From 87cbb862148fac257c991949f6cebd9ce6c51a2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Giumo=20X=2E=20Clanjor=20=28=E5=93=86=E5=95=A6=E6=AF=94?=
 =?UTF-8?q?=E7=8C=AB/=E5=85=B0=E5=A8=81=E4=B8=BE=29?= <cjxgm@126.com>
Date: Tue, 4 Jul 2017 21:12:47 +0800
Subject: [PATCH 0001/3370] systemd.nspawn: fix missing suffix

Fix files placed in `/etc/systemd/nspawn/` missing `.nspawn` suffix
---
 nixos/modules/system/boot/systemd-nspawn.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix
index 8fa9f8b795e5..64b3b8b584e3 100644
--- a/nixos/modules/system/boot/systemd-nspawn.nix
+++ b/nixos/modules/system/boot/systemd-nspawn.nix
@@ -110,7 +110,7 @@ in {
 
   config =
     let
-      units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg;
+      units = mapAttrs' (n: v: let nspawnFile = "${n}.nspawn"; in nameValuePair nspawnFile (instanceToUnit nspawnFile v)) cfg;
     in mkIf (cfg != {}) {
 
       environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] [];

From 01bf32deef9d80d49d0a34cee176e27dd2008b19 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Mon, 2 Oct 2017 23:19:29 +0200
Subject: [PATCH 0002/3370] poppler: add nss to allow for building pdfsig

---
 pkgs/development/libraries/poppler/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 5fcb7d386faf..be41acf0a42f 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,7 +4,7 @@
 , qt4Support ? false, qt4 ? null
 , qt5Support ? false, qtbase ? null
 , introspectionSupport ? false, gobjectIntrospection ? null
-, utils ? false
+, utils ? false, nss ? null
 , minimal ? false, suffix ? "glib"
 , hostPlatform
 }:
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     ++ optionals (!minimal) [ cairo lcms curl ]
     ++ optional qt4Support qt4
     ++ optional qt5Support qtbase
+    ++ optional utils nss
     ++ optional introspectionSupport gobjectIntrospection;
 
   nativeBuildInputs = [ pkgconfig ];
@@ -65,7 +66,9 @@ stdenv.mkDerivation rec {
     description = "A PDF rendering library";
 
     longDescription = ''
-      Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+      Poppler is a PDF rendering library based on the xpdf-3.0 code
+      base. In addition it provides a number of tools that can be
+      installed separately.
     '';
 
     license = licenses.gpl2;

From e70d293b6b5f236d69d559ccccdafba19c6d29c3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Sun, 19 Nov 2017 16:41:28 +0100
Subject: [PATCH 0003/3370] nixos/acme: Allow for time window between cert
 issue and activation

---
 nixos/modules/security/acme.nix | 65 +++++++++++++++++++++++++++------
 1 file changed, 53 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index fb011019f7f5..df0b4986eb82 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -57,9 +57,11 @@ let
         default = "";
         example = "systemctl reload nginx.service";
         description = ''
-          Commands to run after certificates are re-issued. Typically
+          Commands to run after new certificates go live. Typically
           the web server and other servers using certificates need to
           be reloaded.
+
+          Executed in the same directory with the new certificate.
         '';
       };
 
@@ -77,6 +79,27 @@ let
         '';
       };
 
+      activationDelay = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = ''
+          Systemd time span expression to delay copying new certificates to main
+          state directory. See <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum></citerefentry>.
+        '';
+      };
+
+      preDelay = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Commands to run after certificates are re-issued but before they are
+          activated. Typically the new certificate is published to DNS.
+
+          Executed in the same directory with the new certificate.
+        '';
+      };
+
       extraDomains = mkOption {
         type = types.attrsOf (types.nullOr types.str);
         default = {};
@@ -186,14 +209,14 @@ in
           certToServices = cert: data:
               let
                 domain = if data.domain != null then data.domain else cert;
-                cpath = "${cfg.directory}/${cert}";
+                cpath = lpath + optionalString (data.activationDelay != null) ".staging";
+                lpath = "${cfg.directory}/${cert}";
                 rights = if data.allowKeysForGroup then "750" else "700";
                 cmdline = [ "-v" "-d" domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
                           ++ optionals (data.email != null) [ "--email" data.email ]
                           ++ concatMap (p: [ "-f" p ]) data.plugins
                           ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains)
-                          ++ (if cfg.production then []
-                              else ["--server" "https://acme-staging.api.letsencrypt.org/directory"]);
+                          ++ optionals (!cfg.production) ["--server" "https://acme-staging.api.letsencrypt.org/directory"];
                 acmeService = {
                   description = "Renew ACME Certificate for ${cert}";
                   after = [ "network.target" "network-online.target" ];
@@ -206,7 +229,7 @@ in
                     Group = data.group;
                     PrivateTmp = true;
                   };
-                  path = [ pkgs.simp_le ];
+                  path = with pkgs; [ simp_le systemd ];
                   preStart = ''
                     mkdir -p '${cfg.directory}'
                     chown 'root:root' '${cfg.directory}'
@@ -229,15 +252,36 @@ in
                     exit "$EXITCODE"
                   '';
                   postStop = ''
+                    cd '${cpath}'
+
                     if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then
-                      echo "Executing postRun hook..."
-                      ${data.postRun}
+                      ${if data.activationDelay != null then ''
+                      
+                      ${data.preDelay}
+
+                      if [ -d '${lpath}' ]; then
+                        systemd-run --no-block --on-active='${data.activationDelay}' --unit acme-setlive-${cert}.service
+                      else
+                        systemctl --wait start acme-setlive-${cert}.service
+                      fi
+                      '' else data.postRun}
                     fi
                   '';
 
                   before = [ "acme-certificates.target" ];
                   wantedBy = [ "acme-certificates.target" ];
                 };
+                delayService = {
+                  description = "Set certificate for ${cert} live";
+                  path = with pkgs; [ rsync ];
+                  serviceConfig = {
+                    Type = "oneshot";
+                  };
+                  script = ''
+                    rsync -a --delete-after '${cpath}/' '${lpath}'
+                  '';
+                  postStop = data.postRun;
+                };
                 selfsignedService = {
                   description = "Create preliminary self-signed certificate for ${cert}";
                   preStart = ''
@@ -297,11 +341,8 @@ in
                 };
               in (
                 [ { name = "acme-${cert}"; value = acmeService; } ]
-                ++
-                (if cfg.preliminarySelfsigned
-                  then [ { name = "acme-selfsigned-${cert}"; value = selfsignedService; } ]
-                  else []
-                )
+                ++ optional cfg.preliminarySelfsigned { name = "acme-selfsigned-${cert}"; value = selfsignedService; }
+                ++ optional (data.activationDelay != null) { name = "acme-setlive-${cert}"; value = delayService; }
               );
           servicesAttr = listToAttrs services;
           injectServiceDep = {

From 1ed47cf21424ff450ed2ce9059b5ce1a2c7e052a Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Thu, 18 Jan 2018 01:50:24 +0900
Subject: [PATCH 0004/3370] mathematica: enable installation of localized
 editions

For now English (default) and Japanese editions only.
Fill out information in `l10ns.nix` to add the other localized editions.
Example usage: `mathematica.override { lang = "ja"; }` derives Japanese edition.
---
 .../science/math/mathematica/default.nix      | 23 +++++--------
 .../science/math/mathematica/l10ns.nix        | 33 +++++++++++++++++++
 2 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/applications/science/math/mathematica/l10ns.nix

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 1c86097f2ee4..9b9d5b250ef6 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , coreutils
 , patchelf
-, requireFile
+, callPackage
 , alsaLib
 , dbus
 , fontconfig
@@ -18,6 +18,7 @@
 , zlib
 , libxml2
 , libuuid
+, lang ? "en"
 }:
 
 let
@@ -26,21 +27,15 @@ let
       "Linux"
     else
       throw "Mathematica requires i686-linux or x86_64 linux";
+
+  l10n =
+    with stdenv.lib;
+    with callPackage ./l10ns.nix {};
+    flip (findFirst (l: l.lang == lang)) l10ns
+      (throw "Language '${lang}' not supported");
 in
 stdenv.mkDerivation rec {
-  version = "11.2.0";
-
-  name = "mathematica-${version}";
-
-  src = requireFile rec {
-    name = "Mathematica_${version}_LINUX.sh";
-    message = '' 
-      This nix expression requires that ${name} is
-      already part of the store. Find the file on your Mathematica CD
-      and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
-    '';
-    sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9";
-  };
+  inherit (l10n) version name src;
 
   buildInputs = [
     coreutils
diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix
new file mode 100644
index 000000000000..2158021c7548
--- /dev/null
+++ b/pkgs/applications/science/math/mathematica/l10ns.nix
@@ -0,0 +1,33 @@
+{ lib, requireFile }:
+
+with lib;
+{
+  l10ns = flip map
+  [
+    {
+      version = "11.2.0";
+      lang = "en";
+      language = "English";
+      sha256 = "4a1293cc1c404303aa1cab1bd273c7be151d37ac5ed928fbbb18e9c5ab2d8df9";
+    }
+    {
+      version = "11.2.0";
+      lang = "ja";
+      language = "Japanese";
+      sha256 = "916392edd32bed8622238df435dd8e86426bb043038a3336f30df10d819b49b1";
+    }
+  ]
+  ({ version, lang, language, sha256 }: {
+    inherit version lang;
+    name = "mathematica-${version}" + optionalString (lang != "en") "-${lang}";
+    src = requireFile rec {
+      name = "Mathematica_${version}" + optionalString (lang != "en") "_${language}" + "_LINUX.sh";
+      message = ''
+        This nix expression requires that ${name} is
+        already part of the store. Find the file on your Mathematica CD
+        and add it to the nix store with nix-store --add-fixed sha256 <FILE>.
+      '';
+      inherit sha256;
+    };
+  });
+}

From a7ed44ccadfcf1bd54d0197fbc87b6c1b0bcef7b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 10 Feb 2018 10:28:30 +0100
Subject: [PATCH 0005/3370] lib: make use of visible variable in doRename

The `visible` variable was not hooked up previously. It is used to
determine whether the renamed option should be shown in the
documentation.
---
 lib/modules.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/modules.nix b/lib/modules.nix
index 654c4c588de6..019f11d11bc0 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -664,6 +664,7 @@ rec {
     in
       { config, options, ... }:
       { options = setAttrByPath from (mkOption {
+          inherit visible;
           description = "Alias of <option>${showOption to}</option>.";
           apply = x: use (toOf config);
         });

From dc53518dc3efb0a7152e101a75b8c3a16d44feb0 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 14 Feb 2018 17:22:11 +0100
Subject: [PATCH 0006/3370] buildRustPackage: Restrict `find` to files

`find -executable` finds everything with the executable bit set,
including directories. Thats not harmful in this scenario as `cp` won't
copy those directories, but it does result in a few warning messages.
---
 pkgs/build-support/rust/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index 63d08e1d0311..d5c8cc1ec8de 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -77,7 +77,7 @@ in stdenv.mkDerivation (args // {
   installPhase = args.installPhase or ''
     runHook preInstall
     mkdir -p $out/bin
-    find target/release -maxdepth 1 -executable -exec cp "{}" $out/bin \;
+    find target/release -maxdepth 1 -executable -type f -exec cp "{}" $out/bin \;
     runHook postInstall
   '';
 

From 1cc97befd5550732fd155d04cdd9eca3f5024dbc Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 8 Nov 2017 21:55:40 -0800
Subject: [PATCH 0007/3370] lib/eval-config: document NIXOS_EXTRA_MODULE_PATH

This adds some documentation about importing modules external to
Nixpkgs, which provides context for documenting
NIXOS_EXTRA_MODULE_PATH.

Closes #30376
---
 .../manual/development/importing-modules.xml  | 59 +++++++++++++++++++
 .../manual/development/writing-modules.xml    |  1 +
 2 files changed, 60 insertions(+)
 create mode 100644 nixos/doc/manual/development/importing-modules.xml

diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml
new file mode 100644
index 000000000000..ec1da09b9507
--- /dev/null
+++ b/nixos/doc/manual/development/importing-modules.xml
@@ -0,0 +1,59 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="sec-importing-modules">
+
+<title>Importing Modules</title>
+
+<para>
+  Sometimes NixOS modules need to be used in configuration but exist
+  outside of Nixpkgs. These modules can be imported:
+</para>
+
+<programlisting>
+{ config, lib, pkgs, ... }:
+
+{
+  imports =
+    [ # Use a locally-available module definition in
+      # ./example-module/default.nix
+        ./example-module
+    ];
+
+  services.exampleModule.enable = true;
+}
+</programlisting>
+
+<para>
+  The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is
+  an absolute path to a NixOS module that is included alongside the
+  Nixpkgs NixOS modules. Like any NixOS module, this module can import
+  additional modules:
+</para>
+
+<programlisting>
+# ./module-list/default.nix
+[
+  ./example-module1
+  ./example-module2
+]
+</programlisting>
+
+<programlisting>
+# ./extra-module/default.nix
+{ imports = import ./module-list.nix; }
+</programlisting>
+
+<programlisting>
+# NIXOS_EXTRA_MODULE_PATH=/absolute/path/to/extra-module
+{ config, lib, pkgs, ... }:
+
+{
+  # No `imports` needed
+
+  services.exampleModule1.enable = true;
+}
+</programlisting>
+
+</section>
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index cb363b45675b..a49f99cb2669 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -180,6 +180,7 @@ in {
 <xi:include href="option-def.xml" />
 <xi:include href="assertions.xml" />
 <xi:include href="meta-attributes.xml" />
+<xi:include href="importing-modules.xml" />
 <xi:include href="replace-modules.xml" />
 
 </chapter>

From 7654f8fa3a144847be04c071354eb8ba10d2612f Mon Sep 17 00:00:00 2001
From: Olivier Bourdoux <olivier.bourdoux@gmail.com>
Date: Mon, 19 Feb 2018 16:50:54 +0100
Subject: [PATCH 0008/3370] yarssr: init at git-2017-12-01

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

diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix
new file mode 100644
index 000000000000..cadf5ccb6a48
--- /dev/null
+++ b/pkgs/applications/misc/yarssr/default.nix
@@ -0,0 +1,68 @@
+{
+fetchFromGitHub, stdenv, lib,
+autoreconfHook, intltool, pkgconfig, makeWrapper, pkgs,
+perl, perlPackages,
+gnome2 }:
+
+let
+  perlDeps = with perlPackages; [
+    Glib Gtk2 Gnome2 Pango Cairo Gnome2Canvas Gnome2VFS Gtk2GladeXML Gtk2TrayIcon
+    XMLLibXML XMLSAXBase XMLParser XMLRSS
+    HTMLParser
+    DateTime DateTimeFormatMail DateTimeFormatW3CDTF DateTimeLocale DateTimeTimeZone
+    ParamsValidate
+    ModuleImplementation ModuleRuntime
+    TryTiny
+    ClassSingleton
+    URI
+    AnyEvent AnyEventHTTP
+    CommonSense
+    FileSlurp
+    JSON
+    Guard
+    LocaleGettext
+  ];
+  libs = [
+    stdenv.cc.cc.lib
+    pkgs.gtk2
+  ];
+in
+stdenv.mkDerivation rec {
+  version = "git-2017-12-01";
+  name = "yarssr-${version}";
+
+  src = fetchFromGitHub {
+    owner = "JGRennison";
+    repo = "yarssr";
+    rev = "e70eb9fc6563599bfb91c6de6a79654de531c18d";
+    sha256 = "0x7hz8x8qyp3i1vb22zhcnvwxm3jhmmmlr22jqc5b09vpmbw1l45";
+  };
+
+  nativeBuildInputs = [ perl pkgs.gettext makeWrapper ];
+  buildInputs = perlDeps ++ [gnome2.libglade];
+  propagatedBuildInputs = libs ++ perlDeps;
+
+  installPhase = ''
+    DESTDIR=$out make install
+    mv $out/usr/* $out/
+    rm -R $out/usr
+    sed -i -r "s!use lib [^;]+;!use lib '$out/share/yarssr';!" $out/bin/yarssr
+    sed -i -r "s!$Yarssr::PREFIX = [^;]+;!$Yarssr::PREFIX = '$out';!" $out/bin/yarssr
+    sed -i -r "s!use Yarssr::Browser;!!" $out/share/yarssr/Yarssr/GUI.pm
+    chmod a+x $out/bin/yarssr
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/yarssr \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath libs} \
+      --set PERL5LIB "${lib.makePerlPath perlDeps}"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/tsyrogit/zxcvbn-c;
+    description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes.";
+    license = licenses.gpl1;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ xurei ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffc8abcdf236..b10c0e790f1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18310,6 +18310,8 @@ with pkgs;
 
   yarp = callPackage ../applications/science/robotics/yarp {};
 
+  yarssr = callPackage ../applications/misc/yarssr { };
+
   yate = callPackage ../applications/misc/yate { };
 
   yed = callPackage ../applications/graphics/yed {};

From 844c468b8f53e8bb84c75bb944ee9b4ad6b025ce Mon Sep 17 00:00:00 2001
From: Olivier Bourdoux <olivier.bourdoux@gmail.com>
Date: Mon, 19 Feb 2018 21:47:36 +0100
Subject: [PATCH 0009/3370] postman : 5.5.2 -> 5.5.3

---
 pkgs/development/web/postman/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index 605e5de03119..eb5287a3ece9 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "postman-${version}";
-  version = "5.5.2";
+  version = "5.5.3";
 
   src = fetchurl {
     url = "https://dl.pstmn.io/download/version/${version}/linux64";
-    sha1 = "68886197A8375E860AB880547838FEFC9E12FC64";
+    sha1 = "BC0C6117BEC6D1638FD18A0E2A580617669A9297";
     name = "${name}.tar.gz";
   };
 
@@ -16,10 +16,15 @@ stdenv.mkDerivation rec {
 
   buildPhase = ":";   # nothing to build
 
+  icon = fetchurl {
+    url = "https://www.getpostman.com/img-rebrand/logo.png";
+    sha256 = "0jdhl9c07b1723j2f172z3s5p5lh8sqa1rcvdzz3h6z5zwn21g7v";
+  };
+
   desktopItem = makeDesktopItem {
     name = "postman";
     exec = "postman";
-    icon = "$out/share/postman/resources/app/assets/icon.png";
+    icon = "${icon}";
     comment = "API Development Environment";
     desktopName = "Postman";
     genericName = "Postman";
@@ -28,10 +33,12 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     mkdir -p $out/share/postman
-    mkdir -p $out/share/applications
     cp -R * $out/share/postman
+
     mkdir -p $out/bin
     ln -s $out/share/postman/Postman $out/bin/postman
+
+    mkdir -p $out/share/applications
     ln -s ${desktopItem}/share/applications/* $out/share/applications/
   '';
 

From c26bf1cb6004e2f4d3535c8def72bf9963fea071 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 21 Feb 2018 08:11:16 +0100
Subject: [PATCH 0010/3370] logkeys: 2017-10-10 -> 2018-01-22

---
 pkgs/tools/security/logkeys/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix
index e30ad30a4dc1..8a73d056b1ed 100644
--- a/pkgs/tools/security/logkeys/default.nix
+++ b/pkgs/tools/security/logkeys/default.nix
@@ -1,13 +1,14 @@
-{ stdenv, fetchgit, autoconf, automake, which, procps, kbd }:
+{ stdenv, fetchFromGitHub, autoconf, automake, which, procps, kbd }:
 
 stdenv.mkDerivation rec {
   name = "logkeys-${version}";
-  version = "2017-10-10";
+  version = "2018-01-22";
 
-  src = fetchgit {
-    url = https://github.com/kernc/logkeys;
-    rev = "5c368327a2cd818efaed4794633c260b90b87abf";
-    sha256 = "0akj7j775y9c0p53zq5v12jk3fy030fpdvn5m1x9w4rdj47vxdpg";
+  src = fetchFromGitHub {
+    owner = "kernc";
+    repo = "logkeys";
+    rev = "7a9f19fb6b152d9f00a0b3fe29ab266ff1f88129";
+    sha256 = "1k6kj0913imwh53lh6hrhqmrpygqg2h462raafjsn7gbd3vkgx8n";
   };
 
   buildInputs = [ autoconf automake which procps kbd ];

From 1c3c80360b914ff8eacdabeb6d05565721121b1e Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 21 Feb 2018 08:11:33 +0100
Subject: [PATCH 0011/3370] logkeys.service: Add 'device' option

---
 nixos/modules/services/misc/logkeys.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/logkeys.nix b/nixos/modules/services/misc/logkeys.nix
index df0b3ae24c90..ad13d9eaa674 100644
--- a/nixos/modules/services/misc/logkeys.nix
+++ b/nixos/modules/services/misc/logkeys.nix
@@ -7,6 +7,13 @@ let
 in {
   options.services.logkeys = {
     enable = mkEnableOption "logkeys service";
+
+    device = mkOption {
+      description = "Use the given device as keyboard input event device instead of /dev/input/eventX default.";
+      default = null;
+      type = types.nullOr types.string;
+      example = "/dev/input/event15";
+    };
   };
 
   config = mkIf cfg.enable {
@@ -14,7 +21,7 @@ in {
       description = "LogKeys Keylogger Daemon";
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
-        ExecStart = "${pkgs.logkeys}/bin/logkeys -s";
+        ExecStart = "${pkgs.logkeys}/bin/logkeys -s${lib.optionalString (cfg.device != null) " -d ${cfg.device}"}";
         ExecStop = "${pkgs.logkeys}/bin/logkeys -k";
         Type = "forking";
       };

From 8c5da2713cda9e31197e1cd9f4fba20bc32fc239 Mon Sep 17 00:00:00 2001
From: Sebastian Conybeare <sebastian@conybeare.me>
Date: Thu, 22 Feb 2018 14:02:52 -0600
Subject: [PATCH 0012/3370] monkeysphere: wrap the monkeysphere executable with
 the necessary crypto libraries for ssh-proxycommand

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

diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix
index f0d3a870676c..d1266ca495ed 100644
--- a/pkgs/tools/security/monkeysphere/default.nix
+++ b/pkgs/tools/security/monkeysphere/default.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
         CryptOpenSSLRSA
         CryptOpenSSLBignum
       ]}"
+    wrapProgram $out/bin/monkeysphere --prefix PERL5LIB :\
+      "${with perlPackages; stdenv.lib.makePerlPath [
+        CryptOpenSSLRSA
+        CryptOpenSSLBignum
+      ]}"
   '';
 
   meta = with stdenv.lib; {

From 4d7bea7e5efa873b5469af996a0d99ca529ba50f Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Mon, 26 Feb 2018 17:50:56 -0500
Subject: [PATCH 0013/3370] ipxe: fix ISO build

Without this change, it doesn't seem to properly generate ISOs with
embedded scripts.
---
 pkgs/tools/misc/ipxe/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index 786b3992a5cc..1cce03fe74e0 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -26,6 +26,7 @@ stdenv.mkDerivation {
   makeFlags =
     [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here.
       "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin"
+      "LDLINUX_C32=${syslinux}/share/syslinux/ldlinux.c32"
     ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}";
 
 
@@ -34,6 +35,7 @@ stdenv.mkDerivation {
   configurePhase = ''
     runHook preConfigure
     for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done
+    sed -i '/cp \''${ISOLINUX_BIN}/s/$/ --no-preserve=mode/' src/util/geniso
     runHook postConfigure
   '';
 

From 8ae0c8a64f2f2e36b5815f8686e49a4c9315c09d Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Tue, 27 Feb 2018 15:25:13 -0500
Subject: [PATCH 0014/3370] ipxe: 20170922 -> 20180220

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

diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix
index 1cce03fe74e0..d34ccaa4b9e9 100644
--- a/pkgs/tools/misc/ipxe/default.nix
+++ b/pkgs/tools/misc/ipxe/default.nix
@@ -3,8 +3,8 @@
 }:
 
 let
-  date = "20170922";
-  rev = "74d90b33f8490adcee2026ece18d8411d93b6a39";
+  date = "20180220";
+  rev = "47849be3a900c546cf92066849be0806f4e611d9";
 in
 
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = git://git.ipxe.org/ipxe.git;
-    sha256 = "12ijrq451fj2x3i7c7xjlxig5mwbhmgzqjvmfl2sza953vfbk4vw";
+    sha256 = "1f4pi1dp2zqnrbfnggnzycfvrxv0bqgw73dxbyy3hfy4mhdj6z45";
     inherit rev;
   };
 

From d37b43f434e5752bdcd2262365dcfedd15b622b5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Feb 2018 15:38:46 -0800
Subject: [PATCH 0015/3370] rtaudio: 4.1.2 -> 5.0.0

Semi-automatic update. These checks were performed:

- built on NixOS
- found 5.0.0 with grep in /nix/store/sxxwa9mma9933vxb4w3d2szxjqx5w773-rtaudio-5.0.0
- found 5.0.0 in filename of file in /nix/store/sxxwa9mma9933vxb4w3d2szxjqx5w773-rtaudio-5.0.0

cc "@magnetophon"
---
 pkgs/development/libraries/audio/rtaudio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix
index 326572996b48..1df696c0ec64 100644
--- a/pkgs/development/libraries/audio/rtaudio/default.nix
+++ b/pkgs/development/libraries/audio/rtaudio/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoconf, automake, libtool, libjack2,  alsaLib, rtmidi }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.2";
+  version = "5.0.0";
   name = "rtaudio-${version}";
 
   src = fetchFromGitHub {
     owner = "thestk";
     repo = "rtaudio";
     rev = "${version}";
-    sha256 = "09j84l9l3q0g238z5k89rm8hgk0i1ir8917an7amq474nwjp80pq";
+    sha256 = "0jkqnhc2pq31nmq4daxhmqdjgv2qi4ib27hwms2r5zhnmvvzlr67";
   };
 
   buildInputs = [ autoconf automake libtool libjack2 alsaLib rtmidi ];

From 76a1e39e1213f6d0ce262226445c18747cc64294 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 27 Feb 2018 17:29:26 -0800
Subject: [PATCH 0016/3370] thin-provisioning-tools: 0.6.3 -> 0.7.5

Semi-automatic update. These checks were performed:

- built on NixOS
- found 0.7.5 with grep in /nix/store/7y3a77lh1w5ghqlmy5l00bsx90dpwyy4-thin-provisioning-tools-0.7.5
- found 0.7.5 in filename of file in /nix/store/7y3a77lh1w5ghqlmy5l00bsx90dpwyy4-thin-provisioning-tools-0.7.5

cc "@globin"
---
 pkgs/tools/misc/thin-provisioning-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 5d43679b6fe6..8b9fa4f2f3fc 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "thin-provisioning-tools-${version}";
-  version = "0.6.3";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
     rev = "v${version}";
-    sha256 = "0glwhfzwj9afbqdv59ppgfqy7rik8m0vcap7279fpnvwpr1c2p5n";
+    sha256 = "1ibg5wxrbqg4pr3f6aacqm42fxpwn5q00j8ldy9mw4an3ck41cwa";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 059a71a6119d0ef52948ec9e749c46bd1f9aa3d2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 5 Mar 2018 09:54:21 -0500
Subject: [PATCH 0017/3370] lib/options: teach showOptions about funny option
 names

Handle the case where options have funny symbols inside of them.

Example:

If I reference the following attribute without it being defined:

  security.acme.certs."example.com".webroot

I now get the error:

    The option `security.acme.certs."example.com".webroot' is used but
    not defined.

where before I got:

    The option `security.acme.certs.example.com.webroot' is used but
    not defined.

which is not true.
---
 lib/options.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/options.nix b/lib/options.nix
index 9446eca36778..01160b48ec01 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -127,7 +127,20 @@ rec {
 
 
   /* Helper functions. */
-  showOption = concatStringsSep ".";
+
+  # Convert an option, described as a list of the option parts in to a
+  # safe, human readable version. ie:
+  #
+  # (showOption ["foo" "bar" "baz"]) == "foo.bar.baz"
+  # (showOption ["foo" "bar.baz" "tux"]) == "foo.\"bar.baz\".tux"
+  showOption = parts: let
+    escapeOptionPart = part:
+      let
+        escaped = lib.strings.escapeNixString part;
+      in if escaped == "\"${part}\""
+         then part
+         else escaped;
+    in (concatStringsSep ".") (map escapeOptionPart parts);
   showFiles = files: concatStringsSep " and " (map (f: "`${f}'") files);
   unknownModule = "<unknown-file>";
 

From 2fa1165e89db2c49ccd616a39507c9bdd30c50d2 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 12 Aug 2017 21:14:36 +0200
Subject: [PATCH 0018/3370] switch-to-configuration: use Net::DBus to retrieve
 the list of units

This resolves the FIXME, and opens up the possibility of using more of
the systemd DBus interface to make things more robust.
---
 .../activation/switch-to-configuration.pl     | 19 +++++++++----------
 nixos/modules/system/activation/top-level.nix |  3 ++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 87a4ab2a586d..2ce04ed5342c 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use File::Basename;
 use File::Slurp;
+use Net::DBus;
 use Sys::Syslog qw(:standard :macros);
 use Cwd 'abs_path';
 
@@ -67,17 +68,15 @@ EOF
 $SIG{PIPE} = "IGNORE";
 
 sub getActiveUnits {
-    # FIXME: use D-Bus or whatever to query this, since parsing the
-    # output of list-units is likely to break.
-    # Use current version of systemctl binary before daemon is reexeced.
-    my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`;
+    my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1");
+    my $units = $mgr->ListUnitsByPatterns([], []);
     my $res = {};
-    foreach my $line (split '\n', $lines) {
-        chomp $line;
-        last if $line eq "";
-        $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
-        next if $1 eq "UNIT";
-        $res->{$1} = { load => $2, state => $3, substate => $4 };
+    for my $item (@$units) {
+        my ($id, $description, $load_state, $active_state, $sub_state,
+            $following, $unit_path, $job_id, $job_type, $job_path) = @$item;
+        next unless $following eq '';
+        next if $job_id == 0 and $active_state eq 'inactive';
+        $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state };
     }
     return $res;
 }
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 091a2e412eed..f4af9a580fde 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -127,7 +127,8 @@ let
       configurationName = config.boot.loader.grub.configurationName;
 
       # Needed by switch-to-configuration.
-      perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+
+      perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
   } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
 
   # Replace runtime dependencies

From d72a0e711a7ee10c8fbcfa2e8684e6acd6bb8510 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 7 Mar 2018 12:48:19 -0600
Subject: [PATCH 0019/3370] nghttp2: 1.24.0 -> 1.31.0

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

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index d534cd59bd83..703e4d08bd34 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -17,11 +17,11 @@ let inherit (stdenv.lib) optional; in
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
-  version = "1.24.0";
+  version = "1.31.0";
 
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    sha256 = "18ys6p39yvm9wjjzhhlw35c9m8f5gf4dk9jbshibj19q4js1pnv9";
+    sha256 = "0d7ivd7agsrbpz8745d0c0hxjzx9pdj602p1bpnrsd7p393ydrln";
   };
 
   outputs = [ "bin" "out" "dev" "lib" ];

From 88d34b1dda9094516c0fc6ae9f17b44c8247e848 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 8 Mar 2018 13:55:38 -0800
Subject: [PATCH 0020/3370] gperftools: 2.6.1 -> 2.6.3

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` got 0 exit code
- ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` and found version 2.6.3
- found 2.6.3 with grep in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3
- found 2.6.3 in filename of file in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3
---
 pkgs/development/libraries/gperftools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 5c863cf26cbe..2a2710531e06 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libunwind }:
 
 stdenv.mkDerivation rec {
-  name = "gperftools-2.6.1";
+  name = "gperftools-2.6.3";
 
   src = fetchurl {
     url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz";
-    sha256 = "10cxd6s5pkm2d934gh47hrn9xcrw4qlc9yr7s99z4a508bmngd1q";
+    sha256 = "17zfivp6n00rlqbrx6q6h71y2f815nvlzysff1ihgk4mxpv2yjri";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isLinux libunwind;

From 78e23d13cd7c399147b6f04a8b3f868c7231ce20 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 7 Mar 2018 19:50:33 -0800
Subject: [PATCH 0021/3370] c-ares: 1.13.0 -> 1.14.0

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.14.0 with grep in /nix/store/0azgccv236s0l92yfyxx7rbh8nci8g2z-c-ares-1.14.0
- found 1.14.0 in filename of file in /nix/store/0azgccv236s0l92yfyxx7rbh8nci8g2z-c-ares-1.14.0
---
 pkgs/development/libraries/c-ares/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix
index 6b3b69f99971..a384a7707832 100644
--- a/pkgs/development/libraries/c-ares/default.nix
+++ b/pkgs/development/libraries/c-ares/default.nix
@@ -2,11 +2,11 @@
 
 let self =
 stdenv.mkDerivation rec {
-  name = "c-ares-1.13.0";
+  name = "c-ares-1.14.0";
 
   src = fetchurl {
     url = "http://c-ares.haxx.se/download/${name}.tar.gz";
-    sha256 = "19qxhv9aiw903fr808y77r6l9js0fq9m3gcaqckan9jan7qhixq3";
+    sha256 = "0vnwmbvymw677k780kpb6sb8i3szdp89rzy8mz1fwg1657yw3ls5";
   };
 
   meta = with stdenv.lib; {

From 06a239e3a0729f584574f64b8da554e70404989b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 13:18:09 -0800
Subject: [PATCH 0022/3370] soxr: 0.1.2 -> 0.1.3

Semi-automatic update. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.1.3 with grep in /nix/store/n6as7dvjq9vlsri84smc05yjmdvwmxww-soxr-0.1.3
- found 0.1.3 in filename of file in /nix/store/n6as7dvjq9vlsri84smc05yjmdvwmxww-soxr-0.1.3
---
 pkgs/applications/misc/audio/soxr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix
index 12da125bb3e2..7c4e6ff8c3d7 100644
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "soxr-0.1.2";
+  name = "soxr-0.1.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/soxr/${name}-Source.tar.xz";
-    sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl";
+    sha256 = "12aql6svkplxq5fjycar18863hcq84c5kx8g6f4rj0lcvigw24di";
   };
 
   outputs = [ "out" "doc" ]; # headers are just two and very small

From 70840050b357a4b9b6913b135c316f1cd0310889 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 18:17:47 -0800
Subject: [PATCH 0023/3370] x265: 2.6 -> 2.7

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/55ya7ybd3v04zyss7zc2dib0bk6xacxw-x265-2.7/bin/x265 -V` and found version 2.7
- ran `/nix/store/55ya7ybd3v04zyss7zc2dib0bk6xacxw-x265-2.7/bin/x265 --version` and found version 2.7
- found 2.7 with grep in /nix/store/55ya7ybd3v04zyss7zc2dib0bk6xacxw-x265-2.7
- found 2.7 in filename of file in /nix/store/55ya7ybd3v04zyss7zc2dib0bk6xacxw-x265-2.7
---
 pkgs/development/libraries/x265/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 418829e7af8a..d11a93254bfb 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -16,14 +16,14 @@ in
 
 stdenv.mkDerivation rec {
   name = "x265-${version}";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchurl {
     urls = [
       "http://get.videolan.org/x265/x265_${version}.tar.gz"
       "https://github.com/videolan/x265/archive/${version}.tar.gz"
     ];
-    sha256 = "1gyd94jkwdii9308m07nymsbxrmrcl81c0j8i10zhslr2mj07w0v";
+    sha256 = "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym";
   };
 
   enableParallelBuilding = true;

From 2b8ce2a8106457da1107c84a0d52942597d48413 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 13 Mar 2018 23:51:11 -0700
Subject: [PATCH 0024/3370] audit: 2.8.2 -> 2.8.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.8.3 in filename of file in /nix/store/gqr774xsr2qkb7g7s5zz56lyvdf0qm0c-atk-2.28.1
---
 pkgs/os-specific/linux/audit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix
index 390bab849c28..7e14983a6d2b 100644
--- a/pkgs/os-specific/linux/audit/default.nix
+++ b/pkgs/os-specific/linux/audit/default.nix
@@ -6,11 +6,11 @@
 assert enablePython -> python != null;
 
 stdenv.mkDerivation rec {
-  name = "audit-2.8.2";
+  name = "audit-2.8.3";
 
   src = fetchurl {
     url = "http://people.redhat.com/sgrubb/audit/${name}.tar.gz";
-    sha256 = "1fmw8whraz1q3y3z5mgdpgsa3wz6r3zq0kgsgbc9xvmgfwmrpdb7";
+    sha256 = "06lacv9zjn0sf076dydwmvjhdmik3xzhdjvyrkq75917xv54ajbl";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];

From b9a74cf2fb9792eba605bc0b87e7f089f1ff5177 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 00:28:31 -0700
Subject: [PATCH 0025/3370] buildbot: 1.0.0 -> 1.1.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/.buildbot-wrapped --help` got 0 exit code
- ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/.buildbot-wrapped --version` and found version 1.1.0
- ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/buildbot --help` got 0 exit code
- ran `/nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0/bin/buildbot --version` and found version 1.1.0
- found 1.1.0 with grep in /nix/store/7ai407y4sr374513fcvnp9b8p4g9h829-buildbot-1.1.0
---
 pkgs/development/tools/build-managers/buildbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 3e994227ef05..98adaf1c1aa1 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -14,11 +14,11 @@ let
   package = pythonPackages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "buildbot";
-    version = "1.0.0";
+    version = "1.1.0";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0y7gpymxl09gd9dyqj7zqhaihpl9da1v8ppxi4r161ywd8jv9b1g";
+      sha256 = "1rhmlcvw0dsr4f37sb3xmb9xcn76lsrsw2g1z611g339nmxzi0sc";
     };
 
     buildInputs = with pythonPackages; [

From 560891d3a0496e4fa5dcbac757724f60aa36c302 Mon Sep 17 00:00:00 2001
From: Fionn Cleary <fionn.cleary@streamunlimited.com>
Date: Tue, 13 Mar 2018 15:07:49 +0100
Subject: [PATCH 0026/3370] cdparanoia: Fix private keyword in header

Patch taken from SVN, cdparanoia has not had a release since September
11, 2008.  Allows including the header in C++ files.

https://trac.xiph.org/changeset/15338/
---
 .../applications/audio/cdparanoia/default.nix |   3 +-
 .../cdparanoia/fix_private_keyword.patch      | 468 ++++++++++++++++++
 2 files changed, 470 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/audio/cdparanoia/fix_private_keyword.patch

diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index d4d302f07d21..760b04bef005 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
       url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/patch-paranoia_paranoia.c.10.4.diff";
       sha256 = "17l2qhn8sh4jy6ryy5si6ll6dndcm0r537rlmk4a6a8vkn852vad";
     })
-  ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch;
+    ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./utils.patch
+    ++ [./fix_private_keyword.patch];
 
   buildInputs = stdenv.lib.optional stdenv.isAarch64 autoreconfHook;
 
diff --git a/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch b/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch
new file mode 100644
index 000000000000..3e9cbe2bd8c2
--- /dev/null
+++ b/pkgs/applications/audio/cdparanoia/fix_private_keyword.patch
@@ -0,0 +1,468 @@
+--- cdparanoia-III-10.2/interface/cdda_interface.h	(revision 15337)
++++ cdparanoia-III-10.2/interface/cdda_interface.h	(revision 15338)
+@@ -85,5 +85,5 @@
+   int is_mmc;
+ 
+-  cdda_private_data_t *private;
++  cdda_private_data_t *private_data;
+   void         *reserved;
+   unsigned char inqbytes[4];
+--- cdparanoia-III-10.2/interface/cooked_interface.c	(revision 15337)
++++ cdparanoia-III-10.2/interface/cooked_interface.c	(revision 15338)
+@@ -14,11 +14,11 @@
+   struct timespec tv1;
+   struct timespec tv2;
+-  int ret1=clock_gettime(d->private->clock,&tv1);
++  int ret1=clock_gettime(d->private_data->clock,&tv1);
+   int ret2=ioctl(fd, command,arg);
+-  int ret3=clock_gettime(d->private->clock,&tv2);
++  int ret3=clock_gettime(d->private_data->clock,&tv2);
+   if(ret1<0 || ret3<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
+   }
+   return ret2;
+--- cdparanoia-III-10.2/interface/interface.c	(revision 15337)
++++ cdparanoia-III-10.2/interface/interface.c	(revision 15338)
+@@ -40,7 +40,7 @@
+     if(d->cdda_fd!=-1)close(d->cdda_fd);
+     if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
+-    if(d->private){
+-      if(d->private->sg_hd)free(d->private->sg_hd);
+-      free(d->private);
++    if(d->private_data){
++      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
++      free(d->private_data);
+     }
+ 
+@@ -128,5 +128,5 @@
+       }	
+     }
+-    if(ms)*ms=d->private->last_milliseconds;
++    if(ms)*ms=d->private_data->last_milliseconds;
+     return(sectors);
+   }
+--- cdparanoia-III-10.2/interface/scan_devices.c	(revision 15337)
++++ cdparanoia-III-10.2/interface/scan_devices.c	(revision 15338)
+@@ -265,9 +265,9 @@
+   d->bigendianp=-1; /* We don't know yet... */
+   d->nsectors=-1;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   {
+     /* goddamnit */
+     struct timespec tv;
+-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
++    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
+   }
+   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description);
+@@ -675,13 +675,13 @@
+   d->nsectors=-1;
+   d->messagedest = messagedest;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   {
+     /* goddamnit */
+     struct timespec tv;
+-    d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
++    d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC);
+   }
+   if(use_sgio){
+     d->interface=SGIO_SCSI;
+-    d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
++    d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE));
+     g_fd=d->cdda_fd=dup(d->ioctl_fd);
+   }else{
+@@ -697,6 +697,6 @@
+ 
+     /* malloc our big buffer for scsi commands */
+-    d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
+-    d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
++    d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE);
++    d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
+   }
+ 
+@@ -773,7 +773,7 @@
+   if(g_fd!=-1)close(g_fd);
+   if(d){
+-    if(d->private){
+-      if(d->private->sg_hd)free(d->private->sg_hd);
+-      free(d->private);
++    if(d->private_data){
++      if(d->private_data->sg_hd)free(d->private_data->sg_hd);
++      free(d->private_data);
+     }
+     free(d);
+@@ -822,5 +822,5 @@
+   d->bigendianp=-1; /* We don't know yet... */
+   d->nsectors=-1;
+-  d->private=calloc(1,sizeof(*d->private));
++  d->private_data=calloc(1,sizeof(*d->private_data));
+   d->drive_model=copystring("File based test interface");
+   idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model);
+--- cdparanoia-III-10.2/interface/scsi_interface.c	(revision 15337)
++++ cdparanoia-III-10.2/interface/scsi_interface.c	(revision 15338)
+@@ -16,11 +16,11 @@
+   struct timespec tv1;
+   struct timespec tv2;
+-  int ret1=clock_gettime(d->private->clock,&tv1);
++  int ret1=clock_gettime(d->private_data->clock,&tv1);
+   int ret2=ioctl(fd, command,arg);
+-  int ret3=clock_gettime(d->private->clock,&tv2);
++  int ret3=clock_gettime(d->private_data->clock,&tv2);
+   if(ret1<0 || ret3<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.;
+   }
+   return ret2;
+@@ -97,5 +97,5 @@
+   fd_set fdset;
+   struct timeval tv;
+-  struct sg_header *sg_hd=d->private->sg_hd;
++  struct sg_header *sg_hd=d->private_data->sg_hd;
+   int flag=0;
+ 
+@@ -186,5 +186,5 @@
+   int tret1,tret2;
+   int status = 0;
+-  struct sg_header *sg_hd=d->private->sg_hd;
++  struct sg_header *sg_hd=d->private_data->sg_hd;
+   long writebytes=SG_OFF+cmd_len+in_size;
+ 
+@@ -196,5 +196,5 @@
+   memset(sg_hd,0,sizeof(sg_hd)); 
+   memset(sense_buffer,0,SG_MAX_SENSE); 
+-  memcpy(d->private->sg_buffer,cmd,cmd_len+in_size);
++  memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size);
+   sg_hd->twelve_byte = cmd_len == 12;
+   sg_hd->result = 0;
+@@ -210,5 +210,5 @@
+ 
+   if(bytecheck && out_size>in_size){
+-    memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
++    memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 
+     /* the size does not remove cmd_len due to the way the kernel
+        driver copies buffers */
+@@ -244,5 +244,5 @@
+ 
+   sigprocmask (SIG_BLOCK, &(d->sigset), NULL );
+-  tret1=clock_gettime(d->private->clock,&tv1);  
++  tret1=clock_gettime(d->private_data->clock,&tv1);  
+   errno=0;
+   status = write(d->cdda_fd, sg_hd, writebytes );
+@@ -290,5 +290,5 @@
+   }
+ 
+-  tret2=clock_gettime(d->private->clock,&tv2);  
++  tret2=clock_gettime(d->private_data->clock,&tv2);  
+   errno=0;
+   status = read(d->cdda_fd, sg_hd, SG_OFF + out_size);
+@@ -314,5 +314,5 @@
+     long i,flag=0;
+     for(i=in_size;i<out_size;i++)
+-      if(d->private->sg_buffer[i]!=bytefill){
++      if(d->private_data->sg_buffer[i]!=bytefill){
+ 	flag=1;
+ 	break;
+@@ -327,7 +327,7 @@
+   errno=0;
+   if(tret1<0 || tret2<0){
+-    d->private->last_milliseconds=-1;
++    d->private_data->last_milliseconds=-1;
+   }else{
+-    d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
++    d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000;
+   }
+   return(0);
+@@ -348,5 +348,5 @@
+   memset(&hdr,0,sizeof(hdr));
+   memset(sense,0,sizeof(sense));
+-  memcpy(d->private->sg_buffer,cmd+cmd_len,in_size);
++  memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size);
+ 
+   hdr.cmdp = cmd;
+@@ -356,5 +356,5 @@
+   hdr.timeout = 50000;
+   hdr.interface_id = 'S';
+-  hdr.dxferp =  d->private->sg_buffer;
++  hdr.dxferp =  d->private_data->sg_buffer;
+   hdr.flags = SG_FLAG_DIRECT_IO;  /* direct IO if we can get it */
+ 
+@@ -401,5 +401,5 @@
+     long i,flag=0;
+     for(i=in_size;i<out_size;i++)
+-      if(d->private->sg_buffer[i]!=bytefill){
++      if(d->private_data->sg_buffer[i]!=bytefill){
+ 	flag=1;
+ 	break;
+@@ -413,5 +413,5 @@
+ 
+   /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */
+-  /* d->private->last_milliseconds = hdr.duration; */
++  /* d->private_data->last_milliseconds = hdr.duration; */
+ 
+   errno = 0;
+@@ -446,7 +446,7 @@
+   handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense);
+ 
+-  key = d->private->sg_buffer[2] & 0xf;
+-  ASC = d->private->sg_buffer[12];
+-  ASCQ = d->private->sg_buffer[13];
++  key = d->private_data->sg_buffer[2] & 0xf;
++  ASC = d->private_data->sg_buffer[12];
++  ASCQ = d->private_data->sg_buffer[13];
+   
+   if(key == 2 && ASC == 4 && ASCQ == 1) return 0;
+@@ -493,5 +493,5 @@
+ 
+   {
+-    unsigned char *b=d->private->sg_buffer;
++    unsigned char *b=d->private_data->sg_buffer;
+     if(b[0])return(1); /* Handles only up to 256 bytes */
+     if(b[6])return(1); /* Handles only up to 256 bytes */
+@@ -605,6 +605,6 @@
+   if(mode_sense(d,12,0x01))return(-1);
+ 
+-  d->orgdens = d->private->sg_buffer[4];
+-  return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]);
++  d->orgdens = d->private_data->sg_buffer[4];
++  return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]);
+ }
+ 
+@@ -665,6 +665,6 @@
+   }
+ 
+-  first=d->private->sg_buffer[2];
+-  last=d->private->sg_buffer[3];
++  first=d->private_data->sg_buffer[2];
++  last=d->private_data->sg_buffer[3];
+   tracks=last-first+1;
+ 
+@@ -684,5 +684,5 @@
+     }
+     {
+-      scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
++      scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
+ 
+       d->disc_toc[i-first].bFlags=toc->bFlags;
+@@ -705,5 +705,5 @@
+   }
+   {
+-    scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4);
++    scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4);
+     
+     d->disc_toc[i-first].bFlags=toc->bFlags;
+@@ -739,5 +739,5 @@
+ 
+   /* copy to our structure and convert start sector */
+-  tracks = d->private->sg_buffer[1];
++  tracks = d->private_data->sg_buffer[1];
+   if (tracks > MAXTRK) {
+     cderror(d,"003: CDROM reporting illegal number of tracks\n");
+@@ -755,31 +755,31 @@
+     }
+     
+-    d->disc_toc[i].bFlags = d->private->sg_buffer[10];
++    d->disc_toc[i].bFlags = d->private_data->sg_buffer[10];
+     d->disc_toc[i].bTrack = i + 1;
+ 
+     d->disc_toc[i].dwStartSector= d->adjust_ssize * 
+-	(((signed char)(d->private->sg_buffer[2])<<24) | 
+-	 (d->private->sg_buffer[3]<<16)|
+-	 (d->private->sg_buffer[4]<<8)|
+-	 (d->private->sg_buffer[5]));
++	(((signed char)(d->private_data->sg_buffer[2])<<24) | 
++	 (d->private_data->sg_buffer[3]<<16)|
++	 (d->private_data->sg_buffer[4]<<8)|
++	 (d->private_data->sg_buffer[5]));
+   }
+ 
+   d->disc_toc[i].bFlags = 0;
+   d->disc_toc[i].bTrack = i + 1;
+-  memcpy (&foo, d->private->sg_buffer+2, 4);
+-  memcpy (&bar, d->private->sg_buffer+6, 4);
++  memcpy (&foo, d->private_data->sg_buffer+2, 4);
++  memcpy (&bar, d->private_data->sg_buffer+6, 4);
+   d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) +
+ 						    be32_to_cpu(bar));
+ 
+   d->disc_toc[i].dwStartSector= d->adjust_ssize * 
+-    ((((signed char)(d->private->sg_buffer[2])<<24) | 
+-      (d->private->sg_buffer[3]<<16)|
+-      (d->private->sg_buffer[4]<<8)|
+-      (d->private->sg_buffer[5]))+
++    ((((signed char)(d->private_data->sg_buffer[2])<<24) | 
++      (d->private_data->sg_buffer[3]<<16)|
++      (d->private_data->sg_buffer[4]<<8)|
++      (d->private_data->sg_buffer[5]))+
+      
+-     ((((signed char)(d->private->sg_buffer[6])<<24) | 
+-       (d->private->sg_buffer[7]<<16)|
+-       (d->private->sg_buffer[8]<<8)|
+-       (d->private->sg_buffer[9]))));
++     ((((signed char)(d->private_data->sg_buffer[6])<<24) | 
++       (d->private_data->sg_buffer[7]<<16)|
++       (d->private_data->sg_buffer[8]<<8)|
++       (d->private_data->sg_buffer[9]))));
+ 
+ 
+@@ -818,5 +818,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -837,5 +837,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -855,5 +855,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -873,5 +873,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -891,5 +891,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -909,5 +909,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -923,5 +923,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -937,5 +937,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -951,5 +951,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -965,5 +965,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -979,5 +979,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -993,5 +993,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -1027,5 +1027,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -1040,5 +1040,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -1053,5 +1053,5 @@
+   if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense)))
+     return(ret);
+-  if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW);
++  if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW);
+   return(0);
+ }
+@@ -1276,5 +1276,5 @@
+   long i;
+   for(i=2351;i>=0;i--)
+-    if(d->private->sg_buffer[i]!=(unsigned char)'\177')
++    if(d->private_data->sg_buffer[i]!=(unsigned char)'\177')
+       return(((i+3)>>2)<<2);
+ 
+@@ -1285,5 +1285,5 @@
+   long i,flag=0;
+   for(i=0;i<2352;i++)
+-    if(d->private->sg_buffer[i]!=0){
++    if(d->private_data->sg_buffer[i]!=0){
+       flag=1;
+       break;
+@@ -1622,5 +1622,5 @@
+   if(mode_sense(d,22,0x2A)==0){
+   
+-    b=d->private->sg_buffer;
++    b=d->private_data->sg_buffer;
+     b+=b[3]+4;
+     
+@@ -1670,5 +1670,5 @@
+     return(NULL);
+   }
+-  return (d->private->sg_buffer);
++  return (d->private_data->sg_buffer);
+ }
+ 
+@@ -1726,6 +1726,6 @@
+ 
+   d->error_retry=1;
+-  d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
+-  d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF;
++  d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128);
++  d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF;
+   d->report_all=1;
+   return(0);
+--- cdparanoia-III-10.2/interface/test_interface.c	(revision 15337)
++++ cdparanoia-III-10.2/interface/test_interface.c	(revision 15338)
+@@ -67,7 +67,7 @@
+ 
+   if(begin<lastread)
+-    d->private->last_milliseconds=20;
++    d->private_data->last_milliseconds=20;
+   else
+-    d->private->last_milliseconds=sectors;
++    d->private_data->last_milliseconds=sectors;
+ 
+ #ifdef CDDA_TEST_UNDERRUN

From 48698a0668552a477f4454909ca4455fef0a6d19 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 14:10:00 -0700
Subject: [PATCH 0027/3370] itstool: 2.0.2 -> 2.0.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4/bin/itstool -h` got 0 exit code
- ran `/nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4/bin/itstool --help` got 0 exit code
- ran `/nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4/bin/itstool -v` and found version 2.0.4
- ran `/nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4/bin/itstool --version` and found version 2.0.4
- found 2.0.4 with grep in /nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4
- found 2.0.4 in filename of file in /nix/store/pg0jpmczm1gb3rzp3qfnnjl0xfd48nqz-itstool-2.0.4
---
 pkgs/development/tools/misc/itstool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index 70ed9cd0570e..129c1c6b3a93 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -2,11 +2,11 @@
 # We need the same Python as is used to build libxml2Python
 
 stdenv.mkDerivation rec {
-  name = "itstool-2.0.2";
+  name = "itstool-2.0.4";
 
   src = fetchurl {
     url = "http://files.itstool.org/itstool/${name}.tar.bz2";
-    sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a";
+    sha256 = "0q7b4qrc758zfx3adsgvz0r93swdbxjr42w37rahngm33nshihlp";
   };
 
   buildInputs = [ python2 libxml2Python ];

From 3157bd3dc91a6c87dd26ea24effc96296f2d4bc2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 14 Mar 2018 19:51:48 -0700
Subject: [PATCH 0028/3370] libxml2: 2.9.7 -> 2.9.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.9.8 in filename of file in /nix/store/cjycf1wx5a5l22a9kwhpnnh2h9i7pahk-libxc-4.0.4
---
 pkgs/development/libraries/libxml2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index c4f3ff1efdd5..be2f83cb498e 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -10,11 +10,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "libxml2-${version}";
-  version = "2.9.7";
+  version = "2.9.8";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${name}.tar.gz";
-    sha256 = "034hylzspvkm0p4bczqbf8q05a7r2disr8dz725x4bin61ymwg7n";
+    sha256 = "0ci7is75bwqqw2p32vxvrk6ds51ik7qgx73m920rakv5jlayax0b";
   };
 
   outputs = [ "bin" "dev" "out" "man" "doc" ]

From f7c6491613a4f1cc9b50c05720f424bddcdbcb5f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 15 Mar 2018 04:40:57 -0700
Subject: [PATCH 0029/3370] rocksdb: 5.10.3 -> 5.11.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/0z5hqf7lmzgynw5vgliy7848dr7p6fis-rednotebook-2.4/bin/rednotebook -h` got 0 exit code
- ran `/nix/store/0z5hqf7lmzgynw5vgliy7848dr7p6fis-rednotebook-2.4/bin/rednotebook --help` got 0 exit code
- found 5.11.3 in filename of file in /nix/store/0z5hqf7lmzgynw5vgliy7848dr7p6fis-rednotebook-2.4
---
 pkgs/development/libraries/rocksdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index cd17bb8499d6..c082d06eddd5 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -18,7 +18,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "5.10.3";
+  version = "5.11.3";
 
   outputs = [ "dev" "out" "static" ];
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     owner = "facebook";
     repo = "rocksdb";
     rev = "v${version}";
-    sha256 = "19d8i8map8qz639mhflmxc0w9gp78fvkq1l46y5s6b5imwh0w7xq";
+    sha256 = "15x2r7aib1xinwcchl32wghs8g96k4q5xgv6z97mxgp35475x01p";
   };
   
   nativeBuildInputs = [ which perl ];

From f07b330effc24307f1e15c0c528df4f6f9ce3006 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 8 Mar 2018 00:14:05 +0100
Subject: [PATCH 0030/3370] linbox: init at 1.5.2

---
 pkgs/development/libraries/linbox/default.nix | 79 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 80 insertions(+)
 create mode 100644 pkgs/development/libraries/linbox/default.nix

diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix
new file mode 100644
index 000000000000..0f5442bd63b6
--- /dev/null
+++ b/pkgs/development/libraries/linbox/default.nix
@@ -0,0 +1,79 @@
+{ stdenv
+, fetchFromGitHub
+, fetchpatch
+, autoreconfHook
+, givaro
+, pkgconfig
+, openblas
+, liblapack
+, fflas-ffpack
+, gmpxx
+, optimize ? false # impure
+, withSage ? false # sage support
+}:
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "linbox";
+  version = "1.5.2";
+
+  src = fetchFromGitHub {
+    owner = "linbox-team";
+    repo = "${pname}";
+    rev = "v${version}";
+    sha256 = "1wfivlwp30mzdy1697w7rzb8caajim50mc8h27k82yipn2qc5n4i";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+  ];
+
+  buildInputs = [
+    givaro
+    (liblapack.override {shared = true;})
+    openblas
+    gmpxx
+    fflas-ffpack
+  ];
+
+  configureFlags = [
+    "--with-blas-libs=-lopenblas"
+    "--with-lapack-libs=-llapack"
+    "--disable-optimization"
+  ] ++ stdenv.lib.optionals (!optimize) [
+    # disable SIMD instructions (which are enabled *when available* by default)
+    "--disable-sse"
+    "--disable-sse2"
+    "--disable-sse3"
+    "--disable-ssse3"
+    "--disable-sse41"
+    "--disable-sse42"
+    "--disable-avx"
+    "--disable-avx2"
+    "--disable-fma"
+    "--disable-fma4"
+  ] ++ stdenv.lib.optionals withSage [
+    "--enable-sage"
+  ];
+
+  patches = stdenv.lib.optionals withSage [
+    # https://trac.sagemath.org/ticket/24214#comment:39
+    # Will be resolved by
+    # https://github.com/linbox-team/linbox/issues/69
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/sagemath/sage/a843f48b7a4267e44895a3dfa892c89c85b85611/build/pkgs/linbox/patches/linbox_charpoly_fullCRA.patch";
+      sha256 = "16nxfzfknra3k2yk3xy0k8cq9rmnmsch3dnkb03kx15h0y0jmibk";
+    })
+  ];
+
+  doCheck = true;
+
+  meta = {
+    inherit version;
+    description = "C++ library for exact, high-performance linear algebra";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = [stdenv.lib.maintainers.timokau];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = http://linalg.org/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b83424eabbad..f4a3cac618ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8666,6 +8666,7 @@ with pkgs;
 
   fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {};
   fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {};
+  linbox = callPackage ../development/libraries/linbox {};
 
   ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa;

From 421ac6983090d2f153e1e6e480f050cbbadbe15c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 17 Mar 2018 14:40:31 +0100
Subject: [PATCH 0031/3370] libcommuni: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/libcommuni/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 6192266bd4aa..0788236b6017 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -19,12 +19,16 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   dontUseQmakeConfigure = true;
-  configureFlags = "-config release";
+  configureFlags = [ "-config" "release" ];
+
   preConfigure = ''
     sed -i -e 's|/bin/pwd|pwd|g' configure
   '';
 
-  doCheck = true;
+  # The tests fail on darwin because of install_name if they run
+  # before the frameworks are installed.
+  doInstallCheck = true;
+  installCheckTarget = "check";
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = "rm -rf lib";

From 99d56c542e4914b3f6dd06deeb14e0495a2abd31 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 17 Mar 2018 14:46:02 +0100
Subject: [PATCH 0032/3370] communi: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/networking/irc/communi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 25e5a61f2722..917de745d277 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     "
   '';
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString stdenv.isLinux ''
     substituteInPlace "$out/share/applications/communi.desktop" \
       --replace "/usr/bin" "$out/bin"
   '';

From 38acfcad477d892a87d0dc324396f94fcee3d0a5 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 18 Mar 2018 12:58:07 -0700
Subject: [PATCH 0033/3370] libv4l: 1.12.3 -> 1.14.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.14.2 with grep in /nix/store/rbajjyaiyj3q7lxnxs1j3sn1j5x5qgpp-v4l-utils-1.14.2
- directory tree listing: https://gist.github.com/2bfaf54c93c6f29802c6049289a7bf94
---
 pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 84b31d4d516b..9bdb16cd1f16 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "v4l-utils-${version}";
-  version = "1.12.3";
+  version = "1.14.2";
 
   src = fetchurl {
     url = "http://linuxtv.org/downloads/v4l-utils/${name}.tar.bz2";
-    sha256 = "0vpl3jl0x441y7b5cn7zhdsyi954hp9h2p30jhnr1zkx1rpxsiss";
+    sha256 = "14h6d2p3n4jmxhd8i0p1m5dbwz5vnpb3z88xqd9ghg15n7265fg6";
   };
 
   outputs = [ "out" "dev" ];

From 517589f1ffdbc549a812afeee0163d8eb0f3fd0c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 12:06:42 +0800
Subject: [PATCH 0034/3370] sedutil: init at 1.15.1

---
 pkgs/tools/security/sedutil/default.nix | 28 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/security/sedutil/default.nix

diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix
new file mode 100644
index 000000000000..343992a6322f
--- /dev/null
+++ b/pkgs/tools/security/sedutil/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "sedutil-${version}";
+  version = "1.15.1";
+
+  src = fetchFromGitHub {
+    owner  = "Drive-Trust-Alliance";
+    repo   = "sedutil";
+    rev    = version;
+    sha256 = "0zg5v27vbrzzl2vqzks91zj48z30qgcshkqkm1g8ycnhi145l0mf";
+  };
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "DTA sedutil Self encrypting drive software";
+    homepage    = https://www.drivetrust.com;
+    license     = licenses.gpl3;
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98001c416fae..bc37c3572173 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -625,6 +625,8 @@ with pkgs;
 
   ecdsautils = callPackage ../tools/security/ecdsautils { };
 
+  sedutil = callPackage ../tools/security/sedutil { };
+
   elvish = callPackage ../shells/elvish { };
 
   encryptr = callPackage ../tools/security/encryptr {

From c33d8f3d6dd4fbf5fc943187e75a3bad15e9e3e8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 12:12:56 +0800
Subject: [PATCH 0035/3370] nixos sedutil: module for setting up kernel
 parameters

---
 nixos/modules/module-list.nix      |  1 +
 nixos/modules/programs/sedutil.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 nixos/modules/programs/sedutil.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7f28c670bed..adaab86b3af6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -100,6 +100,7 @@
   ./programs/qt5ct.nix
   ./programs/rootston.nix
   ./programs/screen.nix
+  ./programs/sedutil.nix
   ./programs/slock.nix
   ./programs/shadow.nix
   ./programs/shell.nix
diff --git a/nixos/modules/programs/sedutil.nix b/nixos/modules/programs/sedutil.nix
new file mode 100644
index 000000000000..7efc80f4abba
--- /dev/null
+++ b/nixos/modules/programs/sedutil.nix
@@ -0,0 +1,18 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.sedutil;
+
+in {
+  options.programs.sedutil.enable = mkEnableOption "sedutil";
+
+  config = mkIf cfg.enable {
+    boot.kernelParams = [
+      "libata.allow_tpm=1"
+    ];
+
+    environment.systemPackages = with pkgs; [ sedutil ];
+  };
+}

From 7b2eab31d548a72a6fbc35c823cbecf0d25cd86e Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 10:07:57 -0700
Subject: [PATCH 0036/3370] libcap_ng: 0.7.8 -> 0.7.9

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/s6hxbgihfzp3phh3904idpw3jpn1k371-libcap-ng-0.7.9/bin/captest -h` got 0 exit code
- ran `/nix/store/s6hxbgihfzp3phh3904idpw3jpn1k371-libcap-ng-0.7.9/bin/captest --help` got 0 exit code
- ran `/nix/store/s6hxbgihfzp3phh3904idpw3jpn1k371-libcap-ng-0.7.9/bin/captest help` got 0 exit code
- found 0.7.9 with grep in /nix/store/s6hxbgihfzp3phh3904idpw3jpn1k371-libcap-ng-0.7.9
- directory tree listing: https://gist.github.com/eec1818588ca8e5fe720bfe3febec73b
---
 pkgs/os-specific/linux/libcap-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix
index d4625687c472..845e4e704eba 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   name = "libcap-ng-${version}";
   # When updating make sure to test that the version with
   # all of the python bindings still works
-  version = "0.7.8";
+  version = "0.7.9";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.gz";
-    sha256 = "0pyhjxgsph3p28ayk4ynxab6wvzaqmazk1nkamx11m2w8jbzj6n2";
+    sha256 = "0a0k484kwv0zilry2mbl9k56cnpdhsjxdxin17jas6kkyfy345aa";
   };
 
   nativeBuildInputs = [ swig ];

From dc3055487472bf3296bea58ec1eb49d32989cca0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 11:09:31 -0700
Subject: [PATCH 0037/3370] libjpeg_original: 8d -> 9c

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 9c with grep in /nix/store/m070zrgfdkwdqz5p3klbw9r27iz38mjh-libjpeg-9c-bin
- directory tree listing: https://gist.github.com/94ec29f471c8e23b5f10a875c612fd29
---
 pkgs/development/libraries/libjpeg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 8b0a4ec98eda..636699609f1c 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation {
-  name = "libjpeg-8d";
+  name = "libjpeg-9c";
 
   src = fetchurl {
-    url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz;
-    sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
+    url = http://www.ijg.org/files/jpegsrc.v9c.tar.gz;
+    sha256 = "1m3a137r7m14wd92a03qdvp4jfazc0657nzry7rqzs2p1xhkyfhz";
   };
 
   configureFlags = optional static "--enable-static --disable-shared";

From 1a6439fea2e18d9bc93b34f216f78fe66f7a5b35 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 08:39:58 -0700
Subject: [PATCH 0038/3370] xkeyboard_config: 2.22 -> 2.23.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.23.1 with grep in /nix/store/rzna96awj2li59rvgpk0ib40bj0jx8xx-xkeyboard-config-2.23.1
- directory tree listing: https://gist.github.com/6c094cb77d9d6e1110bc5d44144a55ba
---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d22565ae8db9..6551c89726bd 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2468,11 +2468,11 @@ let
   }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
   xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
-    name = "xkeyboard-config-2.22";
+    name = "xkeyboard-config-2.23.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.22.tar.bz2;
-      sha256 = "1garmbyfjp0han04l2l90zzwlfbdgdxl6r1qnic36i5wkycckbny";
+      url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.23.1.tar.bz2;
+      sha256 = "1wq27cs1c9y7d1d7zp5yhq29paj9smajdb68lyvm28d2zq2vqjra";
     };
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ libX11 xproto ];

From 869336d6233ec48234278c654f1a39b3746b9bc6 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Thu, 22 Mar 2018 14:54:42 +0300
Subject: [PATCH 0039/3370] parity: 1.8.11 -> 1.9.5

---
 pkgs/applications/altcoins/parity/default.nix |   8 +-
 .../parity/patches/vendored-sources-1.8.patch | 100 ------------------
 .../parity/patches/vendored-sources-1.9.patch |  16 +--
 3 files changed, 12 insertions(+), 112 deletions(-)
 delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index fe2c2c628275..991799321094 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.8.11";
-  sha256      = "1vabkglmmbx9jccwsqwvwck1brdjack3sw6iwsxy01wsc2jam56k";
-  cargoSha256 = "1l5hx77glclpwd9i35rr3lxfxshsf1bsxvs2chsp2vwjy06knjmi";
-  patches     = [ ./patches/vendored-sources-1.8.patch ];
+  version     = "1.9.5";
+  sha256      = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7";
+  cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva";
+  patches     = [ ./patches/vendored-sources-1.9.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch
deleted file mode 100644
index 3239df63de30..000000000000
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.8.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-diff --git a/.cargo/config b/.cargo/config
-new file mode 100644
-index 000000000..8dddda426
---- /dev/null
-+++ b/.cargo/config
-@@ -0,0 +1,94 @@
-+[source."https://github.com/alexcrichton/mio-named-pipes"]
-+git = "https://github.com/alexcrichton/mio-named-pipes"
-+branch = "master" 
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/parity-tokio-ipc"]
-+git = "https://github.com/nikvolf/parity-tokio-ipc"
-+branch = "master" 
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/tokio-named-pipes"]
-+git = "https://github.com/nikvolf/tokio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/bn"]
-+git = "https://github.com/paritytech/bn"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/hidapi-rs"]
-+git = "https://github.com/paritytech/hidapi-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/hyper"]
-+git = "https://github.com/paritytech/hyper"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/js-precompiled.git"]
-+git = "https://github.com/paritytech/js-precompiled.git"
-+branch = "stable"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/jsonrpc.git"]
-+git = "https://github.com/paritytech/jsonrpc.git"
-+branch = "parity-1.8"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-rs"]
-+git = "https://github.com/paritytech/libusb-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-sys"]
-+git = "https://github.com/paritytech/libusb-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/nanomsg.rs.git"]
-+git = "https://github.com/paritytech/nanomsg.rs.git"
-+branch = "parity-1.7"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-ctrlc.git"]
-+git = "https://github.com/paritytech/rust-ctrlc.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-rocksdb"]
-+git = "https://github.com/paritytech/rust-rocksdb"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-secp256k1"]
-+git = "https://github.com/paritytech/rust-secp256k1"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-snappy"]
-+git = "https://github.com/paritytech/rust-snappy"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/trezor-sys"]
-+git = "https://github.com/paritytech/trezor-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/wasm-utils"]
-+git = "https://github.com/paritytech/wasm-utils"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/tailhook/rotor"]
-+git = "https://github.com/tailhook/rotor"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/tomusdrw/ws-rs"]
-+git = "https://github.com/tomusdrw/ws-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
index d1f6520d706b..31c12d83fafd 100644
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
@@ -1,22 +1,22 @@
 diff --git a/.cargo/config b/.cargo/config
 new file mode 100644
 index 000000000..0efb69724
---- /dev/null
+--- a/.cargo/config
 +++ b/.cargo/config
-@@ -0,0 +1,100 @@
+@@ -0,0 +4,104 @@
 +
 +[source."https://github.com/alexcrichton/mio-named-pipes"]
 +git = "https://github.com/alexcrichton/mio-named-pipes"
 +branch = "master"
 +replace-with = "vendored-sources"
 +
-+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"]
-+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-shell.git"
++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"]
++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"
 +branch = "master"
 +replace-with = "vendored-sources"
 +
-+[source."https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"]
-+git = "https://github.com/js-dist-paritytech/parity-beta-1-9-v1.git"
++[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"]
++git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"
 +branch = "master"
 +replace-with = "vendored-sources"
 +
@@ -90,8 +90,8 @@ index 000000000..0efb69724
 +branch = "master"
 +replace-with = "vendored-sources"
 +
-+[source."https://github.com/pepyakin/wasmi"]
-+git = "https://github.com/pepyakin/wasmi"
++[source."https://github.com/paritytech/wasmi"]
++git = "https://github.com/paritytech/wasmi"
 +branch = "master"
 +replace-with = "vendored-sources"
 +

From 1310e23e38a38dbfb8dcab99b04d0cac6a3f31ff Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Thu, 22 Mar 2018 14:54:59 +0300
Subject: [PATCH 0040/3370] parity-beta: 1.9.4 -> 1.10.0

---
 pkgs/applications/altcoins/parity/beta.nix    |   8 +-
 .../patches/vendored-sources-1.10.patch       | 118 ++++++++++++++++++
 2 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch

diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index ee4203fa88c9..ed78133a759c 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.9.4";
-  sha256      = "00b6wsyc2chmdkhfhi9h1i06hpcjj2abcx3qdc6k39clgha0081f";
-  cargoSha256 = "0pyb1mpykdp6i7c30lm5fprrxg3zanak44g28cygzli3l9l3xiy3";
-  patches     = [ ./patches/vendored-sources-1.9.patch ];
+  version     = "1.10.0";
+  sha256      = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g";
+  cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m";
+  patches     = [ ./patches/vendored-sources-1.10.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch
new file mode 100644
index 000000000000..3e8e032f30c2
--- /dev/null
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch
@@ -0,0 +1,118 @@
+diff --git a/.cargo/config b/.cargo/config
+index 72652ad2f..b21c6aa7b 100644
+--- a/.cargo/config
++++ b/.cargo/config
+@@ -1,3 +1,113 @@
+ [target.x86_64-pc-windows-msvc]
+ # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
+ rustflags = ["-Ctarget-feature=+crt-static"]
++
++[source."https://github.com/alexcrichton/mio-named-pipes"]
++git = "https://github.com/alexcrichton/mio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"]
++git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git"
++rev = "bd25b41cd642c6b822d820dded3aa601a29aa079"
++replace-with = "vendored-sources"
++
++[source."https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"]
++git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git"
++rev = "4b6f112412716cd05123d32eeb7fda448288a6c6"
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/parity-tokio-ipc"]
++git = "https://github.com/nikvolf/parity-tokio-ipc"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/nikvolf/tokio-named-pipes"]
++git = "https://github.com/nikvolf/tokio-named-pipes"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/parity-js/dapp-wallet.git"]
++git = "https://github.com/parity-js/dapp-wallet.git"
++rev = "65deb02e7c007a0fd8aab0c089c93e3fd1de6f87"
++replace-with = "vendored-sources"
++
++[source."https://github.com/parity-js/shell.git"]
++git = "https://github.com/parity-js/shell.git"
++rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/bn"]
++git = "https://github.com/paritytech/bn"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hidapi-rs"]
++git = "https://github.com/paritytech/hidapi-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/hyper"]
++git = "https://github.com/paritytech/hyper"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/jsonrpc.git"]
++git = "https://github.com/paritytech/jsonrpc.git"
++branch = "parity-1.10"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-rs"]
++git = "https://github.com/paritytech/libusb-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/libusb-sys"]
++git = "https://github.com/paritytech/libusb-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-ctrlc.git"]
++git = "https://github.com/paritytech/rust-ctrlc.git"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-rocksdb"]
++git = "https://github.com/paritytech/rust-rocksdb"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-secp256k1"]
++git = "https://github.com/paritytech/rust-secp256k1"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/rust-snappy"]
++git = "https://github.com/paritytech/rust-snappy"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/trezor-sys"]
++git = "https://github.com/paritytech/trezor-sys"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/wasm-utils"]
++git = "https://github.com/paritytech/wasm-utils"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/paritytech/wasmi"]
++git = "https://github.com/paritytech/wasmi"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tailhook/rotor"]
++git = "https://github.com/tailhook/rotor"
++branch = "master"
++replace-with = "vendored-sources"
++
++[source."https://github.com/tomusdrw/ws-rs"]
++git = "https://github.com/tomusdrw/ws-rs"
++branch = "master"
++replace-with = "vendored-sources"

From c1127b95ceeaf07ca9c345b687b1b4ecddbc0572 Mon Sep 17 00:00:00 2001
From: tkatchev <tkatchev@gmail.com>
Date: Thu, 22 Mar 2018 15:45:39 +0300
Subject: [PATCH 0041/3370] boost: Fix static library builds. (link=static and
 runtime-link=static together breaks Boost's build scripts.)

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

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 14ea512afbd2..efe1151359d7 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -55,11 +55,11 @@ let
     "--layout=${layout}"
     "variant=${variant}"
     "threading=${threading}"
-    "runtime-link=${runtime-link}"
     "link=${link}"
     "-sEXPAT_INCLUDE=${expat.dev}/include"
     "-sEXPAT_LIBPATH=${expat.out}/lib"
-  ] ++ optional (variant == "release") "debug-symbols=off"
+  ] ++ optional (link != "static") "runtime-link=${runtime-link}"
+    ++ optional (variant == "release") "debug-symbols=off"
     ++ optional (toolset != null) "toolset=${toolset}"
     ++ optional (mpi != null || hostPlatform != buildPlatform) "--user-config=user-config.jam"
     ++ optionals (hostPlatform.libc == "msvcrt") [

From cac10651ea9e96c828d0f032f6ad462a9b088ac1 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Thu, 22 Mar 2018 17:15:13 +0300
Subject: [PATCH 0042/3370] parity: patch fixes

---
 .../altcoins/parity/patches/vendored-sources-1.9.patch        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
index 31c12d83fafd..d91b103c6cef 100644
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
@@ -1,9 +1,9 @@
 diff --git a/.cargo/config b/.cargo/config
 new file mode 100644
 index 000000000..0efb69724
---- a/.cargo/config
+--- /dev/null
 +++ b/.cargo/config
-@@ -0,0 +4,104 @@
+@@ -0,0 +1,100 @@
 +
 +[source."https://github.com/alexcrichton/mio-named-pipes"]
 +git = "https://github.com/alexcrichton/mio-named-pipes"

From caec3b9e091c6eb5f765c417396e9969f51a0da4 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Thu, 22 Mar 2018 16:30:47 +0000
Subject: [PATCH 0043/3370] PyQt5: 5.10.0 -> 5.10.1

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

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 225da204e21a..eb07f80ed459 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "PyQt";
-  version = "5.10";
+  version = "5.10.1";
 
   inherit (pythonPackages) buildPythonPackage python dbus-python sip;
 in buildPythonPackage {
@@ -24,7 +24,7 @@ in buildPythonPackage {
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt5_gpl-${version}.tar.gz";
-    sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl";
+    sha256 = "1vz9c4v0k8azk2b08swwybrshzw32x8djjpq13mf9v15x1qyjclr";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From fc7ed300d1aafec35f9ea8437b0e6ef6f7669b3d Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Thu, 22 Mar 2018 16:31:06 +0000
Subject: [PATCH 0044/3370] plover: 3.1.0 -> 3.1.1

---
 pkgs/applications/misc/plover/default.nix | 26 ++++++++++-------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index b8fa38268c38..19230a11426e 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -1,26 +1,22 @@
 { stdenv, fetchurl, python27Packages, wmctrl }:
 
-python27Packages.buildPythonPackage rec {
-  name = "plover-${version}";
-  version = "3.1.0";
+with python27Packages; buildPythonPackage rec {
+  name    = "plover-${version}";
+  version = "3.1.1";
 
   meta = with stdenv.lib; {
     description = "OpenSteno Plover stenography software";
     maintainers = with maintainers; [ twey kovirobi ];
-    license = licenses.gpl2;
+    license     = licenses.gpl2;
   };
 
   src = fetchurl {
-    url = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
-    sha256 = "1zdlgyjp93sfvk6by7rsh9hj4ijzplglrxpcpkcir6c3nq2bixl4";
+    url    = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
+    sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r";
   };
 
-  # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781
-  postPatch = ''
-    substituteInPlace setup.py --replace " in sys_platform" " == sys_platform"
-    '';
-
-  buildInputs = with python27Packages; [ pytest mock ];
-  propagatedBuildInputs = with python27Packages; [ six setuptools pyserial appdirs hidapi
-    wxPython xlib wmctrl ];
-}
+  buildInputs           = [ pytest mock ];
+  propagatedBuildInputs = [
+    six setuptools pyserial appdirs hidapi wxPython xlib wmctrl
+  ];
+};

From 51a8848f122108f997ac6923f3ec497f5d6391d7 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Thu, 22 Mar 2018 17:18:32 +0000
Subject: [PATCH 0045/3370] plover: add 4.0.0.dev6

---
 pkgs/applications/misc/plover/default.nix | 59 ++++++++++++++++-------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 19230a11426e..09558ff4c47f 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -1,22 +1,47 @@
-{ stdenv, fetchurl, python27Packages, wmctrl }:
+{ stdenv, fetchurl, python27Packages, python36Packages, wmctrl }:
 
-with python27Packages; buildPythonPackage rec {
-  name    = "plover-${version}";
-  version = "3.1.1";
+{
+  stable = with python27Packages; buildPythonPackage rec {
+    name    = "plover-${version}";
+    version = "3.1.1";
 
-  meta = with stdenv.lib; {
-    description = "OpenSteno Plover stenography software";
-    maintainers = with maintainers; [ twey kovirobi ];
-    license     = licenses.gpl2;
+    meta = with stdenv.lib; {
+      description = "OpenSteno Plover stenography software";
+      maintainers = with maintainers; [ twey kovirobi ];
+      license     = licenses.gpl2;
+    };
+
+    src = fetchurl {
+      url    = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
+      sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r";
+    };
+
+    buildInputs           = [ pytest mock ];
+    propagatedBuildInputs = [
+      six setuptools pyserial appdirs hidapi wxPython xlib wmctrl
+    ];
   };
 
-  src = fetchurl {
-    url    = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
-    sha256 = "1hdg5491phx6svrxxsxp8v6n4b25y7y4wxw7x3bxlbyhaskgj53r";
-  };
+  dev = with python36Packages; buildPythonPackage rec {
+    name    = "plover-${version}";
+    version = "4.0.0.dev6";
 
-  buildInputs           = [ pytest mock ];
-  propagatedBuildInputs = [
-    six setuptools pyserial appdirs hidapi wxPython xlib wmctrl
-  ];
-};
+    meta = with stdenv.lib; {
+      description = "OpenSteno Plover stenography software";
+      maintainers = with maintainers; [ twey kovirobi ];
+      license     = licenses.gpl2;
+    };
+
+    src = fetchurl {
+      url    = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
+      sha256 = "067rkpqnjjxwyv9cwh9i925ndba6fvj6q0r56lizy0l26b4jc8rp";
+    };
+
+    # I'm not sure why we don't find PyQt5 here but there's a similar
+    # sed on many of the platforms Plover builds for
+    postPatch = "sed -i /PyQt5/d setup.cfg";
+
+    buildInputs           = [ pytest mock ];
+    propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8e6b9008295..a1371984d4ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17085,7 +17085,7 @@ with pkgs;
     gtksharp = gtk-sharp-2_0;
   };
 
-  plover = callPackage ../applications/misc/plover { };
+  plover = recurseIntoAttrs (callPackage ../applications/misc/plover { });
 
   plugin-torture = callPackage ../applications/audio/plugin-torture { };
 

From 81d60d59240e6457f5e2f51e59801261e758fb70 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Thu, 22 Mar 2018 15:42:19 -0700
Subject: [PATCH 0046/3370] libvpx: 1.6.1 -> 1.7.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
/tmp/tmp.Z8QazLD8jI /home/ryantm/.cache/nixpkgs
/home/ryantm/.cache/nixpkgs
- ran `/nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin/bin/vpxdec --help` got 0 exit code
- ran `/nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin/bin/vpxdec --help` and found version 1.7.0
- ran `/nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin/bin/vpxenc --help` got 0 exit code
- ran `/nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin/bin/vpxenc --help` and found version 1.7.0
- found 1.7.0 with grep in /nix/store/q26np2w8fjj2cjsgkhklbywd4vvykq67-libvpx-1.7.0-bin
- directory tree listing: https://gist.github.com/feae181f96e3cbf1235f1f3b9503500c
---
 pkgs/development/libraries/libvpx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 1e96ff9bb1ad..f8894de3c752 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -58,13 +58,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport;
 
 stdenv.mkDerivation rec {
   name = "libvpx-${version}";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "webmproject";
     repo = "libvpx";
     rev = "v${version}";
-    sha256 = "10fs7xilf2bsj5bqw206lb5r5dgl84p5m6nibiirk28lmjx1i3l0";
+    sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6";
   };
 
   patchPhase = ''patchShebangs .'';

From 0a74845ce367bbc57751ae526c8ca7756a27a300 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 25 Mar 2018 16:14:48 -0500
Subject: [PATCH 0047/3370] util-linux: 2.31.1 -> 2.32

---
 pkgs/os-specific/linux/util-linux/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 618ba42e7416..9ec6c22d32a5 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -4,15 +4,15 @@
 let
   version = lib.concatStringsSep "." ([ majorVersion ]
     ++ lib.optional (patchVersion != "") patchVersion);
-  majorVersion = "2.31";
-  patchVersion = "1";
+  majorVersion = "2.32";
+  patchVersion = "";
 
 in stdenv.mkDerivation rec {
   name = "util-linux-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${majorVersion}/${name}.tar.xz";
-    sha256 = "04fzrnrr3pvqskvjn9f81y0knh0jvvqx4lmbz5pd4lfdm5pv2l8s";
+    sha256 = "0d2758kjll5xqm5fpp3sww1h66aahx161sf2b60jxqv4qymrfwvc";
   };
 
   patches = [

From b2be363fea1016a28085de22dd386307edbe0409 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 27 Mar 2018 19:43:11 +0300
Subject: [PATCH 0048/3370] nixos/hans: init

---
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/networking/hans.nix | 132 +++++++++++++++++++++
 2 files changed, 133 insertions(+)
 create mode 100644 nixos/modules/services/networking/hans.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7f28c670bed..f9e73acbc531 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -483,6 +483,7 @@
   ./services/networking/gnunet.nix
   ./services/networking/gogoclient.nix
   ./services/networking/gvpe.nix
+  ./services/networking/hans.nix
   ./services/networking/haproxy.nix
   ./services/networking/heyefi.nix
   ./services/networking/hostapd.nix
diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix
new file mode 100644
index 000000000000..24a7edaea454
--- /dev/null
+++ b/nixos/modules/services/networking/hans.nix
@@ -0,0 +1,132 @@
+# NixOS module for hans, ip over icmp daemon
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.hans;
+
+  hansUser = "hans";
+
+in
+{
+
+  ### configuration
+
+  options = {
+
+    services.hans = {
+      clients = mkOption {
+        default = {};
+        description = ''
+          Each attribute of this option defines a systemd service that
+          runs hans. Many or none may be defined.
+          The name of each service is
+          <literal>hans-<replaceable>name</replaceable></literal>
+          where <replaceable>name</replaceable> is the name of the
+          corresponding attribute name.
+        '';
+        example = literalExample ''
+        {
+          foo = {
+            server = "192.0.2.1";
+            extraConfig = "-p mysecurepassword";
+          }
+        }
+        '';
+        type = types.attrsOf (types.submodule (
+        {
+          options = {
+            server = mkOption {
+              type = types.str;
+              default = "";
+              description = "IP address of server running hans";
+              example = "192.0.2.1";
+            };
+
+            extraConfig = mkOption {
+              type = types.str;
+              default = "";
+              description = "Additional command line parameters";
+              example = "-p mysecurepassword";
+            };
+          };
+        }));
+      };
+
+      server = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = "enable hans server";
+        };
+
+        ip = mkOption {
+          type = types.str;
+          default = "";
+          description = "The assigned ip range";
+          example = "198.51.100.0";
+        };
+
+        systemPings = mkOption {
+          type = types.bool;
+          default = false;
+          description = "Respond to ordinary pings";
+        };
+
+        extraConfig = mkOption {
+          type = types.str;
+          default = "";
+          description = "Additional command line parameters";
+          example = "-p mysecurepassword";
+        };
+      };
+
+    };
+  };
+
+  ### implementation
+
+  config = mkIf (cfg.server.enable || cfg.clients != {}) {
+    boot.kernel.sysctl = optionalAttrs cfg.server.systemPings {
+      "net.ipv4.icmp_echo_ignore_all" = 1;
+    };
+
+    boot.kernelModules = [ "tun" ];
+
+    systemd.services =
+    let
+      createHansClientService = name: cfg:
+      {
+        description = "hans client - ${name}";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          RestartSec = "30s";
+          Restart = "always";
+          ExecStart = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server}";
+        };
+      };
+    in
+    listToAttrs (
+      mapAttrsToList
+        (name: value: nameValuePair "hans-${name}" (createHansClientService name value))
+        cfg.clients
+    ) // {
+      hans = mkIf (cfg.server.enable) {
+        description = "hans, ip over icmp server daemon";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig.ExecStart = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"}";
+      };
+    };
+
+    users.extraUsers = singleton {
+      name = hansUser;
+      description = "Hans daemon user";
+    };
+  };
+
+  meta.maintainers = with maintainers; [ gnidorah ];
+}

From 16c5866ceced4a9f0c5c4ea0f09d6e7d9dd5693b Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 27 Mar 2018 22:23:36 +0300
Subject: [PATCH 0049/3370] nixos/hans: passwordFile option #24288

---
 nixos/modules/services/networking/hans.nix | 39 +++++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix
index 24a7edaea454..1b54a822aaee 100644
--- a/nixos/modules/services/networking/hans.nix
+++ b/nixos/modules/services/networking/hans.nix
@@ -31,7 +31,7 @@ in
         {
           foo = {
             server = "192.0.2.1";
-            extraConfig = "-p mysecurepassword";
+            extraConfig = "-v";
           }
         }
         '';
@@ -49,8 +49,15 @@ in
               type = types.str;
               default = "";
               description = "Additional command line parameters";
-              example = "-p mysecurepassword";
+              example = "-v";
             };
+
+            passwordFile = mkOption {
+              type = types.str;
+              default = "";
+              description = "File that containts password";
+            };
+
           };
         }));
       };
@@ -79,7 +86,13 @@ in
           type = types.str;
           default = "";
           description = "Additional command line parameters";
-          example = "-p mysecurepassword";
+          example = "-v";
+        };
+
+        passwordFile = mkOption {
+          type = types.str;
+          default = "";
+          description = "File that containts password";
         };
       };
 
@@ -102,10 +115,18 @@ in
         description = "hans client - ${name}";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
+        preStart = ''
+          cat > /run/hans/${name}-script << EOF
+            #!/bin/sh
+            ${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"} 
+          EOF
+          chmod 700 /run/hans/${name}-script
+        '';
+        script = "/run/hans/${name}-script";
         serviceConfig = {
           RestartSec = "30s";
           Restart = "always";
-          ExecStart = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server}";
+          RuntimeDirectory = [ "hans" ];
         };
       };
     in
@@ -118,7 +139,15 @@ in
         description = "hans, ip over icmp server daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        serviceConfig.ExecStart = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"}";
+        preStart = ''
+          cat > /run/hans/script << EOF
+            #!/bin/sh
+            ${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}
+          EOF
+          chmod 700 /run/hans/script
+        '';
+        script = "/run/hans/script";
+        serviceConfig.RuntimeDirectory = [ "hans" ];
       };
     };
 

From 276d10dae6b14e457c8206e9e292ce8341434520 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 27 Mar 2018 22:42:37 +0300
Subject: [PATCH 0050/3370] nixos/iodine: passwordFile option #24288

---
 nixos/modules/services/networking/iodine.nix | 38 +++++++++++++++++---
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 512dbd77ae4b..66569a7e9127 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -32,7 +32,7 @@ in
           foo = {
             server = "tunnel.mdomain.com";
             relay = "8.8.8.8";
-            extraConfig = "-P mysecurepassword";
+            extraConfig = "-v";
           }
         }
         '';
@@ -57,7 +57,13 @@ in
               type = types.str;
               default = "";
               description = "Additional command line parameters";
-              example = "-P mysecurepassword -l 192.168.1.10 -p 23";
+              example = "-l 192.168.1.10 -p 23";
+            };
+
+            passwordFile = mkOption {
+              type = types.str;
+              default = "";
+              description = "File that containts password";
             };
           };
         }));
@@ -88,7 +94,13 @@ in
           type = types.str;
           default = "";
           description = "Additional command line parameters";
-          example = "-P mysecurepassword -l 192.168.1.10 -p 23";
+          example = "-l 192.168.1.10 -p 23";
+        };
+
+        passwordFile = mkOption {
+          type = types.str;
+          default = "";
+          description = "File that containts password";
         };
       };
 
@@ -108,10 +120,18 @@ in
         description = "iodine client - ${name}";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
+        preStart = ''
+          cat > /run/iodine/${name}-script << EOF
+            #!/bin/sh
+            ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server}
+          EOF
+          chmod 700 /run/iodine/${name}-script
+        '';
+        script = "/run/iodine/${name}-script";
         serviceConfig = {
           RestartSec = "30s";
           Restart = "always";
-          ExecStart = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${cfg.relay} ${cfg.server}";
+          RuntimeDirectory = [ "iodine" ];
         };
       };
     in
@@ -124,7 +144,15 @@ in
         description = "iodine, ip over dns server daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        serviceConfig.ExecStart = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${cfg.server.ip} ${cfg.server.domain}";
+        preStart = ''
+          cat > /run/iodined/script << EOF
+            #!/bin/sh
+            ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}
+          EOF
+          chmod 700 /run/iodined/script
+        '';
+        script = "/run/iodined/script";
+        serviceConfig.RuntimeDirectory = [ "iodined" ];
       };
     };
 

From 33c34aff2fb42268f45c5563f767266e27c58a9b Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 28 Mar 2018 08:32:29 +0300
Subject: [PATCH 0051/3370] hans, iodine: correct script

---
 nixos/modules/services/networking/hans.nix   | 20 ++------------------
 nixos/modules/services/networking/iodine.nix | 20 ++------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix
index 1b54a822aaee..4579154d78fa 100644
--- a/nixos/modules/services/networking/hans.nix
+++ b/nixos/modules/services/networking/hans.nix
@@ -115,18 +115,10 @@ in
         description = "hans client - ${name}";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        preStart = ''
-          cat > /run/hans/${name}-script << EOF
-            #!/bin/sh
-            ${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"} 
-          EOF
-          chmod 700 /run/hans/${name}-script
-        '';
-        script = "/run/hans/${name}-script";
+        script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.extraConfig} -c ${cfg.server} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}";
         serviceConfig = {
           RestartSec = "30s";
           Restart = "always";
-          RuntimeDirectory = [ "hans" ];
         };
       };
     in
@@ -139,15 +131,7 @@ in
         description = "hans, ip over icmp server daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        preStart = ''
-          cat > /run/hans/script << EOF
-            #!/bin/sh
-            ${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}
-          EOF
-          chmod 700 /run/hans/script
-        '';
-        script = "/run/hans/script";
-        serviceConfig.RuntimeDirectory = [ "hans" ];
+        script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}";
       };
     };
 
diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 66569a7e9127..709c36ee54f0 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -120,18 +120,10 @@ in
         description = "iodine client - ${name}";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        preStart = ''
-          cat > /run/iodine/${name}-script << EOF
-            #!/bin/sh
-            ${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server}
-          EOF
-          chmod 700 /run/iodine/${name}-script
-        '';
-        script = "/run/iodine/${name}-script";
+        script = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.relay} ${cfg.server}";
         serviceConfig = {
           RestartSec = "30s";
           Restart = "always";
-          RuntimeDirectory = [ "iodine" ];
         };
       };
     in
@@ -144,15 +136,7 @@ in
         description = "iodine, ip over dns server daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        preStart = ''
-          cat > /run/iodined/script << EOF
-            #!/bin/sh
-            ${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}
-          EOF
-          chmod 700 /run/iodined/script
-        '';
-        script = "/run/iodined/script";
-        serviceConfig.RuntimeDirectory = [ "iodined" ];
+        script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}";
       };
     };
 

From 30a56d72db90914272d023eb5ede7fb5d8c842fb Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 28 Mar 2018 09:13:09 +0300
Subject: [PATCH 0052/3370] hans: rename option

---
 nixos/modules/services/networking/hans.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix
index 4579154d78fa..56c30a6b96e1 100644
--- a/nixos/modules/services/networking/hans.nix
+++ b/nixos/modules/services/networking/hans.nix
@@ -76,10 +76,10 @@ in
           example = "198.51.100.0";
         };
 
-        systemPings = mkOption {
+        respondToSystemPings = mkOption {
           type = types.bool;
           default = false;
-          description = "Respond to ordinary pings";
+          description = "Force hans respond to ordinary pings";
         };
 
         extraConfig = mkOption {
@@ -102,7 +102,7 @@ in
   ### implementation
 
   config = mkIf (cfg.server.enable || cfg.clients != {}) {
-    boot.kernel.sysctl = optionalAttrs cfg.server.systemPings {
+    boot.kernel.sysctl = optionalAttrs cfg.server.respondToSystemPings {
       "net.ipv4.icmp_echo_ignore_all" = 1;
     };
 
@@ -131,7 +131,7 @@ in
         description = "hans, ip over icmp server daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.systemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}";
+        script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.respondToSystemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}";
       };
     };
 

From 991fd430f3b97353a6934db3926af6ba6ad33b45 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Wed, 28 Mar 2018 11:14:22 +0300
Subject: [PATCH 0053/3370] mariadb.connector-c: 2.3.4 -> 2.3.5

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 25fee035cd5d..b67cc3bbe89d 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -167,11 +167,11 @@ everything = stdenv.mkDerivation (common // {
 
 connector-c = stdenv.mkDerivation rec {
   name = "mariadb-connector-c-${version}";
-  version = "2.3.4";
+  version = "2.3.5";
 
   src = fetchurl {
     url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve";
-    sha256 = "1g1sq5knarxkfhpkcczr6qxmq12pid65cdkqnhnfs94av89hbswb";
+    sha256 = "0vvlfs56hxin130vh8pcs5w7jpv1yc6g76bhpzg88hnp4v1z8frg";
     name   = "mariadb-connector-c-${version}-src.tar.gz";
   };
 

From ea968066ef63fb127d85721525beceefbf483260 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 31 Mar 2018 02:42:32 -0700
Subject: [PATCH 0054/3370] nspr: 4.18 -> 4.19

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/nspr/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.19 with grep in /nix/store/0gx5qa3iipnwiyaixnqgd4lljy70gqx8-nspr-4.19
- directory tree listing: https://gist.github.com/9813e84e7c71d6493cbe5b433f8f7f25
---
 pkgs/development/libraries/nspr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 17805f32afb1..ce18498ee858 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl
 , CoreServices ? null }:
 
-let version = "4.18"; in
+let version = "4.19"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq";
+    sha256 = "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f";
   };
 
   outputs = [ "out" "dev" ];

From 0e48f5ffb3f35707b6dc1001da5ed31c05af1ee9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 31 Mar 2018 03:25:35 -0700
Subject: [PATCH 0055/3370] libinput: 1.10.0 -> 1.10.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libinput/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/h8pwbpjg88axygjj65y4y7lbq2z0m5lp-libinput-1.10.3/bin/libinput -h` got 0 exit code
- ran `/nix/store/h8pwbpjg88axygjj65y4y7lbq2z0m5lp-libinput-1.10.3/bin/libinput --help` got 0 exit code
- found 1.10.3 with grep in /nix/store/h8pwbpjg88axygjj65y4y7lbq2z0m5lp-libinput-1.10.3
- directory tree listing: https://gist.github.com/27c5534de9dd9c8e7237f21c2dc8e824
---
 pkgs/development/libraries/libinput/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 0e2458a38959..6773b7c1b1f1 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -16,11 +16,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.10.0";
+  version = "1.10.3";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0mrzsf0349d1g68lizkzxw7vaw459fl8xhl7v0s8njb31hp2riy2";
+    sha256 = "0002xk9cqzpqrlhgav1wp8nimsbp9d2w8rd8mgygczq2hjar0lhd";
   };
 
   outputs = [ "out" "dev" ];

From 46a99d140927686fe5c04e1dd96a6cc5d907c4d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 31 Mar 2018 03:59:09 -0700
Subject: [PATCH 0056/3370] libdvdcss: 1.4.1 -> 1.4.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libdvdcss/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.2 with grep in /nix/store/4fb959a9v1a5nv65smypcp3vxk3j1jhl-libdvdcss-1.4.2
- directory tree listing: https://gist.github.com/8d034c11cb818a43ba4b289989a957a3
---
 pkgs/development/libraries/libdvdcss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index 66cb5215a8a9..f18e0622d0cc 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libdvdcss-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit;
 
   src = fetchurl {
     url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
-    sha256 = "1b7awvyahivglp7qmgx2g5005kc5npv257gw7wxdprjsnx93f1zb";
+    sha256 = "0x957zzpf4w2cp8zlk29prj8i2q6hay3lzdzsyz8y3cwxivyvhkq";
   };
 
   meta = with stdenv.lib; {

From 2f9c38c05669bb8768a7876b9ced7794ce6d31d1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 31 Mar 2018 04:47:05 -0700
Subject: [PATCH 0057/3370] libevdev: 1.5.8 -> 1.5.9

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libevdev/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/sqwg2pbpy19i7vwl45yw966wwh48kg60-libevdev-1.5.9/bin/libevdev-tweak-device -h` got 0 exit code
- ran `/nix/store/sqwg2pbpy19i7vwl45yw966wwh48kg60-libevdev-1.5.9/bin/libevdev-tweak-device --help` got 0 exit code
- found 1.5.9 with grep in /nix/store/sqwg2pbpy19i7vwl45yw966wwh48kg60-libevdev-1.5.9
- directory tree listing: https://gist.github.com/060e1adaed5f9993a82d48c08503be7c
---
 pkgs/development/libraries/libevdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index 5bcb9a1ede22..2ef1d3965ce9 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.5.8";
+  name = "libevdev-1.5.9";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "0vac7n1miqdprikq4g63vsk681q8v416r0nbh2xai7b08qgdi0v0";
+    sha256 = "0xca343ff12wh6nsq76r0nbsfrm8dypjrzm4fqz9vv9v8i8kfrp1";
   };
 
   buildInputs = [ python ];

From 2d57df881fc15d3e4806490af0cce1760d964c5e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 31 Mar 2018 05:02:08 -0700
Subject: [PATCH 0058/3370] libwacom: 0.28 -> 0.29

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libwacom/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/pdk4f0vsb3ynh1jdvqfinji6grl47m8m-libwacom-0.29/bin/libwacom-list-local-devices -h` got 0 exit code
- ran `/nix/store/pdk4f0vsb3ynh1jdvqfinji6grl47m8m-libwacom-0.29/bin/libwacom-list-local-devices --help` got 0 exit code
- ran `/nix/store/pdk4f0vsb3ynh1jdvqfinji6grl47m8m-libwacom-0.29/bin/libwacom-list-local-devices help` got 0 exit code
- found 0.29 with grep in /nix/store/pdk4f0vsb3ynh1jdvqfinji6grl47m8m-libwacom-0.29
- directory tree listing: https://gist.github.com/cc947710a926712edfc2c49d7f55510b
---
 pkgs/development/libraries/libwacom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix
index 8e36edff7edd..cc3f19ab7d31 100644
--- a/pkgs/development/libraries/libwacom/default.nix
+++ b/pkgs/development/libraries/libwacom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libwacom-${version}";
-  version = "0.28";
+  version = "0.29";
 
   src = fetchurl {
     url = "mirror://sourceforge/linuxwacom/libwacom/${name}.tar.bz2";
-    sha256 = "1vv768870597rvwxdb59v6pjn1pxaxg4r6znbb5j3cl828q35mp7";
+    sha256 = "1diklgcjhmvcxi9p1ifp6wcnyr6k7z9jhrlzfhzjqd6zipk01slw";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 16affca0be6f32ea5b38e1c8ef2658dce9fa27de Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 31 Mar 2018 06:51:21 -0700
Subject: [PATCH 0059/3370] harfbuzz-icu: 1.7.5 -> 1.7.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/harfbuzz-icu/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.7.6 with grep in /nix/store/9dzws8q45r5sybzlcz8xc9gil9ng0wf6-harfbuzz-icu-1.7.6
- found 1.7.6 in filename of file in /nix/store/9dzws8q45r5sybzlcz8xc9gil9ng0wf6-harfbuzz-icu-1.7.6
- directory tree listing: https://gist.github.com/660379e3d103a344b19913754635a124
---
 pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index bb68ae94a7f0..2c59fb3f9ea6 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "1.7.5";
+  version = "1.7.6";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
-    sha256 = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563";
+    sha256 = "16rf7qwgy1gza74v2ws79zdwwb1lpvgz2abwwm8ws9j82cwysyys";
   };
 
   outputs = [ "out" "dev" ];

From 47e497b6692f979fee1addead853c2eac102b460 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 1 Apr 2018 01:59:42 -0700
Subject: [PATCH 0060/3370] libidn: 1.33 -> 1.34

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libidn/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn -h` got 0 exit code
- ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn --help` got 0 exit code
- ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn help` got 0 exit code
- ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn -V` and found version 1.34
- ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn --version` and found version 1.34
- ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn -h` and found version 1.34
- ran `/nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin/bin/idn --help` and found version 1.34
- found 1.34 with grep in /nix/store/0i5mh79ayn9s5hzk33qc4r46iv6vq39b-libidn-1.34-bin
- directory tree listing: https://gist.github.com/2097e7f4c50acbee75a30738c68f417c
---
 pkgs/development/libraries/libidn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 54d669f1913b..185cd2ede84c 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "libidn-1.33";
+  name = "libidn-1.34";
 
   src = fetchurl {
     url = "mirror://gnu/libidn/${name}.tar.gz";
-    sha256 = "068fjg2arlppjqqpzd714n1lf6gxkpac9v5yyvp1qwmv6nvam9s4";
+    sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];

From 8a77a0ae0ef7a430ebc7165bdb42936ee8ea352f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 1 Apr 2018 20:32:33 +0000
Subject: [PATCH 0061/3370] go_1_{9,10}: disable TestWritevError test

---
 pkgs/development/compilers/go/1.10.nix | 2 ++
 pkgs/development/compilers/go/1.9.nix  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 145f6a17978d..d99d82277bc7 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
     sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
     # Remove cert tests that conflict with NixOS's cert resolution
     sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
+    # TestWritevError hangs sometimes
+    sed -i '/TestWritevError/areturn' src/net/writev_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index c866212170c4..4db67c927386 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
     sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go
     # Remove cert tests that conflict with NixOS's cert resolution
     sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
+    # TestWritevError hangs sometimes
+    sed -i '/TestWritevError/areturn' src/net/writev_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go

From 9e11e4ba64a209f3bc5009444878a60bc6849762 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Sun, 1 Apr 2018 20:39:12 +0000
Subject: [PATCH 0062/3370] go_1_{9,10}: disable TestVariousDeadlines test

---
 pkgs/development/compilers/go/1.10.nix | 2 ++
 pkgs/development/compilers/go/1.9.nix  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index d99d82277bc7..b0fdd0c88bf7 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
     sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
     # TestWritevError hangs sometimes
     sed -i '/TestWritevError/areturn' src/net/writev_test.go
+    # TestVariousDeadlines fails sometimes
+    sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 4db67c927386..1fa38b99747e 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
     sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go
     # TestWritevError hangs sometimes
     sed -i '/TestWritevError/areturn' src/net/writev_test.go
+    # TestVariousDeadlines fails sometimes
+    sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go
 
     sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
     sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go

From 731d6486cb1bc35683616ac5aab95019326ea9fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 2 Apr 2018 07:01:00 -0700
Subject: [PATCH 0063/3370] gnused: 4.4 -> 4.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gnused/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/71dzrirkbkpna9l1mcbjjhdws2y1g1hj-gnused-4.5/bin/sed --help` got 0 exit code
- ran `/nix/store/71dzrirkbkpna9l1mcbjjhdws2y1g1hj-gnused-4.5/bin/sed --version` and found version 4.5
- ran `/nix/store/71dzrirkbkpna9l1mcbjjhdws2y1g1hj-gnused-4.5/bin/sed --help` and found version 4.5
- found 4.5 with grep in /nix/store/71dzrirkbkpna9l1mcbjjhdws2y1g1hj-gnused-4.5
- directory tree listing: https://gist.github.com/20a2031e4b27616ba71439622e5fe4d1
---
 pkgs/tools/text/gnused/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 72d632533ffa..47193e61615d 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnused-${version}";
-  version = "4.4";
+  version = "4.5";
 
   src = fetchurl {
     url = "mirror://gnu/sed/sed-${version}.tar.xz";
-    sha256 = "0fv88bcnraixc8jvpacvxshi30p5x9m7yb8ns1hfv07hmb2ypmnb";
+    sha256 = "0h3b2jfj57wmz680vkbyavlsrkak556qhvs7m7fdlawwhg477bbs";
   };
 
   outputs = [ "out" "info" ];

From 972dce4dc5a75a1fcf3e2173421f5ef37bf419b2 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Apr 2018 10:19:43 -0500
Subject: [PATCH 0064/3370] ruby: 2.3.6 -> 2.3.7

---
 pkgs/development/interpreters/ruby/default.nix   | 8 ++++----
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4ebc488d9988..d80ec3053162 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -94,7 +94,7 @@ let
           # support is disabled (if it's enabled, we already have it) and we're
           # running on darwin
           ++ (op (!cursesSupport && stdenv.isDarwin) readline)
-          ++ (op (isRuby25 && stdenv.isDarwin) Foundation)
+          ++ (op stdenv.isDarwin Foundation)
           ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]));
 
         enableParallelBuilding = true;
@@ -200,10 +200,10 @@ let
 
 in {
   ruby_2_3 = generic {
-    version = rubyVersion "2" "3" "6" "";
+    version = rubyVersion "2" "3" "7" "";
     sha256 = {
-      src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3";
-      git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds";
+      src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m";
+      git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index fc79761252f2..e672402ffb67 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -6,7 +6,7 @@ rec {
     "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.3.6" = ops useRailsExpress [
+  "2.3.7" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"

From 4c1e987b95833e9f7d93498e455f6df9b3b27fdb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Apr 2018 10:21:51 -0500
Subject: [PATCH 0065/3370] ruby: 2.4.3 -> 2.4.4

---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d80ec3053162..edf8ec693317 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -208,10 +208,10 @@ in {
   };
 
   ruby_2_4 = generic {
-    version = rubyVersion "2" "4" "3" "";
+    version = rubyVersion "2" "4" "4" "";
     sha256 = {
-      src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx";
-      git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m";
+      src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5";
+      git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5";
     };
   };
 
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index e672402ffb67..e52091fd0687 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -11,7 +11,7 @@ rec {
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.4.3" = ops useRailsExpress [
+  "2.4.4" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"

From 1a35b2adc10f429afb7b81e0906d9b17156ff142 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Mon, 2 Apr 2018 10:22:25 -0500
Subject: [PATCH 0066/3370] ruby: 2.5.0 -> 2.5.1

---
 pkgs/development/interpreters/ruby/default.nix   | 6 +++---
 pkgs/development/interpreters/ruby/patchsets.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index edf8ec693317..0df7ec0a7959 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -216,10 +216,10 @@ in {
   };
 
   ruby_2_5 = generic {
-    version = rubyVersion "2" "5" "0" "";
+    version = rubyVersion "2" "5" "1" "";
     sha256 = {
-      src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6";
-      git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd";
+      src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s";
+      git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index e52091fd0687..e53f231884d9 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -16,7 +16,7 @@ rec {
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.5.0" = ops useRailsExpress [
+  "2.5.1" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"

From a683d2cd00780cf7d20caeeef44deb4cc60d2add Mon Sep 17 00:00:00 2001
From: Reuben D'Netto <rdnetto@gmail.com>
Date: Thu, 5 Apr 2018 09:18:20 +1000
Subject: [PATCH 0067/3370] Modified .editorconfig to apply indentation style
 to docbook files

---
 .editorconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 7b40ff1ff568..f272739f240a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,8 +13,8 @@ charset = utf-8
 
 # see https://nixos.org/nixpkgs/manual/#chap-conventions
 
-# Match nix/ruby files, set indent to spaces with width of two
-[*.{nix,rb}]
+# Match nix/ruby/docbook files, set indent to spaces with width of two
+[*.{nix,rb,xml}]
 indent_style = space
 indent_size = 2
 

From add9f5cf4a7affb20de29cfc74d0c91621f35bd4 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Thu, 5 Apr 2018 23:16:49 +0200
Subject: [PATCH 0068/3370] gmrender-resurrect: init

---
 .../networking/gmrender-resurrect/default.nix | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/networking/gmrender-resurrect/default.nix

diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix
new file mode 100644
index 000000000000..6926f1522c71
--- /dev/null
+++ b/pkgs/tools/networking/gmrender-resurrect/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, makeWrapper
+, gstreamer, gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav, libupnp }:
+
+let version = "4f221e6b85abf85957b547436e982d7a501a1718"; in
+
+stdenv.mkDerivation {
+  name = "gmrender-resurrect-${version}";
+
+  src = fetchFromGitHub {
+    owner = "hzeller";
+    repo = "gmrender-resurrect";
+    rev = "${version}";
+    sha256 = "1dmdhyz27bh74qmvncfd3kw7zqwnd05bhxcfjjav98z5qrxdygj4";
+  };
+
+  preConfigurePhases = "autoconfPhase";
+
+  autoconfPhase = "./autogen.sh";
+
+  buildInputs = [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav libupnp ];
+  nativeBuildInputs = [ autoconf automake pkgconfig makeWrapper ];
+
+  postInstall = ''
+    for prog in "$out/bin/"*; do
+        wrapProgram "$prog" --suffix GST_PLUGIN_SYSTEM_PATH : "${gst-plugins-base}/lib/gstreamer-1.0:${gst-plugins-good}/lib/gstreamer-1.0:${gst-plugins-bad}/lib/gstreamer-1.0:${gst-plugins-ugly}/lib/gstreamer-1.0:${gst-libav}/lib/gstreamer-1.0"
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer";
+    homepage = https://github.com/hzeller/gmrender-resurrect;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.koral ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96d3ecee2c78..f18882203bf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2513,6 +2513,10 @@ with pkgs;
 
   glxinfo = callPackage ../tools/graphics/glxinfo { };
 
+  gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav;
+  };
+
   gmvault = callPackage ../tools/networking/gmvault { };
 
   gnash = callPackage ../misc/gnash { };

From 4292c633b438c10ad45030fa656b40cf3dfd6e44 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 6 Apr 2018 10:18:21 -0700
Subject: [PATCH 0069/3370] libuv: 1.19.2 -> 1.20.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libuv/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.20.0 with grep in /nix/store/r6j9x782s7pl6a5055icynmzk1991imw-libuv-1.20.0
- directory tree listing: https://gist.github.com/cff77ff2c13f732c2027bb680a833c5e
---
 pkgs/development/libraries/libuv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index e8877c7f54b6..e6b29a6c36be 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,14 +2,14 @@
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.19.2";
+  version = "1.20.0";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "118r8wigm65107fm7kzfz7gc4awy8xxg0knvwnshx1j40ks08x9z";
+    sha256 = "0bjxny5bjl0qy978i9n2b96vd72h9dd7ghylvhfsi1aqfwc0s1qz";
   };
 
   postPatch = let

From fdbd53e97c9821420a14cd814d92f5f0ca1947b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 6 Apr 2018 14:12:19 -0700
Subject: [PATCH 0070/3370] hamlib: 1.2.15.3 -> 3.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/hamlib/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctl -h’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctl --help’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctl help’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctld -h’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigctld --help’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigmem -h’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigmem --help’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigsmtr -h’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigsmtr --help’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigswr -h’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rigswr --help’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctl -h’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctl --help’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctl help’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctld -h’ got 0 exit code
- ran ‘/nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2/bin/rotctld --help’ got 0 exit code
- found 3.2 with grep in /nix/store/aa53dqx342j0ix0dxhkcmp5sqcjvggnp-hamlib-3.2
- directory tree listing: https://gist.github.com/af20bb24f2d2a1b901f88663a7966181
---
 pkgs/development/libraries/hamlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix
index 3ea70fd49908..9825d6ed64a9 100644
--- a/pkgs/development/libraries/hamlib/default.nix
+++ b/pkgs/development/libraries/hamlib/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   pname = "hamlib";
-  version = "1.2.15.3";
+  version = "3.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "0ppp6fc2h9d8p30j2s9wlqd620kmnny4wd8fc3jxd6gxwi4lbjm2";
+    sha256 = "07ddsykbliiv0p717z1h5vzmvsx6lm75j32rhvmwqxp8m3kbap5m";
   };
 
   buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2

From 80cd26375e7e28a0a9dc5100198b644f166369c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 7 Apr 2018 18:39:32 -0700
Subject: [PATCH 0071/3370] dhcp: 4.3.6-P1 -> 4.4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dhcp/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/.dhclient-script-wrapped -h’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/.dhclient-script-wrapped --help’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/.dhclient-script-wrapped help’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient -h’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient --help’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient --version’ and found version 4.4.1
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient-script -h’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient-script --help’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhclient-script help’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcpd -h’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcpd --help’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcpd --version’ and found version 4.4.1
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcrelay -h’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcrelay --help’ got 0 exit code
- ran ‘/nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1/bin/dhcrelay --version’ and found version 4.4.1
- found 4.4.1 with grep in /nix/store/b2fh17aq0cjj7yrwxs1vgjpas8v3pr9s-dhcp-4.4.1
- directory tree listing: https://gist.github.com/3f68e1eba2f701473b249d35042cc502
---
 pkgs/tools/networking/dhcp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix
index 8b1ac864a434..1ebf57997d00 100644
--- a/pkgs/tools/networking/dhcp/default.nix
+++ b/pkgs/tools/networking/dhcp/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "dhcp-${version}";
-  version = "4.3.6-P1";
+  version = "4.4.1";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz";
-    sha256 = "1hx3az6ckvgvybr1ag4k9kqr8zfcpzcww4vpw5gz0mi8y2z7gl9g";
+    sha256 = "025nfqx4zwdgv4b3rkw26ihcj312vir08jk6yi57ndmb4a4m08ia";
   };
 
   patches =

From cc1ab7413d588f5dc3956b4c705a23f6af474e56 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 29 Mar 2018 22:15:01 +0300
Subject: [PATCH 0072/3370] calibre: remove unnecessary patch

In addition to bumping the version, remove a patch which made
self.update_checker None. This caused errors that showed on the terminal after
closing Calibre (if it was launched from a terminal).
---
 .../misc/calibre/no_updates_dialog.patch             | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch
index 4d37c3b642f5..faaaf2c19949 100644
--- a/pkgs/applications/misc/calibre/no_updates_dialog.patch
+++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch
@@ -13,15 +13,3 @@ diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre
      parser.add_option('--ignore-plugins', default=False, action='store_true',
              help=_('Ignore custom plugins, useful if you installed a plugin'
                  ' that is preventing calibre from starting'))
-diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
---- calibre-2.9.0.orig/src/calibre/gui2/update.py	2014-11-09 20:09:54.082231864 +0800
-+++ calibre-2.9.0/src/calibre/gui2/update.py	2014-11-09 20:17:49.954767115 +0800
-@@ -154,6 +154,8 @@
-             self.update_checker.signal.update_found.connect(self.update_found,
-                     type=Qt.QueuedConnection)
-             self.update_checker.start()
-+        else:
-+            self.update_checker = None
- 
-     def recalc_update_label(self, number_of_plugin_updates):
-         self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)

From f3657a05d82082e4bf1610c69216f71bbe731253 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sun, 8 Apr 2018 00:18:56 +0100
Subject: [PATCH 0073/3370] minidlna nixos module: add loglevel config

---
 .../modules/services/networking/minidlna.nix  | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index 61d063dbfe0e..6401631bf620 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -1,23 +1,16 @@
 # Module for MiniDLNA, a simple DLNA server.
-
 { config, lib, pkgs, ... }:
 
 with lib;
 
 let
-
   cfg = config.services.minidlna;
-
   port = 8200;
-
 in
 
 {
-
   ###### interface
-
   options = {
-
     services.minidlna.enable = mkOption {
       type = types.bool;
       default = false;
@@ -43,24 +36,48 @@ in
         '';
     };
 
+    services.minidlna.loglevel = mkOption {
+      type = types.str;
+      default = "warn";
+      example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn";
+      description =
+        ''
+          Defines the type of messages that should be logged, and down to
+          which level of importance they should be considered.
+
+          The possible types are “artwork”, “database”, “general”, “http”,
+          “inotify”, “metadata”, “scanner”, “ssdp” and “tivo”.
+
+          The levels are “off”, “fatal”, “error”, “warn”, “info” and
+          “debug”, listed here in order of decreasing importance.  “off”
+          turns off logging messages entirely, “fatal” logs the most
+          critical messages only, and so on down to “debug” that logs every
+          single messages.
+
+          The types are comma-separated, followed by an equal sign (‘=’),
+          followed by a level that applies to the preceding types. This can
+          be repeated, separating each of these constructs with a comma.
+
+          Defaults to “general,artwork,database,inotify,scanner,metadata,
+          http,ssdp,tivo=warn” which logs every type of message at the
+          “warn” level.
+        '';
+    };
+
     services.minidlna.config = mkOption {
       type = types.lines;
       description = "The contents of MiniDLNA's configuration file.";
     };
-
   };
 
-
   ###### implementation
-
   config = mkIf cfg.enable {
-
     services.minidlna.config =
       ''
         port=${toString port}
         friendly_name=${config.networking.hostName} MiniDLNA
         db_dir=/var/cache/minidlna
-        log_level=warn
+        log_level=${cfg.loglevel}
         inotify=yes
         ${concatMapStrings (dir: ''
           media_dir=${dir}
@@ -98,7 +115,5 @@ in
               " -f ${pkgs.writeText "minidlna.conf" cfg.config}";
           };
       };
-
   };
-
 }

From 759e66f63df4532e96ad1f0dd56b34364dd9da80 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Mon, 9 Apr 2018 11:39:30 -0700
Subject: [PATCH 0074/3370] btrbk: fix SSH filter script

---
 pkgs/tools/backup/btrbk/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index ace543186651..dd10eeb8e5a9 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
-, asciidoc-full, makeWrapper }:
+, utillinux, asciidoc-full, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
       --replace "/bin/date" "${coreutils}/bin/date" \
       --replace "/bin/echo" "${coreutils}/bin/echo" \
       --replace '$btrbk' 'btrbk'
+
+    # Fix SSH filter script
+    sed -i '/^export PATH/d' ssh_filter_btrbk.sh
+    substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger
   '';
 
   preFixup = ''

From d031891c6bf151ef31517c1bc633ff21ecee864a Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Mon, 9 Apr 2018 13:57:42 -0700
Subject: [PATCH 0075/3370] btrbk: clean up build inputs

---
 pkgs/tools/backup/btrbk/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix
index dd10eeb8e5a9..958afa3f6a9c 100644
--- a/pkgs/tools/backup/btrbk/default.nix
+++ b/pkgs/tools/backup/btrbk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
-, utillinux, asciidoc-full, makeWrapper }:
+, utillinux, asciidoc, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "btrbk-${version}";
@@ -10,7 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "04ahfm52vcf1w0c2km0wdgj2jpffp45bpawczmygcg8fdcm021lp";
   };
 
-  buildInputs = with perlPackages; [ asciidoc-full makeWrapper perl DateCalc ];
+  nativeBuildInputs = [ asciidoc makeWrapper ];
+
+  buildInputs = with perlPackages; [ perl DateCalc ];
 
   preInstall = ''
     for f in $(find . -name Makefile); do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c493337c161..1ff50d20958c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -886,7 +886,9 @@ with pkgs;
 
   btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {};
 
-  btrbk = callPackage ../tools/backup/btrbk { };
+  btrbk = callPackage ../tools/backup/btrbk {
+    asciidoc = asciidoc-full;
+  };
 
   buildtorrent = callPackage ../tools/misc/buildtorrent { };
 

From f43da349ba0722784ad7088ddddd4812a7fa9990 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 10 Apr 2018 09:41:36 -0700
Subject: [PATCH 0076/3370] wayland: 1.14.0 -> 1.15.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wayland/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner -h’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner --help’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner help’ got 0 exit code
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner -v’ and found version 1.15.0
- ran ‘/nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0/bin/wayland-scanner --version’ and found version 1.15.0
- found 1.15.0 with grep in /nix/store/ij8fn0all1sl84wy94wpvc0ih0c1bidq-wayland-1.15.0
- directory tree listing: https://gist.github.com/4f5bd9b49f975338e758858eb2b89e4d
---
 pkgs/development/libraries/wayland/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index a5b7a6a99ce4..bbc33f33e701 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -8,11 +8,11 @@ assert expat != null;
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchurl {
     url = "https://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1f3sla6h0bw15fz8pjc67jhwj7pwmfdc7qlj42j5k9v116ycm07d";
+    sha256 = "1c5fnys8hi71cnzjv5k7j0r8gx80p0yyqlrpmn06mmarhnxvwgzb";
   };
 
   configureFlags = [ "--with-scanner" "--disable-documentation" ];

From f94c9c545918f39cb8a84a40049077c542dc1730 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 10 Apr 2018 18:53:09 -0500
Subject: [PATCH 0077/3370] unix-tools: provide getconf and getent

---
 pkgs/top-level/all-packages.nix | 11 ++---------
 pkgs/top-level/unix-tools.nix   |  7 +++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 72a2fb90f4b8..7f7c74611e1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13703,14 +13703,6 @@ with pkgs;
   musl-fts = callPackage ../os-specific/linux/musl/fts.nix { };
   musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { };
   musl-getent = callPackage ../os-specific/linux/musl/getent.nix { };
-  getent =
-    if hostPlatform.isMusl then musl-getent
-    # This may not be right on other platforms, but preserves existing behavior
-    else /* if hostPlatform.libc == "glibc" then */ glibc.bin;
-
-  getconf =
-    if hostPlatform.isMusl then musl-getconf
-    else lib.getBin stdenv.cc.libc;
 
   nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
              else unixtools.nettools;
@@ -21228,5 +21220,6 @@ with pkgs;
   # Unix tools
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
   inherit (unixtools) hexdump ps logger eject modprobe umount
-                      mount wall hostname more sysctl;
+                      mount wall hostname more sysctl getconf
+                      getent;
 }
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 0d6e8d1c6c2d..69bd6b7a7cca 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -44,6 +44,13 @@ in rec {
   eject = singleBinary "eject" {
     linux = pkgs.utillinux;
   };
+  getconf = singleBinary "getconf" {
+    linux = pkgs.musl-getconf;
+    darwin = pkgs.system_cmds;
+  };
+  getent = singleBinary "getconf" {
+    linux = pkgs.musl-getent;
+  };
   getopt = singleBinary "getopt" {
     linux = pkgs.utillinux;
     darwin = pkgs.getopt;

From 037e5d863b6797270607cd7e148bff71e6eb384e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 10 Apr 2018 18:54:11 -0500
Subject: [PATCH 0078/3370] rabbitmq-server: use provided getconf

---
 pkgs/servers/amqp/rabbitmq-server/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix
index 3d4a8902c918..4cc187846d0d 100644
--- a/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/pkgs/servers/amqp/rabbitmq-server/default.nix
@@ -1,17 +1,11 @@
 { stdenv, fetchurl, runCommand
 , erlang, python, libxml2, libxslt, xmlto
 , docbook_xml_dtd_45, docbook_xsl, zip, unzip, rsync
-
 , AppKit, Carbon, Cocoa
+, getconf
 }:
 
-let
-  # we only need that one glibc binary (28k instead of 2.7M)
-  getconf = runCommand "getconf" {} ''
-    install -D ${stdenv.lib.getBin stdenv.cc.libc}/bin/getconf $out/bin/getconf
-  '';
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "rabbitmq-server-${version}";
   version = "3.6.15";
 

From 70c378891e923f8983d905fb76d30bf86b03a5c8 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 10 Apr 2018 18:55:25 -0500
Subject: [PATCH 0079/3370] unix-tools: copy instead of linking

This prevents big closures from getting pulled in.
---
 pkgs/top-level/unix-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 69bd6b7a7cca..919ff9e81060 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -24,7 +24,7 @@ let
         exit 1
       fi
 
-      ln -s "${provider}" "$out/bin/${cmd}"
+      cp "${provider}" "$out/bin/${cmd}"
     '';
 
 in rec {

From 50bdc5a6128a84dbf5b45543cdb306296fda74d4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 10 Apr 2018 21:18:42 -0500
Subject: [PATCH 0080/3370] unix-tools: fix typo

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

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 919ff9e81060..19e315f6f603 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -46,7 +46,7 @@ in rec {
   };
   getconf = singleBinary "getconf" {
     linux = pkgs.musl-getconf;
-    darwin = pkgs.system_cmds;
+    darwin = pkgs.darwin.system_cmds;
   };
   getent = singleBinary "getconf" {
     linux = pkgs.musl-getent;

From 4ae2488e80e71c41b2aaa98e82e7d37b5df19eaf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 10 Apr 2018 23:20:33 -0700
Subject: [PATCH 0081/3370] grpc: 1.10.0 -> 1.10.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/grpc/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive -h’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive --help’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/check_epollexclusive help’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables -h’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables --help’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_hpack_tables help’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters -h’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters --help’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_legal_metadata_characters help’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables -h’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables --help’ got 0 exit code
- ran ‘/nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1/bin/gen_percent_encoding_tables help’ got 0 exit code
- found 1.10.1 with grep in /nix/store/w2ilavnccdbnkb9dzh3md863fqmdjdbw-grpc-1.10.1
- directory tree listing: https://gist.github.com/dc70d4a21aaa0b79ffe8dca6d80841f0
---
 pkgs/development/libraries/grpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 9f9166e43c9f..fc1f186a219e 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
 
 stdenv.mkDerivation rec {
-  version = "1.10.0";
+  version = "1.10.1";
   name = "grpc-${version}";
   src = fetchurl {
     url = "https://github.com/grpc/grpc/archive/v${version}.tar.gz";
-    sha256 = "0wngrb44bpryrvrnx5y1ncrhi2097qla929wqjwvs0razbk3v9rr";
+    sha256 = "0l721r24d6wz889vz4g6i67ijz0zc0ah967i3immi90zdmjwlyjg";
   };
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

From c03cb44ad1e04b964f0026265b5e09181587e22e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 10 Apr 2018 23:48:52 -0700
Subject: [PATCH 0082/3370] fox_1_6: 1.6.56 -> 1.6.57
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fox/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/0d83j376zvh006b5slmgdx86bcm3dxkm-fox-1.6.57/bin/reswrap -h’ got 0 exit code
- ran ‘/nix/store/0d83j376zvh006b5slmgdx86bcm3dxkm-fox-1.6.57/bin/reswrap --help’ got 0 exit code
- ran ‘/nix/store/0d83j376zvh006b5slmgdx86bcm3dxkm-fox-1.6.57/bin/fox-config --version’ and found version 1.6.57
- found 1.6.57 with grep in /nix/store/0d83j376zvh006b5slmgdx86bcm3dxkm-fox-1.6.57
- directory tree listing: https://gist.github.com/baa2d8696211116ff0be92b664965741
---
 pkgs/development/libraries/fox/fox-1.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix
index a0ba95480129..4f1e0eaee7fb 100644
--- a/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/pkgs/development/libraries/fox/fox-1.6.nix
@@ -3,7 +3,7 @@
 , CoreServices }:
 
 let
-  version = "1.6.56";
+  version = "1.6.57";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.fox-toolkit.org/pub/${name}.tar.gz";
-    sha256 = "1ckcb12gblz1ad1371ah1qirxn3r9zdngh9w0357hsqfmkyfa5y5";
+    sha256 = "08w98m6wjadraw1pi13igzagly4b2nfa57kdqdnkjfhgkvg1bvv5";
   };
 
   buildInputs = [

From 3e3a26e0cc3ef09c0124319b17daceeb02630050 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 11 Apr 2018 00:07:54 -0700
Subject: [PATCH 0083/3370] gdbm: 1.14 -> 1.14.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gdbm/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool -h’ got 0 exit code
- ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool --help’ got 0 exit code
- ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbmtool help’ got 0 exit code
- ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_load -h’ got 0 exit code
- ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_load --help’ got 0 exit code
- ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_dump -h’ got 0 exit code
- ran ‘/nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1/bin/gdbm_dump --help’ got 0 exit code
- found 1.14.1 with grep in /nix/store/rxca8g769fj1zydp1673w0v09605a5ak-gdbm-1.14.1
- directory tree listing: https://gist.github.com/b8277402d4a886ce7a0ee2baa8451e83
---
 pkgs/development/libraries/gdbm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix
index 310aaa430daf..3fd0bb082440 100644
--- a/pkgs/development/libraries/gdbm/default.nix
+++ b/pkgs/development/libraries/gdbm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, buildPlatform, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "gdbm-1.14";
+  name = "gdbm-1.14.1";
 
   src = fetchurl {
     url = "mirror://gnu/gdbm/${name}.tar.gz";
-    sha256 = "02dakgrq93xwgln8qfv3vs5jyz5yvds5nyzkx6rhg9v585x478dd";
+    sha256 = "0pxwz3jlwvglq2mrbxvrjgr8pa0aj73p3v9sxmdlj570zw0gzknd";
   };
 
   doCheck = true; # not cross;

From 0d2f4615af793f0bdee69b24db7e536b379fa572 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 11 Apr 2018 00:38:26 -0700
Subject: [PATCH 0084/3370] dbus-glib: 0.108 -> 0.110

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dbus-glib/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.110 with grep in /nix/store/745gjl73bz311i35h57d3slqd320bvjr-dbus-glib-0.110
- directory tree listing: https://gist.github.com/87d5b9565bc23aa3acfd68aaa8d88725
---
 pkgs/development/libraries/dbus-glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 4d27552d7351..5d78e084e983 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, expat, gettext, libiconv, dbus, glib }:
 
 stdenv.mkDerivation rec {
-  name = "dbus-glib-0.108";
+  name = "dbus-glib-0.110";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/dbus-glib/${name}.tar.gz";
-    sha256 = "0b307hw9j41npzr6niw1bs6ryp87m5yafg492gqwvsaj4dz0qd4z";
+    sha256 = "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From a45dad98119c69644d61e77e3c011e975aa7f4cb Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Wed, 11 Apr 2018 14:12:47 +0200
Subject: [PATCH 0085/3370] tealdeer: init at 1.0.0

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

diff --git a/pkgs/tools/misc/tealdeer/default.nix b/pkgs/tools/misc/tealdeer/default.nix
new file mode 100644
index 000000000000..fe0aa6cc3089
--- /dev/null
+++ b/pkgs/tools/misc/tealdeer/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, cacert, curl }:
+
+rustPlatform.buildRustPackage rec {
+  name = "tealdeer-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "dbrgn";
+    repo = "tealdeer";
+    rev = "v${version}";
+    sha256 = "0mkcja9agkbj2i93hx01r77w66ca805v4wvivcnrqmzid001717v";
+  };
+
+  cargoSha256 = "1qrvic7b6g3f3gjzx7x97ipp7ppa79c0aawn0lsav0c9xxzl44jq";
+
+  buildInputs = [ openssl cacert curl ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  
+  NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+
+  # disable tests for now since one needs network
+  # what is unavailable in sandbox build
+  # and i can't disable just this one
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "An implementation of tldr in Rust";
+    homepage = "https://github.com/dbrgn/tealdeer";
+    maintainers = with maintainers; [ davidak ];
+    license = with licenses; [ asl20 mit ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9bbbbf396c5..2ebd27c93f22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2089,6 +2089,8 @@ with pkgs;
 
   mcrcon = callPackage ../tools/networking/mcrcon {};
 
+  tealdeer = callPackage ../tools/misc/tealdeer/default.nix { };
+
   uudeview = callPackage ../tools/misc/uudeview { };
 
   uutils-coreutils = callPackage ../tools/misc/uutils-coreutils {

From 260194193c333a3d939a07989f160f3d6e1b3047 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 22 Mar 2018 18:06:10 -0500
Subject: [PATCH 0086/3370] git: 2.16.2 -> 2.16.3

---
 .../version-management/git-and-tools/git/default.nix      | 4 ++--
 .../git-and-tools/git/git-sh-i18n.patch                   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 38509dddeb8f..b336f72c7ac1 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.16.2";
+  version = "2.16.3";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "05y7480f2p7fkncbhf08zz56jbykcp0ia5gl6y3djs0lsa5mfq2m";
+    sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
index 97f50064bc3f..216c0e56b44c 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
@@ -6,15 +6,15 @@
 
 -# First decide what scheme to use...
 -GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
--if test -n "@@USE_GETTEXT_SCHEME@@"
+-if test -n "$GIT_GETTEXT_POISON"
+-then
+-	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
+-elif test -n "@@USE_GETTEXT_SCHEME@@"
 -then
 -	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
 -elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
 -then
 -	: no probing necessary
--elif test -n "$GIT_GETTEXT_POISON"
--then
--	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
 -elif type gettext.sh >/dev/null 2>&1
 -then
 -	# GNU libintl's gettext.sh

From ad076ff7ce5ea04d7e890934440702e0228fc660 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Mon, 9 Apr 2018 10:02:57 +0200
Subject: [PATCH 0087/3370] git: 2.16.3 -> 2.17.0

---
 .../git-and-tools/git/default.nix                |  4 ++--
 .../git-and-tools/git/docbook2texi.patch         | 16 ++++++++--------
 .../git/git-send-email-honor-PATH.patch          |  8 +++-----
 .../git-and-tools/git/symlinks-in-bin.patch      |  8 ++++----
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index b336f72c7ac1..de2c67ddc59d 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.16.3";
+  version = "2.17.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
+    sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
index bf36b2d321f3..ab5bb3c3a6c7 100644
--- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
@@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi',
 and (2) make sure `gitman.info' isn't produced since it's broken (duplicate
 node names).
 
-diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
---- git-1.8.4-orig/Documentation/Makefile	2013-08-23 21:38:43.000000000 +0200
-+++ git-1.8.4/Documentation/Makefile	2013-09-30 14:48:51.532890378 +0200
-@@ -101,7 +101,7 @@
+diff --git a/Documentation/Makefile b/Documentation/Makefile
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -122,7 +122,7 @@
  
  MAKEINFO = makeinfo
  INSTALL_INFO = install-info
 -DOCBOOK2X_TEXI = docbook2x-texi
 +DOCBOOK2X_TEXI = docbook2texi
  DBLATEX = dblatex
- ifndef PERL_PATH
- 	PERL_PATH = /usr/bin/perl
-@@ -205,7 +205,7 @@
+ ASCIIDOC_DBLATEX_DIR = /etc/asciidoc/dblatex
+ DBLATEX_COMMON = -p $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.xsl -s $(ASCIIDOC_DBLATEX_DIR)/asciidoc-dblatex.sty
+@@ -240,7 +240,7 @@
  man5: $(DOC_MAN5)
  man7: $(DOC_MAN7)
  
@@ -23,7 +23,7 @@ diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile
  
  pdf: user-manual.pdf
  
-@@ -221,10 +221,9 @@
+@@ -256,10 +256,9 @@
  
  install-info: info
  	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
index 9a484262b7b2..6b93d061a3be 100644
--- a/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/git-send-email-honor-PATH.patch
@@ -1,22 +1,20 @@
 diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
-index 8060ea35c..c81067a19 100644
 --- a/Documentation/git-send-email.txt
 +++ b/Documentation/git-send-email.txt
-@@ -203,8 +203,7 @@ a password is obtained using 'git-credential'.
+@@ -208,8 +208,7 @@ a password is obtained using 'git-credential'.
  	specify a full pathname of a sendmail-like program instead;
  	the program must support the `-i` option.  Default value can
  	be specified by the `sendemail.smtpServer` configuration
 -	option; the built-in default is to search for `sendmail` in
 -	`/usr/sbin`, `/usr/lib` and $PATH if such program is
-+        option; the built-in default is to search in $PATH if such program is
++	option; the built-in default is to search in $PATH if such program is
  	available, falling back to `localhost` otherwise.
 
  --smtp-server-port=<port>::
 diff --git a/git-send-email.perl b/git-send-email.perl
-index edcc6d346..8e357aeab 100755
 --- a/git-send-email.perl
 +++ b/git-send-email.perl
-@@ -885,8 +885,7 @@ if (defined $initial_reply_to) {
+@@ -944,8 +944,7 @@ if (defined $reply_to) {
  }
 
  if (!defined $smtp_server) {
diff --git a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
index 29d537db25f9..0a581a61d46d 100644
--- a/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/symlinks-in-bin.patch
@@ -1,7 +1,7 @@
-diff -ru -x '*~' git-1.8.2.1-orig/Makefile git-1.8.2.1/Makefile
---- git-1.8.2.1-orig/Makefile	2013-04-08 00:52:04.000000000 +0200
-+++ git-1.8.2.1/Makefile	2013-04-22 15:46:42.906026940 +0200
-@@ -2319,8 +2319,7 @@
+diff --git a/Makefile b/Makefile
+--- a/Makefile
++++ b/Makefile
+@@ -2609,8 +2609,7 @@
  	{ test "$$bindir/" = "$$execdir/" || \
  	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
  		$(RM) "$$execdir/$$p" && \

From 2ddba49f59c3291014f7c765c5b6944bbddd2c26 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Wed, 11 Apr 2018 13:00:40 +0200
Subject: [PATCH 0088/3370] git: fix perl libs path

---
 .../git-and-tools/git/default.nix              | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index de2c67ddc59d..f75515b1cc09 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -54,11 +54,19 @@ stdenv.mkDerivation {
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
               + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
 
-  makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
-      + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
-      + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
-      + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ")
-      + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else "");
+  preBuild = ''
+    makeFlagsArray+=( perllibdir=$out/$(perl -MConfig -wle 'print substr $Config{installsitelib}, 1 + length $Config{siteprefixexp}') )
+  '';
+
+  makeFlags = stdenv.lib.concatStringsSep " " [
+    "prefix=\${out}"
+    "PERL_PATH=${perl}/bin/perl"
+    "SHELL_PATH=${stdenv.shell}"
+    (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
+    (if stdenv.isSunOS then "INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
+    (if stdenv.isDarwin then "NO_APPLE_COMMON_CRYPTO=1" else "sysconfdir=/etc/ ")
+    (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else "")
+  ];
 
   # build git-credential-osxkeychain if darwin
   postBuild = stdenv.lib.optionalString stdenv.isDarwin ''

From 74442da768d4dc74f182b3623416a2bbeea32460 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 11 Apr 2018 19:18:29 +0200
Subject: [PATCH 0089/3370] nixos: remove PKG_CONFIG_PATH and PERL5LIB
 environment variables

These make libraries installed in the system or even user profiles
magically available.
---
 nixos/modules/programs/environment.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 401d152941a0..06ebb7bc729b 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -33,8 +33,6 @@ in
     environment.profileRelativeEnvVars =
       { PATH = [ "/bin" ];
         INFOPATH = [ "/info" "/share/info" ];
-        PKG_CONFIG_PATH = [ "/lib/pkgconfig" ];
-        PERL5LIB = [ "/lib/perl5/site_perl" ];
         KDEDIRS = [ "" ];
         STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
         QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" ];

From 27dd87222769bc602d34c5a5c2a13f492f432dbe Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 11 Apr 2018 12:46:53 -0500
Subject: [PATCH 0090/3370] unix-tools: fixup

---
 pkgs/top-level/unix-tools.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 19e315f6f603..16c2a6b77bfe 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -1,4 +1,4 @@
-{ pkgs, buildEnv, runCommand, hostPlatform }:
+{ pkgs, buildEnv, runCommand, hostPlatform, stdenv, lib }:
 
 # These are some unix tools that are commonly included in the /usr/bin
 # and /usr/sbin directory under more normal distributions. Along with
@@ -45,11 +45,14 @@ in rec {
     linux = pkgs.utillinux;
   };
   getconf = singleBinary "getconf" {
-    linux = pkgs.musl-getconf;
+    linux = if hostPlatform.isMusl then pkgs.musl-getconf
+            else lib.getBin stdenv.cc.libc;
     darwin = pkgs.darwin.system_cmds;
   };
-  getent = singleBinary "getconf" {
-    linux = pkgs.musl-getent;
+  getent = singleBinary "getent" {
+    linux = if hostPlatform.isMusl then pkgs.musl-getent
+            # This may not be right on other platforms, but preserves existing behavior
+            else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin;
   };
   getopt = singleBinary "getopt" {
     linux = pkgs.utillinux;

From 0884027ef56c0e7cac94e1c0a42c2a1610c8ef5c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 11 Apr 2018 14:00:13 -0400
Subject: [PATCH 0091/3370] Revert "Revert "Merge pull request #28029 from
 cstrahan/hardening-fix""

This reverts commit 6c064e6b1f34a8416f990db0cc617a7195f71588, reapplying
PR #28029 which was supposed to have gone to staging all along.
---
 .../bintools-wrapper/add-flags.sh             |   5 +-
 .../bintools-wrapper/add-hardening.sh         |  87 ++++++-------
 .../bintools-wrapper/ld-wrapper.sh            |   4 +-
 .../bintools-wrapper/setup-hook.sh            |   4 +
 pkgs/build-support/cc-wrapper/add-flags.sh    |   4 +-
 .../build-support/cc-wrapper/add-hardening.sh | 115 +++++++++---------
 pkgs/build-support/cc-wrapper/cc-wrapper.sh   |   4 +-
 pkgs/build-support/cc-wrapper/setup-hook.sh   |   4 +
 pkgs/stdenv/generic/make-derivation.nix       |   7 ++
 9 files changed, 130 insertions(+), 104 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh
index 7d118d20fc68..a97809258954 100644
--- a/pkgs/build-support/bintools-wrapper/add-flags.sh
+++ b/pkgs/build-support/bintools-wrapper/add-flags.sh
@@ -5,6 +5,7 @@ var_templates_list=(
     NIX+LDFLAGS_BEFORE
     NIX+LDFLAGS_AFTER
     NIX+LDFLAGS_HARDEN
+    NIX+HARDENING_ENABLE
 )
 var_templates_bool=(
     NIX+SET_BUILD_ID
@@ -23,10 +24,10 @@ if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then
 fi
 
 for var in "${var_templates_list[@]}"; do
-    mangleVarList "$var" "${role_infixes[@]}"
+    mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"}
 done
 for var in "${var_templates_bool[@]}"; do
-    mangleVarBool "$var" "${role_infixes[@]}"
+    mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"}
 done
 
 if [ -e @out@/nix-support/libc-ldflags ]; then
diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh
index 5282d17fce27..a15be821659f 100644
--- a/pkgs/build-support/bintools-wrapper/add-hardening.sh
+++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh
@@ -1,53 +1,58 @@
-hardeningFlags=(relro bindnow)
-# Intentionally word-split in case 'hardeningEnable' is defined in
-# Nix. Also, our bootstrap tools version of bash is old enough that
-# undefined arrays trip `set -u`.
-if [[ -v hardeningEnable[@] ]]; then
-  hardeningFlags+=(${hardeningEnable[@]})
-fi
-hardeningLDFlags=()
+declare -a hardeningLDFlags=()
 
-declare -A hardeningDisableMap
+declare -A hardeningEnableMap=()
 
-# Intentionally word-split in case 'hardeningDisable' is defined in Nix.
-for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@
-do
-  hardeningDisableMap[$flag]=1
+# Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The
+# array expansion also prevents undefined variables from causing trouble with
+# `set -u`.
+for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do
+  hardeningEnableMap["$flag"]=1
+done
+
+# Remove unsupported flags.
+for flag in @hardening_unsupported_flags@; do
+  unset -v hardeningEnableMap["$flag"]
 done
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
+  declare -a allHardeningFlags=(pie relro bindnow)
+  declare -A hardeningDisableMap=()
+
+  # Determine which flags were effectively disabled so we can report below.
+  for flag in "${allHardeningFlags[@]}"; do
+    if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then
+      hardeningDisableMap[$flag]=1
+    fi
+  done
+
   printf 'HARDENING: disabled flags:' >&2
   (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2
   echo >&2
-fi
 
-if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
-  if (( "${NIX_DEBUG:-0}" >= 1 )); then
+  if (( "${#hardeningEnableMap[@]}" )); then
     echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2;
   fi
-  for flag in "${hardeningFlags[@]}"
-  do
-    if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then
-      case $flag in
-        pie)
-          if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
-            if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
-            hardeningLDFlags+=('-pie')
-          fi
-          ;;
-        relro)
-          if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi
-          hardeningLDFlags+=('-z' 'relro')
-          ;;
-        bindnow)
-          if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi
-          hardeningLDFlags+=('-z' 'now')
-          ;;
-        *)
-          # Ignore unsupported. Checked in Nix that at least *some*
-          # tool supports each flag.
-          ;;
-      esac
-    fi
-  done
 fi
+
+for flag in "${!hardeningEnableMap[@]}"; do
+  case $flag in
+    pie)
+      if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
+        if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
+        hardeningLDFlags+=('-pie')
+      fi
+      ;;
+    relro)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi
+      hardeningLDFlags+=('-z' 'relro')
+      ;;
+    bindnow)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling bindnow >&2; fi
+      hardeningLDFlags+=('-z' 'now')
+      ;;
+    *)
+      # Ignore unsupported. Checked in Nix that at least *some*
+      # tool supports each flag.
+      ;;
+  esac
+done
diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
index 991ed0fe263c..672a3dcbe385 100644
--- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
@@ -57,8 +57,8 @@ fi
 
 source @out@/nix-support/add-hardening.sh
 
-extraAfter=("${hardeningLDFlags[@]}")
-extraBefore=()
+extraAfter=()
+extraBefore=(${hardeningLDFlags[@]+"${hardeningLDFlags[@]}"})
 
 if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then
     extraAfter+=($NIX_@infixSalt@_LDFLAGS)
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 48a00b0b9b07..831ee9b03872 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -83,6 +83,10 @@ do
     fi
 done
 
+# If unset, assume the default hardening flags.
+: ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"}
+export NIX_HARDENING_ENABLE
+
 # No local scope in sourced file
 unset -v role_pre role_post cmd upper_case
 set +u
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 604aaf6b6cf0..e384d30ecbb6 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -30,10 +30,10 @@ fi
 # We need to mangle names for hygiene, but also take parameters/overrides
 # from the environment.
 for var in "${var_templates_list[@]}"; do
-    mangleVarList "$var" "${role_infixes[@]}"
+    mangleVarList "$var" ${role_infixes[@]+"${role_infixes[@]}"}
 done
 for var in "${var_templates_bool[@]}"; do
-    mangleVarBool "$var" "${role_infixes[@]}"
+    mangleVarBool "$var" ${role_infixes[@]+"${role_infixes[@]}"}
 done
 
 # `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index a35ff3cb4260..026e48671447 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -1,67 +1,72 @@
-hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow)
-# Intentionally word-split in case 'hardeningEnable' is defined in
-# Nix. Also, our bootstrap tools version of bash is old enough that
-# undefined arrays trip `set -u`.
-if [[ -v hardeningEnable[@] ]]; then
-  hardeningFlags+=(${hardeningEnable[@]})
-fi
-hardeningCFlags=()
+declare -a hardeningCFlags=()
 
-declare -A hardeningDisableMap
+declare -A hardeningEnableMap=()
 
-# Intentionally word-split in case 'hardeningDisable' is defined in Nix.
-for flag in ${hardeningDisable[@]:-IGNORED_KEY} @hardening_unsupported_flags@
-do
-  hardeningDisableMap[$flag]=1
+# Intentionally word-split in case 'NIX_HARDENING_ENABLE' is defined in Nix. The
+# array expansion also prevents undefined variables from causing trouble with
+# `set -u`.
+for flag in ${NIX_@infixSalt@_HARDENING_ENABLE-}; do
+  hardeningEnableMap["$flag"]=1
+done
+
+# Remove unsupported flags.
+for flag in @hardening_unsupported_flags@; do
+  unset -v hardeningEnableMap["$flag"]
 done
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
+  declare -a allHardeningFlags=(fortify stackprotector pie pic strictoverflow format)
+  declare -A hardeningDisableMap=()
+
+  # Determine which flags were effectively disabled so we can report below.
+  for flag in "${allHardeningFlags[@]}"; do
+    if [[ -z "${hardeningEnableMap[$flag]-}" ]]; then
+      hardeningDisableMap["$flag"]=1
+    fi
+  done
+
   printf 'HARDENING: disabled flags:' >&2
   (( "${#hardeningDisableMap[@]}" )) && printf ' %q' "${!hardeningDisableMap[@]}" >&2
   echo >&2
-fi
 
-if [[ -z "${hardeningDisableMap[all]:-}" ]]; then
-  if (( "${NIX_DEBUG:-0}" >= 1 )); then
+  if (( "${#hardeningEnableMap[@]}" )); then
     echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2;
   fi
-  for flag in "${hardeningFlags[@]}"
-  do
-    if [[ -z "${hardeningDisableMap[$flag]:-}" ]]; then
-      case $flag in
-        fortify)
-          if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi
-          hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2')
-          ;;
-        stackprotector)
-          if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
-          hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
-          ;;
-        pie)
-          if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
-          hardeningCFlags+=('-fPIE')
-          if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
-            if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
-            hardeningCFlags+=('-pie')
-          fi
-          ;;
-        pic)
-          if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi
-          hardeningCFlags+=('-fPIC')
-          ;;
-        strictoverflow)
-          if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi
-          hardeningCFlags+=('-fno-strict-overflow')
-          ;;
-        format)
-          if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi
-          hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security')
-          ;;
-        *)
-          # Ignore unsupported. Checked in Nix that at least *some*
-          # tool supports each flag.
-          ;;
-      esac
-    fi
-  done
 fi
+
+for flag in "${!hardeningEnableMap[@]}"; do
+  case $flag in
+    fortify)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling fortify >&2; fi
+      hardeningCFlags+=('-O2' '-D_FORTIFY_SOURCE=2')
+      ;;
+    stackprotector)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
+      hardeningCFlags+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
+      ;;
+    pie)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
+      hardeningCFlags+=('-fPIE')
+      if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static ") ]]; then
+        if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
+        hardeningCFlags+=('-pie')
+      fi
+      ;;
+    pic)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi
+      hardeningCFlags+=('-fPIC')
+      ;;
+    strictoverflow)
+       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling strictoverflow >&2; fi
+      hardeningCFlags+=('-fno-strict-overflow')
+      ;;
+    format)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling format >&2; fi
+      hardeningCFlags+=('-Wformat' '-Wformat-security' '-Werror=format-security')
+      ;;
+    *)
+      # Ignore unsupported. Checked in Nix that at least *some*
+      # tool supports each flag.
+      ;;
+  esac
+done
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index c2e6c1406358..8a3cfb694b4f 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -134,8 +134,8 @@ fi
 source @out@/nix-support/add-hardening.sh
 
 # Add the flags for the C compiler proper.
-extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE "${hardeningCFlags[@]}")
-extraBefore=()
+extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE)
+extraBefore=(${hardeningCFlags[@]+"${hardeningCFlags[@]}"})
 
 if [ "$dontLink" != 1 ]; then
 
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 29a7306b9b7e..15b84dca2794 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -147,6 +147,10 @@ export ${role_pre}CXX=@named_cxx@
 export CC${role_post}=@named_cc@
 export CXX${role_post}=@named_cxx@
 
+# If unset, assume the default hardening flags.
+: ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"}
+export NIX_HARDENING_ENABLE
+
 # No local scope in sourced file
 unset -v role_pre role_post
 set +u
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 46df958b8396..7b5f9f7d6b0b 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -74,6 +74,11 @@ rec {
     # TODO(@Ericson2314): Make this more modular, and not O(n^2).
     let
       supportedHardeningFlags = [ "fortify" "stackprotector" "pie" "pic" "strictoverflow" "format" "relro" "bindnow" ];
+      defaultHardeningFlags = lib.remove "pie" supportedHardeningFlags;
+      enabledHardeningOptions =
+        if builtins.elem "all" hardeningDisable
+        then []
+        else lib.subtractLists hardeningDisable (defaultHardeningFlags ++ hardeningEnable);
       # hardeningDisable additionally supports "all".
       erroneousHardeningFlags = lib.subtractLists supportedHardeningFlags (hardeningEnable ++ lib.remove "all" hardeningDisable);
     in if builtins.length erroneousHardeningFlags != 0
@@ -179,6 +184,8 @@ rec {
             ++ optional (elem "host"   configurePlatforms) "--host=${stdenv.hostPlatform.config}"
             ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}";
 
+        } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
+          NIX_HARDENING_ENABLE = enabledHardeningOptions;
         } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
           # TODO: remove lib.unique once nix has a list canonicalization primitive
           __sandboxProfile =

From 42a84598fb7baacc991c03e228a07a536bc0624a Mon Sep 17 00:00:00 2001
From: Reuben D'Netto <rdnetto@gmail.com>
Date: Thu, 5 Apr 2018 18:43:56 +1000
Subject: [PATCH 0092/3370] Added cross-references to NixOS manual

---
 .../manual/administration/cleaning-store.xml  |  4 +-
 .../administration/container-networking.xml   |  6 +-
 .../manual/administration/control-groups.xml  |  4 +-
 .../administration/declarative-containers.xml | 14 +--
 .../administration/imperative-containers.xml  | 10 +--
 .../doc/manual/configuration/abstractions.xml | 12 +--
 .../configuration/ad-hoc-network-config.xml   |  4 +-
 .../configuration/adding-custom-packages.xml  |  6 +-
 .../doc/manual/configuration/config-file.xml  | 26 +++---
 .../configuration/customizing-packages.xml    |  6 +-
 .../configuration/declarative-packages.xml    |  6 +-
 .../doc/manual/configuration/file-systems.xml |  8 +-
 nixos/doc/manual/configuration/firewall.xml   | 14 +--
 .../doc/manual/configuration/ipv4-config.xml  | 10 +--
 .../doc/manual/configuration/ipv6-config.xml  |  8 +-
 .../doc/manual/configuration/linux-kernel.xml | 14 +--
 .../configuration/luks-file-systems.xml       |  6 +-
 nixos/doc/manual/configuration/modularity.xml | 36 ++++----
 .../manual/configuration/network-manager.xml  |  4 +-
 nixos/doc/manual/configuration/ssh.xml        |  6 +-
 nixos/doc/manual/configuration/user-mgmt.xml  | 26 +++---
 nixos/doc/manual/configuration/wireless.xml   |  4 +-
 nixos/doc/manual/configuration/x-windows.xml  | 46 +++++-----
 nixos/doc/manual/configuration/xfce.xml       | 24 +++---
 .../manual/installation/changing-config.xml   |  2 +-
 .../installing-from-other-distro.xml          |  4 +-
 .../installing-virtualbox-guest.xml           |  4 +-
 nixos/doc/manual/installation/installing.xml  | 85 ++++++++++---------
 nixos/doc/manual/installation/upgrading.xml   |  4 +-
 nixos/modules/i18n/input-method/default.xml   | 78 ++++++++---------
 nixos/modules/programs/digitalbitbox/doc.xml  | 38 ++++-----
 nixos/modules/programs/plotinus.xml           |  2 +-
 nixos/modules/security/acme.xml               | 22 ++---
 nixos/modules/security/hidepid.xml            | 12 +--
 .../modules/services/databases/postgresql.xml | 12 +--
 nixos/modules/services/editors/emacs.xml      | 20 ++---
 nixos/modules/services/misc/gitlab.xml        | 59 +++++++------
 .../modules/services/misc/taskserver/doc.xml  | 12 +--
 .../services/networking/dnscrypt-proxy.xml    | 20 ++---
 39 files changed, 340 insertions(+), 338 deletions(-)

diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml
index 4cf62947f528..52512b8f1270 100644
--- a/nixos/doc/manual/administration/cleaning-store.xml
+++ b/nixos/doc/manual/administration/cleaning-store.xml
@@ -29,8 +29,8 @@ this unit automatically at certain points in time, for instance, every
 night at 03:15:
 
 <programlisting>
-nix.gc.automatic = true;
-nix.gc.dates = "03:15";
+<xref linkend="opt-nix.gc.automatic"/> = true;
+<xref linkend="opt-nix.gc.dates"/> = "03:15";
 </programlisting>
 
 </para>
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index d89d262eff4e..2fc353059dfc 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -39,9 +39,9 @@ IP address. This can be accomplished using the following configuration
 on the host:
 
 <programlisting>
-networking.nat.enable = true;
-networking.nat.internalInterfaces = ["ve-+"];
-networking.nat.externalInterface = "eth0";
+<xref linkend="opt-networking.nat.enable"/> = true;
+<xref linkend="opt-networking.nat.internalInterfaces"/> = ["ve-+"];
+<xref linkend="opt-networking.nat.externalInterface"/> = "eth0";
 </programlisting>
 where <literal>eth0</literal> should be replaced with the desired
 external interface. Note that <literal>ve-+</literal> is a wildcard
diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml
index 0d7b8ae910a7..03db40a3bc52 100644
--- a/nixos/doc/manual/administration/control-groups.xml
+++ b/nixos/doc/manual/administration/control-groups.xml
@@ -47,7 +47,7 @@ would get 1/1001 of the cgroup’s CPU time.)  You can limit a service’s
 CPU share in <filename>configuration.nix</filename>:
 
 <programlisting>
-systemd.services.httpd.serviceConfig.CPUShares = 512;
+<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.CPUShares = 512;
 </programlisting>
 
 By default, every cgroup has 1024 CPU shares, so this will halve the
@@ -61,7 +61,7 @@ available memory.  Per-cgroup memory limits can be specified in
 <literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):
 
 <programlisting>
-systemd.services.httpd.serviceConfig.MemoryLimit = "512M";
+<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.MemoryLimit = "512M";
 </programlisting>
 
 </para>
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index 94f03a2ee116..79b230e5fc7f 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -15,8 +15,8 @@ following specifies that there shall be a container named
 containers.database =
   { config =
       { config, pkgs, ... }:
-      { services.postgresql.enable = true;
-        services.postgresql.package = pkgs.postgresql96;
+      { <xref linkend="opt-services.postgresql.enable"/> = true;
+      <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql96;
       };
   };
 </programlisting>
@@ -33,11 +33,11 @@ ports. However, they cannot change the network configuration. You can
 give a container its own network as follows:
 
 <programlisting>
-containers.database =
-  { privateNetwork = true;
-    hostAddress = "192.168.100.10";
-    localAddress = "192.168.100.11";
-  };
+containers.database = {
+  <link linkend="opt-containers._name_.privateNetwork">privateNetwork</link> = true;
+  <link linkend="opt-containers._name_.hostAddress">hostAddress</link> = "192.168.100.10";
+  <link linkend="opt-containers._name_.localAddress">localAddress</link> = "192.168.100.11";
+};
 </programlisting>
 
 This gives the container a private virtual Ethernet interface with IP
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index d5d8140e0764..d39ac7f8bef4 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -30,8 +30,8 @@ line. For instance, to create a container that has
 
 <screen>
 # nixos-container create foo --config '
-  services.openssh.enable = true;
-  users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];
+  <xref linkend="opt-services.openssh.enable"/> = true;
+  <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
 '
 </screen>
 
@@ -100,9 +100,9 @@ specify a new configuration on the command line:
 
 <screen>
 # nixos-container update foo --config '
-  services.httpd.enable = true;
-  services.httpd.adminAddr = "foo@example.org";
-  networking.firewall.allowedTCPPorts = [ 80 ];
+  <xref linkend="opt-services.httpd.enable"/> = true;
+  <xref linkend="opt-services.httpd.adminAddr"/> = "foo@example.org";
+  <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 ];
 '
 
 # curl http://$(nixos-container show-ip foo)/
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml
index cbd54bca62f9..f794085295cf 100644
--- a/nixos/doc/manual/configuration/abstractions.xml
+++ b/nixos/doc/manual/configuration/abstractions.xml
@@ -11,7 +11,7 @@ to abstract.  Take, for instance, this Apache HTTP Server configuration:
 
 <programlisting>
 {
-  services.httpd.virtualHosts =
+  <xref linkend="opt-services.httpd.virtualHosts"/> =
     [ { hostName = "example.org";
         documentRoot = "/webroot";
         adminAddr = "alice@example.org";
@@ -43,7 +43,7 @@ let
     };
 in
 {
-  services.httpd.virtualHosts =
+  <xref linkend="opt-services.httpd.virtualHosts"/> =
     [ exampleOrgCommon
       (exampleOrgCommon // {
         enableSSL = true;
@@ -66,7 +66,7 @@ allowed.  Thus, you also could have written:
 
 <programlisting>
 {
-  services.httpd.virtualHosts =
+  <xref linkend="opt-services.httpd.virtualHosts"/> =
     let exampleOrgCommon = <replaceable>...</replaceable>; in
     [ exampleOrgCommon
       (exampleOrgCommon // { <replaceable>...</replaceable> })
@@ -86,7 +86,7 @@ the host name.  This can be done as follows:
 
 <programlisting>
 {
-  services.httpd.virtualHosts =
+  <xref linkend="opt-services.httpd.virtualHosts"/> =
     let
       makeVirtualHost = name:
         { hostName = name;
@@ -113,7 +113,7 @@ element in a list:
 
 <programlisting>
 {
-  services.httpd.virtualHosts =
+  <xref linkend="opt-services.httpd.virtualHosts"/> =
     let
       makeVirtualHost = <replaceable>...</replaceable>;
     in map makeVirtualHost
@@ -132,7 +132,7 @@ function that takes a <emphasis>set</emphasis> as its argument, like this:
 
 <programlisting>
 {
-  services.httpd.virtualHosts =
+  <xref linkend="opt-services.httpd.virtualHosts"/> =
     let
       makeVirtualHost = { name, root }:
         { hostName = name;
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
index 26a572ba1fb5..c53b9598109c 100644
--- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
@@ -6,14 +6,14 @@
 
 <title>Ad-Hoc Configuration</title>
 
-<para>You can use <option>networking.localCommands</option> to specify
+<para>You can use <xref linkend="opt-networking.localCommands"/> to specify
 shell commands to be run at the end of
 <literal>network-setup.service</literal>.  This is useful for doing
 network configuration not covered by the existing NixOS modules.  For
 instance, to statically configure an IPv6 address:
 
 <programlisting>
-networking.localCommands =
+<xref linkend="opt-networking.localCommands"/> =
   ''
     ip -6 addr add 2001:610:685:1::1/64 dev eth0
   '';
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml
index ab3665bae504..ae58f61d73ed 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.xml
+++ b/nixos/doc/manual/configuration/adding-custom-packages.xml
@@ -24,7 +24,7 @@ manual.  Finally, you add it to
 <literal>environment.systemPackages</literal>, e.g.
 
 <programlisting>
-environment.systemPackages = [ pkgs.my-package ];
+<xref linkend="opt-environment.systemPackages"/> = [ pkgs.my-package ];
 </programlisting>
 
 and you run <command>nixos-rebuild</command>, specifying your own
@@ -41,7 +41,7 @@ Nixpkgs tree.  For instance, here is how you specify a build of the
 package directly in <filename>configuration.nix</filename>:
 
 <programlisting>
-environment.systemPackages =
+<xref linkend="opt-environment.systemPackages"/> =
   let
     my-hello = with pkgs; stdenv.mkDerivation rec {
       name = "hello-2.8";
@@ -57,7 +57,7 @@ environment.systemPackages =
 Of course, you can also move the definition of
 <literal>my-hello</literal> into a separate Nix expression, e.g.
 <programlisting>
-environment.systemPackages = [ (import ./my-hello.nix) ];
+<xref linkend="opt-environment.systemPackages"/> = [ (import ./my-hello.nix) ];
 </programlisting>
 where <filename>my-hello.nix</filename> contains:
 <programlisting>
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 3d1cdaf4c4ab..60a4dac97d5d 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -28,9 +28,9 @@ form <literal><replaceable>name</replaceable> =
 <programlisting>
 { config, pkgs, ... }:
 
-{ services.httpd.enable = true;
-  services.httpd.adminAddr = "alice@example.org";
-  services.httpd.documentRoot = "/webroot";
+{ <xref linkend="opt-services.httpd.enable"/> = true;
+<xref linkend="opt-services.httpd.adminAddr"/> = "alice@example.org";
+<xref linkend="opt-services.httpd.documentRoot"/> = "/webroot";
 }
 </programlisting>
 
@@ -40,7 +40,7 @@ the document root.</para>
 
 <para>Sets can be nested, and in fact dots in option names are
 shorthand for defining a set containing another set.  For instance,
-<option>services.httpd.enable</option> defines a set named
+<xref linkend="opt-services.httpd.enable"/> defines a set named
 <varname>services</varname> that contains a set named
 <varname>httpd</varname>, which in turn contains an option definition
 named <varname>enable</varname> with value <literal>true</literal>.
@@ -89,7 +89,7 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
       <para>Strings are enclosed in double quotes, e.g.
 
 <programlisting>
-networking.hostName = "dexter";
+<xref linkend="opt-networking.hostName"/> = "dexter";
 </programlisting>
 
       Special characters can be escaped by prefixing them with a
@@ -99,7 +99,7 @@ networking.hostName = "dexter";
       single quotes</emphasis>, e.g.
 
 <programlisting>
-networking.extraHosts =
+<xref linkend="opt-networking.extraHosts"/> =
   ''
     127.0.0.2 other-localhost
     10.0.0.1 server
@@ -125,8 +125,8 @@ networking.extraHosts =
       <literal>false</literal>, e.g.
 
 <programlisting>
-networking.firewall.enable = true;
-networking.firewall.allowPing = false;
+<xref linkend="opt-networking.firewall.enable"/> = true;
+<xref linkend="opt-networking.firewall.allowPing"/> = false;
 </programlisting>
       </para>
     </listitem>
@@ -138,7 +138,7 @@ networking.firewall.allowPing = false;
       <para>For example,
 
 <programlisting>
-boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
+<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 60;
 </programlisting>
 
       (Note that here the attribute name
@@ -158,7 +158,7 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
       enclosed in braces, as in the option definition
 
 <programlisting>
-fileSystems."/boot" =
+<xref linkend="opt-fileSystems"/>."/boot" =
   { device = "/dev/sda1";
     fsType = "ext4";
     options = [ "rw" "data=ordered" "relatime" ];
@@ -175,7 +175,7 @@ fileSystems."/boot" =
       elements are separated by whitespace, like this:
 
 <programlisting>
-boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
+<xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
 
       List elements can be any other type, e.g. sets:
@@ -195,12 +195,12 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
       the function argument <varname>pkgs</varname>.  Typical uses:
 
 <programlisting>
-environment.systemPackages =
+<xref linkend="opt-environment.systemPackages"/> =
   [ pkgs.thunderbird
     pkgs.emacs
   ];
 
-postgresql.package = pkgs.postgresql90;
+<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql90;
 </programlisting>
 
       The latter option definition changes the default PostgreSQL
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml
index 8aa01fb57a09..8b7654e9b42e 100644
--- a/nixos/doc/manual/configuration/customizing-packages.xml
+++ b/nixos/doc/manual/configuration/customizing-packages.xml
@@ -28,7 +28,7 @@ has a dependency on GTK+ 2.  If you want to build it against GTK+ 3,
 you can specify that as follows:
 
 <programlisting>
-environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
+<xref linkend="opt-environment.systemPackages"/> = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
 </programlisting>
 
 The function <varname>override</varname> performs the call to the Nix
@@ -38,7 +38,7 @@ the set of arguments specified by you.  So here the function argument
 causing Emacs to depend on GTK+ 3.  (The parentheses are necessary
 because in Nix, function application binds more weakly than list
 construction, so without them,
-<literal>environment.systemPackages</literal> would be a list with two
+<xref linkend="opt-environment.systemPackages"/> would be a list with two
 elements.)</para>
 
 <para>Even greater customisation is possible using the function
@@ -51,7 +51,7 @@ For instance, if you want to override the source code of Emacs, you
 can say:
 
 <programlisting>
-environment.systemPackages = [
+<xref linkend="opt-environment.systemPackages"/> = [
   (pkgs.emacs.overrideAttrs (oldAttrs: {
     name = "emacs-25.0-pre";
     src = /path/to/my/emacs/tree;
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml
index dc2fa715097c..4c875e6f037f 100644
--- a/nixos/doc/manual/configuration/declarative-packages.xml
+++ b/nixos/doc/manual/configuration/declarative-packages.xml
@@ -8,12 +8,12 @@
 
 <para>With declarative package management, you specify which packages
 you want on your system by setting the option
-<option>environment.systemPackages</option>.  For instance, adding the
+<xref linkend="opt-environment.systemPackages"/>.  For instance, adding the
 following line to <filename>configuration.nix</filename> enables the
 Mozilla Thunderbird email application:
 
 <programlisting>
-environment.systemPackages = [ pkgs.thunderbird ];
+<xref linkend="opt-environment.systemPackages"/> = [ pkgs.thunderbird ];
 </programlisting>
 
 The effect of this specification is that the Thunderbird package from
@@ -34,7 +34,7 @@ name</emphasis>, such as
 different channels that you might have.)</para>
 
 <para>To “uninstall” a package, simply remove it from
-<option>environment.systemPackages</option> and run
+<xref linkend="opt-environment.systemPackages"/> and run
 <command>nixos-rebuild switch</command>.</para>
 
 <xi:include href="customizing-packages.xml" />
diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml
index ae3d124cd6bb..0ff37c38d8b0 100644
--- a/nixos/doc/manual/configuration/file-systems.xml
+++ b/nixos/doc/manual/configuration/file-systems.xml
@@ -13,21 +13,21 @@ device <filename>/dev/disk/by-label/data</filename> onto the mount
 point <filename>/data</filename>:
 
 <programlisting>
-fileSystems."/data" =
+<xref linkend="opt-fileSystems"/>."/data" =
   { device = "/dev/disk/by-label/data";
     fsType = "ext4";
   };
 </programlisting>
 
 Mount points are created automatically if they don’t already exist.
-For <option>device</option>, it’s best to use the topology-independent
+For <option><link linkend="opt-fileSystems._name__.device">device</link></option>, it’s best to use the topology-independent
 device aliases in <filename>/dev/disk/by-label</filename> and
 <filename>/dev/disk/by-uuid</filename>, as these don’t change if the
 topology changes (e.g. if a disk is moved to another IDE
 controller).</para>
 
 <para>You can usually omit the file system type
-(<option>fsType</option>), since <command>mount</command> can usually
+(<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>), since <command>mount</command> can usually
 detect the type and load the necessary kernel module automatically.
 However, if the file system is needed at early boot (in the initial
 ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal>
@@ -38,7 +38,7 @@ available.</para>
 <note><para>System startup will fail if any of the filesystems fails to mount,
 dropping you to the emergency shell.
 You can make a mount asynchronous and non-critical by adding
-<literal>options = [ "nofail" ];</literal>.
+<literal><link linkend="opt-fileSystems._name__.options">options</link> = [ "nofail" ];</literal>.
 </para></note>
 
 <xi:include href="luks-file-systems.xml" />
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index 75cccef95b38..ecc21a3bdf51 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -12,37 +12,37 @@ both IPv4 and IPv6 traffic. It is enabled by default. It can be
 disabled as follows:
 
 <programlisting>
-networking.firewall.enable = false;
+<xref linkend="opt-networking.firewall.enable"/> = false;
 </programlisting>
 
 If the firewall is enabled, you can open specific TCP ports to the
 outside world:
 
 <programlisting>
-networking.firewall.allowedTCPPorts = [ 80 443 ];
+<xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 443 ];
 </programlisting>
 
 Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
-is enabled (<option>services.openssh.enable = true</option>). UDP
+is enabled (<option><xref linkend="opt-services.openssh.enable"/> = true</option>). UDP
 ports can be opened through
-<option>networking.firewall.allowedUDPPorts</option>.</para>
+<xref linkend="opt-networking.firewall.allowedUDPPorts"/>.</para>
 
 <para>To open ranges of TCP ports:
 
 <programlisting>
-networking.firewall.allowedTCPPortRanges = [
+<xref linkend="opt-networking.firewall.allowedTCPPortRanges"/> = [
   { from = 4000; to = 4007; }
   { from = 8000; to = 8010; }
 ];
 </programlisting>
 
 Similarly, UDP port ranges can be opened through
-<option>networking.firewall.allowedUDPPortRanges</option>.</para>
+<xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.</para>
 
 <para>Also of interest is
 
 <programlisting>
-networking.firewall.allowPing = true;
+<xref linkend="opt-networking.firewall.allowPing"/> = true;
 </programlisting>
 
 to allow the machine to respond to ping requests.  (ICMPv6 pings are
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index 68238b547d60..f3ce4af39b9f 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -12,15 +12,15 @@ interfaces.  However, you can configure an interface manually as
 follows:
 
 <programlisting>
-networking.interfaces.eth0.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; } ];
+<link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ { address = "192.168.1.2"; prefixLength = 24; } ];
 </programlisting>
 
 Typically you’ll also want to set a default gateway and set of name
 servers:
 
 <programlisting>
-networking.defaultGateway = "192.168.1.1";
-networking.nameservers = [ "8.8.8.8" ];
+<xref linkend="opt-networking.defaultGateway"/> = "192.168.1.1";
+<xref linkend="opt-networking.nameservers"/> = [ "8.8.8.8" ];
 </programlisting>
 
 </para>
@@ -31,10 +31,10 @@ service
 The default gateway and name server configuration is performed by
 <literal>network-setup.service</literal>.</para></note>
 
-<para>The host name is set using <option>networking.hostName</option>:
+<para>The host name is set using <xref linkend="opt-networking.hostName"/>:
 
 <programlisting>
-networking.hostName = "cartman";
+<xref linkend="opt-networking.hostName"/> = "cartman";
 </programlisting>
 
 The default host name is <literal>nixos</literal>.  Set it to the
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
index 74a21e18ec3f..6b0ba0d48f01 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -11,14 +11,14 @@ is used to automatically assign IPv6 addresses to all interfaces.  You
 can disable IPv6 support globally by setting:
 
 <programlisting>
-networking.enableIPv6 = false;
+<xref linkend="opt-networking.enableIPv6"/> = false;
 </programlisting></para>
 
 <para>You can disable IPv6 on a single interface using a normal sysctl (in this
 example, we use interface <varname>eth0</varname>):
 
 <programlisting>
-boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
+<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv6.conf.eth0.disable_ipv6" = true;
 </programlisting>
 </para>
 
@@ -26,14 +26,14 @@ boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
 DHCPv6. You can configure an interface manually:
 
 <programlisting>
-networking.interfaces.eth0.ipv6.addresses = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ];
+<link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ];
 </programlisting>
 </para>
 
 <para>For configuring a gateway, optionally with explicitly specified interface:
 
 <programlisting>
-networking.defaultGateway6 = {
+<xref linkend="opt-networking.defaultGateway6"/> = {
   address = "fe00::1";
   interface = "enp0s3";
 }
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index 52be26d6024a..b9325629256a 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -10,7 +10,7 @@
 the option <option>boot.kernelPackages</option>.  For instance, this
 selects the Linux 3.10 kernel:
 <programlisting>
-boot.kernelPackages = pkgs.linuxPackages_3_10;
+<xref linkend="opt-boot.kernelPackages"/> = pkgs.linuxPackages_3_10;
 </programlisting>
 Note that this not only replaces the kernel, but also packages that
 are specific to the kernel version, such as the NVIDIA video drivers.
@@ -45,23 +45,23 @@ is typically <literal>y</literal>, <literal>n</literal> or
 
 <para>Kernel modules for hardware devices are generally loaded
 automatically by <command>udev</command>.  You can force a module to
-be loaded via <option>boot.kernelModules</option>, e.g.
+be loaded via <xref linkend="opt-boot.kernelModules"/>, e.g.
 <programlisting>
-boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ];
+<xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
 If the module is required early during the boot (e.g. to mount the
 root file system), you can use
-<option>boot.initrd.extraKernelModules</option>:
+<xref linkend="opt-boot.initrd.extraKernelModules"/>:
 <programlisting>
-boot.initrd.extraKernelModules = [ "cifs" ];
+<xref linkend="opt-boot.initrd.extraKernelModules"/> = [ "cifs" ];
 </programlisting>
 This causes the specified modules and their dependencies to be added
 to the initial ramdisk.</para>
 
 <para>Kernel runtime parameters can be set through
-<option>boot.kernel.sysctl</option>, e.g.
+<xref linkend="opt-boot.kernel.sysctl"/>, e.g.
 <programlisting>
-boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120;
+<xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 120;
 </programlisting>
 sets the kernel’s TCP keepalive time to 120 seconds.  To see the
 available parameters, run <command>sysctl -a</command>.</para>
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
index 00c795cd0898..6c2b4cc60b5b 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -33,13 +33,13 @@ as <filename>/</filename>, add the following to
 <filename>configuration.nix</filename>:
 
 <programlisting>
-boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d";
-fileSystems."/".device = "/dev/mapper/crypted";
+<link linkend="opt-boot.initrd.luks.devices._name__.device">boot.initrd.luks.devices.crypted.device</link> = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d";
+<xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/crypted";
 </programlisting>
 
 Should grub be used as bootloader, and <filename>/boot</filename> is located
 on an encrypted partition, it is necessary to add the following grub option:
-<programlisting>boot.loader.grub.enableCryptodisk = true;</programlisting>
+<programlisting><xref linkend="opt-boot.loader.grub.enableCryptodisk"/> = true;</programlisting>
 
 </para>
 
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index 5420c7f88385..2f76459a24e9 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -22,8 +22,8 @@ use other modules by including them from
 { config, pkgs, ... }:
 
 { imports = [ ./vpn.nix ./kde.nix ];
-  services.httpd.enable = true;
-  environment.systemPackages = [ pkgs.emacs ];
+  <xref linkend="opt-services.httpd.enable"/> = true;
+  <xref linkend="opt-environment.systemPackages"/> = [ pkgs.emacs ];
   <replaceable>...</replaceable>
 }
 </programlisting>
@@ -35,25 +35,25 @@ latter might look like this:
 <programlisting>
 { config, pkgs, ... }:
 
-{ services.xserver.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+{ <xref linkend="opt-services.xserver.enable"/> = true;
+  <xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
+  <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
 }
 </programlisting>
 
 Note that both <filename>configuration.nix</filename> and
 <filename>kde.nix</filename> define the option
-<option>environment.systemPackages</option>.  When multiple modules
+<xref linkend="opt-environment.systemPackages"/>.  When multiple modules
 define an option, NixOS will try to <emphasis>merge</emphasis> the
 definitions.  In the case of
-<option>environment.systemPackages</option>, that’s easy: the lists of
+<xref linkend="opt-environment.systemPackages"/>, that’s easy: the lists of
 packages can simply be concatenated.  The value in
 <filename>configuration.nix</filename> is merged last, so for
 list-type options, it will appear at the end of the merged list. If
 you want it to appear first, you can use <varname>mkBefore</varname>:
 
 <programlisting>
-boot.kernelModules = mkBefore [ "kvm-intel" ];
+<xref linkend="opt-boot.kernelModules"/> = mkBefore [ "kvm-intel" ];
 </programlisting>
 
 This causes the <literal>kvm-intel</literal> kernel module to be
@@ -61,7 +61,7 @@ loaded before any other kernel modules.</para>
 
 <para>For other types of options, a merge may not be possible. For
 instance, if two modules define
-<option>services.httpd.adminAddr</option>,
+<xref linkend="opt-services.httpd.adminAddr"/>,
 <command>nixos-rebuild</command> will give an error:
 
 <screen>
@@ -72,7 +72,7 @@ When that happens, it’s possible to force one definition take
 precedence over the others:
 
 <programlisting>
-services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org";
+<xref linkend="opt-services.httpd.adminAddr"/> = pkgs.lib.mkForce "bob@example.org";
 </programlisting>
 
 </para>
@@ -89,15 +89,15 @@ wondering how it’s possible that the (indirect)
 is a “lazy” language — it only computes values when they are needed.
 This works as long as no individual configuration value depends on
 itself.</para></footnote>.  For example, here is a module that adds
-some packages to <option>environment.systemPackages</option> only if
-<option>services.xserver.enable</option> is set to
+some packages to <xref linkend="opt-environment.systemPackages"/> only if
+<xref linkend="opt-services.xserver.enable"/> is set to
 <literal>true</literal> somewhere else:
 
 <programlisting>
 { config, pkgs, ... }:
 
-{ environment.systemPackages =
-    if config.services.xserver.enable then
+{ <xref linkend="opt-environment.systemPackages"/> =
+    if config.<xref linkend="opt-services.xserver.enable"/> then
       [ pkgs.firefox
         pkgs.thunderbird
       ]
@@ -113,10 +113,10 @@ value of a configuration option is.  The command
 <option>nixos-option</option> allows you to find out:
 
 <screen>
-$ nixos-option services.xserver.enable
+$ nixos-option <xref linkend="opt-services.xserver.enable"/>
 true
 
-$ nixos-option boot.kernelModules
+$ nixos-option <xref linkend="opt-boot.kernelModules"/>
 [ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
 </screen>
 
@@ -130,10 +130,10 @@ typical use:
 <screen>
 $ nix-repl '&lt;nixpkgs/nixos>'
 
-nix-repl> config.networking.hostName
+nix-repl> config.<xref linkend="opt-networking.hostName"/>
 "mandark"
 
-nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts
+nix-repl> map (x: x.hostName) config.<xref linkend="opt-services.httpd.virtualHosts"/>
 [ "example.org" "example.gov" ]
 </screen>
 
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index b4808e74ff9d..bbbee3a52ed5 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -10,7 +10,7 @@
 use NetworkManager. You can enable NetworkManager by setting:
 
 <programlisting>
-networking.networkmanager.enable = true;
+<xref linkend="opt-networking.networkmanager.enable"/> = true;
 </programlisting>
 
 some desktop managers (e.g., GNOME) enable NetworkManager
@@ -20,7 +20,7 @@ automatically for you.</para>
 belong to the <code>networkmanager</code> group:
 
 <programlisting>
-users.extraUsers.youruser.extraGroups = [ "networkmanager" ];
+<link linkend="opt-users.users._name__.extraGroups">users.extraUsers.youruser.extraGroups</link> = [ "networkmanager" ];
 </programlisting>
 </para>
 
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml
index 7c928baaf896..7dbe598cffe2 100644
--- a/nixos/doc/manual/configuration/ssh.xml
+++ b/nixos/doc/manual/configuration/ssh.xml
@@ -10,12 +10,12 @@
 setting:
 
 <programlisting>
-services.openssh.enable = true;
+<xref linkend="opt-services.openssh.enable"/> = true;
 </programlisting>
 
 By default, root logins using a password are disallowed.  They can be
 disabled entirely by setting
-<literal>services.openssh.permitRootLogin</literal> to
+<xref linkend="opt-services.openssh.permitRootLogin"/> to
 <literal>"no"</literal>.</para>
 
 <para>You can declaratively specify authorised RSA/DSA public keys for
@@ -23,7 +23,7 @@ a user as follows:
 
 <!-- FIXME: this might not work if the user is unmanaged. -->
 <programlisting>
-users.extraUsers.alice.openssh.authorizedKeys.keys =
+<link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.alice.openssh.authorizedKeys.keys</link> =
   [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
 </programlisting>
 
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index c6656edff6c8..848b221baa7f 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -12,12 +12,12 @@ management.  In the declarative style, users are specified in
 states that a user account named <literal>alice</literal> shall exist:
 
 <programlisting>
-users.users.alice =
-  { isNormalUser = true;
-    home = "/home/alice";
-    description = "Alice Foobar";
-    extraGroups = [ "wheel" "networkmanager" ];
-    openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
+<xref linkend="opt-users.users"/>.alice =
+  { <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true;
+    <link linkend="opt-users.users._name__.home">home</link> = "/home/alice";
+    <link linkend="opt-users.users._name__.description">description</link> = "Alice Foobar";
+    <link linkend="opt-users.users._name__.extraGroups">extraGroups</link> = [ "wheel" "networkmanager" ];
+    <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
   };
 </programlisting>
 
@@ -32,13 +32,13 @@ a password. However, you can use the <command>passwd</command> program
 to set a password, which is retained across invocations of
 <command>nixos-rebuild</command>.</para>
 
-<para>If you set users.mutableUsers to false, then the contents of /etc/passwd
-and /etc/group will be congruent to your NixOS configuration. For instance,
-if you remove a user from users.users and run nixos-rebuild, the user
-account will cease to exist. Also, imperative commands for managing users
+<para>If you set <xref linkend="opt-users.mutableUsers"/> to false, then the contents of
+<literal>/etc/passwd</literal> and <literal>/etc/group</literal> will be congruent to
+your NixOS configuration. For instance, if you remove a user from <xref linkend="opt-users.users"/>
+and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users
 and groups, such as useradd, are no longer available. Passwords may still be
-assigned by setting the user's <literal>hashedPassword</literal> option. A
-hashed password can be generated using <command>mkpasswd -m sha-512</command>
+assigned by setting the user's <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link>
+option. A hashed password can be generated using <command>mkpasswd -m sha-512</command>
 after installing the <literal>mkpasswd</literal> package.</para>
 
 <para>A user ID (uid) is assigned automatically.  You can also specify
@@ -54,7 +54,7 @@ to the user specification.</para>
 group named <literal>students</literal> shall exist:
 
 <programlisting>
-users.groups.students.gid = 1000;
+<xref linkend="opt-users.groups"/>.students.gid = 1000;
 </programlisting>
 
 As with users, the group ID (gid) is optional and will be assigned
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 1868380dcbfa..6ce43a437009 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -15,12 +15,12 @@ section on wireless networks.</para>
 NixOS will start wpa_supplicant for you if you enable this setting:
 
 <programlisting>
-networking.wireless.enable = true;
+<xref linkend="opt-networking.wireless.enable"/> = true;
 </programlisting>
 
 NixOS lets you specify networks for wpa_supplicant declaratively:
 <programlisting>
-networking.wireless.networks = {
+<xref linkend="opt-networking.wireless.networks"/> = {
   echelon = {
     psk = "abcdefgh";
   };
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index 9c2c59006f15..fd0daf6c6e57 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -9,14 +9,14 @@
 <para>The X Window System (X11) provides the basis of NixOS’ graphical
 user interface.  It can be enabled as follows:
 <programlisting>
-services.xserver.enable = true;
+<xref linkend="opt-services.xserver.enable"/> = true;
 </programlisting>
 The X server will automatically detect and use the appropriate video
 driver from a set of X.org drivers (such as <literal>vesa</literal>
 and <literal>intel</literal>).  You can also specify a driver
 manually, e.g.
 <programlisting>
-services.xserver.videoDrivers = [ "r128" ];
+<xref linkend="opt-services.xserver.videoDrivers"/> = [ "r128" ];
 </programlisting>
 to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
 
@@ -25,13 +25,13 @@ Otherwise, you can only log into a plain undecorated
 <command>xterm</command> window.  Thus you should pick one or more of
 the following lines:
 <programlisting>
-services.xserver.desktopManager.plasma5.enable = true;
-services.xserver.desktopManager.xfce.enable = true;
-services.xserver.desktopManager.gnome3.enable = true;
-services.xserver.windowManager.xmonad.enable = true;
-services.xserver.windowManager.twm.enable = true;
-services.xserver.windowManager.icewm.enable = true;
-services.xserver.windowManager.i3.enable = true;
+<xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
+<xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
+<xref linkend="opt-services.xserver.desktopManager.gnome3.enable"/> = true;
+<xref linkend="opt-services.xserver.windowManager.xmonad.enable"/> = true;
+<xref linkend="opt-services.xserver.windowManager.twm.enable"/> = true;
+<xref linkend="opt-services.xserver.windowManager.icewm.enable"/> = true;
+<xref linkend="opt-services.xserver.windowManager.i3.enable"/> = true;
 </programlisting>
 </para>
 
@@ -40,22 +40,22 @@ program that provides a graphical login prompt and manages the X
 server) is SLiM. You can select an alternative one by picking one
 of the following lines:
 <programlisting>
-services.xserver.displayManager.sddm.enable = true;
-services.xserver.displayManager.lightdm.enable = true;
+<xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
+<xref linkend="opt-services.xserver.displayManager.lightdm.enable"/> = true;
 </programlisting>
 </para>
 
 <para>You can set the keyboard layout (and optionally the layout variant):
 <programlisting>
-services.xserver.layout = "de";
-services.xserver.xkbVariant = "neo";
+<xref linkend="opt-services.xserver.layout"/> = "de";
+<xref linkend="opt-services.xserver.xkbVariant"/> = "neo";
 </programlisting>
 </para>
 
 <para>The X server is started automatically at boot time.  If you
 don’t want this to happen, you can set:
 <programlisting>
-services.xserver.autorun = false;
+<xref linkend="opt-services.xserver.autorun"/> = false;
 </programlisting>
 The X server can then be started manually:
 <screen>
@@ -70,13 +70,13 @@ The X server can then be started manually:
 has better 3D performance than the X.org drivers.  It is not enabled
 by default because it’s not free software.  You can enable it as follows:
 <programlisting>
-services.xserver.videoDrivers = [ "nvidia" ];
+<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidia" ];
 </programlisting>
 Or if you have an older card, you may have to use one of the legacy drivers:
 <programlisting>
-services.xserver.videoDrivers = [ "nvidiaLegacy340" ];
-services.xserver.videoDrivers = [ "nvidiaLegacy304" ];
-services.xserver.videoDrivers = [ "nvidiaLegacy173" ];
+<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy340" ];
+<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy304" ];
+<xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy173" ];
 </programlisting>
 You may need to reboot after enabling this driver to prevent a clash
 with other kernel modules.</para>
@@ -84,7 +84,7 @@ with other kernel modules.</para>
 <para>On 64-bit systems, if you want full acceleration for 32-bit
 programs such as Wine, you should also set the following:
 <programlisting>
-hardware.opengl.driSupport32Bit = true;
+<xref linkend="opt-hardware.opengl.driSupport32Bit"/> = true;
 </programlisting>
 </para>
 
@@ -96,7 +96,7 @@ hardware.opengl.driSupport32Bit = true;
 has better 3D performance than the X.org drivers.  It is not enabled
 by default because it’s not free software.  You can enable it as follows:
 <programlisting>
-services.xserver.videoDrivers = [ "ati_unfree" ];
+<xref linkend="opt-services.xserver.videoDrivers"/> = [ "ati_unfree" ];
 </programlisting>
 You will need to reboot after enabling this driver to prevent a clash
 with other kernel modules.</para>
@@ -104,7 +104,7 @@ with other kernel modules.</para>
 <para>On 64-bit systems, if you want full acceleration for 32-bit
 programs such as Wine, you should also set the following:
 <programlisting>
-hardware.opengl.driSupport32Bit = true;
+<xref linkend="opt-hardware.opengl.driSupport32Bit"/> = true;
 </programlisting>
 </para>
 
@@ -115,12 +115,12 @@ hardware.opengl.driSupport32Bit = true;
 <para>Support for Synaptics touchpads (found in many laptops such as
 the Dell Latitude series) can be enabled as follows:
 <programlisting>
-services.xserver.libinput.enable = true;
+<xref linkend="opt-services.xserver.libinput.enable"/> = true;
 </programlisting>
 The driver has many options (see <xref linkend="ch-options"/>).  For
 instance, the following disables tap-to-click behavior:
 <programlisting>
-services.xserver.libinput.tapping = false;
+<xref linkend="opt-services.xserver.libinput.tapping"/> = false;
 </programlisting>
 Note: the use of <literal>services.xserver.synaptics</literal> is deprecated since NixOS 17.09.
 </para>
diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 18804d2c08be..8cb592faed53 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -9,9 +9,9 @@
     <para>
         To enable the Xfce Desktop Environment, set
         <programlisting>
-services.xserver.desktopManager = {
-    xfce.enable = true;
-    default = "xfce";
+<link linkend="opt-services.xserver.desktopManager.default">services.xserver.desktopManager</link> = {
+  <link linkend="opt-services.xserver.desktopManager.xfce.enable">xfce.enable</link> = true;
+  <link linkend="opt-services.xserver.desktopManager.default">default</link> = "xfce";
 };
         </programlisting>
     </para>
@@ -20,12 +20,12 @@ services.xserver.desktopManager = {
         Optionally, <emphasis>compton</emphasis>
         can be enabled for nice graphical effects, some example settings:
         <programlisting>
-services.compton = {
-  enable          = true;
-  fade            = true;
-  inactiveOpacity = "0.9";
-  shadow          = true;
-  fadeDelta       = 4;
+<link linkend="opt-services.compton.enable">services.compton</link> = {
+  <link linkend="opt-services.compton.enable">enable</link>          = true;
+  <link linkend="opt-services.compton.fade">fade</link>            = true;
+  <link linkend="opt-services.compton.inactiveOpacity">inactiveOpacity</link> = "0.9";
+  <link linkend="opt-services.compton.shadow">shadow</link>          = true;
+  <link linkend="opt-services.compton.fadeDelta">fadeDelta</link>       = 4;
 };
         </programlisting>
     </para>
@@ -33,9 +33,9 @@ services.compton = {
     <para>
         Some Xfce programs are not installed automatically.
         To install them manually (system wide), put them into your
-        <literal>environment.systemPackages</literal>.
+        <xref linkend="opt-environment.systemPackages"/>.
     </para>
-         
+
     <simplesect>
         <title>Thunar Volume Support</title>
 
@@ -44,7 +44,7 @@ services.compton = {
             <emphasis>Thunar</emphasis>
             volume support, put
             <programlisting>
-services.xserver.desktopManager.xfce.enable = true;
+<xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
             </programlisting>
             into your <emphasis>configuration.nix</emphasis>.
         </para>
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
index 4db9020b9606..52d8a292f8be 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -75,7 +75,7 @@ have set <literal>mutableUsers = false</literal>.  Another way is to
 temporarily add the following to your configuration:
 
 <screen>
-users.extraUsers.your-user.initialPassword = "test"  
+<link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.your-user.initialHashedPassword</link> = "test";
 </screen>
 
 <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index ecd020a067a9..11fcb43732a9 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -111,7 +111,7 @@ $ nix-channel --add https://nixos.org/channels/nixos-<replaceable>version</repla
                 <literal>configuration.nix</literal>:</para>
 
             <programlisting>
-boot.loader.grub.extraEntries = ''
+<xref linkend="opt-boot.loader.grub.extraEntries"/> = ''
   menuentry "Ubuntu" {
     search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e
     configfile "($ubuntu)/boot/grub/grub.cfg"
@@ -183,7 +183,7 @@ $ sudo groupdel nixbld</screen>
                 account with <literal>sudo passwd -l root</literal> if you use
                 <literal>sudo</literal>)</para>
 
-            <programlisting>users.extraUsers.root.initialHashedPassword = "";</programlisting>
+              <programlisting><link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = "";</programlisting>
         </listitem>
 
         <listitem>
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index 7fcd22a112cf..2b31b7ed3152 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -42,7 +42,7 @@
 </para>
 
 <programlisting>
-boot.loader.grub.device = "/dev/sda";
+<xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda";
 </programlisting>
 
 <para>
@@ -51,7 +51,7 @@ boot.loader.grub.device = "/dev/sda";
 </para>
 
 <programlisting>
-boot.initrd.checkJournalingFS = false;
+<xref linkend="opt-boot.initrd.checkJournalingFS"/> = false;
 </programlisting>
 
 <para>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index e20b6574b725..f967a7fe2682 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -208,26 +208,29 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif
     <variablelist>
 
       <varlistentry><term>BIOS systems</term>
-      <listitem><para>You <emphasis>must</emphasis> set the option
-    <option>boot.loader.grub.device</option> to specify on which disk
-    the GRUB boot loader is to be installed.  Without it, NixOS cannot
-      boot.</para></listitem></varlistentry>
+        <listitem><para>You <emphasis>must</emphasis> set the option
+            <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
+            the GRUB boot loader is to be installed.  Without it, NixOS cannot
+            boot.</para></listitem></varlistentry>
 
       <varlistentry><term>UEFI systems</term>
-      <listitem><para>You <emphasis>must</emphasis> set the option
-      <option>boot.loader.systemd-boot.enable</option> to <literal>true</literal>.
-      <command>nixos-generate-config</command> should do this automatically for new
-      configurations when booted in
-      UEFI mode.</para>
-      <para>You may want to look at the options starting with
-      <option>boot.loader.efi</option> and <option>boot.loader.systemd-boot</option>
-      as well.</para></listitem></varlistentry>
+        <listitem><para>You <emphasis>must</emphasis> set the option
+            <xref linkend="opt-boot.loader.systemd-boot.enable"/> to <literal>true</literal>.
+            <command>nixos-generate-config</command> should do this automatically for new
+            configurations when booted in
+            UEFI mode.</para>
+          <para>You may want to look at the options starting with
+            <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option> and
+            <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option> as well.
+          </para>
+        </listitem>
+      </varlistentry>
 
     </variablelist>
 
     <para>If there are other operating systems running on the machine before
     installing NixOS, the
-    <option>boot.loader.grub.useOSProber</option> option can be set to
+    <xref linkend="opt-boot.loader.grub.useOSProber"/> option can be set to
     <literal>true</literal> to automatically add them to the grub menu.</para>
 
     <para>Another critical option is <option>fileSystems</option>,
@@ -269,15 +272,15 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif
     <para>As the last step, <command>nixos-install</command> will ask
     you to set the password for the <literal>root</literal> user, e.g.
 
-<screen>
-setting root password...
-Enter new UNIX password: ***
-Retype new UNIX password: ***
-</screen>
+    <screen>
+      setting root password...
+      Enter new UNIX password: ***
+      Retype new UNIX password: ***
+    </screen>
 
     <note>
       <para>
-        To prevent the password prompt, set <code>users.mutableUsers = false;</code> in
+        To prevent the password prompt, set <code><xref linkend="opt-users.mutableUsers"/> = false;</code> in
         <filename>configuration.nix</filename>, which allows unattended installation
         necessary in automation.
       </para>
@@ -290,20 +293,20 @@ Retype new UNIX password: ***
   <listitem>
     <para>If everything went well:
 
-<screen>
-# reboot</screen>
+      <screen>
+        # reboot</screen>
 
   </para></listitem>
 
   <listitem>
 
     <para>You should now be able to boot into the installed NixOS. The
-    GRUB boot menu shows a list of <emphasis>available
-    configurations</emphasis> (initially just one). Every time you
-    change the NixOS configuration (see <link
-    linkend="sec-changing-config">Changing Configuration</link> ), a
-    new item is added to the menu. This allows you to easily roll back
-    to a previous configuration if something goes wrong.</para>
+      GRUB boot menu shows a list of <emphasis>available
+        configurations</emphasis> (initially just one). Every time you
+      change the NixOS configuration (see <link
+        linkend="sec-changing-config">Changing Configuration</link> ), a
+      new item is added to the menu. This allows you to easily roll back
+      to a previous configuration if something goes wrong.</para>
 
     <para>You should log in and change the <literal>root</literal>
     password with <command>passwd</command>.</para>
@@ -376,26 +379,26 @@ drive (here <filename>/dev/sda</filename>).  <xref linkend="ex-config"
 </example>
 
 <example xml:id='ex-config'><title>NixOS Configuration</title>
-<screen>
-{ config, pkgs, ... }:
+  <screen>
+    { config, pkgs, ... }:
 
-{
-  imports =
+    {
+    imports =
     [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
+    ./hardware-configuration.nix
     ];
 
-  boot.loader.grub.device = "/dev/sda";   # <lineannotation>(for BIOS systems only)</lineannotation>
-  boot.loader.systemd-boot.enable = true; # <lineannotation>(for UEFI systems only)</lineannotation>
+    <xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda";   # <lineannotation>(for BIOS systems only)</lineannotation>
+    <xref linkend="opt-boot.loader.systemd-boot.enable"/> = true; # <lineannotation>(for UEFI systems only)</lineannotation>
 
-  # Note: setting fileSystems is generally not
-  # necessary, since nixos-generate-config figures them out
-  # automatically in hardware-configuration.nix.
-  #fileSystems."/".device = "/dev/disk/by-label/nixos";
+    # Note: setting fileSystems is generally not
+    # necessary, since nixos-generate-config figures them out
+    # automatically in hardware-configuration.nix.
+    #<link linkend="opt-fileSystems._name__.device">fileSystems."/".device</link> = "/dev/disk/by-label/nixos";
 
-  # Enable the OpenSSH server.
-  services.sshd.enable = true;
-}</screen>
+    # Enable the OpenSSH server.
+    services.sshd.enable = true;
+    }</screen>
 </example>
 
 <xi:include href="installing-usb.xml" />
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index aee6523345c4..24881c8fec0f 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -119,7 +119,7 @@ able to go back to your original channel.</para></warning>
 the following to <filename>configuration.nix</filename>:
 
 <programlisting>
-system.autoUpgrade.enable = true;
+<xref linkend="opt-system.autoUpgrade.enable"/> = true;
 </programlisting>
 
 This enables a periodically executed systemd service named
@@ -130,7 +130,7 @@ runs, see <command>systemctl list-timers</command>.)  You can also
 specify a channel explicitly, e.g.
 
 <programlisting>
-system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03;
+<xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-17.03;
 </programlisting>
 
 </para>
diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml
index 45d6daf068b3..76ffa8cb7e37 100644
--- a/nixos/modules/i18n/input-method/default.xml
+++ b/nixos/modules/i18n/input-method/default.xml
@@ -6,56 +6,56 @@
 
 <title>Input Methods</title>
 
-<para>Input methods are an operating system component that allows any data, such 
-  as keyboard strokes or mouse movements, to be received as input. In this way 
-  users can enter characters and symbols not found on their input devices. Using 
-  an input method is obligatory for any language that has more graphemes than 
+<para>Input methods are an operating system component that allows any data, such
+  as keyboard strokes or mouse movements, to be received as input. In this way
+  users can enter characters and symbols not found on their input devices. Using
+  an input method is obligatory for any language that has more graphemes than
   there are keys on the keyboard.</para>
 
 <para>The following input methods are available in NixOS:</para>
 
 <itemizedlist>
   <listitem><para>IBus: The intelligent input bus.</para></listitem>
-  <listitem><para>Fcitx: A customizable lightweight input 
+  <listitem><para>Fcitx: A customizable lightweight input
       method.</para></listitem>
   <listitem><para>Nabi: A Korean input method based on XIM.</para></listitem>
-  <listitem><para>Uim: The universal input method, is a library with a XIM 
+  <listitem><para>Uim: The universal input method, is a library with a XIM
       bridge.</para></listitem>
 </itemizedlist>
 
 <section><title>IBus</title>
 
-<para>IBus is an Intelligent Input Bus. It provides full featured and user 
+<para>IBus is an Intelligent Input Bus. It provides full featured and user
   friendly input method user interface.</para>
 
 <para>The following snippet can be used to configure IBus:</para>
 
 <programlisting>
 i18n.inputMethod = {
-  enabled = "ibus";
-  ibus.engines = with pkgs.ibus-engines; [ anthy hangul mozc ];
+  <link linkend="opt-i18n.inputMethod.enabled">enabled</link> = "ibus";
+  <link linkend="opt-i18n.inputMethod.ibus.engines">ibus.engines</link> = with pkgs.ibus-engines; [ anthy hangul mozc ];
 };
 </programlisting>
 
-<para><literal>i18n.inputMethod.ibus.engines</literal> is optional and can be 
+<para><literal>i18n.inputMethod.ibus.engines</literal> is optional and can be
   used to add extra IBus engines.</para>
 
 <para>Available extra IBus engines are:</para>
 
 <itemizedlist>
-  <listitem><para>Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a 
-      system for Japanese input method. It converts Hiragana text to Kana Kanji 
+  <listitem><para>Anthy (<literal>ibus-engines.anthy</literal>): Anthy is a
+      system for Japanese input method. It converts Hiragana text to Kana Kanji
       mixed text.</para></listitem>
-  <listitem><para>Hangul (<literal>ibus-engines.hangul</literal>): Korean input 
+  <listitem><para>Hangul (<literal>ibus-engines.hangul</literal>): Korean input
       method.</para></listitem>
-  <listitem><para>m17n (<literal>ibus-engines.m17n</literal>): m17n is an input 
-      method that uses input methods and corresponding icons in the m17n 
+  <listitem><para>m17n (<literal>ibus-engines.m17n</literal>): m17n is an input
+      method that uses input methods and corresponding icons in the m17n
       database.</para></listitem>
-  <listitem><para>mozc (<literal>ibus-engines.mozc</literal>): A Japanese input 
+  <listitem><para>mozc (<literal>ibus-engines.mozc</literal>): A Japanese input
       method from Google.</para></listitem>
-  <listitem><para>Table (<literal>ibus-engines.table</literal>): An input method 
+  <listitem><para>Table (<literal>ibus-engines.table</literal>): An input method
       that load tables of input methods.</para></listitem>
-  <listitem><para>table-others (<literal>ibus-engines.table-others</literal>): 
+  <listitem><para>table-others (<literal>ibus-engines.table-others</literal>):
       Various table-based input methods. To use this, and any other table-based
       input methods, it must appear in the list of engines along with
       <literal>table</literal>. For example:
@@ -72,71 +72,71 @@ ibus.engines = with pkgs.ibus-engines; [ table table-others ];
 
 <section><title>Fcitx</title>
 
-<para>Fcitx is an input method framework with extension support. It has three 
-  built-in Input Method Engine, Pinyin, QuWei and Table-based input 
+<para>Fcitx is an input method framework with extension support. It has three
+  built-in Input Method Engine, Pinyin, QuWei and Table-based input
   methods.</para>
 <para>The following snippet can be used to configure Fcitx:</para>
 
 <programlisting>
 i18n.inputMethod = {
-  enabled = "fcitx";
-  fcitx.engines = with pkgs.fcitx-engines; [ mozc hangul m17n ];
+  <link linkend="opt-i18n.inputMethod.enabled">enabled</link> = "fcitx";
+  <link linkend="opt-i18n.inputMethod.fcitx.engines">fcitx.engines</link> = with pkgs.fcitx-engines; [ mozc hangul m17n ];
 };
 </programlisting>
 
-<para><literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be 
+<para><literal>i18n.inputMethod.fcitx.engines</literal> is optional and can be
   used to add extra Fcitx engines.</para>
 
 <para>Available extra Fcitx engines are:</para>
 
 <itemizedlist>
-  <listitem><para>Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a 
-      system for Japanese input method. It converts Hiragana text to Kana Kanji 
+  <listitem><para>Anthy (<literal>fcitx-engines.anthy</literal>): Anthy is a
+      system for Japanese input method. It converts Hiragana text to Kana Kanji
       mixed text.</para></listitem>
-  <listitem><para>Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is 
-      an intelligent Zhuyin input method. It is one of the most popular input 
+  <listitem><para>Chewing (<literal>fcitx-engines.chewing</literal>): Chewing is
+      an intelligent Zhuyin input method. It is one of the most popular input
       methods among Traditional Chinese Unix users.</para></listitem>
-  <listitem><para>Hangul (<literal>fcitx-engines.hangul</literal>): Korean input 
+  <listitem><para>Hangul (<literal>fcitx-engines.hangul</literal>): Korean input
       method.</para></listitem>
-  <listitem><para>Unikey (<literal>fcitx-engines.unikey</literal>): Vietnamese input 
+  <listitem><para>Unikey (<literal>fcitx-engines.unikey</literal>): Vietnamese input
       method.</para></listitem>
-  <listitem><para>m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input 
-      method that uses input methods and corresponding icons in the m17n 
+  <listitem><para>m17n (<literal>fcitx-engines.m17n</literal>): m17n is an input
+      method that uses input methods and corresponding icons in the m17n
       database.</para></listitem>
-  <listitem><para>mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input 
+  <listitem><para>mozc (<literal>fcitx-engines.mozc</literal>): A Japanese input
       method from Google.</para></listitem>
-  <listitem><para>table-others (<literal>fcitx-engines.table-others</literal>): 
+  <listitem><para>table-others (<literal>fcitx-engines.table-others</literal>):
       Various table-based input methods.</para></listitem>
 </itemizedlist>
 </section>
 
 <section><title>Nabi</title>
 
-<para>Nabi is an easy to use Korean X input method. It allows you to enter 
-  phonetic Korean characters (hangul) and pictographic Korean characters 
+<para>Nabi is an easy to use Korean X input method. It allows you to enter
+  phonetic Korean characters (hangul) and pictographic Korean characters
   (hanja).</para>
 <para>The following snippet can be used to configure Nabi:</para>
 
 <programlisting>
 i18n.inputMethod = {
-  enabled = "nabi";
+  <link linkend="opt-i18n.inputMethod.enabled">enabled</link> = "nabi";
 };
 </programlisting>
 </section>
 
 <section><title>Uim</title>
 
-<para>Uim (short for "universal input method") is a multilingual input method 
+<para>Uim (short for "universal input method") is a multilingual input method
   framework. Applications can use it through so-called bridges.</para>
 <para>The following snippet can be used to configure uim:</para>
 
 <programlisting>
 i18n.inputMethod = {
-  enabled = "uim";
+  <link linkend="opt-i18n.inputMethod.enabled">enabled</link> = "uim";
 };
 </programlisting>
 
-<para>Note: The <literal>i18n.inputMethod.uim.toolbar</literal> option can be 
+<para>Note: The <xref linkend="opt-i18n.inputMethod.uim.toolbar"/> option can be
   used to choose uim toolbar.</para>
 
 </section>
diff --git a/nixos/modules/programs/digitalbitbox/doc.xml b/nixos/modules/programs/digitalbitbox/doc.xml
index 7acbc2fc4dde..a26653dda535 100644
--- a/nixos/modules/programs/digitalbitbox/doc.xml
+++ b/nixos/modules/programs/digitalbitbox/doc.xml
@@ -15,9 +15,9 @@
     installed by setting <literal>programs.digitalbitbox</literal>
     to <literal>true</literal> in a manner similar to
 
-    <programlisting>
-      programs.digitalbitbox.enable = true;
-    </programlisting>
+<programlisting>
+<xref linkend="opt-programs.digitalbitbox.enable"/> = true;
+</programlisting>
 
     and bundles the <literal>digitalbitbox</literal> package (see <xref
       linkend="sec-digitalbitbox-package" />), which contains the
@@ -46,11 +46,11 @@
       <literal>digitalbitbox</literal> package which could be installed
       as follows:
 
-      <programlisting>
-        environment.systemPackages = [
-          pkgs.digitalbitbox
-        ];
-      </programlisting>
+<programlisting>
+<xref linkend="opt-environment.systemPackages"/> = [
+  pkgs.digitalbitbox
+];
+</programlisting>
     </para>
   </section>
 
@@ -62,9 +62,9 @@
       The digitalbitbox hardware package enables the udev rules for
       Digital Bitbox devices and may be installed as follows:
 
-      <programlisting>
-        hardware.digitalbitbox.enable = true;
-      </programlisting>
+<programlisting>
+<xref linkend="opt-hardware.digitalbitbox.enable"/> = true;
+</programlisting>
     </para>
 
     <para>
@@ -72,14 +72,14 @@
       the <literal>udevRule51</literal> and <literal>udevRule52</literal>
       attributes by means of overriding as follows:
 
-      <programlisting>
-        programs.digitalbitbox = {
-          enable = true;
-          package = pkgs.digitalbitbox.override {
-            udevRule51 = "something else";
-          };
-        };
-      </programlisting>
+<programlisting>
+programs.digitalbitbox = {
+  <link linkend="opt-programs.digitalbitbox.enable">enable</link> = true;
+  <link linkend="opt-programs.digitalbitbox.package">package</link> = pkgs.digitalbitbox.override {
+    udevRule51 = "something else";
+  };
+};
+</programlisting>
     </para>
   </section>
 </chapter>
diff --git a/nixos/modules/programs/plotinus.xml b/nixos/modules/programs/plotinus.xml
index 85b0e023e6c1..91740ee16ec2 100644
--- a/nixos/modules/programs/plotinus.xml
+++ b/nixos/modules/programs/plotinus.xml
@@ -17,7 +17,7 @@
 <para>To enable Plotinus, add the following to your <filename>configuration.nix</filename>:
 
 <programlisting>
-programs.plotinus.enable = true;
+<xref linkend="opt-programs.plotinus.enable"/> = true;
 </programlisting>
 
 </para>
diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml
index 6130ed82ed38..7cdc554989ea 100644
--- a/nixos/modules/security/acme.xml
+++ b/nixos/modules/security/acme.xml
@@ -48,9 +48,9 @@ http {
 <filename>configuration.nix</filename>:
 
 <programlisting>
-security.acme.certs."foo.example.com" = {
-  webroot = "/var/www/challenges";
-  email = "foo@example.com";
+<xref linkend="opt-security.acme.certs"/>."foo.example.com" = {
+  <link linkend="opt-security.acme.certs._name_.webroot">webroot</link> = "/var/www/challenges";
+  <link linkend="opt-security.acme.certs._name_.email">email</link> = "foo@example.com";
 };
 </programlisting>
 </para>
@@ -58,17 +58,17 @@ security.acme.certs."foo.example.com" = {
 <para>The private key <filename>key.pem</filename> and certificate
 <filename>fullchain.pem</filename> will be put into
 <filename>/var/lib/acme/foo.example.com</filename>. The target directory can
-be configured with the option <literal>security.acme.directory</literal>.
+be configured with the option <xref linkend="opt-security.acme.directory"/>.
 </para>
 
 <para>Refer to <xref linkend="ch-options" /> for all available configuration
-options for the <literal>security.acme</literal> module.</para>
+options for the <link linkend="opt-security.acme.certs">security.acme</link> module.</para>
 
 </section>
 
 <section><title>Using ACME certificates in Nginx</title>
 <para>NixOS supports fetching ACME certificates for you by setting
-<literal>enableACME = true;</literal> in a virtualHost config. We
+  <literal><link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;</literal> in a virtualHost config. We
 first create self-signed placeholder certificates in place of the
 real ACME certs. The placeholder certs are overwritten when the ACME
 certs arrive. For <literal>foo.example.com</literal> the config would
@@ -77,13 +77,13 @@ look like.
 
 <programlisting>
 services.nginx = {
-  enable = true;
-  virtualHosts = {
+  <link linkend="opt-services.nginx.enable">enable = true;</link>
+  <link linkend="opt-services.nginx.virtualHosts">virtualHosts</link> = {
     "foo.example.com" = {
-      forceSSL = true;
-      enableACME = true;
+      <link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true;
+      <link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;
       locations."/" = {
-        root = "/var/www";
+        <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.root">root</link> = "/var/www";
       };
     };
   };
diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml
index 5715ee7ac165..d69341eb3cde 100644
--- a/nixos/modules/security/hidepid.xml
+++ b/nixos/modules/security/hidepid.xml
@@ -8,9 +8,9 @@
 
   <para>
     Setting
-    <programlisting>
-      security.hideProcessInformation = true;
-    </programlisting>
+<programlisting>
+<xref linkend="opt-security.hideProcessInformation"/> = true;
+</programlisting>
     ensures that access to process information is restricted to the
     owning user.  This implies, among other things, that command-line
     arguments remain private.  Unless your deployment relies on unprivileged
@@ -25,9 +25,9 @@
 
   <para>
     To allow a service <replaceable>foo</replaceable> to run without process information hiding, set
-    <programlisting>
-      systemd.services.<replaceable>foo</replaceable>.serviceConfig.SupplementaryGroups = [ "proc" ];
-    </programlisting>
+<programlisting>
+<link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.<replaceable>foo</replaceable>.serviceConfig</link>.SupplementaryGroups = [ "proc" ];
+</programlisting>
   </para>
 
 </chapter>
diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml
index a98026942959..98a631c0cd32 100644
--- a/nixos/modules/services/databases/postgresql.xml
+++ b/nixos/modules/services/databases/postgresql.xml
@@ -23,15 +23,15 @@
 <filename>configuration.nix</filename>:
 
 <programlisting>
-services.postgresql.enable = true;
-services.postgresql.package = pkgs.postgresql94;
+<xref linkend="opt-services.postgresql.enable"/> = true;
+<xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql94;
 </programlisting>
 
 Note that you are required to specify the desired version of
 PostgreSQL (e.g. <literal>pkgs.postgresql94</literal>). Since
 upgrading your PostgreSQL version requires a database dump and reload
 (see below), NixOS cannot provide a default value for
-<option>services.postgresql.package</option> such as the most recent
+<xref linkend="opt-services.postgresql.package"/> such as the most recent
 release of PostgreSQL.</para>
 
 <!--
@@ -49,10 +49,10 @@ alice=>
 
 <para>By default, PostgreSQL stores its databases in
 <filename>/var/db/postgresql</filename>. You can override this using
-<option>services.postgresql.dataDir</option>, e.g.
+<xref linkend="opt-services.postgresql.dataDir"/>, e.g.
 
 <programlisting>
-services.postgresql.dataDir = "/data/postgresql";
+<xref linkend="opt-services.postgresql.dataDir"/> = "/data/postgresql";
 </programlisting>
 
 </para>
@@ -69,7 +69,7 @@ services.postgresql.dataDir = "/data/postgresql";
 
 <section><title>Options</title>
 
-<para>FIXME: auto-generated list of module options.</para>
+  <para>A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>.</para>
 
 </section>
 
diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml
index dd66bac442c6..dfab5ce4a79d 100644
--- a/nixos/modules/services/editors/emacs.xml
+++ b/nixos/modules/services/editors/emacs.xml
@@ -404,10 +404,10 @@ in [...]
       user service for Emacs daemon, add the following to your
       <filename>configuration.nix</filename>:
 
-      <programlisting><![CDATA[
-services.emacs.enable = true;
-services.emacs.package = import /home/cassou/.emacs.d { pkgs = pkgs; };
-]]></programlisting>
+<programlisting>
+<xref linkend="opt-services.emacs.enable"/> = true;
+<xref linkend="opt-services.emacs.package"/> = import /home/cassou/.emacs.d { pkgs = pkgs; };
+</programlisting>
     </para>
 
     <para>
@@ -462,7 +462,7 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
     <!--<title><command>emacsclient</command> as the Default Editor</title>-->
 
     <para>
-      If <varname>services.emacs.defaultEditor</varname> is
+      If <xref linkend="opt-services.emacs.defaultEditor"/> is
       <literal>true</literal>, the <varname>EDITOR</varname> variable
       will be set to a wrapper script which launches
       <command>emacsclient</command>.
@@ -497,10 +497,10 @@ emacsclient --create-frame --tty  # opens a new frame on the current terminal
       Emacs daemon is not wanted for all users, it is possible to
       install the service but not globally enable it:
 
-      <programlisting><![CDATA[
-services.emacs.enable = false;
-services.emacs.install = true;
-]]></programlisting>
+<programlisting>
+<xref linkend="opt-services.emacs.enable"/> = false;
+<xref linkend="opt-services.emacs.install"/> = true;
+</programlisting>
     </para>
 
     <para>
@@ -582,7 +582,7 @@ services.emacs.install = true;
     <para>
       To install the DocBook 5.0 schemas, either add
       <varname>pkgs.docbook5</varname> to
-      <varname>environment.systemPackages</varname> (<link
+      <xref linkend="opt-environment.systemPackages"/> (<link
       linkend="sec-declarative-package-mgmt">NixOS</link>), or run
       <literal>nix-env -i pkgs.docbook5</literal>
       (<link linkend="sec-ad-hoc-packages">Nix</link>).
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
index 4b00f50abd63..3306ba8e9b11 100644
--- a/nixos/modules/services/misc/gitlab.xml
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -18,19 +18,18 @@ webserver to proxy HTTP requests to the socket.</para>
     frontend proxy:
 
 <programlisting>
-    services.nginx = {
-      enable = true;
-      recommendedGzipSettings = true;
-      recommendedOptimisation = true;
-      recommendedProxySettings = true;
-      recommendedTlsSettings = true;
-      virtualHosts."git.example.com" = {
-        enableACME = true;
-        forceSSL = true;
-        locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket";
-      };
-    };
-'';
+<link linkend="opt-services.nginx.enable">services.nginx</link> = {
+  <link linkend="opt-services.nginx.enable">enable</link> = true;
+  <link linkend="opt-services.nginx.recommendedGzipSettings">recommendedGzipSettings</link> = true;
+  <link linkend="opt-services.nginx.recommendedOptimisation">recommendedOptimisation</link> = true;
+  <link linkend="opt-services.nginx.recommendedProxySettings">recommendedProxySettings</link> = true;
+  <link linkend="opt-services.nginx.recommendedTlsSettings">recommendedTlsSettings</link> = true;
+  <link linkend="opt-services.nginx.virtualHosts">virtualHosts</link>."git.example.com" = {
+    <link linkend="opt-services.nginx.virtualHosts._name_.enableACME">enableACME</link> = true;
+    <link linkend="opt-services.nginx.virtualHosts._name_.forceSSL">forceSSL</link> = true;
+    <link linkend="opt-services.nginx.virtualHosts._name_.locations._name_.proxyPass">locations."/".proxyPass</link> = "http://unix:/run/gitlab/gitlab-workhorse.socket";
+  };
+};
 </programlisting>
 </para>
 
@@ -49,24 +48,24 @@ all data like the repositories and uploads will be stored.</para>
 
 <programlisting>
 services.gitlab = {
-  enable = true;
-  databasePassword = "eXaMpl3";
-  initialRootPassword = "UseNixOS!";
-  https = true;
-  host = "git.example.com";
-  port = 443;
-  user = "git";
-  group = "git";
+  <link linkend="opt-services.gitlab.enable">enable</link> = true;
+  <link linkend="opt-services.gitlab.databasePassword">databasePassword</link> = "eXaMpl3";
+  <link linkend="opt-services.gitlab.initialRootPassword">initialRootPassword</link> = "UseNixOS!";
+  <link linkend="opt-services.gitlab.https">https</link> = true;
+  <link linkend="opt-services.gitlab.host">host</link> = "git.example.com";
+  <link linkend="opt-services.gitlab.port">port</link> = 443;
+  <link linkend="opt-services.gitlab.user">user</link> = "git";
+  <link linkend="opt-services.gitlab.group">group</link> = "git";
   smtp = {
-    enable = true;
-    address = "localhost";
-    port = 25;
+    <link linkend="opt-services.gitlab.smtp.enable">enable</link> = true;
+    <link linkend="opt-services.gitlab.smtp.address">address</link> = "localhost";
+    <link linkend="opt-services.gitlab.smtp.port">port</link> = 25;
   };
   secrets = {
-    db = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6";
-    secret = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3";
-    otp = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI";
-    jws = ''
+    <link linkend="opt-services.gitlab.secrets.db">db</link> = "uPgq1gtwwHiatiuE0YHqbGa5lEIXH7fMsvuTNgdzJi8P0Dg12gibTzBQbq5LT7PNzcc3BP9P1snHVnduqtGF43PgrQtU7XL93ts6gqe9CBNhjtaqUwutQUDkygP5NrV6";
+    <link linkend="opt-services.gitlab.secrets.secret">secret</link> = "devzJ0Tz0POiDBlrpWmcsjjrLaltyiAdS8TtgT9YNBOoUcDsfppiY3IXZjMVtKgXrFImIennFGOpPN8IkP8ATXpRgDD5rxVnKuTTwYQaci2NtaV1XxOQGjdIE50VGsR3";
+    <link linkend="opt-services.gitlab.secrets.otp">otp</link> = "e1GATJVuS2sUh7jxiPzZPre4qtzGGaS22FR50Xs1TerRVdgI3CBVUi5XYtQ38W4xFeS4mDqi5cQjExE838iViSzCdcG19XSL6qNsfokQP9JugwiftmhmCadtsnHErBMI";
+    <link linkend="opt-services.gitlab.secrets.jws">jws</link> = ''
       -----BEGIN RSA PRIVATE KEY-----
       MIIEpAIBAAKCAQEArrtx4oHKwXoqUbMNqnHgAklnnuDon3XG5LJB35yPsXKv/8GK
       ke92wkI+s1Xkvsp8tg9BIY/7c6YK4SR07EWL+dB5qwctsWR2Q8z+/BKmTx9D99pm
@@ -96,7 +95,7 @@ services.gitlab = {
       -----END RSA PRIVATE KEY-----
     '';
   };
-  extraConfig = {
+  <link linkend="opt-services.gitlab.extraConfig">extraConfig</link> = {
     gitlab = {
       email_from = "gitlab-no-reply@example.com";
       email_display_name = "Example GitLab";
@@ -116,7 +115,7 @@ secret from <literal>config/secrets.yml</literal> located in your Gitlab state
 folder.</para>
 
 <para>Refer to <xref linkend="ch-options" /> for all available configuration
-options for the <literal>services.gitlab</literal> module.</para>
+options for the <link linkend="opt-services.gitlab.enable">services.gitlab</link> module.</para>
 
 </section>
 
diff --git a/nixos/modules/services/misc/taskserver/doc.xml b/nixos/modules/services/misc/taskserver/doc.xml
index 6d4d2a9b488c..75493ac1394f 100644
--- a/nixos/modules/services/misc/taskserver/doc.xml
+++ b/nixos/modules/services/misc/taskserver/doc.xml
@@ -55,7 +55,7 @@
       Because Taskserver by default only provides scripts to setup users
       imperatively, the <command>nixos-taskserver</command> tool is used for
       addition and deletion of organisations along with users and groups defined
-      by <option>services.taskserver.organisations</option> and as well for
+      by <xref linkend="opt-services.taskserver.organisations"/> and as well for
       imperative set up.
     </para>
 
@@ -99,10 +99,10 @@
       For example, let's say you have the following configuration:
 <screen>
 {
-  services.taskserver.enable = true;
-  services.taskserver.fqdn = "server";
-  services.taskserver.listenHost = "::";
-  services.taskserver.organisations.my-company.users = [ "alice" ];
+  <xref linkend="opt-services.taskserver.enable"/> = true;
+  <xref linkend="opt-services.taskserver.fqdn"/> = "server";
+  <xref linkend="opt-services.taskserver.listenHost"/> = "::";
+  <link linkend="opt-services.taskserver.organisations._name_.users">services.taskserver.organisations.my-company.users</link> = [ "alice" ];
 }
 </screen>
       This creates an organisation called <literal>my-company</literal> with the
@@ -136,7 +136,7 @@ $ ssh server nixos-taskserver user export my-company alice | sh
 
     <para>
       If you set any options within
-      <option>service.taskserver.pki.manual.*</option>,
+      <link linkend="opt-services.taskserver.pki.manual.ca.cert">service.taskserver.pki.manual</link>.*,
       <command>nixos-taskserver</command> won't issue certificates, but you can
       still use it for adding or removing user accounts.
     </para>
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.xml b/nixos/modules/services/networking/dnscrypt-proxy.xml
index 555c6df4d551..ff1088698589 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.xml
+++ b/nixos/modules/services/networking/dnscrypt-proxy.xml
@@ -19,7 +19,7 @@
   <para>
     To enable the client proxy, set
     <programlisting>
-      services.dnscrypt-proxy.enable = true;
+<xref linkend="opt-services.dnscrypt-proxy.enable"/> = true;
     </programlisting>
   </para>
 
@@ -38,17 +38,17 @@
     DNS client, change the default proxy listening port to a
     non-standard value and point the other client to it:
     <programlisting>
-      services.dnscrypt-proxy.localPort = 43;
+<xref linkend="opt-services.dnscrypt-proxy.localPort"/> = 43;
     </programlisting>
   </para>
 
   <sect2><title>dnsmasq</title>
   <para>
     <programlisting>
-      {
-        services.dnsmasq.enable = true;
-        services.dnsmasq.servers = [ "127.0.0.1#43" ];
-      }
+{
+  <xref linkend="opt-services.dnsmasq.enable"/> = true;
+  <xref linkend="opt-services.dnsmasq.servers"/> = [ "127.0.0.1#43" ];
+}
     </programlisting>
   </para>
   </sect2>
@@ -56,10 +56,10 @@
   <sect2><title>unbound</title>
   <para>
     <programlisting>
-      {
-        services.unbound.enable = true;
-        services.unbound.forwardAddresses = [ "127.0.0.1@43" ];
-      }
+{
+  <xref linkend="opt-services.unbound.enable"/> = true;
+  <xref linkend="opt-services.unbound.forwardAddresses"/> = [ "127.0.0.1@43" ];
+}
     </programlisting>
   </para>
   </sect2>

From c93579d0fa772c95c0298d4d838ef53bdd07982d Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 7 Mar 2018 18:45:46 +0100
Subject: [PATCH 0093/3370] fflas-ffpack: enable checks, disable simd

---
 .../libraries/fflas-ffpack/default.nix        | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index edea352ae2dd..82ece22b7c7d 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,4 +1,7 @@
-{stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack}:
+{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack
+, gmpxx
+, optimize ? false # impure
+}:
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "fflas-ffpack";
@@ -9,9 +12,31 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl";
   };
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  checkInputs = [
+    gmpxx
+  ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+  ] ++ stdenv.lib.optionals doCheck checkInputs;
   buildInputs = [ givaro (liblapack.override {shared = true;}) openblas];
-  configureFlags = "--with-blas-libs=-lopenblas --with-lapack-libs=-llapack";
+  configureFlags = [
+    "--with-blas-libs=-lopenblas"
+    "--with-lapack-libs=-llapack"
+  ] ++ stdenv.lib.optionals (!optimize) [
+    # disable SIMD instructions (which are enabled *when available* by default)
+    "--disable-sse"
+    "--disable-sse2"
+    "--disable-sse3"
+    "--disable-ssse3"
+    "--disable-sse41"
+    "--disable-sse42"
+    "--disable-avx"
+    "--disable-avx2"
+    "--disable-fma"
+    "--disable-fma4"
+  ];
+  doCheck = true;
   meta = {
     inherit version;
     description = ''Finite Field Linear Algebra Subroutines'';

From b9219912de7ea94e7d420f3846d56a79f67be373 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 6 Apr 2018 18:59:30 +0200
Subject: [PATCH 0094/3370] =?UTF-8?q?cairo:=201.14.10=20=E2=86=92=201.15.1?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 6a7beb1cc1a8..6d7b79c0b20a 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,25 +9,17 @@
 
 assert glSupport -> libGL != null;
 
-let inherit (stdenv.lib) optional optionals; in
-
-stdenv.mkDerivation rec {
-  name = "cairo-1.14.10";
+let
+  version = "1.15.10";
+  inherit (stdenv.lib) optional optionals;
+in stdenv.mkDerivation rec {
+  name = "cairo-${version}";
 
   src = fetchurl {
-    url = "http://cairographics.org/releases/${name}.tar.xz";
-    sha256 = "02banr0wxckq62nbhc3mqidfdh2q956i2r7w2hd9bjgjb238g1vy";
+    url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
+    sha256 = "14l3jll98pjdlpm8f972v0spzcsf6y5nz85y2k8iybyg6ihj5jk2";
   };
 
-  patches = [
-    # from https://bugs.freedesktop.org/show_bug.cgi?id=98165
-    (fetchpatch {
-      name = "cairo-CVE-2016-9082.patch";
-      url = "https://bugs.freedesktop.org/attachment.cgi?id=127421";
-      sha256 = "03sfyaclzlglip4pvfjb4zj4dmm8mlphhxl30mb6giinkc74bfri";
-    })
-  ];
-
   outputs = [ "out" "dev" "devdoc" ];
   outputBin = "dev"; # very small
 

From 2b6596962b82270ad6ba3e00211372035553e5dd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 7 Apr 2018 01:52:15 +0200
Subject: [PATCH 0095/3370] =?UTF-8?q?librsvg:=202.42.2=20=E2=86=92=202.42.?=
 =?UTF-8?q?3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index c2e1739117b5..7ee1733f34d2 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -5,14 +5,14 @@
 
 let
   pname = "librsvg";
-  version = "2.42.2";
+  version = "2.42.3";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0c550a0bffef768a436286116c03d9f6cd3f97f5021c13e7f093b550fac12562";
+    sha256 = "0mz6rdxpnnjnk15nahlwpa2gba0ws1hs2dnyk1agqw5ip522qkvh";
   };
 
   outputs = [ "out" "dev" ];

From 8bf523e17cc69e00c872a449aa8a31c484b72286 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 7 Apr 2018 01:53:34 +0200
Subject: [PATCH 0096/3370] =?UTF-8?q?python.pkgs.pycairo:=201.15.4=20?=
 =?UTF-8?q?=E2=86=92=201.16.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../python-modules/pycairo/default.nix        | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 39c06bff3bf7..091ac809a9bb 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -2,8 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pycairo";
-  version = "1.15.4";
-  name = "${pname}-${version}";
+  version = "1.16.3";
 
   disabled = isPyPy;
 
@@ -11,13 +10,21 @@ buildPythonPackage rec {
     owner = "pygobject";
     repo = "pycairo";
     rev = "v${version}";
-    sha256 = "02vzmfxx8nl6dbwzc911wcj7hqspgqz6v9xmq6579vwfla0vaglv";
+    sha256 = "0clk6wrfls3fa1xrn844762qfaw6gs4ivwkrfysidbzmlbxhpngl";
   };
 
-  postPatch = ''
-    # we are unable to pass --prefix to bdist_wheel
-    # see https://github.com/NixOS/nixpkgs/pull/32034#discussion_r153285955
-    substituteInPlace setup.py --replace '"prefix": self.install_base' "'prefix': '$out'"
+  # We need to create the pkgconfig file but it cannot be installed as a wheel since wheels
+  # are supposed to be relocatable and do not support --prefix option
+  buildPhase = ''
+    ${python.interpreter} setup.py build
+  '';
+
+  installPhase = ''
+    ${python.interpreter} setup.py install --skip-build --prefix="$out" --optimize=1
+  '';
+
+  checkPhase = ''
+    ${python.interpreter} setup.py test
   '';
 
   nativeBuildInputs = [ pkgconfig ];

From 36ce7ac867168e735c86db55529a00f8609d598c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 11 Apr 2018 12:19:47 +0200
Subject: [PATCH 0097/3370] python.pkgs.deprecation: init at 2.0.2

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

diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix
new file mode 100644
index 000000000000..63c3fcd74cac
--- /dev/null
+++ b/pkgs/development/python-modules/deprecation/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, python, packaging, unittest2 }:
+
+buildPythonPackage rec {
+  pname = "deprecation";
+  version = "2.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e8d0dc5a17d7d551730e5f23ff3a53fc9e438364b9efb47d41c3e9b05522eabe";
+  };
+
+  propagatedBuildInputs = [ packaging ];
+
+  checkInputs = [ unittest2 ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with lib; {
+    description = "A library to handle automated deprecations";
+    homepage = https://deprecation.readthedocs.io/;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ce9bde2c97d..b3ada10d65a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2101,6 +2101,8 @@ in {
 
   demjson = callPackage ../development/python-modules/demjson { };
 
+  deprecation = callPackage ../development/python-modules/deprecation { };
+
   derpconf = callPackage ../development/python-modules/derpconf { };
 
   deskcon = self.buildPythonPackage rec {

From 13dadd48b5eed7b65f55d3d4068d0fa0a7ba9944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 11 Apr 2018 12:23:06 +0200
Subject: [PATCH 0098/3370] conan: 1.1.1 -> 1.2.3

---
 .../tools/build-managers/conan/default.nix         | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix
index 04d7d93455e9..849c722e5548 100644
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -20,12 +20,12 @@ let newPython = python.override {
 };
 
 in newPython.pkgs.buildPythonApplication rec {
-  version = "1.1.1"; # remove patch below when updating
+  version = "1.2.3";
   pname = "conan";
 
   src = newPython.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1k1r401bc9fgmhd5n5f29mjcn346r3zdrm7p28nwpr2r2p3fslrl";
+    sha256 = "623e92d99cd0f4ec92552b23af66a6bb066071e213659f502480bb9a96d7be23";
   };
 
   checkInputs = with newPython.pkgs; [
@@ -39,15 +39,7 @@ in newPython.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with newPython.pkgs; [
     requests fasteners pyyaml pyjwt colorama patch
     bottle pluginbase six distro pylint node-semver
-    future pygments mccabe
-  ];
-
-  patches = [
-    # already merged, remove with the next package update
-    (fetchpatch {
-      url = "https://github.com/conan-io/conan/commit/51cc4cbd51ac8f9b9efa2bf678a2d7810e273ff3.patch";
-      sha256 = "0d93g4hjpfk8z870imwdswkw5qba2h5zhfgwwijiqhr2pv7fl1y7";
-    })
+    future pygments mccabe deprecation
   ];
 
   preCheck = ''

From 59b75e06a658ad0ad62fd752bd5d1862f2458803 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 12 Apr 2018 09:16:59 -0700
Subject: [PATCH 0099/3370] brotli: 1.0.3 -> 1.0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/brotli/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -h’ got 0 exit code
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --help’ got 0 exit code
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli -V’ and found version 1.0.4
- ran ‘/nix/store/7izjihjc6qc7z96hqvbh6y56rs7q63nd-brotli-1.0.4/bin/brotli --version’ and found version 1.0.4
- directory tree listing: https://gist.github.com/8f1f6ce7cb6e005fe8d7cb00a4f50222
---
 pkgs/tools/compression/brotli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
index 707b8f0d799f..1a42ba03d464 100644
--- a/pkgs/tools/compression/brotli/default.nix
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "brotli-${version}";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "brotli";
     rev = "v" + version;
-    sha256 = "1hlkqgkm2gv6q83dswg6b19hpw8j33y6iw924j8r647pd4qg1xs7";
+    sha256 = "0n5snycxgwqj2v8sgxiqxq4zqh5ydx70dr7qa4ygizs02ms69n1i";
   };
 
   nativeBuildInputs = [ cmake ];

From 435176a64b7090f07574f4290161271132796322 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 12 Apr 2018 10:45:10 -0700
Subject: [PATCH 0100/3370] gnome3.webkitgtk: 2.20.0 -> 2.20.1 (#38824)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/webkitgtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/4iba6cp8lj5v53lzk6j3djrnf790byj4-webkitgtk-2.20.1/bin/WebKitWebDriver -h’ got 0 exit code
- ran ‘/nix/store/4iba6cp8lj5v53lzk6j3djrnf790byj4-webkitgtk-2.20.1/bin/WebKitWebDriver --help’ got 0 exit code
- found 2.20.1 with grep in /nix/store/4iba6cp8lj5v53lzk6j3djrnf790byj4-webkitgtk-2.20.1
- directory tree listing: https://gist.github.com/a60788ffc43ea1bedb466120462ff111
---
 pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
index 27524504872e..3cc26b512c89 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.20.0";
+  version = "2.20.1";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0g0an3pc2yz13gzpaysfgch2yp510gw1qcpk0xr8m6mx43vl1xjp";
+    sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23";
   };
 
   patches = optionals stdenv.isDarwin [

From 8fccc7e1df9a984d41e6feb6bf677365eaaeabf0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 10 Jan 2018 01:50:28 +0100
Subject: [PATCH 0101/3370] deluge: use mkEnableOption

---
 nixos/modules/services/torrent/deluge.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix
index ec1e97f4125e..bff22cd13594 100644
--- a/nixos/modules/services/torrent/deluge.nix
+++ b/nixos/modules/services/torrent/deluge.nix
@@ -11,10 +11,7 @@ in {
   options = {
     services = {
       deluge = {
-        enable = mkOption {
-          default = false;
-          description = "Start the Deluge daemon";
-        };
+        enable = mkEnableOption "Deluge daemon";
 
         openFilesLimit = mkOption {
           default = openFilesLimit;
@@ -25,14 +22,7 @@ in {
         };
       };
 
-      deluge.web = {
-        enable = mkOption {
-          default = false;
-          description = ''
-            Start Deluge Web daemon.
-          '';
-        };
-      };
+      deluge.web.enable = mkEnableOption "Deluge Web daemon";
     };
   };
 

From fe840cd3339eba56855840630d22889ee1424bfb Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 10 Jan 2018 01:52:15 +0100
Subject: [PATCH 0102/3370] deluge: add test

---
 nixos/release.nix      |  1 +
 nixos/tests/deluge.nix | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 nixos/tests/deluge.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 4fd77e6471cf..39a6f34aa985 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -264,6 +264,7 @@ in rec {
   tests.containers-hosts = callTest tests/containers-hosts.nix {};
   tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
   tests.couchdb = callTest tests/couchdb.nix {};
+  tests.deluge = callTest tests/deluge.nix {};
   tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {};
   tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {};
   tests.docker-edge = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-edge.nix {};
diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix
new file mode 100644
index 000000000000..6119fd58447c
--- /dev/null
+++ b/nixos/tests/deluge.nix
@@ -0,0 +1,29 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "deluge";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ flokli ];
+  };
+
+  nodes = {
+    server =
+      { pkgs, config, ... }:
+
+      { services.deluge = {
+          enable = true;
+          web.enable = true;
+        };
+        networking.firewall.allowedTCPPorts = [ 8112 ];
+      };
+
+    client = { };
+  };
+
+  testScript = ''
+    startAll;
+
+    $server->waitForUnit("deluged");
+    $server->waitForUnit("delugeweb");
+    $client->waitForUnit("network.target");
+    $client->waitUntilSucceeds("curl --fail http://server:8112");
+  '';
+})

From 4707dc6454904bee0bacd3a53829bcc76b4f0667 Mon Sep 17 00:00:00 2001
From: Piotr Bogdan <ppbogdan@gmail.com>
Date: Sat, 14 Apr 2018 15:16:34 +0100
Subject: [PATCH 0103/3370] {cc,bintools}-wrapper: fix removal of unsupported
 hardening flags

---
 pkgs/build-support/bintools-wrapper/add-hardening.sh | 2 +-
 pkgs/build-support/cc-wrapper/add-hardening.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh
index a15be821659f..b7180870860a 100644
--- a/pkgs/build-support/bintools-wrapper/add-hardening.sh
+++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh
@@ -11,7 +11,7 @@ done
 
 # Remove unsupported flags.
 for flag in @hardening_unsupported_flags@; do
-  unset -v hardeningEnableMap["$flag"]
+  unset -v "hardeningEnableMap[$flag]"
 done
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index 026e48671447..fc40fe7408b6 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -11,7 +11,7 @@ done
 
 # Remove unsupported flags.
 for flag in @hardening_unsupported_flags@; do
-  unset -v hardeningEnableMap["$flag"]
+  unset -v "hardeningEnableMap[$flag]"
 done
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then

From d26c032d1499b3b119f195cc4833355da53f2284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 15 Apr 2018 21:28:09 +0100
Subject: [PATCH 0104/3370] nspr: 4.18 -> 4.19

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

diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 17805f32afb1..ce18498ee858 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl
 , CoreServices ? null }:
 
-let version = "4.18"; in
+let version = "4.19"; in
 
 stdenv.mkDerivation {
   name = "nspr-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    sha256 = "0d7vr3wrgp73qbywrvdkikk8vq1s1n9vhf62db80g1zqkg05g5mq";
+    sha256 = "0agpv3f17h8kmzi0ifibaaxc1k3xc0q61wqw3l6r2xr2z8bmkn9f";
   };
 
   outputs = [ "out" "dev" ];

From 2adc297e52413fc60299b823984b569ecc55b557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 15 Apr 2018 21:28:28 +0100
Subject: [PATCH 0105/3370] nss: 3.35 -> 3.36.1

---
 pkgs/development/libraries/nss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 8662b956ce22..840b349035b1 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -15,11 +15,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.35";
+  version = "3.36.1";
 
   src = fetchurl {
-    url = "mirror://mozilla/security/nss/releases/NSS_3_35_RTM/src/${name}.tar.gz";
-    sha256 = "1ypn68z9ncbbshi3184ywrhx5i846lyd72gps1grzqzdkgh7s4pl";
+    url = "mirror://mozilla/security/nss/releases/NSS_3_36_1_RTM/src/${name}.tar.gz";
+    sha256 = "1zrb49mp7cy3snnday1zv8d76h1mgppbcwxnlkqsgxlga8fl89b0";
   };
 
   buildInputs = [ perl zlib sqlite ]

From d3d0c0196ebffe23eaab27086ef1a426990ef3cc Mon Sep 17 00:00:00 2001
From: Matthew Glazar <strager.nds@gmail.com>
Date: Sun, 15 Apr 2018 21:06:16 -0700
Subject: [PATCH 0106/3370] clang: refactor post-install comments

Throughout the evolution of the Clang packages, some comments have
become misplaced. Put some of Clang's postInstall comments next to the
lines they refer to.
---
 pkgs/development/compilers/llvm/5/clang/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index b5aea54b5771..8a25db3ef41a 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -50,10 +50,10 @@ let
 
     outputs = [ "out" "lib" "python" ];
 
-    # Clang expects to find LLVMgold in its own prefix
-    # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
+      # Clang expects to find LLVMgold in its own prefix
       ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      # Clang expects to find sanitizer libraries in its own prefix
       ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
       ln -sv $out/bin/clang $out/bin/cpp
 

From 2505aa51a449e5237808b2b6dc6a90105da90caa Mon Sep 17 00:00:00 2001
From: Matthew Glazar <strager.nds@gmail.com>
Date: Sun, 15 Apr 2018 21:08:24 -0700
Subject: [PATCH 0107/3370] clang: fix install on Darwin

As of Nix 2.0, building the `user-environment` package on macOS (Darwin)
fails because LLVMgold.so is a broken symlink. Fix the issue by not
creating the symlink in the first place, since it wouldn't be used on
Darwin anyway.
---
 pkgs/development/compilers/llvm/5/clang/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index 8a25db3ef41a..36f09a42308a 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -52,7 +52,9 @@ let
 
     postInstall = ''
       # Clang expects to find LLVMgold in its own prefix
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
       # Clang expects to find sanitizer libraries in its own prefix
       ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
       ln -sv $out/bin/clang $out/bin/cpp

From b901c40a8e2aeabafedbaeec6e07f3ce4567d42a Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Thu, 12 Apr 2018 18:45:14 +0200
Subject: [PATCH 0108/3370] oauth2_proxy: update module for extraConfig support

---
 .../services/security/oauth2_proxy.nix        | 125 ++++++++++--------
 1 file changed, 71 insertions(+), 54 deletions(-)

diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index ef48d52e7a94..d4557a7dfe21 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -6,70 +6,80 @@ with lib;
 let
   cfg = config.services.oauth2_proxy;
 
-  # Use like:
-  #   repeatedArgs (arg: "--arg=${arg}") args
-  repeatedArgs = concatMapStringsSep " ";
-
   # oauth2_proxy provides many options that are only relevant if you are using
   # a certain provider. This set maps from provider name to a function that
   # takes the configuration and returns a string that can be inserted into the
   # command-line to launch oauth2_proxy.
   providerSpecificOptions = {
-    azure = cfg: ''
-      --azure-tenant=${cfg.azure.tenant} \
-      --resource=${cfg.azure.resource} \
-    '';
+    azure = cfg: {
+      azure.tenant = cfg.azure.tenant;
+      resource = cfg.azure.resource;
+    };
 
-    github = cfg: ''
-      ${optionalString (!isNull cfg.github.org) "--github-org=${cfg.github.org}"} \
-      ${optionalString (!isNull cfg.github.team) "--github-org=${cfg.github.team}"} \
-    '';
+    github = cfg: { github = {
+      inherit (cfg.github) org team;
+    }; };
 
-    google = cfg: ''
-      --google-admin-email=${cfg.google.adminEmail} \
-      --google-service-account=${cfg.google.serviceAccountJSON} \
-      ${repeatedArgs (group: "--google-group=${group}") cfg.google.groups} \
-    '';
+    google = cfg: { google = with cfg.google; {
+      admin-email = adminEmail;
+      service-account = serviceAccountJSON;
+      group = groups;
+    }; };
   };
 
   authenticatedEmailsFile = pkgs.writeText "authenticated-emails" cfg.email.addresses;
 
-  getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: "") cfg;
+  getProviderOptions = cfg: provider: providerSpecificOptions.${provider} or (_: {}) cfg;
 
-  mkCommandLine = cfg: ''
-    --provider='${cfg.provider}' \
-    ${optionalString (!isNull cfg.email.addresses) "--authenticated-emails-file='${authenticatedEmailsFile}'"} \
-    --approval-prompt='${cfg.approvalPrompt}' \
-    ${optionalString (cfg.passBasicAuth && !isNull cfg.basicAuthPassword) "--basic-auth-password='${cfg.basicAuthPassword}'"} \
-    --client-id='${cfg.clientID}' \
-    --client-secret='${cfg.clientSecret}' \
-    ${optionalString (!isNull cfg.cookie.domain) "--cookie-domain='${cfg.cookie.domain}'"} \
-    --cookie-expire='${cfg.cookie.expire}' \
-    --cookie-httponly=${boolToString cfg.cookie.httpOnly} \
-    --cookie-name='${cfg.cookie.name}' \
-    --cookie-secret='${cfg.cookie.secret}' \
-    --cookie-secure=${boolToString cfg.cookie.secure} \
-    ${optionalString (!isNull cfg.cookie.refresh) "--cookie-refresh='${cfg.cookie.refresh}'"} \
-    ${optionalString (!isNull cfg.customTemplatesDir) "--custom-templates-dir='${cfg.customTemplatesDir}'"} \
-    ${repeatedArgs (x: "--email-domain='${x}'") cfg.email.domains} \
-    --http-address='${cfg.httpAddress}' \
-    ${optionalString (!isNull cfg.htpasswd.file) "--htpasswd-file='${cfg.htpasswd.file}' --display-htpasswd-form=${boolToString cfg.htpasswd.displayForm}"} \
-    ${optionalString (!isNull cfg.loginURL) "--login-url='${cfg.loginURL}'"} \
-    --pass-access-token=${boolToString cfg.passAccessToken} \
-    --pass-basic-auth=${boolToString cfg.passBasicAuth} \
-    --pass-host-header=${boolToString cfg.passHostHeader} \
-    --proxy-prefix='${cfg.proxyPrefix}' \
-    ${optionalString (!isNull cfg.profileURL) "--profile-url='${cfg.profileURL}'"} \
-    ${optionalString (!isNull cfg.redeemURL) "--redeem-url='${cfg.redeemURL}'"} \
-    ${optionalString (!isNull cfg.redirectURL) "--redirect-url='${cfg.redirectURL}'"} \
-    --request-logging=${boolToString cfg.requestLogging} \
-    ${optionalString (!isNull cfg.scope) "--scope='${cfg.scope}'"} \
-    ${repeatedArgs (x: "--skip-auth-regex='${x}'") cfg.skipAuthRegexes} \
-    ${optionalString (!isNull cfg.signatureKey) "--signature-key='${cfg.signatureKey}'"} \
-    --upstream='${cfg.upstream}' \
-    ${optionalString (!isNull cfg.validateURL) "--validate-url='${cfg.validateURL}'"} \
-    ${optionalString cfg.tls.enable "--tls-cert='${cfg.tls.certificate}' --tls-key='${cfg.tls.key}' --https-address='${cfg.tls.httpsAddress}'"} \
-  '' + getProviderOptions cfg cfg.provider;
+  allConfig = with cfg; {
+    inherit (cfg) provider scope upstream;
+    approval-prompt = approvalPrompt;
+    basic-auth-password = basicAuthPassword;
+    client-id = clientID;
+    client-secret = clientSecret;
+    custom-templates-dir = customTemplatesDir;
+    email-domain = email.domains;
+    http-address = httpAddress;
+    login-url = loginURL;
+    pass-access-token = passAccessToken;
+    pass-basic-auth = passBasicAuth;
+    pass-host-header = passHostHeader;
+    proxy-prefix = proxyPrefix;
+    profile-url = profileURL;
+    redeem-url = redeemURL;
+    redirect-url = redirectURL;
+    request-logging = requestLogging;
+    skip-auth-regex = skipAuthRegexes;
+    signature-key = signatureKey;
+    validate-url = validateURL;
+    htpasswd-file = htpasswd.file;
+    cookie = {
+      inherit (cookie) domain secure expire name secret refresh;
+      httponly = cookie.httpOnly;
+    };
+  } // lib.optionalAttrs (!isNull cfg.email.addresses) {
+    authenticated-emails-file = authenticatedEmailsFile;
+  } // lib.optionalAttrs (cfg.passBasicAuth) {
+    basic-auth-password = cfg.basicAuthPassword;
+  } // lib.optionalAttrs (!isNull cfg.htpasswd.file) {
+    display-htpasswd-file = cfg.htpasswd.displayForm;
+  } // lib.optionalAttrs tls.enable {
+    tls-cert = tls.certificate;
+    tls-key = tls.key;
+    https-address = tls.httpsAddress;
+  } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig;
+
+  mapConfig = key: attr:
+  if (!isNull attr && attr != []) then (
+    if (builtins.typeOf attr) == "set" then concatStringsSep " "
+      (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else
+    if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else
+    if (builtins.typeOf attr) == "bool" then "--${key}=${boolToString attr}" else
+    if (builtins.typeOf attr) == "string" then "--${key}='${attr}'" else
+    "--${key}=${toString attr}")
+    else "";
+
+  configString = concatStringsSep " " (mapAttrsToList mapConfig allConfig);
 in
 {
   options.services.oauth2_proxy = {
@@ -365,7 +375,7 @@ in
       };
 
       secret = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
         description = ''
           The seed string for secure cookies.
         '';
@@ -494,6 +504,13 @@ in
       '';
     };
 
+    extraConfig = mkOption {
+      default = {};
+      description = ''
+        Extra config to pass to oauth2_proxy.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
@@ -511,7 +528,7 @@ in
       serviceConfig = {
         User = "oauth2_proxy";
         Restart = "always";
-        ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${mkCommandLine cfg}";
+        ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}";
       };
     };
 

From a037cbd46bab2553921c5d5de51641bfdcf902a9 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Mon, 16 Apr 2018 14:06:22 +0200
Subject: [PATCH 0109/3370] oauth2_proxy: add keyFile, make some options
 optional

---
 .../services/security/oauth2_proxy.nix        | 37 +++++++++++++++++--
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index d4557a7dfe21..cf41625d16c8 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -20,7 +20,7 @@ let
       inherit (cfg.github) org team;
     }; };
 
-    google = cfg: { google = with cfg.google; {
+    google = cfg: { google = with cfg.google; optionalAttrs (groups != []) {
       admin-email = adminEmail;
       service-account = serviceAccountJSON;
       group = groups;
@@ -57,6 +57,7 @@ let
       inherit (cookie) domain secure expire name secret refresh;
       httponly = cookie.httpOnly;
     };
+    set-xauthrequest = setXauthrequest;
   } // lib.optionalAttrs (!isNull cfg.email.addresses) {
     authenticated-emails-file = authenticatedEmailsFile;
   } // lib.optionalAttrs (cfg.passBasicAuth) {
@@ -120,7 +121,7 @@ in
     };
 
     clientID = mkOption {
-      type = types.str;
+      type = types.nullOr types.str;
       description = ''
         The OAuth Client ID.
       '';
@@ -128,7 +129,7 @@ in
     };
 
     clientSecret = mkOption {
-      type = types.str;
+      type = types.nullOr types.str;
       description = ''
         The OAuth Client Secret.
       '';
@@ -282,7 +283,8 @@ in
     ####################################################
     # UPSTREAM Configuration
     upstream = mkOption {
-      type = types.commas;
+      type = with types; coercedTo string (x: [x]) (listOf string);
+      default = [];
       description = ''
         The http url(s) of the upstream endpoint or <literal>file://</literal>
         paths for static files. Routing is based on the path.
@@ -504,6 +506,14 @@ in
       '';
     };
 
+    setXauthrequest = mkOption {
+      type = types.nullOr types.bool;
+      default = null;
+      description = ''
+        Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode).
+      '';
+    };
+
     extraConfig = mkOption {
       default = {};
       description = ''
@@ -511,10 +521,28 @@ in
       '';
     };
 
+    keyFile = mkOption {
+      type = types.nullOr types.string;
+      default = null;
+      description = ''
+        oauth2_proxy allows passing sensitive configuration via environment variables.
+        Make a file that contains lines like
+        OAUTH2_PROXY_CLIENT_SECRET=asdfasdfasdf.apps.googleuserscontent.com
+        and specify the path here.
+      '';
+      example = "/run/keys/oauth2_proxy";
+    };
+
   };
 
   config = mkIf cfg.enable {
 
+    services.oauth2_proxy = mkIf (!isNull cfg.keyFile) {
+      clientID = mkDefault null;
+      clientSecret = mkDefault null;
+      cookie.secret = mkDefault null;
+    };
+
     users.extraUsers.oauth2_proxy = {
       description = "OAuth2 Proxy";
     };
@@ -529,6 +557,7 @@ in
         User = "oauth2_proxy";
         Restart = "always";
         ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}";
+        EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile;
       };
     };
 

From 7292c5a5701bacc4188a00e0399a92aa748ec6a5 Mon Sep 17 00:00:00 2001
From: Reuben D'Netto <rdnetto@gmail.com>
Date: Tue, 17 Apr 2018 09:19:55 +1000
Subject: [PATCH 0110/3370] Fixed indentation

---
 .../doc/manual/configuration/config-file.xml  |  4 +--
 .../doc/manual/configuration/ipv4-config.xml  |  5 ++-
 .../doc/manual/configuration/ipv6-config.xml  |  5 ++-
 nixos/doc/manual/configuration/user-mgmt.xml  | 14 ++++----
 .../installing-from-other-distro.xml          | 10 ++++--
 nixos/doc/manual/installation/installing.xml  | 35 +++++++++----------
 6 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index 60a4dac97d5d..d4ca15bb3e72 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -29,8 +29,8 @@ form <literal><replaceable>name</replaceable> =
 { config, pkgs, ... }:
 
 { <xref linkend="opt-services.httpd.enable"/> = true;
-<xref linkend="opt-services.httpd.adminAddr"/> = "alice@example.org";
-<xref linkend="opt-services.httpd.documentRoot"/> = "/webroot";
+  <xref linkend="opt-services.httpd.adminAddr"/> = "alice@example.org";
+  <xref linkend="opt-services.httpd.documentRoot"/> = "/webroot";
 }
 </programlisting>
 
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index f3ce4af39b9f..fbc9695c6014 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -12,7 +12,10 @@ interfaces.  However, you can configure an interface manually as
 follows:
 
 <programlisting>
-<link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ { address = "192.168.1.2"; prefixLength = 24; } ];
+<link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ {
+  address = "192.168.1.2";
+  prefixLength = 24;
+} ];
 </programlisting>
 
 Typically you’ll also want to set a default gateway and set of name
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
index 6b0ba0d48f01..e8960dc8930c 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -26,7 +26,10 @@ example, we use interface <varname>eth0</varname>):
 DHCPv6. You can configure an interface manually:
 
 <programlisting>
-<link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ { address = "fe00:aa:bb:cc::2"; prefixLength = 64; } ];
+<link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ {
+  address = "fe00:aa:bb:cc::2";
+  prefixLength = 64;
+} ];
 </programlisting>
 </para>
 
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index 848b221baa7f..1456a5894119 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -12,13 +12,13 @@ management.  In the declarative style, users are specified in
 states that a user account named <literal>alice</literal> shall exist:
 
 <programlisting>
-<xref linkend="opt-users.users"/>.alice =
-  { <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true;
-    <link linkend="opt-users.users._name__.home">home</link> = "/home/alice";
-    <link linkend="opt-users.users._name__.description">description</link> = "Alice Foobar";
-    <link linkend="opt-users.users._name__.extraGroups">extraGroups</link> = [ "wheel" "networkmanager" ];
-    <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
-  };
+<xref linkend="opt-users.users"/>.alice = {
+  <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true;
+  <link linkend="opt-users.users._name__.home">home</link> = "/home/alice";
+  <link linkend="opt-users.users._name__.description">description</link> = "Alice Foobar";
+  <link linkend="opt-users.users._name__.extraGroups">extraGroups</link> = [ "wheel" "networkmanager" ];
+  <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
+};
 </programlisting>
 
 Note that <literal>alice</literal> is a member of the
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 11fcb43732a9..7e6ddb05cd66 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -183,7 +183,9 @@ $ sudo groupdel nixbld</screen>
                 account with <literal>sudo passwd -l root</literal> if you use
                 <literal>sudo</literal>)</para>
 
-              <programlisting><link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = "";</programlisting>
+              <programlisting>
+<link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = "";
+              </programlisting>
         </listitem>
 
         <listitem>
@@ -243,13 +245,15 @@ $ sudo groupdel nixbld</screen>
 
             <screen>
 $ sudo touch /etc/NIXOS
-$ sudo touch /etc/NIXOS_LUSTRATE</screen>
+$ sudo touch /etc/NIXOS_LUSTRATE
+            </screen>
 
             <para>Let's also make sure the NixOS configuration files are kept
                 once we reboot on NixOS:</para>
 
             <screen>
-$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE</screen>
+$ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE
+            </screen>
         </listitem>
 
         <listitem>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index f967a7fe2682..ba6098d917d0 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -273,9 +273,9 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif
     you to set the password for the <literal>root</literal> user, e.g.
 
     <screen>
-      setting root password...
-      Enter new UNIX password: ***
-      Retype new UNIX password: ***
+setting root password...
+Enter new UNIX password: ***
+Retype new UNIX password: ***
     </screen>
 
     <note>
@@ -380,25 +380,24 @@ drive (here <filename>/dev/sda</filename>).  <xref linkend="ex-config"
 
 <example xml:id='ex-config'><title>NixOS Configuration</title>
   <screen>
-    { config, pkgs, ... }:
-
-    {
-    imports =
-    [ # Include the results of the hardware scan.
+{ config, pkgs, ... }: {
+  imports = [
+    # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ];
+  ];
 
-    <xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda";   # <lineannotation>(for BIOS systems only)</lineannotation>
-    <xref linkend="opt-boot.loader.systemd-boot.enable"/> = true; # <lineannotation>(for UEFI systems only)</lineannotation>
+  <xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda";   # <lineannotation>(for BIOS systems only)</lineannotation>
+  <xref linkend="opt-boot.loader.systemd-boot.enable"/> = true; # <lineannotation>(for UEFI systems only)</lineannotation>
 
-    # Note: setting fileSystems is generally not
-    # necessary, since nixos-generate-config figures them out
-    # automatically in hardware-configuration.nix.
-    #<link linkend="opt-fileSystems._name__.device">fileSystems."/".device</link> = "/dev/disk/by-label/nixos";
+  # Note: setting fileSystems is generally not
+  # necessary, since nixos-generate-config figures them out
+  # automatically in hardware-configuration.nix.
+  #<link linkend="opt-fileSystems._name__.device">fileSystems."/".device</link> = "/dev/disk/by-label/nixos";
 
-    # Enable the OpenSSH server.
-    services.sshd.enable = true;
-    }</screen>
+  # Enable the OpenSSH server.
+  services.sshd.enable = true;
+}
+  </screen>
 </example>
 
 <xi:include href="installing-usb.xml" />

From 4018d44641afb0312348c0a6c846331ec5224943 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 17 Apr 2018 09:03:05 +0000
Subject: [PATCH 0111/3370] Revert "nixos/version: fix nixops pre 1.6
 compatibility"

This reverts commit 70c6f6572dda0f2516bad812857ef814ec710a12.
---
 nixos/modules/misc/version.nix | 15 ---------------
 nixos/modules/rename.nix       |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 7519d9176982..b8f0a223c910 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -16,21 +16,6 @@ in
 
   options.system = {
 
-    # XXX: Reintroduce old options to make nixops before 1.6 able to evaluate configurations
-    # XXX: Remove after nixops has been bumped to a compatible version
-    nixosVersion = mkOption {
-      readOnly = true;
-      internal = true;
-      type = types.str;
-      default = config.system.nixos.version;
-    };
-    nixosVersionSuffix = mkOption {
-      readOnly = true;
-      internal = true;
-      type = types.str;
-      default = config.system.nixos.versionSuffix;
-    };
-
     nixos.version = mkOption {
       internal = true;
       type = types.str;
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0c3ac054292d..ff90547b8a31 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -197,9 +197,9 @@ with lib;
     (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
 
     # misc/version.nix
-    #(mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
+    (mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
     (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ])
-    #(mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
+    (mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
     (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ])
     (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ])
     (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ])

From b57a6e9a5f5690a11e6e8013c764bd091ca2a8ca Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 6 Apr 2018 02:12:49 +0000
Subject: [PATCH 0112/3370] nixos: rename.nix: fix bugs

Introduced in 286b007bd327a1e8d6d1fe66702b951f2fd6e29a and then
in 2e6b796761672e0e3ed685487007bb0d99126d91.

This a proper fix for what 70c6f6572dda0f2516bad812857ef814ec710a12 tried to do.
Removing the "config" prefix triggers the bug on pure nixos too, not only
on nixops.
---
 nixos/modules/rename.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index ff90547b8a31..02ed2752cfa1 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -187,22 +187,20 @@ with lib;
     (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "kde5" ] [ "services" "xserver" "desktopManager" "plasma5" ])
 
     # Fontconfig
-    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "config" "fonts" "fontconfig" "allowBitmaps" ])
-    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "allowType1" ] [ "config" "fonts" "fontconfig" "allowType1" ])
-    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "config" "fonts" "fontconfig" "useEmbeddedBitmaps" ])
-    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "config" "fonts" "fontconfig" "forceAutohint" ])
-    (mkRenamedOptionModule [ "config" "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "config" "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
+    (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowBitmaps" ] [ "fonts" "fontconfig" "allowBitmaps" ])
+    (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "allowType1" ] [ "fonts" "fontconfig" "allowType1" ])
+    (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "useEmbeddedBitmaps" ] [ "fonts" "fontconfig" "useEmbeddedBitmaps" ])
+    (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "forceAutohint" ] [ "fonts" "fontconfig" "forceAutohint" ])
+    (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "renderMonoTTFAsBitmap" ] [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ])
 
     # Profile splitting
     (mkRenamedOptionModule [ "virtualization" "growPartition" ] [ "boot" "growPartition" ])
 
     # misc/version.nix
-    (mkRenamedOptionModule [ "config" "system" "nixosVersion" ] [ "config" "system" "nixos" "version" ])
-    (mkRenamedOptionModule [ "config" "system" "nixosRelease" ] [ "config" "system" "nixos" "release" ])
-    (mkRenamedOptionModule [ "config" "system" "nixosVersionSuffix" ] [ "config" "system" "nixos" "versionSuffix" ])
-    (mkRenamedOptionModule [ "config" "system" "nixosRevision" ] [ "config" "system" "nixos" "revision" ])
-    (mkRenamedOptionModule [ "config" "system" "nixosCodeName" ] [ "config" "system" "nixos" "codeName" ])
-    (mkRenamedOptionModule [ "config" "system" "nixosLabel" ] [ "config" "system" "nixos" "label" ])
+    (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ])
+    (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])
+    (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])
+    (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])
 
     # Users
     (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])

From e5b678698b2fd5ec49a9502bdb5a01acf1bff91b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 17 Apr 2018 02:31:12 -0700
Subject: [PATCH 0113/3370] geoclue2: 2.4.7 -> 2.4.8

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/geoclue/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.8 with grep in /nix/store/94izsg39mjz2f8z4wp0z4i2kxpwj8gv4-geoclue-2.4.8
- directory tree listing: https://gist.github.com/387fefa5c6ac00efbebe272c600f309f
---
 pkgs/development/libraries/geoclue/2.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/geoclue/2.0.nix b/pkgs/development/libraries/geoclue/2.0.nix
index 495a113391e3..4d348c92171b 100644
--- a/pkgs/development/libraries/geoclue/2.0.nix
+++ b/pkgs/development/libraries/geoclue/2.0.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "geoclue-2.4.7";
+  name = "geoclue-2.4.8";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/geoclue/releases/2.4/${name}.tar.xz";
-    sha256 = "19hfmr8fa1js8ynazdyjxlyrqpjn6m1719ay70ilga4rayxrcyyi";
+    sha256 = "08yg1r7m0n9hwyvcy769qkmkf8lslqwv69cjfffwnc3zm5km25qj";
   };
 
   outputs = [ "out" "dev" ];

From b81aa02800795724fe0a01e7544c49b04a40994a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 17 Apr 2018 12:40:05 +0300
Subject: [PATCH 0114/3370] firewall service: run stop commands in reload

Do cleanup of user-created additional rules.

Of course it'd be much better to just use iptables-{save,restore} for
declarative management, but as it's still not there...
---
 nixos/modules/services/networking/firewall.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix
index 20c0b0acf165..c4bd0e7f9eef 100644
--- a/nixos/modules/services/networking/firewall.nix
+++ b/nixos/modules/services/networking/firewall.nix
@@ -242,6 +242,9 @@ let
 
     # Don't allow traffic to leak out until the script has completed
     ip46tables -A INPUT -j nixos-drop
+
+    ${cfg.extraStopCommands}
+
     if ${startScript}; then
       ip46tables -D INPUT -j nixos-drop 2>/dev/null || true
     else

From 50f568e2d5cfcbcbdbaad4ba6fc7133d9f422536 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 17 Apr 2018 02:41:37 -0700
Subject: [PATCH 0115/3370] ethtool: 4.15 -> 4.16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ethtool/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/gaiqa1ygxahd49bpb8zzc7fp4i1mml63-ethtool-4.16/bin/ethtool -h’ got 0 exit code
- ran ‘/nix/store/gaiqa1ygxahd49bpb8zzc7fp4i1mml63-ethtool-4.16/bin/ethtool --help’ got 0 exit code
- ran ‘/nix/store/gaiqa1ygxahd49bpb8zzc7fp4i1mml63-ethtool-4.16/bin/ethtool --version’ and found version 4.16
- found 4.16 with grep in /nix/store/gaiqa1ygxahd49bpb8zzc7fp4i1mml63-ethtool-4.16
- directory tree listing: https://gist.github.com/03539f0a0b1a6c9a35f832b19650ba47
---
 pkgs/tools/misc/ethtool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix
index 2527c34feebb..62c782b26fec 100644
--- a/pkgs/tools/misc/ethtool/default.nix
+++ b/pkgs/tools/misc/ethtool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ethtool-${version}";
-  version = "4.15";
+  version = "4.16";
 
   src = fetchurl {
     url = "mirror://kernel/software/network/ethtool/${name}.tar.xz";
-    sha256 = "06pr3s7wg2pbvfbf7js61bgh3caff4qf50nqqk3cgz9z90rgvxvi";
+    sha256 = "00ss07jc7p276d83f6jpafgwyc9yiribciyqcgx9j86v49kpm5py";
   };
 
   meta = with stdenv.lib; {

From 02b022a9b2a672a17b2c72573aa155b371362308 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 17 Apr 2018 02:45:07 -0700
Subject: [PATCH 0116/3370] file: 5.32 -> 5.33
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/file/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/n5afz3w8g0mj9pf5qcndb3kdz4jbljca-file-5.33/bin/file --help’ got 0 exit code
- ran ‘/nix/store/n5afz3w8g0mj9pf5qcndb3kdz4jbljca-file-5.33/bin/file help’ got 0 exit code
- found 5.33 with grep in /nix/store/n5afz3w8g0mj9pf5qcndb3kdz4jbljca-file-5.33
- directory tree listing: https://gist.github.com/b6f0a44bc22e88f13fe5dbc4f56d9296
---
 pkgs/tools/misc/file/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 3765f9134308..aeb43d7c1151 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "file-${version}";
-  version = "5.32";
+  version = "5.33";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
       "https://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "0l1bfa0icng9vdwya00ff48fhvjazi5610ylbhl35qi13d6xqfc6";
+    sha256 = "1iipnwjkag7q04zjkaqic41r9nlw0ml6mhqian6qkkbisb1whlhw";
   };
 
   nativeBuildInputs = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) file;

From 11fd378f73898fe53db75f2cf6e59bf351d6c187 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 17 Apr 2018 09:03:12 +0200
Subject: [PATCH 0117/3370] gnupatch: fix CVE-2018-6951

fixes #39045
---
 pkgs/tools/text/gnupatch/CVE-2018-6951.patch | 28 ++++++++++++++++++++
 pkgs/tools/text/gnupatch/default.nix         |  5 ++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/text/gnupatch/CVE-2018-6951.patch

diff --git a/pkgs/tools/text/gnupatch/CVE-2018-6951.patch b/pkgs/tools/text/gnupatch/CVE-2018-6951.patch
new file mode 100644
index 000000000000..22d5f061c332
--- /dev/null
+++ b/pkgs/tools/text/gnupatch/CVE-2018-6951.patch
@@ -0,0 +1,28 @@
+From f290f48a621867084884bfff87f8093c15195e6a Mon Sep 17 00:00:00 2001
+From: Andreas Gruenbacher <agruen@gnu.org>
+Date: Mon, 12 Feb 2018 16:48:24 +0100
+Subject: Fix segfault with mangled rename patch
+
+http://savannah.gnu.org/bugs/?53132
+* src/pch.c (intuit_diff_type): Ensure that two filenames are specified
+for renames and copies (fix the existing check).
+---
+ src/pch.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/pch.c b/src/pch.c
+index ff9ed2c..bc6278c 100644
+--- a/src/pch.c
++++ b/src/pch.c
+@@ -974,7 +974,8 @@ intuit_diff_type (bool need_header, mode_t *p_file_type)
+     if ((pch_rename () || pch_copy ())
+ 	&& ! inname
+ 	&& ! ((i == OLD || i == NEW) &&
+-	      p_name[! reverse] &&
++	      p_name[reverse] && p_name[! reverse] &&
++	      name_is_valid (p_name[reverse]) &&
+ 	      name_is_valid (p_name[! reverse])))
+       {
+ 	say ("Cannot %s file without two valid file names\n", pch_rename () ? "rename" : "copy");
+-- 
+cgit v1.0-41-gc330
diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix
index 3840811a3e36..c83eab2e2ef6 100644
--- a/pkgs/tools/text/gnupatch/default.nix
+++ b/pkgs/tools/text/gnupatch/default.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
     sha256 = "1zfqy4rdcy279vwn2z1kbv19dcfw25d2aqy9nzvdkq5bjzd0nqdc";
   };
 
+  patches = [
+    # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=f290f48a621867084884bfff87f8093c15195e6a
+    ./CVE-2018-6951.patch
+  ];
+
   buildInputs = stdenv.lib.optional doCheck ed;
 
   configureFlags = stdenv.lib.optionals (hostPlatform != buildPlatform) [

From 7b73c7f49a0a4673987b661b9d679ec595704d89 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 17 Apr 2018 09:50:21 -0500
Subject: [PATCH 0118/3370] clang: only link if LLVMgold exists

buildEnv now errors with broken symlinks. Lots of things like this
still exist.

Discussion in #39038.
---
 pkgs/development/compilers/llvm/3.4/clang.nix         | 5 ++++-
 pkgs/development/compilers/llvm/3.5/clang.nix         | 5 ++++-
 pkgs/development/compilers/llvm/3.7/clang/default.nix | 5 ++++-
 pkgs/development/compilers/llvm/3.8/clang/default.nix | 5 ++++-
 pkgs/development/compilers/llvm/3.9/clang/default.nix | 5 ++++-
 pkgs/development/compilers/llvm/4/clang/default.nix   | 5 ++++-
 pkgs/development/compilers/llvm/6/clang/default.nix   | 5 ++++-
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 10510c750354..863e7eb22474 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -29,7 +29,10 @@ stdenv.mkDerivation {
   # Clang expects to find LLVMgold in its own prefix
   # Clang expects to find sanitizer libraries in its own prefix
   postInstall = ''
-    ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    if [ -e ${llvm}/lib/LLVMgold.so ]; then
+      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    fi
+
     ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
   '';
 
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index f15c989ef510..b61118439ee7 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -31,7 +31,10 @@ in stdenv.mkDerivation {
   # Clang expects to find LLVMgold in its own prefix
   # Clang expects to find sanitizer libraries in its own prefix
   postInstall = ''
-    ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    if [ -e ${llvm}/lib/LLVMgold.so ]; then
+      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    fi
+
     ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
     ln -sv $out/bin/clang $out/bin/cpp
   '';
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index f27e3f0089e2..a63706e95cfb 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -32,7 +32,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
       ln -sv $out/bin/clang $out/bin/cpp
     '';
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 0147485dd58d..c8b2fec5e51d 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -34,7 +34,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
       ln -sv $out/bin/clang $out/bin/cpp
 
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index aafe30e4c9b3..fabc6a39d9f4 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -36,7 +36,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
       ln -sv $out/bin/clang $out/bin/cpp
 
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 5531fd2ab77e..e8f025c24ede 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -52,7 +52,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
       ln -sv $out/bin/clang $out/bin/cpp
 
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 919efdc8ef97..c540a8267e97 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -53,7 +53,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
       ln -sv $out/bin/clang $out/bin/cpp
 

From 9ee69c27c9b300154f1b26c1c21737cf000656cf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 16 Apr 2018 20:04:54 -0500
Subject: [PATCH 0119/3370] llvm: remove libedit from clang

clang should never need libedit. From what I understand this is only
needed by LLDB.

https://github.com/llvm-mirror/clang/search?q=libedit
---
 pkgs/development/compilers/llvm/3.4/clang.nix         | 4 ++--
 pkgs/development/compilers/llvm/3.5/clang.nix         | 4 ++--
 pkgs/development/compilers/llvm/3.7/clang/default.nix | 4 ++--
 pkgs/development/compilers/llvm/3.8/clang/default.nix | 4 ++--
 pkgs/development/compilers/llvm/3.9/clang/default.nix | 4 ++--
 pkgs/development/compilers/llvm/4/clang/default.nix   | 4 ++--
 pkgs/development/compilers/llvm/5/clang/default.nix   | 4 ++--
 pkgs/development/compilers/llvm/6/clang/default.nix   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 863e7eb22474..2c5d3524911d 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }:
 
 stdenv.mkDerivation {
   name = "clang-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
 
-  buildInputs = [ cmake libedit libxml2 zlib ];
+  buildInputs = [ cmake libxml2 zlib ];
 
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index b61118439ee7..7e0163577baf 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation {
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     mv clang-tools-extra-* $sourceRoot/tools/extra
   '';
 
-  buildInputs = [ cmake libedit libxml2 llvm ];
+  buildInputs = [ cmake libxml2 llvm ];
 
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index a63706e95cfb..4ccd00af6846 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -13,7 +13,7 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    buildInputs = [ cmake libedit libxml2 llvm ];
+    buildInputs = [ cmake libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index c8b2fec5e51d..05893704d872 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -13,7 +13,7 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    buildInputs = [ cmake libedit libxml2 llvm python ];
+    buildInputs = [ cmake libxml2 llvm python ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index fabc6a39d9f4..1f6d80ab3be9 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -15,7 +15,7 @@ let
 
     nativeBuildInputs = [ cmake ];
 
-    buildInputs = [ libedit libxml2 llvm python ];
+    buildInputs = [ libxml2 llvm python ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index e8f025c24ede..c6538282f23e 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,7 +19,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libedit libxml2 llvm ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index 36f09a42308a..6499be2a0bdc 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,7 +19,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libedit libxml2 llvm ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index c540a8267e97..3d02062a4a32 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,7 +19,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libedit libxml2 llvm ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [

From 5ce2d3355d4bcda5e1393b0cfb52b834e82d2546 Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Tue, 17 Apr 2018 16:21:28 +0100
Subject: [PATCH 0120/3370] binutils: apply patch on aarch64 to fix
 https://sourceware.org/bugzilla/show_bug.cgi?id=22764

---
 .../tools/misc/binutils/default.nix           |   6 +
 ...RCH64_ABS32-R_AARCH64_ABS16-absolute.patch | 130 ++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 5c88902a68c4..ff798fb39691 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -64,6 +64,12 @@ stdenv.mkDerivation rec {
 
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22868
     ./gold-symbol-visibility.patch
+
+  ] ++ stdenv.lib.optionals targetPlatform.isAarch64 [
+    # Version 2.30 introduced strict requirements on ELF relocations which cannot
+    # be satisfied on aarch64 platform. Add backported fix from bugzilla.
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=22764
+    ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
   ];
 
   outputs = [ "out" "info" "man" ];
diff --git a/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
new file mode 100644
index 000000000000..6a04b3cc5588
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
@@ -0,0 +1,130 @@
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index c310da6ed3..d31f46171f 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,10 @@
++2018-02-05  Renlin Li  <renlin.li@arm.com>
++
++       PR ld/22764
++       * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the
++       R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the
++       check for writeable section as well.
++
+ 2018-01-27  Nick Clifton  <nickc@redhat.com>
+ 
+ 	This is the 2.30 release:
+diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
+index d5711e0eb1..973188220b 100644
+--- a/bfd/elfnn-aarch64.c
++++ b/bfd/elfnn-aarch64.c
+@@ -7074,10 +7074,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ #if ARCH_SIZE == 64
+ 	case BFD_RELOC_AARCH64_32:
+ #endif
+-	  if (bfd_link_pic (info)
+-	      && (sec->flags & SEC_ALLOC) != 0
+-	      && (sec->flags & SEC_READONLY) != 0)
++	  if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0)
+ 	    {
++	      if (h != NULL
++		  /* This is an absolute symbol.  It represents a value instead
++		     of an address.  */
++		  && ((h->root.type == bfd_link_hash_defined
++		       && bfd_is_abs_section (h->root.u.def.section))
++		      /* This is an undefined symbol.  */
++		      || h->root.type == bfd_link_hash_undefined))
++		break;
++
++	      /* For local symbols, defined global symbols in a non-ABS section,
++		 it is assumed that the value is an address.  */
+ 	      int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
+ 	      _bfd_error_handler
+ 		/* xgettext:c-format */
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 6337cd0cb6..1aaa6da3b5 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1,3 +1,11 @@
++2018-02-05  Renlin Li  <renlin.li@arm.com>
++
++       PR ld/22764
++       * testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address.
++       * testsuite/ld-aarch64/emit-relocs-259.s: Likewise.
++       * testsuite/ld-aarch64/pr22764.s: New.
++       * testsuite/ld-aarch64/pr22764.d: New.
++
+ 2018-01-27  Nick Clifton  <nickc@redhat.com>
+ 
+ 	This is the 2.30 release:
+diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
+index f31089361b..d766f3736b 100644
+--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
+@@ -275,6 +275,7 @@ run_dump_test "pr17415"
+ run_dump_test_lp64 "tprel_g2_overflow"
+ run_dump_test "tprel_add_lo12_overflow"
+ run_dump_test "protected-data"
++run_dump_test_lp64 "pr22764"
+ 
+ # ifunc tests
+ run_dump_test "ifunc-1"
+diff --git a/ld/testsuite/ld-aarch64/emit-relocs-258.s b/ld/testsuite/ld-aarch64/emit-relocs-258.s
+index f724776243..87bb657c5d 100644
+--- a/ld/testsuite/ld-aarch64/emit-relocs-258.s
++++ b/ld/testsuite/ld-aarch64/emit-relocs-258.s
+@@ -1,5 +1,6 @@
++.global dummy
+ .text
+-
++dummy:
+   ldr x0, .L1
+ 
+ .L1:
+diff --git a/ld/testsuite/ld-aarch64/emit-relocs-259.s b/ld/testsuite/ld-aarch64/emit-relocs-259.s
+index 7e1ba3ceb4..0977c9d869 100644
+--- a/ld/testsuite/ld-aarch64/emit-relocs-259.s
++++ b/ld/testsuite/ld-aarch64/emit-relocs-259.s
+@@ -1,5 +1,6 @@
++.global dummy
+ .text
+-
++dummy:
+   ldr x0, .L1
+ 
+ .L1:
+diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d
+new file mode 100644
+index 0000000000..997519f469
+--- /dev/null
++++ b/ld/testsuite/ld-aarch64/pr22764.d
+@@ -0,0 +1,18 @@
++#source: pr22764.s
++#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs
++#notarget: aarch64_be-*-*
++#objdump: -dr
++#...
++
++Disassembly of section \.text:
++
++0000000000010000 \<\.text\>:
++   10000:	d503201f 	nop
++	...
++			10004: R_AARCH64_ABS64	sym_abs1
++   1000c:	00000002 	\.word	0x00000002
++			1000c: R_AARCH64_ABS32	sym_abs2
++   10010:	0003      	\.short	0x0003
++			10010: R_AARCH64_ABS16	sym_abs3
++   10012:	0000      	\.short	0x0000
++   10014:	d503201f 	nop
+diff --git a/ld/testsuite/ld-aarch64/pr22764.s b/ld/testsuite/ld-aarch64/pr22764.s
+new file mode 100644
+index 0000000000..25e36b4a12
+--- /dev/null
++++ b/ld/testsuite/ld-aarch64/pr22764.s
+@@ -0,0 +1,6 @@
++  .text
++  nop
++  .xword sym_abs1
++  .word sym_abs2
++  .short sym_abs3
++  nop

From 6bf47e0d77fad929d37c007883dd3a493bc2947c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 27 Mar 2018 14:53:42 +0200
Subject: [PATCH 0121/3370] mypaint-brushes: init at 1.3.0

---
 .../libraries/mypaint-brushes/default.nix     | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/mypaint-brushes/default.nix

diff --git a/pkgs/development/libraries/mypaint-brushes/default.nix b/pkgs/development/libraries/mypaint-brushes/default.nix
new file mode 100644
index 000000000000..140dbcc937b5
--- /dev/null
+++ b/pkgs/development/libraries/mypaint-brushes/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchpatch, autoconf, automake, fetchFromGitHub, pkgconfig}:
+
+let
+  pname = "mypaint-brushes";
+  version = "1.3.0";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "Jehan";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1iz89z6v2mp8j1lrf942k561s8311i3s34ap36wh4rybb2lq15m0";
+  };
+
+  nativeBuildInputs = [ autoconf automake pkgconfig ];
+
+  patches = [
+    # build with automake 1.16
+    (fetchpatch {
+      url = https://github.com/Jehan/mypaint-brushes/commit/1e9109dde3bffd416ed351c3f30ecd6ffd0ca2cd.patch;
+      sha256 = "0mi8rwbirl0ib22f2hz7kdlgi4hw8s3ab29b003dsshdyzn5iha9";
+    })
+  ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    homepage = http://mypaint.org/;
+    description = "Brushes used by MyPaint and other software using libmypaint.";
+    license = licenses.cc0;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca44af435501..c1c63060734e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17032,6 +17032,8 @@ with pkgs;
 
   mypaint = callPackage ../applications/graphics/mypaint { };
 
+  mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { };
+
   mythtv = libsForQt5.callPackage ../applications/video/mythtv { };
 
   micro = callPackage ../applications/editors/micro { };

From d1f7c51d179ac2ebcb7649ca8b7606ec098a0ea2 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 17 Apr 2018 18:34:45 -0700
Subject: [PATCH 0122/3370] vulkan-loader: fix broken symlink in output

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

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 2b0d765efc8b..8345786d3e8e 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {
     cp -d loader/libvulkan.so* $out/lib
     cp demos/vulkaninfo $out/bin
     mkdir -p $out/lib $out/share/vulkan/explicit_layer.d
-    cp -d layers/*.so $out/lib/
-    cp -d layers/*.json $out/share/vulkan/explicit_layer.d/
+    cp -L layers/*.so $out/lib/
+    cp -L layers/*.json $out/share/vulkan/explicit_layer.d/
     sed -i "s:\\./lib:$out/lib/lib:g" "$out/share/vulkan/"*/*.json
     mkdir -p $dev/include
     cp -rv ../include $dev/

From 85854ab2435629c6cb127773f422e2309bf0eade Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 18 Apr 2018 08:21:43 +0200
Subject: [PATCH 0123/3370] vamp-sdk: 2.5 -> 2.7.1

---
 pkgs/development/libraries/audio/vamp/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix
index 8098ac9f3efb..f8b1006d2eb7 100644
--- a/pkgs/development/libraries/audio/vamp/default.nix
+++ b/pkgs/development/libraries/audio/vamp/default.nix
@@ -1,16 +1,19 @@
 # set VAMP_PATH ?
 # plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses)
 
-{ stdenv, fetchurl, pkgconfig, libsndfile }:
+{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }:
 
 rec {
 
   vampSDK = stdenv.mkDerivation {
-    name = "vamp-sdk-2.5";
+    name = "vamp-sdk-2.7.1";
+    # version = "2.7.1";
 
-    src = fetchurl {
-      url = http://code.soundsoftware.ac.uk/attachments/download/690/vamp-plugin-sdk-2.5.tar.gz;
-      sha256 = "178kfgq08cmgdzv7g8dwyjp4adwx8q04riimncq4nqkm8ng9ywbv";
+    src = fetchFromGitHub {
+      owner = "c4dm";
+      repo = "vamp-plugin-sdk";
+      rev = "vamp-plugin-sdk-v2.7.1";
+      sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4";
     };
 
   nativeBuildInputs = [ pkgconfig ];

From efe25f416c7a594c33b8239935a843a6941077b1 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 18 Apr 2018 17:09:48 +0300
Subject: [PATCH 0124/3370] parity: 1.9.5 -> 1.9.6

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

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index 991799321094..71485551ef6a 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.9.5";
-  sha256      = "0f2x78p5bshs3678qcybqd34k83d294mp3vadp99iqhmbkhbfyy7";
-  cargoSha256 = "1irc01sva5yyhdv79cs6jk5pbmhxyvs0ja4cly4nw639m1kx7rva";
+  version     = "1.9.6";
+  sha256      = "17h7c93c95pj71nbw152rl4ka240zzd8w0yf8k4l4rimcsbra92g";
+  cargoSha256 = "0gk26yncahrlnx6xz13x775wrwh7xsfqiifspjislmgk7xknqjm0";
   patches     = [ ./patches/vendored-sources-1.9.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }

From 44342f139ec014442c0b1538099868696e641cb2 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 18 Apr 2018 17:09:57 +0300
Subject: [PATCH 0125/3370] parity-beta: 1.10.0 -> 1.10.1

---
 pkgs/applications/altcoins/parity/beta.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index ed78133a759c..b1bf38427a83 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.10.0";
-  sha256      = "0dmdd7qa8lww5bzcdn25nkyz6334irh8hw0y1j0yc2pmd2dny99g";
-  cargoSha256 = "0whkjbaq40mqva1ayqnmz2ppqjrg35va93cypx1al41rsp1yc37m";
+  version     = "1.10.1";
+  sha256      = "0313ch4rqnwrsf7y1h8bdwjk59gvcj08jjf6sybb6ww0ml7a6i7b";
+  cargoSha256 = "00jr4g3q40pc1wi7fmfq1j8iakmv9pid7l31rf76wj4n8g051zc7";
   patches     = [ ./patches/vendored-sources-1.10.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }

From 2d90138b3b90fb36db50a0954629b2f306795d5a Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 18 Apr 2018 13:13:03 -0500
Subject: [PATCH 0126/3370] clang3.4: still needs libedit

https://hydra.nixos.org/build/72965931/nixlog/1
---
 pkgs/development/compilers/llvm/3.4/clang.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 2c5d3524911d..863e7eb22474 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
 
 stdenv.mkDerivation {
   name = "clang-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
 
-  buildInputs = [ cmake libxml2 zlib ];
+  buildInputs = [ cmake libedit libxml2 zlib ];
 
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-std=c++11"

From 9b4b21c6abba97773de7c19f31880676684696a5 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Wed, 18 Apr 2018 20:23:27 +0300
Subject: [PATCH 0127/3370] handbrake: refactor (fx, clenup, description,
 cosmetics, add maintainer)

---
 maintainers/maintainer-list.nix               |  5 +++++
 pkgs/applications/video/handbrake/default.nix | 20 +++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 839458dbfc9a..2bb748e0ce66 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28,6 +28,11 @@
     github = "AndersonTorres";
     name = "Anderson Torres";
   };
+  Anton-Latukha = {
+    email = "anton.latuka+nixpkgs@gmail.com";
+    github = "Anton-Latukha";
+    name = "Anton Latukha";
+  };
   Baughn = {
     email = "sveina@gmail.com";
     github = "Baughn";
diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 904401c5e913..6ce2ae08eeb4 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -37,15 +37,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake python2 pkgconfig yasm autoconf automake libtool m4
-  ] ++ lib.optionals useGtk [
-    intltool wrapGAppsHook
-  ];
+  ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
 
   buildInputs = [
     fribidi fontconfig freetype jansson zlib
     libass libiconv libsamplerate libxml2 bzip2
     libogg libopus libtheora libvorbis libdvdcss a52dec libmkv
-    lame ffmpeg libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
+    lame libdvdread libdvdnav libbluray mp4v2 mpeg2dec x264 x265 libvpx
   ] ++ lib.optionals useGtk [
     glib gtk3 libappindicator-gtk3 libnotify
     gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
@@ -60,8 +58,6 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     patchShebangs scripts
 
-    echo 'TAG=${version}' > version.txt
-
     # `configure` errors out when trying to read the current year which is too low
     substituteInPlace make/configure.py \
       --replace developer release \
@@ -97,13 +93,17 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://handbrake.fr/;
-    description = "A tool for ripping DVDs into video files";
+    description = "A tool for converting video files and ripping DVDs";
     longDescription = ''
-      Handbrake is a versatile transcoding DVD ripper. This package
-      provides the cli HandbrakeCLI and the GTK+ version ghb.
+      Tool for converting and remuxing video files
+      into selection of modern and widely supported codecs
+      and containers. Very versatile and customizable.
+      Package provides:
+      CLI - `HandbrakeCLI`
+      GTK+ GUI - `ghb`
     '';
     license = licenses.gpl2;
-    maintainers = with maintainers; [ wmertens ];
+    maintainers = with maintainers; [ Anton-Latukha wmertens ];
     # Not tested on anything else
     platforms = platforms.linux;
   };

From 3b69e6ef1a3d752fa8572784b0fadfffefaeee7f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 18 Apr 2018 15:34:23 -0400
Subject: [PATCH 0128/3370] sherpa: 2.2.4 -> 2.2.5

---
 .../science/physics/sherpa/default.nix        |   7 +-
 .../physics/sherpa/explicit_overloads.patch   | 119 ------------------
 2 files changed, 2 insertions(+), 124 deletions(-)
 delete mode 100644 pkgs/applications/science/physics/sherpa/explicit_overloads.patch

diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index cdbe19c53b33..340428e8e777 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -2,20 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "sherpa-${version}";
-  version = "2.2.4";
+  version = "2.2.5";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz";
-    sha256 = "1rw0ivx78zkbkl7nwil9i4fn8rvkifc3i20zrq3asbi4kb6brj2x";
+    sha256 = "0rv14j8gvjjr3darb0wcradlmsnyq915jz7v2yybrjzqfbsr3zb5";
   };
 
   buildInputs = [ gfortran sqlite lhapdf rivet ];
 
   enableParallelBuilding = true;
 
-  # LLVM 4 doesn't allow ambigous type in std::abs argument
-  patches = stdenv.lib.optional stdenv.cc.isClang [ ./explicit_overloads.patch ];
-
   configureFlags = [
     "--with-sqlite3=${sqlite.dev}"
     "--enable-hepmc2=${hepmc}"
diff --git a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch b/pkgs/applications/science/physics/sherpa/explicit_overloads.patch
deleted file mode 100644
index 33e5a7632178..000000000000
--- a/pkgs/applications/science/physics/sherpa/explicit_overloads.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff --git a/ATOOLS/Phys/Flavour.C b/ATOOLS/Phys/Flavour.C
-index 1986348..740eea3 100644
---- a/ATOOLS/Phys/Flavour.C
-+++ b/ATOOLS/Phys/Flavour.C
-@@ -298,8 +298,8 @@ std::string Flavour::IDName() const
- 
- bool Flavour::IsDiQuark() const 
- {
--  if(abs(Kfcode())>=1103&&abs(Kfcode())<=5505) {
--    double help=abs(Kfcode())/100.0-int(abs(Kfcode())/100.0); 
-+  if(abs((long)Kfcode())>=1103&&abs((long)Kfcode())<=5505) {
-+    double help=abs((long)Kfcode())/100.0-int(abs((long)Kfcode())/100.0); 
-     if(help<0.031) return true;
-   }
-   return false;
-@@ -307,27 +307,27 @@ bool Flavour::IsDiQuark() const
- 
- bool Flavour::IsBaryon() const 
- {
--  if (abs(Kfcode())%10000<1000) return false;
-+  if (abs((long)Kfcode())%10000<1000) return false;
-   return !IsDiQuark();
- }
- 
- bool Flavour::IsB_Hadron() const 
- {
--  if (abs(Kfcode())<100)                            return 0;
-+  if (abs((long)Kfcode())<100)                            return 0;
-   if (Kfcode()-100*int(Kfcode()/100)<10)                 return 0;
--  if (abs((Kfcode()-100*int(Kfcode()/100))/10)==5)       return 1;
--  if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==5)    return 1;
--  if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1;
-+  if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==5)       return 1;
-+  if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==5)    return 1;
-+  if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==5) return 1;
-   return 0;
- }
- 
- bool Flavour::IsC_Hadron() const 
- {
--  if (abs(Kfcode())<100)                            return 0;
-+  if (abs((long)Kfcode())<100)                            return 0;
-   if (Kfcode()-100*int(Kfcode()/100)<10)                 return 0;
--  if (abs((Kfcode()-100*int(Kfcode()/100))/10)==4)       return 1;
--  if (abs((Kfcode()-1000*int(Kfcode()/1000))/100)==4)    return 1;
--  if (abs((Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1;
-+  if (abs((long)(Kfcode()-100*int(Kfcode()/100))/10)==4)       return 1;
-+  if (abs((long)(Kfcode()-1000*int(Kfcode()/1000))/100)==4)    return 1;
-+  if (abs((long)(Kfcode()-10000*int(Kfcode()/10000))/1000)==4) return 1;
-   return 0;
- }
- 
-diff --git a/AddOns/Pythia/Pythia_Jet_Criterion.C b/AddOns/Pythia/Pythia_Jet_Criterion.C
-index bbe9597..c1201e1 100644
---- a/AddOns/Pythia/Pythia_Jet_Criterion.C
-+++ b/AddOns/Pythia/Pythia_Jet_Criterion.C
-@@ -117,8 +117,8 @@ namespace PYTHIA {
-       double Qsq = sign * Q.Abs2();
-       // Mass term of radiator
-       DEBUG_VAR(ampl->MS());
--      double m2Rad = ( abs(RadAfterBranch.Flav().Kfcode()) >= 4
--                   && abs(RadAfterBranch.Flav().Kfcode()) < 7)
-+      double m2Rad = ( abs((long)RadAfterBranch.Flav().Kfcode()) >= 4
-+                   && abs((long)RadAfterBranch.Flav().Kfcode()) < 7)
-                    ? ampl->MS()->Mass2(RadAfterBranch.Flav())
-                    : 0.;
-       // Construct 2->3 variables for FSR
-diff --git a/BEAM/Main/EPA.C b/BEAM/Main/EPA.C
-index 861a1b2..340ac33 100644
---- a/BEAM/Main/EPA.C
-+++ b/BEAM/Main/EPA.C
-@@ -54,7 +54,7 @@ double EPA::CosInt::GetCosInt(double X)
- 
- double EPA::phi(double x, double qq)
- {
--  if (abs(m_beam.Kfcode()) == kf_p_plus) {
-+  if (abs((long)m_beam.Kfcode()) == kf_p_plus) {
-     const double a = 7.16;
-     const double b = -3.96;
-     const double c = .028;
-@@ -179,7 +179,7 @@ bool EPA::CalculateWeight(double x,double q2)
-     m_weight=0.0;
-     return 1;
-   }
--  if (abs(m_beam.Kfcode()) == kf_e) {
-+  if (abs((long)m_beam.Kfcode()) == kf_e) {
-     double f = alpha/M_PI*(1+sqr(1-m_x))/m_x*log(2.*m_energy/m_mass);
-     if (f < 0) f = 0.;
-     m_weight = f;
-@@ -187,7 +187,7 @@ bool EPA::CalculateWeight(double x,double q2)
- 	     <<"energy = "<<m_energy<<", "<<"mass = "<<m_mass<<".\n";
-     return 1;    
-   }
--  else if (abs(m_beam.Kfcode()) == kf_p_plus) {
-+  else if (abs((long)m_beam.Kfcode()) == kf_p_plus) {
-     const double qz = 0.71;
-     double f, qmi, qma;
-     qma=m_q2Max/qz;
-diff --git a/PDF/Remnant/Hadron_Remnant.C b/PDF/Remnant/Hadron_Remnant.C
-index 243717c..58c2278 100644
---- a/PDF/Remnant/Hadron_Remnant.C
-+++ b/PDF/Remnant/Hadron_Remnant.C
-@@ -188,13 +188,13 @@ ATOOLS::Flavour Hadron_Remnant::Opposite(ATOOLS::Flavour flav) const
-     if (m_constit[i]==flav && !found) found=true;
-     else rem[j++]=m_constit[i].Kfcode();
-   }
--  Flavour anti=Flavour((kf_code)(abs(rem[0])*1000+abs(rem[1])*100+3));
-+  Flavour anti=Flavour((kf_code)(abs((long)rem[0])*1000+abs((long)rem[1])*100+3));
-   if (rem[0]!=rem[1]) {
-     if (ran->Get()<0.25) 
--      anti=Flavour((kf_code)(abs(rem[0])*1000+abs(rem[1])*100+1));
-+      anti=Flavour((kf_code)(abs((long)rem[0])*1000+abs((long)rem[1])*100+1));
-   }
-   else {
--    anti=Flavour((kf_code)(abs(rem[0])*1100+3));
-+    anti=Flavour((kf_code)(abs((long)rem[0])*1100+3));
-   }
-   if (flav.IsAnti()) anti=anti.Bar();
-   return anti;

From 6026e43bceb66355f657e3d97bcbe7df173d2c79 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 18 Apr 2018 22:11:28 +0200
Subject: [PATCH 0129/3370] dust: init at 0.2.3

---
 pkgs/tools/misc/dust/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/dust/default.nix

diff --git a/pkgs/tools/misc/dust/default.nix b/pkgs/tools/misc/dust/default.nix
new file mode 100644
index 000000000000..f34d05758cf4
--- /dev/null
+++ b/pkgs/tools/misc/dust/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, cargo, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "dust-${version}";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "bootandy";
+    repo = "dust";
+    rev = "v${version}";
+    sha256 = "1l8z1daiq2x92449p2ciblcwl0ddgr3vqj2dsd3z8jj3y0z8j51s";
+  };
+
+  cargoSha256 = "0x3ay440vbc64y3pd8zhd119sw8fih0njmkzpr7r8wdw3k48v96m";
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "du + rust = dust. Like du but more intuitive";
+    homepage = https://github.com/bootandy/dust;
+    license = licenses.asl20;
+    maintainers = [ maintainers.infinisil ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86eb873174c6..19be6e2e23e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15245,6 +15245,8 @@ with pkgs;
 
   dunst = callPackage ../applications/misc/dunst { };
 
+  du-dust = callPackage ../tools/misc/dust { };
+
   devede = callPackage ../applications/video/devede { };
 
   denemo = callPackage ../applications/audio/denemo {

From 06a9f14c17a340189545950699e43170b77ff652 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Thu, 19 Apr 2018 11:13:52 +0200
Subject: [PATCH 0130/3370] et: 0.1 -> 0.1.1

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

diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index 40631b0a0dbf..4aaaa3339982 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "et-${version}";
-  version = "0.1";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "geistesk";
     repo = "et";
     rev = "${version}";
-    sha256 = "1d2hq6p1y2ynk0a3l35lwbm1fcl9kg7rpjcin8bx4xcdpbw42y94";
+    sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
   };
 
   buildInputs = [ libnotify gdk_pixbuf ];

From fa3f62025624185bdf7243c1c788d98004be2c76 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Thu, 19 Apr 2018 11:51:06 +0200
Subject: [PATCH 0131/3370] farbfeld, sent: wrap PATH for 2ff and sent

---
 pkgs/applications/misc/sent/default.nix         | 8 ++++++--
 pkgs/development/libraries/farbfeld/default.nix | 6 +++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix
index 24e76500a6a5..9bbae33b3e41 100644
--- a/pkgs/applications/misc/sent/default.nix
+++ b/pkgs/applications/misc/sent/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, farbfeld, libX11, libXft
+{ stdenv, fetchurl, farbfeld, libX11, libXft, makeWrapper
 , patches ? [] }:
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv";
   };
 
-  buildInputs = [ farbfeld libX11 libXft ];
+  buildInputs = [ libX11 libXft ];
+  nativeBuildInputs = [ makeWrapper ];
 
   # unpacking doesn't create a directory
   sourceRoot = ".";
@@ -17,6 +18,9 @@ stdenv.mkDerivation rec {
   inherit patches;
 
   installFlags = [ "PREFIX=$(out)" ];
+  postInstall = ''
+    wrapProgram "$out/bin/sent" --prefix PATH : "${farbfeld}/bin"
+  '';
 
   meta = with stdenv.lib; {
     description = "A simple plaintext presentation tool";
diff --git a/pkgs/development/libraries/farbfeld/default.nix b/pkgs/development/libraries/farbfeld/default.nix
index 7c0addea5e8b..c23fc0bc59f6 100644
--- a/pkgs/development/libraries/farbfeld/default.nix
+++ b/pkgs/development/libraries/farbfeld/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libpng, libjpeg }:
+{ stdenv, fetchgit, makeWrapper, file, libpng, libjpeg }:
 
 stdenv.mkDerivation rec {
   name = "farbfeld-${version}";
@@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libpng libjpeg ];
+  nativeBuildInputs = [ makeWrapper ];
 
   installFlags = "PREFIX=/ DESTDIR=$(out)";
+  postInstall = ''
+    wrapProgram "$out/bin/2ff" --prefix PATH : "${file}/bin"
+  '';
 
   meta = with stdenv.lib; {
     description = "Suckless image format with conversion tools";

From cd79136c06a58643b19db253bf041e167ce239cb Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Thu, 19 Apr 2018 11:58:25 +0200
Subject: [PATCH 0132/3370] slstatus: unstable-2018-03-21 ->
 unstable-2018-04-16

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

diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix
index bc855db29ecc..f4a2e889cd43 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/pkgs/applications/misc/slstatus/default.nix
@@ -4,12 +4,12 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "slstatus-${version}";
-  version = "unstable-2018-03-28";
+  version = "unstable-2018-04-16";
 
   src = fetchgit {
     url = https://git.suckless.org/slstatus;
-    rev = "faa52bdcc0221de2d8fae950e409a8ac5e05bfcd";
-    sha256 = "0i8k7gjvx51y0mwxjlqhyk2dpvkb2d3y8x4l6ckdnyiy5632pn76";
+    rev = "97ef7c2a1d67bb2c9c379e657fbc8e35acd6aafb";
+    sha256 = "1777hgl10imk0l2sgnqgbkfchv1mpxrd82ninzwp7f1rgwchz36v";
   };
 
   configFile = optionalString (conf!=null) (writeText "config.def.h" conf);

From dd5e2a08fbb0ea321885c7e36b3c072bf3d2aef7 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Thu, 19 Apr 2018 16:44:08 +0200
Subject: [PATCH 0133/3370] zramSwap: default to 1 device

One device per cpu is only needed for kernel 3.14
---
 nixos/modules/config/zram.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index ae1b0a6c8e11..b8adb51765f6 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -26,15 +26,16 @@ in
         description = ''
           Enable in-memory compressed swap space provided by the zram kernel
           module. It is recommended to enable only for kernel 3.14 or higher.
+          See https://www.kernel.org/doc/Documentation/blockdev/zram.txt
         '';
       };
 
       numDevices = mkOption {
-        default = 4;
+        default = 1;
         type = types.int;
         description = ''
           Number of zram swap devices to create. It should be equal to the
-          number of CPU cores your system has.
+          number of CPU cores your system has for kernel < v3.15.
         '';
       };
 

From 8e3a14549ffde6b721d77185ae64ddcc4831e490 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Thu, 19 Apr 2018 16:53:40 +0200
Subject: [PATCH 0134/3370] zramSwap: remove mentions of old kernels

---
 nixos/modules/config/zram.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index b8adb51765f6..c1748812821e 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -25,7 +25,7 @@ in
         type = types.bool;
         description = ''
           Enable in-memory compressed swap space provided by the zram kernel
-          module. It is recommended to enable only for kernel 3.14 or higher.
+          module.
           See https://www.kernel.org/doc/Documentation/blockdev/zram.txt
         '';
       };
@@ -34,8 +34,7 @@ in
         default = 1;
         type = types.int;
         description = ''
-          Number of zram swap devices to create. It should be equal to the
-          number of CPU cores your system has for kernel < v3.15.
+          Number of zram swap devices to create.
         '';
       };
 

From 79f9657841ea79a98effb7044c1c44e1cb9d9195 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 19 Apr 2018 11:54:42 -0500
Subject: [PATCH 0135/3370] libjpeg: fixup hash

https://hydra.nixos.org/build/72972836/nixlog/1
---
 pkgs/development/libraries/libjpeg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 636699609f1c..96dbd463370b 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = http://www.ijg.org/files/jpegsrc.v9c.tar.gz;
-    sha256 = "1m3a137r7m14wd92a03qdvp4jfazc0657nzry7rqzs2p1xhkyfhz";
+    sha256 = "08kixcf3a7s9x91174abjnk1xbvj4v8crdc73zi4k9h3jfbm00k5";
   };
 
   configureFlags = optional static "--enable-static --disable-shared";

From 4959111f304c047af89990a708f12cc5e639505a Mon Sep 17 00:00:00 2001
From: nocent <nocent@protonmail.ch>
Date: Tue, 17 Apr 2018 23:17:06 +0200
Subject: [PATCH 0136/3370] bonzomatic: init at 2018-03-29

---
 maintainers/maintainer-list.nix               |  5 +++
 .../editors/bonzomatic/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/editors/bonzomatic/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 839458dbfc9a..8e9b0ef337e4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2650,6 +2650,11 @@
     github = "nmattia";
     name = "Nicolas Mattia";
   };
+  nocent = {
+    email = "nocent@protonmail.ch";
+    github = "nocent";
+    name = "nocent";
+  };
   nocoolnametom = {
     email = "nocoolnametom@gmail.com";
     github = "nocoolnametom";
diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix
new file mode 100644
index 000000000000..57aa381e68c5
--- /dev/null
+++ b/pkgs/applications/editors/bonzomatic/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }:
+
+let
+  name = "bonzomatic";
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchFromGitHub {
+    repo = name;
+    owner = "Gargaj";
+    rev = "2018-03-29";
+    sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg";
+  };
+
+  buildInputs = [ cmake makeWrapper alsaLib mesa_glu libXcursor libXinerama libXrandr xorgserver ];
+
+  postFixup = ''
+    wrapProgram $out/bin/Bonzomatic --prefix LD_LIBRARY_PATH : "${alsaLib}/lib"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A live-coding tool for writing 2D fragment/pixel shaders";
+    license = with licenses; [
+      unlicense
+      unfreeRedistributable # contains libbass.so in repository
+    ];
+    maintainers = [ maintainers.nocent ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b0423de0f43..c26500c3d197 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14943,6 +14943,8 @@ with pkgs;
     ffmpeg = ffmpeg_2;
   };
 
+  bonzomatic = callPackage ../applications/editors/bonzomatic { };
+
   brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; };
 
   notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { };

From 54c6a9c7104660757a713a8d2795df57b59251c5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Apr 2018 13:06:30 -0500
Subject: [PATCH 0137/3370] procps-ng: 3.3.13 -> 3.3.14

* patches were from upstream, merged in this update \o/
* "addressses" incorrect hash by moving to latest version
---
 pkgs/os-specific/linux/procps-ng/default.nix | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 316f0ad1a28d..617bbd2d64fe 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,33 +1,19 @@
-{ lib, stdenv, fetchFromGitLab, fetchpatch, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
+{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "procps-${version}";
-  version = "3.3.13";
+  version = "3.3.14";
 
   src = fetchFromGitLab {
     owner ="procps-ng";
     repo = "procps";
     rev = "v${version}";
-    sha256 = "0r3h9adhqi5fi62lx65z839fww35lfh2isnknhkaw71xndjpzr0q";
+    sha256 = "0l2xfm3vr8qpzvdnkcvmfj1rdw6lxx840zw9vp0z9f008y5fc31g";
   };
 
   buildInputs = [ ncurses ];
   nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ];
 
-  # https://gitlab.com/procps-ng/procps/issues/88
-  # Patches needed for musl and glibc 2.28
-  patches = [
-    (fetchpatch {
-      url = "https://gitlab.com/procps-ng/procps/uploads/f91ff094be1e4638aeffb67bdbb751ba/numa.h.diff";
-      sha256 = "16r537d2wfrvbv6dg9vyfck8n31xa58903mnssw1s4kb5ap83yd5";
-      extraPrefix = "";
-    })
-    (fetchpatch {
-      url = "https://gitlab.com/procps-ng/procps/uploads/6a7bdea4d82ba781451316fda74192ae/libio_detection.diff";
-      sha256 = "0qp0j60kiycjsv213ih10imjirmxz8zja3rk9fq5lr5xf7k2lr3p";
-    })
-  ];
-
   # autoreconfHook doesn't quite get, what procps-ng buildprocss does
   # with po/Makefile.in.in and stuff.
   preConfigure = ''

From dde9c099e9dacda65623ef8d08d9490068f4927c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 19 Apr 2018 13:10:34 -0500
Subject: [PATCH 0138/3370] procps-ng: switch URL style to (hopefully) fix
 problems with hash

See:
https://github.com/NixOS/nixpkgs/issues/39154

Not sure why we're seeing that behavior re:fetchFromGitLab,
but for now use a likely-to-be-stable URL instead.

Fixes #39154.

(although the issue warrants some additional investigation IMO)
---
 pkgs/os-specific/linux/procps-ng/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 617bbd2d64fe..d164af63315f 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,14 +1,12 @@
-{ lib, stdenv, fetchFromGitLab, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
+{ lib, stdenv, fetchurl, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "procps-${version}";
   version = "3.3.14";
 
-  src = fetchFromGitLab {
-    owner ="procps-ng";
-    repo = "procps";
-    rev = "v${version}";
-    sha256 = "0l2xfm3vr8qpzvdnkcvmfj1rdw6lxx840zw9vp0z9f008y5fc31g";
+  src = fetchurl {
+    url = "https://gitlab.com/procps-ng/procps/-/archive/v${version}/procps-v${version}.tar.bz2";
+    sha256 = "0igvsl3s7m5ygxgypzksk4cp2wkvv3lk49s7i9m5wbimyakmr0vf";
   };
 
   buildInputs = [ ncurses ];

From 737c1c491dd78066f0d7a27f0476d3ebcd40140b Mon Sep 17 00:00:00 2001
From: Keith Amidon <kamidon@users.noreply.github.com>
Date: Thu, 19 Apr 2018 11:40:10 -0700
Subject: [PATCH 0139/3370] gnome-boxes: fix USB redirection (#39129)

This fixes USB redirection in gnome-boxes by ensuring that the
required PolicyKit action policy file is installed in the spice-gtk
package and adding that package to gnome-boxes propagatedUserEnvPkgs.
---
 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 3 +++
 pkgs/development/libraries/spice-gtk/default.nix   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 8921d70787ca..8ce9617aaae4 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -24,6 +24,9 @@ in stdenv.mkDerivation rec {
     meson ninja vala pkgconfig gettext itstool wrapGAppsHook gobjectIntrospection desktop-file-utils
   ];
 
+  # Required for USB redirection PolicyKit rules file
+  propagatedUserEnvPkgs = [ spice-gtk ];
+
   buildInputs = [
     libvirt-glib glib gtk3 gtkvnc libxml2
     libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 0564459b24c0..05fd952eb2e8 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];
 
-  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "share/polkit-1/actions";
+  PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "$(out)/share/polkit-1/actions";
 
   configureFlags = [
     "--with-gtk3"

From e8c936556dcbb08e23f374015191d96c621a10c2 Mon Sep 17 00:00:00 2001
From: vodkabot <38538876+vodkabot@users.noreply.github.com>
Date: Thu, 19 Apr 2018 21:54:09 +0300
Subject: [PATCH 0140/3370] twilight: init at 2018-04-19

---
 pkgs/tools/graphics/twilight/default.nix | 28 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/graphics/twilight/default.nix

diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix
new file mode 100644
index 000000000000..8d1ee7b7bfbe
--- /dev/null
+++ b/pkgs/tools/graphics/twilight/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub
+, libGL, libGLU, freeglut, libX11 }:
+
+let
+  version = "2018-04-19";
+in stdenv.mkDerivation rec {
+  name = "twilight-${version}";
+
+  src = fetchFromGitHub {
+    owner = "tweakoz";
+    repo = "twilight";
+    rev = "43f21d15c2a8923c9d707bdf3789f480bfd4b36d";
+    sha256 = "0mmmi4jj8yd8wnah6kx5na782sjycszgzim33dfalr0ph361m4pz";
+  };
+
+  buildInputs = [ libGL libGLU freeglut libX11 ];
+
+  installPhase = ''
+    install -Dm755 twilight $out/bin/twilight
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Redo of IRIX twilight backdrop in old school OpenGL";
+    homepage = src.meta.homepage;
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05bb159a5f77..bf47b1ebf6f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5251,6 +5251,10 @@ with pkgs;
 
   oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { };
 
+  twilight = callPackage ../tools/graphics/twilight/default.nix {
+    libX11 = xorg.libX11;
+  };
+
   twitterBootstrap = callPackage ../development/web/twitter-bootstrap {};
   twitterBootstrap3 = callPackage ../development/web/twitter-bootstrap/v3.nix {};
 

From b95a24fdf1f751c44282f6c38b84b763a85eee19 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 20 Apr 2018 11:07:07 +0800
Subject: [PATCH 0141/3370] nixos-container: support restarts

---
 .../nixos-container/nixos-container.pl          | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/nixos-container/nixos-container.pl b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
index 2cb723a7b71a..a210a65f431c 100755
--- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl
+++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl
@@ -242,11 +242,21 @@ sub terminateContainer {
     while ( kill 0, $leader ) { Time::HiRes::sleep(0.1) }
 }
 
+sub startContainer {
+    system("systemctl", "start", "container\@$containerName") == 0
+        or die "$0: failed to start container\n";
+}
+
 sub stopContainer {
     system("systemctl", "stop", "container\@$containerName") == 0
         or die "$0: failed to stop container\n";
 }
 
+sub restartContainer {
+    stopContainer;
+    startContainer;
+}
+
 # Run a command in the container.
 sub runInContainer {
     my @args = @_;
@@ -285,9 +295,12 @@ if ($action eq "destroy") {
     unlink($confFile) or die;
 }
 
+elsif ($action eq "restart") {
+    restartContainer;
+}
+
 elsif ($action eq "start") {
-    system("systemctl", "start", "container\@$containerName") == 0
-        or die "$0: failed to start container\n";
+    startContainer;
 }
 
 elsif ($action eq "stop") {

From bf6660c3ed27a323999fe70cce5731551693d1ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 19 Apr 2018 21:47:14 -0700
Subject: [PATCH 0142/3370] xpra: 2.2.5 -> 2.2.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xpra/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra -h’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra --help’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version -h’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version --help’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/udev_product_version help’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra_launcher-wrapped -h’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra_launcher-wrapped --help’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra_launcher -h’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/xpra_launcher --help’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/..xpra-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/..xpra-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra-wrapped -h’ got 0 exit code
- ran ‘/nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6/bin/.xpra-wrapped --help’ got 0 exit code
- found 2.2.6 with grep in /nix/store/yh7iwzli0pcqnhm2vdcc2ha5ifig1ix0-xpra-2.2.6
- directory tree listing: https://gist.github.com/01ffc3c415200e59fd7469357044a87a
---
 pkgs/tools/X11/xpra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index b931f270dee2..9bc13b3260da 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -12,11 +12,11 @@ let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.2.5";
+  version = "2.2.6";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "1q2l00nc3bgwlhjzkbk4a8x2l8z9w1799yn31icsx5hrgh98a1js";
+    sha256 = "1zyynghhzjbgnmzcibm17wpj9f7jy31d7dr373li8cwg2yl2swyz";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 65d5a8272977afdad7d7f5115fdbad7644c72035 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 19 Apr 2018 21:50:46 -0700
Subject: [PATCH 0143/3370] python27Packages.youtube-dl: 2018.03.26.1 ->
 2018.04.16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/youtube-dl/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/.youtube-dl-wrapped --version’ and found version 2018.04.16
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl -h’ got 0 exit code
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl --help’ got 0 exit code
- ran ‘/nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16/bin/youtube-dl --version’ and found version 2018.04.16
- found 2018.04.16 with grep in /nix/store/3dkc0vhb4v2fyagm0p33r54f6j89sjb0-youtube-dl-2018.04.16
- directory tree listing: https://gist.github.com/359ce5add8ebf04a1dfe79aecb499137
---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index cbfbf77739ba..1f7d8c549e42 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   pname = "youtube-dl";
-  version = "2018.03.26.1";
+  version = "2018.04.16";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1sbapwx2zdhprvmljqs6rzxnhiyfpxgin7qyjdrg6h25hhq63vss";
+    sha256 = "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5257f8e5b4c927020491f1caf13ac53da99e4591 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 19 Apr 2018 22:41:26 -0700
Subject: [PATCH 0144/3370] supercollider: 3.9.2 -> 3.9.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/supercollider/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/4azhvz3aw8jkcs3vib2aaii15yq5rr8k-supercollider-3.9.3/bin/supernova -h’ got 0 exit code
- ran ‘/nix/store/4azhvz3aw8jkcs3vib2aaii15yq5rr8k-supercollider-3.9.3/bin/supernova --help’ got 0 exit code
- ran ‘/nix/store/4azhvz3aw8jkcs3vib2aaii15yq5rr8k-supercollider-3.9.3/bin/sclang -h’ got 0 exit code
- found 3.9.3 with grep in /nix/store/4azhvz3aw8jkcs3vib2aaii15yq5rr8k-supercollider-3.9.3
- directory tree listing: https://gist.github.com/1dcdb0888d56e74baf1a827e371acad1
---
 pkgs/development/interpreters/supercollider/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix
index 2d3509542135..2737fd6fae04 100644
--- a/pkgs/development/interpreters/supercollider/default.nix
+++ b/pkgs/development/interpreters/supercollider/default.nix
@@ -9,12 +9,12 @@ in
 
 stdenv.mkDerivation rec {
   name = "supercollider-${version}";
-  version = "3.9.2";
+  version = "3.9.3";
 
 
   src = fetchurl {
     url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source-linux.tar.bz2";
-    sha256 = "0d3cb6dw8jz7ijriqn3rlwin24gffczp69hl17pzxj1d5w57yj44";
+    sha256 = "1d8ixfl100jvlialxdizp8wqsl1mp5pi2bam25vp97bhjd59cfdr";
   };
 
   hardeningDisable = [ "stackprotector" ];

From dc524390689f62aefcbaf961df9afd3331ca99f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 19 Apr 2018 23:28:46 -0700
Subject: [PATCH 0145/3370] rocksndiamonds: 4.0.1.4 -> 4.1.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/rocksndiamonds/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0/bin/rocksndiamonds -h’ got 0 exit code
- ran ‘/nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0/bin/rocksndiamonds --help’ got 0 exit code
- found 4.1.0.0 with grep in /nix/store/v9jwi4ziz6yaxhvlrfz6zlx07bdrmsmw-rocksndiamonds-4.1.0.0
- directory tree listing: https://gist.github.com/9ff0ad9227dc9e0063f83d558a704fb7
---
 pkgs/games/rocksndiamonds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix
index b84e7dd3af61..09478001fb72 100644
--- a/pkgs/games/rocksndiamonds/default.nix
+++ b/pkgs/games/rocksndiamonds/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "${project}-${version}";
   project = "rocksndiamonds";
-  version = "4.0.1.4";
+  version = "4.1.0.0";
 
   src = fetchurl {
     url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz";
-    sha256 = "0rvi4crfh4rfczpsflzcfj6nqrg49mhm163k6ms9gxz97xj2jp3g";
+    sha256 = "0bmszf2hqyh76p3lzmhljcjwlx7jzpirwx9zyzgfvwqcapf5i6af";
   };
 
   desktopItem = makeDesktopItem {

From 24fe3dbb3f26dfeeb5b90bf4923247255a9605ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 20 Apr 2018 04:05:06 -0700
Subject: [PATCH 0146/3370] jackett: 0.8.823 -> 0.8.886
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jackett/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/gi1iygygag1b9cb30gir6yzv0jas2612-jackett-0.8.886/bin/Jackett -h’ got 0 exit code
- ran ‘/nix/store/gi1iygygag1b9cb30gir6yzv0jas2612-jackett-0.8.886/bin/Jackett help’ got 0 exit code
- found 0.8.886 with grep in /nix/store/gi1iygygag1b9cb30gir6yzv0jas2612-jackett-0.8.886
- directory tree listing: https://gist.github.com/79337833aca5adb980efc368f828a551
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 34d242b92a8a..f2d38111d5d2 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.823";
+  version = "0.8.886";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0hicz21dvcakqkxix70akc3rrz570j3g0a512pqrr3bdq7ay0dkk";
+    sha256 = "18agnavhch29pi1w6vp374cs6bz2j7bf55mh4ym0cs038h5xkdvv";
   };
 
   buildInputs = [ makeWrapper ];

From 8a28784618d68deac42801c9dfee2d3edaf7032d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 20 Apr 2018 04:23:49 -0700
Subject: [PATCH 0147/3370] leatherman: 1.4.0 -> 1.4.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/leatherman/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.1 with grep in /nix/store/9wbh0aq3a46hkm7ybz7mi5ns2s1hwsp9-leatherman-1.4.1
- directory tree listing: https://gist.github.com/478abe4c1470eb6b45919b8e1eca9538
---
 pkgs/development/libraries/leatherman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix
index 44d527e1304b..7b6834166d8c 100644
--- a/pkgs/development/libraries/leatherman/default.nix
+++ b/pkgs/development/libraries/leatherman/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "leatherman-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
-    sha256 = "0whlyzz0imv4lm69xkwhcd6jzh3s0rzlqjmwimbqz96p4771ivpd";
+    sha256 = "0n516gqv501ymj99bickbr2cbhr109azh9hc1hn7flbcjzz3aljc";
     rev = version;
     repo = "leatherman";
     owner = "puppetlabs";

From 8539dec47a5e2370c69995aa32f355bdceb29b18 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 20 Apr 2018 04:51:53 -0700
Subject: [PATCH 0148/3370] ibus-engines.libpinyin: 1.9.3 -> 1.10.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ibus-libpinyin/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.10.0 with grep in /nix/store/4ya0a61mnwzvlphi2a39q3wz8srak0g5-ibus-libpinyin-1.10.0
- directory tree listing: https://gist.github.com/920acb2f5a3bfd5b8d50bff07772754e
---
 .../inputmethods/ibus-engines/ibus-libpinyin/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
index bd22aefe2a95..3bdb69391cc4 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-libpinyin-${version}";
-  version = "1.9.3";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner  = "libpinyin";
     repo   = "ibus-libpinyin";
     rev    = version;
-    sha256 = "02rwddv1lxzk70946v3rjsx1p7hx1d9bnwb7cx406cbws73yb2r9";
+    sha256 = "0zkzz6ig74nws8phqxbsggnpf5g5f2hxi0mdyn2m3s4nm14q3ma6";
   };
 
   buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ];

From 412476a105e4fcf7e1ded9fa06a5f46c7fa2749e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 20 Apr 2018 05:14:00 -0700
Subject: [PATCH 0149/3370] gzdoom: 3.3.0 -> 3.3.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gzdoom/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.2 with grep in /nix/store/zv856axqy6bna0vpgramgaglz02nb8rh-gzdoom-3.3.2
- directory tree listing: https://gist.github.com/66372cbd8e865e89ab9749a99b308ea7
---
 pkgs/games/gzdoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index d622299cf0f3..3964eefb9b33 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "3.3.0";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "1q1hjfxhksny236a058ys36mpdl434vbmgapqr51n82pia838h2l";
+    sha256 = "0zlkja0jcqi3s4iw5h076iwqxa3haradqksjnx9jxcbkvaw75p3k";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];

From 01a4d957dd46bfffd792fea07bb9784a8f2931af Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 20 Apr 2018 14:55:01 +0200
Subject: [PATCH 0150/3370] openssl: enable parallel building

There is no improvement for the build duration of openssl 1.0
but the one of openssl 1.1 is reduced significantly.
---
 pkgs/development/libraries/openssl/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 5a9052222cb8..370616745d33 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -71,8 +71,7 @@ let
 
     makeFlags = [ "MANDIR=$(man)/share/man" ];
 
-    # Parallel building is broken in OpenSSL.
-    enableParallelBuilding = false;
+    enableParallelBuilding = true;
 
     postInstall = ''
       # If we're building dynamic libraries, then don't install static

From 53bea54a651c9a7c3f3a21af08779f806cd8735a Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 20 Apr 2018 16:42:27 +0200
Subject: [PATCH 0151/3370] matrix-synapse: 0.27.2 -> 0.27.4

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 3cf460539699..4c82f5cfdde8 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.27.2";
+  version = "0.27.4";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "00hcjs5hbayamckcsfd92s7f3da9jv5nm5ygvwinyc7ml7gn66i3";
+    sha256 = "051bwr4vz8mwglh1m9rqlljbn8g3alvd52f09ff887nsi6z3jc17";
   };
 
   patches = [

From cf351f6389eaf83f7122285389e9958110fe9da2 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Fri, 20 Apr 2018 16:20:45 +0100
Subject: [PATCH 0152/3370] atlassian-cli: init at 7.8.0

---
 .../office/atlassian-cli/default.nix          | 31 +++++++++++++++++++
 .../office/atlassian-cli/wrapper.sh           | 20 ++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 53 insertions(+)
 create mode 100644 pkgs/applications/office/atlassian-cli/default.nix
 create mode 100755 pkgs/applications/office/atlassian-cli/wrapper.sh

diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
new file mode 100644
index 000000000000..a56c15bffb2a
--- /dev/null
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip, jre }:
+stdenv.mkDerivation {
+  name = "atlassian-cli";
+  version = "7.8.0";
+  src = fetchzip {
+    url            = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip;
+    sha256         = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
+    extraPostFetch = "chmod go-w $out";
+  };
+  tools = [ "agile" "bamboo" "bitbucket" "confluence" "csv"
+    "hipchat" "jira" "servicedesk" "structure" "tempo" "trello" "upm" ];
+  installPhase = ''
+    mkdir -p $out/{bin,share/doc/atlassian-cli}
+    cp -r lib $out/share/java
+    cp -r README.txt license $out/share/doc/atlassian-cli
+    for tool in $tools
+    do
+      substitute ${./wrapper.sh} $out/bin/$tool \
+        --subst-var out \
+        --subst-var-by jre ${jre} \
+        --subst-var-by tool $tool
+      chmod +x $out/bin/$tool
+    done
+  '';
+  meta = with stdenv.lib; {
+    description = "An integrated family of CLI’s for various Atlassian applications";
+    homepage    = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview;
+    maintainers = [ maintainers.twey ];
+    license     = [ licenses.unfreeRedistributable ];
+  };
+}
diff --git a/pkgs/applications/office/atlassian-cli/wrapper.sh b/pkgs/applications/office/atlassian-cli/wrapper.sh
new file mode 100755
index 000000000000..80b60dbc468c
--- /dev/null
+++ b/pkgs/applications/office/atlassian-cli/wrapper.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+tool=@tool@
+user=ATLASSIAN_${tool^^}_USER
+host=ATLASSIAN_${tool^^}_HOST
+pass=ATLASSIAN_${tool^^}_PASS
+
+[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli
+if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ]
+then
+    >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli'
+    exit 1
+fi
+
+@jre@/bin/java \
+    -jar @out@/share/java/@tool@-cli-* \
+    --server "${!host}" \
+    --user "${!user}" \
+    --password "${!pass}" \
+    "$@"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b80db9d4d0ca..3b34769e148d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14766,6 +14766,8 @@ with pkgs;
 
   artha = callPackage ../applications/misc/artha { };
 
+  atlassian-cli = callPackage ../applications/office/atlassian-cli { };
+
   atomEnv = callPackage ../applications/editors/atom/env.nix {
     gconf = gnome2.GConf;
   };

From 3d974552f35c450d6f6f74e18932e1d55d06e541 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 20 Apr 2018 17:24:19 +0200
Subject: [PATCH 0153/3370] canonicaljson: 1.0.0 -> 1.1.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93e821fb719d..c2465a8e2f22 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16640,16 +16640,16 @@ EOF
 
   canonicaljson = buildPythonPackage rec {
     name = "canonicaljson-${version}";
-    version = "1.0.0";
+    version = "1.1.3";
 
     src = pkgs.fetchgit {
       url = "https://github.com/matrix-org/python-canonicaljson.git";
       rev = "refs/tags/v${version}";
-      sha256 = "0r82zlip93y169ijkn8xpbp0yr22mf92pni6dw420vb53l27sprq";
+      sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy";
     };
 
     propagatedBuildInputs = with self; [
-      frozendict simplejson
+      frozendict simplejson six
     ];
   };
 

From a23c0c577c0ba8b4f492a5d61a677c68036983b3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 20 Apr 2018 21:10:47 -0500
Subject: [PATCH 0154/3370] boehmgc: 7.6.4 -> 7.6.6

https://github.com/ivmai/bdwgc/releases/tag/v7.6.6
---
 pkgs/development/libraries/boehm-gc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index d4e91deb7449..14479a560913 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "boehm-gc-${version}";
-  version = "7.6.4";
+  version = "7.6.6";
 
   src = fetchurl {
     urls = [
       "http://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz"
       "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
     ];
-    sha256 = "076dzsqqyxd3nlzs0z277vvhqjp8nv5dqi763s0m90zr6ljiyk5r";
+    sha256 = "1p1r015a7jbpvkkbgzv1y8nxrbbp6dg0mq3ksi6ji0qdz3wfss79";
   };
 
   buildInputs = [ libatomic_ops ];

From 6d2dd3307060a0a9dc3532e123726c8657ba6c98 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 14 Apr 2018 17:11:50 +0200
Subject: [PATCH 0155/3370] python.pkgs.bootstrapped-pip: 9.0.3 -> 10.0.1

---
 .../development/python-modules/bootstrapped-pip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 4ff4c687e5c0..28962d0c9361 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -24,13 +24,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "pip";
-  version = "9.0.3";
+  version = "10.0.1";
   name = "${python.libPrefix}-bootstrapped-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     format = "wheel";
-    sha256 = "c3ede34530e0e0b2381e7363aded78e0c33291654937e7373032fda04e8803e5";
+    sha256 = "717cdffb2833be8409433a93746744b59505f42146e8d37de6c62b430e25d6d7";
   };
 
   unpackPhase = ''
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
 
     # install pip binary
     echo '#!${python.interpreter}' > $out/bin/pip
-    echo 'import sys;from pip import main' >> $out/bin/pip
+    echo 'import sys;from pip._internal import main' >> $out/bin/pip
     echo 'sys.exit(main())' >> $out/bin/pip
     chmod +x $out/bin/pip
 

From e5f57757d0396841bb6d9f215cb6777f1914c9dd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 14 Apr 2018 17:12:10 +0200
Subject: [PATCH 0156/3370] python.pkgs.pip: 9.0.3 -> 10.0.1

---
 pkgs/development/python-modules/pip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix
index a566e31e035f..20558312f290 100644
--- a/pkgs/development/python-modules/pip/default.nix
+++ b/pkgs/development/python-modules/pip/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "pip";
-  version = "9.0.3";
+  version = "10.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7bf48f9a693be1d58f49f7af7e0ae9fe29fd671cde8a55e6edca3581c4ef5796";
+    sha256 = "f2bd08e0cd1b06e10218feaf6fef299f473ba706582eb3bd9d52203fdbd7ee68";
   };
 
   # pip detects that we already have bootstrapped_pip "installed", so we need
@@ -31,4 +31,4 @@ buildPythonPackage rec {
     homepage = https://pip.pypa.io/;
     priority = 10;
   };
-}
\ No newline at end of file
+}

From 6a45d0b1791ae7f35f5b1478416893e8782fbd71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 17 Apr 2018 17:23:52 +0200
Subject: [PATCH 0157/3370] python.pkgs.flake8-future-import: 0.4.3 -> 0.4.5

---
 .../flake8-future-import/default.nix            | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix
index 2ece8ba85abc..2612cfde1f50 100644
--- a/pkgs/development/python-modules/flake8-future-import/default.nix
+++ b/pkgs/development/python-modules/flake8-future-import/default.nix
@@ -3,27 +3,18 @@
 
 buildPythonPackage rec {
   pname = "flake8-future-import";
-  name = "${pname}-${version}";
-  version = "0.4.3";
+  version = "0.4.5";
+
   # PyPI tarball doesn't include the test suite
   src = fetchFromGitHub {
     owner = "xZise";
     repo = "flake8-future-import";
     rev = version;
-    sha256 = "0622bdcfa588m7g8igag6hf4rhjdwh74yfnrjwlxw4vlqhg344k4";
+    sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr";
   };
 
-  patches = [
-    # Tests in 0.4.3 are broken. We can remove this patch after
-    # the next release.
-    (fetchurl {
-      url = "https://github.com/xZise/flake8-future-import/commit/b4f5a06b22c574fb5270574d1420715667768d5c.patch";
-      sha256 = "06n9ggz9p9kiwjb3vmaj44pm5vi4nhgzjfn7i730m85xn67xzmyn";
-    })
-  ];
-
-
   propagatedBuildInputs = [ flake8 six ];
+
   meta = {
     homepage = https://github.com/xZise/flake8-future-import;
     description = "A flake8 extension to check for the imported __future__ modules to make it easier to have a consistent code base";

From 1c84ac797d84b6f2eb086dcc8aeb48f07143b038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 17 Apr 2018 17:26:17 +0200
Subject: [PATCH 0158/3370] python: pip-tools: 1.11.0 -> 2.0.1

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

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index 752047d04f7e..abe2dff6441b 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "1.11.0";
+  version = "2.0.1";
   name = pname + "-" + version;
 
   src = fetchurl {
     url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
-    sha256 = "ba427b68443466c389e3b0b0ef55f537ab39344190ea980dfebb333d0e6a50a3";
+    sha256 = "81abea4ba206051ddaf90854b7302849002fdd0084450d2dd7f5c44a6d0ddf16";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -22,6 +22,8 @@ buildPythonPackage rec {
     "test_generate_hashes_without_interfering_with_each_other"
     "test_realistic_complex_sub_dependencies"
     "test_generate_hashes_with_editable"
+    "test_filter_pip_markes"
+    "test_get_hashes_local_repository_cache_miss"
     # Expect specific version of "six":
     "test_editable_package"
     "test_input_file_without_extension"

From 3ce3708d197021fa941d63fd50afd219ba2065fa Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 21 Apr 2018 14:33:02 +0200
Subject: [PATCH 0159/3370] libgphoto2: 2.5.16 -> 2.5.17

---
 pkgs/development/libraries/libgphoto2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 9c0ea4a3a73e..96b42ac068cc 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     owner = "gphoto";
     repo = "libgphoto2";
     rev = "${meta.tag}";
-    sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9";
+    sha256 = "0pbfg89817qkb35mmajsw2iz6j9nhkkj67m419f8x8yxpqkaa0wb";
   };
 
   patches = [];
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.16";
-    tag = "libgphoto2-2_5_16-release";
+    version = "2.5.17";
+    tag = "libgphoto2-2_5_17-release";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;

From 294f823146aa1961f493d0c2f408872e9b2d34cb Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sat, 21 Apr 2018 14:41:43 +0200
Subject: [PATCH 0160/3370] gphoto2: 2.5.15 -> 2.5.17

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

diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index 77e7b592f647..5131e0739e73 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.15";
+  name = "gphoto2-2.5.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf";
+    sha256 = "0kslwclyyzvnxjw3gdzhlagj7l5f8lba833ipr9s0s0c4hwi0mxa";
   };
 
   nativeBuildInputs = [ pkgconfig gettext libtool ];

From ee1778de783a4ad24656b6901ad447a979d4061c Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Fri, 20 Apr 2018 23:39:08 -0300
Subject: [PATCH 0161/3370] mesa_drivers: fix drirc install path

This will install drirc to the location where mesa expects to find it.

You can test with:

    LIBGL_DEBUG=1 glxgears

An error message will be printed if drirc can't be found.
---
 pkgs/development/libraries/mesa/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e77a4e1414e9..fae83a95f3ca 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -160,7 +160,7 @@ let self = stdenv.mkDerivation {
   doCheck = false;
 
   installFlags = [
-    "sysconfdir=\${out}/etc"
+    "sysconfdir=\${drivers}/etc"
     "localstatedir=\${TMPDIR}"
     "vendorjsondir=\${out}/share/glvnd/egl_vendor.d"
   ];

From 6392fb3d6ca585c4b4da6a42a93466ca9d19c1e3 Mon Sep 17 00:00:00 2001
From: Guillaume Bouchard <guillaum.bouchard@gmail.com>
Date: Sun, 15 Apr 2018 10:49:10 +0200
Subject: [PATCH 0162/3370] pysensors: init at 2017-07-13

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

diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix
new file mode 100644
index 000000000000..c891140827ee
--- /dev/null
+++ b/pkgs/development/python-modules/pysensors/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }:
+buildPythonPackage rec {
+  version = "2017-07-13";
+  pname = "pysensors";
+
+  # note that https://pypi.org/project/PySensors/ is a different project
+  src = fetchFromGitHub {
+    owner = "bastienleonard";
+    repo = "pysensors";
+    rev = "ef46fc8eb181ecb8ad09b3d80bc002d23d9e26b3";
+    sha256 = "1xvbxnkz55fk5fpr514263c7s7s9r8hgrw4ybfaj5a0mligmmrfm";
+  };
+
+  buildInputs = [ lm_sensors ];
+
+  # Tests are disable because they fail on `aarch64-linux`, probably
+  # due to sandboxing
+  doCheck = false;
+
+  checkPhase = ''
+    cd tests
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ guibou ];
+    description = "Easy hardware health monitoring in Python for Linux systems";
+    homepage = http://pysensors.readthedocs.org;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e572eaefb2eb..d6a8fb0ffaa6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18271,6 +18271,8 @@ EOF
 
   pyspark = callPackage ../development/python-modules/pyspark { };
 
+  pysensors = callPackage ../development/python-modules/pysensors { };
+
   sseclient = callPackage ../development/python-modules/sseclient { };
 
   textacy = callPackage ../development/python-modules/textacy { };

From 79eebad05559adb9a4e7c3de73e3bcdad508729a Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Sat, 21 Apr 2018 22:34:39 +0200
Subject: [PATCH 0163/3370] Fix incorrect merge

---
 nixos/modules/security/acme.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index eb705007d028..e430c2ddb903 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -212,7 +212,6 @@ in
                 domain = if data.domain != null then data.domain else cert;
                 cpath = lpath + optionalString (data.activationDelay != null) ".staging";
                 lpath = "${cfg.directory}/${cert}";
-                cpath = "${cfg.directory}/${cert}";
                 rights = if data.allowKeysForGroup then "750" else "700";
                 cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ]
                           ++ optionals (data.email != null) [ "--email" data.email ]

From f7fe61207b57d678e20548bee7d790a885c29df0 Mon Sep 17 00:00:00 2001
From: Drew Hess <src@drewhess.com>
Date: Sat, 21 Apr 2018 14:50:07 -0700
Subject: [PATCH 0164/3370] hydra: fix run-time dependencies after latest CPAN
 update.

---
 pkgs/development/tools/misc/hydra/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index 38b28ec0f607..4fdd017306ac 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -27,6 +27,7 @@ let
         CatalystViewDownload
         CatalystViewJSON
         CatalystViewTT
+        CatalystXRoleApplicator
         CatalystXScriptServerStarman
         CryptRandPasswd
         DBDPg
@@ -39,6 +40,7 @@ let
         FileSlurp
         IOCompress
         IPCRun
+        JSONAny
         JSONXS
         LWP
         LWPProtocolHttps

From 50953c3cbcbe26498a5c9f13e3a49946803f7801 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 22 Apr 2018 00:17:26 +0200
Subject: [PATCH 0165/3370] =?UTF-8?q?gdk=5Fpixbuf:=202.36.7=20=E2=86=92=20?=
 =?UTF-8?q?2.36.12=20(#39026)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/gdk-pixbuf/default.nix          | 47 ++++++++++++-------
 .../gdk-pixbuf/no-mime-sniffing.patch         | 18 +++++++
 2 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 6bfa6bdc2fb9..aa415d097ca2 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,40 +1,50 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobjectIntrospection, doCheck ? false }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
+, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
 
 let
   pname = "gdk-pixbuf";
-  version = "2.36.7";
-  # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
-  # which apparently requires access to shared-mime-info files during runtime.
+  version = "2.36.12";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
+    sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
   };
 
-  outputs = [ "out" "dev" "devdoc" ];
+  patches = [
+    # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
+    # which requires access to shared-mime-info files during runtime.
+    # For now, we are patching the build script to avoid the dependency.
+    ./no-mime-sniffing.patch
+  ];
+
+  outputs = [ "out" "dev" "man" "devdoc" ];
 
   setupHook = ./setup-hook.sh;
 
-  enableParallelBuilding = true;
-
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 gobjectIntrospection ];
+  buildInputs = [ libX11 ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
+    gtk-doc gobjectIntrospection makeWrapper
+  ];
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  configureFlags = "--with-libjasper --with-x11"
-    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
-    ;
+  mesonFlags = [
+    "-Ddocs=true"
+    "-Djasper=true"
+    "-Dx11=true"
+    "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
+  ];
 
-  # on darwin, tests don't link
-  preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
-    substituteInPlace Makefile --replace "docs tests" "docs"
+  postPatch = ''
+    chmod +x build-aux/* # patchShebangs only applies to executables
+    patchShebangs build-aux
   '';
 
   postInstall =
@@ -42,6 +52,9 @@ stdenv.mkDerivation rec {
     ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+
+      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
+      $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
new file mode 100644
index 000000000000..9896e25acda1
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
@@ -0,0 +1,18 @@
+--- a/meson.build
++++ b/meson.build
+@@ -186,13 +186,8 @@
+ gmodule_dep = dependency('gmodule-no-export-2.0')
+ gio_dep = dependency('gio-2.0')
+ 
+-# On non-Windows/macOS systems we always required shared-mime-info and GIO
+-if host_system != 'windows' and host_system != 'darwin'
+-  shared_mime_dep = dependency('shared-mime-info')
+-  gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1)
+-else
+-  shared_mime_dep = []
+-endif
++# No MIME sniffing for now
++shared_mime_dep = []
+ 
+ gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ]
+ 

From c70a245bb314250271c0fa1b6bcc78f80f867dfe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 22 Apr 2018 00:18:56 +0200
Subject: [PATCH 0166/3370] =?UTF-8?q?Revert=20"gdk=5Fpixbuf:=202.36.7=20?=
 =?UTF-8?q?=E2=86=92=202.36.12=20(#39026)"=20(#39316)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 50953c3cbcbe26498a5c9f13e3a49946803f7801.
---
 .../libraries/gdk-pixbuf/default.nix          | 49 +++++++------------
 .../gdk-pixbuf/no-mime-sniffing.patch         | 18 -------
 2 files changed, 18 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index aa415d097ca2..6bfa6bdc2fb9 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,50 +1,40 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
-, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
+, jasper, gobjectIntrospection, doCheck ? false }:
 
 let
   pname = "gdk-pixbuf";
-  version = "2.36.12";
+  version = "2.36.7";
+  # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
+  # which apparently requires access to shared-mime-info files during runtime.
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
+    sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
   };
 
-  patches = [
-    # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
-    # which requires access to shared-mime-info files during runtime.
-    # For now, we are patching the build script to avoid the dependency.
-    ./no-mime-sniffing.patch
-  ];
-
-  outputs = [ "out" "dev" "man" "devdoc" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   setupHook = ./setup-hook.sh;
 
-  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 ];
+  enableParallelBuilding = true;
 
-  nativeBuildInputs = [
-    meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
-    gtk-doc gobjectIntrospection makeWrapper
-  ];
+  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
+  buildInputs = [ libX11 gobjectIntrospection ];
+
+  nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  mesonFlags = [
-    "-Ddocs=true"
-    "-Djasper=true"
-    "-Dx11=true"
-    "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
-  ];
+  configureFlags = "--with-libjasper --with-x11"
+    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
+    ;
 
-  postPatch = ''
-    chmod +x build-aux/* # patchShebangs only applies to executables
-    patchShebangs build-aux
+  # on darwin, tests don't link
+  preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
+    substituteInPlace Makefile --replace "docs tests" "docs"
   '';
 
   postInstall =
@@ -52,9 +42,6 @@ stdenv.mkDerivation rec {
     ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
-
-      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
-      $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
deleted file mode 100644
index 9896e25acda1..000000000000
--- a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -186,13 +186,8 @@
- gmodule_dep = dependency('gmodule-no-export-2.0')
- gio_dep = dependency('gio-2.0')
- 
--# On non-Windows/macOS systems we always required shared-mime-info and GIO
--if host_system != 'windows' and host_system != 'darwin'
--  shared_mime_dep = dependency('shared-mime-info')
--  gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1)
--else
--  shared_mime_dep = []
--endif
-+# No MIME sniffing for now
-+shared_mime_dep = []
- 
- gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ]
- 

From 3e3b5895ca2088126219559768e412902b137ee0 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 21 Apr 2018 22:30:59 +0800
Subject: [PATCH 0167/3370] remarshal: use python3 instead of python2

Officially both python2 and 3 are supported.
---
 pkgs/development/tools/remarshal/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix
index baba4fd75ea9..23c9768f7e05 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/pkgs/development/tools/remarshal/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ stdenv, python3Packages, fetchFromGitHub }:
 
-pythonPackages.buildPythonApplication rec {
-  name = "remarshal-${version}";
+python3Packages.buildPythonApplication rec {
+  pname = "remarshal";
   version = "0.7.0";
 
   src = fetchFromGitHub {
@@ -11,10 +11,8 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "1wsgvzfp40lvly7nyyhv9prip4vi32rfc8kdji587jpw28zc1dfb";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
-    dateutil
-    pytoml
-    pyyaml
+  propagatedBuildInputs = with python3Packages; [
+    dateutil pytoml pyyaml
   ];
 
   meta = with stdenv.lib; {

From d71a8533ff24c510be9692c24df64d8675d7d8b5 Mon Sep 17 00:00:00 2001
From: Masayuki Takeda <mtakeda.enigsol@gmail.com>
Date: Sun, 22 Apr 2018 12:23:19 +0900
Subject: [PATCH 0168/3370] ffmpeg library clash fix

---
 pkgs/tools/misc/sweep-visualizer/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix
index c1f3fbea8e5c..cbf849494b75 100644
--- a/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/pkgs/tools/misc/sweep-visualizer/default.nix
@@ -24,10 +24,9 @@
     buildPhase = ":";
 
     installPhase = ''
-      mkdir -p $out/lib $out/bin $out/share/sweep-visualizer
+      mkdir -p $out/bin $out/share/sweep-visualizer
       mv usr/share/* $out/share
       mv opt/Sweep\ Visualizer\ BETA/* $out/share/sweep-visualizer/
-      mv $out/share/sweep-visualizer/*.so $out/lib/
       ln -s $out/share/sweep-visualizer/sweep_visualizer $out/bin/sweep_visualizer
     '';
 
@@ -40,12 +39,12 @@
       ];
       runtimeLibs = lib.makeLibraryPath [ libudev0-shim ];
     in ''
-      for lib in $out/lib/*.so; do
-        patchelf --set-rpath "$out/lib:${libPath}" $lib
+      for lib in $out/share/sweep-visualizer/*.so; do
+        patchelf --set-rpath "$out/share/sweep-visualizer:${libPath}" $lib
       done
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "$out/lib:${libPath}" \
+        --set-rpath "$out/share/sweep-visualizer:${libPath}" \
         $out/share/sweep-visualizer/sweep_visualizer
       wrapProgram "$out/bin/sweep_visualizer" --prefix LD_LIBRARY_PATH : ${runtimeLibs}
     '';

From 4bf61fa67adfc39e3ee53934ef2a2cf505137a8c Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Sun, 25 Mar 2018 23:41:41 -0700
Subject: [PATCH 0169/3370] trezord: Added Trezor Model-T (v2) udev rules

---
 nixos/modules/services/hardware/trezord.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix
index fa0496114684..f2ec00a7d3e1 100644
--- a/nixos/modules/services/hardware/trezord.nix
+++ b/nixos/modules/services/hardware/trezord.nix
@@ -26,8 +26,15 @@ in {
       name = "trezord-udev-rules";
       destination = "/etc/udev/rules.d/51-trezor.rules";
       text = ''
-        SUBSYSTEM=="usb", ATTR{idVendor}=="534c", ATTR{idProduct}=="0001", MODE="0666", GROUP="dialout", SYMLINK+="trezor%n"
-        KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001",  MODE="0666", GROUP="dialout"
+        # Trezor 1
+        SUBSYSTEM=="usb",  ATTR{idVendor}=="534c",  ATTR{idProduct}=="0001",  MODE="0666", GROUP="dialout", SYMLINK+="trezor%n"
+        KERNEL=="hidraw*", ATTRS{idVendor}=="534c", ATTRS{idProduct}=="0001", MODE="0666", GROUP="dialout"
+
+        # Trezor 2 (Model-T)
+        SUBSYSTEM=="usb",  ATTR{idVendor}=="1209",  ATTR{idProduct}=="53c0",  MODE="0661", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
+        SUBSYSTEM=="usb",  ATTR{idVendor}=="1209",  ATTR{idProduct}=="53c1",  MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl", SYMLINK+="trezor%n"
+        KERNEL=="hidraw*", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="53c1", MODE="0660", GROUP="dialout", TAG+="uaccess", TAG+="udev-acl"
+  ];
       '';
     });
 

From b52f5dba48d39a67112f95a15dd0a786959f0e52 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sun, 22 Apr 2018 11:17:59 +1000
Subject: [PATCH 0170/3370] gup: simplify build expression

---
 .../tools/build-managers/gup/build.nix        | 16 ----------
 .../tools/build-managers/gup/default.nix      | 32 +++++++++++--------
 2 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/gup/build.nix

diff --git a/pkgs/development/tools/build-managers/gup/build.nix b/pkgs/development/tools/build-managers/gup/build.nix
deleted file mode 100644
index a9af037bb81e..000000000000
--- a/pkgs/development/tools/build-managers/gup/build.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-# NOTE: this file is copied from the upstream repository for this package.
-# Please submit any changes you make here to https://github.com/timbertson/gup/
-
-{ stdenv, lib, python, which, pychecker ? null }:
-{ src, version, meta ? {} }:
-stdenv.mkDerivation {
-  inherit src meta;
-  name = "gup-${version}";
-  buildInputs = lib.remove null [ python which pychecker ];
-  SKIP_PYCHECKER = pychecker == null;
-  buildPhase = "make python";
-  installPhase = ''
-    mkdir $out
-    cp -r python/bin $out/bin
-  '';
-}
diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index 8d1ad4490e98..748a59bda2f3 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, lib, python, which }:
-let
+{ stdenv, fetchFromGitHub, lib, python, which, pychecker ? null }:
+stdenv.mkDerivation rec {
   version = "0.7.0";
   src = fetchFromGitHub {
     sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
@@ -7,15 +7,19 @@ let
     repo = "gup";
     owner = "timbertson";
   };
-in
-import ./build.nix
-  { inherit stdenv lib python which; }
-  { inherit src version;
-    meta = {
-      inherit (src.meta) homepage;
-      description = "A better make, inspired by djb's redo";
-      license = stdenv.lib.licenses.lgpl2Plus;
-      maintainers = [ stdenv.lib.maintainers.timbertson ];
-      platforms = stdenv.lib.platforms.all;
-    };
-  }
+  name = "gup-${version}";
+  buildInputs = lib.remove null [ python which pychecker ];
+  SKIP_PYCHECKER = pychecker == null;
+  buildPhase = "make python";
+  installPhase = ''
+    mkdir $out
+    cp -r python/bin $out/bin
+  '';
+  meta = {
+    inherit (src.meta) homepage;
+    description = "A better make, inspired by djb's redo";
+    license = stdenv.lib.licenses.lgpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.timbertson ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

From ad5b090853d381efcc0e2e7f87eaf364aa4abac6 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sun, 22 Apr 2018 11:31:41 +1000
Subject: [PATCH 0171/3370] gup: add `passthru.updateScript`

---
 .../tools/build-managers/gup/default.nix      | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index 748a59bda2f3..f6d5b7b9b59c 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, lib, python, which, pychecker ? null }:
+{ stdenv, fetchFromGitHub, nix-update-source, lib, python, which, pychecker ? null }:
 stdenv.mkDerivation rec {
   version = "0.7.0";
   src = fetchFromGitHub {
-    sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
-    rev = "version-${version}";
-    repo = "gup";
     owner = "timbertson";
+    repo = "gup";
+    rev = "version-0.7.0";
+    sha256 = "1pwnmlq2pgkkln9sgz4wlb9dqlqw83bkf105qljnlvggc21zm3pv";
   };
   name = "gup-${version}";
   buildInputs = lib.remove null [ python which pychecker ];
@@ -15,6 +15,19 @@ stdenv.mkDerivation rec {
     mkdir $out
     cp -r python/bin $out/bin
   '';
+  passthru.updateScript = ''
+    set -e
+    echo
+    cd ${toString ./.}
+    ${nix-update-source}/bin/nix-update-source \
+      --prompt version \
+      --replace-attr version \
+      --set owner timbertson \
+      --set repo gup \
+      --set type fetchFromGitHub \
+      --set rev 'version-{version}' \
+      --modify-nix default.nix
+  '';
   meta = {
     inherit (src.meta) homepage;
     description = "A better make, inspired by djb's redo";

From 9cbf81e11b12e3799fe35b039d93caead6083ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Sat, 25 Nov 2017 23:03:36 +0100
Subject: [PATCH 0172/3370] initial kernel modules for TBS devices

---
 pkgs/os-specific/linux/tbs/default.nix | 50 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/os-specific/linux/tbs/default.nix

diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
new file mode 100644
index 000000000000..e4b954d4dbf5
--- /dev/null
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }:
+let
+  media = fetchFromGitHub {
+    owner = "tbsdtv";
+    repo = "linux_media";
+    rev = "14ebbec91f2cd0423aaf859fc6e6d5d986397cd4";
+    sha256 = "1cmqj3kby8sxfcpvslbxywr95529vjxzbn800fdp35lka1fv962h";
+  };
+  build = fetchFromGitHub {
+    owner = "tbsdtv";
+    repo = "media_build";
+    rev = "c340e29a4047e43f7ea7ebf19e1e28c1f2112d05";
+    sha256 = "0hfn1j9qk8lh30z3ywj22qky480nsf8z2iag2bqhrhy4375vjlbl";
+  };
+in stdenv.mkDerivation {
+  name = "tbs-2017-11-05-${kernel.version}";
+
+  srcs = [ media build ];
+  sourceRoot = "${build.name}";
+
+  preConfigure = ''
+    make dir DIR=../${media.name}
+  '';
+
+  postPatch = ''
+    patchShebangs .
+
+    sed -i v4l/Makefile \
+      -i v4l/scripts/make_makefile.pl \
+      -e 's,/sbin/depmod,${kmod}/bin/depmod,g' \
+      -e 's,/sbin/lsmod,${kmod}/bin/lsmod,g'
+
+    sed -i v4l/Makefile \
+      -e 's,^OUTDIR ?= /lib/modules,OUTDIR ?= ${kernel.dev}/lib/modules,' \
+      -e 's,^SRCDIR ?= /lib/modules,SRCDIR ?= ${kernel.dev}/lib/modules,'
+  '';
+
+  buildFlags = [ "VER=${kernel.modDirVersion}" ];
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  hardeningDisable = [ "pic" "format" ];
+  nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.tbsdtv.com/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ck3d ];
+    priority = 20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9bbbbf396c5..5da5087c46bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13522,6 +13522,8 @@ with pkgs;
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
 
+    tbs = callPackage ../os-specific/linux/tbs { };
+
     nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
 
     nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };

From bf6d796a2763f2f58c8e04f9505478d478de0e97 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 21 Apr 2018 19:37:49 +0200
Subject: [PATCH 0173/3370] haskell: allow overriding all package sets at once

Setting haskell.packageOverrides like so:

  haskell = super.haskell // {
    packageOverrides = self: super: {
      my-package = ...;
      my-other-package = ...;
    };
  };

causes all compiler-specific package sets to be overridden with those
overrides.
---
 doc/languages-frameworks/haskell.section.md | 50 +++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix         |  8 +++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index 1623e0d276f2..3b8971c295bb 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -666,6 +666,56 @@ prefer one built with GHC 7.8.x in the first place. However, for users who
 cannot use GHC 7.10.x at all for some reason, the approach of downgrading to an
 older version might be useful.
 
+### How to override packages in all compiler-specific package sets
+
+In the previous section we learned how to override a package in a single
+compiler-specific package set. You may have some overrides defined that you want
+to use across multiple package sets. To accomplish this you could use the
+technique that we learned in the previous section by repeating the overrides for
+all the compiler-specific package sets. For example:
+
+```nix
+{
+  packageOverrides = super: let self = super.pkgs; in
+  {
+    haskell = super.haskell // {
+      packages = super.haskell.packages // {
+        ghc784 = super.haskell.packages.ghc784.override {
+          overrides = self: super: {
+            my-package = ...;
+            my-other-package = ...;
+          };
+        };
+        ghc822 = super.haskell.packages.ghc784.override {
+          overrides = self: super: {
+            my-package = ...;
+            my-other-package = ...;
+          };
+        };
+        ...
+      };
+    };
+  };
+}
+```
+
+However there's a more convenient way to override all compiler-specific package
+sets at once:
+
+```nix
+{
+  packageOverrides = super: let self = super.pkgs; in
+  {
+    haskell = super.haskell // {
+      packageOverrides = self: super: {
+        my-package = ...;
+        my-other-package = ...;
+      };
+    };
+  };
+}
+```
+
 ### How to recover from GHC's infamous non-deterministic library ID bug
 
 GHC and distributed build farms don't get along well:
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index f9cd2eb94337..48980e48f1d4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -19,7 +19,10 @@ let
     inherit pkgs;
   };
 
-  callPackage = newScope { inherit haskellLib; };
+  callPackage = newScope {
+    inherit haskellLib;
+    overrides = pkgs.haskell.packageOverrides;
+  };
 
   bootstrapPackageSet = self: super: {
     mkDerivation = drv: super.mkDerivation (drv // {
@@ -99,6 +102,9 @@ in rec {
       (name: compiler."${name}".override { enableIntegerSimple = true; }));
   };
 
+  # Default overrides that are applied to all package sets.
+  packageOverrides = self : super : {};
+
   # Always get compilers from `buildPackages`
   packages = let bh = buildPackages.haskell; in {
 

From e9baa47a3b441631e2c124f919416eb827ad662a Mon Sep 17 00:00:00 2001
From: Marti Serra <marti.serra.coscollano@gmail.com>
Date: Fri, 13 Apr 2018 17:09:47 +0200
Subject: [PATCH 0174/3370] tribler: 7.0.1 -> 7.0.2

---
 pkgs/applications/networking/p2p/tribler/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index f6828fe6f317..aa42af5ccbdd 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -2,13 +2,12 @@
 , enablePlayer ? true, vlc ? null, qt5 }:
 
 stdenv.mkDerivation rec {
-  pname = "tribler";
-  name = "${pname}-${version}";
-  version = "7.0.1";
+  name = "tribler-${version}";
+  version = "7.0.2";
 
   src = fetchurl {
     url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
-    sha256 = "0cqg6319x2lid5la5vdlj6lwja8g712196j39jzv5yiaq8d0zym4";
+    sha256 = "1p0d0l0sa0nrnbyx2gg50nklkljwvl581i9w3z5qbkfzc7jsdy42";
   };
 
   buildInputs = [
@@ -41,6 +40,7 @@ stdenv.mkDerivation rec {
     pythonPackages.service-identity
     pythonPackages.psutil
     pythonPackages.meliae
+    pythonPackages.sip
   ];
 
   postPatch = ''

From 46425a65ac4df2010f9ad1c94f03e4cf95139891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 21 Apr 2018 20:06:36 +0100
Subject: [PATCH 0175/3370] bitcoin-{unlimited,xt}: fix darwin

---
 .../altcoins/bitcoin-unlimited.nix            | 10 ++++++----
 pkgs/applications/altcoins/bitcoin-xt.nix     |  8 +++++---
 pkgs/applications/altcoins/default.nix        | 20 +++++++++++++++----
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix
index d9040377ebe3..5a67dc565aa7 100644
--- a/pkgs/applications/altcoins/bitcoin-unlimited.nix
+++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
 , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
-, withGui }:
+, withGui
+, Foundation, ApplicationServices, AppKit }:
 
 with stdenv.lib;
 
@@ -19,7 +20,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib
                   miniupnpc utillinux protobuf libevent ]
-                  ++ optionals withGui [ qt4 qrencode ];
+                  ++ optionals withGui [ qt4 qrencode ]
+                  ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ];
 
   patches = [
     ./bitcoin-unlimited-const-comparators.patch
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
       completely decentralized, without the need for a central server or trusted
       parties. Users hold the crypto keys to their own money and transact directly
       with each other, with the help of a P2P network to check for double-spending.
-      
+
       The Bitcoin Unlimited (BU) project seeks to provide a voice to all
       stakeholders in the Bitcoin ecosystem.
 
@@ -55,7 +57,7 @@ stdenv.mkDerivation rec {
 
       If you support an increase in the blocksize limit by any means - or just
       support Bitcoin conflict resolution as originally envisioned by its founder -
-      consider running a Bitcoin Unlimited client.      
+      consider running a Bitcoin Unlimited client.
     '';
     homepage = https://www.bitcoinunlimited.info/;
     maintainers = with maintainers; [ DmitryTsygankov ];
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index ccc55d17bcf6..feb2924f8651 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, openssl, db48, boost
 , zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl, libevent
-, withGui }:
+, withGui
+, Foundation, ApplicationServices, AppKit }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
@@ -18,7 +19,8 @@ stdenv.mkDerivation rec{
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib libevent
                   miniupnpc utillinux protobuf curl ]
-                  ++ optionals withGui [ qt4 qrencode ];
+                  ++ optionals withGui [ qt4 qrencode ]
+                  ++ optionals stdenv.isDarwin [ Foundation ApplicationServices AppKit ];
 
   configureFlags = [
     "--with-boost-libdir=${boost.out}/lib"
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec{
       Bitcoin XT is an implementation of a Bitcoin full node, based upon the
       source code of Bitcoin Core. It is built by taking the latest stable
       Core release, applying a series of patches, and then doing deterministic
-      builds so anyone can check the downloads correspond to the source code. 
+      builds so anyone can check the downloads correspond to the source code.
     '';
     homepage = https://bitcoinxt.software/;
     maintainers = with maintainers; [ jefdaj ];
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 174ff96a1247..c58178e3edbb 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -10,14 +10,26 @@ rec {
   bitcoin-abc  = libsForQt5.callPackage ./bitcoin-abc.nix { boost = boost165; withGui = true; };
   bitcoind-abc = callPackage ./bitcoin-abc.nix { boost = boost165; withGui = false; };
 
-  bitcoin-unlimited  = callPackage ./bitcoin-unlimited.nix { withGui = true; };
-  bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; };
+  bitcoin-unlimited  = callPackage ./bitcoin-unlimited.nix {
+    inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
+    withGui = true;
+  };
+  bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix {
+    inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
+    withGui = false;
+  };
 
   bitcoin-classic  = libsForQt5.callPackage ./bitcoin-classic.nix { boost = boost165; withGui = true; };
   bitcoind-classic = callPackage ./bitcoin-classic.nix { boost = boost165; withGui = false; };
 
-  bitcoin-xt  = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = true; };
-  bitcoind-xt = callPackage ./bitcoin-xt.nix { boost = boost165; withGui = false; };
+  bitcoin-xt  = callPackage ./bitcoin-xt.nix {
+    inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
+    boost = boost165; withGui = true;
+  };
+  bitcoind-xt = callPackage ./bitcoin-xt.nix {
+    inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit;
+    boost = boost165; withGui = false;
+  };
 
   btc1 = callPackage ./btc1.nix { boost = boost165; withGui = true; };
   btc1d = callPackage ./btc1.nix { boost = boost165; withGui = false; };

From caa45305fe230421e6f06819ffe157bad0524c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Apr 2018 12:49:17 +0100
Subject: [PATCH 0176/3370] nix-review: 0.1.2 -> 0.2.0

---
 pkgs/tools/package-management/nix-review/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nix-review/default.nix
index 2b813638a11a..14b234c4dd5a 100644
--- a/pkgs/tools/package-management/nix-review/default.nix
+++ b/pkgs/tools/package-management/nix-review/default.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nix-review";
-  version = "0.1.2";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-review";
     rev = version;
-    sha256 = "06lj3q6405fw18fq1xg0bm52cwlwx94lx5hn4zpz3rxl5g49wiyz";
+    sha256 = "138f9m2c8fwpvn3kv5q7845ffi1pjbqxcs44aych4832i0pn6jaf";
   };
 
   buildInputs = [ makeWrapper ];

From 63901546df7b0b473459ad076c9dd190b5a0aba7 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Sat, 21 Apr 2018 18:46:44 +0200
Subject: [PATCH 0177/3370] canonicaljson: separating from pythonPackages

---
 .../python-modules/canonicaljson/default.nix  | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 15 +-----------
 2 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/canonicaljson/default.nix

diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix
new file mode 100644
index 000000000000..b7fd01472aab
--- /dev/null
+++ b/pkgs/development/python-modules/canonicaljson/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, frozendict, simplejson, six
+}:
+
+buildPythonPackage rec {
+  pname = "canonicaljson";
+  version = "1.1.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q50zk9a0r7kd56rdf9cgyxxj7vy54j96sgh8vc8jhmsvdv8dzh6";
+  };
+
+  propagatedBuildInputs = [
+    frozendict simplejson six
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/matrix-org/python-canonicaljson;
+    description = "Encodes objects and arrays as RFC 7159 JSON.";
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c2465a8e2f22..878292cb2025 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16638,20 +16638,7 @@ EOF
     };
   };
 
-  canonicaljson = buildPythonPackage rec {
-    name = "canonicaljson-${version}";
-    version = "1.1.3";
-
-    src = pkgs.fetchgit {
-      url = "https://github.com/matrix-org/python-canonicaljson.git";
-      rev = "refs/tags/v${version}";
-      sha256 = "11j0xmbw2hbl789pyfga02w8aa3s8rkc8pk6501r1sfy8xljd8zy";
-    };
-
-    propagatedBuildInputs = with self; [
-      frozendict simplejson six
-    ];
-  };
+  canonicaljson = callPackage ../development/python-modules/canonicaljson { };
 
   daemonize = buildPythonPackage rec {
     name = "daemonize-${version}";

From ce3961cc70d506838084834c22e29983899c5011 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Fri, 20 Apr 2018 22:37:06 +0200
Subject: [PATCH 0178/3370] python-frozendict: 0.5 -> 1.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 878292cb2025..1de6d8bafa3f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2558,11 +2558,11 @@ in {
   fritzconnection = callPackage ../development/python-modules/fritzconnection { };
 
   frozendict = buildPythonPackage rec {
-    name = "frozendict-0.5";
+    name = "frozendict-1.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/f/frozendict/${name}.tar.gz";
-      sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n";
+      sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp";
     };
 
     meta = {

From 2749531e0f1a76c7e611ce8a7f553de337c1f8e9 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Sat, 21 Apr 2018 18:48:10 +0200
Subject: [PATCH 0179/3370] frozendict: move to separate module

---
 .../python-modules/frozendict/default.nix       | 17 +++++++++++++++++
 pkgs/top-level/python-packages.nix              | 15 +--------------
 2 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/frozendict/default.nix

diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix
new file mode 100644
index 000000000000..4ec8eff70c6d
--- /dev/null
+++ b/pkgs/development/python-modules/frozendict/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "frozendict";
+  version = "1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/slezica/python-frozendict;
+    description = "An immutable dictionary";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1de6d8bafa3f..b4028e01a4e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2557,20 +2557,7 @@ in {
 
   fritzconnection = callPackage ../development/python-modules/fritzconnection { };
 
-  frozendict = buildPythonPackage rec {
-    name = "frozendict-1.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/f/frozendict/${name}.tar.gz";
-      sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp";
-    };
-
-    meta = {
-      homepage = https://github.com/slezica/python-frozendict;
-      description = "An immutable dictionary";
-      license = stdenv.lib.licenses.mit;
-    };
-  };
+  frozendict = callPackage ../development/python-modules/frozendict { };
 
   ftputil = callPackage ../development/python-modules/ftputil { };
 

From 8bc970bbc7c4ee9423844fbe7a6561ed90d414db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 2 Apr 2018 00:28:50 +0200
Subject: [PATCH 0180/3370] raspberrypi-bootloader: Adds support for using
 uboot

Uboot is copied into `/boot` in the installation process.
The boot entries are created by calling the `generic-extlinux-compatible` builder.
---
 .../system/boot/loader/raspberrypi/builder.sh |  4 +
 .../boot/loader/raspberrypi/builder_uboot.nix | 34 +++++++
 .../boot/loader/raspberrypi/builder_uboot.sh  | 29 ++++++
 .../boot/loader/raspberrypi/raspberrypi.nix   | 91 +++++++++++++++----
 4 files changed, 141 insertions(+), 17 deletions(-)
 create mode 100644 nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix
 create mode 100644 nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh

diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
index f627d093eafb..8adc8a6a7e11 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh
@@ -109,11 +109,15 @@ copyForced $fwdir/bootcode.bin  /boot/bootcode.bin
 copyForced $fwdir/fixup.dat     /boot/fixup.dat
 copyForced $fwdir/fixup_cd.dat  /boot/fixup_cd.dat
 copyForced $fwdir/fixup_db.dat  /boot/fixup_db.dat
+copyForced $fwdir/fixup_x.dat   /boot/fixup_x.dat
 copyForced $fwdir/start.elf     /boot/start.elf
 copyForced $fwdir/start_cd.elf  /boot/start_cd.elf
 copyForced $fwdir/start_db.elf  /boot/start_db.elf
 copyForced $fwdir/start_x.elf   /boot/start_x.elf
 
+# Add the config.txt
+copyForced @configTxt@ /boot/config.txt
+
 # Remove obsolete files from /boot and /boot/old.
 for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do
     if ! test "${filesCopied[$fn]}" = 1; then
diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix
new file mode 100644
index 000000000000..47f25a9c2b1b
--- /dev/null
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.nix
@@ -0,0 +1,34 @@
+{ config, pkgs, configTxt }:
+
+let
+  cfg = config.boot.loader.raspberryPi;
+  isAarch64 = pkgs.stdenv.isAarch64;
+
+  uboot =
+    if cfg.version == 1 then
+      pkgs.ubootRaspberryPi
+    else if cfg.version == 2 then
+      pkgs.ubootRaspberryPi2
+    else
+      if isAarch64 then
+        pkgs.ubootRaspberryPi3_64bit
+      else
+        pkgs.ubootRaspberryPi3_32bit;
+
+  extlinuxConfBuilder =
+    import ../generic-extlinux-compatible/extlinux-conf-builder.nix {
+      inherit pkgs;
+    };
+in
+pkgs.substituteAll {
+  src = ./builder_uboot.sh;
+  isExecutable = true;
+  inherit (pkgs) bash;
+  path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
+  firmware = pkgs.raspberrypifw;
+  inherit uboot;
+  inherit configTxt;
+  inherit extlinuxConfBuilder;
+  version = cfg.version;
+}
+
diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh
new file mode 100644
index 000000000000..36bf15066274
--- /dev/null
+++ b/nixos/modules/system/boot/loader/raspberrypi/builder_uboot.sh
@@ -0,0 +1,29 @@
+#! @bash@/bin/sh -e
+
+copyForced() {
+    local src="$1"
+    local dst="$2"
+    cp $src $dst.tmp
+    mv $dst.tmp $dst
+}
+
+# Call the extlinux builder
+"@extlinuxConfBuilder@" "$@"
+
+# Add the firmware files
+fwdir=@firmware@/share/raspberrypi/boot/
+copyForced $fwdir/bootcode.bin  /boot/bootcode.bin
+copyForced $fwdir/fixup.dat     /boot/fixup.dat
+copyForced $fwdir/fixup_cd.dat  /boot/fixup_cd.dat
+copyForced $fwdir/fixup_db.dat  /boot/fixup_db.dat
+copyForced $fwdir/fixup_x.dat   /boot/fixup_x.dat
+copyForced $fwdir/start.elf     /boot/start.elf
+copyForced $fwdir/start_cd.elf  /boot/start_cd.elf
+copyForced $fwdir/start_db.elf  /boot/start_db.elf
+copyForced $fwdir/start_x.elf   /boot/start_x.elf
+
+# Add the uboot file
+copyForced @uboot@/u-boot.bin /boot/u-boot-rpi.bin
+
+# Add the config.txt
+copyForced @configTxt@ /boot/config.txt
diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index f246d04284ca..adf13ce6098c 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -5,42 +5,99 @@ with lib;
 let
   cfg = config.boot.loader.raspberryPi;
 
-  builder = pkgs.substituteAll {
+  builderGeneric = pkgs.substituteAll {
     src = ./builder.sh;
     isExecutable = true;
     inherit (pkgs) bash;
     path = [pkgs.coreutils pkgs.gnused pkgs.gnugrep];
     firmware = pkgs.raspberrypifw;
     version = cfg.version;
+    inherit configTxt;
   };
 
   platform = pkgs.stdenv.platform;
 
+  builderUboot = import ./builder_uboot.nix { inherit config; inherit pkgs; inherit configTxt; };
+
+  builder = 
+    if cfg.uboot.enable then
+      "${builderUboot} -g ${toString cfg.uboot.configurationLimit} -t ${timeoutStr} -c"
+    else
+      builderGeneric;
+
+  blCfg = config.boot.loader;
+  timeoutStr = if blCfg.timeout == null then "-1" else toString blCfg.timeout;
+
+  isAarch64 = pkgs.stdenv.isAarch64;
+  optional = pkgs.stdenv.lib.optionalString;
+
+  configTxt =
+    pkgs.writeText "config.txt" (''
+      # U-Boot used to need this to work, regardless of whether UART is actually used or not.
+      # TODO: check when/if this can be removed.
+      enable_uart=1
+
+      # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
+      # when attempting to show low-voltage or overtemperature warnings.
+      avoid_warnings=1
+    '' + optional isAarch64 ''
+      # Boot in 64-bit mode.
+      arm_control=0x200
+    '' + optional cfg.uboot.enable ''
+      kernel=u-boot-rpi.bin
+    '');
+
 in
 
 {
   options = {
 
-    boot.loader.raspberryPi.enable = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Whether to create files with the system generations in
-        <literal>/boot</literal>.
-        <literal>/boot/old</literal> will hold files from old generations.
-      '';
-    };
+    boot.loader.raspberryPi = {
+      enable = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to create files with the system generations in
+          <literal>/boot</literal>.
+          <literal>/boot/old</literal> will hold files from old generations.
+        '';
+      };
 
-    boot.loader.raspberryPi.version = mkOption {
-      default = 2;
-      type = types.enum [ 1 2 3 ];
-      description = ''
-      '';
-    };
+      version = mkOption {
+        default = 2;
+        type = types.enum [ 1 2 3 ];
+        description = ''
+        '';
+      };
 
+      uboot = {
+        enable = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            Enable using uboot as bootmanager for the raspberry pi.
+          '';
+        };
+
+        configurationLimit = mkOption {
+          default = 20;
+          example = 10;
+          type = types.int;
+          description = ''
+            Maximum number of configurations in the boot menu.
+          '';
+        };
+
+      };
+    };
   };
 
-  config = mkIf config.boot.loader.raspberryPi.enable {
+  config = mkIf cfg.enable {
+    assertions = singleton {
+      assertion = !pkgs.stdenv.isAarch64 || cfg.version == 3;
+      message = "Only Raspberry Pi 3 supports aarch64.";
+    };
+
     system.build.installBootLoader = builder;
     system.boot.loader.id = "raspberrypi";
     system.boot.loader.kernelFile = platform.kernelTarget;

From 6ed495cf13e55f1884204668b92facce5ee6896f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sun, 8 Apr 2018 23:42:36 +0200
Subject: [PATCH 0181/3370] raspberrypi-bootloader: Adds `firmwareConfig`
 config option

The `firmwareConfig` option will be appended to `/boot/config.txt`.
---
 .../system/boot/loader/raspberrypi/raspberrypi.nix    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
index adf13ce6098c..f974d07da9e5 100644
--- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
+++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix
@@ -45,7 +45,7 @@ let
       arm_control=0x200
     '' + optional cfg.uboot.enable ''
       kernel=u-boot-rpi.bin
-    '');
+    '' + optional (cfg.firmwareConfig != null) cfg.firmwareConfig);
 
 in
 
@@ -89,6 +89,15 @@ in
         };
 
       };
+
+      firmwareConfig = mkOption {
+        default = null;
+        type = types.nullOr types.string;
+        description = ''
+          Extra options that will be appended to <literal>/boot/config.txt</literal> file.
+          For possible values, see: https://www.raspberrypi.org/documentation/configuration/config-txt/
+        '';
+      };
     };
   };
 

From b96cc8fb8646923e1f9616f64495d58120f409f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Apr 2018 16:43:18 +0100
Subject: [PATCH 0182/3370] Revert "nix-pin: add `passthru.updateScript`"

This reverts commit 146dabd4aca9794f685528d2b247cb72f2fc54bd.

breaks evaluation
---
 pkgs/tools/package-management/nix-pin/default.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index 72cea4de5021..e2c18f33d61d 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -20,19 +20,6 @@ let self = stdenv.mkDerivation rec {
     let api = import "${self}/share/nix/api.nix" { inherit pkgs; }; in
     {
       inherit (api) augmentedPkgs pins callPackage;
-      updateScript = ''
-        set -e
-        echo
-        cd ${toString ./.}
-        ${pkgs.nix-update-source}/bin/nix-update-source \
-          --prompt version \
-          --replace-attr version \
-          --set owner timbertson \
-          --set repo nix-pin \
-          --set type fetchFromGitHub \
-          --set rev 'version-{version}' \
-          --modify-nix default.nix
-      '';
     };
   meta = with stdenv.lib; {
     homepage = "https://github.com/timbertson/nix-pin";

From 1d0267b2e75c2b74951199f9fe84b113d4358498 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 22 Apr 2018 08:43:19 -0700
Subject: [PATCH 0183/3370] octopus: 7.2 -> 7.3

---
 pkgs/applications/science/chemistry/octopus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix
index 2ff20fef40e8..bf8ccee4a635 100644
--- a/pkgs/applications/science/chemistry/octopus/default.nix
+++ b/pkgs/applications/science/chemistry/octopus/default.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "7.2";
+  version = "7.3";
   fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; };
 
 in stdenv.mkDerivation {
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz";
-    sha256 = "03zzmq72zdnjkhifbmlxs7ig7x6sf6mv8zv9mxhakm9hzwa9yn7m";
+    sha256 = "0hnpqjjxdxh2ggf6ckrsy4hs9iglnazscb4siczddvmysi4kv15d";
   };
 
   nativeBuildInputs = [ perl procps fftw.dev ];

From 94d92fd046feeb8d56c8ad88b2916005ef6305ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Apr 2018 16:43:27 +0100
Subject: [PATCH 0184/3370] Revert "nix-pin: 0.1.2 -> 0.2.2"

This reverts commit 92f083af238f844a0267531cc25275f80e97622e.

breaks evaluation
---
 .../package-management/nix-pin/default.nix      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index e2c18f33d61d..c12b82a61e17 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,12 +1,12 @@
 { pkgs, stdenv, fetchFromGitHub, mypy, python3 }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.2.2";
+  version = "0.1.2";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.2.2";
-    sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz";
+    rev = "version-0.1.2";
+    sha256 = "1zwfb5198qzbjwivgiaxbwva9frgrrqaj92nw8vz95yi08pijssh";
   };
   buildInputs = [ python3 mypy ];
   buildPhase = ''
@@ -16,11 +16,12 @@ let self = stdenv.mkDerivation rec {
     mkdir "$out"
     cp -r bin share "$out"
   '';
-  passthru =
-    let api = import "${self}/share/nix/api.nix" { inherit pkgs; }; in
-    {
-      inherit (api) augmentedPkgs pins callPackage;
-    };
+  passthru = {
+    callWithPins = path: args:
+      import "${self}/share/nix/call.nix" {
+        inherit pkgs path args;
+      };
+  };
   meta = with stdenv.lib; {
     homepage = "https://github.com/timbertson/nix-pin";
     description = "nixpkgs development utility";

From 17d17ce472c45d792ef5ebff3c92abfc5008a1e4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 22 Apr 2018 17:44:09 +0200
Subject: [PATCH 0185/3370] as31: use cve tag in patchname for vulnix
 auto-detection

---
 pkgs/development/compilers/as31/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
index 93b251707e80..519992fd8c26 100644
--- a/pkgs/development/compilers/as31/default.nix
+++ b/pkgs/development/compilers/as31/default.nix
@@ -15,9 +15,8 @@ in stdenv.mkDerivation {
   buildInputs = [ yacc ];
 
   patches = [
-    # CVE-2012-0808
     (fetchpatch {
-       name = "as31-mkstemps.patch";
+       name = "CVE-2012-0808.patch";
        url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=655496;filename=as31-mkstemps.patch;msg=5";
        sha256 = "0iia4wa8m141bwz4588yxb1dp2qwhapcii382sncm6jvwyngwh21";
      })

From ae4dac3e5c787044ef9639be61d6a22f087541c2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 22 Apr 2018 09:10:25 -0700
Subject: [PATCH 0186/3370] openmpi: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 9aca076c5dcb..2d3b9780090d 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -9,14 +9,14 @@
 
 let
   majorVersion = "3.0";
-  minorVersion = "0";
+  minorVersion = "1";
 
 in stdenv.mkDerivation rec {
   name = "openmpi-${majorVersion}.${minorVersion}";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
-    sha256 = "1mw2d94k6mp4scg1wnkj50vdh734fy5m2ygyrj65s4mh3prbz6gn";
+    sha256 = "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36";
   };
 
   postPatch = ''

From 0c9aaf0814a099b56dd9829fe47d702bddcdf50f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 11 Apr 2018 20:48:46 +0200
Subject: [PATCH 0187/3370] rankwidth: init at 0.7

---
 .../science/math/rankwidth/default.nix        | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/rankwidth/default.nix

diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
new file mode 100644
index 000000000000..f38fce5831ee
--- /dev/null
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, fetchurl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "rankwidth";
+  version = "0.7";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://mirrors.mit.edu/sage/spkg/upstream/rw/rw-${version}.tar.gz";
+    sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0";
+  };
+
+  configureFlags = [
+    "--enable-executable=no" # no igraph dependency
+  ];
+
+  # check phase is empty for now (as of version 0.7)
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Calculates rank-width and rank-decompositions";
+    license = with licenses; [ gpl2Plus ];
+    maintainers = with maintainers; [ timokau ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e22c7e93a79..c227e2367da7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19904,6 +19904,8 @@ with pkgs;
 
   planarity = callPackage ../development/libraries/science/math/planarity { };
 
+  rankwidth = callPackage ../development/libraries/science/math/rankwidth { };
+
   fenics = callPackage ../development/libraries/science/math/fenics {
     inherit (python3Packages) numpy ply pytest python six sympy;
     pythonPackages = python3Packages;

From 7c90a8677090bb144cc8db17aaf485def8d54a91 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 1 Apr 2018 18:22:14 +0300
Subject: [PATCH 0188/3370] wireguard service: use scripts instead of
 ExecStarts/Stops

This is more in line with what other services do; also looks cleaner.
It changes configuration entries for pre-and post-hooks type to lines from
lists of strings which are more logical for them; coersion is provided for
backwards compatibility.

Finally, add several steps to improve robustness:

1. Load kernel module on start if not loaded;
2. Don't remove wireguard interface on start; it is removed on service stop. If
   it's not something is wrong.
---
 .../modules/services/networking/wireguard.nix | 95 ++++++++++---------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 24accd41511c..0591917c7423 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -53,30 +53,30 @@ let
       };
 
       preSetup = mkOption {
-        example = literalExample [''
+        example = literalExample ''
           ${pkgs.iproute}/bin/ip netns add foo
-        ''];
-        default = [];
-        type = with types; listOf str;
+        '';
+        default = "";
+        type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
         description = ''
-          A list of commands called at the start of the interface setup.
+          Commands called at the start of the interface setup.
         '';
       };
 
       postSetup = mkOption {
-        example = literalExample [''
-          ${pkgs.bash} -c 'printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0'
-        ''];
-        default = [];
-        type = with types; listOf str;
-        description = "A list of commands called at the end of the interface setup.";
+        example = literalExample ''
+          printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0
+        '';
+        default = "";
+        type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
+        description = "Commands called at the end of the interface setup.";
       };
 
       postShutdown = mkOption {
-        example = literalExample ["${pkgs.openresolv}/bin/resolvconf -d wg0"];
-        default = [];
-        type = with types; listOf str;
-        description = "A list of commands called after shutting down the interface.";
+        example = literalExample "${pkgs.openresolv}/bin/resolvconf -d wg0";
+        default = "";
+        type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines;
+        description = "Commands called after shutting down the interface.";
       };
 
       table = mkOption {
@@ -182,9 +182,6 @@ let
 
   };
 
-  ipCommand = "${pkgs.iproute}/bin/ip";
-  wgCommand = "${pkgs.wireguard}/bin/wg";
-
   generateUnit = name: values:
     # exactly one way to specify the private key must be set
     assert (values.privateKey != null) != (values.privateKeyFile != null);
@@ -196,49 +193,53 @@ let
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         environment.DEVICE = name;
+        path = with pkgs; [ kmod iproute wireguard ];
 
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
-          ExecStart = flatten([
-            values.preSetup
+        };
 
-            "-${ipCommand} link del dev ${name}"
-            "${ipCommand} link add dev ${name} type wireguard"
+        script = ''
+          modprobe wireguard
 
-            (map (ip:
-            "${ipCommand} address add ${ip} dev ${name}"
-            ) values.ips)
+          ${values.preSetup}
 
-            ("${wgCommand} set ${name} private-key ${privKey}" +
-            optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}")
+          ip link add dev ${name} type wireguard
 
-            (map (peer:
+          ${concatMapStringsSep "\n" (ip:
+            "ip address add ${ip} dev ${name}"
+          ) values.ips}
+
+          wg set ${name} private-key ${privKey} ${
+            optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}"}
+
+          ${concatMapStringsSep "\n" (peer:
             assert (peer.presharedKeyFile == null) || (peer.presharedKey == null); # at most one of the two must be set
             let psk = if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile;
             in
-            "${wgCommand} set ${name} peer ${peer.publicKey}" +
-            optionalString (psk != null) " preshared-key ${psk}" +
-            optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" +
-            optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" +
-            optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}"
-            ) values.peers)
+              "wg set ${name} peer ${peer.publicKey}" +
+              optionalString (psk != null) " preshared-key ${psk}" +
+              optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" +
+              optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" +
+              optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}"
+            ) values.peers}
 
-            "${ipCommand} link set up dev ${name}"
+          ip link set up dev ${name}
 
-            (optionals (values.allowedIPsAsRoutes != false) (map (peer:
-            (map (allowedIP:
-            "${ipCommand} route replace ${allowedIP} dev ${name} table ${values.table}"
-            ) peer.allowedIPs)
-            ) values.peers))
+          ${optionalString (values.allowedIPsAsRoutes != false) (concatStringsSep "\n" (concatMap (peer:
+              (map (allowedIP:
+                "ip route replace ${allowedIP} dev ${name} table ${values.table}"
+              ) peer.allowedIPs)
+            ) values.peers))}
 
-            values.postSetup
-          ]);
-          ExecStop = flatten([
-            "${ipCommand} link del dev ${name}"
-            values.postShutdown
-          ]);
-        };
+          ${values.postSetup}
+        '';
+
+        preStop = ''
+          ip link del dev ${name}
+          ${values.postShutdown}
+        '';
       };
 
 in

From 28c023e2466b2fa65358a97a991f55e52d30818c Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 11 Apr 2018 21:06:03 +0200
Subject: [PATCH 0189/3370] zn_poly: init at 0.9

---
 .../science/math/zn_poly/default.nix          | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/zn_poly/default.nix

diff --git a/pkgs/development/libraries/science/math/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix
new file mode 100644
index 000000000000..bc322d4c5341
--- /dev/null
+++ b/pkgs/development/libraries/science/math/zn_poly/default.nix
@@ -0,0 +1,50 @@
+{ stdenv
+, fetchurl
+, gmp
+, python2
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.9";
+  pname = "zn_poly";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/releases/zn_poly-${version}.tar.gz";
+    sha256 = "1kxl25av7i3v68k32hw5bayrfcvmahmqvs97mlh9g238gj4qb851";
+  };
+
+  buildInputs = [
+    gmp
+  ];
+
+  nativeBuildInputs = [
+    python2 # needed by ./configure to create the makefile
+  ];
+
+  libname = "libzn_poly${stdenv.targetPlatform.extensions.sharedLibrary}";
+
+  # Tuning (either autotuning or with hand-written paramters) is possible
+  # but not implemented here.
+  # It seems buggy anyways (see homepage).
+  buildFlags = [ "all" libname ];
+
+
+  # `make install` fails to install some header files and the lib file.
+  installPhase = ''
+    mkdir -p "$out/include/zn_poly"
+    mkdir -p "$out/lib"
+    cp "${libname}" "$out/lib"
+    cp include/*.h "$out/include/zn_poly"
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/;
+    description = "Polynomial arithmetic over Z/nZ";
+    license = with licenses; [ gpl3 ];
+    maintainers = with maintainers; [ timokau ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 199f6e878ff5..9c10e7a4fdd2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19832,6 +19832,8 @@ with pkgs;
 
   gmsh = callPackage ../applications/science/math/gmsh { };
 
+  zn_poly = callPackage ../development/libraries/science/math/zn_poly { };
+
   ### SCIENCE/MOLECULAR-DYNAMICS
 
   lammps = callPackage ../applications/science/molecular-dynamics/lammps {

From 7de43f38e07d29a5b0c3c91f96724c330929029a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 22 Apr 2018 16:38:27 +0000
Subject: [PATCH 0190/3370] memtest86plus: disable all hardening

With hardening enabled it reports errors on known-good memory modules
on my Thinkpad X230 (Ivy Bridge). It's the same bug as reported in
https://bugs.launchpad.net/ubuntu/+source/memtest86+/+bug/1071209 but
memtest86+ fails on test #9 instead of test #7 (because #7 in 4.20
became #9 in 5.01) and with all the addresses multiplied by 2 (I guess
the bug was reported for i686, and I test on x86_64, it was 2012 after
all).
---
 pkgs/tools/misc/memtest86+/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix
index d949108524f6..8ee4d6eeb9ef 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = "-I. -std=gnu90";
 
-  hardeningDisable = [ "fortify" "stackprotector" "pic" ];
+  hardeningDisable = [ "all" ];
 
   buildFlags = "memtest.bin";
 

From c3148948ff0c5cdbf75b8e2c894f15850e8aff3d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 22 Apr 2018 17:04:51 +0000
Subject: [PATCH 0191/3370] memtest86plus: 5.01 -> 5.01+coreboot-20180113

aka 5.01+coreboot-001+

The version maintained by coreboot project is superior to Debian, it
integrates all the Debian patches and fixes a bunch more bugs.

In particular, it fixes SMP freezes and apparent memory errors when
running under coreboot ROM.
---
 pkgs/tools/misc/memtest86+/default.nix | 34 +++++---------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix
index 8ee4d6eeb9ef..6103ba021260 100644
--- a/pkgs/tools/misc/memtest86+/default.nix
+++ b/pkgs/tools/misc/memtest86+/default.nix
@@ -1,36 +1,14 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  name = "memtest86+-5.01";
+  name = "memtest86+-5.01+coreboot-20180113";
 
-  src = fetchurl {
-    url = "http://www.memtest.org/download/5.01/${name}.tar.gz";
-    sha256 = "0fch1l55753y6jkk0hj8f6vw4h1kinkn9ysp22dq5g9zjnvjf88l";
+  src = fetchgit {
+    url = "https://review.coreboot.org/memtest86plus";
+    rev = "5ca4eb9544e51254254d09ae6e70f93403469ec3";
+    sha256 = "08m4rjr0chhhb1whgggknz926zv9hm8bisnxqp8lffqiwhb55rgk";
   };
 
-  patches = [
-    (fetchurl {
-      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/doc-serialconsole";
-      sha256 = "1qh2byj9bmpchym8iq20n4hqmy10nrl6bi0d9pgdqikkmw9m38jq";
-    })
-    (fetchurl {
-      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/multiboot";
-      sha256 = "0nq61307ah5b41ff5nqs99wjzjzlajvfv6k9c9d0gqvhx8r4dvmy";
-    })
-    (fetchurl {
-      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-O0.patch";
-      sha256 = "1xmj3anq1fr0cxwv8lqfp5cr5f58v7glwc6z0v8hx8aib8yj1wl2";
-    })
-    (fetchurl {
-      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/memtest86+-5.01-array-size.patch";
-      sha256 = "0yxlzpfs6313s91y984p7rlf5rgybcjhg7i9zqy4wqhm3j90f1kb";
-    })
-    (fetchurl {
-      url = "https://sources.debian.net/data/main/m/memtest86+/5.01-3/debian/patches/gcc-5";
-      sha256 = "13xfy6sn8qbj1hx4vms2cz24dsa3bl8n2iblz185hkn11y7141sc";
-    })
-  ];
-
   preBuild = ''
     # Really dirty hack to get Memtest to build without needing a Glibc
     # with 32-bit libraries and headers.

From 236703f9f3ac1d0904d63940d00f885dfeeb854b Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 22 Apr 2018 20:10:15 +0200
Subject: [PATCH 0192/3370] nixos/systemd-networkd: wait for udev to settle

... to avoid race condition between udevd renaming and
networkd configuring interfaces (39069)
---
 nixos/modules/system/boot/networkd.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index eea10613ea58..74d17cf9787e 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -712,6 +712,9 @@ in
     systemd.services.systemd-networkd = {
       wantedBy = [ "multi-user.target" ];
       restartTriggers = map (f: f.source) (unitFiles);
+      # prevent race condition with interface renaming (#39069)
+      requires = [ "systemd-udev-settle.service" ];
+      after = [ "systemd-udev-settle.service" ];
     };
 
     systemd.services.systemd-networkd-wait-online = {

From 6a819c8f8c9100eb1a79515f10ad2d0d49b42ed5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 22 Apr 2018 22:12:17 +0300
Subject: [PATCH 0193/3370] nixos/iso-image.nix: Fix typo

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index e7cbf415a223..83f8a2586bd3 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -59,7 +59,7 @@ let
     INITRD /boot/${config.system.boot.loader.initrdFile}
 
     # A variant to boot with verbose logging to the console
-    LABEL boot-nomodeset
+    LABEL boot-debug
     MENU LABEL NixOS ${config.system.nixos.label}${config.isoImage.appendToMenuLabel} (debug)
     LINUX /boot/${config.system.boot.loader.kernelFile}
     APPEND init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams} loglevel=7

From 0f92afdd6d4ead5abc929e6954350e684edbc843 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 22 Apr 2018 22:43:39 +0300
Subject: [PATCH 0194/3370] diskrsync: fix argv0

When using diskrsync over SSH, on the remote machine it calls an executable
equal to argv0. Typically, this is just diskrsync but now that diskrsync is
wrapped, the wrapper uses absolute path to diskrsync and that path doesn't most
likely work on the remote machine. Thus, we need to force argv0 to "diskrsync"
so that it works on the remote machine.
---
 pkgs/tools/backup/diskrsync/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index 2e86ad0deda8..3a5ffc30f8f2 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -19,7 +19,7 @@ buildGoPackage rec {
   buildInputs = [ makeWrapper ];
 
   preFixup = ''
-    wrapProgram "$bin/bin/diskrsync" --prefix PATH : ${openssh}/bin
+    wrapProgram "$bin/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin
   '';
 
   meta = with stdenv.lib; {

From 14cab1ac57b44decdbf12a854f9cddd02af54004 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 22 Apr 2018 16:02:57 -0400
Subject: [PATCH 0195/3370] nixos-enter: Ensures presence of full /sys tree.

This partially reverts a change from e88f28965a7d76e83478d3ae6fcddc165b1c94f1
which removed the `mount --rbind /sys`.

While true that the activation scripts will mount `sysfs` at `/sys`,
none of the mountpoints lower in the `/sys` tree are handled by the
activation script, which includes `efivarfs`.

This fixes #38477 since it ensures the presence of `efivarfs` in the
`/sys` tree, which is why the systemd-boot installation failed.
---
 nixos/modules/installer/tools/nixos-enter.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh
index 679391189612..518dbbbf21e3 100644
--- a/nixos/modules/installer/tools/nixos-enter.sh
+++ b/nixos/modules/installer/tools/nixos-enter.sh
@@ -51,8 +51,9 @@ if [[ ! -e $mountPoint/etc/NIXOS ]]; then
     exit 126
 fi
 
-mkdir -m 0755 -p "$mountPoint/dev"
+mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/sys"
 mount --rbind /dev "$mountPoint/dev"
+mount --rbind /sys "$mountPoint/sys"
 
 # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
 LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 || true

From ef47a5846ca56df999235c8ba7da04eda6d8f7af Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Sun, 22 Apr 2018 22:43:21 +0200
Subject: [PATCH 0196/3370] pythonPackages.html5-parser: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index faddfe2bfddb..ae036d33f9ed 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "html5-parser";
-  version = "0.4.4";
+  version = "0.4.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5";
+    sha256 = "01mx33sx4dhl4kj6wc48nj6jz7ry60rkhjv0s6k8h5xmjf5yy0x9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b577f3292ebc98de91297fb24ed6ef3c2a95cb93 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 22 Apr 2018 15:46:12 -0500
Subject: [PATCH 0197/3370] mono: allow custom meta in generic

---
 pkgs/development/compilers/mono/generic.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix
index 3b476bce0273..a62f2f24dd87 100644
--- a/pkgs/development/compilers/mono/generic.nix
+++ b/pkgs/development/compilers/mono/generic.nix
@@ -5,13 +5,15 @@
 , version, sha256
 , withLLVM ? false
 , enableParallelBuilding ? true
+, meta ? {}
 }:
 
 let
   llvm     = callPackage ./llvm.nix { };
-in
-stdenv.mkDerivation rec {
   name = "mono-${version}";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     inherit sha256;
@@ -91,5 +93,5 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.x86;
     maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz vrthra ];
     license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
-  };
+  } // meta;
 }

From 6e0a68b1e6bd8decfb78ea5cc0b21d9c65fc3058 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 22 Apr 2018 15:46:51 -0500
Subject: [PATCH 0198/3370] mono: add knownVulnerabilities for 4.0.4

http://www.mono-project.com/docs/about-mono/vulnerabilities/#string-to-double-parser-bug
---
 pkgs/development/compilers/mono/4.0.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/mono/4.0.nix b/pkgs/development/compilers/mono/4.0.nix
index 8621751e5a14..f13883db74ff 100644
--- a/pkgs/development/compilers/mono/4.0.nix
+++ b/pkgs/development/compilers/mono/4.0.nix
@@ -3,4 +3,7 @@ callPackage ./generic.nix (rec {
   inherit Foundation libobjc;
   version = "4.0.4.1";
   sha256 = "1ydw9l89apc9p7xr5mdzy0h97g2q6v243g82mxswfc2rrqhfs4gd";
+  meta = {
+    knownVulnerabilities = [ "CVE-2009-0689" ];
+  };
 })

From 6a4cc3562cf6e41272e542f3aeb7ae46cec45ecc Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sun, 22 Apr 2018 15:57:51 -0500
Subject: [PATCH 0199/3370] Revert "initial TBS driver"

---
 pkgs/os-specific/linux/tbs/default.nix | 50 --------------------------
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 52 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/tbs/default.nix

diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
deleted file mode 100644
index e4b954d4dbf5..000000000000
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }:
-let
-  media = fetchFromGitHub {
-    owner = "tbsdtv";
-    repo = "linux_media";
-    rev = "14ebbec91f2cd0423aaf859fc6e6d5d986397cd4";
-    sha256 = "1cmqj3kby8sxfcpvslbxywr95529vjxzbn800fdp35lka1fv962h";
-  };
-  build = fetchFromGitHub {
-    owner = "tbsdtv";
-    repo = "media_build";
-    rev = "c340e29a4047e43f7ea7ebf19e1e28c1f2112d05";
-    sha256 = "0hfn1j9qk8lh30z3ywj22qky480nsf8z2iag2bqhrhy4375vjlbl";
-  };
-in stdenv.mkDerivation {
-  name = "tbs-2017-11-05-${kernel.version}";
-
-  srcs = [ media build ];
-  sourceRoot = "${build.name}";
-
-  preConfigure = ''
-    make dir DIR=../${media.name}
-  '';
-
-  postPatch = ''
-    patchShebangs .
-
-    sed -i v4l/Makefile \
-      -i v4l/scripts/make_makefile.pl \
-      -e 's,/sbin/depmod,${kmod}/bin/depmod,g' \
-      -e 's,/sbin/lsmod,${kmod}/bin/lsmod,g'
-
-    sed -i v4l/Makefile \
-      -e 's,^OUTDIR ?= /lib/modules,OUTDIR ?= ${kernel.dev}/lib/modules,' \
-      -e 's,^SRCDIR ?= /lib/modules,SRCDIR ?= ${kernel.dev}/lib/modules,'
-  '';
-
-  buildFlags = [ "VER=${kernel.modDirVersion}" ];
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  hardeningDisable = [ "pic" "format" ];
-  nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ];
-
-  meta = with stdenv.lib; {
-    homepage = https://www.tbsdtv.com/;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ ck3d ];
-    priority = 20;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e22c7e93a79..5bd83347ab09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13501,8 +13501,6 @@ with pkgs;
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
 
-    tbs = callPackage ../os-specific/linux/tbs { };
-
     nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
 
     nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };

From 69f23d9e730afd135a0342394869470453979dc9 Mon Sep 17 00:00:00 2001
From: Corbin Simpson <MostAwesomeDude@gmail.com>
Date: Sun, 22 Apr 2018 14:42:20 -0700
Subject: [PATCH 0200/3370] enhanced-ctorrent: fix CVE-2009-1759 (#39311)

Patches from Debian.
---
 .../networking/enhanced-ctorrent/default.nix      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/enhanced-ctorrent/default.nix b/pkgs/applications/networking/enhanced-ctorrent/default.nix
index fedbfeb957ce..2cfde73a01a6 100644
--- a/pkgs/applications/networking/enhanced-ctorrent/default.nix
+++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix
@@ -1,13 +1,26 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   version = "dnh3.3.2";
   name = "enhanced-ctorrent";
+
   src = fetchurl {
     url = "http://www.rahul.net/dholmes/ctorrent/ctorrent-dnh3.3.2.tar.gz";
     sha256 = "0qs8waqwllk56i3yy3zhncy7nsnhmf09a494p5siz4vm2k4ncwy8";
   };
 
+  # These patches come from Debian and fix CVE-2009-1759.
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/c/ctorrent/1.3.4.dnh3.3.2-5/debian/patches/cve-security-fix.diff";
+      sha256 = "1qkzzm8sfspbcs10azmmif4qcr7pr8r38dsa2py84lsjm1yi3kls";
+    })
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/c/ctorrent/1.3.4.dnh3.3.2-5/debian/patches/FTBFS-fix.diff";
+      sha256 = "1m3zh96xwqjjzsbg62f7kx0miams58nys1f484qhdn870b5x9p06";
+    })
+  ];
+
   meta = {
     description = "BitTorrent client written in C++";
     longDescription = ''

From 1dbdffa0994d00d2b10485b40eb355cc28e96cc1 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 22 Apr 2018 23:13:05 +0200
Subject: [PATCH 0201/3370] arb: 2.8.1 -> 2.13.0

---
 pkgs/development/libraries/arb/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix
index c4b37ddb78fd..a59641e99d39 100644
--- a/pkgs/development/libraries/arb/default.nix
+++ b/pkgs/development/libraries/arb/default.nix
@@ -2,15 +2,21 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "arb";
-  version = "2.8.1";
+  version = "2.13.0";
   src = fetchFromGitHub {
     owner = "fredrik-johansson";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "15phk71ci9rr32aqznpkd2b993wjahsgliilkg4mnxsr86nwdf6x";
+    sha256 = "1fl9gmxf6c1cphk5r8jbys5pywj2rfm705kv0055i0aqc6hrv303";
   };
   buildInputs = [mpir gmp mpfr flint];
-  configureFlags = "--with-gmp=${gmp} --with-mpir=${mpir} --with-mpfr=${mpfr} --with-flint=${flint}";
+  configureFlags = [
+    "--with-gmp=${gmp}"
+    "--with-mpir=${mpir}"
+    "--with-mpfr=${mpfr}"
+    "--with-flint=${flint}"
+  ];
+  doCheck = true;
   meta = {
     inherit version;
     description = ''A library for arbitrary-precision interval arithmetic'';

From a05581674300579d5da75346e6576d8d65e6bf2c Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 22 Apr 2018 23:37:04 +0200
Subject: [PATCH 0202/3370] eclib: 20160720 -> 20171002

---
 pkgs/development/libraries/eclib/default.nix | 39 ++++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index 3651b9e7660e..dbe487368dc5 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -1,21 +1,44 @@
-{stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, autoreconfHook
-, pari, ntl, gmp}:
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, libtool
+, gettext
+, pari
+, ntl
+, gmp
+# "FLINT is optional and only used for one part of sparse matrix reduction,
+# which is used in the modular symbol code but not mwrank or other elliptic
+# curve programs." -- https://github.com/JohnCremona/eclib/blob/master/README
+, withFlint ? false, flint ? null
+}:
+
+assert withFlint -> flint != null;
+
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "eclib";
-  version = "20160720";
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+  version = "20171002";
   src = fetchFromGitHub {
     owner = "JohnCremona";
     repo = "${pname}";
-    rev = "${version}";
-    sha256 = "0qrcd5c8cqhw9f14my6k6013w8li5vdigrjvchkr19n2l8g75j0h";
+    rev = "v${version}";
+    sha256 = "092an90405q9da0k0z5jfp5rng9jl0mqbvsbv4fx6jc9ykfcahsj";
   };
-  buildInputs = [pari ntl gmp];
-  nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
+  buildInputs = [
+    pari
+    ntl
+    gmp
+  ] ++ stdenv.lib.optionals withFlint [
+    flint
+  ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+  doCheck = true;
   meta = {
     inherit version;
     description = ''Elliptic curve tools'';
+    homepage = https://github.com/JohnCremona/eclib;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;

From 9e9cc471b663ae318fbddd98232137640500c195 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 22 Apr 2018 18:24:44 -0400
Subject: [PATCH 0203/3370] dejavu-fonts: fix missing Perl IOString dependency
 (#39341)

Per the docs, IOString was recently added as a dependency:
https://github.com/dejavu-fonts/dejavu-fonts/blob/master/BUILDING.md

As-is, attempting to rebulid from source errors out with this missing perl module.
---
 pkgs/data/fonts/dejavu-fonts/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix          | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 23158a38f218..251654e2d58d 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/pkgs/data/fonts/dejavu-fonts/default.nix
@@ -1,4 +1,4 @@
-{fetchFromGitHub, stdenv, fontforge, perl, FontTTF}:
+{ fetchFromGitHub, stdenv, fontforge, perl, perlPackages }:
 
 let
   version = "2.37";
@@ -25,7 +25,7 @@ let
 
   full-ttf = stdenv.mkDerivation {
     name = "dejavu-fonts-full-${version}";
-    nativeBuildInputs = [fontforge perl FontTTF];
+    nativeBuildInputs = [fontforge perl perlPackages.IOString perlPackages.FontTTF];
 
     src = fetchFromGitHub {
       owner = "dejavu-fonts";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bd83347ab09..d07ac59c80f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14241,9 +14241,7 @@ with pkgs;
 
   crimson = callPackage ../data/fonts/crimson {};
 
-  dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {
-    inherit (perlPackages) FontTTF;
-  });
+  dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts {});
 
   # solve collision for nix-env before https://github.com/NixOS/nix/pull/815
   dejavu_fontsEnv = buildEnv {

From bc7c7b2b09ed93910a24645e284250351c9d023d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Apr 2018 23:44:29 +0100
Subject: [PATCH 0204/3370] zfs: mark as broken for 4.16

---
 pkgs/os-specific/linux/zfs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index a467b457f236..bdc43a092f7f 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -153,7 +153,7 @@ in {
   # to be adapted
   zfsStable = common {
     # comment/uncomment if breaking kernel versions are known
-    incompatibleKernelVersion = null;
+    incompatibleKernelVersion = "4.16";
 
     # this package should point to the latest release.
     version = "0.7.8";

From 63507ada7d8d53434c5d01ab1a94bed8d1d66ee6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 22 Apr 2018 18:43:40 -0500
Subject: [PATCH 0205/3370] calc: cleanup expression

Fixes #39321

(Still needs testing on Linux)
---
 .../science/math/calc/default.nix             | 56 ++++++++++---------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
index efd38f053451..9d95960bde27 100644
--- a/pkgs/applications/science/math/calc/default.nix
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -1,47 +1,49 @@
-{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, utillinux }:
+{ stdenv, lib, fetchurl, utillinux, makeWrapper
+, enableReadline ? true, readline, ncurses }:
 
-with stdenv.lib;
-let
-  makeFlags = ''
-    INCDIR=${glibc.dev}/include \
-    BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \
-    USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \
-    TERMCONTROL=-DUSE_TERMIOS \
-  '';
-in
 stdenv.mkDerivation rec {
-
   name = "calc-${version}";
   version = "2.12.6.6";
 
   src = fetchurl {
-    url = "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2";
+    urls = [
+      "https://github.com/lcn2/calc/releases/download/${version}/${name}.tar.bz2"
+      "http://www.isthe.com/chongo/src/calc/${name}.tar.bz2"
+    ];
     sha256 = "03sg1xhin6qsrz82scf96mmzw8lz1yj68rhj4p4npp4s0fawc9d5";
   };
 
-  buildInputs = [ makeWrapper readline ncurses utillinux ];
-
-  configurePhase = ''
-    sed -i 's/all: check_include/all:/' Makefile
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace 'all: check_include' 'all:' \
+      --replace '-install_name ''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcalc''${LIB_EXT_VERSION}' \
+      --replace '-install_name ''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}' '-install_name ''${T}''${LIBDIR}/libcustcalc''${LIB_EXT_VERSION}'
   '';
 
-  buildPhase = ''
-    make ${makeFlags}
-  '';
+  buildInputs = [ utillinux makeWrapper ]
+             ++ lib.optionals enableReadline [ readline ncurses ];
 
-  installPhase = ''
-    make install ${makeFlags}
-    wrapProgram $out/bin/calc --prefix LD_LIBRARY_PATH : $out/lib
-  '';
+  makeFlags = [
+    "T=$(out)"
+    "INCDIR=${lib.getDev stdenv.cc.libc}/include"
+    "BINDIR=/bin"
+    "LIBDIR=/lib"
+    "CALC_SHAREDIR=/share/calc"
+    "CALC_INCDIR=/include"
+    "MANDIR=/share/man/man1"
 
-  # Hack to avoid TMPDIR in RPATHs.
-  preFixup = ''rm -rf "$(pwd)" '';
+    # Handle LDFLAGS defaults in calc
+    "DEFAULT_LIB_INSTALL_PATH=$(out)/lib"
+  ] ++ lib.optionals enableReadline [
+    "READLINE_LIB=-lreadline"
+    "USE_READLINE=-DUSE_READLINE"
+  ];
 
-  meta = {
+  meta = with lib; {
     description = "C-style arbitrary precision calculator";
     homepage = http://www.isthe.com/chongo/tech/comp/calc/;
     license = licenses.lgpl21;
-    maintainers = [ ];
+    maintainers = with maintainers; [ matthewbauer ];
     platforms = platforms.all;
   };
 }

From afd3dbcce8ef99ea806675569a9dc86bf9b1e7e4 Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Sun, 22 Apr 2018 21:29:19 -0400
Subject: [PATCH 0206/3370] vmTools: update Debian 9 names and hashes

---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 8e8b88a9bd2d..08d0a358e61f 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -997,22 +997,22 @@ rec {
     };
 
     debian9i386 = {
-      name = "debian-9.3-stretch-i386";
-      fullName = "Debian 9.3 Stretch (i386)";
+      name = "debian-9.4-stretch-i386";
+      fullName = "Debian 9.4 Stretch (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/stretch/main/binary-i386/Packages.xz;
-        sha256 = "1rpv0r92pkr9dmjvpffvgmq3an1s83npfmq870h67jqag3qpwj9l";
+        sha256 = "05z5ccg4ysbrgallhai53sh83i0364w7a3fdq84dpv1li059jf10";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian9x86_64 = {
-      name = "debian-9.3-stretch-amd64";
-      fullName = "Debian 9.3 Stretch (amd64)";
+      name = "debian-9.4-stretch-amd64";
+      fullName = "Debian 9.4 Stretch (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/stretch/main/binary-amd64/Packages.xz;
-        sha256 = "1gnkvh7wc5yp0rw8kq8p8rlskvl0lc4cv3gdylw8qpqzy75xqlig";
+        sha256 = "19j0c54b1b9lbk9fv2c2aswdh0s2c3klf97zrlmsz4hs8wm9jylq";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 23ccc6904a5cd6f958a35e0e547bd65ed086f2bb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 23 Apr 2018 11:00:33 +0800
Subject: [PATCH 0207/3370] bftpd: minor cleanups

---
 pkgs/servers/ftp/bftpd/default.nix | 34 ++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix
index 38fb7d250e34..c35177e6aa90 100644
--- a/pkgs/servers/ftp/bftpd/default.nix
+++ b/pkgs/servers/ftp/bftpd/default.nix
@@ -1,24 +1,36 @@
-{stdenv, fetchurl}:
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+{ stdenv, fetchurl }:
+
+let
   pname = "bftpd";
+
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
   version = "4.9";
-  # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev)
+
   src = fetchurl {
     url = "mirror://sourceforge/project/${pname}/${pname}/${name}/${name}.tar.gz";
     sha256 = "13pjil9cjggpi773m0516lszyqvwzlgcrmmj8yn9nc24rbxwvn6d";
   };
-  buildInputs = [];
+
   preConfigure = ''
     sed -re 's/-[og] 0//g' -i Makefile*
   '';
-  meta = {
+
+  postInstall = ''
+    mkdir -p $out/share/doc/${pname}
+    mv $out/etc/*.conf $out/share/doc/${pname}
+    rm -rf $out/{etc,var}
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
     inherit version;
-    description = ''A minimal ftp server'';
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-    homepage = http://bftpd.sf.net/;
+    description = "A minimal ftp server";
     downloadPage = "http://bftpd.sf.net/download.html";
+    homepage = http://bftpd.sf.net/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
   };
 }

From 1faea2934b9a46d0fbf1a605a01c356f9d0da94a Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sun, 22 Apr 2018 10:28:11 +1000
Subject: [PATCH 0208/3370] nix-pin: 0.1.2 -> 0.2.2 and add updateScript

---
 .../package-management/nix-pin/default.nix    | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index c12b82a61e17..bb3a1faa0c3b 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,12 +1,12 @@
 { pkgs, stdenv, fetchFromGitHub, mypy, python3 }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.1.2";
+  version = "0.2.2";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.1.2";
-    sha256 = "1zwfb5198qzbjwivgiaxbwva9frgrrqaj92nw8vz95yi08pijssh";
+    rev = "version-0.2.2";
+    sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz";
   };
   buildInputs = [ python3 mypy ];
   buildPhase = ''
@@ -16,12 +16,27 @@ let self = stdenv.mkDerivation rec {
     mkdir "$out"
     cp -r bin share "$out"
   '';
-  passthru = {
-    callWithPins = path: args:
-      import "${self}/share/nix/call.nix" {
-        inherit pkgs path args;
-      };
-  };
+  passthru =
+    let
+      defaults = import "${self}/share/nix/defaults.nix";
+    in {
+      api = { pinConfig ? defaults.pinConfig }:
+        let impl = import "${self}/share/nix/api.nix" { inherit pkgs pinConfig; }; in
+        { inherit (impl) augmentedPkgs pins callPackage; };
+      updateScript = ''
+        set -e
+        echo
+        cd ${toString ./.}
+        ${pkgs.nix-update-source}/bin/nix-update-source \
+          --prompt version \
+          --replace-attr version \
+          --set owner timbertson \
+          --set repo nix-pin \
+          --set type fetchFromGitHub \
+          --set rev 'version-{version}' \
+          --modify-nix default.nix
+      '';
+    };
   meta = with stdenv.lib; {
     homepage = "https://github.com/timbertson/nix-pin";
     description = "nixpkgs development utility";

From 5f82c322d64eaa2c10ff6bbcd3a00b6025632bbb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Mon, 23 Apr 2018 09:16:03 +0200
Subject: [PATCH 0209/3370] eff: 20140928 -> 5.0 (#39264)

---
 pkgs/development/interpreters/eff/default.nix | 23 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/ocaml-packages.nix             |  2 --
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix
index 28ea05066c23..258aebe81727 100644
--- a/pkgs/development/interpreters/eff/default.nix
+++ b/pkgs/development/interpreters/eff/default.nix
@@ -1,20 +1,21 @@
-{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, menhir, which }:
+{ stdenv, fetchFromGitHub, which, ocamlPackages }:
 
-let inherit (stdenv.lib) getVersion versionAtLeast; in
-
-assert versionAtLeast (getVersion ocaml) "3.12";
+let version = "5.0"; in
 
 stdenv.mkDerivation {
 
-  name = "eff-20140928";
+  name = "eff-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/matijapretnar/eff.git";
-    rev = "90f884a790fddddb51d4d1d3b7c2edf1e8aabb64";
-    sha256 = "0cqqrpvfw0nrk5d28mkzfvc8yzqxcss0k46bkmqhqjkqq886n2mm";
+  src = fetchFromGitHub {
+    owner = "matijapretnar";
+    repo = "eff";
+    rev = "v${version}";
+    sha256 = "1fslfj5d7fhj3f7kh558b8mk5wllwyq4rnhfkyd96fpy144sdcka";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild menhir which ];
+  buildInputs = [ which ] ++ (with ocamlPackages; [
+    ocaml findlib ocamlbuild menhir js_of_ocaml js_of_ocaml-ocamlbuild
+  ]);
 
   doCheck = true;
   checkTarget = "test";
@@ -29,7 +30,7 @@ stdenv.mkDerivation {
       backtracking, multi-threading, and much more...
     '';
     license = licenses.bsd2;
-    platforms = ocaml.meta.platforms or [];
+    inherit (ocamlPackages.ocaml.meta) platforms;
     maintainers = [ maintainers.jirkamarsik ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d07ac59c80f1..35e320dc31fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2089,6 +2089,8 @@ with pkgs;
 
   edk2 = callPackage ../development/compilers/edk2 { };
 
+  eff = callPackage ../development/interpreters/eff { };
+
   eflite = callPackage ../applications/audio/eflite {};
 
   eid-mw = callPackage ../tools/security/eid-mw { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 72bcc45c48e6..f095ccb34ab5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -217,8 +217,6 @@ let
 
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
-    eff = callPackage ../development/interpreters/eff { };
-
     eliom = callPackage ../development/ocaml-modules/eliom {
       lwt = lwt2;
       js_of_ocaml = js_of_ocaml_2;

From a586011b58963c42a7854fae61b12ef4ae7e4de4 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Mon, 23 Apr 2018 09:33:09 +0200
Subject: [PATCH 0210/3370] firefox-wrapper: fix icon linking (#39315)

don't try to link non-existing icons
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 8f07415db5f2..45917bf65c1e 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -132,8 +132,10 @@ let
         else
             for res in 16 32 48 64 128; do
             mkdir -p "$out/share/icons/hicolor/''${res}x''${res}/apps"
-            ln -s "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" \
+            icon=( "${browser}/lib/"*"/browser/chrome/icons/default/default''${res}.png" )
+              if [ -e "$icon" ]; then ln -s "$icon" \
                 "$out/share/icons/hicolor/''${res}x''${res}/apps/${browserName}.png"
+              fi
             done
         fi
 

From e7ee85199310071d899d73709534f1055d1a17f6 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 23 Apr 2018 09:19:35 +0200
Subject: [PATCH 0211/3370] gmime3: 3.0.5 -> 3.2.0

---
 pkgs/development/libraries/gmime/3.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix
index 66d0cf88bd02..124fc08cf3bd 100644
--- a/pkgs/development/libraries/gmime/3.nix
+++ b/pkgs/development/libraries/gmime/3.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, zlib, gpgme, libidn, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.5";
+  version = "3.2.0";
   name = "gmime-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gmime/3.0/${name}.tar.xz";
-    sha256 = "1q45gd1ahnz9q1milc2lqqwl7j3q0wd6kiswhp25iak222n56lrg";
+    url = "mirror://gnome/sources/gmime/3.2/${name}.tar.xz";
+    sha256 = "1q6palbpf6lh6bvy9ly26q5apl5k0z0r4mvl6zzqh90rz4rn1v3m";
   };
 
   outputs = [ "out" "dev" ];

From f396f0937e69f843187e5c899e8e6a21123ec2ec Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 25 Dec 2017 15:20:42 +0100
Subject: [PATCH 0212/3370] pythonPackages.milksnake: init at 0.1.5

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

diff --git a/pkgs/development/python-modules/milksnake/default.nix b/pkgs/development/python-modules/milksnake/default.nix
new file mode 100644
index 000000000000..014bb223225d
--- /dev/null
+++ b/pkgs/development/python-modules/milksnake/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, cffi }:
+
+buildPythonPackage rec {
+  pname = "milksnake";
+  version = "0.1.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "120nprd8lqis7x7zy72536gk2j68f7gxm8gffmx8k4ygifvl7kfz";
+  };
+
+  propagatedBuildInputs = [
+   cffi
+  ];
+
+  # tests rely on pip/venv
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A python library that extends setuptools for binary extensions";
+    homepage = https://github.com/getsentry/milksnake;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ matthiasbeyer ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2ca134a413f9..5e35996a0a03 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9452,6 +9452,8 @@ in {
 
   micawber = callPackage ../development/python-modules/micawber { };
 
+  milksnake = callPackage ../development/python-modules/milksnake { };
+
   minimock = buildPythonPackage rec {
     version = "1.2.8";
     name = "minimock-${version}";

From 7f693c2fda272094e3e3990e6074f68f1cd91ccc Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Mon, 23 Apr 2018 10:56:41 +0300
Subject: [PATCH 0213/3370] xonsh: 0.6.0 -> 0.6.1

---
 pkgs/shells/xonsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index d22a66eb93ae..a923602cdd76 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "0hfsan22i81wffx2xbamm8wwkxgpv12z4kfl37p9m22vpqgg0fdg";
+    sha256= "0lxjklwj267q0ikqab8p743sjvm44gq1w7mp80c7hgrn2ndvrypg";
   };
 
   LC_ALL = "en_US.UTF-8";
@@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "A Python-ish, BASHwards-compatible shell";
-    homepage = http://xonsh.org;
+    homepage = http://xon.sh/;
     license = licenses.bsd3;
     maintainers = with maintainers; [ spwhitt garbas vrthra ];
     platforms = platforms.all;

From 49f55fa3375910259a7d9ba813121c3ca4096506 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 25 Dec 2017 15:20:57 +0100
Subject: [PATCH 0214/3370] vdirsyncer: 0.16.4 -> 0.17.0a2

---
 pkgs/tools/misc/vdirsyncer/default.nix | 51 +++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 9d1e4096776a..9e9ded5c3a76 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,18 +1,30 @@
-{ stdenv, fetchurl, python3Packages, glibcLocales }:
+{ stdenv, python3Packages, glibcLocales, rustPlatform }:
 
 # Packaging documentation at:
 # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst
 let
   pythonPackages = python3Packages;
-in
-pythonPackages.buildPythonApplication rec {
-  version = "0.16.4";
-  name = "vdirsyncer-${version}";
-
-  src = fetchurl {
-    url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "03wva48bgv1ad3df6plc9b8xxh6k8bcaxrhlzwh81c9mzn5bspzv";
+  version = "0.17.0a2";
+  pname = "vdirsyncer";
+  name = pname + "-" + version;
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "0y464rsx5la6bp94z2g0nnkbl4nwfya08abynvifw4c84vs1gr4q";
   };
+  native = rustPlatform.buildRustPackage {
+    name = name + "-native";
+    inherit src;
+    sourceRoot = name + "/rust";
+    cargoSha256 = "1cr7xs11gbsc3x5slga9qahchwc22qq49amf28g4jgs9lzf57qis";
+    postInstall = ''
+      mkdir $out/include $out/lib
+      cp $out/bin/libvdirsyncer_rustext* $out/lib
+      rm -r $out/bin
+      cp target/vdirsyncer_rustext.h $out/include
+    '';
+  };
+in pythonPackages.buildPythonApplication rec {
+  inherit version pname src;
 
   propagatedBuildInputs = with pythonPackages; [
     click click-log click-threading
@@ -20,14 +32,33 @@ pythonPackages.buildPythonApplication rec {
     requests
     requests_oauthlib # required for google oauth sync
     atomicwrites
+    milksnake
   ];
 
-  buildInputs = with pythonPackages; [hypothesis pytest pytest-localserver pytest-subtesthack setuptools_scm ] ++ [ glibcLocales ];
+  buildInputs = with pythonPackages; [ setuptools_scm ];
+
+  checkInputs = with pythonPackages; [ hypothesis pytest pytest-localserver pytest-subtesthack ] ++ [ glibcLocales ];
+
+  postPatch = ''
+    sed -i "/cargo build/d" Makefile
+  '';
+
+  preBuild = ''
+    mkdir -p rust/target/release
+    ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/
+    ln -s ${native}/include/vdirsyncer_rustext.h rust/target/
+  '';
 
   LC_ALL = "en_US.utf8";
 
+  preCheck = ''
+    ln -sf ../dist/tmpbuild/vdirsyncer/vdirsyncer/_native__lib.so vdirsyncer
+  '';
+
   checkPhase = ''
+    runHook preCheck
     make DETERMINISTIC_TESTS=true test
+    runHook postCheck
   '';
 
   meta = with stdenv.lib; {

From 85dfd4b41c2525e758f66579c1ff77800c63234d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 23 Apr 2018 10:30:57 +0200
Subject: [PATCH 0215/3370] slop: 7.3.49 -> 7.4

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

diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix
index ad1c2b64e65d..f411bbd2c300 100644
--- a/pkgs/tools/misc/slop/default.nix
+++ b/pkgs/tools/misc/slop/default.nix
@@ -1,15 +1,17 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
-, glew, glm, libGLU_combined, libX11, libXext, libXrender, cppcheck, icu}:
+, glew, glm, libGLU_combined, libX11, libXext, libXrender, icu
+, cppcheck
+}:
 
 stdenv.mkDerivation rec {
   name = "slop-${version}";
-  version = "7.3.49";
+  version = "7.4";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "slop";
     rev = "v${version}";
-    sha256 = "0is3mh2d1jqgvv72v5x92w23yf26n8n384nbr1b6cn883aw8j7jz";
+    sha256 = "0fgd8a2dqkg64all0f96sca92sdss9r3pzmv5kck46b99z2325z6";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From cd1eefcd29a8cad8056166658cddbb8b53c0794e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 23 Apr 2018 10:31:14 +0200
Subject: [PATCH 0216/3370] maim: 5.4.68 -> 5.5

---
 pkgs/tools/graphics/maim/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index c7e8dc966e8d..cac86e29c472 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -1,22 +1,23 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig
-, zlib, libpng, libjpeg
-, libGLU_combined, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }:
+, zlib, libpng, libjpeg, libGLU_combined, glm
+, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu
+}:
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.4.68";
+  version = "5.5";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "12jvfxzfhh6cbk6ygliwnkvm3mb7rca60k6x9qdzm17jsz65xhh0";
+    sha256 = "0dr44lwqsvhwf9pncxq6k42zj9hj07b96qsk1q8vh4l42zcpqzla";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs =
-    [ zlib libpng libjpeg libGLU_combined glm libX11 libXext libXfixes libXrandr
-      libXcomposite slop icu ];
+    [ zlib libpng libjpeg libGLU_combined glm
+      libX11 libXext libXfixes libXrandr libXcomposite slop icu ];
 
   doCheck = false;
 

From 9b5793790eb1b12fe4aa6b2ec259b3b5f9e8ba01 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 23 Apr 2018 10:49:47 +0200
Subject: [PATCH 0217/3370] motuclient: 1.4.00 -> 1.5.00

---
 pkgs/applications/science/misc/motu-client/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix
index 0d5c79fde900..0994bb1ca38d 100644
--- a/pkgs/applications/science/misc/motu-client/default.nix
+++ b/pkgs/applications/science/misc/motu-client/default.nix
@@ -1,11 +1,11 @@
 { python27Packages, fetchurl, lib } :
 python27Packages.buildPythonApplication rec {
-  name = "motu-client-${version}";
-  version = "1.4.00";
+  pname = "motu-client";
+  version = "1.5.00";
 
   src = fetchurl {
     url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${version}.tar.gz";
-    sha256 = "0v0h90mylhaamd1vm4nc64q63vmlafhijm47hs0xfam33y1q2yvb";
+    sha256 = "1iqsws3wa2gpb36ms21xmaxfi83i8p8cdya4cxpn4r47c8mz74x8";
   };
 
   meta = with lib; {

From 4cd88807d8434efdc3fb666767098e2b3ee0b812 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 21 Apr 2018 22:32:09 +0800
Subject: [PATCH 0218/3370] home-assistant: make port configurable so we can
 use it elsewhere

Additionally, some settings based on NixOS configuation is set via defaultConfig
which is then merged with the user provided configration.

For now that just means http port and time zone but others can easily be added.
---
 .../modules/services/misc/home-assistant.nix  | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index ac37c11106ef..07b14bb67643 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -5,7 +5,9 @@ with lib;
 let
   cfg = config.services.home-assistant;
 
-  configFile = pkgs.writeText "configuration.yaml" (builtins.toJSON cfg.config);
+  configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig
+    then (lib.recursiveUpdate defaultConfig (if (isNull cfg.config) then {} else cfg.config))
+    else cfg.config));
 
   availableComponents = pkgs.home-assistant.availableComponents;
 
@@ -38,6 +40,12 @@ let
     then (cfg.package.override { inherit extraComponents; })
     else cfg.package;
 
+  # If you are changing this, please update the description in applyDefaultConfig
+  defaultConfig = {
+    homeassistant.time_zone = config.time.timeZone;
+    http.server_port = (toString cfg.port);
+  };
+
 in {
   meta.maintainers = with maintainers; [ dotlambda ];
 
@@ -50,6 +58,26 @@ in {
       description = "The config directory, where your <filename>configuration.yaml</filename> is located.";
     };
 
+    port = mkOption {
+      default = 8123;
+      type = types.int;
+      description = "The port on which to listen.";
+    };
+
+    applyDefaultConfig = mkOption {
+      default = true;
+      type = types.bool;
+      description = ''
+        Setting this option enables a few configuration options for HA based on NixOS configuration (such as time zone) to avoid having to manually specify configuration we already have.
+        </para>
+        <para>
+        Currently one side effect of enabling this is that the <literal>http</literal> component will be enabled.
+        </para>
+        <para>
+        This only takes effect if <literal>config != null</literal> in order to ensure that a manually managed <filename>configuration.yaml</filename> is not overwritten.
+      '';
+    };
+
     config = mkOption {
       default = null;
       type = with types; nullOr attrs;
@@ -110,15 +138,14 @@ in {
         ln -s ${configFile} ${cfg.configDir}/configuration.yaml
       '';
       serviceConfig = {
-        ExecStart = ''
-          ${package}/bin/hass --config "${cfg.configDir}"
-        '';
+        ExecStart = "${package}/bin/hass --config '${cfg.configDir}'";
         User = "hass";
         Group = "hass";
         Restart = "on-failure";
         ProtectSystem = "strict";
         ReadWritePaths = "${cfg.configDir}";
         PrivateTmp = true;
+        RemoveIPC = true;
       };
       path = [
         "/run/wrappers" # needed for ping

From b886faa6b60eb67bc9c09484673998924083c12b Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 21 Apr 2018 22:33:32 +0800
Subject: [PATCH 0219/3370] home-assistant: use remarshal to convert
 configuration to YAML

HA doesn't mind the configuration being JSON instead of YAML but since YAML is
the official language, use that as it allows users to easily exchange config
data with other parties in the community.
---
 nixos/modules/services/misc/home-assistant.nix | 6 ++++--
 nixos/tests/home-assistant.nix                 | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index 07b14bb67643..b9a972967792 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -134,8 +134,10 @@ in {
       description = "Home Assistant";
       after = [ "network.target" ];
       preStart = lib.optionalString (cfg.config != null) ''
-        rm -f ${cfg.configDir}/configuration.yaml
-        ln -s ${configFile} ${cfg.configDir}/configuration.yaml
+        config=${cfg.configDir}/configuration.yaml
+        rm -f $config
+        ${pkgs.remarshal}/bin/json2yaml -i ${configFile} -o $config
+        chmod 444 $config
       '';
       serviceConfig = {
         ExecStart = "${package}/bin/hass --config '${cfg.configDir}'";
diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 2e45dc78471f..4ebccb7ab868 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -51,9 +51,9 @@ in {
     startAll;
     $hass->waitForUnit("home-assistant.service");
 
-    # Since config is specified using a Nix attribute set,
-    # configuration.yaml is a link to the Nix store
-    $hass->succeed("test -L ${configDir}/configuration.yaml");
+    # The config is specified using a Nix attribute set,
+    # but then converted from JSON to YAML
+    $hass->succeed("test -f ${configDir}/configuration.yaml");
 
     # Check that Home Assistant's web interface and API can be reached
     $hass->waitForOpenPort(8123);

From a8f9fc1c1647d1407863a34ece572db428e7fb3b Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 11 Apr 2018 18:53:31 +0200
Subject: [PATCH 0220/3370] pythonPackages.flask-autoindex: init at 0.6

---
 .../flask-autoindex/default.nix               | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-autoindex/default.nix

diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
new file mode 100644
index 000000000000..397d1e03ee82
--- /dev/null
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, buildPythonPackage
+, fetchpatch
+, fetchPypi
+, flask
+, flask-silk
+, future
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-AutoIndex";
+  version = "0.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19b10mb1nrqfjyafki6wnrbn8mqi30bbyyiyvp5xssc74pciyfqs";
+  };
+
+  propagatedBuildInputs = [
+    flask
+    flask-silk
+    future
+  ];
+
+  patches = [
+    # fix generated binary, see https://github.com/sublee/flask-autoindex/pull/32
+    (fetchpatch {
+      name = "fix_binary.patch";
+      url = "https://github.com/sublee/flask-autoindex/pull/32.patch";
+      sha256 = "1v2r0wvi7prhipjq89774svv6aqj0a13mdfj07pdlkpzfbf029dn";
+    })
+  ];
+
+  meta = with stdenv.lib; {
+    description = "The mod_autoindex for Flask";
+    longDescription = ''
+      Flask-AutoIndex generates an index page for your Flask application automatically.
+      The result is just like mod_autoindex, but the look is more awesome!
+    '';
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ timokau ];
+    homepage = http://pythonhosted.org/Flask-AutoIndex/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5b1877875344..2eab753e491f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5533,6 +5533,8 @@ in {
 
   flask_assets = callPackage ../development/python-modules/flask-assets { };
 
+  flask-autoindex = callPackage ../development/python-modules/flask-autoindex { };
+
   flask-babel = callPackage ../development/python-modules/flask-babel { };
 
   flask_cache = buildPythonPackage rec {

From 2becf90c935ae8849add008d4198c2d7392818d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 23 Apr 2018 13:26:57 +0200
Subject: [PATCH 0221/3370] knot-resolver: 2.2.0 -> 2.3.0 (security)

Contains fixes for CVE-2018-1110.
---
 pkgs/servers/dns/knot-resolver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix
index 09fda1b81b8b..1a5577e81655 100644
--- a/pkgs/servers/dns/knot-resolver/default.nix
+++ b/pkgs/servers/dns/knot-resolver/default.nix
@@ -12,11 +12,11 @@ inherit (stdenv.lib) optional optionals optionalString concatStringsSep;
 
 unwrapped = stdenv.mkDerivation rec {
   name = "knot-resolver-${version}";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz";
-    sha256 = "1yhlwvpl81klyfb8hhvrhii99q7wvydi3vandmq9j7dvig6z1dvv";
+    sha256 = "2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b";
   };
 
   outputs = [ "out" "dev" ];

From 1b4027c6fcaf73b7e1ed83bbe728827a83f1be47 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 23 Apr 2018 12:08:24 +0200
Subject: [PATCH 0222/3370] abootimg: init at 0.6

---
 pkgs/development/mobile/abootimg/default.nix | 43 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/mobile/abootimg/default.nix

diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix
new file mode 100644
index 000000000000..a2ddda34347a
--- /dev/null
+++ b/pkgs/development/mobile/abootimg/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, coreutils, cpio, findutils, gzip, makeWrapper, utillinux }:
+
+let
+  version = "0.6";
+in
+stdenv.mkDerivation {
+  name = "abootimg-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ggrandou";
+    repo = "abootimg";
+    rev = "7e127fee6a3981f6b0a50ce9910267cd501e09d4";
+    sha256 = "1qgx9fxwhylgnixzkz2mzv2707f65qq7rar2rsqak536vhig1z9a";
+  };
+
+  nativeBuildInputs = [ makeWrapper utillinux ];
+
+  postPatch = ''
+    cat <<EOF > version.h
+    #define VERSION_STR "${version}"
+    EOF
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D -m 755 abootimg $out/bin
+    install -D -m444 ./debian/abootimg.1 $out/share/man/man1/abootimg.1;
+
+    install -D -m 755 abootimg-pack-initrd $out/bin
+    wrapProgram $out/bin/abootimg-pack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils cpio findutils gzip ]}
+
+    install -D -m 755 abootimg-unpack-initrd $out/bin
+    wrapProgram $out/bin/abootimg-unpack-initrd --prefix PATH : ${stdenv.lib.makeBinPath [ cpio gzip ]}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ggrandou/abootimg;
+    description = "Manipulate Android Boot Images";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.flokli ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35e320dc31fc..940a3672f198 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -688,6 +688,8 @@ with pkgs;
     pkgs_i686 = pkgsi686Linux;
   };
 
+  abootimg = callPackage ../development/mobile/abootimg {};
+
   adbfs-rootless = callPackage ../development/mobile/adbfs-rootless {
     adb = androidenv.platformTools;
   };

From b73c44ece4b99421c488a08ebbaf0878e09c8d31 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 23 Apr 2018 15:04:09 +0200
Subject: [PATCH 0223/3370] sqldeveloper: add desktop item

---
 .../tools/database/sqldeveloper/default.nix   | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index a5d5702029b9..f2c756e30f12 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,7 +1,21 @@
-{ stdenv, makeWrapper, requireFile, unzip, openjdk }:
+{ stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, openjdk }:
 
-stdenv.mkDerivation rec {
+let
   version = "17.4.1.054.0712";
+
+  desktopItem = makeDesktopItem {
+    name = "sqldeveloper";
+    exec = "sqldeveloper";
+    icon = "sqldeveloper";
+    desktopName = "Oracle SQL Developer";
+    genericName = "Oracle SQL Developer";
+    comment = "Oracle's Oracle DB GUI client";
+    categories = "Application;Development;";
+  };
+in
+  stdenv.mkDerivation rec {
+
+  inherit version;
   name = "sqldeveloper-${version}";
 
   src = requireFile rec {
@@ -51,6 +65,10 @@ stdenv.mkDerivation rec {
     cd $out
     unzip ${src}
     mv sqldeveloper $out/lib/${name}
+
+    install -D -m 444 $out/lib/$name/icon.png $out/share/pixmaps/sqldeveloper.png
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
   '';
 
   meta = with stdenv.lib; {

From 483815a743e1cb1676ddef4cf5621f3216dbbaff Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 5 Apr 2018 22:20:46 +0000
Subject: [PATCH 0224/3370] nixos: documentation: move some code around, make
 docstrings more informative

---
 nixos/modules/misc/documentation.nix | 32 ++++++++++++++++------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index cea8981370bb..4af40a6bb42d 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -16,7 +16,10 @@ let cfg = config.documentation; in
         description = ''
           Whether to install documentation of packages from
           <option>environment.systemPackages</option> into the generated system path.
+
+          See "Multiple-output packages" chapter in the nixpkgs manual for more info.
         '';
+        # which is at ../../../doc/multiple-output.xml
       };
 
       man.enable = mkOption {
@@ -28,6 +31,15 @@ let cfg = config.documentation; in
         '';
       };
 
+      info.enable = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to install info pages and the <command>info</command> command.
+          This also includes "info" outputs.
+        '';
+      };
+
       doc.enable = mkOption {
         type = types.bool;
         default = true;
@@ -38,14 +50,6 @@ let cfg = config.documentation; in
         '';
       };
 
-      info.enable = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Whether to install info pages and the <command>info</command> command.
-          This also includes "info" outputs.
-        '';
-      };
 
     };
 
@@ -59,6 +63,12 @@ let cfg = config.documentation; in
       environment.extraOutputsToInstall = [ "man" ];
     })
 
+    (mkIf cfg.info.enable {
+      environment.systemPackages = [ pkgs.texinfoInteractive ];
+      environment.pathsToLink = [ "/share/info" ];
+      environment.extraOutputsToInstall = [ "info" ];
+    })
+
     (mkIf cfg.doc.enable {
       # TODO(@oxij): put it here and remove from profiles?
       # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
@@ -66,12 +76,6 @@ let cfg = config.documentation; in
       environment.extraOutputsToInstall = [ "doc" ];
     })
 
-    (mkIf cfg.info.enable {
-      environment.systemPackages = [ pkgs.texinfoInteractive ];
-      environment.pathsToLink = [ "/share/info" ];
-      environment.extraOutputsToInstall = [ "info" ];
-    })
-
   ]);
 
 }

From fbd4563b537ee083ffdc6964cf027e542a2ff249 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 5 Apr 2018 22:27:46 +0000
Subject: [PATCH 0225/3370] nixos: documentation: implement
 `documentation.dev.enable` option

I know that "devinfo" output does not currently exist, but so does "devman".
It is mentioned in the nixpkgs manual, but no derivation in nixpkgs actually uses it.
---
 nixos/modules/misc/documentation.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 4af40a6bb42d..2e426c017080 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -50,6 +50,21 @@ let cfg = config.documentation; in
         '';
       };
 
+      dev.enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to install documentation targeted at developers.
+          <itemizedlist>
+          <listitem><para>This includes man pages targeted at developers if <option>man.enable</option> is
+                    set (this also includes "devman" outputs).</para></listitem>
+          <listitem><para>This includes info pages targeted at developers if <option>info.enable</option>
+                    is set (this also includes "devinfo" outputs).</para></listitem>
+          <listitem><para>This includes other pages targeted at developers if <option>doc.enable</option>
+                    is set (this also includes "devdoc" outputs).</para></listitem>
+          </itemizedlist>
+        '';
+      };
 
     };
 
@@ -60,20 +75,20 @@ let cfg = config.documentation; in
     (mkIf cfg.man.enable {
       environment.systemPackages = [ pkgs.man-db ];
       environment.pathsToLink = [ "/share/man" ];
-      environment.extraOutputsToInstall = [ "man" ];
+      environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable [ "devman" ];
     })
 
     (mkIf cfg.info.enable {
       environment.systemPackages = [ pkgs.texinfoInteractive ];
       environment.pathsToLink = [ "/share/info" ];
-      environment.extraOutputsToInstall = [ "info" ];
+      environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ];
     })
 
     (mkIf cfg.doc.enable {
       # TODO(@oxij): put it here and remove from profiles?
       # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
       environment.pathsToLink = [ "/share/doc" ];
-      environment.extraOutputsToInstall = [ "doc" ];
+      environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ];
     })
 
   ]);

From 9c194b1b63ffc92f289a783398f71ce6dfb70d18 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Mon, 23 Apr 2018 15:29:50 +0200
Subject: [PATCH 0226/3370] frozendict: disable checks as there are none

---
 pkgs/development/python-modules/frozendict/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix
index 4ec8eff70c6d..94d42206d63d 100644
--- a/pkgs/development/python-modules/frozendict/default.nix
+++ b/pkgs/development/python-modules/frozendict/default.nix
@@ -9,6 +9,9 @@ buildPythonPackage rec {
     sha256 = "0ibf1wipidz57giy53dh7mh68f2hz38x8f4wdq88mvxj5pr7jhbp";
   };
 
+  # frozendict does not come with tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/slezica/python-frozendict;
     description = "An immutable dictionary";

From ccffc7a5dda79caa29bb62ce27d5cca8056e5d03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 23 Apr 2018 07:48:22 -0700
Subject: [PATCH 0227/3370] todo-txt-cli: 2.10 -> 2.11.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/todo.txt-cli/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.11.0 with grep in /nix/store/ws0k0b3kcl4j2aainnn8xg1vnx803s9c-todo.txt-cli-2.11.0
- directory tree listing: https://gist.github.com/37dad7ad49e196a469453b0b6a4ddb16
---
 pkgs/applications/office/todo.txt-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix
index faecc3f4227b..77a602954438 100644
--- a/pkgs/applications/office/todo.txt-cli/default.nix
+++ b/pkgs/applications/office/todo.txt-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 let
-  version = "2.10";
+  version = "2.11.0";
 in stdenv.mkDerivation {
   name = "todo.txt-cli-${version}";
 
   src = fetchurl {
     url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz";
-    sha256 = "1agn4zzbizrrylvbfi053b5mpb39bvl1gzziw08xibzfdyi1g55m";
+    sha256 = "0majx8lcvhh8ji54qi0sxr833wchdss95fjc92byd8g3lfz27rsz";
   };
 
   installPhase = ''

From 5960919876e2ae24fde9979587e7e936fd926610 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 23 Apr 2018 07:53:00 -0700
Subject: [PATCH 0228/3370] urh: 2.0.1 -> 2.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/urh/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/cs9vqxk0xqcpqcs10bbqhq6h7vdbmyny-urh-2.0.2/bin/.urh-wrapped --version’ and found version 2.0.2
- ran ‘/nix/store/cs9vqxk0xqcpqcs10bbqhq6h7vdbmyny-urh-2.0.2/bin/urh --version’ and found version 2.0.2
- found 2.0.2 with grep in /nix/store/cs9vqxk0xqcpqcs10bbqhq6h7vdbmyny-urh-2.0.2
- directory tree listing: https://gist.github.com/fd267c85c4f90f14b9af167c50b169a0
---
 pkgs/applications/misc/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index d2463616d677..fa2f16166446 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "0mnnrxm49s77s1qg7zbfciw0525ipsl010sciqdw8a22jg1rfjh8";
+    sha256 = "1qqb31y65rd85rf3gvxxxy06hm89ary00km1ac84qz5bwm6n5fyb";
   };
 
   buildInputs = [ hackrf rtl-sdr ];

From 69746047cdfd464c82413027061ed5c6443eb6ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 23 Apr 2018 08:27:39 -0700
Subject: [PATCH 0229/3370] sc-controller: 0.4.1 -> 0.4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sc-controller/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc -h’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc --help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/scc help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/..scc-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped -h’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped --help’ got 0 exit code
- ran ‘/nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2/bin/.scc-wrapped help’ got 0 exit code
- found 0.4.2 with grep in /nix/store/d6a2kmmbi7lw8xq2yk7si8qd4af897lx-sc-controller-0.4.2
- directory tree listing: https://gist.github.com/3f673ef175fbb295f67a2384aef61ede
---
 pkgs/misc/drivers/sc-controller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index 93e8ffbc3ca8..d4ed749ca9cc 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonApplication rec {
   pname = "sc-controller";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner  = "kozec";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0zal8sl3j17gqmynig8jhqrhj7zfqql8vci4whn19gymchwjalzi";
+    sha256 = "19i9z5cjjgi3a94hrz5g3a6m4vj71p1gs6mhklc6dq8ydwsadwzz";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From ffd428b5a099838697e9d6c6da0bf40163dccda2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 23 Apr 2018 09:06:07 -0700
Subject: [PATCH 0230/3370] sabnzbd: 2.3.2 -> 2.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sabnzbd/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3/bin/.sabnzbd-wrapped -h’ got 0 exit code
- ran ‘/nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3/bin/.sabnzbd-wrapped --help’ got 0 exit code
- ran ‘/nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3/bin/sabnzbd -h’ got 0 exit code
- ran ‘/nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3/bin/sabnzbd --help’ got 0 exit code
- found 2.3.3 with grep in /nix/store/rl41iqq34y5lbia598awnnr5zlqvn7p0-sabnzbd-2.3.3
- directory tree listing: https://gist.github.com/06ad54e65a99a41896933852c69b59c1
---
 pkgs/servers/sabnzbd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index d46f5677b9f0..1b5a8c24424a 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -4,7 +4,7 @@ let
   pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc ]);
   path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
 in stdenv.mkDerivation rec {
-  version = "2.3.2";
+  version = "2.3.3";
   pname = "sabnzbd";
   name = "${pname}-${version}";
 
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
     owner = pname;
     repo = pname;
     rev = version;
-    sha256 = "0c0ap8bygvz643fgfvvmwshcyfblq2c5jziqwgpf30g6rsbfv2v0";
+    sha256 = "0za4xjc4x44f7i30r86bbza3zppid333ifwzp5h526w3zak1lal8";
   };
 
   buildInputs = [ pythonEnv makeWrapper ];

From 617db2df96a75f7808d544b57aa97d9859377e84 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 20 Apr 2018 06:35:35 -0500
Subject: [PATCH 0231/3370] foundationdb: init at 5.1.7

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix         | 99 +++++++++++++++++++
 .../foundationdb/fix-scm-version.patch        | 42 ++++++++
 pkgs/servers/foundationdb/ldflags.patch       | 90 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 233 insertions(+)
 create mode 100644 pkgs/servers/foundationdb/default.nix
 create mode 100644 pkgs/servers/foundationdb/fix-scm-version.patch
 create mode 100644 pkgs/servers/foundationdb/ldflags.patch

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
new file mode 100644
index 000000000000..95326b4c1c6c
--- /dev/null
+++ b/pkgs/servers/foundationdb/default.nix
@@ -0,0 +1,99 @@
+{ stdenv, fetchurl, fetchFromGitHub
+, which, findutils, m4, gawk, python, openjdk, mono58, libressl_2_6
+}:
+
+let
+  version = "5.1.7";
+  branch  = "release-5.1";
+  rev     = "9ad8d02386d4a6a5efecf898df80f2747695c627";
+  sha256  = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06";
+
+  # hysterical raisins dictate a version of boost this old. however,
+  # we luckily do not need to build anything, we just need the header
+  # files.
+  boost152 = stdenv.mkDerivation rec {
+    name = "boost-headers-1.52.0";
+
+    src = fetchurl {
+      url = "mirror://sourceforge/boost/boost_1_52_0.tar.bz2";
+      sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
+    };
+
+    buildPhase = ":";
+    configurePhase = ":";
+    installPhase = ''
+      mkdir -p $out/include/
+      cp -R boost $out/include/
+    '';
+  };
+
+in stdenv.mkDerivation rec {
+  name = "foundationdb-${version}";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "apple";
+    repo  = "foundationdb";
+    inherit rev sha256;
+  };
+
+  nativeBuildInputs = [ gawk which m4 findutils boost152 mono58 ];
+  buildInputs = [ python openjdk libressl_2_6 ];
+
+  patches =
+    [ ./fix-scm-version.patch
+      ./ldflags.patch
+    ];
+
+  postPatch = ''
+    substituteInPlace ./build/scver.mk \
+      --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \
+      --subst-var-by NIXOS_FDB_SCBRANCH   "${branch}"
+
+    substituteInPlace ./Makefile \
+      --replace 'shell which ccache' 'shell true' \
+      --replace -Werror ""
+
+    substituteInPlace ./Makefile \
+      --replace libstdc++_pic libstdc++
+
+    substituteInPlace ./build/link-validate.sh \
+      --replace 'exit 1' '#exit 1'
+
+    patchShebangs .
+  '';
+
+  enableParallelBuilding = true;
+  makeFlags = [ "all" "fdb_c" "KVRELEASE=1" ];
+
+  configurePhase = ":";
+  installPhase = ''
+    mkdir -vp $out/{bin,libexec/plugins} $lib/lib $dev/include/foundationdb
+
+    cp -v ./lib/libfdb_c.so     $lib/lib
+    cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
+
+    cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
+    cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
+
+    for x in fdbbackup fdbcli fdbserver fdbmonitor; do
+      cp -v "./bin/$x" $out/bin;
+    done
+
+    ln -sfv $out/bin/fdbbackup $out/bin/dr_agent
+    ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore
+    ln -sfv $out/bin/fdbbackup $out/bin/fdbdr
+
+    ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent
+  '';
+
+  outputs = [ "out" "lib" "dev" ];
+
+  meta = with stdenv.lib; {
+    description = "Open source, distributed, transactional key-value store";
+    homepage    = https://www.foundationdb.org;
+    license     = licenses.asl20;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/servers/foundationdb/fix-scm-version.patch b/pkgs/servers/foundationdb/fix-scm-version.patch
new file mode 100644
index 000000000000..0e0df7ade82b
--- /dev/null
+++ b/pkgs/servers/foundationdb/fix-scm-version.patch
@@ -0,0 +1,42 @@
+diff --git a/build/scver.mk b/build/scver.mk
+index bdae8be..7539864 100644
+--- a/build/scver.mk
++++ b/build/scver.mk
+@@ -98,33 +98,10 @@ endif
+ GITPRESENT := $(wildcard $(FDBDIR)/.git)
+ HGPRESENT := $(wildcard $(FDBDIR)/.hg)
+ 
+-# Use Git, if not missing
+-ifneq ($(GITPRESENT),)
+-	SCVER := $(shell cd "$(FDBDIR)" && git --version 2>/dev/null)
+-	ifneq ($(SCVER),)
+-		VERSION_ID := $(shell cd "$(FDBDIR)" && git rev-parse --verify HEAD)
+-		SOURCE_CONTROL := GIT
+-		SCBRANCH := $(shell cd "$(FDBDIR)" && git rev-parse --abbrev-ref HEAD)
+-	else
+-$(error Missing git executable on $(PLATFORM) )
+-	endif
+-# Otherwise, use Mercurial
+-else
+-	# Otherwise, use Mercurial, if not missing
+-	ifneq ($(HGPRESENT),)
+-		SCVER := $(shell cd "$(FDBDIR)" && hg --version 2>/dev/null)
+-		ifdef SCVER
+-			VERSION_ID := $(shell cd "$(FDBDIR)" && hg id -n)
+-			SOURCE_CONTROL := MERCURIAL
+-			SCBRANCH := $(shell cd "$(FDBDIR)" && hg branch)
+-		else
+-$(error Missing hg executable on $(PLATFORM))
+-		endif
+-	else
+-	FDBFILES := (shell ls -la $(FDBDIR))
+-$(error Missing source control information for source on $(PLATFORM) in directory: $(FDBDIR) with files: $(FDBFILES))
+-	endif
+-endif
++# NixOS-specific non-VCS packaging, filled out by the nix build
++SOURCE_CONTROL := GIT
++VERSION_ID     := @NIXOS_FDB_VERSION_ID@
++SCBRANCH       := @NIXOS_FDB_SCBRANCH@
+ 
+ # Set the RELEASE variable based on the KVRELEASE variable.
+ ifeq ($(KVRELEASE),1)
diff --git a/pkgs/servers/foundationdb/ldflags.patch b/pkgs/servers/foundationdb/ldflags.patch
new file mode 100644
index 000000000000..4d523a7ecdd3
--- /dev/null
+++ b/pkgs/servers/foundationdb/ldflags.patch
@@ -0,0 +1,90 @@
+diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
+index 0b6eac8..b1891ca 100644
+--- a/FDBLibTLS/local.mk
++++ b/FDBLibTLS/local.mk
+@@ -1,6 +1,5 @@
+ FDBLibTLS_CFLAGS := -fPIC -I/usr/local/include -I$(BOOSTDIR)
+-FDBLibTLS_STATIC_LIBS := -ltls -lssl -lcrypto
+-FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt
++FDBLibTLS_LDFLAGS := -L/usr/local/lib -static-libstdc++ -static-libgcc -lrt -ltls -lssl -lcrypto
+ FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDBLibTLS.map
+ 
+ # The plugin isn't a typical library, so it feels more sensible to have a copy
+diff --git a/bindings/c/local.mk b/bindings/c/local.mk
+index 44f0c31..7aea5a4 100644
+--- a/bindings/c/local.mk
++++ b/bindings/c/local.mk
+@@ -29,8 +29,8 @@ fdb_c_tests_HEADERS := -Ibindings/c
+ CLEAN_TARGETS += fdb_c_tests_clean
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_c_LIBS += lib/libstdc++.a -lm -lpthread -lrt -ldl
+-  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete
++  fdb_c_LIBS += lib/libstdc++.a
++  fdb_c_LDFLAGS += -Wl,--version-script=bindings/c/fdb_c.map -static-libgcc -Wl,-z,nodelete -lm -lpthread -lrt -ldl
+   fdb_c_tests_LIBS += -lpthread
+ endif
+ 
+diff --git a/bindings/flow/tester/local.mk b/bindings/flow/tester/local.mk
+index 2ef4fcb..6e59625 100644
+--- a/bindings/flow/tester/local.mk
++++ b/bindings/flow/tester/local.mk
+@@ -35,8 +35,7 @@ _fdb_flow_tester_clean:
+ 	@rm -rf bindings/flow/bin
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdb_flow_tester_LIBS += -ldl -lpthread -lrt
+-  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdb_flow_tester_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ else ifeq ($(PLATFORM),osx)
+   fdb_flow_tester_LDFLAGS += -lc++
+ endif
+diff --git a/fdbbackup/local.mk b/fdbbackup/local.mk
+index 033fe7d..865fc92 100644
+--- a/fdbbackup/local.mk
++++ b/fdbbackup/local.mk
+@@ -25,8 +25,7 @@ fdbbackup_LDFLAGS := $(fdbrpc_LDFLAGS)
+ fdbbackup_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbbackup_LIBS += -ldl -lpthread -lrt
+-  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbbackup_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbbackup_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
+diff --git a/fdbcli/local.mk b/fdbcli/local.mk
+index 81a4a42..892c079 100644
+--- a/fdbcli/local.mk
++++ b/fdbcli/local.mk
+@@ -22,14 +22,13 @@
+ 
+ fdbcli_CFLAGS := $(fdbclient_CFLAGS)
+ fdbcli_LDFLAGS := $(fdbrpc_LDFLAGS)
+-fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a -ldl
++fdbcli_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
+ fdbcli_STATIC_LIBS :=
+ 
+ fdbcli_GENERATED_SOURCES += versions.h
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc
+-  fdbcli_LIBS += -lpthread -lrt
++  fdbcli_LDFLAGS += -static-libstdc++ -static-libgcc -lpthread -lrt -ldl
+ else ifeq ($(PLATFORM),osx)
+   fdbcli_LDFLAGS += -lc++
+ endif
+diff --git a/fdbserver/local.mk b/fdbserver/local.mk
+index 78cad1b..36f2c0f 100644
+--- a/fdbserver/local.mk
++++ b/fdbserver/local.mk
+@@ -25,8 +25,7 @@ fdbserver_LDFLAGS := $(fdbrpc_LDFLAGS)
+ fdbserver_LIBS := lib/libfdbclient.a lib/libfdbrpc.a lib/libflow.a
+ 
+ ifeq ($(PLATFORM),linux)
+-  fdbserver_LIBS += -ldl -lpthread -lrt
+-  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc
++  fdbserver_LDFLAGS += -static-libstdc++ -static-libgcc -ldl -lpthread -lrt
+ 
+   # GPerfTools profiler (uncomment to use)
+   # fdbserver_CFLAGS += -I/opt/gperftools/include -DUSE_GPERFTOOLS=1
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 578ff7f2cc5e..67a5390aa6aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2409,6 +2409,8 @@ with pkgs;
 
   fuseiso = callPackage ../tools/filesystems/fuseiso { };
 
+  foundationdb = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; };
+
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
 
   fwknop = callPackage ../tools/security/fwknop { };

From 18f28a6413e33416576f632367f0a4816c74c188 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 23 Apr 2018 01:02:31 -0500
Subject: [PATCH 0232/3370] nixos: add foundationdb module, documentation

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/module-list.nix                 |   1 +
 .../services/databases/foundationdb.nix       | 360 ++++++++++++++++++
 .../services/databases/foundationdb.xml       | 279 ++++++++++++++
 3 files changed, 640 insertions(+)
 create mode 100644 nixos/modules/services/databases/foundationdb.nix
 create mode 100644 nixos/modules/services/databases/foundationdb.xml

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5a56554dc98b..1261fe950928 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -195,6 +195,7 @@
   ./services/databases/clickhouse.nix
   ./services/databases/couchdb.nix
   ./services/databases/firebird.nix
+  ./services/databases/foundationdb.nix
   ./services/databases/hbase.nix
   ./services/databases/influxdb.nix
   ./services/databases/memcached.nix
diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
new file mode 100644
index 000000000000..ba921a9c1521
--- /dev/null
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -0,0 +1,360 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.foundationdb;
+
+  # used for initial cluster configuration
+  initialIpAddr = if (cfg.publicAddress != "auto") then cfg.publicAddress else "127.0.0.1";
+
+  fdbServers = n:
+    concatStringsSep "\n" (map (x: "[fdbserver.${toString (x+cfg.listenPortStart)}]") (range 0 (n - 1)));
+
+  backupAgents = n:
+    concatStringsSep "\n" (map (x: "[backup_agent.${toString x}]") (range 1 n));
+
+  configFile = pkgs.writeText "foundationdb.conf" ''
+    [general]
+    cluster_file  = /etc/foundationdb/fdb.cluster
+
+    [fdbmonitor]
+    restart_delay = ${toString cfg.restartDelay}
+    user          = ${cfg.user}
+    group         = ${cfg.group}
+
+    [fdbserver]
+    command        = ${pkgs.foundationdb}/bin/fdbserver
+    public_address = ${cfg.publicAddress}:$ID
+    listen_address = ${cfg.listenAddress}
+    datadir        = ${cfg.dataDir}/$ID
+    logdir         = ${cfg.logDir}
+    logsize        = ${cfg.logSize}
+    maxlogssize    = ${cfg.maxLogSize}
+    ${optionalString (cfg.class != null) "class = ${cfg.class}"}
+    memory         = ${cfg.memory}
+    storage_memory = ${cfg.storageMemory}
+
+    ${optionalString (cfg.locality.machineId    != null) "locality_machineid=${cfg.locality.machineId}"}
+    ${optionalString (cfg.locality.zoneId       != null) "locality_zoneid=${cfg.locality.zoneId}"}
+    ${optionalString (cfg.locality.datacenterId != null) "locality_dcid=${cfg.locality.datacenterId}"}
+    ${optionalString (cfg.locality.dataHall     != null) "locality_data_hall=${cfg.locality.dataHall}"}
+
+    ${fdbServers cfg.serverProcesses}
+
+    [backup_agent]
+    command = ${pkgs.foundationdb}/libexec/backup_agent
+    ${backupAgents cfg.backupProcesses}
+  '';
+in
+{
+  options.services.foundationdb = {
+
+    enable = mkEnableOption "FoundationDB Server";
+
+    publicAddress = mkOption {
+      type        = types.str;
+      default     = "auto";
+      description = "Publicly visible IP address of the process. Port is determined by process ID";
+    };
+
+    listenAddress = mkOption {
+      type        = types.str;
+      default     = "public";
+      description = "Publicly visible IP address of the process. Port is determined by process ID";
+    };
+
+    listenPortStart = mkOption {
+      type          = types.int;
+      default       = 4500;
+      description   = ''
+        Starting port number for database listening sockets. Every FDB process binds to a
+        subsequent port, to this number reflects the start of the overall range. e.g. having
+        8 server processes will use all ports between 4500 and 4507.
+      '';
+    };
+
+    openFirewall = mkOption {
+      type        = types.bool;
+      default     = false;
+      description = ''
+        Open the firewall ports corresponding to FoundationDB processes and coordinators
+        using <option>config.networking.firewall.*</option>.
+      '';
+    };
+
+    dataDir = mkOption {
+      type        = types.path;
+      default     = "/var/lib/foundationdb";
+      description = "Data directory. All cluster data will be put under here.";
+    };
+
+    logDir = mkOption {
+      type        = types.path;
+      default     = "/var/log/foundationdb";
+      description = "Log directory.";
+    };
+
+    user = mkOption {
+      type        = types.str;
+      default     = "foundationdb";
+      description = "User account under which FoundationDB runs.";
+    };
+
+    group = mkOption {
+      type        = types.str;
+      default     = "foundationdb";
+      description = "Group account under which FoundationDB runs.";
+    };
+
+    class = mkOption {
+      type        = types.nullOr (types.enum [ "storage" "transaction" "stateless" ]);
+      default     = null;
+      description = "Process class";
+    };
+
+    restartDelay = mkOption {
+      type = types.int;
+      default = 10;
+      description = "Number of seconds to wait before restarting servers.";
+    };
+
+    logSize = mkOption {
+      type        = types.string;
+      default     = "10MiB";
+      description = ''
+        Roll over to a new log file after the current log file
+        reaches the specified size.
+      '';
+    };
+
+    maxLogSize = mkOption {
+      type        = types.string;
+      default     = "100MiB";
+      description = ''
+        Delete the oldest log file when the total size of all log
+        files exceeds the specified size. If set to 0, old log files
+        will not be deleted.
+      '';
+    };
+
+    serverProcesses = mkOption {
+      type = types.int;
+      default = 1;
+      description = "Number of fdbserver processes to run.";
+    };
+
+    backupProcesses = mkOption {
+      type = types.int;
+      default = 1;
+      description = "Number of backup_agent processes to run for snapshots.";
+    };
+
+    memory = mkOption {
+      type        = types.string;
+      default     = "8GiB";
+      description = ''
+        Maximum memory used by the process. The default value is
+        <literal>8GiB</literal>. When specified without a unit,
+        <literal>MiB</literal> is assumed. This parameter does not
+        change the memory allocation of the program. Rather, it sets
+        a hard limit beyond which the process will kill itself and
+        be restarted. The default value of <literal>8GiB</literal>
+        is double the intended memory usage in the default
+        configuration (providing an emergency buffer to deal with
+        memory leaks or similar problems). It is not recommended to
+        decrease the value of this parameter below its default
+        value. It may be increased if you wish to allocate a very
+        large amount of storage engine memory or cache. In
+        particular, when the <literal>storageMemory</literal>
+        parameter is increased, the <literal>memory</literal>
+        parameter should be increased by an equal amount.
+      '';
+    };
+
+    storageMemory = mkOption {
+      type        = types.string;
+      default     = "1GiB";
+      description = ''
+        Maximum memory used for data storage. The default value is
+        <literal>1GiB</literal>. When specified without a unit,
+        <literal>MB</literal> is assumed. Clusters using the memory
+        storage engine will be restricted to using this amount of
+        memory per process for purposes of data storage. Memory
+        overhead associated with storing the data is counted against
+        this total. If you increase the
+        <literal>storageMemory</literal>, you should also increase
+        the <literal>memory</literal> parameter by the same amount.
+      '';
+    };
+
+    locality = mkOption {
+      default = {
+        machineId    = null;
+        zoneId       = null;
+        datacenterId = null;
+        dataHall     = null;
+      };
+
+      description = ''
+        FoundationDB locality settings.
+      '';
+
+      type = types.submodule ({
+        options = {
+          machineId = mkOption {
+            default = null;
+            type = types.nullOr types.str;
+            description = ''
+	      Machine identifier key. All processes on a machine should share a
+              unique id. By default, processes on a machine determine a unique id to share.
+              This does not generally need to be set.
+            '';
+          };
+
+          zoneId = mkOption {
+            default = null;
+            type = types.nullOr types.str;
+            description = ''
+	      Zone identifier key. Processes that share a zone id are
+              considered non-unique for the purposes of data replication.
+              If unset, defaults to machine id.
+            '';
+          };
+
+          datacenterId = mkOption {
+            default = null;
+            type = types.nullOr types.str;
+            description = ''
+	      Data center identifier key. All processes physically located in a
+              data center should share the id. If you are depending on data
+              center based replication this must be set on all processes.
+            '';
+          };
+
+          dataHall = mkOption {
+            default = null;
+            type = types.nullOr types.str;
+            description = ''
+	      Data hall identifier key. All processes physically located in a
+              data hall should share the id. If you are depending on data
+              hall based replication this must be set on all processes.
+            '';
+          };
+        };
+      });
+    };
+
+    extraReadWritePaths = mkOption {
+      default = [ ];
+      type = types.listOf types.path;
+      description = ''
+        An extra set of filesystem paths that FoundationDB can read to
+        and write from. By default, FoundationDB runs under a heavily
+        namespaced systemd environment without write access to most of
+        the filesystem outside of its data and log directories. By
+        adding paths to this list, the set of writeable paths will be
+        expanded. This is useful for allowing e.g. backups to local files,
+        which must be performed on behalf of the foundationdb service.
+      '';
+    };
+
+    pidfile = mkOption {
+      type        = types.path;
+      default     = "/run/foundationdb.pid";
+      description = "Path to pidfile for fdbmonitor.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    meta.doc         = ./foundationdb.xml;
+    meta.maintainers = with lib.maintainers; [ thoughtpolice ];
+
+    environment.systemPackages = [ pkgs.foundationdb ];
+
+    users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton
+      { name        = "foundationdb";
+        description = "FoundationDB User";
+        uid         = config.ids.uids.foundationdb;
+        group       = cfg.group;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "foundationdb") (singleton
+      { name = "foundationdb";
+        gid  = config.ids.gids.foundationdb;
+      });
+
+    networking.firewall.allowedTCPPortRanges = mkIf cfg.openFirewall
+      [ { from = cfg.listenPortStart;
+          to = (cfg.listenPortStart + cfg.serverProcesses) - 1;
+        }
+      ];
+
+    systemd.services.foundationdb = {
+      description             = "FoundationDB Service";
+
+      after                   = [ "network.target" ];
+      wantedBy                = [ "multi-user.target" ];
+      unitConfig =
+        { RequiresMountsFor = "${cfg.dataDir} ${cfg.logDir}";
+        };
+
+      serviceConfig =
+        let rwpaths = [ cfg.dataDir cfg.logDir cfg.pidfile "/etc/foundationdb" ]
+                   ++ cfg.extraReadWritePaths;
+        in
+        { Type       = "simple";
+          Restart    = "always";
+          RestartSec = 5;
+          User       = cfg.user;
+          Group      = cfg.group;
+          PIDFile    = "${cfg.pidfile}";
+
+          PermissionsStartOnly = true;  # setup needs root perms
+          TimeoutSec           = 120;   # give reasonable time to shut down
+
+          # Security options
+          NoNewPrivileges       = true;
+          ProtectHome           = true;
+          ProtectSystem         = "strict";
+          ProtectKernelTunables = true;
+          ProtectControlGroups  = true;
+          PrivateTmp            = true;
+          PrivateDevices        = true;
+          ReadWritePaths        = lib.concatStringsSep " " (map (x: "-" + x) rwpaths);
+        };
+
+      path = [ pkgs.foundationdb pkgs.coreutils ];
+
+      preStart = ''
+        rm -f ${cfg.pidfile}   && \
+          touch ${cfg.pidfile} && \
+          chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile}
+
+        for x in "${cfg.logDir}" "${cfg.dataDir}" /etc/foundationdb; do
+          [ ! -d "$x" ] && mkdir -m 0700 -vp "$x" && chown -R ${cfg.user}:${cfg.group} "$x";
+        done
+
+        if [ ! -f /etc/foundationdb/fdb.cluster ]; then
+            cf=/etc/foundationdb/fdb.cluster
+            desc=$(tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c8)
+            rand=$(tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c8)
+            echo ''${desc}:''${rand}@${initialIpAddr}:${builtins.toString cfg.listenPortStart} > $cf
+            chmod 0660 $cf && chown -R ${cfg.user}:${cfg.group} $cf
+            touch "${cfg.dataDir}/.first_startup"
+        fi
+      '';
+
+      script = ''
+        exec fdbmonitor --lockfile ${cfg.pidfile} --conffile ${configFile};
+      '';
+
+      postStart = ''
+        if [ -e "${cfg.dataDir}/.first_startup" ]; then
+          fdbcli --exec "configure new single ssd"
+          rm -f "${cfg.dataDir}/.first_startup";
+        fi
+      '';
+    };
+  };
+}
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
new file mode 100644
index 000000000000..d10a5cfe836e
--- /dev/null
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -0,0 +1,279 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-foundationdb">
+
+<title>FoundationDB</title>
+
+<para><emphasis>Source:</emphasis> <filename>modules/services/databases/foundationdb.nix</filename></para>
+
+<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://apple.github.io/foundationdb/"/></para>
+
+<para><emphasis>Maintainer:</emphasis> Austin Seipp</para>
+
+<para><emphasis>Default version:</emphasis> 5.1.x</para>
+
+<para>FoundationDB (or "FDB") is a distributed, open source, high performance,
+transactional key-value store. It can store petabytes of data and deliver
+exceptional performance while maintaining consistency and ACID semantics over a
+large cluster.</para>
+
+<section><title>Configuring and basic setup</title>
+
+<para>To enable FoundationDB, add the following to your
+<filename>configuration.nix</filename>:
+
+<programlisting>
+services.foundationdb.enable = true;
+</programlisting>
+</para>
+
+<para>After running <command>nixos-rebuild</command>, you can verify whether
+FoundationDB is running by executing <command>fdbcli</command> (which is added
+to <option>environment.systemPackages</option>):
+
+<programlisting>
+$ sudo -u foundationdb fdbcli
+Using cluster file `/etc/foundationdb/fdb.cluster'.
+
+The database is available.
+
+Welcome to the fdbcli. For help, type `help'.
+fdb> status
+
+Using cluster file `/etc/foundationdb/fdb.cluster'.
+
+Configuration:
+  Redundancy mode        - single
+  Storage engine         - memory
+  Coordinators           - 1
+
+Cluster:
+  FoundationDB processes - 1
+  Machines               - 1
+  Memory availability    - 5.4 GB per process on machine with least available
+  Fault Tolerance        - 0 machines
+  Server time            - 04/20/18 15:21:14
+
+...
+
+fdb>
+</programlisting>
+</para>
+
+<para>FoundationDB is run under the <command>foundationdb</command> user and
+group by default, but this may be changed in the NixOS configuration. The
+systemd unit <command>foundationdb.service</command> controls the
+<command>fdbmonitor</command> process.</para>
+
+<para>By default, the NixOS module for FoundationDB creates a single
+SSD-storage based database for development and basic usage. This storage engine
+is designed for SSDs and will perform poorly on HDDs; however it can handle far
+more data than the alternative "memory" engine and is a better default choice
+for most deployments. (Note that you can change the storage backend on-the-fly
+for a given FoundationDB cluster using <command>fdbcli</command>.)</para>
+
+<para>Furthermore, only 1 server process and 1 backup agent are started in the
+default configuration. See below for more on scaling to increase this.</para>
+
+<para>FoundationDB stores all data for all server processes under
+<filename>/var/lib/foundationdb</filename>. You can override this using
+<option>services.foundationdb.dataDir</option>, e.g.
+
+<programlisting>
+services.foundationdb.dataDir = "/data/fdb";
+</programlisting>
+
+</para>
+
+<para>Similarly, logs are stored under
+<filename>/var/log/foundationdb</filename> by default, and there is a
+corresponding <option>services.foundationdb.logDir</option> as well.</para>
+
+</section>
+
+<section><title>Scaling processes and backup agents</title>
+
+<para>Scaling the number of server processes is quite easy; simply specify
+<option>services.foundationdb.serverProcesses</option> to be the number of
+FoundationDB worker processes that should be started on the machine.</para>
+
+<para>FoundationDB worker processes typically require 4GB of RAM per-process at
+minimum for good performance, so this option is set to 1 by default since the
+maximum aount of RAM is unknown. You're advised to abide by this restriction,
+so pick a number of processes so that each has 4GB or more.</para>
+
+<para>A similar option exists in order to scale backup agent processes,
+<option>services.foundationdb.backupProcesses</option>. Backup agents are not
+as performance/RAM sensitive, so feel free to experiment with the number of
+available backup processes.</para>
+
+</section>
+
+<section><title>Clustering</title>
+
+<para>FoundationDB on NixOS works similarly to other Linux systems, so this
+section will be brief. Please refer to the full FoundationDB documentation for
+more on clustering.</para>
+
+<para>FoundationDB organizes clusters using a set of
+<emphasis>coordinators</emphasis>, which are just specially-designated worker
+processes. By default, every installation of FoundationDB on NixOS will start
+as its own individual cluster, with a single coordinator: the first worker
+process on <command>localhost</command>.</para>
+
+<para>Coordinators are specified globally using the
+<command>/etc/foundationdb/fdb.cluster</command> file, which all servers and
+client applications will use to find and join coordinators. Note that this file
+<emphasis>can not</emphasis> be managed by NixOS so easily: FoundationDB is
+designed so that it will rewrite the file at runtime for all clients and nodes
+when cluster coordinators change, with clients transparently handling this
+without intervention.</para>
+
+<para>When dealing with a cluster, there are two main things you want to
+do:</para>
+
+<itemizedlist>
+  <listitem><para>Add a node to the cluster for storage/compute.</para></listitem>
+  <listitem><para>Promote an ordinary worker to a coordinator.</para></listitem>
+</itemizedlist>
+
+<para>A node must already be a member of the cluster in order to properly be
+promoted to a coordinator, so you must always add it first if you wish to
+promote it.</para>
+
+<para>To add a machine to a FoundationDB cluster:</para>
+
+<itemizedlist>
+  <listitem><para>Choose one of the servers to start as the initial coordinator.
+      </para></listitem>
+  <listitem><para>Copy the <command>/etc/foundationdb/fdb.cluster</command> file
+      from this server to all the other servers. Restart FoundationDB on all of
+      these other servers, so they join the cluster.</para></listitem>
+  <listitem><para>All of these servers are now connected and working together
+      in the cluster, under the chosen coordinator.</para></listitem>
+</itemizedlist>
+
+<para>At this point, you can add as many nodes as you want by just repeating
+the above steps. By default there will still be a single coordinator: you can
+use <command>fdbcli</command> to change this and add new coordinators.</para>
+
+<para>As a convenience, FoundationDB can automatically assign coordinators
+based on the redundancy mode you wish to achieve for the cluster. Once all the
+nodes have been joined, simply set the replication policy, and then issue the
+<command>coordinators auto</command> command</para>
+
+<para>For example, assuming we have 3 nodes available, we can enable double
+redundancy mode, then auto-select coordinators. For double redundancy, 3
+coordinators is ideal: therefore FoundationDB will make
+<emphasis>every</emphasis> node a coordinator automatically:</para>
+
+<programlisting>
+fdbcli> configure double ssd
+fdbcli> coordinators auto
+</programlisting>
+
+<para>This will transparently update all the servers within seconds, and
+appropriately rewrite the <command>fdb.cluster</command> file, as well as
+informing all client processes to do the same.</para>
+
+</section>
+
+<section><title>Client connectivity</title>
+
+<para>By default, all clients must use the current
+<command>fdb.cluster</command> file to access a given FoundationDB cluster.
+This file is located by default in
+<command>/etc/foundationdb/fdb.cluster</command> on all machines with the
+FoundationDB service enabled, so you may copy the active one from your cluster
+to a new node in order to connect, if it is not part of the cluster.</para>
+
+</section>
+
+<section><title>Backups and Disaster Recovery</title>
+
+<para>The usual rules for doing FoundationDB backups apply on NixOS as written
+in the FoundationDB manual. However, one important difference is the security
+profile for NixOS: by default, the <command>foundationdb</command> systemd unit
+uses <emphasis>Linux namespaces</emphasis> to restrict write access to the
+system, except for the log directory, data directory, and the
+<command>/etc/foundationdb/</command> directory. This is enforced by default
+and cannot be disabled.</para>
+
+<para>However, a side effect of this is that the <command>fdbbackup</command>
+command doesn't work properly for local filesystem backups: FoundationDB uses a
+server process alongside the database processes to perform backups and copy the
+backups to the filesystem. As a result, this process is put under the
+restricted namespaces above: the backup process can only write to a limited
+number of paths.</para>
+
+<para>In order to allow flexible backup locations on local disks, the
+FoundationDB NixOS module supports a
+<option>services.foundationdb.extraReadWritePaths</option> option. This option
+takes a list of paths, and adds them to the systemd unit, allowing the
+processes inside the service to write (and read) the specified
+directories.</para>
+
+<para>For example, to create backups in <command>/opt/fdb-backups</command>,
+first set up the paths in the module options:</para>
+
+<programlisting>
+services.foundationdb.extraReadWritePaths = [ "/opt/fdb-backups" ];
+</programlisting>
+
+<para>Restart the FoundationDB service, and it will now be able to write to
+this directory (even if it does not yet exist.) Note: this path
+<emphasis>must</emphasis> exist before restarting the unit. Otherwise, systemd
+will not include it in the private FoundationDB namespace (and it will not add
+it dynamically at runtime).</para>
+
+<para>You can now perform a backup:</para>
+
+<programlisting>
+$ sudo -u foundationdb fdbbackup start  -t default -d file:///opt/fdb-backups
+$ sudo -u foundationdb fdbbackup status -t default
+</programlisting>
+
+</section>
+
+<section><title>Known limitations</title>
+
+<para>The FoundationDB setup for NixOS should currently be considered beta.
+FoundationDB is not new software, but the NixOS compilation and integration has
+only undergone fairly basic testing of all the available functionality.</para>
+
+<itemizedlist>
+  <listitem><para>TLS plugin support is compiled in, but it's currently not
+      possible to specify the set of TLS certificate options in
+      <command>services.foundationdb</command></para></listitem>
+  <listitem><para>There is no way to specify individual parameters for
+      individual <command>fdbserver</command> processes. Currently, all server
+      processes inherit all the global <command>fdbmonitor</command> settings.
+      </para></listitem>
+  <listitem><para>Python bindings are not currently installed.</para></listitem>
+  <listitem><para>Ruby bindings are not currently installed.</para></listitem>
+  <listitem><para>Java bindings are not currently installed.</para></listitem>
+  <listitem><para>Go bindings are not currently installed.</para></listitem>
+</itemizedlist>
+
+</section>
+
+<section><title>Options</title>
+
+<para>NixOS's FoundationDB module allows you to configure all of the most
+relevant configuration options for <command>fdbmonitor</command>, matching it
+quite closely. For a complete list of all options, check <command>man
+configuration.nix</command>.</para>
+
+</section>
+
+<section><title>Full documentation</title>
+
+<para>FoundationDB is a complex piece of software, and requires careful
+administration to properly use. Full documentation for administration can be
+found here: <link xlink:href="https://apple.github.io/foundationdb/"/>.</para>
+
+</section>
+
+</chapter>

From dc61a487c90580144919512f019905b06816bd44 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 23 Apr 2018 10:22:07 -0700
Subject: [PATCH 0233/3370] qlcplus: 4.11.1 -> 4.11.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qlcplus/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.11.2 with grep in /nix/store/4qhjfvk9i1hi3q4jqzic5ajndnqschfi-qlcplus-4.11.2
- directory tree listing: https://gist.github.com/2877914d9c008fd955d2946bfd21926e
---
 pkgs/applications/misc/qlcplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix
index e162d0d317f7..2fa4887a0f0f 100644
--- a/pkgs/applications/misc/qlcplus/default.nix
+++ b/pkgs/applications/misc/qlcplus/default.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   name = "qlcplus-${version}";
-  version = "4.11.1";
+  version = "4.11.2";
 
   src = fetchFromGitHub {
     owner = "mcallegari";
     repo = "qlcplus";
     rev = "QLC+_${version}";
-    sha256 = "0lb1mdp7kbnkja14phgyknr65irwkxcmzk96rqacysvwrvzvfzyd";
+    sha256 = "0ry7j8d5mm3h3mzd49xqlagnldmfhfr6plwk73pz62hxr4j58s6w";
   };
 
   nativeBuildInputs = [ qmake pkgconfig ];

From c214bc9aeec943345e095b88a94eabc6fba9671f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 23 Apr 2018 12:31:36 -0500
Subject: [PATCH 0234/3370] gstreamer: fix on Darwin

---
 .../libraries/gstreamer/core/default.nix          | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index ab3f78767a1c..5845c8c50db2 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -2,17 +2,18 @@
 , pkgconfig, gettext, gobjectIntrospection
 , bison, flex, python3, glib, makeWrapper
 , libcap,libunwind, darwin
+, lib
 }:
 
 stdenv.mkDerivation rec {
   name = "gstreamer-1.14.0";
 
-  meta = {
+  meta = with lib ;{
     description = "Open source multimedia framework";
     homepage = https://gstreamer.freedesktop.org;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ttuegel matthewbauer ];
   };
 
   src = fetchurl {
@@ -20,7 +21,7 @@ stdenv.mkDerivation rec {
     sha256 = "0vj6k01lp2yva6rfd95fkyng9jdr62gkz0x8d2l81dyly1ki6dpw";
   };
 
-  patches = [ 
+  patches = [
     (fetchpatch {
         url = "https://bug794856.bugzilla-attachments.gnome.org/attachment.cgi?id=370411";
         sha256 = "16plzzmkk906k4892zq68j3c9z8vdma5nxzlviq20jfv04ykhmk2";
@@ -34,7 +35,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson ninja pkgconfig gettext bison flex python3 makeWrapper gobjectIntrospection
   ];
-  buildInputs = [ libcap libunwind ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices;
+  buildInputs =
+       lib.optionals stdenv.isLinux [ libcap libunwind ]
+    ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreServices;
 
   propagatedBuildInputs = [ glib ];
 

From b09c250435dcdcb8fd66fcb0ed701b580ca3d482 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 23 Apr 2018 12:32:37 -0500
Subject: [PATCH 0235/3370] gst_plugins_base: fix on darwin

---
 .../libraries/gstreamer/base/default.nix      | 50 +++++++++++++------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index b3a4f445289e..39cf57ec5258 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, meson
-, ninja, gettext, gobjectIntrospection, python
-, gstreamer, orc, alsaLib, libXv, pango, libtheora
-, wayland, cdparanoia, libvisual, libintl
-}:
+{ stdenv, fetchurl, fetchpatch, lib
+, pkgconfig, meson, ninja, gettext, gobjectIntrospection
+, python, gstreamer, orc, pango, libtheora, libvisual
+, libintl
+, enableX11 ? stdenv.isLinux, libXv
+, enableWayland ? stdenv.isLinux, wayland
+, enableAlsa ? stdenv.isLinux, alsaLib
+, enableCocoa ? false, darwin
+, enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-base-1.14.0";
 
-  meta = {
+  meta = with lib; {
     description = "Base plugins and helper libraries";
     homepage = https://gstreamer.freedesktop.org;
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ matthewbauer ];
   };
 
   src = fetchurl {
@@ -21,19 +26,32 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [
-    pkgconfig python meson ninja gettext gobjectIntrospection
-  ];
+  nativeBuildInputs = [ pkgconfig python gettext gobjectIntrospection ]
 
-  buildInputs = [
-    orc libXv pango libtheora cdparanoia libintl wayland
+  # Broken meson with Darwin. Should hopefully be fixed soon. Tracking
+  # in https://bugzilla.gnome.org/show_bug.cgi?id=781148.
+  ++ lib.optionals (!stdenv.isDarwin) [ meson ninja ];
+
+  # TODO How to pass these to Meson?
+  configureFlags = [
+    "--enable-x11=${if enableX11 then "yes" else "no"}"
+    "--enable-wayland=${if enableWayland then "yes" else "no"}"
+    "--enable-cocoa=${if enableCocoa then "yes" else "no"}"
   ]
-  ++ stdenv.lib.optional stdenv.isLinux alsaLib
-  ++ stdenv.lib.optional (!stdenv.isDarwin) libvisual;
+
+  # Introspection fails on my MacBook currently
+  ++ lib.optional stdenv.isDarwin "--disable-introspection";
+
+  buildInputs = [ orc libtheora libintl ]
+    ++ lib.optional enableAlsa alsaLib
+    ++ lib.optionals enableX11 [ libXv pango ]
+    ++ lib.optional enableWayland wayland
+    ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa
+    ++ lib.optional enableCdparanoia cdparanoia;
 
   propagatedBuildInputs = [ gstreamer ];
 
-  preConfigure = ''
+  postPatch = ''
     patchShebangs .
   '';
 

From 14eeba83fa62db164b7f3fe114d32fc2ed62417a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 23 Apr 2018 11:06:01 -0700
Subject: [PATCH 0236/3370] parallel: 20180322 -> 20180422
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/parallel/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/sem -h’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/sem --help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/sem help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parallel -h’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parallel --help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parallel help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/niceload -h’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/niceload --help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parset -h’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parset --help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/parset help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel -h’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel --help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.bash -h’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.bash --help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.bash help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.sh -h’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.sh --help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/env_parallel.sh help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/.parallel-wrapped -h’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/.parallel-wrapped --help’ got 0 exit code
- ran ‘/nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422/bin/.parallel-wrapped help’ got 0 exit code
- found 20180422 with grep in /nix/store/hbg2f2hd6lzzhndcpvlvimf9g7n3zwcj-parallel-20180422
- directory tree listing: https://gist.github.com/1d25708a872478041161c30dc54e53fb
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 093633e21142..9bb09d227c4c 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20180322";
+  name = "parallel-20180422";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3";
+    sha256 = "0xsfpbxwgd4197gra981iv0nmjfk58c0d88dxx6dh6yrqz523klx";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From 83e5b55ed00a705a6425c2ac2e4e86177de9b542 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Apr 2018 20:08:12 +0200
Subject: [PATCH 0237/3370] ecl_16_1_2: Adopt upstream error handling patch

---
 pkgs/development/compilers/ecl/16.1.2.nix  | 13 +++++++++++--
 pkgs/development/compilers/ecl/default.nix |  1 +
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index 30fee77321f5..b324ec490f1a 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -1,9 +1,9 @@
-{stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , libtool, autoconf, automake
 , gmp, mpfr, libffi, makeWrapper
 , noUnicode ? false
 , gcc
-, threadSupport ? true
+, threadSupport ? false
 }:
 let
   s = # Generated upstream information
@@ -39,6 +39,15 @@ stdenv.mkDerivation {
       "--enable-unicode")
     ;
 
+  patches = [
+    (fetchpatch {
+      # Avoid infinite loop, see https://gitlab.com/embeddable-common-lisp/ecl/issues/43 (fixed upstream)
+      name = "avoid-infinite-loop.patch";
+      url = "https://gitlab.com/embeddable-common-lisp/ecl/commit/caba1989f40ef917e7486f41b9cd5c7e3c5c2d79.patch";
+      sha256 = "07vw91psbc9gdn8grql46ra8lq3bgkzg5v480chnbryna4sv6lbb";
+    })
+  ];
+
   hardeningDisable = [ "format" ];
 
   postInstall = ''
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index e506e3aace1f..b877ca58e95b 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Lisp implementation aiming to be small, fast and easy to embed";
+    homepage = https://common-lisp.net/project/ecl/;
     license = stdenv.lib.licenses.mit ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;

From 84ace02e87cce36323e2dff26e0845b82b68f51c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 23 Apr 2018 20:21:11 +0200
Subject: [PATCH 0238/3370] android-studio: 3.1.1.0 -> 3.1.2.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 e18235024df4..df0c275ba25d 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   stableVersion = {
-    version = "3.1.1.0"; # "Android Studio 3.1.1"
-    build = "173.4697961";
-    sha256Hash = "0xn02miq2hz7666mziza56pfqw9sjflgvn88ds7j5yd4rlcr0lq8";
+    version = "3.1.2.0"; # "Android Studio 3.1.2"
+    build = "173.4720617";
+    sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
   };
   latestVersion = {
     version = "3.2.0.10"; # "Android Studio 3.2 Canary 11"

From 42a9ba28d116420424e935668890d4d1e810d982 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 23 Apr 2018 20:22:00 +0200
Subject: [PATCH 0239/3370] androidStudioPackages.{dev,canary}: 3.2.0.10 ->
 3.2.0.11

---
 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 df0c275ba25d..75385275ec84 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
   };
   latestVersion = {
-    version = "3.2.0.10"; # "Android Studio 3.2 Canary 11"
-    build = "181.4720098";
-    sha256Hash = "00cd7qdznspi69cgs1a13a3fnkvsc7zjfl517jgp32vdygkb0qxw";
+    version = "3.2.0.11"; # "Android Studio 3.2 Canary 12"
+    build = "181.4729833";
+    sha256Hash = "1b976m59d230pl35ajhdic46cw8qmnykkbrg3l7am7zmih0zk64c";
   };
 in rec {
   # Old alias

From 8647df2fb6be8d586376c2cb76ca5f2518dcbb81 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 23 Apr 2018 20:37:03 +0200
Subject: [PATCH 0240/3370] goocanvas_2: support gobjectIntrospection

---
 pkgs/development/libraries/goocanvas/2.x.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix
index 026f58079f6d..ef36a9c076fb 100644
--- a/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/pkgs/development/libraries/goocanvas/2.x.nix
@@ -13,11 +13,13 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig gettext gtk-doc python2 ];
-  buildInputs = [ gtk3 cairo glib ];
+  buildInputs = [ gtk3 cairo glib gobjectIntrospection ];
 
   configureFlags = [
     "--disable-python"
   ];
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "$(dev)/share/gir-1.0";
+  PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "$(out)/lib/girepository-1.0";
 
   meta = with stdenv.lib; {
     description = "Canvas widget for GTK+ based on the the Cairo 2D library";

From 3cdb8f581dbb85a0cb9552c0d84c44f736aecc63 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Wed, 18 Oct 2017 16:05:07 +0200
Subject: [PATCH 0241/3370] spark: provided-hadoop -> nixpkgs hadoop

spark should use nixpkgs provided hadoop to make it consistent
for bigger Nix hadoop + spark setup
---
 .../networking/cluster/spark/default.nix      | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 2b36d7c5647a..6401194eac20 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,20 +1,16 @@
-{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils
+{ stdenv, fetchzip, makeWrapper, jre, pythonPackages, coreutils, hadoop
 , RSupport? true, R
 , mesosSupport ? true, mesos
 , version
 }:
 
 let
-  versionMap = {
-    "2.2.1" = {
-                hadoopVersion = "hadoop2.7";
-                sparkSha256 = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c";
-              };
-  };
+  sha256 = {
+    "1.6.3" = "142hw73wf20d846l83ydx0yg7qj5qxywm4h7qrhwnd7lsy2sbnjf";
+    "2.2.1" = "10nxsf9a6hj1263sxv0cbdqxdb8mb4cl6iqq32ljq9ydvk32s99c";
+  }.${version};
 in
 
-with versionMap.${version};
-
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
@@ -22,15 +18,15 @@ stdenv.mkDerivation rec {
   name = "spark-${version}";
 
   src = fetchzip {
-    url    = "mirror://apache/spark/${name}/${name}-bin-${hadoopVersion}.tgz";
-    sha256 = sparkSha256;
+    inherit sha256;
+    url    = "mirror://apache/spark/${name}/${name}-bin-without-hadoop.tgz";
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]
     ++ optional RSupport R
     ++ optional mesosSupport mesos;
 
-  untarDir = "${name}-bin-${hadoopVersion}";
+  untarDir = "${name}-bin-without-hadoop";
   installPhase = ''
     mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
     mv * $out/lib/${untarDir}
@@ -42,6 +38,7 @@ stdenv.mkDerivation rec {
     cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF
     export JAVA_HOME="${jre}"
     export SPARK_HOME="$out/lib/${untarDir}"
+    export SPARK_DIST_CLASSPATH=$(${hadoop}/bin/hadoop classpath)
     export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}"
     export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH"
     ${optionalString RSupport
@@ -63,7 +60,7 @@ stdenv.mkDerivation rec {
     homepage         = "http://spark.apache.org";
     license          = stdenv.lib.licenses.asl20;
     platforms        = stdenv.lib.platforms.all;
-    maintainers      = with maintainers; [ thoughtpolice offline ];
+    maintainers      = with maintainers; [ thoughtpolice offline kamilchm ];
     repositories.git = git://git.apache.org/spark.git;
   };
 }

From 5e548e94e805794d76402d90bc0dc7e887dde8c9 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Apr 2018 21:13:25 +0200
Subject: [PATCH 0242/3370] glpk: Add gmp support

---
 pkgs/development/libraries/glpk/default.nix | 26 ++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index b9634e01900e..5b9296608d45 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -1,13 +1,33 @@
-{ fetchurl, stdenv }:
+{ stdenv
+, fetchurl
+# Excerpt from glpk's INSTALL file:
+# This feature allows the exact simplex solver to use the GNU MP
+# bignum library. If it is disabled, the exact simplex solver uses the
+# GLPK bignum module, which provides the same functionality as GNU MP,
+# however, it is much less efficient.
+, withGmp ? true
+, gmp
+}:
+
+assert withGmp -> gmp != null;
 
 stdenv.mkDerivation rec {
-  name = "glpk-4.65";
+  version = "4.65";
+  name = "glpk-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/glpk/${name}.tar.gz";
     sha256 = "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2";
   };
 
+  buildInputs = stdenv.lib.optionals withGmp [
+    gmp
+  ];
+
+  configureFlags = stdenv.lib.optionals withGmp [
+    "--with-gmp"
+  ];
+
   doCheck = true;
 
   meta = {
@@ -23,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/glpk/;
     license = stdenv.lib.licenses.gpl3Plus;
 
-    maintainers = [ stdenv.lib.maintainers.bjg ];
+    maintainers = with stdenv.lib.maintainers; [ bjg ];
     platforms = stdenv.lib.platforms.all;
   };
 }

From 0e5f82b847632cfd01122915ad9c57b2c65a2026 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 23 Apr 2018 20:37:27 +0200
Subject: [PATCH 0243/3370] pdf-quench: init at 1.0.5

---
 pkgs/applications/misc/pdf-quench/default.nix | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/misc/pdf-quench/default.nix

diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
new file mode 100644
index 000000000000..5b80fb161224
--- /dev/null
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, pkgs, pythonPackages, wrapGAppsHook}:
+
+pythonPackages.buildPythonApplication rec {
+  name = "pdf-quench-${version}";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "linuxerwang";
+    repo = "pdf-quench";
+    rev = "b72b3970b371026f9a7ebe6003581e8a63af98f6";
+    sha256 = "1rp9rlwr6rarcsxygv5x2c5psgwl6r69k0lsgribgyyla9cf2m7n";
+  };
+
+  nativeBuildInputs = [ wrapGAppsHook ];
+  buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ];
+  propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ];
+
+  dontBuild = true;
+  doCheck = false;
+
+  postPatch = ''
+    substituteInPlace src/pdf_quench.py \
+      --replace /usr/bin/python "${pythonPackages.python}/bin/python"
+    '';
+
+  installPhase = ''
+    install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/linuxerwang/pdf-quench;
+    description = "A visual tool for cropping pdf files";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ flokli ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35e320dc31fc..a45a6f2d04a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4276,6 +4276,8 @@ with pkgs;
 
   pdfmod = callPackage ../applications/misc/pdfmod { };
 
+  pdf-quench = callPackage ../applications/misc/pdf-quench { };
+
   jbig2enc = callPackage ../tools/graphics/jbig2enc { };
 
   pdfread = callPackage ../tools/graphics/pdfread {

From 94a420b92159ad979b97859a3db4779f91826a9f Mon Sep 17 00:00:00 2001
From: Eric Wolf <ericwolf42@gmail.com>
Date: Mon, 23 Apr 2018 21:27:42 +0200
Subject: [PATCH 0244/3370] fetchFromGitLab: Use API archive download endpoint.

According to

https://gitlab.com/gitlab-org/gitlab-ce/issues/45586#note_69828451

this URL is something with guaranteed stability.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67a5390aa6aa..7928f08f4581 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -288,7 +288,7 @@ with pkgs;
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
-    url = "https://gitlab.com/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.tar.gz";
+    url = "https://gitlab.com/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}";
     meta.homepage = "https://gitlab.com/${owner}/${repo}/";
   } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; };
 

From 412066173d36f991d90ce51128cd3125e6ec2a70 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Mon, 23 Apr 2018 21:55:26 +0200
Subject: [PATCH 0245/3370] Adjust email address

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1178ebb536ec..c827e0d11a92 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1731,7 +1731,7 @@
     name = "Jeffrey David Johnson";
   };
   jensbin = {
-    email = "jensbin@protonmail.com";
+    email = "jensbin+git@pm.me";
     github = "jensbin";
     name = "Jens Binkert";
   };

From 5d2671de81a4fde5be8d4bf9ee8caf3d2e3a3c66 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Apr 2018 21:57:23 +0200
Subject: [PATCH 0246/3370] fflas-ffpack: Drop liblapack dependency

---
 pkgs/development/libraries/fflas-ffpack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 82ece22b7c7d..5f99f35a1599 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas, liblapack
+{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas
 , gmpxx
 , optimize ? false # impure
 }:
@@ -19,10 +19,10 @@ stdenv.mkDerivation rec {
     autoreconfHook
     pkgconfig
   ] ++ stdenv.lib.optionals doCheck checkInputs;
-  buildInputs = [ givaro (liblapack.override {shared = true;}) openblas];
+  buildInputs = [ givaro openblas];
   configureFlags = [
     "--with-blas-libs=-lopenblas"
-    "--with-lapack-libs=-llapack"
+    "--with-lapack-libs=-lopenblas"
   ] ++ stdenv.lib.optionals (!optimize) [
     # disable SIMD instructions (which are enabled *when available* by default)
     "--disable-sse"

From e304b6b216ef77c7c19fae799e282c94a4b32506 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Mon, 23 Apr 2018 22:02:24 +0200
Subject: [PATCH 0247/3370] typora: 0.9.44 -> 0.9.47

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

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 7c6d186b8830..d687712fc08a 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
-  version = "0.9.44";
+  version = "0.9.47";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-        sha256 = "9442c090bf2619d270890228abd7dabb9e217c0b200615f8ed3cb255efd122d5";
+        sha256 = "431741948f5a2faba04984c495bea56b4a800c6dbb7e21e24ad3124fb8ffcbc9";
       }
     else
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_i386.deb";
-        sha256 = "ae228ca946d03940b85df30c995c4de3f942a780e32d4dcab872dec671c66ef3";
+        sha256 = "a95c8c1e296d8587a4dc6182af3b24253c3c2abc991badb7c758cd6d1bf5b1b6";
       }
     ;
 

From ce8f347ca8d69f606bbfeee44f74a5f05664b3cd Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Mon, 23 Apr 2018 23:40:47 +0300
Subject: [PATCH 0248/3370] nixos/hans, nixos/iodine: fix passwordFile
 attribute

---
 nixos/modules/services/networking/hans.nix   | 2 +-
 nixos/modules/services/networking/iodine.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/hans.nix b/nixos/modules/services/networking/hans.nix
index 56c30a6b96e1..dd34ef8d4ca1 100644
--- a/nixos/modules/services/networking/hans.nix
+++ b/nixos/modules/services/networking/hans.nix
@@ -131,7 +131,7 @@ in
         description = "hans, ip over icmp server daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.respondToSystemPings "-r"} ${optionalString (cfg.passwordFile != "") "-p $(cat \"${cfg.passwordFile}\")"}";
+        script = "${pkgs.hans}/bin/hans -f -u ${hansUser} ${cfg.server.extraConfig} -s ${cfg.server.ip} ${optionalString cfg.server.respondToSystemPings "-r"} ${optionalString (cfg.server.passwordFile != "") "-p $(cat \"${cfg.server.passwordFile}\")"}";
       };
     };
 
diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
index 709c36ee54f0..3f41421d27f7 100644
--- a/nixos/modules/services/networking/iodine.nix
+++ b/nixos/modules/services/networking/iodine.nix
@@ -136,7 +136,7 @@ in
         description = "iodine, ip over dns server daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.passwordFile != "") "-P $(cat \"${cfg.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}";
+        script = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${optionalString (cfg.server.passwordFile != "") "-P $(cat \"${cfg.server.passwordFile}\")"} ${cfg.server.ip} ${cfg.server.domain}";
       };
     };
 

From d32983a1caa92c74e8240c9a355ce9f1df8f5f42 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 23 Apr 2018 14:03:19 -0700
Subject: [PATCH 0249/3370] google-compute-engine: 20170914 -> 20180129
 (#36565)

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/optimize_local_ssd help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -V` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -v` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --version` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue version` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue -h` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue --help` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/set_multiqueue help` and found version 20180129
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_accounts_daemon-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_accounts_daemon-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_accounts_daemon -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_accounts_daemon --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_instance_setup-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_instance_setup-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_instance_setup -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_instance_setup --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_network_setup-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_network_setup-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_network_setup -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_network_setup --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_ip_forwarding_daemon-wrapped help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_ip_forwarding_daemon help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_clock_skew_daemon-wrapped help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_clock_skew_daemon help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_metadata_script_runner-wrapped -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/.google_metadata_script_runner-wrapped --help` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_metadata_script_runner -h` got 0 exit code
- ran `/nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129/bin/google_metadata_script_runner --help` got 0 exit code
- found 20180129 with grep in /nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129
- found 20180129 in filename of file in /nix/store/xxf54yjdmhkmsy5h0rrh985lygpi3sjv-google-compute-engine-20180129

only build on Linux
---
 pkgs/tools/virtualization/google-compute-engine/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index a923d73c03e4..3645de88bf8a 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonApplication rec {
   name = "google-compute-engine-${version}";
-  version = "20170914";
+  version = "20180129";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "compute-image-packages";
     rev = version;
-    sha256 = "0hlzcrf6yhzan25f4wzy1vbncak9whhqzrzza026ly3sq0smmjpg";
+    sha256 = "0380fnr64109hv8l1f3sgdg8a5mf020axj7jh8y25xq6wzkjm20c";
   };
 
   postPatch = ''
@@ -52,5 +52,6 @@ buildPythonApplication rec {
     homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages";
     license = licenses.asl20;
     maintainers = with maintainers; [ zimbatm ];
+    platforms = platforms.linux;
   };
 }

From cf758a5aa4f089f86e82bf6224864fc63cb3d08e Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 23 Apr 2018 16:51:33 -0500
Subject: [PATCH 0250/3370] release: add inkscape, qt5.qtmultimedia (darwin)

We want to make sure these work in Darwin. Hopefully this will improve their stability.
---
 pkgs/top-level/release.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index aee73f206696..3ea873cdc7ff 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -101,6 +101,9 @@ let
               jobs.git.x86_64-darwin
               jobs.mysql.x86_64-darwin
               jobs.vim.x86_64-darwin
+              # Ensure that UI stuff works on darwin
+              jobs.inkscape.x86_64-darwin
+              jobs.qt5.qtmultimedia.x86_64-darwin
 
               jobs.tests.cc-wrapper.x86_64-linux
               jobs.tests.cc-wrapper.x86_64-darwin

From 8edb13f0797befb79cfed0f1a777673eb7323bb7 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 23 Apr 2018 17:07:53 -0500
Subject: [PATCH 0251/3370] doc: add filtered pr list

---
 doc/reviewing-contributions.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index d6f33ccd1cdb..7b017f0a8cc4 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -23,7 +23,9 @@
     xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
     recently</link> and the <link
     xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
-    recently</link> updated pull-requests.</para>
+        recently</link> updated pull-requests.
+  We highly encourage looking at <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone">
+  this list of ready to merge, unreviewed pull requests</link>.</para>
 
 <para>When reviewing a pull request, please always be nice and polite.
   Controversial changes can lead to controversial opinions, but it is important

From 884e6a7b9fbea0e776e199ed4c11d36f2f3dedb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Mon, 23 Apr 2018 23:54:04 +0200
Subject: [PATCH 0252/3370] tbs: updated to kernel-4.14

* updated meta data
* fix concurrent names for fetchFromGitHub derivations
---
 pkgs/os-specific/linux/tbs/default.nix | 28 +++++++++++++++++---------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index e4b954d4dbf5..db20a7ab8211 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages }:
+{ stdenv, lib, fetchFromGitHub, kernel, kmod, perl, patchutils, perlPackages, libelf }:
 let
-  media = fetchFromGitHub {
+
+  media = fetchFromGitHub rec {
+    name = repo;
     owner = "tbsdtv";
     repo = "linux_media";
-    rev = "14ebbec91f2cd0423aaf859fc6e6d5d986397cd4";
-    sha256 = "1cmqj3kby8sxfcpvslbxywr95529vjxzbn800fdp35lka1fv962h";
+    rev = "efe31531b77efd3a4c94516504a5823d31cdc776";
+    sha256 = "1533qi3sb91v00289hl5zaj4l35r2sf9fqc6z5ky1vbb7byxgnlr";
   };
-  build = fetchFromGitHub {
+
+  build = fetchFromGitHub rec {
+    name = repo;
     owner = "tbsdtv";
     repo = "media_build";
-    rev = "c340e29a4047e43f7ea7ebf19e1e28c1f2112d05";
-    sha256 = "0hfn1j9qk8lh30z3ywj22qky480nsf8z2iag2bqhrhy4375vjlbl";
+    rev = "a0d62eba4d429e0e9d2c2f910fb203e817cac84b";
+    sha256 = "1329s7w9xlqjqwkpaqsd6b5dmzhm97jw0c7c7zzmmbdkl289i4i4";
   };
+
 in stdenv.mkDerivation {
-  name = "tbs-2017-11-05-${kernel.version}";
+  name = "tbs-2018.04.18-${kernel.version}";
 
   srcs = [ media build ];
   sourceRoot = "${build.name}";
@@ -39,10 +44,13 @@ in stdenv.mkDerivation {
   installFlags = [ "DESTDIR=$(out)" ];
 
   hardeningDisable = [ "pic" "format" ];
-  nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ];
 
-  meta = with stdenv.lib; {
+  nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ]
+  ++ lib.optional (lib.versionAtLeast kernel.version "4.14") [ libelf ];
+
+  meta = with lib; {
     homepage = https://www.tbsdtv.com/;
+    description = "Linux driver for TBSDTV cards";
     license = licenses.gpl2;
     maintainers = with maintainers; [ ck3d ];
     priority = 20;

From bca24c02ac7a8225f11aa79647f58dc71a03b1f0 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 24 Apr 2018 00:19:34 +0200
Subject: [PATCH 0253/3370] qemu: fix darwin build

---
 pkgs/applications/virtualization/qemu/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index f5cd661fbecb..a10687141615 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -8,7 +8,7 @@
 , seccompSupport ? stdenv.isLinux, libseccomp
 , pulseSupport ? !stdenv.isDarwin, libpulseaudio
 , sdlSupport ? !stdenv.isDarwin, SDL2
-, gtkSupport ? !xenSupport, gtk3, gettext, gnome3
+, gtkSupport ? !stdenv.isDarwin && !xenSupport, gtk3, gettext, gnome3
 , vncSupport ? true, libjpeg, libpng
 , spiceSupport ? !stdenv.isDarwin, spice, spice-protocol
 , usbredirSupport ? spiceSupport, usbredir
@@ -107,6 +107,8 @@ stdenv.mkDerivation rec {
       "--sysconfdir=/etc"
       "--localstatedir=/var"
     ]
+    # disable sysctl check on darwin.
+    ++ optional stdenv.isDarwin "--cpu=x86_64"
     ++ optional numaSupport "--enable-numa"
     ++ optional seccompSupport "--enable-seccomp"
     ++ optional spiceSupport "--enable-spice"

From fe6386c2f0ac2bdfaac9bc70f3e361f2391bb5c1 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 24 Apr 2018 00:28:54 +0200
Subject: [PATCH 0254/3370] oniguruma: remove darwin install_name patch

---
 pkgs/development/libraries/oniguruma/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix
index 3989ab42468d..f9a75801e101 100644
--- a/pkgs/development/libraries/oniguruma/default.nix
+++ b/pkgs/development/libraries/oniguruma/default.nix
@@ -13,16 +13,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  prePatch = stdenv.lib.optional stdenv.isDarwin ''
-    substituteInPlace cmake/dist.cmake \
-      --replace '@executable_path/''${UP_DIR}/''${INSTALL_LIB}' $out'/''${INSTALL_LIB}'
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/kkos/oniguruma;
     description = "Regular expressions library";
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    platforms = with stdenv.lib.platforms; unix;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fuuzetsu ];
+    platforms = platforms.unix;
   };
 }

From 63b82757096e9b57bf5cffc5b0a7463d19d2f797 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 00:25:22 +0200
Subject: [PATCH 0255/3370] ecl: Use boehmgc

---
 pkgs/development/compilers/ecl/16.1.2.nix  | 7 +++++++
 pkgs/development/compilers/ecl/default.nix | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index b324ec490f1a..291b0ed013d6 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -4,7 +4,11 @@
 , noUnicode ? false
 , gcc
 , threadSupport ? false
+, useBoehmgc ? true, boehmgc
 }:
+
+assert useBoehmgc -> boehmgc != null;
+
 let
   s = # Generated upstream information
   rec {
@@ -19,6 +23,9 @@ let
   ];
   propagatedBuildInputs = [
     libffi gmp mpfr gcc
+  ] ++ stdenv.lib.optionals useBoehmgc [
+    # replaces ecl's own gc which other packages can depend on, thus propagated
+    boehmgc
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index b877ca58e95b..33ed690772ea 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -4,6 +4,7 @@
 , noUnicode ? false
 , gcc
 , threadSupport ? true
+, useBoehmgc ? false, boehmgc
 }:
 let
   s = # Generated upstream information
@@ -20,6 +21,10 @@ let
   ];
   propagatedBuildInputs = [
     libffi gmp mpfr gcc
+    # replaces ecl's own gc which other packages can depend on, thus propagated
+  ] ++ stdenv.lib.optionals useBoehmgc [
+    # replaces ecl's own gc which other packages can depend on, thus propagated
+    boehmgc
   ];
 in
 stdenv.mkDerivation {

From 7a82fcfefa02b491c8354ea7a29c1286478fdea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 24 Apr 2018 00:55:30 +0200
Subject: [PATCH 0256/3370] python.pkgs.faulthandler: 3.0 -> 3.1

---
 .../python-modules/faulthandler/default.nix       | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix
index 1fc1aea94d57..a05ac1ba679e 100644
--- a/pkgs/development/python-modules/faulthandler/default.nix
+++ b/pkgs/development/python-modules/faulthandler/default.nix
@@ -2,24 +2,13 @@
 
 buildPythonPackage rec {
   pname = "faulthandler";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "acc10e10909f0f956ba1b42b6c450ea0bdaaa27b3942899f65931396cfcdd36a";
+    sha256 = "83301ffab03c86b291677b64b5cec7026f412cbda5ebd27e4cb3338452c40021";
   };
 
-  patches = [
-    (fetchpatch {
-      url = https://github.com/vstinner/faulthandler/commit/67b661e.patch;
-      sha256 = "1nn8c9nq5qypja949hzz0n4yprsyr63wihf5g3gwrinm2nkjnnv7";
-    })
-    (fetchpatch {
-      url = https://github.com/vstinner/faulthandler/commit/07cbb7b.patch;
-      sha256 = "0fh6rjyjw7z1hsiy3sgdc8j9mncg1vlv3y0h4bplqyw18vq3srb3";
-    })
-  ];
-
   meta = {
     description = "Dump the Python traceback";
     license = stdenv.lib.licenses.bsd2;

From e109784f84d44cc73abeaa6c96c5a5d5bf9e3e06 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Apr 2018 07:10:23 +0200
Subject: [PATCH 0257/3370] .version: remove final newline

When reading the `nixpkgs` version from `.version` you always have a
`\n` at the end because of the final newline.

This issue exists since b7d15ed and had to be fixed several times
according to the history of `.version`.

Furthermore @Infinisil recommended I explicitly configured
`.editorconfig` to avoid newlines in `.version`.
---
 .editorconfig | 4 ++++
 .version      | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.editorconfig b/.editorconfig
index 7b40ff1ff568..f5df33889e6b 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -26,3 +26,7 @@ indent_size = 4
 # Match diffs, avoid to trim trailing whitespace
 [*.{diff,patch}]
 trim_trailing_whitespace = false
+
+# https://github.com/NixOS/nixpkgs/pull/39336#discussion_r183387754
+[.version]
+insert_final_newline = false
diff --git a/.version b/.version
index 770bde1f44b3..c1b80a502792 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-18.09
+18.09
\ No newline at end of file

From 3cd2707e370e4773954cb3fe84b768d648c5ed63 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Apr 2018 07:13:49 +0200
Subject: [PATCH 0258/3370] osquery: 2.5.2 -> 3.2.2

The package was originally broken as reported in #38940 and
facebook/osquery#4257. The latest version (3.x) contains several
important fixes for GCC 7, so now we can compile without a much less
complicated patches.

The following changes were needed to fix the derivation:

* Upgrade `osquery/third-party` to the latest rev to be compliant with
  osquery 3.

* Keep using an override for the AWS SDK (for a lower closure size and
  less compile time), but make the `ec2` API available.

* Added the dependencies `fpm`, `zstd`, `rdkafka`, `rapidjson` to the
  build. `linenoise-ng` is obsolete as it's directly bundled with
  `osquery/third-party`.

* Fixed the linking issue with `gflags` as recommended in the mailing
  list: https://groups.google.com/d/msg/nix-devel/l1blj-mWxtI/J3CwPATBCAAJ

* Dropped the obsolete dependencies `cpp-netlib`, `lz4`, `apt` and
  `devicemapper` (thanks @Infinisil).

* Override `OSQUERY_PLATFORM` to provide `nixos:version`
  for sandbox and non-NixOS based builds. The `platform-nixos.patch`
  file is now obsolete (thanks @flokli).

The patch was rebased against the 3.x branch of `osquery` and contains
mostly old changes. Additionally several testing targets were skipped as
they broke the build.

The functionality has been testing using the following command:

```
mkdir /tmp/osq.log/
./result/bin/osqueryd --pidfile /tmp/osq.pid \
  --database_path /tmp/test.db --logger_path /tmp/osq.log
```

With the daemon running the database can be queried easily using
`./result/bin/osqueryi`.

Fixes ticket #38940
See ticket #36453

Further reference can be gathered from the affected Hydra logs for
the master branch: https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.osquery.x86_64-linux
---
 pkgs/tools/system/osquery/default.nix         |  48 ++---
 pkgs/tools/system/osquery/misc.patch          | 195 ++++++++----------
 .../tools/system/osquery/platform-nixos.patch |  22 --
 3 files changed, 111 insertions(+), 154 deletions(-)
 delete mode 100644 pkgs/tools/system/osquery/platform-nixos.patch

diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index 44d5bcf5f38a..2a719efd79b3 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -1,59 +1,62 @@
 { stdenv, lib, fetchFromGitHub, pkgconfig, cmake, pythonPackages
 , udev, audit, aws-sdk-cpp, cryptsetup, lvm2, libgcrypt, libarchive
-, libgpgerror, libuuid, iptables, apt, dpkg, lzma, lz4, bzip2, rpm
+, libgpgerror, libuuid, iptables, dpkg, lzma, bzip2, rpm
 , beecrypt, augeas, libxml2, sleuthkit, yara, lldpd, google-gflags
-, thrift, boost, rocksdb_lite, cpp-netlib, glog, gbenchmark, snappy
-, openssl, linenoise-ng, file, doxygen, devicemapper
-, gtest, sqlite
+, thrift, boost, rocksdb_lite, glog, gbenchmark, snappy
+, openssl, file, doxygen
+, gtest, sqlite, fpm, zstd, rdkafka, rapidjson, path
 }:
 
 let
+
   thirdparty = fetchFromGitHub {
     owner = "osquery";
     repo = "third-party";
-    rev = "6919841175b2c9cb2dee8986e0cfe49191ecb868";
-    sha256 = "1kjxrky586jd1b2z1vs9cm7x1dxw51cizpys9kddiarapc2ih65j";
+    rev = "4ef099c31a1165c5e7e3a699f9e4b3eb68c3c3d9";
+    sha256 = "1vm0prw4dix0m51vkw9z0vwfd8698gqjw499q8h604hs1rvn6132";
   };
 
 in
 
 stdenv.mkDerivation rec {
   name = "osquery-${version}";
-  version = "2.5.2";
+  version = "3.2.2";
 
   # this is what `osquery --help` will show as the version.
   OSQUERY_BUILD_VERSION = version;
+  OSQUERY_PLATFORM = "nixos;${builtins.readFile "${toString path}/.version"}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "osquery";
     rev = version;
-    sha256 = "16isplk66qpvhrf041l0lxb4z6k7wwd1sg7kpsw2q6kivkxpnk3z";
+    sha256 = "0qwj4cy6m25sqwb0irqfqinipx50l4imnz1gqxx147vzfwb52jlq";
   };
 
-  patches = [ ./misc.patch ] ++ lib.optional stdenv.isLinux ./platform-nixos.patch;
+  patches = [ ./misc.patch ];
 
   nativeBuildInputs = [
-    pkgconfig cmake pythonPackages.python pythonPackages.jinja2
+    pkgconfig cmake pythonPackages.python pythonPackages.jinja2 doxygen fpm
   ];
 
-  buildInputs = [
+  buildInputs = let
+    gflags' = google-gflags.overrideAttrs (old: {
+      cmakeFlags = stdenv.lib.filter (f: isNull (builtins.match ".*STATIC.*" f)) old.cmakeFlags;
+    });
+  in [
     udev audit
 
     (aws-sdk-cpp.override {
-      apis = [ "firehose" "kinesis" "sts" ];
+      apis = [ "firehose" "kinesis" "sts" "ec2" ];
       customMemoryManagement = false;
     })
 
-    lvm2 libgcrypt libarchive libgpgerror libuuid iptables.dev apt dpkg
-    lzma lz4 bzip2 rpm beecrypt augeas libxml2 sleuthkit
-    yara lldpd google-gflags thrift boost
-    cpp-netlib glog gbenchmark snappy openssl linenoise-ng
-    file doxygen devicemapper cryptsetup
-    gtest sqlite
-
-    # need to be consistent about the malloc implementation
-    (rocksdb_lite.override { jemalloc = null; gperftools = null; })
+    lvm2 libgcrypt libarchive libgpgerror libuuid iptables dpkg
+    lzma bzip2 rpm beecrypt augeas libxml2 sleuthkit
+    yara lldpd gflags' thrift boost
+    glog gbenchmark snappy openssl
+    file cryptsetup
+    gtest sqlite zstd rdkafka rapidjson rocksdb_lite
   ];
 
   preConfigure = ''
@@ -74,7 +77,6 @@ stdenv.mkDerivation rec {
     homepage = https://osquery.io/;
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ cstrahan ];
-    broken = true; # 2018-04-11
+    maintainers = with maintainers; [ cstrahan ma27 ];
   };
 }
diff --git a/pkgs/tools/system/osquery/misc.patch b/pkgs/tools/system/osquery/misc.patch
index 1a0ef267f0df..acdbf6346c83 100644
--- a/pkgs/tools/system/osquery/misc.patch
+++ b/pkgs/tools/system/osquery/misc.patch
@@ -1,33 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a976a46d..408ac308 100644
+index b8eb5a16..319d81dc 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -125,14 +125,13 @@ else()
-     set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libc++")
-   else()
-     set(LINUX TRUE)
--    set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14 -stdlib=libstdc++")
-+    set(CXX_COMPILE_FLAGS "${CXX_COMPILE_FLAGS} -std=c++14")
-   endif()
-   set(POSIX TRUE)
- endif()
- 
- if(POSIX)
-   add_compile_options(
--    -Qunused-arguments
-     -Wstrict-aliasing
-     -Wno-missing-field-initializers
-     -Wno-unused-local-typedef
-@@ -154,7 +153,6 @@ if(POSIX)
-   )
-   if(NOT FREEBSD)
-     add_compile_options(
--      -Werror=shadow
-       -fvisibility=hidden
-       -fvisibility-inlines-hidden
-     )
-@@ -372,12 +370,6 @@ elseif(NOT FREEBSD)
-   endif()
+@@ -447,12 +447,6 @@ elseif(CLANG AND DEPS AND NOT FREEBSD)
+   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flto=thin")
  endif()
  
 -if(NOT IS_DIRECTORY "${CMAKE_SOURCE_DIR}/third-party/sqlite3")
@@ -39,7 +15,7 @@ index a976a46d..408ac308 100644
  # Make sure deps were built before compiling (else show warning).
  execute_process(
    COMMAND "${CMAKE_SOURCE_DIR}/tools/provision.sh" check "${CMAKE_BINARY_DIR}"
-@@ -439,6 +431,8 @@ endif()
+@@ -518,6 +512,8 @@ endif()
  
  if(APPLE)
    LOG_PLATFORM("OS X")
@@ -48,87 +24,67 @@ index a976a46d..408ac308 100644
  elseif(OSQUERY_BUILD_PLATFORM STREQUAL "debian")
    LOG_PLATFORM("Debian")
  elseif(OSQUERY_BUILD_PLATFORM STREQUAL "ubuntu")
-@@ -477,7 +471,6 @@ if(POSIX)
-   include_directories("${BUILD_DEPS}/include/openssl")
+@@ -567,7 +563,6 @@ if(POSIX AND DEPS)
+   endif()
  endif()
  
 -include_directories("${CMAKE_SOURCE_DIR}/third-party/sqlite3")
  include_directories("${CMAKE_SOURCE_DIR}/include")
  include_directories("${CMAKE_SOURCE_DIR}")
  
-@@ -559,21 +552,10 @@ else()
-   set(GTEST_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=0")
+@@ -655,18 +650,6 @@ if(FREEBSD OR "${HAVE_TR1_TUPLE}" STREQUAL "")
+   add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=0)
  endif()
  
 -set(GTEST_FLAGS
--  ${GTEST_FLAGS}
 -  "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googletest/include"
 -  "-I${CMAKE_SOURCE_DIR}/third-party/googletest/googlemock/include"
 -)
 -join("${GTEST_FLAGS}" " " GTEST_FLAGS)
 -
- set(BUILD_GTEST TRUE)
- 
--add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest")
+-if(NOT SKIP_TESTS)
+-  add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/googletest")
+-endif()
 -
- include(Thrift)
- 
 -add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/sqlite3")
 -
- add_subdirectory(osquery)
- add_subdirectory(tools/tests)
- 
-diff --git a/include/osquery/core.h b/include/osquery/core.h
-index b597edee..b0628037 100644
---- a/include/osquery/core.h
-+++ b/include/osquery/core.h
-@@ -15,8 +15,9 @@
- #include <string>
- #include <vector>
- 
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
- #include <boost/thread/shared_mutex.hpp>
-+#include <boost/thread/recursive_mutex.hpp>
- #else
- #include <shared_mutex>
- #endif
-@@ -188,7 +189,7 @@ inline bool isPlatform(PlatformType a, const PlatformType& t = kPlatformType) {
-   return (static_cast<int>(t) & static_cast<int>(a)) != 0;
- }
- 
--#if defined(__APPLE__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__linux__)
- #define MUTEX_IMPL boost
- #else
- #define MUTEX_IMPL std
-@@ -204,10 +205,10 @@ using WriteLock = MUTEX_IMPL::unique_lock<Mutex>;
- using ReadLock = MUTEX_IMPL::shared_lock<Mutex>;
- 
- /// Helper alias for defining recursive mutexes.
--using RecursiveMutex = std::recursive_mutex;
-+using RecursiveMutex = MUTEX_IMPL::recursive_mutex;
- 
- /// Helper alias for write locking a recursive mutex.
--using RecursiveLock = std::lock_guard<std::recursive_mutex>;
-+using RecursiveLock = MUTEX_IMPL::lock_guard<MUTEX_IMPL::recursive_mutex>;
- }
- 
- /**
+ if(NOT FREEBSD)
+   add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/linenoise-ng")
+ endif()
 diff --git a/osquery/CMakeLists.txt b/osquery/CMakeLists.txt
-index 77913d31..671b20d4 100644
+index 1c8201ee..a89e6821 100644
 --- a/osquery/CMakeLists.txt
 +++ b/osquery/CMakeLists.txt
-@@ -57,7 +57,7 @@ endif()
+@@ -35,8 +35,6 @@ if(CLANG AND POSIX)
+     -Wextra
+     -pedantic
+     -Wuseless-cast
+-    -Wno-c99-extensions
+-    -Wno-zero-length-array
+     -Wno-unused-parameter
+     -Wno-gnu-case-range
+     -Weffc++
+@@ -61,14 +59,7 @@ endif()
  
  # Construct a set of all object files, starting with third-party and all
  # of the osquery core objects (sources from ADD_CORE_LIBRARY macros).
--set(OSQUERY_OBJECTS $<TARGET_OBJECTS:osquery_sqlite>)
-+set(OSQUERY_OBJECTS "")
+-if(FREEBSD)
+-  set(OSQUERY_OBJECTS $<TARGET_OBJECTS:osquery_sqlite>)
+-else()
+-  set(OSQUERY_OBJECTS
+-    $<TARGET_OBJECTS:osquery_sqlite>
+-    $<TARGET_OBJECTS:linenoise-ng>
+-  )
+-endif()
++set(OSQUERY_OBJECTS $<TARGET_OBJECTS:linenoise-ng>)
  
  # Add subdirectories
  add_subdirectory(config)
-@@ -138,6 +138,8 @@ elseif(FREEBSD)
+@@ -147,10 +138,11 @@ if(APPLE OR LINUX)
+   ADD_OSQUERY_LINK_ADDITIONAL("rocksdb_lite")
+ elseif(FREEBSD)
+   ADD_OSQUERY_LINK_CORE("icuuc")
+-  ADD_OSQUERY_LINK_CORE("linenoise")
    ADD_OSQUERY_LINK_ADDITIONAL("rocksdb-lite")
  endif()
  
@@ -137,41 +93,62 @@ index 77913d31..671b20d4 100644
  if(POSIX)
    ADD_OSQUERY_LINK_CORE("boost_system")
    ADD_OSQUERY_LINK_CORE("boost_filesystem")
-@@ -157,6 +159,7 @@ ADD_OSQUERY_LINK_ADDITIONAL("cppnetlib-client-connections${WO_KEY}")
+@@ -168,6 +160,8 @@ endif()
  ADD_OSQUERY_LINK_CORE("glog${WO_KEY}")
  
  if(POSIX)
 +  ADD_OSQUERY_LINK_ADDITIONAL("benchmark")
-   ADD_OSQUERY_LINK_ADDITIONAL("snappy")
++  ADD_OSQUERY_LINK_ADDITIONAL("snappy")
    ADD_OSQUERY_LINK_ADDITIONAL("ssl")
    ADD_OSQUERY_LINK_ADDITIONAL("crypto")
-@@ -336,13 +339,6 @@ if(NOT OSQUERY_BUILD_SDK_ONLY)
- 
-   install(DIRECTORY "${CMAKE_SOURCE_DIR}/packs/"
-     DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/packs" COMPONENT main)
--  if(APPLE)
--    install(FILES "${CMAKE_SOURCE_DIR}/tools/deployment/com.facebook.osqueryd.plist"
--      DESTINATION "${CMAKE_INSTALL_PREFIX}/share/osquery/" COMPONENT main)
--  else()
--    install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/deployment/osqueryd.initd"
--      DESTINATION "/etc/init.d/" RENAME "osqueryd" COMPONENT main)
--  endif()
+   ADD_OSQUERY_LINK_ADDITIONAL("libpthread")
+diff --git a/osquery/extensions/CMakeLists.txt b/osquery/extensions/CMakeLists.txt
+index 52f3bf80..066ed1c0 100644
+--- a/osquery/extensions/CMakeLists.txt
++++ b/osquery/extensions/CMakeLists.txt
+@@ -60,12 +60,6 @@ else()
+   )
  endif()
  
- if(NOT SKIP_TESTS)
-diff --git a/osquery/tables/system/linux/tests/md_tables_tests.cpp b/osquery/tables/system/linux/tests/md_tables_tests.cpp
-index 126be362..119d361d 100644
---- a/osquery/tables/system/linux/tests/md_tables_tests.cpp
-+++ b/osquery/tables/system/linux/tests/md_tables_tests.cpp
-@@ -72,7 +72,7 @@ void GetDrivesForArrayTestHarness(std::string arrayName,
-   EXPECT_CALL(md, getArrayInfo(arrayDevPath, _))
-       .WillOnce(DoAll(SetArgReferee<1>(arrayInfo), Return(true)));
+-if(NOT WINDOWS)
+-  add_compile_options(
+-    -Wno-macro-redefined
+-  )
+-endif()
+-
+ ADD_OSQUERY_LIBRARY(TRUE osquery_extensions
+   ${THRIFT_GENERATED_FILES}
+   ${THRIFT_IMPL_FILE}
+diff --git a/osquery/logger/CMakeLists.txt b/osquery/logger/CMakeLists.txt
+index ab91bd24..d8364991 100644
+--- a/osquery/logger/CMakeLists.txt
++++ b/osquery/logger/CMakeLists.txt
+@@ -55,9 +55,9 @@ if(NOT SKIP_KAFKA AND NOT WINDOWS AND NOT FREEBSD)
  
--  Sequence::Sequence s1;
-+  Sequence s1;
-   for (int i = 0; i < MD_SB_DISKS; i++) {
-     mdu_disk_info_t diskInfo;
-     diskInfo.number = i;
+   ADD_OSQUERY_LINK_ADDITIONAL("rdkafka")
+ 
+-  set(OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS
+-    "logger/plugins/tests/kafka_producer_tests.cpp"
+-  )
++  #set(OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS
++  #  "logger/plugins/tests/kafka_producer_tests.cpp"
++  #)
+ 
+   ADD_OSQUERY_TEST_ADDITIONAL(${OSQUERY_LOGGER_KAFKA_PLUGINS_TESTS})
+ endif()
+diff --git a/osquery/tables/CMakeLists.txt b/osquery/tables/CMakeLists.txt
+index dd78084f..158758e1 100644
+--- a/osquery/tables/CMakeLists.txt
++++ b/osquery/tables/CMakeLists.txt
+@@ -68,7 +68,7 @@ if(LINUX)
+   set(TABLE_PLATFORM "linux")
+ 
+   ADD_OSQUERY_LINK_ADDITIONAL("libresolv.so")
+-  ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app lvm-internal daemonclient")
++  ADD_OSQUERY_LINK_ADDITIONAL("cryptsetup devmapper lvm2app")
+   ADD_OSQUERY_LINK_ADDITIONAL("gcrypt gpg-error")
+   ADD_OSQUERY_LINK_ADDITIONAL("blkid")
+   ADD_OSQUERY_LINK_ADDITIONAL("ip4tc")
 diff --git a/specs/windows/services.table b/specs/windows/services.table
 index 4ac24ee9..657d8b99 100644
 --- a/specs/windows/services.table
diff --git a/pkgs/tools/system/osquery/platform-nixos.patch b/pkgs/tools/system/osquery/platform-nixos.patch
deleted file mode 100644
index 7e1afcb640b3..000000000000
--- a/pkgs/tools/system/osquery/platform-nixos.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/tools/get_platform.py b/tools/get_platform.py
-index 3dd34516..f53ca83a 100644
---- a/tools/get_platform.py
-+++ b/tools/get_platform.py
-@@ -26,6 +26,8 @@ DEBIAN_VERSION = "/etc/debian_version"
- GENTOO_RELEASE = "/etc/gentoo-release"
- 
- def _platform():
-+    return ("nixos", "nixos")
-+
-     osType, _, _, _, _, _ = platform.uname()
- 
-     if osType == "Windows":
-@@ -75,6 +77,8 @@ def _platform():
-         return (None, osType.lower())
- 
- def _distro(osType):
-+    return "unknown_version"
-+
-     def getRedhatDistroVersion(pattern):
-         with open(SYSTEM_RELEASE, "r") as fd:
-             contents = fd.read()

From 56df1aca245d2a415301d560366da637f081670c Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Tue, 24 Apr 2018 06:47:44 +0000
Subject: [PATCH 0259/3370] powerline-go: 1.8.2 -> 1.10.0

---
 pkgs/tools/misc/powerline-go/default.nix |  4 ++--
 pkgs/tools/misc/powerline-go/deps.nix    | 29 ++++++++++++++++--------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index 4e465e7ea1ca..e31c0da6306a 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "powerline-go";
-  version = "1.8.2";
+  version = "1.10.0";
   name = "${pname}-${version}";
   rev = "v${version}";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "justjanne";
     repo = pname;
     inherit rev;
-    sha256 = "1q45hxbrnx0mgi7z1rqkxp47dk8yf4mzy62i0027fhr65aifq6xj";
+    sha256 = "1bmgim61cx6i4m24a474nm3w4zqjflm0wnw3y24299n9dj14izs3";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/misc/powerline-go/deps.nix b/pkgs/tools/misc/powerline-go/deps.nix
index a3276ab229bb..78e28efb3b10 100644
--- a/pkgs/tools/misc/powerline-go/deps.nix
+++ b/pkgs/tools/misc/powerline-go/deps.nix
@@ -5,8 +5,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-runewidth";
-      rev = "a9d6d1e4dc51df2130326793d49971f238839169";
-      sha256 = "1x6x5r6ijik5ardfrpncjbqvpv8j5m7yb94svzz83a15ln44ajmg";
+      rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+    };
+  }
+  {
+    goPackagePath = "github.com/shirou/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/gopsutil";
+      rev = "63047d776e07105e370af46ecbd0ae96850f5ef2";
+      sha256 = "0204f0gx3fd8ya6rb478a7a4gr2v4i3m71148iv3jrdfvr5q5aaw";
     };
   }
   {
@@ -14,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "91a49db82a88618983a78a06c1cbd4e00ab749ab";
-      sha256 = "1xb4vlshx76xany4w60dkpz67plyfk7nr97pinf1bbha32pi36jc";
+      rev = "2b6c08872f4b66da917bb4ce98df4f0307330f78";
+      sha256 = "07wgdhs7ac3qmx0lfr4zazg2l159jqbwmn7jx49rr9811vivl1yh";
     };
   }
   {
@@ -23,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "dd2ff4accc098aceecb86b36eaa7829b2a17b1c9";
-      sha256 = "086j1kk56vm1m5m9sf3lcww9phqw6p2q3g0is1jn4ixfxd3wm2wg";
+      rev = "79b0c6888797020a994db17c8510466c72fe75d9";
+      sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag";
     };
   }
   {
@@ -32,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "b7ef84aaf62aa3e70962625c80a571ae7c17cb40";
-      sha256 = "0xfb515f3bmcq15sq1cm641qwgsmq1w5xjdx2mhwgns770jngndd";
+      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
+      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
     };
   }
   {
@@ -41,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "7f97868eec74b32b0982dd158a51a446d1da7eb5";
-      sha256 = "0a31jd1p00b9c82f3sfsbv2bdh7mlfy9vhcqxipll2cyvxplgfq8";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
     };
   }
 ]

From 6799fcb42b25b41e9674f459c6817d232192d6fa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Apr 2018 11:57:56 +0200
Subject: [PATCH 0260/3370] R: 3.4.4 -> 3.5.0

Unfortunately, the new version fails its test suite AGAIN when the recommended
packages are not build. Makes one wonder whether maybe we should offer the R
developers CI builds that check this. I've reported the issue upstream, let's
see what happens.
---
 pkgs/applications/science/math/R/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index a9b2de1a00c5..953f4e62c22b 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -7,11 +7,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.4.4";
+  name = "R-3.5.0";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "0dq3jsnwsb5j3fhl0wi3p5ycv8avf8s5j1y4ap3d2mkjmcppvsdk";
+    sha256 = "0w38865laqg28cdhikxdxhx4rfp0kgcn72gakwypsy91br9ja5zx";
   };
 
   buildInputs = [
@@ -65,7 +65,8 @@ stdenv.mkDerivation rec {
 
   installTargets = [ "install" "install-info" "install-pdf" ];
 
-  doCheck = true;
+  doCheck = withRecommendedPackages;  # R 3.5.0 fails the test suite if the
+                                      # recommended packages are not built
   preCheck = "export TZ=CET; bin/Rscript -e 'sessionInfo()'";
 
   enableParallelBuilding = true;

From 94295e3cee960f54789353cb41cbc00c5ced3afc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Apr 2018 21:26:52 +0200
Subject: [PATCH 0261/3370] R: update CRAN and BIOC package sets

---
 .../r-modules/bioc-experiment-packages.nix    |    6 +-
 pkgs/development/r-modules/bioc-packages.nix  |  108 +-
 pkgs/development/r-modules/cran-packages.nix  | 2314 +++++++++--------
 pkgs/development/r-modules/default.nix        |    2 -
 4 files changed, 1335 insertions(+), 1095 deletions(-)

diff --git a/pkgs/development/r-modules/bioc-experiment-packages.nix b/pkgs/development/r-modules/bioc-experiment-packages.nix
index 220ac60486b8..f323532ad7d9 100644
--- a/pkgs/development/r-modules/bioc-experiment-packages.nix
+++ b/pkgs/development/r-modules/bioc-experiment-packages.nix
@@ -70,7 +70,7 @@ in with self; {
   HelloRangesData = derive2 { name="HelloRangesData"; version="1.4.0"; sha256="1c7gfhwr9g6hv0p3s4yd8v9rhjp3jmrnzsqsqq4ysc2i24nf7drr"; depends=[]; };
   HiCDataHumanIMR90 = derive2 { name="HiCDataHumanIMR90"; version="0.112.0"; sha256="1qxg7650lbfbjl9p75clrybsdbzd0yzpi8pi2biv83jgqkkjrd0b"; depends=[]; };
   HiCDataLymphoblast = derive2 { name="HiCDataLymphoblast"; version="1.14.0"; sha256="0708xgm495a330h70yi2qd494h6gf0n46j016mw9bc4gzbb7aq9p"; depends=[]; };
-  Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.14.0"; sha256="0lah9l8gd5gs1wj68l9hqakcwha0rl88dg2p0zk92nff64jxn3pj"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; };
+  Hiiragi2013 = derive2 { name="Hiiragi2013"; version="1.14.1"; sha256="0b47hi6di0gy4f8bzhsjm5ag5jhqqsgh5h19h4lwr5jcg2710ang"; depends=[affy Biobase boot clue cluster genefilter geneplotter gplots gtools KEGGREST lattice latticeExtra MASS mouse4302_db RColorBrewer xtable]; };
   HumanAffyData = derive2 { name="HumanAffyData"; version="1.4.0"; sha256="0xgb3rrvgrx6sdwbb8gb1q8mgf0s2giih8l8d3hzvnxazh80qs8b"; depends=[Biobase ExperimentHub]; };
   IHWpaper = derive2 { name="IHWpaper"; version="1.6.0"; sha256="08gkdi1lra9mn1cbsqddqn3pwj3pfy2yfgzay5igr7n1akfmgh7k"; depends=[Biobase BiocGenerics BiocParallel cowplot DESeq2 dplyr fdrtool genefilter ggplot2 IHW qvalue Rcpp SummarizedExperiment]; };
   ITALICSData = derive2 { name="ITALICSData"; version="2.16.0"; sha256="1rrfxc3hzlq2i0z5j432w3s33ln56i91a06q49piisz06vviz6yv"; depends=[]; };
@@ -260,7 +260,7 @@ in with self; {
   lungExpression = derive2 { name="lungExpression"; version="0.16.0"; sha256="09v9r6rmfcqprqd1rx53sa4dhjjmg6d9649vlhfhzkyc73yknwmb"; depends=[Biobase]; };
   lydata = derive2 { name="lydata"; version="1.4.0"; sha256="0dflfp14gdjgy7qf3my0vas5zbg77l16li7xgv1924cry11w2dxx"; depends=[]; };
   mAPKLData = derive2 { name="mAPKLData"; version="1.10.0"; sha256="1bfx4imb5yg17n0g1ag436zlks4jcp8ga0xj9wyh9bhx4miwyay4"; depends=[]; };
-  mammaPrintData = derive2 { name="mammaPrintData"; version="1.14.0"; sha256="0ks72wnagdvnbilqcsvl5lbhgh64fhbfys0da03336f1z16f5lv9"; depends=[]; };
+  mammaPrintData = derive2 { name="mammaPrintData"; version="1.14.2"; sha256="04ymimgj8ng5qgvq0cglmhcxv7a3jqx9a2zyg8lwiwzpyip18inx"; depends=[]; };
   maqcExpression4plex = derive2 { name="maqcExpression4plex"; version="1.22.0"; sha256="0hn20i11vl9x23mx283aki097r1a8rspagac821kmlwghyab1mxq"; depends=[]; };
   metaMSdata = derive2 { name="metaMSdata"; version="1.14.0"; sha256="1iygqxymvb98cm325bmdqb34n9b4k1vdzdyzcq8a0gh1dvs2m0iw"; depends=[]; };
   methyvimData = derive2 { name="methyvimData"; version="1.0.0"; sha256="1b2mvcawafkr15py8h9j10w5givifi99h9clbdmkgfyixbbh0m94"; depends=[minfi]; };
@@ -287,7 +287,7 @@ in with self; {
   pcaGoPromoter_Hs_hg19 = derive2 { name="pcaGoPromoter.Hs.hg19"; version="1.14.0"; sha256="137lj4j0hlz3mkwyf334xr3bpm9j2jg1cd2sw9203kx6hvk92i2z"; depends=[]; };
   pcaGoPromoter_Mm_mm9 = derive2 { name="pcaGoPromoter.Mm.mm9"; version="1.14.0"; sha256="0kb62bm1a8m88g59v6553qg69rmv0gh0wy4yfkqvn2sgz51zk4r4"; depends=[]; };
   pcaGoPromoter_Rn_rn4 = derive2 { name="pcaGoPromoter.Rn.rn4"; version="1.14.0"; sha256="0b3cak7nzd6qxr7gnly4246gjdhxyp8h0w5dr1xsgwd9zy1k0psw"; depends=[]; };
-  pcxnData = derive2 { name="pcxnData"; version="1.0.0"; sha256="0bkzqac0b2x1f398bflv077dp6nb3ysdf75jcwxpj4nwyhcb7n4f"; depends=[]; };
+  pcxnData = derive2 { name="pcxnData"; version="2.0.0"; sha256="10qhw7v1nzf4y9xhd34jiimcyi6lgjy6y9zc6kzk80hm6qiry8j2"; depends=[]; };
   pd_atdschip_tiling = derive2 { name="pd.atdschip.tiling"; version="0.16.0"; sha256="1ilwm4nx232dll01xqqvagq3qi6qa060v84y20ihxhfwdm46z0ci"; depends=[Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
   pepDat = derive2 { name="pepDat"; version="0.112.0"; sha256="15v4yk9cpnz2k16ka4iyc61ji5ck9mlkabgzxalwfnz77ri23mk0"; depends=[GenomicRanges]; };
   plasFIA = derive2 { name="plasFIA"; version="1.6.0"; sha256="0p3pbjm5ww24ax7h72m38l0rcm01w5a4h8j5rsgynczvfv9jlwjq"; depends=[proFIA]; };
diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix
index 2d98b23a8671..efb91b43bb04 100644
--- a/pkgs/development/r-modules/bioc-packages.nix
+++ b/pkgs/development/r-modules/bioc-packages.nix
@@ -38,7 +38,7 @@ in with self; {
   AnnotationForge = derive2 { name="AnnotationForge"; version="1.20.0"; sha256="01vbrf76vqfvxh6vpfxkjwccxggnha3byqzj333glqz2b6kwx5q1"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl RSQLite S4Vectors XML]; };
   AnnotationFuncs = derive2 { name="AnnotationFuncs"; version="1.28.0"; sha256="1g6y7bwk573yaays0fmlicxq2452sli0kv41bq8sh4ja2l5jh5i6"; depends=[AnnotationDbi DBI]; };
   AnnotationHub = derive2 { name="AnnotationHub"; version="2.10.1"; sha256="14v8g44a6zg9j2rwn9x9y8509k0wr2cw8yccliz24glplb40wva4"; depends=[AnnotationDbi BiocGenerics BiocInstaller curl httr interactiveDisplayBase RSQLite S4Vectors yaml]; };
-  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.8.0"; sha256="1nsai8a2vf5jwczd4k3vbdd9xbn6dfg6dydvf4byklxj6pk6vi97"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; };
+  AnnotationHubData = derive2 { name="AnnotationHubData"; version="1.8.1"; sha256="08pvswszxnbr6b3amg2g2353iil2bm9bs571c6lf4v8z0z1by8g5"; depends=[AnnotationDbi AnnotationForge AnnotationHub Biobase BiocGenerics BiocInstaller biocViews Biostrings DBI futile_logger GenomeInfoDb GenomicFeatures GenomicRanges GEOquery IRanges jsonlite OrganismDbi rBiopaxParser RCurl Rsamtools RSQLite rtracklayer S4Vectors XML]; };
   ArrayExpress = derive2 { name="ArrayExpress"; version="1.38.0"; sha256="01kb4322pfl9w6za6glb777hdyc8j36xs6flz3b11n1mjryipz7c"; depends=[Biobase limma oligo XML]; };
   ArrayExpressHTS = derive2 { name="ArrayExpressHTS"; version="1.28.0"; sha256="04qnxgywyxww8xd6r8vgy8sglbixd25749dmbsw0wgqk6zcgysim"; depends=[Biobase BiocGenerics biomaRt Biostrings bitops DESeq edgeR GenomicRanges Hmisc IRanges R2HTML RColorBrewer rJava Rsamtools sampling sendmailR ShortRead snow svMisc XML]; };
   ArrayTV = derive2 { name="ArrayTV"; version="1.16.0"; sha256="1hn5dngk4civwzx1w2py1n9g1k1jv3kwrj6z6ysvfsfi4q668341"; depends=[DNAcopy foreach oligoClasses S4Vectors]; };
@@ -47,7 +47,7 @@ in with self; {
   BAC = derive2 { name="BAC"; version="1.38.0"; sha256="04s7fbb8b4is97alj64p86jnh1lgf4a0n02wg3g9rvd75jxmzbai"; depends=[]; };
   BADER = derive2 { name="BADER"; version="1.16.0"; sha256="05p006rqydnvz5a8gdbara9fsyn51b5flc05j593bvvlmkc6anl5"; depends=[]; };
   BAGS = derive2 { name="BAGS"; version="2.18.0"; sha256="1qhmrz6ffhhsbnmcc0xmb64psv50b1jd1gxkjhhv479mcfl6mk06"; depends=[Biobase breastCancerVDX]; };
-  BASiCS = derive2 { name="BASiCS"; version="1.0.0"; sha256="15yby5dz0hizr76bpa5clrpfh1ycvpkk11i7y7ak164ikzxvvmd9"; depends=[BiocGenerics coda data_table KernSmooth matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; };
+  BASiCS = derive2 { name="BASiCS"; version="1.0.1"; sha256="02acpq0mrdr8l3xa3k32k2mq8k96c95gm9603m5z5z3x3npjdzq7"; depends=[BiocGenerics coda data_table KernSmooth matrixStats Rcpp RcppArmadillo S4Vectors scran SingleCellExperiment SummarizedExperiment testthat]; };
   BBCAnalyzer = derive2 { name="BBCAnalyzer"; version="1.8.0"; sha256="0fv5gyzfv0093dlyrlci9d88fcb0ifgljxwivrxpkbbsll5vrpxh"; depends=[Biostrings GenomicRanges IRanges Rsamtools SummarizedExperiment VariantAnnotation]; };
   BCRANK = derive2 { name="BCRANK"; version="1.40.0"; sha256="0vbjskazhm5v4lmwdc456r5vl2v848ldqrzbdjrdxjlvd72wfprw"; depends=[Biostrings]; };
   BEAT = derive2 { name="BEAT"; version="1.16.0"; sha256="0x4k45qgzwv6m00zq1jhbhc2aa5slgg5p4g8g909vajc75fpp6g7"; depends=[Biostrings BSgenome GenomicRanges ShortRead]; };
@@ -83,13 +83,13 @@ in with self; {
   Biobase = derive2 { name="Biobase"; version="2.38.0"; sha256="1cgm1ja1kp56zdlzyy9ggbkfn8r2vbsd4hncmz8g4hjd47fg18kg"; depends=[BiocGenerics]; };
   BiocCaseStudies = derive2 { name="BiocCaseStudies"; version="1.40.0"; sha256="0hwmqv8nimc8gl1c5a72ckmgag5j8886ab62i1irlkfis5x2rj8m"; depends=[Biobase]; };
   BiocCheck = derive2 { name="BiocCheck"; version="1.14.0"; sha256="1nzp8kgw13z9pgf885rplj6k37jcldfhbz0adqclxr2gq0yalmyx"; depends=[BiocInstaller biocViews codetools graph httr optparse stringdist]; };
-  BiocFileCache = derive2 { name="BiocFileCache"; version="1.2.2"; sha256="111rrzz366kmqs1v8jx5ck0kb0xs42f250m5i0sn65ypvg9ag504"; depends=[DBI dbplyr dplyr httr rappdirs RSQLite]; };
+  BiocFileCache = derive2 { name="BiocFileCache"; version="1.2.3"; sha256="0fam0j8kwf9kfbvh4h7q4m53via75c5wnbn2g55cv3d37hikbpsm"; depends=[DBI dbplyr dplyr httr rappdirs RSQLite]; };
   BiocGenerics = derive2 { name="BiocGenerics"; version="0.24.0"; sha256="03wxvhxyrhipbgcg83lqlfn7p9gbzzrnl48y0dq7303xgp232zai"; depends=[]; };
   BiocInstaller = derive2 { name="BiocInstaller"; version="1.28.0"; sha256="19fga27bv6q9v5mpil74y76lahmnwvpg2h33rdx1r79nvljkd19d"; depends=[]; };
   BiocParallel = derive2 { name="BiocParallel"; version="1.12.0"; sha256="13ng3n2wsgl3fh0v6jnz3vg51k5c1sh44pqdvblcrcd1qyjmmqhd"; depends=[BH futile_logger snow]; };
   BiocSklearn = derive2 { name="BiocSklearn"; version="1.0.2"; sha256="1zpfb7g353c01ffldrx7251919r6giy58s19w78jf0bslagblv4y"; depends=[BBmisc knitr reticulate SummarizedExperiment]; };
   BiocStyle = derive2 { name="BiocStyle"; version="2.6.1"; sha256="03pp04pkcq99kdv2spzr995h2cxsza7l6w3d4gp4112m06prcybm"; depends=[bookdown knitr rmarkdown yaml]; };
-  BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.4.1"; sha256="13xcsd4c2l9jrcbl8axrragk4g2x6sp6xrk5r4gcligdicgxpq9l"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown stringr]; };
+  BiocWorkflowTools = derive2 { name="BiocWorkflowTools"; version="1.4.2"; sha256="1nfph17y36vkji7yyvmkry134s4naml256p6687ag53klqxvvz7x"; depends=[BiocStyle bookdown git2r httr knitr rmarkdown stringr]; };
   Biostrings = derive2 { name="Biostrings"; version="2.46.0"; sha256="0vg50qdlxqcm2d6axjnzg8wh8pr4c5gz03l8bdl0llmwzp0zclzk"; depends=[BiocGenerics IRanges S4Vectors XVector]; };
   BitSeq = derive2 { name="BitSeq"; version="1.22.0"; sha256="1xkmvzv2kdla3mrarlw21w1hz788w71443jbn36a8dc4p6wrnxhy"; depends=[IRanges Rsamtools S4Vectors zlibbioc]; };
   BrainStars = derive2 { name="BrainStars"; version="1.22.0"; sha256="0fipnpjpsp462dsfsvcrnysca4vsq2k6z15a6mxfxvqs1gybhvvj"; depends=[Biobase RCurl RJSONIO]; };
@@ -129,7 +129,7 @@ in with self; {
   CNVtools = derive2 { name="CNVtools"; version="1.72.0"; sha256="0ihmgg5f0p7yhg0273jb785fcrhcw704vz8r6ban8c63wk0qbqb5"; depends=[survival]; };
   CODEX = derive2 { name="CODEX"; version="1.10.0"; sha256="1knfgii0n8grn4436aksk7f2xkk93ih2snvrp7p8pkr206kqadnq"; depends=[Biostrings BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb IRanges Rsamtools S4Vectors]; };
   COHCAP = derive2 { name="COHCAP"; version="1.24.0"; sha256="1ggxn35hif4x4k1rbnxinf0pdqbg1n53wym9rm5zs6cnya4aimgj"; depends=[COHCAPanno gplots RColorBrewer WriteXLS]; };
-  COMPASS = derive2 { name="COMPASS"; version="1.16.0"; sha256="1x1vcn37nr4mcx5q8zahyg654gbx0srxckxvz6shvprpdvgs83sn"; depends=[abind clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang scales tidyr]; };
+  COMPASS = derive2 { name="COMPASS"; version="1.16.2"; sha256="1g9y5gryy1r8sg75008v3b2a1l2wkxvf8h5bnljnkc0wsd4f4nvb"; depends=[abind clue data_table dplyr knitr magrittr pdist plyr RColorBrewer Rcpp reshape2 rlang scales tidyr]; };
   CONFESS = derive2 { name="CONFESS"; version="1.6.0"; sha256="0kmvhwyzxz9ahvvzicigxal3r4ya8y5i090m7pi7d1p5arir7djl"; depends=[changepoint cluster contrast data_table EBImage ecp flexmix flowClust flowCore flowMeans flowMerge flowPeaks foreach ggplot2 limma MASS moments outliers plotrix raster readbitmap reshape2 SamSPECTRAL waveslim wavethresh zoo]; };
   CORREP = derive2 { name="CORREP"; version="1.44.0"; sha256="10bjv02x2xzanajfbsvbxd7s2s07z0gydx1ypmbfym41jjwac9ra"; depends=[e1071]; };
   COSNet = derive2 { name="COSNet"; version="1.12.0"; sha256="0x5kg4c5ml7ndqq81k5jy07fyra4q6nhhly6v7qd98gpmvrj6gnk"; depends=[]; };
@@ -193,7 +193,7 @@ in with self; {
   DEP = derive2 { name="DEP"; version="1.0.1"; sha256="0glkq6xlhcsr364zl4nkc7g3gnscv0yb3kcyvhzgm3bbfvd9q7ac"; depends=[assertthat Biobase broom circlize ComplexHeatmap dplyr DT fdrtool ggplot2 ggrepel gridExtra imputeLCMD limma MSnbase purrr RColorBrewer readr rmarkdown shiny shinydashboard SummarizedExperiment tibble tidyr vsn]; };
   DESeq = derive2 { name="DESeq"; version="1.30.0"; sha256="0mn5w3cy16iwwk8zxs7za6aa6cnrca75z0g45zd5zh1py5d7nfv9"; depends=[Biobase BiocGenerics genefilter geneplotter lattice locfit MASS RColorBrewer]; };
   DESeq2 = derive2 { name="DESeq2"; version="1.18.1"; sha256="1iyimg1s0x5pdmvl8x08s8h0v019y0nhjzs50chagbpk2x91fsmv"; depends=[Biobase BiocGenerics BiocParallel genefilter geneplotter GenomicRanges ggplot2 Hmisc IRanges locfit Rcpp RcppArmadillo S4Vectors SummarizedExperiment]; };
-  DEXSeq = derive2 { name="DEXSeq"; version="1.24.3"; sha256="0xip73hlbr3zry9d7ly9vvvsbb3xjcmfa09lr9fdy528dwjrf084"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
+  DEXSeq = derive2 { name="DEXSeq"; version="1.24.4"; sha256="1a80yv742fx5c7qav7imsdybphf0d5bixsqyf8w5zng7fk8j16d5"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel biomaRt DESeq2 genefilter geneplotter GenomicRanges hwriter IRanges RColorBrewer Rsamtools S4Vectors statmod stringr SummarizedExperiment]; };
   DEsubs = derive2 { name="DEsubs"; version="1.4.0"; sha256="1i9blymzj18r9646vac9grrjxw6xar8m6chn1dgdila17jag1wlp"; depends=[circlize DESeq DESeq2 EBSeq edgeR ggplot2 graph igraph jsonlite limma locfit Matrix NBPSeq pheatmap RBGL samr]; };
   DFP = derive2 { name="DFP"; version="1.36.0"; sha256="117gmzcgr9wr9wb7g0rm7wlrakd76ys1frhmhx1k6ps97ibxlz1k"; depends=[Biobase]; };
   DMCHMM = derive2 { name="DMCHMM"; version="1.0.0"; sha256="1y0wmxks51h0d21v8g4mryq7kzq49khhpa88fbhza9xp2bmwk358"; depends=[BiocParallel calibrate fdrtool GenomicRanges IRanges multcomp rtracklayer S4Vectors SummarizedExperiment]; };
@@ -242,8 +242,8 @@ in with self; {
   ENmix = derive2 { name="ENmix"; version="1.14.0"; sha256="117jp47hpm276x4q25jwqfagymvay0qk3ji5l9xvrj74piwqpgwh"; depends=[doParallel foreach geneplotter impute MASS minfi preprocessCore SummarizedExperiment sva wateRmelon]; };
   EasyqpcR = derive2 { name="EasyqpcR"; version="1.20.0"; sha256="06lmq3pp0j86rv9bgs809r30qscgpxv5vjbkccf32q9wv82vd7hw"; depends=[gWidgetsRGtk2 matrixStats plotrix plyr]; };
   EmpiricalBrownsMethod = derive2 { name="EmpiricalBrownsMethod"; version="1.6.0"; sha256="1wv1anm4bwm2kqi9lqn06bl1w17q6wvc1v2amrifbqjbmi5k7g8y"; depends=[]; };
-  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.9.2"; sha256="0ffyb40qcvpjqval78146w8wvk3ng7v1ipdwnqkzj705gqkwbw9y"; depends=[ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; };
-  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.8.6"; sha256="1vxnl0n34ygl4fx28s8zmp71b8hidlp4sn34k1cfkw7hiaf2gg9n"; depends=[AnnotationDbi BiocFileCache biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
+  EnrichedHeatmap = derive2 { name="EnrichedHeatmap"; version="1.9.4"; sha256="03n7w56r14y3jrrsdl2awcan5d0hsn3kd8900lrj015pmgf2r9d0"; depends=[circlize ComplexHeatmap GenomicRanges GetoptLong IRanges locfit matrixStats Rcpp]; };
+  EnrichmentBrowser = derive2 { name="EnrichmentBrowser"; version="2.8.7"; sha256="12wrxbp14ahjjph85g040f72yk4j47svsyyv7b9s56mkc513vd6v"; depends=[AnnotationDbi BiocFileCache biocGraph ComplexHeatmap DESeq2 EDASeq edgeR geneplotter GO_db graph GSEABase hwriter KEGGgraph KEGGREST limma MASS pathview rappdirs ReportingTools Rgraphviz S4Vectors safe SPIA SummarizedExperiment topGO]; };
   EpiDISH = derive2 { name="EpiDISH"; version="1.0.0"; sha256="065bvrfsssf5y4j9axqdcybqb5i8y2hnl09f9jr44bpbay34ay5f"; depends=[e1071 MASS quadprog]; };
   EventPointer = derive2 { name="EventPointer"; version="1.2.0"; sha256="1yh6yhaf8c2rp8f4ipsk014552pplb28cl5z7wjwvarjb21waj05"; depends=[affxparser doParallel foreach GenomeInfoDb GenomicFeatures GenomicRanges graph igraph limma MASS Matrix matrixStats nnls prodlim RBGL S4Vectors SGSeq stringr SummarizedExperiment]; };
   ExiMiR = derive2 { name="ExiMiR"; version="2.20.0"; sha256="0saxway680972dmn6q1gbbmkxcwv08hl2bq973qbyrv5drg6g4vv"; depends=[affy affyio Biobase limma preprocessCore]; };
@@ -298,10 +298,10 @@ in with self; {
   GSRI = derive2 { name="GSRI"; version="2.26.0"; sha256="12silcf67r3ni40g7vsc7iv15arzy7w12abpj2xcjfd9nr4d84js"; depends=[Biobase fdrtool genefilter GSEABase les]; };
   GSReg = derive2 { name="GSReg"; version="1.12.0"; sha256="1rdzkv6kf14shfddvrz3pssjgr6pvg6is4lzcvjzrxai4y34n0y6"; depends=[AnnotationDbi GenomicFeatures Homo_sapiens org_Hs_eg_db]; };
   GSVA = derive2 { name="GSVA"; version="1.26.0"; sha256="1zvi0w7clm5qg6fv6akqw4cx84kswcgzfzjdkhxsrid0l4hwmw09"; depends=[Biobase BiocGenerics geneplotter GSEABase shiny shinythemes]; };
-  GUIDEseq = derive2 { name="GUIDEseq"; version="1.8.0"; sha256="1xsjz3mq6iawspdz1rif3fb8j2h92ykfrjj3lzlcsnvg92bnlczq"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; };
+  GUIDEseq = derive2 { name="GUIDEseq"; version="1.8.1"; sha256="1vx24scbwr4xqhza4q90jpw3xv1pyd7afbqlxijy2fv4p1fzwi4h"; depends=[BiocGenerics BiocParallel Biostrings BSgenome ChIPpeakAnno CRISPRseek data_table GenomeInfoDb GenomicAlignments GenomicRanges hash IRanges limma matrixStats Rsamtools S4Vectors]; };
   GWASTools = derive2 { name="GWASTools"; version="1.24.1"; sha256="1x8p32f47fki2kl0pkjv4v7az8s1b6zwqjnxywfxy0drs9g6lky4"; depends=[Biobase DBI DNAcopy gdsfmt GWASExactHW lmtest logistf quantsmooth RSQLite sandwich survival]; };
   GenRank = derive2 { name="GenRank"; version="1.6.0"; sha256="071k23qknpd46x22bj2cmp07mmxj22higw8ma4b0a8w0wmd05bwz"; depends=[matrixStats reshape2 survcomp]; };
-  GenVisR = derive2 { name="GenVisR"; version="1.8.0"; sha256="03jc5qz1xfqpbll8qbs5ib7g70s21crmggc9a6xi9nvjq8ky05r6"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; };
+  GenVisR = derive2 { name="GenVisR"; version="1.8.1"; sha256="0c8dm4k2fn4g7vpjvd452vx0a1xb4rp5w1ii1h4q96957s8s52hj"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings DBI FField GenomicFeatures GenomicRanges ggplot2 gridExtra gtable gtools IRanges plyr reshape2 Rsamtools scales viridis]; };
   GeneAnswers = derive2 { name="GeneAnswers"; version="2.20.0"; sha256="11bdc59ybi1kck3jkzilf0vmql6a3k97b1f9h940h28mhgn5x9w6"; depends=[annotate Biobase downloader Heatplus igraph MASS RBGL RColorBrewer RCurl RSQLite XML]; };
   GeneBreak = derive2 { name="GeneBreak"; version="1.8.0"; sha256="1157crj12c3girr6973a24ph15rfjw0vcakr42fpx7yhhirs89lb"; depends=[CGHbase CGHcall GenomicRanges QDNAseq]; };
   GeneExpressionSignature = derive2 { name="GeneExpressionSignature"; version="1.24.0"; sha256="1l8829axy6fp29bkqlwbjcsajq99yb86yp5cc8211zprlhlxb30i"; depends=[Biobase PGSEA]; };
@@ -318,7 +318,7 @@ in with self; {
   GenoGAM = derive2 { name="GenoGAM"; version="1.6.0"; sha256="1dvaapinarpgn3i63iqhdbjh9mc5h7sgdxwlv9d55l42d1jyj6h3"; depends=[BiocParallel Biostrings data_table DESeq2 futile_logger GenomeInfoDb GenomicAlignments GenomicRanges IRanges mgcv reshape2 Rsamtools S4Vectors SummarizedExperiment]; };
   GenomeGraphs = derive2 { name="GenomeGraphs"; version="1.38.0"; sha256="15p75cbbgwgcc3awyvawkah491yim0rp73af815pfiai11a51i4m"; depends=[biomaRt]; };
   GenomeInfoDb = derive2 { name="GenomeInfoDb"; version="1.14.0"; sha256="1jhm0imkac4gvchbjxj408aakk39xdv2fyh818d3lk295bz6bnyp"; depends=[BiocGenerics GenomeInfoDbData IRanges RCurl S4Vectors]; };
-  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.14.1"; sha256="033p6fw46sn7w2yyn14nb9qcnkf30cl0nv6zh014ixflm3iifz39"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
+  GenomicAlignments = derive2 { name="GenomicAlignments"; version="1.14.2"; sha256="1659nj1xps7vliy5955i51x6hvrf16n1z0dfh10mmpaaswn2d2mv"; depends=[BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicRanges IRanges Rsamtools S4Vectors SummarizedExperiment]; };
   GenomicDataCommons = derive2 { name="GenomicDataCommons"; version="1.2.0"; sha256="0ndzpzripibx38nk40xpz4xkghhr4an3skqdhfh8479jk2fnfwjd"; depends=[data_table GenomicRanges httr IRanges jsonlite lazyeval magrittr readr xml2]; };
   GenomicFeatures = derive2 { name="GenomicFeatures"; version="1.30.3"; sha256="010vn8hlwbnw12pd1d8pv6m12yp3xwx557gba5rbjq9p4qypnn3z"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings DBI GenomeInfoDb GenomicRanges IRanges RCurl RMySQL RSQLite rtracklayer S4Vectors XVector]; };
   GenomicFiles = derive2 { name="GenomicFiles"; version="1.14.0"; sha256="0r0wmrs5jycf1kckhnc2sgjmp336srlcjdkpbb1ymm7kazdd0s9n"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
@@ -352,7 +352,7 @@ in with self; {
   Heatplus = derive2 { name="Heatplus"; version="2.24.0"; sha256="0lil1yfqqga9l6qrgismngvary4495zmi4yk01izpcx29pk8zn6n"; depends=[RColorBrewer]; };
   HelloRanges = derive2 { name="HelloRanges"; version="1.4.0"; sha256="0pbikr79lh6iij044sy6fw6i2bqigmna4hb806kyihclpm0rs3y2"; depends=[BiocGenerics Biostrings BSgenome docopt GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
   HiCcompare = derive2 { name="HiCcompare"; version="1.0.0"; sha256="1r25l4q7rpzjhz02ys78a4p8ga3wrd231znk84pp7xgka3xpprv0"; depends=[BiocParallel data_table dplyr GenomicRanges ggplot2 gridExtra gtools InteractionSet IRanges KernSmooth mgcv pheatmap QDNAseq S4Vectors]; };
-  HiTC = derive2 { name="HiTC"; version="1.22.0"; sha256="0288xa1jy6nzvz2ha07csmp6dirjw5r7p9vy69q2wsbyzr02ymkp"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
+  HiTC = derive2 { name="HiTC"; version="1.22.1"; sha256="0da1jw9my2n2gihs31zyn14wwr23d8v2vij39ll7rm6fma3ydfbl"; depends=[Biostrings GenomeInfoDb GenomicRanges IRanges Matrix RColorBrewer rtracklayer]; };
   HilbertCurve = derive2 { name="HilbertCurve"; version="1.9.1"; sha256="1k3l3i8fpfhzsdwrlkyp7k8rpkyg51lx6c776vd8nm4f2nqn7z36"; depends=[circlize GenomicRanges HilbertVis IRanges png]; };
   HilbertVis = derive2 { name="HilbertVis"; version="1.36.0"; sha256="1yilvi5pcr0z5h0n0mf7hfrjc7cl44vn6svczlmw57n8pxf8p35g"; depends=[lattice]; };
   HilbertVisGUI = derive2 { name="HilbertVisGUI"; version="1.36.0"; sha256="12bwk0lj2s6jgrpwigc4jd80irzxqjwc8smq1dhsm6pj62v0gvlk"; depends=[HilbertVis]; };
@@ -420,7 +420,7 @@ in with self; {
   MBCB = derive2 { name="MBCB"; version="1.32.0"; sha256="0amqmzi54dvkgzylavy0dbv973s2p02jppd5vzqzkrqs8amb3r4c"; depends=[preprocessCore tcltk2]; };
   MBttest = derive2 { name="MBttest"; version="1.5.0"; sha256="0gswdh61mmqn7h4d6vwvis08lxx383ynj6pk2va3z8bn25qki5lz"; depends=[gplots gtools]; };
   MCRestimate = derive2 { name="MCRestimate"; version="2.34.0"; sha256="1n4abpm6ld4ap87pgrv3mfr1aycdjb4hjg3fm699rckyl9qynjr3"; depends=[Biobase e1071 golubEsets pamr randomForest RColorBrewer]; };
-  MCbiclust = derive2 { name="MCbiclust"; version="1.2.1"; sha256="1yqm6fwap4553nmh1dl3vg87hixljzm097wcv4l6sd5sd0sg63c7"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; };
+  MCbiclust = derive2 { name="MCbiclust"; version="1.2.2"; sha256="0xll7qdg8cf854yzwxmzvd8xh0pjzkq9x9fskcsv7brm25ar6ghv"; depends=[AnnotationDbi BiocParallel cluster GGally ggplot2 GO_db org_Hs_eg_db scales WGCNA]; };
   MEAL = derive2 { name="MEAL"; version="1.8.0"; sha256="0mccjr21jvmwlszhb9qixm7dr83gkhm2hjh9yrn11d22cm9r6g1q"; depends=[Biobase BiocGenerics DMRcate doParallel GenomicRanges ggplot2 Gviz IRanges isva limma matrixStats minfi missMethyl MultiDataSet permute S4Vectors SmartSVA SNPassoc snpStats SummarizedExperiment vegan]; };
   MEDIPS = derive2 { name="MEDIPS"; version="1.30.0"; sha256="06mm424g3rc8j64wfyv6w40m106wifzhi91nsbpi317fg98qfd3d"; depends=[biomaRt Biostrings BSgenome DNAcopy edgeR GenomicRanges gtools IRanges preprocessCore Rsamtools rtracklayer]; };
   MEDME = derive2 { name="MEDME"; version="1.38.0"; sha256="137p9z1g3z4r7q3nsrpsp2gbm657nrbrrq96ph1mykvv41ylq59p"; depends=[Biostrings drc MASS]; };
@@ -428,9 +428,9 @@ in with self; {
   MGFM = derive2 { name="MGFM"; version="1.12.0"; sha256="0yjr14anr5rny6g1508nrw905d4b01jh34vpwi8737p1q4d9bzis"; depends=[annotate AnnotationDbi]; };
   MGFR = derive2 { name="MGFR"; version="1.4.0"; sha256="04nxg65m1s8qyq8sbs8733d541r0vcmabz27w03vs87f0dbxhg11"; depends=[annotate biomaRt]; };
   MIGSA = derive2 { name="MIGSA"; version="1.2.0"; sha256="0ih5i1acb7igbcqk7wykxhncvl5vbgx34gl5nqc65adpqb0199fl"; depends=[AnnotationDbi Biobase BiocGenerics BiocParallel data_table edgeR futile_logger ggdendro ggplot2 GO_db GOstats graph GSEABase limma matrixStats mGSZ org_Hs_eg_db RBGL reshape2 Rgraphviz RJSONIO vegan]; };
-  MIMOSA = derive2 { name="MIMOSA"; version="1.16.0"; sha256="0rnxr7gxcps2raxka8c2x58liwwc75acwpahi2xc1dl8c2z4jpvx"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
+  MIMOSA = derive2 { name="MIMOSA"; version="1.16.1"; sha256="1fsjpqpv32ps8pyj1mjkhrpikchhmm3l06yyjqy3bgrfa1ch36vx"; depends=[Biobase coda data_table Formula ggplot2 MASS MCMCpack modeest plyr pracma Rcpp RcppArmadillo reshape scales testthat]; };
   MIRA = derive2 { name="MIRA"; version="1.0.1"; sha256="0dapp1q6vrdixz8n2g6ivav4d4si3wg1na7cg5jirb22mwi2rrpk"; depends=[Biobase BiocGenerics bsseq data_table GenomicRanges ggplot2 IRanges S4Vectors]; };
-  MLInterfaces = derive2 { name="MLInterfaces"; version="1.58.0"; sha256="1py603bykvnzyq15rcqvq1nly3l6chh5zh6x4biwdn0smyjlnkns"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; };
+  MLInterfaces = derive2 { name="MLInterfaces"; version="1.58.1"; sha256="0hran4cavh1zlzwjwpmmd13qsx95z7kf8pqmh7w1pb36isj2z3hy"; depends=[annotate Biobase BiocGenerics cluster fpc gbm gdata genefilter ggvis hwriter MASS mlbench pls RColorBrewer rda rpart sfsmisc shiny threejs]; };
   MLP = derive2 { name="MLP"; version="1.26.0"; sha256="0mhaw39rbzrnrminvsiq6vrdrmf3zm2zqg3ilnsq1zw8bm2bsbh7"; depends=[affy AnnotationDbi gdata gmodels gplots gtools plotrix]; };
   MLSeq = derive2 { name="MLSeq"; version="1.18.0"; sha256="1r6b33ic2lnj3v2qzs7r904rfyibz96yr35mgpiz4zzsax4ar6v4"; depends=[Biobase caret DESeq2 edgeR limma randomForest]; };
   MMDiff2 = derive2 { name="MMDiff2"; version="1.6.0"; sha256="13f96dw630hadqa0z83ispdni728g7zl12xj8zxrf5hvw1c1hs2h"; depends=[Biobase Biostrings BSgenome GenomicRanges ggplot2 locfit RColorBrewer Rsamtools S4Vectors shiny]; };
@@ -468,7 +468,7 @@ in with self; {
   MiRaGE = derive2 { name="MiRaGE"; version="1.20.0"; sha256="1jbs427vpld18l83s5dngijc8rgllqvrili8gv4in20nr6dyk9hi"; depends=[AnnotationDbi Biobase BiocGenerics S4Vectors]; };
   MineICA = derive2 { name="MineICA"; version="1.18.0"; sha256="1zdq5i14ksm8rirbry6j1dh56r1bhy5yvfzrxfjkm94lynqcdpdy"; depends=[annotate AnnotationDbi Biobase BiocGenerics biomaRt cluster colorspace fastICA foreach fpc ggplot2 GOstats graph gtools Hmisc igraph JADE lumi lumiHumanAll_db marray mclust plyr RColorBrewer Rgraphviz scales xtable]; };
   MinimumDistance = derive2 { name="MinimumDistance"; version="1.22.0"; sha256="1j2g0ji1ac9608b965rr9vvbhlcbvirqypngh11havh3vn54m9rf"; depends=[Biobase BiocGenerics data_table DNAcopy ff foreach GenomeInfoDb GenomicRanges IRanges lattice matrixStats oligoClasses S4Vectors SummarizedExperiment VanillaICE]; };
-  Mirsynergy = derive2 { name="Mirsynergy"; version="1.14.0"; sha256="1mwcv1fb3vda4ilmvwjrwb2qg65bgdxsvd2jd9ndaccxb7m3c2lk"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
+  Mirsynergy = derive2 { name="Mirsynergy"; version="1.14.1"; sha256="09hg5mak0ba0vifix5s0nq7md4hjldmar23jyxz5da1lp22cza9i"; depends=[ggplot2 gridExtra igraph Matrix RColorBrewer reshape scales]; };
   MmPalateMiRNA = derive2 { name="MmPalateMiRNA"; version="1.28.0"; sha256="058nvymnnzd61a7x2vpzic1s2nm3q520cnfdhd6i09isg6kqr6c8"; depends=[Biobase lattice limma statmod vsn xtable]; };
   MoPS = derive2 { name="MoPS"; version="1.12.0"; sha256="0g4awrm90kjnk66b291y2n5vwwwzpdb3kaq96sxfc5a1af8q5q81"; depends=[Biobase]; };
   MoonlightR = derive2 { name="MoonlightR"; version="1.4.0"; sha256="0kisic6bzp2gy1yjg717izbkirlvrwb1wndckd2yvncrjzpidcq6"; depends=[Biobase circlize clusterProfiler doParallel DOSE foreach GEOquery gplots HiveR limma parmigene randomForest RColorBrewer RISmed SummarizedExperiment TCGAbiolinks]; };
@@ -478,7 +478,7 @@ in with self; {
   MultiAssayExperiment = derive2 { name="MultiAssayExperiment"; version="1.4.9"; sha256="0kbr2nfxkny9y6hgijr2xpzczs0ijv0g7nh37yrzgkh10rwjsflq"; depends=[Biobase BiocGenerics GenomicRanges IRanges reshape2 S4Vectors shiny shinydashboard SummarizedExperiment tidyr]; };
   MultiDataSet = derive2 { name="MultiDataSet"; version="1.6.0"; sha256="0h187dkqn63m6askai30x31va24hiv4ig0kxvp9xraz7n9zfr24g"; depends=[Biobase BiocGenerics GenomicRanges ggplot2 ggrepel IRanges limma qqman S4Vectors SummarizedExperiment]; };
   MultiMed = derive2 { name="MultiMed"; version="1.12.0"; sha256="1b48iv34bnsbyg7j70kwi8iyikc1hxlcfmaxsc97249dfq71rfab"; depends=[]; };
-  MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.4.2"; sha256="08ay9h5cqsi8ypb6r0g4rfa5l1g06jgfzl64wmhgz134yqbl7vfv"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 gridExtra IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; };
+  MutationalPatterns = derive2 { name="MutationalPatterns"; version="1.4.3"; sha256="0ml4gsp5dfv23xqrknxh25q8q65hly1xb1215lcwyc8hj9z8f941"; depends=[BiocGenerics Biostrings cowplot GenomeInfoDb GenomicRanges ggdendro ggplot2 IRanges NMF plyr pracma reshape2 S4Vectors SummarizedExperiment VariantAnnotation]; };
   NADfinder = derive2 { name="NADfinder"; version="1.2.0"; sha256="0npzbgbpwir4jv8h4giar9w8vjy3rivk55bimqd9bq7m83iwqapq"; depends=[baseline BiocGenerics GenomeInfoDb GenomicAlignments GenomicRanges IRanges limma rtracklayer S4Vectors signal SummarizedExperiment trackViewer]; };
   NCIgraph = derive2 { name="NCIgraph"; version="1.26.0"; sha256="094dnqj1gss4dh8hsc8y9k98b0g33n7yy714kjavcd16glp4w7i0"; depends=[graph KEGGgraph R_methodsS3 RBGL RCy3]; };
   NGScopy = derive2 { name="NGScopy"; version="1.12.0"; sha256="1aibq3rbs52vyhcx388p7szax7v8ac023pxayqmn2xq3kzj172ah"; depends=[changepoint rbamtools Xmisc]; };
@@ -501,7 +501,7 @@ in with self; {
   OmicCircos = derive2 { name="OmicCircos"; version="1.16.0"; sha256="13dw36n0lg5cafsrgkgr65al6y7jij2clyf1wzidn05p508i02m3"; depends=[GenomicRanges]; };
   OmicsMarkeR = derive2 { name="OmicsMarkeR"; version="1.10.0"; sha256="0s7zyj3xkr74w0jw604hv3v775kqjpdgks4gkkrkfa3a1xj7xa5b"; depends=[assertive assertive_base caret caTools data_table DiscriMiner e1071 foreach gbm glmnet pamr permute plyr randomForest]; };
   Onassis = derive2 { name="Onassis"; version="1.0.1"; sha256="11sq6f3qcq37i4blml024kb24ifcq1xplklv2i9c55wg299ni620"; depends=[AnnotationDbi data_table GEOmetadb OnassisJavaLibs rJava RSQLite SRAdb]; };
-  OncoScore = derive2 { name="OncoScore"; version="1.6.0"; sha256="02vzvvdnisx3xhr7428xdclgx90apa49h64bvp2h3nsa0vnhnj9l"; depends=[biomaRt]; };
+  OncoScore = derive2 { name="OncoScore"; version="1.6.2"; sha256="0lv3rx92fslikv79cpib839wbhj7v3ad869n50frqylyp6kn5nyg"; depends=[biomaRt]; };
   OncoSimulR = derive2 { name="OncoSimulR"; version="2.8.0"; sha256="1b0myymp38j6fbd4y8ppwmsj8v9w96g8wayc20bcygm16i1zjm5k"; depends=[car data_table dplyr ggplot2 ggrepel graph gtools igraph nem RColorBrewer Rcpp Rgraphviz smatr]; };
   OperaMate = derive2 { name="OperaMate"; version="1.9.0"; sha256="11ah55sl04gm8hq3gkcz3b4shq4dxdpwlwl0wn4j82ciai0k6wsm"; depends=[fBasics ggplot2 gProfileR gridExtra pheatmap reshape2 stabledist]; };
   OrderedList = derive2 { name="OrderedList"; version="1.50.0"; sha256="1sk9ni3vyixb3vwn86vz174lfd7n7rnc8jmm1fx94pjsp9r6sbgr"; depends=[Biobase twilight]; };
@@ -538,10 +538,10 @@ in with self; {
   PathoStat = derive2 { name="PathoStat"; version="1.4.1"; sha256="1al0h4mw5lsmn4n3d76d8p9px62l4y5c5z78md2zchnam3x9ii78"; depends=[alluvial ape BatchQC BiocStyle corpcor DESeq2 dplyr DT edgeR ggplot2 gtools knitr limma matrixStats MCMCpack pander phyloseq plyr preprocessCore rentrez reshape2 rmarkdown scales shiny tidyr XML]; };
   PathwaySplice = derive2 { name="PathwaySplice"; version="1.0.0"; sha256="1yi302xjf355xi14vx5rl6qyrm35qz9llf48fwrj7ycb41vla0fj"; depends=[AnnotationDbi AnnotationHub BiasedUrn Biobase BiocGenerics DOSE dplyr ensembldb gdata geneLenDataBase GO_db goseq gplots gridExtra htmlwidgets igraph JunctionSeq mgcv org_Hs_eg_db org_Mm_eg_db plotly RColorBrewer reshape2 S4Vectors tibble VennDiagram webshot]; };
   Pbase = derive2 { name="Pbase"; version="0.18.0"; sha256="17ya1mmz8dqrr81vcfy3ygw490bwg26xkj72mcmba17cyy0nv11x"; depends=[AnnotationFilter Biobase BiocGenerics BiocParallel biomaRt Biostrings cleaver ensembldb GenomicRanges Gviz IRanges MSnbase mzID mzR Pviz Rcpp rtracklayer S4Vectors]; };
-  PharmacoGx = derive2 { name="PharmacoGx"; version="1.8.2"; sha256="0w77wpvi4qs8ngf5404m2cgac9zfj4jvkh88xcrz7zmmjmg2wvb9"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; };
+  PharmacoGx = derive2 { name="PharmacoGx"; version="1.8.3"; sha256="1lax2naj6qcjp4fy640m9pflvi2y1aqbsh5m9j2mpphy6a1dlvmh"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; };
   PhenStat = derive2 { name="PhenStat"; version="2.14.0"; sha256="1hjj1i083ihi7c1lc1rrh3k7513xcqpybn3aaivdjw66pi1bg7vp"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; };
   Pi = derive2 { name="Pi"; version="1.6.2"; sha256="0x3b5cs7r4cjvjjc2gx7xapzlkvg56784aj04zg6271hldpcd84j"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; };
-  Pigengene = derive2 { name="Pigengene"; version="1.4.2"; sha256="15wnq91k360jblns36dgx4a24jk6a7rwkj342ja0sgfc6kvwvvqb"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; };
+  Pigengene = derive2 { name="Pigengene"; version="1.4.20"; sha256="13pzgzls2k48h31h25n2rw028n97xaxfxlb4dq49ndwy5874cbzb"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; };
   Polyfit = derive2 { name="Polyfit"; version="1.12.0"; sha256="1gkn6g5hwa8ss156armxam9ky5fd7dj0k3gh1b0gy5plpzzyzv1h"; depends=[DESeq]; };
   Prize = derive2 { name="Prize"; version="1.8.0"; sha256="1vaf4n69pb2sa6fd79988picz08d3c46cjmxfr5qf7hxay9lbwc6"; depends=[diagram ggplot2 gplots matrixcalc reshape2 stringr]; };
   ProCoNA = derive2 { name="ProCoNA"; version="1.16.0"; sha256="06jlzcr9b6nfrlgb1wqxp7r2z8042ygjx4d2z7jzg07hqn3gymjz"; depends=[BiocGenerics flashClust GOstats MSnbase WGCNA]; };
@@ -562,7 +562,7 @@ in with self; {
   RBGL = derive2 { name="RBGL"; version="1.54.0"; sha256="18jad23i3899ypv4bg3l47cvvs3qnj1pqis2p9x0135yv5y6wnv7"; depends=[graph]; };
   RBM = derive2 { name="RBM"; version="1.10.0"; sha256="1nqmf9yiaam767f2wkwggnw6v0rymszx7chnkis0xbdsllzqb0j4"; depends=[limma marray]; };
   RBioinf = derive2 { name="RBioinf"; version="1.38.0"; sha256="01qk9ddk8bm9sl70rlwgmrkz2y7dnqzrhi13hhh0ii62s0z0gdwh"; depends=[graph]; };
-  RCAS = derive2 { name="RCAS"; version="1.4.3"; sha256="0ajnhi8i9p755lr0l2j5j52d5j6rsilrjhm3zrjr1zsgwqm2an6z"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; };
+  RCAS = derive2 { name="RCAS"; version="1.4.4"; sha256="0jnrikh0qhpxgjc6rdgfj9d57x4i5b40wxx7lfafrxdxg60qsy1g"; depends=[AnnotationDbi BiocGenerics biomaRt Biostrings BSgenome_Hsapiens_UCSC_hg19 cowplot data_table DBI DT genomation GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggseqlogo knitr motifRG org_Hs_eg_db pbapply pheatmap plotly plotrix proxy rmarkdown RSQLite rtracklayer S4Vectors topGO]; };
   RCASPAR = derive2 { name="RCASPAR"; version="1.24.0"; sha256="1v19pv81q0g965mks88ablznzhcdk3kfd7j2dgxx4r12bl1afawg"; depends=[]; };
   RCy3 = derive2 { name="RCy3"; version="1.8.0"; sha256="09p66zxh82j5pcjz1zn3cg43rpsp0gnkwja836m6g1i450zrialv"; depends=[graph httr RCurl RJSONIO]; };
   RCyjs = derive2 { name="RCyjs"; version="1.10.0"; sha256="0vlyh32byw49j3vfw0avknixflpjs5h599xxlbf2zc6irvncg1wg"; depends=[base64enc BiocGenerics BrowserViz graph httpuv igraph jsonlite Rcpp]; };
@@ -577,19 +577,19 @@ in with self; {
   RIPSeeker = derive2 { name="RIPSeeker"; version="1.18.0"; sha256="0bqkzwrncww7il36273chkd3gfxmii7p566ycki9qij419pwr35y"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
   RITAN = derive2 { name="RITAN"; version="1.2.0"; sha256="199kddc19fwkfgqnbhx7v4sl5h6lj6f3wqs5xy9f9n9bg09f5rrf"; depends=[BgeeDB dynamicTreeCut ggplot2 gplots gridExtra gsubfn hash igraph knitr linkcomm MCL plotrix png ProNet RColorBrewer reshape2 RITANdata sqldf STRINGdb]; };
   RIVER = derive2 { name="RIVER"; version="1.2.0"; sha256="00j9i0hrn0j2i5rxgsax3ixj8pwm2ks9fyvp657yd5amm1vackxq"; depends=[Biobase ggplot2 glmnet pROC]; };
-  RImmPort = derive2 { name="RImmPort"; version="1.6.0"; sha256="1fj69k1mb0gbajsiah23azp0ina3wvc43ghr6866glqcfh4xckj7"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; };
+  RImmPort = derive2 { name="RImmPort"; version="1.7.2"; sha256="0h3r7q7lfl4z7srmallaldljv2231j3zhxy0d4x9q7ghcfglfnbf"; depends=[data_table DBI dplyr plyr reshape2 RSQLite sqldf]; };
   RJMCMCNucleosomes = derive2 { name="RJMCMCNucleosomes"; version="1.2.0"; sha256="0xjscfbxrrfnd40dmzhrrly0v3pk1k33jdl4z19bslh89gmrmygr"; depends=[BiocGenerics BiocParallel consensusSeekeR GenomeInfoDb GenomicRanges IRanges Rcpp S4Vectors]; };
   RLMM = derive2 { name="RLMM"; version="1.40.0"; sha256="01mbk00fbhzldivxlr5jfy1fgfrdbd657lya3s3p7zxw7z0054a0"; depends=[MASS]; };
   RMassBank = derive2 { name="RMassBank"; version="2.6.0"; sha256="1yfnj64ybl95a7bc4980i5h6cvs2hq3nkmj9dklarcp9wfw5p59w"; depends=[Biobase digest MSnbase mzR rcdk Rcpp RCurl rjson S4Vectors XML yaml]; };
   RNASeqPower = derive2 { name="RNASeqPower"; version="1.18.0"; sha256="08x58sd6q5xm47ix2f1kkqpgyk10nnbf994i4m1wia8fjhx0hdkm"; depends=[]; };
   RNAinteract = derive2 { name="RNAinteract"; version="1.26.0"; sha256="1cscf2izpx924ai0vian9mm528mn1k618zqscss7mry13ik78p3c"; depends=[abind Biobase cellHTS2 geneplotter gplots hwriter ICS ICSNP lattice latticeExtra limma locfit RColorBrewer splots]; };
-  RNAither = derive2 { name="RNAither"; version="2.26.0"; sha256="1dyxmk0j319822qf0wwd41xw7v9qdahixkhmsbv3qp6203hp49w5"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
+  RNAither = derive2 { name="RNAither"; version="2.26.1"; sha256="0fs3kab20h77d00kg48rdgslj3fsmnl73qi740sa7xmwx6ra5lc7"; depends=[biomaRt car geneplotter limma prada RankProd splots topGO]; };
   RNAprobR = derive2 { name="RNAprobR"; version="1.10.0"; sha256="0lq0cf5g004w2gi8rs29rhdy3p49njmwnw5jhfijfj4hgkgc6caf"; depends=[BiocGenerics Biostrings GenomicAlignments GenomicFeatures GenomicRanges IRanges plyr Rsamtools rtracklayer S4Vectors]; };
   ROC = derive2 { name="ROC"; version="1.54.0"; sha256="0a60k93q0zsmj2s4gy9wgzpd5yl9xdv2g62m18z4s4dmr3ykwsdv"; depends=[]; };
   ROTS = derive2 { name="ROTS"; version="1.6.0"; sha256="12dqbwqiiz21im45iqf41nm25anf0fffip86glpydwwc0km054jh"; depends=[Biobase Rcpp]; };
   ROntoTools = derive2 { name="ROntoTools"; version="2.6.0"; sha256="0lxxqa8syanb9v4nzc93arlwg65zyf4hkgxgw6q4h62mxkabdp0d"; depends=[boot graph KEGGgraph KEGGREST Rgraphviz]; };
   RPA = derive2 { name="RPA"; version="1.34.0"; sha256="1s5d8wpy3n69f9lnsi8avwalbzzvi7v8np6bv3vcnxy3nfx0iqx3"; depends=[affy BiocGenerics phyloseq]; };
-  RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.0.1"; sha256="1a8psx12hwbzybkd92k9n3351g24fqqxrmq5x3sln62z2f0c7psw"; depends=[]; };
+  RProtoBufLib = derive2 { name="RProtoBufLib"; version="1.0.2"; sha256="14hs5mam4yjcm00zqz5fgmgxzwhw45fniaihch2mwrb6kbys2y68"; depends=[]; };
   RRHO = derive2 { name="RRHO"; version="1.18.0"; sha256="1nz643k6bahg1bizw5bgjkpv2hd7hpi87s4kh1z38jqfpfixw9lk"; depends=[VennDiagram]; };
   RSVSim = derive2 { name="RSVSim"; version="1.18.0"; sha256="0f2fv2cxwhsl6gvz3dpgk55faymdwxyry6lr3l6f2s8f6rqpnzgf"; depends=[Biostrings GenomicRanges IRanges ShortRead]; };
   RTCA = derive2 { name="RTCA"; version="1.30.0"; sha256="0y2vrqfr4qjgsq8f82a5xnfhm835wi5zqf1xlxrv4mpxm9f9jr38"; depends=[Biobase gtools RColorBrewer]; };
@@ -628,7 +628,7 @@ in with self; {
   Rhdf5lib = derive2 { name="Rhdf5lib"; version="1.0.0"; sha256="0kkc4rprjbqn2wvbx4d49kk9l91vihccxbl4843qr1wqk6v33r1w"; depends=[]; };
   Rhtslib = derive2 { name="Rhtslib"; version="1.10.0"; sha256="1dw3p44bfr0m7w39ckc2k37sjcp1zz0b9g12mr8am15jaj6v0q2j"; depends=[zlibbioc]; };
   RiboProfiling = derive2 { name="RiboProfiling"; version="1.7.2"; sha256="0yygf098phiakaj8c74c337gbwpd0dh4haabbg2qq1k0qjw4prmp"; depends=[BiocGenerics Biostrings data_table GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggbio ggplot2 IRanges plyr reshape2 Rsamtools rtracklayer S4Vectors sqldf]; };
-  Ringo = derive2 { name="Ringo"; version="1.42.0"; sha256="174zcz86x43yrg9wl1wwdhammgyxhfc3aqas3yqgrdq7vdsnxzxq"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
+  Ringo = derive2 { name="Ringo"; version="1.42.1"; sha256="12r4bcn2sivcp68rd7jr4w4a8yz7xdydwx6bv1mi2lp2s2mzf5c5"; depends=[Biobase BiocGenerics genefilter lattice limma Matrix RColorBrewer vsn]; };
   Risa = derive2 { name="Risa"; version="1.20.0"; sha256="10ypbd9qwh1rk27fwm8naf3gl05w9zlw79qyr55pk5m6x5lnn9cb"; depends=[affy Biobase biocViews Rcpp xcms]; };
   Rmagpie = derive2 { name="Rmagpie"; version="1.34.0"; sha256="1hvv8pps0q7xnsl33rammqvyj191j5gs78r2333jgscxnw4byqb7"; depends=[Biobase e1071 kernlab pamr]; };
   RmiR = derive2 { name="RmiR"; version="1.34.0"; sha256="10n8i7qirbd8xrb73ccxyj7c6bi1szx263nwjh8w2j9x4dgzx22x"; depends=[DBI RmiR_Hs_miRNA RSVGTipsDevice]; };
@@ -655,7 +655,7 @@ in with self; {
   SICtools = derive2 { name="SICtools"; version="1.8.0"; sha256="0n3m3435wa95mld4b57hr31rfhlk41yw1qqi1jdnybkqgdndpqf8"; depends=[Biostrings doParallel GenomicRanges IRanges matrixStats plyr Rsamtools stringr]; };
   SIM = derive2 { name="SIM"; version="1.48.0"; sha256="1n207w5idd2v515v8ppsfx7q1wvn2zxy6if7dp2hpr0x2qvxijnf"; depends=[globaltest quantreg quantsmooth]; };
   SIMAT = derive2 { name="SIMAT"; version="1.10.0"; sha256="0gd99p8kjf1wn0xygdyppxgddp9bnp3a3grg8za2mmm8xv5r990h"; depends=[ggplot2 mzR Rcpp reshape2]; };
-  SIMLR = derive2 { name="SIMLR"; version="1.4.0"; sha256="1sfd32qd39wy8a1206xkazbmvkqwhs09p7fhdn8n59xf56914pfa"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; };
+  SIMLR = derive2 { name="SIMLR"; version="1.4.1"; sha256="09siwqc57f0rfx0297hk2jbpvvayhk47wkvapz2ap621ya203b0z"; depends=[Matrix pracma Rcpp RcppAnnoy RSpectra]; };
   SISPA = derive2 { name="SISPA"; version="1.8.0"; sha256="18v8fw3l4pxh4fi18fhnqxbd1hlhp2w36s31vf58ffldq3bz1bpb"; depends=[changepoint data_table genefilter ggplot2 GSVA plyr]; };
   SLGI = derive2 { name="SLGI"; version="1.38.0"; sha256="1p0lwzmzz820npnsw9sk6x12innc39qv0ja0di7rplkmsi60z92j"; depends=[AnnotationDbi Biobase BiocGenerics GO_db lattice ScISI]; };
   SLqPCR = derive2 { name="SLqPCR"; version="1.44.0"; sha256="16kvssib1j4d5cn3b350ip2m9m7fcsgm1mgq13wbfnwcd6sx52kb"; depends=[]; };
@@ -669,7 +669,7 @@ in with self; {
   SPEM = derive2 { name="SPEM"; version="1.18.0"; sha256="05gpj1fykiw8xjcbd6splqkb8jsyksnhzl6g6pzinpbczhslq55a"; depends=[Biobase Rsolnp]; };
   SPIA = derive2 { name="SPIA"; version="2.30.0"; sha256="0m2vv6zj0vgd98w2jrlbwbyn998ml2i2wr9160gmq5h77rn91xq3"; depends=[KEGGgraph]; };
   SPLINTER = derive2 { name="SPLINTER"; version="1.4.0"; sha256="06xamivcwlpwj6n8c3wzgd5ykh21q2mrdl7zz1bnicq5npha99l9"; depends=[biomaRt Biostrings BSgenome_Mmusculus_UCSC_mm9 GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges ggplot2 Gviz IRanges plyr S4Vectors seqLogo]; };
-  SPONGE = derive2 { name="SPONGE"; version="1.0.2"; sha256="100gbcysmf3fhn22zmvvx2sck6hhfgc7ar782l822vbsig1vnyk9"; depends=[bigmemory Biobase data_table doRNG expm foreach glmnet gRbase igraph iterators logging MASS ppcor]; };
+  SPONGE = derive2 { name="SPONGE"; version="1.0.3"; sha256="1jb7nwji4j9kvnx40hr26qhcn3pbmjaahl4cpvqbljs9pmi9lfdy"; depends=[bigmemory Biobase data_table doRNG expm foreach glmnet gRbase igraph iterators logging MASS ppcor]; };
   SQUADD = derive2 { name="SQUADD"; version="1.28.0"; sha256="1z139p0xbaq4gvd9acxnd8dlapdsiaab1fj10pc7wx2iz4dj9zd6"; depends=[RColorBrewer]; };
   SRAdb = derive2 { name="SRAdb"; version="1.40.0"; sha256="18aayqid2fhhkjf7anlk34qw3fj3byxsxcrw2lmq4s4mqq06k5vh"; depends=[GEOquery graph RCurl RSQLite]; };
   SRGnet = derive2 { name="SRGnet"; version="1.4.0"; sha256="1a2as38svd6vp6pdllir4gs6jqicg7n7ya42ffjgiy2rpnyijbci"; depends=[DMwR EBcoexpress gbm Hmisc igraph limma MASS matrixStats pvclust]; };
@@ -688,7 +688,7 @@ in with self; {
   SeqArray = derive2 { name="SeqArray"; version="1.18.2"; sha256="05w051i63af4akr6zna9w14bdyi06bpif0vab9yvf6iwq2ag72kz"; depends=[Biostrings gdsfmt GenomeInfoDb GenomicRanges IRanges S4Vectors]; };
   SeqGSEA = derive2 { name="SeqGSEA"; version="1.18.0"; sha256="1vaqa6jkvwxpbqnz9wz3i6p26mky6d7d704cjv5as67j04v99b2a"; depends=[Biobase biomaRt DESeq doParallel]; };
   SeqSQC = derive2 { name="SeqSQC"; version="1.0.0"; sha256="0qj1y9zsjxkh08jkw80hl62072viincq1pvcz9r3i0m28nhk7pg5"; depends=[e1071 ExperimentHub gdsfmt GenomicRanges GGally ggplot2 IRanges rbokeh RColorBrewer reshape2 rmarkdown S4Vectors SNPRelate]; };
-  SeqVarTools = derive2 { name="SeqVarTools"; version="1.16.0"; sha256="14n70xzj91f4rshl0kx549rqzy9rrv5mv0b0xvj891i8anxahb2n"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray tidyr]; };
+  SeqVarTools = derive2 { name="SeqVarTools"; version="1.16.1"; sha256="0vjgksqyapvkdbnl3af0sjbbraslyc6m7f63sl05m87zdkav8fzz"; depends=[Biobase dplyr gdsfmt GenomicRanges GWASExactHW IRanges logistf S4Vectors SeqArray tidyr]; };
   ShortRead = derive2 { name="ShortRead"; version="1.36.1"; sha256="1cyv47632m9ljkxfsvnvmd19sb607ys5kz8fwh6v39dnw16g0a6m"; depends=[Biobase BiocGenerics BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges hwriter IRanges lattice latticeExtra Rsamtools S4Vectors XVector zlibbioc]; };
   SigCheck = derive2 { name="SigCheck"; version="2.10.0"; sha256="1k2xmb7jcjbdxafr8fspf9pbc0jwcll914lqc42gvhhjq6rnf8q4"; depends=[Biobase BiocParallel e1071 MLInterfaces survival]; };
   SigFuge = derive2 { name="SigFuge"; version="1.16.0"; sha256="0ddy6bayb05gsgh06p5awhjwyx57z0l8fb5x6p0dci2fgzy6gr4f"; depends=[GenomicRanges ggplot2 matlab reshape sigclust]; };
@@ -708,7 +708,7 @@ in with self; {
   SwimR = derive2 { name="SwimR"; version="1.16.0"; sha256="033hh3bpkn6qladvn7iz0fvrbphffzy1rkvmi0j32v9n9h88lizz"; depends=[gplots heatmap_plus R2HTML signal]; };
   TCC = derive2 { name="TCC"; version="1.18.0"; sha256="10nmha786k85jr93vbnlsxkrr2wiykxa5rl2z5ry49w14fis82m5"; depends=[baySeq DESeq DESeq2 edgeR ROC samr]; };
   TCGAbiolinks = derive2 { name="TCGAbiolinks"; version="2.6.12"; sha256="0pih8jpzffsjlhamfpvgcapa48dq2m86f4hxqr5m5z4vgjd7j1mv"; depends=[biomaRt circlize ComplexHeatmap ConsensusClusterPlus data_table doParallel downloader dplyr EDASeq edgeR genefilter GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 ggrepel ggthemes gridExtra httr IRanges jsonlite knitr limma matlab plyr R_utils RColorBrewer readr rvest S4Vectors scales selectr stringr SummarizedExperiment survival survminer sva tibble XML xml2]; };
-  TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.4.2"; sha256="1g81w346lvws8bcm8w94b1r3jjr1zfg5ln80p0rq69gzv9hkdjyw"; depends=[clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks]; };
+  TCGAbiolinksGUI = derive2 { name="TCGAbiolinksGUI"; version="1.4.7"; sha256="1hwq13rsynxv18pzahq54107n2dm0wgbh7a5xizda4zqgf4s50gj"; depends=[clusterProfiler colourpicker data_table downloader DT ELMER ggplot2 ggrepel maftools pathview plotly readr shiny shinyBS shinydashboard shinyFiles shinyjs stringr SummarizedExperiment TCGAbiolinks]; };
   TCseq = derive2 { name="TCseq"; version="1.2.0"; sha256="07wbp4caw18g1mf5h40i1c1y7jadfqmx3p7a8zz5rjjibsfa2bw1"; depends=[BiocGenerics cluster e1071 edgeR GenomicAlignments GenomicRanges ggplot2 IRanges locfit reshape2 Rsamtools SummarizedExperiment]; };
   TDARACNE = derive2 { name="TDARACNE"; version="1.28.0"; sha256="0agzpgz39ya46kgnz95ff2h0hml2mb14fb3pdj218adas24zq9jf"; depends=[Biobase GenKern Rgraphviz]; };
   TEQC = derive2 { name="TEQC"; version="3.18.0"; sha256="0rnqlk677hcf2w3whc9gdqm21gjqf4rsanaw8a847jc7li8isnpj"; depends=[Biobase BiocGenerics hwriter IRanges Rsamtools]; };
@@ -718,7 +718,7 @@ in with self; {
   TIN = derive2 { name="TIN"; version="1.10.0"; sha256="16lv7k4js3zbak0b1m2mlimd1f56gif3vlm2hpc5vx1y315mz9gd"; depends=[aroma_affymetrix data_table impute squash stringr WGCNA]; };
   TMixClust = derive2 { name="TMixClust"; version="1.0.1"; sha256="1mv9hv5hjg55mwbp824n5b74w8zcb9sv8a1wa6hxmfb00n6wcr4h"; depends=[Biobase BiocParallel cluster flexclust gss mvtnorm SPEM zoo]; };
   TPP = derive2 { name="TPP"; version="3.6.0"; sha256="1gma7lfnq1ybcqnl9536wv22advjaqxmysfgamrgn38zwbcwhdi9"; depends=[Biobase biobroom broom data_table doParallel dplyr foreach futile_logger ggplot2 gridExtra knitr limma magrittr MASS mefa nls2 openxlsx plyr purrr RColorBrewer RCurl reshape2 rmarkdown sme stringr tidyr VennDiagram VGAM]; };
-  TRONCO = derive2 { name="TRONCO"; version="2.10.0"; sha256="1lvzfx75z50r8kd3yrcjwzvsg16yi5644rz90bm1l6hpkmw2wcpf"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
+  TRONCO = derive2 { name="TRONCO"; version="2.10.3"; sha256="1kw4j57wri0sm3piinq169pkljfb3ff4vcj1ify2il2pl7va94l4"; depends=[bnlearn cgdsr circlize doParallel foreach gridExtra gtable gtools igraph iterators R_matlab RColorBrewer Rgraphviz scales xtable]; };
   TReNA = derive2 { name="TReNA"; version="0.99.10"; sha256="1yiq953w6830v1fba4gglnf485m6lis11qlpp9g1jw0x4s0rpg70"; depends=[DBI doParallel flare foreach GenomicRanges glmnet lassopv randomForest RPostgreSQL RSQLite vbsr]; };
   TSCAN = derive2 { name="TSCAN"; version="1.16.0"; sha256="0m88r5yg46ra8k6ymzfrk68fqbg2y47kshzgj5flblbay079hnxg"; depends=[combinat fastICA ggplot2 gplots igraph mclust mgcv plyr shiny]; };
   TSRchitect = derive2 { name="TSRchitect"; version="1.4.0"; sha256="0qymyjmzpi1n5fpyzw8riz32kwsc2bi1cw3sx9sxvpvhjk45dmyx"; depends=[AnnotationHub BiocGenerics BiocParallel GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges Rsamtools rtracklayer S4Vectors SummarizedExperiment]; };
@@ -742,7 +742,7 @@ in with self; {
   VariantTools = derive2 { name="VariantTools"; version="1.20.0"; sha256="1ma1qs9n606a5gjcm8l9fna8vfg5f8ixdzriwaalhys22pyjgqsy"; depends=[Biobase BiocGenerics BiocParallel Biostrings BSgenome GenomeInfoDb GenomicFeatures GenomicRanges IRanges Matrix Rsamtools rtracklayer S4Vectors VariantAnnotation]; };
   Vega = derive2 { name="Vega"; version="1.26.0"; sha256="1kya7h7xa47d7l3svkpnkwjg49izpjfird5fjja6490ynr1a55yd"; depends=[]; };
   VegaMC = derive2 { name="VegaMC"; version="3.16.0"; sha256="1lmgmaf4andfxv2z4h2pahyggnic5wj61llzkm8q4k0q7i50l63i"; depends=[Biobase biomaRt genoset]; };
-  XBSeq = derive2 { name="XBSeq"; version="1.8.0"; sha256="07123c1wd3l7lj29kaa0d83dlv7zsrx8gk8aag7g0h8k9vlhcni4"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; };
+  XBSeq = derive2 { name="XBSeq"; version="1.10.0"; sha256="0p2f2wckndgrsf0jjcag22i6bgrn2ky78ngdk9c5cvqnxwjcfagz"; depends=[Biobase DESeq2 dplyr ggplot2 locfit magrittr matrixStats pracma roar]; };
   XDE = derive2 { name="XDE"; version="2.24.0"; sha256="11g74znfafp03q710mhmzgxap6f7j04b75jhm7x6lmd6cbwqh25p"; depends=[Biobase BiocGenerics genefilter GeneMeta gtools MergeMaid mvtnorm RColorBrewer siggenes]; };
   XVector = derive2 { name="XVector"; version="0.18.0"; sha256="1i4i3kdxr78lr1kcxq657p11ybi7kq10c8kyaqyh6gfc8i9rhvmk"; depends=[BiocGenerics IRanges S4Vectors zlibbioc]; };
   YAPSA = derive2 { name="YAPSA"; version="1.4.0"; sha256="0jv940xdqrbb8hw13nm6cky767zn9k8wh6sh5vz5b7hgh7c75kww"; depends=[circlize ComplexHeatmap corrplot dendextend GenomeInfoDb GenomicRanges GetoptLong ggplot2 gridExtra gtrellis KEGGREST lsei PMCMR reshape2 SomaticSignatures VariantAnnotation]; };
@@ -776,11 +776,11 @@ in with self; {
   anamiR = derive2 { name="anamiR"; version="1.6.1"; sha256="0mxpxangzbvx7rpzm4ak321pcgj6pa0nbslgvh8rplyz4sf6v0z6"; depends=[agricolae DBI DESeq2 gage gplots limma lumi RMySQL S4Vectors SummarizedExperiment]; };
   annaffy = derive2 { name="annaffy"; version="1.50.0"; sha256="0qprkcvq56h6dwcylqsa0dq0nmv5bk280j89cwa3brm4jfncs4hm"; depends=[AnnotationDbi Biobase DBI GO_db KEGG_db]; };
   annmap = derive2 { name="annmap"; version="1.20.0"; sha256="0q4lcx1j5av5jpn2wmarn7z32clzzdaprvpcagnvv453i11vp5bi"; depends=[Biobase BiocGenerics DBI digest genefilter GenomicRanges IRanges lattice RMySQL Rsamtools]; };
-  annotate = derive2 { name="annotate"; version="1.56.1"; sha256="14c5xd9kasvcwg5gbjys2c1vizxhlqlzxakqc2kml0kw97hmx0rq"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; };
+  annotate = derive2 { name="annotate"; version="1.56.2"; sha256="0ybg9k1s289h15nj1kp9821i1rsk1gkn8i8blplmk7gsgpbw1f42"; depends=[AnnotationDbi Biobase BiocGenerics DBI RCurl XML xtable]; };
   annotationTools = derive2 { name="annotationTools"; version="1.52.0"; sha256="1kmhgasb26dbq10d4r8wig5pjlbiqcqsa12zpgcsasj8kvpr2gpd"; depends=[Biobase]; };
   annotatr = derive2 { name="annotatr"; version="1.4.1"; sha256="10izqb0x92fjpsycsyppvz6yidg8ssix452jfni692na7ih564y9"; depends=[AnnotationDbi AnnotationHub dplyr GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 IRanges org_Dm_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db readr regioneR reshape2 rtracklayer S4Vectors TxDb_Dmelanogaster_UCSC_dm3_ensGene TxDb_Dmelanogaster_UCSC_dm6_ensGene TxDb_Hsapiens_UCSC_hg19_knownGene TxDb_Hsapiens_UCSC_hg38_knownGene TxDb_Mmusculus_UCSC_mm10_knownGene TxDb_Mmusculus_UCSC_mm9_knownGene TxDb_Rnorvegicus_UCSC_rn4_ensGene TxDb_Rnorvegicus_UCSC_rn5_refGene TxDb_Rnorvegicus_UCSC_rn6_refGene]; };
   anota = derive2 { name="anota"; version="1.26.0"; sha256="1fvr9yvyf0m7m5dnfbzbm29kd1yqq78carv9v7xx60szi30w4lvq"; depends=[multtest qvalue]; };
-  anota2seq = derive2 { name="anota2seq"; version="1.0.0"; sha256="1pcmjlnvx3g2209l54jcbw044k6iz9zch3l01d1vr1cxiqag8smh"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; };
+  anota2seq = derive2 { name="anota2seq"; version="1.0.1"; sha256="0fya2plqvpmypm3jf6mwncpi1ngjsprbnadh7j33wdshr4znhyc3"; depends=[DESeq2 edgeR limma multtest qvalue RColorBrewer SummarizedExperiment]; };
   antiProfiles = derive2 { name="antiProfiles"; version="1.18.0"; sha256="03y6j3y0qvfzwbwzjgjsl5zlqayqj1400gj278m28l70l43ifnyg"; depends=[locfit matrixStats]; };
   apComplex = derive2 { name="apComplex"; version="2.44.0"; sha256="132j6gm70h8sma82jd566hrih7npa217h5r6kqx4lq5yw3dlqcs1"; depends=[graph org_Sc_sgd_db RBGL Rgraphviz]; };
   apeglm = derive2 { name="apeglm"; version="1.0.3"; sha256="06j68szmxdr9c8qmmlcx85rv1hjl2rk52lagack83cr3q1gd10bj"; depends=[emdbook GenomicRanges SummarizedExperiment]; };
@@ -844,10 +844,10 @@ in with self; {
   chipenrich = derive2 { name="chipenrich"; version="2.2.0"; sha256="0q24il68grjqdxpy7qjk6lw6l5zlmw6yybrbrbb8l42gljyi6s74"; depends=[AnnotationDbi BiocGenerics chipenrich_data GenomeInfoDb GenomicRanges IRanges lattice latticeExtra mgcv org_Dm_eg_db org_Dr_eg_db org_Hs_eg_db org_Mm_eg_db org_Rn_eg_db plyr rms rtracklayer S4Vectors stringr]; };
   chipseq = derive2 { name="chipseq"; version="1.28.0"; sha256="1ymcq77krwjzrkzzcw7i9909cmkqa7c0675z9wzvrrk81hgdssfq"; depends=[BiocGenerics GenomicRanges IRanges lattice S4Vectors ShortRead]; };
   chopsticks = derive2 { name="chopsticks"; version="1.42.0"; sha256="0awwk8k7vnsc0c1ic17m2mhmpin0s0ijd2gn7my9yysqzld9sncd"; depends=[survival]; };
-  chroGPS = derive2 { name="chroGPS"; version="1.26.0"; sha256="1lx12mlrj1syl2qaibm08b4vq8h2xw609vr6vxynl1wvvf8wdarp"; depends=[Biobase changepoint cluster DPpackage GenomicRanges ICSNP MASS]; };
+  chroGPS = derive2 { name="chroGPS"; version="1.27.3"; sha256="0glqisz3nzlrcvjryxf406dkiq6sg9bg1g3bcqqnmayirm92w5qv"; depends=[Biobase changepoint cluster DPpackage GenomicRanges ICSNP MASS]; };
   chromDraw = derive2 { name="chromDraw"; version="2.8.0"; sha256="1lqrpbf322kxpx5068mw650ibzqksfmxc4j6q1fs4dv0ghpxdcsf"; depends=[GenomicRanges Rcpp]; };
   chromPlot = derive2 { name="chromPlot"; version="1.6.0"; sha256="16qy1zqwlxc2pdkdb1jf8rknvr5cz2k4vbg2jybr6ks73pzagb47"; depends=[biomaRt GenomicRanges]; };
-  chromVAR = derive2 { name="chromVAR"; version="1.0.1"; sha256="0a62gp47ymspn9pbdz7j2vjpd0g7bhl333dicbs468qjjfpm8fbw"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; };
+  chromVAR = derive2 { name="chromVAR"; version="1.0.2"; sha256="08bp5wyxg5s9gjwnpymcahhy5rar64x385msczam62i1h1y95f8b"; depends=[BiocGenerics BiocParallel Biostrings BSgenome DT GenomeInfoDb GenomicRanges ggplot2 IRanges Matrix miniUI nabor plotly RColorBrewer Rcpp RcppArmadillo Rsamtools Rtsne S4Vectors shiny SummarizedExperiment TFBSTools]; };
   chromstaR = derive2 { name="chromstaR"; version="1.4.0"; sha256="1ky2z9v6gwwgzvd498ng9ac5s7x8nkgm5170gywr7bgw7lqrycjz"; depends=[bamsignals chromstaRData doParallel foreach GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 IRanges mvtnorm reshape2 Rsamtools S4Vectors]; };
   chromswitch = derive2 { name="chromswitch"; version="1.0.0"; sha256="1ym7vdj6lfwi4nja38lixm3vsxp296dpb90zwnmabws3dhysxhfy"; depends=[Biobase BiocParallel cluster DescTools dplyr GenomicRanges gplots IRanges lazyeval magrittr matrixStats mclust NMF rtracklayer S4Vectors tidyr]; };
   cisPath = derive2 { name="cisPath"; version="1.18.0"; sha256="0ya1kkvghs23c4rqydkas68a7y6z16ihjnv8ljjy9h3i7pdani4h"; depends=[]; };
@@ -934,7 +934,7 @@ in with self; {
   eegc = derive2 { name="eegc"; version="1.4.0"; sha256="1v3586qddx1l74ha083x36m3lqdblrhmwd63k22jzfpkh30adz09"; depends=[AnnotationDbi clusterProfiler DESeq2 DOSE edgeR ggplot2 gplots igraph limma org_Hs_eg_db org_Mm_eg_db pheatmap R_utils S4Vectors sna wordcloud]; };
   eiR = derive2 { name="eiR"; version="1.18.0"; sha256="1ypd7yq9c6mqp7nm984dm60qzvwy4qb81zrp2mvp7g87c5vdj2a3"; depends=[BiocGenerics ChemmineR DBI digest gespeR RcppAnnoy RCurl RUnit snow snowfall]; };
   eisa = derive2 { name="eisa"; version="1.30.0"; sha256="11ydmv5kddq75sknbax1aiyxq60rx146qa7pd3m09axjzvk83mq5"; depends=[AnnotationDbi Biobase BiocGenerics Category DBI genefilter isa2]; };
-  ensemblVEP = derive2 { name="ensemblVEP"; version="1.20.0"; sha256="1xza76fyqp8xikc98ipamsz6175nirdv7aisfvkb9nmzba4q0r62"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
+  ensemblVEP = derive2 { name="ensemblVEP"; version="1.20.1"; sha256="0785hhfsgmnkangcq6lg48kdr5pifxs6j9v6apv80457k70d7ybv"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges S4Vectors SummarizedExperiment VariantAnnotation]; };
   ensembldb = derive2 { name="ensembldb"; version="2.2.2"; sha256="1yngndkf3588z91z0a2fvkg423p26ajm6xv1p27x0l9mzhhaqq3k"; depends=[AnnotationDbi AnnotationFilter AnnotationHub Biobase BiocGenerics Biostrings curl DBI GenomeInfoDb GenomicFeatures GenomicRanges IRanges ProtGenerics Rsamtools RSQLite rtracklayer S4Vectors]; };
   epiNEM = derive2 { name="epiNEM"; version="1.2.0"; sha256="0d3r4m0q3w2ljf4bm03z1dpiiih9cshzpbi4nnqq3jwls82f7nlq"; depends=[BoolNet e1071 graph gtools igraph lattice latticeExtra minet nem pcalg RColorBrewer]; };
   epigenomix = derive2 { name="epigenomix"; version="1.18.0"; sha256="0x567fxak38ngy5hs3x567381aigh1x1fb8ww8xvmpf2wlzrlfwp"; depends=[beadarray Biobase BiocGenerics GenomeInfoDb GenomicRanges IRanges MCMCpack Rsamtools S4Vectors SummarizedExperiment]; };
@@ -943,8 +943,8 @@ in with self; {
   epivizrData = derive2 { name="epivizrData"; version="1.6.0"; sha256="101ibx9nq17dnn5j8kjy31pm8ly4nyzs1rrlbsvk0140avjhz154"; depends=[Biobase ensembldb epivizrServer GenomeInfoDb GenomicFeatures GenomicRanges IRanges OrganismDbi S4Vectors SummarizedExperiment]; };
   epivizrServer = derive2 { name="epivizrServer"; version="1.6.0"; sha256="0qa13yvq9ywa3m1n2vmi60087cgg18rpnqbr1m7f137ivnxyb11b"; depends=[httpuv mime R6 rjson]; };
   epivizrStandalone = derive2 { name="epivizrStandalone"; version="1.6.0"; sha256="0rbd2kmdi0y97mx72gkg93s97slfig1k1bgcv5maknsqqqcwzz8j"; depends=[BiocGenerics epivizr epivizrServer GenomeInfoDb GenomicFeatures git2r S4Vectors]; };
-  erccdashboard = derive2 { name="erccdashboard"; version="1.12.0"; sha256="07dc80l8618rlv3sywr0gp9i49kq66i9glx3md2r0k5c4l67mw37"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; };
-  erma = derive2 { name="erma"; version="0.10.0"; sha256="0gcfs9g8vvdv5vmq9b21kd8sq5mizjj49nfzd4in9zvp4b9v7x1g"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; };
+  erccdashboard = derive2 { name="erccdashboard"; version="1.12.1"; sha256="19fg4n99w983wp6ffmzadzfp1bzmsn8papb5szbrxz102r2mq6df"; depends=[edgeR ggplot2 gplots gridExtra gtools limma locfit MASS plyr qvalue reshape2 ROCR scales stringr]; };
+  erma = derive2 { name="erma"; version="0.10.1"; sha256="1fi8nc6fbd7i4p9i9hli31xplmdpsxqcdrb8v3nf8fx9klllbdav"; depends=[AnnotationDbi Biobase BiocGenerics foreach GenomicFiles GenomicRanges ggplot2 Homo_sapiens rtracklayer S4Vectors shiny SummarizedExperiment]; };
   esATAC = derive2 { name="esATAC"; version="1.0.23"; sha256="1g2pai0b98dfnng4h7w2xs73qp2dqacmx8x3ackqi6a515x0cyaf"; depends=[AnnotationDbi BiocGenerics BiocInstaller Biostrings BSgenome ChIPseeker clusterProfiler corrplot DiagrammeR digest GenomeInfoDb GenomicFeatures GenomicRanges ggplot2 igraph IRanges JASPAR2016 knitr magrittr R_utils Rbowtie2 Rcpp rJava rmarkdown Rsamtools rtracklayer S4Vectors ShortRead TFBSTools VennDiagram]; };
   esetVis = derive2 { name="esetVis"; version="1.4.0"; sha256="1yb238lxy8sqmxim3zd25rp642cpz8p25vdffjlija2wivq8phn1"; depends=[Biobase hexbin MASS MLP mpm Rtsne]; };
   eudysbiome = derive2 { name="eudysbiome"; version="1.8.0"; sha256="13ayrigzy55h6an3am9f77r6mzcvyfcpxpby71xilhaf6mjhyj39"; depends=[Biostrings plyr R_utils Rsamtools]; };
@@ -992,14 +992,14 @@ in with self; {
   flowUtils = derive2 { name="flowUtils"; version="1.42.0"; sha256="0d4ab30xp722h9avi785wj8z1qz7dy65z5faqf3jc6j6v40bzikq"; depends=[Biobase corpcor flowCore graph RUnit XML]; };
   flowVS = derive2 { name="flowVS"; version="1.10.0"; sha256="07vcqcxzd9cw4hvc1yld2v05zcxqs5p9spka2l80pmsjr0aij043"; depends=[flowCore flowStats flowViz]; };
   flowViz = derive2 { name="flowViz"; version="1.42.0"; sha256="1fbr0snid9vgb133sb5dwkk469n465p8r490r67vsmm8wqsf6iyl"; depends=[Biobase flowCore hexbin IDPmisc KernSmooth lattice latticeExtra MASS RColorBrewer]; };
-  flowWorkspace = derive2 { name="flowWorkspace"; version="3.26.6"; sha256="11r9c9h1ffp3i1p7gw0f93l5g30waawl7f2vbyh06p5mcr732dmp"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; };
+  flowWorkspace = derive2 { name="flowWorkspace"; version="3.26.9"; sha256="04vs7knal0mrlj0rxpq5p3x1243ji0191zf0xmvk9689m94ib2za"; depends=[BH Biobase BiocGenerics cytolib data_table dplyr flowCore flowViz graph gridExtra lattice latticeExtra ncdfFlow RBGL RColorBrewer Rcpp Rgraphviz RProtoBufLib scales stringr XML]; };
   flowcatchR = derive2 { name="flowcatchR"; version="1.12.0"; sha256="0i6r86b1g98kaw8nhbnjjrw8gw6vvhfpr5r7dn4whl4hwlizc5qx"; depends=[abind BiocParallel colorRamps EBImage rgl]; };
   fmcsR = derive2 { name="fmcsR"; version="1.20.0"; sha256="0cbbil337zbb968zibkysrmpc8bwlpn7rl908zyvzvj8v11lxzcc"; depends=[BiocGenerics ChemmineR RUnit]; };
   focalCall = derive2 { name="focalCall"; version="1.12.0"; sha256="07lb0ijdsryd31dxp5fgp393p9f21b7in3rnf9j43qn8wmz48hnl"; depends=[CGHcall]; };
   frma = derive2 { name="frma"; version="1.30.1"; sha256="0319m8l7n2sfp4m6zipm7pkc57xikb735qk605m952m8ra08v8ml"; depends=[affy Biobase BiocGenerics DBI MASS oligo oligoClasses preprocessCore]; };
   frmaTools = derive2 { name="frmaTools"; version="1.30.0"; sha256="02z7igfcvhjg9f36snmmif8d7lsca9n9izg8zc543hcy7s704aa2"; depends=[affy Biobase DBI preprocessCore]; };
   funtooNorm = derive2 { name="funtooNorm"; version="1.2.0"; sha256="09n7vq5f26px57sy35s29b8pmb9wcx6kii0h0i354sr3yg21ccpc"; depends=[GenomeInfoDb IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest matrixStats minfi pls]; };
-  gCMAP = derive2 { name="gCMAP"; version="1.22.0"; sha256="1ghaidxm8wpg9jx8s9ymlkciwkxjnlr5g5yfjappj7mf4qaqxvil"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
+  gCMAP = derive2 { name="gCMAP"; version="1.22.1"; sha256="0va9jixmp3v001gnym3clyjwarxs5d31vnyklzv31n5zffd7dm3l"; depends=[annotate AnnotationDbi bigmemory bigmemoryExtras Biobase Category DESeq genefilter GSEABase GSEAlm limma Matrix]; };
   gCMAPWeb = derive2 { name="gCMAPWeb"; version="1.18.0"; sha256="152nd7vxz3cja8xmg5rq4j08lvd7cw1y09a737bfdq1zwrxc22v8"; depends=[annotate AnnotationDbi Biobase BiocGenerics brew gCMAP GSEABase hwriter Rook yaml]; };
   gCrisprTools = derive2 { name="gCrisprTools"; version="1.6.0"; sha256="0x7bsnhs3qwimfkkxr8yslawdfy83x5ip8j2wlwq4m9hqwqk060g"; depends=[Biobase ggplot2 limma PANTHER_db rmarkdown RobustRankAggreg]; };
   gQTLBase = derive2 { name="gQTLBase"; version="1.10.0"; sha256="1756vfcj2dkkgcmfkkg7qdaig36dv9gfvpypn9rbrky56wm1p035"; depends=[BatchJobs BBmisc BiocGenerics bit doParallel ff ffbase foreach GenomicFiles GenomicRanges rtracklayer S4Vectors SummarizedExperiment]; };
@@ -1024,7 +1024,7 @@ in with self; {
   geneRxCluster = derive2 { name="geneRxCluster"; version="1.14.0"; sha256="0r0lnhf19qw1d4p87632lz0rgx0d9q3cakpd6qh43b10fil7wjgp"; depends=[GenomicRanges IRanges]; };
   geneXtendeR = derive2 { name="geneXtendeR"; version="1.4.0"; sha256="02a3aqn115l85cnvxy16ppri4hwir6mcp1av6s00nj66afxxnzmv"; depends=[AnnotationDbi data_table dplyr GO_db networkD3 org_Ag_eg_db org_Bt_eg_db org_Ce_eg_db org_Cf_eg_db org_Dm_eg_db org_Dr_eg_db org_Gg_eg_db org_Hs_eg_db org_Mm_eg_db org_Mmu_eg_db org_Pt_eg_db org_Rn_eg_db org_Sc_sgd_db org_Ss_eg_db org_Xl_eg_db RColorBrewer rtracklayer SnowballC tm wordcloud]; };
   genefilter = derive2 { name="genefilter"; version="1.60.0"; sha256="173swlg6gj4kdllbqvyiw5dggbcxiwlwpqmllsv4dxzn7h25i3g7"; depends=[annotate AnnotationDbi Biobase S4Vectors survival]; };
-  genefu = derive2 { name="genefu"; version="2.10.0"; sha256="0pg9425z0inlbgvi15d050s6928xyqbxj36kk12z3dh3w2gwkycf"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; };
+  genefu = derive2 { name="genefu"; version="2.11.2"; sha256="1z70pnzgci0sjpr8vsvyg93zrjim7jh9jmba0p3pgqp3qw4gbi34"; depends=[AIMS amap biomaRt iC10 limma mclust survcomp]; };
   geneplast = derive2 { name="geneplast"; version="1.4.0"; sha256="12ncf9rpnv1mwmdw4rbzzhggppcnzch764aiipy0jb21ix9xj61q"; depends=[ape snow]; };
   geneplotter = derive2 { name="geneplotter"; version="1.56.0"; sha256="1z3g7frc1iviwrsv2dlm4nqvkc0685h4va0388yfxn102ln8wwma"; depends=[annotate AnnotationDbi Biobase BiocGenerics lattice RColorBrewer]; };
   genoCN = derive2 { name="genoCN"; version="1.30.0"; sha256="0m4sj2w0zra67d939knzriwda0nwphzspsmnl9jakl0kq8dvhjki"; depends=[]; };
@@ -1034,9 +1034,9 @@ in with self; {
   genoset = derive2 { name="genoset"; version="1.34.0"; sha256="1cw6g8r3n33xlqmbjsfn6kkdzz19kh71ag529sjbk9wlxi69rrz0"; depends=[BiocGenerics GenomeInfoDb GenomicRanges IRanges S4Vectors SummarizedExperiment]; };
   genotypeeval = derive2 { name="genotypeeval"; version="1.10.0"; sha256="1pff2n1s350j6i7klsnwqlizkdvvfpyqqrvc7kq5gj7yh508dxy9"; depends=[BiocGenerics BiocParallel GenomeInfoDb GenomicRanges ggplot2 IRanges rtracklayer Rtsne VariantAnnotation]; };
   genphen = derive2 { name="genphen"; version="1.6.0"; sha256="0m1g1hfhhbq3xjdr2fjf3wbng6d953kci965h298c168dv3864k6"; depends=[Biostrings e1071 effsize ggplot2 randomForest rjags]; };
-  gespeR = derive2 { name="gespeR"; version="1.10.0"; sha256="09xd080b08bfpqqbha4rxn4vmglv7c5asd4gibfjgjkasd78g40m"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
+  gespeR = derive2 { name="gespeR"; version="1.10.1"; sha256="10aw6s5bn5jiw3qlqskcp2ngshgyykslsqlwrdpyahr4rh7z0zyl"; depends=[Biobase biomaRt cellHTS2 doParallel dplyr foreach ggplot2 glmnet Matrix reshape2]; };
   ggbio = derive2 { name="ggbio"; version="1.26.1"; sha256="1xlmlngn27iwnr21s9di4059kav1a7c1sajx08wja8yn8f7j06hp"; depends=[AnnotationDbi AnnotationFilter Biobase BiocGenerics Biostrings biovizBase BSgenome ensembldb GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges GGally ggplot2 gridExtra gtable Hmisc IRanges OrganismDbi reshape2 Rsamtools rtracklayer S4Vectors scales SummarizedExperiment VariantAnnotation]; };
-  ggcyto = derive2 { name="ggcyto"; version="1.6.1"; sha256="07rsg673hnrn1kf82nb59sxa925hjlb3qnjwlxvzlr2lzs958rcd"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; };
+  ggcyto = derive2 { name="ggcyto"; version="1.6.2"; sha256="0qg9ivya9c2998hq40c0pvzfilb1q24h13fafymwa8p2lj59jyrg"; depends=[data_table flowCore flowWorkspace ggplot2 gridExtra ncdfFlow plyr RColorBrewer scales]; };
   ggtree = derive2 { name="ggtree"; version="1.10.5"; sha256="1gkfjgihykkvqrhvzhr5brwzsgva0mxvfpa664k08jan9brjg22f"; depends=[ape ggplot2 magrittr rvcheck scales tidyr treeio]; };
   girafe = derive2 { name="girafe"; version="1.30.0"; sha256="0k8fjn7d1hxwin0vywly7vc570048i7nckhyw9j4cind6fi6f75v"; depends=[Biobase BiocGenerics Biostrings genomeIntervals intervals IRanges Rsamtools S4Vectors ShortRead]; };
   globalSeq = derive2 { name="globalSeq"; version="1.6.0"; sha256="19aws180r5gwxrz6xmfgic0mp8piki2qmzrxyy1f75866blk3r4f"; depends=[]; };
@@ -1100,7 +1100,7 @@ in with self; {
   keggorthology = derive2 { name="keggorthology"; version="2.30.0"; sha256="117s7b32nkv95adh2j91b87r90svhfb91ag28brsq3r333m2q8cn"; depends=[AnnotationDbi DBI graph hgu95av2_db]; };
   kimod = derive2 { name="kimod"; version="1.6.0"; sha256="0mb9bv6bz7k27vs8rl26kh2zm8mvpkgzqhgc471lp4qz8f4fsbxc"; depends=[Biobase cluster]; };
   lapmix = derive2 { name="lapmix"; version="1.44.0"; sha256="1b7daaqsq3bvb1wbhf99pk8kl4pm4kac7bnx211isr7ica34pxb5"; depends=[Biobase]; };
-  ldblock = derive2 { name="ldblock"; version="1.8.0"; sha256="18nfsixh6d2wfrb9laqsgly5w1frzihhak683k0p8fdf51h4aqba"; depends=[erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; };
+  ldblock = derive2 { name="ldblock"; version="1.8.1"; sha256="1q8dz8wcq1r7kr635s9q21g36sxkdybk8khhpa4p57qv8r0gppl0"; depends=[erma GenomeInfoDb GenomicFiles GO_db Homo_sapiens Matrix Rsamtools snpStats VariantAnnotation]; };
   les = derive2 { name="les"; version="1.28.0"; sha256="0xy7ggc2b20i1c78mww84xvc0jhbinxn00nbfvnbw997vjqr7r79"; depends=[boot fdrtool gplots RColorBrewer]; };
   lfa = derive2 { name="lfa"; version="1.8.0"; sha256="06w0032wwqm2cxid7brb6iq6bkhqc5x3a08wwyjbib6lnj5n7rvh"; depends=[corpcor]; };
   limma = derive2 { name="limma"; version="3.34.9"; sha256="1y2fm61g5i0fn0j3l31xvwh9zww9bpkc4nwzb1d0yv1cag20jkdc"; depends=[]; };
@@ -1121,7 +1121,7 @@ in with self; {
   maanova = derive2 { name="maanova"; version="1.48.0"; sha256="1vvjk6y8mp5h7l8yk4f1y48jx5k9fl9s12x2mgsbap306paw860q"; depends=[Biobase]; };
   macat = derive2 { name="macat"; version="1.52.0"; sha256="168jw5bi1nbj2dfhipnvja7w0avmiw6vrvdany73d41fvigmagj5"; depends=[annotate Biobase]; };
   made4 = derive2 { name="made4"; version="1.52.0"; sha256="1ns7f47l7ig2fm95l67ppym5gbkbr8lp18vx51pqwjg8r5rvj9sc"; depends=[ade4 gplots RColorBrewer scatterplot3d]; };
-  maftools = derive2 { name="maftools"; version="1.4.25"; sha256="0k4ry5pnh3lxyzkab094wpjiaqjrymq9hbgpz8xv9g67fhg2g8ah"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; };
+  maftools = derive2 { name="maftools"; version="1.4.28"; sha256="17b3v1v9ipid8gqsq2gy0fpminc58f1mng9i2andswfr5ip38g7s"; depends=[Biostrings changepoint cometExactTest ComplexHeatmap cowplot data_table ggplot2 ggrepel gridExtra mclust NMF RColorBrewer rjson Rsamtools survival VariantAnnotation wordcloud]; };
   maigesPack = derive2 { name="maigesPack"; version="1.42.0"; sha256="1c92kkr2rmfydckmbvri8g0lzz1v3hx93zpmb1pwrnlfpm01j95j"; depends=[convert graph limma marray]; };
   makecdfenv = derive2 { name="makecdfenv"; version="1.54.0"; sha256="17fmzd12acdpq3vfnqrafmmg5jcmdgkf83mrqjpw92zah2w8490a"; depends=[affy affyio Biobase zlibbioc]; };
   manta = derive2 { name="manta"; version="1.24.0"; sha256="060x5rdzkx882pa8x9w7j3sgj0clar6w35yblbcggq579r9jpx06"; depends=[caroline edgeR Hmisc]; };
@@ -1177,7 +1177,7 @@ in with self; {
   missMethyl = derive2 { name="missMethyl"; version="1.12.0"; sha256="1fvpny7x56l55zhgabm6al2i2n0hix7fp7d01bzirsn7chxpwny3"; depends=[AnnotationDbi BiasedUrn GO_db IlluminaHumanMethylation450kanno_ilmn12_hg19 IlluminaHumanMethylation450kmanifest IlluminaHumanMethylationEPICanno_ilm10b2_hg19 IlluminaHumanMethylationEPICmanifest limma methylumi minfi org_Hs_eg_db ruv statmod stringr]; };
   mitoODE = derive2 { name="mitoODE"; version="1.16.0"; sha256="11kyihynbl3kcrngv8dhiqn3ghpkvv0xi35pf8np2p41zdhbrpyv"; depends=[KernSmooth MASS minpack_lm mitoODEdata]; };
   mogsa = derive2 { name="mogsa"; version="1.12.2"; sha256="0a29q9jak4vr05ngh2pcsfifa9i6p086acjk2qrzwnc3lcfm00bm"; depends=[Biobase BiocGenerics cluster corpcor genefilter gplots graphite GSEABase svd]; };
-  monocle = derive2 { name="monocle"; version="2.6.3"; sha256="1qag8q6wy1wf1zx16h2lwki6rn4nxkjff7yhpn8m30hp3v01fvhn"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; };
+  monocle = derive2 { name="monocle"; version="2.6.4"; sha256="1x4y02kn8spzz8y4hgmis9h2l494ys2j1vjs0axh32fp1rpc6d8c"; depends=[Biobase BiocGenerics biocViews cluster combinat DDRTree densityClust dplyr fastICA ggplot2 HSMMSingleCell igraph irlba limma MASS Matrix matrixStats pheatmap plyr proxy qlcMatrix RANN Rcpp reshape2 Rtsne slam stringr tibble VGAM viridis]; };
   mosaics = derive2 { name="mosaics"; version="2.16.0"; sha256="08q48zakyfydrj8vix3a5w0j4ix5h1hpqccv0jxgj55gpdc062kj"; depends=[GenomeInfoDb GenomicAlignments GenomicRanges IRanges lattice MASS Rcpp Rsamtools S4Vectors]; };
   motifRG = derive2 { name="motifRG"; version="1.22.0"; sha256="193zl2rlzwxv9p9q5i7rilj3w05ndqfyp9bdpvagp5s5cin4hf44"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 IRanges seqLogo XVector]; };
   motifStack = derive2 { name="motifStack"; version="1.22.4"; sha256="13wrpdgyhzrqdp7k0d7iym2pjjla46rh3i1qwm34j22n7j0pxs8x"; depends=[ade4 Biostrings grImport htmlwidgets MotIV scales XML]; };
@@ -1202,7 +1202,7 @@ in with self; {
   mzID = derive2 { name="mzID"; version="1.16.0"; sha256="0yk70dka56zd8w62f03ggx3mandj91gfa767h9ajj0sd3mjmfqb9"; depends=[doParallel foreach iterators plyr ProtGenerics XML]; };
   mzR = derive2 { name="mzR"; version="2.12.0"; sha256="1x3gp30sfxz2v3k3swih9kff9b2rvk7hzhnlkp6ywlnn2wgb0q8c"; depends=[Biobase BiocGenerics ProtGenerics Rcpp zlibbioc]; };
   ncdfFlow = derive2 { name="ncdfFlow"; version="2.24.0"; sha256="1rvqlfzdbqz7a035c2d0rfziail71pvyla6fi3mv1xzrm2vpw0b8"; depends=[BH Biobase BiocGenerics flowCore flowViz Rcpp RcppArmadillo Rhdf5lib zlibbioc]; };
-  ndexr = derive2 { name="ndexr"; version="1.0.3"; sha256="05wnjya61w0mbskrfs9k5w04pr3hcf4c8w15y85z7j1vxjhpgwjq"; depends=[httr igraph jsonlite plyr tidyr]; };
+  ndexr = derive2 { name="ndexr"; version="1.0.4"; sha256="1hr49a3svk65d585yix13ggd57zv5zzmavb81c452y2jpay0www0"; depends=[httr igraph jsonlite plyr tidyr]; };
   nem = derive2 { name="nem"; version="2.52.0"; sha256="0114b8nzv07gii87rdcvia6n7jn203f5whx6x6x54ijxq8m1fkk8"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; };
   netReg = derive2 { name="netReg"; version="1.2.0"; sha256="1cmh66m5zp1awrg79f8d09b48shq8hyjvkz6mfxrnvqbcj32v8ph"; depends=[Rcpp RcppArmadillo]; };
   netbenchmark = derive2 { name="netbenchmark"; version="1.10.0"; sha256="173jmvslg8vj078psnvk6s4sns8n9zv2z8hkq6iq64pavmn9cf91"; depends=[c3net corpcor fdrtool GeneNet grndata Matrix minet PCIT pracma randomForest Rcpp]; };
@@ -1231,7 +1231,7 @@ in with self; {
   ontoCAT = derive2 { name="ontoCAT"; version="1.29.0"; sha256="057sbc0s08i22gjg886ngz0k59r4v29ssh11qj0wyv4n5g3zs0hg"; depends=[rJava]; };
   ontoProc = derive2 { name="ontoProc"; version="1.0.0"; sha256="0la7lcynmdgavvzdz7b5g726pm4205r8194dnsmnhc5h3lryr36k"; depends=[AnnotationDbi Biobase ontologyIndex S4Vectors shiny]; };
   openCyto = derive2 { name="openCyto"; version="1.16.1"; sha256="1qzx0qq1d2hi5whqi0kbg8xmjbglv6j2fli3wcx932g66lxwg3sv"; depends=[Biobase clue data_table flowClust flowCore flowStats flowViz flowWorkspace graph gtools ks lattice MASS ncdfFlow plyr R_utils RBGL RColorBrewer Rcpp rrcov]; };
-  openPrimeR = derive2 { name="openPrimeR"; version="1.0.0"; sha256="0x4h7lcanzclcxnbrj2hii5mpv2b7rm5izm9p51drqylr69gvns2"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; };
+  openPrimeR = derive2 { name="openPrimeR"; version="1.0.4"; sha256="1gw4b7df390q40zy0bnv0wlwr9dwji99rhgy678k32nm8r2cdc19"; depends=[ape BiocGenerics Biostrings DECIPHER digest distr distrEx dplyr fitdistrplus foreach GenomicRanges ggplot2 Hmisc IRanges lpSolveAPI magrittr openxlsx plyr RColorBrewer reshape2 S4Vectors scales seqinr stringdist stringr uniqtag XML]; };
   openPrimeRui = derive2 { name="openPrimeRui"; version="1.0.0"; sha256="1mchbalmq6mbxp9mdrmndz3pja7j1ffx5xglnzglfdqm2004gdlf"; depends=[DT openPrimeR rmarkdown shiny shinyBS shinyjs]; };
   oposSOM = derive2 { name="oposSOM"; version="1.16.0"; sha256="1855wrszaxwc8rghhn1hgj6hrp5mxsyffbs9ccjckq5jl3z7z1mj"; depends=[ape arules Biobase biomaRt fastICA fdrtool igraph pixmap scatterplot3d som tsne]; };
   oppar = derive2 { name="oppar"; version="1.6.0"; sha256="0h4wfgjq8xm5f6bcaj5vxy686ymr42r3ig9zw93ayycpfl81p275"; depends=[Biobase GSEABase GSVA]; };
@@ -1254,7 +1254,7 @@ in with self; {
   pcaGoPromoter = derive2 { name="pcaGoPromoter"; version="1.22.0"; sha256="0371ns6702nk5s3pj59z04i2sjf24sj0wm3m4rj67q4p5v7v1ksz"; depends=[AnnotationDbi Biostrings ellipse]; };
   pcaMethods = derive2 { name="pcaMethods"; version="1.70.0"; sha256="0ii235g0x0492kh8cfrf28ni0b6vd6fh7kizkqmczzqggd6b1bk8"; depends=[Biobase BiocGenerics MASS Rcpp]; };
   pcot2 = derive2 { name="pcot2"; version="1.46.0"; sha256="1pymhr9ypp5g27bbnayrz4ks8rg5j634bf4l596m2b6c4q9d9rc5"; depends=[amap Biobase]; };
-  pcxn = derive2 { name="pcxn"; version="1.0.0"; sha256="105mzgy6bcwmk1nsnlr44bik8pazyjc7zcqn56732g1dj5na5v5w"; depends=[pcxnData pheatmap]; };
+  pcxn = derive2 { name="pcxn"; version="2.0.0"; sha256="1iq3i3cj7zq7xyprgjv4v4whycm67lzcrsz9p08lxyzz7ci2y6xn"; depends=[pcxnData pheatmap]; };
   pdInfoBuilder = derive2 { name="pdInfoBuilder"; version="1.42.0"; sha256="0cs47qzkpphixcwn3fl9pfrw1qans8y51y8lb9phikh4s8cdq061"; depends=[affxparser Biobase BiocGenerics Biostrings DBI IRanges oligo oligoClasses RSQLite S4Vectors]; };
   pdmclass = derive2 { name="pdmclass"; version="1.47.0"; sha256="1grc1fyn8yhwixi7638bsyb3zc6zhzzrbfh4hcpqk6gf653dls63"; depends=[Biobase fibroEset mda]; };
   pepStat = derive2 { name="pepStat"; version="1.12.0"; sha256="0bnak90zfycd5a9qkz4lhwk4h61pr0pwn3hzaksxcv6c025h0mwm"; depends=[Biobase data_table fields GenomicRanges ggplot2 IRanges limma plyr]; };
@@ -1293,7 +1293,7 @@ in with self; {
   prot2D = derive2 { name="prot2D"; version="1.16.0"; sha256="1fp530fammi9xifx5g72jz8k7y3chjfg3mpybsbf5pzvva1429sj"; depends=[Biobase fdrtool impute limma MASS Mulcom qvalue samr st]; };
   proteinProfiles = derive2 { name="proteinProfiles"; version="1.18.0"; sha256="069ksj5md9m7zylqwy6pyj3p9pa4j04vn4ss4d2r8n7a5z8f7d1g"; depends=[]; };
   proteoQC = derive2 { name="proteoQC"; version="1.14.0"; sha256="1kv8ah7pbfl1gbb1pnjlmdw5bskfyh0hsn0nxraz0ybvwzn3kdsl"; depends=[dplyr ggplot2 MSnbase Nozzle_R1 plotly plyr reshape2 rmarkdown rpx rTANDEM seqinr tidyr VennDiagram XML]; };
-  psichomics = derive2 { name="psichomics"; version="1.4.4"; sha256="1h8vg90nlvjmpz8ific6n41xqc3fzs1133hvbyrjzqbwqy0cgqzp"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp shiny shinyBS shinyjs stringr survival XML xtable]; };
+  psichomics = derive2 { name="psichomics"; version="1.4.5"; sha256="0lvkbjkdg5m1ni6rrnzzq2d2p5j0156vp2q9i3c8ji40fp7rx0vv"; depends=[AnnotationHub cluster colourpicker data_table digest dplyr DT edgeR fastICA fastmatch ggplot2 ggrepel highcharter htmltools httr jsonlite limma miscTools pairsD3 plyr R_utils Rcpp shiny shinyBS shinyjs stringr survival XML xtable]; };
   psygenet2r = derive2 { name="psygenet2r"; version="1.10.0"; sha256="0xf03vjyjiz4093cqnvi3dm532scx3f17mcf0av96h052vy10qb7"; depends=[BgeeDB Biobase BiocInstaller biomaRt ggplot2 GO_db igraph labeling RCurl reshape2 stringr topGO]; };
   puma = derive2 { name="puma"; version="3.20.0"; sha256="0pcwppa2zlzpfl5fafl4h5xcf0pnyvz3hkykl192hzp26wcjsc1i"; depends=[affy affyio Biobase mclust oligo oligoClasses]; };
   pvac = derive2 { name="pvac"; version="1.26.0"; sha256="0lmwy5a74ikq0sl6zqw69kag6q3p092qwh1lzvv7rl2j9wm2yl46"; depends=[affy Biobase]; };
@@ -1382,7 +1382,7 @@ in with self; {
   seqbias = derive2 { name="seqbias"; version="1.26.0"; sha256="1i1zqslv0qws12x45c37h7fkgpz5wv3v87h72n4pw8gh80bgcafl"; depends=[Biostrings GenomicRanges Rsamtools zlibbioc]; };
   seqcombo = derive2 { name="seqcombo"; version="1.0.0"; sha256="0bkap2c1061yg2ws2m1fafxi37pqzkg9mzim5sqiq8sgcfmk6na6"; depends=[Biostrings cowplot dplyr ggplot2 igraph magrittr rvcheck]; };
   seqplots = derive2 { name="seqplots"; version="1.16.0"; sha256="1plwmdq2hjcqs94l7s03h9amcxdimwdrmi11z03xn10dfn1xig70"; depends=[Biostrings BSgenome class DBI digest DT fields GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges jsonlite kohonen plotrix RColorBrewer reshape2 Rsamtools RSQLite rtracklayer S4Vectors shiny]; };
-  sevenbridges = derive2 { name="sevenbridges"; version="1.8.0"; sha256="1jlw69yxh697q3bwd54mvzfiqskg469jyyh97sqnlizjmm5hiw11"; depends=[curl docopt dplyr httr jsonlite liftr miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; };
+  sevenbridges = derive2 { name="sevenbridges"; version="1.8.1"; sha256="0v22pwyrgxh6mjqqcxz9ix7ripl5xds0l8p38w0w08ynbdns1w5b"; depends=[curl docopt dplyr httr jsonlite liftr miniUI objectProperties rstudioapi S4Vectors shiny stringr uuid yaml]; };
   shinyMethyl = derive2 { name="shinyMethyl"; version="1.14.0"; sha256="17w7shgr4s5w3y1ik8zgr9brv7q87dx9l6dfqywsyvfmmkddimwa"; depends=[BiocGenerics IlluminaHumanMethylation450kmanifest matrixStats minfi RColorBrewer shiny]; };
   shinyTANDEM = derive2 { name="shinyTANDEM"; version="1.16.0"; sha256="17x0bq1kzvmqqf30y0dmmp9777i62525mp4ysyv2m6vb9bgrbc4y"; depends=[mixtools rTANDEM shiny xtable]; };
   sigPathway = derive2 { name="sigPathway"; version="1.46.0"; sha256="18nn7rpg67dz30v1drm0lnsb1wnww7maxdg4gk960wayasp8hk2z"; depends=[]; };
@@ -1406,7 +1406,7 @@ in with self; {
   specL = derive2 { name="specL"; version="1.12.0"; sha256="03bkh0z3pd6jl47wq2h6zd73fvaggwnaj2b4ibijwkg1643mfiip"; depends=[DBI protViz Rcpp RSQLite seqinr]; };
   spikeLI = derive2 { name="spikeLI"; version="2.38.0"; sha256="00fixl9jpjfm0qgsg1lwi0315sa53j1j9fbrl69j8y2gbr8kgg28"; depends=[]; };
   spkTools = derive2 { name="spkTools"; version="1.34.0"; sha256="0vpyv78c6c58qrcz91mir7jh9gx2j2l48bclabvgi0k2156wpwn7"; depends=[Biobase gtools RColorBrewer]; };
-  splatter = derive2 { name="splatter"; version="1.2.1"; sha256="0iap91mmfan5p8wcpkxmqrrlk4zhgcigl08js5k1kcizmqkiar5g"; depends=[akima BiocGenerics BiocParallel checkmate edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; };
+  splatter = derive2 { name="splatter"; version="1.2.2"; sha256="05bqmck2hszxlvj0vb1j7fbyv4fp2q7bjv7ywlg6hs9bx7zk1iaj"; depends=[akima BiocGenerics BiocParallel checkmate edgeR fitdistrplus ggplot2 locfit matrixStats scales scater SingleCellExperiment SummarizedExperiment]; };
   spliceR = derive2 { name="spliceR"; version="1.20.0"; sha256="1skwj4cqf4s14df42jgy5b9fxrb5c5np9khc0wkg732qddbdlagd"; depends=[cummeRbund GenomicRanges IRanges plyr RColorBrewer rtracklayer VennDiagram]; };
   spliceSites = derive2 { name="spliceSites"; version="1.26.0"; sha256="19av0wkdvy4x4p0nkhy9ca450d6j0s68m2lp26116ydh4lzv4p8x"; depends=[Biobase BiocGenerics Biostrings doBy IRanges rbamtools refGenome seqLogo]; };
   splicegear = derive2 { name="splicegear"; version="1.50.0"; sha256="0i47l91p77s4acgrx9c8ll2va7amysw1g2acs36mn99hpz86v4m4"; depends=[annotate Biobase XML]; };
@@ -1423,7 +1423,7 @@ in with self; {
   stepNorm = derive2 { name="stepNorm"; version="1.50.0"; sha256="10fd623pqy944q9l913bv1a3dh7wk4i0r211hvvzdr39kfhjl6mf"; depends=[marray MASS]; };
   subSeq = derive2 { name="subSeq"; version="1.8.0"; sha256="1z9qwfclhnnvcp4r4zfi201rmgd0hj47rd77x958m1d6d3z65m34"; depends=[Biobase data_table digest dplyr ggplot2 magrittr qvalue tidyr]; };
   supraHex = derive2 { name="supraHex"; version="1.16.0"; sha256="10lhdhlb33p91np6ldmxc8yqgxwly7p37nlacm77q35dp05a453n"; depends=[ape hexbin MASS]; };
-  survcomp = derive2 { name="survcomp"; version="1.28.4"; sha256="185k9srpfzvr51xfbgq1xy39x40cxgcvvq772y9gdk1702fxvyw0"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
+  survcomp = derive2 { name="survcomp"; version="1.28.5"; sha256="09winy33410hw6srybaw49m2nb5cyp3fx0ww9gyhhkh73cvb6xwb"; depends=[bootstrap ipred KernSmooth prodlim rmeta SuppDists survival survivalROC]; };
   sva = derive2 { name="sva"; version="3.26.0"; sha256="0q5xb68wfcnchy8rkv5ma67pmz1i91lsnvmwmj8f1c3w4xan3pgw"; depends=[BiocParallel genefilter limma matrixStats mgcv]; };
   swfdr = derive2 { name="swfdr"; version="1.4.0"; sha256="0ls0w09bkxxqv1y50d5c1s0qpxb1xdyall8ypvky8awi7v6jlrcg"; depends=[dplyr ggplot2 reshape2]; };
   switchBox = derive2 { name="switchBox"; version="1.14.0"; sha256="0mhkf4wwd3v3s1148nafbd6x6ys8j933glh4gp3wj24ddmmpxvb2"; depends=[gplots pROC]; };
@@ -1468,7 +1468,7 @@ in with self; {
   vtpnet = derive2 { name="vtpnet"; version="0.18.0"; sha256="02nws97nmlrpzwb5jqm3fmg38mp1qdf41hzwmmprhfhsymnmc4ch"; depends=[doParallel foreach GenomicRanges graph gwascat]; };
   vulcan = derive2 { name="vulcan"; version="1.0.0"; sha256="1yxm6yg7d65wh9rl6k5b6831y4hr5l9nnmfi0azxz1h4x1ghqbdj"; depends=[Biobase caTools ChIPpeakAnno csaw DESeq DiffBind GenomicRanges gplots locfit S4Vectors TxDb_Hsapiens_UCSC_hg19_knownGene viper wordcloud zoo]; };
   wateRmelon = derive2 { name="wateRmelon"; version="1.22.1"; sha256="08imbxhs4ikm6panz3y64b24d2ghy1s2ksgd8siff53hg2v59rqr"; depends=[Biobase IlluminaHumanMethylation450kanno_ilmn12_hg19 illuminaio limma lumi matrixStats methylumi ROC]; };
-  wavClusteR = derive2 { name="wavClusteR"; version="2.11.0"; sha256="0f1lk45a9yqr0ysjq8kjpqys8qln2b8ix03nywcqnkl1lk2b5ymi"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; };
+  wavClusteR = derive2 { name="wavClusteR"; version="2.12.1"; sha256="01b8aqwi7nd8l7mkiqgg9skvl0r6y1vwslwchyk95a9l4hkhxrz9"; depends=[BiocGenerics Biostrings foreach GenomicFeatures GenomicRanges ggplot2 Hmisc IRanges mclust Rsamtools rtracklayer S4Vectors seqinr stringr wmtsa]; };
   waveTiling = derive2 { name="waveTiling"; version="1.20.0"; sha256="1dlz548vjnarz15mscmj56jp2hn810w0dy7xprxx22n51h7kb7jg"; depends=[affy Biobase Biostrings GenomeGraphs GenomicRanges IRanges oligo oligoClasses preprocessCore waveslim]; };
   weaver = derive2 { name="weaver"; version="1.44.0"; sha256="06fg8z4gp2mabiy9jrfwkrrz1r4qzzgjk3lxj6d53ii2xhq95vy6"; depends=[codetools digest]; };
   webbioc = derive2 { name="webbioc"; version="1.50.0"; sha256="1kg6apnhq97ypmpx6qm2f7wip81f910mjlg9kmd9zzmhnkrhqamd"; depends=[affy annaffy Biobase BiocInstaller gcrma multtest qvalue vsn]; };
diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 8e8085fdece5..ee3dcdef20c9 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -4,7 +4,7 @@
 # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix
 
 { self, derive }:
-let derive2 = derive { snapshot = "2018-03-12"; };
+let derive2 = derive { snapshot = "2018-04-20"; };
 in with self; {
   A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; };
   ABC_RAP = derive2 { name="ABC.RAP"; version="0.9.0"; sha256="1kdspln17v0krvahcd55vib4dv5azp60b3r1zf489x10qqbp1mxk"; depends=[]; };
@@ -29,6 +29,7 @@ in with self; {
   ADM3 = derive2 { name="ADM3"; version="1.3"; sha256="1hg9wjdhckilqd13dr4cim4j6jsh2sdwm18i3pfmfdj8cyswm3h0"; depends=[]; };
   ADMM = derive2 { name="ADMM"; version="0.2.2"; sha256="0rwszi152nm6rrmgh23js2cv0yfrsa6vky4gmrgszxgx8sw221v9"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; };
   ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; };
+  ADMMsigma = derive2 { name="ADMMsigma"; version="1.0"; sha256="141jzg7cvq1wlscrpb4hfkdshbm0vgzy4cas8vb6abh53j8h2g8q"; depends=[doParallel foreach ggplot2 Rcpp RcppArmadillo]; };
   ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; };
   ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; };
   AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; };
@@ -38,6 +39,7 @@ in with self; {
   AFM = derive2 { name="AFM"; version="1.2.2"; sha256="132zbxim3cbyxhv27l9i3jyhf5c47ckzsg4qndpwbyjhd0p9x7qh"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph moments plyr png pracma rgl scales shiny shinyjs sp stringr]; };
   AGD = derive2 { name="AGD"; version="0.35"; sha256="1dk8m3zqvapwhz0677d3b2cbrin14p9adn5annzgjrxgw7ms4mg0"; depends=[gamlss gamlss_dist]; };
   AGSDest = derive2 { name="AGSDest"; version="2.3.1"; sha256="10jakc2qs5gnbp0g4k05isy0ii73ric50gmwkbb1khf9x0b5v6dg"; depends=[ldbounds]; };
+  AGread = derive2 { name="AGread"; version="0.1.2"; sha256="17jj6g0df3cldaq4brn1abdivfg7w5bwycbrs70ynmy6iqib8piy"; depends=[data_table dplyr magrittr seewave]; };
   AHMbook = derive2 { name="AHMbook"; version="0.1.4"; sha256="1cxyk420pzhh1scagxjmpm328xrcc1mpdrrch92yfgbgx09zkr4c"; depends=[coda plotrix RandomFields raster sp unmarked]; };
   AHR = derive2 { name="AHR"; version="1.4.2"; sha256="15khncbbnpbvj6rcn6rklzhv5a0mmfyjljv77bsx96zfis7mk2d7"; depends=[etm MASS Rcpp RcppArmadillo survival]; };
   AICcmodavg = derive2 { name="AICcmodavg"; version="2.1-1"; sha256="0y2lgvy0a78wdx4xcq85fkhl4hyvjdljrj199mibisfgkh61amb1"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; };
@@ -56,32 +58,34 @@ in with self; {
   AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; };
   AMCTestmakeR = derive2 { name="AMCTestmakeR"; version="0.1.0"; sha256="0wqz9akk5340k0z5791dh8zmh7bfrj7ln05xlw548dql47w0xnrk"; depends=[]; };
   AMGET = derive2 { name="AMGET"; version="1.0"; sha256="18wdzzg5wr7akbd1iasa4mvmy44fb2n5gpghwcrx80knnicy3dxq"; depends=[]; };
-  AMIAS = derive2 { name="AMIAS"; version="1.0.1"; sha256="17ay7dgi2c7ybps337ngyc1lg6fy84lxvkqfrr8nf5rjapw8mg6w"; depends=[limSolve Matrix zoo]; };
+  AMIAS = derive2 { name="AMIAS"; version="1.0.2"; sha256="142bp8yaa87dpxkjrbcq57pr65x8q921hb5kxrcpghg157y5byn3"; depends=[limSolve Matrix zoo]; };
   AMModels = derive2 { name="AMModels"; version="0.1.3"; sha256="1lhd15sh550z664qqxw6jpknnh628hm585d70ipx8s4mswi6g4hj"; depends=[unmarked]; };
   AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; };
   AMORE = derive2 { name="AMORE"; version="0.2-15"; sha256="00zfqcsah2353mrhqkv8bbh24l8gaxk4y78icr9kxy4pqb2988yz"; depends=[]; };
-  AMR = derive2 { name="AMR"; version="0.1.0"; sha256="1vp2l4xfd44sy14fqir2d7kq8835np6hnrzdhqkwxh5vjw8wkfyx"; depends=[dplyr reshape2 rvest xml2]; };
+  AMR = derive2 { name="AMR"; version="0.1.1"; sha256="1kyy70g6nh37a1kfcc4p3d8yd61rhsk07rzh8hk0x5zyvc6gcs8l"; depends=[dplyr reshape2 rvest xml2]; };
   ANLP = derive2 { name="ANLP"; version="1.3"; sha256="1m1jnfaqny6qprgyk4f3naan5i5cildawv322h6mc25nypwl12m4"; depends=[dplyr qdap RWeka tm]; };
   ANN2 = derive2 { name="ANN2"; version="1.5"; sha256="17b0dv1dl4kni7yvrrwk65cadk6f7qk7505r27j9v530pffyv1k3"; depends=[Rcpp RcppArmadillo robustbase]; };
   ANOM = derive2 { name="ANOM"; version="0.5"; sha256="14nfy9xplbabfprwxz5fvx26nmqhp657vr6d90dc8vk8ds63ckiz"; depends=[ggplot2 MCPAN multcomp nparcomp SimComp]; };
+  ANOVA_TFNs = derive2 { name="ANOVA.TFNs"; version="1.0"; sha256="0dwspvxj2gzyvxsd9xyhv47n1hjlqa7z9qza4h3hn1xda12vkjly"; depends=[FuzzyNumbers]; };
   ANOVAreplication = derive2 { name="ANOVAreplication"; version="1.1.3"; sha256="1cmps21lrmk6lh6gx0q9fz2736q7cibfcisvir6hnik3ablv70bn"; depends=[quadprog shiny]; };
   APCanalysis = derive2 { name="APCanalysis"; version="1.0"; sha256="11snn5i8zyjpzf58ica762fpp14v7x5h8a8iwx4s4v81pgvlx862"; depends=[]; };
-  APML0 = derive2 { name="APML0"; version="0.7"; sha256="1ivlyljyllkd53y3ckar7mrdykmd8fz3sg8i1xgfygrcnq79qz0i"; depends=[Matrix Rcpp RcppEigen]; };
+  APML0 = derive2 { name="APML0"; version="0.8"; sha256="15qg0iapl2qh4llc8qazxc9qb4fi82snnw2agjgi29zcq7lzi2ww"; depends=[Matrix Rcpp RcppEigen]; };
   APPEstimation = derive2 { name="APPEstimation"; version="0.1.1"; sha256="1bg9ma4i3k3xdgyk2h4f368gqnczvlhvjw4114iznmrv1wl4g25c"; depends=[densratio]; };
   APSIM = derive2 { name="APSIM"; version="0.9.2"; sha256="0yyjz1kyvqpw9dh71ls2lf44gbb6r7bp9a22mr3z68k89azps5rc"; depends=[data_table lubridate plyr RSQLite sirad stringr]; };
   APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; };
-  APfun = derive2 { name="APfun"; version="0.1.2"; sha256="0qw769ifcc7g9jq8ba2sxghcck52cspj3rpg8pkj2i185vg0lw77"; depends=[maptools raster rgdal sp yesno]; };
+  APfun = derive2 { name="APfun"; version="0.1.3"; sha256="02p40n4l66r63wq8x7ygchfhxmnpaa7vgy4bjhkqx5gfi2v4psxd"; depends=[maptools raster rgdal sp yesno]; };
   APtools = derive2 { name="APtools"; version="3.0"; sha256="0v5xgznc8hvw3gid8x5chksc62zpwbx34qsh64sv7d1kqmh5w26j"; depends=[survival]; };
   AR = derive2 { name="AR"; version="1.0"; sha256="1h9rzlwnfm646s7423pcxz0zqykyadiw4sbxlygy2382la81x69x"; depends=[DISTRIB]; };
   AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; };
   ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; };
+  ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; };
   ARPobservation = derive2 { name="ARPobservation"; version="1.1"; sha256="1cdhn11jf1nf03jyvs17ygmjq9pb5rvmyyrq9fp7ifmvcgbkwsms"; depends=[]; };
   ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; };
   ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; };
-  ARTP = derive2 { name="ARTP"; version="2.0.4"; sha256="1f6ay9lyaqsc33b0larb8v6imp5adaycya84wif2sg32rv4gx3yl"; depends=[]; };
+  ARTP = derive2 { name="ARTP"; version="2.0.5"; sha256="0lwvhf5lamw28sd41vrhyin8ab92rl93j1ahk0aacwvnikgmfkpj"; depends=[]; };
   ARTP2 = derive2 { name="ARTP2"; version="0.9.32"; sha256="12mrxssjcj08svdsrxv2nm53mzsgy1k0whd5zzy6fz327bjyqsrz"; depends=[data_table Formula]; };
   ARTool = derive2 { name="ARTool"; version="0.10.4"; sha256="1malrjv4myk9nj3dndgpzscfhky4y6lj8xbfg8h2b29g7s2k846q"; depends=[car dplyr lme4 magrittr plyr]; };
-  ASICS = derive2 { name="ASICS"; version="1.0.1"; sha256="0axjq2a99kl6qk05w5r9ddx3954m60739miarbwadlqwnsd5lkqk"; depends=[doParallel foreach ggplot2 plyr quadprog zoo]; };
+  ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.1.0"; sha256="017m7cji04gbcn396jz428llik15zgdvbr6bf1c8scds692paz3n"; depends=[sp]; };
   ASIP = derive2 { name="ASIP"; version="0.3.2"; sha256="0zrn3hnn46zxmvchicyzy7zz2jnv8y1249a6sdi3w9rw2d8q025g"; depends=[gdalUtils raster rgdal]; };
   ASMap = derive2 { name="ASMap"; version="1.0-2"; sha256="0fhivq5i2py79jkwfms0my77p9x8lrkn5vn1lwbsawfkyar4dvkq"; depends=[fields gtools lattice qtl RColorBrewer]; };
   ASPBay = derive2 { name="ASPBay"; version="1.2"; sha256="0b1qpyvmj7z10ixrmdxp42bj9s72c1l9rihzmv9p58f12a5aznjz"; depends=[hexbin Rcpp RcppArmadillo]; };
@@ -107,7 +111,7 @@ in with self; {
   AcuityView = derive2 { name="AcuityView"; version="0.1"; sha256="0f0iclmnwdc8ixiiai4svk4x1g3pjy7dhm3cm58fv6ckx12d3d2l"; depends=[fftwtools imager plotrix]; };
   AdMit = derive2 { name="AdMit"; version="2.1.3"; sha256="150zjxl56axhpgm25hzyhwwc5g77pkgi291d2v56zbjjqycfz2v8"; depends=[mvtnorm]; };
   AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; };
-  AdapSamp = derive2 { name="AdapSamp"; version="1.0"; sha256="1nww2c3kz1a62ivkvlcvhgx68wdk9ka8jhw1k8pilbgairxsbxgn"; depends=[pracma]; };
+  AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; };
   AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; };
   AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.65"; sha256="0f92dgfiglbklr4lv5kqxks8d04f675jlj2xjy9aqk4cgdj264xk"; depends=[MASS mgcv nlme SemiPar]; };
   AdaptGauss = derive2 { name="AdaptGauss"; version="1.3.3"; sha256="0f6wk9ds8ayzi0fj1dz1m3755d1sjv4v5vc1hjhfxaim127kmbqh"; depends=[caTools ggplot2 shiny]; };
@@ -129,6 +133,7 @@ in with self; {
   Amelia = derive2 { name="Amelia"; version="1.7.4"; sha256="0w6532s5xr7pw47zqhhymql7i68c4lralvw1gc26l9d4c7ib00fd"; depends=[foreign Rcpp RcppArmadillo]; };
   AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; };
   AmesHousing = derive2 { name="AmesHousing"; version="0.0.3"; sha256="1fr01ka8x8gdnky6cbd2bjlh1lx71gzq440zsknn9kxvf01s6pxm"; depends=[dplyr magrittr]; };
+  AmigaFFH = derive2 { name="AmigaFFH"; version="0.1.2"; sha256="0749j6m8pvdq4lm0n46bn052nxvplh3nvp2miz4hagw8q2p5fsyl"; depends=[adfExplorer ProTrackR tuneR]; };
   AmmoniaConcentration = derive2 { name="AmmoniaConcentration"; version="0.1"; sha256="05pnwfji9l9az4jvni6jy7cayzg5pbspz82a63kmj6rgibn4ywvn"; depends=[]; };
   AmostraBrasil = derive2 { name="AmostraBrasil"; version="1.2"; sha256="06y555gl9g89gygrv1rhg8j1bhb38m09mvvw67wvwhdl56j0fqbd"; depends=[foreign RCurl rgdal RJSONIO sp stringr]; };
   AmpliconDuo = derive2 { name="AmpliconDuo"; version="1.1"; sha256="1vqpahavsksphxjyhd94dghg9ddskbfbs5vl5qcwl3jkjfvl7lwy"; depends=[ggplot2 xtable]; };
@@ -138,14 +143,14 @@ in with self; {
   AnalyzeFMRI = derive2 { name="AnalyzeFMRI"; version="1.1-16"; sha256="1mbjb682ns5230jd3vcvd6x4gnn9hpbmjd7r8120y4sp2g733b0f"; depends=[fastICA R_matlab]; };
   AnalyzeTS = derive2 { name="AnalyzeTS"; version="2.2"; sha256="0ll4g8yzxhricz56vin8hhyplrmvjmkwfldya41vz6y6bwhywnmb"; depends=[MASS TSA tseries TTR urca]; };
   AncestryMapper = derive2 { name="AncestryMapper"; version="2.0"; sha256="1fr2y1a5rn7rq8aly94f618kywix32jwysi70nfhaqx8hf4zzprb"; depends=[svd]; };
-  AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.0"; sha256="0vkb50v3by5z7qmaqpdb81zmbz23f315k09mpfy7qwsjfdgcpshv"; depends=[dplyr ggplot2]; };
+  AnglerCreelSurveySimulation = derive2 { name="AnglerCreelSurveySimulation"; version="1.0.2"; sha256="1nhd0i30g5wb5jh96gfaa0lgnbnj0m2vy4gz7v2c3142396zalnx"; depends=[dplyr ggplot2]; };
   AnnotLists = derive2 { name="AnnotLists"; version="1.2"; sha256="1g2khb2ggniwg2zcjamsm3bxyrl2zabvk540b5vyy9am9k83m1g9"; depends=[]; };
-  AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.1"; sha256="1pdwb4zmvirbn3aikd66djhzwga18w50krgn43mlw5dpa9c7fvhv"; depends=[ape seqinr]; };
+  AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.2"; sha256="1r52qry6xvn79b6qsbch35jhzg8y71kxqq9xm6gd302cv2xbwq7q"; depends=[ape seqinr]; };
   AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; };
   AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; };
   AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; };
-  AnthropMMD = derive2 { name="AnthropMMD"; version="2.3.3"; sha256="1q8pjxlrba7dna647pkzyj41scq8xghx5h7ac3jamhrkdppf5fdk"; depends=[MASS shiny]; };
-  Anthropometry = derive2 { name="Anthropometry"; version="1.9"; sha256="1d1grh952kfpanz4vpvdbnx4yn42kkc6z78cc601l70azar2p7zg"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
+  AnthropMMD = derive2 { name="AnthropMMD"; version="2.5.0"; sha256="0pp9ihrkjwzp6zyglkp81ry4fzm1s26r687bhxswx5iz1brzmhdn"; depends=[scatterplot3d shiny smacof]; };
+  Anthropometry = derive2 { name="Anthropometry"; version="1.10"; sha256="1rny65070yrdxnny8frp5ryp811h59924z5pfwg0cmd2szxnxnz7"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; };
   Aoptbdtvc = derive2 { name="Aoptbdtvc"; version="0.0.2"; sha256="1bygvf8vgzz3wa4485x2xxpk784zmw1nwsjjjysm12brrldh8zzh"; depends=[lpSolve MASS]; };
   ApacheLogProcessor = derive2 { name="ApacheLogProcessor"; version="0.2.2"; sha256="01h8hi76nlwn9hnfyvzyg2d25s2r0vgpl5rz37yqkhjs5xr3rpyi"; depends=[doParallel foreach stringr]; };
   AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-6"; sha256="004d2k3mhl45inb7kx1ph8xc8h9bgm7f7l3prmvqrl5792400cn4"; depends=[CORElearn MASS plyr reshape2]; };
@@ -157,10 +162,11 @@ in with self; {
   ArchaeoPhases = derive2 { name="ArchaeoPhases"; version="1.3"; sha256="0012rjbk3bxf6j7p0skp02yrgqzl903dclnmm7c038f941krjcfq"; depends=[coda DT ggalt ggplot2 ggthemes hdrcde readr shiny shinythemes toOrdinal]; };
   ArfimaMLM = derive2 { name="ArfimaMLM"; version="1.3"; sha256="0s5igf703zzvagsbdxf5yv4gn0vdq51b7fvbc8xkgvlmv91yy372"; depends=[fracdiff fractal lme4]; };
   ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; };
+  Arothron = derive2 { name="Arothron"; version="1.0.0"; sha256="0fwxrjkqq8dkh38s3dcky0d6nggnmvfik0w3c4mzslzipnm84sin"; depends=[compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; };
   ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; };
   AsioHeaders = derive2 { name="AsioHeaders"; version="1.11.0-1"; sha256="1g226im9aakqdv5gynsl568w0mxcbfrny9lqid7pl984pq8xr8ks"; depends=[]; };
   AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; };
-  AssetPricing = derive2 { name="AssetPricing"; version="1.0-0"; sha256="12v8hmmknkp472x406zgzwjp7x8sc90byc3s3dvmwd5qhryxkkix"; depends=[deSolve polynom]; };
+  AssetPricing = derive2 { name="AssetPricing"; version="1.0-1"; sha256="0pbb1362dgdipbj3h50ykissl3gdqf1j1mpq53ixprvyc966c5h4"; depends=[deSolve polynom]; };
   AssocAFC = derive2 { name="AssocAFC"; version="1.0.1"; sha256="0fxqsj2a9wi5py4sw3mzf27zx82nbj1q294vj1n0jh9ryc68wyh3"; depends=[CompQuadForm]; };
   AssocTests = derive2 { name="AssocTests"; version="0.0-4"; sha256="1fhqzbj4aj4srkiba79w8wdyc7yy701izklxqqa7lsifnca6gn4j"; depends=[cluster combinat fExtremes mvtnorm]; };
   AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; };
@@ -180,17 +186,17 @@ in with self; {
   BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; };
   BACprior = derive2 { name="BACprior"; version="2.0"; sha256="1z9dvjq4lr99yp6c99bcv6n5jiiwfddfz4izcpfnnyvagfgizr8p"; depends=[boot leaps mvtnorm]; };
   BAEssd = derive2 { name="BAEssd"; version="1.0.1"; sha256="04wkhcj4wm93hvmfnnzryswaylnxz5qsgnqky9lsx4jqhvg340l6"; depends=[mvtnorm]; };
-  BALCONY = derive2 { name="BALCONY"; version="0.1.8"; sha256="0bnhwz319dy1wc9g2sxb5w2hn8ypzxgaghrg4r82yjl5xig8qmd5"; depends=[Rpdb scales seqinr]; };
+  BALCONY = derive2 { name="BALCONY"; version="0.2.0"; sha256="0ddg5fy82yxnmh54dilpljwfziqpc8rjladmcdnn5p98n9a6ypvl"; depends=[Biostrings dplyr readr Rpdb scales seqinr]; };
   BAMBI = derive2 { name="BAMBI"; version="1.1.1"; sha256="1jzvsaf9cn28ny40vg0wlvdqz6f4i7n6iyym8s0aj58aiazwsmh5"; depends=[label_switching Rcpp RcppArmadillo]; };
   BAMMtools = derive2 { name="BAMMtools"; version="2.1.6"; sha256="01mb40w3g0xy93pl9064ky8kd46sa7qlz6by1r6kchcfhajx8plv"; depends=[ape gplots Rcpp]; };
   BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.1"; sha256="1xs65drkpd1zmrvyrv0kndd5z5q4y425524w6mrh96qya9qjrmsx"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2 zoo]; };
   BANFF = derive2 { name="BANFF"; version="2.0"; sha256="1c5wdwqqvkcm9910lhd387snd7myv9qzs9vfk87vzp3di7hdi4l6"; depends=[coda doParallel DPpackage flexmix foreach GGally igraph mclust network pscl truncnorm]; };
   BANOVA = derive2 { name="BANOVA"; version="1.1.1"; sha256="11cvf7wjip1vn5qn9hwxvdh98i8li9ijydfywf2ks2hls2430qbk"; depends=[coda rjags rstan runjags]; };
-  BART = derive2 { name="BART"; version="1.5"; sha256="0vhyxyp0bbbkyymkwhll8jck3n4mybglshmfs9bycn4xmmm5rq8j"; depends=[Rcpp survival]; };
-  BAS = derive2 { name="BAS"; version="1.4.7"; sha256="0rpgfzwc41clkdf20mh6wdd2fari84rfgfgzxw04lb3b3s7hz8y4"; depends=[]; };
+  BART = derive2 { name="BART"; version="1.6"; sha256="06a6bxrxspgjij8mgi1gzq7fbak9zqppprl55jbb91nkf13svbzq"; depends=[Rcpp survival]; };
+  BAS = derive2 { name="BAS"; version="1.4.9"; sha256="0c0mj7ijgghbjmyrwr6qp2a3iidsxli3a0wb4njjaj5n7b7yggby"; depends=[]; };
   BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; };
   BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; };
-  BASiNET = derive2 { name="BASiNET"; version="0.0.2"; sha256="1qik3r52hygxldw3sw0sln7yw7z0bmybavf0kf9fmpkyir0z0xvn"; depends=[Biostrings igraph randomForest rgl rmcfs RWeka]; };
+  BASiNET = derive2 { name="BASiNET"; version="0.0.3"; sha256="0kcmc4jpiwmdydbyjfm1jx4ravxkqzvqca3p5gp26nx14xglm9hi"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; };
   BAT = derive2 { name="BAT"; version="1.5.6"; sha256="0m6yfxymhzi8n2l421ngy6cz3qa5v7yrd1jhpi8ymlnf8dysd57x"; depends=[nls2 raster spatstat vegan]; };
   BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; };
   BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; };
@@ -214,13 +220,13 @@ in with self; {
   BCgee = derive2 { name="BCgee"; version="0.1"; sha256="0ad0dj2ymgvkmcmq3jlpmn0pgigdql0xgvcwsbpdydv33a6snr04"; depends=[]; };
   BClustLonG = derive2 { name="BClustLonG"; version="0.1.2"; sha256="0w35pwv3y00pmi4qjnzii3q44k7lk13x0cmh1zq3cl42gpi31p7f"; depends=[lme4 MASS mcclust Rcpp RcppArmadillo]; };
   BDWreg = derive2 { name="BDWreg"; version="1.2.0"; sha256="07j6dy69q1as1nwgp2790wzpzmjich2256cddhl7n3h2rs1dja74"; depends=[coda doParallel DWreg foreach MASS]; };
-  BDgraph = derive2 { name="BDgraph"; version="2.44"; sha256="055pmjf8pgfqih6bxjj34gz7gj78y4z3kldy561z7mi443kwphq6"; depends=[igraph Matrix]; };
+  BDgraph = derive2 { name="BDgraph"; version="2.46"; sha256="1y3rcl0x1cvcsfp4p1v82v0i119izwa8hkvs5qang70slv973bbv"; depends=[igraph Matrix]; };
   BEACH = derive2 { name="BEACH"; version="1.2.1"; sha256="0a6xwczw3d2jnksb5lpf7j859pnyfxcab4kfv4v7lmf9iasbyyf5"; depends=[devtools DT haven plyr readxl rJava rtf sas7bdat shiny WriteXLS xtable]; };
   BEDASSLE = derive2 { name="BEDASSLE"; version="1.5"; sha256="1bz3lr0waly9vj9adwhmgs3lq7zjdkcbvm3y9rnn72qlrwmv5fbn"; depends=[emdbook MASS matrixcalc]; };
   BEDMatrix = derive2 { name="BEDMatrix"; version="1.4.0"; sha256="0aha33skksh45fx248lx6v8cxwgkiripw3avspb8arbld9rmqwxn"; depends=[BH crochet Rcpp]; };
   BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; };
-  BEST = derive2 { name="BEST"; version="0.5.0"; sha256="178vn0ps6nr7qjayavnvmbyx6gq57dni5llsncl89kkz633mb2hg"; depends=[coda HDInterval rjags]; };
-  BETS = derive2 { name="BETS"; version="0.3.3"; sha256="09xgf356casig06q7jys5h55y8kj0ndnr7mkymgzcvni7djc5gq3"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny stringr urca webshot xml2 zoo]; };
+  BEST = derive2 { name="BEST"; version="0.5.1"; sha256="0yx3bkaaly0lriyd5xr7aay4c381a5iwanfixz9v37cmvs64rs4s"; depends=[coda HDInterval rjags]; };
+  BETS = derive2 { name="BETS"; version="0.3.6"; sha256="0m32ad2ysb5dr4125fccrbi5cndal3qml0lflnp9kdbm6wwhqv85"; depends=[DBI DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny stringr urca webshot xml2 zoo]; };
   BGData = derive2 { name="BGData"; version="1.0.0"; sha256="0xd7xpnvhpyvv6caxyif7wa25llvrnyzmmk4z6rp7absjqbz2alc"; depends=[BEDMatrix bigmemory bit ff LinkedMatrix symDMatrix]; };
   BGGE = derive2 { name="BGGE"; version="0.6.1"; sha256="1ndn4cj9mrkx2mrlh2dgyy3lpx526fmg91zqgvdcbvn99r5sl17j"; depends=[]; };
   BGLR = derive2 { name="BGLR"; version="1.0.5"; sha256="14a979rnasaklkfafzpkhr6mqv0ga7fsfxq63scpnlwa2aasgn83"; depends=[]; };
@@ -230,7 +236,7 @@ in with self; {
   BHH2 = derive2 { name="BHH2"; version="2016.05.31"; sha256="1m4fcx979nbm97hi89vbjjix0sx6qhdzs486risck9bi7yzih5k4"; depends=[]; };
   BHMSMAfMRI = derive2 { name="BHMSMAfMRI"; version="1.1"; sha256="1qygizn2np9amkm1f1332zp9ab9ky423plr9lahgwzdxn1c2c5c2"; depends=[AnalyzeFMRI fmri wavethresh]; };
   BIEN = derive2 { name="BIEN"; version="1.2.2"; sha256="11bqbkw6v4yvlvpv0bhmn5q7ady12hmp9ziak5jzsc7p4d8azd5r"; depends=[ape DBI rgdal rgeos RPostgreSQL sp]; };
-  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.3-18"; sha256="0cf5nbqcfvx76v1iia2d48j6dg9sqscmjrl0r835xbssiv9xk5w4"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
+  BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="2.4-9"; sha256="0v9q2gxb7i9zgkkf8ka85r3l3ypg21fzl48paliqi5ac144l177q"; depends=[miceadds mitools Rcpp RcppArmadillo survey TAM]; };
   BIGDAWG = derive2 { name="BIGDAWG"; version="2.1"; sha256="0zvy5sl94qi20gdrnxb2lmadfy7p0wqfngjsf6jc2cgwyzk4gnrj"; depends=[haplo_stats httr knitr rmarkdown XML]; };
   BIGL = derive2 { name="BIGL"; version="1.1.1"; sha256="008f3x0hkmifra1wcv56hxjjf2rqc9qxsbpi23aq4pgk7mxdaax7"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; };
   BINCOR = derive2 { name="BINCOR"; version="0.1.0"; sha256="0fzynq85zbjybylxrpk89sq4l1ccm8k4z1bn25b6rgnz5m18r8hs"; depends=[pracma]; };
@@ -238,14 +244,14 @@ in with self; {
   BIOMASS = derive2 { name="BIOMASS"; version="1.2"; sha256="1d9rwgh0ws27yd0p2la7pn49sb71lh9bg4f42fpx448ah8dimw17"; depends=[httr jsonlite minpack_lm msm raster]; };
   BIOdry = derive2 { name="BIOdry"; version="0.5"; sha256="0isvqs2bgirxwb7b1dbn70zfx9b4mw7fp33fwmxq0dx6k1r4f87g"; depends=[ecodist nlme]; };
   BIPOD = derive2 { name="BIPOD"; version="0.2.1"; sha256="04r58gzk3hldbn115j9ik4bclzz5xb2i3x6b90m2w9sq7ymn3zg1"; depends=[Rcpp RcppArmadillo]; };
-  BIS = derive2 { name="BIS"; version="0.1.0"; sha256="0m9wvz4vg9vpw6dxjdxzi3vbkflvs4041xjrpic5jngw0jv8fjz0"; depends=[dplyr readr rvest tidyr xml2]; };
-  BKPC = derive2 { name="BKPC"; version="1.0"; sha256="1c5n2vdpsk00slqyxxq2c8d7ix8jdbyigrh23ykd4b95mynp9kdv"; depends=[kernlab]; };
+  BIS = derive2 { name="BIS"; version="0.2.0"; sha256="15wybfj03rzrxxdm19mm7b7c2l71lzs50n7vw8vnyx1n5w1k97jv"; depends=[dplyr readr rvest tidyr xml2]; };
+  BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; };
   BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; };
   BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; };
   BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.1.5"; sha256="0wnxfyl8hz1a0k33v5nc3j1ziwcv1fnw8639l0xv92p5rn7n5nc5"; depends=[mvQuad numDeriv randtoolbox Rcpp ucminf]; };
   BLR = derive2 { name="BLR"; version="1.4"; sha256="0wy3c8nnzkdhwb5s1ygdid47hpdx72ryim36mnicrydy0msjivja"; depends=[SuppDists]; };
   BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; };
-  BMA = derive2 { name="BMA"; version="3.18.7"; sha256="095iwlbjklg1pkp5jiw0srg7jh9cn50g8z4namrs4xsmlh7if65z"; depends=[inline leaps robustbase rrcov survival]; };
+  BMA = derive2 { name="BMA"; version="3.18.8"; sha256="1a32ghn17ymb3zdh9xv6zvqcxc81m4y478mk6z9bfndq7ihy1ih5"; depends=[inline leaps robustbase rrcov survival]; };
   BMAmevt = derive2 { name="BMAmevt"; version="1.0.1"; sha256="1krx8isj2wp3panjcbc2ysrc2pxz2casj12qq9p18imaa326l53y"; depends=[coda]; };
   BMRBr = derive2 { name="BMRBr"; version="0.1.0"; sha256="1z54annplzydnxvwd0rkhcw5rmfx8r99k28ld5rgh22xq3zdq825"; depends=[rvest xml2]; };
   BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; };
@@ -263,12 +269,13 @@ in with self; {
   BNSL = derive2 { name="BNSL"; version="0.1.3"; sha256="1918dc73gasac45kzcf4pxvl8iaawzkqdi03ny0napbjr3z8rss2"; depends=[bnlearn igraph Rcpp]; };
   BNSP = derive2 { name="BNSP"; version="2.0.2"; sha256="0vapcf8qxcdmragbmwai4yddpmwwm79mksf4zcych0d4a0ij39h6"; depends=[coda ggplot2 gridExtra plot3D threejs]; };
   BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; };
-  BOIN = derive2 { name="BOIN"; version="2.6"; sha256="0vg7rfypkqy8l0q9zyqhbciangv744rvylv9741rk87mdiwgjr8k"; depends=[Iso]; };
-  BPEC = derive2 { name="BPEC"; version="1.1"; sha256="14bkpmi1rmpl728nb7kmbmd687s5cvlzj181cxzwcaz3yb8x58nw"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; };
+  BOIN = derive2 { name="BOIN"; version="2.6.3"; sha256="0hvx75zjb5bj005ggj9j67p9f8hpq8p6c0ihidf3avfrirl8g98p"; depends=[Iso]; };
+  BPEC = derive2 { name="BPEC"; version="1.2.1"; sha256="142x0iw3sanvqm0n2hfba8pwndfk8l5qzhgpca9gcya7wkcmmmf7"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools R2G2 sp]; };
   BRugs = derive2 { name="BRugs"; version="0.9-0"; sha256="0f0v30mvfw97vfwzkjpqzf2894b2yhksja0xhpranprk135srxp0"; depends=[coda]; };
   BSDA = derive2 { name="BSDA"; version="1.2.0"; sha256="0gs33yyca45jd4f5k5f7qid4ayw2rnl2wl7a6m7vf39dfx7ympm2"; depends=[e1071 lattice]; };
   BSGS = derive2 { name="BSGS"; version="2.0"; sha256="08m8g4zbsp55msqbic4f17lcry07mdn0f5a61zdcy2msn2ihzzf9"; depends=[batchmeans MASS plyr pscl]; };
   BSGW = derive2 { name="BSGW"; version="0.9.2"; sha256="1q6qvm9yxh35wywrzs3kr31jsa0bmbwrqh0r3qjc0dzi6q8n6pjy"; depends=[doParallel foreach MfUSampler survival]; };
+  BSL = derive2 { name="BSL"; version="0.1.1"; sha256="0g8nqsnhrghan2kx5iciv01drzn8kbx5klmrvcjz0ajfqjdm8kg4"; depends=[coda cvTools foreach ggplot2 glasso gridExtra MASS Rcpp RcppArmadillo]; };
   BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; };
   BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; };
   BSagri = derive2 { name="BSagri"; version="0.1-8"; sha256="148pr4lkgdi4bwc9lavgj356nh240iazz28xklq14rw4gzhmz2k4"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; };
@@ -280,7 +287,7 @@ in with self; {
   BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; };
   BUCSS = derive2 { name="BUCSS"; version="0.0.2"; sha256="188d9f0gdhym28xvvk5z10amdbg50w6ab4ik2r9qfc3p1v7k10q9"; depends=[]; };
   BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; };
-  BVSNLP = derive2 { name="BVSNLP"; version="0.9.10"; sha256="06q7pdv0jc7q9m5ahyxj5dqv8bjc2zva3gjy8ys139mmv7i37pjv"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
+  BVSNLP = derive2 { name="BVSNLP"; version="1.1.0"; sha256="09vffm27jwpfmil6dn7jbsrh9ys3199l0qpfqrjcvz21nsgd43hg"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; };
   BWStest = derive2 { name="BWStest"; version="0.2.1"; sha256="1kwd1s1dd21qca31np49aql839j8325y8bnxlcq84nw48vqv0jgc"; depends=[memoise Rcpp]; };
   BaBooN = derive2 { name="BaBooN"; version="0.2-0"; sha256="145q2kabjks2ql3m48sfjis5y35l8rcqnr5s176viv9yhfafn351"; depends=[coda Hmisc MASS nnet Rcpp RcppArmadillo]; };
   BaM = derive2 { name="BaM"; version="1.0.1"; sha256="0y8m6mhghlrp379swj9cfrzqcdr3a7y29mx4d6zld4is00wdw16b"; depends=[coda dlm MASS mice nnet]; };
@@ -311,10 +318,11 @@ in with self; {
   BayesCombo = derive2 { name="BayesCombo"; version="1.0"; sha256="01rzjja0xzvqyjivl8a9da13v13ylm4dwv4f27cmgz2znakfg5y8"; depends=[]; };
   BayesComm = derive2 { name="BayesComm"; version="0.1-2"; sha256="1rrbvwcfm93cw0m33g0zn6nyshfjc97kb3fby9cga0zaixc0a8rk"; depends=[abind coda mvtnorm Rcpp RcppArmadillo]; };
   BayesDA = derive2 { name="BayesDA"; version="2012.04-1"; sha256="0fp27cmhw8dsxr4mc1flm6qh907476kph8ch2889g9p31xm1psjc"; depends=[]; };
+  BayesESS = derive2 { name="BayesESS"; version="0.1.12"; sha256="18dhswny8idj2wqpa66amz1yqk8yhk1vwazj4p70pk8jnpg8cdfy"; depends=[dfcrm LaplacesDemon MASS MatrixModels MCMCpack Rcpp RcppArmadillo RcppEigen]; };
   BayesFM = derive2 { name="BayesFM"; version="0.1.2"; sha256="0fiw2x29cpv3prywsbvs1m8a588s2wpi3bwzzjisi2rafbl619xd"; depends=[checkmate coda ggplot2 gridExtra plyr]; };
   BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-2"; sha256="17zfs8bmzp59zaxzcrzis2sxdnqxrv9h1kpb22112mp9l1alvwl4"; depends=[coda gtools Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; };
   BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; };
-  BayesGOF = derive2 { name="BayesGOF"; version="2.1"; sha256="13frvpb3jl8vq1h545k2pbqdj7547k9zipxxiggryvk65l2p4v30"; depends=[orthopolynom VGAM]; };
+  BayesGOF = derive2 { name="BayesGOF"; version="3.0"; sha256="15699lms3g9j9fwc6lng0bg1yngz18pvmvxwaqg8258qjwc79xlx"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; };
   BayesH = derive2 { name="BayesH"; version="1.0"; sha256="0mjd1i3rkhyq3qcalq0ing0ap0igbhyvczaihl4pcfidgs70bci3"; depends=[]; };
   BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; };
   BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; };
@@ -324,7 +332,7 @@ in with self; {
   BayesNetBP = derive2 { name="BayesNetBP"; version="1.3.0"; sha256="01blqc48ssgr3dg5bk7yzwpa59n3ja1dggglwm2441dwjxf10vxx"; depends=[bnlearn doBy fields graph gRbase igraph qtl qtlnet RColorBrewer Rgraphviz]; };
   BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; };
   BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; };
-  BayesRS = derive2 { name="BayesRS"; version="0.1.2"; sha256="11xpkq8x4xcpr4kmflr5blq0pn0ssfi9204bs5xfihn7q3d9bzwy"; depends=[coda ggplot2 metRology reshape rjags]; };
+  BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; };
   BayesS5 = derive2 { name="BayesS5"; version="1.30"; sha256="1nx61sq1d20238hbgr9p9hrmnxsxpsjhnb4sdhmqg1m7klq8qyrw"; depends=[abind Matrix snowfall]; };
   BayesSAE = derive2 { name="BayesSAE"; version="1.0-1"; sha256="09s7f472by689b2b0gahnkhyjriizpsx6r5qa95nf3f4bfqi2cpf"; depends=[coda Formula lattice]; };
   BayesSingleSub = derive2 { name="BayesSingleSub"; version="0.6.2"; sha256="0hgmyhg4mpxx7k91hbfa9h3533mqyn9rz4kl9kb30cc9g7g0m045"; depends=[coda MCMCpack mvtnorm]; };
@@ -356,7 +364,7 @@ in with self; {
   BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; };
   Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; };
   BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; };
-  BiDAG = derive2 { name="BiDAG"; version="1.0.2"; sha256="1y91vb9g6642c0j7cr3g9fg999fxb7bhbfvm0bdlnaixpbnky6qa"; depends=[pcalg Rcpp]; };
+  BiDAG = derive2 { name="BiDAG"; version="1.1.1"; sha256="1rncjsdyam7dnhd6ccdlvc85nnc79nsifcm24spc05k8rvx1836x"; depends=[pcalg Rcpp]; };
   BiDimRegression = derive2 { name="BiDimRegression"; version="1.0.6"; sha256="1kgrk4xanvxqdq619ha08wwplmsn2xqygx4dziagx48iqfpp1lxj"; depends=[nlme]; };
   BiG = derive2 { name="BiG"; version="0.1.0"; sha256="1wi2lyj3q1x47cpf1mdm5kqvjlcvbrliym6j5jbmwz7npc910vrb"; depends=[truncnorm]; };
   BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; };
@@ -371,6 +379,7 @@ in with self; {
   BinNonNor = derive2 { name="BinNonNor"; version="1.4"; sha256="00405ww9mh910jqww60w7cb8qbjql2jn13m60ly0bnxilg44r0bb"; depends=[BB corpcor Matrix mvtnorm]; };
   BinNor = derive2 { name="BinNor"; version="2.2"; sha256="03cggpk9fhndnk9vv5i6fzsq4wjxc5405xxlxg3l9gb618kj437f"; depends=[corpcor Matrix mvtnorm psych]; };
   BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.4"; sha256="0qiy0wf9i9r44ycz1jl666nwpsv5yz7vzz1szdy22sk68lz984bv"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; };
+  BinQuasi = derive2 { name="BinQuasi"; version="0.1-3"; sha256="0kxn71kfaldxji1a0zwnkalpjgrvw0jjfqm2f82gvj8cgcn69lgr"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog Rsamtools S4Vectors SummarizedExperiment]; };
   Binarize = derive2 { name="Binarize"; version="1.2"; sha256="014iagr76y3v7ljn6zlbg1hxwbwdi889bqxa7hwmqrcybnla22ja"; depends=[diptest]; };
   BinaryEMVS = derive2 { name="BinaryEMVS"; version="0.1"; sha256="1ainp6pg481yqhjc4f1pkxzxczbi3qm0kgq280vndq859ldfkpnh"; depends=[]; };
   BinaryEPPM = derive2 { name="BinaryEPPM"; version="2.1"; sha256="1f4y1mrscy9z87yglbynnsis623ar0gqpda3dfm9isa2z10c24qr"; depends=[expm Formula lmtest numDeriv]; };
@@ -394,7 +403,7 @@ in with self; {
   BivRegBLS = derive2 { name="BivRegBLS"; version="1.0.0"; sha256="1fi399vv54dnfywxbc8yb1r58lrl7zpqkahvcx3f5svjy20dvvbw"; depends=[ellipse]; };
   BivUnifBin = derive2 { name="BivUnifBin"; version="1.2"; sha256="0m4a2m7lvlm02hqqigwg3cd6sjzxnxqw1mchxj5g19whk34vwkwi"; depends=[BinOrdNonNor rootSolve]; };
   BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; };
-  Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.0"; sha256="0m5a41q56z6v0681y9093n5rdd33mg4fc904wjkqznlb4kn1156x"; depends=[]; };
+  Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.2"; sha256="1clfknv56zfi9wgzi5bricchvis83mc33i5d4qk3yzf2ryzxag7q"; depends=[compound_Cox]; };
   BlakerCI = derive2 { name="BlakerCI"; version="1.0-5"; sha256="16zj678qzwqih92q19dma7a602d0hif2dhii5hvxdgjymg7hg2bj"; depends=[]; };
   BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; };
   Blaunet = derive2 { name="Blaunet"; version="2.0.7"; sha256="19p2rqbg44pi0dz2iimjgr69zyrjf0dfsic6spph81dyrri1zyvh"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; };
@@ -404,8 +413,9 @@ in with self; {
   Bmix = derive2 { name="Bmix"; version="0.6"; sha256="17swhn2p7jv29fkspacg2v181lkc9yd3xww2fx31xs8hsndcm857"; depends=[mvtnorm]; };
   BoSSA = derive2 { name="BoSSA"; version="3.2"; sha256="03m4l77mq1h7vxfwkkp2r9acnbwd46mq85z27iizmwixnh81pgxy"; depends=[ape jsonlite phangorn plotrix RSQLite]; };
   BoardGames = derive2 { name="BoardGames"; version="1.0.0"; sha256="1w3ghs29qlnjrd46lvv055snclwwy6a22fgdqszqm377w4favnhm"; depends=[]; };
-  Bolstad = derive2 { name="Bolstad"; version="0.2-37"; sha256="12ivpaqx46yhvpnmncvprn4dkqgk7aqfjyvi69j8v31c1al9h5d3"; depends=[mvtnorm]; };
+  Bolstad = derive2 { name="Bolstad"; version="0.2-38"; sha256="1535cfpn202vb037q027dy51kc4yg5g9mpn4l6x2q1pwrvnnx18f"; depends=[mvtnorm]; };
   Bolstad2 = derive2 { name="Bolstad2"; version="1.0-28"; sha256="08cfadvl9jl9278ilsf8cm2i2a3i8zsa2f3vjzw2nlv85fwi2c7v"; depends=[]; };
+  BoltzMM = derive2 { name="BoltzMM"; version="0.1.1"; sha256="0jb81wn8b5lhvlkpv4rs66qdmryf57n2xmxgwl1qk0n8bfzy8ayi"; depends=[BH Rcpp RcppArmadillo]; };
   BonEV = derive2 { name="BonEV"; version="1.0"; sha256="0lmgrg53b0abb5hidyjjmwn7lf2ani84k9fil7g6j6mdajjhh1b7"; depends=[qvalue]; };
   BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; };
   BoolNet = derive2 { name="BoolNet"; version="2.1.3"; sha256="1s64a46wfp31jsyfdg2m8269qaq7x798y2bj0dyk69di1nxx2daa"; depends=[igraph XML]; };
@@ -415,13 +425,14 @@ in with self; {
   BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; };
   BootValidation = derive2 { name="BootValidation"; version="0.1.3"; sha256="097s6yd2g6ahc7rrdpzjarmvqajvzfz2dzawm8gijiami0dkfm9m"; depends=[glmnet pbapply pROC]; };
   BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; };
-  Boruta = derive2 { name="Boruta"; version="5.2.0"; sha256="111rp7lbq79p7c1w4dkzhb9wh32mns5p17xxq0qbjzaiv41377dy"; depends=[ranger]; };
+  Boruta = derive2 { name="Boruta"; version="5.3.0"; sha256="181ldma4rfd14bnq5prhhsjji1hpr4jmn69b017cs08w7k0nqdi9"; depends=[ranger]; };
   BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; };
   BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.0-8"; sha256="09c6zdzf5k5x7zv5m6ygl4k5xbprlpb6s3lrq432mmv8rn2yi58z"; depends=[brglm gtools lme4 qvcalc]; };
   BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; };
   BrailleR = derive2 { name="BrailleR"; version="0.26.0"; sha256="1grqs3sb1xk28vmpcbidb6s805wqzkrrx41qqz7jc5y8vpspba51"; depends=[devtools extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest pander rmarkdown XML xtable]; };
   Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; };
-  Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-4"; sha256="1saxa492f32f511vw0ys55z3kgyzhswxkylw9k9ccl87zgbszf3a"; depends=[]; };
+  BreedingSchemeLanguage = derive2 { name="BreedingSchemeLanguage"; version="0.9.4"; sha256="0d51i3dpdfay3562b87la0731jfc5bq5d04mxs1qdrzw6p69ijvn"; depends=[ggplot2 lme4 Matrix Rcpp rrBLUP snowfall]; };
+  Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-5"; sha256="1ly9fx6mmiwrni52li0c23amsh4k36zjv9h5432igf0fgldhr3pq"; depends=[]; };
   BrownDog = derive2 { name="BrownDog"; version="0.2.1"; sha256="0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938"; depends=[httpuv jsonlite RCurl]; };
   Brq = derive2 { name="Brq"; version="2.0"; sha256="0j6d1m2drzy1wyr5y25qb8gs6555vh0lkyh415kw17x9dj4ks0zx"; depends=[]; };
   Brundle = derive2 { name="Brundle"; version="1.0.8"; sha256="1yj196x6xb75qgi16pgg3dyjmxmjklfjcpxymaki32drhmylf24z"; depends=[DESeq2 DiffBind lattice Rsamtools]; };
@@ -429,6 +440,7 @@ in with self; {
   BullsEyeR = derive2 { name="BullsEyeR"; version="0.2.0"; sha256="1p8b5w818zi7zs0n13cc3sw8z0z9mfr5cn5y5icsx1jam5amppci"; depends=[Matrix NLP slam tm topicmodels]; };
   BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; };
   BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; };
+  BusinessDuration = derive2 { name="BusinessDuration"; version="0.1.0"; sha256="0bx147qcf44q2bpl4rcyps18vk2dawcgn7870j8ljc8d86lqnvqd"; depends=[chron]; };
   BuyseTest = derive2 { name="BuyseTest"; version="1.0"; sha256="1nfj2ajah2dg1p47g2z0zf9s24sxj4dfn3nny1h4qmqwcb4vs55g"; depends=[data_table lava Rcpp RcppArmadillo snowfall survival]; };
   C50 = derive2 { name="C50"; version="0.1.1"; sha256="1pq1plsh7kf45f0ghrja0xjikaxgvq14k8k80ml5rkabyv11zg03"; depends=[Cubist partykit]; };
   CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; };
@@ -440,10 +452,11 @@ in with self; {
   CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; };
   CANSIM2R = derive2 { name="CANSIM2R"; version="0.12"; sha256="1r8fln9rqjsqhbnxvng9wpdnp6mb1gxlq3qkff4q2wbhf18wwn7w"; depends=[Hmisc reshape2]; };
   CARBayes = derive2 { name="CARBayes"; version="5.0"; sha256="0kii28mf75m7ij1l0bz2w93h7m1wwq1xjvv3d3nf3ps9h8rxzi8d"; depends=[CARBayesdata coda MASS matrixcalc MCMCpack Rcpp sp spam spdep truncnorm]; };
-  CARBayesST = derive2 { name="CARBayesST"; version="2.5.1"; sha256="10mzjcybj549wp07sigr7m0r93gjskmwd8i6i1017wyh1vv5vlyc"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; };
+  CARBayesST = derive2 { name="CARBayesST"; version="2.5.2"; sha256="0jww40ghcfiq7laprdicynn1m34ykz9l9navi9rdx8p8d7k76ykc"; depends=[CARBayesdata coda dplyr MASS matrixcalc Rcpp sp spam spdep testthat truncdist truncnorm]; };
   CARBayesdata = derive2 { name="CARBayesdata"; version="2.0"; sha256="0mlqlqm50k4lqyvbjva7vji9jqa3rwi5ky5521rp5l4nqlj53sfb"; depends=[shapefiles sp]; };
   CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; };
   CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; };
+  CARRoT = derive2 { name="CARRoT"; version="0.1.0"; sha256="1zwc59pf0wpd9hy2apx723plag3dmas39sn7rf1cfkn7h9dm27iz"; depends=[doParallel foreach nnet Rdpack]; };
   CARS = derive2 { name="CARS"; version="0.2"; sha256="1n8p4n9fbl20jps9g9pbspw54hq9y6kqbggc8h0i9pbm1b25ngrg"; depends=[np]; };
   CARrampsOcl = derive2 { name="CARrampsOcl"; version="0.1.4"; sha256="1sdrir7h7xl1imipm9b71vca062dxqsqd8mg3w9f3s80x2aghxl8"; depends=[fields OpenCL]; };
   CAST = derive2 { name="CAST"; version="0.1.0"; sha256="0mihpcknwk86m41x14j2g3f2s2ya20sh99ng85rcph57a4v6ar05"; depends=[caret]; };
@@ -452,10 +465,11 @@ in with self; {
   CATkit = derive2 { name="CATkit"; version="3.2.3"; sha256="1vl60m6x3mqgghqzpxq8aalpjpcagamjk5zg62mqpwx0vgdwv2fy"; depends=[assertr magic MASS png rtf season signal]; };
   CAvariants = derive2 { name="CAvariants"; version="3.4"; sha256="1mrqvcgnxbzah7vhqqqdygds8plwswd2l8w0aq5132byhhc4kiax"; depends=[]; };
   CBCgrps = derive2 { name="CBCgrps"; version="2.1"; sha256="0cvgcpvdvpvjkzkwapx0y4a666xq54dwm00w4w9n8fhgp05mnkn8"; depends=[nortest]; };
+  CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; };
   CBPS = derive2 { name="CBPS"; version="0.18"; sha256="0dd63s9nrgra51w005j35scbswbknqgv9ppawh0311hpr7anrir9"; depends=[glmnet MASS MatchIt nnet numDeriv]; };
   CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; };
   CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; };
-  CCM = derive2 { name="CCM"; version="1.1"; sha256="0gya1109w61ia6cq3jg2z5gmvjkv9xg71l2rxhrrf6bx1c2nsrq6"; depends=[]; };
+  CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; };
   CCMnet = derive2 { name="CCMnet"; version="0.0-3"; sha256="0mbw3yhlgnmq7q4wnwiff7rlmciq83cch7kkav3wll6nqvxcdiax"; depends=[ergm network sna]; };
   CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; };
   CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; };
@@ -475,6 +489,7 @@ in with self; {
   CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; };
   CFC = derive2 { name="CFC"; version="1.1.0"; sha256="0yhb314qcdxig5vg0nbzvsqiddlsqlm50vzddhpp0z5n3xfa7h2c"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; };
   CGP = derive2 { name="CGP"; version="2.0-2"; sha256="1mggv3c8525vbdfdc3yhpp4vm4zzdvbwyxim29zj0lzwjf9fkgqk"; depends=[]; };
+  CGPfunctions = derive2 { name="CGPfunctions"; version="0.1"; sha256="0zsvhhp5pgqrn518c1cmmxama1cadg7grscimz08cclzidcqq0w1"; depends=[car dplyr ggplot2 rlang tibble]; };
   CHAT = derive2 { name="CHAT"; version="1.1"; sha256="1hl4xr4lkvb7r36gcbgax6ipqc3rsvn1r03w7fk9gf9bbyg7bkhg"; depends=[DNAcopy DPpackage]; };
   CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; };
   CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; };
@@ -482,12 +497,12 @@ in with self; {
   CHNOSZ = derive2 { name="CHNOSZ"; version="1.1.3"; sha256="07j1xvv6rn57hirxw1dajnvk9hmj3r9bgk4fckzmmpclf22z4mwq"; depends=[]; };
   CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; };
   CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.2"; sha256="0s3a9ay0l9n5kc6q0wb7f9625vba4giz1pdg3ikq4h4zhp1ldq62"; depends=[Matrix mvtnorm numDeriv stringr]; };
-  CIDnetworks = derive2 { name="CIDnetworks"; version="0.8.1"; sha256="0k75mdlvm0rccag42pnhsni1kihpqsnj5bsrwlj7hdf7n8k1xb77"; depends=[igraph MASS msm mvtnorm numDeriv pbivnorm Rcpp]; };
-  CIEE = derive2 { name="CIEE"; version="0.1.0"; sha256="1z4061rkryhnhf6qdxlna1w2dsy06pipx3sk1hswah4i2n7cc7sq"; depends=[survival]; };
+  CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; };
   CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; };
   CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; };
-  CINNA = derive2 { name="CINNA"; version="1.1.3"; sha256="0y2xymk323xjkwpii1i13q38dsfi1ywlvw3ykq4928jb58f96121"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; };
+  CINNA = derive2 { name="CINNA"; version="1.1.4"; sha256="0wq7kiycx4ly6pm9f81g0wjzrhb123zzflsx7mnxs7lc77ga2h2b"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph network pheatmap plyr qdapTools Rtsne sna viridis]; };
   CINOEDV = derive2 { name="CINOEDV"; version="2.0"; sha256="0fjpxahc55zd972p3hlw9fk4dq8hpq715xff8p98kfh29dvw9mnz"; depends=[ggplot2 igraph R_matlab reshape2]; };
+  CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; };
   CITAN = derive2 { name="CITAN"; version="2015.12-2"; sha256="08h91q7529q04izgqw3ahm4r0zjpwnwyc0vynykvv9fz2fkbk7wb"; depends=[agop DBI hash RGtk2 RSQLite stringi]; };
   CIplot = derive2 { name="CIplot"; version="1.0"; sha256="0hx3dn7d8hvsh75747d9046iqriy3bjnchph8xllnvlhkrm4di1f"; depends=[MASS multcomp]; };
   CLA = derive2 { name="CLA"; version="0.90-1"; sha256="1rpklm21i9rjw0vfhaz9brq9571yjynwfhpv6dp6fbl3cj7bwb8g"; depends=[]; };
@@ -512,7 +527,7 @@ in with self; {
   CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; };
   CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; };
   CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; };
-  CORElearn = derive2 { name="CORElearn"; version="1.52.0"; sha256="01kby6kddfbv6qhmsja1q4gyqq57f7n9kk4555g258f9a6900c2n"; depends=[cluster nnet rpart]; };
+  CORElearn = derive2 { name="CORElearn"; version="1.52.1"; sha256="0i37dpnphdq9pcb94rzpy80gw88zrfy8diiig94p1gdj0dk57b0f"; depends=[cluster nnet rpart]; };
   CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; };
   COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; };
   COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; };
@@ -550,6 +565,7 @@ in with self; {
   CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; };
   Cairo = derive2 { name="Cairo"; version="1.5-9"; sha256="1x1q99r3r978rlkkm5gixkv03p0mcr6k7ydcqdmisrwnmrn7p1ia"; depends=[]; };
   Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.2"; sha256="07g7ik3xb9ijghkz94qyk87c2d4q942h4d0yicwr1j1xzcv5qzsw"; depends=[]; };
+  CaliCo = derive2 { name="CaliCo"; version="0.1.0"; sha256="1fz4sx6wsrkmcfjjgjn7z26m266m844qz8ms4vk6bnhx0h1rp6qa"; depends=[coda DiceDesign DiceKriging FactoMineR ggplot2 MASS Matrix R6 Rcpp RcppArmadillo testthat]; };
   CalibrateSSB = derive2 { name="CalibrateSSB"; version="1.0"; sha256="1r3318rzh29cgq72gdp16z60xkan7hyh1vj4gjg3pzbxy8zawqxx"; depends=[survey]; };
   Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; };
   CarletonStats = derive2 { name="CarletonStats"; version="1.3"; sha256="1a8ic2ny2zkqy6xsnzhlc3hybhk200d8jbdbjfy7jav7n757kr0y"; depends=[]; };
@@ -563,7 +579,7 @@ in with self; {
   Causata = derive2 { name="Causata"; version="4.2-0"; sha256="04lndjy4rdf063z75zv42b000z06ffnr91pv2sql1ks6w60zmh1m"; depends=[boot data_table foreach ggplot2 glmnet R_utils RCurl rjson RMySQL stringr XML yaml]; };
   CePa = derive2 { name="CePa"; version="0.5"; sha256="1y2q72j8bqx509i62a2x9j40rj5bkpgx4z6fwj05ibazc1441asd"; depends=[igraph snow]; };
   CellularAutomaton = derive2 { name="CellularAutomaton"; version="1.1-1"; sha256="0kmw2ic161xwalqa63hznic4n4hdz20hsilf2awlcldg7m9si1zd"; depends=[R_methodsS3 R_oo]; };
-  CensMixReg = derive2 { name="CensMixReg"; version="3.0"; sha256="0ywqijwca4hkc0mz5gngqs9ivkvvjznrkflcv590diapxw52b2c5"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; };
+  CensMixReg = derive2 { name="CensMixReg"; version="3.1"; sha256="1r7w84bjdxnkhiw7gh499scc6m3ba9b2a8cwayn6sg5a524yn9gs"; depends=[ClusterR mixsmsn mnormt mvtnorm trimcluster]; };
   CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; };
   CensSpatial = derive2 { name="CensSpatial"; version="1.3"; sha256="0gd1c5qlk71avv0s3jqwb00h9cm6djg9qwzc1znc3kh61wx9kvfi"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tmvtnorm]; };
   Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; };
@@ -585,7 +601,7 @@ in with self; {
   ChoR = derive2 { name="ChoR"; version="0.0-3"; sha256="085p604zbk4l88q4ig2fnfhadxvsssyjl2r48g8s99yx49cvd9sx"; depends=[commonsMath rJava]; };
   ChocoLattes = derive2 { name="ChocoLattes"; version="0.1.0"; sha256="0ircdar4fswaf34969gzgn83ia891jvwl29jn4s9a87cc4qagzgr"; depends=[ggplot2 knitr plotly R_utils rmarkdown WriteXLS XML]; };
   ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; };
-  CholWishart = derive2 { name="CholWishart"; version="0.9.0"; sha256="123m7byr4rcmg9h91g1p1v1aby5qpaidnjid9vg4gr1ywhbvjh63"; depends=[]; };
+  CholWishart = derive2 { name="CholWishart"; version="0.9.2"; sha256="1dlq6a9j3ifhmw94w158czc72f31rns0xfw4zbfx4zcah678raq6"; depends=[]; };
   CircE = derive2 { name="CircE"; version="1.1"; sha256="14bja3zv9wg389m6khmsy3q12hhnfcp49rvrmw47y6fh5m7ihrz2"; depends=[]; };
   CircMLE = derive2 { name="CircMLE"; version="0.2.1"; sha256="031pmfyqwif16am7h1csk1dg9vhy0jgdc8w4z60kqqsgf3yk6il9"; depends=[circular]; };
   CircNNTSR = derive2 { name="CircNNTSR"; version="2.2"; sha256="0z29dsvcwpra1ny8kj486dpnrak272wmkfnaiyashzcqpnkmkg03"; depends=[]; };
@@ -605,13 +621,13 @@ in with self; {
   ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="0.1.0"; sha256="1lqf2ksgchl1j5hfkz7r5yczvkjgi3238k8nkfkd70nyil9vjq06"; depends=[Rcpp]; };
   CluMix = derive2 { name="CluMix"; version="2.1"; sha256="080gd6v8yj83djmf4wg7cwk6q6w6gsg4xfsgw5qd6z8h3kpyn45m"; depends=[Biobase ClustOfVar DescTools extracat FD gplots Hmisc marray Matrix]; };
   ClueR = derive2 { name="ClueR"; version="1.2"; sha256="17phjzpdx11sw259xk16h2w28xdaxxpzbh0sxli61icnssw35n7z"; depends=[e1071]; };
-  ClusVis = derive2 { name="ClusVis"; version="1.0.0"; sha256="0d8s4gd5dl4mc1538rhy2pwk1xfgbq2ca76qaqrl2q3mswb1p6wp"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod]; };
+  ClusVis = derive2 { name="ClusVis"; version="1.1.0"; sha256="17cn3hm37jv10aybaidy89kch6814hdi8g44s94xa9li7nixzass"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; };
   ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; };
   ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; };
   ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; };
   ClustVarLV = derive2 { name="ClustVarLV"; version="1.5.1"; sha256="11zydj3iq15sg84kny6nklpmh8wj9j9nklkknzfqnaagai8jgsmy"; depends=[Rcpp]; };
   Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.1"; sha256="18is8aa496qr7afmyqy12s267ans0hhzy0xs8nzr3qp70mwrbbh1"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr tibble]; };
-  ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.3"; sha256="1znyj39mwdi02xhypvr2fsx2yp45w8br7r8qkn831d6fza5pkcyc"; depends=[]; };
+  ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="0.9.9"; sha256="116rj2ynk37pc5ic6xlnh3gvzl6qasly8avchmwcdsg4w7i2z8l7"; depends=[]; };
   ClusterR = derive2 { name="ClusterR"; version="1.1.1"; sha256="0b9x0a1s0d9nnkkcm417xsaciwb66771s14ir6n6mm7yq1g6x417"; depends=[FD ggplot2 gmp gtools OpenImageR Rcpp RcppArmadillo]; };
   ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; };
   ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; };
@@ -624,6 +640,7 @@ in with self; {
   CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; };
   CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; };
   CollapseLevels = derive2 { name="CollapseLevels"; version="0.2.0"; sha256="1fn5k83lh0vw5j9vhq0x6ksbkrm25acpslav85wfyknsj9vzmzid"; depends=[dplyr ggplot2 lazyeval magrittr]; };
+  CollessLike = derive2 { name="CollessLike"; version="1.0"; sha256="080mrvszysdqvx03sd4aczvhs1zmhc6fx8zp5nwrh7mmyajslxkx"; depends=[ape igraph]; };
   CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; };
   ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; };
   ComICS = derive2 { name="ComICS"; version="1.0.3"; sha256="1jfs0ygr88532jjw2ablyn2r3sg3hfsv5yrm4gkdgzakychj3dy2"; depends=[glmnet]; };
@@ -644,7 +661,7 @@ in with self; {
   CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; };
   CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; };
   CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-4"; sha256="1a3j5j50fz3f8vkvdmfccv5hn00spk08xanadqxpdy8pn925gqqb"; depends=[]; };
-  CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.1.9"; sha256="086yacr5fgqzgl1hh0m6qpx59smk66bsxglaic3ynd9n9k1n9p6c"; depends=[data_table expm Matrix]; };
+  CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.0"; sha256="13gwxnqa0r805i1b5z3ym4pp297305jwvdn7b35pf2v9zlcnyh7c"; depends=[data_table expm Matrix]; };
   CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; };
   CompetingRisk = derive2 { name="CompetingRisk"; version="1.0"; sha256="0lfpqz3a8csgmv8cg4clc1dzsgxvssfr5cyn1mgyxfzssch85drm"; depends=[MASS Matrix reshape2 survival wesanderson]; };
   Compind = derive2 { name="Compind"; version="2.0"; sha256="1qadyl96c9cmk1i763gc055hgv414ha59418lqk183kwl5sgbqy5"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; };
@@ -654,7 +671,7 @@ in with self; {
   ConR = derive2 { name="ConR"; version="1.2.1"; sha256="0k6761x5dfibbbzfzmkc73ahfmw54d5rpj0rj32232qdlk48hqk5"; depends=[fields geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
   ConSpline = derive2 { name="ConSpline"; version="1.2"; sha256="16r0v0llj0pri69jqxribp8dpzh6yn6acpq20aaky14fyh3i4q7x"; depends=[coneproj]; };
   Conake = derive2 { name="Conake"; version="1.0"; sha256="1rj1rv8r53516jqhwp9xqqwjxh4gx1w47c0bw59f87wiy5pbchpf"; depends=[]; };
-  CondIndTests = derive2 { name="CondIndTests"; version="0.1.1"; sha256="0n9ishrq9ilray5cq37q7fyizaffbwx36s5lf9z60mh6hn3dppha"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; };
+  CondIndTests = derive2 { name="CondIndTests"; version="0.1.3"; sha256="1lmys6a3cwk8c3d08lpb2dny9madsdf2fnslx6qjx27cg95bhdcb"; depends=[caTools kernlab lawstat MASS mgcv quantregForest randomForest RPtests]; };
   CondReg = derive2 { name="CondReg"; version="0.20"; sha256="1ffnrjfjcb66i9nyvidkcn4k9pcj4r7xanjwzcxcrj2qm39apkqx"; depends=[]; };
   ConfigParser = derive2 { name="ConfigParser"; version="1.0.0"; sha256="0jjh6gz5qcqhirzkmg7a4lnf8n3mjly15x2mvbvdpjkk7iv3w9m3"; depends=[ini R6]; };
   ConfoundedMeta = derive2 { name="ConfoundedMeta"; version="1.3.0"; sha256="17l6dfff2v0a4p022qclrmkzi78ga9adkgxgrgk9imz0n9m9424d"; depends=[ggplot2 metafor]; };
@@ -667,13 +684,14 @@ in with self; {
   ConvCalendar = derive2 { name="ConvCalendar"; version="1.2"; sha256="0yq9a42gw3pxxwvpbj6zz5a5zl7g5vkswq3mjjv5r28zwa3v05vc"; depends=[]; };
   ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="1.0.0"; sha256="0ndb7k2lfv6014a7c61a2mmcsywpa478lk6fh7d0jkv55hmnzvs9"; depends=[lmtest sandwich]; };
   ConvergenceConcepts = derive2 { name="ConvergenceConcepts"; version="1.2.1"; sha256="0kl67ds6369mxl2i93h43r00ji12qkg0k9m4jhcxsb0ydd8rfqgp"; depends=[lattice tkrplot]; };
-  CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-6"; sha256="1jhyb9hw10cpsac6jyrp21g9habpy0mqglg1aq6qyi59c4n95b46"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; };
+  CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="1.0-7"; sha256="00x2ijyg1bj2xp679i453d4fd58qp7mfj3pvv3cddh0hl8yfns18"; depends=[geosphere ggplot2 raster rgeos rnaturalearth sp]; };
   Copula_Markov = derive2 { name="Copula.Markov"; version="1.1"; sha256="0pgzrgd9bzf2qh9b7h0y4mmszlxk1wxdwlid3xh7rk7pif3mw3qd"; depends=[]; };
   CopulaDTA = derive2 { name="CopulaDTA"; version="1.0.0"; sha256="1bx0jvlbhaxf4yhrfpd5l5zp7kmp6f17ckb1y9974sgc7s3hpqcd"; depends=[ggplot2 plyr reshape2 rstan]; };
   CopulaREMADA = derive2 { name="CopulaREMADA"; version="1.0"; sha256="021x40l5p6ip5br3qnca6nywkx9fpmgx5jm8i2dngj6yz6rc3hag"; depends=[matlab statmod tensor]; };
   CopulaRegression = derive2 { name="CopulaRegression"; version="0.1-5"; sha256="0dd1n7b23yww36718khi6a5kgy8qjpkrh0k433c265653mf1siq8"; depends=[MASS VineCopula]; };
   CopyDetect = derive2 { name="CopyDetect"; version="1.2"; sha256="1sahrlg1gk1q8ciq0a8hxrlyci5i8jxz8pjpy04alckxdrxfpqbi"; depends=[irtoys]; };
   CorReg = derive2 { name="CorReg"; version="1.2.1"; sha256="1c7vvlxza0r9r07rr464y3kfkrnzz15l4jc7s727wjrw2az8rnpy"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen Rmixmod rpart]; };
+  CorShrink = derive2 { name="CorShrink"; version="0.1-5"; sha256="03g5njb191nqiy0lmk8jrwyrnl3w733b8h0krkbsjh2zravyw1xc"; depends=[ashr corpcor corrplot gridExtra Matrix reshape2]; };
   Corbi = derive2 { name="Corbi"; version="0.4-2"; sha256="0h088iplryaipnfp8svw3djh016z23lv66q51gfbqpvchvjdwypw"; depends=[CRF Matrix mpmi]; };
   CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; };
   CorrBin = derive2 { name="CorrBin"; version="1.5"; sha256="1kg8kms76z127j2vmf7v162n0sh2jqylw4i7c35x5sig4q22m9gy"; depends=[boot combinat dirmult geepack mvtnorm]; };
@@ -691,9 +709,9 @@ in with self; {
   CovSelHigh = derive2 { name="CovSelHigh"; version="1.1.1"; sha256="0dvvpkqml2k00gicpgp475z1rjspq3s37ys1mam29k54qlshhny6"; depends=[bartMachine bindata bnlearn doParallel doRNG foreach glmnet MASS Matching randomForest tmle xtable]; };
   CovTools = derive2 { name="CovTools"; version="0.3.0"; sha256="0p5mfrdp4p5fz9ld0rqrd2kj73hi1dzx0iwl4rihhgfgdplzknhf"; depends=[doParallel expm foreach geigen Matrix mvtnorm pracma Rcpp RcppArmadillo Rdpack shapes]; };
   CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim survival]; };
+  CoxPhLb = derive2 { name="CoxPhLb"; version="1.0.0"; sha256="1j8dvbjv4h0zdjvwvpswdlsb9pf3gxixh2rhl0m1kxm6f6h5ig0z"; depends=[survival]; };
   CoxPlus = derive2 { name="CoxPlus"; version="1.1.1"; sha256="038wsz206bgc0pnzx403b5ihcwhxpkrpxmwvrvqcxf8333pb62l5"; depends=[Rcpp RcppArmadillo]; };
   CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; };
-  Coxnet = derive2 { name="Coxnet"; version="0.2"; sha256="023l1fcs0g5qqlslqfwb51nkmcqa0d5qp9bibhndd8gq7raz6ws6"; depends=[Matrix Rcpp RcppEigen]; };
   CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; };
   CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; };
   Cprob = derive2 { name="Cprob"; version="1.4"; sha256="1kjw5hhb3fy12xlyg01i8ynl78gx0r57kvmgafbqix1s3pg2hyw6"; depends=[geepack lattice lgtdl prodlim tpr]; };
@@ -709,6 +727,7 @@ in with self; {
   CsChange = derive2 { name="CsChange"; version="0.1.3"; sha256="08ss1dzwirmnlgw440g3k3vnrl1imhmd2gljnid8z2dzj5450alr"; depends=[boot Hmisc rms survival]; };
   CuCubes = derive2 { name="CuCubes"; version="0.1.0"; sha256="1cpazar85rp8xfjvy0vxivr61grzvxz7a9mirxvhynln964by6ns"; depends=[]; };
   Cubist = derive2 { name="Cubist"; version="0.2.1"; sha256="18w82l44b6jsmz19l34dmaqb22qvjcwhs4cddzhs6pzicvqw645k"; depends=[lattice reshape2]; };
+  CustomerScoringMetrics = derive2 { name="CustomerScoringMetrics"; version="1.0.0"; sha256="166v0hbxy4xgbfqh7sx6zsrv4pghqpimx5xry3h2qwynnvr4ng1a"; depends=[]; };
   Cyclops = derive2 { name="Cyclops"; version="1.3.0"; sha256="0sznzzz21qn1cxxfa3wiwvfza7lykzzf0xyqvawha9vzm8qzgqnq"; depends=[BH bit ff ffbase Matrix Rcpp RcppEigen RcppParallel survival]; };
   CytobankAPI = derive2 { name="CytobankAPI"; version="1.1.0"; sha256="1014r17krw74drykdlw24pgqylidp8yxa00zhf340ilcxfpacxyi"; depends=[curl httr jsonlite]; };
   CytobankAPIstats = derive2 { name="CytobankAPIstats"; version="1.0"; sha256="0hr74igy43d5ybzlgqpvx9ingw6h83w502b6k55cp6zqcv5rl8d5"; depends=[CytobankAPI]; };
@@ -724,7 +743,7 @@ in with self; {
   DAGGER = derive2 { name="DAGGER"; version="1.4"; sha256="0b2hzv001xhch7pqgb53lfpdcjwg5lj33i6pb884l1kx92svjfr7"; depends=[Matrix quadprog Rglpk]; };
   DAISIE = derive2 { name="DAISIE"; version="1.4"; sha256="16653wwz20lhf3bpzflpj5d1h7j3cqyfaqk5gn24aifga2jc0wbb"; depends=[DDD deSolve Matrix subplex tensor]; };
   DAKS = derive2 { name="DAKS"; version="2.1-3"; sha256="0vmpwxvksnmyq40faimbgpj0y3zbk519986n38ipwdfzllcg0zs4"; depends=[relations sets]; };
-  DALEX = derive2 { name="DALEX"; version="0.1.1"; sha256="0nafdpfiawmlv6v43i4glhq1p3aaqph5f8ikcvi75l44n1rwkazk"; depends=[ALEPlot breakDown ggplot2 pdp]; };
+  DALEX = derive2 { name="DALEX"; version="0.2.0"; sha256="0dls9v912bcww4csax35spxl9zx71g9ig9inzi9cr9ffinpw9rgk"; depends=[ALEPlot breakDown factorMerger ggplot2 ggpubr pdp]; };
   DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; };
   DAMOCLES = derive2 { name="DAMOCLES"; version="1.1"; sha256="07z8mynhqnk1zcvm84w09xzkiy2dfxwhmnpi6gaddr3p0waql4gj"; depends=[ape caper deSolve expm geiger matrixStats picante]; };
   DAMisc = derive2 { name="DAMisc"; version="1.4-3"; sha256="1hic53vi7mj4fvggxjl4d3j4zw8wwczh6pldyi8idrhm45hw2nh4"; depends=[boot car effects gdata lattice MASS nnet pscl QRM sm VGAM xtable]; };
@@ -732,6 +751,7 @@ in with self; {
   DATforDCEMRI = derive2 { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[akima lattice locfit matlab R_methodsS3 R_oo xtable]; };
   DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; };
   DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; };
+  DBHC = derive2 { name="DBHC"; version="0.0.2"; sha256="08sl6gv1dw2kpk1zylvyqqga6xvhzhpp5zxa9ql1hyzc2i43jivq"; depends=[ggplot2 reshape2 seqHMM TraMineR]; };
   DBI = derive2 { name="DBI"; version="0.8"; sha256="16nf8flxr5vdz8yrpprfbzydy3ajixkp9hc8ibd9n7r9nc29waym"; depends=[]; };
   DBItest = derive2 { name="DBItest"; version="1.5-2"; sha256="05wizjm2b97fsdha2i391h38xb0zrkhnd036qvdcm0r5l0y56sm8"; depends=[blob DBI desc hms R6 testthat withr]; };
   DBKGrad = derive2 { name="DBKGrad"; version="1.6"; sha256="0207zx0v1x3zhfbs0h1ssxc1b683k111f90k8ybhknb147104knr"; depends=[lattice minpack_lm SDD TSA]; };
@@ -762,21 +782,22 @@ in with self; {
   DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; };
   DGCA = derive2 { name="DGCA"; version="1.0.1"; sha256="1lqqzrsidkli4bk4jikq5f75jzqyzhv94n882yic5ndxgv26p9ic"; depends=[matrixStats WGCNA]; };
   DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; };
-  DHARMa = derive2 { name="DHARMa"; version="0.1.5"; sha256="1mgvpyhllp7pqnas5sbn6393jkin205109g2b4pn3diyb20avqwp"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; };
-  DHS_rates = derive2 { name="DHS.rates"; version="0.2.0"; sha256="0fhbsylm0j6s4ah5iam2rc0c716zljhqf8l87n3gll5kfh08427x"; depends=[reshape survey]; };
+  DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; };
+  DHARMa = derive2 { name="DHARMa"; version="0.1.6"; sha256="1b7yqy4id6ydvyqrgpl5zkmch64rl2b0jcj6ww5rq6afzgkfbfay"; depends=[ape doParallel foreach gap lme4 lmtest MASS mgcv qrnn sfsmisc]; };
+  DHS_rates = derive2 { name="DHS.rates"; version="0.3.0"; sha256="039pa3pln7vj2md4kcv9070qbm8v7aknhhgh49hs5xiwa682g1f7"; depends=[haven matrixStats reshape survey]; };
   DIFboost = derive2 { name="DIFboost"; version="0.2"; sha256="0wyjk870n18lq0dwhm9ndsh5vv0d8wkrbcky68w454vzrrw1q9h8"; depends=[mboost penalized stabs]; };
   DIFlasso = derive2 { name="DIFlasso"; version="1.0-3"; sha256="195wiy0jjkq6bh2b6wrjmr5l34pzx0i2qqvwp4pzv77sx737ds0v"; depends=[grplasso miscTools penalized]; };
   DIFtree = derive2 { name="DIFtree"; version="2.1.4"; sha256="16cyd634jflaszpfq0ymwlbv57ci1iyffwai641jczn8cny504zl"; depends=[penalized plotrix]; };
   DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; };
   DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; };
   DISTRIB = derive2 { name="DISTRIB"; version="1.0"; sha256="0whwmmdx2k2vrjjkz4ww9v7z9ad3835819pby91119lyic27w727"; depends=[]; };
-  DJL = derive2 { name="DJL"; version="2.6"; sha256="1vvfh9hpanac2g22k4hqy3y7j3mn34mvasw0rx3y4vjbv3h05yw6"; depends=[car lpSolveAPI]; };
+  DJL = derive2 { name="DJL"; version="2.7"; sha256="1p0jd2hn6an3kkc85xkkj36x7iwi43k1yrnmzy0mb5qrbvx07hlj"; depends=[car lpSolveAPI]; };
   DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; };
-  DLMtool = derive2 { name="DLMtool"; version="5.0.2"; sha256="0fz8qy3328wmxqg5s13bl2qr4f54zc2bk4amb9kz490vf00by0iw"; depends=[abind coda devtools ggplot2 ggrepel gridExtra knitr LBSPR MASS mvtnorm openxlsx r4ss Rcpp RcppArmadillo readxl rmarkdown snowfall]; };
+  DLMtool = derive2 { name="DLMtool"; version="5.1.3"; sha256="0n7sx577fffxbxfbwy19py2hm00rb403n4fvn9j6pcdi433mfx59"; depends=[abind coda devtools ggplot2 ggrepel gridExtra knitr MASS mvtnorm openxlsx r4ss Rcpp RcppArmadillo readxl rmarkdown snowfall]; };
   DMMF = derive2 { name="DMMF"; version="0.4.0.1"; sha256="0fypj0a0kjzfghazs55mxkig9n3ngjmbi3xmdxkpa35jbn71bfdd"; depends=[raster rgdal sp]; };
   DMR = derive2 { name="DMR"; version="2.0"; sha256="1kal3bvhwqs00b6p6kl0ja35pcz9v9y569148qfhy94m319fcpzm"; depends=[magic]; };
   DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; };
-  DMRnet = derive2 { name="DMRnet"; version="0.1.0"; sha256="0p5iyj6zqrv1hsfdq7bp96ly8dkf2ky6gzilrha336lhm35ym7sr"; depends=[glmnet grpreg]; };
+  DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; };
   DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; };
   DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; };
   DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; };
@@ -789,6 +810,7 @@ in with self; {
   DOT = derive2 { name="DOT"; version="0.1"; sha256="0qh5n57cp9c2n5yn59q4wggz82943pwfanp3kx869aba2x3sj30i"; depends=[V8]; };
   DOvalidation = derive2 { name="DOvalidation"; version="1.1.0"; sha256="1mzws3w7djpxnfqxjcqwgia7p17kb0qlnzj6qcfg2m1vamb1cn2z"; depends=[]; };
   DPBBM = derive2 { name="DPBBM"; version="0.2.5"; sha256="1qypxrcm3sb727lqb09ssjf3hblixqayw3qsyql01imrxwm609i2"; depends=[CEoptim gplots tmvtnorm VGAM]; };
+  DPWeibull = derive2 { name="DPWeibull"; version="1.2"; sha256="0s1c3pn8pivg4227xhis5scmh9zc6fq36inphy6226hriny6q0v9"; depends=[DPpackage matrixStats Rcpp truncdist]; };
   DPpackage = derive2 { name="DPpackage"; version="1.1-7.4"; sha256="0lfw55kbjwr1dqkd98p6488p6c0nh5pkfkc9wpds8wsqm38siad6"; depends=[MASS nlme survival]; };
   DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; };
   DRIP = derive2 { name="DRIP"; version="1.1"; sha256="050xfq30fp9m03ig938bci2haiglj6jj4k327fpz7r2y78cgcnn4"; depends=[caTools readbitmap]; };
@@ -804,10 +826,11 @@ in with self; {
   DT = derive2 { name="DT"; version="0.4"; sha256="06gsqz7p2fv6hc3fm3759gaa50krcfrqrmy7qbxyam6a36w9daix"; depends=[crosstalk htmltools htmlwidgets magrittr]; };
   DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; };
   DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; };
+  DTDA_ni = derive2 { name="DTDA.ni"; version="1.0"; sha256="0c45cz4y629bc0jnf3m35ywqkrnjcdqbssbb6m10j8b4gszdi35i"; depends=[]; };
   DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; };
   DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; };
   DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; };
-  DTRlearn = derive2 { name="DTRlearn"; version="1.2"; sha256="1dakwlafs27nkjsiknnwxnb2hgc2xdpi5mb6dmzpjig7hg2f8d3f"; depends=[ggplot2 glmnet kernlab MASS]; };
+  DTRlearn = derive2 { name="DTRlearn"; version="1.3"; sha256="0ngzvjlzn20pff1ihw87nar7riiva4pnfih7hlsr0iszd3v3b1gq"; depends=[ggplot2 glmnet kernlab MASS]; };
   DTRreg = derive2 { name="DTRreg"; version="1.3"; sha256="1144kcqblyrpdqyj9as6y47iq3x99bf76hdw6j43cmgcs11gapc3"; depends=[]; };
   DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.7"; sha256="1syxw49pzh36nfq0zfr83cwpac86fnj0b7nlqiin4jb00h8vrf6i"; depends=[ggplot2 KernSmooth markdown reshape2 shiny]; };
   DWDLargeR = derive2 { name="DWDLargeR"; version="0.1-0"; sha256="1bxdvgj38xv2xj98njpyhy12b54nccwnc3v92kkpd3i7nwbw48dy"; depends=[Matrix SparseM]; };
@@ -822,6 +845,7 @@ in with self; {
   Dasst = derive2 { name="Dasst"; version="0.3.3"; sha256="0nrcvcfzr2y1jc984rpi3fmggns65sphc6nqr9l91h5qvpdcw7cl"; depends=[]; };
   DatABEL = derive2 { name="DatABEL"; version="0.9-6"; sha256="1w0w3gwacqrbqjdcngdp44d2gb16pq9grq2f8j2bhbxc4nkx12n1"; depends=[]; };
   DatAssim = derive2 { name="DatAssim"; version="1.0"; sha256="120gazyyxda9faydv2lyqgvflhqi2fhih1szq0sy5v1gh4xb0hhy"; depends=[Rcpp RcppArmadillo]; };
+  Data2LD = derive2 { name="Data2LD"; version="0.1-1"; sha256="1klvp4zjbv4g07rahfmwxdms0bh7ca064iap681r1w5jbyq8pkzx"; depends=[fda Matrix R_cache]; };
   DataClean = derive2 { name="DataClean"; version="1.0"; sha256="0wkafjyp6c2mx7g1bpz2pbxyl5nm2wba2hly8miizv0fdc762za5"; depends=[xlsx XML]; };
   DataCombine = derive2 { name="DataCombine"; version="0.2.21"; sha256="0iwb4726bk0cjhay694dp43b1553yyk9lpxbncs85kz229b26arm"; depends=[data_table dplyr]; };
   DataEntry = derive2 { name="DataEntry"; version="0.9-3"; sha256="0gfsg7wfwy88x7y1dwpgwi6fkizjnhrzj0a5ij70y4a4sjmyiy55"; depends=[digest gWidgets2 gWidgets2RGtk2 RGtk2]; };
@@ -852,7 +876,7 @@ in with self; {
   Density_T_HoldOut = derive2 { name="Density.T.HoldOut"; version="2.00"; sha256="0kh5nns1kqyiqqfsgvxhx774i2mf4gcim8fp5jjyq577x4679r31"; depends=[histogram]; };
   DepthProc = derive2 { name="DepthProc"; version="2.0.2"; sha256="0n9hs6fp047gnd8y87rzx5qcr3hqg3pdck97hcbzkd8jsi1b1daw"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; };
   Deriv = derive2 { name="Deriv"; version="3.8.4"; sha256="1la2afxr9nilb32s3nc1j3spxzgcqn48aywq96pckpjk8vypsjyy"; depends=[]; };
-  DescTools = derive2 { name="DescTools"; version="0.99.23"; sha256="0y3br8s2kvvi552xv5ir2av810l8qknc06hw9x6bryjxj42ywa4i"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
+  DescTools = derive2 { name="DescTools"; version="0.99.24"; sha256="1ns0vqpnfj995dq1l6pmah2wi6l8zacndha6brhy97hyn84mc83k"; depends=[BH boot expm foreign manipulate MASS mvtnorm Rcpp]; };
   DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.0"; sha256="1qyxbnmr2dycyfivdyvdqcbpk993q9glrixgp64pflx3sqz91yyk"; depends=[DescTools rstudioapi]; };
   DescribeDisplay = derive2 { name="DescribeDisplay"; version="0.2.5"; sha256="02b6yjgklsdjh3rikc8f5wfx08ymbygr3fyq1c134xhffhykrlgp"; depends=[GGally ggplot2 plyr reshape2 scales]; };
   DescriptiveStats_OBeu = derive2 { name="DescriptiveStats.OBeu"; version="1.2.1"; sha256="0mb33ihqr8jj1ispykvyc7jn1wyaagb535ya5jgwlqrians41ihc"; depends=[jsonlite RCurl reshape]; };
@@ -880,9 +904,9 @@ in with self; {
   DirectEffects = derive2 { name="DirectEffects"; version="0.1"; sha256="0c9inxn624c5rxa86d8r8jhsrm42rcsm4xxrwg7h3lvpairiyil2"; depends=[Formula]; };
   DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; };
   DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; };
-  Directional = derive2 { name="Directional"; version="3.0"; sha256="08m6yg2jpz8fcdw4dlbpb1679d72q059ab2sgc3wj53m7vqirm4a"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
+  Directional = derive2 { name="Directional"; version="3.1"; sha256="0zx6wflc3hnal3n0ql427dsw8npd46sbz4v42lj53yax71cdg8lj"; depends=[doParallel foreach MASS RcppZiggurat Rfast]; };
   DirichletReg = derive2 { name="DirichletReg"; version="0.6-3"; sha256="0qvnsbyn3livp5jrnxskf5sf7f2svy5mqkmnhzncb9bwf3kxpyla"; depends=[Formula maxLik rgl]; };
-  DisHet = derive2 { name="DisHet"; version="0.2.1"; sha256="1w0fpc73pk1fs05j328aw368qcabxfxz97zfqr5mda7wcmkwwnj3"; depends=[gtools matrixStats]; };
+  DisHet = derive2 { name="DisHet"; version="0.2.2"; sha256="03jg7y8hd7c7bi9df37g1p7i28l7l2hyana4y2js7hgc88gv376l"; depends=[gtools matrixStats]; };
   Disake = derive2 { name="Disake"; version="1.5"; sha256="1fw45fmnir6h34jw8917mhyz6cgzbq4ywyyf51qxhm68wgzy9h17"; depends=[]; };
   DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; };
   DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; };
@@ -903,7 +927,7 @@ in with self; {
   DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; };
   DoTC = derive2 { name="DoTC"; version="0.2"; sha256="1hjjkmxrbiysy3xl6n4q7kxcygdq68jcsgki1p937zj9a17sa62j"; depends=[ggplot2 plyr]; };
   Dodge = derive2 { name="Dodge"; version="0.8"; sha256="1vnvqb2qvl6c13s48pyfn1g6yfhc60ql3vn7yh2zymxcsr1gxgcw"; depends=[]; };
-  Dominance = derive2 { name="Dominance"; version="1.0.17"; sha256="07xsyadmq47szvp1vnf53ijq43pwd9g7554fgl803fhkwq6b3jgh"; depends=[chron gdata igraph XLConnect]; };
+  Dominance = derive2 { name="Dominance"; version="1.1.0"; sha256="1dzfj79hv3ds72dy4fn14bp68fiw06vdxkp4dvyvj37yrrqpcxyz"; depends=[chron gdata igraph XLConnect]; };
   DoseFinding = derive2 { name="DoseFinding"; version="0.9-16"; sha256="0ncr95lf4mifmx6n2qkg8m3cn326zj9w4hr7afsdxg155l11w89z"; depends=[lattice mvtnorm]; };
   DoubleCone = derive2 { name="DoubleCone"; version="1.1"; sha256="1kbvsj93nn2306s6pgqiiznmlcn2nqsgcxinihl613ivczxhzpqg"; depends=[coneproj MASS Matrix]; };
   DoubleExpSeq = derive2 { name="DoubleExpSeq"; version="1.1"; sha256="00xpj5xmpgmvp6h76imkmghrnlfk6c50ydvv0jram6m6ix3z8323"; depends=[numDeriv]; };
@@ -911,6 +935,7 @@ in with self; {
   Dpit = derive2 { name="Dpit"; version="1.0"; sha256="02pnc00sk3bwxmxrg27638x0q62r7nsx2nr14zjjc5q880prdisv"; depends=[fitdistrplus gsl moments VGAM]; };
   DrBats = derive2 { name="DrBats"; version="0.1.4"; sha256="0jzl1jklxsbqf5hv3a71lckk51jxi1lnbk5zmvd4x3y9b9azl2cq"; depends=[ade4 coda MASS Matrix rstan sde]; };
   DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; };
+  DrInsight = derive2 { name="DrInsight"; version="0.1.1"; sha256="02lqf6bwbgcgyg5zx16nvnzpagmcmbsngnhmyv47256vsd9vppjd"; depends=[igraph qusage]; };
   DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; };
   DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; };
   DstarM = derive2 { name="DstarM"; version="0.2.2"; sha256="014xlj5kipl2jpcgcqs1ynw05x17wbsgc5mhfjn3p96bbp6pkzzy"; depends=[DEoptim ggplot2 rtdists RWiener]; };
@@ -921,6 +946,7 @@ in with self; {
   DynNom = derive2 { name="DynNom"; version="4.1.1"; sha256="1c4hykp8fwr6h5y09m4qs23bmbaj6im2c833mv2ymlhy5bwhmnfi"; depends=[BBmisc compare ggplot2 plotly rms shiny stargazer survival]; };
   DynTxRegime = derive2 { name="DynTxRegime"; version="3.2"; sha256="0a6s28vc7kf6r7qmy9xjmxm39fl0ijnbl01d8rzr4w9sbnr3n85l"; depends=[dfoptim kernlab modelObj rgenoud]; };
   DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; };
+  DynamicGP = derive2 { name="DynamicGP"; version="1.0-2"; sha256="1mgipnkf8mlxcr9b6naiy5nq90war1gdp2cm54681b4cx0fv62p2"; depends=[laGP lhs]; };
   EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; };
   EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; };
   EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; };
@@ -961,6 +987,7 @@ in with self; {
   EML = derive2 { name="EML"; version="1.0.3"; sha256="04qz4rwq0amy9lp6358qjjql46ky2slqrvipngym5klqvm9vi0zi"; depends=[uuid xml2]; };
   EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.4"; sha256="1i36s8mzp04alff6lqkc798xjzgn61wdpl5i0awjdvg26ka8v7lj"; depends=[GPArotation limSolve shape shiny]; };
   EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-5"; sha256="1ys5kvns6jlw2lk9m6xcy71wx1d581cmphiaxnp3hsqimc8wz7hq"; depends=[MASS mnormt rgl]; };
+  EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.0"; sha256="1jadasvngxczyyc7gxpcw3jxhxai3p88l8lmj1jmdns5vdi2n4rl"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; };
   EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.3"; sha256="05y1ivbzbsfab90925l3ahzd3b8y5kjfk3f0p2s9s3sfyxphqah7"; depends=[KernSmooth lattice mvtnorm]; };
   EMMIXuskew = derive2 { name="EMMIXuskew"; version="0.11-6"; sha256="0japf0l0sj84jna7b5kirp6pgqa4c923ldwphb16ch2xxrgk5n5k"; depends=[MASS]; };
   EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; };
@@ -977,6 +1004,7 @@ in with self; {
   EQL = derive2 { name="EQL"; version="1.0-0"; sha256="0lxfiizkvsfls1km1zr9v980191af6qjrxwcqsa2n6ygzcb17dp5"; depends=[lattice ttutils]; };
   EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; };
   ERP = derive2 { name="ERP"; version="1.1"; sha256="00w9zz5rp1asvk13sj9gkd14n2akbclsyz26jp5a3r85fh6chdm0"; depends=[fdrtool mnormt]; };
+  ERSA = derive2 { name="ERSA"; version="0.1.0"; sha256="063i9fmdccyrbap7fgas9371zv13gpcgzhlsphsn8jw9nmzpdii4"; depends=[broom car combinat dplyr ggplot2 leaps modelr purrr RColorBrewer shiny tidyr]; };
   ES = derive2 { name="ES"; version="1.0"; sha256="1rapwf6kryr6allzbjk6wmxpj9idd3xlnh87rwbh6196xb7rp8lv"; depends=[]; };
   ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; };
   ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; };
@@ -986,7 +1014,7 @@ in with self; {
   ETAS = derive2 { name="ETAS"; version="0.4.4"; sha256="0s0j7r1nyf82qz3lavsvyd11hl0jkq69c70wh00nfy93n2ygp376"; depends=[fields goftest lattice maps Rcpp spatstat]; };
   ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; };
   ETLUtils = derive2 { name="ETLUtils"; version="1.4.1"; sha256="07wqrg7mnxmbdf2ibxj5kppl4sd3l608yfhbbsngkhpsrm203qva"; depends=[bit ff]; };
-  EValue = derive2 { name="EValue"; version="1.1.1"; sha256="0fdihngqgl2m7385ih08zzh9y38aal1d9lv7358qf0z68i9bgfa2"; depends=[ggplot2 metafor]; };
+  EValue = derive2 { name="EValue"; version="1.1.3"; sha256="0c3fsb3p277533gn6yw8ml7d6za211j8k46ga88fsh4mlg28hb6p"; depends=[ggplot2 metafor]; };
   EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; };
   EWGoF = derive2 { name="EWGoF"; version="2.2.1"; sha256="0n1fx6k9ndb2s9ybzizbqz662c9s1f48q6v697pqhnfy9si1nplz"; depends=[Rcpp]; };
   EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; };
@@ -1002,6 +1030,7 @@ in with self; {
   EcoGenetics = derive2 { name="EcoGenetics"; version="1.2.1-4"; sha256="18l5v7zsmz35brnf6b8qfxbs8906rmyc2kkh9bm96x01m3vx8pkh"; depends=[d3heatmap edgebundleR ggplot2 htmlwidgets igraph jsonlite magrittr networkD3 party pheatmap plotly raster reshape2 rgdal rkt SoDA sp]; };
   EcoHydRology = derive2 { name="EcoHydRology"; version="0.4.12"; sha256="03dzdw79s0cnnd7mv6wfxw374yf66dlcmj10xh6sh5i352697xp1"; depends=[DEoptim operators topmodel XML]; };
   EcoIndR = derive2 { name="EcoIndR"; version="1.2"; sha256="1p2m4kramcf71xlm9hbk5l5mb8nmjfac1p3csai7m2gmikf559yj"; depends=[]; };
+  EcoNetGen = derive2 { name="EcoNetGen"; version="0.1.1"; sha256="004y0l8hdl1kmph7y954m8k3rrqfgi6krdwywww136q0yfjdw27v"; depends=[ggplot2 igraph]; };
   EcoSimR = derive2 { name="EcoSimR"; version="0.1.0"; sha256="13ni3vdfahqjyb9xrv7fmnbj5m5n3jwfh1bl9r0bvhi5w72kb7rj"; depends=[MASS]; };
   EcoTroph = derive2 { name="EcoTroph"; version="1.6"; sha256="0zi6g0ra107s47r32mm9h6r1wll3avi0mpjmhcr0nj9y48nv14w3"; depends=[XML]; };
   EcoVirtual = derive2 { name="EcoVirtual"; version="1.0"; sha256="1adhxwi22psr81xh1szjvn6ycv4zw31xjnswk65iazk3sc4vz7wc"; depends=[]; };
@@ -1010,8 +1039,8 @@ in with self; {
   EdSurvey = derive2 { name="EdSurvey"; version="1.0.6"; sha256="1p8cxr69ckz6py0hmagm9aq7kp1q48ymffmnpwsvwh2yfkzl90yq"; depends=[data_table LaF lfactors Matrix NAEPprimer wCorr]; };
   EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.0"; sha256="1pbpknz1v5k7fgwvzv5ldyxxshys4sx7d17hbwzph1z68jcmixzg"; depends=[editrules igraph Rcpp]; };
   EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-2"; sha256="1vkg5gi0gysnw0gz9ah8pdnnlkdfsz0jy53ps2jnnpy8lbr45zc9"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; };
-  EffectStars = derive2 { name="EffectStars"; version="1.8"; sha256="0gcgwlywx7slbk8nyzv47r4wx837gimmshrb1kl2m4cl4xbm84jh"; depends=[VGAM]; };
-  EffectStars2 = derive2 { name="EffectStars2"; version="0.1-1"; sha256="1yffwnr563vzdq0ph9xs3w0zg5c7l3ima6skn8cqiafr21w332ss"; depends=[miscTools VGAM]; };
+  EffectStars = derive2 { name="EffectStars"; version="1.9"; sha256="15n5mrba2s0qxcg3zikfwpxqwv38h39zmvj8sz62ni4pdhrhhjh3"; depends=[VGAM]; };
+  EffectStars2 = derive2 { name="EffectStars2"; version="0.1-2"; sha256="0121zb627zwkgbb84sn2dclph56dc5rkfjpci5xwd0w99vh3q66l"; depends=[miscTools VGAM]; };
   EffectTreat = derive2 { name="EffectTreat"; version="0.3"; sha256="1y8b1867idjbd7i39hhryg4nyijlv6d828z0jspp80fka3sp8xpw"; depends=[]; };
   EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; };
   EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; };
@@ -1044,8 +1073,8 @@ in with self; {
   EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; };
   EpiEstim = derive2 { name="EpiEstim"; version="1.1-2"; sha256="0r56iglhkrqvlsf3gbahd544h944fmbyn6jdc113rhjscf6dl605"; depends=[]; };
   EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; };
-  EpiILMCT = derive2 { name="EpiILMCT"; version="1.0"; sha256="1s7f4g1d44mqp475z5cn97dqv6b1caxmfq1p6gr1w7jvgq0dfqp5"; depends=[]; };
-  EpiModel = derive2 { name="EpiModel"; version="1.6.1"; sha256="0jmwrpcfrfwrw5zwvwl0cv961nvqfvxjggx93iyc8z8bd6mf1wba"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
+  EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.2"; sha256="1rxq9z5lhcgzn02d9k6vgl2cb5x0s9gsly63byx4gg1h91bsvmp6"; depends=[coda]; };
+  EpiModel = derive2 { name="EpiModel"; version="1.6.5"; sha256="1h9490x7vna8z2dib6vgkxhpqvbybg655k88jn48i6qkda8dzv54"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; };
   EpiStats = derive2 { name="EpiStats"; version="1.0"; sha256="17i8i3v8qpwas4h6g8sbdl42syg20fm22c7p1bnv4nzx28p9yzhy"; depends=[dplyr epiR]; };
   EpiWeek = derive2 { name="EpiWeek"; version="1.1"; sha256="19bvjiiz8qn9nlvf3nq238qi1hszlm6asrc03p8ykp6gpl2pi6js"; depends=[]; };
   EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; };
@@ -1054,7 +1083,7 @@ in with self; {
   EstHer = derive2 { name="EstHer"; version="1.0"; sha256="1j8sczwfzil16j85mw5d1c7cxy7wimh0qq7zhmkh7mfnr36m9phr"; depends=[glmnet MASS Rcpp RcppArmadillo]; };
   EstSimPDMP = derive2 { name="EstSimPDMP"; version="1.2"; sha256="05gp0gdix4d98111sky8y88p33qr5w4vffkp6mg9klggn37kdj8j"; depends=[]; };
   EstimateGroupNetwork = derive2 { name="EstimateGroupNetwork"; version="0.1.2"; sha256="148srhlpzh0scvnkjbkyia1pr8a2ridabm3dahw4zn7p3cryiyb1"; depends=[igraph qgraph]; };
-  EthSEQ = derive2 { name="EthSEQ"; version="2.1.1"; sha256="10i2cwrsgi6q5fq9ksjrhrdwg6hjjd284xsjdiwlfcbfa59390dc"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; };
+  EthSEQ = derive2 { name="EthSEQ"; version="2.1.2"; sha256="0w75d8kw1bf4mfgk8rrx6vzq002z2588kxgadyfag0vk9s4akxi3"; depends=[data_table gdsfmt geometry MASS plot3D SNPRelate]; };
   EurosarcBayes = derive2 { name="EurosarcBayes"; version="1.1"; sha256="12311s6ibw9q6kykhh689r93r7mwjhwrhkzdpc75grvw6ilgjmpm"; depends=[clinfun data_table plyr shiny VGAM]; };
   EvCombR = derive2 { name="EvCombR"; version="0.1-2"; sha256="1f5idjaza91npf64hvcnpgnr72mpb7y6kf91dp57xy9m14k7jx5g"; depends=[]; };
   EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; };
@@ -1105,7 +1134,7 @@ in with self; {
   FGN = derive2 { name="FGN"; version="2.0-12"; sha256="0jxawb4wm1vcp0131mdnc0r24dw8sd29ih0fc2wh6ahy7mxzajqn"; depends=[akima ltsa]; };
   FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; };
   FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; };
-  FHDI = derive2 { name="FHDI"; version="1.2.1"; sha256="12vw8l0jk2z3i9gz108l2wrha6psqrg508rv1d44r4fss3xa233l"; depends=[]; };
+  FHDI = derive2 { name="FHDI"; version="1.2.3"; sha256="19480lp2hp0ss2mij1z2ikhdqlkxrfpyy66sz5i0jab48675l9v5"; depends=[]; };
   FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; };
   FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; };
   FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; };
@@ -1132,9 +1161,9 @@ in with self; {
   FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; };
   FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.0.1"; sha256="05hcds1g1hkpr3fww1i462p633xlhwv594fpbphvw8fm10mc0hns"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; };
   FREddyPro = derive2 { name="FREddyPro"; version="1.0"; sha256="0h2rdydcx9pwjl1zxghzb5vqynrwdkscyq6c9adjgz4dngfwyzsw"; depends=[dismo ggplot2 lubridate raster RColorBrewer sp]; };
-  FRK = derive2 { name="FRK"; version="0.1.8"; sha256="037rk9l9bl65wskrii07x4z0g0ic92fx7i0p522bgy53qxa3sbq0"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime]; };
+  FRK = derive2 { name="FRK"; version="0.2.1"; sha256="042j6n3yx46123d0qsghbynjf1h0iri4kfd92z5nbcgv7wggk4d3"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; };
   FRegSigCom = derive2 { name="FRegSigCom"; version="0.1.0"; sha256="02lvgxxr12rfs4k7dg3rl249nbvfkqaywas3k6jhm378j3j8yaaf"; depends=[fda]; };
-  FSA = derive2 { name="FSA"; version="0.8.17"; sha256="1mpkbz5q4xbncmwqrylww679ghz52fsr81flavkksb8ljr4z6f7p"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; };
+  FSA = derive2 { name="FSA"; version="0.8.19"; sha256="0sj928r3dx320q3684ckw8yny6s209n57j0sxdzk7bwl9syyp6ma"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot]; };
   FSAdata = derive2 { name="FSAdata"; version="0.3.6"; sha256="0r4g3s4a7hizxj7zlp8wb5sldnx6kc99vak8ww715bhzpzq40qf8"; depends=[]; };
   FSInteract = derive2 { name="FSInteract"; version="0.1.2"; sha256="1aci1398aaz0nrl5jy6yh7xik355wf7pwngrsak4qsi94vdj05iy"; depends=[Matrix Rcpp]; };
   FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; };
@@ -1149,14 +1178,14 @@ in with self; {
   FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; };
   FactoClass = derive2 { name="FactoClass"; version="1.2.4"; sha256="0rzbzl32hk4mrs6njm4cnj84ifsf52ms5khy43m9bfmwwmadbilr"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; };
   FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.1"; sha256="09fnlqwnijg94yfm3q41pdck9yxaq037m7421g4hdxaigljjb6ml"; depends=[FactoMineR rmarkdown rrcov]; };
-  FactoMineR = derive2 { name="FactoMineR"; version="1.39"; sha256="12m0yi4w3iw07gx8viwvy8v8l1qh3qr7ghv39cdb2g0zgmnivfxh"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
+  FactoMineR = derive2 { name="FactoMineR"; version="1.40"; sha256="1s4mdmxp66ipnbqwzs1s2fyyr8vzbrxamr2sd9k5a6sqwy7pgjv8"; depends=[car cluster ellipse flashClust lattice leaps MASS scatterplot3d]; };
   FactorsR = derive2 { name="FactorsR"; version="1.2"; sha256="0y6r5ch0h0sag1xinvnjr7q4495naygvi5iiqq9bc51ijv228c0m"; depends=[]; };
   Factoshiny = derive2 { name="Factoshiny"; version="1.0.6"; sha256="1rb16g4gqq9mmwgpp94j9g5iv5p1psjqllsp9qn7ccccmgn6nnw9"; depends=[colourpicker FactoMineR shiny]; };
   Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; };
   FamEvent = derive2 { name="FamEvent"; version="1.3"; sha256="0jf4ph9mskycyckyg9biy0h1zk5q6nvj8669zfh8nfnnn2yh3s48"; depends=[kinship2 MASS survival truncnorm]; };
   Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; };
-  FarmSelect = derive2 { name="FarmSelect"; version="1.0.1"; sha256="1qpa46igan3dqgn4ny2lmj08y6jk7krp7pb27afi694nw5l3l97h"; depends=[glmnet ncvreg Rcpp RcppArmadillo]; };
-  FarmTest = derive2 { name="FarmTest"; version="1.0.1"; sha256="0h829706ilq2czjnn48wpwb09ryx0nwbl953m6p6z1wp4a3dzcv4"; depends=[Rcpp RcppArmadillo]; };
+  FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; };
+  FarmTest = derive2 { name="FarmTest"; version="1.0.2"; sha256="1khf2l1rza1kayqrfxf17l365x1ckqs8wnqihqdq9l1jz77p7a7n"; depends=[Rcpp RcppArmadillo]; };
   FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; };
   FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; };
   FastHCS = derive2 { name="FastHCS"; version="0.0.5"; sha256="02ds9syqh8wpjrqibdv3kqxcyijclm572daqrj262b4b6211v46x"; depends=[matrixStats Rcpp RcppEigen robustbase]; };
@@ -1168,10 +1197,10 @@ in with self; {
   FastRWeb = derive2 { name="FastRWeb"; version="1.1-1"; sha256="0xh3710kvnc60pz9rl5m3ym2cxf0mag9gi29y7j3fl4dh2k7zf74"; depends=[base64enc Cairo]; };
   FastSF = derive2 { name="FastSF"; version="0.1.1"; sha256="1xajav45h57hchzkvl2pb4mz9xy433lq74jnry0icid8dai5xhwb"; depends=[limSolve Rcpp RcppArmadillo]; };
   FatTailsR = derive2 { name="FatTailsR"; version="1.7-5"; sha256="1l2anaf4kixidmvya64ni5b78bl9w2n6xf1lnf297lkdka8gxigw"; depends=[minpack_lm timeSeries]; };
-  FateID = derive2 { name="FateID"; version="0.1.0"; sha256="0q2pq5w93n2zh0qz96b33pc9bbjfp1dqzsi1kcizi468a7jgkfmx"; depends=[caTools DESeq2 destiny lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; };
+  FateID = derive2 { name="FateID"; version="0.1.1"; sha256="1v861cfzbrva43b9w2qa9pb9xbrjj91wqcf4m5nvq5via55i14b4"; depends=[caTools DESeq2 destiny lle locfit pheatmap princurve randomForest RColorBrewer rgl Rtsne som]; };
   FeaLect = derive2 { name="FeaLect"; version="1.10"; sha256="1r7rgcadrqjhxn2g2w16axygsck82fprxg7l14ai11bn4b7h4pmb"; depends=[lars rms]; };
-  FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.1"; sha256="1y46bk2yddq0n8p1kj6fwi9q23lsblsrlgf7b630vcbvv8mpz5x2"; depends=[BH digest magrittr Matrix Rcpp]; };
-  FedData = derive2 { name="FedData"; version="2.5.1"; sha256="1yvmy7y26rqrxqap8nicdfrh3s66nyrcn5lvasnairaz1fvx5qxs"; depends=[curl data_table devtools dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos soilDB sp stringr]; };
+  FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.3"; sha256="0k8n3c0yiz6bb9rq6ra8z2hypb4hw4qcsdfbrgrw74kqivscs62i"; depends=[BH digest magrittr Matrix Rcpp]; };
+  FedData = derive2 { name="FedData"; version="2.5.2"; sha256="0lr6q9j8rnjkn5vvk7z4irsxfhkzhi1s36pp5j8175dak240415h"; depends=[curl data_table devtools dplyr foreach Hmisc igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf soilDB sp stringr]; };
   FeedbackTS = derive2 { name="FeedbackTS"; version="1.4"; sha256="1mcsr48hvrpfnk2f0z1bc8556jf848bpd8prm3y46gqdj452wpmm"; depends=[geoR mapdata maps proj4 sp]; };
   Fgmutils = derive2 { name="Fgmutils"; version="0.9.4"; sha256="0k5pafgrcb7smklgzgw2mf6npj55nm5fsr6k0xp6ji380rvdxc0y"; depends=[data_table devEMF ggplot2 gridExtra plyr png ReporteRs sqldf stringr]; };
   FieldSim = derive2 { name="FieldSim"; version="3.2.1"; sha256="1snz2wja3lsgxys0mdlrjjvk5575cyd64mjipafibwcs97bva5x1"; depends=[RColorBrewer rgl]; };
@@ -1182,7 +1211,7 @@ in with self; {
   FinancialInstrument = derive2 { name="FinancialInstrument"; version="1.3.1"; sha256="0f1zaclrcmpkdhcfc8a09f7lsf2b7gfyd7js3173qckn84a01f3w"; depends=[quantmod TTR xts zoo]; };
   FinancialMath = derive2 { name="FinancialMath"; version="0.1.1"; sha256="11nhphvd7bvbc7xfs85rib763r1mpvxmsj6hgzfib5aifib5k5js"; depends=[]; };
   FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; };
-  FindIt = derive2 { name="FindIt"; version="1.1.3"; sha256="1d4cvd4651fdbwmj83q2x9vwvg92fbmq8112z7ian8n96n30rchd"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; };
+  FindIt = derive2 { name="FindIt"; version="1.1.4"; sha256="1rnkxngkqsmqs0d0m8ihscpsigxbjgl5ga5nyfwf97b1hrbv4j37"; depends=[arm ggplot2 glinternet glmnet igraph lars lmtest Matrix quadprog sandwich]; };
   FindMinIC = derive2 { name="FindMinIC"; version="1.6"; sha256="0vlr56nw32msvz8bljrw82nzrnazncs6nz7zisidffm2v3najkar"; depends=[nlme sets]; };
   FinePop = derive2 { name="FinePop"; version="1.4.1"; sha256="06wabgrxfq11ncbll5d0f07kkh23w2hrvjx8k1vy55q9f1dwd3sb"; depends=[]; };
   FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; };
@@ -1191,7 +1220,7 @@ in with self; {
   FitAR = derive2 { name="FitAR"; version="1.94"; sha256="1mkk3kvfq4v0pdabnhbwrk31ji2mv2v6ns16xsvvr1qyg2fnx6hq"; depends=[bestglm lattice leaps ltsa]; };
   FitARMA = derive2 { name="FitARMA"; version="1.6"; sha256="1r9mqrqkm4wh3nd6v9wmpj23gw21i4p89p6z4c7639kn4f590ldk"; depends=[FitAR]; };
   FixSeqMTP = derive2 { name="FixSeqMTP"; version="0.1.2"; sha256="0v1cwq8gapgandm7wiw8p6av6qigydlpmwi6w02p1y7f0hf5ifnp"; depends=[]; };
-  FixedPoint = derive2 { name="FixedPoint"; version="0.2"; sha256="1gmh9ipv010q4lgpnka1rwfza5c7llgjpn7yvcsvlxglmplh8969"; depends=[MASS]; };
+  FixedPoint = derive2 { name="FixedPoint"; version="0.4"; sha256="07qhvaw4abd039dxlcfm5126lv6p5ybbw78qcmi4x51hvq6icals"; depends=[MASS]; };
   FlexDir = derive2 { name="FlexDir"; version="1.0"; sha256="1gb5alv9jsnw0135g63cy757pxhdw6cgwfm8dpcm8dj9zqg10dkm"; depends=[]; };
   FlexGAM = derive2 { name="FlexGAM"; version="0.7.0"; sha256="1pjlsi747j347vwn94391xr3aknnspgw7rc1jnin7g0n1fgkcww4"; depends=[MASS Matrix mgcv scam]; };
   FlexParamCurve = derive2 { name="FlexParamCurve"; version="1.5-3"; sha256="0766ghwbdd7r4yj5xf31hnknn775ziw1hhrn13wf8bibyd8blz70"; depends=[nlme]; };
@@ -1204,7 +1233,7 @@ in with self; {
   ForecastComb = derive2 { name="ForecastComb"; version="1.1"; sha256="1ki769m3cw3kb8jhbrgiwssspszsipmg2hlbk4ifldi8s19l9m12"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; };
   ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; };
   ForecastFramework = derive2 { name="ForecastFramework"; version="0.9.0"; sha256="131h9f148wn89znzsnym43amlvf4s7jzg4f2p7ld9ns7727sf56q"; depends=[abind dplyr lubridate magrittr R6 reshape2]; };
-  ForestTools = derive2 { name="ForestTools"; version="0.1.5"; sha256="0yjyc5i2jhagvwpzg420zhhygs966ncjn9aggh4gd4zdsi0nzqcx"; depends=[APfun imager raster rgeos sp TileManager]; };
+  ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; };
   FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; };
   Formula = derive2 { name="Formula"; version="1.2-2"; sha256="0ad49bzip1zqmpj1d8jajwl4bd81fm3k6dq8p26x6mvlzc04dvwd"; depends=[]; };
   ForwardSearch = derive2 { name="ForwardSearch"; version="1.0"; sha256="0yd47832piqxzjxgl7bc8pn0c8f7vbgsm9z6894rzyi615kjl70b"; depends=[robustbase]; };
@@ -1242,7 +1271,7 @@ in with self; {
   GADMTools = derive2 { name="GADMTools"; version="2.1-1"; sha256="1xlr3qa6li3izms51mf3g35hj0gximvgibx6d821ikxzp6892mha"; depends=[classInt dplyr ggmap ggplot2 gridExtra jsonlite lattice maptools RColorBrewer rgdal rgeos scales sp stringr]; };
   GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; };
   GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; };
-  GAMens = derive2 { name="GAMens"; version="1.2"; sha256="1x1q6a5p2lsx0gbfm976ps4braqaxa26ii6g3iag9ssafyhb0r1f"; depends=[caTools gam mlbench]; };
+  GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; };
   GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; };
   GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; };
   GAR = derive2 { name="GAR"; version="1.1"; sha256="12xgk87bndinx7ibaasn51a9fad3ymvpjmixa7l18pfy99l3pcll"; depends=[httr jsonlite]; };
@@ -1252,17 +1281,17 @@ in with self; {
   GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; };
   GBJ = derive2 { name="GBJ"; version="0.5.0"; sha256="07wrydd2vlvwc56hgcrqbass0d0qamn3rg5vsf9bamxa6pcg9s53"; depends=[BH mvtnorm Rcpp SKAT]; };
   GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; };
-  GCD = derive2 { name="GCD"; version="4.0.0"; sha256="05cn9g9pahx5g9qh2lyqqlaafd1jji9awi9wx6r9hm09g4bmqrba"; depends=[]; };
+  GCD = derive2 { name="GCD"; version="4.0.1"; sha256="00rbj57km104yi39rid922qvw1xdavs4f82cnrsv1gnn9ic7fv3q"; depends=[]; };
   GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; };
   GCalignR = derive2 { name="GCalignR"; version="1.0.1"; sha256="1p1zxf5s75ckyj7a61n43ix314p3b99knyg6z5d4sn5n417h2m42"; depends=[ggplot2 pbapply readr reshape2 stringr]; };
-  GD = derive2 { name="GD"; version="1.2"; sha256="10csmsf4xkd3w73nskd1sxm8c9i0rlrsxyb4dmjrv8l207cc80pb"; depends=[BAMMtools ggplot2 reshape2]; };
+  GD = derive2 { name="GD"; version="1.3"; sha256="1bpcp048hphxjas3dhqyyvs1xbv0356495zhl4r0mgrk9969qkh2"; depends=[BAMMtools ggplot2 reshape2]; };
   GDAdata = derive2 { name="GDAdata"; version="0.93"; sha256="13ks97i289rc4i7gpqrifwbj0m9rx8csjhnfg8mad10qmjwz7p8b"; depends=[]; };
   GDAtools = derive2 { name="GDAtools"; version="1.4"; sha256="1i5g7gzl3fkhwxqizqwrn8098s5lrr0mk17wmpyf92s1sy315cpv"; depends=[FactoMineR nleqslv nnet]; };
   GDELTtools = derive2 { name="GDELTtools"; version="1.2"; sha256="1rx6kjh7kmyycqapvbizcxkcfp09qvqv7k8f25v333sxkacpz6p5"; depends=[plyr TimeWarp]; };
-  GDINA = derive2 { name="GDINA"; version="1.4.2"; sha256="14686mkyxk7gjp0ivz1wkmry15qrf50fcwwza1j98791yjkqsbyf"; depends=[alabama data_table ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp]; };
+  GDINA = derive2 { name="GDINA"; version="2.0.8"; sha256="0mzs49hvns7bzs78ccdj6nzji0ci990sa2znsfnaqly6b38b7qaj"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; };
   GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; };
   GEEmediate = derive2 { name="GEEmediate"; version="1.1.1"; sha256="1akgl4j38x4qf3z9d6z7cgjd7x9f0k3lrzyrzgykqhrzmbh68z2m"; depends=[gee]; };
-  GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.9"; sha256="1imq71nhr0bc08w8jvw57fvghczn1p3vb1n7xnk7i7n6aq23dzsx"; depends=[changepoint GENEAread MASS rpart signal]; };
+  GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.11"; sha256="0xb9fvd7vyfdpshx1y7jcwrm9fbb4mlkvw2f7qk7isgz8dvyhzdn"; depends=[changepoint GENEAread MASS rpart signal]; };
   GENEAread = derive2 { name="GENEAread"; version="1.1.1"; sha256="0c3d76yl8dqclk8zhhgrd6bv6b599vkpbyg3hjspb6npdw6zs6k8"; depends=[bitops]; };
   GENEAsphere = derive2 { name="GENEAsphere"; version="1.4"; sha256="0z6qazcgjcs03zz26167dxg6mgjaq1z0qdsa4ggh32813l4k0ijw"; depends=[GENEAread ggplot2 MASS misc3d rgl]; };
   GENLIB = derive2 { name="GENLIB"; version="1.0.4"; sha256="1gl8qsgm9iy57rlajgc47lfxah52jsg7lpj131a6813kj0c639l7"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; };
@@ -1276,10 +1305,10 @@ in with self; {
   GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; };
   GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; };
   GFD = derive2 { name="GFD"; version="0.2.5"; sha256="14bhqk5hi9w2078nn382ksgw37bx5r1jadizcrwbisglccxa0ncd"; depends=[magic MASS Matrix plotrix plyr]; };
-  GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.2"; sha256="0xxxjhhngc23ac891pn6hwn4y4wqil4xb83s7pq92izz5mb05q96"; depends=[cmprsk joint_Cox]; };
+  GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.3"; sha256="0pqx5fr039izhwi2kdzq9v6nlviyjclzddd092g8mkadj36diwk5"; depends=[cmprsk compound_Cox joint_Cox]; };
   GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; };
   GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; };
-  GGIR = derive2 { name="GGIR"; version="1.5-17"; sha256="0p452p9xcbd0r9w2aqdiw4i740xxxbgi9hk4k5xqifdlkfg4gvmb"; depends=[data_table Rcpp]; };
+  GGIR = derive2 { name="GGIR"; version="1.5-18"; sha256="0v8i3rw5wxmzhfb3dawyykabypvfjskbsmr0phky994kx93zm604"; depends=[data_table Rcpp]; };
   GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; };
   GGMselect = derive2 { name="GGMselect"; version="0.1-12.1"; sha256="0nrkbai9jps54ldx3cvwd4x4wingfj73najwx4bv98z8zxpbnky5"; depends=[gtools lars mvtnorm]; };
   GGUM = derive2 { name="GGUM"; version="0.3.1"; sha256="1dgnhg0ggnp3f8qwzrcnapwzaraddnk2xsksin6pzybz21hfdvxd"; depends=[abind psych Rdpack viridis xlsx]; };
@@ -1295,11 +1324,13 @@ in with self; {
   GLIDE = derive2 { name="GLIDE"; version="1.0.1"; sha256="02pmn0ydrmblgchz189avlrz3zaz0qfhy75d945yphpmvjf9f9m5"; depends=[doParallel foreach MASS]; };
   GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; };
   GLMaSPU = derive2 { name="GLMaSPU"; version="1.0"; sha256="0zx2bza5v5cfp9v7hf42s57522b6prawcwl77aa3kvjcnb0ish6g"; depends=[MASS mnormt mvtnorm Rcpp RcppArmadillo]; };
+  GLMsData = derive2 { name="GLMsData"; version="1.0.0"; sha256="12q41zxniblzys20vjrf5skj8cbzlwb92mwk6jvnyd86lc70bsh1"; depends=[]; };
   GLSME = derive2 { name="GLSME"; version="1.0.3"; sha256="0flja5gk25k4z9hwskvdw4c1f88scc47xvc1l3d2447fkfrb0bwc"; depends=[corpcor mvtnorm]; };
   GMAC = derive2 { name="GMAC"; version="3.0"; sha256="0c2cfpr8dik7j5br87hkvswrhqzj5vcna54gw6ffdf1rk9rz9j22"; depends=[]; };
   GMCM = derive2 { name="GMCM"; version="1.2.4"; sha256="1y0yr6i4l28qw22drca7r4mzqjfbpm3jdssfb7p8pc664g6vmm81"; depends=[Rcpp RcppArmadillo]; };
   GMD = derive2 { name="GMD"; version="0.3.3"; sha256="0hdya8ai210wxnkfra9bzyswk3gib5fm53fs61rh0nsmg3ysdga6"; depends=[gplots]; };
   GMDH = derive2 { name="GMDH"; version="1.6"; sha256="093glyz73246m5f2xb2xgbgi80haj4fanmr325byr99dnf4x35yn"; depends=[MASS]; };
+  GMDH2 = derive2 { name="GMDH2"; version="1.1"; sha256="16jnpwr7sbfai0h5prr7768nsxz65qfds46gphdryi5nd65dbv60"; depends=[e1071 glmnet magrittr MASS nnet plotly randomForest xtable]; };
   GMMBoost = derive2 { name="GMMBoost"; version="1.1.2"; sha256="01q165vkdiv4qh96lha0g2g94jpnzdclbby6q43ghh9j1yrd4qzj"; depends=[magic minqa]; };
   GMSE = derive2 { name="GMSE"; version="0.3.1.9"; sha256="02qzz4w99qissb3b95p7y5bk2wn43k01802vwnzxlq27swhkg17i"; depends=[shiny shinydashboard shinyjs]; };
   GNE = derive2 { name="GNE"; version="0.99-1"; sha256="1avsl54xdlqq8pw16g84igcwms7if7lvdblqvfc2cn3sk8qi5xdv"; depends=[alabama BB nleqslv SQUAREM]; };
@@ -1312,7 +1343,7 @@ in with self; {
   GPCMlasso = derive2 { name="GPCMlasso"; version="0.1-1"; sha256="1qlbs9xxdn7q90afh5zc6fgp213fxyh3xmmhz5dm6azbwx92x3la"; depends=[car caret cubature ltm mirt mvtnorm Rcpp RcppArmadillo statmod TeachingDemos wordcloud]; };
   GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; };
   GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; };
-  GPGame = derive2 { name="GPGame"; version="1.0.0"; sha256="1ln3smlhr0hz5nkbdfhrpvz6cn0jz21w8p0d3xlcv4szlmkx8lx6"; depends=[DiceDesign DiceKriging emoa GPareto KrigInv MASS mnormt mvtnorm Rcpp]; };
+  GPGame = derive2 { name="GPGame"; version="1.1.0"; sha256="00qiqd7p84k22wbmlmj8a81fy5m5rl6afhj2q61j0akicnbzjfw9"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS mnormt mvtnorm Rcpp]; };
   GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; };
   GPM = derive2 { name="GPM"; version="1.0"; sha256="0k2mglgmq1hb0x9gdypvzgi7s3vkdpf6qcvgyd4qc3mfg3avbnmk"; depends=[lattice lhs randtoolbox]; };
   GPPFourier = derive2 { name="GPPFourier"; version="2.1"; sha256="1wlzpiqlg5zx3rv29l1ql3apcaykvk72zc0anwxr152qlk910l2q"; depends=[mFilter Tides]; };
@@ -1321,7 +1352,7 @@ in with self; {
   GPoM = derive2 { name="GPoM"; version="1.1"; sha256="0n1fnmwiygispihqgcx762wkvp28pnm8kcwlx9vxhpafswsp112q"; depends=[deSolve rgl]; };
   GPrank = derive2 { name="GPrank"; version="0.1.2"; sha256="0z9xhydnq04p872zl7glxhndmijjihfgffl6bijc9a0rs95zaacd"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; };
   GPseq = derive2 { name="GPseq"; version="0.5"; sha256="0k5xif44qk2ppvcyja16xshmfciq1h84l1w6d8dfkyryfajbc8ai"; depends=[]; };
-  GPvam = derive2 { name="GPvam"; version="3.0-4"; sha256="1vqvm9647jnw91vpf4dhjjp9rc05n5k6qgzilfpmcg4a7zzi917k"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
+  GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; };
   GRANBase = derive2 { name="GRANBase"; version="1.6.8"; sha256="1pcm0fy3jwwaifd4m7qyil1miaxmi6v7glp2krbkngp6f8qb0bph"; depends=[covr dplyr hexSticker htmlTable jsonlite RCurl sendmailR stringi switchr]; };
   GRAPE = derive2 { name="GRAPE"; version="0.1.0"; sha256="0kcyz8x6yzq83hcwdlx7yw5jpww819f9d1hax19vn31ccq71xkyw"; depends=[]; };
   GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; };
@@ -1338,7 +1369,7 @@ in with self; {
   GSIF = derive2 { name="GSIF"; version="0.5-4"; sha256="1vh3dffi5hakk32rwaabw9k34wigd0n5bhzcyqhadl6fxjsaz6b6"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; };
   GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; };
   GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; };
-  GSODR = derive2 { name="GSODR"; version="1.1.2"; sha256="1zr19zik2ic38wg71gk9iapzmdh4z426djy8w4z25v148940liss"; depends=[curl dplyr magrittr purrr R_utils readr rgdal rlang sp tibble]; };
+  GSODR = derive2 { name="GSODR"; version="1.2.0"; sha256="0zhj2c51mxkdy2z7bllas1qb5jg83263w9vv6iksy5j47vxm2py8"; depends=[curl dplyr magrittr purrr R_utils readr rlang tibble]; };
   GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; };
   GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; };
   GUIDE = derive2 { name="GUIDE"; version="1.2.3.1"; sha256="02chn2mzh6smmiv8rp00cq5rff18bqszazbk8svmvvlgn0a25pj4"; depends=[rpanel tkrplot]; };
@@ -1375,7 +1406,6 @@ in with self; {
   GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; };
   GeneCycle = derive2 { name="GeneCycle"; version="1.1.2"; sha256="1ghdzdddbv6cnxqd08amy4c4s5jsxa637r828ygffk6z76xjr6b6"; depends=[fdrtool longitudinal MASS]; };
   GeneF = derive2 { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; };
-  GeneFeST = derive2 { name="GeneFeST"; version="1.0.1"; sha256="0qgzjzhwf3nigfi09maywg9zkjxiicwiwiyqfcdk9gsvmp6mr4qn"; depends=[BASIX]; };
   GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; };
   GeneReg = derive2 { name="GeneReg"; version="1.1.2"; sha256="081qc66mb17dwk886x9l2z4imklxnfs02yqql0ri9c47bpsga7wp"; depends=[igraph]; };
   GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; };
@@ -1407,7 +1437,7 @@ in with self; {
   Giza = derive2 { name="Giza"; version="1.0"; sha256="13nkm8mk1v7s85kmp6psvnr1v97vi0gid8rsqyq3x6046pyl5z6v"; depends=[lattice reshape]; };
   GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; };
   GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; };
-  GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.12"; sha256="1abpc03cfvazbwj2sx6qgngs5pgpzysvxkana20hyvb4n7ws77f0"; depends=[]; };
+  GlobalOptions = derive2 { name="GlobalOptions"; version="0.0.13"; sha256="04jvha0mafslqz5nr99xjylg9n2x31gj9v4mgyg7qcmfwpqyw3ch"; depends=[]; };
   Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; };
   Gmisc = derive2 { name="Gmisc"; version="1.5"; sha256="0jiyqi0mmwbb7v8jqksvm42r4sq1d5najqkapnpj5jzn6izq6vh5"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown XML]; };
   GoFKernel = derive2 { name="GoFKernel"; version="2.1-0"; sha256="17jd1dqwpki4mmzk695g25vvfwvkp4k7jhvw06dmdmn5j09hw373"; depends=[KernSmooth]; };
@@ -1419,15 +1449,16 @@ in with self; {
   GrammR = derive2 { name="GrammR"; version="1.1.0"; sha256="1rwvgznfxp7d3rzymyljj3pn3z3ggia1bhi4nvpgd79qd4cifi2g"; depends=[ape cluster GUniFrac gWidgets gWidgetsRGtk2 MASS rgl RGtk2]; };
   GraphFactor = derive2 { name="GraphFactor"; version="1.1"; sha256="1jxibd2d5b6vlq27m9ppmm96wsnkqn4pz66n9pwdl8wg2v85npw5"; depends=[igraph]; };
   GraphKit = derive2 { name="GraphKit"; version="0.5"; sha256="1ip0rkrwxpjcd9mhz2z8n7lwdrjj1idymsafm8aac1hfbxr6c0xz"; depends=[Rcpp RcppArmadillo]; };
+  GraphPCA = derive2 { name="GraphPCA"; version="1.1"; sha256="0x6j3lyd70zc0c1al1407ma8crzi174d5dqkz6lx4vx24knrlhbs"; depends=[FactoMineR ggplot2 ggplot2movies scatterplot3d]; };
   GrapheR = derive2 { name="GrapheR"; version="1.9-86"; sha256="1iizknyrpgiz1fh1fjls58n5v5fpki25j7kfbwfkp5ijf1q54ml6"; depends=[]; };
   GrassmannOptim = derive2 { name="GrassmannOptim"; version="2.0"; sha256="05r5zg4kf3xd6pp56bl8ldchdxvspxkdfd33b623hndjhn4lj2lq"; depends=[Matrix]; };
   GreedyEPL = derive2 { name="GreedyEPL"; version="1.0"; sha256="19b8fwxsjd6shwjxhpawa8pmlj6yn0j4577g6b93xbcs76wgrvd1"; depends=[Rcpp RcppArmadillo]; };
   GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.1"; sha256="0r6b8hzzx0ja0skp4w4s49jpkkjbb3an62vp74qh5sf2wi1hx9x6"; depends=[rJava]; };
   GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; };
-  Greg = derive2 { name="Greg"; version="1.2"; sha256="19bzv2nknahzbdnl7n0pcnavsdlwgkprc0yk3ksqllfawnvi39f9"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
+  Greg = derive2 { name="Greg"; version="1.2.1"; sha256="0li05w2nbqvabhwwmhxiwjalr1q79xad9yd2vycpz198c048kiqf"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; };
   Grid2Polygons = derive2 { name="Grid2Polygons"; version="0.2.1"; sha256="0db5kv0rbsg077h2badw28x9363ymqkr52sw5wlg9x1bk9cczhi7"; depends=[inlmisc raster rgeos sp]; };
   GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; };
-  GroupSeq = derive2 { name="GroupSeq"; version="1.3.4"; sha256="0m127793gh00spj2ghapmysvf3dbxhpf2jlms3xxrflh7ajrmy5m"; depends=[]; };
+  GroupSeq = derive2 { name="GroupSeq"; version="1.3.5"; sha256="0c74nlsqa5ly0kf6p4n7gfvd0ygkq78bx851ryniwpnnalvsq8l7"; depends=[]; };
   GroupTest = derive2 { name="GroupTest"; version="1.0.1"; sha256="1v2230mw0irsr5y8n45g8sd362jp7f6dy2r532mhflfdqy6i2khs"; depends=[]; };
   GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; };
   GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; };
@@ -1457,7 +1488,7 @@ in with self; {
   HH = derive2 { name="HH"; version="3.1-34"; sha256="1srr195ha8n4va30impm12p2kamkl36whl8g10pl80hwgg20pbqk"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; };
   HHG = derive2 { name="HHG"; version="2.2"; sha256="114nfpdjdisryil9l8cws885qdskgrjm2cclx543hh4cdhpnkxnp"; depends=[Rcpp]; };
   HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; };
-  HIBPwned = derive2 { name="HIBPwned"; version="0.1.6"; sha256="0ym62n1rmi8pjj37cxbrdmih7530nhmy77gxb8yylppjf3rikci4"; depends=[httr jsonlite ratelimitr urltools]; };
+  HIBPwned = derive2 { name="HIBPwned"; version="0.1.7"; sha256="04l9309lmgn33gdwm162g6vywz8p9sdgmy2baxj98jv7x791wj3r"; depends=[crul jsonlite memoise ratelimitr urltools]; };
   HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; };
   HIV_LifeTables = derive2 { name="HIV.LifeTables"; version="0.1"; sha256="0qa5n9w5d5l1kr4827a34581q380xmpyzmmhhl300z1jwr0j94df"; depends=[]; };
   HIest = derive2 { name="HIest"; version="2.0"; sha256="0ik55kxhzjyg6z6072iz9nfaj7x1nvf91l1kysgvkjccr6jf3y86"; depends=[nnet]; };
@@ -1504,19 +1535,18 @@ in with self; {
   Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; };
   HelpersMG = derive2 { name="HelpersMG"; version="3.0.0"; sha256="1y5q4z9yxap16bkcjsybm2754wm0x31hfqdnp2bb4gbvhz1jhas6"; depends=[coda]; };
   HeritSeq = derive2 { name="HeritSeq"; version="1.0.0"; sha256="0ibb2nkjk1d59gc1ljihihsjai3jp4jsbbariv05h1z26pgpc9p3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; };
-  HiCblock = derive2 { name="HiCblock"; version="1.2"; sha256="17d5jzswzjy7hwr9lyfd273xqa5ssm715wybk0zxd4gsnipvnbsk"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
-  HiCfeat = derive2 { name="HiCfeat"; version="1.2"; sha256="01b8isvn4my41n3608k80d38vgd3waq7rxsx1v4p0rl1f3pxn7dn"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
-  HiCglmi = derive2 { name="HiCglmi"; version="1.1"; sha256="1q47kayga6g4vczh92a63a4ni5hvmrc7477wsjkhp846j3wswm5j"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
+  HiCblock = derive2 { name="HiCblock"; version="1.4"; sha256="07f94j9y5g6f09yi7iwag020ddfhpvrj5idfxwbr900hj3vgm1gm"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
+  HiCfeat = derive2 { name="HiCfeat"; version="1.3"; sha256="1hf24g4cph13s0cbicll3dxvxycdzwbsy6cv297vlkw4sc574ixw"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; };
+  HiCglmi = derive2 { name="HiCglmi"; version="1.3"; sha256="17vwdhnf36cg56vidq7d85s4vgk2pnn5py1y2wsl2dm41vdl0847"; depends=[GenomeInfoDb GenomicRanges glmnet HiTC IRanges MASS Matrix rtracklayer S4Vectors]; };
   HiClimR = derive2 { name="HiClimR"; version="1.2.3"; sha256="1yv01pyfmgq306f3yravwf6sm79m0m93gpya95k85rxqdjl3c2hx"; depends=[]; };
   HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; };
   HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; };
-  HiDimMaxStable = derive2 { name="HiDimMaxStable"; version="0.1.1"; sha256="0gscdjm48yyf8h3bn6xjbjlfc1hwbbh5j6v64c0z3d04h9q35c24"; depends=[copula maxLik mnormpow mnormt partitions VGAM]; };
   HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; };
   HiddenMarkov = derive2 { name="HiddenMarkov"; version="1.8-11"; sha256="1yh85pdb9r90qxcl5gxslyplxzrx8knrrsl2q65l57zfkqj185ja"; depends=[]; };
   HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; };
   HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; };
-  HistDAWass = derive2 { name="HistDAWass"; version="1.0.0"; sha256="0si57vmgnkrhyilk3vv4189c093n6if6i5nv3jylvhpmbf5nvm7p"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; };
-  HistData = derive2 { name="HistData"; version="0.8-2"; sha256="0qd3a1v3xg39nwqfw63k6210vqkpknq0j3r36sy1910hn0nr83fa"; depends=[]; };
+  HistDAWass = derive2 { name="HistDAWass"; version="1.0.1"; sha256="1lc9pz3f6akzyisgwzfl4m5z400bailv1bmsb3snha8nhpqdk3nk"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; };
+  HistData = derive2 { name="HistData"; version="0.8-4"; sha256="0qw8jrh7g9w49k6f8hsg9wvy8ms2pcsmiv2ysxfcr89v60q084rb"; depends=[]; };
   HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; };
   HiveR = derive2 { name="HiveR"; version="0.3.42"; sha256="09h061511pk7iy1k9gb3ifa5q6gd17ix9sn2fshl6gp5sxnysn4f"; depends=[jpeg plyr png RColorBrewer rgl tkrgl]; };
   Hmisc = derive2 { name="Hmisc"; version="4.1-1"; sha256="160l50ppjs69ipcaya1mlcz29zbn5rmqg91r09dvzzvkvwfb47cr"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; };
@@ -1553,14 +1583,14 @@ in with self; {
   ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; };
   ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; };
   ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; };
-  ICEinfer = derive2 { name="ICEinfer"; version="1.0-1"; sha256="0gjgr1r33w6d5ra0njh15lj46lw6v751yl8iqrdf4a5pazs7w3lm"; depends=[lattice]; };
+  ICEinfer = derive2 { name="ICEinfer"; version="1.0-4"; sha256="0fa5mxj224jgppp09bblyi9w9racz5lb1i20npvnccafcm36f7y1"; depends=[lattice]; };
   ICGE = derive2 { name="ICGE"; version="0.3"; sha256="0xin7zml1nbygyi08hhg3wwr2jr1zcsvrlgia89zp4xanxlzgaqa"; depends=[cluster MASS]; };
   ICGOR = derive2 { name="ICGOR"; version="2.0"; sha256="18fn10f5nqqbrfibqmp602nqpx794fy3gpxp1bd10xn48llhqfc4"; depends=[ICsurv MASS pracma survival]; };
   ICRanks = derive2 { name="ICRanks"; version="1.3"; sha256="0n8gyqlwx38v2lfx7r49h43k2f4z4ml78x3lq0sc952n4rckzgiv"; depends=[multcomp Rcpp]; };
   ICS = derive2 { name="ICS"; version="1.3-1"; sha256="0x3cwhvzcibgyb8gqy6dc6lgnvbf6x8425zai57g8yn5i6zzc1li"; depends=[mvtnorm survey]; };
   ICSNP = derive2 { name="ICSNP"; version="1.1-1"; sha256="1zf0k1kwdmjjqsbiiy3r2l47vjsrg09fj65p6zfld3j4gjbp17fd"; depends=[ICS mvtnorm]; };
   ICSOutlier = derive2 { name="ICSOutlier"; version="0.3-0"; sha256="1vj1y4zw8pkghkg4qnmx0yk1yw4zzl9075n5czrna9ckk2p29fmh"; depends=[ICS moments mvtnorm]; };
-  ICSShiny = derive2 { name="ICSShiny"; version="0.4"; sha256="02qcph5ax4gwz44zq8riv4yl4h0wdiwgxv7m96cpdh7gwfhwzgzr"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; };
+  ICSShiny = derive2 { name="ICSShiny"; version="0.5"; sha256="0a13vps0mkv5qs6qnl7ar0mdbkbd7i1c6kgwahmkb3id3n9bw0cl"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; };
   ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; };
   ICcalib = derive2 { name="ICcalib"; version="1.0.7"; sha256="1p224srs1jakl7iyybcn9f6r9kcwxyrikdrfa9wjgkhz60pv88fs"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; };
   ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; };
@@ -1572,8 +1602,9 @@ in with self; {
   IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.2.2"; sha256="0pfvdy82i5w6zrda2022m1v22dv2qsgcj1y7f8hqmaqvqgczizfk"; depends=[]; };
   IDTurtle = derive2 { name="IDTurtle"; version="1.2"; sha256="15r806vk5lmvyclsynzq9qr8pgwwkxal1j6xcq6408i8kq1hk3fb"; depends=[]; };
   IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; };
-  IDmining = derive2 { name="IDmining"; version="1.0.3"; sha256="1kvnp0y0837cgvjjwv2rmh64vksa7c6ififs60w7g05l690fkb9v"; depends=[data_table doParallel foreach]; };
+  IDmining = derive2 { name="IDmining"; version="1.0.4"; sha256="1jjxw9pdhd3wx5qnjnssf0j3bg91li1ar5ps02dhv0c49hslg0x0"; depends=[data_table doParallel foreach]; };
   IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; };
+  IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; };
   IGM_MEA = derive2 { name="IGM.MEA"; version="0.3.5"; sha256="09k5di7bqlqi2m3jn39ahnf7x96wx1h06bw0ah6pdszwd97yy33i"; depends=[emdist ggplot2 gridExtra gtools lattice plyr reshape2]; };
   IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; };
   IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; };
@@ -1597,7 +1628,7 @@ in with self; {
   IPtoCountry = derive2 { name="IPtoCountry"; version="0.0.1"; sha256="1b10z93mc31cr1c5wxp9xz9cr3jm4n4g5kav09dyallpgw60rskp"; depends=[data_table devtools dtables ggplot2 install_load maps scales]; };
   IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; };
   IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; };
-  IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.0.8"; sha256="0imsssija6v91il3dw5ibzm09xyjbabp2xy9jp4ixj6x8295i5xg"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; };
+  IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.1.0"; sha256="033j0dba1bzbbjn7q827h4d1rw91z8gbr2bb119lds4v8zkkfpxx"; depends=[dplyr IRISSeismic RCurl seismicRoll signal stringr XML]; };
   IRISSeismic = derive2 { name="IRISSeismic"; version="1.4.6"; sha256="1kccc4rbnyczdif7plvl3jfa3nfqfasybbbqmdkfiz0mhgvn1z4r"; depends=[pracma RCurl seismicRoll signal stringr XML]; };
   IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; };
   IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; };
@@ -1641,7 +1672,8 @@ in with self; {
   Information = derive2 { name="Information"; version="0.0.9"; sha256="0pszwzj3r7vdvdsy9w1qz95zxp7y2bsyg36b58mm4qcvcvymd4kn"; depends=[data_table doParallel foreach ggplot2 iterators plyr]; };
   InformationValue = derive2 { name="InformationValue"; version="1.2.3"; sha256="1b5g2wyp7x5cdhmf4325n3q7afa6i352lh80j28c8s4356pr3w9j"; depends=[data_table ggplot2]; };
   InformativeCensoring = derive2 { name="InformativeCensoring"; version="0.3.4"; sha256="145k4hggymra2jnxkcck795xk280yyldfzh9ls2irnsxmxfszr52"; depends=[boot dplyr survival]; };
-  Infusion = derive2 { name="Infusion"; version="1.1.8"; sha256="084k36d9bgwmcnrp1bw2vvby9j14qmw2c99pzaps0nlg10j8k4hg"; depends=[blackbox Matrix mvtnorm numDeriv proxy rcdd Rmixmod spaMM viridis]; };
+  Infusion = derive2 { name="Infusion"; version="1.2.0"; sha256="00l12balvdypcypqj8b61lfbksh6jnayai4bxchnxv99h3jq4l24"; depends=[blackbox mvtnorm numDeriv pbapply proxy spaMM viridis]; };
+  InjurySeverityScore = derive2 { name="InjurySeverityScore"; version="0.0.0.1"; sha256="13h2a95bzibszpbr6sjhm3hj03b4znrrczm8pvni70ln2lcskri0"; depends=[dplyr rlang tidyr]; };
   InspectChangepoint = derive2 { name="InspectChangepoint"; version="1.0.1"; sha256="1wirdbz4v7hk7znpjhw9j3l596lmfcrlr4wxayw7klbbdhcwq5qs"; depends=[MASS]; };
   IntClust = derive2 { name="IntClust"; version="0.0.2"; sha256="1n0ywickky1w5m8swfidiprdnkrv0mrh9z5294bimxj5ppi1yl8v"; depends=[a4Core ade4 analogue Biobase cluster e1071 FactoMineR ggplot2 gplots gridExtra gtools limma lsa plotrix pls plyr prodlim SNFtool]; };
   IntLik = derive2 { name="IntLik"; version="1.0"; sha256="13ww5bsbf1vnpaip0w53rw99a8hxzziibj7j66cm31jmi8l6fznf"; depends=[maxLik]; };
@@ -1649,6 +1681,7 @@ in with self; {
   IntegratedJM = derive2 { name="IntegratedJM"; version="1.6"; sha256="0fv24z7vidhn09ljk09pjzkrlg2rlwxcrhfjc53ybjjgsgay99z6"; depends=[Biobase ggplot2 nlme]; };
   IntegratedMRF = derive2 { name="IntegratedMRF"; version="1.1.8"; sha256="0y3hagjx3pzhqyqm3pydl3s3f1g9d5yb2w3ybxll11913p3gll3i"; depends=[bootstrap caTools ggplot2 limSolve MultivariateRandomForest Rcpp]; };
   InterVA4 = derive2 { name="InterVA4"; version="1.7.5"; sha256="0la99ylx8fnn4kpqa364nhs12y2hzp3sm0awsx5sfdv6n7m9js33"; depends=[]; };
+  InterVA5 = derive2 { name="InterVA5"; version="1.0"; sha256="0lp75yinm1ph648s0jxgjixmn4q9g1rbky6hnppicpan2mk6d7ls"; depends=[]; };
   Interact = derive2 { name="Interact"; version="1.1"; sha256="1g9zhafdpr7j410bi8p03d8x9f8m3n329x8v01yk15f65fp7pl1d"; depends=[]; };
   InteractiveIGraph = derive2 { name="InteractiveIGraph"; version="1.0.6.1"; sha256="0srxlp77xqq0vw2phfv7zcnqswi2i5nzkpqbpa5limqx00jd12zy"; depends=[igraph]; };
   Interatrix = derive2 { name="Interatrix"; version="1.1.1"; sha256="1ljxgiia0y8wv1rlm5brd0yvs1r7r5wyrs6nykmwrwwya4k34mpz"; depends=[MASS tkrplot]; };
@@ -1666,8 +1699,8 @@ in with self; {
   IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; };
   IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; };
   IsoSpecR = derive2 { name="IsoSpecR"; version="1.0.3"; sha256="1cnkzc29k0inz6kdn77l0ymzjgf1hid8jza7nla4ym2s0gidgdyf"; depends=[Rcpp]; };
-  IsoplotR = derive2 { name="IsoplotR"; version="1.0"; sha256="0cf2y81s2sc2jqbr431hjv5i347m1q5c5dxrak7ns7s8d902729y"; depends=[MASS]; };
-  IsoriX = derive2 { name="IsoriX"; version="0.7"; sha256="0b94s94axrqgv3dm9dbkdnh6imlzn245f2pi7wbj99nqhwa47ynb"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
+  IsoplotR = derive2 { name="IsoplotR"; version="1.1"; sha256="0w1zsb6qjcgyig8mahmpw0plxzqm2yqvg7gnqf50q1mpvdani2f4"; depends=[MASS]; };
+  IsoriX = derive2 { name="IsoriX"; version="0.7.1"; sha256="1x2vdgvnfkrgcrm7pdrdvr7m72y0274dab5cyhz31j8l2gqxw9la"; depends=[latticeExtra numDeriv raster rasterVis sp spaMM viridisLite]; };
   IsotopeR = derive2 { name="IsotopeR"; version="0.5.4"; sha256="0xgha5alh5y5qfz00rl73q4xlamnmrwij7kckljmy6zgrlrdnl6x"; depends=[colorspace ellipse fgui plotrix runjags]; };
   JADE = derive2 { name="JADE"; version="2.0-1"; sha256="0s7cdvhjcdxdqv4mgjd07xi3s0ngjvpxsmy0ary735rs5y6198mm"; depends=[clue]; };
   JAGUAR = derive2 { name="JAGUAR"; version="3.0.1"; sha256="0lyc8biwj9yir1i06klp2jkb31mnzwp226aw7pwabkprfhqgfmqd"; depends=[lme4 plyr Rcpp RcppArmadillo RcppProgress reshape2]; };
@@ -1677,8 +1710,8 @@ in with self; {
   JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; };
   JGL = derive2 { name="JGL"; version="2.3"; sha256="1351iq547ln06nklrgx192dqlfnn03hkwj3hrliqzfbmsls098qc"; depends=[igraph]; };
   JGR = derive2 { name="JGR"; version="1.8-4"; sha256="0zfjfqlfrsz4wjdq78zasvgd3ldgcx20h16bbar1l7wv843j71ym"; depends=[JavaGD rJava]; };
-  JM = derive2 { name="JM"; version="1.4-7"; sha256="1ajdmabifzg4jp74ghas5wf3vp4x2vnc6sh811n44a1ni727sb2n"; depends=[MASS nlme survival]; };
-  JMbayes = derive2 { name="JMbayes"; version="0.8-70"; sha256="1xvzyy2h3p30wxvgrm6d4dmxwiqs4l7dafpanlnykgih9wmh7xsf"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; };
+  JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; };
+  JMbayes = derive2 { name="JMbayes"; version="0.8-71"; sha256="0vbw3z1njl3jm4qixzh5fs3gmiqz7n3kz3a4a9sdxj498z063svj"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; };
   JMcmprsk = derive2 { name="JMcmprsk"; version="0.9.3"; sha256="0bjaiygn2sq40f2cwa1c6j73748j2cx5q69pd4jgfgbpm9r25r4f"; depends=[MASS Rcpp]; };
   JMdesign = derive2 { name="JMdesign"; version="1.1"; sha256="0w5nzhp82g0k7j5704fif16sf95rpckd76jjz9fbd71pp2d80vlh"; depends=[]; };
   JOP = derive2 { name="JOP"; version="3.6"; sha256="1kpb1dy2vm4jgzd3h0qgdw53nfp2qi74hgq5l5inxx4aayncclk7"; depends=[dglm Rsolnp]; };
@@ -1693,10 +1726,11 @@ in with self; {
   Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; };
   JoSAE = derive2 { name="JoSAE"; version="0.2.3"; sha256="0b1jwplds5b7z15v6bvqj1rbn7zxpgvh2ykhqplxzv4mlaw6i0li"; depends=[nlme]; };
   Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; };
+  JointAI = derive2 { name="JointAI"; version="0.1.0"; sha256="0im17n3w6mhgd2lnjja0ca30b2yz06qn7frcsr9qbbhnc4p7pnv4"; depends=[coda MASS mcmcse rjags]; };
   JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; };
   JointRegBC = derive2 { name="JointRegBC"; version="0.1.1"; sha256="0w7ygs3pvlqkkb2x20kv20kda3gz7cn6zgrkg30nhjxp318d76ab"; depends=[MASS nlme survival]; };
   Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; };
-  JuliaCall = derive2 { name="JuliaCall"; version="0.12.1"; sha256="1qw5qq35z525wrfrqlawm16bm4p0yzcabp2yzk8piiyhqpd7cma6"; depends=[R6 Rcpp]; };
+  JuliaCall = derive2 { name="JuliaCall"; version="0.12.2"; sha256="1408pzvnsxc1mq31b0nf61qc5rby7ymnz3vpkab4xds7kh0fcqh9"; depends=[R6 Rcpp]; };
   JumpTest = derive2 { name="JumpTest"; version="0.0.1"; sha256="1d5zmjwmajzdg5d1ws40zchx9wiaav01fby1v3irym2mx30jgbqn"; depends=[MASS Rcpp RcppEigen]; };
   JuniperKernel = derive2 { name="JuniperKernel"; version="1.2.3.0"; sha256="17r4ssjjayvnp9fp9jalklp3p8dadyx5hvi9z3bh3sw4b7kx4lyd"; depends=[data_table gdtools jsonlite pbdZMQ Rcpp repr]; };
   KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; };
@@ -1718,9 +1752,9 @@ in with self; {
   KScorrect = derive2 { name="KScorrect"; version="1.2.3"; sha256="1i69glkyi3ydzfgd8d6zrbgjq7gy9laq00jdppbqnl13i1n14sp7"; depends=[MASS mclust]; };
   KSgeneral = derive2 { name="KSgeneral"; version="0.1.0"; sha256="19rrm411c2fvx4bxi9qc6v9spqpf52k08i7gvhici9dx2hhm3134"; depends=[dgof MASS Rcpp]; };
   KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.1"; sha256="1hsndxslqgca0ay4q277zjwnwz8bzwfkzz915dgqvjd2v4afrvzx"; depends=[]; };
-  KappaGUI = derive2 { name="KappaGUI"; version="2.0.1"; sha256="0l2kgh9bflag5s056ib8fkajl56yr8c0qsmd9ma56i9ay7i540da"; depends=[irr shiny]; };
+  KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; };
   KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; };
-  KarsTS = derive2 { name="KarsTS"; version="2.0"; sha256="0mha0q5zvijrhrl0nsq229ipf6k2mhw2yqc21vvv8sifh9b9qp4y"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; };
+  KarsTS = derive2 { name="KarsTS"; version="2.1"; sha256="1kpqp1icrinh8lr72ffcbnbgcxs8865nbmnjfcz5r7lyvhd4lbh9"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; };
   KenSyn = derive2 { name="KenSyn"; version="0.2"; sha256="19xbdgxafrgxwz7swg7gzrkxszxy7ksgnmz96sar8ysmwrp7dz9i"; depends=[lme4 metafor nlme]; };
   Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; };
   KernSmooth = derive2 { name="KernSmooth"; version="2.23-15"; sha256="1xhha8kw10jv8pv8b61hb5in9qiw3r2a9kdji3qlm991s4zd4wlb"; depends=[]; };
@@ -1729,7 +1763,7 @@ in with self; {
   Kernelheaping = derive2 { name="Kernelheaping"; version="2.1.8"; sha256="03m5dwgm98x6ncifyyp2yxln4bm87rkrx84bdihywjd0x73pbklv"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; };
   KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; };
   Knoema = derive2 { name="Knoema"; version="0.1.13"; sha256="10r7gpr39f32h4znmh8kywcs0l2g9ij75qqcyd3ai1fyif54wyqc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; };
-  KnowBR = derive2 { name="KnowBR"; version="1.5"; sha256="18xcdlzr8ipsv4zxmk3424apqrgzgf87h00lwjw5ll2y99vy2ds5"; depends=[fossil mgcv plotrix sp vegan]; };
+  KnowBR = derive2 { name="KnowBR"; version="1.7"; sha256="1h5xpj7cqj6130rwsd6bssvwmzc6ldb5wbjgqw7bc588ll1q5rsg"; depends=[fossil mgcv plotrix sp vegan]; };
   KoNLP = derive2 { name="KoNLP"; version="0.80.1"; sha256="1chj8kv1l405dm0jcsxjjjxx395z05sfxbcc5vxnpbydx7lxa6zy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; };
   KoulMde = derive2 { name="KoulMde"; version="3.0.0"; sha256="01mczlrdrfwdp2cj10kdqay3qpg8xf2v7vym62pll9l8n595snrl"; depends=[Rcpp]; };
   Kpart = derive2 { name="Kpart"; version="1.2.1"; sha256="0jx5rqiw0y9hc1czg75iy4jvd993d7dri90s4iiskbg6x6z65mi9"; depends=[leaps]; };
@@ -1737,7 +1771,7 @@ in with self; {
   KrigInv = derive2 { name="KrigInv"; version="1.3.1"; sha256="0fcfv2vl572l8qp1ilhjai6zrw15bf1z41qm7xlfspfbj611ga7k"; depends=[DiceKriging pbivnorm randtoolbox rgenoud]; };
   L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; };
   LAGOSNE = derive2 { name="LAGOSNE"; version="1.1.0"; sha256="08sf4mm40gv9mr57pxsl1b62s2dqvbvrhy2irzqspyqk5ai2aw0m"; depends=[curl dplyr lazyeval magrittr purrr rappdirs sf stringr]; };
-  LAM = derive2 { name="LAM"; version="0.1-22"; sha256="0gj4j5yqyllxbhz6iayh0w473hzq0xc1r9dlyxhh67k9mg951phb"; depends=[CDM coda Rcpp RcppArmadillo sirt]; };
+  LAM = derive2 { name="LAM"; version="0.2-9"; sha256="0znkh25aa2vv3h3rfqdaadk58c2p7rwfw8xx5i8fs6dzyvx6c99l"; depends=[CDM coda Rcpp RcppArmadillo sirt TAM]; };
   LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; };
   LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; };
   LBSPR = derive2 { name="LBSPR"; version="0.1.2"; sha256="09jvdjagf4icnigbfw18z36ya4llg84fa6j2khd22cl60y81r5i3"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; };
@@ -1753,7 +1787,7 @@ in with self; {
   LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; };
   LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; };
   LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; };
-  LDheatmap = derive2 { name="LDheatmap"; version="0.99-2"; sha256="0n80l4wl9rs4ps8h2bjpar5nidq7bg05d6675wiwanx24q6fc0bs"; depends=[chopsticks genetics]; };
+  LDheatmap = derive2 { name="LDheatmap"; version="0.99-4"; sha256="1xdvpydnrlzb6q4hm0rcflf0vysww1xszj6ynly6a32xqmhg0sbq"; depends=[genetics snpStats]; };
   LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; };
   LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; };
   LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; };
@@ -1775,23 +1809,25 @@ in with self; {
   LMest = derive2 { name="LMest"; version="2.4.2"; sha256="0a0azn3lyy0n1882c0zxf7f1b0h26rcck8mmsbh2wxg7r3nckkrd"; depends=[MASS MultiLCIRT]; };
   LMfilteR = derive2 { name="LMfilteR"; version="0.1.1"; sha256="0wjrnzki6mnar3lxfr2mcvk98b58qkqpbb9xx7vgrw567g1ga1ig"; depends=[MASS]; };
   LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; };
-  LNIRT = derive2 { name="LNIRT"; version="0.2.0"; sha256="02gaqn2pixry6qgybwszsv60pk6hzdd51axchkq3ma3gb6biw4fv"; depends=[MASS]; };
+  LNIRT = derive2 { name="LNIRT"; version="0.3.0"; sha256="1xlfk3a0x8abs6xwsm9s50nvi53s1a7nhnskhvjbi3rdzkvkrwxl"; depends=[MASS]; };
   LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; };
   LOGIT = derive2 { name="LOGIT"; version="1.3"; sha256="1nx9ycrys0p08xr1n7bqgn47k5wz1zbp6w5pwsqk5c6f6did2rs1"; depends=[caret e1071 ggplot2 MASS pROC reshape]; };
   LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; };
   LPCM = derive2 { name="LPCM"; version="0.45-0"; sha256="15gpb59556s28npdsw1r821rld7b11y1m2m97m320n9k0z4vbk3i"; depends=[]; };
+  LPGraph = derive2 { name="LPGraph"; version="1.0"; sha256="0hbcllrvjsgkapkf28957y47jrhajrk7j67iw36bxpbb25xfvl7i"; depends=[car SDMTools]; };
   LPKsample = derive2 { name="LPKsample"; version="1.0"; sha256="0vxps8zd9zg1aw4p2qd8wamcjkbl68yvppnlvshm2ry5dahwz1wk"; depends=[apcluster igraph mclust]; };
   LPM = derive2 { name="LPM"; version="2.7"; sha256="1anjgflj1272xrghn3s9a21f2dfggppnzjqh3p8zaid91bzg0g34"; depends=[fracdiff MASS QRM]; };
   LPR = derive2 { name="LPR"; version="1.0"; sha256="16kmfm6p7cwnzpd054ik0cy0ipif6zssdfyxyfm0cijz8z4z40x7"; depends=[doParallel foreach glmnet iterators lattice Matrix slam]; };
   LPS = derive2 { name="LPS"; version="1.0.10"; sha256="0gf3jmhfki01z8fm5xdx59gxvhgzqd10x2iwa8369iz9dvwbjk8j"; depends=[]; };
   LPStimeSeries = derive2 { name="LPStimeSeries"; version="1.0-5"; sha256="0jmcy8076w4bzfnxaq2m3s60c1wdmywkwzfyrc19wdm8idf666wh"; depends=[RColorBrewer]; };
   LPTime = derive2 { name="LPTime"; version="1.0-2"; sha256="08lb6884kj9pg12mzx67fdnqb86x5s6yzb72hh3nrz50awj1f8nn"; depends=[orthopolynom]; };
+  LPWC = derive2 { name="LPWC"; version="0.99.2"; sha256="1cir7w4rrpw7iqc1waf5aijk41hl19mdg1q7ml7mi0js88xy0a0y"; depends=[]; };
   LPmerge = derive2 { name="LPmerge"; version="1.6"; sha256="0xc06s2p7n151lzrp0dcrrxk8zmd816dc7qbnbcail5c1bhvdqhd"; depends=[Matrix Rglpk]; };
   LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; };
   LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; };
   LS2W = derive2 { name="LS2W"; version="1.3-3"; sha256="0pdsv7ld0j116rh94m5y1i2mwrzc80fqxmc6ykc51i1sj6ws3i5k"; depends=[wavethresh]; };
   LS2Wstat = derive2 { name="LS2Wstat"; version="2.0-3"; sha256="0wkh1a6xbp3qg5favxsj166jcgdza16zki675gswxckana6s4is7"; depends=[geoR LS2W matrixStats RandomFields spdep]; };
-  LSAfun = derive2 { name="LSAfun"; version="0.5.1"; sha256="0wj2j53jizg014sppag9zbs5hzc3mvpg1fx1s7l4ff6rabhgvlff"; depends=[lsa rgl]; };
+  LSAfun = derive2 { name="LSAfun"; version="0.5.2"; sha256="114qhnx4dr7ywh3fzkjd35xygpnn74g5nv66ahj7hf5w0gg13ws9"; depends=[lsa rgl]; };
   LSAmitR = derive2 { name="LSAmitR"; version="1.0-1"; sha256="0p1j4q1b7488wbwl2c9py6ldq2j7ri1dvnmmknx5lwvzv0xsawsd"; depends=[Hmisc lme4]; };
   LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; };
   LSD = derive2 { name="LSD"; version="4.0-0"; sha256="0fsp3pwrnnic9mzkd6yxa4bnxbvg68712lb20vd42wf6jb39r2h3"; depends=[]; };
@@ -1803,7 +1839,7 @@ in with self; {
   LSTS = derive2 { name="LSTS"; version="1.0"; sha256="1vgdqyj6k50gqfffqfb4n3sw27jrq21nl2h8sz8942w4a8fn7sgv"; depends=[]; };
   LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; };
   LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; };
-  LTRCtrees = derive2 { name="LTRCtrees"; version="1.0.0"; sha256="08wkhd7sqk0q9sahg6bd1m2xgl5yk9ldvripa6vyps0nni1h8lb6"; depends=[interval inum partykit rpart survival]; };
+  LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.0"; sha256="07mvbk3hwl240r46ahha0a4fzq96awk963zl8dhky51b6abp83gz"; depends=[icenReg inum partykit rpart survival]; };
   LVMMCOR = derive2 { name="LVMMCOR"; version="0.01.1"; sha256="1lq4hqcg0qkywdr4a22m1fr3m97749mm6n2jzdj9i7jrf0agc1fs"; depends=[MASS nlme]; };
   LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; };
   LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; };
@@ -1825,9 +1861,10 @@ in with self; {
   LeLogicielR = derive2 { name="LeLogicielR"; version="1.2"; sha256="0h52pzrksi1mn55mnxbfi61hl7x61cnkhp450slfrk68f6kp30x6"; depends=[gdata IndependenceTests RColorBrewer xtable]; };
   LeafAngle = derive2 { name="LeafAngle"; version="1.2-1"; sha256="0g3i5300f3rvjz7g7z8s5n8xdcsp41gf1vnr4g36m1likddfpxlx"; depends=[]; };
   LeafArea = derive2 { name="LeafArea"; version="0.1.7"; sha256="0pn6hh9ipr609pi49ls8wxnx7v8q1wyp84i22zzwxyzwaap5nmj2"; depends=[]; };
-  LearnBayes = derive2 { name="LearnBayes"; version="2.15"; sha256="0cz2rgqy1cmdz2h1qbdvfqxmmdzmg2z1scdlxr7k385anha13ja5"; depends=[]; };
+  LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; };
   LearnGeom = derive2 { name="LearnGeom"; version="1.3"; sha256="0fqf5k3gsdxwyfcbkypqiq0ir8ay8r9bdy8iljhj308ammq0mxzk"; depends=[RgoogleMaps]; };
   LendingClub = derive2 { name="LendingClub"; version="1.0.4"; sha256="03pgarbraj6in7pk7zaci98aq6dh52vsqb64my5p0bczgl2cpzmm"; depends=[dplyr httr jsonlite plyr]; };
+  LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.1.2"; sha256="0ziy86l6q01l471lmpldhs48xqlyw1va75np5hkzaq5wapr9pfk4"; depends=[data_table quanteda scales stringdist stringi]; };
   LexisPlotR = derive2 { name="LexisPlotR"; version="0.3"; sha256="1qdgs6p11j0ign27bbnn32g65sw42982ijrig5cwqsdvxpdabjl8"; depends=[ggplot2]; };
   LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; };
   LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; };
@@ -1851,7 +1888,7 @@ in with self; {
   LocalControl = derive2 { name="LocalControl"; version="1.1.0"; sha256="0hfm8lllsg5h95ib0h89hbhwcnk2959y9i3kllwmxhmqbirvlpx9"; depends=[cluster gss lattice Rcpp]; };
   Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; };
   Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; };
-  LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.5-9"; sha256="135vkp70q6gn75ds43aq08y13vrsgsgykssmnhrh6545i86vmhhi"; depends=[MASS mvtnorm]; };
+  LogConcDEAD = derive2 { name="LogConcDEAD"; version="1.6-1"; sha256="1hy7fnahncpsgqxfy352lxk298i69w7drlspsgdvpzdbghca3y3i"; depends=[MASS mclust mvtnorm rgl tkrplot]; };
   LogicForest = derive2 { name="LogicForest"; version="2.1.0"; sha256="0zdyyi6wka0568414f1kw91rx04y76n1k11wxd4r8svb5wybjhp5"; depends=[CircStats gtools LogicReg plotrix]; };
   LogicReg = derive2 { name="LogicReg"; version="1.5.9"; sha256="0rxzhbf51psdj7wb2dcah16y8f5q7y8p0yybz54rm00d1qagl6nq"; depends=[survival]; };
   LogisticDx = derive2 { name="LogisticDx"; version="0.2"; sha256="0ciygvynnyajpn1glxy6mwj9vbl7iv8a8dfsi6wxjxp2rac68rig"; depends=[aod data_table pROC RColorBrewer rms speedglm statmod]; };
@@ -1863,10 +1900,10 @@ in with self; {
   LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; };
   LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; };
   LumReader = derive2 { name="LumReader"; version="0.1.0"; sha256="1h2r3c9xkwlnaicn65085bdx7y86ha2fpd5mxirqax5lm6d8lirc"; depends=[gridExtra lattice plotly shiny]; };
-  Luminescence = derive2 { name="Luminescence"; version="0.8.2"; sha256="0fk7vmgp0ws31azl7hazx925ddksqfgsmfwz2akfhbzi1y4bys3m"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
+  Luminescence = derive2 { name="Luminescence"; version="0.8.3"; sha256="0mrmxz5b1px44h50ai25lza67k2ji78sdi1b6nd373kpmix5kxa1"; depends=[bbmle data_table httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; };
   M3 = derive2 { name="M3"; version="0.3"; sha256="1l40alk166lshckqp72k5zmsgm7s5mgyzxlp11l64mgncjwkw2r3"; depends=[mapdata maps ncdf4 rgdal]; };
   MADPop = derive2 { name="MADPop"; version="1.1"; sha256="1w2jbiki6d14y32p8a50b8g53m1iva2kgik14yg27z5hx1rwwq97"; depends=[BH Rcpp RcppEigen rstan StanHeaders]; };
-  MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.2"; sha256="11031gmc6zrhn6vdzza4qqvwc48h09kbvkikqznqr9hhkysv7c11"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; };
+  MAGNAMWAR = derive2 { name="MAGNAMWAR"; version="2.0.3"; sha256="0xv4ldyjp6pa2jk81al5ldvm72ywzb9fmwim8l97xcbydm5wxjcx"; depends=[ape coxme doParallel dplyr foreach iterators lme4 multcomp plyr qqman seqinr survival]; };
   MAINT_Data = derive2 { name="MAINT.Data"; version="1.2.1"; sha256="0fmlmb88005diqwbxlgkzzb7bvxpdkiqiadp649id3mgcz100kcd"; depends=[MASS mclust miscTools pcaPP Rcpp RcppEigen robustbase rrcov sn]; };
   MALDIquant = derive2 { name="MALDIquant"; version="1.17"; sha256="047s6007ydc38x8wm027mlb4mngz15n0d4238fr8h43wyll5zy0z"; depends=[]; };
   MALDIquantForeign = derive2 { name="MALDIquantForeign"; version="0.11.1"; sha256="1aj6gakhbpis576b264s43w55dhmd5rszj54z910plybxq8hzmir"; depends=[base64enc digest MALDIquant readBrukerFlexData readMzXmlData XML]; };
@@ -1878,7 +1915,7 @@ in with self; {
   MAPA = derive2 { name="MAPA"; version="2.0.4"; sha256="02s223s58k2jk49m0xlz3q9m3nip3h4dl4v58j18z2vgi54dwnjr"; depends=[forecast RColorBrewer smooth]; };
   MAPLES = derive2 { name="MAPLES"; version="1.0"; sha256="0hzsh7z1k7qazpxjqbm9842zgdpl51irg7yfd119a7b2sd3a8li9"; depends=[mgcv]; };
   MAR1 = derive2 { name="MAR1"; version="1.0"; sha256="1r6j890icl5h3m2876sakmwr3c65513xnsj68sy0y0q7xj3a039l"; depends=[bestglm leaps]; };
-  MARSS = derive2 { name="MARSS"; version="3.9"; sha256="0vn8axzz0nqdcl3w00waghz68z8pvfm764w11kxxigvjpw2plj31"; depends=[KFAS mvtnorm nlme]; };
+  MARSS = derive2 { name="MARSS"; version="3.10.8"; sha256="1cmkish5rbv7lpm8fnv6d33plkfvxis4r4p48bx10fll1ba11m7h"; depends=[KFAS mvtnorm nlme]; };
   MARX = derive2 { name="MARX"; version="0.1"; sha256="1yanv7q5l8ybw3mh0rvhxyqi2sp8w4b9vnas7lpqflc06j4nnv4p"; depends=[fBasics matlab stabledist tseries]; };
   MASS = derive2 { name="MASS"; version="7.3-49"; sha256="1yjbnj1p4z0vw84wga8q5fyqiw4n6r7pc6rdwam7vsbiamyzfcqs"; depends=[]; };
   MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.3"; sha256="0dsqinl6998jv63m6scljszpi0qb050gj5d4wnp0pcxfs9awi2gj"; depends=[]; };
@@ -1898,11 +1935,12 @@ in with self; {
   MBHdesign = derive2 { name="MBHdesign"; version="1.0.79"; sha256="1qz0igm8h3ij8yc9bg3vr3mkmf99h1kyxscdhkfphc66zaazhyw1"; depends=[class geometry mgcv mvtnorm randtoolbox]; };
   MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; };
   MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; };
+  MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; };
   MBTAr = derive2 { name="MBTAr"; version="1.0.1"; sha256="0zak19pdk0wwkhl4kj1jbwx0qmqcgpmmqv3vk0wg8nwgf1l65idy"; depends=[jsonlite]; };
   MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; };
   MC2toPath = derive2 { name="MC2toPath"; version="0.0.16"; sha256="0jdn9wpxavn2wrml907v23mfxr62wwjdh7487ihjj59g434ry7wh"; depends=[RNetCDF]; };
   MCAvariants = derive2 { name="MCAvariants"; version="2.0"; sha256="0akff64v49d5r0wvspal0pz17jhz1ry4vdmj47m28gzjj69zcab0"; depends=[]; };
-  MCDA = derive2 { name="MCDA"; version="0.0.18"; sha256="1m8kf8xxli3dbbabrcanpsmsmywf21ma0nb9jq2phz7ifgladdyi"; depends=[combinat glpkAPI RColorBrewer Rglpk]; };
+  MCDA = derive2 { name="MCDA"; version="0.0.19"; sha256="0r8l6q5aisjfk0xpv4pyccnngjlkm3978lba62rspd9kyhjlz64n"; depends=[combinat glpkAPI RColorBrewer Rglpk]; };
   MCDM = derive2 { name="MCDM"; version="1.2"; sha256="0r27y9mqvfnv1m0yi2xdyjr4y1s43d5yav960kz2xa732hrrxw01"; depends=[RankAggreg]; };
   MCI = derive2 { name="MCI"; version="1.3.3"; sha256="1wn8lcr5sq3697nsmly6syb9jv7p99ks0fy933ff5rx54x3rf9hz"; depends=[]; };
   MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; };
@@ -1911,9 +1949,9 @@ in with self; {
   MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; };
   MCMCglmm = derive2 { name="MCMCglmm"; version="2.25"; sha256="0crici0g6x2471kk9092f72gc6ghbwwqid3w8jsnsvy6ymmk2wih"; depends=[ape coda corpcor cubature Matrix tensorA]; };
   MCMCpack = derive2 { name="MCMCpack"; version="1.4-2"; sha256="1nizmfxyyrp0sbmyprgm97xmi3amxwix1gj7p9v0sjjklv1djap4"; depends=[coda lattice MASS mcmc quantreg]; };
-  MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.7"; sha256="0pbyg6v478di1w9cpp2rmhr4p5ncnwmks042981snqc5gnwysjx4"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
-  MCMCvis = derive2 { name="MCMCvis"; version="0.9.4"; sha256="0pfj14pji0dqzlq6vy76prkh8m0hj784yjr5lz3p68kviwzrk9r6"; depends=[coda overlapping rstan]; };
-  MCPAN = derive2 { name="MCPAN"; version="1.1-20"; sha256="0j36dhi3bf3q14bbcmrmipz2fcn6g9gsqidzm43i8x5r7hcvv2lh"; depends=[magic MCMCpack multcomp mvtnorm plyr]; };
+  MCMCprecision = derive2 { name="MCMCprecision"; version="0.3.8"; sha256="1qyhxljfcnyj7450vik4j81qilvphwc1b2xv48fnx1pnapfl45wz"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; };
+  MCMCvis = derive2 { name="MCMCvis"; version="0.10.0"; sha256="1yw4xrbkl2mdylvibnqy14v211a1h5knqgpp0syplvjaysjk9irm"; depends=[coda overlapping rstan]; };
+  MCPAN = derive2 { name="MCPAN"; version="1.1-21"; sha256="0q1m0xg8825q9zjwxcz2h2n0dyr21q5bk29qbqpdhirlwm6f1a51"; depends=[magic MCMCpack multcomp mvtnorm plyr]; };
   MCPMod = derive2 { name="MCPMod"; version="1.0-10"; sha256="0ns74qhm9bzi70m9bn61zs4mmqmmxxi77f49pdrcnr8wrrnn1kdn"; depends=[lattice mvtnorm]; };
   MCPerm = derive2 { name="MCPerm"; version="1.1.4"; sha256="0g65vzn43k6qrsglxd2kz245f662gl3c2gdz6qvvxa96v6q9lhh1"; depends=[metafor]; };
   MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; };
@@ -1927,6 +1965,7 @@ in with self; {
   MDSMap = derive2 { name="MDSMap"; version="1.0"; sha256="15557ca83bvsqcmsa48vispagg9a05658i22cqk706shjsp782n5"; depends=[princurve reshape rgl smacof]; };
   MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; };
   MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; };
+  MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; };
   MEET = derive2 { name="MEET"; version="5.1.1"; sha256="02xz2zkwqaf1wck9a3h1j6z8dasw4j0zqa88jg6h10wqzcrlp9ba"; depends=[Hmisc KernSmooth Matrix pcaMethods ROCR seqinr seqLogo]; };
   MEGENA = derive2 { name="MEGENA"; version="1.3.6"; sha256="0ylv7kbk0x3rm08aiwci4p3kma08qj4szlw2h1d6wcqmipy93v8s"; depends=[BH cluster doParallel foreach fpc ggplot2 ggrepel igraph Matrix Rcpp reshape]; };
   MEMSS = derive2 { name="MEMSS"; version="0.9-2"; sha256="0wyw8yjs4miwgwdfcnfbzvkxrgv5r3jlg3cg8q2vy7s69wvhksmy"; depends=[lme4]; };
@@ -1936,6 +1975,7 @@ in with self; {
   MExPosition = derive2 { name="MExPosition"; version="2.0.3"; sha256="1l27wp0psfvlkk79fhb8ypf8awardjljg1f37yj42friy9pdfksz"; depends=[ExPosition prettyGraphs]; };
   MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; };
   MFAg = derive2 { name="MFAg"; version="1.4"; sha256="092zbl2pxbsvfyf3qssbid14194p0ax2zrw0gzpyqwzdpx0brrlb"; depends=[]; };
+  MFDFA = derive2 { name="MFDFA"; version="1.0"; sha256="1gy1v49525i2bhr14nvpz8rqcz3lchfnvm0g53qlln55jdndgsx4"; depends=[]; };
   MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; };
   MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; };
   MFT = derive2 { name="MFT"; version="1.3"; sha256="029apjg1fqrqfg98jczbxfy267m3f68qxvxqjzbsw1xisq4j7wc0"; depends=[]; };
@@ -1944,6 +1984,7 @@ in with self; {
   MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; };
   MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; };
   MHCtools = derive2 { name="MHCtools"; version="1.1.0"; sha256="03y6m3a46bzazxkrxdrii2p1fyc26il09z5676c63rk8wz9wcxa0"; depends=[rlist]; };
+  MHTcop = derive2 { name="MHTcop"; version="0.1.0"; sha256="1fhi7inv8zf3ygj4pf8am445ldq9qpwzi3ll4xqwz8d4s6ajx405"; depends=[copula matrixStats MCMCpack mvtnorm stabledist]; };
   MHTdiscrete = derive2 { name="MHTdiscrete"; version="1.0.0"; sha256="0w1hxa3qk8glijhc4h1wrl5xw54zflibgilhs1w872w9wrkxs5ih"; depends=[]; };
   MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; };
   MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; };
@@ -1954,6 +1995,7 @@ in with self; {
   MIIVsem = derive2 { name="MIIVsem"; version="0.5.2"; sha256="0i144v2qjqb26vjym1lh3hbikm882hrwx6kz2ajrica59gyryr37"; depends=[boot car lavaan Matrix numDeriv]; };
   MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; };
   MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; };
+  MIRL = derive2 { name="MIRL"; version="1.0"; sha256="1l52zpd00rm77vlk4lgnlviz18f7079a4n1gvlmr5syib7cvhfxs"; depends=[boot glmnet MASS mice]; };
   MIXFIM = derive2 { name="MIXFIM"; version="1.0"; sha256="0m4fnmdd8lsdxq629f87lzz1cdc1q0j3q9hqna85ncpflyfwlvg9"; depends=[ggplot2 mvtnorm rstan]; };
   MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; };
   MInt = derive2 { name="MInt"; version="1.0.1"; sha256="1nk02baainxk7z083yyajxrnadg2y1dnhr51fianibvph1pjjkl6"; depends=[glasso MASS testthat trust]; };
@@ -2016,7 +2058,7 @@ in with self; {
   MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; };
   MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; };
   MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; };
-  MSbox = derive2 { name="MSbox"; version="1.0"; sha256="0r6bvw7ddb8lvz5cjvcng9vkc6pn765xgd4bws594jyc0avm0jkx"; depends=[stringr]; };
+  MSbox = derive2 { name="MSbox"; version="1.1"; sha256="0hal7cqfmmcsckysxnwr2qsa2b61ck4zgbdl52w1iqkkvm8qq1x9"; depends=[stringr]; };
   MScombine = derive2 { name="MScombine"; version="1.1"; sha256="0kgz1l4jlhcada3fp02dscf4zx6a22cjxj251838lfz65f512hrn"; depends=[plyr]; };
   MSeasy = derive2 { name="MSeasy"; version="5.3.3"; sha256="191mvg1imxfjlnd808ypn4lsjx7n6ydf16flax79hv01z7rcjylh"; depends=[amap cluster clValid fpc mzR xcms]; };
   MSeasyTkGUI = derive2 { name="MSeasyTkGUI"; version="5.3.3"; sha256="0ihz8vr2wbgy88bzssilgvlhkbr13jznfjvnqy73wpchqgwy0wy6"; depends=[MSeasy]; };
@@ -2033,14 +2075,14 @@ in with self; {
   MVA = derive2 { name="MVA"; version="1.0-6"; sha256="09j9frr6jshs6mapqk28bd5jkxnr1ghmmbv6f4zz0lrg81zjizl3"; depends=[HSAUR2]; };
   MVB = derive2 { name="MVB"; version="1.1"; sha256="0an8b594rknlcz6zxjva6br8f34sgwdi2jil3xh1xzb5fa55dw0f"; depends=[Rcpp RcppArmadillo]; };
   MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; };
-  MVN = derive2 { name="MVN"; version="5.0"; sha256="1rpb9hxi4g87h6gvg6qdvk3f208cdayikmb8ib499ax3wv1zszhy"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; };
-  MVR = derive2 { name="MVR"; version="1.32.0"; sha256="18arp9xh9dflbmc5zxafy132mnz5xwc6kb9hv51njz602kms70qg"; depends=[statmod]; };
+  MVN = derive2 { name="MVN"; version="5.1"; sha256="1w0q42yqh6c0yl2mkcpn28da59i5svrqg18z2dndnxhvyl46ij3d"; depends=[boot energy kableExtra magrittr MASS moments mvoutlier nortest plyr psych robustbase]; };
+  MVR = derive2 { name="MVR"; version="1.32.1"; sha256="03dbd5nib8cx0rwdi4g9fihbkdxazpvbdjh7sfnavsyyrgnqa31m"; depends=[statmod]; };
   MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; };
   MVar_pt = derive2 { name="MVar.pt"; version="1.9.9"; sha256="1lhy66k9x9ymj03d4f7wi6rdx60bwgy6gfv49jq3vr4cj8dv22i9"; depends=[]; };
   MVisAGe = derive2 { name="MVisAGe"; version="0.2.0"; sha256="18w3qf85l81sbxhzxs61jbsng14lbd8vzvbprq0ywkxb2lsq16n2"; depends=[]; };
   MWLasso = derive2 { name="MWLasso"; version="1.3.1"; sha256="11lyk46lmjcd60q0mixi41b8ybjgyp1xi18g3ag4450xyhw3r17s"; depends=[]; };
   MWRidge = derive2 { name="MWRidge"; version="1.0.0"; sha256="17kvs9npr1ff24z3pv9x2qnfwyy6w3hc7hm60ynzbjlk2rr11xr9"; depends=[glmnet]; };
-  MXM = derive2 { name="MXM"; version="1.3.2"; sha256="0d3x773870ky6q36g6skcyfvywrwc264f5g55sh3229c6qpjgzq2"; depends=[doParallel energy foreach geepack hash lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; };
+  MXM = derive2 { name="MXM"; version="1.3.3"; sha256="1xzw7ad3kpd8chfksgfsv0wdy7h1kzw5n410ndfhd1mx1cdfghj9"; depends=[doParallel dplyr energy foreach geepack hash knitr lme4 MASS nnet ordinal quantreg relations Rfast survival visNetwork]; };
   MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; };
   Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; };
   MagneticMap = derive2 { name="MagneticMap"; version="1.0"; sha256="1634bk6x92z01gyiy89c1g6z5cjsj8pf4f358y7rk2kppmfz4cf7"; depends=[scatterplot3d]; };
@@ -2050,8 +2092,10 @@ in with self; {
   ManlyMix = derive2 { name="ManlyMix"; version="0.1.11"; sha256="0vnx4cmx5vv8qh3pn75lz1mxap1ar4jnc5j15552vvi4i9pgmmar"; depends=[]; };
   ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; };
   Map2NCBI = derive2 { name="Map2NCBI"; version="1.1"; sha256="19gafyql767f1p4fxdw7d5a8z1b4vg7jfrvzaml5x16fj6c78fjm"; depends=[]; };
-  MapGAM = derive2 { name="MapGAM"; version="1.0"; sha256="1hzv3sy2szxl4fhnnzlwagh3qm4z22cbhiwi8whgn5ymwlnw0pca"; depends=[gam maptools sp survival]; };
+  MapGAM = derive2 { name="MapGAM"; version="1.1"; sha256="0sh7qnzzahaz09nmld5p8df93my6k5vpvgmvqdlz84vghcfbfpa2"; depends=[colorspace gam maptools sp survival]; };
   MareyMap = derive2 { name="MareyMap"; version="1.3.4"; sha256="1wap0syzgd0w3xla2x4bcasn8zzlj63r5yyf9r479nvifjxdqxzz"; depends=[tkrplot]; };
+  MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; };
+  MarginalMediation = derive2 { name="MarginalMediation"; version="0.5.1"; sha256="1v7ly1yaglyh257b1q4vc7sfrk41lb4ar9dpwf5ppap581pgpz3f"; depends=[boot magrittr purrr]; };
   MarkowitzR = derive2 { name="MarkowitzR"; version="0.9900.0"; sha256="1wyqlgmb376dsvx7nixpbynjzp7xpmsh4fx9s7nai6fhjb50mxha"; depends=[gtools matrixcalc sandwich]; };
   Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; };
   MasterBayes = derive2 { name="MasterBayes"; version="2.55"; sha256="14532l41x5k3z2qg0vklafqyzmn45qny9hlrrgriykajv3xjf2lz"; depends=[coda genetics gtools kinship2]; };
@@ -2061,8 +2105,8 @@ in with self; {
   MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; };
   Matching = derive2 { name="Matching"; version="4.9-2"; sha256="0lv5b41l797c4bl2rzmdqzjnn47zpvvcv3md3xwxvvz5knxky5x4"; depends=[MASS]; };
   MatchingFrontier = derive2 { name="MatchingFrontier"; version="1.0.0"; sha256="1djlkx7ph8p60n2m191xq9i01c2by4vpmjj25mbxy5izxm5123aa"; depends=[igraph MASS segmented]; };
-  Matrix = derive2 { name="Matrix"; version="1.2-12"; sha256="1wm45hg4x5ay15y03k6rmgkd1n9r01da72mszk24vafwd7pimr8n"; depends=[lattice]; };
-  Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.6"; sha256="0aa225y6vqm0dqjfppfrc43wbq3ks9aszhmy73xbai2v12sh439g"; depends=[grr Matrix]; };
+  Matrix = derive2 { name="Matrix"; version="1.2-14"; sha256="15hknim84nj3f54vkchca5ac0c3ip15v1by18k5parmn8wsl19j9"; depends=[lattice]; };
+  Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.7"; sha256="1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va"; depends=[grr Matrix]; };
   MatrixCorrelation = derive2 { name="MatrixCorrelation"; version="0.9.2"; sha256="0s4gxgl6fsy0fnjmsdz4k7p96vl6p00xl9w2fg7v0gikjpz6h5bg"; depends=[plotrix pracma progress Rcpp RcppArmadillo RSpectra]; };
   MatrixEQTL = derive2 { name="MatrixEQTL"; version="2.2"; sha256="1205jxx5aj783r2dmpawiq4rr30b60fq1qf053i7wylw07pz6vba"; depends=[]; };
   MatrixLDA = derive2 { name="MatrixLDA"; version="0.1"; sha256="19q6wl8fc6jzn7544qnlpzfh9v0xlg9cr78l6k8kx6kzjnbnyh9z"; depends=[glasso plyr Rcpp RcppArmadillo]; };
@@ -2079,7 +2123,7 @@ in with self; {
   MedOr = derive2 { name="MedOr"; version="0.1"; sha256="1rwc14s16lnzgb78ac2017hv9pss7zw7nw3y7vrvq1qx4fgiw6f8"; depends=[]; };
   MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; };
   Mediana = derive2 { name="Mediana"; version="1.0.6"; sha256="0cx2bkz5m96dirqknfsi9944rhnn14wwdimw1hq1p8c073z40i7a"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; };
-  Mega2R = derive2 { name="Mega2R"; version="1.0.0"; sha256="1rprbn7pkp0haahf34d1w7pmzn6hv8ci93gfp68hpyxxi6qm61g0"; depends=[AnnotationDbi DBI GenABEL GenomeInfoDb pedgene Rcpp RSQLite SKAT]; };
+  Mega2R = derive2 { name="Mega2R"; version="1.0.2"; sha256="0v56sd0q8bxirjm851sjba52sb846ccqn7bihy0zm4fkqlfdm5m3"; depends=[AnnotationDbi DBI GenABEL GenomeInfoDb pedgene Rcpp RSQLite SKAT]; };
   MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.3.0"; sha256="1nnj4nmzrvdj2arq74bg5ckhmll2z9ydnd75ds48njbhxla2645l"; depends=[ggplot2 iterpc knitr Matrix plotly rmarkdown robustbase]; };
   MenuCollection = derive2 { name="MenuCollection"; version="1.2"; sha256="0v3flicfnln9qld150yk3rfldvsr4dllhq80l02n1lq6px38nf2s"; depends=[gplots RGtk2 RGtk2Extras]; };
   MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; };
@@ -2093,7 +2137,7 @@ in with self; {
   MetaComp = derive2 { name="MetaComp"; version="1.1.1"; sha256="0ndnjpg0c9k4171n190qwxmy79kw2ax4y5ap4xvaf0x561p072l6"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; };
   MetaCycle = derive2 { name="MetaCycle"; version="1.1.0"; sha256="1kzdk21xpbvwibs8501zwdb9lzj7g5nv2zqaskg9x0szshhg8vpp"; depends=[gnm]; };
   MetaIntegrator = derive2 { name="MetaIntegrator"; version="1.0.3"; sha256="0611k497ixy0f51lmqzs08zqqq5krrxrm7m0xqdl18gkwrw3w656"; depends=[Biobase DBI GEOmetadb GEOquery ggplot2 gplots multtest preprocessCore reshape rmeta Rmisc RMySQL RSQLite stringr]; };
-  MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.1"; sha256="1m7h1bdk172zjx7xxlh4lac17ndx28vjpvdkyb352j5f4r4aq09g"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
+  MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.3"; sha256="0zf45c6prr1g9xqsn4f5cxh30qvadbk0hzknz2hff6ljggjxxfia"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; };
   MetaLonDA = derive2 { name="MetaLonDA"; version="1.0.9"; sha256="1iy7p91ln48fhym7gna8xmqrva6fcwxapqcyh1h6hqr0h3j392qd"; depends=[caTools DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr]; };
   MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; };
   MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; };
@@ -2103,6 +2147,7 @@ in with self; {
   MetaboList = derive2 { name="MetaboList"; version="1.2"; sha256="15wkj29s1mxi1wzqzlh8lkr5jkw15dbc37h3hzsc0r72a3ddzf38"; depends=[enviPick]; };
   MetaboQC = derive2 { name="MetaboQC"; version="1.0"; sha256="1hm0ndwda1ciyyg8igkpaalvvdyd7aq5wnl9gzza8fr1l9fxp4a2"; depends=[plyr]; };
   MetabolAnalyze = derive2 { name="MetabolAnalyze"; version="1.3"; sha256="0cl76x6imx4a95wd74xx5s8i2vg8wq3inqgakvgzmkwxad6qhrqp"; depends=[ellipse gplots gtools mclust mvtnorm]; };
+  MetabolomicsBasics = derive2 { name="MetabolomicsBasics"; version="1.0"; sha256="0crgdi7h8gl219lrb7i4f9jisgs7mkz45imwzh69acly4d2332ni"; depends=[C50 caret e1071 mixOmics pcaMethods plyr rattle rpart]; };
   MetaheuristicFPA = derive2 { name="MetaheuristicFPA"; version="1.0"; sha256="096k866mgrdgj55rzvdj080z80hzlj0667mydpz7gjaqdfriw8jg"; depends=[Rcpp RcppArmadillo]; };
   MetamapsDB = derive2 { name="MetamapsDB"; version="0.0.2"; sha256="0y5szb52karxcqr1f9mb050awprbk1ynckr987aw3d4ia6i9gcif"; depends=[base64enc cluster data_table DBI dplyr forcats future GenomicRanges ggplot2 gridExtra httr igraph IRanges lubridate magrittr Matrix purrr RCurl rgexf RJSONIO RSQLite shiny ShortRead stringr tidyr zoo]; };
   Metatron = derive2 { name="Metatron"; version="0.1-1"; sha256="0apz2k3za19px1bcg4ls0axaljrpxnqhs86b6s862c370sspc1x8"; depends=[lme4 Matrix mpt]; };
@@ -2130,10 +2175,11 @@ in with self; {
   MissingDataGUI = derive2 { name="MissingDataGUI"; version="0.2-5"; sha256="0drbm87ka17avg6fmswjilgnz9c3azwd0236s8yfms24k9k77vnd"; depends=[cairoDevice GGally ggplot2 gWidgetsRGtk2 reshape]; };
   MitISEM = derive2 { name="MitISEM"; version="1.2"; sha256="0dn398vrxh16gmy7ghh5000dgk7cbhb3gi3myrxp5dfri3ysjxcj"; depends=[mvtnorm]; };
   MittagLeffleR = derive2 { name="MittagLeffleR"; version="0.2.0"; sha256="1r6hamc4vanxdbmp37ib20drw49c4vxkskqb93qlagaqxgr9xch0"; depends=[stabledist]; };
+  MixAll = derive2 { name="MixAll"; version="1.4.2"; sha256="1m3jkavamx1c2zzalh9j8psk69jmbh4lyl0sxn4x30whv0km5mvp"; depends=[Rcpp rtkore]; };
   MixGHD = derive2 { name="MixGHD"; version="2.2"; sha256="1cq6mar6h56nscnd7xs6spf45mlqp48lssw2i57zfvi75f6s70p4"; depends=[Bessel cluster e1071 ghyp MASS mixture mvtnorm numDeriv]; };
   MixMAP = derive2 { name="MixMAP"; version="1.3.4"; sha256="0gxghym5ghbyxf589hda2fhv5l3x5jvm6i40x5xdwx4hadcn8k9a"; depends=[lme4]; };
   MixRF = derive2 { name="MixRF"; version="1.0"; sha256="1av1wx7wmfc3z8a4bc6g3i3b807nc28n3s2rs3yh0rcwq1pfl0ir"; depends=[doParallel foreach lme4 randomForest]; };
-  MixSIAR = derive2 { name="MixSIAR"; version="3.1.7"; sha256="0myn50sdmp83bhzm66sa61xwxv3lka427mv1ynhqshaqrb5flj35"; depends=[coda compositions ggmcmc ggplot2 lattice MASS R2jags RColorBrewer reshape reshape2 rjags]; };
+  MixSIAR = derive2 { name="MixSIAR"; version="3.1.10"; sha256="0kc0apzl6aq9qjgrnnad78k71g91hzc1d7f3j0s1kpwzax2q6l2l"; depends=[bayesplot coda ggmcmc ggplot2 lattice loo MASS MCMCpack R2jags RColorBrewer reshape reshape2 rjags]; };
   MixSim = derive2 { name="MixSim"; version="1.1-3"; sha256="1mrzbax2inpmhxz26zlybci6ks5q780f10vcy1za638dmkz16fnv"; depends=[MASS]; };
   MixedDataImpute = derive2 { name="MixedDataImpute"; version="0.1"; sha256="123c9i3znv53ikfnga1z9gq5bdl4vyww89967255wg5dzb7w00cn"; depends=[BH gdata Rcpp RcppArmadillo]; };
   MixedPoisson = derive2 { name="MixedPoisson"; version="2.0"; sha256="0g5mpzj0wda6g46q3cg5mm3x4dvpz9gdclzn2m17l62lzny2i10p"; depends=[gaussquad MASS Rmpfr]; };
@@ -2150,24 +2196,26 @@ in with self; {
   ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; };
   ModelMap = derive2 { name="ModelMap"; version="3.3.5"; sha256="1rmm1a2nw91kzvxpvq9qhlag0dhihis7mgscgslqia6z8fr86qvs"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; };
   ModelMetrics = derive2 { name="ModelMetrics"; version="1.1.0"; sha256="119xxmzb5biq7k1yxqsf0jmmarmfn6lds9x9hfgv593xlpym6za8"; depends=[Rcpp]; };
+  Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; };
   Modeler = derive2 { name="Modeler"; version="3.4.2"; sha256="0zf3z3y4w1jixmcbhkgrjh4dx7x3bfi66hrbzsxyfp7abk0p2d6l"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; };
   MomTrunc = derive2 { name="MomTrunc"; version="1.41"; sha256="0az499xzvnczqnbh4g3h5jyz8isq0zdw0x654haac6v6045f5xav"; depends=[matrixcalc mvtnorm]; };
-  Momocs = derive2 { name="Momocs"; version="1.2.2"; sha256="1a4y4zg9zd0pmhcjwvi5k1x36lyl1cw5i6bfm9qphd5bm438n70y"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS plyr reshape2 sp]; };
+  Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp]; };
   Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; };
   MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; };
   MonetDBLite = derive2 { name="MonetDBLite"; version="0.5.1"; sha256="01gcwr5r47dkmr1y2q387xv1qr2fryq9574aijx1a39ywhvcm8pq"; depends=[codetools DBI digest]; };
   MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; };
   MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; };
   MonoPoly = derive2 { name="MonoPoly"; version="0.3-9"; sha256="130hv05fwsskk1bvr7fk8bmafq26vimkfgssjdk3zaz0hm3pxrp4"; depends=[quadprog]; };
-  MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.2"; sha256="1lb5cvly7v45kn24m8pyfw036b8j7lq4my0igaj859r74ky3knw9"; depends=[abind codetools rlecuyer snow snowfall]; };
+  MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.5"; sha256="0a62wq448kq10mf1nhdr0nybzzz7d63nxakggpzmkzz4fz0l67bd"; depends=[abind codetools reshape rlecuyer snow snowfall]; };
   Morpho = derive2 { name="Morpho"; version="2.5.1"; sha256="1cxxsg7j0fq9drxkl6xlaw7j2cajzx9khcs9f3mb9l2ixd42hqnp"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; };
   MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; };
   MortCast = derive2 { name="MortCast"; version="1.1-1"; sha256="077kk08pckm07rh7vxiw8whiyc4fbsj3qihih6mg09slaq8zr825"; depends=[wpp2017]; };
   MortHump = derive2 { name="MortHump"; version="0.2"; sha256="1yhrdcwqf27v22mrysh51m3jcrnf74x21x7db25nic8q8fdmchj2"; depends=[demography HMDHFDplus Matrix minpack_lm MortalitySmooth RColorBrewer svcm WeightedCluster]; };
   MortalityLaws = derive2 { name="MortalityLaws"; version="1.3.0"; sha256="1db4p7kl3kh3kdzqbbvyj3zxv6pz0jnc9fl7j2590ajwd5m9crg4"; depends=[minpack_lm pbapply RCurl]; };
   MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; };
+  MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; };
   MotilityLab = derive2 { name="MotilityLab"; version="0.2-5"; sha256="080j548sp1c4yqqd7p7zgr70j1xyrw3fgjj1f521sgh84x5h2hbc"; depends=[ellipse]; };
-  MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-1"; sha256="1f6gd227pkcs0sa9bwng0m617pjv3b0dm6rsij06a4n2gp50aysw"; depends=[boot coda digest gsubfn lattice pander plyr texreg xtable]; };
+  MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-2"; sha256="0hy6g0fgidjpz7mn1qwwdnhyxjm0v2g9r3fl32zmkvix3852qx1r"; depends=[boot coda digest ggplot2 gsubfn lattice pander plyr texreg xtable]; };
   Mposterior = derive2 { name="Mposterior"; version="0.1.2"; sha256="16a7wvg41ld2bhbss480js5h12r41nl7jmc3y4jsbv1lr5py4ymy"; depends=[Rcpp RcppArmadillo]; };
   MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; };
   MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; };
@@ -2189,7 +2237,8 @@ in with self; {
   MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; };
   MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; };
   MultiSkew = derive2 { name="MultiSkew"; version="1.1.1"; sha256="1s0k3z1vgdz1cxad007p246ghwx282w06inhrjjscbwliz1vg5ib"; depends=[MaxSkew]; };
-  MultiVarSel = derive2 { name="MultiVarSel"; version="1.0"; sha256="0r1l7h2rm7vlvnrsq0khjdd5cb236g9xq1fb1vr15038kf0lmkij"; depends=[ggplot2 glmnet Matrix]; };
+  MultiVarMI = derive2 { name="MultiVarMI"; version="1.0"; sha256="1mlaprg3cfmfwrq7wh64fmyv1wpdnil7wpcrcg3921qydk65py6z"; depends=[BinOrdNonNor corpcor CorrToolBox Matrix moments norm PoisNonNor]; };
+  MultiVarSel = derive2 { name="MultiVarSel"; version="1.1.2"; sha256="07qdi43bg03xyr99361c0565m1i5kzqjbvlc2npnyjyc2ygr386d"; depends=[glmnet Matrix tidyverse]; };
   MultinomialCI = derive2 { name="MultinomialCI"; version="1.0"; sha256="0ryi14d102kvxawls04hcw50n79jkcn29ill77lkfvj6nlzj8i5q"; depends=[]; };
   MultipleBubbles = derive2 { name="MultipleBubbles"; version="0.1.0"; sha256="1g6yqp53dbd96jcjgmif39zb3a7f9zil10dhqi3vz3qv6r2vsnkj"; depends=[foreach MASS]; };
   MultiplierDEA = derive2 { name="MultiplierDEA"; version="0.1.17"; sha256="0s67w8ifd7g231aqq0qdia13kyb1cczhxrigsgrw48pqcfkv9208"; depends=[lpSolveAPI]; };
@@ -2211,7 +2260,7 @@ in with self; {
   NCSampling = derive2 { name="NCSampling"; version="1.0"; sha256="0bv93xffnzvbip86b3pg7apxzh3410mxff77q119m0z7f6vm3fam"; depends=[lattice randomForest yaImpute]; };
   NCmisc = derive2 { name="NCmisc"; version="1.1.5"; sha256="1dq38ac97l8b6ys3yxqnndbrp8fa8zfw0lr4nq2421sn91769w22"; depends=[proftools]; };
   NCutYX = derive2 { name="NCutYX"; version="0.1.0"; sha256="0r2ghnvrbya3p1d8rb5bsnz5v852vvc6rq65yafn2xzr7886wrg2"; depends=[fields glmnet MASS mvtnorm Rcpp RcppEigen]; };
-  NEArender = derive2 { name="NEArender"; version="1.4"; sha256="1zdqil28j6jc6317dkpz5i1qj7b4i3lin4800n1kf14zg9nxjdyg"; depends=[MASS RColorBrewer ROCR]; };
+  NEArender = derive2 { name="NEArender"; version="1.5"; sha256="006128psqxbyw3z4wqflc4xsir3d641r4flwkxmv836lp7fc2d9a"; depends=[hexbin MASS RColorBrewer ROCR]; };
   NEff = derive2 { name="NEff"; version="1.1"; sha256="16ys1fi28kbzg3am9vz1c5pc9x0ac47pl6za04h63lspk99yplzk"; depends=[bit msm]; };
   NEpiC = derive2 { name="NEpiC"; version="1.0.1"; sha256="11zf112xcsg3k93vks2fnsflw2v2d56a0bsjpd460d21k3gipfz8"; depends=[igraph PairedData]; };
   NFP = derive2 { name="NFP"; version="0.99.2"; sha256="1wnllzlww8257sbrgvfyvd21qvhf7j17mcpf6d4p6binaw8svnsb"; depends=[apcluster dplyr ggplot2 graph igraph KEGGgraph magrittr plyr stringr tidyr]; };
@@ -2224,7 +2273,7 @@ in with self; {
   NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; };
   NISTnls = derive2 { name="NISTnls"; version="0.9-13"; sha256="03a1c8a5dr5l5x4wbclnsh3vmx3dy7migfdzdx7d7p3s7hj3ibif"; depends=[]; };
   NISTunits = derive2 { name="NISTunits"; version="1.0.1"; sha256="0km9l3k9p35sb1qrhrz4ijjsdihvsp6j7cz5kh46lgf7nn6xdk7a"; depends=[]; };
-  NLMR = derive2 { name="NLMR"; version="0.2.1"; sha256="0vyha5sx0mz2kky8qwylamqc6k0gnmbkyanapy3dqav66l98ki8b"; depends=[checkmate dismo dplyr extrafont ggplot2 igraph magrittr purrr RandomFields raster rasterVis sp spatstat tibble tidyr viridis]; };
+  NLMR = derive2 { name="NLMR"; version="0.3.0"; sha256="0cqs48jy9ydivjpmx76dyxxdhh3lww7qrmx5s8jcsxxxnn93lq8m"; depends=[checkmate dplyr fasterize purrr RandomFields raster sf spatstat tibble]; };
   NLP = derive2 { name="NLP"; version="0.1-11"; sha256="15v50gxzmpqx49wzkwxfpb5xjpg9y829a0ifys372kf1cfj521aq"; depends=[]; };
   NLPutils = derive2 { name="NLPutils"; version="0.0-4"; sha256="1dqbf8xmrzx81ybmp5qkd5a5rw3c19l2wxfnpddij4a1n074bwym"; depends=[NLP qdap SnowballC]; };
   NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; };
@@ -2234,8 +2283,9 @@ in with self; {
   NMOF = derive2 { name="NMOF"; version="1.2-2"; sha256="03286pp57m7imbgw334r34yg7c5zbaw3d1qxr0sbhmc2jxvv1arm"; depends=[]; };
   NNLM = derive2 { name="NNLM"; version="0.4.1"; sha256="1wi2rbj56v49hsnhwdyyjwfk4hb84sagfq6mpjis4ccq65hxkvfv"; depends=[Rcpp RcppArmadillo RcppProgress]; };
   NNMIS = derive2 { name="NNMIS"; version="1.0.0"; sha256="02k766klw2fssiii5f4291qvs144ab9i5b6pmqvhyr87zdb87nf9"; depends=[survival]; };
-  NNS = derive2 { name="NNS"; version="0.3.8.3"; sha256="0qyb8y54hxy5ac6m0mqyqbfjc4r3m4qvb83nw2vp4mb49fiinwxx"; depends=[data_table rgl stringr]; };
+  NNS = derive2 { name="NNS"; version="0.3.8.6"; sha256="0dfnqy2i306vvqah40p3mj7yyxr9gxrgw8555p6shjiwhqp8rdaq"; depends=[data_table rgl stringr]; };
   NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; };
+  NOAAWeather = derive2 { name="NOAAWeather"; version="0.1.0"; sha256="077c7z13y2lhjzk2fbb9yfa1ay31dfryxmyg76z7l1a03h20xrvb"; depends=[dplyr ggExtra ggmap ggplot2 gridExtra jsonlite lubridate RCurl scales tcR tidyr]; };
   NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; };
   NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; };
   NORRRM = derive2 { name="NORRRM"; version="1.0.0"; sha256="06bdd5m46c8bbgmr1xkqfw72mm38pafxsvwi9p8y7znzyd0i6ag3"; depends=[ggplot2 SDMTools]; };
@@ -2255,7 +2305,7 @@ in with self; {
   NSA = derive2 { name="NSA"; version="0.0.32"; sha256="0lnimyx3fpnw9zfhqm7y3ssvbpmvbmhcqy6fp83862imiwpl8i5r"; depends=[aroma_affymetrix aroma_core DNAcopy MASS matrixStats R_methodsS3 R_oo R_utils]; };
   NSM3 = derive2 { name="NSM3"; version="1.11"; sha256="0lnmzpmh3i4lh5lfba6rhacf4zadbcrs7ify354h5245j0gxp1bv"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; };
   NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; };
-  NScluster = derive2 { name="NScluster"; version="1.1.1"; sha256="1w63abh4q0wgv3x7inl2xyp9qgr9m223r2p7nfiqnxk9y259kh04"; depends=[]; };
+  NScluster = derive2 { name="NScluster"; version="1.2.0"; sha256="04mn9lh4cl1hkz27z7ldqnfwmrvqi7m1zrvscpywdcilpjmcryv0"; depends=[]; };
   NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.1"; sha256="1grz2yxrklqglw9027c8k01jnb42p453fcd38arw4wd85y5hbam4"; depends=[snowfall]; };
   NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; };
   NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; };
@@ -2279,25 +2329,28 @@ in with self; {
   NetworkChange = derive2 { name="NetworkChange"; version="0.3"; sha256="1brpa6fhmrgafmk1iw19g0pppwxi0ld0nyhx9c0fgnkn9m82isjk"; depends=[abind ggplot2 ggvis LaplacesDemon MASS MCMCpack mvtnorm RColorBrewer Rmpfr]; };
   NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.0.1"; sha256="09fqlnpdibf9jr5mw2pzmwi66f6cjz8rmm8jay0cv2bami7jhy2a"; depends=[IsingFit IsingSampler qgraph reshape2]; };
   NetworkDistance = derive2 { name="NetworkDistance"; version="0.1.0"; sha256="0k11crn1wiisw4qrc2yidrhdvscx59skqy4ckxdiykpb1jh5a7s4"; depends=[doParallel foreach igraph Matrix network Rcpp RcppArmadillo Rdpack RSpectra]; };
+  NetworkExtinction = derive2 { name="NetworkExtinction"; version="0.1.0"; sha256="1scza639kf3zzz2yd9q31wsvxpvpq8hbx82a206jkxlxb4dq6vxr"; depends=[broom dplyr ggplot2 magrittr network scales sna tidyr]; };
   NetworkInference = derive2 { name="NetworkInference"; version="1.1.2"; sha256="0lydfkpgsi842fbapnggpngarvqc8arhy4qn13x47myk1mmkkisj"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; };
   NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; };
-  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.0.0"; sha256="1z0l8fdxvyxgajq0j6sx6mvr15sxd45kavy8ywk3hnlwcz1xy7m8"; depends=[corrplot devtools fdrtool graph hypergeo igraph MASS Matrix psych pwr qgraph R_matlab RBGL RColorBrewer]; };
+  NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.1.1"; sha256="19gn50f96nnccgv68vp6850pjdcl433lmppshc2imcjw4hn45fra"; depends=[corpcor corrplot doSNOW fdrtool foreach graph hypergeo igraph MASS Matrix ppcor psych pwr qgraph R_matlab RBGL RColorBrewer]; };
   NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.1"; sha256="1dsjv0vm45skw74x1fz3gd7g6p52ayfwz85bh92j29mfxbnacbnn"; depends=[ggplot2 nnet reshape2 scales tidyr]; };
   Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; };
-  NightDay = derive2 { name="NightDay"; version="1.0.1"; sha256="0vkpr2jwhgghiiiaiglaj1b9pz25fcsl628c9nsp9zyl67982wz1"; depends=[maps]; };
+  NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; };
   Nippon = derive2 { name="Nippon"; version="0.6.5"; sha256="187jzqsabg0vfvipbaig6nsdwclk5p3hgkvg0yid2ip8qc5qcmdw"; depends=[maptools sf sp stringr]; };
   NipponMap = derive2 { name="NipponMap"; version="0.1"; sha256="09cvzw32f0kwlwvrv7r6cx2x2jkc2wv843aip8r3iziixmcy7vxq"; depends=[sf tibble]; };
   NlcOptim = derive2 { name="NlcOptim"; version="0.5"; sha256="0chrf9ac3x1a0b86lf6wjzdsjcv5n08rav88b7xf4c31lflf1rd1"; depends=[MASS quadprog]; };
+  NlinTS = derive2 { name="NlinTS"; version="1.3.2"; sha256="1isr6ci6dsbbx804y3hc8aqvhggfs7ix5yiz32dby69i85b6lj5a"; depends=[Rcpp Rdpack timeSeries]; };
   NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; };
   NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; };
   NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; };
-  NonCompart = derive2 { name="NonCompart"; version="0.3.3"; sha256="0f66p122rdibn8k79wjhvslgankhxk4dq9sfvq0gcabmi1skfqgq"; depends=[]; };
+  NonCompart = derive2 { name="NonCompart"; version="0.4.1"; sha256="0a701lx83vf79pvym2igg2wbkhnx0jykfiglwhic4hvl1lw0f4g2"; depends=[]; };
   NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; };
-  Nonpareil = derive2 { name="Nonpareil"; version="3.3"; sha256="0bli88salj7mxmnh3b8wims1jlfzlq2lxd4kn2bp2vi58ij9v9pm"; depends=[]; };
+  Nonpareil = derive2 { name="Nonpareil"; version="3.3.1"; sha256="0ldl90h499wwm992cj71phf3ryqvjnq0ygarcxf7h85krr4j3sx2"; depends=[]; };
   NormExpression = derive2 { name="NormExpression"; version="0.1.0"; sha256="1j4q8mb70ig40acfd9kfy12vxdvq3qpf53rxh47kkw8mywnd0449"; depends=[]; };
+  NormPsy = derive2 { name="NormPsy"; version="1.0.7"; sha256="1v6jlbxiapkygivx5vv4ravs86n94qxlmj4q940jjfbbk24bssdc"; depends=[lcmm]; };
   NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; };
   NormalLaplace = derive2 { name="NormalLaplace"; version="0.2-0"; sha256="11z568zhb7jw9ghp6wlyf26ijm25crc5pqhzw71qgvva42nsmmwn"; depends=[DistributionUtils GeneralizedHyperbolic]; };
-  NormalizeMets = derive2 { name="NormalizeMets"; version="0.24"; sha256="0n75swaybsggrawplkncb1vnnyy2imz1b4wy74crdgfg02bzzz2r"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; };
+  NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; };
   NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; };
   Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; };
   Numero = derive2 { name="Numero"; version="1.0.3"; sha256="1jj269b5cw7w4bgp6qvh0b3kpj32fjpsb2nbhyhjlkf7m03gnwwv"; depends=[Rcpp]; };
@@ -2318,7 +2371,7 @@ in with self; {
   OOBCurve = derive2 { name="OOBCurve"; version="0.2"; sha256="1dr2mp2wi2dir1h5w3rw17154byfy3gx02x2kz1r67l9dfgrr505"; depends=[mlr randomForest ranger]; };
   OOR = derive2 { name="OOR"; version="0.1.2"; sha256="1zw7g0365znyn828qqsn83l2a837wwj9cx7dzcbns28vhqmsn6hm"; depends=[]; };
   OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; };
-  OPDOE = derive2 { name="OPDOE"; version="1.0-9"; sha256="0pf8rv5wydc8pl4x57g7bk2swjabaxdgijgsigjy5wihfcb48654"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
+  OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; };
   OPI = derive2 { name="OPI"; version="2.7"; sha256="0mmk8alpwm4vmq2yr4qkri2zkh4lxfvrp70j0zljinxcynaraqzn"; depends=[]; };
   ORCI = derive2 { name="ORCI"; version="1.1"; sha256="0xy5lvz2scz06fphjyhqbdhp4bizmv87a8xykp9dbgx8b4ssnqgz"; depends=[BiasedUrn BlakerCI PropCIs]; };
   ORCME = derive2 { name="ORCME"; version="2.0.2"; sha256="1pm8ajj24qqj2fir0gjzq5f4mfpl1cnj6fm2z5qg6g3sbnm57ayk"; depends=[Iso]; };
@@ -2332,7 +2385,7 @@ in with self; {
   OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; };
   OTUtable = derive2 { name="OTUtable"; version="1.1.1"; sha256="0mjjfndc67gzkqskcq4sxpr8fwx3lm3wjgapgg64rbj5x4i1w4rp"; depends=[]; };
   OUwie = derive2 { name="OUwie"; version="1.50"; sha256="1gzgwax9kmcr6rl6nv10xn536nbkjhmg6sqax58xxinc00ykdx75"; depends=[ape corHMM corpcor expm lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; };
-  Oarray = derive2 { name="Oarray"; version="1.4-5"; sha256="1w66vqxvqyrp2h6acnbg3xy7cp6j2dgvzmqqk564kvivbn40vyy4"; depends=[]; };
+  Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; };
   OasisR = derive2 { name="OasisR"; version="3.0.0"; sha256="0dk8asv5v0qiqqf45r3hhh67sa03qdkpgsss649mp2pxzm8chv1y"; depends=[measurements outliers rgdal rgeos seg spdep]; };
   OceanView = derive2 { name="OceanView"; version="1.0.4"; sha256="072gjbka7ncp5sa463kbi06fjx7nm1ljgzpx4b7ybq9pcwvnyzz6"; depends=[plot3D plot3Drgl rgl shape]; };
   Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; };
@@ -2352,7 +2405,7 @@ in with self; {
   OpenImageR = derive2 { name="OpenImageR"; version="1.0.8"; sha256="1j7p1wrzznrisbzw8j1qsxyyv3zr5hk6q9yxw97y6lrfh3c26ig1"; depends=[jpeg png Rcpp RcppArmadillo shiny tiff]; };
   OpenML = derive2 { name="OpenML"; version="1.8"; sha256="04m2gi35hykqs4iy3ipvi41cmkv8vg145cpafjrsf98kj7jg4pmv"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise mlr ParamHelpers stringi XML]; };
   OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; };
-  OpenMx = derive2 { name="OpenMx"; version="2.8.3"; sha256="0kz1x3x43jf326x7l8lb7rlnng4r5cp11vrs1pnnxkmbhqzbbwy8"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
+  OpenMx = derive2 { name="OpenMx"; version="2.9.6"; sha256="0141q6rwppwab426fn65vcnj06nivibl11aqi8dp32rcxgi5s9y8"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; };
   OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.10"; sha256="0ikw8l9hffcaa094y6pnvyc3ly5jb02djaakz668ba15a0yw0wmb"; depends=[abind colorspace GPArotation plyr psych pvclust rgl stringr XML]; };
   OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.3"; sha256="099vdyq0vw9xl5v7zggdb8yd4zl7x8imvvbj5j2f5hrspgg131pz"; depends=[ggplot2 raster rgdal rJava sp]; };
   Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; };
@@ -2360,7 +2413,7 @@ in with self; {
   OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; };
   OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; };
   OptSig = derive2 { name="OptSig"; version="1.0"; sha256="1jmnxwci4rzlwgnq4zxhkii9j7ch1bymx44hk3qv7ws24k7g87nn"; depends=[pwr]; };
-  OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.2"; sha256="0yf3wk0y650cyp5x8jvjr4ncq34phka8z0r9zk9cjn1k0ic2zmjc"; depends=[car clisymbols crayon dplyr e1071 lme4 MASS nnet nortest rpart]; };
+  OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.4"; sha256="0f1szin0isji60gvb0zi240gri6fc4y1s71n96dn5wacdx5b8mhb"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; };
   OptimaRegion = derive2 { name="OptimaRegion"; version="0.2"; sha256="0xhl7jp2429007jzx305ggfwyx0vh2vxw7l2a7f3c0prklhyqpqc"; depends=[boot DepthProc fields nloptr rsm spam]; };
   OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-3"; sha256="1vrbx62080r9sgk9ipjvdrqvikp4gwidp5gi5j92hspk7cp10amg"; depends=[]; };
   OptimalDesign = derive2 { name="OptimalDesign"; version="0.2"; sha256="1gpcasdbcgqqr1l6f63q4jqva28rpz0cbgs1f4l3bizldd9kf4kh"; depends=[]; };
@@ -2413,10 +2466,10 @@ in with self; {
   PCDimension = derive2 { name="PCDimension"; version="1.1.8"; sha256="1359cmswynv9xqbfb60kh32ifm9wgm20iplkdfzf5v2c4vxd0rmf"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; };
   PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; };
   PCGSE = derive2 { name="PCGSE"; version="0.4"; sha256="0ky1nzhz6v9n34kas9nw2scc6ip7av19g09zcsxaa9436nhip4f6"; depends=[MASS RMTstat safe]; };
-  PCICt = derive2 { name="PCICt"; version="0.5-4"; sha256="1g17hxs00dlnb6p0av6l7j99qy00555f80nk1i1i1x87fszp3axa"; depends=[]; };
+  PCICt = derive2 { name="PCICt"; version="0.5-4.1"; sha256="17ipmv6ps7c9dv4k9kxjjynnlgr63baz9z9ndwfg0lckc3vw81ya"; depends=[]; };
   PCIT = derive2 { name="PCIT"; version="1.5-3"; sha256="0gi28i2qd09pkaja4w7abcl7sz43jnk98897vc2905fnk9nks65j"; depends=[]; };
   PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; };
-  PCPS = derive2 { name="PCPS"; version="1.0.3"; sha256="1ys3xp1nripy5zkq25byak9k6yf5rdbfnww8j13yc469428ip8q0"; depends=[ape phylobase picante SYNCSA vegan]; };
+  PCPS = derive2 { name="PCPS"; version="1.0.5"; sha256="1v5173zskkyc79b68a3x0b1harq5xp4igisf94ajgqqmkpf61qcp"; depends=[ape phylobase picante RcppArmadillo SYNCSA vegan]; };
   PCRedux = derive2 { name="PCRedux"; version="0.2.5-1"; sha256="1p5qmz09ajbm1iypyz5rn9bwzbbx57gc6a0xzrm900dw2r2cf7ph"; depends=[bcp changepoint chipPCR ecp fda_usc FFTrees magrittr MBmca pbapply plotly pracma qpcR robustbase testthat visdat zoo]; };
   PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; };
   PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; };
@@ -2433,10 +2486,11 @@ in with self; {
   PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; };
   PGRdup = derive2 { name="PGRdup"; version="0.2.3.3"; sha256="1s0v44922zpxl3w9kzn9xzvs5jldg35gjrnlf89f89i3rs59gg98"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; };
   PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; };
-  PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.8"; sha256="17lmjfbwf8j68zzzhdvppyjacdsmy4zmcfj0pcjsw5j6m361hvh6"; depends=[]; };
+  PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; };
   PHeval = derive2 { name="PHeval"; version="0.5.3"; sha256="1zq4ks6w5vrhy1f170fv16zgrgi1lfxmkpfkg75sjin7asw4i7a9"; depends=[survival]; };
   PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; };
   PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; };
+  PINSPlus = derive2 { name="PINSPlus"; version="1.0.0"; sha256="1vyn6hz4b0gzpvs6m0lbs09vv8531z74vkm2ss1244gn991p7iif"; depends=[cluster doParallel entropy foreach pbmcapply]; };
   PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; };
   PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; };
   PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; };
@@ -2454,14 +2508,15 @@ in with self; {
   PMA = derive2 { name="PMA"; version="1.0.9"; sha256="11qwgw4sgzl3xhrm468bsza83h3mfn89157nfwnrassl7qr42xkq"; depends=[impute plyr]; };
   PMCMR = derive2 { name="PMCMR"; version="4.2"; sha256="1dqfn68034xkik4xfl8mlqsh7x427f7cwna5axj8gvjcj9l48x8c"; depends=[]; };
   PMCMRplus = derive2 { name="PMCMRplus"; version="1.0.0"; sha256="11sliznixsrrlr0y365hxpg64jfva8l1ilrnkdd32ddy8713sin7"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; };
-  PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.0"; sha256="1lr7ycsjp9dimkbxfapl1qpvlvl0771rdipaf26sgi7iabqpz5b4"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; };
+  PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.4.1.1"; sha256="038xylgq3mp1nl5rf11swprv08khvzfw0jg5bmd0yvqmygr082jq"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; };
   POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; };
   POMaSPU = derive2 { name="POMaSPU"; version="1.0.0"; sha256="0jz3jgzdykv0xvfw3ix0hbs32as6dp7p5v8bj5nddknx10d0siya"; depends=[MASS matrixStats Rcpp RcppArmadillo]; };
   POPdemog = derive2 { name="POPdemog"; version="1.0.3"; sha256="0j83c853ligmw8ag4pb0vj46sfn2w2ynh4wvgkabzs688hxxni8r"; depends=[]; };
   POT = derive2 { name="POT"; version="1.1-6"; sha256="08av53rnishk3mhwrb6ydbgc3n9nwi87jlx5vmag3vpiidhn1laj"; depends=[]; };
   PP = derive2 { name="PP"; version="0.6.1"; sha256="10innn1nhc4zqimd0gww7k3k30jkfkkj89zkddcjqa2sqq5gs3xr"; depends=[Rcpp]; };
   PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; };
-  PPCI = derive2 { name="PPCI"; version="0.1.1"; sha256="1f3jmrkszjq6ajbl0kjf5rghiliim96wz53mfrjjvpc6piajs5ym"; depends=[rARPACK]; };
+  PPCI = derive2 { name="PPCI"; version="0.1.2"; sha256="1k6kbln0h1wkzg594k1db6r3nk5dqwhg8gm1hgval05dsdhp8j8b"; depends=[rARPACK]; };
+  PPRL = derive2 { name="PPRL"; version="0.3.5"; sha256="1j8qfa6ipk9x6w7g5y0lz14cf72s2zpkrp5gk2qbvx1pm3w1zyh6"; depends=[Rcpp settings]; };
   PPforest = derive2 { name="PPforest"; version="0.1.0"; sha256="1s0g8icyx30sih2xbdihp9xbmygfgd1hs642qdl5559fqshylbzs"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; };
   PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; };
   PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.3"; sha256="1x5rcls49jz19y3h98n2k4kypm8mv8p586clhdj62bvp2nl8wg3x"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; };
@@ -2475,9 +2530,8 @@ in with self; {
   PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; };
   PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; };
   PRROC = derive2 { name="PRROC"; version="1.3"; sha256="03hvh92lq4i4w4mla9bvwrwb4626f4hvlxgdn57hamp70960vjyc"; depends=[]; };
-  PReMiuM = derive2 { name="PReMiuM"; version="3.1.6"; sha256="14y3c5l050szdm2zh88byzawrfc224j4dr4msc5a5vh10bsa1wd9"; depends=[ald BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
+  PReMiuM = derive2 { name="PReMiuM"; version="3.1.7"; sha256="1l2ibwn5z647dwhrjzgrz3qqzdbkqk3zrpn95hy4ysa32pdz300n"; depends=[ald BH cluster gamlss_dist ggplot2 plotrix Rcpp RcppEigen]; };
   PResiduals = derive2 { name="PResiduals"; version="0.2-5"; sha256="05jk543lv8isbxv24cbzqh80l6xs05lx2k9xzz7s0121vb2yd3v4"; depends=[Formula MASS rms SparseM]; };
-  PSAboot = derive2 { name="PSAboot"; version="1.1.4"; sha256="1zfqpq0ibgazwppbxbmqvkvh9j5421xmj9132zghxki0xdy655ss"; depends=[ggplot2 ggthemes Matching MatchIt modeltools party PSAgraphics psych reshape2 rpart TriMatch]; };
   PSAgraphics = derive2 { name="PSAgraphics"; version="2.1.1"; sha256="05c0k94dxddyrhsnhnd4jcv6fxbbv9vdkss2hvlf3m3xc6jbwvh9"; depends=[rpart]; };
   PSCBS = derive2 { name="PSCBS"; version="0.63.0"; sha256="0pgha1rvb9nfxkr8fxc17zgws781qwmrl01rss7bd0sf2n2lw2k2"; depends=[aroma_light DNAcopy future listenv matrixStats R_cache R_methodsS3 R_oo R_utils]; };
   PSF = derive2 { name="PSF"; version="0.4"; sha256="1hjry8vjqr6zk2i2ppf3fcpsr4v4jm1705qv6i1iz2agl6g2rcnp"; depends=[cluster data_table forecast knitr]; };
@@ -2491,10 +2545,10 @@ in with self; {
   PTAk = derive2 { name="PTAk"; version="1.2-12"; sha256="1phxh2qbzsj2ia2dr6z30lhi765lk1m8lbk57sdgvm14fmi9v5nk"; depends=[tensor]; };
   PTE = derive2 { name="PTE"; version="1.6"; sha256="0y2zqvm2d9minpc22ndq6mar3brbv9k6s1apl19zwpc8h5g3jx5l"; depends=[doParallel foreach survival]; };
   PTXQC = derive2 { name="PTXQC"; version="0.92.3"; sha256="1spkbjji36s2dlhm5b8svpnjmana2jy1ppa0pfgjg7rpsp3369xq"; depends=[data_table ggdendro ggplot2 gridExtra gtable kableExtra knitr plyr proto RColorBrewer reshape2 rmarkdown seqinr yaml]; };
-  PUlasso = derive2 { name="PUlasso"; version="2.2"; sha256="0chk26ll134fqvaqdwdnm49vbvklbrxm0j0qkcydm166p24k8n2z"; depends=[BH Matrix Rcpp RcppEigen]; };
+  PUlasso = derive2 { name="PUlasso"; version="3.1"; sha256="0cnnv9laga24h01aqkk7kzmmv2x5cgcq5l45w8vj5pvfyhvm4067"; depends=[BH doParallel foreach Matrix Rcpp RcppEigen]; };
   PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; };
   PWD = derive2 { name="PWD"; version="1.0"; sha256="0ksr3biaqd4p5a4lv28i4cwk1fn9822ndq2161mgvc1c344p06fj"; depends=[Rcpp RcppArmadillo]; };
-  PWEALL = derive2 { name="PWEALL"; version="1.2.0"; sha256="0h7azgns88qwgdp41v35v6293xqs2hksbr82p15n754ci2hsvzja"; depends=[survival]; };
+  PWEALL = derive2 { name="PWEALL"; version="1.2.1"; sha256="08a7ih9yyp0dqw89n1qhwbxhgiks91c3wjbaz08b6ck6cv6gzy6k"; depends=[survival]; };
   PWFSLSmoke = derive2 { name="PWFSLSmoke"; version="1.0.16"; sha256="015zqbq9wsg0wc1y5s4x8vc7klkfa928xcl23v732vy28j0jf20h"; depends=[cluster dplyr dygraphs futile_logger ggmap httr jsonlite leaflet lubridate magrittr mapproj maps maptools MazamaSpatialUtils openair png raster RColorBrewer readr reshape2 rgdal RgoogleMaps sp stringr xts zoo]; };
   PabonLasso = derive2 { name="PabonLasso"; version="1.0"; sha256="158xg9i13nqy1bnpch8r6a7yas01hsdidmcypgccmyh7d7l52mr1"; depends=[]; };
   Pade = derive2 { name="Pade"; version="0.1-4"; sha256="1kx5qpxd3x43bmyhk8g2af44hz3prhnrzrm571kfjmak63kym741"; depends=[]; };
@@ -2534,7 +2588,7 @@ in with self; {
   PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; };
   PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; };
   PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; };
-  Peptides = derive2 { name="Peptides"; version="2.2"; sha256="0fdc8xd0c6x1m1r3bj9098m6g5ay15ig53z0wib2lvxlcnh2xpjs"; depends=[Rcpp]; };
+  Peptides = derive2 { name="Peptides"; version="2.3"; sha256="17nbjh06vi4syb0hlg7y646xik4csp3fs6r6z0c676k5sxs33mrd"; depends=[Rcpp]; };
   PerFit = derive2 { name="PerFit"; version="1.4.1"; sha256="0mzd9yrgsswxlhljlk8nxi0dhy3k4a9jax9w9c9s29j4m7z9jf01"; depends=[fda Hmisc irtoys ltm MASS Matrix mirt]; };
   PerMallows = derive2 { name="PerMallows"; version="1.13"; sha256="0ny2vc8f0npixaw1kp2d93xr4g46nsg8jjwvi6afv9xjvaz0i6wy"; depends=[Rcpp]; };
   Perc = derive2 { name="Perc"; version="0.1.2"; sha256="0p6l4b536jjz4lmgsdrxqsh77lx4vkb6hbyd6vhbc102m5x3b1yc"; depends=[]; };
@@ -2545,7 +2599,7 @@ in with self; {
   PersomicsArray = derive2 { name="PersomicsArray"; version="1.0"; sha256="1d5gxd65b01m13rgbdhk6w3l43vqcbdk0s1pbgc8h6cnipj55z0i"; depends=[jpeg raster stringr tiff]; };
   PhViD = derive2 { name="PhViD"; version="1.0.8"; sha256="038pw24sb8ja8pbbmj05rww6413i2ljybb2dxwgrpffv22aqawmc"; depends=[LBE MCMCpack]; };
   PharmPow = derive2 { name="PharmPow"; version="1.0"; sha256="0gabkd8p4zsig9p697lyk8m2jxb5abjk81rpzd5ih1yk1qanhsn5"; depends=[scatterplot3d]; };
-  Phase123 = derive2 { name="Phase123"; version="1.4"; sha256="1iw0xgfsvfzrhcnfxvq6rcwfcycyvc2bbg8d7g2spvvjk7aa4bwd"; depends=[Rcpp RcppArmadillo survival]; };
+  Phase123 = derive2 { name="Phase123"; version="1.5"; sha256="05yvzx0sf6dq47nr5bk1kd2icndf20z39y9fj90zqdm3ay2hi586"; depends=[Rcpp RcppArmadillo survival]; };
   PhaseType = derive2 { name="PhaseType"; version="0.1.3"; sha256="092dqyqfaxj8qpwxcjb5cayhnq597rfjz1xb93ps4nrczycqs0l6"; depends=[coda ggplot2 reshape]; };
   PhenotypeSimulator = derive2 { name="PhenotypeSimulator"; version="0.2.0"; sha256="1vnissx2p10w2w435vr2jqw50cs5518l1gpq4pkyyxckcrd300w9"; depends=[data_table dplyr ggplot2 mvtnorm optparse R_utils Rcpp reshape2 snpStats zoo]; };
   Phxnlme = derive2 { name="Phxnlme"; version="1.0.0"; sha256="0h9mi8p95rp1s8xsdv38j9fpy2cy9zvjnldjmnj0n469kimp2782"; depends=[ggplot2 gridExtra lattice manipulate testthat]; };
@@ -2555,10 +2609,10 @@ in with self; {
   PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.1.0"; sha256="0ji78zx0gp1nd5assrmwxdkxryfjijnn9g34w2g2qv32s1fdj6ak"; depends=[ape capushe foreach glmnet grplasso LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; };
   PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; };
   PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.1-1"; sha256="1aqyip7psf3pdrxkpidfldkk9naihvnc7s3n6w6vvr9h1l5mpmvc"; depends=[]; };
-  PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.1"; sha256="0agy9jp5vbh6cj5mipbmn11m69w4ydz91nprph0jyf1drl92730h"; depends=[Rcpp RcppArmadillo]; };
+  PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.2"; sha256="04l1id872mlgpid746l8dz2wdcjxh79cqw835gsph6ngxg0g8qp6"; depends=[Rcpp RcppArmadillo]; };
   Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; };
   PivotalR = derive2 { name="PivotalR"; version="0.1.18.3"; sha256="14l7y57zmfr7h4bq01j83am2plxx320kkhbsh0x2ypif9dni4rf2"; depends=[Matrix]; };
-  PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-2"; sha256="0lzgffw5kbx9psd68r7yigqv8dszjb2xkayxm3rhfs8jv9309yr0"; depends=[igraph MASS Matrix partykit psychotools qvcalc rARPACK sandwich]; };
+  PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-3"; sha256="1w2ihclnh3x83ip4hh95bchv5j832cqy6n140q5q1dbfz6fy1bxv"; depends=[igraph MASS Matrix partykit psychotools psychotree qvcalc rARPACK sandwich]; };
   Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; };
   PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.6.10"; sha256="1dqc6k7mq9k6g9gndgjm6cf61mgl0liy4qwpzragbhq6lym8hw6w"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; };
   Plasmidprofiler = derive2 { name="Plasmidprofiler"; version="0.1.6"; sha256="10m3knmz0596rm30ncyfprar6l42bjm7r34n4pjz1biqmiz6yz6k"; depends=[ape dplyr gdata ggdendro ggplot2 gridExtra gtable htmlwidgets magrittr plotly plyr RColorBrewer reshape2 stringr]; };
@@ -2579,7 +2633,7 @@ in with self; {
   PoloniexR = derive2 { name="PoloniexR"; version="0.0.1"; sha256="1qik272z5lmzv9k1kfr5v0m8sydbdhbrc732n1zpwnqc1spfqb20"; depends=[anytime digest httr jsonlite RApiDatetime xts zoo]; };
   PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; };
   PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; };
-  Polychrome = derive2 { name="Polychrome"; version="1.0.0"; sha256="09yxrwh7a5hgq52jv2d0b0jvwbgm1f1dg6w4vziwdx5cwyny9psl"; depends=[colorspace rgl]; };
+  Polychrome = derive2 { name="Polychrome"; version="1.1.0"; sha256="1a0ifbvkw85sxwc8zjj8hy88avmqyjsfxk2cd16qsp0p9wfn872y"; depends=[colorspace scatterplot3d]; };
   PolynomF = derive2 { name="PolynomF"; version="1.0-1"; sha256="0sr5v43hp1ydy2230vm3mrg4pnnv7nivhnp3zni9svc8g0bd8z8p"; depends=[]; };
   Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; };
   PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; };
@@ -2595,21 +2649,20 @@ in with self; {
   PortfolioOptim = derive2 { name="PortfolioOptim"; version="1.0.3"; sha256="1s9msqjxqxqafhncc3hi5prhzl5cj0incd5rc9fxc23l5l4n9xjx"; depends=[Rglpk]; };
   PottsUtils = derive2 { name="PottsUtils"; version="0.3-3"; sha256="165k4sjh3kqkb8bzi68wx00yl77yfbgs70fcbpzmsmcw4g4hdpzn"; depends=[miscF]; };
   PoweR = derive2 { name="PoweR"; version="1.0.6"; sha256="0p2v07wp1hqmmbf7b3mh0v4n5hbbcms9xkdhjzdfxkkbafxybc24"; depends=[Rcpp RcppArmadillo]; };
-  Power2Stage = derive2 { name="Power2Stage"; version="0.4-6"; sha256="1fzzvv3c7z9fb63l0wz9i0vd413mfn1dzw19kw7rnldv773lwir1"; depends=[mvtnorm PowerTOST]; };
+  Power2Stage = derive2 { name="Power2Stage"; version="0.5-1"; sha256="155w5yp0pdq4g3638m0c54i81lfk0g0f339hzbxpkxhs8ds7g2zv"; depends=[cubature mvtnorm PowerTOST]; };
   PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; };
-  PowerTOST = derive2 { name="PowerTOST"; version="1.4-6"; sha256="0fy9g1zkkxx45pz7axyhv9v9yajfwi19pxcr2bc9dih3j41kazjr"; depends=[cubature mvtnorm TeachingDemos]; };
+  PowerTOST = derive2 { name="PowerTOST"; version="1.4-7"; sha256="02k6jn5dw70518g55bchax0l5gkci827lqwwyxwnn6rzs3mx4ybs"; depends=[cubature mvtnorm TeachingDemos]; };
   PowerUpR = derive2 { name="PowerUpR"; version="0.2.3"; sha256="046p4mrw50k1a0m672i2zx5vxfpyggiazp95qz8kx6bnq472ixp2"; depends=[]; };
   PracTools = derive2 { name="PracTools"; version="0.8"; sha256="0hmdsm1ya6fw0f2fv4b85bkr35vlqmjf1sd9jmw1d4izpifv187h"; depends=[]; };
   PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; };
   PreProcess = derive2 { name="PreProcess"; version="3.1.4"; sha256="0zvy7wx9wfsdcvnjdr1angh0shqwhlm48byc0ymciqlx6xagaw0b"; depends=[oompaBase]; };
-  PreciseSums = derive2 { name="PreciseSums"; version="0.1"; sha256="14d42n1wby1srrjyi0yc565g2ldmxy3r3z5bf7ki2x6snj569n0g"; depends=[]; };
+  PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; };
   PredPsych = derive2 { name="PredPsych"; version="0.3"; sha256="0bqc2vl32z9wzby7ncrab742cajy4w5kq7wv2gh2jjqdnv9nkia7"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; };
   PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; };
-  PredictTestbench = derive2 { name="PredictTestbench"; version="1.1.3"; sha256="14np4zvr0labhqxzsv07iqzldfxmnsfk91qpfqz7vyiq0vwcymp4"; depends=[forecast ggplot2 imputeTestbench PSF reshape2]; };
   PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; };
   PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; };
   PrevMap = derive2 { name="PrevMap"; version="1.4.1"; sha256="1hmvfk5zpflwncaiy2rr0jr2gr2gk66na6ks82b6dfgk8xdc8xmk"; depends=[geoR Matrix maxLik numDeriv pdist raster splancs truncnorm]; };
-  PrivateLR = derive2 { name="PrivateLR"; version="1.2-21"; sha256="1jwq8f0dnngj8sfbmcmxy34nkkq6yjw0mq3w1f8rasz67v3bwzp3"; depends=[]; };
+  PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; };
   ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; };
   ProFit = derive2 { name="ProFit"; version="1.1.1"; sha256="0krnxdf9dddry4a5k1dag43va7lii1ykk0857kk1dfnl56sm3l51"; depends=[celestial fftw FITSio LaplacesDemon magicaxis R2Cuba RColorBrewer Rcpp]; };
   ProFound = derive2 { name="ProFound"; version="1.0.1"; sha256="0ym8ggzm0b8zpfsq8xjjnwa09826gssaqhrqjyq88pwbhzh0y4pl"; depends=[celestial data_table FITSio magicaxis]; };
@@ -2636,11 +2689,11 @@ in with self; {
   PtProcess = derive2 { name="PtProcess"; version="3.3-13"; sha256="0vk1n7hk6v592fi5ld70db6m92zgpjx97axs5h8p53c29984qhwz"; depends=[]; };
   PubBias = derive2 { name="PubBias"; version="1.0"; sha256="0dr5dhfx57knrs05pbx9ngg4k2937n8gjzsgd0jfqd8dfxhy051k"; depends=[R_utils rmeta]; };
   PubMedWordcloud = derive2 { name="PubMedWordcloud"; version="0.3.5"; sha256="0vpd48daamd9q3mdr59sx7zj86qcq2yx8bnrzblyx0ryqx6jnq8m"; depends=[RColorBrewer RCurl stringr tm wordcloud XML]; };
-  Publish = derive2 { name="Publish"; version="2017.10.24"; sha256="14zbbchff4mjvsxs9c2bypqdsfbnnl6lvr0k5v50wkd00avnv9s7"; depends=[data_table lava multcomp prodlim survival]; };
+  Publish = derive2 { name="Publish"; version="2018.04.17"; sha256="0dbcql2mi2qsxzcgcqa58yqynfq1800fa06ikyay2dm6gdyf0apq"; depends=[data_table lava multcomp prodlim survival]; };
   PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; };
-  PwrGSD = derive2 { name="PwrGSD"; version="2.2"; sha256="0z42l7vb3yya59g9rymypfzjbbs5zkknwgcl710rqa64l421sp8z"; depends=[survival]; };
+  PwrGSD = derive2 { name="PwrGSD"; version="2.3"; sha256="1iisib4bnb3fp0nwxnal13fgd0fs1vckchr4cj716k72jh6k7slm"; depends=[survival]; };
   PythonInR = derive2 { name="PythonInR"; version="0.1-4"; sha256="0krr5k0y9rggzq8f74nc6pyf47g8va1lvva31vc774hbb0rmr7gf"; depends=[pack R6]; };
-  QCA = derive2 { name="QCA"; version="3.1"; sha256="1nfwfv19rjqba28kmz9yk78zaq9jiiap8yhr0qcpf41q7381sn7q"; depends=[fastdigest shiny venn]; };
+  QCA = derive2 { name="QCA"; version="3.2"; sha256="1bjsc24b3g7xdb1fi3f4y1297g185gasl3xsgqxibck2zjlagl11"; depends=[fastdigest shiny venn]; };
   QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; };
   QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; };
   QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; };
@@ -2659,26 +2712,26 @@ in with self; {
   QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; };
   QRM = derive2 { name="QRM"; version="0.4-13"; sha256="0zxhm1bdbs4jizd909vw9yjdn484vmcrwcmpk3a7gr4142q9kdjh"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; };
   QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; };
-  QRegVCM = derive2 { name="QRegVCM"; version="1.1"; sha256="01dhc0r1nialwv7dp2108znyc3ip1hswkcbpf3kmabxxj5y4vyvx"; depends=[quantreg SparseM truncSP]; };
+  QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; };
   QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; };
   QTLRel = derive2 { name="QTLRel"; version="1.0"; sha256="0hlnh04w45imf0f7rm9pg1whlps5zxh00qvvn81hip16bv48cw79"; depends=[gdata lattice]; };
   QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; };
   QVM = derive2 { name="QVM"; version="0.1.1"; sha256="0dnr4h4084n505vrxfrx3czrkqdbna8s4fxpwr5czfilbfbxhpar"; depends=[gWidgets IMPACT ltm multilevel mvtnorm nlme pander psych]; };
   QZ = derive2 { name="QZ"; version="0.1-6"; sha256="1vgqwv3rbnmz2sgbmbivgnxcwy5dzgk6ivqskdnqkil4f10zflmi"; depends=[Matrix]; };
   QoLR = derive2 { name="QoLR"; version="1.0.3"; sha256="1z3wicybqsyczgjjd84g95bjxw80l5y8b68ayp300bm5jd4f2pha"; depends=[survival zoo]; };
-  Qtools = derive2 { name="Qtools"; version="1.2"; sha256="0432ip73aldblq3yyig8d47a56j12fs30fpz8sxvfj186ssawych"; depends=[boot MASS mice quantreg]; };
+  Qtools = derive2 { name="Qtools"; version="1.3"; sha256="1vbjydacgczjlsf8b8id25n3k0cq74i43nsvax22k8hbvj4g0b94"; depends=[boot MASS mice quantreg]; };
   QuACN = derive2 { name="QuACN"; version="1.8.0"; sha256="1597blp8gqc5djvbgpfzi8wamvy0x50wh5amxj9cy99qa0jlglxi"; depends=[combinat graph igraph RBGL]; };
   QualInt = derive2 { name="QualInt"; version="1.0.0"; sha256="1ms96m3nz54848gm9kdcydnk5kn2i8p1rgl2dwn7cqcqblfvsr4j"; depends=[ggplot2 survival]; };
   Quandl = derive2 { name="Quandl"; version="2.8.0"; sha256="0n1c4343ki8nia7qrq2m9zb7b05qr3yjwvk1ji7m44sa613w6y5l"; depends=[httr jsonlite xts zoo]; };
   QuantNorm = derive2 { name="QuantNorm"; version="1.0.3"; sha256="1kc8qfa5fwdmk4nfzlkd22968zn44ggr65ysm1l31bhbgjh59ly3"; depends=[]; };
   QuantPsyc = derive2 { name="QuantPsyc"; version="1.5"; sha256="1i9bh88r8zxndzjqsj14qw64gnvm5a9kvhjhzk3qsrvl3qzjgh93"; depends=[boot MASS]; };
-  QuantTools = derive2 { name="QuantTools"; version="0.5.6"; sha256="0ykfxrg4chq4n24spfj2v6cqiw5y7wps2rmnd0150fa6fqk7nd2k"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; };
+  QuantTools = derive2 { name="QuantTools"; version="0.5.7"; sha256="069rvh4yfar5dh6aj6p0q61gasvs9wr72x9pnj00lvyjlnv06p5n"; depends=[data_table fasttime R6 Rcpp RCurl readxl]; };
   QuantifQuantile = derive2 { name="QuantifQuantile"; version="2.2"; sha256="01bdz8a6nhjil6n2z62x5g41v3d6md5v16g0ladsl5zc8raivqdq"; depends=[rgl]; };
   QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; };
   QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; };
   R_cache = derive2 { name="R.cache"; version="0.13.0"; sha256="1hf5cb7xvnca5zlh9245b5g62sgsaxwdhiv7x59yld37cydakm6k"; depends=[digest R_methodsS3 R_oo R_utils]; };
   R_devices = derive2 { name="R.devices"; version="2.15.1"; sha256="09gmzb87n1ybqwyp4jdpih3w3s7nqkr4hd1qhcqr57kp2pj9jp9x"; depends=[base64enc R_methodsS3 R_oo R_utils]; };
-  R_filesets = derive2 { name="R.filesets"; version="2.12.0"; sha256="16djdiwl4rpyhc75q2dpyfpzf2gwqkg9rbk99fbx69my1if0vs7w"; depends=[digest future_apply R_cache R_methodsS3 R_oo R_utils]; };
+  R_filesets = derive2 { name="R.filesets"; version="2.12.1"; sha256="0grd3wk5xh7jgp10m78knj0snqyxqv7yir6wvz2wq5rabvcn9mab"; depends=[digest future_apply R_cache R_methodsS3 R_oo R_utils]; };
   R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; };
   R_matlab = derive2 { name="R.matlab"; version="3.6.1"; sha256="013qi3iikikgib23cqg74vpp2ymsbw1zd6zny7m1km2js6gmfchh"; depends=[R_methodsS3 R_oo R_utils]; };
   R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; };
@@ -2696,13 +2749,13 @@ in with self; {
   R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; };
   R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-5"; sha256="09p8xrxhcf6biy1mffv31p2hlr19s51f3n67az52f3xv5lyp9wm8"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc rbugs texreg]; };
   R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; };
-  R2STATS = derive2 { name="R2STATS"; version="0.68-38"; sha256="1v8mvkvs4fjch0dpjidr51jk6ynnw82zhhylyccyrad9f775j2if"; depends=[cairoDevice gWidgets gWidgetsRGtk2 lattice latticeExtra lme4 MASS Matrix proto RGtk2Extras statmod]; };
   R2SWF = derive2 { name="R2SWF"; version="0.9-2"; sha256="1f7bj2jqm7ys3rimgpsn252j39mw0xd008p3zqi77x1flisla0z3"; depends=[sysfonts]; };
   R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; };
   R2admb = derive2 { name="R2admb"; version="0.7.16"; sha256="0s8p82avxdp5zmkz7amvnphn3lcyhha31mbjghibnhm9g16k0b84"; depends=[coda lattice]; };
   R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; };
   R2ucare = derive2 { name="R2ucare"; version="1.0.0"; sha256="1nh2wf3syxjz9flxhf8x9fd2c2ndn4dha4k34lz1nq5j4qz7wfp1"; depends=[RMark stringr]; };
   R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; };
+  R3port = derive2 { name="R3port"; version="0.1.1"; sha256="0ww0sqjx0la03qx353h0y5wr5qpc5fir3gjy4fsxkw6jrsyx9vaz"; depends=[plyr reshape2 whisker]; };
   R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; };
   R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; };
   R6 = derive2 { name="R6"; version="2.2.2"; sha256="13xfdr19ca7ymisidsanm6w7hsk3qmy5l8c0mlz3nk48f7s5cxq8"; depends=[]; };
@@ -2721,7 +2774,7 @@ in with self; {
   RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; };
   RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; };
   RATest = derive2 { name="RATest"; version="0.1.2"; sha256="0cxb82kzmywgslf6hfjl6v015s64jh483bzxnhph420mcp3ysbfk"; depends=[ggplot2 gridExtra quantreg]; };
-  RAdwords = derive2 { name="RAdwords"; version="0.1.15"; sha256="0f0j5fllkxwa63gpwgaks0sbsq9a68jw6g9djydq4c3jfzw1sqyl"; depends=[RCurl rjson]; };
+  RAdwords = derive2 { name="RAdwords"; version="0.1.16"; sha256="1a7r600s7r4pp0wwcsgyzkc6v7nywbsv3s0q118wmx2ig5rsyihw"; depends=[RCurl rjson]; };
   RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.3"; sha256="0g5sdq6sl7cvsj9fgqhcdxjkrfi53078r0mbzvf69cvz38y5x3sm"; depends=[]; };
   RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; };
   RAppArmor = derive2 { name="RAppArmor"; version="2.0.2"; sha256="18zmqqh4rnbnaiwi60jfp4xi8fp63ydr3jk9w4ijmy6s4hkpp75g"; depends=[]; };
@@ -2746,23 +2799,23 @@ in with self; {
   RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; };
   RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; };
   RCurl = derive2 { name="RCurl"; version="1.95-4.10"; sha256="02pyh6kvsfbwgccf8v77aa3ky21kps1rpgaii20wmridrgqj90vg"; depends=[bitops]; };
-  RCzechia = derive2 { name="RCzechia"; version="1.1.1"; sha256="070k93aj694jyvjmr5rbdzkdmi1sx69fild06dqf8idrkh3i2a55"; depends=[httr]; };
+  RCzechia = derive2 { name="RCzechia"; version="1.2.3"; sha256="18x1561l5hnaayvv8mca8gncqfgn4bbqx69gkb0jk3wa6s11y2qk"; depends=[httr]; };
   RDIDQ = derive2 { name="RDIDQ"; version="1.0"; sha256="09gincmxv20srh4h82ld1ifwncaibic9b30i56zhy0w35353pxm2"; depends=[]; };
   RDML = derive2 { name="RDML"; version="0.9-9"; sha256="0amlr7mxp7175a7rd3jw7lhyvp3lnr01y81l27sl148sfb85zar6"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; };
   RDS = derive2 { name="RDS"; version="0.8-1"; sha256="18xn0ci35xs2myzj8rny6pp08cn8ljl3l4fdgaqp05fphgb5fh8j"; depends=[anytime ergm ggplot2 gridExtra Hmisc igraph isotone network reshape2 scales]; };
   RDSTK = derive2 { name="RDSTK"; version="1.1"; sha256="07vfhsyah8vpvgfxfnmp5py1pxf4vvfzy8jk7zp1x2gl6dz2g7hq"; depends=[plyr RCurl rjson]; };
   RDStreeboot = derive2 { name="RDStreeboot"; version="1.0"; sha256="10ry8rna450j389cplvyvgwljxa8lli7licwdin64b1kyzy2cdn7"; depends=[]; };
   RDataCanvas = derive2 { name="RDataCanvas"; version="0.1"; sha256="1aw19lmdphxwva5cs3f4fb8hllirzfkk48nqdgrarz32l11y5z5j"; depends=[jsonlite]; };
-  RDieHarder = derive2 { name="RDieHarder"; version="0.1.3"; sha256="0wls7b0qfbi6hsq9xdywi4mdhim5b6mrzhvyrm9dxp9z1k7imz6m"; depends=[]; };
+  RDieHarder = derive2 { name="RDieHarder"; version="0.1.4"; sha256="0p37r45fy75a0is2mycvhrz705707acdb2858yd9qx70n6sg3jph"; depends=[]; };
   RDocumentation = derive2 { name="RDocumentation"; version="0.8.2"; sha256="0qdn3c5xbjyrhk56wfch50xpyyfd4f79hs0v00cqk9iwsnjlwmb5"; depends=[httr proto rjson]; };
   RDota2 = derive2 { name="RDota2"; version="0.1.6"; sha256="0fjsgg4dmzw2xwrf8jxq0f2d7f78bf67bl3ms5qcjk9kskfnymag"; depends=[httr jsonlite]; };
-  REAT = derive2 { name="REAT"; version="1.3.2"; sha256="1vp103jwq6zf3w6bn3xvbh4zcgsdrwiycp23ab8mj42axk8pw5li"; depends=[]; };
+  REAT = derive2 { name="REAT"; version="2.0.0"; sha256="0al0502h1iyd03c4hsy35nxz3nbvvfshi5jxxvxlh1x4bxvpy1vs"; depends=[]; };
   REBayes = derive2 { name="REBayes"; version="1.3"; sha256="0byd7587vddffplzp8kc2aakab61pck2r25rajxfn0rsvl5yvxyx"; depends=[Matrix reliaR Rmosek]; };
   RECA = derive2 { name="RECA"; version="1.3"; sha256="1v9ff2inxwpq91pjl6g9bpl9nmlyryp030g6abydikkhkcq3n74b"; depends=[]; };
   REDCapR = derive2 { name="REDCapR"; version="0.9.8"; sha256="14psw0sxlyig4nf968n997djwf80hgy5ia2g0bp8rdpn8lrj01g6"; depends=[data_table dplyr httr magrittr readr tibble tidyr]; };
   REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; };
   REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; };
-  REIDS = derive2 { name="REIDS"; version="0.0.1"; sha256="1pzbwmbz2agqlj28qpm7msahnk5viih5bqkimq3j8wp2pp580gwz"; depends=[aroma_affymetrix aroma_core data_table lmtest MCMCpack RColorBrewer]; };
+  REIDS = derive2 { name="REIDS"; version="0.0.2"; sha256="1njyvc818rwwg109ry8nb2p05rf9yh6zsydvww2ribynlsr2rir1"; depends=[aroma_affymetrix aroma_core biomaRt data_table GenomeGraphs lmtest MCMCpack RColorBrewer]; };
   REPPlab = derive2 { name="REPPlab"; version="0.9.4"; sha256="1pf8zrjdzziyq2lw31p1ij7cn4j7pf659ygxv8wpfnmcmpaqbc45"; depends=[lattice LDRTools rJava]; };
   REPTILE = derive2 { name="REPTILE"; version="1.0"; sha256="11swy4jrmmb0xjjxm1wyxd628fxxcqnialvijdrjwjpdbvraz4gq"; depends=[doParallel flux foreach optparse randomForest]; };
   REQS = derive2 { name="REQS"; version="0.8-12"; sha256="049glqhc8h8gf425kmj92jv70917dsigpm37diby0c6hb4jrg8ka"; depends=[gtools]; };
@@ -2787,7 +2840,7 @@ in with self; {
   RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; };
   RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; };
   RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2"; sha256="1w28yfzk3ilbz1r9fsc76cigyrnzzhsfm3a81ff8g26za7cb8vjp"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; };
-  RGF = derive2 { name="RGF"; version="1.0.1"; sha256="1kj67sc10khzl9xxk8ss366hcnmqiad0ap1xsc738ya6bv4xrr5w"; depends=[Matrix R6 reticulate]; };
+  RGF = derive2 { name="RGF"; version="1.0.2"; sha256="06qvilx9z659q0kad5h1r6mdf4vc8lmr8bzw5nrjsjpb92v5crh5"; depends=[Matrix R6 reticulate]; };
   RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; };
   RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; };
   RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; };
@@ -2795,16 +2848,17 @@ in with self; {
   RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; };
   RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; };
   RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; };
+  RGreenplum = derive2 { name="RGreenplum"; version="0.1.0"; sha256="19wb85npy27r011yfp90y1dvl8qk2yh2qks8zg207nac0vngz4y1"; depends=[DBI RPostgres]; };
   RGtk2 = derive2 { name="RGtk2"; version="2.20.34"; sha256="1yhdcd7f987bdd2y08dcx95i1hbfakgd8v1c606jxwr2dclyhx70"; depends=[]; };
   RGtk2Extras = derive2 { name="RGtk2Extras"; version="0.6.1"; sha256="19gjz2bk9dix06wrmlnq02yj1ly8pzhvr0riz9b08vbzlsv9gnk2"; depends=[RGtk2]; };
-  RH2 = derive2 { name="RH2"; version="0.2.3"; sha256="1qbxy600fc8k2xl70liggdgg03ga6a8yad001banqzdmh508wcxl"; depends=[chron rJava RJDBC]; };
+  RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; };
   RHMS = derive2 { name="RHMS"; version="1.3"; sha256="0pp67p8i6nsh9nvxsd1m453735s0whlril8l640m888zl6a3463j"; depends=[Hmisc pso]; };
   RHPCBenchmark = derive2 { name="RHPCBenchmark"; version="0.1.0"; sha256="1f94d8z15ybqgc2pccsi1m6563xf26ygri6f4pwxkqjmxkxnk34y"; depends=[cluster Matrix mvtnorm]; };
   RHRV = derive2 { name="RHRV"; version="4.2.3"; sha256="09rcf9da04195myh4mwva3hqcd483k0wwcn84jgbkj8a5z1zxqc6"; depends=[lomb nonlinearTseries tkrplot waveslim]; };
   RHT = derive2 { name="RHT"; version="1.0"; sha256="1gxf8nhj3y92h8al7l3fxa45wc568kb3cykrbdjlsy2zjacf7fcc"; depends=[]; };
   RHawkes = derive2 { name="RHawkes"; version="0.0"; sha256="0qi32f6im6fsgvjs8bravc5z21557zn2d0a7i88dy0rri7czm5p7"; depends=[IHSEP]; };
   RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; };
-  RIA = derive2 { name="RIA"; version="1.3.0"; sha256="0wz2c770faravsmlp3ivbw136x82l1i14ilikrdn7cn49bz0r5mh"; depends=[oro_dicom]; };
+  RIA = derive2 { name="RIA"; version="1.4.0"; sha256="0whwja54mmd23sbljgvjnlgz3hlmgpdh53w04bcpgbmvcs281f5l"; depends=[nat oro_dicom oro_nifti]; };
   RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; };
   RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; };
   RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; };
@@ -2812,7 +2866,7 @@ in with self; {
   RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; };
   RInside = derive2 { name="RInside"; version="0.2.14"; sha256="1ks9hs78s2vgdp9nfpzwifkqnh3vnaqwand51yh9r1zyjc4k9rcd"; depends=[Rcpp]; };
   RItools = derive2 { name="RItools"; version="0.1-15"; sha256="0f7g0w8bnbxryll48rnn7blgskgcdqqx9xv4fqmwcbkbasjz37va"; depends=[abind SparseM survival svd xtable]; };
-  RJDBC = derive2 { name="RJDBC"; version="0.2-7"; sha256="0db2s3qkkv16a4xskym8q3lv5s5jscwd5hh1pgl9bndb91wm9qj7"; depends=[DBI rJava]; };
+  RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; };
   RJSDMX = derive2 { name="RJSDMX"; version="1.9-3"; sha256="0myjhimx1p8ndyk60qgaw6csq58s4rxr67hgx9a5i1swsmlkwciz"; depends=[rJava zoo]; };
   RJSONIO = derive2 { name="RJSONIO"; version="1.3-0"; sha256="1dwgyiy19sixhy6yclqcaaxswbmpq7digyjjxhy1qv0wfsvk94qi"; depends=[]; };
   RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; };
@@ -2820,9 +2874,6 @@ in with self; {
   RJafroc = derive2 { name="RJafroc"; version="1.0.1"; sha256="16a8j4bw754ci8mxfhh3c3y5g53f2hr1l1mh05xw31asqcxzafrm"; depends=[bbmle binom caTools ggplot2 mvtnorm numDeriv Rcpp stringr xlsx]; };
   RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; };
   RKEAjars = derive2 { name="RKEAjars"; version="5.0-3"; sha256="0sm7dkdprmqh319jc43ra7qbk4qq0b2kdj9zs9mjcjz58gcrkl7s"; depends=[rJava]; };
-  RKEEL = derive2 { name="RKEEL"; version="1.1.22"; sha256="1k0xdy23za38lmav7hh9zchy9x61nkdm34s3cqrclzhf4nnlndfi"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; };
-  RKEELdata = derive2 { name="RKEELdata"; version="1.0.3"; sha256="1imz5qsr04hkhblivax30jlvbvjxya6h0z9x7s0llgqssfxbawpy"; depends=[]; };
-  RKEELjars = derive2 { name="RKEELjars"; version="1.0.15"; sha256="06wc4x6lhk9akaghqi5bfkfs3yxg29lbga074a5nwadiz2fbnmkv"; depends=[downloader]; };
   RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; };
   RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; };
   RLT = derive2 { name="RLT"; version="3.2.1"; sha256="14im1lvsfpl1vlhc3fmmi4vq41br48mlgqqnwnj0qqxawzzs5738"; depends=[]; };
@@ -2832,8 +2883,10 @@ in with self; {
   RLumShiny = derive2 { name="RLumShiny"; version="0.2.0"; sha256="0gchhgpdr9fb29apqni9yg72rh3hvvk7ap0869fp459hnygfcl7q"; depends=[data_table googleVis Luminescence readxl rhandsontable shiny shinydashboard]; };
   RM_weights = derive2 { name="RM.weights"; version="1.0"; sha256="0757p4174j913k8xh90zg6fpxh25b9415zap1i7ym9ab78kn0k3i"; depends=[Hmisc psychotools]; };
   RM2 = derive2 { name="RM2"; version="0.0"; sha256="1v57nhwg8jrpv4zi22fhrphw0p0haynq13pg9k992sb0c72dx70a"; depends=[msm]; };
+  RM2006 = derive2 { name="RM2006"; version="0.1.0"; sha256="1qjvdh89jql1fl6ia76g766y1igkshlv0slqmpi0y3bn40413snb"; depends=[]; };
   RMAWGEN = derive2 { name="RMAWGEN"; version="1.3.3"; sha256="0spc0vszbxfpfp3kqdj0gnb90nvn50qwalq3mw8151b8h1swmf3l"; depends=[chron date vars]; };
   RMC = derive2 { name="RMC"; version="0.2"; sha256="1sc4nsjmaw2ajm8bka7r4mf73zxqhnvx23kl4v20pfpy9rhgd0h6"; depends=[]; };
+  RMCriteria = derive2 { name="RMCriteria"; version="0.1.0"; sha256="19i7idpkl7ipqcib6rlmbi77n1il9v2hy6s9yyia6m9sz1smxakl"; depends=[dplyr ggnetwork ggplot2 gridExtra linprog lpSolve network pastecs Rcpp RcppEigen RcppNumerical]; };
   RMKdiscrete = derive2 { name="RMKdiscrete"; version="0.1"; sha256="0b4adw46sn98qmy4nxv5l5svcjrp5532x7slfhhgsskqx408lzjf"; depends=[]; };
   RMOA = derive2 { name="RMOA"; version="1.0"; sha256="01mrl6544wv2jc8b8gk1whs865sbv4id5sywnf1hq3r7g8wgs8lp"; depends=[rJava RMOAjars]; };
   RMOAjars = derive2 { name="RMOAjars"; version="1.0"; sha256="0k3w37dwyyvfxh7a9l76cyjm27qq1clxppc5h16li2m8x68fvpjq"; depends=[rJava]; };
@@ -2841,21 +2894,22 @@ in with self; {
   RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; };
   RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; };
   RMallow = derive2 { name="RMallow"; version="1.0"; sha256="0prd5fc98mlxnwjhscmghw62jhq9rj5jk8qf4fnaa2a718yxf9b5"; depends=[combinat]; };
-  RMariaDB = derive2 { name="RMariaDB"; version="1.0-4"; sha256="0xzy1af1w0cjym48zlgdsngksp8j90b0197v78s5jkm1vxmr0ada"; depends=[BH bit64 DBI hms plogr Rcpp]; };
+  RMariaDB = derive2 { name="RMariaDB"; version="1.0.5"; sha256="1fykcsb81pdp3v46sjphldj7nizcdp5m7a3j3p1psx0ppgg57r2d"; depends=[BH bit64 DBI hms plogr Rcpp]; };
   RMark = derive2 { name="RMark"; version="2.2.4"; sha256="1vns8bl3fnk6hkwmm0wl2c6lgyv3vabsk07kkxrxrl1nzy11wj3a"; depends=[coda matrixcalc msm]; };
   RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; };
   RMixpanel = derive2 { name="RMixpanel"; version="0.6-3"; sha256="025fg36jwq44y5m7msmjql3m0avc0hl0iw49wap0fvmzy5qn24qq"; depends=[base64enc jsonlite RCurl uuid]; };
   RMongo = derive2 { name="RMongo"; version="0.0.25"; sha256="1anybw64bcipwsjc880ywzj0mxkgcj6q0aszdad6zd4zlbm444pc"; depends=[rJava]; };
   RMySQL = derive2 { name="RMySQL"; version="0.10.14"; sha256="01891kn263b02y6addgpy3gn5axg7m10bqbqv7dg9yx9k85am590"; depends=[DBI]; };
   RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; };
-  RNAsmc = derive2 { name="RNAsmc"; version="0.1.0"; sha256="02r8y43hrhjyhmim2yf7s4c46q8ys6b8qla9vwjqpmx5104v5v5g"; depends=[RRNA]; };
+  RNAsmc = derive2 { name="RNAsmc"; version="0.3.0"; sha256="15k88skwqcd0m4m502fipdl1iind4mzizqdz4h63izpqfxijl3iz"; depends=[RRNA]; };
   RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; };
   RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; };
   RNCEP = derive2 { name="RNCEP"; version="1.0.8"; sha256="0nkx33997c5rgc3ch5a2bb6rrw5xw1y71rliygw5k1ldi335rsm7"; depends=[abind fields fossil maps RColorBrewer sp tgp]; };
   RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; };
+  RNGforGPD = derive2 { name="RNGforGPD"; version="1.0"; sha256="11n7fl1rrgnknn61qw6dh74amhakkjk5wyg0rms554lw9cn86x2v"; depends=[corpcor Matrix mvtnorm VGAM]; };
   RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; };
-  RNOmni = derive2 { name="RNOmni"; version="0.1.5"; sha256="1lahwala3j0rcxdq1aswngqp89d4za167nrmsbj1lqscd7bn6qkd"; depends=[abind foreach mvtnorm RcppEigen]; };
-  RNRCS = derive2 { name="RNRCS"; version="0.2.0"; sha256="1wg7ld6g94wby5lagf68h19qgx2mf0pc8rfvmnz4fac7xpdsg9s8"; depends=[ggplot2 magrittr rvest xml2]; };
+  RNOmni = derive2 { name="RNOmni"; version="0.3.0"; sha256="0gddpfv0ggbfxids42npnd0q2bkwz81v3x7h1898qyzql3dg9pwv"; depends=[abind foreach mvtnorm plyr Rcpp RcppEigen]; };
+  RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; };
   RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; };
   RNeXML = derive2 { name="RNeXML"; version="2.0.8"; sha256="0ikdv60nkhiv70x1crd21xd92iq2gshj6248m896v1l276513g5j"; depends=[ape dplyr httr lazyeval plyr reshape2 stringr taxize tidyr uuid XML]; };
   RNentropy = derive2 { name="RNentropy"; version="1.2.0"; sha256="19zbjy2xrrsz674qhi6dfzppsgfdy9hp93bqj14p1w3z6smh0k8c"; depends=[]; };
@@ -2895,7 +2949,7 @@ in with self; {
   ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; };
   ROSE = derive2 { name="ROSE"; version="0.0-3"; sha256="12b9grh3rgaa07blbnxy8nvy5gvpd45m43bfqb3m4k3d0655jpk2"; depends=[]; };
   RObsDat = derive2 { name="RObsDat"; version="16.03"; sha256="06d4svg4crgscn3wyg1fi8v46wlhlrgdrbfiv8ak4a5k5z0gws94"; depends=[DBI e1071 sp spacetime vwr xts zoo]; };
-  ROlogit = derive2 { name="ROlogit"; version="0.1.1"; sha256="1bmhq3vcrfxl7flr28x5yhk8akfv59c0xs10s73dchf1qqjfz5ld"; depends=[evd survival]; };
+  ROlogit = derive2 { name="ROlogit"; version="0.1.2"; sha256="09j9c24f7plzpnnhpmzdi4gapb7w1377ksjwk6i2xpyr4bfsrr5k"; depends=[evd survival]; };
   ROpenDota = derive2 { name="ROpenDota"; version="0.1.1"; sha256="0d9a8c008bgzcd1hqly2h010f25xgs2s430hk90yq7vvqr3lmxl7"; depends=[jsonlite RCurl]; };
   ROpenFIGI = derive2 { name="ROpenFIGI"; version="0.2.8"; sha256="0fvd25vsqkgi3jv4s2lnfag5qksyzyb48d7rhfw6z8piz37n4xaj"; depends=[httr jsonlite]; };
   ROpenWeatherMap = derive2 { name="ROpenWeatherMap"; version="1.1"; sha256="0h1yw93v06bx8svhghh1fsrf837qax9896klh64b06djpgg9ngb9"; depends=[httr jsonlite RCurl]; };
@@ -2914,13 +2968,13 @@ in with self; {
   RPPairwiseDesign = derive2 { name="RPPairwiseDesign"; version="1.0"; sha256="0k2vh698rhs5a0b5vhyvrnnwqnagdzs591zx6hn9vbmm8rm4y1dm"; depends=[]; };
   RPPanalyzer = derive2 { name="RPPanalyzer"; version="1.4.5"; sha256="0cf4mb7mjp7x3k7083c8n8fjbvrmcgq359wh6pdyj817mgkanqzv"; depends=[Biobase gam ggplot2 gplots Hmisc lattice limma quantreg]; };
   RPostgreSQL = derive2 { name="RPostgreSQL"; version="0.6-2"; sha256="1mdhw5821v2h7hpa53v10wz53k4i90r0vb6a3dia5gq8f9j1h088"; depends=[DBI]; };
-  RPostgres = derive2 { name="RPostgres"; version="1.0-4"; sha256="0ymlz5av86xy434mr319p2sw7gl42dpj5vfi83wfiq1qri2vvx23"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
+  RPostgres = derive2 { name="RPostgres"; version="1.1.0"; sha256="1h540z1zfzgkayggy28q07r0xnblr3vnp6j5j7la6xbz141gns38"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; };
   RPresto = derive2 { name="RPresto"; version="1.3.0"; sha256="01w832ia4c44nhir5rzw33qa8h7afmf04vkfdlg32jaqi1gv5861"; depends=[DBI httr jsonlite openssl Rcpp stringi]; };
   RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.11"; sha256="0q05hdlbgbjydi0x80kgfayfkisalvmb9wy1n6afcw66pbikyb4l"; depends=[Rcpp RCurl]; };
   RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; };
   RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; };
   RPushbullet = derive2 { name="RPushbullet"; version="0.3.1"; sha256="15cb1zlfnjaf5z4dqx3xrkbkja152ah7jhs21qhvfl20qz4cyh7r"; depends=[curl jsonlite]; };
-  RQDA = derive2 { name="RQDA"; version="0.3-0"; sha256="0p060wilvmz5wyahbga6gxkhs49rw8nb093bfrha7vhqhxnmdyqk"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
+  RQDA = derive2 { name="RQDA"; version="0.3-1"; sha256="1kqax4m4n5h52gi0jaq5cvdh1dgl0bvn420dbws9h5vrabbw1c1w"; depends=[DBI gWidgets gWidgetsRGtk2 igraph RGtk2 RSQLite]; };
   RQGIS = derive2 { name="RQGIS"; version="1.0.3"; sha256="0wrzjfxwciirl838lakcw7f6qyqyykqd999c9krll5krqzyq7c3c"; depends=[raster RCurl readr reticulate rgdal sf sp stringr XML]; };
   RQuantLib = derive2 { name="RQuantLib"; version="0.4.4"; sha256="1pki0c265nmgph9dbz2pyrq8h7295mxswavfdwsr7m1lpbpzk8s5"; depends=[Rcpp zoo]; };
   RRF = derive2 { name="RRF"; version="1.7"; sha256="1nxwqb0ybia8cglqlrbwnm9xzab6ayrn5f3j3l0kqszq1rvkfw95"; depends=[]; };
@@ -2929,12 +2983,14 @@ in with self; {
   RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; };
   RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; };
   RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; };
-  RRreg = derive2 { name="RRreg"; version="0.6.5"; sha256="1hn69zqcafiq1fb38fl4gah90kim8pc2m35sbi1cgkgcbzz1vg16"; depends=[doParallel foreach lme4]; };
+  RRphylo = derive2 { name="RRphylo"; version="1.0.0"; sha256="1h167w16lky8aa18fc90rgclx1by3qa9d69n72dxmjzy0d14zjc6"; depends=[ape doParallel foreach geiger lmtest mvMORPH phangorn phytools pvclust R_utils rlist scales smatr]; };
+  RRreg = derive2 { name="RRreg"; version="0.6.7"; sha256="0v0rzyknqwrnj3dx5lvifzllv1syzflnnby6mjmnsqqb2cgyscrf"; depends=[doParallel foreach lme4]; };
   RSA = derive2 { name="RSA"; version="0.9.11"; sha256="1hsjy755r78my6ib9s9da7mibcjxd5svh2kq0v7a466m60cyfrss"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; };
   RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; };
   RSAGA = derive2 { name="RSAGA"; version="1.0.0"; sha256="1023br8q0i6w18kmn261kf4ql32061hq7xngl1w5mamvvp17d6b1"; depends=[gstat plyr rgdal sf shapefiles]; };
   RSAP = derive2 { name="RSAP"; version="0.9"; sha256="1sxirfabhpmfm0yiiazc9h1db70hqwva2is1dql6sjfanpl8qanl"; depends=[reshape yaml]; };
-  RSCABS = derive2 { name="RSCABS"; version="0.9.2"; sha256="13l4ql40ahm06yi5a9zys62h5452fchkkhlhqh9gzh3pbpyjawgc"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
+  RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; };
+  RSCABS = derive2 { name="RSCABS"; version="0.9.3"; sha256="08ykkqx9rdx5s6wg2idxz35ddpsz1lir22vrjs92k51zq0jrkhv9"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; };
   RSDA = derive2 { name="RSDA"; version="2.0.3"; sha256="18rka6g93yksgnwgzy4planjvsmc4d5xzf4fxarv57v6frg37y98"; depends=[abind dplyr FactoMineR ggplot2 glmnet lazyeval nloptr pander princurve RColorBrewer RJSONIO rlang scales scatterplot3d sqldf stringr tidyr XML xtable]; };
   RSEIS = derive2 { name="RSEIS"; version="3.7-8"; sha256="0f065jkdz91gi6l8y5y4m95vwgjsagrxx6r5982jbafi7zyqxm7j"; depends=[RPMG Rwave]; };
   RSGHB = derive2 { name="RSGHB"; version="1.1.2"; sha256="0b2v17p3a3sy8jc4vy0nq65sdkxyf0b8sf5f78yvdcn5knydah6c"; depends=[]; };
@@ -2944,10 +3000,10 @@ in with self; {
   RSNNS = derive2 { name="RSNNS"; version="0.4-10"; sha256="1khsv1sy8jgsl9s5fypcg77lzj811xzrygwnq6ki9v375sk383gh"; depends=[Rcpp]; };
   RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; };
   RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; };
-  RSQLServer = derive2 { name="RSQLServer"; version="0.3.0"; sha256="1p3qds1ni8dm7cb45n4z5ppn3vsjk8mmqlvw76d301qfp3ja5zll"; depends=[assertthat DBI dbplyr dplyr purrr rJava yaml]; };
-  RSQLite = derive2 { name="RSQLite"; version="2.0"; sha256="1xpg1i1jkzkzv44k512k90c2vvl960pl2d4a3spwcha6yclyc3vz"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
+  RSQLite = derive2 { name="RSQLite"; version="2.1.0"; sha256="0hknfqcgijdapx1ryy20zy68qmm8wsb1hjx4n4hmkgl552z82q5d"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; };
   RSSL = derive2 { name="RSSL"; version="0.6.1"; sha256="03f0i0v0nygkcci42h4bh7jngxz15wsd78cn2zkzbrqadz1c61r5"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; };
   RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; };
+  RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; };
   RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; };
   RSarules = derive2 { name="RSarules"; version="1.0"; sha256="0lrql4q45hyhqbix86ixl12mknnjbz3137gx2zkvqpz91bsk145j"; depends=[arules Matrix]; };
   RSauceLabs = derive2 { name="RSauceLabs"; version="0.1.6"; sha256="1p7hw6vnlg6w5ggmfpc3q3s6n1fikjkjnxzz97jifiy0zwn5dp9i"; depends=[data_table httr jsonlite whisker xml2]; };
@@ -2962,11 +3018,11 @@ in with self; {
   RSpectra = derive2 { name="RSpectra"; version="0.12-0"; sha256="0aa33mhzj03gznpza5l5qj94s45imfhrgx52bsa8rq00f93fgaf0"; depends=[Matrix Rcpp RcppEigen]; };
   RSpincalc = derive2 { name="RSpincalc"; version="1.0.2"; sha256="09fjwfz1bzpbca1bpzxj18ki8wh9mrr5h6k75sc97cyhlixqd37s"; depends=[]; };
   RStata = derive2 { name="RStata"; version="1.1.1"; sha256="1wx6cz4567xkfplybmbwmw25snhlaxn48yi620cv6p5xqv458yp7"; depends=[foreign]; };
-  RStoolbox = derive2 { name="RStoolbox"; version="0.1.10"; sha256="0qz9k7qjwhgw2hm4b6iys365y8dnd9b9js2yzyxpyqwdwmvmkxjj"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; };
+  RStoolbox = derive2 { name="RStoolbox"; version="0.2.1"; sha256="1lvjiaamd2jz1m1prk429lwfwqbm3dcyq6v8hddkynd0k28qbw6s"; depends=[caret codetools doParallel foreach geosphere ggplot2 raster Rcpp RcppArmadillo reshape2 rgdal rgeos sp XML]; };
   RStorm = derive2 { name="RStorm"; version="0.902"; sha256="1apk358jwzg5hkrcq8h39rax1prgz9bhkz9z51glmci88qrw1frv"; depends=[plyr]; };
   RStripe = derive2 { name="RStripe"; version="0.1"; sha256="0vp7zsd5xm8rf7196fivb76kkmxfx3gawxlyjhn9xqv92vawivra"; depends=[httr jsonlite RCurl]; };
   RSurveillance = derive2 { name="RSurveillance"; version="0.2.0"; sha256="1lvl9msnd8l9svd9nyivx1cqfmcxirxvfjfj0xv7yjklza8af7w3"; depends=[epiR epitools mc2d]; };
-  RSurvey = derive2 { name="RSurvey"; version="0.9.2"; sha256="0mg0g93bli2v5nsm3jqbbm3qxk1kk0ngf8fkdq4z9n8k291shx25"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; };
+  RSurvey = derive2 { name="RSurvey"; version="0.9.3"; sha256="0yk969jdvpgv01zbmk4zyxcmrbdizh37bddj1k128ndyf191z37x"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; };
   RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; };
   RSwissMaps = derive2 { name="RSwissMaps"; version="0.1.0"; sha256="0p57pb3p6j0g4ngzikys9i4d02p4dc4k0s8k7r1wgdmdy2rak3k2"; depends=[downloader dplyr ggplot2]; };
   RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; };
@@ -2991,14 +3047,14 @@ in with self; {
   RWeka = derive2 { name="RWeka"; version="0.4-37"; sha256="1q0riy7w2ighyy7fh1hj3q4wa0vbbn6h7nisgkyzwkcxkfq3n2pw"; depends=[rJava RWekajars]; };
   RWekajars = derive2 { name="RWekajars"; version="3.9.2-1"; sha256="006n7m3qxnzvfhkzcr0nbwqdlhygzdhyp8x3534dx6075bm00v0f"; depends=[rJava]; };
   RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; };
-  RWildbook = derive2 { name="RWildbook"; version="0.9.2"; sha256="1bzdj55v7g2vlffpdsxpl8gv4k1xxd3xl7h1whvq6q5x76lprw0g"; depends=[data_table jsonlite marked]; };
+  RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; };
   RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; };
   RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; };
-  RXshrink = derive2 { name="RXshrink"; version="1.0-8"; sha256="0l4aknr1vxrkxqsgkjcffs0731jskyzvl055a01vd8h4a0826n5s"; depends=[lars]; };
+  RXshrink = derive2 { name="RXshrink"; version="1.0-9"; sha256="0lzh2asgxk7vjvb8zkshnhh49ybvj1rgca1mspg7hj3012rw6kjn"; depends=[lars]; };
   RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; };
   RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; };
   RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; };
-  RZigZag = derive2 { name="RZigZag"; version="0.1.4"; sha256="1p0p9imdv40vw59m95x00zv9a3knl4m4gwlrbd2v93yzdc1n2a26"; depends=[Rcpp RcppEigen]; };
+  RZigZag = derive2 { name="RZigZag"; version="0.1.5"; sha256="0cawn24z0rm78dn8l86k3zfh4z3xp1i910dzxp7xqjzlh3spp4ar"; depends=[Rcpp RcppEigen]; };
   RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; };
   RadOnc = derive2 { name="RadOnc"; version="1.1.4"; sha256="1ri6ybzhfdgbrbfcy12mmvv2ipg61az7vwp1dbjyzs8mgsc1cxb5"; depends=[geometry oro_dicom ptinpoly rgl]; };
   RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; };
@@ -3011,7 +3067,7 @@ in with self; {
   RandVar = derive2 { name="RandVar"; version="1.0.1"; sha256="0vj0p46xmj4129m6r5zg85fnvb5kx1ardwwk55nqypkxd0v58a4j"; depends=[distr distrEx startupmsg]; };
   RandomFields = derive2 { name="RandomFields"; version="3.1.50"; sha256="0j7852wvclglp820y2x5r19gsr6ciygbbpl5qvwj1khnlz1hfsid"; depends=[RandomFieldsUtils sp]; };
   RandomFieldsUtils = derive2 { name="RandomFieldsUtils"; version="0.3.25"; sha256="0nxk7jhr61l9h76hf96f7ypakl4wip144c0gzr6rqsja6m75rjz3"; depends=[]; };
-  RankAggreg = derive2 { name="RankAggreg"; version="0.6.2"; sha256="1hblxvx5symysqfrmapw8ma7ghhmc01rzzc7kpq8vckch2k9x8kb"; depends=[gtools]; };
+  RankAggreg = derive2 { name="RankAggreg"; version="0.6.4"; sha256="1bskq723jx87xczw416pijajna73zhjjmbrvh3n6djxy8yjxhrq5"; depends=[gtools]; };
   RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; };
   Rankcluster = derive2 { name="Rankcluster"; version="0.94"; sha256="0ak6cpm073ym4h9l3j7pq0ks9h4is1hzxfjn52j23nc5ifq3fjpq"; depends=[Rcpp RcppEigen]; };
   RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; };
@@ -3019,7 +3075,7 @@ in with self; {
   Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; };
   RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; };
   RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; };
-  RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2"; sha256="0bw2j2wx0l56wp0k6fg8dddphggz0fycjzjydsd55rkg4zq6gpf3"; depends=[ggplot2 pROC]; };
+  RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.1"; sha256="0dcyajh3vgdl9ssdwgaf3sshq61bqqhjz30f9c99aqnpv3k4k76x"; depends=[ggplot2 pROC]; };
   Rbent = derive2 { name="Rbent"; version="0.1.0"; sha256="0xkb57dhhfd3342rv0xwbhbhn4zp5fbfch84fbh0sickm09l9vrj"; depends=[Rfit]; };
   Rbgs = derive2 { name="Rbgs"; version="0.2"; sha256="1q0dnbcpgx7x9klr6z33z6g2p9p8mrmhnsqjy6qw15ch720rrgn3"; depends=[imager magrittr rJava]; };
   Rbitcoin = derive2 { name="Rbitcoin"; version="0.9.2"; sha256="0ndq4kg1jq6h0jxwhpdp8sw1n5shg53lwa1x0bi7rifmy0gnh66f"; depends=[data_table digest RCurl RJSONIO]; };
@@ -3031,15 +3087,16 @@ in with self; {
   RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; };
   Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; };
   Rchoice = derive2 { name="Rchoice"; version="0.3-1"; sha256="1mx50270vbhvng4vdcc6w94f3l890vjl41y07bqkv40n93fxvffw"; depends=[Formula maxLik msm plm plotrix]; };
+  Rclean = derive2 { name="Rclean"; version="1.0.0"; sha256="065jq957xsk9p1nnzf8ilp9swjfxhydgc7xg57lfcg9hz99ckwfr"; depends=[formatR igraph jsonlite]; };
   Rclusterpp = derive2 { name="Rclusterpp"; version="0.2.3"; sha256="02s5gmmmd0l98wd1y884pjl3h289dyd9p9s7dh7yl2zaslqs2094"; depends=[Rcpp RcppEigen]; };
-  Rcmdr = derive2 { name="Rcmdr"; version="2.4-2"; sha256="0027s3g7wzjaqnx3yhn9whpxsrvz7ar70r1a0lwd5hs6g008m8ja"; depends=[abind car effects RcmdrMisc relimp tcltk2]; };
-  RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-8"; sha256="1lc26k2f6r37id85baii7rr5m36vy34p6xxl1fjs87s94zifkfsp"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; };
+  Rcmdr = derive2 { name="Rcmdr"; version="2.4-4"; sha256="0n15wkhn8hfhcpz0n2ngxkfaysjsizksxxr1fhpfjmlpy4wxxnx0"; depends=[abind car effects RcmdrMisc relimp tcltk2]; };
+  RcmdrMisc = derive2 { name="RcmdrMisc"; version="1.0-10"; sha256="1fxcm0iwxdqh9qv2g6w7sqbg23zgl5z5ib2x69j5n10fglx89m8f"; depends=[abind car colorspace e1071 foreign haven Hmisc MASS nortest readstata13 readxl sandwich]; };
   RcmdrPlugin_BCA = derive2 { name="RcmdrPlugin.BCA"; version="0.9-8"; sha256="0xkip7q9i57ghgz0rh0pl8nkl7bflf4w1g4zbyjdlcjypyf7lnr8"; depends=[BCA car flexclust foreign nnet Rcmdr RcmdrMisc rpart rpart_plot]; };
   RcmdrPlugin_BiclustGUI = derive2 { name="RcmdrPlugin.BiclustGUI"; version="1.1.1"; sha256="1sdc8ibggz8wpn77g7hddyl7lg86dbyw8qax63p6cqx1pfhb4rra"; depends=[BcDiag BiBitR BicARE biclust fabia gplots iBBiG Rcmdr rqubic s4vd superbiclust viridis]; };
   RcmdrPlugin_DoE = derive2 { name="RcmdrPlugin.DoE"; version="0.12-3"; sha256="1iifn71kjjgcp7dfz2pjq57mgbv4rrznrl3b3k9gdc2dva1z9zvc"; depends=[DoE_base DoE_wrapper FrF2 Rcmdr RcmdrMisc relimp]; };
   RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; };
   RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; };
-  RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.36"; sha256="0yj9z9x185p4kqn10hm6mrl6i64dwyaaywzlmbgzd51m1112fp6r"; depends=[Rcmdr]; };
+  RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.37"; sha256="1l990nv5xb6slpk7s5k662ln5gp190g0rr3qxrbh44z0j9vnxl2p"; depends=[Rcmdr readstata13]; };
   RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; };
   RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; };
   RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; };
@@ -3059,7 +3116,7 @@ in with self; {
   RcmdrPlugin_SLC = derive2 { name="RcmdrPlugin.SLC"; version="0.2"; sha256="1nwpzmgfla1y05dxf81w0wmvvmvcq5jn5k8phlq30920ia7ybs8g"; depends=[Rcmdr SLC]; };
   RcmdrPlugin_SM = derive2 { name="RcmdrPlugin.SM"; version="0.3.1"; sha256="10sjh2x02kb6yaxbvd9ihc6777j4iv6wi6k42gyl3k7i2c39fyn3"; depends=[car colorspace Rcmdr RColorBrewer vcd]; };
   RcmdrPlugin_TeachingDemos = derive2 { name="RcmdrPlugin.TeachingDemos"; version="1.1-0"; sha256="0fgl1v1g74ca14pf3mmbv26j09v7jy6ddyap5qavgiy9s8qrwrh8"; depends=[Rcmdr rgl TeachingDemos tkrplot]; };
-  RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-2"; sha256="1gg6gi0l0vzcp29c3s8law68bgyms0hczpk41wzzcvvvkhdbr7xi"; depends=[car randtests Rcmdr TeachingDemos tseries]; };
+  RcmdrPlugin_UCA = derive2 { name="RcmdrPlugin.UCA"; version="4.1-4"; sha256="0wzcqmrv9qvdcrcz0vcp5fl8f71zg6c355qrr9476524aidb29my"; depends=[randtests Rcmdr TeachingDemos tseries]; };
   RcmdrPlugin_aRnova = derive2 { name="RcmdrPlugin.aRnova"; version="0.0.5"; sha256="0ys3565pcbr554yb1gi2h149vhvwc0gdfmh7mz8zzd4367hqn553"; depends=[Rcmdr]; };
   RcmdrPlugin_coin = derive2 { name="RcmdrPlugin.coin"; version="1.0-22"; sha256="0qmdjnjmgq52wgl4llg69q9x7hvwd73mz3swv0sv88v8zqg7xj93"; depends=[coin multcomp Rcmdr survival]; };
   RcmdrPlugin_depthTools = derive2 { name="RcmdrPlugin.depthTools"; version="1.3"; sha256="09mjn5jn4rdj1lh515vr3xlnk615flg13kcwbpk0an2si4xkgm9h"; depends=[depthTools Rcmdr]; };
@@ -3079,7 +3136,7 @@ in with self; {
   RcmdrPlugin_temis = derive2 { name="RcmdrPlugin.temis"; version="0.7.9"; sha256="0nacpipaimb1348rhv1rma85gnd38wsg741pz7xpvn347wnnc0wz"; depends=[ca lattice latticeExtra NLP R2HTML Rcmdr RColorBrewer slam stringi tcltk2 tm zoo]; };
   Rcolombos = derive2 { name="Rcolombos"; version="2.0.2"; sha256="0l92icjqqm5fxafqwd09lnmv5x6kvjdg8cphlm37q86nslwr5rkk"; depends=[httr]; };
   Rcplex = derive2 { name="Rcplex"; version="0.3-3"; sha256="0abmrqphrpdlc831hwbwx15z4vdgn385kxhnqlbb9v0sjmfyszsl"; depends=[slam]; };
-  Rcpp = derive2 { name="Rcpp"; version="0.12.15"; sha256="1pnv6sl4vdn69ygmgrb1b3gsigfdcfb56wnzikic93l8gkvdsvxv"; depends=[]; };
+  Rcpp = derive2 { name="Rcpp"; version="0.12.16"; sha256="1rm8hcy72p1jvxikvmkwg20pjqmvmfvqb45lfghmddp2adp67qfl"; depends=[]; };
   Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; };
   RcppAPT = derive2 { name="RcppAPT"; version="0.0.4"; sha256="0xbaamv3bg08ymbmiq6kwh86p17y6qzgydq02syig2a3ykp0042c"; depends=[Rcpp]; };
   RcppAlgos = derive2 { name="RcppAlgos"; version="1.0.1"; sha256="0668anb3kjw3h71n2hjqqjrmiz4dwrgw71ikviq0imw2v5030392"; depends=[Rcpp]; };
@@ -3088,10 +3145,10 @@ in with self; {
   RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; };
   RcppBlaze = derive2 { name="RcppBlaze"; version="0.2.2"; sha256="0hi7gh7xlmdcyzxsis8wl841d6czbcgb8qdg8y822am1mvc0wmb7"; depends=[BH Matrix Rcpp]; };
   RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.3"; sha256="0cb04filbr0mymcg891lc0dw2b3fnjmhn8z50xcilb3v72ccrvqg"; depends=[Rcpp]; };
-  RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.8"; sha256="0fwz942pd1r7jcxwqjbagcai153kv7csflhg7agwhxyj49m97i82"; depends=[Rcpp]; };
+  RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.9"; sha256="0c6vdrf16f8fyaczzwapzn513wrdklsc8izmzfmfbc58s5500gvk"; depends=[Rcpp]; };
   RcppCWB = derive2 { name="RcppCWB"; version="0.1.7"; sha256="13iax4kr5gchm483gib3cdjcbvkymhiwbpnj705c325fbsfk5rj7"; depends=[Rcpp]; };
   RcppClassic = derive2 { name="RcppClassic"; version="0.9.9"; sha256="102gi1l6hxdkz50iy9xbpb57iy5j7flv78sdq36pn9zi8x4k8k95"; depends=[Rcpp]; };
-  RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.1"; sha256="0shs12y3gj5p7gharjik48dqk0fy4k2jx7h22ppvgbs8z85qjrb8"; depends=[Rcpp RcppClassic]; };
+  RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; };
   RcppDE = derive2 { name="RcppDE"; version="0.1.5"; sha256="1zgz8h7d7jjml9hm164y9wrsgcb1fymp3ipxp235fmk44lbrwpcw"; depends=[Rcpp RcppArmadillo]; };
   RcppDL = derive2 { name="RcppDL"; version="0.0.5"; sha256="1gii00bna6k9byaax7gsx42dv1jjnkrp4clbmdq59ybq3vkvw8z2"; depends=[Rcpp]; };
   RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.4.0"; sha256="1m6ssq6lvi36ggf26y4hhq996583pxxdb978jnn1x6r9gdb0q0hi"; depends=[Matrix Rcpp]; };
@@ -3110,8 +3167,7 @@ in with self; {
   RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.2"; sha256="1si5njb8g4g6fjrkqbp3y6z23yxs901nq9kmiwwbqs8di6svc5q3"; depends=[BH Rcpp]; };
   RcppRedis = derive2 { name="RcppRedis"; version="0.1.8"; sha256="05c4c65ayiqyzmkj2mrgwwflgjk54rf9nmb3rhickj16yy9b071q"; depends=[BH RApiSerialize Rcpp]; };
   RcppRoll = derive2 { name="RcppRoll"; version="0.2.2"; sha256="19xzvxym8zbighndygkq4imfwc0abh4hqyq3qrr8aakyd096iisi"; depends=[Rcpp]; };
-  RcppSMC = derive2 { name="RcppSMC"; version="0.2.0"; sha256="063ds546hd5dfsickiawm5c92sw2kb6n79fqz4gy4hvnbkf00q84"; depends=[Rcpp RcppArmadillo]; };
-  RcppShark = derive2 { name="RcppShark"; version="3.1.1"; sha256="0dy6zksxcsbzjyz0f147rk2amwjsrjdcyl6jn767pw9ij9vdzh6r"; depends=[BH checkmate Rcpp]; };
+  RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; };
   RcppStreams = derive2 { name="RcppStreams"; version="0.1.1"; sha256="0sa0ndnfm89f8lh3ba6jf3gxaan1g97dhlzbmpkwqj22frgggqjw"; depends=[BH Rcpp]; };
   RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; };
   RcppTOML = derive2 { name="RcppTOML"; version="0.1.3"; sha256="0krw4104m8drgyf53aq22kl5q0abrd0y4j1fvrwsj1dkbkybas05"; depends=[Rcpp]; };
@@ -3128,7 +3184,7 @@ in with self; {
   Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; };
   Rdimtools = derive2 { name="Rdimtools"; version="0.3.2"; sha256="0wk6sv2ahxscy4nsk826c9rlq8vxgnflg9banwdxhs6qlqhipnlb"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo Rcsdp Rdpack RSpectra Rtsne]; };
   Rdistance = derive2 { name="Rdistance"; version="1.3.2"; sha256="1ajmr58lgc74727jiydfrh4j6ra7vq8hp8nm3l2s3g2mc8n1mqk5"; depends=[]; };
-  Rdpack = derive2 { name="Rdpack"; version="0.5-5"; sha256="19rib96758r2zkq4wlys0gfj60zff34gv1wpb8d7pa34h81gpi9p"; depends=[bibtex gbRd]; };
+  Rdpack = derive2 { name="Rdpack"; version="0.7-0"; sha256="0j8jh5zj4nhcchl3xr6n6bvc4m0irjz44mw5690f7iqfi3mzkii6"; depends=[bibtex gbRd]; };
   Rdrools = derive2 { name="Rdrools"; version="1.0.3"; sha256="1y805j2xrv8kgh42s5lig07mb76fcz5yrxal0zaykj16cvid8287"; depends=[Rdroolsjars rJava]; };
   Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; };
   Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; };
@@ -3148,8 +3204,8 @@ in with self; {
   RefManageR = derive2 { name="RefManageR"; version="0.14.20"; sha256="18g2w32ldfakmnmlk1gaxq64jhx4iy7kil1s7g6lnvv1fygxpg8k"; depends=[bibtex httr jsonlite lubridate plyr stringr xml2]; };
   RegClust = derive2 { name="RegClust"; version="1.0"; sha256="1d9w74phw4fgafglc18j7dpmln96fvxnf1kdc9zddgj90p8yfx63"; depends=[]; };
   RegressionFactory = derive2 { name="RegressionFactory"; version="0.7.2"; sha256="1g23paq42xiiqavikbrflwmr8ikls9z97v1xpgg16pb88svdyayc"; depends=[]; };
-  RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.0"; sha256="02mf1iy3npa5611kc9ifqcl9ap2bhab9qq5pn6cfyw9lxa3q1if0"; depends=[ggplot2 gtools psych RGCCA]; };
-  ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.1"; sha256="12qah22gq9360mw7z2bpcaqyqan10qqbnzyqmkafbkb5jq6fnfx9"; depends=[data_table ggplot2 hash]; };
+  RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.3"; sha256="1d7rzvai36h7nmfvi6fdabba3rfa68x53li9jdrlk77mgpgr9vhw"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; };
+  ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.2"; sha256="1khk3yi0ixs4lzvng9pjmyyiy86bh5bx7wdyr915p1nbhq6yl2cl"; depends=[data_table ggplot2 hash]; };
   RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; };
   Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; };
   Reliability = derive2 { name="Reliability"; version="0.0-2"; sha256="12zsicgbjqih3grbs62pw37x8wlkmnyc7g0yz6bqnfb4ym2yb7fg"; depends=[]; };
@@ -3162,8 +3218,8 @@ in with self; {
   RepeatABEL = derive2 { name="RepeatABEL"; version="1.1"; sha256="00bq9ls4d0kczdv752xasqbavb11bjfvpriggfc8dw3g3i7pizpg"; depends=[GenABEL hglm]; };
   RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; };
   Replicate = derive2 { name="Replicate"; version="1.0.1"; sha256="110pvissyv3dx1wpwpngcg18mpmpml49gcmdykip55s1d3ljf791"; depends=[metafor]; };
-  ReporteRs = derive2 { name="ReporteRs"; version="0.8.9"; sha256="1wsqbn231xqs87dmcry13bdkvv09y17jfqkdnpigcsiivbh3zr3x"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; };
-  ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.3"; sha256="0rn000xkkda08kfh1b1l01piw596j3rca8sv4r23q52indrm7vzs"; depends=[rJava]; };
+  ReporteRs = derive2 { name="ReporteRs"; version="0.8.10"; sha256="18ivgd3736zcrimcyzfkh5d6h9s1srh7xdz597y596dsssx1lmc6"; depends=[gdtools htmltools knitr png R_utils ReporteRsjars rJava rvg shiny xml2]; };
+  ReporteRsjars = derive2 { name="ReporteRsjars"; version="0.0.4"; sha256="0q11jcbkv9ibmkqr3mka0w5d797s8xb0155kcs5inlcacirp6wvy"; depends=[rJava]; };
   ResistorArray = derive2 { name="ResistorArray"; version="1.0-28"; sha256="055zr4rybgrvg3wsgd9vhyjpvzdskrlss68r0g7rnj4yxkix0kxz"; depends=[]; };
   ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-2"; sha256="08b1aa3183k1y30dwabnd6x353mdp2sn5b908cpv84bs3fdzlrdp"; depends=[MASS Matrix pbapply]; };
   RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; };
@@ -3173,14 +3229,15 @@ in with self; {
   Rfit = derive2 { name="Rfit"; version="0.23.0"; sha256="1gxxipbh7mskrqwrpk1gf1dn8mp3l1v4hgmzii44bppffnxs7slp"; depends=[]; };
   Rfmtool = derive2 { name="Rfmtool"; version="2.0.0"; sha256="1a8s4a4mdblzy76ljslfvz8zav2639plhby0ib5ccjnpz2sxhc7s"; depends=[]; };
   Rga4gh = derive2 { name="Rga4gh"; version="0.1.1"; sha256="0h5y722blkkwn6ask6vjnhl22v9l6511chdm50ig6xcs5dvjam2m"; depends=[httr jsonlite]; };
-  Rgb = derive2 { name="Rgb"; version="1.5.1"; sha256="136mhxwnw7jkfnmb5gxjr2xfnly79xfp6a6f9c8lj7s6wrgkl02a"; depends=[]; };
+  Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; };
   Rgbp = derive2 { name="Rgbp"; version="1.1.2"; sha256="1g5v22zjgykzcg5jk7fi03xfn3jzz1yf38izjzhx2433d97hasr7"; depends=[mnormt sn]; };
   Rglpk = derive2 { name="Rglpk"; version="0.6-3"; sha256="03v4cav465dkznm7d3bwwpx3qprhq25sp1rb5ncx2lka6inr1vzd"; depends=[slam]; };
   Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; };
   RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.1"; sha256="0fsmlnhl4kw2j4972kfanzw9njhnzk695gsyw8g6yppsmz2clcaq"; depends=[png]; };
-  Rgretl = derive2 { name="Rgretl"; version="0.2.1"; sha256="07a83nmx3q0yl7fbwqmkmnzxm5rrh8p4nrayv3rj18s1r98i4jph"; depends=[lubridate png xml2]; };
+  Rgretl = derive2 { name="Rgretl"; version="0.2.2"; sha256="18jyp4bxs96ri1a4ifd52aj0q6kd2dygz8pkajbd9whq7bn5ick6"; depends=[lubridate png xml2]; };
   Rhpc = derive2 { name="Rhpc"; version="0.18-12"; sha256="095mrr6g05y9g8h88k1nf19zmjvg8hnmf5b3r6krqs4cxhp2qls2"; depends=[]; };
   RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.18-12"; sha256="14qypi76h73iv3xwbb860r4f7516jyb88j92lmkifw03x86lx2b3"; depends=[]; };
+  Ricetl = derive2 { name="Ricetl"; version="0.2.5"; sha256="0q87cxzqkkp2bk92q3wnxxsqlkafkd37lp5pki7f87a5vcxlcrak"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; };
   RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; };
   Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; };
   Rilostat = derive2 { name="Rilostat"; version="0.2.1"; sha256="058qz5kn7p8wn3lvw92c11cqpkz9brgf1igmawfkb0lqvj366vyd"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; };
@@ -3188,13 +3245,13 @@ in with self; {
   Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; };
   RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.1"; sha256="1kn0vb4nhm3bxlmk5y2nl5m7a7hdvz3nz0yp8rdigpl6b2dp79w1"; depends=[MASS nloptr quadprog]; };
   Ritc = derive2 { name="Ritc"; version="1.0.2"; sha256="03smhxjhjfkc9pxhlgg54b6v2jznpmnws8373qpvn9a9ky5bcq2l"; depends=[minpack_lm]; };
-  RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.0"; sha256="0qs21qz1zc0wsykd7qhry93il6qz255mgxyxnrdmxf5989k5mvxi"; depends=[]; };
+  RiverBuilder = derive2 { name="RiverBuilder"; version="0.1.1"; sha256="06cd1m4liv2bsh2sxplq2zl45g9zq8gsgvh14d0zr0pqm8z4dsyw"; depends=[]; };
   Rivivc = derive2 { name="Rivivc"; version="0.9"; sha256="0gl3040pp9nqm4g2ympnx80z64zfnn1hfsxka8ynd2cqhjn3b5i1"; depends=[signal]; };
   Rjpstatdb = derive2 { name="Rjpstatdb"; version="0.1"; sha256="0iwgsp3mblp7bsx88wfpqn09y1xrkingfkm3z9jsi2bwrnrjc2iv"; depends=[RCurl XML]; };
   RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; };
   Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; };
   Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; };
-  Rlabkey = derive2 { name="Rlabkey"; version="2.2.0"; sha256="1gzywhbdkd4f392fasa91ral8wg7jr51b4n1kll7r8hvyjz7bmgy"; depends=[httr Rcpp rjson]; };
+  Rlabkey = derive2 { name="Rlabkey"; version="2.2.1"; sha256="1nsaab7nysld1gdqnpxd9g68vzs363szyinbfn6j2c7ch0vqcrka"; depends=[httr Rcpp rjson]; };
   Rlda = derive2 { name="Rlda"; version="0.2.4"; sha256="01dh6x0yh9y7q8c8qy0zkkn2y18wzg5y90v4gcawdb1adz46izg2"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; };
   Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.0"; sha256="0nnkblrgycvfwn0lb9j92f5wpln69kk54z4irwi35rrfl31f689m"; depends=[Rcpp]; };
   Rlinkedin = derive2 { name="Rlinkedin"; version="0.2"; sha256="15sbiis1d0s466nqk1adjhflb01sb9kn25f4y6sagkdggvyz6b56"; depends=[httpuv httr XML]; };
@@ -3208,7 +3265,7 @@ in with self; {
   RmixmodCombi = derive2 { name="RmixmodCombi"; version="1.0"; sha256="0cwcyclq143938wby0aj265xyib6gbca1br3x09ijliaj3pjgdqi"; depends=[Rcpp Rmixmod]; };
   Rmosek = derive2 { name="Rmosek"; version="1.2.5.1"; sha256="0zggv699s93i9g98qjs4ci2nprgfkzq45lpzgrbhldsxiflf27gz"; depends=[Matrix]; };
   Rmpfr = derive2 { name="Rmpfr"; version="0.7-0"; sha256="0jpj3nl76jd6vc2p1xwr8jl62q8ckwsdaxqnk9b20srkq63mfrig"; depends=[gmp]; };
-  Rmpi = derive2 { name="Rmpi"; version="0.6-6"; sha256="184skad8m4y4pzk8v98b7k7prqxm9mg1b2pfxbknyvzakq6aizv1"; depends=[]; };
+  Rmpi = derive2 { name="Rmpi"; version="0.6-7"; sha256="1b62gs7w1xqadqd7ir41jnxlcf14gcqfxd0915kn9ckdlsdrh0sw"; depends=[]; };
   RnavGraph = derive2 { name="RnavGraph"; version="0.1.8"; sha256="1fwzfy41gdr1aw1wg6dw04mxwwpp5s9x2inxyq3bc9s8bm1rlxih"; depends=[graph rgl scagnostics]; };
   RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.3"; sha256="1mrh0p2ckczw4xr1kfmcf0ri2h2fhp7fmf8sn2h1capmm12i1q8f"; depends=[]; };
   RndTexExams = derive2 { name="RndTexExams"; version="1.4.1"; sha256="1gi96hfd7dkvmbvy6hj25g1l7nwk4yhxkdjx1l3ws3c2zpi27cvj"; depends=[CopyDetect data_table stringi stringr]; };
@@ -3225,11 +3282,11 @@ in with self; {
   Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; };
   RobustAFT = derive2 { name="RobustAFT"; version="1.4-1"; sha256="180gmlinrpnk4ghl1xickbjkdqr7vb6qzmy6701xpji5k8g9il60"; depends=[robustbase survival]; };
   RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.0"; sha256="1pkgwglnb68563hiirkagz33jfksbzj3cvdyv13brrzx6jzcvw11"; depends=[Rcpp RcppEigen RobustGaSP]; };
-  RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.4"; sha256="1zq62vx5bq2wbdh9irmcfpbpr83qqr9m9icbpksxc8bp9zdsdzkq"; depends=[Rcpp RcppEigen]; };
+  RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.5"; sha256="0asxhzybpfmz3zzhr32hvcxrdmdsjlqjvxiihrxc8f4w3qwnzb82"; depends=[Rcpp RcppEigen]; };
   RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; };
   RockFab = derive2 { name="RockFab"; version="1.2"; sha256="1b5mhfll5vmqwl4pblmclyx9604vn07jyza02rm0jcsx915ms8sc"; depends=[EBImage rgl]; };
   Rodam = derive2 { name="Rodam"; version="0.1.2"; sha256="0fxsjzillr2v3sxbph13q3wrly6dx6m8rm276qzfvx1md044z14y"; depends=[RCurl]; };
-  RonFHIR = derive2 { name="RonFHIR"; version="0.1.0"; sha256="14a5s9w77gb8v4ak5rv22m38d7ga4p4nnqqqhp41jj1snqqw45h3"; depends=[httr jsonlite R6]; };
+  RonFHIR = derive2 { name="RonFHIR"; version="0.2.0"; sha256="1kcbv8ibqh7jb3dpj4p73vd168c6vlwi08s9cshl4w6hqbz1pklg"; depends=[httr jsonlite R6]; };
   Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; };
   RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.1"; sha256="11wybhw180r4zaqwfs301zwzfzprwwl4hiyhjj78l3mnxgdnmwz7"; depends=[doParallel foreach iterators]; };
   Rothermel = derive2 { name="Rothermel"; version="1.2"; sha256="0zrz2ck3q0vg0wpa4528rjlrfnvlyiy0x1gr5z1aax1by7mdj82s"; depends=[ftsa GA]; };
@@ -3239,9 +3296,9 @@ in with self; {
   RpeakChrom = derive2 { name="RpeakChrom"; version="1.1.0"; sha256="1r8f6knpz83arz2kabizx5yyh1myg0h310qlwh8rmy88cdxi1ps9"; depends=[ggplot2 minpack_lm pracma ptw]; };
   Rphylip = derive2 { name="Rphylip"; version="0.1-23"; sha256="0kpqmik4bhr74ib8yvaavr10z4v4w3li5vibdhz7lvz35jfirg9r"; depends=[ape]; };
   Rphylopars = derive2 { name="Rphylopars"; version="0.2.9"; sha256="19y0j5vh82sa9jigylxhv0s0hgjyhx3xq4blvk55jhpj8v7iyiky"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; };
-  Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.1.0"; sha256="06i8pmvn7fl8likxzzqzkggqf7x20pwi10mcv4x46cacil80ir2z"; depends=[futile_logger R6 rgl stringr testthat]; };
+  Rpolyhedra = derive2 { name="Rpolyhedra"; version="0.2.4"; sha256="1klianmsm3msgy5sbigxzx1mzsl915hmam6h2llr274r5gqhg4wh"; depends=[futile_logger R6 rgl stringr testthat XML]; };
   Rpoppler = derive2 { name="Rpoppler"; version="0.1-0"; sha256="19nvv45ahp0c241p1xzlq0sq5qarqg66jw5f1anhqnfi2hi91hcm"; depends=[]; };
-  Rprofet = derive2 { name="Rprofet"; version="1.1.0"; sha256="1aflqic2jfx9y6mxj155n0900xp20g1lliq8ad4nd4z2k0rfcpi2"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf]; };
+  Rprofet = derive2 { name="Rprofet"; version="2.2.0"; sha256="1s0jkq83vfc9jsggnwm31r366b10n6sri2vzpwxybzpjq3d3w5qr"; depends=[binr ClustOfVar ggplot2 gridExtra plyr sqldf stringr]; };
   Rquake = derive2 { name="Rquake"; version="2.4-0"; sha256="14s2mjq9qqxfvlwmq9126h67y5wr7irlc7945pgv1ab9hl1lgmz8"; depends=[GEOmap MBA minpack_lm rgl RPMG RSEIS]; };
   Rramas = derive2 { name="Rramas"; version="0.1-5"; sha256="0wy0flzp68mikq4v9k5pv6hbzx0w9mpa74dwx79i3iiddn0ylby6"; depends=[diagram]; };
   Rraven = derive2 { name="Rraven"; version="1.0.2"; sha256="0mhf0vv58la1xh8vc31ak1wfi47zsqbjgxy7zz4bjk90g6110jyp"; depends=[doParallel dplyr foreach kableExtra pbapply pbmcapply vegan warbleR]; };
@@ -3266,9 +3323,9 @@ in with self; {
   Ruchardet = derive2 { name="Ruchardet"; version="0.0-3"; sha256="0dgldi6fgp949c3455m9b4q6crqv530jph210xzph41vgw8a2q2v"; depends=[Rcpp]; };
   Runiversal = derive2 { name="Runiversal"; version="1.0.2"; sha256="0667mspsjydmxi848c6wsf14gz72bmdj9b3lilma92b7fhqnv7ai"; depends=[]; };
   Runuran = derive2 { name="Runuran"; version="0.24"; sha256="1528jzpg0m4gya63xjf7ya4x1c96anm6bpzjgsa1vq1a4dz9m4y9"; depends=[]; };
-  RunuranGUI = derive2 { name="RunuranGUI"; version="0.2"; sha256="0k3vgn027c2zbrk7pc2wcy2h6dn2djhdi70m8fi1qpz6vg7k8c7x"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 Runuran rvgtest]; };
+  RunuranGUI = derive2 { name="RunuranGUI"; version="0.3"; sha256="1h2bcc443z8vp4hjf4vss4ds5n6zc6x70kmw13b2431f56jq12fa"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 Runuran rvgtest]; };
   Rvcg = derive2 { name="Rvcg"; version="0.17"; sha256="0ssmi8mqmq82qrw0hzrmfqpwnkxwdlfa6j049r4l3gn28cfqhg1j"; depends=[Rcpp RcppArmadillo RcppEigen]; };
-  Rvmmin = derive2 { name="Rvmmin"; version="2017-7.18"; sha256="14jzwqwi1zd8sg1vb18hgvbvsax38hdqjy540qqhn2xb4z8qx3hy"; depends=[optextras]; };
+  Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; };
   Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; };
   Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; };
   Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1"; sha256="0kzngkan9vydibnr3xm4pyz4v6kz0r4h19f0ngqpri07fkhdsxzd"; depends=[]; };
@@ -3276,7 +3333,6 @@ in with self; {
   RxODE = derive2 { name="RxODE"; version="0.6-1"; sha256="1dkz6kq9wq7q2xw2wdzii5682w9f7rmgq28g7pfh8ivimfg1q4bi"; depends=[brew digest dparser inline magrittr Matrix memoise R_utils Rcpp RcppArmadillo rex]; };
   RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; };
   Ryacas = derive2 { name="Ryacas"; version="0.3-1"; sha256="13qvd5gpdrjgzf6isk3529khd02852y3ajmpp5vl8vn9k1jxp86v"; depends=[Rcpp XML]; };
-  Rz = derive2 { name="Rz"; version="0.9-1"; sha256="1cpsmfxijrfx06ydpjzbaak7gkad4jjk1ph9453l9zly1cwzgspj"; depends=[foreign formatR ggplot2 memisc psych RGtk2]; };
   S2sls = derive2 { name="S2sls"; version="0.1"; sha256="0qq1rff2cdgrm5rj69jxgrl71i0wmzyn424fdvcg02zdv9ggqhd3"; depends=[spanel]; };
   SACCR = derive2 { name="SACCR"; version="2.1"; sha256="184mw9q25b06zar4ii3na7c4x28ly922d5csfqkw9b07mdp81k3h"; depends=[data_tree jsonlite Trading]; };
   SACOBRA = derive2 { name="SACOBRA"; version="0.7"; sha256="12aj4ghs3i3ks749z0l95ipv8gi33xgggkyjf21zvnzmb1dgphys"; depends=[testit]; };
@@ -3338,9 +3394,10 @@ in with self; {
   SGCS = derive2 { name="SGCS"; version="2.6"; sha256="09czgfc0mg64qcigp36kjaf52zlmrpz3m2d1dp42d9hhlciliqf5"; depends=[spatstat]; };
   SGL = derive2 { name="SGL"; version="1.1"; sha256="1wc430jqn3li102zpfmyyavfbab7x7ww9p89clxsndyigrrbjdr7"; depends=[]; };
   SGP = derive2 { name="SGP"; version="1.7-0.0"; sha256="0jjrrza8s6sj3gmmldnyxshfmcaf8xhp4g50vc3rcwnkg1jhzkg8"; depends=[Cairo colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats quantreg randomNames RSQLite sn toOrdinal]; };
-  SGPdata = derive2 { name="SGPdata"; version="17.0-0.0"; sha256="1pjilyqwhgisz1iiy50l86dwc4dg3c8dzlpx7mm7n75049vzp2xq"; depends=[data_table]; };
+  SGPdata = derive2 { name="SGPdata"; version="20.0-0.0"; sha256="0fxv7nnxiaq6z9wii9x5qiy0vd2z8jw3gcwl5fj9m29ja7j3900g"; depends=[crayon data_table]; };
   SHELF = derive2 { name="SHELF"; version="1.3.0"; sha256="0qhkp1ypbimiq9r8yv95bipbmhm7b38ibbk9nmhdckrr6ymd2w35"; depends=[ggExtra ggplot2 MASS shiny tidyr]; };
   SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; };
+  SI = derive2 { name="SI"; version="0.1.0"; sha256="11ywmyz4mamk30p4m9qvgmba237s1xvabablh91rwq13089x8nxm"; depends=[]; };
   SIBER = derive2 { name="SIBER"; version="2.1.3"; sha256="14ab9zid0i400kj924m2y5qgp2iibnpllhqw11rlmdf8j9cr7858"; depends=[dplyr ggplot2 hdrcde magrittr mnormt rjags spatstat_utils tidyr viridis]; };
   SID = derive2 { name="SID"; version="1.0"; sha256="1446zy4rqbw0lpyhnhyd06dzv238dxpdxgmsk34hqv7g3j7q5h1w"; depends=[igraph Matrix pcalg RBGL]; };
   SIDES = derive2 { name="SIDES"; version="1.11"; sha256="1gmhfj44qdklsdklmg8p35lmvlgla8i881i3iaziblslyscbyw9f"; depends=[doParallel foreach MASS memoise multicool nnet survival]; };
@@ -3400,6 +3457,7 @@ in with self; {
   SPEI = derive2 { name="SPEI"; version="1.7"; sha256="0lj7d3bbik7q4di5nqc3a1rn94z2y2v9x45r1jjkvgf03frj96qd"; depends=[ggplot2 lmomco]; };
   SPIAssay = derive2 { name="SPIAssay"; version="1.1.0"; sha256="0y02122lj4v95g62w84jmdjdazfz3rch133aid5sgakj2kv68cvh"; depends=[]; };
   SPIGA = derive2 { name="SPIGA"; version="1.0.0"; sha256="0yd06x5rh1h1s4v9apj43c90rkz8m5kssbny7y5mnw5mr2acds9b"; depends=[GA]; };
+  SPINA = derive2 { name="SPINA"; version="4.1.0"; sha256="0x7y150iq072qqci2niqk7j8pvhcylb7kdvwambg1r1gi3ffycm9"; depends=[]; };
   SPIn = derive2 { name="SPIn"; version="1.1"; sha256="109xxrg7bsmmfd6ik85kxrw2qclxbh5ipsh5mmrdl4hki3hnyp2s"; depends=[quadprog]; };
   SPODT = derive2 { name="SPODT"; version="0.9-1"; sha256="01yq429a4s63855bwpn2mqjj2k3cz4187kfpi7n7qqdpdvmxz109"; depends=[rgdal sp tree]; };
   SPOT = derive2 { name="SPOT"; version="2.0.2"; sha256="17apfbsh4qv3yhv7jpmmyz7whwx4ilm0krspxyc4knm3yxxw26bp"; depends=[DEoptim MASS nloptr randomForest rgenoud rsm]; };
@@ -3407,13 +3465,13 @@ in with self; {
   SPREDA = derive2 { name="SPREDA"; version="1.0"; sha256="1dyqsra899fd1nbk1b7vkw8gs455c6pbcvzw84q9iri77186xqhv"; depends=[nlme survival]; };
   SPRT = derive2 { name="SPRT"; version="1.0"; sha256="1r4pfqh8k5avi8qgpk5x1cy8lmkn341yvjvd2r7wqwb3mr242r0v"; depends=[]; };
   SPSL = derive2 { name="SPSL"; version="0.1-8"; sha256="1jg1nfhz8qml1wwqa4d0w7vkdmbgdy5xlfqx0h2pdw2z8iij3xxc"; depends=[]; };
-  SPUTNIK = derive2 { name="SPUTNIK"; version="1.0.1"; sha256="1b8rawkcq15r4cyji245x59l1m3qkj0n31nhs1bjd3286zpdcg7b"; depends=[autothresholdr ggplot2 imager infotheo reshape SDMTools spatstat viridis viridisLite]; };
+  SPUTNIK = derive2 { name="SPUTNIK"; version="1.0.2"; sha256="0hf6g3s17ri1qzl1180s4akyhp98lj6zx5ix1z6rh53gk6dvxb5l"; depends=[autothresholdr ggplot2 imager infotheo reshape SDMTools spatstat viridis viridisLite]; };
   SPYvsSPY = derive2 { name="SPYvsSPY"; version="0.1.1"; sha256="1hxc73wwrzqh1r1xr9yd4hy4ma24virg4iv978lfyc9f9n56znp5"; depends=[]; };
   SPmlficmcm = derive2 { name="SPmlficmcm"; version="1.4"; sha256="1acs3560a7h6xx286m40abr9b7i5qihn6wni8flj0biahmsszzx6"; depends=[nleqslv]; };
   SPreFuGED = derive2 { name="SPreFuGED"; version="1.0"; sha256="1cdamkrr0xpc0l2dypd9lgjidrmalfxs0ms7z3wfmf22a8b3y0d2"; depends=[Biobase boot CMA lattice limma lme4 mvtnorm]; };
   SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; };
   SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; };
-  SQRL = derive2 { name="SQRL"; version="0.2.1"; sha256="01nad4j2q20agi62zay0n731ljwgil7ql0gick5s7f9khhciilf6"; depends=[RODBC]; };
+  SQRL = derive2 { name="SQRL"; version="0.3.0"; sha256="1d4wnm03a900gyhayxkrqpwyxmj8mbqadhi3bzqvi6wb01517a0r"; depends=[RODBC]; };
   SQUAREM = derive2 { name="SQUAREM"; version="2017.10-1"; sha256="10xj26x7qjyvzndnbjl5krr9wabnb9cbrnp3m7xg673g8ddr12cv"; depends=[]; };
   SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; };
   SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; };
@@ -3426,24 +3484,26 @@ in with self; {
   SSN = derive2 { name="SSN"; version="1.1.12"; sha256="1c2dx7d9izd4z76pvsbbfb0r1a6w45x96mv4vb9h99yafcw380nv"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; };
   SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; };
   SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; };
-  SSrat = derive2 { name="SSrat"; version="1.0"; sha256="1qpsdfdngsgxx3mqgn4avl65w4v5v4jwsh1nnxzfn9iqi9mg4bhi"; depends=[plyr sna]; };
+  SSrat = derive2 { name="SSrat"; version="1.1"; sha256="1mmwla7yqqldv0s5hqljq2k2qljdfhq97m5128gvf3iy7n2yjzgj"; depends=[plyr sna]; };
   SSsimple = derive2 { name="SSsimple"; version="0.6.4"; sha256="0p7d4hx7mhn5myq8ajcij6hhg79rjxigk5v8z93yfdw4gjcb5wad"; depends=[mvtnorm]; };
   STAND = derive2 { name="STAND"; version="2.0"; sha256="07wrpmvk0jjlghvrb37xyai48vgzj0fby8y09qdxsxdlgwqg1f3s"; depends=[survival]; };
   STAR = derive2 { name="STAR"; version="0.3-7"; sha256="1g78j4iyh78li1jaa3zz5qv4p41cg0imhmvbfakd34l32ppih4ll"; depends=[codetools gss mgcv R2HTML survival]; };
-  STARTS = derive2 { name="STARTS"; version="0.2-10"; sha256="16d578rgl13x29lbv95g7qrcf0lmxjcz8mxrrd5cb7405bl4a1rq"; depends=[CDM LAM sirt]; };
+  STARTS = derive2 { name="STARTS"; version="0.3-24"; sha256="13963x27y81ahwnhzghq3wadlkkq8k8mga2ap2knx5p980fj1jb7"; depends=[CDM LAM sirt]; };
   STARTdesign = derive2 { name="STARTdesign"; version="1.0"; sha256="1q61l3v8ishzax3ppy0pz4ky4l46472l6j36hjlsa8cl01ik1zjf"; depends=[Rcpp]; };
   STB = derive2 { name="STB"; version="0.6.3.1"; sha256="0fj1cfxqhijpxl41z799zd7id95jsb84ylrbqzrd1jlp80plyw83"; depends=[Matrix VCA]; };
   STEPCAM = derive2 { name="STEPCAM"; version="1.2"; sha256="03crbc7hag8w333j9c7k0q7zy7xmfid4lq773p74r55jmac5xpjf"; depends=[ade4 ape FD geometry gtools MASS vcd]; };
   STI = derive2 { name="STI"; version="0.1"; sha256="1p408y9w2h4ljaq0bsw7vc1xghczjprf558cyg6994m0nv5fh4c4"; depends=[fitdistrplus zoo]; };
   STMedianPolish = derive2 { name="STMedianPolish"; version="0.2"; sha256="0jzgcfhm09cccg2nwbvrmnkah1psbnmg26rc2n7lz26n4b20p3l2"; depends=[gstat maptools nabor reshape2 sp spacetime zoo]; };
   STPGA = derive2 { name="STPGA"; version="4.0"; sha256="198h2wzhv5lnyqypn7s5lilywby2pq3zdx8vk4qd72bybfwwli2c"; depends=[]; };
+  STV = derive2 { name="STV"; version="1.0.0"; sha256="034d9qnvgmk97ah7r9w2hvnw39f7mxs2ml6y8dad94p8phl52gfw"; depends=[]; };
   SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; };
   SUMMER = derive2 { name="SUMMER"; version="0.1.0"; sha256="14dq64h931l8r4pfhdg3i8wabb08n1fnnp8ql1bmhl1z4dqbggfl"; depends=[classInt ggplot2 maptools RColorBrewer sp spdep survey survival]; };
   SVMMaj = derive2 { name="SVMMaj"; version="0.2-8"; sha256="13d9v1l85md1v6qyfrdc3l36yanw5canskngjr1sh0hmyla182bz"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; };
   SVMMatch = derive2 { name="SVMMatch"; version="1.1"; sha256="1ykwrhlid4hs466xh3kv6y2qdhgk0jiglg0l3zwk5qlni6p26zc9"; depends=[Rcpp RcppArmadillo]; };
   SWATmodel = derive2 { name="SWATmodel"; version="0.5.9"; sha256="1i48g9nbjfn30ppwyzyz3k181nscv4wx773l8mzfdwhx0nlv4kyj"; depends=[EcoHydRology]; };
   SWMPr = derive2 { name="SWMPr"; version="2.3.0"; sha256="1z6gg8ih1m5nxm1kilpwxj4xvlbyqr67la7idrfa722y6f6264rf"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; };
-  SYNCSA = derive2 { name="SYNCSA"; version="1.3.2"; sha256="1m057lhfaf0n35rs3sipia04qgkp04hv7wf7rvnr7bhzic9f4vg3"; depends=[FD mice vegan]; };
+  SWMPrExtension = derive2 { name="SWMPrExtension"; version="0.3.12"; sha256="1l79576a4v7kdgnb3skmakbfgnxfr069dn60v31x1fjq75k2lklq"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp stringr SWMPr tidyr]; };
+  SYNCSA = derive2 { name="SYNCSA"; version="1.3.3"; sha256="1g00jzghvvhnj2npplh87bwbm479mwldskhard0vjlfmagbhjm8p"; depends=[FD permute RcppArmadillo vegan]; };
   SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; };
   SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; };
   Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; };
@@ -3474,31 +3534,31 @@ in with self; {
   Segmentor3IsBack = derive2 { name="Segmentor3IsBack"; version="2.0"; sha256="0c7ag9svd1xlm60padg41gvz7qnbcp41kg3cz2dvi9hy2yrqw0qd"; depends=[]; };
   Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; };
   SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; };
-  Select = derive2 { name="Select"; version="1.2"; sha256="0ljlh7zj4r3izns47sa8bx17ll0ki6p02fpjxwghy1hz9k6ak9ir"; depends=[lattice latticeExtra Rsolnp]; };
+  Select = derive2 { name="Select"; version="1.3"; sha256="0gl0rba9d2l3r70wnxlc3d9s8lcgxl9scsb27x4zid5a3y7n7mpw"; depends=[ade4 FD lattice latticeExtra Rsolnp]; };
   SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; };
-  SemiCompRisks = derive2 { name="SemiCompRisks"; version="2.8"; sha256="1f4cpqjb737fz6iiadhdi1ansfi5wj1zl403b3xw7l20k4f39952"; depends=[MASS survival]; };
+  SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.0"; sha256="1f1rv48qpmgg0z25vmz48ziimj6bwnxlzf2k4i1xwb53qxxyysxw"; depends=[Formula MASS survival]; };
   SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.3"; sha256="1qfsy88bd07xk3gy2r7cjcs6fhx9889aqn1494d92msxmc6zvcz7"; depends=[MASS numDeriv Rsolnp]; };
-  SemiPar = derive2 { name="SemiPar"; version="1.0-4.1"; sha256="05gnk4s0d6276rmnyyv6gy1wpkji3sw563n8l7hmi9qqa19ij22w"; depends=[cluster MASS nlme]; };
+  SemiPar = derive2 { name="SemiPar"; version="1.0-4.2"; sha256="0pa3drpvclkw81ji5m1h5arj5c2rh03dnlff97cnnr1v5kvg1i4w"; depends=[cluster MASS nlme]; };
   SemiParSampleSel = derive2 { name="SemiParSampleSel"; version="1.5"; sha256="0apbg8sddz2ab9170wvf7p6cgawvp4w13r97r5q7p3hx2hylb8sw"; depends=[CDVine copula gamlss_dist magic Matrix matrixStats mgcv mvtnorm trust VGAM]; };
   SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; };
   SensMap = derive2 { name="SensMap"; version="0.6"; sha256="0j52aplvdlwwfswyrij0vv7zsdr015cn5931c6631rlps94gka0w"; depends=[doBy factoextra FactoMineR fields ggdendro ggplot2 glmulti lattice MCMCpack mgcv plotly shiny]; };
-  SensMixed = derive2 { name="SensMixed"; version="2.0-10"; sha256="0r2lga40xr782n1viyxc4wn9gzgm7g2ick45pfnkgq6m60wx9rfh"; depends=[doBy ggplot2 Hmisc lme4 lmerTest plyr reshape2 shiny shinyBS xtable]; };
+  SensMixed = derive2 { name="SensMixed"; version="2.1-0"; sha256="0ykg94amnm9clf8d3naap8fmv9qqc6j1q52wnb83zk7ry44dp7dh"; depends=[doBy ggplot2 Hmisc lme4 MASS plyr reshape2 shiny shinyBS xtable]; };
   SensitivityCaseControl = derive2 { name="SensitivityCaseControl"; version="2.1"; sha256="00jqzqx7g0av9lw13is723gph486gb8ga0wgcmmzpmb24s5nya9z"; depends=[]; };
   SensoMineR = derive2 { name="SensoMineR"; version="1.23"; sha256="0a1s2wrb86a0y2faxj5ax8fa6vfcclgg7bcff4j7jb40ilxnxhn4"; depends=[AlgDesign cluster FactoMineR ggplot2 gtools KernSmooth reshape2]; };
   SensusR = derive2 { name="SensusR"; version="2.2.0"; sha256="0ahgy6mvlxfdavdarmfmb1ld1pykhbrjgg8mdh5q71b3a75vbp47"; depends=[ggmap ggplot2 jsonlite lubridate openssl plyr R_utils]; };
-  SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-0"; sha256="098w4kcd6xsgwi996plm06nmyg8f7sg9wjphymmfl29k5y2zyz4s"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; };
+  SentimentAnalysis = derive2 { name="SentimentAnalysis"; version="1.3-2"; sha256="18vycj9vpb32610sn321sbwdnjldyjm9idjw9spggdzj7gsiwwk3"; depends=[ggplot2 glmnet mgcv moments ngramrr qdapDictionaries SnowballC spikeslab stringdist tm XML]; };
   SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; };
-  SeqBayesDesign = derive2 { name="SeqBayesDesign"; version="0.1.0"; sha256="0426v7lf7z0r8lc9clwnq6n977m27cd7l218i5dfssllkv17h88k"; depends=[MASS Rcpp]; };
   SeqFeatR = derive2 { name="SeqFeatR"; version="0.2.6"; sha256="0y06am4q9cgf8cfycw9ym5qys0g99ks3cfxgk0mss34i5vhbfjfr"; depends=[ape Biostrings calibrate coda ggplot2 phangorn plotrix plyr qvalue R2jags scales tcltk2 widgetTools]; };
   SeqGrapheR = derive2 { name="SeqGrapheR"; version="0.4.8.5"; sha256="041hlf64zbndz76r076pmym4dw4xl3fahryvpvjspw0sdlhmfm8c"; depends=[Biostrings cairoDevice gWidgets gWidgetsRGtk2 igraph rggobi]; };
+  SeqKat = derive2 { name="SeqKat"; version="0.0.6"; sha256="0idxyn84rqsg26y6ml218g037qxrx9755ikasyn212qacc36in39"; depends=[doParallel foreach Rcpp]; };
   SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; };
   SequenceAnalysis = derive2 { name="SequenceAnalysis"; version="1.3"; sha256="0jrpq5ryw7rwkv99w0a5p3r0vj8nbzj6adlcsr84d9ffgxafmhif"; depends=[XML]; };
   Sequential = derive2 { name="Sequential"; version="2.3.2"; sha256="01zvgvdj57js08krskahk1ng3wkv9iblmirslgrmllf4q18zwsdr"; depends=[]; };
   SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; };
   SetMethods = derive2 { name="SetMethods"; version="2.3"; sha256="10xzvr7xfv2vwa3byw4qb3v8gi8d36w9drjzqsxx52ffnjb95670"; depends=[betareg fmsb lattice QCA]; };
   SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; };
-  SetTest = derive2 { name="SetTest"; version="0.1.0"; sha256="0b5lkdhaymi3vsx9acdn9jxvqwwsac9lbdr43c44c06gglqlvk47"; depends=[]; };
-  Seurat = derive2 { name="Seurat"; version="2.2.1"; sha256="1sr82nf38hq07avrfn8vlrzjq7dfm4pcr8l1nh6mnglcql2bk9z2"; depends=[ape caret cowplot diffusionMap dplyr dtw FNN fpc gdata ggplot2 ggridges gplots gridExtra Hmisc ica igraph irlba lars MASS Matrix metap mixtools pbapply plotly ranger RColorBrewer Rcpp RcppEigen RcppProgress reshape2 ROCR Rtsne SDMTools stringr tclust tidyr tsne VGAM]; };
+  SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; };
+  Seurat = derive2 { name="Seurat"; version="2.3.0"; sha256="0kp3lw1s896zkjd6x2wp8qcg7wnm5b40g8vihps13f1m7j4nx7r0"; depends=[ape caret cluster cowplot diffusionMap doSNOW dplyr dtw fitdistrplus FNN foreach fpc gdata ggplot2 ggridges gplots gridExtra Hmisc ica igraph irlba lars lmtest MASS Matrix metap mixtools pbapply plotly png ranger RANN RColorBrewer Rcpp RcppEigen RcppProgress reshape2 ROCR Rtsne SDMTools stringr tclust tidyr tsne VGAM]; };
   ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; };
   ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; };
   ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; };
@@ -3506,7 +3566,7 @@ in with self; {
   ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; };
   ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.2.6"; sha256="126rvy7pra60fz7pmc6n9liahhwrq313gbqrkvcpcwdv807l39c8"; depends=[corrplot CTT data_table deltaPlotR difNLR difR DT ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyjs stringr WrightMap xtable]; };
   ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; };
-  ShortForm = derive2 { name="ShortForm"; version="0.3.0"; sha256="03yxn535yv11l5ckw26jd0maf2k0xpvichid5vwn0vb1f6ryk1xn"; depends=[lavaan MplusAutomation]; };
+  ShortForm = derive2 { name="ShortForm"; version="0.4.0"; sha256="0fvv42n2dsl4602scad74w11vj1id9dzsj5szv7xnbgv8lzaawjm"; depends=[lavaan MplusAutomation]; };
   ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.2.0"; sha256="1ybd8vm69y50lj2mkmcdyplxb689xfg4spbl129v8hlvhw69mzmy"; depends=[]; };
   SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; };
   SiMRiv = derive2 { name="SiMRiv"; version="1.0.3"; sha256="1kzvbzmqcxs0sh23nmjd39zkg68kbnc5djpbjhqhn55qjdfx5776"; depends=[mco raster rgdal sp]; };
@@ -3529,9 +3589,11 @@ in with self; {
   SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; };
   SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.1.0"; sha256="1krdz4gxnqxj3wabc5hn7ayfqdfmpgg66zj09b3jnngcdaxkjlwb"; depends=[dplyr kinship2]; };
   SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; };
+  SimRepeat = derive2 { name="SimRepeat"; version="0.1.0"; sha256="1vq82wlnas0jkl8hlj7dnnbn4y1a56lmszs4w7wya7acri92gkqm"; depends=[BB ggplot2 MASS Matrix nleqslv SimCorrMix SimMultiCorrData triangle VGAM]; };
   SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; };
   SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; };
   SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; };
+  SimilaR = derive2 { name="SimilaR"; version="1.0.1"; sha256="1icm34g15c616q5ckf1d664kk6fchjbn4mw2d0bjshqsvlvn89ji"; depends=[BH Rcpp stringi]; };
   SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; };
   Simile = derive2 { name="Simile"; version="1.3.3"; sha256="1izyjp18m1inac3svkf59z3lddrv44m7pdkhisgkr987xs8gdch4"; depends=[]; };
   SimpleTable = derive2 { name="SimpleTable"; version="0.1-2"; sha256="1rkybrp7zlb7cj37799npss1ldic0yf519q5l7a6ikal4yl1afyb"; depends=[hdrcde locfit MCMCpack]; };
@@ -3540,7 +3602,7 @@ in with self; {
   SimuChemPC = derive2 { name="SimuChemPC"; version="1.3"; sha256="06sxknaykikcgbw7qbbw1risg0sbaisb68vhfd7cl6sg0327dznk"; depends=[rcdk]; };
   SimultAnR = derive2 { name="SimultAnR"; version="1.1"; sha256="0jvmxwmbnx14h27b576dg9mw3c2z0w3m82f51f25zd1darcl06bj"; depends=[]; };
   SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; };
-  SixSigma = derive2 { name="SixSigma"; version="0.9-51"; sha256="0101zdz2dqlazg7k8li762g58z0xds76s8nzjjfb3y2j5nqkbjga"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
+  SixSigma = derive2 { name="SixSigma"; version="0.9-52"; sha256="07s4an2az2pgqhq9c08jrf6b95nrs1b3r1092d53n1ps8wbdmbln"; depends=[e1071 ggplot2 lattice nortest qcc reshape2 scales testthat xtable]; };
   SizeEstimation = derive2 { name="SizeEstimation"; version="1.1.1"; sha256="1rz57y76hzp880511kzm7nhxf201n0dr7ccip6slrjz784dl7s27"; depends=[MCMCpack msm]; };
   SkewHyperbolic = derive2 { name="SkewHyperbolic"; version="0.3-2"; sha256="10vilra5z884xinqkvk7ryi4nsq5zxlyn5qh23lsajba3b3qwhaw"; depends=[DistributionUtils GeneralizedHyperbolic RUnit]; };
   Skillings_Mack = derive2 { name="Skillings.Mack"; version="1.10"; sha256="0zxqiw87avw2rb2acj7mvpyfkf7iwnkshg73ib74y5ml9awmg2mw"; depends=[MASS matrixcalc]; };
@@ -3548,6 +3610,7 @@ in with self; {
   SkyWatchr = derive2 { name="SkyWatchr"; version="0.8-2"; sha256="0if44d79j2hlxdccn3jd7lrfbhrr09rfhfgds132syxprwkcb2mr"; depends=[htmlTable httr sp]; };
   Sleuth2 = derive2 { name="Sleuth2"; version="2.0-4"; sha256="18mh1svmb96hw3rjmgxlwzs7kdcvjkxf4zm8k4w0sxz94ks062i7"; depends=[]; };
   Sleuth3 = derive2 { name="Sleuth3"; version="1.0-2"; sha256="0b4g7j8a204wyvh0q9n1l4zrl9rk7ibyfijd49mjjdyg9zz4kbna"; depends=[]; };
+  SmartEDA = derive2 { name="SmartEDA"; version="0.1.0"; sha256="1wxj71fa91q2nxnl8l5iikgw6bqwphp8ymcnqisll1kp1w5f2g22"; depends=[ggplot2 gridExtra ISLR rmarkdown scales]; };
   SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; };
   SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; };
   SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; };
@@ -3556,6 +3619,7 @@ in with self; {
   SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; };
   SmoothWin = derive2 { name="SmoothWin"; version="1.0.0"; sha256="19yd3gnanv8q8ab0x8ds61rznm5w71dri0liknylikiqgbqwxrcn"; depends=[msgps]; };
   SnakeCharmR = derive2 { name="SnakeCharmR"; version="1.0.7"; sha256="1i8g0p51mp0j46434zzhmijwwk1v6my7rdw8j41ac3b4as3g0c73"; depends=[jsonlite Rcpp stringr]; };
+  SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; };
   SnowballC = derive2 { name="SnowballC"; version="0.5.1"; sha256="0kbg33hy6m2hv9jspyx6naqmk2q6h2zmvvczjmkwqvlhzlj0c5s4"; depends=[]; };
   SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; };
   SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; };
@@ -3589,7 +3653,7 @@ in with self; {
   SparseM = derive2 { name="SparseM"; version="1.77"; sha256="0p6ljma2h12cq1xmy0cxb48ih8dhxxbnwkqzvx3cckxf2kprycm9"; depends=[]; };
   SparseTSCGM = derive2 { name="SparseTSCGM"; version="2.5"; sha256="004hbk5fdd5b5hdvg25wl1908pfya26brm2pz00zypfvis99lps3"; depends=[abind flare glasso longitudinal MASS mvtnorm network QUIC]; };
   SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; };
-  SpatMCA = derive2 { name="SpatMCA"; version="1.0.0.2"; sha256="1xm29ybbdxspj2ylkkd9qh17sizz1gkc3l34y3d0ivmxz64vn6pj"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; };
+  SpatMCA = derive2 { name="SpatMCA"; version="1.0.1.0"; sha256="1sjrm1md4lmhyq1yw3np4llkgdskw3mk667jr0k3isjmr6z88gxa"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; };
   SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.0"; sha256="12b9ijbzzkhwrs7q0z5srawiskr3gdjvgdsrmsn4dhyqdzdbi8b6"; depends=[Rcpp RcppArmadillo RcppParallel]; };
   SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-2"; sha256="1nyxxwvlnhz78pw31dqijp1crlar5nak5934s4h0a4sajv9syif2"; depends=[]; };
   SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; };
@@ -3598,7 +3662,7 @@ in with self; {
   SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-6"; sha256="14clsb7w7p39ak00127lfa7irl67vqydvafkj8vs8qn9i3kaj6iz"; depends=[fields maps]; };
   SpatialFloor = derive2 { name="SpatialFloor"; version="1.0.3"; sha256="14nbl0kb4c46kxvw900d972n78x6q0y9039l6p4r9w2i9ir7g1yh"; depends=[fields reshape2]; };
   SpatialNP = derive2 { name="SpatialNP"; version="1.1-2"; sha256="048zzyy3hav8qg0zad2fsv5z1avdppwwdcv0rc6j635wzhdmsl1j"; depends=[]; };
-  SpatialPack = derive2 { name="SpatialPack"; version="0.2-3"; sha256="1gs0x3wj3hj663m6kszwhy3ibcx0lrslr127miy1rhz8683ij71c"; depends=[]; };
+  SpatialPack = derive2 { name="SpatialPack"; version="0.3"; sha256="12mx62drwqx351x4jfvv87rxr28ggz7iw83firkzr5xwfwfgr02c"; depends=[]; };
   SpatialPosition = derive2 { name="SpatialPosition"; version="1.2.0"; sha256="140fg3bjj7383nrdbgnk9lccj4yjq65rkprqpmf4q0mwbc89mmqc"; depends=[raster rgdal rgeos sp]; };
   SpatialTools = derive2 { name="SpatialTools"; version="1.0.2"; sha256="0n8l4k0dm9gwirhxwrajv5gx502px9qzlqi6skzx0k32hmymnazh"; depends=[Rcpp RcppArmadillo spBayes]; };
   SpatialVx = derive2 { name="SpatialVx"; version="0.6-2"; sha256="12kwwhxlvlkss1rg9ipaw97l5kw50m7crpcpv1y420sf14873j7r"; depends=[boot CircStats distillery fastcluster fields maps smatr smoothie spatstat turboEM waveslim]; };
@@ -3612,7 +3676,7 @@ in with self; {
   SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; };
   SqlRender = derive2 { name="SqlRender"; version="1.4.8"; sha256="08q9h6aca7vzgy1ipvghvrspdvmzlgmvhjgibcn38lfyl09xyfas"; depends=[rJava]; };
   StAMPP = derive2 { name="StAMPP"; version="1.5.1"; sha256="0yyssscx3l4csban66gb4q35h37gf7pqvvycfsy56n96pnnlrgkf"; depends=[adegenet doParallel foreach pegas]; };
-  StMoMo = derive2 { name="StMoMo"; version="0.4.0"; sha256="0zkcp19a76dm29fba5r96dxly709sic2k5p9hzc70cvwjhwhfr7v"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; };
+  StMoMo = derive2 { name="StMoMo"; version="0.4.1"; sha256="1c4v2gjipq1y4crc6bqvz2x5c02bl10mh9jacg8dqb2dffsh5y44"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; };
   StMoSim = derive2 { name="StMoSim"; version="3.0"; sha256="18mdgpn0x6338zzvc7nwccz6ypqmlpv7pzcy5fwx5y2wfkmdp4rm"; depends=[Rcpp RcppParallel]; };
   StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; };
   StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; };
@@ -3622,7 +3686,7 @@ in with self; {
   StanHeaders = derive2 { name="StanHeaders"; version="2.17.2"; sha256="11fcc59z63rkgk6pp5vhb5avjlbhbjs2v5mn496ai9jms4223ivc"; depends=[]; };
   StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; };
   Stat2Data = derive2 { name="Stat2Data"; version="1.6"; sha256="0pk68ffc6ffpddfpf9wi8ch39h6k3r80kldld3z5pnql18rc8nvx"; depends=[]; };
-  StatCharrms = derive2 { name="StatCharrms"; version="0.90.7"; sha256="082pwqn08b9ij0vmc68sf43fin2hp16mlpi3d0i9ynpda9v22nr8"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
+  StatCharrms = derive2 { name="StatCharrms"; version="0.90.9"; sha256="1r11zzfzhps234nzkpxw0qw0phjcdww8dkh2l6z6qkvc4495x0zh"; depends=[cairoDevice car clinfun coxme gWidgets gWidgetsRGtk2 lattice multcomp nlme R2HTML RGtk2 RSCABS survival]; };
   StatDA = derive2 { name="StatDA"; version="1.6.9"; sha256="01bjygis14b3yfsfkjbvy0zlhjxysjf46cfcw8p4a4lwik3qp03b"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat xtable]; };
   StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; };
   StatMatch = derive2 { name="StatMatch"; version="1.2.5"; sha256="1162yqqrxkbpchdxdibpk5ccv55krvh9j150jgr047zzghr9ansa"; depends=[clue lpSolve proxy RANN survey]; };
@@ -3650,7 +3714,7 @@ in with self; {
   StructFDR = derive2 { name="StructFDR"; version="1.2"; sha256="00h3mx7kf01snngkcarhyidqiycvnjhcs81x3kprgp6597md7ph1"; depends=[ape cluster dirmult matrixStats nlme]; };
   SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; };
   SubLasso = derive2 { name="SubLasso"; version="1.0"; sha256="12m7ynlqhikjhavd12bhsd04s9cpv8aq5xgm875i10mb3ldpd1bd"; depends=[glmnet gplots psych]; };
-  SubTite = derive2 { name="SubTite"; version="2.0.1"; sha256="1wmsks2dn3lv2m818g57115aqi821bs6ik94hx75knkfvw1835ys"; depends=[Rcpp RcppArmadillo]; };
+  SubTite = derive2 { name="SubTite"; version="2.0.3"; sha256="1i95f3x1nkhx9kqzxwvi15x6yq7mcdihzjxh60la6jvq5nscfi3l"; depends=[Rcpp RcppArmadillo]; };
   SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; };
   SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; };
   SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; };
@@ -3660,9 +3724,10 @@ in with self; {
   SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; };
   SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.0"; sha256="184s0pnwv9irqjlv24svfz3ami559ln03wjknyj67pwi4pfbzz87"; depends=[]; };
   SuperGauss = derive2 { name="SuperGauss"; version="1.0"; sha256="1yqskaz4zsx87mcb9p7081h2lilaiwa3213yxlkyihyans7gnmp8"; depends=[fftw Rcpp RcppEigen]; };
-  SuperLearner = derive2 { name="SuperLearner"; version="2.0-22"; sha256="1yajqqsxfrp9ybaa8ffwdrbwm3rfy5pgp6ma1ak43qg3plclllyr"; depends=[cvAUC nnls]; };
+  SuperLearner = derive2 { name="SuperLearner"; version="2.0-23"; sha256="04bsgxdczw5gr8mkyxgzrsawv2zfcab5jd85azac3m2n08402v44"; depends=[cvAUC nnls]; };
   SuperRanker = derive2 { name="SuperRanker"; version="1.1.0"; sha256="19cfz89557ygf5dvvqykmxcr72sfa0s2d37pplp6iwbhkl4wfw04"; depends=[prodlim Rcpp]; };
   SuppDists = derive2 { name="SuppDists"; version="1.1-9.4"; sha256="1ffx8wigqqvz2pnh06jjc0fnf4vq9z2rhwk2y3f9aszn18ap3dgw"; depends=[]; };
+  SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="0.1.0"; sha256="0cw2nsqc9dx36svb49pqkmrxwk5hhbih206mwwkzfyavswxd2lpv"; depends=[gstat gtools raster rgdal rgeos sp]; };
   Surrogate = derive2 { name="Surrogate"; version="0.6"; sha256="18cqcnzf64wk33qshsamija0r9xpnca0w2a8qz1ikj9r21vabhhw"; depends=[lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms survival]; };
   SurrogateTest = derive2 { name="SurrogateTest"; version="1.0"; sha256="0dw8ic2rskwhj9f013q0j5my7qfsqihfis93frrlz4qag68jddqn"; depends=[survival]; };
   SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; };
@@ -3672,19 +3737,19 @@ in with self; {
   SurvRegCensCov = derive2 { name="SurvRegCensCov"; version="1.4"; sha256="0ipr7lajnrklk963lrlgx946l6r191q3bfif4njkdmw0x797nzm2"; depends=[numDeriv survival]; };
   Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; };
   SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; };
-  SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-2"; sha256="1997nbczgf5xkvj257fa211wxl85lq4jpybjl2q4hajn05ahq7yp"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; };
+  SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-4"; sha256="1b0h1jfywsrfdj8dkbnlzvh7654rycagxij9jbzb65g6swss6ajx"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; };
   SweaveListingUtils = derive2 { name="SweaveListingUtils"; version="0.7.7"; sha256="04yxhphf069y29b40i34kr4hvlcv8kgr6kqc2vdz2a40564fdsjb"; depends=[startupmsg]; };
   SwissAir = derive2 { name="SwissAir"; version="1.1.4"; sha256="1avc32q7nbwjkcbml7z05car6khv1ghcz3miw0krm8i53w032c6f"; depends=[]; };
   SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; };
   SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; };
-  SympluR = derive2 { name="SympluR"; version="0.1.0"; sha256="11ni1x2k24b8g62gga0wvfxhjjf0pm4bir8sjspk97sii4l19037"; depends=[httr jsonlite plyr]; };
+  SympluR = derive2 { name="SympluR"; version="0.3.0"; sha256="0a3irbk5bh3af8rv4l4sh3ymj3icyqjv5akzmx6rrp6pr3mgq6c6"; depends=[httr jsonlite plyr readr]; };
   SyncMove = derive2 { name="SyncMove"; version="0.1-0"; sha256="1jlnsj5v8y5pijfkww7ng7nkwvj93naw29wcxxj130ww5qk7qk1z"; depends=[]; };
   SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; };
   SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; };
   SynergizeR = derive2 { name="SynergizeR"; version="0.2"; sha256="0z32ylrjjvp8kr6lghhg57yq1laf9r0h8l3adysvis8bbpz2q2sj"; depends=[RCurl RJSONIO]; };
   Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; };
   T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; };
-  TAM = derive2 { name="TAM"; version="2.9-35"; sha256="0n49g642xn3c82843l03rhksjbdq81bibj084aihw1nnby1l67k4"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
+  TAM = derive2 { name="TAM"; version="2.10-24"; sha256="1ax7b7q4slwcjamapbmnaaahrwdhrcbasjjgycdk5d7gzrzyygnx"; depends=[CDM coda MASS mvtnorm Rcpp RcppArmadillo sfsmisc]; };
   TANDEM = derive2 { name="TANDEM"; version="1.0.2"; sha256="1h6m6aq2b5m9gdy4nck4dxv75gv50pfdhxx8xifgyv0d7n8czabq"; depends=[glmnet Matrix]; };
   TANOVA = derive2 { name="TANOVA"; version="1.0.0"; sha256="0c2mrahchwagisrkjl5l1s0mv0ny80kngq8dz0fjj9lwxwqwvwa5"; depends=[MASS]; };
   TAQMNGR = derive2 { name="TAQMNGR"; version="2016.12-1"; sha256="1b3v30zi6ssac866grhgki2bpzbk06pd8vrfya3zcc5anry699bm"; depends=[Rcpp]; };
@@ -3695,7 +3760,6 @@ in with self; {
   TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; };
   TCGAretriever = derive2 { name="TCGAretriever"; version="1.3"; sha256="0mi8j7k2b1sx75ka8ympydqpk8jqp8wz8dyf4vk4776fra7bq24p"; depends=[httr]; };
   TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.2"; sha256="1fgjmz297jckdb0xsly1scq5n8y8awfgdkr4yfml4lim2mkdsigx"; depends=[httr jsonlite]; };
-  TDA = derive2 { name="TDA"; version="1.6"; sha256="1i0jgj72rpxn7icgl5f43c7lyq4jghmz4r9jn7bxa5kbavc8asy3"; depends=[BH FNN igraph Rcpp RcppEigen scales]; };
   TDAmapper = derive2 { name="TDAmapper"; version="1.0"; sha256="0cxgr2888v8azgdr3sg4vlcdyivkrxkk6dsp1ahv4frrwvg2z09k"; depends=[]; };
   TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; };
   TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; };
@@ -3712,7 +3776,7 @@ in with self; {
   TFDEA = derive2 { name="TFDEA"; version="0.9.8.3"; sha256="0qg4nhlqqj7hc8lg732zz8klbbp3yksnq8q8n4ml3jz8gadrpyj7"; depends=[lpSolveAPI]; };
   TFMPvalue = derive2 { name="TFMPvalue"; version="0.0.6"; sha256="1892jmgqywm0jp5l5k88brp4h8szkbi9bxi0v1jni1929qnsmqyf"; depends=[Rcpp]; };
   TFX = derive2 { name="TFX"; version="0.1.0"; sha256="0xrjdbvg0ng4i0s8ql1pfyma10x4n045spilkb05750677r5j44p"; depends=[XML]; };
-  TFisher = derive2 { name="TFisher"; version="0.1.0"; sha256="1fvqgy9djhcyrnvvbb3r4p7p3206qsm6yrnv444x48gmadl3mfym"; depends=[mvtnorm sn]; };
+  TFisher = derive2 { name="TFisher"; version="0.2.0"; sha256="0vz74ww1lf1prfwz74hfsi3a8nzq8ss7aqjr85c1d87vss2796xx"; depends=[Matrix mvtnorm sn]; };
   TH_data = derive2 { name="TH.data"; version="1.0-8"; sha256="17csnwyk2f3d47nghkfy9wly5kff8zhdcfwfml7509hjrjgi13s7"; depends=[MASS survival]; };
   TIMP = derive2 { name="TIMP"; version="1.13.0"; sha256="0b6g2afwjz2m7bnfhx1pjmq6x1ghjxgrwi6hz1l867qa4i2yx5hx"; depends=[colorspace deSolve fields gclus gplots minpack_lm nnls]; };
   TITAN2 = derive2 { name="TITAN2"; version="2.1"; sha256="0cxcgkf776411ln5wbfdyjxa42jw473vcq1kns6k6p8dpm1y91c2"; depends=[]; };
@@ -3721,12 +3785,12 @@ in with self; {
   TLBC = derive2 { name="TLBC"; version="1.0"; sha256="08w187akbhfbz6nrrf7avf02lrhgj7bbrjmim9gkh4wlbjhzvw67"; depends=[caret HMM randomForest signal stringr]; };
   TLMoments = derive2 { name="TLMoments"; version="0.7.2.1"; sha256="1xgkbdnh79dj54jg5kf0c5kwykcvjaf4y16yyqf0vcc7aand6a3y"; depends=[hypergeo Rcpp]; };
   TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; };
-  TMB = derive2 { name="TMB"; version="1.7.12"; sha256="06gky76x5bc95l22ygnnamgdym7ysnqg42fa213ic9ws2rjv40ni"; depends=[Matrix RcppEigen]; };
+  TMB = derive2 { name="TMB"; version="1.7.13"; sha256="1cbm8vgjfd00678h011jzf0zjkvbv427nkp0924g2xmiai6c15xc"; depends=[Matrix RcppEigen]; };
   TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; };
   TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; };
   TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; };
-  TOSTER = derive2 { name="TOSTER"; version="0.3"; sha256="0yjvxb2a2vx1zjg8sqsbz5p1qpnv6kbxrnkz76m08s3hn6ql4jpx"; depends=[ggplot2 jmvcore R6]; };
-  TP_idm = derive2 { name="TP.idm"; version="1.3"; sha256="1j1s48342kg2lvydfy0250lyyzchj9qr6qi7d4rwy5xpvx8sy2b0"; depends=[]; };
+  TOSTER = derive2 { name="TOSTER"; version="0.3.2"; sha256="1sfb01cvm9h3gd2x3bs8014czlgbnnwl5gy4frknz3b9qyazi2cy"; depends=[ggplot2 jmvcore R6]; };
+  TP_idm = derive2 { name="TP.idm"; version="1.5"; sha256="07rxn0mpar3p6blg8fd3kbvdngyz9h9n0r0lcljnfdajfzbysv7h"; depends=[]; };
   TPD = derive2 { name="TPD"; version="0.1.2"; sha256="1h8lgcrlsk68x2y01vgcn7dpq5q5180khz4csr8jbscbcdwljcl9"; depends=[ggplot2 gridExtra ks mvtnorm]; };
   TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; };
   TPmsm = derive2 { name="TPmsm"; version="1.2.1"; sha256="1vynzb6qpp8785rdjyarhvwbkasviamhljjlnp4i0dds96wwdgx1"; depends=[KernSmooth]; };
@@ -3772,6 +3836,7 @@ in with self; {
   TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; };
   TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; };
   TUWmodel = derive2 { name="TUWmodel"; version="0.1-8"; sha256="0c00jd2bq4i5fd55hj7l2grkpn990p0kmhbsh95b2zrzhbwgcjp6"; depends=[]; };
+  TVsMiss = derive2 { name="TVsMiss"; version="0.1.1"; sha256="1lvswq3syp2mfcf0higmyg5k5qhg1q6jaz8g75az3xajn4jylm0k"; depends=[glmnet Rcpp]; };
   Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; };
   TableMonster = derive2 { name="TableMonster"; version="1.2"; sha256="1cl70d0svzx8nsg6kw5dv50s9d6wxqkyg39d2d4vissbpilq6arn"; depends=[xtable]; };
   TableToLongForm = derive2 { name="TableToLongForm"; version="1.3.1"; sha256="135q0bgsm2yndrg3vpwmihbqlyf3qkm97i0jvcw6bf06p6b2fk41"; depends=[]; };
@@ -3785,7 +3850,7 @@ in with self; {
   Taxonstand = derive2 { name="Taxonstand"; version="2.1"; sha256="0dvhiqggbv1by284fg38rcvvrxr9q3zp5gh51p1dh0129h73qj7i"; depends=[pbapply]; };
   TcGSA = derive2 { name="TcGSA"; version="0.10.5"; sha256="14gnlk2r0q9zjc3431v97s7ydcyycvl0xh8bmz08mhzi20snrkpq"; depends=[cluster ggplot2 gplots GSA gtools lme4 multtest reshape2 stringr]; };
   Tcomp = derive2 { name="Tcomp"; version="1.0.0"; sha256="0ddswvww9yk31gh8qb9nh0glf9w2mp3ny7zps79kdcnvbkrpcbfs"; depends=[forecast Mcomp]; };
-  TeXCheckR = derive2 { name="TeXCheckR"; version="0.4.4"; sha256="1dbs9i5py9amnx8l6z74py12v52d1b0wl0azcwqsgd8n76xlfqg1"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr readr rstudioapi stringi zoo]; };
+  TeXCheckR = derive2 { name="TeXCheckR"; version="0.5.1"; sha256="18p3hyrrglgn2fdn5q9p1ayb58nznpdr5sy9mniybzsxrmfhghax"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; };
   TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; };
   TeachNet = derive2 { name="TeachNet"; version="0.7"; sha256="1p39bsf846r7zwz4lrrv2bpyx9yrkqzrnacajwrz3jjqj6qpp6cn"; depends=[]; };
   TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; };
@@ -3804,6 +3869,7 @@ in with self; {
   ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-0"; sha256="075cn99k06lgdd0cwl1i9242fcxwmd5malcyks0mmwjf9kzw00z2"; depends=[MASS numDeriv]; };
   ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; };
   ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; };
+  Thresher = derive2 { name="Thresher"; version="0.12.3"; sha256="1lrydxrv67ga73bzxyvnibmggr9kixq2jb6as4cv35rm93vs5mrg"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; };
   ThresholdROC = derive2 { name="ThresholdROC"; version="2.6"; sha256="0ah102z6v9k5pxp3kbj5ffa9vhb7vi7axjkrg5qy5b4spnb71qsg"; depends=[MASS numDeriv pROC]; };
   TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; };
   TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; };
@@ -3815,13 +3881,13 @@ in with self; {
   TimeMachine = derive2 { name="TimeMachine"; version="1.2"; sha256="1dz0j777wmd8mpkm2ryiahpcw6w88w429zjcw6m67pi20r1992cb"; depends=[]; };
   TimeProjection = derive2 { name="TimeProjection"; version="0.2.0"; sha256="04yr4cg2khkw9n3y3qk0ni1327k4pxm09zz2xg8mpjdvgi4p9yi3"; depends=[lubridate Matrix timeDate]; };
   TimeSeries_OBeu = derive2 { name="TimeSeries.OBeu"; version="1.2.2"; sha256="1a44fb29yacwgdiwaf5fpxzc5222cpi5mkv7l0dh43b6lh8f0j5k"; depends=[forecast jsonlite locfit trend tseries]; };
-  TimeVTree = derive2 { name="TimeVTree"; version="0.2.1"; sha256="0657y6s4w83yda36q1isr3zwd8vv9wminljdpivs8c89p0cwm3yb"; depends=[survival]; };
+  TimeVTree = derive2 { name="TimeVTree"; version="0.3.1"; sha256="124kg9zcq4b2j4qvg9f6gykbmzf69qjnnw54nv213ip2h4rdkv32"; depends=[survival]; };
   TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; };
   Tinflex = derive2 { name="Tinflex"; version="1.2"; sha256="0rx4aj0bxiaaap3f43jzf3rlmrjp0g8aplg1ybccdyahx4p727bn"; depends=[]; };
-  TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-7"; sha256="1lc63xghjny45nkrppf06lxvhbqnw9w5i06bmncm90hm0kam092b"; depends=[DescTools mclust TeachingDemos]; };
+  TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.0-8"; sha256="1yx4jyh3a5s4h8anvd6pc73fzzcfdll4kp89b2xi0i01yswx22pd"; depends=[DescTools mclust TeachingDemos]; };
   TippingPoint = derive2 { name="TippingPoint"; version="1.1.0"; sha256="1f5bfag892yk47r1pw2rlvqz9qnkaz8radprpxh0q0knviw3f9fp"; depends=[bayesSurv ggplot2 RColorBrewer reshape2]; };
   Tlasso = derive2 { name="Tlasso"; version="1.0.1"; sha256="0flx4l7q3qndp77349ayfrszyim7mvs7yfvv3j9a1mhf3gdn9j14"; depends=[expm huge igraph rTensor]; };
-  Tmisc = derive2 { name="Tmisc"; version="0.1.17"; sha256="11i807ma7mhx9ba675ifs42b5gr2dgr2z2zx35ga0jav464n9vk0"; depends=[audio dplyr rstudioapi tibble]; };
+  Tmisc = derive2 { name="Tmisc"; version="0.1.19"; sha256="148kgy1pgn03f9h72i0zg62lamdnjl1hbwkzgrnr8p0zw5i0v1xm"; depends=[dplyr rstudioapi tibble]; };
   Tnseq = derive2 { name="Tnseq"; version="0.1.2"; sha256="1n76yzk15p8i5bp3k6fszmdqk2d791r4sb8hg5hb61zb92r7wqlj"; depends=[Biobase Ckmeans_1d_dp DESeq edgeR limma]; };
   ToolsForCoDa = derive2 { name="ToolsForCoDa"; version="1.0.2"; sha256="0x05phwm6gqw1pmars1ypg86sggflffw9g2d0lc5gfsy93nrg0rv"; depends=[calibrate HardyWeinberg MASS]; };
   TopKLists = derive2 { name="TopKLists"; version="1.0.6"; sha256="1hmm9g68scq8sqdb9axqn51p00mx6p6lw0fdgjljfi2q72xcqhq3"; depends=[gplots Hmisc]; };
@@ -3839,7 +3905,7 @@ in with self; {
   TreatmentSelection = derive2 { name="TreatmentSelection"; version="2.1.1"; sha256="1pw64hx697jg2f1r2zd8y98g3ivj2gm8fnixcjfn4drsd0xixb4p"; depends=[binom ggplot2 survival]; };
   TreeBUGS = derive2 { name="TreeBUGS"; version="1.3.1"; sha256="0zwbp7z31hw6krwhf21wpy5ryfhf0hhipjrsmvbrb7d4sx9am2vb"; depends=[coda hypergeo logspline MASS Rcpp RcppArmadillo rjags runjags]; };
   TreePar = derive2 { name="TreePar"; version="3.3"; sha256="1sm518b1b4b1p0n5979qzvi2nacxpp3znbg9n75pf2a8z8wy6p4l"; depends=[ape deSolve Matrix subplex TreeSim]; };
-  TreeSearch = derive2 { name="TreeSearch"; version="0.0.8"; sha256="1w65pw2qj5jcpg2v41kyhp0zq7pr56rxw1vrshxcpwxlwjj1sii6"; depends=[ape memoise phangorn R_cache Rdpack]; };
+  TreeSearch = derive2 { name="TreeSearch"; version="0.1.2"; sha256="0q25zw53whp1v57pkc50h2j7jb64jpip00s0qnmvdgncbrs4zhx5"; depends=[ape memoise phangorn R_cache Rdpack]; };
   TreeSim = derive2 { name="TreeSim"; version="2.3"; sha256="1y98m2whpx9kssgklw2d6prs6af9vcn8yva1l7lm1l509py1fn6h"; depends=[ape geiger]; };
   TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; };
   TrendInTrend = derive2 { name="TrendInTrend"; version="1.0.2"; sha256="0ymlgalddnfnb55s31bysm68yh823ys0rr5fgiic4a2ipnbfd8qf"; depends=[pROC rms]; };
@@ -3857,6 +3923,7 @@ in with self; {
   TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; };
   TwoCop = derive2 { name="TwoCop"; version="1.0"; sha256="1ycxq8vbp68z82r2dfg2wkc9zk3bn33d94xay20g2p55lnzl2ifd"; depends=[]; };
   TwoPhaseInd = derive2 { name="TwoPhaseInd"; version="1.1.1"; sha256="0xsqiq4x7vmhif9j8zi1smbchwm4fsbgb10i4vxi0biijybizk9z"; depends=[survival]; };
+  TwoRegression = derive2 { name="TwoRegression"; version="0.1.2"; sha256="0qr9zrfmbh4c4207gvwa384q5njjx6nsl6lc58d25m8bkfalifpi"; depends=[data_table dplyr magrittr seewave]; };
   TwoStepCLogit = derive2 { name="TwoStepCLogit"; version="1.2.5"; sha256="050y7na91izg36gkwd8yn8rx3r39dk6qlvhd3137f3jnk4v00bck"; depends=[survival]; };
   UBCRM = derive2 { name="UBCRM"; version="1.0.1"; sha256="1h9f8wlxdgb67qqqnfhd9gfs4l2cq84vajhcb0psva0gwdd1yf6i"; depends=[]; };
   UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; };
@@ -3864,7 +3931,7 @@ in with self; {
   UNCLES = derive2 { name="UNCLES"; version="2.0"; sha256="0c61sm09dh0yfrjrjjnizg7qrf8xgc1zdldwhjh64kq8k8g5wa69"; depends=[class kohonen pdist]; };
   UNF = derive2 { name="UNF"; version="2.0.6"; sha256="0sr740dhfp7z9wvhajww43g5gz79x5y5dbflw5a813jgmiqm1jyq"; depends=[base64enc digest]; };
   UPMASK = derive2 { name="UPMASK"; version="1.1"; sha256="1qxajvld8g2mii12agypcm50fps9bai6d2wx6l0bv3srk80in7ai"; depends=[DBI MASS RSQLite]; };
-  USAboundaries = derive2 { name="USAboundaries"; version="0.3.0"; sha256="0rza1np6320xm9ppn458cwgz4zaq173m3g0ylvxbx1fxq716lqj6"; depends=[]; };
+  USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; };
   USCF = derive2 { name="USCF"; version="0.1.3"; sha256="00ynxfd4lg8g4mspz5izxvgkj27l2i1cnp0z0dnkhsbxsg0161mj"; depends=[]; };
   USGSstates2k = derive2 { name="USGSstates2k"; version="1.0.1"; sha256="11yk0pkss23j6fmmxnjkjm9p24ln343y4hijigbrbvcnb21wj2py"; depends=[sp]; };
   UScancer = derive2 { name="UScancer"; version="0.1-2"; sha256="0p1kxw1phqq598ljk3njznc9kmgscc8gmwdrvx1scba9rr6n61kl"; depends=[rgdal]; };
@@ -3878,8 +3945,8 @@ in with self; {
   Umatrix = derive2 { name="Umatrix"; version="3.1"; sha256="131j7yrb0yzffl6gvirdj29zmsbwg8163i15gg9f0clfcrl1kcx6"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png Rcpp reshape2 shiny shinyjs]; };
   Umpire = derive2 { name="Umpire"; version="1.3.4"; sha256="0kxndg96ah6sk1m216f2dmkg73w10lyg3rv7qsrnn145mznsdlw1"; depends=[]; };
   UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; };
-  UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.6"; sha256="17xirpichh4c9qajkz4xywd8881wqdni6d3pqvsy2h13fvidb83q"; depends=[nloptr reshape2 rootSolve]; };
-  UniDOE = derive2 { name="UniDOE"; version="1.0.1"; sha256="1hjraksvxvxz4xbrq97x6xf3r0f90c484ix92zapylyxvkifx628"; depends=[Rcpp]; };
+  UncertainInterval = derive2 { name="UncertainInterval"; version="0.4.7"; sha256="0b7mx919lbj12zrj8l01wfrdpqiq7s7p9q25alp7yf4jpv9w4vfa"; depends=[nloptr reshape2 rootSolve]; };
+  UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; };
   UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; };
   Unicode = derive2 { name="Unicode"; version="10.0.0-1"; sha256="1kj4b29gj3p0wzlzxqn7lwzabair6np705va0nxissfybpmwalgk"; depends=[]; };
   UnivRNG = derive2 { name="UnivRNG"; version="1.1"; sha256="0vjsqc1y24z7zlclglh55kkxjhy0dc5gjsy427zdv95j58jbxa66"; depends=[]; };
@@ -3887,7 +3954,7 @@ in with self; {
   UsingR = derive2 { name="UsingR"; version="2.0-5"; sha256="1w1swcb5srb2b76agbh3mipz8b3vbhpnhxfhg7k546y38j3crafq"; depends=[HistData Hmisc MASS]; };
   V8 = derive2 { name="V8"; version="1.5"; sha256="155389k8laa48akg0bfsz65s4ddmpk0xpi1ha56z1sayv01vrrgc"; depends=[curl jsonlite Rcpp]; };
   VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; };
-  VARSEDIG = derive2 { name="VARSEDIG"; version="1.5"; sha256="07zc1k3h9bh0vlqmxqgpniq8ccsfv99bp18h9x9gjl24dppc0xz7"; depends=[]; };
+  VARSEDIG = derive2 { name="VARSEDIG"; version="1.6"; sha256="1iddpll0fdspzxxf2g1d6zwfs0xrnbq5zrch2a9flrfz2iam6brk"; depends=[]; };
   VARsignR = derive2 { name="VARsignR"; version="0.1.3"; sha256="09mnf9hvsi4wx1c81yq97mzggwk6s7nka7awrws63icjybqjmra9"; depends=[HI minqa mvnfast]; };
   VARtests = derive2 { name="VARtests"; version="1.0.1"; sha256="19xmf4mg4v1fwd002ccinfbsbpcq9qfmzc2sf710mqv6i8ghv6jm"; depends=[Rcpp RcppArmadillo sn]; };
   VBLPCM = derive2 { name="VBLPCM"; version="2.4.4"; sha256="09b80313w2dljl009xzcfhdcl6flc8nqzw9pzgfbciwi61666ppb"; depends=[ergm mclust network sna]; };
@@ -3908,13 +3975,13 @@ in with self; {
   VNM = derive2 { name="VNM"; version="6.1"; sha256="195fcgs6rzpji250j5kikim4k2rfg1gqgz65f2vgfbmz76wi4za6"; depends=[Rcpp]; };
   VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; };
   VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; };
-  VSURF = derive2 { name="VSURF"; version="1.0.3"; sha256="0fgy1qk1jkrnil4cirkp2lj21xjwbpgjgxqrsjs321s69rw2dy1j"; depends=[doParallel foreach randomForest rpart]; };
+  VSURF = derive2 { name="VSURF"; version="1.0.4"; sha256="1sby2ls8yhxv4hx0y508pypsj1sbc0d269yl0xnqbxz44bhj8zzm"; depends=[doParallel foreach randomForest rpart]; };
   VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; };
-  VWPre = derive2 { name="VWPre"; version="1.0.1"; sha256="1q6i1ijw9sx5k9k1gpmhsm99hwgsj6kjkak3lnq7458563vd640m"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
+  VWPre = derive2 { name="VWPre"; version="1.1.0"; sha256="1ccrim9nx5fmmadg687gz9qrfkyxp48rskg1n2pxfwd3h10c9js1"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; };
   VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; };
   VarED = derive2 { name="VarED"; version="1.0.0"; sha256="16j9p2a143y4hqclsv1mig0fccrzjx2r0lll0wz8isjp9x1wzjv8"; depends=[]; };
   VarReg = derive2 { name="VarReg"; version="1.0.1"; sha256="00ygs9gk2719fnhb47z1pj7qacapzg9qs1li2206vsfrmqxjvj1a"; depends=[sn survival]; };
-  VarSelLCM = derive2 { name="VarSelLCM"; version="2.0.1"; sha256="08kpnppa5mm1xjbdgl354py9jy57x4r0nbv8z4skzc1k972qrgy9"; depends=[mgcv Rcpp RcppArmadillo]; };
+  VarSelLCM = derive2 { name="VarSelLCM"; version="2.1.1"; sha256="0yy07fj0jkrninpwgnkw4h25yvbnb9z8kc02056nyh21kpj59vkl"; depends=[ggplot2 mgcv Rcpp RcppArmadillo shiny]; };
   VarSwapPrice = derive2 { name="VarSwapPrice"; version="1.0"; sha256="12q2wp2cqi9q47mzbb7sc250zkjqkhs9z0h93ik0h63dv339abgj"; depends=[]; };
   VarfromPDB = derive2 { name="VarfromPDB"; version="2.2.7"; sha256="1sb31338r2p0jsa3k72q9lc5f57cybywmda7q2j8byngh1fjvgyz"; depends=[curl RISmed stringi stringr XML XML2R]; };
   VariableScreening = derive2 { name="VariableScreening"; version="0.1.1"; sha256="03l929qhgr1bd721488xx0il1hlswv3zdad518ki94ghq9c4nmg3"; depends=[expm gee MASS]; };
@@ -3923,7 +3990,7 @@ in with self; {
   Vdgraph = derive2 { name="Vdgraph"; version="2.2-2"; sha256="1q8l711zbrrj4h1wmpv93nbvlg8xi6kjv22zpidkck8ncpyyla80"; depends=[]; };
   VecStatGraphs2D = derive2 { name="VecStatGraphs2D"; version="1.8"; sha256="0jjxdwcj0n6kk5l7hw4zibpikqxhkkik5819qv75z4gqdgg0fgch"; depends=[MASS]; };
   VecStatGraphs3D = derive2 { name="VecStatGraphs3D"; version="1.6"; sha256="1pnpgnxdiis4kzwhh17k61aidyan5fp9rzqhvwf6gljb4csqsk54"; depends=[MASS misc3d rgl]; };
-  VennDiagram = derive2 { name="VennDiagram"; version="1.6.19"; sha256="0f0kw5rvxl6v39yhgrz819hk1j0xd48iz5wfl91qd1vjw1kg9fn2"; depends=[futile_logger]; };
+  VennDiagram = derive2 { name="VennDiagram"; version="1.6.20"; sha256="1ic1jaxzw98si2p4n1fl4n3myhd7fpw0njb634cwhviwybzv6775"; depends=[futile_logger]; };
   VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; };
   VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; };
   VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; };
@@ -3941,7 +4008,7 @@ in with self; {
   WARN = derive2 { name="WARN"; version="1.2-3"; sha256="0vkp70cc3slz9y8qfybrqyjyglsxz9fnqrid735h2a113h4xvr3v"; depends=[MASS]; };
   WCE = derive2 { name="WCE"; version="1.0"; sha256="1kb1z67ymnz8cgwxq6m5fpqgxmmrfiwh2q3x4rhanac2sinagyn4"; depends=[plyr survival]; };
   WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; };
-  WDI = derive2 { name="WDI"; version="2.4"; sha256="0ih6d9znq6b2prb4nvq5ypyjv1kpi1vylm3zvmkdjvx95z1qsinf"; depends=[RJSONIO]; };
+  WDI = derive2 { name="WDI"; version="2.5"; sha256="0wm3b844pn33047wfd8yp22c6ysdsi8qx71fm1h5rq5vm9mcg9cp"; depends=[RJSONIO]; };
   WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; };
   WGCNA = derive2 { name="WGCNA"; version="1.63"; sha256="1225dqm68bynkmklnsxdqdd3zqrpzbvqwyly8ibxmk75z33xz309"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; };
   WHO = derive2 { name="WHO"; version="0.2"; sha256="0rpk7ddpkjcqs0m7cgxs55k178js0d70ccfximp2vqrsw0igkmk9"; depends=[dplyr httr]; };
@@ -3952,9 +4019,9 @@ in with self; {
   WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; };
   WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; };
   WRS2 = derive2 { name="WRS2"; version="0.9-2"; sha256="0szjq9ffckjqa128avs4cymqvxk7dhldzj620kcq7q59aagrnj04"; depends=[MASS mc2d plyr reshape]; };
-  WRSS = derive2 { name="WRSS"; version="1.1"; sha256="1iv6msack3ha2i8l4c7p9964b9f3c2qza1yxjsyx9sn1wzfxs6fj"; depends=[Hmisc]; };
+  WRSS = derive2 { name="WRSS"; version="1.2"; sha256="0nml5sv0c4fflxvhhf7zwxdz45iid4n7v8kyc4l1qhn0wi2hihdk"; depends=[Hmisc]; };
   WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.0"; sha256="0yyhls0qzwwj4sz5d1nvzfiacx28dmf2hgjc7xgfi2qjkckg40hs"; depends=[caret dplyr EnvStats fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; };
-  WVPlots = derive2 { name="WVPlots"; version="0.2.8"; sha256="1d9016k05s3v3gmxsig6xk87npmgni9mfyqcwcvd522zisfx2g6z"; depends=[cdata ggplot2 gridExtra mgcv plotly replyr seplyr sigr wrapr]; };
+  WVPlots = derive2 { name="WVPlots"; version="0.3.1"; sha256="19ddgkblyqfvnx4a9c7i8nfvcfrmnsbbb3s61hqp16j59p5gfk3x"; depends=[ggplot2 gridExtra mgcv sigr wrapr]; };
   WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; };
   WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; };
   WaterML = derive2 { name="WaterML"; version="1.7.1"; sha256="0aqcanq2l3m9w1kglmkbqshs80wx9inmjp0c1i2j901g4k35ss5j"; depends=[httr RJSONIO XML]; };
@@ -3962,15 +4029,18 @@ in with self; {
   Wats = derive2 { name="Wats"; version="0.10.3"; sha256="1wh4wxzmdj154mh61ng4bg827hpx1kw85x34c1d7xdpbq3wag4g1"; depends=[colorspace ggplot2 lubridate plyr RColorBrewer testit zoo]; };
   WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; };
   WaveletArima = derive2 { name="WaveletArima"; version="0.1.0"; sha256="1f8g6r9qmhr2y7sf7x2vphv2sab5rywpfjvhsxfmzljjmirf2v3n"; depends=[forecast fracdiff wavelets]; };
-  WaveletComp = derive2 { name="WaveletComp"; version="1.0"; sha256="16ghxqjbv39pmgd52im6ilkkh0hpnaw8ns0hwkngpbr479m1grdp"; depends=[]; };
+  WaveletComp = derive2 { name="WaveletComp"; version="1.1"; sha256="07w2aa0jiflvxyqhgh48705hg8hjspd103jd00i2pcw2v42hwmf8"; depends=[]; };
   WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; };
+  WeMix = derive2 { name="WeMix"; version="1.0.2"; sha256="1wj1jxw65i94xf5zk9phgkwybvl2h05ynq0zhdc7q3j6b90mv9hn"; depends=[lme4 MASS minqa NPflow numDeriv Rcpp RcppArmadillo Rmpfr statmod]; };
   WebGestaltR = derive2 { name="WebGestaltR"; version="0.1.1"; sha256="0cdpfwp4whx8pff73acxga072lwbibl44hxdjs9jsb5i21h55vbr"; depends=[data_table doParallel foreach pkgmaker PythonInR rjson]; };
-  WeightIt = derive2 { name="WeightIt"; version="0.3.1"; sha256="0iadn4hpmfpih75nz17kligh3avjzs1cfi3pkkgx378ml64kdz8m"; depends=[cobalt]; };
+  WebPower = derive2 { name="WebPower"; version="0.5"; sha256="184wig66bcg7vsppaijq5jpq2hffl3bhshdx4ilz5hw98mimxg13"; depends=[lavaan lme4 MASS PearsonDS]; };
+  WeibullR = derive2 { name="WeibullR"; version="1.0.9"; sha256="13qkfnfp2pbvb78mj7fg8cgjnbrxv6dbms70wvn9f3mc70djmrb3"; depends=[Rcpp RcppArmadillo]; };
+  WeightIt = derive2 { name="WeightIt"; version="0.3.2"; sha256="13rswk3qr01y3ikpa2d9z7l5wicgsmiqmmhx7cbnyi4jny316sa3"; depends=[cobalt]; };
   Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; };
   WeightedCluster = derive2 { name="WeightedCluster"; version="1.2-1"; sha256="04gsr65mssv4cz4v8sh44qhyzn0isll057d45z4ljv6sx0an5yhl"; depends=[cluster RColorBrewer TraMineR]; };
   WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; };
   WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; };
-  WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.0"; sha256="10rnfwq3f6msrzmgifm33dqwnncfhybiah8czh1z7g3iw2859qbc"; depends=[mgcv oro_nifti]; };
+  WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.1"; sha256="1qyv06ai83b1idfg4bgr97askyzlwi2dv8d5wkivb5czp7crdri1"; depends=[mgcv oro_nifti]; };
   WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; };
   WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; };
   WikiSocio = derive2 { name="WikiSocio"; version="0.7.0"; sha256="1rc90cidc8mj8x7vw82vx41ivwnmil3cmc1whc8ghxrwli256w32"; depends=[httr igraph pbapply plyr RCurl stringr XML]; };
@@ -3981,23 +4051,23 @@ in with self; {
   WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; };
   WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; };
   WordPools = derive2 { name="WordPools"; version="1.0-2"; sha256="1izs4cymf2xy1lax85rvsgsgi05ygf0ibi9gzxc96sbgvy4m78kf"; depends=[]; };
-  WordR = derive2 { name="WordR"; version="0.2.2"; sha256="1q8im3v30xil5qg4m1hypmj439rsx5g2x4mfxsgkz4xz2hwlfh4f"; depends=[dplyr officer ReporteRs]; };
+  WordR = derive2 { name="WordR"; version="0.2.3"; sha256="0sn14s4vnmj6zs8mc8mj5ph78m9z9yr29lknqma3wrphb7cla50w"; depends=[dplyr officer ReporteRs]; };
   Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; };
   WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; };
   WriteXLS = derive2 { name="WriteXLS"; version="4.0.0"; sha256="0nwxi36w3rkzw9j0qil64gakhb101rxg1wydjkwlpg0nbsj1sm50"; depends=[]; };
-  WufooR = derive2 { name="WufooR"; version="0.6.2"; sha256="1k5nmg8mg8m9salcb0jr87ws548ydc597v8m94y4qrrfchy623rg"; depends=[dplyr httr jsonlite]; };
+  WufooR = derive2 { name="WufooR"; version="0.8"; sha256="0nwf66y1jb7dw4yhkdl9g4brh59ky4q4x6j9zbqdn70pcj9hq9jx"; depends=[dplyr httr jsonlite]; };
   XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; };
-  XGR = derive2 { name="XGR"; version="1.1.2"; sha256="0zvqsd7ff8a46w58qklp2w0w785y8nhpx4mcvp27r0k8j9y5yji7"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; };
+  XGR = derive2 { name="XGR"; version="1.1.3"; sha256="01czagfjx5w212l5h29klrrsg0qiprlsiwpz7pfqh44haifnq4pz"; depends=[BiocGenerics dnet dplyr GenomicRanges ggnetwork ggplot2 ggrepel igraph IRanges Matrix plot3D RCircos rtracklayer S4Vectors supraHex tidyr XML]; };
   XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; };
   XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; };
-  XLConnect = derive2 { name="XLConnect"; version="0.2-14"; sha256="06c88rkyavjv3p90hr3cz4y9jx3g6ik3sannjynjnms7d793w0fi"; depends=[rJava XLConnectJars]; };
-  XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-14"; sha256="0ckkvm8i2r60npx0zb36h98gmzgqig9d806cn6r5cghczz6g0xf6"; depends=[rJava]; };
-  XML = derive2 { name="XML"; version="3.98-1.10"; sha256="1faza9bbllp67lf1yv1sllxc3iv8llz52m9diazhq322iqbh97m1"; depends=[]; };
+  XLConnect = derive2 { name="XLConnect"; version="0.2-15"; sha256="1cvq677m09gwpwhj3fy15mbfn0s0b1y35w95pjnijiwpcpdxiq96"; depends=[rJava XLConnectJars]; };
+  XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-15"; sha256="1ipqyjgsh5a1ygsbhyqxyj9wfjv1f73cyfrpx6jvf0is5jklhvxx"; depends=[rJava]; };
+  XML = derive2 { name="XML"; version="3.98-1.11"; sha256="18izvlg2x9mzr6yb3yf02ghwbyn00frki3av4lpc44r22m4djnsh"; depends=[]; };
   XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; };
   XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; };
   XNomial = derive2 { name="XNomial"; version="1.0.4"; sha256="1mwx302576rmsjllbq2clfxilm3hkyp5bw0wmwqbn0kgv5wpy8z6"; depends=[]; };
-  XR = derive2 { name="XR"; version="0.7.1"; sha256="1wly2wpjvmfjjng5kjr9rq1by550amigz10rfpl8iibv5b9kvzjy"; depends=[jsonlite]; };
-  XRJulia = derive2 { name="XRJulia"; version="0.7.6"; sha256="1bvkrx4nvni858qw3p51bm2pidlfqdmk2pbmhwmb61pcbls3gpk8"; depends=[XR]; };
+  XR = derive2 { name="XR"; version="0.7.2"; sha256="0j8rkjw9y7mb0yj24nlisfd84148pnnakz8i2y35y2b8gmh5zhvz"; depends=[jsonlite]; };
+  XRJulia = derive2 { name="XRJulia"; version="0.7.7"; sha256="07332hv7kp5bk1wm24cf2fa9yz5l4mni1gw0ry1qnwh1zx5v8jcd"; depends=[XR]; };
   XRPython = derive2 { name="XRPython"; version="0.8"; sha256="0alg33spiaqf3jwg1qn543nxvbfaqv8gvf5px3grhbgrcmi5mcmj"; depends=[reticulate XR]; };
   XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; };
   XiMpLe = derive2 { name="XiMpLe"; version="0.10-2"; sha256="16dmslc3ji9zbbm2khw8ib8rhwan0mdlfyd4h29v42lcx6l1d0pv"; depends=[]; };
@@ -4008,11 +4078,12 @@ in with self; {
   YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; };
   YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; };
   YuGene = derive2 { name="YuGene"; version="1.1.5"; sha256="1f1bia1q1z2rzp4pw218zglf02x1m9zpz5gqllrd77ggw8ilqfjc"; depends=[mixOmics]; };
+  ZIBBSeqDiscovery = derive2 { name="ZIBBSeqDiscovery"; version="1.0"; sha256="12g9rga9z6318ni6x6q9hdqlgl93y2xn8vf3gc6sm97fz8pliswx"; depends=[mcc]; };
   ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; };
   ZIM = derive2 { name="ZIM"; version="1.0.3"; sha256="1497ki0pr0x21fz5wa2z6zgb2br99z56gvfxyn9cglqq45if6cjh"; depends=[MASS]; };
   ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; };
   ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; };
-  ZeBook = derive2 { name="ZeBook"; version="0.5"; sha256="1djwda6hzx6kpf4dbmw0fkfq39fqh80aa3q9c6p41qxzcpim27dw"; depends=[deSolve triangle]; };
+  ZeBook = derive2 { name="ZeBook"; version="1.0"; sha256="06dg3jk37y64mdcb8hpxgj8rclgxqm96dalm7y5zjb7nrj9jfydk"; depends=[deSolve triangle]; };
   Zelig = derive2 { name="Zelig"; version="5.1.6"; sha256="142kjmgma25pvr525y0mjiwivnmq8y8s1abw4kyqipcmphmgh3an"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; };
   ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; };
   ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; };
@@ -4020,6 +4091,7 @@ in with self; {
   Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; };
   aCRM = derive2 { name="aCRM"; version="0.1.1"; sha256="0kzp568hd9c9a9qgniia5s5gv0q5f89xfvvwpzb197gqhs3x092v"; depends=[ada dummies kernelFactory randomForest]; };
   aLFQ = derive2 { name="aLFQ"; version="1.3.4"; sha256="1q2l5cwkcsng22nxckgc7aalvy3qhvgga5nkchfpy53sxg68awqv"; depends=[bio3d caret data_table lattice plyr protiq randomForest reshape2 ROCR seqinr]; };
+  aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; };
   aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; };
   aRxiv = derive2 { name="aRxiv"; version="0.5.16"; sha256="1dghv40waprld9gg81p2is72sk0z6fla0pfiqzzfhky8lazaih01"; depends=[httr XML]; };
   aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; };
@@ -4038,12 +4110,13 @@ in with self; {
   abind = derive2 { name="abind"; version="1.4-5"; sha256="0b1zd8jbnl6l292cr9rb50m09fy3ylxvzkpgi5lfb1nbzddcwfis"; depends=[]; };
   abjutils = derive2 { name="abjutils"; version="0.2.1"; sha256="0qrsc4if7aif73qp95lw6b5986c2r0jn7m39123zij8k15vc935b"; depends=[devtools dplyr glue httr magrittr plyr progress purrr rstudioapi scales stringi stringr tibble tidyr]; };
   abn = derive2 { name="abn"; version="1.0.2"; sha256="0jxpw5mplnpc57jjg9w3zrik40g7va6s8m9zbfsyf0vqn645wfwq"; depends=[Cairo]; };
+  abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; };
   abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; };
   abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; };
   acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; };
   accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; };
   accelerometry = derive2 { name="accelerometry"; version="2.2.5"; sha256="00mn09j7y39sc7h5srnnfk2l73vhh6zq7rzc0vckfvs72lncmwv5"; depends=[Rcpp]; };
-  accelmissing = derive2 { name="accelmissing"; version="1.1"; sha256="0s2vy16zcpvbqyqz4ifdqccs6bfp8sf7azvfy8jjcm73xncv6ij3"; depends=[mice pscl]; };
+  accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; };
   accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; };
   accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; };
   acebayes = derive2 { name="acebayes"; version="1.4.1"; sha256="0wkygvhwf0y5jzkcj6prjmr9dlak1xgsbswlixqwrx5b48iqxgwh"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; };
@@ -4061,14 +4134,14 @@ in with self; {
   activity = derive2 { name="activity"; version="1.1"; sha256="1lqajgxfps2h6amz1791vp3f52rs9ghmanq1nqfxqd2jmk3idkrx"; depends=[circular overlap pbapply]; };
   activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; };
   actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; };
-  actuar = derive2 { name="actuar"; version="2.3-0"; sha256="0qzzsc9s25l29fi1xgd5ypb4j1l08ghx180n0q5k9p2fn36zjz27"; depends=[expint]; };
+  actuar = derive2 { name="actuar"; version="2.3-1"; sha256="0i0w5y0bgma42p4cbrbv0bxkambp7hgqqlsg90p5skfvg7r1n3bk"; depends=[expint]; };
   ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; };
   adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; };
   adagio = derive2 { name="adagio"; version="0.6.5"; sha256="0jy8g5604alaqbi5ynj95ig07igzbgk8x03a4x1rzkvfwvydfflz"; depends=[]; };
   adapr = derive2 { name="adapr"; version="2.0.0"; sha256="1s57jdbi5pik56xjz1d4438ax6cywg2yq2s47h5g6wrwvpgr1qfw"; depends=[archivist devtools digest doParallel gdata ggplot2 git2r igraph knitr plotly plyr rmarkdown shiny shinydashboard versions]; };
   adaptMCMC = derive2 { name="adaptMCMC"; version="1.3"; sha256="08v11rl0p4w94knb0yzs1ysj42xillya62yaw3zm40d4pqv7vcky"; depends=[coda Matrix]; };
   adaptTest = derive2 { name="adaptTest"; version="1.0"; sha256="08d7a5dlzhaj236jvaw3c91008l66vf5i4k5anhcs32a3j8yh2iv"; depends=[lattice]; };
-  adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.1"; sha256="1jhkiz0gdjvgclqfksm10zza9iwy1z6k5wpviwa4r9a936f1i88k"; depends=[ape ggplot2 phyloseq shiny]; };
+  adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.2"; sha256="0bb6hw77dfa66b12xyazlp992gwjb1plylixlmq4cv4yjhnl9n5z"; depends=[ape ggplot2 phyloseq shiny]; };
   adaptivetau = derive2 { name="adaptivetau"; version="2.2-1"; sha256="1hd2l1jv4i5mg0k0g8bbrvv43nk1zxbwh21594zayrzjyikb2593"; depends=[]; };
   adaptsmoFMRI = derive2 { name="adaptsmoFMRI"; version="1.1"; sha256="1h79gh1bd6s2xhwf4whh72wf2cz4di2p8dnlf6192mfg108qc6nw"; depends=[coda Matrix MCMCpack mvtnorm spatstat]; };
   addhaz = derive2 { name="addhaz"; version="0.4"; sha256="0i3czmv538m8s3pnxrhh2a1mrdv9m3hgzjkb25p7hygwnzz54drg"; depends=[boot MASS Matrix]; };
@@ -4077,12 +4150,11 @@ in with self; {
   additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; };
   additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; };
   addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; };
-  ade4 = derive2 { name="ade4"; version="1.7-10"; sha256="0zk81x0yn30gbyc0jpzyw1nxd08ccihl6vyk0ijvj3aw3nr5flc6"; depends=[MASS]; };
+  ade4 = derive2 { name="ade4"; version="1.7-11"; sha256="0wm54wcpn87rdh6vyw04cr8vgba899y6jsl61f22bmlvx6d7kkac"; depends=[MASS]; };
   ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.2-9"; sha256="0kfnikkzhyfxskrphr65b8amjhdfq35x6dda4kivdhn7ak07s3ll"; depends=[ade4 adegraphics lattice tkrplot]; };
   adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; };
   adegenet = derive2 { name="adegenet"; version="2.1.1"; sha256="0ynfblp0hbd3dp3k86fn1wyhqr28lk6hs2bg4q7gyf0sfdfzwhrh"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; };
-  adegraphics = derive2 { name="adegraphics"; version="1.0-9"; sha256="1fscmisvfd3j9fy1562pjsfpgx16fhr5xwmkzmssxhgyia19f4sr"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
-  adehabitat = derive2 { name="adehabitat"; version="1.8.20"; sha256="18z4a8168a2c7248s15hwkjj70dzlkif360cy28jry4a61cm6d81"; depends=[ade4 shapefiles sp tkrplot]; };
+  adegraphics = derive2 { name="adegraphics"; version="1.0-10"; sha256="0vig5c8hmsa6xapqzb8l4sm05qw7zc5s6b796bspffxj0crg3l3v"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; };
   adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.15"; sha256="1bwx2mfkzfknr6fjjkbx2xnm4gksd78i8fz0bcizqyi1zhg5hd0c"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; };
   adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.13"; sha256="158a6qzks0hml6hk4f1vr66gvwdn09792i2ca3k23061i3j3xp75"; depends=[ade4 adehabitatHR adehabitatMA sp]; };
   adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.23"; sha256="0hf6wpwhsvfp906xk5sadfnvz524zmm05d0h2zxpx6089c6hnw3j"; depends=[ade4 adehabitatMA CircStats sp]; };
@@ -4100,13 +4172,13 @@ in with self; {
   adlift = derive2 { name="adlift"; version="1.3-3"; sha256="0q4ipk9yax4wqp3jckpx6ihriqaaaz0knxd19cm20qzdx37vz4id"; depends=[EbayesThresh]; };
   admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; };
   adnuts = derive2 { name="adnuts"; version="1.0.0"; sha256="0jy9wq269r7s70bwld6ngxc6vmaj9vplq4wn97x4f3c6lqy42swc"; depends=[ellipse rstan]; };
-  ads = derive2 { name="ads"; version="1.5-2.2"; sha256="17k24dihl41jgkkglhnkj7lvvl53dgahjkb5jhfmfgk6i16c7s23"; depends=[ade4 spatstat]; };
+  ads = derive2 { name="ads"; version="1.5-3"; sha256="1k1japzcf0mafxkv9dlzaqz9n4c749lsx0lja4wj327ninpdcfy4"; depends=[ade4 spatstat]; };
   advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; };
   adwave = derive2 { name="adwave"; version="1.2"; sha256="1fnaq9v84y52kb66aq4g0xiqgllk7mi0is5qiafqf546hck3kzz6"; depends=[waveslim]; };
   aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; };
   afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; };
   afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; };
-  afex = derive2 { name="afex"; version="0.19-1"; sha256="10qbwqwashddj93ivvwlkf3lk14411lmxp24cn7sahqr9lm714f7"; depends=[car coin emmeans lme4 lmerTest pbkrtest reshape2 stringr]; };
+  afex = derive2 { name="afex"; version="0.20-2"; sha256="150zf3lzsybpj7hm3ry0x4lliscgmmxpq92iab9fbcrvaqyaibn8"; depends=[car coin emmeans lme4 lmerTest pbkrtest reshape2 stringr]; };
   affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; };
   afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; };
   afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; };
@@ -4114,7 +4186,7 @@ in with self; {
   agRee = derive2 { name="agRee"; version="0.5-1"; sha256="1hmqvpcz4vnpcl9f92q5fy1ca89l9sq25fnsw2mxfsa0yqbyxpw6"; depends=[coda lme4 miscF R2jags]; };
   aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; };
   agop = derive2 { name="agop"; version="0.1-4"; sha256="1jwyl02z053rsdw9hryv1nyj9wlq310l51fghp1p0j51c159mlpx"; depends=[igraph Matrix]; };
-  agriTutorial = derive2 { name="agriTutorial"; version="0.1.2"; sha256="0zcyawmhflm4rbxnyf6gdwrnff4f13yajc81n13ykw7bfi8xphqi"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; };
+  agriTutorial = derive2 { name="agriTutorial"; version="0.1.3"; sha256="1ihz92f10p7nq0rw01hka5wg2svf2hgx9f39604ab0j99z0f99hz"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; };
   agricolae = derive2 { name="agricolae"; version="1.2-8"; sha256="1c6n52jralp33hl3nmpv9fc9vsvs6lcz9j75f2zbz0r4sqd2mw89"; depends=[AlgDesign cluster klaR MASS nlme spdep]; };
   agridat = derive2 { name="agridat"; version="1.13"; sha256="1029n2jkbvybvkbf4pwdjrw6m05xyzn5xyqyfziqb7xnw51ksm2p"; depends=[]; };
   agrmt = derive2 { name="agrmt"; version="1.40.4"; sha256="1y2gnq6b4zkxknygg73r8qrd435y7c69iqn8i56kwk1ccc1rwddx"; depends=[]; };
@@ -4126,14 +4198,16 @@ in with self; {
   aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; };
   aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; };
   airGR = derive2 { name="airGR"; version="1.0.9.64"; sha256="08nw07v5d5pljk839i5j5wgrc5lny7v6kl8m2hd6bm9aijql7hg4"; depends=[]; };
-  aire_zmvm = derive2 { name="aire.zmvm"; version="0.5.0"; sha256="14n2wycfxpj8wb45671pysqxr434b3wgrnbx2vfpsxw46lkqid0i"; depends=[dplyr httr lubridate readr rvest sp stringr tidyr xml2]; };
+  airGRteaching = derive2 { name="airGRteaching"; version="0.2.2.2"; sha256="13alnmazf8n7sgfzh0hfq6i4cd2pl414vwrakgp36q365fkgzpnc"; depends=[airGR dygraphs htmlwidgets markdown plotrix shiny shinyjs xts]; };
+  aire_zmvm = derive2 { name="aire.zmvm"; version="0.6.1"; sha256="1a6aq1fkjj053mi36ibykncd1hmcl0f5c0l2fi0cbx6hcysc28ic"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; };
   ajv = derive2 { name="ajv"; version="1.0.0"; sha256="1qd5ncb7rdnnvqfknsvq9nrpxrh0zv3jyh4b91dcvfvhp262vfrm"; depends=[RJSONIO V8 yaml]; };
   akima = derive2 { name="akima"; version="0.6-2"; sha256="1klprj4a2pgy5pwdwnrn3siisi2lh8hr4z6vz38sdvjkcmakxnk1"; depends=[sp]; };
   akmeans = derive2 { name="akmeans"; version="1.1"; sha256="1nqbxbx583n0h2zmpy002rlmr6j86j6bg76xj5c69brrh59dpyw1"; depends=[]; };
   alabama = derive2 { name="alabama"; version="2015.3-1"; sha256="0mlgk929gdismikwx4k2ndqq57nnqj7mlgvd3479b214hksgq036"; depends=[numDeriv]; };
-  alakazam = derive2 { name="alakazam"; version="0.2.8"; sha256="0lilldxynwhp1i538k3xb9c73956agxj6v8zickxkba1sx4k5zrc"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; };
+  alakazam = derive2 { name="alakazam"; version="0.2.10"; sha256="0bfqc7rbchmj0dby8c8xlxff9gk18kq1v8zqfj3s7h3yddrr7znr"; depends=[dplyr ggplot2 igraph lazyeval progress Rcpp readr scales seqinr stringi]; };
+  albopictus = derive2 { name="albopictus"; version="0.2"; sha256="1ils7y0i9dvhpnwyi31y7dvn02pcyn4dk0165ck81s08k96v3r1z"; depends=[]; };
   ald = derive2 { name="ald"; version="1.2"; sha256="1xmvxmyc1nmsrlyr0rvzz20jx6g1f2jvxpg9f39v48ngg5gmanjj"; depends=[]; };
-  alfred = derive2 { name="alfred"; version="0.1.5"; sha256="0slqmfv5nsjb463n86qf540dd8airzqc98946kbs24xmyi9npyb8"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
+  alfred = derive2 { name="alfred"; version="0.1.6"; sha256="07x012lj33m0pmxdwk39ywrlvlfkp7mb203dwv8v88cxplhbaiq3"; depends=[dplyr jsonlite lubridate magrittr tibble tidyr]; };
   algorithmia = derive2 { name="algorithmia"; version="0.0.2"; sha256="0kly70l9si8ni8n5xm30vai70pvfvip6354scvjqj34362s0lm0a"; depends=[base64enc httr rjson xml2]; };
   algstat = derive2 { name="algstat"; version="0.0.2"; sha256="1ssdrrwnxrhx3syndqxqcaldlbnjamk3x2yiq7jgxy0qsiadmqsi"; depends=[mpoly Rcpp reshape2 stringr]; };
   alineR = derive2 { name="alineR"; version="1.1.4"; sha256="1gi4pl7ij60pz85yjiga5kvldraj9n3nhcyqdxrigs0cqvdwg3ar"; depends=[]; };
@@ -4148,7 +4222,7 @@ in with self; {
   alphahull = derive2 { name="alphahull"; version="2.1"; sha256="129b2j9j60p2wvbb8703x18pydv1g715vmjcb1a80v70i93w4f49"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; };
   alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; };
   alphavantager = derive2 { name="alphavantager"; version="0.1.0"; sha256="02vv0mks73rih4xwabsnk8rkl3cipd27k5lak9lp1rl0agp8g68v"; depends=[devtools dplyr glue httr jsonlite lubridate purrr readr stringr tibble tidyr]; };
-  alr3 = derive2 { name="alr3"; version="2.0.5"; sha256="0zrrsv2kjq3cky3bhk6gp32p1qpr1i5k2lx7c1w08bql0nb1x740"; depends=[car]; };
+  alr3 = derive2 { name="alr3"; version="2.0.7"; sha256="0975m657ri8ad4djrwfdv4cslw8inykq35aj5m00kmsc8gb624j0"; depends=[car]; };
   alr4 = derive2 { name="alr4"; version="1.0.5"; sha256="0m8jgc4mfni17psf8m0avf0m364vcq5k3c9x807p98ch2z5nsygv"; depends=[car effects]; };
   alterryx = derive2 { name="alterryx"; version="0.3.0"; sha256="0y76xy7m7dklvkhfr2czq54ffgj2j5zhnm2kza7m463j1w1mkcqz"; depends=[base64enc digest httr jsonlite]; };
   altmeta = derive2 { name="altmeta"; version="2.2"; sha256="1k3p06v8ccj0dbjfpl4nw6579bwcy4j925rk15v55khqmrlx780l"; depends=[]; };
@@ -4156,11 +4230,11 @@ in with self; {
   ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; };
   ameco = derive2 { name="ameco"; version="0.2.8"; sha256="1i2ap11z1awalw71hai719xh57banpfgj1nllca66zf781x80di9"; depends=[]; };
   amei = derive2 { name="amei"; version="1.0-7"; sha256="0dyx6a1y5i0abwka0y89d0mpj55rm5ywb4r9c2mqmy43djp181hn"; depends=[]; };
-  amelie = derive2 { name="amelie"; version="0.1.0"; sha256="19cn8rhc5lzy9x9wslljjdnmli76bnam2yg5v9l87jvzb712vl6p"; depends=[]; };
+  amelie = derive2 { name="amelie"; version="0.2.0"; sha256="01v93dswr9nk0kvq50jri4568w17pwkcn64xbpzn2p4c7w6gqkhh"; depends=[]; };
   amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; };
   aml = derive2 { name="aml"; version="0.1-1"; sha256="09xxlxp784wlb561apns3j8f2h9pfk497cy5pk8wr4hhqqv4d3al"; depends=[lars]; };
   ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; };
-  amt = derive2 { name="amt"; version="0.0.2.0"; sha256="1w6rdyzyzxsa5qxmcpm1ahgz65z72nil3ay51m8g9qjk7v1xrj8p"; depends=[broom circular dplyr fitdistrplus FNN geosphere lazyeval leaflet lubridate maptools purrr raster Rcpp rgeos rlang sp survival tibble tidyr tidyverse]; };
+  amt = derive2 { name="amt"; version="0.0.3.0"; sha256="1a9hvvqh7359bs2x031qgkq364d07kf60jgn13kz5nva36c5wl8v"; depends=[broom circular dplyr fitdistrplus FNN geosphere lazyeval leaflet lubridate maptools purrr raster Rcpp rgeos rlang sp survival tibble tidyr tidyverse]; };
   anMC = derive2 { name="anMC"; version="0.2.0"; sha256="1j6dah49sgfsb7bj4xys5rcaqw12rrkqhqryqz2xhdkazjmz3gpq"; depends=[mvtnorm Rcpp RcppArmadillo]; };
   anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; };
   analogsea = derive2 { name="analogsea"; version="0.6.0"; sha256="1fcvf3yci3szm155pnk89q36dgc55wdlffvll642zn26zc5d1y5n"; depends=[aws_s3 httr jsonlite magrittr yaml]; };
@@ -4182,11 +4256,13 @@ in with self; {
   annovarR = derive2 { name="annovarR"; version="1.0.0"; sha256="0l2csp06m5f3i1b4h0pvl8mmzx25c0b411c5sdc3qszirbplh038"; depends=[AnnotationDbi BioInstaller configr data_table DBI futile_logger glue ngstk RMySQL RSQLite stringi stringr vcfR]; };
   anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; };
   anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; };
+  anomalize = derive2 { name="anomalize"; version="0.1.1"; sha256="1szxjc8bh616z2xc50hcggh4ky1b7343i3xmg81rbssvkl2gghlh"; depends=[dplyr ggplot2 glue purrr rlang sweep tibble tibbletime tidyr timetk]; };
   anomalyDetection = derive2 { name="anomalyDetection"; version="0.2.5"; sha256="132wb0xz04zib3x7802b2q546rkf097rsxyi9mi86g6vv7yyw9z1"; depends=[caret dplyr ggplot2 gmp magrittr MASS plyr purrr Rcpp RcppArmadillo tibble tidyr]; };
   anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; };
   anonymizer = derive2 { name="anonymizer"; version="0.2.0"; sha256="0zlzxcqy8fjhh6ab58a1pi0k686dzgap58d160ms6bsr5mgn3fbf"; depends=[]; };
+  antaresProcessing = derive2 { name="antaresProcessing"; version="0.15.1"; sha256="0x2rcj4cfw0rsyzdc98j8yk8mp8cnbpx4qj587wszxlyf90yzgfa"; depends=[antaresRead data_table]; };
   antaresRead = derive2 { name="antaresRead"; version="2.1.0"; sha256="1khvwh55gfd62avaj9vl709nrcykyc4zn11fxikbqqgwm9mq7835"; depends=[data_table lubridate plyr shiny stringr]; };
-  antitrust = derive2 { name="antitrust"; version="0.99"; sha256="0j76kbb8l0n3lq74nacymgilf4xzs8g1x2g1jw55v6avqnwyps6p"; depends=[BB evd ggplot2 MASS numDeriv rhandsontable shiny]; };
+  antitrust = derive2 { name="antitrust"; version="0.99.7"; sha256="0si9vnbk6rcpp913cyfh5h4a5fx9kzafr5x5chb3gakzrbzz0hav"; depends=[BB evd MASS numDeriv]; };
   antiword = derive2 { name="antiword"; version="1.1"; sha256="0nbx2l0d2y4qvcw4dw3m26zfkgdmav4cq0l00gib7l3y9pqxzjh5"; depends=[sys]; };
   anytime = derive2 { name="anytime"; version="0.3.0"; sha256="1byhgplskj17d0gib9sajfnzyv8p9slgq1vy8fq9j2ibirl86a91"; depends=[BH RApiDatetime Rcpp]; };
   aod = derive2 { name="aod"; version="1.3"; sha256="1a6xs5d5289w69xd2salsxwikjjhjzvsnplqrq78b1sr6kzfyxz3"; depends=[]; };
@@ -4194,17 +4270,18 @@ in with self; {
   aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; };
   aop = derive2 { name="aop"; version="1.0.0"; sha256="1i3mixiwcvqygbcvj6f9vm223plmydzmixpy6nhis2zv9d90vakd"; depends=[ggplot2 graph igraph plyr Rgraphviz rjson]; };
   aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; };
-  apTreeshape = derive2 { name="apTreeshape"; version="1.4-5"; sha256="0mvnjchhfbpbnrgnplb6qxa7r2kkvw29gqiprwggkf553wi6zl48"; depends=[ape quantreg]; };
+  apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; };
   apa = derive2 { name="apa"; version="0.2.0"; sha256="1f9c8m5z8j7mbmbh61vcs680ya1zq5spwqs90zhajaw5fhvlg8km"; depends=[dplyr magrittr purrr rmarkdown stringr]; };
   apaStyle = derive2 { name="apaStyle"; version="0.5"; sha256="1x3kgyxhgbx3r7wi759j75wh811jcm6z559mrk4zm4p99vqz10bl"; depends=[ReporteRs]; };
   apaTables = derive2 { name="apaTables"; version="2.0.2"; sha256="0b3vaknj0a9znrgr98v35ka0lf5y1wcy1x0yv249gysikncn9mjc"; depends=[boot broom car dplyr tibble]; };
+  apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; };
   apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; };
   apcluster = derive2 { name="apcluster"; version="1.4.5"; sha256="0ipg5m3d7fnbvvlavbv8q8ixyrcgdspzwkv00q93f4biybza27x6"; depends=[Matrix Rcpp]; };
   apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; };
-  ape = derive2 { name="ape"; version="5.0"; sha256="0q59pmxawz498cb9mv5m49lhiwxib8ak94yyydz7qg8b6lpd4bn3"; depends=[lattice nlme Rcpp]; };
+  ape = derive2 { name="ape"; version="5.1"; sha256="0vm2065993wf4hdqarxqykhfz9aaj0rrb98alhkq4qw1d2kdrmdp"; depends=[lattice nlme Rcpp]; };
   apercu = derive2 { name="apercu"; version="0.2.3"; sha256="0w9hi8pdjb3nschh4cy387q67jxhkl2bn9vir949rsl831x4cs1j"; depends=[pls]; };
   apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; };
-  aphid = derive2 { name="aphid"; version="1.0.1"; sha256="1s41ph6i28l14h8s5vvgmx6kby378x27y3vwbz25f2jmq8i7fqi2"; depends=[openssl phylogram Rcpp]; };
+  aphid = derive2 { name="aphid"; version="1.1.0"; sha256="0mf2v7b915hpasic2yqxi0g5fcrwac4d1ycikwzcd9hb9qngcb0n"; depends=[kmer openssl Rcpp]; };
   aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; };
   aplpack = derive2 { name="aplpack"; version="1.3.0"; sha256="0i6jy6aygkqk5gagngdw9h9l579lf0qkiy5v8scq5c015w000aaq"; depends=[]; };
   apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; };
@@ -4222,13 +4299,13 @@ in with self; {
   apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; };
   aptg = derive2 { name="aptg"; version="0.1.0"; sha256="06z8041h1k9v0ymd7azn11xzhqxb8lda4r7nyg51h8z3i8mpq1ba"; depends=[ape brranching phytools taxize xml2]; };
   aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; };
-  aqp = derive2 { name="aqp"; version="1.15"; sha256="0hgz2m3nn45marvx49n62xmq1d1xhy9cf6wb829cvxczisvlakgy"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
+  aqp = derive2 { name="aqp"; version="1.16"; sha256="11ksjvvwazan2xk535ygrk8qs66ny6fywfgw2mpy8kv2637l9pay"; depends=[cluster digest Hmisc lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; };
   aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; };
   arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; };
-  arc = derive2 { name="arc"; version="1.1.4"; sha256="1qzj5bzn2dfssjz1r464ys7c0wab0la23hcrbjbmn93iqm2a648g"; depends=[arules discretization Matrix R_utils]; };
+  arc = derive2 { name="arc"; version="1.2"; sha256="1advs0aqxh84c5n9akww8cdafh7npgaibrb42wncwhv9nfi7wy1v"; depends=[arules discretization Matrix R_utils]; };
   archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; };
   archetypes = derive2 { name="archetypes"; version="2.2-0"; sha256="1djzlnl1pjb0ndgpfj905kf9kpgf9yizrcvh4i1p6f043qiy0axf"; depends=[modeltools nnls]; };
-  archiDART = derive2 { name="archiDART"; version="3.0"; sha256="0yh9asf45l2fxxm67vg9snaqbvs1bb24lm2xsrb6xrr62avdrqlq"; depends=[rgl sp TDA XML]; };
+  archiDART = derive2 { name="archiDART"; version="3.2"; sha256="08jam0nbqvrgrxjqj24k7f0dybyi935w977yi1qk34q1p48462ph"; depends=[rgl sp XML]; };
   archivist = derive2 { name="archivist"; version="2.3"; sha256="0rwdk2scmd06j428zadcxmvshvssf421265632595hvcacqz6yy4"; depends=[DBI digest httr lubridate magrittr RCurl RSQLite]; };
   archivist_github = derive2 { name="archivist.github"; version="0.2.2"; sha256="04xb2i47y12ic87gb2l30bldil0505h7s9601hq0afjg3npx6jq7"; depends=[archivist digest git2r httr jsonlite]; };
   areaplot = derive2 { name="areaplot"; version="1.2-0"; sha256="0xzfgbnzqsvnq46nsxwyqrwldbaqns3h5np0f5wxpjda9cy2rna1"; depends=[]; };
@@ -4239,9 +4316,9 @@ in with self; {
   argparse = derive2 { name="argparse"; version="1.1.1"; sha256="0fzrbj87b274vf96azdnsjxk2nf45d5wy58vzmlah4b4h7q4j524"; depends=[findpython getopt jsonlite proto]; };
   argparser = derive2 { name="argparser"; version="0.4"; sha256="0s1wxshx4jk69wfxhycx973q6y8cmqrfymyjklhq1i8xrj0kmmx9"; depends=[]; };
   ari = derive2 { name="ari"; version="0.1.0"; sha256="05pva8jp7dhl46dm1fha6f8mavrs76a6c491fq3mavly8qcbgx44"; depends=[aws_polly progress purrr rmarkdown rvest tuneR webshot xml2]; };
-  arm = derive2 { name="arm"; version="1.9-3"; sha256="00773z8ai07s9wa2annzjqrxml3z13fh9zqls0z1n7s3h8fwrvqw"; depends=[abind coda lme4 MASS Matrix nlme]; };
+  arm = derive2 { name="arm"; version="1.10-1"; sha256="0vvp90jygajd6ydky57z66wqjq9msfbl88irj5jbsray574mh4bg"; depends=[abind coda lme4 MASS Matrix nlme]; };
   arnie = derive2 { name="arnie"; version="0.1.2"; sha256="14xkgyfn9zvkbgram15w7qzqc5pl1a8ig66cif7a79najrgd914r"; depends=[]; };
-  aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.0"; sha256="1slbmqr0qd8r9lrms7b86fhvn612g4yjbm604zahjr335q6d7h03"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
+  aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.1.1"; sha256="1x2lwdabvh7cjdy57jrnbdb7s9vxs18zyvfzwavi2pgldqz6v2aw"; depends=[aroma_apd aroma_core future listenv MASS matrixStats R_cache R_devices R_filesets R_methodsS3 R_oo R_utils]; };
   aroma_apd = derive2 { name="aroma.apd"; version="0.6.0"; sha256="1l9p5qww71h6wlg2z15wirsfz2i7hmf637l17zaf3n7fp9s3flc7"; depends=[R_huge R_methodsS3 R_oo R_utils]; };
   aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; };
   aroma_core = derive2 { name="aroma.core"; version="3.1.1"; sha256="0mbhk818m8if6cr7g42yy7ba13jh2xs66xkx4zh7dqlwrrmgjnk1"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; };
@@ -4249,9 +4326,9 @@ in with self; {
   arrangements = derive2 { name="arrangements"; version="1.0.2"; sha256="0vqxx0pzvvqnbklpxrcq7d5ppicwbwk3gb2846in0gqjhn4ya4g1"; depends=[gmp R6]; };
   arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; };
   ars = derive2 { name="ars"; version="0.5"; sha256="0m63ljb6b97kmsnmh2z5phmh24d60iddgz46i6ic4rirshq7cpaz"; depends=[]; };
-  arsenal = derive2 { name="arsenal"; version="1.0.0"; sha256="0fv3zq0i28sbdvwh589c27j4k734vr90aik3gxdablgasrhdjfza"; depends=[testthat]; };
+  arsenal = derive2 { name="arsenal"; version="1.2.0"; sha256="1glh8vyms5hcplzzn5n6fynr8jyryy65xb2y9lf6nv7kziwqr5fk"; depends=[testthat]; };
   artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; };
-  arules = derive2 { name="arules"; version="1.6-0"; sha256="14gbq5k2zkx4wc7kkfazz313ngij89qp1xmyxfg3nq3v1s84c3sl"; depends=[Matrix]; };
+  arules = derive2 { name="arules"; version="1.6-1"; sha256="0glfqgxr87900kigmkby2ff7qrjvd6aq595q85y056i5ckjcp615"; depends=[Matrix]; };
   arulesCBA = derive2 { name="arulesCBA"; version="1.1.3"; sha256="0dpa9v8xksq21lyv6g7m81ccpd08lq816vfy5ga8g3blkg1qfrf2"; depends=[arules caret discretization Matrix testthat]; };
   arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; };
   arulesSequences = derive2 { name="arulesSequences"; version="0.2-19"; sha256="1cncvrf7za38b3vdwbzy4yrbakj7jbpxrl1jg6bvjnlkymiajavx"; depends=[arules]; };
@@ -4269,7 +4346,7 @@ in with self; {
   ashr = derive2 { name="ashr"; version="2.2-7"; sha256="1bgkzab7f7fqi259vxrpkxq8yzhh1sl3mqdzc73dk54c5849b2pz"; depends=[assertthat doParallel etrunct foreach Matrix pscl Rcpp SQUAREM truncnorm]; };
   asht = derive2 { name="asht"; version="0.9.3"; sha256="075gzxly8sqkbwnznxcr4z3zs1qvlyl8c4ishgxk035ik1w6p16n"; depends=[bpcp coin exact2x2 exactci perm ssanv]; };
   aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; };
-  asnipe = derive2 { name="asnipe"; version="1.1.8"; sha256="10pza52bcfdj9412hr69lcv4n43y0n91hfkbq8338fsqpad98ilz"; depends=[MASS Matrix]; };
+  asnipe = derive2 { name="asnipe"; version="1.1.9"; sha256="0r6hajdvasvik2ij58xm5kvlcz2gqzgqbvw0ypghrp0qkfqxkrla"; depends=[MASS Matrix]; };
   aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; };
   aspect = derive2 { name="aspect"; version="1.0-4"; sha256="1kxddm8v1y0v2r7lg24r1wpzk7lqzxlrpzq5xb9kn343g53lny6i"; depends=[]; };
   aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; };
@@ -4293,7 +4370,7 @@ in with self; {
   assertive_types = derive2 { name="assertive.types"; version="0.0-3"; sha256="0zxq1jfrzgw95ll7alvm0xnk7aihjdksngq4ya2whyvfjbmv4vdb"; depends=[assertive_base assertive_properties codetools]; };
   assertr = derive2 { name="assertr"; version="2.5"; sha256="17j5aw19cp9csbxhf277yrr4vlr2c5sk70v9a4fnch0c2q14l5f3"; depends=[dplyr lazyeval MASS rlang]; };
   assertthat = derive2 { name="assertthat"; version="0.2.0"; sha256="1wp5znk3xy338x6hknppk702jn596yr735d9i7c3wabm3sdzfgnp"; depends=[]; };
-  assignPOP = derive2 { name="assignPOP"; version="1.1.3"; sha256="12ldcm1v1s311n3c9sysaw5ba2z8yrzrf95rl7ip6fl2q8g0fv6b"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
+  assignPOP = derive2 { name="assignPOP"; version="1.1.4"; sha256="1w13ls4d7gvp17dz0jafwnw9kqn3kl670vs0wf50rladg2fmh7af"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; };
   assist = derive2 { name="assist"; version="3.1.3"; sha256="0ngnn75iid5r014fcly29zhcfpqkqq24znncc3jdanbhdmfyybyz"; depends=[lattice nlme]; };
   assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; };
   assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; };
@@ -4324,10 +4401,11 @@ in with self; {
   audiolyzR = derive2 { name="audiolyzR"; version="0.4-9"; sha256="09jsrjy15vcn6da0kgk06ghayyrf3s853gqv8qdawg745ky2hbgi"; depends=[hexbin plotrix RJSONIO]; };
   audit = derive2 { name="audit"; version="0.1-1"; sha256="0hrcdcwda5c0snskrychiyfjcbnymkcl2x43bapb6inw9y8989qv"; depends=[]; };
   augSIMEX = derive2 { name="augSIMEX"; version="1.0"; sha256="1d13kh9xfkpwy2285awhvgfkwyqlsdk2bypm0i1jjf10avrynxvf"; depends=[MASS Rcpp rootSolve]; };
-  auk = derive2 { name="auk"; version="0.1.0"; sha256="042yygs00vya9xynl2i9bwhwwns3ba25ajp5zlgpv1zw6csby9ml"; depends=[assertthat countrycode dplyr rlang stringi stringr tidyr]; };
+  auk = derive2 { name="auk"; version="0.2.1"; sha256="18vqvjksnllbkwfskiv8cv0dbw92nzkxwb0rj14sxxw8y55hybyy"; depends=[assertthat countrycode dplyr rlang stringi stringr tidyr]; };
   aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; };
   auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; };
   autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; };
+  autoFRK = derive2 { name="autoFRK"; version="1.0.0"; sha256="10vmgcpj2n5w9g4bjq2g3bz3n3x9b6h35w4qfr13v2sdzp3gz5da"; depends=[fields filehash filehashSQLite filematrix FNN LatticeKrig MASS Rcpp RcppEigen RcppParallel RSpectra spam]; };
   autoSEM = derive2 { name="autoSEM"; version="0.1.0"; sha256="0s58dnpr7zyclk5vwaf7a2id6paqsnb224f0gpmj2nms4klsw323"; depends=[GA lavaan snowfall]; };
   autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; };
   autoimage = derive2 { name="autoimage"; version="2.0"; sha256="102f7wkrglsvdrsmyy79v0w7za5b79sn59czxzhriwrp4mrpdl47"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; };
@@ -4336,22 +4414,25 @@ in with self; {
   automultinomial = derive2 { name="automultinomial"; version="1.0.0"; sha256="15cxnqaai2dln6jvk7lpfqvlpv5237zn18axp459p5zxcgg0lw88"; depends=[Hmisc igraph MASS Matrix]; };
   autoplotly = derive2 { name="autoplotly"; version="0.1.1"; sha256="1pm1760dd9p0h66q7y1v9icfhz1lk6i5akjda06jc2f0rq7mzlj0"; depends=[ggfortify ggplot2 plotly]; };
   autopls = derive2 { name="autopls"; version="1.3"; sha256="1qf5gk1vsz1p5670w7bgzh3b15wvrx1gy6ih4sivw0vj8bcjxbw9"; depends=[pls]; };
-  autothresholdr = derive2 { name="autothresholdr"; version="1.1.2"; sha256="0gkab2fnavjfb7h2fd2jbk5phz10hc18kf3l6r2zvvmq3gfhh2db"; depends=[checkmate ijtiff magrittr Rcpp RSAGA]; };
+  autothresholdr = derive2 { name="autothresholdr"; version="1.2.0"; sha256="09wpyirsqw0s4b5221ksr0v0srrq24c6ca8kr5m4hr4ps728np0p"; depends=[checkmate filesstrings ijtiff magrittr Rcpp]; };
   autovarCore = derive2 { name="autovarCore"; version="1.0-2"; sha256="0yvz3nn792xdam8hgnkdrhcyaf9idp0shb1s0yfj1xigknlinn9n"; depends=[Amelia jsonlite Rcpp urca vars]; };
   available = derive2 { name="available"; version="1.0.0"; sha256="0w4i0ajw0p71k717v8hg9d8az08m8yl97w5lly87kli36p7mv30h"; depends=[cli clisymbols crayon desc glue jsonlite memoise purrr SnowballC stringdist tibble tidytext udapi yesno]; };
   averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; };
   aws = derive2 { name="aws"; version="1.9-6"; sha256="0mfq44pji0p6d7s1wbwi0f97lsh3f33wnj8fiyimpg9fv8lr4inz"; depends=[awsMethods gsl]; };
-  aws_alexa = derive2 { name="aws.alexa"; version="0.1.4"; sha256="1dqfmmmvdmlpk9ld563f65chwp2ahhlnrvbzsj9m5rfjs0bw6yny"; depends=[aws_signature httr plyr XML]; };
+  aws_alexa = derive2 { name="aws.alexa"; version="0.1.6"; sha256="0c2yl023g2m4kqhhv4nbysjmp103aj3pk17dwyb9nrkpj9qm8zsh"; depends=[aws_signature dplyr httr xml2]; };
   aws_cloudtrail = derive2 { name="aws.cloudtrail"; version="0.1.5"; sha256="0p7qj9ivs14ska11a9qni4n0f8d05c1p126zvlxj9038c9p0y1wx"; depends=[aws_s3 aws_signature httr jsonlite]; };
-  aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.2"; sha256="1ycxir3l7jcnxp6hdpr3zqf885hl8zb1yvjyr09cq3ql82vi95ml"; depends=[curl jsonlite]; };
+  aws_comprehend = derive2 { name="aws.comprehend"; version="0.1.2"; sha256="0480ggfdmcv2pkjzmwh40h4nd87qswrpwr6h3j959f9y8zmzfd7n"; depends=[aws_signature httr jsonlite]; };
+  aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.1.4"; sha256="08l1gnqn2l6f6rkh21v1my2jp5bbzwnq38swymwl94jbnvnlrasw"; depends=[curl jsonlite]; };
   aws_iam = derive2 { name="aws.iam"; version="0.1.7"; sha256="0hag8j5g8rqg39x4f6d8vwwzhz98cx7549xixfl9cxiff7x9sz2c"; depends=[aws_signature httr jsonlite xml2]; };
   aws_lambda = derive2 { name="aws.lambda"; version="0.1.6"; sha256="16vis596clxn6h9j1k66224ikacsg0f9xrzqi5987nqlzrwskjgk"; depends=[aws_signature base64enc httr jsonlite]; };
   aws_polly = derive2 { name="aws.polly"; version="0.1.2"; sha256="0ij0rbng8q7xfa08p4x1l1lcmskmz3fy2pvln28zxqbs6jbc22rm"; depends=[aws_signature httr jsonlite tuneR]; };
-  aws_s3 = derive2 { name="aws.s3"; version="0.3.3"; sha256="1vk4ykgfdyfispd9nkk1qc1jjhvjhxqzhd48g5ddqz09wm0wx4w3"; depends=[aws_signature base64enc digest httr xml2]; };
+  aws_s3 = derive2 { name="aws.s3"; version="0.3.11"; sha256="0zb219xib86980gq00sam804m91448lsmcy4a3ac322sifmrpasc"; depends=[aws_signature base64enc digest httr xml2]; };
   aws_ses = derive2 { name="aws.ses"; version="0.1.4"; sha256="13hf4iqhnpkm9rnr7nzwky663vplnkjrgk90zix91cn2fvaspjgp"; depends=[aws_signature httr jsonlite]; };
-  aws_signature = derive2 { name="aws.signature"; version="0.3.5"; sha256="1ijzdxv46x5iydmhgbri4lfpdhhlhz1ybhwwdcy4m4mjz9s74yhk"; depends=[base64enc digest]; };
+  aws_signature = derive2 { name="aws.signature"; version="0.4.1"; sha256="094d0jwg6433bdfkvs3r9mjvg61k78ff4ck0zhgyaz4aivlchm9j"; depends=[base64enc digest]; };
   aws_sns = derive2 { name="aws.sns"; version="0.1.7"; sha256="0i8nn5jnykhsjwn4nsqdqbagankjc09zs8and54rkirdigzdny8v"; depends=[aws_signature httr jsonlite xml2]; };
   aws_sqs = derive2 { name="aws.sqs"; version="0.1.10"; sha256="09sh3injb4kfrq5al7hmbnqdn5v5hnjkqqsz86vpi4154435ymdg"; depends=[aws_signature httr jsonlite xml2]; };
+  aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.2"; sha256="12qz7j535aqxcvcawj4iqycbcmlba32sdl8qj2cw6rq5rgm55xaz"; depends=[aws_signature httr jsonlite]; };
+  aws_translate = derive2 { name="aws.translate"; version="0.1.3"; sha256="0qr38f2ywrmccg0k080lhfvvf9zkmclvpmfcwjizls6qkwfww3il"; depends=[aws_signature httr jsonlite]; };
   awsMethods = derive2 { name="awsMethods"; version="1.1-0"; sha256="1xywcadpjyzlw5f2k9sbr8fvrj3kcr1r6swi23lc952yrl3gvpkl"; depends=[]; };
   awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; };
   awspack = derive2 { name="awspack"; version="0.1.6"; sha256="0pf6g9w2r2rm887sa3v0gfwia2w2q94m40m76sq66gb3spkmngd5"; depends=[aws_alexa aws_cloudtrail aws_ec2metadata aws_iam aws_lambda aws_polly aws_s3 aws_ses aws_signature aws_sns aws_sqs]; };
@@ -4359,7 +4440,7 @@ in with self; {
   b6e6rl = derive2 { name="b6e6rl"; version="1.1"; sha256="17scdskn677vaxx1h2jypqaffvjgczryplg17nr3wigi1x0cxg7a"; depends=[]; };
   bPeaks = derive2 { name="bPeaks"; version="1.2"; sha256="1z6jghcmw0lwv17ms7gdp5zzimaawq3ahbwkxa4062g373592smd"; depends=[]; };
   bReeze = derive2 { name="bReeze"; version="0.4-2"; sha256="04zapsxb4lsi85m9qgrsm49yasf0b8wk0djdpa7xks4hjvmskfhq"; depends=[]; };
-  bWGR = derive2 { name="bWGR"; version="1.5.1"; sha256="0dkpj9xskflnhqr92bi54cg3qckjja1jj5vjypzijikwqimz879h"; depends=[Rcpp]; };
+  bWGR = derive2 { name="bWGR"; version="1.5.2"; sha256="1ijz72zxxykscbsr4n1k66zjcy6zs9azgdyf2s5w8j291zy43gw6"; depends=[Rcpp]; };
   babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; };
   babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; };
   babynames = derive2 { name="babynames"; version="0.3.0"; sha256="018wyajdkpvcywcvkna57m5sqnsh7i9zq2hqlyb8q93mgyb3ddzm"; depends=[tibble]; };
@@ -4372,12 +4453,12 @@ in with self; {
   badgecreatr = derive2 { name="badgecreatr"; version="0.1.0"; sha256="070zb5jw817s9ykqc3dvzjqk48612gydkdc31svc0ji01s1y1545"; depends=[stringr]; };
   badger = derive2 { name="badger"; version="0.0.2"; sha256="15qnb0a6rqsf1dbb1cf9ag2z5f4zhf8b8psxbsdhh42qrg8g3mma"; depends=[dlstats rvcheck]; };
   bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; };
-  bairt = derive2 { name="bairt"; version="0.1.1"; sha256="1i0y7bkhx0rsv93j32i2v3g2h3csxvnkkkx9kvkdnkcwzffps5x2"; depends=[coda mvtnorm shiny shinyjs]; };
+  bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; };
   baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; };
-  ballr = derive2 { name="ballr"; version="0.1.1"; sha256="1n2kaindpr6ba2fc1zvkl78jxl24y1gxn9dxv10c8m594l8shbxw"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
+  ballr = derive2 { name="ballr"; version="0.2.0"; sha256="1f5fclmgp0pznahr3ix7xiixqah01jmh2g6fvrqyi6xcin8ynwqc"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; };
   bamboo = derive2 { name="bamboo"; version="0.9.19"; sha256="1k81r06kw50w6lm0vi6xwjymc4l13abagrn5b6czcyki3i6pwqc2"; depends=[rscala]; };
   bamdit = derive2 { name="bamdit"; version="3.1.0"; sha256="148ikj7mly8m6kxs2n4gidi7kb70i3x2vbf9xsllrf0cgvrjccps"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; };
-  bamlss = derive2 { name="bamlss"; version="0.1-2"; sha256="1d5pinyq16y0ljjgf23mpabzpsx4n2vh91c89qmzclcw7ns0l7xw"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp spam survival]; };
+  bamlss = derive2 { name="bamlss"; version="1.0-0"; sha256="0wa54f5zyjyplys29cqhrasc6qa8p5znfal2ihp0qhhs46wzsk4y"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; };
   banR = derive2 { name="banR"; version="0.2.0"; sha256="0m71m99f8f4wckylry6z16gw6r2cc4wxbd9287ns00jr6s13x6c8"; depends=[dplyr httr magrittr purrr readr rlang stringr tibble]; };
   bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; };
   bang = derive2 { name="bang"; version="1.0.0"; sha256="16wy2imrdvhpdzi6ix9k69afqdyc44d1xr655yd3q1cl12x1nr04"; depends=[bayesplot rust]; };
@@ -4385,28 +4466,29 @@ in with self; {
   banxicoR = derive2 { name="banxicoR"; version="0.9.0"; sha256="0vchm2hnqm45fhn8k38rcam4vkazmifcl40390s2r04bgvqr0pnl"; depends=[rvest stringr xml2]; };
   bapred = derive2 { name="bapred"; version="1.0"; sha256="08kvc4cc984jv08ikwbja8zxidrcdiwi5w88hlqakbm8yc6hzssa"; depends=[affy affyPLM Biobase FNN fuzzyRankTests glmnet lme4 MASS mnormt sva]; };
   barcode = derive2 { name="barcode"; version="1.1"; sha256="14zh714cwgq80zspvhw88cs5b82gvz4b6yfbshj9b7x0y2961nxd"; depends=[lattice]; };
-  bartMachine = derive2 { name="bartMachine"; version="1.2.4"; sha256="09w3gb7lh12ls8hmmnssvmlmp3lkbr2j0jqdihfb6049cgl31m60"; depends=[bartMachineJARs car missForest randomForest rJava]; };
+  bartMachine = derive2 { name="bartMachine"; version="1.2.4.1"; sha256="0awshy5djs6f6v77g9f4xcmg9pg3zs650bzql3nvfxw5d0zdnbzb"; depends=[bartMachineJARs car missForest randomForest rJava]; };
   bartMachineJARs = derive2 { name="bartMachineJARs"; version="1.1"; sha256="1wpfzrb6mrx3xmxy4rgnwygmpqq2l4ki2xqr4m51g1bl9nwirhzj"; depends=[rJava]; };
   basad = derive2 { name="basad"; version="0.2.0"; sha256="1qc2amkrjrgdqys275p82lmbpjszm5rzjdpri7hqc9d8b8q1vc9q"; depends=[Rcpp RcppEigen rmutil]; };
+  base2grob = derive2 { name="base2grob"; version="0.0.2"; sha256="0mknr1kdy2vpa8cj18crr98sp22qj27bb1g3mrm64azchsqr5k64"; depends=[gridGraphics]; };
   base64 = derive2 { name="base64"; version="2.0"; sha256="1labh0ycdm2xcjssj8bhnyjvbk44mcdsi0rb2p8rfqa428mrq9cf"; depends=[openssl]; };
   base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; };
   base64url = derive2 { name="base64url"; version="1.3"; sha256="1azik4yqafay4m2panbnyyf7cq5qb2qjv74ikhb8rljbsgv2xchd"; depends=[backports]; };
   baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; };
-  basefun = derive2 { name="basefun"; version="1.0-0"; sha256="1a2ksmxki1jg0g9359zxzxignpcz7lcahqf6k3nclv7s0p22vb42"; depends=[Matrix orthopolynom polynom variables]; };
+  basefun = derive2 { name="basefun"; version="1.0-1"; sha256="0qiszm71alh7p3inhiv9prdl4f5l45ny8plz2fm7l5h51z5xj54r"; depends=[Matrix orthopolynom polynom variables]; };
   baseline = derive2 { name="baseline"; version="1.2-1"; sha256="1vk0vf8p080ainhv09fjwfspqckr0123qlzb9dadqk2601bsivgy"; depends=[SparseM]; };
   basicTrendline = derive2 { name="basicTrendline"; version="1.0.1"; sha256="0rsmlp70ylpkqv437jcy3skwbfkj4xwkpjb2q79b9n8kw2ir0716"; depends=[]; };
   basicspace = derive2 { name="basicspace"; version="0.20"; sha256="0nyljk8ydasirgv7ijxplyhk10s8m9k3rw5qmgf0z81dm7p257wc"; depends=[]; };
   basictabler = derive2 { name="basictabler"; version="0.1.0"; sha256="1m4cgghfh3aixsnwjlbaj3prnnqxhij60bakz9vdr5dvnqg92an9"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; };
   bastah = derive2 { name="bastah"; version="1.0.7"; sha256="08xdba16wj0inp0kq2sbcrdr6wj8bwlq7rqnfrzjrz03wxhc5bk0"; depends=[BigQuic foreach glmnet lars MASS Matrix scalreg]; };
   batade = derive2 { name="batade"; version="0.1"; sha256="1lr0j20iydh15l6gbn471vzbwh29n58dlpv9bcx1mnsqqnsgpmal"; depends=[hwriter]; };
-  batch = derive2 { name="batch"; version="1.1-4"; sha256="03v8a1hsjs6nfgmhdsv6fhy3af2vahc67wsk71wrvdxwslmn669q"; depends=[]; };
+  batch = derive2 { name="batch"; version="1.1-5"; sha256="0wdgfvk2i542cqg34ikvzwlix09f2jyjb32a0f4zh9vg9nrywswq"; depends=[]; };
   batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; };
   batchtools = derive2 { name="batchtools"; version="0.9.8"; sha256="1ch03hj8ahkfc9sr4gv985s6zzxk5xm2dbm0hm8xjygkqkd8r5n9"; depends=[backports base64url brew checkmate data_table digest progress R6 rappdirs stringi withr]; };
   batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; };
   batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; };
   bayesAB = derive2 { name="bayesAB"; version="1.1.0"; sha256="0g74n6jvpmb2sbmywcagb10rk8sd3pxzkw9s8s6qpg34q58v01a6"; depends=[ggplot2 Rcpp]; };
   bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; };
-  bayesDP = derive2 { name="bayesDP"; version="1.3.0"; sha256="1g7d64brln5p2gindc18jk4wqmh6phqr4zhs8jhl0yk9g4jhsqzn"; depends=[ggplot2 Rcpp RcppArmadillo survival]; };
+  bayesDP = derive2 { name="bayesDP"; version="1.3.1"; sha256="175g75cpynccyzcbzca4h6xa2708985h8dhq34kvkpfhv35pc64d"; depends=[ggplot2 Rcpp RcppArmadillo survival]; };
   bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; };
   bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; };
   bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; };
@@ -4414,10 +4496,11 @@ in with self; {
   bayesImageS = derive2 { name="bayesImageS"; version="0.5-1"; sha256="1p4l3i57xm8yrczdiz4nxmd8qv0pv0chlrpvndfn3fnjbcx2cfa2"; depends=[Rcpp RcppArmadillo]; };
   bayesLife = derive2 { name="bayesLife"; version="3.2-0"; sha256="1a3x3y77542hgndvymhnyg6dys0s5rimkgprl8psflsgsrxnbmcv"; depends=[bayesTFR car coda hett wpp2017]; };
   bayesLopod = derive2 { name="bayesLopod"; version="1.0.1"; sha256="0v9yy75mvr74jc0fz10qj1acwxjy0lbqkdqaj1hn88v294r9dw3q"; depends=[BH inline raster Rcpp RcppEigen rgeos rstan rstantools slam sp StanHeaders]; };
-  bayesPop = derive2 { name="bayesPop"; version="6.2-3"; sha256="1znjf8mihip0dl7dyk8h3nbkzihz8lnf7kxvhf1l363v449s0bff"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2017]; };
+  bayesPop = derive2 { name="bayesPop"; version="6.2-4"; sha256="1z8s5lbvz642hxl10b4cv361izw82akq40dav3mknqqcgv1vlrk6"; depends=[abind bayesLife bayesTFR fields googleVis plyr reshape2 rworldmap wpp2012 wpp2017]; };
   bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; };
   bayesSurv = derive2 { name="bayesSurv"; version="3.2"; sha256="1zp302pfi64nnqdiqldvfi1lm0wv2dplz5sfjp0ydl1qc16z0axp"; depends=[coda smoothSurv survival]; };
   bayesTFR = derive2 { name="bayesTFR"; version="6.1-2"; sha256="092sl8xk82kybpp0v06j0dxh4zal0d6j2na42ghl2ri36iy6wqvx"; depends=[coda MASS mvtnorm wpp2017]; };
+  bayesammi = derive2 { name="bayesammi"; version="0.1.0"; sha256="1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs"; depends=[dplyr ggplot2 lme4 magrittr MASS mvtnorm rlang rstiefel scales tibble tidyr tmvtnorm]; };
   bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; };
   bayesboot = derive2 { name="bayesboot"; version="0.2.1"; sha256="0gd3in9z8kx3d29dvyd8blmhlc7wxxl5b2hxnrrq0w13jcnsn57w"; depends=[HDInterval plyr]; };
   bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; };
@@ -4426,12 +4509,13 @@ in with self; {
   bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; };
   bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; };
   bayesm = derive2 { name="bayesm"; version="3.1-0.1"; sha256="04b4s8clxrmdyhnhd2arnsdi992422yam3z91w6dzrmngwxq4yaq"; depends=[Rcpp RcppArmadillo]; };
-  bayesmeta = derive2 { name="bayesmeta"; version="2.1"; sha256="02aw7fgvdsnqasmvljh1pd5nks1hjys7n3kmlwnkr5a6w476v1q9"; depends=[forestplot metafor]; };
+  bayesmeta = derive2 { name="bayesmeta"; version="2.2"; sha256="15pqa1plcnl8pbzs38cw22y3qq1v7f9vla4zy0154crvbrbp8kwf"; depends=[forestplot metafor]; };
   bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; };
-  bayesplot = derive2 { name="bayesplot"; version="1.4.0"; sha256="0izp2v734n4pcdlfjrhasl2srlnhccsf93ni6hfhl5l5xyf02043"; depends=[dplyr ggplot2 reshape2 rlang]; };
+  bayesplot = derive2 { name="bayesplot"; version="1.5.0"; sha256="1f0kgrgr87fp9576ssrygkp5n4186zq1rw5iwzhqr8s81is352li"; depends=[dplyr ggplot2 ggridges reshape2 rlang]; };
   bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; };
   bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; };
   bayou = derive2 { name="bayou"; version="1.1.0"; sha256="1ndd7lygphngvn4a432616f6anmhxbdzmkksrhpl76xvrw5agwkc"; depends=[ape coda denstrip fitdistrplus foreach geiger MASS mnormt phytools Rcpp RcppArmadillo]; };
+  baystability = derive2 { name="baystability"; version="0.1.0"; sha256="1zv4bf5a4p21w2qpr6lcsgsxb0xv15v8p33031rsypmnbs9i80dp"; depends=[dplyr ggfortify ggplot2 lme4 magrittr MASS matrixStats reshape2 rlang rstiefel scales tibble tidyr tidyverse]; };
   bazar = derive2 { name="bazar"; version="1.0.6"; sha256="12b1x218x1yh9iadv8ciyncr841s0arvj4pbn74bryhcgbvmbwqm"; depends=[kimisc]; };
   bbefkr = derive2 { name="bbefkr"; version="4.2"; sha256="1wjx652w3p41sq71a2zdzmb7frjxm6xvcgrc2ark2spwb0lbjjw6"; depends=[]; };
   bbemkr = derive2 { name="bbemkr"; version="2.0"; sha256="015c57s8mpimm82nddnh382wlkisxgdmc2hvp7k38pcnqxc5gb5q"; depends=[MASS]; };
@@ -4441,9 +4525,10 @@ in with self; {
   bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; };
   bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-2"; sha256="0v1zjbgpalr5ag97s9rxcd2z0r7qpw8yhc4lw4p4i3xkw2paf5zh"; depends=[boot nnet Rcpp RcppArmadillo rgl]; };
   bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; };
+  bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; };
   bclust = derive2 { name="bclust"; version="1.5"; sha256="01kx02azj26b6swly53zhf3sny6c6jglkxnzylsc0pvri89x7yj2"; depends=[]; };
-  bcmaps = derive2 { name="bcmaps"; version="0.17.0"; sha256="18rn9zlagp5f0268m8azcbl52jcyx33jjxaqpg05cz853fxib24h"; depends=[httr rappdirs sf]; };
-  bcp = derive2 { name="bcp"; version="4.0.0"; sha256="1bkd7812jacyk955l71b2szpc9550p0hpv3x337qgl09zck4vdgm"; depends=[Rcpp RcppArmadillo]; };
+  bcmaps = derive2 { name="bcmaps"; version="0.17.1"; sha256="12hca67n7fqplis8g954hj588zl9kj8gmph86mxhcy151qpyh927"; depends=[httr rappdirs sf]; };
+  bcp = derive2 { name="bcp"; version="4.0.1"; sha256="1cw7gnkskzwql55bxfrxajsi828zj7rjn7my7dk8lkdqz7n3lsgb"; depends=[Rcpp RcppArmadillo]; };
   bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; };
   bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; };
   bcrm = derive2 { name="bcrm"; version="0.4.7"; sha256="0s0xmmphrrsqnrsnnsqh9ska6afl4jyk0s0290w6askrlqdzjgil"; depends=[ggplot2 mvtnorm]; };
@@ -4452,7 +4537,7 @@ in with self; {
   bda = derive2 { name="bda"; version="10.1.9"; sha256="06ycxqjpnsywakjkjxf1czhxsbdzbpwa11m69gad5538z066d24x"; depends=[]; };
   bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; };
   bdlp = derive2 { name="bdlp"; version="0.9-1"; sha256="1ydb5hsaj1bfdz7hcdkc74qlk608kf0xrbpw247klkxrhsh9ba2p"; depends=[DBI GenOrd MASS MultiOrd rgl RSQLite stringdist]; };
-  bdots = derive2 { name="bdots"; version="0.1.15"; sha256="1a665f9f18wajf4y6jp17icg9w6wx698xfnlry2sm5pq6nrkmwln"; depends=[doParallel doRNG foreach mvtnorm nlme]; };
+  bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; };
   bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; };
   bdpv = derive2 { name="bdpv"; version="1.1"; sha256="0i6wdf27243ch8pn2chqriwxjg3g72wbvzlx52mz4ahw700xjc7n"; depends=[]; };
   bdscale = derive2 { name="bdscale"; version="2.0.0"; sha256="1hkkfd69g2bg2y4hicjs6bnw9f0zw74jy0dpadchnzw17lffpms3"; depends=[ggplot2 scales]; };
@@ -4463,15 +4548,17 @@ in with self; {
   beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; };
   beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; };
   beadplexr = derive2 { name="beadplexr"; version="0.1.0"; sha256="1aw75v4bjxrf22x0bm57qqp6r7cz8zmkd1hmk4amlxypbxd2479f"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; };
+  beam = derive2 { name="beam"; version="1.0.1"; sha256="1xp8hqs1asg2a2lqzn88cxj0gs6qfwak54sy3kzc64kjp0r9lbl9"; depends=[fdrtool igraph knitr Matrix]; };
   beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; };
   beanz = derive2 { name="beanz"; version="2.1"; sha256="0lnjaka2cmkgc7id8njclmmkjb22v6gz9bkncq5n6zidawrczqp0"; depends=[BH loo Rcpp RcppEigen rstan StanHeaders survival]; };
-  beast = derive2 { name="beast"; version="1.0"; sha256="1j4afp8cm6psxqidanvcfqrz6zy1klkzjkm7ia5w5qlvgll2micz"; depends=[RColorBrewer]; };
+  beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; };
   bedr = derive2 { name="bedr"; version="1.0.4"; sha256="052sn90gjr34hjgyndzvcl66pv22q0kjqbx95y1pdydiwhwmhpa3"; depends=[data_table R_utils testthat VennDiagram yaml]; };
   beepr = derive2 { name="beepr"; version="1.2"; sha256="0w4szy3rgj1bdcanxbcb9agyw38jqp0hc7qsn7j9700vh20zqbln"; depends=[audio stringr]; };
   beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; };
   beginr = derive2 { name="beginr"; version="0.1.0"; sha256="0zi2c6agkxx6aq7ih2c1z4r93fsjmqp2iymxllld0d7jcpp5qbv6"; depends=[cranlogs jsonlite]; };
+  behavr = derive2 { name="behavr"; version="0.3.1"; sha256="18rpln7db8cnaj6f47vjgh7q2xbcjmd0vhfbmvm82fr7qhdnnyc0"; depends=[data_table]; };
   belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; };
-  belg = derive2 { name="belg"; version="0.1.1"; sha256="0bbp413q6y24g05xsk49lpz7b2i6n9fb791h05ml39x8r9lapif6"; depends=[Rcpp RcppArmadillo]; };
+  belg = derive2 { name="belg"; version="0.2.1"; sha256="0yl4d2zq01r0wcxdjz3v0zmhdj1g7nbw1kn56883vsv5izdliksv"; depends=[Rcpp RcppArmadillo]; };
   benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; };
   benchmark = derive2 { name="benchmark"; version="0.3-6"; sha256="05rgrjhbvkdv06nzbh0v57b06vdikrqc1d29wirzficxxbjk1hih"; depends=[ggplot2 plyr proto psychotools relations reshape scales]; };
   benchmarkme = derive2 { name="benchmarkme"; version="0.6.0"; sha256="0w98q4b814bz3q0vqdfnwqrgfrky3ggsyyzmdiz17kv6xk17qds8"; depends=[benchmarkmeData doParallel foreach httr Matrix]; };
@@ -4479,9 +4566,9 @@ in with self; {
   benchr = derive2 { name="benchr"; version="0.2.0"; sha256="042ijh6726s116z7w2cky5l105p3dj7xsfmlwkigsbrmya8x5d37"; depends=[Rcpp RcppProgress]; };
   benford_analysis = derive2 { name="benford.analysis"; version="0.1.4.1"; sha256="0acbjjavbvsaigy78b5k9qhj8011751116lqln8j0v8w1k3vqwqm"; depends=[data_table]; };
   bentcableAR = derive2 { name="bentcableAR"; version="0.3.0"; sha256="1gjrlv94av9955jqhicaiqm36rrgmy0avxn9y7wbp2s1sbg7fyg7"; depends=[]; };
-  benthos = derive2 { name="benthos"; version="1.3-4"; sha256="015p9wxykr2g29r95wdslw1d2klc9ps4wznjrv1rxm5mazdbb2wv"; depends=[dplyr lazyeval readr]; };
+  benthos = derive2 { name="benthos"; version="1.3-5"; sha256="1mzhqqy4dblwv70v1ky5gzrr3jyky9k4wibbp589jjjrga2vhq2a"; depends=[dplyr lazyeval readr]; };
   ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; };
-  berryFunctions = derive2 { name="berryFunctions"; version="1.16.3"; sha256="0bwqp999niakmihhj4wp9q63bg4mr4gsygxzss0dl276q7ma8x5i"; depends=[abind]; };
+  berryFunctions = derive2 { name="berryFunctions"; version="1.17.0"; sha256="13wslhr3xm9davx3s69as41r53m3x0gm3mrnwrbsqcbmf9n0zbv3"; depends=[abind]; };
   bestNormalize = derive2 { name="bestNormalize"; version="1.0.1"; sha256="0mlvaa35nsp19154g894xvfd6wg99lwxnfissf8yykwfl7fb265x"; depends=[LambertW nortest]; };
   bestglm = derive2 { name="bestglm"; version="0.36"; sha256="1das1qnczgw46hrjplfhw00wqjd8gxqsdr9s4zmc3k8qlzhb3ych"; depends=[glmnet grpreg lattice leaps]; };
   betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; };
@@ -4504,17 +4591,18 @@ in with self; {
   bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; };
   bgsmtr = derive2 { name="bgsmtr"; version="0.1"; sha256="09h118msqf9yl2z7d6dsvgn4vrvy43ynznajj58k7gkxdlm1nimg"; depends=[coda EDISON Matrix mnormt mvtnorm sparseMVN statmod]; };
   bhm = derive2 { name="bhm"; version="1.13"; sha256="1iq1hjc7xn2kmmxgzv6mzcvvf48kqp5b8lavmzrqykak3v4z02nz"; depends=[coda survival]; };
+  bhrcr = derive2 { name="bhrcr"; version="1.0.0"; sha256="0rqn9wkd25d7l295n55idsf1zch1niz5f05qnsbd1gqrq7nw42xn"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; };
   biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; };
-  bibliometrix = derive2 { name="bibliometrix"; version="1.9"; sha256="1yzdbh5h3fvc6agr551g9n10mlr72cbsrw9mpigfhxb953wvda54"; depends=[factoextra FactoMineR ggplot2 igraph Matrix RColorBrewer RISmed rscopus SnowballC stringdist stringr]; };
+  bibliometrix = derive2 { name="bibliometrix"; version="1.9.2"; sha256="0xv371k1n00awk3w7cjbiyf3wxkk5vch3hf7lp2yz3fsdy2jh91s"; depends=[factoextra FactoMineR ggplot2 ggrepel igraph Matrix RColorBrewer RISmed rscopus SnowballC stringdist stringr]; };
   bibliospec = derive2 { name="bibliospec"; version="0.0.4"; sha256="0abrbaw2knnlh8g5r4c2i6cc7a6ilfxry8zhscrx0x58irmp790b"; depends=[DBI RSQLite]; };
   bibtex = derive2 { name="bibtex"; version="0.4.2"; sha256="0wl3925ryd54g1nv3ncwllc493d39dpgy5md61940h69c0van1hz"; depends=[stringr]; };
   biclique = derive2 { name="biclique"; version="1.0.1"; sha256="0wxvqjxc11ccvfnlnnb6gv6r74a48pg3yabsjynrg1m2kbynnqjf"; depends=[]; };
   biclust = derive2 { name="biclust"; version="1.2.0"; sha256="03vkj7zp3dl4zbv2gzv9pahcd1018lbv4ixghvv1g0fsbndrybdg"; depends=[colorspace flexclust lattice MASS]; };
-  bifactorial = derive2 { name="bifactorial"; version="1.4.7"; sha256="187zlsqph7m63wf6wajvs6a4a08aax9hiqssgvma6cpkpisfiz4k"; depends=[lattice multcomp mvtnorm Rcpp]; };
   bife = derive2 { name="bife"; version="0.5"; sha256="0lzij8sazfdr687bi5lfp5ndvwlx18vyzr3svc0zv9mnv8s8vfvd"; depends=[Formula Rcpp RcppArmadillo]; };
   bigFastlm = derive2 { name="bigFastlm"; version="0.0.2"; sha256="012vxy5mpknc3998h382qdzgrxnyfpyddy003zjp3v42clim5y64"; depends=[BH bigmemory Rcpp RcppEigen]; };
   bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; };
-  bigKRLS = derive2 { name="bigKRLS"; version="2.0.4"; sha256="027p1v89fpi2rgxca035nyzk51dxv0x04sy3mqb5z38rvj8r08k9"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; };
+  bigIntegerAlgos = derive2 { name="bigIntegerAlgos"; version="0.1.0"; sha256="1ik5daj2yc2shjkqypl4y6d53nmz170jvx0bdxn3hpm3g5crg1wd"; depends=[gmp]; };
+  bigKRLS = derive2 { name="bigKRLS"; version="3.0.0"; sha256="043lm32cams2hc0fg1mvq08r4ippy4s5z62n1616vndfmqsn41v8"; depends=[BH bigalgebra biganalytics bigmemory ggplot2 Rcpp RcppArmadillo shiny]; };
   bigQueryR = derive2 { name="bigQueryR"; version="0.3.2"; sha256="0l61yvvjlv1zgb1vyf1q3sj4dff1vi6lkf61hc9kqs5cvhqbf87y"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; };
   bigRR = derive2 { name="bigRR"; version="1.3-10"; sha256="08m77r9br6wb9i21smaj4pwwpq3nxdirs542gnkrpakl7bvyp6s3"; depends=[DatABEL hglm]; };
   bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; };
@@ -4522,8 +4610,9 @@ in with self; {
   biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; };
   biglars = derive2 { name="biglars"; version="1.0.2"; sha256="17zs25dvlja9ynx2fm5f4nmgkx4mnyqs5iscwsyahr6qigx1rz9x"; depends=[ff]; };
   biglasso = derive2 { name="biglasso"; version="1.3-6"; sha256="044l2l34l4pl7ijwgq569cn8x5clj795qpfwb1b9qfwvggvgzgni"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; };
-  bigleaf = derive2 { name="bigleaf"; version="0.3.0"; sha256="1y1z9hi23w0n374jvndr0prry7msp6lfzkwzdr7ivpi89af0h027"; depends=[robustbase]; };
+  bigleaf = derive2 { name="bigleaf"; version="0.5.2"; sha256="13x79i15jvv1bx4xnl9jakjmbxviac0gnrprax61c5afkaqxfxh4"; depends=[robustbase]; };
   biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; };
+  bigmatch = derive2 { name="bigmatch"; version="0.1.0"; sha256="15qrm3kdp9wglmpsy58z117nj85j8zc6cmf5w1kydamk2c8x49c9"; depends=[liqueueR mvnfast plyr rcbalance]; };
   bigmemory = derive2 { name="bigmemory"; version="4.5.33"; sha256="0ycl9dzm3drpyas625h34rir5bnbjlncxlvawfsfmqwcbmwdjdvj"; depends=[BH bigmemory_sri Rcpp]; };
   bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; };
   bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; };
@@ -4541,14 +4630,14 @@ in with self; {
   billboarder = derive2 { name="billboarder"; version="0.2.1"; sha256="0xmkj6l3cpyyq23hp6jhfqllpg7gkksajnq25wyccqmypxjik8jv"; depends=[ggplot2 htmlwidgets jsonlite magrittr scales]; };
   bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; };
   bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; };
-  binGroup = derive2 { name="binGroup"; version="1.1-0"; sha256="1sf7prg2x1ryynf1kz7jr50svmga7kjgd5pi9qm3g2hyimz8mvs4"; depends=[]; };
+  binGroup = derive2 { name="binGroup"; version="2.1-1"; sha256="1rwmsrm4ghpvb1vldph2frwglfvajwyj7bzi1f6mhnm9mrg80blj"; depends=[partitions]; };
   binMto = derive2 { name="binMto"; version="0.0-6"; sha256="1h9s42wk848x15f4glhsh2iikpra64miwlia6xz5dqlzbs4vw86k"; depends=[mvtnorm]; };
   binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; };
   binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; };
   binda = derive2 { name="binda"; version="1.0.3"; sha256="15rhxnlif7agblzd09gyllkqkf5d8cc75b4vmp7grx8a6y7w47g0"; depends=[entropy]; };
   bindata = derive2 { name="bindata"; version="0.9-19"; sha256="15ya21fz1kvq4qsppkn9ypiqvaq8q4vszdcgcymampa7zc07z2ld"; depends=[e1071 mvtnorm]; };
-  bindr = derive2 { name="bindr"; version="0.1"; sha256="0d95ifm0x4mrfzi20xf39f5pzd7rfzqsld0vjqf6xzga5rhnd8fc"; depends=[]; };
-  bindrcpp = derive2 { name="bindrcpp"; version="0.2"; sha256="0l1l22zl87wiyl79m3gj2vlxmkhxvrkl4alhyy08h55q7hqs3vyh"; depends=[bindr plogr Rcpp]; };
+  bindr = derive2 { name="bindr"; version="0.1.1"; sha256="1l05fpk2yql3jka321c0bdgx6mqq9pvfrg2844lbjfpbgjkmqy3w"; depends=[]; };
+  bindrcpp = derive2 { name="bindrcpp"; version="0.2.2"; sha256="0rz4ibjdjsxl99ff3ha79z7cnjmilx4rx58fk9kk7ld9xc4hf4s8"; depends=[bindr plogr Rcpp]; };
   binequality = derive2 { name="binequality"; version="1.0.3"; sha256="0hhcmw1mq785zylcxghfnazi3xvnl7sqpqll8fqdk064a4drqkw1"; depends=[gamlss gamlss_cens gamlss_dist ineq survival]; };
   binford = derive2 { name="binford"; version="0.1.0"; sha256="04mpdvynlm4gddybys04k0446gc9hyq0vaxr6a525p76ls5aw4b1"; depends=[]; };
   bingat = derive2 { name="bingat"; version="1.3"; sha256="1y68rgafipfad78yrzcygdszgy1d5q739kap06pzr78bn3i8hiwa"; depends=[doParallel foreach gplots matrixStats network vegan]; };
@@ -4566,14 +4655,14 @@ in with self; {
   binsmooth = derive2 { name="binsmooth"; version="0.1.0"; sha256="1zlw4zmkckg7rwf4hx8wyr2yl644xkdkazayysy99saysr9pk2c9"; depends=[ineq pracma triangle]; };
   binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; };
   bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; };
-  bio3d = derive2 { name="bio3d"; version="2.3-3"; sha256="0cw6nhkj5mxh89lfrnhrmv0rwxkmh05g6nd6rvd7ahcaxd3mid7l"; depends=[Rcpp]; };
-  bioOED = derive2 { name="bioOED"; version="0.1.1"; sha256="18b66s5dn8a67iwb0g1bmbi856ip81yfa57m40kf7phsga52ncg1"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; };
+  bio3d = derive2 { name="bio3d"; version="2.3-4"; sha256="1zmswa9xs81lbrlkkgi8dvv9xpf0ynqjqwy1k36szvfb8ar9mczr"; depends=[Rcpp]; };
+  bioOED = derive2 { name="bioOED"; version="0.1.4"; sha256="1rjcqrni5xag97pxfsf40isr2c8pkqsvihf86phak8ngwl7qdgmc"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR]; };
   bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; };
   biofiles = derive2 { name="biofiles"; version="1.0.0"; sha256="1bglgl2jcp6jy3f7xwndil56i98xx4kn518s3fqdixw7n5ibmqd2"; depends=[assertthat BiocGenerics Biostrings foreach GenomeInfoDb GenomicRanges IRanges iterators Rcpp RCurl reutils S4Vectors XVector]; };
   biogas = derive2 { name="biogas"; version="1.10.0"; sha256="1il4r71h2a0xqpjs7q97ypdd12jmdnh0kqcs6j5gpjxdsmgnhlsy"; depends=[]; };
   biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; };
   biogram = derive2 { name="biogram"; version="1.4"; sha256="1kkim6dxmvvpby2ir280adl14jmrz7nsib3m8g2ki81d539km6il"; depends=[bit combinat entropy partitions slam]; };
-  bioimagetools = derive2 { name="bioimagetools"; version="1.1.0"; sha256="0ws99rx7bhqi448qqy08jsl3c4vbq96gigqb85yv1mzrc82sg62p"; depends=[EBImage httr tiff]; };
+  bioimagetools = derive2 { name="bioimagetools"; version="1.1.3"; sha256="1xl5q45s4amvinfzysf5za0myq1f76xvqhyza0b191bky5vk8qq1"; depends=[EBImage httr tiff]; };
   bioinactivation = derive2 { name="bioinactivation"; version="1.2.1"; sha256="1dxpa549y6dqzmi8nk57x0blqmcz51v9hj0sy3g9laj9aj0rmyzz"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS rlang]; };
   biolink = derive2 { name="biolink"; version="0.1.3"; sha256="0cy9s9wg5rgwczqjfw6xp9ragqcj9gzp7icpm0nqwrdghsj7azjv"; depends=[DBI glue memoise rentrez RMySQL xml2]; };
   biomartr = derive2 { name="biomartr"; version="0.7.0"; sha256="1gjl4xh9ryxsf3lhn4fqa3zw10yc0mwrfgkrbq117njsw988kms7"; depends=[biomaRt Biostrings curl data_table downloader dplyr httr jsonlite purrr RCurl readr stringr tibble XML]; };
@@ -4581,7 +4670,7 @@ in with self; {
   bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; };
   bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; };
   bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; };
-  bioset = derive2 { name="bioset"; version="0.2.0"; sha256="1cv4sgmbvxghwa22qwvgp5zgbfcyhljsh6c6k7gakxsv0wz1xq46"; depends=[dplyr magrittr rlang tibble tidyr]; };
+  bioset = derive2 { name="bioset"; version="0.2.2"; sha256="1l2iss3rbzc69360r9i9j7nf0nn4fkj3j7bgc1hdabr32i19jkhh"; depends=[dplyr magrittr rlang tibble tidyr]; };
   biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; };
   biospear = derive2 { name="biospear"; version="1.0.1"; sha256="03wsyzlxmqff6xvr10jy49p229xr6jjvr8kk93wm7wil7q6b7z42"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; };
   biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; };
@@ -4592,6 +4681,7 @@ in with self; {
   birdring = derive2 { name="birdring"; version="1.3"; sha256="1vlivapmgq3kz2zz795c7hcfpibnqcfnxp7m42di37yngqc90q87"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; };
   birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; };
   birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; };
+  bisect = derive2 { name="bisect"; version="0.9.0"; sha256="1dr95gnc9rb3i8603wspf0hznmvk5akk46nyf1bhv88mjz2i5q77"; depends=[]; };
   bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; };
   bisoreg = derive2 { name="bisoreg"; version="1.4"; sha256="1ianhk5vrzhwb9ymzvlx9701p5c4iasxyq7nhrvm815dm15rf2wf"; depends=[bootstrap coda monreg R2WinBUGS]; };
   bit = derive2 { name="bit"; version="1.1-12"; sha256="0a6ig6nnjzq80r2ll4hc74za3xwzbzig6wlyb4dby0knzf3iqa6f"; depends=[]; };
@@ -4601,11 +4691,11 @@ in with self; {
   bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; };
   bivrp = derive2 { name="bivrp"; version="1.0"; sha256="0q00k24fssvjkgpndg84vdm7w9hswq593k6yjha4pl0a8bmnv6f8"; depends=[MASS]; };
   biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; };
-  bizdays = derive2 { name="bizdays"; version="1.0.4"; sha256="0vl9anlwvnnaiz67h256r386gy57fbbygjahsjaiaw8zrp84fj3p"; depends=[]; };
+  bizdays = derive2 { name="bizdays"; version="1.0.5"; sha256="0yw53qzi2wbc33q5snmf7xsisfnknvf6pqr20npkwbh3999i1gk0"; depends=[]; };
   bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; };
   blackbox = derive2 { name="blackbox"; version="1.1.7"; sha256="1qdj6wsgr623wnhc573krnhjx65d4k9y8i3n2l2lj1qpqd538ygw"; depends=[geometry lattice MASS nloptr numDeriv proxy rcdd Rcpp RcppEigen spaMM]; };
   blandr = derive2 { name="blandr"; version="0.4.3"; sha256="03w1k646izbrygcsynrzrph7crpqdqn58544mmm9zxfvkmsilpmi"; depends=[ggplot2 knitr]; };
-  blastula = derive2 { name="blastula"; version="0.1"; sha256="0i306x0xm34r9fz7iq8frjbcvfbgg64fm5nn7mbk29a58kn91axp"; depends=[commonmark ggplot2 glue htmltools httr knitr magrittr mailR rJava stringr]; };
+  blastula = derive2 { name="blastula"; version="0.2.0"; sha256="11vaqsfm0kszx3iq38c8vbqnwkfk77lv5021l2zq9iaxz9d83s7k"; depends=[commonmark downloader dplyr ggplot2 glue htmltools httr knitr magrittr purrr rlang stringr tibble tidyr]; };
   blavaan = derive2 { name="blavaan"; version="0.3-1"; sha256="1r5kararl5d8fk6zlawhyjpi1sc3xp1pd2cf83qmh9wbvdsfphwg"; depends=[coda lavaan loo MASS MCMCpack mnormt nonnest2 runjags]; };
   blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; };
   blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; };
@@ -4616,22 +4706,22 @@ in with self; {
   blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; };
   blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; };
   blmeco = derive2 { name="blmeco"; version="1.1"; sha256="1hzg5dimzj1khygm9dv0y30mx1nf9vdhgicqdg1rvj7nf426h2ki"; depends=[arm lme4 MASS MuMIn]; };
-  blob = derive2 { name="blob"; version="1.1.0"; sha256="05pazzcyz3c3vd2l70zq9cf172cgjff4dnf419zigfnxycyn1mhn"; depends=[tibble]; };
+  blob = derive2 { name="blob"; version="1.1.1"; sha256="0lsg91hk508dd95ivig2lwg62qafwnarjw68110kx63cfk4zkjxc"; depends=[prettyunits]; };
   blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; };
   blockcluster = derive2 { name="blockcluster"; version="4.2.6"; sha256="0dskcwdh89a24j1lr829p9rrs88l13738b1gvsmsqrcrg9z955xc"; depends=[Rcpp rtkore]; };
   blockmatrix = derive2 { name="blockmatrix"; version="1.0"; sha256="14k69ly4i8pb8z59005kaf5rpv611kk1mk96q6piyn1gz1s6sk6r"; depends=[]; };
-  blockmodeling = derive2 { name="blockmodeling"; version="0.1.9"; sha256="1rd8ifwv5q9yl0ayzkgi0h4k79w3r46dr164l73iz1ny77a78fn9"; depends=[]; };
+  blockmodeling = derive2 { name="blockmodeling"; version="0.3.0"; sha256="188m35gpf1lbs3yhqrdiz9zfmf3p4v6v0grzmax3d9w9n5g7rx2y"; depends=[doParallel doRNG foreach Matrix]; };
   blockmodels = derive2 { name="blockmodels"; version="1.1.1"; sha256="088629i4g63m8rnqmrv50dgpqbnxd1a4zl5wr3ga0pdpqhmd53wp"; depends=[digest Rcpp RcppArmadillo]; };
   blockrand = derive2 { name="blockrand"; version="1.3"; sha256="1090vb26w6s7iqjcal0xbb3qb6p6j46a5w25f1wjdppd1spvh7f9"; depends=[]; };
-  blocksdesign = derive2 { name="blocksdesign"; version="2.7"; sha256="0pkkp1i6dsj4q4p6529qkbyy8mqmw9zhs1ww1y55yn1adkkwfd4z"; depends=[crossdes]; };
+  blocksdesign = derive2 { name="blocksdesign"; version="2.8"; sha256="0wgdgy705wpq0lh3k46ba7y8dzajgyfzcr87yvvzh610wr8vnsam"; depends=[crossdes]; };
   blockseg = derive2 { name="blockseg"; version="0.2"; sha256="183hjb66589qqjwf14rzdmy770biad73r0l5pkh6f4xk9xac1r62"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; };
-  blogdown = derive2 { name="blogdown"; version="0.5"; sha256="1i34vynvb496w638g0mip30vrxcx60nbr48g1nfkmgiw1nrvr8c5"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
+  blogdown = derive2 { name="blogdown"; version="0.6"; sha256="02ahyzcapsjaanjiz1j9jx2wh8w2fa7dwbraj5w7bl7bln87cs16"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; };
   blsAPI = derive2 { name="blsAPI"; version="0.1.9"; sha256="1p7s799kix396fbx8ap9vy9akwpaps37awr18qbj53n9qcm74wkp"; depends=[RCurl rjson]; };
-  blscrapeR = derive2 { name="blscrapeR"; version="3.1.1"; sha256="1s76d6511ifhh17dnwhrd8hzmfnb26qal68pn4v4smz35srgfa9j"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; };
+  blscrapeR = derive2 { name="blscrapeR"; version="3.1.2"; sha256="1k5g1j4n071pmh2z5lpgkll2i1abpq1h9qialdszak794x8km605"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; };
   bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; };
   bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; };
   bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; };
-  bmixture = derive2 { name="bmixture"; version="0.5"; sha256="144nd1s18nyii135jfr2f65szyzw8hi4zg57z85dnmr2xwas22qb"; depends=[BDgraph]; };
+  bmixture = derive2 { name="bmixture"; version="0.7"; sha256="0x876wsahm0k3v900rkvvl2sma3awkhbrsfygikk1wskh3snqbsj"; depends=[BDgraph]; };
   bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; };
   bmlm = derive2 { name="bmlm"; version="1.3.5"; sha256="091yjllx4kfngaam1ac8rxcx547k7s7qa75pb5350qkr096pvsvs"; depends=[BH ggplot2 Rcpp RcppEigen rstan StanHeaders]; };
   bmmix = derive2 { name="bmmix"; version="0.1-2"; sha256="00php2pgpnm9n0mnamchi6a3dgaa97kdz2ynivrf38s0vca7fqx8"; depends=[ggplot2 reshape2]; };
@@ -4642,7 +4732,7 @@ in with self; {
   bnlearn = derive2 { name="bnlearn"; version="4.3"; sha256="11zp8vf79h5a6dyijazld199pzp1lsgk3x049ykgy0bqjx2ivfvq"; depends=[]; };
   bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; };
   bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; };
-  bnpmr = derive2 { name="bnpmr"; version="1.1"; sha256="0hvwkdbs2p2l0iw0425nca614qy3gsqfq4mifipy98yxxvgh8qgc"; depends=[]; };
+  bnpmr = derive2 { name="bnpmr"; version="1.2"; sha256="0vpqhs1h2mphn9w5yngb7lxvmzrhn7mkj7ca6hykhhg48s2ra98g"; depends=[]; };
   bnpsd = derive2 { name="bnpsd"; version="1.0.1"; sha256="0f9w3qcdmf6qx5k01vddmxj1vadx6d9zcgw6prpbmcf3cdy3fwg0"; depends=[]; };
   bnspatial = derive2 { name="bnspatial"; version="1.0.3"; sha256="018rb5wacjk8igyc0qbp9rk3vjz3lffx81awlba8d2npiaxq6jbv"; depends=[doParallel foreach gRain gRbase raster]; };
   bnstruct = derive2 { name="bnstruct"; version="1.0.2"; sha256="0n4gn1vhka694wdzignawyaca0rx2l0wjgw09fw42bkrswfjvxy1"; depends=[bitops igraph Matrix]; };
@@ -4651,7 +4741,7 @@ in with self; {
   bodenmiller = derive2 { name="bodenmiller"; version="0.1"; sha256="0gqrjscgq4qgk7yl32w0965yscc1py9klr49s8q8hkzyihlwzim2"; depends=[]; };
   boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; };
   bold = derive2 { name="bold"; version="0.5.0"; sha256="0gdmb3zsspcp594d32yzqhdpw4dwg7a3pfm7kgbghz368yw662gl"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; };
-  bomrang = derive2 { name="bomrang"; version="0.1.1"; sha256="1r1k8ridclmlsbrwlrjh7syw4fy3q1hf2rpi2xssh7gg2n709cjb"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite magrittr raster readr rgdal rvest tidyr xml2]; };
+  bomrang = derive2 { name="bomrang"; version="0.1.4"; sha256="00pzhqqk037hc8zl52f185lnj058vg2adzg0fsndvp83h2wghnd7"; depends=[curl data_table dplyr foreign hoardr httr janitor jsonlite magrittr raster readr rgdal rvest tidyr xml2]; };
   bookdown = derive2 { name="bookdown"; version="0.7"; sha256="1b3fw1f41zph5yw3kynb47aijq53vhaa6mnnvxly72zamyzdf95q"; depends=[htmltools knitr rmarkdown tinytex xfun yaml]; };
   bookdownplus = derive2 { name="bookdownplus"; version="1.3.2"; sha256="0vkivgjfmqy2xfs75w8ylkpgcvca294q61jrhbpg24vnll3c281n"; depends=[bookdown knitr yaml]; };
   boolean3 = derive2 { name="boolean3"; version="3.1.6"; sha256="00s6ljhqy8gpwa3kxfnm500r528iml53q364bjcl4dli2x85wa9p"; depends=[lattice mvtnorm numDeriv optimx rgenoud rlecuyer]; };
@@ -4675,7 +4765,7 @@ in with self; {
   bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; };
   boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; };
   boxcoxmix = derive2 { name="boxcoxmix"; version="0.15"; sha256="0qvlk3kcvqzrak2rvf41fs8421fpfh3ch51rq0c9ac62x2dkfidh"; depends=[qicharts statmod]; };
-  boxoffice = derive2 { name="boxoffice"; version="1.0.1"; sha256="0s8zx6n203l2cszq4xrwvazpw1fl36g1cln8n9sh20vyqrdcbgvh"; depends=[rvest xml2]; };
+  boxoffice = derive2 { name="boxoffice"; version="1.1.0"; sha256="08b897dp5cfv6f30k2pdvh8y5n1981msnjr6lfs4dzfc1i6y2zfy"; depends=[httr rvest]; };
   boxplotdbl = derive2 { name="boxplotdbl"; version="1.2.2"; sha256="01bvp6vjnlhc4lndxwd705bzlsh7zq0i9v66mxszrcz6v8hb9rwi"; depends=[]; };
   boxr = derive2 { name="boxr"; version="0.3.4"; sha256="0wx3x65rk1ma8bw5h4yskr7ii95ynkm7il22l1bj34kv9f4bfyj3"; depends=[assertthat bit64 digest dplyr httpuv httr mime rio stringr]; };
   bpa = derive2 { name="bpa"; version="0.1.1"; sha256="0np7q1nasrq4j7ssaipvbjgrsi9n612p9lp96frq1dgix95mcgf0"; depends=[magrittr plyr]; };
@@ -4694,7 +4784,7 @@ in with self; {
   brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; };
   brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; };
   brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; };
-  breakDown = derive2 { name="breakDown"; version="0.1.4"; sha256="0mxn38pg95ih2p2gk2nayzwn6h8dhvsk46g0ndrhrr3l9nkbij3w"; depends=[ggplot2]; };
+  breakDown = derive2 { name="breakDown"; version="0.1.5"; sha256="0m9lpd42ypspkwgwfi0pxkhg4xkrnzirm9d9rjxxf1a6y741ijl2"; depends=[ggplot2]; };
   breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; };
   breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; };
   breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; };
@@ -4703,7 +4793,7 @@ in with self; {
   breathteststan = derive2 { name="breathteststan"; version="0.4.0"; sha256="13wqb33gvzmjpgzqyyadydz5hnqcran80azaxbixj7wga0c35pqq"; depends=[BH breathtestcore dplyr purrr Rcpp RcppEigen rstan StanHeaders stringr tibble tidyr]; };
   brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; };
   brglm = derive2 { name="brglm"; version="0.6.1"; sha256="17r3az6za98v2r06aak77kypdaqssc9wxcc6m6vb20y7xm8dp1mp"; depends=[profileModel]; };
-  brglm2 = derive2 { name="brglm2"; version="0.1.7"; sha256="04hfvb0s6xjswv9f1z2aa80j490jcpf3jlplb4s576hc3fd8qqda"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; };
+  brglm2 = derive2 { name="brglm2"; version="0.1.8"; sha256="017m7nlh29p271dhvx19l6042qfs48hqs947kjmpc7ykzv5461y3"; depends=[enrichwith lpSolveAPI MASS Matrix nnet]; };
   bride = derive2 { name="bride"; version="1.3"; sha256="03k9jwklg1l8sqyjfh914570880ii0qb5dd9l0bg0d0qrghbj0rk"; depends=[]; };
   bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; };
   bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; };
@@ -4711,21 +4801,21 @@ in with self; {
   briskaR = derive2 { name="briskaR"; version="0.1.1"; sha256="0w614lb94vim6wlzj13gnfgkq0vg9fjlvwvvs11pnqq501qn2hzl"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; };
   brlrmr = derive2 { name="brlrmr"; version="0.1.5"; sha256="14dnmh062fw11bm236ilaqs6ss4ywajvsk3sxj0zwqk2bjf7y7vh"; depends=[boot brglm MASS profileModel Rcpp]; };
   brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; };
-  brms = derive2 { name="brms"; version="2.1.0"; sha256="1ahm539add6g26vfj8szmpcwkhnkjcqqqq35mfryrp94yslb6a8n"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
+  brms = derive2 { name="brms"; version="2.2.0"; sha256="1wdf5bka51pwdzniwmi6vwry1lms27124zbrmzm7f7b9k6bsqv3k"; depends=[abind bayesplot bridgesampling coda ggplot2 loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; };
   brnn = derive2 { name="brnn"; version="0.6"; sha256="0q3f3cbl89hgpav7bn54s13cysgz8fi0zm8byc9rgz0sqkjrxval"; depends=[Formula]; };
   broman = derive2 { name="broman"; version="0.67-4"; sha256="1jv1543zq74zjdrmhkcrjwxhn9bmsmmwadd9rjnn18svnrbnlq0g"; depends=[assertthat ggplot2 jsonlite RPushbullet]; };
-  broom = derive2 { name="broom"; version="0.4.3"; sha256="119pc2jnxvm13cvd77c7d14p3bn68f4jm310vj3yfck40101n9if"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
+  broom = derive2 { name="broom"; version="0.4.4"; sha256="081x87sy6dmfvkgwfjrl5ax51k77ciyzg9x3xql25vdi92rmwj3m"; depends=[dplyr nlme plyr psych reshape2 stringr tidyr]; };
   brotli = derive2 { name="brotli"; version="1.1"; sha256="1jdhc03ycafjm6zfl9m95pd3krkb94mq2lhfjchfjc876mbam8x6"; depends=[]; };
   brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; };
   brranching = derive2 { name="brranching"; version="0.2.0"; sha256="0y99px2m02rl60qgf6pjbjv6isp8v1w9sny6p2icgsx4bwxjxmns"; depends=[ape curl httr phytools taxize]; };
-  brt = derive2 { name="brt"; version="1.1.0"; sha256="11a6zpdml5vz3kcdcajw5zcck1zbp4kfdkqm3y6q7qj8ym2f12q5"; depends=[ggplot2]; };
+  brt = derive2 { name="brt"; version="1.2.0"; sha256="04srx4xfx89lg79krckazlfq0hqph39h01sg6fk1ra8fv2xrcnw4"; depends=[ggplot2]; };
   bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; };
   bsamGP = derive2 { name="bsamGP"; version="1.1.2"; sha256="037xgkmcli24jiqahxcingyx97q0jci2ahahcpn3xbzixa161rvf"; depends=[ggplot2 gridExtra MASS]; };
   bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; };
   bshazard = derive2 { name="bshazard"; version="1.0"; sha256="151c63pyapddc4z77bgkhmd7rsa1jl47x8s2n2s8yc6alwmj6dvs"; depends=[Epi survival]; };
   bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; };
-  bsplinePsd = derive2 { name="bsplinePsd"; version="0.2.0"; sha256="0fxm53sdlxjrvwvlihar8iwzin7ajkzvnm3h3nbzh37lf00gz0sb"; depends=[Rcpp]; };
-  bsplus = derive2 { name="bsplus"; version="0.1.0"; sha256="1hpjrmsn66brf1hpwfmg55jbpwbhvkz7sbr160z1cgq3hdhqm7r8"; depends=[htmltools lubridate magrittr purrr rmarkdown stringr]; };
+  bsplinePsd = derive2 { name="bsplinePsd"; version="0.5.0"; sha256="1ddvkn182r48fbjqkiskb94afy942bnl953n0cghza4wkbkdfprd"; depends=[Rcpp]; };
+  bsplus = derive2 { name="bsplus"; version="0.1.1"; sha256="0s3407z48b7sdbkjkqcjk2j1wvs0z7chvdjzphil83l0vp3j5x0s"; depends=[glue htmltools lubridate magrittr purrr rmarkdown stringr]; };
   bspmma = derive2 { name="bspmma"; version="0.1-1"; sha256="0bd6221rrbxjvabf1lqr9nl9s0qwav47gc56sxdw32pd99j9x5a9"; depends=[]; };
   bssm = derive2 { name="bssm"; version="0.1.4"; sha256="0wrai7s5sdjykiz8c5qrlcscm1awfz9cjaggarrs83h9fcs3n38x"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; };
   bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; };
@@ -4740,7 +4830,7 @@ in with self; {
   bullwhipgame = derive2 { name="bullwhipgame"; version="0.1.0"; sha256="03nwf2v4zhgkxvkghpkbkxz0cnkqcwwl51ykrk25qciakfqkgfws"; depends=[shiny]; };
   bunchr = derive2 { name="bunchr"; version="1.2.0"; sha256="1b8hdg2x26k0ahx4gxdpzr36hy056939r4496q3vbgyd4bbk2fbd"; depends=[shiny]; };
   bundesligR = derive2 { name="bundesligR"; version="0.1.0"; sha256="0dnhbh9jh7dfbk7mfh8msq4ys5kakalr0kwkycycrb2q8rd049vp"; depends=[]; };
-  bupaR = derive2 { name="bupaR"; version="0.3.2"; sha256="08xkf88fx8wn22vzn2ghm1jagh09pafqgmx41k99vrqkl3nrfm58"; depends=[data_table dplyr forcats glue magrittr miniUI purrr rlang shiny tidyr]; };
+  bupaR = derive2 { name="bupaR"; version="0.4.0"; sha256="197ibs7jmbn823skg18zm1kqr2p35bxrd6bw22vjlj6b10r4nqhi"; depends=[data_table dplyr eventdataR forcats glue magrittr miniUI purrr rlang shiny tidyr]; };
   burnr = derive2 { name="burnr"; version="0.2.2"; sha256="1b5ys0jm2dmiz1jd5f3907dhv44wh60kmfdfhj3fzx8rk7zllm06"; depends=[ggplot2 MASS plyr reshape2]; };
   bursts = derive2 { name="bursts"; version="1.0-1"; sha256="172g09d1vmwl83xs6gr4gfblqmx3apvblpzdr5d7fcw1ybsx0kj6"; depends=[]; };
   bvarsv = derive2 { name="bvarsv"; version="1.1"; sha256="1bv4fbbi8bn7sqqpjlf8w5jpgydjr15wv5v9940wc42yk792yjrx"; depends=[Rcpp RcppArmadillo]; };
@@ -4752,16 +4842,15 @@ in with self; {
   c212 = derive2 { name="c212"; version="0.93"; sha256="10gwkr2w05bi27zwvspm3g31a1dpqbh1i52vyrfaamqkxypa11nh"; depends=[coda]; };
   c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; };
   c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; };
-  cAIC4 = derive2 { name="cAIC4"; version="0.2"; sha256="13sp3wywv82wgi1vsbxwn68v9xigy0fi3mcwyxjmmgmnsxns2fza"; depends=[lme4 Matrix]; };
+  cAIC4 = derive2 { name="cAIC4"; version="0.3"; sha256="1y12y2hk5fjhqfjbrkxl62nk0y0n1x5dh3zmiw7hqbka6i2bzsy7"; depends=[lme4 Matrix]; };
   cIRT = derive2 { name="cIRT"; version="1.2.1"; sha256="1i43pqlyzykyd1a6abg1yi7ai9ay7d2jkvnw1sa4c6q07jk56d89"; depends=[Rcpp RcppArmadillo]; };
   cOde = derive2 { name="cOde"; version="0.3"; sha256="1r49q7qansn86wrxbhxqnn1dccd9av4lh4h5pn9kk42pls9q60nf"; depends=[Rcpp RcppArmadillo]; };
-  cRegulome = derive2 { name="cRegulome"; version="0.1.0"; sha256="0yf5kx583k483rs3vw614qfv92k3c8gld8vsw16j1vlsbrasbiah"; depends=[DBI dplyr ggplot2 ggridges httr magrittr purrr R_utils reshape2 RSQLite tidyr UpSetR VennDiagram]; };
+  cRegulome = derive2 { name="cRegulome"; version="0.1.1"; sha256="0rhi4f1wkl03vh9m6hsba08cfvqjfn99xyxsykv625bgxra817bd"; depends=[AnnotationDbi clusterProfiler DBI dplyr ggplot2 ggridges httr magrittr org_Hs_eg_db purrr R_utils reshape2 RSQLite tidyr UpSetR VennDiagram]; };
   cSFM = derive2 { name="cSFM"; version="1.1"; sha256="1znxsqa8xdifmryg7jiqbpzm837n4n862kg5x1aki52crc4zyk3k"; depends=[MASS mgcv mnormt moments sn]; };
   ca = derive2 { name="ca"; version="0.70"; sha256="0730c7nk49hz0k1i5nnhq2j3wbhrlhr1qvb50mk8vmqkbhb1pz1l"; depends=[]; };
   caRamel = derive2 { name="caRamel"; version="1.0"; sha256="0al4yk77a4bh8rjdpl841bnnjvs0sjyxqswqwik1n6y0bfr8f7pl"; depends=[geometry]; };
   caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; };
   caTools = derive2 { name="caTools"; version="1.17.1"; sha256="1x4szsn2qmbzpyjfdaiz2q7jwhap2gky9wq0riah74q0pzz76ank"; depends=[bitops]; };
-  cablecuttr = derive2 { name="cablecuttr"; version="0.1.1"; sha256="1v3zhaxkp1h6lack2qk0v4zxh6fd0ymjnikw6bs7k540w2vrbs1g"; depends=[httr jsonlite]; };
   cabootcrs = derive2 { name="cabootcrs"; version="1.0"; sha256="0a6y04jq837k1pk8b9nhgz7rima7s8jid6vdjyfvrqshgaiabg1q"; depends=[]; };
   cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; };
   caesar = derive2 { name="caesar"; version="0.1.0"; sha256="1l0z64fsifx37j2h61kzygbwr3z3cncn48znrpb5cq10ma42igqf"; depends=[binhf]; };
@@ -4771,7 +4860,7 @@ in with self; {
   calibrar = derive2 { name="calibrar"; version="0.2.0"; sha256="1544bc5rhhc6d1mky7ngza00wwh63q07dkbzlwfgyavly8m9cplb"; depends=[cmaes foreach optimx]; };
   calibrate = derive2 { name="calibrate"; version="1.7.2"; sha256="010nb1nb9y7zhw2k6d2i2drwy5brp7b83mjj2w7i3wjp9xb6l1kq"; depends=[MASS]; };
   calibrator = derive2 { name="calibrator"; version="1.2-6"; sha256="1arprrqmczbhc1gl85fh37cwpcky8vvqdh6zfza3hy21pn21i4kh"; depends=[cubature emulator]; };
-  callr = derive2 { name="callr"; version="2.0.2"; sha256="0m51p39vfwldxv6h8x4y9w3laf8q9bldhfqhlcrlx3xhy3irb1bp"; depends=[assertthat crayon debugme R6 testthat]; };
+  callr = derive2 { name="callr"; version="2.0.3"; sha256="1k3mflgn10hcvy74y4pbigpv74zb66fz1phfd3c8isqmn88xbxzi"; depends=[assertthat crayon debugme R6 testthat]; };
   calmate = derive2 { name="calmate"; version="0.12.1"; sha256="07sjbq7bcrhal52pdzsb5pfmk6a8a44wg8xn79sv4y5v74c5xaqz"; depends=[aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; };
   camel = derive2 { name="camel"; version="0.2.0"; sha256="0krilird8j69zbll96k46pcys4gfkcnkisww138wslwbicl52334"; depends=[igraph lattice MASS Matrix]; };
   camsRad = derive2 { name="camsRad"; version="0.3.0"; sha256="06gar6qan1ka01ngjvbpcv649yvfga697mplwn1x6qnfr4ngb7cs"; depends=[httr xml2]; };
@@ -4781,23 +4870,23 @@ in with self; {
   cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; };
   candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; };
   canprot = derive2 { name="canprot"; version="0.1.1"; sha256="14g7wl4p9bgwf5jm48mp676z0pwlsd2xgxjwzixri7mxxh0ivfh1"; depends=[CHNOSZ xtable]; };
-  canvasXpress = derive2 { name="canvasXpress"; version="1.18.5"; sha256="052qwymd28pi4c5pkdrwb85r1f1342y46fpirz2mrspx9r877d7h"; depends=[htmlwidgets]; };
+  canvasXpress = derive2 { name="canvasXpress"; version="1.19.0"; sha256="1cxfadvrm3gkrdfibwi1b7kqlc3hczyc0g72v5gkgc9hssb8j46i"; depends=[htmlwidgets]; };
   cape = derive2 { name="cape"; version="2.0.2"; sha256="0ngm9scd3f2zcy7gy0lqk05cgbfrhhcss3mj5g6bj0byhgwd7msn"; depends=[corpcor doParallel evd fdrtool foreach HardyWeinberg igraph Matrix qpcR RColorBrewer regress shape]; };
-  caper = derive2 { name="caper"; version="0.5.2"; sha256="1l773sxmh1nyxlrjz8brnwhwraff826scwixrqmgdciqk7046d35"; depends=[ape MASS mvtnorm]; };
+  caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; };
   capm = derive2 { name="capm"; version="0.11.0"; sha256="1yw7h1r5m4md8yv0fn1j4wxvhwybifqyvrn8ip3fl32kxbwsmnvz"; depends=[deSolve FME ggplot2 maptools reshape2 rgdal shiny sp survey]; };
   capn = derive2 { name="capn"; version="1.0.0"; sha256="14vfk00xyx0az3whmxjpcv1785lf0gx81w7qc54i3wcfp3i22kcr"; depends=[]; };
   captioner = derive2 { name="captioner"; version="2.2.3"; sha256="0xg72pmgm84f0v45phfwxpsslhf12nhn1swmrj1yifj7g9sjvybj"; depends=[]; };
   captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; };
   capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; };
   capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; };
-  car = derive2 { name="car"; version="2.1-6"; sha256="14l4d9j87xnb0bz2wgqqbxnlnbcdfb5vx2fw6kdxj91kyrk6lhnj"; depends=[MASS mgcv nnet pbkrtest quantreg]; };
-  carData = derive2 { name="carData"; version="3.0-0"; sha256="1ggz4py77bgwlpl6rsv7vlxj1kjs6c10dskizwwjps910r76pd79"; depends=[]; };
+  car = derive2 { name="car"; version="3.0-0"; sha256="1ks2jaav8lbxhzw56vpbnysjk3pvpmqh6avd574k0bha1226k81h"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; };
+  carData = derive2 { name="carData"; version="3.0-1"; sha256="193pdwgw6gk19v7swk1kwphg3vqdmpsgi555g9nyz93sa39j7r8j"; depends=[]; };
   carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; };
   carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; };
   cardidates = derive2 { name="cardidates"; version="0.4.7"; sha256="0dxb2941w56s479laf315hqh9iv3k2l1ds7k8hdl9akcacagjgs2"; depends=[boot lattice pastecs]; };
   cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; };
   care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; };
-  caret = derive2 { name="caret"; version="6.0-78"; sha256="0h1nxzii2h80aslp1zsjczrlfmaks44sskabk4yq9c5rafc7ka6y"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; };
+  caret = derive2 { name="caret"; version="6.0-79"; sha256="1i6sjw279g6mj83vz5gv99x0nljcbpy7v0nbl72lmd80sf7rjshl"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr recipes reshape2 withr]; };
   caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.0"; sha256="0v9gyp81abrbm8b79ch927iqh0v84q5222bvg1wx8n65vx59sx42"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; };
   carfima = derive2 { name="carfima"; version="1.0.0"; sha256="0bxk254q916w5h5zyyp2bs6nvbmbzqfx3jr4a80fkgbmr49chzzp"; depends=[DEoptim invgamma MASS numDeriv truncnorm]; };
   caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; };
@@ -4809,13 +4898,13 @@ in with self; {
   caschrono = derive2 { name="caschrono"; version="2.0"; sha256="091zqin2cr9p50zmifrb52dxy10zflm7f0lr9nissy589qjdd0gk"; depends=[Hmisc zoo]; };
   caseMatch = derive2 { name="caseMatch"; version="1.0.7"; sha256="1xd7mlnknjrilxcp0w0b36aaiql6jdqgyin1823r2x8vl9r4aqns"; depends=[]; };
   casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; };
-  castor = derive2 { name="castor"; version="1.3.2"; sha256="0pz02wbm9w3mkp2gmnl92zgv1b63dvcp6j374hqjgxxpc79aw30m"; depends=[naturalsort Rcpp]; };
+  castor = derive2 { name="castor"; version="1.3.3"; sha256="0n7d4225g28c3i4w4n9bdd8zz91kr80vvnajpn5433db71bqrrv8"; depends=[naturalsort Rcpp]; };
   cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; };
   catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; };
   catR = derive2 { name="catR"; version="3.13"; sha256="1xzxgf9d33h46qxz6a8d71mi673yzdnvxcxj073z7y19hjss3pkw"; depends=[]; };
   catSurv = derive2 { name="catSurv"; version="1.0.3"; sha256="1qjmjdmc81inim5kpwh4k2r3cffmkyp2wpcqqzv731hciqrad8a8"; depends=[BH ltm Rcpp RcppArmadillo RcppGSL RcppParallel]; };
   catcont = derive2 { name="catcont"; version="0.3.0"; sha256="1gz7bh3xi7x7clbwa7qvy64nqx5g6dfkyxysick2razr47dac0y1"; depends=[]; };
-  catdap = derive2 { name="catdap"; version="1.2.4"; sha256="0vvrlbdjml1cxf6jafjycv0k3kzd2xy1zcwjv0rh3cswxmvpnh3a"; depends=[]; };
+  catdap = derive2 { name="catdap"; version="1.3.4"; sha256="0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2"; depends=[]; };
   catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; };
   cate = derive2 { name="cate"; version="1.0.4"; sha256="0qck6675xm5xbw440m1b6n38wjwk7izx3s0zpxbmhc9wh12c5prk"; depends=[corpcor esaBcv leapp MASS ruv sva]; };
   catenary = derive2 { name="catenary"; version="1.1.1"; sha256="0gd46zvd51xvra0d7k7qdcmfl71vcfk750lcafkhmr4cg0vkqcz7"; depends=[boot ggplot2]; };
@@ -4833,6 +4922,7 @@ in with self; {
   cba = derive2 { name="cba"; version="0.2-19"; sha256="0nyssc7j5rkv1gcgx4cg31hwc37wd5k3yn9s2k22ffxlnrknss2l"; depends=[proxy]; };
   cbanalysis = derive2 { name="cbanalysis"; version="0.2.0"; sha256="0h0h8krlb6rckjpcw0jbbr8pcy3jm0cszimbm56l0ca668kiix06"; depends=[]; };
   cbar = derive2 { name="cbar"; version="0.1.3"; sha256="1jy52qnpjvszdd8xviv3vr00ds6bah73q0mhd4kixf68jafnxd35"; depends=[Boom bsts dplyr ggplot2 magrittr]; };
+  cbinom = derive2 { name="cbinom"; version="0.0.0"; sha256="1bg4jq67wr4hd6bxf5477wcmns3r956sgw2lm9gw1d4znvz5x3vf"; depends=[Rcpp]; };
   cbird = derive2 { name="cbird"; version="1.0"; sha256="0kzylylk46swd7f0j6kjyrcs3plbx9799q9kb8hjxmgh0qcjk2p6"; depends=[]; };
   cbsodataR = derive2 { name="cbsodataR"; version="0.2.5"; sha256="1dc4hbida1fbxin22paa31c0f4xj1pqzcc4649p7lbygqvf1fhqh"; depends=[httr jsonlite whisker yaml]; };
   ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; };
@@ -4850,12 +4940,12 @@ in with self; {
   cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; };
   ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; };
   cctools = derive2 { name="cctools"; version="0.1.1"; sha256="1baqijxg75wr90y38d5g1gg8jmpz8ji7zv51wp9n1knif27rg348"; depends=[qrng Rcpp RcppArmadillo]; };
-  cdata = derive2 { name="cdata"; version="0.5.2"; sha256="0l0vqmvizvb7h31796yjbyd0wspxvl3zx64xarkqpq8vwqwkfv51"; depends=[DBI RSQLite wrapr]; };
+  cdata = derive2 { name="cdata"; version="0.7.0"; sha256="1s35wibqs2bklyi8y4j2jxfj7b5jjap2rib3pmh92da3n5jx049l"; depends=[wrapr]; };
   cdb = derive2 { name="cdb"; version="0.0.1"; sha256="1rdb4lacjcw67apdyiv7cl1xvv9d1mrzck1qk605n6794k7wf2ys"; depends=[bitops]; };
   cdcfluview = derive2 { name="cdcfluview"; version="0.7.0"; sha256="00yc3q28y20l2ppqxy6h53p9fvwhvpkc8m7csmp2lizqh787i2cc"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf units xml2]; };
   cdcsis = derive2 { name="cdcsis"; version="1.0"; sha256="1fxdsaqpjhpffn2fxddfcrx8wxwyvfws6rxkpp57g25980xiyzkd"; depends=[ks]; };
   cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.0"; sha256="1z9a2rivi1i56369hkz94azfhyqch8wph819lgrxlrr4mcpl6k2p"; depends=[Formula MASS pracma]; };
-  cdlTools = derive2 { name="cdlTools"; version="0.11"; sha256="0jqr0j6hwqwx574659i3mfzf4hcmmxfd3x28d52dwgpwsv0r10gn"; depends=[raster RCurl rgdal XML]; };
+  cdlTools = derive2 { name="cdlTools"; version="0.13"; sha256="0zcw7k936mxk7ysjaqj9z3lw3vycbcnp6jhwqqysvd8n62nph24n"; depends=[httr raster]; };
   cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; };
   cdparcoord = derive2 { name="cdparcoord"; version="1.0.0"; sha256="0a08rpc7chqbix10jimjh46dy6val97mrzqk972pq446b6ci95sn"; depends=[data_table freqparcoord magrittr partools plotly]; };
   cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; };
@@ -4866,7 +4956,7 @@ in with self; {
   cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; };
   cellWise = derive2 { name="cellWise"; version="2.0.8"; sha256="1xahayqlpylysdiqggzqh7z75r3ldi79bx124ky84r1vab659lm7"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 scales]; };
   cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; };
-  cem = derive2 { name="cem"; version="1.1.17"; sha256="1jnhsrc1jhax3zlw9ynla7g9z5i4w01iar7f7hmv92kp1cwh8rbd"; depends=[combinat lattice MatchIt nlme randomForest]; };
+  cem = derive2 { name="cem"; version="1.1.19"; sha256="17i6jp6czjgchg16zndnh828hs8v28x25gy5f8mkzfhc5pfjd8mq"; depends=[combinat lattice MatchIt nlme randomForest]; };
   cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; };
   censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; };
   censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; };
@@ -4888,7 +4978,7 @@ in with self; {
   cffdrs = derive2 { name="cffdrs"; version="1.7.6"; sha256="00n3h2vf855anxh0xgsps7sv0kj819864wjdmkiak1lsacysav8s"; depends=[data_table doParallel foreach raster rgdal spatial_tools]; };
   cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; };
   cgAUC = derive2 { name="cgAUC"; version="1.2.1"; sha256="172f9rkfhv4xzwpw8izsnsdbcw9p3hvxhh0fd8hzlkil7vskr3k8"; depends=[Rcpp]; };
-  cgam = derive2 { name="cgam"; version="1.9"; sha256="0hc8q6mdd8fy2229biknissmg95b88kryr4c33yv5j77z6gw3s4y"; depends=[coneproj Matrix svDialogs]; };
+  cgam = derive2 { name="cgam"; version="1.10"; sha256="19q90bg32vn7f7znd93a7fz1pjmw1nmfxf4y5y2wfd14qmpwfk36"; depends=[coneproj Matrix svDialogs]; };
   cgdsr = derive2 { name="cgdsr"; version="1.2.10"; sha256="1xyhw7mhmjichr1l6f9y1qvfj9wm87kfbm87ji7lcwf36gxh5g23"; depends=[R_methodsS3 R_oo]; };
   cggd = derive2 { name="cggd"; version="0.8"; sha256="06z0mrxxc02parn9vkjv89qq4yqmsccsy319fi6c5iarssyvin1r"; depends=[]; };
   cgh = derive2 { name="cgh"; version="1.0-7.1"; sha256="1fgjz43bgnswlyvrm669x697lybq3jyzz4l8ppgxqwxp4p4d2yqn"; depends=[]; };
@@ -4906,7 +4996,7 @@ in with self; {
   checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; };
   checkmate = derive2 { name="checkmate"; version="1.8.5"; sha256="1q6igk50lq4fp5d3imgcn1j063h3gsp214ra4nlf534hf4wjlkg9"; depends=[backports]; };
   checkpoint = derive2 { name="checkpoint"; version="0.4.3"; sha256="0r7v7ijyq92yd95ssxxbdlp5dv1sd09yvxr8c0yihf48kzw65s63"; depends=[]; };
-  checkr = derive2 { name="checkr"; version="0.1.0"; sha256="01071y7jgvang5yi00304wr4p4040b8fc4ncfj6qfmk0bc97h51b"; depends=[]; };
+  checkr = derive2 { name="checkr"; version="0.2.0"; sha256="1fy00mxdjfyw37l95gy9qc0ny5v9kn16hv261c8sl1kgnp8zv4a9"; depends=[]; };
   cheddar = derive2 { name="cheddar"; version="0.1-631"; sha256="0s6v3xcpv8ppgx6q6h2hgrjcf3f3i87kmylnr9q9zhry7729aiyn"; depends=[]; };
   chemCal = derive2 { name="chemCal"; version="0.1-37"; sha256="1sbmr8arczc65nzbgr5rfk2mbbnk6h60ni9cd9jngbhgdf0g1scw"; depends=[]; };
   chemmodlab = derive2 { name="chemmodlab"; version="1.0.0"; sha256="0lzibshhfz52m61xldf0xq4cc1xx64fjlw18hlkiv65dj3gcj2mh"; depends=[caret class e1071 elasticnet foreach lars MASS nnet pls pROC randomForest rpart tree]; };
@@ -4919,15 +5009,16 @@ in with self; {
   chillR = derive2 { name="chillR"; version="0.70.2"; sha256="01hn2b88ra7kadjylj2y840lpkapm93kdracnamy15c6f5f27kmb"; depends=[fields httr Kendall pls raster RCurl readxl RMAWGEN sp XML]; };
   chinese_misc = derive2 { name="chinese.misc"; version="0.1.8"; sha256="0c2qhdia7wpkv4x2qnq2lyvgnr0n37brd7m579hcl6zq7dw4y2m7"; depends=[jiebaR Matrix NLP Ruchardet slam stringi tm]; };
   chipPCR = derive2 { name="chipPCR"; version="0.0.8-10"; sha256="1mff7n7ga4sfwvcq7zkjkrl68nybnm2zkn37hmxvnw9yl3ls9lnw"; depends=[lmtest MASS outliers ptw quantreg Rfit robustbase shiny signal]; };
-  chngpt = derive2 { name="chngpt"; version="2018.1-3"; sha256="0x4jifap8y4gs7mdzawxyvfdfjg245zak2zljdl6351ppslzaj6z"; depends=[boot kyotil MASS survival]; };
+  chngpt = derive2 { name="chngpt"; version="2018.3-29"; sha256="0m1va7rknp2lmqdfhlfndhwb6ysn9vi567cc34f33829pdh0y4w3"; depends=[boot kyotil MASS survival]; };
   choiceDes = derive2 { name="choiceDes"; version="0.9-1"; sha256="07nnqqczi9p3cffdijzx14sxhqv1imdakj7y94brlr5mbf5i4fl4"; depends=[AlgDesign]; };
-  cholera = derive2 { name="cholera"; version="0.3.0"; sha256="08ijini3d4ir26di655315lvs9vjscixpawv8r7499idcb1jz87i"; depends=[alphahull deldir HistData igraph KernSmooth pracma RColorBrewer scales sp]; };
+  cholera = derive2 { name="cholera"; version="0.4.0"; sha256="0pm5kbaqkxkwzyda4ms90yivx0iv7hcn2z65xfqcqlsxsjbvlmhs"; depends=[deldir HistData igraph KernSmooth pracma RColorBrewer scales sp]; };
   choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; };
   chopthin = derive2 { name="chopthin"; version="0.2.2"; sha256="1ixmgq6igd2ji88qba7scny1j8rrizcf76dk4ymk3hah5dln97fz"; depends=[Rcpp]; };
   chords = derive2 { name="chords"; version="0.95.4"; sha256="1v6zvl1mv9fyf6hx1fpbj3i7s893n4y1w4j9rw1arps006qz2jqn"; depends=[MASS Matrix]; };
   choroplethr = derive2 { name="choroplethr"; version="3.6.1"; sha256="11f529zcflbqbchnp3v5yw2vwrlhyfib5pn2j6l60x0gdfxp07bb"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps scales stringr tigris WDI]; };
   choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; };
   choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; };
+  chorrrds = derive2 { name="chorrrds"; version="0.1.3"; sha256="1f4mrf5i5cddgv639cv45b35ff4r96hw7xh47zx04lgm295s5rvy"; depends=[dplyr httr jsonlite magrittr plyr stringr XML]; };
   chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; };
   chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; };
   chron = derive2 { name="chron"; version="2.3-52"; sha256="185lfp75cv3l4cavg64sccj8lgc5sivch13n6gkannv3pd5cyzy4"; depends=[]; };
@@ -4944,19 +5035,20 @@ in with self; {
   citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; };
   citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; };
   citr = derive2 { name="citr"; version="0.2.0"; sha256="1nzn0yw74k6zkwzb6spfzqkj3cbx6ry6ypbsnhy6w2flabnnvy4v"; depends=[assertthat curl miniUI RefManageR rstudioapi shiny yaml]; };
-  civis = derive2 { name="civis"; version="1.2.0"; sha256="10idsjq5grg9mw18f8v2wqz1rg95s12dsfglkrg7jar1782yq822"; depends=[DBI dbplyr devtools dplyr future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; };
+  ciuupi = derive2 { name="ciuupi"; version="1.0.0"; sha256="1c72crf0his7vzmh86isvcvi0ahxnqdq4i6ms84hk20jmlz2hxin"; depends=[functional nloptr pracma statmod]; };
+  civis = derive2 { name="civis"; version="1.3.0"; sha256="1897b2s23clgwh35r9nvbgd3xbznbn4yxswwwy5rwc3w8yip5brj"; depends=[DBI dbplyr devtools dplyr feather future ggplot2 httr jsonlite lubridate memoise purrr roxygen2 stringr testthat]; };
   cjoint = derive2 { name="cjoint"; version="2.0.6"; sha256="1bhzw751ll43qbyif589yxmi3m1pbm206lqnsc5zcxsnxjf4li5n"; depends=[ggplot2 lmtest Matrix sandwich survey]; };
   ck37r = derive2 { name="ck37r"; version="1.0.0"; sha256="0nn2sfsfs8mhgjrz0ghn041ybhj2qim4rs3lkci7s4n95c8hbgdi"; depends=[caret cvAUC doParallel doSNOW foreach ggplot2 pryr randomForest RANN reader RhpcBLASctl ROCR snow stringr SuperLearner tmle]; };
   ckanr = derive2 { name="ckanr"; version="0.1.0"; sha256="1cvn0cih763f0ppl1y90vnwj3cgqyb7az89sn12nyn2qb6igiqyl"; depends=[httr jsonlite magrittr]; };
   clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; };
   cladoRcpp = derive2 { name="cladoRcpp"; version="0.14.4"; sha256="0d4vl7xrrwbhhx56ymw52rb5svw9nskxdya4dl04lw1qxc45p4jy"; depends=[Rcpp RcppArmadillo]; };
   clam = derive2 { name="clam"; version="2.3.1"; sha256="1n30fvx4macyawhzv17bzvc1s4qdn51p9mx28apfjbf80qck24g9"; depends=[]; };
-  clampSeg = derive2 { name="clampSeg"; version="1.0-1"; sha256="0y0yxdv75xqmv7v6q8q8v1qj6xr8i7ik4nkh759rpyn0da7qq076"; depends=[Rcpp stepR]; };
+  clampSeg = derive2 { name="clampSeg"; version="1.0-3"; sha256="06j0778qzw7lkdf7wrzshn9pikr57xymb3kbxvxcywz6db5c4k47"; depends=[Rcpp stepR]; };
   clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; };
   class = derive2 { name="class"; version="7.3-14"; sha256="173b8a16lh1i0zjmr784l0xr0azp9v8bgslh12hfdswbq7dpdf0q"; depends=[MASS]; };
   classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; };
-  classInt = derive2 { name="classInt"; version="0.1-24"; sha256="18ng9y647jwb855pkmz555zdrznjgw4ynppaw43xm8qf8n291p7k"; depends=[class e1071]; };
-  classiFunc = derive2 { name="classiFunc"; version="0.1.0"; sha256="0rgl7yzdia2wl4b03zny8fyz6mn9lr3l2lf2134kcsfvw63apc12"; depends=[BBmisc checkmate dtw fda fda_usc fdasrvf proxy]; };
+  classInt = derive2 { name="classInt"; version="0.2-3"; sha256="1afiw3d5vpxky5scngj63095453xr95wrjj8kw36zsz71hrlgx11"; depends=[class e1071 spData]; };
+  classiFunc = derive2 { name="classiFunc"; version="0.1.1"; sha256="1qaima3sii394741p5n06lcqkk4fiv9apb7qqnpi6srx5h02lfl5"; depends=[BBmisc checkmate dtw fda fda_usc fdasrvf proxy rucrdtw zoo]; };
   classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; };
   classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; };
   classify = derive2 { name="classify"; version="1.3"; sha256="0134h12h6v06d7ldj9qgqjhh5f5ap98pvr0v6d4k8dqndnn0pggy"; depends=[ggplot2 lattice plyr R2jags Rcpp reshape2]; };
@@ -4969,7 +5061,7 @@ in with self; {
   cleanr = derive2 { name="cleanr"; version="1.1.3"; sha256="0vf2c2inb729kzmpxaznqa2zwj80j1ix9198gc36zq41ag5pd7jk"; depends=[checkmate]; };
   clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; };
   clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; };
-  clhs = derive2 { name="clhs"; version="0.5-7"; sha256="0n7zy8wf78lka1l0zm42zxwi24bvavfy3irfqcnz5nslqkg61il2"; depends=[ggplot2 plyr raster reshape2 scales sp]; };
+  clhs = derive2 { name="clhs"; version="0.6-0"; sha256="1vw8z4kmmpd8sbx7n8fzdd7lhg10qpnnx31nnjhv4dbd6v2nqii9"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; };
   cli = derive2 { name="cli"; version="1.0.0"; sha256="07as3dr7vwx02p3qgzlmxz1dlrd3x3lysrzp222ip9jcjpydp8wg"; depends=[assertthat crayon]; };
   clickR = derive2 { name="clickR"; version="0.3.38"; sha256="1qlc4lz2y2ls5qx1rqiswl5qr5qqkn6l30cp5ikhzr3ffvwp3nym"; depends=[beeswarm boot brms lme4 lmerTest ReporteRs xtable]; };
   clickstream = derive2 { name="clickstream"; version="1.3.0"; sha256="01bii527xy7hdph1pm6f1g4qnwa5yf3mwz01rjg1h2gc12s5vzgg"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; };
@@ -4984,18 +5076,18 @@ in with self; {
   clinDR = derive2 { name="clinDR"; version="1.7"; sha256="0xnrnmwg4y2vlxsmhj5pzpyiqk90xjxl91i9nn3lv90xszmdh0x2"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; };
   clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; };
   clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; };
-  clinfun = derive2 { name="clinfun"; version="1.0.14"; sha256="13ip144qzgx9bg9pvdgz7y4v21sjvyjjixbm8mnvn6a6k62ycgmf"; depends=[mvtnorm]; };
+  clinfun = derive2 { name="clinfun"; version="1.0.15"; sha256="0cv1kdxj911scri82ms21lk9frsdp4251fawdsbqinby7k6hhmkc"; depends=[mvtnorm]; };
   clinsig = derive2 { name="clinsig"; version="1.2"; sha256="1wgfl9kks57yizrf8z6x7dhmbl3a80q8nnj3a5n2hpc9yr8l9ijf"; depends=[]; };
   clipr = derive2 { name="clipr"; version="0.4.0"; sha256="1bz841r3kmv16r6zxmlkvasp4nyldam00n6gh7zf8lyy9ymz38j4"; depends=[]; };
   clisymbols = derive2 { name="clisymbols"; version="1.2.0"; sha256="1q7gi2zmykhzas9v8fdnbpdq7pzdcpbhim1yxvd2062l777g4j86"; depends=[]; };
   clogitL1 = derive2 { name="clogitL1"; version="1.4"; sha256="0m9yrg9mzzfv5qkdf6w55xyrjdghyrf27kk7b4x2gyvwvi5b7dkm"; depends=[Rcpp]; };
   clogitLasso = derive2 { name="clogitLasso"; version="1.0.1"; sha256="1mm815w31n0jvbh2rwq15ja1mzvjaz1x846xq1949aj4pb692zrl"; depends=[foreach lassoshooting]; };
   clogitboost = derive2 { name="clogitboost"; version="1.1"; sha256="19wcb7229amlxn6xahxj6pf9rwfm02s7qkxz2yvyhnq95y0clxkm"; depends=[Rcpp]; };
-  clordr = derive2 { name="clordr"; version="1.2.0"; sha256="0i04wx3gablbhc8g6591pgb13hhj4gr9jbswv477x3s3rw30mv6s"; depends=[doParallel foreach MASS pbivnorm rootSolve ttutils]; };
+  clordr = derive2 { name="clordr"; version="1.3.0"; sha256="16cw6i91azi3xw9slzy2v8vpdkqik8k02mvgvcl9a3irbl7wgz10"; depends=[doParallel foreach MASS pbivnorm rootSolve ttutils]; };
   cloudUtil = derive2 { name="cloudUtil"; version="0.1.12"; sha256="18g946j00anlk20d0fh01w0xyj1kwyy7jhlgz5a85wmp6s2gkz74"; depends=[]; };
   clpAPI = derive2 { name="clpAPI"; version="1.2.7"; sha256="19bn5d7qjj7g0x17jnh2snymcn2r2skzj35hkhsgcj5r43834f3r"; depends=[]; };
   clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; };
-  clubSandwich = derive2 { name="clubSandwich"; version="0.3.0"; sha256="1az4q95swknjjbaisg0whcqyyrfxs8vhax3af9bnm6n2l2czihvk"; depends=[sandwich]; };
+  clubSandwich = derive2 { name="clubSandwich"; version="0.3.1"; sha256="1ga7f2s2jrj7xhrqz86bfsby8a6gsp9fqbfv0mjb2iaybi0is8d9"; depends=[sandwich]; };
   clue = derive2 { name="clue"; version="0.3-54"; sha256="1fnl1wi0g8f243ra5krlpyz69pg8s8m2wwxa53hb086k7hqv74af"; depends=[cluster]; };
   clues = derive2 { name="clues"; version="0.5.9"; sha256="0znlsbfmnz5wkp2cswrkjbgchdmmf7h78mv2zwx382m9n9n9hshy"; depends=[]; };
   clusrank = derive2 { name="clusrank"; version="0.5-2"; sha256="168xad5dyz46yxm139q09n9vp1304yrhikxz5bcfzhm3psyv5fbf"; depends=[MASS Rcpp]; };
@@ -5004,7 +5096,7 @@ in with self; {
   clustMD = derive2 { name="clustMD"; version="1.2.1"; sha256="0w4s9dab2mm5x0xibyl6s101c64if945a2cmwin9psd95p76mcny"; depends=[ggplot2 MASS mclust msm mvtnorm reshape2 truncnorm viridis]; };
   clustMixType = derive2 { name="clustMixType"; version="0.1-29"; sha256="01rc84ppy5mw3cdcx15xs6061lg1mwh6kxa80rnj3ax3g10x37sh"; depends=[RColorBrewer]; };
   clustRcompaR = derive2 { name="clustRcompaR"; version="0.2.0"; sha256="151xq8qf1mrl35kyhdliwl2jpdkpkbl3gdnrvrybanihry2p0kqg"; depends=[dplyr ggplot2 ppls quanteda]; };
-  cluster = derive2 { name="cluster"; version="2.0.6"; sha256="1z4gbz7chxxi4ly6c0yjlikwgf8aa8dlg05cn5cd6pjr21zvh97l"; depends=[]; };
+  cluster = derive2 { name="cluster"; version="2.0.7-1"; sha256="1grxbifbc4nwig25dmjgkympnbzb4al0w6k1c0ibdhpk1h4l20di"; depends=[]; };
   cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; };
   clusterCrit = derive2 { name="clusterCrit"; version="1.2.7"; sha256="13smdm8dmp4795qqn8an3k22l7xs4i4kgazyjzxdbzkg742akk7q"; depends=[]; };
   clusterGeneration = derive2 { name="clusterGeneration"; version="1.3.4"; sha256="1ak8p2sxz3y9scyva7niywyadmppg3yhvn6mwjq7z7cabbcilnbw"; depends=[MASS]; };
@@ -5021,9 +5113,10 @@ in with self; {
   clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; };
   clustertend = derive2 { name="clustertend"; version="1.4"; sha256="1aqg8cy1hk3lmzvyqh9qc1mcknrva2i0c77hyd0yff9whz80ik4j"; depends=[]; };
   clusteval = derive2 { name="clusteval"; version="0.1"; sha256="1ld0bdl4fy8dsfzm3k7a37cyxc6pfc9qs31x4pxd3z5rslghz7rj"; depends=[mvtnorm Rcpp]; };
-  clustrd = derive2 { name="clustrd"; version="1.2.0"; sha256="029z46ihr2c57wan03c201d9kpaiyhhfvny41fjc2mvvc50rh2z7"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
+  clustrd = derive2 { name="clustrd"; version="1.2.1"; sha256="05lsicz4br81fv20151j4j2bp1pfddcvywfqkagflc33z954a3z1"; depends=[ca cluster corpcor dplyr dummies fpc GGally ggplot2 ggrepel plyr]; };
+  clustree = derive2 { name="clustree"; version="0.1.1"; sha256="0y6i4z9xzmw7jf6c9kl87zims3gs5akyl355jc539534vhmsi73a"; depends=[checkmate dplyr ggplot2 ggraph igraph rlang viridis]; };
   clustsig = derive2 { name="clustsig"; version="1.1"; sha256="0n5nf712vsa8zb0c2lv4gjqsgva62678vjngr9idgswb73shxm8v"; depends=[]; };
-  clustvarsel = derive2 { name="clustvarsel"; version="2.3.1"; sha256="04jhywv15xqb284nwi80sinxkhadd590vvjbg1immywy2md9gfgc"; depends=[BMA foreach iterators Matrix mclust]; };
+  clustvarsel = derive2 { name="clustvarsel"; version="2.3.2"; sha256="11xd3pgr4i15q9rcim8y6ybi1iijv59k7f8wh0b2368kz3kz54cj"; depends=[BMA foreach iterators Matrix mclust]; };
   clv = derive2 { name="clv"; version="0.3-2.1"; sha256="1qgp2qhblg6ysyrlg0ad169ahwhcyn5pvsqzdlqj700y1k7wl7mc"; depends=[class cluster]; };
   cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; };
   cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; };
@@ -5033,7 +5126,7 @@ in with self; {
   cmprsk = derive2 { name="cmprsk"; version="2.2-7"; sha256="1imr3wpnj4g57n2x4ryahl4lk8lvq9y2r7319zv3k82mznha8bcm"; depends=[survival]; };
   cmprskQR = derive2 { name="cmprskQR"; version="0.9.1"; sha256="002s6ls670sdzrxgqv9gbl646b675q1gn6dzkngnf6rgcdqwid7n"; depends=[quantreg survival]; };
   cmrutils = derive2 { name="cmrutils"; version="1.3"; sha256="0zjc0bwp2p03hmnj3zjw7800pcdw8b8161y68npyp3hya0s4i9x0"; depends=[chron]; };
-  cmsaf = derive2 { name="cmsaf"; version="1.9.0"; sha256="1r0cny0i3wi3xfi38l5ls6zycnp0q1a0s00qrdgi1956yrmnm5x1"; depends=[fields ncdf4 raster sp]; };
+  cmsaf = derive2 { name="cmsaf"; version="1.9.1"; sha256="02l1g5l42lxg3wlpjg5qm6h8mfr1bdcpi052z8masxf6xf4l0abr"; depends=[fields ncdf4 raster sp]; };
   cmvnorm = derive2 { name="cmvnorm"; version="1.0-3"; sha256="0810kzg78yaxzniq59a4swvdk9qxp37ja52f5n1zssgn0cwz1vk9"; depends=[elliptic emulator]; };
   cna = derive2 { name="cna"; version="2.0.0"; sha256="0cfr4g63wwqkkz2xxz76m82p0am2kyazal6sqp7gnrc48x9lv8im"; depends=[Rcpp]; };
   cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; };
@@ -5042,8 +5135,9 @@ in with self; {
   coRanking = derive2 { name="coRanking"; version="0.1.3"; sha256="1ss00l0c99fi9p6gcimb31nrl5iflps6lvplnjjqwcqjkb2pjh9p"; depends=[Rtsne scatterplot3d]; };
   coala = derive2 { name="coala"; version="0.5.2"; sha256="1rj9my20ba79alkhszh5lfvb9gjr6vcgiwqk2szawkpd1np3lpsr"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; };
   coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; };
+  coalitions = derive2 { name="coalitions"; version="0.6.2"; sha256="0plzrjjsbbr5mw6wqirxp1wgpl2bw2kh0gdalr8c8v2z7hc1d9r6"; depends=[checkmate dplyr forcats gtools jsonlite lubridate magrittr purrr RCurl reshape2 rlang rvest stringr tidyr xml2]; };
   coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-3"; sha256="0f1fkpmqq142yrqzbqv11s5q4jkq7dilmrllcns871hc6vah6ikd"; depends=[MCMCpack]; };
-  cobalt = derive2 { name="cobalt"; version="3.2.1"; sha256="1ip8d2inr3369iq4bpx52fbvfwy31c0mzg1rpydj8x4m3jfh83fz"; depends=[ggplot2 ggstance]; };
+  cobalt = derive2 { name="cobalt"; version="3.2.2"; sha256="1hjfhbx8pjxf87bbp41xkq03srixv5p30nw2dk1f8if7xcyzjp97"; depends=[ggplot2 ggstance]; };
   cobs = derive2 { name="cobs"; version="1.3-3"; sha256="1pqvz7czcchri4x79g78hbwyagb3bqzdqb047zkbdinyz067c7kb"; depends=[quantreg SparseM]; };
   cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; };
   cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; };
@@ -5052,8 +5146,9 @@ in with self; {
   coda = derive2 { name="coda"; version="0.19-1"; sha256="14a4a8df4ygj05h37chmdn8kzcqs07fpbflxfrq530563mrza7yl"; depends=[lattice]; };
   coda_base = derive2 { name="coda.base"; version="0.1.8"; sha256="05bbmfswajmjc8l3g2clwj3hyj06y9v7camq910b881frl2xj584"; depends=[MASS Rcpp RcppArmadillo]; };
   codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; };
-  codemetar = derive2 { name="codemetar"; version="0.1.4"; sha256="0klwwf4ws2l15iq33d3jk7whp4inql6if7yai5z7493zs9c30z3x"; depends=[devtools git2r jsonld jsonlite readr stringi]; };
-  codep = derive2 { name="codep"; version="0.7-1"; sha256="1icj9mijp3x93rn7xbi0aivj7r4rlgiclsa920b1x9ws8b3jrv06"; depends=[]; };
+  codebook = derive2 { name="codebook"; version="0.5.8"; sha256="0zz4vw5r5dw3vfd0j71jzgdf1z1ll0sgcwqq7qrnxn1s4ya4d0v4"; depends=[dplyr DT future ggplot2 haven knitr likert mice pander psych purrr readr rlang rmarkdown skimr stringr tibble tidyr]; };
+  codemetar = derive2 { name="codemetar"; version="0.1.5"; sha256="164cjcqi0pz2h3v4i8llgjjif1gyrvisg0pqz04s4glbbf2pkz80"; depends=[devtools git2r jsonld jsonlite readr stringi]; };
+  codep = derive2 { name="codep"; version="0.8-1"; sha256="1ip84285kcqgniabw5da7az1p508wx961gr4hiqf8c24flyw08br"; depends=[]; };
   codetools = derive2 { name="codetools"; version="0.2-15"; sha256="0h7sjmvvsi35041jp47cxhsqzgf1y8jrw6fxii7n26i8g7nrh1sf"; depends=[]; };
   codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; };
   codyn = derive2 { name="codyn"; version="1.1.0"; sha256="0s8ssaq59vddilz0fin9sgr8fir70c220cffbsy2l0qn34q48627"; depends=[assertthat permute]; };
@@ -5077,7 +5172,7 @@ in with self; {
   colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; };
   coloc = derive2 { name="coloc"; version="3.1"; sha256="1321675wz1vn7rcd2sm4c9h183nwnmp0lqww5nykjf792ijyaal8"; depends=[BMA flashClust ggplot2 reshape snpStats speedglm]; };
   colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; };
-  colorSpec = derive2 { name="colorSpec"; version="0.6-2"; sha256="153jps1l0wv0b726b0l7bhsg7g45jdfsralg6k8nvyij4yw1dqi1"; depends=[MASS]; };
+  colorSpec = derive2 { name="colorSpec"; version="0.7-3"; sha256="1gg55872ap3h15h5ris1qhjgyq4q55x702z9v0xsigz87fcr300s"; depends=[MASS minpack_lm]; };
   colordistance = derive2 { name="colordistance"; version="0.8.0"; sha256="0fqj8apgfvk021cs1m79nk9kx294zxbj55jqylcrg3hadxy4plkf"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scatterplot3d spatstat]; };
   coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; };
   colorednoise = derive2 { name="colorednoise"; version="0.0.2"; sha256="0y2a86fwndcgkaxr4jmls7a9d1ipij4zi3r4nchwda0bynlw6mq4"; depends=[dplyr purrr Rcpp]; };
@@ -5105,12 +5200,12 @@ in with self; {
   commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; };
   commonmark = derive2 { name="commonmark"; version="1.4"; sha256="1vb8r9khpvcf0q7acv8rsplfjjwcll302bg5kp596cvn6aacypl6"; depends=[]; };
   commonsMath = derive2 { name="commonsMath"; version="1.1"; sha256="0v9jlk75ihh8yjhq5ybighvndp0hn1d6rqh78jkh4g6ylhbpvcw0"; depends=[]; };
-  comorbidity = derive2 { name="comorbidity"; version="0.1.0"; sha256="0j2znk4w4vr1swnqp2pldhzrg28sb13ykzan15l1c1p3yg8pp35w"; depends=[checkmate]; };
+  comorbidity = derive2 { name="comorbidity"; version="0.1.1"; sha256="0xb3k2ql3ikdbyx8l73wsrwi62ayapszbrygk8arw1g2n0yqz2f4"; depends=[checkmate]; };
   compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; };
   compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; };
   compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; };
   compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; };
-  compareDF = derive2 { name="compareDF"; version="1.2.0"; sha256="09y8bh9d9m2pf9j7qqyk1s07pp7rgbhzbkswl12vnx2cm24lp525"; depends=[dplyr htmlTable tidyr]; };
+  compareDF = derive2 { name="compareDF"; version="1.3.0"; sha256="0idra4qsr73sx4rcnm3d6arfz8mrcc072jiw3lljjmwidsfdnjvr"; depends=[dplyr htmlTable tidyr]; };
   compareGroups = derive2 { name="compareGroups"; version="3.3.3"; sha256="18v5as6037ndihsslk25455y553wcbrdriav1p6zbbc52lqcf0a3"; depends=[epitools gdata HardyWeinberg Hmisc knitr rmarkdown SNPassoc survival xtable]; };
   compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; };
   comparer = derive2 { name="comparer"; version="0.1.1"; sha256="1nmvqzrvyxdsidkr243qdn0lj2s7j3jv1sh0mdlxm2v5063nyryr"; depends=[progress]; };
@@ -5123,7 +5218,7 @@ in with self; {
   complmrob = derive2 { name="complmrob"; version="0.6.1"; sha256="1dr80r1p05h3mlnjbgh6kfw86np8y2bhy9yi5qydv85w52k133n1"; depends=[boot ggplot2 robustbase scales]; };
   compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; };
   compositions = derive2 { name="compositions"; version="1.40-1"; sha256="1hn139g86bc1q3dj6kj9f21042v4x0xgrp4ni1zvx1zx8xmy3h8b"; depends=[bayesm energy robustbase tensorA]; };
-  compound_Cox = derive2 { name="compound.Cox"; version="3.8"; sha256="0sskkcillpdxyibph4y35nhk67zmxylbql8igy5lq2r86wfsrp5a"; depends=[numDeriv survival]; };
+  compound_Cox = derive2 { name="compound.Cox"; version="3.10"; sha256="0xk7r7dvcm5kwvimap9v4h60nxrk6hk72hm7258pm0x32ygwidcw"; depends=[numDeriv survival]; };
   compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; };
   comtradr = derive2 { name="comtradr"; version="0.1.0"; sha256="0az61xsrwzr4g1s6g52vm9fivh985c6s06y3rb1c9ic0my385zhx"; depends=[httr jsonlite magrittr purrr]; };
   concatenate = derive2 { name="concatenate"; version="1.0.0"; sha256="1kvsw7vwa3hn97ff7r6z21h5ajs74azwv2dk4pzgyaasnbp778hw"; depends=[]; };
@@ -5132,7 +5227,7 @@ in with self; {
   concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; };
   concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; };
   concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; };
-  cond = derive2 { name="cond"; version="1.2-3"; sha256="0y7m7valk7zn40y62348czmdvfkx59il9sl6wy565lzqfiimd9ps"; depends=[statmod survival]; };
+  cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; };
   condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; };
   condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; };
   condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; };
@@ -5142,12 +5237,12 @@ in with self; {
   condmixt = derive2 { name="condmixt"; version="1.0"; sha256="05q1fj7akf6lsq9rbcqqkzlx82jvk6mlvmwx6jzk8j228fwqmg90"; depends=[evd]; };
   condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; };
   condvis = derive2 { name="condvis"; version="0.4-2"; sha256="0l515wpsmh7g4q4w29gb1gv5kafwzfhb8as0ml8vbbrh6xcgmz9q"; depends=[MASS]; };
-  coneproj = derive2 { name="coneproj"; version="1.12"; sha256="1937sf7b9s2y421gf2srjjdpv2knxrr03xyq5vg5j77z73kh9s6d"; depends=[Rcpp RcppArmadillo]; };
+  coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; };
   conf = derive2 { name="conf"; version="1.0"; sha256="0skfmk1vz8ry52l811rxnk6a8hicajza8m5ycfg7p0xb8ssyj6gi"; depends=[]; };
   conf_design = derive2 { name="conf.design"; version="2.0.0"; sha256="06vdxljkjq1x56xkg041l271an1xv9wq79swxvzzk64dqqnmay51"; depends=[]; };
   confSAM = derive2 { name="confSAM"; version="0.2"; sha256="1l67ndya07hh0yqfbabfhsvp3hryklx0022grpr0cb7ff88d1zam"; depends=[]; };
   confidence = derive2 { name="confidence"; version="1.1-2"; sha256="0m6iz59n5jpi0ig3za3nir4d4bdsysf5g47d2nakfmaz03wk520z"; depends=[ggplot2 knitr markdown plyr xtable]; };
-  config = derive2 { name="config"; version="0.2"; sha256="1p0gaqrqhcrdkp5cr3rn4i5ny8mr96b3q1fwgs0i8lk5riljkk20"; depends=[yaml]; };
+  config = derive2 { name="config"; version="0.3"; sha256="0l67nfpm42ssnk0bl4jmq6bibz8hawgfgh2s14s5c8mnimv6mpjs"; depends=[yaml]; };
   configr = derive2 { name="configr"; version="0.3.2.1"; sha256="184iafdsj0k8i4n877g00fsnqmdq7k4y1azwn4d18gq2l7kg3qn1"; depends=[glue ini jsonlite RcppTOML stringr yaml]; };
   confinterpret = derive2 { name="confinterpret"; version="1.0.0"; sha256="0qldaqpx7kpk71zfwv465jrscwzc9w3xfv52i4h01k9aw3q6m8ja"; depends=[]; };
   conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; };
@@ -5158,7 +5253,7 @@ in with self; {
   conjoint = derive2 { name="conjoint"; version="1.39"; sha256="0f8fwf419js9c292i3ac89rlrwxs2idhwxml1qd8xd2ggwfh6w5m"; depends=[AlgDesign clusterSim]; };
   conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; };
   constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; };
-  constellation = derive2 { name="constellation"; version="0.1.0"; sha256="1q6kv8gg89xk80y24ma0zp8zy3cy4i93bjzax524cjbfnhpknx1k"; depends=[data_table fasttime]; };
+  constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; };
   constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; };
   contfrac = derive2 { name="contfrac"; version="1.1-11"; sha256="0vmcazjlg0p3xaksai3k7yb9bbqkd4lhmbvxf2qymr2asqm51mdi"; depends=[]; };
   conting = derive2 { name="conting"; version="1.6.1"; sha256="0vw6gwiajxzaai6ky0b89l2jg4kd4c6xxzb1cmzxlcdrhwmhz402"; depends=[BMS coda gtools mvtnorm tseries]; };
@@ -5187,14 +5282,13 @@ in with self; {
   corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; };
   corTools = derive2 { name="corTools"; version="1.0"; sha256="0arvqk2xp19ap73zmdk0kb1fycb3v2mf65b4bhanvcqwr4kg4vdk"; depends=[]; };
   corclass = derive2 { name="corclass"; version="0.1.1"; sha256="0ai8si992f58mrvc8hq598zbw9d4jslnc96lpzj5d89lljjv3hf5"; depends=[igraph]; };
-  corcounts = derive2 { name="corcounts"; version="1.4"; sha256="0irlx62ql5rp5s7nnjdy6jh723wl4039wn10zxri8ihxwqsyyz3f"; depends=[]; };
   cord = derive2 { name="cord"; version="0.1.1"; sha256="18xj6cwmx1a7p3vqx5img8qf8s75nc6pcv78v15j081pgn786ma5"; depends=[Rcpp RcppArmadillo]; };
   cordillera = derive2 { name="cordillera"; version="0.8-0"; sha256="0cpysfivwmim36gcqn1i7450a33hv4pdbvil7syb0hr7vdm083dd"; depends=[dbscan yesno]; };
   coreCT = derive2 { name="coreCT"; version="1.2.1"; sha256="19aq5snv5kin913rf0a1n9z0cg2l1jn2hnxbd0h05p1qrsysx52b"; depends=[igraph oro_dicom plyr raster]; };
   coreNLP = derive2 { name="coreNLP"; version="0.4-2"; sha256="0rvyqj7s3lijq4rzil65060b29m393m7zmg99mykp1g1kby5bjd8"; depends=[rJava XML]; };
   coreSim = derive2 { name="coreSim"; version="0.2.4"; sha256="1fhlss420rhs21l9i2ag5g3j0vnrkpqdh13ca4rwfan6h35qr3sm"; depends=[dplyr MASS]; };
   coreTDT = derive2 { name="coreTDT"; version="1.0"; sha256="14rnh61gk3m6g8rq77hm9ybds0px15di2mxm3jiyfdfynx5ng58f"; depends=[]; };
-  corehunter = derive2 { name="corehunter"; version="3.2.0"; sha256="12bwmhl6mmjz7xggh03933k1ax5k5dri3bp4p73y6bh1rk22p5l2"; depends=[naturalsort rJava]; };
+  corehunter = derive2 { name="corehunter"; version="3.2.1"; sha256="0cxvhmi768kz3q8hydb6y9nqvc8hvkmq8nc5yfry4k94whk12wax"; depends=[naturalsort rJava]; };
   corkscrew = derive2 { name="corkscrew"; version="1.1"; sha256="1nb81r4lsrajcj3xz3f7p6xznnb38yg3rnnh44rd3kabca4d8r1s"; depends=[ggplot2 gplots igraph RColorBrewer]; };
   corlink = derive2 { name="corlink"; version="1.0.0"; sha256="06n9pcvbn8y9gy0mn9c0sw05424ss8smpaw3ly6a785cmj3d9b6m"; depends=[]; };
   corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; };
@@ -5202,21 +5296,22 @@ in with self; {
   corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; };
   corpustools = derive2 { name="corpustools"; version="0.3.1"; sha256="0723n7gjk4yrnbvars6c6a805cqpx21z9yn9745wbvfgq7a8c4hy"; depends=[data_table Matrix memoise plyr R6 Rcpp SnowballC stringi wordcloud]; };
   corr2D = derive2 { name="corr2D"; version="0.2.0"; sha256="02z9k0j6j8jyjfgff55amkzsa5w0xbr9nqm1247qylsh8sl2rqcz"; depends=[colorspace doParallel fields foreach mmand rgl]; };
+  corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; };
   correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; };
-  corregp = derive2 { name="corregp"; version="1.0.3"; sha256="07zsbxhvh7n4ma6lgsmg0kkmgcs5afa02k6cq57afaqvxisw18l3"; depends=[diagram ellipse gplots rgl]; };
+  corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; };
   correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; };
   corrgram = derive2 { name="corrgram"; version="1.12"; sha256="1z0h2mkf4805w3wnhy31cf1gm9miliapxchgc4ksg3kx2799gv91"; depends=[seriation]; };
   corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; };
   corrr = derive2 { name="corrr"; version="0.2.1"; sha256="1d04nk92fjmk4kc5zipjqjhhmb1w97kid7l2jz5a8pkwiccn5byc"; depends=[dplyr ggplot2 ggrepel lazyeval magrittr purrr seriation tibble tidyr]; };
   corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; };
   corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; };
-  cosa = derive2 { name="cosa"; version="1.1.0"; sha256="1fdyxc3c5wknxkjmz9xcyf4yri8nh0zkim1prn3xgblwab98b5sv"; depends=[nloptr]; };
+  cosa = derive2 { name="cosa"; version="1.2.0"; sha256="1g2n9l79bi6pr5m9f4c0byw2ls9nhykkaaivssxbx4m6qpqlqg54"; depends=[nloptr]; };
   cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; };
   cosinor2 = derive2 { name="cosinor2"; version="0.1.0"; sha256="0pxkkp8dxhzqp2v3pfzigh1ka7ardf168k5p41z289xgar9p33g0"; depends=[cosinor ggplot2 Hmisc matrixStats]; };
   cosmoFns = derive2 { name="cosmoFns"; version="1.0-1"; sha256="0a6xhbgxxnymlvicg99yhgny2lscxcbmvqmy17kxmahdi797dsg6"; depends=[]; };
   cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; };
-  costat = derive2 { name="costat"; version="2.3"; sha256="1kqyl89lx1amap9zgrfy1bqnl93kahrksj6yms44yrxr1as2g4nk"; depends=[wavethresh]; };
-  cotrend = derive2 { name="cotrend"; version="1.0"; sha256="0h0y502wqq83wlf9ab1b9rxg1wycvi3sp4lbqfpvy46vgljrjw87"; depends=[xts]; };
+  costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; };
+  cotrend = derive2 { name="cotrend"; version="1.0.1"; sha256="14yzfq5a3wi26gn45mp2zm2yn6gic90csk9by66m08fgpzznz4dq"; depends=[xts]; };
   couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; };
   countrycode = derive2 { name="countrycode"; version="1.00.0"; sha256="1b2ijbf74bxvi01f53lbb2b9jya2rlyazvzacxpj79y1dbs600s6"; depends=[]; };
   countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; };
@@ -5243,7 +5338,7 @@ in with self; {
   coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; };
   coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; };
   coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; };
-  coxphw = derive2 { name="coxphw"; version="4.0.0"; sha256="02xiwrvc3gbwwjcz9kwy2g91jrjpawch5r4pq6l4lyvl556w296l"; depends=[survival]; };
+  coxphw = derive2 { name="coxphw"; version="4.0.1"; sha256="116dp6zispa8k7y6jrn4v9ipf0jqdhj68w9qqc2qwcapawvrd0nh"; depends=[survival]; };
   coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; };
   coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; };
   cp4p = derive2 { name="cp4p"; version="0.3.5"; sha256="16pkl0brm415v153ln41nyy13fsp4i0jy8349lsffkv5mvp7vklc"; depends=[limma MESS multtest qvalue]; };
@@ -5257,7 +5352,7 @@ in with self; {
   cpr = derive2 { name="cpr"; version="0.2.3"; sha256="1a2lza1bw74xzrs17a9gr9mnpvnnrykhwd73yqi63wp3k4sm42rb"; depends=[dplyr ggplot2 lazyeval lme4 magrittr plot3D Rcpp RcppArmadillo rgl tibble tidyr]; };
   cprr = derive2 { name="cprr"; version="0.1.1"; sha256="0bnq3961bqf1y1f37x60qkwmq50vnvcpv4axq0yw5n1mrs20mllj"; depends=[]; };
   cpt = derive2 { name="cpt"; version="1.0"; sha256="0cfjsni8m3sx2vh5cxiwqh50gl65nag5zp757jy75sx44rky63m8"; depends=[glmnet MASS nnet randomForest]; };
-  cptcity = derive2 { name="cptcity"; version="1.0.0"; sha256="0gvgjy8m5bcihkcxzdzvxxawpk74zvd185ds28vbwvdibx8kjvph"; depends=[]; };
+  cptcity = derive2 { name="cptcity"; version="1.0.3"; sha256="1axysyarmf68cmwadqwz9106zs5jj1bvrwhkg86maixj5aaqpim5"; depends=[]; };
   cptec = derive2 { name="cptec"; version="0.1.0"; sha256="1sh6vs9qfxxlhlg6y2qchikjg8sh64zg3j8x5b9dpba9lhbhzzqj"; depends=[magrittr rvest xml2]; };
   cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; };
   cquad = derive2 { name="cquad"; version="1.4"; sha256="1sxf30rikzr4mj1nyr12ys7gcnx5vq0rpd9djc2lkfbqlvi4mmai"; depends=[MASS plm]; };
@@ -5267,6 +5362,7 @@ in with self; {
   crank = derive2 { name="crank"; version="1.1"; sha256="117sgq7zm5wxmd97sfc927qq70snra6vd090mhpcsdhipw1py6zc"; depends=[]; };
   cranlike = derive2 { name="cranlike"; version="1.0.1"; sha256="0lnbdkyk5mdy0qlvkx2hakqrisrxsdp5r3gif6f46pf4d9cpfj8v"; depends=[DBI debugme desc RSQLite]; };
   cranlogs = derive2 { name="cranlogs"; version="2.1.0"; sha256="1w1nbifjb9l106fk97zy0w73x73bw5azq89l3c1b8r2fz8aljkkc"; depends=[httr jsonlite]; };
+  cranly = derive2 { name="cranly"; version="0.1"; sha256="1q6x6v77z6y540shyqpiq0p78rp02mmhdmnq79hvlm9ykqblzrcr"; depends=[colorspace countrycode ggplot2 igraph magrittr stringr visNetwork]; };
   crantastic = derive2 { name="crantastic"; version="0.1"; sha256="0y2w9g100llnyw2qwjrib17k2r2q9yws77mf6999c93r8ygzn4f5"; depends=[]; };
   crawl = derive2 { name="crawl"; version="2.1.1"; sha256="0dr9z8y8rvc3wn1gjb6mh5wmszng9j1r2a9ks6p5am8ghf754sps"; depends=[dplyr gdistance mvtnorm raster Rcpp RcppArmadillo shiny sp]; };
   crayon = derive2 { name="crayon"; version="1.3.4"; sha256="0s7s6vc3ww8pzanpjisym4jjvwcc5pi2qg8srx7jqlz9j3wrnvpw"; depends=[]; };
@@ -5279,7 +5375,7 @@ in with self; {
   crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; };
   crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; };
   crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; };
-  crmPack = derive2 { name="crmPack"; version="0.2.6"; sha256="0jpf0626nkl3inbgb8hcgkhilrd1bkxjhm3jzscxrdghpzwvzw6h"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
+  crmPack = derive2 { name="crmPack"; version="0.2.7"; sha256="1d0ydllcbykwip9dw3arvn6lv4h88n5nkm3ms122gfrf44f6h2c0"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; };
   crminer = derive2 { name="crminer"; version="0.1.4"; sha256="1vnl01q5sw13g6qhvn61w9i40zpg9cszisgi0h8d6q6rr23iws9w"; depends=[crul hoardr jsonlite pdftools xml2]; };
   crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; };
   crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; };
@@ -5297,6 +5393,7 @@ in with self; {
   crp_CSFP = derive2 { name="crp.CSFP"; version="2.0.2"; sha256="0gazmhf5bv994x441m2xm0w18h9lw3y68qzdf6gmyqimj4wjqjgf"; depends=[MASS]; };
   crplyr = derive2 { name="crplyr"; version="0.1.4"; sha256="1z50hplp6m4zgjfhmf2j8b22np6kjzqnprrdc0qx8408cb9vc9zr"; depends=[crunch dplyr lazyeval tibble]; };
   crqa = derive2 { name="crqa"; version="1.0.6"; sha256="1v9fwl98jjlg2z5skqsjmmgpmmxy4g1gzvc28yflvdp50qn509v8"; depends=[fields Matrix plot3D pracma tseriesChaos]; };
+  crqanlp = derive2 { name="crqanlp"; version="0.3"; sha256="1ndd5k44w232x6k564r84lyahljgcnldfwgih3iiar3il94drbdg"; depends=[corpus crqa gutenbergr RCurl tm]; };
   crrSC = derive2 { name="crrSC"; version="1.1"; sha256="171cw56q2yv1vb4qd0va75i2q89jcw1126q8pcbv0235g7p2a86z"; depends=[survival]; };
   crrp = derive2 { name="crrp"; version="1.0"; sha256="1fq54jr6avrli91a4z1hp5img4kghyw1yvjr5xyccsanf9i35x8r"; depends=[cmprsk Matrix survival]; };
   crrstep = derive2 { name="crrstep"; version="2015-2.1"; sha256="03vd97prws9gxc7iv3jfzffvlrzhjh0g6kyvclrf87gdnwifyn1z"; depends=[cmprsk]; };
@@ -5308,11 +5405,11 @@ in with self; {
   crunch = derive2 { name="crunch"; version="1.20.0"; sha256="1hsya10ba6mb3xd1lvbn2d74g9glm0l98fbh130phq5wdnn8lpx9"; depends=[crayon curl httpcache httr jsonlite]; };
   crunchy = derive2 { name="crunchy"; version="0.2.0"; sha256="1q9mqpkg5ljb798922fmvjjp36kyjr1rrm6jf3s2fwjrhq186y3z"; depends=[crunch shiny]; };
   cruts = derive2 { name="cruts"; version="0.3"; sha256="0yn6xc2wg23nkjnsb7kii7dn897wf4ymnpmgppacrsznl8mmlmgd"; depends=[lubridate ncdf4 raster sp stringr]; };
-  crypto = derive2 { name="crypto"; version="0.1.4"; sha256="1b3i0f2ll6cj5z8xmws1g6c8zgwz1ip9qwgi205ncxc0nq9xlqlc"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2]; };
+  crypto = derive2 { name="crypto"; version="0.1.5"; sha256="0yqdn14mv8cbn2nmxflhyn46fqbrk3iknjg3bqxyj5k426q3zqx4"; depends=[curl doSNOW dplyr foreach jsonlite lubridate magrittr rvest tidyr xml2]; };
   cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; };
   csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; };
   csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; };
-  csampling = derive2 { name="csampling"; version="1.2-2"; sha256="0gj85cgc3lgv7isqbkng4wgzg8gqcic89768q2p23k4jhhn6xm2w"; depends=[marg statmod survival]; };
+  csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; };
   cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; };
   csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; };
   csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; };
@@ -5335,14 +5432,14 @@ in with self; {
   ctv = derive2 { name="ctv"; version="0.8-4"; sha256="0yl20b1j8c11b1g0q6qv0wsaivxpikwslhky4lckbm3rwbn5vbb2"; depends=[]; };
   cubature = derive2 { name="cubature"; version="1.3-11"; sha256="06f6gsvbb732p80r6hxvzh4ik546icxfvx21dyh65ypmw3kgm64k"; depends=[Rcpp]; };
   cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; };
-  cubing = derive2 { name="cubing"; version="1.0-2"; sha256="00fch9vgxcaasxgrz79x21wb54yspnw5ysdjcdfym4qjknh9m3b6"; depends=[rgl]; };
+  cubing = derive2 { name="cubing"; version="1.0-4"; sha256="11aln47l8ni33k3mmadccnphsv1rad4n5llg9ff5lpjyk9gn3am8"; depends=[rgl]; };
   cudaBayesreg = derive2 { name="cudaBayesreg"; version="0.3-16"; sha256="1xsamdsg4cq7l5r7czkg70j5gypf1dak3h353xfbz3rq0r0dni19"; depends=[cudaBayesregData oro_nifti]; };
   cudaBayesregData = derive2 { name="cudaBayesregData"; version="0.3-11"; sha256="1cls9xqgps7icjpi1mllkrksdxwc1jfhxgffvrcrqx2l16vw6qfx"; depends=[]; };
   cudia = derive2 { name="cudia"; version="0.1"; sha256="1ms3bc8sp6l3bm75j418mmb707sy3gyvxznhfias3nd4sw7i074x"; depends=[MCMCpack mvtnorm]; };
   cumSeg = derive2 { name="cumSeg"; version="1.1"; sha256="01hn3j1i7bi2r9vsqwbgy1f1alcisxyf4316xx57bg82lb34d0s5"; depends=[lars]; };
   cumplyr = derive2 { name="cumplyr"; version="0.1-1"; sha256="07sz1wryl3kxbk67qyvnkrkdrp4virlsaia0y6rf9bqdw7rc6vi2"; depends=[]; };
   cumstats = derive2 { name="cumstats"; version="1.0"; sha256="119w751z9dg6pjyk389pbl8ab8pirf9sqndi4nxi89ix2bby4xz8"; depends=[]; };
-  curl = derive2 { name="curl"; version="3.1"; sha256="15fbjya2xrf2k9hhvg3frisrram4yk5wlfz67zj1z8ahpsb2a3r7"; depends=[]; };
+  curl = derive2 { name="curl"; version="3.2"; sha256="15hmy71310hnf9yqvz0icx4cq939gv6iqaifzlfdh2ia8akawdhn"; depends=[]; };
   currentSurvival = derive2 { name="currentSurvival"; version="1.0"; sha256="0bqpfwf4v4pb024a98qwg81m6zd7ljg1ps42ifhxpqx7b9gdyi6c"; depends=[cmprsk survival]; };
   curry = derive2 { name="curry"; version="0.1.1"; sha256="1ps9hvbnb02m0b8hlw4admwbziyjvswj08ldi2dk3ymnrpawcc29"; depends=[]; };
   curstatCI = derive2 { name="curstatCI"; version="0.1.1"; sha256="0igqdv0fzzji10gz3j3ir8qxpy7vdjfl137067rc28qzbrl2sy2c"; depends=[Rcpp]; };
@@ -5352,10 +5449,13 @@ in with self; {
   cusp = derive2 { name="cusp"; version="2.3.3"; sha256="130m0is48bp11p5fpg17lwqwlavsa8fzfxjs0z62vl6lm006aahw"; depends=[]; };
   customizedTraining = derive2 { name="customizedTraining"; version="1.1"; sha256="0rlfsnhmmcwx7iyjavj03v4kdfzxcqjggi8qpgmi6lkli3n0s6pg"; depends=[FNN glmnet]; };
   cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; };
+  cutpointr = derive2 { name="cutpointr"; version="0.7.3"; sha256="09pcja8kp3sdsz2vp32s5vl7m5cz14rlbp9aa00y4qd21nyckyj9"; depends=[dplyr foreach ggplot2 gridExtra purrr Rcpp rlang tibble tidyr]; };
   cuttlefish_model = derive2 { name="cuttlefish.model"; version="1.0"; sha256="1rmkfyfd1323g2ymd5gi1aksp160cwy5ha5cjqh5r6fzd8hhqjxs"; depends=[]; };
   cvAUC = derive2 { name="cvAUC"; version="1.1.0"; sha256="13bk97l5nn97h85iz93zxazhr63n21nwyrpnl856as9qp59yvn64"; depends=[data_table ROCR]; };
   cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; };
-  cvequality = derive2 { name="cvequality"; version="0.1.1"; sha256="0pqvaz8vfwd0x433rrdwdwjp3hgsw1nb5nzsxci5zibjksk14kgp"; depends=[]; };
+  cvar = derive2 { name="cvar"; version="0.1-1"; sha256="0aqv42wbhdql1v0mxspr5ms2mwkk6yw0snzzjg5qg682m5f13ghn"; depends=[gbutils Rdpack]; };
+  cvcrand = derive2 { name="cvcrand"; version="0.0.2"; sha256="1gclzn6qqjylxg3v263x5cfg1wjkqviqb3fzzb7w0ckpld2his0v"; depends=[tableone]; };
+  cvequality = derive2 { name="cvequality"; version="0.1.3"; sha256="19mpf2vjj2hfgdr3mx5y1i0ldb0byvv2ii7lyanhc6c2a3mirs38"; depends=[]; };
   cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; };
   cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; };
   cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; };
@@ -5375,7 +5475,7 @@ in with self; {
   d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; };
   d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; };
   d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; };
-  d3r = derive2 { name="d3r"; version="0.7.1"; sha256="1v25jh4gfp921q5cgjzxyar1sx2q842slkkshq1lnb31zkzidygq"; depends=[dplyr htmltools tidyr]; };
+  d3r = derive2 { name="d3r"; version="0.8.0"; sha256="1zx351g4kl45dlva8q4ah3wdjvxjzssjpa280ljypfml3iqkzx70"; depends=[dplyr htmltools tidyr]; };
   dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; };
   dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; };
   dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; };
@@ -5400,7 +5500,7 @@ in with self; {
   dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; };
   data_table = derive2 { name="data.table"; version="1.10.4-3"; sha256="12caklgr19vy9wprdks6zh825vr1iw1cajgwcnbpyvmijqdlz2xs"; depends=[]; };
   data_tree = derive2 { name="data.tree"; version="0.7.5"; sha256="07mavj30pqgk831dw5nj0z0jri6fq8wx9a6nyx0q873if7q3j52w"; depends=[DiagrammeR R6 stringr]; };
-  data_world = derive2 { name="data.world"; version="1.2.0"; sha256="0bw1yi5qwnm3fx8d7j2q9r9fyzf4c10z3m4yxs1srp3z77i8v6d9"; depends=[dwapi httr ini miniUI shiny stringi]; };
+  data_world = derive2 { name="data.world"; version="1.2.2"; sha256="1d9hh4965f2d0lwh2xxhnxzc948ailkjzdax3d3z9l8lakqfrx0h"; depends=[dwapi httr ini miniUI shiny stringi]; };
   data360r = derive2 { name="data360r"; version="1.0.1"; sha256="1g245zg70ch81zjmd1ng16lks38qr0a6m63y582w558mza7v148g"; depends=[curl data_table jsonlite reshape2]; };
   dataCompareR = derive2 { name="dataCompareR"; version="0.1.1"; sha256="06nba2yir2yz1189bsag9yavdf9hfmpswxdy92dlnbz9d27jjsic"; depends=[dplyr knitr markdown stringi]; };
   dataMaid = derive2 { name="dataMaid"; version="1.1.0"; sha256="1scpyc0c4rcb0hk1dnzaqprb59n9vrngkg2h1h1knl5klxabkj2y"; depends=[ggplot2 gridExtra haven htmltools magrittr pander robustbase whoami]; };
@@ -5415,7 +5515,7 @@ in with self; {
   dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; };
   datafsm = derive2 { name="datafsm"; version="0.2.1"; sha256="16l6ssprsvnpzxlfnqj7r061x700704s5gdci5x9ixdjmglakmdd"; depends=[caret GA Rcpp]; };
   datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; };
-  datamaps = derive2 { name="datamaps"; version="0.0.1"; sha256="1y44adffpwwfv905qmwx1kkmakh6vfyvrblgjjaqqssp6v597wrq"; depends=[htmlwidgets magrittr]; };
+  datamaps = derive2 { name="datamaps"; version="0.0.2"; sha256="01pjv5f764vw8krq9mrwnih8a8akkqa5779igh4ddh0av32gswd8"; depends=[htmlwidgets magrittr]; };
   datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; };
   dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; };
   dataone = derive2 { name="dataone"; version="2.1.0"; sha256="0vpa4gb30dvxax4sxbnbn8gblnzdfcf2k0v5js3gqwjb95ah4w4y"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; };
@@ -5426,26 +5526,28 @@ in with self; {
   dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; };
   datasets_load = derive2 { name="datasets.load"; version="0.1.0"; sha256="029rxg0h17nszkxgq5kjd0njymb8pgdsabmz5slshzd2ijjh82jz"; depends=[DT miniUI shiny]; };
   datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; };
-  datastructures = derive2 { name="datastructures"; version="0.2.1"; sha256="05m9zrqil1qmjax3r86wn6k1fq4v7x3hwq2hs9n36lyhj06r031y"; depends=[BH Rcpp]; };
+  datastructures = derive2 { name="datastructures"; version="0.2.5"; sha256="0vg7s6l0d9x768j0b6nw93914raybkym0f3l7f0jpwbj265isfs1"; depends=[BH purrr Rcpp]; };
   datasus = derive2 { name="datasus"; version="0.4.0"; sha256="18mvgdzk2f2plzgz9w47w4zxbdz24rymxvjv08j0cm242pcl11l7"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; };
   datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; };
   dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; };
   dataview = derive2 { name="dataview"; version="2.1.1"; sha256="1nn33h5c1h4a3zm1xm7sdz4s6sy0f3r53jhm7bv6qk7aiylwqf6v"; depends=[data_table xtermStyle]; };
   date = derive2 { name="date"; version="1.2-38"; sha256="1ziy17kz02j7lals14s43rs9lmxxfn2ppfi55q4b3m4gfj9pr4jc"; depends=[]; };
-  datetime = derive2 { name="datetime"; version="0.1.2"; sha256="0qbd1makidkbpr26wkxchnb8rpwzm4l42j4vipwwmfwv3gpslmjx"; depends=[]; };
+  datetime = derive2 { name="datetime"; version="0.1.3"; sha256="1grl6ygfwmi8a307fibdlkqv4mnzixjfzmi1vl0svx1w4d527bv9"; depends=[]; };
   datetimeutils = derive2 { name="datetimeutils"; version="0.2-12"; sha256="023jxsih2zlfv9yldn68cbrdl7jw5rpbz4cc9y0z530bb1fs8d1k"; depends=[]; };
   datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; };
+  datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; };
   dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; };
   dawai = derive2 { name="dawai"; version="1.2.3"; sha256="18dg81d1018f8ibm4p43ih6fjgm6r0qs5phqbp7pqrixjj3ydk58"; depends=[boot ibdreg mvtnorm]; };
+  daymetr = derive2 { name="daymetr"; version="1.3.1"; sha256="034yhyq58ihb9faqsqqwbhhrp64kxim0ix6nwiyx7cxahikvdsiy"; depends=[httr ncdf4 raster rgdal rgeos sp]; };
   dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; };
   dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; };
   dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; };
-  dbarts = derive2 { name="dbarts"; version="0.9-1"; sha256="15z70wzkp88r5djq9y6ckj2yqkasbbz0zfx7mmc6w8an7j8flhdg"; depends=[]; };
+  dbarts = derive2 { name="dbarts"; version="0.9-3"; sha256="0mxpvfaily4712k8q5wiby7rhvqm28qqi1v4b3csnlm9f0260gzi"; depends=[]; };
   dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; };
   dbhydroR = derive2 { name="dbhydroR"; version="0.2-4"; sha256="189yzc7nchl31203jadf6qs3w1d3s01ifn9y6403c11qm4y63fpf"; depends=[httr reshape2 XML]; };
   dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; };
   dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; };
-  dbmss = derive2 { name="dbmss"; version="2.5-1"; sha256="1giwbzjgz2qiry9mmqyby1jxpdsxaifv1p227i9jyq9d46gs9qiy"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; };
+  dbmss = derive2 { name="dbmss"; version="2.6-3"; sha256="0b3vbsb01rz46mspfk8v9dgwqkxnjkv5d6152zg1zsvyv0z9wvqd"; depends=[cubature Rcpp RcppParallel spatstat spatstat_utils]; };
   dbplot = derive2 { name="dbplot"; version="0.2.1"; sha256="1ksjxvq8y5n5vwnpvxwbdmcywnld9fnkmq63ckcv7nbgbiyi5wgw"; depends=[dplyr ggplot2 rlang]; };
   dbplyr = derive2 { name="dbplyr"; version="1.2.1"; sha256="1nwrls9c3kc9q7405jp6b9sh23642sz13yw55iikgw134shffj5k"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; };
   dbscan = derive2 { name="dbscan"; version="1.1-1"; sha256="09rh3x4g3xv5f1p8wbc847z8khj7v2r5vz9yf1lfdiy23q2w3xp1"; depends=[Rcpp]; };
@@ -5458,13 +5560,13 @@ in with self; {
   dcmle = derive2 { name="dcmle"; version="0.3-1"; sha256="1d6zk9413h30wcw8q1gnjzk67vshmjcpnh8zjxrsh1h69i1z6rpy"; depends=[coda dclone lattice]; };
   dcmodify = derive2 { name="dcmodify"; version="0.1.1"; sha256="1a909v6jhihwwmq7lzv2xazrkfa1553kbrjsbjfsh1qrqdiam3sr"; depends=[settings validate yaml]; };
   dcmr = derive2 { name="dcmr"; version="1.0"; sha256="1a89wr1n8sykjbwa316zlmcffaysksrqnbd89anxqj8sgw9xv6jq"; depends=[ggplot2 KFAS plyr reshape2 tableplot]; };
+  dcurver = derive2 { name="dcurver"; version="0.9.0"; sha256="16qb5lvwxzkffv1gf0gp8dsvaxipwhgnl3y6qqg0h0qx8gynf217"; depends=[Rcpp RcppArmadillo]; };
   dcv = derive2 { name="dcv"; version="0.1.1"; sha256="12c716x8dnxnqksibpmyysqp2axggvy9dpd55s9bhnsvqvi6dshj"; depends=[lmtest]; };
-  ddR = derive2 { name="ddR"; version="0.1.2"; sha256="00mb9xq69dvl50v5429nw0mjazgjwh2sp98w8n2cwhhamjgp42k9"; depends=[Rcpp]; };
-  ddalpha = derive2 { name="ddalpha"; version="1.3.1.1"; sha256="13w8ir5rd80rka4mq343zd4wn93vfw870lzfqrd3cxgwb1bwcw7y"; depends=[BH class MASS Rcpp robustbase sfsmisc]; };
+  ddalpha = derive2 { name="ddalpha"; version="1.3.2"; sha256="1i2zcz20zy9xd42kdz09njbkq07mj2pp6f07z6dnwi5hrmvhbh9r"; depends=[BH class geometry MASS Rcpp robustbase sfsmisc]; };
   ddeploy = derive2 { name="ddeploy"; version="1.0.4"; sha256="06s4mn93sl33gldda9qab8l3nqig8zq0fh1s2f98igsysmn31br5"; depends=[httr jsonlite]; };
   ddpcr = derive2 { name="ddpcr"; version="1.8"; sha256="11bk4mhiqn73sjji2wz47v7jqqg9kq3amci9m6a88h4fvvgmpcz4"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; };
   ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; };
-  deBInfer = derive2 { name="deBInfer"; version="0.4.1"; sha256="05khyjpyxwrm9q8jsysffgsjpjbw76w9rrl7i8ia0yc9lv0bzjc9"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; };
+  deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; };
   deGradInfer = derive2 { name="deGradInfer"; version="1.0.0"; sha256="1wl1pw1rwins4gr47a8ii4diw6wd6cx8ib4l5bhri5f3crbw7l86"; depends=[deSolve gdata gptk]; };
   deSolve = derive2 { name="deSolve"; version="1.20"; sha256="18nx3maww979a8p8ly4hv63y65mnjx8vbj2fpipd6rhcbf1lbsan"; depends=[]; };
   deTestSet = derive2 { name="deTestSet"; version="1.1.5"; sha256="07wbgniwkpp0yry6wvchvszr8isxs1i9k6km951r5c009w1iviwk"; depends=[deSolve]; };
@@ -5473,6 +5575,7 @@ in with self; {
   deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; };
   debug = derive2 { name="debug"; version="1.3.1"; sha256="0mpwi6sippxyr1l8xf48xqv6qw6pmfkxs13k1gjyd7bkzlbchgqd"; depends=[mvbutils]; };
   debugme = derive2 { name="debugme"; version="1.1.0"; sha256="1c9sg55zvf10h8198jdnpamm6f66lzw3c3jnmdp9ls6na0j0xbjd"; depends=[crayon]; };
+  decido = derive2 { name="decido"; version="0.1.0"; sha256="1d53qcpy165f9izaj0x5x5d5h7jvihhk6mghs9g52dfxrvpndfgn"; depends=[oz Rcpp]; };
   decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; };
   decisionSupport = derive2 { name="decisionSupport"; version="1.103.6"; sha256="1lfv1a9pcf1f7la1vxpwvw8abk4jbq7cmalp374l0xasfyin2mr5"; depends=[chillR msm mvtnorm nleqslv rriskDistributions]; };
   decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; };
@@ -5487,14 +5590,15 @@ in with self; {
   deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; };
   deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; };
   default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; };
+  define = derive2 { name="define"; version="0.2.7"; sha256="0m5nk6shfak43zw68vzc9ncl0a3rrrkhc5ckhb5yhjllj6g5yigf"; depends=[encode Hmisc latexpdf SASxport spec]; };
   deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; };
   degenes = derive2 { name="degenes"; version="1.1"; sha256="1xxn5j06qizywimrp1pl8z3yjdy1a167b9jnm77gmv87rp6j240c"; depends=[]; };
-  degreenet = derive2 { name="degreenet"; version="1.3-1"; sha256="0k0a1c1bv7zclrarfzf0d6avbd8zjnc3zd155jzmhi8dacr6r73w"; depends=[igraph network]; };
+  degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; };
   deisotoper = derive2 { name="deisotoper"; version="0.0.3"; sha256="1263cgwzgl3dnv1y9qhzjl4b7r69h59x38ggb7c8zn7g6qbdc0kc"; depends=[rJava]; };
   dejaVu = derive2 { name="dejaVu"; version="0.2.0"; sha256="1cnbgssdnvl092vz0j2n4bamvysrr0n9wy6ycz2mkm5wvf4r296i"; depends=[MASS]; };
-  deldir = derive2 { name="deldir"; version="0.1-14"; sha256="12cjr4r50rdrh2l0105cvd42rqwzsmmiqcax3sbqk1ggh2lnblw9"; depends=[]; };
+  deldir = derive2 { name="deldir"; version="0.1-15"; sha256="0407wfnjcfg7ca6ani96bbg5ksx8jkyijaprv7n4g7w21311242p"; depends=[]; };
   delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; };
-  deltaPlotR = derive2 { name="deltaPlotR"; version="1.5"; sha256="0hbaibl4b50pg9ypyhz4700w6kir4jiyyl0230a8hjmb92aqn303"; depends=[MASS]; };
+  deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; };
   deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; };
   demi = derive2 { name="demi"; version="1.1.2"; sha256="04dq4db9ibvv91nm0gz8dfbgv1gpmalf9hv6i78dwhh1xzjg1mig"; depends=[affxparser affy devtools oligo plyr R_utils]; };
   deming = derive2 { name="deming"; version="1.0-1"; sha256="00v59qb6qwbwsvcwi59d0c0g3czfz1190ccj4dx6yarizr4g6cy8"; depends=[boot]; };
@@ -5502,7 +5606,7 @@ in with self; {
   demogR = derive2 { name="demogR"; version="0.5.0"; sha256="1y7pkf1m8fqjsvs0szyaqga2y7p3dvj0r85nz8nzqbmy4zrrv4w8"; depends=[]; };
   demography = derive2 { name="demography"; version="1.20"; sha256="097k0chs8shm1r9ny6jdx2kp2shyxsivjw1n1rhb3bs0m0l3vm9r"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; };
   dendextend = derive2 { name="dendextend"; version="1.7.0"; sha256="1krvqadnnh53xx5ql7bwzxaif6a317jzbs1m00gnc6jnj03rfl5d"; depends=[fpc ggplot2 magrittr viridis whisker]; };
-  dendroTools = derive2 { name="dendroTools"; version="0.0.6"; sha256="0mqzlysp0kihs9ymz8y3agvjl6ihn996cmpw331c4jb5n7vhjx0r"; depends=[brnn caret dplyr ggplot2 gridExtra MLmetrics oce randomForest reshape reshape2 RWeka scales]; };
+  dendroTools = derive2 { name="dendroTools"; version="0.0.7"; sha256="1wij1jwhbn0zs15zh2raa7xa1zfklchlyihv6baf7gkk5cmy87zg"; depends=[brnn dplyr ggplot2 gridExtra knitr magrittr MLmetrics oce plotly reshape reshape2 RWeka scales]; };
   dendroextras = derive2 { name="dendroextras"; version="0.2.3"; sha256="0hb7crbgsnbcwvbk05iz5ik45n7zgysmwjj6xc46131yd8l0i1qx"; depends=[]; };
   dendrometeR = derive2 { name="dendrometeR"; version="1.0.0"; sha256="1par27ipgbfbrmdlwvkf82i5dgnfrcawmavakrf8lplin2hhb7gs"; depends=[forecast pspline zoo]; };
   dendsort = derive2 { name="dendsort"; version="0.3.3"; sha256="1m4qh79ppfvipmbi8m8vwq0hqmwwipbg5izihz5j6x8a4g5i6iym"; depends=[]; };
@@ -5510,10 +5614,10 @@ in with self; {
   denoiseR = derive2 { name="denoiseR"; version="1.0"; sha256="094nknr3hyx4kv18vnpdzrcpmfb4r7x9jgrp3p6x4nwrgzdh3r95"; depends=[FactoMineR irlba Matrix]; };
   denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; };
   denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; };
-  denseFLMM = derive2 { name="denseFLMM"; version="0.1.0"; sha256="0sckr9r2wylncpsq5yz2vww35imcc0zw8ghz8prqw2n20233gqj1"; depends=[MASS Matrix mgcv mvtnorm]; };
+  denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; };
   densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; };
   densratio = derive2 { name="densratio"; version="0.0.3"; sha256="07da5spbzr8x7sv6pdknc64a5zhs3dgnpcx4s2v68vc31xsd0gqd"; depends=[]; };
-  denstrip = derive2 { name="denstrip"; version="1.5.3"; sha256="10h8ivs7nd6gkf93zvqzqjb1lzfabvvs182636m67f86jfn6d4y4"; depends=[]; };
+  denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; };
   depend_truncation = derive2 { name="depend.truncation"; version="3.0"; sha256="1jym52qxx8v4kbq2578d03q2593q96jccr85if47djikw0aaxmcr"; depends=[mvtnorm]; };
   depmix = derive2 { name="depmix"; version="0.9.14"; sha256="12mvsd9zab55yg02r309h5i7hldwhh3bd60bzcvwip8vsmym5611"; depends=[MASS]; };
   depmixS4 = derive2 { name="depmixS4"; version="1.3-3"; sha256="0ls30v59hzyd684w4a3aygq1i5m8iq4gxsh8mmjxdq8qx0v84hk2"; depends=[MASS nnet Rsolnp]; };
@@ -5521,12 +5625,12 @@ in with self; {
   depth_plot = derive2 { name="depth.plot"; version="0.1"; sha256="0zjg9iyqmcnkvwc9w2j7lmk3k9nsg6n8m6vq5x44d1bp4g2gr6jv"; depends=[mvtnorm]; };
   depthTools = derive2 { name="depthTools"; version="0.4"; sha256="1699r0h1ksgrlz9xafw2jnqfsc7xs0yaw97fc6dv3r11x6gxk00y"; depends=[]; };
   dequer = derive2 { name="dequer"; version="2.0-1"; sha256="04kzlff8xa733qkkx0gacgig7d4l7yvgqmzva0mj8di12byh214p"; depends=[]; };
-  derivmkts = derive2 { name="derivmkts"; version="0.2.2"; sha256="00bcffqzzsm2h4gfwri772q8i7h40xhv07wl8xj682fnlk246ggs"; depends=[mnormt]; };
+  derivmkts = derive2 { name="derivmkts"; version="0.2.2.1"; sha256="02q3vc70rvh83zqjaql46n4qkfmn0x2kfg9ikyps34vg7clsaqs3"; depends=[mnormt]; };
   desc = derive2 { name="desc"; version="1.1.1"; sha256="0k07qighac1xzmm8k988zi7i88a0yfvia3gk5hbz0fyvb2v9kzrj"; depends=[assertthat crayon R6 rprojroot]; };
   descomponer = derive2 { name="descomponer"; version="1.4"; sha256="12zpkixclm6jmrgzvcy48c1mdqh9dgadzf9026wjyamphxkkjbip"; depends=[taRifx]; };
   descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; };
   describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; };
-  descriptr = derive2 { name="descriptr"; version="0.4.0"; sha256="1v21fb90vhh7mjx9q29cbdvbxyi8sjcfbvdxf0xd8n7fkd6gd4yj"; depends=[dplyr forcats ggplot2 magrittr rlang scales shiny tibble tidyr]; };
+  descriptr = derive2 { name="descriptr"; version="0.4.1"; sha256="1jpcfpidi49lyn02sl0hwsixzln9frrz03vrap1aq0phjcln39hh"; depends=[dplyr forcats ggplot2 magrittr rlang scales shiny tibble tidyr]; };
   desctable = derive2 { name="desctable"; version="0.1.1"; sha256="188pw8fjgm2g88nraagmxbnpv4gg89vm6mxm9w9vk88iq4hgbhjc"; depends=[dplyr DT htmltools pander purrr]; };
   deseasonalize = derive2 { name="deseasonalize"; version="1.35"; sha256="1fjsa7g34dckjs6mx9b10m99byxagggm0p9pw2f1vmpjqlasin0l"; depends=[FitAR lattice]; };
   desiR = derive2 { name="desiR"; version="1.2.1"; sha256="0ghcv96bbwn74mka4dpf2lkpnlikjn3q6lx2sl8bbw77nriap0n6"; depends=[]; };
@@ -5535,14 +5639,14 @@ in with self; {
   designmatch = derive2 { name="designmatch"; version="0.3.0"; sha256="1i8xdc6z01x59gvxdmi6qjqwqi8s9zzgfaxwd7xj49r4cl6h81pd"; depends=[lattice MASS Rglpk slam]; };
   desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; };
   desire = derive2 { name="desire"; version="1.0.7"; sha256="0jmj644nj6ck0gsk7c30af9wbg3asf0pqv1fny98irndqv508kf6"; depends=[loglognorm]; };
-  desplot = derive2 { name="desplot"; version="1.3"; sha256="06aa4ijxk34z9v309jnsapa7bc95wx2g2hbasljwrb90f2z87wq9"; depends=[lattice reshape2]; };
+  desplot = derive2 { name="desplot"; version="1.4"; sha256="0brmdp095zcwx7gncng1ls972kr67ldwiq081wyafn9jm9z461ix"; depends=[lattice reshape2]; };
   detect = derive2 { name="detect"; version="0.4-1"; sha256="0hq3imp4w6bd8x4njcfrvcs5lf0vrfnags1zdph86d7hlrwfds62"; depends=[Formula Matrix pbapply]; };
   detectRUNS = derive2 { name="detectRUNS"; version="0.9.5"; sha256="0w4pz7waaabgsb47xcmgiz8bzlrs2a83y3v6j7bqb5125y1wn8hw"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; };
   detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; };
-  detpack = derive2 { name="detpack"; version="1.0.1"; sha256="00qyjhv7y5mk4h0a428i780fsvlamqnxv12kl6lqs776rhf0skfv"; depends=[]; };
+  detpack = derive2 { name="detpack"; version="1.1.0"; sha256="11l863yr15db0v6r3fmsk3hvvx6xiidw876009x9gp5fwrv7l1cv"; depends=[]; };
   detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; };
-  detrendr = derive2 { name="detrendr"; version="0.4.0"; sha256="0syxd5bds81ihm692bgps7wwl4n5fvi08jwd90hxaddksdskf2p6"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr purrr Rcpp RcppParallel rlang RSAGA stringr]; };
-  detzrcr = derive2 { name="detzrcr"; version="0.2.1"; sha256="1y1lbckm4a4m50x2a47r1wk47z4m4pvkslwgzcvw00nch47h9d8s"; depends=[ggplot2 MASS shiny]; };
+  detrendr = derive2 { name="detrendr"; version="0.5.0"; sha256="0fmyssnwqqi36lklyv7dx9rv37ca8x0iq8nisx9q831yqxvd4lhm"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr plyr purrr Rcpp RcppParallel rlang stringr]; };
+  detzrcr = derive2 { name="detzrcr"; version="0.2.2"; sha256="1bv4l4aharp3gjj9ldri7ip3bfzhq57kkmihmlzdbvnk8ajdggwy"; depends=[ggplot2 MASS shiny]; };
   devEMF = derive2 { name="devEMF"; version="3.6"; sha256="1n5i68f1j3d5yp0p0845zsvr4xhjrvj610wsb5rrlf90jwnarsx2"; depends=[]; };
   devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; };
   devRate = derive2 { name="devRate"; version="0.1.6"; sha256="0wm6nqnr76azpwg00cspi4n8r4w5qfkvm5qqp0kshv701pnbsjbp"; depends=[]; };
@@ -5553,13 +5657,14 @@ in with self; {
   dfcomb = derive2 { name="dfcomb"; version="2.4-2"; sha256="163sc18ka4wkf208ml7ghjsn43b3mbyf9zm4id563az6ckkzw45p"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
   dfcrm = derive2 { name="dfcrm"; version="0.2-2"; sha256="1kwgxfqnz2bcicyb27lp6bnvrj30lqjpn5fg7kaqshgkj53g0s4f"; depends=[]; };
   dfexplore = derive2 { name="dfexplore"; version="0.2.1"; sha256="04nbhn59l1kas26nwj4qflkjvvr33sj1mm7zg7fhvya85gvlhrbf"; depends=[ggplot2]; };
+  dfmeta = derive2 { name="dfmeta"; version="1.0.0"; sha256="0ca48adfhaxac33jmxbynlyg3ak9l5mmjhlr69n4hnz6325gn9vb"; depends=[data_table ggplot2 lme4 plyr]; };
   dfmta = derive2 { name="dfmta"; version="1.6-2"; sha256="0icpgsxhzd9y0d3xv82cy807wylxck7zn31g0b3nv0nq3jxy04jk"; depends=[BH Rcpp RcppArmadillo RcppProgress]; };
-  dfoptim = derive2 { name="dfoptim"; version="2017.12-1"; sha256="03sh92ks29hcdy4ma1b5rs29f65q65wi30j1pxkmsjxkp8179jgf"; depends=[]; };
-  dfped = derive2 { name="dfped"; version="1.0"; sha256="0xhyh5sm1a009pwfn2yb3vg2hr4sfpf9ifg09hqcvjx56pxfd8zh"; depends=[ggplot2 rstan]; };
+  dfoptim = derive2 { name="dfoptim"; version="2018.2-1"; sha256="1gya0sx8ajy04kscds06d6m9prxdwr1dmyfc6awsm6r1jwbibzb3"; depends=[]; };
+  dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; };
   dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; };
-  dfpk = derive2 { name="dfpk"; version="3.4.0"; sha256="0fvvyn1zc0s0z4xaqinf8im2ynmbs7irh9q9h66ym1pxmrqhb5zw"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
+  dfpk = derive2 { name="dfpk"; version="3.4.1"; sha256="1nmn5ir20wx3qvcf9rvnwnni5kqbn8adhc2354fb5gcvbnxlc7mc"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; };
   dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; };
-  dggridR = derive2 { name="dggridR"; version="2.0.1"; sha256="1af5sn3py3my543vn6izqmlsc80rvyx7dqxprylk4pzsmc8yyx4c"; depends=[dplyr ggplot2 Rcpp rgdal sp]; };
+  dggridR = derive2 { name="dggridR"; version="2.0.3"; sha256="1gdwxrl5c5mprfk7rx5mk8davi4mmg1crccxaaipnbnsilg9j9vh"; depends=[dplyr ggplot2 Rcpp rgdal sp]; };
   dglars = derive2 { name="dglars"; version="2.0.0"; sha256="0nhljv02cfsna4d220nhla4fs84hr30qs9j32mml0brnmazyjj0n"; depends=[Matrix]; };
   dglm = derive2 { name="dglm"; version="1.8.3"; sha256="0vj4vddqcrjzgqsi6zsxm22gj5pa5dm50wcxip4vi8kbwxaahnaj"; depends=[statmod]; };
   dgmb = derive2 { name="dgmb"; version="1.2"; sha256="1r5md917wipx78n63x87fpvsc3h87c68cpacrrs9dhss199p1a5k"; depends=[abind MASS]; };
@@ -5568,8 +5673,9 @@ in with self; {
   dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; };
   dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; };
   dhglm = derive2 { name="dhglm"; version="1.7"; sha256="09wasgvjw0xc9k68m6a8lx372p2hywk4j6ikr9wjjjfl6f17j1cw"; depends=[boot MASS Matrix numDeriv]; };
-  di = derive2 { name="di"; version="1.1.3"; sha256="1i3s1rw62iy49141b3lqy5d97iwcj6ihdhsz2716v2497c39qhhy"; depends=[scales]; };
+  di = derive2 { name="di"; version="1.1.4"; sha256="1w2gjhyi410z98d8wnhbd69jxm69nz4pmnr4fb09i70a90f53s25"; depends=[scales]; };
   diagis = derive2 { name="diagis"; version="0.1.3-1"; sha256="1cagcr5znhrg4fp96d79ly0z7bs3hhh3zfspclyfc88p2p3qsd96"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; };
+  diagmeta = derive2 { name="diagmeta"; version="0.2-0"; sha256="1qdpsn0c4g459p8p90p2a9fghiwjqqmmanz3zsa5a3lv7zxmk496"; depends=[lme4 meta]; };
   diagonals = derive2 { name="diagonals"; version="0.4.0"; sha256="03n6lm0hkgylswgj1qlgrjigm7basl5frip99mxx19mvaqa3bhqy"; depends=[]; };
   diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; };
   diaplt = derive2 { name="diaplt"; version="1.2.1"; sha256="0pya6rqzsvc5nd3smhydvabarglc4nn04q605vbllmbhq9rv00pa"; depends=[]; };
@@ -5577,6 +5683,7 @@ in with self; {
   diceR = derive2 { name="diceR"; version="0.4.0"; sha256="1pxkwrbm69b97jia7nc18sprvxqxwwvvvzmxh147wgpqlmgqq47m"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen largeVis magrittr mclust NNLM pheatmap progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; };
   dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; };
   dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; };
+  did = derive2 { name="did"; version="1.0.0"; sha256="0fgwassb8m92iij78f045fl8441f1x9dhf4hnc93wl16yv5hh7g7"; depends=[BMisc formula_tools ggplot2 gridExtra knitr MASS pbapply]; };
   didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; };
   dief = derive2 { name="dief"; version="1.1"; sha256="0x3dwlfi130wmbsmm8vf66qxqn001b07yaiq6mp1s707dnl131mc"; depends=[flux fmsb ggplot2 plyr]; };
   dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; };
@@ -5594,7 +5701,7 @@ in with self; {
   diffobj = derive2 { name="diffobj"; version="0.1.9"; sha256="1adqn472qbwrfb8m2iy3sfvj2n8g3d4h6xc3hqxpbv03yyfia2c2"; depends=[crayon]; };
   diffpriv = derive2 { name="diffpriv"; version="0.4.2"; sha256="12q2v93369bshid83rsy1csbr9ay6rfpd8zdxm12zi7py3f9sjs8"; depends=[gsl]; };
   diffr = derive2 { name="diffr"; version="0.1"; sha256="0ydwnpyzirynffsnvip667y0jqzy7yfqlfpqhb38xvmd9rmwfbp8"; depends=[htmlwidgets]; };
-  diffractometry = derive2 { name="diffractometry"; version="0.1-8"; sha256="1m6cyf1kxm9xf1z4mn4iz0ggiy9wcyi8ysbgcsk7l78y7nqh1h99"; depends=[]; };
+  diffractometry = derive2 { name="diffractometry"; version="0.1-10"; sha256="09mkqg6avky26c2dsnhpcmby76hfqg0pwmnjhkbp4px2k6c9inrc"; depends=[]; };
   diffrprojects = derive2 { name="diffrprojects"; version="0.1.14"; sha256="1mnqf5zs1w8dx9y5iwn4blyzb9j60ayzc04zxj5l8804nd527n25"; depends=[dplyr hellno magrittr R6 Rcpp RSQLite rtext stringb stringdist]; };
   diffrprojectswidget = derive2 { name="diffrprojectswidget"; version="0.1.5"; sha256="1h69mc1wayi80vz4b9cqydylf4kp9mxsigv05r0f903pqakdrzcw"; depends=[diffrprojects dplyr hellno htmlwidgets jsonlite magrittr tidyr]; };
   diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; };
@@ -5610,10 +5717,10 @@ in with self; {
   diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; };
   directPA = derive2 { name="directPA"; version="1.3"; sha256="0hcs56y69gdkfyk2xl0vxh01c19s6z1lfv02g056wxr24qfsx08c"; depends=[calibrate rgl]; };
   directlabels = derive2 { name="directlabels"; version="2017.03.31"; sha256="01ahw0c56mnzwl611s8hnghicww4c4dgf5v2wv6bl1s1pramw9pr"; depends=[quadprog]; };
-  dirichletprocess = derive2 { name="dirichletprocess"; version="0.2.0"; sha256="1q6rnrzyvkz9hn9czlm9sha80qsmrz7n4l3r8r1plkgrnf0biajv"; depends=[ggplot2 gtools mvtnorm]; };
+  dirichletprocess = derive2 { name="dirichletprocess"; version="0.2.1"; sha256="0ip7mcjddqg7z9hqrvbxixvkqp9j4d92zgpk6hn6acd4fxhb17r6"; depends=[ggplot2 gtools mvtnorm]; };
   dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; };
   dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; };
-  discSurv = derive2 { name="discSurv"; version="1.1.7"; sha256="0shxwxbvbbgp0qphpbih582d5psqj5n0izv7zvcw97vh82bzra4l"; depends=[functional mgcv mvtnorm]; };
+  discSurv = derive2 { name="discSurv"; version="1.3.1"; sha256="0vq3g42xy97ksgsghhz232spkbkr2zs8i9nm7xwdabysi9fgqdsv"; depends=[functional mgcv mvtnorm]; };
   discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; };
   disclap = derive2 { name="disclap"; version="1.5"; sha256="0piv9gxhxcd4pbh5qjn9c3199f32y3qiw5vy8cr77ki70dnmr66n"; depends=[]; };
   disclapmix = derive2 { name="disclapmix"; version="1.6.2"; sha256="01pn8hy3xbf1b1fbbsd4n2hv7gs97zalgq858xsrr4a0nqrvxmn5"; depends=[cluster disclap Rcpp]; };
@@ -5627,9 +5734,10 @@ in with self; {
   diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; };
   dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; };
   disp2D = derive2 { name="disp2D"; version="1.0"; sha256="0q5bds2r1mqzcwmnj61dmwqv6b0s0scq5h3nim47q3wp0n4gbslz"; depends=[geometry]; };
+  dispRity = derive2 { name="dispRity"; version="1.0.3"; sha256="1swix45fcr0hn21pvy2dwsnbr60bvsdjk8vwh432p0s69c372m3l"; depends=[ade4 ape geiger geometry geoscale paleotree phangorn phyclust vegan]; };
   disparityfilter = derive2 { name="disparityfilter"; version="2.2.3"; sha256="0dkk3qws631mf0g02di5rsrvh5954cykysyri0g8aqgik0j9dg06"; depends=[igraph]; };
   displayHTS = derive2 { name="displayHTS"; version="1.0"; sha256="0mqfdyvn2c5c3204ykyq29ydldsq0kb3a1d7mrzqr7cvrj1ahlqa"; depends=[]; };
-  dispmod = derive2 { name="dispmod"; version="1.1"; sha256="141gzhnmxxl495cpjgd4wnvdrbz6715m6sd1pycrbaqrsdc1pv57"; depends=[]; };
+  dispmod = derive2 { name="dispmod"; version="1.2"; sha256="16r6is0pchzc9mxpz0c44f72j76vsh3j9damalcxajrha06dkdq4"; depends=[]; };
   disposables = derive2 { name="disposables"; version="1.0.3"; sha256="0q5wacjclspn2fh7z1pg2l67ll51n75wck5h2fdq2vxy3qn3vwis"; depends=[]; };
   dissUtils = derive2 { name="dissUtils"; version="1.0"; sha256="00fzlmkdfw2s3k824wp2pk3v7cvxnywi1hfp86g4mm95z2qlw9br"; depends=[]; };
   dissever = derive2 { name="dissever"; version="0.2-2"; sha256="0s4g84lq15i00vpaafwmcbspdqy23cbj2fbyfnq60mzllyzgs0n2"; depends=[boot caret dplyr foreach magrittr plyr raster sp viridis]; };
@@ -5661,6 +5769,7 @@ in with self; {
   divo = derive2 { name="divo"; version="1.0.0"; sha256="0xy4yxvx2grskdzb5z73mhgrq0nfhdkm2hxahdns7pb1fgajxyjx"; depends=[cluster]; };
   dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; };
   dkDNA = derive2 { name="dkDNA"; version="0.1.1"; sha256="0ycyzn5bmhjl5idp0lndffkninpm9n23wrkrzi59ac8z8ghsnhf4"; depends=[]; };
+  dkanr = derive2 { name="dkanr"; version="0.1.0"; sha256="05sw0rdfl5fr9v67lixbk2jmsxi2gdbyb6bzkf80ynp1y1izxyzq"; depends=[assertthat dplyr httr jsonlite purrr stringr tibble]; };
   dlib = derive2 { name="dlib"; version="1.0"; sha256="0d6p28r86jq7gwqh3njnsfgl6mmgx7famqx7p1xmra91cdlp3hqj"; depends=[Rcpp]; };
   dlm = derive2 { name="dlm"; version="1.1-4"; sha256="0hyphl90bqc16j7in750pmiyq28hmc46kxgv7gj17c8xl9c9xqxm"; depends=[]; };
   dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; };
@@ -5677,7 +5786,7 @@ in with self; {
   dnet = derive2 { name="dnet"; version="1.1.3"; sha256="1av4kbcbhpj1ivz6ln26p80z5fd170971mrcy59zm67h6kdi56az"; depends=[graph igraph Matrix Rgraphviz supraHex]; };
   dng = derive2 { name="dng"; version="0.1.1"; sha256="04r06k6mmif7kbpham52dq2zv5rijjnsdc3sgxz6kbh5mqdn6jfq"; depends=[Rcpp]; };
   dnr = derive2 { name="dnr"; version="0.3.2"; sha256="0f5xahd86x196mg7c9zrhxj7c8cg7mrnd4nzyr02xcym6cff6vqm"; depends=[arm ergm glmnet igraph network sna]; };
-  doBy = derive2 { name="doBy"; version="4.5-15"; sha256="0n1ml47f78nqhy92a0fgsb4brz0qyfr4q3c7im8pnb0ngia4ssdx"; depends=[MASS Matrix]; };
+  doBy = derive2 { name="doBy"; version="4.6-1"; sha256="1y02awzid23bxz8hx6j8pxd6i7jaq8pdw3k60rag8y6m69incrw5"; depends=[dplyr magrittr MASS Matrix plyr]; };
   doFuture = derive2 { name="doFuture"; version="0.6.0"; sha256="04pvs2h1ibdbl6cph30rvdn5vzj9afllvh8f0iy64pgy83vls790"; depends=[foreach future iterators]; };
   doMC = derive2 { name="doMC"; version="1.3.5"; sha256="1vfrykvfvsyq12mypd266867ml1dcwc3rj5k9c3wrn5bddcm88kr"; depends=[foreach iterators]; };
   doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; };
@@ -5687,13 +5796,13 @@ in with self; {
   doSNOW = derive2 { name="doSNOW"; version="1.0.16"; sha256="13ir4a8252h4yvp5ir9xnwack1kn58i4ny6sf2qdc12zspn3850n"; depends=[foreach iterators snow]; };
   dobson = derive2 { name="dobson"; version="0.2"; sha256="1fyf4dyzpg6hqdvr8n4ncs4dny8mg23nxbd49jd3mrlajszzg0vp"; depends=[]; };
   docker = derive2 { name="docker"; version="0.0.2"; sha256="00zq4zmv2y6q069q92dn8db2bj96kfy7pv2s58q21dxkp1c4s6qg"; depends=[reticulate]; };
-  dockerfiler = derive2 { name="dockerfiler"; version="0.1.0"; sha256="16y70blrv9crmgrcnq6dk3bjk73ajlkxv72xj3qrmw78zjy5an19"; depends=[attempt glue R6]; };
+  dockerfiler = derive2 { name="dockerfiler"; version="0.1.1"; sha256="17r8az17vkj46cljp0pa15xh9x2p5w85csm2hickfk2lyg2pbjnx"; depends=[attempt glue R6]; };
   docopt = derive2 { name="docopt"; version="0.4.5"; sha256="1pwng6018ls0hk785bs8yjwpzsqr2pcvzgpavqd9rw19n5lvzhxn"; depends=[stringr]; };
   docopulae = derive2 { name="docopulae"; version="0.3.3"; sha256="13889sj509gbl9zs7jqdvslp6sc81jv54cbqh1wpp834jp5s1q3x"; depends=[]; };
   docstring = derive2 { name="docstring"; version="1.0.0"; sha256="19z5frhxbdc5c4vrkckgqbh9mx4d9w1icw8szsw9yadvbg48nlhl"; depends=[roxygen2]; };
   docuSignr = derive2 { name="docuSignr"; version="0.0.3"; sha256="0q90z31svbdnvylfr0yj2f0gahvpi089c1d5llvwqy8qc5p9fbqw"; depends=[httr jsonlite magrittr]; };
   documair = derive2 { name="documair"; version="0.6-0"; sha256="1pphcbx90n9xn8a7gvfrwzfapwqgpbl3gg2grm7chfxgcp7i99i2"; depends=[]; };
-  document = derive2 { name="document"; version="3.0.0"; sha256="1jd7pgifnlffibmmsflgp0gbv83qclqsfi8glvr9kfxw66yx0mhq"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
+  document = derive2 { name="document"; version="3.0.1"; sha256="1pmms1mrldjqsd2zrmpyxz86xykgq1ld4l4gv9gd1ycd7r8v0f8p"; depends=[callr checkmate desc rcmdcheck roxygen2 rstudioapi withr]; };
   docxtools = derive2 { name="docxtools"; version="0.1.1"; sha256="1mlgl9105mifzdgf57spgr2rr5740ghr5afmlskxn6ind7jfka70"; depends=[dplyr ggplot2 pander stringr tidyr]; };
   docxtractr = derive2 { name="docxtractr"; version="0.2.0"; sha256="197j57ab8x960b1yfq6xp8fwmq51xs04nf0cb16r161h4bcmgs2j"; depends=[dplyr purrr tibble xml2]; };
   dodgr = derive2 { name="dodgr"; version="0.0.3"; sha256="161qy9iyszpb44v26zn6w4d7c9bw8pg7vwgqcba0k0xc5dnr2wjc"; depends=[igraph magrittr osmdata rbenchmark Rcpp sp]; };
@@ -5702,7 +5811,7 @@ in with self; {
   dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; };
   dotCall64 = derive2 { name="dotCall64"; version="0.9-5.2"; sha256="1jw0kyw95nivjimh25ri9sigqwlvk12kd45ydsh1yggigzc0k23k"; depends=[]; };
   dotenv = derive2 { name="dotenv"; version="1.0.2"; sha256="13i8dimrgq9nxmmrxr42pacsiylj6dilwpa8ldnrfp4cl9zgrqas"; depends=[]; };
-  dotwhisker = derive2 { name="dotwhisker"; version="0.3.0"; sha256="1sbj8blnqnsyvf7pq2cc9q7nqb66n0v2gi2rr09yjlppf7v1pcjf"; depends=[broom dplyr ggplot2 ggstance gridExtra gtable plyr stringr]; };
+  dotwhisker = derive2 { name="dotwhisker"; version="0.4.1"; sha256="1wmb9c0c6r0f36cks72y2jp1iwi6hxjqchq4z76vlcdxq09gmq3g"; depends=[broom dplyr ggplot2 ggstance gtable purrr rlang stringr]; };
   doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; };
   downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; };
   downscale = derive2 { name="downscale"; version="2.0-3"; sha256="0jvzvmwhpdr7ygcxky4yl1ldb843hrmnzhmnvl0694mmswwqsf8l"; depends=[cubature minpack_lm raster Rmpfr sp]; };
@@ -5721,9 +5830,9 @@ in with self; {
   dprep = derive2 { name="dprep"; version="3.0.2"; sha256="0iw1pqpqlv436wpwh1w832aqvy91zvxmbk2jdw7aczrb29wys2bj"; depends=[class e1071 FNN MASS nnet rgl rpart StatMatch]; };
   dprint = derive2 { name="dprint"; version="0.0.4"; sha256="13bq6yjlp5p5rcsz684rqcigp42xnz3p5phnqmrhzm874gfzm8rj"; depends=[]; };
   dr = derive2 { name="dr"; version="3.0.10"; sha256="0dmz4h7biwrn480i66f6jm3c6p4pjvfv24pw1aixvab2vcdkqlnf"; depends=[MASS]; };
-  dr4pl = derive2 { name="dr4pl"; version="1.0.0"; sha256="1gcddnjmzqm16vzqvh8hxw2spvfa41jmapf7n87lv100j5f8ahl5"; depends=[devtools drc ggplot2 Matrix Rdpack tensor testthat]; };
+  dr4pl = derive2 { name="dr4pl"; version="1.1.1"; sha256="1wh7mdns9vxjkfphj2nqllh7q3k3lch5y0b4yzf3j4xrd0wyf2hm"; depends=[ggplot2 Matrix matrixcalc Rdpack tensor]; };
   drLumi = derive2 { name="drLumi"; version="0.1.2"; sha256="09ps8rcqrm6a1y8yif2x82l0k4jywq60pkndh9nzfpbsw4ak2lby"; depends=[chron gdata ggplot2 Hmisc irr minpack_lm msm plyr reshape rootSolve stringr]; };
-  drake = derive2 { name="drake"; version="5.0.0"; sha256="0hldxadlcl3m249rb68yikvn4gck98zj2x67jjxfgas27a1n4pjx"; depends=[codetools crayon digest evaluate formatR future future_apply igraph knitr lubridate magrittr plyr R_utils rprojroot storr stringi stringr testthat visNetwork withr]; };
+  drake = derive2 { name="drake"; version="5.1.2"; sha256="18f0mxbzz50dli3y4fzyh5qgk8ccxrvqy8a3xsc5xq4y0ilq8kvf"; depends=[bindr CodeDepends crayon digest dplyr evaluate formatR future future_apply igraph knitr lubridate magrittr pkgconfig plyr purrr R_utils R6 rlang rprojroot storr stringi testthat tibble tidyselect visNetwork withr]; };
   drat = derive2 { name="drat"; version="0.1.4"; sha256="0vrpqf793vinx4v7jrbn910iplvpmrlwhdjqqzx8cl2k9hl43x08"; depends=[]; };
   drawExpression = derive2 { name="drawExpression"; version="1.0"; sha256="0c2daicqrjlqf7s788cknzvw9c6rm500lgmwfr7z03bq7bd2ah90"; depends=[]; };
   drc = derive2 { name="drc"; version="3.0-1"; sha256="0c8xn8ripzq270hy8d16fcnx02l02alddznd7fqwk3jyi6113h1y"; depends=[car gtools MASS multcomp plotrix scales]; };
@@ -5752,7 +5861,7 @@ in with self; {
   dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; };
   dtw = derive2 { name="dtw"; version="1.18-1"; sha256="1b91vahba09cqlb8b1ry4dlv4rbldb4s2p6w52gmyw31vxdv5nnr"; depends=[proxy]; };
   dtwSat = derive2 { name="dtwSat"; version="0.2.3"; sha256="10b0hs9kn5ljfv28iz62h966zb1pxsfrr6fx45d4427gr6fg8ncz"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer reshape2 rgdal scales sp xtable zoo]; };
-  dtwclust = derive2 { name="dtwclust"; version="5.3.0"; sha256="0p6v7d7lp5fsbky5c1qcss2cxx4x5w0ass0ami15aijdb8154qyf"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; };
+  dtwclust = derive2 { name="dtwclust"; version="5.3.1"; sha256="0lm8y63gx096vdnza7mcqllfnl56vaz8dnrnm7f7jvwgmkqkj1xy"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel reshape2 RSpectra shiny shinyjs]; };
   dualScale = derive2 { name="dualScale"; version="0.9.1"; sha256="11hqxprai0s5id6wk4n2q174r1sqx9fzw3fscvqd2cgw8cjn1iwl"; depends=[ff lattice Matrix matrixcalc vcd]; };
   dub = derive2 { name="dub"; version="0.1.0"; sha256="0sdk8sppjcfx2bsngpngm2446warsnipzzw4yz5z4jpickp52ay0"; depends=[]; };
   duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; };
@@ -5766,7 +5875,7 @@ in with self; {
   dwapi = derive2 { name="dwapi"; version="0.1.3"; sha256="149v1yjnrdbqjg7cpnanm1jv1dcpzqy264qk5dx8wvw9kdc5h3b8"; depends=[httr jsonlite readr rjson xml2]; };
   dyads = derive2 { name="dyads"; version="1.1"; sha256="0jlyg4bz3zp4g5ig0swwi72bxaj85wll05h6vishnvmnprpdc96n"; depends=[MASS mvnfast]; };
   dygraphs = derive2 { name="dygraphs"; version="1.1.1.4"; sha256="0vwg9q7xrwxkm92d55ik9gdky42bj3jlh6fi4jzwyl5nfdswklb9"; depends=[htmltools htmlwidgets magrittr xts zoo]; };
-  dyn = derive2 { name="dyn"; version="0.2-9.3"; sha256="00h75kqfpr77jhppnpxvykbdcmsmsb2vl2527xzq10wkvm7gfpvv"; depends=[zoo]; };
+  dyn = derive2 { name="dyn"; version="0.2-9.6"; sha256="16fqv9k7yxdgybwzafjkyqm16qpgqz13lcjpi6a1nc8xbzlzh0gb"; depends=[zoo]; };
   dynBiplotGUI = derive2 { name="dynBiplotGUI"; version="1.1.5"; sha256="0fvyn33mzjcc3sis05phc6412y25m406il2wzdfw8caa8dafj0yw"; depends=[tcltk2 tkrplot]; };
   dynCorr = derive2 { name="dynCorr"; version="1.1.0"; sha256="0l5k764j1zhsqpgp0ndihah63hsk3zv9hviixfmh4h3i0sr0q52p"; depends=[lpridge]; };
   dynOmics = derive2 { name="dynOmics"; version="1.0"; sha256="10aw362hhwqdnjf7xxzy25fdxq2zznzvg6xwvl25a9ppj76nm1rh"; depends=[ggplot2 gplots snow]; };
@@ -5784,6 +5893,7 @@ in with self; {
   dynlm = derive2 { name="dynlm"; version="0.3-5"; sha256="1sjhhlvvcgmayb9dfwacv1g75c4lhbpzyczj6h7gkd19bcfbdhqp"; depends=[car lmtest zoo]; };
   dynpanel = derive2 { name="dynpanel"; version="0.1.0"; sha256="073kfl5g4d7v8wd2qnpixqrxbac3cqj35z03ax2zlb8h2afa7j62"; depends=[gtools]; };
   dynpred = derive2 { name="dynpred"; version="0.1.2"; sha256="111ykasaiznn3431msj4flfhmjvzq7dd1mnzn1wklc5ndix1pvf9"; depends=[survival]; };
+  dynprog = derive2 { name="dynprog"; version="0.1.0"; sha256="1rvn2zyhdi60y01zbvfv4him6iz2ljdr7ivkr7m7y7yd1lg547ax"; depends=[rlang]; };
   dynr = derive2 { name="dynr"; version="0.1.12-5"; sha256="1l9waqwg5mkqy8ipryickrkf141mjpzdvsc4qbw8bq4rkrgykklc"; depends=[ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 xtable]; };
   dynsbm = derive2 { name="dynsbm"; version="0.5"; sha256="01vi4qzgp25l4wg2ij9pqrn775x4yj9gck0l397nwjg96pa7x2lz"; depends=[RColorBrewer Rcpp riverplot]; };
   dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; };
@@ -5797,10 +5907,10 @@ in with self; {
   ePCR = derive2 { name="ePCR"; version="0.9.9-4"; sha256="0lnkb4zffn62vbx8hh953z9zh0plj8l15cc1k3x936zblzgd226r"; depends=[Bolstad2 c060 glmnet hamlet impute MASS Matrix pracma ROCR survival timeROC]; };
   eRm = derive2 { name="eRm"; version="0.16-0"; sha256="18shx4jjvymhzdab1qvlfqnmg49mwllyw3v46j9v19dy6h9l3n8m"; depends=[lattice MASS Matrix]; };
   eVenn = derive2 { name="eVenn"; version="2.4"; sha256="1qs5qsrc89kb6w6xqc8jdxkih6h48zprvavffdqhxq4ab4i1nvbf"; depends=[]; };
-  eaf = derive2 { name="eaf"; version="1.07"; sha256="0310lrqfm1l0lifak7wa6xn21bzzn27kbrrx0bidj4hibwv7sa4l"; depends=[modeltools]; };
+  eaf = derive2 { name="eaf"; version="1.8"; sha256="1plzvfa2vs3njky7xk9dvic2xapdnzb5iycrksv0qj03ylbh6410"; depends=[modeltools]; };
   earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; };
   earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; };
-  earth = derive2 { name="earth"; version="4.6.1"; sha256="0hrbpa0qvhsdrdi06p0kdl2mw0n84sxcrqk96f6rh7cb6j8bm9bg"; depends=[plotmo TeachingDemos]; };
+  earth = derive2 { name="earth"; version="4.6.2"; sha256="1ma2qgbkw0if93wd6fk6611xkznadfxy6v6xawrk4n9b5im3j6f4"; depends=[plotmo TeachingDemos]; };
   earthtones = derive2 { name="earthtones"; version="0.1.0"; sha256="1phl50bgd40i36fdkfs9xkqm703vgwxlnpyik6lk8ssip0m4rn9j"; depends=[ggmap]; };
   easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; };
   easyDes = derive2 { name="easyDes"; version="3.0"; sha256="1z4ynd1ck2vxsshygjgnhyzg8i41kpnwsfix96nmgwm3861n0phb"; depends=[multcomp PMCMR]; };
@@ -5842,7 +5952,7 @@ in with self; {
   ecosim = derive2 { name="ecosim"; version="1.3"; sha256="00arz8j2az1nn4p96pshw0p9xxq2qfgkyrf4ahvl1hp1h3k68jfn"; depends=[deSolve stoichcalc]; };
   ecospace = derive2 { name="ecospace"; version="1.3.1"; sha256="0xrhlhpndycj2hdf50lygymc1hwmczx74r6l9f2qmm6v90c0729k"; depends=[FD]; };
   ecospat = derive2 { name="ecospat"; version="2.2.0"; sha256="0awzhzl90j72jxp7qk5q5vqmgyccbkw2rbw0jrhjvlwkr5q9gyvx"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maptools MigClim PresenceAbsence randomForest raster rms sp spatstat vegan]; };
-  ecotox = derive2 { name="ecotox"; version="1.3.0"; sha256="05k3hdz25kw28222bnlk814b2rlwq2f6b5kdqxqls9wdfvdknij3"; depends=[ggplot2]; };
+  ecotox = derive2 { name="ecotox"; version="1.3.1"; sha256="1is4zn7rabpibpnyy9mwpcjdhhb02r0a2r5azw9i5asshr2d1ywi"; depends=[ggplot2 magrittr]; };
   ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; };
   ecoval = derive2 { name="ecoval"; version="1.1"; sha256="0ihig6nq3lrz6lzix92lrlzywnqkzsp5lrbccn5slhxdj5llird2"; depends=[rivernet utility]; };
   ecp = derive2 { name="ecp"; version="3.1.0"; sha256="0siq5acpy4wmqzm6zvpqj1m8a05hgk5jhb1clv06y40kqk5kjrap"; depends=[Rcpp]; };
@@ -5852,7 +5962,7 @@ in with self; {
   edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; };
   edci = derive2 { name="edci"; version="1.1-2"; sha256="10rqkimvmyb7hxp4wkpj8bq07q3yaimm058d4mmr09fw25lqyz1q"; depends=[]; };
   edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; };
-  edeaR = derive2 { name="edeaR"; version="0.7.2"; sha256="0k043g2qrm58l7dvb2ylpg76wcznkr4p4vp2p3b4hhg1hzq8zccf"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr]; };
+  edeaR = derive2 { name="edeaR"; version="0.8.0"; sha256="1qpkb5ysz5lbkqdxszgzkn7s77h6fqqd62pc0nn2abjgq2hb8a9j"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr]; };
   edesign = derive2 { name="edesign"; version="1.0-13"; sha256="0fc3arr8x9x9kshp6jq4m4izzc5hqyn5vl0ys6x0ph92fc6mybp3"; depends=[]; };
   edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; };
   edfReader = derive2 { name="edfReader"; version="1.2.0"; sha256="0r4918swpfddz246kkvy10a07s178zmwp7m4ydxvi8di6iga76hk"; depends=[]; };
@@ -5878,7 +5988,8 @@ in with self; {
   eesim = derive2 { name="eesim"; version="0.1.0"; sha256="0ljj1jp9cl0im8k7sfjd28ggj4q9a14df3554kwxkssr1vsn1wbc"; depends=[dplyr lubridate purrr viridis]; };
   effectFusion = derive2 { name="effectFusion"; version="1.0"; sha256="1nx61n4lgnj6wh4arqm62p9xwxqvz4g7bs4b5k3ybkhmh6ns9v5l"; depends=[bayesm cluster ggplot2 MASS Matrix]; };
   effectR = derive2 { name="effectR"; version="1.0.0"; sha256="08r1jifrqa9fxm5jp6jsvazdpql53kpm6mj0sg70hvd8q0cilryb"; depends=[ggplot2 reshape2 seqinr shiny viridis]; };
-  effects = derive2 { name="effects"; version="4.0-0"; sha256="0h3247xcccanp0cp18r5k4l87i9862yjr5jc8sxcsfvjzn13xgf6"; depends=[carData colorspace lattice lme4 nnet survey]; };
+  effects = derive2 { name="effects"; version="4.0-1"; sha256="042f6gb799agqqxawd6ddlzplyxkd1h5v9pm759zmnj2094smw6q"; depends=[carData colorspace estimability lattice lme4 nnet survey]; };
+  effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; };
   efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; };
   effsize = derive2 { name="effsize"; version="0.7.1"; sha256="0l0ja7qcknn8r5hf7nrjk5cy0ajw0z60ggbyj8qvjzf8qah4mlss"; depends=[]; };
   efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; };
@@ -5901,7 +6012,7 @@ in with self; {
   elastic = derive2 { name="elastic"; version="0.8.0"; sha256="17aqf0a3spwh8k7s3kgnccbgad3sr3w63if96piygjz0lxgc7kzs"; depends=[curl httr jsonlite]; };
   elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; };
   elasticnet = derive2 { name="elasticnet"; version="1.1"; sha256="1x8rwqb275lz86vi044m1fy8xanmvs7f7irr1vczps1w45nsmqr2"; depends=[lars]; };
-  elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.1"; sha256="1x20w13hkpnf1kjvml99a9q1w162f6703ccqvcqy6z0vamcvylw8"; depends=[httr jsonlite]; };
+  elasticsearchr = derive2 { name="elasticsearchr"; version="0.2.2"; sha256="0jawypqlk8374izh3gq9k6fwc2gwn74xa9lbmx4ww3rq2xp90xw6"; depends=[httr jsonlite]; };
   elec = derive2 { name="elec"; version="0.1.2"; sha256="0f7ahrjb52w8a8l5v00xla6z9afpz2zrckl9v04xalp34snhdwan"; depends=[]; };
   elec_strat = derive2 { name="elec.strat"; version="0.1.1"; sha256="09196k5c3jsikh98d33bn70izwcbx0wb5ki9fv1ij0dw9mnv4c3p"; depends=[elec]; };
   elect = derive2 { name="elect"; version="1.1.1"; sha256="025h69qsify0v3bsr9082wjdkglmarkjaqqkwr8j826466617n1v"; depends=[msm nnet]; };
@@ -5919,15 +6030,15 @@ in with self; {
   elo = derive2 { name="elo"; version="1.0.1"; sha256="0dhlac5l68a3jps2hx0bc7qjj8hsr1ha137hcwxnrfdwnki6chlp"; depends=[pROC Rcpp]; };
   elrm = derive2 { name="elrm"; version="1.2.2"; sha256="0wz0l703v0iyp7nswdmh65n0cy3a7rfvyxd795a6nzk3nich8bfg"; depends=[coda]; };
   emIRT = derive2 { name="emIRT"; version="0.0.8"; sha256="17igda5phgfapjzg7dkid5jj49gmwgpadjr27z7s21365i7md9mz"; depends=[pscl Rcpp RcppArmadillo]; };
-  embryogrowth = derive2 { name="embryogrowth"; version="7.1"; sha256="0gm5ww7vwc6kcv6lzrca4f9a6nkilb79d5b4kidfhwrcbfrkdb2k"; depends=[deSolve HelpersMG numDeriv optimx]; };
+  embryogrowth = derive2 { name="embryogrowth"; version="7.4"; sha256="10h80jy391bm1avmh347ly3a1vhlhbpfbhrf39xl7x4nwcckd6bp"; depends=[deSolve HelpersMG numDeriv optimx]; };
   emdbook = derive2 { name="emdbook"; version="1.3.9"; sha256="09xbdyw8a4pvrsg3ryr8drby0njy4avc5wsjj4ffibdaicpchy69"; depends=[bbmle coda lattice MASS plyr]; };
-  emdi = derive2 { name="emdi"; version="1.1.1"; sha256="1gbjx0pxfzkbp0csgq07iwqqww5lixpkvwn3k53na65gwx9afsq4"; depends=[boot FNN ggmap ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap reshape2 rgeos simFrame]; };
+  emdi = derive2 { name="emdi"; version="1.1.2"; sha256="135dnc7djxa7kyhaa0rd42m396ccic4mgd5pq4qj8zqgd2swj2aa"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; };
   emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; };
   emg = derive2 { name="emg"; version="1.0.6"; sha256="1kzmxs224m6scmk8gg5ckx5c7is99hwgwv28yl26hnrbkm59skyh"; depends=[]; };
   emil = derive2 { name="emil"; version="2.2.8"; sha256="02xjf8ipqr136y3pa375lwpg6h63yvbphhghs9jjxfl2r4fdkvcn"; depends=[data_table dplyr ggplot2 lazyeval magrittr Rcpp tidyr]; };
   emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; };
   emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; };
-  emmeans = derive2 { name="emmeans"; version="1.1.2"; sha256="12gkg2r7g1n481mvry354az5gzqji7rsl43jrmvq504sqyg4z41n"; depends=[coda estimability ggplot2 multcomp mvtnorm nlme plyr xtable]; };
+  emmeans = derive2 { name="emmeans"; version="1.1.3"; sha256="150kgc5ymssmcf240js4jrbhm32xn4bayrzbxry12mh1lcr9kvf2"; depends=[coda estimability ggplot2 multcomp mvtnorm nlme plyr xtable]; };
   emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; };
   emojifont = derive2 { name="emojifont"; version="0.5.1"; sha256="0i4id9631ah5vzkzh6zfxgk55b2ppnbgabp1w2ivy29i0nji9wk4"; depends=[ggplot2 proto showtext sysfonts]; };
   emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; };
@@ -5936,11 +6047,11 @@ in with self; {
   emplik = derive2 { name="emplik"; version="1.0-3"; sha256="0b52383m2djdcg9b1a7r10k5pkzljz6dalvbg2gg962ckvpndb11"; depends=[quantreg]; };
   emplik2 = derive2 { name="emplik2"; version="1.20"; sha256="0qdsfmnvds01qa4f112knv905k0fzccrqj9fwaqrqcy48cigm8pd"; depends=[]; };
   ems = derive2 { name="ems"; version="1.0.0"; sha256="1x6zsrf15xn865v8awbnq1cpaqp5j2k1pmis5a8mjnw568xi0hhw"; depends=[]; };
-  emuR = derive2 { name="emuR"; version="0.2.3"; sha256="04nxrg95qgwc5ss139bgjcsxkarwzkxy132dz0vk3sq7sddnagws"; depends=[base64enc data_table DBI dplyr httpuv jsonlite MASS RCurl RSQLite stringr uuid wrassp]; };
+  emuR = derive2 { name="emuR"; version="1.0.0"; sha256="19740da4m22v9ys1z8q80khf71fjbaisn1f6whgal7p3cinvkcr3"; depends=[base64enc compare DBI dplyr httpuv jsonlite MASS purrr RCurl readr RSQLite shiny stringr tibble uuid wrassp]; };
   emulator = derive2 { name="emulator"; version="1.2-15"; sha256="1rp7q7zs8b49jzdkbzm4s1g8554h41hcabf4d78k9jhhys2z28g2"; depends=[mvtnorm]; };
   enaR = derive2 { name="enaR"; version="3.0.0"; sha256="0sy7k8l6b8p34bcf9bpjr1y6qkjkvn77y2w2ws7ivcr1fynrhm5p"; depends=[gdata limSolve MASS network sna stringr]; };
   enc = derive2 { name="enc"; version="0.2.0"; sha256="0n4s3abxmpndppm18dcibap2n22xpjzafn5xjskfdfrz3wjfy1kb"; depends=[]; };
-  encode = derive2 { name="encode"; version="0.3.3"; sha256="01jippva8gfbg3bq6g1sz8mpmglywg4mkb4k44bfspiv60bmv98f"; depends=[]; };
+  encode = derive2 { name="encode"; version="0.3.4"; sha256="1ibrxa0lzni8c1nm3x061vj55faz8fvfgbl7c7b2wfanh5qnny9j"; depends=[]; };
   endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; };
   endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; };
   endorse = derive2 { name="endorse"; version="1.6.0"; sha256="1j75sb2di2c092dilbjj5qsvb52h3zmm7wxflf9kg7xw227wq3zw"; depends=[coda]; };
@@ -5956,18 +6067,18 @@ in with self; {
   enrichwith = derive2 { name="enrichwith"; version="0.1"; sha256="10x7p0s96hkalnnnwx2gczywblqxig9p4pllzk1ciyjjfidsc9va"; depends=[]; };
   ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; };
   ensembleEN = derive2 { name="ensembleEN"; version="1.1.2"; sha256="033i4bcnr62kmrp1fafdw6vx8ir38kqchgxp4fidg3i750nkjnda"; depends=[Rcpp RcppArmadillo]; };
-  ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.1"; sha256="1xbk3m4b619wni64i7wrccgp7gwaql2g6lg42lqwbsscdr3j0cls"; depends=[chron ensembleBMA evd]; };
+  ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.2"; sha256="16d8030zfdwifqrh45vz3gf5n0bix0mhsmsnydgjq1fghdklcmyx"; depends=[chron ensembleBMA evd]; };
   ensembleR = derive2 { name="ensembleR"; version="0.1.0"; sha256="0xvq1jlsp7gsk46i847nfvadxwlh09gi2rgwss2wf2xmh1855ray"; depends=[caret]; };
   ensemblepp = derive2 { name="ensemblepp"; version="0.1-0"; sha256="1b3rhg8mv1x3caz3xg84cwx8m88055n6yl36d9i4ws6vbj8vx68f"; depends=[]; };
   ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; };
   entropart = derive2 { name="entropart"; version="1.5-3"; sha256="02jzcqb7sqg9fcf2vi4myki9mgdsx0jwyf535zzh124h1bwz3f3y"; depends=[ade4 ape EntropyEstimation geiger vegan]; };
   entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; };
   envDocument = derive2 { name="envDocument"; version="2.4.0"; sha256="0r7h9p0b0gr2l18mv1ydlamsc0iq474dfhp450mdfnw2q289mhrn"; depends=[]; };
-  enveomics_R = derive2 { name="enveomics.R"; version="1.2.0"; sha256="0bbm16k2i9lwm662hsglv3a5mf367bgxh25c87cvvfxafrbd67wj"; depends=[fitdistrplus investr modeest sn]; };
+  enveomics_R = derive2 { name="enveomics.R"; version="1.3"; sha256="1m97lmgf42ifzafz91g69nnf4q918464xir9cqjjn6ch5i7lvi65"; depends=[fitdistrplus investr modeest sn]; };
   enviGCMS = derive2 { name="enviGCMS"; version="0.3.4"; sha256="1wjf1rxwzd590qsyljw1pd59kppx91m32p6nkdy4yvbnv39rk8dq"; depends=[BiocParallel genefilter limma mixtools qvalue rcdk RColorBrewer sva xcms]; };
   enviPat = derive2 { name="enviPat"; version="2.2"; sha256="1cf1h4v05riivjwil4167sncdxzgxf3r4snx1imjb6s4msx67ibi"; depends=[]; };
   enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; };
-  envirem = derive2 { name="envirem"; version="1.1"; sha256="07mlyaqjwwrh9dbc78ik61wrrpg344fg3rb12l6v6hzn04yp26pz"; depends=[raster RSAGA]; };
+  envirem = derive2 { name="envirem"; version="1.3"; sha256="1axgbjl4wh44vd5r9n9rbxxsi35k806r1kdvrcmmpkzwam6zd2lp"; depends=[raster RSAGA]; };
   envlpaster = derive2 { name="envlpaster"; version="0.1-2"; sha256="11a5n40k1ln5gxxvwq1vh4dhmhifhlm89hkhf36qnhj4bjh3v3y0"; depends=[aster aster2 caTools MASS]; };
   epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; };
   epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; };
@@ -5977,7 +6088,7 @@ in with self; {
   epiR = derive2 { name="epiR"; version="0.9-93"; sha256="1i0vi1dx5pjq4rcw8r9g7qkhrn4ra8lffrspzkrrjj12y97izmrg"; depends=[BiasedUrn survival]; };
   epibasix = derive2 { name="epibasix"; version="1.3"; sha256="0d0087sa8lqw35pn7gdg2qqzw3dvz57sgavymwl1ybcj5d4lsbyk"; depends=[]; };
   epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; };
-  epidata = derive2 { name="epidata"; version="0.1.0"; sha256="1lp6hnjzga787abq94k8v48wlikpp5hj1xwmxc8nj1imyr4r8a4h"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; };
+  epidata = derive2 { name="epidata"; version="0.2.0"; sha256="0n0100fy65kgw3c7gdmb5z5hmla5ch51b7872snf525a2r581i28"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; };
   epifit = derive2 { name="epifit"; version="0.1.2"; sha256="1i1ngb5kh03gyx1702fwav3dc3mqry1wjzc7ry36hdw0ngawid34"; depends=[MASS]; };
   epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; };
   episensr = derive2 { name="episensr"; version="0.9.2"; sha256="1w1228q8q2ysi3xi3m8a9z0c7japj97dssjkzpjcrng094cy82is"; depends=[actuar boot ggplot2 gridExtra llogistic logitnorm plyr reshape trapezoid triangle]; };
@@ -5986,10 +6097,9 @@ in with self; {
   episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; };
   epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; };
   epitab = derive2 { name="epitab"; version="0.2.1"; sha256="0q8fxxx7ddzaj8dxxlsh1a2gxf6byw5041mr7abac9yjjga2kz97"; depends=[kableExtra knitr MASS survival xml2]; };
-  epitable = derive2 { name="epitable"; version="0.1.2"; sha256="1g0ab5bah7v52mzsyfxdv8azmpz66pipbc15q3vpvvhl3gjhsaik"; depends=[broom dplyr htmlTable magrittr purrr readr rlang stringr survival tidyr tidyverse]; };
   epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; };
   epitrix = derive2 { name="epitrix"; version="0.1.2"; sha256="1fnmcpjbbk645s7q2jcccjv0q20z8hlzr8sl0jh6d00jrgk8qif4"; depends=[digest distcrete stringi]; };
-  eply = derive2 { name="eply"; version="0.1.0"; sha256="18q40n06gbqg5cs0jknlxk5x0pwcbjnfb27ysmbf76s826qdc8gh"; depends=[magrittr]; };
+  eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; };
   epoc = derive2 { name="epoc"; version="0.2.5-1"; sha256="1r19cvcqf39yf09n3znbdy3dsr7z96yx6zib6031mqqdsxaav5qd"; depends=[elasticnet graph irr lassoshooting Matrix Rgraphviz survival]; };
   epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; };
   epxToR = derive2 { name="epxToR"; version="0.3-0"; sha256="0ckz7cvqsdilfkqap88brh4av9zv1fl3ijs4h4vlwwn7qvdcnhay"; depends=[httr XML]; };
@@ -5997,7 +6107,7 @@ in with self; {
   eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; };
   equSA = derive2 { name="equSA"; version="1.1.5"; sha256="0sknx2p820i26m1d0ypz4ay5rm4j9i97nvcd3wxawqk72ypvbvw1"; depends=[huge igraph mvtnorm speedglm XMRF ZIM]; };
   equaltestMI = derive2 { name="equaltestMI"; version="0.1.0"; sha256="1zqhgx1x6lqjwqisl3ydb6yqp3jn6x7dgnc57r93v73sjx2j5aiz"; depends=[lavaan]; };
-  equate = derive2 { name="equate"; version="2.0.6"; sha256="0fkgz4747wf2n1sfkskpbp20zdmxvykqhncr7a8wl5lp314r48x3"; depends=[]; };
+  equate = derive2 { name="equate"; version="2.0.7"; sha256="07cji0z139fk70d4wvrpk5m34fq1pfnqrsw336lgnp5a7zp3jz7n"; depends=[]; };
   equateIRT = derive2 { name="equateIRT"; version="2.0-4"; sha256="0j5dpgp4r5qisgw65yk7x9nwq7wxfppp0n0qqg734gqwjyfyp68b"; depends=[mirt statmod]; };
   equateMultiple = derive2 { name="equateMultiple"; version="0.0.0"; sha256="0q29bv8bb0c3sprhnkbbpn31phw37dwgk23v5ny4abzvlcgwncdb"; depends=[equateIRT numDeriv Rcpp RcppArmadillo statmod]; };
   equivalence = derive2 { name="equivalence"; version="0.7.2"; sha256="170l5gnk0dkjkfsx7qyrw56ircwsjzz9cvhakgyrqh7bj5734i79"; depends=[boot lattice PairedData]; };
@@ -6017,24 +6127,26 @@ in with self; {
   errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; };
   errorist = derive2 { name="errorist"; version="0.0.1"; sha256="1569yvncc9rdzchs7cvx44dhy8xf10g2hwkiy3kp68h47qghxlbd"; depends=[searcher]; };
   errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; };
-  errorlocate = derive2 { name="errorlocate"; version="0.1.2"; sha256="1qlwdvy7i62hpnfrryzmqwmygxa8mjc7q92g6k5n9r2r179q7h09"; depends=[lpSolveAPI validate]; };
-  errors = derive2 { name="errors"; version="0.2.0"; sha256="0l7yxshfc2ig7354r3vk35fsx2vyj09w7abwxakic93grvr09a71"; depends=[]; };
+  errorlocate = derive2 { name="errorlocate"; version="0.1.3"; sha256="0hfm0nad1bfh7a37zpn4aljrf69yc6dddz9iq46c1mzyrw116a9f"; depends=[lpSolveAPI validate]; };
+  errors = derive2 { name="errors"; version="0.2.1"; sha256="1hf7nqyhyv0n4qn5bzs1gb59fbn6vsiji0va8hpzzw3af0h3dqzy"; depends=[]; };
   esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; };
   esaddle = derive2 { name="esaddle"; version="0.0.3"; sha256="04imppwls6a485kdfwykk4s0pyxas3i92ccghi780ys29y0nggmy"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; };
+  esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; };
   esc = derive2 { name="esc"; version="0.4.0"; sha256="07mgf1kdz6gjkmbsis24gjsppclaxlf7b03jpvasm1k4snfvgb5h"; depends=[dplyr purrr readr sjmisc tibble]; };
   eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; };
   esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; };
-  esmprep = derive2 { name="esmprep"; version="0.1.3"; sha256="0s5ij63v3v9hx1xnl8ygbnxbgik65yd8xn3irpbvc41mp9spgcdz"; depends=[lubridate]; };
+  esmprep = derive2 { name="esmprep"; version="0.1.4"; sha256="1d1rr11fldxsamn19za03sdyvvybkh3bm5zvlrlkz022jj7pgxlr"; depends=[lubridate]; };
   esreg = derive2 { name="esreg"; version="0.3.1"; sha256="19ikfy0g8yd224ah4gyq2k29lz3gagc6vrcv53awvdadqw0cpz8l"; depends=[quantreg Rcpp RcppArmadillo]; };
   ess = derive2 { name="ess"; version="0.1.1"; sha256="1i94sfg8r9mnzcmyddq3zb56gwkgqdclyx90a5plpyy5insk13d7"; depends=[haven httr rvest stringr tibble xml2]; };
-  essHist = derive2 { name="essHist"; version="1.0.1"; sha256="0xnf5cxc7x3chs508am9qhnavz89fim10ffkn8mp1b29jdw88aax"; depends=[Rcpp]; };
+  essHist = derive2 { name="essHist"; version="1.1.1"; sha256="06wmvwjgbb1bfsjn4bv3p2m0i5nc6shn2p62kjp3iv6z42f5wndc"; depends=[Rcpp]; };
+  essurvey = derive2 { name="essurvey"; version="1.0.0"; sha256="0wgwqm59wam5sjzn3cjh3fzbq14bfa02gjsszwg2hid1q976clqk"; depends=[haven httr rvest stringr tibble xml2]; };
   estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; };
   estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; };
-  estimatr = derive2 { name="estimatr"; version="0.4.0"; sha256="19k8b4rglz4b7r12x8da6wzrkd0j40dp1zxzdwj6pfw3fhpacl2i"; depends=[Rcpp RcppEigen]; };
+  estimatr = derive2 { name="estimatr"; version="0.6.0"; sha256="0763wq8y166zwdxf2wqxvbqwps9di7i7877pffs478qr4rx24z5g"; depends=[Formula Rcpp RcppEigen rlang]; };
   estout = derive2 { name="estout"; version="1.2"; sha256="0whrwlh4kzyip45s4zifj64mgsbnrllpvphs6i5csb7hi3mdb3i5"; depends=[]; };
   estprod = derive2 { name="estprod"; version="0.0.1"; sha256="0nd2iz1gqinvppyxgxsdh9m26v46h2ra3cc4nqz6dqnqkslzrl4k"; depends=[boot Formula lazyeval minpack_lm]; };
   estudy2 = derive2 { name="estudy2"; version="0.8.4"; sha256="190wxdy1qsf8fgpbp2cr0blwa97vgmdw83pmfk9i44zkpm4nrij1"; depends=[matrixStats Rcpp tseries zoo]; };
-  esvis = derive2 { name="esvis"; version="0.1.0"; sha256="19avayz2igw8sjc2743a9c3ikyrf18d42czadd98gdn8ny53vr6b"; depends=[sfsmisc]; };
+  esvis = derive2 { name="esvis"; version="0.2.0"; sha256="0l4c87l9n94q14hwky7d7i4h9c5zh8r04zlcz9w4mx7ixfd34zir"; depends=[sfsmisc]; };
   etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; };
   etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; };
   ether = derive2 { name="ether"; version="0.1.4"; sha256="1q6qxda5iw8zj7gy9h35apij5mbndd969ddip7zn5d720131kqra"; depends=[dplyr httr jsonlite Rmpfr]; };
@@ -6050,20 +6162,20 @@ in with self; {
   eurostat = derive2 { name="eurostat"; version="3.1.5"; sha256="128rlkkxdpl95wjxnrw8yzxpc6sml0vaghnaz0ra90ak1s43ndda"; depends=[classInt httr jsonlite RColorBrewer readr sp stringi stringr tibble tidyr]; };
   eva = derive2 { name="eva"; version="0.2.4"; sha256="03jsiz6bkavwxpgllxaw8czahmm2rh5h8hhk5j7i9clcjx244vvj"; depends=[EnvStats Matrix]; };
   evaluate = derive2 { name="evaluate"; version="0.10.1"; sha256="070vvmnbdlp7sz2zhza7fhd2a6mlwiln8fn4hyzhsiizbn4n79y9"; depends=[stringr]; };
-  evaluator = derive2 { name="evaluator"; version="0.1.1"; sha256="19ria8y1bc8cvn1sb28p5zbkgs73m20i4c9v26byhd0rn9gjpm2f"; depends=[dplyr extrafont ggplot2 mc2d purrr purrrlyr readr readxl scales stringi tibble tidyr viridis]; };
+  evaluator = derive2 { name="evaluator"; version="0.2.3"; sha256="1qlrrd68j622i2n0wazz3m44sc2l7hsg7fd1mc204c7pmfb6a3pl"; depends=[dplyr extrafont ggplot2 mc2d purrr readr readxl rlang scales stringi tibble tidyr viridis]; };
   evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; };
   evclust = derive2 { name="evclust"; version="1.0.3"; sha256="0cd0a8w0ixd9ilcqlxiaql4l2r49qrqnllb9qpg3xgnlxka3yb5m"; depends=[FNN limSolve Matrix R_utils]; };
   evd = derive2 { name="evd"; version="2.3-2"; sha256="0n81plbw2p83c10y6a6hvqkxcbfqjdc41p02zyklbcafga1m4gdy"; depends=[]; };
   evdbayes = derive2 { name="evdbayes"; version="1.1-1"; sha256="0lfjfkvswnw3mqcjsamxnl8hpvz08rba05xcg0r47h5vkgpw5lgd"; depends=[]; };
   event = derive2 { name="event"; version="1.1.0"; sha256="1nq34bz9dsixidym3n255vmap3gjx9nfk8pc5s7w026faf96dr2v"; depends=[rmutil]; };
   eventInterval = derive2 { name="eventInterval"; version="1.3"; sha256="0nybzy2mpmazcvz06mkv7l9741mjm3i2q2sindq0777vb2k4504v"; depends=[MASS]; };
-  eventdataR = derive2 { name="eventdataR"; version="0.1.2"; sha256="0f0w5cir3hc01ag9l69y27cfp6bgh1ikk4n99z7pb16373ficjjw"; depends=[]; };
+  eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; };
   events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; };
   eventstudies = derive2 { name="eventstudies"; version="1.2"; sha256="0z449j7yrd6j6hhacz6f048ibilib6m97684cz2wc4pqq2wlj8hg"; depends=[boot sandwich testthat xts zoo]; };
-  evidence = derive2 { name="evidence"; version="0.8.8"; sha256="1bfdwl41yqvhc3jg0xddwaw7h0s7qa4xfz2i94jh6wa247r51gwf"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; };
+  evidence = derive2 { name="evidence"; version="0.8.9"; sha256="173fjmpizjmrp0qh08k2qllvjm4l53ykblfri984x9kh68aqfvnz"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; };
   evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; };
-  evir = derive2 { name="evir"; version="1.7-3"; sha256="1kn139vvzdrx5r9jayjb4b0803b0bbppxk68z00gdb50mxgvi593"; depends=[]; };
-  evmix = derive2 { name="evmix"; version="2.9"; sha256="1w1mm858515hnjpq2yjj0x05skyprhnvbpyif4mdcm24blyb81di"; depends=[gsl MASS SparseM]; };
+  evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; };
+  evmix = derive2 { name="evmix"; version="2.10"; sha256="0q2jcd4r9ndl8c8w4g75cv5g9f58ix6ndwa99lgslw2j0ckh0z97"; depends=[gsl MASS SparseM]; };
   evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; };
   evolqg = derive2 { name="evolqg"; version="0.2-5"; sha256="11n0gxkxhg1d2ziwbipqvyccgnsrzm3mk4xy2d7nxn662q1yl2ah"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; };
   evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; };
@@ -6080,13 +6192,13 @@ in with self; {
   exampletestr = derive2 { name="exampletestr"; version="1.2.0"; sha256="05p819a6s6anxjqvs10df9kcfdg7lkg1205iw635db9g6biplrb7"; depends=[checkmate devtools filesstrings magrittr purrr readr roxygen2 stringr styler]; };
   exams = derive2 { name="exams"; version="2.3-0"; sha256="0y21cx6knx253gka1bib8z0jmyndl4k7c2d8hfh3rwn5bdqyqj53"; depends=[]; };
   excerptr = derive2 { name="excerptr"; version="1.4.0"; sha256="0z69lqfdm2dh9z6rqhfnj6f4b2p6sgmlvcxasg49wd0qasx86ph6"; depends=[git2r rprojroot rPython]; };
-  excursions = derive2 { name="excursions"; version="2.3.2"; sha256="1fh04kkv9nj7wxrklpapsfh0xi8k5hfaa1f4dvnz2wxvzz3iz5nb"; depends=[Matrix sp]; };
+  excursions = derive2 { name="excursions"; version="2.3.3"; sha256="16clwp76hq1q3m7ixjq1rv83vagxyj2fcs4jdsgvl9pzh5syzd3x"; depends=[Matrix sp]; };
   exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; };
   exifr = derive2 { name="exifr"; version="0.2.1"; sha256="0969ip7vwhs3r9zwy5l1gqg886yl4gfw8ss2frnq9nmqpn1ib1v2"; depends=[curl dplyr jsonlite purrr tibble]; };
   exp2flux = derive2 { name="exp2flux"; version="0.1"; sha256="1b3ychb4wcf6dbccx2ddms5xygdgc296cnw4474fm81yrfjznplv"; depends=[gage igraph sybil]; };
   expandFunctions = derive2 { name="expandFunctions"; version="0.1.0"; sha256="0661l4ab0xhjidmh8ycvymhp3wgxafm7nd1c59bfpxhyhz76n1p4"; depends=[glmnet orthopolynom plyr polynom]; };
-  expands = derive2 { name="expands"; version="2.1.0"; sha256="0870jbjk2yzddvs57fdnl4psy55r6rjdbs7w7jc7s3vrzdsziwxa"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; };
-  experiment = derive2 { name="experiment"; version="1.1-2"; sha256="1wswfxfk3b5gvdxb6i3mzx66i1qszvb9alfwhv95y0dr5q6vss1w"; depends=[boot MASS]; };
+  expands = derive2 { name="expands"; version="2.1.1"; sha256="1ajfj5vsqal642avshjfmv0f5vi0ca3whhw5cxmpm013yckb3b3r"; depends=[ape commonsMath flexclust flexmix gplots matlab moments NbClust plyr RColorBrewer rJava]; };
+  experiment = derive2 { name="experiment"; version="1.1-3"; sha256="0gxf6bbx06ynz96mwcb9wdb8pb0njvjnpigjc1vq5ammc3l6dkxz"; depends=[boot MASS]; };
   expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; };
   expint = derive2 { name="expint"; version="0.1-4"; sha256="17vp7znbxlf5zb944snmnml2w42avj9k70fisb8az047i3kdbvfh"; depends=[]; };
   explor = derive2 { name="explor"; version="0.3.3"; sha256="1b3swb7ikp2ik3300ljg2rll5gka4l4lfg95bqbgap3ph4dclv7y"; depends=[dplyr DT ggplot2 highr scatterD3 shiny tidyr]; };
@@ -6151,13 +6263,13 @@ in with self; {
   fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; };
   fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; };
   fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; };
-  fabricatr = derive2 { name="fabricatr"; version="0.2.0"; sha256="1jgfxifp7v80bddcs5zi5zidzhnzmsbvfa7qznaxyp3qknax2k67"; depends=[rlang]; };
+  fabricatr = derive2 { name="fabricatr"; version="0.4.0"; sha256="0z04n2n44anpci8m4m5hs83nwhiczil7lkg8glcgngrdh994k8hc"; depends=[rlang]; };
   face = derive2 { name="face"; version="0.1-4"; sha256="0kkgblxzhjzifxnym6g5psiwvfgydk1scqbxraldklm8c4a12zc3"; depends=[Matrix matrixcalc mgcv refund]; };
   facebook_S4 = derive2 { name="facebook.S4"; version="1.1.0"; sha256="1if3fgyvj6pbf48yjwa5fkn3s4rl6kj9s1nk6dwphykhx72ghzrj"; depends=[httr magrittr plyr rjson]; };
   facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; };
   factoextra = derive2 { name="factoextra"; version="1.0.5"; sha256="1l6m8k7qhdw8ndar8nhmym0lfyd1i2iszl1cicjax0vq23ss6xw1"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; };
   factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; };
-  factorMerger = derive2 { name="factorMerger"; version="0.3.5"; sha256="0j5bjn8jmmdxr88aiw3i46frphkn4s5a54iqz6hcqq70cgg91cj4"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; };
+  factorMerger = derive2 { name="factorMerger"; version="0.3.6"; sha256="04l52w2lfihmwqk4xbv2i37jgkanhvmzcw2x7dmj3hmjymlr4yl0"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; };
   factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; };
   factorcpt = derive2 { name="factorcpt"; version="0.1.2"; sha256="17hwlsrj0fx4x05p6xvs6kl43a24icmnrzyvpf2vam5imwvmpvmm"; depends=[doParallel fields foreach iterators Rcpp RcppArmadillo]; };
   factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; };
@@ -6176,6 +6288,7 @@ in with self; {
   fancycut = derive2 { name="fancycut"; version="0.1.1"; sha256="1vnxn5zl1j8209dyrwq3919hivab09f0jq4v9h7v0wlqk1hy5ich"; depends=[]; };
   fanovaGraph = derive2 { name="fanovaGraph"; version="1.4.8"; sha256="1da7yskh2gn4arrrnalkl3izqyyrm0yf0il4v2izs7di7qlw3m6v"; depends=[DiceKriging igraph sensitivity]; };
   fanplot = derive2 { name="fanplot"; version="3.4.1"; sha256="1xj1hdz3i9c9wdx7ryiqag69khh3544v4474ilxxiyahxg2r6m45"; depends=[]; };
+  fansi = derive2 { name="fansi"; version="0.2.2"; sha256="1kjbklr24n649k17mgcxsrw8lsj4c2yd94yg1rilsnlqcyjdvpvi"; depends=[]; };
   faoutlier = derive2 { name="faoutlier"; version="0.7.2"; sha256="0h2azbkxpz03qjmq558mh7dkpv87vbvminvg69wqsx21m6hdl5r3"; depends=[lattice lavaan MASS mirt mvtnorm pbapply sem]; };
   far = derive2 { name="far"; version="0.6-5"; sha256="18lj2mgnn9s59ypkr19zzv0sffwpx9mgk975xmpvw4kkl84dykis"; depends=[nlme]; };
   faraway = derive2 { name="faraway"; version="1.0.7"; sha256="0lalf52y9rb4zdb4kpscwddb4zy0af7r5sm7lx8s9jaqykrwrfq6"; depends=[lme4 nlme]; };
@@ -6196,13 +6309,15 @@ in with self; {
   fastR2 = derive2 { name="fastR2"; version="0.2.0"; sha256="1xwa4v0j2n0qxn1prhc9x0sz53fhsfbg2m1a6kfdp7cpvvk46pw5"; depends=[dplyr ggformula ggplot2 lattice magrittr maxLik miscTools mosaic numDeriv]; };
   fastSOM = derive2 { name="fastSOM"; version="1.0.0"; sha256="1x4kxys7mxlxz7cfbjig44za8m8p19xgzcs5y2wn9320sx8b0wc0"; depends=[]; };
   fastTextR = derive2 { name="fastTextR"; version="1.0"; sha256="0l0f9jvsa68a3vd6mwbhsqd12729nd6nwsnlzrhsg9wj9rx8kpmi"; depends=[Rcpp]; };
+  fasta = derive2 { name="fasta"; version="0.1.0"; sha256="0wnppxn3039dj58xm0b66fsyq537bk8k8m56im11xj1iwc3zc6vw"; depends=[]; };
   fastclime = derive2 { name="fastclime"; version="1.4.1"; sha256="0zcir8r11b2hxr9vvkmvxlzmhfcaxbr0wbjy86ysr912mp8fs9i3"; depends=[igraph lattice MASS Matrix]; };
   fastcluster = derive2 { name="fastcluster"; version="1.1.24"; sha256="15drhl22wm8whsy6b3vv754skfddiydb068zn1whrw5sknvkkjc2"; depends=[]; };
   fastcmh = derive2 { name="fastcmh"; version="0.2.7"; sha256="0hib3r3pkfdi67bdy4pf1pw6869vq4b3pg1pq1zwpyy76nbnq9vl"; depends=[bindata Rcpp]; };
   fastcox = derive2 { name="fastcox"; version="1.1.3"; sha256="0jn19v6mkwgyz8x63xrfgkgnf0f2rq338r5qkhz690mdzr4c47a3"; depends=[Matrix]; };
   fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; };
   fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; };
-  fastmaRching = derive2 { name="fastmaRching"; version="1.0.0"; sha256="17z5frf5c50y4387l4vbwwbm8z1wn0yyr7kp044s4q8bp1k2pqv3"; depends=[raster rgdal sp]; };
+  fasterize = derive2 { name="fasterize"; version="1.0.0"; sha256="0q8n1r5n06yr6vmnwrdajx8923646bzm7ywgn2f0zxl214plf56s"; depends=[raster Rcpp RcppArmadillo sp]; };
+  fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; };
   fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; };
   fastnet = derive2 { name="fastnet"; version="0.1.4"; sha256="0hc18yc2cmvb5v8vjj1xvnciz35hyfp9iyqhkg9jfjrlf89icny6"; depends=[doParallel foreach igraph tidygraph]; };
   fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; };
@@ -6214,15 +6329,16 @@ in with self; {
   favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; };
   fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; };
   fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; };
-  fbar = derive2 { name="fbar"; version="0.3.4"; sha256="0nsw7axdgmkbmn87wxg3adyy060vrqqbr0s2hfdh54fj58i6nq71"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; };
+  fbar = derive2 { name="fbar"; version="0.4.3"; sha256="1raq8ak01gcnmcsaa3fdfqi40d67v7nfjr212jzvq7wp2qk3j10i"; depends=[assertthat dplyr magrittr Matrix purrr rlang ROI ROI_plugin_ecos stringr tibble tidyr]; };
   fbati = derive2 { name="fbati"; version="1.0-1.1"; sha256="18k8a1m2znzzwmm25dbqnqzwbjxqz4rbjaw3z9affky7lzqgbg6l"; depends=[fgui pbatR rootSolve]; };
   fbroc = derive2 { name="fbroc"; version="0.4.0"; sha256="0bxi027iqqn50mn5nrlgx3z4qdlfkrq88s0dqyaxdl8rsrwp3d2w"; depends=[ggplot2 Rcpp]; };
   fcd = derive2 { name="fcd"; version="0.1"; sha256="091wbf5iskcgyr7jv58wrf590qijb0qcpninmvm3xrwxi34r37xr"; depends=[combinat glmnet MASS]; };
-  fclust = derive2 { name="fclust"; version="1.1.2"; sha256="08gi7w74215r44qbysg233s5n8r905b66gsi4i66xf5r7zgaqsm0"; depends=[]; };
+  fclust = derive2 { name="fclust"; version="1.1.3"; sha256="1wpdvpfama90x8rj5yv54q7k318ad4y6pi33vsyh0rsb3fdrkqkr"; depends=[]; };
   fcm = derive2 { name="fcm"; version="0.1.3"; sha256="1mqk6szczsixdvw0inkypij4cw2syng5l5ccw0xk55kc21l1lzn0"; depends=[ggplot2 reshape2]; };
-  fcros = derive2 { name="fcros"; version="1.5.5"; sha256="1kyrilm6g0nqgba3bf4vbvcgcfj8044n6jfysbrvvlhwypkzqa0q"; depends=[]; };
+  fcr = derive2 { name="fcr"; version="1.0"; sha256="17jrz5zp1msd2khl1lwnb5sgxcigagni556rhn7qm9g0aykbh8yj"; depends=[face fields mgcv]; };
+  fcros = derive2 { name="fcros"; version="1.5.6"; sha256="0n1zbzl6g9k3smdpgyb3xsa2w8ir4bdagv7w644x1jck5rd0xn2j"; depends=[]; };
   fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; };
-  fdANOVA = derive2 { name="fdANOVA"; version="0.1.0"; sha256="10c12yns1sv4ph61hma1mymab03xyyx933f27977lw3c0npy7b02"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; };
+  fdANOVA = derive2 { name="fdANOVA"; version="0.1.1"; sha256="16i0mnbxyjbw06havl277c6vi7mq5rak9cjzp8c2zvr8cakalkg4"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; };
   fda = derive2 { name="fda"; version="2.4.7"; sha256="0371c32kxxvfdh18ldgc2p76dr2436ay0n9prdjwm9v0azp4rp9k"; depends=[Matrix]; };
   fda_usc = derive2 { name="fda.usc"; version="1.4.0"; sha256="0gp19c5lxp0g4690vdr0gpw89rl9v3l6872mf7hr8nsyyd6776vn"; depends=[fda MASS mgcv nlme rpart]; };
   fdaMixed = derive2 { name="fdaMixed"; version="0.5"; sha256="1k2b3z2jj37j6njvxalg8640zlcvi1cm7wkcwp0pia21wydz75ip"; depends=[Formula Rcpp RcppArmadillo]; };
@@ -6241,6 +6357,7 @@ in with self; {
   fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; };
   feather = derive2 { name="feather"; version="0.3.1"; sha256="1q6dbkfnkpnabq8lb6bm9ma44cfcghx2lm23pyk3vg7943wrn1pi"; depends=[hms Rcpp tibble]; };
   feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; };
+  featurefinder = derive2 { name="featurefinder"; version="1.0"; sha256="1hhfhc1gjmi770yljqhqrp9a5z5rrbd7bavznb758c26hpk7xilf"; depends=[plyr rpart rpart_plot]; };
   features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; };
   featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; };
   febr = derive2 { name="febr"; version="1.0-0"; sha256="0c0kgj31n2z2qqbga9waqrrm6xxksi27c6riyp1c57z4wjais860"; depends=[cellranger dplyr glue googlesheets knitr pedometrics readr sp stringr xlsx]; };
@@ -6274,11 +6391,11 @@ in with self; {
   filenamer = derive2 { name="filenamer"; version="0.2.2"; sha256="0289qpy4891fb71fa4bhc8wp4g7n1sw1kis5k5irdyyzmsa9dfhn"; depends=[]; };
   fileplyr = derive2 { name="fileplyr"; version="0.2.0"; sha256="15rxls0njd6j2vxdahf4fx2nxmsa3rc41812v3wlaqas99naaxxr"; depends=[assertthat datadr tibble]; };
   files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; };
-  filesstrings = derive2 { name="filesstrings"; version="2.1.0"; sha256="1ik6m0ks6k1fhmpd3fk9z4mav3f8hs7si84vjcg8jk37xxqhfnd8"; depends=[checkmate magrittr matrixStats ore purrr Rcpp stringr tibble]; };
+  filesstrings = derive2 { name="filesstrings"; version="2.2.0"; sha256="1qix25k0j1d1q3z5xiq9gc928kbb78w0j9083q5xsdik840d91kj"; depends=[BH checkmate magrittr matrixStats ore purrr Rcpp stringr tibble]; };
   filling = derive2 { name="filling"; version="0.1.0"; sha256="0avlfl06nd8wn76ydii09ng2fqp92d4n9v2y5vg16m3my58l0srd"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; };
   financial = derive2 { name="financial"; version="0.2"; sha256="1v6jgs3rq57byin5mynslfjk3zrx91qz36558nn17mv6z0qsf10v"; depends=[]; };
   finch = derive2 { name="finch"; version="0.2.0"; sha256="1vganbkz2d96xfz2jf1q0kqarc575w3nswss2igynsbbd0y53mjm"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; };
-  findR = derive2 { name="findR"; version="0.2.0"; sha256="03xkp8akjaciv2cl1przzz56nc3ma8l7pr4k0c3w2y0sivkmawdk"; depends=[pdftools]; };
+  findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; };
   findpython = derive2 { name="findpython"; version="1.0.3"; sha256="1y08jk2ffmkf9zpwiz2xymjhfwqvls9vzsnq62v278ghw9d571jl"; depends=[]; };
   findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; };
   fingerPro = derive2 { name="fingerPro"; version="1.0"; sha256="17r23x8cdllr8slk56dsmrwc4ns69b3cqy59mxxbsjnhjl3di6x8"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL reshape rgl scales]; };
@@ -6296,6 +6413,7 @@ in with self; {
   fit4NM = derive2 { name="fit4NM"; version="3.3.3"; sha256="0k2194521yby6xxi77bpjp6ywz8kpnzws217m7n0hw6xwz5mqj1g"; depends=[cairoDevice gWidgets gWidgetsRGtk2 RGtk2 tkrplot]; };
   fitDRC = derive2 { name="fitDRC"; version="1.1"; sha256="1f6avw8ia9ks17zdagpmh6yvcmi53h5cvm0wwv9hsb92x5zfhxn9"; depends=[]; };
   fitODBOD = derive2 { name="fitODBOD"; version="1.1.0"; sha256="15ylldlq12mrw06pzww54hsl8nb9krs5w1cgh037km9sndsswvji"; depends=[hypergeo]; };
+  fitPoly = derive2 { name="fitPoly"; version="3.0.0"; sha256="0ws1vsh8if9i9i7820ak32b0bysjc0z09nbrk17qpms0b11cpc3g"; depends=[foreach]; };
   fitTetra = derive2 { name="fitTetra"; version="1.0"; sha256="0ia6wk4gicpmn6kclsd28p7v1npwfv2blagiz0cxzwfw3njv103g"; depends=[]; };
   fitbitScraper = derive2 { name="fitbitScraper"; version="0.1.8"; sha256="0b4d7xw6inp6l1dkfwyrzxwg4vspp4vzlwrhv14ajxrqz6irj8a0"; depends=[httr jsonlite stringr]; };
   fitdc = derive2 { name="fitdc"; version="0.0.1"; sha256="1b1abib7jkl7a6r686r53qjw2ywb9q2h67is8691kkaqxpawg30p"; depends=[]; };
@@ -6305,11 +6423,12 @@ in with self; {
   fitur = derive2 { name="fitur"; version="0.5.25"; sha256="0f33c4mg0257s9c0qldryihaq8p3y07j2nwghjpqhi3rv4mrg2xf"; depends=[actuar e1071 fitdistrplus ggplot2]; };
   fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.4.0"; sha256="1sdj5b365hi11dd2yxvg9w3fz3rx9rbv1nnhf5i8v2ydg4kqyrws"; depends=[]; };
   fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; };
+  fixerapi = derive2 { name="fixerapi"; version="0.1.1"; sha256="0g1bs2d99yv6q6y8kh6s9skkfjany5737kys0yqy8mpflhymvh33"; depends=[jsonlite tibble tidyr]; };
   fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; };
   flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; };
-  flam = derive2 { name="flam"; version="3.1"; sha256="12dkxisi56fg5720mh58jqrjvkqllqgzynafd44xalswkk4ahaak"; depends=[MASS Rcpp]; };
+  flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; };
   flan = derive2 { name="flan"; version="0.6"; sha256="0idlvi4xlfr5l0csj75xmn94856y71j92im6dwv0rcawkwh8ghqh"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; };
-  flare = derive2 { name="flare"; version="1.5.0"; sha256="03bq40lwwq49vvbarf37y7c3smm29mxqfxsc66gkg8l5pak4l38i"; depends=[igraph lattice MASS Matrix]; };
+  flare = derive2 { name="flare"; version="1.6.0"; sha256="0ygif9a7a99qwv0b488wymmmncp6f5ww9yz13s4qs6p8yf37x1r1"; depends=[igraph lattice MASS Matrix]; };
   flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; };
   flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; };
   flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; };
@@ -6317,11 +6436,12 @@ in with self; {
   flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; };
   flexclust = derive2 { name="flexclust"; version="1.3-5"; sha256="19ihdhmhaglccqpvrpc51367gkfafg4jdpabbk0j6mh2n16hi511"; depends=[lattice modeltools]; };
   flexdashboard = derive2 { name="flexdashboard"; version="0.5.1"; sha256="0jb5wswbjr58g121nbvl93p73gxr8cx56kajgpiaw1fis6dsyfyz"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; };
+  flexmet = derive2 { name="flexmet"; version="1.0.0.0"; sha256="0xhr4i46s3k7a4yz2sd1sphn8wz27xcl580s2kqkr1ifg8941kv8"; depends=[]; };
   flexmix = derive2 { name="flexmix"; version="2.3-14"; sha256="0sl4zxh1sb2sr5q7svjw9ihrm219jzn82yrc9d43q6r1b8bpyz43"; depends=[lattice modeltools nnet]; };
   flexrsurv = derive2 { name="flexrsurv"; version="1.4.1"; sha256="13jq7yk7rz2148wkf7dv28l79zwdf1gpfkd5khgacb8hl5kml3p0"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis survival]; };
   flexsurv = derive2 { name="flexsurv"; version="1.1"; sha256="1vj8zsfgq2rv6v7na4w7n7z3farc69qsavm7pnmnhkaylz61gq26"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival]; };
   flexsurvcure = derive2 { name="flexsurvcure"; version="0.0.2"; sha256="1lhw2z8i4l822ncziwpw6hg0dzc244q60n7l5aahgdhcr0xgylhz"; depends=[flexsurv gtools survival]; };
-  flextable = derive2 { name="flextable"; version="0.4.2"; sha256="07a962ylr3y8v31557iqzr1m0c8bvprilfdimwzjl9fhlplb9y4h"; depends=[gdtools htmltools knitr officer R6 rmarkdown stringr]; };
+  flextable = derive2 { name="flextable"; version="0.4.4"; sha256="12f33szyxf4b7ipz4j9sli6miwkjq2309rpinaxmnsqsafd1zn3b"; depends=[gdtools htmltools knitr officer R6 rmarkdown stringr]; };
   flifo = derive2 { name="flifo"; version="0.1.4"; sha256="1yilfnblarimc8mlvvwsgib5sxcfgvgsvgpyzddxb39g6fb7lffs"; depends=[bazar pryr]; };
   flip = derive2 { name="flip"; version="2.4.3"; sha256="04zf2gnk5w57gxnlnh26pn1ir1wfrzxhfhchr33ghk7prhc7k4b8"; depends=[cherry e1071 Rcpp RcppArmadillo someMTP]; };
   flippant = derive2 { name="flippant"; version="1.1.0"; sha256="06aj90y7c33c1q0nw1c67vr1pfmp9fw78az6ivrbq110f2k1m12w"; depends=[assertive_files assertive_numbers assertive_properties assertive_strings assertive_types data_table ggplot2 magrittr minpack_lm plyr RcppRoll stringi withr wmtsa]; };
@@ -6336,20 +6456,21 @@ in with self; {
   flowr = derive2 { name="flowr"; version="0.9.10"; sha256="18mjshfg3827b26b8nz52pl04ph7n887vw0ym5fybjm8gy5wwpdg"; depends=[diagram params whisker]; };
   flows = derive2 { name="flows"; version="1.1.1"; sha256="0l152p17plkrbnrlis8rfr9ij406agckdxvnjsciilv6qwcync29"; depends=[igraph reshape2 sp]; };
   flsa = derive2 { name="flsa"; version="1.05"; sha256="07z2b1pnpnimgbzkjgjl2b074pl9mml7nac2p8qvdgv7aj070cmh"; depends=[]; };
+  fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; };
   flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; };
   fluxweb = derive2 { name="fluxweb"; version="0.1.0"; sha256="1fwxqm8pn9h0bl1cpvz9rx56zsvxz22la5bj8yrrkbg3m8jdzgvi"; depends=[]; };
   fma = derive2 { name="fma"; version="2.3"; sha256="1z7shh9ng3q7ax22cwg86y79jzz5gbchdny2rppzzm0lkvvyy5pm"; depends=[forecast]; };
   fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; };
   fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; };
-  fmlogcondens = derive2 { name="fmlogcondens"; version="1.0.0"; sha256="15n2vjfriicg3mijzkz55w54xyq0h8zjchhlgdxsycysqv59lxag"; depends=[geometry MASS mclust mvtnorm]; };
+  fmlogcondens = derive2 { name="fmlogcondens"; version="1.0.2"; sha256="0slmwzcmsl5cfgif6d47xfjknmap0x45cql339dyamwmhqm968rk"; depends=[geometry MASS mclust mvtnorm]; };
   fmri = derive2 { name="fmri"; version="1.7-2"; sha256="1ifp0fkmr0bj5vkg9vh0lk74f04fk0zc90vknmjmxd2hbdb5kh4r"; depends=[awsMethods metafor nlme]; };
   fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; };
   fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; };
-  fmsb = derive2 { name="fmsb"; version="0.6.1"; sha256="1kdw0j1jl76dzsk56lpl5vvrx5l0w9rc94kmj1dhbqb5yh64xai7"; depends=[]; };
+  fmsb = derive2 { name="fmsb"; version="0.6.3"; sha256="1n29bnyp20pvpk2lsa9fblsj5w7amp14snc74pk5w3yr5y6rj0s5"; depends=[]; };
   fmt = derive2 { name="fmt"; version="1.0"; sha256="13gsywnyvf9zy5n644g2xyd60f92w2dp7vil2dncjvjcqsib22a0"; depends=[]; };
   foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; };
   focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; };
-  foghorn = derive2 { name="foghorn"; version="1.0.1"; sha256="14g82mvh7ylqdms5si3xna1zy5jfxjksv5v2ijikjz40iddxmh5s"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; };
+  foghorn = derive2 { name="foghorn"; version="1.0.2"; sha256="17bng0fxjqrlni11vwmghimk0h38mlyjyxizrbs1fycb8khlqh94"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; };
   fold = derive2 { name="fold"; version="0.2.5"; sha256="1h7vx8saq4mbmylh1zgldm8n17i8waq8fgr5d4q68553xmazws41"; depends=[csv dplyr encode lattice lazyeval magrittr metaplot rlang spec tidyr]; };
   fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; };
   fontHind = derive2 { name="fontHind"; version="0.1.1"; sha256="0qz3bj8vdy6jayy84p3vyxfwqll4v4qlklwq9wl981ii2k7g0vxf"; depends=[extrafont ggplot2 hrbrthemes]; };
@@ -6363,10 +6484,9 @@ in with self; {
   foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.2"; sha256="1wr99jq8a0cbc7n5sdzr0gwnxsv8sjqy1x1lrazxswyj49xc06i4"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; };
   foreach = derive2 { name="foreach"; version="1.4.4"; sha256="0j2yj0rn0d5nbzz9nq5rqqgnxhp9pbd92q4klsarl2xpsn8119y0"; depends=[codetools iterators]; };
   forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; };
-  forecast = derive2 { name="forecast"; version="8.2"; sha256="04mqx1szm22lhiqzncm8ad0kyqhv1y4d6v02gn70d78kxmjangzb"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries zoo]; };
-  forecastHybrid = derive2 { name="forecastHybrid"; version="2.0.10"; sha256="04lspngh44y815amxlnhl74k5g7sj3bm0w8yy58fk8nqrl382pb6"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; };
+  forecast = derive2 { name="forecast"; version="8.3"; sha256="0k5b9skjpyzx7gbd8z6f3d92wl2f8zgli781m4jg903ra0hsyncj"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca uroot zoo]; };
+  forecastHybrid = derive2 { name="forecastHybrid"; version="2.1.11"; sha256="01jmq6mw3idvascgrmr7i69pllqzdwbks42748pq18znw3f2yvjl"; depends=[doParallel foreach forecast ggplot2 reshape2 zoo]; };
   forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.2-0"; sha256="1rnf2a7sri52sm976iicab660qk07pmz8jmd3q71dg4hmc30yf9j"; depends=[Rcpp]; };
-  forega = derive2 { name="forega"; version="1.0.3"; sha256="1n1gqm0bjdw13jm95zp0ni0hps07xjkswzrszvamn2f6sglrn73d"; depends=[forecast Rcpp robfilter]; };
   foreign = derive2 { name="foreign"; version="0.8-69"; sha256="0s1lxmd85dd0kxx8hwk02w9l7pmpk4bpy7787fbyh2dbq5g9ys0k"; depends=[]; };
   forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; };
   forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; };
@@ -6394,7 +6514,7 @@ in with self; {
   fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; };
   fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; };
   fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; };
-  fpp2 = derive2 { name="fpp2"; version="2.2"; sha256="1mjd8mk169k47mb3cjgd72zgjivrh4kr1yclxxxdds3bm1jh2x8l"; depends=[expsmooth fma forecast ggplot2]; };
+  fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; };
   fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; };
   fracdiff = derive2 { name="fracdiff"; version="1.4-2"; sha256="03l5dqpqwwi5c8fwc2vissfawcsignai60h2zalknkibvk782dwq"; depends=[]; };
   fracprolif = derive2 { name="fracprolif"; version="1.0.6"; sha256="1cpb71yk1245j6qz4mqvpqc3s3lrmav4blp5wlxasjizn3ilwh66"; depends=[emg numDeriv]; };
@@ -6429,14 +6549,14 @@ in with self; {
   frontier = derive2 { name="frontier"; version="1.1-2"; sha256="1vpjd57cc6niwqibhz1ib46zj57d5a9m40yaq7kr9awk9di65ryz"; depends=[Formula lmtest micEcon miscTools moments plm]; };
   frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; };
   frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; };
-  fs = derive2 { name="fs"; version="1.1.0"; sha256="1rcpji6qygjm75y51gb6x0vg0fjnvkl3x734d6dgd50xal59blb9"; depends=[Rcpp]; };
+  fs = derive2 { name="fs"; version="1.2.2"; sha256="194sl0vv0p2h1z474yzh9agqj1w02ppvkpz5p1b8ljn794h4ar7a"; depends=[Rcpp]; };
   fscaret = derive2 { name="fscaret"; version="0.9.4.3"; sha256="1miqg7rd3q11aksbjf0nswwnxb7c2p2f0b85nmnwm11snbf1gg8s"; depends=[caret gsubfn hmeasure]; };
   fsdaR = derive2 { name="fsdaR"; version="0.2-21"; sha256="121khfqy1ixqp86cl3cngc40zxjpd4nm5k0lk558nxcfgyyzvx8y"; depends=[rJava robustbase]; };
   fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; };
   fslr = derive2 { name="fslr"; version="2.17.3"; sha256="1g7z1jsj89kqyclb3qdc7c6dgn18jqjmrxpxi62llkixhqg21yha"; depends=[matrixStats neurobase oro_nifti R_utils]; };
   fso = derive2 { name="fso"; version="2.0-1"; sha256="02dr12bssiwn8s1aa1941hfpa4007gd65f3l4s74gs2vgjzdxf8s"; depends=[labdsv rgl]; };
   fst = derive2 { name="fst"; version="0.8.4"; sha256="1jarhz5c6bib4n3xms1xhgybzaqdf4llfbgmnqndz2gwxjx1igia"; depends=[Rcpp]; };
-  fsthet = derive2 { name="fsthet"; version="1.0.0"; sha256="10mimnlq01q0mmaljfp27iq0pv11znbcv3mah57nrwpy0a3zqwhb"; depends=[]; };
+  fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; };
   ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; };
   ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; };
   fts = derive2 { name="fts"; version="0.9.9"; sha256="1qgp8xdwr5pp2b7nd8r717a6p8b6izwqrindx2d1d0lhhnqlcwhv"; depends=[BH zoo]; };
@@ -6449,7 +6569,7 @@ in with self; {
   fun = derive2 { name="fun"; version="0.1-0"; sha256="0z4nq2w1wz1clc7cf87pf870hayxq5mpzhllfgwj4mmh2xpphnrf"; depends=[]; };
   funData = derive2 { name="funData"; version="1.2"; sha256="0y3ar26d6hxc4bg263qjqfb92ivhkphzizhz91wrzbfxha9dcrzz"; depends=[abind fields foreach]; };
   funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; };
-  funHDDC = derive2 { name="funHDDC"; version="1.0"; sha256="038m64yv27wz7ki2gcn94q011p8mv0ggmli5n27y0f5bnkfh6d6w"; depends=[fda]; };
+  funHDDC = derive2 { name="funHDDC"; version="2.0"; sha256="0bd58pdsg9036vk54fayvzr6il56bamrvn5vhqc3g92papp9jlm8"; depends=[fda MASS]; };
   funModeling = derive2 { name="funModeling"; version="1.6.7"; sha256="0blanw0aw7qvcs6a8ryaqvi322gaz65g6flijkbssf681im9pmjr"; depends=[dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales]; };
   funbarRF = derive2 { name="funbarRF"; version="1.0.1"; sha256="05smi717j4zhbrfqjyvx1rzckygigg1x8c6kb3brbpv8w33gcvx7"; depends=[BioSeqClass Biostrings bold randomForest]; };
   funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; };
@@ -6457,11 +6577,12 @@ in with self; {
   functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; };
   funcy = derive2 { name="funcy"; version="0.8.6"; sha256="0wlcwwmv92djj35i7nnfns5l79fca6hsfrjxgsqmwgjb28gy19bs"; depends=[calibrate car caTools cluster fda fields flexclust kernlab MASS Matrix plyr sm wavethresh]; };
   fungible = derive2 { name="fungible"; version="1.5"; sha256="1f4q26rfl7d35ng5nx11mzzv9fhk4zg62j63c59i649wcx1xsan9"; depends=[e1071 lattice MASS mvtnorm nleqslv R2Cuba stringr]; };
+  funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; };
   funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; };
   funrar = derive2 { name="funrar"; version="1.2.2"; sha256="179kxhwkd431d2n917mzjnr5qvh09f0hdm2c78lww4ijb54dhn0l"; depends=[cluster dplyr]; };
   funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; };
   funtimes = derive2 { name="funtimes"; version="5.0"; sha256="0xq0n3939rsrz7dna4d3d7mrpxad2xswnblsc4a88nbq6cmx5c70"; depends=[dbscan Jmisc Kendall]; };
-  furniture = derive2 { name="furniture"; version="1.7.3"; sha256="1bayp2cfd3vacy83jf9x5l2kp4dr2kvfx9zvmw7z2z03lfmjj841"; depends=[knitr]; };
+  furniture = derive2 { name="furniture"; version="1.7.6"; sha256="0yz3l6lrfq5mbh4d7z6ny2gg3qixglcl9lvvs97a3l7mqwi5x4h9"; depends=[knitr]; };
   fuser = derive2 { name="fuser"; version="1.0.0"; sha256="0l2ddc3lal3gvzkn8b09i7pzd9nvqnr45naz3ni52nmgygwdk5ma"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; };
   fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; };
   futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; };
@@ -6470,7 +6591,7 @@ in with self; {
   futile_options = derive2 { name="futile.options"; version="1.0.0"; sha256="1hp82h6xqq5cck67h7lpf22n3j7mg3v1mla5y5ivnzrrb7iyr17f"; depends=[]; };
   futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; };
   futility = derive2 { name="futility"; version="0.2"; sha256="0njckhwmawqhiznv241yjghh99wl72c4xknp9nzbmvi5j575rnlh"; depends=[]; };
-  future = derive2 { name="future"; version="1.7.0"; sha256="0lfzw53z1d4bksishjkmwphfkgdr6zpvnpwr1jx8dsj0b1y2laiq"; depends=[digest globals listenv]; };
+  future = derive2 { name="future"; version="1.8.0"; sha256="096pfwafiwr16m13qda824ba3mzqabz4cdbg08sz1vh5s2k2hp4c"; depends=[digest globals listenv]; };
   future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.15.0"; sha256="0r1bnp9mnv8jk9d6dpr94cqn4zihpm7cgxqj0c3l0x9b6i0ny3z2"; depends=[BatchJobs future R_utils]; };
   future_apply = derive2 { name="future.apply"; version="0.1.0"; sha256="1c5jyklam5j9lmr5jmn6972wwlbyaaihy4kczxib87glmc4g0a4k"; depends=[future globals]; };
   future_batchtools = derive2 { name="future.batchtools"; version="0.6.0"; sha256="0npvy8d927k3ilmnwcq1fh5lvpdr009pyc93ils5qhwhfma3wfh0"; depends=[batchtools future]; };
@@ -6487,7 +6608,7 @@ in with self; {
   fwsim = derive2 { name="fwsim"; version="0.3.3"; sha256="1ix4sl2krlr0b0wfgvy73qhpmkjymqcci3q3v60j20zapi55gxn2"; depends=[Rcpp]; };
   fxregime = derive2 { name="fxregime"; version="1.0-3"; sha256="15fh8yhcba2gw2xfd0yiw5ssvbgb62l6vb28bxz71ckdyv9nsahk"; depends=[car sandwich strucchange zoo]; };
   g_data = derive2 { name="g.data"; version="2.4"; sha256="14a4m0v38p3j1k1kymkxwydlgm8b73hlx9m80sg1l4aj38fvflzl"; depends=[]; };
-  g2f = derive2 { name="g2f"; version="0.1"; sha256="1njx03hnfvzqyzhyjg5zwikv36xggss2vc82vpfybg6rqkx3rqbd"; depends=[KEGGREST minval sybil]; };
+  g2f = derive2 { name="g2f"; version="0.2"; sha256="1jsmiv6v8ilpxg1k1npcgqa467hpyw7mzh5m8dp7bxar4j5npsp4"; depends=[KEGGREST minval sybil]; };
   gCat = derive2 { name="gCat"; version="0.1"; sha256="10990ilsjk52kqkcdngj4nq0kcbn4w1syxl1mqjq2n5g1l002yjy"; depends=[]; };
   gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; };
   gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; };
@@ -6496,14 +6617,14 @@ in with self; {
   gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; };
   gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; };
   gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; };
-  gProfileR = derive2 { name="gProfileR"; version="0.6.4"; sha256="1cka02zbz1rbppm782qpxk1xn9qxbrv2gp5rgf970j906hxm2y0b"; depends=[plyr RCurl]; };
+  gProfileR = derive2 { name="gProfileR"; version="0.6.5"; sha256="1x6ym5bdlpc5z3h3wpyryym2g6qvm45blydw7s44bi165r30vrim"; depends=[plyr RCurl]; };
   gRain = derive2 { name="gRain"; version="1.3-0"; sha256="0xb746pyh8k8w1a8nz7z41bflx5xr0cqdq5l5wj7j464zv2cw6jy"; depends=[functional graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen]; };
   gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; };
   gRbase = derive2 { name="gRbase"; version="1.8-3"; sha256="143qvs5mwypswdq344a48kzn83sx9jskdr9w6kxa3fzhdcqlhi7d"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen]; };
   gRc = derive2 { name="gRc"; version="0.4-2"; sha256="0cqc3s7a1njxzmnx7yx1yjkrazbai3gpw2kc4l7g49ld4j40bsln"; depends=[gRbase MASS]; };
   gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; };
   gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; };
-  gSeg = derive2 { name="gSeg"; version="0.4"; sha256="0fcjhf8hznh1rzyfrk3f3hy16zs1n61b7r3j90pzg873razf97a2"; depends=[]; };
+  gSeg = derive2 { name="gSeg"; version="0.5"; sha256="1f3appvy78adv9jll47smgw2apm3dkm9zrm17hhdxmcnqypd7ias"; depends=[]; };
   gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; };
   gWQS = derive2 { name="gWQS"; version="1.0.0"; sha256="0n0zwfqz5g4js5y3ss64dv5842jypr6sqacs32ax37immd34slhq"; depends=[ggplot2 Rsolnp tableHTML ztable]; };
   gWidgets = derive2 { name="gWidgets"; version="0.0-54"; sha256="13lbbbnmkvb559klgsnz0q27qlyv102xakb6yccxsxjw249hm8c2"; depends=[]; };
@@ -6518,12 +6639,12 @@ in with self; {
   galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; };
   gam = derive2 { name="gam"; version="1.15"; sha256="1w6icadyfyqlkz5qijwifa3z96d460m88k8b2iaqj0cf6agmydhy"; depends=[foreach]; };
   gamCopula = derive2 { name="gamCopula"; version="0.0-4"; sha256="1nj5pxcbr6k7k1m44ky306yycpx20pw8awlx7lzyw1rx1hrv5ivb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; };
-  gamRR = derive2 { name="gamRR"; version="0.3.0"; sha256="07zgh6hxkqxrw5da1pbscl8z8hzbgc5ipkzmpimimxa0i9g04c4h"; depends=[boot mgcv]; };
+  gamRR = derive2 { name="gamRR"; version="0.4.0"; sha256="0grd9d7rar4lq82v55k7c2d3h0g2lh7ny4bpxanqgrq02jkpnz1p"; depends=[boot mgcv]; };
   gamair = derive2 { name="gamair"; version="1.0-0"; sha256="13n2n4b7givzvia93awy7ym0gihl4lr08w3a6ny2pq0f3zbhzw97"; depends=[]; };
   gambin = derive2 { name="gambin"; version="2.3.0"; sha256="1kwh8s191m6gsjczqc3svf6zp1k4zi86rqz7s94rahg84vwh6a9b"; depends=[doParallel foreach gtools]; };
   gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-0"; sha256="0z9wzvxjhnjl2bjnd5pxqzvv43hak7x5m23j76qnm05j12vw4bz1"; depends=[mboost stabs]; };
   gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; };
-  gamclass = derive2 { name="gamclass"; version="0.56"; sha256="13gy8ys69dkhm54x3vcpqblq4j2hkbsnaswzcq0v0saqd9b1shcs"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
+  gamclass = derive2 { name="gamclass"; version="0.57"; sha256="08s44n6x7m01gw02q4zgpa5vxbcgx6mnqgmdn6760ff66wy4zrgc"; depends=[ape car DAAG KernSmooth lattice latticeExtra MASS mgcv randomForest rpart]; };
   games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; };
   gamesGA = derive2 { name="gamesGA"; version="1.1.3.2"; sha256="0srxsm1zhrx1dpm94mkcsds6rwkx9gi9yfbrkzylhrxgi4g8pvwp"; depends=[shiny]; };
   gamlr = derive2 { name="gamlr"; version="1.13-4"; sha256="08igzs2raz6nnkz2aisxaq9jy2mlb49cqlm6gwxp0mrag4q6xxrz"; depends=[Matrix]; };
@@ -6542,11 +6663,11 @@ in with self; {
   gamm4 = derive2 { name="gamm4"; version="0.2-5"; sha256="11wblnh22xq3m3z25i30v2kd0zlf8wa3cm5z38z56rhk3l2wf5bc"; depends=[lme4 Matrix mgcv]; };
   gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; };
   gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; };
-  gamsel = derive2 { name="gamsel"; version="1.8-0"; sha256="0s29czlakix5ksblixcv7y5in5az9syzs2n71mqzf32vqgf8sf18"; depends=[foreach mda]; };
+  gamsel = derive2 { name="gamsel"; version="1.8-1"; sha256="107hbshi36dcyykhy6w1i1ih84xwdqv1q3nad73d3krf7bhvhg5f"; depends=[foreach mda]; };
   gaoptim = derive2 { name="gaoptim"; version="1.1"; sha256="04igpn73k6f6652y496igwypfxmz4igg4jgxx6swqyi37182rqhm"; depends=[]; };
   gap = derive2 { name="gap"; version="1.1-21"; sha256="0vslbk66h1gkpqrpj4pkxnx7nr1fnjp0zvym9cxzyxww797bd57s"; depends=[]; };
   gap_datasets = derive2 { name="gap.datasets"; version="0.0.2"; sha256="0skxgiwymd8c4vsy2dbddifjj9a0bq52gdd2r62slsv0q9haw96y"; depends=[]; };
-  gapfill = derive2 { name="gapfill"; version="0.9.5-3"; sha256="1hwccvshz9z1zgjjrdk6iri272ih11cwpz91rldkpcwly6pqcwhk"; depends=[fields foreach ggplot2 quantreg Rcpp]; };
+  gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; };
   gapmap = derive2 { name="gapmap"; version="0.0.4"; sha256="0xz19n0vvdzbfg6afp3y0qfbs3f2nfxib1cyya3cax5wqqfbzw3i"; depends=[ggplot2 reshape2]; };
   gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; };
   gaselect = derive2 { name="gaselect"; version="1.0.5"; sha256="0xzx00n46x6x7w1xbx8nvabkkrna45pv1i70787m8h05q1yrjjij"; depends=[Rcpp RcppArmadillo]; };
@@ -6558,7 +6679,7 @@ in with self; {
   gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; };
   gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; };
   gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; };
-  gb = derive2 { name="gb"; version="1.1.8-8"; sha256="18n9wqz82mjxjgzk8vc68kyz3b6lk21d2f16551d6fikjla03adf"; depends=[boot]; };
+  gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; };
   gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; };
   gbm = derive2 { name="gbm"; version="2.1.3"; sha256="0ayrpq5qm18dsain088mbw0037bijxcy342grb6g2qnp67llpwpa"; depends=[lattice survival]; };
   gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; };
@@ -6588,7 +6709,7 @@ in with self; {
   gee = derive2 { name="gee"; version="4.13-19"; sha256="14n2fa2jmibw5j8n4qgbl8xbxhapmx4z3zrmkbcci39k9dsyplzb"; depends=[]; };
   gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; };
   geeM = derive2 { name="geeM"; version="0.10.0"; sha256="0bk99kwh6xapkaxc3yis5x3d49j7pb45hq4ksbmkhz6ba21c4sn5"; depends=[Matrix]; };
-  geecure = derive2 { name="geecure"; version="1.0-2"; sha256="0y3h079hyr8p6i0hyf0zzkbfds36zz782ffiw18w7qavnj70yj98"; depends=[geepack MASS Matrix survival]; };
+  geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; };
   geepack = derive2 { name="geepack"; version="1.2-1"; sha256="13fkz38rsdk1byv6rdpdmphz5dd31r4h8ms49hali6hjh5rydzvy"; depends=[]; };
   geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; };
   geex = derive2 { name="geex"; version="1.0.3"; sha256="0px197mz3qfx7s4wfdjlgjpss03y7wid1qa34xf4xan05dnrrnzc"; depends=[lme4 Matrix numDeriv rootSolve]; };
@@ -6600,6 +6721,7 @@ in with self; {
   gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; };
   gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; };
   genBaRcode = derive2 { name="genBaRcode"; version="1.0.0"; sha256="0313kyhy9bg9rabxk2jdgxq2brhj2kkiq0xyd3mlq6j9c626pqi8"; depends=[ape Biostrings ggnetwork ggplot2 igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist visNetwork]; };
+  genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; };
   genMOSS = derive2 { name="genMOSS"; version="1.2"; sha256="18qinckzz7wsw222skrq30izbj6s85i8hq6iicj9nng8gh6jydr8"; depends=[ROCR]; };
   genMOSSplus = derive2 { name="genMOSSplus"; version="1.0"; sha256="1n3ngx1piy3l14k5k95wrgvrjw9238jkygfqanl3xg2na2mmkr26"; depends=[]; };
   genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; };
@@ -6608,7 +6730,7 @@ in with self; {
   gencve = derive2 { name="gencve"; version="0.3"; sha256="00wbmaffm7mbfv3zl6mb24w1df1a8p24girwdh3a522lw3045iwf"; depends=[C50 class e1071 glmnet lars MASS nnet plus randomForest rpart]; };
   gendata = derive2 { name="gendata"; version="1.1"; sha256="1r5bhmfblhk6d31v0byhp4a0pmpri6vk697zmmx9b0hvhda7mllf"; depends=[]; };
   gender = derive2 { name="gender"; version="0.5.2"; sha256="1kd5024z9mbyiwmj7rpn7zflmpw6jsj2sz153g3ckzyhxjbc3x36"; depends=[dplyr httr jsonlite]; };
-  genderBR = derive2 { name="genderBR"; version="1.0.1"; sha256="1sbxp0wz138xxcv31xz411gp7krzghvfmjfg5hmv66l8014s6s6c"; depends=[dplyr httr jsonlite]; };
+  genderBR = derive2 { name="genderBR"; version="1.1.0"; sha256="0j5wsbv797wc48lc65yhaqhpwqyr662460vj59x7r9p7d7m1ncd0"; depends=[dplyr httr jsonlite]; };
   genderizeR = derive2 { name="genderizeR"; version="2.0.0"; sha256="0r9r5x93zr58sfrww3l2vyvjyj8lir2yds08y6dzf88rs9v15w3c"; depends=[data_table httr magrittr stringr tm]; };
   gendist = derive2 { name="gendist"; version="1.0"; sha256="0n3ax7iy40ymrxhmb88w31a4aacaps9f1iild42afin7i7vy4dq9"; depends=[]; };
   geneListPie = derive2 { name="geneListPie"; version="1.0"; sha256="0z2gawfzhm05dafj4zlj6ifmf0dy7p1hrpa59lzxrnrc0wr6laji"; depends=[]; };
@@ -6625,9 +6747,10 @@ in with self; {
   genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; };
   geniusr = derive2 { name="geniusr"; version="1.0.0"; sha256="0akz6hkw9mjwgx9s9j24j5l1z4q41kbhna2245l26ymn4cf0rwjc"; depends=[httr purrr rvest stringr tibble xml2]; };
   genlasso = derive2 { name="genlasso"; version="1.3"; sha256="1q4ybg8xzphnqwywwdb7i2q94dlxwpggvisjqqdj39jh2cabda57"; depends=[igraph MASS Matrix]; };
-  genlogis = derive2 { name="genlogis"; version="0.5.0"; sha256="0ybbfm9znkm52kin4f8dxb63rn6b91zsa31baw1lgczh41yswg3r"; depends=[distr doParallel foreach ggplot2 manipulate]; };
+  genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; };
   geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; };
   genoPlotR = derive2 { name="genoPlotR"; version="0.8.7"; sha256="1zplk0acismv4x528rmmg5jcv6ng6c4vjf5h0mr124fj3kizsrg0"; depends=[ade4]; };
+  genogeographer = derive2 { name="genogeographer"; version="0.1.8"; sha256="1sawxazfyi29h27lyrkkg0cqirmca59387z77r2jamcj6yx4lpxg"; depends=[dplyr DT forcats ggplot2 knitr leaflet magrittr purrr readr rio rmarkdown shiny shinycssloaders shinyjs tibble tidyr]; };
   genomeplot = derive2 { name="genomeplot"; version="1.0"; sha256="15v01ngxq7kxav1bhw1mvqradrmvwsad5xh9l5skivb5smh9795w"; depends=[ggplot2]; };
   genomic_autocorr = derive2 { name="genomic.autocorr"; version="1.0-1"; sha256="1lidrjz1flxw4jvhqdi8y813m7ss4kkvm7bxsdpz60dxxw3204gm"; depends=[data_table magrittr reshape]; };
   genomicper = derive2 { name="genomicper"; version="1.6"; sha256="12msl6syw5a3dvxg9fr1yprcpb9qwn8v2dvkpxgagal11p9q1kx7"; depends=[DBI]; };
@@ -6636,6 +6759,7 @@ in with self; {
   genridge = derive2 { name="genridge"; version="0.6-6"; sha256="1hqarvd767h2vbjqfjzdr0548hxj87kv1073hfqyq5fybdlzsjx3"; depends=[car]; };
   gensemble = derive2 { name="gensemble"; version="1.0"; sha256="0yyi7djzqx4yhxp6yy1rjgvzidjlna79ds89bgj6m6zj3aav6yw2"; depends=[]; };
   gensphere = derive2 { name="gensphere"; version="1.1"; sha256="1xzli40fw94n89cv2qyb321csad1w9zidqc226wlifl2m44cw6f7"; depends=[geometry mvmesh rgl SimplicialCubature SphericalCubature]; };
+  gensvm = derive2 { name="gensvm"; version="0.1.0"; sha256="19qd67x3j0b60wsbinjny7jwx5yh8hdk6387fl64frnq8fvi9d60"; depends=[]; };
   geo = derive2 { name="geo"; version="1.4-3"; sha256="0yxlafm99ypwf1700nh3hnnpndb6ghwwbi5sp6715zjbkkx94482"; depends=[mapdata maps]; };
   geoBayes = derive2 { name="geoBayes"; version="0.3.3"; sha256="1jw0fj39gzf4cislc889ndgj34svcdxk0jz85ssk936g9gp0mm0c"; depends=[coda sp]; };
   geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; };
@@ -6645,14 +6769,15 @@ in with self; {
   geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; };
   geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; };
   geoelectrics = derive2 { name="geoelectrics"; version="0.1.5"; sha256="0zy9m5k4b359mn29cd62cnwjm4fc19hy3l8p587yrrhsi20nbyna"; depends=[fields lattice rgl]; };
-  geofacet = derive2 { name="geofacet"; version="0.1.5"; sha256="1fx7qgvyqkm8728ai1nd7kgj295q46jlps56zwvlvlzhqy437p5n"; depends=[ggplot2 gtable]; };
+  geofacet = derive2 { name="geofacet"; version="0.1.9"; sha256="0z9xd24hn9j8azd4kal81lz72zy6vv9rvwx1jsmkq7z7f1wwly48"; depends=[geogrid ggplot2 ggrepel gridExtra gtable imguR rnaturalearth sp]; };
   geofd = derive2 { name="geofd"; version="1.0"; sha256="16312g9mgw52mpsfky1j20zcqkkv91ihl0xhvv1bl80diffzf0zi"; depends=[fda geoR]; };
   geogrid = derive2 { name="geogrid"; version="0.1.0"; sha256="1aiar70cy8rf7hc7kwc2g3p02x3zmp6nf9vfjjrjm94mb7yr8s48"; depends=[Rcpp RcppArmadillo rgeos sf sp]; };
   geohash = derive2 { name="geohash"; version="0.3.0"; sha256="1yabnf0a6jd4r6zh83sxb9wcn4vs8csp7c80qs6pi1nx016lirx7"; depends=[Rcpp]; };
   geojson = derive2 { name="geojson"; version="0.2.0"; sha256="1xvbkdaaf55x015pflvcdy06ayrmhqi3my0sdqb48z129rdbr3i7"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; };
   geojsonR = derive2 { name="geojsonR"; version="1.0.4"; sha256="0248lb1kgj43czp5z4q7dcrq6ra0jhq62q9x79mgyb83bqn940h8"; depends=[R6 Rcpp RcppArmadillo]; };
-  geojsonio = derive2 { name="geojsonio"; version="0.5.0"; sha256="1ywrzjksiim7xhjywhjmp6s3dalqyzh1948xr8958ahpbk242252"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sp V8]; };
+  geojsonio = derive2 { name="geojsonio"; version="0.6.0"; sha256="10vi40ppy65yg655xy0j8zl6icn7d7icwfj4a84wpp28pd1bwic8"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sf sp V8]; };
   geojsonlint = derive2 { name="geojsonlint"; version="0.2.0"; sha256="05j7059s1hs8i2fkmkv0mqmda3bgk5zbyi865ab0vl361wiwmdya"; depends=[httr jsonlite jsonvalidate V8]; };
+  geojsonsf = derive2 { name="geojsonsf"; version="0.2.0"; sha256="1jc0dgxk4zlrwy6a3y2j87a7vk9w8cnmczhaf0jdw6xymmni1faw"; depends=[rapidjsonr Rcpp]; };
   geoknife = derive2 { name="geoknife"; version="1.5.5"; sha256="0azb98zk4ayfm0z9vz5h59490xvng16p3gpdn60ca9mwdikyxks3"; depends=[curl httr sp XML]; };
   geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; };
   geomedb = derive2 { name="geomedb"; version="0.2"; sha256="1nsf7xzqayk8zbw3b6xpgiqk2w2kzc896gjswzxq128xw05cia0a"; depends=[ape httr]; };
@@ -6662,7 +6787,7 @@ in with self; {
   geomnet = derive2 { name="geomnet"; version="0.2.0"; sha256="0xanzx8p34bac4zcf9j69nivwhllvsrw7x70mzgl95jhg3gvv96a"; depends=[dplyr ggplot2 network plotly readr sna tidyr]; };
   geomorph = derive2 { name="geomorph"; version="3.0.5"; sha256="015ijpmx44agmr2ddwgxy5rs1rhkxr6j6dh5wzksaw1p4mxmhfks"; depends=[ape geiger jpeg Matrix rgl]; };
   geonames = derive2 { name="geonames"; version="0.998"; sha256="1p0x260i383ddr2fwv54pxpqz9vy6vdr0lrn1xj7178vxic1dwyy"; depends=[rjson]; };
-  geoops = derive2 { name="geoops"; version="0.1.2"; sha256="1p2nc6lhqvnxs4l8k0kyqb7mjigaycjms61139sd39qs6wy7cnvp"; depends=[Rcpp]; };
+  geoops = derive2 { name="geoops"; version="0.1.8"; sha256="1n863z83y19bn97clfddhv009c8d6a1grya0q5pk0a6ylihcw11h"; depends=[Rcpp]; };
   geoparser = derive2 { name="geoparser"; version="0.1.1"; sha256="0rk2wcig79r28a974bc181p8vypxzbgxcb9rsp24qj9mg02rn5n5"; depends=[digest dplyr httr jsonlite lazyeval purrr stringr tidyr]; };
   geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; };
   georob = derive2 { name="georob"; version="0.3-6"; sha256="01gq9ymqk3zyjs5n7nj27ky2bnhc7x7npbipa5bcq7jda6gxirhr"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; };
@@ -6672,7 +6797,7 @@ in with self; {
   geosphere = derive2 { name="geosphere"; version="1.5-7"; sha256="186qdm5niq7v3d4w4rngx71znsgi44hnam7698bsx9ar5mg5b6wx"; depends=[sp]; };
   geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; };
   geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; };
-  geostatsp = derive2 { name="geostatsp"; version="1.6.0"; sha256="12lkmwfg4wqmc13xzsmgc1g624v2kpacxpycwlcafr60rbix6f9w"; depends=[abind Matrix numDeriv raster sp]; };
+  geostatsp = derive2 { name="geostatsp"; version="1.7.1"; sha256="141mvwkqk2jpyggmzvm604s37h92gbmzch3d84dq3ng29mc507s2"; depends=[abind Matrix numDeriv raster sp]; };
   geotech = derive2 { name="geotech"; version="1.0"; sha256="18s7w6h1svc4n1hcgj5njfkf3nflkc53cdwsq5112p3442rlz33f"; depends=[]; };
   geotools = derive2 { name="geotools"; version="0.1"; sha256="0d0vf9dvrrv68ivssp58qzaj8vra26ms33my097jmzmgagwy1spd"; depends=[]; };
   geotoolsR = derive2 { name="geotoolsR"; version="1.0"; sha256="1arbyb1q96ya3smn9sqzqji5v21x37iyyxmvlmqmjj75an8ix5dp"; depends=[dplyr geoR ggplot2 tidyr]; };
@@ -6680,6 +6805,7 @@ in with self; {
   geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; };
   geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; };
   gepaf = derive2 { name="gepaf"; version="0.1.1"; sha256="0n36w40jrq3qkgmhz9wrnhp6fczw7bm96g950sa4nq33872xhfgm"; depends=[bitops]; };
+  germinationmetrics = derive2 { name="germinationmetrics"; version="0.1.0"; sha256="1s6mygiwmz2cgg2dcsah4ssnj5hfilf7hfdzvv3qd57imicrlkk5"; depends=[broom ggplot2 ggrepel minpack_lm plyr Rdpack]; };
   gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; };
   gesis = derive2 { name="gesis"; version="0.2.1"; sha256="1cdmhfdjiwsp48a7b0r1mnagnymz606mkzpam9fsvfl72vzji2w7"; depends=[httr rvest xml2]; };
   getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.2.2"; sha256="14rw7pdcan4bdjfb16z3h0acx2s8l34vywsp4nn8l1pmmsvgqpap"; depends=[data_table dplyr hoardr httr raster tibble tidyr]; };
@@ -6689,16 +6815,17 @@ in with self; {
   getlandsat = derive2 { name="getlandsat"; version="0.1.0"; sha256="0h2520r5sqyzsajqw2i86byw9zm5za27mhjkrzzw5vr5sh1vdiwb"; depends=[data_table httr rappdirs readr tibble xml2]; };
   getmstatistic = derive2 { name="getmstatistic"; version="0.1.1"; sha256="14w0n658s624anvxv7sqcgy6vfaaxcc7fj4xi1k2qrxd9rdh6dza"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; };
   getopt = derive2 { name="getopt"; version="1.20.2"; sha256="13p35lbpy7i578752fa71sbfvcsqw5qfa9p6kf8b5m3c5p9i4v1x"; depends=[]; };
-  gets = derive2 { name="gets"; version="0.14"; sha256="01pdpw56q27ihqyp58f0rsggqaqzay74ah1lwi54y7kcyw09yq5w"; depends=[zoo]; };
+  gets = derive2 { name="gets"; version="0.15"; sha256="1sz225bymjp2mrklpjagh6x622kpcvh21r0rmimd1mjhqbg0p9vs"; depends=[zoo]; };
   gettingtothebottom = derive2 { name="gettingtothebottom"; version="3.2"; sha256="1cz2vidh7k346qc38wszs2dg6lvya249hvcsn6zdpbx0c0qs3y72"; depends=[ggplot2 Matrix]; };
   gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; };
   gfcanalysis = derive2 { name="gfcanalysis"; version="1.4"; sha256="1hjgbiakf01mmaa2jhlnymcsjsj1zssay44p4sdxxxzpx4szs3vv"; depends=[animation geosphere ggplot2 plyr raster rasterVis RCurl rgdal rgeos sp stringr]; };
   gfer = derive2 { name="gfer"; version="0.1.10"; sha256="1y0ra8k7zka43ibiii16vbwnc3m1i77yc9zj8rhzhmvhajjwad3l"; depends=[circlize data_table ggplot2 ggrepel googlesheets gsheet httr jsonlite rvest scatterpie stringi tidyr V8 xml2]; };
-  gfmR = derive2 { name="gfmR"; version="1.0-1"; sha256="1irzkiq93wh4yphq8x1v2a7plcrskb8fs36qjaa0qhyhvhn0f57i"; depends=[faraway nnet]; };
+  gfmR = derive2 { name="gfmR"; version="1.1-0"; sha256="0qzzbcra1fnbp0h31b1as20yhmqmi7p62xrhikj64an9avg9b277"; depends=[faraway nnet]; };
   ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; };
-  ggExtra = derive2 { name="ggExtra"; version="0.7"; sha256="0vygac13cjcq63f57zd28jyla09za58r77kq1mmsa4qx4dxyfsbl"; depends=[colourpicker ggplot2 gtable miniUI shiny shinyjs]; };
+  ggExtra = derive2 { name="ggExtra"; version="0.8"; sha256="1m5zpn3l3p1y3d2692gyz50m63d58m2a3b7zb595kvcffdx2qr5b"; depends=[colourpicker ggplot2 gtable miniUI scales shiny shinyjs]; };
   ggFacetSample = derive2 { name="ggFacetSample"; version="1.0.0"; sha256="04h5j54wblrygiscvb6n40b9lz42ssds1yz9qs5hxppiph68k5zq"; depends=[ggplot2 plyr]; };
   ggQC = derive2 { name="ggQC"; version="0.0.2"; sha256="1wi9hb5ihix2vfpzbhpq2clbs7c0qh84qbmdfcxw4lknb0ha9ai1"; depends=[dplyr ggplot2 tidyr]; };
+  ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; };
   ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; };
   ggRandomForests = derive2 { name="ggRandomForests"; version="2.0.1"; sha256="0f8m0j79d8wbac14zk1s8812rz6vgf04bz1iqq8p4d3sxwnvaj7q"; depends=[ggplot2 randomForest randomForestSRC survival tidyr]; };
   ggThemeAssist = derive2 { name="ggThemeAssist"; version="0.1.5"; sha256="1biw91a8p13h62v4w3yim6ghr98khmyhb3qd0h04asf91vvmpxbv"; depends=[formatR ggplot2 miniUI rstudioapi shiny]; };
@@ -6707,25 +6834,26 @@ in with self; {
   ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; };
   ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; };
   ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; };
-  ggconf = derive2 { name="ggconf"; version="0.1"; sha256="1h7z4amlycfddisf8ix5kmax56ix8hdllfn77rf4fs5sbqsqxkdm"; depends=[ggplot2 rly tibble]; };
+  ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; };
   ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.1"; sha256="04jq1qpsgy8bgpilp1a02va4vz0adkjwrz9znmhv54q81qiv7h51"; depends=[ggplot2 reshape2]; };
+  ggdag = derive2 { name="ggdag"; version="0.1.0"; sha256="0ja3v8pmlzl55n8y8n9zcg5n17w8w4vdq42bqf6h8hgyqj63rcg9"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr plyr purrr stringr tibble tidygraph]; };
   ggdendro = derive2 { name="ggdendro"; version="0.1-20"; sha256="1zzq1hxd0d1qa5hrzwfkdw6fzscpcafbwbpkrb62dm559y8awp0j"; depends=[ggplot2 MASS]; };
   ggdmc = derive2 { name="ggdmc"; version="0.1.3.9"; sha256="07a9g6kwq4hg5zlcxndwmyprl3di7fzsn2960qyixn5bzrfk7sh2"; depends=[coda ggmcmc ggplot2 ggthemes gridExtra loo Rcpp RcppArmadillo rtdists]; };
   gge = derive2 { name="gge"; version="1.3"; sha256="0bqclmm4jr7y52n7qh4jikd0804iccjdpy55bvbc2k8ypsp2biik"; depends=[nipals reshape2 rgl]; };
   ggedit = derive2 { name="ggedit"; version="0.2.1"; sha256="0l2ryp8xcyqsgfcywr3y6c2y8j42c15dyrcmfhfimbzy52bmnqxy"; depends=[colourpicker dplyr ggplot2 miniUI plyr reshape2 rstudioapi scales shiny shinyAce shinyBS]; };
-  ggeffects = derive2 { name="ggeffects"; version="0.3.1"; sha256="04wmyrs1pzdv120w7pq2g0x51h061lj27p42gaxfcrzdbplvrwv1"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
+  ggeffects = derive2 { name="ggeffects"; version="0.3.2"; sha256="07xrbl8z5ap5yy40wdz4gcwmmmj66c01qv8jdn0smjf06xavbr0n"; depends=[dplyr effects ggplot2 magrittr prediction purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
   ggenealogy = derive2 { name="ggenealogy"; version="0.3.0"; sha256="169zkcp13g0ll9941a7hh31fll0mavnkb6fd3kvkibdjm621ymyh"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; };
   ggfan = derive2 { name="ggfan"; version="0.1.1"; sha256="0sqf37afz9kpl2wm3cpansav9ndil8agwrblzj0fhnyrj41s148n"; depends=[colorspace dplyr ggplot2 rstan]; };
   ggfittext = derive2 { name="ggfittext"; version="0.5.0"; sha256="0ih6mqg53y5iaiq003wbzp6qqx4844yh5z9zw5d0k7gqclprmpn5"; depends=[ggplot2 stringi]; };
   ggforce = derive2 { name="ggforce"; version="0.1.1"; sha256="0y49anv5sj1qn1ifcxg1krkkv4z3dlan5lya36vfmzzdamfgq5p6"; depends=[dplyr ggplot2 gtable lazyeval MASS Rcpp scales tweenr units]; };
   ggformula = derive2 { name="ggformula"; version="0.6.2"; sha256="08smdd3s8dh3qjcm25v8h1r8pfvlfvkymnbhlyw4bymq479g4w0j"; depends=[ggplot2 magrittr mosaicCore rlang stringr tibble]; };
-  ggfortify = derive2 { name="ggfortify"; version="0.4.3"; sha256="031fq82g7n9r9mvvh1sqbhq8m0swkha0vl78rkgkmzbrp88lkvqg"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
+  ggfortify = derive2 { name="ggfortify"; version="0.4.4"; sha256="12fzf04yqxz0297pq4cpbnxal1vdmibi9nfcmzq5g35diypqwmg9"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; };
   gggenes = derive2 { name="gggenes"; version="0.2.0"; sha256="1s3lkdl9wmhcdra90bv8zzb16h2sdmpr15x8c3d0gfw7yir6prj2"; depends=[ggplot2]; };
   ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; };
   ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; };
   gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; };
   gghighlight = derive2 { name="gghighlight"; version="0.0.1"; sha256="12by8q31fl2kc6w5p72wvd2nxg1cpvhgdbais6hjly1sxi8jd6zp"; depends=[dplyr ggplot2 ggrepel magrittr purrr rlang]; };
-  ggimage = derive2 { name="ggimage"; version="0.1.0"; sha256="1kh8r859bayrha96b5wyfncbns2qw49v5kfai1jx66w89x3bsr7h"; depends=[ggplot2 gridGraphics magick rvcheck scales tibble]; };
+  ggimage = derive2 { name="ggimage"; version="0.1.4"; sha256="0bwzzd7f4knjg7jifsmqwbd0kbca1n5f8f4s068d6mahaff5d9mn"; depends=[base2grob ggplot2 gridGraphics magick rvcheck scales tibble]; };
   ggiraph = derive2 { name="ggiraph"; version="0.4.2"; sha256="0bk6q0psxzggm69yyhfw047xyygp23rk63xvdd9dv6avndfn1h7n"; depends=[ggplot2 htmltools htmlwidgets rvg xml2]; };
   ggiraphExtra = derive2 { name="ggiraphExtra"; version="0.1.0"; sha256="09fiwkaai4sy5kxy4p0c4ldb8ya63czff53hbm6d8fm858fw2byw"; depends=[ggiraph ggplot2 mapproj mgcv moonBook mycor plyr reshape2 scales XML]; };
   ggjoy = derive2 { name="ggjoy"; version="0.4.0"; sha256="1s24zn7gmk52bvjjhanxby7rxbnc2yfl0nx5nv7x7z0zja8gg7nb"; depends=[ggplot2 ggridges]; };
@@ -6752,7 +6880,7 @@ in with self; {
   ggraph = derive2 { name="ggraph"; version="1.0.1"; sha256="0sm1hf2fjfia0s8m5b1x6pi8wvww77rpck86clpa2figwvck8jqr"; depends=[digest dplyr ggforce ggplot2 ggrepel gtable igraph MASS plyr Rcpp scales viridis]; };
   ggraptR = derive2 { name="ggraptR"; version="1.0"; sha256="1n3ildrm8jh6m1j8njx1icbjhpkv3d2ndx59d6ddyg4np09cmp8w"; depends=[assertthat backports colorspace colourpicker DBI dplyr DT evaluate futile_logger futile_options gdtools GGally ggplot2 ggthemes gtable htmltools htmlwidgets httpuv labeling lambda_r lazyeval magrittr miniUI munsell plyr RColorBrewer Rcpp reshape rmarkdown rprojroot scales shiny shinyBS shinyjs stringi stringr svglite tibble xtable yaml]; };
   ggrepel = derive2 { name="ggrepel"; version="0.7.0"; sha256="0g0qfm6g71rv27423c1x846ipilnj213knyzrcr09vrpxc87l618"; depends=[ggplot2 Rcpp scales]; };
-  ggridges = derive2 { name="ggridges"; version="0.4.1"; sha256="0kfa3icqdalqdg1klxjrhfl7if35d3wnsiyl86bprw5dyqyh3lh3"; depends=[ggplot2 plyr scales]; };
+  ggridges = derive2 { name="ggridges"; version="0.5.0"; sha256="1znvsbl3px8dddpjgdrygnpz4s685wizi0jnjvx2hrz58i0chjqj"; depends=[ggplot2 plyr scales withr]; };
   ggsci = derive2 { name="ggsci"; version="2.8"; sha256="1s2asx9aprpzs6xqbl7yb1dv9ci9ivwqcq46fzvys8zgwzf7mkml"; depends=[ggplot2 scales]; };
   ggseas = derive2 { name="ggseas"; version="0.5.1"; sha256="1r23j701rvia49si42fbi6zws7x9r92h1bcp0a15h28hpl7zlp7l"; depends=[ggplot2 seasonal zoo]; };
   ggseqlogo = derive2 { name="ggseqlogo"; version="0.1"; sha256="13q6kcpxrqxqbji889fx63p0nsi08lk5yymkchig75r5k1d18ky1"; depends=[ggplot2]; };
@@ -6761,9 +6889,10 @@ in with self; {
   ggspatial = derive2 { name="ggspatial"; version="0.2.1"; sha256="11vminz4kwv1ny4v9h23sp7j7d45q6v4804xv9fp04qgzbzi9lv8"; depends=[abind ggplot2 maptools plyr raster reshape2 rgdal rosm scales sp]; };
   ggspectra = derive2 { name="ggspectra"; version="0.2.3"; sha256="11y2vlcpxyh56pdfzz11bkip2nxv6rrwscqv48p5fvgn9sllly4q"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands reshape2 scales tidyr]; };
   ggstance = derive2 { name="ggstance"; version="0.3"; sha256="0sr84nasr8x8ib3mdsjck73gbfg9xba50s5nxdij0ah9xqnpyhpi"; depends=[ggplot2 lazyeval plyr purrr]; };
+  ggstatsplot = derive2 { name="ggstatsplot"; version="0.0.1"; sha256="07fpavl7735a7fhaiybf55125afs40ai8sag32xxsf8d24i5zl2s"; depends=[apaTables broom coin cowplot crayon DescTools dplyr effsize ggcorrplot ggExtra ggplot2 ggrepel gtable jmv magrittr MASS nortest purrr rlang RVAideMemoire sfsmisc tibble tidyr userfriendlyscience WRS2]; };
   ggswissmaps = derive2 { name="ggswissmaps"; version="0.1.1"; sha256="0is48x6k2p5dgj9q4km0dv33a9pcpfhlai9vz295y3acpyrkmnn4"; depends=[ggplot2]; };
   ggtern = derive2 { name="ggtern"; version="2.2.1"; sha256="05dszysn1qr5s4ji4il91pv19xjh5yd09w9f153fmg4cyfl716iz"; depends=[compositions ggplot2 gridExtra gtable latex2exp lattice MASS plyr proto scales]; };
-  ggthemes = derive2 { name="ggthemes"; version="3.4.0"; sha256="1jj8lp7jbk3489kpgbw4b5phpn01gkfmksc21c6sn3x6wmzyn6hs"; depends=[assertthat colorspace ggplot2 scales]; };
+  ggthemes = derive2 { name="ggthemes"; version="3.4.2"; sha256="0i7ygpizs00acizixc29bhbrci523ys7vzxbii9b3bcmfa3pj7i3"; depends=[assertthat colorspace ggplot2 scales]; };
   ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; };
   ggvis = derive2 { name="ggvis"; version="0.4.3"; sha256="1p7c8f83da30grj5n0v80p5djp6z0r62z5zqpv2a3ahn61w1gm9l"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; };
   gh = derive2 { name="gh"; version="1.0.1"; sha256="1llinfajb0g7006jd2w1hpskxpmkjhnqarcjb71r1qvsccb2ph7k"; depends=[httr ini jsonlite]; };
@@ -6774,7 +6903,9 @@ in with self; {
   gibble = derive2 { name="gibble"; version="0.0.2"; sha256="0a9h3q0kwk9aagcpnmih59vbm5n7hdjpa4idwagky351almblmr6"; depends=[dplyr tibble]; };
   gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; };
   gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; };
-  gimme = derive2 { name="gimme"; version="0.3-2"; sha256="1k79c057024i59iccphzdkh0022dd4dv0vrpn3pvlw9px6j9fbz3"; depends=[igraph lavaan qgraph]; };
+  gim = derive2 { name="gim"; version="0.11.0"; sha256="1psmziq03k1nbdl64sy152ih4g625qkbp5l7msfibrcbpgz0hg7y"; depends=[numDeriv]; };
+  gimme = derive2 { name="gimme"; version="0.3-3"; sha256="0czms27yfv0iwwqljfpa21qx83282ky4misccbln4cxziyw1n7yz"; depends=[igraph lavaan qgraph]; };
+  gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; };
   gimms = derive2 { name="gimms"; version="1.1.0"; sha256="0mqffqvaapb0m0d50vg4kvdp67yq99qf54f5anwq4md0rf3x8lid"; depends=[curl Kendall ncdf4 raster RCurl zyp]; };
   giphyr = derive2 { name="giphyr"; version="0.1.2"; sha256="1id3r291xyj1ylxgmw2cbazaz0jq4bksj8bijwagcawimfxibz45"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; };
   gistr = derive2 { name="gistr"; version="0.4.0"; sha256="1q1wp3q3ppkclvw9fsc9pr5raqv2r9rdm2n8s197b8brfcjilxsi"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; };
@@ -6784,7 +6915,7 @@ in with self; {
   gitlabr = derive2 { name="gitlabr"; version="0.9"; sha256="0i9sqqvn9xzknybsj9nmi6kclw8c35shy658li17455d28gv4653"; depends=[base64enc dplyr httr magrittr purrr stringr tibble yaml]; };
   gitter = derive2 { name="gitter"; version="1.1.1"; sha256="10m4rs6mhg7xn8dfd41ai0bnn5bnxn6cgqip22hrrpj0i2lzky6l"; depends=[EBImage ggplot2 jpeg logging PET tiff]; };
   givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; };
-  gjam = derive2 { name="gjam"; version="2.1.9"; sha256="05xi8wf1bp75irdklgxbx5clik0l1bpykl30hvda0dxp6qyrzm4w"; depends=[MASS RANN Rcpp RcppArmadillo]; };
+  gjam = derive2 { name="gjam"; version="2.2.1"; sha256="0xjkssxgpcpn37amkjwi5cjdx5b8lkgjaw2lm4wyjjfn59jj3d14"; depends=[MASS RANN Rcpp RcppArmadillo]; };
   gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; };
   gkmSVM = derive2 { name="gkmSVM"; version="0.79.0"; sha256="04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; };
   glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; };
@@ -6795,11 +6926,10 @@ in with self; {
   glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; };
   glcm = derive2 { name="glcm"; version="1.6.1"; sha256="0xzfhafc7326v3g1xngp584039iknw3q3bcx8f0j4ig125in7sxk"; depends=[Rcpp RcppArmadillo]; };
   gld = derive2 { name="gld"; version="2.4.1"; sha256="0ycm3w8s5bm5w2lqy0qa877cwjcwc9x1zyyyrknwwjjxip250iaw"; depends=[e1071 lmom]; };
-  gldrm = derive2 { name="gldrm"; version="1.4"; sha256="0kjd78zpn65zs7nd2fqmm5qs6d0vyjyww93jgcx5ay5qpx83vyrv"; depends=[]; };
+  gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; };
   glinternet = derive2 { name="glinternet"; version="1.0.7"; sha256="0kvhkhkhf5bmqvhxiz83cqw478s55gbkk3s2csa9bnz8ymkcn3f4"; depends=[]; };
   gllm = derive2 { name="gllm"; version="0.35"; sha256="1m9asamh2yha9q8mrllvvc9qj2im6cspvfpafzc8krmh17zq4ins"; depends=[]; };
   gllvm = derive2 { name="gllvm"; version="0.1.0"; sha256="13ca5ms6bbrj3ny5n438v5ma0d7ccnghysz7c8452cpdq8sn87iy"; depends=[fishMod MASS Matrix mvabund mvtnorm Rcpp RcppEigen statmod TMB]; };
-  glm_ddR = derive2 { name="glm.ddR"; version="0.1.1"; sha256="123xqyw73l5lv746zvy2wjwr8xx6gpmwi5n86m8d05dj3bx02dzm"; depends=[ddR Matrix]; };
   glm_deploy = derive2 { name="glm.deploy"; version="1.0.4"; sha256="1akklvbhz2pp0sv1hax1jq0s9ajbfv1597z643gh5l9hwizj2h9m"; depends=[Rcpp]; };
   glm_predict = derive2 { name="glm.predict"; version="3.0-0"; sha256="1kqh8g7mrpfnzklk23x7ckbn5p2qcw951cg4s9gnlncggby864ig"; depends=[MASS nnet]; };
   glm2 = derive2 { name="glm2"; version="1.1.3"; sha256="0mmvba1ccmykm2k02ysjbiqj1lwzdwrbxr1hq1kn1gl97xlarp2x"; depends=[]; };
@@ -6813,10 +6943,10 @@ in with self; {
   glmm = derive2 { name="glmm"; version="1.2.3"; sha256="0cxlcx09a5vypv6kkcfvfjdpz2rnxhay0pjv6q53hdmbshmchbmj"; depends=[digest Matrix mvtnorm trust]; };
   glmmBUGS = derive2 { name="glmmBUGS"; version="2.4.0"; sha256="1clnnf0ja2xiqdgi2f1xs04hhi13rnp8jzzdjncbqbdzk2ic3ynl"; depends=[abind MASS sp]; };
   glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; };
-  glmmML = derive2 { name="glmmML"; version="1.0.2"; sha256="0ndvp7a7dxq6ygdwzq783ci1y0zb4xwnj6g4w1cm8zvqak8dxjdb"; depends=[]; };
+  glmmML = derive2 { name="glmmML"; version="1.0.3"; sha256="1svawi74rfir9czqyf194wmh4fw053n81j7prnanyfskrchkd94k"; depends=[]; };
   glmmTMB = derive2 { name="glmmTMB"; version="0.2.0"; sha256="1yqizxjapdh0n872d26bdgn8a04xc6647mnjhb40g0jj59qgmxrc"; depends=[lme4 Matrix nlme RcppEigen TMB]; };
-  glmmsr = derive2 { name="glmmsr"; version="0.2.1"; sha256="1f2q8zy3jy97y59bdyxhachkv5ndiwp71ihnspjbwz17mvc38cmn"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; };
-  glmnet = derive2 { name="glmnet"; version="2.0-13"; sha256="1zdqp6wnqxzp5qn2ky47phbkrxv3cpgbwmdp896h3xxjvp58sa7k"; depends=[foreach Matrix]; };
+  glmmsr = derive2 { name="glmmsr"; version="0.2.2"; sha256="05psf6yjsp3zgh7lfdh2pk1zycp7rgdk61ccm7059f60dzg182b9"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; };
+  glmnet = derive2 { name="glmnet"; version="2.0-16"; sha256="1brr51z1fzbpyj6myyir4g6dhbp6xwl7nx4xnvrjarnf5y0csk55"; depends=[foreach Matrix]; };
   glmnetUtils = derive2 { name="glmnetUtils"; version="1.1"; sha256="0abvxkwfadh56672qh16vql49js9ar8cz8is0bs6i8jgsl5csz91"; depends=[glmnet Matrix]; };
   glmnetcr = derive2 { name="glmnetcr"; version="1.0.3"; sha256="0w04m0q7w5xxm0yv14f2g1ykpy54pxzdplr0xcz9mn43wi4sl65a"; depends=[glmnet]; };
   glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; };
@@ -6830,7 +6960,7 @@ in with self; {
   globalboosttest = derive2 { name="globalboosttest"; version="1.1-0"; sha256="1k7kgnday27sn6s1agzlj94asww81655d2zprx6qg7liv677bxvf"; depends=[mboost survival]; };
   globals = derive2 { name="globals"; version="0.11.0"; sha256="17spygv9m3mmn01cfxrm05pvny5ddzvr78c60hixqbfh8385na5c"; depends=[codetools]; };
   globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; };
-  glogis = derive2 { name="glogis"; version="1.0-0"; sha256="19h0d3x5lcjipkdvx4ppq5lyj2xzizayidx0gjg9ggb1qljpyw9m"; depends=[sandwich zoo]; };
+  glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; };
   glpkAPI = derive2 { name="glpkAPI"; version="1.3.0"; sha256="0173wljx13jali2jxz4k5za89hc64n2j9djz5bcryrqhq4rmkp87"; depends=[]; };
   glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; };
   glue = derive2 { name="glue"; version="1.2.0"; sha256="0vi9y8ix95g6hjqdz9c9y4119apbdjcypdv0ag8cl6vaxqs5n9qr"; depends=[]; };
@@ -6840,8 +6970,8 @@ in with self; {
   gmapsdistance = derive2 { name="gmapsdistance"; version="3.3"; sha256="09vgrfv5dj0myys0rl767wn0xx1yvmm176c48812ysj2kj3fa29v"; depends=[RCurl XML]; };
   gmediation = derive2 { name="gmediation"; version="0.1.1"; sha256="0md4h298vqw67qrjcaia6xz8s7akdpcmxa83irm12qgbh56a5rpr"; depends=[MASS plyr VGAM]; };
   gmeta = derive2 { name="gmeta"; version="2.3-0"; sha256="1izfz6gkisa8rskhfka6q73rcgzwdsmkdhy79jwcaqk25jrwfk60"; depends=[BiasedUrn binom]; };
-  gmfd = derive2 { name="gmfd"; version="1.0"; sha256="1l6hf191v76l5p9f6r4qpq5y940nb23x07mb6lmwna8nnz1sspaz"; depends=[]; };
-  gmm = derive2 { name="gmm"; version="1.6-1"; sha256="0giq0ic7gdvglkjby217r70dbz9v0xnvzvzv6icqj0m3rxwarmn1"; depends=[sandwich]; };
+  gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; };
+  gmm = derive2 { name="gmm"; version="1.6-2"; sha256="0pbimp4g5hpi949m6dpwwds3a9dv2m4iwwg2gbqq1m62fs18hbxi"; depends=[sandwich]; };
   gmnl = derive2 { name="gmnl"; version="1.1-3"; sha256="05p2kikv8zz9ldc6xi5bz7fyinpd0sp2v82hxhx6h54hfa6i7b9v"; depends=[Formula maxLik mlogit msm plotrix truncnorm]; };
   gmodels = derive2 { name="gmodels"; version="2.16.2"; sha256="0zf4krlvdywny5p5hnkr0r0hync6dvzc9yy4dfywaxmkpna8h0db"; depends=[gdata MASS]; };
   gmp = derive2 { name="gmp"; version="0.5-13.1"; sha256="0xh9dli4i7hyjywsn2h780cxl3k7v0q421djyr1wshk7l9s5701g"; depends=[]; };
@@ -6896,6 +7026,7 @@ in with self; {
   gqlr = derive2 { name="gqlr"; version="0.0.1"; sha256="0qvyvy514ma5wi2qm6a8praqa7js9wl0hh0ack1hknw33g2gyqhy"; depends=[graphql jsonlite magrittr pryr R6]; };
   gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; };
   grImport = derive2 { name="grImport"; version="0.9-0"; sha256="1d8fd7502qj7cirjqdkr1qj51rylw2fz5hs06avfvc2dxs2xwfw1"; depends=[XML]; };
+  grImport2 = derive2 { name="grImport2"; version="0.1-4"; sha256="1hwx287pp936f0wbcicplwmhz96ip00wq09dp7bvz80lqcmr8nyx"; depends=[base64enc jpeg png XML]; };
   gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; };
   grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; };
   gradientPickerD3 = derive2 { name="gradientPickerD3"; version="0.1.0.0"; sha256="0b20iqfipr7migwk1fl4lvdf4ghprqivcgmchfshhr8q82hyd1q0"; depends=[htmlwidgets jsonlite shiny]; };
@@ -6903,8 +7034,9 @@ in with self; {
   granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; };
   granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
   grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; };
-  graphTweets = derive2 { name="graphTweets"; version="0.3.2"; sha256="13kab1nz85ghs5n882ss513di30b7lg72h676v37404ypj5a1vi1"; depends=[dplyr igraph reshape2]; };
+  graphTweets = derive2 { name="graphTweets"; version="0.4.0"; sha256="1zw04s61wjgrx6r6fspp59y5l3bfjf68klcrkp7alaap5dpjsn9a"; depends=[dplyr igraph magrittr purrr reshape2 rtweet splitstackshape]; };
   grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; };
+  graphframes = derive2 { name="graphframes"; version="0.1.0"; sha256="1h7dng6j2wizr14sl3f9lpvka56vd40rjs6skfdyxbn5s8ijmdd8"; depends=[sparklyr tibble]; };
   graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.1"; sha256="1z4x32ji71rq1x89r3wmjhm1fq7klggpz6c1cf45fvcd9qs6ykhk"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; };
   graphicsQC = derive2 { name="graphicsQC"; version="1.0-8"; sha256="12vg93xfmkv73i19vkb10q2qngmsxd3y42z3l6izdywbdc3cdfkg"; depends=[XML]; };
   graphkernels = derive2 { name="graphkernels"; version="1.4"; sha256="1dwk1bd2nx9kdzxq31cgynd75r7am49ygkaryb6iqcmva1wc5xs0"; depends=[igraph Rcpp RcppEigen]; };
@@ -6918,12 +7050,13 @@ in with self; {
   greport = derive2 { name="greport"; version="0.7-1"; sha256="1h1g3khb30n3y8l1sxpas2s6s667az4yxvsq42x5dfx8fic42p6n"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; };
   greta = derive2 { name="greta"; version="0.2.3"; sha256="10vli747b5a1m53qszxk91wppg9511la9yc823qrr51s92z8i222"; depends=[coda progress R6 reticulate tensorflow]; };
   grex = derive2 { name="grex"; version="1.7"; sha256="0bciyafqwx404axidz4dlj856mzy73ij5sifxhvbjnn07rx844c9"; depends=[]; };
+  greybox = derive2 { name="greybox"; version="0.2.0"; sha256="0d0d1c5whh94n678p07fnwn2xaqgv54qp1k1rkis72dgs8jbzm2n"; depends=[forecast zoo]; };
   greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; };
-  grf = derive2 { name="grf"; version="0.9.5"; sha256="0i3x5h19n3cq8mchm3zwg3rgr1ywknkghsk50m70zcjpb4cdbsj6"; depends=[Matrix Rcpp RcppEigen]; };
+  grf = derive2 { name="grf"; version="0.9.6"; sha256="0gv1zphjgwqssiljyqhhv6ggnvw9nyg7wf7sasilpy59qpi457wv"; depends=[DiceKriging Matrix Rcpp RcppEigen sandwich]; };
   gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; };
   gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; };
   gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; };
-  gridGraphics = derive2 { name="gridGraphics"; version="0.2-1"; sha256="1ly6fxnac9g5p3dwxfscz95whaxvc2r713fi36x526yhaayj7xwj"; depends=[]; };
+  gridGraphics = derive2 { name="gridGraphics"; version="0.3-0"; sha256="1p94flvq5h3x817pl1m0aj3sim87x6zdbpv9xrgdnqw3rxfzwgqs"; depends=[]; };
   gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; };
   gridSVG = derive2 { name="gridSVG"; version="1.6-0"; sha256="06nxp0h6clsfxcx5lf11sgzq7v4ijbynh6hldbnpm6pqwn18hb0j"; depends=[jsonlite XML]; };
   gridsample = derive2 { name="gridsample"; version="0.2.0"; sha256="0hpfhkma60h59z3akjqs7igs6zg00xs3jlq3sm48gxbjrk7fb5sm"; depends=[data_table deldir geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; };
@@ -6938,7 +7071,7 @@ in with self; {
   groupsubsetselection = derive2 { name="groupsubsetselection"; version="1.0.3"; sha256="118cj5xc8nbq4fs2gbzg1nhynixaflbl0si77gyy4ybw0drsz4nj"; depends=[]; };
   grove = derive2 { name="grove"; version="1.1"; sha256="0fqsj5dx7py7cin3hvfkxglh8v3x0dwj6cxy4h5vbddjl687db5x"; depends=[Rcpp RcppArmadillo wavethresh]; };
   growcurves = derive2 { name="growcurves"; version="0.2.4.1"; sha256="0h96c1hd6cdzc2l2a9dakmxn2hspvr0fpx9938iscm4hi9ds97m2"; depends=[Formula ggplot2 Rcpp RcppArmadillo reshape2]; };
-  growfunctions = derive2 { name="growfunctions"; version="0.13"; sha256="19ngsd326vws2f3wsrkcsyzn64fm9nnqvnbamfw6aal9xzzzz59m"; depends=[ggplot2 Matrix mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
+  growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; };
   growth = derive2 { name="growth"; version="1.1.0"; sha256="0d1hc56ybp5chckqv5q5jvpgbl7xn9dkbc4dd4sz5gawn1hngbxm"; depends=[rmutil]; };
   growthcurver = derive2 { name="growthcurver"; version="0.2.1"; sha256="0q70g940ggpwnx2cpq2j8ambfbj9sqw6ivyp9cya1nbn05bah9ds"; depends=[caTools minpack_lm]; };
   growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; };
@@ -6946,7 +7079,7 @@ in with self; {
   growthrates = derive2 { name="growthrates"; version="0.7.1"; sha256="0ci846jgshnvrvifl8snyax8ljs9n13lr42mzm89l0gpkg6lh2g0"; depends=[deSolve FME lattice]; };
   grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; };
   grplasso = derive2 { name="grplasso"; version="0.4-5"; sha256="15bqckq9qjdlllhfpb21vzgi9msbl544alkrz01w1vvb3hk1847y"; depends=[]; };
-  grpreg = derive2 { name="grpreg"; version="3.1-2"; sha256="042waw813jfc163376019zd7ngwrmrr26z17c2kw7ggvp1vz5m9q"; depends=[Matrix]; };
+  grpreg = derive2 { name="grpreg"; version="3.1-3"; sha256="0i5gxhjylva3aby933hydkdb8v842qfa4jgfs0pwim8xfr2ipjs7"; depends=[Matrix]; };
   grpregOverlap = derive2 { name="grpregOverlap"; version="2.2-0"; sha256="1kq8wxpx21irwckndgfkzdy5jgzf7pmcwpclmjzjxznv6cyaikd0"; depends=[grpreg Matrix]; };
   grpss = derive2 { name="grpss"; version="3.0.1"; sha256="01bjjhv3vkvn5h363g5a9dlm7kzq10q7ixmrc0kkq5hsbs31vl3x"; depends=[doParallel foreach grpreg MASS]; };
   grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; };
@@ -6956,6 +7089,7 @@ in with self; {
   gsalib = derive2 { name="gsalib"; version="2.1"; sha256="1k3zjdydzb0dfh1ihih08d4cw6rdamgb97cdqna9mf0qdjc3pcp1"; depends=[]; };
   gsarima = derive2 { name="gsarima"; version="0.1-4"; sha256="1ay3iamnvg7mbnl1xaxxcyic559bdnfspy883w2bwgy20yhr34yg"; depends=[MASS]; };
   gsbDesign = derive2 { name="gsbDesign"; version="1.00"; sha256="1kbwlpxbr70aagx9jkap9xlw13r1k3y630b08wmmny421sv4zhxl"; depends=[gsDesign lattice]; };
+  gscounts = derive2 { name="gscounts"; version="0.1-1"; sha256="1x2irpp0jxninijdhsiw12j19c5yq9kljv48j81sp3k97s2f9vbd"; depends=[Rcpp]; };
   gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; };
   gsg = derive2 { name="gsg"; version="2.0"; sha256="17fjl7aw1s814krnszxd4y1d4210bnkrf4kb2fwsycqwcwms5pm7"; depends=[boot mgcv mvtnorm numDeriv]; };
   gsheet = derive2 { name="gsheet"; version="0.4.2"; sha256="1mfpg91855qg0bi6wk0wy58b58lm06jw9fqdl6psqdvnmaf7n2w5"; depends=[httr stringr]; };
@@ -6964,10 +7098,10 @@ in with self; {
   gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; };
   gsmoothr = derive2 { name="gsmoothr"; version="0.1.7"; sha256="00z9852vn5pj04dhl3w36yk0xjawniay6iifw1i7fd8g98mgspxp"; depends=[]; };
   gsrsb = derive2 { name="gsrsb"; version="1.0.3"; sha256="1r4pc3zcmgwxbsmpwb6m24mmy0p78nq35bigjqvwcc32imyw4ls9"; depends=[ldbounds mvtnorm xtable]; };
-  gss = derive2 { name="gss"; version="2.1-7"; sha256="1nrs1yhf2h06pkkhkvaal92h0mzrwixs0pay6dkb8q2d9igbn184"; depends=[]; };
+  gss = derive2 { name="gss"; version="2.1-8"; sha256="1g44214kbgx4gafcz482iyy3izzv2cfp6v6yqfggp6lkvn6wwv0p"; depends=[]; };
   gsscopu = derive2 { name="gsscopu"; version="0.9-3"; sha256="0bvhhs5wn4y1dcff2g87f80jdn3i4mdbvdbydsbx80ng38rfxhhg"; depends=[gss]; };
-  gstat = derive2 { name="gstat"; version="1.1-5"; sha256="1wfzffl0wfimb93d5ln96yhv2g64aywzmh6hdaadl8qyqx6rx7q3"; depends=[FNN lattice sp spacetime zoo]; };
-  gsubfn = derive2 { name="gsubfn"; version="0.6-6"; sha256="196x4c3ihf4q3i0v7b1xa6jm8jjld2rsx00qz03n90wfnjdx5idv"; depends=[proto]; };
+  gstat = derive2 { name="gstat"; version="1.1-6"; sha256="0snvga824v1kbd3xp46652bv6drfrgkjsi5zrbdcliqpqz79wk9f"; depends=[FNN lattice sp spacetime zoo]; };
+  gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; };
   gsw = derive2 { name="gsw"; version="1.0-5"; sha256="0lv4x4is53xybgg205dncizpnqnakqk47b5wgys2kr4ixqc8jipb"; depends=[testthat]; };
   gsynth = derive2 { name="gsynth"; version="1.0.6"; sha256="0fzdlflrl9qlvbzjdspws3naabwyphwqys01wp4wkw5y7whq0mar"; depends=[abind doParallel foreach GGally ggplot2 mvtnorm Rcpp RcppArmadillo]; };
   gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; };
@@ -6996,10 +7130,12 @@ in with self; {
   gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; };
   gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; };
   h2o = derive2 { name="h2o"; version="3.16.0.2"; sha256="181rm5y7wwmpzi45sy62blr6jk9wfbs3j14ansmh7ad1rbml3zm3"; depends=[jsonlite RCurl]; };
+  h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; };
   h5 = derive2 { name="h5"; version="0.9.9"; sha256="14p7i1sj24ky87kd7qr3n9fc9l64s0bp0rwbyl6i2x69xn75gpsx"; depends=[Rcpp]; };
   hBayesDM = derive2 { name="hBayesDM"; version="0.5.0"; sha256="174z98jvi04df04lpdxh3j8lmjvgrg287nxfnrcvjkibc0jiss4m"; depends=[ggplot2 loo Rcpp rstan rstantools]; };
   hIRT = derive2 { name="hIRT"; version="0.1.2"; sha256="0pqp6bycr13di1hbi5sqnkiannz2hyg0ysshswv2i9fp0vkhdhqf"; depends=[pryr rms]; };
-  hR = derive2 { name="hR"; version="0.1.1"; sha256="18a9nhnsw7va1ambj2lc99ralhildc3a2l6xpilfanig4pg7cq08"; depends=[data_tree reshape2 visNetwork]; };
+  hNMF = derive2 { name="hNMF"; version="0.5"; sha256="1nm9sy921fjzqc60p0mf6k0j5a56bdrd8hnghnpaqzs244mm08bj"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; };
+  hR = derive2 { name="hR"; version="0.1.3"; sha256="0s7c2aiq58c2zmv25m42cxp5chzkp5grz5bjqrknfkwjy21679h1"; depends=[data_tree reshape2]; };
   hSDM = derive2 { name="hSDM"; version="1.4"; sha256="1jq6hdnyv446ng62srip0b48kccf0qw3xqym3fprg74mjdy3inqr"; depends=[coda]; };
   haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; };
   hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; };
@@ -7007,7 +7143,7 @@ in with self; {
   hansard = derive2 { name="hansard"; version="0.6.0"; sha256="13h68b300c4lkqbl5gw4hkqcbb2ikvan4hx8092ds995514rg4x8"; depends=[dplyr httr jsonlite lubridate stringi tibble tidyr]; };
   hapassoc = derive2 { name="hapassoc"; version="1.2-8"; sha256="0qs5jl0snzfchgpp6pabncwywxcmi743g91jvjiyyzw0lw85yv4s"; depends=[]; };
   haplo_ccs = derive2 { name="haplo.ccs"; version="1.3.1"; sha256="0cs90zxxbvglz1af0lh37dw1gxa04k0kawzxamz2was3dbh19lbz"; depends=[haplo_stats survival]; };
-  haplo_stats = derive2 { name="haplo.stats"; version="1.7.7"; sha256="1rag22sqy8r87w5a1dww5cxknacm6975bpp74vw9zr04ldx4c64k"; depends=[rms]; };
+  haplo_stats = derive2 { name="haplo.stats"; version="1.7.9"; sha256="19kxascqq5qz0zdxx0w837ji207y1z2ggxkl4vmlbay03k2dw2mx"; depends=[rms]; };
   haploR = derive2 { name="haploR"; version="1.6.2"; sha256="0xzh18170gxxd91yjvh2j3a8jkkz8hyf5rbvh4c9vfi5zirbi82z"; depends=[httr plyr RUnit tibble XML]; };
   haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; };
   haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; };
@@ -7029,7 +7165,7 @@ in with self; {
   hbdct = derive2 { name="hbdct"; version="1.0.1"; sha256="1lmbhl757hdswfq3skwbwsgxpfgim8475d9hk511dbwrzcm6wsxr"; depends=[]; };
   hbim = derive2 { name="hbim"; version="1.0.3"; sha256="1480nydsi2xj7zbfk4zw24mhsjadf83d827kpqzbmn0yh6srp3ps"; depends=[mvtnorm]; };
   hbm = derive2 { name="hbm"; version="1.0"; sha256="0qz28azm91a6pbss1mfc47a21d3q9rs3mmw0kgwc7i2a2m43mysm"; depends=[doParallel foreach Matrix]; };
-  hbmem = derive2 { name="hbmem"; version="0.3"; sha256="0ylxp77ack874sadwfnry84a6bg8gdl9xbw821lp5q05nnyg0dcj"; depends=[]; };
+  hbmem = derive2 { name="hbmem"; version="0.3-3"; sha256="1rajd5h9gp0rrpc0q0m0fx37mv2n70da3gnfvvnjc5a77mzfyqkp"; depends=[]; };
   hbsae = derive2 { name="hbsae"; version="1.0"; sha256="1iwmpi0pn5fxyxkwqkbmy6w1f1wcx0p809jnviim0ypwib32mhh7"; depends=[arm Matrix]; };
   hcc = derive2 { name="hcc"; version="0.54"; sha256="14b3pamkywb0wsjpbm0wpflcds0b5mfymvgk92rmf6ngz1bkpdbq"; depends=[]; };
   hcci = derive2 { name="hcci"; version="1.0.0"; sha256="11piy1ajg3j3dbh66szzf7lhc3x28fz75ai39vlx0gl5nc2v5zs5"; depends=[]; };
@@ -7041,7 +7177,7 @@ in with self; {
   hdi = derive2 { name="hdi"; version="0.1-6"; sha256="1lzy4jcz14j1qi6z4j1sq7z3z75n8jygnzlvqjf45vn1sqil17cq"; depends=[glmnet linprog MASS scalreg]; };
   hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; };
   hdm = derive2 { name="hdm"; version="0.2.3"; sha256="0nj7pbkygzbiraw1b3pqv3bnkjhi1a0h48q0zgkcq8y79kj2f8cl"; depends=[checkmate Formula ggplot2 glmnet MASS]; };
-  hdme = derive2 { name="hdme"; version="0.1.0"; sha256="1wq4kl7dc853v8v1wgihayrd50x5asx5r190lq6flm2ssqd1m6nm"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; };
+  hdme = derive2 { name="hdme"; version="0.1.1"; sha256="0p8qldiiqbd2vyxyrgz0dsh7n2dw5vbvqfqy6z5vkjl52wdggp7z"; depends=[ggplot2 glmnet Rcpp RcppArmadillo Rdpack Rglpk]; };
   hdnom = derive2 { name="hdnom"; version="4.9"; sha256="11yzjfp6b4apn0nyqmi0qm5rd8xy49w6hwwiq7p566mxqy32i2j2"; depends=[foreach ggplot2 glmnet gridExtra ncvreg penalized rms survAUC survival]; };
   hdpca = derive2 { name="hdpca"; version="1.0.0"; sha256="1sv7caw4nhpcvsb7fxpvf2b5zskvfsv004hrqc51b5jx4fsc7y92"; depends=[boot lpSolve]; };
   hdrcde = derive2 { name="hdrcde"; version="3.2"; sha256="1901mg2k2ch9fzn1n9k0kmxkgd1m4pxvrda7mv0mp64nf4mx43xw"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; };
@@ -7060,9 +7196,9 @@ in with self; {
   hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; };
   helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; };
   helsinki = derive2 { name="helsinki"; version="0.9.29"; sha256="0bn5iyxjn9qs6f0dmhv51ssayywbx1rayh80zbzk0gsm94nhs0d9"; depends=[maptools RCurl rjson sp]; };
-  heplots = derive2 { name="heplots"; version="1.3-4"; sha256="0qrx2qiy5w1hdy48ipa5is3k6dmz9gnfk5pckqpxp3hd0ip3217f"; depends=[car MASS]; };
+  heplots = derive2 { name="heplots"; version="1.3-5"; sha256="1vyhfkp66gi17jni3gsbv9kn1s0n00qigr13q8xbzbgylz5jjiln"; depends=[car MASS]; };
   here = derive2 { name="here"; version="0.1"; sha256="1vb5dxqdpimy51q1gjsypyq14p2hhvj7wsvh6g35pj1g03cyg9av"; depends=[rprojroot]; };
-  hergm = derive2 { name="hergm"; version="3.1-0"; sha256="17mxn2ff7yzj95vjsppvz7c9a5g6a2z9zyf34xvvxp9031zhrf46"; depends=[ergm latentnet mcgibbsit network sna]; };
+  hergm = derive2 { name="hergm"; version="3.2-0"; sha256="0yy684vjlk06r0bsx7clpjaj05q0pmbj006kbh9q6rysh35nf9p3"; depends=[ergm latentnet mcgibbsit network sna]; };
   heritability = derive2 { name="heritability"; version="1.2"; sha256="18snrfsjj5jw5qicj92d5qch9v4ciqw1hbiwg6q8kfjka9nmqpma"; depends=[MASS]; };
   hermite = derive2 { name="hermite"; version="1.1.1"; sha256="0ns8l1rf346qxalfdwc7ny0kjp212f6qnnlgillpyvd8k29kg8iy"; depends=[maxLik]; };
   hesim = derive2 { name="hesim"; version="0.1.0"; sha256="002phncl1glv3c3gwp9ifpk56j06rka26a3774xlj3zcs6izglns"; depends=[data_table Rcpp RcppArmadillo]; };
@@ -7082,12 +7218,13 @@ in with self; {
   hglm_data = derive2 { name="hglm.data"; version="1.0-0"; sha256="1hrq1jac658z5xjsg03nfkb4kwm9z44bhciv5chk74ww8gjr9j9q"; depends=[MASS Matrix]; };
   hgm = derive2 { name="hgm"; version="1.17"; sha256="11hv4pfv3gqiargvwvrxqzfji75j291w1nilawf8yjc3isnc4wjp"; depends=[deSolve]; };
   hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; };
+  hhi = derive2 { name="hhi"; version="1.1.0"; sha256="0f0b6a2zr2nipcx4p8n2wx088kndh6bd150f80619kjfizr55x2d"; depends=[ggplot2]; };
   hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; };
   hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; };
   hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; };
   hier_part = derive2 { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; };
   hierDiversity = derive2 { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; };
-  hierNet = derive2 { name="hierNet"; version="1.6"; sha256="08lifk92caa4l9nfb89rl6vby8sd1ba3ay7z29ffirsg7cx07qiw"; depends=[]; };
+  hierNet = derive2 { name="hierNet"; version="1.7"; sha256="1yjsbi17qkz7x9q9x6i8312skwf4gjyisp2096wbg9s19dzvccvi"; depends=[]; };
   hierarchicalDS = derive2 { name="hierarchicalDS"; version="2.9"; sha256="0ckxy4pww5iik4m4kqs714f00g7lfzsarjdbpd0bcalvq4lmaal2"; depends=[coda ggplot2 Matrix mc2d mvtnorm rgeos truncnorm xtable]; };
   hierarchicalSets = derive2 { name="hierarchicalSets"; version="1.0.2"; sha256="0m5mnx1zmiscj0k1gnljr7fla4y1qhysi32a8q9jlah2q7grk7x9"; depends=[ggdendro ggplot2 gtable MASS Matrix RColorBrewer Rcpp scales]; };
   hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; };
@@ -7103,6 +7240,7 @@ in with self; {
   highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; };
   highr = derive2 { name="highr"; version="0.6"; sha256="0n9v44dxdy5fhkdmpbpa2p78whyd9z3rhhy42ipdz5m5vsr55qa3"; depends=[]; };
   highriskzone = derive2 { name="highriskzone"; version="1.4-2"; sha256="1q9y34nj73kg5y6qy4kb023vyzbdb0f6x23asq20bj5pmz2l25y1"; depends=[deldir fields ks Matrix mvtnorm rgeos spatstat]; };
+  higrad = derive2 { name="higrad"; version="0.1.0"; sha256="0q9av8qyvmvgy6a3l7svcmbkjjgnp4iny1cld4g3qsbaz3yp3jaj"; depends=[Matrix]; };
   hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; };
   hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; };
   hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; };
@@ -7120,7 +7258,7 @@ in with self; {
   hmeasure = derive2 { name="hmeasure"; version="1.0"; sha256="0wr0xq956glmhvy4yis3qq7cfqv9x82ci9fzx3wjvaykd16h0sx9"; depends=[]; };
   hmi = derive2 { name="hmi"; version="0.9.10"; sha256="1swbzxykf4mwgahadi5l1xy06h4ivpc4gq3izshg6fvgrapbg1r5"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm tmvtnorm VGAM]; };
   hmm_discnp = derive2 { name="hmm.discnp"; version="0.2-4"; sha256="096flx2b9s66dasqj05zrkxsmg3lj6j5w0pwrw3b1qkpp9dvlrkb"; depends=[]; };
-  hmmm = derive2 { name="hmmm"; version="1.0-3"; sha256="0yjx5i13jbv7vzxn84m6305124ri7jnym0bxbdj46s6l7lw025a9"; depends=[MASS mvtnorm quadprog]; };
+  hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; };
   hms = derive2 { name="hms"; version="0.4.2"; sha256="1g6hslk3z0xga38r71irxq802wskg6nv804mp8y9f7i2wfrj0y55"; depends=[pkgconfig rlang]; };
   hnp = derive2 { name="hnp"; version="1.2-4"; sha256="14w2n95pgi5h71fag4ndrc82z7q26za99vj5z99rv19l5jkvmd46"; depends=[MASS]; };
   hoa = derive2 { name="hoa"; version="2.1.4"; sha256="15klcpmja4afwmpfxrxgrfis0vj7fil8k15jc3p0lqz3dhvq0dvf"; depends=[statmod survival]; };
@@ -7137,6 +7275,7 @@ in with self; {
   hopbyhop = derive2 { name="hopbyhop"; version="2.1"; sha256="0j4m1zz0ijf1kw2m12g7bww3418b8pyjvvrzkm8xcryjil2xfmim"; depends=[]; };
   horizon = derive2 { name="horizon"; version="1.0"; sha256="1wrp5qr1qql21xwcjh415q67z2ym4790zfp0n81360v6bp2b3hyy"; depends=[raster]; };
   hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; };
+  horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; };
   horseshoe = derive2 { name="horseshoe"; version="0.1.0"; sha256="19khsr7gfcygqasjswvm0v0ddna1i1grfbhars8jlvybfawswhgx"; depends=[]; };
   hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; };
   hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; };
@@ -7150,7 +7289,7 @@ in with self; {
   hrbrthemes = derive2 { name="hrbrthemes"; version="0.1.0"; sha256="1hf4370hj80m6zr20236p9068g6ky0366gfk5l9hnj6l8jpmy9qa"; depends=[extrafont ggplot2 hunspell purrr scales stringi]; };
   hsdar = derive2 { name="hsdar"; version="0.7.0"; sha256="09yx8zc9qbf2kj8k76z9a6rhh5zy4ggsxvwhx35666phdml42dy0"; depends=[caret raster rgdal signal]; };
   hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; };
-  hsm = derive2 { name="hsm"; version="0.1"; sha256="1dacsq2f23bz94rh4s3477hs38pbrpz2lis4s1l9im894bcbny1x"; depends=[]; };
+  hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; };
   hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; };
   hsphase = derive2 { name="hsphase"; version="2.0.1"; sha256="1z7yxbknldxn780dxw9xz984b3i8pj5hmdnbynvxc5k0ss8g7isy"; depends=[Rcpp RcppArmadillo snowfall]; };
   htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; };
@@ -7159,21 +7298,22 @@ in with self; {
   htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; };
   htmltidy = derive2 { name="htmltidy"; version="0.4.0"; sha256="090rj1fzdsa8m4g33d4mx92dm8afh173i4hqa4zym8c909jwh9qn"; depends=[htmltools htmlwidgets Rcpp XML xml2]; };
   htmltools = derive2 { name="htmltools"; version="0.3.6"; sha256="18k8r1s8sz1jy7dkz35n69wj20xhmllr53xmwb4pdzf2z61gpbs4"; depends=[digest Rcpp]; };
-  htmlwidgets = derive2 { name="htmlwidgets"; version="1.0"; sha256="09lkmzh35l1420sg0dyh4vgyishqx3g8xmgs2y9z7lbi09xgwwwr"; depends=[htmltools jsonlite yaml]; };
-  htree = derive2 { name="htree"; version="0.1.1"; sha256="1ns7yzzxapax5f355bpq81i581l1iwrfixp1k69n8mzsy106i988"; depends=[]; };
-  hts = derive2 { name="hts"; version="5.1.4"; sha256="0n1gna2694yih5kaiw59crdlfcdfm9dqhjpkcwaskgrpmh08wnkd"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; };
+  htmlwidgets = derive2 { name="htmlwidgets"; version="1.2"; sha256="04c4d0mfcy3dkdlbxnaccpdgxvyxfdwfmmh5djim6v9hyg0j2z8s"; depends=[htmltools jsonlite yaml]; };
+  htree = derive2 { name="htree"; version="1.0.0"; sha256="1yw29rk752g3sc50igcgnxfsp7ydcmrlwpacch5c8yjg5di06ymb"; depends=[]; };
+  hts = derive2 { name="hts"; version="5.1.5"; sha256="0mvsxrk7wkfn81hbk8a80fckiqiwdbvhq42k7c6lm69gamnbak2f"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; };
   httk = derive2 { name="httk"; version="1.8"; sha256="1snwqqvacxgl4cyadx5la87xh4kxiqpdmyq4szqz5r1aq2sxrr03"; depends=[data_table deSolve msm mvtnorm survey truncnorm]; };
   httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; };
   httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; };
   httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; };
   httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; };
   httptest = derive2 { name="httptest"; version="3.0.0"; sha256="1k75i84ajka0abc8x51w74dldb0z9i08dlqbkcdby25465k01l8r"; depends=[digest httr jsonlite testthat]; };
-  httpuv = derive2 { name="httpuv"; version="1.3.6.2"; sha256="0h3hkw575b211bxma23inbq1565wkhiapgasd539h219apqs534f"; depends=[Rcpp]; };
+  httpuv = derive2 { name="httpuv"; version="1.4.0"; sha256="076blaj0vzwfgx212lvgscczmiy9n13izdshrm6xb9vpcmklm95m"; depends=[BH later promises Rcpp]; };
   httr = derive2 { name="httr"; version="1.3.1"; sha256="0n7jz2digbgv48rbr9vmzv4vmf4rahl9jjy31izs7sxj4rs4s4r2"; depends=[curl jsonlite mime openssl R6]; };
   hues = derive2 { name="hues"; version="0.1"; sha256="0b6y4ld242fqzx4ccxzk4i4zbx7myk7v3a03r0klgbh2mmw3ixm0"; depends=[colorspace]; };
   huge = derive2 { name="huge"; version="1.2.7"; sha256="134d951x42vy9dcmf155fbvik2934nh6qm2w5jlx3x2c6cf7faq4"; depends=[igraph lattice MASS Matrix]; };
   humanFormat = derive2 { name="humanFormat"; version="1.0"; sha256="0zwjbl8s5dx5d57sfmq6myc6snximc56zl88h8y1s1jqphyn9sir"; depends=[testthat]; };
   humaniformat = derive2 { name="humaniformat"; version="0.6.0"; sha256="0vaynjzz57pk4y1liag9lpn9jkag2033a6bkn28zzm7ndg3344l6"; depends=[Rcpp]; };
+  humanize = derive2 { name="humanize"; version="0.2.0"; sha256="0hhhd640n77s8xaa2gbd9fckdk2yjg68gdb7wjy56a2khzqfssxr"; depends=[assertthat glue lubridate]; };
   humanleague = derive2 { name="humanleague"; version="2.0.2"; sha256="1svsqfqisywf0iqf3mrh4xnssvjmml6wn7l8iq5shvpmw71l4nnl"; depends=[curl Rcpp]; };
   humidity = derive2 { name="humidity"; version="0.1.1"; sha256="0ifxjz7216ld5c4kc9vs83fcijbg5i2z0mwfzszch9j1s734yc8y"; depends=[]; };
   hunspell = derive2 { name="hunspell"; version="2.9"; sha256="10186544s6nyd2ba470idxrxsl788dkmr1g1ri8x2n1lky9zmrik"; depends=[digest Rcpp]; };
@@ -7192,13 +7332,12 @@ in with self; {
   hydroPSO = derive2 { name="hydroPSO"; version="0.3-4"; sha256="12md94g78m7m1np36sadx0wxpb149pn5gd8yj2kw7fphb8g6a218"; depends=[Hmisc lattice lhs sp zoo]; };
   hydroTSM = derive2 { name="hydroTSM"; version="0.5-1"; sha256="053id9ldr10mafww3vas9fiy16lz0n1mqqfg6wjsbm5r15jkz3ha"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; };
   hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; };
-  hydrolinks = derive2 { name="hydrolinks"; version="0.7.1"; sha256="1yghqn5wvwx2s1lqjh8pi051hki5f9glhaqnrnjlx4bbsirf3hv7"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; };
-  hydroscoper = derive2 { name="hydroscoper"; version="0.1.0"; sha256="06w3rzdv0cjyk5pfx6ji1hkjf23pfd2z0aigyynj7ajbqfxmibna"; depends=[readr stringi stringr XML]; };
+  hydrolinks = derive2 { name="hydrolinks"; version="0.10.0"; sha256="0004a03bx9l9wq6zdz5az41rjxv1ka4qmnxk6ksy8i7365wsay88"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; };
+  hydroscoper = derive2 { name="hydroscoper"; version="1.0.0"; sha256="09dcn2wfd06waxzq8cv8lxyw07kavjp30qc2czn2gamrak8xvrl9"; depends=[jsonlite pingr plyr readr stringi stringr tibble]; };
   hydrostats = derive2 { name="hydrostats"; version="0.2.5"; sha256="1n0wy8i1cfsgmqh898qi0qnqn4qx1srjvd05vmsf9qmhpnnyqw5m"; depends=[]; };
   hyfo = derive2 { name="hyfo"; version="1.3.9"; sha256="03f3irmhndwfnv4i121gwxb2yv1868pggzyr80pgp4969qzddacm"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; };
   hyper_fit = derive2 { name="hyper.fit"; version="1.0.3"; sha256="17f5i2i960796hl92y7ci9ffspway435r02kw1zk91lvfn927hng"; depends=[LaplacesDemon magicaxis MASS rgl]; };
   hyper2 = derive2 { name="hyper2"; version="1.0-1"; sha256="107cp6na0srqax42fmvcsrviy631hg6phqmkc0cxz1zdxxxw6442"; depends=[partitions Rcpp]; };
-  hyperSMURF = derive2 { name="hyperSMURF"; version="1.1.4"; sha256="0mqymg4326cjvcz9qvlfdsydfqgd6szfzy89llr5mwz2s3arnv6j"; depends=[doParallel foreach iterators randomForest unbalanced]; };
   hyperSpec = derive2 { name="hyperSpec"; version="0.99-20171005"; sha256="0rhn9f4faxscwrip14ndymaddc5nfd6pyrhgwkwm8hf680wdrhbl"; depends=[ggplot2 lattice latticeExtra testthat]; };
   hypercube = derive2 { name="hypercube"; version="0.1.0"; sha256="0iv3cfs636mwijm2rjk427izf0gk5lh2fknd7bmb8pd188ckwqmf"; depends=[stringr]; };
   hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; };
@@ -7236,6 +7375,7 @@ in with self; {
   iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; };
   iRepro = derive2 { name="iRepro"; version="1.0"; sha256="1knncn47pl411r31z1r5ipsiyagcpjbc2gb972n7l3539pcpf0zy"; depends=[]; };
   iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; };
+  iTOP = derive2 { name="iTOP"; version="1.0.1"; sha256="1cjrbjrpfm27widw466kgkl5xlbyjf7ipk8ki8mfn3lqp9r2f3rc"; depends=[corpcor Matrix]; };
   iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; };
   iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; };
   iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; };
@@ -7251,7 +7391,6 @@ in with self; {
   ic50 = derive2 { name="ic50"; version="1.4.2"; sha256="1a5ddmbdfr3ls132fvalbkh4yaawv9k58rgpy54s5qddrm6aas2s"; depends=[]; };
   icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; };
   ica = derive2 { name="ica"; version="1.0-1"; sha256="1bkl4a72l0k6gm82l3jxnib898z20cw17zg81jj39l9dn65rlmcq"; depends=[]; };
-  icaOcularCorrection = derive2 { name="icaOcularCorrection"; version="3.0.0"; sha256="1vmvarc2apipd0vlhprc5wpgh8i38m5myj1gqdymjrnky0azq17f"; depends=[fastICA mgcv]; };
   icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; };
   icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; };
   icarus = derive2 { name="icarus"; version="0.3.0"; sha256="1656bz0av59dpgndibn0bc5zr9zka9pmw7qmhjz2b956bh7sh4ag"; depends=[]; };
@@ -7261,22 +7400,22 @@ in with self; {
   icenReg = derive2 { name="icenReg"; version="2.0.7"; sha256="1fc6l3mqnm4rcg49bk2plfa011g7nay71gzd4nxnjisifmw6qi2s"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; };
   icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; };
   icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; };
-  icesAdvice = derive2 { name="icesAdvice"; version="1.4-0"; sha256="0ra25g6am75qh32rfjps59x31zwav98k5d4nf6gbam98cr7vr5h3"; depends=[]; };
+  icesAdvice = derive2 { name="icesAdvice"; version="1.4-1"; sha256="0vhp4mh3isxibxr1i05vlxvrz53ni83s5khjvnk8i20dcri0501g"; depends=[]; };
   icesDatras = derive2 { name="icesDatras"; version="1.2-0"; sha256="0arkn9ma03qb21sv5chmz5fj65da5ivqhvrg8bqibbky8zkix1vh"; depends=[]; };
   icesSAG = derive2 { name="icesSAG"; version="1.3-2"; sha256="1w3v10qjs9jyn7dp6vsv8hyax8mn2b8y5afba4lcpzh0p8d2yzpm"; depends=[httr icesVocab openssl png xml2]; };
-  icesTAF = derive2 { name="icesTAF"; version="1.5-0"; sha256="19xg24k4fz64ki8mxf9g0r49syqh97a98dfb9zgiga3da3f2rk4w"; depends=[httr]; };
+  icesTAF = derive2 { name="icesTAF"; version="1.5-1"; sha256="0sj9wswpaxch195rnwav2qbk2f25xc2kdzf9xr6p8l0adxnijmki"; depends=[httr]; };
   icesVocab = derive2 { name="icesVocab"; version="1.1-2"; sha256="15ha2visv44pphkahg766afafh6467lwznvppwkvqjrbfiijkc6l"; depends=[XML]; };
   icmm = derive2 { name="icmm"; version="1.1"; sha256="1w9f1rniz67rrvq0akc64s5433ddmr2cgbcljil4c58yyz8hinx8"; depends=[EbayesThresh]; };
   icosa = derive2 { name="icosa"; version="0.9.81"; sha256="05gpiksncdi536f4py7szfi6myny1gqj8i0hsgpma7cfcm3npn0l"; depends=[igraph raster Rcpp rgdal rgl sp]; };
   icpsrdata = derive2 { name="icpsrdata"; version="0.3.0"; sha256="17sprbbi8fmvcp8d7hwrxl5amg0j036wq483cw62zbmni3p3fl82"; depends=[httr purrr rvest]; };
-  icr = derive2 { name="icr"; version="0.5.2"; sha256="1qmr6sc56v7ywy01f2mdhdxv2yp6rnwhbq347lfhb4ikhax3znpy"; depends=[ggplot2 Rcpp reshape2]; };
+  icr = derive2 { name="icr"; version="0.5.3"; sha256="178j4xyaxkzi6fxajw5qkab9ifabaj3lvhk2qqipb6n5p68cd9bn"; depends=[ggplot2 Rcpp reshape2]; };
   icsw = derive2 { name="icsw"; version="0.9"; sha256="0lmq9l9sy0fz3yjj2sj8f19iy26913caibf7d9zb9w9n6cqskvlx"; depends=[]; };
   idar = derive2 { name="idar"; version="1.0"; sha256="1yfv3na4rcldkpzybf7la227z4ynsl1scrziirl5gp072k7zrs01"; depends=[ape FD picante spatstat]; };
   idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; };
-  idbr = derive2 { name="idbr"; version="0.2"; sha256="1hhwn93arkzqs5ns9ll7rwqq5gyngixbicly9asw0dgjn12n5p7x"; depends=[countrycode dplyr httr jsonlite]; };
+  idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; };
   idealstan = derive2 { name="idealstan"; version="0.2.7"; sha256="1818vwlv5cr6qyg7p6kgyb996n89d2xr4cy6ys9pdhrp7lip9prr"; depends=[bayesplot BH dplyr ggplot2 lazyeval Rcpp RcppEigen rlang rstan rstantools shinystan StanHeaders stringr tidyr]; };
   idefix = derive2 { name="idefix"; version="0.2.4"; sha256="0j64pmccg01lscvjg9z97ypv3svl4jbvs4819jn4kc9ni6gq4fai"; depends=[dplyr gtools MASS maxLik Rdpack scales shiny]; };
-  idem = derive2 { name="idem"; version="3.0"; sha256="15k6gk3v2hijdfabc1c2xabm5v84hgs0p9lpddrpir3h5jzilr3i"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; };
+  idem = derive2 { name="idem"; version="3.5"; sha256="1fr456drfnla917byw0c8ppqrhq4i7gsd4idfasx6xx5fqhv7ypc"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders survival]; };
   idendr0 = derive2 { name="idendr0"; version="1.5.3"; sha256="11c12d166bp2i498d8y6ipg5jhz1xsdsrmnhjqnrqqzp9avvrsjp"; depends=[tkrplot]; };
   identity = derive2 { name="identity"; version="0.2-1"; sha256="1j5wb5cj5j49in2g6r1shdm4ri4cfzj22hpqazvcmq4dm291sdi9"; depends=[]; };
   ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; };
@@ -7302,7 +7441,8 @@ in with self; {
   igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; };
   iheatmapr = derive2 { name="iheatmapr"; version="0.4.3"; sha256="0124d7h8n83zb5kvvavccprlqknpqrd634zv7sz9s915xzhp7jgz"; depends=[fastcluster ggdendro htmlwidgets jsonlite knitr magrittr plyr RColorBrewer S4Vectors scales]; };
   ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; };
-  ijtiff = derive2 { name="ijtiff"; version="0.3.0"; sha256="1c5pamxjmipgmqipnf0gg4yx7i0hjrb80c0mb2sjab4v05finz55"; depends=[checkmate fields filesstrings magrittr purrr Rcpp readr RSAGA stringr]; };
+  iilasso = derive2 { name="iilasso"; version="0.0.1"; sha256="08d5j0dvi8k0hzn4xn4nzplc1fliqz11jd9i4pfj80ggl5dmc2x1"; depends=[BH Matrix Rcpp]; };
+  ijtiff = derive2 { name="ijtiff"; version="1.1.0"; sha256="0hb201qcwynbdi2fzspvv9sdhyx0cypbsvhawhcwj5zqdp6f507f"; depends=[checkmate fields filesstrings magrittr purrr Rcpp readr rlang stringr]; };
   iki_dataclim = derive2 { name="iki.dataclim"; version="1.0"; sha256="1yhvgr8d3j2r8y9c02rzcg80bz4cx58kzybm4rch78m0207wqs7p"; depends=[climdex_pcic lubridate PCICt zoo]; };
   ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; };
   imPois = derive2 { name="imPois"; version="0.1.4"; sha256="07350zly4fyx2sf9cqpfpyy8l5kn96z49kzym81p2bmhq66d408h"; depends=[geometry rgl]; };
@@ -7313,9 +7453,10 @@ in with self; {
   imbalance = derive2 { name="imbalance"; version="1.0.0"; sha256="1pfhwf4844m0a8qsm852am63x18vlkbs6m1s9izrpd219616skpr"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; };
   imfr = derive2 { name="imfr"; version="0.1.5"; sha256="1f4zynra79h42dmd9qhg67wwvs7c640f5is98bq30fdphiybihgz"; depends=[dplyr httr jsonlite]; };
   imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; };
+  iml = derive2 { name="iml"; version="0.3.0"; sha256="0jz3gw45lyb4ddw9pdfj797aipha2bwcmqrf7dyxx0ga3cfxv7ay"; depends=[checkmate data_table ggplot2 glmnet Metrics partykit R6]; };
   immer = derive2 { name="immer"; version="0.8-5"; sha256="181mp407vy2ij35ggr1vi80y8ak6vyjplyvps1fdpxnanp1mqpw3"; depends=[CDM coda psychotools Rcpp RcppArmadillo sirt]; };
   imp4p = derive2 { name="imp4p"; version="0.5"; sha256="0s1vq64qspni5fqzz781a1l8ldfbwhb57h8z4dr5k9bama5s3g6l"; depends=[imputeLCMD Iso Rcpp truncnorm]; };
-  implyr = derive2 { name="implyr"; version="0.2.2"; sha256="1kqz8pzgdbyvngsbab3v578jxm01hqmh2ipcqxsv1h9j628mvqj8"; depends=[assertthat DBI dbplyr dplyr rlang]; };
+  implyr = derive2 { name="implyr"; version="0.2.3"; sha256="0ap7qdnwm1gcfl67r6bfjmk9ji4z30plclwnwzlv5j7yx5si6lps"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; };
   r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; };
   importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; };
   imprProbEst = derive2 { name="imprProbEst"; version="1.0.1"; sha256="09y8yd9sw0b79ca45ryi7p82vy5s8cx0gg603rlc39lgwcdv45i3"; depends=[inline lpSolve]; };
@@ -7325,15 +7466,15 @@ in with self; {
   imputeMulti = derive2 { name="imputeMulti"; version="0.6.4"; sha256="0ngjbj8pl5mwprrgy234a5p9dhf615z7ymfv8184hby1z6ib3mgl"; depends=[DBI gtools Rcpp RSQLite]; };
   imputePSF = derive2 { name="imputePSF"; version="0.1.0"; sha256="0xfd2mybg0cbi3n35j28s4xq4iwr5rq4mqwgdqml7l2rlzidcwc8"; depends=[PSF]; };
   imputeR = derive2 { name="imputeR"; version="2.0"; sha256="0xyvy785jb1mv06jq25cnsbgiywi3857sdiizcjck7bx970lk02n"; depends=[caret Cubist gbm glmnet mboost pls rda reshape2 ridge rpart]; };
-  imputeTS = derive2 { name="imputeTS"; version="2.5"; sha256="1b0gpgg07hl4n5dnvqfjxk1zxgh93ykh7lz8l0szv5hbijidvqxp"; depends=[forecast Rcpp stinepack]; };
+  imputeTS = derive2 { name="imputeTS"; version="2.6"; sha256="14hkz9y6r8nl036zwi8c7k54bbkyz7zmvnq8ln7pwl15kgpcadkf"; depends=[forecast Rcpp stinepack]; };
   imputeTestbench = derive2 { name="imputeTestbench"; version="3.0.1"; sha256="0yxvwk1bcsid116a4zqsagf2dl3vhzva559bfjjcqdgyniapcmcj"; depends=[dplyr forecast ggplot2 imputeTS reshape2 tidyr zoo]; };
   imputeYn = derive2 { name="imputeYn"; version="1.3"; sha256="1b21w1aa5f7yiq8k0wa86wvbg4ij7f6ldwn6asfqwb0b90rvsgvs"; depends=[boot emplik mvtnorm quadprog survival]; };
   in2extRemes = derive2 { name="in2extRemes"; version="1.0-3"; sha256="1lgsqm29zmjyf8kynyra2p3q7bs4fyd7ac4v6s3pbahzhhzdk94y"; depends=[extRemes]; };
-  inTrees = derive2 { name="inTrees"; version="1.1"; sha256="1b88zy4rarcx1qxzv3089gzdz1smga6ssj8cxxccyyzci6px85j1"; depends=[arules gbm RRF xtable]; };
+  inTrees = derive2 { name="inTrees"; version="1.2"; sha256="1mwn2ijkyw0y9xcgrr56wxd2326ikarlsi79l59dplvlx2iwbi6c"; depends=[arules data_table gbm RRF xgboost xtable]; };
   inaparc = derive2 { name="inaparc"; version="0.2.0"; sha256="0rgbnvvqzbx4j40qz32l1bxmg3wwzbl6719wb9m3xpakblvhhxs2"; depends=[kpeaks lhs]; };
   inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; };
   inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; };
-  incR = derive2 { name="incR"; version="1.0.2"; sha256="07v0jg3cw04qnblpr3zslfwxw8ng444f5545q4yznnbdw8wfmk8x"; depends=[dplyr lubridate maptools rgeos]; };
+  incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; };
   inca = derive2 { name="inca"; version="0.0.3"; sha256="1g9js84xa5b6jl8gp4k0c55kjazfaw5g9biwk4v6vz3vwkwayyzh"; depends=[Matrix Rcpp RcppArmadillo]; };
   incadata = derive2 { name="incadata"; version="0.6.1"; sha256="05i0zifdzc1w6p6annhzp9rdd4v82gx2sxi4lqpdnraaczdrhgbb"; depends=[backports decoder dplyr rccmisc rvest sweidnumbr xml2]; };
   incgraph = derive2 { name="incgraph"; version="1.0.1"; sha256="0zjvxk2krdlm5bcr0m80nxy46f69a1xadfjw5sjw249b28wdclml"; depends=[BH dplyr orca purrr Rcpp testthat tibble]; };
@@ -7341,7 +7482,8 @@ in with self; {
   inctools = derive2 { name="inctools"; version="1.0.11"; sha256="08a1aqsx1f1mkykpgbqbgvai60zxj9zwpmxynyajbm4lwr3rc6rp"; depends=[cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma tmvtnorm]; };
   indelmiss = derive2 { name="indelmiss"; version="1.0.8"; sha256="0674hvgdq0fxab3h55iililphrr6lqp25359crvkqqgb8higbs0h"; depends=[ape numDeriv phangorn Rcpp]; };
   indicspecies = derive2 { name="indicspecies"; version="1.7.6"; sha256="0a7s37k3bg4cnzkvn833nrwi6hnfa5f6jxa8ra954v4sp55g6i5d"; depends=[permute]; };
-  inegiR = derive2 { name="inegiR"; version="1.2.0"; sha256="14mpjyc85l9sznhn29cxk37l3y5yxclqiv2kgcwf8prpxfgwy83l"; depends=[jsonlite plyr XML zoo]; };
+  indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; };
+  inegiR = derive2 { name="inegiR"; version="2.0.0"; sha256="00bhb3zvqhir2rqza3axk98lxhq98s41apwpsm242pqb7wsnmg95"; depends=[jsonlite plyr XML zoo]; };
   ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; };
   infer = derive2 { name="infer"; version="0.1.1"; sha256="1ln2vw4d4xcy9g6cv594glrrcqwmjynv0mfq6nsl1h94gz8wnh8a"; depends=[assertive dplyr ggplot2 magrittr rlang tibble]; };
   inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; };
@@ -7349,7 +7491,7 @@ in with self; {
   inferr = derive2 { name="inferr"; version="0.3.0"; sha256="1z5bfq0gv1h6iw8nwc19ar6f2sgsvgs3ghq52s09wclqk2yy4azz"; depends=[dplyr magrittr purrr Rcpp rlang shiny tibble tidyr]; };
   inflection = derive2 { name="inflection"; version="1.3"; sha256="168ms6hfakr6wql45r9qvk7hpas6sgpaiqyxicihsq0j3dpzvys4"; depends=[]; };
   influence_ME = derive2 { name="influence.ME"; version="0.9-9"; sha256="0f6d2hvs9qllyfpsp2cgh7w8yjxafclbk47n8av7j9zpp7s5yg9v"; depends=[lattice lme4 Matrix]; };
-  influence_SEM = derive2 { name="influence.SEM"; version="2.1"; sha256="1qhv640lngwrbdfqvw2x0x4zwv0aqzxwyfdpnivzjf5pw58nya5s"; depends=[lavaan]; };
+  influence_SEM = derive2 { name="influence.SEM"; version="2.2"; sha256="1cabl6486mlrmk0418s18wii3n6nl1ckv6w9281wdk4fy27y9qk2"; depends=[lavaan]; };
   influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; };
   influxdbr = derive2 { name="influxdbr"; version="0.14.2"; sha256="03dzw86mvbc8w38q9skjki1z17vc04k9q8dx7sd3xg6xbr10f9d9"; depends=[dplyr httr jsonlite magrittr purrr rlang tibble tidyr xts zoo]; };
   infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.0"; sha256="1gmsf4gw6xf70sh7y5hagkavknp80293sb7wgx6lycngq2acmi4w"; depends=[MASS]; };
@@ -7364,7 +7506,7 @@ in with self; {
   inlabru = derive2 { name="inlabru"; version="2.1.3"; sha256="09sdbzg3cdg43clkwnahkhyns019gjya55m6zhq340mgrnirx2i5"; depends=[ggplot2 rgdal rgeos sp]; };
   inline = derive2 { name="inline"; version="0.3.14"; sha256="0cf9vya9h4znwgp6s1nayqqmh6mwyw7jl0isk1nx4j2ijszxcd7x"; depends=[]; };
   inlinedocs = derive2 { name="inlinedocs"; version="2013.9.3"; sha256="13vk6v9723wlfv1z5fxmvxfqhaj68h0x3s2qq9j6ickr4wakb4ar"; depends=[]; };
-  inlmisc = derive2 { name="inlmisc"; version="0.3.5"; sha256="0m215fgyh17nbp2cqmyism3i77rgqkpdggc6fnpn3njxgw7wyb9m"; depends=[checkmate dplyr GA htmlwidgets igraph knitr leaflet raster rgdal rgeos sp]; };
+  inlmisc = derive2 { name="inlmisc"; version="0.4.0"; sha256="0hhw87zvqd2mplpbmbh1y91pyfgyqamw4wiz74a6qwn705bcymah"; depends=[checkmate dplyr GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos sp xtable]; };
   inpdfr = derive2 { name="inpdfr"; version="0.1.6"; sha256="0fwznjsq4wccqfnb3a5ic1nyx538jxmlcv59xdz06y6raczjp9q9"; depends=[ca cluster entropart metacom R_devices RColorBrewer SnowballC stringi tm wordcloud]; };
   insideRODE = derive2 { name="insideRODE"; version="2.0"; sha256="1ffndk8761cpkririb3g1qsq9nwmh82lcrpql9i5fksdprvdjzcw"; depends=[deSolve lattice nlme]; };
   insol = derive2 { name="insol"; version="1.1.1"; sha256="0zbawkp4qb0kqb7y9ibiyy8sa9rfgbzwmcdswx6s87p0h7brrqn6"; depends=[]; };
@@ -7377,7 +7519,7 @@ in with self; {
   intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; };
   intamap = derive2 { name="intamap"; version="1.4-1"; sha256="1shyxlps1rxqavrvg55gw0c9115q0j3yw78ilavig7036zx5lazv"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; };
   intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; };
-  intccr = derive2 { name="intccr"; version="0.2.0"; sha256="0sm66c0ivvky01k5v28k7rc6ba15jpnalhgc019nbrly1s5kyqcy"; depends=[alabama doParallel foreach]; };
+  intccr = derive2 { name="intccr"; version="1.0.0"; sha256="1y3rrxr9m8s6xvg4j8w9a2673kl1g5mmzz2p5dxjr6ddlfl8aji3"; depends=[alabama doParallel foreach numDeriv]; };
   integIRTy = derive2 { name="integIRTy"; version="1.0.5"; sha256="13p1r3rccsmaqwn0mrskr86jpww72aaq8zf2a8rnbpzkfrq9ni14"; depends=[abind doParallel foreach ltm MASS mclust]; };
   interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; };
   interactionTest = derive2 { name="interactionTest"; version="1.0.1"; sha256="021qsg9rglc4vj3hkrvfm2snd77zna7ql2i0m5hf77yzxxc35jc6"; depends=[]; };
@@ -7388,7 +7530,7 @@ in with self; {
   intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; };
   interim = derive2 { name="interim"; version="0.7.0"; sha256="05hgypckfjb9pr60cv6m8lgqibdkgksw13gy8g1rmd9njs6qcb8i"; depends=[]; };
   internetarchive = derive2 { name="internetarchive"; version="0.1.6"; sha256="1cx9dxlrdz1xak4jrrjs2wsq6ml8n2xl0n0s6n9h3g247j4lfvnm"; depends=[dplyr httr]; };
-  interp = derive2 { name="interp"; version="1.0-30"; sha256="1gzxh0xz0zdw5fr9m4w4w99rg540bljwkcmlla4pc0974d6fcg6i"; depends=[deldir Rcpp RcppEigen]; };
+  interp = derive2 { name="interp"; version="1.0-31"; sha256="0zrqlzsl71fggwy8qvhggzxphbc7ld2gahsh8h5aawvkpfz5jm8k"; depends=[deldir Rcpp RcppEigen]; };
   interplot = derive2 { name="interplot"; version="0.1.5"; sha256="0svhs7mj987vravirhmp4788qvqm32v614qj7q06b2y4va477yj8"; depends=[abind arm dplyr ggplot2]; };
   interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; };
   interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; };
@@ -7406,7 +7548,7 @@ in with self; {
   investr = derive2 { name="investr"; version="1.4.0"; sha256="0l47bfwxssfr3maprkpwnmgxnxccl3ch4grc7f968iiqk83mcxw9"; depends=[nlme]; };
   invgamma = derive2 { name="invgamma"; version="1.1"; sha256="12ga2y4wc9bc5zz6vimvxwgjpsx3ys3209nq63gscbw559ydxa5a"; depends=[]; };
   io = derive2 { name="io"; version="0.3.0"; sha256="16mnbxq217ixfg2qfqrj97qqfpc5dj622hf80nwray6hp47lbw2s"; depends=[filenamer stringr]; };
-  ioncopy = derive2 { name="ioncopy"; version="2.0.1"; sha256="1iy4a894yp91f7sm89hvr9sh69abjrygx4yaks1d405vbfxa6z58"; depends=[multtest shiny]; };
+  ioncopy = derive2 { name="ioncopy"; version="2.1.1"; sha256="1lkav3xvh2qazfmcxwisrjy8wzf639a4md71499jj5rmy650crys"; depends=[shiny]; };
   ionflows = derive2 { name="ionflows"; version="1.1"; sha256="1k9yz82hbjwljyg4cmi675ppykrc2yq9md8x1hhkfxmp070whcxl"; depends=[Biostrings]; };
   ionicons = derive2 { name="ionicons"; version="0.1.1"; sha256="0v7icjx2bpb0hd3j8a14lijklyjkmw7qgp336z66wzscm6f411ip"; depends=[png rsvg xml2]; };
   ionr = derive2 { name="ionr"; version="0.3.0"; sha256="18rv5n5gihb6pz36s45yj17sdjsbj4485k4lnggdjj1gbbjkz2ni"; depends=[gplots psych]; };
@@ -7428,12 +7570,12 @@ in with self; {
   ipw = derive2 { name="ipw"; version="1.0-11"; sha256="11a34j6lp329ran2r9kxn8184kfmibkdig74lsy6lj4w4w0d71cm"; depends=[geepack MASS nnet survival]; };
   ipwErrorY = derive2 { name="ipwErrorY"; version="1.0"; sha256="1n1j1crxnnfkg38drgg8rhc13y6s8hcsr5g0f6hi4v680dgrkhmp"; depends=[nleqslv]; };
   iqLearn = derive2 { name="iqLearn"; version="1.4"; sha256="0vgnfr6x6f6qlnag63brnkdymlmm2vbkl8fg02w98qsc48lal454"; depends=[]; };
-  iqspr = derive2 { name="iqspr"; version="2.3"; sha256="190d0mc36l3ggh62km3z7ylhi9f0wp4brkwmm72qjqbm1przvk0w"; depends=[doParallel fingerprint ggplot2 glmnet gridExtra kernlab ranger rBayesianOptimization rcdk tictoc xgboost]; };
   irace = derive2 { name="irace"; version="2.4"; sha256="07xzg4jcq0rjdq1drs3xh02y29z1gmkjkw54apmaqzc0s1pwzkk4"; depends=[]; };
   ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; };
   irlba = derive2 { name="irlba"; version="2.3.2"; sha256="0f7wb12wa0zbyllk5adcf4f517wgjpkhsx4j176i9ax6xy7jvprz"; depends=[Matrix]; };
   irr = derive2 { name="irr"; version="0.84"; sha256="0njxackqj8hyf9j1yszwxbnaxgp27fc2bwyyf7dip72wc12f81n5"; depends=[lpSolve]; };
-  irtDemo = derive2 { name="irtDemo"; version="0.1.3"; sha256="057m8p6qnws09kbq30712hfqkdyqkshpc4vprmj65mrdx6kwvqr7"; depends=[fGarch shiny shinydashboard]; };
+  irrNA = derive2 { name="irrNA"; version="0.1.4"; sha256="1i7s4c285dw1s2kiq01a81cfpd2v40y26yklr06xlmqp28iwslbr"; depends=[irr]; };
+  irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; };
   irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; };
   irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; };
   irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; };
@@ -7444,7 +7586,7 @@ in with self; {
   isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; };
   island = derive2 { name="island"; version="0.1.3"; sha256="1wb44zyfkgk62aidw5qg660473dxh9nyahmxzxn7ffmi8a0hmdnf"; depends=[]; };
   ismev = derive2 { name="ismev"; version="1.41"; sha256="19vmjgz1baqkryi34ffhjznc46z3zwqaqblwafhk9fd50xgn4bi6"; depends=[mgcv]; };
-  isni = derive2 { name="isni"; version="0.1"; sha256="0xqz5ha6ca02xk5n0c8awx8m7zibrb6h2mwwsr44jchdb3dj39sr"; depends=[matrixcalc mvtnorm nlme nnet numDeriv]; };
+  isni = derive2 { name="isni"; version="0.2"; sha256="1092sz4xskrvpxlkxnd8s7lzwqy1qnim63lzx55sspqcwdbry5hn"; depends=[Formula matrixcalc mvtnorm nlme nnet]; };
   isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; };
   isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; };
   isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; };
@@ -7452,10 +7594,11 @@ in with self; {
   isoph = derive2 { name="isoph"; version="1.1.2"; sha256="1qw98cnil3rb9d3vbii8drca744qig6bfd3rc74dxm23cj86f66g"; depends=[Iso survival]; };
   isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; };
   isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; };
+  isqg = derive2 { name="isqg"; version="1.0"; sha256="0ym3d916lpr1bmmla599xg13c8k0wvyi7b6jhzlrxi6nj5ci0vad"; depends=[BH R6 Rcpp]; };
   isva = derive2 { name="isva"; version="1.9"; sha256="05qx9q0kg4ma23v4abhihw0vz017nq6hv2jzsiqx4d20ngh1dl4z"; depends=[fastICA JADE qvalue]; };
   italy = derive2 { name="italy"; version="0.1.0"; sha256="0is90xp6980ja12jzi3816jq1y90ifcw6cvfmybb7invj6rr1cks"; depends=[]; };
   itan = derive2 { name="itan"; version="1.0"; sha256="082vh5gvh8hgyhk8nswll16ldhnp0pfpxnz1yx05zsc4nzvm92cf"; depends=[ggplot2 reshape]; };
-  itcSegment = derive2 { name="itcSegment"; version="0.7"; sha256="15im0aqnl73c7gg6v4al40mappfsb4axfxclpzmdganvr6fccvay"; depends=[maptools raster rgeos sp]; };
+  itcSegment = derive2 { name="itcSegment"; version="0.8"; sha256="032wj34313m3wigdfalq356srdzg0cvnvxnaxwxws6bc44r78izf"; depends=[maptools raster rgeos sp]; };
   iteRates = derive2 { name="iteRates"; version="3.1"; sha256="1dycmlm3vldc60wz2jjdfbla14383911zfahgal5mx8whxwq95c5"; depends=[ape apTreeshape geiger gtools MASS partitions VGAM]; };
   iterLap = derive2 { name="iterLap"; version="1.1-3"; sha256="079d4hxf1ha8pgibzb4r1yk7xqpzndd7hjbp8294qb26jvvcnd8q"; depends=[quadprog randtoolbox]; };
   iterators = derive2 { name="iterators"; version="1.0.9"; sha256="16sycjq912ix52fjxjhcwiaqr0yj1v5iqmrvjljd3z857031w06y"; depends=[]; };
@@ -7482,11 +7625,11 @@ in with self; {
   jagsUI = derive2 { name="jagsUI"; version="1.4.9"; sha256="1c2fq7q3kvf092j6r9ci0gigjpb61dj19phzm8mqi05q2k08siin"; depends=[coda lattice rjags]; };
   james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; };
   janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; };
-  janitor = derive2 { name="janitor"; version="0.3.1"; sha256="0s2inn0apzwrvm5dvvdh36n9fhhrwvfbs6f3fn6byrbd713xl7rq"; depends=[dplyr magrittr tidyr]; };
+  janitor = derive2 { name="janitor"; version="1.0.0"; sha256="0q6mq8s8k7yyx2459nhjvlxjaqxn61k3dpxdhcq0fyk37dafva79"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; };
   jaod = derive2 { name="jaod"; version="0.1.0"; sha256="0wh1nlfhks4c1dga6h7554pg44pamj73x5in71k2xw0yp292zm6x"; depends=[crul jsonlite tibble]; };
   jcext = derive2 { name="jcext"; version="0.1"; sha256="18vmf57l2kv3rvi6laqp948m8mjkdxdy0vi4xp68480b2mjmvij1"; depends=[ggplot2 maps RColorBrewer rworldmap sp stringr]; };
   jcolors = derive2 { name="jcolors"; version="0.0.2"; sha256="0d71sdvj7hwafj0sx2z1nyza5j2lfd8y5yj1p94yrw32wi7b89jn"; depends=[ggplot2 scales]; };
-  jdx = derive2 { name="jdx"; version="0.1.2"; sha256="0963h1ppasw5psxgxzav0mnwc5gq0ah5xv5cyhnm8d1a66svn6pw"; depends=[rJava]; };
+  jdx = derive2 { name="jdx"; version="0.1.3"; sha256="0d9m0sbdrlh8jfijn5mrfw8y2bpj5vxm0bcjlcc42ipxj47962l9"; depends=[rJava]; };
   jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; };
   jiebaR = derive2 { name="jiebaR"; version="0.9.1"; sha256="1qv4k5fgi40ppivdk3mxkhawyf2443h2lz5b9gvai9sqj6vf0s8k"; depends=[jiebaRD Rcpp]; };
   jiebaRD = derive2 { name="jiebaRD"; version="0.1"; sha256="1wadpcdca4pm56r8q22y4axmqdbb2dazsh2vlhjy73rpymqfcph4"; depends=[]; };
@@ -7494,8 +7637,8 @@ in with self; {
   jmetrik = derive2 { name="jmetrik"; version="1.0"; sha256="0xnbvby03fqbxgg0i0qxrrzjv98783n6d7c1fywj81x487qlj77j"; depends=[]; };
   jmotif = derive2 { name="jmotif"; version="1.0.3"; sha256="1llmrksajrd35kfdzq2vqfm17yv5kwark6gz3rvyzcmbrqk5spqv"; depends=[Rcpp RcppArmadillo]; };
   jmuOutlier = derive2 { name="jmuOutlier"; version="1.4"; sha256="1vrihjvq8l2q7d3z80fkzzzwg6xmnfi8sipsgwic1lcbv6vnqndp"; depends=[]; };
-  jmv = derive2 { name="jmv"; version="0.8.1.16"; sha256="1m7h0sbva865ki2wf0sxlb6bl1qw936grks2g4h82i2xq9nrlrhh"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan multcomp mvnormtest PMCMR psych R6 vcd vcdExtra]; };
-  jmvcore = derive2 { name="jmvcore"; version="0.8.1.6"; sha256="1k1w4c0c8ayjzhbi4fqxr2pcynf73jhkr4wc933nijhkyd6w8m29"; depends=[base64enc R6 rjson]; };
+  jmv = derive2 { name="jmv"; version="0.8.6.2"; sha256="0an3ni6lz85cfcra69mycka6x1hgaas6rv6ybbnikmrv846sx03n"; depends=[afex BayesFactor car emmeans GGally ggplot2 ggridges GPArotation jmvcore lavaan MASS multcomp mvnormtest nnet PMCMR psych R6 ROCR vcd vcdExtra]; };
+  jmvcore = derive2 { name="jmvcore"; version="0.8.5"; sha256="0w1d18qrb8aimkzv7imnj9yfdmz7ppdvaiadsaprackch16s91kx"; depends=[base64enc R6 rjson]; };
   jocre = derive2 { name="jocre"; version="0.3.3"; sha256="1i9n3r16pq6r4sy3fc1rxpil5ws8v2is0xdxafinvwr1hzkv1gz6"; depends=[boot KernSmooth plyr TSP]; };
   joinXL = derive2 { name="joinXL"; version="1.0.1"; sha256="1l76bckjz5r1kdsh0s10i0gpca12rkfkp14346fn7avdcw73v23i"; depends=[data_table openxlsx R_utils rChoiceDialogs Rcpp readxl rJava timeDate timeSeries]; };
   joineR = derive2 { name="joineR"; version="1.2.3"; sha256="0cg7bfn0hb7ayx2s7myja5qzdvsbzyk8fbb1x5z0fp21gyrpfz18"; depends=[lattice MASS nlme statmod survival]; };
@@ -7506,8 +7649,8 @@ in with self; {
   jointNmix = derive2 { name="jointNmix"; version="1.0"; sha256="0ibh7hqkpzlfk3bk4d2dd64jhr8cvw563k082vwnljiam7k5nj4b"; depends=[]; };
   jointPm = derive2 { name="jointPm"; version="2.3.1"; sha256="1c2cn9sqwfyv9ksd63w8rrz0kh18jm2wv2sfdkgncjb7vfs4hbv9"; depends=[]; };
   jointseg = derive2 { name="jointseg"; version="1.0.1"; sha256="0wa531b5shrxhnzflfjqn2wypfb565qc2c8wngysgrgyj1kjq1pl"; depends=[acnr DNAcopy matrixStats]; };
-  jomo = derive2 { name="jomo"; version="2.5-3"; sha256="1ig6r4sc4c2vf3h51by78610c5yqd7ap8gqcf0hswn3h2zsf6vm8"; depends=[lme4 survival]; };
-  jose = derive2 { name="jose"; version="0.1"; sha256="1cvrjcx902pbh9xryph1kilmyf0rmbk671jvqd19a2kfwpcw7gqc"; depends=[jsonlite openssl]; };
+  jomo = derive2 { name="jomo"; version="2.6-1"; sha256="1pcac6kbag4as28l557h702kc78mr0iz4m4rkhcx602l7dch8gd8"; depends=[lme4 survival]; };
+  jose = derive2 { name="jose"; version="0.2"; sha256="0vgmr5kmps6yk10bbzrxz2d3y7jk0w1rxpm9gx510kpnqbj325xz"; depends=[jsonlite openssl]; };
   jpeg = derive2 { name="jpeg"; version="0.1-8"; sha256="05hawv5qcb82ljc1l2nchx1wah8mq2k2kfkhpzyww554ngzbwcnh"; depends=[]; };
   jpmesh = derive2 { name="jpmesh"; version="1.1.0"; sha256="01f0020ghl1f5fsri54gni15b36fg9vkr4xj43vy881sv11c5yr8"; depends=[dplyr leaflet miniUI purrr rlang sf shiny tibble tidyr units]; };
   jpndistrict = derive2 { name="jpndistrict"; version="0.3.0"; sha256="0vnawpkrkhv0vjvw49ldn86qy07pqsdw7mmq13h3l4qw5jmfsd9i"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr readr rlang sf shiny stringi tibble tidyr]; };
@@ -7519,16 +7662,17 @@ in with self; {
   jsonld = derive2 { name="jsonld"; version="1.2"; sha256="1y4574ai4m31x4yjx5bp9i8wfgcgjgfr8jn5nn0x6qzlnjg58gyz"; depends=[curl jsonlite V8]; };
   jsonlite = derive2 { name="jsonlite"; version="1.5"; sha256="00lfg464jhf7k01bal9pcjvbdf5cxk6xi2h46hccp1x3h883g434"; depends=[]; };
   jsonvalidate = derive2 { name="jsonvalidate"; version="1.0.0"; sha256="08c1s8fk95np4l6km077dmd1nibhhggi80f5465hhbq521gm0awl"; depends=[V8]; };
+  jsr223 = derive2 { name="jsr223"; version="0.3.1"; sha256="030dp51fh9b7r4f7ad9drln73m3mhg2zh5fh053d65hzyszrqyqg"; depends=[curl jdx R6 rJava]; };
   jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; };
   jtools = derive2 { name="jtools"; version="0.9.4"; sha256="0vljw3n1ykvf3f2ydar9rb24cgiqljh195g2jc4dx77zy1kcfh4d"; depends=[ggplot2]; };
   jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; };
   jug = derive2 { name="jug"; version="0.1.7"; sha256="01m6hyr26f6zih49pz2bmmr8ypdl1qiz0wv3padcy68kaccf44a4"; depends=[base64enc httpuv infuser jsonlite magrittr mime R6 webutils]; };
-  junctions = derive2 { name="junctions"; version="1.0"; sha256="13vqmy4968hpxi6vs3kfgd802miw8navcvsjmak6knwa2mjhhd54"; depends=[Rcpp]; };
+  junctions = derive2 { name="junctions"; version="1.0.1"; sha256="1mfzhizfzpsrlc23kdi658a1svw4p3wh1la7zpf5fk2bbksw0v97"; depends=[Rcpp]; };
   junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; depends=[httr jsonlite]; };
   jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; };
   jwutil = derive2 { name="jwutil"; version="1.1.1"; sha256="114vph86722v89iwyla7skl06cv87ymfy6nmca5iyxwx1z78zddz"; depends=[checkmate Rcpp]; };
   kSamples = derive2 { name="kSamples"; version="1.2-7"; sha256="0f19rjngk0lg6s8c6h5l55qpxp8sl4vxj3kpi05cizzncny9b9bj"; depends=[SuppDists]; };
-  kableExtra = derive2 { name="kableExtra"; version="0.7.0"; sha256="1rj41kcvc46nn6fvqhsc9v1snq2phh09vchkdng1avbm3g5sld62"; depends=[htmltools knitr magrittr readr rmarkdown rvest scales stringr viridisLite xml2]; };
+  kableExtra = derive2 { name="kableExtra"; version="0.8.0"; sha256="01m2h8ms83h5zmy9rys0dal9y77fk7bk1f3k1l2vsg2krb5wxagv"; depends=[htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite xml2]; };
   kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; };
   kamila = derive2 { name="kamila"; version="0.1.1.2"; sha256="0mcray8byifjddsmwzmcpmw3zpm1y8q3nfrgpgacb36rwprqkj6z"; depends=[abind gtools KernSmooth mclust plyr Rcpp]; };
   kangar00 = derive2 { name="kangar00"; version="1.1"; sha256="1rm3mjghgfq8fliha6flqvcb6m4xag1697c0q5smg515453l0s0p"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; };
@@ -7540,16 +7684,18 @@ in with self; {
   karaoke = derive2 { name="karaoke"; version="1.0"; sha256="1kx11lijdffhhh8prjgsamshgg2v29b2i129fjqi079waa335352"; depends=[seewave tuneR]; };
   kazaam = derive2 { name="kazaam"; version="0.1-0"; sha256="0j7vysnmiv9sggcxdn3nrgfvyl52pza4kkjnsa0xlb3fzq9qpwlz"; depends=[pbdMPI]; };
   kcirt = derive2 { name="kcirt"; version="0.6.0"; sha256="1gm3c89i5dq7lj8khc12v30j1c0l1gwb4kv24cyy1yw6wg40sjig"; depends=[corpcor mvtnorm snowfall]; };
-  kdecopula = derive2 { name="kdecopula"; version="0.9.1"; sha256="0qbrm4b2ijyp7fmljz8m918zkv5aywm549lbwjk3rk8isvaac10m"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; };
+  kde1d = derive2 { name="kde1d"; version="0.1.2"; sha256="0n28xkkhl9mfd0bcgfv181j9lqk0aiim2irnwn654fpz0y6rwhnh"; depends=[BH cctools qrng Rcpp RcppEigen]; };
+  kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; };
   kdensity = derive2 { name="kdensity"; version="1.0.0"; sha256="0di027xjcd8xllkbygmkmpvp9wchh3haf15vrw7sjck3yvh68k5f"; depends=[assertthat EQL knitr rmarkdown]; };
   kdetrees = derive2 { name="kdetrees"; version="0.1.5"; sha256="1plf2yp2vl3r5znp5j92l6hx1kgj0pzs7ffqgvz2nap5nf1c6rdg"; depends=[ape distory ggplot2]; };
   kdevine = derive2 { name="kdevine"; version="0.4.1"; sha256="0ci51dn7jhz9swlywiqj3inkk4329argm63lhkyvcbj2kd2rjay1"; depends=[cctools doParallel foreach kdecopula KernSmooth MASS qrng Rcpp VineCopula]; };
+  kdtools = derive2 { name="kdtools"; version="0.3.0"; sha256="1q22h5cs5p6nvmxrnq0pdfs8aq2aghash9y387ch0g6cm1n5hzj4"; depends=[BH Rcpp strider]; };
   kedd = derive2 { name="kedd"; version="1.0.3"; sha256="17rwz3yia95xccbxwn43wr6c9b3062094yfahnnnk3wfijyhlxiq"; depends=[]; };
   keep = derive2 { name="keep"; version="1.0"; sha256="12803hhrs9v94rv6qaihk1f1ls7lx4cy2pa30v4p1r2z9afx9bjf"; depends=[]; };
   kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; };
   kelvin = derive2 { name="kelvin"; version="2.0-0"; sha256="04xdgpmysksm79m3vqmb4zra3pq09nv99w4fbdla1lmy7z8pkdrk"; depends=[Bessel]; };
   kequate = derive2 { name="kequate"; version="1.6.1"; sha256="1rjya1rnlfk2ziiwhkgshlyk3g0388591q3q01a3vgmgsb3cpxl6"; depends=[equateIRT ltm mirt]; };
-  keras = derive2 { name="keras"; version="2.1.4"; sha256="1z08fi5a0hxw96xj95w9k0d918b1yvqixlv0szqbdrd5dqnfj0xa"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
+  keras = derive2 { name="keras"; version="2.1.5"; sha256="0l6hs9bawrnjansmka082cqvcf4h5lnrfjgp9rivg8k89nqaknfq"; depends=[magrittr R6 reticulate tensorflow tfruns zeallot]; };
   kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; };
   kerasformula = derive2 { name="kerasformula"; version="0.1.1"; sha256="0c19208y9v8a1w4p54z7yng5vvmb6h79fs0a20ij98ngys9afbwz"; depends=[dplyr keras Matrix]; };
   kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; };
@@ -7559,7 +7705,7 @@ in with self; {
   kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; };
   kernelboot = derive2 { name="kernelboot"; version="0.1.4"; sha256="1d1l9sbnlyx5a88qmd6q2zxlkr6dykcwlkk648yqmmfvqmq4xjmj"; depends=[future future_apply Rcpp]; };
   kernlab = derive2 { name="kernlab"; version="0.9-25"; sha256="0qnaq9x3j2xc6jrmmd98wc6hkzch487s4p3a9lnc00xvahkhgpmr"; depends=[]; };
-  kernplus = derive2 { name="kernplus"; version="0.1.0"; sha256="0wibp4bbzxmjdyhp643v76accjy1w8jixmwgsdfrq2yjxacgnwcb"; depends=[circular KernSmooth mixtools]; };
+  kernplus = derive2 { name="kernplus"; version="0.1.1"; sha256="1dxw1qk5gx7g05kgsbh5436r7mbv77631zjs0c4ibpscaw77g475"; depends=[circular KernSmooth mixtools]; };
   kernscr = derive2 { name="kernscr"; version="1.0.3"; sha256="0h3xv76dxch8kv4z7cgx60iaikk6906n75c4kc1mccpw0jvyxrvb"; depends=[MASS mvtnorm]; };
   kexpmv = derive2 { name="kexpmv"; version="0.0.3"; sha256="1nx2bpyc06vlr78nhig4zaaygphjp4wqsz9jzhs4qx8wy3kh7rmy"; depends=[Rcpp SparseM]; };
   keyholder = derive2 { name="keyholder"; version="0.1.1"; sha256="1dp326vayjzjpfhd2ajrpqjvbn6vvqa7iw9mdhblprz4cvv65g30"; depends=[dplyr rlang]; };
@@ -7582,16 +7728,15 @@ in with self; {
   kissmig = derive2 { name="kissmig"; version="1.0-3"; sha256="1pi1x3gdbqrhr1km1hqj15k8wyrgs697fnxgjgxga1irbn8bi482"; depends=[raster]; };
   kitagawa = derive2 { name="kitagawa"; version="2.1-0"; sha256="1ddyd0rwwmdpbq823qass5dlp2lvi9d64wpl61ik6fghms2p9ryr"; depends=[kelvin]; };
   kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; };
-  klaR = derive2 { name="klaR"; version="0.6-12"; sha256="10nkqb1zradbvifgv1fm373mhyydgdjjgmnw2442a2lark59z3vs"; depends=[combinat MASS]; };
+  klaR = derive2 { name="klaR"; version="0.6-14"; sha256="1g995df6286sd64nw7q9bihzkqhrasks45n8xk678y57kcadksai"; depends=[combinat MASS questionr]; };
   klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; };
   klin = derive2 { name="klin"; version="2007-02-05"; sha256="0j0hr4bppzk754a66q5z42h7jzfavqpxgl7y266804aginfqm1ax"; depends=[Matrix]; };
   km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; };
   kmc = derive2 { name="kmc"; version="0.2-2"; sha256="0ldyhlqdrbygvhpy4b9xp52zjvjmb0gaph0v9fhla707f63i21m5"; depends=[emplik Rcpp rootSolve]; };
   kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; };
   kmcudaR = derive2 { name="kmcudaR"; version="1.0.0"; sha256="1adixf4nsgnk8rgvcv37aznh8gxrfwn19ihh3c6siss51hlmhln2"; depends=[Rcpp RcppEigen]; };
-  kmeans_ddR = derive2 { name="kmeans.ddR"; version="0.1.0"; sha256="1i87cxakjbq1xwyjyyzv1xiqbrncsqx6baviidcdm3n0pakrqdsg"; depends=[ddR Rcpp]; };
   kmed = derive2 { name="kmed"; version="0.0.1"; sha256="0vcks4n0dpfd5cl5b8mhvhw6r2f3y12jn3d3j3dkj2grxmb9lh4c"; depends=[ggplot2]; };
-  kmer = derive2 { name="kmer"; version="1.0.0"; sha256="0zknmcmv96bq0yqmmbshjwwh7vy2iwks4masmglayx7jw323n9cx"; depends=[openssl phylogram Rcpp]; };
+  kmer = derive2 { name="kmer"; version="1.0.2"; sha256="117ggn2i4yy0l7vvrf9miy4x63n9d34rjksd3dd3ama2alp4s95l"; depends=[openssl phylogram Rcpp]; };
   kmi = derive2 { name="kmi"; version="0.5.3"; sha256="0b3nibvi0skrx3mjfzypqmdqx8s9zkn11f0ljscqpjr28idx4hr0"; depends=[mitools survival]; };
   kml = derive2 { name="kml"; version="2.4.1"; sha256="1my9gcripiqc6iphycjr3srj8qxy05yvd0648vblygrx2qym5hy2"; depends=[clv longitudinalData]; };
   kml3d = derive2 { name="kml3d"; version="2.4.2"; sha256="1a3hqyhrsh12l1j1xlz4zy88impw3biz6w2qc80r11m549h0m6s9"; depends=[clv kml longitudinalData misc3d rgl]; };
@@ -7611,12 +7756,15 @@ in with self; {
   knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; };
   kntnr = derive2 { name="kntnr"; version="0.4.1"; sha256="0d78mgmz2yhfbf4m5jaa28aazaw2wf9vf1vxl53wrnpy0hxw329y"; depends=[base64enc dplyr httr jsonlite lazyeval lubridate purrr rstudioapi stringr tibble]; };
   koRpus = derive2 { name="koRpus"; version="0.10-2"; sha256="1ykaky10zkj76w44fhk6kb6dqz1pgncmdnz4r2amcm08a8h96gsr"; depends=[data_table]; };
+  koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-2"; sha256="0v3cjzcpa24n479xi2lkj3yhjrgbd14iq9rz1bvywbj3shixs0bn"; depends=[koRpus sylly_en]; };
   kofdata = derive2 { name="kofdata"; version="0.1.3"; sha256="135fkfciya8d215iv0ir7kmd01w7rlzqfcif5jz918skrv2p9mcl"; depends=[httr jsonlite xts zoo]; };
   kofnGA = derive2 { name="kofnGA"; version="1.2"; sha256="1j4gx6pkmasgbgcdlg6i5nzfrmim61c2hw34k5zfmwfbkrsgb575"; depends=[]; };
   kohonen = derive2 { name="kohonen"; version="3.0.4"; sha256="1aq98qbmbzsdyimhn28qiyqfrwkwq70qmm5yhx0rvhjq53bn9622"; depends=[MASS Rcpp]; };
   kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; };
   kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; };
   komadown = derive2 { name="komadown"; version="0.1.0"; sha256="08rg2qz4dmxl4xi0d7wdl2xgdmsc29fdc0yi40yddzrbpj4vs2z4"; depends=[bookdown knitr rmarkdown]; };
+  komaletter = derive2 { name="komaletter"; version="0.2.0"; sha256="17xkc22ci2gqypcfs1yhyzfmpsh8bmjbw6yms27cbqg4m4jdgm9v"; depends=[rmarkdown]; };
+  konfound = derive2 { name="konfound"; version="0.1.0"; sha256="1w85gsms061d5hik3bc7x5gc7cp6c9h8l8q8q60isj1r0n60a81s"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; };
   kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; };
   kpeaks = derive2 { name="kpeaks"; version="0.1.0"; sha256="1qxpncwyshv35h1190py6a69mljabfcjjs7v17a2rb5asahy3rk8"; depends=[]; };
   kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; };
@@ -7628,12 +7776,12 @@ in with self; {
   kscons = derive2 { name="kscons"; version="0.7.0"; sha256="1i4dp56y9swl5s6cipqlm5i5fknz2v0yz5g930cl5i8kx91rxwrp"; depends=[]; };
   kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; };
   ksrlive = derive2 { name="ksrlive"; version="1.0"; sha256="1zd3ggzgjks0jay69s5m7ihbd7v7zha6ssj2m9ahnyp00ghpk83j"; depends=[tightClust]; };
-  kst = derive2 { name="kst"; version="0.3-1"; sha256="1b4lqjg9j91qhr5gk0y1xsyfbhgaixza7qw6kl05yz88p6m7p35z"; depends=[proxy relations sets]; };
+  kst = derive2 { name="kst"; version="0.4-0"; sha256="1vqkriqhzdzs3kldjqgl15sm25lbfqzisglk2r96rjgxbj8k59w7"; depends=[proxy relations sets]; };
   kstIO = derive2 { name="kstIO"; version="0.1-0"; sha256="04s8lyg7622zcq947qlx5brwf1an7icg94i5di8vwjp7d8zgczq6"; depends=[MASS pks sets stringr]; };
   ktsolve = derive2 { name="ktsolve"; version="1.1"; sha256="0b5myr093v3qaj9gzbw1w728i5ij418whxxpicj51w657dcy647k"; depends=[]; };
   ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; };
   kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; };
-  kutils = derive2 { name="kutils"; version="1.34"; sha256="17f6pzinmp4lcjd5glhnvbjy1yg912jccx9d4n55bini93vlcz0z"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; };
+  kutils = derive2 { name="kutils"; version="1.39"; sha256="05744f8bz8mbxcqhf50rxjlknwar4ci3g0nmcx5jggwczqqmn2pq"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; };
   kvh = derive2 { name="kvh"; version="1.1"; sha256="1dvq7wbpx1hpjshvsihivd8q8hyhji047gifxc6cjnv778r4irb1"; depends=[Rcpp]; };
   kwb_hantush = derive2 { name="kwb.hantush"; version="0.2.1"; sha256="0rjnhhzvjhhl0r2ixz9vkgnqkrnnk772253zy7xkpadj7ws69jsf"; depends=[hydroGOF lattice]; };
   kyotil = derive2 { name="kyotil"; version="2017.12-27"; sha256="0xd64xg3nj0pj0ziycq4ndpl8kwxfng96ag8zmqzzxk85zw2vyq3"; depends=[]; };
@@ -7652,7 +7800,7 @@ in with self; {
   labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; };
   labelled = derive2 { name="labelled"; version="1.0.1"; sha256="18mz4qraxalq50rzmblsvavx4isb4194rj4iqab09qzh8ib1qzwv"; depends=[haven]; };
   labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; };
-  labstatR = derive2 { name="labstatR"; version="1.0.8"; sha256="1qs76vhw6ihsriq5v0s980fxbb0pbvgwqm0a97b226cpqqabkpfm"; depends=[]; };
+  labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; };
   labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; };
   laeken = derive2 { name="laeken"; version="0.4.6"; sha256="1rhkv1kk508pwln1d325iq4fink2ncssps0ypxi52j9d7wk78la6"; depends=[boot MASS]; };
   laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; };
@@ -7668,6 +7816,8 @@ in with self; {
   landsat = derive2 { name="landsat"; version="1.0.8"; sha256="07zvj1yyryxk7rwgcrf1kl32p2karkkqz6xrnwy1096dg9iw2js7"; depends=[lmodel2 mgcv rgdal sp]; };
   landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; };
   landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; };
+  landscapetools = derive2 { name="landscapetools"; version="0.3.0"; sha256="0ssrqcac3x8fca0vx63nzzac38kx8vlbffkzahmag24c6b1y6dzq"; depends=[checkmate dplyr extrafont ggplot2 magrittr purrr raster rasterVis tibble tidyr viridis]; };
+  landsepi = derive2 { name="landsepi"; version="0.0.4"; sha256="0b162vdgrd1v93bm5dc5r4nzpcm3cq5iy8v3f2axpx1fk378aaar"; depends=[fields maptools MASS Matrix Rcpp rgdal rgeos sf sp splancs]; };
   languageR = derive2 { name="languageR"; version="1.4.1"; sha256="0grkhdjz9dcrgq6qwv7wpwmckn3mfv022c5wrx29b1dxafd0qzm0"; depends=[]; };
   languagelayeR = derive2 { name="languagelayeR"; version="1.2.3"; sha256="1sh3k8xw88pm93wmpy1qi44i8pv5b5g6ajzas36bdi1bqm8cqzax"; depends=[attempt curl httr rjson]; };
   languageserver = derive2 { name="languageserver"; version="0.1.0"; sha256="05ph152xrw8qmnb1mwqsq2qx11d6f4g57v9qp1mxi6y11wl21rxq"; depends=[callr jsonlite lintr R6 repr stringr]; };
@@ -7680,7 +7830,6 @@ in with self; {
   lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; };
   lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; };
   lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; };
-  lasvmR = derive2 { name="lasvmR"; version="0.1.2"; sha256="1yzyfacr47wkpv9bblm7hvx1hgnzbhy1421bpnh95xfxxlzahy5n"; depends=[checkmate Rcpp]; };
   latdiag = derive2 { name="latdiag"; version="0.2-3"; sha256="0i2mqk3ldg5kf4d8sfljgjsqbdin7v69anmc2rrxgy28bmvykf9d"; depends=[]; };
   latentnet = derive2 { name="latentnet"; version="2.8.0"; sha256="05r7hzj5i7rgpxl798lwi2m62l1qkl5zdza0q2awcd5ydkgj34hp"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; };
   later = derive2 { name="later"; version="0.7.1"; sha256="0z9jymmclkq9zcg1fd8p6gsnm5z1sn3n9pfz3bs03qjrkbizgrvz"; depends=[BH Rcpp rlang]; };
@@ -7689,9 +7838,9 @@ in with self; {
   lattice = derive2 { name="lattice"; version="0.20-35"; sha256="0pcnmaz3lr62ly0dcy5hnnqxshc4yqd43hrvlz3almgc9l7sna88"; depends=[]; };
   latticeDensity = derive2 { name="latticeDensity"; version="1.0.7"; sha256="1y33p8hfmpzn8zl4a6zxg1q3zx912nhqlilca6kl5q156zi0sv3d"; depends=[spam spatstat spdep splancs]; };
   latticeExtra = derive2 { name="latticeExtra"; version="0.6-28"; sha256="1hkyqsa7klk5glj9y1hg3rxr5qilqw8h0017zc4c3nps7lr9a1kq"; depends=[lattice RColorBrewer]; };
-  lava = derive2 { name="lava"; version="1.6"; sha256="02xf5d968raz9gnq5ywy04wz29xpdyca1hm79vbbg1mcxvzdl1dz"; depends=[numDeriv SQUAREM survival]; };
+  lava = derive2 { name="lava"; version="1.6.1"; sha256="11k9npmzp3nk2qx0h1dwwfc37j4ddd9y54bppxby0ffnb8qlpw1k"; depends=[numDeriv SQUAREM survival]; };
   lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; };
-  lavaSearch2 = derive2 { name="lavaSearch2"; version="1.1.0"; sha256="1nmzj4yfgas6a9wss34ckd55gajxmd9a0fk8lmpxc2130hlr4ld8"; depends=[ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; };
+  lavaSearch2 = derive2 { name="lavaSearch2"; version="1.3.3"; sha256="08h9nfbjbq6l5drmq07js2b6ylv29wfrddqdlpsnysi99sj8i8aq"; depends=[ggplot2 lava MASS Matrix multcomp mvtnorm nlme reshape2 sandwich]; };
   lavaan = derive2 { name="lavaan"; version="0.5-23.1097"; sha256="11wxzjg09q5wzvbp1lhi9sjnp4rrjpdxnmq3zf8npx08iwkw79ws"; depends=[MASS mnormt numDeriv pbivnorm quadprog]; };
   lavaan_shiny = derive2 { name="lavaan.shiny"; version="1.2"; sha256="0qgswdpxb5af0l3v70sg0jrgsdwr88gz6zzwbk3pw5x6qnvnwb6r"; depends=[lavaan psych semPlot shiny shinyAce]; };
   lavaan_survey = derive2 { name="lavaan.survey"; version="1.1.3.1"; sha256="133hpy8s00y6jzwwzl9brdh70w26jycdm3n1c6bcryghwh3ai4xr"; depends=[lavaan MASS survey]; };
@@ -7714,7 +7863,7 @@ in with self; {
   lcmm = derive2 { name="lcmm"; version="1.7.8"; sha256="180xfx842sic5qnfr0zh2h4345zkzlf123pdw4q6gd0mi5smwwc7"; depends=[survival]; };
   lcopula = derive2 { name="lcopula"; version="1.0"; sha256="07a9k5fp03s6jnjawg11j4458xrsrrqxv6kf3cs58ymv0j2s1qyd"; depends=[copula pcaPP Rcpp]; };
   lctools = derive2 { name="lctools"; version="0.2-6"; sha256="06hhz0sjdrci1li03f09wij1qrl74sla2938fbkx72ffy0mdg310"; depends=[MASS pscl reshape weights]; };
-  lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.0"; sha256="0m8wfp8vs4pgzmxinlbxask1i0z6mf35cyyib77mbyqlfvf0hic0"; depends=[quantmod TTR xts zoo]; };
+  lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.3"; sha256="0nkqrm8r5iyvw2gbixvi0bnqx2wafg67cqz9mn99halzk9hpynl9"; depends=[quantmod TTR xts zoo]; };
   lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; };
   ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; };
   ldat = derive2 { name="ldat"; version="0.1.0"; sha256="1ga96m1sl7khhwi41ab07k02ay4w8vzi5cl895h9kfavgbhqsf6m"; depends=[BH lvec]; };
@@ -7737,7 +7886,7 @@ in with self; {
   leapp = derive2 { name="leapp"; version="1.2"; sha256="1yiqzmhgl5f3zwpcc5sz3yqrvp8p6r4w2ffdfyirirayqc96ar17"; depends=[corpcor MASS sva]; };
   leaps = derive2 { name="leaps"; version="3.0"; sha256="11gjmn1azrjw5xlvdb4gknj9985kck9x8zb9np1rnk2smp6pka2m"; depends=[]; };
   learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; };
-  learningCurve = derive2 { name="learningCurve"; version="1.1.1"; sha256="1rvh6i3vmwrff491k9w551402m3i9sra8rzkljgk9b5fmw7hk5ki"; depends=[ggplot2 gridExtra scales tidyverse]; };
+  learningCurve = derive2 { name="learningCurve"; version="1.1.2"; sha256="02dl5rlvwa8dvhknf4kdfg3aial54shnxrq7k2k8yj2dj0qh062c"; depends=[ggplot2 gridExtra scales tibble]; };
   learningr = derive2 { name="learningr"; version="0.29"; sha256="1nr4ydcq2mskv4c0pmf0kxv5wm8pvjqmv19xz5yaq0j834b0n5q7"; depends=[plyr]; };
   learnr = derive2 { name="learnr"; version="0.9.2"; sha256="1z04c1djg7ghsl7p9ypc6k5m7snahnmjy10xmrzqfayx1wkfkn9n"; depends=[evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs rmarkdown rprojroot shiny withr]; };
   learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; };
@@ -7746,17 +7895,17 @@ in with self; {
   leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; };
   lemon = derive2 { name="lemon"; version="0.3.3"; sha256="0jxcyplr69a3rganqc02ry57xj7is7dylsh9kvsy6kwnji6bvdib"; depends=[ggplot2 gridExtra gtable knitr lattice]; };
   lero_lero = derive2 { name="lero.lero"; version="0.1"; sha256="1jndsgy48fn085ilkh8dfc3w76kfnfj0x70d1m3h59zxi3x9lb82"; depends=[stringr]; };
-  lessR = derive2 { name="lessR"; version="3.7.0"; sha256="14zzm7dsjwl94bcnzrkf8bk83nxsini11s5l0pia31xnm6yl89ln"; depends=[colorspace ellipse foreign lattice latticeExtra leaps png readxl robustbase sas7bdat triangle]; };
+  lessR = derive2 { name="lessR"; version="3.7.2"; sha256="0rmfrwp6hznivj8809n21ihriq33264yj82l3ii7kil1i3vmac3n"; depends=[ellipse foreign lattice latticeExtra leaps openxlsx png robustbase sas7bdat triangle]; };
   lestat = derive2 { name="lestat"; version="1.8"; sha256="12w3s5yr9lsnjkr3nsay5sm4p241y4xz0s3ir56kxjqw23g6m80v"; depends=[MASS]; };
   letsR = derive2 { name="letsR"; version="3.1"; sha256="0wyqqq7w21k87md3pwsz3kdaws345fdhh2xgavwiiywalg0gvxxx"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; };
   lettercase = derive2 { name="lettercase"; version="0.13.1"; sha256="0s2s42v6a3mlz6084sk5wcbap3czgbd53f9p64pxwd1yfj18lbyx"; depends=[stringr]; };
   lexRankr = derive2 { name="lexRankr"; version="0.5.0"; sha256="1l0p4qg6lcpp1f2n6mh1glvxzy3bis0c1ra8x9z5v26x31wmwq68"; depends=[igraph Rcpp SnowballC]; };
   lexicon = derive2 { name="lexicon"; version="0.7.4"; sha256="1f2n90xdpbxk6ffzzlib7fxxswwkfrpf404vzx85s016529dy42m"; depends=[data_table syuzhet]; };
   lexiconPT = derive2 { name="lexiconPT"; version="0.1.0"; sha256="0w53gnr29nzc1ib54rnxdycs0c5f7vpv586qmvxxzy4ar16kisaq"; depends=[]; };
-  lfactors = derive2 { name="lfactors"; version="1.0.1"; sha256="13vjafbss0860fi4qcf23g3cjs9dlr2k5f3majbnyvhwsbfs7cla"; depends=[]; };
+  lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; };
   lfda = derive2 { name="lfda"; version="1.1.2"; sha256="0y59iigcpmyrmsiwrpv5agja6vz3wxmxd9sl5hbf1ybm4d0lyky4"; depends=[plyr rARPACK]; };
   lfe = derive2 { name="lfe"; version="2.6-2291"; sha256="1hdzq85y1nxrinikf308mvdmyw883bfzbamr27ffdphlk403ry70"; depends=[Formula Matrix sandwich xtable]; };
-  lfl = derive2 { name="lfl"; version="1.4"; sha256="09ni0n7xqn3qw9jjh24j679cyzgf0cxxw535ap4z44jjk29bqngw"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
+  lfl = derive2 { name="lfl"; version="1.4.1"; sha256="0r9459mmnx1khpw24w943y1x4xl3zcws2cvv61216yzb0xbqwhc0"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; };
   lfstat = derive2 { name="lfstat"; version="0.9.4"; sha256="0lm9fyw45kdkkjldkmagykn9p3l3jlw2ky3h00f7j6rqkizjm6r0"; depends=[dygraphs lattice latticeExtra lmom lmomRFA plyr xts zoo]; };
   lg = derive2 { name="lg"; version="0.1.0"; sha256="0gaid5aihc9dk3igbm8jhsspl1k4k3prqvn7j2vsm92jc7m00iyw"; depends=[ggplot2 ks localgauss logspline mvtnorm]; };
   lga = derive2 { name="lga"; version="1.1-1"; sha256="1nkvar9lmdvsc3c21xmrnpn0haqk03jwvc9zfxvk5nwi4m9457lg"; depends=[boot lattice]; };
@@ -7770,7 +7919,7 @@ in with self; {
   librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; };
   libsoc = derive2 { name="libsoc"; version="0.6.4"; sha256="1hdnqgnvzm5116gphxa55k2bc3ksr607px2s2yg1ilmmxdghdccw"; depends=[]; };
   libstableR = derive2 { name="libstableR"; version="1.0"; sha256="0qk70rl76lz2izgp2c1asx0yvi8xgfq1yg579kcygxk4pnxjdwv4"; depends=[Rcpp]; };
-  lidR = derive2 { name="lidR"; version="1.4.1"; sha256="01nw6i7ddk99zayblqhxsnx2cy29ippii9vdqahffv91644iqqb1"; depends=[data_table future gdalUtils geometry gstat lazyeval magrittr mapedit mapview memoise RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp stringr]; };
+  lidR = derive2 { name="lidR"; version="1.4.2"; sha256="1m37ncyj2z9yh40qzl4h3s4dpizmfqz8n0fcybpjjhi8yr3lipdf"; depends=[data_table future gdalUtils geometry gstat lazyeval magrittr mapedit mapview memoise RANN raster Rcpp RcppProgress rgeos rgl rlas settings sp stringr]; };
   lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.2"; sha256="012pfiz4l8xrwrjlzwfc0vxw1wpw2n2f2vj39mlpmg5aswg4mm8k"; depends=[markovchain Rcpp]; };
   lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; };
   lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; };
@@ -7793,7 +7942,7 @@ in with self; {
   linear_tools = derive2 { name="linear.tools"; version="1.3.0"; sha256="14lp3gifzbid82lkr7rdqajz2abp8m7y8irpwx6s8w66djjfckda"; depends=[ggplot2 magrittr plyr pryr scales stringr]; };
   linearQ = derive2 { name="linearQ"; version="1.0"; sha256="0c6ccllv4zf8zgs3957zjvnkdwbv2ryrs0f5lzk1clc233vm7acm"; depends=[Rcpp stepR]; };
   linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; };
-  lineup = derive2 { name="lineup"; version="0.37-6"; sha256="1xyvw00lwnx7j3cgk4aw69lam6ndjxx3wj14h4jpx1xn8l3w7652"; depends=[class qtl]; };
+  lineup = derive2 { name="lineup"; version="0.37-10"; sha256="1w45ll6phynn03ala0wadmp06rrgg8rcqnhz7hqy4w6q7khbkk6r"; depends=[class qtl]; };
   lingtypology = derive2 { name="lingtypology"; version="1.0.12"; sha256="03rjnr4hy7im88pawrd86nas0fzkgz3mnzdc8rclcfbbv1vyzxf5"; depends=[leaflet leaflet_minicharts magrittr MASS rowr sp stringdist]; };
   link2GI = derive2 { name="link2GI"; version="0.3-0"; sha256="0jzk1p9cygcw0xz9hqfzx74acl4ymn3jmcjj0dxrmknsvfdzcl2d"; depends=[gdalUtils raster rgdal rgrass7 RSAGA sf sp]; };
   linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; };
@@ -7814,10 +7963,11 @@ in with self; {
   listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; };
   listenv = derive2 { name="listenv"; version="0.7.0"; sha256="0ma5jsri2zqkrlsm9nqpikl7imbwfy1glsmk13mblw0q245h49k1"; depends=[]; };
   listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; };
-  listviewer = derive2 { name="listviewer"; version="1.4.0"; sha256="1273vk8pk393ciwahvpmdh9z4xdlhw3a7mlm7jsqxqnsrc6jrz3x"; depends=[htmltools htmlwidgets shiny]; };
+  listviewer = derive2 { name="listviewer"; version="2.0.0"; sha256="0fq9jdb9yahm095m5ja9j7hlv3ggigj14nlf1pdk26xj2685j8n9"; depends=[htmltools htmlwidgets shiny]; };
   liteq = derive2 { name="liteq"; version="1.0.1"; sha256="080ljgb2qsfmyppnlp9acmskgq94pmdbbgbhygqkxvzda5bbas8h"; depends=[assertthat DBI rappdirs RSQLite]; };
   littler = derive2 { name="littler"; version="0.3.3"; sha256="1cbsnm4ffzld93b9q8g6g6h6yskjfwa8j1xani5682ipb7r290x7"; depends=[]; };
-  liureg = derive2 { name="liureg"; version="1.1.1"; sha256="11cybb1i3a0na3yadzwmn1hlglqk0zdzxj0n07ygsxrdq7sxbpnj"; depends=[]; };
+  liureg = derive2 { name="liureg"; version="1.1.2"; sha256="1zhc5fs47whjvvwwiivykxfchzbjbldyvdmqh9rp7ccwba2q3956"; depends=[]; };
+  live = derive2 { name="live"; version="1.4.2"; sha256="0f04glaji3yy16mlwmizr4c7ykngqnfk7j2zx8smfn2n6biv6qg3"; depends=[breakDown data_table dplyr forestmodel ggplot2 lubridate mlr]; };
   livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; };
   ljr = derive2 { name="ljr"; version="1.4-0"; sha256="0jby94ml8w6pwnxbmv6qfjww2myvvnn9vrmlqpdh71dhgp3z35py"; depends=[]; };
   llama = derive2 { name="llama"; version="0.9.1"; sha256="1cvm58kivjw77a2fy1jwsajzl1d0i3i123p6glpwdlqn6rlharck"; depends=[BBmisc checkmate ggplot2 mlr parallelMap plyr rJava]; };
@@ -7827,8 +7977,10 @@ in with self; {
   lm_beta = derive2 { name="lm.beta"; version="1.5-1"; sha256="0p224y9pm72brbcq8y1agkcwc82j7clsnszqzl1qsc0gw0bx9id3"; depends=[]; };
   lm_br = derive2 { name="lm.br"; version="2.9.3"; sha256="1xadz0rygm58igk0ig0w45132gnsvjxvwqzca4m6v6i6lz9x55pf"; depends=[Rcpp]; };
   lmPerm = derive2 { name="lmPerm"; version="2.1.0"; sha256="1ss2hcfxqvfq4n6hypv7jp0n0apby9payxzaswaysr5368lkidn3"; depends=[]; };
-  lmSupport = derive2 { name="lmSupport"; version="2.9.11"; sha256="1yvckfahw3kq0r28ggrml7qhgm4ib5ihd971zxg62li4inrkri6b"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; };
-  lme4 = derive2 { name="lme4"; version="1.1-15"; sha256="0sc6rvhiizxxpkdc3wps200wg3pqc0d89crn29lzm75fk8qdd7vx"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
+  lmQCM = derive2 { name="lmQCM"; version="0.1.0"; sha256="0y02pbvl5qbfwnhyzilbcpswwmmq0x47ggpg7pcnhd3dv4b6w6zm"; depends=[Biobase genefilter nnet]; };
+  lmSubsets = derive2 { name="lmSubsets"; version="0.1"; sha256="0lkccpk2rxv7dlm4jlk9y3cl3s4cdlfi6schvndrk69glcx0v0zd"; depends=[]; };
+  lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; };
+  lme4 = derive2 { name="lme4"; version="1.1-17"; sha256="0czwdy1s8h3slaw73pz0h8qmqczf5135fz6i46i2dv1ql2pbq49x"; depends=[lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; };
   lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; };
   lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; };
   lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; };
@@ -7836,7 +7988,7 @@ in with self; {
   lmem_gwaser = derive2 { name="lmem.gwaser"; version="0.1.0"; sha256="0i315plqq1c8d7nvzk7jj9b3n4pgy27673pgdbii4c5bccwm12vn"; depends=[fdrtool genetics lattice LDheatmap lme4 pastecs qtl stringr]; };
   lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; };
   lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; };
-  lmerTest = derive2 { name="lmerTest"; version="2.0-36"; sha256="1ja56y45fdxa5xqwzng4rk3vjcfjvmchfcpdy08lv9dzkp71g1qp"; depends=[ggplot2 Hmisc lme4 MASS Matrix plyr]; };
+  lmerTest = derive2 { name="lmerTest"; version="3.0-0"; sha256="08n6zdyxjbch8vf4gbp339yirf3ixxdhhai8iafxf3f1q2gcr52v"; depends=[ggplot2 lme4 MASS numDeriv]; };
   lmeresampler = derive2 { name="lmeresampler"; version="0.1.0"; sha256="00v3qg5vyjjb0pcbrknzxy80kkwsypkhwkv3nsck5rscaf86y3aq"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; };
   lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; };
   lmfor = derive2 { name="lmfor"; version="1.2"; sha256="1lad1sfrf6lsksix4nn2c2dc5fx0rfm4kdhvbmqf9dc55f98rla8"; depends=[MASS nlme]; };
@@ -7852,7 +8004,7 @@ in with self; {
   lmomRFA = derive2 { name="lmomRFA"; version="3.1"; sha256="1gq5sjdywz1jbsshrh350zad7iifml2yj8an5xa63ghxiskrxscx"; depends=[lmom]; };
   lmomco = derive2 { name="lmomco"; version="2.3.1"; sha256="0nyl18kipsab4ka5ywbmw28kkr6i09w4lc9pa96m1fh765zghjxi"; depends=[goftest Lmoments MASS]; };
   lmridge = derive2 { name="lmridge"; version="1.1"; sha256="1r4g7482iz4b7jk0gj169bj96ip2wyrff1ndkwhf0qzg6r6vqa8d"; depends=[]; };
-  lmtest = derive2 { name="lmtest"; version="0.9-35"; sha256="107br1l7p52wxvazs031f4h5ryply97qywg9dzrkw4ydnvqq4j9g"; depends=[zoo]; };
+  lmtest = derive2 { name="lmtest"; version="0.9-36"; sha256="0sym9sm1vl6bbgq01jhz1plxqmgh8hrgrn7rw0mwvsalcn6id7xy"; depends=[zoo]; };
   lmvar = derive2 { name="lmvar"; version="1.4.0"; sha256="0pwpsdmqjlj79ybx5rw82qgkjzak941d9vvdzwipjh8n51mcvwcd"; depends=[Matrix matrixcalc maxLik]; };
   loa = derive2 { name="loa"; version="0.2.43.3"; sha256="0krrv5sicm4xvgilri8nwby6jlidx375b4sk273hxq7bhayw4hqq"; depends=[lattice MASS mgcv plyr png RColorBrewer RgoogleMaps]; };
   localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; };
@@ -7872,7 +8024,8 @@ in with self; {
   logcondens_mode = derive2 { name="logcondens.mode"; version="1.0.1"; sha256="1i2c2prk5j863p3a3q3xnsv684igfi5czz3dib7zfjldpf0qyaq7"; depends=[distr logcondens]; };
   logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; };
   logging = derive2 { name="logging"; version="0.7-103"; sha256="1sp7q217awizb6l8c9p5dix6skpq8j7w8i088x4mm0fc0qr1ba5c"; depends=[]; };
-  loggit = derive2 { name="loggit"; version="1.0.0"; sha256="1h2m4a55v54nvgh665rzhxhzjqkky6lx0f8f43zqh7l152z7bsh2"; depends=[dplyr jsonlite]; };
+  loggit = derive2 { name="loggit"; version="1.1.1"; sha256="1w9a3mbf863dk6lnd95mwr15rxjpv1rra1z45jnqk8w56g1s7q4d"; depends=[dplyr jsonlite]; };
+  loggle = derive2 { name="loggle"; version="1.0"; sha256="0r1r8m2ckva17vbvwkzhq1lx6bap0kbfj9hxyk46adslcf3xxrxp"; depends=[doParallel foreach glasso igraph Matrix sm]; };
   logiBin = derive2 { name="logiBin"; version="0.1.0"; sha256="146jh5cpydpvv8g3ccrglm88zp8sam4airw521cxcfyg5v8qvdqs"; depends=[data_table doParallel foreach iterators partykit]; };
   logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; };
   logistf = derive2 { name="logistf"; version="1.22"; sha256="0npwqbl8rfvn6w2y0qpkckj44mvjjccj0cn9axp2wcs03cmz0rp8"; depends=[mgcv mice]; };
@@ -7884,18 +8037,18 @@ in with self; {
   logmult = derive2 { name="logmult"; version="0.6.5"; sha256="0ak13nfgaima6g75rxbghl7xmagfp4qshj09x1fxh2r2rcags7dk"; depends=[gnm qvcalc]; };
   logspline = derive2 { name="logspline"; version="2.1.9"; sha256="1kd7ricaxbcjl6d9hx7bb5mlkr7x2h7gc8vrmfvlzxppbcghb6vw"; depends=[]; };
   lokern = derive2 { name="lokern"; version="1.1-8"; sha256="1dlyvgd2i4dckd8ic3x75r4sikwalch9b2f13xp5rhkzmfzbprxq"; depends=[sfsmisc]; };
-  lolR = derive2 { name="lolR"; version="1.0.1"; sha256="1lhhasbbpacqpc3d7bvw7q183czdjqc6xdlc7yafk7rnwgmpxjxz"; depends=[abind ggplot2 irlba MASS]; };
+  lolR = derive2 { name="lolR"; version="2.0"; sha256="0ygxm5qym1s64pa8a04jf44y786svrkhscda2x781jx8gpil753v"; depends=[abind ggplot2 irlba MASS pls]; };
   lomb = derive2 { name="lomb"; version="1.0"; sha256="06lbk7s1ilqx6xsgj628wzdwmnvbs0p03hdpx8665fhddcxh3ryy"; depends=[]; };
   longCatEDA = derive2 { name="longCatEDA"; version="0.31"; sha256="0dji41lsknfwmgb2fczzm37dm97wvi45rh878w7pwlzwdh9vq8va"; depends=[]; };
   longROC = derive2 { name="longROC"; version="1.0"; sha256="1fs11vqi4hy99d7shzzdvd6ic5gay6rh2027w6j0qpd04n8q88m8"; depends=[survival]; };
   longRPart2 = derive2 { name="longRPart2"; version="0.2.3"; sha256="1vqcsxi6c4hqrpk3ns7yhghfryin1psxl38qkz2xz8cvyn58f685"; depends=[formula_tools ggplot2 MASS nlme rpart]; };
-  longclust = derive2 { name="longclust"; version="1.2"; sha256="1m270fyvfz0w19p9xdv7ihy19nhrhjq2akymbp774073crznmmw0"; depends=[]; };
+  longclust = derive2 { name="longclust"; version="1.2.2"; sha256="1yxxz8apbl1vaqzrsiq7r5ss87j2li595bkvibpkwslgwzv47dcs"; depends=[]; };
   longitudinal = derive2 { name="longitudinal"; version="1.1.12"; sha256="1d83ws28nxi3kw5lgd5n5y7865djq7ky72fw3ddi1fkkhg1r9y6l"; depends=[corpcor]; };
   longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; };
   longmemo = derive2 { name="longmemo"; version="1.0-0"; sha256="1jnck5nfwxywj74awl4s9i9jn431655mmi85g0nfbg4y71aprzdc"; depends=[]; };
   longpower = derive2 { name="longpower"; version="1.0-16"; sha256="0hbv43y0fgbv1qiczy4kibqc7pk7whrz4kyxshg8730y8g9wyxdi"; depends=[lme4 nlme]; };
   longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; };
-  loo = derive2 { name="loo"; version="1.1.0"; sha256="0nh1jbrvm33v28gbys8sh6v4cxfzfd85561gz380b4kaahn2089l"; depends=[matrixStats]; };
+  loo = derive2 { name="loo"; version="2.0.0"; sha256="1k2qhma7gm4l3h9wf5gh1gm09map2jqcdzz3pba4gf039n8h3gsl"; depends=[matrixStats]; };
   lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; };
   loon = derive2 { name="loon"; version="1.1.1"; sha256="023vrnbn4pikiq6l57phwy9zy1lp6vxrkinrffaxwicvaj58c931"; depends=[]; };
   loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; };
@@ -7915,34 +8068,35 @@ in with self; {
   lpmodeler = derive2 { name="lpmodeler"; version="0.2-1"; sha256="17k67l03dkjx61p4hwswghjm6awk0zx173x9xafxrfd8jrgsf6kf"; depends=[slam]; };
   lpridge = derive2 { name="lpridge"; version="1.0-7"; sha256="0nkl70fwzra308bzlhjfpkxr8hpd8v1xdnah7nscxa10qlisgr2k"; depends=[]; };
   lqa = derive2 { name="lqa"; version="1.0-3"; sha256="141r2cd9kybi6n9jbdsvhza8jdxxqch4z3qizvpazjy8qifng29q"; depends=[]; };
-  lqmm = derive2 { name="lqmm"; version="1.5.3"; sha256="1gl609irhxk7qi4x8as2xylc6iybm9jyrnm7dvb92nxl0ksp44v7"; depends=[nlme SparseGrid]; };
+  lqmm = derive2 { name="lqmm"; version="1.5.4"; sha256="117g38m650mi28ff19nd71dadbdphd1ladmrip2kbsnkpcz2q37p"; depends=[nlme SparseGrid]; };
   lqr = derive2 { name="lqr"; version="1.7"; sha256="110c18wc3y3nkdwjgrksw20kvvy65822njrpy4gwb100ifigw0v7"; depends=[ghyp spatstat]; };
   lrequire = derive2 { name="lrequire"; version="0.1.3"; sha256="03c8h9v2xhlv7bj5jv117a27gaqaly2kdxs9zyihsm9yh9rg3d79"; depends=[]; };
   lrgs = derive2 { name="lrgs"; version="0.5.3"; sha256="0aqz07vg3z52lq224mapwgwr9mspa7aswzdfngg6x933aqsha4gj"; depends=[mvtnorm]; };
   lrmest = derive2 { name="lrmest"; version="3.0"; sha256="1yddkgza672z9y0ipgl92pg9prhmr387zsqf0qbi9k2yzfz2vvs6"; depends=[MASS psych]; };
   lsa = derive2 { name="lsa"; version="0.73.1"; sha256="1af8s32hkri1hpngl9skd6s5x6vb8nqzgnkv0s38yvgsja4xm1g5"; depends=[SnowballC]; };
   lsasim = derive2 { name="lsasim"; version="1.0.1"; sha256="0bwk6bv0wp30v6p55nyd1hcvwnjjddwccyy1swf6sg7lw3fy657p"; depends=[]; };
-  lsbclust = derive2 { name="lsbclust"; version="1.0.4"; sha256="0a0l1vvr4gp1vvqccjicy4qh7l2kwyh7k503yi403d0987zqywcc"; depends=[clue ggplot2 gridExtra plyr Rcpp reshape2]; };
+  lsbclust = derive2 { name="lsbclust"; version="1.0.5"; sha256="005kswkpp3qmrg5ij8999xambyyry5wajkawiwhv45niyi2hlkxv"; depends=[clue doParallel foreach ggplot2 gridExtra mvtnorm plyr Rcpp reshape2]; };
   lsdv = derive2 { name="lsdv"; version="1.1"; sha256="0rl1xszr9r8v71j98gjpav30n2ncsci19hjlc9flzs1s20sb1xpr"; depends=[]; };
   lsei = derive2 { name="lsei"; version="1.2-0"; sha256="1xl06fb3is744pxlh42wx5hn1h0ab1k31wnmsmh0524kxzcyp0a7"; depends=[]; };
-  lsgl = derive2 { name="lsgl"; version="1.3.6"; sha256="0zkv5xgwrnwx0w0qpzsg7krd7fdnlr3a85q64xj1wx0gd578dqq6"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; };
   lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; };
   lslx = derive2 { name="lslx"; version="0.6.2"; sha256="0girzjmkmqym5bnw492991smyhvlz7xw70n8hlswpa4lw3x15q2n"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; };
+  lsm = derive2 { name="lsm"; version="0.1.6"; sha256="1j68jvb7gvgr77wpq1gzh1jw3cs94im1zrlnvw4jnbgbzsmpql99"; depends=[]; };
   lsmeans = derive2 { name="lsmeans"; version="2.27-61"; sha256="0qw4lkgaynld56ywvdyy5nqvq7c6r2v24gsy54rkcw2n4xhlnahm"; depends=[coda estimability multcomp mvtnorm nlme plyr xtable]; };
+  lspartition = derive2 { name="lspartition"; version="0.1"; sha256="1c2wp9yl0jzvbh181flzywwqmm6xr5jg9qbfibw4ja9wf6xnfx8w"; depends=[combinat ggplot2 MASS matrixStats mgcv pracma]; };
   lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; };
   lspls = derive2 { name="lspls"; version="0.2-1"; sha256="1g27fqhnx9db0zrxbhqr76agvxy8a5fx1bfy58j2ni76pki1y4rl"; depends=[pls]; };
   lsplsGlm = derive2 { name="lsplsGlm"; version="1.0"; sha256="1qh68r033fwq1hc19h2srl1k6znvvvrcp38ghxadsksjfxllvniy"; depends=[]; };
   lsr = derive2 { name="lsr"; version="0.5"; sha256="0q385a3q19i8462lm9fx2bw779n4n8azra5ydrzw59zilprhn03f"; depends=[]; };
   lss = derive2 { name="lss"; version="0.52"; sha256="1fvs8p9rhx81xfn450smnd0i1ym06ar6nwwcpl74a66pfi9a5sbp"; depends=[quantreg]; };
   ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; };
-  ltm = derive2 { name="ltm"; version="1.1-0"; sha256="1gxjz3rn5bacv7xdlinzk6rdcwragb76grjpk5wqs4shqbk0rld2"; depends=[MASS msm polycor]; };
+  ltm = derive2 { name="ltm"; version="1.1-1"; sha256="1qrgzwx5l58qf5rfp1knxc84r0g943q5sdr3ky74zzwpnmrf2vf7"; depends=[MASS msm polycor]; };
   ltmle = derive2 { name="ltmle"; version="1.0-1"; sha256="0g3nybhxz7mivqkzvlzkasc1m489s4fsi4874wvlhqg3x3mww0x9"; depends=[Matrix matrixStats speedglm]; };
   ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; };
   ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; };
   ltsk = derive2 { name="ltsk"; version="1.0.5"; sha256="0x142w2l6qaqw1kmx5kix7lkadaw2kl8dqx11d091vqj2imi9wlr"; depends=[fields gstat sp]; };
   ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; };
-  lubridate = derive2 { name="lubridate"; version="1.7.3"; sha256="1pzkqfiahnsdm3zx46asgn8fw43vlxvbh7r4cn70c7ffmxabzzrc"; depends=[Rcpp stringr]; };
+  lubridate = derive2 { name="lubridate"; version="1.7.4"; sha256="14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i"; depends=[Rcpp stringr]; };
   luca = derive2 { name="luca"; version="1.0-5"; sha256="1jiqwibkrgga4ahz0qgpfkvrsxjqc55i2nwnm60xddb8hpb6a6qx"; depends=[genetics survival]; };
   lucid = derive2 { name="lucid"; version="1.4"; sha256="1kwl9h7ynp8nhny51xskrbgc3060bawxjkdijhsjzss2hbbygwds"; depends=[nlme]; };
   lucr = derive2 { name="lucr"; version="0.2.0"; sha256="0v5g72cl9fg3b3ix34bsmjwwqrnm4ivgcd5mm98c5jd8rrz1xkwq"; depends=[httr Rcpp]; };
@@ -7993,15 +8147,16 @@ in with self; {
   magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; };
   magicaxis = derive2 { name="magicaxis"; version="2.0.3"; sha256="08nkf9k2ijlm52ybncfiwrghy911wpvwpvdvllcz2d4slk1vdakj"; depends=[celestial mapproj MASS plotrix sm]; };
   magicfor = derive2 { name="magicfor"; version="0.1.0"; sha256="07l33fczr1x42sfxrsqq4q6r65sdflin6l8f5cgclnvx1858jdip"; depends=[]; };
-  magick = derive2 { name="magick"; version="1.7"; sha256="09dcgfbpp6lls943yps3qaylrs6n9dd1svwab5rmwj0fa4ph2by4"; depends=[curl knitr magrittr Rcpp]; };
+  magick = derive2 { name="magick"; version="1.8"; sha256="0qi86fhqaxad9bbigfv1czxhxqi3x49376pyhfkw7lc7r2fxkx6y"; depends=[curl knitr magrittr Rcpp]; };
   magree = derive2 { name="magree"; version="1.0"; sha256="1qkd6p5g3aigcb0f4d08gc5323alvahzmazm3bzsmz1w033xd1hh"; depends=[]; };
   magrittr = derive2 { name="magrittr"; version="1.5"; sha256="1s1ar6rag8m277qcqmdp02gn4awn9bdj9ax0r8s32i59mm1mki05"; depends=[]; };
   mail = derive2 { name="mail"; version="1.0"; sha256="1m89cvw5ba4d87kp2dj3f8bvd6sgj9k56prqmw761q919xwprgw6"; depends=[]; };
   mailR = derive2 { name="mailR"; version="0.4.1"; sha256="1bfh3fxdqx9f9y3fgklxyslpcvhr9gcj7wsamaxzgrcsaxm8fdlw"; depends=[R_utils rJava stringr]; };
   makeFlow = derive2 { name="makeFlow"; version="1.0.2"; sha256="0r7a0klgx144rnks0fhjflnf8vfyyx2544n86nnxkp6cdvw0b4pw"; depends=[dplyr RColorBrewer]; };
   makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; };
-  makedummies = derive2 { name="makedummies"; version="1.0"; sha256="1kyx0n620pnaaxi136f81kr55v94zlw2bikrky1sq9bhrvdlf7yh"; depends=[]; };
+  makedummies = derive2 { name="makedummies"; version="1.1"; sha256="1qpkghlgkzpzai290kidkmwhn4aj0balb17rs2l5amsml942lq0a"; depends=[]; };
   malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; };
+  malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.1"; sha256="1c1bvfs1azvlci2yrgw5xlr460fdjwikm3vsdfz8lj1xzs1w220c"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal sp stringi tidyr xml2]; };
   mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; };
   managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; };
   mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; };
@@ -8010,19 +8165,19 @@ in with self; {
   manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; };
   manifestoR = derive2 { name="manifestoR"; version="1.2.4"; sha256="1hd4qsa2xsa1dq5jnwh1bph34glkpaabjmsnavdjhkfzjilp32ya"; depends=[base64enc dplyr functional httr jsonlite magrittr NLP psych tibble tm zoo]; };
   manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; };
-  manipulateWidget = derive2 { name="manipulateWidget"; version="0.8.0"; sha256="19vcf3q2q8r53dygc8kh7pbcbjs9q6knylz2jnc9pwxq3wdkbrp7"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny]; };
+  manipulateWidget = derive2 { name="manipulateWidget"; version="0.9.0"; sha256="18zk1f3dk63crpfpljafakdvfvd0494kbws0dwahwfr60avvvx2v"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny]; };
   mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; };
   mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; };
-  mapdata = derive2 { name="mapdata"; version="2.2-6"; sha256="0k3hsnyvax20jph384gca10rl7a9fcglgkqcjsc5hndx3qrwpanv"; depends=[maps]; };
+  mapdata = derive2 { name="mapdata"; version="2.3.0"; sha256="0xnxh73rgcq55zrw81a2bq8yd67bxc2rafp4shf6nyrqj04iip0y"; depends=[maps]; };
   mapedit = derive2 { name="mapedit"; version="0.4.1"; sha256="1dy87kmwra917716r99hp139fbxy3z0cx03cw61b832isizd0b51"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras mapview miniUI sf shiny]; };
   mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; };
   mapfuser = derive2 { name="mapfuser"; version="0.1.2"; sha256="1q7l6rfs6dv76ifizfqq4pdpjpb2zwzd3vvrnhdzh8vw2mrlqcjg"; depends=[doParallel dplyr foreach ggplot2 igraph lazyeval LPmerge mgcv plotly stringi tidyr visNetwork]; };
-  mapmisc = derive2 { name="mapmisc"; version="1.7.0"; sha256="0m8a0zzdrmqkkv9clfar9acij80fmanqny08g9xlir14620aq38c"; depends=[raster sp]; };
+  mapmisc = derive2 { name="mapmisc"; version="1.7.2"; sha256="0w0yvdnxk6gjcc86b6imq764va9f9hjan3ayw7qrbjpqx16fs7dx"; depends=[raster sp]; };
   mapplots = derive2 { name="mapplots"; version="1.5"; sha256="09sk78a0p8hlwhk3w2dwvpb0a6p7fqdxyskvz32p1lcav7y3jfrb"; depends=[]; };
-  mapproj = derive2 { name="mapproj"; version="1.2-5"; sha256="0rjz37r4rizk2c6jaf54f0kfb60dqv6b262cnhiwjl55d4x6l0pk"; depends=[maps]; };
-  mapr = derive2 { name="mapr"; version="0.3.4"; sha256="14f7zfzxb1h935bbybj2l2n4a62cnq0wvgmc09in0fvnl75jl971"; depends=[ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; };
-  maps = derive2 { name="maps"; version="3.2.0"; sha256="0577f3b5d3a7djl7r0miy9mzr6xq6jb32p8nyrma7m2azasbwyj3"; depends=[]; };
-  mapsapi = derive2 { name="mapsapi"; version="0.3.0"; sha256="070dckm5dkicmwkpji4zvap9h9rl3n3l7fxhz2ryslblbrzx70fn"; depends=[bitops magrittr plyr sf xml2]; };
+  mapproj = derive2 { name="mapproj"; version="1.2.6"; sha256="1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2"; depends=[maps]; };
+  mapr = derive2 { name="mapr"; version="0.4.0"; sha256="169ah9v7cpw3hmaj6n575gi1zwazf4vh59n46zghb1x68nc2gqs0"; depends=[data_table ggplot2 gistr jsonlite leaflet RColorBrewer rworldmap sp spocc]; };
+  maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; };
+  mapsapi = derive2 { name="mapsapi"; version="0.3.5"; sha256="0v33kkny98xql6m6rp2xh39rsp00r1crpin8gqw5wh5x28n20sna"; depends=[bitops magrittr plyr sf xml2]; };
   maptools = derive2 { name="maptools"; version="0.9-2"; sha256="075lmb3b62171cw2dg8fv1vwmvfzg39r1ji7jwb8s5k9dz88ry1v"; depends=[foreign lattice sp]; };
   maptpx = derive2 { name="maptpx"; version="1.9-2"; sha256="1i5djmjg0lsi7xlkbvn90njq1lbyi74zwc2nldisay4xsbgqg7fj"; depends=[slam]; };
   maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; };
@@ -8031,20 +8186,19 @@ in with self; {
   march = derive2 { name="march"; version="1.4"; sha256="1wfhm33k2j5yim56sg0wd02ypfhlp9fc138vmdsdjp6nh4y23hnj"; depends=[]; };
   marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; };
   marelac = derive2 { name="marelac"; version="2.1.6"; sha256="024gbrdby6h722j58wl8xn8027sanlpnz1l3hhxnllwzbz3mbdz4"; depends=[seacarb shape]; };
-  marg = derive2 { name="marg"; version="1.2-2"; sha256="0j08zzcrj8nqsargi6xi50gy9pl4smmsp4b7ywlga7r1ga38g82r"; depends=[statmod survival]; };
+  marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; };
   margins = derive2 { name="margins"; version="0.3.0"; sha256="0i6c39acyyvxsx2lkza2afjyhpdlb9fx0zssr24g0xdk3f7c2dc2"; depends=[MASS prediction]; };
   marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; };
   marinespeed = derive2 { name="marinespeed"; version="0.1.0"; sha256="1r9bpggb88px8149dsga3xmkjhjq6ybs6a5kp60qz28iyr183mar"; depends=[bit geosphere sp]; };
   markdown = derive2 { name="markdown"; version="0.8"; sha256="1vcgsh2m2f5kfgappgg71nbf04ff0j1sbk668krjs3r2n89dk3sk"; depends=[mime]; };
-  marked = derive2 { name="marked"; version="1.1.13"; sha256="0zgfd7fdcrvvqnlgzarly16zjnipshxsa1g3j9jqc5kbqvh7fnh2"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
+  marked = derive2 { name="marked"; version="1.2.1"; sha256="138m1clidyhahpz111iblff2w44m8zp0302vcj46frk1c60c46qi"; depends=[coda expm lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; };
   markmyassignment = derive2 { name="markmyassignment"; version="0.8.1"; sha256="1y388s73b1zs482d1d7z40kg4hizp46lc3279xspm2ryx4m49mzj"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; };
   markophylo = derive2 { name="markophylo"; version="1.0.6"; sha256="1gyj3ykwh4ljrb5s80hihy7wl89y3p4xkckspvv4ynl9lnsbm7cs"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; };
   markovchain = derive2 { name="markovchain"; version="0.6.9.8-1"; sha256="1av89829fwnf2bll7b75v2vrglw4130d5c42c3i1fiqh54jxjy7k"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; };
   marl = derive2 { name="marl"; version="1.0"; sha256="0rndnf3rbcibv3gsrw1kfp5zhg37cw9wwlz0b7dbwprd0m71l3pm"; depends=[]; };
-  marmap = derive2 { name="marmap"; version="0.9.6"; sha256="1b0mpygk18ri0xs9f56j2g7zmka7krnw7fmh9m9xisbvq2g23g92"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
+  marmap = derive2 { name="marmap"; version="1.0"; sha256="187zqmpdd4kl5dviphfzdhjlaa9bss1gx4wxxc8zgn4q1g66f4c2"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; };
   marqLevAlg = derive2 { name="marqLevAlg"; version="1.1"; sha256="1wmqi68g0flrlmj87vwgvyxap0miss0n42qiiw7ypyj4jw9kwm8j"; depends=[]; };
   mason = derive2 { name="mason"; version="0.2.5"; sha256="1v2gja8kbwzx5c8y8gchh4rwwprv99ad0nhgb0hnfgjnqsbdmdv7"; depends=[assertive broom dplyr lazyeval magrittr tidyr]; };
-  matR = derive2 { name="matR"; version="0.9"; sha256="0lih3g2z6rxykprl3s529xcf466bpzpsv4l20dkgx1fgfslfcl2p"; depends=[BIOM_utils MGRASTer]; };
   matchMulti = derive2 { name="matchMulti"; version="1.1.6"; sha256="05nkrncrf7vq2bmqbhm9n6p6cyb4drbhjrrfdcw6qcdgvh3bbiy0"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; };
   matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; };
   matchingMarkets = derive2 { name="matchingMarkets"; version="0.3-5"; sha256="083gnqjxvzgqd0lvg13qwzw3cp1imp4xn2nacspfxqg4878jjpn3"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; };
@@ -8056,7 +8210,7 @@ in with self; {
   matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; };
   matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; };
   matlabr = derive2 { name="matlabr"; version="1.5.0"; sha256="0gy639fv0b85h4z96b2b3m635q4w62q63kfxfqny3pwr0r5vsc2p"; depends=[stringr]; };
-  matlib = derive2 { name="matlib"; version="0.8.1"; sha256="080mbmr1lb5ha5ql40hv0idcnnbyaai46c42z756kdyq9pdzcabf"; depends=[car rgl]; };
+  matlib = derive2 { name="matlib"; version="0.9.1"; sha256="03991ckrfk663pdi9q2a4sms9csr1dkr075dsycqggr96yp1cwh8"; depends=[car MASS rgl xtable]; };
   matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; };
   matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; };
   matrixStats = derive2 { name="matrixStats"; version="0.53.1"; sha256="0bkiz5fm09d3512mfr2ymj9qsb1b8aic5l5m6fkaf5j7nsgvqw6z"; depends=[]; };
@@ -8067,6 +8221,7 @@ in with self; {
   mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; };
   maxLik = derive2 { name="maxLik"; version="1.3-4"; sha256="0jjb5kc7dvx940ybg7b7z9di79v75zm2xlb0kj2y7rmi45vvh6hq"; depends=[miscTools sandwich]; };
   maxTPR = derive2 { name="maxTPR"; version="0.1.0"; sha256="13x5rz0mfha5pzahkk4x67ncz9v77sa690cyl6wigwsldsrvzr3h"; depends=[aucm Rsolnp]; };
+  maxadjAUC = derive2 { name="maxadjAUC"; version="0.1.0"; sha256="04zdaqmavhhrj63s2k5pqncvlzbfnxan7r0fagfka9dypwwcl5qm"; depends=[aucm Hmisc Rsolnp survival]; };
   maxent = derive2 { name="maxent"; version="1.3.3.1"; sha256="1skc7d0p6kg0gi1bpgaqn2dmxjzbvcphx5x3idpscxfbplm5v96p"; depends=[Rcpp SparseM tm]; };
   maxlike = derive2 { name="maxlike"; version="0.1-7"; sha256="0gi33hcjj456sjw7l3q4n46k4cb6m3ml3ycd93pnajxacl24swbb"; depends=[raster]; };
   maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; };
@@ -8091,21 +8246,22 @@ in with self; {
   mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; };
   mcbiopi = derive2 { name="mcbiopi"; version="1.1.2"; sha256="12h4bv3hx1m6bsqdxj5n3b5gh98ms508am8pigz7ckmv0xkyhx85"; depends=[]; };
   mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; };
-  mcca = derive2 { name="mcca"; version="0.2.0"; sha256="01c7dp9m8vqffhq0ixsqcfw40jsmb6dwiblym31h84f9s0x4f00j"; depends=[e1071 MASS nnet pROC rpart]; };
+  mcca = derive2 { name="mcca"; version="0.3.0"; sha256="0fmlqk4q2vy7gzxhvb9249f1644jlvy755cpda8kvwp9qk55bp4p"; depends=[caret e1071 MASS nnet pROC rpart]; };
   mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; };
   mccr = derive2 { name="mccr"; version="0.4.4"; sha256="1scqds1yx317qmjappy2h1m564dcmsqqfpdm8pm3plalag16xrhj"; depends=[]; };
   mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; };
   mcga = derive2 { name="mcga"; version="3.0.1"; sha256="0q0nn881lii8wfw28k8jh9z0kbi5ljcwi2wpq460k2w3agsjzw5n"; depends=[GA Rcpp]; };
   mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; };
-  mcglm = derive2 { name="mcglm"; version="0.3.0"; sha256="1q2zc0xn4inp9inadb52yc0svbh581qxxjzc08pgrm9l3xms4a14"; depends=[assertthat Matrix]; };
+  mcglm = derive2 { name="mcglm"; version="0.4.0"; sha256="0k5zkdq3c4fvyhk0lfwikmrxcrd2hg3s820l8rswz7xhl645zr5a"; depends=[assertthat Matrix]; };
   mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; };
-  mclcar = derive2 { name="mclcar"; version="0.1-8"; sha256="1hrjfjbsxh8g6bw2cfxciry8hn9xxfg4bww5p1sjq98v8bsqcx23"; depends=[fields maxLik nleqslv rsm spam spdep]; };
+  mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; };
   mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; };
   mclogit = derive2 { name="mclogit"; version="0.5.1"; sha256="1qnkkjq7gxivpz3mmbq5dx9a128r3xhrdzx96kc80h3w67yc7hbl"; depends=[Matrix memisc]; };
   mclust = derive2 { name="mclust"; version="5.4"; sha256="1i3v1q8qq0al3ifvjhcvxfsg68cx9mq8jz67jwmiqai78mw0aqvk"; depends=[]; };
-  mclustcomp = derive2 { name="mclustcomp"; version="0.2.0"; sha256="0ijsy1p80bqbknw9did3dqa90ck7zd0xplvw870578h4x5q30qdp"; depends=[Rcpp RcppArmadillo]; };
+  mclustcomp = derive2 { name="mclustcomp"; version="0.3.0"; sha256="02j87p2z9z3b8kxnvnm1syjpv6axcs09fs3mnrl1n2q6jyc4gwsr"; depends=[Rcpp RcppArmadillo Rdpack]; };
   mcmc = derive2 { name="mcmc"; version="0.9-5"; sha256="1i3rahph8pbhi5dsyjnkazqklg4lhh3azlyvx4kvabx50q0awxn6"; depends=[]; };
   mcmcplots = derive2 { name="mcmcplots"; version="0.4.2"; sha256="0ws2la6ln016l98c1rzf137jzhzx82l4c49p19yihrmrpfrhr26l"; depends=[coda colorspace denstrip sfsmisc]; };
+  mcmcr = derive2 { name="mcmcr"; version="0.0.1"; sha256="0g64df8v6snbcmk0kynfppq1mqaz9z8apfsm1zn3ch5q2afg0kqy"; depends=[abind checkr coda tibble]; };
   mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; };
   mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; };
   mcompanion = derive2 { name="mcompanion"; version="0.4-5"; sha256="18l29cbggf5mdab8vdzmbsnc0p77llaq3ylp07a7gsq44bys8zq0"; depends=[gbutils MASS Matrix Rdpack]; };
@@ -8123,7 +8279,7 @@ in with self; {
   mdhglm = derive2 { name="mdhglm"; version="1.6"; sha256="1lvckais4c3pbf6zrpfkdlyqhcg4jaw11n00622h9ks413fl788v"; depends=[boot Matrix mvtnorm numDeriv]; };
   mdmb = derive2 { name="mdmb"; version="0.6-17"; sha256="1ydvfjqid7bsgryr8j77ajmh2q40s3gh67n8027f70pa8amr9fnq"; depends=[CDM coda MASS miceadds sirt TAM]; };
   mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; };
-  mdsOpt = derive2 { name="mdsOpt"; version="0.2-2"; sha256="1wg0f2a3z5pdiw8lljfrifn7lf00rza8rmrdh61dmna2nkrg9j4g"; depends=[clusterSim smacof symbolicDA]; };
+  mdsOpt = derive2 { name="mdsOpt"; version="0.3-1"; sha256="0fyzmbaqnj42nhl32cj1kycrqkfx2qvb5vpi0qj98fi6iwsa4psq"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; };
   mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; };
   mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; };
   mdsr = derive2 { name="mdsr"; version="0.1.5"; sha256="0b80l478v68w91vsmvvyvnmk0yasybmm013psy4181lhvxc93kma"; depends=[babynames DBI dbplyr downloader dplyr ggplot2 mosaic RMySQL tidyverse]; };
@@ -8132,7 +8288,7 @@ in with self; {
   meanShiftR = derive2 { name="meanShiftR"; version="0.51"; sha256="0qcciayriygfwkb15n863amcpcfl97fr1sarwm3d269idf5m7w6x"; depends=[]; };
   meanr = derive2 { name="meanr"; version="0.1-1"; sha256="080x21jnbsl6qlrgv12p9qd332ciph3lh18fgs9jagfyygf4f9hg"; depends=[]; };
   measuRing = derive2 { name="measuRing"; version="0.5"; sha256="0yblqkv5444y75jkb6d0zs728i6vybm294h7b5622pwfjqlfhnh2"; depends=[dplR pastecs png tiff]; };
-  measurements = derive2 { name="measurements"; version="1.1.0"; sha256="1zi6mpwyxycbphq48s7vfc8gm76nidpa2gafp0jxiv56rwpv3jc3"; depends=[]; };
+  measurements = derive2 { name="measurements"; version="1.2.0"; sha256="1k47xmydgd9lhc6phr40zphnibiq817f5nf8619ibla2pridjn1l"; depends=[]; };
   meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; };
   mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; };
   medfate = derive2 { name="medfate"; version="0.2.2"; sha256="1vw9j04063sjwyfdkk94xsgz5zps7vmqha6dbsvi8ncb951cfijp"; depends=[meteoland Rcpp sp spdep]; };
@@ -8143,27 +8299,27 @@ in with self; {
   medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; };
   meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; };
   mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; };
-  mefa4 = derive2 { name="mefa4"; version="0.3-4"; sha256="11zg30i2fkxdv8fn7jilbmm7k5g0ls8f91bpq6qiwiagwg8gj2lh"; depends=[Matrix pbapply]; };
+  mefa4 = derive2 { name="mefa4"; version="0.3-5"; sha256="19khmc7jxwlvjyr5gpmmz4pv60xzgjw3npx1iqv1ayx8ghpsmaj0"; depends=[Matrix pbapply]; };
   meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; };
   mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; };
-  meltt = derive2 { name="meltt"; version="0.3.3"; sha256="08qifdpk0c9digpayw1d9h2p9q4nyrlihg8kjqacirb5wh39wr6r"; depends=[ggmap ggplot2 plotGoogleMaps plyr reticulate scales sp]; };
+  meltt = derive2 { name="meltt"; version="0.4.0"; sha256="0m0r7in1s8vq2pvq7pxgwjfhqds8pwhcrn5hy0wa126s1y88v34x"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; };
   melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; };
   mem = derive2 { name="mem"; version="2.12"; sha256="0075i2mbkck06bljck44d26ys68p8vjfb1jhgzrjy1sv2g2w0qa8"; depends=[boot dplyr ggplot2 mclust RColorBrewer reshape2 sm stringr tidyr]; };
-  memapp = derive2 { name="memapp"; version="2.8"; sha256="0y5wl0rv1s8dgxhb0q42wy5rlj4smw9pz7a4j23195llql8lfc9m"; depends=[dplyr DT formattable ggplot2 ggthemes magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; };
-  meme = derive2 { name="meme"; version="0.1.1"; sha256="102z3zgfldggcykb7wlmw0wbdas6jbpvy2kfdps0wky3j552ir95"; depends=[ggplot2 magick showtext sysfonts]; };
+  memapp = derive2 { name="memapp"; version="2.9"; sha256="1g53c90yvh34jisbcy5nvch7yyi7yxx7sg32492rk97h6hr2j8qv"; depends=[dplyr DT formattable ggplot2 ggthemes magrittr mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes stringi stringr tidyr]; };
+  meme = derive2 { name="meme"; version="0.2.0"; sha256="17zpnspc90nlga3iyl4ahasr70mnrhzja4pz7zhmjddhzjs8x3sz"; depends=[ggplot2 magick showtext sysfonts]; };
   memery = derive2 { name="memery"; version="0.4.2"; sha256="0wfp3hf567a1q6mhrsgn4hr8x52yp4na8783f2d19hm0c3r4z51q"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; };
   memgene = derive2 { name="memgene"; version="1.0"; sha256="00b1mi2hvzzps542mh2p96s27kjqkpcic7djklfcwnfn1m4bz0i5"; depends=[ade4 gdistance raster vegan]; };
   memisc = derive2 { name="memisc"; version="0.99.14.9"; sha256="1gh6shm9nwfjwfi5f4cz2jsldfdnkj6f73279l86wki5gdf36zri"; depends=[lattice MASS repr]; };
   memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; };
   memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; };
   memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; };
-  merDeriv = derive2 { name="merDeriv"; version="0.1-3"; sha256="0kgmv220nlg0r31bwg5qxkc8ybngg4c5q16bkknzf4khmbx19iwm"; depends=[lme4 Matrix nonnest2 sandwich]; };
+  merDeriv = derive2 { name="merDeriv"; version="0.1-4"; sha256="1gkxc2bf4fx3vbf1nq1g713hhhx7031wchxmgr2ydwfrighwf8qg"; depends=[lme4 Matrix nonnest2 sandwich]; };
   merTools = derive2 { name="merTools"; version="0.3.0"; sha256="1kc32zm1wmmivf1qfs6vi7y8kwibj6sr540is82dyh7xdmbc5mx3"; depends=[abind arm blme broom dplyr DT ggplot2 lme4 mvtnorm shiny]; };
   merror = derive2 { name="merror"; version="2.0.2"; sha256="13d9r5r83zai8jnzxaz1ak40876aw20zbpr244gs55rvj5j7f87q"; depends=[]; };
   meshsimp = derive2 { name="meshsimp"; version="0.1.1"; sha256="0cdgq4vfjf0h6l55v687k5xs0nwmlpqmw424xgnsfnwxw5ljcvb1"; depends=[plot3D Rcpp RcppEigen]; };
   metRology = derive2 { name="metRology"; version="0.9-26-2"; sha256="1i9lxgphn8nmkcp2zgjs6ylbccmfgv9lfch00xmx1xfb538jz82q"; depends=[MASS numDeriv robustbase]; };
-  metScanR = derive2 { name="metScanR"; version="1.1.1"; sha256="0cl3vfh8hcx230xpv5611liwk7jr49a2akz18f641yd04akk7f19"; depends=[geosphere leaflet plyr RColorBrewer RCurl]; };
-  meta = derive2 { name="meta"; version="4.9-0"; sha256="012yhxbn114q8bf75mm8ap11q33a5azzkh1b811saq77p1f6lwgq"; depends=[]; };
+  metScanR = derive2 { name="metScanR"; version="1.2.0"; sha256="1x32f23w5f3s7sc5gbbqzq9s83clarskj9vpnfnwryrx87dg1jjc"; depends=[geosphere leaflet plyr RColorBrewer RCurl]; };
+  meta = derive2 { name="meta"; version="4.9-1"; sha256="1nv8yzcwamflcii5x6l3h5p1q7q4xrd74v40njnpgmhkn4vrkyax"; depends=[]; };
   meta4diag = derive2 { name="meta4diag"; version="2.0.7"; sha256="024rxnqzw9xydy0mm1w38s739qgkzjsifq23bwpvkwj0x0jnwry0"; depends=[caTools shiny shinyBS sp]; };
   metaBMA = derive2 { name="metaBMA"; version="0.3.9"; sha256="14c3q4aw89r3apzm0ils886xsc6agbn8d2wgp47dc2ddwf5n8p58"; depends=[coda LaplacesDemon logspline mvtnorm runjags]; };
   metaLik = derive2 { name="metaLik"; version="0.42.0"; sha256="1rk5mwgmgnqq2hrzbh936hzw3aa815l12r1a1qywap5ggmmyhszl"; depends=[]; };
@@ -8171,6 +8327,7 @@ in with self; {
   metaMix = derive2 { name="metaMix"; version="0.2"; sha256="0xlsdgincxwjzyr4i8qfmfw2wvgf41qbmyhf2rxcbarf7rmwhmqf"; depends=[data_table ggplot2 gtools Matrix Rmpi]; };
   metaRNASeq = derive2 { name="metaRNASeq"; version="1.0.2"; sha256="1xz7df7ypq4326yg429pgxd6aldp14c3h3qi20j5nqr5xgsdgzqa"; depends=[]; };
   metaSEM = derive2 { name="metaSEM"; version="1.0.0"; sha256="1i77w7b6xbi8p43s9vicj121kz7f3qp1zhqwy6qc5xcj9qaqjklp"; depends=[ellipse lavaan MASS Matrix mvtnorm numDeriv OpenMx]; };
+  metaboGSE = derive2 { name="metaboGSE"; version="1.0.2"; sha256="1nfcjplry2ba98yi3flk6zcvlys57gri3582mylh543xkcvlrifz"; depends=[AnnotationDbi ape Matrix sybil topGO]; };
   metabolomics = derive2 { name="metabolomics"; version="0.1.4"; sha256="0m5d2784mkpkkg396y3vpvf38vmba5kvxarilq3zf818vjs4pnax"; depends=[crmn gplots limma]; };
   metacart = derive2 { name="metacart"; version="1.0-0"; sha256="13dp9yz6yjd2jc7lf3w3ac3vk69ry7zygf6xnvzrcwsdmxd0258n"; depends=[ggplot2 gridExtra rpart rpart_plot]; };
   metacoder = derive2 { name="metacoder"; version="0.2.0"; sha256="0dyd16yy7adpyksfpg6d414s1l6nls5hv1k938mn7fji1px14sgj"; depends=[ape biomformat cowplot dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr taxa taxize traits vegan zoo]; };
@@ -8185,18 +8342,18 @@ in with self; {
   metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; };
   metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="1.0.0"; sha256="1wzy5dnmrdfdj1386snjyisrbzbq8v4qsnq57l3wvkg1pgnz1vh2"; depends=[]; };
   metamisc = derive2 { name="metamisc"; version="0.1.8"; sha256="06dzjnrbxqkb0d0zcdxg8fyadsbq0f0fca4xifjz16yjz1047n5k"; depends=[ellipse ggplot2 lme4 metafor mvtnorm plyr]; };
-  metansue = derive2 { name="metansue"; version="2.0"; sha256="102cddahlzm0b76y6pr7jxqxf28j6y3hsjd17fpnyvrwnzhqbz5m"; depends=[]; };
+  metansue = derive2 { name="metansue"; version="2.1"; sha256="0mklpnb9m0pynz3x0fin003zz0n1v6i0fdcahny70y1yxiy5agcs"; depends=[]; };
   metap = derive2 { name="metap"; version="0.8"; sha256="06ny9zkilawdy0s8yiwhnygs3yppw89bbyf76zgdavykbzscz5lh"; depends=[lattice]; };
-  metaplot = derive2 { name="metaplot"; version="0.4.6"; sha256="1qh7v7s8jrdpjzyw41zjlwv8dlq7k49zi2h5slk0jfa9jd635w4x"; depends=[dplyr encode lattice magrittr rlang tidyr]; };
+  metaplot = derive2 { name="metaplot"; version="0.4.9"; sha256="1nbnyh03n1kkkl4v80nbbbnkrzs1a5ri210x9q4m2v87jrcikllw"; depends=[dplyr encode lattice magrittr rlang tidyr]; };
   metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; };
-  metaplus = derive2 { name="metaplus"; version="0.7-10"; sha256="066w0klii6a82mq4kdzbx3ccshmsxikym9x8w288pjw92r2z2cfn"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
+  metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; };
   metasens = derive2 { name="metasens"; version="0.3-2"; sha256="1wxp6gzq3wmas8hm8vqxclawxkc4p8dw2apzmg0nciqvas6dzic8"; depends=[meta]; };
   metatest = derive2 { name="metatest"; version="1.0-4"; sha256="0bz6gg2n4ffkr144jxk27y24xpqhp8awr09wkaijmv8902qx6qah"; depends=[]; };
   metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; };
-  metaviz = derive2 { name="metaviz"; version="0.1.1"; sha256="1myhh16a7mad4gidl2xhnfv940gjqhbl8rlg6vrwvawgaiwigbxp"; depends=[ggplot2 metafor nullabor plyr RColorBrewer]; };
+  metaviz = derive2 { name="metaviz"; version="0.2.0"; sha256="1a4qwhg3lb5jxnddmi7zf2sc2yjzjap3rh6hfm3965bydpf1q57c"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; };
   meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; };
   meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; };
-  meteoForecast = derive2 { name="meteoForecast"; version="0.51"; sha256="1k5m561b6hpqvzrg5l16523ig1rxcsi4s172jmya039cwyk8mqfp"; depends=[ncdf4 raster sp XML zoo]; };
+  meteoForecast = derive2 { name="meteoForecast"; version="0.52"; sha256="1v9p2l45jzzim10pmy4y1hzc68sxawd996sri6dw7hnalfqfiyxj"; depends=[ncdf4 raster sp XML zoo]; };
   meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; };
   meteoland = derive2 { name="meteoland"; version="0.7.1"; sha256="1nsn4z3gbkcdhgyn13fjcpsyb0lb85kiyy6fhirlnw63dwr56a2l"; depends=[curl ncdf4 ncdf4_helpers qmap Rcpp rgdal sp spdep]; };
   metricTester = derive2 { name="metricTester"; version="1.3.4"; sha256="1z4z8km1jr0azh2zxp1sffm5picc9y6w9yn68zr1axli0l64y3a0"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR]; };
@@ -8204,12 +8361,13 @@ in with self; {
   mets = derive2 { name="mets"; version="1.2.3"; sha256="1f1mqpzpvh5vb8b8w72q13jhk978bcvwipf4bx3kzzgsf6yfxk5s"; depends=[lava numDeriv Rcpp RcppArmadillo survival timereg]; };
   mev = derive2 { name="mev"; version="1.11"; sha256="0iqcslnchap8zh4s3bllqqb8z0klpzg2pn8ays1xk66lj5ywl390"; depends=[boot evd gmm ismev nleqslv nloptr numDeriv Rcpp RcppArmadillo revdbayes rootSolve]; };
   mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; };
-  mexhaz = derive2 { name="mexhaz"; version="1.4"; sha256="1c3n8g93pb38dw45ls6wh81giqw7zkksh2rmpbw46ink23ks12ij"; depends=[MASS numDeriv statmod survival]; };
+  mexhaz = derive2 { name="mexhaz"; version="1.5"; sha256="0my53dg321xfbbkxawxcggnh5gw9qkliji5gsdb8m1fi37djd67w"; depends=[MASS numDeriv statmod survival]; };
   mfGARCH = derive2 { name="mfGARCH"; version="0.1.2"; sha256="08gkba5v8l0867rrxakn7js11v1yj7qp9vmzbjmri9hjcm02s44a"; depends=[numDeriv Rcpp zoo]; };
   mfe = derive2 { name="mfe"; version="0.1.0"; sha256="06x6csf3pr1vdmmimg6f7iffrivj8wcdfafvld7nrzbkl09cbfbn"; depends=[C50 class e1071 infotheo MASS rpart]; };
   mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; };
   mfx = derive2 { name="mfx"; version="1.1"; sha256="1zhpk38k7vdq0pyqi1s858ns19qycs3nznpa00yv8sz9n798wnn5"; depends=[betareg lmtest MASS sandwich]; };
   mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; };
+  mgc = derive2 { name="mgc"; version="1.0.1"; sha256="0bdj890v2rinsddny8kwa48cgqh9qlzfd7k5s4i9mg40ajr0f291"; depends=[MASS SDMTools]; };
   mgcv = derive2 { name="mgcv"; version="1.8-23"; sha256="1lsrhf1yzn25pfn3f5x8yxjqnfryim4jx3iqd7ah8aalh5asqwbp"; depends=[Matrix nlme]; };
   mglR = derive2 { name="mglR"; version="0.1.0"; sha256="1b7nd913d4a1szgw2qnhlnjqhfxr95xag6jwjcb2wnnxd12lib7n"; depends=[biomaRt dplyr gdata ggplot2 gplots magrittr stringr]; };
   mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; };
@@ -8224,7 +8382,7 @@ in with self; {
   mhurdle = derive2 { name="mhurdle"; version="1.1-7"; sha256="06ph0vbm7yk5388v2aww6nmi2rhjhfjj1hl506a41m5k6hf746pk"; depends=[Formula maxLik survival texreg truncreg]; };
   mi = derive2 { name="mi"; version="1.0"; sha256="1h47k5mpbvhid83277dvvj2di493bgzz9iarpyv3r30y219l7x1l"; depends=[arm Matrix]; };
   miCoPTCM = derive2 { name="miCoPTCM"; version="1.0"; sha256="1lmf6zahfp59ylhdp2cbr7y3vayhim72zazimg4qfld4r9d6kygc"; depends=[distr MASS nleqslv survival]; };
-  miLineage = derive2 { name="miLineage"; version="2.0"; sha256="091wf4kwakdr91xkyg038f0vj941gvziy7yc4l8cylcjbr647qzz"; depends=[data_table geepack MASS]; };
+  miLineage = derive2 { name="miLineage"; version="2.1"; sha256="0660vk44ywmj0q2cw7pa2z1r039ncw693dnz7zlgc0ipwak3b0ry"; depends=[data_table geepack MASS]; };
   miRNAss = derive2 { name="miRNAss"; version="1.4"; sha256="0p852vyn44g84i4hzm7b02m5cxyqajnczx0s9x9373rn7fi6r98c"; depends=[CORElearn Matrix Rcpp RSpectra]; };
   miRada = derive2 { name="miRada"; version="1.13.8-8"; sha256="1m6rm65pv4r16r0s5ih69nr3v2rnpsvpdpk07pi7k4f7v9wck71v"; depends=[]; };
   miRtest = derive2 { name="miRtest"; version="1.8"; sha256="0i66s1sz7vf8p8ihfrxmag7wbkw8mlkldcp1w2figlzyhs74c85p"; depends=[corpcor GlobalAncova globaltest limma MASS RepeatedHighDim]; };
@@ -8235,7 +8393,9 @@ in with self; {
   micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; };
   mice = derive2 { name="mice"; version="2.46.0"; sha256="1gjvlk67zvgipfczsca8zqk97vg3sivv82hblsdwp14s7smhjcax"; depends=[lattice MASS nnet Rcpp rpart survival]; };
   miceExt = derive2 { name="miceExt"; version="1.1.0"; sha256="07xj9f5w0kh4d1yj8mx1jydvhd0vwpvvrb6h67xz5gb1ban4k6c6"; depends=[mice RANN RANN_L1]; };
-  miceadds = derive2 { name="miceadds"; version="2.9-15"; sha256="03jvs643cq23y5fj1ffilqr9bi7g4blk7c0bh7nvrpjx5sscqjck"; depends=[CDM lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; };
+  miceFast = derive2 { name="miceFast"; version="0.1.0"; sha256="0089n3iagy81b6k9kdm6rh2k21vi55ly4a5d4b4snhf0rxrj7if8"; depends=[Rcpp RcppArmadillo]; };
+  miceMNAR = derive2 { name="miceMNAR"; version="1.0"; sha256="1ns7i1p2nil2s7960hkfl557qipwshibsgpwyn58ss3ch1vr213g"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; };
+  miceadds = derive2 { name="miceadds"; version="2.10-14"; sha256="1cpwf8j1r5k5wb4cwjz0aqrsgb5x9nhdrxb22sfw3lrfc1x6i6ay"; depends=[CDM lme4 MASS mice mitools mvtnorm Rcpp RcppArmadillo sirt TAM]; };
   micemd = derive2 { name="micemd"; version="1.2.0"; sha256="0l4qzhkxy43xwgfqp2c638fimixdrm94hgiabfds3sc1vbxma4r8"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; };
   micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; };
   microPop = derive2 { name="microPop"; version="1.3"; sha256="072qldi020m84j9crfvzvw2nzn5fagqmjjzb7g7i70zwqhl1kjsa"; depends=[deSolve]; };
@@ -8243,11 +8403,11 @@ in with self; {
   microbenchmark = derive2 { name="microbenchmark"; version="1.4-4"; sha256="0fv2w2vsiz18imf4115nd9chhmf275w2mb49pn7pkxi6z3bamc9c"; depends=[]; };
   microclass = derive2 { name="microclass"; version="1.1"; sha256="0hl2s4135k187f0vqmj9snvmnwa5k9fg8ahivfs7ciknrcxfv3nk"; depends=[microcontax microseq Rcpp RcppEigen RcppParallel]; };
   microcontax = derive2 { name="microcontax"; version="1.0"; sha256="0l5mfgda5xagjbh9bwv328k3m7kgggdm90rc8fr1ic59hvg56f3g"; depends=[microseq]; };
-  microdemic = derive2 { name="microdemic"; version="0.2.0"; sha256="0g39j9bdfcv90332g9mp7khn15vqs0fzqx38criw4rxwi8dcd307"; depends=[crul data_table jsonlite tibble]; };
+  microdemic = derive2 { name="microdemic"; version="0.3.0"; sha256="1hrl458jwrgjm7ds4scmicf39ssw1gbjxqaq95lhlwi9n0prd7jn"; depends=[crul data_table jsonlite tibble]; };
   micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; };
   micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; };
   micropan = derive2 { name="micropan"; version="1.2"; sha256="1b3hd5c6l9njns372zhqfryibrpqmrjxmc1p5gzdwm7450cs7qky"; depends=[BH igraph microseq Rcpp]; };
-  microplot = derive2 { name="microplot"; version="1.0-25"; sha256="05b29l5s4g4yvprxsla28ykr4823lfhqlxm46p406p06r9wki3d7"; depends=[ggplot2 HH Hmisc htmltools lattice ReporteRs]; };
+  microplot = derive2 { name="microplot"; version="1.0-38"; sha256="1jrm0rzq8xwrd3j1xwyy70071jk9cxqnqdbr3ljjn926yji10nfs"; depends=[cowplot ggplot2 HH Hmisc htmltools lattice ReporteRs]; };
   microseq = derive2 { name="microseq"; version="1.2.2"; sha256="1h828iviraqrm43lhd0s3r7rdlakc6yfc6ngrcrkacpflfcmx3c7"; depends=[Rcpp]; };
   midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; };
   midasr = derive2 { name="midasr"; version="0.6"; sha256="1sg6m36jg3b6znfg97ln5a6b4z36xkyjvgxk7wmqdq3h528z8613"; depends=[forecast MASS Matrix numDeriv optimx sandwich]; };
@@ -8273,10 +8433,10 @@ in with self; {
   minpack_lm = derive2 { name="minpack.lm"; version="1.2-1"; sha256="18ym2pdql5vzngc7q5gn66d153hrfrnd8ilv8yh6vd7j7sx7vjql"; depends=[]; };
   minqa = derive2 { name="minqa"; version="1.2.4"; sha256="036drja6xz7awja9iwb76x91415p26fb0jmg7y7v0p65m6j978fg"; depends=[Rcpp]; };
   minque = derive2 { name="minque"; version="1.1"; sha256="1hx4j38213hs8lssf9kj5s423imk7dzv60mdbzrpbp7la7jk2n57"; depends=[klaR Matrix]; };
-  minval = derive2 { name="minval"; version="0.8"; sha256="05yqr2b5x17kpp4661x6p4pjszmvz2bad43z8m3qnvaa29zhd3n3"; depends=[]; };
+  minval = derive2 { name="minval"; version="0.8-1"; sha256="11sr69hmqnh5g2zbfajy3wqc57759basky1w72dnrd38rq50llxs"; depends=[]; };
   minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; };
   mipfp = derive2 { name="mipfp"; version="3.1"; sha256="18cfv8s38cd0g1wc5pry6a4m2ykqflkxhqbqnjbjvmr42bj3r6sp"; depends=[cmm numDeriv Rsolnp]; };
-  mirt = derive2 { name="mirt"; version="1.26.3"; sha256="1jzvxcq7s179vi5cwrxkcqzffl2pyay5abnvlgazhabzf4150sml"; depends=[GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
+  mirt = derive2 { name="mirt"; version="1.27.1"; sha256="0344gqyx8x0q5smi8ifs6dw0hgqgw23mfgw8cb9gc8ky78zydjpp"; depends=[Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; };
   mirtCAT = derive2 { name="mirtCAT"; version="1.7"; sha256="038jp680hn17q8hcz346j4i0p913h7gbkqfswn0ygf1kwgsz1mpa"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; };
   misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; };
   miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; };
@@ -8286,11 +8446,12 @@ in with self; {
   miscor = derive2 { name="miscor"; version="0.1-1"; sha256="1vn0q0i2f1szjywddb7h7krpbf0qch6gmbzs03m4zb03xd70983b"; depends=[]; };
   miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; };
   mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; };
+  mispr = derive2 { name="mispr"; version="1.0.0"; sha256="166piax3f7di8h0i07fbdx45lxz1p47j378v6yl6zdc3525adpjx"; depends=[e1071 MASS penalized]; };
   misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; };
   missDeaths = derive2 { name="missDeaths"; version="2.5"; sha256="0pslssgf580zd0dd7m0l97bzgxnywj2qac0agxv6ih1a0xlxz874"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; };
   missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; };
   missMDA = derive2 { name="missMDA"; version="1.11"; sha256="185ia5zg5gdrkjpj5sql46lz5svw77wjy9zplpqhrmgx43fv0w0i"; depends=[FactoMineR mice mvtnorm]; };
-  missRanger = derive2 { name="missRanger"; version="1.0.0"; sha256="0advj6a57pj79xn43gxp7ll4b3y7hl5cvz5d7hw69f4yk4blwkjr"; depends=[FNN ranger]; };
+  missRanger = derive2 { name="missRanger"; version="1.0.1"; sha256="0rab8b0fankymfhnz4f5g2hh2yq30h6cdblvz2d43i46d147js41"; depends=[FNN ranger]; };
   mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; };
   mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; };
   mitml = derive2 { name="mitml"; version="0.3-5"; sha256="1s888r9y2ri39b48h1iypps6lddqkqv3g31l2sjmi2pvyccfpkwb"; depends=[haven jomo pan]; };
@@ -8306,13 +8467,13 @@ in with self; {
   mixcat = derive2 { name="mixcat"; version="1.0-3"; sha256="0xszngygd3yj61pvv6jrrb5j0sxgpxzhlic69xrd5mv5iyw0cmxd"; depends=[statmod]; };
   mixdist = derive2 { name="mixdist"; version="0.5-4"; sha256="100i9mb930mzvdha31m1srylmpa64wxyjv6pkw1g5lhm1hsclwm3"; depends=[]; };
   mixedMem = derive2 { name="mixedMem"; version="1.1.0"; sha256="0j8w3qfhanyrkkxipdxfdajv15qba8r2rm06iiv3kywficzgkxgv"; depends=[BH gtools Rcpp RcppArmadillo]; };
-  mixedsde = derive2 { name="mixedsde"; version="3.0"; sha256="1libm4pyzfqi11hcx823qdhgshdsy84dzv7jhz3b89w9bkla5l17"; depends=[MASS moments plot3D sde]; };
+  mixedsde = derive2 { name="mixedsde"; version="4.0"; sha256="1hryscff4i4ayqxv9imnx4g56497s1s95fzqv8wkwcpfcqi20bqf"; depends=[MASS moments plot3D sde]; };
   mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; };
   mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; };
   mixlm = derive2 { name="mixlm"; version="1.2.3"; sha256="0i7nrn31yaicdpwfssnid1x8w51iv17lcl96zfr1pgrf97d7gkqd"; depends=[car leaps multcomp pls pracma]; };
   mixor = derive2 { name="mixor"; version="1.0.3"; sha256="1qnrfd0hggad81rn8ryfm9l0cpd59ifj9sxc1bav35bma535azdv"; depends=[]; };
   mixpack = derive2 { name="mixpack"; version="0.3.6"; sha256="0q19mal86qlriwilabgy3sn33iymi5hl3wa33kvb8cd1dgdmjr7a"; depends=[mvtnorm Rcpp RcppArmadillo]; };
-  mixreg = derive2 { name="mixreg"; version="0.0-5"; sha256="0wsb1z98ymhshw9nhsvlszsanflxv3alwpdsw8lr3v62bkwka8zr"; depends=[]; };
+  mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; };
   mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; };
   mixsmsn = derive2 { name="mixsmsn"; version="1.1-4"; sha256="1y15qjh6qzx3aqlv4pndmgk2mgkqpyxcd76ykn31qd8mwzddci9d"; depends=[mvtnorm]; };
   mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; };
@@ -8323,34 +8484,40 @@ in with self; {
   mizer = derive2 { name="mizer"; version="0.4"; sha256="0ir6hx3fb4lkfgg7dln96fd50fr4jdrxbqp70461fsyzi3lxn6nv"; depends=[ggplot2 plyr Rcpp reshape2]; };
   mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; };
   mkin = derive2 { name="mkin"; version="0.9.47.1"; sha256="1cz6f9122im594dvqdmdm9yjlnmwzrx2ka63dgj0zf1ysqzf0872"; depends=[deSolve FME inline minpack_lm R6 rootSolve]; };
+  mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; };
   mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; };
   mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; };
   mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; };
   mlVAR = derive2 { name="mlVAR"; version="0.4"; sha256="08iaq6wq0ngd60nhmlj8c0x8r1fal1zfv2zpd6ll54szcvdbxahr"; depends=[abind arm clusterGeneration corpcor dplyr lme4 MplusAutomation mvtnorm plyr qgraph]; };
   mlapi = derive2 { name="mlapi"; version="0.1.0"; sha256="023vk5bp8cjcq88sapkl87kdxr92bay1dyxl6xirnyj699pyj51k"; depends=[Matrix R6]; };
   mlbench = derive2 { name="mlbench"; version="2.1-1"; sha256="1rp035qxfgh5ail92zjh9jh57dj0b8babw3wsg29v8ricpal30bl"; depends=[]; };
-  mlbgameday = derive2 { name="mlbgameday"; version="0.1.0"; sha256="1d339hr7iys8qlw6m0zbvpcw4b1k04504k6l1xz63ijdgpyr593y"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr xml2]; };
+  mlbgameday = derive2 { name="mlbgameday"; version="0.1.1"; sha256="01jb2fiv847jfdl18g2b3xlihfbry2j2r9ajmw8gd82052ayyk1j"; depends=[DBI doParallel dplyr foreach iterators magrittr purrr stringr tidyr xml2]; };
+  mlbstats = derive2 { name="mlbstats"; version="0.1.0"; sha256="1pfsc1pc5986gykx8l6afahszhaj4940l8g33fdxyy7194kbcz70"; depends=[]; };
   mldr = derive2 { name="mldr"; version="0.4.0"; sha256="1nx21yyxfaiyxpbjkc5sif6pis5v2skisxcxdqk4479h54qzwlj3"; depends=[circlize shiny XML]; };
   mldr_datasets = derive2 { name="mldr.datasets"; version="0.4.0"; sha256="0kbfaf39vkhvscw47bkx2mmc6cmgwz1cys62iiw3yb6kvkzddr3s"; depends=[]; };
   mle_tools = derive2 { name="mle.tools"; version="1.0.0"; sha256="02yndj1if31zr9y805mq5km5n8jz4w9jz1bmaz9nnqsqimrnigrb"; depends=[]; };
   mlearning = derive2 { name="mlearning"; version="1.0-0"; sha256="0r8xfaxw83s2r27b8x5qd0k4r5ayxpkafzn9b1a0jvsr87i6520r"; depends=[class e1071 ipred MASS nnet randomForest]; };
-  mlegp = derive2 { name="mlegp"; version="3.1.6"; sha256="12w6gw1g1xn3i42pgall09w5im8gf84h28d3fa9m3fhkifkid2db"; depends=[]; };
+  mlegp = derive2 { name="mlegp"; version="3.1.7"; sha256="1q0mxvr23qcxvf8k2cgs4m8yfp1gbkmprp964w8viy30japmx16l"; depends=[]; };
   mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; };
+  mlf = derive2 { name="mlf"; version="1.2"; sha256="1k2vplsqnccf5ymf50hgl4ly3np7n87ympd3aajpfwcn3jljbxkf"; depends=[]; };
   mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; };
   mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; };
   mljar = derive2 { name="mljar"; version="0.1.1"; sha256="1mw45aqjwklsnrfwf8656jf30miyrlxpz87z97nkv9i135yhwfx3"; depends=[httr jsonlite readr]; };
   mlmRev = derive2 { name="mlmRev"; version="1.0-6"; sha256="0mvmahnbbp478xwldj4wlsjib4v4afhs07643gxgcqpi56zbd5h7"; depends=[lme4]; };
   mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; };
   mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; };
+  mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.2"; sha256="1zxmiqsn3rcs0a6w785smx8ifa10083vakawy3c59pa8zigii1xp"; depends=[coxme Matrix multcomp multcompView sommer]; };
   mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; };
   mlogit = derive2 { name="mlogit"; version="0.2-4"; sha256="15ndly7i56k8blgvpn15ixxnqx9yvbci7n3mb3hm9mnrxwh5v7sx"; depends=[Formula lmtest MASS maxLik statmod zoo]; };
   mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; };
-  mlr = derive2 { name="mlr"; version="2.12"; sha256="0qf1yl487jmg7w85vjd7wdky8agysi1xlvl20dnqrn2cms4h1q6g"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
+  mlr = derive2 { name="mlr"; version="2.12.1"; sha256="0b68pgx55f19i3pnci1n87cq2a7kfs6s2248zs1vg4xl5sw9ifww"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; };
+  mlrCPO = derive2 { name="mlrCPO"; version="0.3.2"; sha256="1wnh0ljh7739qcrgkgnf40xwkih0bmvpvykaaw51rascy63mf003"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; };
   mlrMBO = derive2 { name="mlrMBO"; version="1.1.1"; sha256="1r6p5ph7nyqs6cqqsg04mass1zppys75n8448lv6iadlm499jzg8"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; };
   mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; };
   mlt = derive2 { name="mlt"; version="1.0-0"; sha256="0vbja0sxjg3a5gpa8wwnj1fvr8kkvkpzhim6lssvyy7kcb44fcya"; depends=[alabama basefun BB coneproj numDeriv sandwich survival variables]; };
   mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-0"; sha256="1shhf5pk90cfia51a0qnbg8pvvv5n86d3mjy961rjs1wj30vj3yd"; depends=[mlt numDeriv]; };
   mltools = derive2 { name="mltools"; version="0.3.4"; sha256="18dxhims684a6fk44nrzdnry8dpxs69wim8kd7zamp8zdhy38kyy"; depends=[data_table Matrix]; };
+  mlvocab = derive2 { name="mlvocab"; version="0.0.1"; sha256="0lv9aqrwm00jdklig80yi5lxj87sh6ysg7qkg0kf1nv05lkvrpb0"; depends=[digest Matrix Rcpp sparsepp]; };
   mlxR = derive2 { name="mlxR"; version="3.3.0"; sha256="0qbhmxmsyqfc2csk96qwizpjj7yk35r85rr5xaqkyr72mjn2m3gh"; depends=[ggplot2 Rcpp XML]; };
   mma = derive2 { name="mma"; version="6.1-0"; sha256="1rrnm7szlaly8klqgi8wdh5qvfx4kx5bkl1q2y9y6zjpxmb4zvi6"; depends=[car doParallel foreach gbm gplots plotrix survival]; };
   mmand = derive2 { name="mmand"; version="1.5.3"; sha256="1n0h7nia9jjc11g8417nfd3wsg4m3bmblm9bsjd0b52vqxhpxmzh"; depends=[Rcpp]; };
@@ -8416,11 +8583,12 @@ in with self; {
   mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; };
   mongolite = derive2 { name="mongolite"; version="1.5"; sha256="06qry561kdg4lxvdayghmhmgb94sqy16gxjp081xnmya0vqf9wjy"; depends=[jsonlite openssl]; };
   monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; };
-  monkeylearn = derive2 { name="monkeylearn"; version="0.1.3"; sha256="1sq30pkqd8q4dck4ck1lfdfyiir5p4c87i3xnvx7w9spx3c6pxpd"; depends=[digest httr jsonlite tibble]; };
+  monkeylearn = derive2 { name="monkeylearn"; version="0.2.0"; sha256="18lpfs64h0hy4vkdjlnmxwgagvf54kn8a1c866vv00ckyp85fvn2"; depends=[cowsay digest dplyr httr jsonlite magrittr purrr ratelimitr tibble tidyr]; };
   monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; };
   monographaR = derive2 { name="monographaR"; version="1.2.0"; sha256="0sis2kw07ifq54w6p56zspmlnvxvq6ajb0sdvc9fk480sfxg9806"; depends=[circular maptools png raster rmarkdown sp]; };
   monomvn = derive2 { name="monomvn"; version="1.9-7"; sha256="1bz967sl6ji84x9v0fypjn75d39naaqgvw31n9lgcd5lyj39hbsk"; depends=[lars MASS mvtnorm pls quadprog]; };
   monoreg = derive2 { name="monoreg"; version="1.2"; sha256="16n622j1j998a5fhn1c1qbzk5bfa5h09d95ry89gsd00p40hqg0a"; depends=[]; };
+  monotonicity = derive2 { name="monotonicity"; version="1.0"; sha256="0xpsn57lixw6pzf7qyp2x6az7vwbfw9bsd0yz93710pyyhkzr94b"; depends=[lmtest MASS sandwich]; };
   monreg = derive2 { name="monreg"; version="0.1.3"; sha256="08rcg2xffa61cgqy8g98b0f7jqhd4yp8nx6g4bq3g722aqx4nfg3"; depends=[]; };
   moonBook = derive2 { name="moonBook"; version="0.1.3"; sha256="1wy8qwzymh482gfb4v9v74k666mq8dz2yird7gz43l3hps22kfgb"; depends=[nortest survival]; };
   moonsun = derive2 { name="moonsun"; version="0.1.3"; sha256="1y8mwxmcy4iz444c2fayyi4i0jk1k561dp6cbjg2b3lmdml0whmi"; depends=[]; };
@@ -8434,6 +8602,7 @@ in with self; {
   mosaicCore = derive2 { name="mosaicCore"; version="0.4.2"; sha256="17yani6781znrrnrcji1q7h6y422bq443gzly0mm6yn8bj7v5qrc"; depends=[dplyr lazyeval MASS rlang tidyr]; };
   mosaicData = derive2 { name="mosaicData"; version="0.16.0"; sha256="09kp3d3h3xmz9fnjaz9nr1jldjd93gyq5gq9sk2a2ymgnbmbc5wm"; depends=[]; };
   mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; };
+  mosum = derive2 { name="mosum"; version="1.1"; sha256="0njpmb7mhgmaylfq1jgk198d6sc6r96kywbjpl2c465kvs8khc2f"; depends=[plot3D Rcpp zoo]; };
   motmot_2_0 = derive2 { name="motmot.2.0"; version="1.1.2"; sha256="1hnpp2850yhvxki7pcwscg79knvxzs3gx4b19wza0wg3p02fvsb6"; depends=[ape caper coda MASS mvtnorm]; };
   moult = derive2 { name="moult"; version="2.1.0"; sha256="0k0969fwy648x25xw42w5ncimyw2cbq305rzf4m77p3pf0k50m9b"; depends=[Formula Matrix]; };
   mountainplot = derive2 { name="mountainplot"; version="1.2"; sha256="1bbgkps1yhfa0lmapqkhhl5mc63p0gzszxw2g910dbi1cjc0pphx"; depends=[lattice]; };
@@ -8461,7 +8630,7 @@ in with self; {
   mpt = derive2 { name="mpt"; version="0.5-4"; sha256="01akz72z6z5ybzika120v4v6ah13hfynh98rzbmqgbchijxbbkz6"; depends=[]; };
   mptools = derive2 { name="mptools"; version="1.0.1"; sha256="1g4fbfwxv9hir0jn22nh9854blgkh0b5jan3lv0888izj4isa1hc"; depends=[animation lattice latticeExtra raster rasterVis sp viridis zoo]; };
   mr_raps = derive2 { name="mr.raps"; version="0.2"; sha256="069vyvsdgc5m7n2fd0h7jrllz789zvsxka7h5wiy36dc7lagd6f8"; depends=[nortest]; };
-  mrMLM = derive2 { name="mrMLM"; version="2.1"; sha256="0ip8xd2dj6d4hxq18pf4j6mk4yl00ajci72rr485wk94cr0zj5hy"; depends=[ggplot2 gWidgets gWidgetsRGtk2 lars MASS ncvreg openxlsx qqman RGtk2 RGtk2Extras stringr]; };
+  mrMLM = derive2 { name="mrMLM"; version="3.0"; sha256="174d12dxrsndd8hkc4ivfa5wd7ixh3vkkvd1br5zm5rwxbq3c71l"; depends=[coin data_table doParallel foreach ggplot2 lars MASS ncvreg openxlsx qqman sampling stringr]; };
   mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; };
   mratios = derive2 { name="mratios"; version="1.3.17"; sha256="0a2pn4234ri5likaqbxgkw8xqmwchr6fak3nninral0yzd4rcal5"; depends=[mvtnorm]; };
   mrbsizeR = derive2 { name="mrbsizeR"; version="1.0.1"; sha256="1gr8mx1byq8nw095yla4gn2ascgw4d90j7a3a3rzwfdavkjj7167"; depends=[fields maps]; };
@@ -8480,28 +8649,28 @@ in with self; {
   msaR = derive2 { name="msaR"; version="0.3.0"; sha256="0lj9yhsissr4rgavyhgdxi2nrkq2088darzraisx9jsirjr49jf8"; depends=[ape htmlwidgets]; };
   msaenet = derive2 { name="msaenet"; version="2.8"; sha256="1293qdvn2qv3prnp4rwwndcjnzk49v565yfvzrvb9j7sqvjshf07"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; };
   msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; };
-  mschart = derive2 { name="mschart"; version="0.2.2"; sha256="0h6q7vzrhw9ccj3m037kw72ylqdsj7hlf0bqpghqpa3sv280ap2n"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; };
+  mschart = derive2 { name="mschart"; version="0.2.3"; sha256="0lq2hhbwy3hycbvzhrhny7jk5cc4iq89a4mff5q2jjfff13vmm6g"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; };
   mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; };
   mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; };
   msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; };
   msde = derive2 { name="msde"; version="1.0.3"; sha256="18l5ca4s1ryyb9i0zsb03klm53f25klwyg171dqkn5z4bqwznp2m"; depends=[Rcpp RcppProgress]; };
   mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; };
-  msgl = derive2 { name="msgl"; version="2.3.6"; sha256="0qq9v8bb70iw67raygpzsg35nb2wdafp7rh7wzq42xd4gghi31ya"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; };
   msgpack = derive2 { name="msgpack"; version="1.0"; sha256="1j1nnca9nm3l1r4wjjlb15zr8p6zw1lcgyj4383ndy156bbh1f5a"; depends=[]; };
   msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; };
   msgps = derive2 { name="msgps"; version="1.3"; sha256="0nvxy9a41z5d111gqr1gh521imm795l1li70g1mzrag1gpg810c5"; depends=[]; };
   msgtools = derive2 { name="msgtools"; version="0.2.7"; sha256="1lk4r9gdhlfarl5z6a48aih682q7dvwa6lf31119lljpa5gmi92y"; depends=[devtools digest hunspell poio tibble]; };
+  msigdbr = derive2 { name="msigdbr"; version="6.1.1"; sha256="0d8jxkfnlybs17s0qfxr1qcg6r4pp4q6c3srmm2r8zp7ln0qkj8j"; depends=[dplyr magrittr rlang tibble]; };
   msir = derive2 { name="msir"; version="1.3.1"; sha256="1ipzgdffsqly3dp91pw7yp3h5cwn08l9qsj7cdmrykd42jc98950"; depends=[mclust rgl]; };
   msltrend = derive2 { name="msltrend"; version="1.0"; sha256="1rwy77ijf3hzq2zp47cijwvqcq34rdlfxwhrd9l56bvmlmzr1dqx"; depends=[changepoint forecast plyr Rssa tseries zoo]; };
   msm = derive2 { name="msm"; version="1.6.6"; sha256="06m7fflb6lgjfnj9v4wjc63x2as8jvc24qmz6jvgm9fw7hnm24px"; depends=[expm mvtnorm survival]; };
   msma = derive2 { name="msma"; version="1.0"; sha256="1pq1m8hrvpfjh89wiz4f3jlzlp620clxzash5061zbhm0xjmxjpd"; depends=[mvtnorm]; };
-  msme = derive2 { name="msme"; version="0.5.1"; sha256="1bkj10pgmv9q61384fwd2pxccclclc3knc5x212p42w4w49hnm1q"; depends=[lattice MASS]; };
+  msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; };
   msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; };
   msos = derive2 { name="msos"; version="1.1.0"; sha256="1dlqmjz5f8h71334kzdjbzvkn0dhysp7fb18g45qqs79cqpf1vzf"; depends=[mclust tree]; };
   msr = derive2 { name="msr"; version="0.4.4"; sha256="1r7kzicyi380xylw4vl88918gqmvs875f3rssx57yg28swb93sv0"; depends=[colorspace e1071 glmnet RColorBrewer rgl]; };
   mssqlR = derive2 { name="mssqlR"; version="1.0.0"; sha256="0qdnm7cx9cg14vfcnkmcjqr1jpxsw8xlrbnxldvzz44mzv2n878l"; depends=[magrittr RODBC]; };
-  mstR = derive2 { name="mstR"; version="1.0"; sha256="0c189ia2mbhn183j0vbqxhwb20ww64fj11pq7p2cd55zfih4kp4b"; depends=[]; };
-  mstate = derive2 { name="mstate"; version="0.2.10"; sha256="14namzs0s7v28xkj1pidccjpxg7570fdqhd64rihvyv1r7ybfyav"; depends=[RColorBrewer survival]; };
+  mstR = derive2 { name="mstR"; version="1.2"; sha256="0v8cv9pswkvw0lva6jx5vavsb20dawgq83gn4rgydyhvigcl5szd"; depends=[]; };
+  mstate = derive2 { name="mstate"; version="0.2.11"; sha256="13kw1n1p2f1f0k5hkcc4732wlhiy3csx8nx2ajrgw06svzksgh3y"; depends=[RColorBrewer survival]; };
   mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; };
   msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; };
   mtconnectR = derive2 { name="mtconnectR"; version="1.1.0"; sha256="068rp4n2afl9qgqrnp0a4lmnq7mq9wrc2yi361bfvib96gzg1fdw"; depends=[data_table dplyr dtw ggplot2 magrittr plyr proxy stringr tidyr XML]; };
@@ -8511,8 +8680,9 @@ in with self; {
   muRL = derive2 { name="muRL"; version="0.1-11"; sha256="1pyspp1wpd80hcla1zwnl3misqggfk0ls54akwnx5aa617bibzz8"; depends=[maps stringr]; };
   muStat = derive2 { name="muStat"; version="1.7.0"; sha256="18727xj9i9hcnpdfnl1b9wd6cp7wl1g74byqpda2gsrcardl57wz"; depends=[]; };
   muckrock = derive2 { name="muckrock"; version="0.1.0"; sha256="16lm1iiaaws7clby7qgblqdiznw6abjjgvsxlfpza7l2xdvplxpg"; depends=[]; };
-  mudata2 = derive2 { name="mudata2"; version="1.0.0"; sha256="0wlj9kra99ll3vmhkrw3gibricq3gwfl27iymnzrvv847lpvqjml"; depends=[dplyr ggplot2 hms jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect]; };
+  mudata2 = derive2 { name="mudata2"; version="1.0.2"; sha256="14jd0fwc11a5640p0vr5dgfw7f1h7473ybqhalg20n7519jybfcb"; depends=[dplyr ggplot2 jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect]; };
   mudfold = derive2 { name="mudfold"; version="1.1.0"; sha256="0mp25lad79dx2101srarx26my172jbkd6a0bzr87hjdgqr1pys5b"; depends=[ggplot2 gtools reshape2 yesno zoo]; };
+  mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; };
   muhaz = derive2 { name="muhaz"; version="1.2.6"; sha256="1b7gzygbb5qss0sf9kdwp7rnj8iz58yq9267n9ffqsl9gwiwa1b7"; depends=[survival]; };
   muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; };
   multcomp = derive2 { name="multcomp"; version="1.4-8"; sha256="0fm78g4zjc6ank316qfw977864shmy890znn4fahwc8jjdhpc252"; depends=[codetools mvtnorm sandwich survival TH_data]; };
@@ -8538,21 +8708,21 @@ in with self; {
   multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; };
   multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; };
   multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; };
-  multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.4"; sha256="0v4mhdpagmkjsc8x4wlqxa88yl3v0y91a1bbq1lh3rhqfmp9yra5"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
+  multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.5"; sha256="0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; };
   multimark = derive2 { name="multimark"; version="2.0.1"; sha256="0d283gvzqmdwr1sxgfb5ir9zw0sahj1wph7izcy1h63h6qlci828"; depends=[Brobdingnag coda Matrix mvtnorm prodlim raster RMark sp statmod]; };
   multimode = derive2 { name="multimode"; version="1.1"; sha256="0dhzpvw71szyw454gi7460yr46j1vas109xgwyz9h6kwm6gi5ysn"; depends=[diptest ks rootSolve]; };
   multinbmod = derive2 { name="multinbmod"; version="1.0"; sha256="1c4jyzlcjkqdafj9b6hrqp6zs33q6qnp3wb3d7ldlij7ns9fhg71"; depends=[]; };
-  multinet = derive2 { name="multinet"; version="1.1.1"; sha256="13f7gqf45ydnyiv36gwcrc8mgv5gy61fak0in7f8bss4bvfldbxx"; depends=[igraph Rcpp]; };
+  multinet = derive2 { name="multinet"; version="1.1.4"; sha256="0zajynn9mkpaqb5a208g90pv14rfxbb6k8gh9xikj4a42g9ijjsp"; depends=[igraph Rcpp]; };
   multinets = derive2 { name="multinets"; version="0.2.0"; sha256="05m0xin8wxshmwb3b9cgsvi8037wvmirbyyim1xxx2ppfwrdr2a6"; depends=[igraph Rcpp]; };
   multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; };
-  multipanelfigure = derive2 { name="multipanelfigure"; version="0.10.6"; sha256="1v53fanbnyba3f1ymgxr6q8yy1g5ax49z9ig1bxk3qywpixl8yh3"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; };
+  multipanelfigure = derive2 { name="multipanelfigure"; version="0.10.7"; sha256="077pjjambyyz6z2a34vnzbwyx9imalhnca3yl6q6j7w12klis41h"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types caTools ggplot2 gridGraphics gtable jpeg magrittr png rsvg tiff]; };
   multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; };
   multiplex = derive2 { name="multiplex"; version="2.8"; sha256="01l3kmvsrrq0c98dv5m25yjjcbc99in6dv9k5h54cyjsw4jsjhns"; depends=[]; };
   multiplyr = derive2 { name="multiplyr"; version="0.1.1"; sha256="0bsf2zhzqwl3skg26fm27j2wpifky0mph26acrlq8p72njkbcw4d"; depends=[bigmemory bigmemory_sri magrittr]; };
-  multipol = derive2 { name="multipol"; version="1.0-6"; sha256="1yjz0p4mcgzs98s61i8315wyhh986jxp8b0lq66375ckpr2ddcss"; depends=[abind]; };
+  multipol = derive2 { name="multipol"; version="1.0-7"; sha256="1rkrg3kayxa05jayg8bk1mm3hcvi76570wqfja5953hd9j4krgha"; depends=[abind]; };
   multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; };
   multiselect = derive2 { name="multiselect"; version="0.1.0"; sha256="1cda38zq7c1r56wdfpr5dg0jfw4kzi9p7jq59qm04j461j9ag3q6"; depends=[Hmisc]; };
-  multisensi = derive2 { name="multisensi"; version="2.1"; sha256="17c1cddgzkgd583fh31wfjahpl5iv1casfs1aja000rqq1x2kfqm"; depends=[knitr sensitivity]; };
+  multisensi = derive2 { name="multisensi"; version="2.1-1"; sha256="0f8i1jvrnmdsws5w7fz9k5pb5yfl5b9hnfd8aq4zj1r6m90kb6sz"; depends=[knitr sensitivity]; };
   multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; };
   multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; };
   multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; };
@@ -8577,7 +8747,7 @@ in with self; {
   mvLSW = derive2 { name="mvLSW"; version="1.2.1"; sha256="012p828pyzz6xnv2akax5hx79v522dg4a2gqrjss526qylpg5j9l"; depends=[fields wavethresh xts zoo]; };
   mvMORPH = derive2 { name="mvMORPH"; version="1.0.9"; sha256="09368vgyb1s18awfr07hs1s40n2h15hy08fmir3ayhdfrdain4k6"; depends=[ape corpcor phytools spam subplex]; };
   mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; };
-  mvPot = derive2 { name="mvPot"; version="0.1.3"; sha256="16m9i33sbgx69426i1nkimkrp75a6jbmkzlsp9bjbm7iyxdcl48b"; depends=[evd gmp MASS numbers]; };
+  mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; };
   mvProbit = derive2 { name="mvProbit"; version="0.1-8"; sha256="07dizclqjlwj29yb3xwjihjh8kmn6jiq5cpf8rcirylzykfdv3wk"; depends=[abind bayesm maxLik miscTools mvtnorm]; };
   mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; };
   mvSLOUCH = derive2 { name="mvSLOUCH"; version="1.3.3"; sha256="18gnxs1cx4f7r3m2vgrkmm41vwkamk9mn5hcgjacv2adl0ihnagd"; depends=[ape corpcor mvtnorm numDeriv ouch]; };
@@ -8589,8 +8759,8 @@ in with self; {
   mvctm = derive2 { name="mvctm"; version="1.1"; sha256="00lrnqnzpnvrl84b41ai33iwpyb4qzpjyqrw1d18hj6szybdfhsv"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; };
   mvcwt = derive2 { name="mvcwt"; version="1.3"; sha256="0fqdyypmszm00rpl04z8kiiw6jd416a0b2rap3dqq3kchnz8h4s2"; depends=[foreach RColorBrewer]; };
   mvdalab = derive2 { name="mvdalab"; version="1.4"; sha256="18wchy517qd45w5y0sr8lcafb7kmscy0q9vsryk9if6x2jq22lqz"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; };
-  mvglmmRank = derive2 { name="mvglmmRank"; version="1.1-2"; sha256="1051l10fbr7m9rmrlvj98660f0pn992n3vxiwnhml07wvvdknw3d"; depends=[Matrix numDeriv]; };
-  mvinfluence = derive2 { name="mvinfluence"; version="0.8"; sha256="08p5hxqa8qp8g52w2d3jqbjzrv607fdm80k6vwaz63fxhk8h82wq"; depends=[car heplots]; };
+  mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-1"; sha256="1gyc1xjyapadrv43kd4kngld37q8drhx4qfcimsvf7jdp33y6g5d"; depends=[MASS Matrix numDeriv]; };
+  mvinfluence = derive2 { name="mvinfluence"; version="0.8-1"; sha256="1lpxvc6g8g9kkshxg41a2dwbxzkfnqp4dggr2j5hh2h6f0xrca4j"; depends=[car heplots]; };
   mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; };
   mvmeta = derive2 { name="mvmeta"; version="0.4.11"; sha256="1h1393s7xdi4sv461srsard6w961mcxxmxq9mkmfsgw5hdmkwkr2"; depends=[]; };
   mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; };
@@ -8613,9 +8783,9 @@ in with self; {
   mwa = derive2 { name="mwa"; version="0.4.1"; sha256="0bd4i1zzwmcsrm2bg14f528yav5hb6qxcd7x4i5rwdcx1hlx27bw"; depends=[cem MASS rJava]; };
   mwaved = derive2 { name="mwaved"; version="1.1.5"; sha256="1hb7y42fy26pv6cf235g4xx1vyvwx7chwryi7phjd2aavxffj18z"; depends=[Rcpp shiny]; };
   mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; };
-  myTAI = derive2 { name="myTAI"; version="0.6.0"; sha256="15r3ipan491n8mvmq9b1bkwx99gy6inq0nxrk35kqjjhfv2bq7c4"; depends=[doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; };
+  myTAI = derive2 { name="myTAI"; version="0.7.0"; sha256="1x7zhkjm89xdzgn4z2ivl9w5srsfbavzdw8kgn2v7x75ihs0dr2n"; depends=[biomartr doParallel dplyr edgeR fitdistrplus foreach ggplot2 gridExtra nortest RColorBrewer Rcpp readr reshape2 scales taxize tibble]; };
   mycobacrvR = derive2 { name="mycobacrvR"; version="1.0"; sha256="1xd9ackzdd8db6bayza0bg4n256mi9rdqih0cdc0nl212c3iz75g"; depends=[]; };
-  mycor = derive2 { name="mycor"; version="0.1"; sha256="1ibcxl9v2d2mxpwad0rv5dw1j645rrg05f4aqvyhyd40hz9823mr"; depends=[lattice]; };
+  mycor = derive2 { name="mycor"; version="0.1.1"; sha256="00hqmvga22bv43833s974s7ky7lbry3r2bb5kza7kvkn1p6773rg"; depends=[lattice]; };
   myepisodes = derive2 { name="myepisodes"; version="1.1.1"; sha256="0xk9bwgpl630nhc8qa2pc0rwqbqk3haxnp78gfxq6sn6z7i44k1p"; depends=[XML]; };
   mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; };
   n1qn1 = derive2 { name="n1qn1"; version="6.0.0-1"; sha256="01bci81lhanxpfl454gl09krgb4229dnq9f34bngwm8ygvdadfgy"; depends=[Rcpp RcppArmadillo]; };
@@ -8623,7 +8793,8 @@ in with self; {
   nCal = derive2 { name="nCal"; version="2017.12-3"; sha256="1k03zrf67il7miap81r2fdnsi15i98wmwc3a8zxn54qfr2w9pcy6"; depends=[drc gdata gWidgets kyotil]; };
   nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; };
   nFactors = derive2 { name="nFactors"; version="2.3.3"; sha256="016d76yfxz7gx7zz5dgwjmj2c5m6kxdmqj0lln5w6d70r9g1kxg7"; depends=[boot lattice MASS psych]; };
-  nLTT = derive2 { name="nLTT"; version="1.3.1"; sha256="1wha26lcgk2kw48vyiws1ciyp8x6d7nmkrahh5b8w23ns6bqpngf"; depends=[ape coda deSolve]; };
+  nLTT = derive2 { name="nLTT"; version="1.4"; sha256="0718r93xw8hw639xpa5w6lax7agr2k3avqx9dcdybqdp19x9qia0"; depends=[ape coda deSolve testit]; };
+  nVennR = derive2 { name="nVennR"; version="0.2.0"; sha256="0y0y15r7j3in2rqiiz42b9rzljajp0pk8172kc7gj9nshih3ryqw"; depends=[grImport2 Rcpp RcppProgress rsvg]; };
   na_tools = derive2 { name="na.tools"; version="0.2.1"; sha256="1fdbrf97mvak44vzarwqr4w6cs6msr42zcfxl2ci3i67nlgsv4pl"; depends=[]; };
   nabor = derive2 { name="nabor"; version="0.4.7"; sha256="16dxnvq6yxlrignzvxjdwzwm32fn2a8bsjqjsg5qz94ir7g3pzm6"; depends=[BH Rcpp RcppEigen]; };
   nadiv = derive2 { name="nadiv"; version="2.14.3.1"; sha256="08276bakyrn9d9vh08yzan60kigsihwfhgx788gwp6pk8v6m25wa"; depends=[Matrix]; };
@@ -8635,7 +8806,7 @@ in with self; {
   nanop = derive2 { name="nanop"; version="2.0-6"; sha256="007gdc93pk0vpfmsw7zgfma2k1045n2cxwwsyy276smy0ys9fdhp"; depends=[distrEx rgl]; };
   nanotime = derive2 { name="nanotime"; version="0.2.0"; sha256="138qz844sczgzzl8vn5079590hnq96w7jdbn851cpw64gmq21r4w"; depends=[bit64 RcppCCTZ zoo]; };
   naptime = derive2 { name="naptime"; version="1.3.0"; sha256="1cadfv5sdsmz61kf96hf2gbnghf24q40g5c3h9b8prvkxslap691"; depends=[lubridate]; };
-  nardl = derive2 { name="nardl"; version="0.1.3"; sha256="1361bh94m4dzcijg1929av88sni4f5ccwwyxsrg7kcxdxl3zhqp0"; depends=[Formula gtools matlab strucchange tseries]; };
+  nardl = derive2 { name="nardl"; version="0.1.4"; sha256="108m1bngal27pz80l1rdlgrx7x4id42ch95w1g9d0r5jnlxlvxp7"; depends=[Formula gtools matlab strucchange tseries]; };
   narray = derive2 { name="narray"; version="0.4.0"; sha256="0cr0y8mqwprxk0bv9160xvqxgvqkihn3avzsjm6ccivvb8zlkqxv"; depends=[reshape2 stringr]; };
   nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; };
   nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; };
@@ -8651,17 +8822,17 @@ in with self; {
   nbconvertR = derive2 { name="nbconvertR"; version="1.0.2"; sha256="1dc9jxfibvb27qwiykj93322nb1ahwrg69zqcc0p9xp0rpsim02w"; depends=[]; };
   nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; };
   ncappc = derive2 { name="ncappc"; version="0.2.1.1"; sha256="19wq7ihcr8989xpzf1dsxz1kwwzqvsx2mwcciqv9204k4fc94zjc"; depends=[dplyr ggplot2 gridExtra gtable knitr lazyeval readr reshape2 scales testthat xtable]; };
-  ncar = derive2 { name="ncar"; version="0.3.7"; sha256="1cbcadyz84w629bz86sivfyf545w9cda078liq9l0j7gm5z5g2if"; depends=[NonCompart rtf]; };
+  ncar = derive2 { name="ncar"; version="0.3.8"; sha256="02xglxz63b9b7yfkwqrh81spzkmvglay6wpylm9fwcqxdasf3bj5"; depends=[NonCompart rtf]; };
   ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; };
   ncdf_tools = derive2 { name="ncdf.tools"; version="0.7.1.295"; sha256="1jgxivmg2gzvkn09n13i5xr1v0xcyp5ckhwxz6g5kdh9z2dkjhc2"; depends=[abind chron JBTools plotrix raster RColorBrewer RNetCDF]; };
   ncdf4 = derive2 { name="ncdf4"; version="1.16"; sha256="0lwjjis0b83c4l3xvqai4ckzrskd6mychck1iwxcxgjvh0d77mgd"; depends=[]; };
   ncdf4_helpers = derive2 { name="ncdf4.helpers"; version="0.3-3"; sha256="051akd7r6zx805a0xwcs95q5sd8alag0f1gzqjk3n188q8r3ji5j"; depends=[abind ncdf4 PCICt]; };
   ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; };
-  ncf = derive2 { name="ncf"; version="1.1-8"; sha256="1hnx6k21ss1mp4llzbfxpsv2y7z1nxf4c46rwq3qpmvqhnw6hh9s"; depends=[]; };
+  ncf = derive2 { name="ncf"; version="1.2-3"; sha256="0d4qbfdhwy071vhkfjn9385vak73zf9c9ghbbiba1ha2d9d2irsl"; depends=[]; };
   ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; };
   ncmeta = derive2 { name="ncmeta"; version="0.0.2"; sha256="1qr0zfyy8g3zrmvg6i6b7sfvl3lavr391rqgf6pqhslg7i9cgpiz"; depends=[dplyr rlang RNetCDF tibble]; };
   ncpen = derive2 { name="ncpen"; version="0.2.0"; sha256="1wrpscd9n7z9lz7537qyy4rn4pjznlb8zwb79kkzmnfvyj21fi1r"; depends=[Rcpp RcppArmadillo]; };
-  ncvreg = derive2 { name="ncvreg"; version="3.9-1"; sha256="1v71r2k25n28lhpqsgzaaw48w1gwn0yjbir64hx5lchdbvd5k1j3"; depends=[]; };
+  ncvreg = derive2 { name="ncvreg"; version="3.10-0"; sha256="0q9rk1mz2rm1h99m093kz7a2p6fl3pj4nqzblp3154q8i1kva7za"; depends=[]; };
   ndjson = derive2 { name="ndjson"; version="0.6.0"; sha256="0w7a587q45hkzmjhzlyrhk0hw4c8avkfzf4ai0wib5qk3al8gk6n"; depends=[data_table dplyr dtplyr Rcpp]; };
   ndl = derive2 { name="ndl"; version="0.2.17"; sha256="08h01rw7gsa31zp91q2rsw1ba9yf0fyhz3w8s9xq5788qwc80280"; depends=[Hmisc MASS Rcpp]; };
   ndtv = derive2 { name="ndtv"; version="0.10.0"; sha256="1j4g5qclfbw7fkykaclrsb2d70vy40fd1rgr1n73qyrkx0fyym44"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; };
@@ -8671,7 +8842,7 @@ in with self; {
   neatmaps = derive2 { name="neatmaps"; version="1.0.7"; sha256="07nr8c5i1s3sba4l2123vb50b1cgn1qjdckwmyjwwai1yb3smkag"; depends=[dendextend ggplot2 heatmaply igraph pvclust]; };
   needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; };
   needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; };
-  negenes = derive2 { name="negenes"; version="1.0-5"; sha256="0fdhc0v0b820wfg3sypvya7zhg7mhfmdbfiwn1lj3a2xg01zvc2n"; depends=[]; };
+  negenes = derive2 { name="negenes"; version="1.0-8"; sha256="0qyhypryp3p8c876jffg1syg05b370mw24clwlx733yx86qhmb1v"; depends=[]; };
   neighbr = derive2 { name="neighbr"; version="1.0"; sha256="0612nzpryj4xp0ncpvpn56x5n9ammzjp3ysq1rj1fc84h0p7nml3"; depends=[]; };
   neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; };
   neotoma = derive2 { name="neotoma"; version="1.7.0"; sha256="0f4s5yw0yj4n8lkvbl2l3ivdclg9pknyss7qhppp85rdxzwxilpq"; depends=[analogue httr jsonlite leaflet plyr reshape2 xml2]; };
@@ -8679,19 +8850,19 @@ in with self; {
   nesRdata = derive2 { name="nesRdata"; version="0.1.0"; sha256="1h33hql0vgkr2ps1ysisdxxb0cnm18mh8sbd3fxy9xf42icwfwdb"; depends=[dataone dplyr purrr rappdirs readr]; };
   nestedRanksTest = derive2 { name="nestedRanksTest"; version="0.2"; sha256="0r08jp8036cz2dl1mjf4qvv5qdcvsrad3cwj88x31xx35c4dnjgj"; depends=[]; };
   net_security = derive2 { name="net.security"; version="0.3.0"; sha256="15vvcmakl9hl1srdhjf73g2bwwcxn93220i4gv0rcsw5732mjanz"; depends=[data_table dplyr jsonlite plyr R_utils stringr XML]; };
-  netCoin = derive2 { name="netCoin"; version="0.2.7"; sha256="0dzncn72zl3yp2gds7vmjk5j82rb80j03ivkf74b0z5s4ckxhc9b"; depends=[haven igraph Matrix]; };
+  netCoin = derive2 { name="netCoin"; version="0.2.8"; sha256="0axac72fj5qhssdpx8k20lgayzpwzcd3pp7cz4mv6cwfzc0y8768"; depends=[haven igraph Matrix]; };
   netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; };
   netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; };
   netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; };
   netdiffuseR = derive2 { name="netdiffuseR"; version="1.19.0"; sha256="0rnf7hf5vxpqw2rn00yqmkgpsx752pmfigyggbs4ikfbcsjq24sx"; depends=[boot igraph MASS MatchIt Matrix network networkDynamic Rcpp RcppArmadillo sna SparseM]; };
   netgen = derive2 { name="netgen"; version="1.3"; sha256="1iywpl9n1yplnd38dff8m9mz1vlfbvplw393grhpav5czcknj160"; depends=[BBmisc checkmate ggplot2 igraph lhs lpSolve mvtnorm stringr]; };
   netgsa = derive2 { name="netgsa"; version="3.0"; sha256="0cqyiilpxhdi6zmibn85y1aqwpcs1aialz34klakmllzn6kvdsng"; depends=[corpcor glasso glmnet igraph Matrix]; };
-  netgwas = derive2 { name="netgwas"; version="0.1.3.1"; sha256="1fgs7dr4dhrs4hmscazsyiq1nkkx1vvygmarmy7pyqhxzv13kdwg"; depends=[glasso huge igraph MASS Matrix RBGL tmvtnorm]; };
-  netmeta = derive2 { name="netmeta"; version="0.9-7"; sha256="0yi1x0dyi7kim2yz9qwsbdnx1k6k15nmv6wlaby9z9yl7p2ij3jq"; depends=[magic MASS meta]; };
+  netgwas = derive2 { name="netgwas"; version="0.1.4.2"; sha256="19r168xppxgdj3b0b575b47vgmzbzkgwpqh499vlm5as9livjlyb"; depends=[glasso huge igraph MASS Matrix RBGL tmvtnorm]; };
+  netmeta = derive2 { name="netmeta"; version="0.9-8"; sha256="0bkfxdz14lg9r51ykwmkmpm6vhbvly35hrcgj6f26g36ihagjksd"; depends=[magic MASS meta]; };
   netrankr = derive2 { name="netrankr"; version="0.2.0"; sha256="1y56y5wv95d7mmjf8rrwr7cs0k64h9a2qbpind4xp0kakpjihn7m"; depends=[igraph Rcpp RcppArmadillo]; };
+  netregR = derive2 { name="netregR"; version="0.3.0"; sha256="106qq3mafqbcdyhnjicbzc4rzi9mr262nqb3ncpzpcvkf0xd988w"; depends=[Matrix]; };
   nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; };
-  nettools = derive2 { name="nettools"; version="1.0.1"; sha256="13fw316r31g9cjlbyy9qfccsyagxb6pyvn5k32f166b7vj92mk1q"; depends=[combinat dtw igraph Matrix minerva minet rootSolve WGCNA]; };
-  network = derive2 { name="network"; version="1.13.0"; sha256="11sg330xb7gcnl3f6lwhhjdabz6mk43828i2np635pqw4s4yl13s"; depends=[]; };
+  network = derive2 { name="network"; version="1.13.0.1"; sha256="1bbkbqkqf1d7irfwh08c13c2pfypir1ssvlqrln83irqns1ikdv0"; depends=[]; };
   networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; };
   networkDynamic = derive2 { name="networkDynamic"; version="0.9.0"; sha256="1949fbcw0gq8lsm6rx5d5mpj1y9k4rk2v0pmm1kxi5igi6yd8lg9"; depends=[network statnet_common]; };
   networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; };
@@ -8706,34 +8877,39 @@ in with self; {
   neuralnet = derive2 { name="neuralnet"; version="1.33"; sha256="14ga04mcd793v9a2584jb9l7n20kw00fgy3gayfwrkr1j39szdls"; depends=[MASS]; };
   neurobase = derive2 { name="neurobase"; version="1.26.1"; sha256="0fb2cvh3j650zjx7b60jfrvm5i7n3l98wis91bmyr9hx3qz24rj5"; depends=[abind matrixStats oro_nifti R_utils RNifti]; };
   neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; };
-  neurohcp = derive2 { name="neurohcp"; version="0.7.3"; sha256="0mz8aiyimw3vqkgm54mwfvnki5hg1j958r71fs1k213zn1cg9qqr"; depends=[base64enc digest httr xml2]; };
+  neurohcp = derive2 { name="neurohcp"; version="0.8.0"; sha256="1p38n2ggz2yj6fqrlf2jm1jnjbv8a0ifi477f5qklmr4bga2c4kr"; depends=[base64enc digest httr xml2]; };
   neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; };
   neuropsychology = derive2 { name="neuropsychology"; version="0.5.0"; sha256="0hlbjf8hxz4cl7fvg9mbyfmcyyxncc2nh9h1mrd2yzgrpgn0d0b5"; depends=[BayesFactor caret dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png ppcor psych stringi tidyr tidyverse tm wordcloud2]; };
+  neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.1"; sha256="15bgb9bh4nwjhjq6wkfbk7cys4mrih3bnjv527mrack8pwkybgpa"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; };
   neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; };
+  newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; };
   ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; };
   ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; };
   ngspatial = derive2 { name="ngspatial"; version="1.2-1"; sha256="1c65ws9b9s2grr44lqg8026c4p2875d0426dfmrakpb44mw2zppp"; depends=[batchmeans Rcpp RcppArmadillo]; };
   ngstk = derive2 { name="ngstk"; version="0.2.1"; sha256="12zpl20i07d1f9navs9jjrialfh798wrfn1241j7s9h3rd6xi40l"; depends=[configr data_table stringr]; };
-  nhanesA = derive2 { name="nhanesA"; version="0.6.4.3.3"; sha256="09mpxmk8w48hc14167jd2xifnj0kjz9h3h76bdnbb33wvhkn4jld"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
+  nhanesA = derive2 { name="nhanesA"; version="0.6.4.4"; sha256="0vl8bg718fk97x3yrjkg48hj3lap4gzhri53gzcwz9g4rfyrlwxp"; depends=[Hmisc magrittr plyr rvest stringr xml2]; };
   nhlscrapr = derive2 { name="nhlscrapr"; version="1.8.1"; sha256="107k063279w9cy6in99rn03w2rq42ci8s6dvb9x6f9w7y3bdpvzn"; depends=[biglm bitops RCurl rjson]; };
   nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; };
   nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; };
   nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; };
   nima = derive2 { name="nima"; version="0.4.5"; sha256="1fllq76k4r07ymd58s865hgg3yrmwa34kr5mjd89n50mm1m110mh"; depends=[assertthat devtools ggplot2 ggthemes gridExtra gtools plyr ProjectTemplate scales survival]; };
-  nimble = derive2 { name="nimble"; version="0.6-9"; sha256="1lkf386qcgw5gr8cpxfh2ncrc9wj59icygi9m37c8077h3h0sj03"; depends=[coda igraph R6]; };
+  nimble = derive2 { name="nimble"; version="0.6-10"; sha256="0aa6823b7xnp2bgrc3jwjrc2py9y57xadsahzva4zxn7vlsp5f36"; depends=[coda igraph R6]; };
   nipals = derive2 { name="nipals"; version="0.4"; sha256="0h9jxmj44x3lllxk1y2izkslafbiab175qrsxlnfcvhnaj13zsds"; depends=[]; };
+  nitrcbot = derive2 { name="nitrcbot"; version="1.0"; sha256="1cg52zv72ppv8vgfl3rccgykw2bhlk3j7pm47cydfmhqbc6sn6by"; depends=[dplyr httr]; };
   nivm = derive2 { name="nivm"; version="0.3"; sha256="111jkgirgsl1j36xgwi81wzwxial3vdw8mqzi1faldxxd9a2cixm"; depends=[bpcp ssanv]; };
   nlWaldTest = derive2 { name="nlWaldTest"; version="1.1.3"; sha256="1cppdz8qvigjdz4sgr1gm2j09zi407xxmryc28zc7ps7rvgy344h"; depends=[]; };
   nlcv = derive2 { name="nlcv"; version="0.3.2"; sha256="1lknlqd64p15lnkydbi7zx7lmhg1fdl750yjqjaccdjzrgrqvgkv"; depends=[a4Core Biobase e1071 ipred kernlab limma MASS MLInterfaces multtest pamr randomForest RColorBrewer ROCR xtable]; };
   nleqslv = derive2 { name="nleqslv"; version="3.3.1"; sha256="1n1sbp7436yd5g6v0060j2iwk4rppjq2pc5x47g9wlwnskdfgvl7"; depends=[]; };
-  nlme = derive2 { name="nlme"; version="3.1-131.1"; sha256="1xafi670a9jzb52kqxkacxfmy0viac3aql5byfq86kgkgla2sg0y"; depends=[lattice]; };
+  nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; };
+  nlme = derive2 { name="nlme"; version="3.1-137"; sha256="11vyxxc0n36vb8d8g02zr0402ymicvbifwdsqm7gy9iqqnwrn101"; depends=[lattice]; };
   nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; };
   nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; };
   nlmixr = derive2 { name="nlmixr"; version="0.9.0-3"; sha256="1fwnq0bnsqadadgy9i1083dz4zkidwdxm2ncy6jyrk1pb055m318"; depends=[BH brew dparser ggplot2 inline lattice lbfgs Matrix memoise minqa mvtnorm n1qn1 nlme numDeriv PreciseSums R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders]; };
   nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; };
-  nlnet = derive2 { name="nlnet"; version="1.0"; sha256="1ipds80qlv2zrl51v0n670g9ihb68sm98p06nvs97w05i64g8frq"; depends=[coin fdrtool igraph TSP]; };
+  nlnet = derive2 { name="nlnet"; version="1.2"; sha256="00lcyz5csjj9qbhh7yw0qlbnyv32k0c2dpm23v04n9wkdgs67jy0"; depends=[coin e1071 earth fdrtool igraph randomForest ROCR TSP]; };
   nloptr = derive2 { name="nloptr"; version="1.0.4"; sha256="1cypz91z28vhvwq2rzqjrbdc6a2lvfr2g16vid2sax618q6ai089"; depends=[]; };
-  nlreg = derive2 { name="nlreg"; version="1.2-2"; sha256="1pi7057ldiqb12kw334iavb4i92ziy1kv4amcc4d1nfsjam03jxv"; depends=[statmod survival]; };
+  nlr = derive2 { name="nlr"; version="0.1-1"; sha256="12j2hp5fgpdz7pvlpykhf9zp1sw1f6vzhh5ykk9b2diaf3l55zsl"; depends=[GA MASS nlme quantreg robcor TSA tseries]; };
+  nlreg = derive2 { name="nlreg"; version="1.2-2.1"; sha256="08pz3qycnsvz175ppj23i2i0wcif6imi6fc117n8802ln3npwm64"; depends=[statmod survival]; };
   nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; };
   nls_multstart = derive2 { name="nls.multstart"; version="1.0.0"; sha256="08zdyx5hp1xbqjspk0f89fca5gc0b5j87hsccvn9dxn2lrnwk8nb"; depends=[dplyr minpack_lm purrr tibble tidyr]; };
   nls2 = derive2 { name="nls2"; version="0.2"; sha256="0k46i865p6jk0jchy03jiq131pc20h9crn3hygzy305rdnqvaccq"; depends=[proto]; };
@@ -8749,34 +8925,36 @@ in with self; {
   nlt = derive2 { name="nlt"; version="2.1-3"; sha256="1j0xrrbr1hvfda8rvnc17lj96m6cz24faxvwn68ilf7j1ab2lkgn"; depends=[adlift EbayesThresh]; };
   nlts = derive2 { name="nlts"; version="0.2-2"; sha256="0bx6xqa3j0k01p43vnv5lcv2pryjzgsak77y1cr9rm2xwqa3j6az"; depends=[acepack locfit]; };
   nmaINLA = derive2 { name="nmaINLA"; version="0.1.1"; sha256="0976jafmdhy2rz5fcarb7hh1vaanm8l2610hk06f5k93xjhypg8j"; depends=[]; };
-  nmathresh = derive2 { name="nmathresh"; version="0.1.2"; sha256="1ldxhk2ry3m8q0881fis403r303n431csmp0gp4785mafy476b5h"; depends=[ggplot2 gridExtra gtable Matrix nnls]; };
-  nmfem = derive2 { name="nmfem"; version="1.0.0"; sha256="0bkw27b59knppfh4qnhrcs2j0mpxak7iyb7lskccv6ibym2kvljw"; depends=[d3heatmap dplyr mixtools plyr tidyr]; };
+  nmathresh = derive2 { name="nmathresh"; version="0.1.3"; sha256="09pxbizmvdp2l5j1gs0v3xk2lsyclx5rndaw6b4ccn61m3x060ls"; depends=[ggplot2 gridExtra gtable Matrix nnls]; };
+  nmfem = derive2 { name="nmfem"; version="1.0.1"; sha256="10y3s7g76pnqqyg8wc3cyjiqay7scp0bdlly4yx30v2sbvxf0msx"; depends=[d3heatmap dplyr mixtools plyr tidyr]; };
   nmfgpu4R = derive2 { name="nmfgpu4R"; version="0.2.5.2"; sha256="05066rgbbp6kj2d67nzf3d1pf32gypz9ammz4ba88yxblydb3cwk"; depends=[Matrix Rcpp SparseM stringr]; };
-  nmslibR = derive2 { name="nmslibR"; version="1.0.0"; sha256="12022g9jww718bqpp7yaapafnjxj29sx7mircj8a7zwww58a7v0q"; depends=[Matrix R6 Rcpp RcppArmadillo reticulate]; };
-  nmw = derive2 { name="nmw"; version="0.1.2"; sha256="1p2h13g0ss0v2jy0ii0r0qgf8i1f0dc8zhii05k2vr6cbiapslv3"; depends=[numDeriv]; };
+  nmslibR = derive2 { name="nmslibR"; version="1.0.1"; sha256="02c2ns9dw1mkr5gmsd31j0yjcr3vr302yvqkfdkmm9csppdcrmb3"; depends=[Matrix R6 Rcpp RcppArmadillo reticulate]; };
+  nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; };
+  nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; };
   nneo = derive2 { name="nneo"; version="0.1.0"; sha256="0jaaz15y1csh3bwmzp7mgx86m3f0w3ykzb8qdvg8ak2grxw3wl6a"; depends=[crul data_table fauxpas jsonlite tibble]; };
   nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; };
   nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; };
   nnfor = derive2 { name="nnfor"; version="0.9.2"; sha256="1wxv8s5547spw155rj7nlilsfn5d7m40xpfy87mady93n25pwm3d"; depends=[forecast glmnet MASS neuralnet plotrix]; };
-  nngeo = derive2 { name="nngeo"; version="0.1.0"; sha256="1r92d5bgd7m9d6v424fry4hsbnwzhzww1sqrphwnk2aag70hqv0g"; depends=[geosphere lwgeom RANN sf units]; };
+  nngeo = derive2 { name="nngeo"; version="0.1.5"; sha256="1285a0p461wm91zriy7rh3awh0k0z7ifmjkxffyxh1l84y51jfak"; depends=[geosphere lwgeom RANN Rcpp sf units]; };
   nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; };
   nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; };
   noaastormevents = derive2 { name="noaastormevents"; version="0.1.0"; sha256="1pkfmvp20f6xi2iy7l6c67zspp9f4wkrh7s308hlklms2difhp6m"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer stringr tidyr viridis XML]; };
   nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; };
-  nodiv = derive2 { name="nodiv"; version="1.1.8"; sha256="0ws0yp4j26yf45gmbvb6dpq476z8mn8yl6xdrzs0yxliizpz8jsf"; depends=[ape picante raster sp vegan]; };
+  nodiv = derive2 { name="nodiv"; version="1.1.9"; sha256="0pbcigfqps44i07yghcg5zx5nlybivkb34bz67fnkgkpbkbs79k7"; depends=[ape picante raster sp vegan]; };
   nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; };
   noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; };
   noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; };
   nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; };
   nomine = derive2 { name="nomine"; version="1.0.0"; sha256="1yaxhac002fxcyiz5x562fnhrsq9h9nx0qmw4rykjsc5l2qbi9gd"; depends=[httr RCurl]; };
+  nomisr = derive2 { name="nomisr"; version="0.2.0"; sha256="0a83fcn5qq2wycbn6acfhapni3k84jf1xj7aarmnr9az1gqdbwc9"; depends=[dplyr httr jsonlite readr tibble]; };
   nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; };
   noncensus = derive2 { name="noncensus"; version="0.1"; sha256="0cfj17bfzddfshhhzv2ijhrp9ylcscmsysswjcsjfxmy3gbkd00q"; depends=[]; };
   noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; };
   noncomplyR = derive2 { name="noncomplyR"; version="1.0"; sha256="1a9m6r9cizw42nmy24jdsrsbllg5z84fs8b239axnh1fxzskg2qy"; depends=[MCMCpack]; };
   nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; };
   nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.3"; sha256="1pcah255hh3lqabxgjb5fsaap4s2d92lvxw9a48l1p4dkmm1lbsx"; depends=[Matrix Rcpp rgl TSA tseries]; };
-  nonmem2R = derive2 { name="nonmem2R"; version="0.1.8"; sha256="1250y5ylwfc3gwc0ilmzrwzk577bp7pj7bljvamzs3pqy4sflvrv"; depends=[ggplot2 lattice latticeExtra MASS mvtnorm]; };
-  nonmemica = derive2 { name="nonmemica"; version="0.7.9"; sha256="0krixfwzxjalmj4b1ln79c1fxxx07qj71gzdddix3p056cdrxlyq"; depends=[csv dplyr encode fold lazyeval magrittr metaplot rlang spec tidyr xml2]; };
+  nonmem2R = derive2 { name="nonmem2R"; version="0.1.9"; sha256="06irvlyhfimcx3izbfivvrxc9xbiwvqajvl5n47krgbkbd4r4ag0"; depends=[ggplot2 lattice latticeExtra MASS mvtnorm]; };
+  nonmemica = derive2 { name="nonmemica"; version="0.8.2"; sha256="1nz0sq8a1xgpasii2hpxiz79d501nnfs6awaqpp8m8lviimnhv68"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; };
   nonnest2 = derive2 { name="nonnest2"; version="0.5-1"; sha256="02pflg6frvsq7azwcr660qj9mpj4q3kjx6xr6v5lshg77mjfhgdg"; depends=[CompQuadForm lavaan mvtnorm sandwich]; };
   nonpar = derive2 { name="nonpar"; version="1.0.1"; sha256="0pxks3nga7jrcvq0pzr1axj3a9xvzky836fl7966a09ws1vff7i4"; depends=[]; };
   nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; };
@@ -8790,7 +8968,7 @@ in with self; {
   nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; };
   norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; };
   normalp = derive2 { name="normalp"; version="0.7.0"; sha256="1s12x2qln3s4bbqsm4p3cq4g6461z73r858g6ym1awamhbmncnrl"; depends=[]; };
-  normalr = derive2 { name="normalr"; version="0.0.3"; sha256="1ydlp6nbldq7sq60zdlvqah43xdfvx5nyiqaq2m5vgma6yny930x"; depends=[ddR magrittr MASS purrr shiny]; };
+  normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; };
   normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; };
   normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; };
   nortest = derive2 { name="nortest"; version="1.0-4"; sha256="17r0wpz72z9312c70nwi1i1kp1v9fm1h6jg7q5cx1mc1h420m1d3"; depends=[]; };
@@ -8813,7 +8991,6 @@ in with self; {
   npbr = derive2 { name="npbr"; version="1.6"; sha256="1jvq4snwrwjhhjgm8n8yxd5y94ks5zzi0xwdn931yp300qnikyzc"; depends=[Benchmarking np quadprog Rglpk]; };
   npcopTest = derive2 { name="npcopTest"; version="1.03"; sha256="1kpa3avi95aa93y038f4zqhhdp8vdscdk0c6397qmqjg34hf1dnr"; depends=[]; };
   npcp = derive2 { name="npcp"; version="0.1-9"; sha256="16vzl3psa806ns387d5mhlp369r45ljcqlhl0lzdjpc1niv572nc"; depends=[]; };
-  npde = derive2 { name="npde"; version="2.0"; sha256="1cp4k7jvsw9rc6rrck902nqqjaf2c1nxjic7i9r3fd6yca1lgqb9"; depends=[mclust]; };
   nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; };
   nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; };
   npmlda = derive2 { name="npmlda"; version="1.0.0"; sha256="1dr25an7cac89jyb8zhmj3ry6lq7sh7zxci1injplnk4gzy17mc5"; depends=[]; };
@@ -8823,7 +9000,7 @@ in with self; {
   nppbib = derive2 { name="nppbib"; version="1.0-0"; sha256="075jb13zckkh66jwdmdlq4d2drjcc3lkj26px3w79b91223yymf2"; depends=[]; };
   npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; };
   npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; };
-  nprobust = derive2 { name="nprobust"; version="0.1.1"; sha256="0aynp42y0qn0jl9f26rk358hjdswkz6anwvni7frxnkb7l1vyrd5"; depends=[ggplot2 Rcpp RcppArmadillo]; };
+  nprobust = derive2 { name="nprobust"; version="0.1.2"; sha256="0hc2p30jalaibjwlq8g52rdpifhvmpaq2c7ww0zzhf3h1az442xs"; depends=[ggplot2 Rcpp RcppArmadillo]; };
   nproc = derive2 { name="nproc"; version="2.1.1"; sha256="0wpny7c1n9mmv1yywlws8gjbidkrikvcqcckrxpba9avjw2c5df8"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; };
   npsf = derive2 { name="npsf"; version="0.3.1"; sha256="1mv2dzn3gc7b9ynpw8dv22xd31igg4hmkgrds12n9920pghkya44"; depends=[Formula Rcpp]; };
   npsm = derive2 { name="npsm"; version="0.5"; sha256="12jq6ygp3di5rknh7izrr3bxvpn6bqnj3jhfxzf29yf0bd86hzqk"; depends=[plyr Rfit]; };
@@ -8831,7 +9008,7 @@ in with self; {
   npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; };
   npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; };
   nricens = derive2 { name="nricens"; version="1.5"; sha256="0a7b4kw91qkr9vrm8swflby06a78d059im54zxxgvy42qjsijwqx"; depends=[survival]; };
-  nsRFA = derive2 { name="nsRFA"; version="0.7-12"; sha256="182zshwyg0l6shb5wcwibqygxs8qmgma9c4s683za8q3f9l94aqj"; depends=[]; };
+  nsRFA = derive2 { name="nsRFA"; version="0.7-13"; sha256="0xa8zm0mk5ckwsmbgdyk8xv1q56pm6j19zxd48rwl3fsqs49bpah"; depends=[]; };
   nsROC = derive2 { name="nsROC"; version="1.0"; sha256="0c99z8kknbrnbyyv7p79sj848aq7b5n4m4r7v1yrcs61ackrdn2n"; depends=[sde survival]; };
   nscancor = derive2 { name="nscancor"; version="0.6.1-25"; sha256="183kvzlln5lhmi51dm0skq1165c3hhy1yz5h2g7nxwqk2b4p23xj"; depends=[]; };
   nscprepr = derive2 { name="nscprepr"; version="0.1.1"; sha256="1rd32zywrzyxz6hpn9s6cwjlg8q8rz3cc0p3b5gan8bicx0ilwjc"; depends=[dplyr lubridate stringr]; };
@@ -8847,6 +9024,7 @@ in with self; {
   numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; };
   numOSL = derive2 { name="numOSL"; version="2.3"; sha256="1bcj1qk3nx1jqhldx9rcwphvlxspz3bj4vb891hkw2fa2i4559c5"; depends=[]; };
   numbers = derive2 { name="numbers"; version="0.6-6"; sha256="05qmv12b90vkzf2b50qjnp8hja6rms91jj97knx70n2yhpb2lnd9"; depends=[]; };
+  numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; };
   numform = derive2 { name="numform"; version="0.4.0"; sha256="09vim4ajnnkdf27ag5j8pj7p8qyfakfh3ar1dki8bqzms2d7bkcm"; depends=[]; };
   nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; };
   nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; };
@@ -8881,22 +9059,20 @@ in with self; {
   odds_converter = derive2 { name="odds.converter"; version="1.4"; sha256="13y3s04l2jvjhn1i4syz4y3q42ba8br0sp3mks5f5h4cp8w4j3wy"; depends=[]; };
   oddsratio = derive2 { name="oddsratio"; version="1.0.2"; sha256="0s9w5iqcabkc7lqdh27nmg7xnw2jpwik5djjlqxb6xgabzls97d6"; depends=[cowplot ggplot2 MASS mgcv]; };
   odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; };
-  odfWeave = derive2 { name="odfWeave"; version="0.8.4"; sha256="1rp9j3snkkp0fqmkr6h6pxqd4cxkdfajgh4vlhpz56gr2l9j48q5"; depends=[lattice XML]; };
-  odfWeave_survey = derive2 { name="odfWeave.survey"; version="1.0"; sha256="0cz7dxh1x4aflvfrdzhi5j64ma5s19ma8fk9q2m086j11a1dw3jn"; depends=[odfWeave survey]; };
   odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; };
   odkr = derive2 { name="odkr"; version="0.1.3"; sha256="0vcpsykr4sq4rq721vyd3wbm4jzlldvvxqh75q7x7wwhjhrnr3qn"; depends=[Hmisc stringr]; };
   odpc = derive2 { name="odpc"; version="1.0.0"; sha256="1mhak9drp0a7h1yrbk08cs00hbvkfkj8r1y6klhr40sdych4q506"; depends=[forecast gdpc Rcpp RcppArmadillo]; };
   odr = derive2 { name="odr"; version="0.7.3"; sha256="07jfd809wv92ijgw1r1nq9516zi2rkf3ik243br42glf6lszn19p"; depends=[]; };
   oec = derive2 { name="oec"; version="2.5.2"; sha256="17np562cv6ln3j4b9iawyhbz8kfd5cy1ifj96kzyhv082jgpsk1s"; depends=[dplyr jsonlite magrittr readr servr]; };
-  oem = derive2 { name="oem"; version="2.0.7"; sha256="12z6cgkm8yyk9dz3s1bswccn7vrvca2wiqz0ylr65q88ws828snz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
-  officer = derive2 { name="officer"; version="0.2.1"; sha256="0l8xj6zsklh2dyl6kn4piv5wjalqm1ifakxh31zfz714s9w0y8qj"; depends=[base64enc digest htmltools magrittr R_utils R6 Rcpp uuid xml2 zip]; };
+  oem = derive2 { name="oem"; version="2.0.8"; sha256="08j9y9vq31skvdpg0kyqj50d77aijd2d95vcwm92df5vcvw9bpwz"; depends=[BH bigmemory foreach Matrix Rcpp RcppArmadillo RcppEigen]; };
+  officer = derive2 { name="officer"; version="0.2.2"; sha256="1yixvlcz7mnf3w5kixd14zi0sa6vvydiqvlsnvj0zll8vplmcsij"; depends=[base64enc digest htmltools magrittr R_utils R6 Rcpp uuid xml2 zip]; };
   oglmx = derive2 { name="oglmx"; version="2.0.0.3"; sha256="02skdnf89ryl4d8ja1a9mj1jzzmjqjgfdcsf6v5dpjn1z9aycc6c"; depends=[maxLik]; };
   ohtadstats = derive2 { name="ohtadstats"; version="1.0"; sha256="1wpil3ag7vzinz4ky7jpzny88a4ycfifbhayyib9cldk8d0mbcgh"; depends=[lattice]; };
   oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; };
   okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; };
   okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; };
   olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; };
-  olsrr = derive2 { name="olsrr"; version="0.4.0"; sha256="0ka8a6gm4ynbr2ss4syw2znnqcjly209sh992shyzp01yp5vy7bm"; depends=[dplyr ggplot2 glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; };
+  olsrr = derive2 { name="olsrr"; version="0.5.0"; sha256="1id5z628bq91p3w64mq28bk247i6vb9ly1maqpf6fsfqiq2pavmv"; depends=[cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; };
   omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; };
   omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; };
   ompr = derive2 { name="ompr"; version="0.7.0"; sha256="06zhmddg19sjnl18zmjjswggjg58rjgarqj2wqf5jf0g0qz3my2n"; depends=[dplyr lazyeval Matrix progress Rcpp]; };
@@ -8915,13 +9091,14 @@ in with self; {
   ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.2"; sha256="1g1ag2bnfczdx2xyswrc9xbl9krnyibb4639wynm7c0lf2876964"; depends=[ontologyIndex Rcpp]; };
   oompaBase = derive2 { name="oompaBase"; version="3.2.5"; sha256="0269jmdw236jy008ic6iwg9y2fq674alqvd5zdvy1k2grxm72hvw"; depends=[cluster]; };
   oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; };
-  openEBGM = derive2 { name="openEBGM"; version="0.4.0"; sha256="0293cy1p3nh4q37qjjkzxivk6lw5sqs6n93hlmvr93ywz4h4wvyf"; depends=[data_table ggplot2]; };
+  openCR = derive2 { name="openCR"; version="1.1.1"; sha256="0dmjisnxn9hdi2a4pb7qy367g4lmmlvnc8sll55dzjir472c3zm1"; depends=[abind MASS nlme plyr Rcpp secr stringr]; };
+  openEBGM = derive2 { name="openEBGM"; version="0.5.0"; sha256="079wy3xrfdcmn0wd314rlrf4499qpdhsfq1m4b7s5y9c21h0raiy"; depends=[data_table ggplot2]; };
   openNLP = derive2 { name="openNLP"; version="0.2-6"; sha256="1173cng877sg6ynbs3csfnn956wwrq3yldhhzfbqdsz35draganj"; depends=[NLP openNLPdata rJava]; };
   openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; };
   openSTARS = derive2 { name="openSTARS"; version="1.0.0"; sha256="0arry24nkd50nkdnddzxagrpy4lky9smc4xr1nl6q9nwxyfgdskg"; depends=[data_table progress raster rgdal rgrass7 sp SSN]; };
   openVA = derive2 { name="openVA"; version="1.0.3"; sha256="09wbhl0g6q1rhi6yr3wpbns4ik7jalpagacn6am09i6zvmz8745j"; depends=[ggplot2 InSilicoVA InterVA4 nbc4va Tariff]; };
   openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; };
-  openair = derive2 { name="openair"; version="2.2-3"; sha256="0gp5q84r6psqd3900f74dm0qgiig6vhnm5400nbwjm0arp1jlyp7"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
+  openair = derive2 { name="openair"; version="2.3-0"; sha256="0kfikssvmdg1r7j1z80hw7pa66rs06cki211rhmv0f12m500zl0c"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr RColorBrewer Rcpp rlang tidyr]; };
   opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; };
   opencpu = derive2 { name="opencpu"; version="2.0.5"; sha256="1bs2z3y2zc3aqzfjh6bq3qrpzm106f5xhw7lbyng1bpcp4rch6y3"; depends=[brew curl devtools evaluate httpuv jsonlite knitr mime openssl protolite rappdirs sendmailR sys webutils zip]; };
   opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; };
@@ -8967,7 +9144,7 @@ in with self; {
   orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; };
   ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; };
   orca = derive2 { name="orca"; version="1.1-1"; sha256="1wd5nh2vh6j1rp78hbw17qipi67f0wimrbkiarak8f7k5pfiy1zn"; depends=[]; };
-  orclus = derive2 { name="orclus"; version="0.2-5"; sha256="0kkxhyqjxib862npinzf3mipqg5imgscdmb5wqm8wf2j2mbislsx"; depends=[]; };
+  orclus = derive2 { name="orclus"; version="0.2-6"; sha256="0d78mn2vl2yxlvdswyxkxp9zg59b8cvfksz9m56kddn79aps1ikl"; depends=[]; };
   orcutt = derive2 { name="orcutt"; version="2.2"; sha256="0mwfbbsn39nla083p845xbbgh3y8kkrg0q735kap64jf4pgcyac7"; depends=[lmtest]; };
   ordBTL = derive2 { name="ordBTL"; version="0.8"; sha256="09x3zfmss4fsh3rjghgmpv8y34dnkz4mw696b3k3nvlgk55a1423"; depends=[caret gtools VGAM wikibooks]; };
   ordDisp = derive2 { name="ordDisp"; version="1.0.1"; sha256="1vjki73h8933z36ikwmjn84ldz154mahp2jkd9cbj5n6xsi47fnw"; depends=[VGAM]; };
@@ -8978,11 +9155,12 @@ in with self; {
   orderedLasso = derive2 { name="orderedLasso"; version="1.7"; sha256="0vrh89nrmpi8xscvambcb1y70gqqi5819a2gxh02h4pnyjn8axql"; depends=[ggplot2 Iso Matrix quadprog reshape2]; };
   orderstats = derive2 { name="orderstats"; version="0.1.0"; sha256="0a3ga0cjryvbininspsx5wzc96s3fza06s3d5fhbllbixz0rap4a"; depends=[]; };
   ordiBreadth = derive2 { name="ordiBreadth"; version="1.0"; sha256="04faqhas1p9lxhghd4xq07yq1nxv7ns18avhvkql7sy5a9g7bfs1"; depends=[vegan]; };
-  ordinal = derive2 { name="ordinal"; version="2015.6-28"; sha256="0lckjzjq2k8rlibrjf5s0ccf17vcvns5pgzvjjnl3wibr2ff4czs"; depends=[MASS Matrix ucminf]; };
+  ordinal = derive2 { name="ordinal"; version="2018.4-19"; sha256="04fpm4jsjfd90ig2rzd11jafkip74814b60ixis0sii2gr9c8zxb"; depends=[MASS Matrix ucminf]; };
   ordinalClust = derive2 { name="ordinalClust"; version="1.2.1"; sha256="1035471ni5f8129w23kkj7263p5pa9jlihqdq2skda410lj50vnk"; depends=[progress Rcpp RcppArmadillo]; };
   ordinalCont = derive2 { name="ordinalCont"; version="1.3.0"; sha256="0zi9cfvkb811hhcplp159zpnmmk4rs0nid19gi4g9g3dgn9pa296"; depends=[boot]; };
   ordinalForest = derive2 { name="ordinalForest"; version="2.1"; sha256="1ancr7xdwhbqq3rj5hijrkjbrcaih8rqcx5r41mykrrp1k1s55dd"; depends=[combinat ggplot2 Rcpp]; };
   ordinalNet = derive2 { name="ordinalNet"; version="2.4"; sha256="0c9k3p62d482sl0vg94xm6hllk2mic2nd1c5m4vhci5ycavqzdd3"; depends=[]; };
+  ordinalRR = derive2 { name="ordinalRR"; version="1.0"; sha256="07gihg8hppxa7bp5wxcshqawj3vkzicmdsrnjyrasr3glv08b9lj"; depends=[rjags]; };
   ore = derive2 { name="ore"; version="1.6.0"; sha256="115s3wq7rrpmx65k9jlpf2x1d218gnl7vsc8zsvmjbsi4gfyliwf"; depends=[]; };
   ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; };
   orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; };
@@ -8997,7 +9175,7 @@ in with self; {
   oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; };
   orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; };
   orsk = derive2 { name="orsk"; version="1.0-3"; sha256="0j8bz5kddzglcljycxy8lv8h5f6hvz88nzwq3b9cdyayd8mlbxs2"; depends=[BB BHH2]; };
-  orthoDr = derive2 { name="orthoDr"; version="0.3.0"; sha256="14z3zl6hvvvsm3q9slwl4sfnzd5igsgdycimg0ww3xg2nw7hln4l"; depends=[plot3D pracma Rcpp RcppArmadillo rgl survival]; };
+  orthoDr = derive2 { name="orthoDr"; version="0.5.1"; sha256="0zpi3g6pkid40cblzsxck254wxljn5bfs354l51xfb182qr76x6k"; depends=[dr MASS plot3D pracma Rcpp RcppArmadillo rgl survival]; };
   orthogonalsplinebasis = derive2 { name="orthogonalsplinebasis"; version="0.1.6"; sha256="07rbd0fhs2gsk7wj41y2h7wf6pfg324vzv2al753d8kqyx5ns2dj"; depends=[]; };
   orthopolynom = derive2 { name="orthopolynom"; version="1.0-5"; sha256="1gvhqx6jlh06hjmkmbsl83gri0gncrm3rkliyzyzmj75m8vz993d"; depends=[polynom]; };
   osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; };
@@ -9009,7 +9187,8 @@ in with self; {
   osmdata = derive2 { name="osmdata"; version="0.0.6"; sha256="1sjaqsj0jxipg00raj20gszzjspgpy9ja37rfkx6jpaa2wh3ii87"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp xml2]; };
   osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; };
   osmplotr = derive2 { name="osmplotr"; version="0.3.0"; sha256="0w45riwwjigh1bxf9gx0wdj2yhdizwi6ydprp83pss2z9wph66yb"; depends=[curl e1071 ggm ggplot2 httr osmdata rgeos sp spatstat]; };
-  osrm = derive2 { name="osrm"; version="3.1.0"; sha256="12gbgjp3hq0vg0wf6xq0l9wgq0h6w4l0bfwmlnyhq26z9n08a1lq"; depends=[gepaf jsonlite raster RCurl rgeos sp]; };
+  osrm = derive2 { name="osrm"; version="3.1.1"; sha256="14rf5m2pm5w414v2l1dvd6vlvirms93l8rkfbmgcvxwxmc52b187"; depends=[gepaf jsonlite raster RCurl rgeos sp]; };
+  osrmr = derive2 { name="osrmr"; version="0.1.28"; sha256="0db8db7hkpc3rl7193gldmjz6ikm2m21d11ff9jmf7l8x0shg38i"; depends=[assertthat bitops R_utils rjson stringr]; };
   otinference = derive2 { name="otinference"; version="0.1.0"; sha256="1l75jjnkyk8yzaw9zyk45jq9ys304i6pzm2xd5apxrb1jk75a3li"; depends=[MASS Rglpk sm transport]; };
   otrimle = derive2 { name="otrimle"; version="1.1"; sha256="0c3wlj6cxpikrfr0knldd1z2kfihpfsppnyb9n3rflnxhk7pwij2"; depends=[doParallel foreach mclust]; };
   otvPlots = derive2 { name="otvPlots"; version="0.2.0"; sha256="1halgpk5ld5ihz0da69wf72l0624r73h2wjc0zjn8b8kw1v9xgzs"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; };
@@ -9034,7 +9213,7 @@ in with self; {
   pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; };
   pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; };
   pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; };
-  pROC = derive2 { name="pROC"; version="1.10.0"; sha256="0rm08hf2gxqn5b83ara733w5nihkg1jmdilz67zzrc9iwmqznfa0"; depends=[ggplot2 plyr Rcpp]; };
+  pROC = derive2 { name="pROC"; version="1.11.0"; sha256="1v61z529yj1bp7wcagyhx0jszla9hv0aq1zvxz9w19r7lcinlzjz"; depends=[ggplot2 plyr Rcpp]; };
   pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; };
   pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; };
   pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; };
@@ -9046,10 +9225,10 @@ in with self; {
   packagedocs = derive2 { name="packagedocs"; version="0.4.0"; sha256="0zw9ana7s42ardphhdaklba02yjj1v8gliq4l98397mjmzc6f4xd"; depends=[crayon devtools digest evaluate highlight htmltools lazyrmd magrittr rmarkdown stringr whisker yaml]; };
   packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; };
   packcircles = derive2 { name="packcircles"; version="0.3.1"; sha256="0f2y651i96sa7b7mfxg5kinmhhzvcv18lia74fdpdnmc6fxlxg17"; depends=[Rcpp]; };
-  packrat = derive2 { name="packrat"; version="0.4.9"; sha256="1l0p59h0w0qdg5vlgq93932hpkidg6kd9cwg3ckn3vwms4sh2p7x"; depends=[]; };
+  packrat = derive2 { name="packrat"; version="0.4.9-1"; sha256="1kk6hs88y5jqgd781kk5jn5467r7sfyqd225vibflbz0s42rcv5a"; depends=[]; };
   pacman = derive2 { name="pacman"; version="0.4.6"; sha256="1vdak1hv3j44dsj6cckzc1a86dg933jqhxdys8fyxacmk101l388"; depends=[devtools]; };
   paco = derive2 { name="paco"; version="0.3.2"; sha256="0qf692fqlq0d7hh9yllywaswmj5spy6q1r67nzkhgyh311nhjh6c"; depends=[plyr vegan]; };
-  pacotest = derive2 { name="pacotest"; version="0.2.2"; sha256="0n17qzn7wabs6am55z96zg8759fdcz3vpm7yx25dyaqliawgqnj7"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
+  pacotest = derive2 { name="pacotest"; version="0.3"; sha256="135637bidfx71xay6c69lfjvr4i0v3ckgkg0fi838p24is6icbix"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; };
   pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; };
   padr = derive2 { name="padr"; version="0.4.0"; sha256="1liks4cj1cyzf6ls2h8f68xd7nry6y9ml3zdmw1fsax251dhmbq4"; depends=[dplyr lubridate Rcpp rlang]; };
   paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; };
@@ -9084,6 +9263,7 @@ in with self; {
   pandocfilters = derive2 { name="pandocfilters"; version="0.1-1"; sha256="18n155rkbr3gq5lsb0bh1v1v0z0r6xr2ald3nh7xh3v9qwxpmsz1"; depends=[jsonlite]; };
   panelAR = derive2 { name="panelAR"; version="0.1"; sha256="1ka2rbl9gs65xh2y2m4aqwh5qj4szibjy101hqfmza9wmdh25gpq"; depends=[car]; };
   panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; };
+  panelvar = derive2 { name="panelvar"; version="0.5.1"; sha256="1394lvvpzbcvm2mhxw68k784jyvsnzxiq787kdf4y4538lqgfx1n"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; };
   pangaear = derive2 { name="pangaear"; version="0.6.0"; sha256="0dykacf5ckhck08rbk6l5kyw51i2p1ncy44agcxj79cr290cd5ck"; depends=[crul jsonlite oai png rappdirs tibble xml2]; };
   papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; };
   papeR = derive2 { name="papeR"; version="1.0-2"; sha256="1pp6zzdqg9lj61f8p90sxl30vp9knmis7154fmfpm6pynbgr46ms"; depends=[car gmodels xtable]; };
@@ -9095,7 +9275,7 @@ in with self; {
   parallelMap = derive2 { name="parallelMap"; version="1.3"; sha256="026d018fr2a43cbh8bi2dklzr9fxjzdw5qyq84g2i18v5ibr6bd5"; depends=[BBmisc checkmate]; };
   parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; };
   parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; };
-  paramGUI = derive2 { name="paramGUI"; version="2.1.2"; sha256="054l9hqsvgnwipzqrapkhsk67afz93zv1cligqhjl2wggzn9a8sc"; depends=[colorspace fields shiny shinydashboard TIMP]; };
+  paramGUI = derive2 { name="paramGUI"; version="2.1.3"; sha256="1z7k4wgzm1bga8djyk44r1kr1mzdb9mrd6fvb5nrd69d76pvldji"; depends=[colorspace fields shiny shinydashboard TIMP]; };
   paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; };
   params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; };
   paramtest = derive2 { name="paramtest"; version="0.1.0"; sha256="0yn1s1qkgby8x0qn7cy1zhxzc0wyi7bm30pkvijhn5h5afjpylsy"; depends=[boot]; };
@@ -9107,7 +9287,7 @@ in with self; {
   parlitools = derive2 { name="parlitools"; version="0.2.1"; sha256="14nzcbjddwnsiwwksl7bf2qk1kzzcnjc0b47ilqiq4nc4c386im3"; depends=[dplyr hansard httr jsonlite mnis sf stringi tibble]; };
   parma = derive2 { name="parma"; version="1.5-3"; sha256="0yjpmxz20v6k107qylw42yf1b231hzym9dizjcq1kalivvscczc5"; depends=[corpcor nloptr quadprog Rglpk slam truncnorm]; };
   parmigene = derive2 { name="parmigene"; version="1.0.2"; sha256="1fsm6pkr17jcbzkj1hbn91jf890fviqk1lq6ls8pihsdgah1zb4d"; depends=[]; };
-  parsec = derive2 { name="parsec"; version="1.1.2"; sha256="1hf3c23rnxckw4s2vqzbhkjgiir1nv1811saximj0mbih9w2vqpf"; depends=[]; };
+  parsec = derive2 { name="parsec"; version="1.2.0"; sha256="0ilc9d6kv7zb0kwhpqqi3bjx3r1cihyfamphrw83p6zy3xhfmfs6"; depends=[igraph]; };
   parsedate = derive2 { name="parsedate"; version="1.1.3"; sha256="0mg7hbm3903iwvmpn51gjpaaq03rsp72hjb1g8h5g84r81iha002"; depends=[]; };
   parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; };
   partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; };
@@ -9127,13 +9307,13 @@ in with self; {
   pass = derive2 { name="pass"; version="1.0"; sha256="00dzwg2lnzmrrmzq3fyrs4axswgnsn7f62l2f2a8d8gyf8qzz3nf"; depends=[lars MASS ncvreg]; };
   passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; };
   password = derive2 { name="password"; version="1.0-0"; sha256="1ijzqdw54l8wvpy6ys28njvhplzjxzzi5i9y41vjnrr88n13977v"; depends=[]; };
-  pastecs = derive2 { name="pastecs"; version="1.3-18"; sha256="0ixlnc1psgqgm71bsf5z5j65lvr92ghpsk9f1ifm94dzjhi6d22i"; depends=[boot]; };
+  pastecs = derive2 { name="pastecs"; version="1.3.21"; sha256="0z4dic94ar646w7zc2ggi5hgvf2qnznsani94c5pyql8zspz47lc"; depends=[boot]; };
   pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; };
   patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; };
   patchDVI = derive2 { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; };
   patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; };
   patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; };
-  patentsview = derive2 { name="patentsview"; version="0.2.0"; sha256="1n599ksd4vdpfxdlq8bfc0h94v76qbsrrpd5p0q1c6cl083fvvzq"; depends=[httr jsonlite]; };
+  patentsview = derive2 { name="patentsview"; version="0.2.1"; sha256="104qq6cqvfk5m2yynpg5iwlp89y5qx18m20qp343mknxjbvqpjdg"; depends=[httr jsonlite]; };
   pathClass = derive2 { name="pathClass"; version="0.9.4"; sha256="1vzmz3bml37wfxsjhkw9fip90sr1iv521ccr7nlf6xd30wavqywk"; depends=[affy Biobase igraph kernlab lpSolve ROCR svmpath]; };
   pathdiagram = derive2 { name="pathdiagram"; version="0.1.9"; sha256="1j2h9mmwfi95nwhk9214kcfpb1qrmw249mjaza7i9gijmlicraxz"; depends=[shape]; };
   pathfindR = derive2 { name="pathfindR"; version="1.0.0"; sha256="1wwl7cxgdrvcyrzyv1jrhhp850fc512585ih5g24jmrfr6n0422h"; depends=[AnnotationDbi DBI doParallel foreach knitr org_Hs_eg_db pathview rmarkdown shiny]; };
@@ -9152,11 +9332,11 @@ in with self; {
   pbdBASE = derive2 { name="pbdBASE"; version="0.4-5.1"; sha256="0ghdq8ry6fiq8qj3plq2n8isjx6iacnhqd1z73bjckmvp99g221n"; depends=[pbdMPI pbdSLAP]; };
   pbdDEMO = derive2 { name="pbdDEMO"; version="0.3-1"; sha256="0vr3dvvhr8j6xvdf308nn37y0lkl2ysm93yf0h7rclvqvsk1pf66"; depends=[pbdBASE pbdDMAT pbdMPI]; };
   pbdDMAT = derive2 { name="pbdDMAT"; version="0.4-2"; sha256="1xiwfpi8r0l8jlfrc35aknm09y4qbn0hvvkscdpcxv9q7zifvl3v"; depends=[pbdBASE pbdMPI]; };
-  pbdMPI = derive2 { name="pbdMPI"; version="0.3-4"; sha256="05b0f8hqnn5wrmxg1yjd60h5v0hys7bvzb9brgbsxp1nbsashqq9"; depends=[rlecuyer]; };
+  pbdMPI = derive2 { name="pbdMPI"; version="0.3-5"; sha256="1i970p74j53bnvqwv4ac03i7rbwp9ixbq1qbcv2x878wwz6fkcc2"; depends=[rlecuyer]; };
   pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; };
   pbdPROF = derive2 { name="pbdPROF"; version="0.3-1"; sha256="0a7c31605si062vbwcwngv770axlwyhh00cvdfqw3hv421p61sj8"; depends=[]; };
   pbdRPC = derive2 { name="pbdRPC"; version="0.2-0"; sha256="0qndlgv6r9k17mz75g7d2k5alg0qp5h7scpnz2zl6kqlpr8z6l2p"; depends=[]; };
-  pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-3"; sha256="1famaxkm385ka7kgk997lvkb68cpch0vb26l94vzkhxwfxl0fyjp"; depends=[pbdMPI rlecuyer]; };
+  pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-4"; sha256="0wl8iir00nyb4j0sm8nssmgb2xhr8g2064pql0s72cgbzkq1k1cm"; depends=[pbdMPI rlecuyer]; };
   pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-2"; sha256="0dzwwffinn9bbb73dmmh88c374f9057bl0a8dq97fbv63j4a5qpc"; depends=[]; };
   pbivnorm = derive2 { name="pbivnorm"; version="0.6.0"; sha256="05jzrjqxzbcf6z245hlk7sjxiszv9paadaaimvcx5y5qgi87vhq7"; depends=[]; };
   pbkrtest = derive2 { name="pbkrtest"; version="0.4-7"; sha256="1si3bhi59xc51a0pgjjglccq3h4aljyhw2k1b8574s145fnh7fsw"; depends=[lme4 MASS Matrix]; };
@@ -9182,7 +9362,7 @@ in with self; {
   pcr = derive2 { name="pcr"; version="1.1.0"; sha256="1rz9jxjs9s7kwg3aljfm1x2v7jsg94wawmhgs8va83g46pbl26g8"; depends=[broom devtools dplyr ggplot2 magrittr purrr readr tidyr]; };
   pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; };
   pcrsim = derive2 { name="pcrsim"; version="1.0.2"; sha256="04177xl513k01prmf93kha91dyxmb9v80d1y4lz73fxsifj6bhar"; depends=[data_table ggplot2 gWidgets mc2d plyr strvalidator]; };
-  pcse = derive2 { name="pcse"; version="1.9"; sha256="04vprsvcmv1ivxqrrvd1f8ifg493byncqvmr84fmc0jw5m9jrk3j"; depends=[]; };
+  pcse = derive2 { name="pcse"; version="1.9.1"; sha256="07382jz75ywqr4q750rk66yf0j28k54plx281k1yi541la8vic57"; depends=[]; };
   pdR = derive2 { name="pdR"; version="1.5"; sha256="072ra8czfvgcgkbdfkjhbpk7f23zh717f9sh84vls9j0wyrai6hn"; depends=[boot car coefplot lmtest papeR plm sandwich]; };
   pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.1"; sha256="0j68jmsm6c9pan195k0l0nm1ldbipl5ywlbwkz61dblspizh04iw"; depends=[ddalpha multitaper Rcpp RcppArmadillo]; };
   pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; };
@@ -9191,7 +9371,7 @@ in with self; {
   pdfetch = derive2 { name="pdfetch"; version="0.2.3"; sha256="1fcjhq79dcbnghmkfpy1h29gcywr1hq91xij5f21wgp4xx465sha"; depends=[curl httr jsonlite lubridate readr reshape2 XML xml2 xts zoo]; };
   pdfsearch = derive2 { name="pdfsearch"; version="0.1.1"; sha256="0k62j6ilv8rmmmasqyb3hklhjqg22jiyx0sxd7f8n0xmlfcjgfqi"; depends=[pdftools tibble]; };
   pdftables = derive2 { name="pdftables"; version="0.1"; sha256="1gnwjijr89cczchc7yi4w5xiw0dalbymvj23rymm8cfra34iwn5p"; depends=[httr]; };
-  pdftools = derive2 { name="pdftools"; version="1.5"; sha256="09z4174zbp0nzdkpwx5yxxlmzskqg48gc6n5qpmx0hkanfz8g7ls"; depends=[Rcpp]; };
+  pdftools = derive2 { name="pdftools"; version="1.6"; sha256="00m5x1n5kjzvc1wljfy8riq2srxjvklasnh6ps8a89zbgglhp5cv"; depends=[Rcpp]; };
   pdist = derive2 { name="pdist"; version="1.2"; sha256="18nd3mgad11f2zmwcp0w3sxlch4a9y6wp8dfdyzvjn7y4b4bq0dd"; depends=[]; };
   pdmod = derive2 { name="pdmod"; version="1.0.1"; sha256="04bk9gjg2c55hk6k1hy0m29927s8a5ig6mr4xb89npam68g0pcms"; depends=[mco]; };
   pdolsms = derive2 { name="pdolsms"; version="0.2"; sha256="18gwr1xnm7jbqna911b7haa9sv1i2qvq18w00dkbnj796rh0h78f"; depends=[reshape2]; };
@@ -9201,8 +9381,8 @@ in with self; {
   peakRAM = derive2 { name="peakRAM"; version="1.0.2"; sha256="0mj7f8jqkfky61xag2km0svbgvfmif3c1d8ccav6pv1963cg3cvv"; depends=[]; };
   pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; };
   pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; };
-  pec = derive2 { name="pec"; version="2.5.4"; sha256="1gi8vvdj3mwpi5rgfqci1lan1a34nbcyyypwa171sfj7j1m770r3"; depends=[foreach prodlim rms survival timereg]; };
-  pedantics = derive2 { name="pedantics"; version="1.6"; sha256="08d13igjprqb8l2i8y07rn8pdq6bvjy8bf2ccpixv34d8cg5758j"; depends=[genetics kinship2 MasterBayes MCMCglmm mvtnorm]; };
+  pec = derive2 { name="pec"; version="2018.04.18"; sha256="0a6q37l42zbz566bz0qs5aszd71bb0kd9bz0zmb42q0ak0v4yijd"; depends=[foreach prodlim rms survival timereg]; };
+  pedantics = derive2 { name="pedantics"; version="1.7"; sha256="14hphziwqrq4fkxlvp94j564q19k9fabvhmdz7zhb6cvak6xv1n6"; depends=[genetics kinship2 MasterBayes MCMCglmm mvtnorm]; };
   pedgene = derive2 { name="pedgene"; version="2.9"; sha256="1200d6blz7n3krnvhw0i9mz6219vwk0vlj17yzr3fqzyn5cyf91z"; depends=[CompQuadForm kinship2 Matrix survey]; };
   pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; };
   pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; };
@@ -9226,11 +9406,11 @@ in with self; {
   pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; };
   perARMA = derive2 { name="perARMA"; version="1.6"; sha256="0k70lcqhiiffrwzvh51asnhx68qxpnjnxadarvgpgbc7kfy7lv9x"; depends=[corpcor gnm matlab Matrix signal]; };
   perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; };
-  perccalc = derive2 { name="perccalc"; version="1.0.0"; sha256="0327jj67gqq05a6fd5iac3b47ch7mgslalk4hr92v6svh8cz4syv"; depends=[broom devtools dplyr ggplot2 haven magrittr MASS multcomp purrr tibble tidyr tidyverse]; };
+  perccalc = derive2 { name="perccalc"; version="1.0.1"; sha256="0dq5m7d6jdapbnkh65f5cizqiggpl1922nl4gc6damzvyym95qrj"; depends=[broom dplyr magrittr multcomp purrr tibble tidyr]; };
   performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; };
   pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; };
   perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; };
-  permDep = derive2 { name="permDep"; version="1.0-0"; sha256="15jjxni14i3br0j5cqajgydkb71yd657fvz4m0jcr66g1sb77aij"; depends=[BB goft survival]; };
+  permDep = derive2 { name="permDep"; version="1.0-1"; sha256="03va74vxzijy169pqf6qhpw4afb3r3ia5y0qcfqz1xjs2zmck7mj"; depends=[BB survival]; };
   permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; };
   permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; };
   permPATH = derive2 { name="permPATH"; version="1.1"; sha256="06h1lqpmkg4ajjh4r837qp094h105n4mpvafnp2nsbv9yyayd4h8"; depends=[R2HTML xtable]; };
@@ -9240,12 +9420,13 @@ in with self; {
   permute = derive2 { name="permute"; version="0.9-4"; sha256="1w8wzk1fg9q7wvisnfp2js70dg0m9wi12gkdhpyngpbdcgssahd5"; depends=[]; };
   perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; };
   persiandictionary = derive2 { name="persiandictionary"; version="1.0"; sha256="0rgi36ngpiax3p5zk4cdgf3463vgx7zg5wxscs2j7834yh37jwax"; depends=[]; };
-  personalized = derive2 { name="personalized"; version="0.1.4"; sha256="0w6qvkbzpbsyjvsgadx59h49im4c03x8kyd39z2w825vznds9xmz"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
+  personalized = derive2 { name="personalized"; version="0.1.5"; sha256="1id3ml5n7l7lgd029csn23ffrsqhm4g1id20hxqhqz4knknfxkkf"; depends=[foreach gbm ggplot2 glmnet kernlab mgcv plotly survival]; };
   personograph = derive2 { name="personograph"; version="0.1.3"; sha256="07lrlbw4222l1d5rwn0hfqliyk8sqjf6ipz4n2zwcbk113bb8sy7"; depends=[grImport]; };
   perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; };
   perturb = derive2 { name="perturb"; version="2.05"; sha256="18ydmmp8aq4rf9834dmsr4fr9r07zyn97v8a1jqz3g9njza983la"; depends=[]; };
-  perturbR = derive2 { name="perturbR"; version="0.1.0"; sha256="0zn10xm39sbv9g8mvp582c6bwpdk6ss1b50pdk7nkdmih3g6cxqb"; depends=[dils ggplot2 igraph mcclust]; };
+  perturbR = derive2 { name="perturbR"; version="0.1.1"; sha256="13in5xjv1854ihalyj4427ix4scc17b95iw72rcb4yivha9jgplq"; depends=[dils ggplot2 igraph mcclust]; };
   pesticides = derive2 { name="pesticides"; version="0.1"; sha256="1w180hqqav0mh9sr9djj94sf55fzh4r373a7h08a2nz9nyjpq09w"; depends=[]; };
+  petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; };
   petrinetR = derive2 { name="petrinetR"; version="0.1.0"; sha256="0na8srzwi933bva9j3hrn4ji8s58dm28jpxw9q13mpahzch4r454"; depends=[dplyr visNetwork]; };
   petro_One = derive2 { name="petro.One"; version="0.1.3"; sha256="13bxd011lprimy5m3z08l4yng2fkp28b1ad1bqs0piffx5bxw13n"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka tibble tm urltools wordcloud xml2]; };
   pewdata = derive2 { name="pewdata"; version="0.2.0"; sha256="17j8fdn9x6hannr91zyccya523z3zm03gr517xfcyrd0m486xnqb"; depends=[httr magrittr purrr rvest]; };
@@ -9253,8 +9434,9 @@ in with self; {
   pfa = derive2 { name="pfa"; version="1.1"; sha256="0ikdd7ps8wnjp9nm66w447m06hqxnnk553jglxikl2w5d9vk6b31"; depends=[lars POET quantreg]; };
   pgam = derive2 { name="pgam"; version="0.4.15"; sha256="12llflsb32dfvxl3nbyb9bsl9bmd35g5g163hd3axzmg1bgi21ls"; depends=[]; };
   pgee_mixed = derive2 { name="pgee.mixed"; version="0.1.0"; sha256="115vvpv54q80486i3xs2yhmfyx476cf4g1v43q6l7wj3jwzcrvbg"; depends=[copula mvtnorm Rcpp RcppArmadillo]; };
-  pgirmess = derive2 { name="pgirmess"; version="1.6.8"; sha256="1sy5jf356mylsr0bjmvdykcv1ssf60v4bnrsqjdqsrry9a7iyp7g"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
+  pgirmess = derive2 { name="pgirmess"; version="1.6.9"; sha256="1i1qn68isaz2lbpqyydjgj9kri09aknza5qjn6m1wa1alyl7f611"; depends=[boot maptools rgdal rgeos sp spdep splancs]; };
   pglm = derive2 { name="pglm"; version="0.2-1"; sha256="14hnlidf62kzcf83jc7k17n4hjjaj82scdwh8a7qxd056vygkqx2"; depends=[maxLik plm statmod]; };
+  pgmm = derive2 { name="pgmm"; version="1.2.2"; sha256="1z39148gvs5nndd54x2afpsqdyqd8apjgnxn0ndv2071aa8gyk1j"; depends=[]; };
   pgnorm = derive2 { name="pgnorm"; version="2.0"; sha256="1k9z7pvmranr8m62v7amc0pj6lwzh3wqi79gg3mflifn1mr6c057"; depends=[]; };
   pgraph = derive2 { name="pgraph"; version="0.8"; sha256="1r784snci5m81qljfh1r3w8qzszmy0476zvsd1alh43afzg9zpr5"; depends=[energy glasso glmnet SAM]; };
   pgs = derive2 { name="pgs"; version="0.4-0"; sha256="1zf5sjn662sds3h06zk5p4g71qnpwp5yhw1dkjzs1rs48pxmagrx"; depends=[gsl R2Cuba]; };
@@ -9263,6 +9445,7 @@ in with self; {
   ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; };
   phalen = derive2 { name="phalen"; version="1.0"; sha256="0awj9a48dy0azkhqkkzf82q75hrsb2yw6dgbsvlsb0a71g4wyhlr"; depends=[sqldf]; };
   phangorn = derive2 { name="phangorn"; version="2.4.0"; sha256="0xc8k552nxczy19jr0xjjagrzc8x6lafasgk2c099ls8bc1yml1i"; depends=[ape fastmatch igraph magrittr Matrix quadprog Rcpp]; };
+  phantom = derive2 { name="phantom"; version="0.1.3"; sha256="0kgw65jziw5s03isq5ywmqijhkbik5i84k30hx5gbi0zzgj8y0h1"; depends=[gplots MASS NMF qusage RColorBrewer Rcpp RcppArmadillo]; };
   phase1RMD = derive2 { name="phase1RMD"; version="1.0.8"; sha256="1wvlajsqb8y8f30asq1lyk87kmakh2risnky98g5gday765y90qa"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; };
   phaseR = derive2 { name="phaseR"; version="1.3"; sha256="1hwclb7lys00vc260y3z9428b5dgm7zq474i8yg0w07rxqriaq2h"; depends=[deSolve]; };
   phcfM = derive2 { name="phcfM"; version="1.2"; sha256="0i1vr8rmq5zs34syz2vvy8c9603ifzr9s5v2izh1fh8xhzg7655x"; depends=[coda]; };
@@ -9272,20 +9455,21 @@ in with self; {
   phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; };
   pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; };
   pheno2geno = derive2 { name="pheno2geno"; version="1.4.0"; sha256="0fy8z6x1y0sakp07jb6zs0w0f86pbbllicj4qylxzfd5rpn1rqr0"; depends=[mixtools qtl VGAM]; };
-  phenoCDM = derive2 { name="phenoCDM"; version="0.0.2"; sha256="07fmljdn5dg9v2mv0k7hjk7xlldhvzvcxia8vda0xkpn3hlrriid"; depends=[rjags]; };
-  phenology = derive2 { name="phenology"; version="6.0.3"; sha256="17idd9znwmgsa6wzijc4ahvlld4qp6sihyg3cdv91gfl0yjd51w1"; depends=[HelpersMG lmf numDeriv optimx]; };
-  phenomap = derive2 { name="phenomap"; version="1.2.0"; sha256="1lz0sjpk8nj9v2fxqzwhcdppjy3hafb3ag2lbi3v85lc9ngwccdd"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; };
+  phenoCDM = derive2 { name="phenoCDM"; version="0.1.2"; sha256="1158ac6cjl83pnfxmklxjnh35nagx1c21iidawr1s7pqv858ixix"; depends=[rjags]; };
+  phenocamr = derive2 { name="phenocamr"; version="1.1.0"; sha256="10k7z82skkf9l15a2b77ygg5lkg0x68z7xbkw4p3mgs68dd9ah63"; depends=[changepoint curl daymetr DT jsonlite leaflet plotly shiny shinydashboard zoo]; };
+  phenology = derive2 { name="phenology"; version="7.0"; sha256="1glbjm7i2kyl04k0sam29zy1lpzfq2mpkgg44jpnby8c9vz8pkmi"; depends=[HelpersMG lmf numDeriv optimx]; };
+  phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; };
   phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; };
   phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; };
-  philentropy = derive2 { name="philentropy"; version="0.0.3"; sha256="00fpbmxg8m8apjb6cdrhh9rw3vp1j65ccvsqj1xlfcn1x5l1h3h8"; depends=[dplyr KernSmooth Rcpp]; };
+  philentropy = derive2 { name="philentropy"; version="0.1.0"; sha256="19nrfkla64jbd46ig13ljy6k5dxiwq2mnsfn37sgy9sf4h8zzwk3"; depends=[dplyr KernSmooth Rcpp]; };
   phmm = derive2 { name="phmm"; version="0.7-10"; sha256="1ra5qf24qmwjf8cra9yh20i2s8jv0kzb1gyw96il8r5cdl20gbcz"; depends=[lattice Matrix survival]; };
   phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; };
   phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; };
   phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; };
   phonics = derive2 { name="phonics"; version="1.0.0"; sha256="02bkw589iijlzbw0cbg9qhq99jij2p92cqrxa77chkly4naqkqds"; depends=[BH Rcpp]; };
-  photobiology = derive2 { name="photobiology"; version="0.9.19"; sha256="1islzlsj37y41c30r1cqmi646596n5b2swx8csxl0l1lrz0h8nnd"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; };
+  photobiology = derive2 { name="photobiology"; version="0.9.20"; sha256="0w4xcg9r6hn8lv8jkmfr1b2w2q30wxs6m3nv4409hy9rp77qgfcl"; depends=[caTools dplyr lubridate plyr polynom rlang splus2R tibble]; };
   photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.4.4"; sha256="14aiw5jxd6wnngy1rbbm85l0yx64nxrancal017wvr5n867c32d6"; depends=[photobiology]; };
-  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.13"; sha256="1zagvdaiv8d5frwki20wwvbyw4a9in3k8560janbmd161xh13ii0"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl reshape2 tibble]; };
+  photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.14"; sha256="1q0dd3szr06rm6zy2mkb37n4s37554x71jgkhmw88iiy58y2fkv5"; depends=[colorSpec dplyr hyperSpec lazyeval lubridate pavo photobiology readr readxl tibble tidyr]; };
   photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; };
   photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.2"; sha256="0fcin04xc2k39qdipslqd3w3bsd8yl3xlvg7mlgm3aphfwg4hnmj"; depends=[photobiology]; };
   photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.1"; sha256="0mpb5sv4wkvqzbhf193zkhap44yzlhxrnjx1p3j9iyjdg4bb1kka"; depends=[photobiology photobiologyWavebands]; };
@@ -9306,17 +9490,18 @@ in with self; {
   phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; };
   phyloclim = derive2 { name="phyloclim"; version="0.9-4"; sha256="0ngg8x192lrhd75rr6qbh72pqijbrhrpizl27q0vr6hp7n9ch3zx"; depends=[ape raster]; };
   phylocurve = derive2 { name="phylocurve"; version="2.0.9"; sha256="1d01nwfpyh61r00dq6cnhxdwzk81jr3l6aa51dl1wck4cy0frscp"; depends=[ape doParallel drc dtw foreach geiger geomorph GPfit Matrix mvnmle phylolm phytools Rcpp RcppArmadillo rgl]; };
-  phylogram = derive2 { name="phylogram"; version="1.0.1"; sha256="0hjniq91ivw82aqifb4sqqbw36scs0081s7xrjj37581rk0xamyl"; depends=[openssl Rcpp]; };
+  phylogram = derive2 { name="phylogram"; version="2.0.1"; sha256="17032pr87cdyz2aynb17jspkghq64xivsf1ylky2niypz7xbz0i3"; depends=[ape]; };
   phyloland = derive2 { name="phyloland"; version="1.3"; sha256="10g40m6n2s4qvnzlqcwpy3k0j7bxdp79f586jj910b8p00ymrksp"; depends=[ape]; };
   phylolm = derive2 { name="phylolm"; version="2.5"; sha256="0bffqzba6kcv8jyya7pja10mjnklhihczljhmj8q0pdrmd6qgqp8"; depends=[ape]; };
   phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; };
   phylopath = derive2 { name="phylopath"; version="1.0.0"; sha256="1n6f7piygps3pwqapsvqpz764995kxhdqz1hc5n6znvl01ykdqx5"; depends=[ape dplyr ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble tidyr]; };
+  phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.1"; sha256="0bxhikzrs5gcwkchpmxwvampyrbwv0d3ay5i7s766x6687xzm6qa"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; };
   phylosignal = derive2 { name="phylosignal"; version="1.2"; sha256="0apsg4v1n58wn8y8wnl6x1ahl903i29hh8bs2dw6ky2jafkjj4jb"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; };
   phylosim = derive2 { name="phylosim"; version="3.0.2"; sha256="148zm43cgdhr264ffcabjx4abykks07jix6lypqysqy25fbmdngk"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; };
   phylotate = derive2 { name="phylotate"; version="1.2"; sha256="19nssrdax5w5a50159j39jgs7305s48k3h56ivyzs5di6l7x1yxj"; depends=[]; };
   phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; };
   phyndr = derive2 { name="phyndr"; version="0.1.0"; sha256="03y3j4ik6flrksqm2dwh2cihn12hzfdik0fsak4zbxjdzaqn5gim"; depends=[ape]; };
-  phyreg = derive2 { name="phyreg"; version="0.7"; sha256="0saynhq4yvd4x2xaljcsfmqk7da2jq3jqk26fm9qivg900z4kf35"; depends=[]; };
+  phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; };
   physiology = derive2 { name="physiology"; version="0.2.2"; sha256="0z394smbnmlrnp9ms5vjczc3avrcn5nxm8np5y58k86x470w6npz"; depends=[]; };
   phytools = derive2 { name="phytools"; version="0.6-44"; sha256="1y815pv1cksj244vcb7q4qr45gzr4cb1qwi166h65ryggywcj48w"; depends=[animation ape clusterGeneration coda combinat maps MASS mnormt msm nlme numDeriv phangorn plotrix scatterplot3d]; };
   phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; };
@@ -9327,6 +9512,7 @@ in with self; {
   pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; };
   pillar = derive2 { name="pillar"; version="1.2.1"; sha256="1ryd7m570y6q3w71wd5dz042b3d0dv24g2rbkw1kdx0n6jj9gsbd"; depends=[cli crayon rlang utf8]; };
   pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; };
+  pimeta = derive2 { name="pimeta"; version="1.0.0"; sha256="0ri6qznk3nj1a2nj9qdahlm452drzcb51x8g89ffb3y6xjsh6y5g"; depends=[Rcpp RcppEigen]; };
   pinbasic = derive2 { name="pinbasic"; version="1.2.0"; sha256="1sn4q9g2pw8z6gyxi302bd7p578ldy1g6419w56z7jgv7m8n7g73"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; };
   pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; };
   pingr = derive2 { name="pingr"; version="1.1.2"; sha256="17fh2gjlmwy6wy8i24q76fivjig8jm05g9kvfz81q0h6b5zxnpmg"; depends=[]; };
@@ -9351,6 +9537,7 @@ in with self; {
   pkgcopier = derive2 { name="pkgcopier"; version="0.0.1"; sha256="04vpjf8nvqnpry54f1wwrnmipd5m6gqd89c3vkryqx88jk85jd8s"; depends=[httr stringr]; };
   pkggraph = derive2 { name="pkggraph"; version="0.2.2"; sha256="0pzqlim84b22ahq5yr50ybffqa0f5k5ch372v37nw1ndzci211d8"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; };
   pkgmaker = derive2 { name="pkgmaker"; version="0.22"; sha256="0vrqnd3kg6liqvpbd969jjsdx0f0rvmmxgdbwwrp6xfmdg0pib8r"; depends=[codetools digest registry stringr xtable]; };
+  pkgnet = derive2 { name="pkgnet"; version="0.1.0"; sha256="0f7xakl7vsx4byw6wfb1yw9bk95wrqsjs8wq6prg697zpdy3c7fw"; depends=[assertthat covr data_table DT futile_logger igraph knitr magrittr mvbutils R6 rmarkdown visNetwork]; };
   pkmon = derive2 { name="pkmon"; version="0.9"; sha256="1zcjz1h45qv81rwnjsgc9iwmrwpnsy917y7h66pz98wzszlxcsd2"; depends=[]; };
   pkr = derive2 { name="pkr"; version="0.1.1"; sha256="0mwrpkmf016lpwkjhhjpq7bw18mvshpyhwgmgqfrfl9gfbq4gphd"; depends=[binr foreign forestplot]; };
   pks = derive2 { name="pks"; version="0.4-0"; sha256="0fx7p2d83x0ip65aqp9dga59d9cggam8k79mi0drk5birzchqbcr"; depends=[sets]; };
@@ -9375,7 +9562,7 @@ in with self; {
   plmDE = derive2 { name="plmDE"; version="1.0"; sha256="19xxi0zzpxcrsdrbs0hiwqgnv2aaw1q3mi586wv27zz6lfqcr9lr"; depends=[limma MASS R_oo]; };
   plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; };
   pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; };
-  plogr = derive2 { name="plogr"; version="0.1-1"; sha256="13zliqlbkl8b04k9ga0sx5jsh7k867gracgl84l2a9kcqy9mqx92"; depends=[]; };
+  plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; };
   plot3D = derive2 { name="plot3D"; version="1.1.1"; sha256="0chn70fqwyca8lbnjnpbcj08ni0dfbax2gjmzhk2c4w72c04mzpn"; depends=[misc3d]; };
   plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; };
   plotGoogleMaps = derive2 { name="plotGoogleMaps"; version="2.2"; sha256="0qv57k46ncg0wrgma0sbr3xf0j9j8cii3ppk3gs65ardghs3bf6b"; depends=[lattice maptools raster rgdal sp spacetime]; };
@@ -9387,7 +9574,7 @@ in with self; {
   plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; };
   plotluck = derive2 { name="plotluck"; version="1.1.0"; sha256="0arbvldg50lyn98vkrys1yjkkraz8jracwal4r2mlw991pnaikpp"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; };
   plotly = derive2 { name="plotly"; version="4.7.1"; sha256="0wj9lw7w28z8w9ip9vadv6sydjhqyg65kfiai9m3bndzz50b1m3w"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr purrr RColorBrewer scales tibble tidyr viridisLite]; };
-  plotmo = derive2 { name="plotmo"; version="3.3.5"; sha256="1hiak4gg73ifml24mx1bjhgwqx9706v2mk5pxh59jvbrrc6mzvf4"; depends=[plotrix TeachingDemos]; };
+  plotmo = derive2 { name="plotmo"; version="3.3.6"; sha256="11v1jncw2x96j1f7nhv9sqvy3ia3035yh8slpy2ky7lf8ravjy58"; depends=[plotrix TeachingDemos]; };
   plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; };
   plotprotein = derive2 { name="plotprotein"; version="1.0"; sha256="14kfb4xxpfp8klz31kb7cpc39636ax2cx2483vqqkciccb28f0ks"; depends=[ade4 plotrix plyr seqinr XML]; };
   plotrix = derive2 { name="plotrix"; version="3.7"; sha256="0rw81n9p3d2i03b4pgcfj5blryc94f29bm9a4j9bnp5h8qjj6pry"; depends=[]; };
@@ -9411,8 +9598,7 @@ in with self; {
   plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; };
   plusser = derive2 { name="plusser"; version="0.4-0"; sha256="1g100dh8cvn9q09j0jbkw4xmwjdp1lm4651369975fm99nrlp1j9"; depends=[lubridate plyr RCurl RJSONIO]; };
   plyr = derive2 { name="plyr"; version="1.8.4"; sha256="1igar5pcjqh0jyxv0z3jah8rz617vfa86vw0r5c7c031b7bj5db0"; depends=[Rcpp]; };
-  pmap = derive2 { name="pmap"; version="0.6.0"; sha256="1g7das8bbp31r6syzn3zbxb8han1lqs9zpija7z8w2jpbw7gj4lb"; depends=[data_table DiagrammeR dplyr lubridate shiny stringr]; };
-  pmatch = derive2 { name="pmatch"; version="0.1.2"; sha256="1sbd02q2jqjqnh269m9f83mk0vbhh4mqqv0p23p6rj6gz0wljz9c"; depends=[dplyr glue purrr rlang tibble]; };
+  pmatch = derive2 { name="pmatch"; version="0.1.3"; sha256="1k83ysgc4dwms0k5knh2rj99l3kfclw9a29h2ksphy0g4r1ig9k3"; depends=[dplyr glue purrr rlang tibble]; };
   pmc = derive2 { name="pmc"; version="1.0.2"; sha256="1pamxg2cwyg36w0xnggrv5w03lb12l25z2da7xm1jvr17h0ipqmh"; depends=[dplyr geiger ggplot2 ouch tidyr]; };
   pmcgd = derive2 { name="pmcgd"; version="1.1"; sha256="1pybzvyjmzpcnxrjsas06diy3x83i1r5491s6ccyr63l56hs55d5"; depends=[mixture mnormt]; };
   pmclust = derive2 { name="pmclust"; version="0.2-0"; sha256="1bpfix76ylmn5ds6y0v40mfad7znaa6dj5ngr4mzv96yy6mg13ns"; depends=[MASS pbdBASE pbdDMAT pbdMPI]; };
@@ -9421,6 +9607,7 @@ in with self; {
   pmml = derive2 { name="pmml"; version="1.5.4"; sha256="1acld1x0z5rgyxb5id071s3zvf2vbv4b9nngvxrb63ay3yyy124b"; depends=[stringr XML]; };
   pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.1"; sha256="1cxmp3fgsf3z71v6qpd9l9ilgda5knan7vqifxpgm8m7a30sp3f3"; depends=[]; };
   pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; };
+  pmxTools = derive2 { name="pmxTools"; version="0.1.0"; sha256="1a242c85ywk026vb778s8bjc331ww11rb15pai02wbvpw9x4kpa0"; depends=[GGally ggplot2 magrittr MASS PKNCA plyr stringr XML xpose]; };
   png = derive2 { name="png"; version="0.1-7"; sha256="0g2mcp55lvvpx4kd3mn225mpbxqcq73wy5qx8b4lyf04iybgysg2"; depends=[]; };
   pnmtrem = derive2 { name="pnmtrem"; version="1.3"; sha256="0053gg368sdpcw2qzydpq0c5v2cxdlwgf5k68cbw0yx41csjgvz0"; depends=[MASS]; };
   pnn = derive2 { name="pnn"; version="1.0.1"; sha256="1s6ib60sbdas4720hrsr5lsszsa474kfblqcalsb56c84gkl42ka"; depends=[]; };
@@ -9430,7 +9617,7 @@ in with self; {
   poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; };
   pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; };
   pointblank = derive2 { name="pointblank"; version="0.1"; sha256="11v0x264065iljhv77m4yc44zqd0i9bg95c6qiv8d85nf97201hh"; depends=[digest dplyr Hmisc htmltools knitr lazyWeave lubridate magrittr mailR pixiedust purrr readr rJava rlang rmarkdown stringr tibble tidyr]; };
-  pointdensityP = derive2 { name="pointdensityP"; version="0.3.2"; sha256="1wi1lv5y589vmibvzigpqk0m9k5m265brhnz520g7wa4h3wpsdq3"; depends=[data_table]; };
+  pointdensityP = derive2 { name="pointdensityP"; version="0.3.3"; sha256="0ifkxxlmrrwscakmlap5bpfkzn4gfx9nc84p98i2spncnyd215ya"; depends=[data_table]; };
   poio = derive2 { name="poio"; version="0.0-3"; sha256="1smbnqjlicaqq2hswl910yiirzb9zikbk4pqxm9pwpixywj0nkys"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr R6 stringi tibble whoami]; };
   poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; };
   poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; };
@@ -9442,20 +9629,21 @@ in with self; {
   poliscidata = derive2 { name="poliscidata"; version="1.2.0"; sha256="0vn9wdlh3bi24mcq0r4ani2b0hhlg1za1z6fw8ikz7952gpacqk8"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; };
   politeness = derive2 { name="politeness"; version="0.2.2"; sha256="06h4g9xbk5dbaqzhybqc0mppa61ypb7ryi6hghqnqyj32y8r6dbr"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; };
   pollen = derive2 { name="pollen"; version="0.70.0"; sha256="1hk9sjxzwglj98ryic3m80lajzv1klnq9dl6i97c8f0ihbf97zdq"; depends=[dplyr lubridate purrr]; };
-  pollstR = derive2 { name="pollstR"; version="2.0.0"; sha256="0lcxhi1mazs8nh9hbbqyqx4axn5lji5fnp0kxrjwjxmzf59nksj8"; depends=[httr lubridate purrr stringr]; };
+  pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; };
   polmineR = derive2 { name="polmineR"; version="0.7.5"; sha256="0yz2c915jrf3dqadi6px9jidfwr4jd23rjrpas4xg4m6dx0f70jm"; depends=[data_table DT jsonlite Matrix pbapply R6 slam tm]; };
   polspline = derive2 { name="polspline"; version="1.1.12"; sha256="0chg5f6fq5ngjp1kkm4kjyxjc3kk83ky2ky5k7q3rhd8rkhd4szw"; depends=[]; };
   polyCub = derive2 { name="polyCub"; version="0.6.1"; sha256="16nr83gmv6pnk89nqxh8ihzacb0y8l4lz05c8sp6whmr26ja9vnf"; depends=[sp]; };
   polyPK = derive2 { name="polyPK"; version="3.0.0"; sha256="1vdfsad2b9habvm2ikjgn7ihnm851q9lqmgqjlsl737ka1vsgisf"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls samr sqldf xlsx]; };
-  polySegratio = derive2 { name="polySegratio"; version="0.2-4"; sha256="05kvj475zhlrmp7rm691cfs28igp4ac2cn2xxf7axx09v1nq33db"; depends=[gdata]; };
-  polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-3"; sha256="1y4kzb1p3aw7ng8mv1hszpvb5hwwxy4vg34mhhk705ki4jy8jgvp"; depends=[coda gtools lattice polySegratio]; };
+  polySegratio = derive2 { name="polySegratio"; version="0.2-5"; sha256="0djw49mbhd7x6jr0f5qkb9akw3fw3ax4w9xv8iwa5f65q5gbxpdf"; depends=[gdata]; };
+  polySegratioMM = derive2 { name="polySegratioMM"; version="0.6-4"; sha256="162xj52566kaxgfk7c14170xx07isyjmqb9skvhrdg7sz20lc3l1"; depends=[coda gtools lattice polySegratio]; };
   polyaAeppli = derive2 { name="polyaAeppli"; version="2.0"; sha256="0kyz3ap92xz7aqyviyrpggfmicy1gybrx7y19djsmixcwz53zqch"; depends=[]; };
   polyapost = derive2 { name="polyapost"; version="1.5"; sha256="0r2h51l2y0sj0xahdzfy1lyq4kh166crh2j02sk85q577q9d883y"; depends=[boot rcdd]; };
   polychaosbasics = derive2 { name="polychaosbasics"; version="1.1-1"; sha256="1kw5c4dmgpkbk2a30hh5n6xqpnbh6q2swxsdjkmcmhkwrzm4ylm2"; depends=[lhs MASS]; };
   polyclip = derive2 { name="polyclip"; version="1.6-1"; sha256="07xxw5ik30ds18kv808hynzmz3w351k6lj4ifz9kak0s7xsaqfn3"; depends=[]; };
   polycor = derive2 { name="polycor"; version="0.7-9"; sha256="0d0756faksviic5jrc47fg6l3wsm9r2wlbnxiw08563rv7shbvb7"; depends=[Matrix mvtnorm]; };
   polyfreqs = derive2 { name="polyfreqs"; version="1.0.2"; sha256="13859vbpys5yj1qiapyzv9wlvi6x6k0rm335bsi1v07ch3x2bh3b"; depends=[Rcpp]; };
-  polymapR = derive2 { name="polymapR"; version="1.0.13"; sha256="18bwi149y2622bdcyb5gcq0mxwalg6dsv3dgsnx2km4kd5x1a4ck"; depends=[combinat doParallel foreach igraph knitr Matrix MDSMap]; };
+  polyglot = derive2 { name="polyglot"; version="0.1.2"; sha256="01sb3ilr58252yw0b2669vjdf8574br0n2n0ffwd86gc9f3islb3"; depends=[]; };
+  polymapR = derive2 { name="polymapR"; version="1.0.16"; sha256="0j9zsgm4v78scsl4bblrf2rs691296p1sdimqqzs03d56cgaky04"; depends=[combinat doParallel foreach igraph knitr MDSMap]; };
   polynom = derive2 { name="polynom"; version="1.3-9"; sha256="1s4xxv5rvpigawknvq27v9vzvs83phfsj5h8mim2lmf5bj950nnk"; depends=[]; };
   polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; };
   polysat = derive2 { name="polysat"; version="1.7-2"; sha256="0ahx2pvlv2vdfiskwgawcrp447249ha0dq4qkhav3hpyvdg3in38"; depends=[]; };
@@ -9465,6 +9653,7 @@ in with self; {
   pompom = derive2 { name="pompom"; version="0.1.4"; sha256="0j37gq6lfccypclhrp7w3yfgsjbhfgqwg7x87r6rgywz6b3fnsgh"; depends=[ggplot2 lavaan qgraph reshape2]; };
   pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; };
   pool = derive2 { name="pool"; version="0.1.4"; sha256="0k209n40l2kwahy7b6hjwj1l19pdhnnq36jzxjmhv5zdad7dmckq"; depends=[DBI dbplyr dplyr later R6]; };
+  poolfstat = derive2 { name="poolfstat"; version="0.0.1"; sha256="1g6qx4518cr77wdlbicda68jm2yji24h14mjv5sq7zq241h4ailh"; depends=[]; };
   pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; };
   pop_wolf = derive2 { name="pop.wolf"; version="0.1"; sha256="19n00xv47v9j7slvm2ykzlksjfwjzimf88b3nk0y0192c29sdc9x"; depends=[abind]; };
   popEpi = derive2 { name="popEpi"; version="0.4.4"; sha256="010nsb3jlz769i8srkd3528a52h9gpw7q7gn4vraz9nx8g8585bs"; depends=[data_table Epi survival]; };
@@ -9472,10 +9661,10 @@ in with self; {
   popRange = derive2 { name="popRange"; version="1.1.3"; sha256="0kkz6va0p8zv3skaqqcpw42014d9x9x4ilx0czz91qf46h61jgb0"; depends=[findpython]; };
   popReconstruct = derive2 { name="popReconstruct"; version="1.0-4"; sha256="14lp0hfnzbiw81fnq7gzpr4lxyfh3g0428rm9jwjh631irz3fcc9"; depends=[coda]; };
   popbio = derive2 { name="popbio"; version="2.4.3"; sha256="1c34izyp6gpic3yv1rhg1snv2irw0bj9r1w9b892l7x0mxxmn2bl"; depends=[]; };
-  popdemo = derive2 { name="popdemo"; version="0.2-3"; sha256="0r3qdvwjwqzqxk3zp9vfzxwmc5fhjzn0ka91b37g62nanwxiyayw"; depends=[expm]; };
+  popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; };
   popkin = derive2 { name="popkin"; version="1.0.5"; sha256="147ic0d7cgs4x9vz4jm4wd6ckikn0s8a0q1mknmcrcfisq8zim75"; depends=[RColorBrewer Rcpp RcppEigen]; };
   poplite = derive2 { name="poplite"; version="0.99.19"; sha256="0y1l21clp9b5m50chqnqmvyd6rsk6xgn2bqf1877gx3h1qidh5fm"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; };
-  poppr = derive2 { name="poppr"; version="2.6.1"; sha256="1ib6z5rpx8xr5wfvjiy56fn9vgjda4d7x16n6wn4377b5fi4l3zp"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn rlang shiny vegan]; };
+  poppr = derive2 { name="poppr"; version="2.7.1"; sha256="01g2kcbrlnfw27yrvf3wzj68r5h8xif5baalx1rdfp16v49jkx34"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; };
   popprxl = derive2 { name="popprxl"; version="0.1.3"; sha256="1l842zgn04s8ghbcp8s2lzg7lgc809xd7hg9crnyp23c2cr0jlvi"; depends=[poppr readxl]; };
   popsom = derive2 { name="popsom"; version="4.2"; sha256="11d6z3qsq94k0557pnwa0h4pc718360lvg9jkblp8abnj52lcvvv"; depends=[class fields ggplot2 som]; };
   poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; };
@@ -9483,7 +9672,7 @@ in with self; {
   portes = derive2 { name="portes"; version="2.1-4"; sha256="09liy2bia76h5dh21s8skq9pj8k4wpq5agwrmr1pnvlpgc8m2b60"; depends=[]; };
   portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; };
   portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; };
-  postGIStools = derive2 { name="postGIStools"; version="0.2.1"; sha256="1dmf77xpy61pqis3j9qzjjksmm9hkyhzxqdmjajpj7rkbqhl5qvp"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
+  postGIStools = derive2 { name="postGIStools"; version="0.2.2"; sha256="1d1igv17bj17d0nmavvn5814nqb7k0hs2cjbaqgjd6ip1wcclfxz"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; };
   postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; };
   potts = derive2 { name="potts"; version="0.5-7"; sha256="194996wr4rnpr42xqfi5yrcnxvd82all2fxki95dklr2qfjxg98a"; depends=[]; };
   powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; };
@@ -9495,19 +9684,19 @@ in with self; {
   powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; };
   powerMediation = derive2 { name="powerMediation"; version="0.2.9"; sha256="1rk8h8qn4b68ra5h5hiy9fvvbpskj9y806rwrvl1l7gs7xlmji7l"; depends=[]; };
   powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; };
-  powerbydesign = derive2 { name="powerbydesign"; version="1.0.3"; sha256="0dv4j0kwdzvxnq587vs1dsy2yci3v3q2smncpscpcsalp38rvx4i"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; };
-  powerlmm = derive2 { name="powerlmm"; version="0.1.0"; sha256="0fsd3h94va5hn0nqxdalchw02s4daxq8dlgdxb5a4nigg64lfkm2"; depends=[ggplot2 ggsci gridExtra lme4 lmerTest MASS Matrix pbmcapply scales testthat]; };
+  powerbydesign = derive2 { name="powerbydesign"; version="1.0.4"; sha256="0xd4hylx7jl4ksycz5gfjcgy92mh5c9d4r34ap1g81ybmyk7yrsj"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; };
+  powerlmm = derive2 { name="powerlmm"; version="0.3.0"; sha256="1prg1dw0pzyz4vc7a936bgx56227ab34b3ipwxn1mm8n03xk1zqc"; depends=[lme4 MASS Matrix scales]; };
   powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; };
   powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; };
   ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; };
   ppcc = derive2 { name="ppcc"; version="1.0"; sha256="022c8w7ws7fw6yy572rn6m8ki14d2ph7nd2hk2c6mmx2c4lbc20v"; depends=[]; };
   ppclust = derive2 { name="ppclust"; version="0.1.1"; sha256="10fcyayda634lg5g992g21casqx5k0jni9r30km5rczzib7cz9gg"; depends=[inaparc MASS]; };
   ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; };
-  ppiPre = derive2 { name="ppiPre"; version="1.9"; sha256="07k2mriyz1wmxb5gka0637q4pmvnmd1j16mnkkdrsx252klgjsdw"; depends=[AnnotationDbi e1071 GO_db GOSemSim igraph]; };
   ppitables = derive2 { name="ppitables"; version="0.1.2"; sha256="1hw25zvvbmc6vxbhcrpz9xkwc6lbc9v1r77fil3gv2wm5n672s4h"; depends=[]; };
   ppls = derive2 { name="ppls"; version="1.6-1"; sha256="1r3h4pf79bkzpqdvyg33nwjabsqfv7r8a4ziq2zwx5vvm7mdy7pd"; depends=[MASS]; };
   ppmlasso = derive2 { name="ppmlasso"; version="1.1"; sha256="1w13p1wjl1csds1xfc79m44rlym9id9gwnp3q0bzw05f35zbfryg"; depends=[spatstat]; };
   pps = derive2 { name="pps"; version="0.94"; sha256="0sirxpagqc2ghc01zc6q4dk691six9wkgknfbwaqxbxvda3hcmyq"; depends=[]; };
+  ppsbm = derive2 { name="ppsbm"; version="0.2.2"; sha256="0y4whxv14jqx7mqxj7n427vpbxb5rkwj8xvx0mj4knnwy9v437z4"; depends=[clue gtools Rfast]; };
   pqantimalarials = derive2 { name="pqantimalarials"; version="0.2"; sha256="0azxkf1rvk9cyzr4gbp4y2vcxrxw3d4f002d5gjkvv1f4kx8faw1"; depends=[plyr RColorBrewer reshape2 shiny]; };
   prLogistic = derive2 { name="prLogistic"; version="1.2"; sha256="1abwz7nqkz2qbyqyr603kl9a3rkad3f4vxhck6a9kl80xrmfrj9s"; depends=[boot Hmisc lme4]; };
   prabclus = derive2 { name="prabclus"; version="2.2-6"; sha256="0qjsxrx6yv338bxm4ki0w9h8hind1l98abdrz828588bwj02jya1"; depends=[MASS mclust]; };
@@ -9526,7 +9715,7 @@ in with self; {
   precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; };
   precrec = derive2 { name="precrec"; version="0.9.1"; sha256="0kppl4x8ji8hzll5wss1nzlk8qvf4g78f14x4c2b8dcxjikgl939"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; };
   predatory = derive2 { name="predatory"; version="1.2"; sha256="1qbkifx16ixzimshm8lsg3d1y7cj453ksn8cpwy03xql6b19r8x4"; depends=[readr stringr]; };
-  prediction = derive2 { name="prediction"; version="0.2.0"; sha256="09jlwk3fh7lkka9vsbr0bp7bpaf2p7q96qb8mv56rcmfrsf5446c"; depends=[]; };
+  prediction = derive2 { name="prediction"; version="0.3.2"; sha256="1a65006i4gs9syvc240zzhx91mvf49jy60grz375lq0bzkxy4ly0"; depends=[data_table]; };
   predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; };
   predictmeans = derive2 { name="predictmeans"; version="0.99"; sha256="1qfqh21d3m0k2491hv5rl5k4v49j5089xsdk3bxicp30l512rax0"; depends=[ggplot2 lattice lme4 nlme pbkrtest plyr]; };
   predkmeans = derive2 { name="predkmeans"; version="0.1.0"; sha256="1xmzdv35hxnslffkj8nbahhxrxmv7995pkdq2igw72x9wbryqlhs"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; };
@@ -9536,6 +9725,7 @@ in with self; {
   preference = derive2 { name="preference"; version="0.1.2"; sha256="113car6miax832kl0gzlqawwq3f5xbp06fz1ygz9nkzxh7mpmi11"; depends=[]; };
   prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; };
   prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; };
+  prepplot = derive2 { name="prepplot"; version="0.7"; sha256="1yqiq78iqsk49ky913x4h8f3638blyamrwdhhcmzfgy4n7dnk11x"; depends=[plotrix shape]; };
   preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; };
   preprosim = derive2 { name="preprosim"; version="0.2.0"; sha256="1z10ranfal51vzsnndfaw5aqddh2w1xx8h50j1p7gx4fi90d0waq"; depends=[caret DMwR doParallel e1071 foreach ggplot2 reshape2]; };
   preproviz = derive2 { name="preproviz"; version="0.2.0"; sha256="0jb85qkzywsd2iyfynd8ngkc136m4qc38phc3fgxm2qw30dacmyh"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; };
@@ -9550,6 +9740,7 @@ in with self; {
   prettyunits = derive2 { name="prettyunits"; version="1.0.2"; sha256="0p3z42hnk53x7ky4d1dr2brf7p8gv3agxr71i99m01n2hq2ri91m"; depends=[assertthat magrittr]; };
   prevR = derive2 { name="prevR"; version="3.3"; sha256="11syifnv0mgbybsphgaj3a2j29p2q0l4y4w008n2r9s359arjj8m"; depends=[directlabels fields foreign GenKern ggplot2 gstat maptools rgdal sp]; };
   prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; };
+  pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="0.2.1"; sha256="0yy2ndvmcwb5syb1km0hkv73mwlnnf53mpqp02p98xib1bm4a1w4"; depends=[]; };
   prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; };
   primefactr = derive2 { name="primefactr"; version="0.1.0"; sha256="1p0hlf0llyfccg0pa2fccxp8zzhwsyrpd18d8ih1z7mx88kyrhwm"; depends=[]; };
   primer = derive2 { name="primer"; version="1.0"; sha256="0vkq794a9qmz9klgzz7xz35msnmhdaq3f91lcix762wlchz6v7sg"; depends=[deSolve lattice]; };
@@ -9558,7 +9749,7 @@ in with self; {
   princurve = derive2 { name="princurve"; version="1.1-12"; sha256="19fprwpfhgv6n6ann978ilwhh58qi443q25z01qzxml4b5jzsd7w"; depends=[]; };
   prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; };
   printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; };
-  prioritizr = derive2 { name="prioritizr"; version="3.0.3"; sha256="111y7zdalai0wd2w1a9fn89axz568gxn91x2zp2x3101y263q1kx"; depends=[assertthat BH data_table doParallel magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp uuid]; };
+  prioritizr = derive2 { name="prioritizr"; version="3.0.4"; sha256="0c82v0vz7b95milgzbbh5z19h1qmybb44lxxmw5407pqrdv2fihl"; depends=[assertthat BH data_table doParallel magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp uuid]; };
   prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.1"; sha256="0mskny9j6dwfbndzqpbmqh552vc86xqwjdpjk2h64qza2abyh5vr"; depends=[raster sp]; };
   prioritylasso = derive2 { name="prioritylasso"; version="0.2.1"; sha256="1wcykrhv1d762h7k7qkvnsjk7l6sincmh6vc6wmgpmmwx5nch70x"; depends=[glmnet survival]; };
   prism = derive2 { name="prism"; version="0.0.7"; sha256="03z1m09vf2gd277xp3y5nhvgrp0fnbr2x0r9b92kp46ca09fq9y8"; depends=[ggplot2 httr raster]; };
@@ -9571,19 +9762,19 @@ in with self; {
   probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; };
   proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; };
   processcontrol = derive2 { name="processcontrol"; version="0.1.0"; sha256="0c0bksgq24blfkdgp5bn49sjnaajrg5bag8qzb5zffxbhnm4s30x"; depends=[plyr]; };
-  processmapR = derive2 { name="processmapR"; version="0.2.1"; sha256="0qlz6av6f0ik62md0wa5il3id55rnbwc6i34sxjhv9awwvm2ygrv"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr]; };
+  processmapR = derive2 { name="processmapR"; version="0.3.0"; sha256="056g379hi80r1hxd77axayb4sa5a97bvxrlsh0nqw6pam5ycqr53"; depends=[bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms miniUI plotly purrr RColorBrewer rlang scales shiny stringr]; };
   processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; };
   processx = derive2 { name="processx"; version="2.0.0.1"; sha256="0yw23lp9xjvbpswzghkmjiayw7p19hbvmgv58k3i6b8g5nav4qcg"; depends=[assertthat crayon debugme R6]; };
   prodest = derive2 { name="prodest"; version="0.1.1"; sha256="1j8gqxswwvnd45givadlvblnsc3qli228gz77d7alc19qf1wrrvz"; depends=[DEoptim dplyr Matrix Rsolnp]; };
   prodigenr = derive2 { name="prodigenr"; version="0.3.0"; sha256="1217l9r012xrgzna1bf9z31n2gw36h6grga3949kg7ghxrzjbm4q"; depends=[devtools]; };
-  prodlim = derive2 { name="prodlim"; version="1.6.1"; sha256="0m51rkivx1zr6whdqwj66jpnkmp4385m06kkha3dp8qqf4jna9iz"; depends=[KernSmooth lava Rcpp survival]; };
-  productivity = derive2 { name="productivity"; version="1.0.0"; sha256="1yf1w9pss8cbhlqg1zmsmr5qchf7sdvl67m1zzgxf8pplj2pzrzm"; depends=[doParallel foreach plm Rglpk]; };
+  prodlim = derive2 { name="prodlim"; version="2018.04.18"; sha256="1aslq87sqwikh8chxc378r38146y7kv79zz0kcq3j93ivx7va8jb"; depends=[KernSmooth lava Rcpp survival]; };
+  productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; };
   productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; };
   prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; };
   profdpm = derive2 { name="profdpm"; version="3.3"; sha256="07lhjavrx4fa5950w928mfpddmmnmvdapl5n6mv49m8h3bxs4nmy"; depends=[]; };
   profile = derive2 { name="profile"; version="1.0"; sha256="0m7fm490gqkbmnbdq3lac87zqb9qyx6546rlpa130rq1jnlgxfp6"; depends=[rlang tibble withr]; };
   profileModel = derive2 { name="profileModel"; version="0.5-9"; sha256="1p9b9jr5842im195d60ja82pp7vbk85vs8b0r3fnf62j4b92aky9"; depends=[]; };
-  profileR = derive2 { name="profileR"; version="0.3-4"; sha256="1vinqddhd4jbncn37rbypja7ili3kwmj2sacgf491s94zil4ijik"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
+  profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; };
   profilr = derive2 { name="profilr"; version="0.1.0"; sha256="0rw5cjvvrgsdmhgrsaw4skfdk8h488b6mkmibgjj3dd3x0j3caq6"; depends=[]; };
   profmem = derive2 { name="profmem"; version="0.5.0"; sha256="152dka39p9i17ydlhc92y6x6i8girn3wab1ycbqb9kva07j9d2h8"; depends=[]; };
   profr = derive2 { name="profr"; version="0.3.1"; sha256="1w06mm89apggy6wc273b2nsp95smajr8sf3dwshykivv7mhkxs5d"; depends=[plyr stringr]; };
@@ -9596,7 +9787,8 @@ in with self; {
   projections = derive2 { name="projections"; version="0.0.1"; sha256="1qrgazxdihzp1i4aghkwkh6q5g1all39bvd83gwh4hj9pxm2w5zy"; depends=[distcrete ggplot2 incidence]; };
   projector = derive2 { name="projector"; version="0.0.2"; sha256="15n5b2xgs0zj87pc3svlmnkjrxgkjkx941g8bs3ms90fg7nh2drc"; depends=[assertthat dbscan plotly RColorBrewer RcppAnnoy Rtsne shiny shinyjs shinythemes]; };
   projmanr = derive2 { name="projmanr"; version="0.1.1"; sha256="0mmfmp5qf4r75q4hjbra2pxym77m16g28n94z5yj2qdzq46hgl4c"; depends=[ggplot2 igraph R6 tidyr]; };
-  projpred = derive2 { name="projpred"; version="0.7.0"; sha256="1n2lwzc3hvjr4d6csc2nqlxqcrr979h52lfvbr81alybkg1nbqch"; depends=[ggplot2 loo Rcpp RcppArmadillo rstan rstanarm]; };
+  projpred = derive2 { name="projpred"; version="0.8.0"; sha256="06wi8lc88xm45drqhb3mcq5l1g1zm2msgi1m0857vldg6828gjbq"; depends=[ggplot2 loo Rcpp RcppArmadillo rngtools rstan rstanarm]; };
+  promises = derive2 { name="promises"; version="1.0.1"; sha256="0n2mlv6bvfb4yhgcml696l9vkbw21pz0smqylivr606z99rwgny2"; depends=[later magrittr R6 Rcpp rlang]; };
   promote = derive2 { name="promote"; version="1.0.1"; sha256="1f8f5rm25fx4146hf3rds2lb7qpfz17fa5r2a1f4s3q5p86svgqn"; depends=[httr jsonlite stringr]; };
   prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; };
   propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; };
@@ -9604,7 +9796,7 @@ in with self; {
   properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; };
   prophet = derive2 { name="prophet"; version="0.2.1"; sha256="10qd3w9jgk3d53465005b0di2lxa6cg67lj81fzmf2h919ai9i5m"; depends=[dplyr extraDistr ggplot2 Rcpp rstan scales tidyr]; };
   proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; };
-  propr = derive2 { name="propr"; version="3.1.4"; sha256="1hggj926zphhg6v09bbrv77rp11bg6vciy3xfnkqi2hakjw3ak59"; depends=[fastcluster ggplot2 igraph Rcpp]; };
+  propr = derive2 { name="propr"; version="3.1.9"; sha256="0bwkn923id6wd9c4qas6j363i9v4ziwvcr8d0rijxyvg23vjaq6x"; depends=[fastcluster ggplot2 igraph Rcpp]; };
   prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; };
   protViz = derive2 { name="protViz"; version="0.2.45"; sha256="0mvq0p0lnxwpia1znyizha5gdj6f9i07nghp3gv9kfficlq3fw03"; depends=[Rcpp]; };
   proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; };
@@ -9619,7 +9811,7 @@ in with self; {
   protr = derive2 { name="protr"; version="1.5-0"; sha256="1mi14hph6cqdsgjw4p00miaa4bh2axkwfcmxaiv7f7v4dk8i52y1"; depends=[]; };
   proustr = derive2 { name="proustr"; version="0.2.1"; sha256="17syaxfrwm9kh5q825hj7bsrvi4h9avpdabw9y0vq20y87w8cq1s"; depends=[assertthat dplyr magrittr purrr rlang SnowballC stringr tidyr tokenizers]; };
   provenance = derive2 { name="provenance"; version="1.9"; sha256="1d40k85cxnnxy480ylvy6wwswgf8hbxgcbansx90hyg9cb3rvhil"; depends=[MASS]; };
-  proxy = derive2 { name="proxy"; version="0.4-21"; sha256="1vih8gsfzv97h5c8ixd1qjnn02i7fzla2p9fdj2wpisqhx0p0xv0"; depends=[]; };
+  proxy = derive2 { name="proxy"; version="0.4-22"; sha256="0l0ff8irmmvic941is290hd5vszyhaj5nfwna4v3w9c1zk5nr1ma"; depends=[]; };
   prozor = derive2 { name="prozor"; version="0.2.3"; sha256="1686lfmzmzl1488xnppv95hfr83gf67xfzqsw49gdas0aba3plhh"; depends=[AhoCorasickTrie doParallel foreach Matrix plyr seqinr stringr]; };
   prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; };
   pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; };
@@ -9632,6 +9824,7 @@ in with self; {
   pse = derive2 { name="pse"; version="0.4.7"; sha256="0kigfzsvx3gw7jwym4f19dydwwarwxgmha7hpy54gg0zzi4k9icl"; depends=[boot Hmisc]; };
   pseudo = derive2 { name="pseudo"; version="1.4.3"; sha256="0ccf3gz2g7g5y4acpj2qnb39hrghhdganizlddg6rx7al869fffs"; depends=[geepack KMsurv]; };
   pseval = derive2 { name="pseval"; version="1.3.0"; sha256="1iv3fa7ar9i7v9j5axbasmn8l8nvry4zvmb7fd8aql82f22szmbj"; depends=[survival]; };
+  psgp = derive2 { name="psgp"; version="0.3-17"; sha256="11rx3xim9jx8klpz1p2xj1laimd5q5qs9mvigbh48gsjrm0pnd5v"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; };
   psidR = derive2 { name="psidR"; version="1.4"; sha256="1whdjsab5cihlq4gp06xafl3zg7z0cjb4622d23v24igz7kr0ic2"; depends=[data_table foreign RCurl SAScii]; };
   pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; };
   psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; };
@@ -9640,9 +9833,9 @@ in with self; {
   pssm = derive2 { name="pssm"; version="1.1"; sha256="0r3d1mzc7bcz238lqq4y518400m2dqm5a1fb9gkfiari1ax099lv"; depends=[abind MASS MHadaptive numDeriv]; };
   pstest = derive2 { name="pstest"; version="0.1.1"; sha256="0k8413ilpbz23v210wz80mli7ajpc8p7y4pbn1za371qw04b81c5"; depends=[harvestr]; };
   psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; };
-  psych = derive2 { name="psych"; version="1.7.8"; sha256="0daismb8pdk392vdy304hqx0m3jx62gx3a0hygjygc125rhfla7k"; depends=[foreign lattice mnormt nlme]; };
-  psychmeta = derive2 { name="psychmeta"; version="0.2.3"; sha256="0lfgsbvb1dplwbxfqim3q7lnf4sclngdik1l5cxl9rkdwb54lcy6"; depends=[boot dplyr fungible ggplot2 MASS metafor nor1mix progress reshape2 rtf tibble tidyr tmvtnorm]; };
-  psycho = derive2 { name="psycho"; version="0.1.0"; sha256="0qfgq5sivr01jiglaykh3jqjz11zag8si1nmw0ffr28bp94gibrg"; depends=[dplyr ggcorrplot ggplot2 lmerTest MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm stringr tidyr]; };
+  psych = derive2 { name="psych"; version="1.8.3.3"; sha256="1zhp8j81nkzd65168zdw9ylypb9n07ajan21x0wqcn8jdbg970sg"; depends=[foreign lattice mnormt nlme]; };
+  psychmeta = derive2 { name="psychmeta"; version="1.0.0"; sha256="0wbjq8908wnch45n4mblx1lxsp5r65jv2g9d46lar6qxrawqbaqg"; depends=[boot dplyr fungible ggplot2 knitr MASS metafor nor1mix progress RCurl RefManageR reshape2 rlang rmarkdown rtf stringr tibble tidyr tmvtnorm]; };
+  psycho = derive2 { name="psycho"; version="0.1.4"; sha256="0drzr3svs76wx7ki6s4c5i27r5p309wgzdcpxz1j5i4ivvwhkl0b"; depends=[dplyr ggcorrplot ggplot2 lmerTest MASS MuMIn nFactors ppcor psych purrr qgraph rstanarm stringr tidyr]; };
   psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; };
   psychomix = derive2 { name="psychomix"; version="1.1-4"; sha256="15yk3z11w4bzk6vljr13bkfhzycypww6blc1djb5iwl635xq1c49"; depends=[flexmix Formula lattice modeltools psychotools]; };
   psychotools = derive2 { name="psychotools"; version="0.4-2"; sha256="04p5yb39c8j28q6brqsrw0dr1zvgpyzb7008v2kk3d5sncgl4dd0"; depends=[]; };
@@ -9656,12 +9849,13 @@ in with self; {
   ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; };
   ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; };
   pubh = derive2 { name="pubh"; version="0.1.7"; sha256="0dha3adlbrxgkamlb5i2lcnqcsspqb30fmj0f2zhz0bh4i83lznb"; depends=[bookdown car descr Epi epiR epitools gee lattice latticeExtra lme4 lmtest MASS multcomp nlme nnet ordinal pander papeR rmdformats sandwich survival visreg]; };
-  pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.11"; sha256="01b4dd28x3a25d0s8k0dwbcr6asaqh2b9c4fddg683i54q483lkd"; depends=[boot R2HTML RCurl XML]; };
+  pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.12"; sha256="04zb5lbjdrhdpam4xmkcc947icsnias5pxbv2pwhvyhk7mz16nya"; depends=[boot R2HTML RCurl XML]; };
   pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; };
-  pulsar = derive2 { name="pulsar"; version="0.3.1"; sha256="0y72wpxa9rqjzyqrfpl1sa06zpx6rbxi4jfncxzac8m534l5l7l5"; depends=[Matrix]; };
+  pulsar = derive2 { name="pulsar"; version="0.3.2"; sha256="1zfkxksynrphfv6lpr7rc3g9k643840bgrdv9ic700984vxgg68m"; depends=[Matrix]; };
   pulver = derive2 { name="pulver"; version="0.1.1"; sha256="0zj3a66hjing4a87lvhxlvdp72kpn0s2d6r5kc0pi06ls04r8sax"; depends=[DatABEL Rcpp]; };
   pumilioR = derive2 { name="pumilioR"; version="1.3.1"; sha256="1791r5lkr6hafd2rz9f9nfy5vc03c4833f292khvd2cg43sb0bfc"; depends=[RCurl XML]; };
   purge = derive2 { name="purge"; version="0.2.1"; sha256="1faf8mkaxsnj63wnig5rs50hd3j6vzaj0xkdz8kn0j7y2vvshp9p"; depends=[]; };
+  purging = derive2 { name="purging"; version="1.0.0"; sha256="1b8f87jn6wyh4fp6b1660bd484wcf7xiajdg9dz2594aj1r94qsr"; depends=[MASS]; };
   purrr = derive2 { name="purrr"; version="0.2.4"; sha256="0wgbnbrqncjpggg8f9bdpcd1gy351s5f0az5k8lc55cvs9lhz3gd"; depends=[magrittr rlang tibble]; };
   purrrlyr = derive2 { name="purrrlyr"; version="0.0.2"; sha256="1wkngb87xmlkghsqjr7l5fhlj3a54prvg6v6hd0prn768xw4rc1c"; depends=[BH dplyr lazyeval magrittr purrr Rcpp]; };
   pushoverr = derive2 { name="pushoverr"; version="1.0.0"; sha256="1zazrx0szx21ymn7zlkfqkhid0ar8jblnpnf5nycj0p7dbh6d0bd"; depends=[assertthat httr]; };
@@ -9673,7 +9867,7 @@ in with self; {
   pwr = derive2 { name="pwr"; version="1.2-2"; sha256="0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm"; depends=[]; };
   pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; };
   pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; };
-  pwrFDR = derive2 { name="pwrFDR"; version="1.85"; sha256="1al8dh5h32lipnqfa823wwx7nsrz8z3fadl7hz4qvj8vpfijpz1i"; depends=[]; };
+  pwrFDR = derive2 { name="pwrFDR"; version="1.90"; sha256="1lphq62k33wd1ay18gyl62yg6d57j2hhyk1pxz67qv5ywj73r34s"; depends=[]; };
   pwrRasch = derive2 { name="pwrRasch"; version="0.1-2"; sha256="13fr4yfk8aky1vv36pllx673l4lg9q7i661vbyn2zabyizd2rw3b"; depends=[]; };
   pwt = derive2 { name="pwt"; version="7.1-1"; sha256="0926viwmwldmzlzbnjfijh00wrhgb0h4h0mlrls71pi5pjfldifa"; depends=[]; };
   pwt8 = derive2 { name="pwt8"; version="8.1-1"; sha256="1iig0x90ilzh3hdki0h33qgrra8r94rw4bk1x8y7i6c1may8y0v6"; depends=[]; };
@@ -9681,6 +9875,7 @@ in with self; {
   pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; };
   pxweb = derive2 { name="pxweb"; version="0.6.3"; sha256="106nb0a3v295cam8ixhdwpgjhwq8p71c2z5c49s6xnqwmf6rbd0h"; depends=[data_table httr plyr RJSONIO stringr]; };
   pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; };
+  pyinit = derive2 { name="pyinit"; version="1.0.2"; sha256="148b8l5a8c636rgm8dwd8v6ggw9qmkafc5a40bciqc4rk09lfhl3"; depends=[robustbase]; };
   pyramid = derive2 { name="pyramid"; version="1.4"; sha256="0hh0hmckicl0r2r9zlf693j65jr9jgmiz643j2asp57nbs99lgxz"; depends=[]; };
   qCBA = derive2 { name="qCBA"; version="0.3.1"; sha256="0lr97hig9c4l9k7vjalvgar4f1dic1lqf91li4q63j07lgdyvh4c"; depends=[arc arules rJava]; };
   qGaussian = derive2 { name="qGaussian"; version="0.1.6"; sha256="0j8n4y4yzidkp52db73zv2snx0kwpg3aiz7vr82ybq3x9scy8c4n"; depends=[Rcpp robustbase zipfR]; };
@@ -9711,7 +9906,7 @@ in with self; {
   qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; };
   qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.5"; sha256="0fm49iydbjp264h9mkk8qfblbvg4l3bfcnphxyhcv3n27m0w44sf"; depends=[Matrix slam]; };
   qlcVisualize = derive2 { name="qlcVisualize"; version="0.1.0"; sha256="13rc4z7rz7vngrkxq09flhszvcbg6i7drdkdp8kmvgcxf0im6lv0"; depends=[alphahull fields mapdata mapplots maps maptools MASS qlcMatrix raster seriation sp spatstat]; };
-  qle = derive2 { name="qle"; version="0.16-6"; sha256="1gah72vv7zfaxl2i9r58qzpkml7pkspxffd7jaf9z93izrzcsp74"; depends=[digest expm lhs mvtnorm nloptr]; };
+  qle = derive2 { name="qle"; version="0.17-1"; sha256="1zsvmnxdfd6avr14z5101i4kmks87yrsn15wiq5sx8gsfbxksjkj"; depends=[digest expm lhs mvtnorm nloptr]; };
   qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; };
   qmethod = derive2 { name="qmethod"; version="1.5.2"; sha256="1snllw82cijl7qgmgkn2x1k3x43x0hxbvh5mx5sffrma9kkv2fii"; depends=[digest GPArotation knitr psych xtable]; };
   qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; };
@@ -9742,9 +9937,9 @@ in with self; {
   qtlbook = derive2 { name="qtlbook"; version="0.18-6"; sha256="0kbz7icp6fzl2bgk50fcg8x704aijpz3xbqrzraj7qa3z8gakaj6"; depends=[qtl]; };
   qtlc = derive2 { name="qtlc"; version="1.0"; sha256="17ij4alx4qg556b5kq7qsjygj5jf8iyx1f0v52pvx1z2sm6nppww"; depends=[plot3D rgl tiff]; };
   qtlcharts = derive2 { name="qtlcharts"; version="0.9-6"; sha256="021gx5qzrc7jbgpp91mn36czr7fsh37wf3c7cifcv3xwzc54j4dd"; depends=[htmlwidgets qtl]; };
-  qtlhot = derive2 { name="qtlhot"; version="0.9.0"; sha256="1043rksqqzgmr7q03j18wxgm706prqxq9ki9b9p2dxvc62vfcfih"; depends=[corpcor lattice mnormt qtl]; };
+  qtlhot = derive2 { name="qtlhot"; version="1.0.4"; sha256="0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m"; depends=[corpcor mnormt qtl]; };
   qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; };
-  qtlnet = derive2 { name="qtlnet"; version="1.3.6"; sha256="044a2p3mpp203kb85s2fr3qiyypm461lrzxkfi0hnzq44qqba169"; depends=[graph igraph pcalg qtl sem]; };
+  qtlnet = derive2 { name="qtlnet"; version="1.4.4"; sha256="1r9r6wp71i36ffcdxiljvh2c8nva868x2dx6bkinbaq8cixww2cx"; depends=[graph igraph pcalg qtl sem]; };
   qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; };
   quad = derive2 { name="quad"; version="1.0"; sha256="0fak12l19f260k0ygh6zimx8dabzsv7a9i2njw8hnfcs3ndffhv5"; depends=[PearsonDS]; };
   quadmesh = derive2 { name="quadmesh"; version="0.1.0"; sha256="1k1midhszmi843krv9sdwbyhjmffgps0xx9aigkp7yw7mpif07vx"; depends=[dplyr raster]; };
@@ -9759,10 +9954,10 @@ in with self; {
   qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; };
   quantable = derive2 { name="quantable"; version="0.2.2"; sha256="179bqqrga8mpigchfmhf11sc75frhd9nd6yqclz85lnd6gl16yd7"; depends=[caret e1071 gplots Matrix pROC RColorBrewer scales]; };
   quantchem = derive2 { name="quantchem"; version="0.13"; sha256="1ga5xa7lsk04flfp1syjzpnvj3i2ypzh1m49vq1xkdwpm6axdy8n"; depends=[MASS outliers]; };
-  quanteda = derive2 { name="quanteda"; version="1.1.1"; sha256="1yi59lr968y6l7v537xc6p50yi9y7hgyg5lwghqqgk13glg6zmbg"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi XML yaml]; };
+  quanteda = derive2 { name="quanteda"; version="1.2.0"; sha256="19rr0dkcazdkyzyy7srawf57mmvjjz3nvxik0bkqx6cl7cvrjajz"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi XML yaml]; };
   quantification = derive2 { name="quantification"; version="0.2.0"; sha256="116cp88q9cmizxc2a8lsysa1vwyp1y86457fx5qkq5dcm4g721g8"; depends=[car]; };
   quantileDA = derive2 { name="quantileDA"; version="1.1"; sha256="0jbklxsy33j7clcw97qq4ijwkrb94v2m11gjcfa38vplfxm9913q"; depends=[]; };
-  quantmod = derive2 { name="quantmod"; version="0.4-12"; sha256="0y7gh0k1s10vdsfch8777avbhf99mc9crikvx7ahqrw0j631vmhq"; depends=[curl TTR xts zoo]; };
+  quantmod = derive2 { name="quantmod"; version="0.4-13"; sha256="16aldg96z7amp5mr90nb8127yy04gxsihfr26km5p3cx3j117yv0"; depends=[curl TTR xts zoo]; };
   quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; };
   quantreg = derive2 { name="quantreg"; version="5.35"; sha256="18f3qxv1j1bqmq55hzssz8mnp5ww4flhy80rm2v1rk0mmg9paz7m"; depends=[Matrix MatrixModels SparseM]; };
   quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; };
@@ -9785,10 +9980,10 @@ in with self; {
   quint = derive2 { name="quint"; version="1.2.1"; sha256="1d9dnrjnl9cg2yn5snr6x9qr6lf74639j3ymsxpw0wn5c4fm8z46"; depends=[Formula partykit rpart]; };
   quipu = derive2 { name="quipu"; version="1.9.0"; sha256="1py1qpbwp2smr5di8b3zmzxxhchfmr5qfhqkdiqig28mcnqcmp5n"; depends=[agricolae pixmap shiny stringr xtable]; };
   quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; };
-  quotedargs = derive2 { name="quotedargs"; version="0.1.1"; sha256="05y3jgix3aix3d4nazd7h9c27mfcl52xl6fdpfpi7zyd4iznpv9g"; depends=[]; };
+  quotedargs = derive2 { name="quotedargs"; version="0.1.2"; sha256="034fhfmfq62yf7akx2i0bim70jq9azkk2h28k79lwax7ysydsjnj"; depends=[]; };
   qut = derive2 { name="qut"; version="2.0"; sha256="1r0yg99p88ar1d9qhayzpplssjpsy901b7n6yr7r4n9nldh8p7xz"; depends=[flare glmnet lars Matrix]; };
   qvcalc = derive2 { name="qvcalc"; version="0.9-1"; sha256="1ll71yww8rsbp0qa60w7vdna8yk60cq66cjn5cdk3bkdwyni28yy"; depends=[]; };
-  qwraps2 = derive2 { name="qwraps2"; version="0.2.4"; sha256="18ail1y3kpiiwgkf7zn1acfz1ipz7wbk8pcmlganayr8p9yv7sh2"; depends=[dplyr ggplot2 knitr Rcpp tidyr]; };
+  qwraps2 = derive2 { name="qwraps2"; version="0.3.0"; sha256="0xhlb0c955raxrqw202f7jd9c1wkrigh1qs93m2739jkwkyv2n3b"; depends=[devtools dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; };
   r_jive = derive2 { name="r.jive"; version="2.1"; sha256="0l0bhhp6bdc84pzxi7gnsxx3scycw0zahrnc496wx3j43np9hlsg"; depends=[abind gplots SpatioTemporal]; };
   r2d2 = derive2 { name="r2d2"; version="1.0-0"; sha256="1zl0b36kx49ymfks8rm33hh0z460y3cz6189zqaf0kblg3a32nsi"; depends=[KernSmooth MASS sp]; };
   r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; };
@@ -9816,14 +10011,14 @@ in with self; {
   rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; };
   rEDM = derive2 { name="rEDM"; version="0.6.9"; sha256="0825yh82vlkmjkrwbk7xfhdq4c7yq7n4bmmw6x7ywmhbnayqj6b3"; depends=[Rcpp RcppEigen]; };
   rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; };
-  rENA = derive2 { name="rENA"; version="0.1.3"; sha256="03sb6fb6d41nf4qd7ifsbr3gqgdk9g5lvjcxvdqhldxrhwn4b1ji"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppEigen RcppParallel RcppRoll scales]; };
+  rENA = derive2 { name="rENA"; version="0.1.4"; sha256="007kgb5n30c4jpbp7q2f0yj5mplb8pvhs8pvghy8zbwrl61n4kx5"; depends=[data_table data_tree doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo RcppEigen RcppParallel RcppRoll scales]; };
   rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; };
   rFSA = derive2 { name="rFSA"; version="0.9.1"; sha256="14qpxmzy4vy1fydn8yqh1001mqrgv1i67ai42w61dkk0d4m75z60"; depends=[hashmap tibble]; };
   rFTRLProximal = derive2 { name="rFTRLProximal"; version="1.0.0"; sha256="1458gqy2zbaa62vaimawdr1nk0lsgwz1j4pgw21fkw7bskcszz0f"; depends=[data_table FeatureHashing foreach magrittr Matrix Rcpp RcppArmadillo RcppProgress]; };
   rFerns = derive2 { name="rFerns"; version="2.0.3"; sha256="02lq43mgcz8n21hwb0pjqi0aq5dacnaakpx336q1xzw1kwlvfkhv"; depends=[]; };
   rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; };
   rGoodData = derive2 { name="rGoodData"; version="0.1.1"; sha256="092sgy6y3dkyr32hrir4jvjwh7n6gfvv9z7i631fipg59255g0zy"; depends=[data_table httr jsonlite]; };
-  rGroovy = derive2 { name="rGroovy"; version="1.2"; sha256="0wx17d4c7202dbmgw4nvnvw42fiwlzsl151idrmm4fzfff8y1vdi"; depends=[rJava]; };
+  rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; };
   rHealthDataGov = derive2 { name="rHealthDataGov"; version="1.0.1"; sha256="0lkjprss15yl6n9wgh79r4clip3jndly2ab1lv4iijzxnxay099d"; depends=[bit64 httr jsonlite]; };
   rHpcc = derive2 { name="rHpcc"; version="1.0"; sha256="0096z90mmf1j2xpb9034a5ph52m8z6n6xjh3km2vrhw63g3cpwap"; depends=[RCurl XML]; };
   rIsing = derive2 { name="rIsing"; version="0.1.0"; sha256="1208lwfk9j8gghj8xf6i8v6s18h89ydqsd4jq3r88n403yzbzzck"; depends=[data_table Rcpp RcppEigen]; };
@@ -9833,9 +10028,10 @@ in with self; {
   rKIN = derive2 { name="rKIN"; version="0.1"; sha256="1j6fdi5h869q4d1hq6ha6qyhisa0zk2qmhjrc4ahl9991d680dyn"; depends=[ggplot2 maptools MASS rgeos sp]; };
   rLDCP = derive2 { name="rLDCP"; version="1.0.2"; sha256="0k7zc1xyqmcl7070hhpqw1d2k1ij6bd4wjym8cw263pds2n7nx21"; depends=[XML]; };
   rLTP = derive2 { name="rLTP"; version="0.1.4"; sha256="04w432m03xwh0szshsrfw5h7wy43q4lj8z0y07k8w6gsf27cy5bx"; depends=[RCurl]; };
-  rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.0"; sha256="0y6ir41yl8xj19lbwlvzcrfcrdk9cn9i4q4z1pg7mwj4cq6bc6gd"; depends=[plyr]; };
+  rLakeAnalyzer = derive2 { name="rLakeAnalyzer"; version="1.11.4"; sha256="1fvln3r2zkzhsck53jppchg795qbjbzw0rd688h89if1lkiy51w6"; depends=[plyr]; };
   rLiDAR = derive2 { name="rLiDAR"; version="0.1.1"; sha256="1w0yi4ygw0l9ydbllqjylp30d401bsf7b6fng6qg3pssbi9v3kln"; depends=[bitops deldir geometry plyr raster rgl sp spatstat]; };
   rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; };
+  rMEA = derive2 { name="rMEA"; version="1.0.0"; sha256="1cxcf2ji2f3kkjlj6lym7zfpmgbbjw7al67dldy2kn9dk2dn087z"; depends=[]; };
   rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; };
   rMouse = derive2 { name="rMouse"; version="0.1"; sha256="0pzxasap5kwxqq36mb4zi139jllsl4vk06dw2pv9xnwdxiszr3gp"; depends=[rJava]; };
   rNMF = derive2 { name="rNMF"; version="0.5.0"; sha256="1nz6h0j5ywdh48m0swmhp34hbkycd7n13rclrxaw85qi9wc42597"; depends=[knitr nnls]; };
@@ -9869,6 +10065,7 @@ in with self; {
   radiant_design = derive2 { name="radiant.design"; version="0.8.0"; sha256="0n2a0jpjcxxmmr9sbky7v2cnzil3hv6b20yzkyc9lf4a48pqlm4l"; depends=[AlgDesign dplyr mvtnorm polycor r_import radiant_data shiny]; };
   radiant_model = derive2 { name="radiant.model"; version="0.8.0"; sha256="0zlb5ny3s15d1ngdhszkn5wzij4y5fz7c2lwkb9g619pr0ngrwr8"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet pryr psych r_import radiant_basics radiant_data rpart sandwich shiny stringr tidyr yaml]; };
   radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.8.0"; sha256="0l3rk5045apjb2jx04jf3mwjixg8cjwrgmz83km9627n93cabs2l"; depends=[car dplyr ggplot2 Gmedian GPArotation gridExtra magrittr MASS pryr psych r_import radiant_data radiant_model scales shiny wordcloud]; };
+  radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; };
   radir = derive2 { name="radir"; version="1.0.2"; sha256="09lcq8ax5x5yk3sqx15rvw3vyi8fyfzgs76kxjhf7hcw4qnib46d"; depends=[hermite]; };
   radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; };
   rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; };
@@ -9884,7 +10081,7 @@ in with self; {
   ramcmc = derive2 { name="ramcmc"; version="0.1.0"; sha256="0s5jgjqkschr64srblppv9lbvhynlpfiy8cy12fywpmnbv8viazq"; depends=[Rcpp RcppArmadillo]; };
   ramidst = derive2 { name="ramidst"; version="0.1.0"; sha256="1q4lvq2c2vj9xrm2p2w2qjsl4qvwcl6y54y68mmbd6cw7wqpffjj"; depends=[rJava]; };
   ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; };
-  ramps = derive2 { name="ramps"; version="0.6-14"; sha256="09chbqh13h8b10dlcka07y954ga129lamg0fr38iwj4lqb6a2fvy"; depends=[coda fields maps Matrix nlme]; };
+  ramps = derive2 { name="ramps"; version="0.6-15"; sha256="0c7y64z0ysjy0kh234xfqhbwwn1vgscvp1n4l2fjk5s5xz8633pn"; depends=[coda fields maps Matrix nlme]; };
   ramsvm = derive2 { name="ramsvm"; version="2.0"; sha256="1q6ag3x1mgkyw8nsxghhk9yrcr0ybwilsx1yzg98bqsmxrrqk17q"; depends=[doParallel foreach]; };
   randNames = derive2 { name="randNames"; version="0.2.3"; sha256="0vhzg14yg4c9inzxin8prfzh6nhf8fvbi4hbn122fyqyp5d6f8zi"; depends=[httr jsonlite tibble]; };
   randaes = derive2 { name="randaes"; version="0.3"; sha256="14803argy0xdd8mpn4v67gbp90qi2is4x6na9zw7i9pm504xji1x"; depends=[]; };
@@ -9892,8 +10089,7 @@ in with self; {
   randnet = derive2 { name="randnet"; version="0.1"; sha256="1mpz3dsbzd5hffv2v5p6jdp0z07f7rhgcjinr1lwggvxw37xwrkj"; depends=[AUC entropy irlba Matrix poweRlaw RSpectra]; };
   random = derive2 { name="random"; version="0.2.6"; sha256="0sdhagwjlhldb8hn6h4nd1sflzhwkapzybdlb8hzisy3w2ygjn9b"; depends=[curl]; };
   random_polychor_pa = derive2 { name="random.polychor.pa"; version="1.1.4-2"; sha256="1ybwfn3hdwisxjn85vqrib1zhk8dcddbarbwjdf1vn27ih3c4h2c"; depends=[boot MASS mvtnorm nFactors psych sfsmisc]; };
-  randomForest = derive2 { name="randomForest"; version="4.6-12"; sha256="1i43idaihhl6nwqw42v9dqpl6f8z3ykcn2in32lh2755i27jylbf"; depends=[]; };
-  randomForest_ddR = derive2 { name="randomForest.ddR"; version="0.1.2"; sha256="1fijnzzap8my4l211m5pgj4fwna04z1db5m3hhim72i3xzc77hy2"; depends=[ddR Matrix randomForest]; };
+  randomForest = derive2 { name="randomForest"; version="4.6-14"; sha256="0kbmm0l42fc2d1rdq0l7k09d34kd87q4lx651ffsic4y84h8kf7l"; depends=[]; };
   randomForestExplainer = derive2 { name="randomForestExplainer"; version="0.9"; sha256="0gqqm3784krl6xdx7j6xvvyi2rjbyi6c8shm44yvq59is5i7fypc"; depends=[data_table dplyr DT dtplyr GGally ggplot2 ggrepel MASS randomForest reshape2 rmarkdown]; };
   randomForestSRC = derive2 { name="randomForestSRC"; version="2.5.1"; sha256="1p5a5z7ddhnsrln8vpdrwvxbgknwdigczjw8vpxzbkckmf6qfidd"; depends=[]; };
   randomGLM = derive2 { name="randomGLM"; version="1.02-1"; sha256="031338zxy6vqak8ibl2as0l37pa6qndln0g3i9gi4s6cvbdw3xrv"; depends=[doParallel foreach MASS]; };
@@ -9904,7 +10100,7 @@ in with self; {
   randomizationInference = derive2 { name="randomizationInference"; version="1.0.3"; sha256="0x36r9bjmpx90fz47cha4hbas4b31mpnbd8ziw2wld4580jkd6mk"; depends=[matrixStats permute]; };
   randomizeBE = derive2 { name="randomizeBE"; version="0.3-3"; sha256="0vdvgk2b1h1lsj0ka01lwldfxanngir91axc8ywa6pg12hrdkkb0"; depends=[]; };
   randomizeR = derive2 { name="randomizeR"; version="1.4"; sha256="0l7gvpm52fwbz79vgy7vn4z2n4gqigimdj6r9drm3lfzbylmx3js"; depends=[ggplot2 plotrix]; };
-  randomizr = derive2 { name="randomizr"; version="0.8.0"; sha256="0yrjw3q8ivimbir6m3adw22mwq2ka0vpyrsrkvvn05bm5x5mffvs"; depends=[]; };
+  randomizr = derive2 { name="randomizr"; version="0.12.0"; sha256="0g0n63srydljvj4spjl5r08khq0sqlhsj01s150m31cxf23zdjli"; depends=[]; };
   randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; };
   randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; };
   randtoolbox = derive2 { name="randtoolbox"; version="1.17.1"; sha256="13akf13qi4yhj9gapym05074b1qzk03vgysy81qsd73pd8r107ls"; depends=[rngWELL]; };
@@ -9913,24 +10109,26 @@ in with self; {
   rangemodelR = derive2 { name="rangemodelR"; version="1.0.1"; sha256="04zv8a4nhin9masvbw1cmbwdkls4wgq81xfw6kg0wdh1hpqjz1z0"; depends=[]; };
   ranger = derive2 { name="ranger"; version="0.9.0"; sha256="1pilj5pxl8jl0gsy9vsyqxqdqfcxzvphbgvrlp4hf7r9mrfw9v0p"; depends=[Matrix Rcpp RcppEigen]; };
   rankFD = derive2 { name="rankFD"; version="0.0.1"; sha256="1zb9gxvsmv46mpw5znskhfjxnwkr59hdixcly6i3r78yaqgca0dz"; depends=[coin lattice MASS Matrix]; };
-  rankdist = derive2 { name="rankdist"; version="1.1.2"; sha256="1nr9nr5nfziia6jykk598hm5ngkfr6yx5mypq34iyfm24877gd3q"; depends=[hash optimx permute Rcpp]; };
+  rankdist = derive2 { name="rankdist"; version="1.1.3"; sha256="1hdafy2zzn7hwl1lx5jksgi974zjn49dwih5s2zdyv4nnmmai003"; depends=[hash optimx permute Rcpp]; };
   rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; };
   rapiclient = derive2 { name="rapiclient"; version="0.1.2"; sha256="072rlr7z9rj4agkzmy12cz4axh4pajavfd83lpcx2b1lgxpj6ck4"; depends=[httr jsonlite]; };
+  rapidjsonr = derive2 { name="rapidjsonr"; version="1.0.0"; sha256="064xqvyv83vl188rk18kgi4iaqq299d2y6fr24dk9lndpc4509kc"; depends=[]; };
   rapidraker = derive2 { name="rapidraker"; version="0.1.0"; sha256="17jzkzm5hvd8vcqql40bwl89sfgz8yicvi0753nzgkmbvanzjhjx"; depends=[openNLPdata rJava slowraker]; };
   rappdirs = derive2 { name="rappdirs"; version="0.3.1"; sha256="0ji6sg3bdn5gazkq14xmmcq7jnbsyxw4lzmmbgv6526j2vn93n1g"; depends=[]; };
   rapport = derive2 { name="rapport"; version="1.0"; sha256="1i1zawar5yxw23km74mrvaxnc9hr06kqjvbm046c09cqi6pw0hjh"; depends=[pander rapportools stringr yaml]; };
   rapportools = derive2 { name="rapportools"; version="1.0"; sha256="1sgv4sc737i12arh5dc3263kjsz3dzg06qihfmrqyax94mv2d01b"; depends=[pander plyr reshape]; };
   raptr = derive2 { name="raptr"; version="0.1.1"; sha256="17k392vid1is0wl5iyr8b41xyw5y0ad7drvlmrcsda7683yal3p3"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; };
+  rare = derive2 { name="rare"; version="0.1.0"; sha256="05bnh2m1sah6zvzvmm3bq1i2n5kmhhxnlzbrjxzmb9vj6skaglv1"; depends=[glmnet Matrix Rcpp RcppArmadillo]; };
   rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; };
   rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; };
-  rarhsmm = derive2 { name="rarhsmm"; version="1.0.5"; sha256="0h5njhvpl2msb2wbb80bmlzzci0ma10rx5y5hxa4vdxgj23g6rpm"; depends=[glmnet Rcpp RcppArmadillo]; };
+  rarhsmm = derive2 { name="rarhsmm"; version="1.0.7"; sha256="0pvqa6f0ib1jb0rwc6wv6hfinncb21v2g0y0hsy5l33gdagjw2sz"; depends=[glmnet Rcpp RcppArmadillo]; };
   rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; };
   rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; };
   raster = derive2 { name="raster"; version="2.6-7"; sha256="009bwil3n9gaf11wzifwxyw9j6pl0pyjk3l5v7csd935si7q14gv"; depends=[Rcpp sp]; };
   rasterImage = derive2 { name="rasterImage"; version="0.3.0"; sha256="0csx7wqwxdsddypd1c9wv74gcyymasn9n6pn05a35j6xhqbk2zp3"; depends=[plotrix]; };
   rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; };
   rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; };
-  rasterVis = derive2 { name="rasterVis"; version="0.43"; sha256="0g6ij4h5di4c0pzv7ghc63jfl3j3rm1g541apbjr6n4k9ci12k4l"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
+  rasterVis = derive2 { name="rasterVis"; version="0.44"; sha256="041a3d6vcvsah6qm4mf2nc70sln9djlv2ymq389icagiwdqjw9xh"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; };
   ratelimitr = derive2 { name="ratelimitr"; version="0.3.9"; sha256="0w6i9czcbj8ipd9nn4w4h4pqk6xd8anh00cn60hss9hs18fcb21d"; depends=[assertthat]; };
   rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; };
   raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; };
@@ -9940,7 +10138,7 @@ in with self; {
   rattle = derive2 { name="rattle"; version="5.1.0"; sha256="0xxf2wpazsk29y2byyk010n59vmzmhm4phpsqvklmsr1v3m10pvp"; depends=[cairoDevice dplyr ggplot2 magrittr RGtk2 rpart_plot stringi stringr tidyr XML]; };
   rattle_data = derive2 { name="rattle.data"; version="1.0.2"; sha256="0cnmyzvy23jc4vz521c3jg0w4165waycvy5014l5773fy19zq75c"; depends=[]; };
   raw = derive2 { name="raw"; version="0.1.5"; sha256="0w0k35izvsi8vwp38har4ygh1zxnz7hfla8d8fcbvckpfbkwpggp"; depends=[]; };
-  rbacon = derive2 { name="rbacon"; version="2.3.3"; sha256="0kkj4ylvk7gsbzzqdg8b66kp4mn99k8yzmgml7z0nkll0lr54srk"; depends=[coda Rcpp]; };
+  rbacon = derive2 { name="rbacon"; version="2.3.4"; sha256="1va1rap2n6mcjfzclqg5h58ggrs2kb4nlaam5ch984w9rzq59g2l"; depends=[coda Rcpp]; };
   rbamtools = derive2 { name="rbamtools"; version="2.16.6"; sha256="1sb18qx68fnj1d598lw8fkqnxp3c5s704g6cnhwy299gppj3xg1d"; depends=[refGenome]; };
   rbcb = derive2 { name="rbcb"; version="0.1.3"; sha256="0bghbxrgy4lpxyazqlm90i42dav1kjca02l2nmw320v01rvw5qvd"; depends=[httr jsonlite tibble xml2 xts]; };
   rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; };
@@ -9949,17 +10147,18 @@ in with self; {
   rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; };
   rbi = derive2 { name="rbi"; version="0.9.0"; sha256="0am6r8dy3nfahprkyvap73x3b6vxgc604v7mf9wbb9vwjja00xzp"; depends=[data_table ncdf4 reshape2]; };
   rbiouml = derive2 { name="rbiouml"; version="1.8"; sha256="0qvc896sf6idczbxix3klf56paxf0wpfbmga8qqlcyjasv1dsdql"; depends=[RCurl RJSONIO]; };
-  rbison = derive2 { name="rbison"; version="0.5.4"; sha256="0l3653q7bfda9lw1isnx6gdd7l5b8aldqgc2hppg2wh2k004rnf6"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; };
+  rbison = derive2 { name="rbison"; version="0.6.0"; sha256="09mbhk56ns1qldgcj8qard3dsvsfbnlrq4s4drc46lr1s8lqjd1h"; depends=[crul dplyr ggplot2 jsonlite mapproj plyr sp]; };
   rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; };
   rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; };
   rbokeh = derive2 { name="rbokeh"; version="0.5.0"; sha256="1lpbph6bhh9rf5rs0ivp8dchx8i8ylz5nr7xc2xv9bnwlwj35729"; depends=[digest ggplot2 gistr hexbin htmlwidgets jsonlite lazyeval magrittr maps pryr scales]; };
   rbounds = derive2 { name="rbounds"; version="2.1"; sha256="1h334bc37r1vbwz1b08jazsdrf6qgzpzkil9axnq5q04jf4rixs3"; depends=[Matching]; };
+  rbraries = derive2 { name="rbraries"; version="0.1.0"; sha256="12vdci4rzjvd419nxh99hpkhjlx86nsmrbjca0am5q0rkc68dgmj"; depends=[crul data_table fauxpas jsonlite tibble]; };
   rbtt = derive2 { name="rbtt"; version="0.1.0"; sha256="1gbsb0vmqxcl28c5nn0rz95bxrvl7i0b17lq90cj5ahbk6x9jblz"; depends=[data_table]; };
   rbugs = derive2 { name="rbugs"; version="0.5-9"; sha256="1kvn7x931gjpxymrz0bv50k69s1x1x9mv34vkz54sdkmi08rgb3y"; depends=[]; };
   rbundler = derive2 { name="rbundler"; version="0.3.7"; sha256="0wmahn59h9vqm6bq1gwnf6mvfkyhqh6xvdc5hraszn1419asy26f"; depends=[devtools]; };
   rbvs = derive2 { name="rbvs"; version="1.0.2"; sha256="1wzxz2ca8f1phhbqr9p7c8sk09cyrdq5jc45g4ddrqvi2q29k28y"; depends=[]; };
   rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; };
-  rcarbon = derive2 { name="rcarbon"; version="1.0.0"; sha256="0xgf26m8cw3g4nc4s413xgplxv8a6s2m4m7g3zavsjl3517b86bc"; depends=[doParallel foreach sp]; };
+  rcarbon = derive2 { name="rcarbon"; version="1.1.0"; sha256="0y201lrmdisw7rmzaxsyiwdj4kms7q1dvw34ial28989ci1rslrw"; depends=[doParallel foreach sp]; };
   rcartocolor = derive2 { name="rcartocolor"; version="0.0.22"; sha256="1dh1n01v70sfmymg1w0f272j6nwnrzawqx5x4ljgh46pzqprx56r"; depends=[ggplot2 scales]; };
   rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; };
   rcbsubset = derive2 { name="rcbsubset"; version="1.1.3"; sha256="16wd0j0z2ll8hqrk27fss4k9fyjw6xwx30xkrphx9jj2ws08wibl"; depends=[MASS plyr]; };
@@ -9972,17 +10171,19 @@ in with self; {
   rchallenge = derive2 { name="rchallenge"; version="1.3.0"; sha256="1qn2pzch5yk771jsjcsmfsi5vddfb2w50vfqlkmsl6nf5z6sdq9k"; depends=[knitr rmarkdown]; };
   rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; };
   rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; };
-  rclimateca = derive2 { name="rclimateca"; version="1.0.0"; sha256="1wydh7k7yyi56l3xdprzx4s7425k68a7f53hx9pvr0xmn501l67z"; depends=[digest dplyr hms httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; };
+  rclimateca = derive2 { name="rclimateca"; version="1.0.1"; sha256="1mv4i290x0bwvap5njizal5z0ccbkqjfyk2pmcbx4sml5crhx6yy"; depends=[digest dplyr httr lubridate magrittr mudata2 prettymapr purrr readr reshape2 rlang stringr tibble tidyr]; };
   rclipboard = derive2 { name="rclipboard"; version="0.1"; sha256="0qphr3qrp0k2gnzk27bgfiq3ff6b8564gmkrjw1kri1p7ilf71wx"; depends=[shiny]; };
   rcmdcheck = derive2 { name="rcmdcheck"; version="1.2.1"; sha256="04gh0drvkikn91i5zmpixhrhyjnsyxwz8k8bx4kgwwrmh1dc7f2s"; depends=[callr clisymbols crayon digest withr]; };
-  rcompanion = derive2 { name="rcompanion"; version="1.11.3"; sha256="1wzqqss86z2qggyjwpc41wblw9kkca20mbh6q4dwl4yc7gb4ggaf"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
+  rcompanion = derive2 { name="rcompanion"; version="1.13.0"; sha256="1smkwp7xjkwiix1m7cx13hwnmka8nqv6m3s5wlzd02l9grc5ldrp"; depends=[boot BSDA coin DescTools EMT hermite lattice lmtest multcompView nortest ordinal plyr RVAideMemoire WRS2]; };
   rcongresso = derive2 { name="rcongresso"; version="0.3.2"; sha256="15b7m1z5lr66kwhl8v8k2car4id9ssd0ypz75z259v8c1w0k7xkl"; depends=[dplyr httr jsonlite magrittr tibble tidyr]; };
   rcoreoa = derive2 { name="rcoreoa"; version="0.1.0"; sha256="13nfziqxxljnczn3idq3zlc9xkklalfnxbakvhs5bw19jmbd11ba"; depends=[crul jsonlite pdftools]; };
   rcorpora = derive2 { name="rcorpora"; version="1.2.0"; sha256="0nxd2arzz2617xxcngvcrrrsky9f1b9zdmpv81zr89y08b3xh9f1"; depends=[jsonlite]; };
+  rcqp = derive2 { name="rcqp"; version="0.5"; sha256="0iww9pbfxlvr68csig9nfi48nrqn2j6viqwwwggk789bk6ffz00a"; depends=[plyr]; };
   rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; };
   rcrossref = derive2 { name="rcrossref"; version="0.8.0"; sha256="01k3jpd6awan8r4kc5wjw0did30i2bafzjr8mwaaqv87gni2yiyf"; depends=[bibtex crul dplyr jsonlite miniUI plyr R6 shiny stringr xml2]; };
   rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; };
   rcss = derive2 { name="rcss"; version="1.2"; sha256="08hiprjcjvc138laqrvlvrmn664b63x829ammzgrwjqcsj4kpmds"; depends=[Rcpp RcppArmadillo rflann]; };
+  rcube = derive2 { name="rcube"; version="0.1"; sha256="15dyxwsj7f2annf3a2wi158m9s38jfl31lhwfi9shlzi5xadcwjk"; depends=[]; };
   rcure = derive2 { name="rcure"; version="0.1.0"; sha256="1pcdc168bwn0b90xy8sdwrm2yvhj26xj11wm8z84m48sxy56j4v8"; depends=[arm MASS plyr smcure survival]; };
   rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; };
   rda = derive2 { name="rda"; version="1.0.2-2"; sha256="1g2q7c0y138i9r7jgjrlpqznvwpqsj6f7vljqqfzh2l6kcj43vjj"; depends=[]; };
@@ -9996,21 +10197,23 @@ in with self; {
   rdefra = derive2 { name="rdefra"; version="0.3.4"; sha256="05fskap0vvrq08m4gql9gczy04lc3dgxgjcsb57dgp3nng358sf6"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; };
   rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; };
   rdflib = derive2 { name="rdflib"; version="0.1.0"; sha256="1xq378nfvbk8b2nbnr6yswqr351pgli7jcmhcr1ipynkl93rl5qm"; depends=[jsonld readr redland stringi]; };
+  rdfp = derive2 { name="rdfp"; version="0.1.2"; sha256="1kznr5p5mhplgpgmc0f4vrs1fwpivwjy52hwfc8k0q0vx53h3fs2"; depends=[curl dplyr httr lubridate plyr purrr readr XML xml2]; };
   rdian = derive2 { name="rdian"; version="0.1.1"; sha256="0i4ljcqhmrwrqbhi321iffypxj4kndx47ssljnixr3fx2lmqh0q1"; depends=[curl httr]; };
   rdist = derive2 { name="rdist"; version="0.0.2"; sha256="0rwv8brambwki3jzpq250lk0k7nmvlzm80szy4nkhdl2zxwriv0a"; depends=[Rcpp RcppArmadillo]; };
   rdiversity = derive2 { name="rdiversity"; version="1.0"; sha256="0x6s9028v4xcc54yy4977yqw5mrsbqlrm5b9drj05c64mavhm4sq"; depends=[ape ggplot2 ggthemes phangorn phytools plyr reshape2 tibble tidyr]; };
-  rdlocrand = derive2 { name="rdlocrand"; version="0.2"; sha256="1jad0b9qqlc88knd92yvjqklilbybp9zpkdq7jx1251m6hivs9sw"; depends=[AER sandwich]; };
+  rdlocrand = derive2 { name="rdlocrand"; version="0.3"; sha256="1cv69iy5sx9kdplpk9hnriqzgrm5mjbmhax4cybszhsyaly6r78d"; depends=[AER sandwich]; };
   rdnb = derive2 { name="rdnb"; version="0.1-1"; sha256="1mg40jad79mk95ndnljvfvyh9rhbxkw7inpg2vbsixf1ywdljri3"; depends=[brew httr xml2]; };
   rdomains = derive2 { name="rdomains"; version="0.1.7"; sha256="1w6jvwzd9lwha4qkf8rhd1g3cpr79fsl4rrmh5chdnbahqg60gh9"; depends=[aws_alexa curl glmnet httr Matrix rlang RSelenium urltools virustotal XML xml2]; };
   rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; };
   rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; };
-  rdrobust = derive2 { name="rdrobust"; version="0.99"; sha256="1c9issw0mssswln2mdirwjlaps4ps8q9z1wr4ailr4c2z9klla9p"; depends=[]; };
+  rdpower = derive2 { name="rdpower"; version="0.1"; sha256="1pi0g980zgy0h3kyiksnbpi59fksm17g9lxinqjf7xiam7pgw99n"; depends=[rdrobust]; };
+  rdrobust = derive2 { name="rdrobust"; version="0.99.1"; sha256="18hq4nmyf8327qdbh7m8y0av6f21pcxaxfqs0qrc07yf6sdcj6ri"; depends=[]; };
   rdrop2 = derive2 { name="rdrop2"; version="0.8.1"; sha256="1f4ysck58dm40k4wn9nfjaxym0mbgfkm146iidfkz7agmd1x0xyl"; depends=[assertive digest dplyr httr jsonlite magrittr purrr]; };
   rdryad = derive2 { name="rdryad"; version="0.3.0"; sha256="18vjq5amaian174ywymsx1px7ckirk36386h66lsq0h87qwnrwj7"; depends=[crul curl oai solrium xml2]; };
-  rdwd = derive2 { name="rdwd"; version="0.9.0"; sha256="1zqmfrxjrkp0f8d943wlzvr7g0rrnbp3x9klx3syrbkn7jqxz49i"; depends=[berryFunctions pbapply]; };
+  rdwd = derive2 { name="rdwd"; version="0.10.1"; sha256="0w1wd1qxisdqd04ybcacbjjsjsvhjd152jcfjljzv2d20ha82kcn"; depends=[berryFunctions pbapply]; };
   re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; };
   reGenotyper = derive2 { name="reGenotyper"; version="1.2.0"; sha256="13g4fhj25kdk6wbl1hcabcaxcpv0dj0hj2l502wl1aywk1fvmy8m"; depends=[gplots MatrixEQTL zoo]; };
-  reReg = derive2 { name="reReg"; version="1.1-1"; sha256="1pjzh9r7488d39a5s0hkymzxh79zc1kp2ag2cp037v3j65mifbin"; depends=[aftgee BB ggplot2 MASS nleqslv plyr SQUAREM survival]; };
+  reReg = derive2 { name="reReg"; version="1.1-2"; sha256="13xnxpsa5pk39sp6pq9qvj4m0pjhvidfbjsx1s9qdczrvm6zsl3c"; depends=[aftgee BB ggplot2 MASS nleqslv plyr SQUAREM survival]; };
   reactR = derive2 { name="reactR"; version="0.2.0"; sha256="17jdcby95fxfa3imalllnqsp16py5vqqj4y0za4wli91vd37555q"; depends=[htmltools]; };
   read_dbc = derive2 { name="read.dbc"; version="1.0.5"; sha256="1vrvxkcrk3iw5am9rsadxzf0wsr7z2mdpa5wb0v9jbhda710b4yf"; depends=[foreign]; };
   readBrukerFlexData = derive2 { name="readBrukerFlexData"; version="1.8.5"; sha256="1qmimfxwh6d7s5qrnnk20i2f9l5j1ci3wpfs3qlmggz69jzf589m"; depends=[]; };
@@ -10024,15 +10227,17 @@ in with self; {
   readbitmap = derive2 { name="readbitmap"; version="0.1-4"; sha256="08fqqsdb2wsx415mnac9mzl5sr5and0zx72ablnlidqfxv8xsi9d"; depends=[bmp jpeg png]; };
   readbulk = derive2 { name="readbulk"; version="1.1.0"; sha256="0m02isvja0ihvy1fscjdl5f9gfdlmfmabgvpirgd2m9j3lz6mi8s"; depends=[plyr]; };
   reader = derive2 { name="reader"; version="1.0.6"; sha256="1x489q3ljap4zpny68mx83mgxaqiwlkglcy57whwhnh33dd7qp4h"; depends=[NCmisc]; };
+  readit = derive2 { name="readit"; version="1.0.0"; sha256="1sq2spjgdc9rq8cr5i9qjmqd4vcf7cknpx5dndwjdqrv112y8bk9"; depends=[crayon haven jsonlite readr readxl]; };
   readobj = derive2 { name="readobj"; version="0.3"; sha256="0hwxfk27azay8hjz702b10cg395is06wnypqdw4788gm25d0i041"; depends=[Rcpp]; };
   readr = derive2 { name="readr"; version="1.1.1"; sha256="1cvw5wdcqk88cp5fyv678mnmp66l3whcd2yh33p2qvx0168bja8s"; depends=[BH hms R6 Rcpp tibble]; };
+  readroper = derive2 { name="readroper"; version="0.9.0"; sha256="1ikw114gc71lg3snawz7bfpd2mk2m1181183sz0lsc5sgl67bb17"; depends=[readr]; };
   readstata13 = derive2 { name="readstata13"; version="0.9.0"; sha256="06qx40v4n217wi379d08w7kc9wlbxlyz9jqcsc85099vgab7l993"; depends=[Rcpp]; };
   readtext = derive2 { name="readtext"; version="0.50"; sha256="1il7zfm092vvns8manz8lkj34q1w4gw931agkpk83cvf1618l5nl"; depends=[antiword data_table httr jsonlite pdftools readODS readxl streamR stringi tibble XML]; };
   readxl = derive2 { name="readxl"; version="1.0.0"; sha256="1bf7gxw9r11m4llyymplxiaa4gzgyj4bwmwad5in756pzq3jzmpv"; depends=[cellranger Rcpp tibble]; };
   realestateDK = derive2 { name="realestateDK"; version="0.1.0"; sha256="02y3c2zww9jakh9a0jqxkgcwshjz1hd5mw63603hyic7q4a07iv3"; depends=[statsDK]; };
   reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; };
   rebird = derive2 { name="rebird"; version="0.4.0"; sha256="1awwjr0gsd7hksh84fz5p17qwd857zn03fc2q0kzncy6q6iiw481"; depends=[dplyr httr jsonlite]; };
-  rebmix = derive2 { name="rebmix"; version="2.10.0"; sha256="0n9s3xklrlzw6mb798q8p395506baj0pxp6n9lj9hhfibbgjif1c"; depends=[mvtnorm]; };
+  rebmix = derive2 { name="rebmix"; version="2.10.1"; sha256="1ccdcmbcnlm0i3r6h09v85wdq4c8gz9dvvbfd2a5zx3ikwfm4wri"; depends=[mvtnorm]; };
   rebus = derive2 { name="rebus"; version="0.1-3"; sha256="0ms3dm6g0fq3jycpgjl7q7kyljxc97cczy2jj0lyviwmipdgjg9d"; depends=[rebus_base rebus_datetimes rebus_numbers rebus_unicode]; };
   rebus_base = derive2 { name="rebus.base"; version="0.0-3"; sha256="1n2khszcya9k6379bdkq47xi2nw9jngiwj7z8a14wfswqydczv6y"; depends=[]; };
   rebus_datetimes = derive2 { name="rebus.datetimes"; version="0.0-1"; sha256="09lv41mywm13avxb0xp8x1a2xz50zxazh3lpg27m16d4cgijmhm5"; depends=[rebus_base]; };
@@ -10042,7 +10247,7 @@ in with self; {
   rechonest = derive2 { name="rechonest"; version="1.2"; sha256="0vpff8q5p6in7vjyl62bx3wmksravcg4mpx20qlgy5ia47vyhqp2"; depends=[httr jsonlite RCurl]; };
   recipes = derive2 { name="recipes"; version="0.1.2"; sha256="1car3a3mqn87pz049cbgkaayz86970mvkapk6al2k7jjw76306l9"; depends=[broom ddalpha dimRed dplyr gower ipred lubridate magrittr Matrix purrr RcppRoll rlang tibble tidyselect timeDate]; };
   recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; };
-  recmap = derive2 { name="recmap"; version="0.5.26"; sha256="02fvl275k4455yw5n31fxb2jhiaciki4i7zzzks166gz33rc0dwy"; depends=[GA Rcpp sp]; };
+  recmap = derive2 { name="recmap"; version="0.5.31"; sha256="1kgmqmpphz4p2zidl0l24nia49g8211dyk66wl09azay4vxm46nj"; depends=[GA Rcpp sp]; };
   recoder = derive2 { name="recoder"; version="0.1"; sha256="0wh0lqp7hfd4lx2xnmszv1m932ax87k810aqxdb6liwbmvwqnfgd"; depends=[stringr]; };
   recombinator = derive2 { name="recombinator"; version="1.0.0"; sha256="0amcpicsk270l9h7qgv764wp09phsffdpi4adcxrsrwiwm274ibw"; depends=[crayon]; };
   recommenderlab = derive2 { name="recommenderlab"; version="0.2-2"; sha256="13mgkxrcwh5ry699my3w6xgm6rabsk9fd5qqsdwzy7cfq6xkq7cg"; depends=[arules irlba Matrix proxy registry]; };
@@ -10051,7 +10256,7 @@ in with self; {
   reconstructr = derive2 { name="reconstructr"; version="2.0.0"; sha256="1pa6b8zns9495f1bdifvx19hsy5808hqbxb2bn1srwnr4s3ma1zi"; depends=[openssl Rcpp]; };
   recosystem = derive2 { name="recosystem"; version="0.4.2"; sha256="1bn6l23gqmfpr6w60ph7zgv53vy3vnq9zdy5x0a8n1yp6b0lw48x"; depends=[Rcpp RcppProgress]; };
   recurse = derive2 { name="recurse"; version="1.1.0"; sha256="1zgzzhbvdzqgmgzj43yvpyc7ahbkn96l5wyr1iqpnn3ha78fy0p3"; depends=[Rcpp]; };
-  red = derive2 { name="red"; version="1.3.1"; sha256="1m8jk3k0g17dlqbws74wi1lsa11v26si2857sxgzv659f46ybmq3"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; };
+  red = derive2 { name="red"; version="1.3.3"; sha256="0f4lriwlsq65z0sqjv4csrkbcjjvpybqf68rgx92ypkdjf57ixrs"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; };
   redR = derive2 { name="redR"; version="1.0.0"; sha256="01safawd9ai34fqxjpc161yzpsk31hfyl8ybcfvdj7a9vdbvcb5i"; depends=[imager]; };
   reda = derive2 { name="reda"; version="0.4.1"; sha256="0aq6c2h694kdmjis12g4nxq5hdlzsi42nbnpzq7wic305l5r7nxl"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; };
   redcapAPI = derive2 { name="redcapAPI"; version="2.0"; sha256="1n4kwmd0kgmnx2zcgvrz2dlkxmv6wflyj4pll00qvpb1njgnq1xv"; depends=[checkmate chron DBI httr labelVector lubridate stringr tidyr]; };
@@ -10109,7 +10314,7 @@ in with self; {
   relevent = derive2 { name="relevent"; version="1.0-4"; sha256="10bf1s7jmas8ck1izqibqcaqg4z55ciwdpd9pm2697y8z0jhr2rj"; depends=[coda sna trust]; };
   reliaR = derive2 { name="reliaR"; version="0.01"; sha256="000nafjp386nzd0n57hshmjzippiha6s6c4nfrcwl059dzmi088i"; depends=[]; };
   relimp = derive2 { name="relimp"; version="1.0-5"; sha256="0ydn82g8xdqzhf34187080bbpcpw1zdjbj2i3dv1d6d35vvprb5c"; depends=[]; };
-  relsurv = derive2 { name="relsurv"; version="2.1-1"; sha256="0jdxjnrxygn3ppzsndyzcch19c726s15lrd0kc1vxbjp3b4r0lhl"; depends=[date survival]; };
+  relsurv = derive2 { name="relsurv"; version="2.1-2"; sha256="0hcvp1n8cvcnpqhwi1gcj3krzsarsk73ivwi75bvsvr3dpgxnwrm"; depends=[date survival]; };
   rem = derive2 { name="rem"; version="1.2.8"; sha256="1w0lkxjhyssl9343z6lw7dn0cazz9firglvcf74nls4ngkgv0bbd"; depends=[doParallel foreach Rcpp]; };
   remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; };
   rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; };
@@ -10124,7 +10329,7 @@ in with self; {
   repijson = derive2 { name="repijson"; version="0.1.0"; sha256="16iypvsmh5r9pk2k6npp17ya5dgkxihsj29pppd3zvdpm3vvd8k1"; depends=[geojsonio ggplot2 jsonlite OutbreakTools plyr sp]; };
   replicatedpp2w = derive2 { name="replicatedpp2w"; version="0.1-2"; sha256="0nskwkqm9z2aphpim6pvykhc3fphlsbap3r49nghkwjpngd0qzj8"; depends=[spatstat spatstat_utils]; };
   replicationInterval = derive2 { name="replicationInterval"; version="2.0.1"; sha256="1jyvyqr8r2fs1cmbz7zjcc8p116bnkslvx27pqi92y5pxgqvsqvr"; depends=[ggplot2 MASS MBESS pbapply]; };
-  replyr = derive2 { name="replyr"; version="0.9.1"; sha256="0vxxmnin8a9mrak33cm01wndbc333dyjh83iyn633yc6ll092klr"; depends=[cdata DBI dbplyr dplyr RSQLite seplyr wrapr]; };
+  replyr = derive2 { name="replyr"; version="0.9.4"; sha256="1f8y2ywv7wf15g76949934r2qq2bp75ayfvrcb654q9pf2h5w39v"; depends=[DBI dplyr wrapr]; };
   repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; };
   repo = derive2 { name="repo"; version="2.1.2"; sha256="14a7lw1rvn7n7caz3p3y69n9wqw48qsxsjs5kwvpbwsmap7bjj7l"; depends=[digest]; };
   repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; };
@@ -10134,7 +10339,7 @@ in with self; {
   reportr = derive2 { name="reportr"; version="1.2.2"; sha256="1fl4hy4ck4aapy152vn9gjd7w5vgvh2gz2ky6p0wwahah7m9b255"; depends=[ore]; };
   reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; };
   reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; };
-  repr = derive2 { name="repr"; version="0.12.0"; sha256="1p6a2ryb5iaf4i6nn1iav26bh83wmvncwpk25hyrzd5rxich1bq3"; depends=[]; };
+  repr = derive2 { name="repr"; version="0.13"; sha256="0k5796r5z9yr8s1hlx30x4cy1ix4fc85m0lwqf9zdapcvw0iqgld"; depends=[base64enc htmltools]; };
   represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; };
   represtools = derive2 { name="represtools"; version="0.1.2"; sha256="1zkabch49q23kd1786km5cb9wcaccbxds11v9hwjzsgrs15g5w35"; depends=[whisker]; };
   reprex = derive2 { name="reprex"; version="0.1.2"; sha256="105d9vsmqfilgpw8psfb2wyiz1hvcycvh4cqhb3ab37lm3rcavvs"; depends=[callr knitr rmarkdown whisker]; };
@@ -10161,7 +10366,7 @@ in with self; {
   restriktor = derive2 { name="restriktor"; version="0.1-80.711"; sha256="10kbfr7gzah119xm4cnx7br9i9fcga38kymjajw7m2571f4jsji9"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; };
   resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; };
   rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; };
-  reticulate = derive2 { name="reticulate"; version="1.5"; sha256="0bbsd87ajw9s37g0m8gpv0rws4jfiic9q31fn5a3lb06r2i4wl53"; depends=[jsonlite Rcpp]; };
+  reticulate = derive2 { name="reticulate"; version="1.6"; sha256="036jiwxfvxkkijpilpbzlndm4bg4nd8gx8gxx4dl4zj263gd398m"; depends=[jsonlite Rcpp]; };
   retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; };
   retistruct = derive2 { name="retistruct"; version="0.5.12"; sha256="11m4i29i3zqh9chyjgdhzqj4yqlslfm8y4q0x14xxc2r9lqbkj9l"; depends=[foreign geometry png R_matlab rgl RImageJROI RTriangle sp ttutils]; };
   reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; };
@@ -10181,27 +10386,28 @@ in with self; {
   rfishbase = derive2 { name="rfishbase"; version="2.1.2"; sha256="1w8jk6qfhyzzmxf8qnqqwckm4syrqimi8k6dqmwflgxz6bsxcz0v"; depends=[dplyr httr lazyeval tidyr]; };
   rfisheries = derive2 { name="rfisheries"; version="0.2"; sha256="16j3hn1py8khqadmh81qsg76c62wzqkaq3fn39z0z5mgynmcm62j"; depends=[assertthat data_table ggplot2 httr rjson]; };
   rflann = derive2 { name="rflann"; version="1.3"; sha256="1y8m52vlrcl69srssd23zgg90yfhh9rryd16hk1dnqg713qhksgm"; depends=[Rcpp RcppArmadillo]; };
+  rfm = derive2 { name="rfm"; version="0.1.0"; sha256="0bd71qk6vrd0jnnwdwlh30mn8v8dwwgmffrd71kbq83gbfp8ry3l"; depends=[assertthat dplyr forcats ggplot2 lubridate magrittr purrr RColorBrewer rlang shiny tidyr]; };
   rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; };
   rfoaas = derive2 { name="rfoaas"; version="1.1.1"; sha256="1rglqmbhnasc3ciypms3qqgfaj19202cnqdimsi69lvig2rnkca5"; depends=[httr]; };
   rfordummies = derive2 { name="rfordummies"; version="0.1.3"; sha256="13jqvww65wzac1c8ajkljz89vi4j76y9ga52w3ygajjzg0rn15l5"; depends=[]; };
-  rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3"; sha256="0ff4v7px4wm5rd4f4z8s4arh48hgayqjfpnni2997c92wlsq3d12"; depends=[Rcpp]; };
+  rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; };
   rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; };
   rgam = derive2 { name="rgam"; version="0.6.3"; sha256="0mbyyhhyr7ijv2sq9n7g0vaxivngwf4nbb5398xpsh7fxvgw5zdw"; depends=[Rcpp RcppArmadillo]; };
   rgbif = derive2 { name="rgbif"; version="0.9.9"; sha256="11gji0b1gzh3zpmaff7ly9pvv6jdig5d1277hrss8x4zj7r34iap"; depends=[crul data_table geoaxe ggplot2 jsonlite magrittr oai tibble whisker wicket xml2]; };
   rgcvpack = derive2 { name="rgcvpack"; version="0.1-4"; sha256="1vlvw9slrra18qaizqk2xglzky0i6z3bsan85x908wrg8drss4h5"; depends=[]; };
-  rgdal = derive2 { name="rgdal"; version="1.2-16"; sha256="1j83bc16ndk561vgr67z99gba9bhgcchgir8s504avcs9zmfyzq1"; depends=[sp]; };
-  rgdax = derive2 { name="rgdax"; version="0.4.0"; sha256="0f8n016p9y62rpxmqrycmbdb7b3h7vnsyd9qcicqs19yvpm91im2"; depends=[digest httr jsonlite RCurl]; };
+  rgdal = derive2 { name="rgdal"; version="1.2-18"; sha256="0vyvbsz7260crfnqk61vcbk051d01lyl984yk140nwh9wj8svr1d"; depends=[sp]; };
+  rgdax = derive2 { name="rgdax"; version="0.5.0"; sha256="1s9vqjmnkd4jvq5v8w1wc44khgd1pjzr2hq356vm0jpcvgf0qscq"; depends=[digest httr jsonlite RCurl]; };
   rgen = derive2 { name="rgen"; version="0.0.1"; sha256="0gl82v09q1ha58wd1014s46wzkx1yf348bc7jkl6s4qdc6c4vsb8"; depends=[]; };
   rgenoud = derive2 { name="rgenoud"; version="5.8-1.0"; sha256="12n34r0p00bmflxrmbj927jm0q19j5r9mjplz5mzb1v8praa7v4x"; depends=[]; };
   rgeoapi = derive2 { name="rgeoapi"; version="1.1.0"; sha256="0k8p1l0vrgx0bifbc2i9gxxwih513vbqhjh7fiifyfq3r74i4j7k"; depends=[httr magrittr rjson]; };
   rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; };
-  rgeopat2 = derive2 { name="rgeopat2"; version="0.2.0"; sha256="12n5zgx8svcrgsihvhw0drd0l3r48clshs2b36p0md111a2b1gh3"; depends=[readr sf stringr]; };
+  rgeopat2 = derive2 { name="rgeopat2"; version="0.2.4"; sha256="1ngisbx9ws8zllkq2qa7zafl400wrvmj3rm812aja74d8rr2i7mw"; depends=[readr sf stringr]; };
   rgeos = derive2 { name="rgeos"; version="0.3-26"; sha256="0czlwfqilzh1zj61axisg06d9dksdvvg5hgcs31ydaqkh45llllq"; depends=[sp]; };
   rgexf = derive2 { name="rgexf"; version="0.15.3"; sha256="0iw1vk32ad623aasf6f8hl0qkj59f1dsc2riwqc775zvs5w7k2if"; depends=[igraph Rook XML]; };
   rggobi = derive2 { name="rggobi"; version="2.1.21"; sha256="0zi4rhggngm0y8dsjxqlr2mmfc5wzi7l1qcp5gin4bjlbyf8yb3z"; depends=[RGtk2]; };
   rgho = derive2 { name="rgho"; version="1.0.1"; sha256="0jkfmyn3i50vsqciy96wd2fpik6yfg0sz6rrhwb04jv1dmyz2nfa"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; };
-  rgl = derive2 { name="rgl"; version="0.99.9"; sha256="1rv4gq03mbx62v4kyj83y5kh1f77d68aqwmdb00r8szqlx5w5gdm"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr shiny]; };
-  rglobi = derive2 { name="rglobi"; version="0.2.13"; sha256="15hqcmh8r6lsc60139f9q9kyspkys61q0y39i5wq86lsq6i3q4js"; depends=[RCurl rjson]; };
+  rgl = derive2 { name="rgl"; version="0.99.16"; sha256="0q8sg8fr0140ilssqhscaxkjc29w1rpp6f4k50amw3zzs9g58ak9"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; };
+  rglobi = derive2 { name="rglobi"; version="0.2.14"; sha256="09f4v98m68ssnf1n0ijsrzawpri3jhv4bz7gzzzpijb75mkb0zwz"; depends=[RCurl rjson]; };
   rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; };
   rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; };
   rgrass7 = derive2 { name="rgrass7"; version="0.1-10"; sha256="0w5vy8163xlfmdrpyp00x25wwq4jnaspzggpvj160azigndsc1kr"; depends=[sp XML]; };
@@ -10214,22 +10420,24 @@ in with self; {
   rhub = derive2 { name="rhub"; version="1.0.2"; sha256="18aq28q4vggbp19l9wcw3dylnyv7sd26wg0i5w8jrva5cq1v2n5j"; depends=[assertthat callr clisymbols crayon desc httr jsonlite parsedate prettyunits R6 rappdirs rcmdcheck rematch whoami withr]; };
   rhymer = derive2 { name="rhymer"; version="1.0.0"; sha256="1k15sd5q6a1ijayl585vc54d1zs4nyrxsfck9bn4nlfdiwc5arwf"; depends=[httr jsonlite]; };
   ri = derive2 { name="ri"; version="0.9"; sha256="00y01n9cx95bjhdpnh7vi0xd5p6al3sxbjszbyxafn7m9mygmnhv"; depends=[]; };
-  ri2 = derive2 { name="ri2"; version="0.1.0"; sha256="02rlczjpfy1q5i7lq4ypindhc65cnryryvbklqjh5dh2xzwjkain"; depends=[estimatr ggplot2 pbapply randomizr]; };
+  ri2 = derive2 { name="ri2"; version="0.1.1"; sha256="01iyk9cfs6v7jd1z962vrcdb3bfab5pcq9abkb21yqi82f9w97jf"; depends=[estimatr ggplot2 pbapply randomizr]; };
   riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; };
   rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; };
   ridge = derive2 { name="ridge"; version="2.2"; sha256="01yldzzlqg0xqha31l3py62lyq7fw5xfsbmz6ifzff24gqsf029x"; depends=[]; };
   ridigbio = derive2 { name="ridigbio"; version="0.3.5"; sha256="0526nscxynl3857zybpms1wr3230qby29kxglm919pcdvpjb5kz5"; depends=[httr jsonlite plyr]; };
+  ridittools = derive2 { name="ridittools"; version="0.1"; sha256="1m9xbwxb277l4cd85qxmpw66gyavpwamgwr8kyf8vqarzfbwiilr"; depends=[]; };
   riem = derive2 { name="riem"; version="0.1.1"; sha256="0lwhsxb4pm26kb65hs8pa63bsbrgy0zchqm4i6pq9f2r9h8vsm1m"; depends=[httr jsonlite lubridate tibble]; };
   rif = derive2 { name="rif"; version="0.2.0"; sha256="0vk3dmg3qzw3i27wbpfih66rx8sdxq033l7h59h3hy960av4hawh"; depends=[crul data_table jsonlite tibble]; };
+  riingo = derive2 { name="riingo"; version="0.1.0"; sha256="1lkg0xmy3mhx99ywbvkmnkj6i61r5x75g4fnnwj6vdyslvwf3s5x"; depends=[crayon glue httr jsonlite purrr rlang tibble]; };
   rinat = derive2 { name="rinat"; version="0.1.5"; sha256="14ql90f8wrxz9nlykbzfpar1yfwh7p71vks7vhhn8ys09wvj30zk"; depends=[ggplot2 httr jsonlite maps plyr]; };
   rindex = derive2 { name="rindex"; version="0.12"; sha256="1k9zihvrp955c4lh70zjlsssviy2app8w6mv5ln4nawackbz0six"; depends=[regtest]; };
   ring = derive2 { name="ring"; version="1.0.0"; sha256="03sbgxwzms20gp0hkm5s0dihqkx3qf6bw0jrays7jjzrrwzl5657"; depends=[R6]; };
   rintrojs = derive2 { name="rintrojs"; version="0.2.0"; sha256="0qdry88f6ci5g6k0i8mycm9k5ibnmb9zjppjvqqaflw3g3nsnli2"; depends=[jsonlite shiny]; };
-  rio = derive2 { name="rio"; version="0.5.9"; sha256="1cb7p0kgas3y84sc1p59zcsp0c4qhg01cs9s7kl927qhral778kd"; depends=[curl data_table foreign haven openxlsx readxl tibble]; };
+  rio = derive2 { name="rio"; version="0.5.10"; sha256="158xg3vj0glk3fslwi6fywwmfym2b6kn3fdmjligdfy5lf68khix"; depends=[curl data_table foreign haven openxlsx readxl tibble]; };
   rioja = derive2 { name="rioja"; version="0.9-15.1"; sha256="18fyqcykg12mf4ap0a2la30656xq32immqz11ddmrfrb0vpd2h7h"; depends=[mgcv vegan]; };
   ripa = derive2 { name="ripa"; version="2.0-2"; sha256="0n1gaga0d4bb9qdlm7gksa1nwi4y28kbgwr3icwqgihf1bfb9m81"; depends=[Rcpp]; };
   riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; };
-  riskRegression = derive2 { name="riskRegression"; version="1.4.3"; sha256="1r9habv47wwhnbvcjl6yin4i415ayhisg67rzggv899nqcyqpm80"; depends=[abind cmprsk data_table doParallel foreach ggplot2 lava prodlim Rcpp RcppArmadillo rms survival]; };
+  riskRegression = derive2 { name="riskRegression"; version="2018.04.21"; sha256="0jyk5pdgr8wqyfxzwbmanqp7ff0fkw3nlz7dx19rqxji1lnj74qa"; depends=[abind cmprsk data_table doParallel foreach ggplot2 lava plotrix prodlim Rcpp RcppArmadillo rms survival timereg]; };
   riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; };
   risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; };
   riskyr = derive2 { name="riskyr"; version="0.1.0"; sha256="1s6yrij5d1vhvzc7nnajjnjmxnhrs0r1psppcvwb0qg3ff181y22"; depends=[diagram vcd]; };
@@ -10243,6 +10451,7 @@ in with self; {
   rivr = derive2 { name="rivr"; version="1.2"; sha256="0ankpfixggwdv17ba8i5iln0zzmngqrhvh3dg8lis9kqg6wa89yr"; depends=[Rcpp]; };
   rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; };
   rjags = derive2 { name="rjags"; version="4-6"; sha256="1bc9bzq31liawg3nzwfczf75vgg56fnqjw0997xvlic4ghgbn96g"; depends=[coda]; };
+  rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; };
   rje = derive2 { name="rje"; version="1.9"; sha256="1dyd34z6lb0p6zmyax5dpzflgc9a4saka33mvdfcxi5pj0rnygaz"; depends=[]; };
   rjson = derive2 { name="rjson"; version="0.2.15"; sha256="1vzjyvf57k1fjizlk28rby65y5lsww5qnfvgnhln74qwda7hvl3p"; depends=[]; };
   rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; };
@@ -10253,28 +10462,30 @@ in with self; {
   rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; };
   rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; };
   rlang = derive2 { name="rlang"; version="0.2.0"; sha256="0f87fhw5pj6s2zjdxnpnd7pwn78czdz71b0xhm5adqg1p38sfwj8"; depends=[]; };
-  rlas = derive2 { name="rlas"; version="1.1.9"; sha256="1c8sc277jiij1j5sb3wsjdm1pxlp0ia3a39xqzglvmlcnlvcygbq"; depends=[data_table Rcpp]; };
+  rlas = derive2 { name="rlas"; version="1.2.1"; sha256="0mqs7vd4855hdjymvp6427vhs2ihaz37lx59984x39rc7sfw6nap"; depends=[data_table Rcpp uuid]; };
   rld = derive2 { name="rld"; version="1.0"; sha256="1glv4q25z14hcwifwg623h77p4awpsn3nk843pnph4sb3p5qbmn3"; depends=[emdbook MASS survival]; };
   rleafmap = derive2 { name="rleafmap"; version="0.2"; sha256="1i2qczipg7lr6fl35lcl896r54jia7libxx83darrfzc1hd9sdcq"; depends=[knitr raster sp]; };
   rlecuyer = derive2 { name="rlecuyer"; version="0.3-4"; sha256="0d5mcdzn6f5nhwzs165a24z36d0b8gd0cyfyzffvr6p96h8qydy7"; depends=[]; };
+  rlfsm = derive2 { name="rlfsm"; version="0.1.0"; sha256="1ixffrn56s9hg56ygk8882kz4b77sfdd9xb5vnk8b10sl9yjh4r7"; depends=[doParallel elliptic foreach ggplot2 plyr Rdpack reshape2 stabledist]; };
   rlist = derive2 { name="rlist"; version="0.4.6.1"; sha256="08awy2p7rykc272wvvya4ddszbr7b7s7qv4wr3hs8ylr4jqlh0dv"; depends=[data_table jsonlite XML yaml]; };
   rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; };
   rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; };
   rlo = derive2 { name="rlo"; version="0.3.2"; sha256="0abq42dhapzmh6hvmildbn8zya29c6p1aqbv8avc03g014dwbrd0"; depends=[PythonInR]; };
-  rly = derive2 { name="rly"; version="1.4.2"; sha256="0mppl3y808k9ydn1lwng2bqmdzbbsla2p9p8qk73mp0xyq8iq9sm"; depends=[futile_logger R6]; };
+  rly = derive2 { name="rly"; version="1.5"; sha256="0rd4ksd6qv227zgdxmy9d77v1jyba0vk0svh5wc5b72z92j9cjzb"; depends=[futile_logger R6]; };
   rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; };
   rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; };
-  rmapshaper = derive2 { name="rmapshaper"; version="0.3.0"; sha256="0v7p8wqgjymidavyq9lfl6kzlpn5ybfc9lqhsaxbxcc9hb80xjxz"; depends=[geojsonio geojsonlint rgdal sp V8]; };
-  rmapzen = derive2 { name="rmapzen"; version="0.3.3"; sha256="0rz3wwy8dbb2620gy07aib2aad6ds001vf47bxrj3vzrxp5h448i"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
+  rmake = derive2 { name="rmake"; version="1.0.0"; sha256="1qvbyd68p37nsqrm77w18znsa6m629qzyd7sl8w98p654pqmjhdw"; depends=[assertthat pryr rmarkdown]; };
+  rmapshaper = derive2 { name="rmapshaper"; version="0.4.0"; sha256="0a911f6q9czni6zpijp63rngnil7jkbcy9f7jz55jr225fgm6g6z"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; };
+  rmapzen = derive2 { name="rmapzen"; version="0.3.4"; sha256="1hpl2j347d5qahwzxlr66k2fl6fg09160jn6p3ycvhp0g7zaq5r4"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; };
   rmarkdown = derive2 { name="rmarkdown"; version="1.9"; sha256="0wq6kbhrkv3fhcy4hg5yyv9gdvf8gr4nsjwdifs4ih8lnn0dmdyb"; depends=[base64enc evaluate htmltools jsonlite knitr mime rprojroot stringr yaml]; };
   rmatio = derive2 { name="rmatio"; version="0.12.0"; sha256="1cw7j44rgjgbw2xln7lh29ln53lwfadr8rx0sffkjwc7lbh1r6wa"; depends=[Matrix]; };
-  rmcfs = derive2 { name="rmcfs"; version="1.2.9"; sha256="1ar2dsxjf0a6ij91d380arlh9wlywqpfaii80bk6mrq4xg6qy4b0"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
+  rmcfs = derive2 { name="rmcfs"; version="1.2.10"; sha256="0gyvb8vdv1n93xbz0xl5vhwhskas8cxj4zv8flz18jm6f0bgqlrr"; depends=[dplyr ggplot2 igraph reshape2 rJava yaml]; };
   rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; };
   rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; };
-  rmda = derive2 { name="rmda"; version="1.4"; sha256="0agh4mrs8mjjb7hc41r59mbnq0h873fmykljla1cbf4ikhxwjihf"; depends=[caret MASS pander reshape]; };
+  rmda = derive2 { name="rmda"; version="1.5"; sha256="13119x23xi912s7wl2p2a24msbczgv75x37p2jsr5w0n4l2k01wi"; depends=[caret MASS pander reshape]; };
   rmdformats = derive2 { name="rmdformats"; version="0.3.3"; sha256="06nyrdhy26mvgfb1bnlbd8hslybpc01a30a40wwlc3ay7yp0nzrj"; depends=[bookdown htmltools knitr questionr rmarkdown]; };
   rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; };
-  rmeta = derive2 { name="rmeta"; version="2.16"; sha256="1s3n185kk0ddv8v6c7mbc7cpj6yg532r7is6pjf9vda7317rxywy"; depends=[]; };
+  rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; };
   rmetasim = derive2 { name="rmetasim"; version="3.1.7"; sha256="0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r"; depends=[ade4 adegenet gtools pegas]; };
   rmgarch = derive2 { name="rmgarch"; version="1.3-0"; sha256="0brqjhplvzl0bgsi6x057rb2cg5x372i746dhddr013p1mx0rlcx"; depends=[Bessel ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; };
   rminer = derive2 { name="rminer"; version="1.4.2"; sha256="1hjgcawjrwsf0nv2hlznr1cvpm445yyxc6cq28k2yzyivk74si34"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; };
@@ -10301,13 +10512,13 @@ in with self; {
   rnn = derive2 { name="rnn"; version="0.8.0"; sha256="04924zn448x9rc3z9vh033l4rv9lz0hxv1bhfl0gn6gvd5wavlc7"; depends=[shiny sigmoid]; };
   rnoaa = derive2 { name="rnoaa"; version="0.7.0"; sha256="0mha1izbzfa6vq44wjsc4p018k83zw99f6bpkhc275c5v09pxvmr"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr httr isdparser jsonlite lubridate rappdirs scales tibble tidyr XML xml2]; };
   rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; };
-  rnr = derive2 { name="rnr"; version="0.1.0"; sha256="1209gayyn98zdkwv51liq62b2xvza6xndfqkpc73w5dgj1rqn343"; depends=[assertthat purrr]; };
-  rnrfa = derive2 { name="rnrfa"; version="1.3.0"; sha256="1zrj7y0qh57r7r9c5pspz238w0j1kaicd2l6vcg92lgxi8b9i558"; depends=[ggmap ggplot2 httr plyr rjson sp stringr xml2 xts]; };
+  rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; };
+  rnrfa = derive2 { name="rnrfa"; version="1.4.0"; sha256="007j6a2hihw7h0vhv6aiz7iymzr3lkzmc1dy5f8b22z5n52k4pl3"; depends=[ggmap ggplot2 httr plyr rgdal rjson sp stringr xml2 xts]; };
   roadoi = derive2 { name="roadoi"; version="0.4.1"; sha256="1g4x1gkcrq8pd5vdikhf16ghgd990hhb1m387r2smz21v993cfk8"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; };
   roahd = derive2 { name="roahd"; version="1.3"; sha256="1pn2xzc5fnp2hb3fw3gpqng0x9rvpd4qfhx9gclf31algpzaidbb"; depends=[robustbase scales]; };
-  robCompositions = derive2 { name="robCompositions"; version="2.0.6"; sha256="1r74w6ssq9fhjain02hr9sz0x2j1fi1waw7319gls69kp73b51hw"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM]; };
+  robCompositions = derive2 { name="robCompositions"; version="2.0.7"; sha256="1ym63s6rn02p42q4mwmxbnh713shs4sc2ayimi053yzix4cnwn7w"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp robustbase rrcov sROC VIM zCompositions]; };
   robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; };
-  robeth = derive2 { name="robeth"; version="2.7"; sha256="03pnwd3xjb9yv8jfav0s4l9k5pgpampp15ak7z0yvkjs20rvfq3d"; depends=[]; };
+  robeth = derive2 { name="robeth"; version="2.7-1"; sha256="06qkrjvg4yps4h6xdb81svx52vlw389z1j4brpv0w9h40ljpxbff"; depends=[]; };
   robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; };
   robfilter = derive2 { name="robfilter"; version="4.1"; sha256="161rsqyy2gq1n6ysz0l4d4gqvxhs72hznc2d5hljxdaz3sbdzzig"; depends=[lattice MASS robustbase]; };
   robis = derive2 { name="robis"; version="1.0.0"; sha256="02spxy33vh675dvhx2v6f06hxzcwfrsmkzb6yk5h30xp21blqv4g"; depends=[dplyr httr jsonlite leaflet]; };
@@ -10347,7 +10558,7 @@ in with self; {
   rolr = derive2 { name="rolr"; version="1.0.0"; sha256="04nm4q0mlr4w6jb0frykzlyknfn3gn02ysqr5ll5jch6wawichy2"; depends=[survival]; };
   rolypoly = derive2 { name="rolypoly"; version="0.1.0"; sha256="11nf7in6n03675l11ynl4rp20rlzy7jli3m518s4sqqxdm8f8ci7"; depends=[data_table dplyr foreach ggplot2 glmnet MASS Matrix matrixcalc]; };
   rootSolve = derive2 { name="rootSolve"; version="1.7"; sha256="08ic6ggcc5dw4nv9xsqkm3vnvswmxyhnqnv1rdjv1h2gy1ivpcq8"; depends=[]; };
-  rootWishart = derive2 { name="rootWishart"; version="0.4.0"; sha256="028k1h6vibbcnmh35kg0z388c991k8v78ac0fbrv1k2ajqrrl4lg"; depends=[BH Rcpp RcppEigen]; };
+  rootWishart = derive2 { name="rootWishart"; version="0.4.1"; sha256="1l9pr3i20hi5k02qnlb3blxhlvp2j0njn74xslw3gcjvyzjlr12j"; depends=[BH Rcpp RcppEigen]; };
   roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; };
   rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; };
   ropenaq = derive2 { name="ropenaq"; version="0.2.6"; sha256="065p4c8l4bqxy00clbjhad8hqw4gg2h2c00b06n2fa5n70z0akgq"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; };
@@ -10361,7 +10572,7 @@ in with self; {
   rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; };
   rotationForest = derive2 { name="rotationForest"; version="0.1.3"; sha256="1z2wk3mcs5hrahsxralidbc0dd8gxdbwjpr2f71g4g3isfx1ic8d"; depends=[rpart]; };
   rotations = derive2 { name="rotations"; version="1.5"; sha256="1zksh6hyxdkm0lvvrld6dgkmhszn6wsjrjzr2xbn3af3gsvsydaa"; depends=[ggplot2 Rcpp RcppArmadillo rgl sphereplot]; };
-  rotl = derive2 { name="rotl"; version="3.0.3"; sha256="0pfpgynvdi011m6j6gs98irldpjrdc8rgza36ndk60q2w5z436h4"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
+  rotl = derive2 { name="rotl"; version="3.0.4"; sha256="1zc4418gxpd65n60lspsdm15v7apkv6wkf9jqqs152z079ppdrhx"; depends=[ape assertthat httr jsonlite rentrez rncl]; };
   roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; };
   routr = derive2 { name="routr"; version="0.3.0"; sha256="1mjf1vwrh1k1kjl1kcgqs29zb8h9m05630czsjkz7li3pmvy9mrv"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; };
   rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; };
@@ -10377,7 +10588,7 @@ in with self; {
   rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; };
   rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; };
   rpdo = derive2 { name="rpdo"; version="0.2.3"; sha256="150kd9pvfr7msrh55vsqcj8lv994izlvhxf4g5n1qbzdcaqsdjzp"; depends=[checkr]; };
-  rpf = derive2 { name="rpf"; version="0.56"; sha256="089n2mmczvvwga8ak3l0p326qsp83d0cz03lc6fhx6a9w5vhl67i"; depends=[mvtnorm RcppEigen]; };
+  rpf = derive2 { name="rpf"; version="0.56.1"; sha256="1332d5fzpsi988k1x57hyydjwrx3gxr3l7hgf946jrd8y1c2nj5d"; depends=[mvtnorm RcppEigen]; };
   rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; };
   rpgm = derive2 { name="rpgm"; version="1.1.2"; sha256="0pbja877gb3mn7m78lfdl217dm7qsrblq6gwrjh5wbv1nd532hvz"; depends=[]; };
   rphast = derive2 { name="rphast"; version="1.6.9"; sha256="111m824z7z0lqdj4kk4cp1yfjhx7d5d9463k892dyvgjvkagvi9g"; depends=[]; };
@@ -10404,7 +10615,7 @@ in with self; {
   rptR = derive2 { name="rptR"; version="0.9.21"; sha256="0wqh9d372s2222qm5w0wx77l2sj7zvdnl7zvxcn5wfs3cz84fj15"; depends=[lme4 pbapply]; };
   rpubchem = derive2 { name="rpubchem"; version="1.5.10"; sha256="06j9ir65ykky5hdbyv74fnddwqd39jxvr6jig0kjqisc75k4spjz"; depends=[base64enc car data_table fingerprint iterators itertools RCurl RJSONIO stringr XML]; };
   rqPen = derive2 { name="rqPen"; version="2.0"; sha256="13m21v753njaramgpbhn0lb793b6946crv5v8vl127w38q0z3wyd"; depends=[quantreg regpro]; };
-  rquery = derive2 { name="rquery"; version="0.4.0"; sha256="080q99q5bkhdxbnd2xg3mjpyvj3ad2lvvay845h50s9c9gpsn9wp"; depends=[DBI RSQLite wrapr]; };
+  rquery = derive2 { name="rquery"; version="0.4.2"; sha256="018m46iqrbs4h20clhqhxydd9y43swhdq1mmb00hvzlfbwbxi05r"; depends=[DBI wrapr]; };
   rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; };
   rrBLUP = derive2 { name="rrBLUP"; version="4.6"; sha256="1bw4pjj9hm9ik5bvvklnlkykhlqm6k7pbkma1iwc3kbg8shpbd18"; depends=[]; };
   rrBlupMethod6 = derive2 { name="rrBlupMethod6"; version="1.3"; sha256="1qwv954mhry46ff2ax48xcmnasygi5alv8d413g3qbk2da6i0d8l"; depends=[]; };
@@ -10416,8 +10627,9 @@ in with self; {
   rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; };
   rredlist = derive2 { name="rredlist"; version="0.4.0"; sha256="0j2hab26zs9dyg9fggza7yffbvwvnmrk5frbfs2ys8h3hg2x6ncy"; depends=[crul jsonlite]; };
   rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; };
-  rreg = derive2 { name="rreg"; version="0.1.2"; sha256="06zang5m39bla4c5wxb9p4fgrn66a69l190z5gnsyp8r6b166x3p"; depends=[directlabels ggplot2]; };
+  rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; };
   rrepast = derive2 { name="rrepast"; version="0.6.0"; sha256="1d6nk6437c4bxbyvpzdlgd1kxh651979m0k7aadi9fl77i5k2x3w"; depends=[digest ggplot2 gridExtra lhs rJava sensitivity xlsx]; };
+  rres = derive2 { name="rres"; version="1.0"; sha256="16blkbmma5wj5zigl9yr62kbffyk2amvq45gvgpdj726qdskymcx"; depends=[kernlab Rcpp]; };
   rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; };
   rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; };
   rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; };
@@ -10427,11 +10639,11 @@ in with self; {
   rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; };
   rsample = derive2 { name="rsample"; version="0.0.2"; sha256="10lmpy4ca045j2fxbz5xzl1w9242dkp6sc8hhrk0fxs0dkfb7amf"; depends=[broom dplyr purrr recipes rlang tibble tidyr]; };
   rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; };
-  rscala = derive2 { name="rscala"; version="2.5.1"; sha256="0az638dlg7nqhj7xf1bwcpv9anqqcif8ni4a8q68lcn2sxb4wamp"; depends=[]; };
+  rscala = derive2 { name="rscala"; version="2.5.3"; sha256="0a6l7inx6shyxma0a0kf2jh8402n7xavpday4k7lr316v62lyq29"; depends=[]; };
   rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; };
   rsconnect = derive2 { name="rsconnect"; version="0.8.8"; sha256="019phwamg2irb0ak9y0sn25ihi0a9sfdpa02dz9x0bhpcg55x0li"; depends=[digest packrat PKI RCurl RJSONIO rstudioapi yaml]; };
   rscopus = derive2 { name="rscopus"; version="0.5.3"; sha256="1d6265ffmhd6ajlp607y5jy77nqgcrdym6w1j8vnil0705z3swzb"; depends=[httr plyr tidyr]; };
-  rscorecard = derive2 { name="rscorecard"; version="0.7.0"; sha256="02bjkk03cppd88dljxj72lngwryhbbffvin8h3fkl7jkcaccsq1z"; depends=[dplyr httr jsonlite lazyeval magrittr]; };
+  rscorecard = derive2 { name="rscorecard"; version="0.7.1"; sha256="1j7v383gcb13bi6d1v59pkx6d9g4yichyyh5ads9w82qq6v31xnw"; depends=[dplyr httr jsonlite lazyeval magrittr]; };
   rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; };
   rsdmx = derive2 { name="rsdmx"; version="0.5-11"; sha256="06sjkjl9y2fg2yz740a1z5zn4afnjfv1nsykszxsnwn7s23rxi31"; depends=[plyr RCurl XML]; };
   rsed = derive2 { name="rsed"; version="0.1.2"; sha256="1rk7wkidvdn1d39a11cbgglz2dg74bbv3v1ijjdx903kgwg3nnrc"; depends=[Smisc]; };
@@ -10440,7 +10652,7 @@ in with self; {
   rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; };
   rsggm = derive2 { name="rsggm"; version="0.3"; sha256="17yzvd5vs2avp0nzk7x9bi4d7p6n9nv7675qpgfpwkfqp25lax73"; depends=[glasso MASS Matrix QUIC]; };
   rsig = derive2 { name="rsig"; version="1.0"; sha256="129k78i8kc30bzlphdb68vv3sw2k6xyiwrhw08vhzz6mf3jxlqsh"; depends=[BBmisc glmnet Matrix superpc survcomp survival]; };
-  rsimsum = derive2 { name="rsimsum"; version="0.3.0"; sha256="11zc6ga4d4i9bilmbfinkanv3fkz8xpcikc38mxf88lv9jfv0kx1"; depends=[checkmate ggplot2]; };
+  rsimsum = derive2 { name="rsimsum"; version="0.3.1"; sha256="0rg3flfh2wwa3xyjsb041k94jryx2yxf8kb0nnvy9wgybn3v1c01"; depends=[checkmate ggplot2]; };
   rslp = derive2 { name="rslp"; version="0.1.0"; sha256="06glpdsd309058kxww114j9sshvj6gw9g5sdm4zkmzq3cl91fa6h"; depends=[magrittr plyr stringi stringr]; };
   rslurm = derive2 { name="rslurm"; version="0.4.0"; sha256="1ck4ky5d0pf8hnxz1ijbjk0nfyj1hfnhf9la5qrqw2spa09z82ki"; depends=[whisker]; };
   rsm = derive2 { name="rsm"; version="2.9"; sha256="1rj2qdlv44hbv1ipv7hdpssn90ypp6bfc7nqdaf9dak0bd6khwni"; depends=[estimability]; };
@@ -10453,9 +10665,9 @@ in with self; {
   rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; };
   rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; };
   rstan = derive2 { name="rstan"; version="2.17.3"; sha256="10fdasqbdwlisnm7hjmgl5f027ypfhni86d1c5fykb09g1pvkjz3"; depends=[BH ggplot2 gridExtra inline Rcpp RcppEigen StanHeaders]; };
-  rstanarm = derive2 { name="rstanarm"; version="2.17.3"; sha256="196fi09fpxf3v0kbdf6ci6f8c0mw1vx3g30cmkvl5rm17abhwifs"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; };
+  rstanarm = derive2 { name="rstanarm"; version="2.17.4"; sha256="1azggccxj6k8nrz8xlmsv42h0rvwmqfih8xxqn45v7fy9la006p0"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; };
   rstansim = derive2 { name="rstansim"; version="0.1.1"; sha256="09hg4ishzp6q90nrl94h21al0ad0jn7fr8brp8f0xa9cvkwlzjpg"; depends=[doRNG doSNOW foreach loo Rcpp rstan]; };
-  rstantools = derive2 { name="rstantools"; version="1.4.0"; sha256="1k1nhcy0d2lcnllrdslk4p2d6cp12s5v2vzl5j7l9c7l24syq2ar"; depends=[]; };
+  rstantools = derive2 { name="rstantools"; version="1.5.0"; sha256="19rzcfiirw539hxs98j33gccwigdpwf3nj1w5jwwzank217wmgg4"; depends=[]; };
   rstatscn = derive2 { name="rstatscn"; version="1.1.1"; sha256="0aj4x3lyrldpgh90v90qbxylndacn5ri5yqff3qy53q45ar7yji3"; depends=[httr jsonlite]; };
   rstiefel = derive2 { name="rstiefel"; version="0.10"; sha256="0b2sdgpb3hzal34gd9ldd7aihlhl3wndg4i4b3wy6rrrjkficrl1"; depends=[]; };
   rstpm2 = derive2 { name="rstpm2"; version="1.4.1"; sha256="0pgy9a8llj0zzzc06afzd0w11mdbx3xvmjf0qpzvsid1zqdbcqxr"; depends=[bbmle fastGHQuad mgcv numDeriv Rcpp RcppArmadillo survival]; };
@@ -10480,13 +10692,13 @@ in with self; {
   rtiff = derive2 { name="rtiff"; version="1.4.5"; sha256="0wpjp8qwfiv1yyirf2zj0696zb7m7fpzn953ii8vbmgzhakgr8kw"; depends=[pixmap]; };
   rtimes = derive2 { name="rtimes"; version="0.5.0"; sha256="1z8iaxkvd99fnk46vzbw6lax2qayng6s5n1sxn78kvp8py552f61"; depends=[crul data_table dplyr jsonlite tibble]; };
   rtimicropem = derive2 { name="rtimicropem"; version="1.3"; sha256="1z7nrmzwdgz7fy2i23rl07jd39sdxqsdmmmkaaxzagj7whd58inj"; depends=[changepoint dplyr ggplot2 knitr lazyeval lubridate pathological R6 rbokeh readr stringr tibble tidyr]; };
-  rtip = derive2 { name="rtip"; version="1.1.0"; sha256="1fpxg85lhdvc68rr13x1w7k9s7j0cwsc18gc579bd44jqpgfkw72"; depends=[boot ggplot2 mvtnorm plyr]; };
+  rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; };
   rtk = derive2 { name="rtk"; version="0.2.5.4"; sha256="1nh757l4ih5pmmh7b84ca1f5wpz9mcksdb0a4rvs2hhgap38ihg9"; depends=[Rcpp]; };
   rtkore = derive2 { name="rtkore"; version="1.5.1"; sha256="03vmgrsil5yrrs3ndgqvfcwv9plcawc8v2y2x9nwcashxg40djn6"; depends=[Rcpp]; };
-  rtop = derive2 { name="rtop"; version="0.5-13"; sha256="1md9sgsmbc3jv1lc4l6r26830k9vjljjqpzzna4s23bn6ky7glgp"; depends=[gstat rgdal sp]; };
+  rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; };
   rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; };
-  rtrim = derive2 { name="rtrim"; version="1.0.1"; sha256="134j5sv9dvcq1n37rry7615nr3pa54by6r7ss7fagcmy4lnma2ps"; depends=[]; };
-  rts = derive2 { name="rts"; version="1.0-38"; sha256="1m9kir2snfhxyagsflp4cyii33ycw4fr0f8bn7r92757l92i7vr7"; depends=[raster RCurl sp xts zoo]; };
+  rtrim = derive2 { name="rtrim"; version="2.0.4"; sha256="1xl3xai768idnfc30hp20cnpq3a07049p7vpkqpdrpla6a8zhvqk"; depends=[]; };
+  rts = derive2 { name="rts"; version="1.0-45"; sha256="11gvgj5bqiacsf51sg4dj7jpsjgdj6j26vqc8by15325a4c804ml"; depends=[raster RCurl sp xts zoo]; };
   rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; };
   rtweet = derive2 { name="rtweet"; version="0.6.0"; sha256="0bh483wfl4f8xscdyv3ys5hhdabc91dynlbqlxxv8mil7pgg3chg"; depends=[bit64 httr jsonlite magrittr openssl readr tibble]; };
   rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; };
@@ -10501,18 +10713,18 @@ in with self; {
   rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; };
   rusk = derive2 { name="rusk"; version="0.1"; sha256="05ci4f0k2b54sqf0h6j38h3kkq3r27klva0hfg968snr9bb6v0wv"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; };
   rust = derive2 { name="rust"; version="1.3.4"; sha256="1jb970kskl2wdhqcjbxl8gh986abdy96jbipnsdi3656ic5dxivn"; depends=[Rcpp RcppArmadillo spatstat]; };
-  ruv = derive2 { name="ruv"; version="0.9.6"; sha256="12zi775nx6k1j9sz691x6r9r0arfnhwddf5nxbr1xk25dj9qa210"; depends=[]; };
+  ruv = derive2 { name="ruv"; version="0.9.7"; sha256="1ynxmax9sz74s8abmmizla6jas385mn5ij151mq35k0yv1xszzj5"; depends=[ggplot2 gridExtra scales]; };
   rv = derive2 { name="rv"; version="2.3.2"; sha256="108s9q19h5ypxb9w4a8nk97js261izag1sf75g4xfqblwxxrbflc"; depends=[]; };
   rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; };
   rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; };
   rvcheck = derive2 { name="rvcheck"; version="0.0.9"; sha256="14pa7fa7yyhmk0v5md7x5xr5jd4gjwjlvgbynnhq30fj56qffyvf"; depends=[]; };
   rversions = derive2 { name="rversions"; version="1.0.3"; sha256="0i2gi05nrvknr7g89rbppkswyfcwwd4r9gp75fdfhpah8sgq1l11"; depends=[curl xml2]; };
-  rvertnet = derive2 { name="rvertnet"; version="0.6.2"; sha256="12qffkkl3yqiqh0zi4zrj6irv7jnylja7fv21h3fnjpvqwkazv8a"; depends=[crul dplyr ggplot2 jsonlite maps]; };
+  rvertnet = derive2 { name="rvertnet"; version="0.7.0"; sha256="01z3ij5z21v901hz4l9173r4pa9jz2nl7bx086ka1bxvcy0dgqgj"; depends=[crul dplyr ggplot2 jsonlite maps]; };
   rvest = derive2 { name="rvest"; version="0.3.2"; sha256="04mv99z8dixywx96kfy4215g6ib23s7qvd77hcf9pxqxzcvqhvhd"; depends=[httr magrittr selectr xml2]; };
   rvg = derive2 { name="rvg"; version="0.1.8"; sha256="03hank94b5d1spig9jzrm5h2xbipi8skwqjg8sfwxwy5sjyrbaam"; depends=[gdtools officer Rcpp xml2]; };
   rvgtest = derive2 { name="rvgtest"; version="0.7.4"; sha256="1lhha5nh8fk42pckg4ziha8sa6g20m0l4p078pjj51kz0k8929ng"; depends=[]; };
   rvinecopulib = derive2 { name="rvinecopulib"; version="0.2.7.1.0"; sha256="1w3nwxpvmmkcvyymhz434xh6srjc87hj824bcjydmavx221ncf6p"; depends=[BH lattice Rcpp RcppEigen RcppThread]; };
-  rwalkr = derive2 { name="rwalkr"; version="0.3.2"; sha256="0vp7iizc6bn3y30vcrvksy91aiid52q01vgzjphc5m5sy99gsxj2"; depends=[dplyr httr tibble tidyr]; };
+  rwalkr = derive2 { name="rwalkr"; version="0.3.3"; sha256="03kpv4hvlajm09cqrlihia62pcj1skakx28ci4mgbfgpjy6l4jsl"; depends=[dplyr httr tibble tidyr]; };
   rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; };
   rwc = derive2 { name="rwc"; version="1.1"; sha256="0gdpskj87wjnpas90i3iqn1qv6frrki2xqiyyakg3zpaviw1imag"; depends=[MASS Matrix mvtnorm raster]; };
   rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; };
@@ -10536,7 +10748,7 @@ in with self; {
   sEparaTe = derive2 { name="sEparaTe"; version="0.2.1"; sha256="0k1c0wa052f1fprc9jn0i3g2cawxfhkan998jlhkr4iy986jynw9"; depends=[]; };
   sExtinct = derive2 { name="sExtinct"; version="1.1"; sha256="1l6232z6c4z3cfl1da94wa6hlv9hj5mcb85fj1y0yparkvvl8249"; depends=[lattice]; };
   sFFLHD = derive2 { name="sFFLHD"; version="0.1.1"; sha256="19zhx0rc6h44301a5q68r9jbxzh12ci3387d1c319vdiw05nschy"; depends=[conf_design DoE_base]; };
-  sGMRFmix = derive2 { name="sGMRFmix"; version="0.1.3"; sha256="19kfcg36yvwcsq24cn16s5zv9l42rnd9yk2p85j40d6f00ncivkr"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; };
+  sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; };
   sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; };
   sRDA = derive2 { name="sRDA"; version="1.0.0"; sha256="0g11smn4adm3b79m9w7wzcragxggkf8rrrsgj2yzdhm1d7zzjwbk"; depends=[doParallel elasticnet foreach Matrix mvtnorm]; };
   sROC = derive2 { name="sROC"; version="0.1-2"; sha256="0cp6frhk9ndffb454dqp8fzjrla76dbz0mn4y8zz1nbq1jzmz0d3"; depends=[]; };
@@ -10549,13 +10761,14 @@ in with self; {
   sads = derive2 { name="sads"; version="0.4.1"; sha256="1ir5cfjw3416gg7bvfp2qrn9qy1xbklb9a57rp06ghjg7d4slwpr"; depends=[bbmle GUILDS MASS poilog VGAM]; };
   sae = derive2 { name="sae"; version="1.1"; sha256="1izww27cqd94yrfbszbzy44plznxsirzn0752ag7xw7qzm5ywp3d"; depends=[MASS nlme]; };
   sae2 = derive2 { name="sae2"; version="0.1-1"; sha256="0fbbh2s0gjhyhypaccnd37b5g2rhyzq7mrm6s0z36ldg1pzi4dd9"; depends=[MASS]; };
-  saeRobust = derive2 { name="saeRobust"; version="0.1.0"; sha256="1zin9ix4wx3qbx2mfjyn61l0g1k4dgn4ps79qn21y6l9r647ya9q"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules Rcpp RcppArmadillo spdep]; };
+  saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; };
   saeSim = derive2 { name="saeSim"; version="0.9.0"; sha256="19l41qpwspccphmgxi20p7f473lxxh8d86b0wyy5jq24phhd8awx"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; };
   saemix = derive2 { name="saemix"; version="2.1"; sha256="1g52vkqg2dfld7miakkmp23yf4yzc7ka0hbg2fl6ya9cq9m7wyqq"; depends=[]; };
   saery = derive2 { name="saery"; version="1.0"; sha256="09x1v627llqbpiwkh1wr0z7gsndfdrjzag2hprhq1adbzh05k47z"; depends=[]; };
   safeBinaryRegression = derive2 { name="safeBinaryRegression"; version="0.1-3"; sha256="1g68r6pp5l41rbgyfqgcha1gpsisnl0ybdmdqr4ylr43f61dpgvd"; depends=[lpSolveAPI]; };
   safer = derive2 { name="safer"; version="0.2.0"; sha256="0659xn8jzd5md2mm71p4036ljrfvlhkfshsgidx7l2k9ig532059"; depends=[assertthat base64enc sodium]; };
   safi = derive2 { name="safi"; version="1.0"; sha256="1km58w57kdmyfj4a97zhnjcka4q4pxm8r2br01qq2niaihpbzp98"; depends=[]; };
+  salesforcer = derive2 { name="salesforcer"; version="0.1.2"; sha256="02a4xzwphy5zfkd0qza6cm2n7dpf71bmc6r78gj17w4amrp3k5y5"; depends=[dplyr httr jsonlite lubridate purrr readr XML xml2]; };
   samon = derive2 { name="samon"; version="4.0.0"; sha256="0pvv93ahh0i69ncc3sic9481wd5rv5dfxysxyzkl61ds3yvrr09v"; depends=[]; };
   sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; };
   sampleSelection = derive2 { name="sampleSelection"; version="1.2-0"; sha256="1s3p5fvvxkjkm6vjpxi3rw8ncbmyvqpfb0gghcvf2sspdyzam1s2"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; };
@@ -10589,11 +10802,11 @@ in with self; {
   sbgcop = derive2 { name="sbgcop"; version="0.975"; sha256="0f47mvwbsym4khwgl0ic3pqkw3jwdah9a48qi3q93d46p2xich61"; depends=[]; };
   sbioPN = derive2 { name="sbioPN"; version="1.1.0"; sha256="0yvg55xnkhm35hfl7rldy2grb26hm4a68jr4x9n45fs7hhdylxri"; depends=[]; };
   sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; };
-  sbpiper = derive2 { name="sbpiper"; version="1.5.0"; sha256="0ighjp1934y3f6myl60fjxman7333yi9fnhhk3d5xgazsfb8bnnp"; depends=[colorRamps data_table ggplot2 Hmisc reshape2 scales stringr]; };
+  sbpiper = derive2 { name="sbpiper"; version="1.6.0"; sha256="00i6wp893rsmm688si3yja7bphmz6ixidhchg2j2h50cfik9q18h"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; };
   sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; };
   sbtools = derive2 { name="sbtools"; version="1.1.6"; sha256="1wvd7xbkfyx88bi1vz30c6jb20fgsrcgpvkw4g4ym0966vhv1ca1"; depends=[curl httr jsonlite stringr]; };
   scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; };
-  scagnostics = derive2 { name="scagnostics"; version="0.2-4"; sha256="0fhc7d2nfhm8w6s6z1ls6i8d7c90h4q7rb92rz8pgq3xh031hpcf"; depends=[rJava]; };
+  scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; };
   scaleboot = derive2 { name="scaleboot"; version="0.3-4"; sha256="16shdj4b8pbdbphqzw7r5xzx6k2qfkr729inv21gkp9qcp4h0vrm"; depends=[mvtnorm pvclust]; };
   scales = derive2 { name="scales"; version="0.5.0"; sha256="0zg9wfzmsdjxpbld0nzv7hcpq5r0wazqxmn7grvvif2agj0w1z6v"; depends=[dichromat labeling munsell plyr R6 RColorBrewer Rcpp viridisLite]; };
   scalpel = derive2 { name="scalpel"; version="1.0.0"; sha256="0zk81q2f49vrbprlvjq3q4s2ak7rrlpj55rrfkqr8nq1vvi6nxd2"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; };
@@ -10605,8 +10818,8 @@ in with self; {
   scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; };
   scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; };
   scatterD3 = derive2 { name="scatterD3"; version="0.8.2"; sha256="1cfh060ffwxy33b1f7n8mba1sbbwgx28mqn08im16dqbphkcmx1z"; depends=[digest ellipse htmlwidgets]; };
-  scatterpie = derive2 { name="scatterpie"; version="0.0.8"; sha256="1dfwz83hxdms7qglsz540wszzcd5hfmjzw440c93jgi18n6kx9s4"; depends=[ggforce ggplot2 tidyr]; };
-  scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-40"; sha256="0ababcj87kx7860mica9y2ydlhskxmgj9n46crx036cila512jc2"; depends=[]; };
+  scatterpie = derive2 { name="scatterpie"; version="0.1.0"; sha256="0ssfvnwwfyavzxxrbimb623pc0y72qvbis16sdr6fxvyfif4qmm5"; depends=[ggforce ggplot2 rlang tidyr]; };
+  scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; };
   scclust = derive2 { name="scclust"; version="0.1.1"; sha256="1bml4qyyspwaqxzwjhqy8i450614p3f3dj0s0qdkv6psa60h0w5z"; depends=[distances]; };
   scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; };
   scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; };
@@ -10623,7 +10836,7 @@ in with self; {
   sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; };
   scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; };
   score = derive2 { name="score"; version="1.0.2"; sha256="1p289k1vmc7qg70rv15x05dyb92r7s6315whr1ibi40sqln62a5s"; depends=[msm]; };
-  scorecard = derive2 { name="scorecard"; version="0.1.5"; sha256="1cf4cmn3csbv1l3nnr3873vszp7xb5v4864g072mwzg7xr1maj4w"; depends=[data_table ggplot2 gridExtra]; };
+  scorecard = derive2 { name="scorecard"; version="0.1.6"; sha256="1k5vcjd574i493wazckyg6a0b4pf9b833rqppq444lwvkag7qn2q"; depends=[data_table doParallel foreach ggplot2 gridExtra]; };
   scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; };
   scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; };
   scoringRules = derive2 { name="scoringRules"; version="0.9.4"; sha256="0m8050qqb3j0miwfbadp6lmd2q5vicsqn4waw4jszz52fhb8mv27"; depends=[MASS Rcpp RcppArmadillo]; };
@@ -10632,6 +10845,7 @@ in with self; {
   scraEP = derive2 { name="scraEP"; version="1.0"; sha256="1pmab2nhymb7vjfg7vysqn2cs9apdkwxgi55qn8kjg2g5r0098p7"; depends=[RCurl XML]; };
   scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; };
   scrime = derive2 { name="scrime"; version="1.3.3"; sha256="1vp7ai10m0f3s0hywyqh0yllxj6z6p795zqpr6vp58fh6yq20x73"; depends=[]; };
+  scriptName = derive2 { name="scriptName"; version="1.0.0"; sha256="0jpr9x5hf45cik5zxqw0j3vkvbk04a7ck2crvb2472hrv7s9al55"; depends=[purrr rlang]; };
   scriptests = derive2 { name="scriptests"; version="1.0-16"; sha256="11l145gvzkxqwbzw976rq94krly1p4lahqw051dwaacarq4hnrdg"; depends=[]; };
   scriptexec = derive2 { name="scriptexec"; version="0.2.1"; sha256="09gaccqadb51ia66xk9vi3p9472s82bg6v8i6ba390g04yipbipi"; depends=[]; };
   scrm = derive2 { name="scrm"; version="1.7.2-1"; sha256="123rxx1a13fbv975hp9f9rjcigp8vfai7679wbn9dlyvph5nivaz"; depends=[Rcpp]; };
@@ -10640,8 +10854,8 @@ in with self; {
   scuba = derive2 { name="scuba"; version="1.9-1"; sha256="1b92b6p9dn54rmcaw2ng41pvvvkmrzgg12d6zcr3yh8qgi89pvdi"; depends=[]; };
   sdPrior = derive2 { name="sdPrior"; version="0.3"; sha256="0d3w75p3r2h07xhp7fj4si1y4sav8vs0lq6h2h4fn4f2inn3l0vl"; depends=[caTools GB2 MASS]; };
   sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; };
-  sdat = derive2 { name="sdat"; version="1.0"; sha256="1rp2s3y44f3vj0p16j1k2rrs44kmnzy9k0lpcm9ga801nbv93saz"; depends=[]; };
-  sdcMicro = derive2 { name="sdcMicro"; version="5.1.0"; sha256="06rnnm5g7rpbbxgdb9sl7gkcimdbx1qmgzg5d2n0jl4b81jac2n2"; depends=[car cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; };
+  sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; };
+  sdcMicro = derive2 { name="sdcMicro"; version="5.2.0"; sha256="1kfws4y59x7blvv8ix1xvwi92ccfsjnjlifs89jj18wjlb2khjsw"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase sets shiny shinyBS VIM xtable]; };
   sdcTable = derive2 { name="sdcTable"; version="0.22.8"; sha256="134a0g1v5w9airckn1bqp4k7hv2dcl5kmb1hx78nw5s8h92y3gkc"; depends=[data_table lpSolveAPI Rcpp Rglpk slam stringr]; };
   sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; };
   sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; };
@@ -10659,6 +10873,7 @@ in with self; {
   seaaroundus = derive2 { name="seaaroundus"; version="1.2.0"; sha256="09nyypzylb0y04ssd9ak2cw8wpy6a3nmabg9p7jrc8qz54wl6z4q"; depends=[crul ggplot2 jsonlite maps rgdal scales sp wicket]; };
   seacarb = derive2 { name="seacarb"; version="3.2.6"; sha256="1036hrmgv7xn0khddbfdg0p9d4hmhhxxb3fd7fysjmzlk7k7naqb"; depends=[gsw oce]; };
   sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; };
+  sealr = derive2 { name="sealr"; version="0.1.0"; sha256="1ky0m120bf4mmb0c99ywrzr2jjx3cljscf9vnsnp54rkabh1q2mm"; depends=[clipr clisymbols digest dplyr glue magrittr purrr rlang rstudioapi styler tibble tidyr]; };
   searchConsoleR = derive2 { name="searchConsoleR"; version="0.3.0"; sha256="1z8bdlxq2sk8bcg164wy0yrmsx0inf0aj5ya2pybvadss8wr0qlr"; depends=[googleAuthR stringr]; };
   searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; };
   searcher = derive2 { name="searcher"; version="0.0.2"; sha256="0lj7zyqldr8m7ky20frzaxmf9by2h3p89ibwsa7dyrf378swkwwj"; depends=[]; };
@@ -10681,6 +10896,7 @@ in with self; {
   segclust2d = derive2 { name="segclust2d"; version="0.1.0"; sha256="0kymw36cvakx84c96npkbnsvv0a1s82773ib5c802ybvkb2r1k9p"; depends=[dplyr ggplot2 magrittr plyr RColorBrewer Rcpp RcppArmadillo reshape2 scales zoo]; };
   segmag = derive2 { name="segmag"; version="1.2.4"; sha256="1i717xg1z7s35pkwzywgjf9wx7zj9xksv0k87h7p1q62y073qbqm"; depends=[plyr Rcpp]; };
   segmented = derive2 { name="segmented"; version="0.5-3.0"; sha256="0nrik5fyq59hwiwjcpbi4p5yfavgfjq6wyrynhkrbm4k6v1g1wlq"; depends=[]; };
+  segregation = derive2 { name="segregation"; version="0.0.1"; sha256="0avapyr8h0c4hl0xchazr5gig9857y25xx4js788liy679iczwf7"; depends=[data_table]; };
   seismic = derive2 { name="seismic"; version="1.0"; sha256="02d11c3filzghi8cvryikaidmk40d4z3qxsqs7bjdhxyf814caw8"; depends=[]; };
   seismicRoll = derive2 { name="seismicRoll"; version="1.1.2"; sha256="183lx9lgmi06lv1l4gbmlmblfgjzhph4aavdnxrykpp6122hsq61"; depends=[Rcpp]; };
   sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; };
@@ -10689,7 +10905,7 @@ in with self; {
   selection = derive2 { name="selection"; version="1.0"; sha256="1w2mzb16frcbh55icc5g8ai3hri9j6dhp7h0kc96iaspphnfw4n8"; depends=[fifer norm]; };
   selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; };
   selectiveInference = derive2 { name="selectiveInference"; version="1.2.4"; sha256="1k7lnf6fplnxp3giwinldg9g5spi21infln21k413dv3wkksk71f"; depends=[glmnet intervals survival]; };
-  selectr = derive2 { name="selectr"; version="0.3-2"; sha256="0kdrj64rqg4z6hg92y9r2h602a2i73r5rnlpg23ys33d5d32n8jy"; depends=[stringr]; };
+  selectr = derive2 { name="selectr"; version="0.4-1"; sha256="1jp27rxks4w29l47k42869hp8hnkzq2rnvsqbr44wd19fqb2zm4b"; depends=[R6 stringr]; };
   selectspm = derive2 { name="selectspm"; version="0.2"; sha256="0wvhlzhl0janhms107xczmilpmr4y26jgk0ag3g34iqba7fbnfqd"; depends=[ecespa spatstat]; };
   seleniumPipes = derive2 { name="seleniumPipes"; version="0.3.7"; sha256="1krpzh2gy3yl07c2n1d8q21xjc2qcv5ac1kv7212710bxkdyfad6"; depends=[httr jsonlite magrittr whisker xml2]; };
   selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; };
@@ -10698,6 +10914,7 @@ in with self; {
   semGOF = derive2 { name="semGOF"; version="0.2-0"; sha256="1lsv72yaza80jqadmah7v2cpfqfay57y12hcz6brvia6bmr5qagb"; depends=[MASS matrixcalc sem]; };
   semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; };
   semPlot = derive2 { name="semPlot"; version="1.1"; sha256="0fzz580an7mmq6vycxbcvfdqbii0qz0nghlidb6in05j8dppsnsn"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph rockchalk sem semTools XML]; };
+  semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; };
   semTools = derive2 { name="semTools"; version="0.4-14"; sha256="1j1chman14i908c009lf0jgdmrrb8avgp8nif1i9wlj6vgif890c"; depends=[lavaan]; };
   semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; };
   semds = derive2 { name="semds"; version="0.9-2"; sha256="0ig8b7ii1c8av0il904b71lzr8lqdiibwf16yj5dp8n4xc80bryh"; depends=[minpack_lm pracma]; };
@@ -10722,10 +10939,10 @@ in with self; {
   sensory = derive2 { name="sensory"; version="1.1"; sha256="1zd0ajrymxi6gygcq9fqgwgy0g6c3cqz53x0k5m0ihbmh11rc7s7"; depends=[gtools MASS Matrix]; };
   senstrat = derive2 { name="senstrat"; version="1.0.3"; sha256="0j6mb55v5ivqvk8nn8fjlzrbdgj6csa58yc6gy1g07m7gk2qz2np"; depends=[BiasedUrn MASS]; };
   sentimentr = derive2 { name="sentimentr"; version="2.2.3"; sha256="0f9hwiyja9cgig0ja9miqzsfwpn25bfa8xrwfm34v1n2l3v2gbxv"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; };
-  sentometrics = derive2 { name="sentometrics"; version="0.2"; sha256="0pndbas1xya2pnriil94r0pp6zjd44flhsqimdgmi7w5k87wlabf"; depends=[abind caret data_table foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll sentimentr stringi zoo]; };
+  sentometrics = derive2 { name="sentometrics"; version="0.3.5"; sha256="0628vnv3wga21z5dvhxs3alj194s43xgaasifpbfm2gmfzma6lb4"; depends=[abind caret data_table foreach ggplot2 ggthemes glmnet ISOweek MCS quanteda Rcpp RcppArmadillo RcppRoll stringi zoo]; };
   seoR = derive2 { name="seoR"; version="0.1.0"; sha256="0aa74a9vi176ap4ap44sjm8lm3025dss067sm5lgc4b73a6ph75p"; depends=[digest dplyr httr igraph jsonlite RCurl readr robotstxt rvest stringr XML xml2]; };
   separationplot = derive2 { name="separationplot"; version="1.1"; sha256="0qfkrk8n6jj8l7ywngwsaikfwmd9hbrpr43x0l9wkjjp1asgs5l6"; depends=[]; };
-  seplyr = derive2 { name="seplyr"; version="0.5.4"; sha256="1ha3cxz5wql9bsw4japc5kj2c42mkk0g1yb141hpxpqq1c416gd1"; depends=[DBI dbplyr dplyr rlang RSQLite wrapr]; };
+  seplyr = derive2 { name="seplyr"; version="0.5.5"; sha256="1hb0df1mlqv8fivdnqg5lw7gj92hscrxw122isgixkqm74n0vc5y"; depends=[dplyr rlang wrapr]; };
   seqCBS = derive2 { name="seqCBS"; version="1.2"; sha256="1kywi3kvvl9y6nm7cwf6fj8gz9gzznp5va336g1akzgy77k82d8v"; depends=[clue]; };
   seqDesign = derive2 { name="seqDesign"; version="1.1"; sha256="1694swd8ik9fbiflmnw4xpq82kq18rqzkw0dv5pvq30c47xjgamv"; depends=[survival xtable]; };
   seqHMM = derive2 { name="seqHMM"; version="1.0.8"; sha256="1zr70ym32isav13wsb7zv4gv3bn04qi0dn5k0fqjbdcw36m5hfi8"; depends=[gridBase igraph Matrix nloptr numDeriv Rcpp RcppArmadillo TraMineR]; };
@@ -10738,13 +10955,13 @@ in with self; {
   seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; };
   sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; };
   sequenza = derive2 { name="sequenza"; version="2.1.2"; sha256="0f3aj96qvbr1wqimlv6rxg0v34zlrgc6pbdy7sfkwfzs1n44q1xf"; depends=[copynumber squash]; };
-  sequoia = derive2 { name="sequoia"; version="0.9.3"; sha256="1lxq88bw5fbm2afdh79fs363dvb1c2jsz02dc6c0ndwkwch04igc"; depends=[plyr]; };
+  sequoia = derive2 { name="sequoia"; version="1.0.2"; sha256="1pn282s40ssprjrfh5drjr123ldlp84z3kviv6mmavrwhkp5lq5g"; depends=[plyr]; };
   sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; };
   serial = derive2 { name="serial"; version="1.3"; sha256="1ibwd8xmkd0pwdhivm6h3yd3rsi28mai5n7qcs1bq2mx8hb5lg7f"; depends=[]; };
   seriation = derive2 { name="seriation"; version="1.2-3"; sha256="1q6hw4hjw224b4y0dc0j630v2pgj6sn455nwkilb70w8k31hpk92"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; };
   seroincidence = derive2 { name="seroincidence"; version="1.0.5"; sha256="07lphrp7r3i87633q8g6svk2mxbsvq4blrf8gnm0p99hkmz8wgg9"; depends=[]; };
   serrsBayes = derive2 { name="serrsBayes"; version="0.3-12"; sha256="137pm5s7w6fxaalyc7hzvdkg7rayjhqw2dnb2q8q9ijp0v9wx7mr"; depends=[MASS Matrix Rcpp RcppEigen truncnorm]; };
-  servr = derive2 { name="servr"; version="0.8"; sha256="05pz4ychqp4cqywcdavdi8jj3y09gmam097d2idjnlcg9x61h2s9"; depends=[httpuv jsonlite mime]; };
+  servr = derive2 { name="servr"; version="0.9"; sha256="0bs0i5mjfzxfshqz8i30nhn7kvgwly4fqn5bfq6dqfdrn7biai2x"; depends=[httpuv jsonlite mime xfun]; };
   sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; };
   session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; };
   sessioninfo = derive2 { name="sessioninfo"; version="1.0.0"; sha256="00g3lbvk1cjjzckl70fn5n3579qb301im4lbm3cip5c2v8k283dk"; depends=[clisymbols withr]; };
@@ -10753,11 +10970,11 @@ in with self; {
   setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; };
   settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; };
   severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; };
-  sf = derive2 { name="sf"; version="0.6-0"; sha256="0g6ghmjpxvlpi2sgvcxb6dx74pl7nc70cr8lgslrnv0fhnjr49jk"; depends=[classInt DBI magrittr pillar Rcpp units]; };
+  sf = derive2 { name="sf"; version="0.6-1"; sha256="1hqsjbbasqb8vxswl7cwwjgvjiki71yb8fr301lzfxagkanys790"; depends=[classInt DBI magrittr Rcpp units]; };
   sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; };
   sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; };
   sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; };
-  sfdct = derive2 { name="sfdct"; version="0.0.5"; sha256="02di504pcv423wk40ap8k18b2q759x8f5wsp8kkbwks54j42s69a"; depends=[dplyr RTriangle sf sp tibble]; };
+  sfdct = derive2 { name="sfdct"; version="0.0.6"; sha256="0ilh89mfwp1yqn44yn80vz1a6g65hryk6w87ngzvak3pd6jxq6aa"; depends=[dplyr RTriangle sf sp tibble]; };
   sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; };
   sfsmisc = derive2 { name="sfsmisc"; version="1.1-2"; sha256="0cgq2h11ngkzd6p34k6mqjnvlvc5vj4lnqrl64k05lb391j391w0"; depends=[]; };
   sft = derive2 { name="sft"; version="2.2-0"; sha256="0d1yiimc899i09yyrv1x40ixqss87xjpy08ab16h9faxd4bsk3y2"; depends=[fda SuppDists]; };
@@ -10765,11 +10982,10 @@ in with self; {
   sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; };
   sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; };
   sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; };
-  sglOptim = derive2 { name="sglOptim"; version="1.3.6"; sha256="0gzhzfi5q9hgqgzagfdzi4cswpmwic9ggf72qi6axl1hixgmgp0w"; depends=[BH doParallel foreach Matrix Rcpp RcppArmadillo RcppProgress]; };
   sglasso = derive2 { name="sglasso"; version="1.2.2"; sha256="1yk9wvg98a2l9kdaksy75av9z9iz27v5d2zpsqhabqwkwfh6wkad"; depends=[igraph Matrix]; };
-  sglg = derive2 { name="sglg"; version="0.1.2"; sha256="0wqjw466j3j5ipjgp18978g7fwb2fvzxhfv2bp4dqdazmxrjyyqm"; depends=[Formula robustloggamma ssym survival]; };
+  sglg = derive2 { name="sglg"; version="0.1.3"; sha256="17w9mfb53ll8aqasl4ysnb0b7sk6cgp7s1cfvn07rg5win2swqrj"; depends=[Formula robustloggamma ssym survival]; };
   sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; };
-  sgmcmc = derive2 { name="sgmcmc"; version="0.2.1"; sha256="13wgc6rd6knmcw8nj12j43qqjsipxf702a4cycsnn9z7jlaxzszh"; depends=[tensorflow]; };
+  sgmcmc = derive2 { name="sgmcmc"; version="0.2.2"; sha256="1ga3dynhldkl98fd7fzbbhb4bryf6nyijwvxsj8i1szy4jsv8q3q"; depends=[tensorflow]; };
   sgof = derive2 { name="sgof"; version="2.3"; sha256="12bpyvg5df1m2ar6frpi10zlj3dk9h61r13rzn3w5a3nyk8gljsg"; depends=[poibin]; };
   sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; };
   sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; };
@@ -10785,29 +11001,30 @@ in with self; {
   sharpr2 = derive2 { name="sharpr2"; version="1.0.0.0"; sha256="018xzpl9h07cddpmr2bxm9iz50ky0ja12kybjil7ipjfn0kxavyr"; depends=[mvtnorm]; };
   sharpshootR = derive2 { name="sharpshootR"; version="1.0"; sha256="1x9cava7b9lg8qpmjqlbkqmpc9a2dn8k4kl71s4himr4wzp9z4y3"; depends=[ape aqp circular cluster digest Hmisc igraph lattice latticeExtra plyr RColorBrewer reshape2 scales soilDB sp vegan]; };
   sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; };
-  shazam = derive2 { name="shazam"; version="0.1.8"; sha256="0j953zf0wigr645a52088ajrchhr7xlf891hybbx8pvspj240f3y"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; };
+  shazam = derive2 { name="shazam"; version="0.1.9"; sha256="1dm553l1qwqajy5p13x3ms6x45ax33zh7b79iw6xx1chbrpalhmk"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress scales SDMTools seqinr stringi tidyr]; };
   shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; };
   shiftR = derive2 { name="shiftR"; version="1.4"; sha256="12mb4b5zhiq7hfkpc9hgi004hqli1kkkzdy2169svwrjv7bfifrn"; depends=[]; };
   shiny = derive2 { name="shiny"; version="1.0.5"; sha256="0hps6nlyffh685smsm9sd0rdmip0y8v7hgv6a4hqlq7kf8zmzqi0"; depends=[digest htmltools httpuv jsonlite mime R6 sourcetools xtable]; };
-  shiny_semantic = derive2 { name="shiny.semantic"; version="0.1.1"; sha256="0jd00z817cccz3wfhcmz61wsy5fjw6yyan2ywkf06xqcdpnr8iwh"; depends=[htmltools htmlwidgets purrr shiny]; };
+  shiny_semantic = derive2 { name="shiny.semantic"; version="0.1.2"; sha256="0zvd37z4d2vx2h2ypmbzbaxa617dpwdzhp3rwd6yak0avfv5h7a0"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; };
   shinyAce = derive2 { name="shinyAce"; version="0.2.1"; sha256="0ycka8rsw0178q9klfid97vdn5cbyx3r778nis5s3dqipdyazdm9"; depends=[shiny]; };
   shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; };
   shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; };
-  shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.3"; sha256="1ikxwa02jpkir1xxx4lvz995ggx8032vl0zknmhccb2mn1k98b4i"; depends=[digest shiny]; };
+  shinyFeedback = derive2 { name="shinyFeedback"; version="0.0.4"; sha256="14lvr99nfldlr101ysmpwz0zw0bjvr6b7lfm0msx57ymh6gjzg3n"; depends=[digest shiny]; };
   shinyFiles = derive2 { name="shinyFiles"; version="0.6.2"; sha256="1lphzqbzg482lv0xiamfv28n5nyjppss9zzcpx1cd5fsz0xg1282"; depends=[htmltools RJSONIO shiny]; };
   shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; };
   shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; };
-  shinyLP = derive2 { name="shinyLP"; version="1.1.0"; sha256="08vc35988pv0kx0kvdl26nkdzcgmi6w4xffmyylan7x59519imkk"; depends=[shiny shinyBS shinythemes]; };
+  shinyLP = derive2 { name="shinyLP"; version="1.1.1"; sha256="099ca86wvjfi3ld6fnvxk65rnxr5yji28il2f9xhacmhksn3db3l"; depends=[shiny]; };
   shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; };
   shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; };
   shinyTime = derive2 { name="shinyTime"; version="0.2.1"; sha256="0gpa6kypchvvlq71nnlilciclcrhaa488prjz46sddrsxjy09mp7"; depends=[htmltools shiny]; };
   shinyTree = derive2 { name="shinyTree"; version="0.2.2"; sha256="08n2s6pppbxn23ijp6vms609p4qwlmfh9g0k5hdfqsqxjrz1nndi"; depends=[shiny]; };
-  shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.1"; sha256="11qwwz4il4n8ha587bc32n1z5pnhw4vv2ffxl9cc1i431k01p7yc"; depends=[htmltools jsonlite shiny]; };
+  shinyWidgets = derive2 { name="shinyWidgets"; version="0.4.2"; sha256="0y23p9wirrp3d9zb8cfdizsg8ijgm2sxhvhfl06yq8i1wnr8yif5"; depends=[htmltools jsonlite shiny]; };
   shinyaframe = derive2 { name="shinyaframe"; version="1.0.1"; sha256="1flhgsm4q7p5acb41v73pf8ni92y9dwdppxjb9czlz1sxwf03p1s"; depends=[htmltools htmlwidgets shiny]; };
   shinyalert = derive2 { name="shinyalert"; version="1.0"; sha256="0ngmpbzw6fw1gs6sv9m3xv2c9bmrxg0bs6lnvxn8hm8cwr4440xi"; depends=[digest shiny]; };
   shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; };
   shinycssloaders = derive2 { name="shinycssloaders"; version="0.2.0"; sha256="1bpzsm7m7c366sjl1qndp4m5dg2vlm68rjgdy9n1ija9xbp0r2g4"; depends=[digest glue shiny]; };
-  shinydashboard = derive2 { name="shinydashboard"; version="0.6.1"; sha256="14zi7g5wrngy6lwi9xpvaid7727m6rfdijbb89al9likfhjqzqqy"; depends=[htmltools shiny]; };
+  shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; };
+  shinydashboard = derive2 { name="shinydashboard"; version="0.7.0"; sha256="10yqcqqcxgfqwkmscqwvvgr710im583qsqnsqkfpisjvkqp10yqb"; depends=[htmltools shiny]; };
   shinyjqui = derive2 { name="shinyjqui"; version="0.2.0"; sha256="07ijd5psywlkfrz54d4q68bwij1as4ai0360fya8ikngkwg393mj"; depends=[htmlwidgets jsonlite shiny]; };
   shinyjs = derive2 { name="shinyjs"; version="1.0"; sha256="113zpijri0l80rlgrvqn6bxk0sdqgl79h7yhja2p76f9dc9i2sr8"; depends=[digest htmltools jsonlite shiny]; };
   shinymaterial = derive2 { name="shinymaterial"; version="0.5.2"; sha256="1xdvk8icnzc156bdn6782qgj1dgzc8v22b8qhfnxabxxgpap5nm9"; depends=[shiny]; };
@@ -10820,9 +11037,10 @@ in with self; {
   showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; };
   showtext = derive2 { name="showtext"; version="0.5-1"; sha256="0zb9h6frw580cql0nbkvfb0jajq6k4yhqaifvz8cpysd32dk35wm"; depends=[showtextdb sysfonts]; };
   showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; };
-  shp2graph = derive2 { name="shp2graph"; version="0-3"; sha256="0mfb3f64kpd23qa1yb19j7j234snls7yvszp2yxnv9yahk0blifw"; depends=[igraph maptools sp]; };
+  shp2graph = derive2 { name="shp2graph"; version="0-4"; sha256="13hpj2yjai3yf8q6dnhpdqzsw4nkdpi06fxxdgn82ycx0sp7zk4v"; depends=[igraph maptools sp]; };
   shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; };
   shuffle = derive2 { name="shuffle"; version="1.0.1"; sha256="0aqb11h340picx7z2jg3k46l3pr6fkknlpyzc0z89hhrc90pss48"; depends=[]; };
+  shuffleCI = derive2 { name="shuffleCI"; version="0.1.0"; sha256="1n9k28m1fcnw1my9a7v0gy9waygd48lab45vj9k2wwijbc325zai"; depends=[plotrix]; };
   siRSM = derive2 { name="siRSM"; version="1.1"; sha256="0fx6bfb5c8hdlgjxddwhhzr09ls53kfgn36hjk9zi5z8m14a7wbn"; depends=[doSNOW foreach MASS rsm]; };
   siar = derive2 { name="siar"; version="4.2"; sha256="1c4z72jr81dzkp9xqyrrkwjsalvvksl67pnbaadkc52v84fhzx3r"; depends=[bayesm coda hdrcde MASS mnormt spatstat]; };
   sicegar = derive2 { name="sicegar"; version="0.2.2"; sha256="0fnr0wv8zbhs2i5y1kqyvhm0kzisc68ys3iy0wxwbdj3bnfgzj70"; depends=[dplyr fBasics ggplot2 minpack_lm]; };
@@ -10831,7 +11049,7 @@ in with self; {
   sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; };
   sievetest = derive2 { name="sievetest"; version="1.2.2"; sha256="0mbgkf014m6bc7qg60vf065i6mvl5n4a0bvg8vb7dw531vsw2771"; depends=[]; };
   sig = derive2 { name="sig"; version="0.0-5"; sha256="084wwpj5mnmq4k98ijbv23z80sj4axadc7c6hn3917dazsaa6ngn"; depends=[]; };
-  sigQC = derive2 { name="sigQC"; version="0.1.12"; sha256="1m7vywpmrwlldgdg9d8vjlfxkdnhcaz3w5vbkyljd9qfsqbwaipz"; depends=[biclust class cluster ComplexHeatmap fmsb gplots gridGraphics KernSmooth lattice MASS mclust moments nnet RankProd]; };
+  sigQC = derive2 { name="sigQC"; version="0.1.14"; sha256="17vgfpkbn8g3bgfxmy5wvpjkzizpzqjw5xijmzpi627ba9g8lrwh"; depends=[biclust class cluster ComplexHeatmap fmsb gplots gridGraphics KernSmooth lattice MASS mclust moments nnet RankProd]; };
   sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; };
   sigloc = derive2 { name="sigloc"; version="0.0.4"; sha256="13v2dlgsbcsqqm8yxls62i7r3sk8m3c78jv8f9lgdihq5pjnd9zp"; depends=[ellipse nleqslv]; };
   sigmaNet = derive2 { name="sigmaNet"; version="1.0.3"; sha256="0b9p5kgcbpzb83s0vgmfwmh15lvsfz5q0yk5wl16rxyiqqg2nxag"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; };
@@ -10840,7 +11058,7 @@ in with self; {
   signalHsmm = derive2 { name="signalHsmm"; version="1.4"; sha256="1plyvx0pdid4zydxjwph6v96c8ilzgn55vcdszkslp3a4s2sns65"; depends=[Rcpp seqinr shiny]; };
   signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; };
   sigora = derive2 { name="sigora"; version="2.0.1"; sha256="1sgjafr2f7carwnvp0vsvp80jn2bzwlkay38ch63qk9gapsh4imh"; depends=[]; };
-  sigr = derive2 { name="sigr"; version="0.2.3"; sha256="1kyj8xizswwg5agv4ac296pqvxxq3kla537z10qvg16ilskbqny5"; depends=[pwr]; };
+  sigr = derive2 { name="sigr"; version="0.2.4"; sha256="11dxv99yibp6cj3jg8qmy8r4csr2lyww6zrdy4a2zgmrzl02fhlc"; depends=[pwr]; };
   siland = derive2 { name="siland"; version="1.0"; sha256="0zqwslg0vak22q475azwank81wr4kfx33h21w84lsg7iihrb08nv"; depends=[lme4 raster rgdal sp]; };
   sim1000G = derive2 { name="sim1000G"; version="1.39"; sha256="1qxl7lsdsd4skn6x8iw7jx60ly0rwsj27yh5yiqmhxa34jpyjg0m"; depends=[hapsim MASS readr stringr]; };
   simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; };
@@ -10850,9 +11068,9 @@ in with self; {
   simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; };
   simPATHy = derive2 { name="simPATHy"; version="0.2"; sha256="0ai5wmjz8k0glbwkclgg3m3ncsjghja4iys2mn1psn3r8gxk79yc"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; };
   simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; };
-  simPop = derive2 { name="simPop"; version="1.0.0"; sha256="1197gfpikrb02s7jgvpxzp19bbjdpzsik8ngh77k2fa76gzs4p6c"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp vcd VIM]; };
+  simPop = derive2 { name="simPop"; version="1.1.0"; sha256="0zaf12lzca73nn0jy1gikzzwrsg046sgsfn9ck65jzdwh9xj9020"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; };
   simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; };
-  simTool = derive2 { name="simTool"; version="1.0.3"; sha256="1x018p5mssrhz2ghs3ly9wss12503h93gl7zk0mqh1bcrzximh0k"; depends=[plyr reshape]; };
+  simTool = derive2 { name="simTool"; version="1.1.0"; sha256="121nv0s14jzxgcmj2fsj1k0msziknwbix2a49f7igic2l8yv869p"; depends=[dplyr plyr purrr reshape tibble tidyr]; };
   simba = derive2 { name="simba"; version="0.3-5"; sha256="14kqxqavacckl5s1518iiwzrmlgbxz1lxy33y8c9qq7xaln41g9h"; depends=[vegan]; };
   simboot = derive2 { name="simboot"; version="0.2-6"; sha256="0bgibrqb9j62p1chldi1lvdsgc6sgsr7afyq4lvyrc2h861f3j9d"; depends=[boot mvtnorm]; };
   simcausal = derive2 { name="simcausal"; version="0.5.4"; sha256="19mqabxqz2mvfhslbln5vsnlrnmgcfmgp7ypf5k2yd03755b0k4b"; depends=[assertthat data_table igraph Matrix R6 stringr]; };
@@ -10888,7 +11106,7 @@ in with self; {
   sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; };
   siplab = derive2 { name="siplab"; version="1.2"; sha256="0r7gk9qsmbc3ln67cb8p87bq3s2rx6fbavlly1fpzqqv2isf5pq9"; depends=[spatstat]; };
   sirad = derive2 { name="sirad"; version="2.3-3"; sha256="0vhmk2fmq4797gj6c8803zw1ipmdxfvdfgi2bygzxbn5bqd4da2n"; depends=[raster zoo]; };
-  sirt = derive2 { name="sirt"; version="2.4-20"; sha256="0kgy5jv6yz6hlx4c8mbb4fgqfb8ihslmaxqxlr8qpqh79fvgv2q6"; depends=[CDM coda lavaan lavaan_survey mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; };
+  sirt = derive2 { name="sirt"; version="2.6-9"; sha256="06iz4dxlsxdfgmn52pyiyng0bbxffc5b7sszwbzq5i64ad1j0d48"; depends=[CDM coda lavaan lavaan_survey MASS mirt mvtnorm Rcpp RcppArmadillo sfsmisc survey TAM]; };
   sisVIVE = derive2 { name="sisVIVE"; version="1.4"; sha256="1vh53irxgk8ahw52cdqbbm89dvmzyf54izg4lm8a3v92k5p6nzwz"; depends=[lars]; };
   sisal = derive2 { name="sisal"; version="0.46"; sha256="00szc3l69i0cksxmd0lyrs4p6plf05sl4vxs3nl4gkbja5y4lvpc"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; };
   sisus = derive2 { name="sisus"; version="3.9-13"; sha256="0lz9ww07dvdx6l3k5san8gwq09hycc3mqwpgzmr2ya9z8y27zadr"; depends=[coda gdata gtools MASS moments polyapost rcdd RColorBrewer]; };
@@ -10902,18 +11120,18 @@ in with self; {
   sjPlot = derive2 { name="sjPlot"; version="2.4.1"; sha256="0aazxrqsbp5jsd5yfm6hrx17rmlqbh5vs314xms7g620aj383zrh"; depends=[arm broom dplyr effects forcats ggeffects ggplot2 glmmTMB knitr lme4 magrittr MASS merTools modelr nlme psych purrr rlang scales sjlabelled sjmisc sjstats tibble tidyr tidyselect]; };
   sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; };
   sjlabelled = derive2 { name="sjlabelled"; version="1.0.8"; sha256="1hhcv5d5jbrd9wv9hdvck40wdpr4nr6hr972ng5w2wbh7bikvgqg"; depends=[broom dplyr haven magrittr prediction purrr rlang snakecase tibble]; };
-  sjmisc = derive2 { name="sjmisc"; version="2.7.0"; sha256="1bni8ppvabzjx94hd8ygp14n2g6a8qhjvnimm0v7pqbf7czmpapy"; depends=[broom cli crayon dplyr haven magrittr pillar psych purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; };
-  sjstats = derive2 { name="sjstats"; version="0.14.1"; sha256="10siniyy1nqsacayyl7p35yc9gmdh5rjlwzv8aywid2a1ld13lfs"; depends=[bayesplot broom cli coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; };
+  sjmisc = derive2 { name="sjmisc"; version="2.7.1"; sha256="0vj0b3vn3mkqw23x2rnrn468db44x6wvphbqlap5n7c7dzg8hg22"; depends=[broom cli crayon dplyr haven magrittr pillar psych purrr rlang sjlabelled stringdist stringr tibble tidyr tidyselect]; };
+  sjstats = derive2 { name="sjstats"; version="0.14.2-3"; sha256="0wqnyf1wpbq0av3027x455jcha7w8kg9lb62rjm5fkz52ff93hpx"; depends=[bayesplot broom coin crayon dplyr emmeans glmmTMB lme4 lmtest magrittr MASS Matrix modelr nlme prediction purrr pwr rlang sandwich sjlabelled sjmisc tibble tidyr tidyselect]; };
   skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; };
   skeleSim = derive2 { name="skeleSim"; version="0.9.8"; sha256="1wxdl30cy8vr1cd0wcjxyklp6crw4bv8r77ma2dkzmxm2ma5jw92"; depends=[adegenet ape hierfstat igraph markdown pegas reshape2 rmetasim shiny shinyFiles strataG swfscMisc]; };
   skeletor = derive2 { name="skeletor"; version="1.0.4"; sha256="1jfbfbkjx8mdwamsrkhvcnyn470in702vgcyw3g2dbgs84gl29q8"; depends=[]; };
   skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; };
   skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; };
-  skimr = derive2 { name="skimr"; version="1.0.1"; sha256="173ymwkx7n24xj70azdwlpiyswdfy17mw2dhpqcm6ssv0crnjjcc"; depends=[dplyr knitr magrittr pander purrr rlang stringr tibble tidyr tidyselect]; };
+  skimr = derive2 { name="skimr"; version="1.0.2"; sha256="1grm4z4avl6qp9ssk3cwg20wgqzk9w61p2hjwhld6p78r971k07a"; depends=[dplyr knitr magrittr pander purrr rlang stringr tibble tidyr tidyselect]; };
   skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; };
   skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; };
-  skpr = derive2 { name="skpr"; version="0.45.2"; sha256="1wi19rz9mhim91pqdzljjscpsv2dbm838jjbv9ynmscjnfcbbfl6"; depends=[doParallel foreach iterators kableExtra knitr lme4 nlme Rcpp RcppArmadillo rintrojs shiny shinythemes survival]; };
-  skynet = derive2 { name="skynet"; version="1.0"; sha256="00i3gvl9hz72id449wph8f0gncps6gzj0yz4n34ys8ih0j8n8b81"; depends=[data_table dplyr ggplot2 ggrepel igraph maps stringr]; };
+  skpr = derive2 { name="skpr"; version="0.47.5"; sha256="1c9ikn3lj3w2a4p1m8gdmhc1xzavf3y8zwra7lcb1snw9pznj7s8"; depends=[doParallel doRNG foreach iterators kableExtra knitr lme4 nlme Rcpp RcppArmadillo rintrojs shiny shinythemes survival]; };
+  skynet = derive2 { name="skynet"; version="1.0.1"; sha256="1jcb7m4warpg0c8x83dzm107qb5i0zakvjx4a1c6rr814c7xrlhl"; depends=[data_table dplyr ggplot2 ggrepel igraph maps stringr]; };
   skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; };
   sla = derive2 { name="sla"; version="0.1"; sha256="0fr5n65ppwsh9z7a6rma9ak0bl8x3nz7v25lij7wb5nrf3sl74yb"; depends=[]; };
   slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; };
@@ -10929,13 +11147,14 @@ in with self; {
   sm = derive2 { name="sm"; version="2.2-5.4"; sha256="0hnq5s2fv94gaj0nyqc1vjdjd64vsp9z23nqa8hxvjcaf996rwj9"; depends=[]; };
   smaa = derive2 { name="smaa"; version="0.2-5"; sha256="1mwahjgslk82f8bl6qcjs1yadhbnqrxxhvkffkgc2fv3s6lh5d9m"; depends=[]; };
   smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; };
-  smacof = derive2 { name="smacof"; version="1.9-6"; sha256="19x11011w8kwdbd0jp7y7zqhmn0a5bhc9gh7jkcpxij8ppiigh8y"; depends=[candisc colorspace ellipse Hmisc MASS nnls plotrix polynom weights wordcloud]; };
+  smacof = derive2 { name="smacof"; version="1.10-5"; sha256="102b63b5zyjv0fsmp3in98ckacsgjvpzmv3fwbchdrvf1262aia2"; depends=[candisc colorspace ellipse Hmisc MASS nnls plotrix polynom weights wordcloud]; };
   smacpod = derive2 { name="smacpod"; version="2.0"; sha256="05bylhh98qlnq4gn0wwg3wb3pwa1q2kh06v2skj2fgbjgr03fhkn"; depends=[abind pbapply plotrix sp SpatialTools spatstat]; };
   smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; };
   smam = derive2 { name="smam"; version="0.3-0"; sha256="1sdr0ki2y9smiwfglgh97kj6y0n1z3blyyxk823xp3467byk1rnb"; depends=[Matrix numDeriv Rcpp]; };
   smapr = derive2 { name="smapr"; version="0.1.1"; sha256="0ci0j26nsgl4yi0b0bhxqgpn281ml5clhih2nl7hm5l8nybdyp3q"; depends=[httr rappdirs raster rhdf5 rvest xml2]; };
   smart = derive2 { name="smart"; version="1.0.1"; sha256="0ki3qn71zrw0nyv395qijcwahnxyv1p21j8x6cxr9spah2wzz8lb"; depends=[elasticnet gplots gtools igraph Matrix pcaPP PMA]; };
-  smatr = derive2 { name="smatr"; version="3.4-3"; sha256="0iiazln4albj7k5w67slvyn98cqg4f6k409mml0n1pvlkki0h7gy"; depends=[plyr]; };
+  smartsizer = derive2 { name="smartsizer"; version="1.0.0"; sha256="0lp7qykb6y93aw5w7nbpb4d2vpz6by6zv8j7safhixx4wczlc39k"; depends=[MASS]; };
+  smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; };
   smbinning = derive2 { name="smbinning"; version="0.6"; sha256="13izdq2pl7hi8ppzmpmiiz4pmc43m63ixjrbj9lwa371vx60ndmh"; depends=[Formula gsubfn partykit sqldf]; };
   smcUtils = derive2 { name="smcUtils"; version="0.2.2"; sha256="0d1kmg386j0zrpp8vgxjwvpf1i25l86xrh82767xkp0n9qj8srwq"; depends=[]; };
   smcfcs = derive2 { name="smcfcs"; version="1.3.0"; sha256="1860qzhfpdr78a8ha8537izbkm0dx9j63l9fv6mswcs5sjl25i09"; depends=[MASS survival VGAM]; };
@@ -10945,7 +11164,7 @@ in with self; {
   smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; };
   smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; };
   sme = derive2 { name="sme"; version="1.0.2"; sha256="0gszpy1sx2qsypps3iza79sab475wcrscl7wnbbrv97a3ry0ybp6"; depends=[lattice]; };
-  smerc = derive2 { name="smerc"; version="0.2.2"; sha256="0x1n1plnq63grs09cijhy265xqrfg9az1pp9n5dg5wqlj6gf9rzi"; depends=[fields igraph maps smacpod SpatialTools spdep]; };
+  smerc = derive2 { name="smerc"; version="0.4.5"; sha256="1455fjfihznzivz80jad7pyfjms8yyvmsz6wqdvqv3n6dsyr8fvb"; depends=[fields maps matrixStats smacpod sp SpatialTools spdep]; };
   smfsb = derive2 { name="smfsb"; version="1.1"; sha256="0khd23b6k9zgxz2x6g6c6k2g32mbpli32izdq6fgk1a990kdsp6j"; depends=[]; };
   smirnov = derive2 { name="smirnov"; version="1.0-1"; sha256="09mpb45wj8rfi6n6822h4c335xp2pl0xsyxgin1bkfw97yjcvrgk"; depends=[]; };
   smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; };
@@ -10957,6 +11176,7 @@ in with self; {
   smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; };
   smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; };
   smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; };
+  smoothr = derive2 { name="smoothr"; version="0.1.0"; sha256="19ylhy7jz445yafdxlygs91vl4vrnnhggc2grwap0dcz0cazik1d"; depends=[sf units]; };
   smoothtail = derive2 { name="smoothtail"; version="2.0.5"; sha256="1sqkwniz9m03k23nba9ndmdm0g03mdshzm8risr6wz98jcqjilrk"; depends=[logcondens]; };
   smotefamily = derive2 { name="smotefamily"; version="1.2"; sha256="166gqwqljips2r0030m3q44zmxlnxcpb9hmwbg1bk3dqk9gfl8ra"; depends=[]; };
   smovie = derive2 { name="smovie"; version="1.0.0"; sha256="07sf9nxanfkcp42bv4x12vrlsdr2nnyfgdm6bhcfpggavd4s8r9q"; depends=[revdbayes rpanel SuppDists]; };
@@ -10965,7 +11185,7 @@ in with self; {
   smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; };
   sn = derive2 { name="sn"; version="1.5-1"; sha256="0l7qlah6dwkp8jswnr2mn3phlm15naba5zkmv0g5pcqy5ix0gz7w"; depends=[mnormt numDeriv]; };
   sna = derive2 { name="sna"; version="2.4"; sha256="1ks8819qvpdfansfqj9p32s1rhvl26frvbi78m4rx1wd1qcv74i2"; depends=[network statnet_common]; };
-  snakecase = derive2 { name="snakecase"; version="0.9.0"; sha256="02s3avsdvdmqfrwlliw90yza8rq2wlf56iwpvj36a2qkzxg54b6a"; depends=[stringi stringr]; };
+  snakecase = derive2 { name="snakecase"; version="0.9.1"; sha256="02462vd08asm4ah2brrc3z2s1lqcya80shrd6w743cylv3h3hpyv"; depends=[stringi stringr]; };
   snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; };
   snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; };
   snht = derive2 { name="snht"; version="1.0.5"; sha256="0k8w1118b2qrf5zfi902gm6zf7b1mwv7py7wg57vsibh2r2ra8ah"; depends=[ggplot2 gridExtra mgcv plyr reshape2 zoo]; };
@@ -10980,7 +11200,7 @@ in with self; {
   snp_plotter = derive2 { name="snp.plotter"; version="0.5.1"; sha256="16apsqvkah5l0d5qcwp3lq2jspkb6n62wzr0wskmj84jblx483vv"; depends=[genetics]; };
   snpEnrichment = derive2 { name="snpEnrichment"; version="1.7.0"; sha256="1lja1n26nr8lgbca2kraryv933jwa2w3h41appzylflf0w3liz9y"; depends=[ggplot2 snpStats]; };
   snpRF = derive2 { name="snpRF"; version="0.4"; sha256="1amxc4jprrc6n5w5h9jm2as025gqdqkla2asz7x97sjdnnj9kzzn"; depends=[]; };
-  snpReady = derive2 { name="snpReady"; version="0.9.4"; sha256="16nfwjda15gjk0y1rvvnlbx350rgdvpk397glp7yl2ji0amwv20r"; depends=[Matrix matrixcalc stringr]; };
+  snpReady = derive2 { name="snpReady"; version="0.9.6"; sha256="1r96j8zh84dn7qh3zgl0p0v3a80hx2wd3c4jgjlr43hzl7yglpqr"; depends=[impute Matrix matrixcalc rgl stringr]; };
   snpStatsWriter = derive2 { name="snpStatsWriter"; version="1.5-6"; sha256="04qhng888yih8gc7yd6rrxvvqf98x3c2xxz22gkwqx59waqd4jlq"; depends=[colorspace snpStats]; };
   snpar = derive2 { name="snpar"; version="1.0"; sha256="0c9myg748jm7khqs8yhg2glxgar1wcf6gyg0xwbmw0qc41myzfnq"; depends=[]; };
   snplist = derive2 { name="snplist"; version="0.18.1"; sha256="14x31h8h3lx25rm30vhp89byrzy3qrmawi07pmzy4xpxdf0rxm4s"; depends=[biomaRt DBI R_utils Rcpp RSQLite]; };
@@ -11002,19 +11222,20 @@ in with self; {
   soilprofile = derive2 { name="soilprofile"; version="1.0"; sha256="0sdfg6m2m6rb11hj017jx2lzcgk6llb01994x749s0qhzxmvx9mb"; depends=[aqp lattice munsell splancs]; };
   soiltexture = derive2 { name="soiltexture"; version="1.4.5"; sha256="0a9n89ygfqpm6sir76ginri1l6gmw3gfd58szl4ikzaz8fk5hxqh"; depends=[MASS sp]; };
   soilwater = derive2 { name="soilwater"; version="1.0.5"; sha256="11gal7hj73j82qx65krmzpmf0gpm41ph8hw70df46dbf4w23vvjn"; depends=[]; };
+  sokoban = derive2 { name="sokoban"; version="0.1.0"; sha256="07r2zv9rynvw06fpncrz3rsmkdy6z2pcvmm559bhs428kmnq2xib"; depends=[]; };
   solaR = derive2 { name="solaR"; version="0.44"; sha256="1waxi2zfns4dh1vpsl3khbgaw07icp4f1ax9l0pry9qipmk0nk3k"; depends=[lattice latticeExtra RColorBrewer zoo]; };
   solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; };
   solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; };
   solr = derive2 { name="solr"; version="0.1.6"; sha256="0hlysi1yw4l98dcb1shznzrgia9pqzfj0p1hmnfz5gz2j64lf4h4"; depends=[assertthat httr plyr rjson XML]; };
   solrium = derive2 { name="solrium"; version="1.0.0"; sha256="1rlf60kynqb8pvzllfdkiabxgnqx60hwm8vy86y9f2bh7d7jsdhf"; depends=[crul dplyr jsonlite plyr R6 tibble xml2]; };
-  solvebio = derive2 { name="solvebio"; version="2.3.1"; sha256="0mbb7ri8shknlw1m7985as84i0m837awpsd89yxc5gr1hvzgdvlh"; depends=[dplyr httr jsonlite mime]; };
+  solvebio = derive2 { name="solvebio"; version="2.4.0"; sha256="0sikq63i6x6vq0h5d8w92yjf6mhnb8nidn18zv27lfmnl0mwwpnm"; depends=[dplyr httr jsonlite mime]; };
   som = derive2 { name="som"; version="0.3-5.1"; sha256="1fbza1jxvwrkf5x3inkj36vshhkn7mz0ajqlxalbfmk6ngjw1x56"; depends=[]; };
   som_nn = derive2 { name="som.nn"; version="1.1.0"; sha256="0mw2c2lqvdq9bhndpjyawjy43l4x7clcsx2350j45g7fnchhy602"; depends=[class hexbin kohonen som]; };
   soma = derive2 { name="soma"; version="1.1.1"; sha256="1mc1yr9sq9h2z60v40aqmil0xswj5hgxfdh4racq297qw3a97my4"; depends=[reportr]; };
   someKfwer = derive2 { name="someKfwer"; version="1.2"; sha256="0widny5l04ja91fy16x4giwrabwqhx0fs3yl48pv9xh4zj6sx563"; depends=[]; };
   someMTP = derive2 { name="someMTP"; version="1.4.1"; sha256="19bsn8rny1vv9343bvk8xzhh82sskl0zg0f5r59g9k812q5llchn"; depends=[]; };
   somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; };
-  sommer = derive2 { name="sommer"; version="3.3"; sha256="1r83inm3b32gqaq2n39pj65h86lr9hxl7ciixqx90pxv15gr6xng"; depends=[data_table lattice MASS Matrix]; };
+  sommer = derive2 { name="sommer"; version="3.4"; sha256="02ghcs0w5pkmc20drynd44cli3s4vkxpksw3h9f828maw2n7q9jk"; depends=[data_table lattice MASS Matrix]; };
   somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; };
   sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; };
   sonicLength = derive2 { name="sonicLength"; version="1.4.4"; sha256="1v46xzx3jxxxs2biyrq6xbv2lhpz1i95la93hj6dl4jfyikmx0im"; depends=[]; };
@@ -11040,27 +11261,28 @@ in with self; {
   spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; };
   spBayes = derive2 { name="spBayes"; version="0.4-1"; sha256="1cypl3kvcr7nwdkq59zpdhkasz0z5r2gk8hr6wf1a1992k8c33ag"; depends=[abind coda Formula magic]; };
   spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.2"; sha256="0m1432gkjkkqmzhksv19yca1wyvp5vjwcmpavhiik4ghfx72rgrr"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; };
-  spData = derive2 { name="spData"; version="0.2.8.1"; sha256="0lbrgc701w8x248cmpl3pwngb9kjz1dqxfplrnr3jpyl9d3qkqv4"; depends=[]; };
+  spData = derive2 { name="spData"; version="0.2.8.3"; sha256="0w638fmzir2z7mn2ybfb88hlfnx1s36ysv7rmhfyf1s6wpyqcswl"; depends=[]; };
+  spGARCH = derive2 { name="spGARCH"; version="0.1.4"; sha256="1bvrhjvw1yyfajm6wyh38dvqkvrx9ymmk45pgbn4qwf47ckryhap"; depends=[Matrix Rcpp RcppEigen Rsolnp spdep truncnorm]; };
   spMC = derive2 { name="spMC"; version="0.3.9"; sha256="10cvha5j2pi3b2qiq3jbrc10yi84a595zlg0wshx3wrzxb1rim85"; depends=[]; };
-  spMaps = derive2 { name="spMaps"; version="0.2"; sha256="1rrrkbj9bvs217dgvwm686zczcwjqcbq0x268cwl6qnsm39mxzzf"; depends=[raster rgeos sp]; };
   spNNGP = derive2 { name="spNNGP"; version="0.1.1"; sha256="0b55arvy5xr592bs2082djyzaa48jbv0y85h7nnj479f8c31grqp"; depends=[coda Formula RANN]; };
   spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; };
   spTest = derive2 { name="spTest"; version="0.2.5"; sha256="11x2wq3031mqbj4n6hvb4l3sp4382qankdl1v1qh7ab2xa0h6xw8"; depends=[geoR sp]; };
   spThin = derive2 { name="spThin"; version="0.1.0"; sha256="06qbk0qiaw7ly1ywbr4cnkmqfasymr7gbhvq8jjbljm0l69fgjpp"; depends=[fields knitr spam]; };
   spTimer = derive2 { name="spTimer"; version="3.0-1"; sha256="1vl26d248642grca63kv1rsghqscchkhbybby0fgfg58v042qbs5"; depends=[coda sp spacetime]; };
   spa = derive2 { name="spa"; version="2.0"; sha256="1np50qiiy3481xs8w0xfmyfl3aypikl1i1w8aa5n2qr16ksxrnq3"; depends=[cluster MASS]; };
-  spaMM = derive2 { name="spaMM"; version="2.3.0"; sha256="1625nplyxklviifhalfwylc0cr2qlhrr57zhm3dj3n2daxjhid87"; depends=[MASS Matrix nlme nloptr proxy Rcpp RcppEigen]; };
+  spaMM = derive2 { name="spaMM"; version="2.4.8"; sha256="15hwz4824m3p7vn6faiffx62zwz0ipqs5z8q6r208vy0jivawwsl"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; };
   spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; };
   space = derive2 { name="space"; version="0.1-1"; sha256="1qigfz62xz47hqi43aii3yr4h7ddvaf11a5nil7rqprgkd0k6mv3"; depends=[]; };
   spaceExt = derive2 { name="spaceExt"; version="1.0"; sha256="0lp8qmb7vcgxqqpsi89zjy7kxpibg3x2mq205pjmsrbbh7saqzr4"; depends=[glasso limSolve]; };
+  spaceNet = derive2 { name="spaceNet"; version="1.0.1"; sha256="005jz7bm3c7zi3pgm8wyivc2kl058c0lwdjjzv0qb1vdsq9mpxx1"; depends=[MASS permute RcppTN Rfast sna vegan]; };
   spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; };
   spacetime = derive2 { name="spacetime"; version="1.2-1"; sha256="1i6yrmyr9vc5lr99w7qhr0jqdx97ckjqay5g0lqdrk98sygpfl4g"; depends=[intervals lattice sp xts zoo]; };
   spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; };
   spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; };
-  spacyr = derive2 { name="spacyr"; version="0.9.6"; sha256="0s4gn2nfd2bamvpzk68n4ym1nylzay8hrgkax6c9ghhvi3p7rch7"; depends=[data_table reticulate]; };
+  spacyr = derive2 { name="spacyr"; version="0.9.9"; sha256="1zdn57k5iacy73xmac32mslqzidpn3d38qyrnbzkzv2slysqwgkw"; depends=[data_table reticulate]; };
   spaero = derive2 { name="spaero"; version="0.2.0"; sha256="0srkah89z23j30y2smlnyhf97mm123apma8vgmgfarbx188bkwpn"; depends=[]; };
-  spam = derive2 { name="spam"; version="2.1-2"; sha256="06c2bal2hj4qjb65qagfq6icy52cjn8sn8yl0c0dbzcz4gmidvy2"; depends=[dotCall64]; };
-  spam64 = derive2 { name="spam64"; version="2.1-2"; sha256="15cjdz71fh04hcqjn93lnnqbmyfgm67p1x5lyiiq3wz7k1fk5a0h"; depends=[]; };
+  spam = derive2 { name="spam"; version="2.1-4"; sha256="0xdr6rmbsx6qq3n4225hr9sma56f33p4pbfirb4r1wxspy5d0zi9"; depends=[dotCall64]; };
+  spam64 = derive2 { name="spam64"; version="2.1-4"; sha256="186q2yl7kjmh13k51zysa6c86dcsydiaam51c2v9v8gk8pgagfgf"; depends=[]; };
   spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; };
   spanish = derive2 { name="spanish"; version="0.3.2"; sha256="1dg4wnvxhybhagag9xx27af6760dlclaivx27mfxywfha312xfpn"; depends=[magrittr xml2]; };
   spant = derive2 { name="spant"; version="0.9.0"; sha256="0cfvi5pxg1wg9kl9rxrarbb3jaxwjfwy34lmg1yy5nj8ld8lzlfc"; depends=[abind complexplus foreach matrixcalc minpack_lm nnls plyr pracma signal smoother stringr svd tkrplot]; };
@@ -11078,17 +11300,18 @@ in with self; {
   sparr = derive2 { name="sparr"; version="2.2-11"; sha256="01li60cybv9kg54zkc9rh4ra6danzbnap9rx59pgfj7zkhs2phmn"; depends=[doParallel foreach misc3d spatstat spatstat_utils]; };
   sparseBC = derive2 { name="sparseBC"; version="1.1"; sha256="1w60n2875n809lbrn0hd4kdmsyfd64aikgzxchza8b59x77l0psy"; depends=[fields glasso]; };
   sparseEigen = derive2 { name="sparseEigen"; version="0.1.0"; sha256="0vqcy61rarmp3liz8fr3vs3y40hkb3wfw89b5xsj1byaiap4772s"; depends=[]; };
-  sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.0"; sha256="0r7080d2s5vrcwi4h11iiapmdl0l59kd0j8r1avmw9x0d0qw6lh8"; depends=[data_table MASS Matrix mgcv refund]; };
-  sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.2"; sha256="0475zyij6h19diaalnkj39j4n0lx6mgfq3sl479mlngf9fhr9zvx"; depends=[Matrix Rcpp RcppEigen]; };
+  sparseFLMM = derive2 { name="sparseFLMM"; version="0.2.2"; sha256="12143qij3p8vry9i02i52nj00m1ckkwg2rq99dq00dq43axcpvgw"; depends=[data_table MASS Matrix mgcv refund]; };
+  sparseHessianFD = derive2 { name="sparseHessianFD"; version="0.3.3.3"; sha256="1a0pkbb7yk9pp57zyy96k7p5xy1s44jbfy0nz8zyw4h774369yfm"; depends=[Matrix Rcpp RcppEigen]; };
   sparseLDA = derive2 { name="sparseLDA"; version="0.1-9"; sha256="1k3sw9kc40yxnfss4vrsx34qxmv8ssddyhbfjhxrdldvblhbwchb"; depends=[elasticnet MASS mda]; };
   sparseLTSEigen = derive2 { name="sparseLTSEigen"; version="0.2.0"; sha256="11llmrkq0pnrdphgjvhmg269bq3xbbn4s7kd7xhvk62sigvspkcj"; depends=[Rcpp RcppEigen robustHD]; };
-  sparseMVN = derive2 { name="sparseMVN"; version="0.2.1"; sha256="1k4jiday24rdiscprwifrc0py13h707ijavspz15jannvjaz9qdh"; depends=[Matrix]; };
+  sparseMVN = derive2 { name="sparseMVN"; version="0.2.1.1"; sha256="0ikh1i4vid6r4sx9pdjqc5wbh4xdj966mr0b7jb1vjw18wrzad8q"; depends=[Matrix]; };
   sparseSEM = derive2 { name="sparseSEM"; version="2.5"; sha256="0ig8apsi94kvbcq3i8nzmywbdizlss7c6r9bppcyl9lxgikc3cds"; depends=[]; };
   sparseSVM = derive2 { name="sparseSVM"; version="1.1-2"; sha256="1bv9ipfs275vr1hmz7g7w4rimvbkg15wjh3xj3cx1zam91k384k9"; depends=[]; };
   sparsebn = derive2 { name="sparsebn"; version="0.0.5"; sha256="19315nzj9pz98498amlhas6ii3vwvn3qxz5a6136nh2xfwfg2bhc"; depends=[ccdrAlgorithm discretecdAlgorithm sparsebnUtils]; };
-  sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.5"; sha256="0hdzrp2wcjl849v7np7ybmyp15zjfqr8gkwhij2qjrpprf7z8s57"; depends=[Matrix nnet]; };
+  sparsebnUtils = derive2 { name="sparsebnUtils"; version="0.0.6"; sha256="02a75ldvxfn0awn2aaws3fgd4zzk1jjfry4nxjf3y1grdbbz396y"; depends=[Matrix nnet]; };
   sparsediscrim = derive2 { name="sparsediscrim"; version="0.2.4"; sha256="1sa3yssncbpx8yid5wrnxdq7jl3hy5rskyh60v5x592ijcb2mif0"; depends=[bdsmatrix corpcor dplyr ggplot2 mvtnorm]; };
-  sparseinv = derive2 { name="sparseinv"; version="0.1.1"; sha256="1c0vkfq4kh78rs8x484jyi29rcswq9slljxvvc7km6qlz1mnrzlm"; depends=[Matrix spam]; };
+  sparseinv = derive2 { name="sparseinv"; version="0.1.2"; sha256="1lf0lbk8dslasd6m1rq4wzpxa1v427j5i9j0rrw5xjx80z1gc206"; depends=[Matrix spam]; };
+  sparsepca = derive2 { name="sparsepca"; version="0.1.2"; sha256="0wk2nm37p15gb8i4s45izzzdmwywr56kv4g0j3jd5s3slm224vv4"; depends=[rsvd]; };
   sparsepp = derive2 { name="sparsepp"; version="0.2.0"; sha256="0ibadyv7lchxw3y1dspjnbhc4pin4dxwqj9rdrdxfbvlx0i3jgxr"; depends=[]; };
   sparsereg = derive2 { name="sparsereg"; version="1.2"; sha256="1ipsang2fppmjx4h5ljgzx3c44z3lggc376ghrqqgmxb5ql8bcp3"; depends=[coda ggplot2 GIGrvg glmnet gridExtra MASS MCMCpack msm Rcpp RcppArmadillo VGAM]; };
   sparsestep = derive2 { name="sparsestep"; version="1.0.0"; sha256="0f3wrwiyn990sn3x9r50zgs8cr76nmyisdc7qismgx1nn5yx5z0g"; depends=[Matrix]; };
@@ -11097,7 +11320,6 @@ in with self; {
   sparsio = derive2 { name="sparsio"; version="1.0.0"; sha256="12nbydgzl3qlanlsfdy8bvg6rxa439lv0z0vbyqssqwky3mmg5c3"; depends=[Matrix Rcpp]; };
   spartan = derive2 { name="spartan"; version="3.0.0"; sha256="1q78l04nbrllrsk14haln5s829rkkhkhmb34xzfgyd8glbi7z4ay"; depends=[e1071 ggplot2 gplots lhs mco mlegp neuralnet plotrix psych randomForest XML]; };
   spass = derive2 { name="spass"; version="1.1"; sha256="1kr2ixyvsm82h2brdm51bzll69632mkj9f88a2ny0pcyqrbggg83"; depends=[geepack MASS multcomp mvtnorm Rcpp]; };
-  spatcounts = derive2 { name="spatcounts"; version="1.1"; sha256="0rp8054aiwc62r1m3l4v5dh3cavbs5h2yb01453bw9rwis1pj2qm"; depends=[]; };
   spate = derive2 { name="spate"; version="1.5"; sha256="1hlh4iwx1lrl8r2gag33z2xdv6k4hg86ch4f0jlqnqkhm9hapshf"; depends=[mvtnorm truncnorm]; };
   spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; };
   spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; };
@@ -11113,26 +11335,26 @@ in with self; {
   spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; };
   spatialsegregation = derive2 { name="spatialsegregation"; version="2.44"; sha256="02s75q6ylzm6xzr1q23fhps3svlb0ix86dzgr23wf42369gs7h0g"; depends=[spatstat]; };
   spatialwarnings = derive2 { name="spatialwarnings"; version="1.0"; sha256="1j8zr9pv769ji9ynzrhah3nd56mjjap450c28g26ff00l3kr9l03"; depends=[ggplot2 moments plyr poweRlaw Rcpp RcppArmadillo reshape2 tidyr VGAM]; };
-  spatstat = derive2 { name="spatstat"; version="1.55-0"; sha256="05mpw0zdw4mdlkcf8q9h0nmviq37ihwpgl472wyxqw69l93vk4k3"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
+  spatstat = derive2 { name="spatstat"; version="1.55-1"; sha256="01rzaaws3nkzqdpqvq54glxxl611gz8vi7l7jv988685y8r8q4wa"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; };
   spatstat_data = derive2 { name="spatstat.data"; version="1.2-0"; sha256="0nzw5y1in36mib5g4v076b9jii71jjidxajn3n8v67lvl48dmwgm"; depends=[spatstat_utils]; };
   spatstat_local = derive2 { name="spatstat.local"; version="3.5-7"; sha256="1sdcx4qxv0z5q97rljn34mssbs4w6qbqxhn71xmkns01xypl1wr2"; depends=[spatstat spatstat_utils tensor]; };
   spatstat_utils = derive2 { name="spatstat.utils"; version="1.8-0"; sha256="053j67mrnjcw1mdbm3qjvf67hrfnhsma4770r7l67bs4xys2qhfg"; depends=[]; };
   spatsurv = derive2 { name="spatsurv"; version="1.1"; sha256="0fakhz2qc5vb7ym2ik7hilv8g5fn3z7s16hzngq1n591xza5b74g"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; };
   spbabel = derive2 { name="spbabel"; version="0.4.8"; sha256="1f0lradf7a3fjkdhbviw24awpqj1pzw1wfvigrqhnmf0jjw3nng3"; depends=[dplyr sp tibble]; };
-  spc = derive2 { name="spc"; version="0.5.4"; sha256="1ii848jcpsg5jij1i17flhz4v5vgsb8j6iijgpha7sigmj7gynk3"; depends=[]; };
-  spc4sts = derive2 { name="spc4sts"; version="0.2.1"; sha256="1mwgqj9gph3fzvmqp03khi541g13ljx8xn09ji9qcjl6j032rk2p"; depends=[gridExtra rpart]; };
+  spc = derive2 { name="spc"; version="0.6.0"; sha256="118r2yjfmzm0bi3ccx9pzi56vw2kbjz0pbxrjqdks0075fk7ij0q"; depends=[]; };
+  spc4sts = derive2 { name="spc4sts"; version="0.3.1"; sha256="1g7q3g486qns8qwpki2nbiy995v7fl1ibmk4645ws9yxgybw5mxj"; depends=[gridExtra rpart]; };
   spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; };
-  spcosa = derive2 { name="spcosa"; version="0.3-7"; sha256="11q6zr4y0hv1vnhl45g38f1906pq9a695ynn6yfkzlpz1kbf2jma"; depends=[ggplot2 rJava sp]; };
+  spcosa = derive2 { name="spcosa"; version="0.3-8"; sha256="1hw3njn2c8wj8bk2qpnbi2mbhj485q3gpbjf1gq9k6my4brdp86b"; depends=[ggplot2 rJava sp]; };
   spcov = derive2 { name="spcov"; version="1.01"; sha256="1brmy64wbk56bwz9va7mc86a0ajbfy09qpjafyq2jv7gm7a35ph5"; depends=[]; };
   spcr = derive2 { name="spcr"; version="2.0"; sha256="1n0lva9brpzxysw6p7l88cj8d46jng2zd7zvr5brqldzd3yl63l9"; depends=[]; };
   spd = derive2 { name="spd"; version="2.0-1"; sha256="00zxh4ri47b61jkcjf5idl9hhlfld6rhczsnhmjsax59884f2i8m"; depends=[KernSmooth]; };
-  spdep = derive2 { name="spdep"; version="0.7-4"; sha256="1iskcrlka8p49i3lvfp9l5y4q9vapdn0m6wlin7pq47017jz2hwn"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; };
+  spdep = derive2 { name="spdep"; version="0.7-7"; sha256="0wrlximy4w5y5aszy3pacmf3ag224chl12q4rj4r7ky6zw2sn1ns"; depends=[boot coda deldir expm gmodels LearnBayes MASS Matrix nlme sp spData]; };
   spdownscale = derive2 { name="spdownscale"; version="0.1.0"; sha256="0pl560km9629iwy13h7359ab7ixzs09hg986kvk0xbnc348srb86"; depends=[]; };
   spdplyr = derive2 { name="spdplyr"; version="0.1.3"; sha256="1f34yzj9z4f1dj7pqaayk0mvabzwa6kc3kwi1pmpikl1afgsyv25"; depends=[dplyr lazyeval rlang sp spbabel tibble]; };
   spduration = derive2 { name="spduration"; version="0.17.0"; sha256="1s41rs5nbdrknn6ag7zn8ds3203q2x5z5mb9vf80y6ba6w3ksr32"; depends=[corpcor forecast MASS plyr Rcpp RcppArmadillo separationplot xtable]; };
   spdynmod = derive2 { name="spdynmod"; version="1.1.3"; sha256="0qh0kkxs6hk344k3fys0g9yy0xl0kwnwl18bgiak53fd1k7whskq"; depends=[animation deSolve raster sp]; };
   spe = derive2 { name="spe"; version="1.1.2"; sha256="0xyx42n3gcsgqmy80nc9la6p6gq07anpzx0afwffyx9fv20fvys0"; depends=[]; };
-  speaq = derive2 { name="speaq"; version="2.2.0"; sha256="1y6sa639b2pcxcd2lh9ivfllvc734pmb0bv63hcnr74f8nmn3ywf"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; };
+  speaq = derive2 { name="speaq"; version="2.3.1"; sha256="18v39nm9h4388asl0vk2w874kpg5spp7fyhib04cyb91hhx910sr"; depends=[cluster data_table doSNOW foreach ggplot2 gridExtra impute MassSpecWavelet missForest mQTL reshape2 rvest xml2]; };
   spec = derive2 { name="spec"; version="0.1.3"; sha256="0i1c5wjrca36zf5ak95i8n57hy1jj8w0qkkpnjqpn3xv3nvqccr2"; depends=[csv encode magrittr]; };
   speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; };
   speciesgeocodeR = derive2 { name="speciesgeocodeR"; version="1.0-4"; sha256="033877l9sxcvvzpyf9aw19sj8qfscim663j2y2az8bl9c79xw4ph"; depends=[maps raster sp]; };
@@ -11149,7 +11371,7 @@ in with self; {
   spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; };
   spelling = derive2 { name="spelling"; version="1.1"; sha256="10zhzbpyjw5lkg4iyjwgs5xp2c8bgwyzjg146fcml6cjs6xhl8ni"; depends=[commonmark hunspell knitr xml2]; };
   sperich = derive2 { name="sperich"; version="1.5-7"; sha256="1apgq5nsl6nw674dy7bc7r7z962wcmqsia5n67a8n6c5lcgcif3f"; depends=[foreach rgdal SDMTools sp]; };
-  sperrorest = derive2 { name="sperrorest"; version="2.1.1"; sha256="0rbfr6dg8dx6lm3npsrinr2vxxsq0f3xwprzl0fyzabdhd82na4y"; depends=[doFuture foreach future gdata magrittr pbapply pbmcapply purrr ROCR rpart stringr]; };
+  sperrorest = derive2 { name="sperrorest"; version="2.1.5"; sha256="126vwk3bxs27gblakc5nplj0k90a21gks9d0kbyanlxc2ihsy243"; depends=[doFuture foreach future future_apply gdata glue magrittr pbapply pbmcapply purrr ROCR rpart stringr]; };
   spew = derive2 { name="spew"; version="1.3.0"; sha256="09g8j5v5k455c3kqm1fn09ql3x34xy22igicakwl99s8gsln7v3p"; depends=[maptools plyr sp]; };
   spex = derive2 { name="spex"; version="0.4.0"; sha256="0b2zcpbjr8lqfsmwvmy4lp88xz16v7fyqx1yv10yhcgxlgw0yw8p"; depends=[quadmesh raster sp]; };
   spfrontier = derive2 { name="spfrontier"; version="0.2.3"; sha256="0br54kkva4m3yyqfjh3cs5wf4kk3ax6yg0h8cl5qiy38dvssa5qd"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; };
@@ -11158,7 +11380,7 @@ in with self; {
   spgs = derive2 { name="spgs"; version="1.0-1"; sha256="1jabgcc8bd6kikcd5rv9xczbg6r52mwyc68r8filn5i0gva4by57"; depends=[]; };
   spgwr = derive2 { name="spgwr"; version="0.6-32"; sha256="0xdv0yy6md9kv1aay6xxj1k3x59apflip0qpfvyk2aa2wbn1sx2v"; depends=[sp spData]; };
   sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; };
-  sphet = derive2 { name="sphet"; version="1.6"; sha256="0149wkak7lp2hj69d83rn05fzh9bsvyc1kyg0d3b69sx92kqlwr0"; depends=[Matrix nlme sp spdep]; };
+  sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; };
   spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; };
   spider = derive2 { name="spider"; version="1.5.0"; sha256="1y034v42jxjl3vj87iz5kaizq7fwppmn56z7yyvrrmk5ps4nqr1j"; depends=[ape pegas]; };
   spiderbar = derive2 { name="spiderbar"; version="0.2.1"; sha256="1mm9g58riyjxpfwjj28shlw9zlycsgcxl6xw8im0gm815v2plyhv"; depends=[Rcpp]; };
@@ -11166,29 +11388,31 @@ in with self; {
   spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-11"; sha256="1f16jvdj6kbiiypnbbj10nj7l88kkrxasrribqpjv7ai62dlximn"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; };
   spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; };
   spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; };
-  spind = derive2 { name="spind"; version="2.1.2"; sha256="0z00fc9r6aycv5v9ms7v64xszfc58wvy6y7bd2z0xima1gpppq2r"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje splancs stringr waveslim]; };
+  spind = derive2 { name="spind"; version="2.1.3"; sha256="173jpyq13vdhcwbxwx188fp7jg8l67yh6kxlai13z8lqnlpl1xqh"; depends=[gee geepack ggplot2 lattice MASS RColorBrewer rje splancs stringr waveslim]; };
   spinyReg = derive2 { name="spinyReg"; version="0.1-0"; sha256="0kbg7rncrrl5xdsaw9vj909x97mfp77mjnvghczplmnwmmanyn72"; depends=[]; };
   splancs = derive2 { name="splancs"; version="2.01-40"; sha256="0qs3lwyllrkahnvqbm8bzrf03bm9zk4s7p1n19s638y4xf0l6x3r"; depends=[sp]; };
   splashr = derive2 { name="splashr"; version="0.4.1"; sha256="1gydnl6qdkqxvgzy3j6n8y4nan4wz6p7wybcgnm5p37n7q6m2rhk"; depends=[curl docker formatR HARtools httr jsonlite lubridate magick openssl purrr scales stringi xml2]; };
   splines2 = derive2 { name="splines2"; version="0.2.7"; sha256="1hh7zd2gqmfc5xx91kjwi465yvq6lwrhgjdim1b40g6canh0ixlb"; depends=[]; };
+  splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; };
   splitfngr = derive2 { name="splitfngr"; version="0.1.1"; sha256="0gz65acnkil9xjspl2kzpzyhj7lslga9g3p0k79xh25ia6qal5ws"; depends=[lbfgs]; };
-  splithalf = derive2 { name="splithalf"; version="0.2.0"; sha256="1bpw8mw88aryk4n0bdm4f356wsix6npdpl91qfbwayhdh0g5302f"; depends=[plyr]; };
-  splitstackshape = derive2 { name="splitstackshape"; version="1.4.2"; sha256="0m9karfh0pcy0jj3dzq87vybxv9gmcrq5m2k7byxpki95apbrsmg"; depends=[data_table]; };
+  splithalf = derive2 { name="splithalf"; version="0.3.1"; sha256="01ip3brnlyxlxr1hmnmc2w6jg4vm5gjk8fwavclmv7m7hr2bb4xh"; depends=[dplyr tidyr]; };
+  splitstackshape = derive2 { name="splitstackshape"; version="1.4.4"; sha256="0vhgb4pysp7hbph7kq8b38m4gqhal40j4p7gij2wrc2rajspzhkq"; depends=[data_table]; };
   splm = derive2 { name="splm"; version="1.4-10"; sha256="0zz28mfs84nqyvl1l0ba7yrhgcxxzw1v0542jc39h4pr537yz1nc"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; };
   splot = derive2 { name="splot"; version="0.3.2"; sha256="1nix7pzqlla3iga99pw9jqcylg4j5xpfrf94y0abzpy3z4gq3kgc"; depends=[]; };
-  spls = derive2 { name="spls"; version="2.2-1"; sha256="0zgk9qd825zqgikpkg13jm8hi6ncg48qw5f985bi145nwy9j19xs"; depends=[MASS nnet pls]; };
+  spls = derive2 { name="spls"; version="2.2-2"; sha256="11xp6wnxizc8g91ci9fd7lbjc8pin84c9ak8lr8yg2jyd2l351j9"; depends=[MASS nnet pls]; };
   splus2R = derive2 { name="splus2R"; version="1.2-2"; sha256="0xrbj8vxy0pc6hl7m8abv71d3hjw47cl51s7j7priadyqczkq6sz"; depends=[]; };
   splusTimeDate = derive2 { name="splusTimeDate"; version="2.5.0-137"; sha256="0bpzv6a05hnqnnz2znnkb3f34r56krhc595zjnn82azxj4a53njh"; depends=[]; };
   splusTimeSeries = derive2 { name="splusTimeSeries"; version="1.5.0-74"; sha256="0aikw6ckc0a7lrgjlcdmqspgrx0fc4iysd7jynd2lsf1hxy4pz35"; depends=[splusTimeDate]; };
-  spm = derive2 { name="spm"; version="1.0.0"; sha256="0q87sbp39axmlnj15srnsysm7d9rpm5q6zic0h6hc1xwp205v0sf"; depends=[gbm gstat psy randomForest sp]; };
+  spm = derive2 { name="spm"; version="1.1.0"; sha256="0xx1g6ir0sanj2p6xgsdghymx1iy2bzsany2j87q49y5hah7349j"; depends=[biomod2 gbm gstat psy randomForest ranger sp]; };
   spm12r = derive2 { name="spm12r"; version="2.7.4"; sha256="0v0zmsbzk6446n1yipz3w99n0n4yya6idff3gfyj7fgq10pcalgz"; depends=[git2r matlabr neurobase oro_nifti R_utils]; };
-  spmoran = derive2 { name="spmoran"; version="0.1.2"; sha256="19rl14w0zry649c3kgvrmb7bsw3dxsprf52naiqfxxs7qy3pxcm2"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; };
+  spmoran = derive2 { name="spmoran"; version="0.1.3"; sha256="1bvq91k346w2cvb3yi10qgidabf3s8whlk6glqrlb1k6na7l8k3y"; depends=[doParallel fields foreach ggplot2 Matrix vegan]; };
   spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; };
+  spnn = derive2 { name="spnn"; version="1.1"; sha256="0i77lpxrfa1jxi9znlmn5knmcjpf17q4hf8999b1x8lhqlhiizc1"; depends=[MASS]; };
   spocc = derive2 { name="spocc"; version="0.7.0"; sha256="0ar107c7snbh1iaib3xddng88861h3gc56whicx5krl3zf2xgjqa"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; };
   spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; };
   sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; };
   spotifyr = derive2 { name="spotifyr"; version="1.0.0"; sha256="1f7sv6qc8bim8vkcsma96zdzd1ci73dpag2dp27mqjcbh716xfy0"; depends=[dplyr httr lubridate purrr tidyr]; };
-  spp = derive2 { name="spp"; version="1.15.3"; sha256="1wn7a6aznxyvr6kwgf3bd8c1n1pxm4b43km3pgfw8mf2vx69cynd"; depends=[BH caTools Rcpp Rsamtools]; };
+  spp = derive2 { name="spp"; version="1.15.4"; sha256="0gjg0g30y9w445mimrd29s44ryla1bmh1mdwj4hb85s1yi1l4h25"; depends=[BH caTools Rcpp Rsamtools]; };
   sppmix = derive2 { name="sppmix"; version="1.0.2"; sha256="1924lrxjlijlbvjbkkwb3pfa4klg49ph6hz66b7kyy1371wa2b9y"; depends=[fields ggplot2 mvtnorm Rcpp RcppArmadillo rgl spatstat]; };
   spray = derive2 { name="spray"; version="1.0-3"; sha256="0zy2dwzk33cwch0pdhhsyiy169z39iij3zvvjg81gxa29pq0h1ab"; depends=[magic partitions Rcpp]; };
   sprex = derive2 { name="sprex"; version="1.4.1"; sha256="14idml4mipd4wyza7hqf49ww4dparmwaps35hxm8jg5h0w1pgh7j"; depends=[swfscMisc]; };
@@ -11202,8 +11426,8 @@ in with self; {
   spt = derive2 { name="spt"; version="1.13-8-8"; sha256="18s74pxfmsjaj92z2a34nq90caf61s84c616yv33a0xvfvp32qr5"; depends=[]; };
   sptemExp = derive2 { name="sptemExp"; version="0.1.1"; sha256="0a4y355j24sll8jmm17lh4j13k21b3nlalsxzpzx2gp5xw1x7jr6"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; };
   sptm = derive2 { name="sptm"; version="17.12-7"; sha256="1l5in0jkqg44rr2id3h25jrfbn7x855p31z338hnmdpfwkpm2b1a"; depends=[kyotil survey survival]; };
-  spuRs = derive2 { name="spuRs"; version="2.0.0"; sha256="0lbc3nny6idijdaxrxfkfrn40bxfyp9z3yl9mwb1k6cyd10v5mfj"; depends=[lattice MASS]; };
-  spup = derive2 { name="spup"; version="0.1-1"; sha256="0iwmydvd6bwpyr4q3hk2hlvgrvpzrdhnbq0frxadwcaaap75pfv0"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
+  spuRs = derive2 { name="spuRs"; version="2.0.1"; sha256="1vjyhm4dvqm5d4kqjiwk7yy85455dgv4sy9kr5427zci3jlmxqij"; depends=[lattice MASS]; };
+  spup = derive2 { name="spup"; version="1.2-1"; sha256="05cl4kddg2f37238am92bbkyl5davd2a6jjb1akzn1v3ha6qbhpq"; depends=[gstat magrittr mvtnorm purrr raster whisker]; };
   sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; };
   sqliter = derive2 { name="sqliter"; version="0.1.0"; sha256="17jjljq60szz0m8p2wc5l56659aap7an5gknc848dp89ycjgj3zx"; depends=[DBI functional RSQLite stringr]; };
   sqlscore = derive2 { name="sqlscore"; version="0.1.2"; sha256="0pl4nf59b8jy8rkqs2z684lxfqh01284h3cx97a1igpy4qqj712b"; depends=[dbplyr]; };
@@ -11216,7 +11440,7 @@ in with self; {
   ss3sim = derive2 { name="ss3sim"; version="0.9.5"; sha256="0rdb49bfxvyh0jrqycrv1hxvh7y4kvw81jccjg5ma734x44q0vm5"; depends=[bbmle dplyr foreach ggplot2 gtools lubridate magrittr plyr r4ss]; };
   ssa = derive2 { name="ssa"; version="1.2.1"; sha256="10x58c57pa9x6svm4h4xrss72ikin9lpf3ihjwmnkgnaicvsd0bx"; depends=[iterators]; };
   ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; };
-  ssc = derive2 { name="ssc"; version="1.0"; sha256="1hhlpcm1mdwkcxrprk5nc2yi3l69lz13av50y3cyz5vj73jhsg44"; depends=[proxy]; };
+  ssc = derive2 { name="ssc"; version="2.0.0"; sha256="0w7c0blqny7dyjh1a6l9lr7nysgpmasfqbf7wf368rwmv59pk0b3"; depends=[proxy]; };
   sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; };
   ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; };
   ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; };
@@ -11236,6 +11460,7 @@ in with self; {
   ssym = derive2 { name="ssym"; version="1.5.7"; sha256="0l5d921vlhd4qwddllrgcxpq3bhivvy5ikh3ixdy3s140rzpgwrv"; depends=[Formula GIGrvg normalp numDeriv sandwich survival]; };
   st = derive2 { name="st"; version="1.2.5"; sha256="0dnyfjcz37gjjv87nrabb11gw2dlkqhq3mrxdpkzahx0w0g0q0pb"; depends=[corpcor fdrtool sda]; };
   stR = derive2 { name="stR"; version="0.3"; sha256="0zad25s9wp4lapkww3rdbqsd4y7p8xhz9is7avq400srxakinx7n"; depends=[foreach forecast Matrix quantreg rgl SparseM]; };
+  staRdom = derive2 { name="staRdom"; version="1.0.3"; sha256="07ciabm0wakzdybhgdmiakdh7mygc38c8vqs9czgq65729928aqq"; depends=[doParallel dplyr drc eemR foreach GGally ggplot2 multiway plotly pracma readr stringr tibble tidyr zoo]; };
   staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; };
   stability = derive2 { name="stability"; version="0.2.0"; sha256="154dp26aghznibnp9h7j86hi30caylvyxp87jkf2p7cb4l3qn5r4"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; };
   stable = derive2 { name="stable"; version="1.1.2"; sha256="11irpn0qfblzskdr71991jlmdrbqqqpszppn5pii3lr5hflqqr1d"; depends=[rmutil]; };
@@ -11247,7 +11472,7 @@ in with self; {
   stacomirtools = derive2 { name="stacomirtools"; version="0.5.2"; sha256="1a33yy594699b05lb32zwx6yhmvxzwly6vvf8xzqg6lac64p26r5"; depends=[RODBC xtable]; };
   stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; };
   stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; };
-  stampr = derive2 { name="stampr"; version="0.1"; sha256="1w7zp5n41gzahv4psdgw5a5mylcxlf12931fnjz0q2cwqj9cwql5"; depends=[deldir maptools raster rgdal rgeos sp spdep]; };
+  stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; };
   standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; };
   stapler = derive2 { name="stapler"; version="0.6.5"; sha256="0xhwlm3iyxxmaaf0smj8g5zdawb51d7dc636czbvk5g551g7wfdb"; depends=[matrixStats RNifti]; };
   staplr = derive2 { name="staplr"; version="1.1.0"; sha256="08kk1zi89ggyli05y7lr1vhq4xszjp6z5jscaaknp38gav7jd5lc"; depends=[]; };
@@ -11255,7 +11480,7 @@ in with self; {
   starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; };
   starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; };
   startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; };
-  startup = derive2 { name="startup"; version="0.9.0"; sha256="0cr3lp5aq93d8mk55nhfpszjkr4iv5ysm7jj7igj7yy3ag93snm0"; depends=[]; };
+  startup = derive2 { name="startup"; version="0.10.0"; sha256="1j9vb1008sg6wwbz8ilxqnqzy7b18cscxiyaijszzx4ygxmcq39j"; depends=[]; };
   startupmsg = derive2 { name="startupmsg"; version="0.9.4"; sha256="1r9dqrfznsrj7s11m56hkzgfnw3qcgzh07pqipl007zr2av9xwqw"; depends=[]; };
   statGraph = derive2 { name="statGraph"; version="0.1.0"; sha256="13wfylb92lzw08fn3p000v87abs7ij2rb82np1rkgsl8w2kica73"; depends=[igraph MASS]; };
   statar = derive2 { name="statar"; version="0.6.5"; sha256="0vmdrdq6db16vfl0rb39x8yfnbdzpcrvywfgp4lss6jby3nvjwd9"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr]; };
@@ -11280,9 +11505,10 @@ in with self; {
   steadyICA = derive2 { name="steadyICA"; version="1.0"; sha256="0mcalbsgajdpk45k9vpyavn079063hw4ihkw72n9wcy5nb0da14g"; depends=[clue combinat MASS Rcpp]; };
   steepness = derive2 { name="steepness"; version="0.2-2"; sha256="0bw7wm7n2xspkmj90qsjfssnig683s3qwg1ndkq2aw3f6clh4ilm"; depends=[]; };
   stellaR = derive2 { name="stellaR"; version="0.3-3"; sha256="098sz6b8pl3fyca3g6myp97nna368xhxf8krmibadnnsr49q5zs9"; depends=[]; };
+  stellaRbase = derive2 { name="stellaRbase"; version="0.1.0"; sha256="1jwhh14wk57z8acg8vjd7m3nwq0vq4w0x9ml8zhk3gnl4czq8m04"; depends=[data_table httr RJSONIO]; };
   stepPenal = derive2 { name="stepPenal"; version="0.1"; sha256="09viapb4846g91jzf9364rdyd865b19v83pwcdm3p3xsjry9ffxk"; depends=[caret dfoptim glmnet mvtnorm pROC]; };
   stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; };
-  stepR = derive2 { name="stepR"; version="2.0-1"; sha256="1r45wxw9kvzyybkl4f1r9c2d7wmi0k4ji39w3nxqrf7n5kp2cnj4"; depends=[digest R_cache Rcpp]; };
+  stepR = derive2 { name="stepR"; version="2.0-2"; sha256="0inxlgihyivfr0l4gk8zq0043l9s5w4r3x3hwjlzfwbqjkwy1rjs"; depends=[digest R_cache Rcpp]; };
   stepp = derive2 { name="stepp"; version="3.0-11"; sha256="0jrwfvcgh3sjm3zag93kjyny2qqsyiw988vnx6jw7s31bv9g0d6s"; depends=[car survival]; };
   stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; };
   stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; };
@@ -11310,26 +11536,26 @@ in with self; {
   stpp = derive2 { name="stpp"; version="2.0-3"; sha256="18icnfrlrcibrpw7vqkrhzfx880ak24xk6llwgiqw18r929mq1hw"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; };
   stppResid = derive2 { name="stppResid"; version="1.1"; sha256="0hgzsyy5y0sqd4d2agdr7p2kq0w51vs8f63dvj6j49h8cvgiws2x"; depends=[cubature deldir splancs]; };
   strandCet = derive2 { name="strandCet"; version="1.0"; sha256="019cacj0g9f6i8v03rq7qyph7f14d8n0qw0axvczijvnk99q602a"; depends=[boot corpcor MASS minpack_lm mvtnorm numDeriv]; };
-  stranger = derive2 { name="stranger"; version="0.3.2"; sha256="05s4dv9w8dxy2x63ai8vyh3rwphr4h59axjsh7lqa05ja06pai5z"; depends=[assertthat data_table dplyr ggplot2 tidyr]; };
+  stranger = derive2 { name="stranger"; version="0.3.3"; sha256="0p0ssba5q192g7pviv1shmh1lpcdjmzdim3rp1qs3hrd1d3pn4vq"; depends=[assertthat data_table dplyr ggplot2 tidyr]; };
   strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; };
   strat = derive2 { name="strat"; version="0.1"; sha256="1axxrp750kjzcgxjdqfscjmryv1mkv4l23zk8k23z8l4ymhd2f5w"; depends=[Hmisc Rcpp RcppArmadillo]; };
   strataG = derive2 { name="strataG"; version="2.0.2"; sha256="1rf1xf07yb0dzasgig9sfm4i9ggdkjgy5iiysqgdapk3sxs26c8r"; depends=[adegenet ape apex copula data_table DT ggplot2 gridExtra Hmisc pegas phangorn RColorBrewer Rcpp shiny shinyFiles survival swfscMisc]; };
   stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; };
   strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; };
   stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; };
+  stratifyR = derive2 { name="stratifyR"; version="1.0-1"; sha256="0w135smkgryx29ppa7khpay8w04b3g2pxka0wsqlhksrp5pqa086"; depends=[actuar fitdistrplus mc2d triangle zipfR]; };
   stratvns = derive2 { name="stratvns"; version="1.0"; sha256="1bw9l389lxiji4h7hrsshf24v135h6la9dg3xxjly53d4fi56ifh"; depends=[MultAlloc Rglpk sampling snowfall stratification]; };
   straweib = derive2 { name="straweib"; version="1.0"; sha256="0bh2f4n4i7fiki52sa57v96757qw1gn1lcn7vgxmc5hk5rzp2mi8"; depends=[]; };
   stream = derive2 { name="stream"; version="1.2-4"; sha256="1xk9lnvf9xld74z4sxbwpgxl7cbni88cjyxqzxr0r9pn9vcpwima"; depends=[animation clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; };
-  streamMOA = derive2 { name="streamMOA"; version="1.1-3"; sha256="0vgnd27xl7lgir0ps3zsz7ca2vvjg8yp28zbfvdgvm3agk7dpra7"; depends=[rJava stream]; };
+  streamMOA = derive2 { name="streamMOA"; version="1.1-4"; sha256="09vspcz806j2f397hr8h685vy4xbx419bbha91f44s3bhks1y7fr"; depends=[rJava stream]; };
   streamR = derive2 { name="streamR"; version="0.2.1"; sha256="1ml33mj7zqlzfyyam23xk5d25jkm3qr7rfj2kc5j5vgsih6kr0gl"; depends=[RCurl rjson]; };
   streambugs = derive2 { name="streambugs"; version="1.0"; sha256="1dyh5rwi47dn584nyy7f7vg5j5nlpz7ygcl8lwkj7prahplmzg5d"; depends=[deSolve]; };
-  stremr = derive2 { name="stremr"; version="0.4"; sha256="0n8ickmzjqlxwrz8dsphh1nsbnsgp4mnwm52i5ji099ps5292f65"; depends=[assertthat data_table pander R6 Rcpp rmarkdown speedglm stringr zoo]; };
   stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; };
   strider = derive2 { name="strider"; version="1.1"; sha256="00r6gbvwmla5h27iyi7rdfd0kr4alxz19fd7g2ba0in3779za3sw"; depends=[BH Rcpp]; };
   stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; };
-  stringdist = derive2 { name="stringdist"; version="0.9.4.6"; sha256="0j5b7hr53nr9xq44famkpwzi4khix93ffani5pwldqkf8bpdvhci"; depends=[]; };
+  stringdist = derive2 { name="stringdist"; version="0.9.4.7"; sha256="1qg80wmcrpkba9njvgjdg15bgw7ddks40kkfh5x61as9lhchy4i4"; depends=[]; };
   stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; };
-  stringi = derive2 { name="stringi"; version="1.1.6"; sha256="122im5m8x9bqpahc0hbxmvdq6hnsmgnxwwyjpvbihyv2jq5kd44m"; depends=[]; };
+  stringi = derive2 { name="stringi"; version="1.1.7"; sha256="0nck1s2iglmkrn15ay2chrrwsy5lngcylz2sc87fxy5skxaahxdl"; depends=[]; };
   stringr = derive2 { name="stringr"; version="1.3.0"; sha256="07dvfbkhv8gk6l32j43jvxpmqlhqp0mdby406h5a3bsc6k94ic13"; depends=[glue magrittr stringi]; };
   strip = derive2 { name="strip"; version="0.1.1"; sha256="18pz6ix6d661fvg1k1yyyiiwa1gdixynmpxl725ffd9lpykmfqbw"; depends=[rlist]; };
   stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; };
@@ -11343,7 +11569,7 @@ in with self; {
   stsm_class = derive2 { name="stsm.class"; version="1.3"; sha256="19jrja5ff31gh5k2zqhqsyd7w2ivr4s6bkliash6x8fmd22h5zs8"; depends=[]; };
   stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; };
   styler = derive2 { name="styler"; version="1.0.1"; sha256="01iy3p0jn57c2glq2a5wh7ds3fyxlmcjpvxnmafvvvlhca73zw88"; depends=[backports cli enc magrittr purrr rematch2 rlang rprojroot tibble withr]; };
-  stylo = derive2 { name="stylo"; version="0.6.5"; sha256="15y7iwk1w9kkdhpbgbvi1cqzza4jgw8zxsp3xbqzhm4qaf4kymia"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
+  stylo = derive2 { name="stylo"; version="0.6.6"; sha256="01kkwzhpcf6nrvbj2dgyh2a10p48gxlgq78smv5x8cn8vcfl1ixa"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; };
   suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; };
   subcopem2D = derive2 { name="subcopem2D"; version="1.2"; sha256="1yrjqg3y6i5m6k0zljq1p1pciicmc1vig3qd0wxaicz708rbp3yq"; depends=[]; };
   subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; };
@@ -11352,7 +11578,7 @@ in with self; {
   sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; };
   submax = derive2 { name="submax"; version="1.1.1"; sha256="0b9x55gqzw20smr3hx9izvyr0i8zv0h03hadn4c7ks7w8ga5i0kj"; depends=[mvtnorm sensitivityfull]; };
   subniche = derive2 { name="subniche"; version="0.9.7"; sha256="1jsdcaf6d38j7c0ppjyilj0jd2dbpdldw6w4prmsbmx8mh7lplww"; depends=[ade4]; };
-  subplex = derive2 { name="subplex"; version="1.5-2"; sha256="1v9xrnkapnq7v1jbhlg32ignklzf2vn8rqpayc8pzk8wvz53r33g"; depends=[]; };
+  subplex = derive2 { name="subplex"; version="1.5-4"; sha256="10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z"; depends=[]; };
   subprocess = derive2 { name="subprocess"; version="0.8.2"; sha256="1qyl8726vq94vqd6iyh9kca6wwxi3g7yv4b784wn2ifrm4waixxd"; depends=[]; };
   subrank = derive2 { name="subrank"; version="0.9.9"; sha256="1z6sp9rfmpy28gpw13bh0c7y98lbbgv1cciavg3gix01whqa49n3"; depends=[]; };
   subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; };
@@ -11368,8 +11594,8 @@ in with self; {
   sugrrants = derive2 { name="sugrrants"; version="0.1.1"; sha256="08f5xdgimdvpivzrlwvdyrmy21nbh379pgfdrx4lxqcxd55y2hil"; depends=[dplyr ggplot2 lubridate purrr readr rlang tidyr timeDate]; };
   sumFREGAT = derive2 { name="sumFREGAT"; version="1.0.0"; sha256="13g3px3c3dxacrvgwrvqdp8lm7k185npr0dlq3siq9x9mgjr7hsj"; depends=[Matrix]; };
   summariser = derive2 { name="summariser"; version="0.1.0"; sha256="0a6wyb0r1i0cynld002q96ylr58jz76n5jqjz8gm6a3csjn9qss7"; depends=[dplyr ggplot2 lazyeval plotrix]; };
-  summarytools = derive2 { name="summarytools"; version="0.8.2"; sha256="014hxyk0r87j5prqdckxy7h41agk2p1w1kxzl0a3pxwbj1j0r2fh"; depends=[htmltools matrixStats pander pryr rapportools RCurl]; };
-  sunburstR = derive2 { name="sunburstR"; version="1.0.3"; sha256="0xxxi01klrm7kspi588n4h5zdzhph5vihs26n2x8fdm2k82jyjp9"; depends=[d3r dplyr htmltools htmlwidgets]; };
+  summarytools = derive2 { name="summarytools"; version="0.8.3"; sha256="0b61131yns1ip4r5qgrfbwd6dqsgg349jfhlgfkvlszh5b9jqhnf"; depends=[htmltools matrixStats pander pryr rapportools RCurl]; };
+  sunburstR = derive2 { name="sunburstR"; version="2.0.0"; sha256="1gkrgm90ps5i1k5cqdw6sbvd4jgbk4yq82gwd5m1z1jhv1shfsf4"; depends=[d3r dplyr htmltools htmlwidgets]; };
   suncalc = derive2 { name="suncalc"; version="0.4"; sha256="190bnh26bl26piq6512ijrx2hygzdscryjsjyz8y4ara8bf646r3"; depends=[V8]; };
   supc = derive2 { name="supc"; version="0.1"; sha256="1cq0lr04m409xr3i1hphww4ldr8z3kqq2gmp7hm3yp0iz2gy3m9a"; depends=[BH Rcpp]; };
   supclust = derive2 { name="supclust"; version="1.0-7"; sha256="0437pccagvqv6ikdsgzpif9yyiv6p24lhn5frk6yqby2asj09727"; depends=[class rpart]; };
@@ -11404,21 +11630,21 @@ in with self; {
   survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; };
   surveillance = derive2 { name="surveillance"; version="1.16.0"; sha256="1nbskhbs8qfwnchig4rckbgy296ifl1hx0w3v71knj693x54r9cj"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; };
   survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; };
-  survey = derive2 { name="survey"; version="3.33"; sha256="11pmk26hirq5p7p4131crpb175hvgg4id5y5m14rskpx8nbp9l94"; depends=[lattice Matrix survival]; };
+  survey = derive2 { name="survey"; version="3.33-2"; sha256="1c4q0005663b0y87ckmf1ra7gm2i5hnlw955pgb11bywh60hg9hl"; depends=[lattice Matrix survival]; };
   surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; };
   surveydata = derive2 { name="surveydata"; version="0.2.0"; sha256="1iwhjhazfy38dbcj224kz3zbw2nvpq01ry54wmmkg9d0n6mb02h4"; depends=[dplyr magrittr plyr purrr stringr]; };
   surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; };
   surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; };
   surveyplanning = derive2 { name="surveyplanning"; version="2.9"; sha256="0ad4122m78hbzhkkaspzpr62bl59w1j8z0qa67slqljjldhq1akv"; depends=[data_table laeken]; };
-  survidm = derive2 { name="survidm"; version="1.0.0"; sha256="13iwl687g4qps6s3d8x0xr916b2ja6487dwnyqwc3nwr6gadqicw"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; };
+  survidm = derive2 { name="survidm"; version="1.1.0"; sha256="1piwhb8zsqnw284xp0l3ajs8r9amyn8yfng19hkci574mkdgsw4f"; depends=[doParallel doRNG foreach KernSmooth np survival TPmsm]; };
   survivALL = derive2 { name="survivALL"; version="0.9.2"; sha256="0mqmlmip6lr1d6i8yj4kc1zzj5jvvqrkipqxlprsrqbwni2ipp7l"; depends=[cowplot desiR ggplot2 ggthemes survcomp survival viridis]; };
-  survival = derive2 { name="survival"; version="2.41-3"; sha256="07cnr0hnki6ybbjll54l4s5lllhk19vni5f8m0mvsfp99ls7qygk"; depends=[Matrix]; };
+  survival = derive2 { name="survival"; version="2.42-3"; sha256="15pasbfzmg2r5bfpsadp9ia4cpybqz6n1kwm7ma02ykzf7bk4xx0"; depends=[Matrix]; };
   survivalMPL = derive2 { name="survivalMPL"; version="0.2"; sha256="05bfa9fx841kh9g2jcs1dimsxkjnf4bxgamcnjpisx3a644c1gkn"; depends=[MASS survival]; };
   survivalROC = derive2 { name="survivalROC"; version="1.0.3"; sha256="0wnd65ff5w679hxa1zrpfrx9qg47q21pjxppsga6m3h4iq1yfj8l"; depends=[]; };
   survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; };
   survminer = derive2 { name="survminer"; version="0.4.2"; sha256="15npx3q7xf7sl7pbb1476khgfpqrvidqcb101iim3iym125sl54r"; depends=[broom cmprsk dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; };
   survsim = derive2 { name="survsim"; version="1.1.4"; sha256="16njbqlzmk34zrh485kc0a52yacdyj9z4z4a9zcq1z5psm87c58m"; depends=[eha statmod]; };
-  survtmle = derive2 { name="survtmle"; version="1.0.0"; sha256="1sdp88br1ry6yzzav67787n0clpq6vjffxqpkvld93dyvmlb6zb1"; depends=[ggplot2 Matrix plyr stringr SuperLearner tidyr]; };
+  survtmle = derive2 { name="survtmle"; version="1.1.0"; sha256="0q1ym4a13xqy3lqjwg40wp28xlp1iqybwq7dd0gp6fnmx3n6373g"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; };
   survutils = derive2 { name="survutils"; version="1.0.1"; sha256="09844i5nfyn0fm5i8ca96xz8dza21shh2f89w41zh17xaxvidjsw"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; };
   sutteForecastR = derive2 { name="sutteForecastR"; version="0.1"; sha256="13dd0v3l3s7xb1wnpf6qvnvclzab87831z8bsxsq53vpb26xcw1b"; depends=[forecast forecastHybrid fracdiff robets]; };
   svDialogs = derive2 { name="svDialogs"; version="0.9-57"; sha256="1qwnimzqz7jam3jnhpr90bgwp9zlsswy2jl17brdpsrpiwcg6jlr"; depends=[svGUI]; };
@@ -11445,11 +11671,12 @@ in with self; {
   svglite = derive2 { name="svglite"; version="1.2.1"; sha256="1bws3lc4hlhln11zd7lalhiyc43yk6c6vrzy41fkxk1dkjazfx51"; depends=[BH gdtools Rcpp]; };
   svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; };
   svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; };
+  svrpath = derive2 { name="svrpath"; version="0.1.1"; sha256="0j38m34ff5a8lqfsss8444fflprai3sgzi9kyrmingp07rx82ss5"; depends=[quadprog svmpath]; };
   svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; };
   svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; };
   swCRTdesign = derive2 { name="swCRTdesign"; version="2.2"; sha256="0kggniy5p900cj074swh7g47zf8bhwjmqph9b5frw86nycxwyn3v"; depends=[]; };
   swa = derive2 { name="swa"; version="0.8.1"; sha256="1zy1a6c17vmdkmkwp8vv3niww2zs1m0hylsa0b2cz68vfhnmpim4"; depends=[ggplot2 reshape ROCR]; };
-  swagger = derive2 { name="swagger"; version="3.4.0"; sha256="1590335n9l1s65li5018m0r3ss67ccgy10lnywxi2ypya71c58zs"; depends=[]; };
+  swagger = derive2 { name="swagger"; version="3.9.2"; sha256="13scbzv65qzxh7kfwlb2k47zgvv7fz085g5lki6zr5w6a33g45q9"; depends=[]; };
   swamp = derive2 { name="swamp"; version="1.3.1"; sha256="1l4rk79hbggn31y5skslqsz9bv7lmya4q5ligki3x1677345hyhv"; depends=[amap gplots impute MASS]; };
   swapClass = derive2 { name="swapClass"; version="1.0.1"; sha256="0wg6km261xdywakxi64dw4wwprbrkw217q4c6622z0mgm9sjgpym"; depends=[inline]; };
   swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; };
@@ -11460,7 +11687,7 @@ in with self; {
   swirlify = derive2 { name="swirlify"; version="0.5.2"; sha256="07r6rdj079ryafdgs0p8jhnk4h7iqm7agh9wjhvm12abbwjr9g1x"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; };
   switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; };
   switchr = derive2 { name="switchr"; version="0.12.7"; sha256="1ymvghjvbrbsgn49mp8f9n4kv81626pa4pv05hrx813ly8h30mmq"; depends=[RCurl RJSONIO]; };
-  swmmr = derive2 { name="swmmr"; version="0.8.0"; sha256="0cyr5x8k6agrgflqp14lxbas0yslwkz432ks71svqhdrl7dd5sg2"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; };
+  swmmr = derive2 { name="swmmr"; version="0.8.1"; sha256="0zl00864x9q6a2aqdbqs3b5kw6z50wgr46c62kxk9xkns8317sa7"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; };
   sybil = derive2 { name="sybil"; version="2.0.4"; sha256="0iyqr9iyb4bydmzjzrc721nzf5q36p2i3zciai9rzjlwx2mdw930"; depends=[lattice Matrix]; };
   sybilDynFBA = derive2 { name="sybilDynFBA"; version="1.0.1"; sha256="1zyhvlzkcwnq3sh6gvi0v1crq94mr16bc5jnh0g9c8rbdl4v8r4x"; depends=[sybil]; };
   sybilEFBA = derive2 { name="sybilEFBA"; version="1.0.2"; sha256="07c32xwql7sr217j8ixqd2pj43hhyr99vjdh7c106lsmqd1pifa4"; depends=[Matrix sybil]; };
@@ -11469,22 +11696,23 @@ in with self; {
   sylcount = derive2 { name="sylcount"; version="0.1-0"; sha256="1dxbqbjyvkg7cx234icby9fjdjz1z4l4crqd7kv8m05fv69pg224"; depends=[]; };
   syllable = derive2 { name="syllable"; version="0.1.3"; sha256="1ymnczwx58h720hsm0s9zq3ddwg6gn6bgg0m8zw24i0nlivx0yjg"; depends=[data_table stringi textclean textshape]; };
   sylly = derive2 { name="sylly"; version="0.1-4"; sha256="14lw5sxrdvidk0465a7x0jz74cvqjbqv0wlqdy78qzbq4ilcmcaa"; depends=[]; };
+  sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; };
   symDMatrix = derive2 { name="symDMatrix"; version="1.0.0"; sha256="0xss7f7hkrf2afchccfavymylfybnp9nxawqxd2vdjni95kbd595"; depends=[]; };
-  symbolicDA = derive2 { name="symbolicDA"; version="0.4-3"; sha256="012ha8m3137gns0q38lanpijdrqq6kcw934f2jgnxj6inl6drca0"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; };
+  symbolicDA = derive2 { name="symbolicDA"; version="0.5-3"; sha256="1zbr8b19m3fnzx0bdajl86s6aijiycjdibf9q83wd6mgpq66jb85"; depends=[ade4 cluster clusterSim e1071 rgl shapes XML]; };
   symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; };
   symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; };
   synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; };
-  synbreed = derive2 { name="synbreed"; version="0.12-6"; sha256="03h3j2g6ynnbmsc6yhbmmmrwj69jf3gjpp1wnsd02yc5kf4r1q57"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; };
+  synbreed = derive2 { name="synbreed"; version="0.12-9"; sha256="0h85z9bhzgsr783qx3zjqyi461a0q52wbqifwm3gc1kapl5irxhd"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; };
   synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; };
   synchronicity = derive2 { name="synchronicity"; version="1.3.2"; sha256="1idrjzl7nkamf1ip55s6qcf64s63xs9j8z9jv3r89p6r5lw7k5mv"; depends=[BH bigmemory_sri Rcpp uuid]; };
   synchrony = derive2 { name="synchrony"; version="0.2.3"; sha256="0fi9a3j8dfslf1nqx8d53fi635y3aq8isxw0dbjbpgk7rc71nzby"; depends=[]; };
   synlik = derive2 { name="synlik"; version="0.1.1"; sha256="0g4n78amydihsq4jg2i9barjm9g40zczasb31fj10yn6wir1dhv7"; depends=[Matrix Rcpp RcppArmadillo]; };
   synthACS = derive2 { name="synthACS"; version="1.0.1"; sha256="0jbhiadgc8f6h7ga685cm5i8y59lf76r8sgd629xfjj4jxn8ckdm"; depends=[acs data_table Rcpp]; };
-  synthpop = derive2 { name="synthpop"; version="1.4-1"; sha256="0725gv7b7kj564rf0nz6djvk58i39d9vv4g12qmgnsipgjs9rsrw"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
+  synthpop = derive2 { name="synthpop"; version="1.4-3"; sha256="1smibiid3hav7w9yky0n6ci160h69v16kkilmm00gady6w7j8drh"; depends=[classInt foreign ggplot2 lattice MASS nnet party plyr polspline proto randomForest rpart]; };
   sys = derive2 { name="sys"; version="1.5"; sha256="0yskm5mzps4435yvld9nfp6i5lqdy5ckpdwydvvbyjznz5yv01x2"; depends=[]; };
   sysfonts = derive2 { name="sysfonts"; version="0.7.2"; sha256="1jl66pyw9khi117523zanjjzdpnpgqdqx190w829xc4ljxzi8n55"; depends=[]; };
   sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; };
-  systemfit = derive2 { name="systemfit"; version="1.1-20"; sha256="1qzgx4hn6f71hnk70ccf6inajprrb6my5af8q2manz41577z0ka7"; depends=[car lmtest MASS Matrix sandwich]; };
+  systemfit = derive2 { name="systemfit"; version="1.1-22"; sha256="19nmhidnzyk2wcwi5v28n9lkvylfw4in63vg5naqlk3w4fbwm2wb"; depends=[car lmtest MASS Matrix sandwich]; };
   systemicrisk = derive2 { name="systemicrisk"; version="0.4.1"; sha256="1zimkyj58lk3iq5x4g6a76dain65j36s8c8jhx25sqjr5z2zmfsr"; depends=[lpSolve Rcpp]; };
   syuzhet = derive2 { name="syuzhet"; version="1.0.4"; sha256="0wf4rls7v7h7zkq2k550d16aqvaij27iim85cwif7dkbinajfngi"; depends=[dplyr dtt NLP textshape tidyr zoo]; };
   tRophicPosition = derive2 { name="tRophicPosition"; version="0.7.5"; sha256="0qmkdsl0b2aw485vpbdqxdlfwg5a3i5bj4l67xv6h51fnbyfqfiz"; depends=[ArgumentCheck coda data_table ggplot2 gridExtra hdrcde MCMCglmm plyr rjags]; };
@@ -11500,14 +11728,15 @@ in with self; {
   tables = derive2 { name="tables"; version="0.8.3"; sha256="1n0kqsvwx2vg7nwyz7hi708xpf2jc9bz3y84aflnzcmbspj1wvf3"; depends=[Hmisc]; };
   tabplot = derive2 { name="tabplot"; version="1.3-1"; sha256="0yz3npn36q93gr0k9a4x5swap5fwxfc22b131kif3dfxkgklna06"; depends=[bit ff ffbase]; };
   tabplotd3 = derive2 { name="tabplotd3"; version="0.3.3"; sha256="0mbj45vb17wlnndpkhvq7xaawsb814x7zxa4rqbfgidvbm1p3abv"; depends=[brew httpuv RJSONIO Rook tabplot]; };
-  tabuSearch = derive2 { name="tabuSearch"; version="1.1"; sha256="0bri03jksm314xy537dldbdvgyq6sywfmpmj2g2acdcli31kkpq0"; depends=[]; };
+  tabr = derive2 { name="tabr"; version="0.1.2"; sha256="1c9r6lx12xadv0c0068zxgx29nnf2hdbbrybm6bs27scizaxzhd2"; depends=[dplyr magrittr purrr tibble]; };
+  tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; };
   tabularaster = derive2 { name="tabularaster"; version="0.4.0"; sha256="1hgbynjp19xwpin31j0647ldbzxam2kmkqnvj6v8kd4svps0kr3g"; depends=[dplyr raster sp spbabel spex tibble viridis]; };
   tactile = derive2 { name="tactile"; version="0.1.0"; sha256="0ygray05jlxrg7mxg412s04jrxjyskxlrl0xgxir8s6mzjg79iqy"; depends=[gridExtra lattice latticeExtra MASS RColorBrewer]; };
   tadaatoolbox = derive2 { name="tadaatoolbox"; version="0.16.0"; sha256="0i69zyiqq8mc5wfc9r43dpcjhwmq4iwj605n4a6h4hma37jjnc2g"; depends=[broom car DescTools ggplot2 magrittr nortest pixiedust pwr viridis]; };
   tagcloud = derive2 { name="tagcloud"; version="0.6"; sha256="04zrh029n8pjlxlr6pdd7xhqqhavbrj3fhvhj6ygzlvi2jslxnwl"; depends=[RColorBrewer Rcpp]; };
   tailDepFun = derive2 { name="tailDepFun"; version="1.0.0"; sha256="1z2jrzly1adiwi8y0pndyfggpr0li6sjv9rkrc5mi47s0qjvr5qj"; depends=[copula cubature mvtnorm SpatialExtremes]; };
   tailloss = derive2 { name="tailloss"; version="1.0"; sha256="0lmjgjs6d94b70i10vx66fyvlxm5swwqbcjsnqa3lmldzz6m4jc1"; depends=[MASS]; };
-  tailr = derive2 { name="tailr"; version="0.1.0"; sha256="1i7dvmmqrg2hylf5n1kwr5m6xc3ydcvfi5fx2dx9zapsv9bhlr4v"; depends=[glue rlang]; };
+  tailr = derive2 { name="tailr"; version="0.1.1"; sha256="07irl0fzg9skpv9kl211ar3yf68lcrpd2rcplkzbm242yb772z1v"; depends=[glue rlang]; };
   tangram = derive2 { name="tangram"; version="0.3.2"; sha256="1dyfyl608k6a7vx9w0s2r6jr0y430qvkqkrrv24wav7snza4d5q2"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; };
   tatoo = derive2 { name="tatoo"; version="1.1.0"; sha256="1dsycdp3vln1m1w3nhhrr60x8raw6gbihjpav0d4ad8qla2fq8nh"; depends=[assertthat colt crayon data_table magrittr openxlsx purrr rlang stringi withr]; };
   tau = derive2 { name="tau"; version="0.0-20"; sha256="1inpqc2cz1vvjkmp8h3jpjvnvj0y5cwbbj92jlq0322w5w45vip9"; depends=[]; };
@@ -11515,7 +11744,7 @@ in with self; {
   tawny = derive2 { name="tawny"; version="2.1.6"; sha256="0s6p0nnz1rpcnn2yfj1vvl54g57d8rv5s4y09azwz1z5ls7vnnlv"; depends=[futile_logger futile_matrix lambda_r lambda_tools PerformanceAnalytics quantmod tawny_types xts zoo]; };
   tawny_types = derive2 { name="tawny.types"; version="1.1.3"; sha256="1v0k6nn45rdczjn5ymsp2fqq0ijnlniyf3bc08ibd8yd1jcdyjnj"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; };
   taxa = derive2 { name="taxa"; version="0.2.0"; sha256="16jif3s5xf4cawwkhpmjrwb0c4ycmwicrshd5m0arlkcfmq85623"; depends=[dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr tibble]; };
-  taxize = derive2 { name="taxize"; version="0.9.2"; sha256="15xv9j644a9zcbywx57ba6x6rsdj0pywdq58zak2fyx7c7fwpahm"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; };
+  taxize = derive2 { name="taxize"; version="0.9.3"; sha256="05llhgv6a440va80fs45r8q6865q45gi4z28b1ldcln0dmx77r7c"; depends=[ape bold crul data_table foreach httr jsonlite natserv plyr reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; };
   taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; };
   taxlist = derive2 { name="taxlist"; version="0.1.3"; sha256="0lsphap7brl67y458x29843wkxvvf2ppjn1crz4hby7wmn1psarx"; depends=[foreign taxize vegdata]; };
   taxonomizr = derive2 { name="taxonomizr"; version="0.2.2"; sha256="0drzsbr23kr3da6bawjrz8rl976mai0vcz19fr5aypsliqz32b41"; depends=[data_table R_utils RSQLite]; };
@@ -11565,9 +11794,9 @@ in with self; {
   texmex = derive2 { name="texmex"; version="2.4"; sha256="0s3x681f1qnbgmzi5iwqpmkfzpx9gsccd3q1vz1dppzq8fbid3c2"; depends=[ggplot2 mvtnorm]; };
   texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; };
   text2vec = derive2 { name="text2vec"; version="0.5.1"; sha256="0vcp50mgpgxbf534vd8l56m8006i3sh8a4v9nrf9vxkq2pv7xygc"; depends=[data_table digest foreach futile_logger irlba Matrix mlapi R6 Rcpp RcppParallel sparsepp stringi]; };
-  textTinyR = derive2 { name="textTinyR"; version="1.0.9"; sha256="1spzmxywzx6xk9z8jwhyab1g96rjq979zkb4sabl0sp362ccalfy"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
+  textTinyR = derive2 { name="textTinyR"; version="1.1.0"; sha256="129ha0187vw4q5lw3xgch2k4fh9kfjrvvx2bb8bm3rd2skdhajj1"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; };
   textcat = derive2 { name="textcat"; version="1.0-5"; sha256="039bzyz4jvh1hl2a2pfp328kr2mpb1a07j79yqf5cbqk3d5a197b"; depends=[slam tau]; };
-  textclean = derive2 { name="textclean"; version="0.6.3"; sha256="0i6linb782257clkdpl7rv354myl9wc1417ad2glhh53lgcprfk2"; depends=[data_table english lexicon qdapRegex stringi textshape]; };
+  textclean = derive2 { name="textclean"; version="0.7.2"; sha256="13g8k7i7j33g4bzqps638k0j1gyms740wyz7d0205cqm70kzz8m3"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; };
   texteffect = derive2 { name="texteffect"; version="0.1"; sha256="0fwcbz7bpynvcivac16z77j8d398bf7vl4l8sppi9yvg72l0k94w"; depends=[boot ggplot2 MASS]; };
   textfeatures = derive2 { name="textfeatures"; version="0.1.1"; sha256="0pcs3nax21npb5blbwrmzl7q85ya8n7vgjn83z2abjr80gj3f5lj"; depends=[dplyr rlang tibble]; };
   textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; };
@@ -11581,7 +11810,7 @@ in with self; {
   textreg = derive2 { name="textreg"; version="0.1.4"; sha256="0k7hpvvhacz29d3mvnygg6rqmh9f3ghkcp7kjmvv9jnr2ipw2j21"; depends=[NLP Rcpp tm]; };
   textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; };
   textshape = derive2 { name="textshape"; version="1.5.0"; sha256="0hvp3mz7j2qkw38jg9cj92ikhyic1c9w8jk07z3vh3f5cm1klvbm"; depends=[data_table slam stringi]; };
-  textstem = derive2 { name="textstem"; version="0.1.2"; sha256="172y1hvxhb33syqj5y369aq7fvcyn659cx6abcz7i5na8q1v9v0l"; depends=[dplyr hunspell koRpus lexicon quanteda SnowballC stringi textclean textshape]; };
+  textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; };
   textutils = derive2 { name="textutils"; version="0.1-6"; sha256="0xvsd6pfg4kv40l14xcvmirqiq8rmky4s8v8diagzri3a7i45nqn"; depends=[]; };
   tfdatasets = derive2 { name="tfdatasets"; version="1.5"; sha256="1ik6rzfnjmm54m7s2rvp1bq5jk0k2vl631bz3db3dk639jndiz6a"; depends=[magrittr reticulate rlang tensorflow tidyselect]; };
   tfer = derive2 { name="tfer"; version="1.1"; sha256="19d31hkxs6dc4hvj5495a3kmydm29mhp9b2wp65mmig5c82cl9ck"; depends=[]; };
@@ -11598,7 +11827,7 @@ in with self; {
   themetagenomics = derive2 { name="themetagenomics"; version="0.1.0"; sha256="1p8qyvll6a9yx2akny1087f73r6p5zi6cf1si7b8i786bcs9khwj"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; };
   thermocouple = derive2 { name="thermocouple"; version="1.0.2"; sha256="1rlvhw3i83iq1vibli84gj67d98whvgkxafwpmisva1m4s1bmij4"; depends=[]; };
   theseus = derive2 { name="theseus"; version="0.1.0"; sha256="1f6vl0m8fcchafn78vrfw610d0sp9rf8kd3q5n7b0zd2yby10dq0"; depends=[dplyr ggplot2 gridExtra magrittr phyloseq ShortRead splancs tidyr tidyverse vegan viridis]; };
-  thgenetics = derive2 { name="thgenetics"; version="0.3-4.1"; sha256="05g5rwdpnd1b4h1lay2l1s0ns2q6a7sav8d4zrxaqgzhaafnpxyv"; depends=[]; };
+  thgenetics = derive2 { name="thgenetics"; version="0.4-2"; sha256="1314gry3xs9v4jy13g08q16qy4ax3s0bc7d74gi0wbpkgdrk3lql"; depends=[]; };
   thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; };
   thinkr = derive2 { name="thinkr"; version="0.11"; sha256="1rr90q91nn406n2sbn3k9q5y1mjcb4i4ixsp05mh38r9qjkbirhk"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr ReporteRs stringi stringr tidyr XLConnect]; };
   threeboost = derive2 { name="threeboost"; version="1.1"; sha256="033vwn42ys81w6z90w5ii41xfihjilk61vdnsgap269l9l0c8gmn"; depends=[Matrix]; };
@@ -11613,10 +11842,10 @@ in with self; {
   tibbrConnector = derive2 { name="tibbrConnector"; version="1.5.1"; sha256="1r58myi7x4hqqvyrphxy4ppa1lnad6x2ginfq2j52ax53zr07ajp"; depends=[RCurl rjson]; };
   tictactoe = derive2 { name="tictactoe"; version="0.2.2"; sha256="1fx8plj5zr04xwk5hfj3zqhcknidxlzya2q14cf0m3y33a86lx42"; depends=[hash]; };
   tictoc = derive2 { name="tictoc"; version="1.0"; sha256="1zp2n8k2ax2jjw89dsri268asmm5ry3ijf32wbca5ji231y0knj7"; depends=[]; };
-  tidyLPA = derive2 { name="tidyLPA"; version="0.1.2"; sha256="11xc8lnhs63ykaq2g3jzrp4kz48zz03cvw5s935fvhsp05drf6g5"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; };
+  tidyLPA = derive2 { name="tidyLPA"; version="0.1.3"; sha256="1yk9abn21ycfdr1h43shjaymga5j9z862mp1zbwj2wbxxv6m5pp7"; depends=[dplyr forcats ggplot2 magrittr mclust purrr readr rlang stringr tibble tidyr]; };
   tidyRSS = derive2 { name="tidyRSS"; version="1.2.3"; sha256="1m21cwdbhial4h3084vqs0j6zwa267ia75gyjivprqjzcccjaqdp"; depends=[dplyr httr jsonlite lubridate magrittr purrr testthat tibble xml2]; };
-  tidyboot = derive2 { name="tidyboot"; version="0.1.0"; sha256="1h997hrwacm91myhy93jrinx0h715da76wm9kwz9nwwzisv62m6k"; depends=[dplyr modelr purrr rlang tidyr]; };
-  tidycensus = derive2 { name="tidycensus"; version="0.4.1"; sha256="1ay6qw25r809fpgs0fsvblgsrpi91ph82mm2w21vj59gba1bkr71"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
+  tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; };
+  tidycensus = derive2 { name="tidycensus"; version="0.4.6"; sha256="1czfdwm5bn0xpqm43mvb5bd30m5kdxikaq21gxkj41r78z69qncl"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; };
   tidygenomics = derive2 { name="tidygenomics"; version="0.1.0"; sha256="0n6km2zhdmbgacn6rzamrn506d9y3sl6yp2q6fd9x7kzgz09aq4n"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp tidyr]; };
   tidygraph = derive2 { name="tidygraph"; version="1.1.0"; sha256="1cqmii1pia5s8cj1hfm5jh4qgg9dn65dcb666bqfhq51nzgwy6b4"; depends=[dplyr igraph magrittr R6 Rcpp rlang tibble tidyr]; };
   tidyhydat = derive2 { name="tidyhydat"; version="0.3.3"; sha256="01l4dwsrrmfavskbqxcq5v1ykggk363nn0m0nf6ks51xdr7lckf5"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr RSQLite tibble tidyr]; };
@@ -11629,10 +11858,10 @@ in with self; {
   tidyselect = derive2 { name="tidyselect"; version="0.2.4"; sha256="1592dbzawhd1hpsp9919l4sifyiaaj6xr7lnhsbwa6jwmmb0xcsw"; depends=[glue purrr Rcpp rlang]; };
   tidystats = derive2 { name="tidystats"; version="0.1"; sha256="0dy4yqdc0y8pmix29100x80q828rapnq9y3qn2p6rs763c7canmr"; depends=[dplyr magrittr purrr readr tibble tidyr]; };
   tidystringdist = derive2 { name="tidystringdist"; version="0.1.2"; sha256="1jk5yqkjf33arbbfgfzk7ym943gy95n3yncybmvwbjsff07qpmaw"; depends=[attempt dplyr magrittr purrr rlang stringdist]; };
-  tidytext = derive2 { name="tidytext"; version="0.1.7"; sha256="1pvf46z1jiwi1j0z917mml1cg9527zkdckh8h3d1ks4wawz099a9"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
-  tidytree = derive2 { name="tidytree"; version="0.1.7"; sha256="1hf4xzdaww9vbh7ii88p43fpd8344zvqnw20ylvx58f7p82yl23b"; depends=[ape dplyr lazyeval magrittr tibble]; };
+  tidytext = derive2 { name="tidytext"; version="0.1.8"; sha256="10w3h71pqbfa0n5b0a63vajc7hbwjy8bazdwmi8260zz82fvhfvl"; depends=[broom dplyr hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; };
+  tidytree = derive2 { name="tidytree"; version="0.1.8"; sha256="0nhhr0qmigvvzchy4pgg7pm2cn50li4zg37b4bdlhkzfzhxz4y3m"; depends=[ape dplyr lazyeval magrittr tibble]; };
   tidyverse = derive2 { name="tidyverse"; version="1.2.1"; sha256="0yy3fkjksgcn6wkbgsb0pbnmsyqs4m01mziqafhig578nixs4rxd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; };
-  tidyxl = derive2 { name="tidyxl"; version="1.0.0"; sha256="1bsvxsz24qbk9wca8kh4qrb4fi22i49vpciq1pm5c48jb11bjb6b"; depends=[piton Rcpp]; };
+  tidyxl = derive2 { name="tidyxl"; version="1.0.1"; sha256="10ckabv7aa744wxs3d5y9cd3a4c0x89gg91l23w7ddvcgjziq7an"; depends=[piton Rcpp]; };
   tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; };
   tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; };
   tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; };
@@ -11640,8 +11869,8 @@ in with self; {
   tigger = derive2 { name="tigger"; version="0.2.11"; sha256="1kbqlfr3lsiiv0l7dzahna706zb4mx0gfx91220n2ckfc81pyrv5"; depends=[alakazam doParallel dplyr foreach ggplot2 iterators lazyeval tidyr]; };
   tightClust = derive2 { name="tightClust"; version="1.0"; sha256="0psyzk6d33qkql8v6hzkp8mfwb678r95vfycz2gh6fky7m5k3yyz"; depends=[]; };
   tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.4"; sha256="0c733mb2fzskrfa4664w6psp80wdr5hc7f9rp516y59a8rr3xzr0"; depends=[DBI RSQLite]; };
-  tigris = derive2 { name="tigris"; version="0.6.2"; sha256="0m4zramm38111rzifh0lqyly2dgdfgg5y39sns2rp8x1n0b69bc2"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
-  tikzDevice = derive2 { name="tikzDevice"; version="0.10-1.2"; sha256="1rwxmjwmjr1dssg9dx7rc6nz11225pz2ac9rhp8581slwzw79icl"; depends=[filehash png]; };
+  tigris = derive2 { name="tigris"; version="0.7"; sha256="0azfp8ahf63a10862669wsamf0270rcyrmknc331vjs52b3qlrvl"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; };
+  tikzDevice = derive2 { name="tikzDevice"; version="0.11"; sha256="09qbwf7k2512q7yimabfr97birvspkn13hyybqsgqm1iiaiwwps3"; depends=[filehash png]; };
   tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; };
   tilting = derive2 { name="tilting"; version="1.1.1"; sha256="0srvxjv3sg35n7f8pam45ny1z1dxwqjkrz9d91hf67a3fi34f5gk"; depends=[mvtnorm]; };
   time2event = derive2 { name="time2event"; version="0.1.0"; sha256="1xkvarw53lcn07wqq7ly5znr6vjq7x72xb0piq5igdmwqmg2y26g"; depends=[survival timereg]; };
@@ -11664,9 +11893,9 @@ in with self; {
   timma = derive2 { name="timma"; version="1.2.1"; sha256="1pypk0pwkhyilh1hsn8hasia1hf6hbskj0xw6vas03k19b6fjnli"; depends=[QCA Rcpp RcppArmadillo reshape2]; };
   timsac = derive2 { name="timsac"; version="1.3.6"; sha256="186919qka9j3kfpdw2gbh16n48d6xgz9lfqgk4b17f1d7l72iplg"; depends=[]; };
   tinsel = derive2 { name="tinsel"; version="0.0.1"; sha256="0n1x0cf4x6cq1yks0444nxd9snga4m6inc5lfvb7k96fzjb3xgbp"; depends=[]; };
-  tint = derive2 { name="tint"; version="0.0.5"; sha256="1283rik1ynnhy40lm1dipmwzihsy0pdn383k9m1yczl2fqf1qcfi"; depends=[htmltools knitr rmarkdown]; };
+  tint = derive2 { name="tint"; version="0.1.0"; sha256="1hczc2nrm8xgvw3igkfnlqyz73686l447kigsrd6m796v8ny1gbf"; depends=[htmltools knitr rmarkdown]; };
   tinyProject = derive2 { name="tinyProject"; version="0.5"; sha256="10sllhjcla4pfgp5n1y5vi318q9bcy82j88rx3k1sgzmbq1nc1c2"; depends=[brew devtools]; };
-  tinytex = derive2 { name="tinytex"; version="0.4"; sha256="0ipmv5jrp6kkfj4m4zvhfys54x34zi15lzdxbgzmnil9lyn391zm"; depends=[]; };
+  tinytex = derive2 { name="tinytex"; version="0.5"; sha256="1pg4jfyvandjwz3lmr38pbqi9d045iwkk3xklhsfhhxq6aviq9p7"; depends=[]; };
   tipom = derive2 { name="tipom"; version="1.0.2-1"; sha256="1gdfv0g5dw742j6ycmi0baqh6xcchp3yf2n1g8vn7jmqgz5mlhdr"; depends=[]; };
   tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; };
   tis = derive2 { name="tis"; version="1.34"; sha256="01bpl8q2n49wpr2gghkcv1zf16b3375xa71mv0q7wwn0da3n7m0n"; depends=[]; };
@@ -11687,12 +11916,12 @@ in with self; {
   tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.3.1"; sha256="15k4bzx1p271yzskkijlf2pm6m7pb5dqxmfab9rhwynllszv96if"; depends=[ISOcodes NLP tm XML]; };
   tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.1"; sha256="0ca2w2p5zv3qr4zi0cj3lfz36g6xkgkbck8pdxq5k65kqi5ndzyp"; depends=[NLP tm]; };
   tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; };
-  tmap = derive2 { name="tmap"; version="1.11-1"; sha256="0day8hy210a2v2ps9pqcv4mnlx39h7dcj47hkyjsm76qlcdccv3l"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; };
-  tmaptools = derive2 { name="tmaptools"; version="1.2-3"; sha256="08m8dir5k7da72fp3hcsb055alwzpbxr2f9lxmhdbk991bmwacjr"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; };
+  tmap = derive2 { name="tmap"; version="1.11-2"; sha256="1cinbsfhi8pngidxp3brmba1willknavlrpjzywm85wp7973y045"; depends=[classInt htmltools htmlwidgets leaflet mapview raster RColorBrewer rgdal rgeos sp spdep tmaptools]; };
+  tmaptools = derive2 { name="tmaptools"; version="1.2-4"; sha256="1dymngn3hrpky5v767lghijlbagmz57dqrkw57r0gy8a9k06bsx8"; depends=[classInt dichromat geosphere KernSmooth magrittr osmar raster RColorBrewer rgdal rgeos rmapshaper sp spdep XML]; };
   tmbstan = derive2 { name="tmbstan"; version="1.0.0"; sha256="01x1nw0mlbpsldrd6hx2g040d9slrhk7hm2pm1v7pci3vxgbpgy9"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; };
   tmcn = derive2 { name="tmcn"; version="0.2-12"; sha256="1gqmq3f0plgd44056905l5jd7x9k4ls06hcp006w8skxj1rnwzb9"; depends=[]; };
   tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; };
-  tmle = derive2 { name="tmle"; version="1.3.0"; sha256="0krnf2mzxmcb105gsx1b0gpc009lv27s0brh6sa1sm87a76p6dqd"; depends=[SuperLearner]; };
+  tmle = derive2 { name="tmle"; version="1.3.0-1"; sha256="1y7fjj2492a70idnqwrlcdpz2bqphdxbaz96yjxnkfhx940y26b5"; depends=[SuperLearner]; };
   tmle_npvi = derive2 { name="tmle.npvi"; version="0.10.0"; sha256="00jav1ql3lv18wh9msxnjvz36z2ds44fdi6lrp1pfphh1in4vdcl"; depends=[geometry MASS Matrix R_methodsS3 R_oo R_utils]; };
   tmlenet = derive2 { name="tmlenet"; version="0.1.0"; sha256="1pg9w7yci9j0m1cxi0nwdpp6jwap0b7ql4xkh25kjbq3w5r8w8pr"; depends=[assertthat data_table Matrix R6 Rcpp simcausal speedglm stringr]; };
   tmod = derive2 { name="tmod"; version="0.36"; sha256="054kg3rwcmrn1y1x1ba8wflb6m76nmf69g4yj3x1vw0qjjs421nh"; depends=[beeswarm plotwidgets tagcloud XML]; };
@@ -11705,7 +11934,7 @@ in with self; {
   toOrdinal = derive2 { name="toOrdinal"; version="1.0-0.0"; sha256="1y46rcm6v2c5n71hdf5rgsgvy913wiazmml60mlxqb70dvz42649"; depends=[crayon testthat]; };
   toaster = derive2 { name="toaster"; version="0.5.5"; sha256="0ga4l3zp422scrgvz701rjznn013vhsbp4gh7v1inqp7kpxafky9"; depends=[foreach GGally ggmap ggplot2 ggthemes memoise network plyr RColorBrewer reshape2 RODBC scales slam wordcloud]; };
   togglr = derive2 { name="togglr"; version="0.1.3"; sha256="033d4mcl2w7nbjmaa5bc28skd63x34k4k4ib94nf11iwdj7bipkw"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr prettyunits purrr rstudioapi]; };
-  tokenizers = derive2 { name="tokenizers"; version="0.1.4"; sha256="1qcsmcd74i39wql9p49g3pzc4flpi8jq9sxia5mcdx054viijgk9"; depends=[Rcpp SnowballC stringi]; };
+  tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; };
   tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; };
   tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; };
   toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; };
@@ -11719,6 +11948,7 @@ in with self; {
   tourr = derive2 { name="tourr"; version="0.5.5"; sha256="12293kp36kz056zd3fnsaf2gy4g8mcs79ws0vgbs7b0hx09sy9vp"; depends=[]; };
   tourrGui = derive2 { name="tourrGui"; version="0.4"; sha256="1g9928q3x9rrd9k3k84r201wss3vjd2pngvbaflk5dqh9yf75jpq"; depends=[Cairo colorspace gWidgets RGtk2 tourr]; };
   toxboot = derive2 { name="toxboot"; version="0.1.1"; sha256="0sw0mxhcq5k11swlhfpn6xk0nfsambh2yx1721zx75lya27wkmq1"; depends=[data_table tcpl]; };
+  toxplot = derive2 { name="toxplot"; version="0.1.1"; sha256="1g5q04ryn2dg675yp90x36z8iw3l5js50gpm4j2c17r88jb2fsl5"; depends=[dplyr ggplot2 ggthemes tcpl tidyr]; };
   toxtestD = derive2 { name="toxtestD"; version="2.0"; sha256="0b7hmpfhwg626r8il12shni0kw94cqnbj49y4vfh8gn98x1s6m48"; depends=[]; };
   tpAUC = derive2 { name="tpAUC"; version="2.1.1"; sha256="0wix9qwcidj7xfqhh7bmrpnadd9qlkvg3515gaamdxkjbz2kyydc"; depends=[pROC]; };
   tpe = derive2 { name="tpe"; version="1.0.1"; sha256="0zsa8vb4qmln3sb4lplv43lh50yys9vfd3rxfp6qxqqjxivd0xsh"; depends=[]; };
@@ -11729,14 +11959,14 @@ in with self; {
   trackdem = derive2 { name="trackdem"; version="0.3.1"; sha256="10qq9217mpd4abhkwsh4yjzpi06qpqa5rnwhxls6yzmymf9apngl"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo SDMTools shiny]; };
   trackeR = derive2 { name="trackeR"; version="1.0.0"; sha256="0z200jlkgcdxwss0ckbh3vqcfw56fi7pivr9vzf4rkwyf2n6v25s"; depends=[fda ggmap ggplot2 gridExtra gtable jsonlite leaflet raster RSQLite scam XML zoo]; };
   trackr = derive2 { name="trackr"; version="0.7.5"; sha256="1achrnkqnpdjp2vr1s7xsl8fdfdyifgv5vr00b3xq9pkr4jggj6z"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools knitr lattice miniUI RJSONIO rmarkdown rsolr shiny]; };
-  tractor_base = derive2 { name="tractor.base"; version="3.1.0"; sha256="0d3hkxqygyh02v63wny32zdxpsn6m6q8i1630zl1mhrbvq3kmqr5"; depends=[ore reportr]; };
+  tractor_base = derive2 { name="tractor.base"; version="3.2.2"; sha256="1pbh9hand7h68vxap2qis3a7zs5qkrj2wxk8flqyvhx50p98wigv"; depends=[ore reportr shades]; };
   traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; };
   traits = derive2 { name="traits"; version="0.3.0"; sha256="155y8j69214xxi1bfk07k30zlpm3q6fmz7ydhnkvw0kv4l0i5pc5"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; };
   traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; };
   trajectories = derive2 { name="trajectories"; version="0.1-4"; sha256="0vwfbx5s8ywasxwv8cld4s6r96vlyknxipp49rsfpqn94nawhwnx"; depends=[lattice sp spacetime]; };
   trajr = derive2 { name="trajr"; version="1.0.0"; sha256="1q17lgwgxn9j3ym1vikrnnyqf61ri3vl7jqq3f1fvy2280nac0s8"; depends=[plotrix signal]; };
   tram = derive2 { name="tram"; version="0.2-0"; sha256="02jbgp011qbinyjwdmj0nc2mpphmqlhm0dvvs7x2lfngrw1fw163"; depends=[basefun Formula mlt multcomp sandwich survival variables]; };
-  tranSurv = derive2 { name="tranSurv"; version="1.1-4"; sha256="1vsp12x4h0s1lba1kf7n0v71kgm1dz6cjfp8lffm4ps80nahs63l"; depends=[rootSolve SQUAREM survival]; };
+  tranSurv = derive2 { name="tranSurv"; version="1.1-5"; sha256="0vn3cywb331kxz6sxidprfh0lmgsmwlnzbv80bfrnahhmhmss8rl"; depends=[rootSolve SQUAREM survival]; };
   transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; };
   translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; };
   translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; };
@@ -11745,15 +11975,15 @@ in with self; {
   transport = derive2 { name="transport"; version="0.9-4"; sha256="0ham0cla4qwfd6fqyckpdl2n2gm3qnl7ry1xi9kjvbajlcc0xwi2"; depends=[Rcpp]; };
   trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; };
   treatSens = derive2 { name="treatSens"; version="2.1.3"; sha256="159dpd4wg0i4cidg40lad665sm3j4qch8d1y3k9chwggbhcad5jn"; depends=[BH dbarts lme4 mvtnorm nlme Rcpp RcppEigen]; };
-  tree = derive2 { name="tree"; version="1.0-37"; sha256="091297qhvqhgjmnyr96jkwaghz8dkbf03rnhwfhks8bsgax6jl13"; depends=[]; };
+  tree = derive2 { name="tree"; version="1.0-39"; sha256="0q2dnl1hvyaw76lkfq0i9d92z68r29ssb3a9j8jknnzx896x055x"; depends=[]; };
   tree_bins = derive2 { name="tree.bins"; version="0.1.0"; sha256="0cqpvh9cbnsk4qv886n2sc1v1s51z4m6aj0ydqzijvy6ckigbiij"; depends=[data_table dplyr rpart rpart_utils]; };
   treeClust = derive2 { name="treeClust"; version="1.1-6"; sha256="07cw8mnfrkw733ga3aq4am1pj50g8vk0rw6b3lflnb4wdhm2fgbi"; depends=[cluster rpart]; };
-  treeDA = derive2 { name="treeDA"; version="0.0.2"; sha256="0ldk7g0bfs8y0znivhj8db5si7glxawicc5zvapbf8d9djlaxxga"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; };
+  treeDA = derive2 { name="treeDA"; version="0.0.3"; sha256="1m9959jya872sdkmw8hcwnjqj7r5x4h0c29g4j2rnxklbspn27j9"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; };
   treebase = derive2 { name="treebase"; version="0.1.4"; sha256="1bx31jahb0wy2g8wl1z71vy659lfi8fq1sbbaxvyixzcwymix1wq"; depends=[ape httr RCurl XML]; };
   treeclim = derive2 { name="treeclim"; version="2.0.0"; sha256="0hiba5xc6rp5zzka31k5klmlllpgbnla4pm920zk12jxn796953l"; depends=[abind boot ggplot2 lmodel2 lmtest np plyr Rcpp RcppArmadillo]; };
   treecm = derive2 { name="treecm"; version="1.2.2"; sha256="0vrawg4vvy270dn20gb2k99xi4q89l4mjz0mm7ikpz8wxqypzq2l"; depends=[plyr]; };
   treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; };
-  treeman = derive2 { name="treeman"; version="1.1.1"; sha256="0j76crs31qniibsdj7dpbbr2jdbhvclfvcscd5dgklvpcspbarch"; depends=[ape bigmemory plyr RJSONIO stringr]; };
+  treeman = derive2 { name="treeman"; version="1.1.2"; sha256="0imwg4wi85gjhbhpym5gs0my8kacx28l74m5xbfwqdi4gxpz3kkc"; depends=[ape bigmemory plyr RJSONIO stringr]; };
   treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; };
   treemapify = derive2 { name="treemapify"; version="2.4.0"; sha256="1cg8jwlls3r3kjlmmxcm9id2spsn5ggsjrw0826ih2khdlnjc0jy"; depends=[ggfittext ggplot2 plyr]; };
   treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; };
@@ -11788,7 +12018,7 @@ in with self; {
   truncnorm = derive2 { name="truncnorm"; version="1.0-8"; sha256="0zn88wdd58223kibk085rhsikl4yhlrwiyq109hzjg06hy6lwmj9"; depends=[]; };
   truncreg = derive2 { name="truncreg"; version="0.2-4"; sha256="1rmf1v2khsx82yzyyk51k7fbnbchf21lj9yqrays1z2mx3p1l1fc"; depends=[maxLik]; };
   trust = derive2 { name="trust"; version="0.1-7"; sha256="013gmiqb6frzsl6fsb5pqfdapwdxas0llg954hlcvgki9al5mlg3"; depends=[]; };
-  trustOptim = derive2 { name="trustOptim"; version="0.8.6.1"; sha256="07xkif11s3mdp4fmhl6zks6p2kdy4fdys2wpa8ibqpc6gd50vhvn"; depends=[Matrix Rcpp RcppEigen]; };
+  trustOptim = derive2 { name="trustOptim"; version="0.8.6.2"; sha256="1nsl8jd6cna52b5dd92jw3sh84jqpg7gazskn7166bcjbph19bf7"; depends=[Matrix Rcpp RcppEigen]; };
   tsBSS = derive2 { name="tsBSS"; version="0.4"; sha256="0mli9y63bp7n21wzz5gga8i0c8f3db6cdcc5jp4zm529svilzkxm"; depends=[forecast ICtest JADE Rcpp RcppArmadillo]; };
   tsDyn = derive2 { name="tsDyn"; version="0.9-46"; sha256="1cq36qxpimiwlzjnnjqj5rjb3l1h684day4kch99vza1v62h1lkv"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; };
   tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; };
@@ -11802,21 +12032,22 @@ in with self; {
   tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; };
   tsdf = derive2 { name="tsdf"; version="1.1-4"; sha256="0kjcfh7vrnyg2aqzr5kkzdccriy2h5x1byzhdhvyb68fi4fjf4dh"; depends=[gsDesign]; };
   tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; };
-  tsensembler = derive2 { name="tsensembler"; version="0.0.3"; sha256="0f4n2w18cii19ls3706cw0kc2gky2x5nh2sz92f5k2smg28dhia4"; depends=[Cubist earth forecast gbm glmnet kernlab nnet pls ranger RcppRoll softImpute xts zoo]; };
-  tseries = derive2 { name="tseries"; version="0.10-43"; sha256="1yjxhj7l1p2przczl6frggfcr5iwda9lbcsmh0y75gbbbps14yf2"; depends=[quadprog quantmod zoo]; };
+  tsensembler = derive2 { name="tsensembler"; version="0.0.4"; sha256="0n5mh951799yd00sbxz0ia2s086kc12rk9xmkdyjvqj8d83vh1ff"; depends=[Cubist earth forecast gbm glmnet kernlab nnet opera pls ranger RcppRoll softImpute xts zoo]; };
+  tseries = derive2 { name="tseries"; version="0.10-44"; sha256="0nz6v76hsxcprpgf84al5r0p08sr9qacqal4adndz9wmg604l4ag"; depends=[quadprog quantmod zoo]; };
   tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13"; sha256="0f2hycxyvcaj3s1lmva1qy46xr6qi43k8fvnm4md5qj8jp2zkazg"; depends=[deSolve]; };
   tseriesEntropy = derive2 { name="tseriesEntropy"; version="0.6-0"; sha256="04clfkpkiy5p5nxcq59c7f4v1llj1d95lvck23h1px50lvb993fv"; depends=[cubature ks]; };
   tsfa = derive2 { name="tsfa"; version="2014.10-1"; sha256="0gkgl55v08dr288nf8r769f96qri7qbi5src7y6azrykb37nz6iz"; depends=[dse EvalEst GPArotation setRNG tfplot tframe]; };
+  tsfknn = derive2 { name="tsfknn"; version="0.1.0"; sha256="0gzij2fbgwavpsqmr7cp012lhii23fav4nsrbc2w9qingglcnqd1"; depends=[ggplot2]; };
   tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; };
   tsiR = derive2 { name="tsiR"; version="0.3.0"; sha256="1brlwsbs4rac8z6cf1q3xm1apdi4ban5hj7p3qvz2yx810gbxp1d"; depends=[ggplot2 kernlab reshape2]; };
-  tsibble = derive2 { name="tsibble"; version="0.1.3"; sha256="08m4k14hiab6nsqrc6qdnjvgqqngyjdv1m81dyk9v4p6l7x24rsj"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; };
+  tsibble = derive2 { name="tsibble"; version="0.1.5"; sha256="054vdbgndi3zr1jizjyasp33l5ifbkfcj1gs8h4bk8vvkp96nqdv"; depends=[dplyr lubridate pillar purrr Rcpp rlang tibble tidyr tidyselect]; };
   tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; };
   tsna = derive2 { name="tsna"; version="0.2.0"; sha256="09q01jzj1rnv2f2jf7djnq5xrkp7lvykdbf4bfswsy0f95j0asx2"; depends=[network networkDynamic statnet_common]; };
   tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; };
   tsoutliers = derive2 { name="tsoutliers"; version="0.6-6"; sha256="0q4lkqasnsps8lzpiyk074nfhv29sbma080729c8l3ba1sa9pmyn"; depends=[forecast KFKSDS stsm]; };
   tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; };
   tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; };
-  tstools = derive2 { name="tstools"; version="0.3.5.1"; sha256="11n56jd4hap8bl8dicdy1zvf916jc66nkg9v2i31n6n42v5dw699"; depends=[data_table jsonlite xts zoo]; };
+  tstools = derive2 { name="tstools"; version="0.3.6"; sha256="0hk98czp6ban95jw7x9bv53n44z6wlkb9gc341x5pfjhslfqccal"; depends=[data_table jsonlite xts zoo]; };
   tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; };
   tsxtreme = derive2 { name="tsxtreme"; version="0.3.1"; sha256="0cfska93ws5x11pslcdhf5rrshxzh6ddlgmfkl9zlci2rqdbwz35"; depends=[evd MASS mvtnorm]; };
   ttScreening = derive2 { name="ttScreening"; version="1.5"; sha256="0qn8lkvgvqpmm368fwpqkm09yaj9mw42mjlikyiwpv2wrgbpmg9n"; depends=[corpcor limma MASS matrixStats sva]; };
@@ -11834,6 +12065,7 @@ in with self; {
   tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; };
   tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; };
   tuneR = derive2 { name="tuneR"; version="1.3.2"; sha256="1xk66rrahfvvbjzpx2mkbmlmyj0l3vidd8kz24f72wh56gbdgbsa"; depends=[signal]; };
+  tuneRanger = derive2 { name="tuneRanger"; version="0.1"; sha256="1mjq64phnphx10mrllcdy1rgm44ar8zr3ba5c4f9fpz4a5kjm7i1"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; };
   tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; };
   turboEM = derive2 { name="turboEM"; version="2014.8-1"; sha256="0g9nm1m542hslz8272n5qz6h59criyf71l2w218dvq34bcjcd3yy"; depends=[doParallel foreach iterators numDeriv quantreg]; };
   turfR = derive2 { name="turfR"; version="0.8-7"; sha256="007jmkppfv1x4zzvvd65fhg5k15ybjhsya2zfjgwm77wm34y81ca"; depends=[dplyr]; };
@@ -11855,15 +12087,15 @@ in with self; {
   twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; };
   txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; };
   types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; };
-  uGMAR = derive2 { name="uGMAR"; version="2.0.0"; sha256="1qgbqqn70n5m0bw8nppzvf0gwgwic7iaidmp9xpmp4mpliybq2j0"; depends=[Brobdingnag]; };
+  uGMAR = derive2 { name="uGMAR"; version="2.0.1"; sha256="038sy4blyz4dxqklk9g9r4glz0gvip84r6mb1ry4l7yh5nbii1dh"; depends=[Brobdingnag]; };
   uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; };
   uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; };
   uavRmp = derive2 { name="uavRmp"; version="0.5.3"; sha256="05annx1vzpssxf5ycrgk2dizgl83zbwvl2x3bj8r5d8w5lvlpwrb"; depends=[brew data_table devtools gdalUtils geosphere htmltools htmlwidgets log4r maptools raster rgdal rgeos roxygen2 sf sp spatial_tools stringr zoo]; };
   ubeR = derive2 { name="ubeR"; version="0.1.4"; sha256="1ilclna04hd1ykcp2b3gcj0v4qznwx0d24yavxnf2yh5d91wr6z2"; depends=[dplyr ggmap ggplot2 ggthemes googleway httpuv httr jsonlite]; };
   ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; };
   ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; };
-  udapi = derive2 { name="udapi"; version="0.1.0"; sha256="0hwnrx9qkazja288m6irmwwybiys9npk6sk60acjdczsfrn1hvl0"; depends=[curl httr]; };
-  udpipe = derive2 { name="udpipe"; version="0.4"; sha256="00n4779g7idc29m7j32plqc4cnhrhhh28zmhd3lp74sxzfhi2vkb"; depends=[data_table Matrix Rcpp]; };
+  udapi = derive2 { name="udapi"; version="0.1.1"; sha256="0mhkf1s7pv8d5hbianzcpc3jxps2i6y955n6bplikcz1l1pnb9ib"; depends=[curl httr]; };
+  udpipe = derive2 { name="udpipe"; version="0.5"; sha256="0vbnfqbjpc27lazf96dwfp3rz0857hlbpld4hqhxkb2sqmrd17c1"; depends=[data_table Matrix Rcpp]; };
   udunits2 = derive2 { name="udunits2"; version="0.13"; sha256="0yav7rm2afcx67xqrknybxgz7x63w78zyxa0xifvc0k2gz0d6mfi"; depends=[]; };
   uiucthemes = derive2 { name="uiucthemes"; version="0.2.0"; sha256="1z1wx89b2d7z1a2zc4ai05v9slfpidja8f561jcsrcdi9hz2yp81"; depends=[rmarkdown]; };
   ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; };
@@ -11871,10 +12103,11 @@ in with self; {
   ukds = derive2 { name="ukds"; version="0.1.0"; sha256="00lgr9jy57bwa8p38mqcf4fk29g2w2wqk3pwf9av6f5lapzzgc94"; depends=[magrittr rio RSelenium stringr]; };
   ukgasapi = derive2 { name="ukgasapi"; version="0.13"; sha256="0bnblha96ldbxj0nqhcj26d1dk2xm6nkjqqval1jlc2pki20mr9n"; depends=[RCurl XML]; };
   ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; };
-  umx = derive2 { name="umx"; version="2.0.2"; sha256="1665h1yjs28zfpy7ziy0qnv8chm5nb5fcca1jj0cfbsspzndm24p"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
+  umx = derive2 { name="umx"; version="2.4.0"; sha256="1i5sa6kwj57spjm1smz9835i92vs70hsq0yl7m1s0i0f3k18k3fx"; depends=[cowplot DiagrammeR ggplot2 knitr MASS Matrix mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; };
   unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; };
   unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; };
-  uncmbb = derive2 { name="uncmbb"; version="0.1.0"; sha256="0gkd475k4qbnfn3cgh8w4fq4g3i2fn3dlb8n89ih3xdk5ac4ns73"; depends=[]; };
+  uncmbb = derive2 { name="uncmbb"; version="0.2.0"; sha256="0cvbh7a81g52hd2qzp23jwwjd5406iszf4wilgrz8sjfrfgybgfm"; depends=[dplyr rlang]; };
+  understandBPMN = derive2 { name="understandBPMN"; version="1.0.0"; sha256="1rps8915r5chnagyqlr4m3jw9hfc3lgwkfnqpxfmxxl7k1dv3mnh"; depends=[dplyr purrr Rcpp tibble tidyr XML]; };
   unfoldr = derive2 { name="unfoldr"; version="0.6.1"; sha256="1s1sy4x808w7nvc5kmskv7ksi2xcnfbb26qn0wkinbqma9aicqm2"; depends=[]; };
   ungeneanno = derive2 { name="ungeneanno"; version="0.1.6"; sha256="0fm47vmzn4z73pn37p94r84lbkg5amk0sl78304ibwz0rhlda0y5"; depends=[httr XML]; };
   uniCox = derive2 { name="uniCox"; version="1.0"; sha256="1glgk6k8gwxk3haqaswd2gmr7a2hgwjkwk2i1qc5ya7gg8svyavv"; depends=[survival]; };
@@ -11895,12 +12128,12 @@ in with self; {
   unrepx = derive2 { name="unrepx"; version="1.0"; sha256="1dzvwpza60y9p7kz1f0bm20wid5jyxx9pma4w41az9shq5kkr0aj"; depends=[]; };
   unrtf = derive2 { name="unrtf"; version="1.2"; sha256="11q2p6cnf1pqsh8sys45gb4xf713bh693lm59d8nw09kcbm23210"; depends=[sys]; };
   unsystation = derive2 { name="unsystation"; version="0.1.1"; sha256="0w5llr2kyv7g5fx5yvlyqwj4da5k5fq1f2y70c9pjdzrny9lpz4q"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; };
-  untb = derive2 { name="untb"; version="1.7-2"; sha256="1ha0xj94sz1r325qb4sb5hla9hw1gbqr76703vk792x9696skhji"; depends=[Brobdingnag partitions polynom]; };
+  untb = derive2 { name="untb"; version="1.7-3"; sha256="1324gn42qxw4cf3jg9vd8nwxiw4w4fg6p2xhzmn636q5wlziln5c"; depends=[Brobdingnag partitions polynom]; };
   unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; };
   upclass = derive2 { name="upclass"; version="2.0"; sha256="0jkxn6jgglw6pzzbcvi1pnq4hwfach3xbi13zwml4i83s3n5b0vg"; depends=[mclust]; };
   uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; };
   upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; };
-  uptasticsearch = derive2 { name="uptasticsearch"; version="0.1.0"; sha256="0kr9lmfp5fa3rcmk0s56pgr4h2pabic17m9yv2sljg7cvx50iss6"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; };
+  uptasticsearch = derive2 { name="uptasticsearch"; version="0.2.0"; sha256="09vc26vpghc5lwlchmn7h8khy7s0jhcb8lqd1asr5l178kfpv3w8"; depends=[data_table futile_logger httr jsonlite purrr stringr uuid]; };
   uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; };
   upwaver = derive2 { name="upwaver"; version="1.0.1"; sha256="0pl5r1rh91s8i74zrsrblp6mjn371a2lp01f5d37d1vnjxc3dn9n"; depends=[assertthat httr rjson XLConnect]; };
   uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; };
@@ -11913,6 +12146,7 @@ in with self; {
   useful = derive2 { name="useful"; version="1.2.3"; sha256="016fwnjrnq44m71jmiy8cpzncja77pii2ag2ir85jdk4fzgckn7l"; depends=[dplyr ggplot2 magrittr Matrix plyr purrr scales]; };
   userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.0"; sha256="14wdy74mj9rzlpmrsy3b4fda5f2sx078w1k1lgahz0yra3bypl3k"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest fBasics GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists viridis XML xtable]; };
   usethis = derive2 { name="usethis"; version="1.3.0"; sha256="0r61pf8qisjvrshm6jpcb76ck1v79s7lg9zwdgad4fasyyrzrcx2"; depends=[backports clipr clisymbols crayon curl desc gh git2r httr rematch2 rmarkdown rprojroot rstudioapi styler whisker]; };
+  usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; };
   uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; };
   usl = derive2 { name="usl"; version="1.8.0"; sha256="04w7p9i08a51smgg11kh4hablic5rjmr5hndrnlg49j5h20i7w1v"; depends=[nlsr]; };
   usmap = derive2 { name="usmap"; version="0.2.1"; sha256="0ilg8fzrxpljdly8xkniirqa3lw74kfark75pv071aa4l6xkiwlg"; depends=[]; };
@@ -11921,19 +12155,19 @@ in with self; {
   utf8latex = derive2 { name="utf8latex"; version="1.0.4"; sha256="12isrl056h7y7nr7wk52dnvf3frcp66qqy7si869ark2aj81f959"; depends=[]; };
   utility = derive2 { name="utility"; version="1.4.2"; sha256="0q08yc0sxbcjhsr0nkgc2pyxkd93zwlbf0jyq21cf535mj4036gq"; depends=[]; };
   utilsIPEA = derive2 { name="utilsIPEA"; version="0.0.5"; sha256="1kllm94c23pb176nazcfgsv38aawbzdwqdhyxx1c1n1jlsls2zk6"; depends=[data_table dplyr RCurl stringdist stringr]; };
-  utiml = derive2 { name="utiml"; version="0.1.3"; sha256="08r2qfvxlz50jzvhl0k9pvzf9xs8jm838bv9ncg59ir1b3ijbkk5"; depends=[mldr]; };
+  utiml = derive2 { name="utiml"; version="0.1.4"; sha256="1z93a7ldgkab6hsa9a0hzyhxsbac45sgqn7fy2jh615d2kw7pqr1"; depends=[mldr]; };
   uuid = derive2 { name="uuid"; version="0.1-2"; sha256="1gmisd630fc8ybg845hbg13wmm3pk3npaamrh5wqbc1nqd6p0wfx"; depends=[]; };
-  uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.4"; sha256="1kkmi2dqd2f4jryrkf9br4m6p7qxknlg62xyw28nirs4a12h52w8"; depends=[Exact geepack plyr sandwich survival]; };
+  uwIntroStats = derive2 { name="uwIntroStats"; version="0.0.5"; sha256="0zsbznvhnxihpxbkw3z4mywc66qx9qfxa0bz6748h19c885hjw01"; depends=[Exact geepack plyr sandwich survival]; };
   vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; };
   vaersvax = derive2 { name="vaersvax"; version="1.0.4"; sha256="15znkwbhr624qgwlcrdhaxpdfl85ym845mr2sy8b016d3ngz7n94"; depends=[]; };
   vagalumeR = derive2 { name="vagalumeR"; version="0.1.1"; sha256="1l1p63yhwqvkh8kgqii9n96vdm86jfc64nrinjp5l7jhx99sn013"; depends=[httr jsonlite plyr stringr]; };
   valaddin = derive2 { name="valaddin"; version="0.1.2"; sha256="0j1c3g9gn2j0manz3jjh58cnl7b1rfwm9494xqrfqpia8948p9vq"; depends=[lazyeval purrr]; };
   valection = derive2 { name="valection"; version="1.0.0"; sha256="0104zcg3cw57ksgmb321hnyv095mn3frxci9vikj1smwarpnrpzc"; depends=[testthat]; };
   validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; };
-  validate = derive2 { name="validate"; version="0.2.0"; sha256="178paxywwiaa45pqhknpw2k6f08b35nlnhwvqv2d1d289fz4f6qh"; depends=[settings yaml]; };
+  validate = derive2 { name="validate"; version="0.2.4"; sha256="0dg6jkc3g42fj0dx1m868v7p7jmxfdgihal9jmzphysyl36z8fp7"; depends=[settings yaml]; };
   validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; };
   validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; };
-  validatetools = derive2 { name="validatetools"; version="0.4.1"; sha256="1ivwgva37j26csvp4w3w7d10yq6myqdg6gcgxrl9z8j3gldnzv7p"; depends=[lpSolveAPI validate]; };
+  validatetools = derive2 { name="validatetools"; version="0.4.3"; sha256="1v6mmk3iq5nzzjkkj1spiqfmqq2133xg2qyy3y8h4pwwfynp4v7c"; depends=[lpSolveAPI validate]; };
   valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; };
   valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; };
   valr = derive2 { name="valr"; version="0.4.0"; sha256="1km828lif5nh15fxc3kbk3xp14gmsd6f3n0g5ml9zbdimh9n990z"; depends=[BH bindrcpp broom dplyr ggplot2 plogr Rcpp readr rlang stringr tibble]; };
@@ -11954,7 +12188,7 @@ in with self; {
   vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; };
   vcd = derive2 { name="vcd"; version="1.4-4"; sha256="1lp99h0wvsc61l1dgcqjxdrcgpgw88ak430cdsv43kmm43qssqd5"; depends=[colorspace lmtest MASS]; };
   vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; };
-  vcfR = derive2 { name="vcfR"; version="1.7.0"; sha256="1vx4s5z8h8mk8gqra2a5mkapz5xv1im76klq8qkpvj6ic4wcwsxs"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble tidyr vegan viridisLite]; };
+  vcfR = derive2 { name="vcfR"; version="1.8.0"; sha256="1684lamsivwaqzvmwzhrrziwczkaqn3mhbdr86zbjdhr1jcgkz2z"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; };
   vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; };
   vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; };
   vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; };
@@ -11964,7 +12198,7 @@ in with self; {
   veccompare = derive2 { name="veccompare"; version="0.1.0"; sha256="03nyyxvhhwfxxg5w6qflk7q234ipbhj9fd4abcp50sxz3diabch1"; depends=[corrplot gtools pander purrr qgraph reshape2 VennDiagram]; };
   vecsets = derive2 { name="vecsets"; version="1.2.1"; sha256="086af6swjpbkd140yvb76affy5gn4p9xm41m3akm8axc3qk0hybg"; depends=[]; };
   vegalite = derive2 { name="vegalite"; version="0.6.1"; sha256="0dlzhvrg3nj6knyycdgg3d1vzq3dn9vxb34fjin9hzilszqmarbk"; depends=[base64 clipr digest htmltools htmlwidgets jsonlite magrittr webshot]; };
-  vegan = derive2 { name="vegan"; version="2.4-6"; sha256="175mqr42mmxy98gpf3rky8alnkw3w1k90ggdw3cispl36841p76w"; depends=[cluster lattice MASS mgcv permute]; };
+  vegan = derive2 { name="vegan"; version="2.5-1"; sha256="0pynr02d1xngda6c3va8fc4nxpgfkawhzcnz1ws4dnarp9b1w90r"; depends=[cluster lattice MASS mgcv permute]; };
   vegan3d = derive2 { name="vegan3d"; version="1.1-1"; sha256="1jd9m2immkhgb1zr39gsgl746y7qpi5fhj8awmqq5lyr5j6jp6jh"; depends=[cluster rgl scatterplot3d vegan]; };
   vegclust = derive2 { name="vegclust"; version="1.7.1"; sha256="1k1dcw424s19f8ngsksvdmsayahl1hkxd9v2irf8ljpp688l8idi"; depends=[Rcpp sp vegan]; };
   vegdata = derive2 { name="vegdata"; version="0.9.1"; sha256="0w4dk7qcl89w04qgnlna5lk5hxnyrvwmgjjxmnvb6r5dspq7qyad"; depends=[foreign httr jsonlite XML]; };
@@ -11975,7 +12209,7 @@ in with self; {
   velox = derive2 { name="velox"; version="0.2.0"; sha256="1jrarfsfflvpc0dqh5gnw92fk8zic222n7pr7hd0lhr5d389k6d0"; depends=[BH raster Rcpp rgdal rgeos sf sp]; };
   vembedr = derive2 { name="vembedr"; version="0.1.3"; sha256="0zg6j0g9l7j36ifwabhxrin5z0dics66bqkc7x6rqijmizk1xpba"; depends=[htmltools httr magrittr stringr]; };
   venn = derive2 { name="venn"; version="1.5"; sha256="0mb8864kmn98184q007jnn7cydh02sx8bh1mhsskycmi70c8w8ai"; depends=[]; };
-  vennLasso = derive2 { name="vennLasso"; version="0.1.1"; sha256="1xlf60xjvk0xq96mgzkj65q21mjk2k274xkcwsfmgir9xfdq60rd"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; };
+  vennLasso = derive2 { name="vennLasso"; version="0.1.2"; sha256="1lma34msdl8ik0375bh4adbfgvcy0crv29gpsk7p6x75464jsp9y"; depends=[foreach igraph MASS Matrix Rcpp RcppEigen RcppNumerical survival VennDiagram visNetwork]; };
   venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; };
   vennplot = derive2 { name="vennplot"; version="1.0"; sha256="0x59awa1zsjwk5qb1jzv6d2mn2fm4aq1lq8zlbnf1da0h4837yab"; depends=[Rcpp rgl stringr]; };
   verification = derive2 { name="verification"; version="1.42"; sha256="0pdqvg7cm9gam49lhc2xy42w788hh2zd06apydc95q2gj95xnaiw"; depends=[boot CircStats dtw fields MASS]; };
@@ -11983,7 +12217,7 @@ in with self; {
   vertexenum = derive2 { name="vertexenum"; version="1.0.1"; sha256="060sfa22m35d1hqxqngxhy7bwjihf6b4sqa1kg5r0cqvdw9zg51d"; depends=[numbers]; };
   vesselr = derive2 { name="vesselr"; version="0.2.1"; sha256="1wzprnpiv04gxhqgki36gp1a0xj9l3mchllphwkfsdja4axq3prk"; depends=[oro_nifti pbapply pbmcapply]; };
   vetools = derive2 { name="vetools"; version="1.3-28"; sha256="1470xgqdq9n5kj86gdfds15k3vqidk3h99zi3g76hhyfl8gyl1c0"; depends=[lubridate maptools plyr scales sp stringr tis xts]; };
-  vetr = derive2 { name="vetr"; version="0.2.3"; sha256="1b35j8zzaj626dgz34hlprgsplnnskpl6zw3vppw27nnds7fdlh8"; depends=[]; };
+  vetr = derive2 { name="vetr"; version="0.2.4"; sha256="16v31qkbn6nbng00465z6990n2hwzrv5i4m3ifv3ysfq28jnd28a"; depends=[]; };
   vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; };
   vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; };
   vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; };
@@ -11992,14 +12226,14 @@ in with self; {
   vioplot = derive2 { name="vioplot"; version="0.2"; sha256="16wkb26kv6qr34hv5zgqmgq6zzgysg9i78pvy2c097lr60v087v0"; depends=[sm]; };
   viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; };
   vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; };
-  viridis = derive2 { name="viridis"; version="0.5.0"; sha256="1ka6amybgzqkg3cbwfxwwqzzzpfn6q5jcia5am0bw48y5hbpg97y"; depends=[ggplot2 gridExtra viridisLite]; };
+  viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; };
   viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; };
   virtualspecies = derive2 { name="virtualspecies"; version="1.4-2"; sha256="19qw8vqf08x6fgm8w159qabpgr2wv2cxishpj6888ihcaa9ykp8f"; depends=[ade4 dismo raster rworldmap]; };
   virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; };
   visNetwork = derive2 { name="visNetwork"; version="2.0.3"; sha256="0bs6war8m6vnzyhmzfmry5sfc5v1crq8i8r8nn70shf19k7pabmw"; depends=[htmltools htmlwidgets jsonlite magrittr]; };
   visdat = derive2 { name="visdat"; version="0.1.0"; sha256="1r009jlg3wwg06j5066c09567q24986c74f0cd68kcbmihaxngbx"; depends=[dplyr ggplot2 magrittr purrr tidyr]; };
   visreg = derive2 { name="visreg"; version="2.5-0"; sha256="0n19k6rsmpqga6r8lyhjviqs3nw881dhr211621m2cl7knqhhi4y"; depends=[lattice]; };
-  vistime = derive2 { name="vistime"; version="0.4.0"; sha256="0fahih28q7lyywnm4mri9macdx4c5b3c5djmg557f7dxlyhhjw0l"; depends=[plotly RColorBrewer]; };
+  vistime = derive2 { name="vistime"; version="0.5.0"; sha256="1h7dm66m0qx3hmfx1hlv5na65swdhdykyg1fsqzgnjl6p98cg81j"; depends=[plotly RColorBrewer]; };
   visualFields = derive2 { name="visualFields"; version="0.4.3"; sha256="0ws3cz71hhhrf4xkdb644li04d31wf51xb2sq789bl2lf50q6a1a"; depends=[flip gridBase Hmisc matrixStats]; };
   visualize = derive2 { name="visualize"; version="4.3.0"; sha256="1s49sx828f25d4n93mn28xdbc81zflk2sr3h8ffs2mkjr888qd8y"; depends=[]; };
   visvow = derive2 { name="visvow"; version="0.1.0"; sha256="0nb849m6dqfanqlaqcargw0rlf4ch9v09zmf0zqmxkwcil0w0dka"; depends=[Cairo DT ggplot2 plot3D plyr pracma psych Rdpack readxl shiny shinyBS svglite WriteXLS]; };
@@ -12014,6 +12248,7 @@ in with self; {
   vortexRdata = derive2 { name="vortexRdata"; version="1.0.3"; sha256="1pq910xaqk6d5amg8hj7xagb5wn2ahfrmqairf3vhwqx55lhjbg1"; depends=[]; };
   vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; };
   voteogram = derive2 { name="voteogram"; version="0.2.0"; sha256="0m4j7iz7mc6z536vk0kmqfd8ank87ingv5vnjl7mn62r53c5fbsf"; depends=[dplyr ggplot2 jsonlite scales]; };
+  votesys = derive2 { name="votesys"; version="0.1.0"; sha256="1y86411khvn8yz0q75ky9ic7n8a11jckmpamj56h9cl5yh1rbm9w"; depends=[data_table]; };
   vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; };
   vowels = derive2 { name="vowels"; version="1.2-2"; sha256="0xhfn3avx9h6kg3jwd47n2x7w8q8c9h13wsxd74hhbbn2gkjrs84"; depends=[]; };
   vows = derive2 { name="vows"; version="0.5"; sha256="06akjdbab9v7r47di7syvcm7gf4k81djizg8maszs5l1ksyhmv6b"; depends=[fda gamm4 mgcv oro_nifti RLRsim shape stringr]; };
@@ -12024,6 +12259,7 @@ in with self; {
   vrmlgen = derive2 { name="vrmlgen"; version="1.4.9"; sha256="0lifhhf41yml4k83wpkssl14jgn8jaw1lcknwbci1sd8s1c4478l"; depends=[]; };
   vrtest = derive2 { name="vrtest"; version="0.97"; sha256="00hdgb0r18nwv3qay97b09kqqw9xqsbya06rrjyddqh9r6ggx1y0"; depends=[]; };
   vscc = derive2 { name="vscc"; version="0.2"; sha256="1p14v8vd8kckd44g4dvzh51gdkd8jvsc4bkd2i4csx8vjiwrni5w"; depends=[mclust teigen]; };
+  vstsr = derive2 { name="vstsr"; version="1.0.0"; sha256="0flsw5yw1vmj5x866klxmjqz5aimkvjiwl1zdciz63p9zffmb4gz"; depends=[httr jsonlite magrittr R6 RCurl xml2]; };
   vtreat = derive2 { name="vtreat"; version="1.0.3"; sha256="04kicd7jxvcnvd0n9ssxv3jsi075wass30l3jg0ikdr3kc899vfs"; depends=[]; };
   vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; };
   vwr = derive2 { name="vwr"; version="0.3.0"; sha256="1h790vjcdfngs1siwldvqz8jrxpkajl3266lzadfnmchfan1x7xv"; depends=[lattice latticeExtra stringdist]; };
@@ -12046,7 +12282,7 @@ in with self; {
   walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; };
   walrus = derive2 { name="walrus"; version="1.0.1"; sha256="032s2k122z5cqkcjvh9gva4vvmj5prn6z3rs8j5y16d98kgambpy"; depends=[ggplot2 jmvcore R6 WRS2]; };
   wand = derive2 { name="wand"; version="0.2.0"; sha256="1p2r96nyr36jv418xi4j2ldarymb4xmpis6d2iz7mq9755kb4fnh"; depends=[dplyr purrr rappdirs Rcpp stringi tibble tidyr]; };
-  warbleR = derive2 { name="warbleR"; version="1.1.10"; sha256="0xwzrl08zvq4r280adz50rvr304i391l0g8m90dd5cdwxmfn071x"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR NatureSounds pbapply pbmcapply proxy RCurl rjson seewave signal tuneR]; };
+  warbleR = derive2 { name="warbleR"; version="1.1.12"; sha256="1fb1pni00gphhwxzq75y5lbjqpyapc5vpqbbi2vq841dpn2jkcwm"; depends=[bitops doParallel dtw fftw foreach iterators jpeg maps monitoR NatureSounds pbapply pbmcapply pracma proxy RCurl rjson seewave signal Sim_DiffProc tuneR]; };
   warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; };
   washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; };
   wasim = derive2 { name="wasim"; version="1.1.2"; sha256="1zydzw7cihhdwv0474fnc4lgaq5fwrv8jinz79vkbidbgcy7i2fd"; depends=[fast MASS qualV tiger]; };
@@ -12054,7 +12290,7 @@ in with self; {
   waterData = derive2 { name="waterData"; version="1.0.8"; sha256="0884agh876wf3qlbc75fbaa47x2iwvncz7r2l25qw34n8lxq1yr6"; depends=[dataRetrieval lattice latticeExtra lubridate xml2]; };
   waterfall = derive2 { name="waterfall"; version="1.0.2"; sha256="0jy6l9mx0dixwnkychdl18sf4xh73pm0qd1jyxp9rlnv1vcragjp"; depends=[lattice]; };
   waterfalls = derive2 { name="waterfalls"; version="0.1.2"; sha256="01gby1mlhrwcalizpywxcakkx2zifswb0188nrl6z9dkkd1866lm"; depends=[ggplot2]; };
-  waveband = derive2 { name="waveband"; version="4.6"; sha256="1y2qi2zb8l2ap6f8ihnpq2yavic464bl5mp5yv1dscbk0nmfn966"; depends=[wavethresh]; };
+  waveband = derive2 { name="waveband"; version="4.7"; sha256="0b57g7jwvqgqjzd7x1pd4nqpx22rmiskvf8wjwrgplqzx4daxny2"; depends=[wavethresh]; };
   waved = derive2 { name="waved"; version="1.1-2"; sha256="17pr9qhz0dbbcr78vwm964d9zd7yrfrqvadr1lwf756bsrscmlg3"; depends=[]; };
   wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; };
   wavelets = derive2 { name="wavelets"; version="0.3-0"; sha256="141s7z7wxl5plxp7xp7wczswlcvb18a4h3n881l9qc4ny9p7gfpa"; depends=[]; };
@@ -12069,8 +12305,8 @@ in with self; {
   weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; };
   weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; };
   webTRISr = derive2 { name="webTRISr"; version="0.1.0"; sha256="19xal5zg9mg25vzvkz55zm6gkd8b0y3sw3zbbrxn73a1jg8x5v0l"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr stringr]; };
-  webchem = derive2 { name="webchem"; version="0.3.0"; sha256="11ryyniqcf6pa5avc5qks0hpksmapk3564bjva86626vml0mixby"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
-  webdriver = derive2 { name="webdriver"; version="1.0.4"; sha256="0k031f26iihk2dxypqvfi60bhpj78yhwvhbmxqv7yrpa8s6j5flm"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage]; };
+  webchem = derive2 { name="webchem"; version="0.4.0"; sha256="032bsfnkn7s33y42fyf8yradsh8jhms4ryjkh0r76hqnx3j00ph0"; depends=[httr jsonlite RCurl rvest stringr xml2]; };
+  webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; };
   webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; };
   webmockr = derive2 { name="webmockr"; version="0.2.0"; sha256="1zzfam380gy1d3k909ixbk61gmmv0w1x17qz8avrrnjlvqbp9gmn"; depends=[crul curl fauxpas jsonlite lazyeval magrittr R6 urltools]; };
   webp = derive2 { name="webp"; version="0.4"; sha256="0jsyjynrsrqpbg93rn48xrjclkvwmz2c2lhcfli5djny122ymh6r"; depends=[]; };
@@ -12088,7 +12324,7 @@ in with self; {
   weights = derive2 { name="weights"; version="0.85"; sha256="0nsvgx2yn2ynrkqvvy3fxjsi6aw8w3zknm80fyjrih2zmxc7v61f"; depends=[gdata Hmisc mice]; };
   weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; };
   welchADF = derive2 { name="welchADF"; version="0.2"; sha256="1gyii50khjd1pamv3v19ajx6b2vw2aspbzmqiqrqmvcl46nha24y"; depends=[lme4]; };
-  wellknown = derive2 { name="wellknown"; version="0.1.0"; sha256="0cin4xi1780hglmcfyjiynvh1lm90yryl1m6z1snpprfzsxx3mmg"; depends=[jsonlite magrittr]; };
+  wellknown = derive2 { name="wellknown"; version="0.5.0"; sha256="1y3hi5ajqaxx3s40cx24ayfcd3c6d1ydlhsm0gg2fxgmidm6bhwy"; depends=[jsonlite V8]; };
   wesanderson = derive2 { name="wesanderson"; version="0.3.2"; sha256="17acf9ydi2sw7q887ni9ly12mdmip66ix6gdkh68rncj8sx3csrd"; depends=[]; };
   wfe = derive2 { name="wfe"; version="1.6"; sha256="0y8f042hzlqwgsr63rl2apl7hkw9bs69a287dynvz9w078am61ch"; depends=[arm MASS Matrix]; };
   wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; };
@@ -12096,6 +12332,7 @@ in with self; {
   wgaim = derive2 { name="wgaim"; version="1.4-11"; sha256="1jjyp100dcjjczp61xlvhmy48ynniqcys535vzbgswhr7fvijymg"; depends=[lattice qtl]; };
   wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; };
   wgsea = derive2 { name="wgsea"; version="1.8"; sha256="1114wik011sm2n12bwm2bhqvdxagbhbscif45k4pgxdkahy2abpi"; depends=[snpStats]; };
+  wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; };
   whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; };
   whisker = derive2 { name="whisker"; version="0.3-2"; sha256="0z4cn115gxcl086d6bnqr8afi67b6a7xqg6ivmk3l4ng1x8kcj28"; depends=[]; };
   whitening = derive2 { name="whitening"; version="1.0.0"; sha256="0vncjbrw9gafplz6r02x0j1fnrfvxq027h1pqcbdwqykjzg0zcym"; depends=[corpcor]; };
@@ -12113,26 +12350,28 @@ in with self; {
   wildcard = derive2 { name="wildcard"; version="1.1.0"; sha256="0qkzab84z95g5f4fv3v4wisccgd7k9m3210pz4nvm1x8rfaqfjf1"; depends=[magrittr stringi]; };
   wildlifeDI = derive2 { name="wildlifeDI"; version="0.2"; sha256="0z8zyrl3d73x2j32l6xqz5nwhygzy7c9sjfp6bql5acyfvn7ngjv"; depends=[adehabitatLT rgeos sp]; };
   wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; };
+  winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; };
   windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; };
-  windfarmGA = derive2 { name="windfarmGA"; version="1.2"; sha256="1g1m7q8gdkd4mawdxi06lsalhii2ymzqlmxfdqhp2cnvj4k7fqby"; depends=[calibrate data_table doParallel dplyr foreach geoR ggplot2 googleVis gstat gtools leaflet magrittr maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; };
+  windfarmGA = derive2 { name="windfarmGA"; version="1.2.1"; sha256="1v4brwi92a2kchak43z0vxjq11373amh190fnmpmnpz58zbls448"; depends=[calibrate data_table doParallel dplyr foreach geoR ggplot2 googleVis gstat gtools leaflet magrittr maptools RandomFields raster RColorBrewer rgdal rgeos rgl RgoogleMaps sp spatstat]; };
   wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; };
   wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; };
   wiqid = derive2 { name="wiqid"; version="0.1.3"; sha256="06six8w77lf9rc49hnr42xgn2jvhb84wvqgi08ns22yn4z2iz9pz"; depends=[coda HDInterval MASS truncnorm]; };
-  withr = derive2 { name="withr"; version="2.1.1"; sha256="17pbllxv18gf1mli9mm5px4wzp364907a4wrl20r1y5q8qwawpxx"; depends=[]; };
+  withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; };
   wkb = derive2 { name="wkb"; version="0.3-0"; sha256="0s7libkg27jdmcw5qmk5j0cmz3nqq7ny4q8gy4vhbgsgj4gbbdn9"; depends=[sp]; };
   wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; };
   wle = derive2 { name="wle"; version="0.9-91"; sha256="18gqwrrw618f1xx93n0lk95gpi3lxvfkr6fmlb82v2wiibb7k7ak"; depends=[circular]; };
   wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; };
   wmtsa = derive2 { name="wmtsa"; version="2.0-3"; sha256="1q436krz5p1f4a7a7sya6a9rh9x9mi8zzcgq66gbk9w9w4hcqcj6"; depends=[ifultools MASS splus2R]; };
   wmwpow = derive2 { name="wmwpow"; version="0.1.0"; sha256="0hvim7b9zn6h6w6m6hgil919nkzkn8676x8b2f3lbmm8m7dwm3lq"; depends=[lamW MASS smoothmest]; };
-  wnl = derive2 { name="wnl"; version="0.3.3"; sha256="1dcq7xicsbwwlw8f2g1f2q4b4ph0w5kjs3108cfg12yww0qjl4ss"; depends=[numDeriv]; };
+  wnl = derive2 { name="wnl"; version="0.4.0"; sha256="02axa2xfbsvqiil240ywkj3r4yw5sqzk9mai1nccrvcx9fz8qlgc"; depends=[numDeriv]; };
   wnominate = derive2 { name="wnominate"; version="1.2.5"; sha256="0pvw36jzx90z7ah4f7cyf95csdn5x7n9rh3ddsppa61y1dmjsn5k"; depends=[pscl]; };
   woe = derive2 { name="woe"; version="0.2"; sha256="15mvcmwnrqxpzn054lq85vyzq5rgxkiwbd40gnn4s3ny1xdrwgsm"; depends=[]; };
   woeBinning = derive2 { name="woeBinning"; version="0.1.5"; sha256="04pw32vng31v1n4r1g1fisvv8cacxmcx7m65vw4a2byamp2d25yq"; depends=[]; };
   woeR = derive2 { name="woeR"; version="0.1.3"; sha256="15bdhgjq39svzaqzmfykyaq4r543lq15jf0sz8m9bwjv2c6vlx5l"; depends=[dplyr]; };
   womblR = derive2 { name="womblR"; version="1.0.2"; sha256="0cnggwi47pmyjqz78vcvdzv3kpss6v4h404w2d7dii0zfqjr7bpk"; depends=[msm mvtnorm Rcpp RcppArmadillo]; };
-  wooldridge = derive2 { name="wooldridge"; version="1.2.0"; sha256="1ib7qqmzybk7a171ny0zszh1lw2zgqyz35rb7g6y4ign2ng9ml9k"; depends=[]; };
+  wooldridge = derive2 { name="wooldridge"; version="1.3.0"; sha256="029vdiglwkr7ilr7jvzarvphcc71n1majn6bh427b4qq7n01a7wb"; depends=[]; };
   word_alignment = derive2 { name="word.alignment"; version="1.0.9"; sha256="02dy4a9agfb99rjbqxy35nf11bpxyjcq15bnyzjkbvcy0ppfgz0l"; depends=[data_table openxlsx quanteda]; };
+  wordbankr = derive2 { name="wordbankr"; version="0.3.0"; sha256="0aa1gz3fg7h9wnk93ialwj0wjyk8wxani8galwkrms4fp7d5lmf4"; depends=[assertthat DBI dbplyr dplyr purrr rlang RMySQL robustbase stringr tidyr]; };
   wordcloud = derive2 { name="wordcloud"; version="2.5"; sha256="1ajqdkm8h1wid3d41zd8v7xzf2swid998w31zrghd45a5lcp7qcm"; depends=[RColorBrewer Rcpp slam]; };
   wordcloud2 = derive2 { name="wordcloud2"; version="0.2.1"; sha256="1a2q42bn65q4idxq0vxysyam16q6c18inxv4dqhfy0x52j8z9x6k"; depends=[base64enc htmlwidgets]; };
   wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; };
@@ -12146,12 +12385,12 @@ in with self; {
   wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; };
   wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; };
   wpp2015 = derive2 { name="wpp2015"; version="1.1-0"; sha256="01vsdma2fgh0vd96ly4f704hl200v0w8ksz60gjxhm44ih3qszh3"; depends=[]; };
-  wpp2017 = derive2 { name="wpp2017"; version="1.1-2"; sha256="18hyygk928kp25n5iy5nwz2fdicgpk3ncpkp2pksnp0cxzw3585w"; depends=[]; };
+  wpp2017 = derive2 { name="wpp2017"; version="1.2-0"; sha256="0dk56wqs7g54r6jjb6wnppdf9d94474nja21j0bi6by0l8gn6lyc"; depends=[plyr]; };
   wppExplorer = derive2 { name="wppExplorer"; version="2.1-1"; sha256="0n0ayn8bxkrabw2iyqv3hfkdchbk9bzv1lhkjpxnjb6z3zl1sggl"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2017]; };
   wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; };
   wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; };
   wrangle = derive2 { name="wrangle"; version="0.4"; sha256="0d1xdcvgcv8bn20s90sn1dmzhcdz39yr1m2bkcjbvavm132p96bl"; depends=[dplyr lazyeval magrittr tidyr]; };
-  wrapr = derive2 { name="wrapr"; version="1.2.0"; sha256="1dagjsbi75gplzkc44p4jqjbh3plp0kw9dz060kqsf0y7z6dk9vh"; depends=[]; };
+  wrapr = derive2 { name="wrapr"; version="1.4.0"; sha256="0kxnpvqnr9whc8f5dr0xwff23pky9hp7mvrprvqnkwk0k44zd6c5"; depends=[]; };
   wrassp = derive2 { name="wrassp"; version="0.1.6"; sha256="1f6yyw6mmwc267cd9v17k6n4fhymi0y201bm6ii56rcw86n4ix77"; depends=[]; };
   write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; };
   writexl = derive2 { name="writexl"; version="0.2"; sha256="0hclrbn21sc0ifd2c5xfww84jf47412wzs86a73swxxjzcbrkg5k"; depends=[]; };
@@ -12171,7 +12410,9 @@ in with self; {
   x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; };
   x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; };
   x13binary = derive2 { name="x13binary"; version="1.1.39-1"; sha256="1v6slh5136av3l7bk99a57gj6i6khx2j55qv4pyz1zmrzzgaayyc"; depends=[]; };
+  x3ptools = derive2 { name="x3ptools"; version="0.0.1"; sha256="16kms5hbpa5hz5i0pdwx49yp2hmhyr8hd4w672vmwi94s5d84i1q"; depends=[digest rgl xml2 zoo]; };
   xLLiM = derive2 { name="xLLiM"; version="2.1"; sha256="1q6ryw9z5wi0amv5f4drz14p36zy8gc2a0s59q10jixhhyas7ycl"; depends=[abind capushe corpcor igraph MASS Matrix]; };
+  xROI = derive2 { name="xROI"; version="0.1.2"; sha256="01xicw6ffrzs0df69dmylfxxfszqy5j81vba1w1l99h7hxq5a6bs"; depends=[colourpicker data_table jpeg lubridate moments plotly raster RCurl rgdal rjson shiny shinyAce shinyBS shinydashboard shinyFiles shinyjs shinythemes shinyTime sp stringr tiff]; };
   xSub = derive2 { name="xSub"; version="0.0.1"; sha256="0ccvkdylsia8qkfjlbbyggpy4l8z3r05cmvp4xb3j4628fa82jav"; depends=[countrycode haven RCurl]; };
   xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; };
   xaringan = derive2 { name="xaringan"; version="0.6"; sha256="0jgdixgbkwp9jnvjnrzdmlawz8f24z8in56cma3hn79glbvxfaw4"; depends=[htmltools knitr rmarkdown servr xfun]; };
@@ -12205,8 +12446,8 @@ in with self; {
   xtable = derive2 { name="xtable"; version="1.8-2"; sha256="0398qkpvlw3dv0myz4mjcyqwpwc2m31l127r8vdzwc71wb6s28qn"; depends=[]; };
   xtal = derive2 { name="xtal"; version="1.15"; sha256="1zq3vd5x3vw6acn47yd2x7kflr9sm3znmdkm68cs64ha54jbl3vs"; depends=[]; };
   xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; };
-  xtractomatic = derive2 { name="xtractomatic"; version="3.4.1"; sha256="189lya8ijm8vxjki76gjdhv1nyp3860ydpzg5ij12ggd5qqn1zgy"; depends=[dplyr httr ncdf4 readr sp]; };
-  xts = derive2 { name="xts"; version="0.10-1"; sha256="1j9ddh9v9081zrqlpylsk13fldilhjdyaw6r6pa726fhgnrsf8a2"; depends=[zoo]; };
+  xtractomatic = derive2 { name="xtractomatic"; version="3.4.2"; sha256="1w70kk608avnf7zdjx79gxqmj12cw86ma4x0b9j92md1vmpw5389"; depends=[dplyr httr ncdf4 readr sp]; };
+  xts = derive2 { name="xts"; version="0.10-2"; sha256="1i11fczks4lh8rpi6xbm9bm7f3jpcp6xw03kv178g3n3361qhmc1"; depends=[zoo]; };
   xwf = derive2 { name="xwf"; version="0.2-1"; sha256="1g94wbsq8flnkxxfxx6yg87siiwpyrx219an9a2cf1blnwjv9b68"; depends=[mgcv]; };
   xxIRT = derive2 { name="xxIRT"; version="2.0.3"; sha256="10n9rrhp0v71gmn0s2l2qi6sfplwj7anydw6rxqk409wg5is3x93"; depends=[dplyr ggplot2 lpSolveAPI magrittr reshape2]; };
   xyloplot = derive2 { name="xyloplot"; version="1.5"; sha256="0h90070m3xgcfky5q6vx6l2lfz0ihwbp2xg25mgmbijz4kg3n9d3"; depends=[]; };
@@ -12221,12 +12462,12 @@ in with self; {
   yasp = derive2 { name="yasp"; version="0.1.0"; sha256="082w1l0892v0vrvfmc1ssgy9ccj30hcrg7m56x61spgcmckfshy4"; depends=[]; };
   ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; };
   yearn = derive2 { name="yearn"; version="0.1.3"; sha256="03aqbf3q0nhg73pqpwlqdhpbmfa0rvv78b84b4mqir43601vjx65"; depends=[BiocInstaller devtools githubinstall]; };
-  yesno = derive2 { name="yesno"; version="0.0.2"; sha256="0aa8kqcqlix9a9a2l4fnl2qv25dgdn4m7cfsh7m0kk76y8q5gbc9"; depends=[]; };
+  yesno = derive2 { name="yesno"; version="0.1.0"; sha256="0l3v51kghbq9s00s736s4jvl8a0yhbgb908mjvhw6k5nqb2cgh8a"; depends=[]; };
   yhat = derive2 { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; };
   yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; };
   ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; };
   yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; };
-  yuima = derive2 { name="yuima"; version="1.6.8"; sha256="1x10q2l8xd3h86m333mi6hkb7fpf4q5fbs7gwmlynylkz216b65j"; depends=[cubature expm mvtnorm Rcpp RcppArmadillo zoo]; };
+  yuima = derive2 { name="yuima"; version="1.7.10"; sha256="0g1jh81s2i6ilpcbrjbz9wmk65m6xsdv8dif88x6v5k8660k2ksl"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; };
   yuimaGUI = derive2 { name="yuimaGUI"; version="1.2.0"; sha256="166hsq1nc0jzkqbz08y3dl0qdi58swascbkm1lc7zhsh6g93azjs"; depends=[DT ggplot2 plotly quantmod sde shiny shinyBS shinydashboard shinyjs yuima]; };
   yummlyr = derive2 { name="yummlyr"; version="0.1.1"; sha256="0xrk6g58laksz92d8mxck923sk4j92g55szrkxk123wjp5kg9vx6"; depends=[httr jsonlite]; };
   zCompositions = derive2 { name="zCompositions"; version="1.1.1"; sha256="1j6v7mfxhn67mr3q6cvcjj9pqc8a02w114z8q74h3l6jw8ahjg6m"; depends=[MASS NADA truncnorm]; };
@@ -12237,15 +12478,16 @@ in with self; {
   zeligverse = derive2 { name="zeligverse"; version="0.1.1"; sha256="1hf3hbgzdlhhyy2gvg984dwp8d0qm0ziyn8i9h5x00gwf74vn9dr"; depends=[Amelia dplyr MatchIt purrr rstudioapi tibble WhatIf Zelig ZeligChoice ZeligEI]; };
   zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; };
   zenplots = derive2 { name="zenplots"; version="0.0-3"; sha256="1ba9xv522knzbirl6ac5hzbmsw8ignsmymbkps2w057w0fsc9iyz"; depends=[graph MASS PairViz]; };
-  zetadiv = derive2 { name="zetadiv"; version="1.0.1"; sha256="0a50xj7bgb2w3yx2ghpwq2y2hkilxx0dchhscspzjalyw77jhxvp"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
+  zetadiv = derive2 { name="zetadiv"; version="1.1.0"; sha256="0z90gpwyi2d0xnwy2vz7an5wv7jrwhl99kd2s76dlxylfjp7j2rn"; depends=[car glm2 Imap mgcv nnls scam vegan]; };
   zfa = derive2 { name="zfa"; version="1.0"; sha256="0lddwpifkzggzvy56ans5pfknfr8laxcg264f3ph2z150gw1plsh"; depends=[SKAT]; };
   zic = derive2 { name="zic"; version="0.9.1"; sha256="1vd64ljigf6iwgzlgdxgj65nlwir176h7ddznddpaz2abh6n6zwp"; depends=[coda Rcpp RcppArmadillo]; };
   zip = derive2 { name="zip"; version="1.0.0"; sha256="0rgr9pcdhdq3k8n29h2ircp3ri1ibhrx81gja1y7331v15xyrabg"; depends=[]; };
   zipcode = derive2 { name="zipcode"; version="1.0"; sha256="1lvlf1h5fv412idpdssjfh4fki933dm5nhr41ppl1mf45b9j7azn"; depends=[]; };
   zipfR = derive2 { name="zipfR"; version="0.6-10"; sha256="16h5saj0b2qm3qwd7arzamn0n05hn31ybgzq4pb10ri0ajs1cvic"; depends=[]; };
-  ziphsmm = derive2 { name="ziphsmm"; version="2.0.2"; sha256="0ki9slsrh9skb23svc9m5a0gbzf4crhgrricr0swr97n5h9xfzkw"; depends=[Rcpp RcppArmadillo]; };
+  zipfextR = derive2 { name="zipfextR"; version="1.0.0"; sha256="007pw5z9rz8ng0llyd2088qxldc3sf0s35pcfqmm85qb94fdksdd"; depends=[tolerance VGAM]; };
+  ziphsmm = derive2 { name="ziphsmm"; version="2.0.4"; sha256="19ypfx05z7c0skv1nvjivxarblizqqwaqpqyvnhqrckfb7lkhdby"; depends=[pracma Rcpp RcppArmadillo]; };
   zoeppritz = derive2 { name="zoeppritz"; version="1.0-7"; sha256="14j9jl2g7gn94nzs96mwsgwlxnfbr1crjfmfwbi3rk367xi197jb"; depends=[]; };
-  zoib = derive2 { name="zoib"; version="1.5.0"; sha256="133d5qxhv5vlxb9f1lh0zsmcb7ycbr42hjynzmd8f5fd91x8k43i"; depends=[abind coda Formula matrixcalc rjags]; };
+  zoib = derive2 { name="zoib"; version="1.5.1"; sha256="0lsyr8hfhk4dk129x2l1793v6nmf2k97wnsc44ir6ymip3i4zfld"; depends=[abind coda Formula matrixcalc rjags]; };
   zonator = derive2 { name="zonator"; version="0.5.9"; sha256="04gjrm9nxnxsigrc30zghmv37ijsx27134hfnrbm51smw2y60dm4"; depends=[ggplot2 raster RColorBrewer reshape2 rgdal]; };
   zoo = derive2 { name="zoo"; version="1.8-1"; sha256="16nc5jnpkf5j9vgq3pzssv7knj30mi055wj7q3sygz3l0d88hgfr"; depends=[lattice]; };
   zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; };
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 37d6611cd9f0..6c00e58d9e73 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -438,7 +438,6 @@ let
   packagesRequireingX = [
     "accrual"
     "ade4TkGUI"
-    "adehabitat"
     "analogue"
     "analogueExtra"
     "AnalyzeFMRI"
@@ -585,7 +584,6 @@ let
     "ProbForecastGOP"
     "qtbase"
     "qtpaint"
-    "R2STATS"
     "r4ss"
     "RandomFields"
     "rareNMtests"

From 84a6e18947fe961e97173f031318cd6111a43949 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Tue, 24 Apr 2018 01:50:23 +0200
Subject: [PATCH 0262/3370] nixos/tests/keymap: improve keymap tests

simplify tests, prevent timeouts and non-deterministic failures
---
 nixos/tests/keymap.nix | 94 +++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 52 deletions(-)

diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix
index caa5f7107c23..abff90d5047d 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -3,46 +3,34 @@
 with import ../lib/testing.nix { inherit system; };
 
 let
+  readyFile  = "/tmp/readerReady";
+  resultFile = "/tmp/readerResult";
+
   testReader = pkgs.writeScript "test-input-reader" ''
     #!${pkgs.stdenv.shell}
-    readInput() {
-      touch /tmp/reader.ready
-      echo "Waiting for '$1' to be typed"
-      read -r -n1 c
-      if [ "$c" = "$2" ]; then
-        echo "SUCCESS: Got back '$c' as expected."
-        echo 0 >&2
-      else
-        echo "FAIL: Expected '$2' but got '$c' instead."
-        echo 1 >&2
-      fi
-    }
+    rm -f ${resultFile}
+    logger "testReader: START: Waiting for $1 characters, expecting '$2'."
+    touch ${readyFile}
+    read -r -N $1 chars
+    rm -f ${readyFile}
 
-    main() {
-      error=0
-      while [ $# -gt 0 ]; do
-        ret="$((readInput "$2" "$3" | systemd-cat -t "$1") 2>&1)"
-        if [ $ret -ne 0 ]; then error=1; fi
-        shift 3
-      done
-      return $error
-    }
-
-    main "$@"; echo -n $? > /tmp/reader.exit
+    if [ "$chars" == "$2" ]; then
+      logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}
+    else
+      logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}
+    fi
   '';
 
-  mkReaderInput = testname: { qwerty, expect }: with pkgs.lib; let
-    lq = length qwerty;
-    le = length expect;
-    msg = "`qwerty' (${lq}) and `expect' (${le}) lists"
-        + " need to be of the same length!";
-    result = flatten (zipListsWith (a: b: [testname a b]) qwerty expect);
-  in if lq != le then throw msg else result;
 
   mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let
-    readerInput = flatten (mapAttrsToList mkReaderInput tests);
+    combinedTests = foldAttrs (acc: val: acc ++ val) [] (builtins.attrValues tests);
     perlStr = val: "'${escape ["'" "\\"] val}'";
-    perlReaderInput = concatMapStringsSep ", " perlStr readerInput;
+    lq = length combinedTests.qwerty;
+    le = length combinedTests.expect;
+    msg = "length mismatch between qwerty (${toString lq}) and expect (${toString le}) lists!";
+    send   = concatMapStringsSep ", " perlStr combinedTests.qwerty;
+    expect = if (lq == le) then concatStrings combinedTests.expect else throw msg;
+
   in makeTest {
     name = "keymap-${layout}";
 
@@ -50,38 +38,40 @@ let
     machine.i18n.consoleKeyMap = mkOverride 900 layout;
     machine.services.xserver.layout = mkOverride 900 layout;
     machine.imports = [ ./common/x11.nix extraConfig ];
-    machine.services.xserver.displayManager.slim.enable = true;
 
     testScript = ''
-      sub waitCatAndDelete ($) {
-        return $machine->succeed(
-          "for i in \$(seq 600); do if [ -e '$_[0]' ]; then ".
-          "cat '$_[0]' && rm -f '$_[0]' && exit 0; ".
-          "fi; sleep 0.1; done; echo timed out after 60 seconds >&2; exit 1"
-        );
-      };
 
       sub mkTest ($$) {
         my ($desc, $cmd) = @_;
 
-        my @testdata = (${perlReaderInput});
-        my $shellTestdata = join ' ', map { "'".s/'/'\\'''/gr."'" } @testdata;
-
         subtest $desc, sub {
-          $machine->succeed("$cmd ${testReader} $shellTestdata &");
-          while (my ($testname, $qwerty, $expect) = splice(@testdata, 0, 3)) {
-            waitCatAndDelete "/tmp/reader.ready";
-            $machine->sendKeys($qwerty);
-          };
-          my $exitcode = waitCatAndDelete "/tmp/reader.exit";
-          die "tests for $desc failed" if $exitcode ne 0;
+          # prepare and start testReader
+          $machine->execute("rm -f ${readyFile} ${resultFile}");
+          $machine->succeed("$cmd ${testReader} ${toString le} ".q(${escapeShellArg expect} & ));
+
+          if ($desc eq "Xorg keymap") {
+            # make sure the xterm window is open and has focus
+            $machine->waitForWindow(qr/testterm/);
+            $machine->succeed("${pkgs.xdotool}/bin/xdotool search --name testterm windowactivate --sync");
+          }
+
+          # wait for reader to be ready
+          $machine->waitForFile("${readyFile}");
+          $machine->sleep(1);
+
+          # send all keys
+          foreach ((${send})) { $machine->sendKeys($_); };
+
+          # wait for result and check
+          $machine->waitForFile("${resultFile}");
+          $machine->succeed("grep -q 'PASS:' ${resultFile}");
         };
-      }
+      };
 
       $machine->waitForX;
 
       mkTest "VT keymap", "openvt -sw --";
-      mkTest "Xorg keymap", "DISPLAY=:0 xterm -fullscreen -e";
+      mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -fullscreen -e";
     '';
   };
 

From b707c91814134cb8002820e7d82ca7129b60ee45 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 11:16:55 +0200
Subject: [PATCH 0263/3370] maxima-ecl: Disable failing tests

---
 .../science/math/maxima/default.nix           |  4 ++++
 .../math/maxima/known-ecl-failures.patch      | 21 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/science/math/maxima/known-ecl-failures.patch

diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index c3eeddef6694..892b9d9520e3 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -69,6 +69,10 @@ stdenv.mkDerivation ({
       url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/maxima.system.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
       sha256 = "18zafig8vflhkr80jq2ivk46k92dkszqlyq8cfmj0b2vcfjwwbar";
     })
+    # There are some transient test failures. I hope this disables all those tests.
+    # If those test failures ever happen in the non-ecl version, that should be
+    # reportetd upstream.
+    ./known-ecl-failures.patch
   ];
 
   # Failures in the regression test suite won't abort the build process. We run
diff --git a/pkgs/applications/science/math/maxima/known-ecl-failures.patch b/pkgs/applications/science/math/maxima/known-ecl-failures.patch
new file mode 100644
index 000000000000..c32912b316e2
--- /dev/null
+++ b/pkgs/applications/science/math/maxima/known-ecl-failures.patch
@@ -0,0 +1,21 @@
+diff --git a/tests/testsuite.lisp b/tests/testsuite.lisp
+index 45a81f4..36c35b8 100644
+--- a/tests/testsuite.lisp
++++ b/tests/testsuite.lisp
+@@ -25,13 +25,14 @@
+         ((mlist simp) "rtest10" 24 25)
+         ((mlist) "rtest11" #+(or gcl cmucl ccl64) 158 #+(or gcl cmucl ccl64) 174 #+gcl 175)
+         "rtest13" "rtest13s"
+-        "rtest14"
++        ((mlist simp) "rtest14" 250 307 310 312 319) ;; fails with ecl
+         "rtest15"
+ 	;; ccl versions 1.11 and earlier fail test 50.  Mark it as a
+ 	;; known failure.  Presumably 1.12 will have this fixed.
+         ((mlist simp) "rtest16" #+ccl 50)
+         "rtestode" "rtestode_zp"
+-        "rtest3" "rtest8"
++        "rtest3"
++        ((mlist simp) "rtest8" 104) ;; fails with ecl
+         ((mlist simp) "rtest12" 76 78)
+         "rexamples"
+         ((mlist simp) "rtesthyp" 105 112 113 123 124 128)

From 847196143df811918b4a9cdb5da07364b30f7a92 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Tue, 24 Apr 2018 17:26:28 +0800
Subject: [PATCH 0264/3370] teseq: init at 1.1.1

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

diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix
new file mode 100644
index 000000000000..9502b3a0abe7
--- /dev/null
+++ b/pkgs/applications/misc/teseq/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "1.1.1";
+in
+stdenv.mkDerivation {
+  name = "teseq-${version}";
+
+  src = fetchurl {
+    url = "mirror://gnu/teseq/teseq-${version}.tar.gz";
+    sha256 = "08ln005qciy7f3jhv980kfhhfmh155naq59r5ah9crz1q4mx5yrj";
+  };
+
+  meta = {
+    homepage = https://www.gnu.org/software/teseq/;
+    description = "Escape sequence illuminator";
+    license = stdenv.lib.licenses.gpl3;
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.vaibhavsagar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 946be093765d..1a088d6644b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21364,6 +21364,8 @@ with pkgs;
 
   wire-desktop = callPackage ../applications/networking/instant-messengers/wire-desktop { };
 
+  teseq = callPackage ../applications/misc/teseq {  };
+
   # Unix tools
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
   inherit (unixtools) hexdump ps logger eject umount

From 9105db24ec7b2e8341ccebe8254038fbe81b0140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Apr 2018 10:30:53 +0100
Subject: [PATCH 0265/3370] telegraf: 1.5.3 -> 1.6.1

---
 pkgs/servers/monitoring/telegraf/default.nix  |  4 +-
 .../{deps-1.5.3.nix => deps-1.6.1.nix}        | 56 +++++++++++++++----
 2 files changed, 48 insertions(+), 12 deletions(-)
 rename pkgs/servers/monitoring/telegraf/{deps-1.5.3.nix => deps-1.6.1.nix} (92%)

diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix
index e06aaa9faa47..b7879cc763aa 100644
--- a/pkgs/servers/monitoring/telegraf/default.nix
+++ b/pkgs/servers/monitoring/telegraf/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "telegraf-${version}";
-  version = "1.5.3";
+  version = "1.6.1";
 
   goPackagePath = "github.com/influxdata/telegraf";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "${version}";
-    sha256 = "0h3v80qvb9xmkmgbp46sqh76y4k84c0da586vdy3xmmbrbagnypv";
+    sha256 = "0zc3bgs1ad392lqv72rkppxmk33b404b8jfx3wbzll7fklwxa8g2";
   };
 
   buildFlagsArray = [ ''-ldflags=
diff --git a/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix b/pkgs/servers/monitoring/telegraf/deps-1.6.1.nix
similarity index 92%
rename from pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
rename to pkgs/servers/monitoring/telegraf/deps-1.6.1.nix
index 916b4688a06e..fb98b8686cc2 100644
--- a/pkgs/servers/monitoring/telegraf/deps-1.5.3.nix
+++ b/pkgs/servers/monitoring/telegraf/deps-1.6.1.nix
@@ -185,8 +185,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/eclipse/paho.mqtt.golang";
-      rev = "d4f545eb108a2d19f9b1a735689dbfb719bc21fb";
-      sha256 = "01cnca8y5caramqn6p8aigj6l5p6z0nrs2xqqv90658x584138kh";
+      rev = "aff15770515e3c57fc6109da73d42b0d46f7f483";
+      sha256 = "1blfvrp1d5jqxxqdw7xd0ns1qiml45k0nch9jwpi0ddg7hckii2d";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-redis/redis";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-redis/redis";
+      rev = "73b70592cdaa9e6abdfcfbf97b4a90d80728c836";
+      sha256 = "0b6xwajnk65bdq98czv137gvypwnznkjnm2ksnxm87nyj2vyddm9";
     };
   }
   {
@@ -257,8 +266,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/influxdata/tail";
-      rev = "a395bf99fe07c233f41fba0735fa2b13b58588ea";
-      sha256 = "0bmkv932xhjpxwp8n74xy8wf34kiiknwq8agfbnz931apq6iw9b0";
+      rev = "c43482518d410361b6c383d7aebce33d0471d7bc";
+      sha256 = "0kf155nz9wvwawsbgaa76q4r975l7945nlvnh4ig60xm0jv8580b";
     };
   }
   {
@@ -360,6 +369,15 @@
       sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6";
     };
   }
+  {
+    goPackagePath = "github.com/nats-io/gnatsd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nats-io/gnatsd";
+      rev = "393bbb7c031433e68707c8810fda0bfcfbe6ab9b";
+      sha256 = "1hnn4p24gm90siixdvj97csrxnr78svxmypglcjska474adhhnzz";
+    };
+  }
   {
     goPackagePath = "github.com/nats-io/go-nats";
     fetch = {
@@ -509,8 +527,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "384a55110aa5ae052eb93ea94940548c1e305a99";
-      sha256 = "00idmnsmalxhm1y60lhm9vyck1ay7gbp0r35fgs8bbiwq351bs23";
+      rev = "a5c2888e464b14fa882c2a059e0f95716bd45cf1";
+      sha256 = "1czzl00lxcyhmf6x7wmw3dxmnyqij8lcahn5mv325csgyym4vm4w";
     };
   }
   {
@@ -518,8 +536,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/soniah/gosnmp";
-      rev = "5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15";
-      sha256 = "0dqz0w077xfk9fj5dd8xa6sqgdvjpb8vx997wnqpi3kbii1b9jnb";
+      rev = "f15472a4cd6f6ea7929e4c7d9f163c49f059924f";
+      sha256 = "1blhxq9sayfg7zih5rj0dg2qj9h10m6sbri57hxya9iz3jfgcx11";
     };
   }
   {
@@ -536,8 +554,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/stretchr/testify";
-      rev = "4d4bfba8f1d1027c4fdbe371823030df51419987";
-      sha256 = "1d3yz1d2s88byjzmn60jbi1m9s552f7ghzbzik97fbph37i8yjhp";
+      rev = "12b6f73e6084dad08a7c6e575284b177ecafbc71";
+      sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/gjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/gjson";
+      rev = "0623bd8fbdbf97cc62b98d15108832851a658e59";
+      sha256 = "0g6rhilcmqpdvjdds7ykzhrlsjx234chf73l8sjah0rsd03207k0";
+    };
+  }
+  {
+    goPackagePath = "github.com/tidwall/match";
+    fetch = {
+      type = "git";
+      url = "https://github.com/tidwall/match";
+      rev = "173748da739a410c5b0b813b956f89ff94730b4c";
+      sha256 = "0a4hp323gnjam3nfxfljq7d24m7rgk5vxbscjmi3ik3ph78r5avg";
     };
   }
   {

From ba389086de2fbd69866445460b7e80496a70c071 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Apr 2018 16:28:25 +0200
Subject: [PATCH 0266/3370] singular: Fix ntl dependency

---
 .../science/math/singular/default.nix         | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix
index 882d481a7f98..cec1a831c912 100644
--- a/pkgs/applications/science/math/singular/default.nix
+++ b/pkgs/applications/science/math/singular/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, gmp, bison, perl, autoconf, ncurses, readline, coreutils, pkgconfig
 , autoreconfHook
+, file
 , flint
 , ntl
 , cddlib
@@ -18,7 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "0wvgz7l1b7zkpmim0r3mvv4fp8xnhlbz4c7hc90rn30snlansnf1";
   };
 
-  configureFlags = stdenv.lib.optionals enableFactory [
+  configureFlags = [
+    "--with-ntl=${ntl}"
+  ] ++stdenv.lib.optionals enableFactory [
     "--enable-factory"
   ] ++ stdenv.lib.optionals enableGfanlib [
     "--enable-gfanlib"
@@ -42,11 +45,19 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals enableGfanlib [
     cddlib
   ];
-  nativeBuildInputs = [ autoconf bison perl pkgconfig autoreconfHook ];
+  nativeBuildInputs = [
+    bison
+    perl
+    pkgconfig
+    autoreconfHook
+  ];
 
-  preConfigure = ''
-    find . -type f -exec sed -e 's@/bin/rm@${coreutils}&@g' -i '{}' ';'
-    find . -type f -exec sed -e 's@/bin/uname@${coreutils}&@g' -i '{}' ';'
+  preAutoreconf = ''
+    find . -type f -readable -writable -exec sed \
+      -e 's@/bin/rm@${coreutils}&@g' \
+      -e 's@/bin/uname@${coreutils}&@g' \
+      -e 's@/usr/bin/file@${file}/bin/file@g' \
+      -i '{}' ';'
   '';
 
   hardeningDisable = stdenv.lib.optional stdenv.isi686 "stackprotector";

From 75b0866d0c750e4ef2fe1ed7ee1af9fd32f52874 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 23 Apr 2018 19:46:12 +0200
Subject: [PATCH 0267/3370] pari: Make pthread optional, remove unstable

---
 .../science/math/pari/default.nix             | 20 +++++++++---
 .../science/math/pari/unstable.nix            | 31 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 16 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/applications/science/math/pari/unstable.nix

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index a1ddbd9ab17d..8c24881f2152 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchurl
-, gmp, readline, libX11, libpthreadstubs, tex, perl }:
+, gmp, readline, libX11, tex, perl
+, withThread ? true, libpthreadstubs
+}:
+
+assert withThread -> libpthreadstubs != null;
 
 stdenv.mkDerivation rec {
 
@@ -11,14 +15,22 @@ stdenv.mkDerivation rec {
     sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g";
   };
 
-  buildInputs = [ gmp readline libX11 libpthreadstubs tex perl ];
+  buildInputs = [
+    gmp
+    readline
+    libX11
+    tex
+    perl
+  ] ++ stdenv.lib.optionals withThread [
+    libpthreadstubs
+  ];
 
   configureScript = "./Configure";
   configureFlags = [
-    "--mt=pthread"
     "--with-gmp=${gmp.dev}"
     "--with-readline=${readline.dev}"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin";
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--host=x86_64-darwin"
+  ++ stdenv.lib.optional withThread "--mt=pthread";
 
   preConfigure = ''
     export LD=$CC
diff --git a/pkgs/applications/science/math/pari/unstable.nix b/pkgs/applications/science/math/pari/unstable.nix
deleted file mode 100644
index 65dd3005b4ab..000000000000
--- a/pkgs/applications/science/math/pari/unstable.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, gmp, readline, perl }:
-
-stdenv.mkDerivation rec {
-  version = "2.9.3";
-  name = "pari-unstable-${version}";
-
-  src = fetchurl {
-    url = "http://pari.math.u-bordeaux.fr/pub/pari/unstable/pari-${version}.tar.gz";
-    sha256 = "0qqal1lpggd6dvs19svnz0dil86xk0xkcj5s3b7104ibkmvjfsp7";
-  };
-
-  buildInputs = [gmp readline];
-  nativeBuildInputs = [perl];
-
-  configureScript = "./Configure";
-  configureFlags =
-    "--with-gmp=${gmp.dev} " +
-    "--with-readline=${readline.dev}";
-
-  meta = with stdenv.lib; {
-    description = "Computer algebra system for high-performance number theory computations";
-    homepage    = "http://pari.math.u-bordeaux.fr/";
-    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ertes raskin ];
-    platforms   = platforms.linux;
-
-    inherit version;
-    downloadPage = "http://pari.math.u-bordeaux.fr/download.html";
-    updateWalker = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 946be093765d..d91d1e92c0b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20279,7 +20279,6 @@ with pkgs;
 
   pari = callPackage ../applications/science/math/pari { tex = texlive.combined.scheme-basic; };
   gp2c = callPackage ../applications/science/math/pari/gp2c.nix { };
-  pari-unstable = callPackage ../applications/science/math/pari/unstable.nix {};
 
   palp = callPackage ../applications/science/math/palp { };
 

From 5f6373d582c56dd1ff8a961ceeaccaced5ded953 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 11 Apr 2018 21:54:05 +0200
Subject: [PATCH 0268/3370] dragonfly-reverb: init at 0.9.1

---
 .../audio/dragonfly-reverb/default.nix        | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/audio/dragonfly-reverb/default.nix

diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix
new file mode 100644
index 000000000000..b3d9fd580288
--- /dev/null
+++ b/pkgs/applications/audio/dragonfly-reverb/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchgit, libjack2, libGL, pkgconfig, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "dragonfly-reverb-${src.rev}";
+
+  src = fetchgit {
+    url = "https://github.com/michaelwillis/dragonfly-reverb";
+    rev = "0.9.1";
+    sha256 = "1dbykx044h768bbzabdagl4jh65gqgfsxsrarjrkp07sqnhlnhpd";
+  };
+
+  patchPhase = ''
+    patchShebangs dpf/utils/generate-ttl.sh
+  '';
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    libjack2 xorg.libX11 libGL
+  ];
+
+  installPhase = ''
+    mkdir -p $out/lib/lv2/
+    cp -a bin/DragonflyReverb.lv2/ $out/lib/lv2/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/michaelwillis/dragonfly-reverb;
+    description = "A hall-style reverb based on freeverb3 algorithms";
+    maintainers = [ maintainers.magnetophon ];
+    license = licenses.gpl2;
+    platforms = ["x86_64-linux"];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67a5390aa6aa..d2019b1f25cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15269,6 +15269,8 @@ with pkgs;
 
   draftsight = callPackage ../applications/graphics/draftsight { };
 
+  dragonfly-reverb = callPackage ../applications/audio/dragonfly-reverb { };
+
   droopy = callPackage ../applications/networking/droopy {
     inherit (python3Packages) wrapPython;
   };

From 39a64b28b52ae0ea57f227941fa23bdced6cc334 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 23 Apr 2018 12:50:48 +0200
Subject: [PATCH 0269/3370] =?UTF-8?q?orca:=203.28.0=20=E2=86=92=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 109c0afa12d0..abc8c3e78424 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -10,7 +10,7 @@
 with lib;
 let
   pname = "orca";
-  version = "3.28.0";
+  version = "3.28.1";
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
@@ -18,7 +18,7 @@ in buildPythonApplication rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1jy2zxs50ah1rg4zgiaj2l2sm1zyyvs37phws0hwmy3xd90ljfc2";
+    sha256 = "04l5ccn7wf175gyq3blfpx0yh70ny06n161297jwc9idf951852g";
   };
 
   patches = [

From 6c15df2c91ce555574ec1ed1dd2f663bd5cc054d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 23 Apr 2018 12:51:17 +0200
Subject: [PATCH 0270/3370] =?UTF-8?q?gnome3.epiphany:=203.28.1=20=E2=86=92?=
 =?UTF-8?q?=203.28.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index 3ece64dc163f..c9537f497690 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
-  version = "3.28.1";
+  version = "3.28.1.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0zvxrwlswxadq4zbr4f73ms141d08j0lhi6rzmj83j1s3gan88md";
+    sha256 = "15d4dr4dwb1dyw3mvs7wp5gik57kdg0rxdc49n92wx46wfh6lhlr";
   };
 
   # Tests need an X display

From fe5fcee1f271f53385c238ff9b46906b1cfcf4d7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 23 Apr 2018 12:51:37 +0200
Subject: [PATCH 0271/3370] =?UTF-8?q?gnome3.sushi:=203.24.0=20=E2=86=92=20?=
 =?UTF-8?q?3.28.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/sushi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index 00cec2f93b9f..114c0d8ac960 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "sushi-${version}";
-  version = "3.24.0";
+  version = "3.28.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/sushi/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48";
+    sha256 = "1yydd34q7r05z0jdgym3r4f8jv8snrcvvhxw0vxn6damlvj5lbiw";
   };
 
   passthru = {

From 1643713bf3bc0dd3ded6232ea225a46d6e796d87 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 23 Apr 2018 12:52:04 +0200
Subject: [PATCH 0272/3370] =?UTF-8?q?libhttpseverywhere:=200.8.2=20?=
 =?UTF-8?q?=E2=86=92=200.8.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 6af3f5225d4d..332dd8444eb4 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -3,13 +3,13 @@
 
 let
   pname = "libhttpseverywhere";
-  version = "0.8.2";
+  version = "0.8.3";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0vcnimlfcscyvjbh845xbnjb9qc8x0mliaqz2gczxxpakxrbl3gh";
+    sha256 = "1jmn6i4vsm89q1axlq4ajqkzqmlmjaml9xhw3h9jnal46db6y00w";
   };
 
   nativeBuildInputs = [ gnome3.vala gobjectIntrospection meson ninja pkgconfig ];

From af3565ca206831caac47758f4415ec1502e1f5d0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 24 Apr 2018 13:10:58 +0200
Subject: [PATCH 0273/3370] =?UTF-8?q?geary:=200.12.1=20=E2=86=92=200.12.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/misc/geary/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix
index 1994b587fbd3..548936dc5e52 100644
--- a/pkgs/desktops/gnome-3/misc/geary/default.nix
+++ b/pkgs/desktops/gnome-3/misc/geary/default.nix
@@ -6,14 +6,14 @@
 
 let
   pname = "geary";
-  version = "0.12.1";
+  version = "0.12.2";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "12hbpd5j3rb122nrsqmgsg31x82xl0ksm0nmsl614v1dd7crqnh6";
+    sha256 = "09j5gh4zm49fcg2ycvy00dkkw69rfppqwc3lqdi4994hry4jivx9";
   };
 
   nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ];

From 396b5d9c655247c776e7dc6789ad623502c1cc4b Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 13:38:44 +0200
Subject: [PATCH 0274/3370] maxima-ecl: Disable more failing tests

---
 pkgs/applications/science/math/maxima/known-ecl-failures.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/maxima/known-ecl-failures.patch b/pkgs/applications/science/math/maxima/known-ecl-failures.patch
index c32912b316e2..f1d612d993e6 100644
--- a/pkgs/applications/science/math/maxima/known-ecl-failures.patch
+++ b/pkgs/applications/science/math/maxima/known-ecl-failures.patch
@@ -7,7 +7,7 @@ index 45a81f4..36c35b8 100644
          ((mlist) "rtest11" #+(or gcl cmucl ccl64) 158 #+(or gcl cmucl ccl64) 174 #+gcl 175)
          "rtest13" "rtest13s"
 -        "rtest14"
-+        ((mlist simp) "rtest14" 250 307 310 312 319) ;; fails with ecl
++        ;; "rtest14" ;; some tests sometimes fail with ecl, hard to reproduce. Observed failing: 250, 267, 297, 307, 310, 312, 315, 319
          "rtest15"
  	;; ccl versions 1.11 and earlier fail test 50.  Mark it as a
  	;; known failure.  Presumably 1.12 will have this fixed.

From 047d17b2d848c74a5c7ac5e97f047b83a1f9046b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Apr 2018 08:10:36 -0400
Subject: [PATCH 0275/3370] linux: 4.4.128 -> 4.4.129

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index b14418964da5..fe8633ed0da7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.128";
+  version = "4.4.129";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1c5nlxazn2ijfra1bn3x4fdz3fx02j76hg430jgyij61vndgi5ka";
+    sha256 = "0aviyky8f73l6jpi1d4by947rj78d5vckxkyf9aj73bavaxc8rd1";
   };
 } // (args.argsOverride or {}))

From 93f1969b040646efe24dcb469e3b8049ef7ab330 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Apr 2018 08:10:49 -0400
Subject: [PATCH 0276/3370] linux: 4.9.95 -> 4.9.96

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 2f10bcc0ea80..63fe3db3b577 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.95";
+  version = "4.9.96";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1x4z66v6zl4q0hzinzb1wvlq9fd3v4sbwj9lay69f3vdq8knsnly";
+    sha256 = "0zw7x86c8qa2kzkwlxlhqzsnddyp1ncw4ja660bqnzqrnmp5jvw2";
   };
 } // (args.argsOverride or {}))

From d9f9b588732b53d3bbba4ad2bb63b35fb70c98bb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Apr 2018 08:11:10 -0400
Subject: [PATCH 0277/3370] linux: 4.14.35 -> 4.14.36

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index e064dbfd85bd..47784e770127 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.35";
+  version = "4.14.36";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "01zfbd766y8hfsd248lffaj6d4ghl4j918m3yvl892p84xsp5aq2";
+    sha256 = "0hxwd3kl5g7zrcl3b00nxdv0zjkmmfrk1i5v3hrjm0dmsw249qna";
   };
 } // (args.argsOverride or {}))

From 6a8b57799d2565aea1b8641f8c37c619bc48f342 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Apr 2018 08:11:21 -0400
Subject: [PATCH 0278/3370] linux: 4.16.3 -> 4.16.4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 343d7c9f9dac..d46c95e1a593 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.3";
+  version = "4.16.4";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18w1dhq5dnmcqc3d8imwm90zwfw0fhda7sy5fjwkhzm93nl72s8d";
+    sha256 = "0v494vm1vbyfk8xmvgf27chsjpy9x7q0iwdaana8vnih2ai6vdcs";
   };
 } // (args.argsOverride or {}))

From 93324dbfa6a003476eb84d4532c8f629578bf6a0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Apr 2018 08:11:40 -0400
Subject: [PATCH 0279/3370] linux: 4.17-rc1 -> 4.17-rc2

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 6c0f01fb8ad7..6370f82235a7 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc1";
-  modDirVersion = "4.17.0-rc1";
+  version = "4.17-rc2";
+  modDirVersion = "4.17.0-rc2";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0a3lrax6f8f98lj65aawpqkzkmxcl2x4h20kr0cr7wf0jvpnn5y3";
+    sha256 = "1z4kl25x8m498wicbzhx21kvksp63ab8l2s0nfxf7fwj7dd13cld";
   };
 
   # Should the testing kernels ever be built on Hydra?

From fc79bf4374b5b254081bb84bfb4e69009c50d775 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 24 Apr 2018 08:14:31 -0400
Subject: [PATCH 0280/3370] linux: Remove 4.15.x

---
 pkgs/os-specific/linux/kernel/linux-4.15.nix | 18 ------------------
 pkgs/top-level/all-packages.nix              | 16 ----------------
 2 files changed, 34 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.15.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.15.nix b/pkgs/os-specific/linux/kernel/linux-4.15.nix
deleted file mode 100644
index 07f408027d8e..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.15.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
-
-with stdenv.lib;
-
-buildLinux (args // rec {
-  version = "4.15.18";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hdg5h91zwypsgb1lp1m5q1iak1g00rml54fh6j7nj8dgrqwv29z";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a088d6644b7..62093afc8204 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13374,21 +13374,6 @@ with pkgs;
       ];
   };
 
-  linux_4_15 = callPackage ../os-specific/linux/kernel/linux-4.15.nix {
-    kernelPatches =
-      [ kernelPatches.bridge_stp_helper
-        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
-        # when adding a new linux version
-        # kernelPatches.cpu-cgroup-v2."4.11"
-        kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_16 = callPackage ../os-specific/linux/kernel/linux-4.16.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -13608,7 +13593,6 @@ with pkgs;
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4);
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
-  linuxPackages_4_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_15);
   linuxPackages_4_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_16);
   # Don't forget to update linuxPackages_latest!
 

From c9b3a2452f7e216260b36794e48a43a052c813d4 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Sun, 22 Apr 2018 19:57:23 +0100
Subject: [PATCH 0281/3370] coursera-dl: init at 0.10.0

---
 maintainers/maintainer-list.nix               |  5 +++
 .../applications/misc/coursera-dl/default.nix | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/applications/misc/coursera-dl/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e6a89f93acc5..40f8342f3ed8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -310,6 +310,11 @@
     email = "alex@farfromthere.net";
     github = "AJChapman";
   };
+  alexfmpe = {
+    email = "alexandre.fmp.esteves@gmail.com";
+    github = "alexfmpe";
+    name = "Alexandre Esteves";
+  };
   alexvorobiev = {
     email = "alexander.vorobiev@gmail.com";
     github = "alexvorobiev";
diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix
new file mode 100644
index 000000000000..a7a2dac26c6e
--- /dev/null
+++ b/pkgs/applications/misc/coursera-dl/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, glibcLocales, pandoc, python3 }:
+
+let
+  pythonPackages = python3.pkgs;
+
+in pythonPackages.buildPythonApplication rec {
+  name = "coursera-dl-${version}";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "coursera-dl";
+    repo = "coursera-dl";
+    rev = version;
+    sha256 = "0m3f6ly8c3mkb8yy2y398afswqgy17rz159s1054wzxpb4f85zlb";
+  };
+
+  nativeBuildInputs = with pythonPackages; [ pandoc ];
+
+  buildInputs = with pythonPackages; [ glibcLocales ];
+
+  propagatedBuildInputs = with pythonPackages; [ beautifulsoup4 ConfigArgParse keyring pyasn1 requests six urllib3 ];
+
+  checkInputs = with pythonPackages; [ pytest mock ];
+
+  preConfigure = ''
+    export LC_ALL=en_US.utf-8
+  '';
+
+  checkPhase = ''
+    # requires dbus service
+    py.test -k 'not test_get_credentials_with_keyring' .
+  '';
+
+  meta = with stdenv.lib; {
+    description = "CLI for downloading Coursera.org videos and naming them";
+    homepage = https://github.com/coursera-dl/coursera-dl;
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ alexfmpe ];
+    platforms = platforms.darwin ++ platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b575c9c4a974..ea37582d74ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15121,6 +15121,8 @@ with pkgs;
 
   convchain = callPackage ../tools/graphics/convchain {};
 
+  coursera-dl = callPackage ../applications/misc/coursera-dl {};
+
   coyim = callPackage ../applications/networking/instant-messengers/coyim {};
 
   cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { };

From 0fad5f7a8445d2848878789f2d1b9b01fc13c18f Mon Sep 17 00:00:00 2001
From: Marcin Falkiewicz <avalatron@gmail.com>
Date: Mon, 23 Apr 2018 16:02:12 +0200
Subject: [PATCH 0282/3370] wine: add Vulkan support

---
 pkgs/misc/emulators/wine/base.nix    | 1 +
 pkgs/misc/emulators/wine/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix      | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index db58c398526a..864b8fac96fc 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -48,6 +48,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optional pulseaudioSupport      pkgs.libpulseaudio
   ++ lib.optional xineramaSupport        pkgs.xorg.libXinerama
   ++ lib.optional udevSupport            pkgs.udev
+  ++ lib.optional vulkanSupport          pkgs.vulkan-loader
   ++ lib.optionals gstreamerSupport      (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ])
   ++ lib.optionals gtkSupport    [ pkgs.gtk3 pkgs.glib ]
   ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ]
diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix
index 91fb0da82d8a..ca67ca836ba0 100644
--- a/pkgs/misc/emulators/wine/default.nix
+++ b/pkgs/misc/emulators/wine/default.nix
@@ -40,7 +40,9 @@
   pulseaudioSupport ? false,
   udevSupport ? false,
   xineramaSupport ? false,
-  xmlSupport ? false }:
+  xmlSupport ? false,
+  vulkanSupport ? false,
+}:
 
 let wine-build = build: release:
       lib.getAttr build (callPackage ./packages.nix {
@@ -51,7 +53,7 @@ let wine-build = build: release:
                   netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport
                   gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport
                   pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport
-                  openglSupport gstreamerSupport udevSupport;
+                  openglSupport gstreamerSupport udevSupport vulkanSupport;
         };
       });
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a088d6644b7..46bdee7b7ac6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21074,6 +21074,7 @@ with pkgs;
       fontconfigSupport = true;
       alsaSupport = true;
       openglSupport = true;
+      vulkanSupport = stdenv.isLinux;
       tlsSupport = true;
       cupsSupport = true;
       dbusSupport = true;

From 49f02db58c1feacdb1b00f2986443084746dd1c8 Mon Sep 17 00:00:00 2001
From: Carlos D'Agostino <m@cdagostino.io>
Date: Tue, 24 Apr 2018 23:40:37 +1000
Subject: [PATCH 0283/3370] go-jira: init at 1.0.17

---
 maintainers/maintainer-list.nix            |  5 +++++
 pkgs/applications/misc/go-jira/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/go-jira/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1cd73469e78a..3e5231ab9aba 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -710,6 +710,11 @@
     github = "canndrew";
     name = "Andrew Cann";
   };
+  carlosdagos = {
+    email = "m@cdagostino.io";
+    github = "carlosdagos";
+    name = "Carlos D'Agostino";
+  };
   carlsverre = {
     email = "accounts@carlsverre.com";
     github = "carlsverre";
diff --git a/pkgs/applications/misc/go-jira/default.nix b/pkgs/applications/misc/go-jira/default.nix
new file mode 100644
index 000000000000..b80ddb8f303f
--- /dev/null
+++ b/pkgs/applications/misc/go-jira/default.nix
@@ -0,0 +1,22 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "go-jira-${version}";
+  version = "1.0.17";
+
+  goPackagePath = "gopkg.in/Netflix-Skunkworks/go-jira.v1";
+
+  src = fetchgit {
+    rev = "v${version}";
+    url = "https://gopkg.in/Netflix-Skunkworks/go-jira.v1";
+    sha256 = "0ap5dzikp934mawigmv7ighajr5yxpck2gpnb2cmkc1p6qa6gn4v";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Simple command line client for Atlassian's Jira service written in Go";
+    homepage = "https://github.com/Netflix-Skunkworks/go-jira";
+    license = licenses.asl20;
+    maintainers = [ maintainers.carlosdagos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35e320dc31fc..ba49ed395b1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3118,6 +3118,8 @@ with pkgs;
 
   jnettop = callPackage ../tools/networking/jnettop { };
 
+  go-jira = callPackage ../applications/misc/go-jira { };
+
   john = callPackage ../tools/security/john {
     gcc = gcc49; # doesn't build with gcc5
   };

From cdfa85c599a2d0fbc3288e6245564c91d8ac1a92 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 15:40:12 +0200
Subject: [PATCH 0284/3370] cddlib: 0.94h -> 0.94i, add cdd_both_reps binary

---
 pkgs/development/libraries/cddlib/default.nix | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix
index 818eb6db8c69..ee56b50e1da5 100644
--- a/pkgs/development/libraries/cddlib/default.nix
+++ b/pkgs/development/libraries/cddlib/default.nix
@@ -1,17 +1,49 @@
-{stdenv, fetchurl, gmp}:
+{ stdenv
+, fetchurl
+, fetchpatch
+, gmp
+, autoreconfHook
+}:
+
 stdenv.mkDerivation rec {
   name = "cddlib-${version}";
-  fileVersion = "094h";
-  version = "0.94h";
-  src = fetchurl {
+  version = "0.94i";
+  src = let
+    fileVersion = stdenv.lib.replaceStrings ["."] [""] version;
+  in fetchurl {
+    # Might switch to github in the future, see
+    # https://trac.sagemath.org/ticket/21952#comment:20
     urls = [
       "http://archive.ubuntu.com/ubuntu/pool/universe/c/cddlib/cddlib_${fileVersion}.orig.tar.gz"
       "ftp://ftp.math.ethz.ch/users/fukudak/cdd/cddlib-${fileVersion}.tar.gz"
     ];
-    name = "";
-    sha256 = "1dasasscwfg793q8fwzgwf64xwj7w62yfvszpr8x8g38jka08vgy";
+    sha256 = "00zdgiqb91vx6gd2103h3ijij0llspsxc6zz3iw2bll39fvkl4xq";
   };
   buildInputs = [gmp];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+  # compute reduced H and V representation of polytope
+  # this patch is included by most distributions (Debian, Conda, ArchLinux, SageMath)
+  # proposed upstream (no answer yet): https://github.com/cddlib/cddlib/pull/3
+  both_reps_c = (fetchurl {
+    name = "cdd_both_reps.c";
+    url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cdd_both_reps.c?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d";
+    sha256 = "0r9yc5bgiz8i72c6vsn2y2mjk5581iw94gji9v7lg16kzzgrk9x0";
+  });
+  preAutoreconf = ''
+    # Required by sage.geometry.polyhedron
+    cp ${both_reps_c} src/cdd_both_reps.c
+    cp ${both_reps_c} src-gmp/cdd_both_reps.c
+  '';
+  patches = [
+    # add the cdd_both_reps binary
+    (fetchpatch {
+      name = "add-cdd_both_reps-binary.patch";
+      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-libs/cddlib/files/cddlib-094h-add-cdd_both_reps-binary.patch?id=78e3a61a68c916450aa4e5ceecd20041583af901";
+      sha256 = "162ni2fr7dpbdkz0b5nizxq7qr5k1i1d75g0smiylpzfb0hb761a";
+    })
+  ];
   meta = {
     inherit version;
     description = ''An implementation of the Double Description Method for generating all vertices of a convex polyhedron'';

From 46ce1047b6cf2cf76eb9ce7e95aac70361f36d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 24 Apr 2018 17:01:29 +0200
Subject: [PATCH 0285/3370] knot-dns: remove .out/lib/*.la

They're really useless here AFAIK. _Currently_ this doesn't
reduce the (transitive) closure at all, but perhaps in future...
---
 pkgs/servers/dns/knot-dns/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index de37aeaa590b..88fa07009f83 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   #doCheck = true; problems in combination with dynamic linking
 
-  postInstall = ''rm -r "$out"/var'';
+  postInstall = ''rm -r "$out"/var "$out"/lib/*.la'';
 
   meta = with stdenv.lib; {
     description = "Authoritative-only DNS server from .cz domain registry";

From 05206347258f1e70d2e96e10bbb6402f8e567edc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Apr 2018 17:04:25 +0200
Subject: [PATCH 0286/3370] xmr-stak: doesn't build with gcc7 if cuda is
 enabled

---
 pkgs/applications/misc/xmr-stak/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix             | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmr-stak/default.nix b/pkgs/applications/misc/xmr-stak/default.nix
index c24e1b0c2f1f..51fd2ee80648 100644
--- a/pkgs/applications/misc/xmr-stak/default.nix
+++ b/pkgs/applications/misc/xmr-stak/default.nix
@@ -1,11 +1,16 @@
-{ stdenv, lib, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl
+{ stdenv, stdenvGcc6, lib
+, fetchFromGitHub, cmake, libuv, libmicrohttpd, openssl
 , opencl-headers, ocl-icd, hwloc, cudatoolkit
 , devDonationLevel ? "0.0"
 , cudaSupport ? false
 , openclSupport ? true
 }:
 
-stdenv.mkDerivation rec {
+let
+  stdenv' = if cudaSupport then stdenvGcc6 else stdenv;
+in
+
+stdenv'.mkDerivation rec {
   name = "xmr-stak-${version}";
   version = "2.4.3";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e68c48d89966..eba8440aff4e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16785,6 +16785,7 @@ with pkgs;
   };
 
   xmr-stak = callPackage ../applications/misc/xmr-stak {
+    stdenvGcc6 = overrideCC stdenv gcc6;
     hwloc = hwloc-nox;
   };
 

From b6dbdaa28c4c9fce3801fcc1e0e3e627d23b54f1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 24 Apr 2018 17:04:47 +0200
Subject: [PATCH 0287/3370] openarena: needs libcurl for fast assets downloads

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

diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix
index 1e396318bbbd..22ce05cb38a7 100644
--- a/pkgs/games/openarena/default.nix
+++ b/pkgs/games/openarena/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis }:
+{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis, curl }:
 
 stdenv.mkDerivation rec {
   name = "openarena-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   installPhase = let
     gameDir = "$out/openarena-$version";
     interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
-    libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis ];
+    libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis curl ];
   in ''
     mkdir -pv $out/bin
     cd $out

From fa1d1eec6e5ef9f248416bec9df10ee2c9ed0e15 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Apr 2018 09:19:45 -0500
Subject: [PATCH 0288/3370] nixos/nix-daemon: optionally (on by default) check
 nix.conf can be read

* checks using package providing the nix-daemon that we'll be using
* made optional (unlike some other config checks) "just in case":
  since this requires running the new Nix on the builder, this
  won't work in a few (AFAIK very uncommon) situations such as
  cross-compiling NixOS or using `include` directives in nix.conf

This does rely on Nix2 but not by the builder.
Since we only offer Nix2+ in-tree this should be fine,
and may otherwise be required anyway.
---
 nixos/modules/services/misc/nix-daemon.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index f2d34560a718..9c428d7a422d 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -33,7 +33,7 @@ let
       sh = pkgs.runtimeShell;
       binshDeps = pkgs.writeReferencesToFile sh;
     in
-      pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } ''
+      pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } (''
         ${optionalString (!isNix20) ''
           extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done)
         ''}
@@ -62,7 +62,11 @@ let
         ''}
         $extraOptions
         END
-      '';
+      '' + optionalString cfg.checkConfig ''
+        echo "Checking that Nix can read nix.conf..."
+        ln -s $out ./nix.conf
+        NIX_CONF_DIR=$PWD ${cfg.package}/bin/nix show-config >/dev/null
+      '');
 
 in
 
@@ -349,6 +353,13 @@ in
         '';
       };
 
+      checkConfig = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          If enabled (the default), checks that Nix can parse the generated nix.conf.
+        '';
+      };
     };
 
   };

From 0ada4b37d7728f74f6077f503ced5d0c18c134f7 Mon Sep 17 00:00:00 2001
From: nocent <nocent@protonmail.ch>
Date: Tue, 24 Apr 2018 15:32:47 +0000
Subject: [PATCH 0289/3370] Added version info, set compatible platforms

Thanks for the review @nlewo and @Infinisil
---
 pkgs/applications/editors/bonzomatic/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/bonzomatic/default.nix b/pkgs/applications/editors/bonzomatic/default.nix
index 57aa381e68c5..9f1db1464482 100644
--- a/pkgs/applications/editors/bonzomatic/default.nix
+++ b/pkgs/applications/editors/bonzomatic/default.nix
@@ -1,14 +1,14 @@
 { stdenv, makeWrapper, fetchFromGitHub, cmake, alsaLib, mesa_glu, libXcursor, libXinerama, libXrandr, xorgserver }:
 
-let
-  name = "bonzomatic";
-in stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "bonzomatic";
+  version = "2018-03-29";
 
   src = fetchFromGitHub {
-    repo = name;
     owner = "Gargaj";
-    rev = "2018-03-29";
+    repo = pname;
+    rev = version;
     sha256 = "12mdfjvbhdqz1585772rj4cap8m4ijfci6ib62jysxjf747k41fg";
   };
 
@@ -25,7 +25,6 @@ in stdenv.mkDerivation {
       unfreeRedistributable # contains libbass.so in repository
     ];
     maintainers = [ maintainers.nocent ];
-    platforms = platforms.linux;
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }
-

From 51a345c6bb5010fda083ed7e1467b1b5e267fe4e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 24 Apr 2018 18:22:25 +0200
Subject: [PATCH 0290/3370] =?UTF-8?q?gnome3.gjs:=201.52.1=20=E2=86=92=201.?=
 =?UTF-8?q?52.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index 68b85d9dfe0f..fc352de2acf8 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gjs-${version}";
-  version = "1.52.1";
+  version = "1.52.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1s1m8xv3ixgl0hah3r364ws249d6w8yn56q2ahfn3dg2j54rmz58";
+    sha256 = "00x08ypx61i3k84bmvkhdj37q81g79lzm5sxqm1lz4xzzad9rg98";
   };
 
   passthru = {

From 6d9eb6c8a9aedfc6d5fe5f8a5ad6d791588dacf6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 09:59:29 -0700
Subject: [PATCH 0291/3370] openfortivpn: 1.6.0 -> 1.7.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/openfortivpn/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn -h’ got 0 exit code
- ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn --help’ got 0 exit code
- ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn help’ got 0 exit code
- ran ‘/nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0/bin/openfortivpn --version’ and found version 1.7.0
- found 1.7.0 with grep in /nix/store/p02dl9fy2g9f6dddm4i0z1nbi4b4vk7j-openfortivpn-1.7.0
- directory tree listing: https://gist.github.com/34708b90f0d4fc975a7b9dbd4670bfee
---
 pkgs/tools/networking/openfortivpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix
index 6eafdde10824..b265cdb4c326 100644
--- a/pkgs/tools/networking/openfortivpn/default.nix
+++ b/pkgs/tools/networking/openfortivpn/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let repo = "openfortivpn";
-    version = "1.6.0";
+    version = "1.7.0";
 
 in stdenv.mkDerivation {
   name = "${repo}-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "adrienverge";
     inherit repo;
     rev = "v${version}";
-    sha256 = "0ca80i8m88f4vhwiq548wjyqwwszpbap92l83bl0wdppvp4nk192";
+    sha256 = "1qfz5igry7fhrkz5iyzqpffldhpdvcw98k06yb6acwc1jyv87nh0";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 378630f477cc6e141bcc447982116da4d3a085f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 10:18:10 -0700
Subject: [PATCH 0292/3370] osrm-backend: 5.16.4 -> 5.17.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/osrm-backend/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract -h’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract --help’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract -v’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-extract --version’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition -h’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition --help’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition -v’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-partition --version’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize -h’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize --help’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize -v’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-customize --version’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract -h’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract --help’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract -v’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-contract --version’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore -h’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore --help’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore -v’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-datastore --version’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed -h’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed --help’ got 0 exit code
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed -v’ and found version 5.17.2
- ran ‘/nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2/bin/osrm-routed --version’ and found version 5.17.2
- found 5.17.2 with grep in /nix/store/y0779ksgxhvysi6ha717axl7v06grmar-osrm-backend-5.17.2
- directory tree listing: https://gist.github.com/82e852d822486a83285e755488f6d056
---
 pkgs/servers/osrm-backend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index b7c85a8f9a4b..3b11f26d6ce2 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "5.16.4";
+  version = "5.17.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "01wghly0rqv4f9lfabmbfddjp2pclcfip45rmn0fvnj5c6x23v6v";
+    sha256 = "0ar94wpsc2vr6pn4x5wy7mkpjlilgnyw545wm0l78174q43460y9";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 3c546c2da99d62584186d2e9b4945eebdb255096 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 10:20:14 -0700
Subject: [PATCH 0293/3370] pcmanfm: 1.2.5 -> 1.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pcmanfm/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0/bin/pcmanfm -h’ got 0 exit code
- ran ‘/nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0/bin/pcmanfm --help’ got 0 exit code
- ran ‘/nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0/bin/.pcmanfm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0/bin/.pcmanfm-wrapped --help’ got 0 exit code
- found 1.3.0 with grep in /nix/store/z37gyw9vskaby2caizkzghjd7ikafv64-pcmanfm-1.3.0
- directory tree listing: https://gist.github.com/f15deaa66af5124a632abbca797f7240
---
 pkgs/applications/misc/pcmanfm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix
index 148dd427fbc7..a77b2d17ecb4 100644
--- a/pkgs/applications/misc/pcmanfm/default.nix
+++ b/pkgs/applications/misc/pcmanfm/default.nix
@@ -7,10 +7,10 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
-  name = "pcmanfm-1.2.5";
+  name = "pcmanfm-1.3.0";
   src = fetchurl {
     url = "mirror://sourceforge/pcmanfm/${name}.tar.xz";
-    sha256 = "0rxdh0dfzc84l85c54blq42gczygq8adhr3l9hqzy1dp530cm1hc";
+    sha256 = "1ywgfyklms5hqkapsbjps4kyx20ac0d1qk16ww74yagkyfdkwsas";
   };
 
   buildInputs = [ glib gtk libfm' libX11 pango gnome3.defaultIconTheme ];

From 866940303c5239eaf0a7261ad00f575641fe2931 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Apr 2018 12:25:43 -0500
Subject: [PATCH 0294/3370] mendeley: 1.17.13 -> 1.18, touchup update script

(support "1.18" instead of "1.18.0")
---
 pkgs/applications/office/mendeley/default.nix | 6 +++---
 pkgs/applications/office/mendeley/update.nix  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index a8664e6820a4..a0a825201524 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -44,14 +44,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.17.13-stable";
+  shortVersion = "1.18-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "0q4x62k00whmq8lskphpcxc610cvclxzcr5k0v7pxjxs9sx5yx43"
-    else "01ylyily1hip35z0d4qkdpbzp5yn4r015psc5773xsqlgrnlwjm3";
+    then "046v1j4sc6m0bf89f52zsg8riygrhldplyih5p0cjhcsd45q6fx8"
+    else "072fppgxhiryb6m1fb4qvq8nbblx88xpknnklygch1sw0lyks69h";
 
   deps = [
     qtbase
diff --git a/pkgs/applications/office/mendeley/update.nix b/pkgs/applications/office/mendeley/update.nix
index 9ac82615c561..cb9ee02702dd 100644
--- a/pkgs/applications/office/mendeley/update.nix
+++ b/pkgs/applications/office/mendeley/update.nix
@@ -15,9 +15,9 @@ writeScript "update-mendeley" ''
   }
 
   amd64URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/amd64/mendeleydesktop-latest)
-  amd64V=$(basename $amd64URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+  amd64V=$(basename $amd64URL|grep -m1 -o "[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?")
   i386URL=$(follow https://www.mendeley.com/repositories/ubuntu/stable/i386/mendeleydesktop-latest)
-  i386V=$(basename $i386URL|grep -m1 -o "[0-9]\+\.[0-9]\+\.[0-9]\+")
+  i386V=$(basename $i386URL|grep -m1 -o "[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?")
 
   echo "amd64 version: $amd64V"
   echo "i386 version:  $i386V"

From bec9726946daada8e14d2c329c53dbb69ce79fae Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Apr 2018 12:55:16 -0500
Subject: [PATCH 0295/3370] ngx_brotli: -> 0.1.1

---
 pkgs/servers/http/nginx/modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 95e156f96275..0e53b35e06d0 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -5,8 +5,8 @@
     src = let gitsrc = pkgs.fetchFromGitHub {
       owner = "eustas";
       repo = "ngx_brotli";
-      rev = "6a1174446f5a866d3d13615dd2824177570f0a69";
-      sha256 = "148xfh6w1wgql2jj922ryiddrs93dyacs903j2hnil67cpia45p6";
+      rev = "37ab9b2933a0b756ba3447000b7f31d432ed8228"; # v0.1.1
+      sha256 = "114ai8v9ns23qm12wp9dgdjvldqjnrmb3cmarkn0d3k6n3bm01bf";
     }; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''
       cp -a ${gitsrc} $out
       substituteInPlace $out/config \

From 2dbde855ebd39bfe2ea6d9431c11b0344e48ff4e Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Thu, 19 Apr 2018 14:47:40 +0000
Subject: [PATCH 0296/3370] pythonPackages.dataclasses: init at 0.5

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

diff --git a/pkgs/development/python-modules/dataclasses/default.nix b/pkgs/development/python-modules/dataclasses/default.nix
new file mode 100644
index 000000000000..083ea6d6347b
--- /dev/null
+++ b/pkgs/development/python-modules/dataclasses/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy36 }:
+
+buildPythonPackage rec {
+  pname = "dataclasses";
+  version = "0.5";
+
+  # backport only works on Python 3.6, and is in the standard library in Python 3.7
+  disabled = !isPy36;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07lgn1k56sqpw7yfzv5a6mwshsgaipjawflgyr6lrkryjl64481z";
+  };
+
+  meta = with stdenv.lib; {
+    description = "An implementation of PEP 557: Data Classes";
+    homepage = "https://github.com/ericvsmith/dataclasses";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93e821fb719d..2043277f2361 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1200,6 +1200,8 @@ in {
 
   datadog = callPackage ../development/python-modules/datadog {};
 
+  dataclasses = callPackage ../development/python-modules/dataclasses { };
+
   debian = callPackage ../development/python-modules/debian {};
 
   defusedxml = callPackage ../development/python-modules/defusedxml {};

From e4a6e320bb8f2adb79a3c9b83478da753de4eedb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 24 Apr 2018 00:12:19 +0200
Subject: [PATCH 0297/3370] home-assistant: simplify definition of configFile

---
 nixos/modules/services/misc/home-assistant.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index b9a972967792..1dc7b44ee37b 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -5,9 +5,10 @@ with lib;
 let
   cfg = config.services.home-assistant;
 
-  configFile = pkgs.writeText "configuration.json" (builtins.toJSON (if cfg.applyDefaultConfig
-    then (lib.recursiveUpdate defaultConfig (if (isNull cfg.config) then {} else cfg.config))
-    else cfg.config));
+  # cfg.config != null can be assumed here
+  configFile = pkgs.writeText "configuration.json"
+    (builtins.toJSON (if cfg.applyDefaultConfig then
+    (lib.recursiveUpdate defaultConfig cfg.config) else cfg.config));
 
   availableComponents = pkgs.home-assistant.availableComponents;
 

From daea65c8e21c5cf02b97ea4df00d38fd55cc7085 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 11:51:25 -0700
Subject: [PATCH 0298/3370] libre: 0.5.7 -> 0.5.8

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libre/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.5.8 with grep in /nix/store/rqyqr2gb6pxqqah435xznnqwr9zi0xi2-libre-0.5.8
- directory tree listing: https://gist.github.com/a84247052706f314827aca34a1869d10
---
 pkgs/development/libraries/libre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index ebe765a0d0d4..c996c5c25f94 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.5.7";
+  version = "0.5.8";
   name = "libre-${version}";
   src = fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "0f8h224xfzvnb2ngvhxz8gzxqjlkkfr6d0nj8zqivzr81ihibk2x";
+    sha256 = "0w0f8j43j0nzgvkmv3ayzrssppgjmsh6z8mpa5iqsz8nv99dc3qr";
   };
   buildInputs = [ zlib openssl ];
   makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" "PREFIX=$(out)" ]

From ab7aaf1b94cf2ea7c90e4c3cfb5738ff90a9094a Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 13:54:12 -0500
Subject: [PATCH 0299/3370] Revert "libretro.mame: 2017-06-04 -> 2017-03-02"

---
 pkgs/misc/emulators/retroarch/cores.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 8a3f7796aef4..d6b3b6a98706 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -232,11 +232,10 @@ in with stdenv.lib.licenses;
 
   mame = (mkLibRetroCore {
     core = "mame";
-    version = "2018-03-02";
     src = fetchRetro {
       repo = "mame";
-      rev = "893f1ac2231b348b63209fd5b2545f770458ae8f";
-      sha256 = "1j9p82q9jhf5lf4w392zd09bq0j4iw1afhznymg0v60jv592h3gz";
+      rev = "9f8a36adeb4dc54ec2ecac992ce91bcdb377519e";
+      sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1";
     };
     description = "Port of MAME to libretro";
     license = gpl2Plus;

From 78a2238c506882c44e5b891f991c074f51c0ec6f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 11:54:42 -0700
Subject: [PATCH 0300/3370] librem: 0.5.2 -> 0.5.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/librem/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.5.3 with grep in /nix/store/x20d9fh0yfyzm28p3sghxq01c3f2wrmw-librem-0.5.3
- directory tree listing: https://gist.github.com/b80b5c5f4dc93169cf0cfc46f4306e73
---
 pkgs/development/libraries/librem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix
index f6e041e57322..b173eddda7d0 100644
--- a/pkgs/development/libraries/librem/default.nix
+++ b/pkgs/development/libraries/librem/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl, libre}:
 stdenv.mkDerivation rec {
-  version = "0.5.2";
+  version = "0.5.3";
   name = "librem-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/rem-${version}.tar.gz";
-    sha256 = "1sv4986yyq42irk9alwp20gc3r5y0r6kix15sl8qmljgxn0lxigv";
+    sha256 = "0l401sn8lkzz9gvnvww6839xa0ys1q7w66krln194w6l8ycsg64z";
   };
   buildInputs = [zlib openssl libre];
   makeFlags = [

From ae0a14d25dfa8da22e20d5164c8243e32a34b44a Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 22 Apr 2018 15:22:34 -0400
Subject: [PATCH 0301/3370] git: Refactor makeFlags using lib.optionals

---
 .../git-and-tools/git/default.nix                   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index cf44cf5ef981..10b70626197e 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -56,11 +56,14 @@ stdenv.mkDerivation {
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
               + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
 
-  makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} "
-      + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1")
-      + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "")
-      + (if stdenv.isDarwin then " NO_APPLE_COMMON_CRYPTO=1" else " sysconfdir=/etc/ ")
-      + (if stdenv.hostPlatform.isMusl then "NO_SYS_POLL_H=1 NO_GETTEXT=YesPlease" else "");
+  makeFlags = [
+    "prefix=\${out}"
+    "SHELL_PATH=${stdenv.shell}"
+  ]
+  ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"])
+  ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
+  ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"])
+  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"];
 
   # build git-credential-osxkeychain if darwin
   postBuild = stdenv.lib.optionalString stdenv.isDarwin ''

From 432df5b1cf9fc6b36634ee26c621cda462dd98b2 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 10 Dec 2017 14:08:23 -0500
Subject: [PATCH 0302/3370] git: Fix USE_LIBPCRE2 configuration

Previously this was injected during install, causing the build system to rebuild
the entire package.
---
 .../version-management/git-and-tools/git/default.nix       | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 10b70626197e..23b7e24965e8 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -63,7 +63,8 @@ stdenv.mkDerivation {
   ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"])
   ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
   ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"])
-  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"];
+  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"]
+  ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1";
 
   # build git-credential-osxkeychain if darwin
   postBuild = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -76,9 +77,7 @@ stdenv.mkDerivation {
   # so that `SPARSE_FLAGS' corresponds to the current architecture...
   #doCheck = true;
 
-  installFlags = "NO_INSTALL_HARDLINKS=1"
-    + (if withpcre2 then " USE_LIBPCRE2=1" else "");
-
+  installFlags = "NO_INSTALL_HARDLINKS=1";
 
   preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/bin

From 2d397f1b76199fa877b6091e4f63e980582faeff Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 22 Apr 2018 13:58:30 -0400
Subject: [PATCH 0303/3370] git: Allow perl support to be disabled

---
 .../git-and-tools/git/default.nix             | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 23b7e24965e8..08be2a618f79 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -4,6 +4,7 @@
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
 , libxslt, tcl, tk, makeWrapper, libiconv
 , svnSupport, subversionClient, perlLibs, smtpPerlLibs
+, perlSupport ? true
 , guiSupport
 , withManual ? true
 , pythonSupport ? true
@@ -12,9 +13,12 @@
 , darwin
 }:
 
+assert sendEmailSupport -> perlSupport;
+assert svnSupport -> perlSupport;
+
 let
   version = "2.16.3";
-  svn = subversionClient.override { perlBindings = true; };
+  svn = subversionClient.override { perlBindings = perlSupport; };
 in
 
 stdenv.mkDerivation {
@@ -25,7 +29,7 @@ stdenv.mkDerivation {
     sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
   };
 
-  outputs = [ "out" "gitweb" ];
+  outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";
 
   hardeningDisable = [ "format" ];
 
@@ -44,7 +48,9 @@ stdenv.mkDerivation {
     done
   '';
 
-  buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv perl]
+  nativeBuildInputs = [ perl ];
+  buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
+    ++ stdenv.lib.optionals perlSupport [ perl ]
     ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
          docbook_xsl docbook_xml_dtd_45 libxslt ]
     ++ stdenv.lib.optionals guiSupport [tcl tk]
@@ -60,6 +66,7 @@ stdenv.mkDerivation {
     "prefix=\${out}"
     "SHELL_PATH=${stdenv.shell}"
   ]
+  ++ (if perlSupport then ["PERL_PATH=${perl}/bin/perl"] else ["NO_PERL=1"])
   ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"])
   ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="]
   ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"])
@@ -117,9 +124,10 @@ stdenv.mkDerivation {
       SCRIPT="$(cat <<'EOS'
         BEGIN{
           @a=(
-            '${perl}/bin/perl', '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
+            '${gnugrep}/bin/grep', '${gnused}/bin/sed', '${gawk}/bin/awk',
             '${coreutils}/bin/cut', '${coreutils}/bin/basename', '${coreutils}/bin/dirname',
             '${coreutils}/bin/wc', '${coreutils}/bin/tr'
+            ${stdenv.lib.optionalString perlSupport ", '${perl}/bin/perl'"}
           );
         }
         foreach $c (@a) {
@@ -135,12 +143,12 @@ stdenv.mkDerivation {
       substituteInPlace $out/libexec/git-core/git-sh-i18n \
           --subst-var-by gettext ${gettext}
 
-      # put in separate package for simpler maintenance
-      mv $out/share/gitweb $gitweb/
-
       # Also put git-http-backend into $PATH, so that we can use smart
       # HTTP(s) transports for pushing
       ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend
+    '' + stdenv.lib.optionalString perlSupport ''
+      # put in separate package for simpler maintenance
+      mv $out/share/gitweb $gitweb/
 
       # wrap perl commands
       gitperllib=$out/lib/perl5/site_perl
@@ -186,7 +194,7 @@ stdenv.mkDerivation {
        '')
 
    + stdenv.lib.optionalString withManual ''# Install man pages and Info manual
-       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${perl}/bin/perl" cmd-list.made install install-info \
+       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cmd-list.made install install-info \
          -C Documentation ''
 
    + (if guiSupport then ''

From d111a42772bc4c878a2ba3106cf573d5bcf0c9fe Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 10 Dec 2017 13:52:34 -0500
Subject: [PATCH 0304/3370] git: Enable cross-compilation

---
 .../git-and-tools/git/default.nix                   | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 08be2a618f79..4e9f2bf16cea 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -48,11 +48,11 @@ stdenv.mkDerivation {
     done
   '';
 
-  nativeBuildInputs = [ perl ];
-  buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
-    ++ stdenv.lib.optionals perlSupport [ perl ]
+  nativeBuildInputs = [ gettext perl ]
     ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x
-         docbook_xsl docbook_xml_dtd_45 libxslt ]
+         docbook_xsl docbook_xml_dtd_45 libxslt ];
+  buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv]
+    ++ stdenv.lib.optionals perlSupport [ perl ]
     ++ stdenv.lib.optionals guiSupport [tcl tk]
     ++ stdenv.lib.optionals withpcre2 [ pcre2 ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
@@ -62,6 +62,11 @@ stdenv.mkDerivation {
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
               + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
 
+  configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "ac_cv_fread_reads_directories=yes"
+    "ac_cv_snprintf_returns_bogus=no"
+  ];
+
   makeFlags = [
     "prefix=\${out}"
     "SHELL_PATH=${stdenv.shell}"

From 768f1d968c002ada292704e729a9b867496cee6e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 24 Apr 2018 11:59:32 -0700
Subject: [PATCH 0305/3370] latte-dock: 0.7.4 -> 0.7.5 (#39418)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/latte-dock/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/6nvkkskm7j4ngqfy722ajp289gqhg1a9-latte-dock-0.7.5/bin/latte-dock -h’ got 0 exit code
- ran ‘/nix/store/6nvkkskm7j4ngqfy722ajp289gqhg1a9-latte-dock-0.7.5/bin/latte-dock --help’ got 0 exit code
- found 0.7.5 with grep in /nix/store/6nvkkskm7j4ngqfy722ajp289gqhg1a9-latte-dock-0.7.5
- directory tree listing: https://gist.github.com/8f58b4f85d4c80752b6d66e912ce92c0
---
 pkgs/applications/misc/latte-dock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index 1867ec3a9c62..eafe0b9b5c64 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,7 +1,7 @@
 { mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub
 , extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }:
 
-let version = "0.7.4"; in
+let version = "0.7.5"; in
 
 mkDerivation {
   name = "latte-dock-${version}";
@@ -10,7 +10,7 @@ mkDerivation {
     owner = "psifidotos";
     repo = "Latte-Dock";
     rev = "v${version}";
-    sha256 = "0w4fphgpdvql31wrypxyfahmr4cv5ap96wjc4270yyawnrqrx0y6";
+    sha256 = "0fblbx6qk4miag1mhiyns7idsw03p9pj3xc3xxxnb5rpj1fy0ifv";
   };
 
   buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ];

From 81c1b9c9fc55d86ee3a7178c30e9744a15bd6da5 Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Tue, 24 Apr 2018 21:05:03 +0200
Subject: [PATCH 0306/3370] googleearth: remove

it's broken, and even after adjusting the derivation to the currently
available downloads it does not run well for me and it is rather
annoying to adjust the derivation to the moving
google-earth-stable_current source download link
---
 .../applications/misc/googleearth/default.nix | 79 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 81 deletions(-)
 delete mode 100644 pkgs/applications/misc/googleearth/default.nix

diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
deleted file mode 100644
index f8ba66c4197c..000000000000
--- a/pkgs/applications/misc/googleearth/default.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
-, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
-, zlib, fontconfig, dpkg }:
-
-let
-  arch =
-    if stdenv.system == "x86_64-linux" then "amd64"
-    else if stdenv.system == "i686-linux" then "i386"
-    else throw "Unsupported system ${stdenv.system}";
-  sha256 =
-    if arch == "amd64"
-    then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
-    else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2";
-  fullPath = stdenv.lib.makeLibraryPath [
-    glibc
-    glib
-    stdenv.cc.cc
-    libSM
-    libICE
-    libXi
-    libXv
-    libGLU_combined
-    libXrender
-    libXrandr
-    libXfixes
-    libXcursor
-    libXinerama
-    freetype
-    libXext
-    libX11
-    qt4
-    zlib
-    fontconfig
-  ];
-in
-stdenv.mkDerivation rec {
-  version = "7.1.4.1529";
-  name = "googleearth-${version}";
-
-  src = fetchurl {
-    url = "https://dl.google.com/earth/client/current/google-earth-stable_current_${arch}.deb";
-    inherit sha256;
-  };
-
-  phases = "unpackPhase installPhase";
-
-  buildInputs = [ dpkg ];
-
-  unpackPhase = ''
-    dpkg-deb -x ${src} ./
-  '';
-
-  installPhase =''
-    mkdir $out
-    mv usr/* $out/
-    rmdir usr
-    mv * $out/
-    rm $out/bin/google-earth $out/opt/google/earth/free/google-earth
-    ln -s $out/opt/google/earth/free/googleearth $out/bin/google-earth
-
-    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${fullPath}:\$ORIGIN" \
-      $out/opt/google/earth/free/googleearth-bin
-
-    for a in $out/opt/google/earth/free/*.so* ; do
-      patchelf --set-rpath "${fullPath}:\$ORIGIN" $a
-    done
-  '';
-
-  dontPatchELF = true;
-
-  meta = {
-    description = "A world sphere viewer";
-    homepage = http://earth.google.com;
-    license = stdenv.lib.licenses.unfree;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a4ebec0480a..90df35e128ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16071,8 +16071,6 @@ with pkgs;
 
   google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; };
 
-  googleearth = callPackage_i686 ../applications/misc/googleearth { };
-
   google-play-music-desktop-player = callPackage ../applications/audio/google-play-music-desktop-player {
     inherit (gnome2) GConf;
   };

From e05099fdde718fef86bb7991fa89c69815b7362f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 12:14:08 -0700
Subject: [PATCH 0307/3370] libfm-extra: 1.2.5 -> 1.3.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libfm-extra/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.0 with grep in /nix/store/jfppsgl453gipb6vx66y4pcssxd7fq54-libfm-extra-1.3.0
- directory tree listing: https://gist.github.com/74991e480da532d6ef49f6fb5727d564
---
 pkgs/development/libraries/libfm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 851ee7f326b6..01bfe1653fe6 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
   name = if extraOnly
     then "libfm-extra-${version}"
     else "libfm-${version}";
-  version = "1.2.5";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
-    sha256 = "0nlvfwh09gbq8bkbvwnw6iqr918rrs9gc9ljb9pjspyg408bn1n7";
+    sha256 = "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 0dc26d0e7edfd6849643147b8e6c2d21ea7f5d5d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 19 Apr 2018 21:51:40 -0500
Subject: [PATCH 0308/3370] cvs: support ssh access

hacky wrapper handles ssh issues in nix builders
---
 pkgs/build-support/fetchcvs/builder.sh  | 6 ++++++
 pkgs/build-support/fetchcvs/default.nix | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh
index 6ee594b33b27..47ae909f3aba 100644
--- a/pkgs/build-support/fetchcvs/builder.sh
+++ b/pkgs/build-support/fetchcvs/builder.sh
@@ -1,5 +1,11 @@
 source $stdenv/setup
 
+(echo '#!/usr/bin/env sh'; \
+ echo 'echo $@'; \
+ echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh
+chmod +x ssh
+export CVS_RSH=$PWD/ssh
+
 # creating the export drictory and checking out there only to be able to
 # move the content without the root directory into $out ...
 # cvs -f -d "$url" export $tag -d "$out" "$module"
diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix
index 9d9deb3f629e..1f7947d4d452 100644
--- a/pkgs/build-support/fetchcvs/default.nix
+++ b/pkgs/build-support/fetchcvs/default.nix
@@ -3,18 +3,18 @@
 # tag="<tagname>" (get version by tag name)
 # If you don't specify neither one date="NOW" will be used (get latest)
 
-{stdenvNoCC, cvs}:
+{stdenvNoCC, cvs, openssh}:
 
 {cvsRoot, module, tag ? null, date ? null, sha256}:
 
 stdenvNoCC.mkDerivation {
   name = "cvs-export";
   builder = ./builder.sh;
-  nativeBuildInputs = [cvs];
+  nativeBuildInputs = [cvs openssh];
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = sha256;
-  
+
   inherit cvsRoot module sha256 tag date;
 }

From 31ef995e37ad4291afdaebb2c6480280fd058858 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 12 Apr 2018 00:14:15 -0500
Subject: [PATCH 0309/3370] bsd: init netbsd & openbsd userland

Adds a couple of useful NetBSD and OpenBSD derivations. Some of these
will be integrated into Nixpkgs later.

Noncomprehensive list:

- netbsd.getent
- netbsd.getconf
- netbsd.fts
- openbsd.mg
- netbsd.compat (can replace libbsd)
---
 pkgs/build-support/fetchcvs/builder.sh        |   1 -
 pkgs/os-specific/bsd/default.nix              |   8 +
 .../bsd/netbsd/compat-setup-hook.sh           |  18 +
 pkgs/os-specific/bsd/netbsd/default.nix       | 404 ++++++++++++++++
 pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh |  16 +
 pkgs/os-specific/bsd/netbsd/getent.patch      | 455 ++++++++++++++++++
 pkgs/os-specific/bsd/openbsd/default.nix      |  42 ++
 pkgs/os-specific/bsd/openbsd/nc.patch         | 421 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |   3 +
 9 files changed, 1367 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/bsd/default.nix
 create mode 100644 pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
 create mode 100644 pkgs/os-specific/bsd/netbsd/default.nix
 create mode 100644 pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
 create mode 100644 pkgs/os-specific/bsd/netbsd/getent.patch
 create mode 100644 pkgs/os-specific/bsd/openbsd/default.nix
 create mode 100644 pkgs/os-specific/bsd/openbsd/nc.patch

diff --git a/pkgs/build-support/fetchcvs/builder.sh b/pkgs/build-support/fetchcvs/builder.sh
index 47ae909f3aba..0975c3478820 100644
--- a/pkgs/build-support/fetchcvs/builder.sh
+++ b/pkgs/build-support/fetchcvs/builder.sh
@@ -1,7 +1,6 @@
 source $stdenv/setup
 
 (echo '#!/usr/bin/env sh'; \
- echo 'echo $@'; \
  echo 'ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no "$@"') > ssh
 chmod +x ssh
 export CVS_RSH=$PWD/ssh
diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix
new file mode 100644
index 000000000000..a8301ea2a8fc
--- /dev/null
+++ b/pkgs/os-specific/bsd/default.nix
@@ -0,0 +1,8 @@
+{ callPackages, recurseIntoAttrs }:
+
+rec {
+  netbsd = recurseIntoAttrs (callPackages ./netbsd {});
+  openbsd = recurseIntoAttrs (callPackages ./openbsd {
+    inherit (netbsd) compat netBSDDerivation libcurses;
+  });
+}
diff --git a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
new file mode 100644
index 000000000000..d47d602e2edb
--- /dev/null
+++ b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
@@ -0,0 +1,18 @@
+setupCompatFlags() {
+    # The `depHostOffset` describes how the host platform of the dependencies
+    # are slid relative to the depending package. It is brought into scope of
+    # the environment hook defined as the role of the dependency being applied.
+    case $depHostOffset in
+        -1) local role='BUILD_' ;;
+        0)  local role='' ;;
+        1)  local role='TARGET_' ;;
+        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
+            return 1 ;;
+    esac
+
+    export NIX_${role}LDFLAGS+=" -lnbcompat"
+    export NIX_${role}CFLAGS_COMPILE+=" -DHAVE_NBTOOL_CONFIG_H"
+    export NIX_${role}CFLAGS_COMPILE+=" -include nbtool_config.h"
+}
+
+addEnvHooks "$hostOffset" setupCompatFlags
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
new file mode 100644
index 000000000000..8cbc765ec9e6
--- /dev/null
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -0,0 +1,404 @@
+{ stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils
+, yacc, flex, libressl, bash }:
+
+let
+  fetchNetBSD = path: version: sha256: fetchcvs {
+    cvsRoot = ":pserver:anoncvs@anoncvs.NetBSD.org:/cvsroot";
+    module = "src/${path}";
+    inherit sha256;
+    tag = "netbsd-${builtins.replaceStrings ["."] ["-"] version}-RELEASE";
+  };
+
+  netBSDDerivation = attrs: stdenv.mkDerivation ((rec {
+    name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}";
+    src = fetchNetBSD attrs.path attrs.version attrs.sha256;
+
+    extraPaths = [ ];
+
+    nativeBuildInputs = [ makeMinimal mandoc groff install yacc flex ];
+    buildInputs = [ compat ];
+    installFlags = [ "includes" ];
+
+    # These should be coverd in nbcompat, but are missing, sadly
+    NIX_CFLAGS_COMPILE = [
+      "-D__noinline="
+      "-D__warn_references(a,b)="
+      "-D__strong_alias(a,b)="
+      "-D__va_list=va_list"
+    ];
+
+    # Definitions passed to share/mk/*.mk. Should be pretty simple -
+    # eventually maybe move it to a configure script.
+    DESTDIR = "$(out)";
+    TOOLDIR = "$(out)";
+    USETOOLS = "never";
+    NOCLANGERROR="yes";
+    NOGCCERROR="yes";
+    LEX = "flex";
+
+    # libs will be provided by cc-wrapper
+    LIBCRT0="";
+    LIBCRTI="";
+    LIBCRTEND="";
+    LIBCRTBEGIN="";
+    LIBC="";
+    LIBUTIL="";
+    LIBSSL = "";
+    LIBCRYPTO = "";
+    LIBCURSES = "";
+    "LIBDO.terminfo" = "_external";
+    _GCC_CRTBEGIN = "";
+    _GCC_CRTBEGINS = "";
+    _GCC_CRTEND = "";
+    _GCC_CRTENDS = "";
+    _GCC_LIBGCCDIR = "";
+    _GCC_CRTI = "";
+    _GCC_CRTDIR = "";
+    _GCC_CRTN = "";
+
+    # all dirs will be prefixed with DESTDIR
+    BINDIR = "/bin";
+    LIBDIR = "/lib";
+    SHLIBDIR = "/lib";
+    MANDIR = "/share/man";
+    INFODIR = "/share/info";
+    DOCDIR = "/share/doc";
+    LOCALEDIR = "/share/locale";
+    X11BINDIR = "/bin";
+    X11USRLIBDIR = "/lib";
+    X11MANDIR = "/share/man";
+    SHLINKDIR = "/usr/libexec";
+
+    HOST_SH = "${bash}/bin/sh";
+
+    # not using bsd binutils
+    SHLIB_WARNTEXTREL = "no";
+    SHLIB_MKMAP = "no";
+    OBJCOPY = "true";
+    PRESERVE = "-p";
+
+    MACHINE_ARCH = hostPlatform.parsed.cpu.name;
+    MACHINE_CPU = hostPlatform.parsed.cpu.name;
+
+    # NetBSD makefiles should be able to detect this
+    # but without they end up using gcc on Darwin stdenv
+    preConfigure = ''
+      export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))}
+    '' + lib.optionalString (!builtins.hasAttr "nativeBuildInputs" attrs) ''
+      # hack until #38657 is fixed
+      export PATH=${install}/bin:$PATH
+    '';
+
+    postUnpack = ''
+      # merge together all extra paths
+      # there should be a better way to do this
+      sourceRoot=$PWD/$sourceRoot
+      export NETBSDSRCDIR=$sourceRoot
+      export BSDSRCDIR=$NETBSDSRCDIR
+      chmod -R u+w $sourceRoot
+      for path in $extraPaths; do
+        cd $path
+        find . -type d -exec mkdir -p $sourceRoot/\{} \;
+        find . -type f -exec cp -pr \{} $sourceRoot/\{} \;
+        chmod -R u+w $sourceRoot
+      done
+
+      cd $sourceRoot
+      if [ -d ${attrs.path} ]
+        then sourceRoot=$sourceRoot/${attrs.path}
+      fi
+    '';
+
+    # need to create directories for xinstall to work
+    preInstall = ''
+      mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \
+               $out$DOCDIR $out$LOCALEDIR
+      for i in 1 2 3 4 5 6 7 8 9; do
+        mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i
+      done
+      mkdir -p $out/usr/include
+    '';
+
+    postInstall = ''
+      # Remove lingering /usr references
+      if [ -d $out/usr ]; then
+        cd $out/usr
+        find . -type d -exec mkdir -p $out/\{} \;
+        find . -type f -exec mv \{} $out/\{} \;
+        find . -type d -delete
+      fi
+
+      find $out -type d -empty -delete
+    '';
+
+    meta = with lib; {
+      maintainers = with maintainers; [matthewbauer];
+      platforms = platforms.unix;
+      license = licenses.bsd2;
+    };
+  }) // attrs);
+
+  # BOOTSTRAPPING
+  makeMinimal = netBSDDerivation rec {
+    path = "tools/make";
+    sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb";
+    version = "7.1.2";
+
+    buildInputs = [];
+    nativeBuildInputs = [];
+    NIX_CFLAGS_COMPILE = "";
+    NIX_LDFLAGS = "";
+
+    patchPhase = ''
+      patchShebangs configure
+      ${make.patchPhase}
+    '';
+    buildPhase = "sh ./buildmake.sh";
+    installPhase = ''
+      install -D nbmake $out/bin/nbmake
+      ln -s $out/bin/nbmake $out/bin/make
+      mkdir -p $out/share
+      cp -r ../../share/mk $out/share/mk
+    '';
+    extraPaths = [ make.src ] ++ make.extraPaths;
+  };
+
+  compat = netBSDDerivation {
+    path = "tools/compat";
+    sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z";
+    version = "7.1.2";
+
+    setupHook = ./compat-setup-hook.sh;
+
+    # override defaults to prevent infinite recursion
+    nativeBuildInputs = [ makeMinimal ];
+    buildInputs = [ zlib ];
+    NIX_CFLAGS_COMPILE = "";
+    NIX_LDFLAGS = "";
+
+    # temporarily use gnuinstall for bootstrapping
+    # bsdinstall will be built later
+    makeFlags = "INSTALL=${coreutils}/bin/install";
+    RENAME = "-D";
+
+    postInstall = ''
+      mv $out/include/compat/* $out/include
+      rmdir $out/include/compat
+
+      # why aren't these installed by netbsd?
+      install -D compat_defs.h $out/include/compat_defs.h
+      install -D $NETBSDSRCDIR/include/cdbw.h $out/include/cdbw.h
+      install -D $NETBSDSRCDIR/sys/sys/cdbr.h $out/include/cdbr.h
+      install -D $NETBSDSRCDIR/sys/sys/featuretest.h \
+                 $out/include/sys/featuretest.h
+      install -D $NETBSDSRCDIR/sys/sys/md5.h $out/include/md5.h
+      install -D $NETBSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h
+      install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h
+      install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h
+    '';
+    extraPaths = [ libc.src libutil.src
+      (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp")
+      (fetchNetBSD "external/bsd/flex" "7.1.2" "0m0m72r3zzc9gi432h3xkqdzspr4n0hj4m8h7j74pwbvpfg9d9qq")
+      (fetchNetBSD "sys/sys" "7.1.2" "1vwnv5nk7rlgn5w9nkdqj9652hmwmfwqxj3ymcz0zk10abbaib93")
+    ] ++ libutil.extraPaths ++ libc.extraPaths;
+  };
+
+  install = netBSDDerivation {
+    path = "usr.bin/xinstall";
+    version = "7.1.2";
+    sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8";
+    extraPaths = [ mtree.src make.src ];
+    nativeBuildInputs = [ makeMinimal mandoc groff compat ];
+    RENAME = "-D";
+  };
+  # END BOOTSTRAPPING
+
+  libutil = netBSDDerivation {
+    path = "lib/libutil";
+    version = "7.1.2";
+    sha256 = "12848ynizz13mvn2kndrkq482xhkw323b7c8fg0zli1nhfsmwsm8";
+    extraPaths = [
+      (fetchNetBSD "common/lib/libutil" "7.1.2" "0q3ixrf36lip1dx0gafs0a03qfs5cs7n0myqq7af4jpjd6kh1831")
+    ];
+  };
+
+  libc = netBSDDerivation {
+    path = "lib/libc";
+    version = "7.1.2";
+    sha256 = "13rcx3mbx2644z01zgk9gggdfr0hqdbsvd7zrsm2l13yf9aix6pg";
+    extraPaths = [
+      (fetchNetBSD "common/lib/libc" "7.1.2" "1va8zd4lqyrc1d0c9q04r8y88cfxpkhwcxasggxxvhksd3khkpha")
+    ];
+  };
+
+  make = netBSDDerivation {
+    path = "usr.bin/make";
+    sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar";
+    version = "7.1.2";
+    patchPhase = ''
+      # make needs this to pick up our sys make files
+      NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
+
+      # can't set owner or group in Nix build
+      # maybe there is a better way to trick it?
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \
+        --replace '-o ''${SCRIPTSOWN_''${.ALLSRC:T}:U''${SCRIPTSOWN}}' "" \
+        --replace '-g ''${SCRIPTSGRP_''${.ALLSRC:T}:U''${SCRIPTSGRP}}' "" \
+        --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \
+        --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \
+        --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \
+        --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \
+        --replace '-o ''${DOCOWN} -g ''${DOCGRP}' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \
+        --replace '-o ''${MANOWN} -g ''${MANGRP}' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \
+        --replace '-o ''${FILESOWN_''${.ALLSRC:T}:U''${FILESOWN}}' "" \
+        --replace '-g ''${FILESGRP_''${.ALLSRC:T}:U''${FILESGRP}}' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.inc.mk \
+        --replace '-o ''${BINOWN} -g ''${BINGRP}' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
+        --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \
+        --replace '-o ''${LIBOWN} -g ''${LIBGRP}' ""
+
+      substituteInPlace $NETBSDSRCDIR/share/mk/Makefile \
+        --replace /usr/share/mk /share/mk
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \
+        --replace '-Wl,--fatal-warnings' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
+        --replace ' ''${_ARFL} ''${.TARGET} `NM=''${NM} ''${LORDER} ''${.ALLSRC:M*o} | ''${TSORT}`' ' ''${_ARFL} ''${.TARGET} ''${.ALLSRC:M*o}' \
+        --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \
+        --replace '-Wl,--whole-archive' "" \
+        --replace '-Wl,--no-whole-archive' ""
+    '';
+    postInstall = ''
+      (cd $NETBSDSRCDIR/share/mk && make install)
+    '';
+    extraPaths = [
+      (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa")
+    ];
+  };
+
+  mtree = netBSDDerivation {
+    path = "usr.sbin/mtree";
+    version = "7.1.2";
+    sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m";
+  };
+
+in rec {
+  inherit compat libc libutil install make mtree netBSDDerivation;
+
+  getent = netBSDDerivation {
+    path = "usr.bin/getent";
+    sha256 = "1ylhw4dnpyrmcy8n5kjcxywm8qc9p124dqnm17x4magiqx1kh9iz";
+    version = "7.1.2";
+    patches = [ ./getent.patch ];
+  };
+
+  getconf = netBSDDerivation {
+    path = "usr.bin/getconf";
+    sha256 = "122vslz4j3h2mfs921nr2s6m078zcj697yrb75rwp2hnw3qz4s8q";
+    version = "7.1.2";
+  };
+
+  fts = netBSDDerivation {
+    pname = "fts";
+    path = "include/fts.h";
+    sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77";
+    version = "7.1.2";
+    nativeBuildInputs = [ ];
+    extraPaths = [
+      (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9")
+      (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y")
+      (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1")
+    ];
+    buildPhase = ''
+      cc  -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
+          -o lib/libc/gen/fts.o
+      ar -rsc libfts.a lib/libc/gen/fts.o
+    '';
+    installPhase = ''
+      install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3
+      install -D include/fts.h $out/include/fts.h
+      install -D lib/libc/include/namespace.h $out/include/namespace.h
+      install -D libfts.a $out/lib/libfts.a
+    '';
+    setupHook = ./fts-setup-hook.sh;
+  };
+
+  games = netBSDDerivation {
+    path = "games";
+    sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1";
+    version = "7.1.2";
+    patchPhase = ''
+      sed -i '1i #include <time.h>' adventure/save.c
+    '';
+  };
+
+  who = netBSDDerivation {
+    path = "usr.bin/who";
+    version = "7.1.2";
+    sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88";
+  };
+
+  finger = netBSDDerivation {
+    path = "usr.bin/finger";
+    sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi";
+    version = "7.1.2";
+    extraPaths = [ who.src ];
+  };
+
+  fingerd = netBSDDerivation {
+    path = "usr.bin/fingerd";
+    sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqz00";
+    version = "7.1.2";
+  };
+
+  libedit = netBSDDerivation {
+    path = "lib/libedit";
+    buildInputs = [ compat libterminfo ];
+    patchPhase = ''
+      sed -i '1i #undef bool_t' el.h
+    '';
+    version = "7.1.2";
+    sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca";
+  };
+
+  libterminfo = netBSDDerivation {
+    path = "lib/libterminfo";
+    version = "7.1.2";
+    sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq";
+    buildInputs = [ compat tic nbperf ];
+    extraPaths = [
+      (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3")
+    ];
+  };
+
+  libcurses = netBSDDerivation {
+    path = "lib/libcurses";
+    version = "7.1.2";
+    sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf";
+    buildInputs = [ compat libterminfo ];
+    MKDOC = "no"; # missing vfontedpr
+  };
+
+  nbperf = netBSDDerivation {
+    path = "usr.bin/nbperf";
+    version = "7.1.2";
+    sha256 = "0gzm0zv2400lasnsswnjw9bwzyizhxzdbrcjwcl1k65aj86aqyqb";
+  };
+
+  tic = netBSDDerivation {
+    path = "tools/tic";
+    version = "7.1.2";
+    sha256 = "092y7db7k4kh2jq8qc55126r5qqvlb8lq8mhmy5ipbi36hwb4zrz";
+    HOSTPROG = "tic";
+    buildInputs = [ compat nbperf ];
+    extraPaths = [
+      libterminfo.src
+      (fetchNetBSD "usr.bin/tic" "7.1.2" "1ghwsaag4gbwvgp3lfxscnh8hn27n8cscwmgjwp3bkx5vl85nfsa")
+      (fetchNetBSD "tools/Makefile.host" "7.1.2" "076r3amivb6xranpvqjmg7x5ibj4cbxaa3z2w1fh47h7d55dw9w8")
+    ];
+  };
+
+}
diff --git a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
new file mode 100644
index 000000000000..6b7064174931
--- /dev/null
+++ b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
@@ -0,0 +1,16 @@
+ftsLdflags() {
+    # The `depHostOffset` describes how the host platform of the dependencies
+    # are slid relative to the depending package. It is brought into scope of
+    # the environment hook defined as the role of the dependency being applied.
+    case $depHostOffset in
+        -1) local role='BUILD_' ;;
+        0)  local role='' ;;
+        1)  local role='TARGET_' ;;
+        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
+            return 1 ;;
+    esac
+
+    export NIX_${role}LDFLAGS+=" -lfts"
+}
+
+addEnvHooks "$hostOffset" ftsLdflags
diff --git a/pkgs/os-specific/bsd/netbsd/getent.patch b/pkgs/os-specific/bsd/netbsd/getent.patch
new file mode 100644
index 000000000000..e9e34d19a315
--- /dev/null
+++ b/pkgs/os-specific/bsd/netbsd/getent.patch
@@ -0,0 +1,455 @@
+Author: Matthew Bauer
+Description: Remove unavailable getent databases
+Version: 7.1.2
+--- a/getent.c	2018-04-16 13:33:49.000000000 -0500
++++ b/getent.c	2018-04-16 13:29:30.000000000 -0500
+@@ -42,7 +42,6 @@
+ #include <grp.h>
+ #include <limits.h>
+ #include <netdb.h>
+-#include <netgroup.h>
+ #include <pwd.h>
+ #include <stdio.h>
+ #include <stdarg.h>
+@@ -57,27 +56,16 @@
+ #include <arpa/nameser.h>
+ 
+ #include <net/if.h>
+-#include <net/if_ether.h>
+ 
+ #include <netinet/in.h>		/* for INET6_ADDRSTRLEN */
+ 
+-#include <rpc/rpcent.h>
+-
+-#include <disktab.h>
+-
+ static int	usage(void) __attribute__((__noreturn__));
+ static int	parsenum(const char *, unsigned long *);
+-static int	disktab(int, char *[]);
+-static int	gettytab(int, char *[]);
+-static int	ethers(int, char *[]);
+ static int	group(int, char *[]);
+ static int	hosts(int, char *[]);
+-static int	netgroup(int, char *[]);
+ static int	networks(int, char *[]);
+ static int	passwd(int, char *[]);
+-static int	printcap(int, char *[]);
+ static int	protocols(int, char *[]);
+-static int	rpc(int, char *[]);
+ static int	services(int, char *[]);
+ static int	shells(int, char *[]);
+ 
+@@ -92,17 +80,11 @@
+ 	const char	*name;
+ 	int		(*callback)(int, char *[]);
+ } databases[] = {
+-	{	"disktab",	disktab,	},
+-	{	"ethers",	ethers,		},
+-	{	"gettytab",	gettytab,	},
+ 	{	"group",	group,		},
+ 	{	"hosts",	hosts,		},
+-	{	"netgroup",	netgroup,	},
+ 	{	"networks",	networks,	},
+ 	{	"passwd",	passwd,		},
+-	{	"printcap",	printcap,	},
+ 	{	"protocols",	protocols,	},
+-	{	"rpc",		rpc,		},
+ 	{	"services",	services,	},
+ 	{	"shells",	shells,		},
+ 
+@@ -195,49 +177,6 @@
+ 	(void)printf("\n");
+ }
+ 
+-
+-		/*
+-		 * ethers
+-		 */
+-
+-static int
+-ethers(int argc, char *argv[])
+-{
+-	char		hostname[MAXHOSTNAMELEN + 1], *hp;
+-	struct ether_addr ea, *eap;
+-	int		i, rv;
+-
+-	assert(argc > 1);
+-	assert(argv != NULL);
+-
+-#define ETHERSPRINT	(void)printf("%-17s  %s\n", ether_ntoa(eap), hp)
+-
+-	rv = RV_OK;
+-	if (argc == 2) {
+-		warnx("Enumeration not supported on ethers");
+-		rv = RV_NOENUM;
+-	} else {
+-		for (i = 2; i < argc; i++) {
+-			if ((eap = ether_aton(argv[i])) == NULL) {
+-				eap = &ea;
+-				hp = argv[i];
+-				if (ether_hostton(hp, eap) != 0) {
+-					rv = RV_NOTFOUND;
+-					break;
+-				}
+-			} else {
+-				hp = hostname;
+-				if (ether_ntohost(hp, eap) != 0) {
+-					rv = RV_NOTFOUND;
+-					break;
+-				}
+-			}
+-			ETHERSPRINT;
+-		}
+-	}
+-	return rv;
+-}
+-
+ 		/*
+ 		 * group
+ 		 */
+@@ -298,7 +237,7 @@
+ hosts(int argc, char *argv[])
+ {
+ 	struct hostent	*he;
+-	char		addr[IN6ADDRSZ];
++	char		addr[NS_IN6ADDRSZ];
+ 	int		i, rv;
+ 
+ 	assert(argc > 1);
+@@ -312,9 +251,9 @@
+ 	} else {
+ 		for (i = 2; i < argc; i++) {
+ 			if (inet_pton(AF_INET6, argv[i], (void *)addr) > 0)
+-				he = gethostbyaddr(addr, IN6ADDRSZ, AF_INET6);
++				he = gethostbyaddr(addr, NS_IN6ADDRSZ, AF_INET6);
+ 			else if (inet_pton(AF_INET, argv[i], (void *)addr) > 0)
+-				he = gethostbyaddr(addr, INADDRSZ, AF_INET);
++				he = gethostbyaddr(addr, NS_INADDRSZ, AF_INET);
+ 			else
+ 				he = gethostbyname(argv[i]);
+ 			if (he != NULL)
+@@ -330,48 +269,6 @@
+ }
+ 
+ 		/*
+-		 * netgroup
+-		 */
+-static int
+-netgroup(int argc, char *argv[])
+-{
+-	int		rv, i;
+-	bool		first;
+-	const char	*host, *user, *domain;
+-
+-	assert(argc > 1);
+-	assert(argv != NULL);
+-
+-#define NETGROUPPRINT(s)	(((s) != NULL) ? (s) : "")
+-
+-	rv = RV_OK;
+-	if (argc == 2) {
+-		warnx("Enumeration not supported on netgroup");
+-		rv = RV_NOENUM;
+-	} else {
+-		for (i = 2; i < argc; i++) {
+-			setnetgrent(argv[i]);
+-			first = true;
+-			while (getnetgrent(&host, &user, &domain) != 0) {
+-				if (first) {
+-					first = false;
+-					(void)fputs(argv[i], stdout);
+-				}
+-				(void)printf(" (%s,%s,%s)",
+-				    NETGROUPPRINT(host),
+-				    NETGROUPPRINT(user),
+-				    NETGROUPPRINT(domain));
+-			}
+-			if (!first)
+-				(void)putchar('\n');
+-			endnetgrent();
+-		}
+-	}
+-
+-	return rv;
+-}
+-
+-		/*
+ 		 * networks
+ 		 */
+ 
+@@ -464,227 +361,6 @@
+ 	return rv;
+ }
+ 
+-static char *
+-mygetent(const char * const * db_array, const char *name)
+-{
+-	char *buf = NULL;
+-	int error;
+-
+-	switch (error = cgetent(&buf, db_array, name)) {
+-	case -3:
+-		warnx("tc= loop in record `%s' in `%s'", name, db_array[0]);
+-		break;
+-	case -2:
+-		warn("system error fetching record `%s' in `%s'", name,
+-		    db_array[0]);
+-		break;
+-	case -1:
+-	case 0:
+-		break;
+-	case 1:
+-		warnx("tc= reference not found in record for `%s' in `%s'",
+-		    name, db_array[0]);
+-		break;
+-	default:
+-		warnx("unknown error %d in record `%s' in `%s'", error, name,
+-		    db_array[0]);
+-		break;
+-	}
+-	return buf;
+-}
+-
+-static char *
+-mygetone(const char * const * db_array, int first)
+-{
+-	char *buf = NULL;
+-	int error;
+-
+-	switch (error = (first ? cgetfirst : cgetnext)(&buf, db_array)) {
+-	case -2:
+-		warnx("tc= loop in `%s'", db_array[0]);
+-		break;
+-	case -1:
+-		warn("system error fetching record in `%s'", db_array[0]);
+-		break;
+-	case 0:
+-	case 1:
+-		break;
+-	case 2:
+-		warnx("tc= reference not found in `%s'", db_array[0]);
+-		break;
+-	default:
+-		warnx("unknown error %d in `%s'", error, db_array[0]);
+-		break;
+-	}
+-	return buf;
+-}
+-
+-static void
+-capprint(const char *cap)
+-{
+-	char *c = strchr(cap, ':');
+-	if (c)
+-		if (c == cap)
+-			(void)printf("true\n");
+-		else {
+-			int l = (int)(c - cap);
+-			(void)printf("%*.*s\n", l, l, cap);
+-		}
+-	else
+-		(void)printf("%s\n", cap);
+-}
+-
+-static void
+-prettyprint(char *b)
+-{
+-#define TERMWIDTH 65
+-	int did = 0;
+-	size_t len;
+-	char *s, c;
+-
+-	for (;;) {
+-		len = strlen(b);
+-		if (len <= TERMWIDTH) {
+-done:
+-			if (did)
+-				printf("\t:");
+-			printf("%s\n", b);
+-			return;
+-		}
+-		for (s = b + TERMWIDTH; s > b && *s != ':'; s--)
+-			continue;
+-		if (*s++ != ':')
+-			goto done;
+-		c = *s;
+-		*s = '\0';
+-		if (did)
+-			printf("\t:");
+-		did++;
+-		printf("%s\\\n", b);
+-		*s = c;
+-		b = s;
+-	}
+-}
+-
+-static void
+-handleone(const char * const *db_array, char *b, int recurse, int pretty,
+-    int level)
+-{
+-	char *tc;
+-
+-	if (level && pretty)
+-		printf("\n");
+-	if (pretty)
+-		prettyprint(b);
+-	else
+-		printf("%s\n", b);
+-	if (!recurse || cgetstr(b, "tc", &tc) <= 0)
+-		return;
+-
+-	b = mygetent(db_array, tc);
+-	free(tc);
+-
+-	if (b == NULL)
+-		return;
+-
+-	handleone(db_array, b, recurse, pretty, ++level);
+-	free(b);
+-}
+-
+-static int
+-handlecap(const char *db, int argc, char *argv[])
+-{
+-	static const char sfx[] = "=#:";
+-	const char *db_array[] = { db, NULL };
+-	char	*b, *cap;
+-	int	i, rv, c;
+-	size_t	j;
+-	int	expand = 1, recurse = 0, pretty = 0;
+-
+-	assert(argc > 1);
+-	assert(argv != NULL);
+-
+-	argc--;
+-	argv++;
+-	while ((c = getopt(argc, argv, "pnr")) != -1)
+-		switch (c) {
+-		case 'n':
+-			expand = 0;
+-			break;
+-		case 'r':
+-			expand = 0;
+-			recurse = 1;
+-			break;
+-		case 'p':
+-			pretty = 1;
+-			break;
+-		default:
+-			usage();
+-			break;
+-		}
+-
+-	argc -= optind;
+-	argv += optind;
+-	csetexpandtc(expand);
+-	rv = RV_OK;
+-	if (argc == 0) {
+-		for (b = mygetone(db_array, 1); b; b = mygetone(db_array, 0)) {
+-			handleone(db_array, b, recurse, pretty, 0);
+-			free(b);
+-		}
+-	} else {
+-		if ((b = mygetent(db_array, argv[0])) == NULL)
+-			return RV_NOTFOUND;
+-		if (argc == 1)
+-			handleone(db_array, b, recurse, pretty, 0);
+-		else {
+-			for (i = 2; i < argc; i++) {
+-				for (j = 0; j < sizeof(sfx) - 1; j++) {
+-					cap = cgetcap(b, argv[i], sfx[j]);
+-					if (cap) {
+-						capprint(cap);
+-						break;
+-					} 
+-				}
+-				if (j == sizeof(sfx) - 1)
+-					printf("false\n");
+-			}
+-		}
+-		free(b);
+-	}
+-	return rv;
+-}
+-
+-		/*
+-		 * gettytab
+-		 */
+-
+-static int
+-gettytab(int argc, char *argv[])
+-{
+-	return handlecap(_PATH_GETTYTAB, argc, argv);
+-}
+-
+-		/*
+-		 * printcap
+-		 */
+-
+-static int
+-printcap(int argc, char *argv[])
+-{
+-	return handlecap(_PATH_PRINTCAP, argc, argv);
+-}
+-
+-		/*
+-		 * disktab
+-		 */
+-
+-static int
+-disktab(int argc, char *argv[])
+-{
+-	return handlecap(_PATH_DISKTAB, argc, argv);
+-}
+-
+ 		/*
+ 		 * protocols
+ 		 */
+@@ -726,47 +402,6 @@
+ }
+ 
+ 		/*
+-		 * rpc
+-		 */
+-
+-static int
+-rpc(int argc, char *argv[])
+-{
+-	struct rpcent	*re;
+-	unsigned long	id;
+-	int		i, rv;
+-	
+-	assert(argc > 1);
+-	assert(argv != NULL);
+-
+-#define RPCPRINT	printfmtstrings(re->r_aliases, "  ", " ", \
+-				"%-16s  %6d", \
+-				re->r_name, re->r_number)
+-
+-	setrpcent(1);
+-	rv = RV_OK;
+-	if (argc == 2) {
+-		while ((re = getrpcent()) != NULL)
+-			RPCPRINT;
+-	} else {
+-		for (i = 2; i < argc; i++) {
+-			if (parsenum(argv[i], &id))
+-				re = getrpcbynumber((int)id);
+-			else
+-				re = getrpcbyname(argv[i]);
+-			if (re != NULL)
+-				RPCPRINT;
+-			else {
+-				rv = RV_NOTFOUND;
+-				break;
+-			}
+-		}
+-	}
+-	endrpcent();
+-	return rv;
+-}
+-
+-		/*
+ 		 * services
+ 		 */
+ 
diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix
new file mode 100644
index 000000000000..9ccc0adaa2df
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/default.nix
@@ -0,0 +1,42 @@
+{ fetchcvs, netBSDDerivation, compat, libcurses, libressl }:
+
+let
+  fetchOpenBSD = path: version: sha256: fetchcvs {
+    cvsRoot = "anoncvs@anoncvs.ca.openbsd.org:/cvs";
+    module = "src/${path}";
+    inherit sha256;
+    tag = "OPENBSD_${builtins.replaceStrings ["."] ["_"] version}";
+  };
+
+  # OpenBSD is a fork of NetBSD
+  # We can build it with minimal changes
+  openBSDDerivation = attrs: netBSDDerivation (attrs // {
+    name = "${attrs.pname or (baseNameOf attrs.path)}-openbsd-${attrs.version}";
+    src = fetchOpenBSD attrs.path attrs.version attrs.sha256;
+  });
+
+in {
+
+  mg = openBSDDerivation {
+    path = "usr.bin/mg";
+    version = "6.3";
+    sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc";
+    buildInputs = [ compat libcurses ];
+    patchPhase = ''
+      NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys"
+    '';
+    extraPaths = [
+      (fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9")
+      (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr")
+    ];
+  };
+
+  nc = openBSDDerivation {
+    path = "usr.bin/nc";
+    version = "6.3";
+    sha256 = "0fmnh6ccxab0qvhmgspyd3wra1ps2516i0j6hwkvna2lcny20xvr";
+    patches = [ ./nc.patch ];
+    buildInputs = [ compat libressl ];
+  };
+
+}
diff --git a/pkgs/os-specific/bsd/openbsd/nc.patch b/pkgs/os-specific/bsd/openbsd/nc.patch
new file mode 100644
index 000000000000..de6fb2d04c41
--- /dev/null
+++ b/pkgs/os-specific/bsd/openbsd/nc.patch
@@ -0,0 +1,421 @@
+--- a/nc.1
++++ b/nc.1
+@@ -204,9 +204,6 @@ Proxy authentication is only supported f
+ Specifies the source port
+ .Nm
+ should use, subject to privilege restrictions and availability.
+-It is an error to use this option in conjunction with the
+-.Fl l
+-option.
+ .It Fl R Ar CAfile
+ Specifies the filename from which the root CA bundle for certificate
+ verification is loaded, in PEM format.
+@@ -258,6 +255,7 @@ For IPv4 TOS value
+ may be one of
+ .Ar critical ,
+ .Ar inetcontrol ,
++.Ar lowcost ,
+ .Ar lowdelay ,
+ .Ar netcontrol ,
+ .Ar throughput ,
+--- a/netcat.c
++++ b/netcat.c
+@@ -32,6 +32,8 @@
+  * *Hobbit* <hobbit@avian.org>.
+  */
+ 
++#define _GNU_SOURCE
++
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+@@ -41,6 +43,49 @@
+ #include <netinet/tcp.h>
+ #include <netinet/ip.h>
+ #include <arpa/telnet.h>
++#ifdef __linux__
++# include <linux/in6.h>
++#endif
++
++#ifndef IPTOS_LOWDELAY
++# define IPTOS_LOWDELAY 0x10
++# define IPTOS_THROUGHPUT 0x08
++# define IPTOS_RELIABILITY 0x04
++# define IPTOS_LOWCOST 0x02
++# define IPTOS_MINCOST IPTOS_LOWCOST
++#endif /* IPTOS_LOWDELAY */
++
++# ifndef IPTOS_DSCP_AF11
++# define	IPTOS_DSCP_AF11		0x28
++# define	IPTOS_DSCP_AF12		0x30
++# define	IPTOS_DSCP_AF13		0x38
++# define	IPTOS_DSCP_AF21		0x48
++# define	IPTOS_DSCP_AF22		0x50
++# define	IPTOS_DSCP_AF23		0x58
++# define	IPTOS_DSCP_AF31		0x68
++# define	IPTOS_DSCP_AF32		0x70
++# define	IPTOS_DSCP_AF33		0x78
++# define	IPTOS_DSCP_AF41		0x88
++# define	IPTOS_DSCP_AF42		0x90
++# define	IPTOS_DSCP_AF43		0x98
++# define	IPTOS_DSCP_EF		0xb8
++#endif /* IPTOS_DSCP_AF11 */
++
++#ifndef IPTOS_DSCP_CS0
++# define	IPTOS_DSCP_CS0		0x00
++# define	IPTOS_DSCP_CS1		0x20
++# define	IPTOS_DSCP_CS2		0x40
++# define	IPTOS_DSCP_CS3		0x60
++# define	IPTOS_DSCP_CS4		0x80
++# define	IPTOS_DSCP_CS5		0xa0
++# define	IPTOS_DSCP_CS6		0xc0
++# define	IPTOS_DSCP_CS7		0xe0
++#endif /* IPTOS_DSCP_CS0 */
++
++#ifndef IPTOS_DSCP_EF
++# define	IPTOS_DSCP_EF		0xb8
++#endif /* IPTOS_DSCP_EF */
++
+ 
+ #include <err.h>
+ #include <errno.h>
+@@ -268,10 +315,14 @@ main(int argc, char *argv[])
+ 			uflag = 1;
+ 			break;
+ 		case 'V':
++# if defined(RT_TABLEID_MAX)
+ 			rtableid = (int)strtonum(optarg, 0,
+ 			    RT_TABLEID_MAX, &errstr);
+ 			if (errstr)
+ 				errx(1, "rtable %s: %s", errstr, optarg);
++# else
++			errx(1, "no alternate routing table support available");
++# endif
+ 			break;
+ 		case 'v':
+ 			vflag = 1;
+@@ -320,7 +371,11 @@ main(int argc, char *argv[])
+ 			oflag = optarg;
+ 			break;
+ 		case 'S':
++# if defined(TCP_MD5SIG)
+ 			Sflag = 1;
++# else
++			errx(1, "no TCP MD5 signature support available");
++# endif
+ 			break;
+ 		case 'T':
+ 			errstr = NULL;
+@@ -345,35 +400,23 @@ main(int argc, char *argv[])
+ 	argc -= optind;
+ 	argv += optind;
+ 
++# if defined(RT_TABLEID_MAX)
+ 	if (rtableid >= 0)
+ 		if (setrtable(rtableid) == -1)
+ 			err(1, "setrtable");
+-
+-	if (family == AF_UNIX) {
+-		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
+-			err(1, "pledge");
+-	} else if (Fflag && Pflag) {
+-		if (pledge("stdio inet dns sendfd tty", NULL) == -1)
+-			err(1, "pledge");
+-	} else if (Fflag) { 
+-		if (pledge("stdio inet dns sendfd", NULL) == -1)
+-			err(1, "pledge");
+-	} else if (Pflag && usetls) {
+-		if (pledge("stdio rpath inet dns tty", NULL) == -1)
+-			err(1, "pledge");
+-	} else if (Pflag) {
+-		if (pledge("stdio inet dns tty", NULL) == -1)
+-			err(1, "pledge");
+-	} else if (usetls) {
+-		if (pledge("stdio rpath inet dns", NULL) == -1)
+-			err(1, "pledge");
+-	} else if (pledge("stdio inet dns", NULL) == -1)
+-		err(1, "pledge");
++# endif
+ 
+ 	/* Cruft to make sure options are clean, and used properly. */
+ 	if (argv[0] && !argv[1] && family == AF_UNIX) {
+ 		host = argv[0];
+ 		uport = NULL;
++	} else if (!argv[0] && lflag) {
++		if (sflag)
++			errx(1, "cannot use -s and -l");
++		if (pflag)
++			errx(1, "cannot use -p and -l");
++		if (zflag)
++			errx(1, "cannot use -z and -l");
+ 	} else if (argv[0] && !argv[1]) {
+ 		if (!lflag)
+ 			usage(1);
+@@ -385,12 +428,6 @@ main(int argc, char *argv[])
+ 	} else
+ 		usage(1);
+ 
+-	if (lflag && sflag)
+-		errx(1, "cannot use -s and -l");
+-	if (lflag && pflag)
+-		errx(1, "cannot use -p and -l");
+-	if (lflag && zflag)
+-		errx(1, "cannot use -z and -l");
+ 	if (!lflag && kflag)
+ 		errx(1, "must use -l with -k");
+ 	if (uflag && usetls)
+@@ -425,8 +462,8 @@ main(int argc, char *argv[])
+ 		} else {
+ 			strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
+ 			    UNIX_DG_TMP_SOCKET_SIZE);
+-			if (mktemp(unix_dg_tmp_socket_buf) == NULL)
+-				err(1, "mktemp");
++			if (mkstemp(unix_dg_tmp_socket_buf) == -1)
++				err(1, "mkstemp");
+ 			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
+ 		}
+ 	}
+@@ -901,8 +938,10 @@ remote_connect(const char *host, const c
+ 		if (sflag || pflag) {
+ 			struct addrinfo ahints, *ares;
+ 
++# if defined (SO_BINDANY)
+ 			/* try SO_BINDANY, but don't insist */
+ 			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
++# endif
+ 			memset(&ahints, 0, sizeof(struct addrinfo));
+ 			ahints.ai_family = res->ai_family;
+ 			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
+@@ -994,9 +1033,15 @@ local_listen(char *host, char *port, str
+ 		    res->ai_protocol)) < 0)
+ 			continue;
+ 
++		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
++		if (ret == -1)
++			err(1, NULL);
++
++# if defined(SO_REUSEPORT)
+ 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
+ 		if (ret == -1)
+ 			err(1, NULL);
++# endif
+ 
+ 		set_common_sockopts(s, res->ai_family);
+ 
+@@ -1452,11 +1497,13 @@ set_common_sockopts(int s, int af)
+ {
+ 	int x = 1;
+ 
++# if defined(TCP_MD5SIG)
+ 	if (Sflag) {
+ 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
+ 			&x, sizeof(x)) == -1)
+ 			err(1, NULL);
+ 	}
++# endif
+ 	if (Dflag) {
+ 		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
+ 			&x, sizeof(x)) == -1)
+@@ -1467,9 +1514,14 @@ set_common_sockopts(int s, int af)
+ 		    IP_TOS, &Tflag, sizeof(Tflag)) == -1)
+ 			err(1, "set IP ToS");
+ 
++#if defined(IPV6_TCLASS)
+ 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
+ 		    IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1)
+ 			err(1, "set IPv6 traffic class");
++#else
++		else if (af == AF_INET6)
++			errx(1, "can't set IPv6 traffic class (unavailable)");
++#endif
+ 	}
+ 	if (Iflag) {
+ 		if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
+@@ -1487,19 +1539,34 @@ set_common_sockopts(int s, int af)
+ 		    IP_TTL, &ttl, sizeof(ttl)))
+ 			err(1, "set IP TTL");
+ 
++#if defined(IPV6_UNICAST_HOPS)
+ 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
+ 		    IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)))
+ 			err(1, "set IPv6 unicast hops");
++#else
++		else if (af == AF_INET6)
++			errx(1, "can't set IPv6 unicast hops (unavailable)");
++#endif
+ 	}
+ 
+ 	if (minttl != -1) {
++#if defined(IP_MINTTL)
+ 		if (af == AF_INET && setsockopt(s, IPPROTO_IP,
+ 		    IP_MINTTL, &minttl, sizeof(minttl)))
+ 			err(1, "set IP min TTL");
++#else
++		if (af == AF_INET)
++			errx(1, "can't set IP min TTL (unavailable)");
++#endif
+ 
++#if defined(IPV6_MINHOPCOUNT)
+ 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
+ 		    IPV6_MINHOPCOUNT, &minttl, sizeof(minttl)))
+ 			err(1, "set IPv6 min hop count");
++#else
++		else if (af == AF_INET6)
++			errx(1, "can't set IPv6 min hop count (unavailable)");
++#endif
+ 	}
+ }
+ 
+@@ -1534,6 +1601,7 @@ process_tos_opt(char *s, int *val)
+ 		{ "cs7",		IPTOS_DSCP_CS7 },
+ 		{ "ef",			IPTOS_DSCP_EF },
+ 		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
++		{ "lowcost",		IPTOS_LOWCOST },
+ 		{ "lowdelay",		IPTOS_LOWDELAY },
+ 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
+ 		{ "reliability",	IPTOS_RELIABILITY },
+@@ -1741,7 +1812,7 @@ help(void)
+ 	\t-Z		Peer certificate file\n\
+ 	\t-z		Zero-I/O mode [used for scanning]\n\
+ 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
+-	exit(1);
++	exit(0);
+ }
+ 
+ void
+--- a/socks.c
++++ b/socks.c
+@@ -219,11 +219,11 @@ socks_connect(const char *host, const ch
+ 		buf[2] = SOCKS_NOAUTH;
+ 		cnt = atomicio(vwrite, proxyfd, buf, 3);
+ 		if (cnt != 3)
+-			err(1, "write failed (%zu/3)", cnt);
++			err(1, "write failed (%zu/3)", (size_t)cnt);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 2);
+ 		if (cnt != 2)
+-			err(1, "read failed (%zu/3)", cnt);
++			err(1, "read failed (%zu/3)", (size_t)cnt);
+ 
+ 		if (buf[1] == SOCKS_NOMETHOD)
+ 			errx(1, "authentication method negotiation failed");
+@@ -272,11 +272,11 @@ socks_connect(const char *host, const ch
+ 
+ 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
+ 		if (cnt != wlen)
+-			err(1, "write failed (%zu/%zu)", cnt, wlen);
++			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 4);
+ 		if (cnt != 4)
+-			err(1, "read failed (%zu/4)", cnt);
++			err(1, "read failed (%zu/4)", (size_t)cnt);
+ 		if (buf[1] != 0) {
+ 			errx(1, "connection failed, SOCKSv5 error: %s",
+ 			    socks5_strerror(buf[1]));
+@@ -285,12 +285,12 @@ socks_connect(const char *host, const ch
+ 		case SOCKS_IPV4:
+ 			cnt = atomicio(read, proxyfd, buf + 4, 6);
+ 			if (cnt != 6)
+-				err(1, "read failed (%zu/6)", cnt);
++				err(1, "read failed (%zu/6)", (size_t)cnt);
+ 			break;
+ 		case SOCKS_IPV6:
+ 			cnt = atomicio(read, proxyfd, buf + 4, 18);
+ 			if (cnt != 18)
+-				err(1, "read failed (%zu/18)", cnt);
++				err(1, "read failed (%zu/18)", (size_t)cnt);
+ 			break;
+ 		default:
+ 			errx(1, "connection failed, unsupported address type");
+@@ -310,11 +310,11 @@ socks_connect(const char *host, const ch
+ 
+ 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
+ 		if (cnt != wlen)
+-			err(1, "write failed (%zu/%zu)", cnt, wlen);
++			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
+ 
+ 		cnt = atomicio(read, proxyfd, buf, 8);
+ 		if (cnt != 8)
+-			err(1, "read failed (%zu/8)", cnt);
++			err(1, "read failed (%zu/8)", (size_t)cnt);
+ 		if (buf[1] != 90) {
+ 			errx(1, "connection failed, SOCKSv4 error: %s",
+ 			    socks4_strerror(buf[1]));
+@@ -328,39 +328,39 @@ socks_connect(const char *host, const ch
+ 
+ 		/* Try to be sane about numeric IPv6 addresses */
+ 		if (strchr(host, ':') != NULL) {
+-			r = snprintf(buf, sizeof(buf),
++			r = snprintf((char*)buf, sizeof(buf),
+ 			    "CONNECT [%s]:%d HTTP/1.0\r\n",
+ 			    host, ntohs(serverport));
+ 		} else {
+-			r = snprintf(buf, sizeof(buf),
++			r = snprintf((char*)buf, sizeof(buf),
+ 			    "CONNECT %s:%d HTTP/1.0\r\n",
+ 			    host, ntohs(serverport));
+ 		}
+ 		if (r == -1 || (size_t)r >= sizeof(buf))
+ 			errx(1, "hostname too long");
+-		r = strlen(buf);
++		r = strlen((char*)buf);
+ 
+ 		cnt = atomicio(vwrite, proxyfd, buf, r);
+ 		if (cnt != r)
+-			err(1, "write failed (%zu/%d)", cnt, r);
++			err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r);
+ 
+ 		if (authretry > 1) {
+ 			char resp[1024];
+ 
+ 			proxypass = getproxypass(proxyuser, proxyhost);
+-			r = snprintf(buf, sizeof(buf), "%s:%s",
++			r = snprintf((char*)buf, sizeof(buf), "%s:%s",
+ 			    proxyuser, proxypass);
+ 			if (r == -1 || (size_t)r >= sizeof(buf) ||
+-			    b64_ntop(buf, strlen(buf), resp,
++			    b64_ntop(buf, strlen((char*)buf), resp,
+ 			    sizeof(resp)) == -1)
+ 				errx(1, "Proxy username/password too long");
+-			r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
++			r = snprintf((char*)buf, sizeof(buf), "Proxy-Authorization: "
+ 			    "Basic %s\r\n", resp);
+ 			if (r == -1 || (size_t)r >= sizeof(buf))
+ 				errx(1, "Proxy auth response too long");
+-			r = strlen(buf);
++			r = strlen((char*)buf);
+ 			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
+-				err(1, "write failed (%zu/%d)", cnt, r);
++				err(1, "write failed (%zu/%d)", (size_t)cnt, r);
+ 		}
+ 
+ 		/* Terminate headers */
+@@ -368,22 +368,22 @@ socks_connect(const char *host, const ch
+ 			err(1, "write failed (%zu/2)", cnt);
+ 
+ 		/* Read status reply */
+-		proxy_read_line(proxyfd, buf, sizeof(buf));
++		proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
+ 		if (proxyuser != NULL &&
+-		    strncmp(buf, "HTTP/1.0 407 ", 12) == 0) {
++		    strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) {
+ 			if (authretry > 1) {
+ 				fprintf(stderr, "Proxy authentication "
+ 				    "failed\n");
+ 			}
+ 			close(proxyfd);
+ 			goto again;
+-		} else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 &&
+-		    strncmp(buf, "HTTP/1.1 200 ", 12) != 0)
++		} else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 &&
++		    strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0)
+ 			errx(1, "Proxy error: \"%s\"", buf);
+ 
+ 		/* Headers continue until we hit an empty line */
+ 		for (r = 0; r < HTTP_MAXHDRS; r++) {
+-			proxy_read_line(proxyfd, buf, sizeof(buf));
++			proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
+ 			if (*buf == '\0')
+ 				break;
+ 		}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2618fce479d..5aca1a0025d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21301,4 +21301,7 @@ with pkgs;
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
   inherit (unixtools) hexdump ps logger eject umount
                       mount wall hostname more sysctl;
+
+  inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
+          netbsd openbsd;
 }

From 82a9df76cce9f46ccf76aeab2a5f98fc38ea81ae Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Tue, 24 Apr 2018 21:25:13 +0200
Subject: [PATCH 0310/3370] tuxpaint: init at 0.9.22

---
 pkgs/games/tuxpaint/default.nix              | 46 ++++++++++++++++++++
 pkgs/games/tuxpaint/tuxpaint-completion.diff | 16 +++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/games/tuxpaint/default.nix
 create mode 100644 pkgs/games/tuxpaint/tuxpaint-completion.diff

diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix
new file mode 100644
index 000000000000..ddf0782b210d
--- /dev/null
+++ b/pkgs/games/tuxpaint/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng,
+  cairo, librsvg, gettext, libpaper, fribidi, pkgconfig, gperf }:
+
+stdenv.mkDerivation rec {
+  version = "0.9.22";
+  name = "tuxpaint-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/tuxpaint/${version}/${name}.tar.gz";
+    sha256 = "1qrbrdck9yxpcg3si6jb9i11w8lw9h4hqad0pfaxgyiniqpr7gca";
+  };
+
+  nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo
+    librsvg gettext libpaper fribidi pkgconfig gperf ];
+  hardeningDisable = [ "format" ];
+  makeFlags = [ "GPERF=${gperf}/bin/gperf"
+                "PREFIX=$$out"
+                "COMPLETIONDIR=$$out/share/bash-completion/completions"
+              ];
+
+  patches = [ ./tuxpaint-completion.diff ];
+  postPatch = ''
+    grep -Zlr include.*SDL . | xargs -0 sed -i -e 's,"SDL,"SDL/SDL,'
+  '';
+
+  # stamps
+  stamps = fetchurl {
+    url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2014-08-23/tuxpaint-stamps-2014.08.23.tar.gz";
+    sha256 = "0rhlwrjz44wp269v3rid4p8pi0i615pzifm1ym6va64gn1bms06q";
+  };
+
+  postInstall = ''
+    tar xzf $stamps
+    cd tuxpaint-stamps-2014.08.23
+    make install-all PREFIX=$out
+    rm -rf $out/share/tuxpaint/stamps/military
+  '';
+
+  meta = {
+    description = "Open Source Drawing Software for Children";
+    homepage = http://www.tuxpaint.org/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = with stdenv.lib.maintainers; [ woffs ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/games/tuxpaint/tuxpaint-completion.diff b/pkgs/games/tuxpaint/tuxpaint-completion.diff
new file mode 100644
index 000000000000..0824b2becf49
--- /dev/null
+++ b/pkgs/games/tuxpaint/tuxpaint-completion.diff
@@ -0,0 +1,16 @@
+--- tuxpaint-0.9.22/src/tuxpaint-completion.bash~	1970-01-01 01:00:01.000000000 +0100
++++ tuxpaint-0.9.22/src/tuxpaint-completion.bash	2018-03-06 10:54:03.437560921 +0100
+@@ -8,7 +8,6 @@
+ # FIXME: See http://www.debian-administration.org/articles/316 for an intro
+ # to how we should be doing this... -bjk 2009.09.09
+ 
+-have tuxpaint &&
+ _tuxpaint()
+ {
+         local cur
+@@ -96,4 +95,4 @@
+         fi
+ 
+ }
+-[ "${have:-}" ] && complete -F _tuxpaint $filenames tuxpaint
++complete -F _tuxpaint $filenames tuxpaint
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a4ebec0480a..6611baa9fe10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19442,6 +19442,8 @@ with pkgs;
 
   tremulous = callPackage ../games/tremulous { };
 
+  tuxpaint = callPackage ../games/tuxpaint { };
+
   speed_dreams = callPackage ../games/speed-dreams {
     # Torcs wants to make shared libraries linked with plib libraries (it provides static).
     # i686 is the only platform I know than can do that linking without plib built with -fPIC

From bc26105522dd71b0fc3b1035a53b26dba9ac8646 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 12:32:19 -0700
Subject: [PATCH 0311/3370] libwebp: 0.6.1 -> 1.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libwebp/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/dwebp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/cwebp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/gif2webp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/img2webp -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/img2webp --help’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/webpmux -h’ got 0 exit code
- ran ‘/nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0/bin/webpinfo -h’ got 0 exit code
- found 1.0.0 with grep in /nix/store/7rlf92q1g4sxv0g1gj8sf8310zm9na88-libwebp-1.0.0
- directory tree listing: https://gist.github.com/a09e2cd5f3d318ac588ecdf308cc9898
---
 pkgs/development/libraries/libwebp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix
index f7d4fc3b3675..8cd0536e2946 100644
--- a/pkgs/development/libraries/libwebp/default.nix
+++ b/pkgs/development/libraries/libwebp/default.nix
@@ -27,11 +27,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libwebp-${version}";
-  version = "0.6.1";
+  version = "1.0.0";
 
   src = fetchurl {
     url = "http://downloads.webmproject.org/releases/webp/${name}.tar.gz";
-    sha256 = "1ayq2zq0zbgf5yizbm32zh7p1vb8kibw74am6am1n5cz5mw3ql06";
+    sha256 = "0nr2hd4iv61fphdbx49g96a56jkmdm9n2qss7jpkg1pii11rq9c4";
   };
 
   configureFlags = [

From d0a7664cc360989750909dd8ad7d500fd0a1bcd2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 12:42:18 -0700
Subject: [PATCH 0312/3370] kexectools: 2.0.16 -> 2.0.17
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/kexec-tools/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17/bin/kexec -h’ got 0 exit code
- ran ‘/nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17/bin/kexec --help’ got 0 exit code
- ran ‘/nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17/bin/kexec -v’ and found version 2.0.17
- ran ‘/nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17/bin/kexec --version’ and found version 2.0.17
- found 2.0.17 with grep in /nix/store/fs7vc5d6vw26v0502smh2dhg6390d1za-kexec-tools-2.0.17
- directory tree listing: https://gist.github.com/892a831f872f6ec59c936b89b0bd6aa6
---
 pkgs/os-specific/linux/kexectools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 26f3d89c6628..f5f0916b90a6 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "kexec-tools-${version}";
-  version = "2.0.16";
+  version = "2.0.17";
 
   src = fetchurl {
     urls = [
       "mirror://kernel/linux/utils/kernel/kexec/${name}.tar.xz"
       "http://horms.net/projects/kexec/kexec-tools/${name}.tar.xz"
     ];
-    sha256 = "043hasx5b9zk7r7dzx24z5wybg74dpmh0nyns6nrnb3mmm8k642v";
+    sha256 = "1ac20jws8iys9w6dpn4q3hihyx73zkabdwv3gcb779cxfrmq2k2h";
   };
 
   hardeningDisable = [ "format" "pic" "relro" ];

From d48e9ff92a111482676504ff244663ca049ec841 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 24 Apr 2018 21:26:37 +0200
Subject: [PATCH 0313/3370] liblouis: mark as broken

---
 pkgs/applications/misc/orca/default.nix         | 3 ++-
 pkgs/development/libraries/liblouis/default.nix | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index abc8c3e78424..3abefae9c6b5 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -34,7 +34,8 @@ in buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = [
-    pygobject3 pyatspi dbus-python pyxdg brltty liblouis speechd gst-python setproctitle
+    # TODO: re-add liblouis when it is fixed
+    pygobject3 pyatspi dbus-python pyxdg brltty speechd gst-python setproctitle
   ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/liblouis/default.nix b/pkgs/development/libraries/liblouis/default.nix
index bde1ff4e4936..a6005d66b4d6 100644
--- a/pkgs/development/libraries/liblouis/default.nix
+++ b/pkgs/development/libraries/liblouis/default.nix
@@ -50,6 +50,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open-source braille translator and back-translator";
     homepage = http://liblouis.org/;
+    broken = true;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ jtojnar ];
     platforms = platforms.unix;

From ddc48afccaa340d4a166fd2e5e183a4fd7185e24 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 24 Apr 2018 21:39:33 +0200
Subject: [PATCH 0314/3370] =?UTF-8?q?python3.pkgs.pyatspi:=202.18.0=20?=
 =?UTF-8?q?=E2=86=92=202.26.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../python-modules/pyatspi/default.nix        | 32 +++++++++++--------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix
index 6192f94445f3..5960551abc72 100644
--- a/pkgs/development/python-modules/pyatspi/default.nix
+++ b/pkgs/development/python-modules/pyatspi/default.nix
@@ -1,29 +1,35 @@
-{ stdenv, fetchurl, pkgconfig, at-spi2-core, pythonPackages }:
+{ stdenv, fetchurl, pkgconfig, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }:
 
-stdenv.mkDerivation rec {
+buildPythonPackage rec {
   pname = "pyatspi";
-  version = "2.18.0";
-  name = "${pname}-${version}";
+  version = "2.26.0";
+  format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pyatspi/2.18/${name}.tar.xz";
-    sha256 = "0imbyk2v6c11da7pkwz91313pkkldxs8zfg81zb2ql6h0nnh6vzq";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0xdnix7gxzgf75xy9ris4dd6b05mqwicw190b98xqmypydyf95n6";
   };
 
-  broken = true;
-
   buildInputs = [
     at-spi2-core
     pkgconfig
-    pythonPackages.python
-    pythonPackages.pygobject3
+    pygobject3
   ];
 
+  disabled = !isPy3k;
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      attrPath = "python3.pkgs.${pname}";
+    };
+  };
+
   meta = with stdenv.lib; {
-    description = "Python 3 bindings for at-spi";
-    homepage = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus;
+    description = "Python client bindings for D-Bus AT-SPI";
+    homepage = https://wiki.linuxfoundation.org/accessibility/d-bus;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ jgeerds jtojnar ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 127e4ac9c0e6..86c5e882ab2e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -315,7 +315,7 @@ in {
     inherit (pkgs) arrow-cpp cmake pkgconfig;
   };
 
-  pyatspi = disabledIf (!isPy3k) (callPackage ../development/python-modules/pyatspi { });
+  pyatspi = callPackage ../development/python-modules/pyatspi { };
 
   pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { };
 

From 5979e886955c0a1e4b7609b5bdd68582d3ec925e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 24 Apr 2018 21:39:53 +0200
Subject: [PATCH 0315/3370] orca: fix typelib lookup

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

diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix
index 3abefae9c6b5..e05cb0ad6f9d 100644
--- a/pkgs/applications/misc/orca/default.nix
+++ b/pkgs/applications/misc/orca/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, pkgconfig, fetchurl, buildPythonApplication
-, autoreconfHook, wrapGAppsHook
+, autoreconfHook, wrapGAppsHook, gobjectIntrospection
 , intltool, yelp-tools, itstool, libxmlxx3
 , python, pygobject3, gtk3, gnome3, substituteAll
 , at-spi2-atk, at-spi2-core, pyatspi, dbus, dbus-python, pyxdg
@@ -30,7 +30,7 @@ in buildPythonApplication rec {
 
   nativeBuildInputs = [
     autoreconfHook wrapGAppsHook pkgconfig libxmlxx3
-    intltool yelp-tools itstool
+    intltool yelp-tools itstool gobjectIntrospection
   ];
 
   propagatedBuildInputs = [

From 2ac306c91cefc585d23239b54e5539abb64c0c04 Mon Sep 17 00:00:00 2001
From: Felix Dietze <felix@beerleader.net>
Date: Tue, 24 Apr 2018 21:57:51 +0200
Subject: [PATCH 0316/3370] nixos manual: Fix typo in Syntax Summary

---
 nixos/doc/manual/configuration/summary.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml
index be1f2263149e..38032c5d9dc3 100644
--- a/nixos/doc/manual/configuration/summary.xml
+++ b/nixos/doc/manual/configuration/summary.xml
@@ -53,7 +53,7 @@ manual</link> for the rest.</para>
       </row>
       <row>
         <entry><literal>{ x = 1; y = 2; }</literal></entry>
-        <entry>An set with attributes names <literal>x</literal> and <literal>y</literal></entry>
+        <entry>A set with attributes named <literal>x</literal> and <literal>y</literal></entry>
       </row>
       <row>
         <entry><literal>{ foo.bar = 1; }</literal></entry>

From dad3714ec16c96b4512d5ebdff84f88867dfb291 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 15:06:15 -0500
Subject: [PATCH 0317/3370] live555: supports darwin

---
 .../development/libraries/live555/default.nix | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 1479f7b6153b..69c16878fdf5 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, lib, darwin }:
 
 # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
 let
@@ -12,19 +12,22 @@ stdenv.mkDerivation {
     sha256 = "0zi47asv1qmb09g321m02q684i3c90vci0mgkdh1mlmx2rbg1d1d";
   };
 
-  postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles"
-  + stdenv.lib.optionalString (stdenv ? glibc) ''
-
+  postPatch = ''
+    sed 's,/bin/rm,rm,g' -i genMakefiles
+    sed \
+      -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
+      -i config.linux
+  '' + stdenv.lib.optionalString (stdenv ? glibc) ''
     substituteInPlace liveMedia/include/Locale.hh \
       --replace '<xlocale.h>' '<locale.h>'
   '';
 
   configurePhase = ''
-    sed \
-      -e 's/$(INCLUDES) -I. -O2 -DSOCKLEN_T/$(INCLUDES) -I. -O2 -I. -fPIC -DRTSPCLIENT_SYNCHRONOUS_INTERFACE=1 -DSOCKLEN_T/g' \
-      -i config.linux
-
-    ./genMakefiles linux
+    ./genMakefiles ${{
+      x86_64-darwin = "macosx";
+      i686-linux = "linux";
+      x86_64-linux = "linux-64bit";
+    }.${stdenv.system}}
   '';
 
   installPhase = ''
@@ -35,10 +38,12 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with stdenv.lib; {
+  nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools;
+
+  meta = with lib; {
     description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)";
     homepage = http://www.live555.com/liveMedia/;
     license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From db6cc5623945c6594475303a838accce41a9729a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 15:08:12 -0500
Subject: [PATCH 0318/3370] libmtp: supports darwin

---
 pkgs/development/libraries/libmtp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 88ef55715a7c..c3061626a6ae 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb1 }:
+{ stdenv, fetchurl, pkgconfig, libusb1, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "libmtp-1.1.15";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" ];
 
+  buildInputs = [ libiconv ];
   propagatedBuildInputs = [ libusb1 ];
   nativeBuildInputs = [ pkgconfig ];
 
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
       in the form of a library suitable primarily for POSIX compliant operating
       systems. We implement MTP Basic, the stuff proposed for standardization.
       '';
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ ];
   };
 }

From 9c406d2ac8574ea03ba68db9b843c36ac43e3289 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 15:09:07 -0500
Subject: [PATCH 0319/3370] libdvdnav: supports Darwin

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

diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index 42321b2f866a..b0dfd1e8fc12 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "A library that implements DVD navigation features such as DVD menus";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.wmertens ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
   passthru = { inherit libdvdread; };

From 00bf1150473dedb02f22696450b250e04875faab Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 15:16:12 -0500
Subject: [PATCH 0320/3370] schroedinger: add Darwin patch

---
 .../libraries/schroedinger/default.nix           | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix
index 2309719c2bdc..167fe4190764 100644
--- a/pkgs/development/libraries/schroedinger/default.nix
+++ b/pkgs/development/libraries/schroedinger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, orc, pkgconfig }:
+{ stdenv, fetchurl, orc, pkgconfig, fetchpatch, autoreconfHook }:
 
 stdenv.mkDerivation {
   name = "schroedinger-1.0.11";
@@ -13,15 +13,23 @@ stdenv.mkDerivation {
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ orc ];
 
-  doCheck = true;
+  doCheck = (!stdenv.isDarwin);
+
+  patchFlags = "-p0";
+  patches = [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/schroedinger/files/patch-testsuite-Makefile.am.diff";
+      sha256 = "0cc8ymvgjgwy7ghca2dd8m8pxpinf27s2i8krf2m3fzv2ckq09v3";
+    })
+  ];
 
   meta = with stdenv.lib; {
     homepage = http://diracvideo.org/;
     maintainers = [ maintainers.spwhitt ];
     license = [ licenses.mpl11 licenses.lgpl2 licenses.mit ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From f827bd40072c7f275a09ccc57d36a468941c618e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 13:23:53 -0700
Subject: [PATCH 0321/3370] grib-api: 1.26.0 -> 1.26.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/grib-api/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_histogram -h’ got 0 exit code
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_histogram --help’ got 0 exit code
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_info -v’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_filter -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_ls -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_dump -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib2ppm -h’ got 0 exit code
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib2ppm --help’ got 0 exit code
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_set -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_get -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_get_data -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_copy -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_packing help’ got 0 exit code
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_compare -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_index_build help’ got 0 exit code
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_index_build -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_to_netcdf -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -V’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -v’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys --version’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys version’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys -h’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys --help’ and found version 1.26.1
- ran ‘/nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1/bin/grib_list_keys help’ and found version 1.26.1
- found 1.26.1 with grep in /nix/store/60krazh9fxzn8n99nx9rxx8mi78hf9sx-grib-api-1.26.1
- directory tree listing: https://gist.github.com/e201ebaf6d3662af211ceca919f68df1
---
 pkgs/development/libraries/grib-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix
index 61409279ded7..9113b6716649 100644
--- a/pkgs/development/libraries/grib-api/default.nix
+++ b/pkgs/development/libraries/grib-api/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec{
   name = "grib-api-${version}";
-  version = "1.26.0";
+  version = "1.26.1";
 
   src = fetchurl {
     url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz";
-    sha256 = "00cmmj44bhdlzhqbvwb3bb4xks3bpva669m6g3g6ffjaqm25b90c";
+    sha256 = "1v1apx9421m8zkjmych5yr66mvqjrrygc98bvyl4miasmsb4ndfs";
   };
 
   preConfigure = ''

From bfd213aa2d1bdc04c09766764355fdfae8f336a0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 24 Apr 2018 22:41:47 +0200
Subject: [PATCH 0322/3370] rhythmbox: fix build with GStreamer 1.14

---
 pkgs/applications/audio/rhythmbox/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix
index a23324c7fdac..8dab9e32f982 100644
--- a/pkgs/applications/audio/rhythmbox/default.nix
+++ b/pkgs/applications/audio/rhythmbox/default.nix
@@ -24,6 +24,15 @@ in stdenv.mkDerivation rec {
     sha256 = "0hzcns8gf5yb0rm4ss8jd8qzarcaplp5cylk6plwilsqfvxj4xn2";
   };
 
+  patches = [
+    # build with GStreamer 1.14 https://bugzilla.gnome.org/show_bug.cgi?id=788706
+    (fetchurl {
+      name = "fmradio-Fix-build-with-GStreamer-master.patch";
+      url = https://bugzilla.gnome.org/attachment.cgi?id=361178;
+      sha256 = "1h09mimlglj9hcmc3pfp0d6c277mqh2khwv9fryk43pkv3904d2w";
+    })
+  ];
+
   nativeBuildInputs = [
     pkgconfig
     intltool perl perlPackages.XMLParser

From 1c3d38c69b0b795a6a445a3fa3af3780cb4c8f06 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 24 Apr 2018 22:56:25 +0200
Subject: [PATCH 0323/3370] vim_configurable: replace default ftNix patch with
 sources from vim-nix

---
 .../applications/editors/vim/configurable.nix |  6 ++
 .../editors/vim/ft-nix-support.patch          | 78 +------------------
 2 files changed, 7 insertions(+), 77 deletions(-)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 0f81b0bdd640..9ffa31f2f2e0 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -4,6 +4,7 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge
 , composableDerivation, writeText, lib, config, glib, gtk2, gtk3, python, perl, tcl, ruby
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
 , libICE
+, vimPlugins
 
 # apple frameworks
 , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
@@ -80,6 +81,11 @@ composableDerivation {
     flags = {
         ftNix = {
           patches = [ ./ft-nix-support.patch ];
+          preConfigure = ''
+            cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
+            cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim
+            cp ${vimPlugins.vim-nix.src}/syntax/nix.vim runtime/syntax/nix.vim
+          '';
         };
       }
       // edf {
diff --git a/pkgs/applications/editors/vim/ft-nix-support.patch b/pkgs/applications/editors/vim/ft-nix-support.patch
index 5feb9c879517..274d855731fd 100644
--- a/pkgs/applications/editors/vim/ft-nix-support.patch
+++ b/pkgs/applications/editors/vim/ft-nix-support.patch
@@ -6,7 +6,7 @@ index a8e6261..2b008fc 100644
  " Z80 assembler asz80
  au BufNewFile,BufRead *.z8a			setf z8a
  
-+" NIX
++" Nix
 +au BufNewFile,BufRead *.nix		setf nix
 +
  augroup END
@@ -18,79 +18,3 @@ index a8e6261..2b008fc 100644
  unlet s:cpo_save
 +
 +
-diff --git a/runtime/syntax/nix.vim b/runtime/syntax/nix.vim
-new file mode 100644
-index 0000000..a2f9918
---- /dev/null
-+++ b/runtime/syntax/nix.vim
-@@ -0,0 +1,56 @@
-+" Vim syntax file
-+" Language:	nix
-+" Maintainer:	Marc Weber <marco-oweber@gmx.de>
-+"               Modify and commit if you feel that way
-+" Last Change:	2011 Jun
-+"
-+" this syntax file can be still be enhanced very much..
-+" Don't ask, do it :-)
-+" This file (github.com/MarcWeber/vim-addon-nix) is periodically synced with
-+" the patch found in vim_configurable (nixpkgs)
-+
-+" Quit when a (custom) syntax file was already loaded
-+if exists("b:current_syntax")
-+  finish
-+endif
-+
-+
-+sy cluster nixStrings contains=nixStringParam,nixStringIndented
-+
-+syn keyword	nixKeyword	let throw inherit import true false null with
-+syn keyword	nixConditional	if else then
-+syn keyword     nixBrace        ( ) { } =
-+syn keyword     nixBuiltin         __currentSystem __currentTime __isFunction __getEnv __trace __toPath __pathExists 
-+  \ __readFile __toXML __toFile __filterSource __attrNames __getAttr __hasAttr __isAttrs __listToAttrs __isList 
-+  \ __head __tail __add __sub __lessThan __substring __stringLength
-+
-+syn region nixStringIndented start=+''+ skip=+'''\|''${\|"+ end=+''+ contains=nixStringParam
-+" syn region nixString         start=+"+ skip=+\\"+ end=+"+
-+syn match nixAttr "\w\+\ze\s*="
-+syn match nixFuncArg "\zs\w\+\ze\s*:"
-+syn region nixStringParam start=+\${+ end=+}+ contains=@nixStrings
-+syn region nixMultiLineComment start=+/\*+ skip=+\\"+ end=+\*/+
-+syn match  nixEndOfLineComment "#.*$"
-+
-+hi def link nixKeyword       Keyword
-+hi def link nixConditional   Conditional
-+hi def link nixBrace         Special
-+hi def link nixString        String
-+hi def link nixStringIndented String
-+hi def link nixBuiltin       Special
-+hi def link nixStringParam   Macro
-+hi def link nixMultiLineComment Comment
-+hi def link nixEndOfLineComment Comment
-+hi def link nixAttr        Identifier
-+hi def link nixFuncArg     Identifier
-+
-+syn sync maxlines=20000
-+syn sync minlines=50000
-+
-+let b:current_syntax = "nix"
-+
-+" thanks to domenkozar
-+" scan backwards to find begining of multiline statements
-+syn sync ccomment nixMultiLineComment minlines=10 maxlines=500
-+syn sync ccomment nixStringIndented minlines=10 maxlines=500
-+syn sync ccomment nixString maxlines=10
-diff --git a/runtime/ftplugin/nix.vim b/runtime/ftplugin/nix.vim
-new file mode 100644
---- /dev/null
-+++ b/runtime/ftplugin/nix.vim
-@@ -0,0 +1,2 @@
-+" Only do this when not done yet for this buffer
-+if exists("b:did_ftplugin")
-+  finish
-+endif
-+let b:did_ftplugin = 1
-+
-+" coding conventions
-+setlocal shiftwidth=2 expandtab softtabstop=2
-+let b:undo_ftplugin = "setlocal sw< et< sts<"

From f54a9994e3fd6e3942b3c761615f106eca2d8965 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 24 Apr 2018 22:58:15 +0200
Subject: [PATCH 0324/3370] eclipse-plugin-spotbugs: 3.1.2 -> 3.1.3

Also switch to using zipped update site provided on GitHub.
---
 pkgs/applications/editors/eclipse/plugins.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 1710c0e35531..136ef7dfc23d 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -530,18 +530,13 @@ rec {
     };
   };
 
-  spotbugs = buildEclipsePlugin rec {
+  spotbugs = buildEclipseUpdateSite rec {
     name = "spotbugs-${version}";
-    version = "3.1.2.r201802250230-59118d9";
+    version = "3.1.3";
 
-    srcFeature = fetchurl {
-      url = "https://spotbugs.github.io/eclipse/features/com.github.spotbugs.plugin.eclipse_${version}.jar";
-      sha256 = "1p0pz7znpfi5h1wr60sl8clkpd7rzkh7krmc0nxc6w43gkgkg9h4";
-    };
-
-    srcPlugin = fetchurl {
-      url = "https://spotbugs.github.io/eclipse/plugins/com.github.spotbugs.plugin.eclipse_${version}.jar";
-      sha256 = "1z3jjbcjif4qip1gx2dhfcm9fyhps96ms7z3ngbdcakgw7wai9v4";
+    src = fetchzip {
+      url = "https://github.com/spotbugs/spotbugs/releases/download/${version}/eclipsePlugin.zip";
+      sha256 = "01zrmk497bxzqgwgbpsvi5iz5qk9b4q949h4918abm54zvkgndlg";
     };
 
     meta = with stdenv.lib; {

From 40bb3374e91cbdbace29594a0f620d4402bc703c Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Tue, 24 Apr 2018 23:12:40 +0200
Subject: [PATCH 0325/3370] source-and-tags: fix default.nix

Tested by observing that the following command produces a correctly
looking TAGS file:

$ nix-shell -E 'let pkgs = import ./. {}; in pkgs.myEnvFun {name = "myEnvFun-htags-test"; buildInputs = [(pkgs.sourceAndTags.sourceWithTagsDerivation (pkgs.sourceAndTags.addHasktagsTaggingInfo pkgs.haskellPackages.scientific).passthru.sourceWithTags)];}' --run 'cat $TAG_FILES'
---
 pkgs/misc/source-and-tags/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/source-and-tags/default.nix b/pkgs/misc/source-and-tags/default.nix
index 981c01e2b4a7..7c082cbbbb0f 100644
--- a/pkgs/misc/source-and-tags/default.nix
+++ b/pkgs/misc/source-and-tags/default.nix
@@ -1,4 +1,4 @@
-args: with args; {
+{ stdenv, lib, glibcLocales, unzip, hasktags, ctags } : {
   # optional srcDir
   annotatedWithSourceAndTagInfo = x : (x ? passthru && x.passthru ? sourceWithTags 
                                       || x ? meta && x.meta ? sourceWithTags );
@@ -59,8 +59,8 @@ args: with args; {
                     # without this creating tag files for lifted-base fails
                     export LC_ALL=en_US.UTF-8
                     export LANG=en_US.UTF-8
-                    ${if args.stdenv.isLinux then "export LOCALE_ARCHIVE=${args.pkgs.glibcLocales}/lib/locale/locale-archive;" else ""}
- 
+                    ${if stdenv.isLinux then "export LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive;" else ""}
+
                     ${toString hasktags}/bin/hasktags --ignore-close-implementation --ctags .
                     mv tags \$TAG_FILE
                    }";

From a4ba8c654403c1f1e6ba006533e3306dd32a638e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Apr 2018 23:27:45 +0200
Subject: [PATCH 0326/3370] clementine: each output should hav a wrapped
 `GST_PLUGIN_SYSTEM_PATH_1_0`

see https://github.com/NixOS/nixpkgs/commit/ef5e212d20959d4d883df2ff2a54e5ef4b2512a5#r28723596

/cc @jtojnar
---
 pkgs/applications/audio/clementine/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index b8ff3daec606..6379975e951c 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -70,7 +70,9 @@ let
 
   free = stdenv.mkDerivation {
     name = "clementine-free-${version}";
-    inherit src patches nativeBuildInputs buildInputs postPatch;
+    inherit src patches nativeBuildInputs postPatch;
+
+    buildInputs = buildInputs ++ [ makeWrapper ];
 
     cmakeFlags = [ "-DUSE_SYSTEM_PROJECTM=ON" ];
 
@@ -78,6 +80,11 @@ let
 
     passthru.unfree = unfree;
 
+    postInstall = ''
+      wrapProgram $out/bin/clementine \
+        --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+    '';
+
     meta = with stdenv.lib; {
       homepage = http://www.clementine-player.org;
       description = "A multiplatform music player";
@@ -108,8 +115,7 @@ let
       rmdir $out/bin
 
       makeWrapper ${free}/bin/clementine $out/bin/clementine \
-        --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine \
-        --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+        --set CLEMENTINE_SPOTIFYBLOB $out/libexec/clementine
 
       mkdir -p $out/share
       for dir in applications icons kde4; do

From 3f42a6eb84cfc56790c1347f081551650f7701f3 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 16:53:56 -0500
Subject: [PATCH 0327/3370] netbsd: small fixups

---
 pkgs/os-specific/bsd/netbsd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 8cbc765ec9e6..42633232c71a 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -114,7 +114,7 @@ let
       mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \
                $out$DOCDIR $out$LOCALEDIR
       for i in 1 2 3 4 5 6 7 8 9; do
-        mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i
+        mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i $out$DOCDIR/reference/ref$i
       done
       mkdir -p $out/usr/include
     '';
@@ -195,6 +195,7 @@ let
       install -D $NETBSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h
       install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h
       install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h
+      install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h
     '';
     extraPaths = [ libc.src libutil.src
       (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp")

From c3ab285ce20934c439ab63473e27b37f0e240ba4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 22 Apr 2018 22:02:38 -0500
Subject: [PATCH 0328/3370] glibc: use local copy of patch to fix w/musl

fetchpatch doesn't work with bootstrap fetchurl,
so just use local file like we do for other glibc patches.
---
 pkgs/development/libraries/glibc/common.nix   |  7 +---
 .../glibc/fix-rpc-types-musl-conflicts.patch  | 38 +++++++++++++++++++
 2 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index c8716bfdc796..31567f0049dd 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -95,12 +95,7 @@ stdenv.mkDerivation ({
       ./allow-kernel-2.6.32.patch
     ]
     ++ lib.optional stdenv.isx86_64 ./fix-x64-abi.patch
-    ++ lib.optional stdenv.hostPlatform.isMusl
-      (fetchpatch {
-        name = "fix-with-musl.patch";
-        url = "https://sourceware.org/bugzilla/attachment.cgi?id=10151&action=diff&collapsed=&headers=1&format=raw";
-        sha256 = "18kk534k6da5bkbsy1ivbi77iin76lsna168mfcbwv4ik5vpziq2";
-      });
+    ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch;
 
   postPatch =
     ''
diff --git a/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch b/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch
new file mode 100644
index 000000000000..19f8bfc7cce8
--- /dev/null
+++ b/pkgs/development/libraries/glibc/fix-rpc-types-musl-conflicts.patch
@@ -0,0 +1,38 @@
+@@ -, +, @@ 
+---
+ sunrpc/rpc/types.h | 22 ++++++----------------
+ 1 file changed, 6 insertions(+), 16 deletions(-)
+--- a/sunrpc/rpc/types.h	
++++ a/sunrpc/rpc/types.h	
+@@ -69,24 +69,14 @@ typedef unsigned long rpcport_t;
+ #include <sys/types.h>
+ #endif
+ 
+-#if defined __APPLE_CC__ || defined __FreeBSD__
+-# define __u_char_defined
+-# define __daddr_t_defined
+-#endif
+-
+-#ifndef __u_char_defined
+-typedef __u_char u_char;
+-typedef __u_short u_short;
+-typedef __u_int u_int;
+-typedef __u_long u_long;
+-typedef __quad_t quad_t;
+-typedef __u_quad_t u_quad_t;
+-typedef __fsid_t fsid_t;
++/* IMPORTANT NOTE: This has been modified to build against the musl C
++ * library and it probably now ONLY builds with the musl C library.
++ *
++ * See: https://sourceware.org/bugzilla/show_bug.cgi?id=21604
++ */
+ # define __u_char_defined
+-#endif
+ #ifndef __daddr_t_defined
+-typedef __daddr_t daddr_t;
+-typedef __caddr_t caddr_t;
++typedef int daddr_t;
+ # define __daddr_t_defined
+ #endif
+ 
+-- 

From 3e53f00a1f5ca65b5740e6974bed118e993ac18c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 15:12:21 -0700
Subject: [PATCH 0329/3370] eccodes: 2.7.0 -> 2.7.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/eccodes/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/codes_info -v’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_histogram -h’ got 0 exit code
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_histogram --help’ got 0 exit code
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_filter -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_ls -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_dump -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_merge -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib2ppm -h’ got 0 exit code
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib2ppm --help’ got 0 exit code
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_set -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_get -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_get_data -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_copy -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_compare -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_index_build help’ got 0 exit code
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_index_build -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_ls -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_dump -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_set -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_get -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_copy -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_compare -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_index_build help’ got 0 exit code
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_index_build -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_get -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_compare -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_copy -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_dump -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_filter -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/gts_ls -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_dump -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_ls -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_compare -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_get -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_filter -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/metar_copy -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/grib_to_netcdf -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/codes_bufr_filter -V’ and found version 2.7.3
- ran ‘/nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3/bin/bufr_filter -V’ and found version 2.7.3
- found 2.7.3 with grep in /nix/store/i6m5cl0plmsnll3n90h88vcnjc269vh9-eccodes-2.7.3
- directory tree listing: https://gist.github.com/f485bc3b3d6105246360c970ac7462e1
---
 pkgs/development/libraries/eccodes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 49dcb31c0478..a453a70dcad7 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib; 
 stdenv.mkDerivation rec {
   name = "eccodes-${version}";
-  version = "2.7.0";
+  version = "2.7.3";
 
   src = fetchurl {
     url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "0slfim64wdyd97nwv7ry0xwhiarphl93ij2v19c8a1c0dz7ld3qi";
+    sha256 = "1nvip0cmbhzmgzyi65qw8406p460alw1842dw2r4nq1lpcyi9avg";
   };
 
   nativeBuildInputs = [ cmake ];

From 64c2e058e678303ca8b23c68f5011b6dda9dc319 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 3 Apr 2018 16:45:43 -0500
Subject: [PATCH 0330/3370] mesa, libglvnd, xorg: disable tls w/musl

---
 pkgs/development/libraries/libglvnd/default.nix | 3 +++
 pkgs/development/libraries/mesa/default.nix     | 3 ++-
 pkgs/servers/x11/xorg/overrides.nix             | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix
index 4bc1d1addcfb..7e1a2b549681 100644
--- a/pkgs/development/libraries/libglvnd/default.nix
+++ b/pkgs/development/libraries/libglvnd/default.nix
@@ -22,6 +22,9 @@ in stdenv.mkDerivation rec {
     "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
   ];
 
+  # Indirectly: https://bugs.freedesktop.org/show_bug.cgi?id=35268
+  configureFlags  = stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-tls";
+
   # Upstream patch fixing use of libdl, should be in next release.
   patches = [
     (fetchpatch {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e77a4e1414e9..a3c03c4f2e53 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -125,7 +125,8 @@ let self = stdenv.mkDerivation {
     "--enable-gles1"
     "--enable-gles2"
     "--enable-glx"
-    "--enable-glx-tls"
+    # https://bugs.freedesktop.org/show_bug.cgi?id=35268
+    (enableFeature (!stdenv.hostPlatform.isMusl) "glx-tls")
     "--enable-gallium-osmesa" # used by wine
     "--enable-llvm"
     "--enable-egl"
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 55eb54622d51..5efa4bfcfd5d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -512,6 +512,8 @@ in
           "--with-xkb-path=${xorg.xkeyboardconfig}/share/X11/xkb"
           "--with-xkb-output=$out/share/X11/xkb/compiled"
           "--enable-glamor"
+        ] ++ lib.optionals stdenv.hostPlatform.isMusl [
+          "--disable-tls"
         ];
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it

From 092a4fff400a06d2b82b8fb9722bcc05c9e89566 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 23 Apr 2018 13:56:08 -0500
Subject: [PATCH 0331/3370] tcp-wrappers: rename conflicting variable instead
 of clearing it

---
 pkgs/os-specific/linux/tcp-wrappers/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 7da4e39ca6c0..667189009ccb 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -20,11 +20,14 @@ in stdenv.mkDerivation rec {
   prePatch = ''
     tar -xaf $debian
     patches="$(cat debian/patches/series | sed 's,^,debian/patches/,') $patches"
+
+    substituteInPlace Makefile --replace STRINGS STRINGDEFS
+    substituteInPlace debian/patches/13_shlib_weaksym --replace STRINGS STRINGDEFS
   '';
 
   buildInputs = [ libnsl ];
 
-  makeFlags = [ "STRINGS=" "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
+  makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
 
   installPhase = ''
     mkdir -p "$out/bin"

From 40be5dd2df4e57237a44fee596e8c2df232686d2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 23 Apr 2018 13:47:32 -0500
Subject: [PATCH 0332/3370] tcp-wrappers: patch up crufty code, fix w/musl

---
 .../linux/tcp-wrappers/cdecls.patch           |  31 ++
 .../linux/tcp-wrappers/default.nix            |   8 +
 .../tcp-wrappers-7.6-headers.patch            | 295 ++++++++++++++++++
 3 files changed, 334 insertions(+)
 create mode 100644 pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
 create mode 100644 pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch

diff --git a/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch b/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
new file mode 100644
index 000000000000..eee640e8a824
--- /dev/null
+++ b/pkgs/os-specific/linux/tcp-wrappers/cdecls.patch
@@ -0,0 +1,31 @@
+__BEGIN_DECLS/__END_DECLS are BSD specific and not defined in musl
+glibc and uclibc had sys/cdefs.h doing it.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: tcp_wrappers_7.6/tcpd.h
+===================================================================
+--- tcp_wrappers_7.6.orig/tcpd.h
++++ tcp_wrappers_7.6/tcpd.h
+@@ -11,7 +11,9 @@
+ #include <netinet/in.h>
+ #include <stdio.h>
+ 
+-__BEGIN_DECLS
++#ifdef __cplusplus
++extern "C" {
++#endif
+ 
+ /* Structure to describe one communications endpoint. */
+ 
+@@ -252,6 +254,8 @@ extern char *fix_strtok();
+ extern char *my_strtok();
+ #endif
+ 
+-__END_DECLS
++#ifdef __cplusplus
++}
++#endif
+ 
+ #endif
diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index 667189009ccb..e3aae30babca 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -25,6 +25,14 @@ in stdenv.mkDerivation rec {
     substituteInPlace debian/patches/13_shlib_weaksym --replace STRINGS STRINGDEFS
   '';
 
+  # Fix __BEGIN_DECLS usage (even if it wasn't non-standard, this doesn't include sys/cdefs.h)
+  patches = [ ./cdecls.patch ];
+
+  postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    substituteInPlace Makefile \
+      --replace '-DNETGROUP' '-DUSE_GETDOMAIN'
+  '';
+
   buildInputs = [ libnsl ];
 
   makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
diff --git a/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch b/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch
new file mode 100644
index 000000000000..328a4a102618
--- /dev/null
+++ b/pkgs/os-specific/linux/tcp-wrappers/tcp-wrappers-7.6-headers.patch
@@ -0,0 +1,295 @@
+--- a/options.c
++++ b/options.c
+@@ -34,6 +34,8 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+--- a/safe_finger.c
++++ b/safe_finger.c
+@@ -20,6 +20,11 @@
+ 
+ /* System libraries */
+ 
++#include <unistd.h>
++#include <fcntl.h>
++#include <stdlib.h>
++#include <sys/wait.h>
++#include <grp.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+@@ -27,7 +31,7 @@
+ #include <ctype.h>
+ #include <pwd.h>
+ 
+-extern void exit();
++int pipe_stdin(char **argv);
+ 
+ /* Local stuff */
+ 
+--- a/scaffold.c
++++ b/scaffold.c
+@@ -10,6 +10,7 @@
+ 
+ /* System libraries. */
+ 
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+@@ -27,7 +27,4 @@
+ #endif
+ 
+-#ifndef INET6
+-extern char *malloc();
+-#endif
+ 
+ /* Application-specific. */
+--- a/shell_cmd.c
++++ b/shell_cmd.c
+@@ -14,6 +14,10 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
++#include <fcntl.h>
++#include <sys/wait.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <signal.h>
+@@ -25,8 +25,6 @@
+ #include <syslog.h>
+ #include <string.h>
+ 
+-extern void exit();
+-
+ /* Local stuff. */
+ 
+ #include "tcpd.h"
+--- a/tcpdchk.c
++++ b/tcpdchk.c
+@@ -20,6 +20,8 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #ifdef INET6
+@@ -35,10 +36,7 @@
+ #include <netdb.h>
+ #include <string.h>
+ 
+-extern int errno;
+-extern void exit();
+-extern int optind;
+-extern char *optarg;
++int cidr_mask_addr(char *str);
+ 
+ #ifndef INADDR_NONE
+ #define INADDR_NONE     (-1)		/* XXX should be 0xffffffff */
+--- a/clean_exit.c
++++ b/clean_exit.c
+@@ -13,8 +13,8 @@
+ #endif
+ 
+ #include <stdio.h>
+-
+-extern void exit();
++#include <unistd.h>
++#include <stdlib.h>
+ 
+ #include "tcpd.h"
+ 
+--- a/hosts_access.c
++++ b/hosts_access.c
+@@ -23,6 +23,7 @@
+ 
+ /* System libraries. */
+ 
++#include <stdlib.h>
+ #include <sys/types.h>
+ #ifdef INT32_T
+     typedef uint32_t u_int32_t;
+@@ -43,8 +44,8 @@
+ #include <netdb.h>
+ #endif
+ 
+-extern char *fgets();
+-extern int errno;
++static int match_pattern_ylo(const char *s, const char *pattern);
++int cidr_mask_addr(char *str);
+ 
+ #ifndef	INADDR_NONE
+ #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
+--- a/inetcf.c
++++ b/inetcf.c
+@@ -9,15 +9,14 @@
+ static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
+ #endif
+ 
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+ 
+-extern int errno;
+-extern void exit();
+-
++#include "scaffold.h"
+ #include "tcpd.h"
+ #include "inetcf.h"
+ 
+--- a/percent_x.c
++++ b/percent_x.c
+@@ -16,12 +16,12 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <string.h>
+ 
+-extern void exit();
+-
+ /* Local stuff. */
+ 
+ #include "tcpd.h"
+--- a/rfc931.c
++++ b/rfc931.c
+@@ -15,6 +15,7 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <sys/types.h>
+--- a/tcpd.c
++++ b/tcpd.c
+@@ -16,6 +16,7 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <sys/stat.h>
+@@ -39,6 +39,8 @@
+ #include "patchlevel.h"
+ #include "tcpd.h"
+ 
++void fix_options(struct request_info *request);
++
+ int     allow_severity = SEVERITY;	/* run-time adjustable */
+ int     deny_severity = LOG_WARNING;	/* ditto */
+ 
+--- a/tcpdmatch.c
++++ b/tcpdmatch.c
+@@ -19,6 +19,8 @@
+ 
+ /* System libraries. */
+ 
++#include <unistd.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+@@ -30,9 +32,6 @@
+ #include <setjmp.h>
+ #include <string.h>
+ 
+-extern void exit();
+-extern int optind;
+-extern char *optarg;
+ 
+ #ifndef	INADDR_NONE
+ #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
+--- a/update.c
++++ b/update.c
+@@ -19,6 +19,7 @@
+ 
+ /* System libraries */
+ 
++#include <unistd.h>
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <string.h>
+--- a/misc.c
++++ b/misc.c
+@@ -14,11 +14,10 @@
+ #include <arpa/inet.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "tcpd.h"
+ 
+-extern char *fgets();
+-
+ #ifndef	INADDR_NONE
+ #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
+ #endif
+--- a/fix_options.c
++++ b/fix_options.c
+@@ -32,6 +32,7 @@
+ 
+ /* fix_options - get rid of IP-level socket options */
+ 
++void
+ fix_options(request)
+ struct request_info *request;
+ {
+@@ -38,11 +38,8 @@
+ #ifdef IP_OPTIONS
+     unsigned char optbuf[BUFFER_SIZE / 3], *cp;
+     char    lbuf[BUFFER_SIZE], *lp;
+-#ifdef __GLIBC__
+-    size_t  optsize = sizeof(optbuf), ipproto;
+-#else
+-    int     optsize = sizeof(optbuf), ipproto;
+-#endif
++    socklen_t optsize = sizeof(optbuf);
++    int ipproto;
+     struct protoent *ip;
+     int     fd = request->fd;
+     unsigned int opt;
+--- a/socket.c
++++ b/socket.c
+@@ -95,11 +95,7 @@
+     static struct sockaddr_in client;
+     static struct sockaddr_in server;
+ #endif
+-#ifdef __GLIBC__
+-    size_t  len;
+-#else
+-    int     len;
+-#endif
++    socklen_t len;
+     char    buf[BUFSIZ];
+     int     fd = request->fd;
+ 
+@@ -430,11 +426,7 @@
+ #else
+     struct sockaddr_in sin;
+ #endif
+-#ifdef __GLIBC__
+-    size_t  size = sizeof(sin);
+-#else
+-    int     size = sizeof(sin);
+-#endif
++    socklen_t size;
+ 
+     /*
+      * Eat up the not-yet received datagram. Some systems insist on a

From d6a6dcc1f8a2ace2fefce826886f584c92514c37 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 22 Apr 2018 22:25:35 -0500
Subject: [PATCH 0333/3370] libnfsidmap: add missing include, fix w/musl

---
 pkgs/development/libraries/libnfsidmap/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libnfsidmap/default.nix b/pkgs/development/libraries/libnfsidmap/default.nix
index 74562ebe1326..ce21cda4a5d4 100644
--- a/pkgs/development/libraries/libnfsidmap/default.nix
+++ b/pkgs/development/libraries/libnfsidmap/default.nix
@@ -2,12 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "libnfsidmap-0.25";
-  
+
   src = fetchurl {
     url = "http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${name}.tar.gz";
     sha256 = "1kzgwxzh83qi97rblcm9qj80cdvnv8kml2plz0q103j0hifj8vb5";
   };
 
+  postPatch = ''
+    sed -i '1i#include <sys/types.h>' cfg.h
+  '';
+
   preConfigure =
     ''
       configureFlags="--with-pluginpath=$out/lib/libnfsidmap"

From 85161629c5239f70db8711d9190795edc0264c51 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 15:33:02 -0700
Subject: [PATCH 0334/3370] baresip: 0.5.8 -> 0.5.9

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/baresip/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.5.9 with grep in /nix/store/qh69vw5jdwnw82vb6gkwz4f0k8gpjjry-baresip-0.5.9
- directory tree listing: https://gist.github.com/f67689bcf18570ad0408e54fa06db37c
---
 .../networking/instant-messengers/baresip/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 225d622c69f9..538e9a3786be 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
-  version = "0.5.8";
+  version = "0.5.9";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "0qk6y83mm7cz4j66d7zy72l7890k7ifqnqbqnjd3bjfn1yjivwfr";
+    sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [zlib openssl libre librem

From b5bfd8a173175d7a36e4399db3dde4e0e4cb4408 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 15:35:46 -0700
Subject: [PATCH 0335/3370] appstream-glib: 0.7.7 -> 0.7.8

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/appstream-glib/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.7.8 with grep in /nix/store/52vkj80m85n3jhzbqhw5abxdrqqac2yk-appstream-glib-0.7.8
- directory tree listing: https://gist.github.com/c3d5906e2b4ff1a38510f114a6c58819
---
 pkgs/development/libraries/appstream-glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 2499a424c85c..6ad6b158826f 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -4,7 +4,7 @@
 , libuuid, json-glib, meson, gperf, ninja
 }:
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.7.7";
+  name = "appstream-glib-0.7.8";
 
   outputs = [ "out" "dev" "man" "installedTests" ];
   outputBin = "dev";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "127m5ds355i1vfvmn9nd4zqqnqm16jpqcn4p2p2pvn7i4wqxra40";
+    sha256 = "10hcl3sl3g8ajg9mssq3g4dbzz0d4b2ybimrcq71cpycqrqhilhx";
   };
 
   nativeBuildInputs = [

From 296bc1e56975c6514d6dbbb16e721aad31091ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Apr 2018 23:39:08 +0100
Subject: [PATCH 0336/3370] dino: 2018-03-10 -> 2018-04-19

---
 .../networking/instant-messengers/dino/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index fd253c389a27..46b82f05c90a 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2018-03-10";
+  name = "dino-unstable-2018-04-19";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "4ccdc1d0920a93b313d81b4014b6f45efb49b1fe";
-    sha256 = "0d9698zi09s107zva6cgip7xxmdby0zfmqvka4n0khxrsnii5awq";
+    rev = "e80da806022d8aaa32f77f3c7f0333cc1c80829b";
+    sha256 = "04z4k1s4ck6vmbzlbpiw096ny0wpj4zi3cd0iv9vb2iwdj22gib";
     fetchSubmodules = true;
   };
 

From cf68bb33cb797d4e6802ef5f3e6b68715fca1e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 24 Apr 2018 23:44:32 +0100
Subject: [PATCH 0337/3370] dino: fix checksum

---
 .../applications/networking/instant-messengers/dino/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 46b82f05c90a..32808f720bf1 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "dino";
     repo = "dino";
     rev = "e80da806022d8aaa32f77f3c7f0333cc1c80829b";
-    sha256 = "04z4k1s4ck6vmbzlbpiw096ny0wpj4zi3cd0iv9vb2iwdj22gib";
+    sha256 = "04z4k1s4ck6vmbzlbpiw096ny0wpj4zi3cd0iv9vb2iwdj22gibm";
     fetchSubmodules = true;
   };
 

From b26ae506a94026d044124d3620a4fe1cdfd568ad Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Tue, 24 Apr 2018 18:53:33 -0400
Subject: [PATCH 0338/3370] git: Set PERL_PATH when building manual

Otherwise the build fails with the perplexing error

    make: *** No rule to make target 'cmd-list.made', needed by 'doc.dep'.  Stop.
    make: Leaving directory '/tmp/nix-build-git-2.16.3.drv-0/git-2.16.3/Documentation'

on NixOS (but not on Debian, where it succeeds, presumably since it picks up the
system perl).
---
 .../version-management/git-and-tools/git/default.nix         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 4e9f2bf16cea..74e88430239d 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,4 +1,5 @@
-{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, python, gettext, cpio
+{ fetchurl, stdenv, buildPackages
+, curl, openssl, zlib, expat, perl, python, gettext, cpio
 , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
 , openssh, pcre2
 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45
@@ -199,7 +200,7 @@ stdenv.mkDerivation {
        '')
 
    + stdenv.lib.optionalString withManual ''# Install man pages and Info manual
-       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cmd-list.made install install-info \
+       make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-info \
          -C Documentation ''
 
    + (if guiSupport then ''

From 1e0d2306fc9f4d59bb5fab8781f1b17f76347820 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 24 Apr 2018 16:02:42 -0700
Subject: [PATCH 0339/3370] armadillo: 8.400.0 -> 8.500.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/armadillo/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 8.500.0 with grep in /nix/store/4b5v6xvxsbdqgwlqnj421wa0cwhdpw4p-armadillo-8.500.0
- directory tree listing: https://gist.github.com/5849376cdd72ab243c8f004589cb24ec
---
 pkgs/development/libraries/armadillo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index a5ca79c0d82e..4c98bbc182c8 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "8.400.0";
+  version = "8.500.0";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "16yxhn904ll48879vmycv84rja28im0mrcfgb03nm7bs8lpvrdjw";
+    sha256 = "1wdvii5sncq3d8dh272s1n79mpcwzz437lyyfwy7gm7vbks6j77m";
   };
 
   nativeBuildInputs = [ cmake ];

From b75b5cdc792970957cf828a95a5340b5f414a6f4 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <eisfreak7@gmail.com>
Date: Wed, 25 Apr 2018 01:23:44 +0200
Subject: [PATCH 0340/3370] pythonPackages.entrypoints: Fix buildInputs
 (#39449)

---
 pkgs/development/python-modules/entrypoints/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix
index c4f5410bc518..9ee0810571ad 100644
--- a/pkgs/development/python-modules/entrypoints/default.nix
+++ b/pkgs/development/python-modules/entrypoints/default.nix
@@ -15,9 +15,9 @@ buildPythonPackage rec {
     sha256 = "d2d587dde06f99545fb13a383d2cd336a8ff1f359c5839ce3a64c917d10c029f";
   };
 
-  checkInputs = [ pytest];
+  checkInputs = [ pytest ];
 
-  propagatedBuildInputs = [] ++ lib.optional (!isPy3k) [ configparser ];
+  propagatedBuildInputs = lib.optional (!isPy3k) configparser;
 
   checkPhase = ''
     py.test tests
@@ -28,4 +28,4 @@ buildPythonPackage rec {
     homepage = https://github.com/takluyver/entrypoints;
     license = lib.licenses.mit;
   };
-}
\ No newline at end of file
+}

From 3e1f698acdef470ba557bbda902a890bdec962e9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 23 Apr 2018 14:24:55 -0500
Subject: [PATCH 0341/3370] nfs-utils: patch to fix w/musl

---
 pkgs/os-specific/linux/nfs-utils/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 904dae55c9cb..359d18690843 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap
+{ stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent, libnfsidmap
 , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers
 , buildEnv
 }:
@@ -39,6 +39,18 @@ in stdenv.mkDerivation rec {
     ]
     ++ lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
 
+  patches = lib.optionals stdenv.hostPlatform.isMusl [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch";
+      sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid";
+    })
+    # http://openwall.com/lists/musl/2015/08/18/10
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/musl-getservbyport.patch";
+      sha256 = "1fqws9dz8n1d9a418c54r11y3w330qgy2652dpwcy96cm44sqyhf";
+    })
+  ];
+
   postPatch =
     ''
       patchShebangs tests

From 734b13a817376f0b96f2e1e7a71034bdbcacbd7c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 18:35:54 -0500
Subject: [PATCH 0342/3370] gst-plugins: fix on Darwin

---
 pkgs/development/libraries/gstreamer/bad/default.nix  | 1 +
 pkgs/development/libraries/gstreamer/good/default.nix | 5 +++++
 pkgs/development/libraries/gstreamer/ugly/default.nix | 9 ++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 73cbaa0f8070..8ebd70921135 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
     '';
     license     = licenses.lgpl2Plus;
     platforms   = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ matthewbauer ];
   };
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 5c10221b27d7..21376ce79c1c 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -6,6 +6,7 @@
 , libsoup, libpulseaudio, libintl
 , darwin, lame, mpg123, twolame
 , gtkSupport ? false, gtk3 ? null
+, ncurses
 }:
 
 assert gtkSupport -> gtk3 != null;
@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
     '';
     license     = licenses.lgpl2Plus;
     platforms   = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ matthewbauer ];
   };
 
   src = fetchurl {
@@ -39,11 +41,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig python meson ninja gettext ];
 
+  NIX_LDFLAGS = "-lncurses";
+
   buildInputs = [
     gst-plugins-base orc bzip2
     libdv libvpx speex flac taglib
     cairo gdk_pixbuf aalib libcaca
     libsoup libshout lame mpg123 twolame libintl
+    ncurses
   ]
   ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
   ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index a5449abb9f7d..004bb0715f26 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, python
 , gst-plugins-base, orc, gettext
 , a52dec, libcdio, libdvdread
-, libmad, libmpeg2, x264, libintl
+, libmad, libmpeg2, x264, libintl, lib
+, darwin
 }:
 
 stdenv.mkDerivation rec {
   name = "gst-plugins-ugly-1.14.0";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Gstreamer Ugly Plugins";
     homepage    = "https://gstreamer.freedesktop.org";
     longDescription = ''
@@ -18,6 +19,7 @@ stdenv.mkDerivation rec {
     '';
     license     = licenses.lgpl2Plus;
     platforms   = platforms.unix;
+    maintainers = with maintainers; [ matthewbauer ];
   };
 
   src = fetchurl {
@@ -34,5 +36,6 @@ stdenv.mkDerivation rec {
     a52dec libcdio libdvdread
     libmad libmpeg2 x264
     libintl
-  ];
+  ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks;
+    [ IOKit CoreFoundation DiskArbitration ]);
 }

From e199143f11db153c1b844320295f9a1e1be4ac83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Wed, 25 Apr 2018 00:37:25 +0200
Subject: [PATCH 0343/3370] matterbridge module: add configPath option as a
 workaround, waiting for nix encryption

---
 .../services/networking/matterbridge.nix      | 82 ++++++++++++-------
 1 file changed, 52 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/services/networking/matterbridge.nix b/nixos/modules/services/networking/matterbridge.nix
index 5526e2ba23ac..e2f478405953 100644
--- a/nixos/modules/services/networking/matterbridge.nix
+++ b/nixos/modules/services/networking/matterbridge.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ options, config, pkgs, lib, ... }:
 
 with lib;
 
@@ -6,7 +6,11 @@ let
 
   cfg = config.services.matterbridge;
 
-  matterbridgeConfToml = pkgs.writeText "matterbridge.toml" (cfg.configFile);
+  matterbridgeConfToml =
+    if cfg.configPath == null then
+      pkgs.writeText "matterbridge.toml" (cfg.configFile)
+    else
+      cfg.configPath;
 
 in
 
@@ -15,17 +19,32 @@ in
     services.matterbridge = {
       enable = mkEnableOption "Matterbridge chat platform bridge";
 
+      configPath = mkOption {
+        type = with types; nullOr str;
+        default = null;
+        example = "/etc/nixos/matterbridge.toml";
+        description = ''
+          The path to the matterbridge configuration file.
+        '';
+      };
+
       configFile = mkOption {
         type = types.str;
         example = ''
-          #WARNING: as this file contains credentials, be sure to set correct file permissions          [irc]
+          # WARNING: as this file contains credentials, do not use this option!
+          # It is kept only for backwards compatibility, and would cause your
+          # credentials to be in the nix-store, thus with the world-readable
+          # permission bits.
+          # Use services.matterbridge.configPath instead.
+
+          [irc]
               [irc.freenode]
               Server="irc.freenode.net:6667"
               Nick="matterbot"
 
           [mattermost]
               [mattermost.work]
-               #do not prefix it wit http:// or https://
+               # Do not prefix it with http:// or https://
                Server="yourmattermostserver.domain"
                Team="yourteam"
                Login="yourlogin"
@@ -44,6 +63,10 @@ in
               channel="off-topic"
         '';
         description = ''
+          WARNING: THIS IS INSECURE, as your password will end up in
+          <filename>/nix/store</filename>, thus publicly readable. Use
+          <literal>services.matterbridge.configPath</literal> instead.
+
           The matterbridge configuration file in the TOML file format.
         '';
       };
@@ -65,32 +88,31 @@ in
     };
   };
 
-  config = mkMerge [
-    (mkIf cfg.enable {
+  config = mkIf cfg.enable {
+    warnings = optional options.services.matterbridge.configFile.isDefined
+      "The option services.matterbridge.configFile is insecure and should be replaced with services.matterbridge.configPath";
 
-      users.extraUsers = mkIf (cfg.user == "matterbridge") [
-        { name = "matterbridge";
-          group = "matterbridge";
-        } ];
-
-      users.extraGroups = mkIf (cfg.group == "matterbridge") [
-        { name = "matterbridge";
-        } ];
-
-      systemd.services.matterbridge = {
-        description = "Matterbridge chat platform bridge";
-        wantedBy = [ "multi-user.target" ];
-        after = [ "network.target" ];
-
-        serviceConfig = {
-          User = cfg.user;
-          Group = cfg.group;
-          ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}";
-          Restart = "always";
-          RestartSec = "10";
-        };
+    users.extraUsers = optional (cfg.user == "matterbridge")
+      { name = "matterbridge";
+        group = "matterbridge";
       };
-    })
-  ];
-}
 
+    users.extraGroups = optional (cfg.group == "matterbridge")
+      { name = "matterbridge";
+      };
+
+    systemd.services.matterbridge = {
+      description = "Matterbridge chat platform bridge";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        ExecStart = "${pkgs.matterbridge.bin}/bin/matterbridge -conf ${matterbridgeConfToml}";
+        Restart = "always";
+        RestartSec = "10";
+      };
+    };
+  };
+}

From 4b2f3971981272b79da7f87b639ca8854a6ea89c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 4 Mar 2018 22:06:08 +0100
Subject: [PATCH 0344/3370] =?UTF-8?q?gdk=5Fpixbuf:=202.36.7=20=E2=86=92=20?=
 =?UTF-8?q?2.36.12?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/gdk-pixbuf/default.nix          | 54 +++++++++++++------
 .../gdk-pixbuf/installed-tests-path.patch     | 13 +++++
 .../gdk-pixbuf/no-mime-sniffing.patch         | 18 +++++++
 3 files changed, 68 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
 create mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 6bfa6bdc2fb9..a3a6f1ff480c 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,40 +1,57 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, gnome3
-, jasper, gobjectIntrospection, doCheck ? false }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
+, jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
 
 let
   pname = "gdk-pixbuf";
-  version = "2.36.7";
-  # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
-  # which apparently requires access to shared-mime-info files during runtime.
+  version = "2.36.12";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
+    sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
   };
 
-  outputs = [ "out" "dev" "devdoc" ];
+  patches = [
+    # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
+    # which requires access to shared-mime-info files during runtime.
+    # For now, we are patching the build script to avoid the dependency.
+    ./no-mime-sniffing.patch
+
+    # Move installed tests to a separate output
+    # They are not usable at the moment, though:
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795527
+    ./installed-tests-path.patch
+  ];
+
+  outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
 
   setupHook = ./setup-hook.sh;
 
-  enableParallelBuilding = true;
-
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 gobjectIntrospection ];
+  buildInputs = [ libX11 ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
+    gtk-doc gobjectIntrospection makeWrapper
+  ];
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  configureFlags = "--with-libjasper --with-x11"
-    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
-    ;
+  mesonFlags = [
+    "-Ddocs=true"
+    "-Djasper=true"
+    "-Dx11=true"
+    "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
+  ];
 
-  # on darwin, tests don't link
-  preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
-    substituteInPlace Makefile --replace "docs tests" "docs"
+  postPatch = ''
+    chmod +x build-aux/* # patchShebangs only applies to executables
+    patchShebangs build-aux
+
+    substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests"
   '';
 
   postInstall =
@@ -42,6 +59,9 @@ stdenv.mkDerivation rec {
     ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+
+      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
+      $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
new file mode 100644
index 000000000000..fb3c04cf80af
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
@@ -0,0 +1,13 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -82,8 +82,8 @@
+   'aero.gif',
+ ]
+ 
+-installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', gdk_pixbuf_api_name)
+-installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', gdk_pixbuf_api_name)
++installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', gdk_pixbuf_api_name)
++installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', gdk_pixbuf_api_name)
+ 
+ install_data(test_data, install_dir: installed_test_bindir)
+ 
diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
new file mode 100644
index 000000000000..9896e25acda1
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
@@ -0,0 +1,18 @@
+--- a/meson.build
++++ b/meson.build
+@@ -186,13 +186,8 @@
+ gmodule_dep = dependency('gmodule-no-export-2.0')
+ gio_dep = dependency('gio-2.0')
+ 
+-# On non-Windows/macOS systems we always required shared-mime-info and GIO
+-if host_system != 'windows' and host_system != 'darwin'
+-  shared_mime_dep = dependency('shared-mime-info')
+-  gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1)
+-else
+-  shared_mime_dep = []
+-endif
++# No MIME sniffing for now
++shared_mime_dep = []
+ 
+ gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ]
+ 

From 49ff3665a5268ff715b52a3ad0f9869de04d9ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 25 Apr 2018 00:49:13 +0100
Subject: [PATCH 0345/3370] alacritty: 2018-03-04 -> 2018-04-1

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

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index a5db33a0bb5a..4a10d68ee4dc 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -32,18 +32,18 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2018-03-04";
+  version = "2018-04-16";
 
   # At the moment we cannot handle git dependencies in buildRustPackage.
   # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
   src = fetchgit {
     url = https://github.com/Mic92/alacritty.git;
     rev = "rev-${version}";
-    sha256 = "0pxnc6r75c7rwnsqc0idi4a60arpgchl1i8yppibhv0px5w11mwa";
+    sha256 = "14qsfaij631pk0gxrhmp594f72v0z7kzymf4hnqv4k5w9xlxciwx";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0q2yy9cldng8znkmhysgrwi43z2x7a8nb1bnxpy9z170q8ds0m0j";
+  cargoSha256 = "0gg28fbx0kisv7hqxgzqhv4z4ikk074djfjlj90nmmi4nddp017p";
 
   nativeBuildInputs = [
     cmake

From 7e33e374db487ed87db316db3b2687f917aa7f90 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 25 Apr 2018 02:04:13 +0200
Subject: [PATCH 0346/3370] =?UTF-8?q?gupnp-tools:=200.8.13=20=E2=86=92=200?=
 =?UTF-8?q?.8.14?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index 1b306bc5e363..4d1796eb2ac9 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "gupnp-tools";
-  version = "0.8.13";
+  version = "0.8.14";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1vbr4iqi7nl7kq982agd3liw10gx67s95idd0pjy5h1jsnwyqgda";
+    sha256 = "1ykybsljjnngj8rsn808a0h37r2jx99c2jbmsb3ihf7l7hmraav8";
   };
 
   nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ];

From 2afd3c901e4d1038ae0ba93bd3765002b997e815 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 15 Apr 2018 00:00:00 +0000
Subject: [PATCH 0347/3370] gcc: prepend `crossNameAddon` instead of appending
 it (like binutils does)

---
 pkgs/development/compilers/gcc/4.8/default.nix | 4 ++--
 pkgs/development/compilers/gcc/4.9/default.nix | 4 ++--
 pkgs/development/compilers/gcc/5/default.nix   | 4 ++--
 pkgs/development/compilers/gcc/6/default.nix   | 4 ++--
 pkgs/development/compilers/gcc/7/default.nix   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 0a6ea59e5ac4..ff2fb0d7ff02 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -170,7 +170,7 @@ let version = "4.8.5";
           "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
 
     bootstrap = targetPlatform == hostPlatform;
 
@@ -180,7 +180,7 @@ in
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
 
 stdenv.mkDerivation ({
-  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+  name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
 
   builder = ../builder.sh;
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 5dfdbd02cbfd..d0729e78e48e 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -164,7 +164,7 @@ let version = "4.9.4";
           "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
 
     bootstrap = targetPlatform == hostPlatform;
 
@@ -174,7 +174,7 @@ in
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
 
 stdenv.mkDerivation ({
-  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+  name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
 
   builder = ../builder.sh;
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e42bb736676d..2990ea1cd4a4 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -168,7 +168,7 @@ let version = "5.5.0";
           "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
 
     bootstrap = targetPlatform == hostPlatform;
 
@@ -178,7 +178,7 @@ in
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
 
 stdenv.mkDerivation ({
-  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+  name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
 
   builder = ../builder.sh;
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index cf71f51627c9..f8708495c82c 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -167,7 +167,7 @@ let version = "6.4.0";
           "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
 
     bootstrap = targetPlatform == hostPlatform;
 
@@ -177,7 +177,7 @@ in
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
 
 stdenv.mkDerivation ({
-  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+  name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
 
   builder = ../builder.sh;
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 0b19aa95effe..74210bdcb6de 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -172,7 +172,7 @@ let version = "7.3.0";
           "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
         ]));
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
-    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+    crossNameAddon = if targetPlatform != hostPlatform then "${targetPlatform.config}${stageNameAddon}-" else "";
 
     bootstrap = targetPlatform == hostPlatform;
 
@@ -182,7 +182,7 @@ in
 assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
 
 stdenv.mkDerivation ({
-  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+  name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
 
   builder = ../builder.sh;
 

From 24600635755cea965bf21b1b1073076d7bfd498a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 25 Apr 2018 00:17:31 +0000
Subject: [PATCH 0348/3370] nixos: installer: cleanup a bit

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 83f8a2586bd3..08923970cd38 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -73,7 +73,8 @@ let
     APPEND ${toString config.boot.loader.grub.memtest86.params}
   '';
 
-  isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry);
+  isolinuxCfg = concatStringsSep "\n"
+    ([ baseIsolinuxCfg ] ++ optional config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry);
 
   # The EFI boot image.
   efiDir = pkgs.runCommand "efi-directory" {} ''

From 3e0a443203acb5c70c4d4686360da4c5820ff8b4 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Apr 2018 19:09:21 -0500
Subject: [PATCH 0349/3370] musl: provide 'iconv' utility occasionally expected
 as part of libiconv

---
 pkgs/os-specific/linux/musl/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 4d1c2cad2e33..a3d09127c085 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -17,6 +17,13 @@ let
     sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71";
   };
 
+  # iconv tool, implemented by musl author:
+  iconv_c = fetchurl {
+    name = "iconv.c";
+    url = "http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f";
+    sha256 = "1yafz6y509zxpa1i830p5463p91g0y70q60z8q054078qrpln8hp";
+  };
+
 in
 stdenv.mkDerivation rec {
   name    = "musl-${version}";
@@ -77,6 +84,9 @@ stdenv.mkDerivation rec {
     moveToOutput lib/musl-gcc.specs $dev
     substituteInPlace $dev/bin/musl-gcc \
       --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs
+
+    # provide 'iconv' utility
+    $CC ${iconv_c} -o $out/bin/iconv
   '' + lib.optionalString useBSDCompatHeaders ''
     install -D ${queue_h} $dev/include/sys/queue.h
     install -D ${cdefs_h} $dev/include/sys/cdefs.h

From de00c0d7fbdbc27fd4a7a5addf5d42d3a90e3181 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Apr 2018 19:31:56 -0500
Subject: [PATCH 0350/3370] musl/iconv: use copy from Alpine for minor touchups
 to error messages

---
 pkgs/os-specific/linux/musl/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index a3d09127c085..0912f427430b 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -17,11 +17,14 @@ let
     sha256 = "14igk6k00bnpfw660qhswagyhvr0gfqg4q55dxvaaq7ikfkrir71";
   };
 
-  # iconv tool, implemented by musl author:
+  # iconv tool, implemented by musl author.
+  # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f
+  # We use copy from Alpine which fixes error messages, see:
+  # https://git.alpinelinux.org/cgit/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f
   iconv_c = fetchurl {
     name = "iconv.c";
-    url = "http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f";
-    sha256 = "1yafz6y509zxpa1i830p5463p91g0y70q60z8q054078qrpln8hp";
+    url = "https://git.alpinelinux.org/cgit/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f";
+    sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp";
   };
 
 in

From 97372a1104fd404c5b21e7cc0e83af0898891013 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Apr 2018 20:19:22 -0500
Subject: [PATCH 0351/3370] git: 2.16.3 -> 2.17.0... again!

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index fe9f3136e58f..7f1b7305836b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.16.3";
+  version = "2.17.0";
   svn = subversionClient.override { perlBindings = perlSupport; };
 in
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
+    sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";

From 6dda53ad223686ae39d8e073f92b129a4aa688c1 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Fri, 13 Apr 2018 23:55:26 +0200
Subject: [PATCH 0352/3370] git: add install checks

(cherry picked from commit f57873f674ebc2f6ae874407aafb98a1350ab525)
---
 .../git-and-tools/git/default.nix             | 69 ++++++++++++++++---
 .../git-and-tools/git/installCheck-path.patch | 12 ++++
 2 files changed, 71 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 7f1b7305836b..21e9a805c108 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -34,12 +34,17 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
+  enableParallelBuilding = true;
+
+  ## Patch
+
   patches = [
     ./docbook2texi.patch
     ./symlinks-in-bin.patch
     ./git-sh-i18n.patch
     ./ssh-path.patch
     ./git-send-email-honor-PATH.patch
+    ./installCheck-path.patch
   ];
 
   postPatch = ''
@@ -47,6 +52,10 @@ stdenv.mkDerivation {
       substituteInPlace "$x" \
         --subst-var-by ssh "${openssh}/bin/ssh"
     done
+
+    # Fix references to gettext introduced by ./git-sh-i18n.patch
+    substituteInPlace git-sh-i18n.sh \
+        --subst-var-by gettext ${gettext}
   '';
 
   nativeBuildInputs = [ gettext perl ]
@@ -58,7 +67,6 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optionals withpcre2 [ pcre2 ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ];
 
-
   # required to support pthread_cancel()
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
               + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
@@ -90,15 +98,17 @@ stdenv.mkDerivation {
     popd
   '';
 
-  # FIXME: "make check" requires Sparse; the Makefile must be tweaked
-  # so that `SPARSE_FLAGS' corresponds to the current architecture...
-  #doCheck = true;
+
+  ## Install
+
+  # WARNING: Do not `rm` or `mv` files from the source tree; use `cp` instead.
+  #          We need many of these files during the installCheckPhase.
 
   installFlags = "NO_INSTALL_HARDLINKS=1";
 
   preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/bin
-    mv $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin
+    cp -a $PWD/contrib/credential/osxkeychain/git-credential-osxkeychain $out/bin
   '';
 
   postInstall =
@@ -116,7 +126,7 @@ stdenv.mkDerivation {
 
       # Install contrib stuff.
       mkdir -p $out/share/git
-      mv contrib $out/share/git/
+      cp -a contrib $out/share/git/
       ln -s "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/
       mkdir -p $out/share/emacs/site-lisp
       ln -s "$out/share/git/contrib/emacs/"*.el $out/share/emacs/site-lisp/
@@ -149,9 +159,6 @@ stdenv.mkDerivation {
       perl -0777 -i -pe "$SCRIPT" \
         $out/libexec/git-core/git-{sh-setup,filter-branch,merge-octopus,mergetool,quiltimport,request-pull,stash,submodule,subtree,web--browse}
 
-      # Fix references to gettext.
-      substituteInPlace $out/libexec/git-core/git-sh-i18n \
-          --subst-var-by gettext ${gettext}
 
       # Also put git-http-backend into $PATH, so that we can use smart
       # HTTP(s) transports for pushing
@@ -229,7 +236,49 @@ EOF
   '';
 
 
-  enableParallelBuilding = true;
+  ## InstallCheck
+
+  doInstallCheck = true;
+
+  installCheckTarget = "test";
+
+  # see also installCheckFlagsArray
+  installCheckFlags = "DEFAULT_TEST_TARGET=prove";
+
+  preInstallCheck = ''
+    installCheckFlagsArray+=(
+      GIT_PROVE_OPTS="--jobs $NIX_BUILD_CORES --failures --state=failed,save"
+      GIT_TEST_INSTALLED=$out/bin
+      ${stdenv.lib.optionalString (!svnSupport) "NO_SVN_TESTS=y"}
+    )
+
+    function disable_test {
+      local test=$1 pattern=$2
+      if [ $# -eq 1 ]; then
+        mv t/{,skip-}$test.sh || true
+      else
+        sed -i t/$test.sh \
+          -e "/^ *test_expect_.*$pattern/,/^ *' *\$/{s/^/#/}"
+      fi
+    }
+
+    # Shared permissions are forbidden in sandbox builds.
+    disable_test t0001-init shared
+    disable_test t1301-shared-repo
+
+    # Our patched gettext never fallbacks
+    disable_test t0201-gettext-fallbacks
+
+    ${stdenv.lib.optionalString (!sendEmailSupport) ''
+      # Disable sendmail tests
+      disable_test t9001-send-email
+    ''}
+
+    # XXX: I failed to understand why this one fails.
+    # Could someone try to re-enable it on the next release ?
+    disable_test t1700-split-index "null sha1"
+  '';
+
 
   meta = {
     homepage = https://git-scm.com/;
diff --git a/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
new file mode 100644
index 000000000000..8c68fb9f186b
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git/installCheck-path.patch
@@ -0,0 +1,12 @@
+diff --git a/t/test-lib.sh b/t/test-lib.sh
+--- a/t/test-lib.sh
++++ b/t/test-lib.sh
+@@ -923,7 +923,7 @@
+ then
+ 	GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path)  ||
+ 	error "Cannot run git from $GIT_TEST_INSTALLED."
+-	PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH
++	PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$GIT_BUILD_DIR:$PATH
+ 	GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
+ else # normal case, use ../bin-wrappers only unless $with_dashes:
+ 	git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"

From b933157f44b5b432d248fec56151ba0646a00e69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 20 Apr 2018 13:57:36 +0200
Subject: [PATCH 0353/3370] kholidays: Move from kde_applications to
 kde_frameworks

---
 pkgs/applications/kde/default.nix                             | 1 -
 pkgs/development/libraries/kde-frameworks/default.nix         | 1 +
 .../libraries/kde-frameworks}/kholidays.nix                   | 4 ++--
 pkgs/top-level/all-packages.nix                               | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename pkgs/{applications/kde => development/libraries/kde-frameworks}/kholidays.nix (81%)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 36dd1773b39e..451fdbe151f4 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -107,7 +107,6 @@ let
       kget = callPackage ./kget.nix {};
       kgpg = callPackage ./kgpg.nix {};
       khelpcenter = callPackage ./khelpcenter.nix {};
-      kholidays = callPackage ./kholidays.nix {};
       kidentitymanagement = callPackage ./kidentitymanagement.nix {};
       kig = callPackage ./kig.nix {};
       kimap = callPackage ./kimap.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 08eebfd83aee..f54139836b1d 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -129,6 +129,7 @@ let
       syntax-highlighting = callPackage ./syntax-highlighting.nix {};
       threadweaver = callPackage ./threadweaver.nix {};
       kirigami2 = callPackage ./kirigami2.nix {};
+      kholidays = callPackage ./kholidays.nix {};
 
     # TIER 2
       kactivities = callPackage ./kactivities.nix {};
diff --git a/pkgs/applications/kde/kholidays.nix b/pkgs/development/libraries/kde-frameworks/kholidays.nix
similarity index 81%
rename from pkgs/applications/kde/kholidays.nix
rename to pkgs/development/libraries/kde-frameworks/kholidays.nix
index 352bec094922..2ede69e74953 100644
--- a/pkgs/applications/kde/kholidays.nix
+++ b/pkgs/development/libraries/kde-frameworks/kholidays.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, kdepimTeam,
+  mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   qtbase, qtdeclarative, qttools,
 }:
@@ -8,7 +8,7 @@ mkDerivation {
   name = "kholidays";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-    maintainers = kdepimTeam;
+    maintainers = with lib.maintainers; [ bkchr ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ qtbase qtdeclarative qttools ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bc008b7beb6..78b8cff8215c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11153,7 +11153,7 @@ with pkgs;
       kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
       kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
       networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting
-      threadweaver kirigami2;
+      threadweaver kirigami2 kholidays;
 
     ### KDE PLASMA 5
 
@@ -11163,7 +11163,7 @@ with pkgs;
     ### KDE APPLICATIONS
 
     inherit (kdeApplications.override { libsForQt5 = self; })
-      kholidays libkdcraw libkexiv2 libkipi libkomparediff2 libksane;
+      libkdcraw libkexiv2 libkipi libkomparediff2 libksane;
 
     ### LIBRARIES
 

From faed18320652bd9d08d609ec663cbdb3aaec0be3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Fri, 20 Apr 2018 16:24:00 +0200
Subject: [PATCH 0354/3370] kde_applications: 17.12.3 -> 18.04.0

---
 .../kde/akonadi/akonadi-paths.patch           |  121 +-
 pkgs/applications/kde/fetch.sh                |    2 +-
 pkgs/applications/kde/kalarmcal.nix           |    4 +-
 pkgs/applications/kde/konsole.nix             |    4 +-
 pkgs/applications/kde/okular.nix              |    4 +-
 pkgs/applications/kde/spectacle.nix           |    3 +-
 pkgs/applications/kde/srcs.nix                | 1712 +++++++++--------
 7 files changed, 929 insertions(+), 921 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index 91fd934b1ecc..4743c36c44d0 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -1,8 +1,40 @@
-Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
-===================================================================
---- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
-+++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
-@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett
+diff --git a/src/akonadicontrol/agentmanager.cpp b/src/akonadicontrol/agentmanager.cpp
+index 2e9f1acf4..ecc80afdc 100644
+--- a/src/akonadicontrol/agentmanager.cpp
++++ b/src/akonadicontrol/agentmanager.cpp
+@@ -84,12 +84,12 @@ AgentManager::AgentManager(bool verbose, QObject *parent)
+     mStorageController = new Akonadi::ProcessControl;
+     mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
+     connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
+-    mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++    mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ 
+     if (mAgentServerEnabled) {
+         mAgentServer = new Akonadi::ProcessControl;
+         connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
+-        mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++        mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+     }
+ 
+ #ifndef QT_NO_DEBUG
+diff --git a/src/akonadicontrol/agentprocessinstance.cpp b/src/akonadicontrol/agentprocessinstance.cpp
+index be1cc4afb..6d0c1d7e5 100644
+--- a/src/akonadicontrol/agentprocessinstance.cpp
++++ b/src/akonadicontrol/agentprocessinstance.cpp
+@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const AgentType &agentInfo)
+     } else {
+         Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
+         const QStringList arguments = QStringList() << executable << identifier();
+-        const QString agentLauncherExec = Akonadi::StandardDirs::findExecutable(QStringLiteral("akonadi_agent_launcher"));
++        const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
+         mController->start(agentLauncherExec, arguments);
+     }
+     return true;
+diff --git a/src/server/storage/dbconfigmysql.cpp b/src/server/storage/dbconfigmysql.cpp
+index a32e86602..48ea4e52e 100644
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &settings)
      // determine default settings depending on the driver
      QString defaultHostName;
      QString defaultOptions;
@@ -10,7 +42,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      QString defaultCleanShutdownCommand;
  
  #ifndef Q_OS_WIN
-@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -71,25 +70,7 @@ bool DbConfigMysql::init(QSettings &settings)
  #endif
  
      const bool defaultInternalServer = true;
@@ -29,28 +61,28 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
 -                                         << QStringLiteral("/opt/local/lib/mysql5/bin")
 -                                         << QStringLiteral("/opt/mysql/sbin");
 -    if (defaultServerPath.isEmpty()) {
--        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath);
+-        defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("mysqld"), mysqldSearchPath);
 -    }
- 
--    const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
+-
+-    const QString mysqladminPath = QStandardPaths::findExecutable(QStringLiteral("mysqladmin"), mysqldSearchPath);
 +    const QString mysqladminPath = QLatin1String(NIXPKGS_MYSQL_MYSQLADMIN);
      if (!mysqladminPath.isEmpty()) {
  #ifndef Q_OS_WIN
          defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
-@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -99,10 +80,10 @@ bool DbConfigMysql::init(QSettings &settings)
  #endif
      }
  
--    mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);
+-    mMysqlInstallDbPath = QStandardPaths::findExecutable(QStringLiteral("mysql_install_db"), mysqldSearchPath);
 +    mMysqlInstallDbPath = QLatin1String(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
      qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
  
--    mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);
+-    mMysqlCheckPath = QStandardPaths::findExecutable(QStringLiteral("mysqlcheck"), mysqldSearchPath);
 +    mMysqlCheckPath = QLatin1String(NIXPKGS_MYSQL_MYSQLCHECK);
      qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
  
      mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -119,7 +100,7 @@ bool DbConfigMysql::init(QSettings &settings)
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -59,7 +91,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
      settings.endGroup();
  
-@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -129,9 +110,6 @@ bool DbConfigMysql::init(QSettings &settings)
          // intentionally not namespaced as we are the only one in this db instance when using internal mode
          mDatabaseName = QStringLiteral("akonadi");
      }
@@ -69,7 +101,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
  
      qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
  
-@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -140,9 +118,6 @@ bool DbConfigMysql::init(QSettings &settings)
      settings.setValue(QStringLiteral("Name"), mDatabaseName);
      settings.setValue(QStringLiteral("Host"), mHostName);
      settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -79,20 +111,20 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      settings.setValue(QStringLiteral("StartServer"), mInternalServer);
      settings.endGroup();
      settings.sync();
-@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer(
+@@ -196,7 +171,7 @@ bool DbConfigMysql::startInternalServer()
  #endif
  
      // generate config file
--    const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
+-    const QString globalConfig = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-global.conf"));
 +    const QString globalConfig = QLatin1String(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
-     const QString localConfig  = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));
+     const QString localConfig  = StandardDirs::locateResourceFile("config", QStringLiteral("mysql-local.conf"));
      const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
      if (globalConfig.isEmpty()) {
-Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
-===================================================================
---- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp
-+++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
-@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings
+diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
+index 60e6272f2..ad7cefbfe 100644
+--- a/src/server/storage/dbconfigpostgresql.cpp
++++ b/src/server/storage/dbconfigpostgresql.cpp
+@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
      // determine default settings depending on the driver
      QString defaultHostName;
      QString defaultOptions;
@@ -100,7 +132,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
      QString defaultInitDbPath;
      QString defaultPgData;
  
-@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings
+@@ -70,34 +69,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
  
      mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
      if (mInternalServer) {
@@ -130,14 +162,13 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
 -            }
 -        }
 -        postgresSearchPath.append(postgresVersionedSearchPaths);
--
--        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
--        defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
+-        defaultServerPath = QStandardPaths::findExecutable(QStringLiteral("pg_ctl"), postgresSearchPath);
+-        defaultInitDbPath = QStandardPaths::findExecutable(QStringLiteral("initdb"), postgresSearchPath);
 +        defaultInitDbPath = QLatin1String(NIXPKGS_POSTGRES_INITDB);
          defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
          defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
      }
-@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings
+@@ -117,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings &settings)
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -149,7 +180,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
      qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
      mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
      if (mInternalServer && mInitDbPath.isEmpty()) {
-@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings
+@@ -141,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings &settings)
          settings.setValue(QStringLiteral("Port"), mHostPort);
      }
      settings.setValue(QStringLiteral("Options"), mConnectionOptions);
@@ -157,35 +188,3 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
      settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
      settings.setValue(QStringLiteral("StartServer"), mInternalServer);
      settings.endGroup();
-Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
-===================================================================
---- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp
-+++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
-@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
-     } else {
-         Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
-         const QStringList arguments = QStringList() << executable << identifier();
--        const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));
-+        const QString agentLauncherExec = QLatin1String(NIX_OUT "/bin/akonadi_agent_launcher");
-         mController->start(agentLauncherExec, arguments);
-     }
-     return true;
-Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
-===================================================================
---- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp
-+++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
-@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose,
-     mStorageController = new Akonadi::ProcessControl;
-     mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
-     connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
--    mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+    mStorageController->start(QLatin1String(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
- 
-     if (mAgentServerEnabled) {
-         mAgentServer = new Akonadi::ProcessControl;
-         connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
--        mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-+        mAgentServer->start(QLatin1String(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
-     }
- 
- #ifndef QT_NO_DEBUG
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 9ad488f63ab4..a2feeac7cd9f 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.04.0/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/kalarmcal.nix b/pkgs/applications/kde/kalarmcal.nix
index f2fb6f4d8bbd..46832477cc60 100644
--- a/pkgs/applications/kde/kalarmcal.nix
+++ b/pkgs/applications/kde/kalarmcal.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi, kcalcore, kdelibs4support, kholidays, kidentitymanagement,
-  kpimtextedit,
+  kpimtextedit, kcalutils
 }:
 
 mkDerivation {
@@ -13,7 +13,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
-    akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit
+    akonadi kcalcore kdelibs4support kholidays kidentitymanagement kpimtextedit kcalutils
   ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 5269941fa113..2847e312d00a 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -4,7 +4,7 @@
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
   knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
-  kwindowsystem, kxmlgui, qtscript
+  kwindowsystem, kxmlgui, qtscript, knewstuff
 }:
 
 mkDerivation {
@@ -17,7 +17,7 @@ mkDerivation {
   buildInputs = [
     kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
     kguiaddons ki18n kiconthemes kinit kio knotifications knotifyconfig kparts kpty
-    kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
+    kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript knewstuff
   ];
   propagatedUserEnvPkgs = [ (lib.getBin kinit) ];
 }
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 5f6f28c95b08..39fb232b3421 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -5,7 +5,7 @@
   kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdegraphics-mobipocket, kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet,
   kwindowsystem, libkexiv2, libspectre, libzip, phonon, poppler, qca-qt5,
-  qtdeclarative, qtsvg, threadweaver
+  qtdeclarative, qtsvg, threadweaver, kcrash
 }:
 
 mkDerivation {
@@ -16,7 +16,7 @@ mkDerivation {
     kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdegraphics-mobipocket kiconthemes kjs khtml kio kparts kpty kwallet
     kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5
-    qtdeclarative qtsvg threadweaver
+    qtdeclarative qtsvg threadweaver kcrash
   ] ++ lib.optional (!stdenv.isAarch64) chmlib;
   meta = with lib; {
     homepage = http://www.kde.org;
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 6deec6aaabb4..f036e8cf632c 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -4,7 +4,7 @@
   ki18n, xcb-util-cursor,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
-  qtx11extras
+  qtx11extras, knewstuff
 }:
 
 mkDerivation {
@@ -14,6 +14,7 @@ mkDerivation {
   buildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
     kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor
+    knewstuff
   ];
   propagatedUserEnvPkgs = [ kipi-plugins libkipi ];
 }
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index d61784805e45..36c18a3f9979 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1691 +3,1699 @@
 
 {
   akonadi = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz";
-      sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi";
-      name = "akonadi-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadi-18.04.0.tar.xz";
+      sha256 = "1scbc6k2w23qmw4qa147ji7r6p88b97yi9wr46xlshgcn2kj684d";
+      name = "akonadi-18.04.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz";
-      sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a";
-      name = "akonadi-calendar-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-18.04.0.tar.xz";
+      sha256 = "09fk8n69f83ygwfsdjx4mv9hwqpifpv9nbdnl19pjgw2ffp99rna";
+      name = "akonadi-calendar-18.04.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz";
-      sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9";
-      name = "akonadi-calendar-tools-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz";
+      sha256 = "1b10kybjj803qwsz74dhism6q7q0lmslqvsb8b9ma8wqk9ajs33f";
+      name = "akonadi-calendar-tools-18.04.0.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz";
-      sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b";
-      name = "akonadiconsole-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadiconsole-18.04.0.tar.xz";
+      sha256 = "053w5ywm8wlv7ssbvyq0z36jsir9mk0ywlqb0ybnlbvr5dawxnnz";
+      name = "akonadiconsole-18.04.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz";
-      sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v";
-      name = "akonadi-contacts-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadi-contacts-18.04.0.tar.xz";
+      sha256 = "01cfxia8vnwizzavk1vbrxbszsyg1sa3qbz79fab7iw8380zqdm2";
+      name = "akonadi-contacts-18.04.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz";
-      sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4";
-      name = "akonadi-import-wizard-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadi-import-wizard-18.04.0.tar.xz";
+      sha256 = "123gaxs5zi5b8x1ripr8ldjipx6rpmr3f51mgv40ibx1h967in19";
+      name = "akonadi-import-wizard-18.04.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz";
-      sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2";
-      name = "akonadi-mime-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadi-mime-18.04.0.tar.xz";
+      sha256 = "14xgi5saylbp19gg0lnqpasz5x335wz6dnmpfsicz0j5452yfznw";
+      name = "akonadi-mime-18.04.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz";
-      sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g";
-      name = "akonadi-notes-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadi-notes-18.04.0.tar.xz";
+      sha256 = "0ahr185jjyh68qf57vaja6c867rm0iy8jp78g4nmzf3dc6y7r01v";
+      name = "akonadi-notes-18.04.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz";
-      sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x";
-      name = "akonadi-search-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akonadi-search-18.04.0.tar.xz";
+      sha256 = "1jn23rr9yah2c4cccbkcvxn4rr6p0q4327b0kwjqzag4lkwd2fy0";
+      name = "akonadi-search-18.04.0.tar.xz";
     };
   };
   akregator = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz";
-      sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp";
-      name = "akregator-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/akregator-18.04.0.tar.xz";
+      sha256 = "10hid155gszwh7gxp4pqbcfch6hrf0bsikj8ah2fvdgii96dn9gc";
+      name = "akregator-18.04.0.tar.xz";
     };
   };
   analitza = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz";
-      sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw";
-      name = "analitza-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/analitza-18.04.0.tar.xz";
+      sha256 = "1yx18mbxvkswpn120rhi092l5wz6s60194q076wdgimx71ngn2v2";
+      name = "analitza-18.04.0.tar.xz";
     };
   };
   ark = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz";
-      sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi";
-      name = "ark-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ark-18.04.0.tar.xz";
+      sha256 = "19bh71j5dvz80mz9xff4ygd0qdvjwsihyx5cb5ay6a2gdf1fhm12";
+      name = "ark-18.04.0.tar.xz";
     };
   };
   artikulate = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz";
-      sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx";
-      name = "artikulate-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/artikulate-18.04.0.tar.xz";
+      sha256 = "1fqv71przn3yfv4dk511bh5bd0cdmwkixwcg17r037nmj3z0xdhg";
+      name = "artikulate-18.04.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz";
-      sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26";
-      name = "audiocd-kio-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/audiocd-kio-18.04.0.tar.xz";
+      sha256 = "0rf8gk8wymk6lff5g4ivx5lfl31rml1ag40fq78nrvnw0sxkm2b1";
+      name = "audiocd-kio-18.04.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz";
-      sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h";
-      name = "baloo-widgets-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/baloo-widgets-18.04.0.tar.xz";
+      sha256 = "1y1wxgwyjdarw6sj7mrsqgljh2fib0vcwwd0nzbnn8ys1v8gqyxj";
+      name = "baloo-widgets-18.04.0.tar.xz";
     };
   };
   blinken = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz";
-      sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0";
-      name = "blinken-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/blinken-18.04.0.tar.xz";
+      sha256 = "19chf9d9d537a5daqca1i4a58gmxz98x4i5palqs3635w1655ln9";
+      name = "blinken-18.04.0.tar.xz";
     };
   };
   bomber = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz";
-      sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s";
-      name = "bomber-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/bomber-18.04.0.tar.xz";
+      sha256 = "1vzqmjkxlw2v63f49ix63p6ypjgg31j8r0rzmq8m41262m3pp0sn";
+      name = "bomber-18.04.0.tar.xz";
     };
   };
   bovo = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz";
-      sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9";
-      name = "bovo-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/bovo-18.04.0.tar.xz";
+      sha256 = "1p4s7kjrjndcqkrkk3y7dqvyfdrn1yy5id3z3wj06ciwpygvv500";
+      name = "bovo-18.04.0.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz";
-      sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84";
-      name = "calendarsupport-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/calendarsupport-18.04.0.tar.xz";
+      sha256 = "0hd1pbqjd75d8fm86b358xd8dni019b2190ly2r3armanjcmdc4r";
+      name = "calendarsupport-18.04.0.tar.xz";
     };
   };
   cantor = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz";
-      sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w";
-      name = "cantor-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/cantor-18.04.0.tar.xz";
+      sha256 = "1zkpa0ihkylzdf5wlywdvnf34dk21nj5cyczjyh9x5psbr6q0151";
+      name = "cantor-18.04.0.tar.xz";
     };
   };
   cervisia = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz";
-      sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr";
-      name = "cervisia-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/cervisia-18.04.0.tar.xz";
+      sha256 = "1ji8i0k6rzmgshpgpk613vkn6kvdwb0ns32cp19j0bd5ljr701wq";
+      name = "cervisia-18.04.0.tar.xz";
     };
   };
   dolphin = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz";
-      sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20";
-      name = "dolphin-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz";
+      sha256 = "0lvdpa3mq6mhfl97a4q1wwg22zccwjf7ja1mbz1dlbjfnck8l1mm";
+      name = "dolphin-18.04.0.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz";
-      sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf";
-      name = "dolphin-plugins-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/dolphin-plugins-18.04.0.tar.xz";
+      sha256 = "10kdf2h8i1jnbsnx9j4c8zs6ryakinhxrggrid038xqgxm4fyxcq";
+      name = "dolphin-plugins-18.04.0.tar.xz";
     };
   };
   dragon = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz";
-      sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4";
-      name = "dragon-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/dragon-18.04.0.tar.xz";
+      sha256 = "0maxlhac9znqsm7qf3c9g7vlramivy63wd8c9aj64c78jqj6l54w";
+      name = "dragon-18.04.0.tar.xz";
     };
   };
   eventviews = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz";
-      sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc";
-      name = "eventviews-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/eventviews-18.04.0.tar.xz";
+      sha256 = "0ai0259ygriza057dn3l6kfapqc2zdp7prv7qrz0x2akssnvn5f3";
+      name = "eventviews-18.04.0.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz";
-      sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5";
-      name = "ffmpegthumbs-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ffmpegthumbs-18.04.0.tar.xz";
+      sha256 = "08hirsm7gbk51i76kkavv50z3289zvphmkfh26lh6rg123f003i6";
+      name = "ffmpegthumbs-18.04.0.tar.xz";
     };
   };
   filelight = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz";
-      sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf";
-      name = "filelight-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/filelight-18.04.0.tar.xz";
+      sha256 = "1mk46a9x40yj7vfjgprhdhmx151lhkv8zb1i4rks01zjpq8bpa43";
+      name = "filelight-18.04.0.tar.xz";
     };
   };
   granatier = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz";
-      sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x";
-      name = "granatier-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/granatier-18.04.0.tar.xz";
+      sha256 = "1vfp4wqv13qxj5vaiqd6hn07hvmdkyrcdicxn693yprn32gqrn33";
+      name = "granatier-18.04.0.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz";
-      sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4";
-      name = "grantlee-editor-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/grantlee-editor-18.04.0.tar.xz";
+      sha256 = "04mw1mskfaqp7klwc0bdwfm3j365pwkwi0yhp86dggxzyisqbx9h";
+      name = "grantlee-editor-18.04.0.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz";
-      sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx";
-      name = "grantleetheme-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/grantleetheme-18.04.0.tar.xz";
+      sha256 = "1i3axg318skx2ifg8fln5blpyj6qnzb0r7frqb9prm0rawk6cr03";
+      name = "grantleetheme-18.04.0.tar.xz";
     };
   };
   gwenview = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz";
-      sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr";
-      name = "gwenview-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/gwenview-18.04.0.tar.xz";
+      sha256 = "0i87k3f1g9w36rzr60c2xw6r41k7zgnbda51mpd3i8q5mvi8r4z5";
+      name = "gwenview-18.04.0.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz";
-      sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka";
-      name = "incidenceeditor-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/incidenceeditor-18.04.0.tar.xz";
+      sha256 = "1z76lz8h0f6h81xvk690h1pz6i1ca4k2kcdvxxj99xm3fxdw5gi4";
+      name = "incidenceeditor-18.04.0.tar.xz";
     };
   };
   juk = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz";
-      sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6";
-      name = "juk-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/juk-18.04.0.tar.xz";
+      sha256 = "0k0kiksqmnp14y3ymfiwg0amv4wyk2ls4cbdimbwg0mvpyvfnnqa";
+      name = "juk-18.04.0.tar.xz";
     };
   };
   k3b = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz";
-      sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l";
-      name = "k3b-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz";
+      sha256 = "167x2mcxj4zq05brxzvhm157sis13xahkv79i9pzbgjb1zx17s3l";
+      name = "k3b-18.04.0.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz";
-      sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9";
-      name = "kaccounts-integration-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kaccounts-integration-18.04.0.tar.xz";
+      sha256 = "09l1ycy4000mxx86hkqigbg803190r159d2yjsfrs7q5i2jrsl09";
+      name = "kaccounts-integration-18.04.0.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz";
-      sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5";
-      name = "kaccounts-providers-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kaccounts-providers-18.04.0.tar.xz";
+      sha256 = "07ra8pjd89qklvb771wcczbxwll86caz07v43a7fhs3f70nwizia";
+      name = "kaccounts-providers-18.04.0.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz";
-      sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq";
-      name = "kaddressbook-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kaddressbook-18.04.0.tar.xz";
+      sha256 = "0fi5nxhp93i1j4dym2yjsnvbxkqvqlanka3cnzbya4abdzrjd9ir";
+      name = "kaddressbook-18.04.0.tar.xz";
     };
   };
   kajongg = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz";
-      sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa";
-      name = "kajongg-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kajongg-18.04.0.tar.xz";
+      sha256 = "0cbgy6zkjd5yd6ybm9v7gvp2hs99m7m8w2my36fqp1sczghjs7x5";
+      name = "kajongg-18.04.0.tar.xz";
     };
   };
   kalarm = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz";
-      sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7";
-      name = "kalarm-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kalarm-18.04.0.tar.xz";
+      sha256 = "0v4zfv48n116j68cfd34vlgk9jyr1zfc8i36i7gjkaq2x9m80g02";
+      name = "kalarm-18.04.0.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz";
-      sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km";
-      name = "kalarmcal-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kalarmcal-18.04.0.tar.xz";
+      sha256 = "0npvwjzrxyf447xyq4kbx5wh94fv7clfjvikwnla9l0s8xwv9gf7";
+      name = "kalarmcal-18.04.0.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz";
-      sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7";
-      name = "kalgebra-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kalgebra-18.04.0.tar.xz";
+      sha256 = "0qk9dchqlklbxssmhfz38s792nidlfh1bkhrmxh5kvpkjziqg7k6";
+      name = "kalgebra-18.04.0.tar.xz";
     };
   };
   kalzium = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz";
-      sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h";
-      name = "kalzium-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kalzium-18.04.0.tar.xz";
+      sha256 = "02c51r4pqj9iyy2wzrilpzd5z8b1lvbv2mian2qr1psi56l3magv";
+      name = "kalzium-18.04.0.tar.xz";
     };
   };
   kamera = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz";
-      sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9";
-      name = "kamera-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kamera-18.04.0.tar.xz";
+      sha256 = "07p51jjp0lj04gfs1mfbg6k6cdh6ms55yjcag7qhcz32ism0y1vc";
+      name = "kamera-18.04.0.tar.xz";
+    };
+  };
+  kamoso = {
+    version = "18.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/18.04.0/src/kamoso-18.04.0.tar.xz";
+      sha256 = "1d7989jr3g02yh10hmnf8mlqypp35xll52v5q6jjqrzbfcmna7dk";
+      name = "kamoso-18.04.0.tar.xz";
     };
   };
   kanagram = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz";
-      sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k";
-      name = "kanagram-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kanagram-18.04.0.tar.xz";
+      sha256 = "1drz8641ns1c1070a98w2wasyvf5nc6jrpn1pzfqmv9bljxrmyrc";
+      name = "kanagram-18.04.0.tar.xz";
     };
   };
   kapman = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz";
-      sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z";
-      name = "kapman-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kapman-18.04.0.tar.xz";
+      sha256 = "0cpsm35sah99rxy42v5isd90w0j839537jmjck4lg40dx38sdz7m";
+      name = "kapman-18.04.0.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz";
-      sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3";
-      name = "kapptemplate-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kapptemplate-18.04.0.tar.xz";
+      sha256 = "1w61s7bj34vq3s9ca3d6kyv9k43qirnyj4mw73wfpxf6ldx19yzp";
+      name = "kapptemplate-18.04.0.tar.xz";
     };
   };
   kate = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz";
-      sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5";
-      name = "kate-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kate-18.04.0.tar.xz";
+      sha256 = "04kb8ynkq6xwmjbrgfg4zv652p3zgr2127f6sb8sq0j9qy55pvq5";
+      name = "kate-18.04.0.tar.xz";
     };
   };
   katomic = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz";
-      sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl";
-      name = "katomic-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/katomic-18.04.0.tar.xz";
+      sha256 = "119v88k2l1bpmf1gm9njkfv90pv595wwjlzkap06c6rx95scpi0q";
+      name = "katomic-18.04.0.tar.xz";
+    };
+  };
+  kbackup = {
+    version = "18.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/18.04.0/src/kbackup-18.04.0.tar.xz";
+      sha256 = "0vayj48zgblsphwffs6b0xphzair6sywy0ksp6ab9x64n8f1mw5q";
+      name = "kbackup-18.04.0.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz";
-      sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm";
-      name = "kblackbox-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kblackbox-18.04.0.tar.xz";
+      sha256 = "1gpjnic6n4kyh7b6x0mb9162qv223fs6lm7iqh6qxwkixcp06qlx";
+      name = "kblackbox-18.04.0.tar.xz";
     };
   };
   kblocks = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz";
-      sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2";
-      name = "kblocks-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kblocks-18.04.0.tar.xz";
+      sha256 = "1y2h1nwgr67b05ggl2v34jh097mzbljhz9ji332xv4vf2rffwqar";
+      name = "kblocks-18.04.0.tar.xz";
     };
   };
   kblog = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz";
-      sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb";
-      name = "kblog-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kblog-18.04.0.tar.xz";
+      sha256 = "1jnsd6fw3pyip71a2cw65y9yrm4zwczh0770n15jcg5yn5whswgs";
+      name = "kblog-18.04.0.tar.xz";
     };
   };
   kbounce = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz";
-      sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw";
-      name = "kbounce-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kbounce-18.04.0.tar.xz";
+      sha256 = "15926m75gysd6gl2vg7d08y4m0cnfazc9jlyx0cnb8a5nfzh5z21";
+      name = "kbounce-18.04.0.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz";
-      sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c";
-      name = "kbreakout-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kbreakout-18.04.0.tar.xz";
+      sha256 = "0i5pbiimrn2bkq94ggwlx7jhfw4wna5srgffa5531jpn28gq456n";
+      name = "kbreakout-18.04.0.tar.xz";
     };
   };
   kbruch = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz";
-      sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r";
-      name = "kbruch-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kbruch-18.04.0.tar.xz";
+      sha256 = "0s7r0hqy4nyrg0ndrb93pd8akldc5k8xx31m4jc8gi23aqvz5wwk";
+      name = "kbruch-18.04.0.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz";
-      sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd";
-      name = "kcachegrind-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kcachegrind-18.04.0.tar.xz";
+      sha256 = "0f6f8wx0kffhhzjjcdn47m3428jbh95nzajm8vhbs789h69ax2a0";
+      name = "kcachegrind-18.04.0.tar.xz";
     };
   };
   kcalc = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz";
-      sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j";
-      name = "kcalc-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kcalc-18.04.0.tar.xz";
+      sha256 = "03q09q5whg1wfgm30p426hlljignjs0lvwfak2n4ka9ggyk3vc9d";
+      name = "kcalc-18.04.0.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz";
-      sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z";
-      name = "kcalcore-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kcalcore-18.04.0.tar.xz";
+      sha256 = "0g4gm47yniy4f11v6rhs3gp2lk8dcrnw8ajchz88s7spii0riv2m";
+      name = "kcalcore-18.04.0.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz";
-      sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb";
-      name = "kcalutils-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kcalutils-18.04.0.tar.xz";
+      sha256 = "1hh3gd81bfkbyr7qvppk8iaywac77y55rwkpvbvin62snipw6ap1";
+      name = "kcalutils-18.04.0.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz";
-      sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4";
-      name = "kcharselect-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kcharselect-18.04.0.tar.xz";
+      sha256 = "08qgwfz23634wv0fw0rx162rcav5fivsp63srdf4c6my5151nxa9";
+      name = "kcharselect-18.04.0.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz";
-      sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl";
-      name = "kcolorchooser-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kcolorchooser-18.04.0.tar.xz";
+      sha256 = "02lqg4ra2nrkfnlhirs148bsd3b5a1j81s9z84wg11z8havrabfn";
+      name = "kcolorchooser-18.04.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz";
-      sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl";
-      name = "kcontacts-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kcontacts-18.04.0.tar.xz";
+      sha256 = "0ja9xbpvv6klwwg0rzppxhfj2nfb7dydadxw5f9471rzniywn1xb";
+      name = "kcontacts-18.04.0.tar.xz";
     };
   };
   kcron = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz";
-      sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf";
-      name = "kcron-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kcron-18.04.0.tar.xz";
+      sha256 = "0pm532pajm7kbzg7w7azi5qx5xnkc9k5crxbahpw8n32lq34lm18";
+      name = "kcron-18.04.0.tar.xz";
     };
   };
   kdav = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz";
-      sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4";
-      name = "kdav-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdav-18.04.0.tar.xz";
+      sha256 = "159bll2b3anxj5i7i92cqsz7hqm66n5ihlzk1g7waqdc9b429hr2";
+      name = "kdav-18.04.0.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz";
-      sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr";
-      name = "kdebugsettings-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdebugsettings-18.04.0.tar.xz";
+      sha256 = "0fr5a0k9jv8zkzv7fl7r71c2gbd1jj3c0vwpyf5riskymznnrx9g";
+      name = "kdebugsettings-18.04.0.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz";
-      sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554";
-      name = "kde-dev-scripts-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kde-dev-scripts-18.04.0.tar.xz";
+      sha256 = "0nnrzpqgzmfg3msx6vqc8js7yzdpscm9599pr4xs4jl4cx5m8vp8";
+      name = "kde-dev-scripts-18.04.0.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz";
-      sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6";
-      name = "kde-dev-utils-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kde-dev-utils-18.04.0.tar.xz";
+      sha256 = "020dyzf078l91rs7sl1dkdbd08viizinsmbvf1f0kfbkfysccfci";
+      name = "kde-dev-utils-18.04.0.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz";
-      sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr";
-      name = "kdeedu-data-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdeedu-data-18.04.0.tar.xz";
+      sha256 = "0rx9ymyv6x29fwl6hvznvylq6gvw992rg3l8mk4qmmzjs4rbjb5q";
+      name = "kdeedu-data-18.04.0.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz";
-      sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j";
-      name = "kdegraphics-mobipocket-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-mobipocket-18.04.0.tar.xz";
+      sha256 = "01g00k3yqsrahslshybd1azd9w0vgmacfs0yrz5ia93amw4azfhn";
+      name = "kdegraphics-mobipocket-18.04.0.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz";
-      sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4";
-      name = "kdegraphics-thumbnailers-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-thumbnailers-18.04.0.tar.xz";
+      sha256 = "1j04bwp9hc9jc7si6jgg4y61jqic27zj094nv2xpwrxnnaz4y4nh";
+      name = "kdegraphics-thumbnailers-18.04.0.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz";
-      sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh";
-      name = "kdenetwork-filesharing-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdenetwork-filesharing-18.04.0.tar.xz";
+      sha256 = "1qfd7jr171bc4alm139hhdiv9q0x8y7mhrkyb7qspr7a8ki8j5cg";
+      name = "kdenetwork-filesharing-18.04.0.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz";
-      sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp";
-      name = "kdenlive-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdenlive-18.04.0.tar.xz";
+      sha256 = "0v54cisilijdq0hyl38fhz0m7lpvphqjvx046ighcqxbrcg6pgah";
+      name = "kdenlive-18.04.0.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz";
-      sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h";
-      name = "kdepim-addons-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdepim-addons-18.04.0.tar.xz";
+      sha256 = "0rcfx07cvpm22kskwry78wzhglpc0vzxavmjydi24lll9ac12mvc";
+      name = "kdepim-addons-18.04.0.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz";
-      sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24";
-      name = "kdepim-apps-libs-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdepim-apps-libs-18.04.0.tar.xz";
+      sha256 = "1ax5y6cdw7klgxky121mk8ilpm257bc8h90pc89ziha888l39wgz";
+      name = "kdepim-apps-libs-18.04.0.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz";
-      sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn";
-      name = "kdepim-runtime-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdepim-runtime-18.04.0.tar.xz";
+      sha256 = "1pxbrr3rcm3yr7il5abz9r06xvd0j1hsphbskjyphylb3r0xv7mz";
+      name = "kdepim-runtime-18.04.0.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz";
-      sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa";
-      name = "kdesdk-kioslaves-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdesdk-kioslaves-18.04.0.tar.xz";
+      sha256 = "18w55iism0b26m6v1j6qlpa4y8zdc12bbc8hi8rwz6nyra2a4r6h";
+      name = "kdesdk-kioslaves-18.04.0.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz";
-      sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci";
-      name = "kdesdk-thumbnailers-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdesdk-thumbnailers-18.04.0.tar.xz";
+      sha256 = "1gsfn3km6dggnwav17vrbv077dj6xsxixjqrypqf8v5n29vzl72g";
+      name = "kdesdk-thumbnailers-18.04.0.tar.xz";
     };
   };
   kdf = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz";
-      sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp";
-      name = "kdf-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdf-18.04.0.tar.xz";
+      sha256 = "1dxm9q25a9vjja3cx7zd9afx08i84l498sykbnvflf56qq6p9jdv";
+      name = "kdf-18.04.0.tar.xz";
     };
   };
   kdialog = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz";
-      sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4";
-      name = "kdialog-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdialog-18.04.0.tar.xz";
+      sha256 = "0ni5imk1a153j4n923im3rs3g691cwlw3g180wcarrg7iads6icn";
+      name = "kdialog-18.04.0.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz";
-      sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc";
-      name = "kdiamond-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kdiamond-18.04.0.tar.xz";
+      sha256 = "0gzxpk3llgh45w3iwbqsshv4mc4whshv7zwaz8ik4wpp9kc72xj9";
+      name = "kdiamond-18.04.0.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz";
-      sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya";
-      name = "keditbookmarks-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/keditbookmarks-18.04.0.tar.xz";
+      sha256 = "18x6cgligwqqj20q69ins33fvkz3is8a11nkp4zx3kb9q50xsdv7";
+      name = "keditbookmarks-18.04.0.tar.xz";
     };
   };
   kfind = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz";
-      sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s";
-      name = "kfind-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kfind-18.04.0.tar.xz";
+      sha256 = "11wgdyparz26gqxlbnawwmhjr2lkqa1j0qqwmiihs0pxfq6q9arw";
+      name = "kfind-18.04.0.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz";
-      sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p";
-      name = "kfloppy-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kfloppy-18.04.0.tar.xz";
+      sha256 = "039lryi6nk69d054svm0yq5x4yd8pja6f8fx0q2wqpnffrsis5yj";
+      name = "kfloppy-18.04.0.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz";
-      sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw";
-      name = "kfourinline-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kfourinline-18.04.0.tar.xz";
+      sha256 = "101h7y2vmg966h92k6360qc3rrgcwvnhg2lz09yffgwf8mqyp19q";
+      name = "kfourinline-18.04.0.tar.xz";
     };
   };
   kgeography = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz";
-      sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih";
-      name = "kgeography-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kgeography-18.04.0.tar.xz";
+      sha256 = "1syky2a8crh5vrn3419a1rzv37ld0kh9llkmcszm9h8jaqdsiw5v";
+      name = "kgeography-18.04.0.tar.xz";
     };
   };
   kget = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz";
-      sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww";
-      name = "kget-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kget-18.04.0.tar.xz";
+      sha256 = "16dj0w8rkiybhdcgp9cf4r50nh790psx4b9xxqgfnab3b8lq35mx";
+      name = "kget-18.04.0.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz";
-      sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx";
-      name = "kgoldrunner-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kgoldrunner-18.04.0.tar.xz";
+      sha256 = "0ydhz0pm0adwjrbsiqkq6d1cs6l8nw2cj4mxf36144gs333nly1z";
+      name = "kgoldrunner-18.04.0.tar.xz";
     };
   };
   kgpg = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz";
-      sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp";
-      name = "kgpg-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kgpg-18.04.0.tar.xz";
+      sha256 = "1ayyzc7vwdrhp2pc41yh01lkc9n0q4icy05z6yg14si0c7a62s78";
+      name = "kgpg-18.04.0.tar.xz";
     };
   };
   khangman = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz";
-      sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk";
-      name = "khangman-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/khangman-18.04.0.tar.xz";
+      sha256 = "01xmvljp3z4x4aihbz4b22avh10hhnvv8y8jy0nd3pggln4mj15c";
+      name = "khangman-18.04.0.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz";
-      sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n";
-      name = "khelpcenter-17.12.3.tar.xz";
-    };
-  };
-  kholidays = {
-    version = "17.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz";
-      sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di";
-      name = "kholidays-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/khelpcenter-18.04.0.tar.xz";
+      sha256 = "1pc6dd4rn4c636sn8lbkdq2svijrpp4fcgf76infk7dsqrxrgnsr";
+      name = "khelpcenter-18.04.0.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz";
-      sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y";
-      name = "kidentitymanagement-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kidentitymanagement-18.04.0.tar.xz";
+      sha256 = "129a38ajkpzgm2z921riyawlnx70c41ln3z7hvx159x3ghcsacyw";
+      name = "kidentitymanagement-18.04.0.tar.xz";
     };
   };
   kig = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz";
-      sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid";
-      name = "kig-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kig-18.04.0.tar.xz";
+      sha256 = "1djy20lcs50ykb99akhfw873br9q0x72r3pma6mv69dpv5jpk3v3";
+      name = "kig-18.04.0.tar.xz";
     };
   };
   kigo = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz";
-      sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh";
-      name = "kigo-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kigo-18.04.0.tar.xz";
+      sha256 = "0jqkab57z0xhbxf2hcagg5b0pgn2z4dnzirp6ccfybl835nwr4rp";
+      name = "kigo-18.04.0.tar.xz";
     };
   };
   killbots = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz";
-      sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an";
-      name = "killbots-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/killbots-18.04.0.tar.xz";
+      sha256 = "10j82a9yv5v21pp9249nzm42ys104ickwavqys5j43230h0qlyl2";
+      name = "killbots-18.04.0.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz";
-      sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn";
-      name = "kimagemapeditor-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kimagemapeditor-18.04.0.tar.xz";
+      sha256 = "01cy4nfi9gzgyfqb16vsy3b15bgag0g3dz2l9v0d4fijxpf157br";
+      name = "kimagemapeditor-18.04.0.tar.xz";
     };
   };
   kimap = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz";
-      sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw";
-      name = "kimap-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kimap-18.04.0.tar.xz";
+      sha256 = "1l22fzslf0zrr230hq17rfg88ifngfwcc1n0v3fzpxnia4cm68by";
+      name = "kimap-18.04.0.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz";
-      sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks";
-      name = "kio-extras-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kio-extras-18.04.0.tar.xz";
+      sha256 = "15icgvanjhvxi2k9hihadvxnx2jpjp2r3gy89brvdsh8lhj9kzil";
+      name = "kio-extras-18.04.0.tar.xz";
     };
   };
   kiriki = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz";
-      sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q";
-      name = "kiriki-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kiriki-18.04.0.tar.xz";
+      sha256 = "0m98fqnrk1vinkammf5fjkbvj5wwk45v8m4m951nvn0wpzrb0clf";
+      name = "kiriki-18.04.0.tar.xz";
     };
   };
   kiten = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz";
-      sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5";
-      name = "kiten-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kiten-18.04.0.tar.xz";
+      sha256 = "1xk58q89hdpy4fhk8ic2ybf60d0xgwfm6ay1gny4qb6klr5xx7ah";
+      name = "kiten-18.04.0.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz";
-      sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l";
-      name = "kjumpingcube-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kjumpingcube-18.04.0.tar.xz";
+      sha256 = "1j9v6j3yams0azdc27g76x3baz6wcw173lam5r8z0q5f6xayv9zl";
+      name = "kjumpingcube-18.04.0.tar.xz";
     };
   };
   kldap = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz";
-      sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy";
-      name = "kldap-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kldap-18.04.0.tar.xz";
+      sha256 = "1fjh6insnmnl4yk5n11bsp9xrhyzkb7cf3vsbx6yjn13gwg06xm9";
+      name = "kldap-18.04.0.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz";
-      sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd";
-      name = "kleopatra-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kleopatra-18.04.0.tar.xz";
+      sha256 = "1lqqhy0pyv8v9x20if6sjklbmfnjmip4nfm0adp5wh7r3n9c0908";
+      name = "kleopatra-18.04.0.tar.xz";
     };
   };
   klettres = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz";
-      sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0";
-      name = "klettres-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/klettres-18.04.0.tar.xz";
+      sha256 = "0x2vj449dgzlyhyagdcs5f12rd3w025iq5q8qcsml7mnr5vy06n3";
+      name = "klettres-18.04.0.tar.xz";
     };
   };
   klickety = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz";
-      sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8";
-      name = "klickety-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/klickety-18.04.0.tar.xz";
+      sha256 = "1l81xk00bkbxm9fmqjyphf8wijgxp979kfsflvy7zyzga43k64fc";
+      name = "klickety-18.04.0.tar.xz";
     };
   };
   klines = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz";
-      sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0";
-      name = "klines-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/klines-18.04.0.tar.xz";
+      sha256 = "1axp8mv1hxdddw86wsd6dkv7cbzk5b3lswqvwxdbbrpsq8j8vjz1";
+      name = "klines-18.04.0.tar.xz";
     };
   };
   kmag = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz";
-      sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w";
-      name = "kmag-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmag-18.04.0.tar.xz";
+      sha256 = "1yaryycwy5h3pafzsvn4xr96p96j3a3302x6y73i9xm94nz7a60f";
+      name = "kmag-18.04.0.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz";
-      sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a";
-      name = "kmahjongg-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmahjongg-18.04.0.tar.xz";
+      sha256 = "191cl5cnq6q8b3fr22frfwrg0a2bqf9c2x454ab0ysc2qapblfkx";
+      name = "kmahjongg-18.04.0.tar.xz";
     };
   };
   kmail = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz";
-      sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs";
-      name = "kmail-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmail-18.04.0.tar.xz";
+      sha256 = "1faw94imrr30bg155zs4hszfbv9fszywyk1v24d0l03vyh4w0x8r";
+      name = "kmail-18.04.0.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz";
-      sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx";
-      name = "kmail-account-wizard-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmail-account-wizard-18.04.0.tar.xz";
+      sha256 = "0sgasycw0ixh6c04kibyii6f5aygkhwanidnmidhgdnqhgcg31gp";
+      name = "kmail-account-wizard-18.04.0.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz";
-      sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0";
-      name = "kmailtransport-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmailtransport-18.04.0.tar.xz";
+      sha256 = "122zcgz9vlqzmr2xy4msrzg9ajvyjlwcf7g4br7bja42f5nk704f";
+      name = "kmailtransport-18.04.0.tar.xz";
     };
   };
   kmbox = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz";
-      sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm";
-      name = "kmbox-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmbox-18.04.0.tar.xz";
+      sha256 = "0qljbixj2jka8sngavi41jjcssy293acy1d6syjyagad7z5f0d0k";
+      name = "kmbox-18.04.0.tar.xz";
     };
   };
   kmime = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz";
-      sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm";
-      name = "kmime-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmime-18.04.0.tar.xz";
+      sha256 = "03hwvwdkb1176d837hbwm8wqj0bl29fdfzirgrp1yri4vadmhrqx";
+      name = "kmime-18.04.0.tar.xz";
     };
   };
   kmines = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz";
-      sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9";
-      name = "kmines-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmines-18.04.0.tar.xz";
+      sha256 = "0jyrynqqzk5dwwfd05kdzx5lc6cjkbhhp5l8ijyfwdqs63wzj705";
+      name = "kmines-18.04.0.tar.xz";
     };
   };
   kmix = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz";
-      sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp";
-      name = "kmix-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmix-18.04.0.tar.xz";
+      sha256 = "0xq5jd5nrjb95lhc38n0b6kmmdbr2hrnpq8kvdywv6xazhb0h9mg";
+      name = "kmix-18.04.0.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz";
-      sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z";
-      name = "kmousetool-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmousetool-18.04.0.tar.xz";
+      sha256 = "1n36myw2j43mnlawkymyv73l4xkpc5ynqalqka2jigdzqin87gr7";
+      name = "kmousetool-18.04.0.tar.xz";
     };
   };
   kmouth = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz";
-      sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n";
-      name = "kmouth-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmouth-18.04.0.tar.xz";
+      sha256 = "03m4ia8s2qg6pnih6i8df3y2dxc8qcxwcnn7kyjd1ygw8i3gjkyk";
+      name = "kmouth-18.04.0.tar.xz";
     };
   };
   kmplot = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz";
-      sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9";
-      name = "kmplot-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kmplot-18.04.0.tar.xz";
+      sha256 = "1bl0sw58p4qnbka1kss2w3p0w7r91c29hg3h3ljxlarj8yg7z95v";
+      name = "kmplot-18.04.0.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz";
-      sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f";
-      name = "knavalbattle-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/knavalbattle-18.04.0.tar.xz";
+      sha256 = "0hw5syv8csnx1myjdfsd96bxvqcg2c21fpcgmb9dc8gj4nzqqabv";
+      name = "knavalbattle-18.04.0.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz";
-      sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k";
-      name = "knetwalk-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/knetwalk-18.04.0.tar.xz";
+      sha256 = "0r3a9pa9nwhfg5xbp062dsaq8n20mrykfbcp52m9wlln8rwjiz1x";
+      name = "knetwalk-18.04.0.tar.xz";
     };
   };
   knotes = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz";
-      sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3";
-      name = "knotes-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/knotes-18.04.0.tar.xz";
+      sha256 = "1gkz3vrsj9irzyhc1djvmkbikiqxn7bgv913ynax8akbbmlh9xlh";
+      name = "knotes-18.04.0.tar.xz";
     };
   };
   kolf = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz";
-      sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj";
-      name = "kolf-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kolf-18.04.0.tar.xz";
+      sha256 = "0cjvm5xg09wnx5n5hz9w3ckxfyhnwxn423f4hm5c8qwij4gnsfsn";
+      name = "kolf-18.04.0.tar.xz";
     };
   };
   kollision = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz";
-      sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz";
-      name = "kollision-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kollision-18.04.0.tar.xz";
+      sha256 = "03lkrdh11q4vmbc8a5hflsbk2w39ffr96r6rwazkas7svc2hky6i";
+      name = "kollision-18.04.0.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz";
-      sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w";
-      name = "kolourpaint-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kolourpaint-18.04.0.tar.xz";
+      sha256 = "18b01w44bp7hyhxyj5cbfhlmhvcr1bbi1j6i0j62h67sm9fy65vr";
+      name = "kolourpaint-18.04.0.tar.xz";
     };
   };
   kompare = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz";
-      sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl";
-      name = "kompare-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kompare-18.04.0.tar.xz";
+      sha256 = "019z54h9dlcxy7hfzxrh0nh3l2jzc993jhdw4s70h7mf2yddl6zi";
+      name = "kompare-18.04.0.tar.xz";
     };
   };
   konqueror = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz";
-      sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw";
-      name = "konqueror-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/konqueror-18.04.0.tar.xz";
+      sha256 = "0z7b8w47xs2wm13c82fkcf07qd7ikyi67dg8abfnxhvmri4bsxn2";
+      name = "konqueror-18.04.0.tar.xz";
     };
   };
   konquest = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz";
-      sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli";
-      name = "konquest-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/konquest-18.04.0.tar.xz";
+      sha256 = "0344hjkhq5czxi3wl9vfavli79lh7mqhk8qby0hj53xp6mqh7xfx";
+      name = "konquest-18.04.0.tar.xz";
     };
   };
   konsole = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz";
-      sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs";
-      name = "konsole-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/konsole-18.04.0.tar.xz";
+      sha256 = "0r2al3ja1fpkyyq7hrzis9pmkp54idivfmrj71rqk74jfjjjky2k";
+      name = "konsole-18.04.0.tar.xz";
     };
   };
   kontact = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz";
-      sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas";
-      name = "kontact-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kontact-18.04.0.tar.xz";
+      sha256 = "14kpnfa2bl92frz6vssfs1q3065vsgl5bfgrgyvbbpxfviy5ciaz";
+      name = "kontact-18.04.0.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz";
-      sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks";
-      name = "kontactinterface-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kontactinterface-18.04.0.tar.xz";
+      sha256 = "12hmh1wxsxb1n1727qpmarhs83nziy93kb7a8xyahpkky82jn62x";
+      name = "kontactinterface-18.04.0.tar.xz";
+    };
+  };
+  kopete = {
+    version = "18.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/18.04.0/src/kopete-18.04.0.tar.xz";
+      sha256 = "0p22yjpzrgqmdr74pw9pxasb25w9ikdgsrlbcq5yy95il1zppwfl";
+      name = "kopete-18.04.0.tar.xz";
     };
   };
   korganizer = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz";
-      sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40";
-      name = "korganizer-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/korganizer-18.04.0.tar.xz";
+      sha256 = "02vyycpiqdfik2902pk97jz28s4nh2wax129y6n1mdxjjvw15gp2";
+      name = "korganizer-18.04.0.tar.xz";
     };
   };
   kpat = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz";
-      sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh";
-      name = "kpat-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kpat-18.04.0.tar.xz";
+      sha256 = "02s74cwyp3mpdc8xk6hky3p8s3svdwwkrdfbaxbkh6ysywbm7728";
+      name = "kpat-18.04.0.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz";
-      sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c";
-      name = "kpimtextedit-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kpimtextedit-18.04.0.tar.xz";
+      sha256 = "101jj454b4p52yxzcp837075fp3lh3wnkjw8spcfb6k1rjf0ss68";
+      name = "kpimtextedit-18.04.0.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz";
-      sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0";
-      name = "kqtquickcharts-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kqtquickcharts-18.04.0.tar.xz";
+      sha256 = "1ccfgbm1dbrf0nkkpg7qzrpa0sjdv46cvdn7qc86qqqmbb96zij8";
+      name = "kqtquickcharts-18.04.0.tar.xz";
     };
   };
   krdc = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz";
-      sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps";
-      name = "krdc-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/krdc-18.04.0.tar.xz";
+      sha256 = "11nk01vhpqlhgn7b928svvpdn5r9hbrc01248xzqkj16iwrdrqr9";
+      name = "krdc-18.04.0.tar.xz";
     };
   };
   kreversi = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz";
-      sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg";
-      name = "kreversi-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kreversi-18.04.0.tar.xz";
+      sha256 = "1jbvsldl1g1ljl4mzn1l93gi5kb8jrzwqjzfga4dbribif8shmq8";
+      name = "kreversi-18.04.0.tar.xz";
     };
   };
   krfb = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz";
-      sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv";
-      name = "krfb-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/krfb-18.04.0.tar.xz";
+      sha256 = "1aq285jn4k0s9vwy99w2a1wm4nzwzjafz8a0gy47ydi0m29b1rkc";
+      name = "krfb-18.04.0.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz";
-      sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s";
-      name = "kross-interpreters-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kross-interpreters-18.04.0.tar.xz";
+      sha256 = "15cbpq7cs0hnm42c03kyvyshfa10xdsajlbmsixzbmvks34c8b1y";
+      name = "kross-interpreters-18.04.0.tar.xz";
     };
   };
   kruler = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz";
-      sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa";
-      name = "kruler-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kruler-18.04.0.tar.xz";
+      sha256 = "0bm1d8n0v4qg8jaciws247bda7q5nab0i80qlg2xb20lygi2fwwr";
+      name = "kruler-18.04.0.tar.xz";
     };
   };
   kshisen = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz";
-      sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0";
-      name = "kshisen-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kshisen-18.04.0.tar.xz";
+      sha256 = "1m9wa59iz3p2x7zxngp2wqf99ab6p1gai3h0fb4zbqbib98jpmyf";
+      name = "kshisen-18.04.0.tar.xz";
     };
   };
   ksirk = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz";
-      sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz";
-      name = "ksirk-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ksirk-18.04.0.tar.xz";
+      sha256 = "0msw4lkrjj5ihbdg9ibjrk7ddcw933kqhbf6aap5jc4lz0r6y1d8";
+      name = "ksirk-18.04.0.tar.xz";
     };
   };
   ksmtp = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz";
-      sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b";
-      name = "ksmtp-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ksmtp-18.04.0.tar.xz";
+      sha256 = "1r89wm8q4vxaqdd1j8qb84qr7zg1dfb731r7qypilvkcc8z1samn";
+      name = "ksmtp-18.04.0.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz";
-      sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy";
-      name = "ksnakeduel-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ksnakeduel-18.04.0.tar.xz";
+      sha256 = "04lpcp7l4xwnwk073yji84kaw16gi0ybkzlvcg1plpqj6w1y1y8w";
+      name = "ksnakeduel-18.04.0.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz";
-      sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6";
-      name = "kspaceduel-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kspaceduel-18.04.0.tar.xz";
+      sha256 = "04shgk89xfp3z26683mc9g612fmnqg01fp8qah7y8mbac3cv4f5i";
+      name = "kspaceduel-18.04.0.tar.xz";
     };
   };
   ksquares = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz";
-      sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667";
-      name = "ksquares-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ksquares-18.04.0.tar.xz";
+      sha256 = "17siqdj6l2g2rnaswdzipxlxxx8x4q5wb4z2rc12gf08fggxfmgn";
+      name = "ksquares-18.04.0.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz";
-      sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n";
-      name = "ksudoku-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ksudoku-18.04.0.tar.xz";
+      sha256 = "1slmfps0861n8p4rqc1ng4981v1jdyppzr990abadqzf344d3ab3";
+      name = "ksudoku-18.04.0.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz";
-      sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr";
-      name = "ksystemlog-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ksystemlog-18.04.0.tar.xz";
+      sha256 = "164cfzfjya7yg5pzzpxzfr0r1yf6napvibpjs9y784fl4r2qb780";
+      name = "ksystemlog-18.04.0.tar.xz";
     };
   };
   kteatime = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz";
-      sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz";
-      name = "kteatime-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kteatime-18.04.0.tar.xz";
+      sha256 = "0sm4kcq618qp5ihnvcw2zp0frnj21mmjapksy7q63skh9ncjgmj3";
+      name = "kteatime-18.04.0.tar.xz";
     };
   };
   ktimer = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz";
-      sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x";
-      name = "ktimer-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktimer-18.04.0.tar.xz";
+      sha256 = "1mgjgs8j4wfkjq766w9lyc21h3l3cfv5qb5a3x1anc74y1vanksj";
+      name = "ktimer-18.04.0.tar.xz";
     };
   };
   ktnef = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz";
-      sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n";
-      name = "ktnef-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktnef-18.04.0.tar.xz";
+      sha256 = "1rys8l7rmwzv79mwmm97yxfq8gsfz4sh6hf7bjq6zhc9q42n3r36";
+      name = "ktnef-18.04.0.tar.xz";
     };
   };
   ktouch = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz";
-      sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795";
-      name = "ktouch-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktouch-18.04.0.tar.xz";
+      sha256 = "10lwc2gz1gwghz95f1dgdv33n4rwly0f8maslv3hb47cr14c259v";
+      name = "ktouch-18.04.0.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz";
-      sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm";
-      name = "ktp-accounts-kcm-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-accounts-kcm-18.04.0.tar.xz";
+      sha256 = "1arcg0wabjqla5mc773vrbwd2abl5zwhhchf88f1i4krcv2crn3s";
+      name = "ktp-accounts-kcm-18.04.0.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz";
-      sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp";
-      name = "ktp-approver-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-approver-18.04.0.tar.xz";
+      sha256 = "0afgd08x857mi7s5br3m5q41k8rm77p6dnvb3idjsmv0m8324md4";
+      name = "ktp-approver-18.04.0.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz";
-      sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21";
-      name = "ktp-auth-handler-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-auth-handler-18.04.0.tar.xz";
+      sha256 = "1d7s1rqh231k57bygbyzxiz3cs9diqx4x2f7v66awm20la2p804y";
+      name = "ktp-auth-handler-18.04.0.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz";
-      sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m";
-      name = "ktp-call-ui-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-call-ui-18.04.0.tar.xz";
+      sha256 = "1qffsq9nnhzlgmm42vg98g172361zra06wgpa7n8y3pvl9mwlrbm";
+      name = "ktp-call-ui-18.04.0.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz";
-      sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80";
-      name = "ktp-common-internals-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-common-internals-18.04.0.tar.xz";
+      sha256 = "0cvyw7rs8afi7c1dl58jmibzqy1jdnbkjqsxilnlkj5rmplg10av";
+      name = "ktp-common-internals-18.04.0.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz";
-      sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb";
-      name = "ktp-contact-list-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-list-18.04.0.tar.xz";
+      sha256 = "1384rps2wp1qgqq0jj1p9rjkg3gdrsjid87jhdjv95kjxc1a7a1y";
+      name = "ktp-contact-list-18.04.0.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz";
-      sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq";
-      name = "ktp-contact-runner-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-runner-18.04.0.tar.xz";
+      sha256 = "02hr0g619h30hr49rxs5yvwna6skzkvca03p9yy70ib22gzpfxli";
+      name = "ktp-contact-runner-18.04.0.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz";
-      sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj";
-      name = "ktp-desktop-applets-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-desktop-applets-18.04.0.tar.xz";
+      sha256 = "09jfw3sn6yn4znir0rcgwwc5h1zp2vc39y4i7fi1rznhdagwy1ji";
+      name = "ktp-desktop-applets-18.04.0.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz";
-      sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8";
-      name = "ktp-filetransfer-handler-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-filetransfer-handler-18.04.0.tar.xz";
+      sha256 = "1wc72ghl2v6bjrw1pb8h8ajigqhyb53nlhya2cqhdf1banpjv0n5";
+      name = "ktp-filetransfer-handler-18.04.0.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz";
-      sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp";
-      name = "ktp-kded-module-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-kded-module-18.04.0.tar.xz";
+      sha256 = "1845csv2ci5589iws49ma5qrkgs5q6hqb2hzrk6znr6w3d1smbbj";
+      name = "ktp-kded-module-18.04.0.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz";
-      sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch";
-      name = "ktp-send-file-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-send-file-18.04.0.tar.xz";
+      sha256 = "137l6b4dpd78x8z99cpz0sp8f5lbdlvzkd2w742jsiylxchrjr5l";
+      name = "ktp-send-file-18.04.0.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz";
-      sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v";
-      name = "ktp-text-ui-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktp-text-ui-18.04.0.tar.xz";
+      sha256 = "12hhfkjglqbd4qxhl10xczk9ha0j494vjldkg05lhm0l233zr9km";
+      name = "ktp-text-ui-18.04.0.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz";
-      sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4";
-      name = "ktuberling-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/ktuberling-18.04.0.tar.xz";
+      sha256 = "12mrb0a5k5z02mjwdn8vlcwr8jxwp7x2f04wzac749csyn0sj86d";
+      name = "ktuberling-18.04.0.tar.xz";
     };
   };
   kturtle = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz";
-      sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8";
-      name = "kturtle-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kturtle-18.04.0.tar.xz";
+      sha256 = "0vm28xngj52l6fs7sd54wg4fhss131kh6ihs1ibnzi9in0hvga62";
+      name = "kturtle-18.04.0.tar.xz";
     };
   };
   kubrick = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz";
-      sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp";
-      name = "kubrick-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kubrick-18.04.0.tar.xz";
+      sha256 = "0as99qx9vi6zcx61kai7y3ym4vzm8r7ma4p0a2z8rxymps1nk3dy";
+      name = "kubrick-18.04.0.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz";
-      sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1";
-      name = "kwalletmanager-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kwalletmanager-18.04.0.tar.xz";
+      sha256 = "1f4124bm86aqbv36v961jca647vvxrlssq5ydnvi1yfx0saza94q";
+      name = "kwalletmanager-18.04.0.tar.xz";
     };
   };
   kwave = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz";
-      sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng";
-      name = "kwave-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kwave-18.04.0.tar.xz";
+      sha256 = "1bw6lcl95aqcvzp2z31krdaiq0hfhndicynarai58rcg2ngbsm53";
+      name = "kwave-18.04.0.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz";
-      sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx";
-      name = "kwordquiz-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/kwordquiz-18.04.0.tar.xz";
+      sha256 = "1rfr1hc6xkciyx5wknzikf4ml1sgcqj8lflxpksdsg9m5nk7w73y";
+      name = "kwordquiz-18.04.0.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz";
-      sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm";
-      name = "libgravatar-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libgravatar-18.04.0.tar.xz";
+      sha256 = "1wzfvp5acdkpj37bg1hphy0fszvbakzx0azg56zk0h9526h6qrq1";
+      name = "libgravatar-18.04.0.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz";
-      sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi";
-      name = "libkcddb-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkcddb-18.04.0.tar.xz";
+      sha256 = "1967in5041lyjapi3avlns1g7ps8sqvq547gw13snhkjn0dbs1aa";
+      name = "libkcddb-18.04.0.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz";
-      sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v";
-      name = "libkcompactdisc-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkcompactdisc-18.04.0.tar.xz";
+      sha256 = "01c1pmb2v7bd03jdkwdw4l37736ad8igrrwa9cf5jwg6q5ps9xgb";
+      name = "libkcompactdisc-18.04.0.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz";
-      sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc";
-      name = "libkdcraw-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkdcraw-18.04.0.tar.xz";
+      sha256 = "04gc0m4ndkx02yavqmc5xh488rmxw5ppicv902iby0m9ywrjinik";
+      name = "libkdcraw-18.04.0.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz";
-      sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd";
-      name = "libkdegames-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkdegames-18.04.0.tar.xz";
+      sha256 = "09wxdvd2ahhh11ncylh5il5fbx1jx6jpwzp1r18cx5k71fw2idp6";
+      name = "libkdegames-18.04.0.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz";
-      sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q";
-      name = "libkdepim-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkdepim-18.04.0.tar.xz";
+      sha256 = "0m3rlwdy010v4s3157w8jlb6ahcmn4frqxp1ibachpmz6y77gkkq";
+      name = "libkdepim-18.04.0.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz";
-      sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v";
-      name = "libkeduvocdocument-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkeduvocdocument-18.04.0.tar.xz";
+      sha256 = "1g10c955gy0530xypr62x9dp4736s6qwr5afb90nlj8rhnq2zmbw";
+      name = "libkeduvocdocument-18.04.0.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz";
-      sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg";
-      name = "libkexiv2-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkexiv2-18.04.0.tar.xz";
+      sha256 = "11ydba6jdvyvp3j3zzy7gjcmz20zv6nwg07r00xgs34y9n50rhzy";
+      name = "libkexiv2-18.04.0.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz";
-      sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y";
-      name = "libkgapi-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkgapi-18.04.0.tar.xz";
+      sha256 = "0bp7y1wjajzzq6q3sygl2vxk685k5hmcvy1i42q5fph28q2b0dli";
+      name = "libkgapi-18.04.0.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz";
-      sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi";
-      name = "libkgeomap-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkgeomap-18.04.0.tar.xz";
+      sha256 = "0814ql6xpj02sirmz9crn649rabqclhzjnrlk47isgjwsgk5kqmh";
+      name = "libkgeomap-18.04.0.tar.xz";
     };
   };
   libkipi = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz";
-      sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq";
-      name = "libkipi-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkipi-18.04.0.tar.xz";
+      sha256 = "10d7yb6psrj1xl34pkhw6fpmja7mk8bkq80id0snc5nxlr0v1jdb";
+      name = "libkipi-18.04.0.tar.xz";
     };
   };
   libkleo = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz";
-      sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k";
-      name = "libkleo-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkleo-18.04.0.tar.xz";
+      sha256 = "179abszgi7nm763cvyqi2274x7107vb4irblsdfkqmlp924xssdd";
+      name = "libkleo-18.04.0.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz";
-      sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd";
-      name = "libkmahjongg-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkmahjongg-18.04.0.tar.xz";
+      sha256 = "1grsyjsghjk3ikj7lpib3k94qcsz6r1l3czcawwamf2m83jydk2k";
+      name = "libkmahjongg-18.04.0.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz";
-      sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l";
-      name = "libkomparediff2-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libkomparediff2-18.04.0.tar.xz";
+      sha256 = "0vzq25q9hihv8np0l0jdyfipf3w86wm6y7n46dhhqkqw380wrxwy";
+      name = "libkomparediff2-18.04.0.tar.xz";
     };
   };
   libksane = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz";
-      sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2";
-      name = "libksane-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libksane-18.04.0.tar.xz";
+      sha256 = "1vc7z3dzr0nk3rrfq96p6phbb3rfnkn6wpjnzmc66f4mvq96hn7i";
+      name = "libksane-18.04.0.tar.xz";
     };
   };
   libksieve = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz";
-      sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433";
-      name = "libksieve-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/libksieve-18.04.0.tar.xz";
+      sha256 = "16x419wzpyl9jj4q49rwmfm75x6minwrg0jvkad5kh541r52a5bn";
+      name = "libksieve-18.04.0.tar.xz";
     };
   };
   lokalize = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz";
-      sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9";
-      name = "lokalize-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/lokalize-18.04.0.tar.xz";
+      sha256 = "19j0jqn3xzawsyy4fzsy3c2hrjp9920bihzpbq8yalws6w0v8li4";
+      name = "lokalize-18.04.0.tar.xz";
     };
   };
   lskat = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz";
-      sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0";
-      name = "lskat-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/lskat-18.04.0.tar.xz";
+      sha256 = "1dk73c6v5h5abx5244rnjjfxi2cn2sya1jav3020nif111c2c9f7";
+      name = "lskat-18.04.0.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz";
-      sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f";
-      name = "mailcommon-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/mailcommon-18.04.0.tar.xz";
+      sha256 = "10psdddw3wzyalh5662rvq68l8i9sxmcl5pavgn03np3g3fws8fd";
+      name = "mailcommon-18.04.0.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz";
-      sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc";
-      name = "mailimporter-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/mailimporter-18.04.0.tar.xz";
+      sha256 = "0wwclx24bfczqxvcf5jdfpqa9cx0dv9ygsj5blaqk9g5pgych5hi";
+      name = "mailimporter-18.04.0.tar.xz";
     };
   };
   marble = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz";
-      sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i";
-      name = "marble-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/marble-18.04.0.tar.xz";
+      sha256 = "0q1dr2p4qwcik86fcr0jqvplkwfnj14fysqcqk2pwwdkfnqlsppv";
+      name = "marble-18.04.0.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz";
-      sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp";
-      name = "mbox-importer-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/mbox-importer-18.04.0.tar.xz";
+      sha256 = "1kai38svb4bsj1kfhyv94sgxqavj4fgb4laxl2sxvwah3rk6avd5";
+      name = "mbox-importer-18.04.0.tar.xz";
     };
   };
   messagelib = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz";
-      sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald";
-      name = "messagelib-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/messagelib-18.04.0.tar.xz";
+      sha256 = "14nn6aw1831j0iwwb7d4swxh6i4855izglmifq2ijsbpbdqsq5p2";
+      name = "messagelib-18.04.0.tar.xz";
     };
   };
   minuet = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz";
-      sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b";
-      name = "minuet-17.12.3.tar.xz";
-    };
-  };
-  okteta = {
-    version = "17.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz";
-      sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
-      name = "okteta-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/minuet-18.04.0.tar.xz";
+      sha256 = "0fdyv0qbj04pxsbyvrmbqs7bff7cld28iyw7n8lgv2gdm3n45vbh";
+      name = "minuet-18.04.0.tar.xz";
     };
   };
   okular = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz";
-      sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha";
-      name = "okular-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/okular-18.04.0.tar.xz";
+      sha256 = "1ywzpdahnfc0ydvpidphdyh61ql7zwk4m6cpfj2zg9njh276w1d8";
+      name = "okular-18.04.0.tar.xz";
     };
   };
   palapeli = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz";
-      sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln";
-      name = "palapeli-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/palapeli-18.04.0.tar.xz";
+      sha256 = "0m4h5h15qcqdhlrsi73c8jxkb3zhz07m2jw3r37603w4g6jk9g8b";
+      name = "palapeli-18.04.0.tar.xz";
     };
   };
   parley = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz";
-      sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6";
-      name = "parley-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/parley-18.04.0.tar.xz";
+      sha256 = "0h87zfqssbbvwyvar9yf8hv53bdpv7arncs63l6hfr6ajspla9if";
+      name = "parley-18.04.0.tar.xz";
     };
   };
   picmi = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz";
-      sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn";
-      name = "picmi-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/picmi-18.04.0.tar.xz";
+      sha256 = "1pxa4xql2c78n0jqswgll2hpfn33fgw6yz7g8ydgn5nnbcsfhs6r";
+      name = "picmi-18.04.0.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz";
-      sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq";
-      name = "pimcommon-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/pimcommon-18.04.0.tar.xz";
+      sha256 = "0xnh0xys4sfqashimc1zsdxbssd3821bp9cx6hb0d8l3bq5x2vrp";
+      name = "pimcommon-18.04.0.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz";
-      sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b";
-      name = "pim-data-exporter-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/pim-data-exporter-18.04.0.tar.xz";
+      sha256 = "0isr1hv74n9mbihirk4qr109d4shh42k8jgcy9v2hmkplq72vwc7";
+      name = "pim-data-exporter-18.04.0.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz";
-      sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp";
-      name = "pim-sieve-editor-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/pim-sieve-editor-18.04.0.tar.xz";
+      sha256 = "0q1f72mb925qzikqfpv74dcc5f9ipxszvm0z05lsp1dhrmz1pf9a";
+      name = "pim-sieve-editor-18.04.0.tar.xz";
     };
   };
   poxml = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz";
-      sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp";
-      name = "poxml-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/poxml-18.04.0.tar.xz";
+      sha256 = "1rwr1ldrkwyfxm56i16mpq0vmqiq2397gcbzg4skqpc727s55nlv";
+      name = "poxml-18.04.0.tar.xz";
     };
   };
   print-manager = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz";
-      sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7";
-      name = "print-manager-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/print-manager-18.04.0.tar.xz";
+      sha256 = "1x70xia2rph40flx4r3cpxcvxfzny83v87l4kgc1n0khavhp9lpx";
+      name = "print-manager-18.04.0.tar.xz";
     };
   };
   rocs = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz";
-      sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46";
-      name = "rocs-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/rocs-18.04.0.tar.xz";
+      sha256 = "0q0q9bnmsw23jdbrxrkmmjvyr5jv4s1z8v9h7nsaxqs1k2prflp4";
+      name = "rocs-18.04.0.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz";
-      sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m";
-      name = "signon-kwallet-extension-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/signon-kwallet-extension-18.04.0.tar.xz";
+      sha256 = "04r92pc8l2vw1dc916n658484v14smqrgg4ngx6rccffm58jfvk0";
+      name = "signon-kwallet-extension-18.04.0.tar.xz";
     };
   };
   spectacle = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz";
-      sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr";
-      name = "spectacle-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/spectacle-18.04.0.tar.xz";
+      sha256 = "1slqgp1rgzcw4nikh6zmxpp3yc04dfbjcqqx2j4wpa1p2xwfv0c2";
+      name = "spectacle-18.04.0.tar.xz";
     };
   };
   step = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz";
-      sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v";
-      name = "step-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/step-18.04.0.tar.xz";
+      sha256 = "048f4n24819vj41a0hdabmqvw6k7wkwwicz0q0slvfqws5c3h1l4";
+      name = "step-18.04.0.tar.xz";
     };
   };
   svgpart = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz";
-      sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5";
-      name = "svgpart-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/svgpart-18.04.0.tar.xz";
+      sha256 = "1yf535ry8xc7lqhcavn2kjmjs0ngkwinm369q0qp7hfddcpsyfbp";
+      name = "svgpart-18.04.0.tar.xz";
     };
   };
   sweeper = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz";
-      sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x";
-      name = "sweeper-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/sweeper-18.04.0.tar.xz";
+      sha256 = "1yf1xfbv516ia3aqj3l8qcdsbjac9pnm8qb23l26g6n3jnq4b331";
+      name = "sweeper-18.04.0.tar.xz";
     };
   };
   syndication = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz";
-      sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808";
-      name = "syndication-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/syndication-18.04.0.tar.xz";
+      sha256 = "11fx8f9sfc51w5dg6mylbvk0yaaxvc9y2dsg9xxasiw8v6rjjq3n";
+      name = "syndication-18.04.0.tar.xz";
     };
   };
   umbrello = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz";
-      sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0";
-      name = "umbrello-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/umbrello-18.04.0.tar.xz";
+      sha256 = "1lbf82j04j8qax7qnsqwsjrz1m4yq0ca6xc9fdhmvkpnzn5z9ydp";
+      name = "umbrello-18.04.0.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.12.3";
+    version = "18.04.0";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz";
-      sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i";
-      name = "zeroconf-ioslave-17.12.3.tar.xz";
+      url = "${mirror}/stable/applications/18.04.0/src/zeroconf-ioslave-18.04.0.tar.xz";
+      sha256 = "0lqh70bmlrj22d82vhm5a9ylm2yj9rz4zgncfwrh9952q1xkzl22";
+      name = "zeroconf-ioslave-18.04.0.tar.xz";
     };
   };
 }

From 58f53dc4d4b8b87172956e3658d24f158f9abaa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 21 Apr 2018 14:40:10 +0200
Subject: [PATCH 0355/3370] okteta: Move into own package

Okteta was removed from kde applications and will now be released
independently. So, we currently use the released version from 17.12.3.
---
 .../{kde/okteta.nix => editors/okteta/default.nix}   | 12 +++++++++---
 pkgs/top-level/all-packages.nix                      |  4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)
 rename pkgs/applications/{kde/okteta.nix => editors/okteta/default.nix} (58%)

diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/editors/okteta/default.nix
similarity index 58%
rename from pkgs/applications/kde/okteta.nix
rename to pkgs/applications/editors/okteta/default.nix
index 0ac8ddebc75d..770eb63dc69e 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -1,16 +1,22 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, fetchurl,
   extra-cmake-modules, kdoctools,
   qtscript, kconfig, kinit, karchive, kcrash,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
   shared-mime-info
 }:
 
-mkDerivation {
+let
+  version = "17.12.3";
+in mkDerivation rec {
   name = "okteta";
+  src = fetchurl {
+    url    = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz";
+    sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
+  };
   meta = {
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ peterhoeg ];
+    maintainers = with lib.maintainers; [ peterhoeg bkchr ];
   };
   nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
   buildInputs = [ shared-mime-info ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78b8cff8215c..a82de21279b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16419,7 +16419,9 @@ with pkgs;
     akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
     kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks
     kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
-    kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okteta okular spectacle;
+    kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle;
+
+  okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 

From 337e9723ce402c74996453b27088f2aa53e9e013 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 24 Apr 2018 15:16:45 +0800
Subject: [PATCH 0356/3370] kde-applications: Create alias to okteta

---
 pkgs/applications/kde/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix   | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 451fdbe151f4..5870179b6c0b 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -28,6 +28,7 @@ still shows most of the available features is in `./gwenview.nix`.
 {
   stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
   plasma5, attica, phonon,
+  okteta
 }:
 
 let
@@ -151,7 +152,6 @@ let
       mbox-importer = callPackage ./mbox-importer.nix {};
       messagelib = callPackage ./messagelib.nix {};
       minuet = callPackage ./minuet.nix {};
-      okteta = callPackage ./okteta.nix {};
       okular = callPackage ./okular.nix {};
       pimcommon = callPackage ./pimcommon.nix {};
       pim-data-exporter = callPackage ./pim-data-exporter.nix {};
@@ -159,6 +159,9 @@ let
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
       syndication = callPackage ./syndication.nix {};
+      # Okteta was removed from kde applications and will now be released independently
+      # Lets keep an alias for compatibility reasons
+      inherit okteta;
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a82de21279b6..d5e8b16e017c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16411,6 +16411,7 @@ with pkgs;
         inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
         inherit plasma5;
         inherit attica phonon;
+        inherit okteta;
       };
     in
       recurseIntoAttrs (makeOverridable mkApplications attrs);

From a2f617f49f7c256b6baba65d621ef660658733fe Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 24 Apr 2018 20:40:52 +0800
Subject: [PATCH 0357/3370] qcachegrind: Remove qt 5.10 build fix patch, now
 applied upstream

---
 pkgs/development/tools/analysis/qcachegrind/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 15be7554c198..30d82aca83ae 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -12,14 +12,6 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ qmake ];
 
-  patches = [
-    (fetchpatch {
-      name = "fix-qt5_10-build.patch";
-      url = https://github.com/KDE/kcachegrind/commit/c41607a.patch;
-      sha256 = "00kh5im3hpcarch8rc2dsgxsajfmd8vd7rry9x6mxrbkgr4ifq8y";
-    })
-  ];
-
   postInstall = ''
      mkdir -p $out/bin
      cp -p converters/dprof2calltree $out/bin/dprof2calltree

From 8945e6b105d6a9481b4dd1c2506dbdcca4327e36 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 25 Apr 2018 09:37:19 +0800
Subject: [PATCH 0358/3370] kproperty: 3.0.2 -> 3.1.0

---
 pkgs/development/libraries/kproperty/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix
index 52b5d944b413..455fb5a711c0 100644
--- a/pkgs/development/libraries/kproperty/default.nix
+++ b/pkgs/development/libraries/kproperty/default.nix
@@ -1,22 +1,23 @@
 {
   mkDerivation, lib, fetchurl,
   extra-cmake-modules,
-  qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons
+  qtbase, kconfig, kcoreaddons, kwidgetsaddons, kguiaddons,
+  qttools
 }:
 
 mkDerivation rec {
   pname = "kproperty";
-  version = "3.0.2";
+  version = "3.1.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
-    sha256 = "1hzkvdap7dzpnxlp4rfg5f24fhqjpqm2hlvv88gj4c0scbp73ynm";
+    sha256 = "18qlwp7ajpx16bd0lfzqfx8y9cbrs8k4nax3cr30wj5sd3l8xpky";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ];
 
-  buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons ];
+  buildInputs = [ kconfig kcoreaddons kwidgetsaddons kguiaddons qttools ];
 
   propagatedBuildInputs = [ qtbase ];
 

From d5121536b80911264b3f55870d5253ede8a2b395 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 25 Apr 2018 09:37:46 +0800
Subject: [PATCH 0359/3370] kreport: 3.0.2 -> 3.1.0

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

diff --git a/pkgs/development/libraries/kreport/default.nix b/pkgs/development/libraries/kreport/default.nix
index 561e964c9610..3f44dbb9c138 100644
--- a/pkgs/development/libraries/kreport/default.nix
+++ b/pkgs/development/libraries/kreport/default.nix
@@ -6,12 +6,12 @@
 
 mkDerivation rec {
   pname = "kreport";
-  version = "3.0.2";
+  version = "3.1.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
-    sha256 = "1zd3vhf26cyp8xrq11awm9pmhnk88ppyc0riyr0gxj8y703ahkp0";
+    sha256 = "0v7krpfx0isij9wzwam28fqn039i4wcznbplvnvl6hsykdi8ar1v";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ];

From 1bde5c59307f1e2d8f786f366f5171f04d60c1e9 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 25 Apr 2018 09:38:04 +0800
Subject: [PATCH 0360/3370] kexi: 3.0.2 -> 3.1.0

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

diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix
index 8463703c0179..2aa19dea1c24 100644
--- a/pkgs/applications/office/kexi/default.nix
+++ b/pkgs/applications/office/kexi/default.nix
@@ -9,12 +9,12 @@
 
 mkDerivation rec {
   pname = "kexi";
-  version = "3.0.2";
+  version = "3.1.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/src/${name}.tar.xz";
-    sha256 = "1fjvjifi5ygx5gs2lzfg22j0x3r7kl4wk5jll09r8gc3dfxaiblf";
+    sha256 = "1ysj44qq75wglw4d080l3gfw47695gapf29scxhb1g3py55csmbd";
   };
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];

From b20a82cd7592ad8ebcfb1e94ce5b44f067355b83 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 25 Apr 2018 09:38:17 +0800
Subject: [PATCH 0361/3370] calligra: 3.0.1 -> 3.1.0

---
 pkgs/applications/office/calligra/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 8449cdf05def..01014e6687cb 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -15,24 +15,16 @@
 
 mkDerivation rec {
   pname = "calligra";
-  version = "3.0.1";
+  version = "3.1.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
-    sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
+    sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638";
   };
 
   enableParallelBuilding = true;
 
-  patches = [
-    (fetchpatch {
-      name = "calligra-build-with-newer-kcalcore.patch";
-      url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff";
-      sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0";
-    })
-  ];
-
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
 
   buildInputs = [

From 04e13de94f1909afc4711a92cf83d5969afa0981 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 20:54:36 -0500
Subject: [PATCH 0362/3370] gn: fix Darwin build

---
 .../tools/build-managers/gn/default.nix       | 139 ++++++++++++------
 1 file changed, 93 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 5e7dd5214a04..bfbb2b4e3308 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -1,77 +1,124 @@
-{ stdenv, lib, fetchgit, fetchurl, libevent, ninja, python }:
+{ stdenv, lib, fetchgit, fetchurl, fetchpatch
+, libevent, ninja, python, darwin }:
 
 let
   depsGit = {
     "tools/gn" = fetchgit {
       url = "https://chromium.googlesource.com/chromium/src/tools/gn";
-      rev = "d0c518db129975ce88ff1de26c857873b0619c4b";
-      sha256 = "0l15vzmjyx6bwlz1qhn3fy7yx3qzzxr3drnkj3l0p0fmyxza52vx";
+      rev = "0fa417a0d2d8484e9a5a636e3301da322f586601";
+      sha256 = "0pigcl14yc4aak6q1ghfjxdz2ah4fg4m2r5y3asw2rz6mpr5y9z0";
     };
     "base" = fetchgit {
       url = "https://chromium.googlesource.com/chromium/src/base";
-      rev = "bc6e3ce8ca01b894751e1f7b22b561e3ae2e7f17";
-      sha256 = "1yl49v6nxbrfms52xf7fiwh7d4301m2aj744pa3hzzh989c5j6g5";
+      rev = "ab1d7c3b92ce9c9bc756bdefb8338360d1a33a1e";
+      sha256 = "15wis6qg9ka62k6v1vamg0bp3v5vkpapg485jsn4bbfcaqp6di0f";
     };
     "build" = fetchgit {
       url = "https://chromium.googlesource.com/chromium/src/build";
-      rev = "e934a19ae908081fba13769924e4ea45a7a451ce";
-      sha256 = "0jhy418vaiin7djg9zvk83f8zhasigki4442x5j7gkmgmgmyc4am";
+      rev = "8d44c08a4c9997695db8098198bdd5026bc7a6f9";
+      sha256 = "19sajgf55xfmvnwvy2ss7g6pyljp751cfsws30w415m6m00lmpxl";
     };
     "config" = fetchgit {
       url = "https://chromium.googlesource.com/chromium/src/build/config";
-      rev = "df16c6a2c070704b0a25efe46ee9af16de1e65b3";
-      sha256 = "1x18syzz1scwhd8lf448hy5lnfpq118l403x9qmwm0np318w09wg";
+      rev = "14116c0cdcb9e28995ca8bb384a12e5c9dbd1dbb";
+      sha256 = "04nif0lm4wcy05b7xhal023874s4r0iq067q57cgwdm72i2gml40";
     };
     "testing/gtest" = fetchgit {
       url = "https://chromium.googlesource.com/chromium/testing/gtest";
       rev = "585ec31ea716f08233a815e680fc0d4699843938";
       sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
     };
+    "third_party/apple_apsl" = fetchurl {
+      url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz";
+      sha256 = "0sc7b7zdw7f9piyyijl7xq3v1fzflqlck1apwm8kvgdhkyz3l63k";
+    };
   };
 
-in
-  stdenv.mkDerivation rec {
-    name = "gn";
-    version = "0.0.0.20170629";
-    sourceRoot = ".";
+in stdenv.mkDerivation {
+  name = "gn";
+  version = "20180423";
+  sourceRoot = ".";
 
-    unpackPhase = ''
-      ${lib.concatStringsSep "\n" (
-        lib.mapAttrsToList (n: v: ''
-          mkdir -p $sourceRoot/${n}
+  unpackPhase = ''
+    ${lib.concatStringsSep "\n" (
+      lib.mapAttrsToList (n: v: ''
+        mkdir -p $sourceRoot/${n}
+        if [ -d ${v} ]; then
           cp -r ${v}/* $sourceRoot/${n}
-        '') depsGit)}
-    '';
+        else
+          mkdir -p $sourceRoot/${n}
+          pushd $sourceRoot/${n}
+          unpackFile ${v}
+          popd
+        fi
+      '') depsGit)}
 
-    postPatch = ''
-      # Patch shebands (for sandbox build)
-      chmod u+w -R build
-      patchShebangs build
+    chmod u+w -R $sourceRoot
+  '';
 
-      # Patch out Chromium-bundled libevent
-      chmod u+w tools/gn/bootstrap tools/gn/bootstrap/bootstrap.py
-      sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \
-          tools/gn/bootstrap/bootstrap.py
-    '';
+  patches = [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
+      sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a";
+    })
+  ];
 
-    NIX_LDFLAGS = "-levent";
+  postPatch = ''
+    # Disable libevent bootstrapping (we will provide it).
+    sed -i -e '/static_libraries.*libevent/,/^ *\]\?[})]$/d' \
+      tools/gn/bootstrap/bootstrap.py
 
-    nativeBuildInputs = [ ninja python ];
-    buildInputs = [ libevent ];
+    # FIXME Needed with old Apple SDKs
+    substituteInPlace base/mac/foundation_util.mm \
+      --replace "NSArray<NSString*>*" "NSArray*"
+    substituteInPlace base/mac/sdk_forward_declarations.h \
+      --replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \
+      --replace "NSArray<VNRequest*>*" "NSArray*" \
+      --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
 
-    buildPhase = ''
-      python tools/gn/bootstrap/bootstrap.py -s
-    '';
+    # Patch shebangs (for sandbox build)
+    patchShebangs build
+  '';
 
-    installPhase = ''
-      install -vD out/Release/gn "$out/bin/gn"
-    '';
+  # FIXME again this shouldn't be necessary but I can't figure out a better way
+  NIX_CFLAGS_COMPILE = "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
 
-    meta = with stdenv.lib; {
-      description = "A meta-build system that generates NinjaBuild files";
-      homepage = https://chromium.googlesource.com/chromium/src/tools/gn;
-      license = licenses.bsd3;
-      platforms = platforms.linux;
-      maintainers = [ maintainers.stesie ];
-    };
-  }
+  NIX_LDFLAGS = "-levent";
+
+  nativeBuildInputs = [ ninja python ];
+  buildInputs = [ libevent ]
+
+  # FIXME These dependencies shouldn't be needed but can't find a way
+  # around it. Chromium pulls this in while bootstrapping GN.
+  ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
+    libobjc
+    cctools
+
+    # frameworks
+    ApplicationServices
+    Foundation
+    AppKit
+    ImageCaptureCore
+    CoreBluetooth
+    IOBluetooth
+    CoreWLAN
+    Quartz
+    Cocoa
+  ]);
+
+  buildPhase = ''
+    python tools/gn/bootstrap/bootstrap.py -s
+  '';
+
+  installPhase = ''
+    install -vD out/Release/gn "$out/bin/gn"
+  '';
+
+  meta = with lib; {
+    description = "A meta-build system that generates NinjaBuild files";
+    homepage = https://chromium.googlesource.com/chromium/src/tools/gn;
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ stesie matthewbauer ];
+  };
+}

From 791b5bbbf4d7ec7de8c1a5df0ee3be08ae8670c9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 24 Apr 2018 21:22:52 -0500
Subject: [PATCH 0363/3370] musl bootstrap: remove libiconv

---
 .../bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh      | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix                      | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
index 8b5070dc6d6f..b160a748d8dc 100644
--- a/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
+++ b/pkgs/stdenv/linux/bootstrap-tools-musl/scripts/unpack-bootstrap-tools.sh
@@ -26,7 +26,7 @@ for i in $out/bin/* $out/libexec/gcc/*/*/*; do
         ./patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i"
 done
 
-for i in $out/lib/libiconv*.so $out/lib/libpcre* $out/lib/libc.so; do
+for i in $out/lib/libpcre* $out/lib/libc.so; do
     if [ -L "$i" ]; then continue; fi
     echo patching "$i"
     $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i"
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 5522bc5dea25..4fc9999b538c 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -136,8 +136,6 @@ in with pkgs; rec {
         cp -d ${libmpc.out}/lib/libmpc*.so* $out/lib
         cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
-      '' + lib.optionalString (hostPlatform.libc == "musl") ''
-        cp -d ${libiconv.out}/lib/libiconv*.so* $out/lib
 
       '' + lib.optionalString (hostPlatform != buildPlatform) ''
         # These needed for cross but not native tools because the stdenv

From a276d5160cc4b307d97261b419e183fb3a2214aa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 22:38:38 -0500
Subject: [PATCH 0364/3370] inkscape: fix on Darwin

Fixes #39175
---
 .../graphics/inkscape/default.nix             | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 47452eb43e88..b5d11d912a5e 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -2,9 +2,15 @@
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, potrace, cmake
+, libvisio, libcdr, libexif, potrace, autoreconfHook
+, intltool
+, lib
 }:
 
+# Note that originally this Nix expression used CMake to build but
+# this led to errors on MacOS of "Too many arguments". Inkscape
+# supports autoconf and we will use this for now on.
+
 let
   python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
 in
@@ -17,12 +23,6 @@ stdenv.mkDerivation rec {
     sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
   };
 
-  unpackPhase = ''
-    cp $src ${name}.tar.bz2
-    tar xvjf ${name}.tar.bz2 > /dev/null
-    cd ${name}
-  '';
-
   postPatch = ''
     patchShebangs share/extensions
     patchShebangs fix-roff-punct
@@ -33,25 +33,26 @@ stdenv.mkDerivation rec {
       --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook intltool ];
   buildInputs = [
     perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif potrace cmake python2Env
+    libvisio libcdr libexif potrace python2Env
   ];
 
   enableParallelBuilding = true;
 
+  preConfigure = ''
+    intltoolize -f
+  '';
+
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
     rm "$out/share/icons/hicolor/icon-theme.cache"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
-    install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     license = "GPL";
     homepage = https://www.inkscape.org;
     description = "Vector graphics editor";
@@ -62,5 +63,6 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
+    maintainers = with maintainters; [ matthewbauer ];
   };
 }

From 7587f9804f23f6ab9973f8735b10cd0bb87e0c7d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 22:58:45 -0500
Subject: [PATCH 0365/3370] glibmm: fix High Sierra segfault

---
 pkgs/development/libraries/glibmm/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index a3af96d51edc..86ed94d7bf34 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }:
+{ stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }:
 
 let
   ver_maj = "2.54";
@@ -14,6 +14,14 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
+  patchFlags = "-p0";
+  patches = [
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/macports/macports-ports/e864b2340be9ef003d8ff4aef92e7151d06287dd/devel/glibmm/files/0001-ustring-Fix-wchar-conversion-on-macOS-with-libc.patch";
+      sha256 = "02qvnailw1i59cjbj3cy7y02kfcivsvkdjrf4njkp4plarayyqp9";
+    })
+  ];
+
   nativeBuildInputs = [ pkgconfig gnum4 ];
   propagatedBuildInputs = [ glib libsigcxx ];
 

From b87cb29d1be6a7729199aa33a5f0e5fd5f9801ef Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 23:00:27 -0500
Subject: [PATCH 0366/3370] =?UTF-8?q?glibmm:=202.54.1=20=E2=86=92=202.56.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Noticed this was out of date.
---
 pkgs/development/libraries/glibmm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 86ed94d7bf34..3c3b49e66161 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, gnum4, glib, libsigcxx }:
 
 let
-  ver_maj = "2.54";
-  ver_min = "1";
+  ver_maj = "2.56";
+  ver_min = "0";
 in
 stdenv.mkDerivation rec {
   name = "glibmm-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz";
-    sha256 = "0jkapw18icz59cmlmsl00nwwz0wh291kb4hc9z9hxmq45drqrhkw";
+    sha256 = "1abrkqhca5p8n6ly3vp1232rny03s7lrd8f8iz2m2m141nxgqx3f";
   };
 
   outputs = [ "out" "dev" ];

From 656f69bea5b5cdbb1a25192b89448e43952aeba4 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 25 Apr 2018 12:11:43 +0800
Subject: [PATCH 0367/3370] buildbot-plugins.wsgi-dashboards: Remove maintainer
 akazakov

Missing from maintainers file
---
 pkgs/development/tools/build-managers/buildbot/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 1d1b963df993..35c8ed8c71cd 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -97,7 +97,7 @@
     meta = with stdenv.lib; {
       homepage = http://buildbot.net/;
       description = "Buildbot WSGI dashboards Plugin";
-      maintainers = with maintainers; [ akazakov ];
+      maintainers = with maintainers; [ ];
       license = licenses.gpl2;
     };
   };

From 7438083a4d9d7b60b915d59e118f19398f177fe3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 25 Apr 2018 03:20:18 +0000
Subject: [PATCH 0368/3370] tree-wide: disable `doCheck` and `doInstallCheck`
 where it fails (the trivial part)

---
 pkgs/applications/altcoins/bitcoin.nix        |  4 ++++
 pkgs/applications/audio/easytag/default.nix   |  2 ++
 .../graphics/ImageMagick/default.nix          |  2 ++
 .../networking/browsers/firefox/common.nix    |  1 +
 .../p2p/transmission-remote-gtk/default.nix   | 17 +++++++------
 .../version-management/cvs/default.nix        |  2 ++
 .../version-management/subversion/default.nix |  2 ++
 .../virtualization/qemu/default.nix           |  2 ++
 pkgs/data/misc/tzdata/default.nix             |  2 ++
 .../gnome-2/desktop/gtksourceview/default.nix |  3 +++
 .../gnome-2/desktop/zenity/default.nix        |  2 ++
 .../gnome-2/platform/gnome-vfs/default.nix    |  2 ++
 pkgs/desktops/gnome-3/core/dconf/default.nix  |  2 ++
 pkgs/desktops/xfce/core/xfconf.nix            |  3 ++-
 .../development/compilers/gcc/4.8/default.nix |  2 ++
 .../development/compilers/gcc/4.9/default.nix |  2 ++
 pkgs/development/compilers/gcc/5/default.nix  |  2 ++
 pkgs/development/compilers/gcc/6/default.nix  |  2 ++
 pkgs/development/compilers/gcc/7/default.nix  |  2 ++
 pkgs/development/compilers/ghc/8.2.2.nix      |  1 +
 pkgs/development/compilers/openjdk/8.nix      |  2 ++
 pkgs/development/interpreters/guile/1.8.nix   |  1 +
 pkgs/development/interpreters/guile/2.0.nix   |  1 +
 .../interpreters/guile/default.nix            |  1 +
 .../development/interpreters/perl/default.nix |  2 ++
 .../python/cpython/2.7/default.nix            |  2 ++
 .../python/cpython/3.4/default.nix            |  2 ++
 .../python/cpython/3.5/default.nix            |  2 ++
 .../python/cpython/3.6/default.nix            |  2 ++
 .../development/interpreters/ruby/default.nix |  2 ++
 .../libraries/appstream-glib/default.nix      |  2 ++
 .../libraries/at-spi2-atk/default.nix         |  2 ++
 .../libraries/at-spi2-core/default.nix        |  2 ++
 pkgs/development/libraries/cairo/default.nix  |  2 ++
 pkgs/development/libraries/celt/generic.nix   |  2 ++
 pkgs/development/libraries/ctpp2/default.nix  |  2 ++
 pkgs/development/libraries/eigen/default.nix  |  8 ++++---
 pkgs/development/libraries/enchant/2.x.nix    |  2 ++
 pkgs/development/libraries/epoxy/default.nix  |  2 ++
 pkgs/development/libraries/ffmpeg/generic.nix |  3 ++-
 .../libraries/gdk-pixbuf/default.nix          |  2 +-
 pkgs/development/libraries/gegl/default.nix   |  2 ++
 pkgs/development/libraries/git2/0.25.nix      |  2 ++
 pkgs/development/libraries/git2/default.nix   |  2 ++
 pkgs/development/libraries/glibc/common.nix   |  2 ++
 .../gobject-introspection/default.nix         |  2 ++
 .../libraries/grantlee/5/default.nix          |  2 ++
 .../libraries/gstreamer/bad/default.nix       |  3 +++
 pkgs/development/libraries/gtk+/2.x.nix       |  2 ++
 pkgs/development/libraries/gtk+/3.x.nix       |  2 ++
 pkgs/development/libraries/gts/default.nix    |  2 ++
 pkgs/development/libraries/id3lib/default.nix |  4 +++-
 pkgs/development/libraries/jasper/default.nix |  2 ++
 pkgs/development/libraries/kerberos/krb5.nix  |  1 +
 pkgs/development/libraries/lcms/default.nix   |  2 ++
 .../libraries/libarchive/default.nix          |  2 ++
 .../development/libraries/libcddb/default.nix |  2 ++
 pkgs/development/libraries/libcue/default.nix |  2 ++
 .../libraries/libevent/default.nix            |  2 ++
 .../development/libraries/libical/default.nix |  2 ++
 pkgs/development/libraries/libidn/default.nix |  2 ++
 .../libraries/libindicator/default.nix        |  2 ++
 pkgs/development/libraries/liblo/default.nix  |  4 +++-
 pkgs/development/libraries/libnih/default.nix |  4 +++-
 .../libraries/libomxil-bellagio/default.nix   |  2 ++
 .../libraries/libproxy/default.nix            |  2 ++
 .../development/libraries/librsvg/default.nix |  2 ++
 .../development/libraries/libsoup/default.nix |  2 ++
 .../libtorrent-rasterbar/generic.nix          |  2 ++
 .../libraries/libtoxcore/default.nix          |  7 +++---
 .../libraries/libuchardet/default.nix         |  2 ++
 .../libraries/libunwind/default.nix           |  2 ++
 .../libraries/libvdpau-va-gl/default.nix      |  2 ++
 .../libraries/libxkbcommon/default.nix        |  2 ++
 .../development/libraries/openexr/default.nix |  1 +
 .../libraries/openldap/default.nix            |  2 ++
 .../development/libraries/p11-kit/default.nix |  2 ++
 pkgs/development/libraries/pcre2/default.nix  |  2 ++
 pkgs/development/libraries/popt/default.nix   |  6 +++--
 .../libraries/qt-4.x/4.8/default.nix          |  2 ++
 .../libraries/sqlcipher/default.nix           |  2 ++
 pkgs/development/libraries/tk/8.5.nix         |  1 -
 pkgs/development/libraries/tk/8.6.nix         |  1 -
 pkgs/development/libraries/tk/generic.nix     |  2 ++
 pkgs/development/libraries/zeromq/3.x.nix     |  2 ++
 pkgs/development/libraries/zeromq/4.x.nix     |  2 ++
 .../tools/analysis/valgrind/default.nix       |  2 ++
 .../tools/build-managers/cmake/default.nix    |  1 +
 pkgs/development/tools/dcadec/default.nix     |  4 +++-
 .../tools/documentation/doxygen/default.nix   |  1 +
 .../tools/documentation/gtk-doc/default.nix   |  3 +++
 pkgs/development/tools/go2nix/default.nix     |  2 ++
 pkgs/development/tools/govers/default.nix     |  5 +++-
 pkgs/development/tools/misc/autoconf/2.64.nix | 10 ++++----
 .../tools/misc/autoconf/default.nix           | 10 ++++----
 .../tools/misc/binutils/default.nix           |  2 ++
 .../tools/misc/libtool/libtool2.nix           |  1 +
 .../tools/misc/pkgconfig/default.nix          |  2 +-
 pkgs/development/tools/parsing/bison/3.x.nix  |  3 +++
 pkgs/misc/cups/filters.nix                    |  1 +
 pkgs/misc/emulators/wine/winetricks.nix       |  2 ++
 pkgs/os-specific/linux/apparmor/default.nix   | 24 +++++++++++++++----
 pkgs/os-specific/linux/busybox/default.nix    |  2 ++
 pkgs/os-specific/linux/hwdata/default.nix     |  2 ++
 pkgs/os-specific/linux/kernel/perf.nix        |  3 +++
 pkgs/os-specific/linux/lvm2/default.nix       |  2 ++
 pkgs/os-specific/linux/pam/default.nix        |  2 ++
 pkgs/os-specific/linux/systemd/default.nix    |  2 ++
 pkgs/os-specific/linux/udisks/2-default.nix   |  2 ++
 pkgs/os-specific/linux/upower/default.nix     |  2 ++
 pkgs/servers/dns/bind/default.nix             |  2 ++
 pkgs/servers/monitoring/net-snmp/default.nix  |  1 +
 pkgs/servers/sql/postgresql/default.nix       |  2 ++
 pkgs/servers/x11/xorg/overrides.nix           |  4 ++++
 pkgs/tools/archivers/gnutar/default.nix       |  3 +++
 pkgs/tools/compression/gzip/default.nix       |  2 ++
 pkgs/tools/filesystems/curlftpfs/default.nix  |  2 ++
 pkgs/tools/graphics/graphviz/base.nix         |  7 ++++++
 pkgs/tools/inputmethods/ibus/default.nix      |  1 +
 pkgs/tools/misc/bogofilter/default.nix        |  2 ++
 pkgs/tools/misc/fontforge/default.nix         |  4 +++-
 pkgs/tools/networking/atftp/default.nix       |  2 ++
 pkgs/tools/networking/curl/default.nix        |  2 ++
 pkgs/tools/networking/maildrop/default.nix    |  2 ++
 .../networking/network-manager/default.nix    |  2 ++
 pkgs/tools/networking/telnet/default.nix      |  2 ++
 pkgs/tools/security/nmap/default.nix          |  2 ++
 pkgs/tools/security/rhash/default.nix         |  2 ++
 pkgs/tools/security/sudo/default.nix          |  2 ++
 pkgs/tools/system/at/default.nix              | 15 +++++++-----
 pkgs/tools/text/patchutils/default.nix        |  2 ++
 pkgs/tools/text/sgml/opensp/default.nix       |  2 ++
 pkgs/tools/typesetting/docbook2x/default.nix  | 14 ++++++-----
 pkgs/tools/typesetting/tex/texlive/bin.nix    |  2 ++
 pkgs/top-level/lua-packages.nix               |  2 ++
 135 files changed, 326 insertions(+), 52 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 0acd616eeaff..30bbcb2c8393 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec{
                                             "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
                                           ];
 
+  # Fails with "This application failed to start because it could not
+  # find or load the Qt platform plugin "minimal""
+  doCheck = false;
+
   meta = {
     description = "Peer-to-peer electronic cash system";
     longDescription= ''
diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index e3263c944f45..f3bcff7a2c51 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -22,6 +22,8 @@ in stdenv.mkDerivation rec {
     gsettings-desktop-schemas gnome3.defaultIconTheme
   ];
 
+  doCheck = false; # fails 1 out of 9 tests
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 4bbc34bb7bb6..4b8d2ab291b7 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -78,6 +78,8 @@ stdenv.mkDerivation rec {
       [ libX11 libXext libXt libwebp ]
     ;
 
+  doCheck = false; # fails 6 out of 76 tests
+
   postInstall = ''
     (cd "$dev/include" && ln -s ImageMagick* ImageMagick)
     moveToOutput "bin/*-config" "$dev"
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index e8e1862d7f83..5b88a61afce6 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -213,6 +213,7 @@ stdenv.mkDerivation (rec {
   ++ extraMakeFlags;
 
   enableParallelBuilding = true;
+  doCheck = false; # "--disable-tests" above
 
   preInstall = ''
     # The following is needed for startup cache creation on grsecurity kernels.
diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
index eb88d1c24c20..3ddbe9be4fc6 100644
--- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
+++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix
@@ -21,13 +21,16 @@ stdenv.mkDerivation rec {
     pkgconfig intltool autoconf-archive
     appstream-glib
   ];
+
   buildInputs = [ gtk3 json-glib curl glib hicolor-icon-theme ];
 
-  meta = with stdenv.lib;
-    { description = "GTK remote control for the Transmission BitTorrent client";
-      homepage = https://github.com/ajf8/transmission-remote-gtk;
-      license = licenses.gpl2;
-      maintainers = [ maintainers.ehmry ];
-      platforms = platforms.linux;
-    };
+  doCheck = false; # fails with style validation error
+
+  meta = with stdenv.lib; {
+    description = "GTK remote control for the Transmission BitTorrent client";
+    homepage = https://github.com/ajf8/transmission-remote-gtk;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.ehmry ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 8a729c28da9a..71fb7612b339 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ nano ];
 
+  doCheck = false; # fails 1 of 1 tests
+
   meta = {
     homepage = http://cvs.nongnu.org;
     description = "Concurrent Versions System - a source control system";
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index e069c39f059f..6b8ef7b88e8e 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -88,6 +88,8 @@ let
 
     enableParallelBuilding = true;
 
+    doCheck = false; # fails 10 out of ~2300 tests
+
     meta = {
       description = "A version control system intended to be a compelling replacement for CVS in the open source community";
       homepage = http://subversion.apache.org/;
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a10687141615..4463a70398ca 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
     ++ optional openGLSupport "--enable-opengl"
     ++ optional virglSupport "--enable-virglrenderer";
 
+  doCheck = false; # tries to access /dev
+
   postFixup =
     ''
       for exe in $out/bin/qemu-system-* ; do
diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 6c8fd6229a3f..2c22bfe93b95 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
+  doCheck = false; # needs more tools
+
   installFlags = [ "ZIC=./zic-native" ];
 
   preInstall = ''
diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 9efca75e8f87..6feaf13d88ec 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -40,4 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
+  doCheck = false; # requires X11 daemon
+
 }
diff --git a/pkgs/desktops/gnome-2/desktop/zenity/default.nix b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
index 014255785ddf..a9b692aadf51 100644
--- a/pkgs/desktops/gnome-2/desktop/zenity/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/zenity/default.nix
@@ -13,4 +13,6 @@ stdenv.mkDerivation {
   buildInputs = [ gtk libglade libxml2 libxslt libX11 docbook_xml_dtd_412 ];
 
   nativeBuildInputs = [ pkgconfig intltool gnome-doc-utils which ];
+
+  doCheck = false; # fails, tries to access the net
 }
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 4ca0e791a2a9..9d71b999d11c 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -21,4 +21,6 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ GConf glib ];
 
   postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";
+
+  doCheck = false; # needs dbus daemon
 }
diff --git a/pkgs/desktops/gnome-3/core/dconf/default.nix b/pkgs/desktops/gnome-3/core/dconf/default.nix
index 9b1adeb953d6..400b3ea9a9b0 100644
--- a/pkgs/desktops/gnome-3/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/core/dconf/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 docbook_xsl ];
   buildInputs = [ glib dbus-glib ];
 
+  doCheck = false; # fails 2 out of 9 tests, maybe needs dbus daemon?
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
index 9aa66a1343f6..9af365c6f14d 100644
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ b/pkgs/desktops/xfce/core/xfconf.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool glib libxfce4util ];
   propagatedBuildInputs = [ dbus-glib ];
 
+  doCheck = false; # requires dbus daemon
+
   meta = with stdenv.lib; {
     homepage = http://docs.xfce.org/xfce/xfconf/start;
     description = "Simple client-server configuration storage and query system for Xfce";
@@ -26,4 +28,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 0a6ea59e5ac4..c69d5fdb7160 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -375,6 +375,8 @@ stdenv.mkDerivation ({
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
     else "";
 
+  doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
   installTargets =
     if stripped
     then "install-strip"
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 5dfdbd02cbfd..a2be6e2201a6 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -383,6 +383,8 @@ stdenv.mkDerivation ({
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
     else "";
 
+  doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
   installTargets =
     if stripped
     then "install-strip"
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e42bb736676d..7ca049f45f96 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -400,6 +400,8 @@ stdenv.mkDerivation ({
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
     else "";
 
+  doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
   installTargets =
     if stripped
     then "install-strip"
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index cf71f51627c9..0bc6094d2ec8 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -403,6 +403,8 @@ stdenv.mkDerivation ({
   buildFlags =
     optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
 
+  doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
   installTargets =
     if stripped
     then "install-strip"
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 0b19aa95effe..7a3214f25fec 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -409,6 +409,8 @@ stdenv.mkDerivation ({
   buildFlags =
     optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
 
+  doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
+
   installTargets =
     if stripped
     then "install-strip"
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 6520daa4d42c..6c19392876d1 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -170,6 +170,7 @@ stdenv.mkDerivation rec {
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
   checkTarget = "test";
+  doCheck = false; # fails with "testsuite/tests: No such file or directory.  Stop."
 
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 705898a74f37..82220e3a5f5d 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -133,6 +133,8 @@ let
 
     buildFlags = [ "all" ];
 
+    doCheck = false; # fails with "No rule to make target 'y'."
+
     installPhase = ''
       mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk
 
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index cf42c9a7b683..03326f7a7592 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -66,6 +66,7 @@ stdenv.mkDerivation rec {
   # This is fixed here:
   # <http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=a0aa1e5b69d6ef0311aeea8e4b9a94eae18a1aaf>.
   doCheck = false;
+  doInstallCheck = doCheck;
 
   setupHook = ./setup-hook.sh;
 
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 2c9aec5b6952..e670f145a5d3 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -89,6 +89,7 @@
   # make check doesn't work on darwin
   # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
   doCheck = false;
+  doInstallCheck = doCheck;
 
   setupHook = ./setup-hook-2.0.sh;
 
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 3d5c51dc420b..f3b36ecd9403 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -85,6 +85,7 @@
   # make check doesn't work on darwin
   # On Linuxes+Hydra the tests are flaky; feel free to investigate deeper.
   doCheck = false;
+  doInstallCheck = doCheck;
 
   setupHook = ./setup-hook-2.2.sh;
 
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 0fd55bd8d71b..d1978c9c78e6 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -105,6 +105,8 @@ let
 
     passthru.libPrefix = "lib/perl5/site_perl";
 
+    doCheck = false; # some tests fail, expensive
+
     # TODO: it seems like absolute paths to some coreutils is required.
     postInstall =
       ''
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 98e5b4b1da0e..5c12d7cec55c 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -241,6 +241,8 @@ in stdenv.mkDerivation {
 
     enableParallelBuilding = true;
 
+    doCheck = false; # expensive, and fails
+
     meta = {
       homepage = http://python.org;
       description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 797a5be40ff3..0946f8743fbe 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -176,6 +176,8 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # expensive, and fails
+
   meta = {
     homepage = http://python.org;
     description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 6dbf9a09cf56..22c55d302625 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -169,6 +169,8 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # expensive, and fails
+
   meta = {
     homepage = http://python.org;
     description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index cc8f6228f623..950a165a2f4a 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -193,6 +193,8 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # expensive, and fails
+
   meta = {
     homepage = http://python.org;
     description = "A high-level dynamically-typed programming language";
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 0df7ec0a7959..a96320f45ae4 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -136,6 +136,8 @@ let
           ++ op (stdenv.hostPlatform != stdenv.buildPlatform)
              "--with-baseruby=${buildRuby}";
 
+        doCheck = false; # expensive, fails
+
         preInstall = ''
           # Ruby installs gems here itself now.
           mkdir -pv "$out/${passthru.gemPath}"
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 6ad6b158826f..b09f5f67f563 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
     "-Ddep11=false"
   ];
 
+  doCheck = false; # fails at least 1 test
+
   postInstall = ''
     moveToOutput "share/installed-tests" "$installedTests"
   '';
diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix
index 86f35d7f578e..1e5d003654ce 100644
--- a/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ python popt atk libX11 libICE xorg.libXtst libXi
                   dbus-glib at-spi2-core libSM ];
 
+  doCheck = false; # needs dbus daemon
+
   meta = with stdenv.lib; {
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 6715a59579b5..b7547c293928 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
   # ToDo: on non-NixOS we create a symlink from there?
   configureFlags = "--with-dbus-daemondir=/run/current-system/sw/bin/";
 
+  doCheck = false; # needs dbus daemon
+
   meta = with stdenv.lib; {
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 6d7b79c0b20a..74ae4abaedf9 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -72,6 +72,8 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # fails
+
   postInstall = stdenv.lib.optionalString stdenv.isDarwin glib.flattenInclude;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix
index 9d861f2c4328..6bf7975034b5 100644
--- a/pkgs/development/libraries/celt/generic.nix
+++ b/pkgs/development/libraries/celt/generic.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
   buildInputs = []
     ++ stdenv.lib.optional liboggSupport libogg;
 
+  doCheck = false; # fails
+
   meta = with stdenv.lib; {
     description = "Ultra-low delay audio codec";
     homepage    = http://www.celt-codec.org/;
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index bb1d4458f50c..bf57bab2f222 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     sed -ie 's/<stdlib.h>/<stdlib.h>\n#include <unistd.h>/' src/CTPP2FileSourceLoader.cpp
   '';
 
+  doCheck = false; # fails
+
   meta = {
     description = "A high performance templating engine";
     homepage = http://ctpp.havoc.ru;
diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix
index 5869276a7977..4e1559e5c738 100644
--- a/pkgs/development/libraries/eigen/default.nix
+++ b/pkgs/development/libraries/eigen/default.nix
@@ -5,19 +5,21 @@ let
 in
 stdenv.mkDerivation {
   name = "eigen-${version}";
-  
+
   src = fetchurl {
     url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz";
     name = "eigen-${version}.tar.gz";
     sha256 = "00l52y7m276gh8wjkqqcxz6x687azrm7a70s3iraxnpy9bxa9y04";
   };
-  
+
   nativeBuildInputs = [ cmake ];
 
+  doCheck = false; # a couple of tests fail with "Child aborted"
+
   postInstall = ''
     sed -e '/Cflags:/s@''${prefix}/@@' -i "$out"/share/pkgconfig/eigen3.pc
   '';
-  
+
   meta = with stdenv.lib; {
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
     license = licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix
index 458b23c33e94..8b559bd03c82 100644
--- a/pkgs/development/libraries/enchant/2.x.nix
+++ b/pkgs/development/libraries/enchant/2.x.nix
@@ -17,6 +17,8 @@ in stdenv.mkDerivation rec {
   buildInputs = [ glib hunspell ];
   propagatedBuildInputs = [ hspell aspell ]; # libtool puts it to la file
 
+  doCheck = false; # fails to compile with with "UnitTest++.h: No such file or directory"
+
   meta = with stdenv.lib; {
     description = "Generic spell checking library";
     homepage = https://abiword.github.io/enchant/;
diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index e0f8e9ff8c76..d44e2650db0a 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = ''-DLIBGL_PATH="${getLib libGL}/lib"'';
 
+  doCheck = false; # needs X11
+
   meta = {
     description = "A library for handling OpenGL function pointer management";
     homepage = https://github.com/anholt/libepoxy;
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 985f328a22dd..87bc0a7dfb94 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -160,9 +160,10 @@ stdenv.mkDerivation rec {
     ++ optional vdpauSupport libvdpau
     ++ optional sdlSupport (if reqMin "3.2" then SDL2 else SDL);
 
-
   enableParallelBuilding = true;
 
+  doCheck = false; # fails
+
   postFixup = ''
     moveToOutput bin "$bin"
     moveToOutput share/ffmpeg/examples "$doc"
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index a3a6f1ff480c..f9f041e955b0 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
-  inherit (doCheck);
+  inherit doCheck;
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 8c93428a0780..d2987be6a3d5 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
+  doCheck = false; # fails 3 out of 19 tests
+
   meta = {
     description = "Graph-based image processing framework";
     homepage = http://www.gegl.org;
diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix
index 9743b82a14ab..6bb1de2cf348 100644
--- a/pkgs/development/libraries/git2/0.25.nix
+++ b/pkgs/development/libraries/git2/0.25.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # hangs. or very expensive?
+
   meta = {
     description = "The Git linkable library";
     homepage = https://libgit2.github.com/;
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index c0659a79fd34..2da1a9ba2a64 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation (rec {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # hangs. or very expensive?
+
   meta = with stdenv.lib; {
     description = "The Git linkable library";
     homepage = https://libgit2.github.com/;
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 31567f0049dd..01544c79b2ea 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -191,6 +191,8 @@ stdenv.mkDerivation ({
 
   preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";
 
+  doCheck = false; # fails
+
   meta = {
     homepage = http://www.gnu.org/software/libc/;
     description = "The GNU C Library";
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f79511897fbe..f5ab5005bad4 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
       cairoLib = "${getLib cairo}/lib";
     });
 
+  doCheck = false; # fails
+
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix
index 3eed4f0c2e29..aa670cd4c86b 100644
--- a/pkgs/development/libraries/grantlee/5/default.nix
+++ b/pkgs/development/libraries/grantlee/5/default.nix
@@ -31,6 +31,8 @@ mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
+  doCheck = false; # fails all the tests (ctest)
+
   meta = with lib; {
     description = "Qt5 port of Django template system";
     longDescription = ''
diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 73cbaa0f8070..38a8260473d2 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -77,4 +77,7 @@ stdenv.mkDerivation rec {
     ++ optional (!stdenv.isDarwin) mjpegtools;
 
   enableParallelBuilding = true;
+
+  doCheck = false; # fails 20 out of 58 tests, expensive
+
 }
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index d35e47f312f9..9731280dedd0 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -49,6 +49,8 @@ stdenv.mkDerivation rec {
     "--disable-visibility"
   ];
 
+  doCheck = false; # needs X11
+
   postInstall = ''
     moveToOutput share/gtk-2.0/demo "$devdoc"
     # The updater is needed for nixos env and it's tiny.
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index dc6a519dfade..0a9513b0fc48 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -63,6 +63,8 @@ stdenv.mkDerivation rec {
     "--enable-wayland-backend"
   ];
 
+  doCheck = false; # needs X11
+
   postInstall = optionalString (!stdenv.isDarwin) ''
     substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \
       --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix
index 770f743fd260..d0da7f8cef61 100644
--- a/pkgs/development/libraries/gts/default.nix
+++ b/pkgs/development/libraries/gts/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ glib gettext ];
 
+  doCheck = false; # fails with "permission denied"
+
   meta = {
     homepage = http://gts.sourceforge.net/;
     license = stdenv.lib.licenses.lgpl2Plus;
diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index 199ac7c902b0..dda1435c1dac 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -9,12 +9,14 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [ zlib ];
-  
+
   src = fetchurl {
     url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz;
     sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97";
   };
 
+  doCheck = false; # fails to compile
+
   meta = {
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index d374c935a2a4..bc18a13884b5 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # fails
+
   postInstall = ''
     moveToOutput bin "$bin"
   '';
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 98073b7bbdc4..d705aa3388fd 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
   '';
 
   enableParallelBuilding = true;
+  doCheck = false; # fails with "No suitable file for testing purposes"
 
   meta = {
     description = "MIT Kerberos 5";
diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix
index 3e4f0d4265f2..63c81822ddf8 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
 
   outputs = [ "bin" "dev" "out" "man" ];
 
+  doCheck = false; # fails with "Error in Linear interpolation (2p): Must be i=8000, But is n=8001"
+
   meta = {
     description = "Color management engine";
     homepage = http://www.littlecms.com/;
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index e0242802fd34..9a9c3b1fa64d 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
     echo "#include <windows.h>" >> config.h
   '' else null;
 
+  doCheck = false; # fails
+
   preFixup = ''
     sed -i $lib/lib/libarchive.la \
       -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \
diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix
index 6a164ef90553..591369df83f1 100644
--- a/pkgs/development/libraries/libcddb/default.nix
+++ b/pkgs/development/libraries/libcddb/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
 
+  doCheck = false; # fails 3 of 5 tests with locale errors
+
   meta = with stdenv.lib; {
     description = "C library to access data on a CDDB server (freedb.org)";
     homepage = http://libcddb.sourceforge.net/;
diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index fb0f0d3d3f9c..683a5bee4c7c 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake bison flex ];
 
+  doCheck = false; # fails all the tests (ctest)
+
   meta = with stdenv.lib; {
     description = "CUE Sheet Parser Library";
     longDescription = ''
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 871437f19082..b74e64aa8490 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames
     ;
 
+  doCheck = false; # needs the net
+
   postInstall = stdenv.lib.optionalString sslSupport ''
     moveToOutput "lib/libevent_openssl*" "$openssl"
     substituteInPlace "$dev/lib/pkgconfig/libevent_openssl.pc" \
diff --git a/pkgs/development/libraries/libical/default.nix b/pkgs/development/libraries/libical/default.nix
index 5ba8bb667845..fd9c8dc9a5e3 100644
--- a/pkgs/development/libraries/libical/default.nix
+++ b/pkgs/development/libraries/libical/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     ./respect-env-tzdir.patch
   ];
 
+  doCheck = false; # fails all the tests (ctest)
+
   meta = with stdenv.lib; {
     homepage = https://github.com/libical/libical;
     description = "An Open Source implementation of the iCalendar protocols";
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 185cd2ede84c..b6f08a9206ee 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
 
+  doCheck = false; # fails
+
   meta = {
     homepage = http://www.gnu.org/software/libidn/;
     description = "Library for internationalized domain names";
diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix
index 67936fecdf4e..a6eb0bed2bb8 100644
--- a/pkgs/development/libraries/libindicator/default.nix
+++ b/pkgs/development/libraries/libindicator/default.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
     "localstatedir=\${TMPDIR}"
   ];
 
+  doCheck = false; # fails 8 out of 8 tests
+
   meta = {
     description = "A set of symbols and convenience functions for Ayatana indicators";
     homepage = https://launchpad.net/libindicator;
diff --git a/pkgs/development/libraries/liblo/default.nix b/pkgs/development/libraries/liblo/default.nix
index ae1d458b0d52..c72b9723dc52 100644
--- a/pkgs/development/libraries/liblo/default.nix
+++ b/pkgs/development/libraries/liblo/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0sn0ckc1d0845mhsaa62wf7f9v0c0ykiq796a30ja5096kib9qdc";
   };
 
-  meta = { 
+  doCheck = false; # fails 1 out of 3 tests
+
+  meta = {
     description = "Lightweight library to handle the sending and receiving of messages according to the Open Sound Control (OSC) protocol";
     homepage = https://sourceforge.net/projects/liblo;
     license = stdenv.lib.licenses.gpl2;
diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix
index 4903d54b4a31..22eb8ed64dd8 100644
--- a/pkgs/development/libraries/libnih/default.nix
+++ b/pkgs/development/libraries/libnih/default.nix
@@ -4,7 +4,7 @@ let version = "1.0.3"; in
 
 stdenv.mkDerivation rec {
   name = "libnih-${version}";
-  
+
   src = fetchurl {
     url = "http://code.launchpad.net/libnih/1.0/${version}/+download/libnih-${version}.tar.gz";
     sha256 = "01glc6y7z1g726zwpvp2zm79pyb37ki729jkh45akh35fpgp4xc9";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ dbus expat ];
 
+  doCheck = false; # fails 1 of 17 test
+
   meta = {
     description = "A small library for C application development";
     homepage = https://launchpad.net/libnih;
diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix
index 28c8a915c635..68302acac29f 100644
--- a/pkgs/development/libraries/libomxil-bellagio/default.nix
+++ b/pkgs/development/libraries/libomxil-bellagio/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fedora-fixes.patch ];
 
+  doCheck = false; # fails
+
   meta = with stdenv.lib; {
     homepage = https://sourceforge.net/projects/omxil/;
     description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components";
diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index bf9e2d079cd6..02e634b22a34 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  doCheck = false; # fails 1 out of 10 tests
+
   meta = with stdenv.lib; {
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.lgpl21;
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 7ee1733f34d2..dfd45f8e4ff2 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
         -i gdk-pixbuf-loader/librsvg.thumbnailer.in
   '';
 
+  doCheck = false; # fails 20 of 145 tests, very likely to be buggy
+
   # Merge gdkpixbuf and librsvg loaders
   postInstall = ''
     mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 92e9c3662c9f..75898852a095 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
     "--with-gnome=${if gnomeSupport then "yes" else "no"}"
   ];
 
+  doCheck = false; # fails with "no: command not found"
+
   passthru = {
     propagatedUserEnvPackages = [ glib-networking.out ];
     updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
index 8c85864f87a5..c112ab65a20d 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # fails to link
+
   meta = with stdenv.lib; {
     homepage = http://www.rasterbar.com/products/libtorrent/;
     description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 16fca9ce3d39..5967d2f4c319 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -29,12 +29,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  checkInputs = [ check ];
-
-  checkPhase = "ctest";
+  doCheck = false; # hangs, tries to access the net?
 
   # for some reason the tests are not running - it says "No tests found!!"
-  doCheck = true;
+  checkInputs = [ check ];
+  checkPhase = "ctest";
 
   meta = with stdenv.lib; {
     description = "P2P FOSS instant messaging application aimed to replace Skype";
diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix
index ea411d73b318..52bc0ac5cfd4 100644
--- a/pkgs/development/libraries/libuchardet/default.nix
+++ b/pkgs/development/libraries/libuchardet/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake ];
 
+  doCheck = false; # fails all the tests (ctest)
+
   meta = with stdenv.lib; {
     description = "Mozilla's Universal Charset Detector C/C++ API";
     homepage    = https://www.byvoid.com/zht/project/uchardet;
diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index b901d352808e..dbf1d7a3756f 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  doCheck = false; # fails
+
   meta = with stdenv.lib; {
     homepage = http://www.nongnu.org/libunwind;
     description = "A portable and efficient API to determine the call-chain of a program";
diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 3ea0155b4f42..50b995a03568 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ];
 
+  doCheck = false; # fails. needs DRI access
+
   meta = with stdenv.lib; {
     homepage = https://github.com/i-rinat/libvdpau-va-gl;
     description = "VDPAU driver with OpenGL/VAAPI backend";
diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index faeed680f3d6..3e0a2872c005 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     "-Dx-locale-root=${libX11.out}/share/X11/locale"
   ];
 
+  doCheck = false; # fails, needs unicode locale
+
   meta = with stdenv.lib; {
     description = "A library to handle keyboard descriptions";
     homepage = https://xkbcommon.org;
diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix
index 8d5a6bb65a91..60ee30177c02 100644
--- a/pkgs/development/libraries/openexr/default.nix
+++ b/pkgs/development/libraries/openexr/default.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ ilmbase zlib ];
 
   enableParallelBuilding = true;
+  doCheck = false; # fails 1 of 1 tests
 
   meta = with stdenv.lib; {
     homepage = http://www.openexr.com/;
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 56118c9bbb2c..93ba3f15a09c 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
       ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"
       ++ stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
+  doCheck = false; # needs a running LDAP server
+
   installFlags = [ "sysconfdir=$(out)/etc" "localstatedir=$(out)/var" ];
 
   # 1. Fixup broken libtool
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index a3d4857d57a9..9c6631862879 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
 
+  doInstallCheck = false; # probably a bug in this derivation
+
   meta = with stdenv.lib; {
     homepage = https://p11-glue.freedesktop.org/;
     platforms = platforms.all;
diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix
index 9603e45a8b44..2e1ed060acac 100644
--- a/pkgs/development/libraries/pcre2/default.nix
+++ b/pkgs/development/libraries/pcre2/default.nix
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ];
 
+  doCheck = false; # fails 1 of 3 tests
+
   postFixup = ''
     moveToOutput bin/pcre2-config "$dev"
   '';
diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix
index 441da25836d3..edec0b7f0699 100644
--- a/pkgs/development/libraries/popt/default.nix
+++ b/pkgs/development/libraries/popt/default.nix
@@ -8,10 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77";
   };
 
-  patches = if stdenv.isCygwin then [
+  patches = stdenv.lib.optionals stdenv.isCygwin [
     ./1.16-cygwin.patch
     ./1.16-vpath.patch
-  ] else null;
+  ];
+
+  doCheck = false; # fails
 
   meta = {
     description = "Command line option parsing library";
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 10f892bc4d00..c37c59997f64 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -192,6 +192,8 @@ stdenv.mkDerivation rec {
     sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release
   '';
 
+  doCheck = false; # qwebframe test fails with fontconfig errors
+
   postInstall = ''
     rm -rf $out/tests
   '';
diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index ed19814be34a..fbf7d8df53e3 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
   CFLAGS = [ "-DSQLITE_ENABLE_COLUMN_METADATA=1" "-DSQLITE_SECURE_DELETE=1" "-DSQLITE_ENABLE_UNLOCK_NOTIFY=1" "-DSQLITE_HAS_CODEC" ];
   LDFLAGS = lib.optional (readline != null) "-lncurses";
 
+  doCheck = false; # fails. requires tcl?
+
   meta = with stdenv.lib; {
     homepage = http://sqlcipher.net/;
     description = "Full Database Encryption for SQLite";
diff --git a/pkgs/development/libraries/tk/8.5.nix b/pkgs/development/libraries/tk/8.5.nix
index c3396dcdad22..141f6da14ce4 100644
--- a/pkgs/development/libraries/tk/8.5.nix
+++ b/pkgs/development/libraries/tk/8.5.nix
@@ -8,4 +8,3 @@ callPackage ./generic.nix (args // rec {
   };
 
 })
-
diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
index 666332d45fb8..cd8d42faa914 100644
--- a/pkgs/development/libraries/tk/8.6.nix
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -10,4 +10,3 @@ callPackage ./generic.nix (args // rec {
   patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
 
 })
-
diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix
index 843c6157479e..34024b23e270 100644
--- a/pkgs/development/libraries/tk/generic.nix
+++ b/pkgs/development/libraries/tk/generic.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_LINK = if stdenv.isDarwin then "-lfontconfig" else null;
 
+  doCheck = false; # fails. can't find itself
+
   inherit tcl;
 
   passthru = rec {
diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix
index 2252f8fe43cc..009826eef476 100644
--- a/pkgs/development/libraries/zeromq/3.x.nix
+++ b/pkgs/development/libraries/zeromq/3.x.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libuuid ];
 
+  doCheck = false; # fails all the tests (ctest)
+
   meta = with stdenv.lib; {
     branch = "3";
     homepage = http://www.zeromq.org;
diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index eea0fb727b01..333a37ba85d9 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
     sed -i 's,''${PACKAGE_PREFIX_DIR}/,,g' ZeroMQConfig.cmake.in
   '';
 
+  doCheck = false; # fails all the tests (ctest)
+
   meta = with stdenv.lib; {
     branch = "4";
     homepage = http://www.zeromq.org;
diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 875feea84d47..131533896ff9 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -59,6 +59,8 @@ stdenv.mkDerivation rec {
   configureFlags =
     stdenv.lib.optional (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin") "--enable-only64bit";
 
+  doCheck = false; # fails
+
   postInstall = ''
     for i in $out/lib/valgrind/*.supp; do
       substituteInPlace $i \
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 97c02cd9cc12..70ea1623f89c 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -101,6 +101,7 @@ stdenv.mkDerivation rec {
   # CMAKE_SYSTEM_NAME, etc.
   configurePlatforms = [ ];
 
+  doCheck = false; # fails
 
   meta = with stdenv.lib; {
     homepage = http://www.cmake.org/;
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index 95f992e490f4..f9ca826cd620 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   installPhase = "make PREFIX=/ DESTDIR=$out install";
 
+  doCheck = false; # fails with "ERROR: Run 'git submodule update --init test/samples' first."
+
   meta = with stdenv.lib; {
     description = "DTS Coherent Acoustics decoder with support for HD extensions";
     maintainers = with maintainers; [ edwtjo ];
@@ -21,4 +23,4 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
     platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 05418aa39a8c..d25f00276f62 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9";
 
   enableParallelBuilding = true;
+  doCheck = false; # fails
 
   meta = {
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index a52afd6c39ad..5bd989a4da88 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-scrollkeeper";
 
+  doCheck = false; # requires a lot of stuff
+  doInstallCheck = false; # fails
+
   passthru = {
     # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch
     respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch;
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix
index 9a3ff192ba93..5ef12d88c06c 100644
--- a/pkgs/development/tools/go2nix/default.nix
+++ b/pkgs/development/tools/go2nix/default.nix
@@ -33,6 +33,8 @@ buildGoPackage rec {
 
   allowGoReference = true;
 
+  doCheck = false; # tries to access the net
+
   meta = with stdenv.lib; {
     description = "Go apps packaging for Nix";
     homepage = https://github.com/kamilchm/go2nix;
diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix
index bd4dd28f599b..a80f1569329c 100644
--- a/pkgs/development/tools/govers/default.nix
+++ b/pkgs/development/tools/govers/default.nix
@@ -4,7 +4,7 @@ buildGoPackage rec {
   name = "govers-${version}";
   version = "20150109-${stdenv.lib.strings.substring 0 7 rev}";
   rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9";
-  
+
   goPackagePath = "github.com/rogpeppe/govers";
 
   src = fetchgit {
@@ -14,4 +14,7 @@ buildGoPackage rec {
   };
 
   dontRenameImports = true;
+
+  doCheck = false; # fails, silently
+
 }
diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix
index 9e70833e008f..31df050d5f80 100644
--- a/pkgs/development/tools/misc/autoconf/2.64.nix
+++ b/pkgs/development/tools/misc/autoconf/2.64.nix
@@ -23,10 +23,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preCheck =
-    # Make the Autotest test suite run in parallel.
-    '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
-    '';
+  # Make the Autotest test suite run in parallel.
+  preCheck =''
+    export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
+  '';
+
+  doInstallCheck = false; # fails
 
   meta = {
     homepage = http://www.gnu.org/software/autoconf/;
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index 579dea33df47..e9ea0ea1ea4f 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -24,10 +24,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preCheck =
-    # Make the Autotest test suite run in parallel.
-    '' export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
-    '';
+  # Make the Autotest test suite run in parallel.
+  preCheck =''
+    export TESTSUITEFLAGS="-j$NIX_BUILD_CORES"
+  '';
+
+  doInstallCheck = false; # fails
 
   meta = {
     homepage = http://www.gnu.org/software/autoconf/;
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 0829139595d7..25f78923e9c2 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -121,6 +121,8 @@ stdenv.mkDerivation rec {
     "--enable-fix-loongson2f-nop"
   ] ++ optionals gold [ "--enable-gold" "--enable-plugins" ];
 
+  doCheck = false; # fails
+
   enableParallelBuilding = true;
 
   passthru = {
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index 85821ee2089d..d1d35d9a4824 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   # XXX: The GNU ld wrapper does all sorts of nasty things wrt. RPATH, which
   # leads to the failure of a number of tests.
   doCheck = false;
+  doInstallCheck = false;
 
   # Don't run the native `strip' when cross-compiling.  This breaks at least
   # with `.a' files for MinGW.
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 15d00b0a2a52..219281f4ec17 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
          "ac_cv_func_posix_getgrgid_r=yes"
        ];
 
+  doCheck = false; # fails
 
   postInstall = ''rm -f "$out"/bin/*-pkg-config''; # clean the duplicate file
 
@@ -42,4 +43,3 @@ stdenv.mkDerivation rec {
   };
 
 }
-
diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 2b0c14ea8321..9c75e93bb1c1 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];
 
+  doCheck = false; # fails
+  doInstallCheck = false; # fails
+
   meta = {
     homepage = http://www.gnu.org/software/bison/;
     description = "Yacc-compatible parser generator";
diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index 02a7ce219c4b..2195cf7d2a39 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -56,6 +56,7 @@ in stdenv.mkDerivation rec {
     '';
 
   enableParallelBuilding = true;
+  doCheck = false; # fails 4 out of 6 tests
 
   meta = {
     homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters;
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index f5f8d6a5f107..76606edf53c3 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
+  doCheck = false; # requires "bashate"
+
   postInstall = ''
     sed -i \
       -e '2i PATH="${pathAdd}:$PATH"' \
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index c8e58dfbf6fb..cbbe4d5ca462 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -36,9 +36,7 @@ let
     substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
   '';
 
-  # use 'if c then x else null' to avoid rebuilding
-  # patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
-  patches = if stdenv.hostPlatform.isMusl then [
+  patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [
     (fetchpatch {
       url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0002-Provide-missing-secure_getenv-and-scandirat-function.patch?id=74b8427cc21f04e32030d047ae92caa618105b53";
       name = "0002-Provide-missing-secure_getenv-and-scandirat-function.patch";
@@ -55,7 +53,11 @@ let
       sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4";
     })
     # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12)
-  ] else null;
+  ];
+
+  # Set to `true` after the next FIXME gets fixed or this gets some
+  # common derivation infra. Too much copy-paste to fix one by one.
+  doCheck = false;
 
   # FIXME: convert these to a single multiple-outputs package?
 
@@ -99,6 +101,8 @@ let
       mv $out/lib/python* $python/lib/
     '';
 
+    inherit doCheck;
+
     meta = apparmor-meta "library";
   };
 
@@ -131,6 +135,8 @@ let
       done
     '';
 
+    inherit doCheck;
+
     meta = apparmor-meta "user-land utilities";
   };
 
@@ -154,6 +160,8 @@ let
     makeFlags = ''LANGS= USE_SYSTEM=1'';
     installFlags = ''DESTDIR=$(out) BINDIR=$(out)/bin'';
 
+    inherit doCheck;
+
     meta = apparmor-meta "binary user-land utilities";
   };
 
@@ -177,6 +185,8 @@ let
     makeFlags = ''LANGS= USE_SYSTEM=1 INCLUDEDIR=${libapparmor}/include'';
     installFlags = ''DESTDIR=$(out) DISTRO=unknown'';
 
+    inherit doCheck;
+
     meta = apparmor-meta "rule parser";
   };
 
@@ -192,6 +202,8 @@ let
     makeFlags = ''USE_SYSTEM=1'';
     installFlags = ''DESTDIR=$(out)'';
 
+    inherit doCheck;
+
     meta = apparmor-meta "PAM service";
   };
 
@@ -204,6 +216,8 @@ let
     postPatch = "cd ./profiles";
     installFlags = ''DESTDIR=$(out) EXTRAS_DEST=$(out)/share/apparmor/extra-profiles'';
 
+    inherit doCheck;
+
     meta = apparmor-meta "profiles";
   };
 
@@ -218,6 +232,8 @@ let
       cp -R ./kernel-patches/* "$out"
     '';
 
+    inherit doCheck;
+
     meta = apparmor-meta "kernel patches";
   };
 
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index b844bf72d82a..ab75d38ba716 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -98,6 +98,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # tries to access the net
+
   meta = with stdenv.lib; {
     description = "Tiny versions of common UNIX utilities in a single small executable";
     homepage = https://busybox.net/;
diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 15b3903ddd1a..54a92d784e2a 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--datadir=$(prefix)/data";
 
+  doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
+
   meta = {
     homepage = https://github.com/vcrhonek/hwdata;
     description = "Hardware Database, including Monitors, pci.ids, usb.ids, and video cards";
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index a6f399c0fba4..bbef2bd19aea 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -53,6 +53,9 @@ stdenv.mkDerivation {
       "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation"
     ];
 
+  doCheck = false; # requires "sparse"
+  doInstallCheck = false; # same
+
   separateDebugInfo = true;
   installFlags = "install install-man ASCIIDOC8=1 prefix=$(out)";
 
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index bd84e121a7d6..8cda636e987d 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -59,6 +59,8 @@ stdenv.mkDerivation {
     })
   ];
 
+  doCheck = false; # requires root
+
   # To prevent make install from failing.
   preInstall = "installFlags=\"OWNER= GROUP= confdir=$out/etc\"";
 
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 5f92dfcc8390..1d380063f884 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -70,6 +70,8 @@ stdenv.mkDerivation rec {
       sed -e 's/pam_rhosts//g' -i modules/Makefile.in
   '';
 
+  doCheck = false; # fails
+
   meta = {
     homepage = http://ftp.kernel.org/pub/linux/libs/pam/;
     description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user";
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7c9514883093..63ed5a5cbb3f 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -170,6 +170,8 @@ in stdenv.mkDerivation rec {
       "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
     ];
 
+  doCheck = false; # fails a bunch of tests
+
   postInstall = ''
     # sysinit.target: Don't depend on
     # systemd-tmpfiles-setup.service. This interferes with NixOps's
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 1c8e429c9455..a057cb3c101e 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
     "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
   ];
 
+  doCheck = false; # fails
+
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/udisks;
     description = "A daemon and command-line utility for querying and manipulating storage devices";
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 713ef974f9fb..d62038c7b0b0 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_LINK = "-lgcc_s";
 
+  doCheck = false; # fails with "env: './linux/integration-test': No such file or directory"
+
   installFlags = "historydir=$(TMPDIR)/foo";
 
   meta = {
diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 4002c6b3542f..1aa487055e27 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  doCheck = false; # requires root and the net
+
   meta = {
     homepage = http://www.isc.org/software/bind;
     description = "Domain name server";
diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index 77dcfa43c43f..a6b738270a9a 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ file perl unzip openssl ];
 
   enableParallelBuilding = true;
+  doCheck = false; # fails
 
   postInstall = ''
     for f in "$out/lib/"*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index a2093962ea93..5d348c129437 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -75,6 +75,8 @@ let
         wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin
       '';
 
+    doInstallCheck = false; # needs a running daemon?
+
     disallowedReferences = [ stdenv.cc ];
 
     passthru = {
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 5efa4bfcfd5d..5d4c528bb0b7 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -582,6 +582,10 @@ in
     nativeBuildInputs = attrs.nativeBuildInputs ++ [args.bison args.flex];
   };
 
+  xauth = attrs: attrs // {
+    doCheck = false; # fails
+  };
+
   xcursorthemes = attrs: attrs // {
     buildInputs = attrs.buildInputs ++ [xorg.xcursorgen];
     configureFlags = "--with-cursordir=$(out)/share/icons";
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 4677ee45afb2..7532cd899cc6 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
     sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
   '' else null;
 
+  doCheck = false; # fails
+  doInstallCheck = false; # fails
+
   meta = {
     homepage = http://www.gnu.org/software/tar/;
     description = "GNU implementation of the `tar' archiver";
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index cfe41d3dfe7a..c39216f1e0cc 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
   # In stdenv-linux, prevent a dependency on bootstrap-tools.
   makeFlags = "SHELL=/bin/sh GREP=grep";
 
+  doCheck = false; # fails
+
   meta = {
     homepage = https://www.gnu.org/software/gzip/;
     description = "GNU zip compression program";
diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix
index 8797c21aa235..4af7c9fb8c26 100644
--- a/pkgs/tools/filesystems/curlftpfs/default.nix
+++ b/pkgs/tools/filesystems/curlftpfs/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [fuse curl glib zlib];
 
+  doCheck = false; # fails, doesn't work well too, btw
+
   meta = {
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix
index b360f9a34503..2fa4bb90a8ea 100644
--- a/pkgs/tools/graphics/graphviz/base.nix
+++ b/pkgs/tools/graphics/graphviz/base.nix
@@ -43,6 +43,13 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  # ''
+  #   substituteInPlace rtest/rtest.sh \
+  #     --replace "/bin/ksh" "${mksh}/bin/mksh"
+  # '';
+
+  doCheck = false; # fails with "Graphviz test suite requires ksh93" which is not in nixpkgs
+
   preAutoreconf = "./autogen.sh";
 
   postFixup = optionalString (xorg != null) ''
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 59ddab7294f5..d3507b57cbd0 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -125,6 +125,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # requires X11 daemon
   doInstallCheck = true;
   installCheckPhase = "$out/bin/ibus version";
 
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index c192e9f42ab1..f86d44c580de 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ flex db ];
 
+  doCheck = false; # needs "y" tool
+
   meta = {
     homepage = http://bogofilter.sourceforge.net/;
     longDescription = ''
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index c7fd29da8ac4..0f6fb38ef3bc 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -57,6 +57,9 @@ stdenv.mkDerivation rec {
     ./bootstrap --skip-git --gnulib-srcdir=./gnulib
   '';
 
+  doCheck = false; # tries to wget some fonts
+  doInstallCheck = doCheck;
+
   postInstall =
     # get rid of the runtime dependency on python
     lib.optionalString (!withPython) ''
@@ -72,4 +75,3 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
   };
 }
-
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix
index 23355d61bea8..068e68875468 100644
--- a/pkgs/tools/networking/atftp/default.nix
+++ b/pkgs/tools/networking/atftp/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
   # Expects pre-GCC5 inline semantics
   NIX_CFLAGS_COMPILE = "-std=gnu89";
 
+  doCheck = false; # fails
+
   meta = {
     description = "Advanced tftp tools";
     maintainers = [ lib.maintainers.raskin ];
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 32a8a7888484..4a1ff7f1798a 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -79,6 +79,8 @@ stdenv.mkDerivation rec {
   CXX = "c++";
   CXXCPP = "c++ -E";
 
+  doCheck = false; # expensive, fails
+
   postInstall = ''
     moveToOutput bin/curl-config "$dev"
     sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix
index 950a6e310ebd..134e9b6df76d 100644
--- a/pkgs/tools/networking/maildrop/default.nix
+++ b/pkgs/tools/networking/maildrop/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./maildrop.configure.hack.patch ]; # for building in chroot
 
+  doCheck = false; # fails with "setlocale: LC_ALL: cannot change locale (en_US.UTF-8)"
+
   meta = with stdenv.lib; {
     homepage = http://www.courier-mta.org/maildrop/;
     description = "Mail filter/mail delivery agent that is used by the Courier Mail Server";
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index ebe40c6192cd..9a129f522134 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -85,6 +85,8 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook intltool pkgconfig libxslt docbook_xsl ];
 
+  doCheck = false; # requires /sys, the net
+
   preInstall = ''
     installFlagsArray=( "sysconfdir=$out/etc" "localstatedir=$out/var" "runstatedir=$out/var/run" )
   '';
diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix
index 3a5117653c83..fc907777324c 100644
--- a/pkgs/tools/networking/telnet/default.nix
+++ b/pkgs/tools/networking/telnet/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ncurses];
 
+  doInstallCheck = false; # fails
+
   meta = {
     description = "A client and daemon for the Telnet protocol";
     homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/;
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index a81fffa20357..4c6df817a72d 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -53,6 +53,8 @@ in stdenv.mkDerivation rec {
       libX11 gtk2 pygtk pysqlite pygobject2 pycairo
     ];
 
+  doCheck = false; # fails 3 tests, probably needs the net
+
   meta = {
     description = "A free and open source utility for network discovery and security auditing";
     homepage    = http://www.nmap.org;
diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix
index 485b34cff88d..22d7e93fe476 100644
--- a/pkgs/tools/security/rhash/default.nix
+++ b/pkgs/tools/security/rhash/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
   # configure script is not autotools-based, doesn't support these options
   configurePlatforms = [ ];
 
+  doCheck = false; # fails
+
   installTargets = [ "install" "install-lib-shared" "install-lib-so-link" ];
   postInstall = "make -C librhash install-headers";
 
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 85dba08255da..bcafefb72c95 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = false; # needs root
+
   postInstall =
     ''
     rm -f $out/share/doc/sudo/ChangeLog
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index eda2197b9f61..baac00bfa763 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -33,12 +33,15 @@ stdenv.mkDerivation rec {
       substituteInPlace ./configure --replace "test -d /var/run" "true"
     '';
 
-  configureFlags =
-    ''
-       --with-etcdir=/etc/at
-       --with-jobdir=/var/spool/atjobs --with-atspool=/var/spool/atspool
-       --with-daemon_username=atd --with-daemon_groupname=atd
-    '';
+  configureFlags = [
+    "--with-etcdir=/etc/at"
+    "--with-jobdir=/var/spool/atjobs"
+    "--with-atspool=/var/spool/atspool"
+    "--with-daemon_username=atd"
+    "--with-daemon_groupname=atd"
+  ];
+
+  doCheck = false; # need "prove" tool
 
   # Ensure that "batch" can invoke the setuid "at" wrapper, if it exists, or
   # else we get permission errors (on NixOS). "batch" is a shell script, so
diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
index 75922a6c830c..238676020e8b 100644
--- a/pkgs/tools/text/patchutils/default.nix
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  doCheck = false; # fails
+
   meta = with stdenv.lib; {
     description = "Tools to manipulate patch files";
     homepage = http://cyberelk.net/tim/software/patchutils;
diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix
index bfd150eefdaf..27fa7bb91a8f 100644
--- a/pkgs/tools/text/sgml/opensp/default.nix
+++ b/pkgs/tools/text/sgml/opensp/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
   buildInputs = stdenv.lib.optionals stdenv.isCygwin [ autoconf automake gettext libiconv libtool ]
     ++ [ xmlto docbook_xml_dtd_412 libxslt docbook_xsl ];
 
+  doCheck = false; # fails
+
   meta = {
     description = "A suite of SGML/XML processing tools";
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix
index 9c802a1187a8..e38e4a1f0596 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
   name = "docbook2X-0.8.8";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/docbook2x/${name}.tar.gz";
     sha256 = "0ifwzk99rzjws0ixzimbvs83x6cxqk1xzmg84wa1p7bs6rypaxs0";
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
       --replace '${"\$" + "{prefix}"}' "$out"
   '';
 
+  doCheck = false; # fails a lot of tests
+
   postInstall = ''
     perlPrograms="db2x_manxml db2x_texixml db2x_xsltproc
                   docbook2man docbook2texi";
@@ -34,12 +36,12 @@ stdenv.mkDerivation rec {
     do
       # XXX: We work around the fact that `wrapProgram' doesn't support
       # spaces below by inserting escaped backslashes.
-      wrapProgram $out/bin/$i --prefix PERL5LIB :			\
+      wrapProgram $out/bin/$i --prefix PERL5LIB : \
         "${XMLSAX}/lib/perl5/site_perl:${XMLSAXBase}/lib/perl5/site_perl:${XMLParser}/lib/perl5/site_perl" \
-	--prefix PERL5LIB :						\
-	"${XMLNamespaceSupport}/lib/perl5/site_perl"			\
-	--prefix XML_CATALOG_FILES "\ "					\
-	"$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml"
+        --prefix PERL5LIB : \
+        "${XMLNamespaceSupport}/lib/perl5/site_perl" \
+        --prefix XML_CATALOG_FILES "\ " \
+        "$out/share/docbook2X/dtd/catalog.xml\ $out/share/docbook2X/xslt/catalog.xml\ ${docbook_xml_dtd_43}/xml/dtd/docbook/catalog.xml"
     done
 
     wrapProgram $out/bin/sgml2xml-isoent --prefix PATH : \
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
index 92778c5eed1c..6555c999d7f2 100644
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@@ -204,6 +204,8 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
   CXXFLAGS = "-std=c++11 -Wno-reserved-user-defined-literal"; # TODO: remove once texlive 2018 is out?
   enableParallelBuilding = true;
 
+  doCheck = false; # fails
+
   # now distribute stuff into outputs, roughly as upstream TL
   # (uninteresting stuff remains in $out, typically duplicates from `core`)
   outputs = [ "out" "metafont" "metapost" "luatex" "xetex" ];
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 3da443098037..97424a10160b 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -438,6 +438,8 @@ let
       );
     '';
 
+    doCheck = false; # fails to find itself
+
     installTargets = [ "install" "install-unix" ];
 
     meta = with stdenv.lib; {

From bd1d0e02922d0d18a3e4d99a82bdf8c6db23055d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 25 Apr 2018 02:45:58 +0000
Subject: [PATCH 0369/3370] flashrom: fix build with gcc7

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

diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index b1e093126584..1bdab1e841f8 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
     sha256 = "0i9wg1lyfg99bld7d00zqjm9f0lk6m0q3h3n9c195c9yysq5ccfb";
   };
 
+  # Newer versions of libusb deprecate some API flashrom uses.
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "-Werror" "-Werror -Wno-error=deprecated-declarations -Wno-error=unused-const-variable="
+  '';
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libftdi pciutils ];
 

From ec632b745fb72e5070983dd3dff78ed81466243d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 24 Apr 2018 23:18:35 -0500
Subject: [PATCH 0370/3370] qtwebengine: rewrite

Fixes #39334
and Fixes #36729

Also, Fixes #36932 (hopefully it's still building)

(This might be able to be able to be cherry-picked to 18.03 but be
careful - chromium is extremely touchy. Probably best to wait for it
to be built successfully on Hydra a few times.)
---
 .../libraries/qt-5/mkDerivation.nix           |  5 +-
 .../libraries/qt-5/modules/qtwebengine.nix    | 95 ++++++++++++++++---
 2 files changed, 82 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix
index 739c9b4a1608..96014cfbc779 100644
--- a/pkgs/development/libraries/qt-5/mkDerivation.nix
+++ b/pkgs/development/libraries/qt-5/mkDerivation.nix
@@ -9,9 +9,8 @@ args:
 let
   args_ = {
 
-    qmakeFlags =
-      (args.qmakeFlags or [])
-      ++ [ ("CONFIG+=" + (if debug then "debug" else "release")) ];
+    qmakeFlags = [ ("CONFIG+=" + (if debug then "debug" else "release")) ]
+              ++ (args.qmakeFlags or []);
 
     NIX_CFLAGS_COMPILE =
       optional (!debug) "-DQT_NO_DEBUG"
diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index 08345510d787..e798d529ce1b 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -11,9 +11,8 @@
 , libcap
 , pciutils
 , systemd
-
 , enableProprietaryCodecs ? true
-
+, gn, darwin, openbsm
 , lib, stdenv # lib.optional, needsPax
 }:
 
@@ -25,7 +24,7 @@ qtModule {
   name = "qtwebengine";
   qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
   nativeBuildInputs = [
-    bison coreutils flex git gperf ninja pkgconfig python2 which
+    bison coreutils flex git gperf ninja pkgconfig python2 which gn
   ];
   doCheck = true;
   outputs = [ "bin" "dev" "out" ];
@@ -61,8 +60,50 @@ qtModule {
 
       sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
         src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc
+    ''
+    + optionalString stdenv.isDarwin ''
+      # Remove annoying xcode check
+      substituteInPlace mkspecs/features/platform.prf \
+        --replace "lessThan(QMAKE_XCODE_VERSION, 7.3)" false
+      substituteInPlace src/core/config/mac_osx.pri \
+        --replace /usr ${stdenv.cc} \
+        --replace "isEmpty(QMAKE_MAC_SDK_VERSION)" false
+
+    # FIXME Needed with old Apple SDKs
+    # Abandon all hope ye who try to make sense of this.
+    substituteInPlace src/3rdparty/chromium/base/mac/foundation_util.mm \
+      --replace "NSArray<NSString*>*" "NSArray*"
+    substituteInPlace src/3rdparty/chromium/base/mac/sdk_forward_declarations.h \
+      --replace "NSDictionary<VNImageOption, id>*" "NSDictionary*" \
+      --replace "NSArray<VNRequest*>*" "NSArray*" \
+      --replace "typedef NSString* VNImageOption NS_STRING_ENUM" "typedef NSString* VNImageOption"
+
+    cat <<EOF > src/3rdparty/chromium/build/mac/find_sdk.py
+#!/usr/bin/env python
+print("10.10.0")
+print("")
+EOF
+
+    cat <<EOF > src/3rdparty/chromium/build/config/mac/sdk_info.py
+#!/usr/bin/env python
+print('xcode_version="9.1"')
+print('xcode_version_int=9')
+print('xcode_build="9B55"')
+print('machine_os_build="17E199"')
+print('sdk_path=""')
+print('sdk_version="10.10"')
+print('sdk_platform_path=""')
+print('sdk_build="17B41"')
+EOF
+
+    # Apple has some secret stuff they don't share with OpenBSM
+    substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
+      --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
+    substituteInPlace src/3rdparty/chromium/sandbox/mac/bootstrap_sandbox.cc \
+      --replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
     '';
 
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_10 -DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_10";
 
   preConfigure = ''
     export NINJAFLAGS=-j$NIX_BUILD_CORES
@@ -70,13 +111,9 @@ qtModule {
     if [ -d "$PWD/tools/qmake" ]; then
         QMAKEPATH="$PWD/tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
     fi
- '';
+   '';
 
-  qmakeFlags =
-    [
-      # Use system Ninja because bootstrapping it is fragile
-      "WEBENGINE_CONFIG+=use_system_ninja"
-    ] ++ optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs";
+  qmakeFlags = optional enableProprietaryCodecs "-- -proprietary-codecs";
 
   propagatedBuildInputs = [
     # Image formats
@@ -90,9 +127,10 @@ qtModule {
 
     # Text rendering
     harfbuzz icu
-  ]
-  ++ optionals (!stdenv.isDarwin) [
-    dbus zlib minizip snappy nss protobuf jsoncpp libevent
+
+    libevent
+  ] ++ optionals (!stdenv.isDarwin) [
+    dbus zlib minizip snappy nss protobuf jsoncpp
 
     # Audio formats
     alsaLib
@@ -106,17 +144,44 @@ qtModule {
     # X11 libs
     xorg.xrandr libXScrnSaver libXcursor libXrandr xorg.libpciaccess libXtst
     xorg.libXcomposite xorg.libXdamage libdrm
-  ];
+  ]
+
+  # FIXME These dependencies shouldn't be needed but can't find a way
+  # around it. Chromium pulls this in while bootstrapping GN.
+  ++ lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [
+    libobjc
+    cctools
+
+    # frameworks
+    ApplicationServices
+    Foundation
+    AppKit
+    ImageCaptureCore
+    CoreBluetooth
+    IOBluetooth
+    CoreWLAN
+    Quartz
+    Cocoa
+
+    openbsm
+    libunwind
+  ]);
 
   dontUseNinjaBuild = true;
   dontUseNinjaInstall = true;
 
-  postInstall = ''
+  postInstall = lib.optionalString stdenv.isLinux ''
     cat > $out/libexec/qt.conf <<EOF
     [Paths]
     Prefix = ..
     EOF
-
     paxmark m $out/libexec/QtWebEngineProcess
   '';
+
+  meta = with lib; {
+    description = "A web engine based on the Chromium web browser";
+    maintainers = with maintainers; [ matthewbauer ];
+    platforms = platforms.unix;
+  };
+
 }

From e4e85628066b0fa33ff5d3ba01ad24a50974639a Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 25 Apr 2018 00:05:18 -0500
Subject: [PATCH 0371/3370] nixos: typofixes/tab deletion in some foundationdb
 docs/module

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/databases/foundationdb.nix | 8 ++++----
 nixos/modules/services/databases/foundationdb.xml | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index ba921a9c1521..22acddc8ca91 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -206,7 +206,7 @@ in
             default = null;
             type = types.nullOr types.str;
             description = ''
-	      Machine identifier key. All processes on a machine should share a
+              Machine identifier key. All processes on a machine should share a
               unique id. By default, processes on a machine determine a unique id to share.
               This does not generally need to be set.
             '';
@@ -216,7 +216,7 @@ in
             default = null;
             type = types.nullOr types.str;
             description = ''
-	      Zone identifier key. Processes that share a zone id are
+              Zone identifier key. Processes that share a zone id are
               considered non-unique for the purposes of data replication.
               If unset, defaults to machine id.
             '';
@@ -226,7 +226,7 @@ in
             default = null;
             type = types.nullOr types.str;
             description = ''
-	      Data center identifier key. All processes physically located in a
+              Data center identifier key. All processes physically located in a
               data center should share the id. If you are depending on data
               center based replication this must be set on all processes.
             '';
@@ -236,7 +236,7 @@ in
             default = null;
             type = types.nullOr types.str;
             description = ''
-	      Data hall identifier key. All processes physically located in a
+              Data hall identifier key. All processes physically located in a
               data hall should share the id. If you are depending on data
               hall based replication this must be set on all processes.
             '';
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index d10a5cfe836e..2a0e3c76c9d8 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -16,8 +16,8 @@
 
 <para>FoundationDB (or "FDB") is a distributed, open source, high performance,
 transactional key-value store. It can store petabytes of data and deliver
-exceptional performance while maintaining consistency and ACID semantics over a
-large cluster.</para>
+exceptional performance while maintaining consistency and ACID semantics
+(serializable transactions) over a large cluster.</para>
 
 <section><title>Configuring and basic setup</title>
 
@@ -101,7 +101,7 @@ FoundationDB worker processes that should be started on the machine.</para>
 
 <para>FoundationDB worker processes typically require 4GB of RAM per-process at
 minimum for good performance, so this option is set to 1 by default since the
-maximum aount of RAM is unknown. You're advised to abide by this restriction,
+maximum amount of RAM is unknown. You're advised to abide by this restriction,
 so pick a number of processes so that each has 4GB or more.</para>
 
 <para>A similar option exists in order to scale backup agent processes,
@@ -129,7 +129,8 @@ client applications will use to find and join coordinators. Note that this file
 <emphasis>can not</emphasis> be managed by NixOS so easily: FoundationDB is
 designed so that it will rewrite the file at runtime for all clients and nodes
 when cluster coordinators change, with clients transparently handling this
-without intervention.</para>
+without intervention. It is fundamentally a mutable file, and you should not
+try to manage it in any way in NixOS.</para>
 
 <para>When dealing with a cluster, there are two main things you want to
 do:</para>

From 22fb762e1a939299ecad27179ca6c5d4013c367e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 25 Apr 2018 00:10:08 -0500
Subject: [PATCH 0372/3370] live555: add aarch64-linux entry

Fixes eval
---
 pkgs/development/libraries/live555/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 69c16878fdf5..e0cf3328bac2 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
       x86_64-darwin = "macosx";
       i686-linux = "linux";
       x86_64-linux = "linux-64bit";
+      aarch64-linux = "linux-64bit";
     }.${stdenv.system}}
   '';
 

From 0a8c91a931ea270e8b1d66f592f6acba9b4b5fcf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 25 Apr 2018 00:17:21 -0500
Subject: [PATCH 0373/3370] inkscape: typo

---
 pkgs/applications/graphics/inkscape/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index b5d11d912a5e..9a8ef6bd7744 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
-    maintainers = with maintainters; [ matthewbauer ];
+    maintainers = with maintainers; [ matthewbauer ];
   };
 }

From 72ec248eda744ccdf1233cebbeeb176355f4b0d8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 25 Apr 2018 06:27:21 +0000
Subject: [PATCH 0374/3370] coqPackages.contribs.containers: make available for
 Coq 8.8

---
 pkgs/development/coq-modules/contribs/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index 82d1f7a4746b..7b274812737e 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -189,7 +189,7 @@ let mkContrib = repo: revs: param:
     sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33";
   };
 
-  containers = mkContrib "containers" [ "8.6" "8.7" ] {
+  containers = mkContrib "containers" [ "8.6" "8.7" "8.8" ] {
     "8.6" = {
       version = "8.6.0";
       rev = "fa1fec7";
@@ -200,6 +200,11 @@ let mkContrib = repo: revs: param:
       rev = "77ac16366529c9e558f70ba86f0168a76ca76b8f";
       sha256 = "01gp8injb0knaxgqsdc4x9h8714k7qxg7j5w7y6i45dnpd81ndr4";
     };
+    "8.8" = {
+      version = "20180330";
+      rev = "52b86bed1671321b25fe4d7495558f9f221b12aa";
+      sha256 = "0hbnrwdgryr52170cfrlbiymr88jsyxilnpr343vnprqq3zk1xz0";
+    };
   }."${coq.coq-version}";
 
   continuations = mkContrib "continuations" [ ] {

From 31e9e752ae0b998598ee1650b8c0db9cb04a0349 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 25 Apr 2018 03:16:13 -0400
Subject: [PATCH 0375/3370] fio: 3.5 -> 3.6, enable on darwin (#39452)

---
 pkgs/tools/system/fio/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index ee7c70240b0a..6e63f467f600 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -15,11 +15,15 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  buildInputs = [ libaio python zlib ];
+  buildInputs = [ python zlib ]
+    ++ stdenv.lib.optional (!stdenv.isDarwin) libaio;
 
   enableParallelBuilding = true;
 
   postPatch = ''
+    substituteInPlace Makefile \
+      --replace "mandir = /usr/share/man" "mandir = \$(prefix)/man" \
+      --replace "sharedir = /usr/share/fio" "sharedir = \$(prefix)/share/fio"
     substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
   '';
 

From 6891bda37071bbecdb343ff941ba893511f5fd70 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 25 Apr 2018 00:06:11 +0200
Subject: [PATCH 0376/3370] nixos/tests/keymap: wait for xdotool to succeed

xdotool failed in rare cases when a window was already created
but not yet decorated by the window manager.
also prevent a (never observed but possible) race condition
---
 nixos/tests/keymap.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix
index abff90d5047d..be880388314c 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -8,17 +8,19 @@ let
 
   testReader = pkgs.writeScript "test-input-reader" ''
     #!${pkgs.stdenv.shell}
-    rm -f ${resultFile}
+    rm -f ${resultFile} ${resultFile}.tmp
     logger "testReader: START: Waiting for $1 characters, expecting '$2'."
     touch ${readyFile}
     read -r -N $1 chars
     rm -f ${readyFile}
 
     if [ "$chars" == "$2" ]; then
-      logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}
+      logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp
     else
-      logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}
+      logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp
     fi
+    # rename after the file is written to prevent a race condition
+    mv  ${resultFile}.tmp ${resultFile}
   '';
 
 
@@ -52,7 +54,7 @@ let
           if ($desc eq "Xorg keymap") {
             # make sure the xterm window is open and has focus
             $machine->waitForWindow(qr/testterm/);
-            $machine->succeed("${pkgs.xdotool}/bin/xdotool search --name testterm windowactivate --sync");
+            $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync");
           }
 
           # wait for reader to be ready
@@ -71,7 +73,7 @@ let
       $machine->waitForX;
 
       mkTest "VT keymap", "openvt -sw --";
-      mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -fullscreen -e";
+      mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e";
     '';
   };
 

From 8ffaeecfca73704c67831e83d59890c52197b9c0 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 18 Apr 2018 11:28:52 +0300
Subject: [PATCH 0377/3370] clion: 2018.1 -> 2018.1.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 84ba32c41256..de98c4b049f3 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -239,12 +239,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.1"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "1mwajah0qghkw2f4hap5f35x826h8318a0bjbn9lpknffgfi0zc3"; /* updated by script */
+      sha256 = "170xgm3dzakvlwxx5kpy4zilq140kzcaxx9g3dm1w0i83g4l5j48"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From a52b5be4a26ea74f3f6062330d5a6e63239ac5d7 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 18 Apr 2018 11:29:07 +0300
Subject: [PATCH 0378/3370] goland: 2018.1 -> 2018.1.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index de98c4b049f3..f6db50a106b7 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -265,12 +265,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.1"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "0r008q3dn30zbn9zzyjj6pz3myxrb9i1s96kinj9vy0cj7gb0aai"; /* updated by script */
+      sha256 = "11bkbh661fpypr1v89xba4nmf02l4map9jdlj2ky6d77l9295ip3"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "goland_release";

From e74d28ef96827252dc9abd53423439fbd7fac5d4 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 18 Apr 2018 11:29:23 +0300
Subject: [PATCH 0379/3370] idea-community: 2018.1 -> 2018.1.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index f6db50a106b7..5f08271c5cd1 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -278,12 +278,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "08dlyf2zfgcbbbnadx5x0n877diyglg9h7h39njcw4ajh4aninyq"; /* updated by script */
+      sha256 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From 21feb8a2eda7a309a2498cdcebd18cf1e698a12f Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 18 Apr 2018 11:29:36 +0300
Subject: [PATCH 0380/3370] idea-ultimate: 2018.1 -> 2018.1.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 5f08271c5cd1..f5b87eb26e77 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -291,12 +291,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "1483w692n29v22f5vchh8fbizwn74wlznd5pvlscxs4ly9af7935"; /* updated by script */
+      sha256 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";

From 12f07ac1bc9f5ca718305a7199456f802c4cd058 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 18 Apr 2018 11:29:54 +0300
Subject: [PATCH 0381/3370] pycharm-community: 2018.1 -> 2018.1.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index f5b87eb26e77..0dd4bc2a9b67 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -317,12 +317,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.1"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0f3chibs7lp3kgkd0ah6d7z1lf3n4scalmadpxcn0fd6bap5mnjb"; /* updated by script */
+      sha256 = "1s26jczag12p3v3r6fdk02mmg55npzn0mzkmgcvh40fr7q7mq2pr"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm_Release";

From 609766bf80598d58445a2099741e07686ddac96b Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 18 Apr 2018 11:30:12 +0300
Subject: [PATCH 0382/3370] pycharm-professional: 2018.1 -> 2018.1.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 0dd4bc2a9b67..cd792cb31b81 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -330,12 +330,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.1"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0lq5bqnfxj02sbd4yaf3ma6nps7cnf0d11dzqjv9m6b41y55dp0k"; /* updated by script */
+      sha256 = "0k7529xhhnvjz7ycs5ab4qc4cr35g1v2qxlswy1aqcgzh2zg4c85"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm_Release";

From ef038375f8701125b35832147cfbf7706a52c809 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 18 Apr 2018 11:30:37 +0300
Subject: [PATCH 0383/3370] ruby-mine: 2017.3.3 -> 2017.3.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index cd792cb31b81..e6c84a308e95 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -356,12 +356,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2017.3.3"; /* updated by script */
+    version = "2017.3.4"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "1b0y8pcg8wwprm1swrl4laajnmx2c359bi7ahsyfjfprlzwx7wck"; /* updated by script */
+      sha256 = "094m45jhrh4n64q5lrgfyvrimqjll6kcl2cx3cbsa3pp7x16abqn"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "rm2017.3";

From 2479b449b6db3409abf7752e0455dc08a19805c3 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 18 Apr 2018 11:30:53 +0300
Subject: [PATCH 0384/3370] webstorm: 2018.1 -> 2018.1.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index e6c84a308e95..aedfb1fec3de 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -369,12 +369,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2018.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "1lx852gycrzajh58k1r2wfpwwjna6y3fsd5srw5fgzw58f120vn4"; /* updated by script */
+      sha256 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WS_Release";

From 2848b5db7d303fcb276958dbc4a78c185f5e1264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 25 Apr 2018 11:16:06 +0200
Subject: [PATCH 0385/3370] nix-zsh-completions: 0.3.8 -> 0.3.9

---
 pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 2bcff6b809dc..8e15476451a8 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let
-  version = "0.3.8";
+  version = "0.3.9";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "spwhitt";
     repo = "nix-zsh-completions";
     rev = "${version}";
-    sha256 = "05ynd38br2kn657g7l01jg1q8ja9xwrdyb95w02gh7j9cww2k06w";
+    sha256 = "1ysc9g72yj63ygm915a316f1hcklmgswyrwsq5abwwj48001y01n";
   };
 
   installPhase = ''

From 954e02f835ca42d20f6fd01a940f06edd3fbb0a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 25 Apr 2018 11:19:51 +0200
Subject: [PATCH 0386/3370] nix-bash-completions: 0.6.5 -> 0.6.6

---
 pkgs/shells/bash/nix-bash-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/bash/nix-bash-completions/default.nix b/pkgs/shells/bash/nix-bash-completions/default.nix
index 739dbd538a6e..b76e65ca8719 100644
--- a/pkgs/shells/bash/nix-bash-completions/default.nix
+++ b/pkgs/shells/bash/nix-bash-completions/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.5";
+  version = "0.6.6";
   name = "nix-bash-completions-${version}";
 
   src = fetchFromGitHub {
     owner = "hedning";
     repo = "nix-bash-completions";
     rev = "v${version}";
-    sha256 = "10f70jw81vky52s3fidf7vzl725fihiypsw39825wnkpynayhmrg";
+    sha256 = "1lz9cgacyd4cphr7l90x4hn0ifhxwzz2d5829w1jcglasfacfpsw";
   };
 
   # To enable lazy loading via. bash-completion we need a symlink to the script

From c60a874ef5a325fd881a2fa11b7dfe405c41022f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Apr 2018 12:01:58 +0200
Subject: [PATCH 0387/3370] LTS Haskell 11.6

---
 .../configuration-hackage2nix.yaml            | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e15482a6708c..5e12e90a3c3d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.5
+  # LTS Haskell 11.6
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -69,7 +69,7 @@ default-package-overrides:
   - aeson-compat ==0.3.7.1
   - aeson-diff ==1.1.0.4
   - aeson-extra ==0.4.1.0
-  - aeson-generic-compat ==0.0.1.1
+  - aeson-generic-compat ==0.0.1.2
   - aeson-injector ==1.1.0.0
   - aeson-picker ==0.1.0.4
   - aeson-pretty ==0.8.7
@@ -83,10 +83,10 @@ default-package-overrides:
   - alerts ==0.1.0.0
   - alex ==3.2.4
   - algebra ==4.3.1
-  - algebraic-graphs ==0.0.5
+  - algebraic-graphs ==0.1.1.1
   - alsa-core ==0.5.0.1
   - alsa-mixer ==0.2.0.3
-  - alsa-pcm ==0.6.0.4
+  - alsa-pcm ==0.6.1
   - alsa-seq ==0.6.0.7
   - alternative-vector ==0.0.0
   - alternators ==0.1.2.0
@@ -132,7 +132,7 @@ default-package-overrides:
   - attoparsec-path ==0.0.0.1
   - attoparsec-time ==1
   - attoparsec-uri ==0.0.4
-  - audacity ==0.0.1.2
+  - audacity ==0.0.2
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
@@ -140,7 +140,7 @@ default-package-overrides:
   - auto-update ==0.1.4
   - avwx ==0.3.0.2
   - axiom ==0.4.6
-  - b9 ==0.5.44
+  - b9 ==0.5.47
   - backprop ==0.1.5.1
   - bank-holidays-england ==0.1.0.6
   - barrier ==0.1.1
@@ -263,7 +263,7 @@ default-package-overrides:
   - cabal-rpm ==0.12.2
   - cabal-toolkit ==0.0.5
   - cache ==0.1.1.0
-  - cairo ==0.13.4.2
+  - cairo ==0.13.5.0
   - calendar-recycling ==0.0
   - call-stack ==0.1.0
   - capataz ==0.1.0.1
@@ -291,12 +291,12 @@ default-package-overrides:
   - Chart-cairo ==1.8.3
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.4
-  - chatwork ==0.1.3.1
+  - chatwork ==0.1.3.2
   - cheapskate ==0.1.1
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
   - check-email ==1.0.2
-  - checkers ==0.4.9.5
+  - checkers ==0.4.10
   - choice ==0.2.2
   - chunked-data ==0.3.1
   - cipher-aes ==0.2.11
@@ -471,7 +471,7 @@ default-package-overrides:
   - dawg-ord ==0.5.1.0
   - dbcleaner ==0.1.3
   - dbus ==0.10.15
-  - debian-build ==0.10.1.0
+  - debian-build ==0.10.1.1
   - debug ==0.1.1
   - Decimal ==0.5.1
   - declarative ==0.5.2
@@ -610,7 +610,7 @@ default-package-overrides:
   - extensible ==0.4.8
   - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.5
+  - extra ==1.6.6
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.1
   - fail ==4.9.0.0
@@ -666,7 +666,7 @@ default-package-overrides:
   - ForestStructures ==0.0.0.2
   - forma ==0.2.0
   - format-numbers ==0.1.0.0
-  - formatting ==6.3.2
+  - formatting ==6.3.4
   - foundation ==0.0.20
   - FPretty ==1.1
   - Frames ==0.3.0.2
@@ -734,10 +734,10 @@ default-package-overrides:
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.4.1.1
   - ghc-syb-utils ==0.2.3.3
-  - ghc-tcplugins-extra ==0.2.4
+  - ghc-tcplugins-extra ==0.2.5
   - ghc-typelits-extra ==0.2.4
-  - ghc-typelits-knownnat ==0.4.1
-  - ghc-typelits-natnormalise ==0.5.9
+  - ghc-typelits-knownnat ==0.4.2
+  - ghc-typelits-natnormalise ==0.5.10
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
   - gi-cairo ==1.0.15
@@ -759,7 +759,7 @@ default-package-overrides:
   - glazier ==0.11.0.1
   - glazier-pipes ==0.1.5.1
   - GLFW-b ==1.4.8.3
-  - glib ==0.13.5.0
+  - glib ==0.13.6.0
   - Glob ==0.9.2
   - glob-posix ==0.1.0.1
   - gloss ==1.11.1.1
@@ -792,7 +792,7 @@ default-package-overrides:
   - group-by-date ==0.1.0.2
   - grouped-list ==0.2.2.0
   - groups ==0.4.1.0
-  - gtk2hs-buildtools ==0.13.3.1
+  - gtk2hs-buildtools ==0.13.4.0
   - H ==0.9.0.1
   - h2c ==1.0.0
   - hackage-db ==2.0
@@ -817,8 +817,8 @@ default-package-overrides:
   - hashmap ==1.3.3
   - hashtables ==1.2.3.0
   - haskeline ==0.7.4.2
-  - haskell-gi ==0.21.0
-  - haskell-gi-base ==0.21.0
+  - haskell-gi ==0.21.2
+  - haskell-gi-base ==0.21.1
   - haskell-gi-overloading ==0.0
   - haskell-lexer ==1.0.1
   - haskell-lsp ==0.2.0.1
@@ -931,8 +931,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -982,12 +982,12 @@ default-package-overrides:
   - HTTP ==4000.3.11
   - http2 ==1.6.3
   - http-api-data ==0.3.7.2
-  - http-client ==0.5.12
+  - http-client ==0.5.12.1
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
   - http-conduit ==2.3.1
-  - http-date ==0.0.6.1
+  - http-date ==0.0.7
   - http-link-header ==1.0.3
   - http-media ==0.7.1.2
   - http-reverse-proxy ==0.5.0.1
@@ -1007,13 +1007,13 @@ default-package-overrides:
   - hw-fingertree ==0.1.0.1
   - hw-fingertree-strict ==0.1.0.3
   - hw-hedgehog ==0.1.0.1
-  - hw-hspec-hedgehog ==0.1.0.3
+  - hw-hspec-hedgehog ==0.1.0.4
   - hw-int ==0.0.0.3
   - hw-json ==0.6.0.0
   - hw-mquery ==0.1.0.1
   - hworker ==0.1.0.1
   - hw-parser ==0.0.0.3
-  - hw-prim ==0.5.0.0
+  - hw-prim ==0.5.0.2
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.2.0.2
   - hw-string-parse ==0.0.0.4
@@ -1071,7 +1071,7 @@ default-package-overrides:
   - intervals ==0.8.1
   - intro ==0.3.1.0
   - invariant ==0.5
-  - invertible ==0.2.0.4
+  - invertible ==0.2.0.5
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
@@ -1082,7 +1082,7 @@ default-package-overrides:
   - io-streams-haproxy ==1.0.0.2
   - ip ==1.1.2
   - ip6addr ==0.5.3
-  - iproute ==1.7.3
+  - iproute ==1.7.4
   - IPv6Addr ==1.0.2
   - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
@@ -1245,7 +1245,7 @@ default-package-overrides:
   - markup ==4.0.4
   - marvin-interpolate ==1.1.2
   - massiv ==0.1.6.1
-  - massiv-io ==0.1.2.0
+  - massiv-io ==0.1.3.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
   - matplotlib ==0.6.0
@@ -1282,7 +1282,7 @@ default-package-overrides:
   - mighty-metropolis ==1.2.0
   - milena ==0.5.2.1
   - mime-mail ==0.4.14
-  - mime-mail-ses ==0.4.0.0
+  - mime-mail-ses ==0.4.1
   - mime-types ==0.1.0.7
   - minimorph ==0.1.6.1
   - miniutter ==0.4.7.0
@@ -1312,7 +1312,7 @@ default-package-overrides:
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
   - monadloc ==0.7.1
-  - monad-logger ==0.3.28.4
+  - monad-logger ==0.3.28.5
   - monad-logger-json ==0.1.0.0
   - monad-logger-prefix ==0.1.9
   - monad-logger-syslog ==0.1.4.0
@@ -1436,7 +1436,7 @@ default-package-overrides:
   - old-time ==1.1.0.3
   - once ==0.2
   - one-liner ==0.9.2
-  - one-liner-instances ==0.1.1.0
+  - one-liner-instances ==0.1.2.1
   - OneTuple ==0.2.1
   - online ==0.2.1.0
   - Only ==0.1
@@ -1470,7 +1470,7 @@ default-package-overrides:
   - pandoc ==2.1.2
   - pandoc-citeproc ==0.14.3
   - pandoc-types ==1.17.3.1
-  - pango ==0.13.4.0
+  - pango ==0.13.5.0
   - papillon ==0.1.0.5
   - parallel ==3.2.1.1
   - parallel-io ==0.3.3
@@ -1533,7 +1533,7 @@ default-package-overrides:
   - pipes-category ==0.3.0.0
   - pipes-concurrency ==2.0.10
   - pipes-csv ==1.4.3
-  - pipes-extras ==1.0.13
+  - pipes-extras ==1.0.14
   - pipes-fastx ==0.3.0.0
   - pipes-fluid ==0.6.0.0
   - pipes-group ==1.0.9
@@ -1652,7 +1652,7 @@ default-package-overrides:
   - raaz ==0.2.0
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
-  - rakuten ==0.1.1.0
+  - rakuten ==0.1.1.1
   - ramus ==0.1.2
   - random ==1.1
   - random-fu ==0.2.7.0
@@ -1748,13 +1748,13 @@ default-package-overrides:
   - SafeSemaphore ==0.10.1
   - sample-frame ==0.0.3
   - sample-frame-np ==0.0.4.1
-  - sampling ==0.3.2
+  - sampling ==0.3.3
   - sandman ==0.2.0.1
   - say ==0.1.0.0
-  - sbp ==2.3.13
+  - sbp ==2.3.16
   - sbv ==7.5
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1889,7 +1889,7 @@ default-package-overrides:
   - Spock-worker ==0.3.1.0
   - spreadsheet ==0.1.3.7
   - sqlite-simple ==0.4.15.0
-  - sql-words ==0.1.5.1
+  - sql-words ==0.1.6.0
   - squeal-postgresql ==0.1.1.4
   - srcloc ==0.5.1.2
   - stache ==1.2.1
@@ -1898,7 +1898,7 @@ default-package-overrides:
   - state-codes ==0.1.3
   - stateref ==0.3
   - statestack ==0.2.0.5
-  - StateVar ==1.1.0.4
+  - StateVar ==1.1.1.0
   - stateWriter ==0.2.10
   - static-text ==0.2.0.1
   - statistics ==0.14.0.2
@@ -2020,7 +2020,7 @@ default-package-overrides:
   - text-generic-pretty ==1.2.1
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
-  - text-ldap ==0.1.1.11
+  - text-ldap ==0.1.1.12
   - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
@@ -2034,7 +2034,7 @@ default-package-overrides:
   - tfp ==1.0.0.2
   - tf-random ==0.5
   - th-abstraction ==0.2.6.0
-  - th-data-compat ==0.0.2.5
+  - th-data-compat ==0.0.2.6
   - th-desugar ==1.7
   - these ==0.7.4
   - th-expand-syns ==0.4.4.0
@@ -2049,7 +2049,7 @@ default-package-overrides:
   - threepenny-editors ==0.5.6
   - threepenny-gui ==0.8.2.3
   - threepenny-gui-flexbox ==0.4.2
-  - th-reify-compat ==0.0.1.3
+  - th-reify-compat ==0.0.1.4
   - th-reify-many ==0.1.8
   - throttle-io-stream ==0.2.0.1
   - through-text ==0.1.0.0
@@ -2058,7 +2058,7 @@ default-package-overrides:
   - th-to-exp ==0.0.1.1
   - th-utilities ==0.2.0.1
   - tibetan-utils ==0.1.1.5
-  - tidal ==0.9.8
+  - tidal ==0.9.9
   - tile ==0.3.0.0
   - time-compat ==0.1.0.3
   - timeit ==2.0
@@ -2104,7 +2104,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.7
+  - turtle ==1.5.8
   - turtle-options ==0.1.0.4
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
@@ -2150,7 +2150,7 @@ default-package-overrides:
   - universe-instances-extended ==1.0.0.1
   - universe-instances-trans ==1.0.0.1
   - universe-reverse-instances ==1.0
-  - universum ==1.1.0
+  - universum ==1.1.1
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
@@ -2241,8 +2241,8 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.2
-  - warp ==3.2.18.2
-  - warp-tls ==3.2.4.2
+  - warp ==3.2.19
+  - warp-tls ==3.2.4.3
   - wave ==0.1.5
   - wavefront ==0.7.1.2
   - webdriver ==0.8.5
@@ -2273,7 +2273,7 @@ default-package-overrides:
   - with-location ==0.1.0
   - witness ==0.4
   - wizards ==1.0.2
-  - wl-pprint ==1.2
+  - wl-pprint ==1.2.1
   - wl-pprint-annotated ==0.1.0.0
   - wl-pprint-console ==0.1.0.1
   - wl-pprint-extras ==3.5.0.5
@@ -2327,7 +2327,7 @@ default-package-overrides:
   - xml-types ==0.3.6
   - xmonad ==0.13
   - xmonad-contrib ==0.13
-  - xmonad-extras ==0.13.2
+  - xmonad-extras ==0.13.3
   - xss-sanitize ==0.3.5.7
   - xturtle ==0.2.0.0
   - xxhash ==0.0.2

From 46cce6ef9924e1961171b2207f5e707974141620 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 22 Apr 2018 10:56:04 +0200
Subject: [PATCH 0388/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-6-g7882850 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/5dcdcbfee8248cc4b7fbe7ce08857000b39d77d6.
---
 .../haskell-modules/hackage-packages.nix      | 2001 ++++++++++-------
 1 file changed, 1161 insertions(+), 840 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index bf7838b2b21b..8d25c173d75a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17550,8 +17550,8 @@ self: {
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "StateVar";
-       version = "1.1.0.4";
-       sha256 = "1dzz9l0haswgag9x56q7n57kw18v7nhmzkjyr61nz9y9npn8vmks";
+       version = "1.1.1.0";
+       sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s";
        libraryHaskellDepends = [ base stm transformers ];
        homepage = "https://github.com/haskell-opengl/StateVar";
        description = "State variables";
@@ -19613,6 +19613,26 @@ self: {
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
 
+  "X11_1_9" = callPackage
+    ({ mkDerivation, base, data-default, libX11, libXext, libXinerama
+     , libXrandr, libXrender, libXScrnSaver
+     }:
+     mkDerivation {
+       pname = "X11";
+       version = "1.9";
+       sha256 = "1f8dy6ckkyvpcv7zlniyv01cqjb9lgqscm8pml58cvwc7n38w4qh";
+       libraryHaskellDepends = [ base data-default ];
+       librarySystemDepends = [
+         libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
+       ];
+       homepage = "https://github.com/xmonad/X11";
+       description = "A binding to the X11 graphics library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
+         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; 
+         inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;};
+
   "X11-extras" = callPackage
     ({ mkDerivation, base, libX11, X11 }:
      mkDerivation {
@@ -22499,17 +22519,6 @@ self: {
      }) {};
 
   "aeson-generic-compat" = callPackage
-    ({ mkDerivation, aeson, base }:
-     mkDerivation {
-       pname = "aeson-generic-compat";
-       version = "0.0.1.1";
-       sha256 = "1davhg48x4k9nsizpafjlicwryi05ijfh902bn35x76pay7alims";
-       libraryHaskellDepends = [ aeson base ];
-       description = "Compatible generic class names of Aeson";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-generic-compat_0_0_1_2" = callPackage
     ({ mkDerivation, aeson, base }:
      mkDerivation {
        pname = "aeson-generic-compat";
@@ -22518,7 +22527,6 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "Compatible generic class names of Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-injector" = callPackage
@@ -23717,8 +23725,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.0.0";
-       sha256 = "1lh5pz3zmzyq9dkgzabgi8xhlssxccxw24ng97lynmsvc7jjras8";
+       version = "0.2.1.0";
+       sha256 = "13glk774rdd6fwi427djkc1q4xqmdf44smhp5lgv24vfwd5fffcq";
        libraryHaskellDepends = [ base ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
@@ -23841,22 +23849,6 @@ self: {
      }) {};
 
   "algebraic-graphs" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, extra
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "algebraic-graphs";
-       version = "0.0.5";
-       sha256 = "046507r77wn4f6grxzrh2n90rnllp1inhdvn4fg9ki36k5qgqyzx";
-       libraryHaskellDepends = [ array base containers ];
-       testHaskellDepends = [ base containers extra QuickCheck ];
-       benchmarkHaskellDepends = [ base containers criterion ];
-       homepage = "https://github.com/snowleopard/alga";
-       description = "A library for algebraic graph construction and transformation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "algebraic-graphs_0_1_1_1" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, containers
      , criterion, deepseq, extra, QuickCheck
      }:
@@ -23876,7 +23868,6 @@ self: {
        homepage = "https://github.com/snowleopard/alga";
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -24181,27 +24172,6 @@ self: {
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
-    ({ mkDerivation, alsa-core, alsaLib, array, base
-     , extensible-exceptions, sample-frame, storable-record
-     }:
-     mkDerivation {
-       pname = "alsa-pcm";
-       version = "0.6.0.4";
-       sha256 = "0anafqzml5haacb7ax27a82b815rhv7nqawa7w3lb11vj1wi7bls";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         alsa-core array base extensible-exceptions sample-frame
-         storable-record
-       ];
-       libraryPkgconfigDepends = [ alsaLib ];
-       homepage = "http://www.haskell.org/haskellwiki/ALSA";
-       description = "Binding to the ALSA Library API (PCM audio)";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) alsaLib;};
-
-  "alsa-pcm_0_6_1" = callPackage
     ({ mkDerivation, alsa-core, alsaLib, array, base
      , extensible-exceptions, sample-frame, semigroups, storable-record
      }:
@@ -24219,7 +24189,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -28446,6 +28416,8 @@ self: {
        pname = "arbtt";
        version = "0.10.0.1";
        sha256 = "0pav5q0xh90vjrj77l7vk38l38xyhqas4750il5wkpqf4f5li877";
+       revision = "1";
+       editedCabalFile = "1mmrv81c9gwa2gqlp0agipg5sdxm88fhiza84y2sv8vg7zf88x82";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29885,6 +29857,8 @@ self: {
        pname = "async-pool";
        version = "0.9.0.2";
        sha256 = "1wg78y80zd7qyizyis073dmmvq4s67ni1pkaq31jl5klr49rs5g0";
+       revision = "1";
+       editedCabalFile = "0w3l3lbnfdm9ihp7pfda4sf1y1cqpc6g6q6wjzafdi088l3lklkn";
        libraryHaskellDepends = [
          async base containers fgl monad-control stm transformers
          transformers-base
@@ -30447,8 +30421,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.10.0.8";
-       sha256 = "159nf1dfb4zh7kbk534xxhvap3gi6943j9vrp7k6lkyvp3p2s1q9";
+       version = "2.10.0.11";
+       sha256 = "09c2nldzaqm8a203gqk6lc81gfhmvz30pxicxi9g1971y1q0nklj";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -30897,27 +30871,6 @@ self: {
      }) {};
 
   "audacity" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, directory
-     , explicit-exception, filepath, non-empty, storable-record
-     , storablevector, tagchup, transformers, utility-ht, xml-basic
-     }:
-     mkDerivation {
-       pname = "audacity";
-       version = "0.0.1.2";
-       sha256 = "1df9vk6f1gj0jpj3rmq63s3xjqc5p02hprfvq1nqgws0vfnp5lab";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring deepseq directory explicit-exception filepath
-         non-empty storable-record storablevector tagchup transformers
-         utility-ht xml-basic
-       ];
-       homepage = "http://hub.darcs.net/thielema/audacity";
-       description = "Interchange with the Audacity sound signal editor";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "audacity_0_0_2" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, directory
      , explicit-exception, filepath, non-empty, semigroups
      , storable-record, storablevector, tagchup, transformers
@@ -30937,7 +30890,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/audacity";
        description = "Interchange with the Audacity sound signal editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "audiovisual" = callPackage
@@ -32423,39 +32375,6 @@ self: {
      }) {};
 
   "b9" = callPackage
-    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
-     , bytestring, conduit, conduit-extra, ConfigFile, directory
-     , filepath, free, hashable, hspec, hspec-expectations, lens, mtl
-     , optparse-applicative, parallel, parsec, pretty, pretty-show
-     , process, QuickCheck, random, shake, syb, template, text, time
-     , transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "b9";
-       version = "0.5.44";
-       sha256 = "0fr9s2s4gwh6l80s9j4jj5s10mp92dkxs5fwjlk8vbyg6xi6sgza";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bifunctors binary boxes bytestring conduit
-         conduit-extra ConfigFile directory filepath free hashable lens mtl
-         parallel parsec pretty pretty-show process QuickCheck random shake
-         syb template text time transformers unordered-containers vector
-         yaml
-       ];
-       executableHaskellDepends = [
-         base bytestring directory lens optparse-applicative
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec hspec-expectations QuickCheck text
-         unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/sheyll/b9-vm-image-builder";
-       description = "A tool and library for building virtual machine images";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "b9_0_5_47" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, lens, mtl
@@ -32486,7 +32405,6 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "babl" = callPackage
@@ -32998,12 +32916,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_11_0_0" = callPackage
+  "base_4_11_1_0" = callPackage
     ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.11.0.0";
-       sha256 = "1p18cm61ql911nqfld1kc7h6qpmhfxrf1xyahik180a7rbygbkq3";
+       version = "4.11.1.0";
+       sha256 = "0q2ygfqy4qim8h9fmlb5iwfnf2lrly27bqqvnckdlmh775fmq07g";
        libraryHaskellDepends = [
          ghc-prim invalid-cabal-flag-settings rts
        ];
@@ -33127,8 +33045,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
-       version = "4.11.0.0";
-       sha256 = "11q2cqy865q13hy2kc9k41cprdmlzh172prh5dhy3xp6zsbppjnh";
+       version = "4.11.1.0";
+       sha256 = "19d1x487kwhc60qjix7xx53dlszbx08rdhxd2zab1pwjw62ws3c8";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        homepage = "https://github.com/hvr/base-noprelude";
@@ -33898,18 +33816,18 @@ self: {
     ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring
      , case-insensitive, conduit, free, hashable, haskell-src-exts
      , lifted-base, monad-control, mtl, network-uri, postgresql-libpq
-     , postgresql-simple, scientific, text, time, unordered-containers
-     , uuid, vector
+     , postgresql-simple, scientific, tagged, text, time
+     , unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "beam-postgres";
-       version = "0.3.1.0";
-       sha256 = "1nv7r50b4khx1ski5c64dywphzbn1x9xx9hp8b8zfh88i05b5jf6";
+       version = "0.3.2.0";
+       sha256 = "09iv1ji1kpavi42z0p4nng057h0q5f16cdsx0yiq53c3ji3yvbnf";
        libraryHaskellDepends = [
          aeson base beam-core beam-migrate bytestring case-insensitive
          conduit free hashable haskell-src-exts lifted-base monad-control
-         mtl network-uri postgresql-libpq postgresql-simple scientific text
-         time unordered-containers uuid vector
+         mtl network-uri postgresql-libpq postgresql-simple scientific
+         tagged text time unordered-containers uuid-types vector
        ];
        homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres";
        description = "Connection layer between beam and postgres";
@@ -35419,15 +35337,15 @@ self: {
          inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; 
          inherit (pkgs.xorg) libXxf86vm;};
 
-  "bindings-GLFW_3_2_1_0" = callPackage
+  "bindings-GLFW_3_2_1_1" = callPackage
     ({ mkDerivation, base, bindings-DSL, HUnit, libGL, libX11
      , libXcursor, libXext, libXfixes, libXi, libXinerama, libXrandr
      , libXxf86vm, test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "bindings-GLFW";
-       version = "3.2.1.0";
-       sha256 = "1sbbms17yyrv5cmf584bc5k4bh8l2vrrhkz2693nyhkadvjxiavb";
+       version = "3.2.1.1";
+       sha256 = "03hn12bdqypwd6x9hxa7685bm6w86nsf6cmcwkr8zzgb41mwc93b";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [
          libGL libX11 libXcursor libXext libXfixes libXi libXinerama
@@ -39194,7 +39112,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_36" = callPackage
+  "brick_0_36_2" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -39202,8 +39120,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.36";
-       sha256 = "1i1np31hncgz5cvygraxcv9x6l7yn9y3f8f92jih1im38drhp65z";
+       version = "0.36.2";
+       sha256 = "0zzd3lwlb60n3zdcyyqf89b066337f6qny5m4clf1fbvqiw7g771";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41150,6 +41068,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ca" = callPackage
+    ({ mkDerivation, alg, base }:
+     mkDerivation {
+       pname = "ca";
+       version = "0.0.0.1";
+       sha256 = "0fkqbpgbbp1g6q5vjmgnfddrilyqwqsvd6w7w3vmgg6q7zdh6fy2";
+       libraryHaskellDepends = [ alg base ];
+       description = "Cellular Automata";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cab" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, conduit
      , conduit-extra, containers, directory, filepath, process
@@ -42385,8 +42314,8 @@ self: {
      }:
      mkDerivation {
        pname = "cairo";
-       version = "0.13.4.2";
-       sha256 = "0sm3367ikrjfzwhz1f9bkamk6i33p5cginzc9kpgw3x0lk6pbrhg";
+       version = "0.13.5.0";
+       sha256 = "1wxylv4d8120ri0vgar168ikqa9m6533ipdwi38qlmxmw20ws2j2";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
@@ -44215,6 +44144,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {dttools = null;};
 
+  "cdeps" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, directory, filepath
+     , hspec, optparse-applicative, text
+     }:
+     mkDerivation {
+       pname = "cdeps";
+       version = "0.1.0.0";
+       sha256 = "1klj3cx7cx39iyskv7fs6s28jplyn13dwv4khz79kxgg1sxd9gv5";
+       revision = "2";
+       editedCabalFile = "1r2ihgk5yj6xv4qc276b29gfzblksf82qdp0qg06cz590kxb8v2x";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring directory filepath text
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [ base optparse-applicative ];
+       testHaskellDepends = [ base hspec ];
+       description = "Extract dependencies from C code";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cedict" = callPackage
     ({ mkDerivation, base, bytestring, containers, mtl, parsec
      , utf8-string
@@ -45123,35 +45074,6 @@ self: {
      }) {};
 
   "chatwork" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
-     , data-default-class, hspec, http-api-data, http-client
-     , http-client-tls, http-types, req, servant-server, text, warp
-     }:
-     mkDerivation {
-       pname = "chatwork";
-       version = "0.1.3.1";
-       sha256 = "0wsr84yk8l9s8fpb6fg4vbjyzlvy0608qply1h12zi09b5zr149i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         http-api-data http-client http-client-tls http-types req text
-       ];
-       executableHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         http-api-data http-client http-client-tls http-types req text
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         hspec http-api-data http-client http-client-tls http-types req
-         servant-server text warp
-       ];
-       homepage = "https://github.com/matsubara0507/chatwork#readme";
-       description = "The ChatWork API in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "chatwork_0_1_3_2" = callPackage
     ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
      , data-default-class, hspec, http-api-data, http-client
      , http-client-tls, http-types, req, servant-server, text, warp
@@ -45178,7 +45100,6 @@ self: {
        homepage = "https://github.com/matsubara0507/chatwork#readme";
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cheapskate" = callPackage
@@ -45311,20 +45232,6 @@ self: {
      }) {};
 
   "checkers" = callPackage
-    ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
-     mkDerivation {
-       pname = "checkers";
-       version = "0.4.9.5";
-       sha256 = "1xaffx0vmq4swciyq3qzjfklfj19nnhd5yama9di5sas4f8v517i";
-       libraryHaskellDepends = [
-         array base QuickCheck random semigroupoids
-       ];
-       homepage = "https://github.com/conal/checkers";
-       description = "Check properties on standard classes and data structures";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "checkers_0_4_10" = callPackage
     ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }:
      mkDerivation {
        pname = "checkers";
@@ -45336,7 +45243,6 @@ self: {
        homepage = "https://github.com/conal/checkers";
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "checkmate" = callPackage
@@ -48595,6 +48501,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "coerce-util" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "coerce-util";
+       version = "0.1.0.0";
+       sha256 = "0v4ymcrqij8q9s8pcgbfrnl8y379fki3zp80lg4xqvbx0i89vsxf";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/chessai/coerce-util.git";
+       description = "utils for Data.Coerce";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cofunctor" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -50202,6 +50120,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "composition-prelude_1_4_0_1" = callPackage
+    ({ mkDerivation, base, cpphs }:
+     mkDerivation {
+       pname = "composition-prelude";
+       version = "1.4.0.1";
+       sha256 = "172fnixh4jgmwfsaxg0fyji0i745pbjwk00l3yh5pwng9swzi6ik";
+       libraryHaskellDepends = [ base ];
+       libraryToolDepends = [ cpphs ];
+       homepage = "https://github.com/vmchale/composition-prelude#readme";
+       description = "Higher-order function combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "composition-tree" = callPackage
     ({ mkDerivation, base, doctest, QuickCheck }:
      mkDerivation {
@@ -52475,6 +52407,8 @@ self: {
        pname = "contravariant";
        version = "1.4.1";
        sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9";
+       revision = "1";
+       editedCabalFile = "0qj5nymccrb9p0cd6hffsy90jidjng14g9yv95z8v6h4q84sbzvx";
        libraryHaskellDepends = [
          base StateVar transformers transformers-compat
        ];
@@ -53674,8 +53608,8 @@ self: {
     ({ mkDerivation, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "3.4.1";
-       sha256 = "1sd6h0xw76iwvgl7i4c9wy6q5fmq75inq5vh79rzf3bhmahb1529";
+       version = "3.5.0";
+       sha256 = "0x8l31zbgcx4idcvpjsipsc3k610hj6g6rjpxbbpaz7zcb2ykvn1";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -54210,8 +54144,8 @@ self: {
      }:
      mkDerivation {
        pname = "crdt";
-       version = "9.3";
-       sha256 = "1w1mb43hb6zn8n8r261j623jrgxx54h8jifhcby8nnfyl3h97c69";
+       version = "10.0";
+       sha256 = "10wg1s47r70gxgl9bfg3cxhj8w74k7wn0c3lh418mxypb2p3ffww";
        libraryHaskellDepends = [
          base binary bytestring containers Diff hashable mtl network-info
          safe stm time vector
@@ -57780,16 +57714,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse-lens_3_0_0_2" = callPackage
-    ({ mkDerivation, base, data-diverse, generic-lens, hspec, lens
-     , profunctors, tagged
+  "data-diverse-lens_3_1_0_0" = callPackage
+    ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec
+     , lens, profunctors, tagged
      }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "3.0.0.2";
-       sha256 = "0hahvbyb6yr3bq36dlrvdsgzg3nifckyp10h83d2ryqgla7p7rbp";
+       version = "3.1.0.0";
+       sha256 = "0g1cnn1kw36ac68wm8qmd8pdzjpl4xcil7shailxwawldi52v549";
        libraryHaskellDepends = [
-         base data-diverse generic-lens lens profunctors tagged
+         base data-diverse data-has generic-lens lens profunctors tagged
        ];
        testHaskellDepends = [
          base data-diverse generic-lens hspec lens tagged
@@ -60052,25 +59986,6 @@ self: {
      }) {};
 
   "debian-build" = callPackage
-    ({ mkDerivation, base, directory, filepath, process, split
-     , transformers
-     }:
-     mkDerivation {
-       pname = "debian-build";
-       version = "0.10.1.0";
-       sha256 = "1d4h3r0v82fwiwazvcgrbv9f7nslbgw94hbsyyibsiikwpg36454";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base directory filepath process split transformers
-       ];
-       executableHaskellDepends = [ base filepath transformers ];
-       homepage = "http://twitter.com/khibino/";
-       description = "Debian package build sequence tools";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "debian-build_0_10_1_1" = callPackage
     ({ mkDerivation, base, directory, filepath, process, split
      , transformers
      }:
@@ -60087,7 +60002,6 @@ self: {
        homepage = "http://twitter.com/khibino/";
        description = "Debian package build sequence tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debug" = callPackage
@@ -72239,15 +72153,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "extensible-effects_2_5_3_0" = callPackage
+  "extensible-effects_2_6_0_1" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, mtl
      , QuickCheck, silently, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "2.5.3.0";
-       sha256 = "0dp6wsrlqivghmhwkj5js807i5m71lp9g3v3v8qb7xd3c08awy86";
+       version = "2.6.0.1";
+       sha256 = "1c39hn8iskn71s3hd3af3q1xym9mzdvrjswcnyqrkibws47k2lmx";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base HUnit monad-control QuickCheck silently test-framework
@@ -72300,23 +72214,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.5";
-       sha256 = "05x89gclm8vw1rx4945p3asmsa28055y81nwzvgq91yr5qc4lbgi";
-       libraryHaskellDepends = [
-         base clock directory filepath process time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       homepage = "https://github.com/ndmitchell/extra#readme";
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_6" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -72331,7 +72228,6 @@ self: {
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -72760,8 +72656,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.5.0.0";
-       sha256 = "17jv9ysnd0bvlzc0sircj0mnbxpwzzby98wf6p6hj76m284acdx6";
+       version = "0.6.0.1";
+       sha256 = "1am161zrjaann9pnazsv9ic43cnw1bimqcy6vvh5qinigc33p08f";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [
          arithmoi base combinat-compat hspec QuickCheck
@@ -77161,24 +77057,6 @@ self: {
      }) {};
 
   "formatting" = callPackage
-    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
-     , integer-gmp, old-locale, scientific, semigroups, text, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "formatting";
-       version = "6.3.2";
-       sha256 = "1h5jy7y2cd1qaymypw8hfr52924szas0jd2hvjpbr5mrwssvhkqf";
-       libraryHaskellDepends = [
-         array base bytestring clock ghc-prim integer-gmp old-locale
-         scientific semigroups text time transformers
-       ];
-       testHaskellDepends = [ base hspec semigroups ];
-       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "formatting_6_3_4" = callPackage
     ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
      , integer-gmp, old-locale, scientific, semigroups, text, time
      , transformers
@@ -77194,7 +77072,6 @@ self: {
        testHaskellDepends = [ base hspec semigroups ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forml" = callPackage
@@ -78593,6 +78470,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fsnotify_0_2_1_2" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , filepath, hinotify, tasty, tasty-hunit, temporary, text, time
+     , unix-compat
+     }:
+     mkDerivation {
+       pname = "fsnotify";
+       version = "0.2.1.2";
+       sha256 = "1384yksg5v1rsbbhncairxh8ahwqmg661mgc2yrcs6hbnv5jzjyp";
+       libraryHaskellDepends = [
+         async base bytestring containers directory filepath hinotify text
+         time unix-compat
+       ];
+       testHaskellDepends = [
+         async base directory filepath tasty tasty-hunit temporary
+         unix-compat
+       ];
+       homepage = "https://github.com/haskell-fswatch/hfsnotify";
+       description = "Cross platform library for file change notification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fsnotify-conduit" = callPackage
     ({ mkDerivation, async, base, conduit, directory, filepath
      , fsnotify, hspec, resourcet, temporary, transformers
@@ -81042,6 +80942,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity_0_5_0_0" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, validity }:
+     mkDerivation {
+       pname = "genvalidity";
+       version = "0.5.0.0";
+       sha256 = "0s640ql6i9lr8s8m39fvjv7iz1pbcnjnvb8xsdbygb49cwk3khcz";
+       libraryHaskellDepends = [ base QuickCheck validity ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Testing utilities for the validity library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-aeson" = callPackage
     ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
      , genvalidity-scientific, genvalidity-text
@@ -81066,6 +80980,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-aeson_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
+     , genvalidity-scientific, genvalidity-text
+     , genvalidity-unordered-containers, genvalidity-vector, hspec
+     , QuickCheck, validity, validity-aeson
+     }:
+     mkDerivation {
+       pname = "genvalidity-aeson";
+       version = "0.2.0.0";
+       sha256 = "0lwy2r7gb5s26hilgxs2hf8zcn4dhdwqhr8r05zrvjcry4inn5mm";
+       libraryHaskellDepends = [
+         aeson base genvalidity genvalidity-scientific genvalidity-text
+         genvalidity-unordered-containers genvalidity-vector QuickCheck
+         validity validity-aeson
+       ];
+       testHaskellDepends = [
+         aeson base genvalidity genvalidity-hspec hspec
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for aeson";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-bytestring
@@ -81086,6 +81024,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-bytestring_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
+     , hspec, QuickCheck, validity, validity-bytestring
+     }:
+     mkDerivation {
+       pname = "genvalidity-bytestring";
+       version = "0.2.0.0";
+       sha256 = "0ai3pmybs2xky8b596s0xs6511ab1h28ywbaishn5s0217q225zf";
+       libraryHaskellDepends = [
+         base bytestring genvalidity QuickCheck validity validity-bytestring
+       ];
+       testHaskellDepends = [
+         base bytestring genvalidity genvalidity-hspec hspec QuickCheck
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for ByteString";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-containers" = callPackage
     ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-containers
@@ -81127,6 +81085,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-hspec_0_6_0_0" = callPackage
+    ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
+     , hspec, hspec-core, QuickCheck, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec";
+       version = "0.6.0.0";
+       sha256 = "0pa4wx08yipr59nsdf5prh6j5pcixnxxfd9i4vm1rb4v89nws6al";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-property hspec hspec-core QuickCheck
+         validity
+       ];
+       testHaskellDepends = [
+         base doctest genvalidity hspec hspec-core QuickCheck
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Standard spec's for GenValidity instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-hspec-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
      , genvalidity, genvalidity-aeson, genvalidity-hspec
@@ -81150,6 +81129,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-hspec-aeson_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
+     , genvalidity, genvalidity-aeson, genvalidity-hspec
+     , genvalidity-text, hspec, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-aeson";
+       version = "0.2.0.0";
+       sha256 = "0xkignwkq1hdyvachslwf5clzvnw0bmyi00mv3nkigxn8q1vbf7h";
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
+         QuickCheck
+       ];
+       testHaskellDepends = [
+         aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
+         genvalidity-text hspec text
+       ];
+       homepage = "http://cs-syd.eu";
+       description = "Standard spec's for aeson-related instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-hspec-binary" = callPackage
     ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
@@ -81168,6 +81170,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-hspec-binary_0_2_0_0" = callPackage
+    ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
+     , genvalidity-hspec, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-binary";
+       version = "0.2.0.0";
+       sha256 = "0qmmhbka2ba9x9ypafij5q9gmmm7x4v1frf9mrfi4ffw91fnfnpv";
+       libraryHaskellDepends = [
+         base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
+       ];
+       testHaskellDepends = [ base doctest genvalidity hspec ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Standard spec's for binary-related Instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-hspec-cereal" = callPackage
     ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
@@ -81186,6 +81206,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-hspec-cereal_0_2_0_0" = callPackage
+    ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
+     , genvalidity-hspec, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-cereal";
+       version = "0.2.0.0";
+       sha256 = "18fz57lwn6ljrm9fszb1n2jzn93kqvqi7x9fyp6a0kh733lyzrnn";
+       libraryHaskellDepends = [
+         base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
+       ];
+       testHaskellDepends = [ base doctest genvalidity hspec ];
+       homepage = "http://cs-syd.eu";
+       description = "Standard spec's for cereal-related instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-hspec-hashable" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
      , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
@@ -81209,6 +81247,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-hspec-hashable_0_2_0_0" = callPackage
+    ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
+     , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
+     , validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-hspec-hashable";
+       version = "0.2.0.0";
+       sha256 = "1mw3lg792hssbfasb0av9x9n7ksqcjwxpgab0n9ia1jspxacrxr4";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-hspec genvalidity-property hashable
+         hspec QuickCheck validity
+       ];
+       testHaskellDepends = [
+         base doctest genvalidity genvalidity-hspec hashable hspec
+         hspec-core QuickCheck
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Standard spec's for Hashable instances";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-path" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path
      , validity-path
@@ -81225,6 +81286,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-path_0_3_0_0" = callPackage
+    ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec
+     , hspec, path, QuickCheck, validity-path
+     }:
+     mkDerivation {
+       pname = "genvalidity-path";
+       version = "0.3.0.0";
+       sha256 = "00rbizzxy9ccd85gr0bf4kw6b5bz15pzhg05qzsifpjj6vfy4izf";
+       libraryHaskellDepends = [
+         base genvalidity path QuickCheck validity-path
+       ];
+       testHaskellDepends = [ base genvalidity-hspec hspec path ];
+       benchmarkHaskellDepends = [
+         base criterion genvalidity path QuickCheck
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for Path";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-property" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, QuickCheck, validity
@@ -81242,6 +81324,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "genvalidity-property_0_2_0_0" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, genvalidity
+     , hspec, QuickCheck, validity
+     }:
+     mkDerivation {
+       pname = "genvalidity-property";
+       version = "0.2.0.0";
+       sha256 = "10przvvqrmjyr9cmbna79kj15wjhi0r4j64qn5824gslyy7g39pa";
+       libraryHaskellDepends = [
+         base genvalidity hspec QuickCheck validity
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Standard properties for functions on `Validity` types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-scientific" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, scientific, validity, validity-scientific
@@ -81262,6 +81362,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-scientific_0_2_0_0" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, scientific, validity, validity-scientific
+     }:
+     mkDerivation {
+       pname = "genvalidity-scientific";
+       version = "0.2.0.0";
+       sha256 = "0zf0akzbggyy79h48m78cfsp82nmdgk0py8crfp81sh0pd3cydpi";
+       libraryHaskellDepends = [
+         base genvalidity QuickCheck scientific validity validity-scientific
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec QuickCheck scientific
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for Scientific";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-text" = callPackage
     ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, text, validity, validity-text
@@ -81282,6 +81402,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-text_0_5_0_0" = callPackage
+    ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, text, validity, validity-text
+     }:
+     mkDerivation {
+       pname = "genvalidity-text";
+       version = "0.5.0.0";
+       sha256 = "0vyw27l0b9snndl1nixidg8ghk6i95qv2xk59fbj1r1ybg27b837";
+       libraryHaskellDepends = [
+         array base genvalidity QuickCheck text validity validity-text
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec QuickCheck text
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for Text";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-time" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, time, validity-time
@@ -81300,6 +81440,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-time_0_2_0_0" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, time, validity-time
+     }:
+     mkDerivation {
+       pname = "genvalidity-time";
+       version = "0.2.0.0";
+       sha256 = "04kfqs4mc9p5flr3vvb6qj3nb4agpl3hww62g7np6sl5s36cbycb";
+       libraryHaskellDepends = [
+         base genvalidity QuickCheck time validity-time
+       ];
+       testHaskellDepends = [ base genvalidity-hspec hspec time ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for time";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-unordered-containers" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
      , hspec, QuickCheck, unordered-containers, validity
@@ -81322,6 +81480,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-unordered-containers_0_2_0_0" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
+     , hspec, QuickCheck, unordered-containers, validity
+     , validity-unordered-containers
+     }:
+     mkDerivation {
+       pname = "genvalidity-unordered-containers";
+       version = "0.2.0.0";
+       sha256 = "1kfn6g3h33g215qy0iffhr35vd2np9nsf6634fjk40mbz1san0m8";
+       libraryHaskellDepends = [
+         base genvalidity hashable QuickCheck unordered-containers validity
+         validity-unordered-containers
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec unordered-containers
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for unordered-containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-uuid" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, uuid, validity, validity-uuid
@@ -81342,6 +81522,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-uuid_0_1_0_0" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, uuid, validity, validity-uuid
+     }:
+     mkDerivation {
+       pname = "genvalidity-uuid";
+       version = "0.1.0.0";
+       sha256 = "1j4q3smhz812cfgsv6vmjgng068knd9v7xg0hkvx868wbndgk37h";
+       libraryHaskellDepends = [
+         base genvalidity QuickCheck uuid validity validity-uuid
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec QuickCheck uuid
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for UUID";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-vector" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, validity, validity-vector, vector
@@ -81362,6 +81562,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-vector_0_2_0_0" = callPackage
+    ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
+     , QuickCheck, validity, validity-vector, vector
+     }:
+     mkDerivation {
+       pname = "genvalidity-vector";
+       version = "0.2.0.0";
+       sha256 = "0ww3hzkzhblx8qp062vz74vwaqvv38l0sl0dwyxrqra68qglxr4f";
+       libraryHaskellDepends = [
+         base genvalidity QuickCheck validity validity-vector vector
+       ];
+       testHaskellDepends = [
+         base genvalidity genvalidity-hspec hspec vector
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for vector";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "geo-resolver" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, http-conduit, http-types, HUnit, QuickCheck
@@ -81758,14 +81978,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot_8_4_1" = callPackage
+  "ghc-boot_8_4_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , ghc-boot-th
      }:
      mkDerivation {
        pname = "ghc-boot";
-       version = "8.4.1";
-       sha256 = "0abgzvqra66hi61bn901dlk0r0n4s2fg6y7d8w2k2a6w437vgzdd";
+       version = "8.4.2";
+       sha256 = "120vdlb6gyv6mndv8n3sssnif1m4zz6wrjlq9xmr2sha27pgsx9r";
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc-boot-th
        ];
@@ -81774,12 +81994,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-boot-th_8_4_1" = callPackage
+  "ghc-boot-th_8_4_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "ghc-boot-th";
-       version = "8.4.1";
-       sha256 = "0l9fv1sp4dbq1ssw0l55riw9zpcii8fz75i0yj0vlihccf10lbj9";
+       version = "8.4.2";
+       sha256 = "1c7crailwqgwn7a8mqpggmkzzz7067z3hz710vx7wp71wynzj8ff";
        libraryHaskellDepends = [ base ];
        description = "Shared functionality between GHC and the @template-haskell@ library";
        license = stdenv.lib.licenses.bsd3;
@@ -82546,18 +82766,6 @@ self: {
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
-    ({ mkDerivation, base, ghc }:
-     mkDerivation {
-       pname = "ghc-tcplugins-extra";
-       version = "0.2.4";
-       sha256 = "03lxph20m33ipa117i917khgk8rv3fljly3fh31j92d0l02bh9sb";
-       libraryHaskellDepends = [ base ghc ];
-       homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
-       description = "Utilities for writing GHC type-checker plugins";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-tcplugins-extra_0_2_5" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
@@ -82567,7 +82775,6 @@ self: {
        homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-time-alloc-prof" = callPackage
@@ -82626,27 +82833,6 @@ self: {
      }) {};
 
   "ghc-typelits-knownnat" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
-     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-knownnat";
-       version = "0.4.1";
-       sha256 = "0m3flri3y82wvqania3yj7mhnnxvx8z5hxwl6mr5ppavxak169q9";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
-         template-haskell transformers
-       ];
-       testHaskellDepends = [
-         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
-       ];
-       homepage = "http://clash-lang.org/";
-       description = "Derive KnownNat constraints from other KnownNat constraints";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-knownnat_0_4_2" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
      , template-haskell, transformers
@@ -82665,27 +82851,9 @@ self: {
        homepage = "http://clash-lang.org/";
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-natnormalise" = callPackage
-    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
-     , tasty-hunit, template-haskell
-     }:
-     mkDerivation {
-       pname = "ghc-typelits-natnormalise";
-       version = "0.5.9";
-       sha256 = "1aw0pgcplljll86gk9jvqc22zpnb17amamna11n9b4xzrw2lrnkg";
-       libraryHaskellDepends = [
-         base ghc ghc-tcplugins-extra integer-gmp
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       homepage = "http://www.clash-lang.org/";
-       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "ghc-typelits-natnormalise_0_5_10" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell
      }:
@@ -82700,6 +82868,23 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
+     }) {};
+
+  "ghc-typelits-natnormalise_0_6" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
+     , tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.6";
+       sha256 = "0xs5d7bsyp53nzg509gs2qyfrj5fjp7bpyw3pjnnqk8d4xcgmf2w";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra integer-gmp transformers
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
+       homepage = "http://www.clash-lang.org/";
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -82756,15 +82941,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghci_8_4_1" = callPackage
+  "ghci_8_4_2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , deepseq, filepath, ghc-boot, ghc-boot-th, template-haskell
      , transformers, unix
      }:
      mkDerivation {
        pname = "ghci";
-       version = "8.4.1";
-       sha256 = "0jlnzkwj4xxs57c0zi3rcy96rksqakx65a7m8xq04055ip388sws";
+       version = "8.4.2";
+       sha256 = "0pdhy6p3axq6jwl84mcq6404r1mnld7fbyspkmzninvdd46wr74l";
        libraryHaskellDepends = [
          array base binary bytestring containers deepseq filepath ghc-boot
          ghc-boot-th template-haskell transformers unix
@@ -84123,8 +84308,8 @@ self: {
      }:
      mkDerivation {
        pname = "gio";
-       version = "0.13.4.1";
-       sha256 = "11w567c4zafcdm5i6wpi1dr4m6mpfvyqyda4llq7wgvjbshy5fqk";
+       version = "0.13.5.0";
+       sha256 = "0p1mwzbrzb74wxlykasza4qvvlck2b0wgnhvfa0j3h27x4ii8xjw";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
@@ -85574,8 +85759,8 @@ self: {
      }:
      mkDerivation {
        pname = "glib";
-       version = "0.13.5.0";
-       sha256 = "1bd6lfl8l08s28g9wky2bpyl2kh8vhycdni2wh3m7iq91madxgbj";
+       version = "0.13.6.0";
+       sha256 = "1sz8mvac39sxj7skw8zasbp6srm4k92223l29lll1125d8n0cwaf";
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
          base bytestring containers text utf8-string
@@ -90416,8 +90601,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.14.7";
-       sha256 = "0fqbr1h2zxa4g6jyias163bnlsnsdhfzfansc63qzh9y10vc2hn4";
+       version = "0.14.9";
+       sha256 = "1khz6ymwga07h7s1k9gadf212m242l9qq09qn2fvx8v67p4wvxxz";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
@@ -90522,6 +90707,33 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "gtk-sni-tray" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dbus, directory
+     , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut
+     , gtk3, hslogger, optparse-applicative, status-notifier-item, text
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "gtk-sni-tray";
+       version = "0.1.0.0";
+       sha256 = "0a9yxhir33zg1bkv9nyazkrjawv2w9qr43n4prrifib7r976b7pj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk
+         gi-gdkpixbuf gi-glib gi-gtk hslogger status-notifier-item text
+         transformers unix
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       executableHaskellDepends = [
+         base dbus gi-gdk gi-gtk gtk-strut hslogger optparse-applicative
+         status-notifier-item text unix
+       ];
+       homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme";
+       description = "A standalone StatusNotifierItem/AppIndicator tray";
+       license = stdenv.lib.licenses.bsd3;
+     }) {gtk3 = pkgs.gnome3.gtk;};
+
   "gtk-strut" = callPackage
     ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }:
      mkDerivation {
@@ -90578,8 +90790,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk2hs-buildtools";
-       version = "0.13.3.1";
-       sha256 = "0m3irv9cs8f602wc5lq84c7k1pd9yg4vydfzzn2qa6z0l552y3r2";
+       version = "0.13.4.0";
+       sha256 = "0yg6xmylgpylmnh5g33qwwn5x9bqckdvvv4czqzd9vrr12lnnghg";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -90731,8 +90943,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk3";
-       version = "0.14.8";
-       sha256 = "0sxk3dhzhqkmlwqkpvmi1b0ycyqdz19z7zfr5nxhskzn5b522ikw";
+       version = "0.14.9";
+       sha256 = "1rcn0x6q0r0a3waxdsyvbyzfswsi6j7yr9fsixqr1c0g334lmqa8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -92834,8 +93046,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.6.2";
-       sha256 = "0nkq1qlhpd6gmrj75vik51a4fndn6sy3vwx2nk91vmdd7ml2f0v8";
+       version = "1.6.5";
+       sha256 = "10pn82hichabqxxk931zwqkis8p0z235ydv7dlcrl8nisj6lzda1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -93661,6 +93873,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "half_0_3" = callPackage
+    ({ mkDerivation, base, deepseq, hspec, QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "half";
+       version = "0.3";
+       sha256 = "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6";
+       libraryHaskellDepends = [ base deepseq template-haskell ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "http://github.com/ekmett/half";
+       description = "Half-precision floating-point";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "halfs" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers
      , directory, filepath, fingertree, HFuse, mtl, QuickCheck, random
@@ -94278,6 +94505,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_5_5" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath
+     , formatting, gitrev, hspec, mtl, optparse-applicative, path
+     , path-io, process, stm, temporary, time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.5.5";
+       sha256 = "1imgfnn58cmfi383zfi0flx8w2430f5kplsy2m27djy5fv6brmpv";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base filepath formatting gitrev mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base formatting gitrev optparse-applicative path
+         path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       homepage = "https://github.com/stackbuilders/hapistrano";
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -95366,8 +95621,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.4";
-       sha256 = "0dclanbd07knph3bxn5a3kyl9qkqcwhy00y5jnah9sxk4qqhjkk5";
+       version = "0.0.0.7";
+       sha256 = "0bbyrbs1rm83sd5nsd65yxxfyz4day20hs3vz7rlkh2hjxhpvxjv";
        libraryHaskellDepends = [
          base containers hasbolt lens neat-interpolation template-haskell
          text th-lift-instances
@@ -96527,37 +96782,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.21.0";
-       sha256 = "109jgixxrb9xjlkqnwkch9zgb2rj79knd8ivgfi1cc4v30299vwi";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring Cabal containers directory filepath
-         haskell-gi-base mtl pretty-show process regex-tdfa safe text
-         transformers xdg-basedir xml-conduit
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       executableHaskellDepends = [
-         base containers directory filepath haskell-gi-base pretty-show text
-       ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) glib; 
-         inherit (pkgs.gnome3) gobjectIntrospection;};
-
-  "haskell-gi_0_21_1" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
-     , directory, doctest, filepath, glib, gobjectIntrospection
-     , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
-     , text, transformers, xdg-basedir, xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.21.1";
-       sha256 = "0nhsjw0cv29r6rbajz4lf1ca63lm1m0i57wcs8p6aw10kx246q1n";
+       version = "0.21.2";
+       sha256 = "0g32zgj89n1nihldvn756bz0z25h1ip8as2xvp3d10prx92i4qgi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -96581,8 +96807,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.21.0";
-       sha256 = "1vrz2vrmvsbahzsp1c06x4qmny5qhbrnz5ybzh5p8z1g3ji9z166";
+       version = "0.21.1";
+       sha256 = "0p992mpyy9z699zpvp8i8b5v8a3jhiq6c4n29zlf7qbcxc8z4z36";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
        homepage = "https://github.com/haskell-gi/haskell-gi-base";
@@ -96663,25 +96889,27 @@ self: {
      }) {};
 
   "haskell-igraph" = callPackage
-    ({ mkDerivation, base, binary, bytestring, bytestring-lexing, c2hs
-     , colour, data-default-class, data-ordlist, hashable, hxt, igraph
-     , matrices, primitive, random, split, tasty, tasty-golden
-     , tasty-hunit, unordered-containers
+    ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, cereal
+     , cereal-conduit, colour, conduit, data-default-class, data-ordlist
+     , hashable, hxt, igraph, matrices, primitive, random, split, tasty
+     , tasty-golden, tasty-hunit, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.3.0";
-       sha256 = "1d0phlb2c7dibvs6ayvwgqslkzxmvcij7iw9mqxqk67zp12ga0pv";
+       version = "0.4.0";
+       sha256 = "19bhfcrfj4jxd6znqzslax6sd4w1icwp4rn3h0w31qpjv54x171f";
        libraryHaskellDepends = [
-         base binary bytestring bytestring-lexing colour data-default-class
-         hashable hxt primitive split unordered-containers
+         base bytestring bytestring-lexing cereal cereal-conduit colour
+         conduit data-default-class hashable hxt primitive split
+         unordered-containers
        ];
        librarySystemDepends = [ igraph ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
-         base data-ordlist matrices random tasty tasty-golden tasty-hunit
+         base cereal conduit data-ordlist matrices random tasty tasty-golden
+         tasty-hunit
        ];
-       description = "Imcomplete igraph bindings";
+       description = "Haskell interface of the igraph library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {igraph = null;};
@@ -101292,8 +101520,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedis-config";
-       version = "0.0.3";
-       sha256 = "0n78gh1qz8d7xjc74bb20mvxjk4lf8acc1a3glhyr8ycw05sap2b";
+       version = "1.0.0";
+       sha256 = "19p0g83ybn9iajy5r8ymc8mapml34zw1a7s5hmpxdayv6slabg7r";
        libraryHaskellDepends = [
          aeson base bytestring hedis scientific text time
        ];
@@ -103120,23 +103348,19 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, Chart
      , Chart-cairo, Chart-diagrams, colour, composition-prelude
      , data-binary-ieee754, data-default, directory, filepath, hspec
-     , lens, monad-loops, optparse-applicative
+     , lens, monad-loops
      }:
      mkDerivation {
        pname = "hgis";
-       version = "0.1.3.8";
-       sha256 = "10lqv0v4lnah22qwlyh1ixhcvl0abs9brlpddw0a24xdym4j0xhf";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.0.0.0";
+       sha256 = "1j70p3bgy8v1nzpqiv20lpxq7vxi54f9j3mwl8046hanra99wdr5";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring Chart Chart-cairo
          Chart-diagrams colour composition-prelude data-binary-ieee754
          data-default directory filepath lens monad-loops
-         optparse-applicative
        ];
-       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       description = "Package and command-line for GIS with Haskell";
+       description = "Library and for GIS with Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -105468,6 +105692,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openblasCompat;};
 
+  "hmatrix_0_19_0_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , openblasCompat, random, semigroups, split, storable-complex
+     , vector
+     }:
+     mkDerivation {
+       pname = "hmatrix";
+       version = "0.19.0.0";
+       sha256 = "10jd69nby29dggghcyjk6ykyr5wrn97nrv1dkpyrp0y5xm12xssj";
+       configureFlags = [ "-fdisable-default-paths" "-fopenblas" ];
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq random semigroups split
+         storable-complex vector
+       ];
+       librarySystemDepends = [ openblasCompat ];
+       homepage = "https://github.com/albertoruiz/hmatrix";
+       description = "Numeric Linear Algebra";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openblasCompat;};
+
   "hmatrix-backprop" = callPackage
     ({ mkDerivation, ANum, backprop, base, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
@@ -105523,13 +105768,13 @@ self: {
     ({ mkDerivation, base, containers, glpk, hmatrix }:
      mkDerivation {
        pname = "hmatrix-glpk";
-       version = "0.6.0.0";
-       sha256 = "0x5ghi0rqv6zir304cjg2plpvzgihg31b5irkpf5alig6v7jdjn1";
+       version = "0.19.0.0";
+       sha256 = "1rbbzz1jc9r7blbqd37jb8f054xfk521q54b3srz3k34nkp05yb1";
        libraryHaskellDepends = [ base containers hmatrix ];
        librarySystemDepends = [ glpk ];
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
      }) {inherit (pkgs) glpk;};
 
   "hmatrix-gsl" = callPackage
@@ -105548,6 +105793,23 @@ self: {
        license = "GPL";
      }) {inherit (pkgs) gsl;};
 
+  "hmatrix-gsl_0_19_0_1" = callPackage
+    ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector
+     }:
+     mkDerivation {
+       pname = "hmatrix-gsl";
+       version = "0.19.0.1";
+       sha256 = "0v6dla426x4ywaq59jm89ql1i42n39iw6z0j378xwb676v9kfxhm";
+       libraryHaskellDepends = [
+         array base hmatrix process random vector
+       ];
+       libraryPkgconfigDepends = [ gsl ];
+       homepage = "https://github.com/albertoruiz/hmatrix";
+       description = "Numerical computation";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gsl;};
+
   "hmatrix-gsl-stats" = callPackage
     ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex
      , vector
@@ -105654,6 +105916,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hmatrix-sparse" = callPackage
+    ({ mkDerivation, base, hmatrix, mkl_core, mkl_intel, mkl_sequential
+     }:
+     mkDerivation {
+       pname = "hmatrix-sparse";
+       version = "0.19.0.0";
+       sha256 = "04h9vf4aayhmjnlk8wnf9mg3rfjx9n6dhnv49vpwv7j8c4qhbd4s";
+       libraryHaskellDepends = [ base hmatrix ];
+       librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ];
+       homepage = "https://github.com/albertoruiz/hmatrix";
+       description = "Sparse linear solver";
+       license = stdenv.lib.licenses.bsd3;
+     }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
+
   "hmatrix-special" = callPackage
     ({ mkDerivation, base, hmatrix, hmatrix-gsl }:
      mkDerivation {
@@ -105666,6 +105942,19 @@ self: {
        license = "GPL";
      }) {};
 
+  "hmatrix-special_0_19_0_0" = callPackage
+    ({ mkDerivation, base, hmatrix, hmatrix-gsl }:
+     mkDerivation {
+       pname = "hmatrix-special";
+       version = "0.19.0.0";
+       sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz";
+       libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
+       homepage = "https://github.com/albertoruiz/hmatrix";
+       description = "Interface to GSL special functions";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hmatrix-static" = callPackage
     ({ mkDerivation, array, base, haskell-src-meta, hmatrix, parsec
      , template-haskell, tfp
@@ -105683,6 +105972,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hmatrix-sundials" = callPackage
+    ({ mkDerivation, base, containers, diagrams-lib
+     , diagrams-rasterific, hmatrix, hspec, inline-c, lens, plots
+     , sundials_arkode, template-haskell, vector
+     }:
+     mkDerivation {
+       pname = "hmatrix-sundials";
+       version = "0.19.0.0";
+       sha256 = "03pil8zkkixlgv2m07zyiyribpkphhl75ixvazb36c6rznvkg6nd";
+       libraryHaskellDepends = [
+         base containers hmatrix inline-c template-haskell vector
+       ];
+       librarySystemDepends = [ sundials_arkode ];
+       testHaskellDepends = [
+         base containers diagrams-lib diagrams-rasterific hmatrix hspec
+         inline-c lens plots template-haskell vector
+       ];
+       testSystemDepends = [ sundials_arkode ];
+       homepage = "https://github.com/idontgetoutmuch/hmatrix/tree/sundials";
+       description = "hmatrix interface to sundials";
+       license = stdenv.lib.licenses.bsd3;
+     }) {sundials_arkode = null;};
+
   "hmatrix-svdlibc" = callPackage
     ({ mkDerivation, base, criterion, hmatrix, hspec, QuickCheck
      , vector
@@ -105722,8 +106034,8 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-tests";
-       version = "0.6.0.0";
-       sha256 = "1my4w6nxlwizlysk4ika9xaqjjgjxi2lal83zqgjkc05jxs1p9ih";
+       version = "0.19.0.0";
+       sha256 = "18adrcwd8zgw8x9dn5fvpjq4l88iqvlm5z0yxzr96zppi8z5w6fw";
        libraryHaskellDepends = [
          base binary deepseq hmatrix hmatrix-gsl HUnit QuickCheck random
        ];
@@ -108112,6 +108424,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hpc-threshold" = callPackage
+    ({ mkDerivation, base, bytestring, interpolate, pcre-heavy }:
+     mkDerivation {
+       pname = "hpc-threshold";
+       version = "0.1.0.0";
+       sha256 = "113m7fpm4zffvzwnqjzd45mbc18acgj5c1b9z5hqwklygjjjpx4a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring interpolate pcre-heavy ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/eckyputrady/hpc-threshold#readme";
+       description = "Small utility for validating whether HPC result is above defined thresholds";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hpc-tracer" = callPackage
     ({ mkDerivation, array, base, containers, haskell98, hpc, network
      , parsec, pretty, process, unix
@@ -113542,34 +113870,6 @@ self: {
      }) {};
 
   "http-client" = callPackage
-    ({ mkDerivation, array, async, base, blaze-builder, bytestring
-     , case-insensitive, containers, cookie, deepseq, directory
-     , exceptions, filepath, ghc-prim, hspec, http-types, memory
-     , mime-types, monad-control, network, network-uri, random, stm
-     , streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.5.12";
-       sha256 = "1m4c4zyl8y3i8bzyrgqv9kcjqzj17rwnf49dvn6745bn8kiyq6v0";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring case-insensitive containers
-         cookie deepseq exceptions filepath ghc-prim http-types memory
-         mime-types network network-uri random stm streaming-commons text
-         time transformers
-       ];
-       testHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive containers
-         deepseq directory hspec http-types monad-control network
-         network-uri streaming-commons text time transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_12_1" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, deepseq, directory
      , exceptions, filepath, ghc-prim, hspec, http-types, memory
@@ -113595,7 +113895,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -113901,22 +114200,6 @@ self: {
      }) {};
 
   "http-date" = callPackage
-    ({ mkDerivation, array, attoparsec, base, bytestring, doctest
-     , hspec, old-locale, time
-     }:
-     mkDerivation {
-       pname = "http-date";
-       version = "0.0.6.1";
-       sha256 = "0dknh28kyarnzqrsc80ssalxjrq0qbv7ir49247p2grb7rh0dqgj";
-       libraryHaskellDepends = [ array attoparsec base bytestring ];
-       testHaskellDepends = [
-         base bytestring doctest hspec old-locale time
-       ];
-       description = "HTTP Date parser/formatter";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-date_0_0_7" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, doctest
      , hspec, old-locale, time
      }:
@@ -113930,7 +114213,6 @@ self: {
        ];
        description = "HTTP Date parser/formatter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-dispatch" = callPackage
@@ -115388,8 +115670,8 @@ self: {
     ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }:
      mkDerivation {
        pname = "hw-hspec-hedgehog";
-       version = "0.1.0.3";
-       sha256 = "0bnqvbh8jkpnannfgx1ghv5b4qvj37w1p29ap730s2bbfpsaldq2";
+       version = "0.1.0.4";
+       sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq";
        libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
        testHaskellDepends = [ base hedgehog hspec ];
        homepage = "https://github.com/haskell-works/hw-hspec-hedgehog#readme";
@@ -115409,6 +115691,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-ip" = callPackage
+    ({ mkDerivation, base, hedgehog, hspec, hw-hspec-hedgehog }:
+     mkDerivation {
+       pname = "hw-ip";
+       version = "0.1.0.0";
+       sha256 = "1gw0g6xd6q2rbnpb8j2yi8ddq39r2l8rplx8nfwk9mqzpgxx0r1n";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
+       homepage = "https://github.com/haskell-works/hw-ip#readme";
+       description = "Library for manipulating IP addresses and CIDR blocks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-json" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
      , bytestring, conduit, containers, criterion, dlist, hspec
@@ -115615,18 +115910,48 @@ self: {
      }) {};
 
   "hw-prim" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }:
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
+     }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.5.0.0";
-       sha256 = "00sivy11g7haafpqy12sxgslffw841bx0i25phaz5vcfwp5xrp9j";
-       libraryHaskellDepends = [ base bytestring vector ];
-       testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
+       version = "0.5.0.2";
+       sha256 = "0pqg7a46j63n8gp4c2hsxh98f0xppfhaww00zbjy45zx8h2gb1qm";
+       libraryHaskellDepends = [ base bytestring mmap vector ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap vector
+       ];
        homepage = "http://github.com/haskell-works/hw-prim#readme";
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_5_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.5.0.3";
+       sha256 = "1cnh8qm4kz4fxh34wn9039dxbb54mwhkls21m5s73q773q9fx4rz";
+       libraryHaskellDepends = [ base bytestring mmap vector ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-prim#readme";
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -119389,7 +119714,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "influxdb_1_6_0" = callPackage
+  "influxdb_1_6_0_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
@@ -119399,8 +119724,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.6.0";
-       sha256 = "1fmz5n3mp3w1v2axp9g1nw9h5sj6cw3xbs44xczn59sgpmz5hv34";
+       version = "1.6.0.1";
+       sha256 = "14xk27qg5w7pdrmbz7fys96x4yywv0hk82z46802dlnxlfpikyc3";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -119990,14 +120315,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "integer-gmp_1_0_1_0" = callPackage
+  "integer-gmp_1_0_2_0" = callPackage
     ({ mkDerivation, ghc-prim }:
      mkDerivation {
        pname = "integer-gmp";
-       version = "1.0.1.0";
-       sha256 = "1xrdqksharn0jg8m1d7zm8nhbsq3abw2k25kzw0z7m0zm14n1nlw";
-       revision = "1";
-       editedCabalFile = "02xp5ldq3xxx1qdxg7gbs2zcqpf1dxbdrvrzizxnjwhpiqxcigy3";
+       version = "1.0.2.0";
+       sha256 = "1aaz2mdmwbrfxahhycpiz92hdvfn9mm7964wfypf8m0m8libhs6k";
        libraryHaskellDepends = [ ghc-prim ];
        description = "Integer library based on GMP";
        license = stdenv.lib.licenses.bsd3;
@@ -120559,25 +120882,6 @@ self: {
      }) {};
 
   "invertible" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, invariant, lens
-     , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
-     , transformers, TypeCompose
-     }:
-     mkDerivation {
-       pname = "invertible";
-       version = "0.2.0.4";
-       sha256 = "0hrg58p5yz97n2xi9mbad69skldr163mr1wdvykdsvwyyxhfl4q4";
-       libraryHaskellDepends = [
-         base haskell-src-meta invariant lens partial-isomorphisms
-         semigroupoids template-haskell transformers TypeCompose
-       ];
-       testHaskellDepends = [ base QuickCheck transformers ];
-       description = "bidirectional arrows, bijective functions, and invariant functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "invertible_0_2_0_5" = callPackage
     ({ mkDerivation, base, haskell-src-meta, invariant, lens
      , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
      , transformers
@@ -121113,8 +121417,8 @@ self: {
      }:
      mkDerivation {
        pname = "iproute";
-       version = "1.7.3";
-       sha256 = "0zhfn0rxwakspx1b9pxcqb9vbi8lr786hhb5s9j15xiszkl8hf4s";
+       version = "1.7.4";
+       sha256 = "17gcmw9m8c30cm3j5hdcqhpkvbir9js1k6s3ad141yszxymmnq8q";
        libraryHaskellDepends = [
          appar base byteorder containers network
        ];
@@ -128102,15 +128406,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_4_0_1" = callPackage
+  "language-docker_5_0_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
      , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split
      , template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "4.0.1";
-       sha256 = "0z1jifvinq90qh4106azd6ss80ds5p8acvl8x73j4zmqpn2d95xa";
+       version = "5.0.0";
+       sha256 = "16shdy1dh0bsalj0ciwg7h9dkjfjgkrfmq7g81z3k8fgy1w2y81n";
        libraryHaskellDepends = [
          base bytestring free mtl parsec pretty split template-haskell text
          th-lift time
@@ -128748,7 +129052,7 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "x86_64-linux" ];
      }) {};
 
   "language-python" = callPackage
@@ -128828,8 +129132,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-rust";
-       version = "0.1.1.26";
-       sha256 = "1f363j2kpvww0v7l13lg8a2a0v0h2zw7q3x8fyssvrw3yn5afwyn";
+       version = "0.2.0.27";
+       sha256 = "04xyw05i5fbk766igpa5kx9wa4801s84wr6nyl4y9dwy8fcnq9va";
        libraryHaskellDepends = [
          array base bytestring deepseq prettyprinter template-haskell
          transformers utf8-string
@@ -130432,8 +130736,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-toml-parser";
-       version = "0.1.0.1";
-       sha256 = "1mcbba5ff2jfr91jlzi5s5jf09p92jbpg37gf525bhv23hhid7xy";
+       version = "0.1.0.2";
+       sha256 = "1akp8mm62pnz8ncg235rdxzcrxv36paw723m7dcyr3139qflzxkn";
        libraryHaskellDepends = [ base profunctors text time toml-parser ];
        testHaskellDepends = [
          base containers dwergaz hlint lens-family text toml-parser
@@ -130459,14 +130763,15 @@ self: {
 
   "lens-utils" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, lens
-     , monoid, template-haskell
+     , monoid, split, template-haskell
      }:
      mkDerivation {
        pname = "lens-utils";
-       version = "1.4.2";
-       sha256 = "1sgsahb2cgfhbv3vw0h1cqls5g5kgbq9crx4w0rfjxcwk9d5jzds";
+       version = "1.4.4";
+       sha256 = "0ry04ghvbyxa236s150hfs5fa0fsip312ivflg70j49n02ypxr91";
        libraryHaskellDepends = [
-         aeson base containers data-default lens monoid template-haskell
+         aeson base containers data-default lens monoid split
+         template-haskell
        ];
        homepage = "https://github.com/luna/lens-utils";
        description = "Collection of missing lens utilities";
@@ -137622,17 +137927,18 @@ self: {
      }) {};
 
   "marihana" = callPackage
-    ({ mkDerivation, base, directory }:
+    ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
        pname = "marihana";
-       version = "0.1.1.0";
-       sha256 = "1wcrmjxw39pcarvwn4cfzd4wimvsf57qg8vl5lykcd9s4p2dnyvw";
+       version = "0.2.1.0";
+       sha256 = "03aw0chicgmyj3ix7nz0dc5mpck0409bv1d7lfs5wn9z4mmynqiv";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base directory ];
-       executableHaskellDepends = [ base directory ];
-       testHaskellDepends = [ base directory ];
+       libraryHaskellDepends = [ base directory filepath process ];
+       executableHaskellDepends = [ base directory filepath process ];
+       testHaskellDepends = [ base directory filepath process ];
        homepage = "https://github.com/suzukeno/marihana#readme";
+       description = "Minimal tool to make your blog in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -138072,8 +138378,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv-io";
-       version = "0.1.2.0";
-       sha256 = "02va411j1alsja009xms30x0zhwansjiy81djz2za06ghyg4f6a1";
+       version = "0.1.3.0";
+       sha256 = "08jngww0ki28d2mhfj9vw4rlxigzzvgb295k5fnj0cr7xmhr48zx";
        libraryHaskellDepends = [
          base bytestring data-default deepseq directory filepath JuicyPixels
          massiv netpbm process vector
@@ -140915,26 +141221,6 @@ self: {
      }) {};
 
   "mime-mail-ses" = callPackage
-    ({ mkDerivation, base, base64-bytestring, byteable, bytestring
-     , conduit, cryptohash, http-client, http-conduit, http-types
-     , mime-mail, old-locale, text, time, transformers, xml-conduit
-     , xml-types
-     }:
-     mkDerivation {
-       pname = "mime-mail-ses";
-       version = "0.4.0.0";
-       sha256 = "0w87ba8a5kli7xv7d8x5viz1c2rmm3ahaxp5d797n8bb13yn09mw";
-       libraryHaskellDepends = [
-         base base64-bytestring byteable bytestring conduit cryptohash
-         http-client http-conduit http-types mime-mail old-locale text time
-         transformers xml-conduit xml-types
-       ];
-       homepage = "http://github.com/snoyberg/mime-mail";
-       description = "Send mime-mail messages via Amazon SES";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mime-mail-ses_0_4_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, byteable, bytestring
      , conduit, cryptohash, http-client, http-client-tls, http-conduit
      , http-types, mime-mail, old-locale, text, time, transformers
@@ -140952,7 +141238,6 @@ self: {
        homepage = "http://github.com/snoyberg/mime-mail";
        description = "Send mime-mail messages via Amazon SES";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime-string" = callPackage
@@ -141134,35 +141419,32 @@ self: {
      }) {};
 
   "minio-hs" = callPackage
-    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
-     , case-insensitive, conduit, conduit-combinators, conduit-extra
-     , containers, cryptonite, cryptonite-conduit, data-default
-     , directory, exceptions, filepath, http-client, http-conduit
-     , http-types, lifted-async, lifted-base, memory, monad-control
-     , protolude, QuickCheck, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, temporary, text, text-format
-     , time, transformers, transformers-base, vector, xml-conduit
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, conduit, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, data-default, directory, exceptions, filepath
+     , http-client, http-conduit, http-types, memory, protolude
+     , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, temporary, text, text-format, time
+     , transformers, unliftio, unliftio-core, xml-conduit
      }:
      mkDerivation {
        pname = "minio-hs";
-       version = "0.3.2";
-       sha256 = "0yfhnvngw27h05hxywxp76fcy4566djsm0l3x2kx8n4ppwi5p6r4";
+       version = "1.0.0";
+       sha256 = "0q6qzzkkbm9b0a7c630yj2rlg54imir1yjbpsy4x9fh3kc7vx0i2";
        libraryHaskellDepends = [
-         aeson async base base64-bytestring bytestring case-insensitive
-         conduit conduit-combinators conduit-extra containers cryptonite
-         cryptonite-conduit data-default exceptions filepath http-client
-         http-conduit http-types lifted-async lifted-base memory
-         monad-control protolude resourcet text text-format time
-         transformers transformers-base vector xml-conduit
+         aeson base base64-bytestring bytestring case-insensitive conduit
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         exceptions filepath http-client http-conduit http-types memory
+         protolude resourcet text text-format time transformers unliftio
+         unliftio-core xml-conduit
        ];
        testHaskellDepends = [
-         aeson async base base64-bytestring bytestring case-insensitive
-         conduit conduit-combinators conduit-extra containers cryptonite
-         cryptonite-conduit data-default directory exceptions filepath
-         http-client http-conduit http-types lifted-async lifted-base memory
-         monad-control protolude QuickCheck resourcet tasty tasty-hunit
+         aeson base base64-bytestring bytestring case-insensitive conduit
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory exceptions filepath http-client http-conduit http-types
+         memory protolude QuickCheck resourcet tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck temporary text text-format time
-         transformers transformers-base vector xml-conduit
+         transformers unliftio unliftio-core xml-conduit
        ];
        homepage = "https://github.com/minio/minio-hs#readme";
        description = "A Minio Haskell Library for Amazon S3 compatible cloud storage";
@@ -141429,15 +141711,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "miso_0_19_0_0" = callPackage
+  "miso_0_20_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
      , http-types, lucid, network-uri, servant, servant-lucid, text
      , transformers, vector
      }:
      mkDerivation {
        pname = "miso";
-       version = "0.19.0.0";
-       sha256 = "0xnnhs36rnbaq8q4s6r2lhm9g4qdvm0qm0pj3hgrkgn22cs2fq21";
+       version = "0.20.0.0";
+       sha256 = "0nr7j9065mrwmmqwjsgl9krh21mhxjddbwmkwja0b207aglc072j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -141660,6 +141942,8 @@ self: {
        pname = "mmark";
        version = "0.0.5.6";
        sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw";
+       revision = "1";
+       editedCabalFile = "02b0ycywjhzx1ll36l38mwp2gy677hgsqpq2mwyi277ykbrwnsdk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -141708,8 +141992,8 @@ self: {
        pname = "mmark-ext";
        version = "0.2.0.0";
        sha256 = "1ccfdjsn8z80x2m5p9q17r2hf14zj63nkxkrg9s7knwr1j08gj1k";
-       revision = "1";
-       editedCabalFile = "0sql0z4123v5kzqcganfaag6ijl3j7lw52d3c50r9qwwg8q2dydz";
+       revision = "2";
+       editedCabalFile = "0h47hy97mdan3cnxppf0yarmis81irc0c92nm1xv9f6w35li7rkq";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base foldl lucid microlens mmark modern-uri skylighting text
@@ -142614,28 +142898,6 @@ self: {
      }) {};
 
   "monad-logger" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, conduit-extra
-     , exceptions, fast-logger, lifted-base, monad-control, monad-loops
-     , mtl, resourcet, stm, stm-chans, template-haskell, text
-     , transformers, transformers-base, transformers-compat
-     , unliftio-core
-     }:
-     mkDerivation {
-       pname = "monad-logger";
-       version = "0.3.28.4";
-       sha256 = "1pqay81lk6divcfslg4dqcpyq2wv7vpdzb73kb2g4203mmpjcpv4";
-       libraryHaskellDepends = [
-         base bytestring conduit conduit-extra exceptions fast-logger
-         lifted-base monad-control monad-loops mtl resourcet stm stm-chans
-         template-haskell text transformers transformers-base
-         transformers-compat unliftio-core
-       ];
-       homepage = "https://github.com/snoyberg/monad-logger#readme";
-       description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-logger_0_3_28_5" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , exceptions, fast-logger, lifted-base, monad-control, monad-loops
      , mtl, resourcet, stm, stm-chans, template-haskell, text
@@ -142655,7 +142917,6 @@ self: {
        homepage = "https://github.com/snoyberg/monad-logger#readme";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -146247,6 +146508,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "mwc-probability-transition" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, logging-effect, mtl
+     , mwc-probability, primitive, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "mwc-probability-transition";
+       version = "0.3.0.3";
+       sha256 = "04jnszan9723ycrf1xgh2k87vcx0xyq5ga8q3fjskr3937j0ydxj";
+       libraryHaskellDepends = [
+         base ghc-prim logging-effect mtl mwc-probability primitive
+         transformers
+       ];
+       testHaskellDepends = [
+         base hspec logging-effect mwc-probability QuickCheck
+       ];
+       homepage = "https://github.com/ocramz/mwc-probability-transition";
+       description = "A Markov stochastic transition operator with logging";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mwc-random" = callPackage
     ({ mkDerivation, base, math-functions, primitive, time, vector }:
      mkDerivation {
@@ -152582,12 +152863,12 @@ self: {
      }) {};
 
   "one-liner-instances" = callPackage
-    ({ mkDerivation, base, one-liner }:
+    ({ mkDerivation, base, one-liner, random }:
      mkDerivation {
        pname = "one-liner-instances";
-       version = "0.1.1.0";
-       sha256 = "0yb5rdy735lalwrxvmvvjnpyikdqs2y2fjldjcbjj0r3d912azxn";
-       libraryHaskellDepends = [ base one-liner ];
+       version = "0.1.2.1";
+       sha256 = "1gy900nd5n6cffqw63hlkqg4ly86wjlfqgdcm1zy2nyx7dxg914k";
+       libraryHaskellDepends = [ base one-liner random ];
        homepage = "https://github.com/mstksg/one-liner-instances#readme";
        description = "Generics-based implementations for common typeclasses";
        license = stdenv.lib.licenses.bsd3;
@@ -152930,8 +153211,8 @@ self: {
     ({ mkDerivation, base, type-fun }:
      mkDerivation {
        pname = "open-union";
-       version = "0.3.0.0";
-       sha256 = "01wxkla0034d5i331vzbjm5ilkdn2570qhl0pa6lf3m58aghmccn";
+       version = "0.4.0.0";
+       sha256 = "0mf37xya4bb8za8jrhnzr9pddsd93dw0vycmjlks5w50x10d4a55";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base type-fun ];
@@ -155682,8 +155963,8 @@ self: {
      }:
      mkDerivation {
        pname = "pango";
-       version = "0.13.4.0";
-       sha256 = "1m7as420nh55n0hywnl6rbm7zj4s1ry38xvb1gk3np7k87lwf20z";
+       version = "0.13.5.0";
+       sha256 = "1s29dmds28ffbcbic8pw3bsixkb6lzjm78j8qv4x3r9l64kvjndz";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal filepath gtk2hs-buildtools ];
        libraryHaskellDepends = [
@@ -160924,8 +161205,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-extras";
-       version = "1.0.13";
-       sha256 = "04adszpz02a72zz8kjj9lcw62n296p74rq4xds3b8g345m6c51g1";
+       version = "1.0.14";
+       sha256 = "17f8aj6p074yryk0a26vg1iiy7dva5cjb1gzsrvsq41dhy28j7gx";
        libraryHaskellDepends = [ base foldl lens pipes transformers ];
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
@@ -166813,8 +167094,8 @@ self: {
      }:
      mkDerivation {
        pname = "prologue";
-       version = "3.1.7";
-       sha256 = "024ygn8q24sxdxdr1mip9pcjjmzm254am7fyzbqpmj5cjg1kykq6";
+       version = "3.2.0";
+       sha256 = "19q61qjmygjah49qjy4a89hpn8ra8z9pq0f72p1c7wzgk38zp55r";
        libraryHaskellDepends = [
          base bifunctors binary comonad cond container convert data-default
          deepseq deriving-compat either errors exceptions functor-utils
@@ -166992,8 +167273,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.3.4";
-       sha256 = "0wzaca3hcvbdfb326srj6sivzkbyshxv6j0lvng6k8dqwiipnvwb";
+       version = "5.3.5";
+       sha256 = "0x6whnn53grfkjqybn91kfsr69w3r9mk9r39yzwx35skwkqj3vb9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -167001,11 +167282,7 @@ self: {
          filepath hashable hslogger IfElse mtl network process split stm
          text time transformers unix unix-compat
        ];
-       executableHaskellDepends = [
-         ansi-terminal async base bytestring containers directory exceptions
-         filepath hashable hslogger IfElse mtl network process split stm
-         text time transformers unix unix-compat
-       ];
+       executableHaskellDepends = [ base ];
        homepage = "https://propellor.branchable.com/";
        description = "property-based host configuration management in haskell";
        license = stdenv.lib.licenses.bsd2;
@@ -170744,31 +171021,6 @@ self: {
      }) {};
 
   "rakuten" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, connection, constraints
-     , data-default-class, extensible, hspec, http-api-data, http-client
-     , http-client-tls, http-types, lens, req, servant-server, text
-     , warp
-     }:
-     mkDerivation {
-       pname = "rakuten";
-       version = "0.1.1.0";
-       sha256 = "13m8rg805aw5rj2a5j16yj06k5ws99ssl89r5s62xlq6lbzhc84c";
-       libraryHaskellDepends = [
-         aeson base bytestring connection constraints data-default-class
-         extensible http-api-data http-client http-client-tls http-types
-         lens req text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring connection constraints data-default-class
-         extensible hspec http-api-data http-client http-client-tls
-         http-types lens req servant-server text warp
-       ];
-       homepage = "https://github.com/matsubara0507/rakuten#readme";
-       description = "The Rakuten API in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rakuten_0_1_1_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, constraints
      , data-default-class, extensible, hspec, http-api-data, http-client
      , http-client-tls, http-types, lens, req, servant-server, text
@@ -170791,7 +171043,6 @@ self: {
        homepage = "https://github.com/matsubara0507/rakuten#readme";
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ralist" = callPackage
@@ -172293,6 +172544,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reactive-banana-automation" = callPackage
+    ({ mkDerivation, base, doctest, reactive-banana, stm, time }:
+     mkDerivation {
+       pname = "reactive-banana-automation";
+       version = "0.1.1";
+       sha256 = "0fn3frv0idgdg9faysri7x5nzrxrzhpy41s5nm6v8ckqcnzq7vvv";
+       libraryHaskellDepends = [ base reactive-banana stm time ];
+       testHaskellDepends = [ base doctest ];
+       description = "home (etc) automation using reactive-banana";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "reactive-banana-bunch" = callPackage
     ({ mkDerivation, base, non-empty, reactive-banana, transformers
      , utility-ht
@@ -173198,8 +173461,8 @@ self: {
     ({ mkDerivation, base, deepseq, raptor2, redland }:
      mkDerivation {
        pname = "redland";
-       version = "0.2.0.1";
-       sha256 = "080bp01x6vlfw116zcl75vr7pb753mn8892rkh7aqgaf8ajkhb2c";
+       version = "0.2.0.2";
+       sha256 = "0wfmv87d9vxah1s519457zs4436lri7ypn2069r8wdpvaariiim5";
        libraryHaskellDepends = [ base deepseq ];
        libraryPkgconfigDepends = [ raptor2 redland ];
        description = "Redland RDF library bindings";
@@ -179217,8 +179480,8 @@ self: {
      }:
      mkDerivation {
        pname = "safe-money";
-       version = "0.5";
-       sha256 = "09ia4sf98ggl2y8xl0gn1vjapvwbbqq3ibfrci2p2akkyykg2vk8";
+       version = "0.6";
+       sha256 = "1l8gn9vscng92s1dkfj2fa55k63jnzcnw590r5a8n7dqwaycpz7r";
        libraryHaskellDepends = [
          aeson base binary cereal constraints deepseq hashable serialise
          store text vector-space xmlbf
@@ -179694,24 +179957,6 @@ self: {
      }) {};
 
   "sampling" = callPackage
-    ({ mkDerivation, base, containers, criterion, foldl, mwc-random
-     , primitive, vector
-     }:
-     mkDerivation {
-       pname = "sampling";
-       version = "0.3.2";
-       sha256 = "0kl2d53rp0wi3fb0apm8czzx1wj93ljl3a17w6yibyqgc3j5cqd6";
-       libraryHaskellDepends = [
-         base containers foldl mwc-random primitive vector
-       ];
-       testHaskellDepends = [ base ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/jtobin/sampling";
-       description = "Sample values from collections";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "sampling_0_3_3" = callPackage
     ({ mkDerivation, base, containers, criterion, foldl, mwc-random
      , primitive, vector
      }:
@@ -179727,7 +179972,6 @@ self: {
        homepage = "https://github.com/jtobin/sampling";
        description = "Sample values from collections";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "samtools" = callPackage
@@ -180106,33 +180350,6 @@ self: {
      }) {};
 
   "sbp" = callPackage
-    ({ mkDerivation, aeson, array, base, base64-bytestring
-     , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
-     , resourcet, tasty, tasty-hunit, template-haskell, text, yaml
-     }:
-     mkDerivation {
-       pname = "sbp";
-       version = "2.3.13";
-       sha256 = "0gvjqddnvbr3vn7qaajqqbh23p17vavj0p97zwh6fbizkxpj25k9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
-         text
-       ];
-       executableHaskellDepends = [
-         aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-extra resourcet yaml
-       ];
-       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
-       homepage = "https://github.com/swift-nav/libsbp";
-       description = "SwiftNav's SBP Library";
-       license = stdenv.lib.licenses.lgpl3;
-     }) {};
-
-  "sbp_2_3_16" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
      , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
@@ -180157,7 +180374,6 @@ self: {
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbp2udp" = callPackage
@@ -181345,8 +181561,8 @@ self: {
      }:
      mkDerivation {
        pname = "scroll";
-       version = "1.20170122";
-       sha256 = "0f4blgfaz69y2i6cj91zq63v5dqv7invjvqv5a4l1rgjixpn7dc9";
+       version = "1.20180421";
+       sha256 = "0apzrvf99rskj4dbmn57jjxrsf19j436s8a09m950df5aws3a0wj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -181633,6 +181849,25 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
+  "sdl2-ttf_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
+     , template-haskell, text, transformers
+     }:
+     mkDerivation {
+       pname = "sdl2-ttf";
+       version = "2.1.0";
+       sha256 = "1xw05jgv6x9xplahwf3jjdq6v3mha4s7bb27kn8x66764glnyrf7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring sdl2 template-haskell text transformers
+       ];
+       libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
+       description = "Bindings to SDL2_ttf";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
+
   "sdnv" = callPackage
     ({ mkDerivation, base, binary, bytestring }:
      mkDerivation {
@@ -182384,13 +182619,19 @@ self: {
      }) {};
 
   "semirings" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, base, constrictor, containers, hashable
+     , integer-gmp, unordered-containers, vector
+     }:
      mkDerivation {
        pname = "semirings";
-       version = "0.0.0";
-       sha256 = "0dc4vi7zlpvz12b9hvq5b6v621aw84hp331rcbn617gpw7dvflcq";
-       doHaddock = false;
-       description = "TBA";
+       version = "0.1.1";
+       sha256 = "1vrvid3ix80vwmf7qmp5f1f97nyzkq4a01bxf62kpqlbri2m9mz3";
+       libraryHaskellDepends = [
+         base constrictor containers hashable integer-gmp
+         unordered-containers vector
+       ];
+       homepage = "http://github.com/chessai/semirings";
+       description = "two monoids as one, in holy haskimony";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -183365,8 +183606,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-auth-token-acid";
-       version = "0.5.3.0";
-       sha256 = "1fwzsx13lvqaaxh8cfs7zi8l2a0c7kgz8gnnwgssrasnk27jsc20";
+       version = "0.5.3.1";
+       sha256 = "0mndi1b0sgfik7yij3l65bcsqp820igbf09nnrk8dmznnama56y4";
        libraryHaskellDepends = [
          acid-state aeson-injector base bytestring containers ghc-prim
          monad-control mtl safe safecopy servant-auth-token
@@ -185875,8 +186116,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.8.0.1";
-       sha256 = "0rl0a2d55r55w705jx4si17n403l06jk3d6mrf3gd2ghn93hb13a";
+       version = "1.8.0.2";
+       sha256 = "16gmyn1rbfx33dxxkyxrswa8cvjpiq3i2vm59hy4y9lag10nq9xn";
        libraryHaskellDepends = [
          base binary dependency directory hashable hs2ats language-ats lens
          shake shake-ext text
@@ -185920,8 +186161,7 @@ self: {
        description = "Helper functions for linting with shake";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-       broken = true;
-     }) {cdeps = null;};
+     }) {};
 
   "shake-extras" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, directory, filepath
@@ -193335,19 +193575,6 @@ self: {
      }) {};
 
   "sql-words" = callPackage
-    ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
-     mkDerivation {
-       pname = "sql-words";
-       version = "0.1.5.1";
-       sha256 = "0nr4ld96s3n48ydd15jsxb823kk2682wkjd2h7vqc306891qwwzd";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "SQL keywords data constructors into OverloadedString";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sql-words_0_1_6_0" = callPackage
     ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
@@ -193358,7 +193585,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "SQL keywords data constructors into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlcipher" = callPackage
@@ -194602,8 +194828,8 @@ self: {
      }:
      mkDerivation {
        pname = "stackage2nix";
-       version = "0.6.1";
-       sha256 = "0wqa6lrn2l38grg4h24ihacchavsyglbvlmlsfh4s9h1300dngab";
+       version = "0.7.0";
+       sha256 = "0g3abhr63jnqw231k6kai9c5gqh15dyxrr78fqw5ga98l3p2b8jl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194615,7 +194841,8 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base bytestring Cabal hspec pretty shakespeare text yaml
+         base bytestring Cabal hspec network-uri pretty shakespeare text
+         yaml
        ];
        homepage = "https://github.com/typeable/stackage2nix#readme";
        description = "Convert Stack files into Nix build instructions";
@@ -195247,8 +195474,8 @@ self: {
      }:
      mkDerivation {
        pname = "status-notifier-item";
-       version = "0.1.0.0";
-       sha256 = "1g1gf3anqrg8mfdyjvymk5wlg0h4pfc0pv4wlw5phk6r93dxah1n";
+       version = "0.2.1.0";
+       sha256 = "1w81n87x70bqpskcp0nai9l8ry6hk518myn1cymi695x94vv9m6d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200564,31 +200791,30 @@ self: {
   "taffybar" = callPackage
     ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers
      , dbus, directory, dyre, either, enclosed-exceptions, filepath
-     , glib, gtk-traymanager, gtk3, HStringTemplate, HTTP, mtl, multimap
+     , gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-gtk, glib, gtk-traymanager
+     , gtk3, haskell-gi-base, HStringTemplate, HTTP, mtl, multimap
      , network, network-uri, old-locale, parsec, process, rate-limit
      , safe, split, stm, text, time, time-locale-compat, time-units
-     , transformers, tuple, unix, utf8-string, X11, xdg-basedir, xml
-     , xml-helpers, xmonad, xmonad-contrib
+     , transformers, transformers-base, tuple, unix, utf8-string, X11
+     , xdg-basedir, xml, xml-helpers, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "1.0.1";
-       sha256 = "1agx7q73h8x53cl8i408yifrr80fbm47pwn46mi6abcp61s92chn";
+       version = "1.0.2";
+       sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          alsa-mixer base cairo ConfigFile containers dbus directory dyre
-         either enclosed-exceptions filepath glib gtk-traymanager gtk3
-         HStringTemplate HTTP mtl multimap network network-uri old-locale
-         parsec process rate-limit safe split stm text time
-         time-locale-compat time-units transformers tuple unix utf8-string
-         X11 xdg-basedir xml xml-helpers xmonad xmonad-contrib
-       ];
-       executableHaskellDepends = [
-         base containers directory dyre filepath glib gtk3 mtl safe split
-         utf8-string X11 xdg-basedir
+         either enclosed-exceptions filepath gi-gdk gi-gdkpixbuf gi-gdkx11
+         gi-gtk glib gtk-traymanager gtk3 haskell-gi-base HStringTemplate
+         HTTP mtl multimap network network-uri old-locale parsec process
+         rate-limit safe split stm text time time-locale-compat time-units
+         transformers transformers-base tuple unix utf8-string X11
+         xdg-basedir xml xml-helpers xmonad xmonad-contrib
        ];
+       executableHaskellDepends = [ base ];
        homepage = "http://github.com/travitch/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
@@ -201278,6 +201504,8 @@ self: {
        pname = "tar";
        version = "0.4.1.0";
        sha256 = "05875pc5ns1fsbl9qgr8sqh29xl4mhvj0pwsa9z4afxv6h6328bm";
+       revision = "1";
+       editedCabalFile = "14ljxvasrda7qafz95gz3m0lpdsh4vvd6j8b3qkr2a2sp7cc0sis";
        libraryHaskellDepends = [
          base bytestring directory filepath old-time
        ];
@@ -202806,8 +203034,8 @@ self: {
     ({ mkDerivation, base, Boolean }:
      mkDerivation {
        pname = "temporal-media";
-       version = "0.6.2";
-       sha256 = "0dsvpag8j2lfn6nz9wbzcbdfrzmq35ww9n8p5db638b11749sc97";
+       version = "0.6.3";
+       sha256 = "04qbbx32rs6mz5w3j7wj2hx744x858rv60hmpla3zpx2491r0qi9";
        libraryHaskellDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
@@ -204178,6 +204406,8 @@ self: {
        pname = "text-format";
        version = "0.3.1.1";
        sha256 = "02zfgzfjvkaxbma1h2gr95h10c8q9gyaadag41q579j68iv15qbd";
+       revision = "1";
+       editedCabalFile = "1ap2paddh2q1ifs3nwdj0f1r7fypnsa669l7gdvgyfidz3w5vzic";
        libraryHaskellDepends = [
          array base double-conversion ghc-prim integer-gmp old-locale text
          time transformers
@@ -204336,27 +204566,6 @@ self: {
      }) {};
 
   "text-ldap" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, dlist
-     , memory, QuickCheck, quickcheck-simple, random, transformers
-     }:
-     mkDerivation {
-       pname = "text-ldap";
-       version = "0.1.1.11";
-       sha256 = "1921cdq9akvcn0hsgs07g2bvbpdvhb1h389yv9703472d0sz7pfs";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers dlist memory transformers
-       ];
-       executableHaskellDepends = [ base bytestring ];
-       testHaskellDepends = [
-         base bytestring QuickCheck quickcheck-simple random
-       ];
-       description = "Parser and Printer for LDAP text data stream";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-ldap_0_1_1_12" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, dlist
      , memory, QuickCheck, quickcheck-simple, random, transformers
      }:
@@ -204375,7 +204584,6 @@ self: {
        ];
        description = "Parser and Printer for LDAP text data stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-lens" = callPackage
@@ -205224,17 +205432,6 @@ self: {
      }) {};
 
   "th-data-compat" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "th-data-compat";
-       version = "0.0.2.5";
-       sha256 = "1q2gggciz9s9ksn3h0mc5zffawz6j7pg6k1k96pqsx39f1bbrbqs";
-       libraryHaskellDepends = [ base template-haskell ];
-       description = "Compatibility for data definition template of TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-data-compat_0_0_2_6" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-data-compat";
@@ -205243,7 +205440,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Compatibility for data definition template of TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar" = callPackage
@@ -205350,8 +205546,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-format";
-       version = "0.1.1.0";
-       sha256 = "1axan3icxz9yxkra2kb9r66h9h51v4zbjncd1xsvgiplqmwf6fjl";
+       version = "0.1.2.0";
+       sha256 = "1wc9ndqv2qxk75b47s44j0lrx5h9hc1r4h1nvl01pbdks6yyi43j";
        libraryHaskellDepends = [
          base Earley haskell-src-meta template-haskell text
        ];
@@ -205549,18 +205745,6 @@ self: {
      }) {};
 
   "th-reify-compat" = callPackage
-    ({ mkDerivation, base, template-haskell }:
-     mkDerivation {
-       pname = "th-reify-compat";
-       version = "0.0.1.3";
-       sha256 = "0byl2n0lj55vx2kyka172bwvw8zcyag78cnqs7y9yp4kl8ivwh8z";
-       libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/khibino/haskell-th-reify-compat/";
-       description = "Compatibility for the result type of TH reify";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-reify-compat_0_0_1_4" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "th-reify-compat";
@@ -205570,7 +205754,6 @@ self: {
        homepage = "http://github.com/khibino/haskell-th-reify-compat/";
        description = "Compatibility for the result type of TH reify";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-reify-many" = callPackage
@@ -206479,25 +206662,6 @@ self: {
      }) {};
 
   "tidal" = callPackage
-    ({ mkDerivation, base, colour, containers, hashable, hosc
-     , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty
-     , tasty-hunit, text, time, websockets
-     }:
-     mkDerivation {
-       pname = "tidal";
-       version = "0.9.8";
-       sha256 = "08a8k4kdq6wmhggf3bm4c5a6xck2waf6n6815csms919rhlbkbpb";
-       libraryHaskellDepends = [
-         base colour containers hashable hosc mersenne-random-pure64 mtl
-         parsec safe semigroups text time websockets
-       ];
-       testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "http://tidalcycles.org/";
-       description = "Pattern language for improvised music";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "tidal_0_9_9" = callPackage
     ({ mkDerivation, base, colour, containers, hashable, hosc
      , mersenne-random-pure64, mtl, parsec, safe, semigroups, tasty
      , tasty-hunit, text, time, websockets
@@ -206514,7 +206678,6 @@ self: {
        homepage = "http://tidalcycles.org/";
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tidal-midi" = callPackage
@@ -209121,6 +209284,8 @@ self: {
        pname = "transformers-either";
        version = "0.0.2";
        sha256 = "1122rgspazl3n9vghlzzg14hv6p0a66lf6r7hkim14p0rcagvx5a";
+       revision = "1";
+       editedCabalFile = "134big9w9307vjmj6p6m3wgmh4lrvv8dyg0iw2nm54p9kg0c6ga8";
        libraryHaskellDepends = [ base text transformers ];
        description = "An Either monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -209132,6 +209297,8 @@ self: {
        pname = "transformers-either";
        version = "0.1.0";
        sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm";
+       revision = "1";
+       editedCabalFile = "1bhkkh73irjql1jhxdcrv1igmf0hqpnw2p0w1s6fwhiidx64kvy9";
        libraryHaskellDepends = [ base exceptions text transformers ];
        homepage = "http://github.com/tmcgilchrist/transformers-either/";
        description = "An Either monad transformer";
@@ -210635,8 +210802,8 @@ self: {
      }:
      mkDerivation {
        pname = "turtle";
-       version = "1.5.7";
-       sha256 = "1qh33akv57wv11qg5bk8wa0gbjjq89gxakcg40b93qc8d0dd86wk";
+       version = "1.5.8";
+       sha256 = "0vp442byylqki6pabhg8bs27msqsdcwcnql40z003jx1hidccnq4";
        libraryHaskellDepends = [
          ansi-wl-pprint async base bytestring clock containers directory
          exceptions foldl hostname managed optional-args
@@ -210730,20 +210897,20 @@ self: {
     ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base
      , bytestring, composition-prelude, containers, criterion
      , data-default, directory, extra, hspec, htoml-megaparsec
-     , http-client, http-client-tls, http-types, megaparsec, microlens
+     , http-client, http-client-tls, http-types, lens, megaparsec
      , optparse-applicative, split, text, unordered-containers
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.37";
-       sha256 = "14csa7p3z4ywxwybs0y4ylymsqg1m8scp5fhcm3mayy9cdz2g49n";
+       version = "1.0.1.38";
+       sha256 = "19k1z6wrizym21a29hx31yhv4y5m1w0474iqm8idyxih4fya3k7s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint authenticate-oauth base bytestring
          composition-prelude containers data-default extra htoml-megaparsec
-         http-client http-client-tls http-types megaparsec microlens split
-         text unordered-containers
+         http-client http-client-tls http-types lens megaparsec split text
+         unordered-containers
        ];
        executableHaskellDepends = [
          base bytestring directory optparse-applicative
@@ -211603,8 +211770,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
        pname = "type-interpreter";
-       version = "0.1.3";
-       sha256 = "0gv1782vj48v9cybsyc8wqsgndg966gkpnzxaw7s9f2g1c18jj1s";
+       version = "0.1.4";
+       sha256 = "0743byvz8jry9b5li4wg5qc4nwl5ri0vjvsfdy3l4gkg1v1zh0ng";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
@@ -211988,18 +212155,17 @@ self: {
      }) {};
 
   "type-unary" = callPackage
-    ({ mkDerivation, applicative-numbers, base, constraints, newtype
-     , ty, vector-space
+    ({ mkDerivation, applicative-numbers, base, constraints
+     , newtype-generics, ty, vector-space
      }:
      mkDerivation {
        pname = "type-unary";
-       version = "0.3.0";
-       sha256 = "1s84bw7fxxsqixy03892zb1s261fc0c8h5srsifs5mzgvhxkn20l";
-       revision = "1";
-       editedCabalFile = "03lz4iprlfl2bnh4isa2k7ddv1wxz8mqb7x1nmhjqbx34apbqi11";
+       version = "0.3.2";
+       sha256 = "12h20xjqr1abb5mb4fmij9j0vkfn7rwbidm2dr7ssbkk7cb5fv37";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         applicative-numbers base constraints newtype ty vector-space
+         applicative-numbers base constraints newtype-generics ty
+         vector-space
        ];
        homepage = "https://github.com/conal/type-unary";
        description = "Type-level and typed unary natural numbers, inequality proofs, vectors";
@@ -213883,16 +214049,16 @@ self: {
      }) {};
 
   "universum" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , doctest, ghc-prim, Glob, hashable, hedgehog, microlens
-     , microlens-mtl, mtl, safe-exceptions, semigroups, stm, tasty
-     , tasty-hedgehog, text, text-format, transformers, type-operators
+    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+     , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
+     , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
+     , text, text-format, transformers, type-operators
      , unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "universum";
-       version = "1.1.0";
-       sha256 = "0k1gk9dba9f7w852m6y46gq1md3z0w29bgv4qy7xp3pk16h3axhp";
+       version = "1.1.1";
+       sha256 = "0l49k17f73hkywccvnir79iwlj7j7bb3p89j5kf5hdnk25biw2hq";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable microlens
          microlens-mtl mtl safe-exceptions stm text text-format transformers
@@ -213903,8 +214069,7 @@ self: {
          utf8-string
        ];
        benchmarkHaskellDepends = [
-         base containers criterion deepseq hashable mtl semigroups text
-         unordered-containers
+         base containers gauge unordered-containers
        ];
        homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
@@ -214116,6 +214281,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "unliftio_0_2_7_0" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+     , process, stm, time, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.7.0";
+       sha256 = "0qql93lq5w7qghl454cc3s1i8v1jb4h08n82fqkw0kli4g3g9njs";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm time transformers
+         unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process stm time
+         transformers unix unliftio-core
+       ];
+       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unliftio-core" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -214136,8 +214323,8 @@ self: {
      }:
      mkDerivation {
        pname = "unliftio-pool";
-       version = "0.1.0.1";
-       sha256 = "1z4h20jn3i3582i63vmih2ccr0pljp6whb3h4pbpj36s1q75bmgp";
+       version = "0.2.0.0";
+       sha256 = "0alwn39ri4npgxfxvnv43bl8vfjhjl4ffcvv8l9nmrmzsh770p59";
        libraryHaskellDepends = [
          base resource-pool time transformers unliftio-core
        ];
@@ -215287,6 +215474,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "utf8-validator" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, tasty, tasty-hunit
+     , text, utf8-string
+     }:
+     mkDerivation {
+       pname = "utf8-validator";
+       version = "0.1.0.0";
+       sha256 = "1r4y6gvd4jqfqv4qz01bhq1r17lsi548p6sr1byvkj00nia0cyjk";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit text utf8-string
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/edwardgeorge/utf8-validator#readme";
+       description = "Constant-space UTF8 validator for ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "util" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -215975,6 +216180,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity_0_5_0_0" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "validity";
+       version = "0.5.0.0";
+       sha256 = "0hpdj3ckp2r8dklpjdrrbfd02maskxw2vrjnqnxsgi8s3j8avqsv";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity typeclass";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-aeson" = callPackage
     ({ mkDerivation, aeson, base, validity, validity-scientific
      , validity-text, validity-unordered-containers, validity-vector
@@ -215992,6 +216211,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-aeson_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, base, validity, validity-scientific
+     , validity-text, validity-unordered-containers, validity-vector
+     }:
+     mkDerivation {
+       pname = "validity-aeson";
+       version = "0.2.0.0";
+       sha256 = "01ck9kbclrjxbjb7rvr1y95cizbdq5lzdd0xfpbpaf4rfgjd3w56";
+       libraryHaskellDepends = [
+         aeson base validity validity-scientific validity-text
+         validity-unordered-containers validity-vector
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for aeson";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
@@ -216004,6 +216241,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-bytestring_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, validity }:
+     mkDerivation {
+       pname = "validity-bytestring";
+       version = "0.3.0.0";
+       sha256 = "1yxrpwxqn0262262j27sf1nb6iw6fnirypivnmpw0ghml28w7aym";
+       libraryHaskellDepends = [ base bytestring validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for bytestring";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-containers" = callPackage
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
@@ -216016,6 +216266,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-containers_0_3_0_0" = callPackage
+    ({ mkDerivation, base, containers, validity }:
+     mkDerivation {
+       pname = "validity-containers";
+       version = "0.3.0.0";
+       sha256 = "1jh2f46x5gwhb5i5bmqn1vdn27way0nk7q2gphyjb62zrg3d3zq5";
+       libraryHaskellDepends = [ base containers validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-path" = callPackage
     ({ mkDerivation, base, filepath, path, validity }:
      mkDerivation {
@@ -216028,6 +216291,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-path_0_3_0_0" = callPackage
+    ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
+     , validity
+     }:
+     mkDerivation {
+       pname = "validity-path";
+       version = "0.3.0.0";
+       sha256 = "1ijrzfk9jhlxxcdjqdq4cqz7ir7k7z9zrbamb18zai99hb6gg066";
+       libraryHaskellDepends = [ base filepath path validity ];
+       testHaskellDepends = [
+         base filepath genvalidity-hspec hspec path validity
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for Path";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-scientific" = callPackage
     ({ mkDerivation, base, scientific, validity }:
      mkDerivation {
@@ -216040,6 +216321,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-scientific_0_2_0_0" = callPackage
+    ({ mkDerivation, base, scientific, validity }:
+     mkDerivation {
+       pname = "validity-scientific";
+       version = "0.2.0.0";
+       sha256 = "0l4mzrhn6yhqd6kz7rwfvrqxk0dhwvfkh40pfjyzbkg5mvd1drhh";
+       libraryHaskellDepends = [ base scientific validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for scientific";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-text" = callPackage
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
@@ -216052,6 +216346,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-text_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, text, validity }:
+     mkDerivation {
+       pname = "validity-text";
+       version = "0.3.0.0";
+       sha256 = "190gkwa3b4rnhmah9idivvrv0val4crv8y3qy9s0aa44kpcj2b8m";
+       libraryHaskellDepends = [ base bytestring text validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for text";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-time" = callPackage
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
@@ -216064,6 +216371,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-time_0_2_0_0" = callPackage
+    ({ mkDerivation, base, time, validity }:
+     mkDerivation {
+       pname = "validity-time";
+       version = "0.2.0.0";
+       sha256 = "0rp1y2xq3h18ji3vaiv3w76kkdyql5y8xxxz730za6mrf1ffbnk4";
+       libraryHaskellDepends = [ base time validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for time";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-unordered-containers" = callPackage
     ({ mkDerivation, base, hashable, unordered-containers, validity }:
      mkDerivation {
@@ -216906,16 +217226,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-sized_1_0_0_0" = callPackage
-    ({ mkDerivation, base, deepseq, finite-typelits
-     , indexed-list-literals, primitive, vector
+  "vector-sized_1_0_1_0" = callPackage
+    ({ mkDerivation, adjunctions, base, deepseq, distributive
+     , finite-typelits, indexed-list-literals, primitive, vector
      }:
      mkDerivation {
        pname = "vector-sized";
-       version = "1.0.0.0";
-       sha256 = "1jn00l5nw2ws4j6z8fd2h312003vpi8a4ygakmrdg4580cwnjmls";
+       version = "1.0.1.0";
+       sha256 = "0p3bwqdz3k1a3ya7bj80d6crpbsk62wcvl6rkpkr0snqh4zq87zl";
        libraryHaskellDepends = [
-         base deepseq finite-typelits indexed-list-literals primitive vector
+         adjunctions base deepseq distributive finite-typelits
+         indexed-list-literals primitive vector
        ];
        homepage = "http://github.com/expipiplus1/vector-sized#readme";
        description = "Size tagged vectors";
@@ -218086,12 +218407,12 @@ self: {
      }) {};
 
   "vulkan" = callPackage
-    ({ mkDerivation, base, vector-sized, vulkan }:
+    ({ mkDerivation, base, cpphs, vector-sized, vulkan }:
      mkDerivation {
        pname = "vulkan";
-       version = "2.0.0.0";
-       sha256 = "1lm92sgv1nbc4h4znyilyp3hqlj5xl6i9zcrax0fxx69a9q2jg2l";
-       libraryHaskellDepends = [ base vector-sized ];
+       version = "2.1.0.0";
+       sha256 = "1w19ip6qc5qbscp06a2b58x9yhjc98naaq1gxymk7gs3iagylrzq";
+       libraryHaskellDepends = [ base cpphs vector-sized ];
        librarySystemDepends = [ vulkan ];
        homepage = "http://github.com/expipiplus1/vulkan#readme";
        description = "Bindings to the Vulkan graphics API";
@@ -219988,8 +220309,8 @@ self: {
      }:
      mkDerivation {
        pname = "warp";
-       version = "3.2.18.2";
-       sha256 = "01jmwq9a5xxig14qh30w2fspjv4rhprv6q6i6bsv1qy9m9n2mczb";
+       version = "3.2.19";
+       sha256 = "0laggqs2bjf4vn58fjpippbwd1i2z82ssmnyn6l0qb3q54d2fyqb";
        libraryHaskellDepends = [
          array async auto-update base bsb-http-chunked bytestring
          case-insensitive containers ghc-prim hashable http-date http-types
@@ -220054,23 +220375,6 @@ self: {
      }) {};
 
   "warp-tls" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
-     , network, streaming-commons, tls, tls-session-manager, wai, warp
-     }:
-     mkDerivation {
-       pname = "warp-tls";
-       version = "3.2.4.2";
-       sha256 = "08g74490mpaghrvkb5z6pa6b6bby1a83js52pg5jlm9b5zfwcj2w";
-       libraryHaskellDepends = [
-         base bytestring cryptonite data-default-class network
-         streaming-commons tls tls-session-manager wai warp
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp-tls_3_2_4_3" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, data-default-class
      , network, streaming-commons, tls, tls-session-manager, wai, warp
      }:
@@ -220085,7 +220389,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -221761,6 +222064,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_2_0_3" = callPackage
+    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
+     , semigroups, stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.2.0.3";
+       sha256 = "0naqmgkqqq83mnrp4ic97i6f6ak3h862jk6pa77c83qmz4ahh4ld";
+       libraryHaskellDepends = [
+         base containers fold-debounce mtl semigroups stm text transformers
+         wild-bind X11
+       ];
+       testHaskellDepends = [
+         async base hspec text time transformers wild-bind X11
+       ];
+       homepage = "https://github.com/debug-ito/wild-bind";
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wilton-ffi" = callPackage
     ({ mkDerivation, aeson, base, bytestring, utf8-string }:
      mkDerivation {
@@ -222057,10 +222381,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "wl-pprint";
-       version = "1.2";
-       sha256 = "166zvk4zwn2zaa9kx66m1av38m34qp6h4i65bri2sfnxgvx0700r";
-       revision = "1";
-       editedCabalFile = "04w1mm6c0k39x3aglrz5rgqjxszxb6jld0s7qrl4zhndl92nzi5c";
+       version = "1.2.1";
+       sha256 = "0kn7y8pdrv8f87zhd5mifcl8fy3b2zvnzmzwhdqhxxlyzwiq6z0c";
        libraryHaskellDepends = [ base ];
        description = "The Wadler/Leijen Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
@@ -225266,8 +225588,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-extras";
-       version = "0.13.2";
-       sha256 = "1ixnr76gmym9gab6m6r2rvrrvakxa5kda6cll9nbq954sjvj54jx";
+       version = "0.13.3";
+       sha256 = "15gxkkni3d6mr7zlzyp6nvzv0jy3vfhjkd8zrdin2nxb5pwwbsp0";
        configureFlags = [
          "-f-with_hlist" "-fwith_parsec" "-fwith_split"
        ];
@@ -226977,19 +227299,18 @@ self: {
   "yesod-auth-oauth2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, errors, hoauth2, hspec
      , http-client, http-conduit, http-types, microlens, random
-     , safe-exceptions, text, transformers, uri-bytestring, yesod-auth
-     , yesod-core
+     , safe-exceptions, text, uri-bytestring, yesod-auth, yesod-core
      }:
      mkDerivation {
        pname = "yesod-auth-oauth2";
-       version = "0.4.1.0";
-       sha256 = "1p0sxgi7cl6lqzkx478zva2byzanna6jicdrgdns2p91cnw5hlh9";
+       version = "0.5.0.0";
+       sha256 = "03qqaxwpdz15krnl8rnm6m3rlmpgfn1i41x1w7c4rhl701hy0vda";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring errors hoauth2 http-client http-conduit
-         http-types microlens random safe-exceptions text transformers
-         uri-bytestring yesod-auth yesod-core
+         http-types microlens random safe-exceptions text uri-bytestring
+         yesod-auth yesod-core
        ];
        testHaskellDepends = [ base hspec uri-bytestring ];
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
@@ -227780,8 +228101,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-media-simple";
-       version = "0.2.0.0";
-       sha256 = "1sfz1iczsqhg8vasc4zyfwpw48hjlslfwf8r60a1c7kgrpa9yj6k";
+       version = "0.2.0.1";
+       sha256 = "1687c46qqdpzvalfi4dajsxaml1ljipysbvz9j1jargl3jrsdfqi";
        libraryHaskellDepends = [
          base bytestring diagrams-cairo diagrams-core diagrams-lib directory
          JuicyPixels vector yesod
@@ -229857,8 +230178,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.6";
-       sha256 = "0bswk4z26v020qkcm09cjkjkvwxsx1mrzrf3kajhwwzpb8vzxbdh";
+       version = "0.0.1.7";
+       sha256 = "1gdrnxa23lk885ldbn72n136acjfv8l0bnpf5v0lnypzl1hwp4rk";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity

From 93b324093025c5c9235d7514a544323b8f1c088b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 25 Apr 2018 11:42:58 +0200
Subject: [PATCH 0389/3370] all-cabal-hashes: update to latest version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index e7dbf947815b..38f8030cc272 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/61de1110af16fa0645a8cc8bbaf4a9c6fca9d8e8.tar.gz";
-  sha256 = "0vwfm1imwcffyliaama572ksjgqmwxk48py0wgvgpi2vg08w7a12";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9cd032898a8fd11b69827ff02d2f295cac0907d9.tar.gz";
+  sha256 = "1xxg3dcp5jgin978sa9510ji10p2j47x7b2n0xz00wrs9yjn5zvg";
 }

From a49dca6821855e3572e7a1d236fb96c3223ff02f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Apr 2018 12:39:43 +0200
Subject: [PATCH 0390/3370] haskell-monad-logger: drop obsolete override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1e993524b5ce..600670c9140b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -866,9 +866,6 @@ self: super: {
   # https://github.com/fpco/stackage/issues/3126
   stack = doJailbreak super.stack;
 
-  # https://github.com/snoyberg/monad-logger/issues/1
-  monad-logger = self.monad-logger_0_3_28_5;
-
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
   SCalendar = markBroken (super.SCalendar.override { scalendar = null; });

From 7724ead286392d37b3f11813a5c79b6720236b25 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Apr 2018 12:41:18 +0200
Subject: [PATCH 0391/3370] haskell-{hlint,hoogle}: drop obsolete overrides

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 600670c9140b..eb419957561e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1027,9 +1027,6 @@ self: super: {
     indexed-list-literals = self.indexed-list-literals_0_2_0_0;
   };
 
-  # Both need a more up-to-date version
-  hlint = super.hlint.override { extra = self.extra_1_6_6; };
-  hoogle = super.hoogle.override { extra = self.extra_1_6_6; };
 }
 
 //

From 33e046271af4c3a532a86fb7a8114dad6f94275e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Apr 2018 12:52:25 +0200
Subject: [PATCH 0392/3370] haskell-vector-sized: update override

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index eb419957561e..785f38be3d0f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1023,7 +1023,8 @@ self: super: {
   # This package refers to the wrong library (itself in fact!)
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
 
-  vector-sized_1_0_0_0 = super.vector-sized_1_0_0_0.override {
+  # Builds only with the latest version of indexed-list-literals.
+  vector-sized_1_0_1_0 = super.vector-sized_1_0_1_0.override {
     indexed-list-literals = self.indexed-list-literals_0_2_0_0;
   };
 

From 1d0a71879dac0226272212df7a2463d8eeb8f75b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 23 Apr 2018 12:03:33 +0200
Subject: [PATCH 0393/3370] haskell-brick: update override for ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 43c869feff12..fe6bc699fb98 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -578,7 +578,7 @@ self: super: {
   });
 
   # Older versions don't compile.
-  brick = doJailbreak super.brick_0_36; # https://github.com/jtdaugherty/brick/issues/171
+  brick = self.brick_0_36_2;
   HaTeX = self.HaTeX_3_19_0_0;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_1_3;

From ca7d98399976be0dd562d1f8ecd62ed3e5cd5656 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Wed, 25 Apr 2018 13:47:26 +0100
Subject: [PATCH 0394/3370] buildkite-agent3: init at 3.0.1 (#39471)

New stable release. Version 2.6 is kept for backwards compatibility.

https://github.com/buildkite/agent/releases/tag/v3.0.0
https://github.com/buildkite/agent/releases/tag/v3.0.1
---
 .../buildkite-agent/2.x.nix                   | 12 ++++++++++
 .../buildkite-agent/3.x.nix                   | 12 ++++++++++
 .../{default.nix => generic.nix}              | 22 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 +++-
 4 files changed, 36 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
 create mode 100644 pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
 rename pkgs/development/tools/continuous-integration/buildkite-agent/{default.nix => generic.nix} (73%)

diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
new file mode 100644
index 000000000000..6a73e2581822
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/2.x.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  src = fetchFromGitHub {
+    owner = "buildkite";
+    repo = "agent";
+    rev = "v${version}";
+    sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg";
+  };
+  version = "2.6.10";
+  hasBootstrapScript = true;
+})
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
new file mode 100644
index 000000000000..2ceaee5650b2
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/3.x.nix
@@ -0,0 +1,12 @@
+{ callPackage, fetchFromGitHub, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  src = fetchFromGitHub {
+    owner = "buildkite";
+    repo = "agent";
+    rev = "v${version}";
+    sha256 = "09smyrzp1xkczlmh8vqb7bmjb2b5d6yf9birjgaw36c6m44bpfvs";
+  };
+  version = "3.0.1";
+  hasBootstrapScript = false;
+})
diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
similarity index 73%
rename from pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
rename to pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
index 7a5f2f44823b..8aa02ac307dd 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix
@@ -1,19 +1,13 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep }:
+{ stdenv, buildGoPackage, makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep
+, src, version, hasBootstrapScript
+, ... }:
 let
-  version = "2.6.10";
   goPackagePath = "github.com/buildkite/agent";
 in
 buildGoPackage {
   name = "buildkite-agent-${version}";
 
-  inherit goPackagePath;
-
-  src = fetchFromGitHub {
-    owner = "buildkite";
-    repo = "agent";
-    rev = "v${version}";
-    sha256 = "07065hhhb418w5qlqnyiap45r59paysysbwz1l7dmaw3j4q8m8rg";
-  };
+  inherit goPackagePath src;
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -22,18 +16,20 @@ buildGoPackage {
   noAuditTmpdir = stdenv.isLinux;
 
   postInstall = ''
+    ${stdenv.lib.optionalString hasBootstrapScript ''
     # Install bootstrap.sh
     mkdir -p $bin/libexec/buildkite-agent
     cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent
     sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh
+    ''}
 
     # Fix binary name
     mv $bin/bin/{agent,buildkite-agent}
 
     # These are runtime dependencies
     wrapProgram $bin/bin/buildkite-agent \
-      --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' \
-      --set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh
+      ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh"} \
+      --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}'
   '';
 
   meta = with stdenv.lib; {
@@ -47,7 +43,7 @@ buildGoPackage {
     '';
     homepage = https://buildkite.com/docs/agent;
     license = licenses.mit;
-    maintainers = with maintainers; [ pawelpacana zimbatm ];
+    maintainers = with maintainers; [ pawelpacana zimbatm rvl ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5e8b16e017c..6e66f1ead518 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7592,7 +7592,9 @@ with pkgs;
   buildbot-ui = buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
   buildbot-full = buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]);
 
-  buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
+  buildkite-agent = buildkite-agent2;
+  buildkite-agent2 = callPackage ../development/tools/continuous-integration/buildkite-agent/2.x.nix { };
+  buildkite-agent3 = callPackage ../development/tools/continuous-integration/buildkite-agent/3.x.nix { };
 
   byacc = callPackage ../development/tools/parsing/byacc { };
 

From ac61ae50b7b47dfae92ff921dab0774554e7df9e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 25 Apr 2018 14:54:59 +0200
Subject: [PATCH 0395/3370] gn: Switch to fetchzip for apple_apsl directory

The tarball from upstream seems to be generated on the fly, so the
output is not deterministic and using fetchzip makes this more reliable
as we have a recursively hashed output path without any of the
non-determinisms in tarballs.

Unfortunately, the build still fails on NixOS systems, because we need a
few more stuff in the build tree.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @stesie
---
 pkgs/development/tools/build-managers/gn/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index bfbb2b4e3308..a9930d258c2c 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, fetchurl, fetchpatch
+{ stdenv, lib, fetchgit, fetchzip, fetchpatch
 , libevent, ninja, python, darwin }:
 
 let
@@ -28,9 +28,10 @@ let
       rev = "585ec31ea716f08233a815e680fc0d4699843938";
       sha256 = "0csn1cza66851nmxxiw42smsm3422mx67vcyykwn0a71lcjng6rc";
     };
-    "third_party/apple_apsl" = fetchurl {
+    "third_party/apple_apsl" = fetchzip {
       url = "https://chromium.googlesource.com/chromium/src/third_party/+archive/8e6ccb8c74db6dfa15dd21401ace3ac96c054cf7/apple_apsl.tar.gz";
-      sha256 = "0sc7b7zdw7f9piyyijl7xq3v1fzflqlck1apwm8kvgdhkyz3l63k";
+      sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8";
+      stripRoot = false;
     };
   };
 

From a3502ba765ed5634b62d2440d342f81f68a67a8b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 25 Apr 2018 14:58:54 +0200
Subject: [PATCH 0396/3370] gn: Add libc++ and libc++abi from third_party

On GNU/Linux the build references these files, so let's fetch them from
the Chromium repository. I haven't checked whether they are heavily
patched or whether we can use the version from LLVM, but when looking at
the changes, they do seem to divert a bit from upstream LLVM.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @stesie
---
 pkgs/development/tools/build-managers/gn/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index a9930d258c2c..35f54369abd9 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -33,6 +33,16 @@ let
       sha256 = "1vgcg741lwz84kdy0qc5wn9dxx3j9zh6a9d185fpygdsipwikqv8";
       stripRoot = false;
     };
+    "buildtools/third_party/libc++/trunk" = fetchgit {
+      url = "https://chromium.googlesource.com/chromium/llvm-project/libcxx";
+      rev = "ece1de8658d749e19c12cacd4458cc330eca94e3";
+      sha256 = "1nlyvfkzhchwv9b18bh82jcamqv3acj26ah9ajs31f2dql05amhg";
+    };
+    "buildtools/third_party/libc++abi/trunk" = fetchgit {
+      url = "https://chromium.googlesource.com/chromium/llvm-project/libcxxabi";
+      rev = "52c7a3760aef1df328a9bc957f686410872f0dc0";
+      sha256 = "1aam539j01381q27b7xhij18pz3h0lhw08hglvqq4hgvlqx5cn2s";
+    };
   };
 
 in stdenv.mkDerivation {

From 97698b0d6d644cc6d59495e339f6fbf44ff8ac64 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 25 Apr 2018 08:08:47 -0500
Subject: [PATCH 0397/3370] musl-stdenv: don't add special allowance for
 libiconv

---
 pkgs/stdenv/linux/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 2eb55ae439b5..92da0d7873d0 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -362,7 +362,6 @@ in
         ++  [ /*propagated from .dev*/ linuxHeaders
             binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params
           ]
-          ++ lib.optional (localSystem.libc == "musl") libiconv
           ++ lib.optionals localSystem.isAarch64
             [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
 

From 4340a1582ffbd90f19e42f1480d36e17c0b515c7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 1 Mar 2018 05:32:36 +0100
Subject: [PATCH 0398/3370] =?UTF-8?q?pitivi:=200.96=20=E2=86=92=200.99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/video/pitivi/default.nix    | 61 ++++++++++++-------
 .../prevent-closure-contamination.patch       | 23 +++++++
 2 files changed, 63 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/applications/video/pitivi/prevent-closure-contamination.patch

diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix
index 48074a86b552..6c92b9aeed6b 100644
--- a/pkgs/applications/video/pitivi/default.nix
+++ b/pkgs/applications/video/pitivi/default.nix
@@ -1,61 +1,80 @@
 { stdenv, fetchurl, pkgconfig, intltool, itstool, wrapGAppsHook
 , python3Packages, gst, gtk3, hicolor-icon-theme
 , gobjectIntrospection, librsvg, gnome3, libnotify
-# for gst-transcoder:
-, which, meson, ninja
+, meson, ninja
 }:
 
 let
-  version = "0.96";
+  version = "0.99";
 
   # gst-transcoder will eventually be merged with gstreamer (according to
   # gst-transcoder 1.8.0 release notes). For now the only user is pitivi so we
   # don't bother exposing the package to all of nixpkgs.
   gst-transcoder = stdenv.mkDerivation rec {
-    name = "gst-transcoder-1.8.0";
+    version = "1.12.2";
+    name = "gst-transcoder-${version}";
     src = fetchurl {
       name = "${name}.tar.gz";
-      url = "https://github.com/pitivi/gst-transcoder/archive/1.8.0.tar.gz";
-      sha256 = "0iggr6idmp7cmfsf6pkhfl3jq1bkga37jl5prbcl1zapkzi26fg6";
+      url = "https://github.com/pitivi/gst-transcoder/archive/${version}.tar.gz";
+      sha256 = "0cnwmrsd321s02ff91m3j27ydj7f8wks0jvmp5admlhka6z7zxm9";
     };
-  nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ which meson ninja gobjectIntrospection ]
-      ++ (with gst; [ gstreamer gst-plugins-base ]);
+    nativeBuildInputs = [ pkgconfig meson ninja gobjectIntrospection ];
+    buildInputs = with gst; [ gstreamer gst-plugins-base ];
   };
 
-in stdenv.mkDerivation rec {
+in python3Packages.buildPythonApplication rec {
   name = "pitivi-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/pitivi/${version}/${name}.tar.xz";
-    sha256 = "115d37mvi32yds8gqj2yidkk6pap7szavhjf2hw0388ynydlc2zs";
+    url = "mirror://gnome/sources/pitivi/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "0z4gvcr0cvyz2by47f36nqf7x2kfv9wn382w9glhs7l0d7b2zl69";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ];
+  format = "other";
+
+  patches = [
+    # By default, the build picks up environment variables like PYTHONPATH
+    # and saves them to the generated binary. This would make the build-time
+    # dependencies part of the closure so we remove it.
+    ./prevent-closure-contamination.patch
+  ];
+
+  postPatch = ''
+    patchShebangs ./getenvvar.py
+  '';
+
+  nativeBuildInputs = [ meson ninja pkgconfig intltool itstool wrapGAppsHook ];
 
   buildInputs = [
-    gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop
+    gobjectIntrospection gtk3 librsvg gnome3.gnome-desktop gnome3.gsound
     gnome3.defaultIconTheme
     gnome3.gsettings-desktop-schemas libnotify
     gst-transcoder
   ] ++ (with gst; [
     gstreamer gst-editing-services
-    gst-plugins-base gst-plugins-good
+    gst-plugins-base (gst-plugins-good.override { gtkSupport = true; })
     gst-plugins-bad gst-plugins-ugly gst-libav gst-validate
-  ]) ++ (with python3Packages; [
-    python pygobject3 gst-python pyxdg numpy pycairo matplotlib
-    dbus-python
   ]);
 
+  pythonPath = with python3Packages; [ pygobject3 gst-python pyxdg numpy pycairo matplotlib dbus-python ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "pitivi";
+      versionPolicy = "none"; # we are using dev version, since the stable one is too old
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "Non-Linear video editor utilizing the power of GStreamer";
-    homepage    = "http://pitivi.org/";
+    homepage = http://pitivi.org/;
     longDescription = ''
       Pitivi is a video editor built upon the GStreamer Editing Services.
       It aims to be an intuitive and flexible application
       that can appeal to newbies and professionals alike.
     '';
-    license     = licenses.lgpl21Plus;
-    platforms   = platforms.linux;
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/video/pitivi/prevent-closure-contamination.patch b/pkgs/applications/video/pitivi/prevent-closure-contamination.patch
new file mode 100644
index 000000000000..0025ecd0a4cf
--- /dev/null
+++ b/pkgs/applications/video/pitivi/prevent-closure-contamination.patch
@@ -0,0 +1,23 @@
+--- a/meson.build
++++ b/meson.build
+@@ -26,15 +26,15 @@
+ geteenvvar = find_program('getenvvar.py')
+ cdata = configuration_data()
+ cdata.set('CONFIGURED_PYTHONPATH',
+-          run_command(geteenvvar, 'PYTHONPATH').stdout().strip())
++          '')
+ cdata.set('CONFIGURED_GI_TYPELIB_PATH',
+-          run_command(geteenvvar, 'GI_TYPELIB_PATH').stdout().strip())
++          '')
+ cdata.set('CONFIGURED_LD_LIBRARY_PATH',
+-          run_command(geteenvvar, 'LD_LIBRARY_PATH').stdout().strip())
++          '')
+ cdata.set('CONFIGURED_GST_PLUGIN_PATH',
+-          run_command(geteenvvar, 'GST_PLUGIN_PATH').stdout().strip())
++          '')
+ cdata.set('CONFIGURED_GST_PLUGIN_SYSTEM_PATH',
+-          run_command(geteenvvar, 'GST_PLUGIN_SYSTEM_PATH').stdout().strip())
++          '')
+ cdata.set('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+ cdata.set('DATADIR', join_paths(get_option('prefix'), get_option('datadir')))
+ cdata.set('PACKAGE_NAME', 'Pitivi')

From 2d54f8f915166dbdc93ed9497f622799e930bf9b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 25 Apr 2018 08:09:56 -0500
Subject: [PATCH 0399/3370] musl: build iconv using just-built pieces

This is a bit unusual for a package,
but not libc's as they should stand alone.
---
 pkgs/os-specific/linux/musl/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index 0912f427430b..cd102cca00f1 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -68,6 +68,8 @@ stdenv.mkDerivation rec {
   dontDisableStatic = true;
   separateDebugInfo = true;
 
+  NIX_DONT_SET_RPATH = true;
+
   postInstall = ''
     # Not sure why, but link in all but scsi directory as that's what uclibc/glibc do.
     # Apparently glibc provides scsi itself?
@@ -88,8 +90,13 @@ stdenv.mkDerivation rec {
     substituteInPlace $dev/bin/musl-gcc \
       --replace $out/lib/musl-gcc.specs $dev/lib/musl-gcc.specs
 
-    # provide 'iconv' utility
-    $CC ${iconv_c} -o $out/bin/iconv
+    # provide 'iconv' utility, using just-built headers, libc/ldso
+    $CC ${iconv_c} -o $out/bin/iconv \
+      -I$dev/include \
+      -L$out/lib -Wl,-rpath=$out/lib \
+      -lc \
+      -B $out/lib \
+      -Wl,-dynamic-linker=$(ls $out/lib/ld-*)
   '' + lib.optionalString useBSDCompatHeaders ''
     install -D ${queue_h} $dev/include/sys/queue.h
     install -D ${cdefs_h} $dev/include/sys/cdefs.h

From 558f7424f26076e1bb2260f13c04a9eb88127f97 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 11 Mar 2018 21:00:19 -0500
Subject: [PATCH 0400/3370] musl: make libc -> {ldso,ldd} symlinks relative

Minor touchup while rebuilding things anyway.
---
 pkgs/os-specific/linux/musl/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index cd102cca00f1..3d515f7b762f 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -51,6 +51,13 @@ stdenv.mkDerivation rec {
       --replace -fno-asynchronous-unwind-tables ""
   '';
 
+  patches = [
+    # Minor touchup to build system making dynamic linker symlink relative
+    (fetchurl {
+      url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch;
+      sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n";
+    })
+  ];
   preConfigure = ''
     configureFlagsArray+=("--syslibdir=$out/lib")
   '';
@@ -80,7 +87,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
 
     # Create 'ldd' symlink, builtin
-    ln -s $out/lib/libc.so $out/bin/ldd
+    ln -rs $out/lib/libc.so $out/bin/ldd
 
     # (impure) cc wrapper around musl for interactive usuage
     for i in musl-gcc musl-clang ld.musl-clang; do

From c84dad316a8d1eb0b5c2af0bd037c169096683ca Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 25 Apr 2018 15:04:30 +0200
Subject: [PATCH 0401/3370] lib/generators: print paths without quotes & move
 function down

---
 lib/generators.nix | 26 +++++++++++++++-----------
 lib/tests/misc.nix |  8 +++++---
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/lib/generators.nix b/lib/generators.nix
index d1a8f6bf8dcd..c09384c00f57 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -143,18 +143,13 @@ rec {
        (This means fn is type Val -> String.) */
     allowPrettyValues ? false
   }@args: v: with builtins;
-    if      isInt      v then toString v
+    let     isPath   = v: typeOf v == "path";
+    in if   isInt      v then toString v
     else if isString   v then ''"${libStr.escape [''"''] v}"''
     else if true  ==   v then "true"
     else if false ==   v then "false"
-    else if null ==    v then "null"
-    else if isFunction v then
-      let fna = lib.functionArgs v;
-          showFnas = concatStringsSep "," (libAttr.mapAttrsToList
-                       (name: hasDefVal: if hasDefVal then "(${name})" else name)
-                       fna);
-      in if fna == {}    then "<λ>"
-                         else "<λ:{${showFnas}}>"
+    else if null  ==   v then "null"
+    else if isPath     v then toString v
     else if isList     v then "[ "
         + libStr.concatMapStringsSep " " (toPretty args) v
       + " ]"
@@ -163,12 +158,21 @@ rec {
       if attrNames v == [ "__pretty" "val" ] && allowPrettyValues
          then v.__pretty v.val
       # TODO: there is probably a better representation?
-      else if v ? type && v.type == "derivation" then "<δ>"
+      else if v ? type && v.type == "derivation" then
+        "<δ:${v.name}>"
+        # "<δ:${concatStringsSep "," (builtins.attrNames v)}>"
       else "{ "
           + libStr.concatStringsSep " " (libAttr.mapAttrsToList
               (name: value:
                 "${toPretty args name} = ${toPretty args value};") v)
         + " }"
-    else abort "generators.toPretty: should never happen (v = ${v})";
+    else if isFunction v then
+      let fna = lib.functionArgs v;
+          showFnas = concatStringsSep "," (libAttr.mapAttrsToList
+                       (name: hasDefVal: if hasDefVal then "(${name})" else name)
+                       fna);
+      in if fna == {}    then "<λ>"
+                         else "<λ:{${showFnas}}>"
+    else abort "toPretty: should never happen (v = ${v})";
 
 }
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 5f19dd63f2d8..c683df7d7ca3 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -317,7 +317,8 @@ runTests {
     expr = mapAttrs (const (generators.toPretty {})) rec {
       int = 42;
       bool = true;
-      string = "fnord";
+      string = ''fno"rd'';
+      path = /. + "/foo"; # toPath returns a string
       null_ = null;
       function = x: x;
       functionArgs = { arg ? 4, foo }: arg;
@@ -328,13 +329,14 @@ runTests {
     expected = rec {
       int = "42";
       bool = "true";
-      string = "\"fnord\"";
+      string = ''"fno\"rd"'';
+      path = "/foo";
       null_ = "null";
       function = "<λ>";
       functionArgs = "<λ:{(arg),foo}>";
       list = "[ 3 4 ${function} [ false ] ]";
       attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }";
-      drv = "<δ>";
+      drv = "<δ:test>";
     };
   };
 

From 4f16b36fedb9157bff36984d88338b3e80bee2e0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 25 Apr 2018 08:32:49 -0500
Subject: [PATCH 0402/3370] radiotray-ng: 0.2.1 -> 0.2.2

https://github.com/ebruck/radiotray-ng/releases/tag/v0.2.2
---
 pkgs/applications/audio/radiotray-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 60c8f90b6d15..695a5b36dbf0 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -40,13 +40,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "radiotray-ng-${version}";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
     owner = "ebruck";
     repo = "radiotray-ng";
     rev = "v${version}";
-    sha256 = "0hqg6vn8hv5pic96klf1d9vj8fibrgiqnqb5vwrg3wvakx0y32kr";
+    sha256 = "0q8k7nsjm6m0r0zs1br60niaqlwvd3myqalb5sqijzanx41aq2l6";
   };
 
   nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ];

From 4d40adb86d03b856e12984048ced8902e3f73fd3 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Wed, 4 Apr 2018 21:47:56 -0400
Subject: [PATCH 0403/3370] nginx: allow basic auth passwords to be specified
 in a file

---
 .../services/web-servers/nginx/default.nix    | 20 +++++++++----------
 .../web-servers/nginx/vhost-options.nix       |  8 ++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 938a8a1fe334..815c3147e647 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -218,7 +218,10 @@ let
             ssl_certificate_key ${vhost.sslCertificateKey};
           ''}
 
-          ${optionalString (vhost.basicAuth != {}) (mkBasicAuth vhostName vhost.basicAuth)}
+          ${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) ''
+            auth_basic secured;
+            auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else mkHtpasswd vhostName vhost.basicAuth};
+          ''}
 
           ${mkLocations vhost.locations}
 
@@ -248,16 +251,11 @@ let
       ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
     }
   '') locations);
-  mkBasicAuth = vhostName: authDef: let
-    htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" (
-      concatStringsSep "\n" (mapAttrsToList (user: password: ''
-        ${user}:{PLAIN}${password}
-      '') authDef)
-    );
-  in ''
-    auth_basic secured;
-    auth_basic_user_file ${htpasswdFile};
-  '';
+  mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" (
+    concatStringsSep "\n" (mapAttrsToList (user: password: ''
+      ${user}:{PLAIN}${password}
+    '') authDef)
+  );
 in
 
 {
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index bf18108a1a3c..f014d817e80e 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -193,6 +193,14 @@ with lib;
       '';
     };
 
+    basicAuthFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Basic Auth password file for a vhost.
+      '';
+    };
+
     locations = mkOption {
       type = types.attrsOf (types.submodule (import ./location-options.nix {
         inherit lib;

From 2236f418f5b6a1b04871b96b37959fb5e22fea86 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 25 Apr 2018 08:38:36 -0500
Subject: [PATCH 0404/3370] radiotray-ng: disable tests, they now want to
 download unconditionally

---
 pkgs/applications/audio/radiotray-ng/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix
index 695a5b36dbf0..2ce82eb6a0a0 100644
--- a/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/pkgs/applications/audio/radiotray-ng/default.nix
@@ -78,7 +78,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+ # XXX: as of 0.2.2, tries to download gmock instead of checking for provided
+  doCheck = false;
 
   checkPhase = "ctest";
 

From 42ecb0dd949cac7040878882904dfb07db3e7894 Mon Sep 17 00:00:00 2001
From: Yucheng Zhang <yu@cheng.cat>
Date: Wed, 25 Apr 2018 18:10:17 +0800
Subject: [PATCH 0405/3370] inziu-iosevka: init at 1.13.2

---
 pkgs/data/fonts/inziu-iosevka/default.nix | 31 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/data/fonts/inziu-iosevka/default.nix

diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix
new file mode 100644
index 000000000000..536f5cb0c61d
--- /dev/null
+++ b/pkgs/data/fonts/inziu-iosevka/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, p7zip }:
+
+stdenv.mkDerivation rec {
+  version = "1.13.2";
+  name = "inziu-iosevka-${version}";
+
+  package = fetchurl {
+    url = "http://7xpdnl.dl1.z0.glb.clouddn.com/inziu-iosevka-ttfs-${version}.7z";
+    sha256 = "1i7qqcv1x6s1xkp687wq79zqg9ly6a7l5mnmg1iqgfgcbglgjbaw";
+  };
+
+  nativeBuildInputs = [ p7zip ];
+
+  unpackPhase = ''
+    7z x $package
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Inziu Iosevka font";
+    homepage = https://be5invis.github.io/Iosevka/inziu;
+    # license is clarified here: https://github.com/be5invis/Iosevka/issues/265
+    license = licenses.ofl;
+    maintainers = [ maintainers.ChengCat ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9bbbbf396c5..7518ed65a7a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14365,6 +14365,8 @@ with pkgs;
 
   input-fonts = callPackage ../data/fonts/input-fonts { };
 
+  inziu-iosevka = callPackage ../data/fonts/inziu-iosevka { };
+
   iosevka = callPackage ../data/fonts/iosevka {
     nodejs = nodejs-8_x;
   };

From cbbcd2920d4bb715f239fe3aeda6e7e2dca7887f Mon Sep 17 00:00:00 2001
From: Yucheng Zhang <yu@cheng.cat>
Date: Wed, 25 Apr 2018 17:34:53 +0800
Subject: [PATCH 0406/3370] sarasa-gothic: init at 0.5.2

---
 pkgs/data/fonts/sarasa-gothic/default.nix | 30 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/data/fonts/sarasa-gothic/default.nix

diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
new file mode 100644
index 000000000000..8d2afbcf80dd
--- /dev/null
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, p7zip }:
+
+stdenv.mkDerivation rec {
+  version = "0.5.2";
+  name = "sarasa-gothic-${version}";
+
+  package = fetchurl {
+    url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttf-${version}.7z";
+    sha256 = "18ycw57k7yhrbb8njzhzk6x32xnjal61wr48qxkqy4lh9zfy0p22";
+  };
+
+  nativeBuildInputs = [ p7zip ];
+
+  unpackPhase = ''
+    7z x $package
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
+
+  meta = with stdenv.lib; {
+    description = "SARASA GOTHIC is a Chinese & Japanese programming font based on Iosevka and Source Han Sans";
+    homepage = https://github.com/be5invis/Sarasa-Gothic;
+    license = licenses.ofl;
+    maintainers = [ maintainers.ChengCat ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7518ed65a7a9..4d5bedfa7917 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14524,6 +14524,8 @@ with pkgs;
 
   sampradaya = callPackage ../data/fonts/sampradaya { };
 
+  sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { };
+
   scowl = callPackage ../data/misc/scowl { };
 
   shaderc = callPackage ../development/compilers/shaderc { };

From 0dec4fa1dbbf10f4a59fba522c24dbea0ba6e9fc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 25 Apr 2018 15:52:09 +0200
Subject: [PATCH 0407/3370] rarian: merge gnome{2,3}.rarian

---
 pkgs/desktops/gnome-2/default.nix                    |  6 ++----
 pkgs/desktops/gnome-2/desktop/rarian/default.nix     | 12 ------------
 pkgs/desktops/gnome-3/default.nix                    |  4 +---
 .../libraries}/rarian/default.nix                    |  0
 pkgs/top-level/all-packages.nix                      |  2 ++
 5 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/desktop/rarian/default.nix
 rename pkgs/{desktops/gnome-3/desktop => development/libraries}/rarian/default.nix (100%)

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index cc4536785251..80f2c9ce70d7 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2
+{ callPackage, self, stdenv, gettext, gvfs, libunique, bison2, rarian
 , libstartup_notification, overrides ? {} }:
 
 let overridden = set // overrides; set = with overridden; {
@@ -14,6 +14,7 @@ let overridden = set // overrides; set = with overridden; {
   gnome_desktop = gnome-desktop;
   gnome_settings_daemon = gnome-settings-daemon;
   gnome_control_center = gnome-control-center;
+  inherit rarian;
 
 #### PLATFORM
 
@@ -93,9 +94,6 @@ let overridden = set // overrides; set = with overridden; {
   # Removed from recent GNOME releases, but still required
   scrollkeeper = callPackage ./desktop/scrollkeeper { };
 
-  # scrollkeeper replacement
-  rarian = callPackage ./desktop/rarian { };
-
   zenity = callPackage ./desktop/zenity { };
 
   metacity = callPackage ./desktop/metacity { };
diff --git a/pkgs/desktops/gnome-2/desktop/rarian/default.nix b/pkgs/desktops/gnome-2/desktop/rarian/default.nix
deleted file mode 100644
index d2bcaa7c5e10..000000000000
--- a/pkgs/desktops/gnome-2/desktop/rarian/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
-
-stdenv.mkDerivation rec {
-  name = "rarian-0.8.1";
-  src = fetchurl {
-    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
-    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
-  };
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ perl perlXMLParser libxml2 libxslt];
-  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
-}
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index f35688888997..422dedbce853 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -311,9 +311,6 @@ let
 
   polari = callPackage ./apps/polari { };
 
-  # scrollkeeper replacement
-  rarian = callPackage ./desktop/rarian { };
-
   seahorse = callPackage ./apps/seahorse { };
 
   vinagre = callPackage ./apps/vinagre { };
@@ -427,6 +424,7 @@ let
   libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
   libgames-support = libgnome-games-support; # added 2018-03-14
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
+  inherit (pkgs) rarian; # added 2018-04-25
   networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
   networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
   networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
diff --git a/pkgs/desktops/gnome-3/desktop/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/desktop/rarian/default.nix
rename to pkgs/development/libraries/rarian/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e66f1ead518..eaa458529e3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4560,6 +4560,8 @@ with pkgs;
 
   rarcrack = callPackage ../tools/security/rarcrack { };
 
+  rarian = callPackage ../development/libraries/rarian { };
+
   ratools = callPackage ../tools/networking/ratools { };
 
   rawdog = callPackage ../applications/networking/feedreaders/rawdog { };

From ec371a5d98f1d1dd9ccf06cd923050b2afe976b3 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Wed, 25 Apr 2018 16:07:16 +0200
Subject: [PATCH 0408/3370] ipmicfg: fix patchelf args

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

diff --git a/pkgs/applications/misc/ipmicfg/default.nix b/pkgs/applications/misc/ipmicfg/default.nix
index 2efd0ee969f1..af7d257eed6e 100644
--- a/pkgs/applications/misc/ipmicfg/default.nix
+++ b/pkgs/applications/misc/ipmicfg/default.nix
@@ -15,9 +15,10 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/bin" "$out/opt/ipmicfg"
     cp Linux/64bit/* "$out/opt/ipmicfg"
 
-    patchelf "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" \
+    patchelf \
        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-       --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}"
+       --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}" \
+       "$out/opt/ipmicfg/IPMICFG-Linux.x86_64"
 
     ln -s "$out/opt/ipmicfg/IPMICFG-Linux.x86_64" "$out/bin/ipmicfg"
   '';

From 077811ebe37fd1c5ff75fec40f89111db15214c4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Mar 2018 12:38:17 +0800
Subject: [PATCH 0409/3370] nixos lcdproc: module for lcdd/lcdproc

---
 nixos/modules/module-list.nix           |   1 +
 nixos/modules/services/hardware/lcd.nix | 172 ++++++++++++++++++++++++
 2 files changed, 173 insertions(+)
 create mode 100644 nixos/modules/services/hardware/lcd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e7f28c670bed..b00cc7a67697 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -245,6 +245,7 @@
   ./services/hardware/illum.nix
   ./services/hardware/interception-tools.nix
   ./services/hardware/irqbalance.nix
+  ./services/hardware/lcd.nix
   ./services/hardware/nvidia-optimus.nix
   ./services/hardware/pcscd.nix
   ./services/hardware/pommed.nix
diff --git a/nixos/modules/services/hardware/lcd.nix b/nixos/modules/services/hardware/lcd.nix
new file mode 100644
index 000000000000..d78d742cd318
--- /dev/null
+++ b/nixos/modules/services/hardware/lcd.nix
@@ -0,0 +1,172 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.services.hardware.lcd;
+  pkg = lib.getBin pkgs.lcdproc;
+
+  serverCfg = pkgs.writeText "lcdd.conf" ''
+    [server]
+    DriverPath=${pkg}/lib/lcdproc/
+    ReportToSyslog=false
+    Bind=${cfg.serverHost}
+    Port=${toString cfg.serverPort}
+    ${cfg.server.extraConfig}
+  '';
+
+  clientCfg = pkgs.writeText "lcdproc.conf" ''
+    [lcdproc]
+    Server=${cfg.serverHost}
+    Port=${toString cfg.serverPort}
+    ReportToSyslog=false
+    ${cfg.client.extraConfig}
+  '';
+
+  serviceCfg = {
+    DynamicUser = true;
+    Restart = "on-failure";
+    Slice = "lcd.slice";
+  };
+
+in with lib; {
+
+  meta.maintainers = with maintainers; [ peterhoeg ];
+
+  options = with types; {
+    services.hardware.lcd = {
+      serverHost = mkOption {
+        type = str;
+        default = "localhost";
+        description = "Host on which LCDd is listening.";
+      };
+
+      serverPort = mkOption {
+        type = int;
+        default = 13666;
+        description = "Port on which LCDd is listening.";
+      };
+
+      server = {
+        enable = mkOption {
+          type = bool;
+          default = false;
+          description = "Enable the LCD panel server (LCDd)";
+        };
+
+        openPorts = mkOption {
+          type = bool;
+          default = false;
+          description = "Open the ports in the firewall";
+        };
+
+        usbPermissions = mkOption {
+          type = bool;
+          default = false;
+          description = ''
+            Set group-write permissions on a USB device.
+            </para>
+            <para>
+            A USB connected LCD panel will most likely require having its
+            permissions modified for lcdd to write to it. Enabling this option
+            sets group-write permissions on the device identified by
+            <option>services.hardware.lcd.usbVid</option> and
+            <option>services.hardware.lcd.usbPid</option>. In order to find the
+            values, you can run the <command>lsusb</command> command. Example
+            output:
+            </para>
+            <para>
+            <literal>
+            Bus 005 Device 002: ID 0403:c630 Future Technology Devices International, Ltd lcd2usb interface
+            </literal>
+            </para>
+            <para>
+            In this case the vendor id is 0403 and the product id is c630.
+          '';
+        };
+
+        usbVid = mkOption {
+          type = str;
+          default = "";
+          description = "The vendor ID of the USB device to claim.";
+        };
+
+        usbPid = mkOption {
+          type = str;
+          default = "";
+          description = "The product ID of the USB device to claim.";
+        };
+
+        usbGroup = mkOption {
+          type = str;
+          default = "dialout";
+          description = "The group to use for settings permissions. This group must exist or you will have to create it.";
+        };
+
+        extraConfig = mkOption {
+          type = lines;
+          default = "";
+          description = "Additional configuration added verbatim to the server config.";
+        };
+      };
+
+      client = {
+        enable = mkOption {
+          type = bool;
+          default = false;
+          description = "Enable the LCD panel client (LCDproc)";
+        };
+
+        extraConfig = mkOption {
+          type = lines;
+          default = "";
+          description = "Additional configuration added verbatim to the client config.";
+        };
+
+        restartForever = mkOption {
+          type = bool;
+          default = true;
+          description = "Try restarting the client forever.";
+        };
+      };
+    };
+  };
+
+  config = mkIf (cfg.server.enable || cfg.client.enable) {
+    networking.firewall.allowedTCPPorts = mkIf (cfg.server.enable && cfg.server.openPorts) [ cfg.serverPort ];
+
+    services.udev.extraRules = mkIf (cfg.server.enable && cfg.server.usbPermissions) ''
+      ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="${cfg.server.usbVid}", ATTRS{idProduct}=="${cfg.server.usbPid}", MODE="660", GROUP="${cfg.server.usbGroup}"
+    '';
+
+    systemd.services = {
+      lcdd = mkIf cfg.server.enable {
+        description = "LCDproc - server";
+        wantedBy = [ "lcd.target" ];
+        serviceConfig = serviceCfg // {
+          ExecStart = "${pkg}/bin/LCDd -f -c ${serverCfg}";
+          SupplementaryGroups = cfg.server.usbGroup;
+        };
+      };
+
+      lcdproc = mkIf cfg.client.enable {
+        description = "LCDproc - client";
+        after = [ "lcdd.service" ];
+        wantedBy = [ "lcd.target" ];
+        serviceConfig = serviceCfg // {
+          ExecStart = "${pkg}/bin/lcdproc -f -c ${clientCfg}";
+          # If the server is being restarted at the same time, the client will
+          # fail as it cannot connect, so space it out a bit.
+          RestartSec = "5";
+          # Allow restarting for eternity
+          StartLimitIntervalSec = lib.mkIf cfg.client.restartForever "0";
+          StartLimitBurst = lib.mkIf cfg.client.restartForever "0";
+        };
+      };
+    };
+
+    systemd.targets.lcd = {
+      description = "LCD client/server";
+      after = [ "lcdd.service" "lcdproc.service" ];
+      wantedBy = [ "multi-user.target" ];
+    };
+  };
+}

From 6c748ae749faae3ff989a800ffa5095f634a6050 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 25 Apr 2018 16:42:28 +0200
Subject: [PATCH 0410/3370] inkscape: Fix build on NixOS

The first problem that was introduced in a276d5160cc4b307d97261b419e183f
was a linking error:

ld: cannot find -licui18n
ld: cannot find -licuuc
ld: cannot find -licudata

So I added icu to the buildInputs.

The second problem was that the interpreter wasn't patched in
share/filters, apparently this is only needed when building with
autotools:

make[3]: Entering directory '/build/inkscape-0.92.3/share/filters'
./i18n.py ./filters.svg > ./filters.svg.h
./i18n.py: /usr/bin/env: bad interpreter: No such file or directory

A similar error also occurs for share/palettes, share/patterns,
share/symbols and share/templates, so I added patching the interpreter
there as well.

Switching to autotools in Inkscape is a very bad idea, because upstream
currently still has their own autotools files in the 0.92.x tree but
master already has them removed, see this commit:

https://gitlab.com/inkscape/inkscape/commit/e471a664f923f517b68071f2e33fbb6ce070f8b7

However for the sake of trying to not break Inkscape on Darwin again,
I tried to keep the fixes minimal and not went back to CMake.

I did however mark the stuff that's unneeded for CMake, so that we can
avoid forgetting to remove that crap once we get back to CMake.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer
---
 pkgs/applications/graphics/inkscape/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 9a8ef6bd7744..37af9f6b86c7 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -4,6 +4,7 @@
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
 , libvisio, libcdr, libexif, potrace, autoreconfHook
 , intltool
+, icu # Not needed for building with CMake
 , lib
 }:
 
@@ -27,6 +28,13 @@ stdenv.mkDerivation rec {
     patchShebangs share/extensions
     patchShebangs fix-roff-punct
 
+    # XXX: Not needed for CMake:
+    patchShebangs share/filters
+    patchShebangs share/palettes
+    patchShebangs share/patterns
+    patchShebangs share/symbols
+    patchShebangs share/templates
+
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
     substituteInPlace src/extension/implementation/script.cpp \
@@ -38,7 +46,7 @@ stdenv.mkDerivation rec {
     perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif potrace python2Env
+    libvisio libcdr libexif potrace python2Env icu
   ];
 
   enableParallelBuilding = true;

From ac0fd5a90968e4820aa8bbc4c5c5cc6ddcba58a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Wed, 25 Apr 2018 18:03:31 +0200
Subject: [PATCH 0411/3370] kitty: 0.8.2 -> 0.9.0

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

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 52f1c9fb1a1d..496353325255 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -5,7 +5,7 @@
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.8.2";
+  version = "0.9.0";
   name = "kitty-${version}";
   format = "other";
 
@@ -13,7 +13,7 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "08s8l59bib363ykg4djcxrc1968n5j1cjlp6fwwv7xmf18wd1a6c";
+    sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8";
   };
 
   buildInputs = [

From c19eeccc64c2be30a030859f9edaa03c132e812d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Wed, 25 Apr 2018 18:16:20 +0200
Subject: [PATCH 0412/3370] clojure: 1.9.0.358 -> 1.9.0.375

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

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index b35f6032d5aa..4340b68d8f74 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "clojure-${version}";
-  version = "1.9.0.358";
+  version = "1.9.0.375";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "0fi5kni6rdqjy6qgklf4xf7p1pgbsrdwd17iy6lrlg2vb8n8nksp";
+    sha256 = "17a82dw5akhzlz4az9bh6s8rnz6nfgq50d8si0lwg212niq3c599";
   };
 
   buildInputs = [ makeWrapper ];

From c4b7bbf77e15b9e7d0cf8a76ecffde0e5893fe74 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 19 Apr 2018 05:28:16 +0000
Subject: [PATCH 0413/3370] ocamlPackages.findlib: 1.7.3 -> 1.8.0

---
 .../tools/ocaml/findlib/default.nix           | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 6f136a7ef289..e25b94714b68 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -1,22 +1,33 @@
 { stdenv, fetchurl, fetchpatch, m4, ncurses, ocaml, writeText }:
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4"
+  then {
+    version = "1.8.0";
+    sha256 = "1b97zqjdriqd2ikgh4rmqajgxwdwn013riji5j53y3xvcmnpsyrb";
+  } else {
+    version = "1.7.3";
+    sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni";
+    patches = [ (fetchpatch {
+      url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch";
+      sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3";
+    }) ];
+  };
+in
+
 stdenv.mkDerivation rec {
   name = "ocaml-findlib-${version}";
-  version = "1.7.3";
+  inherit (param) version;
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
-    sha256 = "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni";
+    inherit (param) sha256;
   };
 
   buildInputs = [m4 ncurses ocaml];
 
-  patches = [ ./ldconf.patch ./install_topfind.patch
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/ocaml/opam-repository/1f29c5ef8eccd373e5ff2169a30bfd95a9ae6050/packages/ocamlfind/ocamlfind.1.7.3-1/files/threads.patch";
-      sha256 = "0cqgpjqpmfbr0ph3jr25gw8hgckj4qlfwmir6vkgi5hvn2qnjpx3";
-    })
-  ];
+  patches = [ ./ldconf.patch ./install_topfind.patch ]
+  ++ (param.patches or []);
 
   dontAddPrefix=true;
 

From 5c4ee2a3ab9f278b12d9196e59307e65f5fed88c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 18 Apr 2018 12:47:27 +0000
Subject: [PATCH 0414/3370] ocaml: init at 4.07.0+beta2

---
 pkgs/development/compilers/ocaml/4.07.nix    | 9 +++++++++
 pkgs/development/compilers/ocaml/generic.nix | 3 ++-
 pkgs/top-level/ocaml-packages.nix            | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ocaml/4.07.nix

diff --git a/pkgs/development/compilers/ocaml/4.07.nix b/pkgs/development/compilers/ocaml/4.07.nix
new file mode 100644
index 000000000000..b39d57cc092b
--- /dev/null
+++ b/pkgs/development/compilers/ocaml/4.07.nix
@@ -0,0 +1,9 @@
+import ./generic.nix {
+  major_version = "4";
+  minor_version = "07";
+  patch_version = "0+beta2";
+  sha256 = "0rrvl47kq982z2ns7cnasmlbj60mpmza2zyhl1kh45c5a3n7692n";
+
+  # If the executable is stripped it does not work
+  dontStrip = true;
+}
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 03ae6e518d0b..d8af0722c941 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -45,7 +45,8 @@ stdenv.mkDerivation (args // rec {
   ;
 
   buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt";
-  buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ];
+  buildInputs = optional (!stdenv.lib.versionAtLeast version "4.07") ncurses
+    ++ optionals useX11 [ libX11 xproto ];
   installTargets = "install" + optionalString useNativeCompilers " installopt";
   preConfigure = optionalString (!stdenv.lib.versionAtLeast version "4.04") ''
     CAT=$(type -tp cat)
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index f095ccb34ab5..741a58ce588a 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1042,6 +1042,8 @@ in rec
 
   ocamlPackages_4_06 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.06.nix { }) (self: super: { });
 
+  ocamlPackages_4_07 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.07.nix { }) (self: super: { });
+
   ocamlPackages_latest = ocamlPackages_4_06;
 
   ocamlPackages = ocamlPackages_4_05;

From 70a5ba0ac9b4f9a2bd73bafe954f2bc070ee14ad Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 25 Apr 2018 17:12:06 +0200
Subject: [PATCH 0415/3370] gdk_pixbuf: fix installedTests

---
 .../libraries/gdk-pixbuf/default.nix          | 29 +++++++++++++++----
 .../gdk-pixbuf/installed-tests-path.patch     | 12 ++++----
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index f9f041e955b0..97a979945c1d 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+{ stdenv, fetchurl, fetchgit, fetchpatch, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
 , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
 , jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
 
@@ -9,9 +9,15 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
+  # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball
+  # src = fetchurl {
+  #   url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+  #   sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
+  # };
+  src = fetchgit {
+    url = https://git.gnome.org/browse/gdk-pixbuf;
+    rev = version;
+    sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
   };
 
   patches = [
@@ -20,9 +26,20 @@ stdenv.mkDerivation rec {
     # For now, we are patching the build script to avoid the dependency.
     ./no-mime-sniffing.patch
 
-    # Move installed tests to a separate output
-    # They are not usable at the moment, though:
+    # Fix installed tests with meson
     # https://bugzilla.gnome.org/show_bug.cgi?id=795527
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371381;
+      sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn";
+    })
+
+    # Add missing test file bug753605-atsize.jpg
+    (fetchpatch {
+      url = https://git.gnome.org/browse/gdk-pixbuf/patch/?id=87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7;
+      sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0";
+    })
+
+    # Move installed tests to a separate output
     ./installed-tests-path.patch
   ];
 
diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
index fb3c04cf80af..1da2b0a10dcd 100644
--- a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
+++ b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
@@ -1,13 +1,13 @@
 --- a/tests/meson.build
 +++ b/tests/meson.build
-@@ -82,8 +82,8 @@
+@@ -85,8 +85,8 @@
    'aero.gif',
  ]
  
--installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', gdk_pixbuf_api_name)
--installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', gdk_pixbuf_api_name)
-+installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', gdk_pixbuf_api_name)
-+installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', gdk_pixbuf_api_name)
+-installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name())
+-installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name())
++installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', meson.project_name())
++installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', meson.project_name())
  
  install_data(test_data, install_dir: installed_test_bindir)
- 
+ install_subdir('test-images', install_dir: installed_test_bindir)

From ad589329e71cde816a7ec8f2779ff368ce51a622 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 25 Apr 2018 18:35:33 +0200
Subject: [PATCH 0416/3370] nixos/release.nix: add tests.gdk-pixbuf

---
 nixos/release.nix          |  1 +
 nixos/tests/gdk-pixbuf.nix | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 nixos/tests/gdk-pixbuf.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 5d3c3de08dac..a54443f92cf1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -285,6 +285,7 @@ in rec {
   tests.firewall = callTest tests/firewall.nix {};
   tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {};
   tests.fwupd = callTest tests/fwupd.nix {};
+  tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gitolite = callTest tests/gitolite.nix {};
   tests.gjs = callTest tests/gjs.nix {};
diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix
new file mode 100644
index 000000000000..b20f61b5ffe2
--- /dev/null
+++ b/nixos/tests/gdk-pixbuf.nix
@@ -0,0 +1,19 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }: {
+  name = "gdk-pixbuf";
+
+  meta = {
+    maintainers = pkgs.gdk_pixbuf.meta.maintainers;
+  };
+
+  machine = { pkgs, ... }: {
+    environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+    environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
+
+    virtualisation.memorySize = 4096; # Tests allocate a lot of memory trying to exploit a CVE
+  };
+
+  testScript = ''
+    $machine->succeed("gnome-desktop-testing-runner");
+  '';
+})

From e609551090c02c5c31ec39c090f96df9dcb7f12e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 25 Apr 2018 18:48:16 +0200
Subject: [PATCH 0417/3370] vim-nix: 2018-04-15 -> 2018-04-24

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

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index a48f9943779a..0134d5fae48a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -280,11 +280,11 @@ rec {
   };
 
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nix-2018-04-15";
+    name = "vim-nix-2018-04-24";
     src = fetchgit {
       url = "https://github.com/LnL7/vim-nix";
-      rev = "bf5779180bf0e3cb6c967f87d6262a976e055e32";
-      sha256 = "023c932vybycj8zasvgvp7xhp42i2iy26msjgjsgzfwmdf5w877y";
+      rev = "dae3d30a145f1d0e50658dafd88f95cd4b5e323d";
+      sha256 = "1x3gaiz2wbqykzhk0zj0krjp81m5rxhk80pcg96f4gyqp7hxrx78";
     };
     dependencies = [];
 

From 00528006cfc998db81abb77d5aebe7115bbd664f Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Wed, 25 Apr 2018 19:20:57 +0200
Subject: [PATCH 0418/3370] guitarix: 0.36.1 -> 0.37.0

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

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index bcb301687089..62bc2fa6f36f 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -12,11 +12,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.36.1";
+  version = "0.37.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.xz";
-    sha256 = "1g5949jwh2n755xjs3kcbdb8a1wxr5mn0m115wdnk27dxcdn93b0";
+    sha256 = "17dsd32yd92l7xq1x0b8jsws5yif2pk4zbfjbc560hgarym6r8x6";
   };
 
   nativeBuildInputs = [ gettext intltool wrapGAppsHook pkgconfig python2 ];

From 30357e203ad73748a2fc81735d3660e403d5161c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 25 Apr 2018 12:49:51 -0500
Subject: [PATCH 0419/3370] lsof: 4.90 -> 4.91

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

diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix
index ae62c8c7aaef..005fb09fba09 100644
--- a/pkgs/development/tools/misc/lsof/default.nix
+++ b/pkgs/development/tools/misc/lsof/default.nix
@@ -4,13 +4,13 @@ let dialect = with stdenv.lib; last (splitString "-" stdenv.system); in
 
 stdenv.mkDerivation rec {
   name = "lsof-${version}";
-  version = "4.90";
+  version = "4.91";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   buildInputs = [ ncurses ];
 
   src = fetchurl {
-    urls = ["https://fossies.org/linux/misc/lsof_4.90.tar.bz2"] ++ # Mirrors seem to be down...
+    urls = ["https://fossies.org/linux/misc/lsof_${version}.tar.bz2"] ++ # Mirrors seem to be down...
       ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"]
       ++ map (
         # the tarball is moved after new version is released
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
         + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2"
       ) [ false true ]
       ;
-    sha256 = "1xhn3amvl5mmwji5g90nkw7lfmh2494v18qbv1f729hrg468853g";
+    sha256 = "18sh4hbl9jw2szkf0gvgan8g13f3g4c6s2q9h3zq5gsza9m99nn9";
   };
 
   unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); ";

From 0009ae3d5e1ad620215c2b8409eeec668de60552 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 25 Apr 2018 19:55:29 +0200
Subject: [PATCH 0420/3370] onboard: fix missing typelibs

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

diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix
index d4847e4ce493..de64705d832b 100644
--- a/pkgs/applications/misc/onboard/default.nix
+++ b/pkgs/applications/misc/onboard/default.nix
@@ -88,6 +88,7 @@ in python3.pkgs.buildPythonApplication rec {
 
   nativeBuildInputs = [
     glibcLocales
+    gobjectIntrospection # populate GI_TYPELIB_PATH
     intltool
     pkgconfig
   ];

From c1f45f76ad0c84f4e5a3f968de08f97c2150f9ac Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 25 Apr 2018 14:58:23 -0400
Subject: [PATCH 0421/3370] sacrifice: fix runtime on darwin

---
 pkgs/applications/science/physics/sacrifice/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
index d6aeeedc086d..99d6df77f853 100644
--- a/pkgs/applications/science/physics/sacrifice/default.nix
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -27,6 +27,10 @@ stdenv.mkDerivation rec {
     "--with-pythia=${pythia}"
   ];
 
+  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia
+  '';
+
   enableParallelBuilding = true;
 
   meta = {

From 524b29471bc3683650005ebffec042fb15e0937c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 12 Apr 2018 21:29:58 -0300
Subject: [PATCH 0422/3370] onestepback: init at 0.98

---
 pkgs/misc/themes/onestepback/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/misc/themes/onestepback/default.nix

diff --git a/pkgs/misc/themes/onestepback/default.nix b/pkgs/misc/themes/onestepback/default.nix
new file mode 100644
index 000000000000..609e027d9eba
--- /dev/null
+++ b/pkgs/misc/themes/onestepback/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchzip }:
+
+let
+  version = "0.98";
+
+in fetchzip {
+  name = "onestepback-${version}";
+
+  url = "http://www.vide.memoire.free.fr/perso/OneStepBack/OneStepBack-v${version}.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/themes
+    unzip $downloadedFile -x OneStepBack/LICENSE -d $out/share/themes
+  '';
+
+  sha256 = "0sjacvx7020lzc89r5310w83wclw96gzzczy3mss54ldkgmnd0mr";
+
+  meta = with stdenv.lib; {
+    description = "Gtk theme inspired by the NextStep look";
+    homepage = https://www.opendesktop.org/p/1013663/;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f8c3e0765cd..85212825a0e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19609,6 +19609,8 @@ with pkgs;
 
   numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { };
 
+  onestepback = callPackage ../misc/themes/onestepback { };
+
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   rox-filer = callPackage ../desktops/rox/rox-filer {

From ba52ae50488de85a9cf60a3a04f1c9ca7122ec74 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 22:41:06 -0400
Subject: [PATCH 0423/3370] treewide: isArm -> isAarch32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile
---
 lib/systems/doubles.nix                            |  2 +-
 lib/systems/for-meta.nix                           |  2 +-
 lib/systems/inspect.nix                            |  7 +++++--
 lib/systems/parse.nix                              |  2 +-
 nixos/lib/qemu-flags.nix                           |  2 +-
 nixos/modules/config/gnu.nix                       |  4 ++--
 nixos/modules/virtualisation/qemu-vm.nix           |  2 +-
 pkgs/applications/audio/sunvox/default.nix         |  2 +-
 .../instant-messengers/toxic/default.nix           |  2 +-
 pkgs/applications/virtualization/qemu/default.nix  |  6 +++---
 pkgs/build-support/bintools-wrapper/default.nix    |  4 ++--
 pkgs/development/compilers/gcc/4.8/default.nix     |  2 +-
 pkgs/development/compilers/gcc/4.9/default.nix     |  2 +-
 pkgs/development/compilers/gcc/5/default.nix       |  2 +-
 pkgs/development/compilers/gcc/6/default.nix       |  2 +-
 pkgs/development/compilers/gcc/7/default.nix       |  2 +-
 .../development/compilers/gcc/snapshot/default.nix |  2 +-
 pkgs/development/compilers/ghc/7.10.3-binary.nix   |  2 +-
 pkgs/development/compilers/ghc/8.2.1-binary.nix    |  2 +-
 pkgs/development/compilers/ghc/8.2.2.nix           |  6 +++---
 pkgs/development/compilers/ghc/8.4.1.nix           |  4 ++--
 pkgs/development/compilers/ghc/8.4.2.nix           |  4 ++--
 pkgs/development/compilers/ghc/head.nix            |  4 ++--
 pkgs/development/compilers/go/1.10.nix             |  4 ++--
 pkgs/development/compilers/go/1.4.nix              |  2 +-
 pkgs/development/compilers/go/1.9.nix              |  4 ++--
 pkgs/development/compilers/ocaml/3.12.1.nix        |  2 +-
 pkgs/development/compilers/ocaml/4.00.1.nix        |  2 +-
 pkgs/development/compilers/ocaml/generic.nix       |  4 ++--
 pkgs/development/compilers/sbcl/bootstrap.nix      |  2 +-
 pkgs/development/compilers/sbcl/default.nix        |  2 +-
 .../haskell-modules/configuration-common.nix       | 10 +++++-----
 .../haskell-modules/generic-builder.nix            |  2 +-
 pkgs/development/interpreters/perl/default.nix     |  2 +-
 pkgs/development/interpreters/picolisp/default.nix |  2 +-
 .../interpreters/spidermonkey/1.8.5.nix            |  8 ++++----
 pkgs/development/libraries/ffmpeg/generic.nix      | 14 +++++++-------
 pkgs/development/libraries/freetype/default.nix    |  2 +-
 pkgs/development/libraries/glibc/common.nix        |  2 +-
 pkgs/development/libraries/gmp/5.1.x.nix           |  2 +-
 pkgs/development/libraries/gmp/6.x.nix             |  2 +-
 pkgs/development/libraries/gnu-efi/default.nix     |  2 +-
 pkgs/development/libraries/icu/base.nix            |  2 +-
 pkgs/development/libraries/jemalloc/common.nix     |  2 +-
 pkgs/development/libraries/libdrm/default.nix      |  2 +-
 pkgs/development/libraries/libtoxcore/default.nix  |  2 +-
 pkgs/development/libraries/libtoxcore/new-api.nix  |  4 ++--
 pkgs/development/libraries/libvpx/default.nix      |  2 +-
 pkgs/development/libraries/libvpx/git.nix          |  4 ++--
 pkgs/development/libraries/mesa/default.nix        |  6 +++---
 pkgs/development/libraries/pixman/default.nix      |  2 +-
 pkgs/development/libraries/pth/default.nix         |  2 +-
 pkgs/development/libraries/v8/3.16.14.nix          |  4 ++--
 pkgs/development/libraries/v8/6_x.nix              |  2 +-
 pkgs/development/libraries/v8/default.nix          |  2 +-
 .../libraries/webrtc-audio-processing/default.nix  |  2 +-
 pkgs/development/tools/misc/binutils/default.nix   |  2 +-
 pkgs/development/tools/misc/uhd/default.nix        |  4 ++--
 .../apple-source-releases/system_cmds/default.nix  |  2 +-
 pkgs/os-specific/linux/kbd/default.nix             |  2 +-
 pkgs/os-specific/linux/kernel/common-config.nix    |  2 +-
 pkgs/os-specific/linux/systemd/default.nix         |  2 +-
 pkgs/os-specific/linux/uclibc/default.nix          |  2 +-
 pkgs/servers/sql/mariadb/default.nix               |  2 +-
 pkgs/stdenv/generic/default.nix                    |  2 +-
 pkgs/tools/networking/cjdns/default.nix            |  2 +-
 pkgs/tools/networking/filegive/default.nix         |  2 +-
 pkgs/tools/system/storebrowse/default.nix          |  2 +-
 pkgs/top-level/all-packages.nix                    | 14 +++++++-------
 69 files changed, 110 insertions(+), 107 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 012a1786a3cc..c6618083ce72 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -26,7 +26,7 @@ in rec {
 
   none = [];
 
-  arm     = filterDoubles predicates.isArm;
+  arm     = filterDoubles predicates.isAarch32;
   aarch64 = filterDoubles predicates.isAarch64;
   x86     = filterDoubles predicates.isx86;
   i686    = filterDoubles predicates.isi686;
diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 43c0195c3f18..9e85cea3ad11 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -7,7 +7,7 @@ in rec {
   all     = [ {} ]; # `{}` matches anything
   none    = [];
 
-  arm     = [ patterns.isArm ];
+  arm     = [ patterns.isAarch32 ];
   aarch64 = [ patterns.isAarch64 ];
   x86     = [ patterns.isx86 ];
   i686    = [ patterns.isi686 ];
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index d7fabf684b72..b87320594cab 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -9,8 +9,8 @@ rec {
     isx86_64       = { cpu = cpuTypes.x86_64; };
     isPowerPC      = { cpu = cpuTypes.powerpc; };
     isx86          = { cpu = { family = "x86"; }; };
-    isArm          = { cpu = { family = "arm"; }; };
-    isAarch64      = { cpu = { family = "aarch64"; }; };
+    isAarch32      = { cpu = { family = "arm"; bits = 32; }; };
+    isAarch64      = { cpu = { family = "arm"; bits = 64; }; };
     isMips         = { cpu = { family = "mips"; }; };
     isRiscV        = { cpu = { family = "riscv"; }; };
     isWasm         = { cpu = { family = "wasm"; }; };
@@ -41,6 +41,9 @@ rec {
 
     isEfi          = map (family: { cpu.family = family; })
                        [ "x86" "arm" "aarch64" ];
+
+    # Deprecated
+    isArm = isAarch32;
   };
 
   matchAnyAttrs = patterns:
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 381108d76fe2..018fd172e687 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -72,7 +72,7 @@ rec {
     armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    aarch64  = { bits = 64; significantByte = littleEndian; family = "aarch64"; };
+    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
     mips     = { bits = 32; significantByte = bigEndian;    family = "mips"; };
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index fcdcbf1b0077..e4c95ebdfb0d 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
@@ -9,7 +9,7 @@
     ];
 
   qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
-        else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"
+        else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0"
         else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";
 
   qemuBinary = qemuPkg: {
diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index ef48ccb7b4fe..93d130970190 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -26,11 +26,11 @@ with lib;
         nano zile
         texinfo # for the stand-alone Info reader
       ]
-      ++ stdenv.lib.optional (!stdenv.isArm) grub2;
+      ++ stdenv.lib.optional (!stdenv.isAarch32) grub2;
 
 
     # GNU GRUB, where available.
-    boot.loader.grub.enable = !pkgs.stdenv.isArm;
+    boot.loader.grub.enable = !pkgs.stdenv.isAarch32;
     boot.loader.grub.version = 2;
 
     # GNU lsh.
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 45325c6b0d8d..2b78276fcdea 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -437,7 +437,7 @@ in
     # FIXME: Consolidate this one day.
     virtualisation.qemu.options = mkMerge [
       (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" ])
-      (mkIf (pkgs.stdenv.isArm || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ])
+      (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ])
     ];
 
     # Mount the host filesystem via 9P, and bind-mount the Nix store
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index ccbceddefd2f..47b0bf2e736c 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -5,7 +5,7 @@ let
   arch =
     if stdenv.isAarch64
     then "arm64"
-    else if stdenv.isArm
+    else if stdenv.isAarch32
     then "arm_armhf_raspberry_pi"
     else if stdenv.is64bit
     then "x86_64"
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index e2e25be49f23..4934a7374058 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
-  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
     openal libopus libvpx freealut libqrencode
   ];
   nativeBuildInputs = [ pkgconfig libconfig ];
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index a10687141615..9839aadc9c1f 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -4,7 +4,7 @@
 , makeWrapper
 , attr, libcap, libcap_ng
 , CoreServices, Cocoa, rez, setfile
-, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl
+, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
 , seccompSupport ? stdenv.isLinux, libseccomp
 , pulseSupport ? !stdenv.isDarwin, libpulseaudio
 , sdlSupport ? !stdenv.isDarwin, SDL2
@@ -29,7 +29,7 @@ let
 
   hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu"
                    else if stdenv.isi686 then "i386-softmmu"
-                   else if stdenv.isArm then "arm-softmmu"
+                   else if stdenv.isAarch32 then "arm-softmmu"
                    else if stdenv.isAarch64 then "aarch64-softmmu"
                    else throw "Don't know how to build a 'hostCpuOnly = true' QEMU";
 in
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
   postInstall =
     if stdenv.isx86_64       then ''makeWrapper $out/bin/qemu-system-x86_64  $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else if stdenv.isi686    then ''makeWrapper $out/bin/qemu-system-i386    $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
-    else if stdenv.isArm     then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+    else if stdenv.isAarch32     then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else "";
 
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 5c0436b73ddf..47301bbdde69 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -57,7 +57,7 @@ let
     else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
     else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
     # ARM with a wildcard, which can be "" or "-armhf".
-    else if (with targetPlatform; isArm && isLinux)   then "${libc_lib}/lib/ld-linux*.so.3"
+    else if (with targetPlatform; isAarch32 && isLinux)   then "${libc_lib}/lib/ld-linux*.so.3"
     else if targetPlatform.system == "aarch64-linux"  then "${libc_lib}/lib/ld-linux-aarch64.so.1"
     else if targetPlatform.system == "powerpc-linux"  then "${libc_lib}/lib/ld.so.1"
     else if targetPlatform.isMips                     then "${libc_lib}/lib/ld.so.1"
@@ -176,7 +176,7 @@ stdenv.mkDerivation {
     sep = optionalString (!targetPlatform.isMips) "-";
     arch =
       /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
-      else if targetPlatform.isArm     then endianPrefix + "arm"
+      else if targetPlatform.isAarch32     then endianPrefix + "arm"
       else if targetPlatform.isx86_64  then "x86-64"
       else if targetPlatform.isi686    then "i386"
       else if targetPlatform.isMips    then {
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 0a6ea59e5ac4..532c56d52573 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -289,7 +289,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 5dfdbd02cbfd..fb82eee4ab85 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -298,7 +298,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index e42bb736676d..dee798eb09b1 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -318,7 +318,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index cf71f51627c9..b99ab8fce7fb 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -322,7 +322,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 0b19aa95effe..493e50d9f327 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -327,7 +327,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index e41e8789c9ed..d37cfac3fa85 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -290,7 +290,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix
index c56798e31ae4..cb9f78aa0813 100644
--- a/pkgs/development/compilers/ghc/7.10.3-binary.nix
+++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ];
+  buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index 5cb3f2ea5ced..c88d2a8685a6 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ];
+  buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 6520daa4d42c..192ff1ba207d 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -26,7 +26,7 @@
   enableShared ?
     !(targetPlatform.isDarwin
       # On iOS, dynamic linking is not supported
-      && (targetPlatform.isAarch64 || targetPlatform.isArm))
+      && (targetPlatform.isAarch64 || targetPlatform.isAarch32))
 , # Whether to backport https://phabricator.haskell.org/D4388 for
   # deterministic profiling symbol names, at the cost of a slightly
   # non-standard GHC API
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isArm) [
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix
index df23f660147a..8f398458fd53 100644
--- a/pkgs/development/compilers/ghc/8.4.1.nix
+++ b/pkgs/development/compilers/ghc/8.4.1.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isArm) [
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 296c10b9346c..cf4e57727198 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -120,7 +120,7 @@ stdenv.mkDerivation rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isArm) [
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index bc3ccbdcdf51..51497e0d9cee 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isArm) [
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 7ba547552907..69184744307d 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
 
   '' + optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
-  '' + optionalString stdenv.isArm ''
+  '' + optionalString stdenv.isAarch32 ''
     sed -i '/TestCurrent/areturn' src/os/user/user_test.go
     echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
   '' + optionalString stdenv.isDarwin ''
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
   GOARCH = if stdenv.isDarwin then "amd64"
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.isArm then "arm"
+           else if stdenv.isAarch32 then "arm"
            else if stdenv.isAarch64 then "arm64"
            else throw "Unsupported system";
   GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index b8c283fef07e..32eb0d98d188 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
   GOARCH = if stdenv.isDarwin then "amd64"
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.isArm then "arm"
+           else if stdenv.isAarch32 then "arm"
            else throw "Unsupported system";
   GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index 829309f94268..6a92775e0c25 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
 
   '' + optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
-  '' + optionalString stdenv.isArm ''
+  '' + optionalString stdenv.isAarch32 ''
     sed -i '/TestCurrent/areturn' src/os/user/user_test.go
     echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
   '' + optionalString stdenv.isDarwin ''
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
   GOARCH = if stdenv.isDarwin then "amd64"
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.isArm then "arm"
+           else if stdenv.isAarch32 then "arm"
            else if stdenv.isAarch64 then "arm64"
            else throw "Unsupported system";
   GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index c69554e633a9..8cfe2bb7bcfe 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, xlibsWrapper }:
 
 let
-   useX11 = !stdenv.isArm && !stdenv.isMips;
+   useX11 = !stdenv.isAarch32 && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
 in
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 648ef0d91f9e..8bad5494e8b9 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, xlibsWrapper }:
 
 let
-   useX11 = !stdenv.isArm && !stdenv.isMips;
+   useX11 = !stdenv.isAarch32 && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
 in
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index d8af0722c941..1ee6fee613c9 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -7,7 +7,7 @@ let
   real_url = if url == null then
     "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz"
   else url;
-  safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
+  safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
 in
 
 { stdenv, fetchurl, ncurses, buildEnv
@@ -15,7 +15,7 @@ in
 , flambdaSupport ? false
 }:
 
-assert useX11 -> !stdenv.isArm && !stdenv.isMips;
+assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
 assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
 
 let
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 707f7966dd9b..529123398a57 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
       --add-flags "--core $out/share/sbcl/sbcl.core"
   '';
 
-  postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) ''
+  postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) ''
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
   '';
 
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 0da3e9f0fd1d..29a192fcff24 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
                (setf features (remove x features))))
     ''
     + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)")
-    + stdenv.lib.optionalString stdenv.isArm "(enable :arm)"
+    + stdenv.lib.optionalString stdenv.isAarch32 "(enable :arm)"
     + ''
       )) " > customize-target-features.lisp
 
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 785f38be3d0f..e4f2d6728640 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -932,11 +932,11 @@ self: super: {
   JuicyPixels = dontHaddock super.JuicyPixels;
 
   # aarch64 and armv7l fixes.
-  happy = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
-  hashable = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
-  servant-docs = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs;
-  servant-swagger = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger;
-  swagger2 = if (pkgs.stdenv.hostPlatform.isArm || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
+  happy = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
+  hashable = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
+  servant-docs = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-docs else super.servant-docs;
+  servant-swagger = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontCheck super.servant-swagger else super.servant-swagger;
+  swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2;
 
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 52d596da701a..3ab77c42cbba 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -136,7 +136,7 @@ let
     (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
     (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
-    (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
+    (enableFeature (enableDeadCodeElimination && !hostPlatform.isAarch32 && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
     (optionalString ((enableExecutableProfiling || enableLibraryProfiling) && versionOlder "8" ghc.version) "--profiling-detail=${profilingDetail}")
     (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 0fd55bd8d71b..3541c92fd9d6 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -86,7 +86,7 @@ let
 
     preConfigure = optionalString (!crossCompiling) ''
         configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-      '' + optionalString (stdenv.isArm || stdenv.isMips) ''
+      '' + optionalString (stdenv.isAarch32 || stdenv.isMips) ''
         configureFlagsArray=(-Dldflags="-lm -lrt")
       '' + optionalString stdenv.isDarwin ''
         substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 4618d0da9dd3..6f7f2df96bff 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75";
   };
   buildInputs = optional stdenv.is64bit jdk;
-  patchPhase = optionalString stdenv.isArm ''
+  patchPhase = optionalString stdenv.isAarch32 ''
     sed -i s/-m32//g Makefile
     cat >>Makefile <<EOF
     ext.o: ext.c
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 9a14beb856b6..8e51b9b7d58e 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213;
+  nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213;
   buildInputs = [ perl python2 zip ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
     export LIBXUL_DIST=$out
-    ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"}
+    ${lib.optionalString stdenv.isAarch32 "autoreconf --verbose --force"}
   '';
 
   patches = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e";
       sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
     })
-  ] ++ stdenv.lib.optionals stdenv.isArm [
+  ] ++ stdenv.lib.optionals stdenv.isAarch32 [
     # Explained below in configureFlags for ARM
     ./1.8.5-findvanilla.patch
     # Fix for hard float flags.
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
   preBuild = ''
     touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}
-    ${if stdenv.isArm then "rm -r jit-test/tests/jaeger/bug563000" else ""}
+    ${if stdenv.isAarch32 then "rm -r jit-test/tests/jaeger/bug563000" else ""}
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 985f328a22dd..4a05eab87bd7 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -7,8 +7,8 @@
 # Build options
 , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
 , multithreadBuild ? true # Multithreading via pthreads/win32 threads
-, sdlSupport ? !stdenv.isArm, SDL ? null, SDL2 ? null
-, vdpauSupport ? !stdenv.isArm, libvdpau ? null
+, sdlSupport ? !stdenv.isAarch32, SDL ? null, SDL2 ? null
+, vdpauSupport ? !stdenv.isAarch32, libvdpau ? null
 # Developer options
 , debugDeveloper ? false
 , optimizationsDeveloper ? true
@@ -42,7 +42,7 @@
  */
 
 let
-  inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isArm;
+  inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32;
   inherit (stdenv.lib) optional optionals enableFeature;
 
   cmpVer = builtins.compareVersions;
@@ -55,9 +55,9 @@ let
   verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix;
 
   # Disable dependency that needs fixes before it will work on Darwin or Arm
-  disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg;
+  disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg;
 
-  vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm);
+  vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isAarch32);
 in
 
 assert openglSupport -> libGLU_combined != null;
@@ -153,8 +153,8 @@ stdenv.mkDerivation rec {
     bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
     libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
   ] ++ optional openglSupport libGLU_combined
-    ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
-    ++ optional ((isLinux || isFreeBSD) && !isArm) libva
+    ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
+    ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
     ++ optional isLinux alsaLib
     ++ optionals isDarwin darwinFrameworks
     ++ optional vdpauSupport libvdpau
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 3fccce02def4..4d2455d4872b 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -52,7 +52,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];
 
   # The asm for armel is written with the 'asm' keyword.
-  CFLAGS = optionalString stdenv.isArm "-std=gnu99";
+  CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 31567f0049dd..37e0a20a957d 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -127,7 +127,7 @@ stdenv.mkDerivation ({
       (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
     ] ++ lib.optionals (cross != null) [
       "--with-__thread"
-    ] ++ lib.optionals (cross == null && stdenv.isArm) [
+    ] ++ lib.optionals (cross == null && stdenv.isAarch32) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
 
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index b65a8ee5fc1c..57204776decd 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec {
   # The config.guess in GMP tries to runtime-detect various
   # ARM optimization flags via /proc/cpuinfo (and is also
   # broken on multicore CPUs). Avoid this impurity.
-  preConfigure = optionalString stdenv.isArm ''
+  preConfigure = optionalString stdenv.isAarch32 ''
       configureFlagsArray+=("--build=$(./configfsf.guess)")
     '';
 
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 5973c89cef79..551e7e5e1f6b 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -38,7 +38,7 @@ let self = stdenv.mkDerivation rec {
   # The config.guess in GMP tries to runtime-detect various
   # ARM optimization flags via /proc/cpuinfo (and is also
   # broken on multicore CPUs). Avoid this impurity.
-  preConfigure = optionalString stdenv.isArm ''
+  preConfigure = optionalString stdenv.isAarch32 ''
       configureFlagsArray+=("--build=$(./configfsf.guess)")
     '';
 
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 940b4e2aee4e..1f8a518d69e4 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "AR=${stdenv.cc.targetPrefix}ar"
     "RANLIB=${stdenv.cc.targetPrefix}ranlib"
     "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
-  ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"
+  ] ++ stdenv.lib.optional stdenv.isAarch32 "ARCH=arm"
     ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index 87551ee6ee03..ee868d371ce5 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -31,7 +31,7 @@ let
 
       # $(includedir) is different from $(prefix)/include due to multiple outputs
       sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in
-    '' + stdenv.lib.optionalString stdenv.isArm ''
+    '' + stdenv.lib.optionalString stdenv.isAarch32 ''
       # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
       sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
     '';
diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix
index 1a26bd13d41c..d8866ae3ff89 100644
--- a/pkgs/development/libraries/jemalloc/common.nix
+++ b/pkgs/development/libraries/jemalloc/common.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (rec {
                    # jemalloc is unable to correctly detect transparent hugepage support on
                    # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
                    # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support
-                   ++ stdenv.lib.optional stdenv.isArm "--disable-thp";
+                   ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp";
   doCheck = true;
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 82307e9ab163..ccae6ce50142 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
   configureFlags = [ "--enable-install-test-programs" ]
-    ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64)
+    ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
       [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 16fca9ce3d39..9af8718dc5fe 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libsodium libmsgpack ncurses libconfig
-  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
     libopus
     libvpx
   ];
diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix
index 8d0a467c82a8..785bc6f3c843 100644
--- a/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -33,11 +33,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
     autoreconfHook libsodium ncurses check libconfig
-  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
     libopus
   ];
 
-  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
+  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ];
 
   # Some tests fail randomly due to timeout. This kind of problem is well known
   # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 1e96ff9bb1ad..272761cc6af3 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -41,7 +41,7 @@
 }:
 
 let
-  inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin;
+  inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
   inherit (stdenv.lib) enableFeature optional optionals;
 in
 
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index ef499f238d63..e2b94dda28e7 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -43,11 +43,11 @@
 }:
 
 let
-  inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin;
+  inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
   inherit (stdenv.lib) enableFeature optional optionals;
 in
 
-assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support
+assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support
 
 assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
 assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index a3c03c4f2e53..2beb7e600804 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -33,17 +33,17 @@ else
 
 let
   defaultGalliumDrivers =
-    if stdenv.isArm
+    if stdenv.isAarch32
     then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
     else if stdenv.isAarch64
     then ["nouveau" "vc4" ]
     else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
   defaultDriDrivers =
-    if (stdenv.isArm || stdenv.isAarch64)
+    if (stdenv.isAarch32 || stdenv.isAarch64)
     then ["nouveau"]
     else ["i915" "i965" "nouveau" "radeon" "r200"];
   defaultVulkanDrivers =
-    if (stdenv.isArm || stdenv.isAarch64)
+    if (stdenv.isAarch32 || stdenv.isAarch64)
     then []
     else ["intel"] ++ lib.optional enableRadv "radeon";
 in
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index e70ffc3eb2f1..2987c67ae757 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional doCheck libpng;
 
-  configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt";
+  configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt";
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index b7b09caed9b3..6118d9c41d6f 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
   };
 
-  preConfigure = stdenv.lib.optionalString stdenv.isArm ''
+  preConfigure = stdenv.lib.optionalString stdenv.isAarch32 ''
     configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
   '';
 
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index 73f5febb6685..e1a9336e3a56 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -3,10 +3,10 @@
 assert readline != null;
 
 let
-  arch = if stdenv.isArm
+  arch = if stdenv.isAarch32
     then (if stdenv.is64bit then "arm64" else "arm")
     else (if stdenv.is64bit then "x64" else "ia32");
-  armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard";
+  armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix
index 4095ff20c2bc..adebedbf2ac1 100644
--- a/pkgs/development/libraries/v8/6_x.nix
+++ b/pkgs/development/libraries/v8/6_x.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  arch = if stdenv.isArm
+  arch = if stdenv.isAarch32
          then if stdenv.is64bit
               then"arm64"
               else "arm"
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index f14ec4fc6084..099794f6623d 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -10,7 +10,7 @@ let
   arch = if stdenv.isx86_64 then "x64"
             else if stdenv.isi686 then "ia32"
             else if stdenv.isAarch64 then "arm64"
-            else if stdenv.isArm then "arm"
+            else if stdenv.isAarch32 then "arm"
             else throw "Unknown architecture for v8";
   git_url = "https://chromium.googlesource.com";
   clangFlag = if stdenv.isDarwin then "1" else "0";
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix
index b5a3aed91d90..529091518eb6 100644
--- a/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # Avoid this error:
   # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode
-  patchPhase = stdenv.lib.optionalString stdenv.isArm ''
+  patchPhase = stdenv.lib.optionalString stdenv.isAarch32 ''
     substituteInPlace configure --replace 'armv7*|armv8*' 'disabled'
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 123f679d779d..e65736a3e887 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
   # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix
index 2ea87fe6d7f1..011d0b3e80b9 100644
--- a/pkgs/development/tools/misc/uhd/default.nix
+++ b/pkgs/development/tools/misc/uhd/default.nix
@@ -38,14 +38,14 @@ in stdenv.mkDerivation {
   # /nix/store/wd6r25miqbk9ia53pp669gn4wrg9n9cj-gcc-7.3.0/include/c++/7.3.0/bits/vector.tcc:394:7: note: parameter passing for argument of type 'std::vector<uhd::range_t>::iterator {aka __gnu_cxx::__normal_iterator<uhd::range_t*, std::vector<uhd::range_t> >}' changed in GCC 7.1
 
   cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++
-               [ (stdenv.lib.optionalString stdenv.isArm "-DCMAKE_CXX_FLAGS=-Wno-psabi") ];
+               [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ python pythonPackages.pyramid_mako orc libusb1 boost ];
 
   # Build only the host software
   preConfigure = "cd host";
-  patches = if stdenv.isArm then ./neon.patch else null;
+  patches = if stdenv.isAarch32 then ./neon.patch else null;
 
   postPhases = [ "installFirmware" ];
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
index 2579b0b6a0a6..1bbda6ab7add 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/default.nix
@@ -11,7 +11,7 @@ appleDerivation rec {
                   apple_sdk.frameworks.IOKit openbsm ];
   # NIX_CFLAGS_COMPILE = lib.optionalString hostPlatform.isi686 "-D__i386__"
   #                    + lib.optionalString hostPlatform.isx86_64 "-D__x86_64__"
-  #                    + lib.optionalString hostPlatform.isArm "-D__arm__";
+  #                    + lib.optionalString hostPlatform.isAarch32 "-D__arm__";
   NIX_CFLAGS_COMPILE = [ "-DDAEMON_UID=1"
                          "-DDAEMON_GID=1"
                          "-DDEFAULT_AT_QUEUE=\'a\'"
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index d1e40371e370..bfade509fcac 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
       # We get a warning in armv5tel-linux and the fuloong2f, so we
       # disable -Werror in it.
-      ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) ''
+      ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) ''
         sed -i s/-Werror// src/Makefile.am
       ''}
     '';
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4d9ec389f44e..4af5889fd1cd 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -355,7 +355,7 @@ with stdenv.lib;
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   SECURITY_YAMA? y # Prevent processes from ptracing non-children processes
   DEVKMEM n # Disable /dev/kmem
-  ${optionalString (! stdenv.hostPlatform.isArm)
+  ${optionalString (! stdenv.hostPlatform.isAarch32)
     (if versionOlder version "3.14" then ''
         CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
       '' else ''
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 7c9514883093..615e4f867c4d 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -79,7 +79,7 @@ in stdenv.mkDerivation rec {
     "-Dsystem-gid-max=499"
     # "-Dtime-epoch=1"
 
-    (if stdenv.isArm || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
+    (if stdenv.isAarch32 || stdenv.isAarch64 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
     "-Defi-libdir=${toString gnu-efi}/lib"
     "-Defi-includedir=${toString gnu-efi}/include/efi"
     "-Defi-ldsdir=${toString gnu-efi}/lib"
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index c4d2bf04d7a0..180aabc94cc6 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -43,7 +43,7 @@ let
     UCLIBC_SUSV4_LEGACY y
     UCLIBC_HAS_THREADS_NATIVE y
     KERNEL_HEADERS "${linuxHeaders}/include"
-  '' + stdenv.lib.optionalString (stdenv.isArm && cross == null) ''
+  '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) ''
     CONFIG_ARM_EABI y
     ARCH_WANTS_BIG_ENDIAN n
     ARCH_BIG_ENDIAN n
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 60462f83d108..a9de5508371a 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -123,7 +123,7 @@ everything = stdenv.mkDerivation (common // {
   buildInputs = common.buildInputs ++ [
     xz lzo lz4 bzip2 snappy
     libxml2 boost judy libevent cracklib
-  ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl;
+  ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl;
 
   cmakeFlags = common.cmakeFlags ++ [
     "-DMYSQL_DATADIR=/var/lib/mysql"
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 42288e6245e4..190fc500068c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -117,7 +117,7 @@ let
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
         isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
-        isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian;
+        isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
 
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index d16e730b5abf..817da08c05e3 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     stdenv.lib.optional stdenv.isLinux utillinux;
 
   buildPhase =
-    stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 "
+    stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 "
     + "bash do";
   installPhase = ''
     install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index d20cb3c37859..3dfd136ad060 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, go }:
 
-assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm);
+assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32);
 
 let
 
diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix
index 40332f7b0d44..179b4cb1a4c0 100644
--- a/pkgs/tools/system/storebrowse/default.nix
+++ b/pkgs/tools/system/storebrowse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchhg, go, sqlite}:
 
-assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm);
+assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32);
 
 stdenv.mkDerivation rec {
   name = "storebrowse-20130318212204";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eaa458529e3c..d446a0127212 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6471,12 +6471,12 @@ with pkgs;
 
   openjdk = openjdk8;
 
-  jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
-  jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
+  jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
+  jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk8.jre // { outputs = [ "jre" ]; }));
   jre8_headless =
-    if stdenv.isArm || stdenv.isAarch64 then
+    if stdenv.isAarch32 || stdenv.isAarch64 then
       oraclejre8
     else if stdenv.isDarwin then
       jre8
@@ -6485,12 +6485,12 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
-  jdk10 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
-  jre10 = if stdenv.isArm || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
+  jdk10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk10 else openjdk10 // { outputs = [ "out" ]; };
+  jre10 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre10 else lib.setName "openjre-${lib.getVersion pkgs.openjdk10.jre}"
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk10.jre // { outputs = [ "jre" ]; }));
   jre10_headless =
-    if stdenv.isArm || stdenv.isAarch64 then
+    if stdenv.isAarch32 || stdenv.isAarch64 then
       oraclejre10
     else if stdenv.isDarwin then
       jre10
@@ -9247,7 +9247,7 @@ with pkgs;
 
   cairo = callPackage ../development/libraries/cairo {
     glSupport = config.cairo.gl or (stdenv.isLinux &&
-      !stdenv.isArm && !stdenv.isMips);
+      !stdenv.isAarch32 && !stdenv.isMips);
   };
 
 

From 184cb1e8c6ac5b226d29f14c5452e9dbafc2792f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 10:01:40 -0700
Subject: [PATCH 0424/3370] soapysdr+plugins: init at 0.6.1

---
 .../applications/misc/soapyairspy/default.nix | 30 +++++++++++
 .../misc/soapybladerf/default.nix             | 31 ++++++++++++
 .../applications/misc/soapyhackrf/default.nix | 30 +++++++++++
 .../applications/misc/soapyremote/default.nix | 28 +++++++++++
 pkgs/applications/misc/soapysdr/default.nix   | 50 +++++++++++++++++++
 pkgs/applications/misc/soapyuhd/default.nix   | 34 +++++++++++++
 pkgs/top-level/all-packages.nix               | 23 +++++++++
 7 files changed, 226 insertions(+)
 create mode 100644 pkgs/applications/misc/soapyairspy/default.nix
 create mode 100644 pkgs/applications/misc/soapybladerf/default.nix
 create mode 100644 pkgs/applications/misc/soapyhackrf/default.nix
 create mode 100644 pkgs/applications/misc/soapyremote/default.nix
 create mode 100644 pkgs/applications/misc/soapysdr/default.nix
 create mode 100644 pkgs/applications/misc/soapyuhd/default.nix

diff --git a/pkgs/applications/misc/soapyairspy/default.nix b/pkgs/applications/misc/soapyairspy/default.nix
new file mode 100644
index 000000000000..af72c784135d
--- /dev/null
+++ b/pkgs/applications/misc/soapyairspy/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake
+, airspy, soapysdr
+} :
+
+let
+  version = "0.1.1";
+
+in stdenv.mkDerivation {
+  name = "soapyairspy-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyAirspy";
+    rev = "soapy-airspy-${version}";
+    sha256 = "072vc9619s9f22k7639krr1p2418cmhgm44yhzy7x9dzapc43wvk";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ airspy soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyAirspy;
+    description = "SoapySDR plugin for Airspy devices";
+    license = licenses.mit;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/soapybladerf/default.nix b/pkgs/applications/misc/soapybladerf/default.nix
new file mode 100644
index 000000000000..4e1adc32946e
--- /dev/null
+++ b/pkgs/applications/misc/soapybladerf/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, libbladeRF, soapysdr
+} :
+
+let
+  version = "0.3.5";
+
+in stdenv.mkDerivation {
+  name = "soapybladerf-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyBladeRF";
+    rev = "soapy-bladerf-${version}";
+    sha256 = "1n7vy6y8k1smq3l729npxbhxbnrc79gz06dxkibsihz4k8sddkrg";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libbladeRF soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyBladeRF;
+    description = "SoapySDR plugin for BladeRF devices";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix
new file mode 100644
index 000000000000..f5543af9c60b
--- /dev/null
+++ b/pkgs/applications/misc/soapyhackrf/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, hackrf, soapysdr
+} :
+
+let
+  version = "0.3.2";
+
+in stdenv.mkDerivation {
+  name = "soapyhackrf-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyHackRF";
+    rev = "soapy-hackrf-${version}";
+    sha256 = "1sgx2nk8yrzfwisjfs9mw0xwc47bckzi17p42s2pbv7zcxzpb66p";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ hackrf soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyHackRF;
+    description = "SoapySDR plugin for HackRF devices";
+    license = licenses.mit;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/soapyremote/default.nix b/pkgs/applications/misc/soapyremote/default.nix
new file mode 100644
index 000000000000..d10b09f99a8d
--- /dev/null
+++ b/pkgs/applications/misc/soapyremote/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, soapysdr }:
+
+let
+  version = "0.4.3";
+
+in stdenv.mkDerivation {
+  name = "soapyremote-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyRemote";
+    rev = "d07f43863b1ef79252f8029cfb5947220f21311d";
+    sha256 = "0i101dfqq0aawybv0qyjgsnhk39dc4q6z6ys2gsvwjhpf3d48aw0";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyRemote;
+    description = "SoapySDR plugin for remote access to SDRs";
+    license = licenses.boost;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/misc/soapysdr/default.nix b/pkgs/applications/misc/soapysdr/default.nix
new file mode 100644
index 000000000000..6230f2f6f6a6
--- /dev/null
+++ b/pkgs/applications/misc/soapysdr/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, lib, lndir, makeWrapper
+, fetchFromGitHub, cmake
+, libusb, pkgconfig
+, python, swig2, numpy, ncurses
+, extraPackages ? []
+} :
+
+let
+  version = "0.6.1";
+
+in stdenv.mkDerivation {
+  name = "soapysdr-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapySDR";
+    rev = "soapy-sdr-${version}";
+    sha256 = "1azbb2j6dv0b2dd5ks6yqd31j17sdhi9p82czwc8zy2isymax0l9";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libusb ncurses numpy swig2 python ];
+
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DUSE_PYTHON_CONFIG=ON"
+  ];
+
+  postFixup = lib.optionalString (lib.length extraPackages != 0) ''
+    # Join all plugins via symlinking
+    for i in ${toString extraPackages}; do
+      ${lndir}/bin/lndir -silent $i $out
+    done
+
+    # Needed for at least the remote plugin server
+    for file in out/bin/*; do
+        ${makeWrapper}/bin/wrapProgram "$file" \
+            --prefix SOAPY_SDR_PLUGIN_PATH : ${lib.makeSearchPath "lib/SoapySDR/modules0.6" extraPackages}
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapySDR;
+    description = "Vendor and platform neutral SDR support library";
+    license = licenses.boost;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/applications/misc/soapyuhd/default.nix b/pkgs/applications/misc/soapyuhd/default.nix
new file mode 100644
index 000000000000..4f2a79c97fe2
--- /dev/null
+++ b/pkgs/applications/misc/soapyuhd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, uhd, boost, soapysdr
+} :
+
+let
+  version = "0.3.4";
+
+in stdenv.mkDerivation {
+  name = "soapyuhd-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pothosware";
+    repo = "SoapyUHD";
+    rev = "soapy-uhd-${version}";
+    sha256 = "1da7cjcvfdqhgznm7x14s1h7lwz5lan1b48akw445ah1vxwvh4hl";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ uhd boost soapysdr ];
+
+  cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ];
+
+  postPatch = ''
+    sed -i "s:DESTINATION .*uhd/modules:DESTINATION $out/lib/uhd/modules:" CMakeLists.txt
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/pothosware/SoapyAirspy;
+    description = "SoapySDR plugin for UHD devices";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5e8b16e017c..b93998838234 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11464,6 +11464,29 @@ with pkgs;
 
   snappy = callPackage ../development/libraries/snappy { };
 
+  soapyairspy = callPackage ../applications/misc/soapyairspy { };
+
+  soapybladerf = callPackage ../applications/misc/soapybladerf { };
+
+  soapyhackrf = callPackage ../applications/misc/soapyhackrf { };
+
+  soapysdr = callPackage ../applications/misc/soapysdr { inherit (python3Packages) python numpy; };
+
+  soapyremote = callPackage ../applications/misc/soapyremote { };
+
+  soapysdr-with-plugins = callPackage ../applications/misc/soapysdr {
+    inherit (python3Packages) python numpy;
+    extraPackages = [
+      soapyairspy
+      soapybladerf
+      soapyhackrf
+      soapyremote
+      soapyuhd
+    ];
+  };
+
+  soapyuhd = callPackage ../applications/misc/soapyuhd { };
+
   socket_wrapper = callPackage ../development/libraries/socket_wrapper { };
 
   sofia_sip = callPackage ../development/libraries/sofia-sip { };

From e0d33717282a3fba85840c01ae8ac485832fed93 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 11:54:41 -0700
Subject: [PATCH 0425/3370] limesuite: init at 18.04.1

---
 pkgs/applications/misc/limesuite/default.nix | 55 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  3 ++
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/misc/limesuite/default.nix

diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
new file mode 100644
index 000000000000..e166c7a6b516
--- /dev/null
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchFromGitHub, cmake
+, sqlite, wxGTK30, libusb1, soapysdr
+, mesa_glu, libX11, gnuplot, fltk
+} :
+
+let
+  version = "18.04.1";
+
+in stdenv.mkDerivation {
+  name = "limesuite-${version}";
+
+  src = fetchFromGitHub {
+    owner = "myriadrf";
+    repo = "LimeSuite";
+    rev = "v${version}";
+    sha256 = "1aaqnwif1j045hvj011k5dyqxgxx72h33r4al74h5f8al81zvzj9";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [
+    libusb1
+    sqlite
+    wxGTK30
+    fltk
+    gnuplot
+    libusb1
+    soapysdr
+    mesa_glu
+    libX11
+  ];
+
+  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
+
+  postInstall = ''
+    mkdir -p $out/lib/udev/rules.d
+    cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d
+
+    mkdir -p $out/share/limesuite
+    cp bin/Release/lms7suite_mcu/* $out/share/limesuite
+
+    cp bin/dualRXTX $out/bin
+    cp bin/basicRX $out/bin
+    cp bin/singleRX $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Driver and GUI for LMS7002M-based SDR platforms";
+    homepage = https://github.com/myriadrf/LimeSuite;
+    license = licenses.apache2;
+    maintainers = with maintainers; [ markuskowa ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b93998838234..1b6135c4dbcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3513,6 +3513,8 @@ with pkgs;
 
   libwebsockets = callPackage ../development/libraries/libwebsockets { };
 
+  limesuite = callPackage ../applications/misc/limesuite { };
+
   limesurvey = callPackage ../servers/limesurvey { };
 
   linuxquota = callPackage ../tools/misc/linuxquota { };
@@ -11477,6 +11479,7 @@ with pkgs;
   soapysdr-with-plugins = callPackage ../applications/misc/soapysdr {
     inherit (python3Packages) python numpy;
     extraPackages = [
+      limesuite
       soapyairspy
       soapybladerf
       soapyhackrf

From 7ba275410139c664354557f152ff8739631f498e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 11:58:50 -0700
Subject: [PATCH 0426/3370] welle-io: add soapysdr support

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

diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
index d705de1a8cd6..b3a9a3f3b86b 100644
--- a/pkgs/applications/misc/welle-io/default.nix
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildEnv, fetchFromGitHub, cmake, pkgconfig
 , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2
-, faad2, rtl-sdr, libusb, fftwSinglePrec }:
+, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec }:
 let
 
   version = "1.0-rc2";
@@ -28,10 +28,11 @@ in stdenv.mkDerivation {
     qtquickcontrols
     qtquickcontrols2
     rtl-sdr
+    soapysdr-with-plugins
   ];
 
   cmakeFlags = [
-    "-DRTLSDR=true"
+    "-DRTLSDR=true" "-DSOAPYSDR=true"
   ];
 
   enableParallelBuilding = true;

From b9acfb4ecfbbdac123fed170f5b2806fe4e846d0 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 22:41:06 -0400
Subject: [PATCH 0427/3370] treewide: isArm -> isAarch32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Following legacy packing conventions, `isArm` was defined just for
32-bit ARM instruction set. This is confusing to non packagers though,
because Aarch64 is an ARM instruction set.

The official ARM overview for ARMv8[1] is surprisingly not confusing,
given the overall state of affairs for ARM naming conventions, and
offers us a solution. It divides the nomenclature into three levels:

```
ISA:             ARMv8   {-A, -R, -M}
                 /    \
Mode:     Aarch32     Aarch64
             |         /   \
Encoding:   A64      A32   T32
```

At the top is the overall v8 instruction set archicture. Second are the
two modes, defined by bitwidth but differing in other semantics too, and
buttom are the encodings, (hopefully?) isomorphic if they encode the
same mode.

The 32 bit encodings are mostly backwards compatible with previous
non-Thumb and Thumb encodings, and if so we can pun the mode names to
instead mean "sets of compatable or isomorphic encodings", and then
voilà we have nice names for 32-bit and 64-bit arm instruction sets
which do not use the word ARM so as to not confused either laymen or
experienced ARM packages.

[1]: https://developer.arm.com/products/architecture/a-profile

(cherry picked from commit ba52ae50488de85a9cf60a3a04f1c9ca7122ec74)
---
 lib/systems/doubles.nix                          |  2 +-
 lib/systems/for-meta.nix                         |  2 +-
 lib/systems/inspect.nix                          |  7 +++++--
 lib/systems/parse.nix                            |  2 +-
 nixos/lib/qemu-flags.nix                         |  2 +-
 nixos/modules/config/gnu.nix                     |  4 ++--
 pkgs/applications/audio/sunvox/default.nix       |  2 +-
 .../instant-messengers/toxic/default.nix         |  2 +-
 .../applications/virtualization/qemu/default.nix |  6 +++---
 pkgs/build-support/bintools-wrapper/default.nix  |  4 ++--
 pkgs/development/compilers/gcc/4.5/default.nix   |  2 +-
 pkgs/development/compilers/gcc/4.8/default.nix   |  2 +-
 pkgs/development/compilers/gcc/4.9/default.nix   |  2 +-
 pkgs/development/compilers/gcc/5/default.nix     |  2 +-
 pkgs/development/compilers/gcc/6/default.nix     |  2 +-
 pkgs/development/compilers/gcc/7/default.nix     |  2 +-
 .../compilers/gcc/snapshot/default.nix           |  2 +-
 pkgs/development/compilers/ghc/7.10.3-binary.nix |  2 +-
 pkgs/development/compilers/ghc/8.2.1-binary.nix  |  2 +-
 pkgs/development/compilers/ghc/8.2.2.nix         |  6 +++---
 pkgs/development/compilers/ghc/8.4.1.nix         |  4 ++--
 pkgs/development/compilers/ghc/head.nix          |  4 ++--
 pkgs/development/compilers/go/1.10.nix           |  4 ++--
 pkgs/development/compilers/go/1.4.nix            |  2 +-
 pkgs/development/compilers/go/1.9.nix            |  4 ++--
 pkgs/development/compilers/ocaml/3.12.1.nix      |  2 +-
 pkgs/development/compilers/ocaml/4.00.1.nix      |  2 +-
 pkgs/development/compilers/ocaml/generic.nix     |  4 ++--
 pkgs/development/compilers/sbcl/bootstrap.nix    |  2 +-
 pkgs/development/compilers/sbcl/default.nix      |  2 +-
 .../haskell-modules/configuration-common.nix     | 10 +++++-----
 .../haskell-modules/generic-builder.nix          |  2 +-
 pkgs/development/interpreters/perl/default.nix   |  2 +-
 .../interpreters/picolisp/default.nix            |  2 +-
 .../interpreters/spidermonkey/1.8.5.nix          |  8 ++++----
 pkgs/development/libraries/ffmpeg/generic.nix    | 14 +++++++-------
 pkgs/development/libraries/freetype/default.nix  |  2 +-
 pkgs/development/libraries/glibc/common-2.27.nix |  2 +-
 pkgs/development/libraries/glibc/common.nix      |  2 +-
 pkgs/development/libraries/gmp/5.1.x.nix         |  2 +-
 pkgs/development/libraries/gmp/6.x.nix           |  2 +-
 pkgs/development/libraries/gnu-efi/default.nix   |  2 +-
 pkgs/development/libraries/icu/base.nix          |  2 +-
 pkgs/development/libraries/jemalloc/default.nix  |  2 +-
 pkgs/development/libraries/libdrm/default.nix    |  2 +-
 .../development/libraries/libtoxcore/default.nix |  2 +-
 .../development/libraries/libtoxcore/new-api.nix |  4 ++--
 pkgs/development/libraries/libvpx/default.nix    |  2 +-
 pkgs/development/libraries/libvpx/git.nix        |  4 ++--
 pkgs/development/libraries/mesa/default.nix      |  6 +++---
 pkgs/development/libraries/pixman/default.nix    |  2 +-
 pkgs/development/libraries/pth/default.nix       |  2 +-
 pkgs/development/libraries/v8/3.16.14.nix        |  4 ++--
 pkgs/development/libraries/v8/6_x.nix            |  2 +-
 pkgs/development/libraries/v8/default.nix        |  2 +-
 .../webrtc-audio-processing/default.nix          |  2 +-
 .../python-modules/Cython/default.nix            |  2 +-
 pkgs/development/tools/misc/binutils/2.30.nix    |  2 +-
 pkgs/development/tools/misc/binutils/default.nix |  2 +-
 pkgs/os-specific/linux/kbd/default.nix           |  2 +-
 pkgs/os-specific/linux/kernel/common-config.nix  |  2 +-
 pkgs/os-specific/linux/systemd/default.nix       |  2 +-
 pkgs/os-specific/linux/uclibc/default.nix        |  2 +-
 pkgs/servers/sql/mariadb/default.nix             |  2 +-
 pkgs/stdenv/generic/default.nix                  |  2 +-
 pkgs/tools/networking/cjdns/default.nix          |  2 +-
 pkgs/tools/networking/filegive/default.nix       |  2 +-
 pkgs/tools/system/storebrowse/default.nix        |  2 +-
 pkgs/top-level/all-packages.nix                  | 16 ++++++++--------
 69 files changed, 109 insertions(+), 106 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 012a1786a3cc..c6618083ce72 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -26,7 +26,7 @@ in rec {
 
   none = [];
 
-  arm     = filterDoubles predicates.isArm;
+  arm     = filterDoubles predicates.isAarch32;
   aarch64 = filterDoubles predicates.isAarch64;
   x86     = filterDoubles predicates.isx86;
   i686    = filterDoubles predicates.isi686;
diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index fa713b1e6136..68c68c2cd369 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -7,7 +7,7 @@ in rec {
   inherit (lib.systems.doubles) all mesaPlatforms;
   none = [];
 
-  arm     = [ patterns.isArm ];
+  arm     = [ patterns.isAarch32 ];
   aarch64 = [ patterns.isAarch64 ];
   x86     = [ patterns.isx86 ];
   i686    = [ patterns.isi686 ];
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index a7bd17f68a45..91ae2cd2557e 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -9,8 +9,8 @@ rec {
     isx86_64       = { cpu = cpuTypes.x86_64; };
     isPowerPC      = { cpu = cpuTypes.powerpc; };
     isx86          = { cpu = { family = "x86"; }; };
-    isArm          = { cpu = { family = "arm"; }; };
-    isAarch64      = { cpu = { family = "aarch64"; }; };
+    isAarch32      = { cpu = { family = "arm"; bits = 32; }; };
+    isAarch64      = { cpu = { family = "arm"; bits = 64; }; };
     isMips         = { cpu = { family = "mips"; }; };
     isRiscV        = { cpu = { family = "riscv"; }; };
     isWasm         = { cpu = { family = "wasm"; }; };
@@ -43,6 +43,9 @@ rec {
                        [ "x86" "arm" "aarch64" ];
     isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
                         [ "x86" "arm" "aarch64" "mips" ];
+
+    # Deprecated after 18.03
+    isArm = isAarch32;
   };
 
   matchAnyAttrs = patterns:
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 03d052f5f192..8a6c951d5e5e 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -72,7 +72,7 @@ rec {
     armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    aarch64  = { bits = 64; significantByte = littleEndian; family = "aarch64"; };
+    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
     mips     = { bits = 32; significantByte = bigEndian;    family = "mips"; };
diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index fcdcbf1b0077..e4c95ebdfb0d 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
@@ -9,7 +9,7 @@
     ];
 
   qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0"
-        else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0"
+        else if pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64 then "ttyAMA0"
         else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";
 
   qemuBinary = qemuPkg: {
diff --git a/nixos/modules/config/gnu.nix b/nixos/modules/config/gnu.nix
index ef48ccb7b4fe..93d130970190 100644
--- a/nixos/modules/config/gnu.nix
+++ b/nixos/modules/config/gnu.nix
@@ -26,11 +26,11 @@ with lib;
         nano zile
         texinfo # for the stand-alone Info reader
       ]
-      ++ stdenv.lib.optional (!stdenv.isArm) grub2;
+      ++ stdenv.lib.optional (!stdenv.isAarch32) grub2;
 
 
     # GNU GRUB, where available.
-    boot.loader.grub.enable = !pkgs.stdenv.isArm;
+    boot.loader.grub.enable = !pkgs.stdenv.isAarch32;
     boot.loader.grub.version = 2;
 
     # GNU lsh.
diff --git a/pkgs/applications/audio/sunvox/default.nix b/pkgs/applications/audio/sunvox/default.nix
index ccbceddefd2f..47b0bf2e736c 100644
--- a/pkgs/applications/audio/sunvox/default.nix
+++ b/pkgs/applications/audio/sunvox/default.nix
@@ -5,7 +5,7 @@ let
   arch =
     if stdenv.isAarch64
     then "arm64"
-    else if stdenv.isArm
+    else if stdenv.isAarch32
     then "arm_armhf_raspberry_pi"
     else if stdenv.is64bit
     then "x86_64"
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index e2e25be49f23..4934a7374058 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
-  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
     openal libopus libvpx freealut libqrencode
   ];
   nativeBuildInputs = [ pkgconfig libconfig ];
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 00303be12da2..c3d8d05eea98 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -4,7 +4,7 @@
 , makeWrapper
 , attr, libcap, libcap_ng
 , CoreServices, Cocoa, rez, setfile
-, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl
+, numaSupport ? stdenv.isLinux && !stdenv.isAarch32, numactl
 , seccompSupport ? stdenv.isLinux, libseccomp
 , pulseSupport ? !stdenv.isDarwin, libpulseaudio
 , sdlSupport ? !stdenv.isDarwin, SDL
@@ -26,7 +26,7 @@ let
 
   hostCpuTargets = if stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu"
                    else if stdenv.isi686 then "i386-softmmu"
-                   else if stdenv.isArm then "arm-softmmu"
+                   else if stdenv.isAarch32 then "arm-softmmu"
                    else if stdenv.isAarch64 then "aarch64-softmmu"
                    else throw "Don't know how to build a 'hostCpuOnly = true' QEMU";
 in
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
   postInstall =
     if stdenv.isx86_64       then ''makeWrapper $out/bin/qemu-system-x86_64  $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else if stdenv.isi686    then ''makeWrapper $out/bin/qemu-system-i386    $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
-    else if stdenv.isArm     then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+    else if stdenv.isAarch32     then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else "";
 
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 8e94ccfa49bc..a5084808c3bc 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -55,7 +55,7 @@ let
     else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
     else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
     # ARM with a wildcard, which can be "" or "-armhf".
-    else if (with targetPlatform; isArm && isLinux)   then "${libc_lib}/lib/ld-linux*.so.3"
+    else if (with targetPlatform; isAarch32 && isLinux)   then "${libc_lib}/lib/ld-linux*.so.3"
     else if targetPlatform.system == "aarch64-linux"  then "${libc_lib}/lib/ld-linux-aarch64.so.1"
     else if targetPlatform.system == "powerpc-linux"  then "${libc_lib}/lib/ld.so.1"
     else if targetPlatform.isMips                     then "${libc_lib}/lib/ld.so.1"
@@ -174,7 +174,7 @@ stdenv.mkDerivation {
     sep = optionalString (!targetPlatform.isMips) "-";
     arch =
       /**/ if targetPlatform.isAarch64 then endianPrefix + "aarch64"
-      else if targetPlatform.isArm     then endianPrefix + "arm"
+      else if targetPlatform.isAarch32     then endianPrefix + "arm"
       else if targetPlatform.isx86_64  then "x86-64"
       else if targetPlatform.isi686    then "i386"
       else if targetPlatform.isMips    then {
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index c63867a1d2db..8cee08c09261 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -258,7 +258,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 36adfd075df2..c798a67de840 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -300,7 +300,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index c436da678fd9..c729bbeb66f9 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -309,7 +309,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index b9ca8696d4e3..f2a091e34dc9 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -329,7 +329,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index df0c1578daed..3de5b4dd2702 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -333,7 +333,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e8997b1efb06..888e455488ca 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -329,7 +329,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index c1306d374d5d..3c98b7a58f76 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -301,7 +301,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix
index c56798e31ae4..cb9f78aa0813 100644
--- a/pkgs/development/compilers/ghc/7.10.3-binary.nix
+++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isArm [ llvm_35 ];
+  buildInputs = stdenv.lib.optionals stdenv.targetPlatform.isAarch32 [ llvm_35 ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix
index 8a08ab4b9862..c0bc2a9dd736 100644
--- a/pkgs/development/compilers/ghc/8.2.1-binary.nix
+++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     or (throw "cannot bootstrap GHC on this platform"));
 
   nativeBuildInputs = [ perl ];
-  buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isArm || stdenv.targetPlatform.isAarch64) [ llvm_39 ];
+  buildInputs = stdenv.lib.optionals (stdenv.targetPlatform.isAarch32 || stdenv.targetPlatform.isAarch64) [ llvm_39 ];
 
   # Cannot patchelf beforehand due to relative RPATHs that anticipate
   # the final install location/
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 1c3f260da1c1..b2a1aafe6131 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -25,7 +25,7 @@
   enableShared ?
     !(targetPlatform.isDarwin
       # On iOS, dynamic linking is not supported
-      && (targetPlatform.isAarch64 || targetPlatform.isArm))
+      && (targetPlatform.isAarch64 || targetPlatform.isAarch32))
 , # Whether to backport https://phabricator.haskell.org/D4388 for
   # deterministic profiling symbol names, at the cost of a slightly
   # non-standard GHC API
@@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isArm) [
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix
index 8f7cdc9568e4..f232e0b47287 100644
--- a/pkgs/development/compilers/ghc/8.4.1.nix
+++ b/pkgs/development/compilers/ghc/8.4.1.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -135,7 +135,7 @@ stdenv.mkDerivation rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isArm) [
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index bc3ccbdcdf51..51497e0d9cee 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
     export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
     # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isArm ".gold"}"
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
     export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
     export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
     export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isArm) [
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
     "CFLAGS=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
     "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 145f6a17978d..b22bfb2bd101 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   '' + optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
-  '' + optionalString stdenv.isArm ''
+  '' + optionalString stdenv.isAarch32 ''
     sed -i '/TestCurrent/areturn' src/os/user/user_test.go
     echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
   '' + optionalString stdenv.isDarwin ''
@@ -131,7 +131,7 @@ stdenv.mkDerivation rec {
   GOARCH = if stdenv.isDarwin then "amd64"
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.isArm then "arm"
+           else if stdenv.isAarch32 then "arm"
            else if stdenv.isAarch64 then "arm64"
            else throw "Unsupported system";
   GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index b8c283fef07e..32eb0d98d188 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
   GOARCH = if stdenv.isDarwin then "amd64"
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.isArm then "arm"
+           else if stdenv.isAarch32 then "arm"
            else throw "Unsupported system";
   GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
   GO386 = 387; # from Arch: don't assume sse2 on i686
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix
index c866212170c4..955d9029d388 100644
--- a/pkgs/development/compilers/go/1.9.nix
+++ b/pkgs/development/compilers/go/1.9.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   '' + optionalString stdenv.isLinux ''
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
-  '' + optionalString stdenv.isArm ''
+  '' + optionalString stdenv.isAarch32 ''
     sed -i '/TestCurrent/areturn' src/os/user/user_test.go
     echo '#!${stdenv.shell}' > misc/cgo/testplugin/test.bash
   '' + optionalString stdenv.isDarwin ''
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
   GOARCH = if stdenv.isDarwin then "amd64"
            else if stdenv.system == "i686-linux" then "386"
            else if stdenv.system == "x86_64-linux" then "amd64"
-           else if stdenv.isArm then "arm"
+           else if stdenv.isAarch32 then "arm"
            else if stdenv.isAarch64 then "arm64"
            else throw "Unsupported system";
   GOARM = optionalString (stdenv.system == "armv5tel-linux") "5";
diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix
index c69554e633a9..8cfe2bb7bcfe 100644
--- a/pkgs/development/compilers/ocaml/3.12.1.nix
+++ b/pkgs/development/compilers/ocaml/3.12.1.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, xlibsWrapper }:
 
 let
-   useX11 = !stdenv.isArm && !stdenv.isMips;
+   useX11 = !stdenv.isAarch32 && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
 in
diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix
index 648ef0d91f9e..8bad5494e8b9 100644
--- a/pkgs/development/compilers/ocaml/4.00.1.nix
+++ b/pkgs/development/compilers/ocaml/4.00.1.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, xlibsWrapper }:
 
 let
-   useX11 = !stdenv.isArm && !stdenv.isMips;
+   useX11 = !stdenv.isAarch32 && !stdenv.isMips;
    useNativeCompilers = !stdenv.isMips;
    inherit (stdenv.lib) optionals optionalString;
 in
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 03ae6e518d0b..54e9ae671af5 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -7,7 +7,7 @@ let
   real_url = if url == null then
     "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz"
   else url;
-  safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips);
+  safeX11 = stdenv: !(stdenv.isAarch32 || stdenv.isMips);
 in
 
 { stdenv, fetchurl, ncurses, buildEnv
@@ -15,7 +15,7 @@ in
 , flambdaSupport ? false
 }:
 
-assert useX11 -> !stdenv.isArm && !stdenv.isMips;
+assert useX11 -> !stdenv.isAarch32 && !stdenv.isMips;
 assert flambdaSupport -> stdenv.lib.versionAtLeast version "4.03";
 
 let
diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix
index 707f7966dd9b..529123398a57 100644
--- a/pkgs/development/compilers/sbcl/bootstrap.nix
+++ b/pkgs/development/compilers/sbcl/bootstrap.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
       --add-flags "--core $out/share/sbcl/sbcl.core"
   '';
 
-  postFixup = stdenv.lib.optionalString (!stdenv.isArm && stdenv.isLinux) ''
+  postFixup = stdenv.lib.optionalString (!stdenv.isAarch32 && stdenv.isLinux) ''
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $out/share/sbcl/sbcl
   '';
 
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 39b84ae6a365..8006648a7dc3 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
                (setf features (remove x features))))
     ''
     + (if threadSupport then "(enable :sb-thread)" else "(disable :sb-thread)")
-    + stdenv.lib.optionalString stdenv.isArm "(enable :arm)"
+    + stdenv.lib.optionalString stdenv.isAarch32 "(enable :arm)"
     + ''
       )) " > customize-target-features.lisp
 
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 08443de111dd..6d95805ddb62 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -937,11 +937,11 @@ self: super: {
   JuicyPixels = dontHaddock super.JuicyPixels;
 
   # armv7l fixes.
-  happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
-  hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
-  servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs;
-  servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger;
-  swagger2 = if pkgs.stdenv.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2;
+  happy = if pkgs.stdenv.isAarch32 then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
+  hashable = if pkgs.stdenv.isAarch32 then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95
+  servant-docs = if pkgs.stdenv.isAarch32 then dontCheck super.servant-docs else super.servant-docs;
+  servant-swagger = if pkgs.stdenv.isAarch32 then dontCheck super.servant-swagger else super.servant-swagger;
+  swagger2 = if pkgs.stdenv.isAarch32 then dontHaddock (dontCheck super.swagger2) else super.swagger2;
 
   # Tries to read a file it is not allowed to in the test suite
   load-env = dontCheck super.load-env;
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a29056d965ac..01e2eef58cba 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -133,7 +133,7 @@ let
     (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
     (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES")
     (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
-    (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
+    (enableFeature (enableDeadCodeElimination && !hostPlatform.isAarch32 && !hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
     (enableFeature enableLibraryProfiling "library-profiling")
     (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling"))
     (enableFeature enableSharedLibraries "shared")
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index f7324fc6d01a..b3381c1dd8fe 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -82,7 +82,7 @@ let
 
     preConfigure = optionalString (!crossCompiling) ''
         configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-      '' + optionalString (stdenv.isArm || stdenv.isMips) ''
+      '' + optionalString (stdenv.isAarch32 || stdenv.isMips) ''
         configureFlagsArray=(-Dldflags="-lm -lrt")
       '' + optionalString stdenv.isDarwin ''
         substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 4618d0da9dd3..6f7f2df96bff 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1k3x6mvk9b34iiyml142bzh3gf241f25ywjlaagbxzb9vklpws75";
   };
   buildInputs = optional stdenv.is64bit jdk;
-  patchPhase = optionalString stdenv.isArm ''
+  patchPhase = optionalString stdenv.isAarch32 ''
     sed -i s/-m32//g Makefile
     cat >>Makefile <<EOF
     ext.o: ext.c
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
index 9a14beb856b6..8e51b9b7d58e 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ nspr ];
 
-  nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isArm autoconf213;
+  nativeBuildInputs = [ pkgconfig ] ++ lib.optional stdenv.isAarch32 autoconf213;
   buildInputs = [ perl python2 zip ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
     export LIBXUL_DIST=$out
-    ${lib.optionalString stdenv.isArm "autoreconf --verbose --force"}
+    ${lib.optionalString stdenv.isAarch32 "autoreconf --verbose --force"}
   '';
 
   patches = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       url = "https://anonscm.debian.org/cgit/collab-maint/mozjs.git/plain/debian/patches/fix-811665.patch?id=00b15c7841968ab4f7fec409a6b93fa5e1e1d32e";
       sha256 = "1q8477xqxiy5d8376k5902l45gd0qkd4nxmhl8vr6rr1pxfcny99";
     })
-  ] ++ stdenv.lib.optionals stdenv.isArm [
+  ] ++ stdenv.lib.optionals stdenv.isAarch32 [
     # Explained below in configureFlags for ARM
     ./1.8.5-findvanilla.patch
     # Fix for hard float flags.
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   # hack around a make problem, see https://github.com/NixOS/nixpkgs/issues/1279#issuecomment-29547393
   preBuild = ''
     touch -- {.,shell,jsapi-tests}/{-lpthread,-ldl}
-    ${if stdenv.isArm then "rm -r jit-test/tests/jaeger/bug563000" else ""}
+    ${if stdenv.isAarch32 then "rm -r jit-test/tests/jaeger/bug563000" else ""}
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 985f328a22dd..4a05eab87bd7 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -7,8 +7,8 @@
 # Build options
 , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
 , multithreadBuild ? true # Multithreading via pthreads/win32 threads
-, sdlSupport ? !stdenv.isArm, SDL ? null, SDL2 ? null
-, vdpauSupport ? !stdenv.isArm, libvdpau ? null
+, sdlSupport ? !stdenv.isAarch32, SDL ? null, SDL2 ? null
+, vdpauSupport ? !stdenv.isAarch32, libvdpau ? null
 # Developer options
 , debugDeveloper ? false
 , optimizationsDeveloper ? true
@@ -42,7 +42,7 @@
  */
 
 let
-  inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isArm;
+  inherit (stdenv) icCygwin isDarwin isFreeBSD isLinux isAarch32;
   inherit (stdenv.lib) optional optionals enableFeature;
 
   cmpVer = builtins.compareVersions;
@@ -55,9 +55,9 @@ let
   verFix = withoutFix: fixVer: withFix: if reqMatch fixVer then withFix else withoutFix;
 
   # Disable dependency that needs fixes before it will work on Darwin or Arm
-  disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isArm) && reqMin minVer) then fixArg else origArg;
+  disDarwinOrArmFix = origArg: minVer: fixArg: if ((isDarwin || isAarch32) && reqMin minVer) then fixArg else origArg;
 
-  vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm);
+  vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isAarch32);
 in
 
 assert openglSupport -> libGLU_combined != null;
@@ -153,8 +153,8 @@ stdenv.mkDerivation rec {
     bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
     libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
   ] ++ optional openglSupport libGLU_combined
-    ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
-    ++ optional ((isLinux || isFreeBSD) && !isArm) libva
+    ++ optionals (!isDarwin && !isAarch32) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
+    ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva
     ++ optional isLinux alsaLib
     ++ optionals isDarwin darwinFrameworks
     ++ optional vdpauSupport libvdpau
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 8f16f85cabf7..be4da5a035b0 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -59,7 +59,7 @@ in stdenv.mkDerivation {
   configureFlags = [ "--disable-static" "--bindir=$(dev)/bin" ];
 
   # The asm for armel is written with the 'asm' keyword.
-  CFLAGS = optionalString stdenv.isArm "-std=gnu99";
+  CFLAGS = optionalString stdenv.isAarch32 "-std=gnu99";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix
index 6c443ebbb932..272e18905c13 100644
--- a/pkgs/development/libraries/glibc/common-2.27.nix
+++ b/pkgs/development/libraries/glibc/common-2.27.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation ({
       (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
     ] ++ lib.optionals (cross != null) [
       "--with-__thread"
-    ] ++ lib.optionals (cross == null && stdenv.isArm) [
+    ] ++ lib.optionals (cross == null && stdenv.isAarch32) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
 
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index d40733adf874..5179ce4a9a88 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation ({
       (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
     ] ++ lib.optionals (cross != null) [
       "--with-__thread"
-    ] ++ lib.optionals (cross == null && stdenv.isArm) [
+    ] ++ lib.optionals (cross == null && stdenv.isAarch32) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
 
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index b65a8ee5fc1c..57204776decd 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -37,7 +37,7 @@ let self = stdenv.mkDerivation rec {
   # The config.guess in GMP tries to runtime-detect various
   # ARM optimization flags via /proc/cpuinfo (and is also
   # broken on multicore CPUs). Avoid this impurity.
-  preConfigure = optionalString stdenv.isArm ''
+  preConfigure = optionalString stdenv.isAarch32 ''
       configureFlagsArray+=("--build=$(./configfsf.guess)")
     '';
 
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 5973c89cef79..551e7e5e1f6b 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -38,7 +38,7 @@ let self = stdenv.mkDerivation rec {
   # The config.guess in GMP tries to runtime-detect various
   # ARM optimization flags via /proc/cpuinfo (and is also
   # broken on multicore CPUs). Avoid this impurity.
-  preConfigure = optionalString stdenv.isArm ''
+  preConfigure = optionalString stdenv.isAarch32 ''
       configureFlagsArray+=("--build=$(./configfsf.guess)")
     '';
 
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index a46abe3b4f7c..bb7c35ddc9c9 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     "AR=${stdenv.cc.targetPrefix}ar"
     "RANLIB=${stdenv.cc.targetPrefix}ranlib"
     "OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
-  ] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"
+  ] ++ stdenv.lib.optional stdenv.isAarch32 "ARCH=arm"
     ++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix
index 87551ee6ee03..ee868d371ce5 100644
--- a/pkgs/development/libraries/icu/base.nix
+++ b/pkgs/development/libraries/icu/base.nix
@@ -31,7 +31,7 @@ let
 
       # $(includedir) is different from $(prefix)/include due to multiple outputs
       sed -i -e 's|^\(CPPFLAGS = .*\) -I\$(prefix)/include|\1 -I$(includedir)|' config/Makefile.inc.in
-    '' + stdenv.lib.optionalString stdenv.isArm ''
+    '' + stdenv.lib.optionalString stdenv.isAarch32 ''
       # From https://archlinuxarm.org/packages/armv7h/icu/files/icudata-stdlibs.patch
       sed -e 's/LDFLAGSICUDT=-nodefaultlibs -nostdlib/LDFLAGSICUDT=/' -i config/mh-linux
     '';
diff --git a/pkgs/development/libraries/jemalloc/default.nix b/pkgs/development/libraries/jemalloc/default.nix
index 0882431cc15b..d4c9e0ff24a4 100644
--- a/pkgs/development/libraries/jemalloc/default.nix
+++ b/pkgs/development/libraries/jemalloc/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
                    # jemalloc is unable to correctly detect transparent hugepage support on
                    # ARM (https://github.com/jemalloc/jemalloc/issues/526), and the default
                    # kernel ARMv6/7 kernel does not enable it, so we explicitly disable support
-                   ++ stdenv.lib.optional stdenv.isArm "--disable-thp";
+                   ++ stdenv.lib.optional stdenv.isAarch32 "--disable-thp";
   doCheck = true;
 
   patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch {
diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index e5e1e2e7a399..45a71759d458 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     "echo : \\\${ac_cv_func_clock_gettime=\'yes\'} > config.cache";
 
   configureFlags = [ "--enable-install-test-programs" ]
-    ++ stdenv.lib.optionals (stdenv.isArm || stdenv.isAarch64)
+    ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
       [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
     ++ stdenv.lib.optional stdenv.isDarwin "-C";
 
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 16fca9ce3d39..9af8718dc5fe 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libsodium libmsgpack ncurses libconfig
-  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
     libopus
     libvpx
   ];
diff --git a/pkgs/development/libraries/libtoxcore/new-api.nix b/pkgs/development/libraries/libtoxcore/new-api.nix
index 8d0a467c82a8..785bc6f3c843 100644
--- a/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -33,11 +33,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [
     autoreconfHook libsodium ncurses check libconfig
-  ] ++ stdenv.lib.optionals (!stdenv.isArm) [
+  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
     libopus
   ];
 
-  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
+  propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isAarch32) [ libvpx ];
 
   # Some tests fail randomly due to timeout. This kind of problem is well known
   # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 1e96ff9bb1ad..272761cc6af3 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -41,7 +41,7 @@
 }:
 
 let
-  inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin;
+  inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
   inherit (stdenv.lib) enableFeature optional optionals;
 in
 
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index 824449a347af..a861428f0f72 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -43,11 +43,11 @@
 }:
 
 let
-  inherit (stdenv) isi686 isx86_64 isArm is64bit isMips isDarwin isCygwin;
+  inherit (stdenv) isi686 isx86_64 isAarch32 is64bit isMips isDarwin isCygwin;
   inherit (stdenv.lib) enableFeature optional optionals;
 in
 
-assert isi686 || isx86_64 || isArm || isMips; # Requires ARM with floating point support
+assert isi686 || isx86_64 || isAarch32 || isMips; # Requires ARM with floating point support
 
 assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport;
 assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport;
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 3f873022f7ac..675002168005 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -32,17 +32,17 @@ else
 
 let
   defaultGalliumDrivers =
-    if stdenv.isArm
+    if stdenv.isAarch32
     then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
     else if stdenv.isAarch64
     then ["nouveau" "vc4" ]
     else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
   defaultDriDrivers =
-    if (stdenv.isArm || stdenv.isAarch64)
+    if (stdenv.isAarch32 || stdenv.isAarch64)
     then ["nouveau"]
     else ["i915" "i965" "nouveau" "radeon" "r200"];
   defaultVulkanDrivers =
-    if (stdenv.isArm || stdenv.isAarch64)
+    if (stdenv.isAarch32 || stdenv.isAarch64)
     then []
     else ["intel"] ++ lib.optional enableRadv "radeon";
 in
diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 6b891bdb38c2..98d4c737ebd1 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional doCheck libpng;
 
-  configureFlags = stdenv.lib.optional stdenv.isArm "--disable-arm-iwmmxt";
+  configureFlags = stdenv.lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt";
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index b7b09caed9b3..6118d9c41d6f 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
   };
 
-  preConfigure = stdenv.lib.optionalString stdenv.isArm ''
+  preConfigure = stdenv.lib.optionalString stdenv.isAarch32 ''
     configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
   '';
 
diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix
index 73f5febb6685..e1a9336e3a56 100644
--- a/pkgs/development/libraries/v8/3.16.14.nix
+++ b/pkgs/development/libraries/v8/3.16.14.nix
@@ -3,10 +3,10 @@
 assert readline != null;
 
 let
-  arch = if stdenv.isArm
+  arch = if stdenv.isAarch32
     then (if stdenv.is64bit then "arm64" else "arm")
     else (if stdenv.is64bit then "x64" else "ia32");
-  armHardFloat = stdenv.isArm && (stdenv.platform.gcc.float or null) == "hard";
+  armHardFloat = stdenv.isAarch32 && (stdenv.platform.gcc.float or null) == "hard";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/libraries/v8/6_x.nix b/pkgs/development/libraries/v8/6_x.nix
index 4095ff20c2bc..adebedbf2ac1 100644
--- a/pkgs/development/libraries/v8/6_x.nix
+++ b/pkgs/development/libraries/v8/6_x.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  arch = if stdenv.isArm
+  arch = if stdenv.isAarch32
          then if stdenv.is64bit
               then"arm64"
               else "arm"
diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix
index 4d49fdce3a92..3246c23ab021 100644
--- a/pkgs/development/libraries/v8/default.nix
+++ b/pkgs/development/libraries/v8/default.nix
@@ -10,7 +10,7 @@ let
   arch = if stdenv.isx86_64 then "x64"
             else if stdenv.isi686 then "ia32"
             else if stdenv.isAarch64 then "arm64"
-            else if stdenv.isArm then "arm"
+            else if stdenv.isAarch32 then "arm"
             else throw "Unknown architecture for v8";
   git_url = "https://chromium.googlesource.com";
   clangFlag = if stdenv.isDarwin then "1" else "0";
diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix
index b5a3aed91d90..529091518eb6 100644
--- a/pkgs/development/libraries/webrtc-audio-processing/default.nix
+++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # Avoid this error:
   # signal_processing/filter_ar_fast_q12_armv7.S:88: Error: selected processor does not support `sbfx r11,r6,#12,#16' in ARM mode
-  patchPhase = stdenv.lib.optionalString stdenv.isArm ''
+  patchPhase = stdenv.lib.optionalString stdenv.isAarch32 ''
     substituteInPlace configure --replace 'armv7*|armv8*' 'disabled'
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1
diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 751e064ad706..ce63970495bc 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   # result is "3L" instead of "3", so let's fix it in-place.
   #
   # Upstream issue: https://github.com/cython/cython/issues/1548
-  postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) ''
+  postPatch = lib.optionalString ((stdenv.isi686 || stdenv.isAarch32) && !isPy3k) ''
     sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \
       tests/run/cpdef_enums.pyx
   '';
diff --git a/pkgs/development/tools/misc/binutils/2.30.nix b/pkgs/development/tools/misc/binutils/2.30.nix
index 830c07330524..2a8e6d88b934 100644
--- a/pkgs/development/tools/misc/binutils/2.30.nix
+++ b/pkgs/development/tools/misc/binutils/2.30.nix
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 05d0d21a179b..549eaf5253d3 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
   # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isArm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index d1e40371e370..bfade509fcac 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
       # We get a warning in armv5tel-linux and the fuloong2f, so we
       # disable -Werror in it.
-      ${stdenv.lib.optionalString (stdenv.isArm || stdenv.hostPlatform.isMips) ''
+      ${stdenv.lib.optionalString (stdenv.isAarch32 || stdenv.hostPlatform.isMips) ''
         sed -i s/-Werror// src/Makefile.am
       ''}
     '';
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5fbd9955c2a3..50f5999c557f 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -353,7 +353,7 @@ with stdenv.lib;
   SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default
   SECURITY_YAMA? y # Prevent processes from ptracing non-children processes
   DEVKMEM n # Disable /dev/kmem
-  ${optionalString (! stdenv.hostPlatform.isArm)
+  ${optionalString (! stdenv.hostPlatform.isAarch32)
     (if versionOlder version "3.14" then ''
         CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
       '' else ''
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index fc72728cbabe..5992c1ffa95b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -70,7 +70,7 @@ in stdenv.mkDerivation rec {
     "-Dsystem-gid-max=499"
     # "-Dtime-epoch=1"
 
-    (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
+    (if stdenv.isAarch32 || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true")
     "-Defi-libdir=${toString gnu-efi}/lib"
     "-Defi-includedir=${toString gnu-efi}/include/efi"
     "-Defi-ldsdir=${toString gnu-efi}/lib"
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index c4d2bf04d7a0..180aabc94cc6 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -43,7 +43,7 @@ let
     UCLIBC_SUSV4_LEGACY y
     UCLIBC_HAS_THREADS_NATIVE y
     KERNEL_HEADERS "${linuxHeaders}/include"
-  '' + stdenv.lib.optionalString (stdenv.isArm && cross == null) ''
+  '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) ''
     CONFIG_ARM_EABI y
     ARCH_WANTS_BIG_ENDIAN n
     ARCH_BIG_ENDIAN n
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 25fee035cd5d..1b4585e065ba 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -123,7 +123,7 @@ everything = stdenv.mkDerivation (common // {
   buildInputs = common.buildInputs ++ [
     xz lzo lz4 bzip2 snappy
     libxml2 boost judy libevent cracklib
-  ] ++ optional (stdenv.isLinux && !stdenv.isArm) numactl;
+  ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl;
 
   cmakeFlags = common.cmakeFlags ++ [
     "-DMYSQL_DATADIR=/var/lib/mysql"
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 42288e6245e4..190fc500068c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -117,7 +117,7 @@ let
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
         isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
-        isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian;
+        isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
 
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index d16e730b5abf..817da08c05e3 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     stdenv.lib.optional stdenv.isLinux utillinux;
 
   buildPhase =
-    stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 "
+    stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 "
     + "bash do";
   installPhase = ''
     install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index d20cb3c37859..3dfd136ad060 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchgit, go }:
 
-assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm);
+assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32);
 
 let
 
diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix
index 40332f7b0d44..179b4cb1a4c0 100644
--- a/pkgs/tools/system/storebrowse/default.nix
+++ b/pkgs/tools/system/storebrowse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchhg, go, sqlite}:
 
-assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm);
+assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32);
 
 stdenv.mkDerivation rec {
   name = "storebrowse-20130318212204";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82ad4769977c..d38f8d201889 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5988,7 +5988,7 @@ with pkgs;
 
     # bootstrapping a profiled compiler does not work in the sheevaplug:
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43944
-    profiledCompiler = !stdenv.isArm;
+    profiledCompiler = !stdenv.isAarch32;
 
     libcCross = if targetPlatform != buildPlatform then libcCross else null;
   }));
@@ -6352,12 +6352,12 @@ with pkgs;
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk7.jre // { outputs = [ "jre" ]; }));
 
-  jdk8 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
-  jre8 = if stdenv.isArm || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
+  jdk8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk8 else openjdk8 // { outputs = [ "out" ]; };
+  jre8 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre8 else lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}"
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk8.jre // { outputs = [ "jre" ]; }));
   jre8_headless =
-    if stdenv.isArm || stdenv.isAarch64 then
+    if stdenv.isAarch32 || stdenv.isAarch64 then
       oraclejre8
     else if stdenv.isDarwin then
       jre8
@@ -6366,12 +6366,12 @@ with pkgs;
         (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
           ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; }));
 
-  jdk9 = if stdenv.isArm || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; };
-  jre9 = if stdenv.isArm || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}"
+  jdk9 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejdk9 else openjdk9 // { outputs = [ "out" ]; };
+  jre9 = if stdenv.isAarch32 || stdenv.isAarch64 then oraclejre9 else lib.setName "openjre-${lib.getVersion pkgs.openjdk9.jre}"
     (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; }
       (openjdk9.jre // { outputs = [ "jre" ]; }));
   jre9_headless =
-    if stdenv.isArm || stdenv.isAarch64 then
+    if stdenv.isAarch32 || stdenv.isAarch64 then
       oraclejre9
     else if stdenv.isDarwin then
       jre9
@@ -9126,7 +9126,7 @@ with pkgs;
 
   cairo = callPackage ../development/libraries/cairo {
     glSupport = config.cairo.gl or (stdenv.isLinux &&
-      !stdenv.isArm && !stdenv.isMips);
+      !stdenv.isAarch32 && !stdenv.isMips);
   };
 
 

From a809fdc8e1b0c1d49d40815d9bac0de27ddab5f1 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 1 Apr 2018 00:00:00 +0000
Subject: [PATCH 0428/3370] stdenv: linux: stop recompiling `texinfo`

This makes stdenv bootstraping a bit more efficient.
We don't recompile most of other stuff used in bootstrapping stdenv too.
---
 pkgs/stdenv/linux/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 2eb55ae439b5..5d1201b7f5d5 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -351,6 +351,7 @@ in
         concatMap (p: [ (getBin p) (getLib p) ])
           [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils
             gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
+            texinfo
           ]
         # Library dependencies
         ++ map getLib (
@@ -370,7 +371,7 @@ in
         inherit (prevStage)
           gzip bzip2 xz bash coreutils diffutils findutils gawk
           gnumake gnused gnutar gnugrep gnupatch patchelf
-          attr acl paxctl zlib pcre;
+          attr acl paxctl zlib pcre texinfo;
         ${localSystem.libc} = getLibc prevStage;
       } // lib.optionalAttrs (super.targetPlatform == localSystem) {
         # Need to get rid of these when cross-compiling.

From 3c7f6572cea284ee792dcd31ea5be185734c21b1 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 1 Apr 2018 00:00:01 +0000
Subject: [PATCH 0429/3370] bash: simplify expression, add `withDocs` option

---
 pkgs/shells/bash/4.4.nix                      | 53 ++++++-------
 .../bash/cygwin-bash-4.4.11-2.src.patch       | 76 +++++++++----------
 pkgs/top-level/all-packages.nix               | 10 +--
 3 files changed, 67 insertions(+), 72 deletions(-)

diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix
index 04a036982893..72ce29bf3f2b 100644
--- a/pkgs/shells/bash/4.4.nix
+++ b/pkgs/shells/bash/4.4.nix
@@ -1,37 +1,33 @@
 { stdenv, buildPackages
-, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison, autoconf
+, fetchurl, binutils ? null, bison, autoconf
 , buildPlatform, hostPlatform
-, interactive ? false
+
+# patch for cygwin requires readline support
+, interactive ? stdenv.isCygwin, readline70 ? null
+, withDocs ? false, texinfo ? null
+, self
 }:
 
+with stdenv.lib;
+
 assert interactive -> readline70 != null;
+assert withDocs -> texinfo != null;
 assert hostPlatform.isDarwin -> binutils != null;
 
 let
-  version = "4.4";
-  realName = "bash-${version}";
-  shortName = "bash44";
-  sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
-
-  upstreamPatches =
-    let
-      patch = nr: sha256:
-        fetchurl {
-          url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
-          inherit sha256;
-        };
-    in
-      import ./bash-4.4-patches.nix patch;
-
-  inherit (stdenv.lib) optional optionals optionalString;
+  upstreamPatches = import ./bash-4.4-patches.nix (nr: sha256: fetchurl {
+    url = "mirror://gnu/bash/bash-4.4-patches/bash44-${nr}";
+    inherit sha256;
+  });
 in
 
 stdenv.mkDerivation rec {
-  name = "${realName}-p${toString (builtins.length upstreamPatches)}";
+  name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}";
+  version = "4.4";
 
   src = fetchurl {
-    url = "mirror://gnu/bash/${realName}.tar.gz";
-    inherit sha256;
+    url = "mirror://gnu/bash/bash-${version}.tar.gz";
+    sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
   };
 
   hardeningDisable = [ "format" ];
@@ -50,18 +46,19 @@ stdenv.mkDerivation rec {
   patchFlags = "-p0";
 
   patches = upstreamPatches
+    ++ optional hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch
     # https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html
-    ++ optional (hostPlatform.libc == "musl") (fetchurl {
+    ++ optional hostPlatform.isMusl (fetchurl {
       url = "https://lists.gnu.org/archive/html/bug-bash/2016-10/patchJxugOXrY2y.patch";
       sha256 = "1m4v9imidb1cc1h91f2na0b8y9kc5c5fgmpvy9apcyv2kbdcghg1";
-  });
-
-  postPatch = optionalString hostPlatform.isCygwin "patch -p2 < ${./cygwin-bash-4.4.11-2.src.patch}";
+    });
 
   configureFlags = [
     (if interactive then "--with-installed-readline" else "--disable-readline")
   ] ++ optionals (hostPlatform != buildPlatform) [
-    "bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes"
+    "bash_cv_job_control_missing=nomissing"
+    "bash_cv_sys_named_pipes=nomissing"
+    "bash_cv_getcwd_malloc=yes"
   ] ++ optionals hostPlatform.isCygwin [
     "--without-libintl-prefix --without-libiconv-prefix"
     "--with-installed-readline"
@@ -75,8 +72,8 @@ stdenv.mkDerivation rec {
 
   # Note: Bison is needed because the patches above modify parse.y.
   depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [bison]
-    ++ optional (texinfo != null) texinfo
+  nativeBuildInputs = [ bison ]
+    ++ optional withDocs texinfo
     ++ optional hostPlatform.isDarwin binutils
     ++ optional (hostPlatform.libc == "musl") autoconf;
 
diff --git a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch b/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
index c854e8828aea..488373109625 100644
--- a/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
+++ b/pkgs/shells/bash/cygwin-bash-4.4.11-2.src.patch
@@ -1,5 +1,5 @@
---- origsrc/bash-4.4/bashline.c	2017-01-23 13:28:06.955247200 -0600
-+++ src/bash-4.4/bashline.c	2017-01-23 13:55:07.992877600 -0600
+--- bashline.c	2017-01-23 13:28:06.955247200 -0600
++++ bashline.c	2017-01-23 13:55:07.992877600 -0600
 @@ -76,6 +76,16 @@
  #  include "pcomplete.h"
  #endif
@@ -104,8 +104,8 @@
    r = file_isdir (fn);
    free (fn);
  
---- origsrc/bash-4.4/builtins/read.def	2017-01-23 13:28:07.017686500 -0600
-+++ src/bash-4.4/builtins/read.def	2017-01-23 13:55:07.992877600 -0600
+--- builtins/read.def	2017-01-23 13:28:07.017686500 -0600
++++ builtins/read.def	2017-01-23 13:55:07.992877600 -0600
 @@ -85,7 +85,6 @@ $END
  
  #ifdef __CYGWIN__
@@ -140,8 +140,8 @@
        if ((skip_ctlesc == 0 && c == CTLESC) || (skip_ctlnul == 0 && c == CTLNUL))
  	{
  	  saw_escape++;
---- origsrc/bash-4.4/builtins/set.def	2016-06-02 19:10:10.000000000 -0500
-+++ src/bash-4.4/builtins/set.def	2017-01-23 13:55:07.992877600 -0600
+--- builtins/set.def	2016-06-02 19:10:10.000000000 -0500
++++ builtins/set.def	2017-01-23 13:55:07.992877600 -0600
 @@ -56,6 +56,13 @@ extern int dont_save_function_defs;
  #if defined (READLINE)
  extern int no_line_editing;
@@ -258,8 +258,8 @@
        free (vname);
      }
  }
---- origsrc/bash-4.4/builtins/shopt.def	2016-05-06 14:00:02.000000000 -0500
-+++ src/bash-4.4/builtins/shopt.def	2017-01-23 13:55:07.992877600 -0600
+--- builtins/shopt.def	2016-05-06 14:00:02.000000000 -0500
++++ builtins/shopt.def	2017-01-23 13:55:07.992877600 -0600
 @@ -92,6 +92,10 @@ extern int glob_asciirange;
  extern int lastpipe_opt;
  extern int inherit_errexit;
@@ -281,8 +281,8 @@
  #if defined (READLINE)
    { "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
    { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
---- origsrc/bash-4.4/config-top.h	2016-05-19 13:34:02.000000000 -0500
-+++ src/bash-4.4/config-top.h	2017-01-23 13:55:07.992877600 -0600
+--- config-top.h	2016-05-19 13:34:02.000000000 -0500
++++ config-top.h	2017-01-23 13:55:07.992877600 -0600
 @@ -87,10 +87,10 @@
  #define DEFAULT_BASHRC "~/.bashrc"
  
@@ -305,8 +305,8 @@
  
  /* Define if you want the case-capitalizing operators (~[~]) and the
     `capcase' variable attribute (declare -c). */
---- origsrc/bash-4.4/doc/Makefile.in	2015-12-06 18:55:56.000000000 -0600
-+++ src/bash-4.4/doc/Makefile.in	2017-01-23 13:55:07.992877600 -0600
+--- doc/Makefile.in	2015-12-06 18:55:56.000000000 -0600
++++ doc/Makefile.in	2017-01-23 13:55:07.992877600 -0600
 @@ -189,7 +189,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER)
  	$(MAKEINFO) --html --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
  
@@ -329,8 +329,8 @@
  	-if test -f bash.info; then d=.; else d=$(srcdir); fi; \
  	  $(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info
  # run install-info if it is present to update the info directory
---- origsrc/bash-4.4/doc/bash.1	2016-08-26 08:45:17.000000000 -0500
-+++ src/bash-4.4/doc/bash.1	2017-01-23 13:55:08.008447700 -0600
+--- doc/bash.1	2016-08-26 08:45:17.000000000 -0500
++++ doc/bash.1	2017-01-23 13:55:08.008447700 -0600
 @@ -9607,6 +9607,10 @@ filenames.
  This variable is set by default, which is the default bash behavior in
  versions through 4.2.
@@ -342,8 +342,8 @@
  .B direxpand
  If set,
  .B bash
---- origsrc/bash-4.4/doc/bashref.texi	2016-09-07 16:13:36.000000000 -0500
-+++ src/bash-4.4/doc/bashref.texi	2017-01-23 13:55:08.008447700 -0600
+--- doc/bashref.texi	2016-09-07 16:13:36.000000000 -0500
++++ doc/bashref.texi	2017-01-23 13:55:08.008447700 -0600
 @@ -5123,6 +5123,10 @@ filenames.
  This variable is set by default, which is the default Bash behavior in
  versions through 4.2.
@@ -355,8 +355,8 @@
  @item direxpand
  If set, Bash
  replaces directory names with the results of word expansion when performing
---- origsrc/bash-4.4/doc/builtins.1	2012-02-21 13:32:05.000000000 -0600
-+++ src/bash-4.4/doc/builtins.1	2017-01-23 13:55:08.008447700 -0600
+--- doc/builtins.1	2012-02-21 13:32:05.000000000 -0600
++++ doc/builtins.1	2017-01-23 13:55:08.008447700 -0600
 @@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim
  ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
  .SH BASH BUILTIN COMMANDS
@@ -365,8 +365,8 @@
 +.so man1/bash.1
  .SH SEE ALSO
  bash(1), sh(1)
---- origsrc/bash-4.4/general.c	2016-08-11 10:16:56.000000000 -0500
-+++ src/bash-4.4/general.c	2017-01-23 13:55:08.008447700 -0600
+--- general.c	2016-08-11 10:16:56.000000000 -0500
++++ general.c	2017-01-23 13:55:08.008447700 -0600
 @@ -48,6 +48,10 @@
  
  #include <tilde/tilde.h>
@@ -388,8 +388,8 @@
        result = savestring (pathbuf);
      }
  #else
---- origsrc/bash-4.4/input.c	2015-09-24 18:49:23.000000000 -0500
-+++ src/bash-4.4/input.c	2017-01-23 13:55:08.008447700 -0600
+--- input.c	2015-09-24 18:49:23.000000000 -0500
++++ input.c	2017-01-23 13:55:08.008447700 -0600
 @@ -44,6 +44,10 @@
  #include "quit.h"
  #include "trap.h"
@@ -421,8 +421,8 @@
  #if !defined (DJGPP)
    return (bufstream_getc (buffers[bash_input.location.buffered_fd]));
  #else
---- origsrc/bash-4.4/lib/sh/pathphys.c	2013-05-28 14:33:58.000000000 -0500
-+++ src/bash-4.4/lib/sh/pathphys.c	2017-01-23 13:55:08.008447700 -0600
+--- lib/sh/pathphys.c	2013-05-28 14:33:58.000000000 -0500
++++ lib/sh/pathphys.c	2017-01-23 13:55:08.008447700 -0600
 @@ -35,6 +35,7 @@
  #include <stdio.h>
  #include <chartypes.h>
@@ -453,8 +453,8 @@
  	      double_slash_path = DOUBLE_SLASH (workpath);
  	      qbase += double_slash_path;
      
---- origsrc/bash-4.4/lib/sh/tmpfile.c	2016-08-11 10:05:58.000000000 -0500
-+++ src/bash-4.4/lib/sh/tmpfile.c	2017-01-23 13:55:08.008447700 -0600
+--- lib/sh/tmpfile.c	2016-08-11 10:05:58.000000000 -0500
++++ lib/sh/tmpfile.c	2017-01-23 13:55:08.008447700 -0600
 @@ -101,7 +101,7 @@ get_tmpdir (flags)
    if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX))
      tdir = 0;
@@ -464,8 +464,8 @@
      tdir = get_sys_tmpdir ();
  
  #if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX)
---- origsrc/bash-4.4/mksyntax.c	2012-07-29 18:48:38.000000000 -0500
-+++ src/bash-4.4/mksyntax.c	2017-01-23 13:55:08.008447700 -0600
+--- mksyntax.c	2012-07-29 18:48:38.000000000 -0500
++++ mksyntax.c	2017-01-23 13:55:08.008447700 -0600
 @@ -29,13 +29,13 @@
  
  #ifdef HAVE_UNISTD_H
@@ -483,8 +483,8 @@
  #ifndef errno
  extern int errno;
  #endif
---- origsrc/bash-4.4/parse.y	2016-09-11 10:31:46.000000000 -0500
-+++ src/bash-4.4/parse.y	2017-01-23 13:55:08.008447700 -0600
+--- parse.y	2016-09-11 10:31:46.000000000 -0500
++++ parse.y	2017-01-23 13:55:08.008447700 -0600
 @@ -1539,14 +1539,20 @@ yy_string_get ()
    string = bash_input.location.string;
  
@@ -509,8 +509,8 @@
  }
  
  static int
---- origsrc/bash-4.4/subst.c	2017-01-23 13:28:06.955247200 -0600
-+++ src/bash-4.4/subst.c	2017-01-23 13:55:08.008447700 -0600
+--- subst.c	2017-01-23 13:28:06.955247200 -0600
++++ subst.c	2017-01-23 13:55:08.008447700 -0600
 @@ -43,6 +43,7 @@
  #include "posixstat.h"
  #include "bashintl.h"
@@ -562,8 +562,8 @@
    old_pid = last_made_pid;
  #if defined (JOB_CONTROL)
    old_pipeline_pgrp = pipeline_pgrp;
---- origsrc/bash-4.4/support/bashversion.c	2008-09-09 08:31:53.000000000 -0500
-+++ src/bash-4.4/support/bashversion.c	2017-01-23 13:55:08.024037200 -0600
+--- support/bashversion.c	2008-09-09 08:31:53.000000000 -0500
++++ support/bashversion.c	2017-01-23 13:55:08.024037200 -0600
 @@ -26,6 +26,9 @@
  
  #if defined (HAVE_UNISTD_H)
@@ -584,8 +584,8 @@
  extern char *dist_version;
  extern int patch_level;
  
---- origsrc/bash-4.4/support/mkversion.sh	2008-08-13 07:25:57.000000000 -0500
-+++ src/bash-4.4/support/mkversion.sh	2017-01-23 13:55:08.024037200 -0600
+--- support/mkversion.sh	2008-08-13 07:25:57.000000000 -0500
++++ support/mkversion.sh	2017-01-23 13:55:08.024037200 -0600
 @@ -29,7 +29,7 @@ source_dir="."
  while [ $# -gt 0 ]; do
  	case "$1" in
@@ -595,8 +595,8 @@
  	-s)	shift; rel_status=$1; shift ;;
  	-p)	shift; patch_level=$1; shift ;;
  	-d)	shift; dist_version=$1; shift ;;
---- origsrc/bash-4.4/variables.c	2016-06-15 15:05:52.000000000 -0500
-+++ src/bash-4.4/variables.c	2017-01-23 13:55:08.024037200 -0600
+--- variables.c	2016-06-15 15:05:52.000000000 -0500
++++ variables.c	2017-01-23 13:55:08.024037200 -0600
 @@ -5239,6 +5239,7 @@ sv_winsize (name)
  /* Update the value of HOME in the export environment so tilde expansion will
     work on cygwin. */
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92927bbf9d91..550e76a14589 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5841,15 +5841,13 @@ with pkgs;
   runtimeShell = "${runtimeShellPackage}/bin/bash";
   runtimeShellPackage = bash;
 
-  bash = lowPrio (callPackage ../shells/bash/4.4.nix {
-    texinfo = null;
-    interactive = stdenv.isCygwin; # patch for cygwin requires readline support
-  });
+  bash = lowPrio (callPackage ../shells/bash/4.4.nix { });
 
   # WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
-  bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix {
+  bashInteractive = callPackage ../shells/bash/4.4.nix {
     interactive = true;
-  });
+    withDocs = true;
+  };
 
   bash-completion = callPackage ../shells/bash/bash-completion { };
 

From d531a1e96784cc64d17cef1892d1f747c7c02b10 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 1 Apr 2018 00:00:02 +0000
Subject: [PATCH 0430/3370] texinfo: merge expressions for 5.2 and 6.5

Also add me as a maintainer.
---
 pkgs/development/tools/misc/texinfo/4.13a.nix | 33 ++--------
 pkgs/development/tools/misc/texinfo/5.2.nix   | 56 +---------------
 pkgs/development/tools/misc/texinfo/6.5.nix   | 58 +----------------
 .../development/tools/misc/texinfo/common.nix | 64 +++++++++++++++++++
 4 files changed, 75 insertions(+), 136 deletions(-)
 create mode 100644 pkgs/development/tools/misc/texinfo/common.nix

diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix
index 2e0d020688ea..63e5bea19d74 100644
--- a/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ b/pkgs/development/tools/misc/texinfo/4.13a.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, ncurses, lzma }:
+{ stdenv, fetchurl, texinfo, ncurses, lzma }:
 
 stdenv.mkDerivation rec {
-  name = "texinfo-4.13a";
+  name = "texinfo-${version}";
+  version = "4.13a";
 
   src = fetchurl {
-    url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma";
+    url = "mirror://gnu/texinfo/${name}.tar.lzma";
     sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
   };
 
@@ -14,29 +15,5 @@ stdenv.mkDerivation rec {
   # Disabled because we don't have zdiff in the stdenv bootstrap.
   #doCheck = true;
 
-  meta = {
-    description = "The GNU documentation system";
-
-    longDescription = ''
-      Texinfo is the official documentation format of the GNU project.
-      It was invented by Richard Stallman and Bob Chassell many years
-      ago, loosely based on Brian Reid's Scribe and other formatting
-      languages of the time.  It is used by many non-GNU projects as
-      well.
-
-      Texinfo uses a single source file to produce output in a number
-      of formats, both online and printed (dvi, html, info, pdf, xml,
-      etc.).  This means that instead of writing different documents
-      for online information and another for a printed manual, you
-      need write only one document.  And when the work is revised, you
-      need revise only that one document.  The Texinfo system is
-      well-integrated with GNU Emacs.
-    '';
-
-    license = stdenv.lib.licenses.gpl3Plus;
-
-    homepage = http://www.gnu.org/software/texinfo/;
-    branch = "4.13";
-    platforms = stdenv.lib.platforms.unix;
-  };
+  meta = texinfo.meta // { branch = version; };
 }
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index 0feb4b943df3..d395494984d5 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -1,54 +1,4 @@
-{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "texinfo-5.2";
-
-  src = fetchurl {
-    url = "mirror://gnu/texinfo/${name}.tar.xz";
-    sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
-  };
-
-  # We need a native compiler to build perl XS extensions
-  # when cross-compiling.
-  depsBuildBuild = [ buildPackages.stdenv.cc perl ];
-
-  buildInputs = [ perl xz.bin ]
-    ++ optional interactive ncurses
-    ++ optional doCheck procps; # for tests
-
-  configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
-    ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
-
-  preInstall = ''
-    installFlags="TEXMF=$out/texmf-dist";
-    installTargets="install install-tex";
-  '';
-
-  doCheck = !stdenv.isDarwin;
-
-  meta = {
-    homepage = http://www.gnu.org/software/texinfo/;
-    description = "The GNU documentation system";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-
-    longDescription = ''
-      Texinfo is the official documentation format of the GNU project.
-      It was invented by Richard Stallman and Bob Chassell many years
-      ago, loosely based on Brian Reid's Scribe and other formatting
-      languages of the time.  It is used by many non-GNU projects as
-      well.
-
-      Texinfo uses a single source file to produce output in a number
-      of formats, both online and printed (dvi, html, info, pdf, xml,
-      etc.).  This means that instead of writing different documents
-      for online information and another for a printed manual, you
-      need write only one document.  And when the work is revised, you
-      need revise only that one document.  The Texinfo system is
-      well-integrated with GNU Emacs.
-    '';
-    branch = "5.2";
-  };
+import ./common.nix {
+  version = "5.2";
+  sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
 }
diff --git a/pkgs/development/tools/misc/texinfo/6.5.nix b/pkgs/development/tools/misc/texinfo/6.5.nix
index afa7e9a0a206..34596f306581 100644
--- a/pkgs/development/tools/misc/texinfo/6.5.nix
+++ b/pkgs/development/tools/misc/texinfo/6.5.nix
@@ -1,56 +1,4 @@
-{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "texinfo-6.5";
-
-  src = fetchurl {
-    url = "mirror://gnu/texinfo/${name}.tar.xz";
-    sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
-  };
-
-  # We need a native compiler to build perl XS extensions
-  # when cross-compiling.
-  depsBuildBuild = [ buildPackages.stdenv.cc perl ];
-
-  buildInputs = [ xz ]
-    ++ optionals stdenv.isSunOS [ libiconv gawk ]
-    ++ optional interactive ncurses
-    ++ optional doCheck procps; # for tests
-
-  configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
-    ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
-
-  preInstall = ''
-    installFlags="TEXMF=$out/texmf-dist";
-    installTargets="install install-tex";
-  '';
-
-  doCheck = interactive # simplify bootstrapping
-    && !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/texinfo/;
-    description = "The GNU documentation system";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = [ maintainers.vrthra ];
-
-    longDescription = ''
-      Texinfo is the official documentation format of the GNU project.
-      It was invented by Richard Stallman and Bob Chassell many years
-      ago, loosely based on Brian Reid's Scribe and other formatting
-      languages of the time.  It is used by many non-GNU projects as
-      well.
-
-      Texinfo uses a single source file to produce output in a number
-      of formats, both online and printed (dvi, html, info, pdf, xml,
-      etc.).  This means that instead of writing different documents
-      for online information and another for a printed manual, you
-      need write only one document.  And when the work is revised, you
-      need revise only that one document.  The Texinfo system is
-      well-integrated with GNU Emacs.
-    '';
-  };
+import ./common.nix {
+  version = "6.5";
+  sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
 }
diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix
new file mode 100644
index 000000000000..12534297ff3d
--- /dev/null
+++ b/pkgs/development/tools/misc/texinfo/common.nix
@@ -0,0 +1,64 @@
+{ version, sha256 }:
+
+{ stdenv, buildPackages, fetchurl, perl, xz
+
+# we are a dependency of gcc, this simplifies bootstraping
+, interactive ? false, ncurses, procps
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "texinfo-${optionalString interactive "interactive-"}${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "mirror://gnu/texinfo/texinfo-${version}.tar.xz";
+    inherit sha256;
+  };
+
+  # We need a native compiler to build perl XS extensions
+  # when cross-compiling.
+  depsBuildBuild = [ buildPackages.stdenv.cc perl ];
+
+  buildInputs = [ xz.bin ]
+    ++ optionals stdenv.isSunOS [ libiconv gawk ]
+    ++ optionals interactive [ ncurses procps ];
+
+  configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
+    ++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
+
+  preInstall = ''
+    installFlags="TEXMF=$out/texmf-dist";
+    installTargets="install install-tex";
+  '';
+
+  doCheck = interactive
+    && !stdenv.isDarwin
+    && !stdenv.isSunOS; # flaky
+
+  meta = {
+    homepage = http://www.gnu.org/software/texinfo/;
+    description = "The GNU documentation system";
+    license = licenses.gpl3Plus;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ vrthra oxij ];
+
+    longDescription = ''
+      Texinfo is the official documentation format of the GNU project.
+      It was invented by Richard Stallman and Bob Chassell many years
+      ago, loosely based on Brian Reid's Scribe and other formatting
+      languages of the time.  It is used by many non-GNU projects as
+      well.
+
+      Texinfo uses a single source file to produce output in a number
+      of formats, both online and printed (dvi, html, info, pdf, xml,
+      etc.).  This means that instead of writing different documents
+      for online information and another for a printed manual, you
+      need write only one document.  And when the work is revised, you
+      need revise only that one document.  The Texinfo system is
+      well-integrated with GNU Emacs.
+    '';
+    branch = version;
+  };
+}

From ad98c36f1b1b681db433a6cb798e7ec21e8da33c Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 15 Mar 2018 00:00:01 +0000
Subject: [PATCH 0431/3370] stdenv: generic/setup.sh: simplify buildPhase
 Makefile check

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d7a4781448ae..17aaa5b798ff 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -968,7 +968,7 @@ buildPhase() {
     # set to empty if unset
     : ${makeFlags=}
 
-    if [[ -z "$makeFlags" && ! ( -n "${makefile:-}" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
+    if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
         echo "no Makefile, doing nothing"
     else
         # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409

From e9e06888edc0f79055e0f4e59867a1426d960895 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 15 Mar 2018 00:00:02 +0000
Subject: [PATCH 0432/3370] stdenv: generic/setup.sh: cleanup installPhase

---
 pkgs/stdenv/generic/setup.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 17aaa5b798ff..bb9e32486674 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1018,14 +1018,12 @@ installPhase() {
         mkdir -p "$prefix"
     fi
 
-    installTargets="${installTargets:-install}"
-
     # Old bash empty array hack
     # shellcheck disable=SC2086
     local flagsArray=(
-        $installTargets
         $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
         $installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
+        ${installTargets:-install}
     )
 
     echoCmd 'install flags' "${flagsArray[@]}"

From 50af975d8595c7fce05bc8bbd9db93e3c4cece25 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 15 Mar 2018 00:00:04 +0000
Subject: [PATCH 0433/3370] stdenv: implement `checkTarget` and
 `installCheckTarget` autodetection

---
 pkgs/stdenv/generic/setup.sh | 74 +++++++++++++++++++++++++-----------
 1 file changed, 52 insertions(+), 22 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index bb9e32486674..c85f05d9a919 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -971,6 +971,8 @@ buildPhase() {
     if [[ -z "$makeFlags" && -z "${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
         echo "no Makefile, doing nothing"
     else
+        foundMakefile=1
+
         # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
         makeFlags="SHELL=$SHELL $makeFlags"
 
@@ -994,18 +996,38 @@ buildPhase() {
 checkPhase() {
     runHook preCheck
 
-    # Old bash empty array hack
-    # shellcheck disable=SC2086
-    local flagsArray=(
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
-        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-        ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
-        ${checkTarget:-check}
-    )
+    if [[ -z "${foundMakefile:-}" ]]; then
+        echo "no Makefile or custom buildPhase, doing nothing"
+        runHook postCheck
+        return
+    fi
 
-    echoCmd 'check flags' "${flagsArray[@]}"
-    make ${makefile:+-f $makefile} "${flagsArray[@]}"
-    unset flagsArray
+    if [[ -z "${checkTarget:-}" ]]; then
+        #TODO(@oxij): should flagsArray influence make -n?
+        if make -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
+            checkTarget=check
+        elif make -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
+            checkTarget=test
+        fi
+    fi
+
+    if [[ -z "${checkTarget:-}" ]]; then
+        echo "no check/test target in ${makefile:-Makefile}, doing nothing"
+    else
+        # Old bash empty array hack
+        # shellcheck disable=SC2086
+        local flagsArray=(
+            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
+            ${checkTarget}
+        )
+
+        echoCmd 'check flags' "${flagsArray[@]}"
+        make ${makefile:+-f $makefile} "${flagsArray[@]}"
+
+        unset flagsArray
+    fi
 
     runHook postCheck
 }
@@ -1104,18 +1126,26 @@ fixupPhase() {
 installCheckPhase() {
     runHook preInstallCheck
 
-    # Old bash empty array hack
-    # shellcheck disable=SC2086
-    local flagsArray=(
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
-        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
-        $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
-        ${installCheckTarget:-installcheck}
-    )
+    if [[ -z "${foundMakefile:-}" ]]; then
+        echo "no Makefile or custom buildPhase, doing nothing"
+    #TODO(@oxij): should flagsArray influence make -n?
+    elif [[ -z "${installCheckTarget:-}" ]] \
+       && ! make -n ${makefile:+-f $makefile} ${installCheckTarget:-installcheck} >/dev/null 2>&1; then
+        echo "no installcheck target in ${makefile:-Makefile}, doing nothing"
+    else
+        # Old bash empty array hack
+        # shellcheck disable=SC2086
+        local flagsArray=(
+            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
+            ${installCheckTarget:-installcheck}
+        )
 
-    echoCmd 'installcheck flags' "${flagsArray[@]}"
-    make ${makefile:+-f $makefile} "${flagsArray[@]}"
-    unset flagsArray
+        echoCmd 'installcheck flags' "${flagsArray[@]}"
+        make ${makefile:+-f $makefile} "${flagsArray[@]}"
+        unset flagsArray
+    fi
 
     runHook postInstallCheck
 }

From 683b91ea1083b39958939f487f31e4aaabfa4996 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 12:59:23 -0700
Subject: [PATCH 0434/3370] limesuite: fix license

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

diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
index e166c7a6b516..fb1ef8fb6696 100644
--- a/pkgs/applications/misc/limesuite/default.nix
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Driver and GUI for LMS7002M-based SDR platforms";
     homepage = https://github.com/myriadrf/LimeSuite;
-    license = licenses.apache2;
+    license = licenses.asl20;
     maintainers = with maintainers; [ markuskowa ];
     platforms = platforms.linux;
   };

From 3a8b8bcb693bcae570d2541bc9eb4849ad73d2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Mon, 4 Dec 2017 19:37:09 +0100
Subject: [PATCH 0435/3370] all-packages.nix: made new block CHEMISTRY

---
 pkgs/top-level/all-packages.nix | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eaa458529e3c..5ede261d5c55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2770,8 +2770,6 @@ with pkgs;
 
   gvolicon = callPackage ../tools/audio/gvolicon {};
 
-  gwyddion = callPackage ../applications/science/chemistry/gwyddion {};
-
   gzip = callPackage ../tools/compression/gzip { };
 
   gzrt = callPackage ../tools/compression/gzrt { };
@@ -3114,8 +3112,6 @@ with pkgs;
 
   jmespath = callPackage ../development/tools/jmespath { };
 
-  jmol = callPackage ../applications/science/chemistry/jmol { };
-
   jmtpfs = callPackage ../tools/filesystems/jmtpfs { };
 
   jnettop = callPackage ../tools/networking/jnettop { };
@@ -3744,8 +3740,6 @@ with pkgs;
 
   modsecurity_standalone = callPackage ../tools/security/modsecurity { };
 
-  molden = callPackage ../applications/science/chemistry/molden { };
-
   molly-guard = callPackage ../os-specific/linux/molly-guard { };
 
   moneyplex = callPackage ../applications/office/moneyplex { };
@@ -7151,8 +7145,6 @@ with pkgs;
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; };
-
   inherit (callPackages ../development/interpreters/perl {}) perl perl522 perl524 perl526;
 
   pachyderm = callPackage ../applications/networking/cluster/pachyderm { };
@@ -14842,10 +14834,6 @@ with pkgs;
 
   avidemux = libsForQt5.callPackage ../applications/video/avidemux { };
 
-  avogadro = callPackage ../applications/science/chemistry/avogadro {
-    eigen = eigen2;
-  };
-
   avrdudess = callPackage ../applications/misc/avrdudess { };
 
   avxsynth = callPackage ../applications/video/avxsynth {
@@ -17404,8 +17392,6 @@ with pkgs;
 
   puremapping = callPackage ../applications/audio/pd-plugins/puremapping { };
 
-  pymol = callPackage ../applications/science/chemistry/pymol { };
-
   pybitmessage = callPackage ../applications/networking/instant-messengers/pybitmessage { };
 
   pythonmagick = callPackage ../applications/graphics/PythonMagick { };
@@ -19730,6 +19716,22 @@ with pkgs;
 
   ### SCIENCE
 
+  ### SCIENCE/CHEMISTY
+
+  avogadro = callPackage ../applications/science/chemistry/avogadro {
+    eigen = eigen2;
+  };
+
+  gwyddion = callPackage ../applications/science/chemistry/gwyddion {};
+
+  jmol = callPackage ../applications/science/chemistry/jmol { };
+
+  molden = callPackage ../applications/science/chemistry/molden { };
+
+  octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; };
+
+  pymol = callPackage ../applications/science/chemistry/pymol { };
+
   ### SCIENCE/GEOMETRY
 
   drgeo = callPackage ../applications/science/geometry/drgeo {

From 75d8c81868fdbffbc27fe0ae94c6870da5f42143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Mon, 26 Mar 2018 13:01:25 +0200
Subject: [PATCH 0436/3370] pymol: 1.8.4 -> 2.1.0

---
 .../applications/science/chemistry/pymol/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index 39c027706ee3..e7dd04377be7 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeDesktopItem
 , python3, python3Packages
-, glew, freeglut, libpng, libxml2, tk, freetype }:
+, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }:
 
 
 with stdenv.lib;
 
 let
   pname = "pymol";
-  ver_maj = "1.8";
-  ver_min = "4";
+  ver_maj = "2";
+  ver_min = "1";
   version = "${ver_maj}.${ver_min}.0";
   description = "A Python-enhanced molecular graphics tool";
 
@@ -16,7 +16,7 @@ let
     name = "${pname}";
     exec = "${pname}";
     desktopName = "PyMol Molecular Graphics System";
-    genericName = "Molecular Modeller";
+    genericName = "Molecular Modeler";
     comment = description;
     mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;";
     categories = "Graphics;Education;Science;Chemistry;";
@@ -26,10 +26,10 @@ python3Packages.buildPythonApplication {
   name = "pymol-${version}";
   src = fetchurl {
     url = "mirror://sourceforge/project/pymol/pymol/${ver_maj}/pymol-v${version}.tar.bz2";
-    sha256 = "0yfj8g5yic9zz6f0bw2n8h6ifvgsn8qvhq84alixsi28wzppn55n";
+    sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s";
   };
 
-  buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype ];
+  buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ];
   NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
 
   installPhase = ''

From 329d1ba69a3b8b16af228bff28066274bc4cf085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Katona=20L=C3=A1szl=C3=B3?= <muoniurn@gmail.com>
Date: Mon, 4 Dec 2017 19:53:36 +0100
Subject: [PATCH 0437/3370] jmol: made it runnable

---
 .../science/chemistry/jmol/default.nix        | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix
index c85e1143d103..4c4278c30faa 100644
--- a/pkgs/applications/science/chemistry/jmol/default.nix
+++ b/pkgs/applications/science/chemistry/jmol/default.nix
@@ -1,9 +1,20 @@
 { stdenv
 , fetchurl
 , unzip
+, makeDesktopItem
 , jre
 }:
 
+let
+  desktopItem = makeDesktopItem {
+    name = "jmol";
+    exec = "jmol";
+    desktopName = "JMol";
+    genericName = "Molecular Modeler";
+    mimeType = "chemical/x-pdb;chemical/x-mdl-molfile;chemical/x-mol2;chemical/seq-aa-fasta;chemical/seq-na-fasta;chemical/x-xyz;chemical/x-mdl-sdf;";
+    categories = "Graphics;Education;Science;Chemistry;";
+  };
+in
 stdenv.mkDerivation rec {
   version = "${baseVersion}.${patchVersion}";
   baseVersion = "14.29";
@@ -16,19 +27,18 @@ stdenv.mkDerivation rec {
     sha256 = "1ndq9am75janshrnk26334z1nmyh3k4bp20napvf2zv0lfp8k3bv";
   };
 
-  buildInputs = [
-    jre
-  ];
+  patchPhase = ''
+    sed -i -e "4s:.*:command=${jre}/bin/java:" -e "10s:.*:jarpath=$out/share/jmol/Jmol.jar:" -e "11,21d" jmol
+  '';
 
   installPhase = ''
-    mkdir -p "$out/share/jmol"
-    mkdir -p "$out/bin"
+    mkdir -p "$out/share/jmol" "$out/bin"
 
     ${unzip}/bin/unzip jsmol.zip -d "$out/share/"
 
-    sed -i -e 's|command=java|command=${jre}/bin/java|' jmol.sh
     cp *.jar jmol.sh "$out/share/jmol"
-    ln -s $out/share/jmol/jmol.sh "$out/bin/jmol"
+    cp -r ${desktopItem}/share/applications $out/share
+    cp jmol $out/bin
   '';
 
   enableParallelBuilding = true;
@@ -38,7 +48,6 @@ stdenv.mkDerivation rec {
      homepage = https://sourceforge.net/projects/jmol;
      license = licenses.lgpl2;
      platforms = platforms.all;
-     maintainers = with maintainers; [ timokau ];
+     maintainers = with maintainers; [ timokau mounium ];
   };
 }
-

From c3e137e7cbf513d51415f619cc3c17ea35b370ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 25 Apr 2018 22:14:41 +0100
Subject: [PATCH 0438/3370] rubycop: 0.47.0 -> 0.55.0

---
 pkgs/development/tools/rubocop/Gemfile.lock | 24 ++++++------
 pkgs/development/tools/rubocop/gemset.nix   | 41 ++++++++++++---------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock
index abc782465ccc..d6185d79f1d1 100644
--- a/pkgs/development/tools/rubocop/Gemfile.lock
+++ b/pkgs/development/tools/rubocop/Gemfile.lock
@@ -1,20 +1,22 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
-    parser (2.3.3.1)
-      ast (~> 2.2)
+    ast (2.4.0)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
     powerpack (0.1.1)
-    rainbow (2.2.1)
-    rake (12.0.0)
-    rubocop (0.47.0)
-      parser (>= 2.3.3.1, < 3.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rubocop (0.55.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
-    unicode-display_width (1.1.3)
+    ruby-progressbar (1.9.0)
+    unicode-display_width (1.3.2)
 
 PLATFORMS
   ruby
@@ -24,4 +26,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.13.7
+   1.14.6
diff --git a/pkgs/development/tools/rubocop/gemset.nix b/pkgs/development/tools/rubocop/gemset.nix
index 908b5b76dd38..a2585a6e4f66 100644
--- a/pkgs/development/tools/rubocop/gemset.nix
+++ b/pkgs/development/tools/rubocop/gemset.nix
@@ -2,19 +2,27 @@
   ast = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
+      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
+  };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+      type = "gem";
+    };
+    version = "1.12.1";
   };
   parser = {
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nply96nqrkgx8d3jay31sfy5p4q74dg8ymln0mdazxx5cz2n8bq";
+      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
       type = "gem";
     };
-    version = "2.3.3.1";
+    version = "2.5.1.0";
   };
   powerpack = {
     source = {
@@ -25,45 +33,44 @@
     version = "0.1.1";
   };
   rainbow = {
-    dependencies = ["rake"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0frz90gyi5k26jx3ham1x661hpkxf82rkxb85nakcz70dna7i8ri";
+      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "3.0.0";
   };
   rake = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
+      sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg";
       type = "gem";
     };
-    version = "12.0.0";
+    version = "12.3.1";
   };
   rubocop = {
-    dependencies = ["parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lsv3zbjl14nqyqqvcwciz15nq76l7vg97nydrdsrxs2bc5jrlsm";
+      sha256 = "17qnk66q4diny1bvzbwsl1d5a26nj0mjzc2425h6nyp3xqjipz11";
       type = "gem";
     };
-    version = "0.47.0";
+    version = "0.55.0";
   };
   ruby-progressbar = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1qzc7s7r21bd7ah06kskajc2bjzkr9y0v5q48y0xwh2l55axgplm";
+      sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.9.0";
   };
   unicode-display_width = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1r28mxyi0zwby24wyn1szj5hcnv67066wkv14wyzsc94bf04fqhx";
+      sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
       type = "gem";
     };
-    version = "1.1.3";
+    version = "1.3.2";
   };
-}
+}
\ No newline at end of file

From 42297b0e1ce0198fa87b3b1d31c2057707ad4611 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 25 Apr 2018 14:44:03 -0700
Subject: [PATCH 0439/3370] limesuite: removed unnecessary cmakeFlag

---
 pkgs/applications/misc/limesuite/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/misc/limesuite/default.nix b/pkgs/applications/misc/limesuite/default.nix
index fb1ef8fb6696..4599fab0c6d6 100644
--- a/pkgs/applications/misc/limesuite/default.nix
+++ b/pkgs/applications/misc/limesuite/default.nix
@@ -30,8 +30,6 @@ in stdenv.mkDerivation {
     libX11
   ];
 
-  cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
-
   postInstall = ''
     mkdir -p $out/lib/udev/rules.d
     cp ../udev-rules/64-limesuite.rules $out/lib/udev/rules.d

From 189a4f3656d0a13e86091654a615c21b1e9031ec Mon Sep 17 00:00:00 2001
From: Michiel Derhaeg <derhaeg.michiel@gmail.com>
Date: Wed, 25 Apr 2018 23:54:57 +0200
Subject: [PATCH 0440/3370] verifast: 14.5 -> 18.02 (#39480)

---
 .../science/logic/verifast/default.nix        | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index ada586fc4e6d..8229af9649f8 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -2,25 +2,30 @@
 , fontconfig, libxml2, gnome2 }:
 
 assert stdenv.isLinux;
-
 let
+
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo
       freetype fontconfig libxml2 gnome2.gtksourceview
-    ] + ":${stdenv.cc.cc.lib}/lib64";
+    ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec";
 
   patchExe = x: ''
     patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath ${libPath} ${x}
   '';
+
+  patchLib = x: ''
+    patchelf --set-rpath ${libPath} ${x}
+  '';
+
 in
 stdenv.mkDerivation rec {
   name    = "verifast-${version}";
-  version = "14.5";
+  version = "18.02";
 
   src = fetchurl {
-    url    = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/${name}-x64.tar.gz";
-    sha256 = "03y1s6s2j9vqgiad0vbxriipsypxaylxxd3q36n9rvrc3lf9xra9";
+    url    = "https://github.com/verifast/verifast/releases/download/${version}/${name}-linux.tar.gz";
+    sha256 = "19050be23b6d5e471690421fee59f84c58b29e38379fb86b8f3713a206a4423e";
   };
 
   dontStrip = true;
@@ -29,10 +34,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp -R bin $out/libexec
 
-    ${patchExe "$out/libexec/verifast-core"}
-    ${patchExe "$out/libexec/vfide-core"}
-    ln -s $out/libexec/verifast-core $out/bin/verifast
-    ln -s $out/libexec/vfide-core    $out/bin/vfide
+    ${patchExe "$out/libexec/verifast"}
+    ${patchExe "$out/libexec/vfide"}
+    ${patchLib "$out/libexec/libz3.so"}
+    ln -s $out/libexec/verifast $out/bin/verifast
+    ln -s $out/libexec/vfide    $out/bin/vfide
   '';
 
   meta = {

From 59ad9933ff5065bbc14231d7a66c87bedfa0bad7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Apr 2018 19:55:12 +0200
Subject: [PATCH 0441/3370] gitaly: 0.81.0 -> 0.95.0

---
 .../version-management/gitaly/Gemfile         | 12 ++++--
 .../version-management/gitaly/Gemfile.lock    | 31 ++++++++------
 .../version-management/gitaly/default.nix     |  4 +-
 .../version-management/gitaly/gemset.nix      | 42 +++++++++++++------
 4 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index 2b95446161b8..b300f27918c5 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -1,13 +1,19 @@
 source 'https://rubygems.org'
 
-gem 'github-linguist', '~> 4.7.0', require: 'linguist'
+gem 'rugged', '~> 0.27.0'
+gem 'github-linguist', '~> 5.3.3', require: 'linguist'
 gem 'gitlab-markup', '~> 1.6.2'
-gem 'gitaly-proto', '~> 0.83.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.95.0', require: 'gitaly'
 gem 'activesupport', '~> 5.0.2'
 gem 'rdoc', '~> 4.2'
 gem 'gollum-lib', '~> 4.2', require: false
 gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
-gem 'grpc', '~> 1.8.0'
+gem 'grpc', '~> 1.10.0'
+gem 'sentry-raven', '~> 2.7.2', require: false
+
+# Detects the open source license the repository includes
+# This version needs to be in sync with GitLab CE/EE
+gem 'licensee', '~> 8.7.0'
 
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
 gem 'google-protobuf', '= 3.5.1'
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index cb53bb10122a..2687952c805b 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -9,7 +9,7 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     ast (2.3.0)
-    charlock_holmes (0.7.5)
+    charlock_holmes (0.7.6)
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     escape_utils (1.1.1)
@@ -17,14 +17,14 @@ GEM
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
-    gitaly-proto (0.83.0)
+    gitaly-proto (0.95.0)
       google-protobuf (~> 3.1)
-      grpc (~> 1.0)
-    github-linguist (4.7.6)
-      charlock_holmes (~> 0.7.3)
+      grpc (~> 1.10)
+    github-linguist (5.3.3)
+      charlock_holmes (~> 0.7.5)
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
-      rugged (>= 0.23.0b)
+      rugged (>= 0.25.1)
     github-markup (1.6.1)
     gitlab-grit (2.8.2)
       charlock_holmes (~> 0.6)
@@ -60,13 +60,15 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.8.7)
+    grpc (1.10.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
       googleauth (>= 0.5.1, < 0.7)
     i18n (0.8.1)
     json (2.1.0)
     jwt (2.1.0)
+    licensee (8.7.0)
+      rugged (~> 0.24)
     little-plugger (1.1.4)
     logging (2.2.2)
       little-plugger (~> 1.1)
@@ -87,7 +89,7 @@ GEM
       ast (~> 2.2)
     posix-spawn (0.3.13)
     powerpack (0.1.1)
-    public_suffix (3.0.1)
+    public_suffix (3.0.2)
     rainbow (2.2.2)
       rake
     rake (12.1.0)
@@ -118,9 +120,11 @@ GEM
     rubocop-rspec (1.17.0)
       rubocop (>= 0.50.0)
     ruby-progressbar (1.8.3)
-    rugged (0.26.0)
+    rugged (0.27.0)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
+    sentry-raven (2.7.2)
+      faraday (>= 0.7.6, < 1.0)
     signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
@@ -137,16 +141,19 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 5.0.2)
-  gitaly-proto (~> 0.83.0)
-  github-linguist (~> 4.7.0)
+  gitaly-proto (~> 0.95.0)
+  github-linguist (~> 5.3.3)
   gitlab-markup (~> 1.6.2)
   gitlab-styles (~> 2.0.0)
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.4)
   google-protobuf (= 3.5.1)
-  grpc (~> 1.8.0)
+  grpc (~> 1.10.0)
+  licensee (~> 8.7.0)
   rdoc (~> 4.2)
   rspec
+  rugged (~> 0.27.0)
+  sentry-raven (~> 2.7.2)
 
 BUNDLED WITH
    1.16.1
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 7a8ba0fda744..32884d0a1cc5 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.81.0";
+  version = "0.95.0";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "01sw5y201xbd21k9r7xmzqiiypb924ac95nqqfhzplqnssa98n9y";
+    sha256 = "0kadld8372vj0nm692mcn8j4ngph5gzzrzp8dmb4g26h10nq9k6a";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index efe786216628..9e6f01e3679d 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -28,10 +28,10 @@
   charlock_holmes = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y";
+      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
       type = "gem";
     };
-    version = "0.7.5";
+    version = "0.7.6";
   };
   concurrent-ruby = {
     source = {
@@ -79,19 +79,19 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z3asy104q36sshq9zhmgcm32sg8qr8jvy0mi19nakkq7prrkwqv";
+      sha256 = "0xwgi3902c89kx0fa176wz289nh67qm9bmx0yykrg5xx1lwk8a2j";
       type = "gem";
     };
-    version = "0.83.0";
+    version = "0.95.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd";
+      sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
       type = "gem";
     };
-    version = "4.7.6";
+    version = "5.3.3";
   };
   github-markup = {
     source = {
@@ -184,10 +184,10 @@
     dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02b80pyg4rgkiafyh1jqnfh6xp9abpd1x0a9c2h98f0851scw28b";
+      sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82";
       type = "gem";
     };
-    version = "1.8.7";
+    version = "1.10.0";
   };
   i18n = {
     source = {
@@ -213,6 +213,15 @@
     };
     version = "2.1.0";
   };
+  licensee = {
+    dependencies = ["rugged"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2";
+      type = "gem";
+    };
+    version = "8.7.0";
+  };
   little-plugger = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -340,10 +349,10 @@
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637";
+      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
       type = "gem";
     };
-    version = "3.0.1";
+    version = "3.0.2";
   };
   rainbow = {
     dependencies = ["rake"];
@@ -460,10 +469,10 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy";
+      sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3";
       type = "gem";
     };
-    version = "0.26.0";
+    version = "0.27.0";
   };
   sanitize = {
     dependencies = ["nokogiri"];
@@ -474,6 +483,15 @@
     };
     version = "2.1.0";
   };
+  sentry-raven = {
+    dependencies = ["faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4";
+      type = "gem";
+    };
+    version = "2.7.2";
+  };
   signet = {
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {

From ddec4ae7a0d1bf4ba39b2e1d94b99c50b911494f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Apr 2018 19:55:58 +0200
Subject: [PATCH 0442/3370] gitlab-shell: 6.0.3 -> 7.1.2

---
 .../version-management/gitlab-shell/default.nix             | 6 +++---
 .../version-management/gitlab-shell/fixes.patch             | 4 ++--
 .../gitlab-shell/remove-hardcoded-locations.patch           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index ca5b8a84fbf9..09c1cd13d440 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,14 +1,14 @@
 { stdenv, ruby, bundler, fetchFromGitLab, go }:
 
 stdenv.mkDerivation rec {
-  version = "6.0.3";
+  version = "7.1.2";
   name = "gitlab-shell-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    sha256 = "073y41d9sqy6l6dxbiml6c13fq98qcb0jf86w9slld1mcw19cmrk";
+    sha256 = "1mkr2k2ldn5hl84acajvfify97qy80lmicxx49jbpln22vh9rcni";
   };
 
   buildInputs = [ ruby bundler go ];
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.gitlab.com/;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with maintainers; [ fpletz globin ];
     license = licenses.mit;
   };
 }
diff --git a/pkgs/applications/version-management/gitlab-shell/fixes.patch b/pkgs/applications/version-management/gitlab-shell/fixes.patch
index b0ee31cf39dd..29e4dccb26c7 100644
--- a/pkgs/applications/version-management/gitlab-shell/fixes.patch
+++ b/pkgs/applications/version-management/gitlab-shell/fixes.patch
@@ -5,8 +5,8 @@ index 30a6b71..46b4dfa 100644
 @@ -26,8 +26,8 @@ module GoBuild
      raise "env must be a hash" unless env.is_a?(Hash)
      raise "cmd must be an array" unless cmd.is_a?(Array)
-   
--    if !system(env, *cmd)
+ 
+-    unless system(env, *cmd)
 -      abort "command failed: #{env.inspect} #{cmd.join(' ')}"
 -    end
 +    puts "Starting #{env.inspect} #{cmd.join(' ')}"
diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
index bc1aa8583867..38181399eec8 100644
--- a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -19,9 +19,9 @@ index 1452f95..2b40327 100644
      end
  
      # We use 'chdir: ROOT_PATH' to let the next executable know where config.yml is.
--    Kernel::exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
+-    Kernel.exec(env, *args, unsetenv_others: true, chdir: ROOT_PATH)
 +    # Except we don't, because we're already in the right directory on nixos!
-+    Kernel::exec(env, *args, unsetenv_others: true)
++    Kernel.exec(env, *args, unsetenv_others: true)
    end
  
    def api

From 775bbc2d574560134b9bffbe06c5703e0d68cd4c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Apr 2018 19:56:45 +0200
Subject: [PATCH 0443/3370] gitlab-workhorse: 3.6.0 -> 4.1.0

---
 .../version-management/gitlab-workhorse/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 6bb696406c9d..05cf33d408a5 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  version = "3.6.0";
+  version = "4.1.0";
   name = "gitlab-workhorse-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1vcxm9m82m1dcc86r29k5v8cp3zvpby4kszbkavl3frm3ws0w9lz";
+    sha256 = "1yqmkpszcan5cawkl9cxjngcyqlqg061ihk31isar9ifbhpv9yfv";
   };
 
   buildInputs = [ git go ];
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.gitlab.com/;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ fpletz ];
+    maintainers = with maintainers; [ fpletz globin ];
     license = licenses.mit;
   };
 }

From 04ab1ed623fb1f3d02339c789452020771d73c06 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Apr 2018 19:57:10 +0200
Subject: [PATCH 0444/3370] gitlab: 10.5.6 -> 10.7.0

---
 .../version-management/gitlab/Gemfile         |  99 +++--
 .../version-management/gitlab/Gemfile.lock    | 293 +++++++-------
 .../version-management/gitlab/default.nix     |  19 +-
 .../version-management/gitlab/gemset.nix      | 367 ++++++++++--------
 4 files changed, 409 insertions(+), 369 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 97d40857e117..d85ee9886443 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -1,6 +1,18 @@
+# --- Special code for migrating to Rails 5.0 ---
+def rails5?
+  %w[1 true].include?(ENV["RAILS5"])
+end
+
+gem_versions = {}
+gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0'      : '0.2'
+gem_versions['default_value_for']               = rails5? ? '~> 3.0.5' : '~> 3.0.0'
+gem_versions['rails']                           = rails5? ? '5.0.6'    : '4.2.10'
+gem_versions['rails-i18n']                      = rails5? ? '~> 5.1'   : '~> 4.0.9'
+# --- The end of special code for migrating to Rails 5.0 ---
+
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.10'
+gem 'rails', gem_versions['rails']
 gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 
 # Responders respond_to and respond_with
@@ -9,36 +21,37 @@ gem 'responders', '~> 2.0'
 gem 'sprockets', '~> 3.7.0'
 
 # Default values for AR models
-gem 'default_value_for', '~> 3.0.0'
+gem 'default_value_for', gem_versions['default_value_for']
 
 # Supported DBs
 gem 'mysql2', '~> 0.4.10', group: :mysql
 gem 'pg', '~> 0.18.2', group: :postgres
 
-gem 'rugged', '~> 0.26.0'
+gem 'rugged', '~> 0.27'
 gem 'grape-route-helpers', '~> 2.1.0'
 
 gem 'faraday', '~> 0.12'
 
 # Authentication libraries
 gem 'devise', '~> 4.2'
-gem 'doorkeeper', '~> 4.2.0'
-gem 'doorkeeper-openid_connect', '~> 1.2.0'
-gem 'omniauth', '~> 1.4.2'
+gem 'doorkeeper', '~> 4.3'
+gem 'doorkeeper-openid_connect', '~> 1.3'
+gem 'omniauth', '~> 1.8'
 gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
 gem 'omniauth-cas3', '~> 1.1.4'
 gem 'omniauth-facebook', '~> 4.0.0'
 gem 'omniauth-github', '~> 1.1.1'
 gem 'omniauth-gitlab', '~> 1.0.2'
-gem 'omniauth-google-oauth2', '~> 0.5.2'
+gem 'omniauth-google-oauth2', '~> 0.5.3'
 gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
 gem 'omniauth-oauth2-generic', '~> 0.2.2'
-gem 'omniauth-saml', '~> 1.7.0'
+gem 'omniauth-saml', '~> 1.10'
 gem 'omniauth-shibboleth', '~> 1.2.0'
-gem 'omniauth-twitter', '~> 1.2.0'
+gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.2.0'
 gem 'omniauth-authentiq', '~> 0.3.1'
+gem 'omniauth-jwt', '~> 0.0.2'
 gem 'rack-oauth2', '~> 1.2.1'
 gem 'jwt', '~> 1.5.6'
 
@@ -81,7 +94,7 @@ gem 'gollum-lib', '~> 4.2', require: false
 gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
 
 # Language detection
-gem 'github-linguist', '~> 4.7.0', require: 'linguist'
+gem 'github-linguist', '~> 5.3.3', require: 'linguist'
 
 # API
 gem 'grape', '~> 1.0'
@@ -104,16 +117,16 @@ gem 'carrierwave', '~> 1.2'
 gem 'dropzonejs-rails', '~> 0.7.1'
 
 # for backups
-gem 'fog-aws', '~> 1.4'
+gem 'fog-aws', '~> 2.0.1'
 gem 'fog-core', '~> 1.44'
-gem 'fog-google', '~> 0.5'
+gem 'fog-google', '~> 1.3.3'
 gem 'fog-local', '~> 0.3'
 gem 'fog-openstack', '~> 0.1'
 gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.2.0'
 
 # for Google storage
-gem 'google-api-client', '~> 0.13.6'
+gem 'google-api-client', '~> 0.19.8'
 
 # for aws storage
 gem 'unf', '~> 0.1.4'
@@ -122,17 +135,18 @@ gem 'unf', '~> 0.1.4'
 gem 'seed-fu', '~> 2.3.7'
 
 # Markdown and HTML processing
-gem 'html-pipeline', '~> 1.11.0'
+gem 'html-pipeline', '~> 2.7.1'
 gem 'deckar01-task_list', '2.0.0'
 gem 'gitlab-markup', '~> 1.6.2'
 gem 'redcarpet', '~> 3.4'
+gem 'commonmarker', '~> 0.17'
 gem 'RedCloth', '~> 4.3.2'
 gem 'rdoc', '~> 4.2'
 gem 'org-ruby', '~> 0.9.12'
 gem 'creole', '~> 0.5.0'
 gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.2'
-gem 'asciidoctor-plantuml', '0.0.7'
+gem 'asciidoctor', '~> 1.5.6'
+gem 'asciidoctor-plantuml', '0.0.8'
 gem 'rouge', '~> 2.0'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
@@ -148,10 +162,10 @@ group :unicorn do
 end
 
 # State machine
-gem 'state_machines-activerecord', '~> 0.4.0'
+gem 'state_machines-activerecord', '~> 0.5.1'
 
 # Issue tags
-gem 'acts-as-taggable-on', '~> 4.0'
+gem 'acts-as-taggable-on', '~> 5.0'
 
 # Background jobs
 gem 'sidekiq', '~> 5.0'
@@ -207,7 +221,7 @@ gem 'asana', '~> 0.6.0'
 gem 'ruby-fogbugz', '~> 0.2.1'
 
 # Kubernetes integration
-gem 'kubeclient', '~> 2.2.0'
+gem 'kubeclient', '~> 3.0'
 
 # d3
 gem 'd3_rails', '~> 3.5.0'
@@ -217,10 +231,10 @@ gem 'sanitize', '~> 2.0'
 gem 'babosa', '~> 1.0.2'
 
 # Sanitizes SVG input
-gem 'loofah', '~> 2.0.3'
+gem 'loofah', '~> 2.2'
 
 # Working with license
-gem 'licensee', '~> 8.7.0'
+gem 'licensee', '~> 8.9'
 
 # Protect against bruteforcing
 gem 'rack-attack', '~> 4.4.1'
@@ -234,9 +248,6 @@ gem 'mousetrap-rails', '~> 1.4.6'
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.5'
 
-# Faster JSON
-gem 'oj', '~> 2.17.4'
-
 # Faster blank
 gem 'fast_blank'
 
@@ -256,22 +267,21 @@ gem 'font-awesome-rails', '~> 4.7'
 gem 'gemojione', '~> 3.3'
 gem 'gon', '~> 6.1.0'
 gem 'jquery-atwho-rails', '~> 1.3.2'
-gem 'jquery-rails', '~> 4.3.1'
 gem 'request_store', '~> 1.3'
 gem 'select2-rails', '~> 3.5.9'
 gem 'virtus', '~> 1.0.1'
 gem 'base32', '~> 0.3.0'
 
 # Sentry integration
-gem 'sentry-raven', '~> 2.5.3'
+gem 'sentry-raven', '~> 2.7'
 
 gem 'premailer-rails', '~> 1.9.7'
 
 # I18n
 gem 'ruby_parser', '~> 3.8', require: false
-gem 'rails-i18n', '~> 4.0.9'
+gem 'rails-i18n', gem_versions['rails-i18n']
 gem 'gettext_i18n_rails', '~> 1.8.0'
-gem 'gettext_i18n_rails_js', '~> 1.2.0'
+gem 'gettext_i18n_rails_js', '~> 1.3'
 gem 'gettext', '~> 3.2.2', require: false, group: :development
 
 gem 'batch-loader', '~> 1.2.1'
@@ -279,7 +289,6 @@ gem 'batch-loader', '~> 1.2.1'
 # Perf bar
 gem 'peek', '~> 1.0.1'
 gem 'peek-gc', '~> 0.0.2'
-gem 'peek-host', '~> 1.0.0'
 gem 'peek-mysql2', '~> 1.1.0', group: :mysql
 gem 'peek-performance_bar', '~> 1.3.0'
 gem 'peek-pg', '~> 1.3.0', group: :postgres
@@ -299,8 +308,8 @@ group :metrics do
 end
 
 group :development do
-  gem 'foreman', '~> 0.78.0'
-  gem 'brakeman', '~> 3.6.0', require: false
+  gem 'foreman', '~> 0.84.0'
+  gem 'brakeman', '~> 4.2', require: false
 
   gem 'letter_opener_web', '~> 1.3.0'
   gem 'rblineprof', '~> 0.3.6', platform: :mri, require: false
@@ -359,13 +368,15 @@ group :development, :test do
   gem 'benchmark-ips', '~> 2.3.0', require: false
 
   gem 'license_finder', '~> 3.1', require: false
-  gem 'knapsack', '~> 1.11.0'
+  gem 'knapsack', '~> 1.16'
 
-  gem 'activerecord_sane_schema_dumper', '0.2'
+  gem 'activerecord_sane_schema_dumper', gem_versions['activerecord_sane_schema_dumper']
 
   gem 'stackprof', '~> 0.2.10', require: false
 
   gem 'simple_po_parser', '~> 1.1.2', require: false
+
+  gem 'timecop', '~> 0.8.0'
 end
 
 group :test do
@@ -373,21 +384,20 @@ group :test do
   gem 'email_spec', '~> 1.6.0'
   gem 'json-schema', '~> 2.8.0'
   gem 'webmock', '~> 2.3.2'
-  gem 'test_after_commit', '~> 1.1'
+  gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
   gem 'sham_rack', '~> 1.3.6'
-  gem 'timecop', '~> 0.8.0'
   gem 'concurrent-ruby', '~> 1.0.5'
   gem 'test-prof', '~> 0.2.5'
 end
 
-gem 'octokit', '~> 4.6.2'
+gem 'octokit', '~> 4.8'
 
 gem 'mail_room', '~> 0.9.1'
 
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
 
-gem 'ruby-prof', '~> 0.16.2'
+gem 'ruby-prof', '~> 0.17.0'
 
 # OAuth
 gem 'oauth2', '~> 1.4'
@@ -400,7 +410,8 @@ gem 'vmstat', '~> 2.3.0'
 gem 'sys-filesystem', '~> 1.1.6'
 
 # SSH host key support
-gem 'net-ssh', '~> 4.1.0'
+gem 'net-ssh', '~> 4.2.0'
+gem 'sshkey', '~> 1.9.0'
 
 # Required for ED25519 SSH host key support
 group :ed25519 do
@@ -410,16 +421,18 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.84.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.94.0', require: 'gitaly'
+gem 'grpc', '~> 1.10.0'
+
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
 gem 'google-protobuf', '= 3.5.1'
 
-gem 'toml-rb', '~> 0.3.15', require: false
+gem 'toml-rb', '~> 1.0.0', require: false
 
 # Feature toggles
-gem 'flipper', '~> 0.11.0'
-gem 'flipper-active_record', '~> 0.11.0'
-gem 'flipper-active_support_cache_store', '~> 0.11.0'
+gem 'flipper', '~> 0.13.0'
+gem 'flipper-active_record', '~> 0.13.0'
+gem 'flipper-active_support_cache_store', '~> 0.13.0'
 
 # Structured logging
 gem 'lograge', '~> 0.5'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 4022e2896116..a1150dfccdd2 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -40,13 +40,14 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (4.0.0)
-      activerecord (>= 4.0)
+    acts-as-taggable-on (5.0.0)
+      activerecord (>= 4.2.8)
     adamantium (0.2.0)
       ice_nine (~> 0.11.0)
       memoizable (~> 0.4.0)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
+    aes_key_wrap (1.0.1)
     akismet (2.0.0)
     allocations (1.0.5)
     arel (6.0.4)
@@ -55,15 +56,15 @@ GEM
       faraday_middleware (~> 0.9)
       faraday_middleware-multi_json (~> 0.0)
       oauth2 (~> 1.0)
-    asciidoctor (1.5.3)
-    asciidoctor-plantuml (0.0.7)
+    asciidoctor (1.5.6.2)
+    asciidoctor-plantuml (0.0.8)
       asciidoctor (~> 1.5)
     asset_sync (2.2.0)
       activemodel (>= 4.1.0)
       fog-core
       mime-types (>= 2.99)
       unf
-    ast (2.3.0)
+    ast (2.4.0)
     atomic (1.1.99)
     attr_encrypted (3.0.3)
       encryptor (~> 3.0.0)
@@ -86,7 +87,7 @@ GEM
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
-    bindata (2.4.1)
+    bindata (2.4.3)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     blankslate (2.1.2.4)
@@ -94,7 +95,7 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     bootstrap_form (2.7.0)
-    brakeman (3.6.1)
+    brakeman (4.2.1)
     browser (2.2.0)
     builder (3.2.3)
     bullet (5.5.1)
@@ -119,7 +120,7 @@ GEM
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
     cause (0.1)
-    charlock_holmes (0.7.5)
+    charlock_holmes (0.7.6)
     childprocess (0.7.0)
       ffi (~> 1.0, >= 1.0.11)
     chronic (0.10.2)
@@ -131,6 +132,8 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colorize (0.7.7)
+    commonmarker (0.17.8)
+      ruby-enum (~> 0.5)
     concord (0.1.5)
       adamantium (~> 0.2.0)
       equalizer (~> 0.0.9)
@@ -140,6 +143,7 @@ GEM
     connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
+    crass (1.0.3)
     creole (0.5.0)
     css_parser (1.5.0)
       addressable
@@ -172,12 +176,12 @@ GEM
     diff-lcs (1.3)
     diffy (3.1.0)
     docile (1.1.5)
-    domain_name (0.5.20161021)
+    domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.2.6)
+    doorkeeper (4.3.1)
       railties (>= 4.2)
-    doorkeeper-openid_connect (1.2.0)
-      doorkeeper (~> 4.0)
+    doorkeeper-openid_connect (1.3.0)
+      doorkeeper (~> 4.3)
       json-jwt (~> 1.6)
     dropzonejs-rails (0.7.2)
       rails (> 3.1)
@@ -192,7 +196,7 @@ GEM
     et-orbi (1.0.3)
       tzinfo
     eventmachine (1.0.8)
-    excon (0.57.1)
+    excon (0.60.0)
     execjs (2.6.0)
     expression_parser (0.9.0)
     factory_bot (4.8.2)
@@ -208,7 +212,7 @@ GEM
       faraday_middleware
       multi_json
     fast_blank (1.0.0)
-    fast_gettext (1.4.0)
+    fast_gettext (1.6.0)
     ffaker (2.4.0)
     ffi (1.9.18)
     flay (2.10.0)
@@ -216,13 +220,13 @@ GEM
       path_expander (~> 1.0)
       ruby_parser (~> 3.0)
       sexp_processor (~> 4.0)
-    flipper (0.11.0)
-    flipper-active_record (0.11.0)
+    flipper (0.13.0)
+    flipper-active_record (0.13.0)
       activerecord (>= 3.2, < 6)
-      flipper (~> 0.11.0)
-    flipper-active_support_cache_store (0.11.0)
+      flipper (~> 0.13.0)
+    flipper-active_support_cache_store (0.13.0)
       activesupport (>= 3.2, < 6)
-      flipper (~> 0.11.0)
+      flipper (~> 0.13.0)
     flowdock (0.7.1)
       httparty (~> 0.7)
       multi_json
@@ -231,19 +235,20 @@ GEM
       fog-json (~> 1.0)
       ipaddress (~> 0.8)
       xml-simple (~> 1.1)
-    fog-aws (1.4.0)
+    fog-aws (2.0.1)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (1.44.3)
+    fog-core (1.45.0)
       builder
-      excon (~> 0.49)
+      excon (~> 0.58)
       formatador (~> 0.2)
-    fog-google (0.5.3)
+    fog-google (1.3.3)
       fog-core
       fog-json
       fog-xml
+      google-api-client (~> 0.19.1)
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
@@ -263,7 +268,7 @@ GEM
       nokogiri (>= 1.5.11, < 2.0.0)
     font-awesome-rails (4.7.0.1)
       railties (>= 3.2, < 5.1)
-    foreman (0.78.0)
+    foreman (0.84.0)
       thor (~> 0.19.1)
     formatador (0.2.5)
     fuubar (2.2.0)
@@ -274,25 +279,25 @@ GEM
     gemojione (3.3.0)
       json
     get_process_mem (0.2.0)
-    gettext (3.2.2)
+    gettext (3.2.9)
       locale (>= 2.0.5)
       text (>= 1.3.0)
     gettext_i18n_rails (1.8.0)
       fast_gettext (>= 0.9.0)
-    gettext_i18n_rails_js (1.2.0)
+    gettext_i18n_rails_js (1.3.0)
       gettext (>= 3.0.2)
       gettext_i18n_rails (>= 0.7.1)
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-    gitaly-proto (0.84.0)
+    gitaly-proto (0.94.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.0)
-    github-linguist (4.7.6)
-      charlock_holmes (~> 0.7.3)
+    github-linguist (5.3.3)
+      charlock_holmes (~> 0.7.5)
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
-      rugged (>= 0.23.0b)
+      rugged (>= 0.25.1)
     github-markup (1.6.1)
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
@@ -333,9 +338,9 @@ GEM
       json
       multi_json
       request_store (>= 1.0)
-    google-api-client (0.13.6)
+    google-api-client (0.19.8)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.5)
+      googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
       mime-types (~> 3.0)
       representable (~> 3.0)
@@ -343,9 +348,9 @@ GEM
     google-protobuf (3.5.1)
     googleapis-common-protos-types (1.0.1)
       google-protobuf (~> 3.0)
-    googleauth (0.5.3)
+    googleauth (0.6.2)
       faraday (~> 0.12)
-      jwt (~> 1.4)
+      jwt (>= 1.4, < 3.0)
       logging (~> 2.0)
       memoist (~> 0.12)
       multi_json (~> 1.11)
@@ -353,7 +358,7 @@ GEM
       signet (~> 0.7)
     gpgme (2.0.13)
       mini_portile2 (~> 2.1)
-    grape (1.0.0)
+    grape (1.0.2)
       activesupport
       builder
       mustermann-grape (~> 1.0.0)
@@ -369,7 +374,7 @@ GEM
       rake
     grape_logging (1.7.0)
       grape
-    grpc (1.8.3)
+    grpc (1.10.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
       googleauth (>= 0.5.1, < 0.7)
@@ -386,7 +391,7 @@ GEM
       thor
       tilt
     hashdiff (0.3.4)
-    hashie (3.5.6)
+    hashie (3.5.7)
     hashie-forbidden_attributes (0.1.1)
       hashie (>= 3.0)
     health_check (2.6.0)
@@ -394,26 +399,26 @@ GEM
     hipchat (1.5.2)
       httparty
       mimemagic
-    html-pipeline (1.11.0)
+    html-pipeline (2.7.1)
       activesupport (>= 2)
-      nokogiri (~> 1.4)
+      nokogiri (>= 1.4)
     html2text (0.2.0)
       nokogiri (~> 1.6)
     htmlentities (4.3.4)
-    http (0.9.8)
+    http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)
       http_parser.rb (~> 0.6.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    http-form_data (1.0.1)
+    http-form_data (1.0.3)
     http_parser.rb (0.6.0)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    httpclient (2.8.2)
-    i18n (0.9.1)
+    httpclient (2.8.3)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     influxdb (0.2.3)
@@ -425,15 +430,11 @@ GEM
       multipart-post
       oauth (~> 0.5, >= 0.5.0)
     jquery-atwho-rails (1.3.2)
-    jquery-rails (4.3.1)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
     json (1.8.6)
-    json-jwt (1.7.2)
+    json-jwt (1.9.2)
       activesupport
+      aes_key_wrap
       bindata
-      multi_json (>= 1.3)
       securecompare
       url_safe_base64
     json-schema (2.8.0)
@@ -452,13 +453,13 @@ GEM
       kaminari-core (= 1.0.1)
     kaminari-core (1.0.1)
     kgio (2.10.0)
-    knapsack (1.11.0)
+    knapsack (1.16.0)
       rake
       timecop (>= 0.1.0)
-    kubeclient (2.2.0)
-      http (= 0.9.8)
-      recursive-open-struct (= 1.0.0)
-      rest-client
+    kubeclient (3.0.0)
+      http (~> 2.2.2)
+      recursive-open-struct (~> 1.0.4)
+      rest-client (~> 2.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.4.1)
@@ -475,7 +476,7 @@ GEM
       toml (= 0.1.2)
       with_env (> 1.0)
       xml-simple
-    licensee (8.7.0)
+    licensee (8.9.2)
       rugged (~> 0.24)
     little-plugger (1.1.4)
     locale (2.1.2)
@@ -486,7 +487,8 @@ GEM
       actionpack (>= 4, < 5.2)
       activesupport (>= 4, < 5.2)
       railties (>= 4, < 5.2)
-    loofah (2.0.3)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
@@ -499,36 +501,35 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mimemagic (0.3.0)
-    mini_mime (0.1.4)
+    mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.7.0)
     mousetrap-rails (1.4.6)
-    multi_json (1.12.2)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (1.0.0)
+    mustermann (1.0.2)
     mustermann-grape (1.0.0)
       mustermann (~> 1.0.0)
     mysql2 (0.4.10)
     net-ldap (0.16.0)
-    net-ssh (4.1.0)
+    net-ssh (4.2.0)
     netrc (0.11.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     numerizer (0.1.1)
-    oauth (0.5.1)
+    oauth (0.5.4)
     oauth2 (1.4.0)
       faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octokit (4.6.2)
+    octokit (4.8.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (2.17.5)
-    omniauth (1.4.2)
-      hashie (>= 1.2, < 4)
-      rack (>= 1.0, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
     omniauth-auth0 (2.0.0)
       omniauth-oauth2 (~> 1.4)
     omniauth-authentiq (0.3.1)
@@ -549,11 +550,13 @@ GEM
     omniauth-gitlab (1.0.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.5.2)
-      jwt (~> 1.5)
-      multi_json (~> 1.3)
+    omniauth-google-oauth2 (0.5.3)
+      jwt (>= 1.5)
       omniauth (>= 1.1.1)
-      omniauth-oauth2 (>= 1.3.1)
+      omniauth-oauth2 (>= 1.5)
+    omniauth-jwt (0.0.2)
+      jwt
+      omniauth (~> 1.1)
     omniauth-kerberos (0.3.0)
       omniauth-multipassword
       timfel-krb5-auth (~> 0.8)
@@ -562,19 +565,19 @@ GEM
     omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.4.0)
-      oauth2 (~> 1.0)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
       omniauth (~> 1.2)
     omniauth-oauth2-generic (0.2.2)
       omniauth-oauth2 (~> 1.0)
-    omniauth-saml (1.7.0)
-      omniauth (~> 1.3)
-      ruby-saml (~> 1.4)
+    omniauth-saml (1.10.0)
+      omniauth (~> 1.3, >= 1.3.2)
+      ruby-saml (~> 1.7)
     omniauth-shibboleth (1.2.1)
       omniauth (>= 1.0.0)
-    omniauth-twitter (1.2.1)
-      json (~> 1.3)
+    omniauth-twitter (1.4.0)
       omniauth-oauth (~> 1.1)
+      rack
     omniauth_crowd (2.2.3)
       activesupport
       nokogiri (>= 1.4.4)
@@ -584,8 +587,8 @@ GEM
     orm_adapter (0.5.0)
     os (0.9.6)
     parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
+    parser (2.5.0.5)
+      ast (~> 2.4.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
     path_expander (1.0.2)
@@ -595,13 +598,11 @@ GEM
       railties (>= 4.0.0)
     peek-gc (0.0.2)
       peek
-    peek-host (1.0.0)
-      peek
     peek-mysql2 (1.1.0)
       atomic (>= 1.0.0)
       mysql2
       peek
-    peek-performance_bar (1.3.0)
+    peek-performance_bar (1.3.1)
       peek (>= 0.1.0)
     peek-pg (1.3.0)
       concurrent-ruby
@@ -646,9 +647,9 @@ GEM
       pry (~> 0.10)
     pry-rails (0.3.5)
       pry (>= 0.9.10)
-    public_suffix (3.0.0)
+    public_suffix (3.0.2)
     pyu-ruby-sasl (0.0.3.3)
-    rack (1.6.8)
+    rack (1.6.9)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (4.4.1)
@@ -660,7 +661,7 @@ GEM
       httpclient (>= 2.4)
       multi_json (>= 1.3.6)
       rack (>= 1.1)
-    rack-protection (1.5.3)
+    rack-protection (2.0.1)
       rack
     rack-proxy (0.6.0)
       rack
@@ -679,12 +680,12 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
@@ -711,7 +712,7 @@ GEM
     re2 (1.1.1)
     recaptcha (3.0.0)
       json
-    recursive-open-struct (1.0.0)
+    recursive-open-struct (1.0.5)
     redcarpet (3.4.0)
     redis (3.3.5)
     redis-actionpack (5.0.2)
@@ -739,7 +740,7 @@ GEM
     request_store (1.3.1)
     responders (2.3.0)
       railties (>= 4.2.0, < 5.1)
-    rest-client (2.0.0)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -797,11 +798,13 @@ GEM
       rubocop (>= 0.51)
     rubocop-rspec (1.22.1)
       rubocop (>= 0.52.1)
+    ruby-enum (0.7.2)
+      i18n
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
-    ruby-prof (0.16.2)
+    ruby-prof (0.17.0)
     ruby-progressbar (1.9.0)
-    ruby-saml (1.4.1)
+    ruby-saml (1.7.2)
       nokogiri (>= 1.5.10)
     ruby_parser (3.9.0)
       sexp_processor (~> 4.1)
@@ -810,7 +813,7 @@ GEM
     rubyzip (1.2.1)
     rufus-scheduler (3.4.0)
       et-orbi (~> 1.0)
-    rugged (0.26.0)
+    rugged (0.27.0)
     safe_yaml (1.0.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
@@ -840,7 +843,7 @@ GEM
     selenium-webdriver (3.5.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
-    sentry-raven (2.5.3)
+    sentry-raven (2.7.2)
       faraday (>= 0.7.6, < 1.0)
     settingslogic (2.0.9)
     sexp_processor (4.9.0)
@@ -858,10 +861,10 @@ GEM
       sidekiq (>= 4.2.1)
     sidekiq-limit_fetch (3.4.0)
       sidekiq (>= 4)
-    signet (0.7.3)
+    signet (0.8.1)
       addressable (~> 2.3)
       faraday (~> 0.9)
-      jwt (~> 1.5)
+      jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     simple_po_parser (1.1.2)
     simplecov (0.14.1)
@@ -895,14 +898,15 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
+    sshkey (1.9.0)
     stackprof (0.2.10)
-    state_machines (0.4.0)
-    state_machines-activemodel (0.4.0)
-      activemodel (>= 4.1, < 5.1)
-      state_machines (>= 0.4.0)
-    state_machines-activerecord (0.4.0)
-      activerecord (>= 4.1, < 5.1)
-      state_machines-activemodel (>= 0.3.0)
+    state_machines (0.5.0)
+    state_machines-activemodel (0.5.1)
+      activemodel (>= 4.1, < 6.0)
+      state_machines (>= 0.5.0)
+    state_machines-activerecord (0.5.1)
+      activerecord (>= 4.1, < 6.0)
+      state_machines-activemodel (>= 0.5.0)
     stringex (2.7.1)
     sys-filesystem (1.1.6)
       ffi
@@ -923,12 +927,12 @@ GEM
     timfel-krb5-auth (0.8.3)
     toml (0.1.2)
       parslet (~> 1.5.0)
-    toml-rb (0.3.15)
+    toml-rb (1.0.0)
       citrus (~> 3.0, > 3.0)
     truncato (0.7.10)
       htmlentities (~> 4.3.1)
       nokogiri (~> 1.8.0, >= 1.7.0)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     u2f (0.2.1)
     uber (0.1.0)
@@ -937,7 +941,7 @@ GEM
       json (>= 1.8.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.4)
+    unf_ext (0.0.7.5)
     unicode-display_width (1.3.0)
     unicorn (5.1.0)
       kgio (~> 2.6)
@@ -946,13 +950,13 @@ GEM
       get_process_mem (~> 0)
       unicorn (>= 4, < 6)
     uniform_notifier (1.10.0)
-    unparser (0.2.6)
+    unparser (0.2.7)
       abstract_type (~> 0.0.7)
       adamantium (~> 0.2.0)
       concord (~> 0.1.5)
       diff-lcs (~> 1.3)
       equalizer (~> 0.0.9)
-      parser (>= 2.3.1.2, < 2.5)
+      parser (>= 2.3.1.2, < 2.6)
       procto (~> 0.0.2)
     url_safe_base64 (0.2.2)
     validates_hostname (1.0.6)
@@ -989,13 +993,13 @@ DEPENDENCIES
   RedCloth (~> 4.3.2)
   ace-rails-ap (~> 4.1.0)
   activerecord_sane_schema_dumper (= 0.2)
-  acts-as-taggable-on (~> 4.0)
+  acts-as-taggable-on (~> 5.0)
   addressable (~> 2.5.2)
   akismet (~> 2.0)
   allocations (~> 1.0)
   asana (~> 0.6.0)
-  asciidoctor (~> 1.5.2)
-  asciidoctor-plantuml (= 0.0.7)
+  asciidoctor (~> 1.5.6)
+  asciidoctor-plantuml (= 0.0.8)
   asset_sync (~> 2.2.0)
   attr_encrypted (~> 3.0.0)
   awesome_print (~> 1.2.0)
@@ -1008,7 +1012,7 @@ DEPENDENCIES
   binding_of_caller (~> 0.7.2)
   bootstrap-sass (~> 3.3.0)
   bootstrap_form (~> 2.7.0)
-  brakeman (~> 3.6.0)
+  brakeman (~> 4.2)
   browser (~> 2.2)
   bullet (~> 5.5.0)
   bundler-audit (~> 0.5.0)
@@ -1018,6 +1022,7 @@ DEPENDENCIES
   charlock_holmes (~> 0.7.5)
   chronic (~> 0.10.2)
   chronic_duration (~> 0.10.6)
+  commonmarker (~> 0.17)
   concurrent-ruby (~> 1.0.5)
   connection_pool (~> 2.0)
   creole (~> 0.5.0)
@@ -1028,8 +1033,8 @@ DEPENDENCIES
   devise (~> 4.2)
   devise-two-factor (~> 3.0.0)
   diffy (~> 3.1.0)
-  doorkeeper (~> 4.2.0)
-  doorkeeper-openid_connect (~> 1.2.0)
+  doorkeeper (~> 4.3)
+  doorkeeper-openid_connect (~> 1.3)
   dropzonejs-rails (~> 0.7.1)
   email_reply_trimmer (~> 0.1)
   email_spec (~> 1.6.0)
@@ -1038,26 +1043,26 @@ DEPENDENCIES
   fast_blank
   ffaker (~> 2.4)
   flay (~> 2.10.0)
-  flipper (~> 0.11.0)
-  flipper-active_record (~> 0.11.0)
-  flipper-active_support_cache_store (~> 0.11.0)
+  flipper (~> 0.13.0)
+  flipper-active_record (~> 0.13.0)
+  flipper-active_support_cache_store (~> 0.13.0)
   fog-aliyun (~> 0.2.0)
-  fog-aws (~> 1.4)
+  fog-aws (~> 2.0.1)
   fog-core (~> 1.44)
-  fog-google (~> 0.5)
+  fog-google (~> 1.3.3)
   fog-local (~> 0.3)
   fog-openstack (~> 0.1)
   fog-rackspace (~> 0.1.1)
   font-awesome-rails (~> 4.7)
-  foreman (~> 0.78.0)
+  foreman (~> 0.84.0)
   fuubar (~> 2.2.0)
   gemnasium-gitlab-service (~> 0.2)
   gemojione (~> 3.3)
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
-  gettext_i18n_rails_js (~> 1.2.0)
-  gitaly-proto (~> 0.84.0)
-  github-linguist (~> 4.7.0)
+  gettext_i18n_rails_js (~> 1.3)
+  gitaly-proto (~> 0.94.0)
+  github-linguist (~> 5.3.3)
   gitlab-flowdock-git-hook (~> 1.0.1)
   gitlab-markup (~> 1.6.2)
   gitlab-styles (~> 2.3)
@@ -1065,47 +1070,46 @@ DEPENDENCIES
   gollum-lib (~> 4.2)
   gollum-rugged_adapter (~> 0.4.4)
   gon (~> 6.1.0)
-  google-api-client (~> 0.13.6)
+  google-api-client (~> 0.19.8)
   google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
   grape-entity (~> 0.6.0)
   grape-route-helpers (~> 2.1.0)
   grape_logging (~> 1.7)
+  grpc (~> 1.10.0)
   haml_lint (~> 0.26.0)
   hamlit (~> 2.6.1)
   hashie-forbidden_attributes
   health_check (~> 2.6.0)
   hipchat (~> 1.5.0)
-  html-pipeline (~> 1.11.0)
+  html-pipeline (~> 2.7.1)
   html2text
   httparty (~> 0.13.3)
   influxdb (~> 0.2)
   jira-ruby (~> 1.4)
   jquery-atwho-rails (~> 1.3.2)
-  jquery-rails (~> 4.3.1)
   json-schema (~> 2.8.0)
   jwt (~> 1.5.6)
   kaminari (~> 1.0)
-  knapsack (~> 1.11.0)
-  kubeclient (~> 2.2.0)
+  knapsack (~> 1.16)
+  kubeclient (~> 3.0)
   letter_opener_web (~> 1.3.0)
   license_finder (~> 3.1)
-  licensee (~> 8.7.0)
+  licensee (~> 8.9)
   lograge (~> 0.5)
-  loofah (~> 2.0.3)
+  loofah (~> 2.2)
   mail_room (~> 0.9.1)
   method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.4.10)
   net-ldap
-  net-ssh (~> 4.1.0)
+  net-ssh (~> 4.2.0)
   nokogiri (~> 1.8.2)
   oauth2 (~> 1.4)
-  octokit (~> 4.6.2)
-  oj (~> 2.17.4)
-  omniauth (~> 1.4.2)
+  octokit (~> 4.8)
+  omniauth (~> 1.8)
   omniauth-auth0 (~> 2.0.0)
   omniauth-authentiq (~> 0.3.1)
   omniauth-azure-oauth2 (~> 0.0.9)
@@ -1113,17 +1117,17 @@ DEPENDENCIES
   omniauth-facebook (~> 4.0.0)
   omniauth-github (~> 1.1.1)
   omniauth-gitlab (~> 1.0.2)
-  omniauth-google-oauth2 (~> 0.5.2)
+  omniauth-google-oauth2 (~> 0.5.3)
+  omniauth-jwt (~> 0.0.2)
   omniauth-kerberos (~> 0.3.0)
   omniauth-oauth2-generic (~> 0.2.2)
-  omniauth-saml (~> 1.7.0)
+  omniauth-saml (~> 1.10)
   omniauth-shibboleth (~> 1.2.0)
-  omniauth-twitter (~> 1.2.0)
+  omniauth-twitter (~> 1.4)
   omniauth_crowd (~> 2.2.0)
   org-ruby (~> 0.9.12)
   peek (~> 1.0.1)
   peek-gc (~> 0.0.2)
-  peek-host (~> 1.0.0)
   peek-mysql2 (~> 1.1.0)
   peek-performance_bar (~> 1.3.0)
   peek-pg (~> 1.3.0)
@@ -1166,17 +1170,17 @@ DEPENDENCIES
   rubocop (~> 0.52.1)
   rubocop-rspec (~> 1.22.1)
   ruby-fogbugz (~> 0.2.1)
-  ruby-prof (~> 0.16.2)
+  ruby-prof (~> 0.17.0)
   ruby_parser (~> 3.8)
   rufus-scheduler (~> 3.4)
-  rugged (~> 0.26.0)
+  rugged (~> 0.27)
   sanitize (~> 2.0)
   sass-rails (~> 5.0.6)
   scss_lint (~> 0.56.0)
   seed-fu (~> 2.3.7)
   select2-rails (~> 3.5.9)
   selenium-webdriver (~> 3.5)
-  sentry-raven (~> 2.5.3)
+  sentry-raven (~> 2.7)
   settingslogic (~> 2.0.9)
   sham_rack (~> 1.3.6)
   shoulda-matchers (~> 3.1.2)
@@ -1192,14 +1196,15 @@ DEPENDENCIES
   spring-commands-rspec (~> 1.0.4)
   spring-commands-spinach (~> 1.1.0)
   sprockets (~> 3.7.0)
+  sshkey (~> 1.9.0)
   stackprof (~> 0.2.10)
-  state_machines-activerecord (~> 0.4.0)
+  state_machines-activerecord (~> 0.5.1)
   sys-filesystem (~> 1.1.6)
   test-prof (~> 0.2.5)
   test_after_commit (~> 1.1)
   thin (~> 1.7.0)
   timecop (~> 0.8.0)
-  toml-rb (~> 0.3.15)
+  toml-rb (~> 1.0.0)
   truncato (~> 0.7.9)
   u2f (~> 0.2.1)
   uglifier (~> 2.7.2)
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 7cfaeff33827..8564e4af91b1 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,15 +1,13 @@
 { pkgs, stdenv, lib, bundler, fetchurl, fetchFromGitHub, bundlerEnv, libiconv
-, ruby, tzdata, git, ps, dpkg, nettools
+, ruby, tzdata, git, procps, nettools
 }:
 
-/* When updating the Gemfile add `gem "activerecord-nulldb-adapter"`
-   to allow building the assets without a database */
-
 let
   rubyEnv = bundlerEnv {
     name = "gitlab-env-${version}";
     inherit ruby;
     gemdir = ./.;
+    groups = [ "default" "unicorn" "ed25519" "metrics" ];
     meta = with lib; {
       homepage = http://www.gitlab.com/;
       platforms = platforms.linux;
@@ -18,11 +16,11 @@ let
     };
   };
 
-  version = "10.5.6";
+  version = "10.7.0";
 
   gitlabDeb = fetchurl {
     url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "1kml7iz4q9g5gcfqqarivlnkmkmq9250wgm95yi4rgzynb5jndd0";
+    sha256 = "0dngh6gj8kkfcxn6ki9i96jg4x1x0vq3zzdimxz31g3j2zpd0ryz";
   };
 
 in
@@ -34,16 +32,15 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "059h63jn552fcir2dgsjv85zv1ihbyiwzws4h2j15mwj2cdpjkh0";
+    sha256 = "010xhzrp6svp2a4xzmzwl4x3hk9wc1frqr66lp8x58nfmvr8hdrg";
   };
 
   buildInputs = [
-    rubyEnv ruby bundler tzdata git ps dpkg nettools
+    rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler tzdata git procps nettools
   ];
 
   patches = [
     ./remove-hardcoded-locations.patch
-    ./fix-36783.patch
   ];
 
   postPatch = ''
@@ -56,7 +53,7 @@ stdenv.mkDerivation rec {
     rm config/initializers/gitlab_shell_secret_token.rb
 
     substituteInPlace app/controllers/admin/background_jobs_controller.rb \
-        --replace "ps -U" "${ps}/bin/ps -U"
+        --replace "ps -U" "${procps}/bin/ps -U"
 
     sed -i '/ask_to_continue/d' lib/tasks/gitlab/two_factor.rake
 
@@ -105,6 +102,6 @@ stdenv.mkDerivation rec {
 
   passthru = {
     inherit rubyEnv;
-    inherit ruby;
+    ruby = rubyEnv.wrappedRuby;
   };
 }
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 4a021f5f2d97..d14a963a8c07 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -91,10 +91,10 @@
     dependencies = ["activerecord"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1h2y2zh4vrjf6bzdgvyq5a53a4gpr8xvq4a5rvq7fy1w43z4753s";
+      sha256 = "0kvbhlansqiz1xp5r28cv27ghbfmx4b39cv51w6xrhkb52bskn3i";
       type = "gem";
     };
-    version = "4.0.0";
+    version = "5.0.0";
   };
   adamantium = {
     dependencies = ["ice_nine" "memoizable"];
@@ -114,6 +114,14 @@
     };
     version = "2.5.2";
   };
+  aes_key_wrap = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0li86k0g812jkzrppb2fvqngvzp09nygywjpn81nx90s01wxqw07";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
   akismet = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -150,19 +158,19 @@
   asciidoctor = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0q9yhan2mkk1lh15zcfd9g2fn6faix9yrf5skg23dp1y77jv7vm0";
+      sha256 = "0zq3az4836nxkc8g5wnnbzmarw7663s1ky6gf8pc04sfpa8n2l3f";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "1.5.6.2";
   };
   asciidoctor-plantuml = {
     dependencies = ["asciidoctor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "00ax9r822n4ykl6jizaxp03wqzknr7nn20mmqjpiwajy9j0zvr88";
+      sha256 = "0x092ldl8p7svczg4lnrnp0h918acnflh7jz5qwv40ksh1fflqna";
       type = "gem";
     };
-    version = "0.0.7";
+    version = "0.0.8";
   };
   asset_sync = {
     dependencies = ["activemodel" "fog-core" "mime-types" "unf"];
@@ -176,10 +184,10 @@
   ast = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pp82blr5fakdk27d1d21xq9zchzb6vmyb1zcsl520s3ygvprn8m";
+      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
   atomic = {
     source = {
@@ -292,10 +300,10 @@
   bindata = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0anbg203zjr4crql20ss5b9xg2c6a7j8nm6hs8w3ll1h1akkpp2z";
+      sha256 = "0kxy917xyxckifmnawff65j7g6yb3wh2s45npjq9lqjbi1p86lsr";
       type = "gem";
     };
-    version = "2.4.1";
+    version = "2.4.3";
   };
   binding_of_caller = {
     dependencies = ["debug_inspector"];
@@ -334,10 +342,10 @@
   brakeman = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fxv3cgmjh6rimz2jcslj3qnh1vqqz1grrjnp6m3nywbznlv441w";
+      sha256 = "161l4ln7x1vnqrcvbvglznf46f0lvq305vq211xaxp4fv4wwv89v";
       type = "gem";
     };
-    version = "3.6.1";
+    version = "4.2.1";
   };
   browser = {
     source = {
@@ -419,10 +427,10 @@
   charlock_holmes = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09dn56sx0kcw0k8ypiynhnhhiq7ff9m7b57l8wvnxj82wxsjb54y";
+      sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
       type = "gem";
     };
-    version = "0.7.5";
+    version = "0.7.6";
   };
   childprocess = {
     dependencies = ["ffi"];
@@ -491,6 +499,15 @@
     };
     version = "0.7.7";
   };
+  commonmarker = {
+    dependencies = ["ruby-enum"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02iz27421qk6lnn0xwlz95w5l65dc4rnfqlwyal0h6mnawwy3b5i";
+      type = "gem";
+    };
+    version = "0.17.8";
+  };
   concord = {
     dependencies = ["adamantium" "equalizer"];
     source = {
@@ -534,6 +551,14 @@
     };
     version = "0.4.3";
   };
+  crass = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1czijxlagzpzwchr2ldrgfi7kywg08idjpq37ndcmwh4fmz72c4l";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
   creole = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -681,28 +706,28 @@
     dependencies = ["unf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1y5c96gzyh6z4nrnkisljqngfvljdba36dww657ka0x7khzvx7jl";
+      sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
       type = "gem";
     };
-    version = "0.5.20161021";
+    version = "0.5.20170404";
   };
   doorkeeper = {
     dependencies = ["railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0r5rfvjjnlf9cn97cdrfw260zkg785k4197xqidgb35445k62mah";
+      sha256 = "1yjbmkhpj25h6n5hi382gxna1303crr4v57w1ic23n0w8ll6jh0z";
       type = "gem";
     };
-    version = "4.2.6";
+    version = "4.3.1";
   };
   doorkeeper-openid_connect = {
     dependencies = ["doorkeeper" "json-jwt"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "13k0xlr1grjj8ri26qy2zwbgi3fqxinvnygh53bnyi9qcynx5827";
+      sha256 = "1sknjc7gdyswvyh6bry3l4l57hjcab0bmkyz88i9k7qbb4p1fwck";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   dropzonejs-rails = {
     dependencies = ["rails"];
@@ -782,10 +807,10 @@
   excon = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1kc2l7kqrj8lhmrz3v21xhsl2laps4y2xmf952m2qrgzffy1pacg";
+      sha256 = "1rxwlfs7dq4r3bi9avgn7j6bz4hq1a3hdlr9xwdiyp4dp4286xfc";
       type = "gem";
     };
-    version = "0.57.1";
+    version = "0.60.0";
   };
   execjs = {
     source = {
@@ -859,10 +884,10 @@
   fast_gettext = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1l8snpgxrri8jc0c35s6h3n92j8bfahh1knj94mw6i4zqhnpv40z";
+      sha256 = "1s42dsy3rh9h37d16pwhswf2q9cx25v5fn3q881b5iz6fvdjixv3";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.6.0";
   };
   ffaker = {
     source = {
@@ -892,28 +917,28 @@
   flipper = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0j3zn54x0a6vvjmyhggl992df7zpcrhzv9ibr6af5gkcx502pg87";
+      sha256 = "1pdj9y3k6padiicfraxw9ibx9fm8yi2ihh608736lq5nnbf3k6gw";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.13.0";
   };
   flipper-active_record = {
     dependencies = ["activerecord" "flipper"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bm1wh1nrl6zbrcqk1nyqbrpddd5fvi72jyqv1j7y2df5sqwfj91";
+      sha256 = "0rgm4h5h6xcbf17z47sw8ancaxva8x4hwlxmyqpm0vzj1pnc47c1";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.13.0";
   };
   flipper-active_support_cache_store = {
     dependencies = ["activesupport" "flipper"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18w11dmby55cyd4azic1nsb7h632y6nx3ka8ndlrd1g6g28afvfb";
+      sha256 = "0zpikmfhadb7l1ny6xbhk5d4840im6yq0wvfsnlw718spxi4ccgk";
       type = "gem";
     };
-    version = "0.11.0";
+    version = "0.13.0";
   };
   flowdock = {
     dependencies = ["httparty" "multi_json"];
@@ -937,28 +962,28 @@
     dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z5zkz7998l0bcxdp0cz4wg4ds4mhdzxd90xxqd50f52cqy85fjg";
+      sha256 = "00skbbgvhqzq6gpgzmw0957n0wf1y3vjgrdyq3sib0ghpyfgmig3";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "2.0.1";
   };
   fog-core = {
     dependencies = ["builder" "excon" "formatador"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1w8ph79x0jp810qdzr5a73hpf39v27y0an23j7ifyk5zsq0j3maw";
+      sha256 = "02449kh2x3zj9xxszm02vy8zpbsrykvjrg5gj3kqcy2yizy2bhp3";
       type = "gem";
     };
-    version = "1.44.3";
+    version = "1.45.0";
   };
   fog-google = {
-    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    dependencies = ["fog-core" "fog-json" "fog-xml" "google-api-client"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "179kk6mr84wsybm2afjckm8y95z3b5hg84xlgv8l2cv46wdql2ii";
+      sha256 = "09q0khxyaqckgz2d44sp4zkw61gbmhjdww0wsqjy5mwj041bwn3i";
       type = "gem";
     };
-    version = "0.5.3";
+    version = "1.3.3";
   };
   fog-json = {
     dependencies = ["fog-core" "multi_json"];
@@ -1018,10 +1043,10 @@
     dependencies = ["thor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
+      sha256 = "06mq39lpmc17bxzlwhad9d8i0lcnbb08xr18smh2x79mm631wsw0";
       type = "gem";
     };
-    version = "0.78.0";
+    version = "0.84.0";
   };
   formatador = {
     source = {
@@ -1070,10 +1095,10 @@
     dependencies = ["locale" "text"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1d2i1zfqvaxqi01g9vvkfkf5r85c5nfj2zwpd2ib9vvkjavhn9cx";
+      sha256 = "0764vj7gacn0aypm2bf6m46dzjzwzrjlmbyx6qwwwzbmi94r40wr";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "3.2.9";
   };
   gettext_i18n_rails = {
     dependencies = ["fast_gettext"];
@@ -1088,10 +1113,10 @@
     dependencies = ["gettext" "gettext_i18n_rails" "po_to_json" "rails"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04lkmy6mgxdnpl4icddg00nj0ay0ylacfxrm723npzaqviml7c2x";
+      sha256 = "11yn5cf92wsmlj5c1065mg6swf8gq9l6g9ahikvvyf9npvjay42x";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   gherkin-ruby = {
     source = {
@@ -1105,19 +1130,19 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05ql75gbcw8px03y4pjvbnfy272mh68777f4m3sfajr1jjjp4lw8";
+      sha256 = "1rnfswh0jpsiyzvsac7kwk9rpbpf4fcz9p2i8pamqamm3skgd4i6";
       type = "gem";
     };
-    version = "0.84.0";
+    version = "0.94.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0c8w92yzjfs7pjnm8bdjsgyd1jpisn10fb6dy43381k1k8pxsifd";
+      sha256 = "0kgashbqpypv329m63b85ri1dx0gppwd0832hvwh124lk5b19drk";
       type = "gem";
     };
-    version = "4.7.6";
+    version = "5.3.3";
   };
   github-markup = {
     source = {
@@ -1220,10 +1245,10 @@
     dependencies = ["addressable" "googleauth" "httpclient" "mime-types" "representable" "retriable"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ac9qa0kwnirkvwz2w9zf07lqcgbmnvgd1wg8xxyjbadwsbpyf1y";
+      sha256 = "1gk6c21na1sizgsi71c6l6gpyjgib863jg991ycmrdnpr12mvs0q";
       type = "gem";
     };
-    version = "0.13.6";
+    version = "0.19.8";
   };
   google-protobuf = {
     source = {
@@ -1246,10 +1271,10 @@
     dependencies = ["faraday" "jwt" "logging" "memoist" "multi_json" "os" "signet"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xpmvrzhczak25nm0k3r9aa083lmfnzi94mir3g1xyrgzz66vxli";
+      sha256 = "08z4zfj9cwry13y8c2w5p4xylyslxxjq4wahd95bk1ddl5pknd4f";
       type = "gem";
     };
-    version = "0.5.3";
+    version = "0.6.2";
   };
   gpgme = {
     dependencies = ["mini_portile2"];
@@ -1264,10 +1289,10 @@
     dependencies = ["activesupport" "builder" "mustermann-grape" "rack" "rack-accept" "virtus"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1vz5lx56z9hwx6ifyc7qpdwd020xb3ynv3vahvlcgm01qi7ykdhv";
+      sha256 = "1nv7ijyr20can779cfgna76dwrckmscpc7nxj699lrwarr9as17v";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.2";
   };
   grape-entity = {
     dependencies = ["activesupport" "multi_json"];
@@ -1300,10 +1325,10 @@
     dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fpbxzqacmc78m7whbv3vyfsfyk3cnfbppsy4789mwrlnbnfnp1j";
+      sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82";
       type = "gem";
     };
-    version = "1.8.3";
+    version = "1.10.0";
   };
   haml = {
     dependencies = ["tilt"];
@@ -1343,10 +1368,10 @@
   hashie = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "120mkd2hkwhcfj7avi1dphb0lm7wx364d1cjm9yr4fibqpvsgqi7";
+      sha256 = "1hh5lybf8hm7d7xs4xm8hxvm8xqrs2flc8fnwkrclaj746izw6xb";
       type = "gem";
     };
-    version = "3.5.6";
+    version = "3.5.7";
   };
   hashie-forbidden_attributes = {
     dependencies = ["hashie"];
@@ -1379,10 +1404,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l";
+      sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "2.7.1";
   };
   html2text = {
     dependencies = ["nokogiri"];
@@ -1405,10 +1430,10 @@
     dependencies = ["addressable" "http-cookie" "http-form_data" "http_parser.rb"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ll9x8qjp97l8gj0jx23nj7xvm0rsxj5pb3d19f7bhmdb70r0xsi";
+      sha256 = "1kcd9qp8vm1rkyp7gfh8j0dbl3zpi97vz2vbhpbcsdsa7l21a59r";
       type = "gem";
     };
-    version = "0.9.8";
+    version = "2.2.2";
   };
   http-cookie = {
     dependencies = ["domain_name"];
@@ -1422,10 +1447,10 @@
   http-form_data = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "10r6hy8wcf8n4nbdmdz9hrm8mg45lncfc7anaycpzrhfp3949xh9";
+      sha256 = "0j8dwwbfpf8kc0lcsqcgy29lflszd1x4d7kc0f7227892m7r6y0m";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.3";
   };
   "http_parser.rb" = {
     source = {
@@ -1447,19 +1472,19 @@
   httpclient = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1pg15svk9lv5r7w1hxd87di6apsr9y009af3mm01xcaccvqj4j2d";
+      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
       type = "gem";
     };
-    version = "2.8.2";
+    version = "2.8.3";
   };
   i18n = {
     dependencies = ["concurrent-ruby"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s";
+      sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
       type = "gem";
     };
-    version = "0.9.1";
+    version = "0.9.5";
   };
   ice_nine = {
     source = {
@@ -1503,15 +1528,6 @@
     };
     version = "1.3.2";
   };
-  jquery-rails = {
-    dependencies = ["rails-dom-testing" "railties" "thor"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "02ii77vwxc49f2lrkbdzww2168bp5nihwzakc9mqyrsbw394w7ki";
-      type = "gem";
-    };
-    version = "4.3.1";
-  };
   json = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1521,13 +1537,13 @@
     version = "1.8.6";
   };
   json-jwt = {
-    dependencies = ["activesupport" "bindata" "multi_json" "securecompare" "url_safe_base64"];
+    dependencies = ["activesupport" "aes_key_wrap" "bindata" "securecompare" "url_safe_base64"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15a3v498lvsshzgjnk2dmyvjv87y3lffq71axj5xq3iz4mp1r4b2";
+      sha256 = "08sisbiz851ny0bgikfqdqjn1hqpgrzsfzddpm7s5a8ln51s9x78";
       type = "gem";
     };
-    version = "1.7.2";
+    version = "1.9.2";
   };
   json-schema = {
     dependencies = ["addressable"];
@@ -1593,19 +1609,19 @@
     dependencies = ["rake" "timecop"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z0bp5al0b8wyzw8ff99jwr6qsh5n52xqryvzvy2nbrma9qr7dam";
+      sha256 = "1q2y7mb8ii1ncdrlp46l9v2x909gdnjaid2dg5gcicj39hna36di";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.16.0";
   };
   kubeclient = {
     dependencies = ["http" "recursive-open-struct" "rest-client"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09hr5cb6rzf9876wa0c8pv3kxjj4s8hcjpf7jjdg2n9prb7hhmgi";
+      sha256 = "14kmip7zprb7q6rp4lj011ikv33x193sy1642l2gmf8yv320h0sw";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "3.0.0";
   };
   launchy = {
     dependencies = ["addressable"];
@@ -1647,10 +1663,10 @@
     dependencies = ["rugged"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2";
+      sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
       type = "gem";
     };
-    version = "8.7.0";
+    version = "8.9.2";
   };
   little-plugger = {
     source = {
@@ -1687,13 +1703,13 @@
     version = "0.5.1";
   };
   loofah = {
-    dependencies = ["nokogiri"];
+    dependencies = ["crass" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8";
+      sha256 = "0yjs6wbcj3n06d3xjqpy3qbpx0bfa12h3x2rbpc2k33ldjlkx6zy";
       type = "gem";
     };
-    version = "2.0.3";
+    version = "2.2.2";
   };
   mail = {
     dependencies = ["mini_mime"];
@@ -1765,10 +1781,10 @@
   mini_mime = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kzf2zx1arhjhw9c6mns0jqbmzdkd1vw25v940lvw63fzkbfv6dg";
+      sha256 = "1lwhlvjqaqfm6k3ms4v29sby9y7m518ylsqz2j74i740715yl5c8";
       type = "gem";
     };
-    version = "0.1.4";
+    version = "1.0.0";
   };
   mini_portile2 = {
     source = {
@@ -1797,10 +1813,10 @@
   multi_json = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
       type = "gem";
     };
-    version = "1.12.2";
+    version = "1.13.1";
   };
   multi_xml = {
     source = {
@@ -1821,10 +1837,10 @@
   mustermann = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0npddl1kf72i3m72vs72a24z2rpgspis3hbzyni9fsds96zf0zyl";
+      sha256 = "07sb7fckrraqh48fjnqf6yl7vxxabfx0qrsrhfdz67pd838g4k8g";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.2";
   };
   mustermann-grape = {
     dependencies = ["mustermann"];
@@ -1854,10 +1870,10 @@
   net-ssh = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q";
+      sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx";
       type = "gem";
     };
-    version = "4.1.0";
+    version = "4.2.0";
   };
   netrc = {
     source = {
@@ -1887,10 +1903,10 @@
   oauth = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1awhy8ddhixch44y68lail3h1d214rnl3y1yzk0msq5g4z2l62ky";
+      sha256 = "1zszdg8q1b135z7l7crjj234k4j0m347hywp5kj6zsq7q78pw09y";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.5.4";
   };
   oauth2 = {
     dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
@@ -1905,27 +1921,19 @@
     dependencies = ["sawyer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1bppfc0q8mflbcdsb66dly3skx42vad30q0fkzwx4za908qwvjpd";
+      sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg";
       type = "gem";
     };
-    version = "4.6.2";
-  };
-  oj = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "17c50q2ygi8jlw8dq3ghzha774ln1swbvmvai2ar7qb3bwcfgc8b";
-      type = "gem";
-    };
-    version = "2.17.5";
+    version = "4.8.0";
   };
   omniauth = {
     dependencies = ["hashie" "rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kvr0g12fawf491jmdaxzzr6qyd1r8ixzkcdr0zscs42fqsxv79i";
+      sha256 = "1msqr4qq7mfdvl3rg89529isrv595hvjpj2gi0say4b8nwqfggmg";
       type = "gem";
     };
-    version = "1.4.2";
+    version = "1.8.1";
   };
   omniauth-auth0 = {
     dependencies = ["omniauth-oauth2"];
@@ -1991,13 +1999,22 @@
     version = "1.0.2";
   };
   omniauth-google-oauth2 = {
-    dependencies = ["jwt" "multi_json" "omniauth" "omniauth-oauth2"];
+    dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sri7pn9pm7nr93zj7j1g4gqd3rpibqw7v09s1c6fihh5cmjz3fz";
+      sha256 = "1rvdac08vgrxcblq8w2hqj080v2cwv3cigxdzs11gz4d538zjnym";
       type = "gem";
     };
-    version = "0.5.2";
+    version = "0.5.3";
+  };
+  omniauth-jwt = {
+    dependencies = ["jwt" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qxr95z5p7fs13mg04zp76ldplgk6n8fkwbn17mlzlry1ihcrgxr";
+      type = "gem";
+    };
+    version = "0.0.2";
   };
   omniauth-kerberos = {
     dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
@@ -2030,10 +2047,10 @@
     dependencies = ["oauth2" "omniauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0aykbg5qfm37ywrq34dydrhxa5jwpski71dpspgp2fi6dinx09f5";
+      sha256 = "0kscjf1y0lnggsl4z3w5bwllqshqjlsl5kmcya5haydajdnzvdjr";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.5.0";
   };
   omniauth-oauth2-generic = {
     dependencies = ["omniauth-oauth2"];
@@ -2048,10 +2065,10 @@
     dependencies = ["omniauth" "ruby-saml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1garppa83v53yr9bwfx51v4hqwfr5h4aq3d39gn2fmysnfav7c1x";
+      sha256 = "17lji8i4q9k3yi8lmjwlw8rfpp2sc74jv8d6flgq85lg5brfqq1p";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.10.0";
   };
   omniauth-shibboleth = {
     dependencies = ["omniauth"];
@@ -2063,13 +2080,13 @@
     version = "1.2.1";
   };
   omniauth-twitter = {
-    dependencies = ["json" "omniauth-oauth"];
+    dependencies = ["omniauth-oauth" "rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833";
+      sha256 = "0r5j65hkpgzhvvbs90id3nfsjgsad6ymzggbm7zlaxvnrmvnrk65";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.4.0";
   };
   omniauth_crowd = {
     dependencies = ["activesupport" "nokogiri" "omniauth"];
@@ -2117,10 +2134,10 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bqc29xx4zwlshvi6krrd0sl82d7xjfhcrxvgf38wvdqcl3b7ck3";
+      sha256 = "1sj8dlqs5l2pa5y2412r4d5fi7qvf26n8vpciz7k9fy0ch327gdc";
       type = "gem";
     };
-    version = "2.4.0.2";
+    version = "2.5.0.5";
   };
   parslet = {
     dependencies = ["blankslate"];
@@ -2157,15 +2174,6 @@
     };
     version = "0.0.2";
   };
-  peek-host = {
-    dependencies = ["peek"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "11ra0hzdkdywp3cmaizcisliy26jwz7k0r9nkgm87y7amqk1wh8b";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
   peek-mysql2 = {
     dependencies = ["atomic" "mysql2" "peek"];
     source = {
@@ -2179,10 +2187,10 @@
     dependencies = ["peek"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08i2gvn59hsbysbmnakxdcpm0jvhh6rl00pr5i3zqf2f5dd0sjz6";
+      sha256 = "1a0ly4p8xnrb3pnf273qq2d5bm2w19p829n4n2730rijd42pa2n4";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.3.1";
   };
   peek-pg = {
     dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"];
@@ -2326,10 +2334,10 @@
   public_suffix = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0snaj1gxfib4ja1mvy3dzmi7am73i0mkqr0zkz045qv6509dhj5f";
+      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.2";
   };
   pyu-ruby-sasl = {
     source = {
@@ -2342,10 +2350,10 @@
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19m7aixb2ri7p1n0iqaqx8ldi97xdhvbxijbyrrcdcl6fv5prqza";
+      sha256 = "03w1ri5l91q800f1bdcdl5rbagy7s4kml136b42s2lmxmznxhr07";
       type = "gem";
     };
-    version = "1.6.8";
+    version = "1.6.9";
   };
   rack-accept = {
     dependencies = ["rack"];
@@ -2386,10 +2394,10 @@
     dependencies = ["rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+      sha256 = "0ywmgh7x8ljf7jfnq5hmfzki3f803waji3fcvi107w7mlyflbng7";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "2.0.1";
   };
   rack-proxy = {
     dependencies = ["rack"];
@@ -2431,19 +2439,19 @@
     dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ny7mbjxhq20rzg4pivvyvk14irmc7cn20kxfk3vc0z2r2c49p8r";
+      sha256 = "0wssfqpn00byhvp2372p99mphkcj8qx6pf6646avwr9ifvq0q1x6";
       type = "gem";
     };
-    version = "1.0.8";
+    version = "1.0.9";
   };
   rails-html-sanitizer = {
     dependencies = ["loofah"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7";
+      sha256 = "1gv7vr5d9g2xmgpjfq4nxsqr70r9pr042r9ycqqnfvw5cz9c7jwr";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.0.4";
   };
   rails-i18n = {
     dependencies = ["i18n" "railties"];
@@ -2561,10 +2569,10 @@
   recursive-open-struct = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "102bgpfkjsaghpb1qs1ah5s89100dchpimzah2wxdy9rv9318rqw";
+      sha256 = "0p8x9w9zzv56ka6czdmzl5sbsqjhnb9lkchvw55rf5lp8h0z3r6z";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.5";
   };
   redcarpet = {
     source = {
@@ -2674,10 +2682,10 @@
     dependencies = ["http-cookie" "mime-types" "netrc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1v2jp2ilpb2rm97yknxcnay9lfagcm4k82pfsmmcm9v290xm1ib7";
+      sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j";
       type = "gem";
     };
-    version = "2.0.0";
+    version = "2.0.2";
   };
   retriable = {
     source = {
@@ -2844,6 +2852,15 @@
     };
     version = "1.22.1";
   };
+  ruby-enum = {
+    dependencies = ["i18n"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h62avini866kxpjzqxlqnajma3yvj0y25l6hn9h2mv5pp6fcrhx";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
   ruby-fogbugz = {
     dependencies = ["crack"];
     source = {
@@ -2856,10 +2873,10 @@
   ruby-prof = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0y13gdcdajfgrkx5rc9pvb7bwkyximwl5yrhq05gkmhflzdr7kag";
+      sha256 = "02z4lh1iv1d8751a1l6r4hfc9mp61gf80g4qc4l6gbync3j3hf2c";
       type = "gem";
     };
-    version = "0.16.2";
+    version = "0.17.0";
   };
   ruby-progressbar = {
     source = {
@@ -2873,10 +2890,10 @@
     dependencies = ["nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1abhf16vbyzck4pv06qd5c59780glaf682ssjzpjwd9h9d7nqvl5";
+      sha256 = "0k9d88fa8bp5szivbwq0qi960y3r2kp6jhnkmsp3n2rvwpn936i3";
       type = "gem";
     };
-    version = "1.4.1";
+    version = "1.7.2";
   };
   ruby_parser = {
     dependencies = ["sexp_processor"];
@@ -2923,10 +2940,10 @@
   rugged = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rqhg6g2q2av3fb6iyzfd3hfjxvr8hs32w7llil2kbx73crvc2dy";
+      sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3";
       type = "gem";
     };
-    version = "0.26.0";
+    version = "0.27.0";
   };
   safe_yaml = {
     source = {
@@ -3029,10 +3046,10 @@
     dependencies = ["faraday"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19qqb7whayd170y45asc3cr3mbxfd46fv6s4jbs5xx1wphy4q80i";
+      sha256 = "0yf2gysjw6sy1xcp2jw35z9cp83pwx33lq0qyvaqbs969j4993r4";
       type = "gem";
     };
-    version = "2.5.3";
+    version = "2.7.2";
   };
   settingslogic = {
     source = {
@@ -3099,10 +3116,10 @@
     dependencies = ["addressable" "faraday" "jwt" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "149668991xqibvm8kvl10kzy891yd6f994b4gwlx6c3vl24v5jq6";
+      sha256 = "0js81lxqirdza8gf2f6avh11fny49ygmxfi1qx7jp8l9wrhznbkv";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.8.1";
   };
   simple_po_parser = {
     source = {
@@ -3225,6 +3242,14 @@
     };
     version = "1.3.13";
   };
+  sshkey = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g02lh50jd5z4l9bp7xirnfn3n1dh9lr06dv3xh0kr3yhsny059h";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
   stackprof = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -3236,28 +3261,28 @@
   state_machines = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1xg84kdglz0k1pshf2q604zybjpribzcz2b651sc1j27kd86w787";
+      sha256 = "00mi16hg3rhkxz4y58s173cbnjlba41y9bfcim90p4ja6yfj9ri3";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.0";
   };
   state_machines-activemodel = {
     dependencies = ["activemodel" "state_machines"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0p6560jsb4flapd1vbc50bqjk6dzykkwbmyivchyjh5ncynsdb8v";
+      sha256 = "0chhm5hs1y83dq8haff10m66r3yrm7jab35r9xg6adn6qd8ynv2l";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.1";
   };
   state_machines-activerecord = {
     dependencies = ["activerecord" "state_machines-activemodel"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x5wx1s2i3qc4p2knkf2n9h8b49pla9rjidkwxqzi781qm40wdxx";
+      sha256 = "00h07gd4kb22ahgv61r8zca9hqxaw44fnk2sc28j00c1nmwsw6r3";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.1";
   };
   stringex = {
     source = {
@@ -3379,10 +3404,10 @@
     dependencies = ["citrus"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03sr3k193i1r5bh9g4zc7iq9jklapmwj0rndcvhr9q7v5xm7x4rf";
+      sha256 = "0pz6z1mc7rnv4chkbx3mdn4q1lpp0j596dq57kbq39jv0wn0wi4d";
       type = "gem";
     };
-    version = "0.3.15";
+    version = "1.0.0";
   };
   truncato = {
     dependencies = ["htmlentities" "nokogiri"];
@@ -3397,10 +3422,10 @@
     dependencies = ["thread_safe"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp";
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
       type = "gem";
     };
-    version = "1.2.4";
+    version = "1.2.5";
   };
   u2f = {
     source = {
@@ -3439,10 +3464,10 @@
   unf_ext = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
+      sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
       type = "gem";
     };
-    version = "0.0.7.4";
+    version = "0.0.7.5";
   };
   unicode-display_width = {
     source = {
@@ -3482,10 +3507,10 @@
     dependencies = ["abstract_type" "adamantium" "concord" "diff-lcs" "equalizer" "parser" "procto"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1jhpgvghn764myi5iwlys98f71yspwgrzimzz11108jnhl5rcx7l";
+      sha256 = "0k2asbk9k5kzq8jidy3frqcmn58i9cvaizn8f6g5xlx1pn70bx1w";
       type = "gem";
     };
-    version = "0.2.6";
+    version = "0.2.7";
   };
   url_safe_base64 = {
     source = {

From 783fb86de498769dd4c14fd0f3a59c746cec5f95 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Apr 2018 19:58:05 +0200
Subject: [PATCH 0445/3370] gitlab module: update to gitlab 10.7

---
 nixos/modules/services/misc/gitlab.nix | 29 +++++++++-----------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 20d7ec90dcc9..be13fed860bd 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -8,9 +8,6 @@ let
   cfg = config.services.gitlab;
 
   ruby = cfg.packages.gitlab.ruby;
-  bundler = pkgs.bundler;
-
-  gemHome = "${cfg.packages.gitlab.rubyEnv}/${ruby.gemPath}";
 
   gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
   gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";
@@ -137,8 +134,6 @@ let
 
   gitlabEnv = {
     HOME = "${cfg.statePath}/home";
-    GEM_HOME = gemHome;
-    BUNDLE_GEMFILE = "${cfg.packages.gitlab}/share/gitlab/Gemfile";
     UNICORN_PATH = "${cfg.statePath}/";
     GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
     GITLAB_STATE_PATH = "${cfg.statePath}";
@@ -158,19 +153,17 @@ let
 
   gitlab-rake = pkgs.stdenv.mkDerivation rec {
     name = "gitlab-rake";
-    buildInputs = [ cfg.packages.gitlab cfg.packages.gitlab.rubyEnv pkgs.makeWrapper ];
-    phases = "installPhase fixupPhase";
-    buildPhase = "";
+    buildInputs = [ pkgs.makeWrapper ];
+    dontBuild = true;
+    unpackPhase = ":";
     installPhase = ''
       mkdir -p $out/bin
-      makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/bundle $out/bin/gitlab-bundle \
+      makeWrapper ${cfg.packages.gitlab.rubyEnv}/bin/rake $out/bin/gitlab-rake \
           ${concatStrings (mapAttrsToList (name: value: "--set ${name} '${value}' ") gitlabEnv)} \
           --set GITLAB_CONFIG_PATH '${cfg.statePath}/config' \
           --set PATH '${lib.makeBinPath [ pkgs.nodejs pkgs.gzip pkgs.git pkgs.gnutar config.services.postgresql.package ]}:$PATH' \
           --set RAKEOPT '-f ${cfg.packages.gitlab}/share/gitlab/Rakefile' \
           --run 'cd ${cfg.packages.gitlab}/share/gitlab'
-      makeWrapper $out/bin/gitlab-bundle $out/bin/gitlab-rake \
-          --add-flags "exec rake"
      '';
   };
 
@@ -482,10 +475,10 @@ in {
         Type = "simple";
         User = cfg.user;
         Group = cfg.group;
-        TimeoutSec = "300";
+        TimeoutSec = "infinity";
         Restart = "on-failure";
         WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
-        ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid\"";
+        ExecStart="${cfg.packages.gitlab.rubyEnv}/bin/sidekiq -C \"${cfg.packages.gitlab}/share/gitlab/config/sidekiq_queues.yml\" -e production -P ${cfg.statePath}/tmp/sidekiq.pid";
       };
     };
 
@@ -493,11 +486,9 @@ in {
       after = [ "network.target" "gitlab.service" ];
       wantedBy = [ "multi-user.target" ];
       environment.HOME = gitlabEnv.HOME;
-      environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}";
       environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
-      path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ];
+      path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv cfg.packages.gitaly.rubyEnv.wrappedRuby ];
       serviceConfig = {
-        #PermissionsStartOnly = true; # preStart must be run as root
         Type = "simple";
         User = cfg.user;
         Group = cfg.group;
@@ -529,7 +520,7 @@ in {
         Type = "simple";
         User = cfg.user;
         Group = cfg.group;
-        TimeoutSec = "300";
+        TimeoutSec = "infinity";
         Restart = "on-failure";
         WorkingDirectory = gitlabEnv.HOME;
         ExecStart =
@@ -658,10 +649,10 @@ in {
         Type = "simple";
         User = cfg.user;
         Group = cfg.group;
-        TimeoutSec = "300";
+        TimeoutSec = "infinity";
         Restart = "on-failure";
         WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
-        ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\"";
+        ExecStart = "${cfg.packages.gitlab.rubyEnv}/bin/unicorn -c ${cfg.statePath}/config/unicorn.rb -E production";
       };
 
     };

From 94f5e5ad14e99700e82576167515ba784dbfe98b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 25 Apr 2018 20:01:07 +0200
Subject: [PATCH 0446/3370] Revert "gitlab: disable"

This reverts commit 68c4605f1a251b97cb0fcde251ce52d498e2cef8.

Gitlab has been fixed
---
 nixos/modules/module-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 1261fe950928..8ef76b9d81ed 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -327,7 +327,7 @@
   ./services/misc/geoip-updater.nix
   ./services/misc/gitea.nix
   #./services/misc/gitit.nix
-  #./services/misc/gitlab.nix
+  ./services/misc/gitlab.nix
   ./services/misc/gitolite.nix
   ./services/misc/gitweb.nix
   ./services/misc/gogs.nix

From 7673593c85623fa7065ea7ef56bcd0a50f2fbea1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 26 Apr 2018 00:14:38 +0200
Subject: [PATCH 0447/3370] gem-config.grpc: disable format hardening

---
 pkgs/development/ruby-modules/gem-config/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index a447cd1a1032..83ab5e0d86ff 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -145,6 +145,7 @@ in
   grpc = attrs: {
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ openssl ];
+    hardeningDisable = [ "format" ];
     NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ];
   };
 

From c600f02e430b49c8907a63a12c62ee407b95cf5d Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 26 Apr 2018 00:16:26 +0200
Subject: [PATCH 0448/3370] cups-kyodialog3: init at 8.1601

---
 pkgs/misc/cups/drivers/kyodialog3/default.nix | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/misc/cups/drivers/kyodialog3/default.nix

diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix
new file mode 100644
index 000000000000..bc48b2c8f339
--- /dev/null
+++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix
@@ -0,0 +1,65 @@
+{ stdenv, lib, fetchzip, cups
+
+  # Can either be "EU" or "Global"; it's unclear what the difference is
+  , region ? "Global"
+}:
+
+let
+  platform =
+    if stdenv.system == "x86_64-linux" then "64bit"
+    else if stdenv.system == "i686-linux" then "32bit"
+         else throw "Unsupported system: ${stdenv.system}";
+  debPlatform = 
+    if platform == "64bit" then "amd64"
+    else "i386";
+  debRegion = if region == "EU" then "EU." else "";
+
+  # TODO: add Qt4 for kyodialog3 application
+  libPath = lib.makeLibraryPath [ cups ];
+in
+stdenv.mkDerivation rec {
+  name = "cups-kyodialog3-${version}";
+  version = "8.1601";
+
+  dontPatchELF = true;
+  dontStrip = true;
+
+  src = fetchzip {
+    url = "https://usa.kyoceradocumentsolutions.com/content/dam/kdc/kdag/downloads/technical/executables/drivers/kyoceradocumentsolutions/us/en/Kyocera_Linux_PPD_Ver_${version}.tar.gz";
+    sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cd $out
+
+    # unpack the debian archive
+    ar p ${src}/KyoceraLinuxPackages/${region}/${platform}/kyodialog3.en${debRegion}_0.5-0_${debPlatform}.deb data.tar.gz | tar -xz
+    rm -Rf KyoceraLinuxPackages
+
+    # strip $out/usr
+    mv usr/* .
+    rmdir usr
+
+    # allow cups to find the ppd files
+    mkdir -p share/cups/model
+    mv share/ppd/kyocera share/cups/model/Kyocera
+    rmdir share/ppd
+
+    # prepend $out to all references in ppd and desktop files
+    find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \;
+    find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \;
+
+    # patchELF all executables
+    find -type f -executable -exec patchelf --set-rpath ${libPath} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
+  '';
+
+  meta = with lib; {
+    description = "CUPS drivers for several Kyocera printers";
+    homepage = "https://www.kyoceradocumentsolutions.com";
+    license = licenses.unfree;
+    maintainers = [ maintainers.steveej ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4235616748c7..8bdd4f5ae50b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19994,6 +19994,8 @@ with pkgs;
 
   cups-kyocera = callPackage ../misc/cups/drivers/kyocera {};
 
+  cups-kyodialog3 = callPackage ../misc/cups/drivers/kyodialog3 {};
+
   cups-dymo = callPackage ../misc/cups/drivers/dymo {};
 
   cups-toshiba-estudio = callPackage ../misc/cups/drivers/estudio {};

From 3e3b39f173f9abc99da84084a1f4657c9de885bd Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 26 Apr 2018 01:41:53 +0200
Subject: [PATCH 0449/3370] qemu: 2.11.1 -> 2.12.0

---
 .../virtualization/qemu/default.nix           |  10 +-
 .../virtualization/qemu/statfs-flags.patch    | 197 ------------------
 2 files changed, 3 insertions(+), 204 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/qemu/statfs-flags.patch

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 9839aadc9c1f..0496adb6f409 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -21,8 +21,8 @@
 
 with stdenv.lib;
 let
-  version = "2.11.1";
-  sha256 = "1jrcff0szyjxc3vywyiclwdzk0xgq4cxvjbvmcfyjcpdrq9j5pyr";
+  version = "2.12.0";
+  sha256 = "17377xxbmwbrnh895a108z944pqi39hzrbw4jzgj8pcipi3s3x69";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -69,11 +69,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "ga" ];
 
-  patches = [ ./no-etc-install.patch ./statfs-flags.patch (fetchpatch {
-    name = "glibc-2.27-memfd.patch";
-    url = "https://git.qemu.org/?p=qemu.git;a=patch;h=75e5b70e6b5dcc4f2219992d7cffa462aa406af0";
-    sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa";
-  }) ]
+  patches = [ ./no-etc-install.patch ]
     ++ optional nixosTestRunner ./force-uid0-on-9p.patch
     ++ optional pulseSupport ./fix-hda-recording.patch
     ++ optionals stdenv.hostPlatform.isMusl [
diff --git a/pkgs/applications/virtualization/qemu/statfs-flags.patch b/pkgs/applications/virtualization/qemu/statfs-flags.patch
deleted file mode 100644
index 52a470a2869a..000000000000
--- a/pkgs/applications/virtualization/qemu/statfs-flags.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-commit 909fe47c7009aa9a75fe9470c5f8d3dd5b50917a
-Author: Shea Levy <shea@shealevy.com>
-Date:   Sun Feb 18 13:50:11 2018 -0500
-
-    linux-user: Support f_flags in statfs when available.
-    
-    Signed-off-by: Shea Levy <shea@shealevy.com>
-
-diff --git a/configure b/configure
-index 913e14839d..52fe2bf941 100755
---- a/configure
-+++ b/configure
-@@ -5303,6 +5303,22 @@ if compile_prog "" "" ; then
-     have_utmpx=yes
- fi
- 
-+##########################################
-+# Check for newer fields of struct statfs on Linux
-+
-+if test "$linux_user" = "yes"; then
-+  cat > $TMPC <<EOF
-+#include <sys/vfs.h>
-+
-+int main(void) {
-+  struct statfs fs;
-+  fs.f_flags = 0;
-+}
-+EOF
-+  if compile_object ; then
-+      have_statfs_flags=yes
-+  fi
-+fi
- ##########################################
- # checks for sanitizers
- 
-@@ -6518,6 +6534,10 @@ if test "$have_utmpx" = "yes" ; then
-   echo "HAVE_UTMPX=y" >> $config_host_mak
- fi
- 
-+if test "$have_statfs_flags" = "yes" ; then
-+  echo "HAVE_STATFS_FLAGS=y" >> $config_host_mak
-+fi
-+
- if test "$ivshmem" = "yes" ; then
-   echo "CONFIG_IVSHMEM=y" >> $config_host_mak
- fi
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 82b35a6bdf..77481eca2c 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -9534,6 +9534,9 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
-             __put_user(stfs.f_fsid.__val[1], &target_stfs->f_fsid.val[1]);
-             __put_user(stfs.f_namelen, &target_stfs->f_namelen);
-             __put_user(stfs.f_frsize, &target_stfs->f_frsize);
-+#ifdef HAVE_STATFS_FLAGS
-+            __put_user(stfs.f_flags, &target_stfs->f_flags);
-+#endif
-             memset(target_stfs->f_spare, 0, sizeof(target_stfs->f_spare));
-             unlock_user_struct(target_stfs, arg2, 1);
-         }
-diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
-index a35c52a60a..64aa49d3c5 100644
---- a/linux-user/syscall_defs.h
-+++ b/linux-user/syscall_defs.h
-@@ -362,7 +362,14 @@ struct kernel_statfs {
- 	int f_ffree;
-         kernel_fsid_t f_fsid;
- 	int f_namelen;
-+#ifdef HAVE_STATFS_FLAGS
-+	int f_frsize;
-+	int f_flags;
-+	int f_spare[4];
-+#else
- 	int f_spare[6];
-+#endif
-+
- };
- 
- struct target_dirent {
-@@ -2223,7 +2230,12 @@ struct target_statfs {
- 	/* Linux specials */
- 	target_fsid_t		f_fsid;
- 	int32_t			f_namelen;
-+#ifdef HAVE_STATFS_FLAGS
-+	int32_t			f_flags;
-+	int32_t			f_spare[5];
-+#else
- 	int32_t			f_spare[6];
-+#endif
- };
- #else
- struct target_statfs {
-@@ -2239,7 +2251,12 @@ struct target_statfs {
- 	/* Linux specials */
- 	target_fsid_t		f_fsid;
- 	abi_long		f_namelen;
-+#ifdef HAVE_STATFS_FLAGS
-+	abi_long		f_flags;
-+	abi_long		f_spare[5];
-+#else
- 	abi_long		f_spare[6];
-+#endif
- };
- #endif
- 
-@@ -2255,7 +2272,12 @@ struct target_statfs64 {
- 	uint64_t	f_bavail;
- 	target_fsid_t	f_fsid;
- 	uint32_t	f_namelen;
-+#ifdef HAVE_STATFS_FLAGS
-+	uint32_t	f_flags;
-+	uint32_t	f_spare[5];
-+#else
- 	uint32_t	f_spare[6];
-+#endif
- };
- #elif (defined(TARGET_PPC64) || defined(TARGET_X86_64) || \
-        defined(TARGET_SPARC64) || defined(TARGET_AARCH64)) && \
-@@ -2271,7 +2293,12 @@ struct target_statfs {
- 	target_fsid_t f_fsid;
- 	abi_long f_namelen;
- 	abi_long f_frsize;
-+#ifdef HAVE_STATFS_FLAGS
-+	abi_long f_flags;
-+	abi_long f_spare[4];
-+#else
- 	abi_long f_spare[5];
-+#endif
- };
- 
- struct target_statfs64 {
-@@ -2285,7 +2312,12 @@ struct target_statfs64 {
- 	target_fsid_t f_fsid;
- 	abi_long f_namelen;
- 	abi_long f_frsize;
-+#ifdef HAVE_STATFS_FLAGS
-+	abi_long f_flags;
-+	abi_long f_spare[4];
-+#else
- 	abi_long f_spare[5];
-+#endif
- };
- #elif defined(TARGET_S390X)
- struct target_statfs {
-@@ -2299,7 +2331,13 @@ struct target_statfs {
-     kernel_fsid_t f_fsid;
-     int32_t  f_namelen;
-     int32_t  f_frsize;
-+#ifdef HAVE_STATFS_FLAGS
-+    int32_t  f_flags;
-+    int32_t  f_spare[4];
-+#else
-     int32_t  f_spare[5];
-+#endif
-+
- };
- 
- struct target_statfs64 {
-@@ -2313,7 +2351,12 @@ struct target_statfs64 {
-     kernel_fsid_t f_fsid;
-     int32_t  f_namelen;
-     int32_t  f_frsize;
-+#ifdef HAVE_STATFS_FLAGS
-+    int32_t  f_flags;
-+    int32_t  f_spare[4];
-+#else
-     int32_t  f_spare[5];
-+#endif
- };
- #else
- struct target_statfs {
-@@ -2327,7 +2370,12 @@ struct target_statfs {
- 	target_fsid_t f_fsid;
- 	uint32_t f_namelen;
- 	uint32_t f_frsize;
-+#ifdef HAVE_STATFS_FLAGS
-+	uint32_t f_flags;
-+	uint32_t f_spare[4];
-+#else
- 	uint32_t f_spare[5];
-+#endif
- };
- 
- struct target_statfs64 {
-@@ -2341,7 +2389,12 @@ struct target_statfs64 {
- 	target_fsid_t f_fsid;
-         uint32_t f_namelen;
- 	uint32_t f_frsize;
-+#ifdef HAVE_STATFS_FLAGS
-+	uint32_t f_flags;
-+	uint32_t f_spare[4];
-+#else
- 	uint32_t f_spare[5];
-+#endif
- };
- #endif
- 

From ca52152a9198ae42e894829f8f192d39ac173356 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 25 Apr 2018 21:36:13 -0400
Subject: [PATCH 0450/3370] boto{3,core}: {1.6.0,1.9.3} -> {1.7.9,1.10.9}

Yeah yeah, I want parallel glob expansion but you get what I mean.
These two packages like getting upgraded together so to minimize
incompatibilities I'm upgrading them both in the same commit.
---
 pkgs/development/python-modules/boto3/default.nix    | 4 ++--
 pkgs/development/python-modules/botocore/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix
index ccada6dd1404..042ad9cf7932 100644
--- a/pkgs/development/python-modules/boto3/default.nix
+++ b/pkgs/development/python-modules/boto3/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname =  "boto3";
-  version = "1.6.0";
+  version = "1.7.9";
 
   src = fetchFromGitHub {
     owner = "boto";
     repo  = "boto3";
     rev   = version;
-    sha256 = "14d60wc5kff2gjkrm0yfz0179s0qg3f1qqldv8hnf37ny6yvfwn3";
+    sha256 = "0yqym19nlayjm1qlh6vvinmk5xw0zskil971n2v9s65ray7sn5lv";
   };
 
   propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ];
diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index 5276fdb9329d..cd9c5729611c 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "botocore";
-  version = "1.9.3";
+  version = "1.10.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d5b892ab86cd3e8d6cb570dd5275bf1c600cbbf9f07a40a22bcdd9023c0e844f";
+    sha256 = "19vlf2w05h9818hrhx8al4r9ngfhvhf2pxcwka9s7bc51qnhx4xh";
   };
 
   propagatedBuildInputs = [

From b11f3bc8e33232f0adbf3489ceae1b739b8699ba Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 25 Apr 2018 19:42:35 -0500
Subject: [PATCH 0451/3370] cpython: don't use lchmod() on Linux, fix w/musl

upstream issue:
https://bugs.python.org/issue31940

There are two PR's proposed to fix this,
but both seem to be stalling waiting for review.

I previously used what appears to be the favored
of the two approaches[1] to fix this,
with plan of keeping it musl-only until PR was merged.

However, while writing up a commit message
explaining the problem and why it needed fixing...

I investigated a bit and found it increasingly
hard to justify anything other than ...
simply not using lchmod.

Here's what I found:
* lchmod is non-POSIX, seems BSD-only these days
* Functionality of lchmod isn't supported on Linux
  * best scenario on Linux would be an error
* POSIX does provide lchmod-esque functionality
  with fchmodat(), which AFAICT is generally preferred.
* Python intentionally overlooks fchmodat()[2]
  electing instead to use lchmod() behavior
  as a proxy for whether fchmodat() "works".
  I'm not sure I follow their reasoning...
* both glibc and musl provide lchmod impls:
  * glibc returns ENOSYS "not implemented"
  * musl implements lchmod with fchmodat(),
    and so returns EOPNOTSUPP "op not supported"
* Python doesn't expect EOPNOTSUPP from lchmod,
  since it's not valid on BSD's lchmod.
* "configure" doesn't actually check lchmod usefully,
  instead checks for glibc preprocessor defines
  to indicate if the function is just a stub[3];
  somewhat fittingly, if the magic macros are defined
  then the next line of the C source is "choke me",
  causing the compiler to trip, fall, and point
  a finger at whatever is near where it ends up.
  (somewhat amusing, but AFAIK effective way to get an error :P)

I'm leaving out links to threads on mailing lists and such,
but for now I hope I've convinced you
(or to those reading commit history: explained my reasons)
that this is a bit of a mess[4].

And so instead of making a big mess messier,
and with hopes of never thinking about this again,
I propose we simply tell Python "don't use lchmod" on Linux.

[1] https://github.com/python/cpython/pull/4783
[2] https://github.com/python/cpython/blob/28453feaa8d88bbcbf6d834b1d5ca396d17265f2/Lib/os.py#L144
[3] https://github.com/python/cpython/blob/28453feaa8d88bbcbf6d834b1d5ca396d17265f2/configure#L2198
[4] Messes happen, no good intention goes unpunished :).
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 5 ++++-
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 5 ++++-
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 5 ++++-
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 5 ++++-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 5c12d7cec55c..9d89e96383f5 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -140,7 +140,10 @@ let
     "ac_cv_computed_gotos=yes"
     "ac_cv_file__dev_ptmx=yes"
     "ac_cv_file__dev_ptc=yes"
-  ];
+  ]
+    # Never even try to use lchmod on linux,
+    # don't rely on detecting glibc-isms.
+  ++ optional hostPlatform.isLinux "ac_cv_func_lchmod=no";
 
   postConfigure = if hostPlatform.isCygwin then ''
     sed -i Makefile -e 's,PYTHONPATH="$(srcdir),PYTHONPATH="$(abs_srcdir),'
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 0946f8743fbe..85c45a9d396f 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -96,7 +96,10 @@ in stdenv.mkDerivation {
     "--without-ensurepip"
     "--with-system-expat"
     "--with-system-ffi"
-  ];
+  ]
+    # Never even try to use lchmod on linux,
+    # don't rely on detecting glibc-isms.
+  ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
 
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 22c55d302625..d67cc7286942 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -90,7 +90,10 @@ in stdenv.mkDerivation {
     "--without-ensurepip"
     "--with-system-expat"
     "--with-system-ffi"
-  ];
+  ]
+    # Never even try to use lchmod on linux,
+    # don't rely on detecting glibc-isms.
+  ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
 
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 950a165a2f4a..ee9a0df9a8c4 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -113,7 +113,10 @@ in stdenv.mkDerivation {
     "ac_cv_computed_gotos=yes"
     "ac_cv_file__dev_ptmx=yes"
     "ac_cv_file__dev_ptc=yes"
-  ];
+  ]
+    # Never even try to use lchmod on linux,
+    # don't rely on detecting glibc-isms.
+  ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no";
 
   preConfigure = ''
     for i in /usr /sw /opt /pkg; do	# improve purity

From 7e1db6b41d00032652032ca3bedaaac4a2f0b8e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 25 Apr 2018 20:36:43 -0700
Subject: [PATCH 0452/3370] xmrig: 2.5.2 -> 2.5.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xmrig/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.5.3 with grep in /nix/store/csidwxna34qv298smf6sflwaj93xr9p0-xmrig-2.5.3
- directory tree listing: https://gist.github.com/5aaeee0849eb7acb740cae01310a19f9
---
 pkgs/applications/misc/xmrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 42d9e448991a..88adbfff3b9a 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-${version}";
-  version = "2.5.2";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "1jc6vzqdl85pmiw5qv9b148kfw4k4wxn90ggylxfpfdv7czamh2c";
+    sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp";
   };
 
   nativeBuildInputs = [ cmake ];

From 3a8fb11949826e7730f3a11cecd4dd0e86069491 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 25 Apr 2018 20:40:14 -0700
Subject: [PATCH 0453/3370] yubikey-personalization: 1.18.1 -> 1.19.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/yubikey-personalization/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize -h’ got 0 exit code
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize --help’ got 0 exit code
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykpersonalize -V’ and found version 1.19.0
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp -h’ got 0 exit code
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp --help’ got 0 exit code
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykchalresp -V’ and found version 1.19.0
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo -h’ got 0 exit code
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo --help’ got 0 exit code
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo help’ got 0 exit code
- ran ‘/nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0/bin/ykinfo -V’ and found version 1.19.0
- found 1.19.0 with grep in /nix/store/gbg5yr1p726q33f057gwcjgq35jc8qg3-yubikey-personalization-1.19.0
- directory tree listing: https://gist.github.com/6592e44c4a66c1b7cf2c9f4c2a75c3ab
---
 pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix
index 462f8d8e99a2..48827ec0aae4 100644
--- a/pkgs/tools/misc/yubikey-personalization/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yubikey-personalization-${version}";
-  version = "1.18.1";
+  version = "1.19.0";
 
   src = fetchurl {
     url = "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${version}.tar.gz";
-    sha256 = "0mjjkk6p8d0kblj6vzld4v188y40ynprvd2hnfh7m1hs28wbkzcz";
+    sha256 = "104lc0nnqdr365fa7c4vrq67rxp1dp8idndsh9jlhnj9dnhszj1b";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7cbf00847ca66dbb474c734a5051ebc7e526a0e6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 25 Apr 2018 21:44:13 -0700
Subject: [PATCH 0454/3370] thefuck: 3.25 -> 3.26
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/thefuck/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/.thefuck-wrapped -h’ got 0 exit code
- ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/.thefuck-wrapped --help’ got 0 exit code
- ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/thefuck -h’ got 0 exit code
- ran ‘/nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26/bin/thefuck --help’ got 0 exit code
- found 3.26 with grep in /nix/store/p0waa9llvgzfvjv05vgwvsic2xlkm4jr-thefuck-3.26
- directory tree listing: https://gist.github.com/7fd81df3f197603f76bdf8c0ae663dcb
---
 pkgs/tools/misc/thefuck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix
index 788529125da5..7befd344a4d8 100644
--- a/pkgs/tools/misc/thefuck/default.nix
+++ b/pkgs/tools/misc/thefuck/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "thefuck";
-  version = "3.25";
+  version = "3.26";
 
   src = fetchFromGitHub {
     owner = "nvbn";
     repo = "${pname}";
     rev = version;
-    sha256 = "090mg809aac932lgqmjxm4za53lg3bjprj562sp189k47xs4wijv";
+    sha256 = "0iyihbp94z38xajy8yfbn3ky7irnam1zwyswg34cw4kkfgggrwhz";
   };
 
   propagatedBuildInputs = [ colorama decorator psutil pyte six ];

From 518eca82567b69349f987f8b0a015ade0a974aff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 25 Apr 2018 21:45:09 -0700
Subject: [PATCH 0455/3370] tini: 0.17.0 -> 0.18.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/tini/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0/bin/tini -h’ got 0 exit code
- ran ‘/nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0/bin/tini --version’ and found version 0.18.0
- found 0.18.0 with grep in /nix/store/h0h2qyxwrvsjy47m1xyv7sxzd2j0ilsi-tini-0.18.0
- directory tree listing: https://gist.github.com/c992fd0a24dfc0365d6b62ac567d395c
---
 pkgs/applications/virtualization/tini/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
index c027541c01c1..25c19cd79c7f 100644
--- a/pkgs/applications/virtualization/tini/default.nix
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, glibc }:
 
 stdenv.mkDerivation rec {
-  version = "0.17.0";
+  version = "0.18.0";
   name = "tini-${version}";
 
   src = fetchFromGitHub {
     owner = "krallin";
     repo = "tini";
     rev = "v${version}";
-    sha256 ="0y16xk89811a6g2srg63jv5b2221dirzrhha7mj056a6jq5ql2f0";
+    sha256 ="1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
   };
 
   patchPhase = "sed -i /tini-static/d CMakeLists.txt";

From 28440ed27697bbd592a6fea7c4556c919d362688 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 25 Apr 2018 22:04:55 -0700
Subject: [PATCH 0456/3370] smplayer: 18.3.0 -> 18.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/smplayer/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0/bin/smplayer -h’ got 0 exit code
- ran ‘/nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0/bin/smplayer --help’ got 0 exit code
- found 18.4.0 with grep in /nix/store/5vy4663v65r0ks1d1jcy0p24m2lk0zmh-smplayer-18.4.0
- directory tree listing: https://gist.github.com/25ca7c094ad35c4c5ed4c2c33dfb9be2
---
 pkgs/applications/video/smplayer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index ef614d41d00d..49444e350de4 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-18.3.0";
+  name = "smplayer-18.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0y7kwcngd0d2d863wnppfvjm1n1l60nn6lsf9r0g4hsf19gkrd46";
+    sha256 = "0q2fbg41djyxsy6jinlnidpcqxvs9bi91ga3fwlgnfh6kxsw2ldd";
   };
 
   buildInputs = [ qtscript ];

From d97d463d190936da38e6be5f842fa160a878ba7e Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 23 Apr 2018 00:46:22 -0700
Subject: [PATCH 0457/3370] perlPackages.ListMoreUtilsXS: Fix build on Darwin

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e9d6cd97bc8c..3278311f25c0 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8592,6 +8592,9 @@ let self = _self // overrides; _self = with self; {
        url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz;
        sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx";
      };
+     preConfigure = ''
+       export LD=$CC
+     '';
      propagatedBuildInputs = [ XSLoader ];
      meta = {
        description = "Provide the stuff missing in List::Util in XS";

From 4de774a63bef6d97246641212d8c38cc34ff6665 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 26 Apr 2018 06:09:05 +0200
Subject: [PATCH 0458/3370] nixos/dhparams: Add a VM test

We're going to make changes to the dhparams module so we really want to
make sure we don't break it, so having a NixOS VM test is to make sure
we don't blow things up and can iterate on it.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog
---
 nixos/release.nix        |   1 +
 nixos/tests/dhparams.nix | 105 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 nixos/tests/dhparams.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 2f779280e6b2..9d8a62f99952 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -269,6 +269,7 @@ in rec {
   tests.containers-macvlans = callTest tests/containers-macvlans.nix {};
   tests.couchdb = callTest tests/couchdb.nix {};
   tests.deluge = callTest tests/deluge.nix {};
+  tests.dhparams = callTest tests/dhparams.nix {};
   tests.docker = callTestOnMatchingSystems ["x86_64-linux"] tests/docker.nix {};
   tests.docker-tools = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools.nix {};
   tests.docker-tools-overlay = callTestOnMatchingSystems ["x86_64-linux"] tests/docker-tools-overlay.nix {};
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
new file mode 100644
index 000000000000..36079b990975
--- /dev/null
+++ b/nixos/tests/dhparams.nix
@@ -0,0 +1,105 @@
+let
+  common = { pkgs, ... }: {
+    security.dhparams.enable = true;
+    environment.systemPackages = [ pkgs.openssl ];
+  };
+
+in import ./make-test.nix {
+  name = "dhparams";
+
+  nodes.generation1 = { pkgs, config, ... }: {
+    imports = [ common ];
+    security.dhparams.params.foo = 16;
+    security.dhparams.params.bar = 17;
+
+    systemd.services.foo = {
+      description = "Check systemd Ordering";
+      wantedBy = [ "multi-user.target" ];
+      unitConfig = {
+        # This is to make sure that the dhparams generation of foo occurs
+        # before this service so we need this service to start as early as
+        # possible to provoke a race condition.
+        DefaultDependencies = false;
+
+        # We check later whether the service has been started or not.
+        ConditionPathExists = "${config.security.dhparams.path}/foo.pem";
+      };
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
+      # The reason we only provide an ExecStop here is to ensure that we don't
+      # accidentally trigger an error because a file system is not yet ready
+      # during very early startup (we might not even have the Nix store
+      # available, for example if future changes in NixOS use systemd mount
+      # units to do early file system initialisation).
+      serviceConfig.ExecStop = "${pkgs.coreutils}/bin/true";
+    };
+  };
+
+  nodes.generation2 = {
+    imports = [ common ];
+    security.dhparams.params.foo = 18;
+  };
+
+  nodes.generation3 = common;
+
+  testScript = { nodes, ... }: let
+    getParamPath = gen: name: let
+      node = "generation${toString gen}";
+      inherit (nodes.${node}.config.security.dhparams) path;
+    in "${path}/${name}.pem";
+
+    assertParamBits = gen: name: bits: let
+      path = getParamPath gen name;
+    in ''
+      $machine->nest('check bit size of ${path}', sub {
+        my $out = $machine->succeed('openssl dhparam -in ${path} -text');
+        $out =~ /^\s*DH Parameters:\s+\((\d+)\s+bit\)\s*$/m;
+        die "bit size should be ${toString bits} but it is $1 instead."
+          if $1 != ${toString bits};
+      });
+    '';
+
+    switchToGeneration = gen: let
+      node = "generation${toString gen}";
+      inherit (nodes.${node}.config.system.build) toplevel;
+      switchCmd = "${toplevel}/bin/switch-to-configuration test";
+    in ''
+      $machine->nest('switch to generation ${toString gen}', sub {
+        $machine->succeed('${switchCmd}');
+        $main::machine = ''$${node};
+      });
+    '';
+
+  in ''
+    my $machine = $generation1;
+
+    $machine->waitForUnit('multi-user.target');
+
+    subtest "verify startup order", sub {
+      $machine->succeed('systemctl is-active foo.service');
+    };
+
+    subtest "check bit sizes of dhparam files", sub {
+      ${assertParamBits 1 "foo" 16}
+      ${assertParamBits 1 "bar" 17}
+    };
+
+    ${switchToGeneration 2}
+
+    subtest "check whether bit size has changed", sub {
+      ${assertParamBits 2 "foo" 18}
+    };
+
+    subtest "ensure that dhparams file for 'bar' was deleted", sub {
+      $machine->fail('test -e ${getParamPath 1 "bar"}');
+    };
+
+    ${switchToGeneration 3}
+
+    subtest "ensure that 'security.dhparams.path' has been deleted", sub {
+      $machine->fail(
+        'test -e ${nodes.generation3.config.security.dhparams.path}'
+      );
+    };
+  '';
+}

From 761266bd18cf1117a11d2fd6168259f7fe867122 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 26 Apr 2018 06:19:48 +0200
Subject: [PATCH 0459/3370] nixos/dhparams: Turn params into a submodule

We're going to implement an option which allows us to turn off stateful
handling of Diffie-Hellman parameter files by putting them into the Nix
store.

However, modules now might need a way to reference these files, so we
add a now path option to every param specified, which carries a
read-only value of the path where to find the corresponding DH params
file.

I've also improved the description of security.dhparams.params a bit so
that it uses <warning/> and <note/>.

The NixOS VM test also reflects this change and checks whether the old
way to specify the bit size still works.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog
---
 nixos/modules/security/dhparams.nix | 64 +++++++++++++++++++++--------
 nixos/tests/dhparams.nix            | 16 +++++---
 2 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 55c75713101d..7c9fe986e576 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -1,10 +1,38 @@
 { config, lib, pkgs, ... }:
 
 with lib;
+
 let
   cfg = config.security.dhparams;
-in
-{
+
+  paramsSubmodule = { name, config, ... }: {
+    options.bits = mkOption {
+      type = types.addCheck types.int (b: b >= 16) // {
+        name = "bits";
+        description = "integer of at least 16 bits";
+      };
+      default = 4096;
+      description = ''
+        The bit size for the prime that is used during a Diffie-Hellman
+        key exchange.
+      '';
+    };
+
+    options.path = mkOption {
+      type = types.path;
+      readOnly = true;
+      description = ''
+        The resulting path of the generated Diffie-Hellman parameters
+        file for other services to reference. This could be either a
+        store path or a file inside the directory specified by
+        <option>security.dhparams.path</option>.
+      '';
+    };
+
+    config.path = "${cfg.path}/${name}.pem";
+  };
+
+in {
   options = {
     security.dhparams = {
       params = mkOption {
@@ -14,21 +42,23 @@ in
 
             The value is the size (in bits) of the DH params to generate. The
             generated DH params path can be found in
-            <filename><replaceable>security.dhparams.path</replaceable>/<replaceable>name</replaceable>.pem</filename>.
+            <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>.
 
-            Note: The name of the DH params is taken as being the name of the
-            service it serves: the params will be generated before the said
-            service is started.
+            <note><para>The name of the DH params is taken as being the name of
+            the service it serves and the params will be generated before the
+            said service is started.</para></note>
 
-            Warning: If you are removing all dhparams from this list, you have
-            to leave security.dhparams.enable for at least one activation in
-            order to have them be cleaned up. This also means if you rollback to
-            a version without any dhparams the existing ones won't be cleaned
-            up.
+            <warning><para>If you are removing all dhparams from this list, you
+            have to leave <option>security.dhparams.enable</option> for at
+            least one activation in order to have them be cleaned up. This also
+            means if you rollback to a version without any dhparams the
+            existing ones won't be cleaned up.</para></warning>
           '';
-        type = with types; attrsOf int;
+        type = with types; let
+          coerce = bits: { inherit bits; };
+        in attrsOf (coercedTo types.int coerce (submodule paramsSubmodule));
         default = {};
-        example = { nginx = 3072; };
+        example = literalExample "{ nginx.bits = 3072; }";
       };
 
       path = mkOption {
@@ -71,10 +101,10 @@ in
               if [ ! -f "$file" ]; then
                 continue
               fi
-          '' + concatStrings (mapAttrsToList (name: value:
+          '' + concatStrings (mapAttrsToList (name: { bits, ... }:
           ''
               if [ "$file" == "${cfg.path}/${name}.pem" ] && \
-                  ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString value} bit)" > /dev/null; then
+                  ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
                 continue
               fi
           ''
@@ -89,7 +119,7 @@ in
           '';
       };
     } //
-      mapAttrs' (name: value: nameValuePair "dhparams-gen-${name}" {
+      mapAttrs' (name: { bits, ... }: nameValuePair "dhparams-gen-${name}" {
         description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
         after = [ "dhparams-init.service" ];
         before = [ "${name}.service" ];
@@ -99,7 +129,7 @@ in
           ''
             mkdir -p ${cfg.path}
             if [ ! -f ${cfg.path}/${name}.pem ]; then
-              ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString value}
+              ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString bits}
             fi
           '';
       }) cfg.params;
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
index 36079b990975..ead5f2efce7c 100644
--- a/nixos/tests/dhparams.nix
+++ b/nixos/tests/dhparams.nix
@@ -9,8 +9,13 @@ in import ./make-test.nix {
 
   nodes.generation1 = { pkgs, config, ... }: {
     imports = [ common ];
-    security.dhparams.params.foo = 16;
-    security.dhparams.params.bar = 17;
+    security.dhparams.params = {
+      # Use low values here because we don't want the test to run for ages.
+      foo.bits = 16;
+      # Also use the old format to make sure the type is coerced in the right
+      # way.
+      bar = 17;
+    };
 
     systemd.services.foo = {
       description = "Check systemd Ordering";
@@ -22,7 +27,7 @@ in import ./make-test.nix {
         DefaultDependencies = false;
 
         # We check later whether the service has been started or not.
-        ConditionPathExists = "${config.security.dhparams.path}/foo.pem";
+        ConditionPathExists = config.security.dhparams.params.foo.path;
       };
       serviceConfig.Type = "oneshot";
       serviceConfig.RemainAfterExit = true;
@@ -37,7 +42,7 @@ in import ./make-test.nix {
 
   nodes.generation2 = {
     imports = [ common ];
-    security.dhparams.params.foo = 18;
+    security.dhparams.params.foo.bits = 18;
   };
 
   nodes.generation3 = common;
@@ -45,8 +50,7 @@ in import ./make-test.nix {
   testScript = { nodes, ... }: let
     getParamPath = gen: name: let
       node = "generation${toString gen}";
-      inherit (nodes.${node}.config.security.dhparams) path;
-    in "${path}/${name}.pem";
+    in nodes.${node}.config.security.dhparams.params.${name}.path;
 
     assertParamBits = gen: name: bits: let
       path = getParamPath gen name;

From 3e11ff6e0d9fb21a962408407f24b465b30fe96f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 26 Apr 2018 06:38:02 +0200
Subject: [PATCH 0460/3370] nixos/dhparams: Introduce a 'stateful' option

This option allows us to turn off stateful generation of Diffie-Hellman
parameters, which in some way is still stateful as the generated DH
params file is non-deterministic.

However what we can avoid with this is to have an increased surface for
failures during system startup, because generation of the parameters is
done during build-time.

Another advantage of this is that we no longer need to take care of
cleaning up the files that are no longer used and in my humble opinion I
would have preferred that #11505 (which puts the dhparams in the Nix
store) would have been merged instead of #22634 (which we have now).

Luckily we can still change that and this change gives the user the
option to put the dhparams into the Nix store.

Beside of the more obvious advantages pointed out here, this also
effects test runtime if more services are starting to use this (for
example see #39507 and #39288), because generating DH params could take
a long time depending on the bit size which adds up to test runtime.

If we generate the DH params in a separate derivation, subsequent test
runs won't need to wait for DH params generation during bootup.

Of course, tests could still mock this by force-disabling the service
and adding a service or activation script that places pre-generated DH
params in /var/lib/dhparams but this would make tests less readable and
the workaround would have to be made for each test affected.

Note that the 'stateful' option is still true by default so that we are
backwards-compatible with existing systems.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog, @abbradar, @fpletz
---
 nixos/modules/security/dhparams.nix | 39 +++++++++++++++++++++++------
 nixos/tests/dhparams.nix            | 21 ++++++++++++++++
 2 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 7c9fe986e576..64b296eea5b8 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -29,7 +29,11 @@ let
       '';
     };
 
-    config.path = "${cfg.path}/${name}.pem";
+    config.path = let
+      generated = pkgs.runCommand "dhparams-${name}.pem" {
+        nativeBuildInputs = [ pkgs.openssl ];
+      } "openssl dhparam -out \"$out\" ${toString config.bits}";
+    in if cfg.stateful then "${cfg.path}/${name}.pem" else generated;
   };
 
 in {
@@ -52,7 +56,9 @@ in {
             have to leave <option>security.dhparams.enable</option> for at
             least one activation in order to have them be cleaned up. This also
             means if you rollback to a version without any dhparams the
-            existing ones won't be cleaned up.</para></warning>
+            existing ones won't be cleaned up. Of course this only applies if
+            <option>security.dhparams.stateful</option> is
+            <literal>true</literal>.</para></warning>
           '';
         type = with types; let
           coerce = bits: { inherit bits; };
@@ -61,12 +67,29 @@ in {
         example = literalExample "{ nginx.bits = 3072; }";
       };
 
+      stateful = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether generation of Diffie-Hellman parameters should be stateful or
+          not. If this is enabled, PEM-encoded files for Diffie-Hellman
+          parameters are placed in the directory specified by
+          <option>security.dhparams.path</option>. Otherwise the files are
+          created within the Nix store.
+
+          <note><para>If this is <literal>false</literal> the resulting store
+          path will be non-deterministic and will be rebuilt every time the
+          <package>openssl</package> package changes.</para></note>
+        '';
+      };
+
       path = mkOption {
-        description =
-          ''
-            Path to the directory in which Diffie-Hellman parameters will be
-            stored.
-          '';
+        description = ''
+          Path to the directory in which Diffie-Hellman parameters will be
+          stored. This only is relevant if
+          <option>security.dhparams.stateful</option> is
+          <literal>true</literal>.
+        '';
         type = types.str;
         default = "/var/lib/dhparams";
       };
@@ -82,7 +105,7 @@ in {
     };
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (cfg.enable && cfg.stateful) {
     systemd.services = {
       dhparams-init = {
         description = "Cleanup old Diffie-Hellman parameters";
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
index ead5f2efce7c..da75391e4ce5 100644
--- a/nixos/tests/dhparams.nix
+++ b/nixos/tests/dhparams.nix
@@ -47,6 +47,13 @@ in import ./make-test.nix {
 
   nodes.generation3 = common;
 
+  nodes.generation4 = {
+    imports = [ common ];
+    security.dhparams.stateful = false;
+    security.dhparams.params.foo2.bits = 18;
+    security.dhparams.params.bar2.bits = 19;
+  };
+
   testScript = { nodes, ... }: let
     getParamPath = gen: name: let
       node = "generation${toString gen}";
@@ -105,5 +112,19 @@ in import ./make-test.nix {
         'test -e ${nodes.generation3.config.security.dhparams.path}'
       );
     };
+
+    ${switchToGeneration 4}
+
+    subtest "check bit sizes dhparam files", sub {
+      ${assertParamBits 4 "foo2" 18}
+      ${assertParamBits 4 "bar2" 19}
+    };
+
+    subtest "check whether dhparam files are in the Nix store", sub {
+      $machine->succeed(
+        'expr match ${getParamPath 4 "foo2"} ${builtins.storeDir}',
+        'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}',
+      );
+    };
   '';
 }

From ce8777386786f5a38fb0bc8728515a66c82c3d04 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 26 Apr 2018 07:11:54 +0200
Subject: [PATCH 0461/3370] nixos/dhparams: Clean up module expression

First of all let's start with a clean up the multiline string
indentation for descriptions, because having two indentation levels
after description is a waste of screen estate.

A quick survey in the form of the following also reveals that the
majority of multiline strings in nixpkgs is starting the two beginning
quotes in the same line:

$ find -name '*.nix' -exec sed -n -e '/=$/ { n; /'\'\''/p }' {} + | wc -l
817
$ find -name '*.nix' -exec grep "= *'' *\$" {} + | wc -l
14818

The next point is to get the type, default and example attributes on top
of the description because that's the way it's rendered in the manual.

Most services have their enable option close to the beginning of the
file, so let's move it to the top.

Also, I found the script attribute for dhparams-init.service a bit hard
to read as it was using string concatenation to split a "for" loop.

Now for the more substantial clean ups rather than just code style:

  * Remove the "with lib;" at the beginning of the module, because it
    makes it easier to do a quick check with "nix-instantiate --parse".
  * Use ConditionPathExists instead of test -e for checking whether we
    need to generate the dhparams file. This avoids spawning a shell if
    the file exists already and it's probably more common that it will
    exist, except for the initial creation of course.
  * When cleaning up old dhparams file, use RemainAfterExit so that the
    unit won't be triggered again whenever we stop and start a service
    depending on it.
  * Capitalize systemd unit descriptions to be more in par with most
    other unit descriptions (also see 0c5e837b66f58265ce2b66a33d0f47a3).
  * Use "=" instead of "==" for conditionals using []. It's just a very
    small nitpick though and it will only fail for POSIX shells. Bash on
    the other side accepts it anyway.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @Ekleog
---
 nixos/modules/security/dhparams.nix | 154 ++++++++++++++--------------
 1 file changed, 75 insertions(+), 79 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 64b296eea5b8..481d4c5db512 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -1,8 +1,7 @@
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
+  inherit (lib) mkOption types;
   cfg = config.security.dhparams;
 
   paramsSubmodule = { name, config, ... }: {
@@ -39,32 +38,39 @@ let
 in {
   options = {
     security.dhparams = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to generate new DH params and clean up old DH params.
+        '';
+      };
+
       params = mkOption {
-        description =
-          ''
-            Diffie-Hellman parameters to generate.
-
-            The value is the size (in bits) of the DH params to generate. The
-            generated DH params path can be found in
-            <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>.
-
-            <note><para>The name of the DH params is taken as being the name of
-            the service it serves and the params will be generated before the
-            said service is started.</para></note>
-
-            <warning><para>If you are removing all dhparams from this list, you
-            have to leave <option>security.dhparams.enable</option> for at
-            least one activation in order to have them be cleaned up. This also
-            means if you rollback to a version without any dhparams the
-            existing ones won't be cleaned up. Of course this only applies if
-            <option>security.dhparams.stateful</option> is
-            <literal>true</literal>.</para></warning>
-          '';
         type = with types; let
           coerce = bits: { inherit bits; };
-        in attrsOf (coercedTo types.int coerce (submodule paramsSubmodule));
+        in attrsOf (coercedTo int coerce (submodule paramsSubmodule));
         default = {};
-        example = literalExample "{ nginx.bits = 3072; }";
+        example = lib.literalExample "{ nginx.bits = 3072; }";
+        description = ''
+          Diffie-Hellman parameters to generate.
+
+          The value is the size (in bits) of the DH params to generate. The
+          generated DH params path can be found in
+          <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>.
+
+          <note><para>The name of the DH params is taken as being the name of
+          the service it serves and the params will be generated before the
+          said service is started.</para></note>
+
+          <warning><para>If you are removing all dhparams from this list, you
+          have to leave <option>security.dhparams.enable</option> for at
+          least one activation in order to have them be cleaned up. This also
+          means if you rollback to a version without any dhparams the
+          existing ones won't be cleaned up. Of course this only applies if
+          <option>security.dhparams.stateful</option> is
+          <literal>true</literal>.</para></warning>
+        '';
       };
 
       stateful = mkOption {
@@ -84,77 +90,67 @@ in {
       };
 
       path = mkOption {
+        type = types.str;
+        default = "/var/lib/dhparams";
         description = ''
           Path to the directory in which Diffie-Hellman parameters will be
           stored. This only is relevant if
           <option>security.dhparams.stateful</option> is
           <literal>true</literal>.
         '';
-        type = types.str;
-        default = "/var/lib/dhparams";
-      };
-
-      enable = mkOption {
-        description =
-          ''
-            Whether to generate new DH params and clean up old DH params.
-          '';
-        default = false;
-        type = types.bool;
       };
     };
   };
 
-  config = mkIf (cfg.enable && cfg.stateful) {
+  config = lib.mkIf (cfg.enable && cfg.stateful) {
     systemd.services = {
       dhparams-init = {
-        description = "Cleanup old Diffie-Hellman parameters";
-        wantedBy = [ "multi-user.target" ]; # Clean up even when no DH params is set
-        serviceConfig.Type = "oneshot";
-        script =
-          # Create directory
-          ''
-            if [ ! -d ${cfg.path} ]; then
-              mkdir -p ${cfg.path}
-            fi
-          '' +
-          # Remove old dhparams
-          ''
-            for file in ${cfg.path}/*; do
-              if [ ! -f "$file" ]; then
-                continue
-              fi
-          '' + concatStrings (mapAttrsToList (name: { bits, ... }:
-          ''
-              if [ "$file" == "${cfg.path}/${name}.pem" ] && \
-                  ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
-                continue
-              fi
-          ''
-          ) cfg.params) +
-          ''
-              rm $file
-            done
+        description = "Clean Up Old Diffie-Hellman Parameters";
 
-            # TODO: Ideally this would be removing the *former* cfg.path, though this
-            # does not seem really important as changes to it are quite unlikely
-            rmdir --ignore-fail-on-non-empty ${cfg.path}
-          '';
-      };
-    } //
-      mapAttrs' (name: { bits, ... }: nameValuePair "dhparams-gen-${name}" {
-        description = "Generate Diffie-Hellman parameters for ${name} if they don't exist yet";
-        after = [ "dhparams-init.service" ];
-        before = [ "${name}.service" ];
+        # Clean up even when no DH params is set
         wantedBy = [ "multi-user.target" ];
+
+        serviceConfig.RemainAfterExit = true;
         serviceConfig.Type = "oneshot";
-        script =
-          ''
+
+        script = ''
+          if [ ! -d ${cfg.path} ]; then
             mkdir -p ${cfg.path}
-            if [ ! -f ${cfg.path}/${name}.pem ]; then
-              ${pkgs.openssl}/bin/openssl dhparam -out ${cfg.path}/${name}.pem ${toString bits}
+          fi
+
+          # Remove old dhparams
+          for file in ${cfg.path}/*; do
+            if [ ! -f "$file" ]; then
+              continue
             fi
-          '';
-      }) cfg.params;
+            ${lib.concatStrings (lib.mapAttrsToList (name: { bits, path, ... }: ''
+              if [ "$file" = ${lib.escapeShellArg path} ] && \
+                 ${pkgs.openssl}/bin/openssl dhparam -in "$file" -text \
+                 | head -n 1 | grep "(${toString bits} bit)" > /dev/null; then
+                continue
+              fi
+            '') cfg.params)}
+            rm $file
+          done
+
+          # TODO: Ideally this would be removing the *former* cfg.path, though
+          # this does not seem really important as changes to it are quite
+          # unlikely
+          rmdir --ignore-fail-on-non-empty ${cfg.path}
+        '';
+      };
+    } // lib.mapAttrs' (name: { bits, path, ... }: lib.nameValuePair "dhparams-gen-${name}" {
+      description = "Generate Diffie-Hellman Parameters for ${name}";
+      after = [ "dhparams-init.service" ];
+      before = [ "${name}.service" ];
+      wantedBy = [ "multi-user.target" ];
+      unitConfig.ConditionPathExists = "!${path}";
+      serviceConfig.Type = "oneshot";
+      script = ''
+        mkdir -p ${lib.escapeShellArg cfg.path}
+        ${pkgs.openssl}/bin/openssl dhparam -out ${lib.escapeShellArg path} \
+          ${toString bits}
+      '';
+    }) cfg.params;
   };
 }

From 566d7531e55af3b5c8659e2a2850a275f8ddd09f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 25 Apr 2018 23:12:48 -0700
Subject: [PATCH 0462/3370] radicale: 2.1.8 -> 2.1.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/radicale/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped -h’ got 0 exit code
- ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped --help’ got 0 exit code
- ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/.radicale-wrapped --version’ and found version 2.1.9
- ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale -h’ got 0 exit code
- ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale --help’ got 0 exit code
- ran ‘/nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9/bin/radicale --version’ and found version 2.1.9
- found 2.1.9 with grep in /nix/store/rbymr2y0pbx8n8b8bfz2gscafmby904x-radicale-2.1.9
- directory tree listing: https://gist.github.com/e41acc1e5d5f2db9d8498cf5a989eb7f
---
 pkgs/servers/radicale/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix
index 937bf327995f..171fcc887d21 100644
--- a/pkgs/servers/radicale/default.nix
+++ b/pkgs/servers/radicale/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 let
-  version = "2.1.8";
-  sha256 = "0fnsk61s328dg16iv0chqxayni8ahkbcb84z012w0d9417i806lc";
+  version = "2.1.9";
+  sha256 = "1sywxn7j9bq39qwq74h327crc44j9049cykai1alv44agx8s1nhz";
 in
 
 python3Packages.buildPythonApplication {

From b07201882481eedc3c09669c2c14c620d293537c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 26 Apr 2018 08:14:35 +0200
Subject: [PATCH 0463/3370] python: docker-pycreds: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix
index 9cc510bf9af3..dd20400ea4f4 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "docker-pycreds";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299";
+    sha256 = "e3732a03610a00461a716997670c7010bf1c214a3edc440f7d6a2a3a830ecd9d";
   };
 
   # require docker-credential-helpers binaries

From df7efec99533e5c21530051a174e0a5ad19f8856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 26 Apr 2018 08:11:30 +0200
Subject: [PATCH 0464/3370] python: docker: 3.2.1 -> 3.3.0

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

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index c290c6bd177b..2ae56b7dc5a7 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -3,12 +3,12 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "3.2.1";
+  version = "3.3.0";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d698c3dc4df66c988de5df21a62cdc3450de2fa8523772779e5e23799c41f43";
+    sha256 = "dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a";
   };
 
   propagatedBuildInputs = [

From 95d1d753dc874faa88a32f3c851afcd8a88cdff7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 25 Apr 2018 23:25:47 -0700
Subject: [PATCH 0465/3370] poppler_data: 0.4.8 -> 0.4.9

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/poppler-data/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.4.9 with grep in /nix/store/vcpqkfixqx9gdd3mf07lqil5q7kivlfm-poppler-data-0.4.9
- directory tree listing: https://gist.github.com/d2d3458239d6b4ca15b241ba36a9309e
---
 pkgs/data/misc/poppler-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index 5c8e0970518b..d7a5ce33bd26 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, cmake, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.4.8";
+  name = "poppler-data-0.4.9";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh";
+    sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z";
   };
 
   nativeBuildInputs = [ cmake ninja ];

From 274579cc95ae33457b5cd643ea030d1f530eb31e Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Thu, 24 Nov 2016 15:40:04 +0100
Subject: [PATCH 0466/3370] nixos/infinoted: Abstract over libinfinity version

---
 nixos/modules/services/editors/infinoted.nix       | 2 +-
 pkgs/development/libraries/libinfinity/default.nix | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/editors/infinoted.nix b/nixos/modules/services/editors/infinoted.nix
index 963147b18a04..9074a4345eae 100644
--- a/nixos/modules/services/editors/infinoted.nix
+++ b/nixos/modules/services/editors/infinoted.nix
@@ -129,7 +129,7 @@ in {
         serviceConfig = {
           Type = "simple";
           Restart = "always";
-          ExecStart = "${cfg.package}/bin/infinoted-0.6 --config-file=/var/lib/infinoted/infinoted.conf";
+          ExecStart = "${cfg.package}/bin/infinoted-${versions.majorMinor cfg.package.version} --config-file=/var/lib/infinoted/infinoted.conf";
           User = cfg.user;
           Group = cfg.group;
           PermissionsStartOnly = true;
diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix
index 944cf7a6f5e2..208e01110625 100644
--- a/pkgs/development/libraries/libinfinity/default.nix
+++ b/pkgs/development/libraries/libinfinity/default.nix
@@ -12,7 +12,8 @@ let
 
 in stdenv.mkDerivation rec {
 
-  name = "libinfinity-0.7.1";
+  name = "libinfinity-${version}";
+  version = "0.7.1";
   src = fetchurl {
     url = "http://releases.0x539.de/libinfinity/${name}.tar.gz";
     sha256 = "1jw2fhrcbpyz99bij07iyhy9ffyqdn87vl8cb1qz897y3f2f0vk2";
@@ -36,6 +37,10 @@ in stdenv.mkDerivation rec {
     ${edf avahiSupport "avahi"}
   '';
 
+  passthru = {
+    inherit version;
+  };
+
   meta = {
     homepage = http://gobby.0x539.de/;
     description = "An implementation of the Infinote protocol written in GObject-based C";

From e04a4d3c9ebc5e6725091238f7b530b6e55a77fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 26 Apr 2018 08:46:54 +0200
Subject: [PATCH 0467/3370] python.pkgs.tweepy: move expression

---
 .../python-modules/tweepy/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-----------------
 2 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/tweepy/default.nix

diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
new file mode 100644
index 000000000000..562edf3d15ab
--- /dev/null
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, requests, six, requests_oauthlib }:
+
+buildPythonPackage rec {
+  pname = "tweepy";
+  version = "3.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h";
+  };
+
+  doCheck = false;
+  propagatedBuildInputs = [ requests six requests_oauthlib ];
+
+  meta = with lib; {
+    homepage = https://github.com/tweepy/tweepy;
+    description = "Twitter library for python";
+    license = licenses.mit;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6fee2dcd65b8..8d899f94abd3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14387,25 +14387,7 @@ in {
 
   TurboCheetah = callPackage ../development/python-modules/TurboCheetah { };
 
-  tweepy = buildPythonPackage (rec {
-    name = "tweepy-3.5.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/t/tweepy/${name}.tar.gz";
-      sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h";
-    };
-
-    doCheck = false;
-    propagatedBuildInputs = with self; [ requests six requests_oauthlib ];
-
-    meta = {
-      homepage = "https://github.com/tweepy/tweepy";
-      description = "Twitter library for python";
-      license = licenses.mit;
-      maintainers = with maintainers; [ garbas ];
-      platforms = platforms.linux;
-    };
-  });
+  tweepy = callPackage ../development/python-modules/tweepy { };
 
   twiggy = buildPythonPackage rec {
     name = "Twiggy-${version}";

From 4d0989fe046bdca41f07bbf3d6fa86d7a3cdf792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 26 Apr 2018 08:53:00 +0200
Subject: [PATCH 0468/3370] python: tweepy: 3.5.0 -> 3.6.0

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

diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
index 562edf3d15ab..3020ef80aa41 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "tweepy";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h";
+    sha256 = "901500666de5e265d93e611dc05066bb020481c85550d6bcbf8030212938902c";
   };
 
   doCheck = false;

From c63a32357a807a6e967c5853220293b86c439549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 26 Apr 2018 08:53:27 +0200
Subject: [PATCH 0469/3370] python.pkgs.tweepy: fix build with pip 10

This applies https://github.com/tweepy/tweepy/pull/1030.
---
 pkgs/development/python-modules/tweepy/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix
index 3020ef80aa41..c0c74743044d 100644
--- a/pkgs/development/python-modules/tweepy/default.nix
+++ b/pkgs/development/python-modules/tweepy/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, requests, six, requests_oauthlib }:
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, requests, six, requests_oauthlib }:
 
 buildPythonPackage rec {
   pname = "tweepy";
@@ -9,6 +9,13 @@ buildPythonPackage rec {
     sha256 = "901500666de5e265d93e611dc05066bb020481c85550d6bcbf8030212938902c";
   };
 
+  # Fix build with pip 10
+  # https://github.com/tweepy/tweepy/pull/1030
+  patches = fetchpatch {
+    url = "${meta.homepage}/commit/778bd7a31d2f5fae98652735e7844533589ca221.patch";
+    sha256 = "1sqmjn0ngiynhfkdkcs33qmvl49ysfp8522hvxjk8bx252y9qw2h";
+  };
+
   doCheck = false;
   propagatedBuildInputs = [ requests six requests_oauthlib ];
 

From 1ec8160f8ca9b05fc19d23bac5b6d8c87a19ad39 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 25 Apr 2018 23:57:03 -0700
Subject: [PATCH 0470/3370] php: 7.2.4 -> 7.2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar.phar help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phar help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/phpdbg help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-cgi --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pear help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/peardev help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl --help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/pecl help’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm -h’ got 0 exit code
- ran ‘/nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5/bin/php-fpm --help’ got 0 exit code
- found 7.2.5 with grep in /nix/store/zlkvhv6z2l08gawl8w2vnc7pb3v6p815-php-7.2.5
- directory tree listing: https://gist.github.com/c9aa24f676de9bcd4cc434c086932362
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 7cb9b4dea7f6..301aa99637d0 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -353,7 +353,7 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.4";
-    sha256 = "1wvy8jdd1l5hmdqgw7lq2ynkim3mxfsx8q7vp4il1jadfq6qlr8i";
+    version = "7.2.5";
+    sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk";
   };
 }

From 769093b867c79608b52e415086617bc907f8c38b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 00:52:29 -0700
Subject: [PATCH 0471/3370] ott: 0.27 -> 0.28
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ott/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28/bin/ott --help’ got 0 exit code
- ran ‘/nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28/bin/ott.opt --help’ got 0 exit code
- found 0.28 with grep in /nix/store/2lbl8zpp2lrrh9pgh2gnyhimq6i86rl1-ott-0.28
- directory tree listing: https://gist.github.com/177f63b8c23bae6301ced29fb0e617c4
---
 pkgs/applications/science/logic/ott/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix
index 6fcc8f9c111f..d21487ef92fa 100644
--- a/pkgs/applications/science/logic/ott/default.nix
+++ b/pkgs/applications/science/logic/ott/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "ott-${version}";
-  version = "0.27";
+  version = "0.28";
 
   src = fetchFromGitHub {
     owner = "ott-lang";
     repo = "ott";
     rev = version;
-    sha256 = "12hzpyinswqaxwp6y793h7ywrv6289cw4911ah2yzq04ji095pfb";
+    sha256 = "0mzbrvqayqpns9zzg4m1scxx24dv9askhn51dawyb9pisvlyvai0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From c35dc53e5652e85a7692ef1f0176f80c7ebc406a Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 26 Apr 2018 01:17:40 -0700
Subject: [PATCH 0472/3370] welle-io: remove aarch64 from platform flags

---
 pkgs/applications/misc/welle-io/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/welle-io/default.nix b/pkgs/applications/misc/welle-io/default.nix
index b3a9a3f3b86b..143ec518ac51 100644
--- a/pkgs/applications/misc/welle-io/default.nix
+++ b/pkgs/applications/misc/welle-io/default.nix
@@ -42,7 +42,6 @@ in stdenv.mkDerivation {
     homepage = http://www.welle.io/;
     maintainers = with maintainers; [ ck3d ];
     license = licenses.gpl2;
-    platforms = with platforms; linux ++ darwin;
+    platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin;
   };
-
 }

From 8898063828e5813682bf2c8aa751e0e48d989296 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 01:20:56 -0700
Subject: [PATCH 0473/3370] openvpn: 2.4.5 -> 2.4.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/openvpn/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.6 with grep in /nix/store/5hj70y409c0b01zmx4rddiicgq7jajb2-openvpn-2.4.6
- directory tree listing: https://gist.github.com/ce0bc5e31d7d26ead341febdc7bdc6ee
---
 pkgs/tools/networking/openvpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index 31fccbffa790..d96652e456df 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openvpn-${version}";
-  version = "2.4.5";
+  version = "2.4.6";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz";
-    sha256 = "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23";
+    sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 4176d58331e9a1781725bd14bde26b3d09a56704 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 01:22:20 -0700
Subject: [PATCH 0474/3370] packagekit: 1.1.9 -> 1.1.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/packagekit/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkcon -h’ got 0 exit code
- ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkcon --help’ got 0 exit code
- ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkmon -h’ got 0 exit code
- ran ‘/nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10/bin/pkmon --help’ got 0 exit code
- found 1.1.10 with grep in /nix/store/lxwq08kfybd0zlg06xk0zj606nlpk3bn-packagekit-1.1.10
- directory tree listing: https://gist.github.com/1d641323594032d2e935bd1e088bf409
---
 pkgs/tools/package-management/packagekit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index b40c8ea26aa2..5eb20169412d 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   name = "packagekit-${version}";
-  version = "1.1.9";
+  version = "1.1.10";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit";
     rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "1zs7xkk3b2izdnis7ir5h93p8f2i9513663h2xhxb0sh6i2h18y4";
+    sha256 = "11drd6ixx75q3w12am3z1npwllq1kxnhbxv0npng92c69kn291zs";
   };
 
   buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_38 ]

From 8440100b4f88e3ac9e1816a72f7f2e6a4c9719d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 26 Apr 2018 10:10:47 +0100
Subject: [PATCH 0475/3370] inziu-iosevka: disable hydra build due its size

Build is i/o bound
---
 pkgs/data/fonts/inziu-iosevka/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix
index 536f5cb0c61d..f76e4cb61df0 100644
--- a/pkgs/data/fonts/inziu-iosevka/default.nix
+++ b/pkgs/data/fonts/inziu-iosevka/default.nix
@@ -27,5 +27,7 @@ stdenv.mkDerivation rec {
     license = licenses.ofl;
     maintainers = [ maintainers.ChengCat ];
     platforms = platforms.all;
+    # large package, mainly i/o bound
+    hydraPlatforms = [];
   };
 }

From 0c02d1539465b263e16b1f946c03e3f023e2159e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 26 Apr 2018 10:15:12 +0100
Subject: [PATCH 0476/3370] sarasa-gothic: disable hydra build due its size

Build is i/o bound
---
 pkgs/data/fonts/sarasa-gothic/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
index 8d2afbcf80dd..0d0ff700a303 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -26,5 +26,7 @@ stdenv.mkDerivation rec {
     license = licenses.ofl;
     maintainers = [ maintainers.ChengCat ];
     platforms = platforms.all;
+    # large package, mainly i/o bound
+    hydraPlatforms = [];
   };
 }

From 89fb95b93fd4710755bcbb062f383cca63144925 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 02:54:03 -0700
Subject: [PATCH 0477/3370] libwps: 0.4.8 -> 0.4.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libwps/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2html -v’ and found version 0.4.9
- ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2raw -v’ and found version 0.4.9
- ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2raw --version’ and found version 0.4.9
- ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wps2text -v’ and found version 0.4.9
- ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2csv -v’ and found version 0.4.9
- ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2raw -v’ and found version 0.4.9
- ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2raw --version’ and found version 0.4.9
- ran ‘/nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9/bin/wks2text -v’ and found version 0.4.9
- found 0.4.9 with grep in /nix/store/ffxxsf65d1lgwg2v456z97waagpn3ng0-libwps-0.4.9
- directory tree listing: https://gist.github.com/a3fdf5973402ddf0aa6d1a0ecd058d41
---
 pkgs/development/libraries/libwps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
index 84748d601a64..2f89c0abdfc6 100644
--- a/pkgs/development/libraries/libwps/default.nix
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libwps-${version}";
-  version = "0.4.8";
+  version = "0.4.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/libwps/${name}.tar.bz2";
-    sha256 = "163gdqaanqfs767aj6zdzagqldngn8i7f0hbmhhxlxr0wmvx6c9q";
+    sha256 = "1wn5lvx7c9dp98d9akqjhkv5fk94725hbvqzbjpy1v8y4mm9knb6";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7ebebcb3259e1e4e6de259f8d86af90f5dda2e6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 03:01:35 -0700
Subject: [PATCH 0478/3370] libmwaw: 0.3.13 -> 0.3.14
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libmwaw/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwawFile -v’ and found version 0.3.14
- ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwawZip -v’ and found version 0.3.14
- ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2csv -v’ and found version 0.3.14
- ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2html -v’ and found version 0.3.14
- ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2raw -v’ and found version 0.3.14
- ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2raw --version’ and found version 0.3.14
- ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2svg -v’ and found version 0.3.14
- ran ‘/nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14/bin/mwaw2text -v’ and found version 0.3.14
- found 0.3.14 with grep in /nix/store/a9gm0j8p8v4i0psq5jx3kyxvphhpz8rs-libmwaw-0.3.14
- directory tree listing: https://gist.github.com/e6bf3abafc8b9634a51796eb8969b268
---
 pkgs/development/libraries/libmwaw/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix
index 35137a09cd9c..79718b47745c 100644
--- a/pkgs/development/libraries/libmwaw/default.nix
+++ b/pkgs/development/libraries/libmwaw/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="libmwaw";
-    version="0.3.13";
+    version="0.3.14";
     name="${baseName}-${version}";
-    hash="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv";
-    url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.13/libmwaw-0.3.13.tar.xz";
-    sha256="1sjs3nc39im232h5bf81w3il8ivd7w2bc2qssxf7k74g8hlcfmfv";
+    hash="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c";
+    url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.14/libmwaw-0.3.14.tar.xz";
+    sha256="1s9wyf8pyh3fbazq2d2b6fgi7s7bid60viw2xbdkmn2ywlfbza5c";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From cd3047f313773bbe60df63f512dcf9271c60b34a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 03:33:31 -0700
Subject: [PATCH 0479/3370] libraw: 0.18.8 -> 0.18.9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libraw/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/raw-identify help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/unprocessed_raw help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/4channels help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/simple_dcraw help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/mem_image help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_half help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/half_mt help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test --help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/multirender_test help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/postprocessing_benchmark -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/postprocessing_benchmark help’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_emu -h’ got 0 exit code
- ran ‘/nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9/bin/dcraw_emu help’ got 0 exit code
- found 0.18.9 with grep in /nix/store/87k97dwlfma7hj6yrsyw7av631pzk3bh-libraw-0.18.9
- directory tree listing: https://gist.github.com/5d0a0f5fe58f15c25701c4dc878c5080
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index d4ad1c038601..4ad2f7ba34dc 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.8";
+  version = "0.18.9";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "1qi0fkw2zmd0yplrf79z7lgpz0hxl45dj5rdgpaj7283jzys9b2n";
+    sha256 = "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];

From 96fddac69122ab50fe04975cb4f85dff99d7b9f5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 26 Apr 2018 18:36:42 +0800
Subject: [PATCH 0480/3370] wp-cli: 1.5.0 -> 1.5.1

---
 pkgs/development/tools/wp-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix
index e35bdd22e2d7..9dbdcfaa8aab 100644
--- a/pkgs/development/tools/wp-cli/default.nix
+++ b/pkgs/development/tools/wp-cli/default.nix
@@ -2,11 +2,11 @@
 
 let
   name = "wp-cli-${version}";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchurl {
     url    = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar";
-    sha256 = "17dgbcalvz5gw6xqgcywh6jrybj0qlglm16cgbshjsp6axwxa5gn";
+    sha256 = "1lnjbl6rcv32g6akj4552ncyqmbsawmx1dnbmxr0rjj7wr8484f1";
   };
 
   completion = fetchurl {

From f8bd1b18686e50c5b43d59fe357bd2c184ec0558 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 03:42:34 -0700
Subject: [PATCH 0481/3370] libsass: 3.5.2 -> 3.5.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libsass/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.5.3 with grep in /nix/store/mp09kp6kk1mnb0m6szp8r8cjswpky236-libsass-3.5.3
- directory tree listing: https://gist.github.com/693ae2149cf8d174efe563ad97396c0a
---
 pkgs/development/libraries/libsass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index ec4fa6b7427a..3afe0e905e74 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchurl {
     url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
-    sha256 = "1qjpicbjsj9gf8s00ma0d6kw6qfnc29fhrqdkvq8427wfffj654r";
+    sha256 = "1lfdq2ahskf9yd0m71jlx3r4n6a0dhg4wxpnwbrvj2a23k7db7zi";
   };
 
   patchPhase = ''

From fb4f737b87fd384a33d1786eb38c59e51f05cdc5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 03:55:58 -0700
Subject: [PATCH 0482/3370] jruby: 9.1.16.0 -> 9.1.17.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jruby/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby -h’ got 0 exit code
- ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby --help’ got 0 exit code
- ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby.bash -h’ got 0 exit code
- ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/jruby.bash --help’ got 0 exit code
- ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/ruby -h’ got 0 exit code
- ran ‘/nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0/bin/ruby --help’ got 0 exit code
- found 9.1.17.0 with grep in /nix/store/g4a83h4462412zd3cf95j5ny19bxgha6-jruby-9.1.17.0
- directory tree listing: https://gist.github.com/20468ca63db765e0d42a1c93191f0901
---
 pkgs/development/interpreters/jruby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index b9cc38ee68a3..050d5accd2cb 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "9.1.16.0";
+  version = "9.1.17.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r";
+    sha256 = "1mfzs3mcpx8gmzidilzhpsxhgbblsflq35ww199m46pgiyzzf8ka";
   };
 
   buildInputs = [ makeWrapper ];

From 4b0638394d9fb0c4ce505b1187cc4ff3c5f54a10 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 16 Apr 2018 15:10:42 +0300
Subject: [PATCH 0483/3370] db: split outputs

---
 pkgs/development/libraries/db/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index 4a11c2b98935..d4398692a4e6 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation (rec {
 
   patches = extraPatches;
 
+  outputs = [ "out" "lib" ];
+
   configureFlags =
     [
       (if cxxSupport then "--enable-cxx" else "--disable-cxx")

From 8460769e88eb2807ecfc89ffc67ed9857a2ebe4e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 16 Apr 2018 15:11:01 +0300
Subject: [PATCH 0484/3370] pam: build with userdb support

---
 pkgs/os-specific/linux/pam/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 1d380063f884..1db1a493ae2f 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib }:
+{ stdenv, buildPackages, hostPlatform, fetchurl, fetchpatch, flex, cracklib, db4 }:
 
 stdenv.mkDerivation rec {
   name = "linux-pam-${version}";
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ flex ];
 
-  buildInputs = [ cracklib ];
+  buildInputs = [ cracklib db4 ];
 
   enableParallelBuilding = true;
 
@@ -72,9 +72,10 @@ stdenv.mkDerivation rec {
 
   doCheck = false; # fails
 
-  meta = {
-    homepage = http://ftp.kernel.org/pub/linux/libs/pam/;
+  meta = with stdenv.lib; {
+    homepage = http://www.linux-pam.org/;
     description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.bsd3;
   };
 }

From 52fff3955318c7a7c92088ca9a123d7db888f071 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 26 Apr 2018 18:56:21 +0800
Subject: [PATCH 0485/3370] dbus-broker: 11 -> 13

---
 pkgs/os-specific/linux/dbus-broker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 67e4df3d6f9d..c57650e0806f 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "dbus-broker-${version}";
-  version = "11";
+  version = "13";
 
   src = fetchFromGitHub {
-    owner           = "bus1";
-    repo            = "dbus-broker";
-    rev             = "v${version}";
-    sha256          = "19sszb6ac7md494i996ixqmz9b3gim8rrv2nbrmlgjd59gk6hf7b";
+    owner  = "bus1";
+    repo   = "dbus-broker";
+    rev    = "v${version}";
+    sha256 = "1yjkxpnl54pky6ha3y8dsds57lnk10lmriyzpzy0ha2npng2614x";
     fetchSubmodules = true;
   };
 

From 2821265dfd15ba39e1873cd035720f3343df5791 Mon Sep 17 00:00:00 2001
From: Stefan Matting <smatting@users.noreply.github.com>
Date: Wed, 11 Apr 2018 15:43:36 +0200
Subject: [PATCH 0486/3370] Swap incorrect TheanoWithoutCuda with
 TheanoWithCuda

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0b78cb40656d..7748120cd49c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13056,13 +13056,13 @@ in {
   };
 
   TheanoWithoutCuda = self.Theano.override {
-    cudaSupport = true;
-    cudnnSupport = true;
+    cudaSupport = false;
+    cudnnSupport = false;
   };
 
   TheanoWithCuda = self.Theano.override {
-    cudaSupport = false;
-    cudnnSupport = false;
+    cudaSupport = true;
+    cudnnSupport = true;
   };
 
   thespian = callPackage ../development/python-modules/thespian { };

From 1f1124859d9cbb705b60d8c012a7af61ab4abf94 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 16 Apr 2018 15:11:23 +0300
Subject: [PATCH 0487/3370] dante: add extra build inputs

Add PAM, SASL and UPnP support.
---
 pkgs/servers/dante/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/dante/default.nix b/pkgs/servers/dante/default.nix
index ee139ea2652c..1c093facde5c 100644
--- a/pkgs/servers/dante/default.nix
+++ b/pkgs/servers/dante/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pam, libkrb5, cyrus_sasl, miniupnpc }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "dante-${version}";
   version = "1.4.2";
 
@@ -9,15 +9,17 @@ stdenv.mkDerivation (rec {
     sha256 = "1bfafnm445afrmyxvvcl8ckq0p59yzykmr3y8qvryzrscd85g8ms";
   };
 
+  buildInputs = [ pam libkrb5 cyrus_sasl miniupnpc ];
+
   configureFlags = [
     "--with-libc=libc.so.6"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A circuit-level SOCKS client/server that can be used to provide convenient and secure network connectivity.";
     homepage    = "https://www.inet.no/dante/";
-    maintainers = [ stdenv.lib.maintainers.arobyn ];
-    license     = stdenv.lib.licenses.bsdOriginal;
-    platforms   = stdenv.lib.platforms.linux;
+    maintainers = [ maintainers.arobyn ];
+    license     = licenses.bsdOriginal;
+    platforms   = platforms.linux;
   };
-})
+}

From bd140fb41d5123a06568a98589271a23b6f0c398 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 16 Apr 2018 15:14:13 +0300
Subject: [PATCH 0488/3370] dante service: restart only on failure

Normal exit code shouldn't result in a restart.
---
 nixos/modules/services/networking/dante.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix
index 32acce51e692..67da28308e9a 100644
--- a/nixos/modules/services/networking/dante.nix
+++ b/nixos/modules/services/networking/dante.nix
@@ -54,7 +54,8 @@ in
         Type        = "simple";
         ExecStart   = "${pkgs.dante}/bin/sockd -f ${confFile}";
         ExecReload  = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-        Restart     = "always";
+        # Can crash sometimes; see https://github.com/NixOS/nixpkgs/pull/39005#issuecomment-381828708
+        Restart     = "on-failure";
       };
     };
   };

From b827307c52215c1ef4696e6d7d3c307892ec5231 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 16 Apr 2018 15:15:09 +0300
Subject: [PATCH 0489/3370] dante service: default for logoutput

Log to journald via syslog by default; also improve option type.
---
 nixos/modules/services/networking/dante.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/dante.nix b/nixos/modules/services/networking/dante.nix
index 67da28308e9a..20d4faa1cdb1 100644
--- a/nixos/modules/services/networking/dante.nix
+++ b/nixos/modules/services/networking/dante.nix
@@ -6,6 +6,7 @@ let
   confFile = pkgs.writeText "dante-sockd.conf" ''
     user.privileged: root
     user.unprivileged: dante
+    logoutput: syslog
 
     ${cfg.config}
   '';
@@ -21,11 +22,10 @@ in
       enable = mkEnableOption "Dante SOCKS proxy";
 
       config = mkOption {
-        default     = null;
-        type        = types.nullOr types.str;
+        type        = types.lines;
         description = ''
-          Contents of Dante's configuration file
-          NOTE: user.privileged/user.unprivileged are set by the service
+          Contents of Dante's configuration file.
+          NOTE: user.privileged, user.unprivileged and logoutput are set by the service.
         '';
       };
     };
@@ -33,7 +33,7 @@ in
 
   config = mkIf cfg.enable {
     assertions = [
-      { assertion   = cfg.config != null;
+      { assertion   = cfg.config != "";
         message     = "please provide Dante configuration file contents";
       }
     ];

From a050133e9f75010fc2fba37c4acfe98c264f6e4c Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 26 Apr 2018 19:39:03 +0900
Subject: [PATCH 0490/3370] linux-mptcp: enable advanced schedulers

---
 pkgs/os-specific/linux/kernel/linux-mptcp.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index c4bade2abeda..d486bd1d6d24 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -33,8 +33,7 @@ buildLinux (rec {
     DEFAULT_MPTCP_PM default
 
     # MPTCP scheduler selection.
-    # Disabled as the only non-default is the useless round-robin.
-    MPTCP_SCHED_ADVANCED n
+    MPTCP_SCHED_ADVANCED y
     DEFAULT_MPTCP_SCHED default
 
     # Smarter TCP congestion controllers

From 29c66d9f09a25b0c6a61ff84b57cbded68d11193 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 04:30:01 -0700
Subject: [PATCH 0491/3370] kid3: 3.6.0 -> 3.6.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/kid3/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli -h’ got 0 exit code
- ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli --help’ got 0 exit code
- ran ‘/nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1/bin/kid3-cli help’ got 0 exit code
- found 3.6.1 with grep in /nix/store/frn5bzzva0ysc1vk9adf7lwmlqg28br9-kid3-3.6.1
- directory tree listing: https://gist.github.com/b9be08ae08dde4714bfceaebaf277eab
---
 pkgs/applications/audio/kid3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 680542dc405b..4c9540607eb6 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -10,11 +10,11 @@
 stdenv.mkDerivation rec {
 
   name = "kid3-${version}";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/kid3/kid3/${version}/${name}.tar.gz";
-    sha256 = "1kv795prc4d3f2cbzskvdi73l6nx4cfcd32x255wq1s74zp1k73p";
+    sha256 = "1bbnd6jgahdiqmsbw6c3x4h517m50db592fnq1w0v4k5aaav4i26";
   };
 
   buildInputs = with stdenv.lib;

From 50a4977252f231d5b8f533ef5d81e9be7c24ded8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 04:43:51 -0700
Subject: [PATCH 0492/3370] hwinfo: 21.52 -> 21.53
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/hwinfo/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo -h’ got 0 exit code
- ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo --help’ got 0 exit code
- ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/hwinfo --version’ and found version 21.53
- ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/check_hd help’ got 0 exit code
- ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo -h’ got 0 exit code
- ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo --help’ got 0 exit code
- ran ‘/nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53/bin/getsysinfo help’ got 0 exit code
- found 21.53 with grep in /nix/store/a5f46qz0541j2jbqycbaq1y33nb356pj-hwinfo-21.53
- directory tree listing: https://gist.github.com/c3f6d76aa5a198a4ded2f2598380a0ef
---
 pkgs/tools/system/hwinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix
index 67258399d8bc..839be268b5b4 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/tools/system/hwinfo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "hwinfo-${version}";
-  version = "21.52";
+  version = "21.53";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = "${version}";
-    sha256 = "1kva5bhylxbxgp2lv48av8mzcyybigj45rbwl9736l1kiv58i21r";
+    sha256 = "1hrazksr95pxl5p0r0x3cdph1ps98cls2v9avg0qs0qf9y18hady";
   };
 
   patchPhase = ''

From e0ad325cd46db4d8763cd3417aeb479835cc6290 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 26 Apr 2018 08:02:21 -0400
Subject: [PATCH 0493/3370] docker: 18.03.0 -> 18.03.1

---
 pkgs/applications/virtualization/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 61899d12974f..2a271a96ecd4 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -198,13 +198,13 @@ rec {
   # https://github.com/docker/docker-ce/tree/v${version}/components/engine/hack/dockerfile/install/*
 
   docker_18_03 = dockerGen rec {
-    version = "18.03.0-ce";
-    rev = "0520e243029d1361649afb0706a1c5d9a1c012b8"; # git commit
-    sha256 = "0dq7kf30k6p5m9qrzskfx0rxsx22f7yvxzij6vv1g70pggzacs4g";
+    version = "18.03.1-ce";
+    rev = "9ee9f402cd1eba817c5591a64f1d770c87c421a4"; # git commit
+    sha256 = "1jm3jmcbkvvy3s8pi3xcpir6mwxjfbad46lbif4bnpjfd2r5irrx";
     runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
     runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
-    containerdRev = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c";
-    containerdSha256 = "1x6mmk69jksh4m9rjd8qwpp0qc7jmimpkq9pw9237p0v63p9yci0";
+    containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88";
+    containerdSha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs";
     tiniRev = "949e6facb77383876aeff8a6944dde66b3089574";
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };

From 14ebf244feb78f191a48a7f8cda26b6e36a218ca Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 26 Apr 2018 08:08:53 -0400
Subject: [PATCH 0494/3370] oh-my-zsh: 2018-04-06 -> 2018-04-25

---
 pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix
index 5412f4ce8967..1ff9455adece 100644
--- a/pkgs/shells/zsh/oh-my-zsh/default.nix
+++ b/pkgs/shells/zsh/oh-my-zsh/default.nix
@@ -4,13 +4,13 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2018-04-06";
+  version = "2018-04-25";
   name = "oh-my-zsh-${version}";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "62b8a70a7c5d0c939d8dabfef48796a092d1a55f";
-    sha256 = "02na47pa2ly17yvwa2nhzyrp8iarawyirhfw3779sh0w78vgw1gs";
+    rev = "9cd3701ac0297f4bdf9673ea0dffa8ffdaea63e8";
+    sha256 = "0pjw5m7wpmcfdhrj322icplw3hsbbdxjgfw12kr2zpzl95xqkkhs";
   };
 
   pathsToLink = [ "/share/oh-my-zsh" ];

From 70e070afa7685126eef21456682807da0c9f16c2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 05:57:09 -0700
Subject: [PATCH 0495/3370] fastjet: 3.3.0 -> 3.3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fastjet/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config -h’ got 0 exit code
- ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --help’ got 0 exit code
- ran ‘/nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1/bin/fastjet-config --version’ and found version 3.3.1
- found 3.3.1 with grep in /nix/store/y8mkgp5xlcfik6fb5r1dzb93n6xm1f9r-fastjet-3.3.1
- directory tree listing: https://gist.github.com/aa455f4d0802d2b2b76678ecccfe3eab
---
 pkgs/development/libraries/physics/fastjet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 0ee68415b89c..b4ffccb5360c 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fastjet-${version}";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "http://fastjet.fr/repo/fastjet-${version}.tar.gz";
-    sha256 = "03x75mmnlw2m0a7669k82rf9a7dgjwygf8wjbk8cdgnb82c5pnp9";
+    sha256 = "0lvchyh9q2p8lb10isazw0wbwzs24yg7gxyhpj9xpvz5hydyvgvn";
   };
 
   buildInputs = [ python2 ];

From 0d32d9318b00cae2f1956f5e0baaf75d13454606 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <giulio.eulisse@cern.ch>
Date: Thu, 26 Apr 2018 09:58:36 +0200
Subject: [PATCH 0496/3370] Add myself to the maintainers list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0f05c363a656..c2d94898ab1e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2001,6 +2001,11 @@
     github = "kristoff3r";
     name = "Kristoffer Søholm";
   };
+  ktf = {
+    email = "giulio.eulisse@cern.ch";
+    github = "ktf";
+    name = "Giuluo Eulisse";
+ };
   ktosiek = {
     email = "tomasz.kontusz@gmail.com";
     github = "ktosiek";

From 8a3cdb993d1c7e62dc62dd7239852930f2e71997 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 06:18:41 -0700
Subject: [PATCH 0497/3370] containerd: 1.0.3 -> 1.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/containerd/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd -h’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd --help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release -h’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release --help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/containerd-release help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr -h’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr --help’ got 0 exit code
- ran ‘/nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0/bin/ctr help’ got 0 exit code
- found 1.1.0 with grep in /nix/store/lmnlz9w8fhf71pxl7wlhv9vsv4k3bnxd-containerd-1.1.0
- directory tree listing: https://gist.github.com/7b4a990853acfbf946f8abe02582f41d
---
 pkgs/applications/virtualization/containerd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix
index 533721034575..3854c577188f 100644
--- a/pkgs/applications/virtualization/containerd/default.nix
+++ b/pkgs/applications/virtualization/containerd/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "containerd-${version}";
-  version = "1.0.3";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = "containerd";
     rev = "v${version}";
-    sha256 = "0k1zjn0mpd7q3p5srxld2fr4k6ijzbk0r34r6w69sh0d0rd2fvbs";
+    sha256 = "0nknqprmi04jfiivrk158jyddc95q4jggfsm7cg7rpvjamkzn6c8";
   };
 
   hardeningDisable = [ "fortify" ];

From 5a62cfe4d3d119a3b7c2708e6f4489b7d9041c03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 06:55:28 -0700
Subject: [PATCH 0498/3370] darktable: 2.4.2 -> 2.4.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/darktable/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cltest help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest -h’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest --help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/darktable-cmstest help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped -h’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped --help’ got 0 exit code
- ran ‘/nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3/bin/.darktable-cmstest-wrapped help’ got 0 exit code
- found 2.4.3 with grep in /nix/store/9c4h87rp848ik02prxawwi85qzidjkmz-darktable-2.4.3
- directory tree listing: https://gist.github.com/70f09e7ec3ef4b1bba88d54f066cf9df
---
 pkgs/applications/graphics/darktable/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index d81fea5ea398..4de49524f82f 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.2";
+  version = "2.4.3";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "10asz918kv2248px3w9bn5k8cfrad5xrci58x9y61l0yf5hcpk0r";
+    sha256 = "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x";
   };
 
   nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];

From bea11a34fbcefe24a66cf64c7388124db567a17d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 25 Apr 2018 14:47:39 +0300
Subject: [PATCH 0499/3370] haskellPackages.encoding: fix build with Cabal 2.0

---
 .../haskell-modules/configuration-common.nix  |  3 +
 .../patches/encoding-Cabal-2.0.patch          | 67 +++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e4f2d6728640..cfa80062e3be 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1028,6 +1028,9 @@ self: super: {
     indexed-list-literals = self.indexed-list-literals_0_2_0_0;
   };
 
+  # https://github.com/dmwit/encoding/pull/3
+  encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
+
 }
 
 //
diff --git a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
new file mode 100644
index 000000000000..510e450945b8
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
@@ -0,0 +1,67 @@
+From 67bb87ceff53f0178c988dd4e15eeb2daee92b84 Mon Sep 17 00:00:00 2001
+From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
+Date: Tue, 20 Feb 2018 17:46:24 +0100
+Subject: [PATCH] Relax upper version bounds on dependencies
+
+---
+ Setup.hs       | 20 ++++++++++++++++----
+ encoding.cabal |  4 ++--
+ stack.yaml     |  4 ++--
+ 3 files changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/Setup.hs b/Setup.hs
+index de719e6..fe5b84c 100644
+--- a/Setup.hs
++++ b/Setup.hs
+@@ -1,13 +1,25 @@
++{-# LANGUAGE CPP #-}
++
+ module Main where
+ 
+ import Distribution.Simple
+ import Data.Encoding.Preprocessor.Mapping
+ import Data.Encoding.Preprocessor.XMLMappingBuilder
+ 
++#if MIN_VERSION_Cabal(2,0,0)
++main = defaultMainWithHooks (simpleUserHooks
++                             {hookedPreProcessors = ( ("mapping" , \_ _ _ -> mappingPreprocessor)
++                                                    : ("mapping2", \_ _ _ -> mappingPreprocessor)
++                                                    : ("xml"     , \_ _ _ -> xmlPreprocessor)
++                                                    : (hookedPreProcessors simpleUserHooks)
++                                                    )
++                             })
++#else
+ main = defaultMainWithHooks (simpleUserHooks
+-                             {hookedPreProcessors = (("mapping",\_ _ -> mappingPreprocessor)
+-                                                     :("mapping2",\_ _ -> mappingPreprocessor)
+-                                                     :("xml",\_ _ -> xmlPreprocessor)
+-                                                     :(hookedPreProcessors simpleUserHooks)
++                             {hookedPreProcessors = ( ("mapping" , \_ _ -> mappingPreprocessor)
++                                                    : ("mapping2", \_ _ -> mappingPreprocessor)
++                                                    : ("xml"     , \_ _ -> xmlPreprocessor)
++                                                    : (hookedPreProcessors simpleUserHooks)
+                                                     )
+                              })
++#endif
+diff --git a/encoding.cabal b/encoding.cabal
+index ec20617..f221715 100644
+--- a/encoding.cabal
++++ b/encoding.cabal
+@@ -36,7 +36,7 @@ Source-Repository this
+ 
+ Custom-Setup
+   Setup-Depends: base >=3 && <5,
+-                 Cabal >=1.24 && <1.25,
++                 Cabal >=1.24 && <2.1,
+                  containers,
+                  filepath,
+                  ghc-prim,
+@@ -51,7 +51,7 @@ Library
+                  extensible-exceptions >=0.1 && <0.2,
+                  ghc-prim >=0.3 && <0.6,
+                  mtl >=2.0 && <2.3,
+-                 regex-compat >=0.71 && <0.95
++                 regex-compat >=0.71 && <0.96
+ 
+   Extensions: CPP
+ 

From 94c6dbbaaa6245d4d13554565d3f1f310d81b84c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 07:08:01 -0700
Subject: [PATCH 0500/3370] cgal: 4.11.1 -> 4.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cgal/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_CMakeLists -h’ got 0 exit code
- ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_CMakeLists help’ got 0 exit code
- ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_cmake_script -h’ got 0 exit code
- ran ‘/nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12/bin/cgal_create_cmake_script --help’ got 0 exit code
- found 4.12 with grep in /nix/store/7py5j9ixfljnic4dr3ij97msnj0wahv6-cgal-4.12
- directory tree listing: https://gist.github.com/35067880611978f76a8e3f3adac7f12a
---
 pkgs/development/libraries/CGAL/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index cdb37a84c801..23a539491d0e 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.11.1";
+  version = "4.12";
   name = "cgal-" + version;
 
   src = fetchFromGitHub {
     owner = "CGAL";
     repo = "releases";
     rev = "CGAL-${version}";
-    sha256 = "04nn1lzsjdglzjygc72cq09xrvpqwwnbf6l0xz8bfwfp4x9g10jf";
+    sha256 = "0n4yvg2rkrlb1bwhykrg4iyqg4whxadcs441k10xx0r75i6220mn";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;

From 38ef327aec2d59e484438c36851c0c3ac930ca7a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 26 Apr 2018 09:21:58 -0500
Subject: [PATCH 0501/3370] procps-ng: Use official release tarballs, fix
 version.

Also no need to re-generate config bits,
which is good since we encountered an error when trying to do so.

Fixes #39538.
---
 pkgs/os-specific/linux/procps-ng/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index d164af63315f..08420e36c65b 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -1,22 +1,17 @@
-{ lib, stdenv, fetchurl, ncurses, libtool, gettext, autoconf, automake, pkgconfig }:
+{ lib, stdenv, fetchurl, ncurses, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "procps-${version}";
   version = "3.3.14";
 
+  # The project's releases are on SF, but git repo on gitlab.
   src = fetchurl {
-    url = "https://gitlab.com/procps-ng/procps/-/archive/v${version}/procps-v${version}.tar.bz2";
-    sha256 = "0igvsl3s7m5ygxgypzksk4cp2wkvv3lk49s7i9m5wbimyakmr0vf";
+    url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz";
+    sha256 = "0v3j6rkzzscqds37i105cxx3q4dk04rsgpqfd5p7hzcvk59h5njy";
   };
 
   buildInputs = [ ncurses ];
-  nativeBuildInputs = [ libtool gettext autoconf automake pkgconfig ];
-
-  # autoreconfHook doesn't quite get, what procps-ng buildprocss does
-  # with po/Makefile.in.in and stuff.
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  nativeBuildInputs = [ pkgconfig ];
 
   makeFlags = "usrbin_execdir=$(out)/bin";
 

From 1cbbf3088e8bfe9c09795327d1e81e6a9628e2cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 07:24:38 -0700
Subject: [PATCH 0502/3370] bdf2psf: 1.178 -> 1.184
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bdf2psf/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184/bin/bdf2psf -h’ got 0 exit code
- ran ‘/nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184/bin/bdf2psf --help’ got 0 exit code
- found 1.184 with grep in /nix/store/xd8wdqmq5583b39cl6bwv1n2mnfxlz2y-bdf2psf-1.184
- directory tree listing: https://gist.github.com/8810c5939feee7c4840d8eae52e98832
---
 pkgs/tools/misc/bdf2psf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index e06c2dee000d..5e4b6994094a 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.178";
+  version = "1.184";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "1ngxa7hzfhvfhkvyc2qib3qyql5zz8rjg559wpi2jsi4hibj84vc";
+    sha256 = "0lyxiwm0586b8gyl13ks2rqqa6abkqaxc4i08hvwyza1k1cqm2jc";
   };
 
   buildInputs = [ dpkg ];

From 5164104ef2a7fe37df7721e052c1e30b54df4435 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 07:48:41 -0700
Subject: [PATCH 0503/3370] accountsservice: 0.6.46 -> 0.6.47

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/accountsservice/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.47 with grep in /nix/store/gd55py0d0scns044hqccrihgsv9k8g9r-accountsservice-0.6.47
- directory tree listing: https://gist.github.com/0f7bbf0eb1486bf773f561276689270a
---
 pkgs/development/libraries/accountsservice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index f12dfb4635b2..1d15aafcf935 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "accountsservice-${version}";
-  version = "0.6.46";
+  version = "0.6.47";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "09ddndbha2wh22a0k5150d2wy0v8k8zj3vmbdijyirqwhf5vjr8q";
+    sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From c7a567315f1d14db9bf25aec45553ee9be3812fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 26 Apr 2018 07:51:42 -0700
Subject: [PATCH 0504/3370] batctl: 2018.0 -> 2018.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/batctl/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/8djn6psqrxjc66chnig215c5z8il9zaw-batctl-2018.1/bin/batctl -h’ got 0 exit code
- found 2018.1 with grep in /nix/store/8djn6psqrxjc66chnig215c5z8il9zaw-batctl-2018.1
- directory tree listing: https://gist.github.com/13f600b1fb0404e8b5b78d0e2e32f5c5
---
 pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index ef1d51501e85..a1a2cff70a83 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2018.0";
+  ver = "2018.1";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1x7gy6agwk68s2cbhc4wfhvhdy2ccrq0vi7jzaj94pn8nqshi5ss";
+    sha256 = "0lxm0vb0w1gxyi5k553jgkpmhifc4cykzfybrsk8hvwilq6pv1r7";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 82dd4501f405800202b0485c1bab5575f30be80a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 15 Apr 2018 00:00:01 +0000
Subject: [PATCH 0505/3370] bintools-wrapper, cc-wrapper: don't add
 `targetPrefix` the second time

... binutils and gcc add it already anyway.

Without this it's easy to get cross-toolchain paths longer than 256
chars and nix-daemon will then fail to commit them to /nix/store on XFS.
---
 pkgs/build-support/bintools-wrapper/default.nix | 2 +-
 pkgs/build-support/cc-wrapper/default.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 5c0436b73ddf..a4e2ecb63b81 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -74,7 +74,7 @@ in
 
 stdenv.mkDerivation {
   name = targetPrefix
-    + (if name != "" then name else "${bintoolsName}-wrapper")
+    + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${bintoolsName}-wrapper")
     + (stdenv.lib.optionalString (bintools != null && bintoolsVersion != "") "-${bintoolsVersion}");
 
   preferLocalBuild = true;
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 43cd87fb4597..700e7547b7ae 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -71,7 +71,7 @@ assert nativePrefix == bintools.nativePrefix;
 
 stdenv.mkDerivation {
   name = targetPrefix
-    + (if name != "" then name else "${ccName}-wrapper")
+    + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${ccName}-wrapper")
     + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}");
 
   preferLocalBuild = true;

From 43dbc268cbe74b68e504a0a03087514cbd2f2cdf Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 26 Apr 2018 14:50:36 +0000
Subject: [PATCH 0506/3370] gccCrossStageStatic: don't override name

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79d42d12c827..77450f1fe84e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6128,7 +6128,6 @@ with pkgs;
       libc = libcCross1;
     };
     in wrapCCWith {
-      name = "gcc-cross-wrapper";
       cc = gccFun {
         # copy-pasted
         inherit noSysDirs;

From 1d0625499854b583c57267a744111ba8a1d0cfaf Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 26 Apr 2018 10:14:51 -0500
Subject: [PATCH 0507/3370] release-combined: don't include tests.chromium

The chromium package will frequently time out . Note that this is unrelated to the test but a side effect because the test depends on chromium.

https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.chromium.x86_64-linux

See also #39476
---
 nixos/release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index e010b532a688..4d6ff334d347 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -58,7 +58,7 @@ in rec {
         nixos.ova.x86_64-linux or []
 
         #(all nixos.tests.containers)
-        nixos.tests.chromium.x86_64-linux or []
+        #nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)

From f31b147f638a9b98cee3fcb6a686bbf3ff979265 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 26 Apr 2018 10:19:52 -0500
Subject: [PATCH 0508/3370] linux bootstrap: remove assertion failure from dev,
 fixes 'nix eval'

As in:

$ nix eval -f . bash

Also remove the glibc propagation inherit that made these necessary,
stages handle propagating libc themselves (apparently) and
AFAICT no hashes are changed as a result of this.
---
 pkgs/stdenv/linux/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 2eb55ae439b5..15d3fde965f1 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -107,11 +107,6 @@ let
           # Having the proper 'platform' in all the stdenvs allows getting proper
           # linuxHeaders for example.
           inherit platform;
-
-          # stdenv.glibc is used by GCC build to figure out the system-level
-          # /usr/include directory.
-          # TODO: Remove this!
-          inherit (prevStage) glibc;
         };
         overrides = self: super: (overrides self super) // { fetchurl = thisStdenv.fetchurlBoot; };
       };
@@ -129,8 +124,6 @@ in
     __raw = true;
 
     gcc-unwrapped = null;
-    glibc = assert false; null;
-    musl = assert false; null;
     binutils = null;
     coreutils = null;
     gnugrep = null;

From 18e4125b8873419308944e7adb805d6ad8b5da95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 26 Apr 2018 17:32:18 +0200
Subject: [PATCH 0509/3370] Revert "checkbashism: 2.0.0.2 -> 2.18.1"

This reverts commit c4ac43a20ccf6a53587e3a5b5d6f2c87e4a9de5c.

See https://github.com/NixOS/nixpkgs/pull/38102.
---
 pkgs/development/tools/misc/checkbashisms/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix
index 6f4330ef0a9a..2564b42731b3 100644
--- a/pkgs/development/tools/misc/checkbashisms/default.nix
+++ b/pkgs/development/tools/misc/checkbashisms/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 stdenv.mkDerivation rec {
-  version = "2.18.1";
+  version = "2.0.0.2";
   name = "checkbashisms-${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "1yaygfzv5jzvcbahz6sdfnzhch9mxgsrlsym2ad62nk0svsnp24n";
+    url = "mirror://sourceforge/project/checkbaskisms/${version}/checkbashisms";
+    sha256 = "1vm0yykkg58ja9ianfpm3mgrpah109gj33b41kl0jmmm11zip9jd";
   };
 
   buildInputs = [ perl ];

From 38364c0b07b9343e67e331bdcad1891511690c0b Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 26 Apr 2018 10:36:57 -0500
Subject: [PATCH 0510/3370] inkscape: don't patch share/filters

This should not be needed because they are using `#!/usr/bin/env python` as the shebang and in fact it will break inkscape.x86_64-darwin.

https://hydra.nixos.org/build/73283875/
---
 pkgs/applications/graphics/inkscape/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 37af9f6b86c7..eb349e412068 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
     patchShebangs fix-roff-punct
 
     # XXX: Not needed for CMake:
-    patchShebangs share/filters
     patchShebangs share/palettes
     patchShebangs share/patterns
     patchShebangs share/symbols

From c53c7a02fe68eb1bd92b3ec73cf9370e42e1b794 Mon Sep 17 00:00:00 2001
From: Sergej Leibenzon <sleiben@gmail.com>
Date: Thu, 26 Apr 2018 17:35:06 +0200
Subject: [PATCH 0511/3370] libuv: 1.20.0 -> 1.20.2

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

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index e6b29a6c36be..ed4397c88f0d 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -2,14 +2,14 @@
 , ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.20.0";
+  version = "1.20.2";
   name = "libuv-${version}";
 
   src = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
     rev = "v${version}";
-    sha256 = "0bjxny5bjl0qy978i9n2b96vd72h9dd7ghylvhfsi1aqfwc0s1qz";
+    sha256 = "14zlf59fr03v684ryapc57r9nfrznyk5xvcd59q04rb435ibib48";
   };
 
   postPatch = let

From 2119545865c4b5ef65b2b5433147c884f2cfb1b2 Mon Sep 17 00:00:00 2001
From: Sergej Leibenzon <sleiben@gmail.com>
Date: Thu, 26 Apr 2018 12:01:14 +0200
Subject: [PATCH 0512/3370] nodejs: init at v10.0.0

---
 pkgs/development/web/nodejs/v10.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix     |  8 ++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/web/nodejs/v10.nix

diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
new file mode 100644
index 000000000000..68d7f1b4ff11
--- /dev/null
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -0,0 +1,11 @@
+{ stdenv, callPackage, lib, openssl, enableNpm ? true }:
+
+let
+  buildNodejs = callPackage ./nodejs.nix { inherit openssl; };
+in
+  buildNodejs {
+    inherit enableNpm;
+    version = "10.0.0";
+    sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2";
+    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 470fe7c98187..5a45730c8315 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3390,6 +3390,14 @@ with pkgs;
   nodejs-9_x = callPackage ../development/web/nodejs/v9.nix {};
   nodejs-slim-9_x = callPackage ../development/web/nodejs/v9.nix { enableNpm = false; };
 
+  nodejs-10_x = callPackage ../development/web/nodejs/v10.nix {
+    openssl = openssl_1_1_0;
+  };
+  nodejs-slim-10_x = callPackage ../development/web/nodejs/v10.nix {
+    enableNpm = false;
+    openssl = openssl_1_1_0;
+  };
+
   nodePackages_8_x = callPackage ../development/node-packages/default-v8.nix {
     nodejs = pkgs.nodejs-8_x;
   };

From 3d4aa7e95def212895c36262355ca6349cfe7d5a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 26 Apr 2018 07:27:23 -0500
Subject: [PATCH 0513/3370] qemu: workaround 'struct sysinfo' conflict musl
 <--> linux

Most everyone using musl patches the linux headers instead,
but various software uses a local workaround like the
one added in this commit (psutils, for example).

It's not obvious to me which project has the "bug",
and I'm reluctant to even propose modifying our headers
without clear answer on the issue.

Also, modifying those headers triggers rebuild-all-the-things.

Hopefully upstream projects sort this out, in the meantime
adding this define is a bit of a kludge but does the job.

-------

For the curious, the patch usually is something like this:
https://patchwork.kernel.org/patch/3833241/

Here's an updated version that also ensures
kernel users get the sysinfo struct as expected too:
https://raw.githubusercontent.com/openwrt/openwrt/e3c43ade0bae9491aeea50fa361e846bb5002dc0/target/linux/generic/pending-4.14/270-uapi-kernel.h-glibc-specific-inclusion-of-sysinfo.h.patch

(cherry picked from commit dtzWill/nixpkgs@91b5f5a463f5545fbf4f916b3c624840fcb9f300)
---
 pkgs/applications/virtualization/qemu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 0496adb6f409..dd68eb19380f 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -95,6 +95,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     unset CPP # intereferes with dependency calculation
+  '' + optionalString stdenv.hostPlatform.isMusl ''
+    NIX_CFLAGS_COMPILE+=" -D_LINUX_SYSINFO_H"
   '';
 
   configureFlags =

From 00610fe0903e0aa300e4f7797a6d84d13f3d8ce9 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 26 Apr 2018 18:15:21 +0200
Subject: [PATCH 0514/3370] qemu-riscv: remove, obsolete with qemu 2.12

upstream qemu 2.12 includes riscv support
---
 .../virtualization/qemu/riscv.nix             | 30 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/qemu/riscv.nix

diff --git a/pkgs/applications/virtualization/qemu/riscv.nix b/pkgs/applications/virtualization/qemu/riscv.nix
deleted file mode 100644
index 2159ad4b4dc9..000000000000
--- a/pkgs/applications/virtualization/qemu/riscv.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ qemu, fetchFromGitHub, lib }: let
-  src = fetchFromGitHub {
-    owner  = "riscv";
-    repo   = "riscv-qemu";
-    rev    = "f733c7b5f86147216e14aff90c03ccdd76056bef";
-    sha256 = "1ppr9qqwi7qqh8m6dgk1hrzg8zri240il27l67vfayd8ijagb9zq";
-    fetchSubmodules = true;
-  };
-  version = "2.11.92";
-  revCount = "60378";
-  shortRev = builtins.substring 0 9 src.rev;
-  targets = [ "riscv32-linux-user" "riscv32-softmmu"
-              "riscv64-linux-user" "riscv64-softmmu"
-            ];
-in lib.overrideDerivation qemu (orig: {
-  name = "${(builtins.parseDrvName qemu.name).name}-${version}pre${revCount}_${shortRev}";
-  inherit src;
-# <<<<<<< HEAD
-#   # https://github.com/riscv/riscv-qemu/pull/109
-#   patches = [ ./no-etc-install.patch ./statfs-flags.patch ./riscv-initrd.patch ];
-# =======
-  # The pulseaudio and statfs patches are in 2.12.0+, which this is based on
-  patches = [
-    ./force-uid0-on-9p.patch
-    ./no-etc-install.patch
-  ];
-
-  configureFlags = orig.configureFlags ++ [ "--target-list=${lib.concatStringsSep "," targets}" ];
-  postInstall = null;
-})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1606e82ca89..fb490a4753bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17424,8 +17424,6 @@ with pkgs;
     inherit (darwin.stubs) rez setfile;
   };
 
-  qemu-riscv = lowPrio (callPackage ../applications/virtualization/qemu/riscv.nix {});
-
   qgis = callPackage ../applications/gis/qgis {
     inherit (darwin.apple_sdk.frameworks) IOKit ApplicationServices;
   };

From 2a4dc39e1e6f70569ba5664cf3de1c49adf063be Mon Sep 17 00:00:00 2001
From: Mark Karpov <markkarpov92@gmail.com>
Date: Thu, 26 Apr 2018 23:19:52 +0700
Subject: [PATCH 0515/3370] pytaglib: init at 1.4.3 (#39498)

---
 maintainers/maintainer-list.nix               |  5 +++
 .../python-modules/pytaglib/default.nix       | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytaglib/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0f05c363a656..299f4d1c82a8 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2521,6 +2521,11 @@
     github = "fstamour";
     name = "Francis St-Amour";
   };
+  mrkkrp = {
+    email = "markkarpov92@gmail.com";
+    github = "mrkkrp";
+    name = "Mark Karpov";
+  };
   mrVanDalo = {
     email = "contact@ingolf-wagner.de";
     github = "mrVanDalo";
diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix
new file mode 100644
index 000000000000..6674a89180af
--- /dev/null
+++ b/pkgs/development/python-modules/pytaglib/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, taglib
+, cython
+, pytest
+, glibcLocales
+}:
+
+buildPythonPackage rec {
+  pname   = "pytaglib";
+  version = "1.4.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "44ab26dc4b33962b8db0bb8856e7b166539c0c555bc933a6bbbc96f4ec51c7a2";
+  };
+
+  buildInputs = [ taglib cython ];
+
+  checkInputs = [ pytest glibcLocales ];
+
+  checkPhase = ''
+    LC_ALL=en_US.utf-8 pytest .
+  '';
+
+  meta = {
+    homepage = https://github.com/supermihi/pytaglib;
+    description = "Python 2.x/3.x bindings for the Taglib audio metadata library";
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.mrkkrp ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7748120cd49c..f24d6ff955bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8220,6 +8220,8 @@ in {
     };
   };
 
+  pytaglib = callPackage ../development/python-modules/pytaglib { };
+
   pyte = callPackage ../development/python-modules/pyte { };
 
   graphviz = buildPythonPackage rec {

From 882ed257d639dbea50dfaf8221808a9ddb6ffb71 Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Thu, 26 Apr 2018 19:08:50 +0200
Subject: [PATCH 0516/3370] owncloud-client: 2.3.4 -> 2.4.1

---
 .../networking/owncloud-client/default.nix           |  6 +++---
 .../networking/owncloud-client/find-sql.patch        | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/networking/owncloud-client/find-sql.patch

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 94e3b7d0ba6a..17c5cc86fa6b 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
-  version = "2.3.4";
+  version = "2.4.1";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "1fpi1mlp2b8sx2993b4mava5c6qw794dmlayih430299z1l9wh49";
+    sha256 = "4462ae581c281123dc62f3604f1aa54c8f4a60cd8157b982e2d76faac0f7aa23";
   };
 
-  patches = [ ../nextcloud-client/find-sql.patch ];
+  patches = [ ./find-sql.patch ];
 
   nativeBuildInputs = [ pkgconfig cmake ];
   buildInputs = [ qtbase qtwebkit qtkeychain sqlite ];
diff --git a/pkgs/applications/networking/owncloud-client/find-sql.patch b/pkgs/applications/networking/owncloud-client/find-sql.patch
new file mode 100644
index 000000000000..44dea6414e92
--- /dev/null
+++ b/pkgs/applications/networking/owncloud-client/find-sql.patch
@@ -0,0 +1,12 @@
+*** a/cmake/modules/QtVersionAbstraction.cmake
+--- b/cmake/modules/QtVersionAbstraction.cmake
+***************
+*** 8,13 ****
+--- 8,14 ----
+  find_package(Qt5Core REQUIRED)
+  find_package(Qt5Network REQUIRED)
+  find_package(Qt5Xml REQUIRED)
++ find_package(Qt5Sql REQUIRED)
+  find_package(Qt5Concurrent REQUIRED)
+  if(UNIT_TESTING)
+      find_package(Qt5Test REQUIRED)

From a026242e4a2353d33dea47c09617f0988eae779f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 26 Apr 2018 12:24:45 -0500
Subject: [PATCH 0517/3370] netbsd: remove broken attributes

---
 pkgs/os-specific/bsd/netbsd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 42633232c71a..e382fcbb9f0d 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -287,7 +287,7 @@ let
   };
 
 in rec {
-  inherit compat libc libutil install make mtree netBSDDerivation;
+  inherit compat install make netBSDDerivation;
 
   getent = netBSDDerivation {
     path = "usr.bin/getent";

From 4539f1f2f72ab4d95642506c4481379f09d2699c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 26 Apr 2018 12:29:58 -0500
Subject: [PATCH 0518/3370] netbsd: install db.h to compat

---
 pkgs/os-specific/bsd/netbsd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index e382fcbb9f0d..387d0cd270ee 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -196,6 +196,7 @@ let
       install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h
       install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h
       install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h
+      install -D $NETBSDSRCDIR/include/db.h $out/include/db.h
     '';
     extraPaths = [ libc.src libutil.src
       (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp")

From e521bada21b18bcb623c549b5d153d5612afbf96 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 26 Apr 2018 12:31:06 -0500
Subject: [PATCH 0519/3370] netbsd: propagate compat

---
 pkgs/os-specific/bsd/netbsd/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 387d0cd270ee..03d93f3d9086 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -288,7 +288,7 @@ let
   };
 
 in rec {
-  inherit compat install make netBSDDerivation;
+  inherit compat install netBSDDerivation;
 
   getent = netBSDDerivation {
     path = "usr.bin/getent";
@@ -309,6 +309,7 @@ in rec {
     sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77";
     version = "7.1.2";
     nativeBuildInputs = [ ];
+    propagatedBuildInputs = [ compat ];
     extraPaths = [
       (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9")
       (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y")
@@ -358,7 +359,8 @@ in rec {
 
   libedit = netBSDDerivation {
     path = "lib/libedit";
-    buildInputs = [ compat libterminfo ];
+    buildInputs = [ libterminfo libcurses ];
+    propagatedBuildInputs = [ compat ];
     patchPhase = ''
       sed -i '1i #undef bool_t' el.h
     '';
@@ -380,7 +382,8 @@ in rec {
     path = "lib/libcurses";
     version = "7.1.2";
     sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf";
-    buildInputs = [ compat libterminfo ];
+    buildInputs = [ libterminfo ];
+    propagatedBuildInputs = [ compat ];
     MKDOC = "no"; # missing vfontedpr
   };
 

From 968e8a1099859bf41cc34ca453bda897cdb8380c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 26 Apr 2018 17:57:53 +0000
Subject: [PATCH 0520/3370] netbsd: fix getent with musl

---
 pkgs/os-specific/bsd/netbsd/default.nix | 58 +++++++++++++------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 03d93f3d9086..f64c36932e34 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -25,6 +25,7 @@ let
       "-D__warn_references(a,b)="
       "-D__strong_alias(a,b)="
       "-D__va_list=va_list"
+      "-D__scanflike(a,b)="
     ];
 
     # Definitions passed to share/mk/*.mk. Should be pretty simple -
@@ -210,9 +211,36 @@ let
     version = "7.1.2";
     sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8";
     extraPaths = [ mtree.src make.src ];
-    nativeBuildInputs = [ makeMinimal mandoc groff compat ];
+    nativeBuildInputs = [ makeMinimal mandoc groff ];
+    buildInputs = [ compat fts ];
     RENAME = "-D";
   };
+
+  fts = netBSDDerivation {
+    pname = "fts";
+    path = "include/fts.h";
+    sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77";
+    version = "7.1.2";
+    nativeBuildInputs = [ ];
+    propagatedBuildInputs = [ compat ];
+    extraPaths = [
+      (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9")
+      (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y")
+      (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1")
+    ];
+    buildPhase = ''
+      cc  -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
+          -o lib/libc/gen/fts.o
+      ar -rsc libfts.a lib/libc/gen/fts.o
+    '';
+    installPhase = ''
+      install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3
+      install -D include/fts.h $out/include/fts.h
+      install -D lib/libc/include/namespace.h $out/include/namespace.h
+      install -D libfts.a $out/lib/libfts.a
+    '';
+    setupHook = ./fts-setup-hook.sh;
+  };
   # END BOOTSTRAPPING
 
   libutil = netBSDDerivation {
@@ -288,7 +316,7 @@ let
   };
 
 in rec {
-  inherit compat install netBSDDerivation;
+  inherit compat install netBSDDerivation fts;
 
   getent = netBSDDerivation {
     path = "usr.bin/getent";
@@ -303,32 +331,6 @@ in rec {
     version = "7.1.2";
   };
 
-  fts = netBSDDerivation {
-    pname = "fts";
-    path = "include/fts.h";
-    sha256 = "01d4fpxvz1pgzfk5xznz5dcm0x0gdzwcsfm1h3d0xc9kc6hj2q77";
-    version = "7.1.2";
-    nativeBuildInputs = [ ];
-    propagatedBuildInputs = [ compat ];
-    extraPaths = [
-      (fetchNetBSD "lib/libc/gen/fts.c" "7.1.2" "1yfd2liypj6xky2h0mgxi5lgpflmkkg4zf3ii3apz5cf8jq9gmn9")
-      (fetchNetBSD "lib/libc/include/namespace.h" "7.1.2" "0kwd4v8y0mfjhmwplsk52pvzbcpvpp2qy2g8c0jmfraam63q6q1y")
-      (fetchNetBSD "lib/libc/gen/fts.3" "7.1.2" "1asxw0n3fhjdadwkkq3xplfgqgl3q32w1lyrvbakfa3gs0wz5zc1")
-    ];
-    buildPhase = ''
-      cc  -c -Iinclude -Ilib/libc/include lib/libc/gen/fts.c \
-          -o lib/libc/gen/fts.o
-      ar -rsc libfts.a lib/libc/gen/fts.o
-    '';
-    installPhase = ''
-      install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3
-      install -D include/fts.h $out/include/fts.h
-      install -D lib/libc/include/namespace.h $out/include/namespace.h
-      install -D libfts.a $out/lib/libfts.a
-    '';
-    setupHook = ./fts-setup-hook.sh;
-  };
-
   games = netBSDDerivation {
     path = "games";
     sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1";

From 6ed855289e5910aa2ff5082d03b70fb1fe150a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 26 Apr 2018 20:20:01 +0200
Subject: [PATCH 0521/3370] python.pkgs.pyhomematic: 0.1.41 -> 0.1.42

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

diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 18e477dbd814..0967659a641f 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.41";
+  version = "0.1.42";
 
   disabled = !isPy3k;
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = version;
-    sha256 = "01j6y2ypi7a8ffnkqd8j8vnpszza2cxqpiqbnk1dwbg9w9pwwq53";
+    sha256 = "0h7bq66q22kzj1xwhxmr7knibsmb4csjwq3jr19fyl9sxxmgqwqy";
   };
 
   # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126

From f925480215a14420d893021dc2c6f2b78a66f137 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 26 Apr 2018 18:11:05 +0200
Subject: [PATCH 0522/3370] grafana: 5.0.4 -> 5.1.0

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index d2a0d0463895..df89e67bffc1 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.0.4";
+  version = "5.1.0";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "18f69985a5j6fd2ax6z50yfss70phdh1vwyx0z69j145zac3sf90";
+    sha256 = "1j8l8v5iq1mpvc8j7vbwqqd0xhv9ysl05lxwm524cqljynslaq8f";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "0xdpqf8n3ds0g7nhbiwahhdj0hfc4biz69rhkl48vm31idlr92sc";
+    sha256 = "08wha1n3lqn27pc3bc3sg94y47npy69ydh2ad1rbkmvllnjbwx3z";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From a95a0a932ba7d57e30b19377b90099e439e866d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Thu, 26 Apr 2018 20:27:41 +0200
Subject: [PATCH 0523/3370] pspg: 1.0.0 -> 1.1.0

---
 pkgs/tools/misc/pspg/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index b9543dc143cf..ddd76a344e01 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig }:
+{ stdenv, fetchFromGitHub, gnugrep, ncurses, pkgconfig, readline }:
 
 stdenv.mkDerivation rec {
   name = "pspg-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
     rev = "${version}";
-    sha256 = "1swrg4bg7i4xpdrsg8dsfldbxaffni04x8i1s0g6h691qcin675v";
+    sha256 = "10r6jfcqw4wclp84f07g3bda844csgm4sh7cjsnk2smmal7nhybs";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gnugrep ncurses ];
+  buildInputs = [ gnugrep ncurses readline ];
 
   preBuild = ''
     makeFlags="PREFIX=$out PKG_CONFIG=${pkgconfig}/bin/pkg-config"

From 6c5d860c8b3e0995d01505da86559ebde731a9df Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 26 Apr 2018 20:01:10 +0200
Subject: [PATCH 0524/3370] gst_all_1: fix botched merge

23741692 merged staging incorrectly
---
 pkgs/development/libraries/gstreamer/bad/default.nix  | 10 +---------
 pkgs/development/libraries/gstreamer/good/default.nix |  3 ++-
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index 8ebd70921135..de1a3700cc2b 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -13,13 +13,7 @@
 assert faacSupport -> faac != null;
 
 let
-  inherit (stdenv.lib) optional optionalString;
-
-  # OpenJPEG version is hardcoded in package source
-  openJpegVersion = with stdenv;
-    lib.concatStringsSep "." (lib.lists.take 2
-      (lib.splitString "." (lib.getVersion openjpeg)));
-
+  inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation rec {
   name = "gst-plugins-bad-1.14.0";
@@ -76,6 +70,4 @@ stdenv.mkDerivation rec {
     ++ optional (!stdenv.isDarwin) wildmidi
     # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin
     ++ optional (!stdenv.isDarwin) mjpegtools;
-
-  enableParallelBuilding = true;
 }
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 21376ce79c1c..11e0894df3c3 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -12,7 +12,7 @@
 assert gtkSupport -> gtk3 != null;
 
 let
-  inherit (stdenv.lib) optionals optionalString;
+  inherit (stdenv.lib) optional optionals optionalString;
 in
 stdenv.mkDerivation rec {
   name = "gst-plugins-good-1.14.0";
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
     libsoup libshout lame mpg123 twolame libintl
     ncurses
   ]
+  ++ optional gtkSupport gtk3 # for gtksink
   ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
   ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
 

From 489b0a5f47a6bbf0397111ea0ba222b3b4cdeb6d Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Thu, 26 Apr 2018 21:41:30 +0200
Subject: [PATCH 0525/3370] shotcut: 17.11 -> 18.03.06

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

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 6b1389c97ab0..59c1463577e8 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "17.11";
+  version = "18.03.06";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1bw2cjpzycddxi9b21haiaslv0ikia85wwgkfm2xl2m15w5j8510";
+    sha256 = "1b8hfym89i1nmrx80y16z06zsff5qba7gpga8jydnw1lmcscdash";
   };
 
   enableParallelBuilding = true;

From c12caf34d256cd717107bde2f5160ec773a15605 Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Thu, 26 Apr 2018 21:42:22 +0200
Subject: [PATCH 0526/3370] shotcut: add myself as maintainer

---
 pkgs/applications/video/shotcut/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 59c1463577e8..0a786312214a 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://shotcut.org;
     license = licenses.gpl3;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu woffs ];
     platforms = platforms.linux;
   };
 }

From 537d14f4e2c8ef908641223bc80fe8e2bca74e90 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <>
Date: Thu, 26 Apr 2018 21:59:33 +0200
Subject: [PATCH 0527/3370] chromium: See if Hydra obeys a 24h meta.timeout

---
 pkgs/applications/networking/browsers/chromium/browser.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index e35d894e0e7e..cca26b541240 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -51,5 +51,6 @@ mkChromiumDerivation (base: rec {
     license = licenses.bsd3;
     platforms = platforms.linux;
     hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else [];
+    timeout = 86400; # 24 hours
   };
 })

From d834ba6654fc5fa79c6cc8b0d5cdaa5d8f85fd0e Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 15 Mar 2018 00:00:04 +0000
Subject: [PATCH 0528/3370] stdenv: introduce and use `config.doCheckByDefault`
 option

---
 pkgs/stdenv/generic/make-derivation.nix | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 7b5f9f7d6b0b..c7a991572e9c 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -46,11 +46,13 @@ rec {
         (stdenv.hostPlatform != stdenv.buildPlatform)
         [ "build" "host" ]
 
+    # TODO(@Ericson2314): Make unconditional / resolve #33599
     # Check phase
-    , doCheck ? false
+    , doCheck ? config.doCheckByDefault or false
 
+    # TODO(@Ericson2314): Make unconditional / resolve #33599
     # InstallCheck phase
-    , doInstallCheck ? false
+    , doInstallCheck ? config.doCheckByDefault or false
 
     , crossConfig ? null
     , meta ? {}
@@ -120,6 +122,11 @@ rec {
         ]
       ];
 
+      # TODO(@oxij, @Ericson2314): This is here to keep the old semantics, remove when
+      # no package has `doCheck = true`.
+      doCheck' = doCheck && stdenv.hostPlatform == stdenv.buildPlatform;
+      doInstallCheck' = doInstallCheck && stdenv.hostPlatform == stdenv.buildPlatform;
+
       outputs' =
         outputs ++
         (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []);
@@ -127,6 +134,7 @@ rec {
       derivationArg =
         (removeAttrs attrs
           ["meta" "passthru" "crossAttrs" "pos"
+           "doCheck" "doInstallCheck"
            "__impureHostDeps" "__propagatedImpureHostDeps"
            "sandboxProfile" "propagatedSandboxProfile"])
         // (let
@@ -202,12 +210,10 @@ rec {
           __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
         } // lib.optionalAttrs (outputs' != [ "out" ]) {
           outputs = outputs';
-        } // lib.optionalAttrs (attrs ? doCheck) {
-          # TODO(@Ericson2314): Make unconditional / resolve #33599
-          doCheck = doCheck && (stdenv.hostPlatform == stdenv.buildPlatform);
-        } // lib.optionalAttrs (attrs ? doInstallCheck) {
-          # TODO(@Ericson2314): Make unconditional / resolve #33599
-          doInstallCheck = doInstallCheck && (stdenv.hostPlatform == stdenv.buildPlatform);
+        } // lib.optionalAttrs doCheck' {
+          doCheck = true;
+        } // lib.optionalAttrs doInstallCheck' {
+          doInstallCheck = true;
         });
 
       validity = import ./check-meta.nix {

From 845fa5692164d0bbe2a1857ba27d1bbb4ae0c0e7 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 25 Apr 2018 18:49:44 +0000
Subject: [PATCH 0529/3370] stdenv: cleanup things a little bit

---
 pkgs/stdenv/generic/make-derivation.nix | 55 +++++++++++++------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index c7a991572e9c..96e40a78e518 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -131,31 +131,33 @@ rec {
         outputs ++
         (if separateDebugInfo then assert stdenv.hostPlatform.isLinux; [ "debug" ] else []);
 
+      computedSandboxProfile =
+        lib.concatMap (input: input.__propagatedSandboxProfile or [])
+          (stdenv.extraNativeBuildInputs
+           ++ stdenv.extraBuildInputs
+           ++ lib.concatLists dependencies);
+
+      computedPropagatedSandboxProfile =
+        lib.concatMap (input: input.__propagatedSandboxProfile or [])
+          (lib.concatLists propagatedDependencies);
+
+      computedImpureHostDeps =
+        lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+          (stdenv.extraNativeBuildInputs
+           ++ stdenv.extraBuildInputs
+           ++ lib.concatLists dependencies));
+
+      computedPropagatedImpureHostDeps =
+        lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+          (lib.concatLists propagatedDependencies));
+
       derivationArg =
         (removeAttrs attrs
           ["meta" "passthru" "crossAttrs" "pos"
            "doCheck" "doInstallCheck"
            "__impureHostDeps" "__propagatedImpureHostDeps"
            "sandboxProfile" "propagatedSandboxProfile"])
-        // (let
-          computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or [])
-              (stdenv.extraNativeBuildInputs
-               ++ stdenv.extraBuildInputs
-               ++ lib.concatLists dependencies);
-          computedPropagatedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or [])
-              (lib.concatLists propagatedDependencies);
-          computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
-              (stdenv.extraNativeBuildInputs
-               ++ stdenv.extraBuildInputs
-               ++ lib.concatLists dependencies));
-          computedPropagatedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
-              (lib.concatLists propagatedDependencies));
-        in
-        {
+        // {
           # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
           # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
           name = assert validity.handled; name + lib.optionalString
@@ -194,6 +196,13 @@ rec {
 
         } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) {
           NIX_HARDENING_ENABLE = enabledHardeningOptions;
+        } // lib.optionalAttrs (outputs' != [ "out" ]) {
+          outputs = outputs';
+        } // lib.optionalAttrs doCheck' {
+          doCheck = true;
+        } // lib.optionalAttrs doInstallCheck' {
+          doInstallCheck = true;
+
         } // lib.optionalAttrs (stdenv.buildPlatform.isDarwin) {
           # TODO: remove lib.unique once nix has a list canonicalization primitive
           __sandboxProfile =
@@ -208,13 +217,7 @@ rec {
             "/bin/sh"
           ];
           __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
-        } // lib.optionalAttrs (outputs' != [ "out" ]) {
-          outputs = outputs';
-        } // lib.optionalAttrs doCheck' {
-          doCheck = true;
-        } // lib.optionalAttrs doInstallCheck' {
-          doInstallCheck = true;
-        });
+        };
 
       validity = import ./check-meta.nix {
         inherit lib config meta;

From 912cfb8aaaaeff60c25a685dc41b143952cfb4d3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 25 Apr 2018 17:15:48 +0000
Subject: [PATCH 0530/3370] buildPythonPackage: use `config.doCheckByDefault`

---
 pkgs/development/interpreters/python/build-python-package.nix | 3 ++-
 pkgs/development/interpreters/python/mk-python-derivation.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix
index 6a07a006c6b5..b55d6d874bbb 100644
--- a/pkgs/development/interpreters/python/build-python-package.nix
+++ b/pkgs/development/interpreters/python/build-python-package.nix
@@ -2,6 +2,7 @@
 # and can build packages that use distutils, setuptools or flit.
 
 { lib
+, config
 , python
 , wrapPython
 , setuptools
@@ -19,7 +20,7 @@ let
   wheel-specific = import ./build-python-package-wheel.nix { };
   common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; };
   mkPythonDerivation = import ./mk-python-derivation.nix {
-    inherit lib python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix;
+    inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix;
   };
 in
 
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 96a9cdf0c615..9835ba32d170 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -1,6 +1,7 @@
 # Generic builder.
 
 { lib
+, config
 , python
 , wrapPython
 , setuptools
@@ -53,7 +54,7 @@
 
 , passthru ? {}
 
-, doCheck ? false
+, doCheck ? config.doCheckByDefault or false
 
 , ... } @ attrs:
 

From 9345fc51d111bb4a35afa86fb1617855bcade43d Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 15 Mar 2018 00:00:00 +0000
Subject: [PATCH 0531/3370] haskell-generic-builder: be explicit about
 `doCheck`, cleanup

---
 pkgs/development/haskell-modules/generic-builder.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 52d596da701a..09cbab13930e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -20,7 +20,7 @@ in
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
 , configureFlags ? []
 , description ? ""
-, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
+, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
 , doBenchmark ? false
 , doHoogle ? true
 , editedCabalFile ? null
@@ -172,7 +172,7 @@ let
                       buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
-                     optionals (allPkgconfigDepends != []) allPkgconfigDepends ++
+                     allPkgconfigDepends ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
@@ -314,6 +314,8 @@ stdenv.mkDerivation ({
     runHook postBuild
   '';
 
+  inherit doCheck;
+
   checkPhase = ''
     runHook preCheck
     ${setupCommand} test ${testTarget}
@@ -428,7 +430,6 @@ stdenv.mkDerivation ({
 // optionalAttrs (postConfigure != "")  { inherit postConfigure; }
 // optionalAttrs (preBuild != "")       { inherit preBuild; }
 // optionalAttrs (postBuild != "")      { inherit postBuild; }
-// optionalAttrs (doCheck)              { inherit doCheck; }
 // optionalAttrs (doBenchmark)          { inherit doBenchmark; }
 // optionalAttrs (checkPhase != "")     { inherit checkPhase; }
 // optionalAttrs (preCheck != "")       { inherit preCheck; }

From 87651b32fe44b9cdeb5dc55d6197d5c5158ce42a Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 15 Mar 2018 00:00:04 +0000
Subject: [PATCH 0532/3370] stdenv: steal `checkInputs` from buildPythonPackage

Note that a bunch of non-python packages use this attribute already.
Some of those are clearly unaware of the fact that this attribute does
not exists in stdenv because they define it but don't to add it to
their `bulidInputs` :)

Also note that I use `buildInputs` here and only handle regular
builds because python and haskell builders do it this way and I'm not
sure how to properly handle the cross-compilation case.
---
 doc/stdenv.xml                                     | 14 ++++++++++++++
 .../interpreters/python/mk-python-derivation.nix   |  2 +-
 pkgs/stdenv/generic/make-derivation.nix            |  8 +++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 2a3316b8d018..31d3d0ca3c4e 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1005,6 +1005,13 @@ but only if the <varname>doCheck</varname> variable is enabled.</para>
     </para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>checkInputs</varname></term>
+    <listitem><para>
+      A list of dependencies used by the phase. This gets included in <varname>buildInputs</varname> when <varname>doCheck</varname> is set.
+    </para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>makeFlags</varname> /
     <varname>makeFlagsArray</varname> /
@@ -1291,6 +1298,13 @@ installcheck</command>.</para>
     </para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term><varname>installCheckInputs</varname></term>
+    <listitem><para>
+      A list of dependencies used by the phase. This gets included in <varname>buildInputs</varname> when <varname>doInstallCheck</varname> is set.
+    </para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term><varname>preInstallCheck</varname></term>
     <listitem><para>Hook executed at the start of the installCheck
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index 9835ba32d170..63ffdbb8c0ac 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -75,7 +75,6 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
 
   buildInputs = [ wrapPython ]
     ++ lib.optional (lib.hasSuffix "zip" (attrs.src.name or "")) unzip
-    ++ lib.optionals doCheck checkInputs
     ++ lib.optional catchConflicts setuptools # If we no longer propagate setuptools
     ++ buildInputs
     ++ pythonPath;
@@ -86,6 +85,7 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [
   # Python packages don't have a checkPhase, only an installCheckPhase
   doCheck = false;
   doInstallCheck = doCheck;
+  installCheckInputs = checkInputs;
 
   postFixup = lib.optionalString (!dontWrapPythonPrograms) ''
     wrapPythonPrograms
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 96e40a78e518..b523374454fc 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -36,6 +36,9 @@ rec {
     , depsTargetTarget            ? [] #  1 ->  1
     , depsTargetTargetPropagated  ? [] #  1 ->  1
 
+    , checkInputs                 ? []
+    , installCheckInputs          ? []
+
     # Configure Phase
     , configureFlags ? []
     , # Target is not included by default because most programs don't care.
@@ -101,7 +104,9 @@ rec {
         ]
         [
           (map (drv: drv.__spliced.hostHost or drv) depsHostHost)
-          (map (drv: drv.crossDrv or drv) buildInputs)
+          (map (drv: drv.crossDrv or drv) (buildInputs
+             ++ lib.optionals doCheck' checkInputs
+             ++ lib.optionals doInstallCheck' installCheckInputs))
         ]
         [
           (map (drv: drv.__spliced.targetTarget or drv) depsTargetTarget)
@@ -155,6 +160,7 @@ rec {
         (removeAttrs attrs
           ["meta" "passthru" "crossAttrs" "pos"
            "doCheck" "doInstallCheck"
+           "checkInputs" "installCheckInputs"
            "__impureHostDeps" "__propagatedImpureHostDeps"
            "sandboxProfile" "propagatedSandboxProfile"])
         // {

From bae15c811f182132c77f3c20b6785c9297e8498f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 26 Apr 2018 22:50:36 +0200
Subject: [PATCH 0533/3370] sympow: don't use placeholder

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

diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index fd677f5c0b7b..c83b3d1737cf 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -34,11 +34,13 @@ stdenv.mkDerivation rec {
     makeWrapper "$out/share/sympow/sympow" "$out/bin/sympow" \
       --run 'export SYMPOW_LOCAL="$HOME/.local/share/sympow"' \
       --run 'if [ ! -d "$SYMPOW_LOCAL" ]; then
-        mkdir -p "$SYMPOW_LOCAL" 
-        cp -r ${placeholder "out"}/share/sympow/* "$SYMPOW_LOCAL"
+        mkdir -p "$SYMPOW_LOCAL"
+        cp -r @out@/share/sympow/* "$SYMPOW_LOCAL"
         chmod -R +xw "$SYMPOW_LOCAL"
     fi' \
       --run 'cd "$SYMPOW_LOCAL"'
+    substituteInPlace $out/bin/sympow --subst-var out
+
     runHook postInstall
   '';
 

From f3ff2b1fa638ba5c32bbf90edeedc00102033139 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Fri, 27 Apr 2018 00:37:40 +0300
Subject: [PATCH 0534/3370] handbrake: 1.0.7 -> 1.1.0 & according changes

---
 pkgs/applications/video/handbrake/default.nix | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 6ce2ae08eeb4..d13995f6e9bd 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -9,7 +9,7 @@
 #
 # Only tested on Linux
 
-{ stdenv, lib, fetchFromGitHub,
+{ stdenv, lib, fetchurl,
   python2, pkgconfig, yasm, harfbuzz, zlib,
   autoconf, automake, cmake, libtool, m4, jansson,
   libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
@@ -25,16 +25,24 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.7";
+  version = "1.1.0";
   name = "handbrake-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "HandBrake";
-    repo   = "HandBrake";
-    rev    = "${version}";
-    sha256 = "1pdrvicq40s8n23n6k8k097kkjs3ah5wbz1mvxnfy3h2mh5rwk57";
+  src = fetchurl {
+    url = ''https://download2.handbrake.fr/${version}/HandBrake-${version}-source.tar.bz2'';
+    sha256 = "1nj0ihflisxcfkmsk7fm3b5cn7cpnpg66dk2lkp2ip6qidppqbm0";
   };
 
+  patched_libav_12 = libav_12.overrideAttrs (super: {
+    # 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream.
+    patches = (super.patches or []) ++ [(
+      fetchurl {
+        url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/9e1f245708a157231c427c0ef9b91729d59a30e1/contrib/ffmpeg/A21-mp4-sdtp.patch'';
+        sha256 = "14grzyvb1qbb90k31ibabnwmwnrc48ml6h2z0rjamdv83q45jq4g";
+      })
+    ];
+  });
+
   nativeBuildInputs = [
     cmake python2 pkgconfig yasm autoconf automake libtool m4
   ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
@@ -48,7 +56,7 @@ stdenv.mkDerivation rec {
     glib gtk3 libappindicator-gtk3 libnotify
     gst_all_1.gstreamer gst_all_1.gst-plugins-base dbus-glib udev
     libgudev
-  ] ++ (if useFfmpeg then [ ffmpeg ] else [ libav_12 ])
+  ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
   ++ lib.optional useFdk fdk_aac;
 
   dontUseCmakeConfigure = true;
@@ -58,11 +66,6 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     patchShebangs scripts
 
-    # `configure` errors out when trying to read the current year which is too low
-    substituteInPlace make/configure.py \
-      --replace developer release \
-      --replace 'repo.date.strftime("%Y-%m-%d %H:%M:%S")' '""'
-
     substituteInPlace libhb/module.defs \
       --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2
 

From 1cfc5f1da21b1527bc86e1b368bbda3885f125d1 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 26 Apr 2018 18:08:53 -0400
Subject: [PATCH 0535/3370] pythia: 8.226 -> 8.235, enable lhapdf6 plugin

---
 pkgs/development/libraries/physics/pythia/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix
index eca2807ce153..3f9f3f8498bd 100644
--- a/pkgs/development/libraries/physics/pythia/default.nix
+++ b/pkgs/development/libraries/physics/pythia/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pythia-${version}";
-  version = "8.226";
+  version = "8.235";
 
   src = fetchurl {
     url = "http://home.thep.lu.se/~torbjorn/pythia8/pythia${builtins.replaceStrings ["."] [""] version}.tgz";
-    sha256 = "1jfjkq78d1llrrm2k5pgsl92a5z8af9rx3n83rzv28lxrqdjix4g";
+    sha256 = "17cfgs7v469pdnnzvlmdagcdhi0h419znqmaws90l9d8cmhhsbz8";
   };
 
   buildInputs = [ boost fastjet hepmc zlib rsync lhapdf ];
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-shared"
     "--with-hepmc2=${hepmc}"
+    "--with-lhapdf6=${lhapdf}"
   ];
 
   enableParallelBuilding = true;

From 2f47c93ec848ae4b9594a13406f71982282ce0d7 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 26 Apr 2018 18:09:26 -0400
Subject: [PATCH 0536/3370] sacrifice: set LD_LIBRARY_PATH for pythia plugins
 to work

---
 pkgs/applications/science/physics/sacrifice/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix
index 99d6df77f853..6c25f720ebf9 100644
--- a/pkgs/applications/science/physics/sacrifice/default.nix
+++ b/pkgs/applications/science/physics/sacrifice/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia }:
+{ stdenv, fetchurl, boost, hepmc, lhapdf, pythia, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "sacrifice-${version}";
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ boost hepmc lhapdf pythia ];
+  nativeBuildInputs = [ makeWrapper ];
 
   patches = [
     ./compat.patch
@@ -27,8 +28,11 @@ stdenv.mkDerivation rec {
     "--with-pythia=${pythia}"
   ];
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = if stdenv.isDarwin then ''
     install_name_tool -add_rpath ${pythia}/lib "$out"/bin/run-pythia
+  '' else ''
+    wrapProgram $out/bin/run-pythia \
+      --prefix LD_LIBRARY_PATH : "${pythia}/lib"
   '';
 
   enableParallelBuilding = true;

From 7390e007635c347257a4daba4c5e9f5355f7c4ab Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 27 Apr 2018 00:10:52 +0200
Subject: [PATCH 0537/3370] mpfi: 1.5.1 -> 1.5.3

---
 pkgs/development/libraries/mpfi/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix
index c88c8da63784..6b607e94bd49 100644
--- a/pkgs/development/libraries/mpfi/default.nix
+++ b/pkgs/development/libraries/mpfi/default.nix
@@ -1,15 +1,20 @@
 {stdenv, fetchurl, mpfr}:
 stdenv.mkDerivation rec {
   name = "mpfi-${version}";
-  version = "1.5.1";
+  version = "1.5.3";
+  file_nr = "37331";
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/file/30129/mpfi-${version}.tar.bz2";
-    sha256 = "0vk9jfcfiqda0zksg1ffy36pdznpng9b4nl7pfzpz9hps4v6bk1z";
+    # NOTE: the file_nr is whats important here. The actual package name (including the version)
+    # is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/
+    # and click on Download in the section "Latest File Releases".
+    url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tar.bz2";
+    sha256 = "0bqr8yibl7jbrp0bw7xk1lm7nis7rv26jsz6y8ycvih8n9bx90r3";
   };
   buildInputs = [mpfr];
   meta = {
     inherit version;
     description = ''A multiple precision interval arithmetic library based on MPFR'';
+    homepage = https://gforge.inria.fr/projects/mpfi/;
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;

From ec7502946f940e986381d94de9d272ba74d919b0 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Thu, 26 Apr 2018 23:12:35 +0200
Subject: [PATCH 0538/3370] mpfr: 3.1.6 -> 4.0.1

---
 pkgs/development/libraries/mpfr/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 4aac5a927092..d75d9d6b9d90 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpfr-3.1.6";
+  version = "4.0.1";
+  name = "mpfr-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/mpfr/${name}.tar.xz";
-    sha256 = "0l598h9klpgkz2bp0rxiqb90mkqh9f2f81n5rpy191j00hdaqqks";
+    sha256 = "0vp1lrc08gcmwdaqck6bpzllkrykvp06vz5gnqpyw0v3h9h4m1v7";
   };
 
   outputs = [ "out" "dev" "doc" "info" ];

From 6ca343103bb8f6a32db5c63c122aad72e0ecbe40 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 27 Apr 2018 00:12:54 +0200
Subject: [PATCH 0539/3370] check-meta.nix: specify meta.timeout

---
 pkgs/stdenv/generic/check-meta.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 1350e7d37301..a5c8ca705231 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -170,6 +170,8 @@ let
     isIbusEngine = bool;
     isGutenprint = bool;
     badPlatforms = platforms;
+    # Hydra build timeout
+    timeout = int;
   };
 
   checkMetaAttr = k: v:

From 31010e0f89a43985122a94728b7dce14ec27739e Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Thu, 26 Apr 2018 17:54:25 -0400
Subject: [PATCH 0540/3370] python3: add C++ compiler support for distutils

This implements 095095c4 ('python: add C++ compiler support for distutils')
for python3. Should fix various problems with python packages on darwin.
---
 .../interpreters/python/cpython/3.4/default.nix  | 16 ++++++++++++++--
 .../interpreters/python/cpython/3.5/default.nix  | 14 +++++++++++++-
 .../interpreters/python/cpython/3.6/default.nix  | 14 +++++++++++++-
 .../development/python-modules/numpy/default.nix |  5 +++--
 4 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 85c45a9d396f..7da2cfdd1527 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , bzip2
 , expat
 , libffi
@@ -39,6 +39,8 @@ let
     ++ optionals x11Support [ tcl tk libX11 xproto ]
     ++ optionals stdenv.isDarwin [ CF configd ];
 
+  hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
+
 in stdenv.mkDerivation {
   name = "python3-${version}";
   pythonVersion = majorVersion;
@@ -69,6 +71,16 @@ in stdenv.mkDerivation {
     ./ld_library_path.patch
   ] ++ optionals (x11Support && stdenv.isDarwin) [
     ./use-correct-tcl-tk-on-darwin.patch
+  ] ++ optionals hasDistutilsCxxPatch [
+    # Fix for http://bugs.python.org/issue1222585
+    # Upstream distutils is calling C compiler to compile C++ code, which
+    # only works for GCC and Apple Clang. This makes distutils to call C++
+    # compiler when needed.
+    (fetchpatch {
+      url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch";
+      sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8";
+      extraPrefix = "";
+    })
   ];
 
   postPatch = ''
@@ -166,7 +178,7 @@ in stdenv.mkDerivation {
   passthru = let
     pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
   in rec {
-    inherit libPrefix sitePackages x11Support;
+    inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
     executable = "${libPrefix}m";
     buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
     withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index d67cc7286942..5a5179df6f51 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -39,6 +39,8 @@ let
     ++ optionals x11Support [ tcl tk libX11 xproto ]
     ++ optionals stdenv.isDarwin [ CF configd ];
 
+  hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
+
 in stdenv.mkDerivation {
   name = "python3-${version}";
   pythonVersion = majorVersion;
@@ -69,6 +71,16 @@ in stdenv.mkDerivation {
     ./ld_library_path.patch
   ] ++ optionals (x11Support && stdenv.isDarwin) [
     ./use-correct-tcl-tk-on-darwin.patch
+  ] ++ optionals hasDistutilsCxxPatch [
+    # Fix for http://bugs.python.org/issue1222585
+    # Upstream distutils is calling C compiler to compile C++ code, which
+    # only works for GCC and Apple Clang. This makes distutils to call C++
+    # compiler when needed.
+    (fetchpatch {
+      url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch";
+      sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8";
+      extraPrefix = "";
+    })
   ];
 
   postPatch = ''
@@ -160,7 +172,7 @@ in stdenv.mkDerivation {
   passthru = let
     pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
   in rec {
-    inherit libPrefix sitePackages x11Support;
+    inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
     executable = "${libPrefix}m";
     buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
     withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index ee9a0df9a8c4..a2e979518734 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -42,6 +42,8 @@ let
   nativeBuildInputs =
     optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.python3;
 
+  hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
+
 in stdenv.mkDerivation {
   name = "python3-${version}";
   pythonVersion = majorVersion;
@@ -71,6 +73,16 @@ in stdenv.mkDerivation {
     ./no-ldconfig.patch
   ] ++ optionals (x11Support && stdenv.isDarwin) [
     ./use-correct-tcl-tk-on-darwin.patch
+  ] ++ optionals hasDistutilsCxxPatch [
+    # Fix for http://bugs.python.org/issue1222585
+    # Upstream distutils is calling C compiler to compile C++ code, which
+    # only works for GCC and Apple Clang. This makes distutils to call C++
+    # compiler when needed.
+    (fetchpatch {
+      url = "https://bugs.python.org/file47046/python-3.x-distutils-C++.patch";
+      sha256 = "0dgdn9k2kmw4wh90vdnjcrnn97ylxgx7mbn9l87fwz6j501jqvk8";
+      extraPrefix = "";
+    })
   ];
 
   postPatch = ''
@@ -183,7 +195,7 @@ in stdenv.mkDerivation {
   passthru = let
     pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;};
   in rec {
-    inherit libPrefix sitePackages x11Support;
+    inherit libPrefix sitePackages x11Support hasDistutilsCxxPatch;
     executable = "${libPrefix}m";
     buildEnv = callPackage ../../wrapper.nix { python = self; inherit (pythonPackages) requiredPythonModules; };
     withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;};
diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 4022115e9a0e..ec727994b09c 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -14,8 +14,9 @@ buildPythonPackage rec {
   buildInputs = [ gfortran nose blas ];
 
   patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
-    # See cpython 2.7 patches.
-    # numpy.distutils is used by cython during it's check phase
+    # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
+    # Patching of numpy.distutils is needed to prevent it from undoing the
+    # patch to distutils.
     ./numpy-distutils-C++.patch
   ];
 

From 9badee01c1540629f6841177d0067682fbc7f437 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Thu, 26 Apr 2018 14:04:13 +0200
Subject: [PATCH 0541/3370] teamviewer 12.0.90041 -> 13.1.3026

bump, move to qt5, drop i686 support
---
 .../networking/remote/teamviewer/default.nix  | 61 +++++--------------
 pkgs/top-level/all-packages.nix               |  4 +-
 2 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 260500e9d337..5365228ae657 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -1,28 +1,13 @@
-{ stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }:
+{ stdenv, lib, fetchurl, autoPatchelfHook, makeWrapper, xdg_utils, dbus, qtbase, qtwebkit, qtx11extras, qtquickcontrols, glibc, libXrandr, libX11 }:
 
-let
-  ld32 =
-    if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
-    else if stdenv.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32"
-    else throw "Unsupported system ${stdenv.system}";
-  ld64 = "${stdenv.cc}/nix-support/dynamic-linker";
-
-  mkLdPath = ps: lib.makeLibraryPath (with ps; [ qt4 dbus alsaLib ]);
-
-  deps = ps: (with ps; [ dbus zlib alsaLib fontconfig freetype libpng12 libjpeg ]) ++ (with ps.xorg; [ libX11 libXext libXdamage libXrandr libXrender libXfixes libSM libXtst libXinerama]);
-  tvldpath32 = lib.makeLibraryPath (with pkgsi686Linux; [ qt4 "$out/share/teamviewer/tv_bin/wine" ] ++ deps pkgsi686Linux);
-  tvldpath64 = lib.makeLibraryPath (deps pkgs);
-in
 
 stdenv.mkDerivation rec {
   name = "teamviewer-${version}";
-  version = "12.0.90041";
+  version = "13.1.3026";
 
   src = fetchurl {
-    # There is a 64-bit package, but it has no differences apart from Debian dependencies.
-    # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
-    url = "https://dl.tvcdn.de/download/version_12x/teamviewer_${version}_i386.deb";
-    sha256 = "19gf68xadayncrbpkk3v05xm698zavv8mz8ia6jhadrh5s6i0bwg";
+    url = "https://dl.tvcdn.de/download/linux/version_13x/teamviewer_${version}_amd64.deb";
+    sha256 = "14zaa1xjdfmgbbq40is5mllqcd9zan03sblkzajswd5gps7crsik";
   };
 
   unpackPhase = ''
@@ -30,6 +15,10 @@ stdenv.mkDerivation rec {
     tar xf data.tar.*
   '';
 
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+  buildInputs = [ dbus qtbase qtwebkit qtx11extras libX11 ];
+  propagatedBuildInputs = [ qtquickcontrols ];
+
   installPhase = ''
     mkdir -p $out/share/teamviewer $out/bin $out/share/applications
     cp -a opt/teamviewer/* $out/share/teamviewer
@@ -46,41 +35,23 @@ stdenv.mkDerivation rec {
     ln -s /var/log/teamviewer $out/share/teamviewer/logfiles
     ln -s ${xdg_utils}/bin $out/share/teamviewer/tv_bin/xdg-utils
 
-    pushd $out/share/teamviewer/tv_bin
+    sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" $out/share/teamviewer/tv_bin/desktop/com.teamviewer.*.desktop
 
-    sed -i "s,TV_LD32_PATH=.*,TV_LD32_PATH=$(cat ${ld32})," script/tvw_config
-    ${if stdenv.system == "x86_64-linux" then ''
-      sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config
-    '' else ''
-      sed -i "/TV_LD64_PATH=.*/d" script/tvw_config
-    ''}
-
-    sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/com.teamviewer.*.desktop
-
-    for i in teamviewer-config teamviewerd TeamViewer_Desktop TVGuiDelegate TVGuiSlave.32 wine/bin/* RTlib/libQtCore.so.4; do
-      echo "patching $i"
-      patchelf --set-interpreter $(cat ${ld32}) --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
-    done
-    for i in resources/*.so wine/drive_c/TeamViewer/tvwine.dll.so wine/lib/*.so* wine/lib/wine/*.so RTlib/*.so* ;  do
-      echo "patching $i"
-      patchelf --set-rpath $out/share/teamviewer/tv_bin/RTlib:${tvldpath32} $i || true
-    done
-    ${if stdenv.system == "x86_64-linux" then ''
-      patchelf --set-interpreter $(cat ${ld64}) --set-rpath ${tvldpath64} TVGuiSlave.64
-    '' else ''
-      rm TVGuiSlave.64
-    ''}
-    popd
+    substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_aux \
+      --replace '/lib64/ld-linux-x86-64.so.2' '${glibc.out}/lib/ld-linux-x86-64.so.2'
+    substituteInPlace $out/share/teamviewer/tv_bin/script/tvw_config \
+      --replace '/var/run/' '/run/'
+    wrapProgram $out/share/teamviewer/tv_bin/script/teamviewer --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}"
+    wrapProgram $out/share/teamviewer/tv_bin/teamviewerd --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libXrandr libX11 ]}"
   '';
 
-  dontPatchELF = true;
   dontStrip = true;
 
   meta = with stdenv.lib; {
     homepage = http://www.teamviewer.com;
     license = licenses.unfree;
     description = "Desktop sharing application, providing remote support and online meetings";
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ jagajaga dasuxullebt ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31a1acff06ee..605ca9bac0e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5107,9 +5107,7 @@ with pkgs;
 
   ted = callPackage ../tools/typesetting/ted { };
 
-  teamviewer = callPackage ../applications/networking/remote/teamviewer {
-    stdenv = stdenv_32bit;
-  };
+  teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
 
   telnet = callPackage ../tools/networking/telnet { };
 

From dc62e8509a793097a8b86b3707f876ba1f5532bf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Apr 2018 01:03:28 +0200
Subject: [PATCH 0542/3370] nixos/caddy: fix ca api endpoint, now uses v2

---
 nixos/modules/services/web-servers/caddy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index d8efa24bc6d5..2124a42f01a1 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -25,8 +25,8 @@ in {
     };
 
     ca = mkOption {
-      default = "https://acme-v01.api.letsencrypt.org/directory";
-      example = "https://acme-staging.api.letsencrypt.org/directory";
+      default = "https://acme-v02.api.letsencrypt.org/directory";
+      example = "https://acme-staging-v02.api.letsencrypt.org/directory";
       type = types.string;
       description = "Certificate authority ACME server. The default (Let's Encrypt production server) should be fine for most people.";
     };

From 1ae220b689a3dc8cd118a27196391b0e2460043b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Apr 2018 01:04:08 +0200
Subject: [PATCH 0543/3370] pssh: add explicit references to openssh and rsync

---
 pkgs/tools/networking/pssh/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix
index ddaf419e5658..22c359620507 100644
--- a/pkgs/tools/networking/pssh/default.nix
+++ b/pkgs/tools/networking/pssh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages }:
+{ stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }:
 
 pythonPackages.buildPythonApplication rec {
   name = "pssh-${version}";
@@ -11,6 +11,15 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq";
   };
 
+  postPatch = ''
+    for f in bin/*; do
+      substituteInPlace $f \
+        --replace "'ssh'" "'${openssh}/bin/ssh'" \
+        --replace "'scp'" "'${openssh}/bin/scp'" \
+        --replace "'rsync'" "'${rsync}/bin/rsync'"
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "Parallel SSH Tools";
     longDescription = ''

From c208823e2d43b8475273107a7299cceff5d23592 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Apr 2018 01:07:05 +0200
Subject: [PATCH 0544/3370] youtubeDL: 2018.04.16 -> 2018.04.25

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 1f7d8c549e42..55c785b06da0 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   pname = "youtube-dl";
-  version = "2018.04.16";
+  version = "2018.04.25";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d";
+    sha256 = "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 70bcb507986de789614bedbaa84adc525947f13e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Apr 2018 01:09:30 +0200
Subject: [PATCH 0545/3370] smcroute: fix smcroutectl

---
 pkgs/servers/smcroute/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index b1d614bc5cf0..40472c59a873 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libcap }:
 
 stdenv.mkDerivation rec {
   name = "smcroute-${version}";
@@ -11,7 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "12xwdwvl9h269armwak7grm4g944j2c89srha4lqx2zndx1ycg1r";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ libcap ];
+
+  configureFlags = [
+    "--localstatedir=/var"
+    "--with-systemd=\$(out)/lib/systemd/system"
+  ];
 
   meta = with stdenv.lib; {
     description = "Static multicast routing daemon";

From b5655751a1efef57d90032ae73d3c6676c057ed9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Apr 2018 01:22:35 +0200
Subject: [PATCH 0546/3370] EmptyEpsilon: init at 2018.02.15

---
 pkgs/games/empty-epsilon/default.nix | 58 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/games/empty-epsilon/default.nix

diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix
new file mode 100644
index 000000000000..d7742d316647
--- /dev/null
+++ b/pkgs/games/empty-epsilon/default.nix
@@ -0,0 +1,58 @@
+{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python }:
+
+let
+
+  version = "2018.02.15";
+
+  serious-proton = stdenv.mkDerivation rec {
+    name = "serious-proton-${version}";
+    inherit version;
+
+    src = fetchFromGitHub {
+      owner = "daid";
+      repo = "SeriousProton";
+      rev = "EE-${version}";
+      sha256 = "0b4n4pn7x3y63i9y15f8983zlpdvmx7151iph1lcc49j3hmpd0gy";
+    };
+
+    nativeBuildInputs = [ cmake ];
+    buildInputs = [ sfml libX11 ];
+
+    meta = with lib; {
+      description = "C++ game engine coded on top of SFML used for EmptyEpsilon";
+      homepage = https://github.com/daid/SeriousProton;
+      license = licenses.mit;
+      maintainers = with maintainers; [ fpletz ];
+      platforms = platforms.linux;
+    };
+  };
+
+in
+
+
+stdenv.mkDerivation rec {
+  name = "empty-epsilon-${version}";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "daid";
+    repo = "EmptyEpsilon";
+    rev = "EE-${version}";
+    sha256 = "1by0wrw00frrlcs1kd003zkmfkwa1pnbnva2qn8km3xnl9chf11d";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ serious-proton sfml glew libX11 python ];
+
+  cmakeFlags = [
+    "-DSERIOUS_PROTON_DIR=${serious-proton.src}"
+  ];
+
+  meta = with lib; {
+    description = "Open source bridge simulator based on Artemis";
+    homepage = https://daid.github.io/EmptyEpsilon/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31a1acff06ee..0e07f2374482 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19017,6 +19017,8 @@ with pkgs;
 
   egoboo = callPackage ../games/egoboo { };
 
+  EmptyEpsilon = callPackage ../games/empty-epsilon { };
+
   endless-sky = callPackage ../games/endless-sky { };
 
   enyo-doom = libsForQt5.callPackage ../games/enyo-doom { };

From b151b050d58a60f2b4db1ac407ed379c24fb71af Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Fri, 27 Apr 2018 01:55:27 +0200
Subject: [PATCH 0547/3370] accountsservice: change url to https

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

diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 1d15aafcf935..289bc45d2037 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "0.6.47";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
+    url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
     sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3";
   };
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "D-Bus interface for user account query and manipulation";
-    homepage = http://www.freedesktop.org/wiki/Software/AccountsService;
+    homepage = https://www.freedesktop.org/wiki/Software/AccountsService;
     license = licenses.gpl3;
     maintainers = with maintainers; [ pSub ];
     platforms = with platforms; linux;

From a22b3e91b61d1f27bf326885a89db91531e28e91 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Thu, 26 Apr 2018 17:20:08 -0700
Subject: [PATCH 0548/3370] configuration-ghc-8.4.x.nix: Remove reference to
 non-existent bv_0_5

---
 .../development/haskell-modules/configuration-ghc-8.4.x.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index fe6bc699fb98..b38b17e34751 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -41,12 +41,6 @@ self: super: {
 
   ## Shadowed:
 
-  ## Needs bump to a versioned attribute
-  ##     • No instance for (GHC.Base.Semigroup BV)
-  ##         arising from the superclasses of an instance declaration
-  ##     • In the instance declaration for ‘Monoid BV’
-  bv = super.bv_0_5;
-
   ## Needs bump to a versioned attribute
   ## Issue: https://github.com/sol/doctest/issues/189
   doctest = overrideCabal super.doctest_0_15_0 (drv: {

From 88695c6e9497c018d0565b4078f4dc1acd280afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 27 Apr 2018 02:42:12 +0200
Subject: [PATCH 0549/3370] Revert "release-combined: don't include
 tests.chromium"

This reverts commit 1d0625499854b583c57267a744111ba8a1d0cfaf.
We now get a build and maybe have a workaround #39570; /cc #39476.
---
 nixos/release-combined.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 4d6ff334d347..e010b532a688 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -58,7 +58,7 @@ in rec {
         nixos.ova.x86_64-linux or []
 
         #(all nixos.tests.containers)
-        #nixos.tests.chromium.x86_64-linux or []
+        nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)

From ffe9f0a2bb7ed94eb0461a0947b847a3356d386c Mon Sep 17 00:00:00 2001
From: Ruben Maher <ruben@maher.fyi>
Date: Fri, 27 Apr 2018 10:19:37 +0930
Subject: [PATCH 0550/3370] awsebcli: pin pathspec dependency to 0.5.5

pathspec has been bumped to 0.5.6 in c705acef and awsebcli's setup.py refuses to
use that version.
---
 pkgs/tools/virtualization/awsebcli/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index 3b3bda0f22dc..5f847e7eb907 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -19,6 +19,14 @@ let
         };
       });
 
+      pathspec = super.pathspec.overridePythonAttrs (oldAttrs: rec {
+        version = "0.5.5";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "72c495d1bbe76674219e307f6d1c6062f2e1b0b483a5e4886435127d0df3d0d3";
+        };
+      });
+
       requests = super.requests.overridePythonAttrs (oldAttrs: rec {
         version = "2.9.1";
         src = oldAttrs.src.override {

From e8dcf87007cea397304289c723fab1e2898c7a3c Mon Sep 17 00:00:00 2001
From: Ruben Maher <ruben@maher.fyi>
Date: Fri, 27 Apr 2018 10:28:03 +0930
Subject: [PATCH 0551/3370] awsebcli: 3.12.3 -> 3.12.4

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

diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix
index 5f847e7eb907..b55ac457305b 100644
--- a/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/pkgs/tools/virtualization/awsebcli/default.nix
@@ -54,11 +54,11 @@ let
   };
 in with localPython.pkgs; buildPythonApplication rec {
   pname = "awsebcli";
-  version = "3.12.3";
+  version = "3.12.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0jj6xhvsrgvc5pm05zbd95zvx36ssywq70j6q1kzcdv1flfzzyp9";
+    sha256 = "128dgxyz2bgl3r4jdkbmjs280004bm0dwzln7p6ly3yjs2x37jl6";
   };
 
   checkInputs = [

From 564a6288b89678b5aaaeb4e1ef7d08257ff9cac4 Mon Sep 17 00:00:00 2001
From: Ruben Maher <ruben@maher.fyi>
Date: Fri, 27 Apr 2018 10:35:26 +0930
Subject: [PATCH 0552/3370] maintainers: update email address

Trying to move away from .au ccTLD.
---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 299f4d1c82a8..30597373fc52 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1241,7 +1241,7 @@
     name = "Mabry Cervin";
   };
   eqyiel = {
-    email = "r@rkm.id.au";
+    email = "ruben@maher.fyi";
     github = "eqyiel";
     name = "Ruben Maher";
   };

From 047c9372ab1314d8e3fab13b9f21359fdf3a643c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 26 Apr 2018 20:47:16 -0500
Subject: [PATCH 0553/3370] inkscape: fix on darwin again

I have no idea why but this broke Darwin. So added a conditional for the shebang patching.

https://hydra.nixos.org/build/73283875
---
 pkgs/applications/graphics/inkscape/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index eb349e412068..5978612fdf33 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -29,10 +29,13 @@ stdenv.mkDerivation rec {
     patchShebangs fix-roff-punct
 
     # XXX: Not needed for CMake:
-    patchShebangs share/palettes
-    patchShebangs share/patterns
-    patchShebangs share/symbols
-    patchShebangs share/templates
+    ${lib.optionalString (!stdenv.isDarwin) ''
+      patchShebangs share/filters
+      patchShebangs share/palettes
+      patchShebangs share/patterns
+      patchShebangs share/symbols
+      patchShebangs share/templates
+    ''}
 
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.

From 8efe41dfb226d95f6394475e0f027c0ac14989a3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Apr 2018 01:56:39 +0000
Subject: [PATCH 0554/3370] linux: 4.14.36 -> 4.14.37

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 47784e770127..d9aef3a21930 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.36";
+  version = "4.14.37";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0hxwd3kl5g7zrcl3b00nxdv0zjkmmfrk1i5v3hrjm0dmsw249qna";
+    sha256 = "14lfj2vfxw36k8cbmzs280w4h81yz5xhlhq5550kww906vnyg5w1";
   };
 } // (args.argsOverride or {}))

From 7f3832bf93fb9c308052d8deec184de95ce0ee92 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Apr 2018 01:56:53 +0000
Subject: [PATCH 0555/3370] linux: 4.16.4 -> 4.16.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index d46c95e1a593..3da2cda30e22 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.4";
+  version = "4.16.5";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0v494vm1vbyfk8xmvgf27chsjpy9x7q0iwdaana8vnih2ai6vdcs";
+    sha256 = "0f1a8ggjb2jxc8n3hvypc81xbwylwkqi0mnynd9q316ay152zb1r";
   };
 } // (args.argsOverride or {}))

From ddc23593e1885e04663fe735e29c4f45978a6d87 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 27 Apr 2018 01:59:36 +0000
Subject: [PATCH 0556/3370] netbsd: fix links installer

---
 pkgs/os-specific/bsd/netbsd/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index f64c36932e34..f0220fc05d22 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -280,6 +280,9 @@ let
         --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' ""
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \
         --replace '-o ''${DOCOWN} -g ''${DOCGRP}' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.links.mk \
+        --replace '-o ''${LINKSOWN_''${.ALLSRC:T}:U''${LINKSOWN}}' "" \
+        --replace '-g ''${LINKSGRP_''${.ALLSRC:T}:U''${LINKSGRP}}' ""
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \
         --replace '-o ''${MANOWN} -g ''${MANGRP}' ""
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \
@@ -338,6 +341,7 @@ in rec {
     patchPhase = ''
       sed -i '1i #include <time.h>' adventure/save.c
     '';
+    buildInputs = [ compat libcurses ];
   };
 
   who = netBSDDerivation {

From ff3b88713c4e5bfeb839e59b3ad4753043d3b47c Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polyhack.io>
Date: Fri, 27 Apr 2018 12:01:24 +1000
Subject: [PATCH 0557/3370] labelImg: init at 1.6.0

---
 .../machine-learning/labelimg/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/science/machine-learning/labelimg/default.nix

diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix
new file mode 100644
index 000000000000..802a03bd4c7a
--- /dev/null
+++ b/pkgs/applications/science/machine-learning/labelimg/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, python2Packages, fetchurl }:
+  python2Packages.buildPythonApplication rec {
+    name = "labelImg-${version}";
+    version = "1.6.0";
+    src = fetchurl {
+      url = "https://github.com/tzutalin/labelImg/archive/v${version}.tar.gz";
+      sha256 = "126kc4r7xm9170kh7snqsfkkc868m5bcnswrv7b4cq9ivlrdwbm4";
+    };
+    propagatedBuildInputs = with python2Packages; [
+      pyqt4
+      lxml
+    ];
+    preBuild = ''
+      make qt4py2
+    '';
+    meta = with stdenv.lib; {
+      description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images";
+      homepage = https://github.com/tzutalin/labelImg;
+      license = licenses.mit;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.cmcdragonkai ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e07f2374482..fbb5d864e88b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12428,6 +12428,8 @@ with pkgs;
 
   lwan = callPackage ../servers/http/lwan { };
 
+  labelImg = callPackage ../applications/science/machine-learning/labelimg { };
+
   mailman = callPackage ../servers/mail/mailman { };
 
   mattermost = callPackage ../servers/mattermost { };

From 4975378b2139f24b1368f44e9e3d44e34c3e48ad Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 27 Apr 2018 02:04:08 +0000
Subject: [PATCH 0558/3370] linux-copperhead: 4.15.18.a -> 4.14.36.a

The 4.15.x series is EOL'd, we should instead follow the LTS kernel
---
 pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index 5685e6dd904d..dfe58119da26 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.15.18";
+  version = "4.14.36";
   revision = "a";
-  sha256 = "1wld16i3r06mqxwwkghsxnnivg1jpc6c15y9iclhdgl4srcs1qp6";
+  sha256 = "052ck8giy5nxy7871crhx6cdkgzzzpffdm8ilq1ys0rd3vldzl9b";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 19f6fe6e9c616ff64ace9ae2c2a13068732a0bcb Mon Sep 17 00:00:00 2001
From: Yucheng Zhang <yu@cheng.cat>
Date: Wed, 25 Apr 2018 15:39:43 +0800
Subject: [PATCH 0559/3370] fcitx-libpinyin: fix data path

---
 .../fcitx-engines/fcitx-libpinyin/datapath.patch | 16 ++++++++++++++++
 .../fcitx-engines/fcitx-libpinyin/default.nix    | 10 ++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch
new file mode 100644
index 000000000000..84dd5fc8f462
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/datapath.patch
@@ -0,0 +1,16 @@
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -9,12 +9,7 @@ char* FcitxLibPinyinGetSysPath(LIBPINYIN_LANGUAGE_TYPE type)
+ #ifdef LIBPINYIN_TOOLS_FOUND
+     if (type == LPLT_Simplified) {
+ #endif
+-        /* portable detect here */
+-        if (getenv("FCITXDIR")) {
+-            syspath = fcitx_utils_get_fcitx_path_with_filename("datadir", "libpinyin/data");
+-        } else {
+-            syspath = strdup(LIBPINYIN_PKGDATADIR "/data");
+-        }
++        syspath = strdup(LIBPINYIN_PKGDATADIR "/data");
+ #ifdef LIBPINYIN_TOOLS_FOUND
+     }
+     else {
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
index f2610efd2eb4..4468f1fa263a 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix
@@ -12,6 +12,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig  ];
   buildInputs = [ fcitx-qt5 qtbase qtwebengine.dev cmake fcitx gettext libpinyin glib pcre dbus ];
 
+  # With a typical installation via NixOS option i18n.inputMethod.fcitx.engines,
+  # the FCITXDIR environment variable is set to $out of fcitx-with-plugins,
+  # which leads to an incorrect path for pinyin data.
+  #
+  # It is impossible or difficult to fix this issue without patching. We want
+  # FCITXDIR to point into libpinyin, which is currently not symlinked within
+  # fcitx-with-plugins (only fcitx-libpinyin is symlinked). Also, FCITXDIR
+  # doesn't accept multiple directories.
+  patches = [ ./datapath.patch ];
+
   preInstall = ''
     substituteInPlace src/cmake_install.cmake \
       --replace ${fcitx} $out

From 2cfda31cff8516512288ccccb9b4489d5239e0e4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Thu, 26 Apr 2018 22:20:30 -0500
Subject: [PATCH 0560/3370] vale: 0.10.1 -> 0.11.2

---
 pkgs/tools/text/vale/default.nix |  10 +-
 pkgs/tools/text/vale/deps.nix    | 519 +++++++++++++++----------------
 2 files changed, 250 insertions(+), 279 deletions(-)

diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix
index 057f1c48a1f2..84ef164ce248 100644
--- a/pkgs/tools/text/vale/default.nix
+++ b/pkgs/tools/text/vale/default.nix
@@ -2,16 +2,16 @@
 
 buildGoPackage rec {
   name = "vale-${version}";
-  version = "0.10.1";
-  rev    = "${version}";
+  version = "0.11.2";
+  rev    = "v${version}";
 
-  goPackagePath = "github.com/ValeLint/vale";
+  goPackagePath = "github.com/errata-ai/vale";
 
   src = fetchFromGitHub {
     inherit rev;
-    owner  = "ValeLint";
+    owner  = "errata-ai";
     repo   = "vale";
-    sha256 = "1iyc9mny3nb6j3allj3szkiygc2v3gi7l7syq9ifjrm1wknk8wrf";
+    sha256 = "0zs6bdwnc5fpa0skw1xhdwg6jzsc7wcb8lsfj235jc8jd2w13mvm";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/text/vale/deps.nix b/pkgs/tools/text/vale/deps.nix
index 7bf61f433cee..e63becb5b4b3 100644
--- a/pkgs/tools/text/vale/deps.nix
+++ b/pkgs/tools/text/vale/deps.nix
@@ -1,275 +1,246 @@
-
-  # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep)
-  [
-
-    {
-      goPackagePath  = "github.com/ValeLint/gospell";
-      fetch = {
-        type = "git";
-        url = "https://github.com/ValeLint/gospell";
-        rev =  "90dfc71015dfebd3a7274f1ad2756c1dbf09e250";
-        sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/client9/gospell";
-      fetch = {
-        type = "git";
-        url = "https://github.com/client9/gospell";
-        rev =  "90dfc71015dfebd3a7274f1ad2756c1dbf09e250";
-        sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/davecgh/go-spew";
-      fetch = {
-        type = "git";
-        url = "https://github.com/davecgh/go-spew";
-        rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
-        sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/fatih/color";
-      fetch = {
-        type = "git";
-        url = "https://github.com/fatih/color";
-        rev =  "570b54cabe6b8eb0bc2dfce68d964677d63b5260";
-        sha256 = "1hw9hgkfzbzqjhy29pqpk20xggxaqjv45wx8yn69488mw5ph7khh";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/gobwas/glob";
-      fetch = {
-        type = "git";
-        url = "https://github.com/gobwas/glob";
-        rev =  "bea32b9cd2d6f55753d94a28e959b13f0244797a";
-        sha256 = "0dx0f293v1a0d8qi7ik5hdl26dapd8xm0hj9a9gc620vhj7khi9q";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/jdkato/prose";
-      fetch = {
-        type = "git";
-        url = "https://github.com/jdkato/prose";
-        rev =  "4d68d1b77f66e36b6897a79f59f434d558e5e0c2";
-        sha256 = "1g2wwj6azpcjy6j7pk4dqx868v3hrqwjg5d737p4441a55026prj";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/jdkato/regexp";
-      fetch = {
-        type = "git";
-        url = "https://github.com/jdkato/regexp";
-        rev =  "38ab2f7842bf2a539528aa7d0014b37421b886e1";
-        sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/mattn/go-colorable";
-      fetch = {
-        type = "git";
-        url = "https://github.com/mattn/go-colorable";
-        rev =  "941b50ebc6efddf4c41c8e4537a5f68a4e686b24";
-        sha256 = "0dw492z5w0fzv1cxm3xx26n8qpqjaf2ybiwpmvimzyhv65n8nrf8";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/mattn/go-isatty";
-      fetch = {
-        type = "git";
-        url = "https://github.com/mattn/go-isatty";
-        rev =  "fc9e8d8ef48496124e79ae0df75490096eccf6fe";
-        sha256 = "1r5f9gkavkb1w6sr0qs5kj16706xirl3qnlq3hqpszkw9w27x65a";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/mattn/go-runewidth";
-      fetch = {
-        type = "git";
-        url = "https://github.com/mattn/go-runewidth";
-        rev =  "9e777a8366cce605130a531d2cd6363d07ad7317";
-        sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/mitchellh/go-homedir";
-      fetch = {
-        type = "git";
-        url = "https://github.com/mitchellh/go-homedir";
-        rev =  "b8bc1bf767474819792c23f32d8286a45736f1c6";
-        sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/mitchellh/mapstructure";
-      fetch = {
-        type = "git";
-        url = "https://github.com/mitchellh/mapstructure";
-        rev =  "d0303fe809921458f417bcf828397a65db30a7e4";
-        sha256 = "1fjwi5ghc1ibyx93apz31n4hj6gcq1hzismpdfbg2qxwshyg0ya8";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/montanaflynn/stats";
-      fetch = {
-        type = "git";
-        url = "https://github.com/montanaflynn/stats";
-        rev =  "eeaced052adbcfeea372c749c281099ed7fdaa38";
-        sha256 = "0kamcla633692n81w0j0d423ws3qdds97r2c0i193ypsh9xknpq9";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/olekukonko/tablewriter";
-      fetch = {
-        type = "git";
-        url = "https://github.com/olekukonko/tablewriter";
-        rev =  "be5337e7b39e64e5f91445ce7e721888dbab7387";
-        sha256 = "04zg261i4bq29bc460nyx9r2j70mj0sbxlprn87ylk8y5j2m1d1w";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/pmezard/go-difflib";
-      fetch = {
-        type = "git";
-        url = "https://github.com/pmezard/go-difflib";
-        rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
-        sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/remeh/sizedwaitgroup";
-      fetch = {
-        type = "git";
-        url = "https://github.com/remeh/sizedwaitgroup";
-        rev =  "4b44541c93591ee0e73747d6081e61bd8c58b5c7";
-        sha256 = "1kz7h8r09c95r3hc8bngznc4lrnkz2vm50lrl96cqxja0pw8jl92";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/russross/blackfriday";
-      fetch = {
-        type = "git";
-        url = "https://github.com/russross/blackfriday";
-        rev =  "0b647d0506a698cca42caca173e55559b12a69f2";
-        sha256 = "1bv6mvnrqrcrp5d45l5p07q855sval8l3jzw1cf2dajkpcpysqln";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/shogo82148/go-shuffle";
-      fetch = {
-        type = "git";
-        url = "https://github.com/shogo82148/go-shuffle";
-        rev =  "4789c7c401f229b3ae1673acbccca451480660cd";
-        sha256 = "1gaii1h51df8vr28ww5np8nhvfcy4plv0nja9b9h0cmcxa3jf1lp";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/shurcooL/sanitized_anchor_name";
-      fetch = {
-        type = "git";
-        url = "https://github.com/shurcooL/sanitized_anchor_name";
-        rev =  "541ff5ee47f1dddf6a5281af78307d921524bcb5";
-        sha256 = "1fslblamqkd0yrvl1kbq95hnnji78bq9m33nnxiqs7y9w32zylv5";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/stretchr/testify";
-      fetch = {
-        type = "git";
-        url = "https://github.com/stretchr/testify";
-        rev =  "69483b4bd14f5845b5a1e55bca19e954e827f1d0";
-        sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/urfave/cli";
-      fetch = {
-        type = "git";
-        url = "https://github.com/urfave/cli";
-        rev =  "0bdeddeeb0f650497d603c4ad7b20cfe685682f6";
-        sha256 = "1ny63c7bfwfrsp7vfkvb4i0xhq4v7yxqnwxa52y4xlfxs4r6v6fg";
-      };
-    }
-
-    {
-      goPackagePath  = "github.com/xrash/smetrics";
-      fetch = {
-        type = "git";
-        url = "https://github.com/xrash/smetrics";
-        rev =  "a3153f7040e90324c58c6287535e26a0ac5c1cc1";
-        sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6";
-      };
-    }
-
-    {
-      goPackagePath  = "golang.org/x/net";
-      fetch = {
-        type = "git";
-        url = "https://go.googlesource.com/net";
-        rev =  "ab5485076ff3407ad2d02db054635913f017b0ed";
-        sha256 = "10805rk5rfgc3ivx35r9qmnps8hy3k3m57g0j6mz10w96k8i7pk7";
-      };
-    }
-
-    {
-      goPackagePath  = "golang.org/x/sys";
-      fetch = {
-        type = "git";
-        url = "https://go.googlesource.com/sys";
-        rev =  "14ac33bf8474b62c65cae263af2e4d3b543cc699";
-        sha256 = "1453l5v5kizq142fiq3bg5hka7b0yvnf9fsq8y2ayj4bc9h5vqf3";
-      };
-    }
-
-    {
-      goPackagePath  = "gopkg.in/ini.v1";
-      fetch = {
-        type = "git";
-        url = "https://gopkg.in/ini.v1";
-        rev =  "d3de07a94d22b4a0972deb4b96d790c2c0ce8333";
-        sha256 = "1lpwqhcfhaa6aighd2lpjfswbb6aw5d5bsmyr0vqaqg6g5kz0ikg";
-      };
-    }
-
-    {
-      goPackagePath  = "gopkg.in/neurosnap/sentences.v1";
-      fetch = {
-        type = "git";
-        url = "https://gopkg.in/neurosnap/sentences.v1";
-        rev =  "a7f18ead1433a139742a8b42ce7a059cfb484d60";
-        sha256 = "1b64xv5anfbnq6354jaygxapwgkdhbszzi604b96sm682brwl0p7";
-      };
-    }
-
-    {
-      goPackagePath  = "gopkg.in/yaml.v2";
-      fetch = {
-        type = "git";
-        url = "https://gopkg.in/yaml.v2";
-        rev =  "25c4ec802a7d637f88d584ab26798e94ad14c13b";
-        sha256 = "053mknsl3xhjscmd552005xnwbfcg0z2iphvbvj3wi0w3pvmlw44";
-      };
-    }
-
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/ValeLint/gospell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ValeLint/gospell";
+      rev =  "90dfc71015dfebd3a7274f1ad2756c1dbf09e250";
+      sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/client9/gospell";
+    fetch = {
+      type = "git";
+      url = "https://github.com/client9/gospell";
+      rev =  "90dfc71015dfebd3a7274f1ad2756c1dbf09e250";
+      sha256 = "0i2ha76q2xja8r4j72kqiarnylrbk4l1b29632skgzib6k4fh4g1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/davecgh/go-spew";
+    fetch = {
+      type = "git";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "8991bc29aa16c548c550c7ff78260e27b9ab7c73";
+      sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
+    };
+  }
+  {
+    goPackagePath  = "github.com/fatih/color";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fatih/color";
+      rev =  "507f6050b8568533fb3f5504de8e5205fa62a114";
+      sha256 = "0k1v9dkhrxiqhg48yqkwzpd7x40xx38gv2pgknswbsy4r8w644i7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/gobwas/glob";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gobwas/glob";
+      rev =  "f00a7392b43971b2fdb562418faab1f18da2067a";
+      sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jdkato/prose";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jdkato/prose";
+      rev =  "e27abfd3f31b84c37bbce37179b0428fcb1384be";
+      sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jdkato/regexp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jdkato/regexp";
+      rev =  "38ab2f7842bf2a539528aa7d0014b37421b886e1";
+      sha256 = "11z21z2h2l8vlh4nwkcn7vbfdcmdjk9sc90kn8ji1923i3s7p3bw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-colorable";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-colorable";
+      rev =  "efa589957cd060542a26d2dd7832fd6a6c6c3ade";
+      sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-isatty";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-isatty";
+      rev =  "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c";
+      sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev =  "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/go-homedir";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/go-homedir";
+      rev =  "b8bc1bf767474819792c23f32d8286a45736f1c6";
+      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev =  "00c29f56e2386353d58c599509e8dc3801b0d716";
+      sha256 = "1vw8fvhax0d567amgvxr7glcl12lvzg2sbzs007q5k5bbwn1szyb";
+    };
+  }
+  {
+    goPackagePath  = "github.com/montanaflynn/stats";
+    fetch = {
+      type = "git";
+      url = "https://github.com/montanaflynn/stats";
+      rev =  "1bf9dbcd8cbe1fdb75add3785b1d4a9a646269ab";
+      sha256 = "0qnx3hvd3lhwnmxg7nr4nwl5kbsc7ffnjk9ifyk0f05h61l3v9pz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/olekukonko/tablewriter";
+    fetch = {
+      type = "git";
+      url = "https://github.com/olekukonko/tablewriter";
+      rev =  "d5dd8a50526aadb3d5f2c9b5233277bc2db90e88";
+      sha256 = "0l7y3mmwkzpa7p56drw6d6416j9zfapznfyr1dab44d6kk48rvjx";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/remeh/sizedwaitgroup";
+    fetch = {
+      type = "git";
+      url = "https://github.com/remeh/sizedwaitgroup";
+      rev =  "5582a674300c427060d06980c142aeb52ed20040";
+      sha256 = "152a1xnaswh9fx6f71llggm513c6ch171gc61jk3b6b0il6npb57";
+    };
+  }
+  {
+    goPackagePath  = "github.com/russross/blackfriday";
+    fetch = {
+      type = "git";
+      url = "https://github.com/russross/blackfriday";
+      rev =  "16ac584625fae401e2778e7af317dc415844c44b";
+      sha256 = "0g0dbqm76aqsc2a43j95i0h5138cmlgnldhkv3blgn0ga6s8ypfg";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shogo82148/go-shuffle";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shogo82148/go-shuffle";
+      rev =  "27e6095f230d6c769aafa7232db643a628bd87ad";
+      sha256 = "0nig0q0f0v6ay2w0k3r0pqlvjp1yg9s06f00qpizp679vc46gqs1";
+    };
+  }
+  {
+    goPackagePath  = "github.com/shurcooL/sanitized_anchor_name";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shurcooL/sanitized_anchor_name";
+      rev =  "86672fcb3f950f35f2e675df2240550f2a50762f";
+      sha256 = "142m507s9971cl8qdmbcw7sqxnkgi3xqd8wzvfq15p0w7w8i4a3h";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "c679ae2cc0cb27ec3293fea7e254e47386f05d69";
+      sha256 = "1rrdn7k83j492rzhqwkh6956sj8m2nbk44d7r1xa9nsn3hfwj691";
+    };
+  }
+  {
+    goPackagePath  = "github.com/urfave/cli";
+    fetch = {
+      type = "git";
+      url = "https://github.com/urfave/cli";
+      rev =  "8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff";
+      sha256 = "0cpr10n4ps3gcdbcink71ry9hzhdb5rrcysmylybs8h2lzxqgc1i";
+    };
+  }
+  {
+    goPackagePath  = "github.com/xrash/smetrics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/xrash/smetrics";
+      rev =  "a3153f7040e90324c58c6287535e26a0ac5c1cc1";
+      sha256 = "1phq5y6mcg741spq7snc6xsky1ybc7fllh2444sfr3p41sjq9hg6";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev =  "5f9ae10d9af5b1c89ae6904293b14b064d4ada23";
+      sha256 = "10vzmdg8z73krbp2qhsqygvqd0f0s98376mrxm614xdcdljn73dn";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev =  "bb9c189858d91f42db229b04d45a4c3d23a7662a";
+      sha256 = "0z20pql3hzlplcc8ywfq7a1s8mfixmcp84k656fdkmkdjfyvsl0v";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/ini.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-ini/ini";
+      rev =  "bda519ae5f4cbc60d391ff8610711627a08b86ae";
+      sha256 = "05vcc3ssxyrk8g3sr4gs888vllgjqfq11na63qz2pvaiy7m0rqrs";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/neurosnap/sentences.v1";
+    fetch = {
+      type = "git";
+      url = "https://github.com/neurosnap/sentences";
+      rev =  "b0f23a5b35b961fe821f49e51235242d2a8193f3";
+      sha256 = "0f5lmww1g4frd5avmqw120zzklcxk5z4l20r4d8zix7406ry7zrg";
+    };
+  }
+  {
+    goPackagePath  = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-yaml/yaml";
+      rev =  "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
 ]
\ No newline at end of file

From 51190e4d8c2f83aeb7da135f179997268ca1184f Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 27 Apr 2018 08:41:11 +0200
Subject: [PATCH 0561/3370] php56: 5.6.35 -> 5.6.36

Changelog: http://www.php.net/ChangeLog-5.php#5.6.36
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 7cb9b4dea7f6..b128224e6b7a 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -338,8 +338,8 @@ let
 
 in {
   php56 = generic {
-    version = "5.6.35";
-    sha256 = "14ivsxdny0s7qm9pf773pafs8xzlzzpmaz039lwymn11rblsfy7f";
+    version = "5.6.36";
+    sha256 = "0ahp9vk33dpsqgld0gg4npff67v0l39hs3wk5dm6h3lablzhwsk2";
   };
 
   php70 = generic {

From bd547f6688e75b45278a0d5b28a4dae1762c4728 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 27 Apr 2018 09:00:36 +0200
Subject: [PATCH 0562/3370] php70: 7.0.29 -> 7.0.30

Changelog: http://www.php.net/ChangeLog-7.php#7.0.30
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index b128224e6b7a..a5afd5878f56 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -343,8 +343,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.29";
-    sha256 = "1g1z1nhnmq0idsb9rfb46cdddfimaacw3yal291i2ypzqpal54cq";
+    version = "7.0.30";
+    sha256 = "0l0bhnlgxmfl7mrdykmxfl53simxsksdcnbg5ymqz6r31i03hgr1";
   };
 
   php71 = generic {

From 73d5006abcf983d91f31f1962ec1a7649fd23981 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 27 Apr 2018 07:05:56 +0000
Subject: [PATCH 0563/3370] netbsd: more cleanup

---
 pkgs/os-specific/bsd/netbsd/default.nix | 130 ++++++++++++++++++------
 1 file changed, 100 insertions(+), 30 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index f0220fc05d22..67ad3687c2c6 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -15,19 +15,11 @@ let
 
     extraPaths = [ ];
 
-    nativeBuildInputs = [ makeMinimal mandoc groff install yacc flex ];
+    nativeBuildInputs = [ makeMinimal mandoc groff install stat
+                          yacc flex tsort lorder ];
     buildInputs = [ compat ];
     installFlags = [ "includes" ];
 
-    # These should be coverd in nbcompat, but are missing, sadly
-    NIX_CFLAGS_COMPILE = [
-      "-D__noinline="
-      "-D__warn_references(a,b)="
-      "-D__strong_alias(a,b)="
-      "-D__va_list=va_list"
-      "-D__scanflike(a,b)="
-    ];
-
     # Definitions passed to share/mk/*.mk. Should be pretty simple -
     # eventually maybe move it to a configure script.
     DESTDIR = "$(out)";
@@ -46,8 +38,12 @@ let
     LIBUTIL="";
     LIBSSL = "";
     LIBCRYPTO = "";
+    LIBCRYPT = "";
     LIBCURSES = "";
+    LIBTERMINFO = "";
+    LIBM = "";
     "LIBDO.terminfo" = "_external";
+    "LIBDO.curses" = "_external";
     _GCC_CRTBEGIN = "";
     _GCC_CRTBEGINS = "";
     _GCC_CRTEND = "";
@@ -75,7 +71,6 @@ let
     # not using bsd binutils
     SHLIB_WARNTEXTREL = "no";
     SHLIB_MKMAP = "no";
-    OBJCOPY = "true";
     PRESERVE = "-p";
 
     MACHINE_ARCH = hostPlatform.parsed.cpu.name;
@@ -85,9 +80,8 @@ let
     # but without they end up using gcc on Darwin stdenv
     preConfigure = ''
       export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))}
-    '' + lib.optionalString (!builtins.hasAttr "nativeBuildInputs" attrs) ''
-      # hack until #38657 is fixed
-      export PATH=${install}/bin:$PATH
+      # Parallel building. Needs the space.
+      export makeFlags+=" -j $NIX_BUILD_CORES"
     '';
 
     postUnpack = ''
@@ -110,12 +104,14 @@ let
       fi
     '';
 
-    # need to create directories for xinstall to work
+    # Need to create directories for xinstall to work. Unused ones
+    # will be removed in the postInstall.
     preInstall = ''
       mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \
-               $out$DOCDIR $out$LOCALEDIR
+               $out$DOCDIR $out$LOCALEDIR $out/usr/games
       for i in 1 2 3 4 5 6 7 8 9; do
-        mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i $out$DOCDIR/reference/ref$i
+        mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \
+	         $out$DOCDIR/reference/ref$i
       done
       mkdir -p $out/usr/include
     '';
@@ -126,7 +122,6 @@ let
         cd $out/usr
         find . -type d -exec mkdir -p $out/\{} \;
         find . -type f -exec mv \{} $out/\{} \;
-        find . -type d -delete
       fi
 
       find $out -type d -empty -delete
@@ -147,8 +142,6 @@ let
 
     buildInputs = [];
     nativeBuildInputs = [];
-    NIX_CFLAGS_COMPILE = "";
-    NIX_LDFLAGS = "";
 
     patchPhase = ''
       patchShebangs configure
@@ -174,8 +167,6 @@ let
     # override defaults to prevent infinite recursion
     nativeBuildInputs = [ makeMinimal ];
     buildInputs = [ zlib ];
-    NIX_CFLAGS_COMPILE = "";
-    NIX_LDFLAGS = "";
 
     # temporarily use gnuinstall for bootstrapping
     # bsdinstall will be built later
@@ -198,6 +189,19 @@ let
       install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h
       install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h
       install -D $NETBSDSRCDIR/include/db.h $out/include/db.h
+      install -D $NETBSDSRCDIR/include/netconfig.h $out/include/netconfig.h
+      install -D $NETBSDSRCDIR/include/rpc/types.h $out/include/rpc/types.h
+      install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h
+      install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h
+
+      # Remove lingering /usr references
+      if [ -d $out/usr ]; then
+        cd $out/usr
+        find . -type d -exec mkdir -p $out/\{} \;
+        find . -type f -exec mv \{} $out/\{} \;
+      fi
+
+      find $out -type d -empty -delete
     '';
     extraPaths = [ libc.src libutil.src
       (fetchNetBSD "include" "7.1.2" "1vc58xrhrp202biiv1chhlh0jwnjr7k3qq91pm46k6v5j95j0qwp")
@@ -241,6 +245,27 @@ let
     '';
     setupHook = ./fts-setup-hook.sh;
   };
+
+  stat = netBSDDerivation {
+    path = "usr.bin/stat";
+    version = "7.1.2";
+    sha256 = "0z4r96id2r4cfy443rw2s1n52n186xm0lqvs8s3qjf4314z7r7yh";
+    nativeBuildInputs = [ makeMinimal mandoc groff install ];
+  };
+
+  tsort = netBSDDerivation {
+    path = "usr.bin/tsort";
+    version = "7.1.2";
+    sha256 = "1dqvf9gin29nnq3c4byxc7lfd062pg7m84843zdy6n0z63hnnwiq";
+    nativeBuildInputs = [ makeMinimal mandoc groff install ];
+  };
+
+  lorder = netBSDDerivation {
+    path = "usr.bin/lorder";
+    version = "7.1.2";
+    sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2";
+    nativeBuildInputs = [ makeMinimal mandoc groff install ];
+  };
   # END BOOTSTRAPPING
 
   libutil = netBSDDerivation {
@@ -267,7 +292,7 @@ let
     version = "7.1.2";
     patchPhase = ''
       # make needs this to pick up our sys make files
-      NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
+      export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
 
       # can't set owner or group in Nix build
       # maybe there is a better way to trick it?
@@ -293,13 +318,10 @@ let
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
         --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \
         --replace '-o ''${LIBOWN} -g ''${LIBGRP}' ""
-
-      substituteInPlace $NETBSDSRCDIR/share/mk/Makefile \
-        --replace /usr/share/mk /share/mk
+    '' + lib.optionalString stdenv.isDarwin ''
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \
         --replace '-Wl,--fatal-warnings' ""
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
-        --replace ' ''${_ARFL} ''${.TARGET} `NM=''${NM} ''${LORDER} ''${.ALLSRC:M*o} | ''${TSORT}`' ' ''${_ARFL} ''${.TARGET} ''${.ALLSRC:M*o}' \
         --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \
         --replace '-Wl,--whole-archive' "" \
         --replace '-Wl,--no-whole-archive' ""
@@ -340,8 +362,36 @@ in rec {
     version = "7.1.2";
     patchPhase = ''
       sed -i '1i #include <time.h>' adventure/save.c
+
+      # Disable some games that don't build. They should be possible to
+      # build but need to look at how to implement stuff in Linux.
+      substituteInPlace Makefile \
+        ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \
+        --replace atc "" \
+        --replace boggle "" \
+        --replace dm "" \
+        --replace fortune "" \
+        --replace hunt "" \
+        --replace larn "" \
+        --replace phantasia "" \
+        --replace rogue "" \
+        --replace sail "" \
+        --replace trek "" \
+	--replace dab ""
     '';
-    buildInputs = [ compat libcurses ];
+    NIX_CFLAGS_COMPILE = [
+      "-D__noinline="
+      "-D__scanflike(a,b)="
+      "-D__va_list=va_list"
+      "-DOXTABS=XTABS"
+      "-DRANDOM_MAX=RAND_MAX"
+      "-DINFTIM=-1"
+    ];
+    buildInputs = [ compat libcurses libterminfo libressl ];
+    extraPaths = [
+      (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4")
+      who.src
+    ];
   };
 
   who = netBSDDerivation {
@@ -358,8 +408,8 @@ in rec {
   };
 
   fingerd = netBSDDerivation {
-    path = "usr.bin/fingerd";
-    sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqz00";
+    path = "libexec/fingerd";
+    sha256 = "1hhdq70hrxxkjnjfmjm3w8w9g9xq2ngxaxk0chy4vm7chg9nfpmp";
     version = "7.1.2";
   };
 
@@ -367,9 +417,17 @@ in rec {
     path = "lib/libedit";
     buildInputs = [ libterminfo libcurses ];
     propagatedBuildInputs = [ compat ];
+    postBuild = "mkdir -p $out/usr/include/readline";
     patchPhase = ''
       sed -i '1i #undef bool_t' el.h
+      substituteInPlace config.h \
+        --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" ""
     '';
+    NIX_CFLAGS_COMPILE = [
+      "-D__noinline="
+      "-D__scanflike(a,b)="
+      "-D__va_list=va_list"
+    ];
     version = "7.1.2";
     sha256 = "0qvr52j4qih10m7fa8nddn1psyjy9l0pa4ix02acyssjvgbz2kca";
   };
@@ -389,8 +447,20 @@ in rec {
     version = "7.1.2";
     sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf";
     buildInputs = [ libterminfo ];
+    NIX_CFLAGS_COMPILE = [
+      "-D__scanflike(a,b)="
+      "-D__va_list=va_list"
+      "-D__warn_references(a,b)="
+    ];
     propagatedBuildInputs = [ compat ];
     MKDOC = "no"; # missing vfontedpr
+    patchPhase = ''
+      substituteInPlace printw.c \
+        --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \
+        --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));'
+      substituteInPlace scanw.c \
+        --replace "__strong_alias(vwscanw, vw_scanw)" 'extern int vwscanw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_scanw")));'
+    '';
   };
 
   nbperf = netBSDDerivation {

From 707f7ca1d213c0f945b1ed73f702874dd5f6317c Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 27 Apr 2018 09:25:58 +0200
Subject: [PATCH 0564/3370] php71: 7.1.16 -> 7.1.17

Changelog: http://www.php.net/ChangeLog-7.php#7.1.17
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index a5afd5878f56..d494060c3882 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -348,8 +348,8 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.16";
-    sha256 = "1rg7n12rd2v1p2yar615kqcdxpvphw3p89lpgajjgwy0qzwjm3il";
+    version = "7.1.17";
+    sha256 = "1kyvg1dvn2zddlc7apl8c74wlwz45rxx10fr1s4z6l1cannf6971";
   };
 
   php72 = generic {

From ee9d0a85d976378c4d54131b000d31b0c014c7f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Apr 2018 08:30:57 +0100
Subject: [PATCH 0565/3370] masterpdfeditor: use autoPatchelfHook

---
 .../misc/masterpdfeditor/default.nix          | 86 ++++++++-----------
 1 file changed, 38 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 5ea49f28afd8..525be09d9686 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,52 +1,42 @@
-{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
-  let
-    version = "4.3.89";
-  in
-    stdenv.mkDerivation {
-      name = "masterpdfeditor-${version}";
-      src = fetchurl {
-        url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
-        sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc";
-      };
-      libPath = stdenv.lib.makeLibraryPath [
-        stdenv.cc.cc
-        glibc
-        sane-backends
-        qtbase
-        qtsvg
-        libXext
-        libX11
-        libXdmcp
-        libXau
-        libxcb
-      ];
-      dontStrip = true;
-      installPhase = ''
-        p=$out/opt/masterpdfeditor
-        mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps
+{ stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb, autoPatchelfHook }:
+let
+  version = "4.3.89";
+in stdenv.mkDerivation {
+  name = "masterpdfeditor-${version}";
+  src = fetchurl {
+    url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
+    sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc";
+  };
 
-        substituteInPlace masterpdfeditor4.desktop \
-          --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \
-          --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \
-          --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps"
-        cp -v masterpdfeditor4.png $out/share/pixmaps/
-        cp -v masterpdfeditor4.desktop $out/share/applications
+  nativeBuildInputs = [ autoPatchelfHook ];
 
-        cp -v masterpdfeditor4 $p/
-        ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4
-        cp -v -r stamps templates lang fonts $p
+  buildInputs = [ sane-backends qtbase qtsvg ];
 
-        install -D license.txt $out/share/$name/LICENSE
+  dontStrip = true;
 
-        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                 --set-rpath $libPath \
-                 $p/masterpdfeditor4
-      '';
-      meta = with stdenv.lib; {
-        description = "Master PDF Editor";
-        homepage = "https://code-industry.net/free-pdf-editor/";
-        license = licenses.unfreeRedistributable;
-        platforms = with platforms; [ "x86_64-linux" ];
-        maintainers = with maintainers; [ cmcdragonkai flokli ];
-      };
-    }
+  installPhase = ''
+   p=$out/opt/masterpdfeditor
+   mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps
+
+   substituteInPlace masterpdfeditor4.desktop \
+     --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \
+     --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \
+     --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps"
+   cp -v masterpdfeditor4.png $out/share/pixmaps/
+   cp -v masterpdfeditor4.desktop $out/share/applications
+
+   cp -v masterpdfeditor4 $p/
+   ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4
+   cp -v -r stamps templates lang fonts $p
+
+   install -D license.txt $out/share/$name/LICENSE
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Master PDF Editor";
+    homepage = "https://code-industry.net/free-pdf-editor/";
+    license = licenses.unfreeRedistributable;
+    platforms = with platforms; [ "x86_64-linux" ];
+    maintainers = with maintainers; [ cmcdragonkai flokli ];
+  };
+}

From 5f0e6404dca24492a76880e635b5fe7617277e94 Mon Sep 17 00:00:00 2001
From: StillerHarpo <florianengel39@gmail.com>
Date: Fri, 27 Apr 2018 09:43:07 +0200
Subject: [PATCH 0566/3370] monetdb: init at 11.29.3 (#39306)

monetdb: init at 11.29.3
---
 pkgs/servers/sql/monetdb/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/servers/sql/monetdb/default.nix

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
new file mode 100644
index 000000000000..5f7e879819e9
--- /dev/null
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pkgconfig, bison, openssl }:
+
+let
+  version = "11.29.3";
+in stdenv.mkDerivation rec {
+
+  name = "monetdb-${version}";
+
+  src = fetchurl {
+    url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${version}.tar.bz2";
+    sha256 = "18l4jkkryki5az5n7gnalfdxz6ibnkg3q2z4cwh1010b313wqi8s";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ bison openssl ];
+
+  meta = with stdenv.lib; {
+    description = "An open source database system";
+    homepage = https://www.monetdb.org/;
+    license = licenses.mpl20;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.StillerHarpo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2be3f27574b5..66eb5866682b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1322,6 +1322,8 @@ with pkgs;
 
   metabase = callPackage ../servers/metabase { };
 
+  monetdb = callPackage ../servers/sql/monetdb { };
+
   mp3blaster = callPackage ../applications/audio/mp3blaster { };
 
   mp3fs = callPackage ../tools/filesystems/mp3fs { };

From e5e5dc3377604a8502d2383067798645961a5d39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Apr 2018 08:51:43 +0100
Subject: [PATCH 0567/3370] aangifte: remove ancient versions

Packages were either absent or the hashes were broken,
so I highly doubt somebody is using 4+ years old tax programs.
---
 .../taxes/aangifte-2006/builder.sh            | 17 --------
 .../taxes/aangifte-2006/default.nix           | 21 ----------
 .../taxes/aangifte-2007/builder.sh            | 19 ---------
 .../taxes/aangifte-2007/default.nix           | 24 -----------
 .../taxes/aangifte-2008/builder.sh            | 19 ---------
 .../taxes/aangifte-2008/default.nix           | 25 -----------
 .../taxes/aangifte-2009/default.nix           | 40 ------------------
 .../taxes/aangifte-2010/default.nix           | 40 ------------------
 .../taxes/aangifte-2011/default.nix           | 40 ------------------
 .../taxes/aangifte-2012/default.nix           | 41 -------------------
 .../taxes/aangifte-2013-wa/default.nix        | 41 -------------------
 .../taxes/aangifte-2013/default.nix           | 41 -------------------
 .../taxes/aangifte-2014-wa/default.nix        | 41 -------------------
 .../taxes/aangifte-2014/default.nix           | 41 -------------------
 pkgs/top-level/all-packages.nix               | 22 ----------
 15 files changed, 472 deletions(-)
 delete mode 100644 pkgs/applications/taxes/aangifte-2006/builder.sh
 delete mode 100644 pkgs/applications/taxes/aangifte-2006/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2007/builder.sh
 delete mode 100644 pkgs/applications/taxes/aangifte-2007/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2008/builder.sh
 delete mode 100644 pkgs/applications/taxes/aangifte-2008/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2009/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2010/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2011/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2012/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2013-wa/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2013/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2014-wa/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2014/default.nix

diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh
deleted file mode 100644
index 1b709b613bd4..000000000000
--- a/pkgs/applications/taxes/aangifte-2006/builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-source $stdenv/setup
-
-buildPhase() {
-    for i in bin/*; do
-        patchelf \
-            --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib \
-            $i
-    done
-}
-
-installPhase() {
-    mkdir -p $out
-    cp -prvd * $out/
-}
-
-genericBuild
diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix
deleted file mode 100644
index 5883e51f712e..000000000000
--- a/pkgs/applications/taxes/aangifte-2006/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl, libX11, libXext}:
-
-stdenv.mkDerivation {
-  name = "aangifte2006-1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2006_linux.tar.gz;
-    sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc";
-  };
-
-  inherit libX11 libXext;
-
-  meta = {
-    description = "Elektronische aangifte IB 2006";
-    homepage = "http://www.belastingdienst.nl/download/1341.html";
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh
deleted file mode 100644
index 79e5b3097696..000000000000
--- a/pkgs/applications/taxes/aangifte-2007/builder.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-source $stdenv/setup
-
-echo $NIX_CC
-
-buildPhase() {
-    for i in bin/*; do
-        patchelf \
-            --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-            $i
-    done
-}
-
-installPhase() {
-    mkdir -p $out
-    cp -prvd * $out/
-}
-
-genericBuild
diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix
deleted file mode 100644
index 43fb26d811a3..000000000000
--- a/pkgs/applications/taxes/aangifte-2007/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, libX11, libXext, libSM}:
-
-stdenv.mkDerivation {
-  name = "aangifte2007-1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2007_linux.tar.gz;
-    sha256 = "13p3gv086jn95wvmfygdmk9qjn0qxqdv7pp0v5pmw6i5hp8rmjxf";
-  };
-
-  inherit libX11 libXext libSM;
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  meta = {
-    description = "Elektronische aangifte IB 2007";
-    homepage = "http://www.belastingdienst.nl/download/1341.html";
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh
deleted file mode 100644
index 79e5b3097696..000000000000
--- a/pkgs/applications/taxes/aangifte-2008/builder.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-source $stdenv/setup
-
-echo $NIX_CC
-
-buildPhase() {
-    for i in bin/*; do
-        patchelf \
-            --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-            $i
-    done
-}
-
-installPhase() {
-    mkdir -p $out
-    cp -prvd * $out/
-}
-
-genericBuild
diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix
deleted file mode 100644
index b9fad2fa10bd..000000000000
--- a/pkgs/applications/taxes/aangifte-2008/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, fetchurl, libX11, libXext, libSM}:
-
-stdenv.mkDerivation {
-  name = "aangifte2008-1";
-  
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2008_linux.tar.gz;
-    sha256 = "0p46bc1b14hgf07illg3crjgjdflkcknk4nzm7b73cwkni57scx3";
-  };
-
-  inherit libX11 libXext libSM;
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  meta = {
-    description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix
deleted file mode 100644
index d4230d426ece..000000000000
--- a/pkgs/applications/taxes/aangifte-2009/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2009-1";
-  
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz;
-    sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix
deleted file mode 100644
index 602368d2017b..000000000000
--- a/pkgs/applications/taxes/aangifte-2010/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2010-1";
-  
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz;
-    sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix
deleted file mode 100644
index 80c772705142..000000000000
--- a/pkgs/applications/taxes/aangifte-2011/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2011-1";
-  
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2011_linux.tar.gz;
-    sha256 = "0br9cfy3ibykzbhc1mkm7plxrs251vakpd5gai0m13bwgc04jrd2";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2011ux --prefix PATH : ${xdg_utils}/bin
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix
deleted file mode 100644
index 8066c86742c1..000000000000
--- a/pkgs/applications/taxes/aangifte-2012/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2012-1";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz;
-    sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix
deleted file mode 100644
index 6f8e6d6429d3..000000000000
--- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2013-wa";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz;
-    sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix
deleted file mode 100644
index d75b60c83673..000000000000
--- a/pkgs/applications/taxes/aangifte-2013/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2013-1";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz;
-    sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix
deleted file mode 100644
index 38124677f9a5..000000000000
--- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2014-wa";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz;
-    sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix
deleted file mode 100644
index 33b6f8853aa2..000000000000
--- a/pkgs/applications/taxes/aangifte-2014/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2014-1";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz;
-    sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2be3f27574b5..fd56586e1bea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14671,28 +14671,6 @@ with pkgs;
 
   aacgain = callPackage ../applications/audio/aacgain { };
 
-  aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { };
-
-  aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { };
-
-  aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { };
-
-  aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { };
-
-  aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { };
-
-  aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { };
-
-  aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { };
-
-  aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { };
-
-  aangifte2014 = callPackage_i686 ../applications/taxes/aangifte-2014 { };
-
-  aangifte2013wa = callPackage_i686 ../applications/taxes/aangifte-2013-wa { };
-
-  aangifte2014wa = callPackage_i686 ../applications/taxes/aangifte-2014-wa { };
-
   abcde = callPackage ../applications/audio/abcde {
     inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
     inherit (pythonPackages) eyeD3;

From f2a15f747a41a457c48761ac4bd27c9d230b7a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Apr 2018 08:51:43 +0100
Subject: [PATCH 0568/3370] aangifte: remove ancient versions

Packages were either absent or the hashes were broken,
so I highly doubt somebody is using 4+ years old tax programs.
---
 .../taxes/aangifte-2006/builder.sh            | 17 --------
 .../taxes/aangifte-2006/default.nix           | 21 ----------
 .../taxes/aangifte-2007/builder.sh            | 19 ---------
 .../taxes/aangifte-2007/default.nix           | 24 -----------
 .../taxes/aangifte-2008/builder.sh            | 19 ---------
 .../taxes/aangifte-2008/default.nix           | 25 -----------
 .../taxes/aangifte-2009/default.nix           | 40 ------------------
 .../taxes/aangifte-2010/default.nix           | 40 ------------------
 .../taxes/aangifte-2011/default.nix           | 40 ------------------
 .../taxes/aangifte-2012/default.nix           | 41 -------------------
 .../taxes/aangifte-2013-wa/default.nix        | 41 -------------------
 .../taxes/aangifte-2013/default.nix           | 41 -------------------
 .../taxes/aangifte-2014-wa/default.nix        | 41 -------------------
 .../taxes/aangifte-2014/default.nix           | 41 -------------------
 pkgs/top-level/all-packages.nix               | 22 ----------
 15 files changed, 472 deletions(-)
 delete mode 100644 pkgs/applications/taxes/aangifte-2006/builder.sh
 delete mode 100644 pkgs/applications/taxes/aangifte-2006/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2007/builder.sh
 delete mode 100644 pkgs/applications/taxes/aangifte-2007/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2008/builder.sh
 delete mode 100644 pkgs/applications/taxes/aangifte-2008/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2009/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2010/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2011/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2012/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2013-wa/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2013/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2014-wa/default.nix
 delete mode 100644 pkgs/applications/taxes/aangifte-2014/default.nix

diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh
deleted file mode 100644
index 1b709b613bd4..000000000000
--- a/pkgs/applications/taxes/aangifte-2006/builder.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-source $stdenv/setup
-
-buildPhase() {
-    for i in bin/*; do
-        patchelf \
-            --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib \
-            $i
-    done
-}
-
-installPhase() {
-    mkdir -p $out
-    cp -prvd * $out/
-}
-
-genericBuild
diff --git a/pkgs/applications/taxes/aangifte-2006/default.nix b/pkgs/applications/taxes/aangifte-2006/default.nix
deleted file mode 100644
index 5883e51f712e..000000000000
--- a/pkgs/applications/taxes/aangifte-2006/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{stdenv, fetchurl, libX11, libXext}:
-
-stdenv.mkDerivation {
-  name = "aangifte2006-1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2006_linux.tar.gz;
-    sha256 = "1hgm3vmcr32v34h4y8yz3vxcxbcsxqb12qy1dqqwgbg1bja7nvrc";
-  };
-
-  inherit libX11 libXext;
-
-  meta = {
-    description = "Elektronische aangifte IB 2006";
-    homepage = "http://www.belastingdienst.nl/download/1341.html";
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh
deleted file mode 100644
index 79e5b3097696..000000000000
--- a/pkgs/applications/taxes/aangifte-2007/builder.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-source $stdenv/setup
-
-echo $NIX_CC
-
-buildPhase() {
-    for i in bin/*; do
-        patchelf \
-            --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-            $i
-    done
-}
-
-installPhase() {
-    mkdir -p $out
-    cp -prvd * $out/
-}
-
-genericBuild
diff --git a/pkgs/applications/taxes/aangifte-2007/default.nix b/pkgs/applications/taxes/aangifte-2007/default.nix
deleted file mode 100644
index 43fb26d811a3..000000000000
--- a/pkgs/applications/taxes/aangifte-2007/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{stdenv, fetchurl, libX11, libXext, libSM}:
-
-stdenv.mkDerivation {
-  name = "aangifte2007-1";
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2007_linux.tar.gz;
-    sha256 = "13p3gv086jn95wvmfygdmk9qjn0qxqdv7pp0v5pmw6i5hp8rmjxf";
-  };
-
-  inherit libX11 libXext libSM;
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  meta = {
-    description = "Elektronische aangifte IB 2007";
-    homepage = "http://www.belastingdienst.nl/download/1341.html";
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh
deleted file mode 100644
index 79e5b3097696..000000000000
--- a/pkgs/applications/taxes/aangifte-2008/builder.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-source $stdenv/setup
-
-echo $NIX_CC
-
-buildPhase() {
-    for i in bin/*; do
-        patchelf \
-            --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-            --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-            $i
-    done
-}
-
-installPhase() {
-    mkdir -p $out
-    cp -prvd * $out/
-}
-
-genericBuild
diff --git a/pkgs/applications/taxes/aangifte-2008/default.nix b/pkgs/applications/taxes/aangifte-2008/default.nix
deleted file mode 100644
index b9fad2fa10bd..000000000000
--- a/pkgs/applications/taxes/aangifte-2008/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{stdenv, fetchurl, libX11, libXext, libSM}:
-
-stdenv.mkDerivation {
-  name = "aangifte2008-1";
-  
-  builder = ./builder.sh;
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2008_linux.tar.gz;
-    sha256 = "0p46bc1b14hgf07illg3crjgjdflkcknk4nzm7b73cwkni57scx3";
-  };
-
-  inherit libX11 libXext libSM;
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  meta = {
-    description = "Elektronische aangifte IB 2008 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2008/aangifte_2008/aangifte_2008.html;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix
deleted file mode 100644
index d4230d426ece..000000000000
--- a/pkgs/applications/taxes/aangifte-2009/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2009-1";
-  
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2009_linux.tar.gz;
-    sha256 = "07l83cknzxwlzmg1w6baf2wqs06bh8v3949n51hy1p3wgr8hf408";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2009ux --prefix PATH : ${xdg_utils}/bin
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2009 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix
deleted file mode 100644
index 602368d2017b..000000000000
--- a/pkgs/applications/taxes/aangifte-2010/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2010-1";
-  
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2010_linux.tar.gz;
-    sha256 = "15mingjyqjvy4k6ws6qlhaaw8dj7336b54zg7mj70ig7jskjkz5h";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2010ux --prefix PATH : ${xdg_utils}/bin
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2010 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix
deleted file mode 100644
index 80c772705142..000000000000
--- a/pkgs/applications/taxes/aangifte-2011/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2011-1";
-  
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2011_linux.tar.gz;
-    sha256 = "0br9cfy3ibykzbhc1mkm7plxrs251vakpd5gai0m13bwgc04jrd2";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2011ux --prefix PATH : ${xdg_utils}/bin
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2011 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2009/download/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix
deleted file mode 100644
index 8066c86742c1..000000000000
--- a/pkgs/applications/taxes/aangifte-2012/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2012-1";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2012_linux.tar.gz;
-    sha256 = "05bahvk514lncgfr9kybcafahyz1rgfpwp5cykchxbbc033zm0xy";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2012 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/particulier/aangifte2012/download/;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix
deleted file mode 100644
index 6f8e6d6429d3..000000000000
--- a/pkgs/applications/taxes/aangifte-2013-wa/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2013-wa";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz;
-    sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix
deleted file mode 100644
index d75b60c83673..000000000000
--- a/pkgs/applications/taxes/aangifte-2013/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2013-1";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2013_linux.tar.gz;
-    sha256 = "05biqxz39gwln960xj31yg8s2chdn9vs0lzm4rlcwcavxy8lam1c";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2013 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix
deleted file mode 100644
index 38124677f9a5..000000000000
--- a/pkgs/applications/taxes/aangifte-2014-wa/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2014-wa";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz;
-    sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix
deleted file mode 100644
index 33b6f8853aa2..000000000000
--- a/pkgs/applications/taxes/aangifte-2014/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
-
-stdenv.mkDerivation {
-  name = "aangifte2014-1";
-
-  src = fetchurl {
-    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz;
-    sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j";
-  };
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  buildInputs = [ makeWrapper ];
-
-  buildPhase =
-    ''
-      for i in bin/*; do
-          patchelf \
-              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-              $i
-      done
-    '';
-
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -prvd * $out/
-      wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \
-                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
-    '';
-
-  meta = {
-    description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)";
-    homepage = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
-    license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66eb5866682b..b4a88cbe5b2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14673,28 +14673,6 @@ with pkgs;
 
   aacgain = callPackage ../applications/audio/aacgain { };
 
-  aangifte2006 = callPackage_i686 ../applications/taxes/aangifte-2006 { };
-
-  aangifte2007 = callPackage_i686 ../applications/taxes/aangifte-2007 { };
-
-  aangifte2008 = callPackage_i686 ../applications/taxes/aangifte-2008 { };
-
-  aangifte2009 = callPackage_i686 ../applications/taxes/aangifte-2009 { };
-
-  aangifte2010 = callPackage_i686 ../applications/taxes/aangifte-2010 { };
-
-  aangifte2011 = callPackage_i686 ../applications/taxes/aangifte-2011 { };
-
-  aangifte2012 = callPackage_i686 ../applications/taxes/aangifte-2012 { };
-
-  aangifte2013 = callPackage_i686 ../applications/taxes/aangifte-2013 { };
-
-  aangifte2014 = callPackage_i686 ../applications/taxes/aangifte-2014 { };
-
-  aangifte2013wa = callPackage_i686 ../applications/taxes/aangifte-2013-wa { };
-
-  aangifte2014wa = callPackage_i686 ../applications/taxes/aangifte-2014-wa { };
-
   abcde = callPackage ../applications/audio/abcde {
     inherit (perlPackages) DigestSHA MusicBrainz MusicBrainzDiscID;
     inherit (pythonPackages) eyeD3;

From 53e3aa1539049d6e4603e47d7262d7928673ed9e Mon Sep 17 00:00:00 2001
From: Thomas Bach <hacking@babibo.de>
Date: Fri, 27 Apr 2018 09:03:18 +0200
Subject: [PATCH 0569/3370] cassandra: 3.11.1 -> 3.11.2

---
 pkgs/servers/nosql/cassandra/3.11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/3.11.nix b/pkgs/servers/nosql/cassandra/3.11.nix
index 4647260b1e28..f18b6256d3f0 100644
--- a/pkgs/servers/nosql/cassandra/3.11.nix
+++ b/pkgs/servers/nosql/cassandra/3.11.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "3.11.1";
-  sha256 = "1vgh4ysnl4xg8g5v6zm78h3sq308r7s17ppbw0ck4bwyfnbddvkg";
+  version = "3.11.2";
+  sha256 = "0867i3irsji3qkjpp2s171xmjf2r8yhwzhs24ka8hljxv457f8p9";
 })

From ca0604190e4428e1cdf9bb369fbbf73e1679e007 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 18 Apr 2018 11:29:54 +0900
Subject: [PATCH 0570/3370] qemu-guest-agent: init module

Allow out of band communication between qemu VMs and the host.
Useful to retrieve IPs of VMs from the host (for instance when libvirt can't analyze
DHCP requests because VMs are configured with static addresses or when
there is connectivity default).
---
 nixos/modules/module-list.nix                 |  1 +
 .../virtualisation/qemu-guest-agent.nix       | 36 +++++++++++++++++++
 nixos/modules/virtualisation/qemu-vm.nix      | 11 ++++++
 3 files changed, 48 insertions(+)
 create mode 100644 nixos/modules/virtualisation/qemu-guest-agent.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ef76b9d81ed..8a81a5fff8db 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -777,6 +777,7 @@
   ./virtualisation/hyperv-guest.nix
   ./virtualisation/openvswitch.nix
   ./virtualisation/parallels-guest.nix
+  ./virtualisation/qemu-guest-agent.nix
   ./virtualisation/rkt.nix
   ./virtualisation/virtualbox-guest.nix
   ./virtualisation/virtualbox-host.nix
diff --git a/nixos/modules/virtualisation/qemu-guest-agent.nix b/nixos/modules/virtualisation/qemu-guest-agent.nix
new file mode 100644
index 000000000000..e0d2b3dc509d
--- /dev/null
+++ b/nixos/modules/virtualisation/qemu-guest-agent.nix
@@ -0,0 +1,36 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.qemuGuest;
+in {
+
+  options.services.qemuGuest = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the qemu guest agent.";
+      };
+  };
+
+  config = mkIf cfg.enable (
+      mkMerge [
+    {
+
+      services.udev.extraRules = ''
+        SUBSYSTEM=="virtio-ports", ATTR{name}=="org.qemu.guest_agent.0", TAG+="systemd" ENV{SYSTEMD_WANTS}="qemu-guest-agent.service"
+      '';
+
+      systemd.services.qemu-guest-agent = {
+        description = "Run the QEMU Guest Agent";
+        serviceConfig = {
+          ExecStart = "${pkgs.kvm.ga}/bin/qemu-ga";
+          Restart = "always";
+          RestartSec = 0;
+        };
+      };
+    }
+  ]
+  );
+}
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 2b78276fcdea..57e25d808dc3 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -343,6 +343,15 @@ in
             (<literal>virtio</literal> or <literal>scsi</literal>).
           '';
         };
+
+      guestAgent.enable =
+        mkOption {
+          default = true;
+          type = types.bool;
+          description = ''
+            Enable the Qemu guest agent.
+          '';
+        };
     };
 
     virtualisation.useBootLoader =
@@ -494,6 +503,8 @@ in
     # Don't run ntpd in the guest.  It should get the correct time from KVM.
     services.timesyncd.enable = false;
 
+    services.qemuGuest.enable = cfg.qemu.guestAgent.enable;
+
     system.build.vm = pkgs.runCommand "nixos-vm" { preferLocalBuild = true; }
       ''
         mkdir -p $out/bin

From c56c0ac945f0db2cbb4fcc1dcf4764d6b7f493f2 Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@gmail.com>
Date: Wed, 21 Mar 2018 21:42:20 -0700
Subject: [PATCH 0571/3370] bundler: 1.14.6 -> 1.16.1

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

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index 6ba1d5f10ec1..0c754fcfe3bc 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.14.6";
-  source.sha256 = "0h3x2csvlz99v2ryj1w72vn6kixf7rl35lhdryvh7s49brnj0cgl";
+  version = "1.16.1";
+  source.sha256 = "42b8e0f57093e1d10c15542f956a871446b759e7969d99f91caf3b6731c156e8";
   dontPatchShebangs = true;
 
   postFixup = ''

From c8b9ac9be63cbadd5da62a37670631770e0d74cd Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Wed, 25 Apr 2018 09:09:13 +1000
Subject: [PATCH 0572/3370] haskellPackages.base-compat-batteries: fix bad
 dependency

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index ef1ebe881f54..acbcb1320e61 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -502,4 +502,9 @@ self: super: builtins.intersectAttrs super {
 
   # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
   blank-canvas = dontCheck super.blank-canvas;
+
+  # cabal2nix generates a dependency on base-compat, which is the wrong version
+  base-compat-batteries = super.base-compat-batteries.override {
+    base-compat = pkgs.haskellPackages.base-compat_0_10_1;
+  };
 }

From 12ba3954d7f27f260845663332becc450ddbd010 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 27 Apr 2018 12:20:12 +0200
Subject: [PATCH 0573/3370] multi-ghc-travis: update to latest git version

---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 781d3b096cfb..454bb5d58817 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -8,8 +8,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "848c2fe5c7d0d95b20312e86b360d5db8c95db75";
-    sha256 = "1n4y6j564sxxry19xs4x0ds7fg8h1q0svw9q45477czx82qzavym";
+    rev = "105005cde6bde903e477e5b9724d02bdea06bae4";
+    sha256 = "1l76782aa29mi88a2brvkyi6k0v33rpihxlskx99mak06bjrmnhh";
   };
   isLibrary = true;
   isExecutable = true;

From 3e446ecd564611953c75caf97a855285ef30ba38 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Mon, 2 Apr 2018 11:30:24 +0100
Subject: [PATCH 0574/3370] nixos/buildkite-agent: fix variable expansion in
 hook scripts

@cleverca found this bug in the declarative hooks config. Any shell
variables referenced in a hook script would get expanded by the hooks
directory builder.

Prevent variable expansion by quoting the here doc limit string.
---
 .../modules/services/continuous-integration/buildkite-agent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix
index 03af9a7859ec..d647b7b9fa49 100644
--- a/nixos/modules/services/continuous-integration/buildkite-agent.nix
+++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix
@@ -17,7 +17,7 @@ let
 
   hooksDir = let
     mkHookEntry = name: value: ''
-      cat > $out/${name} <<EOF
+      cat > $out/${name} <<'EOF'
       #! ${pkgs.runtimeShell}
       set -e
       ${value}

From fc7ae1fefee37e2209753323b1ff57a79487dd10 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Fri, 27 Apr 2018 13:40:20 +0200
Subject: [PATCH 0575/3370] atom: 1.26.0 -> 1.26.1

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 7b989f8df1f9..ca223803f04d 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.26.0";
+  version = "1.26.1";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1gyxys3mwwizc88vlb6j769b6r4ibjnqs6pg5iv336b13f9acyvr";
+    sha256 = "0g83qj9siq1vr2v46rzjf3dy2gns9krh6xlh7w3bhrgfk0vqkm11";
     name = "${name}.deb";
   };
 

From 503c9f8ea4c586cdff82641c9b2e6c76a5444bd8 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 27 Apr 2018 13:42:03 +0200
Subject: [PATCH 0576/3370] insomnia: 5.15.0 -> 5.16.0

---
 pkgs/development/web/insomnia/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index df46cf3ab920..9a4aaaad3ced 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -6,7 +6,7 @@
   libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr,
   libXrender, libXtst, libxcb,
 
-  libudev0-shim, glibc, curl
+  libudev0-shim, glibc, curl, openssl
 }:
 
 let
@@ -15,14 +15,14 @@ let
     gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
     libXi libXrandr libXrender libXtst libxcb
   ];
-  runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ];
+  runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "5.15.0";
+  version = "5.16.0";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "17pxgxpss5jxzpmcim7hkyyj0fgyxwdiyxb2idpsna2hmhaipyxa";
+    sha256 = "1cpw63ibxaa08vms7fbxr5ap2yh4vcl8q3rjfn0ag1zkimz8cg2p";
   };
 
   nativeBuildInputs = [ makeWrapper dpkg ];

From ad7bc980d27849f0862ac14cc92f611638bd0916 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 27 Apr 2018 12:54:40 +0100
Subject: [PATCH 0577/3370] terraform: update all plugins

---
 .../cluster/terraform/providers/data.nix      | 75 ++++++++++---------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix
index 0a0b20bfd15d..7aed4b95dd45 100644
--- a/pkgs/applications/networking/cluster/terraform/providers/data.nix
+++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix
@@ -4,8 +4,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-alicloud";
-      version = "1.9.0";
-      sha256  = "19jqyzpcnlraxzn8bvrjzsh81j7dfadswgxfsiqzxll9xbm0k2bv";
+      version = "1.9.1";
+      sha256  = "11rsvzyc74v14n7g0z1mwyykaz7m6bmvi38jx711b6vpxvm2scva";
     };
   archive =
     {
@@ -32,8 +32,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-aws";
-      version = "1.13.0";
-      sha256  = "09ba2r3avqbl85s8llmgkk6gwgfkzm83994kd965r481xcnfv1ny";
+      version = "1.16.0";
+      sha256  = "0knivwxdjkxyaqka0vvn0lh2ndbg660dw2g03iw00fx6ska1zn0c";
     };
   azure-classic =
     {
@@ -46,8 +46,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-azurerm";
-      version = "1.3.1";
-      sha256  = "1qpf2h9qnhki4lg9pv77r0sc4acj08m0fqqagkvkinq46ypsfbp4";
+      version = "1.4.0";
+      sha256  = "0g1i1aasi44zn5bdivzqkk1kshq271x2lydjskyqq7jfx27myibb";
     };
   bitbucket =
     {
@@ -81,22 +81,22 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cloudflare";
-      version = "0.1.0";
-      sha256  = "073j0kqkccj7yrqz6j4vx722vmy6mmvmgidamkjnhhjcwm6g1jbq";
+      version = "1.0.0";
+      sha256  = "1ar9wcgr45f2v6bqjn24zii0qwfppla8ya3gjc546sh1a7m0h9p3";
     };
   cloudscale =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cloudscale";
-      version = "1.0.0";
-      sha256  = "0yqiz4xywbd3568hl6va8da81fbc1hnynlz4z0vqxgi3bs8hhdhz";
+      version = "1.0.1";
+      sha256  = "0lhzwbm1a2s11s0ahb3vxfvshh385fgy1ficvip4rl31dahhwrav";
     };
   cloudstack =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-cloudstack";
-      version = "0.1.4";
-      sha256  = "1dj6zkwv0bix31b8sjad9gil43m8c2c5d1dr10qza40f9z4agaxa";
+      version = "0.1.5";
+      sha256  = "139wq6rr6fczjz496fqkxh6cmscx5hfnv2hvhfwpkhvqipsnlxmq";
     };
   cobbler =
     {
@@ -193,15 +193,15 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-google";
-      version = "1.8.0";
-      sha256  = "1n01gj9572hhskbl4bsg0fqyg9slv8fpvzp3avmwvg5b2hsj4snh";
+      version = "1.10.0";
+      sha256  = "08ayi30aqw9lz8qn982vl9m3z4prah60fqq2q9hvscf6qb9g8lr0";
     };
   grafana =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-grafana";
-      version = "1.0.1";
-      sha256  = "1dvd7dy039ranlkvnbililk2lzr6cffwc4jsgs6lk3hfxhrq8bns";
+      version = "1.0.2";
+      sha256  = "17pj4mm7ik9llhgckza822866x6986cdcr821f16dchvn3bfbf2i";
     };
   heroku =
     {
@@ -263,8 +263,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-logentries";
-      version = "0.1.0";
-      sha256  = "11fkb84gqcq59wk5kqn3h428jrc2gkl659zxmkdldad6jdll9ypa";
+      version = "1.0.0";
+      sha256  = "04xprkb9zwdjyzmsdf10bgmn8sa8q7jw0izz8lw0cc9hag97qgbq";
     };
   logicmonitor =
     {
@@ -308,6 +308,13 @@
       version = "1.0.0";
       sha256  = "0zjdhz6miwlg3b68pbd99c6nw7hhyzxy736734xz8g3w89xn18f5";
     };
+  nsxt =
+    {
+      owner   = "terraform-providers";
+      repo    = "terraform-provider-nsxt";
+      version = "1.0.0";
+      sha256  = "09yliw59wp9flfgmkznbf4syl510wpxsplzr8sa9m2vw0yc78jnq";
+    };
   null =
     {
       owner   = "terraform-providers";
@@ -368,22 +375,22 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-packet";
-      version = "1.2.0";
-      sha256  = "0jk8wwm7srjxc3mspqd9szlq8fd63bhdgkzwdjr2fvv4ivj17xp4";
+      version = "1.2.3";
+      sha256  = "0vx2pvrxgpy137v3i563w0sdqqrqp6p6sls27fg76cfxrqik5dpk";
     };
   pagerduty =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-pagerduty";
-      version = "1.0.0";
-      sha256  = "113anbcpp8ab111jm19h7d9i5sds76msgnk8xvwk8qf6500ivfqa";
+      version = "1.1.0";
+      sha256  = "100zxmpgd5qbzivkc2ja75980yrlz0k50x7448wf1kp2inyylxq0";
     };
   panos =
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-panos";
-      version = "1.0.0";
-      sha256  = "1pslp8pas1p90bmxp1yqmackqkbxrw2sgcm88ibz8l4k43vwks76";
+      version = "1.1.0";
+      sha256  = "1j3j0bdblw54g2l4xdwm9604n3qfb6zb4b8p081hs5nv004awka4";
     };
   postgresql =
     {
@@ -424,8 +431,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-random";
-      version = "1.1.0";
-      sha256  = "1mal0pg37a99q0sjqbccwc2ipwvxm8lqp93lg8i96f868hiv4yzl";
+      version = "1.2.0";
+      sha256  = "00gzqav21h2x2spczwcddlwl0llhgy03djvjjq9g9wb5yvcf4yll";
     };
   rundeck =
     {
@@ -438,8 +445,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-scaleway";
-      version = "1.2.0";
-      sha256  = "123rjvslq7gy2m96rikm0i2298jjpsnyh9civbyvbxj3h47z9h4v";
+      version = "1.3.0";
+      sha256  = "1yd2xdr52z0f3ykfhsfgf57zzhjglci8mvbimdf6z8xmdgfhwjbf";
     };
   softlayer =
     {
@@ -487,8 +494,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-triton";
-      version = "0.4.2";
-      sha256  = "0nid5sp8xskw5wmc0dbkw6m87bmyb37p9ck9xm74nrvdzqjxz5ml";
+      version = "0.5.0";
+      sha256  = "1cbv4bliswiwbhr9bh2m4faazhj0v89jnwn0fndfjw3rka1b97h7";
     };
   ultradns =
     {
@@ -501,8 +508,8 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vault";
-      version = "1.0.0";
-      sha256  = "1v4b8zs0s48gqgsh719hwi69i4h8i5vvp2g5m881z5yzv7n7haqw";
+      version = "1.1.0";
+      sha256  = "1g0cca662glqcz83l1skhj3nb7g386x65kwz95kyp59nvyxywvbq";
     };
   vcd =
     {
@@ -515,7 +522,7 @@
     {
       owner   = "terraform-providers";
       repo    = "terraform-provider-vsphere";
-      version = "1.3.3";
-      sha256  = "1z6v8hagpjm8573d36v3nak5h7hn3jyq2f4m93k1adygvs3n9yx7";
+      version = "1.4.1";
+      sha256  = "16dgszmcsfzbflqg053av1v8wgwy8m6f2qlk55fg3ww1a59c0wy1";
     };
 }

From 9939fb2cb6ae28e87be6ac38b85d0537eb0a097e Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Fri, 27 Apr 2018 15:11:31 +0300
Subject: [PATCH 0578/3370] parity-beta: 1.10.1 -> 1.10.2

---
 pkgs/applications/altcoins/parity/beta.nix     |  6 +++---
 .../parity/patches/vendored-sources-1.10.patch | 18 +++++++-----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
index b1bf38427a83..9cbab6ad0955 100644
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ b/pkgs/applications/altcoins/parity/beta.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.10.1";
-  sha256      = "0313ch4rqnwrsf7y1h8bdwjk59gvcj08jjf6sybb6ww0ml7a6i7b";
-  cargoSha256 = "00jr4g3q40pc1wi7fmfq1j8iakmv9pid7l31rf76wj4n8g051zc7";
+  version     = "1.10.2";
+  sha256      = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l";
+  cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh";
   patches     = [ ./patches/vendored-sources-1.10.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch
index 3e8e032f30c2..e59858442c9e 100644
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch
@@ -2,7 +2,7 @@ diff --git a/.cargo/config b/.cargo/config
 index 72652ad2f..b21c6aa7b 100644
 --- a/.cargo/config
 +++ b/.cargo/config
-@@ -1,3 +1,113 @@
+@@ -1,3 +1,108 @@
  [target.x86_64-pc-windows-msvc]
  # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643
  rustflags = ["-Ctarget-feature=+crt-static"]
@@ -42,6 +42,11 @@ index 72652ad2f..b21c6aa7b 100644
 +rev = "eecaadcb9e421bce31e91680d14a20bbd38f92a2"
 +replace-with = "vendored-sources"
 +
++[source."https://github.com/paritytech/app-dirs-rs"]
++git = "https://github.com/paritytech/app-dirs-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
 +[source."https://github.com/paritytech/bn"]
 +git = "https://github.com/paritytech/bn"
 +branch = "master"
@@ -97,16 +102,6 @@ index 72652ad2f..b21c6aa7b 100644
 +branch = "master"
 +replace-with = "vendored-sources"
 +
-+[source."https://github.com/paritytech/wasm-utils"]
-+git = "https://github.com/paritytech/wasm-utils"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/wasmi"]
-+git = "https://github.com/paritytech/wasmi"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
 +[source."https://github.com/tailhook/rotor"]
 +git = "https://github.com/tailhook/rotor"
 +branch = "master"
@@ -116,3 +111,4 @@ index 72652ad2f..b21c6aa7b 100644
 +git = "https://github.com/tomusdrw/ws-rs"
 +branch = "master"
 +replace-with = "vendored-sources"
++

From 82f24d65a3c6f58e6c0a14aec1b048cd2f521992 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Fri, 27 Apr 2018 15:11:52 +0300
Subject: [PATCH 0579/3370] parity: 1.9.6 -> 1.9.7

---
 pkgs/applications/altcoins/parity/default.nix |  6 +++---
 .../parity/patches/vendored-sources-1.9.patch | 20 +++++++------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index 71485551ef6a..d85fc25355c8 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.9.6";
-  sha256      = "17h7c93c95pj71nbw152rl4ka240zzd8w0yf8k4l4rimcsbra92g";
-  cargoSha256 = "0gk26yncahrlnx6xz13x775wrwh7xsfqiifspjislmgk7xknqjm0";
+  version     = "1.9.7";
+  sha256      = "1h9rmyqkdv2v83g12dadgqflq1n1qqgd5hrpy20ajha0qpbiv3ph";
+  cargoSha256 = "0ss5jw43850r8l34prai5vk1zd5d5fjyg4rcav1asbq6v683bww0";
   patches     = [ ./patches/vendored-sources-1.9.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
index d91b103c6cef..3e1ba2429f2d 100644
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
+++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
@@ -1,10 +1,9 @@
 diff --git a/.cargo/config b/.cargo/config
 new file mode 100644
 index 000000000..0efb69724
---- /dev/null
+--- /dev/null 
 +++ b/.cargo/config
-@@ -0,0 +1,100 @@
-+
+@@ -0,0 +1,94 @@
 +[source."https://github.com/alexcrichton/mio-named-pipes"]
 +git = "https://github.com/alexcrichton/mio-named-pipes"
 +branch = "master"
@@ -30,6 +29,11 @@ index 000000000..0efb69724
 +branch = "master"
 +replace-with = "vendored-sources"
 +
++[source."https://github.com/paritytech/app-dirs-rs"]
++git = "https://github.com/paritytech/app-dirs-rs"
++branch = "master"
++replace-with = "vendored-sources"
++
 +[source."https://github.com/paritytech/bn"]
 +git = "https://github.com/paritytech/bn"
 +branch = "master"
@@ -85,16 +89,6 @@ index 000000000..0efb69724
 +branch = "master"
 +replace-with = "vendored-sources"
 +
-+[source."https://github.com/paritytech/wasm-utils"]
-+git = "https://github.com/paritytech/wasm-utils"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/wasmi"]
-+git = "https://github.com/paritytech/wasmi"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
 +[source."https://github.com/tailhook/rotor"]
 +git = "https://github.com/tailhook/rotor"
 +branch = "master"

From 0963abfb41e48d60315e73223d390c1b4df3ff12 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Fri, 27 Apr 2018 15:02:24 +0200
Subject: [PATCH 0580/3370] maintainer-list.nix: add real name for xeji

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 30597373fc52..18ed73b19324 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4044,7 +4044,7 @@
   xeji = {
     email = "xeji@cat3.de";
     github = "xeji";
-    name = "xeji";
+    name = "Uli Baum";
   };
   xnaveira = {
     email = "xnaveira@gmail.com";

From abbf9656830f7f77210770a86b6044be4abb89e8 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 27 Apr 2018 16:35:02 +0200
Subject: [PATCH 0581/3370] nodejs: use xcodebuild patch for Node.js 10.x so
 that modules with native dependencies on darwin will build properly

---
 pkgs/development/web/nodejs/v10.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index 68d7f1b4ff11..9f5f18809897 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -7,5 +7,5 @@ in
     inherit enableNpm;
     version = "10.0.0";
     sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2";
-    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ];
+    patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
   }

From 048c991eb0344c368ba9b29e0168faf8b2aff9f7 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Fri, 27 Apr 2018 16:45:38 +0200
Subject: [PATCH 0582/3370] oauth2_proxy: use explicit upstream default for
 setXauthrequest

---
 nixos/modules/services/security/oauth2_proxy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix
index cf41625d16c8..433d97c2a7d7 100644
--- a/nixos/modules/services/security/oauth2_proxy.nix
+++ b/nixos/modules/services/security/oauth2_proxy.nix
@@ -508,9 +508,9 @@ in
 
     setXauthrequest = mkOption {
       type = types.nullOr types.bool;
-      default = null;
+      default = false;
       description = ''
-        Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode).
+        Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). Setting this to 'null' means using the upstream default (false).
       '';
     };
 

From 6c0806bdf0b908ce678b1dcb78a253d0dc61c9ca Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Fri, 27 Apr 2018 16:57:47 +0200
Subject: [PATCH 0583/3370] youtrack: init at 2018.1.41051

---
 pkgs/servers/jetbrains/youtrack.nix | 30 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/servers/jetbrains/youtrack.nix

diff --git a/pkgs/servers/jetbrains/youtrack.nix b/pkgs/servers/jetbrains/youtrack.nix
new file mode 100644
index 000000000000..7e368bf295b6
--- /dev/null
+++ b/pkgs/servers/jetbrains/youtrack.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+stdenv.mkDerivation rec {
+  name = "youtrack-${version}";
+  version = "2018.1.41051";
+
+  jar = fetchurl {
+    url = "https://download.jetbrains.com/charisma/${name}.jar";
+    sha256 = "1sznay3lbyb2i977103hzh61rw1bpkdv0raffbir68apmvv1r0rb";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  unpackPhase = "true";
+
+  installPhase = ''
+    runHook preInstall
+    makeWrapper ${jre}/bin/java $out/bin/youtrack --add-flags "\$YOUTRACK_JVM_OPTS -jar $jar"
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    description = ''
+      Issue Tracking and Project Management Tool for Developers
+    '';
+    maintainers = with maintainers; [ yorickvp ];
+    # https://www.jetbrains.com/youtrack/buy/license.html
+    license = licenses.unfree;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40792a702afa..3946a577cf64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12902,6 +12902,8 @@ with pkgs;
     erlang = erlangR18;
   };
 
+  youtrack = callPackage ../servers/jetbrains/youtrack.nix { };
+
   zabbix = recurseIntoAttrs (callPackages ../servers/monitoring/zabbix {});
 
   zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { };

From f135610acae39770db5413b0602544018f450299 Mon Sep 17 00:00:00 2001
From: Yucheng Zhang <yu@cheng.cat>
Date: Fri, 27 Apr 2018 15:31:02 +0800
Subject: [PATCH 0584/3370] inziu-iosevka: remove

---
 pkgs/data/fonts/inziu-iosevka/default.nix | 33 -----------------------
 pkgs/top-level/all-packages.nix           |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/data/fonts/inziu-iosevka/default.nix

diff --git a/pkgs/data/fonts/inziu-iosevka/default.nix b/pkgs/data/fonts/inziu-iosevka/default.nix
deleted file mode 100644
index f76e4cb61df0..000000000000
--- a/pkgs/data/fonts/inziu-iosevka/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, p7zip }:
-
-stdenv.mkDerivation rec {
-  version = "1.13.2";
-  name = "inziu-iosevka-${version}";
-
-  package = fetchurl {
-    url = "http://7xpdnl.dl1.z0.glb.clouddn.com/inziu-iosevka-ttfs-${version}.7z";
-    sha256 = "1i7qqcv1x6s1xkp687wq79zqg9ly6a7l5mnmg1iqgfgcbglgjbaw";
-  };
-
-  nativeBuildInputs = [ p7zip ];
-
-  unpackPhase = ''
-    7z x $package
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/truetype
-    cp *.ttf $out/share/fonts/truetype
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Inziu Iosevka font";
-    homepage = https://be5invis.github.io/Iosevka/inziu;
-    # license is clarified here: https://github.com/be5invis/Iosevka/issues/265
-    license = licenses.ofl;
-    maintainers = [ maintainers.ChengCat ];
-    platforms = platforms.all;
-    # large package, mainly i/o bound
-    hydraPlatforms = [];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0e07f2374482..b2b766eea59b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14353,8 +14353,6 @@ with pkgs;
 
   input-fonts = callPackage ../data/fonts/input-fonts { };
 
-  inziu-iosevka = callPackage ../data/fonts/inziu-iosevka { };
-
   iosevka = callPackage ../data/fonts/iosevka {
     nodejs = nodejs-8_x;
   };

From 000482ffc470f798fb3aa1673b39a38680cbb567 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Fri, 27 Apr 2018 17:20:08 +0200
Subject: [PATCH 0585/3370] youtrack: add service

---
 nixos/modules/services/web-apps/youtrack.nix | 177 +++++++++++++++++++
 1 file changed, 177 insertions(+)
 create mode 100644 nixos/modules/services/web-apps/youtrack.nix

diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix
new file mode 100644
index 000000000000..e057e3025629
--- /dev/null
+++ b/nixos/modules/services/web-apps/youtrack.nix
@@ -0,0 +1,177 @@
+{ config, lib, pkgs, options, ... }:
+
+with lib;
+
+let
+  cfg = config.services.youtrack;
+
+  extraAttr = concatStringsSep " " (mapAttrsToList (k: v: "-D${k}=${v}") (stdParams // cfg.extraParams));
+  mergeAttrList = lib.foldl' lib.mergeAttrs {};
+
+  stdParams = mergeAttrList [
+    (optionalAttrs (cfg.baseUrl != null) {
+      "jetbrains.youtrack.baseUrl" = cfg.baseUrl;
+    })
+    {
+    "java.aws.headless" = "true";
+    "jetbrains.youtrack.disableBrowser" = "true";
+    }
+  ];
+in
+{
+  options.services.youtrack = {
+
+    enable = mkEnableOption "YouTrack service";
+
+    address = mkOption {
+      description = ''
+        The interface youtrack will listen on.
+      '';
+      default = "127.0.0.1";
+      type = types.string;
+    };
+
+    baseUrl = mkOption {
+      description = ''
+        Base URL for youtrack. Will be auto-detected and stored in database.
+      '';
+      type = types.nullOr types.string;
+      default = null;
+    };
+
+    extraParams = mkOption {
+      default = {};
+      description = ''
+        Extra parameters to pass to youtrack. See 
+        https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html
+        for more information.
+      '';
+      example = {
+        "jetbrains.youtrack.overrideRootPassword" = "tortuga";
+      };
+      type = types.attrsOf types.string;
+    };
+
+    package = mkOption {
+      description = ''
+        Package to use.
+      '';
+      type = types.package;
+      default = pkgs.youtrack;
+      defaultText = "pkgs.youtrack";
+    };
+
+    port = mkOption {
+      description = ''
+        The port youtrack will listen on.
+      '';
+      default = 8080;
+      type = types.int;
+    };
+
+    statePath = mkOption {
+      description = ''
+        Where to keep the youtrack database.
+      '';
+      type = types.string;
+      default = "/var/lib/youtrack";
+    };
+
+    virtualHost = mkOption {
+      description = ''
+        Name of the nginx virtual host to use and setup.
+        If null, do not setup anything.
+      '';
+      default = null;
+      type = types.nullOr types.string;
+    };
+
+    jvmOpts = mkOption {
+      description = ''
+        Extra options to pass to the JVM.
+        See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html
+        for more information.
+      '';
+      type = types.string;
+      example = "-XX:MetaspaceSize=250m";
+      default = "";
+    };
+
+    maxMemory = mkOption {
+      description = ''
+        Maximum Java heap size
+      '';
+      type = types.string;
+      default = "1g";
+    };
+
+    maxMetaspaceSize = mkOption {
+      description = ''
+        Maximum java Metaspace memory.
+      '';
+      type = types.string;
+      default = "350m";
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.youtrack = {
+      environment.HOME = cfg.statePath;
+      environment.YOUTRACK_JVM_OPTS = "-Xmx${cfg.maxMemory} -XX:MaxMetaspaceSize=${cfg.maxMetaspaceSize} ${cfg.jvmOpts} ${extraAttr}";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "simple";
+        User = "youtrack";
+        Group = "youtrack";
+        ExecStart = ''${cfg.package}/bin/youtrack ${cfg.address}:${toString cfg.port}'';
+      };
+    };
+
+    users.users.youtrack = {
+      description = "Youtrack service user";
+      isSystemUser = true;
+      home = cfg.statePath;
+      createHome = true;
+      group = "youtrack";
+    };
+
+    users.groups.youtrack = {};
+
+    services.nginx = mkIf (cfg.virtualHost != null) {
+      upstreams.youtrack.servers."${cfg.address}:${toString cfg.port}" = {};
+      virtualHosts.${cfg.virtualHost}.locations = {
+        "/" = {
+          proxyPass = "http://youtrack";
+          extraConfig = ''
+            client_max_body_size 10m;
+            proxy_http_version 1.1;
+            proxy_set_header X-Forwarded-Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+          '';
+        };
+
+        "/api/eventSourceBus" = {
+          proxyPass = "http://youtrack";
+          extraConfig = ''
+            proxy_cache off;
+            proxy_buffering off;
+            proxy_read_timeout 86400s;
+            proxy_send_timeout 86400s;
+            proxy_set_header Connection "";
+            chunked_transfer_encoding off;
+            client_max_body_size 10m;
+            proxy_http_version 1.1;
+            proxy_set_header X-Forwarded-Host $http_host;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+          '';
+        };
+
+      };
+    };
+
+  };
+}

From a0076a4fb6c2a95fe33edfe99b4acc1dbee63f10 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 27 Apr 2018 17:53:58 +0200
Subject: [PATCH 0586/3370] rubiks: fix build

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

diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index 5b20948686b4..fe448106b15d 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildPhase = "true";
 
   installFlags = [
-    "PREFIX=$out"
+    "PREFIX=$(out)"
   ];
 
   patches = [

From e7e2df17da4080c54073c897040ae03f3b6fc669 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 27 Apr 2018 17:10:59 +0200
Subject: [PATCH 0587/3370] gwenhywfar: 4.17.0 -> 4.20.0

Upstream changes in 4.20.0:

  * Update bank information files for German banks because the format of
    ZKA files has changed in the meantime.

Upstream release notes in German:

https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=208

Upstream changes in 4.19.0:

  * Add frontend for GTK3.

Upstream release notes in German:

https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=207

Upstream changes in 4.18.0:

  * Show hashes for MD5, SHA1 and SHA512 in SSL certificates because
    some bank servers display different hashing variants.
  * Let GNUTLS handle the localisation of TrustStore certificates.

Upstream release notes in German:

https://www.aquamaniac.de/sites/download/releasenote.php?package=01&release=206

The updater script (update.sh) actually didn't get the right file to
download, so I temporarily modified it to download file number 2 because
file number 1 is the GPG signature. The reason why I didn't fix the
updater is because the upstream site will have different URLs in the
next upcoming version, so our updater is basically end-of-life for now.

I also changed the package expression to use the version from
sources.nix instead of a hardcoded value.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @goibhniu
---
 pkgs/development/libraries/aqbanking/gwenhywfar.nix | 9 +++++----
 pkgs/development/libraries/aqbanking/sources.nix    | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 28039cc01686..77a5a09da432 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -6,13 +6,14 @@
   ]
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version;
+in stdenv.mkDerivation rec {
   name = "gwenhywfar-${version}";
-  version = "4.15.3";
+  inherit version;
 
   src = let
-    inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId;
-    qstring = "package=01&release=${releaseId}&file=01";
+    qstring = "package=01&release=${releaseId}&file=02";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {
     name = "${name}.tar.gz";
diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix
index 1638c72e95f5..ab69240f6214 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/pkgs/development/libraries/aqbanking/sources.nix
@@ -1,8 +1,8 @@
 # This file is autogenerated from update.sh in the same directory.
 {
-  gwenhywfar.version = "4.17.0";
-  gwenhywfar.sha256 = "1z9bm2r407x8vxk2nk6pndx0zhlk32j65z472ljkgjbh56mgzz8i";
-  gwenhywfar.releaseId = "205";
+  gwenhywfar.version = "4.20.0";
+  gwenhywfar.sha256 = "1c0g3f8jk6j693774ifslx2ds4ksabgbbalhhm9gk20kpamxm22s";
+  gwenhywfar.releaseId = "208";
   libchipcard.version = "5.0.4";
   libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
   libchipcard.releaseId = "200";

From 191f4c210a87b2eddeabd098cd57a85fadfa0ee2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 27 Apr 2018 17:24:21 +0200
Subject: [PATCH 0588/3370] aqbanking: 5.6.12 -> 5.7.8

Upstream changes in 5.7.8:

  * Update bank information files for German banks because the format of
    ZKA files has changed in the meantime.

Upstream release notes in German:

https://www.aquamaniac.de/sites/download/releasenote.php?package=03&release=217

Upstream changes in 5.7.7:

  * Fix of manually adding new HBCI accounts (for example using
    KMyMoney).
  * Fix wrong truncation of account numbers in some turnovers of the
    SWIFT parser.
  * Simplified code for inserting new account data while fetching HBCI
    accounts.
  * Update information for German banks.

Upstream release notes in German:

https://www.aquamaniac.de/sites/download/releasenote.php?package=03&release=216

As with the gwenhywfar update, the updater script (update.sh) actually
didn't get the right file to download, so I temporarily modified it to
download file number 2 because file number 1 is the GPG signature. The
reason why I didn't fix the updater is because the upstream site will
have different URLs in the next upcoming version, so our updater is
basically end-of-life for now.

I also changed the package expression to use the version from
sources.nix instead of a hardcoded value.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @goibhniu
---
 pkgs/development/libraries/aqbanking/default.nix | 9 +++++----
 pkgs/development/libraries/aqbanking/sources.nix | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix
index ad930a705c57..b26291469e75 100644
--- a/pkgs/development/libraries/aqbanking/default.nix
+++ b/pkgs/development/libraries/aqbanking/default.nix
@@ -2,13 +2,14 @@
 , pkgconfig, gettext, xmlsec, zlib
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit ((import ./sources.nix).aqbanking) sha256 releaseId version;
+in stdenv.mkDerivation rec {
   name = "aqbanking-${version}";
-  version = "5.6.10";
+  inherit version;
 
   src = let
-    inherit ((import ./sources.nix).aqbanking) sha256 releaseId;
-    qstring = "package=03&release=${releaseId}&file=01";
+    qstring = "package=03&release=${releaseId}&file=02";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {
     name = "${name}.tar.gz";
diff --git a/pkgs/development/libraries/aqbanking/sources.nix b/pkgs/development/libraries/aqbanking/sources.nix
index ab69240f6214..884543d282a7 100644
--- a/pkgs/development/libraries/aqbanking/sources.nix
+++ b/pkgs/development/libraries/aqbanking/sources.nix
@@ -6,7 +6,7 @@
   libchipcard.version = "5.0.4";
   libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj";
   libchipcard.releaseId = "200";
-  aqbanking.version = "5.6.12";
-  aqbanking.sha256 = "08jbwmiv6f3v8iqdr44x4szna496fqcjfi6mlx04cnbx91m70lh6";
-  aqbanking.releaseId = "208";
+  aqbanking.version = "5.7.8";
+  aqbanking.sha256 = "0s67mysskbiw1h1p0np4ph4351r7wq3nc873vylam7lsqi66xy0n";
+  aqbanking.releaseId = "217";
 }

From cc909ff4dd02bcd7e632b7174d2599fa8f00dd7f Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 27 Apr 2018 17:32:27 +0200
Subject: [PATCH 0589/3370] libchipcard: Don't hardcode version

This is to make sure that we don't get a disparity between the version
in sources.nix and the version in the package expression and it's mostly
to get the package expression in par with aqbanking and gwenhywfar.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @goibhniu
---
 pkgs/development/libraries/aqbanking/libchipcard.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/libchipcard.nix b/pkgs/development/libraries/aqbanking/libchipcard.nix
index 1ac00c3fe882..9a0b70e0d97f 100644
--- a/pkgs/development/libraries/aqbanking/libchipcard.nix
+++ b/pkgs/development/libraries/aqbanking/libchipcard.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, gwenhywfar, pcsclite, zlib }:
 
-stdenv.mkDerivation rec {
+let
+  inherit ((import ./sources.nix).libchipcard) sha256 releaseId version;
+in stdenv.mkDerivation rec {
   name = "libchipcard-${version}";
-  version = "5.0.4";
+  inherit version;
 
   src = let
-    inherit ((import ./sources.nix).libchipcard) sha256 releaseId;
     qstring = "package=02&release=${releaseId}&file=01";
     mkURLs = map (base: "${base}/sites/download/download.php?${qstring}");
   in fetchurl {

From 3dba79e6898c78fde29908ad698a41420bd7c9d8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 27 Apr 2018 17:41:34 +0200
Subject: [PATCH 0590/3370] gwenhywfar: Support Gtk 2, Gtk 3 and Qt 5 GUIs

So far we used only the defaults, which are gtk2 and qt5. However
nowadays most applications have already switched to Qt 5 and Gtk 3, so
let's aim for that instead.

The reason Gtk 2 is still there is because GnuCash in nixpkgs is using
the Gtk 2 interface, so we can drop it as soon as a newer GnuCash has
landed in nixpkgs.

Right now the only package that depends on this is GnuCash (and
aqbanking of course), so I've tested this by not only building
gwenhywfar and aqbanking but also GnuCash. I did however not test
whether HBCI functionality works, only whether GnuCash starts up.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @goibhniu, @peti, @domenkozar
---
 pkgs/development/libraries/aqbanking/gwenhywfar.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index 77a5a09da432..ae402f884159 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnutls, gtk2, libgcrypt, pkgconfig, gettext, qt4
+{ stdenv, fetchurl, gnutls, gtk2, gtk3, libgcrypt, pkgconfig, gettext, which, qt5
 
 , pluginSearchPaths ? [
     "/run/current-system/sw/lib/gwenhywfar/plugins"
@@ -21,6 +21,10 @@ in stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  preConfigure = ''
+    configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5")
+  '';
+
   postPatch = let
     isRelative = path: builtins.substring 0 1 path != "/";
     mkSearchPath = path: ''
@@ -44,11 +48,9 @@ in stdenv.mkDerivation rec {
       configure
   '';
 
-  nativeBuildInputs = [ pkgconfig gettext ];
+  nativeBuildInputs = [ pkgconfig gettext which ];
 
-  buildInputs = [ gtk2 qt4 gnutls libgcrypt ];
-
-  QTDIR = qt4;
+  buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls libgcrypt ];
 
   meta = with stdenv.lib; {
     description = "OS abstraction functions used by aqbanking and related tools";

From f13873f35aaff640e8cf16f3dd9dce01f6661687 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 27 Apr 2018 18:23:11 +0200
Subject: [PATCH 0591/3370] gwenhywfar: Add OpenSSL and libgpgerror

OpenSSL is needed for gct-tool and libgpgerror for RSA key utilities
(src/crypt3/cryptkeyrsa.c).

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @goibhniu
---
 pkgs/development/libraries/aqbanking/gwenhywfar.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
index ae402f884159..bb337e471cfc 100644
--- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix
+++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix
@@ -1,4 +1,8 @@
-{ stdenv, fetchurl, gnutls, gtk2, gtk3, libgcrypt, pkgconfig, gettext, which, qt5
+{ stdenv, fetchurl, gnutls, openssl, libgcrypt, libgpgerror, pkgconfig, gettext
+, which
+
+# GUI support
+, gtk2, gtk3, qt5
 
 , pluginSearchPaths ? [
     "/run/current-system/sw/lib/gwenhywfar/plugins"
@@ -21,6 +25,11 @@ in stdenv.mkDerivation rec {
     inherit sha256;
   };
 
+  configureFlags = [
+    "--with-openssl-includes=${openssl.dev}/include"
+    "--with-openssl-libs=${openssl.out}/lib"
+  ];
+
   preConfigure = ''
     configureFlagsArray+=("--with-guis=gtk2 gtk3 qt5")
   '';
@@ -50,7 +59,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext which ];
 
-  buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls libgcrypt ];
+  buildInputs = [ gtk2 gtk3 qt5.qtbase gnutls openssl libgcrypt libgpgerror ];
 
   meta = with stdenv.lib; {
     description = "OS abstraction functions used by aqbanking and related tools";

From 65c1cfce3f72436a3a9fcba8053f6a7a5c6e078e Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 27 Apr 2018 16:39:45 +0000
Subject: [PATCH 0592/3370] nixos/networkd: Allow RequiredForOnline field in
 [Link] section

This was previously missing.
---
 nixos/modules/system/boot/networkd.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index eea10613ea58..e95ca27914ec 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -146,12 +146,13 @@ let
   # .network files have a [Link] section with different options than in .netlink files
   checkNetworkLink = checkUnitConfig "Link" [
     (assertOnlyFields [
-      "MACAddress" "MTUBytes" "ARP" "Unmanaged"
+      "MACAddress" "MTUBytes" "ARP" "Unmanaged" "RequiredForOnline"
     ])
     (assertMacAddress "MACAddress")
     (assertByteFormat "MTUBytes")
     (assertValueOneOf "ARP" boolValues)
     (assertValueOneOf "Unmanaged" boolValues)
+    (assertValueOneOf "RquiredForOnline" boolValues)
   ];
 
 

From 192352ff2f9a736f959a569a74cd42fcdb29021c Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 27 Apr 2018 16:34:02 +0000
Subject: [PATCH 0593/3370] nixos/cupsd: Introduce services.printing.logLevel
 option

Previously we indirectly suggested that the user use
services.printing.extraConf to set this, but this doesn't work with the
default merge ordering. Fix this by making it an independent option.
Fixes #39611.
---
 nixos/modules/services/printing/cupsd.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index ecab8cfc7df9..c4147986439c 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -83,6 +83,8 @@ let
 
     WebInterface ${if cfg.webInterface then "Yes" else "No"}
 
+    LogLevel ${cfg.logLevel}
+
     ${cfg.extraConf}
   '';
 
@@ -165,6 +167,15 @@ in
         '';
       };
 
+      logLevel = mkOption {
+        type = types.str;
+        default = "info";
+        example = "debug";
+        description = ''
+          Specifies the cupsd logging verbosity.
+        '';
+      };
+
       extraFilesConf = mkOption {
         type = types.lines;
         default = "";
@@ -180,7 +191,7 @@ in
         example =
           ''
             BrowsePoll cups.example.com
-            LogLevel debug
+            MaxCopies 42
           '';
         description = ''
           Extra contents of the configuration file of the CUPS daemon
@@ -345,8 +356,6 @@ in
 
     services.printing.extraConf =
       ''
-        LogLevel info
-
         DefaultAuthType Basic
 
         <Location />

From a5f6cdfd7ef36c0ee3c8bda8b487d1292838862f Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Apr 2018 17:21:35 +0200
Subject: [PATCH 0594/3370] lib/debug: add traceValFn, traceValSeqFn,
 traceValSeqNFn

Being able to modify the value on-the-fly before printing is very useful in
practice.
---
 lib/debug.nix   | 9 ++++++---
 lib/default.nix | 9 +++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index d163e60b6957..d5e9473ff773 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -17,7 +17,8 @@ rec {
 
   traceIf = p: msg: x: if p then trace msg x else x;
 
-  traceVal = x: trace x x;
+  traceValFn = f: x: trace (f x) x;
+  traceVal = traceValFn id;
   traceXMLVal = x: trace (builtins.toXML x) x;
   traceXMLValMarked = str: x: trace (str + builtins.toXML x) x;
 
@@ -44,9 +45,11 @@ rec {
                (modify depth snip x)) y;
 
   /* `traceSeq`, but the same value is traced and returned */
-  traceValSeq = v: traceVal (builtins.deepSeq v v);
+  traceValSeqFn = f: v: traceVal f (builtins.deepSeq v v);
+  traceValSeq = traceValSeqFn id;
   /* `traceValSeq` but with fixed depth */
-  traceValSeqN = depth: v: traceSeqN depth v v;
+  traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v;
+  traceValSeqN = traceValSeqNFn id;
 
 
   # this can help debug your code as well - designed to not produce thousands of lines
diff --git a/lib/default.nix b/lib/default.nix
index c292ed33e1da..23e276732db6 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -115,11 +115,12 @@ let
       unknownModule mkOption;
     inherit (types) isType setType defaultTypeMerge defaultFunctor
       isOptionType mkOptionType;
-    inherit (debug) addErrorContextToAttrs traceIf traceVal
+    inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn
       traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
-      traceValSeqN traceShowVal traceShowValMarked
-      showVal traceCall traceCall2 traceCall3 traceValIfNot runTests
-      testAllTrue strict traceCallXml attrNamesToStr;
+      traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
+      traceShowValMarked showVal traceCall traceCall2 traceCall3
+      traceValIfNot runTests testAllTrue strict traceCallXml
+      attrNamesToStr;
     inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs
       defaultOverridableDelayableArgs composedArgsAndFun
       maybeAttrNullable maybeAttr ifEnable checkFlag getValue

From a455637d28fb209a4677f55d887aa91ca05ed44e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Apr 2018 17:25:03 +0200
Subject: [PATCH 0595/3370] lib/debug: remove the deprecated strict function

The grace period was long enough.
---
 lib/debug.nix   | 8 ++------
 lib/default.nix | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index d5e9473ff773..7eaa1bd9c8b1 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -102,10 +102,6 @@ rec {
   # usage: { testX = allTrue [ true ]; }
   testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
 
-  strict = v:
-    trace "Warning: strict is deprecated and will be removed in the next release"
-      (builtins.seq v v);
-
   # example: (traceCallXml "myfun" id 3) will output something like
   # calling myfun arg 1: 3 result: 3
   # this forces deep evaluation of all arguments and the result!
@@ -119,10 +115,10 @@ rec {
       in (str: expr:
           if isFunction expr then
             (arg:
-              traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (strict arg)}" (expr arg)
+              traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg)
             )
           else
-            let r = strict expr;
+            let r = builtins.seq expr expr;
             in trace "${str}\n result:\n${builtins.toXML r}" r
       );
 }
diff --git a/lib/default.nix b/lib/default.nix
index 23e276732db6..b3c4fdc0e59a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -119,7 +119,7 @@ let
       traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
       traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
       traceShowValMarked showVal traceCall traceCall2 traceCall3
-      traceValIfNot runTests testAllTrue strict traceCallXml
+      traceValIfNot runTests testAllTrue traceCallXml
       attrNamesToStr;
     inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs
       defaultOverridableDelayableArgs composedArgsAndFun

From a7fdd10bf321f2db45c7fcdb79a39d7bc75bb828 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Apr 2018 18:30:21 +0200
Subject: [PATCH 0596/3370] lib/debug: deprecate & modernize showVal

The code is re-implemented in terms of `generators.toPretty`, but is strictly
less general than `traceValSeqN`, so we deprecate it.
---
 lib/debug.nix | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index 7eaa1bd9c8b1..2e052ba31d85 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -56,19 +56,25 @@ rec {
   traceShowVal = x: trace (showVal x) x;
   traceShowValMarked = str: x: trace (str + showVal x) x;
   attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a));
-  showVal = x:
-      if isAttrs x then
-          if x ? outPath then "x is a derivation, name ${if x ? name then x.name else "<no name>"}, { ${attrNamesToStr x} }"
-          else "x is attr set { ${attrNamesToStr x} }"
-      else if isFunction x then "x is a function"
-      else if x == [] then "x is an empty list"
-      else if isList x then "x is a list, first element is: ${showVal (head x)}"
-      else if x == true then "x is boolean true"
-      else if x == false then "x is boolean false"
-      else if x == null then "x is null"
-      else if isInt x then "x is an integer `${toString x}'"
-      else if isString x then "x is a string `${substring 0 50 x}...'"
-      else "x is probably a path `${substring 0 50 (toString x)}...'";
+  showVal = with lib;
+    trace ( "Warning: `showVal` is deprecated "
+          + "and will be removed in the next release, "
+          + "please use `traceSeqN`" )
+    (let
+      modify = v:
+        let pr = f: { __pretty = f; val = v; };
+        in   if isDerivation v then pr
+          (drv: "<δ:${drv.name}:${concatStringsSep ","
+                                 (attrNames drv)}>")
+        else if [] ==   v then pr (const "[]")
+        else if isList  v then pr (l: "[ ${go (head l)}, … ]")
+        else if isAttrs v then pr
+          (a: "{ ${ concatStringsSep ", " (attrNames a)} }")
+        else v;
+      go = x: generators.toPretty
+        { allowPrettyValues = true; }
+        (modify x);
+    in go);
 
   # trace the arguments passed to function and its result
   # maybe rewrite these functions in a traceCallXml like style. Then one function is enough

From 7365671fb23861d59ece8d85de407c3127128ad8 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Apr 2018 19:13:51 +0200
Subject: [PATCH 0597/3370] lib/debug: deprecate attrNamesToStr,
 traceXMLVal(Marked)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`attrNamesToStr` is very specific (and pretty trivial), so it doesn’t make sense
to have it in the library.
`traceXMLVal(Marked)` are just a builtin and `trace` and not very useful in
general (trace output should not be parsed anyway).
---
 lib/debug.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index 2e052ba31d85..fad6b769b39f 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -19,9 +19,6 @@ rec {
 
   traceValFn = f: x: trace (f x) x;
   traceVal = traceValFn id;
-  traceXMLVal = x: trace (builtins.toXML x) x;
-  traceXMLValMarked = str: x: trace (str + builtins.toXML x) x;
-
   # strict trace functions (traced structure is fully evaluated and printed)
 
   /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */
@@ -55,7 +52,12 @@ rec {
   # this can help debug your code as well - designed to not produce thousands of lines
   traceShowVal = x: trace (showVal x) x;
   traceShowValMarked = str: x: trace (str + showVal x) x;
-  attrNamesToStr = a: lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a));
+
+  attrNamesToStr = a:
+    trace ( "Warning: `attrNamesToStr` is deprecated "
+          + "and will be removed in the next release." )
+    (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)));
+
   showVal = with lib;
     trace ( "Warning: `showVal` is deprecated "
           + "and will be removed in the next release, "
@@ -76,6 +78,15 @@ rec {
         (modify x);
     in go);
 
+  traceXMLVal = x:
+    trace ( "Warning: `traceXMLVal` is deprecated "
+          + "and will be removed in the next release." )
+    (trace (builtins.toXML x) x);
+  traceXMLValMarked = str: x:
+    trace ( "Warning: `traceXMLValMarked` is deprecated "
+          + "and will be removed in the next release." )
+    (trace (str + builtins.toXML x) x);
+
   # trace the arguments passed to function and its result
   # maybe rewrite these functions in a traceCallXml like style. Then one function is enough
   traceCall  = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a));

From 562286aa560aea85448adbc0e50e636e8d3cf8d0 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Apr 2018 20:41:59 +0200
Subject: [PATCH 0598/3370] lib/debug: deprecate `traceValIfNot`

The function is only used in exactly one module and overly specific (`c` must be
a true predicate for `x`, if not, a specific trace is called).
---
 lib/debug.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index fad6b769b39f..16e8710168c3 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -93,9 +93,10 @@ rec {
   traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b));
   traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c));
 
-  # FIXME: rename this?
   traceValIfNot = c: x:
-    if c x then true else trace (showVal x) false;
+    trace ( "Warning: `traceValIfNot` is deprecated "
+          + "and will be removed in the next release." )
+    (if c x then true else traceSeq (showVal x) false);
 
   /* Evaluate a set of tests.  A test is an attribute set {expr,
      expected}, denoting an expression and its expected result.  The

From b90104ea0edc6763505458e4143e034f1d92bc2a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Apr 2018 20:45:12 +0200
Subject: [PATCH 0599/3370] lib/debug: fix use-sites of deprecated debug
 functions

---
 nixos/modules/misc/nixpkgs.nix      | 6 +++++-
 pkgs/misc/vim-plugins/vim-utils.nix | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index b8a55a24394e..8fbe218b232a 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -33,7 +33,11 @@ let
   configType = mkOptionType {
     name = "nixpkgs-config";
     description = "nixpkgs config";
-    check = traceValIfNot isConfig;
+    check = x:
+      let traceXIfNot = c:
+            if c x then true
+            else lib.traceSeqN 1 x false;
+      in traceXIfNot isConfig;
     merge = args: fold (def: mergeConfig def.value) {};
   };
 
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index e11419846aeb..514c1daed629 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -224,7 +224,7 @@ let
           else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation
           else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}"
           else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]"
-          else throw "turning ${lib.showVal x} into a VimL thing not implemented yet";
+          else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet";
 
       in assert builtins.hasAttr "vim-addon-manager" knownPlugins;
       ''

From fd54a946ca6d42b53df8d9040263fa43f6e426e9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 2 Apr 2018 21:00:47 +0200
Subject: [PATCH 0600/3370] lib/debug: deprecate `addErrorContextToAttrs`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The function isn’t used anywhere and `addErrorContext` is an undocumented
builtin.
The builtin is explicitely qualified at its two uses in the module system.
---
 lib/debug.nix   | 10 ++++++----
 lib/modules.nix |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index 16e8710168c3..a792806fa79e 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -11,10 +11,6 @@ in
 
 rec {
 
-  inherit (builtins) addErrorContext;
-
-  addErrorContextToAttrs = lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v);
-
   traceIf = p: msg: x: if p then trace msg x else x;
 
   traceValFn = f: x: trace (f x) x;
@@ -98,6 +94,12 @@ rec {
           + "and will be removed in the next release." )
     (if c x then true else traceSeq (showVal x) false);
 
+
+  addErrorContextToAttrs = attrs:
+    trace ( "Warning: `addErrorContextToAttrs` is deprecated "
+          + "and will be removed in the next release." )
+    (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs);
+
   /* Evaluate a set of tests.  A test is an attribute set {expr,
      expected}, denoting an expression and its expected result.  The
      result is a list of failed tests, each represented as {name,
diff --git a/lib/modules.nix b/lib/modules.nix
index 4ef982c7ec96..6c8033322a54 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -159,7 +159,7 @@ rec {
       context = name: ''while evaluating the module argument `${name}' in "${key}":'';
       extraArgs = builtins.listToAttrs (map (name: {
         inherit name;
-        value = addErrorContext (context name)
+        value = builtins.addErrorContext (context name)
           (args.${name} or config._module.args.${name});
       }) requiredArgs);
 
@@ -309,7 +309,7 @@ rec {
           res.mergedValue;
 
     in opt //
-      { value = addErrorContext "while evaluating the option `${showOption loc}':" value;
+      { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
         definitions = map (def: def.value) res.defsFinal;
         files = map (def: def.file) res.defsFinal;
         inherit (res) isDefined;

From e49f40e1caad0827096927f1a3c631209859496a Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 3 Apr 2018 08:00:02 +0200
Subject: [PATCH 0601/3370] lib/debug: deprecate `traceCallXml`

Incompletely documented, and a FIXME/bug that has been there for years.
---
 lib/debug.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index a792806fa79e..36f8c30353a4 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -128,7 +128,9 @@ rec {
   # note: if result doesn't evaluate you'll get no trace at all (FIXME)
   #       args should be printed in any case
   traceCallXml = a:
-    if !isInt a then
+    trace ( "Warning: `traceCallXml` is deprecated "
+          + "and will be removed in the next release." )
+    (if !isInt a then
       traceCallXml 1 "calling ${a}\n"
     else
       let nr = a;
@@ -140,5 +142,5 @@ rec {
           else
             let r = builtins.seq expr expr;
             in trace "${str}\n result:\n${builtins.toXML r}" r
-      );
+      ));
 }

From 5012c49fc0c2c0e5b07c308a84dd5181a40969ca Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 3 Apr 2018 08:48:04 +0200
Subject: [PATCH 0602/3370] lib/debug: document module & functions, prune
 imports

---
 lib/debug.nix | 120 ++++++++++++++++++++++++++++++++++----------------
 1 file changed, 82 insertions(+), 38 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index 36f8c30353a4..f4b261b824fd 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -1,28 +1,67 @@
+/* Collection of functions useful for debugging
+   broken nix expressions.
+
+   * `trace`-like functions take two values, print
+     the first to stderr and return the second.
+   * `traceVal`-like functions take one argument
+     which both printed and returned.
+   * `traceSeq`-like functions fully evaluate their
+     traced value before printing (not just to “weak
+     head normal form” like trace does by default).
+   * Functions that end in `-Fn` take an additional
+     function as their first argument, which is applied
+     to the traced value before it is printed.
+*/
 { lib }:
-
 let
-
-inherit (builtins) trace attrNamesToStr isAttrs isList isInt
-        isString isBool head substring attrNames;
-
-inherit (lib) all id mapAttrsFlatten elem isFunction;
-
+  inherit (builtins) trace isAttrs isList isInt
+          head substring attrNames;
+  inherit (lib) id elem isFunction;
 in
 
 rec {
 
-  traceIf = p: msg: x: if p then trace msg x else x;
+  # -- TRACING --
 
+  /* Trace msg, but only if pred is true.
+
+     Example:
+       traceIf true "hello" 3
+       trace: hello
+       => 3
+  */
+  traceIf = pred: msg: x: if pred then trace msg x else x;
+
+  /* Trace the value and also return it.
+
+     Example:
+       traceValFn (v: "mystring ${v}") "foo"
+       trace: mystring foo
+       => "foo"
+  */
   traceValFn = f: x: trace (f x) x;
   traceVal = traceValFn id;
-  # strict trace functions (traced structure is fully evaluated and printed)
 
-  /* `builtins.trace`, but the value is `builtins.deepSeq`ed first. */
+  /* `builtins.trace`, but the value is `builtins.deepSeq`ed first.
+
+     Example:
+       trace { a.b.c = 3; } null
+       trace: { a = <CODE>; }
+       => null
+       traceSeq { a.b.c = 3; } null
+       trace: { a = { b = { c = 3; }; }; }
+       => null
+  */
   traceSeq = x: y: trace (builtins.deepSeq x x) y;
 
-  /* Like `traceSeq`, but only down to depth n.
-   * This is very useful because lots of `traceSeq` usages
-   * lead to an infinite recursion.
+  /* Like `traceSeq`, but only evaluate down to depth n.
+     This is very useful because lots of `traceSeq` usages
+     lead to an infinite recursion.
+
+     Example:
+       traceSeqN 2 { a.b.c = 3; } null
+       trace: { a = { b = {…}; }; }
+       => null
    */
   traceSeqN = depth: x: y: with lib;
     let snip = v: if      isList  v then noQuotes "[…]" v
@@ -37,15 +76,42 @@ rec {
     in trace (generators.toPretty { allowPrettyValues = true; }
                (modify depth snip x)) y;
 
-  /* `traceSeq`, but the same value is traced and returned */
+  /* A combination of `traceVal` and `traceSeq` */
   traceValSeqFn = f: v: traceVal f (builtins.deepSeq v v);
   traceValSeq = traceValSeqFn id;
-  /* `traceValSeq` but with fixed depth */
+
+  /* A combination of `traceVal` and `traceSeqN`. */
   traceValSeqNFn = f: depth: v: traceSeqN depth (f v) v;
   traceValSeqN = traceValSeqNFn id;
 
 
-  # this can help debug your code as well - designed to not produce thousands of lines
+  # -- TESTING --
+
+  /* Evaluate a set of tests.  A test is an attribute set {expr,
+     expected}, denoting an expression and its expected result.  The
+     result is a list of failed tests, each represented as {name,
+     expected, actual}, denoting the attribute name of the failing
+     test and its expected and actual results.  Used for regression
+     testing of the functions in lib; see tests.nix for an example.
+     Only tests having names starting with "test" are run.
+     Add attr { tests = ["testName"]; } to run these test only
+  */
+  runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
+    let testsToRun = if tests ? tests then tests.tests else [];
+    in if (substring 0 4 name == "test" ||  elem name testsToRun)
+       && ((testsToRun == []) || elem name tests.tests)
+       && (test.expr != test.expected)
+
+      then [ { inherit name; expected = test.expected; result = test.expr; } ]
+      else [] ) tests));
+
+  # create a test assuming that list elements are true
+  # usage: { testX = allTrue [ true ]; }
+  testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
+
+
+  # -- DEPRECATED --
+
   traceShowVal = x: trace (showVal x) x;
   traceShowValMarked = str: x: trace (str + showVal x) x;
 
@@ -100,28 +166,6 @@ rec {
           + "and will be removed in the next release." )
     (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs);
 
-  /* Evaluate a set of tests.  A test is an attribute set {expr,
-     expected}, denoting an expression and its expected result.  The
-     result is a list of failed tests, each represented as {name,
-     expected, actual}, denoting the attribute name of the failing
-     test and its expected and actual results.  Used for regression
-     testing of the functions in lib; see tests.nix for an example.
-     Only tests having names starting with "test" are run.
-     Add attr { tests = ["testName"]; } to run these test only
-  */
-  runTests = tests: lib.concatLists (lib.attrValues (lib.mapAttrs (name: test:
-    let testsToRun = if tests ? tests then tests.tests else [];
-    in if (substring 0 4 name == "test" ||  elem name testsToRun)
-       && ((testsToRun == []) || elem name tests.tests)
-       && (test.expr != test.expected)
-
-      then [ { inherit name; expected = test.expected; result = test.expr; } ]
-      else [] ) tests));
-
-  # create a test assuming that list elements are true
-  # usage: { testX = allTrue [ true ]; }
-  testAllTrue = expr: { inherit expr; expected = map (x: true) expr; };
-
   # example: (traceCallXml "myfun" id 3) will output something like
   # calling myfun arg 1: 3 result: 3
   # this forces deep evaluation of all arguments and the result!

From 06156610f139dbbba43b6610f2528ad33e746529 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 3 Apr 2018 08:52:54 +0200
Subject: [PATCH 0603/3370] CODEOWNERS: add Profpatsch to lib/debug.nix

Reason: has overhauled the module quite substantially.
---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4e508d739e6a..3d4855c5cf40 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -14,6 +14,7 @@
 /lib                        @edolstra @nbp
 /lib/systems                @nbp @ericson2314
 /lib/generators.nix         @edolstra @nbp @Profpatsch
+/lib/debug.nix              @edolstra @nbp @Profpatsch
 
 # Nixpkgs Internals
 /default.nix                          @nbp

From 21b87a7bdb31f19812e0f989cc9e0304a9972e32 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 3 Apr 2018 13:06:39 +0200
Subject: [PATCH 0604/3370] docs: initial manual entry for `lib/debug.nix`

It is more of a stub for now, but at least points to the right file.
---
 doc/functions.xml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/doc/functions.xml b/doc/functions.xml
index f790512e7db1..b2e450972947 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -294,6 +294,22 @@ merge:"diff3"
 
 </section>
 
+<section xml:id="sec-debug">
+  <title>Debugging Nix Expressions</title>
+
+  <para>Nix is a unityped, dynamic language, this means every value can
+  potentially appear anywhere. Since it is also non-strict, evaluation order
+  and what ultimately is evaluated might surprise you. Therefore it is important
+  to be able to debug nix expressions.</para>
+
+
+  <para>In the <literal>lib/debug.nix</literal> file you will find a number of
+  functions that help (pretty-)printing values while evaluation is runnnig. You
+  can even specify how deep these values should be printed recursively, and
+  transform them on the fly. Please consult the docstrings in
+  <literal>lib/debug.nix</literal> for usage information.</para>
+</section>
+
 
 <section xml:id="sec-fhs-environments">
   <title>buildFHSUserEnv</title>

From 900cec79a0aaf0628f855ec71d0ecf3145a67d3e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 3 Apr 2018 14:04:05 +0200
Subject: [PATCH 0605/3370] lib/debug: add replacement instructions & release
 notes

for every deprecated function.
---
 lib/debug.nix                              | 19 ++++++---
 nixos/doc/manual/release-notes/rl-1809.xml | 45 ++++++++++++++++++++++
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/lib/debug.nix b/lib/debug.nix
index f4b261b824fd..91a9265a6b5e 100644
--- a/lib/debug.nix
+++ b/lib/debug.nix
@@ -117,7 +117,9 @@ rec {
 
   attrNamesToStr = a:
     trace ( "Warning: `attrNamesToStr` is deprecated "
-          + "and will be removed in the next release." )
+          + "and will be removed in the next release. "
+          + "Please use more specific concatenation "
+          + "for your uses (`lib.concat(Map)StringsSep`)." )
     (lib.concatStringsSep "; " (map (x: "${x}=") (attrNames a)));
 
   showVal = with lib;
@@ -142,11 +144,13 @@ rec {
 
   traceXMLVal = x:
     trace ( "Warning: `traceXMLVal` is deprecated "
-          + "and will be removed in the next release." )
+          + "and will be removed in the next release. "
+          + "Please use `traceValFn builtins.toXML`." )
     (trace (builtins.toXML x) x);
   traceXMLValMarked = str: x:
     trace ( "Warning: `traceXMLValMarked` is deprecated "
-          + "and will be removed in the next release." )
+          + "and will be removed in the next release. "
+          + "Please use `traceValFn (x: str + builtins.toXML x)`." )
     (trace (str + builtins.toXML x) x);
 
   # trace the arguments passed to function and its result
@@ -157,13 +161,15 @@ rec {
 
   traceValIfNot = c: x:
     trace ( "Warning: `traceValIfNot` is deprecated "
-          + "and will be removed in the next release." )
+          + "and will be removed in the next release. "
+          + "Please use `if/then/else` and `traceValSeq 1`.")
     (if c x then true else traceSeq (showVal x) false);
 
 
   addErrorContextToAttrs = attrs:
     trace ( "Warning: `addErrorContextToAttrs` is deprecated "
-          + "and will be removed in the next release." )
+          + "and will be removed in the next release. "
+          + "Please use `builtins.addErrorContext` directly." )
     (lib.mapAttrs (a: v: lib.addErrorContext "while evaluating ${a}" v) attrs);
 
   # example: (traceCallXml "myfun" id 3) will output something like
@@ -173,7 +179,8 @@ rec {
   #       args should be printed in any case
   traceCallXml = a:
     trace ( "Warning: `traceCallXml` is deprecated "
-          + "and will be removed in the next release." )
+          + "and will be removed in the next release. "
+          + "Please complain if you use the function regularly." )
     (if !isInt a then
       traceCallXml 1 "calling ${a}\n"
     else
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 61f9ec8ba995..2e53f0563baf 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -56,6 +56,11 @@ has the following highlights: </para>
 following incompatible changes:</para>
 
 <itemizedlist>
+  <listitem>
+    <para>
+      <literal>lib.strict</literal> is removed. Use <literal>builtins.seq</literal> instead.
+    </para>
+  </listitem>
   <listitem>
     <para>
       The <literal>clementine</literal> package points now to the free derivation.
@@ -77,6 +82,46 @@ following incompatible changes:</para>
 <itemizedlist>
   <listitem>
     <para>
+      <literal>lib.attrNamesToStr</literal> has been deprecated. Use
+      more specific concatenation (<literal>lib.concat(Map)StringsSep</literal>)
+      instead.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use
+      <literal>builtins.addErrorContext</literal> directly.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <literal>lib.showVal</literal> has been deprecated. Use
+      <literal>lib.traceSeqN</literal> instead.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <literal>lib.traceXMLVal</literal> has been deprecated. Use
+      <literal>lib.traceValFn builtins.toXml</literal> instead.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <literal>lib.traceXMLValMarked</literal> has been deprecated. Use
+      <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <literal>lib.traceValIfNot</literal> has been deprecated. Use
+      <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal>
+      instead.
+    </para>
+  </listitem>
+  <listitem>
+    <para>
+      <literal>lib.traceCallXml</literal> has been deprecated. Please complain
+      if you use the function regularly.
     </para>
   </listitem>
 </itemizedlist>

From 12707b88106ff0a09676aebf0a25d733fd5aac89 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Fri, 27 Apr 2018 18:44:28 +0200
Subject: [PATCH 0606/3370] pythonPackages.cysignals: 1.6.9 -> 1.7.1

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

diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index c1fedecbff34..56d997c6b325 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "cysignals";
-  version = "1.6.9";
+  version = "1.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "003invnixqy1h4lb358vwrxykxzp15csaddkgq3pqqmswnva5908";
+    sha256 = "15nky8siwlc7s8v23vv4m0mnxa1z6jcs2qfr26m2mkw9j9g2na2j";
   };
 
   hardeningDisable = [

From 5ec94de03c86fe12e2570c6fa870260bbfe710e8 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 25 Apr 2018 07:11:49 +0000
Subject: [PATCH 0607/3370] nixos: alsa: better docstring

---
 nixos/modules/services/audio/alsa.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/audio/alsa.nix b/nixos/modules/services/audio/alsa.nix
index e3e8bb28c58b..376aad66e236 100644
--- a/nixos/modules/services/audio/alsa.nix
+++ b/nixos/modules/services/audio/alsa.nix
@@ -54,6 +54,11 @@ in
           description = ''
             Whether to enable volume and capture control with keyboard media keys.
 
+            You want to leave this disabled if you run a desktop environment
+            like KDE, Gnome, Xfce, etc, as those handle such things themselves.
+            You might want to enable this if you run a minimalistic desktop
+            environment or work from bare linux ttys/framebuffers.
+
             Enabling this will turn on <option>services.actkbd</option>.
           '';
         };

From 92265e807e60fac8bbf3c08a82715b575b5e4e7e Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 25 Apr 2018 07:12:04 +0000
Subject: [PATCH 0608/3370] nixos: xserver: add related packages

---
 nixos/modules/services/x11/xserver.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 5f0a0f278452..29d1f17d28c8 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -240,7 +240,10 @@ in
         type = types.listOf types.str;
         # !!! We'd like "nv" here, but it segfaults the X server.
         default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
-        example = [ "vesa" ];
+        example = [
+          "ati_unfree" "amdgpu" "amdgpu-pro"
+          "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" "nvidiaLegacy173"
+        ];
         description = ''
           The names of the video drivers the configuration
           supports. They will be tried in order until one that

From e8d5070e23203163afb6450a6d82fc59e0012580 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Apr 2018 18:19:05 +0100
Subject: [PATCH 0609/3370] nixos/nixos-generate-config: update search command

---
 nixos/modules/installer/tools/nixos-generate-config.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 14c611e18bc3..74b61a64667e 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -577,8 +577,8 @@ $bootLoaderConfig
   # Set your time zone.
   # time.timeZone = "Europe/Amsterdam";
 
-  # List packages installed in system profile. To search by name, run:
-  # \$ nix-env -qaP | grep wget
+  # List packages installed in system profile. To search, run:
+  # \$ nix search wget
   # environment.systemPackages = with pkgs; [
   #   wget vim
   # ];

From 555d2db62008fb156d37b5cfa13df3e062527fa2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 27 Apr 2018 20:04:00 +0200
Subject: [PATCH 0610/3370] selfoss: 2016-07-31 -> 2.18

Fixes PHP7 compatibility.
---
 pkgs/servers/web-apps/selfoss/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 14f1dffee64c..4ed9d96510c8 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "selfoss-unstable-${version}";
-  version = "2016-07-31";
+  name = "selfoss-${version}";
+  version = "2.18";
 
-  src = fetchFromGitHub {
-    owner = "SSilence";
-    repo = "selfoss";
-    rev = "ceb431ad9208e2c5e31dafe593c75e5eb8b65cf7";
-    sha256 = "00vrpw7sb95x6lwpaxrlzxyj98k98xblqcrjr236ykv0ha97xv30";
+  src = fetchurl {
+    url = "https://github.com/SSilence/selfoss/releases/download/${version}/${name}.zip";
+    sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b";
   };
 
+  sourceRoot = ".";
+  nativeBuildInputs = [ unzip ];
+
   installPhase = ''
     mkdir $out
     cp -ra * $out/

From 53722f25adeaf41c4af5d4b7ddab6f13cc0b435e Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Fri, 27 Apr 2018 20:20:21 +0200
Subject: [PATCH 0611/3370] terraform-provider-ibm: init at 0.8.0

---
 .../terraform-provider-ibm/default.nix        | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix

diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
new file mode 100644
index 000000000000..9764e029d277
--- /dev/null
+++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+#
+# USAGE:
+# install the following package globally or in nix-shell:
+#
+#   (terraform.withPlugins ( plugins: [ terraform-provider-ibm ]))
+#
+# examples:
+# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples
+#
+
+buildGoPackage rec {
+  name = "terraform-provider-ibm-${version}";
+  version = "0.8.0";
+
+  goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
+  subPackages = [ "./" ];
+
+  src = fetchFromGitHub {
+    owner = "IBM-Cloud";
+    repo = "terraform-provider-ibm";
+    sha256 = "1jc1g2jadh02z4lfqnvgqk5cqrzk8pnn3cj3cwsm3ksa8pccf6w4";
+    rev = "v${version}";
+  };
+
+  # Terraform allow checking the provider versions, but this breaks
+  # if the versions are not provided via file paths.
+  postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/IBM-Cloud/terraform-provider-ibm;
+    description = "Terraform provider is used to manage IBM Cloud resources.";
+    platforms = platforms.all;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ jensbin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4a88cbe5b2b..6a6de6370e3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20944,6 +20944,8 @@ with pkgs;
   terraform = terraform_0_11;
   terraform-full = terraform_0_11-full;
 
+  terraform-provider-ibm = callPackage ../applications/networking/cluster/terraform-provider-ibm {};
+
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {};
 
   terraform-provider-nixos = callPackage ../applications/networking/cluster/terraform-provider-nixos {};

From 89df48e9db6a75641b6a9932e0c741c8ba2c7037 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 27 Apr 2018 20:35:23 +0200
Subject: [PATCH 0612/3370] weboob: Disable doctests requiring networking

Unfortunately I haven't found a way for nose to disable doctests and the
-e/--exclude flag only works on unit tests.

So I'm using sed in postPatch to remove the doctests without mangling
the whole docstring.

I've built weboob and it now succeeds.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/development/python-modules/weboob/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix
index a4b1b9c467a4..73a70a65c380 100644
--- a/pkgs/development/python-modules/weboob/default.nix
+++ b/pkgs/development/python-modules/weboob/default.nix
@@ -16,6 +16,19 @@ buildPythonPackage rec {
     sha256 = "0m5yh49lplvb57dfilczh65ky35fshp3g7ni31pwfxwqi1f7i4f9";
   };
 
+  postPatch = ''
+    # Disable doctests that require networking:
+    sed -i -n -e '/^ *def \+pagination *(.*: *$/ {
+      p; n; p; /"""\|'\'\'\'''/!b
+
+      :loop
+      n; /^ *\(>>>\|\.\.\.\)/ { h; bloop }
+      x; /^ *\(>>>\|\.\.\.\)/bloop; x
+      p; /"""\|'\'\'\'''/b
+      bloop
+    }; p' weboob/browser/browsers.py weboob/browser/pages.py
+  '';
+
   setupPyBuildFlags = ["--qt" "--xdg"];
 
   checkInputs = [ nose ];
@@ -33,7 +46,6 @@ buildPythonPackage rec {
     homepage = http://weboob.org;
     description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser";
     license = stdenv.lib.licenses.agpl3;
-    broken = true; # 2018-04-11
   };
 }
 

From 06c7d4d40dc77c79e50b54282345c1d71a1ac058 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 27 Apr 2018 19:55:35 +0200
Subject: [PATCH 0613/3370] opam: propagate `curl` and `unzip` dependencies

These are required for `opam init` to succeed.

Closes #14466
Cc @henrytill
---
 pkgs/development/tools/ocaml/opam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 63f79981e1b2..469e97e19de5 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
   name = "opam-${version}";
   version = "1.2.2";
 
-  buildInputs = [ unzip curl ncurses ocaml makeWrapper];
+  buildInputs = [ unzip curl ncurses ocaml makeWrapper ];
 
   src = srcs.opam;
 
@@ -73,7 +73,7 @@ in stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/opam \
-      --suffix PATH : ${aspcud}/bin
+      --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin
   '';
 
   doCheck = false;

From 876bbce48081a84c233a2d3da7dfbe659b136bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 27 Apr 2018 22:14:16 +0200
Subject: [PATCH 0614/3370] doc: fix typo in cross-compilation docs

---
 doc/cross-compilation.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 10e4706b0590..0b2b85aeeef6 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -75,7 +75,7 @@
             An example of such a tool is LLVM.
           </para>
           <para>
-            Although the existance of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf.
+            Although the existence of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf.
             Nixpkgs tries to avoid sharing in the mistake where possible.
             Still, because the concept of a target platform is so ingrained, it is best to support it as is.
           </para>

From be0b3e3cd0d784333c151d1c7cc7e45b6af189ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 27 Apr 2018 22:22:26 +0200
Subject: [PATCH 0615/3370] kcov: 34 -> 35

As the maintainer currently in `meta.maintainers` appears to not have
touched the package since 2015, I've also added myself there.
---
 pkgs/development/tools/analysis/kcov/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index 3c3665e72200..ce391b938cae 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "kcov-${version}";
-  version = "34";
+  version = "35";
 
   src = fetchFromGitHub {
     owner = "SimonKagstrom";
     repo = "kcov";
     rev = "v${version}";
-    sha256 = "1i4pn5na8m308pssk8585nmqi8kwd63a9h2rkjrn4w78ibmxvj01";
+    sha256 = "1da9vm87pi5m9ika0q1f1ai85w3vwlap8yln147yr9sc37jp5jcw";
   };
 
   preConfigure = "patchShebangs src/bin-to-c-source.py";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     homepage = http://simonkagstrom.github.io/kcov/index.html;
     license = licenses.gpl2;
 
-    maintainers = [ maintainers.gal_bolle ];
+    maintainers = with maintainers; [ gal_bolle ekleog ];
     platforms = platforms.linux;
   };
 }

From df85ddd229adcdd75f67e78eb4513d7df0cea947 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 27 Apr 2018 19:04:31 +0200
Subject: [PATCH 0616/3370] bspwm: 0.9.4 -> 0.9.5

---
 pkgs/applications/window-managers/bspwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index c494ee266be3..49af25e4bc2f 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "bspwm-${version}";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner  = "baskerville";
     repo   = "bspwm";
     rev    = version;
-    sha256 = "1srgsszp184zg123wdij0zp57c16m7lmal51rhflyx2c9fiiqm9l";
+    sha256 = "09h3g1rxxjyw861mk32lj774nmwkx8cwxq4wfgmf4dpbizymvhhr";
   };
 
   buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ];

From 1a244d9a3572b5cb7e62224a265007d00c81fdd8 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Fri, 27 Apr 2018 22:54:07 +0200
Subject: [PATCH 0617/3370] bspwm: add rvolosatovs to maintainers

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

diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix
index 49af25e4bc2f..0538228d4b4e 100644
--- a/pkgs/applications/window-managers/bspwm/default.nix
+++ b/pkgs/applications/window-managers/bspwm/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A tiling window manager based on binary space partitioning";
     homepage = https://github.com/baskerville/bspwm;
-    maintainers = with maintainers; [ meisternu epitrochoid ];
+    maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ];
     license = licenses.bsd2;
     platforms = platforms.linux;
   };

From 5c7b7c360be8083cfcc57f7e377b01d8135f32c2 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 27 Apr 2018 20:21:20 +0200
Subject: [PATCH 0618/3370] pythonPackages.opentimestamps: 0.2.1 -> 0.3.0

---
 .../python-modules/opentimestamps/default.nix          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix
index 1271a46f047d..370378f097a4 100644
--- a/pkgs/development/python-modules/opentimestamps/default.nix
+++ b/pkgs/development/python-modules/opentimestamps/default.nix
@@ -2,15 +2,17 @@
 , bitcoinlib, GitPython, pysha3 }:
 
 buildPythonPackage rec {
-  name = "opentimestamps-${version}";
-  version = "0.2.1";
+  pname = "opentimestamps";
+  version = "0.3.0";
   disabled = (!isPy3k);
 
+  # We can't use the pypi source because it doesn't include README.md which is
+  # needed in setup.py
   src = fetchFromGitHub {
     owner = "opentimestamps";
     repo = "python-opentimestamps";
-    rev = "python-opentimestamps-v0.2.1";
-    sha256 = "1cilv1ls9mdqk8zriqfkz7xcl8i1ncm0f89n4c8k4s82kf5y56rm";
+    rev = "python-opentimestamps-v${version}";
+    sha256 = "1i843mbz4h9vqc3y2x09ix6bv9wc0gzq36zhbnmf5by08iaiydks";
   };
 
   # Remove a failing test which expects the test source file to reside in the

From 4e79f2fb42e54711b864a1f02cb54a2b2e653be2 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Fri, 27 Apr 2018 20:21:50 +0200
Subject: [PATCH 0619/3370] opentimestamps-client: 0.5.1 -> 0.6.0

---
 pkgs/tools/misc/opentimestamps-client/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix
index a062aa992be6..3fbd874503de 100644
--- a/pkgs/tools/misc/opentimestamps-client/default.nix
+++ b/pkgs/tools/misc/opentimestamps-client/default.nix
@@ -1,19 +1,21 @@
 { lib, buildPythonApplication, fetchFromGitHub, isPy3k
-, opentimestamps, GitPython, pysocks }:
+, opentimestamps, appdirs, GitPython, pysocks }:
 
 buildPythonApplication rec {
-  name = "opentimestamps-client-${version}";
-  version = "0.5.1";
+  pname = "opentimestamps-client";
+  version = "0.6.0";
   disabled = (!isPy3k);
 
+  # We can't use the pypi source because it doesn't include README.md which is
+  # needed in setup.py
   src = fetchFromGitHub {
     owner = "opentimestamps";
     repo = "opentimestamps-client";
-    rev = "opentimestamps-client-v0.5.1";
-    sha256 = "0s549xkb75r5wyvjlfmac8a1df6w0y55l98f492zsihdns1d6rzq";
+    rev = "opentimestamps-client-v${version}";
+    sha256 = "05m8nllqad3k69mvby5q08y22i0wrj84gqifdgcldimrrn1i00xp";
   };
 
-  propagatedBuildInputs = [ opentimestamps GitPython pysocks ];
+  propagatedBuildInputs = [ opentimestamps appdirs GitPython pysocks ];
 
   meta = {
     description = "Command-line tool to create and verify OpenTimestamps proofs";

From b8917dc0f3d8e66c1fac0ea84440c05330f99f5a Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 27 Apr 2018 17:37:44 -0400
Subject: [PATCH 0620/3370] python35, python36: fix reading large files on
 darwin

---
 .../development/interpreters/python/cpython/3.5/default.nix | 6 ++++++
 .../development/interpreters/python/cpython/3.6/default.nix | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index d67cc7286942..c6d572aca164 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -67,6 +67,12 @@ in stdenv.mkDerivation {
   patches = [
     ./no-ldconfig.patch
     ./ld_library_path.patch
+  ] ++ optionals stdenv.isDarwin [
+    # Fix for https://bugs.python.org/issue24658
+    (fetchpatch {
+      url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
+      sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
+    })
   ] ++ optionals (x11Support && stdenv.isDarwin) [
     ./use-correct-tcl-tk-on-darwin.patch
   ];
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index ee9a0df9a8c4..e5e05c0ac7a3 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -69,6 +69,12 @@ in stdenv.mkDerivation {
 
   patches = [
     ./no-ldconfig.patch
+  ] ++ optionals stdenv.isDarwin [
+    # Fix for https://bugs.python.org/issue24658
+    (fetchpatch {
+      url = "https://bugs.python.org/file45178/issue24658-3-3.6.diff";
+      sha256 = "1x060hs80nl34mcl2ji2i7l4shxkmxwgq8h8lcmav8rjqqz1nb4a";
+    })
   ] ++ optionals (x11Support && stdenv.isDarwin) [
     ./use-correct-tcl-tk-on-darwin.patch
   ];

From 468f3ce0edfc753110e70ad82589acc7487c640a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Apr 2018 23:02:09 +0100
Subject: [PATCH 0621/3370] nixos/xserver: remove nvidiaLegacy173 from
 videoDrivers.examples

see https://github.com/NixOS/nixpkgs/commit/92265e807e60fac8bbf3c08a82715b575b5e4e7e#commitcomment-28773179
---
 nixos/modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 29d1f17d28c8..1404231f837e 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -242,7 +242,7 @@ in
         default = [ "ati" "cirrus" "intel" "vesa" "vmware" "modesetting" ];
         example = [
           "ati_unfree" "amdgpu" "amdgpu-pro"
-          "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304" "nvidiaLegacy173"
+          "nv" "nvidia" "nvidiaLegacy340" "nvidiaLegacy304"
         ];
         description = ''
           The names of the video drivers the configuration

From 4317f7ab26942b4fad23f616932a1df1611bd44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 27 Apr 2018 23:52:50 +0200
Subject: [PATCH 0622/3370] kcov: fix build on aarch64

Apparently, without this patch `NT_PRSTATUS` is not found. So the patch
adds the include apparently necessary. `NT_PRSTATUS` is also defined in
`<linux/ptrace.h>`, which would likely have been a better name, were it
not in the `linux/` directory, which is a priori not stable.

The need to do that is kind of weird (the change was introduced in [1],
and fedora apparently didn't need this additional import), but I'll try
to upstream it.

[1] https://github.com/SimonKagstrom/kcov/pull/239
---
 .../tools/analysis/kcov/aarch64_nt_prstatus.patch    | 12 ++++++++++++
 pkgs/development/tools/analysis/kcov/default.nix     |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch

diff --git a/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch
new file mode 100644
index 000000000000..d5c3662e9abf
--- /dev/null
+++ b/pkgs/development/tools/analysis/kcov/aarch64_nt_prstatus.patch
@@ -0,0 +1,12 @@
+diff --git a/src/engines/ptrace.cc b/src/engines/ptrace.cc
+index 59b615f..e02cddf 100644
+--- a/src/engines/ptrace.cc
++++ b/src/engines/ptrace.cc
+@@ -21,6 +21,7 @@
+ 
+ #if defined(__aarch64__)
+ #  include <sys/uio.h>
++#  include <elf.h>
+ #endif
+ 
+ #include <map>
diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix
index ce391b938cae..7d75d9a34e1a 100644
--- a/pkgs/development/tools/analysis/kcov/default.nix
+++ b/pkgs/development/tools/analysis/kcov/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib curl elfutils python libiberty libopcodes ];
 
+  patches = [ ./aarch64_nt_prstatus.patch ];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From 14568ddaabd23a96ffa537728888e1d8e8ee687a Mon Sep 17 00:00:00 2001
From: Sander Hollaar <github@humilis.net>
Date: Sat, 28 Apr 2018 00:19:05 +0200
Subject: [PATCH 0623/3370] netcat-openbsd: 1.187 -> 1.190: (#39605)

http://metadata.ftp-master.debian.org/changelogs/main/n/netcat-openbsd/netcat-openbsd_1.190-1_changelog
---
 pkgs/tools/networking/netcat-openbsd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix
index 2d9776abfcfc..1a79e17c6598 100644
--- a/pkgs/tools/networking/netcat-openbsd/default.nix
+++ b/pkgs/tools/networking/netcat-openbsd/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}:
 
 stdenv.mkDerivation rec {
-  version = "1.187";
+  version = "1.190";
   deb-version = "${version}-1";
   name = "netcat-openbsd-${version}";
 
   srcs = [
     (fetchurl {
       url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz";
-      sha256 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw";
+      sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38";
     })
     (fetchurl {
       url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz";
-      sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q";
+      sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv";
     })
   ];
 

From df3566c9560b3305bd33faf4bc7580dc55f4f71e Mon Sep 17 00:00:00 2001
From: Badi Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sun, 25 Mar 2018 16:49:54 -0400
Subject: [PATCH 0624/3370] unifi, nixos/unifi: support LTS (5.6.36) and
 release (5.7.20)

Ubiquiti has both a LTS and current version of their Unifi controller software.

The latter adds new features, but may drop support for some devices.

This adds the capability to use either for the unifi module but defaults
to the LTS version, which was the previous behavior.
---
 nixos/modules/services/networking/unifi.nix | 37 ++++++++++++++++++---
 pkgs/servers/unifi/default.nix              | 28 ++++++++++++----
 pkgs/top-level/all-packages.nix             |  1 +
 3 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index 8e5f0bfc070d..94958bfdd83e 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -4,22 +4,22 @@ let
   cfg = config.services.unifi;
   stateDir = "/var/lib/unifi";
   cmd = ''
-    @${pkgs.jre}/bin/java java \
+    @${cfg.jrePackage}/bin/java java \
         ${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
         ${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
         -jar ${stateDir}/lib/ace.jar
   '';
   mountPoints = [
     {
-      what = "${pkgs.unifi}/dl";
+      what = "${cfg.unifiPackage}/dl";
       where = "${stateDir}/dl";
     }
     {
-      what = "${pkgs.unifi}/lib";
+      what = "${cfg.unifiPackage}/lib";
       where = "${stateDir}/lib";
     }
     {
-      what = "${pkgs.mongodb}/bin";
+      what = "${cfg.mongodbPackage}/bin";
       where = "${stateDir}/bin";
     }
     {
@@ -41,6 +41,33 @@ in
       '';
     };
 
+    services.unifi.jrePackage = mkOption {
+      type = types.package;
+      default = pkgs.jre8;
+      defaultText = "pkgs.jre8";
+      description = ''
+        The JRE package to use. Check the release notes to ensure it is supported.
+      '';
+    };
+
+    services.unifi.unifiPackage = mkOption {
+      type = types.package;
+      default = pkgs.unifiLTS;
+      defaultText = "pkgs.unifiLTS";
+      description = ''
+        The unifi package to use.
+      '';
+    };
+
+    services.unifi.mongodbPackage = mkOption {
+      type = types.package;
+      default = pkgs.mongodb;
+      defaultText = "pkgs.mongodb";
+      description = ''
+        The mongodb package to use.
+      '';
+    };
+
     services.unifi.dataDir = mkOption {
       type = types.str;
       default = "${stateDir}/data";
@@ -137,7 +164,7 @@ in
         rm -rf "${stateDir}/webapps"
         mkdir -p "${stateDir}/webapps"
         chown unifi "${stateDir}/webapps"
-        ln -s "${pkgs.unifi}/webapps/ROOT" "${stateDir}/webapps/ROOT"
+        ln -s "${cfg.unifiPackage}/webapps/ROOT" "${stateDir}/webapps/ROOT"
       '';
 
       postStop = ''
diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index e9d2fd07dc56..dac4bf6899a1 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -2,21 +2,37 @@
 , dpkg
 , fetchurl
 , unzip
+, useLTS ? false
 }:
 
-stdenv.mkDerivation rec {
-  name = "unifi-controller-${version}";
-  version = "5.6.36";
 
-  src = fetchurl {
+let
+  versions = {
+    stable = {
+      version = "5.7.20";
+      sha256 = "1ylj4i5mcv6z9n32275ccdf1rqk74zilqsih3r6xzhm30pxrd8dd";
+    };
+    lts = {
+      version = "5.6.36";
+      sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
+    };
+  };
+  selectedVersion =
+    let attr = if useLTS then "lts" else "stable";
+    in versions."${attr}";
+in
+
+stdenv.mkDerivation {
+  name = "unifi-controller-${selectedVersion.version}";
+  src = with selectedVersion; fetchurl {
     url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb";
-    sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
+    inherit sha256;
   };
 
   buildInputs = [ dpkg ];
 
   unpackPhase = ''
-    dpkg-deb -x ${src} ./
+    dpkg-deb -x $src ./
   '';
 
   doConfigure = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bd29155a977..ef5a7c1d8ba9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12909,6 +12909,7 @@ with pkgs;
   axis2 = callPackage ../servers/http/tomcat/axis2 { };
 
   unifi = callPackage ../servers/unifi { };
+  unifiLTS = callPackage ../servers/unifi { useLTS=true; };
 
   virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { };
 

From 3ee2db1ab1cdede280dbcab66fd85329e2345bb6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 27 Apr 2018 22:32:20 +0000
Subject: [PATCH 0625/3370] netbsd: fix games on linux

---
 pkgs/os-specific/bsd/netbsd/default.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 67ad3687c2c6..75bd85be49dc 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -108,10 +108,10 @@ let
     # will be removed in the postInstall.
     preInstall = ''
       mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \
-               $out$DOCDIR $out$LOCALEDIR $out/usr/games
+               $out$DOCDIR $out$LOCALEDIR
       for i in 1 2 3 4 5 6 7 8 9; do
         mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \
-	         $out$DOCDIR/reference/ref$i
+                 $out$DOCDIR/reference/ref$i
       done
       mkdir -p $out/usr/include
     '';
@@ -363,8 +363,10 @@ in rec {
     patchPhase = ''
       sed -i '1i #include <time.h>' adventure/save.c
 
-      # Disable some games that don't build. They should be possible to
-      # build but need to look at how to implement stuff in Linux.
+      # Disable some games that don't build. They should be possible
+      # to build but need to look at how to implement stuff in
+      # Linux. macOS is missing gettime. TODO try to get these
+      # working.
       substituteInPlace Makefile \
         ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \
         --replace atc "" \
@@ -378,6 +380,9 @@ in rec {
         --replace sail "" \
         --replace trek "" \
 	--replace dab ""
+      substituteInPlace Makefile.inc \
+        --replace 2555 555 \
+        --replace 2550 550
     '';
     NIX_CFLAGS_COMPILE = [
       "-D__noinline="
@@ -387,6 +392,17 @@ in rec {
       "-DRANDOM_MAX=RAND_MAX"
       "-DINFTIM=-1"
     ];
+    postBuild = ''
+      mkdir -p $out/usr/games $out/usr/share/games/ching \
+               $out/usr/share/games/quiz.db \
+               $out/usr/libexec/ching $out/var/games/hackdir
+      touch $out/var/games/hackdir/perm
+    '';
+    preFixup = ''
+      mkdir -p $out/bin
+      mv $out/games/* $out/bin
+      rmdir $out/games
+    '';
     buildInputs = [ compat libcurses libterminfo libressl ];
     extraPaths = [
       (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4")

From e421c427d2c9cca60567b6057dfb1ff71e07278b Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 27 Apr 2018 18:33:42 -0400
Subject: [PATCH 0626/3370] fastjet: add veprbl to maintainers

---
 pkgs/development/libraries/physics/fastjet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 0ee68415b89c..2f3dfea9a51a 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     license     = stdenv.lib.licenses.gpl2;
     homepage    = http://fastjet.fr/;
     platforms   = stdenv.lib.platforms.unix;
+    maintainers = with stdenv.lib.maintainers; [ veprbl ];
   };
 }

From e2fb669bc5154e13dfe78cd19b7727ed7a0248e9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 27 Apr 2018 22:52:54 +0000
Subject: [PATCH 0627/3370] netbsd: fix finger

---
 pkgs/os-specific/bsd/netbsd/default.nix | 28 +++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 75bd85be49dc..c44e25b00fc0 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -340,6 +340,19 @@ let
     sha256 = "1dhsyfvcm67kf5zdbg5dmx5y8fimnbll6qxwp3gjfmbxqigmc52m";
   };
 
+  who = netBSDDerivation {
+    path = "usr.bin/who";
+    version = "7.1.2";
+    sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88";
+    patchPhase = ''
+      substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
+        --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \
+        --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \
+        --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" \
+        --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0"
+    '';
+  };
+
 in rec {
   inherit compat install netBSDDerivation fts;
 
@@ -410,17 +423,20 @@ in rec {
     ];
   };
 
-  who = netBSDDerivation {
-    path = "usr.bin/who";
-    version = "7.1.2";
-    sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88";
-  };
-
   finger = netBSDDerivation {
     path = "usr.bin/finger";
     sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi";
     version = "7.1.2";
     extraPaths = [ who.src ];
+    NIX_CFLAGS_COMPILE = [
+      "-DSUPPORT_UTMP"
+      "-USUPPORT_UTMPX"
+    ];
+    patchPhase = ''
+
+      ${who.patchPhase} 
+
+    '';
   };
 
   fingerd = netBSDDerivation {

From 837e8c342c2eb3e83873134374854280c873932d Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 27 Apr 2018 18:52:46 -0400
Subject: [PATCH 0628/3370] conglomerate: init at 2017-09-10

---
 .../science/biology/conglomerate/default.nix  | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/science/biology/conglomerate/default.nix

diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix
new file mode 100644
index 000000000000..8e24eacca2bb
--- /dev/null
+++ b/pkgs/applications/science/biology/conglomerate/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, cmake, coreutils, perl, bicpl, libminc, zlib, minc_tools,
+  makeWrapper, GetoptTabular, MNI-Perllib }:
+
+stdenv.mkDerivation rec {
+  pname = "conglomerate";
+  name  = "${pname}-2017-09-10";
+
+  src = fetchFromGitHub {
+    owner  = "BIC-MNI";
+    repo   = pname;
+    rev    = "7343238bc6215942c7ecc885a224f24433a291b0";
+    sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr";
+  };
+
+  nativeBuildInputs = [ cmake makeWrapper ];
+  buildInputs = [ libminc zlib bicpl ];
+  propagatedBuildInputs = [ coreutils minc_tools perl GetoptTabular MNI-Perllib ];
+
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ];
+
+  checkPhase = "ctest --output-on-failure";  # still some weird test failures though
+
+  postFixup = ''
+    for p in $out/bin/*; do
+      wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}";
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/BIC-MNI/conglomerate;
+    description = "More command-line utilities for working with MINC files";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license   = licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10053f926da1..d98e2aec1d2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19740,6 +19740,10 @@ with pkgs;
 
   bcftools = callPackage ../applications/science/biology/bcftools { };
 
+  conglomerate = callPackage ../applications/science/biology/conglomerate {
+    inherit (perlPackages) GetoptTabular MNI-Perllib;
+  };
+
   dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
 
   diamond = callPackage ../applications/science/biology/diamond { };

From fa850e8fda68c92984760f9ff9086e8cde6ef835 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 27 Apr 2018 18:52:46 -0400
Subject: [PATCH 0629/3370] conglomerate: init at 2017-09-10

---
 .../science/biology/conglomerate/default.nix  | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/science/biology/conglomerate/default.nix

diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix
new file mode 100644
index 000000000000..c04bc84c156d
--- /dev/null
+++ b/pkgs/applications/science/biology/conglomerate/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, cmake, coreutils, perl, bicpl, libminc, zlib, minc_tools,
+  makeWrapper, GetoptTabular, MNI-Perllib }:
+
+stdenv.mkDerivation rec {
+  pname = "conglomerate";
+  name  = "${pname}-2017-09-10";
+
+  src = fetchFromGitHub {
+    owner  = "BIC-MNI";
+    repo   = pname;
+    rev    = "7343238bc6215942c7ecc885a224f24433a291b0";
+    sha256 = "1mlqgmy3jc13bv7d01rjwldxq0p4ayqic85xcl222hhifi3w2prr";
+  };
+
+  nativeBuildInputs = [ cmake makeWrapper ];
+  buildInputs = [ libminc zlib bicpl ];
+  propagatedBuildInputs = [ coreutils minc_tools perl GetoptTabular MNI-Perllib ];
+
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DBICPL_DIR=${bicpl}/lib/" ];
+
+  postFixup = ''
+    for p in $out/bin/*; do
+      wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${stdenv.lib.makeBinPath [ coreutils minc_tools ]}";
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/BIC-MNI/conglomerate;
+    description = "More command-line utilities for working with MINC files";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license   = licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10053f926da1..d98e2aec1d2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19740,6 +19740,10 @@ with pkgs;
 
   bcftools = callPackage ../applications/science/biology/bcftools { };
 
+  conglomerate = callPackage ../applications/science/biology/conglomerate {
+    inherit (perlPackages) GetoptTabular MNI-Perllib;
+  };
+
   dcm2niix = callPackage ../applications/science/biology/dcm2niix { };
 
   diamond = callPackage ../applications/science/biology/diamond { };

From 92808e667fd909ecd2a1502b20d9dd163986aec8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Sat, 28 Apr 2018 00:58:40 +0200
Subject: [PATCH 0630/3370] blobfuse: init at 1.0.1-RC-Preview (#39073)

---
 maintainers/maintainer-list.nix             |  5 +++++
 pkgs/tools/filesystems/blobfuse/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/filesystems/blobfuse/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 18ed73b19324..aec6f67a9191 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1726,6 +1726,11 @@
     github = "jbedo";
     name = "Justin Bedő";
   };
+  jbgi = {
+    email = "jb@giraudeau.info";
+    github = "jbgi";
+    name = "Jean-Baptiste Giraudeau";
+  };
   jcumming = {
     email = "jack@mudshark.org";
     name = "Jack Cummings";
diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix
new file mode 100644
index 000000000000..f847cde98a9e
--- /dev/null
+++ b/pkgs/tools/filesystems/blobfuse/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, curl, gnutls, libgcrypt, libuuid, fuse }:
+
+stdenv.mkDerivation rec {
+  name = "blobfuse-${version}";
+  version = "1.0.1-RC-Preview";
+
+  src = fetchFromGitHub {
+    owner  = "Azure";
+    repo   = "azure-storage-fuse";
+    rev    = "v${version}";
+    sha256 = "143rxgfmprir4a7frrv8llkv61jxzq50w2v8wn32vx6gl6vci1zs";
+  };
+
+  buildInputs = [ curl gnutls libgcrypt libuuid fuse ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Mount an Azure Blob storage as filesystem through FUSE";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jbgi ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef5a7c1d8ba9..31e091b810eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -838,6 +838,8 @@ with pkgs;
     boost = boost160;
   };
 
+  blobfuse = callPackage ../tools/filesystems/blobfuse { };
+
   blockdiag = pythonPackages.blockdiag;
 
   blsd = callPackage ../tools/misc/blsd {

From b1950f081dcb1906ee20babf08c6377167a85f2d Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 27 Apr 2018 19:16:32 -0400
Subject: [PATCH 0631/3370] fastjet: update license in meta

Fixes: 70e070 ('fastjet: 3.3.0 -> 3.3.1')
---
 pkgs/development/libraries/physics/fastjet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix
index 2f3dfea9a51a..812d741fec96 100644
--- a/pkgs/development/libraries/physics/fastjet/default.nix
+++ b/pkgs/development/libraries/physics/fastjet/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A software package for jet finding in pp and e+e− collisions";
-    license     = stdenv.lib.licenses.gpl2;
+    license     = stdenv.lib.licenses.gpl2Plus;
     homepage    = http://fastjet.fr/;
     platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ veprbl ];

From 99b8d106e987b7fcddf4a92bd54e7f2ba8b0006a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 27 Apr 2018 19:32:19 -0500
Subject: [PATCH 0632/3370] netcat-gnu: move to pkgs/tools/networking/netcat

---
 pkgs/tools/networking/{netcat-gnu => netcat}/default.nix | 0
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/tools/networking/{netcat-gnu => netcat}/default.nix (100%)

diff --git a/pkgs/tools/networking/netcat-gnu/default.nix b/pkgs/tools/networking/netcat/default.nix
similarity index 100%
rename from pkgs/tools/networking/netcat-gnu/default.nix
rename to pkgs/tools/networking/netcat/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31e091b810eb..8e61a555aacd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3877,7 +3877,7 @@ with pkgs;
 
   netcat = netcat-openbsd;
 
-  netcat-gnu = callPackage ../tools/networking/netcat-gnu { };
+  netcat-gnu = callPackage ../tools/networking/netcat { };
 
   netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
 

From 949bb9887254be8b56cd7837e09bc7366b3e097f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 27 Apr 2018 19:33:05 -0500
Subject: [PATCH 0633/3370] libressl: build netcat

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index ae03ef7ecb97..8f028bcb5461 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -11,6 +11,8 @@ let
       inherit sha256;
     };
 
+    configureFlags = [ "--enable-nc" ];
+
     enableParallelBuilding = true;
 
     outputs = [ "bin" "dev" "out" "man" ];

From c65000af91d91708a1afbb4cb24b1daac068aaa0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 28 Apr 2018 00:33:51 +0000
Subject: [PATCH 0634/3370] openbsd: fixup mg

---
 pkgs/os-specific/bsd/default.nix         |   2 +-
 pkgs/os-specific/bsd/openbsd/default.nix |  28 +-
 pkgs/os-specific/bsd/openbsd/nc.patch    | 421 -----------------------
 3 files changed, 18 insertions(+), 433 deletions(-)
 delete mode 100644 pkgs/os-specific/bsd/openbsd/nc.patch

diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix
index a8301ea2a8fc..5f094a8dad3f 100644
--- a/pkgs/os-specific/bsd/default.nix
+++ b/pkgs/os-specific/bsd/default.nix
@@ -3,6 +3,6 @@
 rec {
   netbsd = recurseIntoAttrs (callPackages ./netbsd {});
   openbsd = recurseIntoAttrs (callPackages ./openbsd {
-    inherit (netbsd) compat netBSDDerivation libcurses;
+    inherit (netbsd) compat netBSDDerivation libcurses libterminfo;
   });
 }
diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix
index 9ccc0adaa2df..6d909e1c5566 100644
--- a/pkgs/os-specific/bsd/openbsd/default.nix
+++ b/pkgs/os-specific/bsd/openbsd/default.nix
@@ -1,4 +1,4 @@
-{ fetchcvs, netBSDDerivation, compat, libcurses, libressl }:
+{ fetchcvs, netBSDDerivation, compat, libcurses, libterminfo }:
 
 let
   fetchOpenBSD = path: version: sha256: fetchcvs {
@@ -21,22 +21,28 @@ in {
     path = "usr.bin/mg";
     version = "6.3";
     sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc";
-    buildInputs = [ compat libcurses ];
+    buildInputs = [ compat libcurses libterminfo ];
     patchPhase = ''
       NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys"
+      substituteInPlace fileio.c \
+        --replace "bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec" "bp->b_fi.fi_mtime.tv_sec != sb.st_mtim.tv_sec" \
+        --replace "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec" "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtim.tv_nsec" \
+        --replace "bp->b_fi.fi_mtime = sb.st_mtimespec" "bp->b_fi.fi_mtime = sb.st_mtim"
+      substituteInPlace Makefile \
+        --replace "-o root -g wheel" "" \
+        --replace '-o ''${DOCOWN} -g ''${DOCGRP}' ""
+    '';
+    NIX_CFLAGS_COMPILE = [ "-DTCSASOFT=0x10" "-Dpledge(a,b)=0" ];
+    preBuild = ''
+      cc -c $BSDSRCDIR/lib/libc/stdlib/strtonum.c -o strtonum.o
+      NIX_LDFLAGS+=" strtonum.o"
     '';
     extraPaths = [
       (fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9")
       (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr")
-    ];
-  };
-
-  nc = openBSDDerivation {
-    path = "usr.bin/nc";
-    version = "6.3";
-    sha256 = "0fmnh6ccxab0qvhmgspyd3wra1ps2516i0j6hwkvna2lcny20xvr";
-    patches = [ ./nc.patch ];
-    buildInputs = [ compat libressl ];
+      (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr")
+      (fetchOpenBSD "lib/libc/stdlib/strtonum.c" "6.3" "0xn3qxvb3g76hz698sjkf85p07zrcdv2g31inp8caqw2mpk6jadv")
+     ];
   };
 
 }
diff --git a/pkgs/os-specific/bsd/openbsd/nc.patch b/pkgs/os-specific/bsd/openbsd/nc.patch
deleted file mode 100644
index de6fb2d04c41..000000000000
--- a/pkgs/os-specific/bsd/openbsd/nc.patch
+++ /dev/null
@@ -1,421 +0,0 @@
---- a/nc.1
-+++ b/nc.1
-@@ -204,9 +204,6 @@ Proxy authentication is only supported f
- Specifies the source port
- .Nm
- should use, subject to privilege restrictions and availability.
--It is an error to use this option in conjunction with the
--.Fl l
--option.
- .It Fl R Ar CAfile
- Specifies the filename from which the root CA bundle for certificate
- verification is loaded, in PEM format.
-@@ -258,6 +255,7 @@ For IPv4 TOS value
- may be one of
- .Ar critical ,
- .Ar inetcontrol ,
-+.Ar lowcost ,
- .Ar lowdelay ,
- .Ar netcontrol ,
- .Ar throughput ,
---- a/netcat.c
-+++ b/netcat.c
-@@ -32,6 +32,8 @@
-  * *Hobbit* <hobbit@avian.org>.
-  */
- 
-+#define _GNU_SOURCE
-+
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/uio.h>
-@@ -41,6 +43,49 @@
- #include <netinet/tcp.h>
- #include <netinet/ip.h>
- #include <arpa/telnet.h>
-+#ifdef __linux__
-+# include <linux/in6.h>
-+#endif
-+
-+#ifndef IPTOS_LOWDELAY
-+# define IPTOS_LOWDELAY 0x10
-+# define IPTOS_THROUGHPUT 0x08
-+# define IPTOS_RELIABILITY 0x04
-+# define IPTOS_LOWCOST 0x02
-+# define IPTOS_MINCOST IPTOS_LOWCOST
-+#endif /* IPTOS_LOWDELAY */
-+
-+# ifndef IPTOS_DSCP_AF11
-+# define	IPTOS_DSCP_AF11		0x28
-+# define	IPTOS_DSCP_AF12		0x30
-+# define	IPTOS_DSCP_AF13		0x38
-+# define	IPTOS_DSCP_AF21		0x48
-+# define	IPTOS_DSCP_AF22		0x50
-+# define	IPTOS_DSCP_AF23		0x58
-+# define	IPTOS_DSCP_AF31		0x68
-+# define	IPTOS_DSCP_AF32		0x70
-+# define	IPTOS_DSCP_AF33		0x78
-+# define	IPTOS_DSCP_AF41		0x88
-+# define	IPTOS_DSCP_AF42		0x90
-+# define	IPTOS_DSCP_AF43		0x98
-+# define	IPTOS_DSCP_EF		0xb8
-+#endif /* IPTOS_DSCP_AF11 */
-+
-+#ifndef IPTOS_DSCP_CS0
-+# define	IPTOS_DSCP_CS0		0x00
-+# define	IPTOS_DSCP_CS1		0x20
-+# define	IPTOS_DSCP_CS2		0x40
-+# define	IPTOS_DSCP_CS3		0x60
-+# define	IPTOS_DSCP_CS4		0x80
-+# define	IPTOS_DSCP_CS5		0xa0
-+# define	IPTOS_DSCP_CS6		0xc0
-+# define	IPTOS_DSCP_CS7		0xe0
-+#endif /* IPTOS_DSCP_CS0 */
-+
-+#ifndef IPTOS_DSCP_EF
-+# define	IPTOS_DSCP_EF		0xb8
-+#endif /* IPTOS_DSCP_EF */
-+
- 
- #include <err.h>
- #include <errno.h>
-@@ -268,10 +315,14 @@ main(int argc, char *argv[])
- 			uflag = 1;
- 			break;
- 		case 'V':
-+# if defined(RT_TABLEID_MAX)
- 			rtableid = (int)strtonum(optarg, 0,
- 			    RT_TABLEID_MAX, &errstr);
- 			if (errstr)
- 				errx(1, "rtable %s: %s", errstr, optarg);
-+# else
-+			errx(1, "no alternate routing table support available");
-+# endif
- 			break;
- 		case 'v':
- 			vflag = 1;
-@@ -320,7 +371,11 @@ main(int argc, char *argv[])
- 			oflag = optarg;
- 			break;
- 		case 'S':
-+# if defined(TCP_MD5SIG)
- 			Sflag = 1;
-+# else
-+			errx(1, "no TCP MD5 signature support available");
-+# endif
- 			break;
- 		case 'T':
- 			errstr = NULL;
-@@ -345,35 +400,23 @@ main(int argc, char *argv[])
- 	argc -= optind;
- 	argv += optind;
- 
-+# if defined(RT_TABLEID_MAX)
- 	if (rtableid >= 0)
- 		if (setrtable(rtableid) == -1)
- 			err(1, "setrtable");
--
--	if (family == AF_UNIX) {
--		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
--			err(1, "pledge");
--	} else if (Fflag && Pflag) {
--		if (pledge("stdio inet dns sendfd tty", NULL) == -1)
--			err(1, "pledge");
--	} else if (Fflag) { 
--		if (pledge("stdio inet dns sendfd", NULL) == -1)
--			err(1, "pledge");
--	} else if (Pflag && usetls) {
--		if (pledge("stdio rpath inet dns tty", NULL) == -1)
--			err(1, "pledge");
--	} else if (Pflag) {
--		if (pledge("stdio inet dns tty", NULL) == -1)
--			err(1, "pledge");
--	} else if (usetls) {
--		if (pledge("stdio rpath inet dns", NULL) == -1)
--			err(1, "pledge");
--	} else if (pledge("stdio inet dns", NULL) == -1)
--		err(1, "pledge");
-+# endif
- 
- 	/* Cruft to make sure options are clean, and used properly. */
- 	if (argv[0] && !argv[1] && family == AF_UNIX) {
- 		host = argv[0];
- 		uport = NULL;
-+	} else if (!argv[0] && lflag) {
-+		if (sflag)
-+			errx(1, "cannot use -s and -l");
-+		if (pflag)
-+			errx(1, "cannot use -p and -l");
-+		if (zflag)
-+			errx(1, "cannot use -z and -l");
- 	} else if (argv[0] && !argv[1]) {
- 		if (!lflag)
- 			usage(1);
-@@ -385,12 +428,6 @@ main(int argc, char *argv[])
- 	} else
- 		usage(1);
- 
--	if (lflag && sflag)
--		errx(1, "cannot use -s and -l");
--	if (lflag && pflag)
--		errx(1, "cannot use -p and -l");
--	if (lflag && zflag)
--		errx(1, "cannot use -z and -l");
- 	if (!lflag && kflag)
- 		errx(1, "must use -l with -k");
- 	if (uflag && usetls)
-@@ -425,8 +462,8 @@ main(int argc, char *argv[])
- 		} else {
- 			strlcpy(unix_dg_tmp_socket_buf, "/tmp/nc.XXXXXXXXXX",
- 			    UNIX_DG_TMP_SOCKET_SIZE);
--			if (mktemp(unix_dg_tmp_socket_buf) == NULL)
--				err(1, "mktemp");
-+			if (mkstemp(unix_dg_tmp_socket_buf) == -1)
-+				err(1, "mkstemp");
- 			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
- 		}
- 	}
-@@ -901,8 +938,10 @@ remote_connect(const char *host, const c
- 		if (sflag || pflag) {
- 			struct addrinfo ahints, *ares;
- 
-+# if defined (SO_BINDANY)
- 			/* try SO_BINDANY, but don't insist */
- 			setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
-+# endif
- 			memset(&ahints, 0, sizeof(struct addrinfo));
- 			ahints.ai_family = res->ai_family;
- 			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -994,9 +1033,15 @@ local_listen(char *host, char *port, str
- 		    res->ai_protocol)) < 0)
- 			continue;
- 
-+		ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
-+		if (ret == -1)
-+			err(1, NULL);
-+
-+# if defined(SO_REUSEPORT)
- 		ret = setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &x, sizeof(x));
- 		if (ret == -1)
- 			err(1, NULL);
-+# endif
- 
- 		set_common_sockopts(s, res->ai_family);
- 
-@@ -1452,11 +1497,13 @@ set_common_sockopts(int s, int af)
- {
- 	int x = 1;
- 
-+# if defined(TCP_MD5SIG)
- 	if (Sflag) {
- 		if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG,
- 			&x, sizeof(x)) == -1)
- 			err(1, NULL);
- 	}
-+# endif
- 	if (Dflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_DEBUG,
- 			&x, sizeof(x)) == -1)
-@@ -1467,9 +1514,14 @@ set_common_sockopts(int s, int af)
- 		    IP_TOS, &Tflag, sizeof(Tflag)) == -1)
- 			err(1, "set IP ToS");
- 
-+#if defined(IPV6_TCLASS)
- 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
- 		    IPV6_TCLASS, &Tflag, sizeof(Tflag)) == -1)
- 			err(1, "set IPv6 traffic class");
-+#else
-+		else if (af == AF_INET6)
-+			errx(1, "can't set IPv6 traffic class (unavailable)");
-+#endif
- 	}
- 	if (Iflag) {
- 		if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
-@@ -1487,19 +1539,34 @@ set_common_sockopts(int s, int af)
- 		    IP_TTL, &ttl, sizeof(ttl)))
- 			err(1, "set IP TTL");
- 
-+#if defined(IPV6_UNICAST_HOPS)
- 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
- 		    IPV6_UNICAST_HOPS, &ttl, sizeof(ttl)))
- 			err(1, "set IPv6 unicast hops");
-+#else
-+		else if (af == AF_INET6)
-+			errx(1, "can't set IPv6 unicast hops (unavailable)");
-+#endif
- 	}
- 
- 	if (minttl != -1) {
-+#if defined(IP_MINTTL)
- 		if (af == AF_INET && setsockopt(s, IPPROTO_IP,
- 		    IP_MINTTL, &minttl, sizeof(minttl)))
- 			err(1, "set IP min TTL");
-+#else
-+		if (af == AF_INET)
-+			errx(1, "can't set IP min TTL (unavailable)");
-+#endif
- 
-+#if defined(IPV6_MINHOPCOUNT)
- 		else if (af == AF_INET6 && setsockopt(s, IPPROTO_IPV6,
- 		    IPV6_MINHOPCOUNT, &minttl, sizeof(minttl)))
- 			err(1, "set IPv6 min hop count");
-+#else
-+		else if (af == AF_INET6)
-+			errx(1, "can't set IPv6 min hop count (unavailable)");
-+#endif
- 	}
- }
- 
-@@ -1534,6 +1601,7 @@ process_tos_opt(char *s, int *val)
- 		{ "cs7",		IPTOS_DSCP_CS7 },
- 		{ "ef",			IPTOS_DSCP_EF },
- 		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
-+		{ "lowcost",		IPTOS_LOWCOST },
- 		{ "lowdelay",		IPTOS_LOWDELAY },
- 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
- 		{ "reliability",	IPTOS_RELIABILITY },
-@@ -1741,7 +1812,7 @@ help(void)
- 	\t-Z		Peer certificate file\n\
- 	\t-z		Zero-I/O mode [used for scanning]\n\
- 	Port numbers can be individual or ranges: lo-hi [inclusive]\n");
--	exit(1);
-+	exit(0);
- }
- 
- void
---- a/socks.c
-+++ b/socks.c
-@@ -219,11 +219,11 @@ socks_connect(const char *host, const ch
- 		buf[2] = SOCKS_NOAUTH;
- 		cnt = atomicio(vwrite, proxyfd, buf, 3);
- 		if (cnt != 3)
--			err(1, "write failed (%zu/3)", cnt);
-+			err(1, "write failed (%zu/3)", (size_t)cnt);
- 
- 		cnt = atomicio(read, proxyfd, buf, 2);
- 		if (cnt != 2)
--			err(1, "read failed (%zu/3)", cnt);
-+			err(1, "read failed (%zu/3)", (size_t)cnt);
- 
- 		if (buf[1] == SOCKS_NOMETHOD)
- 			errx(1, "authentication method negotiation failed");
-@@ -272,11 +272,11 @@ socks_connect(const char *host, const ch
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%zu/%zu)", cnt, wlen);
-+			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 4);
- 		if (cnt != 4)
--			err(1, "read failed (%zu/4)", cnt);
-+			err(1, "read failed (%zu/4)", (size_t)cnt);
- 		if (buf[1] != 0) {
- 			errx(1, "connection failed, SOCKSv5 error: %s",
- 			    socks5_strerror(buf[1]));
-@@ -285,12 +285,12 @@ socks_connect(const char *host, const ch
- 		case SOCKS_IPV4:
- 			cnt = atomicio(read, proxyfd, buf + 4, 6);
- 			if (cnt != 6)
--				err(1, "read failed (%zu/6)", cnt);
-+				err(1, "read failed (%zu/6)", (size_t)cnt);
- 			break;
- 		case SOCKS_IPV6:
- 			cnt = atomicio(read, proxyfd, buf + 4, 18);
- 			if (cnt != 18)
--				err(1, "read failed (%zu/18)", cnt);
-+				err(1, "read failed (%zu/18)", (size_t)cnt);
- 			break;
- 		default:
- 			errx(1, "connection failed, unsupported address type");
-@@ -310,11 +310,11 @@ socks_connect(const char *host, const ch
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, wlen);
- 		if (cnt != wlen)
--			err(1, "write failed (%zu/%zu)", cnt, wlen);
-+			err(1, "write failed (%zu/%zu)", (size_t)cnt, (size_t)wlen);
- 
- 		cnt = atomicio(read, proxyfd, buf, 8);
- 		if (cnt != 8)
--			err(1, "read failed (%zu/8)", cnt);
-+			err(1, "read failed (%zu/8)", (size_t)cnt);
- 		if (buf[1] != 90) {
- 			errx(1, "connection failed, SOCKSv4 error: %s",
- 			    socks4_strerror(buf[1]));
-@@ -328,39 +328,39 @@ socks_connect(const char *host, const ch
- 
- 		/* Try to be sane about numeric IPv6 addresses */
- 		if (strchr(host, ':') != NULL) {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT [%s]:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		} else {
--			r = snprintf(buf, sizeof(buf),
-+			r = snprintf((char*)buf, sizeof(buf),
- 			    "CONNECT %s:%d HTTP/1.0\r\n",
- 			    host, ntohs(serverport));
- 		}
- 		if (r == -1 || (size_t)r >= sizeof(buf))
- 			errx(1, "hostname too long");
--		r = strlen(buf);
-+		r = strlen((char*)buf);
- 
- 		cnt = atomicio(vwrite, proxyfd, buf, r);
- 		if (cnt != r)
--			err(1, "write failed (%zu/%d)", cnt, r);
-+			err(1, "write failed (%zu/%d)", (size_t)cnt, (int)r);
- 
- 		if (authretry > 1) {
- 			char resp[1024];
- 
- 			proxypass = getproxypass(proxyuser, proxyhost);
--			r = snprintf(buf, sizeof(buf), "%s:%s",
-+			r = snprintf((char*)buf, sizeof(buf), "%s:%s",
- 			    proxyuser, proxypass);
- 			if (r == -1 || (size_t)r >= sizeof(buf) ||
--			    b64_ntop(buf, strlen(buf), resp,
-+			    b64_ntop(buf, strlen((char*)buf), resp,
- 			    sizeof(resp)) == -1)
- 				errx(1, "Proxy username/password too long");
--			r = snprintf(buf, sizeof(buf), "Proxy-Authorization: "
-+			r = snprintf((char*)buf, sizeof(buf), "Proxy-Authorization: "
- 			    "Basic %s\r\n", resp);
- 			if (r == -1 || (size_t)r >= sizeof(buf))
- 				errx(1, "Proxy auth response too long");
--			r = strlen(buf);
-+			r = strlen((char*)buf);
- 			if ((cnt = atomicio(vwrite, proxyfd, buf, r)) != r)
--				err(1, "write failed (%zu/%d)", cnt, r);
-+				err(1, "write failed (%zu/%d)", (size_t)cnt, r);
- 		}
- 
- 		/* Terminate headers */
-@@ -368,22 +368,22 @@ socks_connect(const char *host, const ch
- 			err(1, "write failed (%zu/2)", cnt);
- 
- 		/* Read status reply */
--		proxy_read_line(proxyfd, buf, sizeof(buf));
-+		proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 		if (proxyuser != NULL &&
--		    strncmp(buf, "HTTP/1.0 407 ", 12) == 0) {
-+		    strncmp((char*)buf, "HTTP/1.0 407 ", 12) == 0) {
- 			if (authretry > 1) {
- 				fprintf(stderr, "Proxy authentication "
- 				    "failed\n");
- 			}
- 			close(proxyfd);
- 			goto again;
--		} else if (strncmp(buf, "HTTP/1.0 200 ", 12) != 0 &&
--		    strncmp(buf, "HTTP/1.1 200 ", 12) != 0)
-+		} else if (strncmp((char*)buf, "HTTP/1.0 200 ", 12) != 0 &&
-+		    strncmp((char*)buf, "HTTP/1.1 200 ", 12) != 0)
- 			errx(1, "Proxy error: \"%s\"", buf);
- 
- 		/* Headers continue until we hit an empty line */
- 		for (r = 0; r < HTTP_MAXHDRS; r++) {
--			proxy_read_line(proxyfd, buf, sizeof(buf));
-+			proxy_read_line(proxyfd, (char*)buf, sizeof(buf));
- 			if (*buf == '\0')
- 				break;
- 		}
\ No newline at end of file

From 3c3b82234a6faa5a4c07323d0066452055d1ea81 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 27 Apr 2018 19:34:41 -0500
Subject: [PATCH 0635/3370] netcat-openbsd: remove

---
 .../networking/netcat-openbsd/default.nix     | 51 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100644 pkgs/tools/networking/netcat-openbsd/default.nix

diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix
deleted file mode 100644
index 1a79e17c6598..000000000000
--- a/pkgs/tools/networking/netcat-openbsd/default.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}:
-
-stdenv.mkDerivation rec {
-  version = "1.190";
-  deb-version = "${version}-1";
-  name = "netcat-openbsd-${version}";
-
-  srcs = [
-    (fetchurl {
-      url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz";
-      sha256 = "0dp571m42zc7wvb9bf4hz5a08rcc5fknf0gdp98yq19c754c9k38";
-    })
-    (fetchurl {
-      url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz";
-      sha256 = "0plgrri85sghzn499jzd9d3h7w61ksqj0amkwmcah8dmfkp7jrgv";
-    })
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libbsd ];
-
-  sourceRoot = name;
-
-  prePatch = ''
-    for i in $(cat ../debian/patches/series); do
-      patch -p1 < "../debian/patches/$i"
-    done
-  '';
-
-  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6";
-      sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr";
-    })
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -Dm0755 nc $out/bin/nc
-    install -Dm0644 nc.1 $out/share/man/man1/nc.1
-    runHook postInstall
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://packages.debian.org/netcat-openbsd;
-    description = "TCP/IP swiss army knife, OpenBSD variant";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ willibutz ];
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4b4dd2bf915d..a7f59d1268fd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -138,6 +138,7 @@ mapAliases (rec {
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
   mysqlWorkbench = mysql-workbench; # added 2017-01-19
   ncat = nmap;  # added 2016-01-26
+  netcat-openbsd = libressl.bin; # added 2018-04-25
   networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
   networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
   networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e61a555aacd..0b59862c20ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3879,8 +3879,6 @@ with pkgs;
 
   netcat-gnu = callPackage ../tools/networking/netcat { };
 
-  netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { };
-
   nethogs = callPackage ../tools/networking/nethogs { };
 
   netkittftp = callPackage ../tools/networking/netkit/tftp { };

From 6bc19398bed6a4062979c86454e41581f0bddbc7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 28 Apr 2018 01:03:34 +0000
Subject: [PATCH 0636/3370] openbsd: remove

---
 pkgs/os-specific/bsd/default.nix         |  3 --
 pkgs/os-specific/bsd/openbsd/default.nix | 48 ------------------------
 pkgs/top-level/all-packages.nix          |  2 +-
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 pkgs/os-specific/bsd/openbsd/default.nix

diff --git a/pkgs/os-specific/bsd/default.nix b/pkgs/os-specific/bsd/default.nix
index 5f094a8dad3f..a75c132b55a2 100644
--- a/pkgs/os-specific/bsd/default.nix
+++ b/pkgs/os-specific/bsd/default.nix
@@ -2,7 +2,4 @@
 
 rec {
   netbsd = recurseIntoAttrs (callPackages ./netbsd {});
-  openbsd = recurseIntoAttrs (callPackages ./openbsd {
-    inherit (netbsd) compat netBSDDerivation libcurses libterminfo;
-  });
 }
diff --git a/pkgs/os-specific/bsd/openbsd/default.nix b/pkgs/os-specific/bsd/openbsd/default.nix
deleted file mode 100644
index 6d909e1c5566..000000000000
--- a/pkgs/os-specific/bsd/openbsd/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ fetchcvs, netBSDDerivation, compat, libcurses, libterminfo }:
-
-let
-  fetchOpenBSD = path: version: sha256: fetchcvs {
-    cvsRoot = "anoncvs@anoncvs.ca.openbsd.org:/cvs";
-    module = "src/${path}";
-    inherit sha256;
-    tag = "OPENBSD_${builtins.replaceStrings ["."] ["_"] version}";
-  };
-
-  # OpenBSD is a fork of NetBSD
-  # We can build it with minimal changes
-  openBSDDerivation = attrs: netBSDDerivation (attrs // {
-    name = "${attrs.pname or (baseNameOf attrs.path)}-openbsd-${attrs.version}";
-    src = fetchOpenBSD attrs.path attrs.version attrs.sha256;
-  });
-
-in {
-
-  mg = openBSDDerivation {
-    path = "usr.bin/mg";
-    version = "6.3";
-    sha256 = "0n3hwa81c2mcjwbmidrbvi1l25jh8hy939kqrigbv78jixpynffc";
-    buildInputs = [ compat libcurses libterminfo ];
-    patchPhase = ''
-      NIX_CFLAGS_COMPILE+=" -I$BSDSRCDIR/sys"
-      substituteInPlace fileio.c \
-        --replace "bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec" "bp->b_fi.fi_mtime.tv_sec != sb.st_mtim.tv_sec" \
-        --replace "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec" "bp->b_fi.fi_mtime.tv_nsec != sb.st_mtim.tv_nsec" \
-        --replace "bp->b_fi.fi_mtime = sb.st_mtimespec" "bp->b_fi.fi_mtime = sb.st_mtim"
-      substituteInPlace Makefile \
-        --replace "-o root -g wheel" "" \
-        --replace '-o ''${DOCOWN} -g ''${DOCGRP}' ""
-    '';
-    NIX_CFLAGS_COMPILE = [ "-DTCSASOFT=0x10" "-Dpledge(a,b)=0" ];
-    preBuild = ''
-      cc -c $BSDSRCDIR/lib/libc/stdlib/strtonum.c -o strtonum.o
-      NIX_LDFLAGS+=" strtonum.o"
-    '';
-    extraPaths = [
-      (fetchOpenBSD "sys/sys/tree.h" "6.3" "0rimh41wn9wz5m510zk9i27z3s450qqgq2k5xn8kp3885hygbcj9")
-      (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr")
-      (fetchOpenBSD "sys/sys/_null.h" "6.3" "0l2rgg9ai4ivfl07zmbqli19vnm3lj7qkxpikqplmzrfp36qpzgr")
-      (fetchOpenBSD "lib/libc/stdlib/strtonum.c" "6.3" "0xn3qxvb3g76hz698sjkf85p07zrcdv2g31inp8caqw2mpk6jadv")
-     ];
-  };
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31a1acff06ee..beffac76715f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21379,5 +21379,5 @@ with pkgs;
                       mount wall hostname more sysctl;
 
   inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
-          netbsd openbsd;
+          netbsd;
 }

From 004111c27e11684d6945f82124110c5f17c1bf01 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 28 Apr 2018 01:03:47 +0000
Subject: [PATCH 0637/3370] netbsd: small fixups

---
 pkgs/os-specific/bsd/netbsd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index c44e25b00fc0..f9c8653447fe 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -11,7 +11,7 @@ let
 
   netBSDDerivation = attrs: stdenv.mkDerivation ((rec {
     name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}";
-    src = fetchNetBSD attrs.path attrs.version attrs.sha256;
+    src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256;
 
     extraPaths = [ ];
 
@@ -187,6 +187,7 @@ let
       install -D $NETBSDSRCDIR/sys/sys/rmd160.h $out/include/rmd160.h
       install -D $NETBSDSRCDIR/sys/sys/sha1.h $out/include/sha1.h
       install -D $NETBSDSRCDIR/sys/sys/sha2.h $out/include/sha2.h
+      install -D $NETBSDSRCDIR/sys/sys/queue.h $out/include/sys/queue.h
       install -D $NETBSDSRCDIR/include/vis.h $out/include/vis.h
       install -D $NETBSDSRCDIR/include/db.h $out/include/db.h
       install -D $NETBSDSRCDIR/include/netconfig.h $out/include/netconfig.h

From d11f290f670d04071f893deea891a373e1548821 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 28 Apr 2018 01:31:06 +0000
Subject: [PATCH 0638/3370] netbsd: cleanup and musl suppot

---
 pkgs/os-specific/bsd/netbsd/default.nix | 29 ++++++++++++-------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index f9c8653447fe..0cd2b4ffc6e8 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -405,6 +405,7 @@ in rec {
       "-DOXTABS=XTABS"
       "-DRANDOM_MAX=RAND_MAX"
       "-DINFTIM=-1"
+      (if hostPlatform.isMusl then "-include sys/ttydefaults.h -include sys/file.h" else "")
     ];
     postBuild = ''
       mkdir -p $out/usr/games $out/usr/share/games/ching \
@@ -424,21 +425,19 @@ in rec {
     ];
   };
 
-  finger = netBSDDerivation {
-    path = "usr.bin/finger";
-    sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi";
-    version = "7.1.2";
-    extraPaths = [ who.src ];
-    NIX_CFLAGS_COMPILE = [
-      "-DSUPPORT_UTMP"
-      "-USUPPORT_UTMPX"
-    ];
-    patchPhase = ''
-
-      ${who.patchPhase} 
-
-    '';
-  };
+  # finger = netBSDDerivation {
+  #   path = "usr.bin/finger";
+  #   sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi";
+  #   version = "7.1.2";
+  #   extraPaths = [ who.src ];
+  #   NIX_CFLAGS_COMPILE = [
+  #     "-DSUPPORT_UTMP"
+  #     "-USUPPORT_UTMPX"
+  #   ];
+  #   patchPhase = ''
+  #     ${who.patchPhase}
+  #   '';
+  # };
 
   fingerd = netBSDDerivation {
     path = "libexec/fingerd";

From 5f419f3df7f71b9dd88e513fcdd1303a5d5b99dd Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 27 Apr 2018 20:50:15 -0500
Subject: [PATCH 0639/3370] netbsd: improve darwin support

---
 pkgs/os-specific/bsd/netbsd/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 0cd2b4ffc6e8..343b61bab383 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -68,10 +68,10 @@ let
 
     HOST_SH = "${bash}/bin/sh";
 
-    # not using bsd binutils
     SHLIB_WARNTEXTREL = "no";
     SHLIB_MKMAP = "no";
     PRESERVE = "-p";
+    OBJCOPY = if stdenv.isDarwin then "true" else "objcopy";
 
     MACHINE_ARCH = hostPlatform.parsed.cpu.name;
     MACHINE_CPU = hostPlatform.parsed.cpu.name;
@@ -393,7 +393,7 @@ in rec {
         --replace rogue "" \
         --replace sail "" \
         --replace trek "" \
-	--replace dab ""
+        --replace dab ""
       substituteInPlace Makefile.inc \
         --replace 2555 555 \
         --replace 2550 550
@@ -469,6 +469,7 @@ in rec {
     version = "7.1.2";
     sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq";
     buildInputs = [ compat tic nbperf ];
+    MKPIC = if stdenv.isDarwin then "no" else "yes";
     extraPaths = [
       (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3")
     ];
@@ -483,10 +484,11 @@ in rec {
       "-D__scanflike(a,b)="
       "-D__va_list=va_list"
       "-D__warn_references(a,b)="
-    ];
+    ] ++ lib.optional stdenv.isDarwin "-D__strong_alias(a,b)=";
     propagatedBuildInputs = [ compat ];
     MKDOC = "no"; # missing vfontedpr
-    patchPhase = ''
+    MKPIC = if stdenv.isDarwin then "no" else "yes";
+    patchPhase = lib.optionalString (!stdenv.isDarwin) ''
       substituteInPlace printw.c \
         --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \
         --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));'

From e375bd4a9e789105b84eabf61f11b1d55b7131d3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 27 Mar 2018 16:23:21 +0200
Subject: [PATCH 0640/3370] gdk_pixbuf: export moduleDir

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 6bfa6bdc2fb9..069b78f6bcac 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -52,6 +52,9 @@ stdenv.mkDerivation rec {
       packageName = pname;
       attrPath = "gdk_pixbuf";
     };
+
+    # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc
+    moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders";
   };
 
   meta = with stdenv.lib; {

From 3ebb162d902906c2eb65bd4978f9d77a8a841522 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 28 Apr 2018 00:59:26 +0200
Subject: [PATCH 0641/3370] gegl_0_4: init at 0.4.0

---
 pkgs/development/libraries/gegl/4.0.nix | 38 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 +++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/libraries/gegl/4.0.nix

diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
new file mode 100644
index 000000000000..a8e50945c3fd
--- /dev/null
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg, which
+, librsvg, pango, gtk, bzip2, json-glib, intltool, autoreconfHook, libraw
+, libwebp, gnome3, libintl }:
+
+let
+  version = "0.4.0";
+in stdenv.mkDerivation rec {
+  name = "gegl-${version}";
+
+  src = fetchurl {
+    url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
+    sha256 = "1ighk4z8nlqrzyj8w97s140hzj59564l3xv6fpzbr97m1zx2nkfh";
+  };
+
+  # needs fonts otherwise, don't know how to pass them
+  configureFlags = [ "--disable-docs" ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  buildInputs = [
+    libpng cairo libjpeg librsvg pango gtk bzip2
+    libraw libwebp gnome3.gexiv2
+  ];
+
+  propagatedBuildInputs = [ glib json-glib babl ]; # for gegl-4.0.pc
+
+  nativeBuildInputs = [ pkgconfig intltool which autoreconfHook libintl ];
+
+  meta = with stdenv.lib; {
+    description = "Graph-based image processing framework";
+    homepage = http://www.gegl.org;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c1c63060734e..c9513d60db47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8904,6 +8904,10 @@ with pkgs;
     gtk = self.gtk2;
   };
 
+  gegl_0_4 = callPackage ../development/libraries/gegl/4.0.nix {
+    gtk = self.gtk2;
+  };
+
   geoclue = callPackage ../development/libraries/geoclue {};
 
   geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {};

From 59f8b1e844d679d1ae7d2a94cf02f9ca259f0dfa Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 27 Apr 2018 22:44:25 -0400
Subject: [PATCH 0642/3370] nixos docs: Move generated XML in to a specific
 subdirectory to allow easier hacking

---
 nixos/doc/manual/configuration/configuration.xml |  3 +--
 nixos/doc/manual/default.nix                     | 11 ++++++++---
 nixos/doc/manual/man-configuration.xml           |  2 +-
 nixos/doc/manual/manual.xml                      |  4 ++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 8677c13db40f..f092c7e207ff 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -25,9 +25,8 @@ effect after you run <command>nixos-rebuild</command>.</para>
 <xi:include href="networking.xml" />
 <xi:include href="linux-kernel.xml" />
 
-<xi:include href="modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
+<xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
 
 <!-- Apache; libvirtd virtualisation -->
 
 </part>
-
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index ac22712baf87..c396c799c638 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -102,13 +102,18 @@ let
     </section>
   '';
 
+  generatedSources = runCommand "generated-docbook" {} ''
+    mkdir $out
+    ln -s ${modulesDoc} $out/modules.xml
+    ln -s ${optionsDocBook} $out/options-db.xml
+    printf "%s" "${version}" > $out/version
+  '';
+
   copySources =
     ''
       cp -prd $sources/* . # */
+      ln -s ${generatedSources} ./generated
       chmod -R u+w .
-      ln -s ${modulesDoc} configuration/modules.xml
-      ln -s ${optionsDocBook} options-db.xml
-      printf "%s" "${version}" > version
     '';
 
   toc = builtins.toFile "toc.xml"
diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml
index 05531b3909a3..89d321d69726 100644
--- a/nixos/doc/manual/man-configuration.xml
+++ b/nixos/doc/manual/man-configuration.xml
@@ -31,7 +31,7 @@ therein.</para>
 <para>You can use the following options in
 <filename>configuration.nix</filename>.</para>
 
-<xi:include href="options-db.xml" />
+<xi:include href="./generated/options-db.xml" />
 
 </refsection>
 
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 9aa332f026da..a7825579e03d 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -6,7 +6,7 @@
 
   <info>
     <title>NixOS Manual</title>
-    <subtitle>Version <xi:include href="version" parse="text" /></subtitle>
+    <subtitle>Version <xi:include href="./generated/version" parse="text" /></subtitle>
   </info>
 
   <preface>
@@ -39,7 +39,7 @@
 
   <appendix xml:id="ch-options">
     <title>Configuration Options</title>
-    <xi:include href="options-db.xml" />
+    <xi:include href="./generated/options-db.xml" />
   </appendix>
 
   <xi:include href="release-notes/release-notes.xml" />

From 2f893ff53db6e812230e3fe8bf4b1c10f34ccdde Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 07:20:40 +0200
Subject: [PATCH 0643/3370] autoPatchelfHook: Provide a better derivation name

Thanks to @Ericson2314 for the suggestion to provide a name for the hook
script. Comment was posted here:

https://github.com/NixOS/nixpkgs/pull/34506#discussion_r167421856

Very useful if you use some other hooks and autoPatchelfHook so you
don't just get a bunch of "hook" derivations.

Tested by quickly building (not running) teamviewer and masterpdfeditor.

Signed-off-by: aszlig <aszlig@nix.build>
Reported-by: John Ericson <Ericson2314@yahoo.com>
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c060c588e8c..3795cce452a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -80,7 +80,7 @@ with pkgs;
     ../build-support/setup-hooks/autoreconf.sh;
 
   autoPatchelfHook = makeSetupHook
-    { deps = [ file ]; }
+    { name = "auto-patchelf-hook"; deps = [ file ]; }
     ../build-support/setup-hooks/auto-patchelf.sh;
 
   ensureNewerSourcesHook = { year }: makeSetupHook {}

From 1c235abda6446eb787d33feb5eb329d72531ce9c Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sat, 28 Apr 2018 07:58:52 +0200
Subject: [PATCH 0644/3370] elementary-xfce-icon-theme: 2017-11-28 -> 0.11

---
 pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 724f3a066cc8..8a831a630d86 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "elementary-xfce-icon-theme-${version}";
-  version = "2017-11-28";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
-    rev = "b5cc6f044ed24e388ed2fffed1d02f43ce76f5e6";
-    sha256 = "15n28f2pw8b0y5pi8ydahg31v6hhh7zvpvymi8jaafdc9bn18z3y";
+    rev = "elementary-xfce-${version}";
+    sha256 = "1hgbw9wwsgrbrs8lgdhba2m8m1cvqbcy27b87kjws6jsa00f5hx6";
   };
 
   nativeBuildInputs = [ gtk3 hicolor-icon-theme ];

From 0ff0d138e4e9d68853c463a540d61718aa91cffb Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 28 Apr 2018 04:00:55 -0400
Subject: [PATCH 0645/3370] nixos docs: Add a makefile for hacking on the nixos
 docs

---
 nixos/doc/manual/Makefile               | 8 ++++++++
 nixos/doc/manual/default.nix            | 1 +
 nixos/doc/manual/manual.xml             | 3 ++-
 nixos/doc/manual/options-to-docbook.xsl | 8 ++++----
 nixos/release.nix                       | 2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 nixos/doc/manual/Makefile

diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
new file mode 100644
index 000000000000..b15fbaa270fc
--- /dev/null
+++ b/nixos/doc/manual/Makefile
@@ -0,0 +1,8 @@
+debug:
+	nix-shell --packages xmloscopy \
+		--run 'xmloscopy --docbook5 ./manual.xml ./manual-combined.xml'
+
+generated: ./options-to-docbook.xsl
+	nix-build ../../release.nix \
+		--attr manualGeneratedSources.x86_64-linux \
+		--out-link ./generated
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index c396c799c638..2c6309474b37 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -229,6 +229,7 @@ let
     '';
 
 in rec {
+  inherit generatedSources;
 
   # The NixOS options in JSON format.
   optionsJSON = runCommand "options-json"
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index a7825579e03d..676924e5c8b2 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -39,7 +39,8 @@
 
   <appendix xml:id="ch-options">
     <title>Configuration Options</title>
-    <xi:include href="./generated/options-db.xml" />
+    <xi:include href="./generated/options-db.xml"
+                xpointer="configuration-variable-list" />
   </appendix>
 
   <xi:include href="release-notes/release-notes.xml" />
diff --git a/nixos/doc/manual/options-to-docbook.xsl b/nixos/doc/manual/options-to-docbook.xsl
index 7b45b233ab2a..43a69806a2b0 100644
--- a/nixos/doc/manual/options-to-docbook.xsl
+++ b/nixos/doc/manual/options-to-docbook.xsl
@@ -15,9 +15,9 @@
 
 
   <xsl:template match="/expr/list">
-
-      <variablelist>
-
+    <appendix>
+      <title>Configuration Options</title>
+      <variablelist xml:id="configuration-variable-list">
         <xsl:for-each select="attrs">
           <xsl:variable name="id" select="concat('opt-', str:replace(str:replace(str:replace(str:replace(attr[@name = 'name']/string/@value, '*', '_'), '&lt;', '_'), '>', '_'), '?', '_'))" />
           <varlistentry>
@@ -100,7 +100,7 @@
         </xsl:for-each>
 
       </variablelist>
-
+    </appendix>
   </xsl:template>
 
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 2f779280e6b2..4994cd98302f 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -124,7 +124,6 @@ let
         preferLocalBuild = true;
       };
 
-
 in rec {
 
   channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
@@ -132,6 +131,7 @@ in rec {
   manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
   manualEpub = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualEpub));
   manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
+  manualGeneratedSources = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.generatedSources);
   options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
 
 

From a77dc213a7825f5dd13c7989e38d82e64816d881 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 28 Apr 2018 04:04:56 -0400
Subject: [PATCH 0646/3370] nixos manual: update xi:include for
 configuruation.nix's options-db

---
 nixos/doc/manual/man-configuration.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml
index 89d321d69726..37ffb9d648a9 100644
--- a/nixos/doc/manual/man-configuration.xml
+++ b/nixos/doc/manual/man-configuration.xml
@@ -31,7 +31,8 @@ therein.</para>
 <para>You can use the following options in
 <filename>configuration.nix</filename>.</para>
 
-<xi:include href="./generated/options-db.xml" />
+<xi:include href="./generated/options-db.xml"
+            xpointer="configuration-variable-list" />
 
 </refsection>
 

From 74fcb1c770e3a5178a7ee089b3caf406f7bf94bf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 28 Apr 2018 04:15:16 -0400
Subject: [PATCH 0647/3370] nixos docs: include note about make for debugging
 the nixos docs

---
 .../development/writing-documentation.xml     | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml
index 59a287717acb..8b787fae1fe0 100644
--- a/nixos/doc/manual/development/writing-documentation.xml
+++ b/nixos/doc/manual/development/writing-documentation.xml
@@ -18,13 +18,25 @@
 <para>
   The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the
   <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link>
-  subdirectory of the Nixpkgs repository. If you make modifications to
-  the manual, it's important to build it before committing. You can do
-  that as follows:
-
-  <screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen>
+  subdirectory of the Nixpkgs repository.
 </para>
 
+<para>
+  You can quickly validate your edits with <command>make</command>:
+</para>
+
+<screen>
+  $ cd /path/to/nixpkgs/nixos/doc/manual
+  $ make
+</screen>
+
+<para>
+  Once you are done making modifications to the manual, it's important
+  to build it before committing. You can do that as follows:
+</para>
+
+<screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen>
+
 <para>
   When this command successfully finishes, it will tell you where the
   manual got generated. The HTML will be accessible through the

From bf325f1bd7f148a6043add54446f983700dd2c64 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 28 Apr 2018 11:08:42 +0200
Subject: [PATCH 0648/3370] quassel: 0.12.4 -> 0.12.5 (fixes RCE & remote
 crash)

It was found that Quassel could be remotely crashed and had an
unauthenticated RCE vulnerability. The public annoucement can be found
on the oss-sec archive [1]. The bump to 0.12.5 is supposed fixe both issues.

[1] http://seclists.org/oss-sec/2018/q2/77
---
 pkgs/applications/networking/irc/quassel/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/irc/quassel/source.nix b/pkgs/applications/networking/irc/quassel/source.nix
index f3941ee976e4..20daba788997 100644
--- a/pkgs/applications/networking/irc/quassel/source.nix
+++ b/pkgs/applications/networking/irc/quassel/source.nix
@@ -1,9 +1,9 @@
 { fetchurl }:
 
 rec {
-  version = "0.12.4";
+  version = "0.12.5";
   src = fetchurl {
     url = "https://github.com/quassel/quassel/archive/${version}.tar.gz";
-    sha256 = "0q2qlhy1d6glw9pwxgcgwvspd1mkk3yi6m21dx9gnj86bxas2qs2";
+    sha256 = "04f42x87a4wkj3va3wnmj2jl7ikqqa7d7nmypqpqwalzpzk7kxwv";
   };
 }

From dda74d9e50dbd8a412de743a53e9cfd585407342 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 28 Apr 2018 12:48:06 +0300
Subject: [PATCH 0649/3370] nixos/qemu-vm: Always add a virtio RNG device to
 the quest

mke2fs has this annoying property that it uses getrandom() to get random
numbers (for whatever purposes) which blocks until the kernel's secure
RNG has sufficient entropy, which it usually doesn't in the early boot
(except if your CPU supports RDRAND) where we may need to create the
root disk.

So let's give the VM a virtio RNG to avoid the boot getting stuck at
mke2fs.
---
 nixos/modules/virtualisation/qemu-vm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 2b78276fcdea..3d4bd315f812 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -77,6 +77,7 @@ let
           -name ${vmName} \
           -m ${toString config.virtualisation.memorySize} \
           -smp ${toString config.virtualisation.cores} \
+          -device virtio-rng-pci \
           ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \
           -virtfs local,path=/nix/store,security_model=none,mount_tag=store \
           -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \

From 6134887bef5357ccda4d81aef78182217df4c3ed Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 27 Apr 2018 15:52:00 +0200
Subject: [PATCH 0650/3370] mpir: Build with C++ support

This is needed by Alkimia which I'm going to package soon as part of
KMyMoney.

I enabled this by default, because it doesn't increase the closure size
a whole lot (only around 150 KiB):

$ nix-store -q --size /nix/store/...old...-mpir-3.0.0
1223248
$ nix-store -q --size /nix/store/...new...-mpir-3.0.0
1377136

Introducing an option for enabling/disabling this is not worth it,
because it doesn't conflict with anything and the size increase is the
only drawback and we can still make it configurable if we want someday.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @7c6f434c
---
 pkgs/development/libraries/mpir/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix
index cbcf83f1d322..b9b25e7f43b3 100644
--- a/pkgs/development/libraries/mpir/default.nix
+++ b/pkgs/development/libraries/mpir/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1fvmhrqdjs925hzr2i8bszm50h00gwsh17p2kn2pi51zrxck9xjj";
   };
 
+  configureFlags = [ "--enable-cxx" ];
+
   meta = {
     inherit version;
     description = ''A highly optimised library for bignum arithmetic forked from GMP'';

From 5370b8267c94bf5762683746f537c002f0ea3ac6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 01:21:25 +0200
Subject: [PATCH 0651/3370] kdewebkit: Add package expression

This is one of the requirements of KMyMoney and packaging is quite
straightforward with no unexpected traps.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
---
 pkgs/development/libraries/kde-frameworks/default.nix |  1 +
 .../libraries/kde-frameworks/kdewebkit.nix            | 11 +++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kdewebkit.nix

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index f54139836b1d..d780fc30a4c2 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -155,6 +155,7 @@ let
       kded = callPackage ./kded.nix {};
       kdesignerplugin = callPackage ./kdesignerplugin.nix {};
       kdesu = callPackage ./kdesu.nix {};
+      kdewebkit = callPackage ./kdewebkit.nix {};
       kemoticons = callPackage ./kemoticons.nix {};
       kglobalaccel = callPackage ./kglobalaccel.nix {};
       kiconthemes = callPackage ./kiconthemes {};
diff --git a/pkgs/development/libraries/kde-frameworks/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
new file mode 100644
index 000000000000..b7dcfb7fe64c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kdewebkit.nix
@@ -0,0 +1,11 @@
+{ mkDerivation, extra-cmake-modules
+, kconfig, kcoreaddons, kio, kparts, qtwebkit
+}:
+
+mkDerivation {
+  name = "kdewebkit";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kcoreaddons kio kparts ];
+  propagatedBuildInputs = [ qtwebkit ];
+  outputs = [ "out" "dev" ];
+}

From d2b8d8bddc40734b14e9b04039a1ae5415a60b4d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 01:32:32 +0200
Subject: [PATCH 0652/3370] alkimia: init at 7.0.1

This is used by KMyMoney and also the reason why I needed to add C++
support to MPIR in the parent commit.

The reason why I didn't add myself as a maintainer is because I'm not
personally using KMyMoney and thus Alkimia.

Signed-off-by: aszlig <aszlig@nix.build>
---
 .../development/libraries/alkimia/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/alkimia/default.nix

diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
new file mode 100644
index 000000000000..495c5118e742
--- /dev/null
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -0,0 +1,24 @@
+{ mkDerivation, fetchurl, lib
+, extra-cmake-modules, doxygen, graphviz, qtbase, mpir
+}:
+
+mkDerivation rec {
+  name = "alkimia-${version}";
+  version = "7.0.1";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/alkimia/${version}/src/${name}.tar.xz";
+    sha256 = "1fri76465058fgsyrmdrc3hj1javz4g10mfzqp5rsj7qncjr1i22";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules doxygen graphviz ];
+
+  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ mpir ];
+
+  meta = {
+    description = "Library used by KDE finance applications";
+    license = lib.licenses.lgpl21Plus;
+    platforms = qtbase.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3795cce452a9..213bdcc784ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11181,6 +11181,8 @@ with pkgs;
 
     accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
+    alkimia = callPackage ../development/libraries/alkimia { };
+
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
 
     qgpgme = callPackage ../development/libraries/gpgme { };

From 93042b7376139fca94e1223a7a5803399806ef61 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 02:21:22 +0200
Subject: [PATCH 0653/3370] kmymoney: init at 5.0.1

I tried to use -DENABLE_SQLCIPHER and also passed the right directories
to the Qt 5 source of the QSQLiteDriver but CMake then failed to run
qt4_automoc, by which I'd imply that SQLCipher is not maintained
anymore (after all KMyMoney using qgpgme as well, which doesn't require
sources).

Another odd thing is that CMake reports that the weboob plugin is
disabled, but after inspecting it turns out that the reporting is just
wrong. This is already fixed upstream but not yet released in
KDE/kmymoney@8b086cf921879770971e9331f005339bfacdc84c.

In addition of running the upstream test suite I have manually tested a
few things in a VM by using the following Nix expression:

  (import <nixpkgs/nixos> {
    configuration = { pkgs, ... }: {
      environment.systemPackages = with pkgs; [
        kmymoney aqbanking gwenhywfar libchipcard python2Packages.weboob
        kgpg
      ];
      users.users.test.isNormalUser = true;
      virtualisation.diskSize = 4096;
      virtualisation.memorySize = 2048;
      services.xserver = {
        enable = true;
        inherit ((import <nixpkgs/nixos> {}).config.services.xserver) layout;
        displayManager.sddm.enable = true;
        displayManager.sddm.autoLogin.enable = true;
        displayManager.sddm.autoLogin.user = "test";
        desktopManager.default = "plasma5";
        desktopManager.plasma5.enable = true;
      };
    };
  }).vm

The things I have tested in particular are:

  * Basic startup
  * Completing the wizard
  * Add some test transactions
  * GPG encryption
  * Generation of charts and reports
  * Rough check whether OFX integration lists supported financial
    institutions.
  * Small check of AqBanking implementation, whether accounts and users
    can be configured, but didn't test actual connectivity with a
    financial institution.
  * Check of Weboob integration with a test PayPal backend, however also
    just with a dummy account and without actually connecting to PayPal.

One of the upstream tests "reports-chart-test" seems to fail even though
generating charts and reports are working when testing manually. It also
seems that this is the case on other distributions, for example Gentoo
has disabled that test as well:

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5169cec68fa6fd67841

Note that I didn't add myself as a maintainer because I'm not personally
using KMyMoney but just packaged it for someone else. I hope this is
useful for other people, so that maybe someday[TM] there will be a
proper maintainer.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel
---
 pkgs/applications/office/kmymoney/default.nix | 70 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 2 files changed, 75 insertions(+)
 create mode 100644 pkgs/applications/office/kmymoney/default.nix

diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
new file mode 100644
index 000000000000..212aaa5fa2c4
--- /dev/null
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools
+
+, akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive
+, kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement
+, kitemmodels, libical, libofx, qgpgme
+
+# Needed for running tests:
+, qtbase, xvfb_run
+
+# For weboob, which only supports Python 2.x:
+, python2Packages
+}:
+
+stdenv.mkDerivation rec {
+  name = "kmymoney-${version}";
+  version = "5.0.1";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
+    sha256 = "1c9apnvc07y17pzy4vygry1dai5ass2z7j354lrcppa85b18yvnx";
+  };
+
+  # Hidden dependency that wasn't included in CMakeLists.txt:
+  NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5";
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    doxygen extra-cmake-modules graphviz kdoctools python2Packages.wrapPython
+  ];
+
+  buildInputs = [
+    akonadi alkimia aqbanking gmp gwenhywfar kactivities karchive kcmutils
+    kcontacts kdewebkit kdiagram kholidays kidentitymanagement kitemmodels
+    libical libofx qgpgme
+
+    # Put it into buildInputs so that CMake can find it, even though we patch
+    # it into the interface later.
+    python2Packages.weboob
+  ];
+
+  weboobPythonPath = [ python2Packages.weboob ];
+
+  postInstall = ''
+    buildPythonPath "$weboobPythonPath"
+    patchPythonScript "$out/share/kmymoney/weboob/kmymoneyweboob.py"
+
+    # Within the embedded Python interpreter, sys.argv is unavailable, so let's
+    # assign it to a dummy value so that the assignment of sys.argv[0] injected
+    # by patchPythonScript doesn't fail:
+    sed -i -e '1i import sys; sys.argv = [""]' \
+      "$out/share/kmymoney/weboob/kmymoneyweboob.py"
+  '';
+
+  doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+  installCheckPhase = let
+    pluginPath = "${qtbase.bin}/${qtbase.qtPluginPrefix}";
+  in lib.optionalString doInstallCheck ''
+    QT_PLUGIN_PATH=${lib.escapeShellArg pluginPath} CTEST_OUTPUT_ON_FAILURE=1 \
+      ${xvfb_run}/bin/xvfb-run -s '-screen 0 1024x768x24' make test \
+      ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
+  '';
+
+  meta = {
+    description = "Personal finance manager for KDE";
+    homepage = https://kmymoney.org/;
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 213bdcc784ea..329c6fb81056 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16476,6 +16476,11 @@ with pkgs;
 
   kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
 
+  kmymoney = libsForQt5.callPackage ../applications/office/kmymoney {
+    inherit (kdeApplications) kidentitymanagement;
+    inherit (kdeFrameworks) kdewebkit;
+  };
+
   kodestudio = callPackage ../applications/editors/kodestudio { };
 
   konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { };

From 9e883426417b5f249a45a3cdb9fdbbd6625f8e08 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 13:53:07 +0200
Subject: [PATCH 0654/3370] alkimia: Add meta.longDescription

@7c6f434c wrote in [1]:

   Maybe copy-paste the upstream "Alkimia is the infrastructure for
   common storage and business logic that will be used by all financial
   applications in KDE. The target is to share financial related
   information over application bounderies." as longDescription for
   Alkimia? The current description makes me want to look up the
   homepage to find out what it actually is (then I do, and despair).

[1]: https://github.com/NixOS/nixpkgs/pull/39647#issuecomment-385169261

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/development/libraries/alkimia/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/alkimia/default.nix b/pkgs/development/libraries/alkimia/default.nix
index 495c5118e742..6f4fd09015e5 100644
--- a/pkgs/development/libraries/alkimia/default.nix
+++ b/pkgs/development/libraries/alkimia/default.nix
@@ -18,6 +18,13 @@ mkDerivation rec {
 
   meta = {
     description = "Library used by KDE finance applications";
+    longDescription = ''
+      Alkimia is the infrastructure for common storage and business
+      logic that will be used by all financial applications in KDE.
+
+      The target is to share financial related information over
+      application bounderies.
+    '';
     license = lib.licenses.lgpl21Plus;
     platforms = qtbase.meta.platforms;
   };

From ea5787ad5291ee1c131326cb9c9fec03d359edff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 28 Apr 2018 13:02:20 +0100
Subject: [PATCH 0655/3370] cups-kyodialog3: use autoPatchelfHook, add missing
 qt4

---
 pkgs/misc/cups/drivers/kyodialog3/default.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/misc/cups/drivers/kyodialog3/default.nix b/pkgs/misc/cups/drivers/kyodialog3/default.nix
index bc48b2c8f339..073bd4ccbbfc 100644
--- a/pkgs/misc/cups/drivers/kyodialog3/default.nix
+++ b/pkgs/misc/cups/drivers/kyodialog3/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, fetchzip, cups
+{ stdenv, lib, fetchzip, cups, autoPatchelfHook
 
   # Can either be "EU" or "Global"; it's unclear what the difference is
-  , region ? "Global"
+  , region ? "Global", qt4
 }:
 
 let
@@ -9,19 +9,15 @@ let
     if stdenv.system == "x86_64-linux" then "64bit"
     else if stdenv.system == "i686-linux" then "32bit"
          else throw "Unsupported system: ${stdenv.system}";
-  debPlatform = 
+  debPlatform =
     if platform == "64bit" then "amd64"
     else "i386";
   debRegion = if region == "EU" then "EU." else "";
-
-  # TODO: add Qt4 for kyodialog3 application
-  libPath = lib.makeLibraryPath [ cups ];
 in
 stdenv.mkDerivation rec {
   name = "cups-kyodialog3-${version}";
   version = "8.1601";
 
-  dontPatchELF = true;
   dontStrip = true;
 
   src = fetchzip {
@@ -29,6 +25,10 @@ stdenv.mkDerivation rec {
     sha256 = "11znnlkfssakml7w80gxlz1k59f3nvhph91fkzzadnm9i7a8yjal";
   };
 
+  nativeBuildInputs = [ autoPatchelfHook ];
+
+  buildInputs = [ cups qt4 ];
+
   installPhase = ''
     mkdir -p $out
     cd $out
@@ -49,9 +49,6 @@ stdenv.mkDerivation rec {
     # prepend $out to all references in ppd and desktop files
     find -name "*.ppd" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \;
     find -name "*.desktop" -exec sed -E -i "s:/usr/lib:$out/lib:g" {} \;
-
-    # patchELF all executables
-    find -type f -executable -exec patchelf --set-rpath ${libPath} --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \;
   '';
 
   meta = with lib; {
@@ -61,5 +58,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.steveej ];
     platforms = platforms.linux;
   };
-
 }

From 1f34893553398a9c83140958fbe6e656acd785db Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 28 Apr 2018 13:08:52 +0100
Subject: [PATCH 0656/3370] hyena: fix hyena & pdfmod builds on higher versions
 of mono

Helps with #36711
---
 pkgs/development/libraries/hyena/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix
index edd35bd27e44..f99aa0b6f0cf 100644
--- a/pkgs/development/libraries/hyena/default.nix
+++ b/pkgs/development/libraries/hyena/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs build/dll-map-makefile-verifier
     patchShebangs build/private-icon-theme-installer
+    substituteInPlace configure --replace lib/mono/2.0/ lib/mono/2.0-api/
     find -name Makefile.in | xargs -n 1 -d '\n' sed -e 's/^dnl/#/' -i
   '';
 

From 9f2b67d89b10b2f5375e77c976990f87c869d6fd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Apr 2018 20:27:10 +0200
Subject: [PATCH 0657/3370] Revert ".version: remove final newline"

This reverts commit e109784f84d44cc73abeaa6c96c5a5d5bf9e3e06.
---
 .editorconfig | 4 ----
 .version      | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index f5df33889e6b..7b40ff1ff568 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -26,7 +26,3 @@ indent_size = 4
 # Match diffs, avoid to trim trailing whitespace
 [*.{diff,patch}]
 trim_trailing_whitespace = false
-
-# https://github.com/NixOS/nixpkgs/pull/39336#discussion_r183387754
-[.version]
-insert_final_newline = false
diff --git a/.version b/.version
index c1b80a502792..770bde1f44b3 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-18.09
\ No newline at end of file
+18.09

From f66cdc71a3300581501fd953f8e359b7ff824933 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Apr 2018 20:30:12 +0200
Subject: [PATCH 0658/3370] osquery: use `stdenv.lib.nixpkgsVersion`

This way easier to understand and the officially recommended approach.

/cc @dezgeg @fpletz
---
 pkgs/tools/system/osquery/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index 2a719efd79b3..b88186a610bf 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   # this is what `osquery --help` will show as the version.
   OSQUERY_BUILD_VERSION = version;
-  OSQUERY_PLATFORM = "nixos;${builtins.readFile "${toString path}/.version"}";
+  OSQUERY_PLATFORM = "nixos;${stdenv.lib.nixpkgsVersion}";
 
   src = fetchFromGitHub {
     owner = "facebook";

From 39909289f452fcd60127cbd2372f22ac35f25d08 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 24 Apr 2018 20:33:35 +0200
Subject: [PATCH 0659/3370] lib: deduplicate version/suffix references

The logic regarding the generated `.version-suffix` file is already
defined in `lib/trivial.nix` and shouldn't be duplicated in
`nixos/version`.
---
 lib/trivial.nix                | 9 +++++----
 nixos/modules/misc/version.nix | 6 ++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index a928e1dbca98..a6a4abba1189 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -58,11 +58,12 @@ rec {
 
   inherit (lib.strings) fileContents;
 
+  version = fileContents ../.version;
+  suffix = let suffixFile = ../.version-suffix; in
+    if pathExists suffixFile then fileContents suffixFile else "pre-git";
+
   # Return the Nixpkgs version number.
-  nixpkgsVersion =
-    let suffixFile = ../.version-suffix; in
-    fileContents ../.version
-    + (if pathExists suffixFile then fileContents suffixFile else "pre-git");
+  nixpkgsVersion = version + suffix;
 
   # Whether we're being called by nix-shell.
   inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index b8f0a223c910..d9d60b725093 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -5,8 +5,6 @@ with lib;
 let
   cfg = config.system.nixos;
 
-  releaseFile  = "${toString pkgs.path}/.version";
-  suffixFile   = "${toString pkgs.path}/.version-suffix";
   revisionFile = "${toString pkgs.path}/.git-revision";
   gitRepo      = "${toString pkgs.path}/.git";
   gitCommitId  = lib.substring 0 7 (commitIdFromGitRepo gitRepo);
@@ -25,14 +23,14 @@ in
     nixos.release = mkOption {
       readOnly = true;
       type = types.str;
-      default = fileContents releaseFile;
+      default = trivial.version;
       description = "The NixOS release (e.g. <literal>16.03</literal>).";
     };
 
     nixos.versionSuffix = mkOption {
       internal = true;
       type = types.str;
-      default = if pathExists suffixFile then fileContents suffixFile else "pre-git";
+      default = trivial.suffix;
       description = "The NixOS version suffix (e.g. <literal>1160.f2d4ee1</literal>).";
     };
 

From 9274ea390348e17f766732e7fbd335e3bc164954 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 26 Apr 2018 10:31:05 +0200
Subject: [PATCH 0660/3370] treewide: rename version attributes

As suggested in https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745
the versioning attributes in `lib` should be consistent to
`nixos/version` which implicates the following changes:

* `lib.trivial.version` -> `lib.trivial.release`
* `lib.trivial.suffix` -> `lib.trivial.versionSuffix`
* `lib.nixpkgsVersion` -> `lib.version`

As `lib.nixpkgsVersion` is referenced several times in `NixOS/nixpkgs`,
`NixOS/nix` and probably several user's setups. As the rename will cause
a notable impact it's better to keep `lib.nixpkgsVersion` as alias with
a warning yielded by `builtins.trace`.
---
 doc/Makefile                                 | 2 +-
 doc/default.nix                              | 2 +-
 lib/default.nix                              | 2 +-
 lib/trivial.nix                              | 8 +++++---
 nixos/doc/manual/release-notes/rl-1809.xml   | 5 +++++
 nixos/maintainers/scripts/ec2/create-amis.sh | 2 +-
 nixos/modules/misc/version.nix               | 4 ++--
 pkgs/tools/system/osquery/default.nix        | 2 +-
 8 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 0ddae8631f3c..952ef4bfcbb9 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -64,7 +64,7 @@ manual-full.xml: ${MD_TARGETS} .version *.xml
 
 .version:
 	nix-instantiate --eval \
-		-E '(import ../lib).nixpkgsVersion' > .version
+		-E '(import ../lib).version' > .version
 
 %.section.xml: %.section.md
 	pandoc $^ -w docbook+smart \
diff --git a/doc/default.nix b/doc/default.nix
index 8abde58bb114..e5be364506ff 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -30,7 +30,7 @@ pkgs.stdenv.mkDerivation {
   ];
 
   postPatch = ''
-    echo ${lib.nixpkgsVersion} > .version
+    echo ${lib.version} > .version
   '';
 
   installPhase = ''
diff --git a/lib/default.nix b/lib/default.nix
index b3c4fdc0e59a..60ce01a93cd2 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -58,7 +58,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 version mod compare splitByAndCompare
       functionArgs setFunctionArgs isFunction;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
diff --git a/lib/trivial.nix b/lib/trivial.nix
index a6a4abba1189..251cb796db0e 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -58,12 +58,14 @@ rec {
 
   inherit (lib.strings) fileContents;
 
-  version = fileContents ../.version;
-  suffix = let suffixFile = ../.version-suffix; in
+  release = fileContents ../.version;
+  versionSuffix = let suffixFile = ../.version-suffix; in
     if pathExists suffixFile then fileContents suffixFile else "pre-git";
 
   # Return the Nixpkgs version number.
-  nixpkgsVersion = version + suffix;
+  version = release + versionSuffix;
+
+  nixpkgsVersion = builtins.trace "`lib.nixpkgsVersion` is deprecated, use `lib.version` instead!" version;
 
   # Whether we're being called by nix-shell.
   inNixShell = builtins.getEnv "IN_NIX_SHELL" != "";
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 2e53f0563baf..949dbf0e0c1e 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -123,6 +123,11 @@ following incompatible changes:</para>
       <literal>lib.traceCallXml</literal> has been deprecated. Please complain
       if you use the function regularly.
     </para>
+    <para>
+      The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in favor of
+      <literal>lib.version</literal>. Please refer to the discussion in
+      <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link> for further reference.
+    </para>
   </listitem>
 </itemizedlist>
 
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 347e6b9c6e0d..9461144fad5a 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -6,7 +6,7 @@
 set -e
 set -o pipefail
 
-version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g)
+version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.version | sed s/'"'//g)
 major=${version:0:5}
 echo "NixOS version is $version ($major)"
 
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index d9d60b725093..74c86443ab90 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -23,14 +23,14 @@ in
     nixos.release = mkOption {
       readOnly = true;
       type = types.str;
-      default = trivial.version;
+      default = trivial.release;
       description = "The NixOS release (e.g. <literal>16.03</literal>).";
     };
 
     nixos.versionSuffix = mkOption {
       internal = true;
       type = types.str;
-      default = trivial.suffix;
+      default = trivial.versionSuffix;
       description = "The NixOS version suffix (e.g. <literal>1160.f2d4ee1</literal>).";
     };
 
diff --git a/pkgs/tools/system/osquery/default.nix b/pkgs/tools/system/osquery/default.nix
index b88186a610bf..a0aaa846bc73 100644
--- a/pkgs/tools/system/osquery/default.nix
+++ b/pkgs/tools/system/osquery/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   # this is what `osquery --help` will show as the version.
   OSQUERY_BUILD_VERSION = version;
-  OSQUERY_PLATFORM = "nixos;${stdenv.lib.nixpkgsVersion}";
+  OSQUERY_PLATFORM = "nixos;${stdenv.lib.version}";
 
   src = fetchFromGitHub {
     owner = "facebook";

From ba1b2ef24386d306409cbf3f95a4a57f796bc3ba Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sat, 28 Apr 2018 15:22:48 +0200
Subject: [PATCH 0661/3370] makemkv: 1.10.8 -> 1.12.2, switch from qt4 to qt5

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

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index a4b08e1ce47c..acc9c88d2ffe 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -1,26 +1,26 @@
 { stdenv, fetchurl
-, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav
+, openssl, qt5, libGLU_combined, zlib, pkgconfig, libav
 }:
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.10.8";
+  ver = "1.12.2";
   builder = ./builder.sh;
 
   src_bin = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
-    sha256 = "b7861aa7b03203f50d2ce3130f805c4b0406d13aec597648050349fa8b084b29";
+    sha256 = "0ylybq0776am5yy064b55q0jja1q1p9dscwmn7f1p3igzv15rypj";
   };
 
   src_oss = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
-    sha256 = "d17cfd916a9bdda35b1065bce86a48a987caf9ffb4d6861609458f9f312603c7";
+    sha256 = "063rgb88zbh4zwysyhjn4awykcnc90qgsx6d8ggm27wy849306v1";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [openssl qt4 libGLU_combined zlib libav];
+  buildInputs = [openssl qt5.qtbase libGLU_combined zlib libav];
 
-  libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ]
+  libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt5.qtbase zlib ]
           + ":" + stdenv.cc.cc + "/lib64";
 
   meta = with stdenv.lib; {

From f8d0c9e3c3b92f8af058b742eb7553d53c3502a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 26 Apr 2018 02:31:07 +0200
Subject: [PATCH 0662/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/bb8ed19628062fa0afd844771b20ee50a49a1721.
---
 .../haskell-modules/hackage-packages.nix      | 1269 +++++++++++++----
 1 file changed, 1019 insertions(+), 250 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8d25c173d75a..8b035359730b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6110,14 +6110,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "GLFW-b_1_4_8_4" = callPackage
+  "GLFW-b_3_2_1_0" = callPackage
     ({ mkDerivation, base, bindings-GLFW, deepseq, HUnit
      , test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "GLFW-b";
-       version = "1.4.8.4";
-       sha256 = "1xww650q80ii9f80v9kpz56lwgd1cirvhqjdca1vq9xs8k30hfd0";
+       version = "3.2.1.0";
+       sha256 = "19mngkprzlm322pfyljvm4lyk1j7j8ss50m5kzzmkwk3mph25h1i";
        libraryHaskellDepends = [ base bindings-GLFW deepseq ];
        testHaskellDepends = [
          base bindings-GLFW deepseq HUnit test-framework
@@ -9534,16 +9534,18 @@ self: {
      }) {};
 
   "Hastodon" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-client, http-conduit
-     , http-types, mime-types, MissingH, text
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+     , exceptions, http-client, http-conduit, http-types, mime-types
+     , MissingH, resourcet, text, transformers
      }:
      mkDerivation {
        pname = "Hastodon";
-       version = "0.3.2";
-       sha256 = "0qdq23mg1nszsf3ldbdawdkcmbv18cmny6529k9kwlfq9fhdm83x";
+       version = "0.4.0";
+       sha256 = "00zq3kzzazqlgbh45xc6py3m23x448af34d4y3z903by79fid79f";
        libraryHaskellDepends = [
-         aeson base bytestring http-client http-conduit http-types
-         mime-types MissingH text
+         aeson attoparsec base bytestring conduit exceptions http-client
+         http-conduit http-types mime-types MissingH resourcet text
+         transformers
        ];
        homepage = "https://github.com/syucream/hastodon";
        description = "mastodon client module for Haskell";
@@ -14039,14 +14041,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
-  "OpenGLRaw_3_3_0_0" = callPackage
+  "OpenGLRaw_3_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, fixed, half, libGL
      , text, transformers
      }:
      mkDerivation {
        pname = "OpenGLRaw";
-       version = "3.3.0.0";
-       sha256 = "145j4fa4vs7x5r6x5i0733qc9aw27ggzax3xpjc7pmibmrkri20p";
+       version = "3.3.0.1";
+       sha256 = "0jzipa8avnrsw2via8ks012illwg2in27l01y1bp35ci0w2f92fq";
        libraryHaskellDepends = [
          base bytestring containers fixed half text transformers
        ];
@@ -16596,7 +16598,7 @@ self: {
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
+     }) {inherit (pkgs) glib; mono = null;};
 
   "Saturnin" = callPackage
     ({ mkDerivation, base, bytestring, data-default, directory, either
@@ -21062,6 +21064,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "access-token-provider" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
+     , bytestring, containers, exceptions, filepath, http-client
+     , http-client-tls, http-types, katip, lens, lens-aeson, mtl, random
+     , safe-exceptions, stm, tasty, tasty-hunit, text, th-format
+     , transformers, unliftio, unliftio-core, uuid
+     }:
+     mkDerivation {
+       pname = "access-token-provider";
+       version = "0.1.0.0";
+       sha256 = "03832v0aab3imqim8f6g1r0jj2pfrrca45qnvpkw7ry7krbq5z7q";
+       libraryHaskellDepends = [
+         aeson aeson-casing base base64-bytestring bytestring containers
+         exceptions filepath http-client http-client-tls http-types katip
+         lens lens-aeson mtl random safe-exceptions stm text th-format
+         transformers unliftio unliftio-core
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers exceptions http-client http-types
+         katip lens mtl random safe-exceptions tasty tasty-hunit text
+         th-format unliftio unliftio-core uuid
+       ];
+       homepage = "https://github.com/mtesseract/access-token-provider#readme";
+       description = "Provides Access Token for Services";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "accuerr" = callPackage
     ({ mkDerivation, base, bifunctors, lens, semigroups }:
      mkDerivation {
@@ -30397,8 +30426,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.2.0.25";
-       sha256 = "0p5pg2ix0ppan0cz4b0pk16ihfcnvqwb8g93k4bh7d304ca5xdk4";
+       version = "0.2.0.26";
+       sha256 = "14s8bic1kvsigmi5nmjdca6pkh223axygr74nmygjbvwmryfxcxn";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -32479,6 +32508,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "backprop_0_1_5_2" = callPackage
+    ({ mkDerivation, base, bifunctors, binary, criterion, deepseq
+     , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
+     , primitive, random, reflection, time, transformers
+     , type-combinators, vector
+     }:
+     mkDerivation {
+       pname = "backprop";
+       version = "0.1.5.2";
+       sha256 = "1mb99dwpng07vsaa3vhl6b0kn8ym6qz7i9a0gyj8hafxawbrznfh";
+       libraryHaskellDepends = [
+         base binary deepseq microlens primitive random reflection
+         transformers type-combinators vector
+       ];
+       benchmarkHaskellDepends = [
+         base bifunctors criterion deepseq directory hmatrix lens mnist-idx
+         mwc-random time transformers vector
+       ];
+       homepage = "https://github.com/mstksg/backprop#readme";
+       description = "Heterogeneous automatic differentation (backpropagation)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "backtracking-exceptions" = callPackage
     ({ mkDerivation, base, either, free, kan-extensions, mtl
      , semigroupoids, semigroups, transformers
@@ -33510,8 +33563,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.1";
-       sha256 = "1zjjmz36lxxrxgx449212q878mzavjpwx5jad0lk9ninpas16h5v";
+       version = "0.1.0.2";
+       sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -33790,6 +33843,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "beam-core_0_7_2_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, dlist, free
+     , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty
+     , tasty-hunit, text, time, vector-sized
+     }:
+     mkDerivation {
+       pname = "beam-core";
+       version = "0.7.2.1";
+       sha256 = "0v9mspr3r7g5n73pgdwipgx2z23cd5g537g8afd1hj22p7d993jw";
+       libraryHaskellDepends = [
+         aeson base bytestring containers dlist free ghc-prim hashable
+         microlens mtl network-uri tagged text time vector-sized
+       ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hunit text time
+       ];
+       homepage = "http://travis.athougies.net/projects/beam.html";
+       description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "beam-migrate" = callPackage
     ({ mkDerivation, aeson, base, beam-core, bytestring, containers
      , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable
@@ -37079,10 +37154,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, criterion, QuickCheck }:
      mkDerivation {
        pname = "bitwise";
-       version = "0.1.1.1";
-       sha256 = "11llsq03f7nlqdgzr2al71l01r3gbc8xfvrskx5ix3lc20aldq6d";
-       revision = "2";
-       editedCabalFile = "1dqddxjf4kpb16k51z40qlnl0shw6gmpf1c1ckdn4q8jm61bmlgn";
+       version = "1.0.0.1";
+       sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
@@ -40244,6 +40317,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bv-little_0_1_1" = callPackage
+    ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp
+     , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "bv-little";
+       version = "0.1.1";
+       sha256 = "153bd5y55scp6qd9q7vnkhp8zwj3qssyr4qy8wpfj8k9xp8xdrk8";
+       libraryHaskellDepends = [
+         base deepseq hashable integer-gmp mono-traversable primitive
+         QuickCheck
+       ];
+       testHaskellDepends = [
+         base deepseq hashable mono-traversable QuickCheck tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq hashable ];
+       homepage = "https://github.com/recursion-ninja/bv-little";
+       description = "Efficient little-endian bit vector library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bv-sized" = callPackage
     ({ mkDerivation, base, containers, lens, mtl, parameterized-utils
      , prettyclass, QuickCheck, random
@@ -43950,11 +44047,11 @@ self: {
      }:
      mkDerivation {
        pname = "cautious";
-       version = "0.0.0.0";
-       sha256 = "0kr9aipbi95hz97lbidifsfm51rsjlpjgkbvnyiwrh1cckh6q0zw";
+       version = "0.1.0.0";
+       sha256 = "054n9vy4h4qs208gfi7ryvb40y50pmaxcrslxplk95vg0pvg4k1w";
        libraryHaskellDepends = [
-         aeson base genvalidity-hspec-aeson hspec hspec-discover QuickCheck
-         transformers validity
+         aeson base genvalidity genvalidity-hspec-aeson hspec hspec-discover
+         QuickCheck transformers validity
        ];
        testHaskellDepends = [
          aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson
@@ -46113,6 +46210,36 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cisco-spark-api_0_1_0_3" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
+     , bytestring, conduit, data-default, hspec, http-conduit
+     , http-types, network-uri, optparse-applicative, text, utf8-string
+     , wai, warp
+     }:
+     mkDerivation {
+       pname = "cisco-spark-api";
+       version = "0.1.0.3";
+       sha256 = "1fi8cadjszb92yih5ilagay8c9fj4aiwdx2qx1pwdc756jgjm5ky";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bitset-word8 bytestring conduit data-default
+         http-conduit network-uri text
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit data-default http-conduit
+         optparse-applicative text utf8-string
+       ];
+       testHaskellDepends = [
+         aeson async attoparsec base bytestring conduit data-default hspec
+         http-conduit http-types network-uri text wai warp
+       ];
+       homepage = "https://github.com/nshimaza/webex-teams-api#readme";
+       description = "A Haskell bindings for Webex Teams API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "citation-resolve" = callPackage
     ({ mkDerivation, aeson, base, bytestring, citeproc-hs, containers
      , curl, data-default, directory, doctest, download-curl, either
@@ -47279,8 +47406,8 @@ self: {
      }:
      mkDerivation {
        pname = "clifm";
-       version = "0.3.1.0";
-       sha256 = "17kd2cfxc9dswlqv141f2anc0g19xhj9w5mk3xicx7vyr6j43y0y";
+       version = "0.4.1.0";
+       sha256 = "0q0m662sg4n2k9lgx82d72gi16widm74a7j08psnjmwhk55ir3cb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -47681,7 +47808,7 @@ self: {
        homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host";
        description = "Hosting the Common Language Runtime";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
+     }) {inherit (pkgs) glib; mono = null;};
 
   "clr-inline" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, case-insensitive
@@ -50120,12 +50247,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "composition-prelude_1_4_0_1" = callPackage
+  "composition-prelude_1_4_0_3" = callPackage
     ({ mkDerivation, base, cpphs }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.4.0.1";
-       sha256 = "172fnixh4jgmwfsaxg0fyji0i745pbjwk00l3yh5pwng9swzi6ik";
+       version = "1.4.0.3";
+       sha256 = "0vzd71yqnbx5pk4yvan1sbjdgg3b7k476jiyr36pjyi1ysdm13qj";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
        homepage = "https://github.com/vmchale/composition-prelude#readme";
@@ -54102,8 +54229,8 @@ self: {
      }:
      mkDerivation {
        pname = "crc";
-       version = "0.0.1.1";
-       sha256 = "1swn00ksnqkqfjh1q9ck8zd5y9vb2yaf7rsxyy9i47d8p93m5g74";
+       version = "0.1.0.0";
+       sha256 = "0cvyzw1c63s1cbs9ypa5xxj7kjl57v0ggkxsxncnl7sqlkpn6s74";
        libraryHaskellDepends = [ base bytestring vector ];
        testHaskellDepends = [
          base bytestring conduit conduit-extra resourcet tasty tasty-golden
@@ -54806,6 +54933,8 @@ self: {
        pname = "crypto-enigma";
        version = "0.0.2.11";
        sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1";
+       revision = "1";
+       editedCabalFile = "1wh09ma0xr8lgj0a2ybp6kxisi36cl2kiqz2akhy915v6gpkjkyz";
        libraryHaskellDepends = [ base containers MissingH mtl split ];
        testHaskellDepends = [ base HUnit QuickCheck ];
        homepage = "https://github.com/orome/crypto-enigma-hs";
@@ -54813,6 +54942,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crypto-enigma_0_0_2_12" = callPackage
+    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
+     , split
+     }:
+     mkDerivation {
+       pname = "crypto-enigma";
+       version = "0.0.2.12";
+       sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b";
+       libraryHaskellDepends = [ base containers MissingH mtl split ];
+       testHaskellDepends = [ base HUnit QuickCheck ];
+       homepage = "https://github.com/orome/crypto-enigma-hs";
+       description = "An Enigma machine simulator with display";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "crypto-multihash" = callPackage
     ({ mkDerivation, base, base58-bytestring, bytestring, containers
      , cryptonite, hspec, memory, QuickCheck, string-conversions
@@ -55473,8 +55618,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.7.1";
-       sha256 = "117ih5cssflaa7mvg4a4vz5sfsylivb8n0ri90211pml3d5idwpf";
+       version = "0.7.2";
+       sha256 = "0c16h2m8zkpyjbclvqpd8kq46ciw6qwc94d6v2d66c3g0ixx53vx";
        libraryHaskellDepends = [
          base csound-expression csound-sampler sharc-timbre transformers
        ];
@@ -55491,8 +55636,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "5.3.1";
-       sha256 = "0fwzsmb9syk144d445cw1d9pjx3vn18pxi161yafv2q7q4m57i3g";
+       version = "5.3.2";
+       sha256 = "1v3ssy2rfgwz9wwv8kmaifyrphyl5w66p9zmrg1bi0vbzwxnr57q";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -55509,8 +55654,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-dynamic";
-       version = "0.3.2";
-       sha256 = "1h827ijkwa5fyg1jphaa19fr4wxs5l76m89xl44989jnb7blbkcd";
+       version = "0.3.3";
+       sha256 = "0k4pk96cx2f6rhz18mrdkkz7ic2fdzpqkxf1x596990az7pjg7g3";
        libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          hashable transformers wl-pprint
@@ -55543,8 +55688,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.2.1.0";
-       sha256 = "0w591ij97i1kkv2z5fix8zlvw9shagxq6lpkic71ldpvv1a4cf8q";
+       version = "0.2.2.0";
+       sha256 = "19cplqpyd7vhn28z0k8mxmscja05w9xb8q4bbvq5qd0h8liqxsqg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
@@ -55560,8 +55705,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.8.1";
-       sha256 = "15k5in43w4ivkzi6qs5z19fh3pd2fg5ih1dyd1vk736lawlivx20";
+       version = "0.0.9.0";
+       sha256 = "0vvsqbnd1yjwijz4g0y9av6d20m73b5swln4v7gna3jd16mrg2k1";
        libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -66066,8 +66211,8 @@ self: {
      }:
      mkDerivation {
        pname = "dtab";
-       version = "1.0.0.1";
-       sha256 = "0sg0pf8nsy4fdx8gqpqv6k29v01gz4bq5y1id28v9j8rj0mgv5nn";
+       version = "1.1";
+       sha256 = "18h4876saf2f8k052qf76j5w89x7nay12nlf7hc5dkwf4c9y5hq9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66077,7 +66222,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
-       license = "GPL";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -66376,6 +66521,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "duration" = callPackage
+    ({ mkDerivation, base, doctest, hspec, parsec, template-haskell
+     , time
+     }:
+     mkDerivation {
+       pname = "duration";
+       version = "0.1.0.0";
+       sha256 = "18qjn97njhra7brps58rl44vyc0hmfc83prgm519q7dyf3159cd0";
+       libraryHaskellDepends = [ base parsec template-haskell time ];
+       testHaskellDepends = [
+         base doctest hspec parsec template-haskell time
+       ];
+       homepage = "https://github.com/ryota-ka/duration#readme";
+       description = "A tiny compile-time time utility library inspired by zeit/ms";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dustme" = callPackage
     ({ mkDerivation, ansi-terminal, ansi-wl-pprint, async, attoparsec
      , base, bytestring, containers, deepseq, extra, hashable, hspec
@@ -69658,6 +69820,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eq_4_2" = callPackage
+    ({ mkDerivation, base, semigroupoids }:
+     mkDerivation {
+       pname = "eq";
+       version = "4.2";
+       sha256 = "1s3h77i0h4z3dg97sqqjl027rz0k82h48cpzp0c7a75g0qx70q21";
+       libraryHaskellDepends = [ base semigroupoids ];
+       homepage = "http://github.com/ekmett/eq/";
+       description = "Leibnizian equality";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "equal-files" = callPackage
     ({ mkDerivation, base, bytestring, explicit-exception, filemanip
      , transformers, utility-ht
@@ -70263,8 +70438,8 @@ self: {
      }:
      mkDerivation {
        pname = "etc";
-       version = "0.3.1.0";
-       sha256 = "0l938jhlx1jgb46b9ykdc741r0v7wkklrc1ga5v81r3b52civb1c";
+       version = "0.3.2.0";
+       sha256 = "1j4qjw1hqw5q9i47ixiwcr3zpcs1x39l46mh5yii5xkqmwlw9gk0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base hashable rio text typed-process unliftio
@@ -71803,8 +71978,8 @@ self: {
      }:
      mkDerivation {
        pname = "expiring-containers";
-       version = "0.1.0.2";
-       sha256 = "006n6zwdgrdh0717wd85kwxrbpv3fl5srbc77acglms41pcn72yz";
+       version = "0.1.1.1";
+       sha256 = "0v35m5bl6y5l4m8gfs6wrcs0pqmgk52aaa261jg92jkvhji21ki5";
        libraryHaskellDepends = [
          base containers hashable int-multimap time timestamp
          unordered-containers
@@ -72539,8 +72714,8 @@ self: {
      }:
      mkDerivation {
        pname = "fake";
-       version = "0.1.1";
-       sha256 = "0xp737s8067bynh03d6zhi8w71pl1q8mrk5si80mykn401dzw7ir";
+       version = "0.1.1.1";
+       sha256 = "0f6iqbyyrllry2q48by8qwaq0n9k7b5d00xgw5vvlr9zdvrpllgf";
        libraryHaskellDepends = [
          base containers generics-sop random text time
        ];
@@ -77645,6 +77820,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "free_5_0_2" = callPackage
+    ({ mkDerivation, base, bifunctors, comonad, containers
+     , distributive, exceptions, mtl, profunctors, semigroupoids
+     , semigroups, template-haskell, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "free";
+       version = "5.0.2";
+       sha256 = "15m3n9vhz7z3kzv1w3wlfa3x8jp4cbrkwmrcjr7jlx39iqffn1gg";
+       libraryHaskellDepends = [
+         base bifunctors comonad containers distributive exceptions mtl
+         profunctors semigroupoids semigroups template-haskell transformers
+         transformers-base transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/free/";
+       description = "Monads for free";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "free-concurrent" = callPackage
     ({ mkDerivation, base, type-aligned }:
      mkDerivation {
@@ -78221,6 +78417,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "friendly" = callPackage
+    ({ mkDerivation, base, bifunctors, lens, optparse-applicative }:
+     mkDerivation {
+       pname = "friendly";
+       version = "0.1.0.0";
+       sha256 = "0ikbfki5yvagc3xjbqwmzzp29idfviaylnan6cr39kna6fc8ajgx";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bifunctors lens optparse-applicative
+       ];
+       description = "Attempt to pretty-print any input";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "friendly-time" = callPackage
     ({ mkDerivation, base, hspec, old-locale, time }:
      mkDerivation {
@@ -84458,8 +84669,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180409";
-       sha256 = "05cwyh3x432k3czrd59py0jsvl3qjg8ky7nc0rxkw6pbzwpgcb8c";
+       version = "6.20180427";
+       sha256 = "0pjdb0mk5hmjl0sra37ap3cr5xp9pa7fyikqmz4156hzk925rrds";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -85488,6 +85699,8 @@ self: {
        pname = "gl";
        version = "0.8.0";
        sha256 = "0f8l1ra05asqjnk97sliqb3wqvr6lic18rfs1f9dm1kw2lw2hkda";
+       revision = "1";
+       editedCabalFile = "17m5vagiq1v7zg6409f56qqy28jd0xp13yk44s661rcwj0f4pd14";
        setupHaskellDepends = [
          base Cabal containers directory filepath hxt transformers
        ];
@@ -86421,8 +86634,8 @@ self: {
     ({ mkDerivation, base, gmp, recursion-schemes }:
      mkDerivation {
        pname = "gmpint";
-       version = "0.1.0.11";
-       sha256 = "00sml2d5jbfc0qy0nvrmk9xv31zk66anzz5r4d7h049asq0zh20n";
+       version = "0.1.0.12";
+       sha256 = "0l3qd8hps55am4ddj4x83f0vyi1rwhh7gj36k465n4m1pz7ndxrx";
        libraryHaskellDepends = [ base recursion-schemes ];
        librarySystemDepends = [ gmp ];
        description = "GMP integer conversions";
@@ -88350,19 +88563,22 @@ self: {
      }) {};
 
   "google-oauth2" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, HTTP, http-conduit
-     , http-types, load-env
+    ({ mkDerivation, base, bytestring, hoauth2, hspec, http-client-tls
+     , http-conduit, load-env, safe-exceptions, text, transformers
+     , uri-bytestring
      }:
      mkDerivation {
        pname = "google-oauth2";
-       version = "0.2.2";
-       sha256 = "0n408kh48d7ky09j9zw9ad4mhbv1v7gq6i3ya4f6fhkjqqgw8c1j";
+       version = "0.3.0.0";
+       sha256 = "119p792prspir2vxk53jzkr90rava2qnixr1jkbmx5si63h9l01z";
        libraryHaskellDepends = [
-         aeson base bytestring HTTP http-conduit
+         base bytestring hoauth2 http-client-tls safe-exceptions text
+         transformers uri-bytestring
        ];
        testHaskellDepends = [
-         base bytestring hspec http-conduit http-types load-env
+         base bytestring hoauth2 hspec http-conduit load-env text
        ];
+       homepage = "https://github.com/pbrisbin/google-oauth2#readme";
        description = "Google OAuth2 token negotiation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90710,19 +90926,19 @@ self: {
   "gtk-sni-tray" = callPackage
     ({ mkDerivation, base, bytestring, containers, dbus, directory
      , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut
-     , gtk3, hslogger, optparse-applicative, status-notifier-item, text
-     , transformers, unix
+     , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative
+     , status-notifier-item, text, transformers, unix
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.0.0";
-       sha256 = "0a9yxhir33zg1bkv9nyazkrjawv2w9qr43n4prrifib7r976b7pj";
+       version = "0.1.1.0";
+       sha256 = "16wif6b94ipw49810jyjgl6h8mhx7bkz0pkl8ri6ir9ljp0mnvp0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk
-         gi-gdkpixbuf gi-glib gi-gtk hslogger status-notifier-item text
-         transformers unix
+         gi-gdkpixbuf gi-glib gi-gtk gtk-strut haskell-gi haskell-gi-base
+         hslogger status-notifier-item text transformers unix
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [
@@ -91539,6 +91755,58 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hOpenPGP_2_6_1" = callPackage
+    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
+     , base16-bytestring, base64-bytestring, bifunctors, binary
+     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
+     , containers, criterion, crypto-cipher-types, cryptonite
+     , data-default-class, errors, hashable, incremental-parser
+     , ixset-typed, lens, memory, monad-loops, nettle, network
+     , network-uri, newtype, openpgp-asciiarmor, QuickCheck
+     , quickcheck-instances, resourcet, semigroups, split, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+     , transformers, unliftio-core, unordered-containers
+     , wl-pprint-extras, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.6.1";
+       sha256 = "1al531lrsgfsqjc21117l420pcd7ymv4vdzywka189lkd8p5yzj7";
+       libraryHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring
+         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
+         conduit conduit-extra containers crypto-cipher-types cryptonite
+         data-default-class errors hashable incremental-parser ixset-typed
+         lens memory monad-loops nettle network-uri newtype
+         openpgp-asciiarmor resourcet semigroups split text time
+         time-locale-compat transformers unliftio-core unordered-containers
+         wl-pprint-extras zlib
+       ];
+       testHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+         binary binary-conduit bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite data-default-class errors
+         hashable incremental-parser ixset-typed lens memory monad-loops
+         nettle network network-uri newtype QuickCheck quickcheck-instances
+         resourcet semigroups split tasty tasty-hunit tasty-quickcheck text
+         time time-locale-compat transformers unliftio-core
+         unordered-containers wl-pprint-extras zlib
+       ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring bifunctors binary
+         binary-conduit bytestring bzlib conduit conduit-extra containers
+         criterion crypto-cipher-types cryptonite data-default-class errors
+         hashable incremental-parser ixset-typed lens memory monad-loops
+         nettle network network-uri newtype openpgp-asciiarmor resourcet
+         semigroups split text time time-locale-compat transformers
+         unliftio-core unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "https://salsa.debian.org/clint/hOpenPGP";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hPDB" = callPackage
     ({ mkDerivation, AC-Vector, base, bytestring, containers, deepseq
      , directory, ghc-prim, iterable, mmap, mtl, Octree, parallel
@@ -96896,8 +97164,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.4.0";
-       sha256 = "19bhfcrfj4jxd6znqzslax6sd4w1icwp4rn3h0w31qpjv54x171f";
+       version = "0.5.0";
+       sha256 = "1hil0zl4pnvkh0ingp0bgi0m7mhmvf1pqr7qskjxm6pa9kqybrw9";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing cereal cereal-conduit colour
          conduit data-default-class hashable hxt primitive split
@@ -96920,8 +97188,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-import-graph";
-       version = "1.0.3";
-       sha256 = "1fh3nn4hqcj6lc3m1zlxykxk2dbchh3cdz63k8zfpl7dr2d91132";
+       version = "1.0.4";
+       sha256 = "17ac5k98aqx77lq398kgvyiylpmkvxdmxzqbh7wk1fl9kphwsdm0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106808,8 +107076,8 @@ self: {
        pname = "hoist-error";
        version = "0.1.0.2";
        sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z";
-       revision = "2";
-       editedCabalFile = "0yg8w9cy4qff8hkv0057qqwiapfhh2sxx43j64wgdp8vb8jar97w";
+       revision = "3";
+       editedCabalFile = "1f2znb9x4f4m8h3d66pdyi7fqjr6v120mjqswj40dy7p2wmd6dm6";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
@@ -108425,18 +108693,20 @@ self: {
      }) {};
 
   "hpc-threshold" = callPackage
-    ({ mkDerivation, base, bytestring, interpolate, pcre-heavy }:
+    ({ mkDerivation, base, bytestring, deepseq, hspec, interpolate
+     , pcre-heavy
+     }:
      mkDerivation {
        pname = "hpc-threshold";
-       version = "0.1.0.0";
-       sha256 = "113m7fpm4zffvzwnqjzd45mbc18acgj5c1b9z5hqwklygjjjpx4a";
+       version = "0.1.0.3";
+       sha256 = "0f16iq5d6d865ifg9lwbli16p5svzy3hjp05fkivqnl3p7hmd297";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring interpolate pcre-heavy ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base deepseq hspec ];
        homepage = "https://github.com/eckyputrady/hpc-threshold#readme";
-       description = "Small utility for validating whether HPC result is above defined thresholds";
+       description = "Ensure the code coverage is above configured thresholds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -109376,23 +109646,24 @@ self: {
 
   "hs-multiaddr" = callPackage
     ({ mkDerivation, base, bytes, bytestring, cereal, either-unwrap
-     , filepath, hspec, iproute, multihash, sandi
+     , filepath, hs-multihash, hspec, iproute, sandi
      }:
      mkDerivation {
        pname = "hs-multiaddr";
-       version = "0.1.0.1";
-       sha256 = "0bac505a3fvz46zbh60vl0m6jj5snjbmj925vxhv6bpdydidi8hw";
+       version = "0.1.4";
+       sha256 = "0vmyqrgrw1fqm26mgb1bwdivv5iwgypb5186awva665gvp8p30ib";
        libraryHaskellDepends = [
-         base bytes bytestring cereal filepath iproute multihash sandi
+         base bytes bytestring cereal filepath hs-multihash iproute sandi
        ];
        testHaskellDepends = [
-         base bytestring either-unwrap hspec iproute multihash sandi
+         base bytestring either-unwrap hs-multihash hspec iproute sandi
        ];
-       homepage = "https://github.com/MatrixAI/haskell-multiaddr#readme";
-       description = "Multiaddr Library for LibP2P";
-       license = stdenv.lib.licenses.bsd3;
+       homepage = "https://github.com/MatrixAI/hs-multiaddr#readme";
+       description = "Multiaddr library";
+       license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+       broken = true;
+     }) {hs-multihash = null;};
 
   "hs-nombre-generator" = callPackage
     ({ mkDerivation, base, HandsomeSoup, hxt, random }:
@@ -113682,8 +113953,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "1.1.0.3";
-       sha256 = "0bzja2n7hxj530d3pfh58zn29vapl341fy7x6ggvp5sfgsysg7ll";
+       version = "1.1.0.4";
+       sha256 = "03ffmff09k6aqpd9rv41bfi566pr6hk4vdjm0my2wfypbn2mrgb0";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -114591,6 +114862,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-reverse-proxy_0_6_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
+     , conduit, conduit-extra, containers, hspec, http-client
+     , http-conduit, http-types, network, resourcet, streaming-commons
+     , text, transformers, unliftio, wai, wai-logger, warp, word8
+     }:
+     mkDerivation {
+       pname = "http-reverse-proxy";
+       version = "0.6.0";
+       sha256 = "1a6i5njf85b2lhg8m83njagcf09wih5q2irnyb2890s724qr277v";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring case-insensitive conduit
+         conduit-extra containers http-client http-types network resourcet
+         streaming-commons text transformers unliftio wai wai-logger word8
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra hspec
+         http-conduit http-types network resourcet streaming-commons
+         transformers unliftio wai warp
+       ];
+       homepage = "https://github.com/fpco/http-reverse-proxy";
+       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-server" = callPackage
     ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix
      , url, utf8-string
@@ -115502,6 +115799,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hvega" = callPackage
+    ({ mkDerivation, aeson, base, text, vector }:
+     mkDerivation {
+       pname = "hvega";
+       version = "0.1.0.0";
+       sha256 = "14czd3qhji2aq4x23v0a1fhschnq1azd8spiar9pw5z12z4n9j1l";
+       libraryHaskellDepends = [ aeson base text vector ];
+       homepage = "https://github.com/DougBurke/hvega";
+       description = "Create Vega and Vega-Lite visualizations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-balancedparens" = callPackage
     ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
      , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector
@@ -115812,17 +116121,16 @@ self: {
 
   "hw-kafka-client" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers
-     , either, hspec, monad-loops, rdkafka, temporary, transformers
-     , unix
+     , either, hspec, monad-loops, rdkafka, transformers, unix
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.4.3";
-       sha256 = "18pyayl0xyb045db5584cfbbvzvmkwm3zkpvks30vrz9sb5jx1qd";
+       version = "2.4.4";
+       sha256 = "1zw35ikrp0r07rvnm3fah3p9xj8h8bw2h4nwv94ih1ff2ab2glhf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bifunctors bytestring containers temporary transformers unix
+         base bifunctors bytestring containers transformers unix
        ];
        librarySystemDepends = [ rdkafka ];
        libraryToolDepends = [ c2hs ];
@@ -118320,6 +118628,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ihaskell-hvega" = callPackage
+    ({ mkDerivation, aeson, base, hvega, ihaskell, text }:
+     mkDerivation {
+       pname = "ihaskell-hvega";
+       version = "0.1.0.0";
+       sha256 = "0fwn0c7v5g67gkrzq7k3myy3cxk5b176svzcgaidfs7ckl3hbsnm";
+       libraryHaskellDepends = [ aeson base hvega ihaskell text ];
+       homepage = "https://github.com/githubuser/ihaskell-hvega#readme";
+       description = "IHaskell display instance for hvega types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ihaskell-inline-r" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , filepath, ihaskell, ihaskell-blaze, inline-r, template-haskell
@@ -119279,6 +119599,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "incremental-parser_0_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.3.1";
+       sha256 = "1nygr5hs547innw9f5wx8ifpkiq01ckbhx34266ds6rmnjsqxzby";
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
+       homepage = "https://github.com/blamario/incremental-parser";
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -120305,8 +120646,8 @@ self: {
      }:
      mkDerivation {
        pname = "int-multimap";
-       version = "0.1.0.1";
-       sha256 = "0xi0n9hhra6pzqnxahf109qgifxnsgvc9v9jl0qmnxzz5yki1pvg";
+       version = "0.2";
+       sha256 = "17hwqly7v5224fddan9nkywv4pp478nby7iswaj32x27qwn9p11f";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -120525,8 +120866,8 @@ self: {
      }:
      mkDerivation {
        pname = "intero";
-       version = "0.1.30";
-       sha256 = "0axjmswi9jgyd9kkhyjwbviqbh693vvki4hvwcg7rq6dsgl0lgk8";
+       version = "0.1.31";
+       sha256 = "0d6pc7mza12889wbzxy7gb5fb86v3b5pm2cdvcvnh6gd6x4ii336";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -125661,6 +126002,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "katip-kafka" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hw-kafka-client, katip }:
+     mkDerivation {
+       pname = "katip-kafka";
+       version = "0.0.1";
+       sha256 = "1w5w3sccvh1rl0zd69k0nya0bbf9jwi9ahb7q1c761jq5333gv8q";
+       libraryHaskellDepends = [
+         aeson base bytestring hw-kafka-client katip
+       ];
+       homepage = "https://github.com/s9gf4ult/katip-kafka";
+       description = "Katip scribe to send logs to Kafka";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "katip-rollbar" = callPackage
     ({ mkDerivation, aeson, async, base, hostname, http-client, katip
      , rollbar-hs, stm-chans, text, time
@@ -128154,8 +128509,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.8";
-       sha256 = "0609xpjcq294ypjq4blw1cb3a6jnjzm9gwzr54dnp3afhindbq3m";
+       version = "1.2.0.9";
+       sha256 = "0narp1zhvyannd627bafh6yhk8y5lfw6f5nqr9wi1qvbynmlmhmg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -130767,8 +131122,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens-utils";
-       version = "1.4.4";
-       sha256 = "0ry04ghvbyxa236s150hfs5fa0fsip312ivflg70j49n02ypxr91";
+       version = "1.4.5";
+       sha256 = "00xcwyl12w95k14rc12ww2i0kgbrv39q1lvq5kfj3z7l5hv4fg0g";
        libraryHaskellDepends = [
          aeson base containers data-default lens monoid split
          template-haskell
@@ -137885,6 +138240,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mapalgebra" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, deepseq, hmatrix, HUnit-approx, massiv, massiv-io
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, vector
+     }:
+     mkDerivation {
+       pname = "mapalgebra";
+       version = "0.1.0";
+       sha256 = "1d4cdwkrbvkh53h3vkzghikmbnba3x1j84r0wgsc90cnr2im5san";
+       libraryHaskellDepends = [
+         base bytestring containers data-default deepseq hmatrix massiv
+         massiv-io vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default deepseq hmatrix
+         HUnit-approx massiv massiv-io QuickCheck tasty tasty-hunit
+         tasty-quickcheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion data-default deepseq hmatrix
+         massiv massiv-io vector
+       ];
+       homepage = "https://github.com/fosskers/mapalgebra";
+       description = "Efficient, polymorphic Map Algebra";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "mappy" = callPackage
     ({ mkDerivation, ansi-terminal, base, containers, directory
      , haskeline, hspec, parsec, QuickCheck
@@ -137930,10 +138312,11 @@ self: {
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
        pname = "marihana";
-       version = "0.2.1.0";
-       sha256 = "03aw0chicgmyj3ix7nz0dc5mpck0409bv1d7lfs5wn9z4mmynqiv";
+       version = "0.2.2.0";
+       sha256 = "0xg2ldcm01b352zjv9rh0vvdbhxbcwfvi8464ymh4ms8nh3x4hb6";
        isLibrary = true;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath process ];
        executableHaskellDepends = [ base directory filepath process ];
        testHaskellDepends = [ base directory filepath process ];
@@ -138759,26 +139142,27 @@ self: {
      , config-ini, connection, containers, directory, filepath, gitrev
      , hashable, Hclip, mattermost-api, mattermost-api-qc
      , microlens-platform, mtl, process, quickcheck-text, semigroups
-     , skylighting, stm, stm-delay, strict, string-conversions, tasty
-     , tasty-hunit, tasty-quickcheck, temporary, text, text-zipper, time
-     , timezone-olson, timezone-series, transformers, Unique, unix
-     , unordered-containers, utf8-string, vector, vty, word-wrap
-     , xdg-basedir
+     , skylighting-core, stm, stm-delay, strict, string-conversions
+     , tasty, tasty-hunit, tasty-quickcheck, temporary, text
+     , text-zipper, time, timezone-olson, timezone-series, transformers
+     , Unique, unix, unordered-containers, utf8-string, vector, vty
+     , word-wrap, xdg-basedir
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "40800.0.2";
-       sha256 = "0fgk0my3r0vcw545xqjcda8ikj5cbfzgg9vxfs3jzdcnsa0rgcyf";
+       version = "40900.0.1";
+       sha256 = "1ygnh27dv5hprb5fqqxwjxsf43ik784pwdagndn3sdiddy2k3yf7";
        isLibrary = false;
        isExecutable = true;
+       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson aspell-pipe async base base-compat brick brick-skylighting
          bytestring cheapskate config-ini connection containers directory
          filepath gitrev hashable Hclip mattermost-api microlens-platform
-         mtl process semigroups skylighting stm stm-delay strict temporary
-         text text-zipper time timezone-olson timezone-series transformers
-         unix unordered-containers utf8-string vector vty word-wrap
-         xdg-basedir
+         mtl process semigroups skylighting-core stm stm-delay strict
+         temporary text text-zipper time timezone-olson timezone-series
+         transformers unix unordered-containers utf8-string vector vty
+         word-wrap xdg-basedir
        ];
        testHaskellDepends = [
          base base-compat brick bytestring cheapskate checkers config-ini
@@ -138803,8 +139187,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api";
-       version = "40800.0.2";
-       sha256 = "1l2yb9nvy2haw5kyjjij465g45w8xm8vm97jbkx5jb3p4cs44xl8";
+       version = "40900.1.0";
+       sha256 = "1ngpinpal50s8bizwvnpafx6zh8zqb7m0yc21lcp7ybh4yhwikad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138828,8 +139212,8 @@ self: {
      }:
      mkDerivation {
        pname = "mattermost-api-qc";
-       version = "40800.0.2";
-       sha256 = "04whpcbcd5cqnwfrskk3r2gjmyvap2m7d8xsjdry56kil6iqznk5";
+       version = "40900.1.0";
+       sha256 = "0mdwi6130hz508bxbhriyg7fr6rqpbalmjwwizvj9nb7cz1dmrsl";
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
@@ -141043,26 +141427,25 @@ self: {
      }) {};
 
   "mighttpd2" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, blaze-builder
-     , byteorder, bytestring, case-insensitive, conduit, conduit-extra
-     , directory, filepath, hspec, http-client, http-date, http-types
-     , io-choice, network, old-locale, parsec, resourcet
-     , streaming-commons, time, transformers, unix, unix-time
-     , unordered-containers, wai, wai-app-file-cgi, wai-http2-extra
-     , wai-logger, warp
+    ({ mkDerivation, array, async, auto-update, base, byteorder
+     , bytestring, case-insensitive, conduit, conduit-extra, directory
+     , filepath, hspec, http-client, http-date, http-types, io-choice
+     , network, old-locale, parsec, resourcet, streaming-commons, time
+     , transformers, unix, unix-time, unordered-containers, wai
+     , wai-app-file-cgi, wai-http2-extra, wai-logger, warp
      }:
      mkDerivation {
        pname = "mighttpd2";
-       version = "3.4.2";
-       sha256 = "0a5i9cs0rjap7i4gyda6dgglckn3ys0ldl0qkvnxvm87bcyyfc3k";
+       version = "3.4.3";
+       sha256 = "0afa25kaagdznfg1kbm5hbmlfk75p7rws0x9fjb505wrr12jipbh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         array async auto-update base blaze-builder byteorder bytestring
-         case-insensitive conduit conduit-extra directory filepath http-date
-         http-types io-choice network parsec resourcet streaming-commons
-         unix unix-time unordered-containers wai wai-app-file-cgi warp
+         array async auto-update base byteorder bytestring case-insensitive
+         conduit conduit-extra directory filepath http-date http-types
+         io-choice network parsec resourcet streaming-commons unix unix-time
+         unordered-containers wai wai-app-file-cgi warp
        ];
        executableHaskellDepends = [
          base bytestring conduit-extra directory filepath http-client
@@ -151074,8 +151457,8 @@ self: {
        pname = "np-extras";
        version = "0.3.1.1";
        sha256 = "0g17kpmd819q0lsy41x0ssvfy3calspdq3q1d579irga77gf0blf";
-       revision = "1";
-       editedCabalFile = "1m4sfcpb9dcawckfk6nb2qib402s958zjgspd4svxrzdyaqqg4i3";
+       revision = "2";
+       editedCabalFile = "01jp7y4lsdxlfrbi5vqsc5iyjzzc996w7g88amkkfg5k6amlxb9r";
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
@@ -155493,7 +155876,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_1_3" = callPackage
+  "pandoc_2_2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , Cabal, case-insensitive, cmark-gfm, containers, criterion
@@ -155508,8 +155891,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.1.3";
-       sha256 = "023h0jdn996q37p8b5wdi1hifq17drrwbfq92c6imxwk2a4rl3jf";
+       version = "2.2";
+       sha256 = "0sc51sw7g9jni9jamj7rcdn9fqf5476gzp7cahhkjj29xak88a8g";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -155579,6 +155962,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_14_3_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat
+     , bytestring, Cabal, containers, data-default, directory, filepath
+     , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec
+     , process, rfc5051, setenv, split, syb, tagsoup, temporary, text
+     , time, unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.14.3.1";
+       sha256 = "0yj6rckwsc9vig40cm15ry0j3d01xpk04qma9n4byhal6v4b5h22";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base base-compat bytestring containers data-default directory
+         filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec
+         rfc5051 setenv split syb tagsoup text time unordered-containers
+         vector xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base base-compat bytestring filepath
+         pandoc pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring containers directory filepath mtl
+         pandoc pandoc-types process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -157554,8 +157973,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.6.1.0";
-       sha256 = "1i6vql76j5439bwdd1z7haphgm4x82rh08s22fc70hmfzkrln733";
+       version = "0.6.1.1";
+       sha256 = "153d2ij27jjsh0h014d1v3y06diri1njbmwzvq2kgwdbdqgkhf0y";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -158556,8 +158975,8 @@ self: {
      }:
      mkDerivation {
        pname = "pedersen-commitment";
-       version = "0.1.0";
-       sha256 = "10flwinxxs1vg2giqqyazcgxrykqsj6m0kgd62b8f4wzmygws4r1";
+       version = "0.2.0";
+       sha256 = "1dxh20abilyf29jg6dbl9al300v7wzd1avv36p4hf8x2xwvwr4v7";
        libraryHaskellDepends = [
          base bytestring containers cryptonite memory mtl protolude text
        ];
@@ -158567,7 +158986,7 @@ self: {
        ];
        homepage = "https://github.com/adjoint-io/pedersen-commitment#readme";
        description = "An implementation of Pedersen commitment schemes";
-       license = stdenv.lib.licenses.asl20;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "peg" = callPackage
@@ -158946,6 +159365,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "perhaps" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-doctest, doctest, mtl
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "perhaps";
+       version = "0";
+       sha256 = "16bm069pqrdsbscyp9m1r7cciqppkvlmgn4xgzp3yyfh69z095gn";
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://github.com/ekmett/perhaps/";
+       description = "Perhaps, a monad";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "period" = callPackage
     ({ mkDerivation, base, hspec, HUnit, old-locale
      , optparse-applicative, parsec, text, text-show, time
@@ -159077,6 +159514,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "persistable-types-HDBC-pg_0_0_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, convertible, dlist, HDBC
+     , persistable-record, relational-query, relational-query-HDBC
+     , text-postgresql
+     }:
+     mkDerivation {
+       pname = "persistable-types-HDBC-pg";
+       version = "0.0.3.1";
+       sha256 = "1dmvwr21q5g15v50b5ycnyvqbrfg75pw5kdvmi4sp03yldk0fsdc";
+       libraryHaskellDepends = [
+         base bytestring convertible dlist HDBC persistable-record
+         relational-query relational-query-HDBC text-postgresql
+       ];
+       testHaskellDepends = [
+         base relational-query relational-query-HDBC text-postgresql
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "HDBC and Relational-Record instances of PostgreSQL extended types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent_2_7_3_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , blaze-html, blaze-markup, bytestring, conduit, containers
@@ -165616,6 +166075,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pretty-relative-time" = callPackage
+    ({ mkDerivation, base, genvalidity-hspec, genvalidity-time, hspec
+     , QuickCheck, time, validity, validity-time
+     }:
+     mkDerivation {
+       pname = "pretty-relative-time";
+       version = "0.0.0.0";
+       sha256 = "0k28jh5mw5qfw4d1hfdj2f53qwmn3apy1yxwyxjbr50m2924j8f2";
+       libraryHaskellDepends = [ base time validity validity-time ];
+       testHaskellDepends = [
+         base genvalidity-hspec genvalidity-time hspec QuickCheck time
+         validity validity-time
+       ];
+       homepage = "https://github.com/NorfairKing/pretty-relative-time#readme";
+       description = "Pretty relative time";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "pretty-show" = callPackage
     ({ mkDerivation, array, base, filepath, ghc-prim, happy
      , haskell-lexer, pretty
@@ -168063,6 +168540,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "publicsuffix_0_20180426" = callPackage
+    ({ mkDerivation, base, criterion, filepath, hspec, random
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "publicsuffix";
+       version = "0.20180426";
+       sha256 = "0pfxsh2ds3dwm6mq6g85vhq8rdgc93bn84pq1b4lk3sf71sqs2ii";
+       libraryHaskellDepends = [ base filepath template-haskell ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion random ];
+       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
+       description = "The publicsuffix list exposed as proper Haskell types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "publicsuffixlist" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, data-default
      , HUnit, idna, text, utf8-string
@@ -171981,8 +172475,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "4.0.8";
-       sha256 = "05rad5dckya26mai39623n5bvhvk13yjxikrc6r7yc6nvlkkh8zb";
+       version = "4.0.9";
+       sha256 = "0wz36zclpckkm8w7mmdzbklrr08ggyqsk7j4wfxbh4gxa0ry7yj5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -179148,16 +179642,16 @@ self: {
      }:
      mkDerivation {
        pname = "runmany";
-       version = "0.1.2";
-       sha256 = "1c672mxmgw3d7r3fbnjm9i7b74v00xrf95riwl2a52a1lpkmb0ip";
+       version = "0.1.3";
+       sha256 = "19pgmq009f5kpsilixbnsx5frl9c12v6in0blifandr9q3n9is9c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          async base bytestring optparse-applicative process stm
        ];
-       homepage = "https://github.com/jwiegley/runmany";
+       homepage = "https://github.com/jwiegley/runmany#readme";
        description = "Run multiple commands, interleaving output and errors";
-       license = stdenv.lib.licenses.mit;
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -185009,8 +185503,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-tracing";
-       version = "0.1.0.1";
-       sha256 = "0dff51fywa1z1png1hhwpn4f8av2jxdsplin8h80aad459czaid2";
+       version = "0.1.0.2";
+       sha256 = "0qpamaf3ydfb8197iz2prjh9nxwxi03cdfsp3jl28rhbqrc2xpry";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -188224,16 +188718,16 @@ self: {
      }) {};
 
   "simple-vec3" = callPackage
-    ({ mkDerivation, base, criterion, doctest, doctest-discover
+    ({ mkDerivation, base, criterion, doctest, doctest-driver-gen
      , QuickCheck, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.4.0.1";
-       sha256 = "17nvwph2g5xzi8lqgyrsbskdm9flwr7h3ch7yf4rnbx3bg37bvsh";
+       version = "0.4.0.2";
+       sha256 = "0zqy3ffndyvz97wfs0ha0d5j6045gfdh0p6rmz6dv87j9mqmfpl0";
        libraryHaskellDepends = [ base QuickCheck vector ];
        testHaskellDepends = [
-         base doctest doctest-discover tasty tasty-quickcheck
+         base doctest doctest-driver-gen tasty tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
        homepage = "https://github.com/dzhus/simple-vec3#readme";
@@ -188931,6 +189425,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "skeletal-set" = callPackage
+    ({ mkDerivation, base, containers, mtl, smallcheck, tasty
+     , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "skeletal-set";
+       version = "0.1.0.0";
+       sha256 = "0f8mc705bk6nc6l95y65fvcxi772fwvqy3cgm0sb3rv13h4rn468";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base containers mtl smallcheck tasty tasty-discover tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       description = "Skeletal set - a set with equivalence relation different from equality";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "skeleton" = callPackage
     ({ mkDerivation, argparser, attoparsec, base, bytestring, filepath
      , hex, posix-escape, process, time
@@ -192105,6 +192616,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sorted-list_0_2_1_0" = callPackage
+    ({ mkDerivation, base, criterion, deepseq }:
+     mkDerivation {
+       pname = "sorted-list";
+       version = "0.2.1.0";
+       sha256 = "1x2ygkh32q2kk5g7b7hnrl8z8azvgwsj36f3ndg79pzhghapdr5l";
+       libraryHaskellDepends = [ base deepseq ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
+       description = "Type-enforced sorted lists and related functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sorting" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -192779,6 +193304,8 @@ self: {
        pname = "species";
        version = "0.4.0.1";
        sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2";
+       revision = "1";
+       editedCabalFile = "1pvk34n7lsbpng9b6m6nrhhr44z1pilh292j3lfnx69hvxhvaq93";
        libraryHaskellDepends = [
          base containers multiset-comb np-extras numeric-prelude
          template-haskell
@@ -194223,86 +194750,82 @@ self: {
 
   "stack" = callPackage
     ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, async
-     , attoparsec, base, base64-bytestring, bindings-uname
-     , blaze-builder, bytestring, Cabal, clock, conduit, conduit-extra
-     , containers, cryptonite, cryptonite-conduit, deepseq, directory
-     , echo, exceptions, extra, fast-logger, file-embed, filelock
-     , filepath, fsnotify, generic-deriving, gitrev, hackage-security
-     , hashable, hastache, hpack, hpc, hspec, http-client
-     , http-client-tls, http-conduit, http-types, memory, microlens
-     , microlens-mtl, mintty, monad-logger, mono-traversable, mtl
+     , attoparsec, base, base64-bytestring, bindings-uname, bytestring
+     , Cabal, conduit, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, deepseq, directory, echo, exceptions, extra
+     , file-embed, filelock, filepath, fsnotify, generic-deriving
+     , gitrev, hackage-security, hashable, hpack, hpc, hspec
+     , http-client, http-client-tls, http-conduit, http-types, memory
+     , microlens, mintty, monad-logger, mono-traversable, mtl, mustache
      , neat-interpolation, network-uri, open-browser
      , optparse-applicative, optparse-simple, path, path-io, persistent
-     , persistent-sqlite, persistent-template, pid1, pretty, primitive
+     , persistent-sqlite, persistent-template, pretty, primitive
      , process, project-template, QuickCheck, regex-applicative-text
-     , resourcet, retry, semigroups, smallcheck, split, stm, store
+     , resourcet, retry, rio, semigroups, smallcheck, split, stm, store
      , store-core, streaming-commons, tar, template-haskell, temporary
      , text, text-metrics, th-reify-many, time, tls, transformers
-     , unicode-transforms, unix, unix-compat, unliftio
+     , typed-process, unicode-transforms, unix, unix-compat, unliftio
      , unordered-containers, vector, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.6.5";
-       sha256 = "0f5a0znxwmib03vhqkw0yiv89a82z43wlm7zwfyx30gfz6iqqp7f";
+       version = "1.7.1";
+       sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
        revision = "1";
-       editedCabalFile = "11bmzlf3gxbz2gij0l2999a296z4c12l27f7jfyfka8l1k15d6b1";
+       editedCabalFile = "12ym80mwlvg3zwbjhmby4k467hxa0yip0314w658ivn0sq6vgycw";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname blaze-builder bytestring Cabal
-         clock conduit conduit-extra containers cryptonite
-         cryptonite-conduit deepseq directory echo exceptions extra
-         fast-logger file-embed filelock filepath fsnotify generic-deriving
-         hackage-security hashable hastache hpack hpc http-client
-         http-client-tls http-conduit http-types memory microlens
-         microlens-mtl mintty monad-logger mono-traversable mtl
+         base64-bytestring bindings-uname bytestring Cabal conduit
+         conduit-extra containers cryptonite cryptonite-conduit deepseq
+         directory echo exceptions extra file-embed filelock filepath
+         fsnotify generic-deriving hackage-security hashable hpack hpc
+         http-client http-client-tls http-conduit http-types memory
+         microlens mintty monad-logger mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         path path-io persistent persistent-sqlite persistent-template pid1
+         path path-io persistent persistent-sqlite persistent-template
          pretty primitive process project-template regex-applicative-text
-         resourcet retry semigroups split stm store store-core
+         resourcet retry rio semigroups split stm store store-core
          streaming-commons tar template-haskell temporary text text-metrics
-         th-reify-many time tls transformers unicode-transforms unix
-         unix-compat unliftio unordered-containers vector yaml zip-archive
-         zlib
+         th-reify-many time tls transformers typed-process
+         unicode-transforms unix unix-compat unliftio unordered-containers
+         vector yaml zip-archive zlib
        ];
        executableHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname blaze-builder bytestring Cabal
-         clock conduit conduit-extra containers cryptonite
-         cryptonite-conduit deepseq directory echo exceptions extra
-         fast-logger file-embed filelock filepath fsnotify generic-deriving
-         gitrev hackage-security hashable hastache hpack hpc http-client
-         http-client-tls http-conduit http-types memory microlens
-         microlens-mtl mintty monad-logger mono-traversable mtl
+         base64-bytestring bindings-uname bytestring Cabal conduit
+         conduit-extra containers cryptonite cryptonite-conduit deepseq
+         directory echo exceptions extra file-embed filelock filepath
+         fsnotify generic-deriving gitrev hackage-security hashable hpack
+         hpc http-client http-client-tls http-conduit http-types memory
+         microlens mintty monad-logger mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
          optparse-simple path path-io persistent persistent-sqlite
-         persistent-template pid1 pretty primitive process project-template
-         regex-applicative-text resourcet retry semigroups split stm store
-         store-core streaming-commons tar template-haskell temporary text
-         text-metrics th-reify-many time tls transformers unicode-transforms
-         unix unix-compat unliftio unordered-containers vector yaml
-         zip-archive zlib
+         persistent-template pretty primitive process project-template
+         regex-applicative-text resourcet retry rio semigroups split stm
+         store store-core streaming-commons tar template-haskell temporary
+         text text-metrics th-reify-many time tls transformers typed-process
+         unicode-transforms unix unix-compat unliftio unordered-containers
+         vector yaml zip-archive zlib
        ];
        testHaskellDepends = [
          aeson annotated-wl-pprint ansi-terminal async attoparsec base
-         base64-bytestring bindings-uname blaze-builder bytestring Cabal
-         clock conduit conduit-extra containers cryptonite
-         cryptonite-conduit deepseq directory echo exceptions extra
-         fast-logger file-embed filelock filepath fsnotify generic-deriving
-         hackage-security hashable hastache hpack hpc hspec http-client
-         http-client-tls http-conduit http-types memory microlens
-         microlens-mtl mintty monad-logger mono-traversable mtl
+         base64-bytestring bindings-uname bytestring Cabal conduit
+         conduit-extra containers cryptonite cryptonite-conduit deepseq
+         directory echo exceptions extra file-embed filelock filepath
+         fsnotify generic-deriving hackage-security hashable hpack hpc hspec
+         http-client http-client-tls http-conduit http-types memory
+         microlens mintty monad-logger mono-traversable mtl mustache
          neat-interpolation network-uri open-browser optparse-applicative
-         path path-io persistent persistent-sqlite persistent-template pid1
+         path path-io persistent persistent-sqlite persistent-template
          pretty primitive process project-template QuickCheck
-         regex-applicative-text resourcet retry semigroups smallcheck split
-         stm store store-core streaming-commons tar template-haskell
+         regex-applicative-text resourcet retry rio semigroups smallcheck
+         split stm store store-core streaming-commons tar template-haskell
          temporary text text-metrics th-reify-many time tls transformers
-         unicode-transforms unix unix-compat unliftio unordered-containers
-         vector yaml zip-archive zlib
+         typed-process unicode-transforms unix unix-compat unliftio
+         unordered-containers vector yaml zip-archive zlib
        ];
        doCheck = false;
        preCheck = "export HOME=$TMPDIR";
@@ -194386,6 +194909,48 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "stack-network" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, binary, bytestring
+     , Cabal, clock, configurator, directory, dirstream
+     , distributed-process-lifted, distributed-process-simplelocalnet
+     , exceptions, filepath, hspec, lifted-base, mtl
+     , optparse-applicative, pipes, pipes-safe, process, raw-strings-qq
+     , system-fileio, system-filepath, temporary, text, transformers
+     , yaml
+     }:
+     mkDerivation {
+       pname = "stack-network";
+       version = "0.1.0.0";
+       sha256 = "0l2r6r89lj1197ybsfgjxikhpgravw12zjpaz62gcsvdhdcflsak";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal async base binary bytestring Cabal clock configurator
+         directory dirstream distributed-process-lifted
+         distributed-process-simplelocalnet exceptions filepath lifted-base
+         mtl optparse-applicative pipes pipes-safe process system-fileio
+         system-filepath temporary text transformers
+       ];
+       executableHaskellDepends = [
+         ansi-terminal async base binary bytestring Cabal clock configurator
+         directory dirstream distributed-process-lifted
+         distributed-process-simplelocalnet exceptions filepath lifted-base
+         mtl optparse-applicative pipes pipes-safe process system-fileio
+         system-filepath temporary text transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal async base binary bytestring Cabal clock configurator
+         directory dirstream distributed-process-lifted
+         distributed-process-simplelocalnet exceptions filepath hspec
+         lifted-base mtl optparse-applicative pipes pipes-safe process
+         raw-strings-qq system-fileio system-filepath temporary text
+         transformers yaml
+       ];
+       homepage = "https://github.com/McGizzle/stack-network#readme";
+       description = "A program for extending Stack to add distributed capabilities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stack-prism" = callPackage
     ({ mkDerivation, base, profunctors, tagged, template-haskell
      , transformers
@@ -198072,18 +198637,18 @@ self: {
   "stylish-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , file-embed, filepath, haskell-src-exts, HUnit, mtl
-     , optparse-applicative, strict, syb, test-framework
+     , optparse-applicative, semigroups, strict, syb, test-framework
      , test-framework-hunit, yaml
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.9.0.2";
-       sha256 = "0w0hh08b1zlp3disxp20yrg20vblqgk5y3arf8xbfiznzf05x5zr";
+       version = "0.9.1.1";
+       sha256 = "0qvaxivxvgaz4zpgc6275j9psdipj2p7y3msv9py11z1y6r5izss";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring containers directory file-embed filepath
-         haskell-src-exts mtl syb yaml
+         haskell-src-exts mtl semigroups syb yaml
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory file-embed filepath
@@ -200802,6 +201367,8 @@ self: {
        pname = "taffybar";
        version = "1.0.2";
        sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9";
+       revision = "1";
+       editedCabalFile = "02ip0c6fq3ra6zhhq2adxjx8j4w07x19zndkk0jj6jn6kj5qggf3";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -200988,16 +201555,14 @@ self: {
      }:
      mkDerivation {
        pname = "tagged-transformer";
-       version = "0.8";
-       sha256 = "13jzfrzcgbh3g3qssv08r8i8j2l5c5y84blc1m90rhyyvx2zizn7";
-       revision = "1";
-       editedCabalFile = "06h1v2q35dzc69vfshzvwcpai176dd3bp89hvgcm5r6dyii6bqlg";
+       version = "0.8.1";
+       sha256 = "1ffwxr312vi3fqhgnad5b6gqkgz3j27c30z551j8zisjx0hn3zx0";
        libraryHaskellDepends = [
          base comonad contravariant distributive exceptions mtl reflection
          semigroupoids tagged
        ];
        homepage = "http://github.com/ekmett/tagged-transformer";
-       description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments";
+       description = "Monad transformer carrying an extra phantom type tag";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -202610,14 +203175,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "teardown_0_4_0_0" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, criterion, rio, tasty
+  "teardown_0_4_1_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, gauge, rio, tasty
      , tasty-hunit, typed-process, unliftio
      }:
      mkDerivation {
        pname = "teardown";
-       version = "0.4.0.0";
-       sha256 = "0y2ihw74fnnygzp22nyy7285d3rcp6kw2gjkzys82blwrbdwdlsk";
+       version = "0.4.1.0";
+       sha256 = "1w8yblzn0i8i03bfg97qgq4c6i6l2p04krvwg41q157rcgb91gq0";
        libraryHaskellDepends = [
          ansi-wl-pprint base rio typed-process unliftio
        ];
@@ -202625,10 +203190,10 @@ self: {
          base rio tasty tasty-hunit typed-process unliftio
        ];
        benchmarkHaskellDepends = [
-         base criterion rio typed-process unliftio
+         base gauge rio typed-process unliftio
        ];
        homepage = "https://github.com/roman/Haskell-teardown#readme";
-       description = "Build composable components for your application with clear teardown semantics";
+       description = "Build safe and composable teardown sub-routines for resources";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -204230,6 +204795,30 @@ self: {
        license = "GPL";
      }) {};
 
+  "texmath_0_10_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.10.1.2";
+       sha256 = "08fqlnl7r2izsl3rasa27ybnnijmn8ypvi0lbzsb3vs8rsq318px";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -210650,8 +211239,8 @@ self: {
     ({ mkDerivation, base, generics-sop }:
      mkDerivation {
        pname = "tuple-sop";
-       version = "0.1.0.0";
-       sha256 = "08g0jzqngw1bkrn212rj6d5h7ppfar7q1p8b79049ivrich6zspj";
+       version = "0.2.0.1";
+       sha256 = "1l2llpn3b3v5hly3bpzyhzagnrrs830xgpqaab8w1rcbhkmqby12";
        libraryHaskellDepends = [ base generics-sop ];
        testHaskellDepends = [ base generics-sop ];
        homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme";
@@ -210902,8 +211491,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.38";
-       sha256 = "19k1z6wrizym21a29hx31yhv4y5m1w0474iqm8idyxih4fya3k7s";
+       version = "1.0.1.39";
+       sha256 = "148lan5d4mzngkfq5l5rsz20s9dcgn71y145d1y59pr7nnlg3ipw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -211951,8 +212540,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-natural";
-       version = "0.8.0.1";
-       sha256 = "0ybcivp219h8xw9k31f5cimlnj63y5s2br3rahxgdacvhdb678zg";
+       version = "0.8.1.0";
+       sha256 = "0gp0bkcc3zx2mi8pi0j6vqigif6sy2w54pkb2qv7dlmvvijm6ra2";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger singletons template-haskell
@@ -213661,8 +214250,8 @@ self: {
      }:
      mkDerivation {
        pname = "uniprot-kb";
-       version = "0.1.1.2";
-       sha256 = "15mlmappp5k8lamgmpkmyahi5vimxk3a1821c6cabs28r4d9rywy";
+       version = "0.1.2.0";
+       sha256 = "0hh6fnnmr6i4mgli07hgaagswdipa0p3ckr3jzzfcw4y5x98036l";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [
          attoparsec base hspec neat-interpolation QuickCheck text
@@ -218424,8 +219013,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "vulkan-api";
-       version = "1.1.1.0";
-       sha256 = "17209hslyqfx3lyh1a8sii3gn1ygsb5a81nampx1ym6f6gx9g3lh";
+       version = "1.1.2.0";
+       sha256 = "0l52494zi9r3fq3nx21r8pkbb7zkynz1gbrn58k8pramx7nhksb1";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/achirkin/vulkan#readme";
        description = "Low-level low-overhead vulkan api bindings";
@@ -218545,20 +219134,19 @@ self: {
 
   "wai-app-file-cgi" = callPackage
     ({ mkDerivation, array, attoparsec, attoparsec-conduit, base
-     , blaze-builder, blaze-html, bytestring, case-insensitive, conduit
-     , conduit-extra, containers, data-default-class, directory, doctest
-     , filepath, hspec, HTTP, http-client, http-conduit, http-date
-     , http-types, io-choice, lifted-base, mime-types, network, process
-     , sockaddr, static-hash, text, transformers, unix, wai, wai-conduit
-     , warp, word8
+     , bytestring, case-insensitive, conduit, conduit-extra, containers
+     , data-default-class, directory, doctest, filepath, hspec, HTTP
+     , http-client, http-conduit, http-date, http-types, io-choice
+     , lifted-base, mime-types, network, process, sockaddr, static-hash
+     , text, transformers, unix, wai, wai-conduit, warp, word8
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.1.4";
-       sha256 = "1gcrfcvll4lpd8qrpcai00cn2zs8ql46z1chlqkbi7jk31r14qy0";
+       version = "3.1.6";
+       sha256 = "1w2hmy0q8dvg575sxmc69f9x7pcf1fx6lypzxsaxyfyazvhi4krc";
        libraryHaskellDepends = [
-         array attoparsec attoparsec-conduit base blaze-builder blaze-html
-         bytestring case-insensitive conduit conduit-extra containers
+         array attoparsec attoparsec-conduit base bytestring
+         case-insensitive conduit conduit-extra containers
          data-default-class directory filepath http-client http-conduit
          http-date http-types io-choice lifted-base mime-types network
          process sockaddr static-hash text transformers unix wai wai-conduit
@@ -219700,6 +220288,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-middleware-throttle_0_2_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, containers
+     , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm
+     , text, token-bucket, transformers, wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-middleware-throttle";
+       version = "0.2.2.1";
+       sha256 = "1z4n7ja5kq7cl2117w8wx0kz3fjdzr3mlvx6m76jbgp0504vjgja";
+       libraryHaskellDepends = [
+         base bytestring bytestring-builder containers hashable http-types
+         mtl network stm text token-bucket transformers wai
+       ];
+       testHaskellDepends = [
+         base bytestring hspec http-types HUnit QuickCheck stm transformers
+         wai wai-extra
+       ];
+       description = "WAI Middleware for Request Throttling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-middleware-verbs" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hashable, http-types
      , mmorph, monad-control, monad-control-aligned, monad-logger, mtl
@@ -220334,6 +220944,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_22" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
+     , bytestring, case-insensitive, containers, directory, doctest
+     , gauge, ghc-prim, hashable, hspec, http-client, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
+     , text, time, transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.22";
+       sha256 = "03jrby2q3xb16xgbmlk3yl36g1mnwq56lj62whks438568626nv4";
+       libraryHaskellDepends = [
+         array async auto-update base bsb-http-chunked bytestring
+         case-insensitive containers ghc-prim hashable http-date http-types
+         http2 iproute network simple-sendfile stm streaming-commons text
+         unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base bsb-http-chunked bytestring
+         case-insensitive containers directory doctest ghc-prim hashable
+         hspec http-client http-date http-types http2 HUnit iproute
+         lifted-base network process QuickCheck silently simple-sendfile stm
+         streaming-commons text time transformers unix unix-compat vault wai
+         word8
+       ];
+       benchmarkHaskellDepends = [
+         auto-update base bytestring containers gauge hashable http-date
+         http-types network unix unix-compat
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-dynamic" = callPackage
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -220971,20 +221617,26 @@ self: {
      }) {};
 
   "web3" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, cryptonite, http-client, http-client-tls, memory
-     , template-haskell, text, transformers, vector
+    ({ mkDerivation, aeson, async, base, basement, bytestring, cereal
+     , cryptonite, data-default, exceptions, generics-sop, hspec
+     , hspec-contrib, hspec-discover, hspec-expectations, http-client
+     , http-client-tls, machines, memory, mtl, parsec, split, stm
+     , tagged, template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.6.0.0";
-       sha256 = "1dwwxvh11867f18lw9g2rjqsjawqa92p6063x64izdl1qj5qnwv9";
+       version = "0.7.0.0";
+       sha256 = "0mlrscl6f6l2jcsgw4x97p2qcd26d73wy8m13gbnhrh04d4kmd9h";
        libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring bytestring cryptonite
-         http-client http-client-tls memory template-haskell text
-         transformers vector
+         aeson async base basement bytestring cereal cryptonite data-default
+         exceptions generics-sop http-client http-client-tls machines memory
+         mtl parsec tagged template-haskell text transformers
+       ];
+       testHaskellDepends = [
+         async base bytestring data-default generics-sop hspec hspec-contrib
+         hspec-discover hspec-expectations memory split stm tagged text time
+         transformers
        ];
-       testHaskellDepends = [ base memory text ];
        homepage = "https://github.com/airalab/hs-web3#readme";
        description = "Ethereum API for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -227406,6 +228058,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-bin_1_6_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
+     , bytestring, Cabal, conduit, conduit-extra, containers
+     , data-default-class, directory, file-embed, filepath, fsnotify
+     , http-client, http-client-tls, http-reverse-proxy, http-types
+     , network, optparse-applicative, parsec, process, project-template
+     , resourcet, say, shakespeare, split, stm, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp
+     , warp-tls, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.6.0.2";
+       sha256 = "0x1lr6xm4h3x1ld42xs946aq4sn0g5x147bxqjxr5bfswj7vjk5k";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring blaze-builder bytestring Cabal
+         conduit conduit-extra containers data-default-class directory
+         file-embed filepath fsnotify http-client http-client-tls
+         http-reverse-proxy http-types network optparse-applicative parsec
+         process project-template resourcet say shakespeare split stm
+         streaming-commons tar template-haskell text time transformers
+         transformers-compat unix-compat unliftio unordered-containers wai
+         wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-bootstrap" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types
      , shakespeare, text, transformers, yesod-core, yesod-elements
@@ -227588,6 +228273,47 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_4" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, byteable, bytestring, case-insensitive, cereal
+     , clientsession, conduit, conduit-extra, containers, cookie
+     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
+     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
+     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
+     , resourcet, safe, semigroups, shakespeare, streaming-commons
+     , template-haskell, text, time, transformers, unix-compat, unliftio
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.6.4";
+       sha256 = "09r714ibpml8mqbqhnckync5a0kb7fyz079m9lapmvhq1yvl4zld";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup byteable bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq deepseq-generics directory fast-logger
+         http-types monad-logger mtl old-locale parsec path-pieces primitive
+         random resourcet safe semigroups shakespeare template-haskell text
+         time transformers unix-compat unliftio unordered-containers vector
+         wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base bytestring clientsession conduit conduit-extra
+         containers cookie hspec hspec-expectations http-types HUnit network
+         path-pieces QuickCheck random resourcet shakespeare
+         streaming-commons template-haskell text transformers unliftio wai
+         wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text transformers
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -227888,6 +228614,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-form-bootstrap4_1_0_0" = callPackage
+    ({ mkDerivation, base, shakespeare, text, yesod-core, yesod-form }:
+     mkDerivation {
+       pname = "yesod-form-bootstrap4";
+       version = "1.0.0";
+       sha256 = "0z19w6d612qxl0w6nmq2vc467s9s9q6ncbjjc2l620px2i7iqrfq";
+       libraryHaskellDepends = [
+         base shakespeare text yesod-core yesod-form
+       ];
+       homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme";
+       description = "renderBootstrap4";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-form-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, yesod-core, yesod-form
@@ -228821,6 +229562,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_6_3" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, conduit, containers
+     , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
+     , network, persistent, pretty-show, semigroups, text, time
+     , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types
+     , yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.6.3";
+       sha256 = "0mxjkk6bkxgjpdifvz7qlqg0ms1xh19b8r7f96lp0pcnfksnil4d";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive conduit containers cookie hspec-core html-conduit
+         http-types HUnit network persistent pretty-show semigroups text
+         time transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit text
+         unliftio wai wai-extra xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test

From e39a75cd350f03d13b3bded2bb605629f5031330 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Apr 2018 12:16:17 +0200
Subject: [PATCH 0663/3370] haskell-pandoc: update override for ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b38b17e34751..09de2116098d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -575,7 +575,7 @@ self: super: {
   brick = self.brick_0_36_2;
   HaTeX = self.HaTeX_3_19_0_0;
   matrix = self.matrix_0_3_6_1;
-  pandoc = self.pandoc_2_1_3;
+  pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;
 
   # https://github.com/xmonad/xmonad/issues/155

From 99dc2d6f0f8cfd6427e29bc7371ec0cabdcaa47a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Apr 2018 12:27:21 +0200
Subject: [PATCH 0664/3370] haskell-hpack: use latest version for ghc-8.4.x to
 fix the build

---
 .../configuration-ghc-8.4.x.nix                | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 09de2116098d..2440e3b7a9dc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -293,23 +293,6 @@ self: super: {
     };
   });
 
-  ## Unmerged.  PR: https://github.com/sol/hpack/pull/277
-  ## Issue: https://github.com/sol/hpack/issues/276
-  hpack = overrideCabal super.hpack (drv: {
-    ##     • No instance for (Semigroup Dependencies)
-    ##         arising from the 'deriving' clause of a data type declaration
-    ##       Possible fix:
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "hpack";
-      rev    = "acce0cffcc1d165a0fd9f0b83878dfbd622ea0d6";
-      sha256 = "1wv0ya1gb1hwd9w8g4z5aig694q3arsqhxv0d4wcp270xnq9ja8y";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## http-client -any, http-client-tls -any, http-types -any
-    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ http-client http-client-tls http-types ]);
-  });
-
   ## Unmerged.  PR: https://github.com/hanshoglund/monadplus/pull/3
   monadplus = overrideCabal super.monadplus (drv: {
     ##     • No instance for (Semigroup (Partial a b))
@@ -574,6 +557,7 @@ self: super: {
   # Older versions don't compile.
   brick = self.brick_0_36_2;
   HaTeX = self.HaTeX_3_19_0_0;
+  hpack = self.hpack_0_28_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;

From c60c6a2443ab45169996aba33ae883622bbc1026 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Apr 2018 12:30:57 +0200
Subject: [PATCH 0665/3370] git-annex: update sha256 hash for new 6.2018042
 version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cfa80062e3be..82ac96d2c85d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -82,7 +82,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "011kiyy1anj99ab70npl5i7pcqri0pdk04s4cvdm39zyas5m9lbd";
+      sha256 = "05rygb8jm4nh7ggzihz6664hcgwkbqspi8gbpkpf7l7wwvzdm1rd";
     };
   })).overrideScope (self: super: {
     aws = dontCheck (self.aws_0_18);

From f0549be090185a07da2be4b26f654a487c45243f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Apr 2018 12:32:01 +0200
Subject: [PATCH 0666/3370] haskell-stack: update overrides for the new 1.7.1
 version

---
 pkgs/development/haskell-modules/configuration-common.nix    | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 82ac96d2c85d..ec8e7a1bc2b7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -863,8 +863,8 @@ self: super: {
     testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
   });
 
-  # https://github.com/fpco/stackage/issues/3126
-  stack = doJailbreak super.stack;
+  # Needs newer versions than what we have in LTS-11.x at the moment.
+  stack = super.stack.overrideScope (self: super: { hpack = self.hpack_0_28_2; });
 
   # These packages depend on each other, forming an infinite loop.
   scalendar = markBroken (super.scalendar.override { SCalendar = null; });
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 b6fdb75e5506..d1bb60e83958 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -84,10 +84,11 @@ self: super: {
   purescript = doJailbreak (super.purescript);
 
   # These packages need Cabal 2.2.x, which is not the default.
-  distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
-  hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
   cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
   cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
+  distribution-nixpkgs = super.distribution-nixpkgs.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
+  hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
+  stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
   stylish-cabal = dontCheck (super.stylish-cabal.overrideScope (self: super: {
     Cabal = self.Cabal_2_2_0_1;
     haddock-library = dontHaddock (dontCheck self.haddock-library_1_5_0_1);

From 8564e93d2d695c08b1cfd8f5df9e6ca3928ead4a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Apr 2018 12:43:19 +0200
Subject: [PATCH 0667/3370] haskell-c2hs: drop hacky override and try the
 current version again

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ec8e7a1bc2b7..8c7ef561f171 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -845,17 +845,8 @@ self: super: {
   # missing dependencies: Glob >=0.7.14 && <0.8, data-fix ==0.0.4
   stack2nix = doJailbreak super.stack2nix;
 
-  # Hacks to work around https://github.com/haskell/c2hs/issues/192.
-  c2hs = (overrideCabal super.c2hs {
-    version = "0.26.2-28-g8b79823";
-    doCheck = false;
-    src = pkgs.fetchFromGitHub {
-      owner = "deech";
-      repo = "c2hs";
-      rev = "8b79823c32e234c161baec67fdf7907952ca62b8";
-      sha256 = "0hyrcyssclkdfcw2kgcark8jl869snwnbrhr9k0a9sbpk72wp7nz";
-    };
-  });
+  # Work around https://github.com/haskell/c2hs/issues/192.
+  c2hs = dontCheck super.c2hs;
 
   # Needs pginit to function and pgrep to verify.
   tmp-postgres = overrideCabal super.tmp-postgres (drv: {

From 9f144e857870d706e85c6655d563258a291c3963 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 28 Apr 2018 12:45:52 +0200
Subject: [PATCH 0668/3370] haskell-hspec-smallcheck: use latest version for
 ghc-8.4.x to fix the build

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 2440e3b7a9dc..da65c2698228 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -558,6 +558,7 @@ self: super: {
   brick = self.brick_0_36_2;
   HaTeX = self.HaTeX_3_19_0_0;
   hpack = self.hpack_0_28_2;
+  hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;

From 65adfc73ad6226c01d80ed2a19aefd02225e453d Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 28 Apr 2018 14:19:15 +0100
Subject: [PATCH 0669/3370] zerotierone: 1.2.4 -> 1.2.8

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

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index 77df8cbf6f7d..ec6c9c196788 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.4";
+  version = "1.2.8";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "0n035f2qslw1srxjlm0szrnvb3va3sspbpxqqhng08dp68vmn9wz";
+    sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8";
   };
 
   preConfigure = ''
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "Create flat virtual Ethernet networks of almost unlimited size";
     homepage = https://www.zerotier.com;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ];
+    maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ];
     platforms = platforms.x86_64 ++ platforms.aarch64;
   };
 }

From 75cfbdf33b0423c2bd8f9fb20393267ef02bbf9d Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 15 Apr 2018 13:43:42 +0100
Subject: [PATCH 0670/3370] buildFHSUserEnv: change to root directory after
 chroot

Fixes #38525
---
 pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
index c03a1710f451..7e49e9e78d78 100644
--- a/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
+++ b/pkgs/build-support/build-fhs-userenv/chrootenv/chrootenv.c
@@ -118,6 +118,7 @@ int main(gint argc, gchar **argv) {
     bind("/", prefix);
 
     fail_if(chroot(prefix));
+    fail_if(chdir("/"));
     fail_if(execvp(*argv, argv));
   }
 

From eaf0592498070e3184316c9c63c3dd1c5264cd95 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 2 Feb 2018 07:51:23 +0000
Subject: [PATCH 0671/3370] ocamlPackages.ocsigen_server: 2.8 -> 2.9

---
 .../ocaml-modules/ocsigen-server/default.nix  | 33 ++++++++++++++-----
 pkgs/top-level/ocaml-packages.nix             |  2 +-
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
index 081f9edbecf9..efbb12304970 100644
--- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, ocaml, findlib, which, react, ssl,
-lwt, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
+{ stdenv, fetchurl, ocaml, findlib, which, react, ssl
+, ocamlnet, ocaml_pcre, cryptokit, tyxml, ipaddr, zlib,
 libev, openssl, ocaml_sqlite3, tree, uutf, makeWrapper, camlp4
-, camlzip, pgocaml
+, camlzip, pgocaml, lwt2, lwt_react, lwt_ssl
 }:
 
 let mkpath = p: n:
@@ -9,17 +9,32 @@ let mkpath = p: n:
   "${p}/lib/ocaml/${v}/site-lib/${n}";
 in
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.03" then {
+    version = "2.9";
+    sha256 = "0na3qa4h89f2wv31li63nfpg4151d0g8fply0bq59j3bhpyc85nd";
+    buildInputs = [ lwt_react lwt_ssl ];
+    ldpath = "";
+  } else {
+    version = "2.8";
+    sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
+    buildInputs = [ lwt2 ];
+    ldpath = "${mkpath lwt2 "lwt"}";
+  }
+; in
+
 stdenv.mkDerivation {
-  name = "ocsigenserver-2.8";
+  name = "ocsigenserver-${param.version}";
 
   src = fetchurl {
-    url = https://github.com/ocsigen/ocsigenserver/archive/2.8.tar.gz;
-    sha256 = "1v44qv2ixd7i1qinyhlzzqiffawsdl7xhhh6ysd7lf93kh46d5sy";
+    url = "https://github.com/ocsigen/ocsigenserver/archive/${param.version}.tar.gz";
+    inherit (param) sha256;
   };
 
-  buildInputs = [ocaml which findlib react ssl lwt
+  buildInputs = [ocaml which findlib react ssl
   ocamlnet ocaml_pcre cryptokit tyxml ipaddr zlib libev openssl
-  ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ];
+  ocaml_sqlite3 tree uutf makeWrapper camlp4 pgocaml camlzip ]
+  ++ (param.buildInputs or []);
 
   configureFlags = "--root $(out) --prefix /";
 
@@ -31,7 +46,7 @@ stdenv.mkDerivation {
   ''
   rm -rf $out/var/run
   wrapProgram $out/bin/ocsigenserver \
-    --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath lwt "lwt"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
+    --prefix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${param.ldpath}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath cryptokit "cryptokit"}:${mkpath ocaml_sqlite3 "sqlite3"}"
   '';
 
   dontPatchShebangs = true;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 741a58ce588a..22efb8a8a353 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -504,7 +504,7 @@ let
 
     ocplib-simplex = callPackage ../development/ocaml-modules/ocplib-simplex { };
 
-    ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { lwt = lwt2; };
+    ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { };
 
     ocsigen-start = callPackage ../development/ocaml-modules/ocsigen-start { };
 

From 8994fff8bb06b86c42aff28b8ef6f9cc77cb81af Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 31 Mar 2018 05:41:24 +0000
Subject: [PATCH 0672/3370] ocamlPackages.eliom: 6.2.0 -> 6.3.0

---
 .../ocaml-modules/eliom/default.nix           | 40 ++++++++++++-------
 pkgs/top-level/ocaml-packages.nix             |  5 +--
 2 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 42afec7e439d..da9383c4e95b 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,35 +1,47 @@
-{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml,
-  js_of_ocaml, react, lwt, calendar, cryptokit, tyxml,
-  ipaddr, ocamlnet, ssl, ocaml_pcre, ocaml_optcomp,
-  reactivedata, opam, ppx_tools, ppx_deriving, findlib
-, ocamlbuild
+{ stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4,
+  js_of_ocaml, lwt_react, cryptokit,
+  ipaddr, ocamlnet, lwt_ssl, ocaml_pcre,
+  opam, ppx_tools, ppx_deriving, findlib
+, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
+, js_of_ocaml-lwt
+, js_of_ocaml-tyxml
 }:
 
-assert stdenv.lib.versionAtLeast ocaml.version "4.02";
+assert stdenv.lib.versionAtLeast ocaml.version "4.03";
 
 stdenv.mkDerivation rec
 {
   pname = "eliom";
-  version = "6.2.0";
+  version = "6.3.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
-    sha256 = "01c4l982ld6d1ndhb6f15ldb2li7mv0bs279d5gs99mpiwsapadx";
+    sha256 = "137hgdzv9fwkzf6xdksqy437lrf8xvrycf5jwc3z4cmpsigs6x7v";
   };
 
   patches = [ ./camlp4.patch ];
 
-  buildInputs = [ ocaml which findlib ocamlbuild ocaml_optcomp opam ppx_tools ];
+  buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opam ppx_tools
+    ocsigen_deriving
+  ];
 
-  propagatedBuildInputs = [ lwt reactivedata tyxml ipaddr ocsigen_server ppx_deriving
-                            ocsigen_deriving js_of_ocaml
-                            calendar cryptokit ocamlnet react ssl ocaml_pcre ];
+  propagatedBuildInputs = [
+    camlp4
+    cryptokit
+    ipaddr
+    js_of_ocaml-lwt
+    js_of_ocaml-ppx
+    js_of_ocaml-tyxml
+    lwt_react
+    lwt_ssl
+    ocamlnet ocaml_pcre
+    ocsigen_server
+    ppx_deriving
+  ];
 
   installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
-  createFindlibDestdir = true;
-
   setupHook = [ ./setup-hook.sh ];
 
   meta = {
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 22efb8a8a353..92f772bb25ea 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -217,10 +217,7 @@ let
 
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
-    eliom = callPackage ../development/ocaml-modules/eliom {
-      lwt = lwt2;
-      js_of_ocaml = js_of_ocaml_2;
-    };
+    eliom = callPackage ../development/ocaml-modules/eliom { };
 
     enumerate = callPackage ../development/ocaml-modules/enumerate { };
 

From 9a170f5bdfbf87d6e31ab070528d78b4ea7d405b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Apr 2018 06:54:23 +0000
Subject: [PATCH 0673/3370] ocamlPackages.ocsigen-toolkit: 1.0.0 -> 1.1.0

---
 .../ocaml-modules/ocsigen-toolkit/default.nix        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 00416c92bb94..556c343241c3 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, buildOcaml, ocaml, eliom, opam }:
+{ stdenv, fetchurl, buildOcaml, ocaml, opam
+, calendar, eliom, js_of_ocaml-ppx_deriving_json
+}:
 
 buildOcaml rec
 {
  name = "ocsigen-toolkit";
- version = "1.0.0";
+ version = "1.1.0";
 
- propagatedBuildInputs = [ eliom ];
+ propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
  buildInputs = [ opam ];
 
- createFindlibDestdir = true;
-
  installPhase =
   ''
     export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
@@ -18,7 +18,7 @@ buildOcaml rec
   '';
 
   src = fetchurl {
-    sha256 = "0wm4fnss7vlkd03ybgfrk63kpip6m6p6kdqjn3f64n11256mwzj2";
+    sha256 = "1i5806gaqqllgsgjz3lf9fwlffqg3vfl49msmhy7xvq2sncbxp8a";
     url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
   };
 

From 7d7afdde4a9b5e9853ac4e0ff8477debdfc302b4 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 1 Apr 2018 07:00:07 +0000
Subject: [PATCH 0674/3370] ocamlPackages.ocsigen-start: 1.0.0 -> 1.1.0

---
 .../ocaml-modules/ocsigen-start/default.nix          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
index 13794602af4f..ba7e3e93c989 100644
--- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ojquery, magick, ocsigen_deriving, ocsigen_server }:
+{ stdenv, fetchurl, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server
+, js_of_ocaml-camlp4
+}:
 
 buildOcaml rec
 {
   name = "ocsigen-start";
-  version = "1.0.0";
+  version = "1.1.0";
 
-  buildInputs = [ eliom ];
-  propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ojquery ocsigen_deriving ocsigen_server magick ];
+  buildInputs = [ eliom js_of_ocaml-camlp4 ];
+  propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server ];
 
   patches = [ ./templates-dir.patch ];
 
@@ -16,7 +18,7 @@ buildOcaml rec
   
   src = fetchurl {
     url = "https://github.com/ocsigen/${name}/archive/${version}.tar.gz";
-    sha256 = "0npc2iq39ixci6ly0fssklv07zqi5cfa1adad4hm8dbzjawkqqll";
+    sha256 = "09cw6qzcld0m1qm66mbjg9gw8l6dynpw3fzhm3kfx5ldh0afgvjq";
   };
 
   createFindlibDestdir = true;

From 1b1b76f70a9dbf59ad8e833f9de3a60f14cf5471 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 28 Apr 2018 17:24:31 +0200
Subject: [PATCH 0675/3370] nixos/tests/chromium: Wait 10s after new window

This is a very very very ugly workaround and it's because Chromium seems
to eat keystroke for a few seconds after a new window is created.

I haven't found a better solution yet, so let's at least unbreak the
test until we come up with a better way.

Thanks to @vcunat for bringing this to my attention and also doing the
initial bisect.

The change that brought up this problem was 2b29e401531306d044f797a5dfa,
which updated Chromium from version 65.0.3325.181 to version
66.0.3359.117. Unfortunately the upstream changelog[1] is way too large
to actually guess what the breaking change is.

[1]: https://chromium.googlesource.com/chromium/src/+log/65.0.3325.181..66.0.3359.117?pretty=fuller&n=10000

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @bendlas, @vcunat
---
 nixos/tests/chromium.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 65c314e22e1d..c341e83961a8 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -94,6 +94,11 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
           ''}");
           if ($status == 0) {
             $ret = 1;
+
+            # XXX: Somehow Chromium is not accepting keystrokes for a few
+            # seconds after a new window has appeared, so let's wait a while.
+            $machine->sleep(10);
+
             last;
           }
           $machine->sleep(1);

From 3b8c7424d1948e52bc2afe0e41e3b64db3f2c22b Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine.chikhaoui91@gmail.com>
Date: Sat, 28 Apr 2018 16:52:46 +0100
Subject: [PATCH 0676/3370] pull the ssh host keys from the metadata service as
 expected by NixOps. Issues: #38623
 https://github.com/NixOS/nixops/issues/930.

---
 .../modules/virtualisation/google-compute-image.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 0b6bec786da4..e0d8027c67aa 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -221,7 +221,7 @@ in
           echo "Obtaining SSH keys..."
           mkdir -m 0700 -p /root/.ssh
           AUTH_KEYS=$(${mktemp})
-          ${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys
+          ${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys
           if [ -s $AUTH_KEYS ]; then
 
             # Read in key one by one, split in case Google decided
@@ -246,6 +246,17 @@ in
             false
           fi
           rm -f $AUTH_KEYS
+          SSH_HOST_KEYS_DIR=$(${mktemp} -d)
+          ${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key
+          ${wget} -O $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub http://metadata.google.internal/computeMetadata/v1/instance/attributes/ssh_host_ed25519_key_pub
+          if [ -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key -a -s $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key.pub ]; then
+              mv -f $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key* /etc/ssh/
+              chmod 600 /etc/ssh/ssh_host_ed25519_key
+              chmod 644 /etc/ssh/ssh_host_ed25519_key.pub
+          else
+              echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed."
+          fi
+          rm -f $SSH_HOST_KEYS_DIR/*
         '';
       serviceConfig.Type = "oneshot";
       serviceConfig.RemainAfterExit = true;

From 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine.chikhaoui91@gmail.com>
Date: Sat, 28 Apr 2018 17:06:25 +0100
Subject: [PATCH 0677/3370] remove the entire temporary directory

---
 nixos/modules/virtualisation/google-compute-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index e0d8027c67aa..f175be673bad 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -256,7 +256,7 @@ in
           else
               echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed."
           fi
-          rm -f $SSH_HOST_KEYS_DIR/*
+          rm -f $SSH_HOST_KEYS_DIR
         '';
       serviceConfig.Type = "oneshot";
       serviceConfig.RemainAfterExit = true;

From f514a6896919f090cd811ebd9866ace1bb4b2b54 Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine.chikhaoui91@gmail.com>
Date: Sat, 28 Apr 2018 17:07:54 +0100
Subject: [PATCH 0678/3370] barf if pulling the ssh host keys fails

---
 nixos/modules/virtualisation/google-compute-image.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index f175be673bad..374a84332357 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -255,6 +255,7 @@ in
               chmod 644 /etc/ssh/ssh_host_ed25519_key.pub
           else
               echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed."
+              false
           fi
           rm -f $SSH_HOST_KEYS_DIR
         '';

From c7713e9775ba66a1685fb52dc632114b352790d4 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Sat, 28 Apr 2018 19:39:15 +0200
Subject: [PATCH 0679/3370] mono: change default version to "latest" (5.8),
 because 4.0 does not evaluate due to security

---
 pkgs/top-level/all-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cac46ff0f4cc..788d346684b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6706,12 +6706,12 @@ with pkgs;
 
   mlton = callPackage ../development/compilers/mlton { };
 
-  mono = mono40;
+  mono = mono58;
 
-  mono40 = callPackage ../development/compilers/mono/4.0.nix {
+  mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) Foundation;
-  };
+  });
 
   mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix {
     inherit (darwin) libobjc;
@@ -6738,10 +6738,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation;
   });
 
-  mono58 = lowPrio (callPackage ../development/compilers/mono/5.8.nix {
+  mono58 = callPackage ../development/compilers/mono/5.8.nix {
     inherit (darwin) libobjc;
     inherit (darwin.apple_sdk.frameworks) Foundation;
-  });
+  };
 
   monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
 

From d71df79998c59522634073b252210392d482da28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 28 Apr 2018 19:58:03 +0200
Subject: [PATCH 0680/3370] home-assistant: 0.67.1 -> 0.68.0

---
 pkgs/servers/home-assistant/component-packages.nix | 13 +++++++++----
 pkgs/servers/home-assistant/default.nix            |  8 ++++----
 pkgs/servers/home-assistant/frontend.nix           |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 3a74a43d14d5..c2f06cd6a8e3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.67.1";
+  version = "0.68.0";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -86,7 +86,7 @@
     "device_tracker.unifi" = ps: with ps; [ pyunifi ];
     "device_tracker.unifi_direct" = ps: with ps; [ pexpect ];
     "device_tracker.upc_connect" = ps: with ps; [ defusedxml ];
-    "device_tracker.xiaomi_miio" = ps: with ps; [  ];
+    "device_tracker.xiaomi_miio" = ps: with ps; [ construct ];
     "digital_ocean" = ps: with ps; [ digital-ocean ];
     "discovery" = ps: with ps; [ netdisco ];
     "dominos" = ps: with ps; [  ];
@@ -99,10 +99,12 @@
     "emulated_hue" = ps: with ps; [ aiohttp-cors ];
     "enocean" = ps: with ps; [  ];
     "envisalink" = ps: with ps; [  ];
+    "eufy" = ps: with ps; [  ];
     "fan.xiaomi_miio" = ps: with ps; [ construct ];
     "feedreader" = ps: with ps; [ feedparser ];
     "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
     "folder_watcher" = ps: with ps; [ watchdog ];
+    "fritzbox" = ps: with ps; [  ];
     "frontend" = ps: with ps; [  ];
     "gc100" = ps: with ps; [  ];
     "goalfeed" = ps: with ps; [  ];
@@ -110,6 +112,7 @@
     "hdmi_cec" = ps: with ps; [  ];
     "hive" = ps: with ps; [  ];
     "homekit" = ps: with ps; [  ];
+    "homekit_controller" = ps: with ps; [  ];
     "homematic" = ps: with ps; [ pyhomematic ];
     "homematicip_cloud" = ps: with ps; [  ];
     "http" = ps: with ps; [ aiohttp-cors ];
@@ -166,6 +169,7 @@
     "media_extractor" = ps: with ps; [  ];
     "media_player.anthemav" = ps: with ps; [  ];
     "media_player.aquostv" = ps: with ps; [  ];
+    "media_player.blackbird" = ps: with ps; [  ];
     "media_player.bluesound" = ps: with ps; [ xmltodict ];
     "media_player.braviatv" = ps: with ps; [  ];
     "media_player.cast" = ps: with ps; [ PyChromecast ];
@@ -294,7 +298,6 @@
     "sensor.dovado" = ps: with ps; [  ];
     "sensor.dsmr" = ps: with ps; [  ];
     "sensor.dweet" = ps: with ps; [  ];
-    "sensor.ebox" = ps: with ps; [  ];
     "sensor.eddystone_temperature" = ps: with ps; [ construct ];
     "sensor.eliqonline" = ps: with ps; [  ];
     "sensor.envirophat" = ps: with ps; [  ];
@@ -354,6 +357,7 @@
     "sensor.serial" = ps: with ps; [  ];
     "sensor.serial_pm" = ps: with ps; [  ];
     "sensor.shodan" = ps: with ps; [  ];
+    "sensor.sht31" = ps: with ps; [  ];
     "sensor.sma" = ps: with ps; [  ];
     "sensor.snmp" = ps: with ps; [ pysnmp ];
     "sensor.sochain" = ps: with ps; [  ];
@@ -378,6 +382,7 @@
     "sensor.twitch" = ps: with ps; [  ];
     "sensor.uber" = ps: with ps; [  ];
     "sensor.ups" = ps: with ps; [  ];
+    "sensor.uscis" = ps: with ps; [  ];
     "sensor.vasttrafik" = ps: with ps; [  ];
     "sensor.waqi" = ps: with ps; [  ];
     "sensor.waze_travel_time" = ps: with ps; [  ];
@@ -434,7 +439,7 @@
     "twilio" = ps: with ps; [ twilio ];
     "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
-    "upnp" = ps: with ps; [ miniupnpc ];
+    "upnp" = ps: with ps; [  ];
     "usps" = ps: with ps; [  ];
     "vacuum.roomba" = ps: with ps; [  ];
     "vacuum.xiaomi_miio" = ps: with ps; [ construct ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 0f15b21e4685..0751ffb3c9ed 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -8,10 +8,10 @@ let
   py = python3.override {
     packageOverrides = self: super: {
       aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
-        version = "3.1.1";
+        version = "3.1.3";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "dc5cab081d4b334d0440b019edf24fe1cb138b8114e0e22d2b0661284bc1775f";
+          sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad";
         };
       });
       pytest = super.pytest.overridePythonAttrs (oldAttrs: rec {
@@ -58,7 +58,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.67.1";
+  hassVersion = "0.68.0";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -73,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "02czbqdsdar8rjkr0r5g6j1x9caazcir2w1hp595z4cn90c0342f";
+    sha256 = "037gc2sghg5n0li087vvjcf6657rd31wv0m5r23b2cdfds8lxk4w";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index fbafa87e622e..678b5d3826c7 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20180404.0";
+  version = "20180426.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ac36d4f5e30e93b02dadd2ecdc07218fde3d97ffc2f69a6f1acf5e601cd4e5ad";
+    sha256 = "60ff4e0b0c4538fa0be0db9407f95333546940e119a8d3edb9b0d7e1c86b1f3b";
   };
 
   propagatedBuildInputs = [ user-agents ];

From e22ba26c7b33cb262e8c393c5fbaea6579100acd Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Tue, 17 Apr 2018 16:21:28 +0100
Subject: [PATCH 0681/3370] binutils: apply patch on aarch64 to fix
 https://sourceware.org/bugzilla/show_bug.cgi?id=22764

(cherry picked from commit 5ce2d3355d4bcda5e1393b0cfb52b834e82d2546)
---
 .../tools/misc/binutils/default.nix           |   8 +-
 ...RCH64_ABS32-R_AARCH64_ABS16-absolute.patch | 130 ++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e65736a3e887..ac055171658b 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -64,7 +64,13 @@ stdenv.mkDerivation rec {
 
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22868
     ./gold-symbol-visibility.patch
-  ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
+  ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch
+    ++ stdenv.lib.optionals targetPlatform.isAarch64 [
+    # Version 2.30 introduced strict requirements on ELF relocations which cannot
+    # be satisfied on aarch64 platform. Add backported fix from bugzilla.
+    # https://sourceware.org/bugzilla/show_bug.cgi?id=22764
+    ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
+  ];
 
   outputs = [ "out" "info" "man" ];
 
diff --git a/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
new file mode 100644
index 000000000000..6a04b3cc5588
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
@@ -0,0 +1,130 @@
+diff --git a/bfd/ChangeLog b/bfd/ChangeLog
+index c310da6ed3..d31f46171f 100644
+--- a/bfd/ChangeLog
++++ b/bfd/ChangeLog
+@@ -1,3 +1,10 @@
++2018-02-05  Renlin Li  <renlin.li@arm.com>
++
++       PR ld/22764
++       * elfnn-aarch64.c (elfNN_aarch64_check_relocs): Relax the
++       R_AARCH64_ABS32 and R_AARCH64_ABS16 for absolute symbol. Apply the
++       check for writeable section as well.
++
+ 2018-01-27  Nick Clifton  <nickc@redhat.com>
+ 
+ 	This is the 2.30 release:
+diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
+index d5711e0eb1..973188220b 100644
+--- a/bfd/elfnn-aarch64.c
++++ b/bfd/elfnn-aarch64.c
+@@ -7074,10 +7074,19 @@ elfNN_aarch64_check_relocs (bfd *abfd, struct bfd_link_info *info,
+ #if ARCH_SIZE == 64
+ 	case BFD_RELOC_AARCH64_32:
+ #endif
+-	  if (bfd_link_pic (info)
+-	      && (sec->flags & SEC_ALLOC) != 0
+-	      && (sec->flags & SEC_READONLY) != 0)
++	  if (bfd_link_pic (info) && (sec->flags & SEC_ALLOC) != 0)
+ 	    {
++	      if (h != NULL
++		  /* This is an absolute symbol.  It represents a value instead
++		     of an address.  */
++		  && ((h->root.type == bfd_link_hash_defined
++		       && bfd_is_abs_section (h->root.u.def.section))
++		      /* This is an undefined symbol.  */
++		      || h->root.type == bfd_link_hash_undefined))
++		break;
++
++	      /* For local symbols, defined global symbols in a non-ABS section,
++		 it is assumed that the value is an address.  */
+ 	      int howto_index = bfd_r_type - BFD_RELOC_AARCH64_RELOC_START;
+ 	      _bfd_error_handler
+ 		/* xgettext:c-format */
+diff --git a/ld/ChangeLog b/ld/ChangeLog
+index 6337cd0cb6..1aaa6da3b5 100644
+--- a/ld/ChangeLog
++++ b/ld/ChangeLog
+@@ -1,3 +1,11 @@
++2018-02-05  Renlin Li  <renlin.li@arm.com>
++
++       PR ld/22764
++       * testsuite/ld-aarch64/emit-relocs-258.s: Define symbol as an address.
++       * testsuite/ld-aarch64/emit-relocs-259.s: Likewise.
++       * testsuite/ld-aarch64/pr22764.s: New.
++       * testsuite/ld-aarch64/pr22764.d: New.
++
+ 2018-01-27  Nick Clifton  <nickc@redhat.com>
+ 
+ 	This is the 2.30 release:
+diff --git a/ld/testsuite/ld-aarch64/aarch64-elf.exp b/ld/testsuite/ld-aarch64/aarch64-elf.exp
+index f31089361b..d766f3736b 100644
+--- a/ld/testsuite/ld-aarch64/aarch64-elf.exp
++++ b/ld/testsuite/ld-aarch64/aarch64-elf.exp
+@@ -275,6 +275,7 @@ run_dump_test "pr17415"
+ run_dump_test_lp64 "tprel_g2_overflow"
+ run_dump_test "tprel_add_lo12_overflow"
+ run_dump_test "protected-data"
++run_dump_test_lp64 "pr22764"
+ 
+ # ifunc tests
+ run_dump_test "ifunc-1"
+diff --git a/ld/testsuite/ld-aarch64/emit-relocs-258.s b/ld/testsuite/ld-aarch64/emit-relocs-258.s
+index f724776243..87bb657c5d 100644
+--- a/ld/testsuite/ld-aarch64/emit-relocs-258.s
++++ b/ld/testsuite/ld-aarch64/emit-relocs-258.s
+@@ -1,5 +1,6 @@
++.global dummy
+ .text
+-
++dummy:
+   ldr x0, .L1
+ 
+ .L1:
+diff --git a/ld/testsuite/ld-aarch64/emit-relocs-259.s b/ld/testsuite/ld-aarch64/emit-relocs-259.s
+index 7e1ba3ceb4..0977c9d869 100644
+--- a/ld/testsuite/ld-aarch64/emit-relocs-259.s
++++ b/ld/testsuite/ld-aarch64/emit-relocs-259.s
+@@ -1,5 +1,6 @@
++.global dummy
+ .text
+-
++dummy:
+   ldr x0, .L1
+ 
+ .L1:
+diff --git a/ld/testsuite/ld-aarch64/pr22764.d b/ld/testsuite/ld-aarch64/pr22764.d
+new file mode 100644
+index 0000000000..997519f469
+--- /dev/null
++++ b/ld/testsuite/ld-aarch64/pr22764.d
+@@ -0,0 +1,18 @@
++#source: pr22764.s
++#ld: -shared -T relocs.ld -defsym sym_abs1=0x1 -defsym sym_abs2=0x2 -defsym sym_abs3=0x3 -e0 --emit-relocs
++#notarget: aarch64_be-*-*
++#objdump: -dr
++#...
++
++Disassembly of section \.text:
++
++0000000000010000 \<\.text\>:
++   10000:	d503201f 	nop
++	...
++			10004: R_AARCH64_ABS64	sym_abs1
++   1000c:	00000002 	\.word	0x00000002
++			1000c: R_AARCH64_ABS32	sym_abs2
++   10010:	0003      	\.short	0x0003
++			10010: R_AARCH64_ABS16	sym_abs3
++   10012:	0000      	\.short	0x0000
++   10014:	d503201f 	nop
+diff --git a/ld/testsuite/ld-aarch64/pr22764.s b/ld/testsuite/ld-aarch64/pr22764.s
+new file mode 100644
+index 0000000000..25e36b4a12
+--- /dev/null
++++ b/ld/testsuite/ld-aarch64/pr22764.s
+@@ -0,0 +1,6 @@
++  .text
++  nop
++  .xword sym_abs1
++  .word sym_abs2
++  .short sym_abs3
++  nop

From e8012dd2ddf0bc84bc8f76aaf2b958f553536da5 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 28 Apr 2018 19:01:55 +0000
Subject: [PATCH 0682/3370] scala: 2.12.5 -> 2.12.6

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

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index bfbd9d05d05b..a25d4f6e6544 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.12.5";
+  name = "scala-2.12.6";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "18bah2n3jfvc3cb10n4b3d6pwm3rwlqp7lrfvafjxccmlklzyqdj";
+    sha256 = "05ili2959yrshqi44wpmwy0dyfm4kvp6i8mlbnj1xvc5b9649iqs";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 2eb42290e7fbe634a87720d7d954864049729a00 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 28 Apr 2018 19:05:46 +0000
Subject: [PATCH 0683/3370] linux-copperhead: 4.14.36.a -> 4.14.37.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
index dfe58119da26..76b59ee75fb1 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.14.36";
+  version = "4.14.37";
   revision = "a";
-  sha256 = "052ck8giy5nxy7871crhx6cdkgzzzpffdm8ilq1ys0rd3vldzl9b";
+  sha256 = "0dwi17hx13kkccqc2315dnb8sfdc0jgv9v4b1xd10v2pnq7qb0x8";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 844c08ec0a5b79abb16d9de5bd39ed492f4fc214 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 28 Apr 2018 19:46:25 +0000
Subject: [PATCH 0684/3370] linux-copperhead: Add 4.16.5.a

Separate LTS and stable kernel releases
---
 ...-hardened.nix => linux-copperhead-lts.nix} |  0
 .../linux/kernel/linux-copperhead-stable.nix  | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 21 ++++++++-----
 3 files changed, 44 insertions(+), 7 deletions(-)
 rename pkgs/os-specific/linux/kernel/{linux-copperhead-hardened.nix => linux-copperhead-lts.nix} (100%)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
similarity index 100%
rename from pkgs/os-specific/linux/kernel/linux-copperhead-hardened.nix
rename to pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
new file mode 100644
index 000000000000..86b7eaa8823e
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
+
+with stdenv.lib;
+
+let
+  version = "4.16.5";
+  revision = "a";
+  sha256 = "150cwq51x3cnnvnd7izizi93jmiqs0na15p8ip4vkm5frspmnks7";
+
+  # modVersion needs to be x.y.z, will automatically add .0 if needed
+  modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
+
+  # branchVersion needs to be x.y
+  branchVersion = concatStrings (intersperse "." (take 2 (splitString "." version)));
+
+  modDirVersion = "${modVersion}-hardened";
+in
+buildLinux (args // {
+  inherit modDirVersion;
+
+  version = "${version}-${revision}";
+  extraMeta.branch = "${branchVersion}";
+
+  src = fetchFromGitHub {
+    inherit sha256;
+    owner = "copperhead";
+    repo = "linux-hardened";
+    rev = "${version}.${revision}";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afd6a60ee060..3bc6ca6e96c2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13321,11 +13321,19 @@ with pkgs;
       ];
   };
 
-  linux_copperhead = callPackage ../os-specific/linux/kernel/linux-copperhead-hardened.nix {
+  linux_copperhead_lts = callPackage ../os-specific/linux/kernel/linux-copperhead-lts.nix {
     kernelPatches = with kernelPatches; [
-      kernelPatches.bridge_stp_helper
-      kernelPatches.modinst_arg_list_too_long
-      kernelPatches.tag_hardened
+      bridge_stp_helper
+      modinst_arg_list_too_long
+      tag_hardened
+    ];
+  };
+
+  linux_copperhead_stable = callPackage ../os-specific/linux/kernel/linux-copperhead-stable.nix {
+    kernelPatches = with kernelPatches; [
+      bridge_stp_helper
+      modinst_arg_list_too_long
+      tag_hardened
     ];
   };
 
@@ -13661,9 +13669,8 @@ with pkgs;
 
   linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
 
-  linuxPackages_copperhead_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead);
-  linux_copperhead_hardened = linuxPackages_copperhead_hardened.kernel;
-  linux_hardened_copperhead = linux_copperhead_hardened; # alias for backward compatibility
+  linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts);
+  linuxPackages_copperhead_stable = recurseIntoAttr (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable);
 
   # Samus kernels
   linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);

From 094683ac36e9595a9997a40cd155db5705c0266c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 23 Feb 2018 18:48:15 +0100
Subject: [PATCH 0685/3370] =?UTF-8?q?syncthing-gtk:=200.9.2.7=20=E2=86=92?=
 =?UTF-8?q?=200.9.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../networking/syncthing-gtk/default.nix      | 12 +++---
 ...sable-syncthing-binary-configuration.patch | 40 +++++++++----------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix
index ae715aa4321c..4db546651dd9 100644
--- a/pkgs/applications/networking/syncthing-gtk/default.nix
+++ b/pkgs/applications/networking/syncthing-gtk/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchFromGitHub, libnotify, librsvg, psmisc, gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
+{ stdenv, fetchFromGitHub, libnotify, librsvg, darwin, psmisc, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3, bcrypt, gobjectIntrospection }:
 
 buildPythonApplication rec {
-  version = "0.9.2.7";
+  version = "0.9.3.1";
   name = "syncthing-gtk-${version}";
 
   src = fetchFromGitHub {
     owner = "syncthing";
     repo = "syncthing-gtk";
     rev = "v${version}";
-    sha256 = "08k7vkibia85klwjxbnzk67h4pphrizka5v9zxwvvv3cisjiclc2";
+    sha256 = "15bh9i0j0g7hrqsz22px8g2bg0xj4lsn81rziznh9fxxx5b9v9bb";
   };
 
   nativeBuildInputs = [
@@ -18,8 +18,8 @@ buildPythonApplication rec {
   ];
 
   buildInputs = [
-    gtk3 librsvg
-    libnotify
+    gtk3 librsvg libappindicator-gtk3
+    libnotify gnome3.adwaita-icon-theme
     # Schemas with proxy configuration
     gnome3.gsettings-desktop-schemas
   ];
@@ -32,7 +32,7 @@ buildPythonApplication rec {
     ./disable-syncthing-binary-configuration.patch
     (substituteAll {
       src = ./paths.patch;
-      killall = "${psmisc}/bin/killall";
+      killall = "${if stdenv.isDarwin then darwin.shell_cmds else psmisc}/bin/killall";
       syncthing = "${syncthing}/bin/syncthing";
     })
   ];
diff --git a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
index 6c516e98acb1..14c2b62e6e38 100644
--- a/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
+++ b/pkgs/applications/networking/syncthing-gtk/disable-syncthing-binary-configuration.patch
@@ -1,5 +1,5 @@
---- a/find-daemon.glade
-+++ b/find-daemon.glade
+--- a/glade/find-daemon.glade
++++ b/glade/find-daemon.glade
 @@ -112,6 +112,7 @@
                    <object class="GtkEntry" id="vsyncthing_binary">
                      <property name="visible">True</property>
@@ -16,6 +16,24 @@
                      <property name="receives_default">True</property>
                      <property name="use_underline">True</property>
                      <property name="yalign">0.51999998092651367</property>
+--- a/glade/ui-settings.glade
++++ b/glade/ui-settings.glade
+@@ -943,6 +943,7 @@
+                     <property name="label" translatable="yes">_Browse...</property>
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
++                    <property name="sensitive">False</property>
+                     <property name="receives_default">True</property>
+                     <property name="use_underline">True</property>
+                     <property name="yalign">0.51999998092651367</property>
+@@ -974,6 +975,7 @@
+                   <object class="GtkEntry" id="vsyncthing_binary">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
++                    <property name="sensitive">False</property>
+                     <property name="hexpand">True</property>
+                     <signal name="changed" handler="cb_check_value" swapped="no"/>
+                   </object>
 --- a/syncthing_gtk/configuration.py
 +++ b/syncthing_gtk/configuration.py
 @@ -168,6 +168,8 @@
@@ -57,21 +75,3 @@
  		self.add_page(GenerateKeysPage())
  		self.add_page(HttpSettingsPage())
  		self.add_page(SaveSettingsPage())
---- a/ui-settings.glade
-+++ b/ui-settings.glade
-@@ -943,6 +943,7 @@
-                     <property name="label" translatable="yes">_Browse...</property>
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="receives_default">True</property>
-                     <property name="use_underline">True</property>
-                     <property name="yalign">0.51999998092651367</property>
-@@ -974,6 +975,7 @@
-                   <object class="GtkEntry" id="vsyncthing_binary">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-+                    <property name="sensitive">False</property>
-                     <property name="hexpand">True</property>
-                     <signal name="changed" handler="cb_check_value" swapped="no"/>
-                   </object>

From 5c8c4710bae57549b4c4dfd4c772cb67a6e7a7e3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 28 Apr 2018 20:19:00 +0000
Subject: [PATCH 0686/3370] openjdk: 10.0.0 -> 10.0.1

---
 pkgs/development/compilers/openjdk/10.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix
index 9cc774727b71..7882fa49b07e 100644
--- a/pkgs/development/compilers/openjdk/10.nix
+++ b/pkgs/development/compilers/openjdk/10.nix
@@ -17,8 +17,8 @@ let
       "i386"
     else "amd64";
 
-  update = "10";
-  build = "46";
+  update = "10.0.1";
+  build = "10";
   repover = "jdk-${update}+${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
 
@@ -27,7 +27,7 @@ let
 
     src = fetchurl {
       url = "http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/${repover}.tar.gz";
-      sha256 = "1a2cjad816qilsigkq035rqzfhzmq5vaz1klilrrws456flbsjlg";
+      sha256 = "1fg0rl5pd3f2y3v3bq8p3zdkrpa1pyslwdln4s64clyr7spvxkjw";
     };
 
     outputs = [ "out" "jre" ];

From 9774c8a0dedce5d07f5247eff5582122e6b620ac Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 28 Apr 2018 20:20:13 +0000
Subject: [PATCH 0687/3370] linux-copperhead: Fix test

---
 nixos/tests/kernel-copperhead.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/kernel-copperhead.nix b/nixos/tests/kernel-copperhead.nix
index 0af978f1851f..aa133c9b0aa7 100644
--- a/nixos/tests/kernel-copperhead.nix
+++ b/nixos/tests/kernel-copperhead.nix
@@ -6,14 +6,14 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   machine = { config, lib, pkgs, ... }:
     {
-      boot.kernelPackages = pkgs.linuxPackages_copperhead_hardened;
+      boot.kernelPackages = pkgs.linuxPackages_copperhead_lts;
     };
 
   testScript =
     ''
       $machine->succeed("uname -a");
       $machine->succeed("uname -s | grep 'Linux'");
-      $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_hardened.kernel.modDirVersion}'");
+      $machine->succeed("uname -a | grep '${pkgs.linuxPackages_copperhead_lts.kernel.modDirVersion}'");
       $machine->succeed("uname -a | grep 'hardened'");
     '';
 })

From 1cf5aad65bc087d71e8c7ba000e34ccc01f723c8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 28 Apr 2018 16:32:15 -0400
Subject: [PATCH 0688/3370] linux-copperhead: Fix all-packages reference

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3bc6ca6e96c2..3ba524aa722a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13670,7 +13670,7 @@ with pkgs;
   linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; }));
 
   linuxPackages_copperhead_lts = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_lts);
-  linuxPackages_copperhead_stable = recurseIntoAttr (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable);
+  linuxPackages_copperhead_stable = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_copperhead_stable);
 
   # Samus kernels
   linuxPackages_samus_4_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_samus_4_12);

From 7cd7e4ce267faac9acfa2dd421d3583ec6f43d01 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 28 Apr 2018 22:35:19 +0200
Subject: [PATCH 0689/3370] weechat: 2.0 -> 2.1

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

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index b2ea28f0cf85..dec933489af9 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -29,12 +29,12 @@ let
   weechat =
     assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins;
     stdenv.mkDerivation rec {
-      version = "2.0";
+      version = "2.1";
       name = "weechat-${version}";
 
       src = fetchurl {
         url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-        sha256 = "0jd1l67k2k44xmfv0a71im3j4v0gss3a6bd5s84nj3f7lqnfmqdn";
+        sha256 = "0fq68wgynv2c3319gmzi0lz4ln4yrrk755y5mbrlr7fc1sx7ffd8";
       };
 
       outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins;

From f5268994be469e66d0967d5a45eccb5e0976f690 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 28 Apr 2018 22:36:22 +0200
Subject: [PATCH 0690/3370] weechat-matrix-bridge: 2018-01-10 -> 2017-03-29

---
 .../instant-messengers/weechat-matrix-bridge/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
index f1338bc0df35..85faebf95a3d 100644
--- a/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/instant-messengers/weechat-matrix-bridge/default.nix
@@ -1,12 +1,12 @@
 { stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }:
 
 stdenv.mkDerivation {
-  name = "weechat-matrix-bridge-2017-03-28";
+  name = "weechat-matrix-bridge-2018-01-10";
   src = fetchFromGitHub {
     owner = "torhve";
     repo = "weechat-matrix-protocol-script";
-    rev = "0052e7275ae149dc5241226391c9b1889ecc3c6b";
-    sha256 = "14x58jd44g08sfnp1gx74gq2na527v5jjpsvv1xx4b8mixwy20hi";
+    rev = "a8e4ce04665c09ee7f24d6b319cd85cfb56dfbd7";
+    sha256 = "0822xcxvwanwm8qbzqhn3f1m6hhxs29pyf8lnv6v29bl8136vcq3";
   };
 
   patches = [

From 4797fe8da41c4fa4291ce4e1ac3434ea4e04fb1e Mon Sep 17 00:00:00 2001
From: Ilya Kolpakov <ilya.kolpakov@gmail.com>
Date: Sat, 28 Apr 2018 21:02:49 +0200
Subject: [PATCH 0691/3370] pythonPackages.patsy: 0.3.0 -> 0.5.0

---
 .../python-modules/patsy/default.nix          | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +---------
 2 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/patsy/default.nix

diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix
new file mode 100644
index 000000000000..9efa3126ce3b
--- /dev/null
+++ b/pkgs/development/python-modules/patsy/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, nose
+, six
+, numpy
+, scipy # optional, allows spline-related features (see patsy's docs)
+, parameterized
+}:
+
+buildPythonPackage rec {
+  pname = "patsy";
+  version = "0.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0fw888zd2s7f5zxm9f98ss93qhwv0sqnbdy21ipj33ccqgakhpz0";
+  };
+
+  checkInputs = [ nose parameterized ];
+  checkPhase = "nosetests -v";
+
+  propagatedBuildInputs = [
+    six
+    numpy
+    scipy
+  ];
+
+  meta = {
+    description = "A Python package for describing statistical models";
+    homepage = https://github.com/pydata/patsy;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ ilya-kolpakov ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f24d6ff955bd..50589b6938d0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9673,24 +9673,7 @@ in {
     };
   };
 
-  patsy = buildPythonPackage rec {
-    name = "patsy-${version}";
-    version = "0.3.0";
-
-    src = pkgs.fetchurl{
-      url = "mirror://pypi/p/patsy/${name}.zip";
-      sha256 = "a55dd4ca09af4b9608b81f30322beb450510964c022708ab50e83a065ccf15f0";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [six numpy];
-
-    meta = {
-      description = "A Python package for describing statistical models";
-      homepage = "https://github.com/pydata/patsy";
-      license = licenses.bsd2;
-    };
-  };
+  patsy = callPackage ../development/python-modules/patsy { };
 
   paste = buildPythonPackage rec {
     name = "paste-${version}";

From f2adf2059a8cce0e7619f65ba1f2d8f38f5efad5 Mon Sep 17 00:00:00 2001
From: Ilya Kolpakov <ilya.kolpakov@gmail.com>
Date: Sat, 28 Apr 2018 21:06:12 +0200
Subject: [PATCH 0692/3370] pythonPackages.pymc3: init at 3.2

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

diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix
new file mode 100644
index 000000000000..308958abb6d0
--- /dev/null
+++ b/pkgs/development/python-modules/pymc3/default.nix
@@ -0,0 +1,64 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, pythonOlder
+, Theano
+, pandas
+, patsy
+, joblib
+, tqdm
+, six
+, h5py
+, pytest
+, nose
+, parameterized
+, matplotlib
+}:
+
+buildPythonPackage rec {
+  pname = "pymc3";
+  version = "3.2";
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0hpzhkpv7sbwkcva7x914yvzcf1d1a952ynbcx6mvlgv5lqghc39";
+  };
+
+  # No need for coverage stats in Nix builds
+  postPatch = ''
+    substituteInPlace setup.py --replace ", 'pytest-cov'" ""
+  '';
+
+  propagatedBuildInputs = [
+    Theano
+    pandas
+    patsy
+    joblib
+    tqdm
+    six
+    h5py
+  ];
+
+  checkInputs = [
+    pytest
+    nose
+    parameterized
+  ];
+
+  # The test suite is computationally intensive and test failures are not
+  # indicative for package usability hence tests are disabled by default.
+  doCheck = false;
+
+  # For some reason tests are run as a part of the *install* phase if enabled.
+  # Theano writes compiled code to ~/.theano hence we set $HOME.
+  preInstall = "export HOME=$(mktemp -d)";
+  postInstall = "rm -rf $HOME";
+
+  meta = {
+    description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)";
+    homepage = http://github.com/pymc-devs/pymc3;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ilya-kolpakov ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 50589b6938d0..93444be7302a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8244,6 +8244,8 @@ in {
 
   pygraphviz = callPackage ../development/python-modules/pygraphviz { };
 
+  pymc3 = callPackage ../development/python-modules/pymc3 { };
+
   pympler = buildPythonPackage rec {
     pname = "Pympler";
     version = "0.4.3";

From 3c4efe448d96693cd370b3994c0b9087970e1e83 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Sun, 29 Apr 2018 00:58:17 +0200
Subject: [PATCH 0693/3370] xen_4_10: fix build (qemu-xen memfd patch)

---
 pkgs/applications/virtualization/xen/4.10.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix
index c3280cbda94b..dab90a1ed781 100644
--- a/pkgs/applications/virtualization/xen/4.10.nix
+++ b/pkgs/applications/virtualization/xen/4.10.nix
@@ -29,6 +29,12 @@ let
 
   xsa = import ./xsa-patches.nix { inherit fetchpatch; };
 
+  qemuMemfdBuildFix = fetchpatch {
+    name = "xen-4.8-memfd-build-fix.patch";
+    url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch;
+    sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa";
+  };
+
   qemuDeps = [
     udev pciutils xorg.libX11 SDL pixman acl glusterfs spice-protocol usbredir
     alsaLib glib python2
@@ -53,6 +59,9 @@ callPackage (import ./generic.nix (rec {
         rev = "b79708a8ed1b3d18bee67baeaf33b3fa529493e2";
         sha256 = "1yxxad6nvlfmrbgyc8ix19qmrsn1rx4zpyiqnfi4x4kg94acwa5w";
       };
+      patches = [
+        qemuMemfdBuildFix
+      ];
       buildInputs = qemuDeps;
       postPatch = ''
         # needed in build but /usr/bin/env is not available in sandbox

From 15268306febdc338ec6a00e8099c1904287f598a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Apr 2018 18:19:23 +0800
Subject: [PATCH 0694/3370] libtoxcore: introduce 0.2.2 in addition to 0.1.11

---
 .../libraries/libtoxcore/default.nix          | 79 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index 9af8718dc5fe..42d2fe11f7b3 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -1,46 +1,51 @@
 { stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
 , libvpx, check, libconfig, pkgconfig }:
 
-stdenv.mkDerivation rec {
-  name = "libtoxcore-${version}";
-  version = "0.1.11";
+let
+  generic = { version, sha256 }:
+  stdenv.mkDerivation rec {
+    name = "libtoxcore-${version}";
 
-  src = fetchFromGitHub {
-    owner  = "TokTok";
-    repo   = "c-toxcore";
-    rev    = "v${version}";
+    src = fetchFromGitHub {
+      owner  = "TokTok";
+      repo   = "c-toxcore";
+      rev    = "v${version}";
+      inherit sha256;
+    };
+
+    cmakeFlags = [
+      "-DBUILD_NTOX=ON"
+      "-DDHT_BOOTSTRAP=ON"
+      "-DBOOTSTRAP_DAEMON=ON"
+    ];
+
+    buildInputs = [
+      libsodium libmsgpack ncurses libconfig
+    ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
+      libopus libvpx
+    ];
+
+    nativeBuildInputs = [ cmake pkgconfig ];
+
+    enableParallelBuilding = true;
+
+    meta = with stdenv.lib; {
+      description = "P2P FOSS instant messaging application aimed to replace Skype";
+      homepage = https://tox.chat;
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ peterhoeg ];
+      platforms = platforms.all;
+    };
+  };
+
+in rec {
+  libtoxcore_0_1 = generic {
+    version = "0.1.11";
     sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij";
   };
 
-  cmakeFlags = [
-    "-DBUILD_NTOX=ON"
-    "-DDHT_BOOTSTRAP=ON"
-    "-DBOOTSTRAP_DAEMON=ON"
-  ];
-
-  buildInputs = [
-    libsodium libmsgpack ncurses libconfig
-  ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
-    libopus
-    libvpx
-  ];
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  enableParallelBuilding = true;
-
-  checkInputs = [ check ];
-
-  checkPhase = "ctest";
-
-  # for some reason the tests are not running - it says "No tests found!!"
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "P2P FOSS instant messaging application aimed to replace Skype";
-    homepage = https://tox.chat;
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = platforms.all;
+  libtoxcore_0_2 = generic {
+    version = "0.2.2";
+    sha256 = "1463grbbv009pj2g6dbnyk4lr871vw41962m63v21mmp6dkrr7r5";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cac46ff0f4cc..fea7f1e34415 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10358,9 +10358,12 @@ with pkgs;
 
   libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { };
 
+  # this is still the new version of the old API
   libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
 
-  libtoxcore = callPackage ../development/libraries/libtoxcore { };
+  inherit (callPackages ../development/libraries/libtoxcore {})
+    libtoxcore_0_1 libtoxcore_0_2;
+  libtoxcore = libtoxcore_0_2;
 
   libtap = callPackage ../development/libraries/libtap { };
 

From 058df14f81482e05fad93b017e8a8d45cea10db5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Apr 2018 18:19:48 +0800
Subject: [PATCH 0695/3370] ratox: 0.4 -> 0.4.20180303

---
 .../instant-messengers/ratox/default.nix       | 18 ++++++++++--------
 .../instant-messengers/ratox/ldlibs.patch      |  5 -----
 2 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch

diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index 5d004db60e3a..add337d3f085 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -5,22 +5,24 @@ with stdenv.lib;
 
 let
   configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
-in
 
-stdenv.mkDerivation rec {
-  name = "ratox-0.4";
+in stdenv.mkDerivation rec {
+  name = "ratox-0.4.20180303";
 
   src = fetchgit {
     url = "git://git.2f30.org/ratox.git";
-    rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c";
-    sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5";
+    rev = "269f7f97fb374a8f9c0b82195c21de15b81ddbbb";
+    sha256 = "0bpn37h8jvsqd66fkba8ky42nydc8acawa5x31yxqlxc8mc66k74";
   };
 
-  patches = [ ./ldlibs.patch ];
-
   buildInputs = [ libtoxcore ];
 
-  preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h";
+  preConfigure = ''
+    substituteInPlace config.mk \
+      --replace '-lsodium -lopus -lvpx ' ""
+
+    ${optionalString (conf!=null) "cp ${configFile} config.def.h"}
+  '';
 
   makeFlags = [ "PREFIX=$(out)" ];
 
diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
deleted file mode 100644
index 1406e7143107..000000000000
--- a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/config.mk
-+++ b/config.mk
-@@ -13 +13 @@ LDFLAGS  = -L/usr/local/lib
--LDLIBS   = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread
-+LDLIBS   = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread

From 88454d73b0c72137eb04f30c0e053db139d71b2a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Apr 2018 18:20:27 +0800
Subject: [PATCH 0696/3370] qtox: 1.13.1 -> 1.15.0

---
 .../instant-messengers/qtox/default.nix       | 29 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index bbad5a681807..f7a56d47dbfa 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,19 +1,23 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig,
-  libtoxcore,
-  libpthreadstubs, libXdmcp, libXScrnSaver,
-  qtbase, qtsvg, qttools, qttranslations,
-  ffmpeg, filter-audio, libexif, libsodium, libopus,
-  libvpx, openal, pcre, qrencode, sqlcipher }:
+{ stdenv, mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
+, libtoxcore
+, libpthreadstubs, libXdmcp, libXScrnSaver
+, qtbase, qtsvg, qttools, qttranslations
+, ffmpeg, filter-audio, libexif, libsodium, libopus
+, libvpx, openal, pcre, qrencode, sqlcipher
+, AVFoundation ? null }:
 
-mkDerivation rec {
+let
+  version = "1.15.0";
+  rev = "v${version}";
+
+in mkDerivation rec {
   name = "qtox-${version}";
-  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner  = "qTox";
     repo   = "qTox";
-    rev    = "v${version}";
-    sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y";
+    sha256 = "1garwnlmg452b0bwx36rsh08s15q3zylb26l01iiwg4l9vcaldh9";
+    inherit rev;
   };
 
   buildInputs = [
@@ -22,17 +26,18 @@ mkDerivation rec {
     qtbase qtsvg qttranslations
     ffmpeg filter-audio libexif libopus libsodium
     libvpx openal pcre qrencode sqlcipher
-  ];
+  ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ;
 
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    "-DGIT_DESCRIBE=${version}"
+    "-DGIT_DESCRIBE=${rev}"
     "-DENABLE_STATUSNOTIFIER=False"
     "-DENABLE_GTK_SYSTRAY=False"
     "-DENABLE_APPINDICATOR=False"
+    "-DTIMESTAMP=1"
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fea7f1e34415..e9224ecbe66e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17461,7 +17461,7 @@ with pkgs;
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
 
-  qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { ffmpeg = ffmpeg_2; };
+  qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
 
   qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };
 

From 3f454bc90f2c569f237b9df56db75bbedd2feae3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Apr 2018 18:20:46 +0800
Subject: [PATCH 0697/3370] toxic: 0.7.2 -> 0.8.2

---
 .../networking/instant-messengers/toxic/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 4934a7374058..8a45e988c07d 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "toxic-${version}";
-  version = "0.7.2";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner  = "Tox";
     repo   = "toxic";
     rev    = "v${version}";
-    sha256 = "1kws6bx5va1wc0k6pqihrla91vicxk4zqghvxiylgfbjr1jnkvwc";
+    sha256 = "0fwmk945nip98m3md58y3ibjmzfq25hns3xf0bmbc6fjpww8d5p5";
   };
 
   makeFlags = [ "PREFIX=$(out)"];

From 1b1be29bf827fc177100ae175030b2fda4132e47 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 28 Apr 2018 20:09:17 -0400
Subject: [PATCH 0698/3370] openjdk: 8u172-b02 -> 8u172-b11

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

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 705898a74f37..7798418ebfd1 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -22,41 +22,41 @@ let
       throw "openjdk requires i686-linux or x86_64 linux";
 
   update = "172";
-  build = "02";
+  build = "11";
   baseurl = "http://hg.openjdk.java.net/jdk8u/jdk8u";
   repover = "jdk8u${update}-b${build}";
   paxflags = if stdenv.isi686 then "msp" else "m";
   jdk8 = fetchurl {
              url = "${baseurl}/archive/${repover}.tar.gz";
-             sha256 = "0y28by4ifsaxhfrzq35654i8h9jjgvrw51hbxyg8pgfink0n30r2";
+             sha256 = "08mgfqbbgnx9n6prczwm4m8pgsakya45iai1gfslqnb0adh33jpi";
           };
   langtools = fetchurl {
              url = "${baseurl}/langtools/archive/${repover}.tar.gz";
-             sha256 = "0rxp4920xpd9khdg2ia1v1djcw1nndsjfis68whawi7s95zwpxy5";
+             sha256 = "0dph17mpr5ni280z8rmiwlw0v46dnzyph6fq132xvxiw2i1203zg";
           };
   hotspot = fetchurl {
              url = "${baseurl}/hotspot/archive/${repover}.tar.gz";
-             sha256 = "0sdf6rww290wgfqhaix1vjac244drdgg7hapb67wgj733kkdl711";
+             sha256 = "181ixh75xjvlj0l3a58d9iqf50ivq77993yzfv0463dm44h6b8pp";
           };
   corba = fetchurl {
              url = "${baseurl}/corba/archive/${repover}.tar.gz";
-             sha256 = "0vl3aryw3nclqprc35b2iriwfyr9fch3x8snjry1z5ajbdyd5c8b";
+             sha256 = "097azhdmr7ph1gvlzjgx6s2hyxmi2s5293d5hs23dl5i9f55b6x8";
           };
   jdk = fetchurl {
              url = "${baseurl}/jdk/archive/${repover}.tar.gz";
-             sha256 = "1y5fnzxdll3q0jgqxsap3xb21bm1napdlqzs7h6c2l5qldyvw692";
+             sha256 = "1lvk2brd9yclzd7cdk1kvnv4mbdxzjxd595pqhdaxdxxr5anhsvm";
           };
   jaxws = fetchurl {
              url = "${baseurl}/jaxws/archive/${repover}.tar.gz";
-             sha256 = "1yg1ik1klg8pl4b7izi2waqhs7vr6ln3fzc4k1siir4va5qhrhlm";
+             sha256 = "0cl4b4c2qjyhlsa5khlxinilfaj6ai1mzji3y0263klc8q6bglwa";
           };
   jaxp = fetchurl {
              url = "${baseurl}/jaxp/archive/${repover}.tar.gz";
-             sha256 = "03srcj6hhvbdg1iqw85mfm1pwd6yvpykyz5nn4ydf930g4dyxfkf";
+             sha256 = "00s6wm62v7gmkwy46js0lisijng40lnxscndczbgfvvz2q9zz4q1";
           };
   nashorn = fetchurl {
              url = "${baseurl}/nashorn/archive/${repover}.tar.gz";
-             sha256 = "12nn02jiq3vqgwhqh5yvxq1k92fy3n0jpvfpj1npq9fvimywry2k";
+             sha256 = "0ab0rrmmf145nh4mibvknjni4whvzmk6fsnl7ihcn8m0zi6zyfra";
           };
   openjdk8 = stdenv.mkDerivation {
     name = "openjdk-8u${update}b${build}";

From cd0aee5cbceba576b61d932601702b8740ed3b8c Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 28 Apr 2018 23:07:10 -0400
Subject: [PATCH 0699/3370] buildbot: 1.1.0 -> 1.1.1

---
 .../tools/build-managers/buildbot/default.nix          |  4 ++--
 .../tools/build-managers/buildbot/plugins.nix          | 10 +++++-----
 .../tools/build-managers/buildbot/worker.nix           |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 98adaf1c1aa1..bc2cd978f670 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -14,11 +14,11 @@ let
   package = pythonPackages.buildPythonApplication rec {
     name = "${pname}-${version}";
     pname = "buildbot";
-    version = "1.1.0";
+    version = "1.1.1";
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1rhmlcvw0dsr4f37sb3xmb9xcn76lsrsw2g1z611g339nmxzi0sc";
+      sha256 = "1vcmanx3ma3cfyiddjcmsnx6qmxd3m5blqax04rcsiq2zq4dmzir";
     };
 
     buildInputs = with pythonPackages; [
diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix
index 35c8ed8c71cd..c8a12c192647 100644
--- a/pkgs/development/tools/build-managers/buildbot/plugins.nix
+++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix
@@ -11,7 +11,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version format;
-      sha256 = "0nmrq50c5ib185rpb8ai1mm7gjq2mjvxik1kqrjfa62i1ia9ikyj";
+      sha256 = "01v9w8iy9q6fwrmz6db7fanjixax7whn74k67bj0czrbjjkpfzvb";
     };
 
     meta = with stdenv.lib; {
@@ -29,7 +29,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1laz7l7cbbz0czb6skxw314bd2qk2f63qw3n2rs7m7v11gd9cdll";
+      sha256 = "1cwxkzpgwzk9b361rj980bbnmhzzsr46pgf94zqpg3na8xm6hpwj";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -49,7 +49,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0mmri8c4n1zwxc1dx2a11yllrmnwqqxjvvil9224lbs98mpchppi";
+      sha256 = "0ival58f50128315d0nck63pzya2zm7q6hvgmxfbjl0my8il9p2l";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -69,7 +69,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "0nwlw2m3qfifia6gy3d4lrnycra50k98ax071p2zjqknanh563vr";
+      sha256 = "0jiwfb699nqbmpcm88y187ig4ha6p7d4v98mjwa9blhm54dk8kh1";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
@@ -89,7 +89,7 @@
 
     src = pythonPackages.fetchPypi {
       inherit pname version;
-      sha256 = "1zml9bd910zwcby4vr3lmzap2grinha2w5zgb2cmixmz7hfrqswp";
+      sha256 = "00mfn24gbwr2p3n7nsijzv949l7hiksiafhma18nnh40r8f4l5f2";
     };
 
     propagatedBuildInputs = with pythonPackages; [ buildbot-pkg ];
diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix
index 59d3c93bb877..b1cfb6aeaf2f 100644
--- a/pkgs/development/tools/build-managers/buildbot/worker.nix
+++ b/pkgs/development/tools/build-managers/buildbot/worker.nix
@@ -3,11 +3,11 @@
 pythonPackages.buildPythonApplication (rec {
   name = "${pname}-${version}";
   pname = "buildbot-worker";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0hpiawf0dq8phsvihlcx9bpl70n7s3rhcgbgma36bark6sgr4y8y";
+    sha256 = "02xfzlcy3cnvc3cmpl9gs6209a3qm71yz5pahbws9jcyhv6fbrrm";
   };
 
   buildInputs = with pythonPackages; [ setuptoolsTrial mock ];

From 6e8118b2395ab928594e20585dba1e83c8354820 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 28 Apr 2018 22:11:30 -0500
Subject: [PATCH 0700/3370] nix: fix stdenv.system check -- should be
 hostPlatform

(stdenv.system is the system running the build, apparently)
---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index aee6678d1167..230994897234 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -41,7 +41,7 @@ let
     propagatedBuildInputs = [ boehmgc ];
 
     # Seems to be required when using std::atomic with 64-bit types
-    NIX_LDFLAGS = lib.optionalString (stdenv.system == "armv6l-linux") "-latomic";
+    NIX_LDFLAGS = lib.optionalString (stdenv.hostPlatform.system == "armv6l-linux") "-latomic";
 
     configureFlags =
       [ "--with-store-dir=${storeDir}"

From 7b6433b0eb3f1acf03b964636ef1bd12fac0bda5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 29 Apr 2018 12:34:38 +0800
Subject: [PATCH 0701/3370] gcalcli: pin older versions of needed python
 packages

---
 pkgs/applications/misc/gcalcli/default.nix | 63 +++++++++++++++-------
 1 file changed, 44 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix
index d3ba5a97333a..6a7a7ae604de 100644
--- a/pkgs/applications/misc/gcalcli/default.nix
+++ b/pkgs/applications/misc/gcalcli/default.nix
@@ -1,7 +1,38 @@
-{ stdenv, lib, fetchFromGitHub, pythonPackages
+{ stdenv, lib, fetchFromGitHub, python2
 , libnotify ? null }:
 
-pythonPackages.buildPythonApplication rec {
+let
+  py = python2.override {
+    packageOverrides = self: super: {
+      google_api_python_client = super.google_api_python_client.overridePythonAttrs (oldAttrs: rec {
+        version = "1.5.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "1ggxk094vqr4ia6yq7qcpa74b4x5cjd5mj74rq0xx9wp2jkrxmig";
+        };
+      });
+
+      oauth2client = super.oauth2client.overridePythonAttrs (oldAttrs: rec {
+        version = "1.4.12";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl";
+        };
+      });
+
+      uritemplate = super.uritemplate.overridePythonAttrs (oldAttrs: rec {
+        version = "0.6";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "1zapwg406vkwsirnzc6mwq9fac4az8brm6d9bp5xpgkyxc5263m3";
+        };
+        # there are no checks in this version
+        doCheck = false;
+      });
+    };
+  };
+
+in with py.pkgs; buildPythonApplication rec {
   version = "3.4.0";
   name = "gcalcli-${version}";
 
@@ -12,27 +43,21 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "171awccgnmfv4j7m2my9387sjy60g18kzgvscl6pzdid9fn9rrm8";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
-    dateutil
-    gflags
-    google_api_python_client
-    httplib2
-    oauth2client
-    parsedatetime
-    six
-    vobject
-  ]
-  ++ lib.optional (!pythonPackages.isPy3k) futures;
-
-  # there are no tests as of 3.4.0
-  doCheck = false;
+  propagatedBuildInputs = [
+    dateutil gflags httplib2 parsedatetime six vobject
+    # overridden
+    google_api_python_client oauth2client uritemplate
+  ] ++ lib.optional (!isPy3k) futures;
 
   postInstall = lib.optionalString stdenv.isLinux ''
-    substituteInPlace $out/bin/gcalcli \
-      --replace "command = 'notify-send -u critical -a gcalcli %s'" \
-                "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'"
+    substituteInPlace $out/bin/gcalcli --replace \
+      "command = 'notify-send -u critical -a gcalcli %s'" \
+      "command = '${libnotify}/bin/notify-send -i view-calendar-upcoming-events -u critical -a Calendar %s'"
   '';
 
+  # There are no tests as of 3.4.0
+  doCheck = false;
+
   meta = with lib; {
     homepage = https://github.com/insanum/gcalcli;
     description = "CLI for Google Calendar";

From b0d3ed348474f02dd79d63149706be66231dff55 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 22 Dec 2017 08:59:08 +0100
Subject: [PATCH 0702/3370] =?UTF-8?q?gimp:=202.8.22=20=E2=86=92=202.10.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/graphics/gimp/2.8.nix       | 57 -----------
 pkgs/applications/graphics/gimp/default.nix   | 95 +++++++++++++++++++
 .../graphics/gimp/plugins/default.nix         |  8 +-
 pkgs/applications/graphics/gimp/wrapper.nix   |  5 +-
 pkgs/applications/graphics/sane/xsane.nix     |  6 +-
 pkgs/top-level/all-packages.nix               |  8 +-
 6 files changed, 108 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/applications/graphics/gimp/2.8.nix
 create mode 100644 pkgs/applications/graphics/gimp/default.nix

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
deleted file mode 100644
index 3802fff2ad21..000000000000
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf
-, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff
-, webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper
-, python2Packages, libexif, gettext, xorg
-, AppKit, Cocoa, gtk-mac-integration }:
-
-let
-  inherit (python2Packages) pygtk wrapPython python;
-in stdenv.mkDerivation rec {
-  name = "gimp-${version}";
-  version = "2.8.22";
-
-  # This declarations for `gimp-with-plugins` wrapper,
-  # (used for determining $out/lib/gimp/${majorVersion}/ paths)
-  majorVersion = "2.0";
-  targetPluginDir = "$out/lib/gimp/${majorVersion}/plug-ins";
-  targetScriptDir = "$out/lib/gimp/${majorVersion}/scripts";
-
-  src = fetchurl {
-    url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    sha256 = "12k3lp938qdc9cqj29scg55f3bb8iav2fysd29w0s49bqmfa71wi";
-  };
-
-  buildInputs =
-    [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo
-      freetype fontconfig lcms libpng libjpeg poppler libtiff webkit
-      libmng librsvg libwmf zlib libzip ghostscript aalib jasper
-      python pygtk libexif gettext xorg.libXpm
-      wrapPython
-    ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];
-
-  pythonPath = [ pygtk ];
-
-  postFixup = ''
-    wrapPythonProgramsIn $out/lib/gimp/2.0/plug-ins/
-    wrapProgram $out/bin/gimp \
-      --prefix PYTHONPATH : "$PYTHONPATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
-  '';
-
-  passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ?
-
-  #configureFlags = [ "--disable-print" ];
-
-  enableParallelBuilding = true;
-
-  # "screenshot" needs this.
-  NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib";
-
-  meta = {
-    description = "The GNU Image Manipulation Program";
-    homepage = https://www.gimp.org/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
new file mode 100644
index 000000000000..2536367f6ceb
--- /dev/null
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -0,0 +1,95 @@
+{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
+, pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
+, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
+, python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
+, harfbuzz, mypaint-brushes, libwebp, libgudev, openexr
+, AppKit, Cocoa, gtk-mac-integration }:
+
+let
+  inherit (python2Packages) pygtk wrapPython python;
+in stdenv.mkDerivation rec {
+  name = "gimp-${version}";
+  version = "2.10.0";
+
+  src = fetchurl {
+    url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
+    sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z";
+  };
+
+  patches = [
+    # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371482;
+      sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc";
+    })
+
+    # fix absolute paths stored in configuration
+    (fetchpatch {
+      url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6;
+      sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris";
+    })
+    (fetchpatch {
+      url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df;
+      sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh";
+    })
+
+    # fix pc file (needed e.g. for building plug-ins)
+    (fetchpatch {
+      url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe;
+      sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1";
+    })
+  ];
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];
+  propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
+  buildInputs = [
+    babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev
+    freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
+    libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp
+    python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];
+
+  pythonPath = [ pygtk ];
+
+  # Check if librsvg was built with --disable-pixbuf-loader.
+  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk_pixbuf.moduleDir}";
+
+  preConfigure = ''
+    # The check runs before glib-networking is registered
+    export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES"
+  '';
+
+  postFixup = ''
+    wrapPythonProgramsIn $out/lib/gimp/${passthru.majorVersion}/plug-ins/
+    wrapProgram $out/bin/gimp-${stdenv.lib.versions.majorMinor version} \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
+
+  passthru = rec {
+    # The declarations for `gimp-with-plugins` wrapper,
+    # used for determining plug-in installation paths
+    majorVersion = "${stdenv.lib.versions.major version}.0";
+    targetPluginDir = "lib/gimp/${majorVersion}/plug-ins";
+    targetScriptDir = "lib/gimp/${majorVersion}/scripts";
+
+    # probably its a good idea to use the same gtk in plugins ?
+    gtk = gtk2;
+  };
+
+  configureFlags = [
+    "--without-webkit" # old version is required
+  ];
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "The GNU Image Manipulation Program";
+    homepage = https://www.gimp.org/;
+    maintainers = with maintainers; [ jtojnar ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 0d4215dd5bc2..a19a5487b425 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -12,12 +12,12 @@ let
     prePhases = "extraLib";
     extraLib = ''
       installScripts(){
-        mkdir -p ${targetScriptDir};
-        for p in "$@"; do cp "$p" ${targetScriptDir}; done
+        mkdir -p $out/${targetScriptDir};
+        for p in "$@"; do cp "$p" $out/${targetScriptDir}; done
       }
       installPlugins(){
-        mkdir -p ${targetPluginDir};
-        for p in "$@"; do cp "$p" ${targetPluginDir}; done
+        mkdir -p $out/${targetPluginDir};
+        for p in "$@"; do cp "$p" $out/${targetPluginDir}; done
       }
     '';
   }
diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix
index 7455a69dde97..6e450b25c048 100644
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@@ -4,6 +4,7 @@ let
 allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins);
 selectedPlugins = if plugins == null then allPlugins else plugins;
 extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
+versionBranch = stdenv.lib.versions.majorMinor gimp.version;
 
 in symlinkJoin {
   name = "gimp-with-plugins-${gimp.version}";
@@ -13,14 +14,14 @@ in symlinkJoin {
   buildInputs = [ makeWrapper ];
 
   postBuild = ''
-    for each in gimp-2.8 gimp-console-2.8; do
+    for each in gimp-${versionBranch} gimp-console-${versionBranch}; do
       wrapProgram $out/bin/$each \
         --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \
         ${toString extraArgs}
     done
     set +x
     for each in gimp gimp-console; do
-      ln -sf "$each-2.8" $out/bin/$each
+      ln -sf "$each-${versionBranch}" $out/bin/$each
     done
   '';
 }
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index ad02e1a80231..ca0f49e0c948 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng
 , libusb ? null
-, gimpSupport ? false, gimp_2_8 ? null
+, gimpSupport ? false, gimp ? null
 }:
 
-assert gimpSupport -> gimp_2_8 != null;
+assert gimpSupport -> gimp != null;
 
 stdenv.mkDerivation rec {
   name = "xsane-0.999";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ]
     ++ (if libusb != null then [libusb] else [])
-    ++ stdenv.lib.optional gimpSupport gimp_2_8;
+    ++ stdenv.lib.optional gimpSupport gimp;
 
   meta = {
     homepage = http://www.sane-project.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9513d60db47..9a667a2911f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15868,16 +15868,14 @@ with pkgs;
 
   ghq = gitAndTools.ghq;
 
-  gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
-    webkit = null;
+  gimp = callPackage ../applications/graphics/gimp {
+    gegl = gegl_0_4;
     lcms = lcms2;
+    inherit (gnome3) gexiv2;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
   };
 
-  gimp = gimp_2_8;
-
   gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {
-    gimp = gimp_2_8;
     plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied
   };
 

From 882682827a0c23537951d3ad0241df11b3dbb36e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 12 Apr 2018 22:02:37 +0200
Subject: [PATCH 0703/3370] gimpPlugins.lqrPlugin: use liblqr1 from pkgs

---
 pkgs/applications/graphics/gimp/plugins/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index a19a5487b425..444fb37ae338 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -35,15 +35,6 @@ let
     installPhase = "installScripts ${src}";
   };
 
- libLQR = pluginDerivation {
-    name = "liblqr-1-0.4.1";
-    # required by lqrPlugin, you don't havet to install this lib explicitely
-    src = fetchurl {
-      url = http://registry.gimp.org/files/liblqr-1-0.4.1.tar.bz2;
-      sha256 = "02g90wag7xi5rjlmwq8h0qs666b1i2sa90s4303hmym40il33nlz";
-    };
-  };
-
 in
 rec {
   gap = pluginDerivation {
@@ -166,12 +157,12 @@ rec {
        Layer/Liquid Rescale
     */
     name = "lqr-plugin-0.6.1";
-    buildInputs = with pkgs; [ libLQR ];
+    buildInputs = with pkgs; [ liblqr1 ];
     src = fetchurl {
       url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2;
       sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9";
     };
-    #postInstall = ''mkdir -p $out/nix-support; echo "${libLQR}" > "$out/nix-support/propagated-user-env-packages"'';
+    #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"'';
     installPhase = "installPlugins src/gimp-lqr-plugin";
   };
 

From 63a234c4a720f3457801043276e1884e451d3b85 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Apr 2018 02:59:26 +0200
Subject: [PATCH 0704/3370] ufraw: build gimp plugin

---
 .../graphics/gimp/plugins/default.nix         | 27 +------------------
 pkgs/applications/graphics/ufraw/default.nix  | 24 ++++++++++++++---
 2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 444fb37ae338..86e3c4e20c54 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -179,32 +179,7 @@ rec {
       installPhase = "installPlugins gmic_gimp";
   };
 
-  # this is more than a gimp plugin !
-  # either load the raw image with gimp (and the import dialog will popup)
-  # or use the binary
-  ufraw = pluginDerivation rec {
-    name = "ufraw-0.19.2";
-    buildInputs = with pkgs; [ gtkimageview lcms ];
-      # --enable-mime - install mime files, see README for more information
-      # --enable-extras - build extra (dcraw, nikon-curve) executables
-      # --enable-dst-correction - enable DST correction for file timestamps.
-      # --enable-contrast - enable the contrast setting option.
-      # --enable-interp-none: enable 'None' interpolation (mostly for debugging).
-      # --with-lensfun: use the lensfun library - experimental feature, read this before using it.
-      # --with-prefix=PREFIX - use also PREFIX as an input prefix for the build
-      # --with-dosprefix=PREFIX - PREFIX in the the prefix in dos format (needed only for ms-window
-    configureFlags = "--enable-extras --enable-dst-correction --enable-contrast";
-
-    src = fetchurl {
-      url = "mirror://sourceforge/ufraw/${name}.tar.gz";
-      sha256 = "1lxba7pb3vcsq94dwapg9bk9mb3ww6r3pvvcyb0ah5gh2sgzxgkk";
-    };
-    installPhase = "
-      installPlugins ufraw-gimp
-      mkdir -p $out/bin
-      cp ufraw $out/bin
-    ";
-  };
+  ufraw = pkgs.ufraw.gimpPlugin;
 
   gimplensfun = pluginDerivation rec {
     version = "0.2.4";
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index fc8e7a62c2ba..cb1c37aefebf 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -1,6 +1,9 @@
 { fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib
+, withGimpPlugin ? true, gimp ? null
 , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }:
 
+assert withGimpPlugin -> gimp != null;
+
 stdenv.mkDerivation rec {
   name = "ufraw-0.22";
 
@@ -10,10 +13,23 @@ stdenv.mkDerivation rec {
     sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp";
   };
 
-  buildInputs =
-    [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib
-      libjpeg libtiff cfitsio exiv2 lcms2 lensfun
-    ];
+  outputs = [ "out" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
+
+  nativeBuildInputs = [ pkgconfig gettext ];
+  buildInputs = [
+    gtk2 gtkimageview bzip2 zlib
+    libjpeg libtiff cfitsio exiv2 lcms2 lensfun
+  ] ++ stdenv.lib.optional withGimpPlugin gimp;
+
+  configureFlags = [
+    "--enable-extras"
+    "--enable-dst-correction"
+    "--enable-contrast"
+  ] ++ stdenv.lib.optional withGimpPlugin "--with-gimp";
+
+  postInstall = stdenv.lib.optionalString withGimpPlugin ''
+    moveToOutput "lib/gimp" "$gimpPlugin"
+  '';
 
   meta = {
     homepage = http://ufraw.sourceforge.net/;

From 4f420c6802575855a342d00c6685ac493c54139c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Apr 2018 06:05:04 +0200
Subject: [PATCH 0705/3370] =?UTF-8?q?gmic:=202.2.1=20=E2=86=92=202.2.2=20+?=
 =?UTF-8?q?=20build=20gimpPlugin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graphics/gimp/plugins/default.nix         | 13 +----
 pkgs/tools/graphics/gmic/default.nix          | 51 +++++++++++--------
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 86e3c4e20c54..600938645df8 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -166,18 +166,7 @@ rec {
     installPhase = "installPlugins src/gimp-lqr-plugin";
   };
 
-  gmic =
-    pluginDerivation rec {
-      inherit (pkgs.gmic) name src meta;
-
-      buildInputs = with pkgs; [ fftw opencv curl ];
-
-      sourceRoot = "${name}/src";
-
-      buildFlags = "gimp";
-
-      installPhase = "installPlugins gmic_gimp";
-  };
+  gmic = pkgs.gmic.gimpPlugin;
 
   ufraw = pkgs.ufraw.gimpPlugin;
 
diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix
index a8c491b049ff..008f9af36852 100644
--- a/pkgs/tools/graphics/gmic/default.nix
+++ b/pkgs/tools/graphics/gmic/default.nix
@@ -1,36 +1,45 @@
-{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng, pkgconfig }:
+{ stdenv, fetchurl, fetchFromGitHub, cmake, ninja, pkgconfig
+, opencv, openexr, graphicsmagick, fftw, zlib, libjpeg, libtiff, libpng
+, withGimpPlugin ? true, gimp ? null}:
 
-stdenv.mkDerivation rec {
+assert withGimpPlugin -> gimp != null;
+
+let
+  version = "2.2.2";
+
+  # CMakeLists.txt is missing from the tarball and Makefile is terrible
+  CMakeLists = fetchurl {
+    url = "https://github.com/dtschump/gmic/raw/v.${version}/CMakeLists.txt";
+    sha256 = "0lv5jrg98cpbk13fl4xm7l4sk1axfz054q570bpi741w815d7cpg";
+  };
+in stdenv.mkDerivation rec {
   name = "gmic-${version}";
-  version = "2.2.1";
+
+  outputs = [ "out" "lib" "dev" "man" ] ++ stdenv.lib.optional withGimpPlugin "gimpPlugin";
 
   src = fetchurl {
     url = "http://gmic.eu/files/source/gmic_${version}.tar.gz";
-    sha256 = "0iac1zaix2zv1dfp45ca0wk9pj6k02gf8l1vmg820z8jd12pa19w";
+    sha256 = "0zqfj2ym5nn3ff93xh2wf9ayxqlznabbdi00xw4lm7vw3iwkzqnc";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ cmake ninja pkgconfig ];
 
-  buildInputs = [ fftw zlib libjpeg libtiff libpng ];
+  buildInputs = [
+    fftw zlib libjpeg libtiff libpng opencv openexr graphicsmagick
+  ] ++ stdenv.lib.optionals withGimpPlugin [ gimp gimp.gtk ];
 
-  sourceRoot = "${name}/src";
+  cmakeFlags = [
+    "-DBUILD_LIB_STATIC=OFF"
+    "-DBUILD_PLUGIN=${if withGimpPlugin then "ON" else "OFF"}"
+    "-DENABLE_DYNAMIC_LINKING=ON"
+  ];
 
-  preBuild = ''
-    buildFlagsArray=( \
-      CURL_CFLAGS= CURL_LIBS= \
-      OPENEXR_CFLAGS= OPENEXR_LIBS= \
-      OPENCV_CFLAGS= OPENCV_LIBS= \
-      X11_CFLAGS="-Dcimg_display=0" X11_LIBS= \
-      cli \
-    )
+  postPatch = ''
+    cp ${CMakeLists} CMakeLists.txt
   '';
 
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/man/man1
-
-    cp -v gmic $out/bin/
-    cp -v ../man/gmic.1.gz $out/share/man/man1/
+  preConfigure = stdenv.lib.optionalString withGimpPlugin ''
+    cmakeFlags="$cmakeFlags -DPLUGIN_INSTALL_PREFIX=$gimpPlugin/${gimp.targetPluginDir}"
   '';
 
   meta = with stdenv.lib; {

From 33615ccfa5a7c324a694f630f0b48fba8d40f9ba Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 29 Apr 2018 12:00:16 +0200
Subject: [PATCH 0706/3370] linux_hardened: enforce usercopy whitelisting

The default is to warn only
---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 3a82c00c5010..a00ba9ab7b8e 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -78,6 +78,9 @@ ${optionalString (versionAtLeast version "4.13") ''
 
 # Perform usercopy bounds checking.
 HARDENED_USERCOPY y
+${optionalString (versionAtLeast version "4.16") ''
+  HARDENED_USERCOPY_FALLBACK n
+''}
 
 # Randomize allocator freelists.
 SLAB_FREELIST_RANDOM y

From 9df35787f16636628a2c7392cc4bfeff0e815242 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 15 Apr 2018 13:26:38 +0200
Subject: [PATCH 0707/3370] tor-browser-bundle-bin: allow unset XAUTHORITY

Apparently this can happen on e.g., fedora.

Closes https://github.com/NixOS/nixpkgs/issues/38671
---
 .../networking/browsers/tor-browser-bundle-bin/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 8a8abb42f55e..a2094305db55 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -340,7 +340,7 @@ stdenv.mkDerivation rec {
       \
       TMPDIR="\''${TMPDIR:-/tmp}" \
       HOME="\$HOME" \
-      XAUTHORITY="\$XAUTHORITY" \
+      XAUTHORITY="\''${XAUTHORITY:-}" \
       DISPLAY="\$DISPLAY" \
       DBUS_SESSION_BUS_ADDRESS="\$DBUS_SESSION_BUS_ADDRESS" \
       \

From 49003e880c3659ecd0479cfb6b227e99b650db0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Steinpa=C3=9F?= <philipp@xndr.de>
Date: Sun, 29 Apr 2018 13:26:40 +0200
Subject: [PATCH 0708/3370] gnunet: Add gnunet_git.

---
 .../networking/p2p/gnunet/git.nix             | 92 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/applications/networking/p2p/gnunet/git.nix

diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix
new file mode 100644
index 000000000000..6a0063dfb871
--- /dev/null
+++ b/pkgs/applications/networking/p2p/gnunet/git.nix
@@ -0,0 +1,92 @@
+{ stdenv, fetchgit, libextractor, libmicrohttpd, libgcrypt
+, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
+, libxml2, ncurses, gettext, libunistring, libidn
+, makeWrapper, autoconf, automake, texinfo, which
+, withVerbose ? false }:
+
+let
+  rev = 	"ce2864cfaa27e55096b480bf35db5f8cee2a5e7e";
+in
+stdenv.mkDerivation rec {
+  name = "gnunet-git-${rev}";
+
+  src = fetchgit {
+    url =  https://gnunet.org/git/gnunet.git;
+    inherit rev;
+    sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl";
+  };
+
+  buildInputs = [
+    libextractor libmicrohttpd libgcrypt gmp curl libtool
+    zlib adns sqlite libxml2 ncurses libidn
+    pkgconfig gettext libunistring makeWrapper
+    autoconf automake texinfo which
+  ];
+
+  configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose ";
+
+  preConfigure = ''
+    # Brute force: since nix-worker chroots don't provide
+    # /etc/{resolv.conf,hosts}, replace all references to `localhost'
+    # by their IPv4 equivalent.
+    for i in $(find . \( -name \*.c -or -name \*.conf \) \
+                    -exec grep -l '\<localhost\>' {} \;)
+    do
+      echo "$i: substituting \`127.0.0.1' to \`localhost'..."
+      sed -i "$i" -e's/\<localhost\>/127.0.0.1/g'
+    done
+
+    # Make sure the tests don't rely on `/tmp', for the sake of chroot
+    # builds.
+    for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
+                    -exec grep -l /tmp {} \;)
+    do
+      echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
+      substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
+    done
+
+    # Ensure NSS installation works fine
+    configureFlags="$configureFlags --with-nssdir=$out/lib"
+
+    sh contrib/pogen.sh
+    sh bootstrap
+  '';
+
+  doCheck = false;
+
+  /* FIXME: Tests must be run this way, but there are still a couple of
+     failures.
+
+  postInstall =
+    '' export GNUNET_PREFIX="$out"
+       export PATH="$out/bin:$PATH"
+       make -k check
+    '';
+  */
+
+  meta = {
+    description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
+
+    longDescription = ''
+      GNUnet is a framework for secure peer-to-peer networking that
+      does not use any centralized or otherwise trusted services.  A
+      first service implemented on top of the networking layer
+      allows anonymous censorship-resistant file-sharing.  Anonymity
+      is provided by making messages originating from a peer
+      indistinguishable from messages that the peer is routing.  All
+      peers act as routers and use link-encrypted connections with
+      stable bandwidth utilization to communicate with each other.
+      GNUnet uses a simple, excess-based economic model to allocate
+      resources.  Peers in GNUnet monitor each others behavior with
+      respect to resource usage; peers that contribute to the
+      network are rewarded with better service.
+    '';
+
+    homepage = https://gnunet.org/;
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    maintainers = with stdenv.lib.maintainers; [ viric ];
+    platforms = stdenv.lib.platforms.gnu;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ba524aa722a..b4b0f4098c88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16026,6 +16026,8 @@ with pkgs;
 
   gnunet = callPackage ../applications/networking/p2p/gnunet { };
 
+  gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { });
+
   gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { });
 
   gocr = callPackage ../applications/graphics/gocr { };

From 518fb36dcbd4473055ff34480a8c1fa45604d03b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Apr 2018 14:23:36 +0200
Subject: [PATCH 0709/3370] gimpPlugins.focusblur: mark as broken

---
 pkgs/applications/graphics/gimp/plugins/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 600938645df8..b950ae7b2dd4 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -88,6 +88,7 @@ rec {
       url = "http://registry.gimp.org/files/${name}.tar.bz2";
       sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h";
     };
+    meta.broken = true;
   };
 
   resynthesizer = pluginDerivation {

From 4779556ed16e95c807784285a64248cf6048da41 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Apr 2018 14:23:46 +0200
Subject: [PATCH 0710/3370] gimpPlugins.texturize: mark as broken

---
 pkgs/applications/graphics/gimp/plugins/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index b950ae7b2dd4..f491f5dc914a 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -139,6 +139,7 @@ rec {
       sha256 = "1zzvbczly7k456c0y6s92a1i8ph4ywmbvdl8i4rcc29l4qd2z8fw";
     };
     installPhase = "installPlugins src/texturize";
+    meta.broken = true; # https://github.com/lmanul/gimp-texturize/issues/1
   };
 
   waveletSharpen = pluginDerivation {

From 5c4b687a88c9f4d2b4fa75c1919e96260d6f2e7e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 29 Apr 2018 14:29:36 +0200
Subject: [PATCH 0711/3370] gimp-with-plugins: filter out broken plugins from
 default selection

---
 pkgs/applications/graphics/gimp/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix
index 6e450b25c048..ec529519159b 100644
--- a/pkgs/applications/graphics/gimp/wrapper.nix
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, plugins ? null}:
 
 let
-allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins);
+allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation" && !pkg.meta.broken or false) (lib.attrValues gimpPlugins);
 selectedPlugins = if plugins == null then allPlugins else plugins;
 extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
 versionBranch = stdenv.lib.versions.majorMinor gimp.version;

From a3b69a52c58baa8e9f801e227f85c8502dd21669 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 29 Apr 2018 20:34:41 +0800
Subject: [PATCH 0712/3370] uchiwa: 1.1.2 -> 1.2.0

---
 pkgs/servers/monitoring/uchiwa/bower-packages.nix | 12 ++++++------
 pkgs/servers/monitoring/uchiwa/src.nix            |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/monitoring/uchiwa/bower-packages.nix b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
index 618c3a33cd7c..f18ea3875516 100644
--- a/pkgs/servers/monitoring/uchiwa/bower-packages.nix
+++ b/pkgs/servers/monitoring/uchiwa/bower-packages.nix
@@ -1,15 +1,15 @@
 # Generated by bower2nix v3.2.0 (https://github.com/rvl/bower2nix)
 { fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
-  (fetchbower "uchiwa-web" "1.1.2" "1.1.2" "174flmnqjm0avpvi71ii5cvas2wkgz42is38r7n4zyrhagzlj66k")
-  (fetchbower "angular" "1.6.8" "~1.6.3" "07bwbahxaz5myjj7sqv7k211avs23a9j7msl373h1qvp05fblajf")
+  (fetchbower "uchiwa-web" "1.2.0" "1.2.0" "0733ha6bahzg9qlvhz75agi8hwwqdk99hfx9j8dhpdf1v5xkj2fz")
+  (fetchbower "angular" "1.6.10" "~1.6.3" "0ag8xddsgxx5yka4wjq4ala4y6z3x2g1vc3x7a1n291fzz26p7ws")
   (fetchbower "angular-bootstrap" "2.2.0" "~2.2.0" "11r2nlwp6xrim2y6lnrr8v064mx3bmlxchqpg1i803v9zxz3q53d")
-  (fetchbower "angular-cookies" "1.6.8" "~1.6.3" "0p3skdg2pmzgwm9a0gyl1vhq4lcwyrymmii7lxlrmypjhwm83il6")
+  (fetchbower "angular-cookies" "1.6.10" "~1.6.3" "0bjgmz5jnw06dfxhq9sajj62fk0b3v4j9p7nb45x8bl8rzkf25pn")
   (fetchbower "angular-gravatar" "0.4.2" "~0.4.2" "14jrzvjwx64awh9z95054manp8qd57fvinqhmakipz5x12i7qrwi")
   (fetchbower "angular-moment" "1.0.1" "~1.0.1" "0zkn52s9l15d6b5zfx52g5jpib23rpb637m0p1hzc429w5bbl0rj")
-  (fetchbower "angular-resource" "1.6.8" "~1.6.3" "0pnv12c61i8giwj0fmzf38f3x6ckf24g6izrak9y7zy28nlb3y5q")
-  (fetchbower "angular-route" "1.6.8" "~1.6.3" "0k8sy5dkn589w8ykn65fhrcrfi7wkn7gagwwl5j5zgzj4m91wlar")
-  (fetchbower "angular-sanitize" "1.6.8" "~1.6.3" "0q7hy5iyjlf745yisphwa5b8rvkhc43zwwmiwfkqcdcbf3w6564l")
+  (fetchbower "angular-resource" "1.6.10" "~1.6.3" "1gplq8kd49qakk7ardg5xr5amwvspaz9n71kf8x49xfllda61rm0")
+  (fetchbower "angular-route" "1.6.10" "~1.6.3" "0vwbn7i45yvsn8c469nj141ahrn7iw85j7hy3vvhh2r373j94mai")
+  (fetchbower "angular-sanitize" "1.6.10" "~1.6.3" "066gsdl19s27w00wafg2skf5abdsdrlzhkcagkk1ma39dyqyl4i3")
   (fetchbower "angular-toastr" "1.6.0" "1.6.0" "1szigf1m28bgpfyg8hbm5rffr5zi7wr9n73nc1fqhk0yqh7gzysh")
   (fetchbower "angular-tools/ng-jsoneditor" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "ea138469f157d8f2b54ec5b8dcf4b08a55b61459" "1j3vysr01niabc9fxcpixhcq1lyx2fr4q4wpmxhmiqki431h9hq8")
   (fetchbower "angular-ua-parser" "0.0.2" "0.0.2" "0gb0vmwksnydlm6hklfq1n4ak2967wcmnx3cx9cgiv7v7vk3w2m9")
diff --git a/pkgs/servers/monitoring/uchiwa/src.nix b/pkgs/servers/monitoring/uchiwa/src.nix
index 3e0ead7b495b..0cf6815fbe5d 100644
--- a/pkgs/servers/monitoring/uchiwa/src.nix
+++ b/pkgs/servers/monitoring/uchiwa/src.nix
@@ -1,4 +1,4 @@
 {
-    version = "1.1.2-1";
-    sha256  = "0fmzpjwmv7fkl0ihy2gzcgfd384k3wnifg42gzap770d6kl6yj1c";
+    version = "1.2.0-1";
+    sha256  = "1gj9cr0gkiivxdlq7ha6gxq9s8s26j79crijkrlrsqpg59jz063p";
 }

From 97adb03a9e542c9966712b9d88c84b4ed6d1a6b6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 29 Apr 2018 15:28:33 +0200
Subject: [PATCH 0713/3370] nixos/tests/predictable-interface-names: Refactor

The Nix expression here is really hard to read with multiple (and
unnecessarily) nested lets and it also generates attribute names based
on the derivation generated by makeTest, which will result in these
attribute names:

  * vm-test-run-predictableInterfaceNames
  * vm-test-run-predictableInterfaceNames-with-networkd
  * vm-test-run-unpredictableInterfaceNames
  * vm-test-run-unpredictableInterfaceNames-with-networkd

With the refactor the attribute names are now:

  * predictable
  * predictableNetworkd
  * unpredictable
  * unpredictableNetworkd

So now the code is even shorter and IMHO slightly more readable.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @symphorien, @fpletz, @adisbladis
---
 nixos/tests/predictable-interface-names.nix | 47 ++++++++++-----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/nixos/tests/predictable-interface-names.nix b/nixos/tests/predictable-interface-names.nix
index b4c2039923cf..0b431034a7a9 100644
--- a/nixos/tests/predictable-interface-names.nix
+++ b/nixos/tests/predictable-interface-names.nix
@@ -1,27 +1,24 @@
-{ system ? builtins.currentSystem
-, pkgs ? import ../.. { inherit system; }
-}:
-with import ../lib/testing.nix { inherit system; };
-let boolToString = x: if x then "yes" else "no"; in
-let testWhenSetTo = predictable: withNetworkd:
-makeTest {
-  name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";
-  meta = {};
+{ system ? builtins.currentSystem }:
 
-  machine = { config, pkgs, ... }: {
-    networking.usePredictableInterfaceNames = pkgs.stdenv.lib.mkForce predictable;
-    networking.useNetworkd = withNetworkd;
-    networking.dhcpcd.enable = !withNetworkd;
+let
+  inherit (import ../lib/testing.nix { inherit system; }) makeTest pkgs;
+in pkgs.lib.listToAttrs (pkgs.lib.crossLists (predictable: withNetworkd: {
+  name = pkgs.lib.optionalString (!predictable) "un" + "predictable"
+       + pkgs.lib.optionalString withNetworkd "Networkd";
+  value = makeTest {
+    name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";
+    meta = {};
+
+    machine = { config, lib, ... }: {
+      networking.usePredictableInterfaceNames = lib.mkForce predictable;
+      networking.useNetworkd = withNetworkd;
+      networking.dhcpcd.enable = !withNetworkd;
+    };
+
+    testScript = ''
+      print $machine->succeed("ip link");
+      $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}");
+      $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}");
+    '';
   };
-
-  testScript = ''
-    print $machine->succeed("ip link");
-    $machine->succeed("ip link show ${if predictable then "ens3" else "eth0"}");
-    $machine->fail("ip link show ${if predictable then "eth0" else "ens3"}");
-  '';
-}; in
-with pkgs.stdenv.lib.lists;
-with pkgs.stdenv.lib.attrsets;
-listToAttrs (map (drv: nameValuePair drv.name drv) (
-crossLists testWhenSetTo [[true false] [true false]]
-))
+}) [[true false] [true false]])

From e55677bffa05c8e1f08e33b4bc08533684c20a50 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 29 Apr 2018 17:09:11 +0300
Subject: [PATCH 0714/3370] tiled: 1.1.4 -> 1.1.5

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

diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index 8444ff6eaecc..b23db38e0f45 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "tiled-${version}";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "bjorn";
     repo = "tiled";
     rev = "v${version}";
-    sha256 = "0ln8lis9g23wp3w70xwbkzqmmbkd02cdx6z7msw9lrpkjzkj7mlr";
+    sha256 = "1l8sx0qfkm7n2ag0ns01vrs8mzcxzva00in4xqz4zgd505qx5q9v";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Free, easy to use and flexible tile map editor";
-    homepage = http://www.mapeditor.org/;
+    homepage = https://www.mapeditor.org/;
     license = with licenses; [
       bsd2	# libtiled and tmxviewer
       gpl2Plus	# all the rest

From 067ed1c5eb0f8620f51338f061c412621c63191d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 29 Apr 2018 16:47:59 +0200
Subject: [PATCH 0715/3370] instead: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 343b2948d5ea..697791d38577 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "3.2.0";
+  version = "3.2.1";
 
   # I took several games at random from http://instead.syscall.ru/games/
   games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
-    sha256 = "0l57qdngxv9nbfj4ixr4fyanlazmdib2kr1nzv3g578308xzjv6a";
+    sha256 = "1lnsawbrdhdixbdhm49hc4c9vz2l3fvrpbxyk1mia2hf4pdmc594";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";

From 2085b88c01ed49b9d3d1fbc7e234cfb217fe14fd Mon Sep 17 00:00:00 2001
From: Philipp Steinpass <philipp@xndr.de>
Date: Sun, 29 Apr 2018 13:50:58 +0200
Subject: [PATCH 0716/3370] dehydrated: 0.6.1 -> 0.6.2

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

diff --git a/pkgs/tools/admin/dehydrated/default.nix b/pkgs/tools/admin/dehydrated/default.nix
index d4211328b959..38b70d1b5d07 100644
--- a/pkgs/tools/admin/dehydrated/default.nix
+++ b/pkgs/tools/admin/dehydrated/default.nix
@@ -1,7 +1,7 @@
 { stdenv, bash, coreutils, curl, diffutils, gawk, gnugrep, gnused, openssl, makeWrapper, fetchFromGitHub }:
 let
   pkgName = "dehydrated";
-  version = "0.6.1";
+  version = "0.6.2";
 in
 stdenv.mkDerivation rec {
   name = pkgName + "-" + version;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "lukas2511";
     repo = "dehydrated";
     rev = "v${version}";
-    sha256 = "0390fnycl3l4yqacwvaf7dp08rx2vvs27s06q7b478qzrn59flz4";
+    sha256 = "19d4kam0dl6l9wfd0v54w4d085jdgi1ljksnqpjj67d6sm23f2l4";
   };
 
   buildInputs = [ makeWrapper ];

From a07881c8b83ecf08d1cca03d9c185fd940fe23f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sat, 28 Apr 2018 01:40:57 +0200
Subject: [PATCH 0717/3370] chromium: skia patch appears to be still needed
 with 66 on aarch64

Cc @chaoflow @bendlas
Replaces #39628
---
 pkgs/applications/networking/browsers/chromium/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index b591d5d7ba0c..ad28d829157b 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -160,7 +160,7 @@ let
         sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z";
       })
     ] ++ optional enableWideVine ./patches/widevine.patch
-      ++ optionals (stdenv.isAarch64 && versionRange "65" "66") [
+      ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [
         ./patches/skia_buildfix.patch
     ];
 

From 905b03bce29601c23848ea6bdb4d7b879750041f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 29 Apr 2018 00:13:03 +0200
Subject: [PATCH 0718/3370] chromium: fix build on aarch64

chromium build on aarch64 failed with:
```
FAILED: obj/skia/skia/convolver_neon.o
g++ -MMD -MF obj/skia/skia/convolver_neon.o.d -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS -D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_SUPPORT_GPU=1 -DSK_FREETYPE_MINIMUM_RUNTIME_VERSION=\(\(\(FREETYPE_MAJOR\)\ \*\ 0x01000000\)\ \|\ \(\(FREETYPE_MINOR\)\ \*\ 0x00010000\)\ \|\ \(\(FREETYPE_PATCH\)\ \*\ 0x00000100\)\) -DSK_GAMMA_EXPONENT=1.2 -DSK_GAMMA_CONTRAST=0.2 -DSK_DEFAULT_FONT_CACHE_LIMIT=20971520 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DFT_CONFIG_CONFIG_H=\"freetype-custom-config/ftconfig.h\" -DFT_CONFIG_MODULES_H=\"freetype-custom-config/ftmodule.h\" -DFT_CONFIG_OPTIONS_H=\"freetype-custom-config/ftoption.h\" -DPDFIUM_REQUIRED_MODULES -DCHROMIUM_RESTRICT_VISIBILITY -DUSE_LIBJPEG_TURBO=1 -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DUSE_SYSTEM_ZLIB=1 -I../.. -Igen -I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c -I../../third_party/skia/include/config -I../../third_party/skia/include/core -I../../third_party/skia/include/effects -I../../third_party/skia/include/encode -I../../third_party/skia/include/gpu -I../../third_party/skia/include/images -I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops -I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe -I../../third_party/skia/include/ports -I../../third_party/skia/include/utils -I../../third_party/skia/src/gpu -I../../third_party/skia/src/sksl -I../../third_party/skia/include/codec -I../../third_party/skia/include/private -I../../third_party/skia/include/client/android -I../../third_party/skia/src/codec -I../../third_party/skia/src/core -I../../third_party/skia/src/image -I../../third_party/skia/src/images -I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf -I../../third_party/skia/src/ports -I../../third_party/skia/src/shaders -I../../third_party/skia/src/shaders/gradients -I../../third_party/skia/src/sfnt -I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy -I../../third_party/skia/third_party/gif -I../../third_party/skia/src/effects/gradients -Igen/shim_headers/libpng_shim -Igen/shim_headers/zlib_shim -I../../third_party/freetype/include -I../../third_party/freetype/src/include -I../../third_party/harfbuzz-ng/src -I../../third_party/libjpeg_turbo -I../../third_party/fontconfig/src -I../../third_party/icu/source/common -I../../third_party/icu/source/i18n -I../../third_party/sfntly/src/cpp/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -pthread -fno-omit-frame-pointer -g0 -fno-builtin-abs -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -isystem/nix/store/smmxgfkqaqqh43d5gmv5p3abcq19hkzy-glib-2.56.0-dev/include/glib-2.0 -isystem/nix/store/yn3bbw1sxg19h07wzn16k0ja58wr9yiz-glib-2.56.0/lib/glib-2.0/include -isystem/nix/store/f82jgynysk9mvhyfavfzims41zkskb3c-libpng-apng-1.6.34-dev/include/libpng16 -isystem/nix/store/56i89kfi2nmjrv8hifsz6zikr6pq1avw-zlib-1.2.11-dev/include -std=gnu++14 -fno-exceptions -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include -fvisibility-inlines-hidden -Wno-narrowing -c ../../skia/ext/convolver_neon.cc -o obj/skia/skia/convolver_neon.o
../../skia/ext/convolver_neon.cc: In function 'int32x4_t skia::AccumRemainder(const unsigned char*, const Fixed*, int)':
../../skia/ext/convolver_neon.cc:26:65: error: cannot convert '<brace-enclosed initializer list>' to 'int32x4_t {aka __vector(4) int}' in return
   return {remainder[0], remainder[1], remainder[2], remainder[3]};
                                                                 ^
```

The following patch appears to fix this build issue.

Source: https://chromium.googlesource.com/chromium/src.git/+/b84682f31dc99b9c90f5a04947075815697c68d9%5E%21/#F0
Suggested-by: @dezgeg
---
 .../networking/browsers/chromium/common.nix   |  1 +
 .../chromium/patches/neon_buildfix.patch      | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index ad28d829157b..6403f5441f36 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -162,6 +162,7 @@ let
     ] ++ optional enableWideVine ./patches/widevine.patch
       ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [
         ./patches/skia_buildfix.patch
+        ./patches/neon_buildfix.patch
     ];
 
     postPatch = ''
diff --git a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch
new file mode 100644
index 000000000000..b44487ca634c
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch
@@ -0,0 +1,21 @@
+diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc
+index 26b91b9..cae6bc2 100644
+--- a/skia/ext/convolver_neon.cc
++++ b/skia/ext/convolver_neon.cc
+
+@@ -23,7 +23,7 @@
+     remainder[2] += coeff * pixels_left[i * 4 + 2];
+     remainder[3] += coeff * pixels_left[i * 4 + 3];
+   }
+-  return {remainder[0], remainder[1], remainder[2], remainder[3]};
++  return vld1q_s32(remainder);
+ }
+ 
+ // Convolves horizontally along a single row. The row data is given in
+@@ -336,4 +336,4 @@
+   }
+ }
+ 
+-}  // namespace skia
+\ No newline at end of file
++}  // namespace skia

From 0e5eafc1fd0e58fb4bca6d0defff36e168eacc08 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Apr 2018 17:40:18 +0200
Subject: [PATCH 0719/3370] awscli: 1.14.50 -> 1.15.10; fix build

As reported in #39676 the build broke because of ca52152 as the bump of
`pythonPackages.botocore` to 1.10.9 clashed with the wanted dependencies
in `awscli`.

In order to reduce the risk of accidental bugs because of loosened
version constraints I bumped the AWS CLI to `1.15.10` which depends on
`botocore@1.10` as well.

Fixes #39676
---
 pkgs/tools/admin/awscli/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index 23908a8b66f9..4e7e2d402e90 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -19,11 +19,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.14.50";
+  version = "1.15.10";
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "1yiwj7cl9r1k9226mdq6pcmrs044k7p3d133lzgv9rb1dgp4053c";
+    sha256 = "0nwpanbfx5h0bad8wwvvbhpjf9r6n885bbv2w8mw7vijdgclkq8x";
   };
 
   # No tests included
@@ -42,6 +42,12 @@ in py.pkgs.buildPythonApplication rec {
     less
   ];
 
+  postPatch = ''
+    for i in {py,cfg}; do
+      substituteInPlace setup.$i --replace "botocore==1.10.10" "botocore>=1.10.9,<=1.11"
+    done
+  '';
+
   postInstall = ''
     mkdir -p $out/etc/bash_completion.d
     echo "complete -C $out/bin/aws_completer aws" > $out/etc/bash_completion.d/awscli

From 80b7298420f0ce6327f9d75f63f416d6db22231e Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sat, 28 Apr 2018 22:13:12 -0400
Subject: [PATCH 0720/3370] =?UTF-8?q?ldb:=201.1.27=20=E2=86=92=201.1.31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index 4f2785675f08..c178f2f76a4d 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python, pkgconfig, readline, tdb, talloc, tevent
-, popt, libxslt, docbook_xsl, docbook_xml_dtd_42
+, popt, libxslt, docbook_xsl, docbook_xml_dtd_42, cmocka
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldb-1.1.27";
+  name = "ldb-1.1.31";
 
   src = fetchurl {
     url = "mirror://samba/ldb/${name}.tar.gz";
-    sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d";
+    sha256 = "04d53e2ab5b35688f5ed7a4471f5b273da121016e1af0630b36a36506afaeb46"                                                                                                                                                             ;
   };
 
   outputs = [ "out" "dev" ];
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python readline tdb talloc tevent popt
     libxslt docbook_xsl docbook_xml_dtd_42
+    cmocka
   ];
 
   preConfigure = ''

From 7d68eadf373f9962b0e6c9f9299563c543245396 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 29 Apr 2018 13:30:09 -0400
Subject: [PATCH 0721/3370] nixos/acme: Fix broken post-stop script

Previously the script would contain an empty `if` block (which is invalid
syntax) if both `data.activationDelay == null` and `data.postRun == ""`. Fix
this by adding a no-op `true`.
---
 nixos/modules/security/acme.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index e430c2ddb903..9e5d636241e9 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -257,7 +257,7 @@ in
 
                     if [ -e /tmp/lastExitCode ] && [ "$(cat /tmp/lastExitCode)" = "0" ]; then
                       ${if data.activationDelay != null then ''
-                      
+
                       ${data.preDelay}
 
                       if [ -d '${lpath}' ]; then
@@ -266,6 +266,10 @@ in
                         systemctl --wait start acme-setlive-${cert}.service
                       fi
                       '' else data.postRun}
+
+                      # noop ensuring that the "if" block is non-empty even if
+                      # activationDelay == null and postRun == ""
+                      true
                     fi
                   '';
 
@@ -294,7 +298,7 @@ in
                         chown '${data.user}:${data.group}' '${cpath}'
                       fi
                   '';
-                  script = 
+                  script =
                     ''
                       workdir="$(mktemp -d)"
 

From 0a973b9985d7bf41622d2048d5e261c24db6f635 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 27 Apr 2018 10:50:46 +0100
Subject: [PATCH 0722/3370] vagrant: 2.0.2 -> 2.0.4

---
 pkgs/development/tools/vagrant/Gemfile      |   2 +-
 pkgs/development/tools/vagrant/Gemfile.lock |  73 +++-----
 pkgs/development/tools/vagrant/default.nix  |  25 +--
 pkgs/development/tools/vagrant/gemset.nix   | 183 +++++---------------
 4 files changed, 71 insertions(+), 212 deletions(-)

diff --git a/pkgs/development/tools/vagrant/Gemfile b/pkgs/development/tools/vagrant/Gemfile
index d32951f1c054..f25a77c9398c 100644
--- a/pkgs/development/tools/vagrant/Gemfile
+++ b/pkgs/development/tools/vagrant/Gemfile
@@ -1,2 +1,2 @@
 source "https://rubygems.org"
-gem 'vagrant'
+gem 'vagrant', git: "https://github.com/hashicorp/vagrant.git", tag: "v2.0.4"
diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock
index 2c63b57443ad..fd5cb8dbee9e 100644
--- a/pkgs/development/tools/vagrant/Gemfile.lock
+++ b/pkgs/development/tools/vagrant/Gemfile.lock
@@ -1,17 +1,9 @@
 GIT
-  remote: https://github.com/mitchellh/vagrant-spec.git
-  revision: 7ac8b4191de578e345b29acaf62ecc72c8e73be1
+  remote: https://github.com/hashicorp/vagrant.git
+  revision: 6a6805f284dff05207e359acdfb1ca8443b78751
+  tag: v2.0.4
   specs:
-    vagrant-spec (0.0.1)
-      childprocess (~> 0.6.0)
-      log4r (~> 1.1.9)
-      rspec (~> 3.5.0)
-      thor (~> 0.18.1)
-
-PATH
-  remote: .
-  specs:
-    vagrant (2.0.2)
+    vagrant (2.0.4)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
@@ -25,6 +17,8 @@ PATH
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
       wdm (~> 0.1.0)
+      win32-file (~> 0.8.1)
+      win32-file-security (~> 1.0.10)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
       winrm-fs (~> 1.0)
@@ -32,24 +26,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    fake_ftp (0.1.1)
-    ffi (1.9.18)
+    ffi (1.9.23)
+    ffi-win32-extensions (1.0.3)
+      ffi
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashdiff (0.3.7)
     hashicorp-checkpoint (0.1.5)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -75,8 +64,6 @@ GEM
     net-ssh (4.2.0)
     netrc (0.11.0)
     nori (2.6.0)
-    public_suffix (3.0.1)
-    rake (12.0.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -86,35 +73,23 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-its (1.2.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
     ruby_dep (1.3.1)
     rubyntlm (0.6.2)
     rubyzip (1.2.1)
-    safe_yaml (1.0.4)
-    thor (0.18.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
     wdm (0.1.1)
-    webmock (2.3.2)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-      hashdiff
+    win32-file (0.8.1)
+      ffi
+      ffi-win32-extensions
+      win32-file-stat (>= 1.4.0)
+    win32-file-security (1.0.10)
+      ffi
+      ffi-win32-extensions
+    win32-file-stat (1.5.5)
+      ffi
+      ffi-win32-extensions
     winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
@@ -137,13 +112,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fake_ftp (~> 0.1.1)
-  rake (~> 12.0.0)
-  rspec (~> 3.5.0)
-  rspec-its (~> 1.2.0)
   vagrant!
-  vagrant-spec!
-  webmock (~> 2.3.1)
 
 BUNDLED WITH
-   1.14.6
+   1.16.1
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 3b055d38d03f..11ca6014b2de 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,36 +1,29 @@
-{ lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }:
+{ lib, buildRubyGem, bundlerEnv, ruby, libarchive }:
+
+
+# To update vagrant, visit the Gemfile and re-run bundix.
 
 let
-  version = "2.0.2";
-  url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir";
+  gemset = import ./gemset.nix;
+  inherit (gemset.vagrant) version;
 
   deps = bundlerEnv rec {
-    name = "${pname}-${version}";
+    name = "vagrant-${version}";
     pname = "vagrant";
     inherit version;
 
     inherit ruby;
     gemdir = ./.;
-    gemset = lib.recursiveUpdate (import ./gemset.nix) {
-      vagrant = {
-        source = {
-          type = "url";
-          inherit url sha256;
-        };
-        inherit version;
-      };
-    };
   };
 
 in buildRubyGem rec {
   name = "${gemName}-${version}";
   gemName = "vagrant";
-  inherit version;
 
   doInstallCheck = true;
   dontBuild = false;
-  src = fetchurl { inherit url sha256; };
+
+  inherit (deps.gems.vagrant) src;
 
   patches = [
     ./unofficial-installation-nowarn.patch
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index 5d3d2693d013..7a432d302172 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -1,13 +1,4 @@
 {
-  addressable = {
-    dependencies = ["public_suffix"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
-      type = "gem";
-    };
-    version = "2.5.2";
-  };
   builder = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -25,31 +16,14 @@
     };
     version = "0.6.3";
   };
-  crack = {
-    dependencies = ["safe_yaml"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
-      type = "gem";
-    };
-    version = "0.4.3";
-  };
-  diff-lcs = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza";
-      type = "gem";
-    };
-    version = "1.3";
-  };
   domain_name = {
     dependencies = ["unf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
+      sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
       type = "gem";
     };
-    version = "0.5.20170404";
+    version = "0.5.20180417";
   };
   erubis = {
     source = {
@@ -59,21 +33,22 @@
     };
     version = "2.7.0";
   };
-  fake_ftp = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0rn7lxdk3sqc2i4v2c5k25b9ca1qnkdf32nv04y760aml9mszwf7";
-      type = "gem";
-    };
-    version = "0.1.1";
-  };
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
       type = "gem";
     };
-    version = "1.9.18";
+    version = "1.9.23";
+  };
+  ffi-win32-extensions = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ywkkbr3bpi2ais2jr8yrsqwwrm48jg262anmdkcb9if95vajx7l";
+      type = "gem";
+    };
+    version = "1.0.3";
   };
   gssapi = {
     dependencies = ["ffi"];
@@ -93,14 +68,6 @@
     };
     version = "1.3.1";
   };
-  hashdiff = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0yj5l2rw8i8jc725hbcpc4wks0qlaaimr3dpaqamfjkjkxl0hjp9";
-      type = "gem";
-    };
-    version = "0.3.7";
-  };
   hashicorp-checkpoint = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -235,22 +202,6 @@
     };
     version = "2.6.0";
   };
-  public_suffix = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0mvzd9ycjw8ydb9qy3daq3kdzqs2vpqvac4dqss6ckk4rfcjc637";
-      type = "gem";
-    };
-    version = "3.0.1";
-  };
-  rake = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "01j8fc9bqjnrsxbppncai05h43315vmz9fwg28qdsgcjw9ck1d7n";
-      type = "gem";
-    };
-    version = "12.0.0";
-  };
   rb-fsevent = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -286,59 +237,6 @@
     };
     version = "2.0.2";
   };
-  rspec = {
-    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "16g3mmih999f0b6vcz2c3qsc7ks5zy4lj1rzjh8hf6wk531nvc6s";
-      type = "gem";
-    };
-    version = "3.5.0";
-  };
-  rspec-core = {
-    dependencies = ["rspec-support"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1nacs062qbr98fx6czf1vwppn1js956nv2c8vfwj6i65axdfs46i";
-      type = "gem";
-    };
-    version = "3.5.4";
-  };
-  rspec-expectations = {
-    dependencies = ["diff-lcs" "rspec-support"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0bbqfrb1x8gmwf8x2xhhwvvlhwbbafq4isbvlibxi6jk602f09gs";
-      type = "gem";
-    };
-    version = "3.5.0";
-  };
-  rspec-its = {
-    dependencies = ["rspec-core" "rspec-expectations"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1pwphny5jawcm1hda3vs9pjv1cybaxy17dc1s75qd7drrvx697p3";
-      type = "gem";
-    };
-    version = "1.2.0";
-  };
-  rspec-mocks = {
-    dependencies = ["diff-lcs" "rspec-support"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0nl3ksivh9wwrjjd47z5dggrwx40v6gpb3a0gzbp1gs06a5dmk24";
-      type = "gem";
-    };
-    version = "3.5.0";
-  };
-  rspec-support = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "10vf3k3d472y573mag2kzfsfrf6rv355s13kadnpryk8d36yq5r0";
-      type = "gem";
-    };
-    version = "3.5.0";
-  };
   ruby_dep = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -363,22 +261,6 @@
     };
     version = "1.2.1";
   };
-  safe_yaml = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-      type = "gem";
-    };
-    version = "1.0.4";
-  };
-  thor = {
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3";
-      type = "gem";
-    };
-    version = "0.18.1";
-  };
   unf = {
     dependencies = ["unf_ext"];
     source = {
@@ -397,18 +279,15 @@
     version = "0.0.7.5";
   };
   vagrant = {
-    dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"];
-  };
-  vagrant-spec = {
-    dependencies = ["childprocess" "log4r" "rspec" "thor"];
+    dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "win32-file" "win32-file-security" "winrm" "winrm-elevated" "winrm-fs"];
     source = {
       fetchSubmodules = false;
-      rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1";
-      sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h";
+      rev = "6a6805f284dff05207e359acdfb1ca8443b78751";
+      sha256 = "07c7r4xk0md9hkbcnij0kp7acxz0li9ak1ah7lmh52j10gq4cjmw";
       type = "git";
-      url = "https://github.com/mitchellh/vagrant-spec.git";
+      url = "https://github.com/hashicorp/vagrant.git";
     };
-    version = "0.0.1";
+    version = "2.0.4";
   };
   wdm = {
     source = {
@@ -418,14 +297,32 @@
     };
     version = "0.1.1";
   };
-  webmock = {
-    dependencies = ["addressable" "crack" "hashdiff"];
+  win32-file = {
+    dependencies = ["ffi" "ffi-win32-extensions" "win32-file-stat"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04hkcqsmbfnp8g237pisnc834vpgildklicbjbyikqg0bg1rwcy5";
+      sha256 = "0mjylzv4bbnxyjqf7hnd9ghcs5xr2sv8chnmkqdi2cc6pya2xax0";
       type = "gem";
     };
-    version = "2.3.2";
+    version = "0.8.1";
+  };
+  win32-file-security = {
+    dependencies = ["ffi" "ffi-win32-extensions"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lpq821a1hrxmm0ki5c34wijzhn77g4ny76v698ixwg853y2ir9r";
+      type = "gem";
+    };
+    version = "1.0.10";
+  };
+  win32-file-stat = {
+    dependencies = ["ffi" "ffi-win32-extensions"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lc3yajcb8xxabvj9qian938k60ixydvs3ixl5fldi0nlvnvk468";
+      type = "gem";
+    };
+    version = "1.5.5";
   };
   winrm = {
     dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];

From 80bf73b11c6e5b4f9fdf499d85a7d66f6be04f90 Mon Sep 17 00:00:00 2001
From: Matan Shenhav <matan@fluxcraft.net>
Date: Sun, 29 Apr 2018 21:22:12 +0300
Subject: [PATCH 0723/3370] pythonPackages.hdbscan: init at 0.8.12 (#37762)

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

diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
new file mode 100644
index 000000000000..3d57ff371666
--- /dev/null
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, cython
+, numpy
+, nose
+, scipy
+, scikitlearn
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "hdbscan";
+  version = "0.8.12";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0yxi34frg2jwyvjl942qy4gq5pbx8dq4pf4p28d1xah8njchfqir";
+  };
+
+  checkInputs = [ nose ];
+
+  propagatedBuildInputs = [ cython numpy scipy scikitlearn ];
+
+  meta = with lib; {
+    description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API";
+    homepage =  http://github.com/scikit-learn-contrib/hdbscan;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ixxie ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93444be7302a..6635721ee958 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6342,6 +6342,8 @@ in {
     propagatedBuildInputs = with self; [ requests webob ];
   };
 
+  hdbscan = callPackage ../development/python-modules/hdbscan { };
+
   hmmlearn = callPackage ../development/python-modules/hmmlearn { };
 
   hcs_utils = callPackage ../development/python-modules/hcs_utils { };

From 42d11feae80f86b450ce64eef75a6f21dc807aab Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Wed, 7 Mar 2018 17:19:37 +0300
Subject: [PATCH 0724/3370] pythonPackages.isort: 4.2.5 -> 4.3.4

---
 .../python-modules/isort/default.nix          | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +------------
 2 files changed, 29 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/isort/default.nix

diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix
new file mode 100644
index 000000000000..5a7e50d43322
--- /dev/null
+++ b/pkgs/development/python-modules/isort/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchPypi, isPy27, futures, mock, pytest }:
+
+buildPythonPackage rec {
+  pname = "isort";
+  version = "4.3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1y0yfv56cqyh9wyg7kxxv9y5wmfgcq18n7a49mp7xmzka2bhxi5r";
+  };
+
+  propagatedBuildInputs = lib.optional isPy27 futures;
+
+  checkInputs = [ mock pytest ];
+
+  checkPhase = ''
+    py.test test_isort.py -k "not test_long_line_comments \
+                          and not test_import_case_produces_inconsistent_results_issue_472 \
+                          and not test_no_extra_lines_issue_557"
+  '';
+
+  meta = with lib; {
+    description = "A Python utility / library to sort Python imports";
+    homepage = https://github.com/timothycrosley/isort;
+    license = licenses.mit;
+    maintainers = with maintainers; [ couchemar nand0p ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f24d6ff955bd..997da36a1eb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6802,24 +6802,7 @@ in {
 
   iso8601 = callPackage ../development/python-modules/iso8601 { };
 
-  isort = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    pname = "isort";
-    version = "4.2.5";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/i/${pname}/${name}.tar.gz";
-      sha256 = "0p7a6xaq7zxxq5vr5gizshnsbk2afm70apg97xwfdxiwyi201cjn";
-    };
-    buildInputs = with self; [ mock pytest ];
-    # No tests distributed
-    doCheck = false;
-    meta = {
-      description = "A Python utility / library to sort Python imports";
-      homepage = https://github.com/timothycrosley/isort;
-      license = licenses.mit;
-      maintainers = with maintainers; [ couchemar nand0p ];
-    };
-  };
+  isort = callPackage ../development/python-modules/isort {};
 
   jabberbot = callPackage ../development/python-modules/jabberbot {};
 

From 8a07916fa965d752d929890c4621823401862ab6 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 27 Apr 2018 20:30:51 +0000
Subject: [PATCH 0725/3370] hplip: 3.17.11 -> 3.18.3

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

diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index b18ae7762df2..91be6cf743a4 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -11,16 +11,16 @@
 let
 
   name = "hplip-${version}";
-  version = "3.17.11";
+  version = "3.18.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
-    sha256 = "0xda7x7xxjvzn1l0adlvbwcw21crq1r3r79bkf94q3m5i6abx49g";
+    sha256 = "0x5xs86v18w46rxz5whc15bl4fb7p4km6xqjpwzclp83nl7rl01y";
   };
 
   plugin = fetchurl {
     url = "https://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run";
-    sha256 = "0vqhwqc33vxncdhbzdchbgrcrxvkwnp7rc2hkswwn9da112s0c9w";
+    sha256 = "11nc3cifhd2h2c7p0dr2jjzrg3fd5j43ih1wy0m186l6wcgdjssw";
   };
 
   hplipState = substituteAll {

From 0be5637139970d5ae6aef1999769b600765a95f6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 14:27:26 -0500
Subject: [PATCH 0726/3370] netbsd.games: disable more games on darwin

---
 pkgs/os-specific/bsd/netbsd/default.nix | 33 +++++++++++++++----------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 343b61bab383..ecd09eaff807 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -381,19 +381,26 @@ in rec {
       # to build but need to look at how to implement stuff in
       # Linux. macOS is missing gettime. TODO try to get these
       # working.
-      substituteInPlace Makefile \
-        ${lib.optionalString stdenv.isDarwin "--replace adventure ''"} \
-        --replace atc "" \
-        --replace boggle "" \
-        --replace dm "" \
-        --replace fortune "" \
-        --replace hunt "" \
-        --replace larn "" \
-        --replace phantasia "" \
-        --replace rogue "" \
-        --replace sail "" \
-        --replace trek "" \
-        --replace dab ""
+      disableGame() {
+        substituteInPlace Makefile --replace $1 ""
+      }
+
+      disableGame atc
+      disableGame boggle
+      disableGame dm
+      disableGame fortune
+      disableGame hunt
+      disableGame larn
+      disableGame phantasia
+      disableGame rogue
+      disableGame sail
+      disableGame trek
+      disableGame dab
+      ${lib.optionalString stdenv.isDarwin "disableGame adventure"}
+      ${lib.optionalString stdenv.isDarwin "disableGame factor"}
+      ${lib.optionalString stdenv.isDarwin "disableGame gomoku"}
+      ${lib.optionalString stdenv.isDarwin "disableGame mille"}
+
       substituteInPlace Makefile.inc \
         --replace 2555 555 \
         --replace 2550 550

From c2148482c2b4d479017d94c5e8b80bdc9bdb9a03 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 14:46:54 -0500
Subject: [PATCH 0727/3370] libressl: move netcat stuff to '.nc' output

I still feel weird about doing this because it seems a little hacky
but this was requested by @Mic92 and seems understandable to not want
to mix up libressl outputs with netcat stuff.
---
 pkgs/development/libraries/libressl/default.nix | 11 ++++++++---
 pkgs/top-level/aliases.nix                      |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 8f028bcb5461..b65c813f230f 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, lib }:
 
 let
 
@@ -15,11 +15,16 @@ let
 
     enableParallelBuilding = true;
 
-    outputs = [ "bin" "dev" "out" "man" ];
+    outputs = [ "bin" "dev" "out" "man" "nc" ];
+
+    postFixup = ''
+      moveToOutput "bin/nc" "$nc"
+      moveToOutput "share/man/man1/nc.1${lib.optionalString (!dontGzipMan) ".gz"}" "$nc"
+    '';
 
     dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong
 
-    meta = with stdenv.lib; {
+    meta = with lib; {
       description = "Free TLS/SSL implementation";
       homepage    = "http://www.libressl.org";
       platforms   = platforms.all;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a7f59d1268fd..334905b79f2b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -138,7 +138,7 @@ mapAliases (rec {
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
   mysqlWorkbench = mysql-workbench; # added 2017-01-19
   ncat = nmap;  # added 2016-01-26
-  netcat-openbsd = libressl.bin; # added 2018-04-25
+  netcat-openbsd = libressl.nc; # added 2018-04-25
   networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
   networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
   networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25

From e8672c8b3751622c5d603bc7bb144377d1d3498c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 15:14:34 -0500
Subject: [PATCH 0728/3370] libressl: fix eval

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index b65c813f230f..51162979e630 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -19,7 +19,7 @@ let
 
     postFixup = ''
       moveToOutput "bin/nc" "$nc"
-      moveToOutput "share/man/man1/nc.1${lib.optionalString (!dontGzipMan) ".gz"}" "$nc"
+      moveToOutput "share/man/man1/nc.1${lib.optionalString (dontGzipMan==null) ".gz"}" "$nc"
     '';
 
     dontGzipMan = if stdenv.isDarwin then true else null; # not sure what's wrong

From caed1877ebf7a84f16ac1eb6af641af155e47b5b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 11 Apr 2018 20:51:39 +0200
Subject: [PATCH 0729/3370] cryptsetup-generator: add postFixup

This makes cryptsetup-generator link correctly
to the shared systemd library.
---
 .../linux/systemd/cryptsetup-generator.nix            | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
index f69269347e37..5c6efb440133 100644
--- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
+++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
@@ -13,6 +13,17 @@ stdenv.lib.overrideDerivation systemd (p: {
     ninja systemd-cryptsetup systemd-cryptsetup-generator
   '';
 
+  # As ninja install is not used here, the rpath needs to be manually fixed.
+  # Otherwise the resulting binary doesn't properly link against systemd-shared.so
+  postFixup = ''
+    sharedLib=libsystemd-shared-${p.version}.so
+    for prog in `find $out -type f -executable`; do
+      (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && (
+        patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog
+      ) || true
+    done
+  '';
+
   installPhase = ''
     mkdir -p $out/lib/systemd/
     cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup

From 87b51a1e670e1f973c48d1f8d896b2098e8769ca Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Sun, 29 Apr 2018 22:22:19 +0200
Subject: [PATCH 0730/3370] wine-{Unstable,Staging}: 3.5 -> 3.7

---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index f86e34a5d542..817241fbe0fe 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.5";
+    version = "3.7";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "0hr1syfhnpvcm84gmms1i26k68hakcgw4m6dvckmbbvw7ca0c8pl";
+    sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "0kcwg7w79zbsg29b9ma9mapzhj9dg7z0vccy4a35fx04044xj0zn";
+    sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 146cb02542989d67f6bb11e1206562f44c0e1eec Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 29 Apr 2018 23:39:25 +0200
Subject: [PATCH 0731/3370] nixos/tests/hibernate: Fix netcat flags

I'm not sure why 024b501907eafbd89624e465ff21afbc96e9fec6 used -q 0
because even netcat-openbsd has the -N flag which IMO is the better way
to shutdown the socket on EOF.

Our default netcat implementation has changed once again[1] in
3c3b82234a6faa5a4c07323d0066452055d1ea81 and we're now using LibreSSL's
implementation, which doesn't have a -q flag.

See https://github.com/NixOS/nixpkgs/pull/39634 for the pull request
introducing the switch.

[1]: https://github.com/NixOS/nixpkgs/pull/19982

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @matthewbauer, @dtzWill, @Mic92
---
 nixos/tests/hibernate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix
index a95235887e89..3ae2bdffed90 100644
--- a/nixos/tests/hibernate.nix
+++ b/nixos/tests/hibernate.nix
@@ -37,7 +37,7 @@ import ./make-test.nix (pkgs: {
       $machine->waitForShutdown;
       $machine->start;
       $probe->waitForUnit("network.target");
-      $probe->waitUntilSucceeds("echo test | nc machine 4444 -q 0");
+      $probe->waitUntilSucceeds("echo test | nc machine 4444 -N");
     '';
 
 })

From b341529a354774894306f3890437ec9930fcc265 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 29 Apr 2018 16:46:36 -0500
Subject: [PATCH 0732/3370] systemd: use upstream patch to fix building with
 util-linux 2.32

See linked PR.
---
 pkgs/os-specific/linux/systemd/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 0bb9f509b38a..ef4b8ec5dfca 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -151,6 +151,14 @@ in stdenv.mkDerivation rec {
       --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH"
   '';
 
+  patches = [
+    # https://github.com/systemd/systemd/pull/8580
+    (fetchpatch {
+      url = https://github.com/systemd/systemd/pull/8580.patch;
+      sha256 = "1yp07hlpgqq0h2y0qc3kasswzkycz6p8d56d695ck1qa2f5bdfgn";
+    })
+  ];
+
   hardeningDisable = [ "stackprotector" ];
 
   NIX_CFLAGS_COMPILE =

From 04380e713c20377b5346d026040a01621aae8935 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 29 Apr 2018 17:09:52 -0500
Subject: [PATCH 0733/3370] libepoxy: 1.5.0 -> 1.5.1

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

diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index d44e2650db0a..cc62b2776ede 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -6,13 +6,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "epoxy-${version}";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "anholt";
     repo = "libepoxy";
     rev = "${version}";
-    sha256 = "1ixpqb10pmdy3n9nxd5inflig9dal5502ggadcns5b58j6jr0yv0";
+    sha256 = "1811agxr7g9wd832np8sw152j468kg3qydmfkc564v54ncfcgaci";
   };
 
   outputs = [ "out" "dev" ];

From f12b93162a134cf9bfa4fcdaf10966922fbec6f7 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 18:30:42 -0500
Subject: [PATCH 0734/3370] rl-1809: add netcat note

---
 nixos/doc/manual/release-notes/rl-1809.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 2e53f0563baf..62f1b769463b 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -68,6 +68,15 @@ following incompatible changes:</para>
       points to the package which is bundled with the unfree <literal>libspotify</literal> package.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>netcat</literal> package is now taken directly from OpenBSD's
+      <literal>libressl</literal>, instead of relying on Debian's fork. The new
+      version should be very close to the old version, but there are some minor
+      differences. Importantly, flags like -b, -q, -C, and -Z are no longer
+      accepted by the nc command.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>

From 62eb285a621e1b09ea82387c15a817cf07d61d9e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Mar 2018 12:48:31 +0200
Subject: [PATCH 0735/3370] qpdfview: port to qt5

---
 pkgs/applications/misc/qpdfview/default.nix | 24 ++++++++++++---------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index e3e7ff950b0c..a4fd1d356746 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt4, pkgconfig, poppler_qt4, djvulibre, libspectre, cups
+{stdenv, fetchurl, qmake, qtbase, qtsvg, pkgconfig, poppler_qt5, djvulibre, libspectre, cups
 , file, ghostscript
 }:
 let
@@ -10,9 +10,9 @@ let
     url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
     sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
   };
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [
-    qt4 poppler_qt4 djvulibre libspectre cups file ghostscript
+    qtbase qtsvg poppler_qt5 djvulibre libspectre cups file ghostscript
   ];
 in
 stdenv.mkDerivation {
@@ -21,13 +21,17 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
-  configurePhase = ''
-    qmake *.pro
-    for i in *.pro; do 
-      qmake "$i" -o "Makefile.$(basename "$i" .pro)"
-    done
-    sed -e "s@/usr/@$out/@g" -i Makefile*
-  '';
+  qmakeFlags = [
+    "*.pro"
+    "TARGET_INSTALL_PATH=${placeholder "out"}/bin"
+    "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview"
+    "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview"
+    "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1"
+    "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps"
+    "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications"
+    "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata"
+  ];
+
   meta = {
     inherit (s) version;
     description = "A tabbed document viewer";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9bbbbf396c5..34e13559c649 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18213,7 +18213,7 @@ with pkgs;
 
   vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
 
-  qpdfview = callPackage ../applications/misc/qpdfview {};
+  qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
 
   qtile = callPackage ../applications/window-managers/qtile {
     inherit (xorg) libxcb;

From 8ce6587966040ab03a2f7d1d26223bed59c65cbe Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Apr 2018 18:21:01 +0800
Subject: [PATCH 0736/3370] utox: 0.16.1 -> 0.17.0

---
 .../instant-messengers/utox/default.nix       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 9c208dd52a83..e139904fee53 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
-, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium, libopus, check }:
+{ stdenv, lib, fetchFromGitHub, check, cmake, pkgconfig
+, libtoxcore, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
+, libXrender, fontconfig, libXext, libXft, utillinux, libsodium, libopus }:
 
 stdenv.mkDerivation rec {
   name = "utox-${version}";
 
-  version = "0.16.1";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner  = "uTox";
     repo   = "uTox";
     rev    = "v${version}";
-    sha256 = "0ak10925v67yaga2pw9yzp0xkb5j1181srfjdyqpd29v8mi9j828";
+    sha256 = "12wbq883il7ikldayh8hm0cjfrkp45vn05xx9s1jbfz6gmkidyar";
+    fetchSubmodules = true;
   };
 
   buildInputs = [
@@ -20,16 +22,20 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    cmake git pkgconfig check
+    check cmake pkgconfig
   ];
 
   cmakeFlags = [
-    "-DENABLE_UPDATER=OFF"
-  ] ++ stdenv.lib.optional (!doCheck) "-DENABLE_TESTS=OFF";
+    "-DENABLE_AUTOUPDATE=OFF"
+  ] ++ lib.optional (doCheck) "-DENABLE_TESTS=ON";
 
-  doCheck = true;
+  doCheck = stdenv.isLinux;
 
-  checkTarget = "test";
+  checkPhase = ''
+    runHook preCheck
+    ctest -VV
+    runHook postCheck
+  '';
 
   meta = with stdenv.lib; {
     description = "Lightweight Tox client";

From 8811d1d384d38962927450cf8f69d675f72ee80a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 19 Apr 2018 18:21:25 +0800
Subject: [PATCH 0737/3370] toxvpn: 2017-06-25 -> 2018-04-17

---
 pkgs/tools/networking/toxvpn/default.nix | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix
index c7fa1c7a2719..ccb9f3bc0d6b 100644
--- a/pkgs/tools/networking/toxvpn/default.nix
+++ b/pkgs/tools/networking/toxvpn/default.nix
@@ -1,25 +1,22 @@
 { stdenv, fetchFromGitHub, cmake, nlohmann_json,
-libtoxcore, libsodium, systemd, libcap, zeromq }:
+  libtoxcore, libsodium, libcap, zeromq,
+  systemd ? null }:
 
 with stdenv.lib;
 
-let
-  systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd;
-  if_systemd = optional (systemdOrNull != null);
-in stdenv.mkDerivation rec {
-  name = "toxvpn-${version}";
-  version = "2017-06-25";
+stdenv.mkDerivation rec {
+  name = "toxvpn-2018-04-17";
 
   src = fetchFromGitHub {
     owner  = "cleverca22";
     repo   = "toxvpn";
-    rev    = "7bd6f169d69c511affa8c9672e8f794e4e205a44";
-    sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0";
+    rev    = "dc766f98888f500ea51f002f59007eac3f3a0a06";
+    sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz";
   };
 
   buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
-    ++ if_systemd systemd
-    ++ optional (stdenv.system != "x86_64-darwin") libcap;
+    ++ optionals stdenv.isLinux [ libcap systemd ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9224ecbe66e..c60f99b82cb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5220,7 +5220,7 @@ with pkgs;
 
   torsocks = callPackage ../tools/security/tor/torsocks.nix { };
 
-  toxvpn = callPackage ../tools/networking/toxvpn { };
+  toxvpn = callPackage ../tools/networking/toxvpn { libtoxcore = libtoxcore_0_1; };
 
   tpmmanager = callPackage ../applications/misc/tpmmanager { };
 

From 841643796a8efc8c3412eb7488646094cb607ef7 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sun, 29 Apr 2018 20:03:05 -0400
Subject: [PATCH 0738/3370] rclone: 1.40 -> 1.41

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

diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix
index aa2a971b15f6..405ff2fde735 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/applications/networking/sync/rclone/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "rclone-${version}";
-  version = "1.40";
+  version = "1.41";
 
   goPackagePath = "github.com/ncw/rclone";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "ncw";
     repo = "rclone";
     rev = "v${version}";
-    sha256 = "01q9g5g4va1s91xzvxpq8lj9jcrbl66cik383cpxwmcv04qcqgw9";
+    sha256 = "0kvqzrj7kbr9mhg023lkvk320qhkf4widcv6yph1cx701935brhr";
   };
 
   outputs = [ "bin" "out" "man" ];

From 47a738339553e5416e9edb4c5bc71c3497911fb1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 19:14:00 -0500
Subject: [PATCH 0739/3370] darling: fix src

Darling has a case conflict which means that its src hash will be
different between case sensitive and case insensitive file systems.
This is not ideal and the only way around it is basically to remove
the offending files from the output. I use fetchzip here to do that
but I hope there is a better fix available eventually.
---
 pkgs/os-specific/darwin/darling/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/darwin/darling/default.nix b/pkgs/os-specific/darwin/darling/default.nix
index b9d806cded23..c1e29843147c 100644
--- a/pkgs/os-specific/darwin/darling/default.nix
+++ b/pkgs/os-specific/darwin/darling/default.nix
@@ -1,14 +1,19 @@
-{stdenv, lib, fetchFromGitHub, cmake, bison, flex}:
+{stdenv, lib, fetchzip, cmake, bison, flex}:
 
 stdenv.mkDerivation rec {
   pname = "darling";
   name = pname;
 
-  src = fetchFromGitHub {
-    repo = pname;
-    owner = "darlinghq";
-    rev = "d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b";
-    sha256 = "1sdl0ysa3yfdvkq0x7vkdl64g7mcfy3qx70saf1d8rnhycbxjgjg";
+  src = fetchzip {
+    url = "https://github.com/darlinghq/darling/archive/d2cc5fa748003aaa70ad4180fff0a9a85dc65e9b.tar.gz";
+    sha256 = "11b51fw47nl505h63bgx5kqiyhf3glhp1q6jkpb6nqfislnzzkrf";
+    postFetch = ''
+      # Get rid of case conflict
+      mkdir $out
+      cd $out
+      tar -xzf $downloadedFile --strip-components=1
+      rm -r $out/src/libm
+    '';
   };
 
   # only packaging sandbox for now

From 9e503e039b6adce89bc0b99cbf6e5b24d3b75118 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 30 Apr 2018 02:22:54 +0200
Subject: [PATCH 0740/3370] qpdfview: remove placeholder usage

---
 pkgs/applications/misc/qpdfview/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index a4fd1d356746..f836ce5b8085 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -21,16 +21,11 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
-  qmakeFlags = [
-    "*.pro"
-    "TARGET_INSTALL_PATH=${placeholder "out"}/bin"
-    "PLUGIN_INSTALL_PATH=${placeholder "out"}/lib/qpdfview"
-    "DATA_INSTALL_PATH=${placeholder "out"}/share/qpdfview"
-    "MANUAL_INSTALL_PATH=${placeholder "out"}/share/man/man1"
-    "ICON_INSTALL_PATH=${placeholder "out"}/share/icons/hicolor/scalable/apps"
-    "LAUNCHER_INSTALL_PATH=${placeholder "out"}/share/applications"
-    "APPDATA_INSTALL_PATH=${placeholder "out"}/share/appdata"
-  ];
+
+  # TODO: revert this once placeholder is supported
+  preConfigure = ''
+    qmakeFlags="$qmakeFlags *.pro TARGET_INSTALL_PATH=$out/bin PLUGIN_INSTALL_PATH=$out/lib/qpdfview DATA_INSTALL_PATH=$out/share/qpdfview MANUAL_INSTALL_PATH=$out/share/man/man1 ICON_INSTALL_PATH=$out/share/icons/hicolor/scalable/apps LAUNCHER_INSTALL_PATH=$out/share/applications APPDATA_INSTALL_PATH=$out/share/appdata"
+  '';
 
   meta = {
     inherit (s) version;

From 82080d77a0f135ddb6a980e110d7e67282bc8be3 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sun, 29 Apr 2018 20:32:41 -0400
Subject: [PATCH 0741/3370] wire-desktop: correct desktopItem

---
 .../networking/instant-messengers/wire-desktop/default.nix      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 9e946152c192..f0123024fe2f 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -61,7 +61,7 @@ in
     };
 
     desktopItem = makeDesktopItem {
-      name = "Wire";
+      name = "wire-desktop";
       exec = "wire-desktop %U";
       icon = "wire-desktop";
       comment = "Secure messenger for everyone";

From 1907120f23ada097ccf00ba8ac040097c911e9e6 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 30 Apr 2018 00:21:36 +0200
Subject: [PATCH 0742/3370] nixos/tests/udisks2: Fix USB device hotplug

The usb_add and usb_del monitor commands have been removed in QEMU
version 2.12 (introduced in 3e3b39f173f9abc99da84084a1f4657c9de885bd).

Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes:

> The deprecated HMP commands "usb_add" and "usb_del" have been removed.
> Use "device_add" and "device_del" as replacement instead.

So we're doing exactly that and the udisks2 test now works again.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra
---
 nixos/tests/udisks2.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix
index 72d51c0051c0..70a999267a54 100644
--- a/nixos/tests/udisks2.nix
+++ b/nixos/tests/udisks2.nix
@@ -37,7 +37,8 @@ in
       $machine->fail("udisksctl info -b /dev/sda1");
 
       # Attach a USB stick and wait for it to show up.
-      $machine->sendMonitorCommand("usb_add disk:$stick");
+      $machine->sendMonitorCommand("drive_add 0 id=stick,if=none,file=$stick,format=raw");
+      $machine->sendMonitorCommand("device_add usb-storage,id=stick,drive=stick");
       $machine->waitUntilSucceeds("udisksctl info -b /dev/sda1");
       $machine->succeed("udisksctl info -b /dev/sda1 | grep 'IdLabel:.*USBSTICK'");
 
@@ -52,7 +53,7 @@ in
       $machine->fail("[ -d /run/media/alice/USBSTICK ]");
 
       # Remove the USB stick.
-      $machine->sendMonitorCommand("usb_del 0.3"); # FIXME
+      $machine->sendMonitorCommand("device_del stick");
       $machine->waitUntilFails("udisksctl info -b /dev/sda1");
       $machine->fail("[ -e /dev/sda ]");
     '';

From f148c5c4a1ffa353836bfd18a94d457acf83bd36 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 30 Apr 2018 01:43:17 +0200
Subject: [PATCH 0743/3370] nixos/tests: Fix QEMU flags for SCSI disks

The ability to specify "-drive if=scsi" has been removed in QEMU version
2.12 (introduced in 3e3b39f173f9abc99da84084a1f4657c9de885bd).

Quote from https://wiki.qemu.org/ChangeLog/2.12#Incompatible_changes:

> The deprecated way of configuring SCSI devices with "-drive if=scsi"
> on x86 has been removed. Use an appropriate SCSI controller together
> "-device scsi-hd" or "-device scsi-cd" and a corresponding "-blockdev"
> parameter instead.

So whenever the diskInterface is "scsi" we use the new way to specify
the drive and fall back to the deprecated way for the time being. The
reason why I'm not using the new way for "virtio" and "ide" as well is
because there is no simple generic way anymore to specify these.

This also turns the type of the virtualisation.qemu.diskInterface option
to be an enum, so the user knows which values are allowed but we can
also make sure the right value is provided to prevent typos.

I've tested this against a few non-disk-related NixOS VM tests but also
the installer.grub1 test (because it uses "ide" as its drive interface),
the installer.simple test (just to be sure it still works with
"virtio") and all the tests in nixos/tests/boot.nix.

In order to be able to run the grub1 test I had to go back to
8b1cf100cd8badad6e1b6d4650b904b88aa870db (which is a known commit where
that test still works) and apply the QEMU update and this very commit,
because right now the test is broken.

Apart from the tests here in nixpkgs, I also ran another[1] test in
another repository which uses the "scsi" disk interface as well (in
comparison to most of the installer tests, this one actually failed
prior to this commit).

All of them now succeed.

[1]: https://github.com/openlab-aux/vuizvui/blob/9b5a119972e9c2d327500638d89063f4fce243ec/tests/system/kernel/bfq.nix

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edostra, @grahamc, @dezgeg, @abbradar, @ts468
---
 nixos/lib/test-driver/Machine.pm         | 17 +++++++++++---
 nixos/modules/virtualisation/qemu-vm.nix | 30 +++++++++++++++++-------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 7e269b43e70f..b18f48464cee 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -33,9 +33,20 @@ sub new {
         $startCommand =
             "qemu-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
-        my $iface = $args->{hdaInterface} || "virtio";
-        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,werror=report "
-            if defined $args->{hda};
+
+        if (defined $args->{hda}) {
+            if ($args->{hdaInterface} eq "scsi") {
+                $startCommand .= "-drive id=hda,file="
+                               . Cwd::abs_path($args->{hda})
+                               . ",werror=report,if=none "
+                               . "-device scsi-hd,drive=hda ";
+            } else {
+                $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda})
+                               . ",if=" . $args->{hdaInterface}
+                               . ",werror=report ";
+            }
+        }
+
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
         $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk "
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 3d4bd315f812..66ff43c8547d 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -27,6 +27,21 @@ let
   kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
   ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
 
+  # XXX: This is very ugly and in the future we really should use attribute
+  # sets to build ALL of the QEMU flags instead of this mixed mess of Nix
+  # expressions and shell script stuff.
+  mkDiskIfaceDriveFlag = idx: driveArgs: let
+    inherit (cfg.qemu) diskInterface;
+    # The drive identifier created by incrementing the index by one using the
+    # shell.
+    drvId = "drive$((${idx} + 1))";
+    # NOTE: DO NOT shell escape, because this may contain shell variables.
+    commonArgs = "index=${idx},id=${drvId},${driveArgs}";
+    isSCSI = diskInterface == "scsi";
+    devArgs = "${diskInterface}-hd,drive=${drvId}";
+    args = "-drive ${commonArgs},if=none -device lsi53c895a -device ${devArgs}";
+  in if isSCSI then args else "-drive ${commonArgs},if=${diskInterface}";
+
   # Shell script to start the VM.
   startVM =
     ''
@@ -68,7 +83,7 @@ let
         if ! test -e "empty$idx.qcow2"; then
             ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M"
         fi
-        extraDisks="$extraDisks -drive index=$idx,file=$(pwd)/empty$idx.qcow2,if=${cfg.qemu.diskInterface},werror=report"
+        extraDisks="$extraDisks ${mkDiskIfaceDriveFlag "$idx" "file=$(pwd)/empty$idx.qcow2,werror=report"}"
         idx=$((idx + 1))
       '')}
 
@@ -83,14 +98,14 @@ let
           -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \
           -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \
           ${if cfg.useBootLoader then ''
-            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
-            -drive index=1,id=drive2,file=$TMPDIR/disk.img,media=disk \
+            ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
+            ${mkDiskIfaceDriveFlag "1" "file=$TMPDIR/disk.img,media=disk"} \
             ${if cfg.useEFIBoot then ''
               -pflash $TMPDIR/bios.bin \
             '' else ''
             ''}
           '' else ''
-            -drive index=0,id=drive1,file=$NIX_DISK_IMAGE,if=${cfg.qemu.diskInterface},cache=writeback,werror=report \
+            ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
             -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \
@@ -338,11 +353,8 @@ in
         mkOption {
           default = "virtio";
           example = "scsi";
-          type = types.str;
-          description = ''
-            The interface used for the virtual hard disks
-            (<literal>virtio</literal> or <literal>scsi</literal>).
-          '';
+          type = types.enum [ "virtio" "scsi" "ide" ];
+          description = "The interface used for the virtual hard disks.";
         };
     };
 

From dadf22293478749bfffa25f9201168c6e9fac016 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 29 Apr 2018 20:24:04 -0500
Subject: [PATCH 0744/3370] systemd: add pcre2 as build dep for searching in
 journalctl

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 63ed5a5cbb3f..3d8b7cb33227 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
-, audit, lz4, bzip2, kexectools, libmicrohttpd
+, audit, lz4, bzip2, kexectools, libmicrohttpd, pcre2
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
 , libseccomp, iptables, gnu-efi
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
   buildInputs =
     [ linuxHeaders libcap kmod xz pam acl
       /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
-      libmicrohttpd ] ++
+      libmicrohttpd pcre2 ] ++
       stdenv.lib.meta.enableIfAvailable kexectools ++
       stdenv.lib.meta.enableIfAvailable libseccomp ++
     [ libffi audit lz4 bzip2 libapparmor

From cf194a93115ac1354f0e49f49c1f44aac74b3d6d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 29 Apr 2018 22:29:10 -0400
Subject: [PATCH 0745/3370] linux: 4.17-rc2 -> 4.17-rc3

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 6370f82235a7..d02ab4157191 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc2";
-  modDirVersion = "4.17.0-rc2";
+  version = "4.17-rc3";
+  modDirVersion = "4.17.0-rc3";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1z4kl25x8m498wicbzhx21kvksp63ab8l2s0nfxf7fwj7dd13cld";
+    sha256 = "1divgjzmpl98b5j416vhkq53li0y9v5vvdwbgwpr2xznspzbkygq";
   };
 
   # Should the testing kernels ever be built on Hydra?

From d0c8bf86e4bb6839b3567178bae2d0bba2ebb8ac Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 29 Apr 2018 23:19:19 -0400
Subject: [PATCH 0746/3370] dbeaver: 5.0.3 -> 5.0.4

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 002d8fc8f23b..edc1497294fc 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.0.3";
+  version = "5.0.4";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "0pk40jzmd23cv690a8wslxbb4xp4msq2zwh7xm0hvs64ykm9a581";
+    sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3";
   };
 
   installPhase = ''

From d207e043d3315330e5011be63783a335f645c9d0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud@urkud.name>
Date: Sun, 29 Apr 2018 22:46:16 -0400
Subject: [PATCH 0747/3370] asymptote: move Emacs Lisp files to
 $out/share/emacs/site-lisp/asymptote/

This way, emacs can find the 'asymptote' mode.
---
 pkgs/tools/graphics/asymptote/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 7337cd227a2e..01ddd6ba7fc5 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -51,7 +51,9 @@ stdenv.mkDerivation {
     rmdir $out/share/info/asymptote
     rm $out/share/info/dir
 
-    rm -rf "$out"/share/texmf
+    rm -rfv "$out"/share/texmf
+    mkdir -pv "$out"/share/emacs/site-lisp/${s.name}
+    mv -v "$out"/share/asymptote/*.el "$out"/share/emacs/site-lisp/${s.name}
   '';
 
   enableParallelBuilding = true;

From b3d5ca8359d3fac0f21ccece79c202557a9433b5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 30 Apr 2018 05:53:38 +0200
Subject: [PATCH 0748/3370] nixos/dhparams: Set default bit size to 2048

@Ekleog writes in https://github.com/NixOS/nixpkgs/pull/39526:

> I think a default of 4096 is maybe too much? See certbot/certbot#4973;
> Let's Encrypt supposedly know what they are doing and use a
> pre-generated 2048-bit DH params (and using the same DH params as
> others is quite bad, even compared to lower bit size, if I correctly
> remember the attacks available -- because it increases by as much the
> value of breaking the group).

> Basically I don't have anything personal against 4096, but fear it may
> re-start the arms race: people like having "more security" than their
> distributions, and having NixOS already having more security than is
> actually useful (I personally don't know whether a real-size quantum
> computer will come before or after our being able to break 2048-bit
> keys, let alone 3072-bit ones -- see wikipedia for some numbers).

> So basically, I'd have set it to 3072 in order to both decrease build
> time and avoid having people setting it to 8192 and complaining about
> how slow things are, but that's just my opinion. :)

While he suggests is 3072 I'm using 2048 now, because it's the default
of "openssl dhparam". If users want to have a higher value, they can
still change it.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/modules/security/dhparams.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index 481d4c5db512..beac125fc6e0 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -10,7 +10,7 @@ let
         name = "bits";
         description = "integer of at least 16 bits";
       };
-      default = 4096;
+      default = 2048;
       description = ''
         The bit size for the prime that is used during a Diffie-Hellman
         key exchange.

From f3062702096f42c6a2349693bf776e17fb8dd4d9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 23:11:37 -0500
Subject: [PATCH 0749/3370] netbsd.games: cleanup

This gets a few more games working.
---
 pkgs/os-specific/bsd/netbsd/default.nix | 73 ++++++++++++++++++++-----
 1 file changed, 59 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index ecd09eaff807..4961ab6080a9 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils
-, yacc, flex, libressl, bash }:
+, yacc, flex, libressl, bash, more }:
 
 let
   fetchNetBSD = path: version: sha256: fetchcvs {
@@ -42,6 +42,7 @@ let
     LIBCURSES = "";
     LIBTERMINFO = "";
     LIBM = "";
+    LIBL = "";
     "LIBDO.terminfo" = "_external";
     "LIBDO.curses" = "_external";
     _GCC_CRTBEGIN = "";
@@ -370,6 +371,14 @@ in rec {
     version = "7.1.2";
   };
 
+  dict = netBSDDerivation {
+    path = "share/dict";
+    version = "7.1.2";
+    sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4";
+    preBuild = "mkdir -p $out/share/dict";
+    makeFlags = [ "BINDIR=/share" ];
+  };
+
   games = netBSDDerivation {
     path = "games";
     sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1";
@@ -377,6 +386,21 @@ in rec {
     patchPhase = ''
       sed -i '1i #include <time.h>' adventure/save.c
 
+      for f in $(find . -name pathnames.h); do
+        substituteInPlace $f \
+          --replace /usr/share/games $out/share/games \
+          --replace /usr/games $out/bin \
+          --replace /usr/libexec $out/libexec \
+          --replace /var/games $out/var/games \
+          --replace /usr/bin/more ${more}/bin/more \
+          --replace /usr/share/dict ${dict}/share/dict
+      done
+      substituteInPlace ching/ching/ching.sh \
+        --replace /usr/share $out/share \
+        --replace /usr/libexec $out/libexec
+      substituteInPlace hunt/huntd/driver.c \
+        --replace "(void) setpgrp(getpid(), getpid());" ""
+
       # Disable some games that don't build. They should be possible
       # to build but need to look at how to implement stuff in
       # Linux. macOS is missing gettime. TODO try to get these
@@ -386,16 +410,10 @@ in rec {
       }
 
       disableGame atc
-      disableGame boggle
       disableGame dm
-      disableGame fortune
-      disableGame hunt
-      disableGame larn
-      disableGame phantasia
-      disableGame rogue
-      disableGame sail
-      disableGame trek
       disableGame dab
+      ${lib.optionalString stdenv.isDarwin "disableGame sail"}
+      ${lib.optionalString stdenv.isDarwin "disableGame trek"}
       ${lib.optionalString stdenv.isDarwin "disableGame adventure"}
       ${lib.optionalString stdenv.isDarwin "disableGame factor"}
       ${lib.optionalString stdenv.isDarwin "disableGame gomoku"}
@@ -405,6 +423,17 @@ in rec {
         --replace 2555 555 \
         --replace 2550 550
     '';
+
+    # HACK strfile needs to be installed first & in the path
+    preBuild = ''
+      pushd fortune/strfile
+      mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8
+      make
+      make BINDIR=/bin install
+      popd
+      export PATH=$out/bin:$PATH
+    '';
+
     NIX_CFLAGS_COMPILE = [
       "-D__noinline="
       "-D__scanflike(a,b)="
@@ -412,24 +441,29 @@ in rec {
       "-DOXTABS=XTABS"
       "-DRANDOM_MAX=RAND_MAX"
       "-DINFTIM=-1"
-      (if hostPlatform.isMusl then "-include sys/ttydefaults.h -include sys/file.h" else "")
+      (lib.optionalString hostPlatform.isMusl "-include sys/ttydefaults.h -include sys/file.h")
+      "-DBE32TOH(x)=((void)0)"
+      "-DBE64TOH(x)=((void)0)"
+      "-D__c99inline=__inline"
     ];
+
     postBuild = ''
       mkdir -p $out/usr/games $out/usr/share/games/ching \
+               $out/usr/share/games/fortune \
                $out/usr/share/games/quiz.db \
+               $out/usr/share/games/boggle \
                $out/usr/libexec/ching $out/var/games/hackdir
       touch $out/var/games/hackdir/perm
     '';
+
     preFixup = ''
       mkdir -p $out/bin
       mv $out/games/* $out/bin
       rmdir $out/games
     '';
+
     buildInputs = [ compat libcurses libterminfo libressl ];
-    extraPaths = [
-      (fetchNetBSD "share/dict" "7.1.2" "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4")
-      who.src
-    ];
+    extraPaths = [ dict.src who.src ];
   };
 
   # finger = netBSDDerivation {
@@ -477,6 +511,17 @@ in rec {
     sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq";
     buildInputs = [ compat tic nbperf ];
     MKPIC = if stdenv.isDarwin then "no" else "yes";
+    patchPhase = ''
+      substituteInPlace term.c \
+        --replace /usr/share $out/share
+    '';
+    postBuild = ''
+      pushd $NETBSDSRCDIR/share/terminfo
+      mkdir -p $out/share/misc
+      make
+      make BINDIR=/share install
+      popd
+    '';
     extraPaths = [
       (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3")
     ];

From 5f5257dbce61d8fd417b64b59ddaffc62c695f4f Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 30 Apr 2018 13:31:09 +0800
Subject: [PATCH 0750/3370] go-ethereum: 1.8.3 -> 1.8.6

---
 pkgs/applications/altcoins/go-ethereum.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index 65e1dbc9b198..a47b7fa3168f 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.8.3";
+  version = "1.8.6";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
   # Fix for usb-related segmentation faults on darwin
@@ -27,7 +27,7 @@ buildGoPackage rec {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    sha256 = "1vdrf3fi4arr6aivyp5myj4jy7apqbiqa6brr3jplmc07q1yijnf";
+    sha256 = "1n6f34r7zlc64l1q8xzcjk5sljdznjwp81d9naapprhpqb8g01gl";
   };
 
   meta = with stdenv.lib; {

From 6a560f499c5a1038a573ea961ef1d1166e1b3677 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 30 Apr 2018 07:43:57 +0100
Subject: [PATCH 0751/3370] gperftools: suppress compilation warning on macOS

---
 pkgs/development/libraries/gperftools/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix
index 2a2710531e06..de71704cff85 100644
--- a/pkgs/development/libraries/gperftools/default.nix
+++ b/pkgs/development/libraries/gperftools/default.nix
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
     substituteInPlace libtool --replace stdc++ c++
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isDarwin "-D_XOPEN_SOURCE";
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [
+    "-D_XOPEN_SOURCE" "-Wno-aligned-allocation-unavailable"
+  ];
 
   # some packages want to link to the static tcmalloc_minimal
   # to drop the runtime dependency on gperftools

From 8ce6db16244b2fb312a2cfb7a8ba425dc3b4a18a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 30 Apr 2018 16:11:37 +0800
Subject: [PATCH 0752/3370] grc: 1.11.1 -> 1.11.3

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

diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix
index c554c13bb4ab..451828b0f47b 100644
--- a/pkgs/tools/misc/grc/default.nix
+++ b/pkgs/tools/misc/grc/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "grc-${version}";
-  version = "1.11.1";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner  = "garabik";
     repo   = "grc";
     rev    = "v${version}";
-    sha256 = "10h65qmv2cymixzfsckfcn6f01xsjzfq1x303rv01nibniwbq5z9";
+    sha256 = "0b3wx9zr7l642hizk93ysbdss7rfymn22b2ykj4kpkf1agjkbv35";
   };
 
   buildInputs = with python3Packages; [ wrapPython makeWrapper ];

From 6a32965e17910c18bd166a79502c0a3639854ea7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 29 Apr 2018 22:09:25 +0200
Subject: [PATCH 0753/3370] notary: fix build

The package is broken on master for some time now:
https://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.notary.x86_64-linux/all

The main reason for the breackage is that the `Makefile` script attempts
to retrieve the latest git commit by using `git rev-parse` which breaks
as `git` is not in the build environment. This could be fixed by using
`?=` rather than `:=` for the `GITCOMMIT` variable in the `make` script
to easily override `GITCOMMIT` in the `buildPhase`.

See the Hydra logs for reference:
https://nix-cache.s3.amazonaws.com/log/ib4qp8h4r8d830ra4fah38l7ybb82gp7-notary-0.6.0.drv

Furthermore some refactoring was applied:

* Activated the test suite for `cmd/notary` to confirm the basic
  functionality when building for NixOS.

* Added {pre,post} hooks for `{build,install}Phase`

* Added myself as maintainer to have more people available in case of
  further breakage.
---
 pkgs/tools/security/notary/default.nix        | 34 ++++++++++++-------
 pkgs/tools/security/notary/no-git-usage.patch | 15 ++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/tools/security/notary/no-git-usage.patch

diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 4a42c9162e1b..071bfdaea005 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -1,32 +1,42 @@
-{ stdenv, fetchFromGitHub, buildGoPackage, git, libtool }:
+{ stdenv, fetchFromGitHub, buildGoPackage, libtool }:
 
 buildGoPackage rec {
   name = "notary-${version}";
-  version = "0.6.0";
-  gitcommit = "34f53ad";
+  version = "0.6.1";
+  gitcommit = "d6e1431f";
 
   src = fetchFromGitHub {
     owner = "theupdateframework";
     repo = "notary";
     rev = "v${version}";
-    sha256 = "0lg7ab2agkk3rnladcvpdzk8cnf3m49qfm4sanh7yjvlvlv1wm4a";
+    sha256 = "1ak9dk6vjny5069hp3w36dbjawcnaq82l3i2qvf7mn7zfglbsnf9";
   };
 
+  patches = [ ./no-git-usage.patch ];
+
   buildInputs = [ libtool ];
+  buildPhase = ''
+    runHook preBuild
+    cd go/src/github.com/theupdateframework/notary
+    make client GITCOMMIT=${gitcommit}
+    runHook postBuild
+  '';
 
   goPackagePath = "github.com/theupdateframework/notary";
 
-  buildPhase = ''
-    cd go/src/github.com/theupdateframework/notary
-    make GITCOMMIT=${gitcommit} GITUNTRACKEDCHANGES= client
+  installPhase = ''
+    runHook preInstall
+    install -D bin/notary $bin/bin/notary
+    runHook postInstall
   '';
 
-  installPhase = ''
-    install -D bin/notary $bin/bin/notary
+  doCheck = true;
+  checkPhase = ''
+    make test PKGS=github.com/theupdateframework/notary/cmd/notary
   '';
 
   meta = with stdenv.lib; {
-    description = " Notary is a project that allows anyone to have trust over arbitrary collections of data";
+    description = "Notary is a project that allows anyone to have trust over arbitrary collections of data";
     longDescription = ''
       The Notary project comprises a server and a client for running and
       interacting with trusted collections. See the service architecture
@@ -49,7 +59,7 @@ buildGoPackage rec {
     '';
     license = licenses.asl20;
     homepage = https://github.com/theupdateframework/notary;
-    maintainers = with maintainers; [ vdemeester ];
-    platforms = with platforms; unix;
+    maintainers = with maintainers; [ vdemeester ma27 ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/security/notary/no-git-usage.patch b/pkgs/tools/security/notary/no-git-usage.patch
new file mode 100644
index 000000000000..363eefe36921
--- /dev/null
+++ b/pkgs/tools/security/notary/no-git-usage.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index ab794165..0cbd047f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5,8 +5,8 @@ PREFIX?=$(shell pwd)
+ # Add to compile time flags
+ NOTARY_PKG := github.com/theupdateframework/notary
+ NOTARY_VERSION := $(shell cat NOTARY_VERSION)
+-GITCOMMIT := $(shell git rev-parse --short HEAD)
+-GITUNTRACKEDCHANGES := $(shell git status --porcelain --untracked-files=no)
++GITCOMMIT ?= $(shell git rev-parse --short HEAD)
++GITUNTRACKEDCHANGES :=
+ ifneq ($(GITUNTRACKEDCHANGES),)
+ GITCOMMIT := $(GITCOMMIT)-dirty
+ endif

From 2fcf50a323a8fe695e3ad0520eb25bdcff976e2e Mon Sep 17 00:00:00 2001
From: Stefan Wiehler <me@sephalon.net>
Date: Mon, 30 Apr 2018 10:59:57 +0200
Subject: [PATCH 0754/3370] luafilesystem: 1.6.3 -> 1.7.0

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 3da443098037..e6ec2f8ed9d8 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -267,14 +267,14 @@ let
   };
 
   luafilesystem = buildLuaPackage rec {
-    version = "1.6.3";
+    version = "1.7.0";
     name = "filesystem-${version}";
 
     src = fetchFromGitHub {
       owner = "keplerproject";
       repo = "luafilesystem";
       rev = "v${stdenv.lib.replaceChars ["."] ["_"] version}";
-      sha256 = "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri";
+      sha256 = "0fibrasshlgpa71m9wkpjxwmylnxpcf06rpqbaa0qwvqh94nhwby";
     };
 
     preConfigure = ''

From 9786bd06a621dbb2c0cd7de696df5ed269e54ddd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 30 Apr 2018 17:22:01 +0800
Subject: [PATCH 0755/3370] libqmatrixclient: 0.2 -> 0.2.1

---
 .../libraries/libqmatrixclient/default.nix    | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix
index f537013d2fec..7d8ec42700c5 100644
--- a/pkgs/development/libraries/libqmatrixclient/default.nix
+++ b/pkgs/development/libraries/libqmatrixclient/default.nix
@@ -1,40 +1,26 @@
 { stdenv, fetchFromGitHub, cmake
 , qtbase }:
 
-# This doesn't actually do anything really yet as it doesn't support dynamic building
-# When it does, quaternion and tensor should use it
-
 stdenv.mkDerivation rec {
   name = "libqmatrixclient-${version}";
-  version = "0.2";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner  = "QMatrixClient";
     repo   = "libqmatrixclient";
-    rev    = "v${version}-q0.0.5";
-    sha256 = "1m53yxsqjxv2jq0h1xipwsgaj5rca4fk4cl3azgvmf19l9yn00ck";
+    rev    = "v${version}";
+    sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv";
   };
 
   buildInputs = [ qtbase ];
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm644 -t $out/lib *.a
-
-    runHook postInstall
-  '';
-
   meta = with stdenv.lib; {
     description= "A Qt5 library to write cross-platfrom clients for Matrix";
     homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html;
     license = licenses.lgpl21;
     platforms = platforms.linux;
     maintainers = with maintainers; [ peterhoeg ];
-    hydraPlatforms = [ ];
   };
 }

From dbcdcb63d886b8ded089b06e7f727a2d16739664 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 30 Apr 2018 17:22:20 +0800
Subject: [PATCH 0756/3370] quaternion: 0.0.5 -> 0.0.9

---
 .../instant-messengers/quaternion/default.nix         | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 768ab24c2f39..6c716cc3e1c0 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -2,24 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "quaternion-${version}";
-  version = "0.0.5";
-
-  # libqmatrixclient doesn't support dynamic linking as of 0.2 so we simply pull in the source
+  version = "0.0.9";
 
   src = fetchFromGitHub {
     owner  = "QMatrixClient";
     repo   = "Quaternion";
     rev    = "v${version}";
-    sha256 = "14xmaq446aggqhpcilahrw2mr5gf2mlr1xzyp7r6amrnmnqsyxrd";
+    sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408";
   };
 
   buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
-
-  # take the source from libqmatrixclient
+  # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet
+  # https://github.com/QMatrixClient/Quaternion/issues/239
   postPatch = ''
     rm -rf lib
     ln -s ${libqmatrixclient.src} lib

From d5eef36abb2914a98c25475409b71819d4c94162 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Apr 2018 07:12:37 -0400
Subject: [PATCH 0757/3370] linux: 4.4.129 -> 4.4.130

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index fe8633ed0da7..ccc8b4ba2dc2 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.129";
+  version = "4.4.130";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0aviyky8f73l6jpi1d4by947rj78d5vckxkyf9aj73bavaxc8rd1";
+    sha256 = "1rad8fa25hzifpxqxsc7wzhcssbbv32rc03nvljygvlxcn8dz6xj";
   };
 } // (args.argsOverride or {}))

From 24a7d14ab43d2366f917397e4a42715e1245fa10 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Apr 2018 07:13:00 -0400
Subject: [PATCH 0758/3370] linux: 4.9.96 -> 4.9.97

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 63fe3db3b577..cc4609676d4e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.96";
+  version = "4.9.97";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0zw7x86c8qa2kzkwlxlhqzsnddyp1ncw4ja660bqnzqrnmp5jvw2";
+    sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4";
   };
 } // (args.argsOverride or {}))

From 6cbded6551e4d6c8608814a6752774807d1cc67a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Apr 2018 07:13:17 -0400
Subject: [PATCH 0759/3370] linux: 4.14.37 -> 4.14.38

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index d9aef3a21930..177a5c878f65 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.37";
+  version = "4.14.38";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14lfj2vfxw36k8cbmzs280w4h81yz5xhlhq5550kww906vnyg5w1";
+    sha256 = "00ibrl633d4cqnn4i0z7kj1ddj1243dh7ap783bwlicw9hkddwzg";
   };
 } // (args.argsOverride or {}))

From cf994a3d3d14272f624e20d1c3c64f86a27904a1 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 30 Apr 2018 07:13:32 -0400
Subject: [PATCH 0760/3370] linux: 4.16.5 -> 4.16.6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 3da2cda30e22..46bdcff66a10 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.5";
+  version = "4.16.6";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0f1a8ggjb2jxc8n3hvypc81xbwylwkqi0mnynd9q316ay152zb1r";
+    sha256 = "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs";
   };
 } // (args.argsOverride or {}))

From a7ce93955d962ecaa263f04ef3c87a1fe6799f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 29 Apr 2018 23:41:36 -0300
Subject: [PATCH 0761/3370] uget-integrator: init at 1.0.0

---
 .../networking/browsers/firefox/wrapper.nix   |  3 +-
 .../networking/uget-integrator/default.nix    | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/uget-integrator/default.nix

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 45917bf65c1e..ed6cf712ed9a 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -8,7 +8,7 @@
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
 , esteidfirefoxplugin
 , vlc_npapi
-, browserpass, chrome-gnome-shell
+, browserpass, chrome-gnome-shell, uget-integrator
 , libudev
 , kerberos
 }:
@@ -64,6 +64,7 @@ let
         ([ ]
           ++ lib.optional (cfg.enableBrowserpass or false) browserpass
           ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
+          ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
           ++ extraNativeMessagingHosts
         );
       libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix
new file mode 100644
index 000000000000..cc93da7f2533
--- /dev/null
+++ b/pkgs/tools/networking/uget-integrator/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, uget, python3Packages }:
+
+stdenv.mkDerivation rec {
+  name = "uget-integrator-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ugetdm";
+    repo = "uget-integrator";
+    rev = "v${version}";
+    sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp";
+  };
+
+  nativeBuildInputs = [ python3Packages.wrapPython ];
+
+  buildInputs = [ uget python3Packages.python ];
+
+  installPhase = ''
+    for f in conf/com.ugetdm.{chrome,firefox}.json; do
+      substituteInPlace $f --replace "/usr" "$out"
+    done
+
+	  install -D -t $out/bin                                   bin/uget-integrator
+	  install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json
+	  install -D -t $out/etc/chromium/native-messaging-hosts   conf/com.ugetdm.chrome.json
+	  install -D -t $out/etc/opera/native-messaging-hosts      conf/com.ugetdm.chrome.json
+	  install -D -t $out/lib/mozilla/native-messaging-hosts    conf/com.ugetdm.firefox.json
+
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Native messaging host to integrate uGet Download Manager with web browsers";
+    homepage = https://github.com/ugetdm/uget-integrator;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77f54000df8b..be80fc699331 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5306,6 +5306,8 @@ with pkgs;
 
   uget = callPackage ../tools/networking/uget { };
 
+  uget-integrator = callPackage ../tools/networking/uget-integrator { };
+
   uif2iso = callPackage ../tools/cd-dvd/uif2iso { };
 
   umlet = callPackage ../tools/misc/umlet { };

From 2cc9da33af1db5750fdf41b8ed397ff48f318d28 Mon Sep 17 00:00:00 2001
From: Stefan Wiehler <me@sephalon.net>
Date: Mon, 30 Apr 2018 13:15:25 +0200
Subject: [PATCH 0762/3370] pcsc-scm-scl011: clean up unpack phase

---
 pkgs/tools/security/pcsc-scm-scl011/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix
index 88b5c147f303..1418a4ead580 100644
--- a/pkgs/tools/security/pcsc-scm-scl011/default.nix
+++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix
@@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip ];
 
   unpackPhase = ''
-    echo ${stdenv.system}
     unzip $src
     tar xf "Linux Driver Ver${version}/sclgeneric_${version}_linux_${arch}bit.tar.gz"
-    cd sclgeneric_${version}_linux_${arch}bit; export sourceRoot=`pwd`
+    export sourceRoot=$(readlink -e sclgeneric_${version}_linux_${arch}bit)
   '';
 
   # Add support for SCL011 nPA (subsidized model for German eID)

From 480da10f30b5855aee3433365c5b3065437c9074 Mon Sep 17 00:00:00 2001
From: Stefan Wiehler <sephalon@farce.de>
Date: Mon, 24 Oct 2016 23:54:18 +0200
Subject: [PATCH 0763/3370] open-ecard: init at 1.2.4

---
 pkgs/tools/security/open-ecard/default.nix | 64 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/tools/security/open-ecard/default.nix

diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix
new file mode 100644
index 000000000000..a0af51186edf
--- /dev/null
+++ b/pkgs/tools/security/open-ecard/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, jre, pcsclite, makeDesktopItem, makeWrapper }:
+
+let
+  version = "1.2.4";
+
+  srcs = {
+    richclient = fetchurl {
+      url = "https://jnlp.openecard.org/richclient-${version}-20171212-0958.jar";
+      sha256 = "1ckhyhszp4zhfb5mn67lz603b55z814jh0sz0q5hriqzx017j7nr";
+    };
+    cifs = fetchurl {
+      url = "https://jnlp.openecard.org/cifs-${version}-20171212-0958.jar";
+      sha256 = "0rc862lx3y6sw87r1v5xjmqqpysyr1x6yqhycqmcdrwz0j3wykrr";
+    };
+    logo = fetchurl {
+      url = https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg;
+      sha256 = "0rpmyv10vjx2yfpm03mqliygcww8af2wnrnrppmsazdplksaxkhs";
+    };
+  };
+in stdenv.mkDerivation rec {
+  appName = "open-ecard";
+  name = "${appName}-${version}";
+
+  src = srcs.richclient;
+
+  phases = "installPhase";
+
+  buildInputs = [ makeWrapper ];
+
+  desktopItem = makeDesktopItem {
+    name = appName;
+    desktopName = "Open eCard App";
+    genericName = "eCard App";
+    comment = "Client side implementation of the eCard-API-Framework";
+    icon = "oec_logo_bg-transparent.svg";
+    exec = appName;
+    categories = "Utility;Security;";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/java
+    cp ${srcs.richclient} $out/share/java/richclient-${version}.jar
+    cp ${srcs.cifs} $out/share/java/cifs-${version}.jar
+
+    mkdir -p $out/share/applications $out/share/pixmaps
+    cp $desktopItem/share/applications/* $out/share/applications
+    cp ${srcs.logo} $out/share/pixmaps/oec_logo_bg-transparent.svg
+
+    mkdir -p $out/bin
+    makeWrapper ${jre}/bin/java $out/bin/${appName} \
+      --add-flags "-cp $out/share/java/cifs-${version}.jar" \
+      --add-flags "-jar $out/share/java/richclient-${version}.jar" \
+      --suffix LD_LIBRARY_PATH ':' ${pcsclite}/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Client side implementation of the eCard-API-Framework (BSI
+      TR-03112) and related international standards, such as ISO/IEC 24727";
+    homepage = https://www.openecard.org/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ sephalon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719a5c66db7f..3317e2548348 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4076,6 +4076,8 @@ with pkgs;
 
   opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { };
 
+  open-ecard = callPackage ../tools/security/open-ecard { };
+
   openjade = callPackage ../tools/text/sgml/openjade { };
 
   openmvg = callPackage ../applications/science/misc/openmvg { };

From e12cc85b070ec62144c5bfc8036041fee4b3692e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 30 Apr 2018 11:59:53 +0200
Subject: [PATCH 0764/3370] nixos/osquery: add test

Some time ago I fixed the broken package `osquery` (see #39336).
I had to test the package manually by starting the daemon locally,
however this doesn't ensure that the module is still functional.

In order to cover the package *and* the integration with the NixOS
module I thought that adding a testcase might be the best idea.

The current testcase does the following things:

* Starts an `osqueryd` service in a test machine with customized logger
  path and PID file

* Ensures that the `osqueryd.service` unit is running

* Checks if the customized flags (`pidfile`, `logger_path`) are applied
  to `osquery`.

* Performs a simple test query against the `etc_hosts` database to check
  if the basic funcitonality of `osquery` (storing system information into
  a database) works fine.
---
 nixos/release.nix       |  1 +
 nixos/tests/osquery.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/tests/osquery.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 4994cd98302f..4ad947f11d10 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -307,6 +307,7 @@ in rec {
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
+  tests.osquery = callTest tests/osquery.nix {};
   tests.plasma5 = callTest tests/plasma5.nix {};
   tests.plotinus = callTest tests/plotinus.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
diff --git a/nixos/tests/osquery.nix b/nixos/tests/osquery.nix
new file mode 100644
index 000000000000..281dbcff6643
--- /dev/null
+++ b/nixos/tests/osquery.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+with lib;
+
+{
+  name = "osquery";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ ma27 ];
+  };
+
+  machine = {
+    services.osquery.enable = true;
+    services.osquery.loggerPath = "/var/log/osquery/logs";
+    services.osquery.pidfile = "/var/run/osqueryd.pid";
+  };
+
+  testScript = ''
+    $machine->start;
+    $machine->waitForUnit("osqueryd.service");
+
+    $machine->succeed("echo 'SELECT address FROM etc_hosts LIMIT 1;' | osqueryi | grep '127.0.0.1'");
+    $machine->succeed(
+      "echo 'SELECT value FROM osquery_flags WHERE name = \"logger_path\";' | osqueryi | grep /var/log/osquery/logs"
+    );
+
+    $machine->succeed("echo 'SELECT value FROM osquery_flags WHERE name = \"pidfile\";' | osqueryi | grep /var/run/osqueryd.pid");
+  '';
+})

From 8446ba26a8f098c98d06b24acce7588eac63eb1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Mon, 30 Apr 2018 16:55:27 +0200
Subject: [PATCH 0765/3370] added lost entry in all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cac46ff0f4cc..7f035ad89b4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13508,6 +13508,8 @@ with pkgs;
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
 
+    tbs = callPackage ../os-specific/linux/tbs { };
+
     nvidiabl = callPackage ../os-specific/linux/nvidiabl { };
 
     nvidiaPackages = callPackage ../os-specific/linux/nvidia-x11 { };

From ccb7e5488e879de3645ca66081f3cb8a638783a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 30 Apr 2018 16:01:07 +0100
Subject: [PATCH 0766/3370] pdf-quench: no manual shebang patch

---
 pkgs/applications/misc/pdf-quench/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index 5b80fb161224..291ab241b084 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -12,17 +12,17 @@ pythonPackages.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];
-  buildInputs = with pkgs; [ gtk3 gobjectIntrospection goocanvas2 (poppler.override { introspectionSupport = true; }) ];
+  buildInputs = with pkgs; [
+    gtk3
+    gobjectIntrospection
+    goocanvas2
+    (poppler.override { introspectionSupport = true; })
+  ];
   propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ];
 
-  dontBuild = true;
+  format = "other";
   doCheck = false;
 
-  postPatch = ''
-    substituteInPlace src/pdf_quench.py \
-      --replace /usr/bin/python "${pythonPackages.python}/bin/python"
-    '';
-
   installPhase = ''
     install -D -T -m 755 src/pdf_quench.py $out/bin/pdf-quench
   '';

From 1478878caba8c9c73780d3615cd1dea6a1686593 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 30 Apr 2018 17:26:59 +0200
Subject: [PATCH 0767/3370] pdf-quench: use poppler_gi from top-level

---
 pkgs/applications/misc/pdf-quench/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix
index 291ab241b084..c567a7903b81 100644
--- a/pkgs/applications/misc/pdf-quench/default.nix
+++ b/pkgs/applications/misc/pdf-quench/default.nix
@@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec {
     gtk3
     gobjectIntrospection
     goocanvas2
-    (poppler.override { introspectionSupport = true; })
+    poppler_gi
   ];
   propagatedBuildInputs = with pythonPackages; [ pygobject3 pypdf2 ];
 

From bb12277049769a6d626959f569e14c979c74cd05 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sun, 18 Mar 2018 01:14:24 -0400
Subject: [PATCH 0768/3370] pythonPackages.pyslurm: 20170302 -> 20180427

Fixes build against slurm 17.11.5

Fixes: 0e0b80d4b42 ('slurm: 17.11.3 -> 17.11.5')
---
 pkgs/development/python-modules/pyslurm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 74ff0be3833a..1bc08d634189 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "20170302";
+  version = "20180427";
 
   src = fetchFromGitHub {
     repo = "pyslurm";
     owner = "PySlurm";
-    rev = "f5a756f199da404ec73cb7fcd7f04ec4d21ea3ff";
-    sha256 = "1xn321nc8i8zmngh537j6lnng1rhdp460qx4skvh9daz5h9nxznx";
+    rev = "3900e1afac9ffd13c80c57d8c39933d42eb7bad7";
+    sha256 = "1a183ig4sdbc70rx2yyaslyq61wkbsf8cbim1jj0kzrp65nf0vls";
   };
 
   buildInputs = [ cython slurm ];

From 3520fef779dbdfc145214294673c47aeac4ddeab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 08:43:52 -0700
Subject: [PATCH 0769/3370] x42-plugins: 20170428 -> 20180320
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/x42-plugins/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fat1 -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fat1 --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fil4 -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-fil4 --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-meter -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-meter --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-mixtri -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-mixtri --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-scope -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-scope --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-stepseq -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-stepseq --help’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-tuna -h’ got 0 exit code
- ran ‘/nix/store/92qs2yp1dsm7mpw3q2ynh8l0vihfm8mb-x42-plugins-20180320/bin/x42-tuna --help’ got 0 exit code
- directory tree listing: https://gist.github.com/b5bff61b6a034a2f1ebe040e1e3155d0
---
 pkgs/applications/audio/x42-plugins/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix
index 4c4f958ec493..6bf45f451a5d 100644
--- a/pkgs/applications/audio/x42-plugins/default.nix
+++ b/pkgs/applications/audio/x42-plugins/default.nix
@@ -3,12 +3,12 @@
 , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
 
 stdenv.mkDerivation rec {
-  version = "20170428";
+  version = "20180320";
   name = "x42-plugins-${version}";
 
   src = fetchurl {
     url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz";
-    sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg";
+    sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From dc6cda78fb1aa77bdc2c80b6401821628aa64cae Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 10:57:52 -0500
Subject: [PATCH 0770/3370] gllvm: 2018-02-09 -> 2018-04-28 (~= 1.0.2)

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

diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index 58ee7699b459..da8f90cd9406 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "gllvm-${version}";
-  version = "2018-02-09";
+  version = "2018-04-28"; # ~= 1.0.2, but no release tags yet
 
   goPackagePath = "github.com/SRI-CSL/gllvm";
 
   src = fetchFromGitHub {
     owner = "SRI-CSL";
     repo = "gllvm";
-    rev = "ef83222afd22452dd1277329df227a326db9f84f";
-    sha256 = "068mc8q7jmpjzh6pr0ygvv39mh4k7vz0dmiacxf3pdsigy3d1y1a";
+    rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e";
+    sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl";
   };
 
   meta = with stdenv.lib; {

From 751aa3dff2ad43b1cc872f33b859c62cd671812e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 08:58:49 -0700
Subject: [PATCH 0771/3370] linuxPackages.wireguard: 0.0.20180413 ->
 0.0.20180420

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireguard/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/62dbb660d0b10010e5638c9be376d68b
---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index b88646424be5..6e3e444240ac 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20180413";
+  version = "0.0.20180420";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0lbjx62ihc8prqfhvmi0v1xq1q3ayzj5rfy2p5149nr9qx3z37j1";
+    sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m";
   };
 
   meta = with stdenv.lib; {

From 02cb787c0cf4d38c9eb64e7110201a19ab6469cd Mon Sep 17 00:00:00 2001
From: Fatih Altinok <photonia@gmail.com>
Date: Mon, 30 Apr 2018 11:47:18 +0300
Subject: [PATCH 0772/3370] flow: 0.70.0 -> 0.71.0

---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 042b338b2b14..31bc1848d580 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -4,14 +4,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.70.0";
+  version = "0.71.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1pydmfs7xxrqjdnidp2nagwpk2d0vf5nx3m821plld3vbyh22b76";
+    sha256 = "1z9qf3kahaincy3i3ynqx7gr1sf470ym8h690a0kc7ah5fwsyr5w";
   };
 
   installPhase = ''

From 910ad133b44b4e4a9fa058b2c4a83870d8e1b7a3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 11:08:03 -0500
Subject: [PATCH 0773/3370] mesa: 17.3.8 -> 17.3.9

https://www.mesa3d.org/relnotes/17.3.9.html
---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 1033c87b54c3..71121e28a2ec 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.3.8";
+  version = "17.3.9";
   branch  = head (splitString "." version);
 in
 
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "1cd6a4ll5arla3kncxnw9196ak1v4rvnb098aa7lm3n4h7r9p7cg";
+    sha256 = "0yg4nvagg5y2fxyl3jjdgbi6gjqqw4z3j6pyzsac5q7h0pybbgn5";
   };
 
   prePatch = "patchShebangs .";

From 89001d8d158ca0040084811c6f517416ddc2c7d9 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 30 Apr 2018 12:18:14 -0400
Subject: [PATCH 0774/3370] hplipWithPlugin_3_16_11: Refer to correct base
 derivation

This appears to be a cut-and-paste error.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31a1acff06ee..cf2d9e9db3ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20632,7 +20632,7 @@ with pkgs;
 
   hplip_3_16_11 = callPackage ../misc/drivers/hplip/3.16.11.nix { };
 
-  hplipWithPlugin_3_16_11 = hplip.override { withPlugin = true; };
+  hplipWithPlugin_3_16_11 = hplip_3_16_11.override { withPlugin = true; };
 
   hyperfine = callPackage ../tools/misc/hyperfine { };
 

From eaf71dd33e8ec5836193f27717139be44c0ada3d Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 30 Apr 2018 12:20:01 -0400
Subject: [PATCH 0775/3370] notmuch: 0.26.1 -> 0.26.2

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

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index d89219cce5f3..13add2690db3 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "0.26.1";
+  version = "0.26.2";
   name = "notmuch-${version}";
 
   passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "0dx8nhdmkaqabxcgxfa757m99fi395y76h9ynx8539yh9m7y9xyk";
+    sha256 = "0fqf6wwvqlccq9qdnd0mky7fx0kbkczd28blf045s0vsvdjii70h";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 99964ff49336a782f7ff67f39d61a608347c7507 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 09:35:47 -0700
Subject: [PATCH 0776/3370] wesnoth-dev: 1.13.13 -> 1.14.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wesnoth/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnoth -h’ got 0 exit code
- ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnoth --help’ got 0 exit code
- ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd -h’ got 0 exit code
- ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd --help’ got 0 exit code
- ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd -V’ and found version 1.14.0
- ran ‘/nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0/bin/wesnothd --version’ and found version 1.14.0
- found 1.14.0 with grep in /nix/store/kk2lcjayzj584gczvzmqbna8gc59g92j-wesnoth-1.14.0
- directory tree listing: https://gist.github.com/faf1d8fe4a47781eb51e8a411a546099
---
 pkgs/games/wesnoth/dev.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix
index c9cd7119d8f2..81ffd6b135fc 100644
--- a/pkgs/games/wesnoth/dev.nix
+++ b/pkgs/games/wesnoth/dev.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.13.13";
+  version = "1.14.0";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1jn3gvw0x8ndwvdm4bqpki1p1cxg2ij02s6w0frhfi4kz706al0c";
+    sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 92f00a58533b7fd58b0ed6efbe86ccd387682b7d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 09:39:09 -0700
Subject: [PATCH 0777/3370] utf8proc: 2.1.0 -> 2.1.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/utf8proc/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.1.1 with grep in /nix/store/bzpfz4cpf1lf7269ymwdblz2kn0iwf2b-utf8proc-2.1.1
- directory tree listing: https://gist.github.com/bc9fd69cddc0fd9435fab30a0abcae97
---
 pkgs/development/libraries/utf8proc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix
index 48c2428bbcdb..89dbeaab04ae 100644
--- a/pkgs/development/libraries/utf8proc/default.nix
+++ b/pkgs/development/libraries/utf8proc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "utf8proc-${version}";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "https://github.com/JuliaLang/utf8proc/archive/v${version}.tar.gz";
-    sha256 = "0q1jhdkk4f9b0zb8s2ql3sba3br5nvjsmbsaybmgj064k9hwbk15";
+    sha256 = "1cnpigrazhslw65s4j1a56j7p6d7d61wsxxjf1218i9mkwv2yw17";
   };
 
   makeFlags = [ "prefix=$(out)" ];

From b405a6537c79a00f3d754dfd9b7a3b3ca467b4f0 Mon Sep 17 00:00:00 2001
From: Milo <iitalics@gmail.com>
Date: Mon, 30 Apr 2018 13:03:05 -0400
Subject: [PATCH 0778/3370] nixos/bspwm: spawn bpswm process in the background
 and properly set waiPID (#39707)

---
 nixos/modules/services/x11/window-managers/bspwm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 6783ac3479e6..23cd4f6529a6 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -59,7 +59,7 @@ in
       start = ''
         export _JAVA_AWT_WM_NONREPARENTING=1
         SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} &
-        ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""}
+        ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""} &
         waitPID=$!
       '';
     };

From dc2f012215f15dc05e447ce6611039fcaede3910 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 10:12:01 -0700
Subject: [PATCH 0779/3370] riot-web: 0.14.0 -> 0.14.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/riot-web/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.14.1 with grep in /nix/store/77d4rg2yy4gj8m1mvrw6zqhdi7jv7cg8-riot-web-0.14.1
- directory tree listing: https://gist.github.com/4606f4af0dcfc7ef1ece43dfe4b38abe
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 0d3342e66687..ce558130a6ce 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "0san8d3dghjkqqv0ypampgl7837mxk9w64ci6fzy1k5d5dmdgvsi";
+    sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf";
   };
 
   installPhase = ''

From 078b764f38cb779e32f7be4f1e614157b72cac2d Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 30 Apr 2018 19:22:42 +0200
Subject: [PATCH 0780/3370] highlight: 3.42 -> 3.43

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

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index 1fcfdd85e7ae..c2fe3fcd5761 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "highlight-${version}";
-  version = "3.42";
+  version = "3.43";
 
   src = fetchFromGitHub {
     owner = "andre-simon";
     repo = "highlight";
-    rev = "${version}";
-    sha256 = "1fxx827igzqjn5rri57b8980hnd3ixz3j7smfxwi1ivfhlfznzgr";
+    rev = "v${version}";
+    sha256 = "126nsf4cjxflg2kiv72qf1xl5fsilk0jqcncs6qqgm72cpjfmlsy";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ optional stdenv.isDarwin  gcc ;

From 1022dc54bab9fa076fe3033a0c1e3f7f9549345d Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 30 Apr 2018 13:28:46 -0400
Subject: [PATCH 0781/3370] strongswan: include curl plugin by default (#39506)

This is necessary for OCSP and/or remote CRL verification of server
certificates to work, which is a fairly common thing to need.
---
 pkgs/tools/networking/strongswan/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index 042f8bea3d62..eb466745ef84 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -3,11 +3,15 @@
 , gmp, python, iptables, ldns, unbound, openssl, pcsclite
 , openresolv
 , systemd, pam
-
-, enableTNC            ? false, curl, trousers, sqlite, libxml2
+, curl
+, enableTNC            ? false, trousers, sqlite, libxml2
 , enableNetworkManager ? false, networkmanager
 }:
 
+# Note on curl support: If curl is built with gnutls as its backend, the
+# strongswan curl plugin may break.
+# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info.
+
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
@@ -23,8 +27,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs =
-    [ gmp python iptables ldns unbound openssl pcsclite ]
-    ++ optionals enableTNC [ curl trousers sqlite libxml2 ]
+    [ curl gmp python iptables ldns unbound openssl pcsclite ]
+    ++ optionals enableTNC [ trousers sqlite libxml2 ]
     ++ optionals stdenv.isLinux [ systemd.dev pam ]
     ++ optionals enableNetworkManager [ networkmanager ];
 
@@ -61,12 +65,12 @@ stdenv.mkDerivation rec {
       "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth"
       "--enable-forecast" "--enable-connmark" "--enable-acert"
       "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound"
-      "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ]
+      "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly"
+      "--enable-curl" ]
     ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ]
     ++ optional (stdenv.system == "i686-linux") "--enable-padlock"
     ++ optionals enableTNC [
          "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf"
-         "--enable-curl"
          "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20"
          "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation"
          "--enable-tnc-imv" "--enable-imv-attestation"

From ecc7f83e75b48ee04c4c7cac1386e370921060f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 11:07:54 -0700
Subject: [PATCH 0782/3370] spidermonkey_52: 52.6.0 -> 52.7.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/spidermonkey/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 -h’ got 0 exit code
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 --help’ got 0 exit code
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 -v’ and found version 52.7.4
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52 --version’ and found version 52.7.4
- ran ‘/nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4/bin/js52-config --version’ and found version 52.7.4
- found 52.7.4 with grep in /nix/store/47rbdzbgccrrdc63fnsnwklria9clmms-spidermonkey-52.7.4
- directory tree listing: https://gist.github.com/7e5182415a0a1bce8071576312c08a3a
---
 pkgs/development/interpreters/spidermonkey/52.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 4992ea04f110..35dcff95029d 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
 
 let
-  version = "52.6.0";
+  version = "52.7.4";
 in stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "0hhyd4ni4jja7jd687dm0csi1jcjxahf918zbjzr8njz655djz2q";
+    sha256 = "0dn3hbc95qhvcgzbibhy17xwn5m0340f64bq5byvx22c2rf40xwz";
   };
 
   buildInputs = [ readline icu zlib nspr ];

From 49ef9019f149f9051d4b1da4190f078c19980921 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 13:12:01 -0500
Subject: [PATCH 0783/3370] psstop: init at 1.3

---
 pkgs/tools/system/psstop/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/system/psstop/default.nix

diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix
new file mode 100644
index 000000000000..178e08938fea
--- /dev/null
+++ b/pkgs/tools/system/psstop/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }:
+
+stdenv.mkDerivation rec {
+  name = "psstop-${version}";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "clearlinux";
+    repo = "psstop";
+    rev = "v${version}";
+    sha256 = "03ir3jjpzm7q8n1qc5jr99hqarr9r529w1zb6f7q4wak2vfj7w9h";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ glib ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/clearlinux/psstop;
+    description = "Show processes' memory usage by looking into pss"; # upstream summary
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77b7a822c5c4..49160d59ac45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1358,6 +1358,8 @@ with pkgs;
 
   ps_mem = callPackage ../tools/system/ps_mem { };
 
+  psstop = callPackage ../tools/system/psstop { };
+
   parallel-rust = callPackage ../tools/misc/parallel-rust { };
 
   socklog = callPackage ../tools/system/socklog { };

From a8f3b1ad752c6552245f42e7428319642d7ca627 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 13:27:36 -0500
Subject: [PATCH 0784/3370] openmw: update hash missed in update to 0.43.0

Fixes #39712
---
 pkgs/games/openmw/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix
index f64bbe4c1255..8080c9596388 100644
--- a/pkgs/games/openmw/default.nix
+++ b/pkgs/games/openmw/default.nix
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
     owner = "OpenMW";
     repo = "openmw";
     rev = name;
-    sha256 = "0lj8v81hk807dy0wcdhfp0iyn4l5yag53hx1a6xm44gh2dpyil43";
+    sha256 = "1nybxwp77qswjayf0g9xayp4x1xxq799681rhjlggch127r07ifi";
   };
 
   enableParallelBuilding = true;

From 4e5cecabcfcb2fcb70c8f992e7686fb2ced65a45 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 11:41:45 -0700
Subject: [PATCH 0785/3370] pqiv: 2.10.3 -> 2.10.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pqiv/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv -h’ got 0 exit code
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv --help’ got 0 exit code
- ran ‘/nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4/bin/pqiv help’ got 0 exit code
- found 2.10.4 with grep in /nix/store/80y2wx9ga0c647w0m0nhkx2hgfhnwpv5-pqiv-2.10.4
- directory tree listing: https://gist.github.com/4743505ebdeb4ef63b3c2637f5d6879d
---
 pkgs/applications/graphics/pqiv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix
index 757ce52e9c4c..e4f565b3b052 100644
--- a/pkgs/applications/graphics/pqiv/default.nix
+++ b/pkgs/applications/graphics/pqiv/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation (rec {
   name = "pqiv-${version}";
-  version = "2.10.3";
+  version = "2.10.4";
 
   src = fetchFromGitHub {
     owner = "phillipberndt";
     repo = "pqiv";
     rev = version;
-    sha256 = "16nhnv0dcp242jf1099pjr5dwnc65i40cnb3dvx1avdhidcmsx01";
+    sha256 = "04fawc3sd625y1bbgfgwmak56pq28sm58dwn5db4h183iy3awdl9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 4ea3841d7f9fbed0aaee83bde0227b09384e50fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 11:43:21 -0700
Subject: [PATCH 0786/3370] picard-tools: 2.18.2 -> 2.18.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/picard-tools/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.18.3 with grep in /nix/store/q67hqz7716nf3c4f8rjmlpf2dqbb06rz-picard-tools-2.18.3
- directory tree listing: https://gist.github.com/6b71ce718f18ef6a48c05457cd0e583b
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index 7af1669dc45e..ed90ed5aa047 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.2";
+  version = "2.18.3";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0w3b2jz4n9irslsg85r4x9dc3y4ziykn8fs4iqqiq4sfdcz259fz";
+    sha256 = "0w4v30vnyr549hd9lhj1sm69whssabqvhfrbavxfjbl2k9fw83qf";
   };
 
   buildInputs = [ jre makeWrapper ];

From 3dfe97c62d15d812e422b3e3e469fe9a862a0069 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 11:53:17 -0700
Subject: [PATCH 0787/3370] poppler_utils: 0.63.0 -> 0.64.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/poppler-utils/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftoppm -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftoppm --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftocairo -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftocairo --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdffonts -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdffonts --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfimages -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfimages --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfinfo -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfinfo --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftops -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftops --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftotext -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftotext --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftohtml -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftohtml --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfseparate -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfseparate --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfunite -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfunite --help’ got 0 exit code
- found 0.64.0 with grep in /nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0
- directory tree listing: https://gist.github.com/c3d0cef388a4d423d47e26ff96c1ffd0
---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 11dd8ec32910..a96de20ccfeb 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.63.0";
+  version = "0.64.0";
   mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17";
+    sha256 = "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj";
   };
 
   outputs = [ "out" "dev" ];

From decaeb1bfa9c21c1317973fcdd24b50f2eb223b2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 13:59:11 -0500
Subject: [PATCH 0788/3370] nano: 2.9.4 -> 2.9.6

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

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 9ff1c44dceb0..f5598b3365bb 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.9.4";
+  version = "2.9.6";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "0nm3zy4azr5rkxjq7jfybbj3cnddmvxc49rxyqm9cp2zfdp75y9c";
+    sha256 = "1inl8ljkc711969ncwy7irf0464psasikg1g42l0g4sfpdz50wx3";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From b45a5a1801d677d67b9e20a8b216719b914bc9ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 12:43:38 -0700
Subject: [PATCH 0789/3370] nextcloud: 13.0.1 -> 13.0.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/nextcloud/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 13.0.2 with grep in /nix/store/370na6b77ds8vj2qjxij4id8r5ihjpiq-nextcloud-13.0.2
- directory tree listing: https://gist.github.com/bb7d1d9b3be5379cba2c2852ec4b8e56
---
 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 e6baf9e64d8b..7513d3c71d2b 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "13.0.1";
+  version = "13.0.2";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "048x3x6d11m75ghxjcjzm8amjm6ljirv6djbl53awwp9f5532hsp";
+    sha256 = "0zf4z4cn4wwsybxirvzyk7l6xjw9gkc60lzm8jqz9aak3a5gk5kk";
   };
 
   installPhase = ''

From 3e37981ae3601aa29e72d307c6d51d550af207d2 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Mon, 30 Apr 2018 22:22:18 +0200
Subject: [PATCH 0790/3370] i3lock-color: 2.10.1-1-c -> 2.11-c

---
 pkgs/applications/window-managers/i3/lock-color.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index edaa88bde23d..66a6af2fbb08 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.10.1-1-c";
+  version = "2.11-c";
   name = "i3lock-color-${version}";
 
   src = fetchFromGitHub {
     owner = "PandorasFox";
     repo = "i3lock-color";
-    rev = "01476c56333cccae80cdd3f125b0b9f3a0fe2cb3";
-    sha256 = "06ca8496fkdkvh4ycg0b7kd3r1bjdqdwfimb51v4nj1lm87pdkdf";
+    rev = version;
+    sha256 = "1myq9fazkwd776agrnj27bm5nwskvss9v9a5qb77n037dv8d0rdw";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 4f715a5690d28cf74068de823cbb793194a0b2ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 13:48:48 -0700
Subject: [PATCH 0791/3370] palemoon: 27.8.3 -> 27.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/palemoon/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -h’ got 0 exit code
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon --help’ got 0 exit code
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -V’ and found version 27.9.0
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon -v’ and found version 27.9.0
- ran ‘/nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0/bin/palemoon --version’ and found version 27.9.0
- found 27.9.0 with grep in /nix/store/0qfxznyni5ivyrj3hs0w6dhlk3z4kfaq-palemoon-27.9.0
- directory tree listing: https://gist.github.com/d3039819d96bec3615450de44abbffc4
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 0c0ef501e996..aa77f0847344 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.8.3";
+  version = "27.9.0";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "1v3wliq8k5yq17ms214fhwka8x4l3sq8kja59dx4pbvczzb1zyzh";
+    sha256 = "181g1hy4k9xr6nlrw8jamp541gr5znny4mmpwwaa1lzq5v1w1sw6";
   };
 
   desktopItem = makeDesktopItem {

From b0989d3c76439277198557375893c29d8b0bcf2f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 13:49:46 -0700
Subject: [PATCH 0792/3370] pam_u2f: 1.0.5 -> 1.0.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pam_u2f/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg -h’ got 0 exit code
- ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg --help’ got 0 exit code
- ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg -V’ and found version 1.0.6
- ran ‘/nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6/bin/pamu2fcfg --version’ and found version 1.0.6
- found 1.0.6 with grep in /nix/store/diyxvz87ashi10zx97b0dyl2hsr6f9bh-pam_u2f-1.0.6
- directory tree listing: https://gist.github.com/7d4bb96a876d359bc67f88a024a674f8
---
 pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 0f0b6ebb37a6..5cc235c3104a 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "pam_u2f-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src     = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
-    sha256 = "0bbwy9k3002anhkv67zwck3dry7blqnnp291dc4qsjrca0blw217";
+    sha256 = "0fpdb49596zywnbx1cfcx1k83rbs1ylhi1cnn25pq9d3b92hj50h";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 49e4a597cb2eed29cf8abe6852dc142119cb5d7b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:17:03 -0700
Subject: [PATCH 0793/3370] mopidy-iris: 3.17.1 -> 3.17.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/Mopidy-Iris/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.17.5 with grep in /nix/store/ih97pncwmlk71wa9cv49aa9hx7mxc156-Mopidy-Iris-3.17.5
- directory tree listing: https://gist.github.com/0f0187f3e9d60193ebddabe0b082e78f
---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index f3a9b73aabe5..cfd2a4173da7 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.17.1";
+  version = "3.17.5";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "02k1br077v9c5x6nn0391vh28pvn1zjbkjv8h508vy7k6ch2xjyq";
+    sha256 = "011bccvjy1rdrc43576hgfb7md404ziqmkam6na2z6v9km1b9gwr";
   };
 
   propagatedBuildInputs = [

From 7ce53bee97d55dab2c3fe8ccdf06e6b3461432e0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:42:45 -0700
Subject: [PATCH 0794/3370] mwic: 0.7.4 -> 0.7.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mwic/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.7.5 with grep in /nix/store/3r91cbyw9xi6iy67l5nalznb7rkq1idq-mwic-0.7.5
- directory tree listing: https://gist.github.com/0513e07e310449f5f9f06de443e90f43
---
 pkgs/applications/misc/mwic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix
index 02c18109abc2..67e6ed3fa9ce 100644
--- a/pkgs/applications/misc/mwic/default.nix
+++ b/pkgs/applications/misc/mwic/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.4";
+  version = "0.7.5";
   name = "mwic-${version}";
 
   src = fetchurl {
     url = "https://github.com/jwilk/mwic/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0c0xk7wx4vaamlry6srdixw1q6afmqznvxdzcg1skr0qjypw5i5q";
+    sha256 = "1b4fz9vs0aihg9nj9aj6d2jmykpa9nxi9rvz06v50wwk515plpmc";
   };
 
   makeFlags=["PREFIX=\${out}"];

From 1fe6cca2db75e24f3e23ab645baf4a349447a903 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:53:47 -0700
Subject: [PATCH 0795/3370] miniupnpd: 2.0.20180410 -> 2.0.20180422

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/miniupnpd/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/f8b4c06f4c61efa13671b5156550d7b5
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 129db56dc554..99e12084ccb5 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.0.20180410";
+  name = "miniupnpd-2.0.20180422";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "1w4crmsmrygagh0v9phx8aicbyh6nypfjh2fdmknijngvx05biaq";
+    sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy";
     name = "${name}.tar.gz";
   };
 

From acdbf504e3f756de9964123b355a8c4f2d60e133 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:57:13 -0700
Subject: [PATCH 0796/3370] ipmiutil: 3.0.9 -> 3.1.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ipmiutil/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/706664f90d887aff46e82433584920a1
---
 pkgs/tools/system/ipmiutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index 6b206ea8761a..bace31a17bda 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "3.0.9";
+  version = "3.1.0";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "0j4lsfdj2bk1b1vw9l00zv1g4jan05p09szqbzxgqqw2lpnca4i7";
+    sha256 = "1vvdydql5gmq103wr0ris2fvr3l5an2a8zgg2mmgdi88pxi11xfx";
   };
 
   buildInputs = [ openssl ];

From 2034ef073fe0490a7dbabbde81a4c39f91850064 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 15:00:53 -0700
Subject: [PATCH 0797/3370] jackett: 0.8.886 -> 0.8.929
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jackett/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929/bin/Jackett -h’ got 0 exit code
- ran ‘/nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929/bin/Jackett help’ got 0 exit code
- found 0.8.929 with grep in /nix/store/5zfami4c97mdgiw2kga88hbr050gz9nl-jackett-0.8.929
- directory tree listing: https://gist.github.com/abeee550859eff26afc80fcec3b0ec15
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index f2d38111d5d2..8324af8b3d0d 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.886";
+  version = "0.8.929";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "18agnavhch29pi1w6vp374cs6bz2j7bf55mh4ym0cs038h5xkdvv";
+    sha256 = "1dq69734f6x8iw1jpvln5lq7bykpwky6iiwz8iwwamwg8143f20p";
   };
 
   buildInputs = [ makeWrapper ];

From d50a31a7106bb6d38fb3f594652a862de8f71281 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 15:01:58 -0700
Subject: [PATCH 0798/3370] html-xml-utils: 7.6 -> 7.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/html-xml-utils/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxaddid help’ got 0 exit code
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxaddid -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxcite -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract --help’ got 0 exit code
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract help’ got 0 exit code
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxextract -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxcopy -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxincl -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxpipe -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxremove help’ got 0 exit code
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxremove -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxselect help’ got 0 exit code
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxselect -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxtabletrans -v’ and found version 7.7
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxuncdata --help’ got 0 exit code
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxwls -h’ got 0 exit code
- ran ‘/nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7/bin/hxref -v’ and found version 7.7
- found 7.7 with grep in /nix/store/bgy2cxgllc9d8ll74s3lglhfygjw4c63-html-xml-utils-7.7
- directory tree listing: https://gist.github.com/f303211f05f8424805b5314ae0ff7c9e
---
 pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index 987d192bafcd..f681ae62aeaa 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "html-xml-utils-${version}";
-  version = "7.6";
+  version = "7.7";
 
   src = fetchurl {
     url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";
-    sha256 = "0l97ps089byy62838wf2jwvvc465iw29z9r5kwmwcq7f3bn11y3m";
+    sha256 = "1vwqp5q276j8di9zql3kygf31z2frp2c59yjqlrvvwcvccvkcdwr";
   };
 
   buildInputs = [curl libiconv];

From bf49200102a19a34bc619bfa7643cf9037dea4e2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 15:37:14 -0700
Subject: [PATCH 0799/3370] kotlin: 1.2.40 -> 1.2.41
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/kotlin/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41/bin/kotlin -h’ got 0 exit code
- ran ‘/nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41/bin/.kotlin-wrapped -h’ got 0 exit code
- found 1.2.41 with grep in /nix/store/5byxycv5j3gvwvr87qpv08a7347fxv9q-kotlin-1.2.41
- directory tree listing: https://gist.github.com/927e0c1e045ca7c165603ae8b1961beb
---
 pkgs/development/compilers/kotlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index d5ce240b4a5f..e589611505f4 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 let
-  version = "1.2.40";
+  version = "1.2.41";
 in stdenv.mkDerivation rec {
   inherit version;
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip";
-    sha256 = "0n4na0ddnjgc573szk5bpd34v5gib71pah62xq7vwdf34q8mg61l";
+    sha256 = "0p16xl2qhm7913abd06vvmsx956ny51jjfr6knkmrnk8y9r2g1xg";
   };
 
   propagatedBuildInputs = [ jre ] ;

From eb8e6f1f014577295f1cf9e53ad89a25cdce9f92 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 17:44:42 -0500
Subject: [PATCH 0800/3370] vit: enable on all

Fixes #39762
---
 pkgs/applications/misc/vit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix
index 37d7aeb88e61..40a399247e90 100644
--- a/pkgs/applications/misc/vit/default.nix
+++ b/pkgs/applications/misc/vit/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Visual Interactive Taskwarrior";
     maintainers = with pkgs.lib.maintainers; [ ];
-    platforms = pkgs.lib.platforms.linux;
+    platforms = pkgs.lib.platforms.all;
     license = pkgs.lib.licenses.gpl3;
   };
 }

From 67b3dcde4c259897b1909dcef795309a33413deb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 15:58:28 -0700
Subject: [PATCH 0801/3370] goxel: 0.7.3 -> 0.8.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/goxel/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel --help’ got 0 exit code
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel -V’ and found version 0.8.0
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/goxel --version’ and found version 0.8.0
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped --help’ got 0 exit code
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped -V’ and found version 0.8.0
- ran ‘/nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0/bin/.goxel-wrapped --version’ and found version 0.8.0
- found 0.8.0 with grep in /nix/store/af30rki4lvc9cinx3nxq1nqdnfgi6g1b-goxel-0.8.0
- directory tree listing: https://gist.github.com/ee8a96a0b785c0293e1e477b693c483b
---
 pkgs/applications/graphics/goxel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 8df630d582cc..03f7b515747b 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "goxel-${version}";
-  version = "0.7.3";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "guillaumechereau";
     repo = "goxel";
     rev = "v${version}";
-    sha256 = "114s1pbv3ixc2gzkg7n927hffd6ly5gg59izw4z6drgjcdhd7xj9";
+    sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17";
   };
 
   nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];

From 855e0463abe182e4cb481db8246ae5cd029c1298 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 17:43:54 -0500
Subject: [PATCH 0802/3370] tree-wide: platforms = platforms.gnu; -> platforms
 = gnu ++ linux

"platforms.gnu" has been linux-only since at least 17.03:

$ nix eval -f channel:nixos-17.03 lib.platforms.gnu
[ "i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "aarch64-linux" "mips64el-linux" ]

Unlike platforms.linux, platforms.gnu indicates "must use glibc"
which for the most part is not intended.

Replacing platforms.gnu with platforms.linux would be the same "today"
but let's err on preserving existing behavior and be optimistic
about platforms these packages work on.
---
 pkgs/applications/audio/mpg321/default.nix                      | 2 +-
 pkgs/applications/graphics/geeqie/default.nix                   | 2 +-
 pkgs/applications/graphics/ocrad/default.nix                    | 2 +-
 pkgs/applications/graphics/scantailor/advanced.nix              | 2 +-
 .../networking/instant-messengers/bitlbee/default.nix           | 2 +-
 .../networking/instant-messengers/telepathy/logger/default.nix  | 2 +-
 .../networking/instant-messengers/telepathy/salut/default.nix   | 2 +-
 pkgs/applications/networking/p2p/gnunet/default.nix             | 2 +-
 pkgs/development/guile-modules/guile-lib/default.nix            | 2 +-
 pkgs/development/guile-modules/guile-ncurses/default.nix        | 2 +-
 pkgs/development/libraries/libchamplain/default.nix             | 2 +-
 pkgs/development/libraries/libchop/default.nix                  | 2 +-
 pkgs/development/libraries/vcdimager/default.nix                | 2 +-
 pkgs/tools/graphics/logstalgia/default.nix                      | 2 +-
 pkgs/tools/misc/grub/pvgrub_image/default.nix                   | 2 +-
 pkgs/tools/misc/grub/trusted.nix                                | 2 +-
 pkgs/tools/networking/mailutils/default.nix                     | 2 +-
 pkgs/tools/security/gnupg/1.nix                                 | 2 +-
 pkgs/tools/text/numdiff/default.nix                             | 2 +-
 pkgs/tools/video/dvgrab/default.nix                             | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix
index ee0ebf234ce5..3ffc5265f7a0 100644
--- a/pkgs/applications/audio/mpg321/default.nix
+++ b/pkgs/applications/audio/mpg321/default.nix
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     homepage = http://mpg321.sourceforge.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.rycee ];
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index d034f5d64d93..a1ea88da84be 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     homepage = http://geeqie.sourceforge.net;
 
     maintainers = with maintainers; [ jfrankenau pSub ];
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix
index ac67759c258c..d88117916279 100644
--- a/pkgs/applications/graphics/ocrad/default.nix
+++ b/pkgs/applications/graphics/ocrad/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ pSub ];
-    platforms = platforms.gnu;  # arbitrary choice
+    platforms = platforms.gnu ++ platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index bea4fe9b2c6c..1fb8d572e95b 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     description = "Interactive post-processing tool for scanned pages";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ jfrankenau ];
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index fa1c64ba0ad7..fa3c66e67b61 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
 
     maintainers = with maintainers; [ wkennington pSub ];
-    platforms = platforms.gnu;  # arbitrary choice
+    platforms = platforms.gnu ++ platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 111970ab7112..f1b3c55d14c3 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = https://telepathy.freedesktop.org/components/telepathy-logger/;
     license = licenses.lgpl21;
     maintainers = with maintainers; [ jtojnar ];
-    platforms = platforms.gnu; # Arbitrary choice
+    platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index e060eaabf281..17cd20c09cbd 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Link-local XMPP connection manager for Telepathy";
-    platforms = platforms.gnu; # Random choice
+    platforms = platforms.gnu ++ platforms.linux; # Random choice
     maintainers = [ maintainers.lethalman ];
   };
 }
diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix
index d18342177243..e15c3588c298 100644
--- a/pkgs/applications/networking/p2p/gnunet/default.nix
+++ b/pkgs/applications/networking/p2p/gnunet/default.nix
@@ -73,6 +73,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
 
     maintainers = with maintainers; [ viric vrthra ];
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index 95741e07600a..35eb4667bd6b 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -40,6 +40,6 @@ in stdenv.mkDerivation {
     homepage = "http://www.nongnu.org/guile-lib/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ vyp ];
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/development/guile-modules/guile-ncurses/default.nix b/pkgs/development/guile-modules/guile-ncurses/default.nix
index 152a34883045..8f6018582670 100644
--- a/pkgs/development/guile-modules/guile-ncurses/default.nix
+++ b/pkgs/development/guile-modules/guile-ncurses/default.nix
@@ -39,6 +39,6 @@ in stdenv.mkDerivation {
     homepage = "https://www.gnu.org/software/guile-ncurses/";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ vyp ];
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 74e5bbc952ae..418e9cf0b573 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     '';
 
      maintainers = gnome3.maintainers;
-     platforms = platforms.gnu;  # arbitrary choice
+     platforms = platforms.gnu ++ platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix
index 1be3a74fbff5..5790672d8e51 100644
--- a/pkgs/development/libraries/libchop/default.nix
+++ b/pkgs/development/libraries/libchop/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     homepage = http://nongnu.org/libchop/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ viric ];
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix
index 48ad33424f60..77956be3b12e 100644
--- a/pkgs/development/libraries/vcdimager/default.nix
+++ b/pkgs/development/libraries/vcdimager/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = http://www.gnu.org/software/vcdimager/;
     description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs";
-    platforms = platforms.gnu; # random choice
+    platforms = platforms.gnu ++ platforms.linux; # random choice
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix
index 0fa991638457..be4cf0f493b6 100644
--- a/pkgs/tools/graphics/logstalgia/default.nix
+++ b/pkgs/tools/graphics/logstalgia/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
       a Miscellaneous section.
     '';
 
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
     maintainers = with maintainers; [ pSub ];
   };
 }
diff --git a/pkgs/tools/misc/grub/pvgrub_image/default.nix b/pkgs/tools/misc/grub/pvgrub_image/default.nix
index ee6e5065f40b..df5e3f15e95a 100644
--- a/pkgs/tools/misc/grub/pvgrub_image/default.nix
+++ b/pkgs/tools/misc/grub/pvgrub_image/default.nix
@@ -37,6 +37,6 @@ stdenv.mkDerivation rec {
          Xen guests
       '';
 
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 })
diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix
index e57c98bf51b0..2bf7e3dcf43b 100644
--- a/pkgs/tools/misc/grub/trusted.nix
+++ b/pkgs/tools/misc/grub/trusted.nix
@@ -98,6 +98,6 @@ stdenv.mkDerivation rec {
     description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)";
     homepage = https://github.com/Sirrix-AG/TrustedGRUB2;
     license = licenses.gpl3Plus;
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix
index 26bfd27bf9a6..4df7f80fff6c 100644
--- a/pkgs/tools/networking/mailutils/default.nix
+++ b/pkgs/tools/networking/mailutils/default.nix
@@ -116,6 +116,6 @@ in stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/mailutils/;
 
     # Some of the dependencies fail to build on {cyg,dar}win.
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix
index fa4555dcafb9..9a147caa7e21 100644
--- a/pkgs/tools/security/gnupg/1.nix
+++ b/pkgs/tools/security/gnupg/1.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
       other applications.  A wealth of frontend applications and libraries are
       available.
     '';
-    platforms = platforms.gnu; # arbitrary choice
+    platforms = platforms.gnu ++ platforms.linux; # arbitrary choice
   };
 }
diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix
index 96c91def9ac7..4741fecb90c1 100644
--- a/pkgs/tools/text/numdiff/default.nix
+++ b/pkgs/tools/text/numdiff/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.nongnu.org/numdiff/;
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ndowens ];
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }
diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix
index cec4fc1ce8bf..752a6f314325 100644
--- a/pkgs/tools/video/dvgrab/default.nix
+++ b/pkgs/tools/video/dvgrab/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     homepage = http://kinodv.org/;
 
     license = licenses.gpl2Plus;
-    platforms = platforms.gnu;
+    platforms = platforms.gnu ++ platforms.linux;
   };
 }

From 4b7b083bcbfffe0cddc79eb618fbf316918dea6b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 17:47:47 -0500
Subject: [PATCH 0803/3370] treewide: stdenv.lib.platforms.gnu -> ... gnu ++
 linux

Include all linux platforms.
---
 pkgs/applications/audio/mpc123/default.nix                      | 2 +-
 pkgs/applications/editors/emacs-modes/calfw/default.nix         | 2 +-
 pkgs/applications/editors/emacs-modes/jdee/default.nix          | 2 +-
 pkgs/applications/editors/texmacs/default.nix                   | 2 +-
 pkgs/applications/graphics/gimp/plugins/default.nix             | 2 +-
 pkgs/applications/graphics/panotools/default.nix                | 2 +-
 pkgs/applications/graphics/qtpfsgui/default.nix                 | 2 +-
 pkgs/applications/graphics/scantailor/default.nix               | 2 +-
 pkgs/applications/graphics/ufraw/default.nix                    | 2 +-
 pkgs/applications/graphics/viewnior/default.nix                 | 2 +-
 pkgs/applications/graphics/xfig/default.nix                     | 2 +-
 .../networking/instant-messengers/telepathy/gabble/default.nix  | 2 +-
 .../networking/instant-messengers/telepathy/haze/default.nix    | 2 +-
 .../networking/instant-messengers/telepathy/idle/default.nix    | 2 +-
 pkgs/applications/networking/p2p/gnunet/git.nix                 | 2 +-
 pkgs/applications/networking/p2p/gnunet/svn.nix                 | 2 +-
 pkgs/applications/office/gnucash/2.6.nix                        | 2 +-
 pkgs/applications/office/gnucash/default.nix                    | 2 +-
 .../science/machine-learning/torch/torch-distro.nix             | 2 +-
 pkgs/applications/science/misc/megam/default.nix                | 2 +-
 pkgs/applications/science/misc/tulip/default.nix                | 2 +-
 pkgs/applications/video/qstopmotion/default.nix                 | 2 +-
 pkgs/desktops/gnome-3/core/folks/default.nix                    | 2 +-
 pkgs/development/compilers/gprolog/default.nix                  | 2 +-
 pkgs/development/libraries/clutter-gst/default.nix              | 2 +-
 pkgs/development/libraries/clutter-gtk/default.nix              | 2 +-
 pkgs/development/libraries/libcanberra/default.nix              | 2 +-
 pkgs/development/libraries/libgpod/default.nix                  | 2 +-
 pkgs/development/libraries/libxmi/default.nix                   | 2 +-
 pkgs/development/libraries/tokyo-tyrant/default.nix             | 2 +-
 pkgs/development/tools/misc/complexity/default.nix              | 2 +-
 pkgs/os-specific/gnu/mig/default.nix                            | 2 +-
 pkgs/servers/pies/default.nix                                   | 2 +-
 pkgs/tools/X11/xnee/default.nix                                 | 2 +-
 pkgs/tools/misc/picocom/default.nix                             | 2 +-
 pkgs/tools/misc/urjtag/default.nix                              | 2 +-
 pkgs/tools/networking/connect/default.nix                       | 2 +-
 pkgs/tools/networking/inetutils/default.nix                     | 2 +-
 pkgs/tools/networking/p2p/amule/default.nix                     | 2 +-
 pkgs/tools/networking/p2p/seeks/default.nix                     | 2 +-
 pkgs/tools/networking/telnet/default.nix                        | 2 +-
 pkgs/tools/security/pius/default.nix                            | 2 +-
 pkgs/tools/system/freeipmi/default.nix                          | 2 +-
 pkgs/tools/text/namazu/default.nix                              | 2 +-
 44 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix
index ac945bee7f74..efaef97257e0 100644
--- a/pkgs/applications/audio/mpc123/default.nix
+++ b/pkgs/applications/audio/mpc123/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu; # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/calfw/default.nix b/pkgs/applications/editors/emacs-modes/calfw/default.nix
index c173684fab4c..091635feda6f 100644
--- a/pkgs/applications/editors/emacs-modes/calfw/default.nix
+++ b/pkgs/applications/editors/emacs-modes/calfw/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = with stdenv.lib.maintainers; [ chaoflow ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix
index e47da7a41934..306fe66823c8 100644
--- a/pkgs/applications/editors/emacs-modes/jdee/default.nix
+++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix
@@ -92,7 +92,7 @@ in
       license = stdenv.lib.licenses.gpl2Plus;
 
       maintainers = [ ];
-      platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+      platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
 
       broken = true;
     };
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index 447e729d4f9b..d3d95e5886a5 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation {
 
   meta = common.meta // {
     maintainers = [ stdenv.lib.maintainers.roconnor ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index f491f5dc914a..01d086cc4ed4 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -196,7 +196,7 @@ rec {
 
       license = stdenv.lib.licenses.gpl3Plus;
       maintainers = [ ];
-      platforms = stdenv.lib.platforms.gnu;
+      platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     };
   };
 
diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix
index 9ca90d2f5df3..719aca5096a5 100644
--- a/pkgs/applications/graphics/panotools/default.nix
+++ b/pkgs/applications/graphics/panotools/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description = "Free software suite for authoring and displaying virtual reality panoramas";
     license = stdenv.lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix
index d3edc40cbea2..4be7d230b5f4 100644
--- a/pkgs/applications/graphics/qtpfsgui/default.nix
+++ b/pkgs/applications/graphics/qtpfsgui/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix
index ec7af8829073..395179ff70ae 100644
--- a/pkgs/applications/graphics/scantailor/default.nix
+++ b/pkgs/applications/graphics/scantailor/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index cb1c37aefebf..50cd9485a3e8 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # needs GTK+
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # needs GTK+
   };
 }
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index c655cadef400..5afd7a0237d0 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.smironov ];
 
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index c70b1029b791..545675ab1545 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation {
   meta = {
     description = "An interactive drawing tool for X11";
     homepage = http://xfig.org;
-    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;         # arbitrary choice
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index 2d880bef753e..4fa4967c898e 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/;
     description = "Jabber/XMPP connection manager for the Telepathy framework";
     license = licenses.lgpl21Plus;
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
index a1669183bb3b..89be42781a4c 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A Telepathy connection manager based on libpurple";
-    platforms = stdenv.lib.platforms.gnu; # Random choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # Random choice
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
index 7894554eee4f..4607961cdf08 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "IRC connection manager for the Telepathy framework";
     license = stdenv.lib.licenses.lgpl21;
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix
index 6a0063dfb871..9763c0ee97fa 100644
--- a/pkgs/applications/networking/p2p/gnunet/git.nix
+++ b/pkgs/applications/networking/p2p/gnunet/git.nix
@@ -87,6 +87,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
index 8c8d95169c87..688bb11acd03 100644
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ b/pkgs/applications/networking/p2p/gnunet/svn.nix
@@ -88,6 +88,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
 
     maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index c768f4c7fa34..4d85374ee9a6 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -113,6 +113,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnucash.org/;
 
     maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index d17cd2a7ab75..252c6d878d0c 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -80,6 +80,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnucash.org/;
 
     maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index a4247eac627b..d8ce1d2c6280 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -9,7 +9,7 @@ let
     homepage = http://torch.ch;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ smironov ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 
   distro_src = src;
diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix
index a0ee505dc97f..8cd119c7b7b0 100644
--- a/pkgs/applications/science/misc/megam/default.nix
+++ b/pkgs/applications/science/misc/megam/default.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation rec {
     license = "non-commercial";
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 8560d900a4fa..7db2e6a12c20 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index 412cc1ad2728..2454044bb48e 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [ maintainers.leenaars ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome-3/core/folks/default.nix b/pkgs/desktops/gnome-3/core/folks/default.nix
index 776f76642222..beb40209bc8c 100644
--- a/pkgs/desktops/gnome-3/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/core/folks/default.nix
@@ -45,6 +45,6 @@ in stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = gnome3.maintainers;
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix
index 0e3eb88f537c..b12b055342ca 100644
--- a/pkgs/development/compilers/gprolog/default.nix
+++ b/pkgs/development/compilers/gprolog/default.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation rec {
     '';
 
     maintainers = [ stdenv.lib.maintainers.peti ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 962ca9ff9b53..a06691d5c715 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -30,6 +30,6 @@ in stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 71789b45a283..22f205cdcec0 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/pkgs/development/libraries/clutter-gtk/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.clutter-project.org/;
     license = stdenv.lib.licenses.lgpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 1b2cf4084f93..54f2273c2fcf 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index 60400712e30e..fbe421e9974e 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     homepage = http://gtkpod.sourceforge.net/;
     description = "Library used by gtkpod to access the contents of an ipod";
     license = "LGPL";
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix
index 46d38b16ccf1..81c5b5e2891b 100644
--- a/pkgs/development/libraries/libxmi/default.nix
+++ b/pkgs/development/libraries/libxmi/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     description = "Library for rasterizing 2-D vector graphics";
     homepage = http://www.gnu.org/software/libxmi/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix
index ccd619e8bc18..7bf08a3560ae 100644
--- a/pkgs/development/libraries/tokyo-tyrant/default.nix
+++ b/pkgs/development/libraries/tokyo-tyrant/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.lgpl21Plus;
 
-    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;         # arbitrary choice
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix
index 60a0370e86e2..41bfa520e62c 100644
--- a/pkgs/development/tools/misc/complexity/default.nix
+++ b/pkgs/development/tools/misc/complexity/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/complexity/;
 
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/os-specific/gnu/mig/default.nix b/pkgs/os-specific/gnu/mig/default.nix
index 34426b45d55e..2855f5b4240f 100644
--- a/pkgs/os-specific/gnu/mig/default.nix
+++ b/pkgs/os-specific/gnu/mig/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
 
     homepage = http://www.gnu.org/software/hurd/microkernel/mach/mig/gnu_mig.html;
 
-    # platforms = stdenv.lib.platforms.gnu;  # really GNU/Hurd
+    # platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # really GNU/Hurd
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix
index c472f767d525..73af60e55c42 100644
--- a/pkgs/servers/pies/default.nix
+++ b/pkgs/servers/pies/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/pies/;
 
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix
index 63abc31e0076..b31a512e84ab 100644
--- a/pkgs/tools/X11/xnee/default.nix
+++ b/pkgs/tools/X11/xnee/default.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/xnee/;
 
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
index 57be275d32af..bb66b97039da 100644
--- a/pkgs/tools/misc/picocom/default.nix
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "Minimal dumb-terminal emulation program";
     homepage = https://github.com/npat-efault/picocom/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
index 99cd407a9ae4..25687a3dbe1e 100644
--- a/pkgs/tools/misc/urjtag/default.nix
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
     homepage = http://urjtag.org/;
     license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
     maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ];
   };
 }
diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix
index 387987c588ad..f7a0c00fb481 100644
--- a/pkgs/tools/networking/connect/default.nix
+++ b/pkgs/tools/networking/connect/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = https://bitbucket.org/gotoh/connect/wiki/Home;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ jcumming ];
   };
 }
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index c5ecb5eb6dad..04045615a9b4 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix
index c278cc989357..ac440fc6d338 100644
--- a/pkgs/tools/networking/p2p/amule/default.nix
+++ b/pkgs/tools/networking/p2p/amule/default.nix
@@ -65,7 +65,7 @@ mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
     maintainers = [ stdenv.lib.maintainers.phreedom ];
   };
 }
diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix
index f11c0a63b07e..2a89e419b2e4 100644
--- a/pkgs/tools/networking/p2p/seeks/default.nix
+++ b/pkgs/tools/networking/p2p/seeks/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     maintainers = [
       stdenv.lib.maintainers.matejc
     ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
     broken = true; # 2018-04-11
   };
 }
diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix
index 3a5117653c83..c38f3c46fa46 100644
--- a/pkgs/tools/networking/telnet/default.nix
+++ b/pkgs/tools/networking/telnet/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
     description = "A client and daemon for the Telnet protocol";
     homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/;
     license = "BSD";
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index eb05c3748078..f9dced33ed46 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication {
 
     license = stdenv.lib.licenses.gpl2;
 
-    platforms = stdenv.lib.platforms.gnu;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu kierdavis ];
   };
 }
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index fd70dce4edf3..6996d66abe0c 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = with stdenv.lib.maintainers; [ raskin ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
 
     updateWalker = true;
     inherit version;
diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix
index 21548de5efbd..67a26cb41aa0 100644
--- a/pkgs/tools/text/namazu/default.nix
+++ b/pkgs/tools/text/namazu/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://namazu.org/;
 
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;  # arbitrary choice
     maintainers = [ ];
     broken = true; # File-MMagic is not compatible with our Perl version
   };

From 9bbac8b3bf8daa22d3b632eacd625328396243c0 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 17:48:58 -0500
Subject: [PATCH 0804/3370] mtools: optimistically extend platforms (gnu +
 darwin) => unix

---
 pkgs/tools/filesystems/mtools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix
index ff311b9fae2f..e7a9963f6501 100644
--- a/pkgs/tools/filesystems/mtools/default.nix
+++ b/pkgs/tools/filesystems/mtools/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.gnu.org/software/mtools/;
     description = "Utilities to access MS-DOS disks";
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.darwin;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ ];
   };
 }

From d86866cd678178ead6039ee7a131f2a6c49402bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 16:09:11 -0700
Subject: [PATCH 0805/3370] gitAndTools.gitRemoteGcrypt: 1.0.3 -> 1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-remote-gcrypt/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt -h’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt --help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/git-remote-gcrypt help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1/bin/.git-remote-gcrypt-wrapped help’ got 0 exit code
- found 1.1 with grep in /nix/store/xqncvvl7rynvbw0lf27d68qj879s26bm-git-remote-gcrypt-1.1
- directory tree listing: https://gist.github.com/f375e7b41aa0075f2c539d2c32748c12
---
 .../git-and-tools/git-remote-gcrypt/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
index 5e41db0e03f8..adfdb9a541c1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-gcrypt/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "git-remote-gcrypt-${version}";
-  version = "1.0.3";
+  version = "1.1";
   rev = version;
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "spwhitton";
     repo = "git-remote-gcrypt";
-    sha256 = "1vay3204729c7wajgn3nxf0s0hzwpdrw14pl6kd8w2ss25gvw2k1";
+    sha256 = "0mhz5mqnr35rk7j4wyhp7hzmqgv8r554n9qlm4iw565bz7acvq24";
   };
 
   outputs = [ "out" "man" ];

From 9bde5abedd34add6fdc579635cd4d522cad1a299 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 17:51:17 -0500
Subject: [PATCH 0806/3370] more platforms.gnu -> gnu ++ linux changes,
 manually

---
 pkgs/development/compilers/mit-scheme/default.nix | 2 +-
 pkgs/servers/http/myserver/default.nix            | 2 +-
 pkgs/tools/networking/p2p/tahoe-lafs/default.nix  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix
index 4670f39eac18..f254e91e5c65 100644
--- a/pkgs/development/compilers/mit-scheme/default.nix
+++ b/pkgs/development/compilers/mit-scheme/default.nix
@@ -87,6 +87,6 @@ stdenv.mkDerivation {
 
     # Build fails on Cygwin and Darwin:
     # <http://article.gmane.org/gmane.lisp.scheme.mit-scheme.devel/489>.
-    platforms = platforms.gnu ++ platforms.freebsd;
+    platforms = platforms.gnu ++ platforms.linux ++ platforms.freebsd;
   };
 }
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index 3e1c94e79b4b..fa3b57a0b22e 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
 
     # libevent fails to build on Cygwin and Guile has troubles on Darwin.
-    platforms = lib.platforms.gnu;
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;
 
     broken = true; # needs patch for gets()
   };
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 8c0c4a6c5664..c682100b4384 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -89,6 +89,6 @@ pythonPackages.buildPythonApplication rec {
     homepage = http://tahoe-lafs.org/;
     license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ];
     maintainers = with lib.maintainers; [ MostAwesomeDude ];
-    platforms = lib.platforms.gnu;  # arbitrary choice
+    platforms = lib.platforms.gnu ++ lib.platforms.linux;
   };
 }

From 1e295ccaf75cceff8b4949cf785a9b8e253f452f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 16:16:51 -0700
Subject: [PATCH 0807/3370] graphicsmagick: 1.3.28 -> 1.3.29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/graphicsmagick/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/gm help’ got 0 exit code
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick++-config --version’ and found version 1.3.29
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagick-config --version’ and found version 1.3.29
- ran ‘/nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29/bin/GraphicsMagickWand-config --version’ and found version 1.3.29
- found 1.3.29 with grep in /nix/store/j8gk0alkmajz7wsv7wn368blshmk89mk-graphicsmagick-1.3.29
- directory tree listing: https://gist.github.com/014b06393c82c79d1f5dfeea620b71f3
---
 pkgs/applications/graphics/graphicsmagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index f086a8f5ba60..4258d91b42af 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,14 +2,14 @@
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
-let version = "1.3.28"; in
+let version = "1.3.29"; in
 
 stdenv.mkDerivation {
   name = "graphicsmagick-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
-    sha256 = "0jlrrimrajcmwp7llivyj14qnzb1mpqd8vw95dl6zbx5m2lnhall";
+    sha256 = "1m0cc6kpky06lpcipj7rfwc2jbw2igr0jk97zqmw3j1ld5mg93g1";
   };
 
   patches = [

From 52a9b6e896508e3794dff8b102da65e23596ed05 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 16:18:09 -0700
Subject: [PATCH 0808/3370] encfs: 1.9.4 -> 1.9.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/encfs/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5/bin/encfs --version’ and found version 1.9.5
- ran ‘/nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5/bin/encfsctl --version’ and found version 1.9.5
- found 1.9.5 with grep in /nix/store/hyf73217fw2hx4kwkl7g2bg92rkabxlw-encfs-1.9.5
- directory tree listing: https://gist.github.com/43f0591cfbd83d8f0ed7349f3b2cbec2
---
 pkgs/tools/filesystems/encfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 03da84f7c733..1a9951a33fd7 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -5,10 +5,10 @@
 
 stdenv.mkDerivation rec {
   name = "encfs-${version}";
-  version = "1.9.4";
+  version = "1.9.5";
 
   src = fetchFromGitHub {
-    sha256 = "1hp2l4yk7fsimlrrd6a675vigmyikd323l1n3mybcdng58skj2ag";
+    sha256 = "099rjb02knr6yz7przlnyj62ic0ag5ncs7vvcc36ikyqrmpqsdch";
     rev = "v${version}";
     repo = "encfs";
     owner = "vgough";

From 02d34f7d9e72bc8c4373784d3d23a2c86cc25cef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 16:33:57 -0700
Subject: [PATCH 0809/3370] guake: 3.2.0 -> 3.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/guake/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/guake -h’ got 0 exit code
- ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/guake --help’ got 0 exit code
- ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/..guake-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/..guake-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/.guake-wrapped -h’ got 0 exit code
- ran ‘/nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1/bin/.guake-wrapped --help’ got 0 exit code
- found 3.2.1 with grep in /nix/store/p6q5wvny65jwxx2v1gq6gwbnrv587a1n-guake-3.2.1
- directory tree listing: https://gist.github.com/507c9c542414dc20262767a01f4ba0d9
---
 pkgs/applications/misc/guake/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 17837c6c254e..9ae4ca0be03e 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -2,7 +2,7 @@
 , gtk3, keybinder3, libnotify, libutempter, vte }:
 
 let
-  version = "3.2.0";
+  version = "3.2.1";
 in python3.pkgs.buildPythonApplication rec {
   name = "guake-${version}";
   format = "other";
@@ -11,7 +11,7 @@ in python3.pkgs.buildPythonApplication rec {
     owner = "Guake";
     repo = "guake";
     rev = version;
-    sha256 = "1qghapg9sslj9fdrl2mnbi10lgqgqa36gdag74wn7as9wak4qc3d";
+    sha256 = "0qzrkmjizpc3kirvhml62wya1sr3pbig25nfcrfhk1hhr3jxq17s";
   };
 
   nativeBuildInputs = [ gettext gobjectIntrospection wrapGAppsHook python3.pkgs.pip glibcLocales ];

From e9d67529f7c83530e6caf1cc2e807dd33994653a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 30 Apr 2018 18:45:22 -0500
Subject: [PATCH 0810/3370] nss-mdns: fix build w/musl

---
 pkgs/tools/networking/nss-mdns/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix
index b3d4ec95e061..9f83949e8de0 100644
--- a/pkgs/tools/networking/nss-mdns/default.nix
+++ b/pkgs/tools/networking/nss-mdns/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "nss-mdns-0.10";
@@ -20,6 +20,16 @@ stdenv.mkDerivation rec {
       "--localstatedir=/var"
     ];
 
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
+    (
+      fetchpatch
+      {
+        url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch";
+        sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds";
+      }
+    );
+
+
   meta = {
     description = "The mDNS Name Service Switch (NSS) plug-in";
     longDescription = ''
@@ -34,7 +44,7 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.lgpl2Plus;
 
     # Supports both the GNU and FreeBSD NSS.
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd;
 
     maintainers = [ ];
   };

From 369a7e598539887cd5065b39ed38434620dab0a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 16:58:59 -0700
Subject: [PATCH 0811/3370] folly: 2018.04.16.00 -> 2018.04.23.00

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/folly/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.04.23.00 with grep in /nix/store/gdpqjqzr8vyisbqsklghaj7lzbbld8a7-folly-2018.04.23.00
- directory tree listing: https://gist.github.com/07bd48be1a92119ed9366c9d83b6a9d1
---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index d3ba4b889094..17c6f75a59db 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2018.04.16.00";
+  version = "2018.04.23.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "10wivnszpqcbg2hbvfal94lcjw20pjz0d8p0m4qa7i4v4z90q37p";
+    sha256 = "0wfp4pxi71bi3bz3h5jxsvdd5wa8q6wqdgsx0jvyvaiiy7v884sv";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];

From e6f9103afcab0b7bf2fd64c2f4de2950d97eb4b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 17:15:47 -0700
Subject: [PATCH 0812/3370] eclib: 20171002 -> 20171219
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/eclib/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_conic help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/solve_legendre help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_cubics help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/list_cubics help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/point_search help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/indep_test help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/mwrank help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/reduce_quartics help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/quartic_points help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/ecnf help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/qexp --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/qexp help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1bsd help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/h1curve help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap --help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/checkap help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/nfcount -h’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/nfcount help’ got 0 exit code
- ran ‘/nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219/bin/aplist --help’ got 0 exit code
- found 20171219 with grep in /nix/store/hpvamrs8z1pdjplqpiknqhycnyp9grm4-eclib-20171219
- directory tree listing: https://gist.github.com/65ae32e270027abb20516fbca4766d48
---
 pkgs/development/libraries/eclib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix
index dbe487368dc5..b2a224e10b11 100644
--- a/pkgs/development/libraries/eclib/default.nix
+++ b/pkgs/development/libraries/eclib/default.nix
@@ -17,12 +17,12 @@ assert withFlint -> flint != null;
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "eclib";
-  version = "20171002";
+  version = "20171219";
   src = fetchFromGitHub {
     owner = "JohnCremona";
     repo = "${pname}";
     rev = "v${version}";
-    sha256 = "092an90405q9da0k0z5jfp5rng9jl0mqbvsbv4fx6jc9ykfcahsj";
+    sha256 = "1yw488ng0labpxqqpxq0710qnndxl8plvcaqklpbwwd62a47knlr";
   };
   buildInputs = [
     pari

From 6cad5785ea0fc6d3d5f3dba2172e9d885b1c3661 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 17:24:48 -0700
Subject: [PATCH 0813/3370] extremetuxracer: 0.7.4 -> 0.7.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/extremetuxracer/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.7.5 with grep in /nix/store/aqs72fzhj8mlf9dlcrh0nsmwczsxa0il-extremetuxracer-0.7.5
- directory tree listing: https://gist.github.com/af25592b4861fd5c1e67e48c17da69d9
---
 pkgs/games/extremetuxracer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index d1bf190be574..26703b8288e6 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.4";
+  version = "0.7.5";
   name = "extremetuxracer-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz";
-    sha256 = "0d2j4ybdjmimg67v2fndgahgq4fvgz3fpfb3a4l1ar75n6hy776s";
+    sha256 = "1ly63316c07i0gyqqmyzsyvygsvygn0fpk3bnbg25fi6li99rlsg";
   };
 
   buildInputs = [

From 71594fa9a28a6bf128d5b4041fd6d805aa8d9a32 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 17:41:01 -0700
Subject: [PATCH 0814/3370] acpica-tools: 20180313 -> 20180427
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/acpica-tools/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpibin help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpidump -h’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpidump --help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpiexec -h’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpiexec --help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpihelp help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpinames -h’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpinames --help’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpixtract -h’ got 0 exit code
- ran ‘/nix/store/7p0yabnnlx6kqsig855id44ywsjymigc-acpica-tools-20180427/bin/acpixtract --help’ got 0 exit code
- directory tree listing: https://gist.github.com/3a2dd151709bad304f81a4c4c7d3715e
---
 pkgs/tools/system/acpica-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index a8fb57b2fba0..f26142260fef 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "acpica-tools-${version}";
-  version = "20180313";
+  version = "20180427";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
+    sha256 = "05hczn82dpn7irh8zy9m17hm8r3ngwrbmk69zsldr4k1w3cv40df";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From f66a510db8ce6f4012db368052a4154bf42b9b22 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 17:48:52 -0700
Subject: [PATCH 0815/3370] cni-plugins: 0.7.0 -> 0.7.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cni-plugins/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.7.1 with grep in /nix/store/ddh9jrgh4df6s6kj6ywc6clnprfggp75-cni-plugins-0.7.1
- directory tree listing: https://gist.github.com/2260aa864704a4bc411b23f3147315e9
---
 pkgs/applications/networking/cluster/cni/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix
index 9f6b6fcb7e11..8a006edda6a8 100644
--- a/pkgs/applications/networking/cluster/cni/plugins.nix
+++ b/pkgs/applications/networking/cluster/cni/plugins.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "cni-plugins-${version}";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "containernetworking";
     repo = "plugins";
     rev = "v${version}";
-    sha256 = "0m885v76azs7lrk6m6n53rwh0xadwvdcr90h0l3bxpdv87sj2mnf";
+    sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2";
   };
 
   buildInputs = [ go ];

From 07c025424ee0685801ed76cc6b9bd243e435a6e7 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 30 Apr 2018 20:52:09 -0400
Subject: [PATCH 0816/3370] xmlformat: init at 1.04

---
 pkgs/tools/text/xml/xmlformat/default.nix | 28 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/text/xml/xmlformat/default.nix

diff --git a/pkgs/tools/text/xml/xmlformat/default.nix b/pkgs/tools/text/xml/xmlformat/default.nix
new file mode 100644
index 000000000000..5982aa3828ef
--- /dev/null
+++ b/pkgs/tools/text/xml/xmlformat/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, perl }:
+stdenv.mkDerivation rec {
+  name = "xmlformat-${version}";
+  version = "1.04";
+
+  src = fetchurl {
+    url = "http://www.kitebird.com/software/xmlformat/xmlformat-${version}.tar.gz";
+    sha256 = "1vwgzn4ha0az7dx0cyc6dx5nywwrx9gxhyh08mvdcq27wjbh79vi";
+  };
+
+  buildInputs = [ perl ];
+  buildPhase = ''
+    patchShebangs ./xmlformat.pl
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ./xmlformat.pl $out/bin/xmlformat
+    cp ./LICENSE $out/
+  '';
+
+  meta = {
+    description = "a configurable formatter (or 'pretty-printer') for XML documents";
+    homepage = "http://www.kitebird.com/software/xmlformat/";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fea71173109..b20cf36a05fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5736,6 +5736,8 @@ with pkgs;
 
   xml2 = callPackage ../tools/text/xml/xml2 { };
 
+  xmlformat = callPackage ../tools/text/xml/xmlformat { };
+
   xmlroff = callPackage ../tools/typesetting/xmlroff { };
 
   xmloscopy = callPackage ../tools/text/xml/xmloscopy { };

From 1c86f0cc4683e055df981cded464464cb48e05aa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 19:59:33 -0500
Subject: [PATCH 0817/3370] netbsd: cleanup bootstrapping

---
 pkgs/os-specific/bsd/netbsd/default.nix | 242 +++++++++++++-----------
 1 file changed, 133 insertions(+), 109 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 4961ab6080a9..aea0ddac3023 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -10,10 +10,11 @@ let
   };
 
   netBSDDerivation = attrs: stdenv.mkDerivation ((rec {
-    name = "${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}";
+    name = "bsd-${attrs.pname or (baseNameOf attrs.path)}-netbsd-${attrs.version}";
     src = attrs.src or fetchNetBSD attrs.path attrs.version attrs.sha256;
 
     extraPaths = [ ];
+    setOutputFlags = false;
 
     nativeBuildInputs = [ makeMinimal mandoc groff install stat
                           yacc flex tsort lorder ];
@@ -25,17 +26,24 @@ let
     DESTDIR = "$(out)";
     TOOLDIR = "$(out)";
     USETOOLS = "never";
-    NOCLANGERROR="yes";
-    NOGCCERROR="yes";
+    NOCLANGERROR = "yes";
+    NOGCCERROR = "yes";
     LEX = "flex";
+    MKUNPRIVED = "yes";
+    INSTPRIV = '' ''${INSTPRIV.unpriv}'';
+    HOST_SH = "${bash}/bin/sh";
+    OBJCOPY = if stdenv.isDarwin then "true" else "objcopy";
+    PRESERVE = "-p";
+    MACHINE_ARCH = hostPlatform.parsed.cpu.name;
+    MACHINE_CPU = hostPlatform.parsed.cpu.name;
 
     # libs will be provided by cc-wrapper
-    LIBCRT0="";
-    LIBCRTI="";
-    LIBCRTEND="";
-    LIBCRTBEGIN="";
-    LIBC="";
-    LIBUTIL="";
+    LIBCRT0 = "";
+    LIBCRTI = "";
+    LIBCRTEND = "";
+    LIBCRTBEGIN = "";
+    LIBC = "";
+    LIBUTIL = "";
     LIBSSL = "";
     LIBCRYPTO = "";
     LIBCRYPT = "";
@@ -43,8 +51,6 @@ let
     LIBTERMINFO = "";
     LIBM = "";
     LIBL = "";
-    "LIBDO.terminfo" = "_external";
-    "LIBDO.curses" = "_external";
     _GCC_CRTBEGIN = "";
     _GCC_CRTBEGINS = "";
     _GCC_CRTEND = "";
@@ -54,10 +60,14 @@ let
     _GCC_CRTDIR = "";
     _GCC_CRTN = "";
 
+    "LIBDO.terminfo" = "_external";
+    "LIBDO.curses" = "_external";
+
     # all dirs will be prefixed with DESTDIR
     BINDIR = "/bin";
     LIBDIR = "/lib";
     SHLIBDIR = "/lib";
+    INCSDIR = "/include";
     MANDIR = "/share/man";
     INFODIR = "/share/info";
     DOCDIR = "/share/doc";
@@ -65,22 +75,12 @@ let
     X11BINDIR = "/bin";
     X11USRLIBDIR = "/lib";
     X11MANDIR = "/share/man";
-    SHLINKDIR = "/usr/libexec";
-
-    HOST_SH = "${bash}/bin/sh";
-
-    SHLIB_WARNTEXTREL = "no";
-    SHLIB_MKMAP = "no";
-    PRESERVE = "-p";
-    OBJCOPY = if stdenv.isDarwin then "true" else "objcopy";
-
-    MACHINE_ARCH = hostPlatform.parsed.cpu.name;
-    MACHINE_CPU = hostPlatform.parsed.cpu.name;
 
     # NetBSD makefiles should be able to detect this
     # but without they end up using gcc on Darwin stdenv
     preConfigure = ''
       export HAVE_${if stdenv.cc.isGNU then "GCC" else "LLVM"}=${lib.head (lib.splitString "." (lib.getVersion stdenv.cc.cc))}
+
       # Parallel building. Needs the space.
       export makeFlags+=" -j $NIX_BUILD_CORES"
     '';
@@ -91,6 +91,7 @@ let
       sourceRoot=$PWD/$sourceRoot
       export NETBSDSRCDIR=$sourceRoot
       export BSDSRCDIR=$NETBSDSRCDIR
+      export _SRC_TOP_=$NETBSDSRCDIR
       chmod -R u+w $sourceRoot
       for path in $extraPaths; do
         cd $path
@@ -109,15 +110,14 @@ let
     # will be removed in the postInstall.
     preInstall = ''
       mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \
-               $out$DOCDIR $out$LOCALEDIR
+               $out$DOCDIR $out$LOCALEDIR $out$INCSDIR
       for i in 1 2 3 4 5 6 7 8 9; do
         mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \
                  $out$DOCDIR/reference/ref$i
       done
-      mkdir -p $out/usr/include
     '';
 
-    postInstall = ''
+    preFixup = ''
       # Remove lingering /usr references
       if [ -d $out/usr ]; then
         cd $out/usr
@@ -125,6 +125,10 @@ let
         find . -type f -exec mv \{} $out/\{} \;
       fi
 
+      if [ -f $out/METALOG ]; then
+        rm $out/METALOG
+      fi
+
       find $out -type d -empty -delete
     '';
 
@@ -135,7 +139,9 @@ let
     };
   }) // attrs);
 
-  # BOOTSTRAPPING
+  ##
+  ## BOOTSTRAPPING
+  ##
   makeMinimal = netBSDDerivation rec {
     path = "tools/make";
     sha256 = "0l4794zwj2haark3azf9xwcwqlkbrifhb2glaa9iba4dkg2mklsb";
@@ -144,16 +150,26 @@ let
     buildInputs = [];
     nativeBuildInputs = [];
 
-    patchPhase = ''
+    postPatch = ''
       patchShebangs configure
-      ${make.patchPhase}
+      ${make.postPatch}
+    '';
+    buildPhase = ''
+      runHook prePatch
+
+      sh ./buildmake.sh
+
+      runHook postPatch
     '';
-    buildPhase = "sh ./buildmake.sh";
     installPhase = ''
+      runHook preInstall
+
       install -D nbmake $out/bin/nbmake
       ln -s $out/bin/nbmake $out/bin/make
       mkdir -p $out/share
-      cp -r ../../share/mk $out/share/mk
+      cp -r $NETBSDSRCDIR/share/mk $out/share/mk
+
+      runHook postInstall
     '';
     extraPaths = [ make.src ] ++ make.extraPaths;
   };
@@ -171,7 +187,8 @@ let
 
     # temporarily use gnuinstall for bootstrapping
     # bsdinstall will be built later
-    makeFlags = "INSTALL=${coreutils}/bin/install";
+    makeFlags = [ "INSTALL=${coreutils}/bin/install" ];
+    installFlags = [];
     RENAME = "-D";
 
     postInstall = ''
@@ -219,7 +236,17 @@ let
     extraPaths = [ mtree.src make.src ];
     nativeBuildInputs = [ makeMinimal mandoc groff ];
     buildInputs = [ compat fts ];
-    RENAME = "-D";
+    installPhase = ''
+      runHook preInstall
+
+      install -D install.1 $out/share/man/man1/install.1
+      install -D xinstall $out/bin/install
+      ln -s $out/bin/install $out/bin/xinstall
+      ln -s $out/bin/install $out/bin/binstall
+
+      runHook postInstall
+    '';
+    # INSTALL_FILE = "install -D";
   };
 
   fts = netBSDDerivation {
@@ -240,10 +267,14 @@ let
       ar -rsc libfts.a lib/libc/gen/fts.o
     '';
     installPhase = ''
+      runHook preInstall
+
       install -D lib/libc/gen/fts.3 $out/share/man/man3/fts.3
       install -D include/fts.h $out/include/fts.h
       install -D lib/libc/include/namespace.h $out/include/namespace.h
       install -D libfts.a $out/lib/libfts.a
+
+      runHook postInstall
     '';
     setupHook = ./fts-setup-hook.sh;
   };
@@ -268,7 +299,9 @@ let
     sha256 = "0rjf9blihhm0n699vr2bg88m4yjhkbxh6fxliaay3wxkgnydjwn2";
     nativeBuildInputs = [ makeMinimal mandoc groff install ];
   };
-  # END BOOTSTRAPPING
+  ##
+  ## END BOOTSTRAPPING
+  ##
 
   libutil = netBSDDerivation {
     path = "lib/libutil";
@@ -292,44 +325,31 @@ let
     path = "usr.bin/make";
     sha256 = "0srkkg6qdzqlccfi4xh19gl766ks6hpss76bnfvwmd0zg4q4zdar";
     version = "7.1.2";
-    patchPhase = ''
+    postPatch = ''
       # make needs this to pick up our sys make files
       export NIX_CFLAGS_COMPILE+=" -D_PATH_DEFSYSPATH=\"$out/share/mk\""
 
-      # can't set owner or group in Nix build
-      # maybe there is a better way to trick it?
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \
-        --replace '-o ''${SCRIPTSOWN_''${.ALLSRC:T}:U''${SCRIPTSOWN}}' "" \
-        --replace '-g ''${SCRIPTSGRP_''${.ALLSRC:T}:U''${SCRIPTSGRP}}' "" \
-        --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \
-        --replace '-o ''${BINOWN} -g ''${BINGRP}' "" \
-        --replace '-o ''${RUMPBINOWN} -g ''${RUMPBINGRP}' "" \
-        --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' ""
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.doc.mk \
-        --replace '-o ''${DOCOWN} -g ''${DOCGRP}' ""
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.links.mk \
-        --replace '-o ''${LINKSOWN_''${.ALLSRC:T}:U''${LINKSOWN}}' "" \
-        --replace '-g ''${LINKSGRP_''${.ALLSRC:T}:U''${LINKSGRP}}' ""
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.man.mk \
-        --replace '-o ''${MANOWN} -g ''${MANGRP}' ""
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.files.mk \
-        --replace '-o ''${FILESOWN_''${.ALLSRC:T}:U''${FILESOWN}}' "" \
-        --replace '-g ''${FILESGRP_''${.ALLSRC:T}:U''${FILESGRP}}' ""
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.inc.mk \
-        --replace '-o ''${BINOWN} -g ''${BINGRP}' ""
-      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
-        --replace '-o ''${DEBUGOWN} -g ''${DEBUGGRP}' "" \
-        --replace '-o ''${LIBOWN} -g ''${LIBGRP}' ""
+        --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \
+        --replace '-Wl,-rpath,''${SHLIBDIR}' ""
     '' + lib.optionalString stdenv.isDarwin ''
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \
-        --replace '-Wl,--fatal-warnings' ""
+        --replace '-Wl,--fatal-warnings' "" \
+        --replace '-Wl,--warn-shared-textrel' ""
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
         --replace '-Wl,-soname,''${_LIB}.so.''${SHLIB_SOVERSION}' "" \
         --replace '-Wl,--whole-archive' "" \
-        --replace '-Wl,--no-whole-archive' ""
+        --replace '-Wl,--no-whole-archive' "" \
+        --replace '-Wl,--warn-shared-textrel' "" \
+        --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \
+        --replace '-Wl,-rpath,''${SHLIBDIR}' ""
+    '';
+    preInstall = ''
+      mkdir -p $out$BINDIR $out$DOCDIR/reference/ref1/make \
+               $out$MANDIR/man1 $out$MANDIR/html1 $out/share/mk
     '';
     postInstall = ''
-      (cd $NETBSDSRCDIR/share/mk && make install)
+      (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install)
     '';
     extraPaths = [
       (fetchNetBSD "share/mk" "7.1.2" "0570v0siv0wygn8ygs1yy9pgk9xjw9x1axr5qg4xrddv3lskf9xa")
@@ -346,17 +366,23 @@ let
     path = "usr.bin/who";
     version = "7.1.2";
     sha256 = "17ffwww957m3qw0b6fkgjpp12pd5ydg2hs9dxkkw0qpv11j00d88";
-    patchPhase = ''
+    postPatch = lib.optionalString stdenv.isLinux ''
+      substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
+        --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \
+        --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec"
+   '' + lib.optionalString stdenv.isDarwin ''
+      substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
+        --replace "timespeccmp(&st.st_mtimespec, &utmpxtime, >)" "st.st_mtimespec.tv_sec == utmpxtime.tv_sec ? st.st_mtimespec.tv_nsec > utmpxtime.tv_nsec : st.st_mtimespec.tv_sec > utmpxtime.tv_sec"
+   '' + ''
       substituteInPlace $NETBSDSRCDIR/usr.bin/who/utmpentry.c \
         --replace "strncpy(e->name, up->ut_name, sizeof(up->ut_name))" "strncpy(e->name, up->ut_user, sizeof(up->ut_user))" \
-        --replace "utmptime = st.st_mtimespec" "utmptime = st.st_mtim" \
-        --replace "timespeccmp(&st.st_mtimespec, &utmptime, >)" "st.st_mtim.tv_sec == utmptime.tv_sec ? st.st_mtim.tv_nsec > utmptime.tv_nsec : st.st_mtim.tv_sec > utmptime.tv_sec" \
-        --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0"
+        --replace "timespecclear(&utmptime)" "utmptime.tv_sec = utmptime.tv_nsec = 0" \
+        --replace "timespecclear(&utmpxtime)" "utmpxtime.tv_sec = utmpxtime.tv_nsec = 0"
     '';
   };
 
 in rec {
-  inherit compat install netBSDDerivation fts;
+  inherit compat install netBSDDerivation fts make;
 
   getent = netBSDDerivation {
     path = "usr.bin/getent";
@@ -375,23 +401,26 @@ in rec {
     path = "share/dict";
     version = "7.1.2";
     sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4";
-    preBuild = "mkdir -p $out/share/dict";
     makeFlags = [ "BINDIR=/share" ];
+    preInstall = "mkdir -p $out/share/dict";
   };
 
   games = netBSDDerivation {
     path = "games";
     sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1";
     version = "7.1.2";
-    patchPhase = ''
+    makeFlags = [ "BINDIR=/bin"
+                  "SCRIPTSDIR=/bin"
+                  "FILESDIR=/share/games" ];
+    postPatch = ''
       sed -i '1i #include <time.h>' adventure/save.c
 
       for f in $(find . -name pathnames.h); do
         substituteInPlace $f \
+          --replace /usr/share/games/fortune $out/share/games \
           --replace /usr/share/games $out/share/games \
           --replace /usr/games $out/bin \
           --replace /usr/libexec $out/libexec \
-          --replace /var/games $out/var/games \
           --replace /usr/bin/more ${more}/bin/more \
           --replace /usr/share/dict ${dict}/share/dict
       done
@@ -424,13 +453,11 @@ in rec {
         --replace 2550 550
     '';
 
-    # HACK strfile needs to be installed first & in the path
+    # HACK strfile needs to be installed first & in the path. The
+    # Makefile should do this for us but haven't gotten it to work
     preBuild = ''
-      pushd fortune/strfile
       mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8
-      make
-      make BINDIR=/bin install
-      popd
+      (cd fortune/strfile && make && make BINDIR=/bin install)
       export PATH=$out/bin:$PATH
     '';
 
@@ -447,38 +474,37 @@ in rec {
       "-D__c99inline=__inline"
     ];
 
-    postBuild = ''
-      mkdir -p $out/usr/games $out/usr/share/games/ching \
-               $out/usr/share/games/fortune \
-               $out/usr/share/games/quiz.db \
-               $out/usr/share/games/boggle \
-               $out/usr/libexec/ching $out/var/games/hackdir
+    preInstall = ''
+      mkdir -p $out/var/games/hackdir \
+               $out/share/games \
+               $out$DOCDIR/reference/ref6/rogue \
+               $out$MANDIR/man6 $out$MANDIR/html6
       touch $out/var/games/hackdir/perm
     '';
 
-    preFixup = ''
-      mkdir -p $out/bin
-      mv $out/games/* $out/bin
-      rmdir $out/games
-    '';
-
     buildInputs = [ compat libcurses libterminfo libressl ];
     extraPaths = [ dict.src who.src ];
   };
 
-  # finger = netBSDDerivation {
-  #   path = "usr.bin/finger";
-  #   sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi";
-  #   version = "7.1.2";
-  #   extraPaths = [ who.src ];
-  #   NIX_CFLAGS_COMPILE = [
-  #     "-DSUPPORT_UTMP"
-  #     "-USUPPORT_UTMPX"
-  #   ];
-  #   patchPhase = ''
-  #     ${who.patchPhase}
-  #   '';
-  # };
+  finger = netBSDDerivation {
+    path = "usr.bin/finger";
+    sha256 = "0jl672z50f2yf7ikp682b3xrarm6bnrrx9vi94xnp2fav8m8zfyi";
+    version = "7.1.2";
+    NIX_CFLAGS_COMPILE = [
+      (if stdenv.isLinux then "-DSUPPORT_UTMP" else "-USUPPORT_UTMP")
+      (if stdenv.isDarwin then "-DSUPPORT_UTMPX" else "-USUPPORT_UTMPX")
+    ];
+    postPatch = ''
+      NIX_CFLAGS_COMPILE+=" -I$NETBSDSRCDIR/include"
+
+      substituteInPlace extern.h \
+        --replace psort _psort
+
+      ${who.postPatch}
+    '';
+    extraPaths = [ who.src ]
+              ++ lib.optional stdenv.isDarwin (fetchNetBSD "include/utmp.h" "7.1.2" "05690fzz0825p2bq0sfyb00mxwd0wa06qryqgqkwpqk9y2xzc7px");
+  };
 
   fingerd = netBSDDerivation {
     path = "libexec/fingerd";
@@ -490,8 +516,8 @@ in rec {
     path = "lib/libedit";
     buildInputs = [ libterminfo libcurses ];
     propagatedBuildInputs = [ compat ];
-    postBuild = "mkdir -p $out/usr/include/readline";
-    patchPhase = ''
+    makeFlags = [ "INCSDIR=/include" ];
+    postPatch = ''
       sed -i '1i #undef bool_t' el.h
       substituteInPlace config.h \
         --replace "#define HAVE_STRUCT_DIRENT_D_NAMLEN 1" ""
@@ -511,16 +537,13 @@ in rec {
     sha256 = "06plg0bjqgbb0aghpb9qlk8wkp1l2izdlr64vbr5laqyw8jg84zq";
     buildInputs = [ compat tic nbperf ];
     MKPIC = if stdenv.isDarwin then "no" else "yes";
-    patchPhase = ''
-      substituteInPlace term.c \
-        --replace /usr/share $out/share
+    makeFlags = [ "INCSDIR=/include" ];
+    postPatch = ''
+      substituteInPlace term.c --replace /usr/share $out/share
     '';
-    postBuild = ''
-      pushd $NETBSDSRCDIR/share/terminfo
+    postInstall = ''
       mkdir -p $out/share/misc
-      make
-      make BINDIR=/share install
-      popd
+      (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install)
     '';
     extraPaths = [
       (fetchNetBSD "share/terminfo" "7.1.2" "1z5vzq8cw24j05r6df4vd6r57cvdbv7vbm4h962kplp14xrbg2h3")
@@ -532,6 +555,7 @@ in rec {
     version = "7.1.2";
     sha256 = "04djah9dadzw74nswn0xydkxn900kav8xdvxlxdl50nbrynxg9yf";
     buildInputs = [ libterminfo ];
+    makeFlags = [ "INCSDIR=/include" ];
     NIX_CFLAGS_COMPILE = [
       "-D__scanflike(a,b)="
       "-D__va_list=va_list"
@@ -540,7 +564,7 @@ in rec {
     propagatedBuildInputs = [ compat ];
     MKDOC = "no"; # missing vfontedpr
     MKPIC = if stdenv.isDarwin then "no" else "yes";
-    patchPhase = lib.optionalString (!stdenv.isDarwin) ''
+    postPatch = lib.optionalString (!stdenv.isDarwin) ''
       substituteInPlace printw.c \
         --replace "funopen(win, NULL, __winwrite, NULL, NULL)" NULL \
         --replace "__strong_alias(vwprintw, vw_printw)" 'extern int vwprintw(WINDOW*, const char*, va_list) __attribute__ ((alias ("vw_printw")));'

From ab1648bf0d13afc19bdf7e3d092a3f7ce15a4de1 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 30 Apr 2018 22:35:54 -0400
Subject: [PATCH 0818/3370] nixpkgs doc: add format Make target

---
 doc/Makefile             |  7 +++-
 doc/default.nix          |  3 +-
 doc/shell.nix            |  1 +
 nixos/doc/xmlformat.conf | 72 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 nixos/doc/xmlformat.conf

diff --git a/doc/Makefile b/doc/Makefile
index 952ef4bfcbb9..8a4612e95f19 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,12 +1,17 @@
 MD_TARGETS=$(addsuffix .xml, $(basename $(wildcard ./*.md ./**/*.md)))
 
 .PHONY: all
-all: validate out/html/index.html out/epub/manual.epub
+all: validate format out/html/index.html out/epub/manual.epub
 
 .PHONY: debug
 debug:
 	nix-shell --run "xmloscopy --docbook5 ./manual.xml ./manual-full.xml"
 
+.PHONY: format
+format:
+	find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
+		xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}
+
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml
diff --git a/doc/default.nix b/doc/default.nix
index e5be364506ff..0d95d3f04573 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -7,7 +7,7 @@ in
 pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
 
-  buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing ];
+  buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing  xmlformat ];
 
   src = ./.;
 
@@ -18,6 +18,7 @@ pkgs.stdenv.mkDerivation {
   HIGHLIGHTJS = pkgs.documentation-highlighter;
   XSL = "${pkgs.docbook5_xsl}/xml/xsl";
   RNG = "${pkgs.docbook5}/xml/rng/docbook/docbook.rng";
+  XMLFORMAT_CONFIG = ../nixos/doc/xmlformat.conf;
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
     "--param section.label.includes.component.label 1"
diff --git a/doc/shell.nix b/doc/shell.nix
index 22590142ee1a..e8da2eaf16be 100644
--- a/doc/shell.nix
+++ b/doc/shell.nix
@@ -1,4 +1,5 @@
 { pkgs ? import ../. {} }:
 (import ./default.nix).overrideAttrs (x: {
   buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ];
+
 })
diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf
new file mode 100644
index 000000000000..50255857b24a
--- /dev/null
+++ b/nixos/doc/xmlformat.conf
@@ -0,0 +1,72 @@
+#
+# DocBook Configuration file for "xmlformat"
+# see http://www.kitebird.com/software/xmlformat/
+# 10 Sept. 2004
+#
+
+# Only block elements
+ackno address appendix article biblioentry bibliography bibliomixed \
+biblioset blockquote book bridgehead callout calloutlist caption caution \
+chapter chapterinfo classsynopsis cmdsynopsis colophon constraintdef \
+constructorsynopsis dedication destructorsynopsis entry epigraph equation example \
+figure formalpara funcsynopsis glossary glossdef glossdiv glossentry glosslist \
+glosssee glossseealso graphic graphicco highlights imageobjectco important \
+index indexdiv indexentry indexinfo info informalequation informalexample \
+informalfigure informaltable legalnotice literallayout lot lotentry mediaobject \
+mediaobjectco msgmain msgset note orderedlist para part preface primaryie \
+procedure qandadiv qandaentry qandaset refentry refentrytitle reference \
+refnamediv refsect1 refsect2 refsect3 refsection revhistory screenshot sect1 \
+sect2 sect3 sect4 sect5 section seglistitem set setindex sidebar simpara \
+simplesect step substeps synopfragment synopsis table term title \
+toc variablelist varlistentry warning itemizedlist listitem \
+footnote colspec partintro row simplelist subtitle tbody tgroup thead tip
+  format      block
+  normalize   no
+
+
+#appendix bibliography chapter glossary preface reference
+#  element-break   3
+
+sect1 section
+  element-break   2
+
+
+#
+para abstract
+  format       block
+  entry-break  1
+  exit-break   1
+  normalize    yes
+  wrap-length  79
+
+title
+  format       block
+  normalize = yes
+  entry-break = 0
+  exit-break = 0
+
+# Inline elements
+abbrev accel acronym action application citation citebiblioid citerefentry citetitle \
+classname co code command computeroutput constant country database date email emphasis \
+envar errorcode errorname errortext errortype exceptionname fax filename \
+firstname firstterm footnoteref foreignphrase funcdef funcparams function \
+glossterm group guibutton guiicon guilabel guimenu guimenuitem guisubmenu \
+hardware holder honorific indexterm inlineequation inlinegraphic inlinemediaobject \
+interface interfacename \
+keycap keycode keycombo keysym lineage link literal manvolnum markup medialabel \
+menuchoice methodname methodparam modifier mousebutton olink ooclass ooexception \
+oointerface option optional otheraddr othername package paramdef parameter personname \
+phrase pob postcode productname prompt property quote refpurpose replaceable \
+returnvalue revnumber sgmltag state street structfield structname subscript \
+superscript surname symbol systemitem token trademark type ulink userinput \
+uri varargs varname void wordasword xref year mathphrase member tag
+  format       inline
+
+programlisting screen
+  format       verbatim
+  entry-break = 0
+  exit-break = 0
+
+
+#term
+#  format       inline

From 5c1b3d93bfc70d14fba94afb2e824ab88faa0aef Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 02:43:01 +0000
Subject: [PATCH 0819/3370] netbsd.games: disable some broken linux games

---
 pkgs/os-specific/bsd/netbsd/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index aea0ddac3023..188d9709ee08 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -382,7 +382,7 @@ let
   };
 
 in rec {
-  inherit compat install netBSDDerivation fts make;
+  inherit compat install netBSDDerivation fts;
 
   getent = netBSDDerivation {
     path = "usr.bin/getent";
@@ -441,16 +441,17 @@ in rec {
       disableGame atc
       disableGame dm
       disableGame dab
-      ${lib.optionalString stdenv.isDarwin "disableGame sail"}
-      ${lib.optionalString stdenv.isDarwin "disableGame trek"}
+      disableGame sail
+      disableGame trek
+      ${lib.optionalString stdenv.isLinux "disableGame boggle"}
+      ${lib.optionalString stdenv.isLinux "disableGame hunt"}
+      ${lib.optionalString stdenv.isLinux "disableGame larn"}
+      ${lib.optionalString stdenv.isLinux "disableGame phantasia"}
+      ${lib.optionalString stdenv.isLinux "disableGame rogue"}
       ${lib.optionalString stdenv.isDarwin "disableGame adventure"}
       ${lib.optionalString stdenv.isDarwin "disableGame factor"}
       ${lib.optionalString stdenv.isDarwin "disableGame gomoku"}
       ${lib.optionalString stdenv.isDarwin "disableGame mille"}
-
-      substituteInPlace Makefile.inc \
-        --replace 2555 555 \
-        --replace 2550 550
     '';
 
     # HACK strfile needs to be installed first & in the path. The

From 8838533ec12db36483a6e3aee903075b62b14130 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 22:28:11 -0500
Subject: [PATCH 0820/3370] dejagnu: supports darwin

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

diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix
index 0cb483027c19..b734eadae902 100644
--- a/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/pkgs/development/tools/misc/dejagnu/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/dejagnu/;
     license = licenses.gpl2Plus;
 
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington vrthra ];
   };
 }

From 85e1f22b98a022fb3a3fb0be15bee6771cd81c25 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 22:28:42 -0500
Subject: [PATCH 0821/3370] inetutils: cleanup

- supports darwin (only when servers are disabled)
- pass SUIDMODE= to avoid setuid
- add myself as maintainer
---
 pkgs/tools/networking/inetutils/default.nix | 23 ++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index 04045615a9b4..c050758a8ee3 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, perl, help2man }:
+{ stdenv, lib, fetchurl, ncurses, perl, help2man }:
 
 stdenv.mkDerivation rec {
   name = "inetutils-1.9.4";
@@ -16,25 +16,20 @@ stdenv.mkDerivation rec {
   buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ];
 
   configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ]
-  ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd
+  ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd
     "--disable-rcp"
     "--disable-rsh"
     "--disable-rlogin"
     "--disable-rexec"
-  ];
+  ] ++ lib.optional stdenv.isDarwin  "--disable-servers";
 
   # Test fails with "UNIX socket name too long", probably because our
   # $TMPDIR is too long.
-  #doCheck = true;
+  doCheck = false;
 
+  installFlags = [ "SUIDMODE=" ];
 
-  postInstall = ''
-    # XXX: These programs are normally installed setuid but since it
-    # fails, they end up being non-executable, hence this hack.
-    chmod +x $out/bin/{ping,ping6,${stdenv.lib.optionalString (!stdenv.hostPlatform.isMusl) ''rcp,rlogin,rsh,''}traceroute}
-  '';
-
-  meta = {
+  meta = with lib; {
     description = "Collection of common network programs";
 
     longDescription =
@@ -45,9 +40,9 @@ stdenv.mkDerivation rec {
       '';
 
     homepage = http://www.gnu.org/software/inetutils/;
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ matthewbauer ];
+    platforms = platforms.unix;
   };
 }

From e1bc2fbfdd18ae04343ebe50f736d2601e751b8e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 22:44:14 -0500
Subject: [PATCH 0822/3370] moe: supports darwin

---
 pkgs/applications/editors/moe/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix
index 751b78ab674b..764877a11cb3 100644
--- a/pkgs/applications/editors/moe/default.nix
+++ b/pkgs/applications/editors/moe/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.gnu.org/software/moe/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
 # TODO: a configurable, global moerc file

From 426a9acf1e266308b05975694d2125381b27ae94 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 22:54:42 -0500
Subject: [PATCH 0823/3370] dirmngr: supports darwin

---
 pkgs/tools/security/dirmngr/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/dirmngr/default.nix b/pkgs/tools/security/dirmngr/default.nix
index bd94c6786d77..888fa48eab9a 100644
--- a/pkgs/tools/security/dirmngr/default.nix
+++ b/pkgs/tools/security/dirmngr/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap }:
+{ stdenv, fetchurl, libgpgerror, libgcrypt, libassuan, libksba, pth, openldap
+, libiconv}:
 
 stdenv.mkDerivation rec {
   name = "dirmngr-1.1.1";
@@ -6,9 +7,10 @@ stdenv.mkDerivation rec {
     url = "mirror://gnupg/dirmngr/${name}.tar.bz2";
     sha256 = "1zz6m87ca55nq5f59hzm6qs48d37h93il881y7d0rf2d6660na6j";
   };
-  buildInputs = [ libgpgerror libgcrypt libassuan libksba pth openldap ];
+  buildInputs = [ libgpgerror libgcrypt libassuan libksba
+                  pth openldap libiconv ];
 
   meta = {
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 884babe32431ba40e9aa1d7160bc42daaf926f13 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 23:07:57 -0500
Subject: [PATCH 0824/3370] ballandpaddle: supports darwin

---
 pkgs/games/ball-and-paddle/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix
index 4a7eb9376da7..dbd2814a6fb6 100644
--- a/pkgs/games/ball-and-paddle/default.nix
+++ b/pkgs/games/ball-and-paddle/default.nix
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
 
     maintainers = [ ];
 
-    # The fancy libs aren't available on {Cyg,Dar}win.
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From d424d34bf7faa42277e9ec506647e25128d54eaf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 23:15:33 -0500
Subject: [PATCH 0825/3370] jwhois: supports darwin

- also set license to gpl3
---
 pkgs/tools/networking/jwhois/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix
index cd0821ef9ef5..be8e9e210d15 100644
--- a/pkgs/tools/networking/jwhois/default.nix
+++ b/pkgs/tools/networking/jwhois/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   meta = {
     description = "A client for the WHOIS protocol allowing you to query the owner of a domain name";
     homepage = http://www.gnu.org/software/jwhois/;
-    license = "GPL";
-    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 262fdca5e90eb7fb8d0ca994b834a401dada0acf Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 23:16:14 -0500
Subject: [PATCH 0826/3370] gcal: supports darwin

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

diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix
index 67bb5feff8c7..f3f7fe2aacba 100644
--- a/pkgs/applications/misc/gcal/default.nix
+++ b/pkgs/applications/misc/gcal/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://www.gnu.org/software/gcal/;
     license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];
   };
 }

From 7cbf40808631996d5fca0785026c31e09e4413b1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 23:30:42 -0500
Subject: [PATCH 0827/3370] vcdimager: supports darwin

---
 pkgs/development/libraries/vcdimager/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix
index 77956be3b12e..ddecf4a96a75 100644
--- a/pkgs/development/libraries/vcdimager/default.nix
+++ b/pkgs/development/libraries/vcdimager/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt }:
+{ stdenv, lib, fetchurl, pkgconfig, libcdio, libxml2, popt
+, libiconv, darwin }:
 
 stdenv.mkDerivation rec {
   name = "vcdimager-2.0.1";
@@ -10,14 +11,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libxml2 popt ];
+  buildInputs = [ libxml2 popt libiconv ]
+             ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit DiskArbitration ]);
 
   propagatedBuildInputs = [ libcdio ];
 
   meta = with lib; {
     homepage = http://www.gnu.org/software/vcdimager/;
     description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs";
-    platforms = platforms.gnu ++ platforms.linux; # random choice
+    platforms = platforms.unix;
     license = licenses.gpl2;
   };
 }

From ccaebf04c15ce3b0c8f054d2e48826c68e7cbee0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 30 Apr 2018 23:33:49 -0500
Subject: [PATCH 0828/3370] ocrad: supports darwin

---
 pkgs/applications/graphics/ocrad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix
index d88117916279..2ff62cc9eef2 100644
--- a/pkgs/applications/graphics/ocrad/default.nix
+++ b/pkgs/applications/graphics/ocrad/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
 
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ pSub ];
-    platforms = platforms.gnu ++ platforms.linux;  # arbitrary choice
+    platforms = platforms.unix;
   };
 }

From 038a0c9a603166eada74e930859ccd7e0197f78d Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 30 Apr 2018 20:03:23 -0700
Subject: [PATCH 0829/3370] treewide: http to https

---
 pkgs/applications/audio/gmpc/default.nix                  | 2 +-
 pkgs/applications/graphics/digikam/default.nix            | 2 +-
 pkgs/applications/graphics/dosage/default.nix             | 2 +-
 pkgs/applications/graphics/gimp/plugins/default.nix       | 4 ++--
 pkgs/applications/misc/chirp/default.nix                  | 4 ++--
 pkgs/applications/misc/gramps/default.nix                 | 2 +-
 pkgs/applications/misc/lilyterm/default.nix               | 4 ++--
 .../networking/cluster/kubernetes/default.nix             | 2 +-
 pkgs/applications/networking/ids/snort/default.nix        | 2 +-
 .../networking/instant-messengers/franz/default.nix       | 2 +-
 pkgs/applications/networking/irc/irssi/default.nix        | 2 +-
 pkgs/applications/video/mpv/default.nix                   | 4 ++--
 pkgs/applications/window-managers/i3/default.nix          | 2 +-
 pkgs/applications/window-managers/i3/status.nix           | 2 +-
 pkgs/desktops/gnome-3/core/gnome-menus/default.nix        | 2 +-
 pkgs/development/compilers/hhvm/default.nix               | 2 +-
 pkgs/development/libraries/LASzip/default.nix             | 2 +-
 pkgs/development/libraries/fcppt/default.nix              | 2 +-
 pkgs/development/libraries/libLAS/default.nix             | 2 +-
 pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix      | 2 +-
 pkgs/development/libraries/libmsgpack/generic.nix         | 2 +-
 pkgs/development/libraries/liboil/default.nix             | 2 +-
 pkgs/development/libraries/libssh2/default.nix            | 2 +-
 pkgs/development/libraries/movit/default.nix              | 2 +-
 .../tools/analysis/include-what-you-use/default.nix       | 2 +-
 pkgs/development/tools/build-managers/cmake/2.8.nix       | 8 ++++----
 pkgs/development/tools/castxml/default.nix                | 2 +-
 pkgs/development/tools/gauge/default.nix                  | 2 +-
 pkgs/games/assaultcube/default.nix                        | 2 +-
 pkgs/misc/emulators/emulationstation/default.nix          | 2 +-
 pkgs/servers/firebird/default.nix                         | 2 +-
 pkgs/servers/xmpp/ejabberd/default.nix                    | 4 ++--
 pkgs/tools/backup/burp/default.nix                        | 2 +-
 pkgs/tools/filesystems/bindfs/default.nix                 | 2 +-
 pkgs/tools/filesystems/irods/common.nix                   | 2 +-
 pkgs/tools/misc/gparted/default.nix                       | 2 +-
 pkgs/tools/networking/easyrsa/2.x.nix                     | 2 +-
 pkgs/tools/networking/easyrsa/default.nix                 | 2 +-
 pkgs/tools/networking/openvpn/default.nix                 | 4 ++--
 pkgs/tools/security/clamav/default.nix                    | 2 +-
 pkgs/tools/security/mpw/default.nix                       | 2 +-
 41 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index c2adc58f9ce5..099e4428016e 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = http://gmpclient.org;
+    homepage = https://gmpclient.org;
     description = "A GTK2 frontend for Music Player Daemon";
     license = licenses.gpl2;
     maintainers = [ maintainers.rickynils ];
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 633a1d9bd6e6..5c6a4bab9306 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -116,7 +116,7 @@ mkDerivation rec {
   meta = with lib; {
     description = "Photo Management Program";
     license = licenses.gpl2;
-    homepage = http://www.digikam.org;
+    homepage = https://www.digikam.org;
     maintainers = with maintainers; [ the-kenny ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index f95370e39e72..4bc0e93a3b46 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -23,6 +23,6 @@ pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "A comic strip downloader and archiver";
-    homepage = http://dosage.rocks/;
+    homepage = https://dosage.rocks/;
   };
 }
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 01d086cc4ed4..5b21b349764b 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -43,7 +43,7 @@ rec {
     */
     name = "gap-2.6.0";
     src = fetchurl {
-      url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
+      url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
       sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
     };
     patchPhase = ''
@@ -53,7 +53,7 @@ rec {
     hardeningDisable = [ "format" ];
     meta = with stdenv.lib; {
       description = "The GIMP Animation Package";
-      homepage = http://www.gimp.org;
+      homepage = https://www.gimp.org;
       # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license
       # falls inside "free".
       license = with licenses; [ gpl3 free ];
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 22d659dd10e4..b8fc63c2c9ed 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "20180412";
 
   src = fetchurl {
-    url = "http://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
+    url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
     sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9";
   };
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free, open-source tool for programming your amateur radio";
-    homepage = http://chirp.danplanet.com/;
+    homepage = https://chirp.danplanet.com/;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.the-kenny ];
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 5f219dc4752c..50f575d15cec 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -51,7 +51,7 @@ in buildPythonApplication rec {
 
   meta = with stdenv.lib; {
     description = "Genealogy software";
-    homepage = http://gramps-project.org;
+    homepage = https://gramps-project.org;
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix
index 36527cdbe7c3..662ca9761fb2 100644
--- a/pkgs/applications/misc/lilyterm/default.nix
+++ b/pkgs/applications/misc/lilyterm/default.nix
@@ -15,7 +15,7 @@ let
     then rec {
         version = "0.9.9.4";
         src = fetchurl {
-          url = "http://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz";
+          url = "https://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz";
           sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp";
         };
       }
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     longDescription = ''
       LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight.
     '';
-    homepage = http://lilyterm.luna.com.tw/;
+    homepage = https://lilyterm.luna.com.tw/;
     license = licenses.gpl3;
     maintainers = with maintainers; [ AndersonTorres Profpatsch ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 2b5554353270..1a7ba3cf93df 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Production-Grade Container Scheduling and Management";
     license = licenses.asl20;
-    homepage = http://kubernetes.io;
+    homepage = https://kubernetes.io;
     maintainers = with maintainers; [offline];
     platforms = platforms.unix;
   };
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index e3a917a12eb3..ff19a62ef306 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   
   meta = {
     description = "Network intrusion prevention and detection system (IDS/IPS)";
-    homepage = http://www.snort.org;
+    homepage = https://www.snort.org;
     maintainers = with stdenv.lib.maintainers; [ aycanirican ];
     license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index c2e6528e637e..95e01e586ec2 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A free messaging app that combines chat & messaging services into one application";
-    homepage = http://meetfranz.com;
+    homepage = https://meetfranz.com;
     license = licenses.free;
     maintainers = [ maintainers.gnidorah ];
     platforms = ["i686-linux" "x86_64-linux"];
diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index b03673a00b66..b5bab3585c5f 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage    = http://irssi.org;
+    homepage    = https://irssi.org;
     description = "A terminal based IRC client";
     platforms   = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 421e0dbb8a39..aa17cf183e34 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -77,7 +77,7 @@ let
   # for purity reasons this behavior should be avoided.
   wafVersion = "1.9.15";
   waf = fetchurl {
-    urls = [ "http://waf.io/waf-${wafVersion}"
+    urls = [ "https://waf.io/waf-${wafVersion}"
              "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ];
     sha256 = "0qrnlv91cb0v221w8a0fi4wxm99q2hpz10rkyyk4akcsvww6xrw5";
   };
@@ -200,7 +200,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
-    homepage = http://mpv.io;
+    homepage = https://mpv.io;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ AndersonTorres fuuzetsu fpletz ];
     platforms = platforms.darwin ++ platforms.linux;
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 46c87b0b189e..986639c947b0 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A tiling window manager";
-    homepage    = "http://i3wm.org";
+    homepage    = "https://i3wm.org";
     maintainers = with maintainers; [ garbas modulistic fpletz ];
     license     = licenses.bsd3;
     platforms   = platforms.all;
diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index b54f6e8def33..fa964e86974b 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A tiling window manager";
-    homepage = http://i3wm.org;
+    homepage = https://i3wm.org;
     maintainers = [ stdenv.lib.maintainers.garbas ];
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
index fdd23d134599..8a316b60f025 100644
--- a/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-menus/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ intltool glib gobjectIntrospection ];
 
   meta = {
-    homepage = http://www.gnome.org;
+    homepage = https://www.gnome.org;
     description = "Gnome menu specification";
 
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 1cb28118ccbe..749e4125a0b3 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "High-performance JIT compiler for PHP/Hack";
-    homepage    = "http://hhvm.com";
+    homepage    = "https://hhvm.com";
     license     = "PHP/Zend";
     platforms   = [ "x86_64-linux" ];
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix
index 384178d2c8df..4a166242eb3a 100644
--- a/pkgs/development/libraries/LASzip/default.nix
+++ b/pkgs/development/libraries/LASzip/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Turn quickly bulky LAS files into compact LAZ files without information loss";
-    homepage = http://www.laszip.org;
+    homepage = https://www.laszip.org;
     license = stdenv.lib.licenses.lgpl2;
     maintainers = [ stdenv.lib.maintainers.michelk ];
     platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix
index c4332df5a3db..660cdfa6414b 100644
--- a/pkgs/development/libraries/fcppt/default.nix
+++ b/pkgs/development/libraries/fcppt/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       programming (which is both efficient and syntactically affordable in
       C++11).
     '';
-    homepage = http://fcppt.org;
+    homepage = https://fcppt.org;
     license = licenses.boost;
     maintainers = with maintainers; [ pmiddend ];
     platforms = platforms.linux;
diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix
index 272a9774a7f4..1e7720b0656a 100644
--- a/pkgs/development/libraries/libLAS/default.nix
+++ b/pkgs/development/libraries/libLAS/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset";
-    homepage = http://www.liblas.org;
+    homepage = https://www.liblas.org;
     license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.michelk ];
diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
index 75cf69035cbe..9c25757efb03 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "libdbusmenu-qt-0.9.3+14";
 
   src = fetchbzr {
-    url = "http://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk";
+    url = "https://bazaar.launchpad.net/~dbusmenu-team/libdbusmenu-qt/trunk";
     rev = "ps-jenkins@lists.canonical.com-20140619090718-mppiiax5atpnb8i2";
     sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd";
   };
diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix
index 7bca8f21c6b9..889ef1347732 100644
--- a/pkgs/development/libraries/libmsgpack/generic.nix
+++ b/pkgs/development/libraries/libmsgpack/generic.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "MessagePack implementation for C and C++";
-    homepage    = http://msgpack.org;
+    homepage    = https://msgpack.org;
     license     = licenses.asl20;
     maintainers = with maintainers; [ redbaron wkennington ];
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix
index a8d2953cad00..fb2dad605252 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A library of simple functions that are optimized for various CPUs";
-    homepage    = http://liboil.freedesktop.org;
+    homepage    = https://liboil.freedesktop.org;
     license     = licenses.bsd2;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.all;
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 4d754dc80866..a09a76707390 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A client-side C library implementing the SSH2 protocol";
-    homepage = http://www.libssh2.org;
+    homepage = https://www.libssh2.org;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ ];
   };
diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix
index 3766140eea1e..b5188cb66d29 100644
--- a/pkgs/development/libraries/movit/default.nix
+++ b/pkgs/development/libraries/movit/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "High-performance, high-quality video filters for the GPU";
-    homepage = http://movit.sesse.net;
+    homepage = https://movit.sesse.net;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index ec4d19423e6d..9aac638d0a80 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       actually needed for this file (for both .cc and .h files), and by
       replacing #includes with forward-declares when possible.
     '';
-    homepage = http://include-what-you-use.org;
+    homepage = https://include-what-you-use.org;
     license = licenses.bsd3;
     platforms = platforms.unix;
   };
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index 5fcd6b341653..e014276cd670 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -28,16 +28,16 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches =
-    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
+    [(fetchpatch { # see https://www.cmake.org/Bug/view.php?id=13959
       name = "FindFreetype-2.5.patch";
-      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
+      url = "https://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
       sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
     })] ++
     # Don't search in non-Nix locations such as /usr, but do search in our libc.
     [ ./search-path.patch ] ++
     optional (hostPlatform != buildPlatform) (fetchurl {
       name = "fix-darwin-cross-compile.patch";
-      url = "http://public.kitware.com/Bug/file_download.php?"
+      url = "https://public.kitware.com/Bug/file_download.php?"
           + "file_id=4981&type=bug";
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
     });
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = http://www.cmake.org/;
+    homepage = https://cmake.org;
     description = "Cross-Platform Makefile Generator";
     platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ ];
diff --git a/pkgs/development/tools/castxml/default.nix b/pkgs/development/tools/castxml/default.nix
index f8389786b9da..f42adffc5f42 100644
--- a/pkgs/development/tools/castxml/default.nix
+++ b/pkgs/development/tools/castxml/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.kitware.com;
+    homepage = https://www.kitware.com;
     license = licenses.asl20;
     description = "Abstract syntax tree XML output tool";
     platforms = platforms.unix;
diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix
index 58bc24e1ec64..12152e988669 100644
--- a/pkgs/development/tools/gauge/default.nix
+++ b/pkgs/development/tools/gauge/default.nix
@@ -16,7 +16,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
    description = "Light weight cross-platform test automation";
-   homepage    = http://gauge.org;
+   homepage    = https://gauge.org;
    license     = licenses.gpl3;
    maintainers = [ maintainers.vdemeester ];
    platforms   = platforms.unix;
diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix
index cef48978b6d0..6f742bb64f79 100644
--- a/pkgs/games/assaultcube/default.nix
+++ b/pkgs/games/assaultcube/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Fast and fun first-person-shooter based on the Cube fps";
-    homepage = http://assault.cubers.net;
+    homepage = https://assault.cubers.net;
     maintainers = [ maintainers.genesis ];
     platforms = platforms.linux; # should work on darwin with a little effort.
     license = stdenv.lib.licenses.zlib;
diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix
index 16cb7af3d600..9dec1ecacae0 100644
--- a/pkgs/misc/emulators/emulationstation/default.nix
+++ b/pkgs/misc/emulators/emulationstation/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes";
-    homepage = http://emulationstation.org;
+    homepage = https://emulationstation.org;
     maintainers = [ stdenv.lib.maintainers.edwtjo ];
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix
index da54936092b3..24ed1dffd4d8 100644
--- a/pkgs/servers/firebird/default.nix
+++ b/pkgs/servers/firebird/default.nix
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "SQL relational database management system";
-    homepage = http://www.firebirdnews.org;
+    homepage = https://www.firebirdnews.org;
     license = ["IDPL" "Interbase-1.0"];
     maintainers = [stdenv.lib.maintainers.marcweber];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index f95b5efe3d38..6a0bedeab260 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
   name = "ejabberd-${version}";
 
   src = fetchurl {
-    url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
+    url = "https://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
     sha256 = "01i2n8mlgw293jdf4172f9q8ca8m35vysjws791p7nynpfdb4cn6";
   };
 
@@ -111,7 +111,7 @@ in stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Open-source XMPP application server written in Erlang";
     license = licenses.gpl2;
-    homepage = http://www.ejabberd.im;
+    homepage = https://www.ejabberd.im;
     platforms = platforms.linux;
     maintainers = with maintainers; [ sander abbradar ];
     broken = withElixir;
diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix
index c079d8272b12..4133478dbf98 100644
--- a/pkgs/tools/backup/burp/default.nix
+++ b/pkgs/tools/backup/burp/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "BURP - BackUp and Restore Program";
-    homepage    = http://burp.grke.org;
+    homepage    = https://burp.grke.org;
     license     = licenses.agpl3;
     maintainers = with maintainers; [ tokudan ];
     platforms   = platforms.all;
diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index a83ee771d699..1499e81b624e 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A FUSE filesystem for mounting a directory to another location";
-    homepage    = http://bindfs.org;
+    homepage    = https://bindfs.org;
     license     = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ lovek323 ];
     platforms   = stdenv.lib.platforms.unix;
diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix
index c7267aca1071..902d7d7d1a1e 100644
--- a/pkgs/tools/filesystems/irods/common.nix
+++ b/pkgs/tools/filesystems/irods/common.nix
@@ -47,7 +47,7 @@ with stdenv;
       important in data management. The development infrastructure supports exhaustive
       testing on supported platforms; plug-in support for microservices, storage resources,
       drivers, and databases; and extensive documentation, training and support services.'';
-    homepage = http://irods.org;
+    homepage = https://irods.org;
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.bzizou ];
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index 451bcae1efd1..ca078c16ab6b 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
       partitions. GParted enables you to change the partition organization
       while preserving the partition contents.
     '';
-    homepage = http://gparted.org;
+    homepage = https://gparted.org;
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix
index b33034515fb6..3c6c5f3d2992 100644
--- a/pkgs/tools/networking/easyrsa/2.x.nix
+++ b/pkgs/tools/networking/easyrsa/2.x.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple shell based CA utility";
-    homepage = http://openvpn.net/;
+    homepage = https://openvpn.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.offline ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index 59d97a4a18b6..fcc6c1d86bdf 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Simple shell based CA utility";
-    homepage = http://openvpn.net/;
+    homepage = https://openvpn.net/;
     license = licenses.gpl2;
     maintainers = [ maintainers.offline ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index d96652e456df..358c53f453bb 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "2.4.6";
 
   src = fetchurl {
-    url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz";
+    url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz";
     sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g";
   };
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A robust and highly flexible tunneling application";
-    homepage = http://openvpn.net/;
+    homepage = https://openvpn.net/;
     downloadPage = "https://openvpn.net/index.php/open-source/downloads.html";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.viric ];
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 8c12e4e30c3e..c3aa92bf4b01 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.clamav.net;
+    homepage = https://www.clamav.net;
     description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";
     license = licenses.gpl2;
     maintainers = with maintainers; [ phreedom robberer qknight fpletz ];
diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix
index 3e1e3a882839..0994c649c83e 100644
--- a/pkgs/tools/security/mpw/default.nix
+++ b/pkgs/tools/security/mpw/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://masterpasswordapp.com/;
+    homepage = https://masterpasswordapp.com/;
     description = "A stateless password management solution";
     license = licenses.gpl3;
     platforms = platforms.unix;

From 1beb4236a21f2e9e7adcad1aa97191a4420295da Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 00:07:39 -0500
Subject: [PATCH 0830/3370] gpa: supports darwin

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

diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix
index ef805a31567a..149092c70d38 100644
--- a/pkgs/applications/misc/gpa/default.nix
+++ b/pkgs/applications/misc/gpa/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "Graphical user interface for the GnuPG";
     homepage = https://www.gnupg.org/related_software/gpa/;
     license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 0c3efb9ba05828822ba61105aead64ee3d6dd12c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 1 May 2018 01:13:44 -0400
Subject: [PATCH 0831/3370] openssl: Support iOS cross compilation (in theory)

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 5a9052222cb8..1eac225387d2 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -48,6 +48,8 @@ let
           then "./Configure mingw${toString hostPlatform.parsed.cpu.bits}"
         else if hostPlatform.isLinux
           then "./Configure linux-generic${toString hostPlatform.parsed.cpu.bits}"
+        else if hostPlatform.isiOS
+          then "./Configure ios${toString hostPlatform.parsed.cpu.bits}-cross"
         else
           throw "Not sure what configuration to use for ${hostPlatform.config}"
       );

From 9a845de873dfcc31f360a08f1b1f786c6f649c7d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 1 May 2018 01:14:58 -0400
Subject: [PATCH 0832/3370] lib/systems: Update iOS examples

The commented-out configs are @shlevy's old known-good ones. I changed
them as needed to play nice with lib.systems.parse but did not test so
leaving them as comments for now.
---
 lib/systems/examples.nix | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 848737700b0b..e229cccb365c 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -88,16 +88,36 @@ rec {
   #
 
   iphone64 = {
-    config = "aarch64-apple-darwin14";
-    arch = "arm64";
-    libc = "libSystem";
+    config = "aarch64-apple-ios";
+    # config = "aarch64-apple-darwin14";
+    sdkVer = "10.2";
+    useiOSPrebuilt = true;
     platform = {};
   };
 
   iphone32 = {
-    config = "arm-apple-darwin10";
-    arch = "armv7-a";
-    libc = "libSystem";
+    config = "armv7-apple-ios";
+    # config = "arm-apple-darwin10";
+    sdkVer = "10.2";
+    useiOSPrebuilt = true;
+    platform = {};
+  };
+
+  iphone64-simulator = {
+    config = "x86_64-apple-ios";
+    # config = "x86_64-apple-darwin14";
+    sdkVer = "10.2";
+    useiOSPrebuilt = true;
+    isiPhoneSimulator = true;
+    platform = {};
+  };
+
+  iphone32-simulator = {
+    config = "i686-apple-ios";
+    # config = "i386-apple-darwin11";
+    sdkVer = "10.2";
+    useiOSPrebuilt = true;
+    isiPhoneSimulator = true;
     platform = {};
   };
 

From 57a4db244995c9852cf5a202bd7540a5c1e7c410 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 00:45:05 -0500
Subject: [PATCH 0833/3370] pspp: supports darwin

---
 pkgs/applications/science/math/pspp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix
index 486a2e69d264..957a4cf64211 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
       more traditional syntax commands.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 24761ef5d4a48be1ddd409db7604b8718fc9de56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 23:08:21 -0700
Subject: [PATCH 0834/3370] atlas: 3.10.2 -> 3.10.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/atlas/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.10.3 with grep in /nix/store/bgqampvgm3zdncg3206n7qnvyvl0jipj-atlas-3.10.3
- directory tree listing: https://gist.github.com/a7dd287df10b13796423e3c2df0850eb
---
 pkgs/development/libraries/science/math/atlas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 8cca5565bf6f..8b740bdb6f6d 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -47,7 +47,7 @@ let
   inherit (stdenv.lib) optional optionalString;
   # Don't upgrade until https://github.com/math-atlas/math-atlas/issues/44
   # is resolved.
-  version = "3.10.2";
+  version = "3.10.3";
 in
 
 stdenv.mkDerivation {
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/math-atlas/atlas${version}.tar.bz2";
-    sha256 = "0bqh4bdnjdyww4mcpg6kn0x7338mfqbdgysn97dzrwwb26di7ars";
+    sha256 = "1dyjlq3fiparvm8ypwk6rsmjzmnwk81l88gkishphpvc79ryp216";
   };
 
   buildInputs = [ gfortran ];

From d13572817e30bddff97979c93aebc27a7cacb2ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 23:32:00 -0700
Subject: [PATCH 0835/3370] adapta-gtk-theme: 3.93.0.258 -> 3.93.1.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/5796929fde76fddc1465d9cfbc2ace7b
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index c0c67eeb6abe..f524c7d95792 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.0.258";
+  version = "3.93.1.1";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "114rryaqr97f7qlwxn3fdspzigxx1jgpsbhypdn265511rsh30hx";
+    sha256 = "00k67qpq62swz7p6dk4g8ak31h97lxyddpyr6xii1jpbygwkk9zc";
   };
 
   preferLocalBuild = true;

From 152454d9875cc1df645c5aa01ec41451d985199f Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 1 May 2018 07:36:35 +0100
Subject: [PATCH 0836/3370] nixos-install manual: remove --chroot option

This option has been removed from the tool in favour of nixos-enter.
---
 nixos/doc/manual/man-nixos-install.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index c9887146989b..d6e70d16098b 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -57,9 +57,6 @@
     <arg>
       <arg choice='plain'><option>--show-trace</option></arg>
     </arg>
-    <arg>
-      <arg choice='plain'><option>--chroot</option></arg>
-    </arg>
     <arg>
       <arg choice='plain'><option>--help</option></arg>
     </arg>
@@ -177,14 +174,6 @@ it.</para>
     </listitem>
   </varlistentry>
 
-  <varlistentry>
-    <term><option>--chroot</option></term>
-    <listitem>
-      <para>Chroot into given installation. Any additional arguments passed are going to be executed inside the chroot.
-      </para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry>
     <term><option>--help</option></term>
     <listitem>

From 800c46b24bda32efbc30faf6c7fcf63b1f8758ff Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 30 Apr 2018 23:45:30 -0700
Subject: [PATCH 0837/3370] dolphinEmuMaster: 20171218 -> 20180430

also fix build
---
 pkgs/misc/emulators/dolphin-emu/master.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index e2bac5d3884c..5d4e22fefae3 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib
-, pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline
+, pcre, gettext, libpthreadstubs, libXrandr, libXext, libXxf86vm, libXinerama, libSM, readline
 , openal, libXdmcp, portaudio, libusb, libevdev
 , libpulseaudio ? null
 , curl
@@ -20,12 +20,12 @@ assert dolphin-wxgui || dolphin-qtgui;
 assert !(dolphin-wxgui && dolphin-qtgui);
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20171218";
+  name = "dolphin-emu-20180430";
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa";
-    sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc";
+    rev = "ad098283c023b0f5f0d314c646bc5d5756c35e3d";
+    sha256 = "17fv3vz0nc5jax1bbl4wny1kzsshbbhms82dxd8rzcwwvd2ad1g7";
   };
 
   cmakeFlags = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre
-                  gettext libpthreadstubs libXrandr libXext libSM readline openal
+                  gettext libpthreadstubs libXrandr libXext libXxf86vm libXinerama libSM readline openal
                   libXdmcp portaudio libusb libpulseaudio libpng hidapi
                 ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ]
                   ++ stdenv.lib.optionals stdenv.isLinux  [ bluez libevdev  ]

From 79897e15ab405c884b864b9196e0f9d94cd2cf43 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 30 Apr 2018 20:50:34 +0200
Subject: [PATCH 0838/3370] LTS Haskell 11.7

---
 .../configuration-hackage2nix.yaml            | 54 ++++++++++---------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 5e12e90a3c3d..6b18694dc8d1 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.6
+  # LTS Haskell 11.7
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -141,7 +141,7 @@ default-package-overrides:
   - avwx ==0.3.0.2
   - axiom ==0.4.6
   - b9 ==0.5.47
-  - backprop ==0.1.5.1
+  - backprop ==0.1.5.2
   - bank-holidays-england ==0.1.0.6
   - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
@@ -157,7 +157,7 @@ default-package-overrides:
   - basic-prelude ==0.7.0
   - bbdb ==0.8
   - bcrypt ==0.0.11
-  - beam-core ==0.7.2.0
+  - beam-core ==0.7.2.1
   - beam-migrate ==0.3.1.0
   - beam-sqlite ==0.3.2.0
   - bench ==1.0.9
@@ -242,7 +242,7 @@ default-package-overrides:
   - buffer-pipe ==0.0
   - butcher ==1.3.0.0
   - bv ==0.5
-  - bv-little ==0.1.0.0
+  - bv-little ==0.1.1
   - byteable ==0.1.1
   - bytedump ==1.0
   - byteorder ==1.0.4
@@ -306,7 +306,7 @@ default-package-overrides:
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
-  - cisco-spark-api ==0.1.0.2
+  - cisco-spark-api ==0.1.0.3
   - clang-compilation-database ==0.1.0.1
   - classyplate ==0.3.0.2
   - classy-prelude ==1.4.0
@@ -400,7 +400,7 @@ default-package-overrides:
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
   - cryptocompare ==0.1.1
-  - crypto-enigma ==0.0.2.11
+  - crypto-enigma ==0.0.2.12
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -670,7 +670,7 @@ default-package-overrides:
   - foundation ==0.0.20
   - FPretty ==1.1
   - Frames ==0.3.0.2
-  - free ==5.0.1
+  - free ==5.0.2
   - freenect ==1.2.1
   - freer-simple ==1.1.0.0
   - freetype2 ==0.1.2
@@ -800,12 +800,12 @@ default-package-overrides:
   - haddock-library ==1.4.5
   - hailgun ==0.4.1.6
   - hailgun-simple ==0.1.0.0
-  - hakyll ==4.12.1.0
+  - hakyll ==4.12.2.0
   - half ==0.2.2.3
   - hamilton ==0.1.0.2
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.4
+  - hapistrano ==0.3.5.5
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.1
   - happstack-server-tls ==7.1.6.5
@@ -906,7 +906,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - hocilib ==0.2.0
   - Hoed ==0.5.1
-  - hOpenPGP ==2.6
+  - hOpenPGP ==2.6.1
   - hopfli ==0.2.2.1
   - hosc ==0.16
   - hostname ==1.0
@@ -931,8 +931,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - hset ==2.2.0
   - HSet ==0.0.1
+  - hset ==2.2.0
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -1013,7 +1013,7 @@ default-package-overrides:
   - hw-mquery ==0.1.0.1
   - hworker ==0.1.0.1
   - hw-parser ==0.0.0.3
-  - hw-prim ==0.5.0.2
+  - hw-prim ==0.5.0.3
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.2.0.2
   - hw-string-parse ==0.0.0.4
@@ -1046,7 +1046,7 @@ default-package-overrides:
   - immortal ==0.2.2.1
   - imprint ==0.0.1.0
   - include-file ==0.1.0.3
-  - incremental-parser ==0.2.5.3
+  - incremental-parser ==0.2.5.4
   - indentation-core ==0.0.0.1
   - indentation-parsec ==0.0.0.1
   - indents ==0.4.0.1
@@ -1285,6 +1285,7 @@ default-package-overrides:
   - mime-mail-ses ==0.4.1
   - mime-types ==0.1.0.7
   - minimorph ==0.1.6.1
+  - minio-hs ==1.0.0
   - miniutter ==0.4.7.0
   - mintty ==0.1.1
   - misfortune ==0.1.1.2
@@ -1468,7 +1469,7 @@ default-package-overrides:
   - pagination ==0.2.1
   - palette ==0.1.0.5
   - pandoc ==2.1.2
-  - pandoc-citeproc ==0.14.3
+  - pandoc-citeproc ==0.14.3.1
   - pandoc-types ==1.17.3.1
   - pango ==0.13.5.0
   - papillon ==0.1.0.5
@@ -1507,7 +1508,7 @@ default-package-overrides:
   - perf ==0.3.1.1
   - perfect-hash-generator ==0.2.0.6
   - persistable-record ==0.6.0.3
-  - persistable-types-HDBC-pg ==0.0.1.5
+  - persistable-types-HDBC-pg ==0.0.3.2
   - persistent ==2.8.2
   - persistent-mongoDB ==2.8.0
   - persistent-mysql ==2.8.1
@@ -1753,8 +1754,8 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1887,6 +1888,7 @@ default-package-overrides:
   - Spock-core ==0.12.0.0
   - Spock-lucid ==0.4.0.1
   - Spock-worker ==0.3.1.0
+  - spoon ==0.3.1
   - spreadsheet ==0.1.3.7
   - sqlite-simple ==0.4.15.0
   - sql-words ==0.1.6.0
@@ -2012,7 +2014,7 @@ default-package-overrides:
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
   - testing-feat ==0.4.0.3
-  - texmath ==0.10.1.1
+  - texmath ==0.10.1.2
   - text ==1.2.3.0
   - text-binary ==0.2.1.1
   - text-conversions ==0.3.0
@@ -2140,8 +2142,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - Unique ==0.4.7.2
   - unique ==0
+  - Unique ==0.4.7.2
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2154,7 +2156,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.6.0
+  - unliftio ==0.2.7.0
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2232,7 +2234,7 @@ default-package-overrides:
   - wai-middleware-prometheus ==0.3.0
   - wai-middleware-rollbar ==0.10.0
   - wai-middleware-static ==0.8.2
-  - wai-middleware-throttle ==0.2.2.0
+  - wai-middleware-throttle ==0.2.2.1
   - wai-predicates ==0.10.0
   - wai-route ==0.3.1.2
   - wai-routing ==0.13.0
@@ -2241,7 +2243,7 @@ default-package-overrides:
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
   - wai-websockets ==3.0.1.2
-  - warp ==3.2.19
+  - warp ==3.2.22
   - warp-tls ==3.2.4.3
   - wave ==0.1.5
   - wavefront ==0.7.1.2
@@ -2264,7 +2266,7 @@ default-package-overrides:
   - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.2.0
-  - wild-bind-x11 ==0.2.0.2
+  - wild-bind-x11 ==0.2.0.3
   - Win32 ==2.5.4.1
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
@@ -2341,13 +2343,13 @@ default-package-overrides:
   - yesod-auth ==1.6.3
   - yesod-auth-fb ==1.9.0
   - yesod-auth-hashdb ==1.7
-  - yesod-bin ==1.6.0
-  - yesod-core ==1.6.3
+  - yesod-bin ==1.6.0.2
+  - yesod-core ==1.6.4
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0
   - yesod-form ==1.6.1
-  - yesod-form-bootstrap4 ==0.1.0.2
+  - yesod-form-bootstrap4 ==0.1.1
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.0.0
   - yesod-newsfeed ==1.6.1.0
@@ -2356,7 +2358,7 @@ default-package-overrides:
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0
   - yesod-table ==2.0.3
-  - yesod-test ==1.6.2
+  - yesod-test ==1.6.3
   - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
   - yi-core ==0.17.1

From e9c955fb8477c30f0e9bbf9f9f96065e38dd81d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 29 Apr 2018 02:30:52 +0200
Subject: [PATCH 0839/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/4fb888414b6e1d312df6e38bc41ee5289154aeeb.
---
 .../haskell-modules/hackage-packages.nix      | 1324 ++++++++---------
 1 file changed, 631 insertions(+), 693 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8b035359730b..f3ea3b8954f5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -13317,6 +13317,27 @@ self: {
        license = "unknown";
      }) {};
 
+  "Network-NineP_0_4_3" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, convertible
+     , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl
+     , network, NineP, regex-posix, stateref, transformers
+     }:
+     mkDerivation {
+       pname = "Network-NineP";
+       version = "0.4.3";
+       sha256 = "1hsfcicijzqy7vxvknxxq9qa4qx3d1smg6mw4mpvk46nvxny8sc1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers convertible exceptions hslogger
+         monad-loops monad-peel mstate mtl network NineP regex-posix
+         stateref transformers
+       ];
+       description = "High-level abstraction over 9P protocol";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "NewBinary" = callPackage
     ({ mkDerivation, array, base, integer }:
      mkDerivation {
@@ -30450,8 +30471,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.10.0.11";
-       sha256 = "09c2nldzaqm8a203gqk6lc81gfhmvz30pxicxi9g1971y1q0nklj";
+       version = "2.10.0.20";
+       sha256 = "0k73jcj2za79wvb6nki1k02d6rj7zrnl0vz494ajh4d96gwdwacp";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -30463,8 +30484,8 @@ self: {
          zip-archive zlib
        ];
        executableHaskellDepends = [
-         base composition-prelude directory lens optparse-applicative shake
-         shake-ats temporary text
+         base composition-prelude directory lens optparse-applicative
+         parallel-io shake shake-ats temporary text
        ];
        homepage = "https://github.com/vmchale/atspkg#readme";
        description = "A build tool for ATS";
@@ -32486,29 +32507,6 @@ self: {
      }) {};
 
   "backprop" = callPackage
-    ({ mkDerivation, base, bifunctors, binary, criterion, deepseq
-     , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
-     , primitive, reflection, time, transformers, type-combinators
-     , vector
-     }:
-     mkDerivation {
-       pname = "backprop";
-       version = "0.1.5.1";
-       sha256 = "1jii5nwnkh44jxxyfkgm14695ah7p3rpbydcgj84g5ijmhdnmks0";
-       libraryHaskellDepends = [
-         base binary deepseq microlens primitive reflection transformers
-         type-combinators vector
-       ];
-       benchmarkHaskellDepends = [
-         base bifunctors criterion deepseq directory hmatrix lens mnist-idx
-         mwc-random time transformers vector
-       ];
-       homepage = "https://github.com/mstksg/backprop#readme";
-       description = "Heterogeneous automatic differentation (backpropagation)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "backprop_0_1_5_2" = callPackage
     ({ mkDerivation, base, bifunctors, binary, criterion, deepseq
      , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
      , primitive, random, reflection, time, transformers
@@ -32529,7 +32527,6 @@ self: {
        homepage = "https://github.com/mstksg/backprop#readme";
        description = "Heterogeneous automatic differentation (backpropagation)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -33822,28 +33819,6 @@ self: {
      }) {};
 
   "beam-core" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, dlist, free
-     , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty
-     , tasty-hunit, text, time, vector-sized
-     }:
-     mkDerivation {
-       pname = "beam-core";
-       version = "0.7.2.0";
-       sha256 = "1m3jyz1wh9g14cv5nyklqi6v8rqxi73xnppk308lrjh00iwrvgvb";
-       libraryHaskellDepends = [
-         aeson base bytestring containers dlist free ghc-prim hashable
-         microlens mtl network-uri tagged text time vector-sized
-       ];
-       testHaskellDepends = [
-         base bytestring tasty tasty-hunit text time
-       ];
-       homepage = "http://travis.athougies.net/projects/beam.html";
-       description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "beam-core_0_7_2_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, dlist, free
      , ghc-prim, hashable, microlens, mtl, network-uri, tagged, tasty
      , tasty-hunit, text, time, vector-sized
@@ -39185,7 +39160,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_36_2" = callPackage
+  "brick_0_36_3" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -39193,8 +39168,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.36.2";
-       sha256 = "0zzd3lwlb60n3zdcyyqf89b066337f6qny5m4clf1fbvqiw7g771";
+       version = "0.36.3";
+       sha256 = "1j53pj4axgyah3qj9zkaicbccmypm8cjfrpdjzarpcnb1za9y60n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40295,29 +40270,6 @@ self: {
      }) {};
 
   "bv-little" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp
-     , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "bv-little";
-       version = "0.1.0.0";
-       sha256 = "0gll7czp8xcm8lcvlxqxfx1gn8wj6cvqm5c9xh0g1s445ykrs93w";
-       libraryHaskellDepends = [
-         base deepseq hashable integer-gmp mono-traversable primitive
-         QuickCheck
-       ];
-       testHaskellDepends = [
-         base hashable mono-traversable QuickCheck tasty tasty-hunit
-         tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/recursion-ninja/bv-little";
-       description = "Efficient little-endian bit vector library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bv-little_0_1_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hashable, integer-gmp
      , mono-traversable, primitive, QuickCheck, tasty, tasty-hunit
      , tasty-quickcheck
@@ -40338,7 +40290,6 @@ self: {
        homepage = "https://github.com/recursion-ninja/bv-little";
        description = "Efficient little-endian bit vector library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv-sized" = callPackage
@@ -41330,8 +41281,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.36.2";
-       sha256 = "142y8ng64qcykyjp1yz989ksznhippgij3m5qy5rgh77kdncbpb1";
+       version = "4.38";
+       sha256 = "0c5c3xd3lipnwdyvnvlxk4wk8gi2akbjwmhnc1bsdyr6g6ihai81";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41493,6 +41444,8 @@ self: {
        pname = "cabal-helper";
        version = "0.8.0.2";
        sha256 = "0yhsyq2z660qj5vp38lak2cz90r5jy69ifvz6dfipj6miyh2vmm6";
+       revision = "1";
+       editedCabalFile = "0hzjhnb9iyvk2qs3zbyj6rjhf3dbjksq0jqi8is522sph20zavvk";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -44041,22 +43994,12 @@ self: {
      }) {};
 
   "cautious" = callPackage
-    ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
-     , genvalidity-hspec-aeson, hspec, hspec-discover, QuickCheck
-     , transformers, validity
-     }:
+    ({ mkDerivation, aeson, base, transformers, validity }:
      mkDerivation {
        pname = "cautious";
-       version = "0.1.0.0";
-       sha256 = "054n9vy4h4qs208gfi7ryvb40y50pmaxcrslxplk95vg0pvg4k1w";
-       libraryHaskellDepends = [
-         aeson base genvalidity genvalidity-hspec-aeson hspec hspec-discover
-         QuickCheck transformers validity
-       ];
-       testHaskellDepends = [
-         aeson base genvalidity genvalidity-hspec genvalidity-hspec-aeson
-         hspec hspec-discover QuickCheck transformers validity
-       ];
+       version = "0.3.0.0";
+       sha256 = "0kydmb5f714pfgjz6drqi91m43bgs2sfap2nbww92xxyjbcls3j6";
+       libraryHaskellDepends = [ aeson base transformers validity ];
        homepage = "https://github.com/Nickske666/cautious#readme";
        description = "Keep track of warnings and errors during calculations";
        license = stdenv.lib.licenses.bsd3;
@@ -44077,6 +44020,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cautious-gen" = callPackage
+    ({ mkDerivation, base, cautious, genvalidity, genvalidity-hspec
+     , genvalidity-hspec-aeson, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "cautious-gen";
+       version = "0.0.0.0";
+       sha256 = "1i9cmqkh1n6s3dkqr0f9slm6frslw82rwvngx80iw9rc95anhykl";
+       libraryHaskellDepends = [ base cautious genvalidity ];
+       testHaskellDepends = [
+         base cautious genvalidity genvalidity-hspec genvalidity-hspec-aeson
+         hspec QuickCheck
+       ];
+       homepage = "https://github.com/Nickske666/cautious#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cayley-client" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
@@ -44247,10 +44207,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.0.0";
-       sha256 = "1klj3cx7cx39iyskv7fs6s28jplyn13dwv4khz79kxgg1sxd9gv5";
-       revision = "2";
-       editedCabalFile = "1r2ihgk5yj6xv4qc276b29gfzblksf82qdp0qg06cz590kxb8v2x";
+       version = "0.1.0.1";
+       sha256 = "16pzba0zc346d3azw4wd90apz7ldx68d5vd3q13dd3s9f3gqy4wv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46182,35 +46140,6 @@ self: {
      }) {};
 
   "cisco-spark-api" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
-     , bytestring, conduit, data-default, hspec, http-conduit
-     , http-types, network-uri, optparse-applicative, text, utf8-string
-     , wai, warp
-     }:
-     mkDerivation {
-       pname = "cisco-spark-api";
-       version = "0.1.0.2";
-       sha256 = "0cgs3d4dlc5vxz51d8c6hjvi1zxsvxzni4nqhqrc0rxnxkimc7bw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bitset-word8 bytestring conduit data-default
-         http-conduit network-uri text
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring conduit data-default http-conduit
-         optparse-applicative text utf8-string
-       ];
-       testHaskellDepends = [
-         aeson async attoparsec base bytestring conduit data-default hspec
-         http-conduit http-types network-uri text wai warp
-       ];
-       homepage = "https://github.com/nshimaza/cisco-spark-api#readme";
-       description = "A Haskell bindings for Cisco Spark API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "cisco-spark-api_0_1_0_3" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
      , bytestring, conduit, data-default, hspec, http-conduit
      , http-types, network-uri, optparse-applicative, text, utf8-string
@@ -46237,7 +46166,6 @@ self: {
        homepage = "https://github.com/nshimaza/webex-teams-api#readme";
        description = "A Haskell bindings for Webex Teams API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "citation-resolve" = callPackage
@@ -49007,6 +48935,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "colorful-monoids_0_2_1_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "colorful-monoids";
+       version = "0.2.1.1";
+       sha256 = "0n1f9x6kyb3fcg1fbs80wrlm3c897l089ma4cxm47v1dcgczix8b";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/minad/colorful-monoids#readme";
+       description = "Styled console text output using ANSI escape sequences";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "colorize-haskell" = callPackage
     ({ mkDerivation, ansi-terminal, base, haskell-lexer }:
      mkDerivation {
@@ -54926,23 +54868,6 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
-     , split
-     }:
-     mkDerivation {
-       pname = "crypto-enigma";
-       version = "0.0.2.11";
-       sha256 = "0wm8jifcwfad2hmh15hm2n93f2vzaxkvm2ndf57l0j97acbvbmy1";
-       revision = "1";
-       editedCabalFile = "1wh09ma0xr8lgj0a2ybp6kxisi36cl2kiqz2akhy915v6gpkjkyz";
-       libraryHaskellDepends = [ base containers MissingH mtl split ];
-       testHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/orome/crypto-enigma-hs";
-       description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crypto-enigma_0_0_2_12" = callPackage
     ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
      , split
      }:
@@ -54955,7 +54880,6 @@ self: {
        homepage = "https://github.com/orome/crypto-enigma-hs";
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-multihash" = callPackage
@@ -60562,6 +60486,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "deferred-folds" = callPackage
+    ({ mkDerivation, base, foldl }:
+     mkDerivation {
+       pname = "deferred-folds";
+       version = "0.2.1";
+       sha256 = "0i8wzih07532zw276h271lzdk3lkinjsjyhn8lks04yqkgq4b2x8";
+       libraryHaskellDepends = [ base foldl ];
+       homepage = "https://github.com/metrix-ai/deferred-folds";
+       description = "Abstractions over deferred folds";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "definitive-base" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, GLURaw, OpenGL, OpenGLRaw, primitive, vector
@@ -60719,17 +60655,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_5_0_0" = callPackage
-    ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, profunctors, random, transformers
+  "dejafu_1_5_1_0" = callPackage
+    ({ mkDerivation, base, concurrency, containers, contravariant
+     , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.5.0.0";
-       sha256 = "1d32y12mzd9vfj2ww2cqn4jsvkc4yysnada6wijk5hm6ax7in822";
+       version = "1.5.1.0";
+       sha256 = "0whxbn6h5k7n38w0wzm5iwqc20yyvzri88zsp3hhp8pdfj34df7d";
        libraryHaskellDepends = [
-         base concurrency containers deepseq exceptions leancheck
-         profunctors random transformers
+         base concurrency containers contravariant deepseq exceptions
+         leancheck profunctors random transformers
        ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "A library for unit-testing concurrent programs";
@@ -60967,18 +60903,18 @@ self: {
      }) {};
 
   "dependency" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, binary, containers
-     , criterion, deepseq, hspec, lens, recursion-schemes, tardis
-     , transformers
+    ({ mkDerivation, ansi-wl-pprint, base, binary, containers, cpphs
+     , criterion, deepseq, hspec, lens, recursion-schemes, transformers
      }:
      mkDerivation {
        pname = "dependency";
-       version = "0.1.0.11";
-       sha256 = "0nazbm1mf3agjkfc1ll0fy4jxdkb65dzx92jz15jp7xp5y10866h";
+       version = "1.0.0.0";
+       sha256 = "08n38sqcnljja235cv4xlvfmir7cbcmb53rayc81nl3km292hr8i";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary containers deepseq lens
-         recursion-schemes tardis transformers
+         recursion-schemes transformers
        ];
+       libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base containers hspec ];
        benchmarkHaskellDepends = [ base containers criterion ];
        description = "Dependency resolution for package management";
@@ -61593,34 +61529,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_12_0" = callPackage
-    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base
-     , base16-bytestring, bytestring, case-insensitive, containers
-     , contravariant, cryptonite, deepseq, directory, exceptions
-     , filepath, formatting, haskeline, http-client, http-client-tls
-     , insert-ordered-containers, lens-family-core, memory, mtl
-     , optparse-generic, parsers, prettyprinter
-     , prettyprinter-ansi-terminal, repline, scientific, tasty
-     , tasty-hunit, text, transformers, trifecta, unordered-containers
+  "dhall_1_13_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
+     , containers, contravariant, cryptonite, deepseq, directory
+     , exceptions, filepath, formatting, haskeline, http-client
+     , http-client-tls, insert-ordered-containers, lens-family-core
+     , megaparsec, memory, mtl, optparse-applicative, parsers
+     , prettyprinter, prettyprinter-ansi-terminal, repline, scientific
+     , tasty, tasty-hunit, text, transformers, unordered-containers
      , vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.12.0";
-       sha256 = "065cs20v5ps91mygvha5k5348n62vkhacqyv6fdl4m5b2hs0bkab";
+       version = "1.13.0";
+       sha256 = "1fn3yi2zv2l88jjapk0zhij247cy4yh0w07icyr41g341wx7gfv4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base base16-bytestring bytestring case-insensitive
-         containers contravariant cryptonite directory exceptions filepath
-         formatting http-client http-client-tls insert-ordered-containers
-         lens-family-core memory parsers prettyprinter
-         prettyprinter-ansi-terminal scientific text transformers trifecta
+         ansi-terminal base bytestring case-insensitive containers
+         contravariant cryptonite directory exceptions filepath formatting
+         http-client http-client-tls insert-ordered-containers
+         lens-family-core megaparsec memory parsers prettyprinter
+         prettyprinter-ansi-terminal scientific text transformers
          unordered-containers vector
        ];
        executableHaskellDepends = [
-         ansi-terminal base haskeline mtl optparse-generic prettyprinter
-         prettyprinter-ansi-terminal repline text trifecta
+         ansi-terminal base haskeline megaparsec mtl optparse-applicative
+         prettyprinter prettyprinter-ansi-terminal repline text
        ];
        testHaskellDepends = [
          base deepseq insert-ordered-containers prettyprinter tasty
@@ -61634,12 +61569,14 @@ self: {
   "dhall-bash" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall, formatting
      , insert-ordered-containers, neat-interpolation, optparse-generic
-     , shell-escape, text, trifecta
+     , shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.11";
-       sha256 = "17jgzb43ga8ddmxjp2mliv0zx6zpy0p7m5dihijpya66g7dkm91g";
+       version = "1.0.12";
+       sha256 = "1q9bwcdxyn2f7zp6r67k3kxqydj54shf0v0liyps7g7c9fixzrij";
+       revision = "1";
+       editedCabalFile = "12qklhw4jk2i1qiq9wyv23d6bl3yyqyjwf8dda649clby2my0hrc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61647,7 +61584,7 @@ self: {
          insert-ordered-containers neat-interpolation shell-escape text
        ];
        executableHaskellDepends = [
-         base bytestring dhall optparse-generic text trifecta
+         base bytestring dhall optparse-generic text
        ];
        description = "Compile Dhall to Bash";
        license = stdenv.lib.licenses.bsd3;
@@ -61693,6 +61630,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-json_1_1_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
+     , optparse-generic, text, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "dhall-json";
+       version = "1.1.0";
+       sha256 = "13fan1zdgj8zdv1br5vj57iqbfb5grllk8a2xkz6yyfk8kylmrc7";
+       revision = "1";
+       editedCabalFile = "0k8q44hfhd95k7i92g1zvsw9ys1ak6vl663r2v7pf6k1zl70cyhs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base dhall text unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring dhall optparse-generic text yaml
+       ];
+       description = "Compile Dhall to JSON or YAML";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dhall-lex" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq
      , hspec, hspec-dirstream, scientific
@@ -61715,12 +61675,12 @@ self: {
   "dhall-nix" = callPackage
     ({ mkDerivation, base, containers, data-fix, dhall, formatting
      , hnix, insert-ordered-containers, neat-interpolation
-     , optparse-generic, scientific, text, trifecta
+     , optparse-generic, scientific, text
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.2";
-       sha256 = "0ssb2ncycx6ayislqggf3ljnvk5xzq65g63fj658jkpmv2vh2wyj";
+       version = "1.1.3";
+       sha256 = "0dpkg84qzviasadgif30ivbg6k7azqq9ki8grd3g93zbrdxgv4fj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61728,7 +61688,7 @@ self: {
          insert-ordered-containers neat-interpolation scientific text
        ];
        executableHaskellDepends = [
-         base dhall hnix optparse-generic text trifecta
+         base dhall hnix optparse-generic text
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
@@ -61739,8 +61699,8 @@ self: {
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.8";
-       sha256 = "05h534bsggz4jysdc4n62l3a0asqr7ba9mpsminisc76f6k5y54d";
+       version = "1.0.9";
+       sha256 = "0jh2nm26i5gdicsxzvx54rmx7x1g5mpjiwd7c5wfj6pmrpcp606r";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base dhall optparse-generic text ];
@@ -62619,6 +62579,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diff3_0_3_1" = callPackage
+    ({ mkDerivation, base, Diff, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "diff3";
+       version = "0.3.1";
+       sha256 = "0myajph6iv6vddwfsrwzdbjw8di9wpabb393is98jnacjwa9csx3";
+       libraryHaskellDepends = [ base Diff ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+       ];
+       homepage = "http://github.com/ocharles/diff3.git";
+       description = "Perform a 3-way difference of documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diffarray" = callPackage
     ({ mkDerivation, array, base }:
      mkDerivation {
@@ -63797,6 +63775,8 @@ self: {
        pname = "distributed-process";
        version = "0.7.3";
        sha256 = "1m771siv3dvrc1i3pxl3iqrnz63wvq6i80wyvi5m64m16xgiisg5";
+       revision = "1";
+       editedCabalFile = "0vrk3lrrsc7rrzrkfqcc5q36clr8cy51v6dv4hpmi89fyngx6lz5";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static exceptions hashable mtl network-transport random
@@ -66211,8 +66191,8 @@ self: {
      }:
      mkDerivation {
        pname = "dtab";
-       version = "1.1";
-       sha256 = "18h4876saf2f8k052qf76j5w89x7nay12nlf7hc5dkwf4c9y5hq9";
+       version = "1.1.0.1";
+       sha256 = "18p10a2x6ra18aj6cphgswq4sjjkdrq58pk7ikgmpgq9sj4bxgpr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -68007,8 +67987,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-bosun";
-       version = "1.0.12";
-       sha256 = "1ashmmm5icv4q3808a5bg64cl4rmcjksm1hcf7ajgn3lggrkbxpq";
+       version = "1.0.13";
+       sha256 = "0w9zafd8ipq2hpxqmd9iywryjl0ym5gwwrv90kx80jxmv2dpqpzp";
        libraryHaskellDepends = [
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
@@ -68024,8 +68004,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.9";
-       sha256 = "00xdyrvwmd9jp59awh9i1yzbnywndzmjmz8qsn87hrcd2848fdnm";
+       version = "1.0.10";
+       sha256 = "0mvx5qpj5fzdb991gb344a5a34fvgys6xy3xxpr65bddlbpv0mk9";
        libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -72826,20 +72806,16 @@ self: {
      }) {};
 
   "fast-arithmetic" = callPackage
-    ({ mkDerivation, arithmoi, base, combinat-compat
-     , composition-prelude, criterion, gmpint, hspec, QuickCheck
+    ({ mkDerivation, arithmoi, base, combinat, composition-prelude
+     , criterion, gmpint, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.0.1";
-       sha256 = "1am161zrjaann9pnazsv9ic43cnw1bimqcy6vvh5qinigc33p08f";
+       version = "0.6.0.3";
+       sha256 = "1q9fdx61wpznpw551id09xg1yw8vyh77cvcwswmi0grld4hqn17g";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
-       testHaskellDepends = [
-         arithmoi base combinat-compat hspec QuickCheck
-       ];
-       benchmarkHaskellDepends = [
-         arithmoi base combinat-compat criterion
-       ];
+       testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
+       benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
        homepage = "https://github.com/vmchale/fast-arithmetic#readme";
        description = "Fast functions on integers";
        license = stdenv.lib.licenses.bsd3;
@@ -74800,6 +74776,8 @@ self: {
        pname = "filtrable";
        version = "0.1.0.5";
        sha256 = "0znfhi3sxfnrhqnmll7dx9pyw5wcyvlj62b8ir9hz3cznvb7aakd";
+       revision = "1";
+       editedCabalFile = "0wa848jypc7vvr4y6h7rvfd6m8n1747889rqzybrl3cvm138572v";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
@@ -77799,28 +77777,6 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, containers
-     , distributive, exceptions, mtl, profunctors, semigroupoids
-     , semigroups, template-haskell, transformers, transformers-base
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "free";
-       version = "5.0.1";
-       sha256 = "16b29r9f9j7wpd99zbspkxq22rm6r2shqv1isa1ipqfbzn9bap5p";
-       revision = "1";
-       editedCabalFile = "0d6wzbazlw9yamka4p01scqypl6kcg2kzh00amim40wx6f4sdyqj";
-       libraryHaskellDepends = [
-         base bifunctors comonad containers distributive exceptions mtl
-         profunctors semigroupoids semigroups template-haskell transformers
-         transformers-base transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/free/";
-       description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "free_5_0_2" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, containers
      , distributive, exceptions, mtl, profunctors, semigroupoids
      , semigroups, template-haskell, transformers, transformers-base
@@ -77838,7 +77794,6 @@ self: {
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-concurrent" = callPackage
@@ -83752,8 +83707,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "2.0.15";
-       sha256 = "0j2bqphjfhgm9nk8pyfpd6zp7i3q4b11s4vlgas9xdwwi9p1md8r";
+       version = "2.0.16";
+       sha256 = "0vqnskshbfp9nsgyfg4pifrh007rb7k176ci8niik96kxh95zfzx";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -90318,6 +90273,56 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "groot" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-autoscaling
+     , amazonka-core, amazonka-ec2, amazonka-ecs, ansi-terminal
+     , attoparsec, base, bytestring, checkers, conduit
+     , conduit-combinators, directory, exceptions, free, hashable, hspec
+     , http-conduit, http-types, ini, lens, lifted-base, mmorph
+     , monad-control, mtl, optparse-applicative, pptable, prettyprinter
+     , prettyprinter-ansi-terminal, prettyprinter-compat-ansi-wl-pprint
+     , QuickCheck, quickcheck-text, resourcet, stm, stm-chans
+     , stm-conduit, stm-delay, text, these, time, transformers
+     , unordered-containers, uuid, vector, yaml
+     }:
+     mkDerivation {
+       pname = "groot";
+       version = "0.0.1.0";
+       sha256 = "04klrvsc0j16zhv5a1b80gmv91p0xlbp22ylq1cfh8qbbp5mpf5a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2
+         amazonka-ecs ansi-terminal attoparsec base bytestring conduit
+         conduit-combinators directory exceptions free hashable http-conduit
+         http-types ini lens lifted-base mmorph monad-control mtl
+         optparse-applicative pptable prettyprinter
+         prettyprinter-ansi-terminal prettyprinter-compat-ansi-wl-pprint
+         resourcet stm stm-chans stm-conduit stm-delay text these time
+         transformers unordered-containers uuid vector yaml
+       ];
+       executableHaskellDepends = [
+         aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2
+         amazonka-ecs attoparsec base bytestring conduit conduit-combinators
+         directory exceptions free hashable http-conduit http-types lens
+         lifted-base mmorph monad-control mtl resourcet stm stm-chans
+         stm-conduit stm-delay text these time transformers
+         unordered-containers uuid vector yaml
+       ];
+       testHaskellDepends = [
+         aeson amazonka amazonka-autoscaling amazonka-core amazonka-ec2
+         amazonka-ecs attoparsec base bytestring checkers conduit
+         conduit-combinators directory exceptions free hashable hspec
+         http-conduit http-types lens lifted-base mmorph monad-control mtl
+         QuickCheck quickcheck-text resourcet stm stm-chans stm-conduit
+         stm-delay text these time transformers unordered-containers uuid
+         vector yaml
+       ];
+       homepage = "https://github.com/alonsodomin/groot#readme";
+       description = "Command line utility to manage AWS ECS resources";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "gross" = callPackage
     ({ mkDerivation, base, lens, mtl, ncurses }:
      mkDerivation {
@@ -91704,58 +91709,6 @@ self: {
      }) {};
 
   "hOpenPGP" = callPackage
-    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
-     , base16-bytestring, base64-bytestring, bifunctors, binary
-     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
-     , containers, criterion, crypto-cipher-types, cryptonite
-     , data-default-class, errors, hashable, incremental-parser
-     , ixset-typed, lens, memory, monad-loops, nettle, network
-     , network-uri, newtype, openpgp-asciiarmor, QuickCheck
-     , quickcheck-instances, resourcet, semigroups, split, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
-     , transformers, unliftio-core, unordered-containers
-     , wl-pprint-extras, zlib
-     }:
-     mkDerivation {
-       pname = "hOpenPGP";
-       version = "2.6";
-       sha256 = "0vsrgyzh7zlx9z27fvpjzk4s4gv1zpxwb68n529hvilsphyz35kf";
-       libraryHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring
-         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
-         conduit conduit-extra containers crypto-cipher-types cryptonite
-         data-default-class errors hashable incremental-parser ixset-typed
-         lens memory monad-loops nettle network-uri newtype
-         openpgp-asciiarmor resourcet semigroups split text time
-         time-locale-compat transformers unliftio-core unordered-containers
-         wl-pprint-extras zlib
-       ];
-       testHaskellDepends = [
-         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
-         binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype QuickCheck quickcheck-instances
-         resourcet semigroups split tasty tasty-hunit tasty-quickcheck text
-         time time-locale-compat transformers unliftio-core
-         unordered-containers wl-pprint-extras zlib
-       ];
-       benchmarkHaskellDepends = [
-         aeson base base16-bytestring base64-bytestring bifunctors binary
-         binary-conduit bytestring bzlib conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype openpgp-asciiarmor resourcet
-         semigroups split text time time-locale-compat transformers
-         unliftio-core unordered-containers wl-pprint-extras zlib
-       ];
-       homepage = "https://salsa.debian.org/clint/hOpenPGP";
-       description = "native Haskell implementation of OpenPGP (RFC4880)";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hOpenPGP_2_6_1" = callPackage
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-conduit, bytestring, bzlib, conduit, conduit-extra
@@ -93546,6 +93499,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_7" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.7";
+       sha256 = "1ldh6q96xz2a8frvgq29j3gr8jc2m0rx652215bm8w99mbq4pcri";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -93775,8 +93748,8 @@ self: {
      }:
      mkDerivation {
        pname = "hakyll";
-       version = "4.12.1.0";
-       sha256 = "0hw6j6kq7g9sg03ihw0q1f4d96kkr6dnfg7f2bj4skpwfsslb2cg";
+       version = "4.12.2.0";
+       sha256 = "1bkr94dakfwq86pm68r61x4g2xmcsliqn8lxgp2jkf8603mjla47";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -94303,6 +94276,18 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "halves" = callPackage
+    ({ mkDerivation, base, hedgehog, lens }:
+     mkDerivation {
+       pname = "halves";
+       version = "0.1.0.0";
+       sha256 = "06axsxkfja0p7vki4cnrf3rf3k255f5mk573pzn0zvzi4f8mmadn";
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [ base hedgehog lens ];
+       description = "Splitting/combining data structures to/from halves, quarters, eighths";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "halvm-web" = callPackage
     ({ mkDerivation, async, base, bytestring, cereal, containers
      , HALVMCore, hans, HTTP, mime-types, network-uri, simple-tar, text
@@ -94747,33 +94732,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.5.4";
-       sha256 = "02cc7bgld3cl36wq4n1c0n6gf2kbz0klj6ssfgjmjwvxvl064cg5";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_5" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -94798,7 +94756,6 @@ self: {
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -95872,8 +95829,8 @@ self: {
        pname = "hasbolt";
        version = "0.1.3.0";
        sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx";
-       revision = "1";
-       editedCabalFile = "0420drijspw73092rh3mhyrz4i7pph1fz3m0hcshs1zmngqibvv2";
+       revision = "2";
+       editedCabalFile = "1isygckkasffk06bd6023imr51c7l9cdvk4vf2vgv9x10v8kpp37";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default hex network text transformers
@@ -96848,8 +96805,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-dap";
-       version = "0.0.3.0";
-       sha256 = "0l09s90mfwnyc3nz3xpgja6dh99qm2yvim4r0fxyvh0adfzkmiwn";
+       version = "0.0.4.0";
+       sha256 = "1nzaf9zwqsx1jgspimkig6vhh2d1iz7kc3hr2kixc52sbr7y9iag";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -105173,6 +105130,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hjsonpointer_1_4_0" = callPackage
+    ({ mkDerivation, aeson, base, hashable, hspec, http-types
+     , QuickCheck, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjsonpointer";
+       version = "1.4.0";
+       sha256 = "0hkcaqiich4ap323ir2dmr3v498rlavy34g69m386d4ml1gxm411";
+       revision = "1";
+       editedCabalFile = "0l84zr0p1ywwn81fdb2z365vrs9xaaz7c7bcmx8pjvb5wfx1g9g4";
+       libraryHaskellDepends = [
+         aeson base hashable QuickCheck text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-types QuickCheck text unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/seagreen/hjsonpointer";
+       description = "JSON Pointer library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
@@ -105201,29 +105181,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hjsonschema_1_8_0" = callPackage
+  "hjsonschema_1_9_0" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , directory, file-embed, filepath, hashable, hjsonpointer, hspec
      , http-client, http-client-tls, http-types, pcre-heavy, profunctors
-     , protolude, QuickCheck, safe-exceptions, scientific, semigroups
-     , text, unordered-containers, vector, wai-app-static, warp
+     , protolude, QuickCheck, safe-exceptions, scientific, text
+     , unordered-containers, vector, wai-app-static, warp
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "1.8.0";
-       sha256 = "06jf3f7samp5mq3771ywv6r458kkyav4psagkkdqavrx53s4y4xl";
+       version = "1.9.0";
+       sha256 = "051i5y557g82hd5zcn63f65jyxk07d9wnvfmwdps391zxza8ifki";
        revision = "1";
-       editedCabalFile = "0c0y28js9jj10hmbk2syqfv681jp3px2ps02b1n99sz84va70h4i";
+       editedCabalFile = "1kxn0smmcmzysvi1bw9v0j6j68fk4s36nqyqmvbkl61pgm6bs803";
        libraryHaskellDepends = [
          aeson base bytestring containers file-embed filepath hashable
          hjsonpointer http-client http-client-tls http-types pcre-heavy
-         profunctors protolude QuickCheck safe-exceptions scientific
-         semigroups text unordered-containers vector
+         profunctors protolude QuickCheck safe-exceptions scientific text
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson async base bytestring directory filepath hjsonpointer hspec
-         profunctors protolude QuickCheck semigroups text
-         unordered-containers vector wai-app-static warp
+         profunctors protolude QuickCheck text unordered-containers vector
+         wai-app-static warp
        ];
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
@@ -116218,27 +116198,6 @@ self: {
      }) {};
 
   "hw-prim" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
-     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
-     }:
-     mkDerivation {
-       pname = "hw-prim";
-       version = "0.5.0.2";
-       sha256 = "0pqg7a46j63n8gp4c2hsxh98f0xppfhaww00zbjy45zx8h2gb1qm";
-       libraryHaskellDepends = [ base bytestring mmap vector ];
-       testHaskellDepends = [
-         base bytestring directory exceptions hedgehog hspec
-         hw-hspec-hedgehog mmap QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion mmap vector
-       ];
-       homepage = "http://github.com/haskell-works/hw-prim#readme";
-       description = "Primitive functions and data types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-prim_0_5_0_3" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
      }:
@@ -116257,7 +116216,6 @@ self: {
        homepage = "http://github.com/haskell-works/hw-prim#readme";
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -119349,8 +119307,8 @@ self: {
     ({ mkDerivation, base, lens }:
      mkDerivation {
        pname = "impossible";
-       version = "1.1.1";
-       sha256 = "0drq4rzbljql51hc2d8ldsm6xhsj7imlsxclivmf3lr9lykkp0p1";
+       version = "1.1.2";
+       sha256 = "13iwy9pn3w3whg8hqy83mgbzcb156pz88nfcx4axkw9hpkh4810s";
        libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/luna/impossible";
        description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
@@ -119584,8 +119542,8 @@ self: {
      }:
      mkDerivation {
        pname = "incremental-parser";
-       version = "0.2.5.3";
-       sha256 = "0646hxjd25hpmffabbdp6bxa5720gd99hgg31ifcx8nprlm8sl7a";
+       version = "0.2.5.4";
+       sha256 = "0891m40bl9jlblfg3wf6fi3bgzfl9d8lhmab5s755mpp1bw9gr6w";
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
@@ -119595,7 +119553,7 @@ self: {
        ];
        homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -120055,7 +120013,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "influxdb_1_6_0_1" = callPackage
+  "influxdb_1_6_0_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
      , cabal-doctest, clock, containers, doctest, foldl, http-client
      , http-types, HUnit, lens, mtl, network, optional-args, QuickCheck
@@ -120065,8 +120023,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.6.0.1";
-       sha256 = "14xk27qg5w7pdrmbz7fys96x4yywv0hk82z46802dlnxlfpikyc3";
+       version = "1.6.0.2";
+       sha256 = "0f5lcwvs4cw7ipqw3da5baf2sw4m1a7g29iw3big5m93wc2flk38";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -130113,6 +130071,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lazy" = callPackage
+    ({ mkDerivation, base, comonad }:
+     mkDerivation {
+       pname = "lazy";
+       version = "0.1";
+       sha256 = "02a9iw0ns12hszi5rim4x6pa15y3zycmbcmcwmsr6m31rzgz8ryp";
+       libraryHaskellDepends = [ base comonad ];
+       homepage = "https://github.com/nikita-volkov/lazy";
+       description = "Explicit laziness for Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "lazy-csv" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -140833,6 +140803,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microaeson" = callPackage
+    ({ mkDerivation, aeson, alex, array, base, bytestring, containers
+     , deepseq, QuickCheck, quickcheck-instances, tasty
+     , tasty-quickcheck, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microaeson";
+       version = "0.1.0.0";
+       sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq text
+       ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
+         aeson base bytestring containers QuickCheck quickcheck-instances
+         tasty tasty-quickcheck text unordered-containers vector
+       ];
+       description = "A tiny JSON library with light dependency footprint";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "microbench" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -149062,6 +149053,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network_2_7_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, directory, doctest, hspec, HUnit
+     , unix
+     }:
+     mkDerivation {
+       pname = "network";
+       version = "2.7.0.0";
+       sha256 = "17qd387vxq2b27k4g56679flnvfvsm7vqf2mnssa0lvghks4c1f1";
+       libraryHaskellDepends = [ base bytestring unix ];
+       testHaskellDepends = [
+         base bytestring directory doctest hspec HUnit
+       ];
+       homepage = "https://github.com/haskell/network";
+       description = "Low-level networking interface";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-address" = callPackage
     ({ mkDerivation, base, Cabal, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -150622,8 +150631,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-diff";
-       version = "1.0.1";
-       sha256 = "0xk8ggng32czhy4wxgzw7g28xj18jcbncmfshviqlw17rccrm2fx";
+       version = "1.0.2";
+       sha256 = "1n1f3p5hamvlc7jhl9m569d8li9kxqwkjmv5nn1mq1n1ldhdlwxj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -153006,8 +153015,8 @@ self: {
      }:
      mkDerivation {
        pname = "om-elm";
-       version = "1.0.0.1";
-       sha256 = "1fvpsiv5xdc7jamhdsaw2kzm32qrbg7c2b5s5zhhhcd7j4vgn3xq";
+       version = "1.0.0.3";
+       sha256 = "0i674vjbp03nkr76fdi7bjylv264nxwnxw0ija11fkpd1rdg045g";
        libraryHaskellDepends = [
          base bytestring Cabal containers directory http-types safe
          safe-exceptions template-haskell text unix wai
@@ -155775,6 +155784,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "palette_0_3" = callPackage
+    ({ mkDerivation, array, base, colour, containers, MonadRandom }:
+     mkDerivation {
+       pname = "palette";
+       version = "0.3";
+       sha256 = "1wpzrhr3b9psa7b56ys34vnaag6z12xam2rymld2g8fd13jlkxh6";
+       libraryHaskellDepends = [
+         array base colour containers MonadRandom
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Utilities for choosing and creating color schemes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "palindromes" = callPackage
     ({ mkDerivation, array, base, bytestring, containers }:
      mkDerivation {
@@ -155928,41 +155952,6 @@ self: {
      }) {};
 
   "pandoc-citeproc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat
-     , bytestring, Cabal, containers, data-default, directory, filepath
-     , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec
-     , process, rfc5051, setenv, split, syb, tagsoup, temporary, text
-     , time, unordered-containers, vector, xml-conduit, yaml
-     }:
-     mkDerivation {
-       pname = "pandoc-citeproc";
-       version = "0.14.3";
-       sha256 = "1z27x8bd8zxmqrxlapzxkc0g65ix7ig96d0bwzq3i521fzig85bj";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson base base-compat bytestring containers data-default directory
-         filepath hs-bibutils mtl old-locale pandoc pandoc-types parsec
-         rfc5051 setenv split syb tagsoup text time unordered-containers
-         vector xml-conduit yaml
-       ];
-       executableHaskellDepends = [
-         aeson aeson-pretty attoparsec base base-compat bytestring filepath
-         pandoc pandoc-types syb text yaml
-       ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring containers directory filepath mtl
-         pandoc pandoc-types process temporary text yaml
-       ];
-       doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
-       description = "Supports using pandoc with citeproc";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pandoc-citeproc_0_14_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, base-compat
      , bytestring, Cabal, containers, data-default, directory, filepath
      , hs-bibutils, mtl, old-locale, pandoc, pandoc-types, parsec
@@ -155995,7 +155984,6 @@ self: {
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -156462,27 +156450,27 @@ self: {
   "pansite" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, data-default
      , directory, doctest, filepath, Glob, hspec, http-types, MissingH
-     , optparse-applicative, pandoc, pandoc-types, shake, split
-     , template-haskell, text, time, unordered-containers, vcs-revision
-     , vector, wai, wai-logger, warp, yaml
+     , optparse-applicative, pandoc, pandoc-types, QuickCheck, shake
+     , split, template-haskell, text, time, unordered-containers
+     , vcs-revision, vector, wai, wai-logger, warp, yaml
      }:
      mkDerivation {
        pname = "pansite";
-       version = "0.1.0.0";
-       sha256 = "1hm8lgcrr5my2h3n8yn40qmf9kghsaai1fjh4q8qxqlk4jsblvb5";
+       version = "0.2.0.0";
+       sha256 = "0y60pk4zryxllpv1h27ja7c7a91vd00g9p29ml2l7rvdgprcy5ar";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring data-default split text unordered-containers
-         vector yaml
+         aeson base bytestring data-default MissingH shake split text
+         unordered-containers vector yaml
        ];
        executableHaskellDepends = [
          aeson base blaze-html bytestring data-default directory filepath
          http-types MissingH optparse-applicative pandoc pandoc-types shake
-         template-haskell text time unordered-containers vcs-revision wai
-         wai-logger warp
+         split template-haskell text time unordered-containers vcs-revision
+         wai wai-logger warp
        ];
-       testHaskellDepends = [ base doctest Glob hspec ];
+       testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        homepage = "https://github.com/rcook/pansite#readme";
        description = "Pansite: a simple web site management tool";
        license = stdenv.lib.licenses.mit;
@@ -157567,6 +157555,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parser-combinators_1_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "parser-combinators";
+       version = "1.0.0";
+       sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/mrkkrp/parser-combinators";
+       description = "Lightweight package providing commonly useful parser combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parser-helper" = callPackage
     ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }:
      mkDerivation {
@@ -159498,31 +159499,14 @@ self: {
      }) {};
 
   "persistable-types-HDBC-pg" = callPackage
-    ({ mkDerivation, base, bytestring, convertible, HDBC
-     , persistable-record, relational-query-HDBC, text-postgresql
-     }:
-     mkDerivation {
-       pname = "persistable-types-HDBC-pg";
-       version = "0.0.1.5";
-       sha256 = "0kdrqn6j7vsq748j9j22g3wqxik9pfy3s3dgk4gd5bqnp4gv7949";
-       libraryHaskellDepends = [
-         base bytestring convertible HDBC persistable-record
-         relational-query-HDBC text-postgresql
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "HDBC and Relational-Record instances of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "persistable-types-HDBC-pg_0_0_3_1" = callPackage
     ({ mkDerivation, base, bytestring, convertible, dlist, HDBC
      , persistable-record, relational-query, relational-query-HDBC
      , text-postgresql
      }:
      mkDerivation {
        pname = "persistable-types-HDBC-pg";
-       version = "0.0.3.1";
-       sha256 = "1dmvwr21q5g15v50b5ycnyvqbrfg75pw5kdvmi4sp03yldk0fsdc";
+       version = "0.0.3.2";
+       sha256 = "0ddzmc19in35vxivgqp9yi8p2afvg67q2dwgl39pkw6camrqlh2r";
        libraryHaskellDepends = [
          base bytestring convertible dlist HDBC persistable-record
          relational-query relational-query-HDBC text-postgresql
@@ -159533,7 +159517,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC and Relational-Record instances of PostgreSQL extended types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent_2_7_3_1" = callPackage
@@ -160592,8 +160575,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.22.0";
-       sha256 = "0ala51fps5yd1lk47blsbfby6sysnz2v39frmc53ggqzzlsls2q7";
+       version = "0.0.23.0";
+       sha256 = "139fjsyximny4ikgqrjxx9pg4spkz8s1fh6b3a9xgrsyya4r1sw7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160997,6 +160980,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pier" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, binary
+     , binary-orphans, bytestring, Cabal, containers, cryptohash-sha256
+     , directory, hashable, http-client, http-client-tls, http-types
+     , optparse-applicative, process, shake, split, temporary, text
+     , transformers, unix, unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "pier";
+       version = "0.1.0.0";
+       sha256 = "19l8ghpik8j8igh0xa8kcmn6zs6r4xa8yks60n8v37d6ksr5k9m6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring binary binary-orphans bytestring Cabal
+         containers cryptohash-sha256 directory hashable http-client
+         http-client-tls http-types process shake temporary text
+         transformers unix unordered-containers yaml
+       ];
+       executableHaskellDepends = [
+         base Cabal directory optparse-applicative shake split
+         unordered-containers
+       ];
+       homepage = "https://github.com/judah/pier#readme";
+       description = "Yet another Haskell build system";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "piet" = callPackage
     ({ mkDerivation, array, base, containers, Imlib, mtl }:
      mkDerivation {
@@ -162861,15 +162872,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "plot-light_0_3_2_1" = callPackage
+  "plot-light_0_3_3" = callPackage
     ({ mkDerivation, base, blaze-svg, colour, containers
      , data-default-class, hspec, mtl, QuickCheck, scientific, text
      , time
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.3.2.1";
-       sha256 = "00gl17lsavwn1cglaa8jqzl1v3vczskkiz0zg51xg4g7v1v1irr7";
+       version = "0.3.3";
+       sha256 = "1ymfrrn28l6dbvw6m6j0cqxjb027ynhcc7b7y6i7bq4gq6rd60dz";
        libraryHaskellDepends = [
          base blaze-svg colour containers data-default-class mtl scientific
          text time
@@ -167571,8 +167582,8 @@ self: {
      }:
      mkDerivation {
        pname = "prologue";
-       version = "3.2.0";
-       sha256 = "19q61qjmygjah49qjy4a89hpn8ra8z9pq0f72p1c7wzgk38zp55r";
+       version = "3.2.2";
+       sha256 = "1sswdhbfgh2pnhyixj03khp5ylsxkyisghyg0mqgb039kq1lxxci";
        libraryHaskellDepends = [
          base bifunctors binary comonad cond container convert data-default
          deepseq deriving-compat either errors exceptions functor-utils
@@ -168453,6 +168464,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "psqueues_0_2_7_0" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
+     , QuickCheck, random, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, unordered-containers
+     }:
+     mkDerivation {
+       pname = "psqueues";
+       version = "0.2.7.0";
+       sha256 = "1sjgc9bxh63kkdp59nbirx3xazr02ia5yhp4f4a0jnq1hj465wsc";
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion deepseq fingertree-psqueue ghc-prim
+         hashable mtl PSQueue random unordered-containers
+       ];
+       description = "Pure priority search queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pstemmer" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -169776,6 +169811,38 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "qnap-decrypt" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cipher-aes128, conduit
+     , conduit-extra, crypto-api, directory, filepath, hspec, HUnit
+     , optparse-applicative, streaming-commons, tagged, temporary
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "qnap-decrypt";
+       version = "0.3.1";
+       sha256 = "1ns5wz427ilw7xn886sw7ip9d1nbfqbs1qcgjm9cvdi5v5v89pi6";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary bytestring cipher-aes128 conduit conduit-extra
+         crypto-api directory streaming-commons tagged utf8-string
+       ];
+       executableHaskellDepends = [
+         base binary bytestring cipher-aes128 conduit conduit-extra
+         crypto-api directory filepath optparse-applicative
+         streaming-commons tagged utf8-string
+       ];
+       testHaskellDepends = [
+         base binary bytestring cipher-aes128 conduit conduit-extra
+         crypto-api directory filepath hspec HUnit streaming-commons tagged
+         temporary utf8-string
+       ];
+       homepage = "https://github.com/alexkazik/qnap-decrypt#readme";
+       description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "qq-literals" = callPackage
     ({ mkDerivation, base, network-uri, template-haskell }:
      mkDerivation {
@@ -175595,6 +175662,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query_0_11_1_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, dlist
+     , names-th, persistable-record, product-isomorphic
+     , quickcheck-simple, sql-words, template-haskell, text
+     , th-reify-compat, time, time-locale-compat, transformers
+     }:
+     mkDerivation {
+       pname = "relational-query";
+       version = "0.11.1.0";
+       sha256 = "1iydq7jdsizacvanvxdfad52vjaazb2awv2h3lyiqrsmva1y0qmq";
+       libraryHaskellDepends = [
+         array base bytestring containers dlist names-th persistable-record
+         product-isomorphic sql-words template-haskell text th-reify-compat
+         time time-locale-compat transformers
+       ];
+       testHaskellDepends = [
+         base containers product-isomorphic quickcheck-simple transformers
+       ];
+       homepage = "http://khibino.github.io/haskell-relational-record/";
+       description = "Typeful, Modular, Relational, algebraic query engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-query-HDBC" = callPackage
     ({ mkDerivation, base, containers, convertible, dlist, HDBC
      , HDBC-session, names-th, persistable-record, product-isomorphic
@@ -177921,8 +178012,8 @@ self: {
      }:
      mkDerivation {
        pname = "rio";
-       version = "0.1.1.0";
-       sha256 = "0mr78bd5xcq4gxc7vhz1k70gxbng2rbpip648fs4k0hb7gf2z0ds";
+       version = "0.1.2.0";
+       sha256 = "0449jjgw38dwf0lw3vq0ri3gh7mlzfjkajz8xdvxr76ffs9kncwq";
        libraryHaskellDepends = [
          base bytestring containers deepseq directory exceptions filepath
          hashable microlens mtl primitive process text time typed-process
@@ -180918,17 +181009,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
-  "sbv_7_6" = callPackage
+  "sbv_7_7" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
      , process, QuickCheck, random, syb, tasty, tasty-golden
-     , tasty-hunit, template-haskell, time, z3
+     , tasty-hunit, tasty-quickcheck, template-haskell, time, z3
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.6";
-       sha256 = "0ycrwmyi1ba5v71qjladn0mn2hlrxdswy5mlx2dxzhrf2r6k6zd9";
+       version = "7.7";
+       sha256 = "0yf68qyp29kxgpdx5xdyx64vkn0dvfrizn5hq2xgrik0v9vb1ja0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -180937,8 +181028,8 @@ self: {
        ];
        testHaskellDepends = [
          base bytestring containers data-binary-ieee754 directory doctest
-         filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit
-         template-haskell
+         filepath Glob hlint mtl QuickCheck random syb tasty tasty-golden
+         tasty-hunit tasty-quickcheck template-haskell
        ];
        testSystemDepends = [ z3 ];
        homepage = "http://leventerkok.github.com/sbv/";
@@ -181714,6 +181805,8 @@ self: {
        pname = "scotty";
        version = "0.11.1";
        sha256 = "1xcdfx43v1p2a20jjmnb70v2sm34iprn17ssa81fcfnabcn4blhw";
+       revision = "1";
+       editedCabalFile = "0msb0ydgga07gicchs8k0f7d35gp18vrin649q6yqah75l5i2f9x";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class exceptions fail http-types monad-control mtl
@@ -181866,8 +181959,8 @@ self: {
      }:
      mkDerivation {
        pname = "scotty-resource";
-       version = "0.2.0.1";
-       sha256 = "0y39sxvin9ljwk2jxnb18wr79d0ap9363vr2mh8xbc4llq0yjavj";
+       version = "0.2.0.2";
+       sha256 = "1lhaajsx34hlci76wjvab7a1sjd42silxsvf94ncf0pc0rmjqg1n";
        libraryHaskellDepends = [
          base containers http-types scotty text transformers wai
        ];
@@ -183279,7 +183372,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sensu-run_0_5_0" = callPackage
+  "sensu-run_0_5_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, filepath
      , http-client, http-client-tls, http-types, lens, network
      , optparse-applicative, process, temporary, text, time, unix
@@ -183287,8 +183380,8 @@ self: {
      }:
      mkDerivation {
        pname = "sensu-run";
-       version = "0.5.0";
-       sha256 = "0826al67dwzdyazqkvrcsbxdv6gg6zk52q32avfz7l8dlpswgr9m";
+       version = "0.5.0.1";
+       sha256 = "1kxdndaimwgj9mjjhb5z8kb36k4awby8a3h1dpghvas1l64i5dfl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -186645,8 +186738,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.11.0.1";
-       sha256 = "09gg30b8xiq2krz58lkavcgi1gybc5sn6snscdq8nj3qbxcvd0av";
+       version = "2.11.0.2";
+       sha256 = "1wmvk91gfmrd1cqj3k70h3lc2xypiqs2d2dh4xlq97fsqm2kmfmy";
        libraryHaskellDepends = [
          base Cabal cdeps composition-prelude cpphs directory shake
          template-haskell
@@ -188575,8 +188668,8 @@ self: {
     ({ mkDerivation, base, process }:
      mkDerivation {
        pname = "simple-smt";
-       version = "0.7.1";
-       sha256 = "1h7acjqis9qrj4i5k4aspjjrd8a86bkhhcn6ib3aa8s384ar0wfv";
+       version = "0.8";
+       sha256 = "0w4adm7zjiqbzm0vg8ky4xyldid00grsnjf7n4pkw5a2fw81qi3d";
        libraryHaskellDepends = [ base process ];
        description = "A simple way to interact with an SMT solver process";
        license = stdenv.lib.licenses.bsd3;
@@ -190330,8 +190423,8 @@ self: {
     ({ mkDerivation, base, pretty }:
      mkDerivation {
        pname = "smtLib";
-       version = "1.0.8";
-       sha256 = "1a91ml428xxb9pd88vdw5cj076s13k864bk9kp48hb3l4a9ny09p";
+       version = "1.0.9";
+       sha256 = "19hfw5pgygka2wrnlr8s6wqpw92kz259lli83w1i7igw3v7vyzcc";
        libraryHaskellDepends = [ base pretty ];
        description = "A library for working with the SMTLIB format";
        license = stdenv.lib.licenses.bsd3;
@@ -199307,19 +199400,19 @@ self: {
      }) {};
 
   "superrecord" = callPackage
-    ({ mkDerivation, aeson, base, bookkeeper, constraints, criterion
-     , deepseq, ghc-prim, hspec, labels, mtl, text
+    ({ mkDerivation, aeson, base, bookkeeper, bytestring, constraints
+     , criterion, deepseq, ghc-prim, hspec, labels, mtl, text
      }:
      mkDerivation {
        pname = "superrecord";
-       version = "0.3.0.0";
-       sha256 = "1yya0lx3lqhr7pj3p72zi8xgjrqlrsrs9b6ilrskzkh0gjqcfjw5";
+       version = "0.5.0.0";
+       sha256 = "1bg2kjkwl78lhf34j1xb20lpypp26bavd0h6cnhj4m6d4sq3z86a";
        libraryHaskellDepends = [
-         aeson base constraints deepseq ghc-prim mtl text
+         aeson base bytestring constraints deepseq ghc-prim mtl text
        ];
-       testHaskellDepends = [ aeson base hspec ];
+       testHaskellDepends = [ aeson base hspec mtl text ];
        benchmarkHaskellDepends = [
-         aeson base bookkeeper criterion deepseq labels
+         aeson base bookkeeper criterion deepseq labels text
        ];
        homepage = "https://github.com/agrafix/superrecord#readme";
        description = "Supercharged anonymous records";
@@ -204167,11 +204260,14 @@ self: {
      }:
      mkDerivation {
        pname = "tersmu";
-       version = "0.2.1";
-       sha256 = "10bq2b3nhnpy566i1gbf8iz10nq0z0x4xdi4kr5nlbzrih86ih4n";
-       isLibrary = false;
+       version = "0.2.2";
+       sha256 = "1wyrbggpgr6jyskvvkh12g6a440md1aqj405cxqhdmy0bzwz5cfn";
+       isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base containers mtl process syb transformers
+       ];
        executableHaskellDepends = [
          base containers mtl process syb transformers
        ];
@@ -204773,29 +204869,6 @@ self: {
      }) {};
 
   "texmath" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
-     , utf8-string, xml
-     }:
-     mkDerivation {
-       pname = "texmath";
-       version = "0.10.1.1";
-       sha256 = "0q2fld5mdcd6j1n3rrg3bjpndbgbn17cwg0xbnvscrpa0s767jaj";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers mtl pandoc-types parsec syb xml
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath process split temporary text
-         utf8-string xml
-       ];
-       homepage = "http://github.com/jgm/texmath";
-       description = "Conversion between formats used to represent mathematics";
-       license = "GPL";
-     }) {};
-
-  "texmath_0_10_1_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, split, syb, temporary, text
      , utf8-string, xml
@@ -204816,7 +204889,6 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -214850,27 +214922,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
-     , process, stm, time, transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.6.0";
-       sha256 = "0rmklk2d2ip1mcizqn8j38lbqy58lc8h9hwigvab5ggilxpmnzgq";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath process stm time transformers
-         unix unliftio-core
-       ];
-       testHaskellDepends = [
-         async base deepseq directory filepath hspec process stm time
-         transformers unix unliftio-core
-       ];
-       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_7_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , process, stm, time, transformers, unix, unliftio-core
      }:
@@ -214889,7 +214940,6 @@ self: {
        homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -216085,8 +216135,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
-       version = "0.1.5.0";
-       sha256 = "0rll7fv31bamnqcy3hcm8vdgzz5wjzlqhvz5lnbp1gfymx43jrga";
+       version = "0.1.6.0";
+       sha256 = "0qym7if90kp51f0mf8yxsw3csfpdp2mnp7aah3vc6wdh58gljva5";
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -220268,27 +220318,6 @@ self: {
      }) {};
 
   "wai-middleware-throttle" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-builder, containers
-     , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm
-     , text, token-bucket, transformers, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "wai-middleware-throttle";
-       version = "0.2.2.0";
-       sha256 = "0k5q6vziq67bscfrm1dx6i4wkvw30wa35mgdd7x1dzniibx87dva";
-       libraryHaskellDepends = [
-         base bytestring bytestring-builder containers hashable http-types
-         mtl network stm text token-bucket transformers wai
-       ];
-       testHaskellDepends = [
-         base bytestring hspec http-types HUnit QuickCheck stm transformers
-         wai wai-extra
-       ];
-       description = "WAI Middleware for Request Throttling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-middleware-throttle_0_2_2_1" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-builder, containers
      , hashable, hspec, http-types, HUnit, mtl, network, QuickCheck, stm
      , text, token-bucket, transformers, wai, wai-extra
@@ -220307,7 +220336,6 @@ self: {
        ];
        description = "WAI Middleware for Request Throttling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-verbs" = callPackage
@@ -220910,41 +220938,6 @@ self: {
      }) {};
 
   "warp" = callPackage
-    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
-     , bytestring, case-insensitive, containers, directory, doctest
-     , gauge, ghc-prim, hashable, hspec, http-client, http-date
-     , http-types, http2, HUnit, iproute, lifted-base, network, process
-     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
-     , text, time, transformers, unix, unix-compat, vault, wai, word8
-     }:
-     mkDerivation {
-       pname = "warp";
-       version = "3.2.19";
-       sha256 = "0laggqs2bjf4vn58fjpippbwd1i2z82ssmnyn6l0qb3q54d2fyqb";
-       libraryHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers ghc-prim hashable http-date http-types
-         http2 iproute network simple-sendfile stm streaming-commons text
-         unix unix-compat vault wai word8
-       ];
-       testHaskellDepends = [
-         array async auto-update base bsb-http-chunked bytestring
-         case-insensitive containers directory doctest ghc-prim hashable
-         hspec http-client http-date http-types http2 HUnit iproute
-         lifted-base network process QuickCheck silently simple-sendfile stm
-         streaming-commons text time transformers unix unix-compat vault wai
-         word8
-       ];
-       benchmarkHaskellDepends = [
-         auto-update base bytestring containers gauge hashable http-date
-         http-types network unix unix-compat
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "A fast, light-weight web server for WAI applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp_3_2_22" = callPackage
     ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
      , bytestring, case-insensitive, containers, directory, doctest
      , gauge, ghc-prim, hashable, hspec, http-client, http-date
@@ -220977,7 +220970,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -222296,6 +222288,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weigh_0_0_11" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
+     mkDerivation {
+       pname = "weigh";
+       version = "0.0.11";
+       sha256 = "0q4l2npli78w3p74rsh56q1azwh07856ckip9v3vmw53xzx0n42l";
+       libraryHaskellDepends = [
+         base deepseq mtl process split temporary
+       ];
+       testHaskellDepends = [ base deepseq ];
+       homepage = "https://github.com/fpco/weigh#readme";
+       description = "Measure allocations of a Haskell functions/values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weighted" = callPackage
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
@@ -222697,26 +222705,6 @@ self: {
      }) {};
 
   "wild-bind-x11" = callPackage
-    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
-     , semigroups, stm, text, time, transformers, wild-bind, X11
-     }:
-     mkDerivation {
-       pname = "wild-bind-x11";
-       version = "0.2.0.2";
-       sha256 = "0vf6jm5gw76hcrwrqmfrq8niwh4z5p2wg0j0rh74wn9vbs6cm8cl";
-       libraryHaskellDepends = [
-         base containers fold-debounce mtl semigroups stm text transformers
-         wild-bind X11
-       ];
-       testHaskellDepends = [
-         async base hspec text time transformers wild-bind X11
-       ];
-       homepage = "https://github.com/debug-ito/wild-bind";
-       description = "X11-specific implementation for WildBind";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind-x11_0_2_0_3" = callPackage
     ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
      , semigroups, stm, text, time, transformers, wild-bind, X11
      }:
@@ -222734,7 +222722,6 @@ self: {
        homepage = "https://github.com/debug-ito/wild-bind";
        description = "X11-specific implementation for WildBind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wilton-ffi" = callPackage
@@ -228026,39 +228013,6 @@ self: {
      }) {};
 
   "yesod-bin" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
-     , bytestring, Cabal, conduit, conduit-extra, containers
-     , data-default-class, directory, file-embed, filepath, fsnotify
-     , http-client, http-client-tls, http-reverse-proxy, http-types
-     , network, optparse-applicative, parsec, process, project-template
-     , resourcet, say, shakespeare, split, stm, streaming-commons, tar
-     , template-haskell, text, time, transformers, transformers-compat
-     , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp
-     , warp-tls, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "yesod-bin";
-       version = "1.6.0";
-       sha256 = "096yxpb6dxy44s2ydf137rmd0b7zm5ww4yqkf7mnapslhc25wznn";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         attoparsec base base64-bytestring blaze-builder bytestring Cabal
-         conduit conduit-extra containers data-default-class directory
-         file-embed filepath fsnotify http-client http-client-tls
-         http-reverse-proxy http-types network optparse-applicative parsec
-         process project-template resourcet say shakespeare split stm
-         streaming-commons tar template-haskell text time transformers
-         transformers-compat unix-compat unliftio unordered-containers wai
-         wai-extra warp warp-tls yaml zlib
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yesod-bin_1_6_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
      , bytestring, Cabal, conduit, conduit-extra, containers
      , data-default-class, directory, file-embed, filepath, fsnotify
@@ -228234,46 +228188,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
-     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
-     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
-     , resourcet, safe, semigroups, shakespeare, streaming-commons
-     , template-haskell, text, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.6.3";
-       sha256 = "0k2gwnbrpwwbna03bbi53fppgyn7x5g9167jyjcfyjb8qfn4pwxg";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq deepseq-generics directory fast-logger
-         http-types monad-logger mtl old-locale parsec path-pieces primitive
-         random resourcet safe semigroups shakespeare template-haskell text
-         time transformers unix-compat unliftio unordered-containers vector
-         wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces QuickCheck random resourcet shakespeare
-         streaming-commons template-haskell text transformers unliftio wai
-         wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text transformers
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_4" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -228311,7 +228225,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -228606,8 +228519,8 @@ self: {
     ({ mkDerivation, base, classy-prelude-yesod, yesod-form }:
      mkDerivation {
        pname = "yesod-form-bootstrap4";
-       version = "0.1.0.2";
-       sha256 = "0lsdvs33xsy7ipr44calfhyf375mkq7h3axi39q91f28r76iy6cf";
+       version = "0.1.1";
+       sha256 = "17bdd0pmhpj85w7vc7vzzb3iggl3azr1jzpkmy9x9mxdl1birgmg";
        libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ];
        homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme";
        description = "renderBootstrap4";
@@ -229536,33 +229449,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, conduit, containers
-     , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
-     , network, persistent, pretty-show, semigroups, text, time
-     , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types
-     , yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.6.2";
-       sha256 = "172m7nafq8w1j3cm6p110vlxzy14y6pgm8ica357b1qn0wvzd39x";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive conduit containers cookie hspec-core html-conduit
-         http-types HUnit network persistent pretty-show semigroups text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit text
-         unliftio wai wai-extra xml-conduit yesod-core yesod-form
-       ];
-       homepage = "http://www.yesodweb.com";
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_6_3" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, conduit, containers
      , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
@@ -229587,7 +229473,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -230626,14 +230511,16 @@ self: {
      }:
      mkDerivation {
        pname = "z3";
-       version = "4.2.0";
-       sha256 = "1rzdsn54508y6w965a8y2g118ylx6588gxbdi3dd9ihqh9mdzg31";
+       version = "4.3";
+       sha256 = "1c29zzc6y7l169hdj9278z95530h6hc161fxgfn4zlxs3k5611d1";
+       revision = "1";
+       editedCabalFile = "0spg0sqqra4h5k5zagmmhh0sh10p3bzrhgrfspcd3i5c7yymwagb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
        librarySystemDepends = [ gomp z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://bitbucket.org/iago/z3-haskell";
+       homepage = "https://github.com/IagoAbal/haskell-z3";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
      }) {gomp = null; inherit (pkgs) z3;};
@@ -230873,6 +230760,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zeromq;};
 
+  "zeromq4-clone-pattern" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, exceptions
+     , QuickCheck, stm, test-framework, test-framework-quickcheck2
+     , transformers, zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "zeromq4-clone-pattern";
+       version = "0.1.0.0";
+       sha256 = "1czc3p9s3jqmjmvasqcraqv0fjn2j7s3qj59l35cb1nd8gvxzmyg";
+       revision = "1";
+       editedCabalFile = "01shrkqnl65lbj3vaj96hm6vbvw0qp0jwdaza5hwzwwlzarfylaa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base binary bytestring exceptions stm transformers
+         zeromq4-haskell
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         async base binary bytestring QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/hverr/zeromq4-clone-pattern#readme";
+       description = "Haskell implementation of the ZeroMQ clone pattern";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "zeromq4-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, lifted-base
      , monad-control, mtl, resourcet, semigroups, transformers
@@ -230915,6 +230829,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) zeromq;};
 
+  "zeromq4-patterns" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, exceptions
+     , QuickCheck, stm, test-framework, test-framework-quickcheck2
+     , zeromq4-haskell
+     }:
+     mkDerivation {
+       pname = "zeromq4-patterns";
+       version = "0.3.0.0";
+       sha256 = "0y5rk13rzmyfxrxbkn38klzxgnbmqi2xg69m5l2gb2gqrza8szy7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base binary bytestring exceptions stm zeromq4-haskell
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         async base binary bytestring QuickCheck test-framework
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/hverr/zeromq4-patterns#readme";
+       description = "Haskell implementation of several ZeroMQ patterns";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "zeroth" = callPackage
     ({ mkDerivation, base, Cabal, derive, directory, filepath
      , haskell-src-exts, hskeleton, monoid-record, process, syb

From 59490ae47235a6248863c4cb48ea53cdf22d72c7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 May 2018 09:30:23 +0200
Subject: [PATCH 0840/3370] haskell-brick: update override for ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index da65c2698228..cf1036283126 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -555,7 +555,7 @@ self: super: {
   });
 
   # Older versions don't compile.
-  brick = self.brick_0_36_2;
+  brick = self.brick_0_36_3;
   HaTeX = self.HaTeX_3_19_0_0;
   hpack = self.hpack_0_28_2;
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;

From 16e46207ec55a9610f5f08bb7f07966b13742ff7 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Tue, 1 May 2018 10:36:38 +0200
Subject: [PATCH 0841/3370] goxel: don't save imgui.ini to working directory

---
 pkgs/applications/graphics/goxel/default.nix        |  2 ++
 .../graphics/goxel/disable-imgui_ini.patch          | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/graphics/goxel/disable-imgui_ini.patch

diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 03f7b515747b..3d49452cbe62 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "01022c43pmwiqb18rx9fz08xr99h6p03gw6bp0lay5z61g3xkz17";
   };
 
+  patches = [ ./disable-imgui_ini.patch ];
+
   nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
   buildInputs = [ glfw3 gtk3 libpng12 ];
 
diff --git a/pkgs/applications/graphics/goxel/disable-imgui_ini.patch b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch
new file mode 100644
index 000000000000..9427d45487d4
--- /dev/null
+++ b/pkgs/applications/graphics/goxel/disable-imgui_ini.patch
@@ -0,0 +1,13 @@
+diff --git a/src/gui.cpp b/src/gui.cpp
+index 9b7236c..a8a11b2 100644
+--- a/src/gui.cpp
++++ b/src/gui.cpp
+@@ -314,6 +314,8 @@ static void init_ImGui(const inputs_t *inputs)
+     ImGuiIO& io = ImGui::GetIO();
+     io.DeltaTime = 1.0f/60.0f;
+
++    io.IniFilename = NULL;
++
+     io.KeyMap[ImGuiKey_Tab]         = KEY_TAB;
+     io.KeyMap[ImGuiKey_LeftArrow]   = KEY_LEFT;
+     io.KeyMap[ImGuiKey_RightArrow]  = KEY_RIGHT;

From b4d0647752cbc50b919fbd6723aa9d4068952c13 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 24 Apr 2018 14:21:21 +0000
Subject: [PATCH 0842/3370] coqPackages.mathcomp: 1.6.4 -> 1.7.0

---
 .../coq-modules/autosubst/default.nix         |  5 +++-
 .../coq-modules/coquelicot/default.nix        |  4 ++-
 .../coq-modules/interval/default.nix          |  5 +++-
 .../coq-modules/mathcomp/default.nix          | 26 +++++++++----------
 .../coq-modules/mathcomp/generic.nix          |  4 +--
 .../coq-modules/ssreflect/default.nix         | 26 +++++++++----------
 .../coq-modules/ssreflect/generic.nix         |  4 +--
 7 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix
index 75e78d8ac44f..9c24e77e0f78 100644
--- a/pkgs/development/coq-modules/autosubst/default.nix
+++ b/pkgs/development/coq-modules/autosubst/default.nix
@@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
     platforms = coq.meta.platforms;
   };
 
-  passthru = { inherit (mathcomp) compatibleCoqVersions; };
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+  };
+
 
 }
diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix
index 2e6c95bfe3c1..c4dc8b5fc5b9 100644
--- a/pkgs/development/coq-modules/coquelicot/default.nix
+++ b/pkgs/development/coq-modules/coquelicot/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
     inherit (coq.meta) platforms;
   };
 
-  passthru = { inherit (ssreflect) compatibleCoqVersions; };
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+  };
 
 }
diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix
index b1036e61f1bb..6797a71703b4 100644
--- a/pkgs/development/coq-modules/interval/default.nix
+++ b/pkgs/development/coq-modules/interval/default.nix
@@ -25,6 +25,9 @@ stdenv.mkDerivation {
     platforms = coq.meta.platforms;
   };
 
-  passthru = { inherit (mathcomp) compatibleCoqVersions; };
+  passthru = {
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+  };
+
 
 }
diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix
index 79bced9ad0ee..92c3c87774ab 100644
--- a/pkgs/development/coq-modules/mathcomp/default.nix
+++ b/pkgs/development/coq-modules/mathcomp/default.nix
@@ -1,29 +1,29 @@
 { callPackage, fetchurl, coq }:
 
 let param =
+
+  let param_1_7 = {
+      version = "1.7.0";
+      sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39";
+  }; in
+
   {
     "8.5" =  {
       version = "1.6.1";
-      url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
       sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
     };
 
-    "8.6" =  {
-      version = "1.6.4";
-      url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
-      sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
-    };
-
-    "8.7" = {
-      version = "1.6.4";
-      url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
-      sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
-    };
+    "8.6" = param_1_7;
+    "8.7" = param_1_7;
+    "8.8" = param_1_7;
 
   }."${coq.coq-version}"
 ; in
 
 callPackage ./generic.nix {
   name = "coq${coq.coq-version}-mathcomp-${param.version}";
-  src = fetchurl { inherit (param) url sha256; };
+  src = fetchurl {
+    url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
+    inherit (param) sha256;
+  };
 }
diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix
index 5d39f9b3b0c8..1cc5dc368da3 100644
--- a/pkgs/development/coq-modules/mathcomp/generic.nix
+++ b/pkgs/development/coq-modules/mathcomp/generic.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   buildFlags = stdenv.lib.optionalString withDoc "doc";
 
   preBuild = ''
-    patchShebangs etc/utils/ssrcoqdep
+    patchShebangs etc/utils/ssrcoqdep || true
     cd mathcomp
     export COQBIN=${coq}/bin/
   '';
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
   };
 
 }
diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix
index 3b53a2831e8c..9e9c3c7957aa 100644
--- a/pkgs/development/coq-modules/ssreflect/default.nix
+++ b/pkgs/development/coq-modules/ssreflect/default.nix
@@ -1,29 +1,29 @@
 { callPackage, fetchurl, coq }:
 
 let param =
+
+  let param_1_7 = {
+    version = "1.7.0";
+    sha256 = "05zgyi4wmasi1rcyn5jq42w0bi9713q9m8dl1fdgl66nmacixh39";
+  }; in
+
   {
     "8.5" =  {
       version = "1.6.1";
-      url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz;
       sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw";
     };
 
-    "8.6" =  {
-      version = "1.6.4";
-      url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
-      sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
-    };
-
-    "8.7" = {
-      version = "1.6.4";
-      url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.4.tar.gz;
-      sha256 = "0qmjjb6jsxmmf4gpw10r30rmrvwqgzirvvgyy41mz2vhgwis8wn6";
-    };
+    "8.6" = param_1_7;
+    "8.7" = param_1_7;
+    "8.8" = param_1_7;
 
   }."${coq.coq-version}"
 ; in
 
 callPackage ./generic.nix {
   name = "coq${coq.coq-version}-ssreflect-${param.version}";
-  src = fetchurl { inherit (param) url sha256; };
+  src = fetchurl {
+    url = "https://github.com/math-comp/math-comp/archive/mathcomp-${param.version}.tar.gz";
+    inherit (param) sha256;
+  };
 }
diff --git a/pkgs/development/coq-modules/ssreflect/generic.nix b/pkgs/development/coq-modules/ssreflect/generic.nix
index ca20e17dd50e..a44e81d3c19c 100644
--- a/pkgs/development/coq-modules/ssreflect/generic.nix
+++ b/pkgs/development/coq-modules/ssreflect/generic.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   inherit patches;
 
   preBuild = ''
-    patchShebangs etc/utils/ssrcoqdep
+    patchShebangs etc/utils/ssrcoqdep || true
     cd mathcomp/ssreflect
     export COQBIN=${coq}/bin/
   '';
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
   };
 
   passthru = {
-    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" ];
+    compatibleCoqVersions = v: builtins.elem v [ "8.5" "8.6" "8.7" "8.8" ];
   };
 
 }

From 9c01a7745093c8698c60df066bb50e6060ea1168 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Tue, 1 May 2018 09:13:59 +0000
Subject: [PATCH 0843/3370] gron: 0.5.1 -> 0.5.2

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

diff --git a/pkgs/development/tools/gron/default.nix b/pkgs/development/tools/gron/default.nix
index 59f7360df2ae..14c8f53a3944 100644
--- a/pkgs/development/tools/gron/default.nix
+++ b/pkgs/development/tools/gron/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gron-${version}";
-  version = "0.5.1";
+  version = "0.5.2";
 
   owner = "tomnomnom";
   repo = "gron";
@@ -11,7 +11,7 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     inherit owner repo;
     rev = "v${version}";
-    sha256 = "1s688ynjddchviwbiggnfbw28s4wsff2941f4b1q1j7mfak7iym2";
+    sha256 = "0nxcvih8n5a4f0a53dxaipab5ckqxgnsznzymhfw5kv4inr9v6j6";
   };
 
   goDeps = ./deps.nix;

From 519b64592d5bd89c0975b44120b88ec2684d8352 Mon Sep 17 00:00:00 2001
From: Julien Langlois <langlois.jf@gmail.com>
Date: Tue, 1 May 2018 02:36:36 -0700
Subject: [PATCH 0844/3370] hitch: init at 1.4.8 + service + test (#39358)

Add the Hitch TLS reverse proxy as an option for TLS termination.
---
 maintainers/maintainer-list.nix               |   5 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/web-servers/hitch/default.nix    | 108 ++++++++++++++++++
 nixos/release.nix                             |   1 +
 nixos/tests/hitch/default.nix                 |  33 ++++++
 nixos/tests/hitch/example.pem                 |  53 +++++++++
 nixos/tests/hitch/example/index.txt           |   1 +
 pkgs/servers/hitch/default.nix                |  23 ++++
 pkgs/top-level/all-packages.nix               |   2 +
 9 files changed, 227 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/hitch/default.nix
 create mode 100644 nixos/tests/hitch/default.nix
 create mode 100644 nixos/tests/hitch/example.pem
 create mode 100644 nixos/tests/hitch/example/index.txt
 create mode 100644 pkgs/servers/hitch/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aec6f67a9191..14fd53b2f492 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1760,6 +1760,11 @@
     github = "tftio";
     name = "James Felix Black";
   };
+  jflanglois = {
+    email = "yourstruly@julienlanglois.me";
+    github = "jflanglois";
+    name = "Julien Langlois";
+  };
   jfrankenau = {
     email = "johannes@frankenau.net";
     github = "jfrankenau";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b0889e62f7c5..38f961c0467a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -651,6 +651,7 @@
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/caddy.nix
   ./services/web-servers/fcgiwrap.nix
+  ./services/web-servers/hitch/default.nix
   ./services/web-servers/jboss/default.nix
   ./services/web-servers/lighttpd/cgit.nix
   ./services/web-servers/lighttpd/collectd.nix
diff --git a/nixos/modules/services/web-servers/hitch/default.nix b/nixos/modules/services/web-servers/hitch/default.nix
new file mode 100644
index 000000000000..895d02827f71
--- /dev/null
+++ b/nixos/modules/services/web-servers/hitch/default.nix
@@ -0,0 +1,108 @@
+{ config, lib, pkgs, ...}:
+let
+  cfg = config.services.hitch;
+  ocspDir = lib.optionalString cfg.ocsp-stapling.enabled "/var/cache/hitch/ocsp";
+  hitchConfig = with lib; pkgs.writeText "hitch.conf" (concatStringsSep "\n" [
+    ("backend = \"${cfg.backend}\"")
+    (concatMapStrings (s: "frontend = \"${s}\"\n") cfg.frontend)
+    (concatMapStrings (s: "pem-file = \"${s}\"\n") cfg.pem-files)
+    ("ciphers = \"${cfg.ciphers}\"")
+    ("ocsp-dir = \"${ocspDir}\"")
+    "user = \"${cfg.user}\""
+    "group = \"${cfg.group}\""
+    cfg.extraConfig
+  ]);
+in
+with lib;
+{
+  options = {
+    services.hitch = {
+      enable = mkEnableOption "Hitch Server";
+
+      backend = mkOption {
+        type = types.str;
+        description = ''
+          The host and port Hitch connects to when receiving
+          a connection in the form [HOST]:PORT
+        '';
+      };
+
+      ciphers = mkOption {
+        type = types.str;
+        default = "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH";
+        description = "The list of ciphers to use";
+      };
+
+      frontend = mkOption {
+        type = types.either types.str (types.listOf types.str);
+        default = "[127.0.0.1]:443";
+        description = ''
+          The port and interface of the listen endpoint in the
++         form [HOST]:PORT[+CERT].
+        '';
+        apply = toList;
+      };
+
+      pem-files = mkOption {
+        type = types.listOf types.path;
+        default = [];
+        description = "PEM files to use";
+      };
+
+      ocsp-stapling = {
+        enabled = mkOption {
+          type = types.bool;
+          default = true;
+          description = "Whether to enable OCSP Stapling";
+        };
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "hitch";
+        description = "The user to run as";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "hitch";
+        description = "The group to run as";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Additional configuration lines";
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.hitch = {
+      description = "Hitch";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      preStart = ''
+        ${pkgs.hitch}/sbin/hitch -t --config ${hitchConfig}
+      '' + (optionalString cfg.ocsp-stapling.enabled ''
+        mkdir -p ${ocspDir}
+        chown -R hitch:hitch ${ocspDir}
+      '');
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "${pkgs.hitch}/sbin/hitch --daemon --config ${hitchConfig}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        Restart = "always";
+        RestartSec = "5s";
+        LimitNOFILE = 131072;
+      };
+    };
+
+    environment.systemPackages = [ pkgs.hitch ];
+
+    users.extraUsers.hitch.group = "hitch";
+    users.extraGroups.hitch = {};
+  };
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index 4ad947f11d10..5b6640f1d3cc 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -297,6 +297,7 @@ in rec {
   tests.graphite = callTest tests/graphite.nix {};
   tests.hardened = callTest tests/hardened.nix { };
   tests.hibernate = callTest tests/hibernate.nix {};
+  tests.hitch = callTest tests/hitch {};
   tests.home-assistant = callTest tests/home-assistant.nix { };
   tests.hound = callTest tests/hound.nix {};
   tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {};
diff --git a/nixos/tests/hitch/default.nix b/nixos/tests/hitch/default.nix
new file mode 100644
index 000000000000..b024306cde56
--- /dev/null
+++ b/nixos/tests/hitch/default.nix
@@ -0,0 +1,33 @@
+import ../make-test.nix ({ pkgs, ... }:
+{
+  name = "hitch";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ jflanglois ];
+  };
+  machine = { config, pkgs, ... }: {
+    environment.systemPackages = [ pkgs.curl ];
+    services.hitch = {
+      enable = true;
+      backend = "[127.0.0.1]:80";
+      pem-files = [
+        ./example.pem
+      ];
+    };
+
+    services.httpd = {
+      enable = true;
+      documentRoot = ./example;
+      adminAddr = "noone@testing.nowhere";
+    };
+  };
+
+  testScript =
+    ''
+      startAll;
+
+      $machine->waitForUnit('multi-user.target');
+      $machine->waitForUnit('hitch.service');
+      $machine->waitForOpenPort(443);
+      $machine->succeed('curl -k https://localhost:443/index.txt | grep "We are all good!"');
+    '';
+})
diff --git a/nixos/tests/hitch/example.pem b/nixos/tests/hitch/example.pem
new file mode 100644
index 000000000000..fde6f3cbd19a
--- /dev/null
+++ b/nixos/tests/hitch/example.pem
@@ -0,0 +1,53 @@
+-----BEGIN CERTIFICATE-----
+MIIEKTCCAxGgAwIBAgIJAIFAWQXSZ7lIMA0GCSqGSIb3DQEBCwUAMIGqMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEVMBMGA1UEBwwMUmVkd29vZCBD
+aXR5MRkwFwYDVQQKDBBUZXN0aW5nIDEyMyBJbmMuMRQwEgYDVQQLDAtJVCBTZXJ2
+aWNlczEYMBYGA1UEAwwPdGVzdGluZy5ub3doZXJlMSQwIgYJKoZIhvcNAQkBFhVu
+b29uZUB0ZXN0aW5nLm5vd2hlcmUwHhcNMTgwNDIzMDcxMTI5WhcNMTkwNDIzMDcx
+MTI5WjCBqjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFTATBgNV
+BAcMDFJlZHdvb2QgQ2l0eTEZMBcGA1UECgwQVGVzdGluZyAxMjMgSW5jLjEUMBIG
+A1UECwwLSVQgU2VydmljZXMxGDAWBgNVBAMMD3Rlc3Rpbmcubm93aGVyZTEkMCIG
+CSqGSIb3DQEJARYVbm9vbmVAdGVzdGluZy5ub3doZXJlMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAxQq6AA9o/QErMbQwfgDF4mqXcvglRTwPr2zPE6Rv
+1g0ncRBSMM8iKbPapHM6qHNfg2e1fU2SFqzD6HkyZqHHLCgLzkdzswEcEjsMqiUP
+OR++5g4CWoQrdTi31itzYzCjnQ45BrAMrLEhBQgDTNwrEE+Tit0gpOGggtj/ktLk
+OD8BKa640lkmWEUGF18fd3rYTUC4hwM5qhAVXTe21vj9ZWsgprpQKdN61v0dCUap
+C5eAgvZ8Re+Cd0Id674hK4cJ4SekqfHKv/jLyIg3Vsdc9nkhmiC4O6KH5f1Zzq2i
+E4Kd5mnJDFxfSzIErKWmbhriLWsj3KEJ983AGLJ9hxQTAwIDAQABo1AwTjAdBgNV
+HQ4EFgQU76Mm6DP/BePJRQUNrJ9z038zjocwHwYDVR0jBBgwFoAU76Mm6DP/BePJ
+RQUNrJ9z038zjocwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAAZzt
+VdPaUqrvDAh5rMYqzYMJ3tj6daNYoX6CbTFoevK5J5D4FESM0D/FMKgpNiVz39kB
+8Cjaw5rPHMHY61rHz7JRDK1sWXsonwzCF21BK7Tx0G1CIfLpYHWYb/FfdWGROx+O
+hPgKuoMRWQB+txozkZp5BqWJmk5MOyFCDEXhMOmrfsJq0IYU6QaH3Lsf1oJRy4yU
+afFrT9o3DLOyYLG/j/HXijCu8DVjZVa4aboum79ecYzPjjGF1posrFUnvQiuAeYy
+t7cuHNUB8gW9lWR5J7tP8fzFWtIcyT2oRL8u3H+fXf0i4bW73wtOBOoeULBzBNE7
+6rphcSrQunSZQIc+hg==
+-----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDFCroAD2j9ASsx
+tDB+AMXiapdy+CVFPA+vbM8TpG/WDSdxEFIwzyIps9qkczqoc1+DZ7V9TZIWrMPo
+eTJmoccsKAvOR3OzARwSOwyqJQ85H77mDgJahCt1OLfWK3NjMKOdDjkGsAyssSEF
+CANM3CsQT5OK3SCk4aCC2P+S0uQ4PwEprrjSWSZYRQYXXx93ethNQLiHAzmqEBVd
+N7bW+P1layCmulAp03rW/R0JRqkLl4CC9nxF74J3Qh3rviErhwnhJ6Sp8cq/+MvI
+iDdWx1z2eSGaILg7oofl/VnOraITgp3mackMXF9LMgSspaZuGuItayPcoQn3zcAY
+sn2HFBMDAgMBAAECggEAcaR8HijFHpab+PC5vxJnDuz3KEHiDQpU6ZJR5DxEnCm+
+A8GsBaaRR4gJpCspO5o/DiS0Ue55QUanPt8XqIXJv7fhBznCiw0qyYDxDviMzR94
+FGskBFySS+tIa+dnh1+4HY7kaO0Egl0udB5o+N1KoP+kUsSyXSYcUxsgW+fx5FW9
+22Ya3HNWnWxMCSfSGGlTFXGj2whf25SkL25dM9iblO4ZOx4MX8kaXij7TaYy8hMM
+Vf6/OMnXqtPKho+ctZZVKZkE9PxdS4f/pnp5EsdoOZwNBtfQ1WqVLWd3DlGWhnsH
+7L8ZSP2HkoI4Pd1wtkpOKZc+yM2bFXWa8WY4TcmpUQKBgQD33HxGdtmtZehrexSA
+/ZwWJlMslUsNz4Ivv6s7J4WCRhdh94+r9TWQP/yHdT9Ry5bvn84I5ZLUdp+aA962
+mvjz+GIglkCGpA7HU/hqurB1O63pj2cIDB8qhV21zjVIoqXcQ7IBJ+tqD79nF8vm
+h3KfuHUhuu1rayGepbtIyNhLdwKBgQDLgw4TJBg/QB8RzYECk78QnfZpCExsQA/z
+YJpc+dF2/nsid5R2u9jWzfmgHM2Jjo2/+ofRUaTqcFYU0K57CqmQkOLIzsbNQoYt
+e2NOANNVHiZLuzTZC2r3BrrkNbo3YvQzhAesUA5lS6LfrxBLUKiwo2LU9NlmJs3b
+UPVFYI0/1QKBgCswxIcS1sOcam+wNtZzWuuRKhUuvrFdY3YmlBPuwxj8Vb7AgMya
+IgdM3xhLmgkKzPZchm6OcpOLSCxyWDDBuHfq5E6BYCUWGW0qeLNAbNdA2wFD99Qz
+KIskSjwP/sD1dql3MmF5L1CABf5U6zb0i0jBv8ds50o8lNMsVgJM3UPpAoGBAL1+
+nzllb4pdi1CJWKnspoizfQCZsIdPM0r71V/jYY36MO+MBtpz2NlSWzAiAaQm74gl
+oBdgfT2qMg0Zro11BSRONEykdOolGkj5TiMQk7b65s+3VeMPRZ8UTis2d9kgs5/Q
+PVDODkl1nwfGu1ZVmW04BUujXVZHpYCkJm1eFMetAoGAImE7gWj+qRMhpbtCCGCg
+z06gDKvMrF6S+GJsvUoSyM8oUtfdPodI6gWAC65NfYkIiqbpCaEVNzfui73f5Lnz
+p5X1IbzhuH5UZs/k5A3OR2PPDbPs3lqEw7YJdBdLVRmO1o824uaXaJJwkL/1C+lq
+8dh1wV3CnynNmZApkz4vpzQ=
+-----END PRIVATE KEY-----
diff --git a/nixos/tests/hitch/example/index.txt b/nixos/tests/hitch/example/index.txt
new file mode 100644
index 000000000000..0478b1c26351
--- /dev/null
+++ b/nixos/tests/hitch/example/index.txt
@@ -0,0 +1 @@
+We are all good!
diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix
new file mode 100644
index 000000000000..366934829b86
--- /dev/null
+++ b/pkgs/servers/hitch/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, docutils, libev, openssl, pkgconfig }:
+stdenv.mkDerivation rec {
+  version = "1.4.8";
+  name = "hitch-${version}";
+
+  src = fetchurl {
+    url = "https://hitch-tls.org/source/${name}.tar.gz";
+    sha256 = "1hqs5p69gr1lb3xldbrgq7d6d0vk4za0wpizlzybn98cv68acaym";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ docutils libev openssl ];
+
+  outputs = [ "out" "doc" "man" ];
+
+  meta = with stdenv.lib; {
+    description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software";
+    homepage = https://hitch-tls.org/;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.jflanglois ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20cf36a05fb..4f9644f9bd56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5611,6 +5611,8 @@ with pkgs;
   varnishPackages = varnish5Packages;
   varnish = varnishPackages.varnish;
 
+  hitch = callPackage ../servers/hitch { };
+
   venus = callPackage ../tools/misc/venus {
     python = python27;
   };

From 175705b6ceec23b638965921582f54d3c75e8c65 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 1 May 2018 11:33:24 +0200
Subject: [PATCH 0845/3370] sshfs: 3.3.1 -> 3.3.2

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 6fd55c369d59..6f2fb68775df 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -5,14 +5,14 @@
 let
   inherit (stdenv.lib) optional;
 in stdenv.mkDerivation rec {
-  version = "3.3.1";
+  version = "3.3.2";
   name = "sshfs-fuse-${version}";
 
   src = fetchFromGitHub {
     owner = "libfuse";
     repo = "sshfs";
     rev = "sshfs-${version}";
-    sha256 = "15z1mlad09llckkadvjfzmbv14fbq218xmb4axkmi7kzixbi41hv";
+    sha256 = "01nrdprkqynk20yw6zdn6w8xv4hdw47g5d0v5qvfw0wls2kmadyr";
   };
 
   nativeBuildInputs = [ meson pkgconfig ninja docutils ];

From b8f9b2e55266d7f41b1056fb2238e4bc0b69f36e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 1 May 2018 11:41:50 +0200
Subject: [PATCH 0846/3370] androidStudioPackages.{dev,canary}: 3.2.0.11 ->
 3.2.0.12

---
 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 75385275ec84..630f5dd34471 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
   };
   latestVersion = {
-    version = "3.2.0.11"; # "Android Studio 3.2 Canary 12"
-    build = "181.4729833";
-    sha256Hash = "1b976m59d230pl35ajhdic46cw8qmnykkbrg3l7am7zmih0zk64c";
+    version = "3.2.0.12"; # "Android Studio 3.2 Canary 13"
+    build = "181.4749738";
+    sha256Hash = "0mwsbmxzrs7yavgkckpmfvpz46v7fpa0nxvf8zqa9flmsv8p8l10";
   };
 in rec {
   # Old alias

From 3434cf40e12d8c99d35bd7ef4272ff7cf0f9a64c Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 24 Apr 2018 01:27:51 +0900
Subject: [PATCH 0847/3370] gnucash: 2.4.15 -> 3.1-1

---
 pkgs/applications/office/gnucash/default.nix | 102 +++++++++++--------
 pkgs/top-level/all-packages.nix              |   6 +-
 2 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index 252c6d878d0c..d12b1327e8f7 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -1,63 +1,81 @@
-{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
-, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
-, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
-, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
+{ fetchurl, stdenv, pkgconfig, makeWrapper, cmake, gtest
+, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales
+, webkit, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
+, libdbiDrivers, guile, perl, perlPackages
 }:
 
-/* If you experience GConf errors when running GnuCash on NixOS, see
- * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications
- * for a possible solution.
- */
+let
+
+  # Enable gnc-fq-* to run in command line.
+  perlWrapper = stdenv.mkDerivation {
+    name = perl.name + "-wrapper-for-gnucash";
+    nativeBuildInputs = [ makeWrapper ];
+    buildInputs = [ perl ] ++ (with perlPackages; [ FinanceQuote DateManip ]);
+    phases = [ "installPhase" ];
+    installPhase = ''
+      mkdir -p $out/bin
+      for script in ${perl}/bin/*; do
+        makeWrapper $script $out''${script#${perl}} \
+          --prefix "PERL5LIB" ":" "$PERL5LIB"
+      done
+    '';
+  };
+
+in
 
 stdenv.mkDerivation rec {
-  name = "gnucash-2.4.15";
+  name = "gnucash-${version}";
+  version = "3.1-1";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
+    sha256 = "0qfjpmr6hnr0v7l2fi00rilnlyan4kqiyygyidxlpdxqqg76dvx1";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
-    libgnomeprint goffice enchant gettext intltool perl guile slibGuile
-    swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
-    perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
-  ];
-  propagatedUserEnvPkgs = [ gconf ];
+  nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];
 
-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
+  buildInputs = [
+    boost icu libxml2 libxslt gettext swig isocodes gtk3 glibcLocales
+    webkit dconf hicolor-icon-theme libofx aqbanking gwenhywfar libdbi
+    libdbiDrivers guile perlWrapper
+  ];
+
+  propagatedUserEnvPkgs = [ dconf ];
+
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  makeFlags = [ "GUILE_AUTO_COMPILE=0" ];
 
   postInstall = ''
     # Auto-updaters don't make sense in Nix.
     rm $out/bin/gnc-fq-update
 
-    sed -i $out/bin/update-gnucash-gconf \
-       -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
+    # Unnecessary in the release build.
+    rm $out/bin/gnucash-valgrind
 
-    for prog in $(echo "$out/bin/"*)
-    do
-      # Don't wrap the gnc-fq-* scripts, since gnucash calls them as
-      # "perl <script>', i.e. they must be Perl scripts.
-      if [[ $prog =~ gnc-fq ]]; then continue; fi
-      wrapProgram "$prog"                                               \
-        --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH"                \
-        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"                 \
-        --prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0"   \
-        --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0"  \
-        --prefix PERL5LIB ":" "$PERL5LIB"                               \
-        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
-        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
-    done
-
-    rm $out/share/icons/hicolor/icon-theme.cache
+    wrapProgram "$out/bin/gnucash" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
+      --prefix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
+      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
   '';
 
-  # The following settings fix failures in the test suite. It's not required otherwise.
-  NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
-  preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
-
-  doCheck = false;      # https://github.com/NixOS/nixpkgs/issues/11084
+  # TODO: The following tests FAILED:
+  #   61 - test-gnc-timezone (Failed)
+  #   70 - test-load-c (Failed)
+  #   71 - test-modsysver (Failed)
+  #   72 - test-incompatdep (Failed)
+  #   73 - test-agedver (Failed)
+  #   77 - test-gnc-module-swigged-c (Failed)
+  #   78 - test-gnc-module-load-deps (Failed)
+  #   80 - test-gnc-module-scm-module (Failed)
+  #   81 - test-gnc-module-scm-multi (Failed)
+  preCheck = ''
+    export LD_LIBRARY_PATH=$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$LD_LIBRARY_PATH
+    export NIX_CFLAGS_LINK="-lgtest -lgtest_main"
+  '';
+  doCheck = false;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20cf36a05fb..3f55a560d6a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15965,11 +15965,7 @@ with pkgs;
   gmrun = callPackage ../applications/misc/gmrun {};
 
   gnucash = callPackage ../applications/office/gnucash {
-    inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl;
-    gconf = gnome2.GConf;
-    guile = guile_1_8;
-    slibGuile = slibGuile.override { scheme = guile_1_8; };
-    goffice = goffice_0_8;
+    inherit (gnome3) dconf;
   };
 
   gnucash26 = lowPrio (callPackage ../applications/office/gnucash/2.6.nix {

From 8ab8d9cb74e75de46e647a5d77c137f7ef3ebd2b Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 2 Apr 2018 15:02:43 -0400
Subject: [PATCH 0848/3370] Add user channels to the default nix path

---
 nixos/doc/manual/release-notes/rl-1809.xml | 15 +++++++++++++--
 nixos/modules/services/misc/nix-daemon.nix |  4 +++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 959bd86759b1..111d6636dd81 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -20,10 +20,21 @@ has the following highlights: </para>
 <itemizedlist>
   <listitem>
     <para>
-      TODO
+      User channels are now in the default <literal>NIX_PATH</literal>,
+      allowing users to use their personal <command>nix-channel</command>
+      defined channels in <command>nix-build</command> and
+      <command>nix-shell</command> commands, as well as in imports like
+      <code>import &lt;mychannel&gt;</code>.
     </para>
+    <para>For example</para>
+    <programlisting>
+$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgsunstable
+$ nix-channel --update
+$ nix-build '&lt;nixpkgsunstable&gt;' -A gitFull
+$ nix run -f '&lt;nixpkgsunstable&gt;' gitFull
+$ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
+</programlisting>
   </listitem>
-
 </itemizedlist>
 
 </section>
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index ea964fd68e43..d2d29962ce6f 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -338,7 +338,9 @@ in
       nixPath = mkOption {
         type = types.listOf types.str;
         default =
-          [ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs"
+          [
+            "$HOME/.nix-defexpr/channels"
+            "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
             "/nix/var/nix/profiles/per-user/root/channels"
           ];

From b2c0126b94bd76503e8909e70ac98d730add0bbf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 19 Apr 2018 17:47:32 +0200
Subject: [PATCH 0849/3370] python.pkgs.jira: init at 1.0.14

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

diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
new file mode 100644
index 000000000000..0d38e741962b
--- /dev/null
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pbr, glibcLocales
+, pytestcov
+, requests, requests_oauthlib, requests_toolbelt, defusedxml }:
+
+buildPythonPackage rec {
+  pname = "jira";
+  version = "1.0.14";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1xncrcaqgj0gnva3bz5c4vwnn7z84v9cmr37pc93zx676w62fpm3";
+  };
+
+  buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ];
+  propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml ];
+
+  LC_ALL = "en_US.utf8";
+
+  # no tests in release tarball
+  doCheck = false;
+
+  meta = with lib; {
+    description = "This library eases the use of the JIRA REST API from Python.";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ globin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6635721ee958..02fcb325527d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -271,6 +271,8 @@ in {
 
   intelhex = callPackage ../development/python-modules/intelhex { };
 
+  jira = callPackage ../development/python-modules/jira { };
+
   lmtpd = callPackage ../development/python-modules/lmtpd { };
 
   logster = callPackage ../development/python-modules/logster { };

From d868a6cdeb436112a4663e5c463a19e211138f02 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 May 2018 12:53:11 +0200
Subject: [PATCH 0850/3370] python.pkgs.jira: disable on python2

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

diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
index 0d38e741962b..03f1abd7abca 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -1,5 +1,5 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, pytestrunner, pbr, glibcLocales
-, pytestcov
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, pytest, pytestrunner, pbr, glibcLocales , pytestcov
 , requests, requests_oauthlib, requests_toolbelt, defusedxml }:
 
 buildPythonPackage rec {
@@ -16,6 +16,8 @@ buildPythonPackage rec {
 
   LC_ALL = "en_US.utf8";
 
+  disabled = !isPy3k;
+
   # no tests in release tarball
   doCheck = false;
 

From bf2e5123774f8928fa9441a70d375ac1f5317ad5 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 May 2018 13:04:23 +0200
Subject: [PATCH 0851/3370] python.pkgs.errbot-rocket: add patch to fix IPv6

---
 .../python-modules/rocket-errbot/default.nix  | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 10 +-------
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/rocket-errbot/default.nix

diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix
new file mode 100644
index 000000000000..2d2b3af0694f
--- /dev/null
+++ b/pkgs/development/python-modules/rocket-errbot/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchurl, fetchpatch, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "rocket-errbot-${version}";
+  version = "1.2.5";
+
+  src = fetchurl {
+    url = "mirror://pypi/r/rocket-errbot/${name}.tar.gz";
+    sha256 = "181y1wqjvlry5xdzbliajvrxvswzh3myh795jnj1pm92r5grqzda";
+  };
+
+  # remove with 1.2.6
+  patches = [ (fetchpatch {
+    url = "https://github.com/errbotio/rocket/pull/1.patch";
+    sha256 = "0v9zjp4ls32vkpr4b6kjflz4ny2fwj6hwshbnjmhdzc4hnmnzf7x";
+  }) ];
+
+  meta = {
+    homepage = https://github.com/errbotio/rocket;
+    description = "Modern, multi-threaded and extensible web server";
+    license = lib.licenses.mit;
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 02fcb325527d..3e2375637d2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17863,15 +17863,7 @@ EOF
     };
   };
 
-  rocket-errbot = buildPythonPackage rec {
-    name = "rocket-errbot-${version}";
-    version = "1.2.5";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rocket-errbot/${name}.tar.gz";
-      sha256 = "181y1wqjvlry5xdzbliajvrxvswzh3myh795jnj1pm92r5grqzda";
-    };
-  };
+  rocket-errbot = callPackage ../development/python-modules/rocket-errbot {  };
 
   Yapsy = buildPythonPackage rec {
     name = "Yapsy-${version}";

From 6f76d907c8d42ee017dcbb905eb3cb72fa2d6710 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 5 Jun 2017 22:10:58 +0200
Subject: [PATCH 0852/3370] pythonPackages.sleekxmpp: fix dnspython issue

---
 .../python-modules/sleekxmpp/default.nix      | 23 ++++++++
 .../sleekxmpp/dnspython-ip6.patch             | 55 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 pkgs/development/python-modules/sleekxmpp/default.nix
 create mode 100644 pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch

diff --git a/pkgs/development/python-modules/sleekxmpp/default.nix b/pkgs/development/python-modules/sleekxmpp/default.nix
new file mode 100644
index 000000000000..c6444224104f
--- /dev/null
+++ b/pkgs/development/python-modules/sleekxmpp/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, buildPythonPackage, dns, pyasn1 }:
+
+buildPythonPackage rec {
+  name = "sleekxmpp-${version}";
+  version = "1.3.1";
+
+  propagatedBuildInputs = [ dns pyasn1 ];
+
+  patches = [
+    ./dnspython-ip6.patch
+  ];
+
+  src = fetchurl {
+    url = "mirror://pypi/s/sleekxmpp/${name}.tar.gz";
+    sha256 = "1krkhkvj8xw5a6c2xlf7h1rg9xdcm9d8x2niivwjahahpvbl6krr";
+  };
+
+  meta = with stdenv.lib; {
+    description = "XMPP library for Python";
+    license = licenses.mit;
+    homepage = "http://sleekxmpp.com/";
+  };
+}
diff --git a/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch b/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch
new file mode 100644
index 000000000000..d8d6eb106838
--- /dev/null
+++ b/pkgs/development/python-modules/sleekxmpp/dnspython-ip6.patch
@@ -0,0 +1,55 @@
+--- a/sleekxmpp/xmlstream/resolver.py
++++ b/sleekxmpp/xmlstream/resolver.py
+@@ -175,6 +175,9 @@ def get_A(host, resolver=None, use_dnspy
+     """
+     log.debug("DNS: Querying %s for A records." % host)
+
++    if isinstance(host, bytes):
++        host = host.decode("utf-8")
++
+     # If not using dnspython, attempt lookup using the OS level
+     # getaddrinfo() method.
+     if resolver is None or not use_dnspython:
+@@ -189,7 +192,10 @@ def get_A(host, resolver=None, use_dnspy
+     # Using dnspython:
+     try:
+         recs = resolver.query(host, dns.rdatatype.A)
+-        return [rec.to_text() for rec in recs]
++        if isinstance(recs[0].to_text(), bytes):
++            return [rec.to_text().decode("utf-8") for rec in recs]
++        else:
++            return [rec.to_text() for rec in recs]
+     except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
+         log.debug("DNS: No A records for %s" % host)
+         return []
+@@ -222,6 +228,9 @@ def get_AAAA(host, resolver=None, use_dn
+     """
+     log.debug("DNS: Querying %s for AAAA records." % host)
+
++    if isinstance(host, bytes):
++        host = host.decode("utf-8")
++
+     # If not using dnspython, attempt lookup using the OS level
+     # getaddrinfo() method.
+     if resolver is None or not use_dnspython:
+@@ -240,7 +249,10 @@ def get_AAAA(host, resolver=None, use_dn
+     # Using dnspython:
+     try:
+         recs = resolver.query(host, dns.rdatatype.AAAA)
+-        return [rec.to_text() for rec in recs]
++        if isinstance(recs[0].to_text(), bytes):
++            return [rec.to_text().decode("utf-8") for rec in recs]
++        else:
++            return [rec.to_text() for rec in recs]
+     except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
+         log.debug("DNS: No AAAA records for %s" % host)
+         return []
+@@ -324,6 +336,8 @@ def get_SRV(host, port, service, proto='
+                 if running_sum >= selected:
+                     rec = sums[running_sum]
+                     host = rec.target.to_text()
++                    if isinstance(host, bytes):
++                        host = host.decode("utf-8")
+                     if host.endswith('.'):
+                         host = host[:-1]
+                     sorted_recs.append((host, rec.port))

From 926f312cf4040dc0df0e1c35f4ffd1f4f8793479 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 May 2018 13:24:41 +0200
Subject: [PATCH 0853/3370] python.pkgs.httplib2: 0.9.2 -> 0.11.3

---
 .../python-modules/httplib2/default.nix        | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 16 +---------------
 2 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/httplib2/default.nix

diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
new file mode 100644
index 000000000000..197e646027c4
--- /dev/null
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "httplib2";
+  version = "0.11.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1pyb0hmc0j0kcy27yiw38gq9pk7f1fkny5k1vd13cdz6l3csw7g7";
+  };
+
+  meta = with lib; {
+    homepage = http://code.google.com/p/httplib2;
+    description = "A comprehensive HTTP client library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ garbas ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e2375637d2a..a97c023ca0fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6414,21 +6414,7 @@ in {
 
   httpbin = callPackage ../development/python-modules/httpbin { };
 
-  httplib2 = buildPythonPackage rec {
-    name = "httplib2-0.9.2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/h/httplib2/${name}.tar.gz";
-      sha256 = "126rsryvw9vhbf3qmsfw9lf4l4xm2srmgs439lgma4cpag4s3ay3";
-    };
-
-    meta = {
-      homepage = http://code.google.com/p/httplib2;
-      description = "A comprehensive HTTP client library";
-      license = licenses.mit;
-      maintainers = with maintainers; [ garbas ];
-    };
-  };
+  httplib2 = callPackage ../development/python-modules/httplib2 { };
 
   hvac = callPackage ../development/python-modules/hvac { };
 

From f5c0b3f887a90c0dee1467d6e3ac151d4a2e9649 Mon Sep 17 00:00:00 2001
From: Michele Catalano <michele.catalano@mayflower.de>
Date: Sun, 4 Feb 2018 14:15:47 +0100
Subject: [PATCH 0854/3370] nixos/docker-registry: add more configuration
 options for docker-registry

---
 .../modules/services/misc/docker-registry.nix | 79 ++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 96ac2a1cf2c9..4866ecf7793a 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -5,6 +5,57 @@ with lib;
 let
   cfg = config.services.dockerRegistry;
 
+  blogCache = if cfg.enableRedisCache
+      then "redis"
+      else "inmemory";
+
+  registryConfig = {
+    version =  "0.1";
+    log = {
+      fields = {
+        service = "registry";
+      };
+    };
+    storage = {
+      cache = {
+        blobdescriptor = "${blogCache}";
+      };
+      filesystem = {
+        rootdirectory = "/var/lib/registry";
+      };
+      delete = {
+        enabled = cfg.enableDelete;
+      };
+    };
+    http = {
+      addr = ":5000";
+      headers = {
+        X-Content-Type-Options = "[nosniff]";
+      };
+    };
+    health = {
+      storagedriver = {
+        enabled = true;
+        interval = "10s";
+        threshold = 3;
+      };
+    };
+  };
+
+  registryConfig.redis = mkIf cfg.enableRedisCache {
+    addr = "${cfg.redisUrl}";
+    password = "${cfg.redisPassword}";
+    db = 0;
+    dialtimeout = "10ms";
+    readtimeout = "10ms";
+    writetimeout = "10ms";
+    pool = {
+      maxidle = 16;
+      maxactive = 64;
+      idletimeout = "300s";
+    };
+  };
+
 in {
   options.services.dockerRegistry = {
     enable = mkEnableOption "Docker Registry";
@@ -27,6 +78,30 @@ in {
       description = "Docker registry storage path.";
     };
 
+    enableDelete = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable delete for manifests and blobs.";
+    };
+
+    enableRedisCache = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Enable redis as blob cache instade of inmemory.";
+    };
+
+    redisUrl = mkOption {
+      type = types.str;
+      default = "localhost:6379";
+      description = "Set redis host and port.";
+    };
+
+    redisPassword = mkOption {
+      type = types.str;
+      default = "asecret";
+      description = "Set redis password.";
+    };
+
     extraConfig = mkOption {
       description = ''
         Docker extra registry configuration via environment variables.
@@ -37,6 +112,8 @@ in {
   };
 
   config = mkIf cfg.enable {
+    environment.etc."docker/registry/config.yml".text = builtins.toJSON registryConfig;
+
     systemd.services.docker-registry = {
       description = "Docker Container Registry";
       wantedBy = [ "multi-user.target" ];
@@ -49,7 +126,7 @@ in {
 
       script = ''
         ${pkgs.docker-distribution}/bin/registry serve \
-          ${pkgs.docker-distribution.out}/share/go/src/github.com/docker/distribution/cmd/registry/config-example.yml
+          /etc/docker/registry/config.yml
       '';
 
       serviceConfig = {

From 21a29c27202c890ca38de717237e064a0668aa11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:29:45 -0700
Subject: [PATCH 0855/3370] lr: 1.3 -> 1.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/lr/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/cwrqw239bf9kd1d82ljq7506j4ri4p8i-lr-1.4/bin/lr -h’ got 0 exit code
- directory tree listing: https://gist.github.com/7ffd474460d7e46863b9b0cf42f9c791
---
 pkgs/tools/system/lr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
index 8fac35fbe431..f4b451026d11 100644
--- a/pkgs/tools/system/lr/default.nix
+++ b/pkgs/tools/system/lr/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lr-${version}";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "chneukirchen";
     repo = "lr";
     rev = "v${version}";
-    sha256 = "0g4iqz8ddv7dsrfhx0828bmc16ff8qp8xh5ya9f0n5qj4zh4cn35";
+    sha256 = "0lwnd5whq5f0czhqgaj4y6myzw4wssk6bji4z3dck95c8rpvg05a";
   };
 
   makeFlags = "PREFIX=$(out)";

From 593dc4514192354491473ba00e1b9104f456c50c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 26 Mar 2018 13:54:01 +0200
Subject: [PATCH 0856/3370] nixos/docker-registry: cleanup module definition &
 enhance testcase

The following changes have been applied:

- the property `http.headers.X-Content-Type-Options` must a list of
  strings rather than a serialized list
- instead of `/etc/docker/registry/config.yml` the configuration will be
  written with `pkgs.writeText` and the store path will be used to run
  the registry. This reduces the risk of possible impurities by relying
  on the Nix store only.
- cleaned up the property paths to easy readability and reduce the
  verbosity.
- enhanced the testcase to ensure that digests can be deleted as well
- the `services.docker-registry.extraConfig` object will be merged with
  `registryConfig`

/cc @ironpinguin
---
 nixos/doc/manual/release-notes/rl-1809.xml    |  7 +++
 .../modules/services/misc/docker-registry.nix | 57 ++++++-------------
 nixos/tests/docker-registry.nix               |  8 ++-
 3 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 62f1b769463b..5ff5caaf2554 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -77,6 +77,13 @@ following incompatible changes:</para>
       accepted by the nc command.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <varname>services.docker-registry.extraConfig</varname> object doesn't contain
+      environment variables anymore. Instead it needs to provide an object structure
+      that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
+    </para>
+  </listitem>
 </itemizedlist>
 
 </section>
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 4866ecf7793a..c0dbcf380db3 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -5,40 +5,26 @@ with lib;
 let
   cfg = config.services.dockerRegistry;
 
-  blogCache = if cfg.enableRedisCache
-      then "redis"
-      else "inmemory";
+  blobCache = if cfg.enableRedisCache
+    then "redis"
+    else "inmemory";
 
   registryConfig = {
     version =  "0.1";
-    log = {
-      fields = {
-        service = "registry";
-      };
-    };
+    log.fields.service = "registry";
     storage = {
-      cache = {
-        blobdescriptor = "${blogCache}";
-      };
-      filesystem = {
-        rootdirectory = "/var/lib/registry";
-      };
-      delete = {
-        enabled = cfg.enableDelete;
-      };
+      cache.blobdescriptor = blobCache;
+      filesystem.rootdirectory = cfg.storagePath;
+      delete.enabled = cfg.enableDelete;
     };
     http = {
-      addr = ":5000";
-      headers = {
-        X-Content-Type-Options = "[nosniff]";
-      };
+      addr = ":${builtins.toString cfg.port}";
+      headers.X-Content-Type-Options = ["nosniff"];
     };
-    health = {
-      storagedriver = {
-        enabled = true;
-        interval = "10s";
-        threshold = 3;
-      };
+    health.storagedriver = {
+      enabled = true;
+      interval = "10s";
+      threshold = 3;
     };
   };
 
@@ -98,7 +84,7 @@ in {
 
     redisPassword = mkOption {
       type = types.str;
-      default = "asecret";
+      default = "";
       description = "Set redis password.";
     };
 
@@ -112,21 +98,14 @@ in {
   };
 
   config = mkIf cfg.enable {
-    environment.etc."docker/registry/config.yml".text = builtins.toJSON registryConfig;
-
     systemd.services.docker-registry = {
       description = "Docker Container Registry";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-
-      environment = {
-        REGISTRY_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.port}";
-        REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY = cfg.storagePath;
-      } // cfg.extraConfig;
-
-      script = ''
-        ${pkgs.docker-distribution}/bin/registry serve \
-          /etc/docker/registry/config.yml
+      script = let
+        configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (registryConfig // cfg.extraConfig));
+      in ''
+        ${pkgs.docker-distribution}/bin/registry serve ${configFile}
       '';
 
       serviceConfig = {
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index 109fca440e57..943773ee3918 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -3,12 +3,13 @@
 import ./make-test.nix ({ pkgs, ...} : {
   name = "docker-registry";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ globin ];
+    maintainers = [ globin ma27 ];
   };
 
   nodes = {
     registry = { config, pkgs, ... }: {
       services.dockerRegistry.enable = true;
+      services.dockerRegistry.enableDelete = true;
       services.dockerRegistry.port = 8080;
       services.dockerRegistry.listenAddress = "0.0.0.0";
       networking.firewall.allowedTCPPorts = [ 8080 ];
@@ -22,6 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     client2 = { config, pkgs, ...}: {
       virtualisation.docker.enable = true;
       virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
+      environment.systemPackages = [ pkgs.jq ];
     };
   };
 
@@ -39,5 +41,9 @@ import ./make-test.nix ({ pkgs, ...} : {
     $client2->waitForUnit("docker.service");
     $client2->succeed("docker pull registry:8080/scratch");
     $client2->succeed("docker images | grep scratch");
+
+    $client2->succeed(
+      'curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl registry:8080/v2/scratch/manifests/latest | jq ".fsLayers[0].blobSum" | sed -e \'s/"//g\')'
+    );
   '';
 })

From afd3136e8efe2cbd477cb6db7be5ad7b2eb7efc6 Mon Sep 17 00:00:00 2001
From: Michele Catalano <michele@catalano.de>
Date: Fri, 6 Apr 2018 15:11:52 +0200
Subject: [PATCH 0857/3370] nixos/docker-registry: Add support for garbage
 collector to docker registry

---
 .../modules/services/misc/docker-registry.nix | 41 +++++++++++++++----
 nixos/tests/docker-registry.nix               | 20 +++++++--
 2 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index c0dbcf380db3..45931cb42b54 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -42,6 +42,8 @@ let
     };
   };
 
+  configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (registryConfig // cfg.extraConfig));
+
 in {
   options.services.dockerRegistry = {
     enable = mkEnableOption "Docker Registry";
@@ -70,11 +72,7 @@ in {
       description = "Enable delete for manifests and blobs.";
     };
 
-    enableRedisCache = mkOption {
-      type = types.bool;
-      default = false;
-      description = "Enable redis as blob cache instade of inmemory.";
-    };
+    enableRedisCache = mkEnableOption "redis as blob cache";
 
     redisUrl = mkOption {
       type = types.str;
@@ -95,6 +93,19 @@ in {
       default = {};
       type = types.attrsOf types.str;
     };
+
+    enableGarbageCollect = mkEnableOption "garbage collect";
+
+    garbageCollectDates = mkOption {
+      default = "daily";
+      type = types.str;
+      description = ''
+        Specification (in the format described by
+        <citerefentry><refentrytitle>systemd.time</refentrytitle>
+        <manvolnum>7</manvolnum></citerefentry>) of the time at
+        which the garbage collect will occur.
+      '';
+    };
   };
 
   config = mkIf cfg.enable {
@@ -102,9 +113,7 @@ in {
       description = "Docker Container Registry";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      script = let
-        configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (registryConfig // cfg.extraConfig));
-      in ''
+      script = ''
         ${pkgs.docker-distribution}/bin/registry serve ${configFile}
       '';
 
@@ -114,6 +123,22 @@ in {
       };
     };
 
+    systemd.services.docker-registry-garbage-collect = {
+      description = "Run Garbage Collection for docker registry";
+
+      restartIfChanged = false;
+      unitConfig.X-StopOnRemoval = false;
+
+      serviceConfig.Type = "oneshot";
+
+      script = ''
+        ${pkgs.docker-distribution}/bin/registry garbage-collect ${configFile}
+        ${pkgs.systemd}/bin/systemctl restart docker-registry.service
+      '';
+
+      startAt = optional cfg.enableGarbageCollect cfg.garbageCollectDates;
+    };
+
     users.extraUsers.docker-registry = {
       createHome = true;
       home = cfg.storagePath;
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index 943773ee3918..1fbd199c7bc4 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -3,7 +3,7 @@
 import ./make-test.nix ({ pkgs, ...} : {
   name = "docker-registry";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ globin ma27 ];
+    maintainers = [ globin ma27 ironpinguin ];
   };
 
   nodes = {
@@ -12,6 +12,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       services.dockerRegistry.enableDelete = true;
       services.dockerRegistry.port = 8080;
       services.dockerRegistry.listenAddress = "0.0.0.0";
+      services.dockerRegistry.enableGarbageCollect = true;
       networking.firewall.allowedTCPPorts = [ 8080 ];
     };
 
@@ -23,7 +24,6 @@ import ./make-test.nix ({ pkgs, ...} : {
     client2 = { config, pkgs, ...}: {
       virtualisation.docker.enable = true;
       virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
-      environment.systemPackages = [ pkgs.jq ];
     };
   };
 
@@ -35,6 +35,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     $registry->start();
     $registry->waitForUnit("docker-registry.service");
+    $registry->waitForOpenPort("8080");
     $client1->succeed("docker push registry:8080/scratch");
 
     $client2->start();
@@ -43,7 +44,20 @@ import ./make-test.nix ({ pkgs, ...} : {
     $client2->succeed("docker images | grep scratch");
 
     $client2->succeed(
-      'curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl registry:8080/v2/scratch/manifests/latest | jq ".fsLayers[0].blobSum" | sed -e \'s/"//g\')'
+      'curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H"Accept: application/vnd.docker.distribution.manifest.v2+json" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e \'s/Docker-Content-Digest: //\' | tr -d \'\r\')'
+    );
+
+    $registry->systemctl("start docker-registry-garbage-collect.service");
+    $registry->waitUntilFails("systemctl status docker-registry-garbage-collect.service");
+    $registry->waitForUnit("docker-registry.service");
+
+    $registry->fail(
+      'ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data'
+    );
+
+    $client1->succeed("docker push registry:8080/scratch");
+    $registry->succeed(
+      'ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data'
     );
   '';
 })

From 5d0adad0ca72f306cb3c6bd6697557f575b7f87d Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 1 May 2018 14:55:24 +0200
Subject: [PATCH 0858/3370] prometheus-snmp-exporter: 0.3.0 -> 0.9.0

---
 pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 6915877ef4fb..9fd7ae8591fc 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -2,16 +2,15 @@
 
 buildGoPackage rec {
   name = "snmp_exporter-${version}";
-  version = "0.3.0";
-  rev = "v${version}";
+  version = "0.9.0";
 
   goPackagePath = "github.com/prometheus/snmp_exporter";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "prometheus";
     repo = "snmp_exporter";
-    sha256 = "1cklsi3cpalmnp0qjkgb7xbgbkr014hk2z54gfynzvzqjmsbxk6a";
+    rev = "v${version}";
+    sha256 = "081ah4zyy53plhm6znwrx55phm2ysxzyx7d4hm8zzrv5r967rgl1";
   };
 
   buildInputs = [ net_snmp ];
@@ -22,7 +21,7 @@ buildGoPackage rec {
     description = "SNMP Exporter for Prometheus";
     homepage = https://github.com/prometheus/snmp_exporter;
     license = licenses.asl20;
-    maintainers = with maintainers; [ oida ];
+    maintainers = with maintainers; [ oida willibutz ];
     platforms = platforms.unix;
   };
 }

From 6b8c1d20847e688a0b3beafac01aec58e68c9bf6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 1 May 2018 15:38:22 +0200
Subject: [PATCH 0859/3370] guake: fix build

---
 pkgs/applications/misc/guake/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 9ae4ca0be03e..c34f0e48f3ec 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -24,6 +24,12 @@ in python3.pkgs.buildPythonApplication rec {
 
   PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var
 
+  postPatch = ''
+    # unnecessary /usr/bin/env in Makefile
+    # https://github.com/Guake/guake/pull/1285
+    substituteInPlace "Makefile" --replace "/usr/bin/env python3" "python3"
+  '';
+
   makeFlags = [
     "prefix=$(out)"
   ];

From 0d2397380fa008cf8516ca0b874f451d515579d4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 15:59:34 -0700
Subject: [PATCH 0860/3370] git-cola: 3.0 -> 3.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-cola/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-cola-wrapped version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-cola version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/.git-dag-wrapped --version’ and found version 3.1
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag -h’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag --help’ got 0 exit code
- ran ‘/nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1/bin/git-dag --version’ and found version 3.1
- found 3.1 with grep in /nix/store/vdgbmam99abv4kryg2bn31vkzdxk90cq-git-cola-3.1
- directory tree listing: https://gist.github.com/af016e8541c2ac80ef4e4e16a00bc0de
---
 .../version-management/git-and-tools/git-cola/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 31504d542d26..73f9921d4865 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -4,13 +4,13 @@ let
   inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
 in buildPythonApplication rec {
   name = "git-cola-${version}";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "git-cola";
     repo = "git-cola";
     rev = "v${version}";
-    sha256 = "0jc360agrlhp1w9i725ffksvc6v95jnzzppjvza7ssip65gplrkx";
+    sha256 = "1xzm8694zndl2pb4nanzhldn7wrsc1gjd5ldjncidw1msp9fczq1";
   };
 
   buildInputs = [ git gettext ];

From 913ec8736c70a089e43a9ee3d8e1f639d01134f4 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 1 May 2018 14:31:48 +0200
Subject: [PATCH 0861/3370] prometheus-nginx-exporter: 20161107 -> 0.1.0

- added myself as maintainer
- fixed license
---
 .../monitoring/prometheus/nginx-exporter.nix  |  18 +--
 .../prometheus/nginx-exporter_deps.nix        | 112 ++++++++++++------
 2 files changed, 83 insertions(+), 47 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
index 013f80411ad6..5c5042b6c7cd 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix
@@ -1,16 +1,16 @@
-{ stdenv, buildGoPackage, fetchgit }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "nginx_exporter-${version}";
-  version = "20161107-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "2d7dfd13458c0d82671c03dc54f3aa0110a49a05";
+  version = "0.1.0";
 
   goPackagePath = "github.com/discordianfish/nginx_exporter";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/discordianfish/nginx_exporter";
-    sha256 = "17mjbf8v4h7ja87y02ggmyzl3g8ms8s37mcpcq1niijgli37h75d";
+  src = fetchFromGitHub {
+    rev = "v${version}";
+    owner = "discordianfish";
+    repo = "nginx_exporter";
+    sha256 = "1xwxnvkzslaj44r44ag24a9qfzjdxwz67hhpkdq42193zqpnlim7";
   };
 
   goDeps = ./nginx-exporter_deps.nix;
@@ -18,8 +18,8 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     description = "Metrics relay from nginx stats to Prometheus";
     homepage = https://github.com/discordianfish/nginx_exporter;
-    license = licenses.asl20;
-    maintainers = with maintainers; [ benley fpletz ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ benley fpletz willibutz ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix
index 26b2bcaa8d28..2fa60de5b493 100644
--- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix
+++ b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix
@@ -1,29 +1,20 @@
 [
   {
-    goPackagePath = "github.com/Sirupsen/logrus";
+    goPackagePath = "github.com/alecthomas/template";
     fetch = {
       type = "git";
-      url = "https://github.com/Sirupsen/logrus";
-      rev = "be52937128b38f1d99787bb476c789e2af1147f1";
-      sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
     };
   }
   {
-    goPackagePath = "github.com/golang/protobuf";
+    goPackagePath = "github.com/alecthomas/units";
     fetch = {
       type = "git";
-      url = "https://github.com/golang/protobuf";
-      rev = "59b73b37c1e45995477aae817e4a653c89a858db";
-      sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/client_model";
-    fetch = {
-      type = "git";
-      url = "https://github.com/prometheus/client_model";
-      rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
-      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
     };
   }
   {
@@ -31,8 +22,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/beorn7/perks";
-      rev = "b965b613227fddccbfffe13eae360ed3fa822f8d";
-      sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk";
+      rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
+      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
     };
   }
   {
@@ -40,8 +40,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/matttproud/golang_protobuf_extensions";
-      rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a";
-      sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj";
+      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
     };
   }
   {
@@ -49,8 +49,26 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_golang";
-      rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864";
-      sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna";
+      rev = "82f5ff156b29e276022b1a958f7d385870fb9814";
+      sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c";
+      sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1";
     };
   }
   {
@@ -58,26 +76,44 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/procfs";
-      rev = "c91d8eefde16bd047416409eb56353ea84a186e4";
-      sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r";
+      rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e";
+      sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf";
     };
   }
   {
-    goPackagePath = "bitbucket.org/ww/goautoneg";
-    fetch = {
-      type = "hg";
-      url = "bitbucket.org/ww/goautoneg";
-      rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675";
-      sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi";
-    };
-  }
-  {
-    goPackagePath = "github.com/prometheus/log";
+    goPackagePath = "github.com/sirupsen/logrus";
     fetch = {
       type = "git";
-      url = "https://github.com/prometheus/log";
-      rev = "439e5db48fbb50ebbaf2c816030473a62f505f55";
-      sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv";
+      url = "https://github.com/sirupsen/logrus";
+      rev = "778f2e774c725116edbc3d039dc0dfc1cc62aae8";
+      sha256 = "0drlrl192k4qkpcf1b6nw2qlixply31x2jhcckjzl3hn4mzwi6nf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "ae8bce0030810cf999bb2b9868ae5c7c58e6343b";
+      sha256 = "0aihwcf0g8mq1sb96pwhpgvwxlf862pdhsfr7mdppz7bii4i9shw";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "78d5f264b493f125018180c204871ecf58a2dce1";
+      sha256 = "0x23n60wskys39dwybz5za77ldky9i518kp58ragpd5528kcc68s";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/alecthomas/kingpin.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/alecthomas/kingpin.v2";
+      rev = "947dcec5ba9c011838740e680966fd7087a71d0d";
+      sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r";
     };
   }
 ]

From de60146f592feb6482a82fc27d9d01f713f34277 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 1 May 2018 14:34:28 +0200
Subject: [PATCH 0862/3370] nixos/promtheus-nginx-exporter: update module

---
 .../monitoring/prometheus/exporters/nginx.nix | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index 6a3ba2d0457c..39054c2b73dd 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -9,21 +9,37 @@ in
   port = 9113;
   extraOpts = {
     scrapeUri = mkOption {
-      type = types.string;
+      type = types.str;
       default = "http://localhost/nginx_status";
       description = ''
         Address to access the nginx status page.
         Can be enabled with services.nginx.statusPage = true.
       '';
     };
+    telemetryEndpoint = mkOption {
+      type = types.str;
+      default = "/metrics";
+      description = ''
+        Path under which to expose metrics.
+      '';
+    };
+    insecure = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Ignore server certificate if using https.
+      '';
+    };
   };
   serviceOpts = {
     serviceConfig = {
       DynamicUser = true;
       ExecStart = ''
         ${pkgs.prometheus-nginx-exporter}/bin/nginx_exporter \
-          -nginx.scrape_uri '${cfg.scrapeUri}' \
-          -telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
+          --nginx.scrape_uri '${cfg.scrapeUri}' \
+          --telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
+          --telemetry.endpoint ${cfg.telemetryEndpoint} \
+          --insecure ${cfg.insecure} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };

From c639df5fa43ac36fe9bf5d99c1245d4c8a63262d Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Tue, 1 May 2018 17:13:37 +0300
Subject: [PATCH 0863/3370] pythonPackages.pytest-flake8: 1.0.0 -> 1.0.1

This upgrade fixes #39206.
---
 pkgs/development/python-modules/pytest-flake8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index b170f480e96e..c2d205f2833c 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-flake8";
-  version = "1.0.0";
+  version = "1.0.1";
 
   # although pytest is a runtime dependency, do not add it as
   # propagatedBuildInputs in order to allow packages depend on another version
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01driw4sc6nfi3m3ii7d074pxi3h1h4mbiyad9crg5i1l5jxx5ir";
+    sha256 = "0s5fdivrmhjf6ybr6m2qb1h8hndv2jh2ir29qv36lhy9b7sc9kg5";
   };
 
   checkPhase = ''

From 1b8642dff6bdbf7c39f1f46a4876f9c9beb775e3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 1 May 2018 16:44:12 +0200
Subject: [PATCH 0864/3370] nixos/monetdb: init (#39812)

---
 nixos/modules/misc/ids.nix                   |   4 +-
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/databases/monetdb.nix | 100 +++++++++++++++++++
 3 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/databases/monetdb.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index ab3cbcab0646..0ed820a32acc 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -138,7 +138,6 @@
       ngircd = 112;
       btsync = 113;
       minecraft = 114;
-      #monetdb = 115; # unused (not packaged), removed 2016-09-19
       vault = 115;
       rippled = 116;
       murmur = 117;
@@ -306,6 +305,7 @@
       monero = 287;
       ceph = 288;
       duplicati = 289;
+      monetdb = 290;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -424,7 +424,6 @@
       #ngircd = 112; # unused
       btsync = 113;
       #minecraft = 114; # unused
-      #monetdb = 115; # unused (not packaged), removed 2016-09-19
       vault = 115;
       #ripped = 116; # unused
       #murmur = 117; # unused
@@ -580,6 +579,7 @@
       monero = 287;
       ceph = 288;
       duplicati = 289;
+      monetdb = 290;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 38f961c0467a..505c5497d36d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -199,6 +199,7 @@
   ./services/databases/hbase.nix
   ./services/databases/influxdb.nix
   ./services/databases/memcached.nix
+  ./services/databases/monetdb.nix
   ./services/databases/mongodb.nix
   ./services/databases/mysql.nix
   ./services/databases/neo4j.nix
diff --git a/nixos/modules/services/databases/monetdb.nix b/nixos/modules/services/databases/monetdb.nix
new file mode 100644
index 000000000000..5c66fc7b2e36
--- /dev/null
+++ b/nixos/modules/services/databases/monetdb.nix
@@ -0,0 +1,100 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.monetdb;
+
+in {
+  meta.maintainers = with maintainers; [ StillerHarpo primeos ];
+
+  ###### interface
+  options = {
+    services.monetdb = {
+
+      enable = mkEnableOption "the MonetDB database server";
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.monetdb;
+        defaultText = "pkgs.monetdb";
+        description = "MonetDB package to use.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "monetdb";
+        description = "User account under which MonetDB runs.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "monetdb";
+        description = "Group under which MonetDB runs.";
+      };
+
+      dataDir = mkOption {
+        type = types.path;
+        default = "/var/lib/monetdb";
+        description = "Data directory for the dbfarm.";
+      };
+
+      port = mkOption {
+        type = types.ints.u16;
+        default = 50000;
+        description = "Port to listen on.";
+      };
+
+      listenAddress = mkOption {
+        type = types.str;
+        default = "127.0.0.1";
+        example = "0.0.0.0";
+        description = "Address to listen on.";
+      };
+    };
+  };
+
+  ###### implementation
+  config = mkIf cfg.enable {
+
+    users.users.monetdb = mkIf (cfg.user == "monetdb") {
+      uid = config.ids.uids.monetdb;
+      group = cfg.group;
+      description = "MonetDB user";
+      home = cfg.dataDir;
+      createHome = true;
+    };
+
+    users.groups.monetdb = mkIf (cfg.group == "monetdb") {
+      gid = config.ids.gids.monetdb;
+      members = [ cfg.user ];
+    };
+
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.services.monetdb = {
+      description = "MonetDB database server";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      path = [ cfg.package ];
+      unitConfig.RequiresMountsFor = "${cfg.dataDir}";
+      serviceConfig = {
+        User = cfg.user;
+        Group = cfg.group;
+        ExecStart = "${cfg.package}/bin/monetdbd start -n ${cfg.dataDir}";
+        ExecStop = "${cfg.package}/bin/monetdbd stop ${cfg.dataDir}";
+      };
+      preStart = ''
+        if [ ! -e ${cfg.dataDir}/.merovingian_properties ]; then
+          # Create the dbfarm (as cfg.user)
+          ${cfg.package}/bin/monetdbd create ${cfg.dataDir}
+        fi
+
+        # Update the properties
+        ${cfg.package}/bin/monetdbd set port=${toString cfg.port} ${cfg.dataDir}
+        ${cfg.package}/bin/monetdbd set listenaddr=${cfg.listenAddress} ${cfg.dataDir}
+      '';
+    };
+
+  };
+}

From 9395d05b65fb6eeb4062455dc91c7ea634230f1e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 09:37:57 -0500
Subject: [PATCH 0865/3370] unix-tools: install man pages

---
 pkgs/top-level/unix-tools.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 9946bb1c4dc4..9b8fefaf8bab 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -13,18 +13,22 @@
 let
 
   singleBinary = cmd: providers: let
-      provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
+      provider = lib.getBin providers.${hostPlatform.parsed.kernel.name};
     in runCommand cmd {
       meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers);
     } ''
-      mkdir -p $out/bin
+      mkdir -p $out/bin $out/share/man/man1
 
-      if ! [ -x "${provider}" ]; then
+      if ! [ -x "${provider}/bin/${cmd}" ]; then
         echo "Cannot find command ${cmd}"
         exit 1
       fi
 
-      cp "${provider}" "$out/bin/${cmd}"
+      cp "${provider}/bin/${cmd}" "$out/bin/${cmd}"
+
+      if [ -f "${provider}/share/man/man1/${cmd}.1.gz" ]; then
+        cp "${provider}/share/man/man1/${cmd}.1.gz" "$out/share/man/man1/${cmd}.1.gz"
+      fi
     '';
 
 in rec {

From 21327edba30b82f5328659e4a4f6352aa4892177 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 May 2018 11:34:49 -0400
Subject: [PATCH 0866/3370] linux-copperhead: 4.14.37.a -> 4.14.38.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
index 76b59ee75fb1..4d5cd07cd95c 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.14.37";
+  version = "4.14.38";
   revision = "a";
-  sha256 = "0dwi17hx13kkccqc2315dnb8sfdc0jgv9v4b1xd10v2pnq7qb0x8";
+  sha256 = "0cad9fp1h96blbgqlgxyv8wc0jg88mildc1ayljz0zpa5dxdfzh4";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 80d51a38bc24b19270f3cfaae6bbbcafae00f7d0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 1 May 2018 11:35:05 -0400
Subject: [PATCH 0867/3370] linux-copperhead: 4.16.5.a -> 4.16.6.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
index 86b7eaa8823e..a931d81cf265 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.16.5";
+  version = "4.16.6";
   revision = "a";
-  sha256 = "150cwq51x3cnnvnd7izizi93jmiqs0na15p8ip4vkm5frspmnks7";
+  sha256 = "0lkycpb837svrvyy04a8n2ix1rrzfl87ah5293mgf9jgy4kmaa2l";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 6dbc010a7dfa8c2958a74fe6daa389d7e8869d30 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Mon, 30 Apr 2018 22:12:20 +0200
Subject: [PATCH 0868/3370] bat: init at 0.2.0

---
 pkgs/tools/misc/bat/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/misc/bat/default.nix

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
new file mode 100644
index 000000000000..5516f4a26a3d
--- /dev/null
+++ b/pkgs/tools/misc/bat/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, pkgs, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  name    = "bat-${version}";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner  = "sharkdp";
+    repo   = "bat";
+    rev    = "v${version}";
+    sha256 = "0qbjkrakcpvnzzljifykw88g0qmmk60id23sjvhp4md54h4xg29p";
+  };
+
+  cargoSha256 = "07r10wwxv8svrw94djl092zj512868izlxldsiljfj34230abl02";
+
+  buildInputs = with pkgs; [ openssl pkgconfig cmake zlib file perl curl ];
+
+  meta = with stdenv.lib; {
+    description = "A cat(1) clone with syntax highlighting and Git integration";
+    homepage    = https://github.com/sharkdp/bat;
+    license     = licenses.mit;
+    maintainers = [];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49160d59ac45..ea74c424d5a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -785,6 +785,8 @@ with pkgs;
 
   bashmount = callPackage ../tools/filesystems/bashmount {};
 
+  bat = callPackage ../tools/misc/bat { };
+
   bc = callPackage ../tools/misc/bc { };
 
   bdf2psf = callPackage ../tools/misc/bdf2psf { };

From 4bca8f8d251f81a6b23994496b3dda6e5a192718 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 1 May 2018 16:04:28 +0200
Subject: [PATCH 0869/3370] prometheus-varnish-exporter: 1.2 -> 1.4

---
 .../prometheus/varnish-exporter.nix           | 20 ++++++++++-----
 .../prometheus/varnish-exporter_deps.nix      | 25 +++++++++----------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
index 707b1014e226..d83aa5b46658 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix
@@ -1,26 +1,34 @@
 # This file was generated by go2nix.
-{ stdenv, buildGoPackage, fetchFromGitHub, lib }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, varnish }:
 
 buildGoPackage rec {
   name = "prometheus_varnish_exporter-${version}";
-  version = "1.2";
-  rev = "0f0e3e2";
+  version = "1.4";
 
   goPackagePath = "github.com/jonnenauha/prometheus_varnish_exporter";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "jonnenauha";
     repo = "prometheus_varnish_exporter";
-    sha256 = "15vw3jqzm2nad81j14spib5v7q2jpibclzrnkd688003vkizlwyn";
+    rev = version;
+    sha256 = "12gd09858zlhn8gkkchfwxv0ca2r72s18wrsz0agfr8pd1gxqh6j";
   };
 
   goDeps = ./varnish-exporter_deps.nix;
 
+  nativeBuildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    wrapProgram $bin/bin/prometheus_varnish_exporter \
+      --prefix PATH : "${varnish}/bin"
+  '';
+
+  doCheck = true;
+
   meta = {
     homepage = https://github.com/jonnenauha/prometheus_varnish_exporter;
     description = "Varnish exporter for Prometheus";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ MostAwesomeDude ];
+    maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ];
   };
 }
diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
index 09a09be36e36..19ff1e9aa560 100644
--- a/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
+++ b/pkgs/servers/monitoring/prometheus/varnish-exporter_deps.nix
@@ -1,12 +1,11 @@
-# This file was generated by go2nix.
 [
   {
     goPackagePath = "github.com/beorn7/perks";
     fetch = {
       type = "git";
       url = "https://github.com/beorn7/perks";
-      rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9";
-      sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y";
+      rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
+      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
     };
   }
   {
@@ -14,8 +13,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "8ee79997227bf9b34611aee7946ae64735e6fd93";
-      sha256 = "0qm1lpdhf97k2hxgivq2cpjgawhlmmz39y230kgxijhm96xijxb8";
+      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
     };
   }
   {
@@ -32,8 +31,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_golang";
-      rev = "575f371f7862609249a1be4c9145f429fe065e32";
-      sha256 = "0hyvszjv5m6i40k2fn21c3bjr8jhlfdqavk1r6g2v5dybyj47vps";
+      rev = "82f5ff156b29e276022b1a958f7d385870fb9814";
+      sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz";
     };
   }
   {
@@ -41,8 +40,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/client_model";
-      rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6";
-      sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9";
+      rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
     };
   }
   {
@@ -50,8 +49,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev = "0d5de9d6d8629cb8bee6d4674da4127cd8b615a3";
-      sha256 = "1zlvvgw67p66fz9nswkydq15j4a5z5kkiskl0jxps8i27ya1baq0";
+      rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c";
+      sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1";
     };
   }
   {
@@ -59,8 +58,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/procfs";
-      rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5";
-      sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws";
+      rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e";
+      sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf";
     };
   }
 ]

From cb4c2834efac36f211ea97d9d1e663b8ff8283a3 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 1 May 2018 16:05:07 +0200
Subject: [PATCH 0870/3370] nixos/prometheus-varnish-exporter: update module

---
 .../prometheus/exporters/varnish.nix          | 70 ++++++++++++++++++-
 1 file changed, 68 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
index b439a83e7aa2..8dbf2d735ab9 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/varnish.nix
@@ -7,14 +7,80 @@ let
 in
 {
   port = 9131;
+  extraOpts = {
+    noExit = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Do not exit server on Varnish scrape errors.
+      '';
+    };
+    withGoMetrics = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Export go runtime and http handler metrics.
+      '';
+    };
+    verbose = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable verbose logging.
+      '';
+    };
+    raw = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable raw stdout logging without timestamps.
+      '';
+    };
+    varnishStatPath = mkOption {
+      type = types.str;
+      default = "varnishstat";
+      description = ''
+        Path to varnishstat.
+      '';
+    };
+    instance = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        varnishstat -n value.
+      '';
+    };
+    healthPath = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        Path under which to expose healthcheck. Disabled unless configured.
+      '';
+    };
+    telemetryPath = mkOption {
+      type = types.str;
+      default = "/metrics";
+      description = ''
+        Path under which to expose metrics.
+      '';
+    };
+  };
   serviceOpts = {
     path = [ pkgs.varnish ];
     serviceConfig = {
       DynamicUser = true;
       ExecStart = ''
         ${pkgs.prometheus-varnish-exporter}/bin/prometheus_varnish_exporter \
-          -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
-          ${concatStringsSep " \\\n  " cfg.extraFlags}
+          --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          --web.telemetry-path ${cfg.telemetryPath} \
+          --varnishstat-path ${cfg.varnishStatPath} \
+          ${concatStringsSep " \\\n  " (cfg.extraFlags
+            ++ optional (cfg.healthPath != null) "--web.health-path ${cfg.healthPath}"
+            ++ optional (cfg.instance != null) "-n ${cfg.instance}"
+            ++ optional cfg.noExit "--no-exit"
+            ++ optional cfg.withGoMetrics "--with-go-metrics"
+            ++ optional cfg.verbose "--verbose"
+            ++ optional cfg.raw "--raw")}
       '';
     };
   };

From 187e2237733e427e63aac5af91c0579c3c7bf0aa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 30 Apr 2018 11:31:44 +0800
Subject: [PATCH 0871/3370] unifi-testing: init at 5.8.14

Also:
 - Instead of using a boolean flag to determine which package to build, use a
   generic builder
 - Add a few missing pre/post hooks
---
 pkgs/servers/unifi/default.nix  | 92 ++++++++++++++++++---------------
 pkgs/top-level/all-packages.nix |  7 ++-
 2 files changed, 55 insertions(+), 44 deletions(-)

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index dac4bf6899a1..b4e03af1cfda 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -1,53 +1,61 @@
-{ stdenv
-, dpkg
-, fetchurl
-, unzip
-, useLTS ? false
-}:
-
+{ stdenv, dpkg, fetchurl }:
 
 let
-  versions = {
-    stable = {
-      version = "5.7.20";
-      sha256 = "1ylj4i5mcv6z9n32275ccdf1rqk74zilqsih3r6xzhm30pxrd8dd";
+  generic = { version, sha256, suffix ? "" }:
+  stdenv.mkDerivation rec {
+    name = "unifi-controller-${version}";
+
+    src = fetchurl {
+      url = "https://dl.ubnt.com/unifi/${version}${suffix}/unifi_sysvinit_all.deb";
+      inherit sha256;
     };
-    lts = {
-      version = "5.6.36";
-      sha256 = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
+
+    nativeBuildInputs = [ dpkg ];
+
+    unpackPhase = ''
+      runHook preUnpack
+      dpkg-deb -x $src ./
+      runHook postUnpack
+    '';
+
+    doConfigure = false;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cd ./usr/lib/unifi
+      cp -ar dl lib webapps $out
+
+      runHook postInstall
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://www.ubnt.com/;
+      description = "Controller for Ubiquiti UniFi access points";
+      license = licenses.unfree;
+      platforms = platforms.unix;
+      maintainers = with maintainers; [ wkennington ];
     };
   };
-  selectedVersion =
-    let attr = if useLTS then "lts" else "stable";
-    in versions."${attr}";
-in
 
-stdenv.mkDerivation {
-  name = "unifi-controller-${selectedVersion.version}";
-  src = with selectedVersion; fetchurl {
-    url = "https://dl.ubnt.com/unifi/${version}/unifi_sysvinit_all.deb";
-    inherit sha256;
+in rec {
+
+  # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions
+
+  unifiLTS = generic {
+    version = "5.6.36";
+    sha256  = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
   };
 
-  buildInputs = [ dpkg ];
+  unifiStable = generic {
+    version = "5.7.20";
+    sha256  = "1ylj4i5mcv6z9n32275ccdf1rqk74zilqsih3r6xzhm30pxrd8dd";
+  };
 
-  unpackPhase = ''
-    dpkg-deb -x $src ./
-  '';
-
-  doConfigure = false;
-
-  installPhase = ''
-    mkdir -p $out
-    cd ./usr/lib/unifi
-    cp -ar dl lib webapps $out
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ubnt.com/;
-    description = "Controller for Ubiquiti UniFi accesspoints";
-    license = licenses.unfree;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
+  unifiTesting = generic {
+    version = "5.8.14";
+    suffix  = "-7ef9535d1b";
+    sha256  = "09gr7zkck6npjhhmd27c9ymyna6anwj3w9v9zjicz9skbrddkccq";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ab4ae69c509..16708027c5a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12921,8 +12921,11 @@ with pkgs;
 
   axis2 = callPackage ../servers/http/tomcat/axis2 { };
 
-  unifi = callPackage ../servers/unifi { };
-  unifiLTS = callPackage ../servers/unifi { useLTS=true; };
+  inherit (callPackages ../servers/unifi { })
+    unifiLTS
+    unifiStable
+    unifiTesting;
+  unifi = unifiStable;
 
   virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { };
 

From ace51a4f85ee1502a6f77d27b5180e66a7852513 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 30 Apr 2018 11:35:56 +0800
Subject: [PATCH 0872/3370] unifi-lts: 5.6.36 -> 5.6.37

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

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index b4e03af1cfda..2dbdf81bda00 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -44,8 +44,8 @@ in rec {
   # https://help.ubnt.com/hc/en-us/articles/115000441548-UniFi-Current-Controller-Versions
 
   unifiLTS = generic {
-    version = "5.6.36";
-    sha256  = "075q7vm56fdsjwh72y2cb1pirl2pxdkvqnhvd3bf1c2n64mvp6bi";
+    version = "5.6.37";
+    sha256  = "0kiksqsbmmfva1blbpg2wl4c3w7j6dzzqmwp6028g7bh303c47qa";
   };
 
   unifiStable = generic {

From 9e37f7ed27040553cb39a658614697fcb7a96da8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 30 Apr 2018 11:36:14 +0800
Subject: [PATCH 0873/3370] unifi-stable: 5.7.20 -> 5.7.23

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

diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix
index 2dbdf81bda00..9002987c387b 100644
--- a/pkgs/servers/unifi/default.nix
+++ b/pkgs/servers/unifi/default.nix
@@ -49,8 +49,8 @@ in rec {
   };
 
   unifiStable = generic {
-    version = "5.7.20";
-    sha256  = "1ylj4i5mcv6z9n32275ccdf1rqk74zilqsih3r6xzhm30pxrd8dd";
+    version = "5.7.23";
+    sha256  = "14jkhp9jl341zsyk5adh3g98mhqwfbd42c7wahzc31bxq8a0idp7";
   };
 
   unifiTesting = generic {

From 673f4c52f473391320baff1955fc7b4ef5ede808 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 17:04:04 -0700
Subject: [PATCH 0874/3370] duktape: 2.2.0 -> 2.2.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/duktape/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.2.1 with grep in /nix/store/8clll9a9f797fd0vxz3vmx641mpqzkkx-duktape-2.2.1
- directory tree listing: https://gist.github.com/6049cc6fc921f7fa2efb27f86c1c7ca6
---
 pkgs/development/interpreters/duktape/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix
index 3cdc89fb3fd2..46550c835108 100644
--- a/pkgs/development/interpreters/duktape/default.nix
+++ b/pkgs/development/interpreters/duktape/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "duktape-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
   src = fetchurl {
     url = "http://duktape.org/duktape-${version}.tar.xz";
-    sha256 = "050csp065ll67dck94s0vdad5r5ck4jwsz1fn1y0fcvn88325xv2";
+    sha256 = "1wp7mpkhizknq72ivdbkzps4radi1daqzjcjp1i54c2k4pnjxgis";
   };
 
   buildPhase = ''

From 2b159d94a2ef8ef2cd819cd9336960d0748e1984 Mon Sep 17 00:00:00 2001
From: LightDiscord <arnaud@lightdiscord.me>
Date: Tue, 1 May 2018 18:39:03 +0200
Subject: [PATCH 0875/3370] robo3t: add libGL library fix #39817

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

diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix
index 8928ee18064d..be365cb94e4e 100644
--- a/pkgs/applications/misc/robo3t/default.nix
+++ b/pkgs/applications/misc/robo3t/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig,
+{ stdenv, fetchurl, zlib, glib, xorg, dbus, fontconfig, libGL,
   freetype, xkeyboard_config, makeDesktopItem, makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -41,6 +41,7 @@ stdenv.mkDerivation rec {
     dbus
     fontconfig
     freetype
+    libGL
   ];
 
   installPhase = ''

From db4f96b3cb817d8f16ad32235f4d75e43d677ab8 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 1 May 2018 12:57:07 -0400
Subject: [PATCH 0876/3370] lib/systems: Fix eval for iphone32* examples

Whoops messed up 9a845de873dfcc31f360a08f1b1f786c6f649c7d slightly.
---
 lib/systems/examples.nix                         | 2 +-
 pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index e229cccb365c..fdb120ebb5cb 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -96,7 +96,7 @@ rec {
   };
 
   iphone32 = {
-    config = "armv7-apple-ios";
+    config = "armv7a-apple-ios";
     # config = "arm-apple-darwin10";
     sdkVer = "10.2";
     useiOSPrebuilt = true;
diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
index 5b9f30b62c39..f336b14ee37b 100644
--- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
+++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
@@ -13,7 +13,7 @@ let
 minSdkVersion = "9.0";
 
 iosPlatformArch = { parsed, ... }: {
-  "arm"     = "armv7";
+  "armv7a"  = "armv7";
   "aarch64" = "arm64";
   "x86_64"  = "x86_64";
 }.${parsed.cpu.name};

From 6cd06ae05b1f9abee685db5e6c6135934178d86a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 1 May 2018 19:25:44 +0200
Subject: [PATCH 0877/3370] spotify: 1.0.77.338.g758ebd78-41 ->
 1.0.79.223.g92622cc2-21

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 87bf440ed4f3..324818736694 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -9,7 +9,7 @@ let
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
   # Be careful not to pick the testing version.
-  version = "1.0.77.338.g758ebd78-41";
+  version = "1.0.79.223.g92622cc2-21";
 
   deps = [
     alsaLib
@@ -54,7 +54,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-    sha256 = "1971jc0431pl8yixpl37ryl2l0pqdf0xjvkg59nqdwj3vbdx5606";
+    sha256 = "1x1rpprzin4cmz1spzw036b4phd0yk1v7idlrcy4pkv97b4g5dw6";
   };
 
   buildInputs = [ dpkg makeWrapper ];

From 1a18fedae43a023da813446034fb2624903de534 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Tue, 1 May 2018 19:57:13 +0200
Subject: [PATCH 0878/3370] nixos doc: mananager -> manager

---
 nixos/doc/manual/installation/installing-from-other-distro.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 7e6ddb05cd66..e8afb97bcde5 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -154,7 +154,7 @@ $ sudo useradd -u 30000 -g nixbld -G nixbld nixbld</screen>
 $ sudo userdel nixbld
 $ sudo groupdel nixbld</screen>
 
-            <para>If you do not wish to keep the Nix package mananager
+            <para>If you do not wish to keep the Nix package manager
                 installed either, run something like <literal>sudo rm -rv
                     ~/.nix-* /nix</literal> and remove the line that the Nix
                 installer added to your <literal>~/.profile</literal>.</para>

From f08de6c7294f35d0bd0f52ba3087307708578d23 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Tue, 1 May 2018 15:20:15 -0300
Subject: [PATCH 0879/3370] kid3: qt5 support

---
 pkgs/applications/audio/kid3/default.nix | 19 +++++++++----------
 pkgs/top-level/all-packages.nix          |  4 +---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 4c9540607eb6..31369bd1e638 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl
-, pkgconfig, cmake
-, docbook_xml_dtd_45, docbook_xsl, libxslt
-, python, ffmpeg, mp4v2, flac, libogg, libvorbis
-, phonon, automoc4, chromaprint, id3lib, taglib
-, qt, zlib, readline
+, pkgconfig, cmake, python, ffmpeg, phonon, automoc4
+, chromaprint, docbook_xml_dtd_45, docbook_xsl, libxslt
+, id3lib, taglib, mp4v2, flac, libogg, libvorbis
+, zlib, readline , qtbase, qttools, qtmultimedia, qtquickcontrols
 , makeWrapper
 }:
 
@@ -18,9 +17,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-  [ pkgconfig cmake python ffmpeg docbook_xml_dtd_45 docbook_xsl libxslt
-    phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis
-    qt zlib readline makeWrapper ];
+  [ pkgconfig cmake python ffmpeg phonon automoc4
+    chromaprint docbook_xml_dtd_45 docbook_xsl libxslt
+    id3lib taglib mp4v2 flac libogg libvorbis zlib readline
+    qtbase qttools qtmultimedia qtquickcontrols makeWrapper ];
 
   cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ];
   NIX_LDFLAGS = "-lm -lpthread";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins
+    wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt5/plugins
   '';
 
   enableParallelBuilding = true;
@@ -73,4 +73,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
   };
 }
-# TODO: Qt5 support - not so urgent!
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24dd47dc63a1..ed160aed85ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16468,9 +16468,7 @@ with pkgs;
 
   khard = callPackage ../applications/misc/khard { };
 
-  kid3 = callPackage ../applications/audio/kid3 {
-    qt = qt4;
-  };
+  kid3 = libsForQt5.callPackage ../applications/audio/kid3 { };
 
   kile = libsForQt5.callPackage ../applications/editors/kile { };
 

From 0433c35eef91dc53018b81fff4a7165866a90482 Mon Sep 17 00:00:00 2001
From: nschoe <ns.schoe@gmail.com>
Date: Tue, 1 May 2018 20:29:23 +0200
Subject: [PATCH 0880/3370] Add libopus as dependencies to gstreamer base
 plugins

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

diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index 39cf57ec5258..dfd3383cdbad 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch, lib
 , pkgconfig, meson, ninja, gettext, gobjectIntrospection
 , python, gstreamer, orc, pango, libtheora, libvisual
-, libintl
+, libintl, libopus
 , enableX11 ? stdenv.isLinux, libXv
 , enableWayland ? stdenv.isLinux, wayland
 , enableAlsa ? stdenv.isLinux, alsaLib
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   # Introspection fails on my MacBook currently
   ++ lib.optional stdenv.isDarwin "--disable-introspection";
 
-  buildInputs = [ orc libtheora libintl ]
+  buildInputs = [ orc libtheora libintl libopus ]
     ++ lib.optional enableAlsa alsaLib
     ++ lib.optionals enableX11 [ libXv pango ]
     ++ lib.optional enableWayland wayland

From 5fb826703162fcc07388a6f382d535452708fb42 Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Tue, 1 May 2018 20:40:06 +0200
Subject: [PATCH 0881/3370] cquery: 2018-03-31 -> 2018-05-01

The update should fix the build on osx.
---
 pkgs/development/tools/misc/cquery/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix
index 09220b2dc651..bf9797671269 100644
--- a/pkgs/development/tools/misc/cquery/default.nix
+++ b/pkgs/development/tools/misc/cquery/default.nix
@@ -5,8 +5,8 @@ let
   src = fetchFromGitHub {
     owner = "cquery-project";
     repo = "cquery";
-    rev = "e45a9ebbb6d8bfaf8bf1a3135b6faa910afea37e";
-    sha256 = "049gkqbamq4r2nz9yjcwq369zrmwrikzbhfza2x2vndqzaavq5yg";
+    rev = "34b357bc5e873d52d2aa41287c6e138244cea109";
+    sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c";
     fetchSubmodules = true;
   };
 
@@ -15,7 +15,7 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "cquery-${version}";
-  version = "2018-03-25";
+  version = "2018-05-01";
 
   inherit src;
 
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
   doInstallCheck = true;
   installCheckPhase = ''
     pushd ${src}
-    $out/bin/cquery --ci --clang-sanity-check && \
     $out/bin/cquery --ci --test-unit
   '';
 
@@ -56,6 +55,5 @@ stdenv.mkDerivation rec {
     license     = licenses.mit;
     platforms   = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.tobim ];
-    priority    = 3;
   };
 }

From 218d81bc9db409a72a572336a4dadc40a9088cde Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 25 Apr 2018 19:55:18 -0500
Subject: [PATCH 0882/3370] all-packages: move aliases to aliases.nix

Lots of aliases have been left over. This is a massive edit that
changes many random lines.
---
 pkgs/top-level/aliases.nix      | 112 +++++++++++++++++++++++------
 pkgs/top-level/all-packages.nix | 122 +-------------------------------
 2 files changed, 95 insertions(+), 139 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4b4dd2bf915d..cf39970fb926 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -24,10 +24,15 @@ in
   ### Deprecated aliases - for backward compatibility
 
 mapAliases (rec {
+  PPSSPP = ppsspp; # added 2017-10-01
+  QmidiNet = qmidinet;  # added 2016-05-22
   accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
   adobeReader = adobe-reader; # added 2013-11-04
+  ag = silver-searcher; # added 2018-04-25
   aircrackng = aircrack-ng; # added 2016-01-14
   ammonite-repl = ammonite; # added 2017-05-02
+  apacheAnt = ant; # added 2018-04-25
+  apacheAnt_1_9 = ant_1_9; # added 2018-04-25
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
   at_spi2_atk = at-spi2-atk; # added 2018-02-25
@@ -48,50 +53,68 @@ mapAliases (rec {
   cupsBjnp = cups-bjnp; # added 2016-01-02
   cups_filters = cups-filters; # added 2016-08
   cv = progress; # added 2015-09-06
+  d1x_rebirth = dxx-rebirth; # added 2018-04-25
+  d2x_rebirth = dxx-rebirth; # added 2018-04-25
+  dbus_daemon = dbus.daemon; # added 2018-04-25
   dbus_glib = dbus-glib; # added 2018-02-25
+  dbus_libs = dbus; # added 2018-04-25
+  dbus_tools = dbus.out; # added 2018-04-25
   deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23
+  deadpixi-sam = deadpixi-sam-unstable;
   debian_devscripts = debian-devscripts; # added 2016-03-23
   desktop_file_utils = desktop-file-utils; # added 2018-02-25
+  devicemapper = lvm2; # added 2018-04-25
   digikam5 = digikam; # added 2017-02-18
+  dmtx = dmtx-utils; # added 2018-04-25
+  docbook5_xsl = docbook_xsl_ns; # added 2018-04-25
+  docbook_xml_xslt = docbook_xsl; # added 2018-04-25
   double_conversion = double-conversion; # 2017-11-22
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
+  emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
   enblendenfuse = enblend-enfuse; # 2015-09-30
   evolution_data_server = evolution-data-server; # added 2018-02-25
+  etcdctl = etcd; # added 2018-04-25
   exfat-utils = exfat;                  # 2015-09-11
+  fam = gamin; # added 2018-04-25
+  fftwFloat = fftwSinglePrec; # 2018-04-25
   firefox-esr-wrapper = firefox-esr;  # 2016-01
   firefox-wrapper = firefox;          # 2016-01
   firefoxWrapper = firefox;           # 2015-09
+  flameGraph = flamegraph; # added 2018-04-25
   font-awesome-ttf = font-awesome_4; # 2018-02-25
   foomatic_filters = foomatic-filters;  # 2016-08
   fuse_exfat = exfat;                   # 2015-09-11
-  gettextWithExpat = gettext; # 2016-02-19
+  fuseki = apache-jena-fuseki; # added 2018-04-25
   gdb-multitarget = gdb; # added 2017-11-13
+  gettextWithExpat = gettext; # 2016-02-19
+  gflags = google-gflags; # added 2018-04-25
   git-hub = gitAndTools.git-hub; # added 2016-04-29
   glib_networking = glib-networking; # added 2018-02-25
+  gmock = gtest; # added 2018-04-25
+  gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
+  gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
+  gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
+  gnustep-make = gnustep.make; # added 2016-7-6
   go-pup = pup; # added 2017-12-19
   googleAuthenticator = google-authenticator; # added 2016-10-16
-  gnome_doc_utils = gnome-doc-utils; # added 2018-02-25
-  gnome-themes-standard = gnome-themes-extra; # added 2018-03-14
-  gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
   grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
   gst_ffmpeg = gst-ffmpeg;  # added 2017-02
+  gst_plugins_bad = gst-plugins-bad;  # added 2017-02
   gst_plugins_base = gst-plugins-base;  # added 2017-02
   gst_plugins_good = gst-plugins-good;  # added 2017-02
-  gst_plugins_bad = gst-plugins-bad;  # added 2017-02
   gst_plugins_ugly = gst-plugins-ugly;  # added 2017-02
   gst_python = gst-python;  # added 2017-02
   gtk_doc = gtk-doc; # added 2018-02-25
   guileCairo = guile-cairo; # added 2017-09-24
   guileGnome = guile-gnome; # added 2017-09-24
-  guile_lib = guile-lib; # added 2017-09-24
   guileLint = guile-lint; # added 2017-09-27
+  guile_lib = guile-lib; # added 2017-09-24
   guile_ncurses = guile-ncurses; # added 2017-09-24
   gupnp_av = gupnp-av; # added 2018-02-25
   gupnp_dlna = gupnp-dlna; # added 2018-02-25
   gupnp_igd = gupnp-igd; # added 2018-02-25
   gupnptools = gupnp-tools;  # added 2015-12-19
-  gnustep-make = gnustep.make; # added 2016-7-6
   hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
   htmlTidy = html-tidy;  # added 2014-12-06
   iana_etc = iana-etc;  # added 2017-03-08
@@ -100,43 +123,55 @@ mapAliases (rec {
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
   kdiff3-qt5 = kdiff3; # added 2017-02-18
-  keepassx2-http = keepassx-reboot; # added 2016-10-17
-  keepassx-reboot = keepassx-community; # added 2017-02-01
+  keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
   keepassx-community = keepassxc; # added 2017-11
+  keepassx-reboot = keepassx-community; # added 2017-02-01
+  keepassx2-http = keepassx-reboot; # added 2016-10-17
+  kerberos = libkrb5; # added 2018-04-25
   keybase-go = keybase;  # added 2016-08-24
   krename-qt5 = krename; # added 2017-02-18
+  kvm = qemu_kvm; # added 2018-04-25
   letsencrypt = certbot; # added 2016-05-16
-  libdbusmenu_qt5 = libsForQt5.libdbusmenu;  # added 2015-12-19
+  libaudit = audit; # added 2018-04-25
   libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
   libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25
   libcap_manpages = libcap.doc; # added 2016-04-29
   libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
   libcap_progs = libcap.out; # added 2016-04-29
+  libdbusmenu_qt5 = libsForQt5.libdbusmenu;  # added 2015-12-19
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
   libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
   libgumbo = gumbo; # added 2018-01-21
   libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || hostPlatform.libc != "glibc") gettext; # added 2018-03-14
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
+  liblrdf = librdf; # added 2018-04-25
   libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
+  librecad2 = librecad;  # backwards compatibility alias, added 2015-10
+  libsysfs = sysfsutils; # added 2018-04-25
   libtidy = html-tidy;  # added 2014-12-21
+  libudev = udev; # added 2018-04-25
   links = links2; # added 2016-01-31
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
-  lua5_sec = luaPackages.luasec; # added 2017-05-02
   lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02
   lua5_expat = luaPackages.luaexpat; # added 2017-05-02
+  lua5_sec = luaPackages.luasec; # added 2017-05-02
+  lzma = xz; # added 2018-04-25
   m3d-linux = m33-linux; # added 2016-08-13
-  manpages = man-pages; # added 2015-12-06
+  gnum4 = m4; # added 2018-04-25
   man_db = man-db; # added 2016-05
-  piwik = matomo; # added 2018-01-16
+  manpages = man-pages; # added 2015-12-06
   midoriWrapper = midori; # added 2015-01
   mlt-qt5 = libsForQt5.mlt;  # added 2015-12-19
   mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25
   module_init_tools = kmod; # added 2016-04-22
+  msf = metasploit; # added 2018-04-25
   mssys = ms-sys; # added 2015-12-13
   multipath_tools = multipath-tools;  # added 2016-01-21
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
+  mysql = mariadb; # added 2018-04-25
   mysqlWorkbench = mysql-workbench; # added 2017-01-19
+  nagiosPluginsOfficial = monitoring-plugins;
   ncat = nmap;  # added 2016-01-26
   networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25
   networkmanager_iodine = networkmanager-iodine; # added 2018-02-25
@@ -144,33 +179,42 @@ mapAliases (rec {
   networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
   networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
   networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
-  nmap_graphical = nmap-graphical;  # added 2017-01-19
   nfsUtils = nfs-utils;  # added 2014-12-06
+  nginxUnstable = nginxMainline; # added 2018-04-25
+  nilfs_utils = nilfs-utils; # added 2018-04-25
+  nmap_graphical = nmap-graphical;  # added 2017-01-19
+  nologin = shadow; # added 2018-04-25
+  openal = openalSoft; # added 2018-04-25
+  opencascade_oce = opencascade; # added 2018-04-25
   opencl-icd = ocl-icd; # added 2017-01-20
+  openexr_ctl = ctl; # added 2018-04-25
   openssh_with_kerberos = openssh; # added 2018-01-28
   owncloudclient = owncloud-client;  # added 2016-08
   p11_kit = p11-kit; # added 2018-02-25
   pgp-tools = signing-party; # added 2017-03-26
   pidgin-with-plugins = pidgin; # added 2016-06
-  pidginlatexSF = pidgin-latex; # added 2014-11-02
   pidginlatex = pidgin-latex; # added 2018-01-08
+  pidginlatexSF = pidgin-latex; # added 2014-11-02
   pidginmsnpecan = pidgin-msn-pecan; # added 2018-01-08
-  pidginotr = pidgin-otr; # added 2018-01-08
   pidginosd = pidgin-osd; # added 2018-01-08
+  pidginotr = pidgin-otr; # added 2018-01-08
   pidginsipe = pidgin-sipe; # added 2018-01-08
   pidginwindowmerge = pidgin-window-merge; # added 2018-01-08
-  postage = pgmanage; # added 2017-11-03
+  piwik = matomo; # added 2018-01-16
+  pltScheme = racket; # just to be sure
+  polarssl = mbedtls; # added 2018-04-25
   poppler_qt5 = libsForQt5.poppler;  # added 2015-12-19
-  PPSSPP = ppsspp; # added 2017-10-01
+  postage = pgmanage; # added 2017-11-03
+  procps = procps-ng; # added 2018-04-25
   prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
-  QmidiNet = qmidinet;  # added 2016-05-22
   qt_gstreamer = qt-gstreamer;  # added 2017-02
   qt_gstreamer1 = qt-gstreamer1;  # added 2017-02
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   rdmd = dtools;  # added 2017-08-19
+  redland = librdf_redland; # added 2018-04-25
   robomongo = robo3t; #added 2017-09-28
   rssglx = rss-glx; #added 2015-03-25
   ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby";
@@ -181,15 +225,21 @@ mapAliases (rec {
   ruby_2_5_0 = throw "deprecated 2018-0213: use ruby_2_5 instead";
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
   rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
+  sam = deadpixi-sam; # added 2018-04-25
   samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
   saneBackends = sane-backends; # added 2016-01-02
   saneBackendsGit = sane-backends-git; # added 2016-01-02
   saneFrontends = sane-frontends; # added 2016-01-02
   scim = sc-im; # added 2016-01-22
+  scollector = bosun; # added 2018-04-25
   shared_mime_info = shared-mime-info; # added 2018-02-25
   skrooge2 = skrooge; # added 2017-02-18
   skype = skypeforlinux; # added 2017-07-27
+  slurm-llnl = slurm; # renamed July 2017
+  slurm-llnl-full = slurm-full; # renamed July 2017
+  smbclient = samba; # added 2018-04-25
   spaceOrbit = space-orbit; # addewd 2016-05-23
+  speech_tools = speech-tools; # added 2018-04-25
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   spice_gtk = spice-gtk; # added 2018-02-25
   spice_protocol = spice-protocol; # added 2018-02-25
@@ -197,8 +247,9 @@ mapAliases (rec {
   sshfs = sshfs-fuse; # added 2017-08-14
   sshfsFuse = sshfs-fuse; # added 2016-09
   surf-webkit2 = surf; # added 2017-04-02
-  tahoelafs = tahoe-lafs; # added 2018-03-26
   system_config_printer = system-config-printer;  # added 2016-01-03
+  systool = sysfsutils; # added 2018-04-25
+  tahoelafs = tahoe-lafs; # added 2018-03-26
   telepathy_farstream = telepathy-farstream; # added 2018-02-25
   telepathy_gabble = telepathy-gabble; # added 2018-02-25
   telepathy_glib = telepathy-glib; # added 2018-02-25
@@ -214,9 +265,12 @@ mapAliases (rec {
   tex-gyre-schola-math = tex-gyre-math.schola; # added 2018-04-03
   tex-gyre-termes-math = tex-gyre-math.termes; # added 2018-04-03
   tftp_hpa = tftp-hpa; # added 2015-04-03
+  trang = jing-trang; # added 2018-04-25
   transmission_gtk = transmission-gtk; # added 2018-01-06
   transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06
+  tshark = wireshark-cli; # added 2018-04-25
   ucsFonts = ucs-fonts; # added 2016-07-15
+  udev = systemd; # added 2018-04-25
   ultrastardx-beta = ultrastardx; # added 2017-08-12
   usb_modeswitch = usb-modeswitch; # added 2016-05-10
   vimbWrapper = vimb; # added 2015-01
@@ -226,8 +280,12 @@ mapAliases (rec {
   wineStaging = wine-staging; # added 2018-01-08
   winusb = woeusb; # added 2017-12-22
   x11 = xlibsWrapper; # added 2015-09
+  xbmc = kodi; # added 2018-04-25
+  xbmcPlain = kodiPlain; # added 2018-04-25
+  xbmcPlugins = kodiPlugins; # added 2018-04-25
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
+  yacc = bison; # added 2018-04-25
   youtubeDL = youtube-dl;  # added 2014-10-26
 
   # added 2017-05-27
@@ -245,6 +303,20 @@ mapAliases (rec {
     ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02
     ocamlPackages_4_03
     ocamlPackages_latest;
+
+  gst_all = { # added 2018-04-25
+    inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
+    gstPluginsBase = pkgs.gst-plugins-base;
+    gstPluginsBad = pkgs.gst-plugins-bad;
+    gstPluginsGood = pkgs.gst-plugins-good;
+    gstPluginsUgly = pkgs.gst-plugins-ugly;
+    gstFfmpeg = pkgs.gst-ffmpeg;
+    gst-plugins-base = pkgs.gst-plugins-base;
+    gst-plugins-bad = pkgs.gst-plugins-bad;
+    gst-plugins-good = pkgs.gst-plugins-good;
+    gst-plugins-ugly = pkgs.gst-plugins-ugly;
+    gst-ffmpeg = pkgs.gst-ffmpeg;
+  };
 } // (with ocaml-ng; { # added 2016-09-14
   ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
   ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08aad6e41c9c..0cd7366c7170 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2330,9 +2330,6 @@ with pkgs;
 
   flamegraph = callPackage ../development/tools/flamegraph { };
 
-  # Awkward historical capitalization for flamegraph. Remove eventually
-  flameGraph = flamegraph;
-
   flvtool2 = callPackage ../tools/video/flvtool2 { };
 
   fmbt = callPackage ../development/tools/fmbt {
@@ -2735,7 +2732,6 @@ with pkgs;
   gt5 = callPackage ../tools/system/gt5 { };
 
   gtest = callPackage ../development/libraries/gtest {};
-  gmock = gtest;
   gbenchmark = callPackage ../development/libraries/gbenchmark {};
 
   gtkdatabox = callPackage ../development/libraries/gtkdatabox {};
@@ -3408,9 +3404,6 @@ with pkgs;
 
   nodePackages = nodePackages_6_x;
 
-  # Can be used as a user shell
-  nologin = shadow;
-
   npm2nix = nodePackages.npm2nix;
 
   file-rename = callPackage ../tools/filesystems/file-rename { };
@@ -3571,8 +3564,6 @@ with pkgs;
 
   lzip = callPackage ../tools/compression/lzip { };
 
-  lzma = xz;
-
   xz = callPackage ../tools/compression/xz { };
 
   lz4 = callPackage ../tools/compression/lz4 { };
@@ -3784,7 +3775,6 @@ with pkgs;
   mscgen = callPackage ../tools/graphics/mscgen { };
 
   metasploit = callPackage ../tools/security/metasploit { };
-  msf = metasploit;
 
   ms-sys = callPackage ../tools/misc/ms-sys { };
 
@@ -3963,7 +3953,6 @@ with pkgs;
   nifskope = callPackage ../tools/graphics/nifskope { };
 
   nilfs-utils = callPackage ../tools/filesystems/nilfs-utils {};
-  nilfs_utils = nilfs-utils;
 
   nitrogen = callPackage ../tools/X11/nitrogen {};
 
@@ -4861,7 +4850,6 @@ with pkgs;
   };
 
   silver-searcher = callPackage ../tools/text/silver-searcher { };
-  ag = self.silver-searcher;
 
   simpleproxy = callPackage ../tools/networking/simpleproxy { };
 
@@ -5495,8 +5483,6 @@ with pkgs;
 
   tradcpp = callPackage ../development/tools/tradcpp { };
 
-  trang = self.jing-trang;
-
   tre = callPackage ../development/libraries/tre { };
 
   ts = callPackage ../tools/system/ts { };
@@ -7202,8 +7188,6 @@ with pkgs;
 
   picolisp = callPackage ../development/interpreters/picolisp {};
 
-  pltScheme = racket; # just to be sure
-
   polyml = callPackage ../development/compilers/polyml { };
   polyml56 = callPackage ../development/compilers/polyml/5.6.nix { };
 
@@ -7489,11 +7473,9 @@ with pkgs;
   antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { };
   antlr4 = antlr4_7;
 
-  ant = apacheAnt;
+  ant = callPackage ../development/tools/build-managers/apache-ant { };
 
-  apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
-
-  apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
+  ant_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
 
   apacheKafka = apacheKafka_1_0;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
@@ -7857,8 +7839,6 @@ with pkgs;
 
   flexcpp = callPackage ../development/tools/parsing/flexc++ { };
 
-  m4 = gnum4;
-
   geis = callPackage ../development/libraries/geis {
     inherit (xorg) libX11 libXext libXi libXtst;
   };
@@ -7873,7 +7853,7 @@ with pkgs;
 
   gnome-usage = callPackage ../applications/misc/gnome-usage {};
 
-  gnum4 = callPackage ../development/tools/misc/gnum4 { };
+  m4 = callPackage ../development/tools/misc/gnum4 { };
 
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
   gnumake3 = gnumake382;
@@ -8363,8 +8343,6 @@ with pkgs;
   };
   xxdiff-tip = libsForQt5.callPackage ../development/tools/misc/xxdiff/tip.nix { };
 
-  yacc = bison;
-
   yaml2json = callPackage ../development/tools/yaml2json { };
 
   ycmd = callPackage ../development/tools/misc/ycmd {
@@ -8687,11 +8665,6 @@ with pkgs;
   dbus-sharp-glib-1_0 = callPackage ../development/libraries/dbus-sharp-glib/dbus-sharp-glib-1.0.nix { };
   dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { };
 
-  # FIXME: deprecate these.
-  dbus_tools = dbus.out;
-  dbus_libs = dbus;
-  dbus_daemon = dbus.daemon;
-
   makeDBusConf = { suidHelper, serviceDirectories }:
     callPackage ../development/libraries/dbus/make-dbus-conf.nix {
       inherit suidHelper serviceDirectories;
@@ -8914,8 +8887,6 @@ with pkgs;
 
   funambol = callPackage ../development/libraries/funambol { };
 
-  fam = gamin;
-
   gamin = callPackage ../development/libraries/gamin { };
 
   ganv = callPackage ../development/libraries/ganv { };
@@ -8963,8 +8934,6 @@ with pkgs;
 
   gettext = callPackage ../development/libraries/gettext { };
 
-  gflags = google-gflags;
-
   gf2x = callPackage ../development/libraries/gf2x {};
 
   gd = callPackage ../development/libraries/gd {
@@ -9123,22 +9092,6 @@ with pkgs;
     callPackage = pkgs.newScope (pkgs // { libav = pkgs.ffmpeg; });
   });
 
-  gst_all = {
-    inherit (pkgs) gstreamer gnonlin gst-python qt-gstreamer;
-    gstPluginsBase = pkgs.gst-plugins-base;
-    gstPluginsBad = pkgs.gst-plugins-bad;
-    gstPluginsGood = pkgs.gst-plugins-good;
-    gstPluginsUgly = pkgs.gst-plugins-ugly;
-    gstFfmpeg = pkgs.gst-ffmpeg;
-
-    # aliases with the dashed naming, same as in gst_all_1
-    gst-plugins-base = pkgs.gst-plugins-base;
-    gst-plugins-bad = pkgs.gst-plugins-bad;
-    gst-plugins-good = pkgs.gst-plugins-good;
-    gst-plugins-ugly = pkgs.gst-plugins-ugly;
-    gst-ffmpeg = pkgs.gst-ffmpeg;
-  };
-
   gstreamer = callPackage ../development/libraries/gstreamer/legacy/gstreamer {
     bison = bison2;
   };
@@ -9338,10 +9291,6 @@ with pkgs;
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  # TODO : Let admin choose.
-  # We are using mit-krb5 because it is better maintained
-  kerberos = libkrb5;
-
   heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { };
   libheimdal = heimdalFull.override { type = "lib"; };
 
@@ -9863,8 +9812,6 @@ with pkgs;
 
   liblo = callPackage ../development/libraries/liblo { };
 
-  liblrdf = librdf;
-
   liblscp = callPackage ../development/libraries/liblscp { };
 
   libe-book = callPackage ../development/libraries/libe-book {};
@@ -10794,8 +10741,6 @@ with pkgs;
 
   oobicpl = callPackage ../development/libraries/science/biology/oobicpl { };
 
-  openal = self.openalSoft;
-
   openalSoft = callPackage ../development/libraries/openal-soft {
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
   };
@@ -10804,8 +10749,6 @@ with pkgs;
 
   opencascade = callPackage ../development/libraries/opencascade { };
 
-  opencascade_oce = opencascade;
-
   opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; };
   opencl-headers_1_2 = opencl-headersGen "12";
   opencl-headers_2_2 = opencl-headersGen "22";
@@ -10834,9 +10777,6 @@ with pkgs;
     enableCuda = false;
   };
 
-  # this ctl version is needed by openexr_viewers
-  openexr_ctl = ctl;
-
   openexr = callPackage ../development/libraries/openexr { };
 
   openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { };
@@ -10982,8 +10922,6 @@ with pkgs;
 
   poker-eval = callPackage ../development/libraries/poker-eval { };
 
-  polarssl = mbedtls;
-
   polkit = callPackage ../development/libraries/polkit { };
 
   polkit_qt4 = callPackage ../development/libraries/polkit-qt-1/qt-4.nix { };
@@ -11342,8 +11280,6 @@ with pkgs;
 
   qrupdate = callPackage ../development/libraries/qrupdate { };
 
-  redland = pkgs.librdf_redland;
-
   resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
 
   rhino = callPackage ../development/libraries/java/rhino {
@@ -11490,7 +11426,6 @@ with pkgs;
   speechd = callPackage ../development/libraries/speechd { };
 
   speech-tools = callPackage ../development/libraries/speech-tools {};
-  speech_tools = speech-tools;
 
   speex = callPackage ../development/libraries/speex {
     fftw = fftwFloat;
@@ -12263,8 +12198,6 @@ with pkgs;
     java = jdk;
   };
 
-  fuseki = apache-jena-fuseki;
-
   apcupsd = callPackage ../servers/apcupsd { };
 
   asterisk = asterisk-stable;
@@ -12286,7 +12219,6 @@ with pkgs;
     bird bird6 bird2;
 
   bosun = callPackage ../servers/monitoring/bosun { };
-  scollector = bosun;
 
   cayley = callPackage ../servers/cayley { };
 
@@ -12359,8 +12291,6 @@ with pkgs;
     v8 = v8_6_x;
   };
 
-  etcdctl = etcd;
-
   exim = callPackage ../servers/mail/exim { };
 
   fcgiwrap = callPackage ../servers/fcgiwrap { };
@@ -12487,8 +12417,6 @@ with pkgs;
     modules = [ nginxModules.dav nginxModules.moreheaders ];
   };
 
-  nginxUnstable = nginxMainline;
-
   nginxModules = callPackage ../servers/http/nginx/modules.nix { };
 
   # We should move to dynmaic modules and create a nginxFull package with all modules
@@ -12565,7 +12493,6 @@ with pkgs;
   };
 
   # libpulse implementations
-
   libpulseaudio-vanilla = callPackage ../servers/pulseaudio {
     libOnly = true;
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
@@ -12630,8 +12557,6 @@ with pkgs;
     boost = boost159;
   };
 
-  mysql = mariadb;
-
   mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { };
 
   nagios = callPackage ../servers/monitoring/nagios { };
@@ -12639,7 +12564,6 @@ with pkgs;
   munin = callPackage ../servers/monitoring/munin { };
 
   monitoring-plugins = callPackage ../servers/monitoring/plugins { };
-  nagiosPluginsOfficial = monitoring-plugins;
 
   inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; })
     check-nwc-health
@@ -12795,7 +12719,6 @@ with pkgs;
 
   deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { };
   deadpixi-sam = deadpixi-sam-unstable;
-  sam = deadpixi-sam;
 
   samba3 = callPackage ../servers/samba/3.x.nix { };
 
@@ -12807,8 +12730,6 @@ with pkgs;
 
   samba = samba4;
 
-  smbclient = samba;
-
   # A lightweight Samba 3, useful for non-Linux-based OSes.
   samba3_light = lowPrio (samba3.override {
     pam = null;
@@ -12872,10 +12793,8 @@ with pkgs;
   storm = callPackage ../servers/computing/storm { };
 
   slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
-  slurm-llnl = slurm; # renamed July 2017
 
   slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
-  slurm-llnl-full = slurm-full; # renamed July 2017
 
   slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { };
 
@@ -13013,7 +12932,6 @@ with pkgs;
   atop = callPackage ../os-specific/linux/atop { };
 
   audit = callPackage ../os-specific/linux/audit { };
-  libaudit = audit;
 
   b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { };
 
@@ -13079,8 +12997,6 @@ with pkgs;
   # `.override` clobbered. C.F. `llvmPackages` which does the same.
   darwin = callPackage ./darwin-packages.nix { };
 
-  devicemapper = lvm2;
-
   disk_indicator = callPackage ../os-specific/linux/disk-indicator { };
 
   displaylink = callPackage ../os-specific/linux/displaylink {
@@ -13708,8 +13624,6 @@ with pkgs;
 
   kmod-debian-aliases = callPackage ../os-specific/linux/kmod-debian-aliases { };
 
-  kvm = qemu_kvm;
-
   libcap = callPackage ../os-specific/linux/libcap { };
 
   libcap_ng = callPackage ../os-specific/linux/libcap-ng {
@@ -13883,8 +13797,6 @@ with pkgs;
 
   prayer = callPackage ../servers/prayer { };
 
-  procps = procps-ng;
-
   procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { }
               else unixtools.procps;
 
@@ -13975,10 +13887,6 @@ with pkgs;
     inherit (gnome2) libglade;
   };
 
-  # Provided with sysfsutils.
-  libsysfs = sysfsutils;
-  systool = sysfsutils;
-
   sysklogd = callPackage ../os-specific/linux/sysklogd { };
 
   syslinux = callPackage ../os-specific/linux/syslinux { };
@@ -14055,9 +13963,6 @@ with pkgs;
     cross = assert targetPlatform != buildPlatform; targetPlatform;
   });
 
-  udev = systemd;
-  libudev = udev;
-
   eudev = callPackage ../os-specific/linux/eudev {};
 
   libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
@@ -14265,10 +14170,6 @@ with pkgs;
     docbook_xsl
     docbook_xsl_ns;
 
-  docbook_xml_xslt = docbook_xsl;
-
-  docbook5_xsl = docbook_xsl_ns;
-
   documentation-highlighter = callPackage ../misc/documentation-highlighter { };
 
   cabin = callPackage ../data/fonts/cabin { };
@@ -15223,8 +15124,6 @@ with pkgs;
     inherit (python3Packages) buildPythonApplication requests;
   };
 
-  dmtx = dmtx-utils;
-
   dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) {
   };
 
@@ -15354,9 +15253,6 @@ with pkgs;
       ImageCaptureCore GSS ImageIO;
   };
 
-  # for backwards compatibility
-  emacs25Macport_25_1 = emacs25Macport;
-
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
     inherit emacs;
 
@@ -15589,7 +15485,6 @@ with pkgs;
   keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { };
 
   keepass-keepassrpc = callPackage ../applications/misc/keepass-plugins/keepassrpc { };
-  keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
 
   exrdisplay = callPackage ../applications/graphics/exrdisplay { };
 
@@ -15752,9 +15647,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
   };
 
-  # the cli binary is actually called tshark and often packaged under this name
-  tshark = wireshark-cli;
-
   # The GTK UI is deprecated by upstream. You probably want the QT version.
   wireshark-gtk = wireshark-cli.override { withGtk = true; };
   wireshark-qt = wireshark-cli.override { withQt = true; };
@@ -16532,7 +16424,6 @@ with pkgs;
   libowfat = callPackage ../development/libraries/libowfat { };
 
   librecad = callPackage ../applications/misc/librecad { };
-  librecad2 = librecad;  # backwards compatibility alias, added 2015-10
 
   libreoffice = hiPrio libreoffice-still;
 
@@ -18578,15 +18469,12 @@ with pkgs;
   };
 
   kodiPlain = callPackage ../applications/video/kodi { };
-  xbmcPlain = kodiPlain;
 
   kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
-  xbmcPlugins = kodiPlugins;
 
   kodi = wrapKodi {
     kodi = kodiPlain;
   };
-  xbmc = kodi;
 
   kodi-retroarch-advanced-launchers =
     callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix {
@@ -18981,10 +18869,6 @@ with pkgs;
     physfs = physfs_2;
   };
 
-  # these are here for compatibility
-  d1x_rebirth = dxx-rebirth;
-  d2x_rebirth = dxx-rebirth;
-
   inherit (callPackages ../games/dxx-rebirth/assets.nix { })
     descent1-assets
     descent2-assets;

From 2911ece39281c0401d271545164ebd5ec22edf9a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 17:43:38 -0500
Subject: [PATCH 0883/3370] aliases: add gccApple

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cf39970fb926..74beaa81ea07 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -85,6 +85,7 @@ mapAliases (rec {
   foomatic_filters = foomatic-filters;  # 2016-08
   fuse_exfat = exfat;                   # 2015-09-11
   fuseki = apache-jena-fuseki; # added 2018-04-25
+  gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
   gdb-multitarget = gdb; # added 2017-11-13
   gettextWithExpat = gettext; # 2016-02-19
   gflags = google-gflags; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cd7366c7170..e4cc1db32bc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6093,8 +6093,6 @@ with pkgs;
     stripped = false;
   }));
 
-  gccApple = throw "gccApple is no longer supported";
-
   libstdcxxHook = makeSetupHook
     { substitutions = { gcc = gcc-unwrapped; }; }
     ../development/compilers/gcc/libstdc++-hook.sh;

From 9d7c57afc4ed9b73c8dfcc09caf503ed9513fde1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 17:44:18 -0500
Subject: [PATCH 0884/3370] aliases: add check if alias still exists in
 all-packages.nix

If an alias is already defined in all-packages.nix, we want to throw
an error to make it obvious that something is wrong. Otherwise there
is no way to realize that the alias is shadowing the real definition.
---
 pkgs/top-level/aliases.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 74beaa81ea07..6f2ebeddb2d7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -17,8 +17,17 @@ let
       dontDistribute alias
     else alias;
 
+  # Make sure that we are not shadowing something from
+  # all-packages.nix.
+  checkInPkgs = n: alias: if builtins.hasAttr n self
+                          then throw "Alias ${n} is still in all-packages.nix"
+                          else alias;
+
   mapAliases = aliases:
-    lib.mapAttrs (n: alias: removeDistribute (removeRecurseForDerivations alias)) aliases;
+    lib.mapAttrs (n: alias: removeDistribute
+                             (removeRecurseForDerivations
+                              (checkInPkgs n alias)))
+                     aliases;
 in
 
   ### Deprecated aliases - for backward compatibility

From ffe4b64205debbbdbc087277c4c8615c1591ac59 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 17:47:57 -0500
Subject: [PATCH 0885/3370] aliases: add skip aliases config

You can turn on this config option if you want to find references to
aliases in Nixpkgs. Ideally these can be removed from Nixpkgs and
eventually we can remove the alias altogether.
---
 pkgs/top-level/stage.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index de676c5a4210..e38f5442d3aa 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -97,7 +97,8 @@ let
       res self;
     in res;
 
-  aliases = self: super: import ./aliases.nix super;
+  aliases = self: super: if config.skipAliases or false then {}
+                         else import ./aliases.nix super;
 
   # stdenvOverrides is used to avoid having multiple of versions
   # of certain dependencies that were used in bootstrapping the

From 4654643266b91c9cff8a162f96a1c98f38ee4d23 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 10:36:29 -0500
Subject: [PATCH 0886/3370] =?UTF-8?q?mysql=20=E2=86=92=20mariadb?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3ea873cdc7ff..58c00cd84d33 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -43,7 +43,7 @@ let
               jobs.ghc.x86_64-darwin
               jobs.git.x86_64-darwin
               jobs.go.x86_64-darwin
-              jobs.mysql.x86_64-darwin
+              jobs.mariadb.x86_64-darwin
               jobs.nix-repl.x86_64-darwin
               jobs.nix.x86_64-darwin
               jobs.nox.x86_64-darwin
@@ -99,7 +99,7 @@ let
               jobs.thunderbird.x86_64-linux
               # Ensure that basic stuff works on darwin
               jobs.git.x86_64-darwin
-              jobs.mysql.x86_64-darwin
+              jobs.mariadb.x86_64-darwin
               jobs.vim.x86_64-darwin
               # Ensure that UI stuff works on darwin
               jobs.inkscape.x86_64-darwin

From 48a1345eaa1c57727f980fcdca0650a1311a485f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 29 Apr 2018 16:37:26 -0500
Subject: [PATCH 0887/3370] all-packages: normalize overrides

Overrides should only be on the "default" package not the other way around.
---
 pkgs/top-level/all-packages.nix | 71 ++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4cc1db32bc7..f654e1aa8e35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2700,11 +2700,11 @@ with pkgs;
 
   grub2_full = callPackage ../tools/misc/grub/2.0x.nix { };
 
-  grub2_efi = grub2_full.override {
+  grub2_efi = grub2.override {
     efiSupport = true;
   };
 
-  grub2_light = grub2_full.override {
+  grub2_light = grub2.override {
     zfsSupport = false;
   };
 
@@ -3721,12 +3721,14 @@ with pkgs;
 
   mitmproxy = callPackage ../tools/networking/mitmproxy { };
 
-  mjpegtoolsFull = callPackage ../tools/video/mjpegtools { };
-
-  mjpegtools = self.mjpegtoolsFull.override {
+  mjpegtools = callPackage ../tools/video/mjpegtools {
     withMinimal = true;
   };
 
+  mjpegtoolsFull = mjpegtools.override {
+    withMinimal = false;
+  };
+
   mkcue = callPackage ../tools/cd-dvd/mkcue { };
 
   mkpasswd = hiPrio (callPackage ../tools/security/mkpasswd { });
@@ -4310,28 +4312,27 @@ with pkgs;
 
   philter = callPackage ../tools/networking/philter { };
 
-  pinentry = pinentry_ncurses.override {
-    inherit gtk2;
+  pinentry = callPackage ../tools/security/pinentry {
+    libcap = if stdenv.isDarwin then null else libcap;
   };
 
-  pinentry_ncurses = callPackage ../tools/security/pinentry {
-    libcap = if stdenv.isDarwin then null else libcap;
+  pinentry_ncurses = pinentry.override {
     gtk2 = null;
   };
 
-  pinentry_emacs = pinentry_ncurses.override {
+  pinentry_emacs = pinentry.override {
     enableEmacs = true;
   };
 
-  pinentry_gnome = pinentry_ncurses.override {
+  pinentry_gnome = pinentry.override {
     gcr = gnome3.gcr;
   };
 
-  pinentry_qt4 = pinentry_ncurses.override {
+  pinentry_qt4 = pinentry.override {
     qt = qt4;
   };
 
-  pinentry_qt5 = pinentry_ncurses.override {
+  pinentry_qt5 = pinentry.override {
     qt = qt5.qtbase;
   };
 
@@ -4354,7 +4355,7 @@ with pkgs;
   plan9port = callPackage ../tools/system/plan9port { };
 
   platformioPackages = callPackage ../development/arduino/platformio { };
-  platformio = platformioPackages.platformio-chrootenv.override {};
+  platformio = platformioPackages.platformio-chrootenv;
 
   platinum-searcher = callPackage ../tools/text/platinum-searcher { };
 
@@ -9293,7 +9294,7 @@ with pkgs;
   libheimdal = heimdalFull.override { type = "lib"; };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
-  harfbuzz-icu = callPackage ../development/libraries/harfbuzz {
+  harfbuzz-icu = harfbuzz.override {
     withIcu = true;
     withGraphite2 = true;
   };
@@ -9480,10 +9481,11 @@ with pkgs;
 
   kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { };
 
-  krb5Full = callPackage ../development/libraries/kerberos/krb5.nix {
+  krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
     inherit (darwin) bootstrap_cmds;
   };
-  libkrb5 = krb5Full.override {
+  krb5Full = krb5;
+  libkrb5 = krb5.override {
     fetchurl = fetchurlBoot;
     type = "lib";
   };
@@ -9675,14 +9677,12 @@ with pkgs;
 
   libdbi = callPackage ../development/libraries/libdbi { };
 
-  libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {
+  libdbiDriversBase = libdbiDrivers.override {
     mysql = null;
     sqlite = null;
   };
 
-  libdbiDrivers = libdbiDriversBase.override {
-    inherit sqlite mysql;
-  };
+  libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
 
   libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { };
   libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; };
@@ -15639,16 +15639,16 @@ with pkgs;
 
   welle-io = libsForQt5.callPackage ../applications/misc/welle-io { };
 
-  wireshark-cli = callPackage ../applications/networking/sniffers/wireshark {
-    withQt = false;
+  wireshark = callPackage ../applications/networking/sniffers/wireshark {
+    withQt = true;
     withGtk = false;
     inherit (darwin.apple_sdk.frameworks) ApplicationServices SystemConfiguration;
   };
+  wireshark-qt = wireshark;
 
   # The GTK UI is deprecated by upstream. You probably want the QT version.
-  wireshark-gtk = wireshark-cli.override { withGtk = true; };
-  wireshark-qt = wireshark-cli.override { withQt = true; };
-  wireshark = wireshark-qt;
+  wireshark-gtk = wireshark.override { withGtk = true; };
+  wireshark-cli = wireshark.override { withGtk = false; withQt = false; };
 
   fbida = callPackage ../applications/graphics/fbida { };
 
@@ -16166,13 +16166,12 @@ with pkgs;
     libwebp = null;
   };
 
-  imagemagick = imagemagickBig.override {
+  imagemagick = callPackage ../applications/graphics/ImageMagick {
+    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
     ghostscript = null;
   };
 
-  imagemagickBig = callPackage ../applications/graphics/ImageMagick {
-    inherit (darwin.apple_sdk.frameworks) ApplicationServices;
-  };
+  imagemagickBig = imagemagick.override { inherit ghostscript; };
 
   imagemagick7_light = lowPrio (imagemagick7.override {
     bzip2 = null;
@@ -19750,12 +19749,12 @@ with pkgs;
   # and with or without atlas as a dependency. The default `liblapack` is 3.4.1
   # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0
   # without atlas. Etc.
-  liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {};
-  liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; };
-  liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
-  liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; };
-  liblapack = liblapackWithAtlas;
-  liblapack_3_5_0 = liblapack_3_5_0WithAtlas;
+  liblapack = callPackage ../development/libraries/science/math/liblapack {};
+  liblapackWithAtlas = liblapack;
+  liblapackWithoutAtlas = liblapack.override { atlas = null; };
+  liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
+  liblapack_3_5_0WithAtlas = liblapack_3_5_0;
+  liblapack_3_5_0WithoutAtlas = liblapack_3_5_0.override { atlas = null; };
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 

From 7ab8c886a45673b69185bb25f19ccb6c4ac0a2f0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 13:46:05 -0500
Subject: [PATCH 0888/3370] all-packages: more overrides normalizing

---
 .../libraries/libindicate/default.nix         |   2 +-
 .../libraries/libindicator/default.nix        |   2 +-
 .../development/libraries/ncurses/default.nix |   2 +-
 pkgs/top-level/aliases.nix                    |  10 +-
 pkgs/top-level/all-packages.nix               | 283 ++++++++----------
 5 files changed, 144 insertions(+), 155 deletions(-)

diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix
index 445a505b68c8..1bde9336c66d 100644
--- a/pkgs/development/libraries/libindicate/default.nix
+++ b/pkgs/development/libraries/libindicate/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, lib, file
 , pkgconfig, autoconf
 , glib, dbus-glib, libdbusmenu-glib
-, gtkVersion, gtk2 ? null, gtk3 ? null
+, gtkVersion ? "3", gtk2 ? null, gtk3 ? null
 , pythonPackages, gobjectIntrospection, vala, gnome-doc-utils
 , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null
  }:
diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix
index a6eb0bed2bb8..33691f79a4c8 100644
--- a/pkgs/development/libraries/libindicator/default.nix
+++ b/pkgs/development/libraries/libindicator/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, file
 , pkgconfig
-, gtkVersion, gtk2 ? null, gtk3 ? null }:
+, gtkVersion ? "3", gtk2 ? null, gtk3 ? null }:
 
 with lib;
 
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index abb3020e5fba..6a8867264dfd 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, pkgconfig
 
-, abiVersion
+, abiVersion ? "6"
 , mouseSupport ? false
 , unicode ? true
 , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6f2ebeddb2d7..7576a7a07577 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -85,6 +85,7 @@ mapAliases (rec {
   etcdctl = etcd; # added 2018-04-25
   exfat-utils = exfat;                  # 2015-09-11
   fam = gamin; # added 2018-04-25
+  ffadoFull = ffado; # added 2018-05-01
   fftwFloat = fftwSinglePrec; # 2018-04-25
   firefox-esr-wrapper = firefox-esr;  # 2016-01
   firefox-wrapper = firefox;          # 2016-01
@@ -125,11 +126,13 @@ mapAliases (rec {
   gupnp_dlna = gupnp-dlna; # added 2018-02-25
   gupnp_igd = gupnp-igd; # added 2018-02-25
   gupnptools = gupnp-tools;  # added 2015-12-19
+  heimdalFull = heimdal; # added 2018-05-01
   hicolor_icon_theme = hicolor-icon-theme; # added 2018-02-25
   htmlTidy = html-tidy;  # added 2014-12-06
   iana_etc = iana-etc;  # added 2017-03-08
   idea = jetbrains; # added 2017-04-03
   inotifyTools = inotify-tools;
+  jack2Full = jack2; # added 2018-04-25
   joseki = apache-jena-fuseki; # added 2016-02-28
   json_glib = json-glib; # added 2018-02-25
   kdiff3-qt5 = kdiff3; # added 2017-02-18
@@ -149,6 +152,7 @@ mapAliases (rec {
   libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29
   libcap_progs = libcap.out; # added 2016-04-29
   libdbusmenu_qt5 = libsForQt5.libdbusmenu;  # added 2015-12-19
+  libdbusmenu-glib = libdbusmenu; # added 2018-05-01
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
   libgnome_keyring3 = libgnome-keyring3; # added 2018-02-25
   libgumbo = gumbo; # added 2018-01-21
@@ -217,6 +221,7 @@ mapAliases (rec {
   postage = pgmanage; # added 2017-11-03
   procps = procps-ng; # added 2018-04-25
   prometheus-statsd-bridge = prometheus-statsd-exporter;  # added 2017-08-27
+  pulseaudioLight = pulseaudio; # added 2018-04-25
   qca-qt5 = libsForQt5.qca-qt5;  # added 2015-12-19
   qt_gstreamer = qt-gstreamer;  # added 2017-02
   qt_gstreamer1 = qt-gstreamer1;  # added 2017-02
@@ -247,6 +252,7 @@ mapAliases (rec {
   skype = skypeforlinux; # added 2017-07-27
   slurm-llnl = slurm; # renamed July 2017
   slurm-llnl-full = slurm-full; # renamed July 2017
+  slurm-full = slurm; # added 2018-05-1
   smbclient = samba; # added 2018-04-25
   spaceOrbit = space-orbit; # addewd 2016-05-23
   speech_tools = speech-tools; # added 2018-04-25
@@ -256,6 +262,7 @@ mapAliases (rec {
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   sshfs = sshfs-fuse; # added 2017-08-14
   sshfsFuse = sshfs-fuse; # added 2016-09
+  suil-qt5 = suil; # added 2018-05-01
   surf-webkit2 = surf; # added 2017-04-02
   system_config_printer = system-config-printer;  # added 2016-01-03
   systool = sysfsutils; # added 2018-04-25
@@ -293,6 +300,7 @@ mapAliases (rec {
   xbmc = kodi; # added 2018-04-25
   xbmcPlain = kodiPlain; # added 2018-04-25
   xbmcPlugins = kodiPlugins; # added 2018-04-25
+  xmonad_log_applet_gnome3 = xmonad_log_applet; # added 2018-05-01
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
   yacc = bison; # added 2018-04-25
@@ -328,7 +336,7 @@ mapAliases (rec {
     gst-ffmpeg = pkgs.gst-ffmpeg;
   };
 } // (with ocaml-ng; { # added 2016-09-14
-  ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
+p  ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
   ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;
   ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml;
   ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f654e1aa8e35..db72b9b42b38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -946,7 +946,6 @@ with pkgs;
   calamares = libsForQt5.callPackage ../tools/misc/calamares {
     python = python3;
     boost = pkgs.boost.override { python = python3; };
-    libyamlcpp = callPackage ../development/libraries/libyaml-cpp { inherit boost; };
   };
 
   capstone = callPackage ../development/libraries/capstone { };
@@ -1615,13 +1614,13 @@ with pkgs;
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  citrix_receiver        = hiPrio citrix_receiver_13_9_0;
-  citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; };
-  citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; };
-  citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; };
-  citrix_receiver_13_6_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.6.0"; };
-  citrix_receiver_13_5_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.5.0"; };
-  citrix_receiver_13_4_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.4.0"; };
+  citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
+  citrix_receiver_13_9_0 = citrix_receiver.override { version = "13.9.0"; };
+  citrix_receiver_13_8_0 = citrix_receiver.override { version = "13.8.0"; };
+  citrix_receiver_13_7_0 = citrix_receiver.override { version = "13.7.0"; };
+  citrix_receiver_13_6_0 = citrix_receiver.override { version = "13.6.0"; };
+  citrix_receiver_13_5_0 = citrix_receiver.override { version = "13.5.0"; };
+  citrix_receiver_13_4_0 = citrix_receiver.override { version = "13.4.0"; };
 
   citra = libsForQt5.callPackage ../misc/emulators/citra { };
 
@@ -2339,7 +2338,7 @@ with pkgs;
   fontforge = lowPrio (callPackage ../tools/misc/fontforge {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   });
-  fontforge-gtk = callPackage ../tools/misc/fontforge {
+  fontforge-gtk = fontforge.override {
     withSpiro = true;
     withGTK = true;
     gtk2 = gtk2-x11;
@@ -2454,7 +2453,7 @@ with pkgs;
 
     gazebo7 = callPackage ../applications/science/robotics/gazebo { };
 
-    gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; };
+    gazebo7-headless = gazebo7.override { withHeadless = true; };
 
   };
 
@@ -3494,7 +3493,7 @@ with pkgs;
 
   libiberty = callPackage ../development/libraries/libiberty { };
 
-  libiberty_static = callPackage ../development/libraries/libiberty { staticBuild = true; };
+  libiberty_static = libiberty.override { staticBuild = true; };
 
   libibverbs = callPackage ../development/libraries/libibverbs { };
 
@@ -3970,7 +3969,7 @@ with pkgs;
 
   nmap = callPackage ../tools/security/nmap { };
 
-  nmap-graphical = callPackage ../tools/security/nmap {
+  nmap-graphical = nmap.override {
     graphicalSupport = true;
   };
 
@@ -5030,8 +5029,8 @@ with pkgs;
   });
 
   strongswan    = callPackage ../tools/networking/strongswan { };
-  strongswanTNC = callPackage ../tools/networking/strongswan { enableTNC = true; };
-  strongswanNM  = callPackage ../tools/networking/strongswan { enableNetworkManager = true; };
+  strongswanTNC = strongswan.override { enableTNC = true; };
+  strongswanNM  = strongswan.override { enableNetworkManager = true; };
 
   su = shadow.su;
 
@@ -6442,18 +6441,19 @@ with pkgs;
 
   hugs = callPackage ../development/interpreters/hugs { };
 
+  bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
+
   openjdk8 =
     if stdenv.isDarwin then
       callPackage ../development/compilers/openjdk/darwin/8.nix { }
     else
       callPackage ../development/compilers/openjdk/8.nix {
-        bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; };
+        bootjdk = bootjdk.override { version = "8"; };
         inherit (gnome2) GConf gnome_vfs;
       };
 
   openjdk10 =
       callPackage ../development/compilers/openjdk/10.nix {
-        bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "10"; };
         inherit (gnome2) GConf gnome_vfs;
       };
 
@@ -6676,7 +6676,7 @@ with pkgs;
    xlibsWrapper = null;
   };
 
-  mitschemeX11 = callPackage ../development/compilers/mit-scheme {
+  mitschemeX11 = mitscheme.override {
    texLive = texlive.combine { inherit (texlive) scheme-small; };
    texinfo = texinfo5;
    enableX11 = true;
@@ -7031,7 +7031,7 @@ with pkgs;
     gtk2 = gtk2-x11;
   };
 
-  lxappearance-gtk3 = callPackage ../desktops/lxde/core/lxappearance {
+  lxappearance-gtk3 = lxappearance.override {
     withGtk3 = true;
   };
 
@@ -7131,7 +7131,7 @@ with pkgs;
       octaveHg = lowPrio (callPackage ../development/interpreters/octave/hg.nix hgOctaveOptions);
   }) octave octaveHg;
 
-  octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
+  octaveFull = (lowPrio (octave.override {
     qt = qt4;
     overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
@@ -7360,22 +7360,21 @@ with pkgs;
 
   amdadlsdk = callPackage ../development/misc/amdadl-sdk { };
 
-  amdappsdk26 = callPackage ../development/misc/amdapp-sdk {
+  amdappsdk26 = amdappsdk.override {
     version = "2.6";
   };
 
-  amdappsdk27 = callPackage ../development/misc/amdapp-sdk {
+  amdappsdk27 = amdappsdk.override {
     version = "2.7";
   };
 
-  amdappsdk28 = callPackage ../development/misc/amdapp-sdk {
+  amdappsdk28 = amdappsdk.override {
     version = "2.8";
   };
 
-  amdappsdk = amdappsdk28;
+  amdappsdk = callPackage ../development/misc/amdapp-sdk { };
 
-  amdappsdkFull = callPackage ../development/misc/amdapp-sdk {
-    version = "2.8";
+  amdappsdkFull = amdappsdk.override {
     samples = true;
   };
 
@@ -7476,11 +7475,11 @@ with pkgs;
 
   ant_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
 
-  apacheKafka = apacheKafka_1_0;
-  apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
-  apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
-  apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
-  apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
+  apacheKafka_1_0 = apacheKafka.override { majorVersion = "1.0"; };
+  apacheKafka_0_9 = apacheKafka.override { majorVersion = "0.9"; };
+  apacheKafka_0_10 = apacheKafka.override { majorVersion = "0.10"; };
+  apacheKafka_0_11 = apacheKafka.override { majorVersion = "0.11"; };
+  apacheKafka = callPackage ../servers/apache-kafka { };
 
   kt = callPackage ../tools/misc/kt {};
 
@@ -8163,7 +8162,7 @@ with pkgs;
   remake = callPackage ../development/tools/build-managers/remake { };
 
   retdec = callPackage ../development/tools/analysis/retdec { };
-  retdec-full = callPackage ../development/tools/analysis/retdec {
+  retdec-full = retdec.override {
     withPEPatterns = true;
   };
 
@@ -8994,7 +8993,7 @@ with pkgs;
     stdenv = crossLibcStdenv;
   };
 
-  muslCross = callPackage ../os-specific/linux/musl {
+  muslCross = musl.override {
     stdenv = crossLibcStdenv;
   };
 
@@ -9256,11 +9255,13 @@ with pkgs;
 
   gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
 
-  gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
+  gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { };
+
+  gtk-mac-integration-gtk2 = gtk-macintegration.override {
     gtk = gtk2;
   };
 
-  gtk-mac-integration-gtk3 = callPackage ../development/libraries/gtk-mac-integration {
+  gtk-mac-integration-gtk3 = gtk-mac-integration.override {
     gtk = gtk3;
   };
 
@@ -9290,8 +9291,8 @@ with pkgs;
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { };
-  libheimdal = heimdalFull.override { type = "lib"; };
+  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+  libheimdal = heimdal.override { type = "lib"; };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };
   harfbuzz-icu = harfbuzz.override {
@@ -9344,7 +9345,7 @@ with pkgs;
 
   hwloc = callPackage ../development/libraries/hwloc {};
 
-  hwloc-nox = callPackage ../development/libraries/hwloc {
+  hwloc-nox = hwloc.override {
     x11Support = false;
   };
 
@@ -9544,8 +9545,9 @@ with pkgs;
 
   libaom = callPackage ../development/libraries/libaom { };
 
-  libappindicator-gtk2 = callPackage ../development/libraries/libappindicator { gtkVersion = "2"; };
-  libappindicator-gtk3 = callPackage ../development/libraries/libappindicator { gtkVersion = "3"; };
+  libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
+  libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
+  libappindicator = callPackage ../development/libraries/libappindicator { };
 
   libarchive = callPackage ../development/libraries/libarchive { };
 
@@ -9684,9 +9686,9 @@ with pkgs;
 
   libdbiDrivers = callPackage ../development/libraries/libdbi-drivers { };
 
-  libdbusmenu-glib = callPackage ../development/libraries/libdbusmenu { };
-  libdbusmenu-gtk2 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "2"; };
-  libdbusmenu-gtk3 = callPackage ../development/libraries/libdbusmenu { gtkVersion = "3"; };
+  libdbusmenu = callPackage ../development/libraries/libdbusmenu { };
+  libdbusmenu-gtk2 = libdbusmenu.override { gtkVersion = "2"; };
+  libdbusmenu-gtk3 = libdbusmenu.override { gtkVersion = "3"; };
 
   libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
 
@@ -9765,7 +9767,7 @@ with pkgs;
   libfilezilla = callPackage ../development/libraries/libfilezilla { };
 
   libfm = callPackage ../development/libraries/libfm { };
-  libfm-extra = callPackage ../development/libraries/libfm {
+  libfm-extra = libfm.override {
     extraOnly = true;
   };
 
@@ -9906,11 +9908,13 @@ with pkgs;
 
   libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
 
-  libindicate-gtk2 = callPackage ../development/libraries/libindicate { gtkVersion = "2"; };
-  libindicate-gtk3 = callPackage ../development/libraries/libindicate { gtkVersion = "3"; };
+  libindicate-gtk2 = libindicate.override { gtkVersion = "2"; };
+  libindicate-gtk3 = libindicate.override { gtkVersion = "3"; };
+  libindicate = callPackage ../development/libraries/libindicate { };
 
-  libindicator-gtk2 = callPackage ../development/libraries/libindicator { gtkVersion = "2"; };
-  libindicator-gtk3 = callPackage ../development/libraries/libindicator { gtkVersion = "3"; };
+  libindicator-gtk2 = libindicator.override { gtkVersion = "2"; };
+  libindicator-gtk3 = libindicator.override { gtkVersion = "3"; };
+  libindicator = callPackage ../development/libraries/libindicator { };
 
   libiodbc = callPackage ../development/libraries/libiodbc {
     useGTK = config.libiodbc.gtk or false;
@@ -10501,7 +10505,7 @@ with pkgs;
 
   luabind = callPackage ../development/libraries/luabind { lua = lua5_1; };
 
-  luabind_luajit = callPackage ../development/libraries/luabind { lua = luajit; };
+  luabind_luajit = luabind.override { lua = luajit; };
 
   luaffi = callPackage ../development/libraries/luaffi { lua = lua5_1; };
 
@@ -10659,13 +10663,13 @@ with pkgs;
 
   notify-sharp = callPackage ../development/libraries/notify-sharp { };
 
-  ncurses5 = callPackage ../development/libraries/ncurses {
+  ncurses5 = ncurses.override {
     abiVersion = "5";
   };
-  ncurses6 = callPackage ../development/libraries/ncurses {
+  ncurses6 = ncurses.override {
     abiVersion = "6";
   };
-  ncurses = ncurses6;
+  ncurses = callPackage ../development/libraries/ncurses { };
 
   neardal = callPackage ../development/libraries/neardal { };
 
@@ -10989,7 +10993,7 @@ with pkgs;
   qbs = callPackage ../development/tools/build-managers/qbs { };
 
   qca2 = callPackage ../development/libraries/qca2 { qt = qt4; };
-  qca2-qt5 = callPackage ../development/libraries/qca2 { qt = qt5.qtbase; };
+  qca2-qt5 = qca2.override { qt = qt5.qtbase; };
 
   qimageblitz = callPackage ../development/libraries/qimageblitz {};
 
@@ -11487,17 +11491,16 @@ with pkgs;
 
   subtitleeditor = callPackage ../applications/video/subtitleeditor { };
 
-  suil-qt4 = callPackage ../development/libraries/audio/suil {
-    withQt4 = true;
-    withQt5 = false;
-  };
+  suil = callPackage ../development/libraries/audio/suil { };
 
-  suil-qt5 = callPackage ../development/libraries/audio/suil {
+  suil-qt5 = suil.override {
     withQt4 = false;
     withQt5 = true;
   };
-
-  suil = suil-qt4;
+  suil-qt4 = suil.override {
+    withQt4 = true;
+    withQt5 = false;
+  };
 
   sundials = callPackage ../development/libraries/sundials { };
 
@@ -11892,7 +11895,7 @@ with pkgs;
 
   zlog = callPackage ../development/libraries/zlog { };
 
-  zlibStatic = lowPrio (appendToName "static" (callPackage ../development/libraries/zlib {
+  zlibStatic = lowPrio (appendToName "static" (zlib.override {
     static = true;
   }));
 
@@ -12300,7 +12303,7 @@ with pkgs;
   fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { };
 
   firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; };
-  firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; };
+  firebirdSuper = firebird.override { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; };
 
   fleet = callPackage ../servers/fleet { };
 
@@ -12418,7 +12421,7 @@ with pkgs;
   nginxModules = callPackage ../servers/http/nginx/modules.nix { };
 
   # We should move to dynmaic modules and create a nginxFull package with all modules
-  nginxShibboleth = callPackage ../servers/http/nginx/stable.nix {
+  nginxShibboleth = nginxStable.override {
     modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders nginxModules.shibboleth ];
   };
 
@@ -12472,13 +12475,11 @@ with pkgs;
 
   # PulseAudio daemons
 
-  # Name is changed to prevent use in packages;
-  # please use libpulseaudio instead.
-  pulseaudioLight = callPackage ../servers/pulseaudio {
+  pulseaudio = callPackage ../servers/pulseaudio {
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
   };
 
-  pulseaudioFull = callPackage ../servers/pulseaudio {
+  pulseaudioFull = pulseaudio.override {
     gconf = gnome3.gconf;
     x11Support = true;
     jackaudioSupport = true;
@@ -12491,7 +12492,7 @@ with pkgs;
   };
 
   # libpulse implementations
-  libpulseaudio-vanilla = callPackage ../servers/pulseaudio {
+  libpulseaudio-vanilla = pulseaudio.override {
     libOnly = true;
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
   };
@@ -12598,8 +12599,8 @@ with pkgs;
   qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
 
   OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; };
-  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl = null; };
-  #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios = null; secureBoot = true; };
+  OVMF-CSM = OVMF.override { openssl = null; };
+  #WIP: OVMF-secureBoot = OVMF.override { seabios = null; secureBoot = true; };
 
   seabios = callPackage ../applications/virtualization/seabios { };
 
@@ -12792,8 +12793,6 @@ with pkgs;
 
   slurm = callPackage ../servers/computing/slurm { gtk2 = null; };
 
-  slurm-full = appendToName "full" (callPackage ../servers/computing/slurm { });
-
   slurm-spank-x11 = callPackage ../servers/computing/slurm-spank-x11 { };
 
   systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { };
@@ -13056,10 +13055,10 @@ with pkgs;
 
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
-  ffadoFull = callPackage ../os-specific/linux/ffado {
+  ffado = callPackage ../os-specific/linux/ffado {
     inherit (python2Packages) python pyqt4 dbus-python;
   };
-  libffado = ffadoFull.override { prefix = "lib"; };
+  libffado = ffado.override { prefix = "lib"; };
 
   fbterm = callPackage ../os-specific/linux/fbterm { };
 
@@ -13154,7 +13153,7 @@ with pkgs;
   iwd = callPackage ../os-specific/linux/iwd { };
 
   jfbview = callPackage ../os-specific/linux/jfbview { };
-  jfbpdf = callPackage ../os-specific/linux/jfbview {
+  jfbpdf = jfbview.override {
     imageSupport = false;
   };
 
@@ -13908,7 +13907,7 @@ with pkgs;
 
   sysvinit = callPackage ../os-specific/linux/sysvinit { };
 
-  sysvtools = callPackage ../os-specific/linux/sysvinit {
+  sysvtools = sysvinit.override {
     withoutInitTools = true;
   };
 
@@ -15013,7 +15012,7 @@ with pkgs;
   };
 
   codeblocks = callPackage ../applications/editors/codeblocks { };
-  codeblocksFull = callPackage ../applications/editors/codeblocks { contribPlugins = true; };
+  codeblocksFull = codeblocks.override { contribPlugins = true; };
 
   comical = callPackage ../applications/graphics/comical { };
 
@@ -15504,9 +15503,9 @@ with pkgs;
 
   fldigi = callPackage ../applications/audio/fldigi { };
 
-  flink = flink_1_4;
-  flink_1_3 = callPackage ../applications/networking/cluster/flink { version = "1.3"; };
-  flink_1_4 = callPackage ../applications/networking/cluster/flink { version = "1.4"; };
+  flink = callPackage ../applications/networking/cluster/flink { };
+  flink_1_3 = flink.override { version = "1.3"; };
+  flink_1_4 = flink.override { version = "1.4"; };
 
   fluidsynth = callPackage ../applications/audio/fluidsynth {
      inherit (darwin.apple_sdk.frameworks) AudioUnit CoreAudio CoreMIDI CoreServices;
@@ -15690,7 +15689,7 @@ with pkgs;
     desktopName = "Firefox";
   };
 
-  firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
+  firefox-beta-bin-unwrapped = firefox-bin-unwrapped.override {
     channel = "beta";
     generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix;
     gconf = pkgs.gnome2.GConf;
@@ -15926,7 +15925,7 @@ with pkgs;
   };
 
   graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
-  graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
+  graphicsmagick_q16 = graphicsmagic.override { quantumdepth = 16; };
 
   grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
 
@@ -16424,54 +16423,36 @@ with pkgs;
 
   libreoffice = hiPrio libreoffice-still;
 
-  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
-    { libreoffice = callPackage ../applications/office/libreoffice {
-      inherit (perlPackages) ArchiveZip CompressZlib;
-      inherit (gnome2) GConf ORBit2 gnome_vfs;
-      inherit (gnome3) defaultIconTheme;
-      zip = zip.override { enableNLS = false; };
-      fontsConf = makeFontsConf {
-        fontDirectories = [
-          carlito dejavu_fonts
-          freefont_ttf xorg.fontmiscmisc
-          liberation_ttf_v1_binary
-          liberation_ttf_v2_binary
-        ];
-      };
-      clucene_core = clucene_core_2;
-      lcms = lcms2;
-      harfbuzz = harfbuzz.override {
-        withIcu = true; withGraphite2 = true;
-      };
-      # checking whether g++ supports C++14 or C++11... configure: error: no
-      # Still relevant: 2018-04-13
-      stdenv = overrideCC stdenv gcc5;
-  };});
+  libreoffice-unwrapped =callPackage ../applications/office/libreoffice {
+    inherit (perlPackages) ArchiveZip CompressZlib;
+    inherit (gnome2) GConf ORBit2 gnome_vfs;
+    inherit (gnome3) defaultIconTheme;
+    zip = zip.override { enableNLS = false; };
+    fontsConf = makeFontsConf {
+      fontDirectories = [
+        carlito dejavu_fonts
+        freefont_ttf xorg.fontmiscmisc
+        liberation_ttf_v1_binary
+        liberation_ttf_v2_binary
+      ];
+    };
+    clucene_core = clucene_core_2;
+    lcms = lcms2;
+    harfbuzz = harfbuzz.override {
+      withIcu = true; withGraphite2 = true;
+    };
+    # checking whether g++ supports C++14 or C++11... configure: error: no
+    # Still relevant: 2018-04-13
+    stdenv = overrideCC stdenv gcc5;
+  };
 
-  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix
-    { libreoffice = callPackage ../applications/office/libreoffice/still.nix {
-      inherit (perlPackages) ArchiveZip CompressZlib;
-      inherit (gnome2) GConf ORBit2 gnome_vfs;
-      inherit (gnome3) defaultIconTheme;
-      zip = zip.override { enableNLS = false; };
+  libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { libreoffice = libreoffice-unwrapped; });
+
+  libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix {
+    libreoffice = libreoffice-unwrapped.override {
       poppler = poppler_0_61;
-      fontsConf = makeFontsConf {
-        fontDirectories = [
-          carlito dejavu_fonts
-          freefont_ttf xorg.fontmiscmisc
-          liberation_ttf_v1_binary
-          liberation_ttf_v2_binary
-        ];
-      };
-      clucene_core = clucene_core_2;
-      lcms = lcms2;
-      harfbuzz = harfbuzz.override {
-        withIcu = true; withGraphite2 = true;
-      };
-      # checking whether g++ supports C++14 or C++11... configure: error: no
-      # Still relevant: 2018-04-13; gcc6 is not enough!
-      stdenv = overrideCC stdenv gcc5;
-  };});
+    };
+  });
 
   liferea = callPackage ../applications/networking/newsreaders/liferea {
     inherit (gnome3) libpeas gsettings-desktop-schemas dconf;
@@ -16838,7 +16819,7 @@ with pkgs;
       libsForQt5.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
-  mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {
+  mutt-with-sidebar = mutt.override {
     withSidebar = true;
   };
 
@@ -18285,7 +18266,7 @@ with pkgs;
 
   weechat-xmpp = callPackage ../applications/networking/instant-messengers/weechat-xmpp {};
 
-  westonLite = callPackage ../applications/window-managers/weston {
+  westonLite = weston.override {
     pango = null;
     freerdp = null;
     libunwind = null;
@@ -18580,21 +18561,21 @@ with pkgs;
     packages = self: [];
   };
 
-  xmonad_log_applet_gnome2 = callPackage ../applications/window-managers/xmonad/log-applet {
+  xmonad_log_applet_gnome2 = xmonad_log_applet.override {
     desktopSupport = "gnome2";
     inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
     GConf2 = gnome2.GConf;
   };
 
-  xmonad_log_applet_gnome3 = callPackage ../applications/window-managers/xmonad/log-applet {
+  xmonad_log_applet = callPackage ../applications/window-managers/xmonad/log-applet {
     desktopSupport = "gnome3";
     inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
     GConf2 = gnome2.GConf;
   };
 
-  xmonad_log_applet_xfce = callPackage ../applications/window-managers/xmonad/log-applet {
+  xmonad_log_applet_xfce = xmonad_log_applet.override {
     desktopSupport = "xfce4";
     inherit (xfce) libxfce4util xfce4-panel;
     gnome2_panel = gnome2.gnome_panel;
@@ -18896,13 +18877,13 @@ with pkgs;
 
   factorio = callPackage ../games/factorio { releaseType = "alpha"; };
 
-  factorio-experimental = callPackage ../games/factorio { releaseType = "alpha"; experimental = true; };
+  factorio-experimental = factorio.override { releaseType = "alpha"; experimental = true; };
 
-  factorio-headless = callPackage ../games/factorio { releaseType = "headless"; };
+  factorio-headless = factorio.override { releaseType = "headless"; };
 
-  factorio-headless-experimental = callPackage ../games/factorio { releaseType = "headless"; experimental = true; };
+  factorio-headless-experimental = factorio.override { releaseType = "headless"; experimental = true; };
 
-  factorio-demo = callPackage ../games/factorio { releaseType = "demo"; };
+  factorio-demo = factorio.override { releaseType = "demo"; };
 
   factorio-mods = callPackage ../games/factorio/mods.nix { };
 
@@ -18922,7 +18903,7 @@ with pkgs;
 
   freeciv = callPackage ../games/freeciv { };
 
-  freeciv_gtk = callPackage ../games/freeciv {
+  freeciv_gtk = freeciv.override {
     gtkClient = true;
     sdlClient = false;
   };
@@ -19134,7 +19115,7 @@ with pkgs;
 
   pokerth = callPackage ../games/pokerth { };
 
-  pokerth-server = with callPackage ../games/pokerth { }; server;
+  pokerth-server = pokerth.server;
 
   prboom = callPackage ../games/prboom { };
 
@@ -19401,7 +19382,7 @@ with pkgs;
     lua = lua5_2;
   };
 
-  worldofgoo_demo = callPackage ../games/worldofgoo {
+  worldofgoo_demo = worldofgoo.override {
     demo = true;
   };
 
@@ -19841,21 +19822,21 @@ with pkgs;
     cmake = cmakeCurses;
   };
 
-  gromacsMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+  gromacsMpi = lowPrio (gromacs.override {
     singlePrec = true;
     mpiEnabled = true;
     fftw = fftwSinglePrec;
     cmake = cmakeCurses;
   });
 
-  gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+  gromacsDouble = lowPrio (gromacs.override {
     singlePrec = false;
     mpiEnabled = false;
     fftw = fftw;
     cmake = cmakeCurses;
   });
 
-  gromacsDoubleMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+  gromacsDoubleMpi = lowPrio (gromacs.override {
     singlePrec = false;
     mpiEnabled = true;
     fftw = fftw;
@@ -20136,7 +20117,7 @@ with pkgs;
   maxima = callPackage ../applications/science/math/maxima {
     ecl = null;
   };
-  maxima-ecl = callPackage ../applications/science/math/maxima {
+  maxima-ecl = maxima.override {
     ecl = ecl_16_1_2;
     ecl-fasl = true;
     sbcl = null;
@@ -20291,7 +20272,7 @@ with pkgs;
   thepeg = callPackage ../development/libraries/physics/thepeg { };
 
   yoda = callPackage ../development/libraries/physics/yoda { };
-  yoda-with-root = lowPrio (callPackage ../development/libraries/physics/yoda {
+  yoda-with-root = lowPrio (yoda.override {
     withRootSupport = true;
   });
 
@@ -20510,11 +20491,11 @@ with pkgs;
   # using the new configuration style proposal which is unstable
   jack1 = callPackage ../misc/jackaudio/jack1.nix { };
 
-  jack2Full = callPackage ../misc/jackaudio {
+  jack2 = callPackage ../misc/jackaudio {
     libopus = libopus.override { withCustomModes = true; };
     inherit (darwin.apple_sdk.frameworks) AudioToolbox CoreAudio CoreFoundation;
   };
-  libjack2 = jack2Full.override { prefix = "lib"; };
+  libjack2 = jack2.override { prefix = "lib"; };
 
   keynav = callPackage ../tools/X11/keynav { };
 
@@ -20578,7 +20559,7 @@ with pkgs;
   nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff;
 
   nix-info = callPackage ../tools/nix/info { };
-  nix-info-tested = callPackage ../tools/nix/info { doCheck = true; };
+  nix-info-tested = nix-info.override { doCheck = true; };
 
   nix-index = callPackage ../tools/package-management/nix-index { };
 
@@ -21105,10 +21086,10 @@ with pkgs;
 
   spdlog = callPackage ../development/libraries/spdlog { };
 
-  dart = dart_stable;
-  dart_old = callPackage ../development/interpreters/dart { version = "1.16.1"; };
-  dart_stable = callPackage ../development/interpreters/dart { version = "1.24.3"; };
-  dart_dev = callPackage ../development/interpreters/dart { version = "2.0.0-dev.26.0"; };
+  dart = callPackage ../development/interpreters/dart { };
+  dart_stable = dart.override { version = "1.24.3"; };
+  dart_old = dart.override { version = "1.16.1"; };
+  dart_dev = dart.override { version = "2.0.0-dev.26.0"; };
 
   httrack = callPackage ../tools/backup/httrack { };
 

From a7d5c50034c3694590b9dcde689a1575700fa7f0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 13:51:03 -0500
Subject: [PATCH 0889/3370] all-packages: cleanup from last commit

---
 .../networking/remote/citrix-receiver/default.nix    |  2 +-
 pkgs/development/interpreters/dart/default.nix       |  6 +++---
 .../libraries/libappindicator/default.nix            |  2 +-
 pkgs/top-level/aliases.nix                           |  2 +-
 pkgs/top-level/all-packages.nix                      | 12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index d5982f33e78e..a721900f20a3 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -23,7 +23,7 @@
 , alsaLib
 , libidn
 , zlib
-, version ? null
+, version ? "13.9.0"
 }:
 
 let
diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix
index 17f124e79890..ae7f8686b781 100644
--- a/pkgs/development/interpreters/dart/default.nix
+++ b/pkgs/development/interpreters/dart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, version }:
+{ stdenv, fetchurl, unzip, version ? "1.24.3" }:
 
 let
 
@@ -57,9 +57,9 @@ stdenv.mkDerivation {
   '';
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ];
- 
+
   dontStrip = true;
-  
+
   meta = {
     platforms = [ "i686-linux" "x86_64-linux" ];
     homepage = https://www.dartlang.org/;
diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix
index 6c87588fd3d7..71c388be6ea5 100644
--- a/pkgs/development/libraries/libappindicator/default.nix
+++ b/pkgs/development/libraries/libappindicator/default.nix
@@ -2,7 +2,7 @@
 
 { stdenv, fetchurl, lib, file
 , pkgconfig, autoconf
-, glib, dbus-glib, gtkVersion
+, glib, dbus-glib, gtkVersion ? "3"
 , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null
 , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null
 , python2Packages, gobjectIntrospection, vala
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7576a7a07577..03748be76a1b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -336,7 +336,7 @@ mapAliases (rec {
     gst-ffmpeg = pkgs.gst-ffmpeg;
   };
 } // (with ocaml-ng; { # added 2016-09-14
-p  ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
+  ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml;
   ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml;
   ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml;
   ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db72b9b42b38..cf4df5ae360d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9255,15 +9255,15 @@ with pkgs;
 
   gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { };
 
-  gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration { };
+  gtk-mac-integration = callPackage ../development/libraries/gtk-mac-integration {
+    gtk = gtk3;
+  };
 
-  gtk-mac-integration-gtk2 = gtk-macintegration.override {
+  gtk-mac-integration-gtk2 = gtk-mac-integration.override {
     gtk = gtk2;
   };
 
-  gtk-mac-integration-gtk3 = gtk-mac-integration.override {
-    gtk = gtk3;
-  };
+  gtk-mac-integration-gtk3 = gtk-mac-integration;
 
   gtk-mac-bundler = callPackage ../development/tools/gtk-mac-bundler {};
 
@@ -15925,7 +15925,7 @@ with pkgs;
   };
 
   graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
-  graphicsmagick_q16 = graphicsmagic.override { quantumdepth = 16; };
+  graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
 
   grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
 

From 0cb39237312fead3cfddb1dcfa1e761df08883b2 Mon Sep 17 00:00:00 2001
From: wchresta <34962284+wchresta@users.noreply.github.com>
Date: Tue, 1 May 2018 20:56:06 +0200
Subject: [PATCH 0890/3370] souffle: 1.0.0 -> 1.2.0

---
 maintainers/maintainer-list.nix                |  5 +++++
 pkgs/development/compilers/souffle/default.nix | 18 +++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aec6f67a9191..ed413e9e8f40 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3979,6 +3979,11 @@
     github = "vyp";
     name = "vyp";
   };
+  wchresta = {
+    email = "wchresta.nix@chrummibei.ch";
+    github = "wchresta";
+    name = "wchresta";
+  };
   wedens = {
     email = "kirill.wedens@gmail.com";
     name = "wedens";
diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index c56ea8cc6495..5289540e944c 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -1,25 +1,27 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz }:
+{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.2.0";
   name    = "souffle-${version}";
 
   src = fetchFromGitHub {
     owner  = "souffle-lang";
     repo   = "souffle";
     rev    = version;
-    sha256 = "13j14227dgxcm25z9iizcav563wg2ak9338pb03aqqz8yqxbmz4n";
+    sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd";
   };
 
   buildInputs = [
     autoconf automake boost bison flex openjdk
+    # Used for 1.2.0
+    libtool lsb-release ncurses zlib sqlite
     # Used for docs
     doxygen perl graphviz
   ];
 
   patchPhase = ''
     substituteInPlace configure.ac \
-      --replace "m4_esyscmd([git describe --tags --abbrev=0 | tr -d '\n'])" "${version}"
+      --replace "m4_esyscmd([git describe --tags --abbrev=0 --always | tr -d '\n'])" "${version}"
   '';
 
   # Without this, we get an obscure error about not being able to find a library version
@@ -29,17 +31,11 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./bootstrap";
 
-  # in 1.0.0: parser.hh:40:0: error: unterminated #ifndef
-  enableParallelBuilding = false;
-
-  # See https://github.com/souffle-lang/souffle/issues/176
-  hardeningDisable = [ "fortify" ];
-
   meta = with stdenv.lib; {
     description = "A translator of declarative Datalog programs into the C++ language";
     homepage    = "http://souffle-lang.github.io/";
     platforms   = platforms.unix;
-    maintainers = with maintainers; [ copumpkin ];
+    maintainers = with maintainers; [ copumpkin wchresta ];
     license     = licenses.upl;
   };
 }

From 485e4a614e8b8d2dec1cb3b479fd23d787105006 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 14:04:35 -0500
Subject: [PATCH 0891/3370] all-packages: revert 2 name changes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I am reverting two name changes that might not be a good idea:

- gnum4 → m4
- apacheAnt → ant

These are debatable changes & not sure what’s best. I prefered the
short version because there are not alternatives- but will not hold
off for now.
---
 pkgs/top-level/aliases.nix      | 3 ---
 pkgs/top-level/all-packages.nix | 9 +++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 03748be76a1b..38b0e6391bfe 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -40,8 +40,6 @@ mapAliases (rec {
   ag = silver-searcher; # added 2018-04-25
   aircrackng = aircrack-ng; # added 2016-01-14
   ammonite-repl = ammonite; # added 2017-05-02
-  apacheAnt = ant; # added 2018-04-25
-  apacheAnt_1_9 = ant_1_9; # added 2018-04-25
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
   at_spi2_atk = at-spi2-atk; # added 2018-02-25
@@ -172,7 +170,6 @@ mapAliases (rec {
   lua5_sec = luaPackages.luasec; # added 2017-05-02
   lzma = xz; # added 2018-04-25
   m3d-linux = m33-linux; # added 2016-08-13
-  gnum4 = m4; # added 2018-04-25
   man_db = man-db; # added 2016-05
   manpages = man-pages; # added 2015-12-06
   midoriWrapper = midori; # added 2015-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cf4df5ae360d..1c81cc59d2b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7471,9 +7471,9 @@ with pkgs;
   antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { };
   antlr4 = antlr4_7;
 
-  ant = callPackage ../development/tools/build-managers/apache-ant { };
-
-  ant_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
+  apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
+  apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
+  ant = apacheAnt;
 
   apacheKafka_1_0 = apacheKafka.override { majorVersion = "1.0"; };
   apacheKafka_0_9 = apacheKafka.override { majorVersion = "0.9"; };
@@ -7851,7 +7851,8 @@ with pkgs;
 
   gnome-usage = callPackage ../applications/misc/gnome-usage {};
 
-  m4 = callPackage ../development/tools/misc/gnum4 { };
+  gnum4 = callPackage ../development/tools/misc/gnum4 { };
+  m4 = gnum4;
 
   gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { };
   gnumake3 = gnumake382;

From 30a065bc997984408a5204bbcbe33a2de274c0f6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 1 May 2018 21:13:51 +0200
Subject: [PATCH 0892/3370] checkstyle: 8.9 -> 8.10

---
 pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index c06cd9c3eb5a..cbb33901311b 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "8.9";
+  version = "8.10";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "058lffmlzw7nqz5z89m2k640q7ffz6dz008bddvjsgpxbrdb89cd";
+    sha256 = "1n7bqqrd13zqx51dqh160z5sjdc6kr089i505gf405ymmfbx1p3d";
   };
 
   installPhase = ''

From d72b8700797105e6dc38a7518786c35b1692bc00 Mon Sep 17 00:00:00 2001
From: LightDiscord <arnaud@lightdiscord.me>
Date: Tue, 1 May 2018 21:17:01 +0200
Subject: [PATCH 0893/3370] discord: 0.0.4 -> 0.0.5

---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 76d688802636..6801edb9767c 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
 
     pname = "discord";
-    version = "0.0.4";
+    version = "0.0.5";
     name = "${pname}-${version}";
 
     src = fetchurl {
         url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz";
-        sha256 = "1alw9rkv1vv0s1w33hd9ab1cgj7iqd7ad9kvn1d55gyki28f8qlb";
+        sha256 = "067gb72qsxrzfma04njkbqbmsvwnnyhw4k9igg5769jkxay68i1g";
     };
 
     nativeBuildInputs = [ makeWrapper ];

From f787dfc0de2ae7a5f29561f5c3f59d9cc066cfdc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 1 May 2018 21:48:39 +0200
Subject: [PATCH 0894/3370] pythonPackages.github3_py: 1.0.2 -> 1.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a97c023ca0fd..b7a70a66c651 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6124,11 +6124,11 @@ in {
 
   github3_py = buildPythonPackage rec {
     name = "github3.py-${version}";
-    version = "1.0.2";
+    version = "1.1.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/g/github3.py/${name}.tar.gz";
-      sha256 = "1g91a8q9w0dalf4y4v0g72zi7vfrxwpx639an28vvys20y5zlvwp";
+      sha256 = "1cxaqdqmz9w2afc0cw2jyv783fp0grydbik0frzj79azzkhyg4gf";
     };
 
     buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers dateutil ];

From ed5cbbbc44c83e3891f907342aace7c13134f59b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 30 Apr 2018 23:35:12 -0500
Subject: [PATCH 0895/3370] foundationdb: install the java client library

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 nixos/modules/services/databases/foundationdb.xml | 1 -
 pkgs/servers/foundationdb/default.nix             | 8 ++++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index 2a0e3c76c9d8..0a96203e0551 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -254,7 +254,6 @@ only undergone fairly basic testing of all the available functionality.</para>
       </para></listitem>
   <listitem><para>Python bindings are not currently installed.</para></listitem>
   <listitem><para>Ruby bindings are not currently installed.</para></listitem>
-  <listitem><para>Java bindings are not currently installed.</para></listitem>
   <listitem><para>Go bindings are not currently installed.</para></listitem>
 </itemizedlist>
 
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 95326b4c1c6c..3397c2ba386e 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -64,18 +64,22 @@ in stdenv.mkDerivation rec {
   '';
 
   enableParallelBuilding = true;
-  makeFlags = [ "all" "fdb_c" "KVRELEASE=1" ];
+  makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ];
 
   configurePhase = ":";
   installPhase = ''
-    mkdir -vp $out/{bin,libexec/plugins} $lib/lib $dev/include/foundationdb
+    mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
 
     cp -v ./lib/libfdb_c.so     $lib/lib
+    cp -v ./lib/libfdb_java.so  $lib/lib
+
     cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
 
     cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
     cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
 
+    cp -v ./bindings/java/foundationdb-client.jar     $lib/share/java
+
     for x in fdbbackup fdbcli fdbserver fdbmonitor; do
       cp -v "./bin/$x" $out/bin;
     done

From 55eec81118574b607ad7cfe9c26919134bcc2365 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 May 2018 00:35:10 -0500
Subject: [PATCH 0896/3370] nixos: add TLS support to FoundationDB module, and
 tweak setup a bit

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../services/databases/foundationdb.nix       | 61 ++++++++++++++++---
 .../services/databases/foundationdb.xml       | 41 ++++++++++++-
 2 files changed, 92 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 22acddc8ca91..443cc6d5e456 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -35,6 +35,13 @@ let
     memory         = ${cfg.memory}
     storage_memory = ${cfg.storageMemory}
 
+    ${optionalString (cfg.tls != null) ''
+      tls_plugin           = ${pkgs.foundationdb}/libexec/plugins/FDBLibTLS.so
+      tls_certificate_file = ${cfg.tls.certificate}
+      tls_key_file         = ${cfg.tls.key}
+      tls_verify_peers     = ${cfg.tls.allowedPeers}
+    ''}
+
     ${optionalString (cfg.locality.machineId    != null) "locality_machineid=${cfg.locality.machineId}"}
     ${optionalString (cfg.locality.zoneId       != null) "locality_zoneid=${cfg.locality.zoneId}"}
     ${optionalString (cfg.locality.datacenterId != null) "locality_dcid=${cfg.locality.datacenterId}"}
@@ -188,6 +195,43 @@ in
       '';
     };
 
+    tls = mkOption {
+      default = null;
+      description = ''
+        FoundationDB Transport Security Layer (TLS) settings.
+      '';
+
+      type = types.nullOr (types.submodule ({
+        options = {
+          certificate = mkOption {
+            type = types.str;
+            description = ''
+              Path to the TLS certificate file. This certificate will
+              be offered to, and may be verified by, clients.
+            '';
+          };
+
+          key = mkOption {
+            type = types.str;
+            description = "Private key file for the certificate.";
+          };
+
+          allowedPeers = mkOption {
+            type = types.str;
+            default = "Check.Valid=1,Check.Unexpired=1";
+            description = ''
+	      "Peer verification string". This may be used to adjust which TLS
+              client certificates a server will accept, as a form of user
+              authorization; for example, it may only accept TLS clients who
+              offer a certificate abiding by some locality or organization name.
+
+              For more information, please see the FoundationDB documentation.
+            '';
+          };
+        };
+      }));
+    };
+
     locality = mkOption {
       default = {
         machineId    = null;
@@ -331,27 +375,30 @@ in
           touch ${cfg.pidfile} && \
           chown -R ${cfg.user}:${cfg.group} ${cfg.pidfile}
 
-        for x in "${cfg.logDir}" "${cfg.dataDir}" /etc/foundationdb; do
-          [ ! -d "$x" ] && mkdir -m 0700 -vp "$x" && chown -R ${cfg.user}:${cfg.group} "$x";
+        for x in "${cfg.logDir}" "${cfg.dataDir}"; do
+          [ ! -d "$x" ] && mkdir -m 0700 -vp "$x";
+          chown -R ${cfg.user}:${cfg.group} "$x";
         done
 
+        [ ! -d /etc/foundationdb ] && \
+          mkdir -m 0775 -vp /etc/foundationdb && \
+          chown -R ${cfg.user}:${cfg.group} "/etc/foundationdb"
+
         if [ ! -f /etc/foundationdb/fdb.cluster ]; then
             cf=/etc/foundationdb/fdb.cluster
             desc=$(tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c8)
             rand=$(tr -dc A-Za-z0-9 </dev/urandom 2>/dev/null | head -c8)
             echo ''${desc}:''${rand}@${initialIpAddr}:${builtins.toString cfg.listenPortStart} > $cf
-            chmod 0660 $cf && chown -R ${cfg.user}:${cfg.group} $cf
+            chmod 0664 $cf && chown -R ${cfg.user}:${cfg.group} $cf
             touch "${cfg.dataDir}/.first_startup"
         fi
       '';
 
-      script = ''
-        exec fdbmonitor --lockfile ${cfg.pidfile} --conffile ${configFile};
-      '';
+      script = "exec fdbmonitor --lockfile ${cfg.pidfile} --conffile ${configFile}";
 
       postStart = ''
         if [ -e "${cfg.dataDir}/.first_startup" ]; then
-          fdbcli --exec "configure new single ssd"
+          fdbcli --exec "configure new single memory"
           rm -f "${cfg.dataDir}/.first_startup";
         fi
       '';
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index 0a96203e0551..045193f4b75b 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -192,6 +192,44 @@ to a new node in order to connect, if it is not part of the cluster.</para>
 
 </section>
 
+<section><title>Client authorization and TLS</title>
+
+<para>By default, any user who can connect to a FoundationDB process with the
+correct cluster configuration can access anything. FoundationDB uses a
+pluggable design to transport security, and out of the box it supports a
+LibreSSL-based plugin for TLS support. This plugin not only does in-flight
+encryption, but also performs client authorization based on the given
+endpoint's certificate chain. For example, a FoundationDB server may be
+configured to only accept client connections over TLS, where the client TLS
+certificate is from organization <emphasis>Acme Co</emphasis> in the
+<emphasis>Research and Development</emphasis> unit.</para>
+
+<para>Configuring TLS with FoundationDB is done using the
+<option>services.foundationdb.tls</option> options in order to control the peer
+verification string, as well as the certificate and its private key.</para>
+
+<para>Note that the certificate and its private key must be accessible to the
+FoundationDB user account that the server runs under. These files are also NOT
+managed by NixOS, as putting them into the store may reveal private
+information.</para>
+
+<para>After you have a key and certificate file in place, it is not enough to
+simply set the NixOS module options -- you must also configure the
+<command>fdb.cluster</command> file to specify that a given set of coordinators
+use TLS. This is as simple as adding the suffix <command>:tls</command> to your
+cluster coordinator configuration, after the port number. For example, assuming
+you have a coordinator on localhost with the default configuration, simply
+specifying:</para>
+
+<programlisting>
+XXXXXX:XXXXXX@127.0.0.1:4500:tls
+</programlisting>
+
+<para>will configure all clients and server processes to use TLS from now
+on.</para>
+
+</section>
+
 <section><title>Backups and Disaster Recovery</title>
 
 <para>The usual rules for doing FoundationDB backups apply on NixOS as written
@@ -245,9 +283,6 @@ FoundationDB is not new software, but the NixOS compilation and integration has
 only undergone fairly basic testing of all the available functionality.</para>
 
 <itemizedlist>
-  <listitem><para>TLS plugin support is compiled in, but it's currently not
-      possible to specify the set of TLS certificate options in
-      <command>services.foundationdb</command></para></listitem>
   <listitem><para>There is no way to specify individual parameters for
       individual <command>fdbserver</command> processes. Currently, all server
       processes inherit all the global <command>fdbmonitor</command> settings.

From 5a24d99fa628169c9fdeb37d3437cc3e7fa521ac Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Tue, 1 May 2018 02:17:46 -0500
Subject: [PATCH 0897/3370] foundationdb: split into multiple, major-versioned
 packages to make upgrades user-controllable

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../services/databases/foundationdb.nix       |  19 +-
 .../services/databases/foundationdb.xml       |  10 +-
 pkgs/servers/foundationdb/default.nix         | 186 ++++++++++--------
 pkgs/top-level/all-packages.nix               |   7 +
 4 files changed, 137 insertions(+), 85 deletions(-)

diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix
index 443cc6d5e456..693d2fde9916 100644
--- a/nixos/modules/services/databases/foundationdb.nix
+++ b/nixos/modules/services/databases/foundationdb.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.foundationdb;
+  pkg = cfg.package;
 
   # used for initial cluster configuration
   initialIpAddr = if (cfg.publicAddress != "auto") then cfg.publicAddress else "127.0.0.1";
@@ -24,7 +25,7 @@ let
     group         = ${cfg.group}
 
     [fdbserver]
-    command        = ${pkgs.foundationdb}/bin/fdbserver
+    command        = ${pkg}/bin/fdbserver
     public_address = ${cfg.publicAddress}:$ID
     listen_address = ${cfg.listenAddress}
     datadir        = ${cfg.dataDir}/$ID
@@ -36,7 +37,7 @@ let
     storage_memory = ${cfg.storageMemory}
 
     ${optionalString (cfg.tls != null) ''
-      tls_plugin           = ${pkgs.foundationdb}/libexec/plugins/FDBLibTLS.so
+      tls_plugin           = ${pkg}/libexec/plugins/FDBLibTLS.so
       tls_certificate_file = ${cfg.tls.certificate}
       tls_key_file         = ${cfg.tls.key}
       tls_verify_peers     = ${cfg.tls.allowedPeers}
@@ -50,7 +51,7 @@ let
     ${fdbServers cfg.serverProcesses}
 
     [backup_agent]
-    command = ${pkgs.foundationdb}/libexec/backup_agent
+    command = ${pkg}/libexec/backup_agent
     ${backupAgents cfg.backupProcesses}
   '';
 in
@@ -59,6 +60,14 @@ in
 
     enable = mkEnableOption "FoundationDB Server";
 
+    package = mkOption {
+      type        = types.package;
+      description = ''
+        The FoundationDB package to use for this server. This must be specified by the user
+        in order to ensure migrations and upgrades are controlled appropriately.
+      '';
+    };
+
     publicAddress = mkOption {
       type        = types.str;
       default     = "auto";
@@ -314,7 +323,7 @@ in
     meta.doc         = ./foundationdb.xml;
     meta.maintainers = with lib.maintainers; [ thoughtpolice ];
 
-    environment.systemPackages = [ pkgs.foundationdb ];
+    environment.systemPackages = [ pkg ];
 
     users.extraUsers = optionalAttrs (cfg.user == "foundationdb") (singleton
       { name        = "foundationdb";
@@ -368,7 +377,7 @@ in
           ReadWritePaths        = lib.concatStringsSep " " (map (x: "-" + x) rwpaths);
         };
 
-      path = [ pkgs.foundationdb pkgs.coreutils ];
+      path = [ pkg pkgs.coreutils ];
 
       preStart = ''
         rm -f ${cfg.pidfile}   && \
diff --git a/nixos/modules/services/databases/foundationdb.xml b/nixos/modules/services/databases/foundationdb.xml
index 045193f4b75b..def9cc436691 100644
--- a/nixos/modules/services/databases/foundationdb.xml
+++ b/nixos/modules/services/databases/foundationdb.xml
@@ -12,7 +12,7 @@
 
 <para><emphasis>Maintainer:</emphasis> Austin Seipp</para>
 
-<para><emphasis>Default version:</emphasis> 5.1.x</para>
+<para><emphasis>Available version(s):</emphasis> 5.1.x</para>
 
 <para>FoundationDB (or "FDB") is a distributed, open source, high performance,
 transactional key-value store. It can store petabytes of data and deliver
@@ -26,9 +26,17 @@ exceptional performance while maintaining consistency and ACID semantics
 
 <programlisting>
 services.foundationdb.enable = true;
+services.foundationdb.package = pkgs.foundationdb51; # FoundationDB 5.1.x
 </programlisting>
 </para>
 
+<para>The <option>services.foundationdb.package</option> option is required,
+and must always be specified. Because FoundationDB network protocols and
+on-disk storage formats may change between (major) versions, and upgrades must
+be explicitly handled by the user, you must always manually specify this
+yourself so that the NixOS module will use the proper version. Note that minor,
+bugfix releases are always compatible.</para>
+
 <para>After running <command>nixos-rebuild</command>, you can verify whether
 FoundationDB is running by executing <command>fdbcli</command> (which is added
 to <option>environment.systemPackages</option>):
diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index 3397c2ba386e..b1745dd53716 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -1,12 +1,91 @@
 { stdenv, fetchurl, fetchFromGitHub
-, which, findutils, m4, gawk, python, openjdk, mono58, libressl_2_6
+, which, findutils, m4, gawk
+, python, openjdk, mono58, libressl_2_6
+, boost16x
 }:
 
 let
-  version = "5.1.7";
-  branch  = "release-5.1";
-  rev     = "9ad8d02386d4a6a5efecf898df80f2747695c627";
-  sha256  = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06";
+  makeFdb =
+    { version
+    , branch
+    , rev, sha256
+
+    # fdb 6.0+ support boost 1.6x+, so default to it
+    , boost ? boost16x
+    }: stdenv.mkDerivation rec {
+        name = "foundationdb-${version}";
+        inherit version;
+
+        src = fetchFromGitHub {
+          owner = "apple";
+          repo  = "foundationdb";
+          inherit rev sha256;
+        };
+
+        nativeBuildInputs = [ gawk which m4 findutils mono58 ];
+        buildInputs = [ python openjdk libressl_2_6 boost ];
+
+        patches =
+          [ ./fix-scm-version.patch
+            ./ldflags.patch
+          ];
+
+        postPatch = ''
+          substituteInPlace ./build/scver.mk \
+            --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \
+            --subst-var-by NIXOS_FDB_SCBRANCH   "${branch}"
+
+          substituteInPlace ./Makefile \
+            --replace 'shell which ccache' 'shell true' \
+            --replace -Werror ""
+
+          substituteInPlace ./Makefile \
+            --replace libstdc++_pic libstdc++
+
+          substituteInPlace ./build/link-validate.sh \
+            --replace 'exit 1' '#exit 1'
+
+          patchShebangs .
+        '';
+
+        enableParallelBuilding = true;
+        makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ];
+
+        configurePhase = ":";
+        installPhase = ''
+          mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
+
+          cp -v ./lib/libfdb_c.so     $lib/lib
+          cp -v ./lib/libfdb_java.so  $lib/lib
+
+          cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
+
+          cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
+          cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
+
+          cp -v ./bindings/java/foundationdb-client.jar     $lib/share/java
+
+          for x in fdbbackup fdbcli fdbserver fdbmonitor; do
+            cp -v "./bin/$x" $out/bin;
+          done
+
+          ln -sfv $out/bin/fdbbackup $out/bin/dr_agent
+          ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore
+          ln -sfv $out/bin/fdbbackup $out/bin/fdbdr
+
+          ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent
+        '';
+
+        outputs = [ "out" "lib" "dev" ];
+
+        meta = with stdenv.lib; {
+          description = "Open source, distributed, transactional key-value store";
+          homepage    = https://www.foundationdb.org;
+          license     = licenses.asl20;
+          platforms   = platforms.linux;
+          maintainers = with maintainers; [ thoughtpolice ];
+       };
+    };
 
   # hysterical raisins dictate a version of boost this old. however,
   # we luckily do not need to build anything, we just need the header
@@ -19,85 +98,34 @@ let
       sha256 = "14mc7gsnnahdjaxbbslzk79rc0d12h1i681cd3srdwr3fzynlar2";
     };
 
-    buildPhase = ":";
     configurePhase = ":";
-    installPhase = ''
-      mkdir -p $out/include/
-      cp -R boost $out/include/
-    '';
+    buildPhase = ":";
+    installPhase = "mkdir -p $out/include && cp -R boost $out/include/";
   };
 
-in stdenv.mkDerivation rec {
-  name = "foundationdb-${version}";
-  inherit version;
+in with builtins; {
 
-  src = fetchFromGitHub {
-    owner = "apple";
-    repo  = "foundationdb";
-    inherit rev sha256;
+  foundationdb51 = makeFdb {
+    version = "5.1.7";
+    branch  = "release-5.1";
+    rev     = "9ad8d02386d4a6a5efecf898df80f2747695c627";
+    sha256  = "1rc472ih24f9s5g3xmnlp3v62w206ny0pvvw02bzpix2sdrpbp06";
+    boost   = boost152;
   };
 
-  nativeBuildInputs = [ gawk which m4 findutils boost152 mono58 ];
-  buildInputs = [ python openjdk libressl_2_6 ];
-
-  patches =
-    [ ./fix-scm-version.patch
-      ./ldflags.patch
-    ];
-
-  postPatch = ''
-    substituteInPlace ./build/scver.mk \
-      --subst-var-by NIXOS_FDB_VERSION_ID "${rev}" \
-      --subst-var-by NIXOS_FDB_SCBRANCH   "${branch}"
-
-    substituteInPlace ./Makefile \
-      --replace 'shell which ccache' 'shell true' \
-      --replace -Werror ""
-
-    substituteInPlace ./Makefile \
-      --replace libstdc++_pic libstdc++
-
-    substituteInPlace ./build/link-validate.sh \
-      --replace 'exit 1' '#exit 1'
-
-    patchShebangs .
-  '';
-
-  enableParallelBuilding = true;
-  makeFlags = [ "all" "fdb_c" "fdb_java" "KVRELEASE=1" ];
-
-  configurePhase = ":";
-  installPhase = ''
-    mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
-
-    cp -v ./lib/libfdb_c.so     $lib/lib
-    cp -v ./lib/libfdb_java.so  $lib/lib
-
-    cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
-
-    cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
-    cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
-
-    cp -v ./bindings/java/foundationdb-client.jar     $lib/share/java
-
-    for x in fdbbackup fdbcli fdbserver fdbmonitor; do
-      cp -v "./bin/$x" $out/bin;
-    done
-
-    ln -sfv $out/bin/fdbbackup $out/bin/dr_agent
-    ln -sfv $out/bin/fdbbackup $out/bin/fdbrestore
-    ln -sfv $out/bin/fdbbackup $out/bin/fdbdr
-
-    ln -sfv $out/bin/fdbbackup $out/libexec/backup_agent
-  '';
-
-  outputs = [ "out" "lib" "dev" ];
-
-  meta = with stdenv.lib; {
-    description = "Open source, distributed, transactional key-value store";
-    homepage    = https://www.foundationdb.org;
-    license     = licenses.asl20;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ thoughtpolice ];
+  foundationdb52 = makeFdb rec {
+    version = "5.2.0pre1488_${substring 0 8 rev}";
+    branch  = "master";
+    rev     = "18f345487ed8d90a5c170d813349fa625cf05b4e";
+    sha256  = "0mz30fxj6q99cvjzg39s5zm992i6h2l2cb70lc58bdhsz92dz3vc";
+    boost   = boost152;
   };
+
+  foundationdb60 = makeFdb rec {
+    version = "6.0.0pre1636_${substring 0 8 rev}";
+    branch  = "master";
+    rev     = "1265a7b6d5e632dd562b3012e70f0727979806bd";
+    sha256  = "0z1i5bkbszsbn8cc48rlhr29m54n2s0gq3dln0n7f97gf58mi5yf";
+  };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df7e97e4f226..11f0d4ae4239 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2421,6 +2421,13 @@ with pkgs;
 
   fuseiso = callPackage ../tools/filesystems/fuseiso { };
 
+  fdbPackages = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; };
+
+  inherit (fdbPackages)
+    foundationdb51
+    foundationdb52
+    foundationdb60;
+
   foundationdb = callPackage ../servers/foundationdb { stdenv = overrideCC stdenv gcc49; };
 
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };

From 92e559212a7d15b458f0229648f5685618db4ec8 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 1 May 2018 22:45:31 +0200
Subject: [PATCH 0898/3370] virtualisation.virtualbox.host: introduce
 enableExtensionPack

---
 nixos/modules/virtualisation/virtualbox-host.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index 7413e12c8f3d..afb7b5fc0311 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -6,7 +6,7 @@ let
   cfg = config.virtualisation.virtualbox.host;
 
   virtualbox = pkgs.virtualbox.override {
-    inherit (cfg) enableHardening headless;
+    inherit (cfg) enableExtensionPack enableHardening headless;
   };
 
   kernelModules = config.boot.kernelPackages.virtualbox.override {
@@ -30,6 +30,8 @@ in
       '';
     };
 
+    enableExtensionPack = mkEnableOption "VirtualBox extension pack";
+
     addNetworkInterface = mkOption {
       type = types.bool;
       default = true;

From d3527d947fa767e9d7eb54bc26be042992a46f13 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 1 May 2018 22:46:28 +0200
Subject: [PATCH 0899/3370] virtualisation.virtualbox.host: migrate from
 mkOption to mkEnableOption

---
 nixos/modules/virtualisation/virtualbox-host.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix
index afb7b5fc0311..885d752577d5 100644
--- a/nixos/modules/virtualisation/virtualbox-host.nix
+++ b/nixos/modules/virtualisation/virtualbox-host.nix
@@ -17,9 +17,7 @@ in
 
 {
   options.virtualisation.virtualbox.host = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
+    enable = mkEnableOption "VirtualBox" // {
       description = ''
         Whether to enable VirtualBox.
 

From 8eb3167e2efdaa6db6cf6ff0d07bc872591dd37c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 1 May 2018 22:46:59 +0200
Subject: [PATCH 0900/3370] virtualbox: 5.2.8 -> 5.2.10

closes #39182.
---
 pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 29cb7c192b56..ca0520f32a8f 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -21,10 +21,10 @@ let
   buildType = "release";
   # Manually sha256sum the extensionPack file, must be hex!
   # Do not forget to update the hash in ./guest-additions/default.nix!
-  extpack = "355ea5fe047f751534720c65398b44290d53f389e0f5f66818f3f36746631d26";
-  extpackRev = "121009";
-  main = "ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8";
-  version = "5.2.8";
+  extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b";
+  extpackRev = "122406";
+  main = "1k14ngz1gcz02qwbpzfp4kgxv8s24js8pwd5nyyqs6jpxx6557pd";
+  version = "5.2.10";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {

From 0a19162fa9a7713be7a62aca217ad9a16d82c308 Mon Sep 17 00:00:00 2001
From: seese <seeseost@gmail.com>
Date: Tue, 1 May 2018 23:47:53 +0200
Subject: [PATCH 0901/3370] buildbot: disable tests on aarch64 because of
 TimeoutErrors (#39826)

buildbot: disable tests because of TimeoutErrors - only on aarch64
---
 pkgs/development/tools/build-managers/buildbot/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 98adaf1c1aa1..ae540104df3a 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -76,6 +76,9 @@ let
       ./skip_test_linux_distro.patch
     ];
 
+    # TimeoutErrors on slow machines -> aarch64
+    doCheck = !stdenv.isAarch64;
+
     postPatch = ''
       substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)"
     '';

From 1abef3a7c935089b823f2d903b94d8119770806a Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Wed, 2 May 2018 07:48:19 +1000
Subject: [PATCH 0902/3370] stride: 1.8.18 -> 1.17.82

---
 .../networking/instant-messengers/stride/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
index 0bcf3493d29e..9df816dd8907 100644
--- a/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -33,12 +33,12 @@ let
   ] + ":${stdenv.cc.cc.lib}/lib64";
 in
 stdenv.mkDerivation rec {
-  version = "1.8.18";
+  version = "1.17.82";
   name = "stride-${version}";
 
   src = fetchurl {
     url = "https://packages.atlassian.com/stride-apt-client/pool/stride_${version}_amd64.deb";
-    sha256 = "0hpj3i3xbvckxm7fphqqb3scb31w2cg4riwp593y0gnbivpc0hym";
+    sha256 = "0lx61gdhw0kv4f9fwbfg69yq52dsp4db7c4li25d6wn11qanzqhy";
   };
 
   dontBuild = true;

From b05ca2d84d2b3d56fb6fa4486ae62b88d239a231 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 16:52:40 -0500
Subject: [PATCH 0903/3370] aliases: remove fftwFloat

I was not seeing this earlier but now getting this error :

Alias fftwFloat is still in all-packages.nix
---
 pkgs/top-level/aliases.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 38b0e6391bfe..71b895c0ef4a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -84,7 +84,6 @@ mapAliases (rec {
   exfat-utils = exfat;                  # 2015-09-11
   fam = gamin; # added 2018-04-25
   ffadoFull = ffado; # added 2018-05-01
-  fftwFloat = fftwSinglePrec; # 2018-04-25
   firefox-esr-wrapper = firefox-esr;  # 2016-01
   firefox-wrapper = firefox;          # 2016-01
   firefoxWrapper = firefox;           # 2015-09

From 374a3bdf5b014d84b6ea57e80af52c5bc2d73f35 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 1 May 2018 18:03:25 -0400
Subject: [PATCH 0904/3370] nixos docs: makefile for formatting

---
 nixos/doc/manual/Makefile  | 20 ++++++++++++++++++--
 nixos/doc/manual/shell.nix |  8 ++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 nixos/doc/manual/shell.nix

diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index b15fbaa270fc..4993976ae57e 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixos/doc/manual/Makefile
@@ -1,6 +1,22 @@
-debug:
+.PHONY: all
+all: manual-combined.xml format
+
+.PHONY: debug
+debug: generated manual-combined.xml
+
+manual-combined.xml: generated *.xml
+	rm ./manual-combined.xml
 	nix-shell --packages xmloscopy \
-		--run 'xmloscopy --docbook5 ./manual.xml ./manual-combined.xml'
+		--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"
+
+.PHONY: format
+format:
+	find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
+		xmlformat --config-file "../xmlformat.conf" -i {}
+
+.PHONY: clean
+clean:
+	rm -f manual-combined.xml generated
 
 generated: ./options-to-docbook.xsl
 	nix-build ../../release.nix \
diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix
new file mode 100644
index 000000000000..7f8422b4ec11
--- /dev/null
+++ b/nixos/doc/manual/shell.nix
@@ -0,0 +1,8 @@
+let
+  pkgs = import ../../.. { };
+in
+pkgs.mkShell {
+  name = "nixos-manual";
+
+  buildInputs = with pkgs; [ xmlformat jing xmloscopy ];
+}

From 4c66aa8938ca286cc9e801284d6f531e548f0eaa Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 1 May 2018 21:57:17 +0800
Subject: [PATCH 0905/3370] bluez: add tools to output that we were building
 anyway

---
 pkgs/os-specific/linux/bluez/default.nix | 35 ++++++++++++++++--------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index d4595d73d942..bd890068f6d6 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -12,24 +12,28 @@ stdenv.mkDerivation rec {
     sha256 = "15ffsaz7l3fgdg03l7g1xx9jw7xgs6pc548zxqsxawsca5x1sc1k";
   };
 
-  pythonPath = with pythonPackages;
-    [ dbus-python pygobject2 pygobject3 recursivePthLoader ];
+  pythonPath = with pythonPackages; [
+    dbus-python pygobject2 pygobject3 recursivePthLoader
+  ];
 
   buildInputs = [
-    pkgconfig dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
+    dbus glib alsaLib pythonPackages.python pythonPackages.wrapPython
     readline udev libical
   ];
 
+  nativeBuildInputs = [ pkgconfig ];
+
   outputs = [ "out" "dev" "test" ];
 
   patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
 
-  preConfigure = ''
-      substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
-      substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
-    '';
+  postConfigure = ''
+    substituteInPlace tools/hid2hci.rules \
+      --replace /sbin/udevadm ${systemd}/bin/udevadm \
+      --replace "hid2hci " "$out/lib/udev/hid2hci "
+  '';
 
-  configureFlags = [
+  configureFlags = (with stdenv.lib; [
     "--localstatedir=/var"
     "--enable-library"
     "--enable-cups"
@@ -40,8 +44,8 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-systemduserunitdir=$(out)/etc/systemd/user"
     "--with-udevdir=$(out)/lib/udev"
-    ] ++ stdenv.lib.optional enableWiimote [ "--enable-wiimote" ]
-    ++ stdenv.lib.optional enableMidi [ "--enable-midi" ];
+    ] ++ optional enableWiimote [ "--enable-wiimote" ]
+      ++ optional enableMidi    [ "--enable-midi" ]);
 
   # Work around `make install' trying to create /var/lib/bluetooth.
   installFlags = "statedir=$(TMPDIR)/var/lib/bluetooth";
@@ -73,14 +77,21 @@ stdenv.mkDerivation rec {
     # Add extra configuration
     mkdir $out/etc/bluetooth
     ln -s /etc/bluetooth/main.conf $out/etc/bluetooth/main.conf
+
+    # Add missing tools, ref https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/bluez
+    for files in `find tools/ -type f -perm -755`; do
+      filename=$(basename $files)
+      install -Dm755 tools/$filename $out/bin/$filename
+    done
   '';
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.bluez.org/;
-    repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
     description = "Bluetooth support for Linux";
+    homepage = http://www.bluez.org/;
+    license = with licenses; [ gpl2 lgpl21 ];
     platforms = platforms.linux;
+    repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;
   };
 }

From d7004320cffa72cc8ea48565306cc34ffa1ee8ac Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 2 May 2018 07:26:25 +0800
Subject: [PATCH 0906/3370] syncthing: 0.14.46 -> 0.14.47

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 531a1d5d0a17..e1a2cf8d1716 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,14 +3,14 @@
 let
   common = { stname, target, patches ? [], postInstall ? "" }:
     stdenv.mkDerivation rec {
-      version = "0.14.46";
+      version = "0.14.47";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "0lv8n5id40iy2gfccy8g45fjzlnbnvi7nlvj25pri22dq2bd5svm";
+        sha256 = "1md835c13f3c9bknnm6pxn0r8k8g2wg56zfav96bpnpk4aqx41bh";
       };
 
       inherit patches;

From 9d4b966c4d0a29ffc898899343975498066d5eed Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 1 May 2018 19:43:52 -0400
Subject: [PATCH 0907/3370] nixos docs: fixup

---
 nixos/doc/manual/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index 4993976ae57e..2e2322d5fb51 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixos/doc/manual/Makefile
@@ -5,7 +5,7 @@ all: manual-combined.xml format
 debug: generated manual-combined.xml
 
 manual-combined.xml: generated *.xml
-	rm ./manual-combined.xml
+	rm -f ./manual-combined.xml
 	nix-shell --packages xmloscopy \
 		--run "xmloscopy --docbook5 ./manual.xml ./manual-combined.xml"
 

From fd2dce9708ff68e8a5474d9bf691a23c52c7273e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 1 May 2018 19:50:02 -0400
Subject: [PATCH 0908/3370] nixos docs: ignore generated files

---
 nixos/doc/manual/.gitignore | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 nixos/doc/manual/.gitignore

diff --git a/nixos/doc/manual/.gitignore b/nixos/doc/manual/.gitignore
new file mode 100644
index 000000000000..879282624217
--- /dev/null
+++ b/nixos/doc/manual/.gitignore
@@ -0,0 +1,2 @@
+generated
+manual-combined.xml

From 77161de4546697f9bf2da6d081eeba4c399b3313 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 1 May 2018 19:54:21 -0400
Subject: [PATCH 0909/3370] nixpkgs docs: format =)

---
 doc/coding-conventions.xml           | 1218 ++++----
 doc/configuration.xml                |  559 ++--
 doc/contributing.xml                 |   38 +-
 doc/cross-compilation.xml            |  689 +++--
 doc/functions.xml                    | 1096 +++----
 doc/languages-frameworks/beam.xml    |  520 ++--
 doc/languages-frameworks/bower.xml   |  279 +-
 doc/languages-frameworks/coq.xml     |   60 +-
 doc/languages-frameworks/go.xml      |  164 +-
 doc/languages-frameworks/index.xml   |   59 +-
 doc/languages-frameworks/java.xml    |   76 +-
 doc/languages-frameworks/lua.xml     |   43 +-
 doc/languages-frameworks/perl.xml    |  219 +-
 doc/languages-frameworks/qt.xml      |  112 +-
 doc/languages-frameworks/ruby.xml    |   90 +-
 doc/languages-frameworks/texlive.xml |  108 +-
 doc/manual.xml                       |   47 +-
 doc/meta.xml                         |  540 ++--
 doc/multiple-output.xml              |  380 ++-
 doc/overlays.xml                     |  240 +-
 doc/package-notes.xml                |  901 +++---
 doc/platform-notes.xml               |   84 +-
 doc/quick-start.xml                  |  374 ++-
 doc/release-notes.xml                | 1341 +++++----
 doc/reviewing-contributions.xml      |  715 +++--
 doc/stdenv.xml                       | 4033 ++++++++++++++------------
 doc/submitting-changes.xml           |  878 +++---
 27 files changed, 8153 insertions(+), 6710 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index d556c7ebe1ed..f244c11d4f20 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -1,56 +1,59 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-conventions">
+ <title>Coding conventions</title>
+ <section xml:id="sec-syntax">
+  <title>Syntax</title>
 
-<title>Coding conventions</title>
-
-
-<section xml:id="sec-syntax"><title>Syntax</title>
-
-<itemizedlist>
-
-  <listitem><para>Use 2 spaces of indentation per indentation level in
-  Nix expressions, 4 spaces in shell scripts.</para></listitem>
-
-  <listitem><para>Do not use tab characters, i.e. configure your
-  editor to use soft tabs.  For instance, use <literal>(setq-default
-  indent-tabs-mode nil)</literal> in Emacs.  Everybody has different
-  tab settings so it’s asking for trouble.</para></listitem>
-
-  <listitem><para>Use <literal>lowerCamelCase</literal> for variable
-  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
-
+  <itemizedlist>
+   <listitem>
+    <para>
+     Use 2 spaces of indentation per indentation level in Nix expressions, 4
+     spaces in shell scripts.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Do not use tab characters, i.e. configure your editor to use soft tabs.
+     For instance, use <literal>(setq-default indent-tabs-mode nil)</literal>
+     in Emacs. Everybody has different tab settings so it’s asking for
+     trouble.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Use <literal>lowerCamelCase</literal> for variable 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
 <programlisting>
 foo {
   arg = ...;
 }
 </programlisting>
-
-  not
-
+     not
 <programlisting>
 foo
 {
   arg = ...;
 }
 </programlisting>
-
-  Also fine is
-
+     Also fine is
 <programlisting>
 foo { arg = ...; }
 </programlisting>
-
-  if it's a short call.</para></listitem>
-
-  <listitem><para>In attribute sets or lists that span multiple lines,
-  the attribute names or list elements should be aligned:
-
+     if it's a short call.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     In attribute sets or lists that span multiple lines, the attribute names
+     or list elements should be aligned:
 <programlisting>
 # A long list.
 list =
@@ -73,12 +76,11 @@ attrs = {
     if true then big_expr else big_expr;
 };
 </programlisting>
-
-  </para></listitem>
-
-  <listitem><para>Short lists or attribute sets can be written on one
-  line:
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Short lists or attribute sets can be written on one line:
 <programlisting>
 # A short list.
 list = [ elem1 elem2 elem3 ];
@@ -86,66 +88,58 @@ list = [ elem1 elem2 elem3 ];
 # A short set.
 attrs = { x = 1280; y = 1024; };
 </programlisting>
-
-  </para></listitem>
-
-  <listitem><para>Breaking in the middle of a function argument can
-  give hard-to-read code, like
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Breaking in the middle of a function argument can give hard-to-read code,
+     like
 <programlisting>
 someFunction { x = 1280;
   y = 1024; } otherArg
   yetAnotherArg
 </programlisting>
-
-  (especially if the argument is very large, spanning multiple
-  lines).</para>
-
-  <para>Better:
-
+     (especially if the argument is very large, spanning multiple lines).
+    </para>
+    <para>
+     Better:
 <programlisting>
 someFunction
   { x = 1280; y = 1024; }
   otherArg
   yetAnotherArg
 </programlisting>
-
-  or
-
+     or
 <programlisting>
 let res = { x = 1280; y = 1024; };
 in someFunction res otherArg yetAnotherArg
 </programlisting>
-
-  </para></listitem>
-
-  <listitem><para>The bodies of functions, asserts, and withs are not
-  indented to prevent a lot of superfluous indentation levels, i.e.
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The bodies of functions, asserts, and withs are not indented to prevent a
+     lot of superfluous indentation levels, i.e.
 <programlisting>
 { arg1, arg2 }:
 assert system == "i686-linux";
 stdenv.mkDerivation { ...
 </programlisting>
-
-  not
-
+     not
 <programlisting>
 { arg1, arg2 }:
   assert system == "i686-linux";
     stdenv.mkDerivation { ...
 </programlisting>
-
-  </para></listitem>
-
-  <listitem><para>Function formal arguments are written as:
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Function formal arguments are written as:
 <programlisting>
 { arg1, arg2, arg3 }:
 </programlisting>
-
-  but if they don't fit on one line they're written as:
-
+     but if they don't fit on one line they're written as:
 <programlisting>
 { arg1, arg2, arg3
 , arg4, ...
@@ -153,35 +147,28 @@ stdenv.mkDerivation { ...
   argN
 }:
 </programlisting>
-
-  </para></listitem>
-
-  <listitem><para>Functions should list their expected arguments as
-  precisely as possible.  That is, write
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Functions should list their expected arguments as precisely as possible.
+     That is, write
 <programlisting>
 { stdenv, fetchurl, perl }: <replaceable>...</replaceable>
 </programlisting>
-
-  instead of
-
+     instead of
 <programlisting>
 args: with args; <replaceable>...</replaceable>
 </programlisting>
-
-  or
-
+     or
 <programlisting>
 { stdenv, fetchurl, perl, ... }: <replaceable>...</replaceable>
 </programlisting>
-
-  </para>
-
-  <para>For functions that are truly generic in the number of
-  arguments (such as wrappers around <varname>mkDerivation</varname>)
-  that have some required arguments, you should write them using an
-  <literal>@</literal>-pattern:
-
+    </para>
+    <para>
+     For functions that are truly generic in the number of arguments (such as
+     wrappers around <varname>mkDerivation</varname>) that have some required
+     arguments, you should write them using an <literal>@</literal>-pattern:
 <programlisting>
 { stdenv, doCoverageAnalysis ? false, ... } @ args:
 
@@ -189,9 +176,7 @@ stdenv.mkDerivation (args // {
   <replaceable>...</replaceable> if doCoverageAnalysis then "bla" else "" <replaceable>...</replaceable>
 })
 </programlisting>
-
-  instead of
-
+     instead of
 <programlisting>
 args:
 
@@ -199,432 +184,557 @@ args.stdenv.mkDerivation (args // {
   <replaceable>...</replaceable> if args ? doCoverageAnalysis &amp;&amp; args.doCoverageAnalysis then "bla" else "" <replaceable>...</replaceable>
 })
 </programlisting>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+ <section xml:id="sec-package-naming">
+  <title>Package naming</title>
 
-  </para></listitem>
-
-</itemizedlist>
-
-</section>
-
-
-<section xml:id="sec-package-naming"><title>Package naming</title>
-
-<para>In Nixpkgs, there are generally three different names associated with a package:
-
-<itemizedlist>
-
-  <listitem><para>The <varname>name</varname> attribute of the
-  derivation (excluding the version part).  This is what most users
-  see, in particular when using
-  <command>nix-env</command>.</para></listitem>
-
-  <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.  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>
-
-</itemizedlist>
-
-Most of the time, these are the same.  For instance, the package
-<literal>e2fsprogs</literal> has a <varname>name</varname> attribute
-<literal>"e2fsprogs-<replaceable>version</replaceable>"</literal>, is
-bound to the variable name <varname>e2fsprogs</varname> in
-<filename>all-packages.nix</filename>, and the Nix expression is in
-<filename>pkgs/os-specific/linux/e2fsprogs/default.nix</filename>.
-</para>
-
-<para>There are a few naming guidelines:
-
-<itemizedlist>
-
-  <listitem><para>Generally, try to stick to the upstream package
-  name.</para></listitem>
-
-  <listitem><para>Don’t use uppercase letters in the
-  <literal>name</literal> attribute — e.g.,
-  <literal>"mplayer-1.0rc2"</literal> instead of
-  <literal>"MPlayer-1.0rc2"</literal>.</para></listitem>
-
-  <listitem><para>The version part of the <literal>name</literal>
-  attribute <emphasis>must</emphasis> start with a digit (following a
-  dash) — e.g., <literal>"hello-0.3.1rc2"</literal>.</para></listitem>
-
-  <listitem><para>If a package is not a release but a commit from a repository, then
-  the version part of the name <emphasis>must</emphasis> be the date of that
-  (fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal> format.
-  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 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
-  <filename>all-packages.nix</filename>,
-  e.g. <varname>json-c-0-9</varname> and <varname>json-c-0-11</varname>.
-  If there is an obvious “default” version, make an attribute like
-  <literal>json-c = json-c-0-9;</literal>.
-  See also <xref linkend="sec-versioning" /></para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</section>
-
-
-<section xml:id="sec-organisation"><title>File naming and organisation</title>
-
-<para>Names of files and directories should be in lowercase, with
-dashes between words — not in camel case.  For instance, it should be
-<filename>all-packages.nix</filename>, not
-<filename>allPackages.nix</filename> or
-<filename>AllPackages.nix</filename>.</para>
-
-<section xml:id="sec-hierarchy"><title>Hierarchy</title>
-
-<para>Each package should be stored in its own directory somewhere in
-the <filename>pkgs/</filename> tree, i.e. in
-<filename>pkgs/<replaceable>category</replaceable>/<replaceable>subcategory</replaceable>/<replaceable>...</replaceable>/<replaceable>pkgname</replaceable></filename>.
-Below are some rules for picking the right category for a package.
-Many packages fall under several categories; what matters is the
-<emphasis>primary</emphasis> purpose of a package.  For example, the
-<literal>libxml2</literal> package builds both a library and some
-tools; but it’s a library foremost, so it goes under
-<filename>pkgs/development/libraries</filename>.</para>
-
-<para>When in doubt, consider refactoring the
-<filename>pkgs/</filename> tree, e.g. creating new categories or
-splitting up an existing category.</para>
-
-<variablelist>
-  <varlistentry>
-    <term>If it’s used to support <emphasis>software development</emphasis>:</term>
+  <para>
+   In Nixpkgs, there are generally three different names associated with a
+   package:
+   <itemizedlist>
     <listitem>
-      <variablelist>
-        <varlistentry>
-          <term>If it’s a <emphasis>library</emphasis> used by other packages:</term>
-          <listitem>
-            <para><filename>development/libraries</filename> (e.g. <filename>libxml2</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a <emphasis>compiler</emphasis>:</term>
-          <listitem>
-            <para><filename>development/compilers</filename> (e.g. <filename>gcc</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s an <emphasis>interpreter</emphasis>:</term>
-          <listitem>
-            <para><filename>development/interpreters</filename> (e.g. <filename>guile</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a (set of) development <emphasis>tool(s)</emphasis>:</term>
-          <listitem>
-            <variablelist>
-              <varlistentry>
-                <term>If it’s a <emphasis>parser generator</emphasis> (including lexers):</term>
-                <listitem>
-                  <para><filename>development/tools/parsing</filename> (e.g. <filename>bison</filename>, <filename>flex</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>If it’s a <emphasis>build manager</emphasis>:</term>
-                <listitem>
-                  <para><filename>development/tools/build-managers</filename> (e.g. <filename>gnumake</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>Else:</term>
-                <listitem>
-                  <para><filename>development/tools/misc</filename> (e.g. <filename>binutils</filename>)</para>
-                </listitem>
-              </varlistentry>
-            </variablelist>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Else:</term>
-          <listitem>
-            <para><filename>development/misc</filename></para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
+     <para>
+      The <varname>name</varname> attribute of the derivation (excluding the
+      version part). This is what most users see, in particular when using
+      <command>nix-env</command>.
+     </para>
     </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term>
     <listitem>
-      <para>(A tool is a relatively small program, especially one intended
-      to be used non-interactively.)</para>
+     <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. 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>
+   </itemizedlist>
+   Most of the time, these are the same. For instance, the package
+   <literal>e2fsprogs</literal> has a <varname>name</varname> attribute
+   <literal>"e2fsprogs-<replaceable>version</replaceable>"</literal>, is bound
+   to the variable name <varname>e2fsprogs</varname> in
+   <filename>all-packages.nix</filename>, and the Nix expression is in
+   <filename>pkgs/os-specific/linux/e2fsprogs/default.nix</filename>.
+  </para>
+
+  <para>
+   There are a few naming guidelines:
+   <itemizedlist>
+    <listitem>
+     <para>
+      Generally, try to stick to the upstream package name.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Don’t use uppercase letters in the <literal>name</literal> attribute
+      — e.g., <literal>"mplayer-1.0rc2"</literal> instead of
+      <literal>"MPlayer-1.0rc2"</literal>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      The version part of the <literal>name</literal> attribute
+      <emphasis>must</emphasis> start with a digit (following a dash) — e.g.,
+      <literal>"hello-0.3.1rc2"</literal>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      If a package is not a release but a commit from a repository, then the
+      version part of the name <emphasis>must</emphasis> be the date of that
+      (fetched) commit. The date must be in <literal>"YYYY-MM-DD"</literal>
+      format. 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 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 <filename>all-packages.nix</filename>, e.g.
+      <varname>json-c-0-9</varname> and <varname>json-c-0-11</varname>. If
+      there is an obvious “default” version, make an attribute like
+      <literal>json-c = json-c-0-9;</literal>. See also
+      <xref linkend="sec-versioning" />
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </section>
+ <section xml:id="sec-organisation">
+  <title>File naming and organisation</title>
+
+  <para>
+   Names of files and directories should be in lowercase, with dashes between
+   words — not in camel case. For instance, it should be
+   <filename>all-packages.nix</filename>, not
+   <filename>allPackages.nix</filename> or
+   <filename>AllPackages.nix</filename>.
+  </para>
+
+  <section xml:id="sec-hierarchy">
+   <title>Hierarchy</title>
+
+   <para>
+    Each package should be stored in its own directory somewhere in the
+    <filename>pkgs/</filename> tree, i.e. in
+    <filename>pkgs/<replaceable>category</replaceable>/<replaceable>subcategory</replaceable>/<replaceable>...</replaceable>/<replaceable>pkgname</replaceable></filename>.
+    Below are some rules for picking the right category for a package. Many
+    packages fall under several categories; what matters is the
+    <emphasis>primary</emphasis> purpose of a package. For example, the
+    <literal>libxml2</literal> package builds both a library and some tools;
+    but it’s a library foremost, so it goes under
+    <filename>pkgs/development/libraries</filename>.
+   </para>
+
+   <para>
+    When in doubt, consider refactoring the <filename>pkgs/</filename> tree,
+    e.g. creating new categories or splitting up an existing category.
+   </para>
+
+   <variablelist>
+    <varlistentry>
+     <term>If it’s used to support <emphasis>software development</emphasis>:</term>
+     <listitem>
       <variablelist>
-        <varlistentry>
-          <term>If it’s for <emphasis>networking</emphasis>:</term>
-          <listitem>
-            <para><filename>tools/networking</filename> (e.g. <filename>wget</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s for <emphasis>text processing</emphasis>:</term>
-          <listitem>
-            <para><filename>tools/text</filename> (e.g. <filename>diffutils</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a <emphasis>system utility</emphasis>, i.e.,
+       <varlistentry>
+        <term>If it’s a <emphasis>library</emphasis> used by other packages:</term>
+        <listitem>
+         <para>
+          <filename>development/libraries</filename> (e.g.
+          <filename>libxml2</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s a <emphasis>compiler</emphasis>:</term>
+        <listitem>
+         <para>
+          <filename>development/compilers</filename> (e.g.
+          <filename>gcc</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s an <emphasis>interpreter</emphasis>:</term>
+        <listitem>
+         <para>
+          <filename>development/interpreters</filename> (e.g.
+          <filename>guile</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s a (set of) development <emphasis>tool(s)</emphasis>:</term>
+        <listitem>
+         <variablelist>
+          <varlistentry>
+           <term>If it’s a <emphasis>parser generator</emphasis> (including lexers):</term>
+           <listitem>
+            <para>
+             <filename>development/tools/parsing</filename> (e.g.
+             <filename>bison</filename>, <filename>flex</filename>)
+            </para>
+           </listitem>
+          </varlistentry>
+          <varlistentry>
+           <term>If it’s a <emphasis>build manager</emphasis>:</term>
+           <listitem>
+            <para>
+             <filename>development/tools/build-managers</filename> (e.g.
+             <filename>gnumake</filename>)
+            </para>
+           </listitem>
+          </varlistentry>
+          <varlistentry>
+           <term>Else:</term>
+           <listitem>
+            <para>
+             <filename>development/tools/misc</filename> (e.g.
+             <filename>binutils</filename>)
+            </para>
+           </listitem>
+          </varlistentry>
+         </variablelist>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>Else:</term>
+        <listitem>
+         <para>
+          <filename>development/misc</filename>
+         </para>
+        </listitem>
+       </varlistentry>
+      </variablelist>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term>
+     <listitem>
+      <para>
+       (A tool is a relatively small program, especially one intended to be
+       used non-interactively.)
+      </para>
+      <variablelist>
+       <varlistentry>
+        <term>If it’s for <emphasis>networking</emphasis>:</term>
+        <listitem>
+         <para>
+          <filename>tools/networking</filename> (e.g.
+          <filename>wget</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s for <emphasis>text processing</emphasis>:</term>
+        <listitem>
+         <para>
+          <filename>tools/text</filename> (e.g. <filename>diffutils</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s a <emphasis>system utility</emphasis>, i.e.,
           something related or essential to the operation of a
           system:</term>
-          <listitem>
-            <para><filename>tools/system</filename> (e.g. <filename>cron</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s an <emphasis>archiver</emphasis> (which may
+        <listitem>
+         <para>
+          <filename>tools/system</filename> (e.g. <filename>cron</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s an <emphasis>archiver</emphasis> (which may
           include a compression function):</term>
-          <listitem>
-            <para><filename>tools/archivers</filename> (e.g. <filename>zip</filename>, <filename>tar</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a <emphasis>compression</emphasis> program:</term>
-          <listitem>
-            <para><filename>tools/compression</filename> (e.g. <filename>gzip</filename>, <filename>bzip2</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s a <emphasis>security</emphasis>-related program:</term>
-          <listitem>
-            <para><filename>tools/security</filename> (e.g. <filename>nmap</filename>, <filename>gnupg</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Else:</term>
-          <listitem>
-            <para><filename>tools/misc</filename></para>
-          </listitem>
-        </varlistentry>
+        <listitem>
+         <para>
+          <filename>tools/archivers</filename> (e.g. <filename>zip</filename>,
+          <filename>tar</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s a <emphasis>compression</emphasis> program:</term>
+        <listitem>
+         <para>
+          <filename>tools/compression</filename> (e.g.
+          <filename>gzip</filename>, <filename>bzip2</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s a <emphasis>security</emphasis>-related program:</term>
+        <listitem>
+         <para>
+          <filename>tools/security</filename> (e.g. <filename>nmap</filename>,
+          <filename>gnupg</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>Else:</term>
+        <listitem>
+         <para>
+          <filename>tools/misc</filename>
+         </para>
+        </listitem>
+       </varlistentry>
       </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>shell</emphasis>:</term>
-    <listitem>
-      <para><filename>shells</filename> (e.g. <filename>bash</filename>)</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>server</emphasis>:</term>
-    <listitem>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>If it’s a <emphasis>shell</emphasis>:</term>
+     <listitem>
+      <para>
+       <filename>shells</filename> (e.g. <filename>bash</filename>)
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>If it’s a <emphasis>server</emphasis>:</term>
+     <listitem>
       <variablelist>
-        <varlistentry>
-          <term>If it’s a web server:</term>
-          <listitem>
-            <para><filename>servers/http</filename> (e.g. <filename>apache-httpd</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s an implementation of the X Windowing System:</term>
-          <listitem>
-            <para><filename>servers/x11</filename> (e.g. <filename>xorg</filename> — this includes the client libraries and programs)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Else:</term>
-          <listitem>
-            <para><filename>servers/misc</filename></para>
-          </listitem>
-        </varlistentry>
+       <varlistentry>
+        <term>If it’s a web server:</term>
+        <listitem>
+         <para>
+          <filename>servers/http</filename> (e.g.
+          <filename>apache-httpd</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s an implementation of the X Windowing System:</term>
+        <listitem>
+         <para>
+          <filename>servers/x11</filename> (e.g. <filename>xorg</filename> —
+          this includes the client libraries and programs)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>Else:</term>
+        <listitem>
+         <para>
+          <filename>servers/misc</filename>
+         </para>
+        </listitem>
+       </varlistentry>
       </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>desktop environment</emphasis>:</term>
-    <listitem>
-      <para><filename>desktops</filename> (e.g. <filename>kde</filename>, <filename>gnome</filename>, <filename>enlightenment</filename>)</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>window manager</emphasis>:</term>
-    <listitem>
-      <para><filename>applications/window-managers</filename> (e.g. <filename>awesome</filename>, <filename>stumpwm</filename>)</para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s an <emphasis>application</emphasis>:</term>
-    <listitem>
-      <para>A (typically large) program with a distinct user
-      interface, primarily used interactively.</para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>If it’s a <emphasis>desktop environment</emphasis>:</term>
+     <listitem>
+      <para>
+       <filename>desktops</filename> (e.g. <filename>kde</filename>,
+       <filename>gnome</filename>, <filename>enlightenment</filename>)
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>If it’s a <emphasis>window manager</emphasis>:</term>
+     <listitem>
+      <para>
+       <filename>applications/window-managers</filename> (e.g.
+       <filename>awesome</filename>, <filename>stumpwm</filename>)
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>If it’s an <emphasis>application</emphasis>:</term>
+     <listitem>
+      <para>
+       A (typically large) program with a distinct user interface, primarily
+       used interactively.
+      </para>
       <variablelist>
-        <varlistentry>
-          <term>If it’s a <emphasis>version management system</emphasis>:</term>
-          <listitem>
-            <para><filename>applications/version-management</filename> (e.g. <filename>subversion</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s for <emphasis>video playback / editing</emphasis>:</term>
-          <listitem>
-            <para><filename>applications/video</filename> (e.g. <filename>vlc</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s for <emphasis>graphics viewing / editing</emphasis>:</term>
-          <listitem>
-            <para><filename>applications/graphics</filename> (e.g. <filename>gimp</filename>)</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s for <emphasis>networking</emphasis>:</term>
-          <listitem>
-            <variablelist>
-              <varlistentry>
-                <term>If it’s a <emphasis>mailreader</emphasis>:</term>
-                <listitem>
-                  <para><filename>applications/networking/mailreaders</filename> (e.g. <filename>thunderbird</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>If it’s a <emphasis>newsreader</emphasis>:</term>
-                <listitem>
-                  <para><filename>applications/networking/newsreaders</filename> (e.g. <filename>pan</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>If it’s a <emphasis>web browser</emphasis>:</term>
-                <listitem>
-                  <para><filename>applications/networking/browsers</filename> (e.g. <filename>firefox</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>Else:</term>
-                <listitem>
-                  <para><filename>applications/networking/misc</filename></para>
-                </listitem>
-              </varlistentry>
-            </variablelist>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>Else:</term>
-          <listitem>
-            <para><filename>applications/misc</filename></para>
-          </listitem>
-        </varlistentry>
+       <varlistentry>
+        <term>If it’s a <emphasis>version management system</emphasis>:</term>
+        <listitem>
+         <para>
+          <filename>applications/version-management</filename> (e.g.
+          <filename>subversion</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s for <emphasis>video playback / editing</emphasis>:</term>
+        <listitem>
+         <para>
+          <filename>applications/video</filename> (e.g.
+          <filename>vlc</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s for <emphasis>graphics viewing / editing</emphasis>:</term>
+        <listitem>
+         <para>
+          <filename>applications/graphics</filename> (e.g.
+          <filename>gimp</filename>)
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s for <emphasis>networking</emphasis>:</term>
+        <listitem>
+         <variablelist>
+          <varlistentry>
+           <term>If it’s a <emphasis>mailreader</emphasis>:</term>
+           <listitem>
+            <para>
+             <filename>applications/networking/mailreaders</filename> (e.g.
+             <filename>thunderbird</filename>)
+            </para>
+           </listitem>
+          </varlistentry>
+          <varlistentry>
+           <term>If it’s a <emphasis>newsreader</emphasis>:</term>
+           <listitem>
+            <para>
+             <filename>applications/networking/newsreaders</filename> (e.g.
+             <filename>pan</filename>)
+            </para>
+           </listitem>
+          </varlistentry>
+          <varlistentry>
+           <term>If it’s a <emphasis>web browser</emphasis>:</term>
+           <listitem>
+            <para>
+             <filename>applications/networking/browsers</filename> (e.g.
+             <filename>firefox</filename>)
+            </para>
+           </listitem>
+          </varlistentry>
+          <varlistentry>
+           <term>Else:</term>
+           <listitem>
+            <para>
+             <filename>applications/networking/misc</filename>
+            </para>
+           </listitem>
+          </varlistentry>
+         </variablelist>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>Else:</term>
+        <listitem>
+         <para>
+          <filename>applications/misc</filename>
+         </para>
+        </listitem>
+       </varlistentry>
       </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s <emphasis>data</emphasis> (i.e., does not have a
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>If it’s <emphasis>data</emphasis> (i.e., does not have a
     straight-forward executable semantics):</term>
-    <listitem>
+     <listitem>
       <variablelist>
-        <varlistentry>
-          <term>If it’s a <emphasis>font</emphasis>:</term>
-          <listitem>
-            <para><filename>data/fonts</filename></para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>If it’s related to <emphasis>SGML/XML processing</emphasis>:</term>
-          <listitem>
-            <variablelist>
-              <varlistentry>
-                <term>If it’s an <emphasis>XML DTD</emphasis>:</term>
-                <listitem>
-                  <para><filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g. <filename>docbook</filename>)</para>
-                </listitem>
-              </varlistentry>
-              <varlistentry>
-                <term>If it’s an <emphasis>XSLT stylesheet</emphasis>:</term>
-                <listitem>
-                  <para>(Okay, these are executable...)</para>
-                  <para><filename>data/sgml+xml/stylesheets/xslt</filename> (e.g. <filename>docbook-xsl</filename>)</para>
-                </listitem>
-              </varlistentry>
-            </variablelist>
-          </listitem>
-        </varlistentry>
+       <varlistentry>
+        <term>If it’s a <emphasis>font</emphasis>:</term>
+        <listitem>
+         <para>
+          <filename>data/fonts</filename>
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term>If it’s related to <emphasis>SGML/XML processing</emphasis>:</term>
+        <listitem>
+         <variablelist>
+          <varlistentry>
+           <term>If it’s an <emphasis>XML DTD</emphasis>:</term>
+           <listitem>
+            <para>
+             <filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g.
+             <filename>docbook</filename>)
+            </para>
+           </listitem>
+          </varlistentry>
+          <varlistentry>
+           <term>If it’s an <emphasis>XSLT stylesheet</emphasis>:</term>
+           <listitem>
+            <para>
+             (Okay, these are executable...)
+            </para>
+            <para>
+             <filename>data/sgml+xml/stylesheets/xslt</filename> (e.g.
+             <filename>docbook-xsl</filename>)
+            </para>
+           </listitem>
+          </varlistentry>
+         </variablelist>
+        </listitem>
+       </varlistentry>
       </variablelist>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>If it’s a <emphasis>game</emphasis>:</term>
-    <listitem>
-      <para><filename>games</filename></para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>Else:</term>
-    <listitem>
-      <para><filename>misc</filename></para>
-    </listitem>
-  </varlistentry>
-</variablelist>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>If it’s a <emphasis>game</emphasis>:</term>
+     <listitem>
+      <para>
+       <filename>games</filename>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>Else:</term>
+     <listitem>
+      <para>
+       <filename>misc</filename>
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
 
-</section>
+  <section xml:id="sec-versioning">
+   <title>Versioning</title>
 
-<section xml:id="sec-versioning"><title>Versioning</title>
+   <para>
+    Because every version of a package in Nixpkgs creates a potential
+    maintenance burden, old versions of a package should not be kept unless
+    there is a good reason to do so. For instance, Nixpkgs contains several
+    versions of GCC because other packages don’t build with the latest
+    version of GCC. Other examples are having both the latest stable and latest
+    pre-release version of a package, or to keep several major releases of an
+    application that differ significantly in functionality.
+   </para>
 
-<para>Because every version of a package in Nixpkgs creates a
-potential maintenance burden, old versions of a package should not be
-kept unless there is a good reason to do so.  For instance, Nixpkgs
-contains several versions of GCC because other packages don’t build
-with the latest version of GCC.  Other examples are having both the
-latest stable and latest pre-release version of a package, or to keep
-several major releases of an application that differ significantly in
-functionality.</para>
+   <para>
+    If there is only one version of a package, its Nix expression should be
+    named <filename>e2fsprogs/default.nix</filename>. If there are multiple
+    versions, this should be reflected in the filename, e.g.
+    <filename>e2fsprogs/1.41.8.nix</filename> and
+    <filename>e2fsprogs/1.41.9.nix</filename>. The version in the filename
+    should leave out unnecessary detail. For instance, if we keep the latest
+    Firefox 2.0.x and 3.5.x versions in Nixpkgs, they should be named
+    <filename>firefox/2.0.nix</filename> and
+    <filename>firefox/3.5.nix</filename>, respectively (which, at a given
+    point, might contain versions <literal>2.0.0.20</literal> and
+    <literal>3.5.4</literal>). If a version requires many auxiliary files, you
+    can use a subdirectory for each version, e.g.
+    <filename>firefox/2.0/default.nix</filename> and
+    <filename>firefox/3.5/default.nix</filename>.
+   </para>
 
-<para>If there is only one version of a package, its Nix expression
-should be named <filename>e2fsprogs/default.nix</filename>.  If there
-are multiple versions, this should be reflected in the filename,
-e.g. <filename>e2fsprogs/1.41.8.nix</filename> and
-<filename>e2fsprogs/1.41.9.nix</filename>.  The version in the
-filename should leave out unnecessary detail.  For instance, if we
-keep the latest Firefox 2.0.x and 3.5.x versions in Nixpkgs, they
-should be named <filename>firefox/2.0.nix</filename> and
-<filename>firefox/3.5.nix</filename>, respectively (which, at a given
-point, might contain versions <literal>2.0.0.20</literal> and
-<literal>3.5.4</literal>).  If a version requires many auxiliary
-files, you can use a subdirectory for each version,
-e.g. <filename>firefox/2.0/default.nix</filename> and
-<filename>firefox/3.5/default.nix</filename>.</para>
+   <para>
+    All versions of a package <emphasis>must</emphasis> be included in
+    <filename>all-packages.nix</filename> to make sure that they evaluate
+    correctly.
+   </para>
+  </section>
+ </section>
+ <section xml:id="sec-sources">
+  <title>Fetching Sources</title>
 
-<para>All versions of a package <emphasis>must</emphasis> be included
-in <filename>all-packages.nix</filename> to make sure that they
-evaluate correctly.</para>
-
-</section>
-
-</section>
-<section xml:id="sec-sources"><title>Fetching Sources</title>
-  <para>There are multiple ways to fetch a package source in nixpkgs. The
-    general guideline is that you should package sources with a high degree of
-    availability. Right now there is only one fetcher which has mirroring
-    support and that is <literal>fetchurl</literal>. Note that you should also
-    prefer protocols which have a corresponding proxy environment variable.
+  <para>
+   There are multiple ways to fetch a package source in nixpkgs. The general
+   guideline is that you should package sources with a high degree of
+   availability. Right now there is only one fetcher which has mirroring
+   support and that is <literal>fetchurl</literal>. Note that you should also
+   prefer protocols which have a corresponding proxy environment variable.
   </para>
-  <para>You can find many source fetch helpers in <literal>pkgs/build-support/fetch*</literal>.
+
+  <para>
+   You can find many source fetch helpers in
+   <literal>pkgs/build-support/fetch*</literal>.
   </para>
-  <para>In the file <literal>pkgs/top-level/all-packages.nix</literal> you can
-    find fetch helpers, these have names on the form
-    <literal>fetchFrom*</literal>. The intention of these are to provide
-    snapshot fetches but using the same api as some of the version controlled
-    fetchers from <literal>pkgs/build-support/</literal>. As an example going
-    from bad to good:
-    <itemizedlist>
-      <listitem>
-        <para>Bad: Uses <literal>git://</literal> which won't be proxied.
+
+  <para>
+   In the file <literal>pkgs/top-level/all-packages.nix</literal> you can find
+   fetch helpers, these have names on the form <literal>fetchFrom*</literal>.
+   The intention of these are to provide snapshot fetches but using the same
+   api as some of the version controlled fetchers from
+   <literal>pkgs/build-support/</literal>. As an example going from bad to
+   good:
+   <itemizedlist>
+    <listitem>
+     <para>
+      Bad: Uses <literal>git://</literal> which won't be proxied.
 <programlisting>
 src = fetchgit {
   url = "git://github.com/NixOS/nix.git";
@@ -632,10 +742,11 @@ src = fetchgit {
   sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
 }
 </programlisting>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Better: This is ok, but an archive fetch will still be faster.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Better: This is ok, but an archive fetch will still be faster.
 <programlisting>
 src = fetchgit {
   url = "https://github.com/NixOS/nix.git";
@@ -643,10 +754,11 @@ src = fetchgit {
   sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
 }
 </programlisting>
-        </para>
-      </listitem>
-      <listitem>
-        <para>Best: Fetches a snapshot archive and you get the rev you want.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Best: Fetches a snapshot archive and you get the rev you want.
 <programlisting>
 src = fetchFromGitHub {
   owner = "NixOS";
@@ -655,15 +767,19 @@ src = fetchFromGitHub {
   sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
 }
 </programlisting>
-        </para>
-      </listitem>
-    </itemizedlist>
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </section>
+ <section xml:id="sec-patches">
+  <title>Patches</title>
+
+  <para>
+   Patches available online should be retrieved using
+   <literal>fetchpatch</literal>.
   </para>
-</section>
 
-<section xml:id="sec-patches"><title>Patches</title>
-  <para>Patches available online should be retrieved using
-    <literal>fetchpatch</literal>.</para>
   <para>
 <programlisting>
 patches = [
@@ -675,30 +791,54 @@ patches = [
 ];
 </programlisting>
   </para>
-  <para>Otherwise, you can add a <literal>.patch</literal> file to the
-  <literal>nixpkgs</literal> repository. In the interest of keeping our
-  maintenance burden to a minimum, only patches that are unique
-  to <literal>nixpkgs</literal> should be added in this way.</para>
-<para><programlisting>
-patches = [ ./0001-changes.patch ];
-</programlisting></para>
-  <para>If you do need to do create this sort of patch file,
-  one way to do so is with git:
-  <orderedlist>
-    <listitem><para>Move to the root directory of the source code
-    you're patching.<screen>
-$ cd the/program/source</screen></para></listitem>
-    <listitem><para>If a git repository is not already present,
-    create one and stage all of the source files.<screen>
-$ git init
-$ git add .</screen></para></listitem>
-    <listitem><para>Edit some files to make whatever changes need
-    to be included in the patch.</para></listitem>
-    <listitem><para>Use git to create a diff, and pipe the output
-    to a patch file:<screen>
-$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch</screen>
-    </para></listitem>
-  </orderedlist></para>
-</section>
 
+  <para>
+   Otherwise, you can add a <literal>.patch</literal> file to the
+   <literal>nixpkgs</literal> repository. In the interest of keeping our
+   maintenance burden to a minimum, only patches that are unique to
+   <literal>nixpkgs</literal> should be added in this way.
+  </para>
+
+  <para>
+<programlisting>
+patches = [ ./0001-changes.patch ];
+</programlisting>
+  </para>
+
+  <para>
+   If you do need to do create this sort of patch file, one way to do so is
+   with git:
+   <orderedlist>
+    <listitem>
+     <para>
+      Move to the root directory of the source code you're patching.
+<screen>
+$ cd the/program/source</screen>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      If a git repository is not already present, create one and stage all of
+      the source files.
+<screen>
+$ git init
+$ git add .</screen>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Edit some files to make whatever changes need to be included in the
+      patch.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Use git to create a diff, and pipe the output to a patch file:
+<screen>
+$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch</screen>
+     </para>
+    </listitem>
+   </orderedlist>
+  </para>
+ </section>
 </chapter>
diff --git a/doc/configuration.xml b/doc/configuration.xml
index 5370265c53ad..4411b4844e99 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -1,42 +1,51 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-packageconfig">
-
-<title>Global configuration</title>
-
-<para>Nix comes with certain defaults about what packages can and
-cannot be installed, based on a package's metadata. By default, Nix
-will prevent installation if any of the following criteria are
-true:</para>
-
-<itemizedlist>
-  <listitem><para>The package is thought to be broken, and has had
-  its <literal>meta.broken</literal> set to
-  <literal>true</literal>.</para></listitem>
-
-  <listitem><para>The package isn't intended to run on the given system, as none of its <literal>meta.platforms</literal> match the given system.</para></listitem>
-
-  <listitem><para>The package's <literal>meta.license</literal> is set
-  to a license which is considered to be unfree.</para></listitem>
-
-  <listitem><para>The package has known security vulnerabilities but
-  has not or can not be updated for some reason, and a list of issues
-  has been entered in to the package's
-  <literal>meta.knownVulnerabilities</literal>.</para></listitem>
-</itemizedlist>
-
-<para>Note that all this is checked during evaluation already,
-and the check includes any package that is evaluated.
-In particular, all build-time dependencies are checked.
-<literal>nix-env -qa</literal> will (attempt to) hide any packages
-that would be refused.
-</para>
-
-<para>Each of these criteria can be altered in the nixpkgs
-configuration.</para>
-
-<para>The nixpkgs configuration for a NixOS system is set in the
-<literal>configuration.nix</literal>, as in the following example:
+ <title>Global configuration</title>
+ <para>
+  Nix comes with certain defaults about what packages can and cannot be
+  installed, based on a package's metadata. By default, Nix will prevent
+  installation if any of the following criteria are true:
+ </para>
+ <itemizedlist>
+  <listitem>
+   <para>
+    The package is thought to be broken, and has had its
+    <literal>meta.broken</literal> set to <literal>true</literal>.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    The package isn't intended to run on the given system, as none of its
+    <literal>meta.platforms</literal> match the given system.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    The package's <literal>meta.license</literal> is set to a license which is
+    considered to be unfree.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    The package has known security vulnerabilities but has not or can not be
+    updated for some reason, and a list of issues has been entered in to the
+    package's <literal>meta.knownVulnerabilities</literal>.
+   </para>
+  </listitem>
+ </itemizedlist>
+ <para>
+  Note that all this is checked during evaluation already, and the check
+  includes any package that is evaluated. In particular, all build-time
+  dependencies are checked. <literal>nix-env -qa</literal> will (attempt to)
+  hide any packages that would be refused.
+ </para>
+ <para>
+  Each of these criteria can be altered in the nixpkgs configuration.
+ </para>
+ <para>
+  The nixpkgs configuration for a NixOS system is set in the
+  <literal>configuration.nix</literal>, as in the following example:
 <programlisting>
 {
   nixpkgs.config = {
@@ -44,187 +53,197 @@ configuration.</para>
   };
 }
 </programlisting>
-However, this does not allow unfree software for individual users.
-Their configurations are managed separately.</para>
-
-<para>A user's of nixpkgs configuration is stored in a user-specific
-configuration file located at
-<filename>~/.config/nixpkgs/config.nix</filename>. For example:
+  However, this does not allow unfree software for individual users. Their
+  configurations are managed separately.
+ </para>
+ <para>
+  A user's of nixpkgs configuration is stored in a user-specific configuration
+  file located at <filename>~/.config/nixpkgs/config.nix</filename>. For
+  example:
 <programlisting>
 {
   allowUnfree = true;
 }
 </programlisting>
-</para>
-
-<para>Note that we are not able to test or build unfree software on Hydra
-due to policy. Most unfree licenses prohibit us from either executing or
-distributing the software.</para>
-
-<section xml:id="sec-allow-broken">
+ </para>
+ <para>
+  Note that we are not able to test or build unfree software on Hydra due to
+  policy. Most unfree licenses prohibit us from either executing or
+  distributing the software.
+ </para>
+ <section xml:id="sec-allow-broken">
   <title>Installing broken packages</title>
 
-
-  <para>There are two ways to try compiling a package which has been
-  marked as broken.</para>
+  <para>
+   There are two ways to try compiling a package which has been marked as
+   broken.
+  </para>
 
   <itemizedlist>
-    <listitem><para>
-      For allowing the build of a broken package once, you can use an
-      environment variable for a single invocation of the nix tools:
-
-      <programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting>
-    </para></listitem>
-
-    <listitem><para>
-      For permanently allowing broken packages to be built, you may
-      add <literal>allowBroken = true;</literal> to your user's
-      configuration file, like this:
-
+   <listitem>
+    <para>
+     For allowing the build of a broken package once, you can use an
+     environment variable for a single invocation of the nix tools:
+<programlisting>$ export NIXPKGS_ALLOW_BROKEN=1</programlisting>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     For permanently allowing broken packages to be built, you may add
+     <literal>allowBroken = true;</literal> to your user's configuration file,
+     like this:
 <programlisting>
 {
   allowBroken = true;
 }
 </programlisting>
-    </para></listitem>
+    </para>
+   </listitem>
   </itemizedlist>
-</section>
-
-<section xml:id="sec-allow-unsupported-system">
+ </section>
+ <section xml:id="sec-allow-unsupported-system">
   <title>Installing packages on unsupported systems</title>
 
-
   <para>
-    There are also two ways to try compiling a package which has been marked as unsuported for the given system.
+   There are also two ways to try compiling a package which has been marked as
+   unsuported for the given system.
   </para>
 
   <itemizedlist>
-    <listitem><para>
-      For allowing the build of a broken package once, you can use an environment variable for a single invocation of the nix tools:
-
-      <programlisting>$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</programlisting>
-    </para></listitem>
-
-    <listitem>
-      <para>
-        For permanently allowing broken packages to be built, you may add <literal>allowUnsupportedSystem = true;</literal> to your user's configuration file, like this:
-
+   <listitem>
+    <para>
+     For allowing the build of a broken package once, you can use an
+     environment variable for a single invocation of the nix tools:
+<programlisting>$ export NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM=1</programlisting>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     For permanently allowing broken packages to be built, you may add
+     <literal>allowUnsupportedSystem = true;</literal> to your user's
+     configuration file, like this:
 <programlisting>
 {
   allowUnsupportedSystem = true;
 }
 </programlisting>
-      </para>
-    </listitem>
+    </para>
+   </listitem>
   </itemizedlist>
 
   <para>
-    The difference between an a package being unsupported on some system and being broken is admittedly a bit fuzzy.
-    If a program <emphasis>ought</emphasis> to work on a certain platform, but doesn't, the platform should be included in <literal>meta.platforms</literal>, but marked as broken with e.g. <literal>meta.broken = !hostPlatform.isWindows</literal>.
-    Of course, this begs the question of what "ought" means exactly.
-    That is left to the package maintainer.
+   The difference between an a package being unsupported on some system and
+   being broken is admittedly a bit fuzzy. If a program
+   <emphasis>ought</emphasis> to work on a certain platform, but doesn't, the
+   platform should be included in <literal>meta.platforms</literal>, but marked
+   as broken with e.g. <literal>meta.broken =
+   !hostPlatform.isWindows</literal>. Of course, this begs the question of what
+   "ought" means exactly. That is left to the package maintainer.
   </para>
-</section>
-
-<section xml:id="sec-allow-unfree">
+ </section>
+ <section xml:id="sec-allow-unfree">
   <title>Installing unfree packages</title>
 
-  <para>There are several ways to tweak how Nix handles a package
-  which has been marked as unfree.</para>
+  <para>
+   There are several ways to tweak how Nix handles a package which has been
+   marked as unfree.
+  </para>
 
   <itemizedlist>
-    <listitem><para>
-      To temporarily allow all unfree packages, you can use an
-      environment variable for a single invocation of the nix tools:
-
-      <programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
-    </para></listitem>
-
-    <listitem><para>
-      It is possible to permanently allow individual unfree packages,
-      while still blocking unfree packages by default using the
-      <literal>allowUnfreePredicate</literal> configuration
-      option in the user configuration file.</para>
-
-      <para>This option is a function which accepts a package as a
-      parameter, and returns a boolean. The following example
-      configuration accepts a package and always returns false:
+   <listitem>
+    <para>
+     To temporarily allow all unfree packages, you can use an environment
+     variable for a single invocation of the nix tools:
+<programlisting>$ export NIXPKGS_ALLOW_UNFREE=1</programlisting>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     It is possible to permanently allow individual unfree packages, while
+     still blocking unfree packages by default using the
+     <literal>allowUnfreePredicate</literal> configuration option in the user
+     configuration file.
+    </para>
+    <para>
+     This option is a function which accepts a package as a parameter, and
+     returns a boolean. The following example configuration accepts a package
+     and always returns false:
 <programlisting>
 {
   allowUnfreePredicate = (pkg: false);
 }
 </programlisting>
-      </para>
-
-      <para>A more useful example, the following configuration allows
-      only allows flash player and visual studio code:
-
+    </para>
+    <para>
+     A more useful example, the following configuration allows only allows
+     flash player and visual studio code:
 <programlisting>
 {
   allowUnfreePredicate = (pkg: elem (builtins.parseDrvName pkg.name).name [ "flashplayer" "vscode" ]);
 }
 </programlisting>
-    </para></listitem>
-
-    <listitem>
-      <para>It is also possible to whitelist and blacklist licenses
-      that are specifically acceptable or not acceptable, using
-      <literal>whitelistedLicenses</literal> and
-      <literal>blacklistedLicenses</literal>, respectively.
-      </para>
-
-      <para>The following example configuration whitelists the
-      licenses <literal>amd</literal> and <literal>wtfpl</literal>:
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     It is also possible to whitelist and blacklist licenses that are
+     specifically acceptable or not acceptable, using
+     <literal>whitelistedLicenses</literal> and
+     <literal>blacklistedLicenses</literal>, respectively.
+    </para>
+    <para>
+     The following example configuration whitelists the licenses
+     <literal>amd</literal> and <literal>wtfpl</literal>:
 <programlisting>
 {
   whitelistedLicenses = with stdenv.lib.licenses; [ amd wtfpl ];
 }
 </programlisting>
-      </para>
-
-      <para>The following example configuration blacklists the
-      <literal>gpl3</literal> and <literal>agpl3</literal> licenses:
-
+    </para>
+    <para>
+     The following example configuration blacklists the <literal>gpl3</literal>
+     and <literal>agpl3</literal> licenses:
 <programlisting>
 {
   blacklistedLicenses = with stdenv.lib.licenses; [ agpl3 gpl3 ];
 }
 </programlisting>
-      </para>
-    </listitem>
+    </para>
+   </listitem>
   </itemizedlist>
 
-  <para>A complete list of licenses can be found in the file
-  <filename>lib/licenses.nix</filename> of the nixpkgs tree.</para>
-</section>
+  <para>
+   A complete list of licenses can be found in the file
+   <filename>lib/licenses.nix</filename> of the nixpkgs tree.
+  </para>
+ </section>
+ <section xml:id="sec-allow-insecure">
+  <title>Installing insecure packages</title>
 
-
-<section xml:id="sec-allow-insecure">
-  <title>
-    Installing insecure packages
-  </title>
-
-  <para>There are several ways to tweak how Nix handles a package
-  which has been marked as insecure.</para>
+  <para>
+   There are several ways to tweak how Nix handles a package which has been
+   marked as insecure.
+  </para>
 
   <itemizedlist>
-    <listitem><para>
-      To temporarily allow all insecure packages, you can use an
-      environment variable for a single invocation of the nix tools:
-
-      <programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting>
-    </para></listitem>
-
-    <listitem><para>
-      It is possible to permanently allow individual insecure
-      packages, while still blocking other insecure packages by
-      default using the <literal>permittedInsecurePackages</literal>
-      configuration option in the user configuration file.</para>
-
-      <para>The following example configuration permits the
-      installation of the hypothetically insecure package
-      <literal>hello</literal>, version <literal>1.2.3</literal>:
+   <listitem>
+    <para>
+     To temporarily allow all insecure packages, you can use an environment
+     variable for a single invocation of the nix tools:
+<programlisting>$ export NIXPKGS_ALLOW_INSECURE=1</programlisting>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     It is possible to permanently allow individual insecure packages, while
+     still blocking other insecure packages by default using the
+     <literal>permittedInsecurePackages</literal> configuration option in the
+     user configuration file.
+    </para>
+    <para>
+     The following example configuration permits the installation of the
+     hypothetically insecure package <literal>hello</literal>, version
+     <literal>1.2.3</literal>:
 <programlisting>
 {
   permittedInsecurePackages = [
@@ -232,47 +251,44 @@ distributing the software.</para>
   ];
 }
 </programlisting>
-      </para>
-    </listitem>
-
-    <listitem><para>
-      It is also possible to create a custom policy around which
-      insecure packages to allow and deny, by overriding the
-      <literal>allowInsecurePredicate</literal> configuration
-      option.</para>
-
-      <para>The <literal>allowInsecurePredicate</literal> option is a
-      function which accepts a package and returns a boolean, much
-      like <literal>allowUnfreePredicate</literal>.</para>
-
-      <para>The following configuration example only allows insecure
-      packages with very short names:
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     It is also possible to create a custom policy around which insecure
+     packages to allow and deny, by overriding the
+     <literal>allowInsecurePredicate</literal> configuration option.
+    </para>
+    <para>
+     The <literal>allowInsecurePredicate</literal> option is a function which
+     accepts a package and returns a boolean, much like
+     <literal>allowUnfreePredicate</literal>.
+    </para>
+    <para>
+     The following configuration example only allows insecure packages with
+     very short names:
 <programlisting>
 {
   allowInsecurePredicate = (pkg: (builtins.stringLength (builtins.parseDrvName pkg.name).name) &lt;= 5);
 }
 </programlisting>
-      </para>
-
-      <para>Note that <literal>permittedInsecurePackages</literal> is
-      only checked if <literal>allowInsecurePredicate</literal> is not
-      specified.
-    </para></listitem>
+    </para>
+    <para>
+     Note that <literal>permittedInsecurePackages</literal> is only checked if
+     <literal>allowInsecurePredicate</literal> is not specified.
+    </para>
+   </listitem>
   </itemizedlist>
-</section>
-
+ </section>
 <!--============================================================-->
+ <section xml:id="sec-modify-via-packageOverrides">
+  <title>Modify packages via <literal>packageOverrides</literal></title>
 
-<section xml:id="sec-modify-via-packageOverrides"><title>Modify
-packages via <literal>packageOverrides</literal></title>
-
-<para>You can define a function called
-<varname>packageOverrides</varname> in your local
-<filename>~/.config/nixpkgs/config.nix</filename> to override nix packages.  It
-must be a function that takes pkgs as an argument and return modified
-set of packages.
-
+  <para>
+   You can define a function called <varname>packageOverrides</varname> in your
+   local <filename>~/.config/nixpkgs/config.nix</filename> to override nix
+   packages. It must be a function that takes pkgs as an argument and return
+   modified set of packages.
 <programlisting>
 {
   packageOverrides = pkgs: rec {
@@ -280,30 +296,27 @@ set of packages.
   };
 }
 </programlisting>
-
-</para>
-
-</section>
-
-<section xml:id="sec-declarative-package-management">
+  </para>
+ </section>
+ <section xml:id="sec-declarative-package-management">
   <title>Declarative Package Management</title>
 
   <section xml:id="sec-building-environment">
-    <title>Build an environment</title>
+   <title>Build an environment</title>
 
-    <para>
-      Using <literal>packageOverrides</literal>, it is possible to manage
-      packages declaratively. This means that we can list all of our desired
-      packages within a declarative Nix expression. For example, to have
-      <literal>aspell</literal>, <literal>bc</literal>,
-      <literal>ffmpeg</literal>, <literal>coreutils</literal>,
-      <literal>gdb</literal>, <literal>nixUnstable</literal>,
-      <literal>emscripten</literal>, <literal>jq</literal>,
-      <literal>nox</literal>, and <literal>silver-searcher</literal>, we could
-      use the following in <filename>~/.config/nixpkgs/config.nix</filename>:
-    </para>
+   <para>
+    Using <literal>packageOverrides</literal>, it is possible to manage
+    packages declaratively. This means that we can list all of our desired
+    packages within a declarative Nix expression. For example, to have
+    <literal>aspell</literal>, <literal>bc</literal>,
+    <literal>ffmpeg</literal>, <literal>coreutils</literal>,
+    <literal>gdb</literal>, <literal>nixUnstable</literal>,
+    <literal>emscripten</literal>, <literal>jq</literal>,
+    <literal>nox</literal>, and <literal>silver-searcher</literal>, we could
+    use the following in <filename>~/.config/nixpkgs/config.nix</filename>:
+   </para>
 
-    <screen>
+<screen>
 {
   packageOverrides = pkgs: with pkgs; {
     myPackages = pkgs.buildEnv {
@@ -314,17 +327,17 @@ set of packages.
 }
     </screen>
 
-    <para>
-      To install it into our environment, you can just run <literal>nix-env -iA
-      nixpkgs.myPackages</literal>. If you want to load the packages to be built
-      from a working copy of <literal>nixpkgs</literal> you just run
-      <literal>nix-env -f. -iA myPackages</literal>. To explore what's been
-      installed, just look through <filename>~/.nix-profile/</filename>. You can
-      see that a lot of stuff has been installed. Some of this stuff is useful
-      some of it isn't. Let's tell Nixpkgs to only link the stuff that we want:
-    </para>
+   <para>
+    To install it into our environment, you can just run <literal>nix-env -iA
+    nixpkgs.myPackages</literal>. If you want to load the packages to be built
+    from a working copy of <literal>nixpkgs</literal> you just run
+    <literal>nix-env -f. -iA myPackages</literal>. To explore what's been
+    installed, just look through <filename>~/.nix-profile/</filename>. You can
+    see that a lot of stuff has been installed. Some of this stuff is useful
+    some of it isn't. Let's tell Nixpkgs to only link the stuff that we want:
+   </para>
 
-    <screen>
+<screen>
 {
   packageOverrides = pkgs: with pkgs; {
     myPackages = pkgs.buildEnv {
@@ -336,31 +349,30 @@ set of packages.
 }
     </screen>
 
-    <para>
-      <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
-      which gets rid of the extra stuff in the profile.
-      <filename>/bin</filename> and <filename>/share</filename> are good
-      defaults for a user environment, getting rid of the clutter. If you are
-      running on Nix on MacOS, you may want to add another path as well,
-      <filename>/Applications</filename>, that makes GUI apps available.
-    </para>
-
+   <para>
+    <literal>pathsToLink</literal> tells Nixpkgs to only link the paths listed
+    which gets rid of the extra stuff in the profile. <filename>/bin</filename>
+    and <filename>/share</filename> are good defaults for a user environment,
+    getting rid of the clutter. If you are running on Nix on MacOS, you may
+    want to add another path as well, <filename>/Applications</filename>, that
+    makes GUI apps available.
+   </para>
   </section>
 
   <section xml:id="sec-getting-documentation">
-    <title>Getting documentation</title>
+   <title>Getting documentation</title>
 
-    <para>
-      After building that new environment, look through
-      <filename>~/.nix-profile</filename> to make sure everything is there that
-      we wanted. Discerning readers will note that some files are missing. Look
-      inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this.
-      There are no man pages for any of the Nix tools! This is because some
-      packages like Nix have multiple outputs for things like documentation (see
-      section 4). Let's make Nix install those as well.
-    </para>
+   <para>
+    After building that new environment, look through
+    <filename>~/.nix-profile</filename> to make sure everything is there that
+    we wanted. Discerning readers will note that some files are missing. Look
+    inside <filename>~/.nix-profile/share/man/man1/</filename> to verify this.
+    There are no man pages for any of the Nix tools! This is because some
+    packages like Nix have multiple outputs for things like documentation (see
+    section 4). Let's make Nix install those as well.
+   </para>
 
-    <screen>
+<screen>
 {
   packageOverrides = pkgs: with pkgs; {
     myPackages = pkgs.buildEnv {
@@ -373,14 +385,13 @@ set of packages.
 }
     </screen>
 
-    <para>
-      This provides us with some useful documentation for using our packages.
-      However, if we actually want those manpages to be detected by man, we need
-      to set up our environment. This can also be managed within Nix
-      expressions.
-    </para>
+   <para>
+    This provides us with some useful documentation for using our packages.
+    However, if we actually want those manpages to be detected by man, we need
+    to set up our environment. This can also be managed within Nix expressions.
+   </para>
 
-    <screen>
+<screen>
 {
   packageOverrides = pkgs: with pkgs; rec {
     myProfile = writeText "my-profile" ''
@@ -412,13 +423,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
 }
     </screen>
 
-    <para>
-      For this to work fully, you must also have this script sourced when you
-      are logged in. Try adding something like this to your
-      <filename>~/.profile</filename> file:
-    </para>
+   <para>
+    For this to work fully, you must also have this script sourced when you are
+    logged in. Try adding something like this to your
+    <filename>~/.profile</filename> file:
+   </para>
 
-    <screen>
+<screen>
 #!/bin/sh
 if [ -d $HOME/.nix-profile/etc/profile.d ]; then
   for i in $HOME/.nix-profile/etc/profile.d/*.sh; do
@@ -429,23 +440,22 @@ if [ -d $HOME/.nix-profile/etc/profile.d ]; then
 fi
     </screen>
 
-    <para>
-      Now just run <literal>source $HOME/.profile</literal> and you can starting
-      loading man pages from your environent.
-    </para>
-
+   <para>
+    Now just run <literal>source $HOME/.profile</literal> and you can starting
+    loading man pages from your environent.
+   </para>
   </section>
 
   <section xml:id="sec-gnu-info-setup">
-    <title>GNU info setup</title>
+   <title>GNU info setup</title>
 
-    <para>
-      Configuring GNU info is a little bit trickier than man pages. To work
-      correctly, info needs a database to be generated. This can be done with
-      some small modifications to our environment scripts.
-    </para>
+   <para>
+    Configuring GNU info is a little bit trickier than man pages. To work
+    correctly, info needs a database to be generated. This can be done with
+    some small modifications to our environment scripts.
+   </para>
 
-    <screen>
+<screen>
 {
   packageOverrides = pkgs: with pkgs; rec {
     myProfile = writeText "my-profile" ''
@@ -487,16 +497,13 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
 }
     </screen>
 
-    <para>
-      <literal>postBuild</literal> tells Nixpkgs to run a command after building
-      the environment. In this case, <literal>install-info</literal> adds the
-      installed info pages to <literal>dir</literal> which is GNU info's default
-      root node. Note that <literal>texinfoInteractive</literal> is added to the
-      environment to give the <literal>install-info</literal> command.
-    </para>
-
+   <para>
+    <literal>postBuild</literal> tells Nixpkgs to run a command after building
+    the environment. In this case, <literal>install-info</literal> adds the
+    installed info pages to <literal>dir</literal> which is GNU info's default
+    root node. Note that <literal>texinfoInteractive</literal> is added to the
+    environment to give the <literal>install-info</literal> command.
+   </para>
   </section>
-
-</section>
-
+ </section>
 </chapter>
diff --git a/doc/contributing.xml b/doc/contributing.xml
index 7aa0df271ff4..d28442b7a2c6 100644
--- a/doc/contributing.xml
+++ b/doc/contributing.xml
@@ -1,35 +1,35 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-contributing">
-
-<title>Contributing to this documentation</title>
-
-<para>The DocBook sources of the Nixpkgs manual are in the <filename
+ <title>Contributing to this documentation</title>
+ <para>
+  The DocBook sources of the Nixpkgs manual are in the
+  <filename
 xlink:href="https://github.com/NixOS/nixpkgs/tree/master/doc">doc</filename>
-subdirectory of the Nixpkgs repository.</para>
-
-<para>You can quickly check your edits with <command>make</command>:</para>
-
+  subdirectory of the Nixpkgs repository.
+ </para>
+ <para>
+  You can quickly check your edits with <command>make</command>:
+ </para>
 <screen>
   $ cd /path/to/nixpkgs/doc
   $ nix-shell
   [nix-shell]$ make
 </screen>
-
-<para>If you experience problems, run <command>make debug</command>
-to help understand the docbook errors.</para>
-
-<para>After making modifications to the manual, it's important to
-build it before committing. You can do that as follows:
-
+ <para>
+  If you experience problems, run <command>make debug</command> to help
+  understand the docbook errors.
+ </para>
+ <para>
+  After making modifications to the manual, it's important to build it before
+  committing. You can do that as follows:
 <screen>
   $ cd /path/to/nixpkgs/doc
   $ nix-shell
   [nix-shell]$ make clean
   [nix-shell]$ nix-build .
 </screen>
-
-If the build succeeds, the manual will be in
-<filename>./result/share/doc/nixpkgs/manual.html</filename>.</para>
-
+  If the build succeeds, the manual will be in
+  <filename>./result/share/doc/nixpkgs/manual.html</filename>.
+ </para>
 </chapter>
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index 0b2b85aeeef6..fe0e0d88d30e 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -1,308 +1,469 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-cross">
-
-<title>Cross-compilation</title>
-
-<section xml:id="sec-cross-intro">
+ <title>Cross-compilation</title>
+ <section xml:id="sec-cross-intro">
   <title>Introduction</title>
+
   <para>
-    "Cross-compilation" means compiling a program on one machine for another type of machine.
-    For example, a typical use of cross compilation is to compile programs for embedded devices.
-    These devices often don't have the computing power and memory to compile their own programs.
-    One might think that cross-compilation is a fairly niche concern, but there are advantages to being rigorous about distinguishing build-time vs run-time environments even when one is developing and deploying on the same machine.
-    Nixpkgs is increasingly adopting the opinion that packages should be written with cross-compilation in mind, and nixpkgs should evaluate in a similar way (by minimizing cross-compilation-specific special cases) whether or not one is cross-compiling.
+   "Cross-compilation" means compiling a program on one machine for another
+   type of machine. For example, a typical use of cross compilation is to
+   compile programs for embedded devices. These devices often don't have the
+   computing power and memory to compile their own programs. One might think
+   that cross-compilation is a fairly niche concern, but there are advantages
+   to being rigorous about distinguishing build-time vs run-time environments
+   even when one is developing and deploying on the same machine. Nixpkgs is
+   increasingly adopting the opinion that packages should be written with
+   cross-compilation in mind, and nixpkgs should evaluate in a similar way (by
+   minimizing cross-compilation-specific special cases) whether or not one is
+   cross-compiling.
   </para>
 
   <para>
-    This chapter will be organized in three parts.
-    First, it will describe the basics of how to package software in a way that supports cross-compilation.
-    Second, it will describe how to use Nixpkgs when cross-compiling.
-    Third, it will describe the internal infrastructure supporting cross-compilation.
+   This chapter will be organized in three parts. First, it will describe the
+   basics of how to package software in a way that supports cross-compilation.
+   Second, it will describe how to use Nixpkgs when cross-compiling. Third, it
+   will describe the internal infrastructure supporting cross-compilation.
   </para>
-</section>
-
+ </section>
 <!--============================================================-->
-
-<section xml:id="sec-cross-packaging">
+ <section xml:id="sec-cross-packaging">
   <title>Packaging in a cross-friendly manner</title>
 
   <section>
-    <title>Platform parameters</title>
-    <para>
-      Nixpkgs follows the <link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">common historical convention of GNU autoconf</link> of distinguishing between 3 types of platform: <wordasword>build</wordasword>, <wordasword>host</wordasword>, and <wordasword>target</wordasword>.
+   <title>Platform parameters</title>
 
-      In summary, <wordasword>build</wordasword> is the platform on which a package is being built, <wordasword>host</wordasword> is the platform on which it is to run. The third attribute, <wordasword>target</wordasword>, is relevant only for certain specific compilers and build tools.
-    </para>
+   <para>
+    Nixpkgs follows the
+    <link xlink:href="https://gcc.gnu.org/onlinedocs/gccint/Configure-Terms.html">common
+    historical convention of GNU autoconf</link> of distinguishing between 3
+    types of platform: <wordasword>build</wordasword>,
+    <wordasword>host</wordasword>, and <wordasword>target</wordasword>. In
+    summary, <wordasword>build</wordasword> is the platform on which a package
+    is being built, <wordasword>host</wordasword> is the platform on which it
+    is to run. The third attribute, <wordasword>target</wordasword>, is
+    relevant only for certain specific compilers and build tools.
+   </para>
 
-    <para>
-      In Nixpkgs, these three platforms are defined as attribute sets under the names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>, and <literal>targetPlatform</literal>.
-      All three are always defined as attributes in the standard environment, and at the top level. That means one can get at them just like a dependency in a function that is imported with <literal>callPackage</literal>:
-      <programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>, or just off <varname>stdenv</varname>:
-      <programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>.
-    </para>
-    <variablelist>
-      <varlistentry>
-        <term><varname>buildPlatform</varname></term>
-        <listitem><para>
-          The "build platform" is the platform on which a package is built.
-          Once someone has a built package, or pre-built binary package, the build platform should not matter and be safe to ignore.
-        </para></listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>hostPlatform</varname></term>
-        <listitem><para>
-          The "host platform" is the platform on which a package will be run.
-          This is the simplest platform to understand, but also the one with the worst name.
-        </para></listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>targetPlatform</varname></term>
-        <listitem>
-          <para>
-            The "target platform" attribute is, unlike the other two attributes, not actually fundamental to the process of building software.
-            Instead, it is only relevant for compatibility with building certain specific compilers and build tools.
-            It can be safely ignored for all other packages.
-          </para>
-          <para>
-            The build process of certain compilers is written in such a way that the compiler resulting from a single build can itself only produce binaries for a single platform.
-            The task specifying this single "target platform" is thus pushed to build time of the compiler.
-            The root cause of this mistake is often that the compiler (which will be run on the host) and the the standard library/runtime (which will be run on the target) are built by a single build process.
-          </para>
-          <para>
-            There is no fundamental need to think about a single target ahead of time like this.
-            If the tool supports modular or pluggable backends, both the need to specify the target at build time and the constraint of having only a single target disappear.
-            An example of such a tool is LLVM.
-          </para>
-          <para>
-            Although the existence of a "target platfom" is arguably a historical mistake, it is a common one: examples of tools that suffer from it are GCC, Binutils, GHC and Autoconf.
-            Nixpkgs tries to avoid sharing in the mistake where possible.
-            Still, because the concept of a target platform is so ingrained, it is best to support it as is.
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    <para>
-      The exact schema these fields follow is a bit ill-defined due to a long and convoluted evolution, but this is slowly being cleaned up.
-      You can see examples of ones used in practice in <literal>lib.systems.examples</literal>; note how they are not all very consistent.
-      For now, here are few fields can count on them containing:
-    </para>
-    <variablelist>
-      <varlistentry>
-        <term><varname>system</varname></term>
-        <listitem>
-          <para>
-            This is a two-component shorthand for the platform.
-            Examples of this would be "x86_64-darwin" and "i686-linux"; see <literal>lib.systems.doubles</literal> for more.
-            This format isn't very standard, but has built-in support in Nix, such as the <varname>builtins.currentSystem</varname> impure string.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>config</varname></term>
-        <listitem>
-          <para>
-            This is a 3- or 4- component shorthand for the platform.
-            Examples of this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
-            This is a standard format called the "LLVM target triple", as they are pioneered by LLVM and traditionally just used for the <varname>targetPlatform</varname>.
-            This format is strictly more informative than the "Nix host double", as the previous format could analogously be termed.
-            This needs a better name than <varname>config</varname>!
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>parsed</varname></term>
-        <listitem>
-          <para>
-            This is a nix representation of a parsed LLVM target triple with white-listed components.
-            This can be specified directly, or actually parsed from the <varname>config</varname>.
-            [Technically, only one need be specified and the others can be inferred, though the precision of inference may not be very good.]
-            See <literal>lib.systems.parse</literal> for the exact representation.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>libc</varname></term>
-        <listitem>
-          <para>
-            This is a string identifying the standard C library used.
-            Valid identifiers include "glibc" for GNU libc, "libSystem" for Darwin's Libsystem, and "uclibc" for µClibc.
-            It should probably be refactored to use the module system, like <varname>parse</varname>.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>is*</varname></term>
-        <listitem>
-          <para>
-            These predicates are defined in <literal>lib.systems.inspect</literal>, and slapped on every platform.
-            They are superior to the ones in <varname>stdenv</varname> as they force the user to be explicit about which platform they are inspecting.
-            Please use these instead of those.
-          </para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><varname>platform</varname></term>
-        <listitem>
-          <para>
-            This is, quite frankly, a dumping ground of ad-hoc settings (it's an attribute set).
-            See <literal>lib.systems.platforms</literal> for examples—there's hopefully one in there that will work verbatim for each platform that is working.
-            Please help us triage these flags and give them better homes!
-          </para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+   <para>
+    In Nixpkgs, these three platforms are defined as attribute sets under the
+    names <literal>buildPlatform</literal>, <literal>hostPlatform</literal>,
+    and <literal>targetPlatform</literal>. All three are always defined as
+    attributes in the standard environment, and at the top level. That means
+    one can get at them just like a dependency in a function that is imported
+    with <literal>callPackage</literal>:
+<programlisting>{ stdenv, buildPlatform, hostPlatform, fooDep, barDep, .. }: ...buildPlatform...</programlisting>
+    , or just off <varname>stdenv</varname>:
+<programlisting>{ stdenv, fooDep, barDep, .. }: ...stdenv.buildPlatform...</programlisting>
+    .
+   </para>
+
+   <variablelist>
+    <varlistentry>
+     <term><varname>buildPlatform</varname>
+     </term>
+     <listitem>
+      <para>
+       The "build platform" is the platform on which a package is built. Once
+       someone has a built package, or pre-built binary package, the build
+       platform should not matter and be safe to ignore.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>hostPlatform</varname>
+     </term>
+     <listitem>
+      <para>
+       The "host platform" is the platform on which a package will be run. This
+       is the simplest platform to understand, but also the one with the worst
+       name.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>targetPlatform</varname>
+     </term>
+     <listitem>
+      <para>
+       The "target platform" attribute is, unlike the other two attributes, not
+       actually fundamental to the process of building software. Instead, it is
+       only relevant for compatibility with building certain specific compilers
+       and build tools. It can be safely ignored for all other packages.
+      </para>
+      <para>
+       The build process of certain compilers is written in such a way that the
+       compiler resulting from a single build can itself only produce binaries
+       for a single platform. The task specifying this single "target platform"
+       is thus pushed to build time of the compiler. The root cause of this
+       mistake is often that the compiler (which will be run on the host) and
+       the the standard library/runtime (which will be run on the target) are
+       built by a single build process.
+      </para>
+      <para>
+       There is no fundamental need to think about a single target ahead of
+       time like this. If the tool supports modular or pluggable backends, both
+       the need to specify the target at build time and the constraint of
+       having only a single target disappear. An example of such a tool is
+       LLVM.
+      </para>
+      <para>
+       Although the existence of a "target platfom" is arguably a historical
+       mistake, it is a common one: examples of tools that suffer from it are
+       GCC, Binutils, GHC and Autoconf. Nixpkgs tries to avoid sharing in the
+       mistake where possible. Still, because the concept of a target platform
+       is so ingrained, it is best to support it as is.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+
+   <para>
+    The exact schema these fields follow is a bit ill-defined due to a long and
+    convoluted evolution, but this is slowly being cleaned up. You can see
+    examples of ones used in practice in
+    <literal>lib.systems.examples</literal>; note how they are not all very
+    consistent. For now, here are few fields can count on them containing:
+   </para>
+
+   <variablelist>
+    <varlistentry>
+     <term><varname>system</varname>
+     </term>
+     <listitem>
+      <para>
+       This is a two-component shorthand for the platform. Examples of this
+       would be "x86_64-darwin" and "i686-linux"; see
+       <literal>lib.systems.doubles</literal> for more. This format isn't very
+       standard, but has built-in support in Nix, such as the
+       <varname>builtins.currentSystem</varname> impure string.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>config</varname>
+     </term>
+     <listitem>
+      <para>
+       This is a 3- or 4- component shorthand for the platform. Examples of
+       this would be "x86_64-unknown-linux-gnu" and "aarch64-apple-darwin14".
+       This is a standard format called the "LLVM target triple", as they are
+       pioneered by LLVM and traditionally just used for the
+       <varname>targetPlatform</varname>. This format is strictly more
+       informative than the "Nix host double", as the previous format could
+       analogously be termed. This needs a better name than
+       <varname>config</varname>!
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>parsed</varname>
+     </term>
+     <listitem>
+      <para>
+       This is a nix representation of a parsed LLVM target triple with
+       white-listed components. This can be specified directly, or actually
+       parsed from the <varname>config</varname>. [Technically, only one need
+       be specified and the others can be inferred, though the precision of
+       inference may not be very good.] See
+       <literal>lib.systems.parse</literal> for the exact representation.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>libc</varname>
+     </term>
+     <listitem>
+      <para>
+       This is a string identifying the standard C library used. Valid
+       identifiers include "glibc" for GNU libc, "libSystem" for Darwin's
+       Libsystem, and "uclibc" for µClibc. It should probably be refactored to
+       use the module system, like <varname>parse</varname>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>is*</varname>
+     </term>
+     <listitem>
+      <para>
+       These predicates are defined in <literal>lib.systems.inspect</literal>,
+       and slapped on every platform. They are superior to the ones in
+       <varname>stdenv</varname> as they force the user to be explicit about
+       which platform they are inspecting. Please use these instead of those.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>platform</varname>
+     </term>
+     <listitem>
+      <para>
+       This is, quite frankly, a dumping ground of ad-hoc settings (it's an
+       attribute set). See <literal>lib.systems.platforms</literal> for
+       examples—there's hopefully one in there that will work verbatim for
+       each platform that is working. Please help us triage these flags and
+       give them better homes!
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
   </section>
 
   <section>
-    <title>Specifying Dependencies</title>
+   <title>Specifying Dependencies</title>
+
+   <para>
+    In this section we explore the relationship between both runtime and
+    buildtime dependencies and the 3 Autoconf platforms.
+   </para>
+
+   <para>
+    A runtime dependency between 2 packages implies that between them both the
+    host and target platforms match. This is directly implied by the meaning of
+    "host platform" and "runtime dependency": The package dependency exists
+    while both packages are running on a single host platform.
+   </para>
+
+   <para>
+    A build time dependency, however, implies a shift in platforms between the
+    depending package and the depended-on package. The meaning of a build time
+    dependency is that to build the depending package we need to be able to run
+    the depended-on's package. The depending package's build platform is
+    therefore equal to the depended-on package's host platform. Analogously,
+    the depending package's host platform is equal to the depended-on package's
+    target platform.
+   </para>
+
+   <para>
+    In this manner, given the 3 platforms for one package, we can determine the
+    three platforms for all its transitive dependencies. This is the most
+    important guiding principle behind cross-compilation with Nixpkgs, and will
+    be called the <wordasword>sliding window principle</wordasword>.
+   </para>
+
+   <para>
+    Some examples will probably make this clearer. If a package is being built
+    with a <literal>(build, host, target)</literal> platform triple of
+    <literal>(foo, bar, bar)</literal>, then its build-time dependencies would
+    have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those
+    packages'</emphasis> build-time dependencies would have triple of
+    <literal>(foo, foo, foo)</literal>. In other words, it should take two
+    "rounds" of following build-time dependency edges before one reaches a
+    fixed point where, by the sliding window principle, the platform triple no
+    longer changes. Indeed, this happens with cross compilation, where only
+    rounds of native dependencies starting with the second necessarily coincide
+    with native packages.
+   </para>
+
+   <note>
     <para>
-      In this section we explore the relationship between both runtime and buildtime dependencies and the 3 Autoconf platforms.
+     The depending package's target platform is unconstrained by the sliding
+     window principle, which makes sense in that one can in principle build
+     cross compilers targeting arbitrary platforms.
     </para>
+   </note>
+
+   <para>
+    How does this work in practice? Nixpkgs is now structured so that
+    build-time dependencies are taken from <varname>buildPackages</varname>,
+    whereas run-time dependencies are taken from the top level attribute set.
+    For example, <varname>buildPackages.gcc</varname> should be used at build
+    time, while <varname>gcc</varname> should be used at run time. Now, for
+    most of Nixpkgs's history, there was no <varname>buildPackages</varname>,
+    and most packages have not been refactored to use it explicitly. Instead,
+    one can use the six (<emphasis>gasp</emphasis>) attributes used for
+    specifying dependencies as documented in
+    <xref linkend="ssec-stdenv-dependencies"/>. We "splice" together the
+    run-time and build-time package sets with <varname>callPackage</varname>,
+    and then <varname>mkDerivation</varname> for each of four attributes pulls
+    the right derivation out. This splicing can be skipped when not cross
+    compiling as the package sets are the same, but is a bit slow for cross
+    compiling. Because of this, a best-of-both-worlds solution is in the works
+    with no splicing or explicit access of <varname>buildPackages</varname>
+    needed. For now, feel free to use either method.
+   </para>
+
+   <note>
     <para>
-      A runtime dependency between 2 packages implies that between them both the host and target platforms match.
-      This is directly implied by the meaning of "host platform" and "runtime dependency":
-      The package dependency exists while both packages are running on a single host platform.
+     There is also a "backlink" <varname>targetPackages</varname>, yielding a
+     package set whose <varname>buildPackages</varname> is the current package
+     set. This is a hack, though, to accommodate compilers with lousy build
+     systems. Please do not use this unless you are absolutely sure you are
+     packaging such a compiler and there is no other way.
     </para>
-    <para>
-      A build time dependency, however, implies a shift in platforms between the depending package and the depended-on package.
-      The meaning of a build time dependency is that to build the depending package we need to be able to run the depended-on's package.
-      The depending package's build platform is therefore equal to the depended-on package's host platform.
-      Analogously, the depending package's host platform is equal to the depended-on package's target platform.
-    </para>
-    <para>
-      In this manner, given the 3 platforms for one package, we can determine the three platforms for all its transitive dependencies.
-      This is the most important guiding principle behind cross-compilation with Nixpkgs, and will be called the <wordasword>sliding window principle</wordasword>.
-    </para>
-    <para>
-      Some examples will probably make this clearer.
-      If a package is being built with a <literal>(build, host, target)</literal> platform triple of <literal>(foo, bar, bar)</literal>, then its build-time dependencies would have a triple of <literal>(foo, foo, bar)</literal>, and <emphasis>those packages'</emphasis> build-time dependencies would have triple of <literal>(foo, foo, foo)</literal>.
-      In other words, it should take two "rounds" of following build-time dependency edges before one reaches a fixed point where, by the sliding window principle, the platform triple no longer changes.
-      Indeed, this happens with cross compilation, where only rounds of native dependencies starting with the second necessarily coincide with native packages.
-    </para>
-    <note><para>
-      The depending package's target platform is unconstrained by the sliding window principle, which makes sense in that one can in principle build cross compilers targeting arbitrary platforms.
-    </para></note>
-    <para>
-      How does this work in practice? Nixpkgs is now structured so that build-time dependencies are taken from <varname>buildPackages</varname>, whereas run-time dependencies are taken from the top level attribute set.
-      For example, <varname>buildPackages.gcc</varname> should be used at build time, while <varname>gcc</varname> should be used at run time.
-      Now, for most of Nixpkgs's history, there was no <varname>buildPackages</varname>, and most packages have not been refactored to use it explicitly.
-      Instead, one can use the six (<emphasis>gasp</emphasis>) attributes used for specifying dependencies as documented in <xref linkend="ssec-stdenv-dependencies"/>.
-      We "splice" together the run-time and build-time package sets with <varname>callPackage</varname>, and then <varname>mkDerivation</varname> for each of four attributes pulls the right derivation out.
-      This splicing can be skipped when not cross compiling as the package sets are the same, but is a bit slow for cross compiling.
-      Because of this, a best-of-both-worlds solution is in the works with no splicing or explicit access of <varname>buildPackages</varname> needed.
-      For now, feel free to use either method.
-    </para>
-    <note><para>
-      There is also a "backlink" <varname>targetPackages</varname>, yielding a package set whose <varname>buildPackages</varname> is the current package set.
-      This is a hack, though, to accommodate compilers with lousy build systems.
-      Please do not use this unless you are absolutely sure you are packaging such a compiler and there is no other way.
-    </para></note>
+   </note>
   </section>
 
   <section>
-    <title>Cross packagaing cookbook</title>
-    <para>
-      Some frequently problems when packaging for cross compilation are good to just spell and answer.
-      Ideally the information above is exhaustive, so this section cannot provide any new information,
-      but its ludicrous and cruel to expect everyone to spend effort working through the interaction of many features just to figure out the same answer to the same common problem.
-      Feel free to add to this list!
-    </para>
-    <qandaset>
-      <qandaentry>
-        <question><para>
-          What if my package's build system needs to build a C program to be run under the build environment?
-        </para></question>
-        <answer><para>
-          <programlisting>depsBuildBuild = [ buildPackages.stdenv.cc ];</programlisting>
-          Add it to your <function>mkDerivation</function> invocation.
-        </para></answer>
-      </qandaentry>
-      <qandaentry>
-        <question><para>
-          My package fails to find <command>ar</command>.
-        </para></question>
-        <answer><para>
-          Many packages assume that an unprefixed <command>ar</command> is available, but Nix doesn't provide one.
-          It only provides a prefixed one, just as it only does for all the other binutils programs.
-          It may be necessary to patch the package to fix the build system to use a prefixed `ar`.
-        </para></answer>
-      </qandaentry>
-      <qandaentry>
-        <question><para>
-          My package's testsuite needs to run host platform code.
-        </para></question>
-        <answer><para>
-          <programlisting>doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;</programlisting>
-          Add it to your <function>mkDerivation</function> invocation.
-        </para></answer>
-      </qandaentry>
-    </qandaset>
-  </section>
-</section>
+   <title>Cross packagaing cookbook</title>
 
+   <para>
+    Some frequently problems when packaging for cross compilation are good to
+    just spell and answer. Ideally the information above is exhaustive, so this
+    section cannot provide any new information, but its ludicrous and cruel to
+    expect everyone to spend effort working through the interaction of many
+    features just to figure out the same answer to the same common problem.
+    Feel free to add to this list!
+   </para>
+
+   <qandaset>
+    <qandaentry>
+     <question>
+      <para>
+       What if my package's build system needs to build a C program to be run
+       under the build environment?
+      </para>
+     </question>
+     <answer>
+      <para>
+<programlisting>depsBuildBuild = [ buildPackages.stdenv.cc ];</programlisting>
+       Add it to your <function>mkDerivation</function> invocation.
+      </para>
+     </answer>
+    </qandaentry>
+    <qandaentry>
+     <question>
+      <para>
+       My package fails to find <command>ar</command>.
+      </para>
+     </question>
+     <answer>
+      <para>
+       Many packages assume that an unprefixed <command>ar</command> is
+       available, but Nix doesn't provide one. It only provides a prefixed one,
+       just as it only does for all the other binutils programs. It may be
+       necessary to patch the package to fix the build system to use a prefixed
+       `ar`.
+      </para>
+     </answer>
+    </qandaentry>
+    <qandaentry>
+     <question>
+      <para>
+       My package's testsuite needs to run host platform code.
+      </para>
+     </question>
+     <answer>
+      <para>
+<programlisting>doCheck = stdenv.hostPlatform != stdenv.buildPlatfrom;</programlisting>
+       Add it to your <function>mkDerivation</function> invocation.
+      </para>
+     </answer>
+    </qandaentry>
+   </qandaset>
+  </section>
+ </section>
 <!--============================================================-->
-
-<section xml:id="sec-cross-usage">
+ <section xml:id="sec-cross-usage">
   <title>Cross-building packages</title>
-  <note><para>
-    More information needs to moved from the old wiki, especially <link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this section.
-  </para></note>
+
+  <note>
+   <para>
+    More information needs to moved from the old wiki, especially
+    <link xlink:href="https://nixos.org/wiki/CrossCompiling" />, for this
+    section.
+   </para>
+  </note>
+
   <para>
-    Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in which case there is no cross compiling and everything is built by and for that system,
-    or also with <varname>crossSystem</varname>, in which case packages run on the latter, but all building happens on the former.
-    Both parameters take the same schema as the 3 (build, host, and target) platforms defined in the previous section.
-    As mentioned above, <literal>lib.systems.examples</literal> has some platforms which are used as arguments for these parameters in practice.
-    You can use them programmatically, or on the command line: <programlisting>
+   Nixpkgs can be instantiated with <varname>localSystem</varname> alone, in
+   which case there is no cross compiling and everything is built by and for
+   that system, or also with <varname>crossSystem</varname>, in which case
+   packages run on the latter, but all building happens on the former. Both
+   parameters take the same schema as the 3 (build, host, and target) platforms
+   defined in the previous section. As mentioned above,
+   <literal>lib.systems.examples</literal> has some platforms which are used as
+   arguments for these parameters in practice. You can use them
+   programmatically, or on the command line:
+<programlisting>
 nix-build &lt;nixpkgs&gt; --arg crossSystem '(import &lt;nixpkgs/lib&gt;).systems.examples.fooBarBaz' -A whatever</programlisting>
   </para>
+
   <note>
-    <para>
-      Eventually we would like to make these platform examples an unnecessary convenience so that <programlisting>
+   <para>
+    Eventually we would like to make these platform examples an unnecessary
+    convenience so that
+<programlisting>
 nix-build &lt;nixpkgs&gt; --arg crossSystem.config '&lt;arch&gt;-&lt;os&gt;-&lt;vendor&gt;-&lt;abi&gt;' -A whatever</programlisting>
-      works in the vast majority of cases.
-      The problem today is dependencies on other sorts of configuration which aren't given proper defaults.
-      We rely on the examples to crudely to set those configuration parameters in some vaguely sane manner on the users behalf.
-      Issue <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link> tracks this inconvenience along with its root cause in crufty configuration options.
-    </para>
+    works in the vast majority of cases. The problem today is dependencies on
+    other sorts of configuration which aren't given proper defaults. We rely on
+    the examples to crudely to set those configuration parameters in some
+    vaguely sane manner on the users behalf. Issue
+    <link xlink:href="https://github.com/NixOS/nixpkgs/issues/34274">#34274</link>
+    tracks this inconvenience along with its root cause in crufty configuration
+    options.
+   </para>
   </note>
+
   <para>
-    While one is free to pass both parameters in full, there's a lot of logic to fill in missing fields.
-    As discussed in the previous section, only one of <varname>system</varname>, <varname>config</varname>, and <varname>parsed</varname> is needed to infer the other two.
-    Additionally, <varname>libc</varname> will be inferred from <varname>parse</varname>.
-    Finally, <literal>localSystem.system</literal> is also <emphasis>impurely</emphasis> inferred based on the platform evaluation occurs.
-    This means it is often not necessary to pass <varname>localSystem</varname> at all, as in the command-line example in the previous paragraph.
+   While one is free to pass both parameters in full, there's a lot of logic to
+   fill in missing fields. As discussed in the previous section, only one of
+   <varname>system</varname>, <varname>config</varname>, and
+   <varname>parsed</varname> is needed to infer the other two. Additionally,
+   <varname>libc</varname> will be inferred from <varname>parse</varname>.
+   Finally, <literal>localSystem.system</literal> is also
+   <emphasis>impurely</emphasis> inferred based on the platform evaluation
+   occurs. This means it is often not necessary to pass
+   <varname>localSystem</varname> at all, as in the command-line example in the
+   previous paragraph.
   </para>
+
   <note>
-    <para>
-      Many sources (manual, wiki, etc) probably mention passing <varname>system</varname>, <varname>platform</varname>, along with the optional <varname>crossSystem</varname> to nixpkgs:
-      <literal>import &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..; }</literal>.
-      Passing those two instead of <varname>localSystem</varname> is still supported for compatibility, but is discouraged.
-      Indeed, much of the inference we do for these parameters is motivated by compatibility as much as convenience.
-    </para>
+   <para>
+    Many sources (manual, wiki, etc) probably mention passing
+    <varname>system</varname>, <varname>platform</varname>, along with the
+    optional <varname>crossSystem</varname> to nixpkgs: <literal>import
+    &lt;nixpkgs&gt; { system = ..; platform = ..; crossSystem = ..;
+    }</literal>. Passing those two instead of <varname>localSystem</varname> is
+    still supported for compatibility, but is discouraged. Indeed, much of the
+    inference we do for these parameters is motivated by compatibility as much
+    as convenience.
+   </para>
   </note>
+
   <para>
-    One would think that <varname>localSystem</varname> and <varname>crossSystem</varname> overlap horribly with the three <varname>*Platforms</varname> (<varname>buildPlatform</varname>, <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see <varname>stage.nix</varname> or the manual).
-    Actually, those identifiers are purposefully not used here to draw a subtle but important distinction:
-    While the granularity of having 3 platforms is necessary to properly *build* packages, it is overkill for specifying the user's *intent* when making a build plan or package set.
-    A simple "build vs deploy" dichotomy is adequate: the sliding window principle described in the previous section shows how to interpolate between the these two "end points" to get the 3 platform triple for each bootstrapping stage.
-    That means for any package a given package set, even those not bound on the top level but only reachable via dependencies or <varname>buildPackages</varname>, the three platforms will be defined as one of <varname>localSystem</varname> or <varname>crossSystem</varname>, with the former replacing the latter as one traverses build-time dependencies.
-    A last simple difference then is <varname>crossSystem</varname> should be null when one doesn't want to cross-compile, while the <varname>*Platform</varname>s are always non-null.
-    <varname>localSystem</varname> is always non-null.
+   One would think that <varname>localSystem</varname> and
+   <varname>crossSystem</varname> overlap horribly with the three
+   <varname>*Platforms</varname> (<varname>buildPlatform</varname>,
+   <varname>hostPlatform,</varname> and <varname>targetPlatform</varname>; see
+   <varname>stage.nix</varname> or the manual). Actually, those identifiers are
+   purposefully not used here to draw a subtle but important distinction: While
+   the granularity of having 3 platforms is necessary to properly *build*
+   packages, it is overkill for specifying the user's *intent* when making a
+   build plan or package set. A simple "build vs deploy" dichotomy is adequate:
+   the sliding window principle described in the previous section shows how to
+   interpolate between the these two "end points" to get the 3 platform triple
+   for each bootstrapping stage. That means for any package a given package
+   set, even those not bound on the top level but only reachable via
+   dependencies or <varname>buildPackages</varname>, the three platforms will
+   be defined as one of <varname>localSystem</varname> or
+   <varname>crossSystem</varname>, with the former replacing the latter as one
+   traverses build-time dependencies. A last simple difference then is
+   <varname>crossSystem</varname> should be null when one doesn't want to
+   cross-compile, while the <varname>*Platform</varname>s are always non-null.
+   <varname>localSystem</varname> is always non-null.
   </para>
-</section>
-
+ </section>
 <!--============================================================-->
-
-<section xml:id="sec-cross-infra">
+ <section xml:id="sec-cross-infra">
   <title>Cross-compilation infrastructure</title>
-  <para>To be written.</para>
-  <note><para>
-    If one explores nixpkgs, they will see derivations with names like <literal>gccCross</literal>.
-    Such <literal>*Cross</literal> derivations is a holdover from before we properly distinguished between the host and target platforms
-    —the derivation with "Cross" in the name covered the <literal>build = host != target</literal> case, while the other covered the <literal>host = target</literal>, with build platform the same or not based on whether one was using its <literal>.nativeDrv</literal> or <literal>.crossDrv</literal>.
-    This ugliness will disappear soon.
-  </para></note>
-</section>
 
+  <para>
+   To be written.
+  </para>
+
+  <note>
+   <para>
+    If one explores nixpkgs, they will see derivations with names like
+    <literal>gccCross</literal>. Such <literal>*Cross</literal> derivations is
+    a holdover from before we properly distinguished between the host and
+    target platforms —the derivation with "Cross" in the name covered the
+    <literal>build = host != target</literal> case, while the other covered the
+    <literal>host = target</literal>, with build platform the same or not based
+    on whether one was using its <literal>.nativeDrv</literal> or
+    <literal>.crossDrv</literal>. This ugliness will disappear soon.
+   </para>
+  </note>
+ </section>
 </chapter>
diff --git a/doc/functions.xml b/doc/functions.xml
index b2e450972947..155ea2bd0043 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -1,144 +1,139 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
 	 xmlns:xlink="http://www.w3.org/1999/xlink"
 	 xml:id="chap-functions">
-
-<title>Functions reference</title>
-
-<para>
-  The nixpkgs repository has several utility functions to manipulate Nix expressions.
-</para>
-
-<section xml:id="sec-overrides">
+ <title>Functions reference</title>
+ <para>
+  The nixpkgs repository has several utility functions to manipulate Nix
+  expressions.
+ </para>
+ <section xml:id="sec-overrides">
   <title>Overriding</title>
 
   <para>
-    Sometimes one wants to override parts of
-    <literal>nixpkgs</literal>, e.g. derivation attributes, the results of
-    derivations or even the whole package set.
+   Sometimes one wants to override parts of <literal>nixpkgs</literal>, e.g.
+   derivation attributes, the results of derivations or even the whole package
+   set.
   </para>
 
   <section xml:id="sec-pkg-override">
-    <title>&lt;pkg&gt;.override</title>
+   <title>&lt;pkg&gt;.override</title>
 
-    <para>
-      The function <varname>override</varname> is usually available for all the
-      derivations in the nixpkgs expression (<varname>pkgs</varname>).
-    </para>
-    <para>
-      It is used to override the arguments passed to a function.
-    </para>
-    <para>
-      Example usages:
+   <para>
+    The function <varname>override</varname> is usually available for all the
+    derivations in the nixpkgs expression (<varname>pkgs</varname>).
+   </para>
 
-      <programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
-      <programlisting>import pkgs.path { overlays = [ (self: super: {
+   <para>
+    It is used to override the arguments passed to a function.
+   </para>
+
+   <para>
+    Example usages:
+<programlisting>pkgs.foo.override { arg1 = val1; arg2 = val2; ... }</programlisting>
+<programlisting>import pkgs.path { overlays = [ (self: super: {
     foo = super.foo.override { barSupport = true ; };
   })]};</programlisting>
-      <programlisting>mypkg = pkgs.callPackage ./mypkg.nix {
+<programlisting>mypkg = pkgs.callPackage ./mypkg.nix {
     mydep = pkgs.mydep.override { ... };
   }</programlisting>
-    </para>
-
-    <para>
-      In the first example, <varname>pkgs.foo</varname> is the result of a function call
-      with some default arguments, usually a derivation.
-      Using <varname>pkgs.foo.override</varname> will call the same function with
-      the given new arguments.
-    </para>
+   </para>
 
+   <para>
+    In the first example, <varname>pkgs.foo</varname> is the result of a
+    function call with some default arguments, usually a derivation. Using
+    <varname>pkgs.foo.override</varname> will call the same function with the
+    given new arguments.
+   </para>
   </section>
 
   <section xml:id="sec-pkg-overrideAttrs">
-    <title>&lt;pkg&gt;.overrideAttrs</title>
+   <title>&lt;pkg&gt;.overrideAttrs</title>
 
-    <para>
-      The function <varname>overrideAttrs</varname> allows overriding the
-      attribute set passed to a <varname>stdenv.mkDerivation</varname> call,
-      producing a new derivation based on the original one.
-      This function is available on all derivations produced by the
-      <varname>stdenv.mkDerivation</varname> function, which is most packages
-      in the nixpkgs expression <varname>pkgs</varname>.
-    </para>
+   <para>
+    The function <varname>overrideAttrs</varname> allows overriding the
+    attribute set passed to a <varname>stdenv.mkDerivation</varname> call,
+    producing a new derivation based on the original one. This function is
+    available on all derivations produced by the
+    <varname>stdenv.mkDerivation</varname> function, which is most packages in
+    the nixpkgs expression <varname>pkgs</varname>.
+   </para>
 
-    <para>
-      Example usage:
-
-      <programlisting>helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
+   <para>
+    Example usage:
+<programlisting>helloWithDebug = pkgs.hello.overrideAttrs (oldAttrs: rec {
     separateDebugInfo = true;
   });</programlisting>
-    </para>
+   </para>
 
+   <para>
+    In the above example, the <varname>separateDebugInfo</varname> attribute is
+    overridden to be true, thus building debug info for
+    <varname>helloWithDebug</varname>, while all other attributes will be
+    retained from the original <varname>hello</varname> package.
+   </para>
+
+   <para>
+    The argument <varname>oldAttrs</varname> is conventionally used to refer to
+    the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
+   </para>
+
+   <note>
     <para>
-      In the above example, the <varname>separateDebugInfo</varname> attribute is
-      overridden to be true, thus building debug info for
-      <varname>helloWithDebug</varname>, while all other attributes will be
-      retained from the original <varname>hello</varname> package.
+     Note that <varname>separateDebugInfo</varname> is processed only by the
+     <varname>stdenv.mkDerivation</varname> function, not the generated, raw
+     Nix derivation. Thus, using <varname>overrideDerivation</varname> will not
+     work in this case, as it overrides only the attributes of the final
+     derivation. It is for this reason that <varname>overrideAttrs</varname>
+     should be preferred in (almost) all cases to
+     <varname>overrideDerivation</varname>, i.e. to allow using
+     <varname>sdenv.mkDerivation</varname> to process input arguments, as well
+     as the fact that it is easier to use (you can use the same attribute names
+     you see in your Nix code, instead of the ones generated (e.g.
+     <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>,
+     and involves less typing.
     </para>
-
-    <para>
-      The argument <varname>oldAttrs</varname> is conventionally used to refer to
-      the attr set originally passed to <varname>stdenv.mkDerivation</varname>.
-    </para>
-
-    <note>
-      <para>
-        Note that <varname>separateDebugInfo</varname> is processed only by the
-        <varname>stdenv.mkDerivation</varname> function, not the generated, raw
-        Nix derivation. Thus, using <varname>overrideDerivation</varname> will
-        not work in this case, as it overrides only the attributes of the final
-        derivation. It is for this reason that <varname>overrideAttrs</varname>
-        should be preferred in (almost) all cases to
-        <varname>overrideDerivation</varname>, i.e. to allow using
-        <varname>sdenv.mkDerivation</varname> to process input arguments, as well
-        as the fact that it is easier to use (you can use the same attribute
-        names you see in your Nix code, instead of the ones generated (e.g.
-        <varname>buildInputs</varname> vs <varname>nativeBuildInputs</varname>,
-        and involves less typing.
-      </para>
-    </note>
-
+   </note>
   </section>
 
-
   <section xml:id="sec-pkg-overrideDerivation">
-    <title>&lt;pkg&gt;.overrideDerivation</title>
-
-    <warning>
-      <para>You should prefer <varname>overrideAttrs</varname> in almost all
-      cases, see its documentation for the reasons why.
-      <varname>overrideDerivation</varname> is not deprecated and will continue
-      to work, but is less nice to use and does not have as many abilities as
-      <varname>overrideAttrs</varname>.
-      </para>
-    </warning>
-
-    <warning>
-      <para>Do not use this function in Nixpkgs as it evaluates a Derivation
-      before modifying it, which breaks package abstraction and removes
-      error-checking of function arguments. In addition, this
-      evaluation-per-function application incurs a performance penalty,
-      which can become a problem if many overrides are used.
-      It is only intended for ad-hoc customisation, such as in
-      <filename>~/.config/nixpkgs/config.nix</filename>.
-    </para>
-    </warning>
+   <title>&lt;pkg&gt;.overrideDerivation</title>
 
+   <warning>
     <para>
-      The function <varname>overrideDerivation</varname> creates a new derivation
-      based on an existing one by overriding the original's attributes with
-      the attribute set produced by the specified function.
-      This function is available on all
-      derivations defined using the <varname>makeOverridable</varname> function.
-      Most standard derivation-producing functions, such as
-      <varname>stdenv.mkDerivation</varname>, are defined using this
-      function, which means most packages in the nixpkgs expression,
-      <varname>pkgs</varname>, have this function.
+     You should prefer <varname>overrideAttrs</varname> in almost all cases,
+     see its documentation for the reasons why.
+     <varname>overrideDerivation</varname> is not deprecated and will continue
+     to work, but is less nice to use and does not have as many abilities as
+     <varname>overrideAttrs</varname>.
     </para>
+   </warning>
 
+   <warning>
     <para>
-      Example usage:
+     Do not use this function in Nixpkgs as it evaluates a Derivation before
+     modifying it, which breaks package abstraction and removes error-checking
+     of function arguments. In addition, this evaluation-per-function
+     application incurs a performance penalty, which can become a problem if
+     many overrides are used. It is only intended for ad-hoc customisation,
+     such as in <filename>~/.config/nixpkgs/config.nix</filename>.
+    </para>
+   </warning>
 
-      <programlisting>mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
+   <para>
+    The function <varname>overrideDerivation</varname> creates a new derivation
+    based on an existing one by overriding the original's attributes with the
+    attribute set produced by the specified function. This function is
+    available on all derivations defined using the
+    <varname>makeOverridable</varname> function. Most standard
+    derivation-producing functions, such as
+    <varname>stdenv.mkDerivation</varname>, are defined using this function,
+    which means most packages in the nixpkgs expression,
+    <varname>pkgs</varname>, have this function.
+   </para>
+
+   <para>
+    Example usage:
+<programlisting>mySed = pkgs.gnused.overrideDerivation (oldAttrs: {
     name = "sed-4.2.2-pre";
     src = fetchurl {
       url = ftp://alpha.gnu.org/gnu/sed/sed-4.2.2-pre.tar.bz2;
@@ -146,98 +141,90 @@
     };
     patches = [];
   });</programlisting>
-    </para>
+   </para>
 
+   <para>
+    In the above example, the <varname>name</varname>, <varname>src</varname>,
+    and <varname>patches</varname> of the derivation will be overridden, while
+    all other attributes will be retained from the original derivation.
+   </para>
+
+   <para>
+    The argument <varname>oldAttrs</varname> is used to refer to the attribute
+    set of the original derivation.
+   </para>
+
+   <note>
     <para>
-      In the above example, the <varname>name</varname>, <varname>src</varname>,
-      and <varname>patches</varname> of the derivation will be overridden, while
-      all other attributes will be retained from the original derivation.
+     A package's attributes are evaluated *before* being modified by the
+     <varname>overrideDerivation</varname> function. For example, the
+     <varname>name</varname> attribute reference in <varname>url =
+     "mirror://gnu/hello/${name}.tar.gz";</varname> is filled-in *before* the
+     <varname>overrideDerivation</varname> function modifies the attribute set.
+     This means that overriding the <varname>name</varname> attribute, in this
+     example, *will not* change the value of the <varname>url</varname>
+     attribute. Instead, we need to override both the <varname>name</varname>
+     *and* <varname>url</varname> attributes.
     </para>
-
-    <para>
-      The argument <varname>oldAttrs</varname> is used to refer to the attribute set of
-      the original derivation.
-    </para>
-
-    <note>
-      <para>
-        A package's attributes are evaluated *before* being modified by
-        the <varname>overrideDerivation</varname> function.
-        For example, the <varname>name</varname> attribute reference
-        in <varname>url = "mirror://gnu/hello/${name}.tar.gz";</varname>
-        is filled-in *before* the <varname>overrideDerivation</varname> function
-        modifies the attribute set. This means that overriding the
-        <varname>name</varname> attribute, in this example, *will not* change the
-        value of the <varname>url</varname> attribute. Instead, we need to override
-        both the <varname>name</varname> *and* <varname>url</varname> attributes.
-      </para>
-    </note>
-
+   </note>
   </section>
 
   <section xml:id="sec-lib-makeOverridable">
-    <title>lib.makeOverridable</title>
+   <title>lib.makeOverridable</title>
 
-    <para>
-      The function <varname>lib.makeOverridable</varname> is used to make the result
-      of a function easily customizable. This utility only makes sense for functions
-      that accept an argument set and return an attribute set.
-    </para>
+   <para>
+    The function <varname>lib.makeOverridable</varname> is used to make the
+    result of a function easily customizable. This utility only makes sense for
+    functions that accept an argument set and return an attribute set.
+   </para>
 
-    <para>
-      Example usage:
-
-      <programlisting>f = { a, b }: { result = a+b; }
+   <para>
+    Example usage:
+<programlisting>f = { a, b }: { result = a+b; }
   c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
+   </para>
 
-    </para>
-
-    <para>
-      The variable <varname>c</varname> is the value of the <varname>f</varname> function
-      applied with some default arguments. Hence the value of <varname>c.result</varname>
-      is <literal>3</literal>, in this example.
-    </para>
-
-    <para>
-      The variable <varname>c</varname> however also has some additional functions, like
-      <link linkend="sec-pkg-override">c.override</link> which can be used to
-      override the default arguments. In this example the value of
-      <varname>(c.override { a = 4; }).result</varname> is 6.
-    </para>
+   <para>
+    The variable <varname>c</varname> is the value of the <varname>f</varname>
+    function applied with some default arguments. Hence the value of
+    <varname>c.result</varname> is <literal>3</literal>, in this example.
+   </para>
 
+   <para>
+    The variable <varname>c</varname> however also has some additional
+    functions, like <link linkend="sec-pkg-override">c.override</link> which
+    can be used to override the default arguments. In this example the value of
+    <varname>(c.override { a = 4; }).result</varname> is 6.
+   </para>
   </section>
-
-</section>
-
-<section xml:id="sec-generators">
+ </section>
+ <section xml:id="sec-generators">
   <title>Generators</title>
 
   <para>
-    Generators are functions that create file formats from nix
-    data structures, e. g. for configuration files.
-    There are generators available for: <literal>INI</literal>,
-    <literal>JSON</literal> and <literal>YAML</literal>
+   Generators are functions that create file formats from nix data structures,
+   e. g. for configuration files. There are generators available for:
+   <literal>INI</literal>, <literal>JSON</literal> and <literal>YAML</literal>
   </para>
 
   <para>
-    All generators follow a similar call interface: <code>generatorName
-    configFunctions data</code>, where <literal>configFunctions</literal> is
-    an attrset of user-defined functions that format nested parts of the
-    content.
-    They each have common defaults, so often they do not need to be set
-    manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]"
-    ] name)</code> from the <literal>INI</literal> generator. It receives the
-    name of a section and sanitizes it. The default
-    <literal>mkSectionName</literal> escapes <literal>[</literal> and
-    <literal>]</literal> with a backslash.
+   All generators follow a similar call interface: <code>generatorName
+   configFunctions data</code>, where <literal>configFunctions</literal> is an
+   attrset of user-defined functions that format nested parts of the content.
+   They each have common defaults, so often they do not need to be set
+   manually. An example is <code>mkSectionName ? (name: libStr.escape [ "[" "]"
+   ] name)</code> from the <literal>INI</literal> generator. It receives the
+   name of a section and sanitizes it. The default
+   <literal>mkSectionName</literal> escapes <literal>[</literal> and
+   <literal>]</literal> with a backslash.
   </para>
 
   <para>
-    Generators can be fine-tuned to produce exactly the file format required
-    by your application/service. One example is an INI-file format which uses
-    <literal>: </literal> as separator, the strings
-    <literal>"yes"</literal>/<literal>"no"</literal> as boolean values
-    and requires all string values to be quoted:
+   Generators can be fine-tuned to produce exactly the file format required by
+   your application/service. One example is an INI-file format which uses
+   <literal>: </literal> as separator, the strings
+   <literal>"yes"</literal>/<literal>"no"</literal> as boolean values and
+   requires all string values to be quoted:
   </para>
 
 <programlisting>
@@ -270,7 +257,9 @@ in customToINI {
 }
 </programlisting>
 
-  <para>This will produce the following INI file as nix string:</para>
+  <para>
+   This will produce the following INI file as nix string:
+  </para>
 
 <programlisting>
 [main]
@@ -284,111 +273,138 @@ str\:ange:"very::strange"
 merge:"diff3"
 </programlisting>
 
-  <note><para>Nix store paths can be converted to strings by enclosing a
-  derivation attribute like so: <code>"${drv}"</code>.</para></note>
+  <note>
+   <para>
+    Nix store paths can be converted to strings by enclosing a derivation
+    attribute like so: <code>"${drv}"</code>.
+   </para>
+  </note>
 
   <para>
-    Detailed documentation for each generator can be found in
-    <literal>lib/generators.nix</literal>.
+   Detailed documentation for each generator can be found in
+   <literal>lib/generators.nix</literal>.
   </para>
-
-</section>
-
-<section xml:id="sec-debug">
+ </section>
+ <section xml:id="sec-debug">
   <title>Debugging Nix Expressions</title>
 
-  <para>Nix is a unityped, dynamic language, this means every value can
-  potentially appear anywhere. Since it is also non-strict, evaluation order
-  and what ultimately is evaluated might surprise you. Therefore it is important
-  to be able to debug nix expressions.</para>
+  <para>
+   Nix is a unityped, dynamic language, this means every value can potentially
+   appear anywhere. Since it is also non-strict, evaluation order and what
+   ultimately is evaluated might surprise you. Therefore it is important to be
+   able to debug nix expressions.
+  </para>
 
-
-  <para>In the <literal>lib/debug.nix</literal> file you will find a number of
-  functions that help (pretty-)printing values while evaluation is runnnig. You
-  can even specify how deep these values should be printed recursively, and
-  transform them on the fly. Please consult the docstrings in
-  <literal>lib/debug.nix</literal> for usage information.</para>
-</section>
-
-
-<section xml:id="sec-fhs-environments">
+  <para>
+   In the <literal>lib/debug.nix</literal> file you will find a number of
+   functions that help (pretty-)printing values while evaluation is runnnig.
+   You can even specify how deep these values should be printed recursively,
+   and transform them on the fly. Please consult the docstrings in
+   <literal>lib/debug.nix</literal> for usage information.
+  </para>
+ </section>
+ <section xml:id="sec-fhs-environments">
   <title>buildFHSUserEnv</title>
 
   <para>
-    <function>buildFHSUserEnv</function> provides a way to build and run
-    FHS-compatible lightweight sandboxes. It creates an isolated root with
-    bound <filename>/nix/store</filename>, so its footprint in terms of disk
-    space needed is quite small. This allows one to run software which is hard or
-    unfeasible to patch for NixOS -- 3rd-party source trees with FHS assumptions,
-    games distributed as tarballs, software with integrity checking and/or external
-    self-updated binaries. It uses Linux namespaces feature to create
-    temporary lightweight environments which are destroyed after all child
-    processes exit, without root user rights requirement. Accepted arguments are:
+   <function>buildFHSUserEnv</function> provides a way to build and run
+   FHS-compatible lightweight sandboxes. It creates an isolated root with bound
+   <filename>/nix/store</filename>, so its footprint in terms of disk space
+   needed is quite small. This allows one to run software which is hard or
+   unfeasible to patch for NixOS -- 3rd-party source trees with FHS
+   assumptions, games distributed as tarballs, software with integrity checking
+   and/or external self-updated binaries. It uses Linux namespaces feature to
+   create temporary lightweight environments which are destroyed after all
+   child processes exit, without root user rights requirement. Accepted
+   arguments are:
   </para>
 
   <variablelist>
-    <varlistentry>
-    <term><literal>name</literal></term>
-
-    <listitem><para>Environment name.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term><literal>targetPkgs</literal></term>
-
-    <listitem><para>Packages to be installed for the main host's architecture
-    (i.e. x86_64 on x86_64 installations). Along with libraries binaries are also
-    installed.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term><literal>multiPkgs</literal></term>
-
-    <listitem><para>Packages to be installed for all architectures supported by
-    a host (i.e. i686 and x86_64 on x86_64 installations). Only libraries are
-    installed by default.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term><literal>extraBuildCommands</literal></term>
-
-    <listitem><para>Additional commands to be executed for finalizing the
-    directory structure.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term><literal>extraBuildCommandsMulti</literal></term>
-
-    <listitem><para>Like <literal>extraBuildCommands</literal>, but
-    executed only on multilib architectures.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term><literal>extraOutputsToInstall</literal></term>
-
-    <listitem><para>Additional derivation outputs to be linked for both
-    target and multi-architecture packages.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term><literal>extraInstallCommands</literal></term>
-
-    <listitem><para>Additional commands to be executed for finalizing the
-    derivation with runner script.</para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-    <term><literal>runScript</literal></term>
-
-    <listitem><para>A command that would be executed inside the sandbox and
-    passed all the command line arguments. It defaults to
-    <literal>bash</literal>.</para></listitem>
-    </varlistentry>
+   <varlistentry>
+    <term><literal>name</literal>
+    </term>
+    <listitem>
+     <para>
+      Environment name.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>targetPkgs</literal>
+    </term>
+    <listitem>
+     <para>
+      Packages to be installed for the main host's architecture (i.e. x86_64 on
+      x86_64 installations). Along with libraries binaries are also installed.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>multiPkgs</literal>
+    </term>
+    <listitem>
+     <para>
+      Packages to be installed for all architectures supported by a host (i.e.
+      i686 and x86_64 on x86_64 installations). Only libraries are installed by
+      default.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>extraBuildCommands</literal>
+    </term>
+    <listitem>
+     <para>
+      Additional commands to be executed for finalizing the directory
+      structure.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>extraBuildCommandsMulti</literal>
+    </term>
+    <listitem>
+     <para>
+      Like <literal>extraBuildCommands</literal>, but executed only on multilib
+      architectures.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>extraOutputsToInstall</literal>
+    </term>
+    <listitem>
+     <para>
+      Additional derivation outputs to be linked for both target and
+      multi-architecture packages.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>extraInstallCommands</literal>
+    </term>
+    <listitem>
+     <para>
+      Additional commands to be executed for finalizing the derivation with
+      runner script.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>runScript</literal>
+    </term>
+    <listitem>
+     <para>
+      A command that would be executed inside the sandbox and passed all the
+      command line arguments. It defaults to <literal>bash</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
   </variablelist>
 
   <para>
-    One can create a simple environment using a <literal>shell.nix</literal>
-    like that:
+   One can create a simple environment using a <literal>shell.nix</literal>
+   like that:
   </para>
 
 <programlisting><![CDATA[
@@ -413,50 +429,49 @@ merge:"diff3"
 ]]></programlisting>
 
   <para>
-    Running <literal>nix-shell</literal> would then drop you into a shell with
-    these libraries and binaries available. You can use this to run
-    closed-source applications which expect FHS structure without hassles:
-    simply change <literal>runScript</literal> to the application path,
-    e.g. <filename>./bin/start.sh</filename> -- relative paths are supported.
+   Running <literal>nix-shell</literal> would then drop you into a shell with
+   these libraries and binaries available. You can use this to run
+   closed-source applications which expect FHS structure without hassles:
+   simply change <literal>runScript</literal> to the application path, e.g.
+   <filename>./bin/start.sh</filename> -- relative paths are supported.
   </para>
-</section>
-
-<section xml:id="sec-pkgs-dockerTools">
-<title>pkgs.dockerTools</title>
-
-<para>
-  <varname>pkgs.dockerTools</varname> is a set of functions for creating and
-  manipulating Docker images according to the
-  <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
-  Docker Image Specification v1.2.0
-  </link>. Docker itself is not used to perform any of the operations done by these
-  functions.
-</para>
-
-<warning>
-  <para>
-  The <varname>dockerTools</varname> API is unstable and may be subject to
-  backwards-incompatible changes in the future.
-  </para>
-</warning>
-
-<section xml:id="ssec-pkgs-dockerTools-buildImage">
-  <title>buildImage</title>
+ </section>
+ <section xml:id="sec-pkgs-dockerTools">
+  <title>pkgs.dockerTools</title>
 
   <para>
-  This function is analogous to the <command>docker build</command> command,
-  in that can used to build a Docker-compatible repository tarball containing
-  a single image with one or multiple layers. As such, the result
-  is suitable for being loaded in Docker with <command>docker load</command>.
+   <varname>pkgs.dockerTools</varname> is a set of functions for creating and
+   manipulating Docker images according to the
+   <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#docker-image-specification-v120">
+   Docker Image Specification v1.2.0 </link>. Docker itself is not used to
+   perform any of the operations done by these functions.
   </para>
 
-  <para>
-  The parameters of <varname>buildImage</varname> with relative example values are
-  described below:
-  </para>
+  <warning>
+   <para>
+    The <varname>dockerTools</varname> API is unstable and may be subject to
+    backwards-incompatible changes in the future.
+   </para>
+  </warning>
 
-  <example xml:id='ex-dockerTools-buildImage'><title>Docker build</title>
-  <programlisting>
+  <section xml:id="ssec-pkgs-dockerTools-buildImage">
+   <title>buildImage</title>
+
+   <para>
+    This function is analogous to the <command>docker build</command> command,
+    in that can used to build a Docker-compatible repository tarball containing
+    a single image with one or multiple layers. As such, the result is suitable
+    for being loaded in Docker with <command>docker load</command>.
+   </para>
+
+   <para>
+    The parameters of <varname>buildImage</varname> with relative example
+    values are described below:
+   </para>
+
+   <example xml:id='ex-dockerTools-buildImage'>
+    <title>Docker build</title>
+<programlisting>
   buildImage {
     name = "redis"; <co xml:id='ex-dockerTools-buildImage-1' />
     tag = "latest"; <co xml:id='ex-dockerTools-buildImage-2' />
@@ -480,154 +495,148 @@ merge:"diff3"
     };
   }
   </programlisting>
-  </example>
+   </example>
 
-  <para>The above example will build a Docker image <literal>redis/latest</literal>
-  from the given base image. Loading and running this image in Docker results in
-  <literal>redis-server</literal> being started automatically.
-  </para>
+   <para>
+    The above example will build a Docker image <literal>redis/latest</literal>
+    from the given base image. Loading and running this image in Docker results
+    in <literal>redis-server</literal> being started automatically.
+   </para>
 
-  <calloutlist>
-  <callout arearefs='ex-dockerTools-buildImage-1'>
+   <calloutlist>
+    <callout arearefs='ex-dockerTools-buildImage-1'>
+     <para>
+      <varname>name</varname> specifies the name of the resulting image. This
+      is the only required argument for <varname>buildImage</varname>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-2'>
+     <para>
+      <varname>tag</varname> specifies the tag of the resulting image. By
+      default it's <literal>latest</literal>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-3'>
+     <para>
+      <varname>fromImage</varname> is the repository tarball containing the
+      base image. It must be a valid Docker image, such as exported by
+      <command>docker save</command>. By default it's <literal>null</literal>,
+      which can be seen as equivalent to <literal>FROM scratch</literal> of a
+      <filename>Dockerfile</filename>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-4'>
+     <para>
+      <varname>fromImageName</varname> can be used to further specify the base
+      image within the repository, in case it contains multiple images. By
+      default it's <literal>null</literal>, in which case
+      <varname>buildImage</varname> will peek the first image available in the
+      repository.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-5'>
+     <para>
+      <varname>fromImageTag</varname> can be used to further specify the tag of
+      the base image within the repository, in case an image contains multiple
+      tags. By default it's <literal>null</literal>, in which case
+      <varname>buildImage</varname> will peek the first tag available for the
+      base image.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-6'>
+     <para>
+      <varname>contents</varname> is a derivation that will be copied in the
+      new layer of the resulting image. This can be similarly seen as
+      <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>.
+      By default it's <literal>null</literal>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-runAsRoot'>
+     <para>
+      <varname>runAsRoot</varname> is a bash script that will run as root in an
+      environment that overlays the existing layers of the base image with the
+      new resulting layer, including the previously copied
+      <varname>contents</varname> derivation. This can be similarly seen as
+      <command>RUN ...</command> in a <filename>Dockerfile</filename>.
+      <note>
+       <para>
+        Using this parameter requires the <literal>kvm</literal> device to be
+        available.
+       </para>
+      </note>
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-buildImage-8'>
+     <para>
+      <varname>config</varname> is used to specify the configuration of the
+      containers that will be started off the built image in Docker. The
+      available options are listed in the
+      <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
+      Docker Image Specification v1.2.0 </link>.
+     </para>
+    </callout>
+   </calloutlist>
+
+   <para>
+    After the new layer has been created, its closure (to which
+    <varname>contents</varname>, <varname>config</varname> and
+    <varname>runAsRoot</varname> contribute) will be copied in the layer
+    itself. Only new dependencies that are not already in the existing layers
+    will be copied.
+   </para>
+
+   <para>
+    At the end of the process, only one new single layer will be produced and
+    added to the resulting image.
+   </para>
+
+   <para>
+    The resulting repository will only list the single image
+    <varname>image/tag</varname>. In the case of
+    <xref linkend='ex-dockerTools-buildImage'/> it would be
+    <varname>redis/latest</varname>.
+   </para>
+
+   <para>
+    It is possible to inspect the arguments with which an image was built using
+    its <varname>buildArgs</varname> attribute.
+   </para>
+
+   <note>
     <para>
-    <varname>name</varname> specifies the name of the resulting image.
-    This is the only required argument for <varname>buildImage</varname>.
+     If you see errors similar to <literal>getProtocolByName: does not exist
+     (no such protocol name: tcp)</literal> you may need to add
+     <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
     </para>
-  </callout>
+   </note>
 
-  <callout arearefs='ex-dockerTools-buildImage-2'>
+   <note>
     <para>
-    <varname>tag</varname> specifies the tag of the resulting image.
-    By default it's <literal>latest</literal>.
+     If you see errors similar to <literal>Error_Protocol ("certificate has
+     unknown CA",True,UnknownCa)</literal> you may need to add
+     <literal>pkgs.cacert</literal> to <varname>contents</varname>.
     </para>
-  </callout>
+   </note>
+  </section>
 
-  <callout arearefs='ex-dockerTools-buildImage-3'>
-    <para>
-    <varname>fromImage</varname> is the repository tarball containing the base image.
-    It must be a valid Docker image, such as exported by <command>docker save</command>.
-    By default it's <literal>null</literal>, which can be seen as equivalent
-    to <literal>FROM scratch</literal> of a <filename>Dockerfile</filename>.
-    </para>
-  </callout>
+  <section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
+   <title>pullImage</title>
 
-  <callout arearefs='ex-dockerTools-buildImage-4'>
-    <para>
-    <varname>fromImageName</varname> can be used to further specify
-    the base image within the repository, in case it contains multiple images.
-    By default it's <literal>null</literal>, in which case
-    <varname>buildImage</varname> will peek the first image available
-    in the repository.
-    </para>
-  </callout>
+   <para>
+    This function is analogous to the <command>docker pull</command> command,
+    in that can be used to fetch a Docker image from a Docker registry.
+    Currently only registry <literal>v1</literal> is supported. By default
+    <link xlink:href="https://hub.docker.com/">Docker Hub</link> is used to
+    pull images.
+   </para>
 
-  <callout arearefs='ex-dockerTools-buildImage-5'>
-    <para>
-    <varname>fromImageTag</varname> can be used to further specify the tag
-    of the base image within the repository, in case an image contains multiple tags.
-    By default it's <literal>null</literal>, in which case
-    <varname>buildImage</varname> will peek the first tag available for the base image.
-    </para>
-  </callout>
+   <para>
+    Its parameters are described in the example below:
+   </para>
 
-  <callout arearefs='ex-dockerTools-buildImage-6'>
-    <para>
-    <varname>contents</varname> is a derivation that will be copied in the new
-    layer of the resulting image. This can be similarly seen as
-    <command>ADD contents/ /</command> in a <filename>Dockerfile</filename>.
-    By default it's <literal>null</literal>.
-    </para>
-  </callout>
-
-  <callout arearefs='ex-dockerTools-buildImage-runAsRoot'>
-    <para>
-    <varname>runAsRoot</varname> is a bash script that will run as root
-    in an environment that overlays the existing layers of the base image with
-    the new resulting layer, including the previously copied
-    <varname>contents</varname> derivation.
-    This can be similarly seen as
-    <command>RUN ...</command> in a <filename>Dockerfile</filename>.
-
-    <note>
-      <para>
-      Using this parameter requires the <literal>kvm</literal>
-      device to be available.
-      </para>
-    </note>
-    </para>
-  </callout>
-
-  <callout arearefs='ex-dockerTools-buildImage-8'>
-    <para>
-    <varname>config</varname> is used to specify the configuration of the
-    containers that will be started off the built image in Docker.
-    The available options are listed in the
-    <link xlink:href="https://github.com/moby/moby/blob/master/image/spec/v1.2.md#image-json-field-descriptions">
-      Docker Image Specification v1.2.0
-    </link>.
-    </para>
-  </callout>
-
-  </calloutlist>
-
-  <para>
-  After the new layer has been created, its closure
-  (to which <varname>contents</varname>, <varname>config</varname> and
-  <varname>runAsRoot</varname> contribute) will be copied in the layer itself.
-  Only new dependencies that are not already in the existing layers will be copied.
-  </para>
-
-  <para>
-  At the end of the process, only one new single layer will be produced and
-  added to the resulting image.
-  </para>
-
-  <para>
-  The resulting repository will only list the single image
-  <varname>image/tag</varname>. In the case of <xref linkend='ex-dockerTools-buildImage'/>
-  it would be <varname>redis/latest</varname>.
-  </para>
-
-  <para>
-  It is possible to inspect the arguments with which an image was built
-  using its <varname>buildArgs</varname> attribute.
-  </para>
-
-
-
-  <note>
-  <para>
-  If you see errors similar to <literal>getProtocolByName: does not exist (no such protocol name: tcp)</literal>
-  you may need to add <literal>pkgs.iana-etc</literal> to <varname>contents</varname>.
-  </para>
-  </note>
-
-  <note>
-  <para>
-  If you see errors similar to <literal>Error_Protocol ("certificate has unknown CA",True,UnknownCa)</literal>
-  you may need to add <literal>pkgs.cacert</literal> to <varname>contents</varname>.
-  </para>
-  </note>
-
-</section>
-
-<section xml:id="ssec-pkgs-dockerTools-fetchFromRegistry">
-  <title>pullImage</title>
-
-  <para>
-  This function is analogous to the <command>docker pull</command> command,
-  in that can be used to fetch a Docker image from a Docker registry.
-  Currently only registry <literal>v1</literal> is supported.
-  By default <link xlink:href="https://hub.docker.com/">Docker Hub</link>
-  is used to pull images.
-  </para>
-
-  <para>
-  Its parameters are described in the example below:
-  </para>
-
-  <example xml:id='ex-dockerTools-pullImage'><title>Docker pull</title>
-  <programlisting>
+   <example xml:id='ex-dockerTools-pullImage'>
+    <title>Docker pull</title>
+<programlisting>
   pullImage {
     imageName = "debian"; <co xml:id='ex-dockerTools-pullImage-1' />
     imageTag = "jessie"; <co xml:id='ex-dockerTools-pullImage-2' />
@@ -638,80 +647,78 @@ merge:"diff3"
     registryVersion = "v1";
   }
   </programlisting>
-  </example>
+   </example>
 
-  <calloutlist>
-  <callout arearefs='ex-dockerTools-pullImage-1'>
+   <calloutlist>
+    <callout arearefs='ex-dockerTools-pullImage-1'>
+     <para>
+      <varname>imageName</varname> specifies the name of the image to be
+      downloaded, which can also include the registry namespace (e.g.
+      <literal>library/debian</literal>). This argument is required.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-2'>
+     <para>
+      <varname>imageTag</varname> specifies the tag of the image to be
+      downloaded. By default it's <literal>latest</literal>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-3'>
+     <para>
+      <varname>imageId</varname>, if specified this exact image will be
+      fetched, instead of <varname>imageName/imageTag</varname>. However, the
+      resulting repository will still be named
+      <varname>imageName/imageTag</varname>. By default it's
+      <literal>null</literal>.
+     </para>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-4'>
+     <para>
+      <varname>sha256</varname> is the checksum of the whole fetched image.
+      This argument is required.
+     </para>
+     <note>
+      <para>
+       The checksum is computed on the unpacked directory, not on the final
+       tarball.
+      </para>
+     </note>
+    </callout>
+    <callout arearefs='ex-dockerTools-pullImage-5'>
+     <para>
+      In the above example the default values are shown for the variables
+      <varname>indexUrl</varname> and <varname>registryVersion</varname>. Hence
+      by default the Docker.io registry is used to pull the images.
+     </para>
+    </callout>
+   </calloutlist>
+  </section>
+
+  <section xml:id="ssec-pkgs-dockerTools-exportImage">
+   <title>exportImage</title>
+
+   <para>
+    This function is analogous to the <command>docker export</command> command,
+    in that can used to flatten a Docker image that contains multiple layers.
+    It is in fact the result of the merge of all the layers of the image. As
+    such, the result is suitable for being imported in Docker with
+    <command>docker import</command>.
+   </para>
+
+   <note>
     <para>
-    <varname>imageName</varname> specifies the name of the image to be downloaded,
-    which can also include the registry namespace (e.g. <literal>library/debian</literal>).
-    This argument is required.
+     Using this function requires the <literal>kvm</literal> device to be
+     available.
     </para>
-  </callout>
+   </note>
 
-  <callout arearefs='ex-dockerTools-pullImage-2'>
-    <para>
-    <varname>imageTag</varname> specifies the tag of the image to be downloaded.
-    By default it's <literal>latest</literal>.
-    </para>
-  </callout>
+   <para>
+    The parameters of <varname>exportImage</varname> are the following:
+   </para>
 
-  <callout arearefs='ex-dockerTools-pullImage-3'>
-    <para>
-    <varname>imageId</varname>, if specified this exact image will be fetched, instead
-    of <varname>imageName/imageTag</varname>. However, the resulting repository
-    will still be named <varname>imageName/imageTag</varname>.
-    By default it's <literal>null</literal>.
-    </para>
-  </callout>
-
-  <callout arearefs='ex-dockerTools-pullImage-4'>
-    <para>
-    <varname>sha256</varname> is the checksum of the whole fetched image.
-    This argument is required.
-    </para>
-
-    <note>
-    <para>The checksum is computed on the unpacked directory, not on the final tarball.</para>
-    </note>
-
-  </callout>
-
-  <callout arearefs='ex-dockerTools-pullImage-5'>
-    <para>
-    In the above example the default values are shown for the variables
-    <varname>indexUrl</varname> and <varname>registryVersion</varname>.
-    Hence by default the Docker.io registry is used to pull the images.
-    </para>
-  </callout>
-  </calloutlist>
-
-</section>
-
-<section xml:id="ssec-pkgs-dockerTools-exportImage">
-  <title>exportImage</title>
-
-  <para>
-  This function is analogous to the <command>docker export</command> command,
-  in that can used to flatten a Docker image that contains multiple layers.
-  It is in fact the result of the merge of all the layers of the image.
-  As such, the result is suitable for being imported in Docker
-  with <command>docker import</command>.
-  </para>
-
-  <note>
-  <para>
-    Using this function requires the <literal>kvm</literal>
-    device to be available.
-  </para>
-  </note>
-
-  <para>
-  The parameters of <varname>exportImage</varname> are the following:
-  </para>
-
-  <example xml:id='ex-dockerTools-exportImage'><title>Docker export</title>
-  <programlisting>
+   <example xml:id='ex-dockerTools-exportImage'>
+    <title>Docker export</title>
+<programlisting>
   exportImage {
     fromImage = someLayeredImage;
     fromImageName = null;
@@ -720,33 +727,35 @@ merge:"diff3"
     name = someLayeredImage.name;
   }
   </programlisting>
-  </example>
+   </example>
 
-  <para>
-  The parameters relative to the base image have the same synopsis as
-  described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except that
-  <varname>fromImage</varname> is the only required argument in this case.
-  </para>
+   <para>
+    The parameters relative to the base image have the same synopsis as
+    described in <xref linkend='ssec-pkgs-dockerTools-buildImage'/>, except
+    that <varname>fromImage</varname> is the only required argument in this
+    case.
+   </para>
 
-  <para>
-  The <varname>name</varname> argument is the name of the derivation output,
-  which defaults to <varname>fromImage.name</varname>.
-  </para>
-</section>
+   <para>
+    The <varname>name</varname> argument is the name of the derivation output,
+    which defaults to <varname>fromImage.name</varname>.
+   </para>
+  </section>
 
-<section xml:id="ssec-pkgs-dockerTools-shadowSetup">
-  <title>shadowSetup</title>
+  <section xml:id="ssec-pkgs-dockerTools-shadowSetup">
+   <title>shadowSetup</title>
 
-  <para>
-  This constant string is a helper for setting up the base files for managing
-  users and groups, only if such files don't exist already.
-  It is suitable for being used in a
-  <varname>runAsRoot</varname> <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like
-  in the example below:
-  </para>
+   <para>
+    This constant string is a helper for setting up the base files for managing
+    users and groups, only if such files don't exist already. It is suitable
+    for being used in a <varname>runAsRoot</varname>
+    <xref linkend='ex-dockerTools-buildImage-runAsRoot'/> script for cases like
+    in the example below:
+   </para>
 
-  <example xml:id='ex-dockerTools-shadowSetup'><title>Shadow base files</title>
-  <programlisting>
+   <example xml:id='ex-dockerTools-shadowSetup'>
+    <title>Shadow base files</title>
+<programlisting>
   buildImage {
     name = "shadow-basic";
 
@@ -760,16 +769,13 @@ merge:"diff3"
     '';
   }
   </programlisting>
-  </example>
-
-  <para>
-  Creating base files like <literal>/etc/passwd</literal> or
-  <literal>/etc/login.defs</literal> are necessary for shadow-utils to
-  manipulate users and groups.
-  </para>
-
-</section>
-
-</section>
+   </example>
 
+   <para>
+    Creating base files like <literal>/etc/passwd</literal> or
+    <literal>/etc/login.defs</literal> are necessary for shadow-utils to
+    manipulate users and groups.
+   </para>
+  </section>
+ </section>
 </chapter>
diff --git a/doc/languages-frameworks/beam.xml b/doc/languages-frameworks/beam.xml
index 1a18ed27237c..ac7a83ed4265 100644
--- a/doc/languages-frameworks/beam.xml
+++ b/doc/languages-frameworks/beam.xml
@@ -1,124 +1,137 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-beam">
+ <title>BEAM Languages (Erlang, Elixir &amp; LFE)</title>
 
-  <title>BEAM Languages (Erlang, Elixir &amp; LFE)</title>
-  <section xml:id="beam-introduction">
-    <title>Introduction</title>
-    <para>
-      In this document and related Nix expressions, we use the term,
-      <emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name
-      of the Erlang Virtual Machine and, as far as we're concerned, from a
-      packaging perspective, all languages that run on the BEAM are
-      interchangeable. That which varies, like the build system, is transparent
-      to users of any given BEAM package, so we make no distinction.
-    </para>
-  </section>
-  <section xml:id="beam-structure">
-    <title>Structure</title>
-    <para>
-      All BEAM-related expressions are available via the top-level
-      <literal>beam</literal> attribute, which includes:
-    </para>
-    <itemizedlist>
-      <listitem>
-        <para>
-          <literal>interpreters</literal>: a set of compilers running on the
-          BEAM, including multiple Erlang/OTP versions
-          (<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
-          (<literal>beam.interpreters.elixir</literal>) and LFE
-          (<literal>beam.interpreters.lfe</literal>).
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <literal>packages</literal>: a set of package sets, each compiled with
-          a specific Erlang/OTP version, e.g.
-          <literal>beam.packages.erlangR19</literal>.
-        </para>
-      </listitem>
-    </itemizedlist>
-    <para>
-      The default Erlang compiler, defined by
-      <literal>beam.interpreters.erlang</literal>, is aliased as
-      <literal>erlang</literal>. The default BEAM package set is defined by
-      <literal>beam.packages.erlang</literal> and aliased at the top level as
-      <literal>beamPackages</literal>.
-    </para>
-    <para>
-      To create a package set built with a custom Erlang version, use the
-      lambda, <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP
-      derivation and produces a package set similar to
-      <literal>beam.packages.erlang</literal>.
-    </para>
-    <para>
-      Many Erlang/OTP distributions available in
-      <literal>beam.interpreters</literal> have versions with ODBC and/or Java
-      enabled. For example, there's
-      <literal>beam.interpreters.erlangR19_odbc_javac</literal>, which
-      corresponds to <literal>beam.interpreters.erlangR19</literal>.
-    </para>
-    <para xml:id="erlang-call-package">
-      We also provide the lambda,
-      <literal>beam.packages.erlang.callPackage</literal>, which simplifies
-      writing BEAM package definitions by injecting all packages from
-      <literal>beam.packages.erlang</literal> into the top-level context.
-    </para>
-  </section>
-  <section xml:id="build-tools">
-  <title>Build Tools</title>
-  <section xml:id="build-tools-rebar3">
-    <title>Rebar3</title>
-    <para>
-      By default, Rebar3 wants to manage its own dependencies. This is perfectly
-      acceptable in the normal, non-Nix setup, but in the Nix world, it is not.
-      To rectify this, we provide two versions of Rebar3:
-      <itemizedlist>
-        <listitem>
-          <para>
-            <literal>rebar3</literal>: patched to remove the ability to download
-            anything. When not running it via <literal>nix-shell</literal> or
-            <literal>nix-build</literal>, it's probably not going to work as
-            desired.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It
-            should work exactly as would any other version of Rebar3. Any Erlang
-            package should rely on <literal>rebar3</literal> instead. See <xref
-            linkend="rebar3-packages"/>.
-          </para>
-        </listitem>
-      </itemizedlist>
-    </para>
-  </section>
-  <section xml:id="build-tools-other">
-    <title>Mix &amp; Erlang.mk</title>
-    <para>
-      Both Mix and Erlang.mk work exactly as expected. There is a bootstrap
-      process that needs to be run for both, however, which is supported by the
-      <literal>buildMix</literal> and <literal>buildErlangMk</literal>
-      derivations, respectively.
-    </para>
-  </section>
-</section>
+ <section xml:id="beam-introduction">
+  <title>Introduction</title>
 
-<section xml:id="how-to-install-beam-packages">
-  <title>How to Install BEAM Packages</title>
   <para>
-    BEAM packages are not registered at the top level, simply because they are
-    not relevant to the vast majority of Nix users. They are installable using
-    the <literal>beam.packages.erlang</literal> attribute set (aliased as
-    <literal>beamPackages</literal>), which points to packages built by the
-    default Erlang/OTP version in Nixpkgs, as defined by
-    <literal>beam.interpreters.erlang</literal>.
+   In this document and related Nix expressions, we use the term,
+   <emphasis>BEAM</emphasis>, to describe the environment. BEAM is the name of
+   the Erlang Virtual Machine and, as far as we're concerned, from a packaging
+   perspective, all languages that run on the BEAM are interchangeable. That
+   which varies, like the build system, is transparent to users of any given
+   BEAM package, so we make no distinction.
+  </para>
+ </section>
 
-    To list the available packages in
-    <literal>beamPackages</literal>, use the following command:
+ <section xml:id="beam-structure">
+  <title>Structure</title>
+
+  <para>
+   All BEAM-related expressions are available via the top-level
+   <literal>beam</literal> attribute, which includes:
   </para>
 
-  <programlisting>
+  <itemizedlist>
+   <listitem>
+    <para>
+     <literal>interpreters</literal>: a set of compilers running on the BEAM,
+     including multiple Erlang/OTP versions
+     (<literal>beam.interpreters.erlangR19</literal>, etc), Elixir
+     (<literal>beam.interpreters.elixir</literal>) and LFE
+     (<literal>beam.interpreters.lfe</literal>).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>packages</literal>: a set of package sets, each compiled with a
+     specific Erlang/OTP version, e.g.
+     <literal>beam.packages.erlangR19</literal>.
+    </para>
+   </listitem>
+  </itemizedlist>
+
+  <para>
+   The default Erlang compiler, defined by
+   <literal>beam.interpreters.erlang</literal>, is aliased as
+   <literal>erlang</literal>. The default BEAM package set is defined by
+   <literal>beam.packages.erlang</literal> and aliased at the top level as
+   <literal>beamPackages</literal>.
+  </para>
+
+  <para>
+   To create a package set built with a custom Erlang version, use the lambda,
+   <literal>beam.packagesWith</literal>, which accepts an Erlang/OTP derivation
+   and produces a package set similar to
+   <literal>beam.packages.erlang</literal>.
+  </para>
+
+  <para>
+   Many Erlang/OTP distributions available in
+   <literal>beam.interpreters</literal> have versions with ODBC and/or Java
+   enabled. For example, there's
+   <literal>beam.interpreters.erlangR19_odbc_javac</literal>, which corresponds
+   to <literal>beam.interpreters.erlangR19</literal>.
+  </para>
+
+  <para xml:id="erlang-call-package">
+   We also provide the lambda,
+   <literal>beam.packages.erlang.callPackage</literal>, which simplifies
+   writing BEAM package definitions by injecting all packages from
+   <literal>beam.packages.erlang</literal> into the top-level context.
+  </para>
+ </section>
+
+ <section xml:id="build-tools">
+  <title>Build Tools</title>
+
+  <section xml:id="build-tools-rebar3">
+   <title>Rebar3</title>
+
+   <para>
+    By default, Rebar3 wants to manage its own dependencies. This is perfectly
+    acceptable in the normal, non-Nix setup, but in the Nix world, it is not.
+    To rectify this, we provide two versions of Rebar3:
+    <itemizedlist>
+     <listitem>
+      <para>
+       <literal>rebar3</literal>: patched to remove the ability to download
+       anything. When not running it via <literal>nix-shell</literal> or
+       <literal>nix-build</literal>, it's probably not going to work as
+       desired.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <literal>rebar3-open</literal>: the normal, unmodified Rebar3. It should
+       work exactly as would any other version of Rebar3. Any Erlang package
+       should rely on <literal>rebar3</literal> instead. See
+       <xref
+            linkend="rebar3-packages"/>.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </para>
+  </section>
+
+  <section xml:id="build-tools-other">
+   <title>Mix &amp; Erlang.mk</title>
+
+   <para>
+    Both Mix and Erlang.mk work exactly as expected. There is a bootstrap
+    process that needs to be run for both, however, which is supported by the
+    <literal>buildMix</literal> and <literal>buildErlangMk</literal>
+    derivations, respectively.
+   </para>
+  </section>
+ </section>
+
+ <section xml:id="how-to-install-beam-packages">
+  <title>How to Install BEAM Packages</title>
+
+  <para>
+   BEAM packages are not registered at the top level, simply because they are
+   not relevant to the vast majority of Nix users. They are installable using
+   the <literal>beam.packages.erlang</literal> attribute set (aliased as
+   <literal>beamPackages</literal>), which points to packages built by the
+   default Erlang/OTP version in Nixpkgs, as defined by
+   <literal>beam.interpreters.erlang</literal>. To list the available packages
+   in <literal>beamPackages</literal>, use the following command:
+  </para>
+
+<programlisting>
 $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A beamPackages
 beamPackages.esqlite    esqlite-0.2.1
 beamPackages.goldrush   goldrush-0.1.7
@@ -128,34 +141,43 @@ beamPackages.lager      lager-3.0.2
 beamPackages.meck       meck-0.8.3
 beamPackages.rebar3-pc  pc-1.1.0
   </programlisting>
+
   <para>
-    To install any of those packages into your profile, refer to them by their
-    attribute path (first column):
+   To install any of those packages into your profile, refer to them by their
+   attribute path (first column):
   </para>
-  <programlisting>
+
+<programlisting>
 $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
   </programlisting>
+
   <para>
-    The attribute path of any BEAM package corresponds to the name of that
-    particular package in <link xlink:href="https://hex.pm">Hex</link> or its
-    OTP Application/Release name.
+   The attribute path of any BEAM package corresponds to the name of that
+   particular package in <link xlink:href="https://hex.pm">Hex</link> or its
+   OTP Application/Release name.
   </para>
-</section>
-<section xml:id="packaging-beam-applications">
+ </section>
+
+ <section xml:id="packaging-beam-applications">
   <title>Packaging BEAM Applications</title>
+
   <section  xml:id="packaging-erlang-applications">
-    <title>Erlang Applications</title>
-    <section xml:id="rebar3-packages">
-      <title>Rebar3 Packages</title>
-      <para>
-        The Nix function, <literal>buildRebar3</literal>, defined in
-        <literal>beam.packages.erlang.buildRebar3</literal> and aliased at the
-        top level, can be used to build a derivation that understands how to
-        build a Rebar3 project. For example, we can build <link
-        xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> as
-        follows:
-      </para>
-      <programlisting>
+   <title>Erlang Applications</title>
+
+   <section xml:id="rebar3-packages">
+    <title>Rebar3 Packages</title>
+
+    <para>
+     The Nix function, <literal>buildRebar3</literal>, defined in
+     <literal>beam.packages.erlang.buildRebar3</literal> and aliased at the top
+     level, can be used to build a derivation that understands how to build a
+     Rebar3 project. For example, we can build
+     <link
+        xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
+     as follows:
+    </para>
+
+<programlisting>
         { stdenv, fetchFromGitHub, buildRebar3, ibrowse, jsx, erlware_commons }:
 
         buildRebar3 rec {
@@ -172,33 +194,40 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
           beamDeps = [ ibrowse jsx erlware_commons ];
         }
       </programlisting>
-      <para>
-        Such derivations are callable with
-        <literal>beam.packages.erlang.callPackage</literal> (see <xref
-        linkend="erlang-call-package"/>). To call this package using the normal
-        <literal>callPackage</literal>, refer to dependency packages via
-        <literal>beamPackages</literal>, e.g.
-        <literal>beamPackages.ibrowse</literal>.
-      </para>
-      <para>
-        Notably, <literal>buildRebar3</literal> includes
-        <literal>beamDeps</literal>, while
-        <literal>stdenv.mkDerivation</literal> does not. BEAM dependencies added
-        there will be correctly handled by the system.
-      </para>
-      <para>
-        If a package needs to compile native code via Rebar3's port compilation
-        mechanism, add <literal>compilePort = true;</literal> to the derivation.
-      </para>
-    </section>
-    <section xml:id="erlang-mk-packages">
-      <title>Erlang.mk Packages</title>
-      <para>
-        Erlang.mk functions similarly to Rebar3, except we use
-        <literal>buildErlangMk</literal> instead of
-        <literal>buildRebar3</literal>.
-      </para>
-      <programlisting>
+
+    <para>
+     Such derivations are callable with
+     <literal>beam.packages.erlang.callPackage</literal> (see
+     <xref
+        linkend="erlang-call-package"/>). To call this package using
+     the normal <literal>callPackage</literal>, refer to dependency packages
+     via <literal>beamPackages</literal>, e.g.
+     <literal>beamPackages.ibrowse</literal>.
+    </para>
+
+    <para>
+     Notably, <literal>buildRebar3</literal> includes
+     <literal>beamDeps</literal>, while <literal>stdenv.mkDerivation</literal>
+     does not. BEAM dependencies added there will be correctly handled by the
+     system.
+    </para>
+
+    <para>
+     If a package needs to compile native code via Rebar3's port compilation
+     mechanism, add <literal>compilePort = true;</literal> to the derivation.
+    </para>
+   </section>
+
+   <section xml:id="erlang-mk-packages">
+    <title>Erlang.mk Packages</title>
+
+    <para>
+     Erlang.mk functions similarly to Rebar3, except we use
+     <literal>buildErlangMk</literal> instead of
+     <literal>buildRebar3</literal>.
+    </para>
+
+<programlisting>
         { buildErlangMk, fetchHex, cowlib, ranch }:
 
         buildErlangMk {
@@ -222,14 +251,17 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
           };
         }
       </programlisting>
-    </section>
-    <section xml:id="mix-packages">
-      <title>Mix Packages</title>
-      <para>
-        Mix functions similarly to Rebar3, except we use
-        <literal>buildMix</literal> instead of <literal>buildRebar3</literal>.
-      </para>
-      <programlisting>
+   </section>
+
+   <section xml:id="mix-packages">
+    <title>Mix Packages</title>
+
+    <para>
+     Mix functions similarly to Rebar3, except we use
+     <literal>buildMix</literal> instead of <literal>buildRebar3</literal>.
+    </para>
+
+<programlisting>
         { buildMix, fetchHex, plug, absinthe }:
 
         buildMix {
@@ -253,10 +285,12 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
           };
         }
       </programlisting>
-      <para>
-        Alternatively, we can use <literal>buildHex</literal> as a shortcut:
-      </para>
-      <programlisting>
+
+    <para>
+     Alternatively, we can use <literal>buildHex</literal> as a shortcut:
+    </para>
+
+<programlisting>
         { buildHex, buildMix, plug, absinthe }:
 
         buildHex {
@@ -278,21 +312,25 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
          };
        }
       </programlisting>
-    </section>
+   </section>
   </section>
-</section>
-<section xml:id="how-to-develop">
+ </section>
+
+ <section xml:id="how-to-develop">
   <title>How to Develop</title>
+
   <section xml:id="accessing-an-environment">
-    <title>Accessing an Environment</title>
-    <para>
-      Often, we simply want to access a valid environment that contains a
-      specific package and its dependencies. We can accomplish that with the
-      <literal>env</literal> attribute of a derivation. For example, let's say
-      we want to access an Erlang REPL with <literal>ibrowse</literal> loaded
-      up. We could do the following:
-    </para>
-    <programlisting>
+   <title>Accessing an Environment</title>
+
+   <para>
+    Often, we simply want to access a valid environment that contains a
+    specific package and its dependencies. We can accomplish that with the
+    <literal>env</literal> attribute of a derivation. For example, let's say we
+    want to access an Erlang REPL with <literal>ibrowse</literal> loaded up. We
+    could do the following:
+   </para>
+
+<programlisting>
       $ nix-shell -A beamPackages.ibrowse.env --run "erl"
       Erlang/OTP 18 [erts-7.0] [source] [64-bit] [smp:4:4] [async-threads:10] [hipe] [kernel-poll:false]
 
@@ -333,22 +371,25 @@ $ nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA beamPackages.ibrowse
       ok
       2>
     </programlisting>
-    <para>
-      Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key
-      to this functionality.
-    </para>
+
+   <para>
+    Notice the <literal>-A beamPackages.ibrowse.env</literal>. That is the key
+    to this functionality.
+   </para>
   </section>
+
   <section xml:id="creating-a-shell">
-    <title>Creating a Shell</title>
-    <para>
-      Getting access to an environment often isn't enough to do real
-      development. Usually, we need to create a <literal>shell.nix</literal>
-      file and do our development inside of the environment specified therein.
-      This file looks a lot like the packaging described above, except that
-      <literal>src</literal> points to the project root and we call the package
-      directly.
-    </para>
-    <programlisting>
+   <title>Creating a Shell</title>
+
+   <para>
+    Getting access to an environment often isn't enough to do real development.
+    Usually, we need to create a <literal>shell.nix</literal> file and do our
+    development inside of the environment specified therein. This file looks a
+    lot like the packaging described above, except that <literal>src</literal>
+    points to the project root and we call the package directly.
+   </para>
+
+<programlisting>
 { pkgs ? import &quot;&lt;nixpkgs&quot;&gt; {} }:
 
 with pkgs;
@@ -368,13 +409,16 @@ in
 
   drv
     </programlisting>
-    <section xml:id="building-in-a-shell">
+
+   <section xml:id="building-in-a-shell">
     <title>Building in a Shell (for Mix Projects)</title>
+
     <para>
-      We can leverage the support of the derivation, irrespective of the build
-      derivation, by calling the commands themselves.
+     We can leverage the support of the derivation, irrespective of the build
+     derivation, by calling the commands themselves.
     </para>
-    <programlisting>
+
+<programlisting>
 # =============================================================================
 # Variables
 # =============================================================================
@@ -431,44 +475,54 @@ analyze: build plt
         $(NIX_SHELL) --run "mix dialyzer --no-compile"
 
     </programlisting>
+
     <para>
-      Using a <literal>shell.nix</literal> as described (see <xref
+     Using a <literal>shell.nix</literal> as described (see
+     <xref
       linkend="creating-a-shell"/>) should just work. Aside from
-      <literal>test</literal>, <literal>plt</literal>, and
-      <literal>analyze</literal>, the Make targets work just fine for all of the
-      build derivations.
+     <literal>test</literal>, <literal>plt</literal>, and
+     <literal>analyze</literal>, the Make targets work just fine for all of the
+     build derivations.
     </para>
+   </section>
   </section>
-</section>
-</section>
-<section xml:id="generating-packages-from-hex-with-hex2nix">
+ </section>
+
+ <section xml:id="generating-packages-from-hex-with-hex2nix">
   <title>Generating Packages from Hex with <literal>hex2nix</literal></title>
+
   <para>
-    Updating the <link xlink:href="https://hex.pm">Hex</link> package set
-    requires <link
-    xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>. Given the
-    path to the Erlang modules (usually
-    <literal>pkgs/development/erlang-modules</literal>), it will dump a file
-    called <literal>hex-packages.nix</literal>, containing all the packages that
-    use a recognized build system in <link
-    xlink:href="https://hex.pm">Hex</link>. It can't be determined, however,
-    whether every package is buildable.
-    </para>
-    <para>
-      To make life easier for our users, try to build every <link
-      xlink:href="https://hex.pm">Hex</link> package and remove those that fail.
-      To do that, simply run the following command in the root of your
-      <literal>nixpkgs</literal> repository:
-    </para>
-    <programlisting>
+   Updating the <link xlink:href="https://hex.pm">Hex</link> package set
+   requires
+   <link
+    xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>.
+   Given the path to the Erlang modules (usually
+   <literal>pkgs/development/erlang-modules</literal>), it will dump a file
+   called <literal>hex-packages.nix</literal>, containing all the packages that
+   use a recognized build system in
+   <link
+    xlink:href="https://hex.pm">Hex</link>. It can't be determined,
+   however, whether every package is buildable.
+  </para>
+
+  <para>
+   To make life easier for our users, try to build every
+   <link
+      xlink:href="https://hex.pm">Hex</link> package and remove those
+   that fail. To do that, simply run the following command in the root of your
+   <literal>nixpkgs</literal> repository:
+  </para>
+
+<programlisting>
 $ nix-build -A beamPackages
     </programlisting>
-    <para>
-      That will attempt to build every package in
-      <literal>beamPackages</literal>. Then manually remove those that fail.
-      Hopefully, someone will improve <link
-      xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link> in the
-      future to automate the process.
-    </para>
-</section>
+
+  <para>
+   That will attempt to build every package in <literal>beamPackages</literal>.
+   Then manually remove those that fail. Hopefully, someone will improve
+   <link
+      xlink:href="https://github.com/erlang-nix/hex2nix">hex2nix</link>
+   in the future to automate the process.
+  </para>
+ </section>
 </section>
diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml
index 742d3c2e9fe5..db7536cdc14e 100644
--- a/doc/languages-frameworks/bower.xml
+++ b/doc/languages-frameworks/bower.xml
@@ -1,40 +1,37 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-bower">
+ <title>Bower</title>
 
-<title>Bower</title>
+ <para>
+  <link xlink:href="http://bower.io">Bower</link> is a package manager for web
+  site front-end components. Bower packages (comprising of build artefacts and
+  sometimes sources) are stored in <command>git</command> repositories,
+  typically on Github. The package registry is run by the Bower team with
+  package metadata coming from the <filename>bower.json</filename> file within
+  each package.
+ </para>
 
-<para>
-  <link xlink:href="http://bower.io">Bower</link> is a package manager
-  for web site front-end components. Bower packages (comprising of
-  build artefacts and sometimes sources) are stored in
-  <command>git</command> repositories, typically on Github. The
-  package registry is run by the Bower team with package metadata
-  coming from the <filename>bower.json</filename> file within each
-  package.
-</para>
+ <para>
+  The end result of running Bower is a <filename>bower_components</filename>
+  directory which can be included in the web app's build process.
+ </para>
 
-<para>
-  The end result of running Bower is a
-  <filename>bower_components</filename> directory which can be included
-  in the web app's build process.
-</para>
-
-<para>
+ <para>
   Bower can be run interactively, by installing
   <varname>nodePackages.bower</varname>. More interestingly, the Bower
   components can be declared in a Nix derivation, with the help of
   <varname>nodePackages.bower2nix</varname>.
-</para>
+ </para>
 
-<section xml:id="ssec-bower2nix-usage">
+ <section xml:id="ssec-bower2nix-usage">
   <title><command>bower2nix</command> usage</title>
 
-<para>
-  Suppose you have a <filename>bower.json</filename> with the following contents:
-
-
-<example xml:id="ex-bowerJson"><title><filename>bower.json</filename></title>
+  <para>
+   Suppose you have a <filename>bower.json</filename> with the following
+   contents:
+   <example xml:id="ex-bowerJson">
+    <title><filename>bower.json</filename></title>
 <programlisting language="json">
 <![CDATA[{
   "name": "my-web-app",
@@ -44,14 +41,12 @@
   }
 }]]>
 </programlisting>
-</example>
-</para>
-
-
-<para>
-  Running <command>bower2nix</command> will produce something like the
-  following output:
+   </example>
+  </para>
 
+  <para>
+   Running <command>bower2nix</command> will produce something like the
+   following output:
 <programlisting language="nix">
 <![CDATA[{ fetchbower, buildEnv }:
 buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
@@ -60,31 +55,31 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
   (fetchbower "jquery" "2.2.2" "1.9.1 - 2" "10sp5h98sqwk90y4k6hbdviwqzvzwqf47r3r51pakch5ii2y7js1")
 ]; }]]>
 </programlisting>
-</para>
-
-
-<para>
-  Using the <command>bower2nix</command> command line arguments, the
-  output can be redirected to a file. A name like
-  <filename>bower-packages.nix</filename> would be fine.
-</para>
-
-<para>
-  The resulting derivation is a union of all the downloaded Bower
-  packages (and their dependencies). To use it, they still need to be
-  linked together by Bower, which is where
-  <varname>buildBowerComponents</varname> is useful.
-</para>
-</section>
-
-<section xml:id="ssec-build-bower-components"><title><varname>buildBowerComponents</varname> function</title>
+  </para>
 
   <para>
-  The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix">
-  <filename>pkgs/development/bower-modules/generic/default.nix</filename></link>.
-  Example usage:
+   Using the <command>bower2nix</command> command line arguments, the output
+   can be redirected to a file. A name like
+   <filename>bower-packages.nix</filename> would be fine.
+  </para>
 
-<example xml:id="ex-buildBowerComponents"><title>buildBowerComponents</title>
+  <para>
+   The resulting derivation is a union of all the downloaded Bower packages
+   (and their dependencies). To use it, they still need to be linked together
+   by Bower, which is where <varname>buildBowerComponents</varname> is useful.
+  </para>
+ </section>
+
+ <section xml:id="ssec-build-bower-components">
+  <title><varname>buildBowerComponents</varname> function</title>
+
+  <para>
+   The function is implemented in
+   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/bower-modules/generic/default.nix">
+   <filename>pkgs/development/bower-modules/generic/default.nix</filename></link>.
+   Example usage:
+   <example xml:id="ex-buildBowerComponents">
+    <title>buildBowerComponents</title>
 <programlisting language="nix">
 bowerComponents = buildBowerComponents {
   name = "my-web-app";
@@ -92,42 +87,42 @@ bowerComponents = buildBowerComponents {
   src = myWebApp; <co xml:id="ex-buildBowerComponents-2" />
 };
 </programlisting>
-</example>
+   </example>
   </para>
 
-<para>
-In <xref linkend="ex-buildBowerComponents" />, the following arguments
-are of special significance to the function:
+  <para>
+   In <xref linkend="ex-buildBowerComponents" />, the following arguments are
+   of special significance to the function:
+   <calloutlist>
+    <callout arearefs="ex-buildBowerComponents-1">
+     <para>
+      <varname>generated</varname> specifies the file which was created by
+      <command>bower2nix</command>.
+     </para>
+    </callout>
+    <callout arearefs="ex-buildBowerComponents-2">
+     <para>
+      <varname>src</varname> is your project's sources. It needs to contain a
+      <filename>bower.json</filename> file.
+     </para>
+    </callout>
+   </calloutlist>
+  </para>
 
-<calloutlist>
-  <callout arearefs="ex-buildBowerComponents-1">
-    <para>
-      <varname>generated</varname> specifies the file which was created by <command>bower2nix</command>.
-    </para>
-  </callout>
+  <para>
+   <varname>buildBowerComponents</varname> will run Bower to link together the
+   output of <command>bower2nix</command>, resulting in a
+   <filename>bower_components</filename> directory which can be used.
+  </para>
 
-  <callout arearefs="ex-buildBowerComponents-2">
-    <para>
-      <varname>src</varname> is your project's sources. It needs to
-      contain a <filename>bower.json</filename> file.
-    </para>
-  </callout>
-</calloutlist>
-</para>
+  <para>
+   Here is an example of a web frontend build process using
+   <command>gulp</command>. You might use <command>grunt</command>, or anything
+   else.
+  </para>
 
-<para>
-  <varname>buildBowerComponents</varname> will run Bower to link
-  together the output of <command>bower2nix</command>, resulting in a
-  <filename>bower_components</filename> directory which can be used.
-</para>
-
-<para>
-  Here is an example of a web frontend build process using
-  <command>gulp</command>. You might use <command>grunt</command>, or
-  anything else.
-</para>
-
-<example xml:id="ex-bowerGulpFile"><title>Example build script (<filename>gulpfile.js</filename>)</title>
+  <example xml:id="ex-bowerGulpFile">
+   <title>Example build script (<filename>gulpfile.js</filename>)</title>
 <programlisting language="javascript">
 <![CDATA[var gulp = require('gulp');
 
@@ -142,10 +137,10 @@ gulp.task('build', [], function () {
     .pipe(gulp.dest("./gulpdist/"));
 });]]>
 </programlisting>
-</example>
+  </example>
 
-<example xml:id="ex-buildBowerComponentsDefaultNix">
-  <title>Full example — <filename>default.nix</filename></title>
+  <example xml:id="ex-buildBowerComponentsDefaultNix">
+   <title>Full example — <filename>default.nix</filename></title>
 <programlisting language="nix">
 { myWebApp ? { outPath = ./.; name = "myWebApp"; }
 , pkgs ? import &lt;nixpkgs&gt; {}
@@ -172,73 +167,63 @@ pkgs.stdenv.mkDerivation {
   installPhase = "mv gulpdist $out";
 }
 </programlisting>
-</example>
+  </example>
 
-<para>
-A few notes about <xref linkend="ex-buildBowerComponentsDefaultNix" />:
-
-<calloutlist>
-  <callout arearefs="ex-buildBowerComponentsDefault-1">
-    <para>
-      The result of <varname>buildBowerComponents</varname> is an
-      input to the frontend build.
-    </para>
-  </callout>
-
-  <callout arearefs="ex-buildBowerComponentsDefault-2">
-    <para>
-      Whether to symlink or copy the
-      <filename>bower_components</filename> directory depends on the
-      build tool in use. In this case a copy is used to avoid
-      <command>gulp</command> silliness with permissions.
-    </para>
-  </callout>
-
-  <callout arearefs="ex-buildBowerComponentsDefault-3">
-    <para>
-      <command>gulp</command> requires <varname>HOME</varname> to
-      refer to a writeable directory.
-    </para>
-  </callout>
-
-  <callout arearefs="ex-buildBowerComponentsDefault-4">
-    <para>
+  <para>
+   A few notes about <xref linkend="ex-buildBowerComponentsDefaultNix" />:
+   <calloutlist>
+    <callout arearefs="ex-buildBowerComponentsDefault-1">
+     <para>
+      The result of <varname>buildBowerComponents</varname> is an input to the
+      frontend build.
+     </para>
+    </callout>
+    <callout arearefs="ex-buildBowerComponentsDefault-2">
+     <para>
+      Whether to symlink or copy the <filename>bower_components</filename>
+      directory depends on the build tool in use. In this case a copy is used
+      to avoid <command>gulp</command> silliness with permissions.
+     </para>
+    </callout>
+    <callout arearefs="ex-buildBowerComponentsDefault-3">
+     <para>
+      <command>gulp</command> requires <varname>HOME</varname> to refer to a
+      writeable directory.
+     </para>
+    </callout>
+    <callout arearefs="ex-buildBowerComponentsDefault-4">
+     <para>
       The actual build command. Other tools could be used.
-    </para>
-  </callout>
-</calloutlist>
-</para>
-</section>
+     </para>
+    </callout>
+   </calloutlist>
+  </para>
+ </section>
 
-<section xml:id="ssec-bower2nix-troubleshooting">
+ <section xml:id="ssec-bower2nix-troubleshooting">
   <title>Troubleshooting</title>
 
-<variablelist>
-
-  <varlistentry>
-    <term>
-    <literal>ENOCACHE</literal> errors from
+  <variablelist>
+   <varlistentry>
+    <term><literal>ENOCACHE</literal> errors from
     <varname>buildBowerComponents</varname>
     </term>
     <listitem>
-      <para>
-        This means that Bower was looking for a package version which
-        doesn't exist in the generated
-        <filename>bower-packages.nix</filename>.
-      </para>
-      <para>
-        If <filename>bower.json</filename> has been updated, then run
-        <command>bower2nix</command> again.
-      </para>
-      <para>
-        It could also be a bug in <command>bower2nix</command> or
-        <command>fetchbower</command>. If possible, try reformulating
-        the version specification in <filename>bower.json</filename>.
-      </para>
+     <para>
+      This means that Bower was looking for a package version which doesn't
+      exist in the generated <filename>bower-packages.nix</filename>.
+     </para>
+     <para>
+      If <filename>bower.json</filename> has been updated, then run
+      <command>bower2nix</command> again.
+     </para>
+     <para>
+      It could also be a bug in <command>bower2nix</command> or
+      <command>fetchbower</command>. If possible, try reformulating the version
+      specification in <filename>bower.json</filename>.
+     </para>
     </listitem>
-  </varlistentry>
-</variablelist>
-
-</section>
-
+   </varlistentry>
+  </variablelist>
+ </section>
 </section>
diff --git a/doc/languages-frameworks/coq.xml b/doc/languages-frameworks/coq.xml
index 0ce1abd6194c..d5f2574039f2 100644
--- a/doc/languages-frameworks/coq.xml
+++ b/doc/languages-frameworks/coq.xml
@@ -1,36 +1,38 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-coq">
+ <title>Coq</title>
 
-<title>Coq</title>
-  <para>
-    Coq libraries should be installed in
-    <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>.
-    Such directories are automatically added to the
-    <literal>$COQPATH</literal> environment variable by the hook defined
-    in the Coq derivation.
-  </para>
-  <para>
-    Some libraries require OCaml and sometimes also Camlp5 or findlib.
-    The exact versions that were used to build Coq are saved in the
-    <literal>coq.ocaml</literal> and <literal>coq.camlp5</literal>
-    and <literal>coq.findlib</literal> attributes.
-  </para>
-  <para>
-    Coq libraries may be compatible with some specific versions of Coq only.
-    The <literal>compatibleCoqVersions</literal> attribute is used to
-    precisely select those versions of Coq that are compatible with this
-    derivation.
-  </para>
-  <para>
-    Here is a simple package example. It is a pure Coq library, thus it
-    depends on Coq. It builds on the Mathematical Components library, thus it
-    also takes <literal>mathcomp</literal> as <literal>buildInputs</literal>.
-    Its <literal>Makefile</literal> has been generated using
-    <literal>coq_makefile</literal> so we only have to
-    set the <literal>$COQLIB</literal> variable at install time.
-  </para>
-  <programlisting>
+ <para>
+  Coq libraries should be installed in
+  <literal>$(out)/lib/coq/${coq.coq-version}/user-contrib/</literal>. Such
+  directories are automatically added to the <literal>$COQPATH</literal>
+  environment variable by the hook defined in the Coq derivation.
+ </para>
+
+ <para>
+  Some libraries require OCaml and sometimes also Camlp5 or findlib. The exact
+  versions that were used to build Coq are saved in the
+  <literal>coq.ocaml</literal> and <literal>coq.camlp5</literal> and
+  <literal>coq.findlib</literal> attributes.
+ </para>
+
+ <para>
+  Coq libraries may be compatible with some specific versions of Coq only. The
+  <literal>compatibleCoqVersions</literal> attribute is used to precisely
+  select those versions of Coq that are compatible with this derivation.
+ </para>
+
+ <para>
+  Here is a simple package example. It is a pure Coq library, thus it depends
+  on Coq. It builds on the Mathematical Components library, thus it also takes
+  <literal>mathcomp</literal> as <literal>buildInputs</literal>. Its
+  <literal>Makefile</literal> has been generated using
+  <literal>coq_makefile</literal> so we only have to set the
+  <literal>$COQLIB</literal> variable at install time.
+ </para>
+
+<programlisting>
 { stdenv, fetchFromGitHub, coq, mathcomp }:
 
 stdenv.mkDerivation rec {
diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml
index 54ea60c90212..ab4c9f0f7c88 100644
--- a/doc/languages-frameworks/go.xml
+++ b/doc/languages-frameworks/go.xml
@@ -1,14 +1,14 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-go">
+ <title>Go</title>
 
-<title>Go</title>
+ <para>
+  The function <varname>buildGoPackage</varname> builds standard Go programs.
+ </para>
 
-<para>The function <varname>buildGoPackage</varname> builds
-standard Go programs.
-</para>
-
-<example xml:id='ex-buildGoPackage'><title>buildGoPackage</title>
+ <example xml:id='ex-buildGoPackage'>
+  <title>buildGoPackage</title>
 <programlisting>
 deis = buildGoPackage rec {
   name = "deis-${version}";
@@ -29,55 +29,56 @@ deis = buildGoPackage rec {
   buildFlags = "--tags release"; <co xml:id='ex-buildGoPackage-4' />
 }
 </programlisting>
-</example>
+ </example>
 
-<para><xref linkend='ex-buildGoPackage'/> is an example expression using buildGoPackage,
-the following arguments are of special significance to the function:
-
-<calloutlist>
-
-  <callout arearefs='ex-buildGoPackage-1'>
+ <para>
+  <xref linkend='ex-buildGoPackage'/> is an example expression using
+  buildGoPackage, the following arguments are of special significance to the
+  function:
+  <calloutlist>
+   <callout arearefs='ex-buildGoPackage-1'>
     <para>
-      <varname>goPackagePath</varname> specifies the package's canonical Go import path.
+     <varname>goPackagePath</varname> specifies the package's canonical Go
+     import path.
     </para>
-  </callout>
-
-  <callout arearefs='ex-buildGoPackage-2'>
+   </callout>
+   <callout arearefs='ex-buildGoPackage-2'>
     <para>
-      <varname>subPackages</varname> limits the builder from building child packages that
-      have not been listed. If <varname>subPackages</varname> is not specified, all child
-      packages will be built.
+     <varname>subPackages</varname> limits the builder from building child
+     packages that have not been listed. If <varname>subPackages</varname> is
+     not specified, all child packages will be built.
     </para>
     <para>
-      In this example only <literal>github.com/deis/deis/client</literal> will be built.
+     In this example only <literal>github.com/deis/deis/client</literal> will
+     be built.
     </para>
-  </callout>
-
-  <callout arearefs='ex-buildGoPackage-3'>
+   </callout>
+   <callout arearefs='ex-buildGoPackage-3'>
     <para>
-      <varname>goDeps</varname> is where the Go dependencies of a Go program are listed
-      as a list of package source identified by Go import path.
-      It could be imported as a separate <varname>deps.nix</varname> file for
-      readability. The dependency data structure is described below.
+     <varname>goDeps</varname> is where the Go dependencies of a Go program are
+     listed as a list of package source identified by Go import path. It could
+     be imported as a separate <varname>deps.nix</varname> file for
+     readability. The dependency data structure is described below.
     </para>
-  </callout>
-
-  <callout arearefs='ex-buildGoPackage-4'>
+   </callout>
+   <callout arearefs='ex-buildGoPackage-4'>
     <para>
-      <varname>buildFlags</varname> is a list of flags passed to the go build command.
+     <varname>buildFlags</varname> is a list of flags passed to the go build
+     command.
     </para>
-  </callout>
+   </callout>
+  </calloutlist>
+ </para>
 
-</calloutlist>
+ <para>
+  The <varname>goDeps</varname> attribute can be imported from a separate
+  <varname>nix</varname> file that defines which Go libraries are needed and
+  should be included in <varname>GOPATH</varname> for
+  <varname>buildPhase</varname>.
+ </para>
 
-</para>
-
-<para>The <varname>goDeps</varname> attribute can be imported from a separate
-  <varname>nix</varname> file that defines which Go libraries are needed and should
-  be included in <varname>GOPATH</varname> for <varname>buildPhase</varname>.
-</para>
-
-<example xml:id='ex-goDeps'><title>deps.nix</title>
+ <example xml:id='ex-goDeps'>
+  <title>deps.nix</title>
 <programlisting>
 [ <co xml:id='ex-goDeps-1' />
   {
@@ -100,67 +101,60 @@ the following arguments are of special significance to the function:
   }
 ]
 </programlisting>
-</example>
+ </example>
 
-<para>
-
-<calloutlist>
-
-  <callout arearefs='ex-goDeps-1'>
+ <para>
+  <calloutlist>
+   <callout arearefs='ex-goDeps-1'>
     <para>
-      <varname>goDeps</varname> is a list of Go dependencies.
+     <varname>goDeps</varname> is a list of Go dependencies.
     </para>
-  </callout>
-
-  <callout arearefs='ex-goDeps-2'>
+   </callout>
+   <callout arearefs='ex-goDeps-2'>
     <para>
-      <varname>goPackagePath</varname> specifies Go package import path.
+     <varname>goPackagePath</varname> specifies Go package import path.
     </para>
-  </callout>
-
-  <callout arearefs='ex-goDeps-3'>
+   </callout>
+   <callout arearefs='ex-goDeps-3'>
     <para>
-      <varname>fetch type</varname> that needs to be used to get package source. If <varname>git</varname>
-      is used there should be <varname>url</varname>, <varname>rev</varname> and <varname>sha256</varname>
-      defined next to it.
+     <varname>fetch type</varname> that needs to be used to get package source.
+     If <varname>git</varname> is used there should be <varname>url</varname>,
+     <varname>rev</varname> and <varname>sha256</varname> defined next to it.
     </para>
-  </callout>
+   </callout>
+  </calloutlist>
+ </para>
 
-</calloutlist>
+ <para>
+  To extract dependency information from a Go package in automated way use
+  <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>. It can
+  produce complete derivation and <varname>goDeps</varname> file for Go
+  programs.
+ </para>
 
-</para>
-
-<para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.
-  It can produce complete derivation and <varname>goDeps</varname> file for Go programs.</para>
-
-<para>
-  <varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" />
-  where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows:
-
-  <screen>
+ <para>
+  <varname>buildGoPackage</varname> produces
+  <xref linkend='chap-multiple-output' xrefstyle="select: title" /> where
+  <varname>bin</varname> includes program binaries. You can test build a Go
+  binary as follows:
+<screen>
     $ nix-build -A deis.bin
   </screen>
-
   or build all outputs with:
-
-  <screen>
+<screen>
     $ nix-build -A deis.all
   </screen>
+  <varname>bin</varname> output will be installed by default with
+  <varname>nix-env -i</varname> or <varname>systemPackages</varname>.
+ </para>
 
-  <varname>bin</varname> output will be installed by default with <varname>nix-env -i</varname>
-  or <varname>systemPackages</varname>.
-
-</para>
-
-<para>
-You may use Go packages installed into the active Nix profiles by adding
-the following to your ~/.bashrc:
-
+ <para>
+  You may use Go packages installed into the active Nix profiles by adding the
+  following to your ~/.bashrc:
 <screen>
 for p in $NIX_PROFILES; do
     GOPATH="$p/share/go:$GOPATH"
 done
 </screen>
-</para>
-
+ </para>
 </section>
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index a1c265f67484..f22984cb56b0 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -1,36 +1,31 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          xml:id="chap-language-support">
-
-<title>Support for specific programming languages and frameworks</title>
-
-<para>The <link linkend="chap-stdenv">standard build
-environment</link> makes it easy to build typical Autotools-based
-packages with very little code.  Any other kind of package can be
-accomodated by overriding the appropriate phases of
-<literal>stdenv</literal>.  However, there are specialised functions
-in Nixpkgs to easily build packages for other programming languages,
-such as Perl or Haskell.  These are described in this chapter.</para>
-
-
-<xi:include href="beam.xml" />
-<xi:include href="bower.xml" />
-<xi:include href="coq.xml" />
-<xi:include href="go.xml" />
-<xi:include href="haskell.section.xml" />
-<xi:include href="idris.section.xml" />
-<xi:include href="java.xml" />
-<xi:include href="lua.xml" />
-<xi:include href="node.section.xml" />
-<xi:include href="perl.xml" />
-<xi:include href="python.section.xml" />
-<xi:include href="qt.xml" />
-<xi:include href="r.section.xml" />
-<xi:include href="ruby.xml" />
-<xi:include href="rust.section.xml" />
-<xi:include href="texlive.xml" />
-<xi:include href="vim.section.xml" />
-<xi:include href="emscripten.section.xml" />
-
-
+ <title>Support for specific programming languages and frameworks</title>
+ <para>
+  The <link linkend="chap-stdenv">standard build environment</link> makes it
+  easy to build typical Autotools-based packages with very little code. Any
+  other kind of package can be accomodated by overriding the appropriate phases
+  of <literal>stdenv</literal>. However, there are specialised functions in
+  Nixpkgs to easily build packages for other programming languages, such as
+  Perl or Haskell. These are described in this chapter.
+ </para>
+ <xi:include href="beam.xml" />
+ <xi:include href="bower.xml" />
+ <xi:include href="coq.xml" />
+ <xi:include href="go.xml" />
+ <xi:include href="haskell.section.xml" />
+ <xi:include href="idris.section.xml" />
+ <xi:include href="java.xml" />
+ <xi:include href="lua.xml" />
+ <xi:include href="node.section.xml" />
+ <xi:include href="perl.xml" />
+ <xi:include href="python.section.xml" />
+ <xi:include href="qt.xml" />
+ <xi:include href="r.section.xml" />
+ <xi:include href="ruby.xml" />
+ <xi:include href="rust.section.xml" />
+ <xi:include href="texlive.xml" />
+ <xi:include href="vim.section.xml" />
+ <xi:include href="emscripten.section.xml" />
 </chapter>
diff --git a/doc/languages-frameworks/java.xml b/doc/languages-frameworks/java.xml
index 2507cc2c469a..dcf4d17fa57d 100644
--- a/doc/languages-frameworks/java.xml
+++ b/doc/languages-frameworks/java.xml
@@ -1,11 +1,10 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-java">
+ <title>Java</title>
 
-<title>Java</title>
-
-<para>Ant-based Java packages are typically built from source as follows:
-
+ <para>
+  Ant-based Java packages are typically built from source as follows:
 <programlisting>
 stdenv.mkDerivation {
   name = "...";
@@ -16,33 +15,33 @@ stdenv.mkDerivation {
   buildPhase = "ant";
 }
 </programlisting>
+  Note that <varname>jdk</varname> is an alias for the OpenJDK.
+ </para>
 
-Note that <varname>jdk</varname> is an alias for the OpenJDK.</para>
-
-<para>JAR files that are intended to be used by other packages should
-be installed in <filename>$out/share/java</filename>.  The OpenJDK has
-a stdenv setup hook that adds any JARs in the
-<filename>share/java</filename> directories of the build inputs to the
-<envar>CLASSPATH</envar> environment variable.  For instance, if the
-package <literal>libfoo</literal> installs a JAR named
-<filename>foo.jar</filename> in its <filename>share/java</filename>
-directory, and another package declares the attribute
-
+ <para>
+  JAR files that are intended to be used by other packages should be installed
+  in <filename>$out/share/java</filename>. The OpenJDK has a stdenv setup hook
+  that adds any JARs in the <filename>share/java</filename> directories of the
+  build inputs to the <envar>CLASSPATH</envar> environment variable. For
+  instance, if the package <literal>libfoo</literal> installs a JAR named
+  <filename>foo.jar</filename> in its <filename>share/java</filename>
+  directory, and another package declares the attribute
 <programlisting>
 buildInputs = [ jdk libfoo ];
 </programlisting>
+  then <envar>CLASSPATH</envar> will be set to
+  <filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.
+ </para>
 
-then <envar>CLASSPATH</envar> will be set to
-<filename>/nix/store/...-libfoo/share/java/foo.jar</filename>.</para>
-
-<para>Private JARs
-should be installed in a location like
-<filename>$out/share/<replaceable>package-name</replaceable></filename>.</para>
-
-<para>If your Java package provides a program, you need to generate a
-wrapper script to run it using the OpenJRE.  You can use
-<literal>makeWrapper</literal> for this:
+ <para>
+  Private JARs should be installed in a location like
+  <filename>$out/share/<replaceable>package-name</replaceable></filename>.
+ </para>
 
+ <para>
+  If your Java package provides a program, you need to generate a wrapper
+  script to run it using the OpenJRE. You can use
+  <literal>makeWrapper</literal> for this:
 <programlisting>
 buildInputs = [ makeWrapper ];
 
@@ -53,23 +52,20 @@ installPhase =
       --add-flags "-cp $out/share/java/foo.jar org.foo.Main"
   '';
 </programlisting>
+  Note the use of <literal>jre</literal>, which is the part of the OpenJDK
+  package that contains the Java Runtime Environment. By using
+  <literal>${jre}/bin/java</literal> instead of
+  <literal>${jdk}/bin/java</literal>, you prevent your package from depending
+  on the JDK at runtime.
+ </para>
 
-Note the use of <literal>jre</literal>, which is the part of the
-OpenJDK package that contains the Java Runtime Environment.  By using
-<literal>${jre}/bin/java</literal> instead of
-<literal>${jdk}/bin/java</literal>, you prevent your package from
-depending on the JDK at runtime.</para>
-
-<para>It is possible to use a different Java compiler than
-<command>javac</command> from the OpenJDK.  For instance, to use the
-GNU Java Compiler:
-
+ <para>
+  It is possible to use a different Java compiler than <command>javac</command>
+  from the OpenJDK. For instance, to use the GNU Java Compiler:
 <programlisting>
 buildInputs = [ gcj ant ];
 </programlisting>
-
-Here, Ant will automatically use <command>gij</command> (the GNU Java
-Runtime) instead of the OpenJRE.</para>
-
+  Here, Ant will automatically use <command>gij</command> (the GNU Java
+  Runtime) instead of the OpenJRE.
+ </para>
 </section>
-
diff --git a/doc/languages-frameworks/lua.xml b/doc/languages-frameworks/lua.xml
index 39b086af4cb1..210140299960 100644
--- a/doc/languages-frameworks/lua.xml
+++ b/doc/languages-frameworks/lua.xml
@@ -1,24 +1,22 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-lua">
+ <title>Lua</title>
 
-<title>Lua</title>
-
-<para>
-  Lua packages are built by the <varname>buildLuaPackage</varname> function.  This function is
-  implemented
-  in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix">
+ <para>
+  Lua packages are built by the <varname>buildLuaPackage</varname> function.
+  This function is implemented in
+  <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules/generic/default.nix">
   <filename>pkgs/development/lua-modules/generic/default.nix</filename></link>
   and works similarly to <varname>buildPerlPackage</varname>. (See
   <xref linkend="sec-language-perl"/> for details.)
-</para>
+ </para>
 
-<para>
-  Lua packages are defined
-  in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>.
+ <para>
+  Lua packages are defined in
+  <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/lua-packages.nix"><filename>pkgs/top-level/lua-packages.nix</filename></link>.
   Most of them are simple. For example:
-
-  <programlisting>
+<programlisting>
 fileSystem = buildLuaPackage {
   name = "filesystem-1.6.2";
   src = fetchurl {
@@ -32,20 +30,19 @@ fileSystem = buildLuaPackage {
   };
 };
   </programlisting>
-</para>
+ </para>
 
-<para>
+ <para>
   Though, more complicated package should be placed in a seperate file in
   <link
   xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/lua-modules"><filename>pkgs/development/lua-modules</filename></link>.
-</para>
-<para>
-  Lua packages accept additional parameter <varname>disabled</varname>, which defines
-  the condition of disabling package from luaPackages. For example, if package has
-  <varname>disabled</varname> assigned to <literal>lua.luaversion != "5.1"</literal>,
-  it will not be included in any luaPackages except lua51Packages, making it
-  only be built for lua 5.1.
-</para>
+ </para>
 
+ <para>
+  Lua packages accept additional parameter <varname>disabled</varname>, which
+  defines the condition of disabling package from luaPackages. For example, if
+  package has <varname>disabled</varname> assigned to <literal>lua.luaversion
+  != "5.1"</literal>, it will not be included in any luaPackages except
+  lua51Packages, making it only be built for lua 5.1.
+ </para>
 </section>
-
diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml
index 149fcb275a09..2fe64999e139 100644
--- a/doc/languages-frameworks/perl.xml
+++ b/doc/languages-frameworks/perl.xml
@@ -1,24 +1,27 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-perl">
+ <title>Perl</title>
 
-<title>Perl</title>
+ <para>
+  Nixpkgs provides a function <varname>buildPerlPackage</varname>, a generic
+  package builder function for any Perl package that has a standard
+  <varname>Makefile.PL</varname>. It’s implemented in
+  <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.
+ </para>
 
-<para>Nixpkgs provides a function <varname>buildPerlPackage</varname>,
-a generic package builder function for any Perl package that has a
-standard <varname>Makefile.PL</varname>.  It’s implemented in <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/perl-modules/generic"><filename>pkgs/development/perl-modules/generic</filename></link>.</para>
-
-<para>Perl packages from CPAN are defined in <link
+ <para>
+  Perl packages from CPAN are defined in
+  <link
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>,
-rather than <filename>pkgs/all-packages.nix</filename>.  Most Perl
-packages are so straight-forward to build that they are defined here
-directly, rather than having a separate function for each package
-called from <filename>perl-packages.nix</filename>.  However, more
-complicated packages should be put in a separate file, typically in
-<filename>pkgs/development/perl-modules</filename>.  Here is an
-example of the former:
-
+  rather than <filename>pkgs/all-packages.nix</filename>. Most Perl packages
+  are so straight-forward to build that they are defined here directly, rather
+  than having a separate function for each package called from
+  <filename>perl-packages.nix</filename>. However, more complicated packages
+  should be put in a separate file, typically in
+  <filename>pkgs/development/perl-modules</filename>. Here is an example of the
+  former:
 <programlisting>
 ClassC3 = buildPerlPackage rec {
   name = "Class-C3-0.21";
@@ -28,74 +31,72 @@ ClassC3 = buildPerlPackage rec {
   };
 };
 </programlisting>
-
-Note the use of <literal>mirror://cpan/</literal>, and the
-<literal>${name}</literal> in the URL definition to ensure that the
-name attribute is consistent with the source that we’re actually
-downloading.  Perl packages are made available in
-<filename>all-packages.nix</filename> through the variable
-<varname>perlPackages</varname>.  For instance, if you have a package
-that needs <varname>ClassC3</varname>, you would typically write
-
+  Note the use of <literal>mirror://cpan/</literal>, and the
+  <literal>${name}</literal> in the URL definition to ensure that the name
+  attribute is consistent with the source that we’re actually downloading.
+  Perl packages are made available in <filename>all-packages.nix</filename>
+  through the variable <varname>perlPackages</varname>. For instance, if you
+  have a package that needs <varname>ClassC3</varname>, you would typically
+  write
 <programlisting>
 foo = import ../path/to/foo.nix {
   inherit stdenv fetchurl ...;
   inherit (perlPackages) ClassC3;
 };
 </programlisting>
-
-in <filename>all-packages.nix</filename>.  You can test building a
-Perl package as follows:
-
+  in <filename>all-packages.nix</filename>. You can test building a Perl
+  package as follows:
 <screen>
 $ nix-build -A perlPackages.ClassC3
 </screen>
-
-<varname>buildPerlPackage</varname> adds <literal>perl-</literal> to
-the start of the name attribute, so the package above is actually
-called <literal>perl-Class-C3-0.21</literal>.  So to install it, you
-can say:
-
+  <varname>buildPerlPackage</varname> adds <literal>perl-</literal> to the
+  start of the name attribute, so the package above is actually called
+  <literal>perl-Class-C3-0.21</literal>. So to install it, you can say:
 <screen>
 $ nix-env -i perl-Class-C3
 </screen>
+  (Of course you can also install using the attribute name: <literal>nix-env -i
+  -A perlPackages.ClassC3</literal>.)
+ </para>
 
-(Of course you can also install using the attribute name:
-<literal>nix-env -i -A perlPackages.ClassC3</literal>.)</para>
-
-<para>So what does <varname>buildPerlPackage</varname> do?  It does
-the following:
-
-<orderedlist>
-
-  <listitem><para>In the configure phase, it calls <literal>perl
-  Makefile.PL</literal> to generate a Makefile.  You can set the
-  variable <varname>makeMakerFlags</varname> to pass flags to
-  <filename>Makefile.PL</filename></para></listitem>
-
-  <listitem><para>It adds the contents of the <envar>PERL5LIB</envar>
-  environment variable to <literal>#! .../bin/perl</literal> line of
-  Perl scripts as <literal>-I<replaceable>dir</replaceable></literal>
-  flags.  This ensures that a script can find its
-  dependencies.</para></listitem>
-
-  <listitem><para>In the fixup phase, it writes the propagated build
-  inputs (<varname>propagatedBuildInputs</varname>) to the file
-  <filename>$out/nix-support/propagated-user-env-packages</filename>.
-  <command>nix-env</command> recursively installs all packages listed
-  in this file when you install a package that has it.  This ensures
-  that a Perl package can find its dependencies.</para></listitem>
-
-</orderedlist>
-
-</para>
-
-<para><varname>buildPerlPackage</varname> is built on top of
-<varname>stdenv</varname>, so everything can be customised in the
-usual way.  For instance, the <literal>BerkeleyDB</literal> module has
-a <varname>preConfigure</varname> hook to generate a configuration
-file used by <filename>Makefile.PL</filename>:
+ <para>
+  So what does <varname>buildPerlPackage</varname> do? It does the following:
+  <orderedlist>
+   <listitem>
+    <para>
+     In the configure phase, it calls <literal>perl Makefile.PL</literal> to
+     generate a Makefile. You can set the variable
+     <varname>makeMakerFlags</varname> to pass flags to
+     <filename>Makefile.PL</filename>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     It adds the contents of the <envar>PERL5LIB</envar> environment variable
+     to <literal>#! .../bin/perl</literal> line of Perl scripts as
+     <literal>-I<replaceable>dir</replaceable></literal> flags. This ensures
+     that a script can find its dependencies.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     In the fixup phase, it writes the propagated build inputs
+     (<varname>propagatedBuildInputs</varname>) to the file
+     <filename>$out/nix-support/propagated-user-env-packages</filename>.
+     <command>nix-env</command> recursively installs all packages listed in
+     this file when you install a package that has it. This ensures that a Perl
+     package can find its dependencies.
+    </para>
+   </listitem>
+  </orderedlist>
+ </para>
 
+ <para>
+  <varname>buildPerlPackage</varname> is built on top of
+  <varname>stdenv</varname>, so everything can be customised in the usual way.
+  For instance, the <literal>BerkeleyDB</literal> module has a
+  <varname>preConfigure</varname> hook to generate a configuration file used by
+  <filename>Makefile.PL</filename>:
 <programlisting>
 { buildPerlPackage, fetchurl, db }:
 
@@ -113,18 +114,15 @@ buildPerlPackage rec {
   '';
 }
 </programlisting>
+ </para>
 
-</para>
-
-<para>Dependencies on other Perl packages can be specified in the
-<varname>buildInputs</varname> and
-<varname>propagatedBuildInputs</varname> attributes.  If something is
-exclusively a build-time dependency, use
-<varname>buildInputs</varname>; if it’s (also) a runtime dependency,
-use <varname>propagatedBuildInputs</varname>.  For instance, this
-builds a Perl module that has runtime dependencies on a bunch of other
-modules:
-
+ <para>
+  Dependencies on other Perl packages can be specified in the
+  <varname>buildInputs</varname> and <varname>propagatedBuildInputs</varname>
+  attributes. If something is exclusively a build-time dependency, use
+  <varname>buildInputs</varname>; if it’s (also) a runtime dependency, use
+  <varname>propagatedBuildInputs</varname>. For instance, this builds a Perl
+  module that has runtime dependencies on a bunch of other modules:
 <programlisting>
 ClassC3Componentised = buildPerlPackage rec {
   name = "Class-C3-Componentised-1.0004";
@@ -137,24 +135,26 @@ ClassC3Componentised = buildPerlPackage rec {
   ];
 };
 </programlisting>
+ </para>
 
-</para>
+ <section xml:id="ssec-generation-from-CPAN">
+  <title>Generation from CPAN</title>
 
-<section xml:id="ssec-generation-from-CPAN"><title>Generation from CPAN</title>
-
-<para>Nix expressions for Perl packages can be generated (almost)
-automatically from CPAN.  This is done by the program
-<command>nix-generate-from-cpan</command>, which can be installed
-as follows:</para>
+  <para>
+   Nix expressions for Perl packages can be generated (almost) automatically
+   from CPAN. This is done by the program
+   <command>nix-generate-from-cpan</command>, which can be installed as
+   follows:
+  </para>
 
 <screen>
 $ nix-env -i nix-generate-from-cpan
 </screen>
 
-<para>This program takes a Perl module name, looks it up on CPAN,
-fetches and unpacks the corresponding package, and prints a Nix
-expression on standard output.  For example:
-
+  <para>
+   This program takes a Perl module name, looks it up on CPAN, fetches and
+   unpacks the corresponding package, and prints a Nix expression on standard
+   output. For example:
 <screen>
 $ nix-generate-from-cpan XML::Simple
   XMLSimple = buildPerlPackage rec {
@@ -170,26 +170,23 @@ $ nix-generate-from-cpan XML::Simple
     };
   };
 </screen>
+   The output can be pasted into
+   <filename>pkgs/top-level/perl-packages.nix</filename> or wherever else you
+   need it.
+  </para>
+ </section>
 
-The output can be pasted into
-<filename>pkgs/top-level/perl-packages.nix</filename> or wherever else
-you need it.</para>
+ <section xml:id="ssec-perl-cross-compilation">
+  <title>Cross-compiling modules</title>
 
+  <para>
+   Nixpkgs has experimental support for cross-compiling Perl modules. In many
+   cases, it will just work out of the box, even for modules with native
+   extensions. Sometimes, however, the Makefile.PL for a module may
+   (indirectly) import a native module. In that case, you will need to make a
+   stub for that module that will satisfy the Makefile.PL and install it into
+   <filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>. See the
+   <varname>postInstall</varname> for <varname>DBI</varname> for an example.
+  </para>
+ </section>
 </section>
-
-<section xml:id="ssec-perl-cross-compilation"><title>Cross-compiling modules</title>
-
-<para>Nixpkgs has experimental support for cross-compiling Perl
-modules. In many cases, it will just work out of the box, even for
-modules with native extensions. Sometimes, however, the Makefile.PL
-for a module may (indirectly) import a native module. In that case,
-you will need to make a stub for that module that will satisfy the
-Makefile.PL and install it into
-<filename>lib/perl5/site_perl/cross_perl/${perl.version}</filename>.
-See the <varname>postInstall</varname> for <varname>DBI</varname> for
-an example.</para>
-
-</section>
-
-</section>
-
diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml
index 1dbbb5341ba3..b9b605b81da1 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/doc/languages-frameworks/qt.xml
@@ -1,58 +1,74 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-qt">
+ <title>Qt</title>
 
-<title>Qt</title>
+ <para>
+  Qt is a comprehensive desktop and mobile application development toolkit for
+  C++. Legacy support is available for Qt 3 and Qt 4, but all current
+  development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to
+  take advantage of new features, but older versions are typically retained
+  until their support window ends. The most important consideration in
+  packaging Qt-based software is ensuring that each package and all its
+  dependencies use the same version of Qt 5; this consideration motivates most
+  of the tools described below.
+ </para>
 
-<para>
-Qt is a comprehensive desktop and mobile application development toolkit for C++.
-Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5.
-The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features,
-but older versions are typically retained until their support window ends.
-The most important consideration in packaging Qt-based software is ensuring that each package and all its dependencies use the same version of Qt 5;
-this consideration motivates most of the tools described below.
-</para>
+ <section xml:id="ssec-qt-libraries">
+  <title>Packaging Libraries for Nixpkgs</title>
 
-<section xml:id="ssec-qt-libraries"><title>Packaging Libraries for Nixpkgs</title>
+  <para>
+   Whenever possible, libraries that use Qt 5 should be built with each
+   available version. Packages providing libraries should be added to the
+   top-level function <varname>mkLibsForQt5</varname>, which is used to build a
+   set of libraries for every Qt 5 version. A special
+   <varname>callPackage</varname> function is used in this scope to ensure that
+   the entire dependency tree uses the same Qt 5 version. Import dependencies
+   unqualified, i.e., <literal>qtbase</literal> not
+   <literal>qt5.qtbase</literal>. <emphasis>Do not</emphasis> import a package
+   set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
+  </para>
 
-<para>
-Whenever possible, libraries that use Qt 5 should be built with each available version.
-Packages providing libraries should be added to the top-level function <varname>mkLibsForQt5</varname>,
-which is used to build a set of libraries for every Qt 5 version.
-A special <varname>callPackage</varname> function is used in this scope to ensure that the entire dependency tree uses the same Qt 5 version.
-Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
-<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
-</para>
+  <para>
+   If a library does not support a particular version of Qt 5, it is best to
+   mark it as broken by setting its <literal>meta.broken</literal> attribute. A
+   package may be marked broken for certain versions by testing the
+   <literal>qtbase.version</literal> attribute, which will always give the
+   current Qt 5 version.
+  </para>
+ </section>
 
-<para>
-If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute.
-A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.
-</para>
+ <section xml:id="ssec-qt-applications">
+  <title>Packaging Applications for Nixpkgs</title>
 
+  <para>
+   Call your application expression using
+   <literal>libsForQt5.callPackage</literal> instead of
+   <literal>callPackage</literal>. Import dependencies unqualified, i.e.,
+   <literal>qtbase</literal> not <literal>qt5.qtbase</literal>. <emphasis>Do
+   not</emphasis> import a package set such as <literal>qt5</literal> or
+   <literal>libsForQt5</literal>.
+  </para>
+
+  <para>
+   Qt 5 maintains strict backward compatibility, so it is generally best to
+   build an application package against the latest version using the
+   <varname>libsForQt5</varname> library set. In case a package does not build
+   with the latest Qt version, it is possible to pick a set pinned to a
+   particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that
+   is the latest version the package supports. If a package must be pinned to
+   an older Qt version, be sure to file a bug upstream; because Qt is strictly
+   backwards-compatible, any incompatibility is by definition a bug in the
+   application.
+  </para>
+
+  <para>
+   When testing applications in Nixpkgs, it is a common practice to build the
+   package with <literal>nix-build</literal> and run it using the created
+   symbolic link. This will not work with Qt applications, however, because
+   they have many hard runtime requirements that can only be guaranteed if the
+   package is actually installed. To test a Qt application, install it with
+   <literal>nix-env</literal> or run it inside <literal>nix-shell</literal>.
+  </para>
+ </section>
 </section>
-
-<section xml:id="ssec-qt-applications"><title>Packaging Applications for Nixpkgs</title>
-
-<para>
-Call your application expression using <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>.
-Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
-<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
-</para>
-
-<para>
-Qt 5 maintains strict backward compatibility, so it is generally best to build an application package against the latest version using the <varname>libsForQt5</varname> library set.
-In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.
-If a package must be pinned to an older Qt version, be sure to file a bug upstream;
-because Qt is strictly backwards-compatible, any incompatibility is by definition a bug in the application.
-</para>
-
-<para>
-When testing applications in Nixpkgs, it is a common practice to build the package with <literal>nix-build</literal> and run it using the created symbolic link.
-This will not work with Qt applications, however, because they have many hard runtime requirements that can only be guaranteed if the package is actually installed.
-To test a Qt application, install it with <literal>nix-env</literal> or run it inside <literal>nix-shell</literal>.
-</para>
-
-</section>
-
-</section>
-
diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index 6bb809192f89..c52a72a3df4a 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -1,17 +1,19 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-ruby">
+ <title>Ruby</title>
 
-<title>Ruby</title>
+ <para>
+  There currently is support to bundle applications that are packaged as Ruby
+  gems. The utility "bundix" allows you to write a
+  <filename>Gemfile</filename>, let bundler create a
+  <filename>Gemfile.lock</filename>, and then convert this into a nix
+  expression that contains all Gem dependencies automatically.
+ </para>
 
-<para>There currently is support to bundle applications that are packaged as
-Ruby gems. The utility "bundix" allows you to write a
-<filename>Gemfile</filename>, let bundler create a
-<filename>Gemfile.lock</filename>, and then convert this into a nix
-expression that contains all Gem dependencies automatically.
-</para>
-
-<para>For example, to package sensu, we did:</para>
+ <para>
+  For example, to package sensu, we did:
+ </para>
 
 <screen>
 <![CDATA[$ cd pkgs/servers/monitoring
@@ -42,17 +44,18 @@ bundlerEnv rec {
 }]]>
 </screen>
 
-<para>Please check in the <filename>Gemfile</filename>,
-<filename>Gemfile.lock</filename> and the
-<filename>gemset.nix</filename> so future updates can be run easily.
-</para>
+ <para>
+  Please check in the <filename>Gemfile</filename>,
+  <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so
+  future updates can be run easily.
+ </para>
 
-<para>For tools written in Ruby - i.e. where the desire is to install
-a package and then execute e.g. <command>rake</command> at the command
-line, there is an alternative builder called <literal>bundlerApp</literal>.
-Set up the <filename>gemset.nix</filename> the same way, and then, for
-example:
-</para>
+ <para>
+  For tools written in Ruby - i.e. where the desire is to install a package and
+  then execute e.g. <command>rake</command> at the command line, there is an
+  alternative builder called <literal>bundlerApp</literal>. Set up the
+  <filename>gemset.nix</filename> the same way, and then, for example:
+ </para>
 
 <screen>
 <![CDATA[{ lib, bundlerApp }:
@@ -72,31 +75,31 @@ bundlerApp {
 }]]>
 </screen>
 
-<para>The chief advantage of <literal>bundlerApp</literal> over
-<literal>bundlerEnv</literal> is the executables introduced in the
-environment are precisely those selected in the <literal>exes</literal>
-list, as opposed to <literal>bundlerEnv</literal> which adds all the
-executables made available by gems in the gemset, which can mean e.g.
-<command>rspec</command> or <command>rake</command> in unpredictable
-versions available from various packages.
-</para>
+ <para>
+  The chief advantage of <literal>bundlerApp</literal> over
+  <literal>bundlerEnv</literal> is the executables introduced in the
+  environment are precisely those selected in the <literal>exes</literal> list,
+  as opposed to <literal>bundlerEnv</literal> which adds all the executables
+  made available by gems in the gemset, which can mean e.g.
+  <command>rspec</command> or <command>rake</command> in unpredictable versions
+  available from various packages.
+ </para>
 
-<para>Resulting derivations for both builders also have two helpful
-attributes, <literal>env</literal> and <literal>wrappedRuby</literal>.
-The first one allows one to quickly drop into
-<command>nix-shell</command> with the specified environment present.
-E.g. <command>nix-shell -A sensu.env</command> would give you an
-environment with Ruby preset so it has all the libraries necessary
-for <literal>sensu</literal> in its paths. The second one can be
-used to make derivations from custom Ruby scripts which have
-<filename>Gemfile</filename>s with their dependencies specified. It is
-a derivation with <command>ruby</command> wrapped so it can find all
-the needed dependencies. For example, to make a derivation
-<literal>my-script</literal> for a <filename>my-script.rb</filename>
-(which should be placed in <filename>bin</filename>) you should run
-<command>bundix</command> as specified above and then use
-<literal>bundlerEnv</literal> like this:
-</para>
+ <para>
+  Resulting derivations for both builders also have two helpful attributes,
+  <literal>env</literal> and <literal>wrappedRuby</literal>. The first one
+  allows one to quickly drop into <command>nix-shell</command> with the
+  specified environment present. E.g. <command>nix-shell -A sensu.env</command>
+  would give you an environment with Ruby preset so it has all the libraries
+  necessary for <literal>sensu</literal> in its paths. The second one can be
+  used to make derivations from custom Ruby scripts which have
+  <filename>Gemfile</filename>s with their dependencies specified. It is a
+  derivation with <command>ruby</command> wrapped so it can find all the needed
+  dependencies. For example, to make a derivation <literal>my-script</literal>
+  for a <filename>my-script.rb</filename> (which should be placed in
+  <filename>bin</filename>) you should run <command>bundix</command> as
+  specified above and then use <literal>bundlerEnv</literal> like this:
+ </para>
 
 <programlisting>
 <![CDATA[let env = bundlerEnv {
@@ -118,5 +121,4 @@ in stdenv.mkDerivation {
   '';
 }]]>
 </programlisting>
-
 </section>
diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml
index 4515e17ec09e..af0b07166e3e 100644
--- a/doc/languages-frameworks/texlive.xml
+++ b/doc/languages-frameworks/texlive.xml
@@ -1,27 +1,42 @@
 <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-texlive">
+ <title>TeX Live</title>
 
-<title>TeX Live</title>
+ <para>
+  Since release 15.09 there is a new TeX Live packaging that lives entirely
+  under attribute <varname>texlive</varname>.
+ </para>
+
+ <section>
+  <title>User's guide</title>
 
-<para>Since release 15.09 there is a new TeX Live packaging that lives entirely under attribute <varname>texlive</varname>.</para>
-<section><title>User's guide</title>
   <itemizedlist>
-    <listitem><para>
-      For basic usage just pull <varname>texlive.combined.scheme-basic</varname> for an environment with basic LaTeX support.</para></listitem>
-    <listitem><para>
-      It typically won't work to use separately installed packages together.
-      Instead, you can build a custom set of packages like this:
-      <programlisting>
+   <listitem>
+    <para>
+     For basic usage just pull <varname>texlive.combined.scheme-basic</varname>
+     for an environment with basic LaTeX support.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     It typically won't work to use separately installed packages together.
+     Instead, you can build a custom set of packages like this:
+<programlisting>
 texlive.combine {
   inherit (texlive) scheme-small collection-langkorean algorithms cm-super;
 }
       </programlisting>
-      There are all the schemes, collections and a few thousand packages, as defined upstream (perhaps with tiny differences).
-    </para></listitem>
-    <listitem><para>
-      By default you only get executables and files needed during runtime, and a little documentation for the core packages.  To change that, you need to add <varname>pkgFilter</varname> function to <varname>combine</varname>.
-      <programlisting>
+     There are all the schemes, collections and a few thousand packages, as
+     defined upstream (perhaps with tiny differences).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     By default you only get executables and files needed during runtime, and a
+     little documentation for the core packages. To change that, you need to
+     add <varname>pkgFilter</varname> function to <varname>combine</varname>.
+<programlisting>
 texlive.combine {
   # inherit (texlive) whatever-you-want;
   pkgFilter = pkg:
@@ -30,34 +45,55 @@ texlive.combine {
   # there are also other attributes: version, name
 }
       </programlisting>
-    </para></listitem>
-    <listitem><para>
-      You can list packages e.g. by <command>nix-repl</command>.
-      <programlisting>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     You can list packages e.g. by <command>nix-repl</command>.
+<programlisting>
 $ nix-repl
 nix-repl> :l &lt;nixpkgs>
 nix-repl> texlive.collection-&lt;TAB>
       </programlisting>
-    </para></listitem>
-    <listitem><para>
-      Note that the wrapper assumes that the result has a chance to be useful. For example, the core executables should be present, as well as some core data files. The supported way of ensuring this is by including some scheme, for example <varname>scheme-basic</varname>, into the combination.
-    </para></listitem>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Note that the wrapper assumes that the result has a chance to be useful.
+     For example, the core executables should be present, as well as some core
+     data files. The supported way of ensuring this is by including some
+     scheme, for example <varname>scheme-basic</varname>, into the combination.
+    </para>
+   </listitem>
   </itemizedlist>
-</section>
+ </section>
+
+ <section>
+  <title>Known problems</title>
 
-<section><title>Known problems</title>
   <itemizedlist>
-    <listitem><para>
-      Some tools are still missing, e.g. luajittex;</para></listitem>
-    <listitem><para>
-      some apps aren't packaged/tested yet (asymptote, biber, etc.);</para></listitem>
-    <listitem><para>
-      feature/bug: when a package is rejected by <varname>pkgFilter</varname>, its dependencies are still propagated;</para></listitem>
-    <listitem><para>
-      in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat.</para></listitem>
+   <listitem>
+    <para>
+     Some tools are still missing, e.g. luajittex;
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     some apps aren't packaged/tested yet (asymptote, biber, etc.);
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     feature/bug: when a package is rejected by <varname>pkgFilter</varname>,
+     its dependencies are still propagated;
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     in case of any bugs or feature requests, file a github issue or better a
+     pull request and /cc @vcunat.
+    </para>
+   </listitem>
   </itemizedlist>
+ </section>
 </section>
-
-
-</section>
-
diff --git a/doc/manual.xml b/doc/manual.xml
index 385079eb5785..f31897aed039 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -1,29 +1,24 @@
 <book xmlns="http://docbook.org/ns/docbook"
       xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <info>
-
-    <title>Nixpkgs Contributors Guide</title>
-
-    <subtitle>Version <xi:include href=".version" parse="text" /></subtitle>
-
-  </info>
-
-  <xi:include href="introduction.chapter.xml" />
-  <xi:include href="quick-start.xml" />
-  <xi:include href="stdenv.xml" />
-  <xi:include href="multiple-output.xml" />
-  <xi:include href="cross-compilation.xml" />
-  <xi:include href="configuration.xml" />
-  <xi:include href="functions.xml" />
-  <xi:include href="meta.xml" />
-  <xi:include href="languages-frameworks/index.xml" />
-  <xi:include href="platform-notes.xml" />
-  <xi:include href="package-notes.xml" />
-  <xi:include href="overlays.xml" />
-  <xi:include href="coding-conventions.xml" />
-  <xi:include href="submitting-changes.xml" />
-  <xi:include href="reviewing-contributions.xml" />
-  <xi:include href="contributing.xml" />
-
+ <info>
+  <title>Nixpkgs Contributors Guide</title>
+  <subtitle>Version <xi:include href=".version" parse="text" />
+  </subtitle>
+ </info>
+ <xi:include href="introduction.chapter.xml" />
+ <xi:include href="quick-start.xml" />
+ <xi:include href="stdenv.xml" />
+ <xi:include href="multiple-output.xml" />
+ <xi:include href="cross-compilation.xml" />
+ <xi:include href="configuration.xml" />
+ <xi:include href="functions.xml" />
+ <xi:include href="meta.xml" />
+ <xi:include href="languages-frameworks/index.xml" />
+ <xi:include href="platform-notes.xml" />
+ <xi:include href="package-notes.xml" />
+ <xi:include href="overlays.xml" />
+ <xi:include href="coding-conventions.xml" />
+ <xi:include href="submitting-changes.xml" />
+ <xi:include href="reviewing-contributions.xml" />
+ <xi:include href="contributing.xml" />
 </book>
diff --git a/doc/meta.xml b/doc/meta.xml
index 5dbe810810d1..ad16e7683f58 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -1,14 +1,12 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-meta">
-
-<title>Meta-attributes</title>
-
-<para>Nix packages can declare <emphasis>meta-attributes</emphasis>
-that contain information about a package such as a description, its
-homepage, its license, and so on.  For instance, the GNU Hello package
-has a <varname>meta</varname> declaration like this:
-
+ <title>Meta-attributes</title>
+ <para>
+  Nix packages can declare <emphasis>meta-attributes</emphasis> that contain
+  information about a package such as a description, its homepage, its license,
+  and so on. For instance, the GNU Hello package has a <varname>meta</varname>
+  declaration like this:
 <programlisting>
 meta = {
   description = "A program that produces a familiar, friendly greeting";
@@ -22,16 +20,15 @@ meta = {
   platforms = stdenv.lib.platforms.all;
 };
 </programlisting>
-
-</para>
-
-<para>Meta-attributes are not passed to the builder of the package.
-Thus, a change to a meta-attribute doesn’t trigger a recompilation of
-the package.  The value of a meta-attribute must be a string.</para>
-
-<para>The meta-attributes of a package can be queried from the
-command-line using <command>nix-env</command>:
-
+ </para>
+ <para>
+  Meta-attributes are not passed to the builder of the package. Thus, a change
+  to a meta-attribute doesn’t trigger a recompilation of the package. The
+  value of a meta-attribute must be a string.
+ </para>
+ <para>
+  The meta-attributes of a package can be queried from the command-line using
+  <command>nix-env</command>:
 <screen>
 $ nix-env -qa hello --json
 {
@@ -70,252 +67,299 @@ $ nix-env -qa hello --json
 
 
 </screen>
-
-<command>nix-env</command> knows about the
-<varname>description</varname> field specifically:
-
+  <command>nix-env</command> knows about the <varname>description</varname>
+  field specifically:
 <screen>
 $ nix-env -qa hello --description
 hello-2.3  A program that produces a familiar, friendly greeting
 </screen>
+ </para>
+ <section xml:id="sec-standard-meta-attributes">
+  <title>Standard meta-attributes</title>
 
-</para>
+  <para>
+   It is expected that each meta-attribute is one of the following:
+  </para>
 
-
-<section xml:id="sec-standard-meta-attributes"><title>Standard
-meta-attributes</title>
-
-<para>It is expected that each meta-attribute is one of the following:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>description</varname></term>
-    <listitem><para>A short (one-line) description of the package.
-    This is shown by <command>nix-env -q --description</command> and
-    also on the Nixpkgs release pages.</para>
-
-    <para>Don’t include a period at the end.  Don’t include newline
-    characters.  Capitalise the first character.  For brevity, don’t
-    repeat the name of package — just describe what it does.</para>
-
-    <para>Wrong: <literal>"libpng is a library that allows you to decode PNG images."</literal></para>
-
-    <para>Right: <literal>"A library for decoding PNG images"</literal></para>
-
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>longDescription</varname></term>
-    <listitem><para>An arbitrarily long description of the
-    package.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>branch</varname></term>
-    <listitem><para>Release branch. Used to specify that a package is not
-    going to receive updates that are not in this branch; for example, Linux
-    kernel 3.0 is supposed to be updated to 3.0.X, not 3.1.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>homepage</varname></term>
-    <listitem><para>The package’s homepage.  Example:
-    <literal>http://www.gnu.org/software/hello/manual/</literal></para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>downloadPage</varname></term>
-    <listitem><para>The page where a link to the current version can be found.  Example:
-    <literal>http://ftp.gnu.org/gnu/hello/</literal></para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>license</varname></term>
+  <variablelist>
+   <varlistentry>
+    <term><varname>description</varname>
+    </term>
     <listitem>
-      <para>
-        The license, or licenses, for the package. One from the attribute set
-        defined in <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
-          <filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment
-        using both a list of licenses and a single license is valid. If the
-        license field is in the form of a list representation, then it means
-        that parts of the package are licensed differently.  Each license
-        should preferably be referenced by their attribute. The non-list
-        attribute value can also be a space delimited string representation of
-        the contained attribute shortNames or spdxIds. The following are all valid
-        examples:
-        <itemizedlist>
-          <listitem><para>Single license referenced by attribute (preferred)
-              <literal>stdenv.lib.licenses.gpl3</literal>.
-          </para></listitem>
-          <listitem><para>Single license referenced by its attribute shortName (frowned upon)
-              <literal>"gpl3"</literal>.
-          </para></listitem>
-          <listitem><para>Single license referenced by its attribute spdxId (frowned upon)
-              <literal>"GPL-3.0"</literal>.
-          </para></listitem>
-          <listitem><para>Multiple licenses referenced by attribute (preferred)
-              <literal>with stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
-          </para></listitem>
-          <listitem><para>Multiple licenses referenced as a space delimited string of attribute shortNames (frowned upon)
-              <literal>"asl20 free ofl"</literal>.
-          </para></listitem>
-        </itemizedlist>
-        For details, see <xref linkend='sec-meta-license'/>.
-      </para>
+     <para>
+      A short (one-line) description of the package. This is shown by
+      <command>nix-env -q --description</command> and also on the Nixpkgs
+      release pages.
+     </para>
+     <para>
+      Don’t include a period at the end. Don’t include newline characters.
+      Capitalise the first character. For brevity, don’t repeat the name of
+      package — just describe what it does.
+     </para>
+     <para>
+      Wrong: <literal>"libpng is a library that allows you to decode PNG
+      images."</literal>
+     </para>
+     <para>
+      Right: <literal>"A library for decoding PNG images"</literal>
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>maintainers</varname></term>
-    <listitem><para>A list of names and e-mail addresses of the
-    maintainers of this Nix expression. If
-    you would like to be a maintainer of a package, you may want to add
-    yourself to <link
+   </varlistentry>
+   <varlistentry>
+    <term><varname>longDescription</varname>
+    </term>
+    <listitem>
+     <para>
+      An arbitrarily long description of the package.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>branch</varname>
+    </term>
+    <listitem>
+     <para>
+      Release branch. Used to specify that a package is not going to receive
+      updates that are not in this branch; for example, Linux kernel 3.0 is
+      supposed to be updated to 3.0.X, not 3.1.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>homepage</varname>
+    </term>
+    <listitem>
+     <para>
+      The package’s homepage. Example:
+      <literal>http://www.gnu.org/software/hello/manual/</literal>
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>downloadPage</varname>
+    </term>
+    <listitem>
+     <para>
+      The page where a link to the current version can be found. Example:
+      <literal>http://ftp.gnu.org/gnu/hello/</literal>
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>license</varname>
+    </term>
+    <listitem>
+     <para>
+      The license, or licenses, for the package. One from the attribute set
+      defined in
+      <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
+      <filename>nixpkgs/lib/licenses.nix</filename></link>. At this moment
+      using both a list of licenses and a single license is valid. If the
+      license field is in the form of a list representation, then it means that
+      parts of the package are licensed differently. Each license should
+      preferably be referenced by their attribute. The non-list attribute value
+      can also be a space delimited string representation of the contained
+      attribute shortNames or spdxIds. The following are all valid examples:
+      <itemizedlist>
+       <listitem>
+        <para>
+         Single license referenced by attribute (preferred)
+         <literal>stdenv.lib.licenses.gpl3</literal>.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Single license referenced by its attribute shortName (frowned upon)
+         <literal>"gpl3"</literal>.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Single license referenced by its attribute spdxId (frowned upon)
+         <literal>"GPL-3.0"</literal>.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Multiple licenses referenced by attribute (preferred) <literal>with
+         stdenv.lib.licenses; [ asl20 free ofl ]</literal>.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Multiple licenses referenced as a space delimited string of attribute
+         shortNames (frowned upon) <literal>"asl20 free ofl"</literal>.
+        </para>
+       </listitem>
+      </itemizedlist>
+      For details, see <xref linkend='sec-meta-license'/>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>maintainers</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of names and e-mail addresses of the maintainers of this Nix
+      expression. If you would like to be a maintainer of a package, you may
+      want to add yourself to
+      <link
     xlink:href="https://github.com/NixOS/nixpkgs/blob/master/maintainers/maintainer-list.nix"><filename>nixpkgs/maintainers/maintainer-list.nix</filename></link>
-    and write something like <literal>[ stdenv.lib.maintainers.alice
-    stdenv.lib.maintainers.bob ]</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>priority</varname></term>
-    <listitem><para>The <emphasis>priority</emphasis> of the package,
-    used by <command>nix-env</command> to resolve file name conflicts
-    between packages.  See the Nix manual page for
-    <command>nix-env</command> for details.  Example:
-    <literal>"10"</literal> (a low-priority
-    package).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>platforms</varname></term>
-    <listitem><para>The list of Nix platform types on which the
-    package is supported. Hydra builds packages according to the
-    platform specified. If no platform is specified, the package does
-    not have prebuilt binaries. An example is:
-
+      and write something like <literal>[ stdenv.lib.maintainers.alice
+      stdenv.lib.maintainers.bob ]</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>priority</varname>
+    </term>
+    <listitem>
+     <para>
+      The <emphasis>priority</emphasis> of the package, used by
+      <command>nix-env</command> to resolve file name conflicts between
+      packages. See the Nix manual page for <command>nix-env</command> for
+      details. Example: <literal>"10"</literal> (a low-priority package).
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>platforms</varname>
+    </term>
+    <listitem>
+     <para>
+      The list of Nix platform types on which the package is supported. Hydra
+      builds packages according to the platform specified. If no platform is
+      specified, the package does not have prebuilt binaries. An example is:
 <programlisting>
 meta.platforms = stdenv.lib.platforms.linux;
 </programlisting>
-
-    Attribute Set <varname>stdenv.lib.platforms</varname> defines
-    <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix">
-    various common lists</link> of platforms types.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>hydraPlatforms</varname></term>
-    <listitem><para>The list of Nix platform types for which the Hydra
-    instance at <literal>hydra.nixos.org</literal> will build the
-    package.  (Hydra is the Nix-based continuous build system.)  It
-    defaults to the value of <varname>meta.platforms</varname>.  Thus,
-    the only reason to set <varname>meta.hydraPlatforms</varname> is
-    if you want <literal>hydra.nixos.org</literal> to build the
-    package on a subset of <varname>meta.platforms</varname>, or not
-    at all, e.g.
-
+      Attribute Set <varname>stdenv.lib.platforms</varname> defines
+      <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/systems/doubles.nix">
+      various common lists</link> of platforms types.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>hydraPlatforms</varname>
+    </term>
+    <listitem>
+     <para>
+      The list of Nix platform types for which the Hydra instance at
+      <literal>hydra.nixos.org</literal> will build the package. (Hydra is the
+      Nix-based continuous build system.) It defaults to the value of
+      <varname>meta.platforms</varname>. Thus, the only reason to set
+      <varname>meta.hydraPlatforms</varname> is if you want
+      <literal>hydra.nixos.org</literal> to build the package on a subset of
+      <varname>meta.platforms</varname>, or not at all, e.g.
 <programlisting>
 meta.platforms = stdenv.lib.platforms.linux;
 meta.hydraPlatforms = [];
 </programlisting>
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>broken</varname>
+    </term>
+    <listitem>
+     <para>
+      If set to <literal>true</literal>, the package is marked as “broken”,
+      meaning that it won’t show up in <literal>nix-env -qa</literal>, and
+      cannot be built or installed. Such packages should be removed from
+      Nixpkgs eventually unless they are fixed.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>updateWalker</varname>
+    </term>
+    <listitem>
+     <para>
+      If set to <literal>true</literal>, the package is tested to be updated
+      correctly by the <literal>update-walker.sh</literal> script without
+      additional settings. Such packages have <varname>meta.version</varname>
+      set and their homepage (or the page specified by
+      <varname>meta.downloadPage</varname>) contains a direct link to the
+      package tarball.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
+ <section xml:id="sec-meta-license">
+  <title>Licenses</title>
 
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>broken</varname></term>
-    <listitem><para>If set to <literal>true</literal>, the package is
-    marked as “broken”, meaning that it won’t show up in
-    <literal>nix-env -qa</literal>, and cannot be built or installed.
-    Such packages should be removed from Nixpkgs eventually unless
-    they are fixed.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>updateWalker</varname></term>
-    <listitem><para>If set to <literal>true</literal>, the package is
-    tested to be updated correctly by the <literal>update-walker.sh</literal>
-    script without additional settings. Such packages have
-    <varname>meta.version</varname> set and their homepage (or
-    the page specified by <varname>meta.downloadPage</varname>) contains
-    a direct link to the package tarball.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-
-</section>
-
-
-<section xml:id="sec-meta-license"><title>Licenses</title>
-
-<para>The <varname>meta.license</varname> attribute should preferrably contain
-a value from <varname>stdenv.lib.licenses</varname> defined in
-<link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
-<filename>nixpkgs/lib/licenses.nix</filename></link>,
-or in-place license description of the same format if the license is
-unlikely to be useful in another expression.</para>
-
-<para>Although it's typically better to indicate the specific license,
-a few generic options are available:
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>stdenv.lib.licenses.free</varname>,
-    <varname>"free"</varname></term>
-
-    <listitem><para>Catch-all for free software licenses not listed
-    above.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
-    <varname>"unfree-redistributable"</varname></term>
-
-    <listitem><para>Unfree package that can be redistributed in binary
-    form. That is, it’s legal to redistribute the
-    <emphasis>output</emphasis> of the derivation.  This means that
-    the package can be included in the Nixpkgs
-    channel.</para>
-
-    <para>Sometimes proprietary software can only be redistributed
-    unmodified. Make sure the builder doesn’t actually modify the
-    original binaries; otherwise we’re breaking the license.  For
-    instance, the NVIDIA X11 drivers can be redistributed unmodified,
-    but our builder applies <command>patchelf</command> to make them
-    work. Thus, its license is <varname>"unfree"</varname> and it
-    cannot be included in the Nixpkgs channel.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>stdenv.lib.licenses.unfree</varname>,
-    <varname>"unfree"</varname></term>
-
-    <listitem><para>Unfree package that cannot be redistributed. You
-    can build it yourself, but you cannot redistribute the output of
-    the derivation. Thus it cannot be included in the Nixpkgs
-    channel.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
-    <varname>"unfree-redistributable-firmware"</varname></term>
-
-    <listitem><para>This package supplies unfree, redistributable
-    firmware.  This is a separate value from
-    <varname>unfree-redistributable</varname> because not everybody
-    cares whether firmware is free.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-
-</section>
-
+  <para>
+   The <varname>meta.license</varname> attribute should preferrably contain a
+   value from <varname>stdenv.lib.licenses</varname> defined in
+   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
+   <filename>nixpkgs/lib/licenses.nix</filename></link>, or in-place license
+   description of the same format if the license is unlikely to be useful in
+   another expression.
+  </para>
 
+  <para>
+   Although it's typically better to indicate the specific license, a few
+   generic options are available:
+   <variablelist>
+    <varlistentry>
+     <term><varname>stdenv.lib.licenses.free</varname>,
+    <varname>"free"</varname>
+     </term>
+     <listitem>
+      <para>
+       Catch-all for free software licenses not listed above.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
+    <varname>"unfree-redistributable"</varname>
+     </term>
+     <listitem>
+      <para>
+       Unfree package that can be redistributed in binary form. That is, it’s
+       legal to redistribute the <emphasis>output</emphasis> of the derivation.
+       This means that the package can be included in the Nixpkgs channel.
+      </para>
+      <para>
+       Sometimes proprietary software can only be redistributed unmodified.
+       Make sure the builder doesn’t actually modify the original binaries;
+       otherwise we’re breaking the license. For instance, the NVIDIA X11
+       drivers can be redistributed unmodified, but our builder applies
+       <command>patchelf</command> to make them work. Thus, its license is
+       <varname>"unfree"</varname> and it cannot be included in the Nixpkgs
+       channel.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>stdenv.lib.licenses.unfree</varname>,
+    <varname>"unfree"</varname>
+     </term>
+     <listitem>
+      <para>
+       Unfree package that cannot be redistributed. You can build it yourself,
+       but you cannot redistribute the output of the derivation. Thus it cannot
+       be included in the Nixpkgs channel.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
+    <varname>"unfree-redistributable-firmware"</varname>
+     </term>
+     <listitem>
+      <para>
+       This package supplies unfree, redistributable firmware. This is a
+       separate value from <varname>unfree-redistributable</varname> because
+       not everybody cares whether firmware is free.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </section>
 </chapter>
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index 277d3d814136..040c12c92913 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -5,105 +5,319 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-multiple-output">
+ <title>Multiple-output packages</title>
+ <section>
+  <title>Introduction</title>
 
-<title>Multiple-output packages</title>
+  <para>
+   The Nix language allows a derivation to produce multiple outputs, which is
+   similar to what is utilized by other Linux distribution packaging systems.
+   The outputs reside in separate nix store paths, so they can be mostly
+   handled independently of each other, including passing to build inputs,
+   garbage collection or binary substitution. The exception is that building
+   from source always produces all the outputs.
+  </para>
 
-<section><title>Introduction</title>
-  <para>The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems.  The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution.  The exception is that building from source always produces all the outputs.</para>
-  <para>The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced.  Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime.  As a result, closure sizes of many packages can get reduced to a half or even much less.</para>
-  <note><para>The reduction effects could be instead achieved by building the parts in completely separate derivations.  That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once.  This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.</para></note>
-</section>
+  <para>
+   The main motivation is to save disk space by reducing runtime closure sizes;
+   consequently also sizes of substituted binaries get reduced. Splitting can
+   be used to have more granular runtime dependencies, for example the typical
+   reduction is to split away development-only files, as those are typically
+   not needed during runtime. As a result, closure sizes of many packages can
+   get reduced to a half or even much less.
+  </para>
+
+  <note>
+   <para>
+    The reduction effects could be instead achieved by building the parts in
+    completely separate derivations. That would often additionally reduce
+    build-time closures, but it tends to be much harder to write such
+    derivations, as build systems typically assume all parts are being built at
+    once. This compromise approach of single source package producing multiple
+    binary packages is also utilized often by rpm and deb.
+   </para>
+  </note>
+ </section>
+ <section>
+  <title>Installing a split package</title>
+
+  <para>
+   When installing a package via <varname>systemPackages</varname> or
+   <command>nix-env</command> you have several options:
+  </para>
 
-<section><title>Installing a split package</title>
-  <para>When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:</para>
   <itemizedlist>
-    <listitem><para>You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package.  The <varname>outputs</varname> attribute contains a list of output names.</para></listitem>
-    <listitem><para>You can let it use the default outputs.  These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.</para>
-      <para>TODO: more about tweaking the attribute, etc.</para></listitem>
-    <listitem><para>NixOS provides configuration option <varname>environment.extraOutputsToInstall</varname> that allows adding extra outputs of <varname>environment.systemPackages</varname> atop the default ones.  It's mainly meant for documentation and debug symbols, and it's also modified by specific options.</para>
-      <note><para>At this moment there is no similar configurability for packages installed by <command>nix-env</command>.  You can still use approach from <xref linkend="sec-modify-via-packageOverrides" /> to override <varname>meta.outputsToInstall</varname> attributes, but that's a rather inconvenient way.</para></note>
-    </listitem>
+   <listitem>
+    <para>
+     You can install particular outputs explicitly, as each is available in the
+     Nix language as an attribute of the package. The
+     <varname>outputs</varname> attribute contains a list of output names.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     You can let it use the default outputs. These are handled by
+     <varname>meta.outputsToInstall</varname> attribute that contains a list of
+     output names.
+    </para>
+    <para>
+     TODO: more about tweaking the attribute, etc.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     NixOS provides configuration option
+     <varname>environment.extraOutputsToInstall</varname> that allows adding
+     extra outputs of <varname>environment.systemPackages</varname> atop the
+     default ones. It's mainly meant for documentation and debug symbols, and
+     it's also modified by specific options.
+    </para>
+    <note>
+     <para>
+      At this moment there is no similar configurability for packages installed
+      by <command>nix-env</command>. You can still use approach from
+      <xref linkend="sec-modify-via-packageOverrides" /> to override
+      <varname>meta.outputsToInstall</varname> attributes, but that's a rather
+      inconvenient way.
+     </para>
+    </note>
+   </listitem>
   </itemizedlist>
-</section>
+ </section>
+ <section>
+  <title>Using a split package</title>
 
-<section><title>Using a split package</title>
-  <para>In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.</para>
-  <para>When a multiple-output derivation gets into a build input of another derivation, the <varname>dev</varname> output is added if it exists, otherwise the first output is added. In addition to that, <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are also added. (See <xref linkend="multiple-output-file-type-groups" />.)</para>
-</section>
+  <para>
+   In the Nix language the individual outputs can be reached explicitly as
+   attributes, e.g. <varname>coreutils.info</varname>, but the typical case is
+   just using packages as build inputs.
+  </para>
 
+  <para>
+   When a multiple-output derivation gets into a build input of another
+   derivation, the <varname>dev</varname> output is added if it exists,
+   otherwise the first output is added. In addition to that,
+   <varname>propagatedBuildOutputs</varname> of that package which by default
+   contain <varname>$outputBin</varname> and <varname>$outputLib</varname> are
+   also added. (See <xref linkend="multiple-output-file-type-groups" />.)
+  </para>
+ </section>
+ <section>
+  <title>Writing a split derivation</title>
 
-<section><title>Writing a split derivation</title>
-  <para>Here you find how to write a derivation that produces multiple outputs.</para>
-  <para>In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior.  You can find the source separated in &lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;; it's relatively well-readable.  The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).</para>
-  <programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting>
-  <para>Often such a single line is enough.  For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output. Typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para>
-  <note><para>There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.</para></note>
+  <para>
+   Here you find how to write a derivation that produces multiple outputs.
+  </para>
+
+  <para>
+   In nixpkgs there is a framework supporting multiple-output derivations. It
+   tries to cover most cases by default behavior. You can find the source
+   separated in
+   &lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;;
+   it's relatively well-readable. The whole machinery is triggered by defining
+   the <varname>outputs</varname> attribute to contain the list of desired
+   output names (strings).
+  </para>
+
+<programlisting>outputs = [ "bin" "dev" "out" "doc" ];</programlisting>
+
+  <para>
+   Often such a single line is enough. For each output an equally named
+   environment variable is passed to the builder and contains the path in nix
+   store for that output. Typically you also want to have the main
+   <varname>out</varname> output, as it catches any files that didn't get
+   elsewhere.
+  </para>
+
+  <note>
+   <para>
+    There is a special handling of the <varname>debug</varname> output,
+    described at <xref linkend="stdenv-separateDebugInfo" />.
+   </para>
+  </note>
 
   <section xml:id="multiple-output-file-binaries-first-convention">
-    <title><quote>Binaries first</quote></title>
-    <para>A commonly adopted convention in <literal>nixpkgs</literal> is that executables provided by the package are contained within its first output. This convention allows the dependent packages to reference the executables provided by packages in a uniform manner. For instance, provided with the knowledge that the <literal>perl</literal> package contains a <literal>perl</literal> executable it can be referenced as <literal>${pkgs.perl}/bin/perl</literal> within a Nix derivation that needs to execute a Perl script.</para>
-    <para>The <literal>glibc</literal> package is a deliberate single exception to the <quote>binaries first</quote> convention. The <literal>glibc</literal> has <literal>libs</literal> as its first output allowing the libraries provided by <literal>glibc</literal> to be referenced directly (e.g. <literal>${stdenv.glibc}/lib/ld-linux-x86-64.so.2</literal>). The executables provided by <literal>glibc</literal> can be accessed via its <literal>bin</literal> attribute (e.g. <literal>${stdenv.glibc.bin}/bin/ldd</literal>).</para>
-    <para>The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more details).</para>
+   <title><quote>Binaries first</quote></title>
+
+   <para>
+    A commonly adopted convention in <literal>nixpkgs</literal> is that
+    executables provided by the package are contained within its first output.
+    This convention allows the dependent packages to reference the executables
+    provided by packages in a uniform manner. For instance, provided with the
+    knowledge that the <literal>perl</literal> package contains a
+    <literal>perl</literal> executable it can be referenced as
+    <literal>${pkgs.perl}/bin/perl</literal> within a Nix derivation that needs
+    to execute a Perl script.
+   </para>
+
+   <para>
+    The <literal>glibc</literal> package is a deliberate single exception to
+    the <quote>binaries first</quote> convention. The <literal>glibc</literal>
+    has <literal>libs</literal> as its first output allowing the libraries
+    provided by <literal>glibc</literal> to be referenced directly (e.g.
+    <literal>${stdenv.glibc}/lib/ld-linux-x86-64.so.2</literal>). The
+    executables provided by <literal>glibc</literal> can be accessed via its
+    <literal>bin</literal> attribute (e.g.
+    <literal>${stdenv.glibc.bin}/bin/ldd</literal>).
+   </para>
+
+   <para>
+    The reason for why <literal>glibc</literal> deviates from the convention is
+    because referencing a library provided by <literal>glibc</literal> is a
+    very common operation among Nix packages. For instance, third-party
+    executables packaged by Nix are typically patched and relinked with the
+    relevant version of <literal>glibc</literal> libraries from Nix packages
+    (please see the documentation on
+    <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more
+    details).
+   </para>
   </section>
 
   <section xml:id="multiple-output-file-type-groups">
-    <title>File type groups</title>
-    <para>The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase.  Each group of file types has an <varname>outputFoo</varname> variable specifying the output name where they should go.  If that variable isn't defined by the derivation writer, it is guessed &ndash; a default output name is defined, falling back to other possibilities if the output isn't defined.</para>
-    <variablelist>
+   <title>File type groups</title>
 
-      <varlistentry><term><varname>
-         $outputDev</varname></term><listitem><para>
-         is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files.  They go to <varname>dev</varname> or <varname>out</varname> by default.
-       </para></listitem>
-      </varlistentry>
+   <para>
+    The support code currently recognizes some particular kinds of outputs and
+    either instructs the build system of the package to put files into their
+    desired outputs or it moves the files during the fixup phase. Each group of
+    file types has an <varname>outputFoo</varname> variable specifying the
+    output name where they should go. If that variable isn't defined by the
+    derivation writer, it is guessed &ndash; a default output name is defined,
+    falling back to other possibilities if the output isn't defined.
+   </para>
 
-      <varlistentry><term><varname>
-        $outputBin</varname></term><listitem><para>
-        is meant for user-facing binaries, typically residing in bin/.  They go to <varname>bin</varname> or <varname>out</varname> by default.
-      </para></listitem></varlistentry>
-
-      <varlistentry><term><varname>
-        $outputLib</varname></term><listitem><para>
-        is meant for libraries, typically residing in <filename>lib/</filename> and <filename>libexec/</filename>.  They go to <varname>lib</varname> or <varname>out</varname> by default.
-      </para></listitem></varlistentry>
-
-      <varlistentry><term><varname>
-        $outputDoc</varname></term><listitem><para>
-        is for user documentation, typically residing in <filename>share/doc/</filename>.  It goes to <varname>doc</varname> or <varname>out</varname> by default.
-      </para></listitem></varlistentry>
-
-      <varlistentry><term><varname>
-        $outputDevdoc</varname></term><listitem><para>
-        is for <emphasis>developer</emphasis> documentation.  Currently we count gtk-doc and devhelp books in there.  It goes to <varname>devdoc</varname> or is removed (!) by default.  This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
-      </para></listitem></varlistentry>
-
-      <varlistentry><term><varname>
-        $outputMan</varname></term><listitem><para>
-        is for man pages (except for section 3). They go to <varname>man</varname> or <varname>$outputBin</varname> by default.
-      </para></listitem></varlistentry>
-
-      <varlistentry><term><varname>
-        $outputDevman</varname></term><listitem><para>
-        is for section 3 man pages. They go to <varname>devman</varname> or <varname>$outputMan</varname> by default.
-      </para></listitem></varlistentry>
-
-      <varlistentry><term><varname>
-        $outputInfo</varname></term><listitem><para>
-        is for info pages. They go to <varname>info</varname> or <varname>$outputBin</varname> by default.
-      </para></listitem></varlistentry>
-
-    </variablelist>
+   <variablelist>
+    <varlistentry>
+     <term><varname>
+         $outputDev</varname>
+     </term>
+     <listitem>
+      <para>
+       is for development-only files. These include C(++) headers, pkg-config,
+       cmake and aclocal files. They go to <varname>dev</varname> or
+       <varname>out</varname> by default.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>
+        $outputBin</varname>
+     </term>
+     <listitem>
+      <para>
+       is meant for user-facing binaries, typically residing in bin/. They go
+       to <varname>bin</varname> or <varname>out</varname> by default.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>
+        $outputLib</varname>
+     </term>
+     <listitem>
+      <para>
+       is meant for libraries, typically residing in <filename>lib/</filename>
+       and <filename>libexec/</filename>. They go to <varname>lib</varname> or
+       <varname>out</varname> by default.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>
+        $outputDoc</varname>
+     </term>
+     <listitem>
+      <para>
+       is for user documentation, typically residing in
+       <filename>share/doc/</filename>. It goes to <varname>doc</varname> or
+       <varname>out</varname> by default.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>
+        $outputDevdoc</varname>
+     </term>
+     <listitem>
+      <para>
+       is for <emphasis>developer</emphasis> documentation. Currently we count
+       gtk-doc and devhelp books in there. It goes to <varname>devdoc</varname>
+       or is removed (!) by default. This is because e.g. gtk-doc tends to be
+       rather large and completely unused by nixpkgs users.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>
+        $outputMan</varname>
+     </term>
+     <listitem>
+      <para>
+       is for man pages (except for section 3). They go to
+       <varname>man</varname> or <varname>$outputBin</varname> by default.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>
+        $outputDevman</varname>
+     </term>
+     <listitem>
+      <para>
+       is for section 3 man pages. They go to <varname>devman</varname> or
+       <varname>$outputMan</varname> by default.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>
+        $outputInfo</varname>
+     </term>
+     <listitem>
+      <para>
+       is for info pages. They go to <varname>info</varname> or
+       <varname>$outputBin</varname> by default.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
   </section>
 
-  <section><title>Common caveats</title>
-    <itemizedlist>
-      <listitem><para>Some configure scripts don't like some of the parameters passed by default by the framework, e.g. <literal>--docdir=/foo/bar</literal>.  You can disable this by setting <literal>setOutputFlags = false;</literal>.</para></listitem>
-      <listitem><para>The outputs of a single derivation can retain references to each other, but note that circular references are not allowed.  (And each strongly-connected component would act as a single output anyway.)</para></listitem>
-      <listitem><para>Most of split packages contain their core functionality in libraries.  These libraries tend to refer to various kind of data that typically gets into <varname>out</varname>, e.g. locale strings, so there is often no advantage in separating the libraries into <varname>lib</varname>, as keeping them in <varname>out</varname> is easier.</para></listitem>
-      <listitem><para>Some packages have hidden assumptions on install paths, which complicates splitting.</para></listitem>
-    </itemizedlist>
+  <section>
+   <title>Common caveats</title>
+
+   <itemizedlist>
+    <listitem>
+     <para>
+      Some configure scripts don't like some of the parameters passed by
+      default by the framework, e.g. <literal>--docdir=/foo/bar</literal>. You
+      can disable this by setting <literal>setOutputFlags = false;</literal>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      The outputs of a single derivation can retain references to each other,
+      but note that circular references are not allowed. (And each
+      strongly-connected component would act as a single output anyway.)
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Most of split packages contain their core functionality in libraries.
+      These libraries tend to refer to various kind of data that typically gets
+      into <varname>out</varname>, e.g. locale strings, so there is often no
+      advantage in separating the libraries into <varname>lib</varname>, as
+      keeping them in <varname>out</varname> is easier.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Some packages have hidden assumptions on install paths, which complicates
+      splitting.
+     </para>
+    </listitem>
+   </itemizedlist>
   </section>
-
-</section><!--Writing a split derivation-->
-
+ </section>
+<!--Writing a split derivation-->
 </chapter>
diff --git a/doc/overlays.xml b/doc/overlays.xml
index cc0aef447d2d..2decf9febe80 100644
--- a/doc/overlays.xml
+++ b/doc/overlays.xml
@@ -1,95 +1,117 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-overlays">
-
-<title>Overlays</title>
-
-<para>This chapter describes how to extend and change Nixpkgs packages using
-overlays. Overlays are used to add layers in the fix-point used by Nixpkgs
-to compose the set of all packages.</para>
-
-<para>Nixpkgs can be configured with a list of overlays, which are
-applied in order. This means that the order of the overlays can be significant
-if multiple layers override the same package.</para>
-
+ <title>Overlays</title>
+ <para>
+  This chapter describes how to extend and change Nixpkgs packages using
+  overlays. Overlays are used to add layers in the fix-point used by Nixpkgs to
+  compose the set of all packages.
+ </para>
+ <para>
+  Nixpkgs can be configured with a list of overlays, which are applied in
+  order. This means that the order of the overlays can be significant if
+  multiple layers override the same package.
+ </para>
 <!--============================================================-->
+ <section xml:id="sec-overlays-install">
+  <title>Installing overlays</title>
 
-<section xml:id="sec-overlays-install">
-<title>Installing overlays</title>
+  <para>
+   The list of overlays is determined as follows.
+  </para>
 
-<para>The list of overlays is determined as follows.</para>
+  <para>
+   If the <varname>overlays</varname> argument is not provided explicitly, we
+   look for overlays in a path. The path is determined as follows:
+   <orderedlist>
+    <listitem>
+     <para>
+      First, if an <varname>overlays</varname> argument to the nixpkgs function
+      itself is given, then that is used.
+     </para>
+     <para>
+      This can be passed explicitly when importing nipxkgs, for example
+      <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ];
+      }</literal>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal>
+      exists, we look for overlays at that path, as described below.
+     </para>
+     <para>
+      See the section on <literal>NIX_PATH</literal> in the Nix manual for more
+      details on how to set a value for
+      <literal>&lt;nixpkgs-overlays>.</literal>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
+      <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for
+      overlays at that path, as described below. It is an error if both exist.
+     </para>
+    </listitem>
+   </orderedlist>
+  </para>
 
-<para>If the <varname>overlays</varname> argument is not provided explicitly, we look for overlays in a path. The path
-is determined as follows:
+  <para>
+   If we are looking for overlays at a path, then there are two cases:
+   <itemizedlist>
+    <listitem>
+     <para>
+      If the path is a file, then the file is imported as a Nix expression and
+      used as the list of overlays.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      If the path is a directory, then we take the content of the directory,
+      order it lexicographically, and attempt to interpret each as an overlay
+      by:
+      <itemizedlist>
+       <listitem>
+        <para>
+         Importing the file, if it is a <literal>.nix</literal> file.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Importing a top-level <filename>default.nix</filename> file, if it is
+         a directory.
+        </para>
+       </listitem>
+      </itemizedlist>
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
 
-<orderedlist>
-
-  <listitem>
-    <para>First, if an <varname>overlays</varname> argument to the nixpkgs function itself is given,
-    then that is used.</para>
-
-    <para>This can be passed explicitly when importing nipxkgs, for example 
-    <literal>import &lt;nixpkgs> { overlays = [ overlay1 overlay2 ]; }</literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Otherwise, if the Nix path entry <literal>&lt;nixpkgs-overlays></literal> exists, we look for overlays
-    at that path, as described below.</para>
-
-    <para>See the section on <literal>NIX_PATH</literal> in the Nix manual for more details on how to 
-    set a value for <literal>&lt;nixpkgs-overlays>.</literal></para>
-  </listitem>
-
-  <listitem>
-    <para>If one of <filename>~/.config/nixpkgs/overlays.nix</filename> and
-    <filename>~/.config/nixpkgs/overlays/</filename> exists, then we look for overlays at that path, as
-    described below. It is an error if both exist.</para>
-  </listitem>
-
-</orderedlist>
-</para>
-
-<para>If we are looking for overlays at a path, then there are two cases:
-<itemizedlist>
-  <listitem>
-    <para>If the path is a file, then the file is imported as a Nix expression and used as the list of
-    overlays.</para>
-  </listitem>
-
-  <listitem>
-    <para>If the path is a directory, then we take the content of the directory, order it
-    lexicographically, and attempt to interpret each as an overlay by:
-    <itemizedlist>
-      <listitem>
-        <para>Importing the file, if it is a <literal>.nix</literal> file.</para>
-      </listitem>
-      <listitem>
-        <para>Importing a top-level <filename>default.nix</filename> file, if it is a directory.</para>
-      </listitem>
-    </itemizedlist>
-    </para>
-  </listitem>
-</itemizedlist>
-</para>
-
-<para>On a NixOS system the value of the <literal>nixpkgs.overlays</literal> option, if present, 
-is passed to the system Nixpkgs directly as an argument. Note that this does not affect the overlays for
-non-NixOS operations (e.g. <literal>nix-env</literal>), which are looked up independently.</para>
-
-<para>The <filename>overlays.nix</filename> option therefore provides a convenient way to use the same
-overlays for a NixOS system configuration and user configuration: the same file can be used
-as <filename>overlays.nix</filename> and imported as the value of <literal>nixpkgs.overlays</literal>.</para>
-
-</section>
+  <para>
+   On a NixOS system the value of the <literal>nixpkgs.overlays</literal>
+   option, if present, is passed to the system Nixpkgs directly as an argument.
+   Note that this does not affect the overlays for non-NixOS operations (e.g.
+   <literal>nix-env</literal>), which are looked up independently.
+  </para>
 
+  <para>
+   The <filename>overlays.nix</filename> option therefore provides a convenient
+   way to use the same overlays for a NixOS system configuration and user
+   configuration: the same file can be used as
+   <filename>overlays.nix</filename> and imported as the value of
+   <literal>nixpkgs.overlays</literal>.
+  </para>
+ </section>
 <!--============================================================-->
+ <section xml:id="sec-overlays-definition">
+  <title>Defining overlays</title>
 
-<section xml:id="sec-overlays-definition">
-<title>Defining overlays</title>
-
-<para>Overlays are Nix functions which accept two arguments, 
-conventionally called <varname>self</varname> and <varname>super</varname>, 
-and return a set of packages. For example, the following is a valid overlay.</para>
+  <para>
+   Overlays are Nix functions which accept two arguments, conventionally called
+   <varname>self</varname> and <varname>super</varname>, and return a set of
+   packages. For example, the following is a valid overlay.
+  </para>
 
 <programlisting>
 self: super:
@@ -104,31 +126,39 @@ self: super:
 }
 </programlisting>
 
-<para>The first argument (<varname>self</varname>) corresponds to the final package
-set. You should use this set for the dependencies of all packages specified in your
-overlay. For example, all the dependencies of <varname>rr</varname> in the example above come
-from <varname>self</varname>, as well as the overridden dependencies used in the
-<varname>boost</varname> override.</para>
+  <para>
+   The first argument (<varname>self</varname>) corresponds to the final
+   package set. You should use this set for the dependencies of all packages
+   specified in your overlay. For example, all the dependencies of
+   <varname>rr</varname> in the example above come from
+   <varname>self</varname>, as well as the overridden dependencies used in the
+   <varname>boost</varname> override.
+  </para>
 
-<para>The second argument (<varname>super</varname>)
-corresponds to the result of the evaluation of the previous stages of
-Nixpkgs. It does not contain any of the packages added by the current
-overlay, nor any of the following overlays. This set should be used either
-to refer to packages you wish to override, or to access functions defined
-in Nixpkgs. For example, the original recipe of <varname>boost</varname>
-in the above example, comes from <varname>super</varname>, as well as the
-<varname>callPackage</varname> function.</para>
+  <para>
+   The second argument (<varname>super</varname>) corresponds to the result of
+   the evaluation of the previous stages of Nixpkgs. It does not contain any of
+   the packages added by the current overlay, nor any of the following
+   overlays. This set should be used either to refer to packages you wish to
+   override, or to access functions defined in Nixpkgs. For example, the
+   original recipe of <varname>boost</varname> in the above example, comes from
+   <varname>super</varname>, as well as the <varname>callPackage</varname>
+   function.
+  </para>
 
-<para>The value returned by this function should be a set similar to
-<filename>pkgs/top-level/all-packages.nix</filename>, containing
-overridden and/or new packages.</para>
-
-<para>Overlays are similar to other methods for customizing Nixpkgs, in particular
-the <literal>packageOverrides</literal> attribute described in <xref linkend="sec-modify-via-packageOverrides"/>.
-Indeed, <literal>packageOverrides</literal> acts as an overlay with only the 
-<varname>super</varname> argument. It is therefore appropriate for basic use, 
-but overlays are more powerful and easier to distribute.</para>
-
-</section>
+  <para>
+   The value returned by this function should be a set similar to
+   <filename>pkgs/top-level/all-packages.nix</filename>, containing overridden
+   and/or new packages.
+  </para>
 
+  <para>
+   Overlays are similar to other methods for customizing Nixpkgs, in particular
+   the <literal>packageOverrides</literal> attribute described in
+   <xref linkend="sec-modify-via-packageOverrides"/>. Indeed,
+   <literal>packageOverrides</literal> acts as an overlay with only the
+   <varname>super</varname> argument. It is therefore appropriate for basic
+   use, but overlays are more powerful and easier to distribute.
+  </para>
+ </section>
 </chapter>
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 1fccfd5d329d..f16826ae6806 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -1,206 +1,185 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-package-notes">
-
-<title>Package Notes</title>
-
-<para>This chapter contains information about how to use and maintain
-the Nix expressions for a number of specific packages, such as the
-Linux kernel or X.org.</para>
-
-
+ <title>Package Notes</title>
+ <para>
+  This chapter contains information about how to use and maintain the Nix
+  expressions for a number of specific packages, such as the Linux kernel or
+  X.org.
+ </para>
 <!--============================================================-->
+ <section xml:id="sec-linux-kernel">
+  <title>Linux kernel</title>
 
-<section xml:id="sec-linux-kernel">
+  <para>
+   The Nix expressions to build the Linux kernel are in
+   <link
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.
+  </para>
 
-<title>Linux kernel</title>
-
-<para>The Nix expressions to build the Linux kernel are in <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel"><filename>pkgs/os-specific/linux/kernel</filename></link>.</para>
-
-<para>The function that builds the kernel has an argument
-<varname>kernelPatches</varname> which should be a list of
-<literal>{name, patch, extraConfig}</literal> attribute sets, where
-<varname>name</varname> is the name of the patch (which is included in
-the kernel’s <varname>meta.description</varname> attribute),
-<varname>patch</varname> is the patch itself (possibly compressed),
-and <varname>extraConfig</varname> (optional) is a string specifying
-extra options to be concatenated to the kernel configuration file
-(<filename>.config</filename>).</para>
-
-<para>The kernel derivation exports an attribute
-<varname>features</varname> specifying whether optional functionality
-is or isn’t enabled.  This is used in NixOS to implement
-kernel-specific behaviour.  For instance, if the kernel has the
-<varname>iwlwifi</varname> feature (i.e. has built-in support for
-Intel wireless chipsets), then NixOS doesn’t have to build the
-external <varname>iwlwifi</varname> package:
+  <para>
+   The function that builds the kernel has an argument
+   <varname>kernelPatches</varname> which should be a list of <literal>{name,
+   patch, extraConfig}</literal> attribute sets, where <varname>name</varname>
+   is the name of the patch (which is included in the kernel’s
+   <varname>meta.description</varname> attribute), <varname>patch</varname> is
+   the patch itself (possibly compressed), and <varname>extraConfig</varname>
+   (optional) is a string specifying extra options to be concatenated to the
+   kernel configuration file (<filename>.config</filename>).
+  </para>
 
+  <para>
+   The kernel derivation exports an attribute <varname>features</varname>
+   specifying whether optional functionality is or isn’t enabled. This is
+   used in NixOS to implement kernel-specific behaviour. For instance, if the
+   kernel has the <varname>iwlwifi</varname> feature (i.e. has built-in support
+   for Intel wireless chipsets), then NixOS doesn’t have to build the
+   external <varname>iwlwifi</varname> package:
 <programlisting>
 modulesTree = [kernel]
   ++ pkgs.lib.optional (!kernel.features ? iwlwifi) kernelPackages.iwlwifi
   ++ ...;
 </programlisting>
+  </para>
 
-</para>
-
-<para>How to add a new (major) version of the Linux kernel to Nixpkgs:
-
-<orderedlist>
-
-  <listitem>
-    <para>Copy the old Nix expression
-    (e.g. <filename>linux-2.6.21.nix</filename>) to the new one
-    (e.g. <filename>linux-2.6.22.nix</filename>) and update it.</para>
-  </listitem>
-
-  <listitem>
-    <para>Add the new kernel to <filename>all-packages.nix</filename>
-    (e.g., create an attribute
-    <varname>kernel_2_6_22</varname>).</para>
-  </listitem>
-
-  <listitem>
-    <para>Now we’re going to update the kernel configuration.  First
-    unpack the kernel.  Then for each supported platform
-    (<literal>i686</literal>, <literal>x86_64</literal>,
-    <literal>uml</literal>) do the following:
-
+  <para>
+   How to add a new (major) version of the Linux kernel to Nixpkgs:
+   <orderedlist>
+    <listitem>
+     <para>
+      Copy the old Nix expression (e.g. <filename>linux-2.6.21.nix</filename>)
+      to the new one (e.g. <filename>linux-2.6.22.nix</filename>) and update
+      it.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Add the new kernel to <filename>all-packages.nix</filename> (e.g., create
+      an attribute <varname>kernel_2_6_22</varname>).
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Now we’re going to update the kernel configuration. First unpack the
+      kernel. Then for each supported platform (<literal>i686</literal>,
+      <literal>x86_64</literal>, <literal>uml</literal>) do the following:
       <orderedlist>
-
-        <listitem>
-          <para>Make an copy from the old
-          config (e.g. <filename>config-2.6.21-i686-smp</filename>) to
-          the new one
-          (e.g. <filename>config-2.6.22-i686-smp</filename>).</para>
-        </listitem>
-
-        <listitem>
-          <para>Copy the config file for this platform
-          (e.g. <filename>config-2.6.22-i686-smp</filename>) to
-          <filename>.config</filename> in the kernel source tree.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>Run <literal>make oldconfig
-          ARCH=<replaceable>{i386,x86_64,um}</replaceable></literal>
-          and answer all questions.  (For the uml configuration, also
-          add <literal>SHELL=bash</literal>.)  Make sure to keep the
-          configuration consistent between platforms (i.e. don’t
-          enable some feature on <literal>i686</literal> and disable
-          it on <literal>x86_64</literal>).
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>If needed you can also run <literal>make
-          menuconfig</literal>:
-
-            <screen>
+       <listitem>
+        <para>
+         Make an copy from the old config (e.g.
+         <filename>config-2.6.21-i686-smp</filename>) to the new one (e.g.
+         <filename>config-2.6.22-i686-smp</filename>).
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Copy the config file for this platform (e.g.
+         <filename>config-2.6.22-i686-smp</filename>) to
+         <filename>.config</filename> in the kernel source tree.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Run <literal>make oldconfig
+         ARCH=<replaceable>{i386,x86_64,um}</replaceable></literal> and answer
+         all questions. (For the uml configuration, also add
+         <literal>SHELL=bash</literal>.) Make sure to keep the configuration
+         consistent between platforms (i.e. don’t enable some feature on
+         <literal>i686</literal> and disable it on <literal>x86_64</literal>).
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         If needed you can also run <literal>make menuconfig</literal>:
+<screen>
 $ nix-env -i ncurses
 $ export NIX_CFLAGS_LINK=-lncurses
 $ make menuconfig ARCH=<replaceable>arch</replaceable></screen>
-
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>Copy <filename>.config</filename> over the new config
-          file (e.g. <filename>config-2.6.22-i686-smp</filename>).</para>
-        </listitem>
-
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Copy <filename>.config</filename> over the new config file (e.g.
+         <filename>config-2.6.22-i686-smp</filename>).
+        </para>
+       </listitem>
       </orderedlist>
-
-    </para>
-
-  </listitem>
-
-  <listitem>
-    <para>Test building the kernel: <literal>nix-build -A
-    kernel_2_6_22</literal>.  If it compiles, ship it!  For extra
-    credit, try booting NixOS with it.</para>
-  </listitem>
-
-  <listitem>
-    <para>It may be that the new kernel requires updating the external
-    kernel modules and kernel-dependent packages listed in the
-    <varname>linuxPackagesFor</varname> function in
-    <filename>all-packages.nix</filename> (such as the NVIDIA drivers,
-    AUFS, etc.).  If the updated packages aren’t backwards compatible
-    with older kernels, you may need to keep the older versions
-    around.</para>
-  </listitem>
-
-</orderedlist>
-
-</para>
-
-</section>
-
-
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Test building the kernel: <literal>nix-build -A kernel_2_6_22</literal>.
+      If it compiles, ship it! For extra credit, try booting NixOS with it.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      It may be that the new kernel requires updating the external kernel
+      modules and kernel-dependent packages listed in the
+      <varname>linuxPackagesFor</varname> function in
+      <filename>all-packages.nix</filename> (such as the NVIDIA drivers, AUFS,
+      etc.). If the updated packages aren’t backwards compatible with older
+      kernels, you may need to keep the older versions around.
+     </para>
+    </listitem>
+   </orderedlist>
+  </para>
+ </section>
 <!--============================================================-->
+ <section xml:id="sec-xorg">
+  <title>X.org</title>
 
-<section xml:id="sec-xorg">
-
-<title>X.org</title>
-
-<para>The Nix expressions for the X.org packages reside in
-<filename>pkgs/servers/x11/xorg/default.nix</filename>.  This file is
-automatically generated from lists of tarballs in an X.org release.
-As such it should not be modified directly; rather, you should modify
-the lists, the generator script or the file
-<filename>pkgs/servers/x11/xorg/overrides.nix</filename>, in which you
-can override or add to the derivations produced by the
-generator.</para>
-
-<para>The generator is invoked as follows:
+  <para>
+   The Nix expressions for the X.org packages reside in
+   <filename>pkgs/servers/x11/xorg/default.nix</filename>. This file is
+   automatically generated from lists of tarballs in an X.org release. As such
+   it should not be modified directly; rather, you should modify the lists, the
+   generator script or the file
+   <filename>pkgs/servers/x11/xorg/overrides.nix</filename>, in which you can
+   override or add to the derivations produced by the generator.
+  </para>
 
+  <para>
+   The generator is invoked as follows:
 <screen>
 $ cd pkgs/servers/x11/xorg
 $ cat tarballs-7.5.list extra.list old.list \
   | perl ./generate-expr-from-tarballs.pl
 </screen>
+   For each of the tarballs in the <filename>.list</filename> files, the script
+   downloads it, unpacks it, and searches its <filename>configure.ac</filename>
+   and <filename>*.pc.in</filename> files for dependencies. This information is
+   used to generate <filename>default.nix</filename>. The generator caches
+   downloaded tarballs between runs. Pay close attention to the <literal>NOT
+   FOUND: <replaceable>name</replaceable></literal> messages at the end of the
+   run, since they may indicate missing dependencies. (Some might be optional
+   dependencies, however.)
+  </para>
 
-For each of the tarballs in the <filename>.list</filename> files, the
-script downloads it, unpacks it, and searches its
-<filename>configure.ac</filename> and <filename>*.pc.in</filename>
-files for dependencies.  This information is used to generate
-<filename>default.nix</filename>.  The generator caches downloaded
-tarballs between runs.  Pay close attention to the <literal>NOT FOUND:
-<replaceable>name</replaceable></literal> messages at the end of the
-run, since they may indicate missing dependencies.  (Some might be
-optional dependencies, however.)</para>
-
-<para>A file like <filename>tarballs-7.5.list</filename> contains all
-tarballs in a X.org release.  It can be generated like this:
-
+  <para>
+   A file like <filename>tarballs-7.5.list</filename> contains all tarballs in
+   a X.org release. It can be generated like this:
 <screen>
 $ export i="mirror://xorg/X11R7.4/src/everything/"
 $ cat $(PRINT_PATH=1 nix-prefetch-url $i | tail -n 1) \
   | perl -e 'while (&lt;>) { if (/(href|HREF)="([^"]*.bz2)"/) { print "$ENV{'i'}$2\n"; }; }' \
   | sort > tarballs-7.4.list
 </screen>
+   <filename>extra.list</filename> contains libraries that aren’t part of
+   X.org proper, but are closely related to it, such as
+   <literal>libxcb</literal>. <filename>old.list</filename> contains some
+   packages that were removed from X.org, but are still needed by some people
+   or by other packages (such as <varname>imake</varname>).
+  </para>
 
-<filename>extra.list</filename> contains libraries that aren’t part of
-X.org proper, but are closely related to it, such as
-<literal>libxcb</literal>.  <filename>old.list</filename> contains
-some packages that were removed from X.org, but are still needed by
-some people or by other packages (such as
-<varname>imake</varname>).</para>
-
-<para>If the expression for a package requires derivation attributes
-that the generator cannot figure out automatically (say,
-<varname>patches</varname> or a <varname>postInstall</varname> hook),
-you should modify
-<filename>pkgs/servers/x11/xorg/overrides.nix</filename>.</para>
-
-</section>
-
-
-
+  <para>
+   If the expression for a package requires derivation attributes that the
+   generator cannot figure out automatically (say, <varname>patches</varname>
+   or a <varname>postInstall</varname> hook), you should modify
+   <filename>pkgs/servers/x11/xorg/overrides.nix</filename>.
+  </para>
+ </section>
 <!--============================================================-->
-
 <!--
 <section>
   <title>Gnome</title>
@@ -208,65 +187,53 @@ you should modify
   <para>* How to update</para>
 </section>
 -->
-
-
 <!--============================================================-->
-
 <!--
 <section>
   <title>GCC</title>
   <para>…</para>
 </section>
 -->
-
 <!--============================================================-->
-
-<section xml:id="sec-eclipse">
-
+ <section xml:id="sec-eclipse">
   <title>Eclipse</title>
 
   <para>
-    The Nix expressions related to the Eclipse platform and IDE are in
-    <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>.
+   The Nix expressions related to the Eclipse platform and IDE are in
+   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/eclipse"><filename>pkgs/applications/editors/eclipse</filename></link>.
   </para>
 
   <para>
-    Nixpkgs provides a number of packages that will install Eclipse in
-    its various forms, these range from the bare-bones Eclipse
-    Platform to the more fully featured Eclipse SDK or Scala-IDE
-    packages and multiple version are often available. It is possible
-    to list available Eclipse packages by issuing the command:
-
+   Nixpkgs provides a number of packages that will install Eclipse in its
+   various forms, these range from the bare-bones Eclipse Platform to the more
+   fully featured Eclipse SDK or Scala-IDE packages and multiple version are
+   often available. It is possible to list available Eclipse packages by
+   issuing the command:
 <screen>
 $ nix-env -f '&lt;nixpkgs&gt;' -qaP -A eclipses --description
 </screen>
-
-    Once an Eclipse variant is installed it can be run using the
-    <command>eclipse</command> command, as expected. From within
-    Eclipse it is then possible to install plugins in the usual manner
-    by either manually specifying an Eclipse update site or by
-    installing the Marketplace Client plugin and using it to discover
-    and install other plugins. This installation method provides an
-    Eclipse installation that closely resemble a manually installed
-    Eclipse.
+   Once an Eclipse variant is installed it can be run using the
+   <command>eclipse</command> command, as expected. From within Eclipse it is
+   then possible to install plugins in the usual manner by either manually
+   specifying an Eclipse update site or by installing the Marketplace Client
+   plugin and using it to discover and install other plugins. This installation
+   method provides an Eclipse installation that closely resemble a manually
+   installed Eclipse.
   </para>
 
   <para>
-    If you prefer to install plugins in a more declarative manner then
-    Nixpkgs also offer a number of Eclipse plugins that can be
-    installed in an <emphasis>Eclipse environment</emphasis>. This
-    type of environment is created using the function
-    <varname>eclipseWithPlugins</varname> found inside the
-    <varname>nixpkgs.eclipses</varname> attribute set. This function
-    takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? []
-    }</literal> where <varname>eclipse</varname> is a one of the
-    Eclipse packages described above, <varname>plugins</varname> is a
-    list of plugin derivations, and <varname>jvmArgs</varname> is a
-    list of arguments given to the JVM running the Eclipse. For
-    example, say you wish to install the latest Eclipse Platform with
-    the popular Eclipse Color Theme plugin and also allow Eclipse to
-    use more RAM. You could then add
-
+   If you prefer to install plugins in a more declarative manner then Nixpkgs
+   also offer a number of Eclipse plugins that can be installed in an
+   <emphasis>Eclipse environment</emphasis>. This type of environment is
+   created using the function <varname>eclipseWithPlugins</varname> found
+   inside the <varname>nixpkgs.eclipses</varname> attribute set. This function
+   takes as argument <literal>{ eclipse, plugins ? [], jvmArgs ? [] }</literal>
+   where <varname>eclipse</varname> is a one of the Eclipse packages described
+   above, <varname>plugins</varname> is a list of plugin derivations, and
+   <varname>jvmArgs</varname> is a list of arguments given to the JVM running
+   the Eclipse. For example, say you wish to install the latest Eclipse
+   Platform with the popular Eclipse Color Theme plugin and also allow Eclipse
+   to use more RAM. You could then add
 <screen>
 packageOverrides = pkgs: {
   myEclipse = with pkgs.eclipses; eclipseWithPlugins {
@@ -276,42 +243,38 @@ packageOverrides = pkgs: {
   };
 }
 </screen>
-
-    to your Nixpkgs configuration
-    (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by
-    running <command>nix-env -f '&lt;nixpkgs&gt;' -iA
-    myEclipse</command> and afterward run Eclipse as usual. It is
-    possible to find out which plugins are available for installation
-    using <varname>eclipseWithPlugins</varname> by running
-
+   to your Nixpkgs configuration
+   (<filename>~/.config/nixpkgs/config.nix</filename>) and install it by
+   running <command>nix-env -f '&lt;nixpkgs&gt;' -iA myEclipse</command> and
+   afterward run Eclipse as usual. It is possible to find out which plugins are
+   available for installation using <varname>eclipseWithPlugins</varname> by
+   running
 <screen>
 $ nix-env -f '&lt;nixpkgs&gt;' -qaP -A eclipses.plugins --description
 </screen>
   </para>
 
   <para>
-    If there is a need to install plugins that are not available in
-    Nixpkgs then it may be possible to define these plugins outside
-    Nixpkgs using the <varname>buildEclipseUpdateSite</varname> and
-    <varname>buildEclipsePlugin</varname> functions found in the
-    <varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the
-    <varname>buildEclipseUpdateSite</varname> function to install a
-    plugin distributed as an Eclipse update site. This function takes
-    <literal>{ name, src }</literal> as argument where
-    <literal>src</literal> indicates the Eclipse update site archive.
-    All Eclipse features and plugins within the downloaded update site
-    will be installed. When an update site archive is not available
-    then the <varname>buildEclipsePlugin</varname> function can be
-    used to install a plugin that consists of a pair of feature and
-    plugin JARs. This function takes an argument <literal>{ name,
-    srcFeature, srcPlugin }</literal> where
-    <literal>srcFeature</literal> and <literal>srcPlugin</literal> are
-    the feature and plugin JARs, respectively.
+   If there is a need to install plugins that are not available in Nixpkgs then
+   it may be possible to define these plugins outside Nixpkgs using the
+   <varname>buildEclipseUpdateSite</varname> and
+   <varname>buildEclipsePlugin</varname> functions found in the
+   <varname>nixpkgs.eclipses.plugins</varname> attribute set. Use the
+   <varname>buildEclipseUpdateSite</varname> function to install a plugin
+   distributed as an Eclipse update site. This function takes <literal>{ name,
+   src }</literal> as argument where <literal>src</literal> indicates the
+   Eclipse update site archive. All Eclipse features and plugins within the
+   downloaded update site will be installed. When an update site archive is not
+   available then the <varname>buildEclipsePlugin</varname> function can be
+   used to install a plugin that consists of a pair of feature and plugin JARs.
+   This function takes an argument <literal>{ name, srcFeature, srcPlugin
+   }</literal> where <literal>srcFeature</literal> and
+   <literal>srcPlugin</literal> are the feature and plugin JARs, respectively.
   </para>
 
   <para>
-    Expanding the previous example with two plugins using the above
-    functions we have
+   Expanding the previous example with two plugins using the above functions we
+   have
 <screen>
 packageOverrides = pkgs: {
   myEclipse = with pkgs.eclipses; eclipseWithPlugins {
@@ -343,210 +306,214 @@ packageOverrides = pkgs: {
 }
 </screen>
   </para>
+ </section>
+ <section xml:id="sec-elm">
+  <title>Elm</title>
 
-</section>
+  <para>
+   The Nix expressions for Elm reside in
+   <filename>pkgs/development/compilers/elm</filename>. They are generated
+   automatically by <command>update-elm.rb</command> script. One should specify
+   versions of Elm packages inside the script, clear the
+   <filename>packages</filename> directory and run the script from inside it.
+   <literal>elm-reactor</literal> is special because it also has Elm package
+   dependencies. The process is not automated very much for now -- you should
+   get the <literal>elm-reactor</literal> source tree (e.g. with
+   <command>nix-shell</command>) and run <command>elm2nix.rb</command> inside
+   it. Place the resulting <filename>package.nix</filename> file into
+   <filename>packages/elm-reactor-elm.nix</filename>.
+  </para>
+ </section>
+ <section xml:id="sec-shell-helpers">
+  <title>Interactive shell helpers</title>
 
-<section xml:id="sec-elm">
-
-<title>Elm</title>
-
-<para>
-The Nix expressions for Elm reside in
-<filename>pkgs/development/compilers/elm</filename>. They are generated
-automatically by <command>update-elm.rb</command> script. One should
-specify versions of Elm packages inside the script, clear the
-<filename>packages</filename> directory and run the script from inside it.
-<literal>elm-reactor</literal> is special because it also has Elm package
-dependencies. The process is not automated very much for now -- you should
-get the <literal>elm-reactor</literal> source tree (e.g. with
-<command>nix-shell</command>) and run <command>elm2nix.rb</command> inside
-it. Place the resulting <filename>package.nix</filename> file into
-<filename>packages/elm-reactor-elm.nix</filename>.
-</para>
-
-</section>
-
-<section xml:id="sec-shell-helpers">
-
-<title>Interactive shell helpers</title>
-
-<para>
-  Some packages provide the shell integration to be more useful. But
-  unlike other systems, nix doesn't have a standard share directory
-  location. This is why a bunch <command>PACKAGE-share</command>
-  scripts are shipped that print the location of the corresponding
-  shared folder.
-
-  Current list of such packages is as following:
-
-  <itemizedlist>
+  <para>
+   Some packages provide the shell integration to be more useful. But unlike
+   other systems, nix doesn't have a standard share directory location. This is
+   why a bunch <command>PACKAGE-share</command> scripts are shipped that print
+   the location of the corresponding shared folder. Current list of such
+   packages is as following:
+   <itemizedlist>
     <listitem>
-      <para>
-        <literal>autojump</literal>: <command>autojump-share</command>
-      </para>
+     <para>
+      <literal>autojump</literal>: <command>autojump-share</command>
+     </para>
     </listitem>
     <listitem>
-      <para>
-        <literal>fzf</literal>: <command>fzf-share</command>
-      </para>
+     <para>
+      <literal>fzf</literal>: <command>fzf-share</command>
+     </para>
     </listitem>
-  </itemizedlist>
-
-  E.g. <literal>autojump</literal> can then used in the .bashrc like this:
+   </itemizedlist>
+   E.g. <literal>autojump</literal> can then used in the .bashrc like this:
 <screen>
   source "$(autojump-share)/autojump.bash"
 </screen>
-</para>
+  </para>
+ </section>
+ <section xml:id="sec-steam">
+  <title>Steam</title>
 
-</section>
+  <section xml:id="sec-steam-nix">
+   <title>Steam in Nix</title>
 
-<section xml:id="sec-steam">
+   <para>
+    Steam is distributed as a <filename>.deb</filename> file, for now only as
+    an i686 package (the amd64 package only has documentation). When unpacked,
+    it has a script called <filename>steam</filename> that in ubuntu (their
+    target distro) would go to <filename>/usr/bin </filename>. When run for the
+    first time, this script copies some files to the user's home, which include
+    another script that is the ultimate responsible for launching the steam
+    binary, which is also in $HOME.
+   </para>
 
-<title>Steam</title>
+   <para>
+    Nix problems and constraints:
+    <itemizedlist>
+     <listitem>
+      <para>
+       We don't have <filename>/bin/bash</filename> and many scripts point
+       there. Similarly for <filename>/usr/bin/python</filename> .
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       We don't have the dynamic loader in <filename>/lib </filename>.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       The <filename>steam.sh</filename> script in $HOME can not be patched, as
+       it is checked and rewritten by steam.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       The steam binary cannot be patched, it's also checked.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </para>
 
-<section xml:id="sec-steam-nix">
+   <para>
+    The current approach to deploy Steam in NixOS is composing a FHS-compatible
+    chroot environment, as documented
+    <link xlink:href="http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html">here</link>.
+    This allows us to have binaries in the expected paths without disrupting
+    the system, and to avoid patching them to work in a non FHS environment.
+   </para>
+  </section>
 
-<title>Steam in Nix</title>
+  <section xml:id="sec-steam-play">
+   <title>How to play</title>
 
-<para>
-  Steam is distributed as a <filename>.deb</filename> file, for now only
-  as an i686 package (the amd64 package only has documentation).
-  When unpacked, it has a script called <filename>steam</filename> that
-  in ubuntu (their target distro) would go to <filename>/usr/bin
-  </filename>. When run for the first time, this script copies some
-  files to the user's home, which include another script that is the
-  ultimate responsible for launching the steam binary, which is also
-  in $HOME.
-</para>
-<para>
-  Nix problems and constraints:
-<itemizedlist>
-  <listitem><para>We don't have <filename>/bin/bash</filename> and many
-  scripts point there. Similarly for <filename>/usr/bin/python</filename>
-  .</para></listitem>
-  <listitem><para>We don't have the dynamic loader in <filename>/lib
-  </filename>.</para></listitem>
-  <listitem><para>The <filename>steam.sh</filename> script in $HOME can
-  not be patched, as it is checked and rewritten by steam.</para></listitem>
-  <listitem><para>The steam binary cannot be patched, it's also checked.</para></listitem>
-</itemizedlist>
-</para>
-<para>
-  The current approach to deploy Steam in NixOS is composing a FHS-compatible
-  chroot environment, as documented
-  <link xlink:href="http://sandervanderburg.blogspot.nl/2013/09/composing-fhs-compatible-chroot.html">here</link>.
-  This allows us to have binaries in the expected paths without disrupting the system,
-  and to avoid patching them to work in a non FHS environment.
-</para>
-
-</section>
-
-<section xml:id="sec-steam-play">
-
-<title>How to play</title>
-
-<para>
-  For 64-bit systems it's important to have
-  <programlisting>hardware.opengl.driSupport32Bit = true;</programlisting>
-  in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need
-  <programlisting>hardware.pulseaudio.support32Bit = true;</programlisting>
-  if you are using PulseAudio - this will enable 32bit ALSA apps integration.
-  To use the Steam controller, you need to add
-  <programlisting>services.udev.extraRules = ''
+   <para>
+    For 64-bit systems it's important to have
+<programlisting>hardware.opengl.driSupport32Bit = true;</programlisting>
+    in your <filename>/etc/nixos/configuration.nix</filename>. You'll also need
+<programlisting>hardware.pulseaudio.support32Bit = true;</programlisting>
+    if you are using PulseAudio - this will enable 32bit ALSA apps integration.
+    To use the Steam controller, you need to add
+<programlisting>services.udev.extraRules = ''
     SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", MODE="0666"
     KERNEL=="uinput", MODE="0660", GROUP="users", OPTIONS+="static_node=uinput"
   '';</programlisting>
-  to your configuration.
-</para>
+    to your configuration.
+   </para>
+  </section>
 
-</section>
+  <section xml:id="sec-steam-troub">
+   <title>Troubleshooting</title>
 
-<section xml:id="sec-steam-troub">
+   <para>
+    <variablelist>
+     <varlistentry>
+      <term>Steam fails to start. What do I do?</term>
+      <listitem>
+       <para>
+        Try to run
+<programlisting>strace steam</programlisting>
+        to see what is causing steam to fail.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term>Using the FOSS Radeon or nouveau (nvidia) drivers</term>
+      <listitem>
+       <itemizedlist>
+        <listitem>
+         <para>
+          The <literal>newStdcpp</literal> parameter was removed since NixOS
+          17.09 and should not be needed anymore.
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          Steam ships statically linked with a version of libcrypto that
+          conflics with the one dynamically loaded by radeonsi_dri.so. If you
+          get the error
+<programlisting>steam.sh: line 713: 7842 Segmentation fault (core dumped)</programlisting>
+          have a look at
+          <link xlink:href="https://github.com/NixOS/nixpkgs/pull/20269">this
+          pull request</link>.
+         </para>
+        </listitem>
+       </itemizedlist>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term>Java</term>
+      <listitem>
+       <orderedlist>
+        <listitem>
+         <para>
+          There is no java in steam chrootenv by default. If you get a message
+          like
+<programlisting>/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found</programlisting>
+          You need to add
+<programlisting> steam.override { withJava = true; };</programlisting>
+          to your configuration.
+         </para>
+        </listitem>
+       </orderedlist>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+   </para>
+  </section>
 
-<title>Troubleshooting</title>
+  <section xml:id="sec-steam-run">
+   <title>steam-run</title>
 
-<para>
-<variablelist>
-
-  <varlistentry>
-    <term>Steam fails to start. What do I do?</term>
-    <listitem><para>Try to run
-    <programlisting>strace steam</programlisting>
-    to see what is causing steam to fail.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-  <term>Using the FOSS Radeon or nouveau (nvidia) drivers</term>
-  <listitem><itemizedlist>
-    <listitem><para>The <literal>newStdcpp</literal> parameter
-    was removed since NixOS 17.09 and should not be needed anymore.
-    </para></listitem>
-
-    <listitem><para>
-    Steam ships statically linked with a version of libcrypto that
-    conflics with the one dynamically loaded by radeonsi_dri.so.
-    If you get the error
-    <programlisting>steam.sh: line 713: 7842 Segmentation fault (core dumped)</programlisting>
-    have a look at <link xlink:href="https://github.com/NixOS/nixpkgs/pull/20269">this pull request</link>.
-    </para></listitem>
-
-  </itemizedlist></listitem></varlistentry>
-
-  <varlistentry>
-  <term>Java</term>
-  <listitem><orderedlist>
-  <listitem><para>
-  There is no java in steam chrootenv by default. If you get a message like
-  <programlisting>/home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found</programlisting>
-  You need to add
-  <programlisting> steam.override { withJava = true; };</programlisting>
-  to your configuration.
-  </para></listitem>
-  </orderedlist></listitem></varlistentry>
-
-</variablelist>
-</para>
-
-</section>
-
-<section xml:id="sec-steam-run">
-
-<title>steam-run</title>
-<para>
-The FHS-compatible chroot used for steam can also be used to run
-other linux games that expect a FHS environment.
-To do it, add
+   <para>
+    The FHS-compatible chroot used for steam can also be used to run other
+    linux games that expect a FHS environment. To do it, add
 <programlisting>pkgs.(steam.override {
           nativeOnly = true;
           newStdcpp = true;
         }).run</programlisting>
-to your configuration, rebuild, and run the game with
+    to your configuration, rebuild, and run the game with
 <programlisting>steam-run ./foo</programlisting>
-</para>
+   </para>
+  </section>
+ </section>
+ <section xml:id="sec-emacs">
+  <title>Emacs</title>
 
-</section>
+  <section xml:id="sec-emacs-config">
+   <title>Configuring Emacs</title>
 
-</section>
-
-<section xml:id="sec-emacs">
-
-<title>Emacs</title>
-
-<section xml:id="sec-emacs-config">
-
-<title>Configuring Emacs</title>
-
-<para>
-  The Emacs package comes with some extra helpers to make it easier to
-  configure. <varname>emacsWithPackages</varname> allows you to manage
-  packages from ELPA. This means that you will not have to install
-  that packages from within Emacs. For instance, if you wanted to use
-  <literal>company</literal>, <literal>counsel</literal>,
-  <literal>flycheck</literal>, <literal>ivy</literal>,
-  <literal>magit</literal>, <literal>projectile</literal>, and
-  <literal>use-package</literal> you could use this as a
-  <filename>~/.config/nixpkgs/config.nix</filename> override:
-</para>
+   <para>
+    The Emacs package comes with some extra helpers to make it easier to
+    configure. <varname>emacsWithPackages</varname> allows you to manage
+    packages from ELPA. This means that you will not have to install that
+    packages from within Emacs. For instance, if you wanted to use
+    <literal>company</literal>, <literal>counsel</literal>,
+    <literal>flycheck</literal>, <literal>ivy</literal>,
+    <literal>magit</literal>, <literal>projectile</literal>, and
+    <literal>use-package</literal> you could use this as a
+    <filename>~/.config/nixpkgs/config.nix</filename> override:
+   </para>
 
 <screen>
 {
@@ -564,17 +531,17 @@ to your configuration, rebuild, and run the game with
 }
 </screen>
 
-<para>
-  You can install it like any other packages via <command>nix-env -iA
-  myEmacs</command>. However, this will only install those packages.
-  It will not <literal>configure</literal> them for us. To do this, we
-  need to provide a configuration file. Luckily, it is possible to do
-  this from within Nix! By modifying the above example, we can make
-  Emacs load a custom config file. The key is to create a package that
-  provide a <filename>default.el</filename> file in
-  <filename>/share/emacs/site-start/</filename>. Emacs knows to load
-  this file automatically when it starts.
-</para>
+   <para>
+    You can install it like any other packages via <command>nix-env -iA
+    myEmacs</command>. However, this will only install those packages. It will
+    not <literal>configure</literal> them for us. To do this, we need to
+    provide a configuration file. Luckily, it is possible to do this from
+    within Nix! By modifying the above example, we can make Emacs load a custom
+    config file. The key is to create a package that provide a
+    <filename>default.el</filename> file in
+    <filename>/share/emacs/site-start/</filename>. Emacs knows to load this
+    file automatically when it starts.
+   </para>
 
 <screen>
 {
@@ -654,25 +621,24 @@ cp ${myEmacsConfig} $out/share/emacs/site-lisp/default.el
 }
 </screen>
 
-<para>
-  This provides a fairly full Emacs start file. It will load in
-  addition to the user's presonal config. You can always disable it by
-  passing <command>-q</command> to the Emacs command.
-</para>
+   <para>
+    This provides a fairly full Emacs start file. It will load in addition to
+    the user's presonal config. You can always disable it by passing
+    <command>-q</command> to the Emacs command.
+   </para>
 
-<para>
-  Sometimes <varname>emacsWithPackages</varname> is not enough, as
-  this package set has some priorities imposed on packages (with
-  the lowest priority assigned to Melpa Unstable, and the highest for
-  packages manually defined in
-  <filename>pkgs/top-level/emacs-packages.nix</filename>). But you
-  can't control this priorities when some package is installed as a
-  dependency. You can override it on per-package-basis, providing all
-  the required dependencies manually - but it's tedious and there is
-  always a possibility that an unwanted dependency will sneak in
-  through some other package. To completely override such a package
-  you can use <varname>overrideScope</varname>.
-</para>
+   <para>
+    Sometimes <varname>emacsWithPackages</varname> is not enough, as this
+    package set has some priorities imposed on packages (with the lowest
+    priority assigned to Melpa Unstable, and the highest for packages manually
+    defined in <filename>pkgs/top-level/emacs-packages.nix</filename>). But you
+    can't control this priorities when some package is installed as a
+    dependency. You can override it on per-package-basis, providing all the
+    required dependencies manually - but it's tedious and there is always a
+    possibility that an unwanted dependency will sneak in through some other
+    package. To completely override such a package you can use
+    <varname>overrideScope</varname>.
+   </para>
 
 <screen>
 overrides = super: self: rec {
@@ -685,34 +651,34 @@ overrides = super: self: rec {
   dante
 ])
 </screen>
+  </section>
+ </section>
+ <section xml:id="sec-weechat">
+  <title>Weechat</title>
 
-</section>
-
-</section>
-
-<section xml:id="sec-weechat">
-<title>Weechat</title>
-<para>
-Weechat can be configured to include your choice of plugins, reducing its
-closure size from the default configuration which includes all available
-plugins.  To make use of this functionality, install an expression that
-overrides its configuration such as
+  <para>
+   Weechat can be configured to include your choice of plugins, reducing its
+   closure size from the default configuration which includes all available
+   plugins. To make use of this functionality, install an expression that
+   overrides its configuration such as
 <programlisting>weechat.override {configure = {availablePlugins, ...}: {
     plugins = with availablePlugins; [ python perl ];
   }
 }</programlisting>
-</para>
-<para>
-The plugins currently available are <literal>python</literal>,
-<literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>,
-<literal>tcl</literal> and <literal>lua</literal>.
-</para>
-<para>
-The python plugin allows the addition of extra libraries. For instance,
-the <literal>inotify.py</literal> script in weechat-scripts requires
-D-Bus or libnotify, and the <literal>fish.py</literal> script requires
-pycrypto. To use these scripts, use the <literal>python</literal>
-plugin's <literal>withPackages</literal> attribute:
+  </para>
+
+  <para>
+   The plugins currently available are <literal>python</literal>,
+   <literal>perl</literal>, <literal>ruby</literal>, <literal>guile</literal>,
+   <literal>tcl</literal> and <literal>lua</literal>.
+  </para>
+
+  <para>
+   The python plugin allows the addition of extra libraries. For instance, the
+   <literal>inotify.py</literal> script in weechat-scripts requires D-Bus or
+   libnotify, and the <literal>fish.py</literal> script requires pycrypto. To
+   use these scripts, use the <literal>python</literal> plugin's
+   <literal>withPackages</literal> attribute:
 <programlisting>weechat.override { configure = {availablePlugins, ...}: {
     plugins = with availablePlugins; [
             (python.withPackages (ps: with ps; [ pycrypto python-dbus ]))
@@ -720,16 +686,17 @@ plugin's <literal>withPackages</literal> attribute:
     }
 }
 </programlisting>
-</para>
-<para>
-In order to also keep all default plugins installed, it is possible to use
-the following method:
+  </para>
+
+  <para>
+   In order to also keep all default plugins installed, it is possible to use
+   the following method:
 <programlisting>weechat.override { configure = { availablePlugins, ... }: {
   plugins = builtins.attrValues (availablePlugins // {
     python = availablePlugins.python.withPackages (ps: with ps; [ pycrypto python-dbus ]);
   });
 }; }
 </programlisting>
-</para>
-</section>
+  </para>
+ </section>
 </chapter>
diff --git a/doc/platform-notes.xml b/doc/platform-notes.xml
index f4f6ec600294..b2c20c2d35c0 100644
--- a/doc/platform-notes.xml
+++ b/doc/platform-notes.xml
@@ -1,27 +1,25 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-platform-nodes">
+ <title>Platform Notes</title>
+ <section xml:id="sec-darwin">
+  <title>Darwin (macOS)</title>
 
-<title>Platform Notes</title>
+  <para>
+   Some common issues when packaging software for darwin:
+  </para>
 
-<section xml:id="sec-darwin">
-
-<title>Darwin (macOS)</title>
-<para>Some common issues when packaging software for darwin:</para>
-
-<itemizedlist>
-
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      The darwin <literal>stdenv</literal> uses clang instead of gcc.
-      When referring to the compiler <varname>$CC</varname> or <command>cc</command>
-      will work in both cases.  Some builds hardcode gcc/g++ in their
-      build scripts, that can usually be fixed with using something
-      like <literal>makeFlags = [ "CC=cc" ];</literal> or by patching
-      the build scripts.
+     The darwin <literal>stdenv</literal> uses clang instead of gcc. When
+     referring to the compiler <varname>$CC</varname> or <command>cc</command>
+     will work in both cases. Some builds hardcode gcc/g++ in their build
+     scripts, that can usually be fixed with using something like
+     <literal>makeFlags = [ "CC=cc" ];</literal> or by patching the build
+     scripts.
     </para>
-
-    <programlisting>
+<programlisting>
       stdenv.mkDerivation {
         name = "libfoo-1.2.3";
         # ...
@@ -30,36 +28,33 @@
         '';
       }
     </programlisting>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      On darwin libraries are linked using absolute paths, libraries
-      are resolved by their <literal>install_name</literal> at link
-      time.  Sometimes packages won't set this correctly causing the
-      library lookups to fail at runtime.  This can be fixed by adding
-      extra linker flags or by running <command>install_name_tool -id</command>
-      during the <function>fixupPhase</function>.
+     On darwin libraries are linked using absolute paths, libraries are
+     resolved by their <literal>install_name</literal> at link time. Sometimes
+     packages won't set this correctly causing the library lookups to fail at
+     runtime. This can be fixed by adding extra linker flags or by running
+     <command>install_name_tool -id</command> during the
+     <function>fixupPhase</function>.
     </para>
-
-    <programlisting>
+<programlisting>
       stdenv.mkDerivation {
         name = "libfoo-1.2.3";
         # ...
         makeFlags = stdenv.lib.optional stdenv.isDarwin "LDFLAGS=-Wl,-install_name,$(out)/lib/libfoo.dylib";
       }
     </programlisting>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Some packages assume xcode is available and use <command>xcrun</command>
-      to resolve build tools like <command>clang</command>, etc.
-      This causes errors like <code>xcode-select: error: no developer tools were found at '/Applications/Xcode.app'</code>
-      while the build doesn't actually depend on xcode.
+     Some packages assume xcode is available and use <command>xcrun</command>
+     to resolve build tools like <command>clang</command>, etc. This causes
+     errors like <code>xcode-select: error: no developer tools were found at
+     '/Applications/Xcode.app'</code> while the build doesn't actually depend
+     on xcode.
     </para>
-
-    <programlisting>
+<programlisting>
       stdenv.mkDerivation {
         name = "libfoo-1.2.3";
         # ...
@@ -69,15 +64,12 @@
         '';
       }
     </programlisting>
-
     <para>
-      The package <literal>xcbuild</literal> can be used to build projects
-      that really depend on Xcode, however projects that build some kind of
-      graphical interface won't work without using Xcode in an impure way.
+     The package <literal>xcbuild</literal> can be used to build projects that
+     really depend on Xcode, however projects that build some kind of graphical
+     interface won't work without using Xcode in an impure way.
     </para>
-  </listitem>
-
-</itemizedlist>
-</section>
-
+   </listitem>
+  </itemizedlist>
+ </section>
 </chapter>
diff --git a/doc/quick-start.xml b/doc/quick-start.xml
index ca86e6c9519b..0cba3a4769c4 100644
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -1,223 +1,219 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-quick-start">
-
-<title>Quick Start to Adding a Package</title>
-
-<para>To add a package to Nixpkgs:
-
-<orderedlist>
-
-  <listitem>
-    <para>Checkout the Nixpkgs source tree:
-
+ <title>Quick Start to Adding a Package</title>
+ <para>
+  To add a package to Nixpkgs:
+  <orderedlist>
+   <listitem>
+    <para>
+     Checkout the Nixpkgs source tree:
 <screen>
 $ git clone git://github.com/NixOS/nixpkgs.git 
 $ cd nixpkgs</screen>
-
     </para>
-  </listitem>
-
-  <listitem>
-    <para>Find a good place in the Nixpkgs tree to add the Nix
-    expression for your package.  For instance, a library package
-    typically goes into
-    <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
-    while a web browser goes into
-    <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
-    See <xref linkend="sec-organisation" /> for some hints on the tree
-    organisation.  Create a directory for your package, e.g.
-
+   </listitem>
+   <listitem>
+    <para>
+     Find a good place in the Nixpkgs tree to add the Nix expression for your
+     package. For instance, a library package typically goes into
+     <filename>pkgs/development/libraries/<replaceable>pkgname</replaceable></filename>,
+     while a web browser goes into
+     <filename>pkgs/applications/networking/browsers/<replaceable>pkgname</replaceable></filename>.
+     See <xref linkend="sec-organisation" /> for some hints on the tree
+     organisation. Create a directory for your package, e.g.
 <screen>
 $ mkdir pkgs/development/libraries/libfoo</screen>
-  
     </para>
-  </listitem>
-
-  <listitem>
-    <para>In the package directory, create a Nix expression — a piece
-    of code that describes how to build the package.  In this case, it
-    should be a <emphasis>function</emphasis> that is called with the
-    package dependencies as arguments, and returns a build of the
-    package in the Nix store.  The expression should usually be called
-    <filename>default.nix</filename>.
-
+   </listitem>
+   <listitem>
+    <para>
+     In the package directory, create a Nix expression — a piece of code that
+     describes how to build the package. In this case, it should be a
+     <emphasis>function</emphasis> that is called with the package dependencies
+     as arguments, and returns a build of the package in the Nix store. The
+     expression should usually be called <filename>default.nix</filename>.
 <screen>
 $ emacs pkgs/development/libraries/libfoo/default.nix
 $ git add pkgs/development/libraries/libfoo/default.nix</screen>
-
     </para>
-
-    <para>You can have a look at the existing Nix expressions under
-    <filename>pkgs/</filename> to see how it’s done.  Here are some
-    good ones:
-
-      <itemizedlist>
-
-        <listitem>
-          <para>GNU Hello: <link
+    <para>
+     You can have a look at the existing Nix expressions under
+     <filename>pkgs/</filename> to see how it’s done. Here are some good
+     ones:
+     <itemizedlist>
+      <listitem>
+       <para>
+        GNU Hello:
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/hello/default.nix"><filename>pkgs/applications/misc/hello/default.nix</filename></link>.
-          Trivial package, which specifies some <varname>meta</varname>
-          attributes which is good practice.</para>
-        </listitem>
-
-        <listitem>
-          <para>GNU cpio: <link
+        Trivial package, which specifies some <varname>meta</varname>
+        attributes which is good practice.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        GNU cpio:
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/archivers/cpio/default.nix"><filename>pkgs/tools/archivers/cpio/default.nix</filename></link>.
-          Also a simple package. The generic builder in
-          <varname>stdenv</varname> does everything for you. It has
-          no dependencies beyond <varname>stdenv</varname>.</para>
-        </listitem>
-
-        <listitem>
-          <para>GNU Multiple Precision arithmetic library (GMP): <link
+        Also a simple package. The generic builder in <varname>stdenv</varname>
+        does everything for you. It has no dependencies beyond
+        <varname>stdenv</varname>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        GNU Multiple Precision arithmetic library (GMP):
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/gmp/5.1.x.nix"><filename>pkgs/development/libraries/gmp/5.1.x.nix</filename></link>.
-          Also done by the generic builder, but has a dependency on
-          <varname>m4</varname>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Pan, a GTK-based newsreader: <link
+        Also done by the generic builder, but has a dependency on
+        <varname>m4</varname>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Pan, a GTK-based newsreader:
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix"><filename>pkgs/applications/networking/newsreaders/pan/default.nix</filename></link>.
-          Has an optional dependency on <varname>gtkspell</varname>,
-          which is only built if <varname>spellCheck</varname> is
-          <literal>true</literal>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Apache HTTPD: <link
+        Has an optional dependency on <varname>gtkspell</varname>, which is
+        only built if <varname>spellCheck</varname> is <literal>true</literal>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Apache HTTPD:
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix"><filename>pkgs/servers/http/apache-httpd/2.4.nix</filename></link>.
-          A bunch of optional features, variable substitutions in the
-          configure flags, a post-install hook, and miscellaneous
-          hackery.</para>
-        </listitem>
-
-        <listitem>
-          <para>Thunderbird: <link
+        A bunch of optional features, variable substitutions in the configure
+        flags, a post-install hook, and miscellaneous hackery.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Thunderbird:
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix"><filename>pkgs/applications/networking/mailreaders/thunderbird/default.nix</filename></link>.
-          Lots of dependencies.</para>
-        </listitem>
-
-        <listitem>
-          <para>JDiskReport, a Java utility: <link
+        Lots of dependencies.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        JDiskReport, a Java utility:
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix"><filename>pkgs/tools/misc/jdiskreport/default.nix</filename></link>
-          (and the <link
+        (and the
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/builder.sh">builder</link>).
-          Nixpkgs doesn’t have a decent <varname>stdenv</varname> for
-          Java yet so this is pretty ad-hoc.</para>
-        </listitem>
-
-        <listitem>
-          <para>XML::Simple, a Perl module: <link
+        Nixpkgs doesn’t have a decent <varname>stdenv</varname> for Java yet
+        so this is pretty ad-hoc.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        XML::Simple, a Perl module:
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/perl-packages.nix"><filename>pkgs/top-level/perl-packages.nix</filename></link>
-          (search for the <varname>XMLSimple</varname> attribute).
-          Most Perl modules are so simple to build that they are
-          defined directly in <filename>perl-packages.nix</filename>;
-          no need to make a separate file for them.</para>
-        </listitem>
-
-        <listitem>
-          <para>Adobe Reader: <link
+        (search for the <varname>XMLSimple</varname> attribute). Most Perl
+        modules are so simple to build that they are defined directly in
+        <filename>perl-packages.nix</filename>; no need to make a separate file
+        for them.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Adobe Reader:
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/default.nix"><filename>pkgs/applications/misc/adobe-reader/default.nix</filename></link>.
-          Shows how binary-only packages can be supported.  In
-          particular the <link
+        Shows how binary-only packages can be supported. In particular the
+        <link
           xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/misc/adobe-reader/builder.sh">builder</link>
-          uses <command>patchelf</command> to set the RUNPATH and ELF
-          interpreter of the executables so that the right libraries
-          are found at runtime.</para>
-        </listitem>
-
-      </itemizedlist>
-
+        uses <command>patchelf</command> to set the RUNPATH and ELF interpreter
+        of the executables so that the right libraries are found at runtime.
+       </para>
+      </listitem>
+     </itemizedlist>
     </para>
-
-    <para>Some notes:
-
-      <itemizedlist>
-
-        <listitem>
-          <para>All <varname linkend="chap-meta">meta</varname>
-          attributes are optional, but it’s still a good idea to
-          provide at least the <varname>description</varname>,
-          <varname>homepage</varname> and <varname
-          linkend="sec-meta-license">license</varname>.</para>
-        </listitem>
-
-        <listitem>
-          <para>You can use <command>nix-prefetch-url</command> (or similar nix-prefetch-git, etc)
-          <replaceable>url</replaceable> to get the SHA-256 hash of
-          source distributions. There are similar commands as <command>nix-prefetch-git</command> and
-          <command>nix-prefetch-hg</command> available in <literal>nix-prefetch-scripts</literal> package.</para>
-        </listitem>
-
-        <listitem>
-          <para>A list of schemes for <literal>mirror://</literal>
-          URLs can be found in <link
-          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.</para>
-        </listitem>
-
-      </itemizedlist>
-
+    <para>
+     Some notes:
+     <itemizedlist>
+      <listitem>
+       <para>
+        All <varname linkend="chap-meta">meta</varname> attributes are
+        optional, but it’s still a good idea to provide at least the
+        <varname>description</varname>, <varname>homepage</varname> and
+        <varname
+          linkend="sec-meta-license">license</varname>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        You can use <command>nix-prefetch-url</command> (or similar
+        nix-prefetch-git, etc) <replaceable>url</replaceable> to get the
+        SHA-256 hash of source distributions. There are similar commands as
+        <command>nix-prefetch-git</command> and
+        <command>nix-prefetch-hg</command> available in
+        <literal>nix-prefetch-scripts</literal> package.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        A list of schemes for <literal>mirror://</literal> URLs can be found in
+        <link
+          xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/build-support/fetchurl/mirrors.nix"><filename>pkgs/build-support/fetchurl/mirrors.nix</filename></link>.
+       </para>
+      </listitem>
+     </itemizedlist>
     </para>
-
-    <para>The exact syntax and semantics of the Nix expression
-    language, including the built-in function, are described in the
-    Nix manual in the <link
+    <para>
+     The exact syntax and semantics of the Nix expression language, including
+     the built-in function, are described in the Nix manual in the
+     <link
     xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
-    on writing Nix expressions</link>.</para>
-    
-  </listitem>
-
-  <listitem>
-    <para>Add a call to the function defined in the previous step to
-    <link
+     on writing Nix expressions</link>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Add a call to the function defined in the previous step to
+     <link
     xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/all-packages.nix"><filename>pkgs/top-level/all-packages.nix</filename></link>
-    with some descriptive name for the variable,
-    e.g. <varname>libfoo</varname>.
-
-    <screen>
+     with some descriptive name for the variable, e.g.
+     <varname>libfoo</varname>.
+<screen>
 $ emacs pkgs/top-level/all-packages.nix</screen>
-      
     </para>
-
-    <para>The attributes in that file are sorted by category (like
-    “Development / Libraries”) that more-or-less correspond to the
-    directory structure of Nixpkgs, and then by attribute name.</para>
-  </listitem>
-
-  <listitem>
-    <para>To test whether the package builds, run the following command
-    from the root of the nixpkgs source tree:
-
-    <screen>
+    <para>
+     The attributes in that file are sorted by category (like “Development /
+     Libraries”) that more-or-less correspond to the directory structure of
+     Nixpkgs, and then by attribute name.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     To test whether the package builds, run the following command from the
+     root of the nixpkgs source tree:
+<screen>
 $ nix-build -A libfoo</screen>
-
-    where <varname>libfoo</varname> should be the variable name
-    defined in the previous step.  You may want to add the flag
-    <option>-K</option> to keep the temporary build directory in case
-    something fails.  If the build succeeds, a symlink
-    <filename>./result</filename> to the package in the Nix store is
-    created.</para>
-  </listitem>
-
-  <listitem>
-    <para>If you want to install the package into your profile
-    (optional), do
-
-    <screen>
-$ nix-env -f . -iA libfoo</screen>
-
+     where <varname>libfoo</varname> should be the variable name defined in the
+     previous step. You may want to add the flag <option>-K</option> to keep
+     the temporary build directory in case something fails. If the build
+     succeeds, a symlink <filename>./result</filename> to the package in the
+     Nix store is created.
     </para>
-  </listitem>
-
-  <listitem>
-    <para>Optionally commit the new package and open a pull request, or send a patch to
-    <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.</para>
-  </listitem>
-
-
-</orderedlist>
-
-</para>
-
+   </listitem>
+   <listitem>
+    <para>
+     If you want to install the package into your profile (optional), do
+<screen>
+$ nix-env -f . -iA libfoo</screen>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Optionally commit the new package and open a pull request, or send a patch
+     to <literal>https://groups.google.com/forum/#!forum/nix-devel</literal>.
+    </para>
+   </listitem>
+  </orderedlist>
+ </para>
 </chapter>
diff --git a/doc/release-notes.xml b/doc/release-notes.xml
index a50ee877acdd..6dae6ae5620e 100644
--- a/doc/release-notes.xml
+++ b/doc/release-notes.xml
@@ -1,164 +1,177 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <article xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink">
+ <title>Nixpkgs Release Notes</title>
+ <section>
+  <title>Release 0.14 (June 4, 2012)</title>
 
-<title>Nixpkgs Release Notes</title>
+  <para>
+   In preparation for the switch from Subversion to Git, this release is mainly
+   the prevent the Nixpkgs version number from going backwards. (This would
+   happen because prerelease version numbers produced for the Git repository
+   are lower than those for the Subversion repository.)
+  </para>
 
+  <para>
+   Since the last release, there have been thousands of changes and new
+   packages by numerous contributors. For details, see the commit logs.
+  </para>
+ </section>
+ <section>
+  <title>Release 0.13 (February 5, 2010)</title>
 
-<section><title>Release 0.14 (June 4, 2012)</title>
+  <para>
+   As always, there are many changes. Some of the most important updates are:
+   <itemizedlist>
+    <listitem>
+     <para>
+      Glibc 2.9.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GCC 4.3.3.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Linux 2.6.32.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      X.org 7.5.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      KDE 4.3.4.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </section>
+ <section>
+  <title>Release 0.12 (April 24, 2009)</title>
 
-<para>In preparation for the switch from Subversion to Git, this
-release is mainly the prevent the Nixpkgs version number from going
-backwards.  (This would happen because prerelease version numbers
-produced for the Git repository are lower than those for the
-Subversion repository.)</para>
+  <para>
+   There are way too many additions to Nixpkgs since the last release to list
+   here: for example, the number of packages on Linux has increased from 1002
+   to 2159. However, some specific improvements are worth listing:
+   <itemizedlist>
+    <listitem>
+     <para>
+      Nixpkgs now has a manual. In particular, it describes the standard build
+      environment in detail.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Major new packages:
+      <itemizedlist>
+       <listitem>
+        <para>
+         KDE 4.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         TeXLive.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         VirtualBox.
+        </para>
+       </listitem>
+      </itemizedlist>
+      … and many others.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Important updates:
+      <itemizedlist>
+       <listitem>
+        <para>
+         Glibc 2.7.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         GCC 4.2.4.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Linux 2.6.25 — 2.6.28.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Firefox 3.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         X.org 7.3.
+        </para>
+       </listitem>
+      </itemizedlist>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Support for building derivations in a virtual machine, including RPM and
+      Debian builds in automatically generated VM images. See
+      <filename>pkgs/build-support/vm/default.nix</filename> for details.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Improved support for building Haskell packages.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
 
-<para>Since the last release, there have been thousands of changes and
-new packages by numerous contributors.  For details, see the commit
-logs.</para>
-
-</section>
-
-
-<section><title>Release 0.13 (February 5, 2010)</title>
-
-<para>As always, there are many changes.  Some of the most important
-updates are:
-
-<itemizedlist>
-
-  <listitem><para>Glibc 2.9.</para></listitem>
-
-  <listitem><para>GCC 4.3.3.</para></listitem>
-
-  <listitem><para>Linux 2.6.32.</para></listitem>
-
-  <listitem><para>X.org 7.5.</para></listitem>
-
-  <listitem><para>KDE 4.3.4.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-
-</section>
-
-
-<section><title>Release 0.12 (April 24, 2009)</title>
-
-<para>There are way too many additions to Nixpkgs since the last
-release to list here: for example, the number of packages on Linux has
-increased from 1002 to 2159.  However, some specific improvements are
-worth listing:
-
-<itemizedlist>
-
-  <listitem><para>Nixpkgs now has a manual.  In particular, it
-  describes the standard build environment in
-  detail.</para></listitem>
-
-  <listitem><para>Major new packages:
-
-    <itemizedlist>
-
-      <listitem><para>KDE 4.</para></listitem>
-
-      <listitem><para>TeXLive.</para></listitem>
-
-      <listitem><para>VirtualBox.</para></listitem>
-
-    </itemizedlist>
-
-    … and many others.
-
-  </para></listitem>
-
-  <listitem><para>Important updates:
-
-    <itemizedlist>
-
-      <listitem><para>Glibc 2.7.</para></listitem>
-      
-      <listitem><para>GCC 4.2.4.</para></listitem>
-
-      <listitem><para>Linux 2.6.25 — 2.6.28.</para></listitem>
-
-      <listitem><para>Firefox 3.</para></listitem>
-
-      <listitem><para>X.org 7.3.</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-  <listitem><para>Support for building derivations in a virtual
-  machine, including RPM and Debian builds in automatically generated
-  VM images.  See
-  <filename>pkgs/build-support/vm/default.nix</filename> for
-  details.</para></listitem>
-
-  <listitem><para>Improved support for building Haskell
-  packages.</para></listitem>
-  
-</itemizedlist>
-
-</para>
-
-<para>The following people contributed to this release:
-
-Andres Löh,
-Arie Middelkoop,
-Armijn Hemel,
-Eelco Dolstra,
-Lluís Batlle,
-Ludovic Courtès,
-Marc Weber,
-Mart Kolthof,
-Martin Bravenboer,
-Michael Raskin,
-Nicolas Pierron,
-Peter Simons,
-Pjotr Prins,
-Rob Vermaas,
-Sander van der Burg,
-Tobias Hammerschmidt,
-Valentin David,
-Wouter den Breejen and
-Yury G. Kudryashov.
-
-In addition, several people contributed patches on the
-<literal>nix-dev</literal> mailing list.</para>
-
-</section>
-  
-
-<section><title>Release 0.11 (September 11, 2007)</title>
-
-<para>This release has the following improvements:
-
-<itemizedlist>
-
-  
-  <listitem><para>The standard build environment
-  (<literal>stdenv</literal>) is now pure on the
-  <literal>x86_64-linux</literal> and <literal>powerpc-linux</literal>
-  platforms, just as on <literal>i686-linux</literal>.  (Purity means
-  that building and using the standard environment has no dependencies
-  outside of the Nix store.  For instance, it doesn’t require an
-  external C compiler such as <filename>/usr/bin/gcc</filename>.)
-  Also, the statically linked binaries used in the bootstrap process
-  are now automatically reproducible, making it easy to update the
-  bootstrap tools and to add support for other Linux platforms.  See
-  <filename>pkgs/stdenv/linux/make-bootstrap-tools.nix</filename> for
-  details.</para></listitem>
-
-  
-  <listitem><para>Hook variables in the generic builder are now
-  executed using the <function>eval</function> shell command.  This
-  has a major advantage: you can write hooks directly in Nix
-  expressions.  For instance, rather than writing a builder like this:
+  <para>
+   The following people contributed to this release: Andres Löh, Arie
+   Middelkoop, Armijn Hemel, Eelco Dolstra, Lluís Batlle, Ludovic Courtès,
+   Marc Weber, Mart Kolthof, Martin Bravenboer, Michael Raskin, Nicolas
+   Pierron, Peter Simons, Pjotr Prins, Rob Vermaas, Sander van der Burg, Tobias
+   Hammerschmidt, Valentin David, Wouter den Breejen and Yury G. Kudryashov. In
+   addition, several people contributed patches on the
+   <literal>nix-dev</literal> mailing list.
+  </para>
+ </section>
+ <section>
+  <title>Release 0.11 (September 11, 2007)</title>
 
+  <para>
+   This release has the following improvements:
+   <itemizedlist>
+    <listitem>
+     <para>
+      The standard build environment (<literal>stdenv</literal>) is now pure on
+      the <literal>x86_64-linux</literal> and <literal>powerpc-linux</literal>
+      platforms, just as on <literal>i686-linux</literal>. (Purity means that
+      building and using the standard environment has no dependencies outside
+      of the Nix store. For instance, it doesn’t require an external C
+      compiler such as <filename>/usr/bin/gcc</filename>.) Also, the statically
+      linked binaries used in the bootstrap process are now automatically
+      reproducible, making it easy to update the bootstrap tools and to add
+      support for other Linux platforms. See
+      <filename>pkgs/stdenv/linux/make-bootstrap-tools.nix</filename> for
+      details.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Hook variables in the generic builder are now executed using the
+      <function>eval</function> shell command. This has a major advantage: you
+      can write hooks directly in Nix expressions. For instance, rather than
+      writing a builder like this:
 <programlisting>
 source $stdenv/setup
 
@@ -169,290 +182,311 @@ postInstall() {
 }
 
 genericBuild</programlisting>
-
-  (the <literal>gzip</literal> builder), you can just add this
-  attribute to the derivation:
-
+      (the <literal>gzip</literal> builder), you can just add this attribute to
+      the derivation:
 <programlisting>
 postInstall = "ln -sf gzip $out/bin/gunzip; ln -sf gzip $out/bin/zcat";</programlisting>
-
-  and so a separate build script becomes unnecessary.  This should
-  allow us to get rid of most builders in Nixpkgs.</para></listitem>
-
-
-  <listitem><para>It is now possible to have the generic builder pass
-  arguments to <command>configure</command> and
-  <command>make</command> that contain whitespace.  Previously, for
-  example, you could say in a builder,
-
+      and so a separate build script becomes unnecessary. This should allow us
+      to get rid of most builders in Nixpkgs.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      It is now possible to have the generic builder pass arguments to
+      <command>configure</command> and <command>make</command> that contain
+      whitespace. Previously, for example, you could say in a builder,
 <programlisting>
 configureFlags="CFLAGS=-O0"</programlisting>
-
-  but not
-
+      but not
 <programlisting>
 configureFlags="CFLAGS=-O0 -g"</programlisting>
-
-  since the <literal>-g</literal> would be interpreted as a separate
-  argument to <command>configure</command>.  Now you can say
-
+      since the <literal>-g</literal> would be interpreted as a separate
+      argument to <command>configure</command>. Now you can say
 <programlisting>
 configureFlagsArray=("CFLAGS=-O0 -g")</programlisting>
-
-  or similarly
-
+      or similarly
 <programlisting>
 configureFlagsArray=("CFLAGS=-O0 -g" "LDFLAGS=-L/foo -L/bar")</programlisting>
-
-  which does the right thing.  Idem for <literal>makeFlags</literal>,
-  <literal>installFlags</literal>, <literal>checkFlags</literal> and
-  <literal>distFlags</literal>.</para>
-
-  <para>Unfortunately you can't pass arrays to Bash through the
-  environment, so you can't put the array above in a Nix expression,
-  e.g.,
-
+      which does the right thing. Idem for <literal>makeFlags</literal>,
+      <literal>installFlags</literal>, <literal>checkFlags</literal> and
+      <literal>distFlags</literal>.
+     </para>
+     <para>
+      Unfortunately you can't pass arrays to Bash through the environment, so
+      you can't put the array above in a Nix expression, e.g.,
 <programlisting>
 configureFlagsArray = ["CFLAGS=-O0 -g"];</programlisting>
-
-  since it would just be flattened to a since string.  However, you
-  <emphasis>can</emphasis> use the inline hooks described above:
-
+      since it would just be flattened to a since string. However, you
+      <emphasis>can</emphasis> use the inline hooks described above:
 <programlisting>
 preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")";</programlisting>
-
-  </para></listitem>
-
-
-  <listitem><para>The function <function>fetchurl</function> now has
-  support for two different kinds of mirroring of files.  First, it
-  has support for <emphasis>content-addressable mirrors</emphasis>.
-  For example, given the <function>fetchurl</function> call
-
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      The function <function>fetchurl</function> now has support for two
+      different kinds of mirroring of files. First, it has support for
+      <emphasis>content-addressable mirrors</emphasis>. For example, given the
+      <function>fetchurl</function> call
 <programlisting>
 fetchurl {
   url = http://releases.mozilla.org/<replaceable>...</replaceable>/firefox-2.0.0.6-source.tar.bz2;
   sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082";
 }</programlisting>
-
-  <function>fetchurl</function> will first try to download this file
-  from <link
+      <function>fetchurl</function> will first try to download this file from
+      <link
   xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
-  If that file doesn’t exist, it will try the original URL.  In
-  general, the “content-addressed” location is
-  <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>.
-  There is currently only one content-addressable mirror (<link
+      If that file doesn’t exist, it will try the original URL. In general,
+      the “content-addressed” location is
+      <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>.
+      There is currently only one content-addressable mirror
+      (<link
   xlink:href="http://tarballs.nixos.org"/>), but more can be
-  specified in the <varname>hashedMirrors</varname> attribute in
-  <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by
-  setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable
-  to a whitespace-separated list of URLs.</para>
-
-  <para>Second, <function>fetchurl</function> has support for
-  widely-mirrored distribution sites such as SourceForge or the Linux
-  kernel archives.  Given a URL of the form
-  <literal>mirror://<replaceable>site</replaceable>/<replaceable>path</replaceable></literal>,
-  it will try to download <replaceable>path</replaceable> from a
-  configurable list of mirrors for <replaceable>site</replaceable>.
-  (This idea was borrowed from Gentoo Linux.)  Example:
+      specified in the <varname>hashedMirrors</varname> attribute in
+      <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by
+      setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable to a
+      whitespace-separated list of URLs.
+     </para>
+     <para>
+      Second, <function>fetchurl</function> has support for widely-mirrored
+      distribution sites such as SourceForge or the Linux kernel archives.
+      Given a URL of the form
+      <literal>mirror://<replaceable>site</replaceable>/<replaceable>path</replaceable></literal>,
+      it will try to download <replaceable>path</replaceable> from a
+      configurable list of mirrors for <replaceable>site</replaceable>. (This
+      idea was borrowed from Gentoo Linux.) Example:
 <programlisting>
 fetchurl {
   url = mirror://gnu/gcc/gcc-4.2.0/gcc-core-4.2.0.tar.bz2;
   sha256 = "0ykhzxhr8857dr97z0j9wyybfz1kjr71xk457cfapfw5fjas4ny1";
 }</programlisting>
-  Currently <replaceable>site</replaceable> can be
-  <literal>sourceforge</literal>, <literal>gnu</literal> and
-  <literal>kernel</literal>.  The list of mirrors is defined in
-  <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>.  You
-  can override the list of mirrors for a particular site by setting
-  the environment variable
-  <envar>NIX_MIRRORS_<replaceable>site</replaceable></envar>, e.g.
+      Currently <replaceable>site</replaceable> can be
+      <literal>sourceforge</literal>, <literal>gnu</literal> and
+      <literal>kernel</literal>. The list of mirrors is defined in
+      <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>. You can
+      override the list of mirrors for a particular site by setting the
+      environment variable
+      <envar>NIX_MIRRORS_<replaceable>site</replaceable></envar>, e.g.
 <programlisting>
 export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/</programlisting>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Important updates:
+      <itemizedlist>
+       <listitem>
+        <para>
+         Glibc 2.5.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         GCC 4.1.2.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Gnome 2.16.3.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         X11R7.2.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Linux 2.6.21.7 and 2.6.22.6.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Emacs 22.1.
+        </para>
+       </listitem>
+      </itemizedlist>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Major new packages:
+      <itemizedlist>
+       <listitem>
+        <para>
+         KDE 3.5.6 Base.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Wine 0.9.43.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         OpenOffice 2.2.1.
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         Many Linux system packages to support NixOS.
+        </para>
+       </listitem>
+      </itemizedlist>
+     </para>
+    </listitem>
+   </itemizedlist>
   </para>
 
-  </listitem>
+  <para>
+   The following people contributed to this release: Andres Löh, Arie
+   Middelkoop, Armijn Hemel, Eelco Dolstra, Marc Weber, Mart Kolthof, Martin
+   Bravenboer, Michael Raskin, Wouter den Breejen and Yury G. Kudryashov.
+  </para>
+ </section>
+ <section>
+  <title>Release 0.10 (October 12, 2006)</title>
 
+  <note>
+   <para>
+    This release of Nixpkgs requires
+    <link
+xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix 0.10</link>
+    or higher.
+   </para>
+  </note>
 
-  <listitem><para>Important updates:
-
-    <itemizedlist>
-
-      <listitem><para>Glibc 2.5.</para></listitem>
-      
-      <listitem><para>GCC 4.1.2.</para></listitem>
-      
-      <listitem><para>Gnome 2.16.3.</para></listitem>
-      
-      <listitem><para>X11R7.2.</para></listitem>
-      
-      <listitem><para>Linux 2.6.21.7 and 2.6.22.6.</para></listitem>
-      
-      <listitem><para>Emacs 22.1.</para></listitem>
-      
-    </itemizedlist>
-
-  </para></listitem>
-
-  
-  <listitem><para>Major new packages:
-
-    <itemizedlist>
-
-      <listitem><para>KDE 3.5.6 Base.</para></listitem>
-      
-      <listitem><para>Wine 0.9.43.</para></listitem>
-      
-      <listitem><para>OpenOffice 2.2.1.</para></listitem>
-      
-      <listitem><para>Many Linux system packages to support
-      NixOS.</para></listitem>
-      
-    </itemizedlist>
-
-  </para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>The following people contributed to this release:
-
-  Andres Löh,
-  Arie Middelkoop,
-  Armijn Hemel,
-  Eelco Dolstra,
-  Marc Weber,
-  Mart Kolthof,
-  Martin Bravenboer,
-  Michael Raskin,
-  Wouter den Breejen and
-  Yury G. Kudryashov.
-
-</para>
-  
-</section>
-
-
-<section><title>Release 0.10 (October 12, 2006)</title>
-
-<note><para>This release of Nixpkgs requires <link
-xlink:href='http://nixos.org/releases/nix/nix-0.10/'>Nix
-0.10</link> or higher.</para></note>
-
-<para>This release has the following improvements:</para>
-
-<itemizedlist>
-
-  <listitem><para><filename>pkgs/system/all-packages-generic.nix</filename>
-  is gone, we now just have
-  <filename>pkgs/top-level/all-packages.nix</filename> that contains
-  all available packages.  This should cause much less confusion with
-  users.  <filename>all-packages.nix</filename> is a function that by
-  default returns packages for the current platform, but you can
-  override this by specifying a different <varname>system</varname>
-  argument.</para></listitem>
-
-  <listitem><para>Certain packages in Nixpkgs are now
-  user-configurable through a configuration file, i.e., without having
-  to edit the Nix expressions in Nixpkgs.  For instance, the Firefox
-  provided in the Nixpkgs channel is built without the RealPlayer
-  plugin (for legal reasons).  Previously, you could easily enable
-  RealPlayer support by editing the call to the Firefox function in
-  <filename>all-packages.nix</filename>, but such changes are not
-  respected when Firefox is subsequently updated through the Nixpkgs
-  channel.</para>
-
-  <para>The Nixpkgs configuration file (found in
-  <filename>~/.nixpkgs/config.nix</filename> or through the
-  <envar>NIXPKGS_CONFIG</envar> environment variable) is an attribute
-  set that contains configuration options that
-  <filename>all-packages.nix</filename> reads and uses for certain
-  packages.  For instance, the following configuration file:
+  <para>
+   This release has the following improvements:
+  </para>
 
+  <itemizedlist>
+   <listitem>
+    <para>
+     <filename>pkgs/system/all-packages-generic.nix</filename> is gone, we now
+     just have <filename>pkgs/top-level/all-packages.nix</filename> that
+     contains all available packages. This should cause much less confusion
+     with users. <filename>all-packages.nix</filename> is a function that by
+     default returns packages for the current platform, but you can override
+     this by specifying a different <varname>system</varname> argument.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Certain packages in Nixpkgs are now user-configurable through a
+     configuration file, i.e., without having to edit the Nix expressions in
+     Nixpkgs. For instance, the Firefox provided in the Nixpkgs channel is
+     built without the RealPlayer plugin (for legal reasons). Previously, you
+     could easily enable RealPlayer support by editing the call to the Firefox
+     function in <filename>all-packages.nix</filename>, but such changes are
+     not respected when Firefox is subsequently updated through the Nixpkgs
+     channel.
+    </para>
+    <para>
+     The Nixpkgs configuration file (found in
+     <filename>~/.nixpkgs/config.nix</filename> or through the
+     <envar>NIXPKGS_CONFIG</envar> environment variable) is an attribute set
+     that contains configuration options that
+     <filename>all-packages.nix</filename> reads and uses for certain packages.
+     For instance, the following configuration file:
 <programlisting>
 {
   firefox = {
     enableRealPlayer = true;
   };
 }</programlisting>
-
-  persistently enables RealPlayer support in the Firefox
-  build.</para>
-
-  <para>(Actually, <literal>firefox.enableRealPlayer</literal> is the
-  <emphasis>only</emphasis> configuration option currently available,
-  but more are sure to be added.)</para></listitem>
-
-  <listitem><para>Support for new platforms:
-
-    <itemizedlist>
-
-      <listitem><para><literal>i686-cygwin</literal>, i.e., Windows
-      (using <link xlink:href="http://www.cygwin.com/">Cygwin</link>).
-      The standard environment on <literal>i686-cygwin</literal> by
-      default builds binaries for the Cygwin environment (i.e., it
-      uses Cygwin tools and produces executables that use the Cygwin
-      library).  However, there is also a standard environment that
-      produces binaries that use <link
-      xlink:href="http://www.mingw.org/">MinGW</link>.  You can use it
-      by calling <filename>all-package.nix</filename> with the
-      <varname>stdenvType</varname> argument set to
-      <literal>"i686-mingw"</literal>.</para></listitem>
-
-      <listitem><para><literal>i686-darwin</literal>, i.e., Mac OS X
-      on Intel CPUs.</para></listitem>
-
-      <listitem><para><literal>powerpc-linux</literal>.</para></listitem>
-
-      <listitem><para><literal>x86_64-linux</literal>, i.e., Linux on
-      64-bit AMD/Intel CPUs.  Unlike <literal>i686-linux</literal>,
-      this platform doesn’t have a pure <literal>stdenv</literal>
-      yet.</para></listitem>
-
-    </itemizedlist>
-
+     persistently enables RealPlayer support in the Firefox build.
     </para>
-
-  </listitem>
-        
-  <listitem><para>The default compiler is now GCC 4.1.1.</para></listitem>
-
-  <listitem><para>X11 updated to X.org’s X11R7.1.</para></listitem>
-
-  <listitem><para>Notable new packages:
-
-    <itemizedlist>
-
-      <listitem><para>Opera.</para></listitem>
-
-      <listitem><para>Microsoft Visual C++ 2005 Express Edition and
-      the Windows SDK.</para></listitem>
-
-    </itemizedlist>
-
-    In total there are now around 809 packages in Nixpkgs.</para>
-
-  </listitem>
-
-  
-  <listitem><para>It is now <emphasis>much</emphasis> easier to
-  override the default C compiler and other tools in
-  <literal>stdenv</literal> for specific packages.
-  <filename>all-packages.nix</filename> provides two utility
-  functions for this purpose: <function>overrideGCC</function> and
-  <function>overrideInStdenv</function>.  Both take a
-  <literal>stdenv</literal> and return an augmented
-  <literal>stdenv</literal>; the formed changes the C compiler, and
-  the latter adds additional packages to the front of
-  <literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing
-  tools to be overridden.</para>
-
-  <para>For instance, the package <varname>strategoxt</varname>
-  doesn’t build with the GNU Make in <literal>stdenv</literal>
-  (version 3.81), so we call it with an augmented
-  <literal>stdenv</literal> that uses GNU Make 3.80:
-
+    <para>
+     (Actually, <literal>firefox.enableRealPlayer</literal> is the
+     <emphasis>only</emphasis> configuration option currently available, but
+     more are sure to be added.)
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Support for new platforms:
+     <itemizedlist>
+      <listitem>
+       <para>
+        <literal>i686-cygwin</literal>, i.e., Windows (using
+        <link xlink:href="http://www.cygwin.com/">Cygwin</link>). The standard
+        environment on <literal>i686-cygwin</literal> by default builds
+        binaries for the Cygwin environment (i.e., it uses Cygwin tools and
+        produces executables that use the Cygwin library). However, there is
+        also a standard environment that produces binaries that use
+        <link
+      xlink:href="http://www.mingw.org/">MinGW</link>. You can
+        use it by calling <filename>all-package.nix</filename> with the
+        <varname>stdenvType</varname> argument set to
+        <literal>"i686-mingw"</literal>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>i686-darwin</literal>, i.e., Mac OS X on Intel CPUs.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>powerpc-linux</literal>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>x86_64-linux</literal>, i.e., Linux on 64-bit AMD/Intel CPUs.
+        Unlike <literal>i686-linux</literal>, this platform doesn’t have a
+        pure <literal>stdenv</literal> yet.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The default compiler is now GCC 4.1.1.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     X11 updated to X.org’s X11R7.1.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Notable new packages:
+     <itemizedlist>
+      <listitem>
+       <para>
+        Opera.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Microsoft Visual C++ 2005 Express Edition and the Windows SDK.
+       </para>
+      </listitem>
+     </itemizedlist>
+     In total there are now around 809 packages in Nixpkgs.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     It is now <emphasis>much</emphasis> easier to override the default C
+     compiler and other tools in <literal>stdenv</literal> for specific
+     packages. <filename>all-packages.nix</filename> provides two utility
+     functions for this purpose: <function>overrideGCC</function> and
+     <function>overrideInStdenv</function>. Both take a
+     <literal>stdenv</literal> and return an augmented
+     <literal>stdenv</literal>; the formed changes the C compiler, and the
+     latter adds additional packages to the front of
+     <literal>stdenv</literal>’s initial <envar>PATH</envar>, allowing tools
+     to be overridden.
+    </para>
+    <para>
+     For instance, the package <varname>strategoxt</varname> doesn’t build
+     with the GNU Make in <literal>stdenv</literal> (version 3.81), so we call
+     it with an augmented <literal>stdenv</literal> that uses GNU Make 3.80:
 <programlisting>
 strategoxt = (import ../development/compilers/strategoxt) {
   inherit fetchurl pkgconfig sdf aterm;
@@ -460,44 +494,37 @@ strategoxt = (import ../development/compilers/strategoxt) {
 };
 
 gnumake380 = <replaceable>...</replaceable>;</programlisting>
-
-  Likewise, there are many packages that don’t compile with the
-  default GCC (4.1.1), but that’s easily fixed:
-
+     Likewise, there are many packages that don’t compile with the default
+     GCC (4.1.1), but that’s easily fixed:
 <programlisting>
 exult = import ../games/exult {
   inherit fetchurl SDL SDL_mixer zlib libpng unzip;
   stdenv = overrideGCC stdenv gcc34;
 };</programlisting>
-
-  </para></listitem>
-
-
-  <listitem><para>It has also become much easier to experiment with
-  changes to the <literal>stdenv</literal> setup script (which notably
-  contains the generic builder).  Since edits to
-  <filename>pkgs/stdenv/generic/setup.sh</filename> trigger a rebuild
-  of <emphasis>everything</emphasis>, this was formerly quite painful.
-  But now <literal>stdenv</literal> contains a function to
-  “regenerate” <literal>stdenv</literal> with a different setup
-  script, allowing the use of a different setup script for specific
-  packages:
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     It has also become much easier to experiment with changes to the
+     <literal>stdenv</literal> setup script (which notably contains the generic
+     builder). Since edits to <filename>pkgs/stdenv/generic/setup.sh</filename>
+     trigger a rebuild of <emphasis>everything</emphasis>, this was formerly
+     quite painful. But now <literal>stdenv</literal> contains a function to
+     “regenerate” <literal>stdenv</literal> with a different setup script,
+     allowing the use of a different setup script for specific packages:
 <programlisting>
 pkg = import <replaceable>...</replaceable> {
   stdenv = stdenv.regenerate ./my-setup.sh;
   <replaceable>...</replaceable>
 }</programlisting>
-
-  </para></listitem>
-
-
-  <listitem><para>Packages can now have a human-readable
-  <emphasis>description</emphasis> field.  Package descriptions are
-  shown by <literal>nix-env -qa --description</literal>.  In addition,
-  they’re shown on the Nixpkgs release page.  A description can be
-  added to a package as follows:
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Packages can now have a human-readable <emphasis>description</emphasis>
+     field. Package descriptions are shown by <literal>nix-env -qa
+     --description</literal>. In addition, they’re shown on the Nixpkgs
+     release page. A description can be added to a package as follows:
 <programlisting>
 stdenv.mkDerivation {
   name = "exult-1.2";
@@ -506,228 +533,268 @@ stdenv.mkDerivation {
     description = "A reimplementation of the Ultima VII game engine";
   };
 }</programlisting>
-
-  The <varname>meta</varname> attribute is not passed to the builder,
-  so changes to the description do not trigger a rebuild.  Additional
-  <varname>meta</varname> attributes may be defined in the future
-  (such as the URL of the package’s homepage, the license,
-  etc.).</para></listitem>
-  
-</itemizedlist>
-
-
-<para>The following people contributed to this release:
-
-  Andres Löh,
-  Armijn Hemel,
-  Christof Douma,
-  Eelco Dolstra,
-  Eelco Visser,
-  Mart Kolthof,
-  Martin Bravenboer,
-  Merijn de Jonge,
-  Rob Vermaas and
-  Roy van den Broek.
-
-</para>
-  
-</section>
-
-
-<section><title>Release 0.9 (January 31, 2006)</title>
-
-<para>There have been zillions of changes since the last release of
-Nixpkgs.  Many packages have been added or updated.  The following are
-some of the more notable changes:</para>
-
-<itemizedlist>
-
-  <listitem><para>Distribution files have been moved to <link
-  xlink:href="http://nixos.org/" />.</para></listitem>
-
-  <listitem><para>The C library on Linux, Glibc, has been updated to
-  version 2.3.6.</para></listitem>
-
-  <listitem><para>The default compiler is now GCC 3.4.5.  GCC 4.0.2 is
-  also available.</para></listitem>
-
-  <listitem><para>The old, unofficial Xlibs has been replaced by the
-  official modularised X11 distribution from X.org, i.e., X11R7.0.
-  X11R7.0 consists of 287 (!) packages, all of which are in Nixpkgs
-  though not all have been tested.  It is now possible to build a
-  working X server (previously we only had X client libraries).  We
-  use a fully Nixified X server on NixOS.</para></listitem>
-
-  <listitem><para>The Sun JDK 5 has been purified, i.e., it doesn’t
-  require any non-Nix components such as
-  <filename>/lib/ld-linux.so.2</filename>.  This means that Java
-  applications such as Eclipse and Azureus can run on
-  NixOS.</para></listitem>
-
-  <listitem><para>Hardware-accelerated OpenGL support, used by games
-  like Quake 3 (which is now built from source).</para></listitem>
-
-  <listitem><para>Improved support for FreeBSD on
-  x86.</para></listitem>
-
-  <listitem><para>Improved Haskell support; e.g., the GHC build is now
-  pure.</para></listitem>
-
-  <listitem><para>Some support for cross-compilation: cross-compiling
-  builds of GCC and Binutils, and cross-compiled builds of the C
-  library uClibc.</para></listitem>
-
-  <listitem><para>Notable new packages:
-
-    <itemizedlist>
-
-      <listitem><para>teTeX, including support for building LaTeX
-      documents using Nix (with automatic dependency
-      determination).</para></listitem>
-      
-      <listitem><para>Ruby.</para></listitem>
-
-      <listitem><para>System-level packages to support NixOS,
-      e.g. Grub, GNU <literal>parted</literal> and so
-      on.</para></listitem>
-
-      <listitem><para><literal>ecj</literal>, the Eclipse Compiler for
-      Java, so we finally have a freely distributable compiler that
-      supports Java 5.0.</para></listitem>
-
-      <listitem><para><literal>php</literal>.</para></listitem>
-
-      <listitem><para>The GIMP.</para></listitem>
-
-      <listitem><para>Inkscape.</para></listitem>
-
-      <listitem><para>GAIM.</para></listitem>
-
-      <listitem><para><literal>kdelibs</literal>.  This allows us to
-      add KDE-based packages (such as
-      <literal>kcachegrind</literal>).</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-</itemizedlist>
-
-<para>The following people contributed to this release:
-
-  Andres Löh,
-  Armijn Hemel,
-  Bogdan Dumitriu,
-  Christof Douma,
-  Eelco Dolstra,
-  Eelco Visser,
-  Mart Kolthof,
-  Martin Bravenboer,
-  Rob Vermaas and
-  Roy van den Broek.
-
-</para>
-
-</section>
-
-
-<section><title>Release 0.8 (April 11, 2005)</title>
-
-<para>This release is mostly to remain synchronised with the changed
-hashing scheme in Nix 0.8.</para>
-
-<para>Notable updates:
-
-<itemizedlist>
-
-  <listitem><para>Adobe Reader 7.0</para></listitem>
-
-  <listitem><para>Various security updates (zlib 1.2.2, etc.)</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</section>
-
-
-<section><title>Release 0.7 (March 14, 2005)</title>
-
-<itemizedlist>
-
-<listitem>
-
-  <para>The bootstrap process for the standard build
-  environment on Linux (stdenv-linux) has been improved.  It is no
-  longer dependent in its initial bootstrap stages on the system
-  Glibc, GCC, and other tools.  Rather, Nixpkgs contains a statically
-  linked bash and curl, and uses that to download other statically
-  linked tools.  These are then used to build a Glibc and dynamically
-  linked versions of all other tools.</para>
-
-  <para>This change also makes the bootstrap process faster.  For
-  instance, GCC is built only once instead of three times.</para>
-
-  <para>(Contributed by Armijn Hemel.)</para>
-
-</listitem>
-
-<listitem>
-
-  <para>Tarballs used by Nixpkgs are now obtained from the same server
-  that hosts Nixpkgs (<link
-  xlink:href="http://catamaran.labs.cs.uu.nl/" />).  This reduces the
-  risk of packages being unbuildable due to moved or deleted files on
-  various servers.</para>
-
-</listitem>
-
-<listitem>
-
-  <para>There now is a generic mechanism for building Perl modules.
-  See the various Perl modules defined in
-  pkgs/system/all-packages-generic.nix.</para>
-
-</listitem>
-
-<listitem>
-
-  <para>Notable new packages:
-
-  <itemizedlist>
-
-    <listitem><para>Qt 3</para></listitem>
-    <listitem><para>MySQL</para></listitem>
-    <listitem><para>MythTV</para></listitem>
-    <listitem><para>Mono</para></listitem>
-    <listitem><para>MonoDevelop (alpha)</para></listitem>
-    <listitem><para>Xine</para></listitem>
-
+     The <varname>meta</varname> attribute is not passed to the builder, so
+     changes to the description do not trigger a rebuild. Additional
+     <varname>meta</varname> attributes may be defined in the future (such as
+     the URL of the package’s homepage, the license, etc.).
+    </para>
+   </listitem>
   </itemizedlist>
 
+  <para>
+   The following people contributed to this release: Andres Löh, Armijn Hemel,
+   Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof, Martin
+   Bravenboer, Merijn de Jonge, Rob Vermaas and Roy van den Broek.
   </para>
+ </section>
+ <section>
+  <title>Release 0.9 (January 31, 2006)</title>
 
-</listitem>
-
-<listitem>
-
-  <para>Notable updates:
+  <para>
+   There have been zillions of changes since the last release of Nixpkgs. Many
+   packages have been added or updated. The following are some of the more
+   notable changes:
+  </para>
 
   <itemizedlist>
-
-    <listitem><para>GCC 3.4.3</para></listitem>
-    <listitem><para>Glibc 2.3.4</para></listitem>
-    <listitem><para>GTK 2.6</para></listitem>
-
+   <listitem>
+    <para>
+     Distribution files have been moved to
+     <link
+  xlink:href="http://nixos.org/" />.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The C library on Linux, Glibc, has been updated to version 2.3.6.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The default compiler is now GCC 3.4.5. GCC 4.0.2 is also available.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The old, unofficial Xlibs has been replaced by the official modularised
+     X11 distribution from X.org, i.e., X11R7.0. X11R7.0 consists of 287 (!)
+     packages, all of which are in Nixpkgs though not all have been tested. It
+     is now possible to build a working X server (previously we only had X
+     client libraries). We use a fully Nixified X server on NixOS.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The Sun JDK 5 has been purified, i.e., it doesn’t require any non-Nix
+     components such as <filename>/lib/ld-linux.so.2</filename>. This means
+     that Java applications such as Eclipse and Azureus can run on NixOS.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Hardware-accelerated OpenGL support, used by games like Quake 3 (which is
+     now built from source).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Improved support for FreeBSD on x86.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Improved Haskell support; e.g., the GHC build is now pure.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Some support for cross-compilation: cross-compiling builds of GCC and
+     Binutils, and cross-compiled builds of the C library uClibc.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Notable new packages:
+     <itemizedlist>
+      <listitem>
+       <para>
+        teTeX, including support for building LaTeX documents using Nix (with
+        automatic dependency determination).
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Ruby.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        System-level packages to support NixOS, e.g. Grub, GNU
+        <literal>parted</literal> and so on.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>ecj</literal>, the Eclipse Compiler for Java, so we finally
+        have a freely distributable compiler that supports Java 5.0.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>php</literal>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        The GIMP.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Inkscape.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        GAIM.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>kdelibs</literal>. This allows us to add KDE-based packages
+        (such as <literal>kcachegrind</literal>).
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
   </itemizedlist>
 
+  <para>
+   The following people contributed to this release: Andres Löh, Armijn Hemel,
+   Bogdan Dumitriu, Christof Douma, Eelco Dolstra, Eelco Visser, Mart Kolthof,
+   Martin Bravenboer, Rob Vermaas and Roy van den Broek.
+  </para>
+ </section>
+ <section>
+  <title>Release 0.8 (April 11, 2005)</title>
+
+  <para>
+   This release is mostly to remain synchronised with the changed hashing
+   scheme in Nix 0.8.
   </para>
 
-</listitem>
+  <para>
+   Notable updates:
+   <itemizedlist>
+    <listitem>
+     <para>
+      Adobe Reader 7.0
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Various security updates (zlib 1.2.2, etc.)
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </section>
+ <section>
+  <title>Release 0.7 (March 14, 2005)</title>
 
-</itemizedlist>
-
-</section>
-
-  
+  <itemizedlist>
+   <listitem>
+    <para>
+     The bootstrap process for the standard build environment on Linux
+     (stdenv-linux) has been improved. It is no longer dependent in its initial
+     bootstrap stages on the system Glibc, GCC, and other tools. Rather,
+     Nixpkgs contains a statically linked bash and curl, and uses that to
+     download other statically linked tools. These are then used to build a
+     Glibc and dynamically linked versions of all other tools.
+    </para>
+    <para>
+     This change also makes the bootstrap process faster. For instance, GCC is
+     built only once instead of three times.
+    </para>
+    <para>
+     (Contributed by Armijn Hemel.)
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Tarballs used by Nixpkgs are now obtained from the same server that hosts
+     Nixpkgs (<link
+  xlink:href="http://catamaran.labs.cs.uu.nl/" />). This
+     reduces the risk of packages being unbuildable due to moved or deleted
+     files on various servers.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     There now is a generic mechanism for building Perl modules. See the
+     various Perl modules defined in pkgs/system/all-packages-generic.nix.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Notable new packages:
+     <itemizedlist>
+      <listitem>
+       <para>
+        Qt 3
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        MySQL
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        MythTV
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Mono
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        MonoDevelop (alpha)
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Xine
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Notable updates:
+     <itemizedlist>
+      <listitem>
+       <para>
+        GCC 3.4.3
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Glibc 2.3.4
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        GTK 2.6
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 </article>
diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml
index 7b017f0a8cc4..b648691183b8 100644
--- a/doc/reviewing-contributions.xml
+++ b/doc/reviewing-contributions.xml
@@ -3,95 +3,148 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-reviewing-contributions">
-
-<title>Reviewing contributions</title>
-
-<warning>
-  <para>The following section is a draft and reviewing policy is still being
-    discussed.</para>
-</warning>
-
-<para>The nixpkgs projects receives a fairly high number of contributions via
-  GitHub pull-requests. Reviewing and approving these is an important task and a
-  way to contribute to the project.</para>
-
-<para>The high change rate of nixpkgs make any pull request that is open for
-  long enough subject to conflicts that will require extra work from the
-  submitter or the merger. Reviewing pull requests in a timely manner and being
+ <title>Reviewing contributions</title>
+ <warning>
+  <para>
+   The following section is a draft and reviewing policy is still being
+   discussed.
+  </para>
+ </warning>
+ <para>
+  The nixpkgs projects receives a fairly high number of contributions via
+  GitHub pull-requests. Reviewing and approving these is an important task and
+  a way to contribute to the project.
+ </para>
+ <para>
+  The high change rate of nixpkgs make any pull request that is open for long
+  enough subject to conflicts that will require extra work from the submitter
+  or the merger. Reviewing pull requests in a timely manner and being
   responsive to the comments is the key to avoid these. GitHub provides sort
-  filters that can be used to see the <link
+  filters that can be used to see the
+  <link
     xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-desc">most
-    recently</link> and the <link
+  recently</link> and the
+  <link
     xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+sort%3Aupdated-asc">least
-        recently</link> updated pull-requests.
-  We highly encourage looking at <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone">
-  this list of ready to merge, unreviewed pull requests</link>.</para>
-
-<para>When reviewing a pull request, please always be nice and polite.
+  recently</link> updated pull-requests. We highly encourage looking at
+  <link xlink:href="https://github.com/NixOS/nixpkgs/pulls?q=is%3Apr+is%3Aopen+review%3Anone+status%3Asuccess+-label%3A%222.status%3A+work-in-progress%22+no%3Aproject+no%3Aassignee+no%3Amilestone">
+  this list of ready to merge, unreviewed pull requests</link>.
+ </para>
+ <para>
+  When reviewing a pull request, please always be nice and polite.
   Controversial changes can lead to controversial opinions, but it is important
-  to respect every community members and their work.</para>
-
-<para>GitHub provides reactions, they are a simple and quick way to provide
+  to respect every community members and their work.
+ </para>
+ <para>
+  GitHub provides reactions, they are a simple and quick way to provide
   feedback to pull-requests or any comments. The thumb-down reaction should be
   used with care and if possible accompanied with some explanations so the
-  submitter has directions to improve his contribution.</para>
-
-<para>Pull-requests reviews should include a list of what has been reviewed in a
-  comment, so other reviewers and mergers can know the state of the
-  review.</para>
-
-<para>All the review template samples provided in this section are generic and
+  submitter has directions to improve his contribution.
+ </para>
+ <para>
+  Pull-requests reviews should include a list of what has been reviewed in a
+  comment, so other reviewers and mergers can know the state of the review.
+ </para>
+ <para>
+  All the review template samples provided in this section are generic and
   meant as examples. Their usage is optional and the reviewer is free to adapt
-  them to his liking.</para>
+  them to his liking.
+ </para>
+ <section>
+  <title>Package updates</title>
 
-<section><title>Package updates</title>
+  <para>
+   A package update is the most trivial and common type of pull-request. These
+   pull-requests mainly consist in updating the version part of the package
+   name and the source hash.
+  </para>
 
-<para>A package update is the most trivial and common type of pull-request.
-  These pull-requests mainly consist in updating the version part of the package
-  name and the source hash.</para>
-<para>It can happen that non trivial updates include patches or more complex
-  changes.</para>
+  <para>
+   It can happen that non trivial updates include patches or more complex
+   changes.
+  </para>
 
-<para>Reviewing process:</para>
+  <para>
+   Reviewing process:
+  </para>
 
-<itemizedlist>
-  <listitem><para>Add labels to the pull-request. (Requires commit
-      rights)</para>
+  <itemizedlist>
+   <listitem>
+    <para>
+     Add labels to the pull-request. (Requires commit rights)
+    </para>
     <itemizedlist>
-      <listitem><para><literal>8.has: package (update)</literal> and any topic
-          label that fit the updated package.</para></listitem>
+     <listitem>
+      <para>
+       <literal>8.has: package (update)</literal> and any topic label that fit
+       the updated package.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the package versioning is fitting the
-      guidelines.</para></listitem>
-  <listitem><para>Ensure that the commit text is fitting the
-      guidelines.</para></listitem>
-  <listitem><para>Ensure that the package maintainers are notified.</para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the package versioning is fitting the guidelines.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the commit text is fitting the guidelines.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the package maintainers are notified.
+    </para>
     <itemizedlist>
-      <listitem><para>mention-bot usually notify GitHub users based on the
-          submitted changes, but it can happen that it misses some of the
-          package maintainers.</para></listitem>
+     <listitem>
+      <para>
+       mention-bot usually notify GitHub users based on the submitted changes,
+       but it can happen that it misses some of the package maintainers.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the meta field contains correct
-      information.</para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the meta field contains correct information.
+    </para>
     <itemizedlist>
-      <listitem><para>License can change with version updates, so it should be
-          checked to be fitting upstream license.</para></listitem>
-      <listitem><para>If the package has no maintainer, a maintainer must be
-          set. This can be the update submitter or a community member that
-          accepts to take maintainership of the package.</para></listitem>
+     <listitem>
+      <para>
+       License can change with version updates, so it should be checked to be
+       fitting upstream license.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       If the package has no maintainer, a maintainer must be set. This can be
+       the update submitter or a community member that accepts to take
+       maintainership of the package.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the code contains no typos.</para></listitem>
-  <listitem><para>Building the package locally.</para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the code contains no typos.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Building the package locally.
+    </para>
     <itemizedlist>
-      <listitem><para>Pull-requests are often targeted to the master or staging
-          branch so building the pull-request locally as it is submitted can
-          trigger a large amount of source builds.</para>
-        <para>It is possible to rebase the changes on nixos-unstable or
-          nixpkgs-unstable for easier review by running the following commands
-          from a nixpkgs clone.
+     <listitem>
+      <para>
+       Pull-requests are often targeted to the master or staging branch so
+       building the pull-request locally as it is submitted can trigger a large
+       amount of source builds.
+      </para>
+      <para>
+       It is possible to rebase the changes on nixos-unstable or
+       nixpkgs-unstable for easier review by running the following commands
+       from a nixpkgs clone.
 <screen>
 $ git remote add channels https://github.com/NixOS/nixpkgs-channels.git <co
   xml:id='reviewing-rebase-1' />
@@ -100,43 +153,56 @@ $ git fetch origin pull/PRNUMBER/head <co xml:id='reviewing-rebase-3' />
 $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co
   xml:id='reviewing-rebase-4' />
 </screen>
-        <calloutlist>
-          <callout arearefs='reviewing-rebase-1'>
-            <para>This should be done only once to be able to fetch channel
-              branches from the nixpkgs-channels repository.</para>
-          </callout>
-          <callout arearefs='reviewing-rebase-2'>
-            <para>Fetching the nixos-unstable branch.</para>
-          </callout>
-          <callout arearefs='reviewing-rebase-3'>
-            <para>Fetching the pull-request changes, <varname>PRNUMBER</varname>
-              is the number at the end of the pull-request title and
-              <varname>BASEBRANCH</varname> the base branch of the
-              pull-request.</para>
-          </callout>
-          <callout arearefs='reviewing-rebase-4'>
-            <para>Rebasing the pull-request changes to the nixos-unstable
-              branch.</para>
-          </callout>
-        </calloutlist>
-        </para>
-      </listitem>
-      <listitem>
-        <para>The <link xlink:href="https://github.com/madjar/nox">nox</link>
-          tool can be used to review a pull-request content in a single command.
-          It doesn't rebase on a channel branch so it might trigger multiple
-          source builds. <varname>PRNUMBER</varname> should be replaced by the
-          number at the end of the pull-request title.</para>
+       <calloutlist>
+        <callout arearefs='reviewing-rebase-1'>
+         <para>
+          This should be done only once to be able to fetch channel branches
+          from the nixpkgs-channels repository.
+         </para>
+        </callout>
+        <callout arearefs='reviewing-rebase-2'>
+         <para>
+          Fetching the nixos-unstable branch.
+         </para>
+        </callout>
+        <callout arearefs='reviewing-rebase-3'>
+         <para>
+          Fetching the pull-request changes, <varname>PRNUMBER</varname> is the
+          number at the end of the pull-request title and
+          <varname>BASEBRANCH</varname> the base branch of the pull-request.
+         </para>
+        </callout>
+        <callout arearefs='reviewing-rebase-4'>
+         <para>
+          Rebasing the pull-request changes to the nixos-unstable branch.
+         </para>
+        </callout>
+       </calloutlist>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       The <link xlink:href="https://github.com/madjar/nox">nox</link> tool can
+       be used to review a pull-request content in a single command. It doesn't
+       rebase on a channel branch so it might trigger multiple source builds.
+       <varname>PRNUMBER</varname> should be replaced by the number at the end
+       of the pull-request title.
+      </para>
 <screen>
 $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
 </screen>
-      </listitem>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Running every binary.</para></listitem>
-</itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Running every binary.
+    </para>
+   </listitem>
+  </itemizedlist>
 
-<example><title>Sample template for a package update review</title>
+  <example>
+   <title>Sample template for a package update review</title>
 <screen>
 ##### Reviewed points
 
@@ -150,55 +216,105 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
 
 ##### Comments
 
-</screen></example>
-</section>
+</screen>
+  </example>
+ </section>
+ <section>
+  <title>New packages</title>
 
-<section><title>New packages</title>
+  <para>
+   New packages are a common type of pull-requests. These pull requests
+   consists in adding a new nix-expression for a package.
+  </para>
 
-<para>New packages are a common type of pull-requests. These pull requests
-  consists in adding a new nix-expression for a package.</para>
+  <para>
+   Reviewing process:
+  </para>
 
-<para>Reviewing process:</para>
-
-<itemizedlist>
-  <listitem><para>Add labels to the pull-request. (Requires commit
-      rights)</para>
+  <itemizedlist>
+   <listitem>
+    <para>
+     Add labels to the pull-request. (Requires commit rights)
+    </para>
     <itemizedlist>
-      <listitem><para><literal>8.has: package (new)</literal> and any topic
-          label that fit the new package.</para></listitem>
+     <listitem>
+      <para>
+       <literal>8.has: package (new)</literal> and any topic label that fit the
+       new package.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the package versioning is fitting the
-      guidelines.</para></listitem>
-  <listitem><para>Ensure that the commit name is fitting the
-      guidelines.</para></listitem>
-  <listitem><para>Ensure that the meta field contains correct
-      information.</para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the package versioning is fitting the guidelines.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the commit name is fitting the guidelines.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the meta field contains correct information.
+    </para>
     <itemizedlist>
-      <listitem><para>License must be checked to be fitting upstream
-          license.</para></listitem>
-      <listitem><para>Platforms should be set or the package will not get binary
-          substitutes.</para></listitem>
-      <listitem><para>A maintainer must be set, this can be the package
-          submitter or a community member that accepts to take maintainership of
-          the package.</para></listitem>
+     <listitem>
+      <para>
+       License must be checked to be fitting upstream license.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Platforms should be set or the package will not get binary substitutes.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       A maintainer must be set, this can be the package submitter or a
+       community member that accepts to take maintainership of the package.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the code contains no typos.</para></listitem>
-  <listitem><para>Ensure the package source.</para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the code contains no typos.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure the package source.
+    </para>
     <itemizedlist>
-      <listitem><para>Mirrors urls should be used when
-          available.</para></listitem>
-      <listitem><para>The most appropriate function should be used (e.g.
-          packages from GitHub should use
-          <literal>fetchFromGitHub</literal>).</para></listitem>
+     <listitem>
+      <para>
+       Mirrors urls should be used when available.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       The most appropriate function should be used (e.g. packages from GitHub
+       should use <literal>fetchFromGitHub</literal>).
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Building the package locally.</para></listitem>
-  <listitem><para>Running every binary.</para></listitem>
-</itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Building the package locally.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Running every binary.
+    </para>
+   </listitem>
+  </itemizedlist>
 
-<example><title>Sample template for a new package review</title>
+  <example>
+   <title>Sample template for a new package review</title>
 <screen>
 ##### Reviewed points
 
@@ -220,58 +336,107 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
 
 ##### Comments
 
-</screen></example>
-</section>
+</screen>
+  </example>
+ </section>
+ <section>
+  <title>Module updates</title>
 
-<section><title>Module updates</title>
+  <para>
+   Module updates are submissions changing modules in some ways. These often
+   contains changes to the options or introduce new options.
+  </para>
 
-<para>Module updates are submissions changing modules in some ways. These often
-  contains changes to the options or introduce new options.</para>
+  <para>
+   Reviewing process
+  </para>
 
-<para>Reviewing process</para>
-
-<itemizedlist>
-  <listitem><para>Add labels to the pull-request. (Requires commit
-      rights)</para>
+  <itemizedlist>
+   <listitem>
+    <para>
+     Add labels to the pull-request. (Requires commit rights)
+    </para>
     <itemizedlist>
-      <listitem><para><literal>8.has: module (update)</literal> and any topic
-          label that fit the module.</para></listitem>
+     <listitem>
+      <para>
+       <literal>8.has: module (update)</literal> and any topic label that fit
+       the module.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the module maintainers are notified.</para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the module maintainers are notified.
+    </para>
     <itemizedlist>
-      <listitem><para>Mention-bot notify GitHub users based on the submitted
-          changes, but it can happen that it miss some of the package
-          maintainers.</para></listitem>
+     <listitem>
+      <para>
+       Mention-bot notify GitHub users based on the submitted changes, but it
+       can happen that it miss some of the package maintainers.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the module tests, if any, are
-      succeeding.</para></listitem>
-  <listitem><para>Ensure that the introduced options are correct.</para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the module tests, if any, are succeeding.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the introduced options are correct.
+    </para>
     <itemizedlist>
-      <listitem><para>Type should be appropriate (string related types differs
-          in their merging capabilities, <literal>optionSet</literal> and
-          <literal>string</literal> types are deprecated).</para></listitem>
-      <listitem><para>Description, default and example should be
-          provided.</para></listitem>
+     <listitem>
+      <para>
+       Type should be appropriate (string related types differs in their
+       merging capabilities, <literal>optionSet</literal> and
+       <literal>string</literal> types are deprecated).
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Description, default and example should be provided.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that option changes are backward compatible.</para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that option changes are backward compatible.
+    </para>
     <itemizedlist>
-      <listitem><para><literal>mkRenamedOptionModule</literal> and
-          <literal>mkAliasOptionModule</literal> functions provide way to make
-          option changes backward compatible.</para></listitem>
+     <listitem>
+      <para>
+       <literal>mkRenamedOptionModule</literal> and
+       <literal>mkAliasOptionModule</literal> functions provide way to make
+       option changes backward compatible.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that removed options are declared with
-      <literal>mkRemovedOptionModule</literal></para></listitem>
-  <listitem><para>Ensure that changes that are not backward compatible are
-      mentioned in release notes.</para></listitem>
-  <listitem><para>Ensure that documentations affected by the change is
-      updated.</para></listitem>
-</itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that removed options are declared with
+     <literal>mkRemovedOptionModule</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that changes that are not backward compatible are mentioned in
+     release notes.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that documentations affected by the change is updated.
+    </para>
+   </listitem>
+  </itemizedlist>
 
-<example><title>Sample template for a module update review</title>
+  <example>
+   <title>Sample template for a module update review</title>
 <screen>
 ##### Reviewed points
 
@@ -288,51 +453,89 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
 
 ##### Comments
 
-</screen></example>
-</section>
+</screen>
+  </example>
+ </section>
+ <section>
+  <title>New modules</title>
 
-<section><title>New modules</title>
+  <para>
+   New modules submissions introduce a new module to NixOS.
+  </para>
 
-<para>New modules submissions introduce a new module to NixOS.</para>
+  <itemizedlist>
+   <listitem>
+    <para>
+     Add labels to the pull-request. (Requires commit rights)
+    </para>
+    <itemizedlist>
+     <listitem>
+      <para>
+       <literal>8.has: module (new)</literal> and any topic label that fit the
+       module.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the module tests, if any, are succeeding.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the introduced options are correct.
+    </para>
+    <itemizedlist>
+     <listitem>
+      <para>
+       Type should be appropriate (string related types differs in their
+       merging capabilities, <literal>optionSet</literal> and
+       <literal>string</literal> types are deprecated).
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Description, default and example should be provided.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that module <literal>meta</literal> field is present
+    </para>
+    <itemizedlist>
+     <listitem>
+      <para>
+       Maintainers should be declared in <literal>meta.maintainers</literal>.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Module documentation should be declared with
+       <literal>meta.doc</literal>.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Ensure that the module respect other modules functionality.
+    </para>
+    <itemizedlist>
+     <listitem>
+      <para>
+       For example, enabling a module should not open firewall ports by
+       default.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </listitem>
+  </itemizedlist>
 
-<itemizedlist>
-  <listitem><para>Add labels to the pull-request. (Requires commit
-      rights)</para>
-    <itemizedlist>
-      <listitem><para><literal>8.has: module (new)</literal> and any topic label
-          that fit the module.</para></listitem>
-    </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the module tests, if any, are
-      succeeding.</para></listitem>
-  <listitem><para>Ensure that the introduced options are correct.</para>
-    <itemizedlist>
-      <listitem><para>Type should be appropriate (string related types differs
-          in their merging capabilities, <literal>optionSet</literal> and
-          <literal>string</literal> types are deprecated).</para></listitem>
-      <listitem><para>Description, default and example should be
-          provided.</para></listitem>
-    </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that module <literal>meta</literal> field is
-      present</para>
-    <itemizedlist>
-      <listitem><para>Maintainers should be declared in
-          <literal>meta.maintainers</literal>.</para></listitem>
-      <listitem><para>Module documentation should be declared with
-          <literal>meta.doc</literal>.</para></listitem>
-    </itemizedlist>
-  </listitem>
-  <listitem><para>Ensure that the module respect other modules
-      functionality.</para>
-    <itemizedlist>
-      <listitem><para>For example, enabling a module should not open firewall
-          ports by default.</para></listitem>
-    </itemizedlist>
-  </listitem>
-</itemizedlist>
-
-<example><title>Sample template for a new module review</title>
+  <example>
+   <title>Sample template for a new module review</title>
 <screen>
 ##### Reviewed points
 
@@ -350,32 +553,41 @@ $ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
 
 ##### Comments
 
-</screen></example>
-</section>
+</screen>
+  </example>
+ </section>
+ <section>
+  <title>Other submissions</title>
 
-<section><title>Other submissions</title>
+  <para>
+   Other type of submissions requires different reviewing steps.
+  </para>
 
-<para>Other type of submissions requires different reviewing steps.</para>
+  <para>
+   If you consider having enough knowledge and experience in a topic and would
+   like to be a long-term reviewer for related submissions, please contact the
+   current reviewers for that topic. They will give you information about the
+   reviewing process. The main reviewers for a topic can be hard to find as
+   there is no list, but checking past pull-requests to see who reviewed or
+   git-blaming the code to see who committed to that topic can give some hints.
+  </para>
 
-<para>If you consider having enough knowledge and experience in a topic and
-  would like to be a long-term reviewer for related submissions, please contact
-  the current reviewers for that topic. They will give you information about the
-  reviewing process.
-The main reviewers for a topic can be hard to find as there is no list, but
-checking past pull-requests to see who reviewed or git-blaming the code to see
-who committed to that topic can give some hints.</para>
+  <para>
+   Container system, boot system and library changes are some examples of the
+   pull requests fitting this category.
+  </para>
+ </section>
+ <section>
+  <title>Merging pull-requests</title>
 
-<para>Container system, boot system and library changes are some examples of the
-  pull requests fitting this category.</para>
+  <para>
+   It is possible for community members that have enough knowledge and
+   experience on a special topic to contribute by merging pull requests.
+  </para>
 
-</section>
-
-<section><title>Merging pull-requests</title>
-
-<para>It is possible for community members that have enough knowledge and
-  experience on a special topic to contribute by merging pull requests.</para>
-
-<para>TODO: add the procedure to request merging rights.</para>
+  <para>
+   TODO: add the procedure to request merging rights.
+  </para>
 
 <!--
 The following paragraph about how to deal with unactive contributors is just a
@@ -386,10 +598,11 @@ policy.
   three months will have their commit rights revoked.</para>
 -->
 
-<para>In a case a contributor leaves definitively the Nix community, he should
-  create an issue or notify the mailing list with references of packages and
-  modules he maintains so the maintainership can be taken over by other
-  contributors.</para>
-
-</section>
+  <para>
+   In a case a contributor leaves definitively the Nix community, he should
+   create an issue or notify the mailing list with references of packages and
+   modules he maintains so the maintainership can be taken over by other
+   contributors.
+  </para>
+ </section>
 </chapter>
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 2a3316b8d018..d5028c51cd51 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1,27 +1,24 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-stdenv">
+ <title>The Standard Environment</title>
+ <para>
+  The standard build environment in the Nix Packages collection provides an
+  environment for building Unix packages that does a lot of common build tasks
+  automatically. In fact, for Unix packages that use the standard
+  <literal>./configure; make; make install</literal> build interface, you
+  don’t need to write a build script at all; the standard environment does
+  everything automatically. If <literal>stdenv</literal> doesn’t do what you
+  need automatically, you can easily customise or override the various build
+  phases.
+ </para>
+ <section xml:id="sec-using-stdenv">
+  <title>Using <literal>stdenv</literal></title>
 
-<title>The Standard Environment</title>
-
-
-<para>The standard build environment in the Nix Packages collection
-provides an environment for building Unix packages that does a lot of
-common build tasks automatically.  In fact, for Unix packages that use
-the standard <literal>./configure; make; make install</literal> build
-interface, you don’t need to write a build script at all; the standard
-environment does everything automatically.  If
-<literal>stdenv</literal> doesn’t do what you need automatically, you
-can easily customise or override the various build phases.</para>
-
-
-<section xml:id="sec-using-stdenv"><title>Using
-<literal>stdenv</literal></title>
-
-<para>To build a package with the standard environment, you use the
-function <varname>stdenv.mkDerivation</varname>, instead of the
-primitive built-in function <varname>derivation</varname>, e.g.
-
+  <para>
+   To build a package with the standard environment, you use the function
+   <varname>stdenv.mkDerivation</varname>, instead of the primitive built-in
+   function <varname>derivation</varname>, e.g.
 <programlisting>
 stdenv.mkDerivation {
   name = "libfoo-1.2.3";
@@ -30,39 +27,35 @@ stdenv.mkDerivation {
     sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m";
   };
 }</programlisting>
-
-(<varname>stdenv</varname> needs to be in scope, so if you write this
-in a separate Nix expression from
-<filename>pkgs/all-packages.nix</filename>, you need to pass it as a
-function argument.)  Specifying a <varname>name</varname> and a
-<varname>src</varname> is the absolute minimum you need to do.  Many
-packages have dependencies that are not provided in the standard
-environment.  It’s usually sufficient to specify those dependencies in
-the <varname>buildInputs</varname> attribute:
-
+   (<varname>stdenv</varname> needs to be in scope, so if you write this in a
+   separate Nix expression from <filename>pkgs/all-packages.nix</filename>, you
+   need to pass it as a function argument.) Specifying a
+   <varname>name</varname> and a <varname>src</varname> is the absolute minimum
+   you need to do. Many packages have dependencies that are not provided in the
+   standard environment. It’s usually sufficient to specify those
+   dependencies in the <varname>buildInputs</varname> attribute:
 <programlisting>
 stdenv.mkDerivation {
   name = "libfoo-1.2.3";
   ...
   buildInputs = [libbar perl ncurses];
 }</programlisting>
+   This attribute ensures that the <filename>bin</filename> subdirectories of
+   these packages appear in the <envar>PATH</envar> environment variable during
+   the build, that their <filename>include</filename> subdirectories are
+   searched by the C compiler, and so on. (See
+   <xref linkend="ssec-setup-hooks"/> for details.)
+  </para>
 
-This attribute ensures that the <filename>bin</filename>
-subdirectories of these packages appear in the <envar>PATH</envar>
-environment variable during the build, that their
-<filename>include</filename> subdirectories are searched by the C
-compiler, and so on.  (See <xref linkend="ssec-setup-hooks"/> for
-details.)</para>
-
-<para>Often it is necessary to override or modify some aspect of the
-build.  To make this easier, the standard environment breaks the
-package build into a number of <emphasis>phases</emphasis>, all of
-which can be overridden or modified individually: unpacking the
-sources, applying patches, configuring, building, and installing.
-(There are some others; see <xref linkend="sec-stdenv-phases"/>.)
-For instance, a package that doesn’t supply a makefile but instead has
-to be compiled “manually” could be handled like this:
-
+  <para>
+   Often it is necessary to override or modify some aspect of the build. To
+   make this easier, the standard environment breaks the package build into a
+   number of <emphasis>phases</emphasis>, all of which can be overridden or
+   modified individually: unpacking the sources, applying patches, configuring,
+   building, and installing. (There are some others; see
+   <xref linkend="sec-stdenv-phases"/>.) For instance, a package that doesn’t
+   supply a makefile but instead has to be compiled “manually” could be
+   handled like this:
 <programlisting>
 stdenv.mkDerivation {
   name = "fnord-4.5";
@@ -75,35 +68,33 @@ stdenv.mkDerivation {
     cp foo $out/bin
   '';
 }</programlisting>
+   (Note the use of <literal>''</literal>-style string literals, which are very
+   convenient for large multi-line script fragments because they don’t need
+   escaping of <literal>"</literal> and <literal>\</literal>, and because
+   indentation is intelligently removed.)
+  </para>
 
-(Note the use of <literal>''</literal>-style string literals, which
-are very convenient for large multi-line script fragments because they
-don’t need escaping of <literal>"</literal> and <literal>\</literal>,
-and because indentation is intelligently removed.)</para>
-
-<para>There are many other attributes to customise the build.  These
-are listed in <xref linkend="ssec-stdenv-attributes"/>.</para>
-
-<para>While the standard environment provides a generic builder, you
-can still supply your own build script:
+  <para>
+   There are many other attributes to customise the build. These are listed in
+   <xref linkend="ssec-stdenv-attributes"/>.
+  </para>
 
+  <para>
+   While the standard environment provides a generic builder, you can still
+   supply your own build script:
 <programlisting>
 stdenv.mkDerivation {
   name = "libfoo-1.2.3";
   ...
   builder = ./builder.sh;
 }</programlisting>
-
-where the builder can do anything it wants, but typically starts with
-
+   where the builder can do anything it wants, but typically starts with
 <programlisting>
 source $stdenv/setup
 </programlisting>
-
-to let <literal>stdenv</literal> set up the environment (e.g., process
-the <varname>buildInputs</varname>).  If you want, you can still use
-<literal>stdenv</literal>’s generic builder:
-
+   to let <literal>stdenv</literal> set up the environment (e.g., process the
+   <varname>buildInputs</varname>). If you want, you can still use
+   <literal>stdenv</literal>’s generic builder:
 <programlisting>
 source $stdenv/setup
 
@@ -119,116 +110,186 @@ installPhase() {
 
 genericBuild
 </programlisting>
+  </para>
+ </section>
+ <section xml:id="sec-tools-of-stdenv">
+  <title>Tools provided by <literal>stdenv</literal></title>
 
-</para>
+  <para>
+   The standard environment provides the following packages:
+   <itemizedlist>
+    <listitem>
+     <para>
+      The GNU C Compiler, configured with C and C++ support.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GNU coreutils (contains a few dozen standard Unix commands).
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GNU findutils (contains <command>find</command>).
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GNU diffutils (contains <command>diff</command>, <command>cmp</command>).
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GNU <command>sed</command>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GNU <command>grep</command>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GNU <command>awk</command>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GNU <command>tar</command>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <command>gzip</command>, <command>bzip2</command> and
+      <command>xz</command>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      GNU Make. It has been patched to provide <quote>nested</quote> output
+      that can be fed into the <command>nix-log2xml</command> command and
+      <command>log2html</command> stylesheet to create a structured, readable
+      output of the build steps performed by Make.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Bash. This is the shell used for all builders in the Nix Packages
+      collection. Not using <command>/bin/sh</command> removes a large source
+      of portability problems.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      The <command>patch</command> command.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
 
-</section>
+  <para>
+   On Linux, <literal>stdenv</literal> also includes the
+   <command>patchelf</command> utility.
+  </para>
+ </section>
+ <section xml:id="ssec-stdenv-dependencies">
+  <title>Specifying dependencies</title>
 
+  <para>
+   As described in the Nix manual, almost any <filename>*.drv</filename> store
+   path in a derivation's attribute set will induce a dependency on that
+   derivation. <varname>mkDerivation</varname>, however, takes a few attributes
+   intended to, between them, include all the dependencies of a package. This
+   is done both for structure and consistency, but also so that certain other
+   setup can take place. For example, certain dependencies need their bin
+   directories added to the <envar>PATH</envar>. That is built-in, but other
+   setup is done via a pluggable mechanism that works in conjunction with these
+   dependency attributes. See <xref linkend="ssec-setup-hooks"/> for details.
+  </para>
 
-<section xml:id="sec-tools-of-stdenv"><title>Tools provided by
-<literal>stdenv</literal></title>
+  <para>
+   Dependencies can be broken down along three axes: their host and target
+   platforms relative to the new derivation's, and whether they are propagated.
+   The platform distinctions are motivated by cross compilation; see
+   <xref linkend="chap-cross"/> for exactly what each platform means.
+   <footnote>
+    <para>
+     The build platform is ignored because it is a mere implementation detail
+     of the package satisfying the dependency: As a general programming
+     principle, dependencies are always <emphasis>specified</emphasis> as
+     interfaces, not concrete implementation.
+    </para>
+   </footnote>
+   But even if one is not cross compiling, the platforms imply whether or not
+   the dependency is needed at run-time or build-time, a concept that makes
+   perfect sense outside of cross compilation. For now, the run-time/build-time
+   distinction is just a hint for mental clarity, but in the future it perhaps
+   could be enforced.
+  </para>
 
-<para>The standard environment provides the following packages:
+  <para>
+   The extension of <envar>PATH</envar> with dependencies, alluded to above,
+   proceeds according to the relative platforms alone. The process is carried
+   out only for dependencies whose host platform matches the new derivation's
+   build platform–i.e. which run on the platform where the new derivation
+   will be built.
+   <footnote>
+    <para>
+     Currently, that means for native builds all dependencies are put on the
+     <envar>PATH</envar>. But in the future that may not be the case for sake
+     of matching cross: the platforms would be assumed to be unique for native
+     and cross builds alike, so only the <varname>depsBuild*</varname> and
+     <varname>nativeBuildDependencies</varname> dependencies would affect the
+     <envar>PATH</envar>.
+    </para>
+   </footnote>
+   For each dependency <replaceable>dep</replaceable> of those dependencies,
+   <filename><replaceable>dep</replaceable>/bin</filename>, if present, is
+   added to the <envar>PATH</envar> environment variable.
+  </para>
 
-<itemizedlist>
+  <para>
+   The dependency is propagated when it forces some of its other-transitive
+   (non-immediate) downstream dependencies to also take it on as an immediate
+   dependency. Nix itself already takes a package's transitive dependencies
+   into account, but this propagation ensures nixpkgs-specific infrastructure
+   like setup hooks (mentioned above) also are run as if the propagated
+   dependency.
+  </para>
 
-  <listitem><para>The GNU C Compiler, configured with C and C++
-  support.</para></listitem>
+  <para>
+   It is important to note dependencies are not necessary propagated as the
+   same sort of dependency that they were before, but rather as the
+   corresponding sort so that the platform rules still line up. The exact rules
+   for dependency propagation can be given by assigning each sort of dependency
+   two integers based one how it's host and target platforms are offset from
+   the depending derivation's platforms. Those offsets are given are given
+   below in the descriptions of each dependency list attribute.
+   Algorithmically, we traverse propagated inputs, accumulating every
+   propagated dep's propagated deps and adjusting them to account for the
+   "shift in perspective" described by the current dep's platform offsets. This
+   results in sort a transitive closure of the dependency relation, with the
+   offsets being approximately summed when two dependency links are combined.
+   We also prune transitive deps whose combined offsets go out-of-bounds, which
+   can be viewed as a filter over that transitive closure removing dependencies
+   that are blatantly absurd.
+  </para>
 
-  <listitem><para>GNU coreutils (contains a few dozen standard Unix
-  commands).</para></listitem>
-
-  <listitem><para>GNU findutils (contains
-  <command>find</command>).</para></listitem>
-
-  <listitem><para>GNU diffutils (contains <command>diff</command>,
-  <command>cmp</command>).</para></listitem>
-
-  <listitem><para>GNU <command>sed</command>.</para></listitem>
-
-  <listitem><para>GNU <command>grep</command>.</para></listitem>
-
-  <listitem><para>GNU <command>awk</command>.</para></listitem>
-
-  <listitem><para>GNU <command>tar</command>.</para></listitem>
-
-  <listitem><para><command>gzip</command>, <command>bzip2</command>
-  and <command>xz</command>.</para></listitem>
-
-  <listitem><para>GNU Make.  It has been patched to provide
-  <quote>nested</quote> output that can be fed into the
-  <command>nix-log2xml</command> command and
-  <command>log2html</command> stylesheet to create a structured,
-  readable output of the build steps performed by
-  Make.</para></listitem>
-
-  <listitem><para>Bash.  This is the shell used for all builders in
-  the Nix Packages collection.  Not using <command>/bin/sh</command>
-  removes a large source of portability problems.</para></listitem>
-
-  <listitem><para>The <command>patch</command>
-  command.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>On Linux, <literal>stdenv</literal> also includes the
-<command>patchelf</command> utility.</para>
-
-</section>
-
-
-<section xml:id="ssec-stdenv-dependencies"><title>Specifying dependencies</title>
-
-<para>
-  As described in the Nix manual, almost any <filename>*.drv</filename> store path in a derivation's attribute set will induce a dependency on that derivation.
-  <varname>mkDerivation</varname>, however, takes a few attributes intended to, between them, include all the dependencies of a package.
-  This is done both for structure and consistency, but also so that certain other setup can take place.
-  For example, certain dependencies need their bin directories added to the <envar>PATH</envar>.
-  That is built-in, but other setup is done via a pluggable mechanism that works in conjunction with these dependency attributes.
-  See <xref linkend="ssec-setup-hooks"/> for details.
-</para>
-<para>
-  Dependencies can be broken down along three axes: their host and target platforms relative to the new derivation's, and whether they are propagated.
-  The platform distinctions are motivated by cross compilation; see <xref linkend="chap-cross"/> for exactly what each platform means.
-  <footnote><para>
-    The build platform is ignored because it is a mere implementation detail of the package satisfying the dependency:
-    As a general programming principle, dependencies are always <emphasis>specified</emphasis> as interfaces, not concrete implementation.
-  </para></footnote>
-  But even if one is not cross compiling, the platforms imply whether or not the dependency is needed at run-time or build-time, a concept that makes perfect sense outside of cross compilation.
-  For now, the run-time/build-time distinction is just a hint for mental clarity, but in the future it perhaps could be enforced.
-</para>
-<para>
-  The extension of <envar>PATH</envar> with dependencies, alluded to above, proceeds according to the relative platforms alone.
-  The process is carried out only for dependencies whose host platform matches the new derivation's build platform–i.e. which run on the platform where the new derivation will be built.
-  <footnote><para>
-    Currently, that means for native builds all dependencies are put on the <envar>PATH</envar>.
-    But in the future that may not be the case for sake of matching cross:
-    the platforms would be assumed to be unique for native and cross builds alike, so only the <varname>depsBuild*</varname> and <varname>nativeBuildDependencies</varname> dependencies would affect the <envar>PATH</envar>.
-  </para></footnote>
-  For each dependency <replaceable>dep</replaceable> of those dependencies, <filename><replaceable>dep</replaceable>/bin</filename>, if present, is added to the <envar>PATH</envar> environment variable.
-</para>
-<para>
-  The dependency is propagated when it forces some of its other-transitive (non-immediate) downstream dependencies to also take it on as an immediate dependency.
-  Nix itself already takes a package's transitive dependencies into account, but this propagation ensures nixpkgs-specific infrastructure like setup hooks (mentioned above) also are run as if the propagated dependency.
-</para>
-<para>
-  It is important to note dependencies are not necessary propagated as the same sort of dependency that they were before, but rather as the corresponding sort so that the platform rules still line up.
-  The exact rules for dependency propagation can be given by assigning each sort of dependency two integers based one how it's host and target platforms are offset from the depending derivation's platforms.
-  Those offsets are given are given below in the descriptions of each dependency list attribute.
-  Algorithmically, we traverse propagated inputs, accumulating every propagated dep's propagated deps and adjusting them to account for the "shift in perspective" described by the current dep's platform offsets.
-  This results in sort a transitive closure of the dependency relation, with the offsets being approximately summed when two dependency links are combined.
-  We also prune transitive deps whose combined offsets go out-of-bounds, which can be viewed as a filter over that transitive closure removing dependencies that are blatantly absurd.
-</para>
-<para>
-  We can define the process precisely with <link xlink:href="https://en.wikipedia.org/wiki/Natural_deduction">Natural Deduction</link> using the inference rules.
-  This probably seems a bit obtuse, but so is the bash code that actually implements it!
-  <footnote><para>
-    The <function>findInputs</function> function, currently residing in <filename>pkgs/stdenv/generic/setup.sh</filename>, implements the propagation logic.
-  </para></footnote>
-  They're confusing in very different ways so...hopefully if something doesn't make sense in one presentation, it does in the other!
-  <programlisting>
+  <para>
+   We can define the process precisely with
+   <link xlink:href="https://en.wikipedia.org/wiki/Natural_deduction">Natural
+   Deduction</link> using the inference rules. This probably seems a bit
+   obtuse, but so is the bash code that actually implements it!
+   <footnote>
+    <para>
+     The <function>findInputs</function> function, currently residing in
+     <filename>pkgs/stdenv/generic/setup.sh</filename>, implements the
+     propagation logic.
+    </para>
+   </footnote>
+   They're confusing in very different ways so...hopefully if something doesn't
+   make sense in one presentation, it does in the other!
+<programlisting>
 let mapOffset(h, t, i) = i + (if i &lt;= 0 then h else t - 1)
 
 propagated-dep(h0, t0, A, B)
@@ -239,7 +300,7 @@ h0 + t1 in {-1, 0, 1}
 propagated-dep(mapOffset(h0, t0, h1),
                mapOffset(h0, t0, t1),
                A, C)</programlisting>
-  <programlisting>
+<programlisting>
 let mapOffset(h, t, i) = i + (if i &lt;= 0 then h else t - 1)
 
 dep(h0, _, A, B)
@@ -250,255 +311,343 @@ h0 + t1 in {-1, 0, -1}
 propagated-dep(mapOffset(h0, t0, h1),
                mapOffset(h0, t0, t1),
                A, C)</programlisting>
-  <programlisting>
+<programlisting>
 propagated-dep(h, t, A, B)
 -------------------------------------- Propagated deps count as deps
 dep(h, t, A, B)</programlisting>
-  Some explanation of this monstrosity is in order.
-  In the common case, the target offset of a dependency is the successor to the target offset: <literal>t = h + 1</literal>.
-  That means that:
-  <programlisting>
+   Some explanation of this monstrosity is in order. In the common case, the
+   target offset of a dependency is the successor to the target offset:
+   <literal>t = h + 1</literal>. That means that:
+<programlisting>
 let f(h, t, i) = i + (if i &lt;= 0 then h else t - 1)
 let f(h, h + 1, i) = i + (if i &lt;= 0 then h else (h + 1) - 1)
 let f(h, h + 1, i) = i + (if i &lt;= 0 then h else h)
 let f(h, h + 1, i) = i + h
   </programlisting>
-  This is where the "sum-like" comes from above:
-  We can just sum all the host offset to get the host offset of the transitive dependency.
-  The target offset is the transitive dep is simply the host offset + 1, just as it was with the dependencies composed to make this transitive one;
-  it can be ignored as it doesn't add any new information.
-</para>
-<para>
-  Because of the bounds checks, the uncommon cases are <literal>h = t</literal> and <literal>h + 2 = t</literal>.
-  In the former case, the motivation for <function>mapOffset</function> is that since its host and target platforms are the same, no transitive dep of it should be able to "discover" an offset greater than its reduced target offsets.
-  <function>mapOffset</function> effectively "squashes" all its transitive dependencies' offsets so that none will ever be greater than the target offset of the original <literal>h = t</literal> package.
-  In the other case, <literal>h + 1</literal> is skipped over between the host and target offsets.
-  Instead of squashing the offsets, we need to "rip" them apart so no transitive dependencies' offset is that one.
-</para>
-<para>
-Overall, the unifying theme here is that propagation shouldn't be introducing transitive dependencies involving platforms the needing package is unaware of.
-The offset bounds checking and definition of <function>mapOffset</function> together ensure that this is the case.
-Discovering a new offset is discovering a new platform, and since those platforms weren't in the derivation "spec" of the needing package, they cannot be relevant.
-From a capability perspective, we can imagine that the host and target platforms of a package are the capabilities a package requires, and the depending package must provide the capability to the dependency.
-</para>
+   This is where the "sum-like" comes from above: We can just sum all the host
+   offset to get the host offset of the transitive dependency. The target
+   offset is the transitive dep is simply the host offset + 1, just as it was
+   with the dependencies composed to make this transitive one; it can be
+   ignored as it doesn't add any new information.
+  </para>
 
-<variablelist>
-  <title>Variables specifying dependencies</title>
+  <para>
+   Because of the bounds checks, the uncommon cases are <literal>h =
+   t</literal> and <literal>h + 2 = t</literal>. In the former case, the
+   motivation for <function>mapOffset</function> is that since its host and
+   target platforms are the same, no transitive dep of it should be able to
+   "discover" an offset greater than its reduced target offsets.
+   <function>mapOffset</function> effectively "squashes" all its transitive
+   dependencies' offsets so that none will ever be greater than the target
+   offset of the original <literal>h = t</literal> package. In the other case,
+   <literal>h + 1</literal> is skipped over between the host and target
+   offsets. Instead of squashing the offsets, we need to "rip" them apart so no
+   transitive dependencies' offset is that one.
+  </para>
 
+  <para>
+   Overall, the unifying theme here is that propagation shouldn't be
+   introducing transitive dependencies involving platforms the needing package
+   is unaware of. The offset bounds checking and definition of
+   <function>mapOffset</function> together ensure that this is the case.
+   Discovering a new offset is discovering a new platform, and since those
+   platforms weren't in the derivation "spec" of the needing package, they
+   cannot be relevant. From a capability perspective, we can imagine that the
+   host and target platforms of a package are the capabilities a package
+   requires, and the depending package must provide the capability to the
+   dependency.
+  </para>
+
+  <variablelist>
+   <title>Variables specifying dependencies</title>
    <varlistentry>
-     <term><varname>depsBuildBuild</varname></term>
-     <listitem>
-       <para>
-         A list of dependencies whose host and target platforms are the new derivation's build platform.
-         This means a <literal>-1</literal> host and <literal>-1</literal> target offset from the new derivation's platforms.
-         They are programs/libraries used at build time that furthermore produce programs/libraries also used at build time.
-         If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it in <varname>nativeBuildInputs</varname>instead.
-         The most common use for this <literal>buildPackages.stdenv.cc</literal>, the default C compiler for this role.
-         That example crops up more than one might think in old commonly used C libraries.
-       </para>
-       <para>
-         Since these packages are able to be run at build time, that are always added to the <envar>PATH</envar>, as described above.
-         But since these packages are only guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
-         This isn't currently enforced, but could be in the future.
-       </para>
-     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>nativeBuildInputs</varname></term>
+    <term><varname>depsBuildBuild</varname>
+    </term>
     <listitem>
-      <para>
-        A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's host platform.
-        This means a <literal>-1</literal> host offset and <literal>0</literal> target offset from the new derivation's platforms.
-        They are programs/libraries used at build time that, if they are a compiler or similar tool, produce code to run at run time—i.e. tools used to build the new derivation.
-        If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>.
-        This would be called <varname>depsBuildHost</varname> but for historical continuity.
-      </para>
-      <para>
-         Since these packages are able to be run at build time, that are added to the <envar>PATH</envar>, as described above.
-         But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
-         This isn't currently enforced, but could be in the future.
-       </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>depsBuildTarget</varname></term>
-    <listitem>
-      <para>
-        A list of dependencies whose host platform is the new derivation's build platform, and target platform is the new derivation's target platform.
-        This means a <literal>-1</literal> host offset and <literal>1</literal> target offset from the new derivation's platforms.
-        They are programs used at build time that produce code to run at run with code produced by the depending package.
-        Most commonly, these would tools used to build the runtime or standard library the currently-being-built compiler will inject into any code it compiles.
-        In many cases, the currently-being built compiler is itself employed for that task, but when that compiler won't run (i.e. its build and host platform differ) this is not possible.
-        Other times, the compiler relies on some other tool, like binutils, that is always built separately so the dependency is unconditional.
-      </para>
-      <para>
-        This is a somewhat confusing dependency to wrap ones head around, and for good reason.
-        As the only one where the platform offsets are not adjacent integers, it requires thinking of a bootstrapping stage <emphasis>two</emphasis> away from the current one.
-        It and it's use-case go hand in hand and are both considered poor form:
-        try not to need this sort dependency, and try not avoid building standard libraries / runtimes in the same derivation as the compiler produces code using them.
-        Instead strive to build those like a normal library, using the newly-built compiler just as a normal library would.
-        In short, do not use this attribute unless you are packaging a compiler and are sure it is needed.
+     <para>
+      A list of dependencies whose host and target platforms are the new
+      derivation's build platform. This means a <literal>-1</literal> host and
+      <literal>-1</literal> target offset from the new derivation's platforms.
+      They are programs/libraries used at build time that furthermore produce
+      programs/libraries also used at build time. If the dependency doesn't
+      care about the target platform (i.e. isn't a compiler or similar tool),
+      put it in <varname>nativeBuildInputs</varname>instead. The most common
+      use for this <literal>buildPackages.stdenv.cc</literal>, the default C
+      compiler for this role. That example crops up more than one might think
+      in old commonly used C libraries.
      </para>
      <para>
-       Since these packages are able to be run at build time, that are added to the <envar>PATH</envar>, as described above.
-       But since these packages only are guaranteed to be able to run then, they shouldn't persist as run-time dependencies.
-       This isn't currently enforced, but could be in the future.
+      Since these packages are able to be run at build time, that are always
+      added to the <envar>PATH</envar>, as described above. But since these
+      packages are only guaranteed to be able to run then, they shouldn't
+      persist as run-time dependencies. This isn't currently enforced, but
+      could be in the future.
      </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>depsHostHost</varname></term>
-    <listitem><para>
-      A list of dependencies whose host and target platforms match the new derivation's host platform.
-      This means a both <literal>0</literal> host offset and <literal>0</literal> target offset from the new derivation's host platform.
-      These are packages used at run-time to generate code also used at run-time.
-      In practice, that would usually be tools used by compilers for metaprogramming/macro systems, or libraries used by the macros/metaprogramming code itself.
-      It's always preferable to use a <varname>depsBuildBuild</varname> dependency in the derivation being built than a <varname>depsHostHost</varname> on the tool doing the building for this purpose.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>buildInputs</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>nativeBuildInputs</varname>
+    </term>
     <listitem>
-      <para>
-        A list of dependencies whose host platform and target platform match the new derivation's.
-        This means a <literal>0</literal> host offset and <literal>1</literal> target offset from the new derivation's host platform.
-        This would be called <varname>depsHostTarget</varname> but for historical continuity.
-        If the dependency doesn't care about the target platform (i.e. isn't a compiler or similar tool), put it here, rather than in <varname>depsBuildBuild</varname>.
-      </para>
-      <para>
-        These often are programs/libraries used by the new derivation at <emphasis>run</emphasis>-time, but that isn't always the case.
-        For example, the machine code in a statically linked library is only used at run time, but the derivation containing the library is only needed at build time.
-        Even in the dynamic case, the library may also be needed at build time to appease the linker.
-      </para>
+     <para>
+      A list of dependencies whose host platform is the new derivation's build
+      platform, and target platform is the new derivation's host platform. This
+      means a <literal>-1</literal> host offset and <literal>0</literal> target
+      offset from the new derivation's platforms. They are programs/libraries
+      used at build time that, if they are a compiler or similar tool, produce
+      code to run at run time—i.e. tools used to build the new derivation. If
+      the dependency doesn't care about the target platform (i.e. isn't a
+      compiler or similar tool), put it here, rather than in
+      <varname>depsBuildBuild</varname> or <varname>depsBuildTarget</varname>.
+      This would be called <varname>depsBuildHost</varname> but for historical
+      continuity.
+     </para>
+     <para>
+      Since these packages are able to be run at build time, that are added to
+      the <envar>PATH</envar>, as described above. But since these packages
+      only are guaranteed to be able to run then, they shouldn't persist as
+      run-time dependencies. This isn't currently enforced, but could be in the
+      future.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>depsTargetTarget</varname></term>
-    <listitem><para>
-      A list of dependencies whose host platform matches the new derivation's target platform.
-      This means a <literal>1</literal> offset from the new derivation's platforms.
-      These are packages that run on the target platform, e.g. the standard library or run-time deps of standard library that a compiler insists on knowing about.
-      It's poor form in almost all cases for a package to depend on another from a future stage [future stage corresponding to positive offset].
-      Do not use this attribute unless you are packaging a compiler and are sure it is needed.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>depsBuildBuildPropagated</varname></term>
-    <listitem><para>
-      The propagated equivalent of <varname>depsBuildBuild</varname>.
-      This perhaps never ought to be used, but it is included for consistency [see below for the others].
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>propagatedNativeBuildInputs</varname></term>
-    <listitem><para>
-      The propagated equivalent of <varname>nativeBuildInputs</varname>.
-      This would be called <varname>depsBuildHostPropagated</varname> but for historical continuity.
-      For example, if package <varname>Y</varname> has <literal>propagatedNativeBuildInputs = [X]</literal>, and package <varname>Z</varname> has <literal>buildInputs = [Y]</literal>, then package <varname>Z</varname> will be built as if it included package <varname>X</varname> in its <varname>nativeBuildInputs</varname>.
-      If instead, package <varname>Z</varname> has <literal>nativeBuildInputs = [Y]</literal>, then <varname>Z</varname> will be built as if it included <varname>X</varname> in the <varname>depsBuildBuild</varname> of package <varname>Z</varname>, because of the sum of the two <literal>-1</literal> host offsets.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>depsBuildTargetPropagated</varname></term>
-    <listitem><para>
-      The propagated equivalent of <varname>depsBuildTarget</varname>.
-      This is prefixed for the same reason of alerting potential users.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>depsHostHostPropagated</varname></term>
-    <listitem><para>
-      The propagated equivalent of <varname>depsHostHost</varname>.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>propagatedBuildInputs</varname></term>
-    <listitem><para>
-      The propagated equivalent of <varname>buildInputs</varname>.
-      This would be called <varname>depsHostTargetPropagated</varname> but for historical continuity.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>depsTargetTarget</varname></term>
-    <listitem><para>
-      The propagated equivalent of <varname>depsTargetTarget</varname>.
-      This is prefixed for the same reason of alerting potential users.
-    </para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</section>
-
-
-<section xml:id="ssec-stdenv-attributes"><title>Attributes</title>
-
-<variablelist>
-  <title>Variables affecting <literal>stdenv</literal>
-  initialisation</title>
-
-  <varlistentry>
-    <term><varname>NIX_DEBUG</varname></term>
-    <listitem><para>
-      A natural number indicating how much information to log.
-      If set to 1 or higher, <literal>stdenv</literal> will print moderate debug information during the build.
-      In particular, the <command>gcc</command> and <command>ld</command> wrapper scripts will print out the complete command line passed to the wrapped tools.
-      If set to 6 or higher, the <literal>stdenv</literal> setup script will be run with <literal>set -x</literal> tracing.
-      If set to 7 or higher, the <command>gcc</command> and <command>ld</command> wrapper scripts will also be run with <literal>set -x</literal> tracing.
-    </para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-<variablelist>
-  <title>Variables affecting build properties</title>
-
-  <varlistentry>
-    <term><varname>enableParallelBuilding</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>depsBuildTarget</varname>
+    </term>
     <listitem>
-      <para>If set to <literal>true</literal>, <literal>stdenv</literal> will
-      pass specific flags to <literal>make</literal> and other build tools to
-      enable parallel building with up to <literal>build-cores</literal>
-      workers.</para>
+     <para>
+      A list of dependencies whose host platform is the new derivation's build
+      platform, and target platform is the new derivation's target platform.
+      This means a <literal>-1</literal> host offset and <literal>1</literal>
+      target offset from the new derivation's platforms. They are programs used
+      at build time that produce code to run at run with code produced by the
+      depending package. Most commonly, these would tools used to build the
+      runtime or standard library the currently-being-built compiler will
+      inject into any code it compiles. In many cases, the currently-being
+      built compiler is itself employed for that task, but when that compiler
+      won't run (i.e. its build and host platform differ) this is not possible.
+      Other times, the compiler relies on some other tool, like binutils, that
+      is always built separately so the dependency is unconditional.
+     </para>
+     <para>
+      This is a somewhat confusing dependency to wrap ones head around, and for
+      good reason. As the only one where the platform offsets are not adjacent
+      integers, it requires thinking of a bootstrapping stage
+      <emphasis>two</emphasis> away from the current one. It and it's use-case
+      go hand in hand and are both considered poor form: try not to need this
+      sort dependency, and try not avoid building standard libraries / runtimes
+      in the same derivation as the compiler produces code using them. Instead
+      strive to build those like a normal library, using the newly-built
+      compiler just as a normal library would. In short, do not use this
+      attribute unless you are packaging a compiler and are sure it is needed.
+     </para>
+     <para>
+      Since these packages are able to be run at build time, that are added to
+      the <envar>PATH</envar>, as described above. But since these packages
+      only are guaranteed to be able to run then, they shouldn't persist as
+      run-time dependencies. This isn't currently enforced, but could be in the
+      future.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>depsHostHost</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of dependencies whose host and target platforms match the new
+      derivation's host platform. This means a both <literal>0</literal> host
+      offset and <literal>0</literal> target offset from the new derivation's
+      host platform. These are packages used at run-time to generate code also
+      used at run-time. In practice, that would usually be tools used by
+      compilers for metaprogramming/macro systems, or libraries used by the
+      macros/metaprogramming code itself. It's always preferable to use a
+      <varname>depsBuildBuild</varname> dependency in the derivation being
+      built than a <varname>depsHostHost</varname> on the tool doing the
+      building for this purpose.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>buildInputs</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of dependencies whose host platform and target platform match the
+      new derivation's. This means a <literal>0</literal> host offset and
+      <literal>1</literal> target offset from the new derivation's host
+      platform. This would be called <varname>depsHostTarget</varname> but for
+      historical continuity. If the dependency doesn't care about the target
+      platform (i.e. isn't a compiler or similar tool), put it here, rather
+      than in <varname>depsBuildBuild</varname>.
+     </para>
+     <para>
+      These often are programs/libraries used by the new derivation at
+      <emphasis>run</emphasis>-time, but that isn't always the case. For
+      example, the machine code in a statically linked library is only used at
+      run time, but the derivation containing the library is only needed at
+      build time. Even in the dynamic case, the library may also be needed at
+      build time to appease the linker.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>depsTargetTarget</varname>
+    </term>
+    <listitem>
+     <para>
+      A list of dependencies whose host platform matches the new derivation's
+      target platform. This means a <literal>1</literal> offset from the new
+      derivation's platforms. These are packages that run on the target
+      platform, e.g. the standard library or run-time deps of standard library
+      that a compiler insists on knowing about. It's poor form in almost all
+      cases for a package to depend on another from a future stage [future
+      stage corresponding to positive offset]. Do not use this attribute unless
+      you are packaging a compiler and are sure it is needed.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>depsBuildBuildPropagated</varname>
+    </term>
+    <listitem>
+     <para>
+      The propagated equivalent of <varname>depsBuildBuild</varname>. This
+      perhaps never ought to be used, but it is included for consistency [see
+      below for the others].
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>propagatedNativeBuildInputs</varname>
+    </term>
+    <listitem>
+     <para>
+      The propagated equivalent of <varname>nativeBuildInputs</varname>. This
+      would be called <varname>depsBuildHostPropagated</varname> but for
+      historical continuity. For example, if package <varname>Y</varname> has
+      <literal>propagatedNativeBuildInputs = [X]</literal>, and package
+      <varname>Z</varname> has <literal>buildInputs = [Y]</literal>, then
+      package <varname>Z</varname> will be built as if it included package
+      <varname>X</varname> in its <varname>nativeBuildInputs</varname>. If
+      instead, package <varname>Z</varname> has <literal>nativeBuildInputs =
+      [Y]</literal>, then <varname>Z</varname> will be built as if it included
+      <varname>X</varname> in the <varname>depsBuildBuild</varname> of package
+      <varname>Z</varname>, because of the sum of the two <literal>-1</literal>
+      host offsets.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>depsBuildTargetPropagated</varname>
+    </term>
+    <listitem>
+     <para>
+      The propagated equivalent of <varname>depsBuildTarget</varname>. This is
+      prefixed for the same reason of alerting potential users.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>depsHostHostPropagated</varname>
+    </term>
+    <listitem>
+     <para>
+      The propagated equivalent of <varname>depsHostHost</varname>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>propagatedBuildInputs</varname>
+    </term>
+    <listitem>
+     <para>
+      The propagated equivalent of <varname>buildInputs</varname>. This would
+      be called <varname>depsHostTargetPropagated</varname> but for historical
+      continuity.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>depsTargetTarget</varname>
+    </term>
+    <listitem>
+     <para>
+      The propagated equivalent of <varname>depsTargetTarget</varname>. This is
+      prefixed for the same reason of alerting potential users.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
+ <section xml:id="ssec-stdenv-attributes">
+  <title>Attributes</title>
 
-      <para>Unless set to <literal>false</literal>, some build systems with good
+  <variablelist>
+   <title>Variables affecting <literal>stdenv</literal> initialisation</title>
+   <varlistentry>
+    <term><varname>NIX_DEBUG</varname>
+    </term>
+    <listitem>
+     <para>
+      A natural number indicating how much information to log. If set to 1 or
+      higher, <literal>stdenv</literal> will print moderate debug information
+      during the build. In particular, the <command>gcc</command> and
+      <command>ld</command> wrapper scripts will print out the complete command
+      line passed to the wrapped tools. If set to 6 or higher, the
+      <literal>stdenv</literal> setup script will be run with <literal>set
+      -x</literal> tracing. If set to 7 or higher, the <command>gcc</command>
+      and <command>ld</command> wrapper scripts will also be run with
+      <literal>set -x</literal> tracing.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <variablelist>
+   <title>Variables affecting build properties</title>
+   <varlistentry>
+    <term><varname>enableParallelBuilding</varname>
+    </term>
+    <listitem>
+     <para>
+      If set to <literal>true</literal>, <literal>stdenv</literal> will pass
+      specific flags to <literal>make</literal> and other build tools to enable
+      parallel building with up to <literal>build-cores</literal> workers.
+     </para>
+     <para>
+      Unless set to <literal>false</literal>, some build systems with good
       support for parallel building including <literal>cmake</literal>,
       <literal>meson</literal>, and <literal>qmake</literal> will set it to
-      <literal>true</literal>.</para>
+      <literal>true</literal>.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preferLocalBuild</varname></term>
-    <listitem><para>If set, specifies that the package is so lightweight
-    in terms of build operations (e.g. write a text file from a Nix string
-    to the store) that there's no need to look for it in binary caches --
-    it's faster to just build it locally. It also tells Hydra and other
-    facilities that this package doesn't need to be exported in binary
-    caches (noone would use it, after all).</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-<variablelist>
-  <title>Special variables</title>
-
-  <varlistentry>
-    <term><varname>passthru</varname></term>
-    <listitem><para>This is an attribute set which can be filled with arbitrary
-    values. For example:
+   </varlistentry>
+   <varlistentry>
+    <term><varname>preferLocalBuild</varname>
+    </term>
+    <listitem>
+     <para>
+      If set, specifies that the package is so lightweight in terms of build
+      operations (e.g. write a text file from a Nix string to the store) that
+      there's no need to look for it in binary caches -- it's faster to just
+      build it locally. It also tells Hydra and other facilities that this
+      package doesn't need to be exported in binary caches (noone would use it,
+      after all).
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
 
+  <variablelist>
+   <title>Special variables</title>
+   <varlistentry>
+    <term><varname>passthru</varname>
+    </term>
+    <listitem>
+     <para>
+      This is an attribute set which can be filled with arbitrary values. For
+      example:
 <programlisting>
 passthru = {
   foo = "bar";
@@ -508,881 +657,1104 @@ passthru = {
   };
 }
 </programlisting>
+     </para>
+     <para>
+      Values inside it are not passed to the builder, so you can change them
+      without triggering a rebuild. However, they can be accessed outside of a
+      derivation directly, as if they were set inside a derivation itself, e.g.
+      <literal>hello.baz.value1</literal>. We don't specify any usage or schema
+      of <literal>passthru</literal> - it is meant for values that would be
+      useful outside the derivation in other parts of a Nix expression (e.g. in
+      other derivations). An example would be to convey some specific
+      dependency of your derivation which contains a program with plugins
+      support. Later, others who make derivations with plugins can use
+      passed-through dependency to ensure that their plugin would be
+      binary-compatible with built program.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
+ <section xml:id="sec-stdenv-phases">
+  <title>Phases</title>
 
-</para>
+  <para>
+   The generic builder has a number of <emphasis>phases</emphasis>. Package
+   builds are split into phases to make it easier to override specific parts of
+   the build (e.g., unpacking the sources or installing the binaries).
+   Furthermore, it allows a nicer presentation of build logs in the Nix build
+   farm.
+  </para>
 
-    <para>Values inside it are not passed to the builder, so you can change
-    them without triggering a rebuild. However, they can be accessed outside of a
-    derivation directly, as if they were set inside a derivation itself, e.g.
-    <literal>hello.baz.value1</literal>. We don't specify any usage or
-    schema of <literal>passthru</literal> - it is meant for values that would be
-    useful outside the derivation in other parts of a Nix expression (e.g. in other
-    derivations). An example would be to convey some specific dependency of your
-    derivation which contains a program with plugins support.  Later, others who
-    make derivations with plugins can use passed-through dependency to ensure that
-    their plugin would be binary-compatible with built program.</para></listitem>
-  </varlistentry>
+  <para>
+   Each phase can be overridden in its entirety either by setting the
+   environment variable <varname><replaceable>name</replaceable>Phase</varname>
+   to a string containing some shell commands to be executed, or by redefining
+   the shell function <varname><replaceable>name</replaceable>Phase</varname>.
+   The former is convenient to override a phase from the derivation, while the
+   latter is convenient from a build script. However, typically one only wants
+   to <emphasis>add</emphasis> some commands to a phase, e.g. by defining
+   <literal>postInstall</literal> or <literal>preFixup</literal>, as skipping
+   some of the default actions may have unexpected consequences.
+  </para>
 
-</variablelist>
+  <section xml:id="ssec-controlling-phases">
+   <title>Controlling phases</title>
 
-</section>
+   <para>
+    There are a number of variables that control what phases are executed and
+    in what order:
+    <variablelist>
+     <title>Variables affecting phase control</title>
+     <varlistentry>
+      <term><varname>phases</varname>
+      </term>
+      <listitem>
+       <para>
+        Specifies the phases. You can change the order in which phases are
+        executed, or add new phases, by setting this variable. If it’s not
+        set, the default value is used, which is <literal>$prePhases
+        unpackPhase patchPhase $preConfigurePhases configurePhase
+        $preBuildPhases buildPhase checkPhase $preInstallPhases installPhase
+        fixupPhase $preDistPhases distPhase $postPhases</literal>.
+       </para>
+       <para>
+        Usually, if you just want to add a few phases, it’s more convenient
+        to set one of the variables below (such as
+        <varname>preInstallPhases</varname>), as you then don’t specify all
+        the normal phases.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><varname>prePhases</varname>
+      </term>
+      <listitem>
+       <para>
+        Additional phases executed before any of the default phases.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><varname>preConfigurePhases</varname>
+      </term>
+      <listitem>
+       <para>
+        Additional phases executed just before the configure phase.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><varname>preBuildPhases</varname>
+      </term>
+      <listitem>
+       <para>
+        Additional phases executed just before the build phase.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><varname>preInstallPhases</varname>
+      </term>
+      <listitem>
+       <para>
+        Additional phases executed just before the install phase.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><varname>preFixupPhases</varname>
+      </term>
+      <listitem>
+       <para>
+        Additional phases executed just before the fixup phase.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><varname>preDistPhases</varname>
+      </term>
+      <listitem>
+       <para>
+        Additional phases executed just before the distribution phase.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term><varname>postPhases</varname>
+      </term>
+      <listitem>
+       <para>
+        Additional phases executed after any of the default phases.
+       </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+   </para>
+  </section>
 
+  <section xml:id="ssec-unpack-phase">
+   <title>The unpack phase</title>
 
-<section xml:id="sec-stdenv-phases"><title>Phases</title>
+   <para>
+    The unpack phase is responsible for unpacking the source code of the
+    package. The default implementation of <function>unpackPhase</function>
+    unpacks the source files listed in the <envar>src</envar> environment
+    variable to the current directory. It supports the following files by
+    default:
+    <variablelist>
+     <varlistentry>
+      <term>Tar files</term>
+      <listitem>
+       <para>
+        These can optionally be compressed using <command>gzip</command>
+        (<filename>.tar.gz</filename>, <filename>.tgz</filename> or
+        <filename>.tar.Z</filename>), <command>bzip2</command>
+        (<filename>.tar.bz2</filename> or <filename>.tbz2</filename>) or
+        <command>xz</command> (<filename>.tar.xz</filename> or
+        <filename>.tar.lzma</filename>).
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term>Zip files</term>
+      <listitem>
+       <para>
+        Zip files are unpacked using <command>unzip</command>. However,
+        <command>unzip</command> is not in the standard environment, so you
+        should add it to <varname>buildInputs</varname> yourself.
+       </para>
+      </listitem>
+     </varlistentry>
+     <varlistentry>
+      <term>Directories in the Nix store</term>
+      <listitem>
+       <para>
+        These are simply copied to the current directory. The hash part of the
+        file name is stripped, e.g.
+        <filename>/nix/store/1wydxgby13cz...-my-sources</filename> would be
+        copied to <filename>my-sources</filename>.
+       </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+    Additional file types can be supported by setting the
+    <varname>unpackCmd</varname> variable (see below).
+   </para>
 
-<para>The generic builder has a number of <emphasis>phases</emphasis>.
-Package builds are split into phases to make it easier to override
-specific parts of the build (e.g., unpacking the sources or installing
-the binaries).  Furthermore, it allows a nicer presentation of build
-logs in the Nix build farm.</para>
+   <para></para>
 
-<para>Each phase can be overridden in its entirety either by setting
-the environment variable
-<varname><replaceable>name</replaceable>Phase</varname> to a string
-containing some shell commands to be executed, or by redefining the
-shell function
-<varname><replaceable>name</replaceable>Phase</varname>.  The former
-is convenient to override a phase from the derivation, while the
-latter is convenient from a build script.
-
-However, typically one only wants to <emphasis>add</emphasis> some
-commands to a phase, e.g. by defining <literal>postInstall</literal>
-or <literal>preFixup</literal>, as skipping some of the default actions
-may have unexpected consequences.
-</para>
-
-
-<section xml:id="ssec-controlling-phases"><title>Controlling
-phases</title>
-
-<para>There are a number of variables that control what phases are
-executed and in what order:
-
-<variablelist>
-  <title>Variables affecting phase control</title>
-
-  <varlistentry>
-    <term><varname>phases</varname></term>
-    <listitem>
-      <para>Specifies the phases.  You can change the order in which
-      phases are executed, or add new phases, by setting this
-      variable.  If it’s not set, the default value is used, which is
-      <literal>$prePhases unpackPhase patchPhase $preConfigurePhases
-      configurePhase $preBuildPhases buildPhase checkPhase
-      $preInstallPhases installPhase fixupPhase $preDistPhases
-      distPhase $postPhases</literal>.
+   <variablelist>
+    <title>Variables controlling the unpack phase</title>
+    <varlistentry>
+     <term><varname>srcs</varname> / <varname>src</varname>
+     </term>
+     <listitem>
+      <para>
+       The list of source files or directories to be unpacked or copied. One of
+       these must be set.
       </para>
-
-      <para>Usually, if you just want to add a few phases, it’s more
-      convenient to set one of the variables below (such as
-      <varname>preInstallPhases</varname>), as you then don’t specify
-      all the normal phases.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>prePhases</varname></term>
-    <listitem>
-      <para>Additional phases executed before any of the default phases.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preConfigurePhases</varname></term>
-    <listitem>
-      <para>Additional phases executed just before the configure phase.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preBuildPhases</varname></term>
-    <listitem>
-      <para>Additional phases executed just before the build phase.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preInstallPhases</varname></term>
-    <listitem>
-      <para>Additional phases executed just before the install phase.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preFixupPhases</varname></term>
-    <listitem>
-      <para>Additional phases executed just before the fixup phase.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preDistPhases</varname></term>
-    <listitem>
-      <para>Additional phases executed just before the distribution phase.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postPhases</varname></term>
-    <listitem>
-      <para>Additional phases executed after any of the default
-      phases.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</section>
-
-
-<section xml:id="ssec-unpack-phase"><title>The unpack phase</title>
-
-<para>The unpack phase is responsible for unpacking the source code of
-the package.  The default implementation of
-<function>unpackPhase</function> unpacks the source files listed in
-the <envar>src</envar> environment variable to the current directory.
-It supports the following files by default:
-
-<variablelist>
-
-  <varlistentry>
-    <term>Tar files</term>
-    <listitem><para>These can optionally be compressed using
-    <command>gzip</command> (<filename>.tar.gz</filename>,
-    <filename>.tgz</filename> or <filename>.tar.Z</filename>),
-    <command>bzip2</command> (<filename>.tar.bz2</filename> or
-    <filename>.tbz2</filename>) or <command>xz</command>
-    (<filename>.tar.xz</filename> or
-    <filename>.tar.lzma</filename>).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Zip files</term>
-    <listitem><para>Zip files are unpacked using
-    <command>unzip</command>.  However, <command>unzip</command> is
-    not in the standard environment, so you should add it to
-    <varname>buildInputs</varname> yourself.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Directories in the Nix store</term>
-    <listitem><para>These are simply copied to the current directory.
-    The hash part of the file name is stripped,
-    e.g. <filename>/nix/store/1wydxgby13cz...-my-sources</filename>
-    would be copied to
-    <filename>my-sources</filename>.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-Additional file types can be supported by setting the
-<varname>unpackCmd</varname> variable (see below).</para>
-
-<para></para>
-
-<variablelist>
-  <title>Variables controlling the unpack phase</title>
-
-  <varlistentry>
-    <term><varname>srcs</varname> / <varname>src</varname></term>
-    <listitem><para>The list of source files or directories to be
-    unpacked or copied.  One of these must be set.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>sourceRoot</varname></term>
-    <listitem><para>After running <function>unpackPhase</function>,
-    the generic builder changes the current directory to the directory
-    created by unpacking the sources.  If there are multiple source
-    directories, you should set <varname>sourceRoot</varname> to the
-    name of the intended directory.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>setSourceRoot</varname></term>
-    <listitem><para>Alternatively to setting
-    <varname>sourceRoot</varname>, you can set
-    <varname>setSourceRoot</varname> to a shell command to be
-    evaluated by the unpack phase after the sources have been
-    unpacked.  This command must set
-    <varname>sourceRoot</varname>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preUnpack</varname></term>
-    <listitem><para>Hook executed at the start of the unpack
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postUnpack</varname></term>
-    <listitem><para>Hook executed at the end of the unpack
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontMakeSourcesWritable</varname></term>
-    <listitem><para>If set to <literal>1</literal>, the unpacked
-    sources are <emphasis>not</emphasis> made
-    writable.  By default, they are made writable to prevent problems
-    with read-only sources.  For example, copied store directories
-    would be read-only without this.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>unpackCmd</varname></term>
-    <listitem><para>The unpack phase evaluates the string
-    <literal>$unpackCmd</literal> for any unrecognised file.  The path
-    to the current source file is contained in the
-    <varname>curSrc</varname> variable.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</section>
-
-
-<section xml:id="ssec-patch-phase"><title>The patch phase</title>
-
-<para>The patch phase applies the list of patches defined in the
-<varname>patches</varname> variable.</para>
-
-<variablelist>
-  <title>Variables controlling the patch phase</title>
-
-  <varlistentry>
-    <term><varname>patches</varname></term>
-    <listitem><para>The list of patches.  They must be in the format
-    accepted by the <command>patch</command> command, and may
-    optionally be compressed using <command>gzip</command>
-    (<filename>.gz</filename>), <command>bzip2</command>
-    (<filename>.bz2</filename>) or <command>xz</command>
-    (<filename>.xz</filename>).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>patchFlags</varname></term>
-    <listitem><para>Flags to be passed to <command>patch</command>.
-    If not set, the argument <option>-p1</option> is used, which
-    causes the leading directory component to be stripped from the
-    file names in each patch.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>prePatch</varname></term>
-    <listitem><para>Hook executed at the start of the patch
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postPatch</varname></term>
-    <listitem><para>Hook executed at the end of the patch
-    phase.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</section>
-
-
-<section xml:id="ssec-configure-phase"><title>The configure phase</title>
-
-<para>The configure phase prepares the source tree for building.  The
-default <function>configurePhase</function> runs
-<filename>./configure</filename> (typically an Autoconf-generated
-script) if it exists.</para>
-
-<variablelist>
-  <title>Variables controlling the configure phase</title>
-
-  <varlistentry>
-    <term><varname>configureScript</varname></term>
-    <listitem><para>The name of the configure script.  It defaults to
-    <filename>./configure</filename> if it exists; otherwise, the
-    configure phase is skipped.  This can actually be a command (like
-    <literal>perl ./Configure.pl</literal>).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>configureFlags</varname></term>
-    <listitem><para>A list of strings passed as additional arguments to the
-    configure script.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>configureFlagsArray</varname></term>
-    <listitem><para>A shell array containing additional arguments
-    passed to the configure script.  You must use this instead of
-    <varname>configureFlags</varname> if the arguments contain
-    spaces.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontAddPrefix</varname></term>
-    <listitem><para>By default, the flag
-    <literal>--prefix=$prefix</literal> is added to the configure
-    flags.  If this is undesirable, set this variable to
-    true.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>prefix</varname></term>
-    <listitem><para>The prefix under which the package must be
-    installed, passed via the <option>--prefix</option> option to the
-    configure script.  It defaults to
-    <option>$out</option>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontAddDisableDepTrack</varname></term>
-    <listitem><para>By default, the flag
-    <literal>--disable-dependency-tracking</literal> is added to the
-    configure flags to speed up Automake-based builds.  If this is
-    undesirable, set this variable to true.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontFixLibtool</varname></term>
-    <listitem><para>By default, the configure phase applies some
-    special hackery to all files called <filename>ltmain.sh</filename>
-    before running the configure script in order to improve the purity
-    of Libtool-based packages<footnote><para>It clears the
-    <varname>sys_lib_<replaceable>*</replaceable>search_path</varname>
-    variables in the Libtool script to prevent Libtool from using
-    libraries in <filename>/usr/lib</filename> and
-    such.</para></footnote>.  If this is undesirable, set this
-    variable to true.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontDisableStatic</varname></term>
-    <listitem><para>By default, when the configure script has
-    <option>--enable-static</option>, the option
-    <option>--disable-static</option> is added to the configure flags.</para>
-    <para>If this is undesirable, set this variable to
-    true.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>configurePlatforms</varname></term>
-    <listitem><para>
-      By default, when cross compiling, the configure script has <option>--build=...</option> and <option>--host=...</option> passed.
-      Packages can instead pass <literal>[ "build" "host" "target" ]</literal> or a subset to control exactly which platform flags are passed.
-      Compilers and other tools should use this to also pass the target platform, for example.
-      <footnote><para>Eventually these will be passed when in native builds too, to improve determinism: build-time guessing, as is done today, is a risk of impurity.</para></footnote>
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preConfigure</varname></term>
-    <listitem><para>Hook executed at the start of the configure
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postConfigure</varname></term>
-    <listitem><para>Hook executed at the end of the configure
-    phase.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-
-</section>
-
-
-<section xml:id="build-phase"><title>The build phase</title>
-
-<para>The build phase is responsible for actually building the package
-(e.g. compiling it).  The default <function>buildPhase</function>
-simply calls <command>make</command> if a file named
-<filename>Makefile</filename>, <filename>makefile</filename> or
-<filename>GNUmakefile</filename> exists in the current directory (or
-the <varname>makefile</varname> is explicitly set); otherwise it does
-nothing.</para>
-
-<variablelist>
-  <title>Variables controlling the build phase</title>
-
-  <varlistentry>
-    <term><varname>dontBuild</varname></term>
-    <listitem><para>Set to true to skip the build phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>makefile</varname></term>
-    <listitem><para>The file name of the Makefile.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>makeFlags</varname></term>
-    <listitem><para>A list of strings passed as additional flags to
-    <command>make</command>.  These flags are also used by the default
-    install and check phase.  For setting make flags specific to the
-    build phase, use <varname>buildFlags</varname> (see below).
-
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>sourceRoot</varname>
+     </term>
+     <listitem>
+      <para>
+       After running <function>unpackPhase</function>, the generic builder
+       changes the current directory to the directory created by unpacking the
+       sources. If there are multiple source directories, you should set
+       <varname>sourceRoot</varname> to the name of the intended directory.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>setSourceRoot</varname>
+     </term>
+     <listitem>
+      <para>
+       Alternatively to setting <varname>sourceRoot</varname>, you can set
+       <varname>setSourceRoot</varname> to a shell command to be evaluated by
+       the unpack phase after the sources have been unpacked. This command must
+       set <varname>sourceRoot</varname>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>preUnpack</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the unpack phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postUnpack</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the unpack phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontMakeSourcesWritable</varname>
+     </term>
+     <listitem>
+      <para>
+       If set to <literal>1</literal>, the unpacked sources are
+       <emphasis>not</emphasis> made writable. By default, they are made
+       writable to prevent problems with read-only sources. For example, copied
+       store directories would be read-only without this.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>unpackCmd</varname>
+     </term>
+     <listitem>
+      <para>
+       The unpack phase evaluates the string <literal>$unpackCmd</literal> for
+       any unrecognised file. The path to the current source file is contained
+       in the <varname>curSrc</varname> variable.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
+
+  <section xml:id="ssec-patch-phase">
+   <title>The patch phase</title>
+
+   <para>
+    The patch phase applies the list of patches defined in the
+    <varname>patches</varname> variable.
+   </para>
+
+   <variablelist>
+    <title>Variables controlling the patch phase</title>
+    <varlistentry>
+     <term><varname>patches</varname>
+     </term>
+     <listitem>
+      <para>
+       The list of patches. They must be in the format accepted by the
+       <command>patch</command> command, and may optionally be compressed using
+       <command>gzip</command> (<filename>.gz</filename>),
+       <command>bzip2</command> (<filename>.bz2</filename>) or
+       <command>xz</command> (<filename>.xz</filename>).
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>patchFlags</varname>
+     </term>
+     <listitem>
+      <para>
+       Flags to be passed to <command>patch</command>. If not set, the argument
+       <option>-p1</option> is used, which causes the leading directory
+       component to be stripped from the file names in each patch.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>prePatch</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the patch phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postPatch</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the patch phase.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
+
+  <section xml:id="ssec-configure-phase">
+   <title>The configure phase</title>
+
+   <para>
+    The configure phase prepares the source tree for building. The default
+    <function>configurePhase</function> runs <filename>./configure</filename>
+    (typically an Autoconf-generated script) if it exists.
+   </para>
+
+   <variablelist>
+    <title>Variables controlling the configure phase</title>
+    <varlistentry>
+     <term><varname>configureScript</varname>
+     </term>
+     <listitem>
+      <para>
+       The name of the configure script. It defaults to
+       <filename>./configure</filename> if it exists; otherwise, the configure
+       phase is skipped. This can actually be a command (like <literal>perl
+       ./Configure.pl</literal>).
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>configureFlags</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of strings passed as additional arguments to the configure
+       script.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>configureFlagsArray</varname>
+     </term>
+     <listitem>
+      <para>
+       A shell array containing additional arguments passed to the configure
+       script. You must use this instead of <varname>configureFlags</varname>
+       if the arguments contain spaces.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontAddPrefix</varname>
+     </term>
+     <listitem>
+      <para>
+       By default, the flag <literal>--prefix=$prefix</literal> is added to the
+       configure flags. If this is undesirable, set this variable to true.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>prefix</varname>
+     </term>
+     <listitem>
+      <para>
+       The prefix under which the package must be installed, passed via the
+       <option>--prefix</option> option to the configure script. It defaults to
+       <option>$out</option>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontAddDisableDepTrack</varname>
+     </term>
+     <listitem>
+      <para>
+       By default, the flag <literal>--disable-dependency-tracking</literal> is
+       added to the configure flags to speed up Automake-based builds. If this
+       is undesirable, set this variable to true.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontFixLibtool</varname>
+     </term>
+     <listitem>
+      <para>
+       By default, the configure phase applies some special hackery to all
+       files called <filename>ltmain.sh</filename> before running the configure
+       script in order to improve the purity of Libtool-based packages
+       <footnote>
+        <para>
+         It clears the
+         <varname>sys_lib_<replaceable>*</replaceable>search_path</varname>
+         variables in the Libtool script to prevent Libtool from using
+         libraries in <filename>/usr/lib</filename> and such.
+        </para>
+       </footnote>
+       . If this is undesirable, set this variable to true.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontDisableStatic</varname>
+     </term>
+     <listitem>
+      <para>
+       By default, when the configure script has
+       <option>--enable-static</option>, the option
+       <option>--disable-static</option> is added to the configure flags.
+      </para>
+      <para>
+       If this is undesirable, set this variable to true.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>configurePlatforms</varname>
+     </term>
+     <listitem>
+      <para>
+       By default, when cross compiling, the configure script has
+       <option>--build=...</option> and <option>--host=...</option> passed.
+       Packages can instead pass <literal>[ "build" "host" "target" ]</literal>
+       or a subset to control exactly which platform flags are passed.
+       Compilers and other tools should use this to also pass the target
+       platform, for example.
+       <footnote>
+        <para>
+         Eventually these will be passed when in native builds too, to improve
+         determinism: build-time guessing, as is done today, is a risk of
+         impurity.
+        </para>
+       </footnote>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>preConfigure</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the configure phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postConfigure</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the configure phase.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
+
+  <section xml:id="build-phase">
+   <title>The build phase</title>
+
+   <para>
+    The build phase is responsible for actually building the package (e.g.
+    compiling it). The default <function>buildPhase</function> simply calls
+    <command>make</command> if a file named <filename>Makefile</filename>,
+    <filename>makefile</filename> or <filename>GNUmakefile</filename> exists in
+    the current directory (or the <varname>makefile</varname> is explicitly
+    set); otherwise it does nothing.
+   </para>
+
+   <variablelist>
+    <title>Variables controlling the build phase</title>
+    <varlistentry>
+     <term><varname>dontBuild</varname>
+     </term>
+     <listitem>
+      <para>
+       Set to true to skip the build phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>makefile</varname>
+     </term>
+     <listitem>
+      <para>
+       The file name of the Makefile.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>makeFlags</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of strings passed as additional flags to <command>make</command>.
+       These flags are also used by the default install and check phase. For
+       setting make flags specific to the build phase, use
+       <varname>buildFlags</varname> (see below).
 <programlisting>
 makeFlags = [ "PREFIX=$(out)" ];
 </programlisting>
-
-    <note><para>The flags are quoted in bash, but environment variables can
-    be specified by using the make syntax.</para></note></para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>makeFlagsArray</varname></term>
-    <listitem><para>A shell array containing additional arguments
-    passed to <command>make</command>.  You must use this instead of
-    <varname>makeFlags</varname> if the arguments contain
-    spaces, e.g.
-
+       <note>
+        <para>
+         The flags are quoted in bash, but environment variables can be
+         specified by using the make syntax.
+        </para>
+       </note>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>makeFlagsArray</varname>
+     </term>
+     <listitem>
+      <para>
+       A shell array containing additional arguments passed to
+       <command>make</command>. You must use this instead of
+       <varname>makeFlags</varname> if the arguments contain spaces, e.g.
 <programlisting>
 makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
 </programlisting>
+       Note that shell arrays cannot be passed through environment variables,
+       so you cannot set <varname>makeFlagsArray</varname> in a derivation
+       attribute (because those are passed through environment variables): you
+       have to define them in shell code.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>buildFlags</varname> / <varname>buildFlagsArray</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of strings passed as additional flags to <command>make</command>.
+       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
+       but only used by the build phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>preBuild</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the build phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postBuild</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the build phase.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
 
-    Note that shell arrays cannot be passed through environment
-    variables, so you cannot set <varname>makeFlagsArray</varname> in
-    a derivation attribute (because those are passed through
-    environment variables): you have to define them in shell
-    code.</para></listitem>
-  </varlistentry>
+   <para>
+    You can set flags for <command>make</command> through the
+    <varname>makeFlags</varname> variable.
+   </para>
 
-  <varlistentry>
-    <term><varname>buildFlags</varname> / <varname>buildFlagsArray</varname></term>
-    <listitem><para>A list of strings passed as additional flags to
-    <command>make</command>.  Like <varname>makeFlags</varname> and
-    <varname>makeFlagsArray</varname>, but only used by the build
-    phase.</para></listitem>
-  </varlistentry>
+   <para>
+    Before and after running <command>make</command>, the hooks
+    <varname>preBuild</varname> and <varname>postBuild</varname> are called,
+    respectively.
+   </para>
+  </section>
 
-  <varlistentry>
-    <term><varname>preBuild</varname></term>
-    <listitem><para>Hook executed at the start of the build
-    phase.</para></listitem>
-  </varlistentry>
+  <section xml:id="ssec-check-phase">
+   <title>The check phase</title>
 
-  <varlistentry>
-    <term><varname>postBuild</varname></term>
-    <listitem><para>Hook executed at the end of the build
-    phase.</para></listitem>
-  </varlistentry>
+   <para>
+    The check phase checks whether the package was built correctly by running
+    its test suite. The default <function>checkPhase</function> calls
+    <command>make check</command>, but only if the <varname>doCheck</varname>
+    variable is enabled.
+   </para>
 
-</variablelist>
-
-
-<para>
-You can set flags for <command>make</command> through the
-<varname>makeFlags</varname> variable.</para>
-
-<para>Before and after running <command>make</command>, the hooks
-<varname>preBuild</varname> and <varname>postBuild</varname> are
-called, respectively.</para>
-
-</section>
-
-
-<section xml:id="ssec-check-phase"><title>The check phase</title>
-
-<para>The check phase checks whether the package was built correctly
-by running its test suite.  The default
-<function>checkPhase</function> calls <command>make check</command>,
-but only if the <varname>doCheck</varname> variable is enabled.</para>
-
-<variablelist>
-  <title>Variables controlling the check phase</title>
-
-  <varlistentry>
-    <term><varname>doCheck</varname></term>
-    <listitem><para>
-      Controls whether the check phase is executed.
-      By default it is skipped, but if <varname>doCheck</varname> is set to true, the check phase is usually executed.
-      Thus you should set <programlisting>doCheck = true;</programlisting> in the derivation to enable checks.
-      The exception is cross compilation.
-      Cross compiled builds never run tests, no matter how <varname>doCheck</varname> is set,
-      as the newly-built program won't run on the platform used to build it.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>makeFlags</varname> /
+   <variablelist>
+    <title>Variables controlling the check phase</title>
+    <varlistentry>
+     <term><varname>doCheck</varname>
+     </term>
+     <listitem>
+      <para>
+       Controls whether the check phase is executed. By default it is skipped,
+       but if <varname>doCheck</varname> is set to true, the check phase is
+       usually executed. Thus you should set
+<programlisting>doCheck = true;</programlisting>
+       in the derivation to enable checks. The exception is cross compilation.
+       Cross compiled builds never run tests, no matter how
+       <varname>doCheck</varname> is set, as the newly-built program won't run
+       on the platform used to build it.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>makeFlags</varname> /
     <varname>makeFlagsArray</varname> /
-    <varname>makefile</varname></term>
-    <listitem><para>See the build phase for details.</para></listitem>
-  </varlistentry>
+    <varname>makefile</varname>
+     </term>
+     <listitem>
+      <para>
+       See the build phase for details.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>checkTarget</varname>
+     </term>
+     <listitem>
+      <para>
+       The make target that runs the tests. Defaults to
+       <literal>check</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>checkFlags</varname> / <varname>checkFlagsArray</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of strings passed as additional flags to <command>make</command>.
+       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
+       but only used by the check phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>preCheck</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the check phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postCheck</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the check phase.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
 
-  <varlistentry>
-    <term><varname>checkTarget</varname></term>
-    <listitem><para>The make target that runs the tests.  Defaults to
-    <literal>check</literal>.</para></listitem>
-  </varlistentry>
+  <section xml:id="ssec-install-phase">
+   <title>The install phase</title>
 
-  <varlistentry>
-    <term><varname>checkFlags</varname> / <varname>checkFlagsArray</varname></term>
-    <listitem><para>A list of strings passed as additional flags to
-    <command>make</command>.  Like <varname>makeFlags</varname> and
-    <varname>makeFlagsArray</varname>, but only used by the check
-    phase.</para></listitem>
-  </varlistentry>
+   <para>
+    The install phase is responsible for installing the package in the Nix
+    store under <envar>out</envar>. The default
+    <function>installPhase</function> creates the directory
+    <literal>$out</literal> and calls <command>make install</command>.
+   </para>
 
-  <varlistentry>
-    <term><varname>preCheck</varname></term>
-    <listitem><para>Hook executed at the start of the check
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postCheck</varname></term>
-    <listitem><para>Hook executed at the end of the check
-    phase.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-
-</section>
-
-
-<section xml:id="ssec-install-phase"><title>The install phase</title>
-
-<para>The install phase is responsible for installing the package in
-the Nix store under <envar>out</envar>.  The default
-<function>installPhase</function> creates the directory
-<literal>$out</literal> and calls <command>make
-install</command>.</para>
-
-<variablelist>
-  <title>Variables controlling the install phase</title>
-
-  <varlistentry>
-    <term><varname>makeFlags</varname> /
+   <variablelist>
+    <title>Variables controlling the install phase</title>
+    <varlistentry>
+     <term><varname>makeFlags</varname> /
     <varname>makeFlagsArray</varname> /
-    <varname>makefile</varname></term>
-    <listitem><para>See the build phase for details.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>installTargets</varname></term>
-    <listitem><para>The make targets that perform the installation.
-    Defaults to <literal>install</literal>.  Example:
-
+    <varname>makefile</varname>
+     </term>
+     <listitem>
+      <para>
+       See the build phase for details.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>installTargets</varname>
+     </term>
+     <listitem>
+      <para>
+       The make targets that perform the installation. Defaults to
+       <literal>install</literal>. Example:
 <programlisting>
 installTargets = "install-bin install-doc";</programlisting>
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>installFlags</varname> / <varname>installFlagsArray</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of strings passed as additional flags to <command>make</command>.
+       Like <varname>makeFlags</varname> and <varname>makeFlagsArray</varname>,
+       but only used by the install phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>preInstall</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the install phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postInstall</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the install phase.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
 
-    </para></listitem>
-  </varlistentry>
+  <section xml:id="ssec-fixup-phase">
+   <title>The fixup phase</title>
 
-  <varlistentry>
-    <term><varname>installFlags</varname> / <varname>installFlagsArray</varname></term>
-    <listitem><para>A list of strings passed as additional flags to
-    <command>make</command>.  Like <varname>makeFlags</varname> and
-    <varname>makeFlagsArray</varname>, but only used by the install
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preInstall</varname></term>
-    <listitem><para>Hook executed at the start of the install
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postInstall</varname></term>
-    <listitem><para>Hook executed at the end of the install
-    phase.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-
-</section>
-
-
-<section xml:id="ssec-fixup-phase"><title>The fixup phase</title>
-
-<para>The fixup phase performs some (Nix-specific) post-processing
-actions on the files installed under <filename>$out</filename> by the
-install phase.  The default <function>fixupPhase</function> does the
-following:
-
-<itemizedlist>
-
-  <listitem><para>It moves the <filename>man/</filename>,
-  <filename>doc/</filename> and <filename>info/</filename>
-  subdirectories of <envar>$out</envar> to
-  <filename>share/</filename>.</para></listitem>
-
-  <listitem><para>It strips libraries and executables of debug
-  information.</para></listitem>
-
-  <listitem><para>On Linux, it applies the <command>patchelf</command>
-  command to ELF executables and libraries to remove unused
-  directories from the <literal>RPATH</literal> in order to prevent
-  unnecessary runtime dependencies.</para></listitem>
-
-  <listitem><para>It rewrites the interpreter paths of shell scripts
-  to paths found in <envar>PATH</envar>.  E.g.,
-  <filename>/usr/bin/perl</filename> will be rewritten to
-  <filename>/nix/store/<replaceable>some-perl</replaceable>/bin/perl</filename>
-  found in <envar>PATH</envar>.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<variablelist>
-  <title>Variables controlling the fixup phase</title>
-
-  <varlistentry>
-    <term><varname>dontStrip</varname></term>
-    <listitem><para>If set, libraries and executables are not
-    stripped.  By default, they are.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>dontStripHost</varname></term>
-    <listitem><para>
-      Like <varname>dontStripHost</varname>, but only affects the <command>strip</command> command targetting the package's host platform.
-      Useful when supporting cross compilation, but otherwise feel free to ignore.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>dontStripTarget</varname></term>
-    <listitem><para>
-      Like <varname>dontStripHost</varname>, but only affects the <command>strip</command> command targetting the packages' target platform.
-      Useful when supporting cross compilation, but otherwise feel free to ignore.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontMoveSbin</varname></term>
-    <listitem><para>If set, files in <filename>$out/sbin</filename> are not moved
-    to <filename>$out/bin</filename>. By default, they are.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>stripAllList</varname></term>
-    <listitem><para>List of directories to search for libraries and
-    executables from which <emphasis>all</emphasis> symbols should be
-    stripped.  By default, it’s empty.  Stripping all symbols is
-    risky, since it may remove not just debug symbols but also ELF
-    information necessary for normal execution.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>stripAllFlags</varname></term>
-    <listitem><para>Flags passed to the <command>strip</command>
-    command applied to the files in the directories listed in
-    <varname>stripAllList</varname>.  Defaults to <option>-s</option>
-    (i.e. <option>--strip-all</option>).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>stripDebugList</varname></term>
-    <listitem><para>List of directories to search for libraries and
-    executables from which only debugging-related symbols should be
-    stripped.  It defaults to <literal>lib bin
-    sbin</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>stripDebugFlags</varname></term>
-    <listitem><para>Flags passed to the <command>strip</command>
-    command applied to the files in the directories listed in
-    <varname>stripDebugList</varname>.  Defaults to
-    <option>-S</option>
-    (i.e. <option>--strip-debug</option>).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontPatchELF</varname></term>
-    <listitem><para>If set, the <command>patchelf</command> command is
-    not used to remove unnecessary <literal>RPATH</literal> entries.
-    Only applies to Linux.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontPatchShebangs</varname></term>
-    <listitem><para>If set, scripts starting with
-    <literal>#!</literal> do not have their interpreter paths
-    rewritten to paths in the Nix store.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>forceShare</varname></term>
-    <listitem><para>The list of directories that must be moved from
-    <filename>$out</filename> to <filename>$out/share</filename>.
-    Defaults to <literal>man doc info</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>setupHook</varname></term>
-    <listitem><para>A package can export a <link
-    linkend="ssec-setup-hooks">setup hook</link> by setting this
-    variable.  The setup hook, if defined, is copied to
-    <filename>$out/nix-support/setup-hook</filename>.  Environment
-    variables are then substituted in it using <function
-    linkend="fun-substituteAll">substituteAll</function>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preFixup</varname></term>
-    <listitem><para>Hook executed at the start of the fixup
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postFixup</varname></term>
-    <listitem><para>Hook executed at the end of the fixup
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="stdenv-separateDebugInfo">
-    <term><varname>separateDebugInfo</varname></term>
-    <listitem><para>If set to <literal>true</literal>, the standard
-    environment will enable debug information in C/C++ builds. After
-    installation, the debug information will be separated from the
-    executables and stored in the output named
-    <literal>debug</literal>. (This output is enabled automatically;
-    you don’t need to set the <varname>outputs</varname> attribute
-    explicitly.) To be precise, the debug information is stored in
-    <filename><replaceable>debug</replaceable>/lib/debug/.build-id/<replaceable>XX</replaceable>/<replaceable>YYYY…</replaceable></filename>,
-    where <replaceable>XXYYYY…</replaceable> is the <replaceable>build
-    ID</replaceable> of the binary — a SHA-1 hash of the contents of
-    the binary. Debuggers like GDB use the build ID to look up the
-    separated debug information.</para>
-
-    <para>For example, with GDB, you can add
+   <para>
+    The fixup phase performs some (Nix-specific) post-processing actions on the
+    files installed under <filename>$out</filename> by the install phase. The
+    default <function>fixupPhase</function> does the following:
+    <itemizedlist>
+     <listitem>
+      <para>
+       It moves the <filename>man/</filename>, <filename>doc/</filename> and
+       <filename>info/</filename> subdirectories of <envar>$out</envar> to
+       <filename>share/</filename>.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       It strips libraries and executables of debug information.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       On Linux, it applies the <command>patchelf</command> command to ELF
+       executables and libraries to remove unused directories from the
+       <literal>RPATH</literal> in order to prevent unnecessary runtime
+       dependencies.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       It rewrites the interpreter paths of shell scripts to paths found in
+       <envar>PATH</envar>. E.g., <filename>/usr/bin/perl</filename> will be
+       rewritten to
+       <filename>/nix/store/<replaceable>some-perl</replaceable>/bin/perl</filename>
+       found in <envar>PATH</envar>.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </para>
 
+   <variablelist>
+    <title>Variables controlling the fixup phase</title>
+    <varlistentry>
+     <term><varname>dontStrip</varname>
+     </term>
+     <listitem>
+      <para>
+       If set, libraries and executables are not stripped. By default, they
+       are.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontStripHost</varname>
+     </term>
+     <listitem>
+      <para>
+       Like <varname>dontStripHost</varname>, but only affects the
+       <command>strip</command> command targetting the package's host platform.
+       Useful when supporting cross compilation, but otherwise feel free to
+       ignore.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontStripTarget</varname>
+     </term>
+     <listitem>
+      <para>
+       Like <varname>dontStripHost</varname>, but only affects the
+       <command>strip</command> command targetting the packages' target
+       platform. Useful when supporting cross compilation, but otherwise feel
+       free to ignore.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontMoveSbin</varname>
+     </term>
+     <listitem>
+      <para>
+       If set, files in <filename>$out/sbin</filename> are not moved to
+       <filename>$out/bin</filename>. By default, they are.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>stripAllList</varname>
+     </term>
+     <listitem>
+      <para>
+       List of directories to search for libraries and executables from which
+       <emphasis>all</emphasis> symbols should be stripped. By default, it’s
+       empty. Stripping all symbols is risky, since it may remove not just
+       debug symbols but also ELF information necessary for normal execution.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>stripAllFlags</varname>
+     </term>
+     <listitem>
+      <para>
+       Flags passed to the <command>strip</command> command applied to the
+       files in the directories listed in <varname>stripAllList</varname>.
+       Defaults to <option>-s</option> (i.e. <option>--strip-all</option>).
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>stripDebugList</varname>
+     </term>
+     <listitem>
+      <para>
+       List of directories to search for libraries and executables from which
+       only debugging-related symbols should be stripped. It defaults to
+       <literal>lib bin sbin</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>stripDebugFlags</varname>
+     </term>
+     <listitem>
+      <para>
+       Flags passed to the <command>strip</command> command applied to the
+       files in the directories listed in <varname>stripDebugList</varname>.
+       Defaults to <option>-S</option> (i.e. <option>--strip-debug</option>).
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontPatchELF</varname>
+     </term>
+     <listitem>
+      <para>
+       If set, the <command>patchelf</command> command is not used to remove
+       unnecessary <literal>RPATH</literal> entries. Only applies to Linux.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontPatchShebangs</varname>
+     </term>
+     <listitem>
+      <para>
+       If set, scripts starting with <literal>#!</literal> do not have their
+       interpreter paths rewritten to paths in the Nix store.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>forceShare</varname>
+     </term>
+     <listitem>
+      <para>
+       The list of directories that must be moved from
+       <filename>$out</filename> to <filename>$out/share</filename>. Defaults
+       to <literal>man doc info</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>setupHook</varname>
+     </term>
+     <listitem>
+      <para>
+       A package can export a <link
+    linkend="ssec-setup-hooks">setup
+       hook</link> by setting this variable. The setup hook, if defined, is
+       copied to <filename>$out/nix-support/setup-hook</filename>. Environment
+       variables are then substituted in it using
+       <function
+    linkend="fun-substituteAll">substituteAll</function>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>preFixup</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the fixup phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postFixup</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the fixup phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry xml:id="stdenv-separateDebugInfo">
+     <term><varname>separateDebugInfo</varname>
+     </term>
+     <listitem>
+      <para>
+       If set to <literal>true</literal>, the standard environment will enable
+       debug information in C/C++ builds. After installation, the debug
+       information will be separated from the executables and stored in the
+       output named <literal>debug</literal>. (This output is enabled
+       automatically; you don’t need to set the <varname>outputs</varname>
+       attribute explicitly.) To be precise, the debug information is stored in
+       <filename><replaceable>debug</replaceable>/lib/debug/.build-id/<replaceable>XX</replaceable>/<replaceable>YYYY…</replaceable></filename>,
+       where <replaceable>XXYYYY…</replaceable> is the <replaceable>build
+       ID</replaceable> of the binary — a SHA-1 hash of the contents of the
+       binary. Debuggers like GDB use the build ID to look up the separated
+       debug information.
+      </para>
+      <para>
+       For example, with GDB, you can add
 <programlisting>
 set debug-file-directory ~/.nix-profile/lib/debug
 </programlisting>
+       to <filename>~/.gdbinit</filename>. GDB will then be able to find debug
+       information installed via <literal>nix-env -i</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
 
-    to <filename>~/.gdbinit</filename>. GDB will then be able to find
-    debug information installed via <literal>nix-env
-    -i</literal>.</para>
+  <section xml:id="ssec-installCheck-phase">
+   <title>The installCheck phase</title>
 
-    </listitem>
-  </varlistentry>
+   <para>
+    The installCheck phase checks whether the package was installed correctly
+    by running its test suite against the installed directories. The default
+    <function>installCheck</function> calls <command>make
+    installcheck</command>.
+   </para>
 
-</variablelist>
+   <variablelist>
+    <title>Variables controlling the installCheck phase</title>
+    <varlistentry>
+     <term><varname>doInstallCheck</varname>
+     </term>
+     <listitem>
+      <para>
+       Controls whether the installCheck phase is executed. By default it is
+       skipped, but if <varname>doInstallCheck</varname> is set to true, the
+       installCheck phase is usually executed. Thus you should set
+<programlisting>doInstallCheck = true;</programlisting>
+       in the derivation to enable install checks. The exception is cross
+       compilation. Cross compiled builds never run tests, no matter how
+       <varname>doInstallCheck</varname> is set, as the newly-built program
+       won't run on the platform used to build it.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>preInstallCheck</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the installCheck phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postInstallCheck</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the installCheck phase.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
 
-</section>
+  <section xml:id="ssec-distribution-phase">
+   <title>The distribution phase</title>
 
-<section xml:id="ssec-installCheck-phase"><title>The installCheck phase</title>
+   <para>
+    The distribution phase is intended to produce a source distribution of the
+    package. The default <function>distPhase</function> first calls
+    <command>make dist</command>, then it copies the resulting source tarballs
+    to <filename>$out/tarballs/</filename>. This phase is only executed if the
+    attribute <varname>doDist</varname> is set.
+   </para>
 
-<para>The installCheck phase checks whether the package was installed
-correctly by running its test suite against the installed directories.
-The default <function>installCheck</function> calls <command>make
-installcheck</command>.</para>
+   <variablelist>
+    <title>Variables controlling the distribution phase</title>
+    <varlistentry>
+     <term><varname>distTarget</varname>
+     </term>
+     <listitem>
+      <para>
+       The make target that produces the distribution. Defaults to
+       <literal>dist</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>distFlags</varname> / <varname>distFlagsArray</varname>
+     </term>
+     <listitem>
+      <para>
+       Additional flags passed to <command>make</command>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>tarballs</varname>
+     </term>
+     <listitem>
+      <para>
+       The names of the source distribution files to be copied to
+       <filename>$out/tarballs/</filename>. It can contain shell wildcards. The
+       default is <filename>*.tar.gz</filename>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>dontCopyDist</varname>
+     </term>
+     <listitem>
+      <para>
+       If set, no files are copied to <filename>$out/tarballs/</filename>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>preDist</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the start of the distribution phase.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><varname>postDist</varname>
+     </term>
+     <listitem>
+      <para>
+       Hook executed at the end of the distribution phase.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </section>
+ </section>
+ <section xml:id="ssec-stdenv-functions">
+  <title>Shell functions</title>
 
-<variablelist>
-  <title>Variables controlling the installCheck phase</title>
-
-  <varlistentry>
-    <term><varname>doInstallCheck</varname></term>
-    <listitem><para>
-      Controls whether the installCheck phase is executed.
-      By default it is skipped, but if <varname>doInstallCheck</varname> is set to true, the installCheck phase is usually executed.
-      Thus you should set <programlisting>doInstallCheck = true;</programlisting> in the derivation to enable install checks.
-      The exception is cross compilation.
-      Cross compiled builds never run tests, no matter how <varname>doInstallCheck</varname> is set,
-      as the newly-built program won't run on the platform used to build it.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preInstallCheck</varname></term>
-    <listitem><para>Hook executed at the start of the installCheck
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postInstallCheck</varname></term>
-    <listitem><para>Hook executed at the end of the installCheck
-    phase.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</section>
-
-<section xml:id="ssec-distribution-phase"><title>The distribution
-phase</title>
-
-<para>The distribution phase is intended to produce a source
-distribution of the package.  The default
-<function>distPhase</function> first calls <command>make
-dist</command>, then it copies the resulting source tarballs to
-<filename>$out/tarballs/</filename>.  This phase is only executed if
-the attribute <varname>doDist</varname> is set.</para>
-
-<variablelist>
-  <title>Variables controlling the distribution phase</title>
-
-  <varlistentry>
-    <term><varname>distTarget</varname></term>
-    <listitem><para>The make target that produces the distribution.
-    Defaults to <literal>dist</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>distFlags</varname> / <varname>distFlagsArray</varname></term>
-    <listitem><para>Additional flags passed to
-    <command>make</command>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>tarballs</varname></term>
-    <listitem><para>The names of the source distribution files to be
-    copied to <filename>$out/tarballs/</filename>.  It can contain
-    shell wildcards.  The default is
-    <filename>*.tar.gz</filename>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>dontCopyDist</varname></term>
-    <listitem><para>If set, no files are copied to
-    <filename>$out/tarballs/</filename>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>preDist</varname></term>
-    <listitem><para>Hook executed at the start of the distribution
-    phase.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>postDist</varname></term>
-    <listitem><para>Hook executed at the end of the distribution
-    phase.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-
-</section>
-
-
-</section>
-
-
-<section xml:id="ssec-stdenv-functions"><title>Shell functions</title>
-
-<para>The standard environment provides a number of useful
-functions.</para>
-
-<variablelist>
-
-
-  <varlistentry xml:id='fun-makeWrapper'>
-    <term><function>makeWrapper</function>
-    <replaceable>executable</replaceable>
-    <replaceable>wrapperfile</replaceable>
-    <replaceable>args</replaceable></term>
-    <listitem><para>Constructs a wrapper for a program with various
-    possible arguments. For example:
+  <para>
+   The standard environment provides a number of useful functions.
+  </para>
 
+  <variablelist>
+   <varlistentry xml:id='fun-makeWrapper'>
+    <term><function>makeWrapper</function><replaceable>executable</replaceable><replaceable>wrapperfile</replaceable><replaceable>args</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Constructs a wrapper for a program with various possible arguments. For
+      example:
 <programlisting>
 # adds `FOOBAR=baz` to `$out/bin/foo`’s environment
 makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz
@@ -1392,662 +1764,763 @@ makeWrapper $out/bin/foo $wrapperfile --set FOOBAR baz
 # (via string replacements or in `configurePhase`).
 makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello git ]}
 </programlisting>
-
-    There’s many more kinds of arguments, they are documented in
-    <literal>nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh</literal>.</para>
-
-    <para><literal>wrapProgram</literal> is a convenience function you probably
-    want to use most of the time.</para>
-
+      There’s many more kinds of arguments, they are documented in
+      <literal>nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh</literal>.
+     </para>
+     <para>
+      <literal>wrapProgram</literal> is a convenience function you probably
+      want to use most of the time.
+     </para>
     </listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id='fun-substitute'>
-    <term><function>substitute</function>
-    <replaceable>infile</replaceable>
-    <replaceable>outfile</replaceable>
-    <replaceable>subs</replaceable></term>
-
+   </varlistentry>
+   <varlistentry xml:id='fun-substitute'>
+    <term><function>substitute</function><replaceable>infile</replaceable><replaceable>outfile</replaceable><replaceable>subs</replaceable>
+    </term>
     <listitem>
-      <para>Performs string substitution on the contents of
+     <para>
+      Performs string substitution on the contents of
       <replaceable>infile</replaceable>, writing the result to
-      <replaceable>outfile</replaceable>.  The substitutions in
+      <replaceable>outfile</replaceable>. The substitutions in
       <replaceable>subs</replaceable> are of the following form:
-
-        <variablelist>
-          <varlistentry>
-            <term><option>--replace</option>
-            <replaceable>s1</replaceable>
-            <replaceable>s2</replaceable></term>
-            <listitem><para>Replace every occurrence of the string
-            <replaceable>s1</replaceable> by
-            <replaceable>s2</replaceable>.</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term><option>--subst-var</option>
-            <replaceable>varName</replaceable></term>
-            <listitem><para>Replace every occurrence of
-            <literal>@<replaceable>varName</replaceable>@</literal> by
-            the contents of the environment variable
-            <replaceable>varName</replaceable>.  This is useful for
-            generating files from templates, using
-            <literal>@<replaceable>...</replaceable>@</literal> in the
-            template as placeholders.</para></listitem>
-          </varlistentry>
-
-          <varlistentry>
-            <term><option>--subst-var-by</option>
-            <replaceable>varName</replaceable>
-            <replaceable>s</replaceable></term>
-            <listitem><para>Replace every occurrence of
-            <literal>@<replaceable>varName</replaceable>@</literal> by
-            the string <replaceable>s</replaceable>.</para></listitem>
-          </varlistentry>
-
-        </variablelist>
-
-      </para>
-
-      <para>Example:
-
+      <variablelist>
+       <varlistentry>
+        <term><option>--replace</option><replaceable>s1</replaceable><replaceable>s2</replaceable>
+        </term>
+        <listitem>
+         <para>
+          Replace every occurrence of the string <replaceable>s1</replaceable>
+          by <replaceable>s2</replaceable>.
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term><option>--subst-var</option><replaceable>varName</replaceable>
+        </term>
+        <listitem>
+         <para>
+          Replace every occurrence of
+          <literal>@<replaceable>varName</replaceable>@</literal> by the
+          contents of the environment variable
+          <replaceable>varName</replaceable>. This is useful for generating
+          files from templates, using
+          <literal>@<replaceable>...</replaceable>@</literal> in the template
+          as placeholders.
+         </para>
+        </listitem>
+       </varlistentry>
+       <varlistentry>
+        <term><option>--subst-var-by</option><replaceable>varName</replaceable><replaceable>s</replaceable>
+        </term>
+        <listitem>
+         <para>
+          Replace every occurrence of
+          <literal>@<replaceable>varName</replaceable>@</literal> by the string
+          <replaceable>s</replaceable>.
+         </para>
+        </listitem>
+       </varlistentry>
+      </variablelist>
+     </para>
+     <para>
+      Example:
 <programlisting>
 substitute ./foo.in ./foo.out \
     --replace /usr/bin/bar $bar/bin/bar \
     --replace "a string containing spaces" "some other text" \
     --subst-var someVar
 </programlisting>
-
-      </para>
-
-      <para><function>substitute</function> is implemented using the
+     </para>
+     <para>
+      <function>substitute</function> is implemented using the
       <command
       xlink:href="http://replace.richardlloyd.org.uk/">replace</command>
-      command.  Unlike with the <command>sed</command> command, you
-      don’t have to worry about escaping special characters.  It
-      supports performing substitutions on binary files (such as
-      executables), though there you’ll probably want to make sure
-      that the replacement string is as long as the replaced
-      string.</para>
-
+      command. Unlike with the <command>sed</command> command, you don’t have
+      to worry about escaping special characters. It supports performing
+      substitutions on binary files (such as executables), though there
+      you’ll probably want to make sure that the replacement string is as
+      long as the replaced string.
+     </para>
     </listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id='fun-substituteInPlace'>
-    <term><function>substituteInPlace</function>
-    <replaceable>file</replaceable>
-    <replaceable>subs</replaceable></term>
-    <listitem><para>Like <function>substitute</function>, but performs
-    the substitutions in place on the file
-    <replaceable>file</replaceable>.</para></listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id='fun-substituteAll'>
-    <term><function>substituteAll</function>
-    <replaceable>infile</replaceable>
-    <replaceable>outfile</replaceable></term>
-    <listitem><para>Replaces every occurrence of
-    <literal>@<replaceable>varName</replaceable>@</literal>, where
-    <replaceable>varName</replaceable> is any environment variable, in
-    <replaceable>infile</replaceable>, writing the result to
-    <replaceable>outfile</replaceable>.  For instance, if
-    <replaceable>infile</replaceable> has the contents
-
+   </varlistentry>
+   <varlistentry xml:id='fun-substituteInPlace'>
+    <term><function>substituteInPlace</function><replaceable>file</replaceable><replaceable>subs</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Like <function>substitute</function>, but performs the substitutions in
+      place on the file <replaceable>file</replaceable>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id='fun-substituteAll'>
+    <term><function>substituteAll</function><replaceable>infile</replaceable><replaceable>outfile</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Replaces every occurrence of
+      <literal>@<replaceable>varName</replaceable>@</literal>, where
+      <replaceable>varName</replaceable> is any environment variable, in
+      <replaceable>infile</replaceable>, writing the result to
+      <replaceable>outfile</replaceable>. For instance, if
+      <replaceable>infile</replaceable> has the contents
 <programlisting>
 #! @bash@/bin/sh
 PATH=@coreutils@/bin
 echo @foo@
 </programlisting>
-
-    and the environment contains
-    <literal>bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39</literal>
-    and
-    <literal>coreutils=/nix/store/68afga4khv0w...-coreutils-6.12</literal>,
-    but does not contain the variable <varname>foo</varname>, then the
-    output will be
-
+      and the environment contains
+      <literal>bash=/nix/store/bmwp0q28cf21...-bash-3.2-p39</literal> and
+      <literal>coreutils=/nix/store/68afga4khv0w...-coreutils-6.12</literal>,
+      but does not contain the variable <varname>foo</varname>, then the output
+      will be
 <programlisting>
 #! /nix/store/bmwp0q28cf21...-bash-3.2-p39/bin/sh
 PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin
 echo @foo@
 </programlisting>
-
-    That is, no substitution is performed for undefined variables.</para>
-
-    <para>Environment variables that start with an uppercase letter or an
-    underscore are filtered out,
-    to prevent global variables (like <literal>HOME</literal>) or private
-    variables (like <literal>__ETC_PROFILE_DONE</literal>) from accidentally
-    getting substituted.
-    The variables also have to be valid bash “names”, as
-    defined in the bash manpage (alphanumeric or <literal>_</literal>,
-    must not start with a number).</para>
-  </listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id='fun-substituteAllInPlace'>
-    <term><function>substituteAllInPlace</function>
-    <replaceable>file</replaceable></term>
-    <listitem><para>Like <function>substituteAll</function>, but performs
-    the substitutions in place on the file
-    <replaceable>file</replaceable>.</para></listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id='fun-stripHash'>
-    <term><function>stripHash</function>
-    <replaceable>path</replaceable></term>
-    <listitem><para>Strips the directory and hash part of a store
-    path, outputting the name part to <literal>stdout</literal>.
-    For example:
-
+      That is, no substitution is performed for undefined variables.
+     </para>
+     <para>
+      Environment variables that start with an uppercase letter or an
+      underscore are filtered out, to prevent global variables (like
+      <literal>HOME</literal>) or private variables (like
+      <literal>__ETC_PROFILE_DONE</literal>) from accidentally getting
+      substituted. The variables also have to be valid bash “names”, as
+      defined in the bash manpage (alphanumeric or <literal>_</literal>, must
+      not start with a number).
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id='fun-substituteAllInPlace'>
+    <term><function>substituteAllInPlace</function><replaceable>file</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Like <function>substituteAll</function>, but performs the substitutions
+      in place on the file <replaceable>file</replaceable>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry xml:id='fun-stripHash'>
+    <term><function>stripHash</function><replaceable>path</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Strips the directory and hash part of a store path, outputting the name
+      part to <literal>stdout</literal>. For example:
 <programlisting>
 # prints coreutils-8.24
 stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
 </programlisting>
-
-    If you wish to store the result in another variable, then the
-    following idiom may be useful:
-
+      If you wish to store the result in another variable, then the following
+      idiom may be useful:
 <programlisting>
 name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24"
 someVar=$(stripHash $name)
 </programlisting>
-
-    </para></listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id='fun-wrapProgram'>
-    <term><function>wrapProgram</function>
-    <replaceable>executable</replaceable>
-    <replaceable>makeWrapperArgs</replaceable></term>
-    <listitem><para>Convenience function for <literal>makeWrapper</literal>
-    that automatically creates a sane wrapper file
-
-    It takes all the same arguments as <literal>makeWrapper</literal>,
-    except for <literal>--argv0</literal>.</para>
-
-    <para>It cannot be applied multiple times, since it will overwrite the wrapper
-    file.</para>
+     </para>
     </listitem>
-  </varlistentry>
+   </varlistentry>
+   <varlistentry xml:id='fun-wrapProgram'>
+    <term><function>wrapProgram</function><replaceable>executable</replaceable><replaceable>makeWrapperArgs</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Convenience function for <literal>makeWrapper</literal> that
+      automatically creates a sane wrapper file It takes all the same arguments
+      as <literal>makeWrapper</literal>, except for <literal>--argv0</literal>.
+     </para>
+     <para>
+      It cannot be applied multiple times, since it will overwrite the wrapper
+      file.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
+ <section xml:id="ssec-setup-hooks">
+  <title>Package setup hooks</title>
 
+  <para>
+   Nix itself considers a build-time dependency merely something that should
+   previously be built and accessible at build time—packages themselves are
+   on their own to perform any additional setup. In most cases, that is fine,
+   and the downstream derivation can deal with it's own dependencies. But for a
+   few common tasks, that would result in almost every package doing the same
+   sort of setup work---depending not on the package itself, but entirely on
+   which dependencies were used.
+  </para>
 
-</variablelist>
+  <para>
+   In order to alleviate this burden, the <firstterm>setup
+   hook></firstterm>mechanism was written, where any package can include a
+   shell script that [by convention rather than enforcement by Nix], any
+   downstream reverse-dependency will source as part of its build process. That
+   allows the downstream dependency to merely specify its dependencies, and
+   lets those dependencies effectively initialize themselves. No boilerplate
+   mirroring the list of dependencies is needed.
+  </para>
 
-</section>
+  <para>
+   The Setup hook mechanism is a bit of a sledgehammer though: a powerful
+   feature with a broad and indiscriminate area of effect. The combination of
+   its power and implicit use may be expedient, but isn't without costs. Nix
+   itself is unchanged, but the spirit of adding dependencies being effect-free
+   is violated even if the letter isn't. For example, if a derivation path is
+   mentioned more than once, Nix itself doesn't care and simply makes sure the
+   dependency derivation is already built just the same—depending is just
+   needing something to exist, and needing is idempotent. However, a dependency
+   specified twice will have its setup hook run twice, and that could easily
+   change the build environment (though a well-written setup hook will
+   therefore strive to be idempotent so this is in fact not observable). More
+   broadly, setup hooks are anti-modular in that multiple dependencies, whether
+   the same or different, should not interfere and yet their setup hooks may
+   well do so.
+  </para>
 
+  <para>
+   The most typical use of the setup hook is actually to add other hooks which
+   are then run (i.e. after all the setup hooks) on each dependency. For
+   example, the C compiler wrapper's setup hook feeds itself flags for each
+   dependency that contains relevant libaries and headers. This is done by
+   defining a bash function, and appending its name to one of
+   <envar>envBuildBuildHooks</envar>`, <envar>envBuildHostHooks</envar>`,
+   <envar>envBuildTargetHooks</envar>`, <envar>envHostHostHooks</envar>`,
+   <envar>envHostTargetHooks</envar>`, or <envar>envTargetTargetHooks</envar>`.
+   These 6 bash variables correspond to the 6 sorts of dependencies by platform
+   (there's 12 total but we ignore the propagated/non-propagated axis).
+  </para>
 
-<section xml:id="ssec-setup-hooks"><title>Package setup hooks</title>
-
-<para>
-  Nix itself considers a build-time dependency merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup.
-  In most cases, that is fine, and the downstream derivation can deal with it's own dependencies.
-  But for a few common tasks, that would result in almost every package doing the same sort of setup work---depending not on the package itself, but entirely on which dependencies were used.
-</para>
-<para>
-  In order to alleviate this burden, the <firstterm>setup hook></firstterm>mechanism was written, where any package can include a shell script that [by convention rather than enforcement by Nix], any downstream reverse-dependency will source as part of its build process.
-  That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves.
-  No boilerplate mirroring the list of dependencies is needed.
-</para>
-<para>
-  The Setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect.
-  The combination of its power and implicit use may be expedient, but isn't without costs.
-  Nix itself is unchanged, but the spirit of adding dependencies being effect-free is violated even if the letter isn't.
-  For example, if a derivation path is mentioned more than once, Nix itself doesn't care and simply makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent.
-  However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable).
-  More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so.
-</para>
-<para>
-  The most typical use of the setup hook is actually to add other hooks which are then run (i.e. after all the setup hooks) on each dependency.
-  For example, the C compiler wrapper's setup hook feeds itself flags for each dependency that contains relevant libaries and headers.
-  This is done by defining a bash function, and appending its name to one of
-  <envar>envBuildBuildHooks</envar>`,
-  <envar>envBuildHostHooks</envar>`,
-  <envar>envBuildTargetHooks</envar>`,
-  <envar>envHostHostHooks</envar>`,
-  <envar>envHostTargetHooks</envar>`, or
-  <envar>envTargetTargetHooks</envar>`.
-  These 6 bash variables correspond to the 6 sorts of dependencies by platform (there's 12 total but we ignore the propagated/non-propagated axis).
-</para>
-<para>
-  Packages adding a hook should not hard code a specific hook, but rather choose a variable <emphasis>relative</emphasis> to how they are included.
-  Returning to the C compiler wrapper example, if it itself is an <literal>n</literal> dependency, then it only wants to accumulate flags from <literal>n + 1</literal> dependencies, as only those ones match the compiler's target platform.
-  The <envar>hostOffset</envar> variable is defined with the current dependency's host offset <envar>targetOffset</envar> with its target offset, before it's setup hook is sourced.
-  Additionally, since most environment hooks don't care about the target platform,
-  That means the setup hook can append to the right bash array by doing something like
-  <programlisting language="bash">
+  <para>
+   Packages adding a hook should not hard code a specific hook, but rather
+   choose a variable <emphasis>relative</emphasis> to how they are included.
+   Returning to the C compiler wrapper example, if it itself is an
+   <literal>n</literal> dependency, then it only wants to accumulate flags from
+   <literal>n + 1</literal> dependencies, as only those ones match the
+   compiler's target platform. The <envar>hostOffset</envar> variable is
+   defined with the current dependency's host offset
+   <envar>targetOffset</envar> with its target offset, before it's setup hook
+   is sourced. Additionally, since most environment hooks don't care about the
+   target platform, That means the setup hook can append to the right bash
+   array by doing something like
+<programlisting language="bash">
 addEnvHooks "$hostOffset" myBashFunction
   </programlisting>
-</para>
-<para>
-  The <emphasis>existence</emphasis> of setups hooks has long been documented and packages inside Nixpkgs are free to use these mechanism.
-  Other packages, however, should not rely on these mechanisms not changing between Nixpkgs versions.
-  Because of the existing issues with this system, there's little benefit from mandating it be stable for any period of time.
-</para>
-<para>
-  Here are some packages that provide a setup hook.
-  Since the mechanism is modular, this probably isn't an exhaustive list.
-  Then again, since the mechanism is only to be used as a last resort, it might be.
-<variablelist>
+  </para>
 
-  <varlistentry>
-    <term>Bintools Wrapper</term>
-    <listitem>
+  <para>
+   The <emphasis>existence</emphasis> of setups hooks has long been documented
+   and packages inside Nixpkgs are free to use these mechanism. Other packages,
+   however, should not rely on these mechanisms not changing between Nixpkgs
+   versions. Because of the existing issues with this system, there's little
+   benefit from mandating it be stable for any period of time.
+  </para>
+
+  <para>
+   Here are some packages that provide a setup hook. Since the mechanism is
+   modular, this probably isn't an exhaustive list. Then again, since the
+   mechanism is only to be used as a last resort, it might be.
+   <variablelist>
+    <varlistentry>
+     <term>Bintools Wrapper</term>
+     <listitem>
       <para>
-        Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous purposes.
-        These are GNU Binutils when targetting Linux, and a mix of cctools and GNU binutils for Darwin.
-        [The "Bintools" name is supposed to be a compromise between "Binutils" and "cctools" not denoting any specific implementation.]
-        Specifically, the underlying bintools package, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by Bintools Wrapper.
-        Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper.
+       Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous
+       purposes. These are GNU Binutils when targetting Linux, and a mix of
+       cctools and GNU binutils for Darwin. [The "Bintools" name is supposed to
+       be a compromise between "Binutils" and "cctools" not denoting any
+       specific implementation.] Specifically, the underlying bintools package,
+       and a C standard library (glibc or Darwin's libSystem, just for the
+       dynamic loader) are all fed in, and dependency finding, hardening (see
+       below), and purity checks for each are handled by Bintools Wrapper.
+       Packages typically depend on CC Wrapper, which in turn (at run time)
+       depends on Bintools Wrapper.
       </para>
       <para>
-        Bintools Wrapper was only just recently split off from CC Wrapper, so the division of labor is still being worked out.
-        For example, it shouldn't care about about the C standard library, but just take a derivation with the dynamic loader (which happens to be the glibc on linux).
-        Dependency finding however is a task both wrappers will continue to need to share, and probably the most important to understand.
-        It is currently accomplished by collecting directories of host-platform dependencies (i.e. <varname>buildInputs</varname> and <varname>nativeBuildInputs</varname>) in environment variables.
-        Bintools Wrapper's setup hook causes any <filename>lib</filename> and <filename>lib64</filename> subdirectories to be added to <envar>NIX_LDFLAGS</envar>.
-        Since CC Wrapper and Bintools Wrapper use the same strategy, most of the Bintools Wrapper code is sparsely commented and refers to CC Wrapper.
-        But CC Wrapper's code, by contrast, has quite lengthy comments.
-        Bintools Wrapper merely cites those, rather than repeating them, to avoid falling out of sync.
+       Bintools Wrapper was only just recently split off from CC Wrapper, so
+       the division of labor is still being worked out. For example, it
+       shouldn't care about about the C standard library, but just take a
+       derivation with the dynamic loader (which happens to be the glibc on
+       linux). Dependency finding however is a task both wrappers will continue
+       to need to share, and probably the most important to understand. It is
+       currently accomplished by collecting directories of host-platform
+       dependencies (i.e. <varname>buildInputs</varname> and
+       <varname>nativeBuildInputs</varname>) in environment variables. Bintools
+       Wrapper's setup hook causes any <filename>lib</filename> and
+       <filename>lib64</filename> subdirectories to be added to
+       <envar>NIX_LDFLAGS</envar>. Since CC Wrapper and Bintools Wrapper use
+       the same strategy, most of the Bintools Wrapper code is sparsely
+       commented and refers to CC Wrapper. But CC Wrapper's code, by contrast,
+       has quite lengthy comments. Bintools Wrapper merely cites those, rather
+       than repeating them, to avoid falling out of sync.
       </para>
       <para>
-        A final task of the setup hook is defining a number of standard environment variables to tell build systems which executables full-fill which purpose.
-        They are defined to just be the base name of the tools, under the assumption that Bintools Wrapper's binaries will be on the path.
-        Firstly, this helps poorly-written packages, e.g. ones that look for just <command>gcc</command> when <envar>CC</envar> isn't defined yet <command>clang</command> is to be used.
-        Secondly, this helps packages not get confused when cross-compiling, in which case multiple Bintools Wrappers may simultaneously be in use.
-        <footnote><para>
-          Each wrapper targets a single platform, so if binaries for multiple platforms are needed, the underlying binaries must be wrapped multiple times.
-          As this is a property of the wrapper itself, the multiple wrappings are needed whether or not the same underlying binaries can target multiple platforms.
-        </para></footnote>
-        <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of the normal environment variable are defined for the additional Bintools Wrappers, properly disambiguating them.
+       A final task of the setup hook is defining a number of standard
+       environment variables to tell build systems which executables full-fill
+       which purpose. They are defined to just be the base name of the tools,
+       under the assumption that Bintools Wrapper's binaries will be on the
+       path. Firstly, this helps poorly-written packages, e.g. ones that look
+       for just <command>gcc</command> when <envar>CC</envar> isn't defined yet
+       <command>clang</command> is to be used. Secondly, this helps packages
+       not get confused when cross-compiling, in which case multiple Bintools
+       Wrappers may simultaneously be in use.
+       <footnote>
+        <para>
+         Each wrapper targets a single platform, so if binaries for multiple
+         platforms are needed, the underlying binaries must be wrapped multiple
+         times. As this is a property of the wrapper itself, the multiple
+         wrappings are needed whether or not the same underlying binaries can
+         target multiple platforms.
+        </para>
+       </footnote>
+       <envar>BUILD_</envar>- and <envar>TARGET_</envar>-prefixed versions of
+       the normal environment variable are defined for the additional Bintools
+       Wrappers, properly disambiguating them.
       </para>
       <para>
-        A problem with this final task is that Bintools Wrapper is honest and defines <envar>LD</envar> as <command>ld</command>.
-        Most packages, however, firstly use the C compiler for linking, secondly use <envar>LD</envar> anyways, defining it as the C compiler, and thirdly, only so define <envar>LD</envar> when it is undefined as a fallback.
-        This triple-threat means Bintools Wrapper will break those packages, as LD is already defined as the actual linker which the package won't override yet doesn't want to use.
-        The workaround is to define, just for the problematic package, <envar>LD</envar> as the C compiler.
-        A good way to do this would be <command>preConfigure = "LD=$CC"</command>.
+       A problem with this final task is that Bintools Wrapper is honest and
+       defines <envar>LD</envar> as <command>ld</command>. Most packages,
+       however, firstly use the C compiler for linking, secondly use
+       <envar>LD</envar> anyways, defining it as the C compiler, and thirdly,
+       only so define <envar>LD</envar> when it is undefined as a fallback.
+       This triple-threat means Bintools Wrapper will break those packages, as
+       LD is already defined as the actual linker which the package won't
+       override yet doesn't want to use. The workaround is to define, just for
+       the problematic package, <envar>LD</envar> as the C compiler. A good way
+       to do this would be <command>preConfigure = "LD=$CC"</command>.
       </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>CC Wrapper</term>
-    <listitem>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>CC Wrapper</term>
+     <listitem>
       <para>
-        CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
-        Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C standard library (glibc or Darwin's libSystem, just for the dynamic loader) are all fed in, and dependency finding, hardening (see below), and purity checks for each are handled by CC Wrapper.
-        Packages typically depend on CC Wrapper, which in turn (at run time) depends on Bintools Wrapper.
+       CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
+       Specifically, a C compiler (GCC or Clang), wrapped binary tools, and a C
+       standard library (glibc or Darwin's libSystem, just for the dynamic
+       loader) are all fed in, and dependency finding, hardening (see below),
+       and purity checks for each are handled by CC Wrapper. Packages typically
+       depend on CC Wrapper, which in turn (at run time) depends on Bintools
+       Wrapper.
       </para>
       <para>
-        Dependency finding is undoubtedly the main task of CC Wrapper.
-        This works just like Bintools Wrapper, except that any <filename>include</filename> subdirectory of any relevant dependency is added to <envar>NIX_CFLAGS_COMPILE</envar>.
-        The setup hook itself contains some lengthy comments describing the exact convoluted mechanism by which this is accomplished.
+       Dependency finding is undoubtedly the main task of CC Wrapper. This
+       works just like Bintools Wrapper, except that any
+       <filename>include</filename> subdirectory of any relevant dependency is
+       added to <envar>NIX_CFLAGS_COMPILE</envar>. The setup hook itself
+       contains some lengthy comments describing the exact convoluted mechanism
+       by which this is accomplished.
       </para>
       <para>
-        CC Wrapper also like Bintools Wrapper defines standard environment variables with the names of the tools it wraps, for the same reasons described above.
-        Importantly, while it includes a <command>cc</command> symlink to the c compiler for portability, the <envar>CC</envar> will be defined using the compiler's "real name" (i.e. <command>gcc</command> or <command>clang</command>).
-        This helps lousy build systems that inspect on the name of the compiler rather than run it.
+       CC Wrapper also like Bintools Wrapper defines standard environment
+       variables with the names of the tools it wraps, for the same reasons
+       described above. Importantly, while it includes a <command>cc</command>
+       symlink to the c compiler for portability, the <envar>CC</envar> will be
+       defined using the compiler's "real name" (i.e. <command>gcc</command> or
+       <command>clang</command>). This helps lousy build systems that inspect
+       on the name of the compiler rather than run it.
       </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Perl</term>
-    <listitem>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>Perl</term>
+     <listitem>
       <para>
-        Adds the <filename>lib/site_perl</filename> subdirectory of each build input to the <envar>PERL5LIB</envar> environment variable.
-        For instance, if <varname>buildInputs</varname> contains Perl, then the <filename>lib/site_perl</filename> subdirectory of each input is added to the <envar>PERL5LIB</envar> environment variable.
+       Adds the <filename>lib/site_perl</filename> subdirectory of each build
+       input to the <envar>PERL5LIB</envar> environment variable. For instance,
+       if <varname>buildInputs</varname> contains Perl, then the
+       <filename>lib/site_perl</filename> subdirectory of each input is added
+       to the <envar>PERL5LIB</envar> environment variable.
       </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Python</term>
-    <listitem><para>Adds the
-    <filename>lib/${python.libPrefix}/site-packages</filename> subdirectory of
-    each build input to the <envar>PYTHONPATH</envar> environment
-    variable.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>pkg-config</term>
-    <listitem><para>Adds the <filename>lib/pkgconfig</filename> and
-    <filename>share/pkgconfig</filename> subdirectories of each
-    build input to the <envar>PKG_CONFIG_PATH</envar> environment
-    variable.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Automake</term>
-    <listitem><para>Adds the <filename>share/aclocal</filename>
-    subdirectory of each build input to the <envar>ACLOCAL_PATH</envar>
-    environment variable.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Autoconf</term>
-    <listitem><para>The <varname>autoreconfHook</varname> derivation adds
-    <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize and
-    automake, essentially preparing the configure script in autotools-based
-    builds.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>libxml2</term>
-    <listitem><para>Adds every file named
-    <filename>catalog.xml</filename> found under the
-    <filename>xml/dtd</filename> and <filename>xml/xsl</filename>
-    subdirectories of each build input to the
-    <envar>XML_CATALOG_FILES</envar> environment
-    variable.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>teTeX / TeX Live</term>
-    <listitem><para>Adds the <filename>share/texmf-nix</filename>
-    subdirectory of each build input to the <envar>TEXINPUTS</envar>
-    environment variable.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Qt 4</term>
-    <listitem><para>Sets the <envar>QTDIR</envar> environment variable
-    to Qt’s path.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>gdk-pixbuf</term>
-    <listitem><para>Exports <envar>GDK_PIXBUF_MODULE_FILE</envar>
-    environment variable the the builder. Add librsvg package
-    to <varname>buildInputs</varname> to get svg support.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>GHC</term>
-    <listitem><para>Creates a temporary package database and registers
-    every Haskell build input in it (TODO: how?).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>GStreamer</term>
-    <listitem><para>Adds the
-    GStreamer plugins subdirectory of
-    each build input to the <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> or
-    <envar>GST_PLUGIN_SYSTEM_PATH</envar> environment variable.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>paxctl</term>
-    <listitem><para>Defines the <varname>paxmark</varname> helper for
-    setting per-executable PaX flags on Linux (where it is available by
-    default; on all other platforms, <varname>paxmark</varname> is a no-op).
-    For example, to disable secure memory protections on the executable
-    <replaceable>foo</replaceable>:
-    <programlisting>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>Python</term>
+     <listitem>
+      <para>
+       Adds the <filename>lib/${python.libPrefix}/site-packages</filename>
+       subdirectory of each build input to the <envar>PYTHONPATH</envar>
+       environment variable.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>pkg-config</term>
+     <listitem>
+      <para>
+       Adds the <filename>lib/pkgconfig</filename> and
+       <filename>share/pkgconfig</filename> subdirectories of each build input
+       to the <envar>PKG_CONFIG_PATH</envar> environment variable.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>Automake</term>
+     <listitem>
+      <para>
+       Adds the <filename>share/aclocal</filename> subdirectory of each build
+       input to the <envar>ACLOCAL_PATH</envar> environment variable.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>Autoconf</term>
+     <listitem>
+      <para>
+       The <varname>autoreconfHook</varname> derivation adds
+       <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize
+       and automake, essentially preparing the configure script in
+       autotools-based builds.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>libxml2</term>
+     <listitem>
+      <para>
+       Adds every file named <filename>catalog.xml</filename> found under the
+       <filename>xml/dtd</filename> and <filename>xml/xsl</filename>
+       subdirectories of each build input to the
+       <envar>XML_CATALOG_FILES</envar> environment variable.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>teTeX / TeX Live</term>
+     <listitem>
+      <para>
+       Adds the <filename>share/texmf-nix</filename> subdirectory of each build
+       input to the <envar>TEXINPUTS</envar> environment variable.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>Qt 4</term>
+     <listitem>
+      <para>
+       Sets the <envar>QTDIR</envar> environment variable to Qt’s path.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>gdk-pixbuf</term>
+     <listitem>
+      <para>
+       Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable the
+       the builder. Add librsvg package to <varname>buildInputs</varname> to
+       get svg support.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>GHC</term>
+     <listitem>
+      <para>
+       Creates a temporary package database and registers every Haskell build
+       input in it (TODO: how?).
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>GStreamer</term>
+     <listitem>
+      <para>
+       Adds the GStreamer plugins subdirectory of each build input to the
+       <envar>GST_PLUGIN_SYSTEM_PATH_1_0</envar> or
+       <envar>GST_PLUGIN_SYSTEM_PATH</envar> environment variable.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>paxctl</term>
+     <listitem>
+      <para>
+       Defines the <varname>paxmark</varname> helper for setting per-executable
+       PaX flags on Linux (where it is available by default; on all other
+       platforms, <varname>paxmark</varname> is a no-op). For example, to
+       disable secure memory protections on the executable
+       <replaceable>foo</replaceable>:
+<programlisting>
       postFixup = ''
         paxmark m $out/bin/<replaceable>foo</replaceable>
       '';
     </programlisting>
-    The <literal>m</literal> flag is the most common flag and is typically
-    required for applications that employ JIT compilation or otherwise need to
-    execute code generated at run-time.  Disabling PaX protections should be
-    considered a last resort: if possible, problematic features should be
-    disabled or patched to work with PaX.</para></listitem>
-  </varlistentry>
+       The <literal>m</literal> flag is the most common flag and is typically
+       required for applications that employ JIT compilation or otherwise need
+       to execute code generated at run-time. Disabling PaX protections should
+       be considered a last resort: if possible, problematic features should be
+       disabled or patched to work with PaX.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>autoPatchelfHook</term>
+     <listitem>
+      <para>
+       This is a special setup hook which helps in packaging proprietary
+       software in that it automatically tries to find missing shared library
+       dependencies of ELF files. All packages within the
+       <envar>runtimeDependencies</envar> environment variable are
+       unconditionally added to executables, which is useful for programs that
+       use <citerefentry>
+       <refentrytitle>dlopen</refentrytitle>
+       <manvolnum>3</manvolnum> </citerefentry> to load libraries at runtime.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </section>
+ <section xml:id="sec-purity-in-nixpkgs">
+  <title>Purity in Nixpkgs</title>
 
-  <varlistentry>
-    <term>autoPatchelfHook</term>
-    <listitem><para>This is a special setup hook which helps in packaging
-    proprietary software in that it automatically tries to find missing shared
-    library dependencies of ELF files. All packages within the
-    <envar>runtimeDependencies</envar> environment variable are unconditionally
-    added to executables, which is useful for programs that use
-    <citerefentry>
-      <refentrytitle>dlopen</refentrytitle>
-      <manvolnum>3</manvolnum>
-    </citerefentry>
-    to load libraries at runtime.</para></listitem>
-  </varlistentry>
+  <para>
+   [measures taken to prevent dependencies on packages outside the store, and
+   what you can do to prevent them]
+  </para>
 
-</variablelist>
+  <para>
+   GCC doesn't search in locations such as <filename>/usr/include</filename>.
+   In fact, attempts to add such directories through the <option>-I</option>
+   flag are filtered out. Likewise, the linker (from GNU binutils) doesn't
+   search in standard locations such as <filename>/usr/lib</filename>. Programs
+   built on Linux are linked against a GNU C Library that likewise doesn't
+   search in the default system locations.
+  </para>
+ </section>
+ <section xml:id="sec-hardening-in-nixpkgs">
+  <title>Hardening in Nixpkgs</title>
 
-</para>
+  <para>
+   There are flags available to harden packages at compile or link-time. These
+   can be toggled using the <varname>stdenv.mkDerivation</varname> parameters
+   <varname>hardeningDisable</varname> and <varname>hardeningEnable</varname>.
+  </para>
 
-</section>
+  <para>
+   Both parameters take a list of flags as strings. The special
+   <varname>"all"</varname> flag can be passed to
+   <varname>hardeningDisable</varname> to turn off all hardening. These flags
+   can also be used as environment variables for testing or development
+   purposes.
+  </para>
 
+  <para>
+   The following flags are enabled by default and might require disabling with
+   <varname>hardeningDisable</varname> if the program to package is
+   incompatible.
+  </para>
 
-<section xml:id="sec-purity-in-nixpkgs"><title>Purity in Nixpkgs</title>
-
-<para>[measures taken to prevent dependencies on packages outside the
-store, and what you can do to prevent them]</para>
-
-<para>GCC doesn't search in locations such as
-<filename>/usr/include</filename>.  In fact, attempts to add such
-directories through the <option>-I</option> flag are filtered out.
-Likewise, the linker (from GNU binutils) doesn't search in standard
-locations such as <filename>/usr/lib</filename>.  Programs built on
-Linux are linked against a GNU C Library that likewise doesn't search
-in the default system locations.</para>
-
-</section>
-
-<section xml:id="sec-hardening-in-nixpkgs"><title>Hardening in Nixpkgs</title>
-
-<para>There are flags available to harden packages at compile or link-time.
-These can be toggled using the <varname>stdenv.mkDerivation</varname> parameters
-<varname>hardeningDisable</varname> and <varname>hardeningEnable</varname>.
-</para>
-
-<para>
-Both parameters take a list of flags as strings. The special
-<varname>"all"</varname> flag can be passed to <varname>hardeningDisable</varname>
-to turn off all hardening. These flags can also be used as environment variables
-for testing or development purposes.
-</para>
-
-<para>The following flags are enabled by default and might require disabling with
-<varname>hardeningDisable</varname> if the program to package is incompatible.
-</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>format</varname></term>
-    <listitem><para>Adds the <option>-Wformat -Wformat-security
-    -Werror=format-security</option> compiler options. At present,
-    this warns about calls to <varname>printf</varname> and
-    <varname>scanf</varname> functions where the format string is
-    not a string literal and there are no format arguments, as in
-    <literal>printf(foo);</literal>. This may be a security hole
-    if the format string came from untrusted input and contains
-    <literal>%n</literal>.</para>
-
-    <para>This needs to be turned off or fixed for errors similar to:</para>
-
-    <programlisting>
+  <variablelist>
+   <varlistentry>
+    <term><varname>format</varname>
+    </term>
+    <listitem>
+     <para>
+      Adds the <option>-Wformat -Wformat-security
+      -Werror=format-security</option> compiler options. At present, this warns
+      about calls to <varname>printf</varname> and <varname>scanf</varname>
+      functions where the format string is not a string literal and there are
+      no format arguments, as in <literal>printf(foo);</literal>. This may be a
+      security hole if the format string came from untrusted input and contains
+      <literal>%n</literal>.
+     </para>
+     <para>
+      This needs to be turned off or fixed for errors similar to:
+     </para>
+<programlisting>
 /tmp/nix-build-zynaddsubfx-2.5.2.drv-0/zynaddsubfx-2.5.2/src/UI/guimain.cpp:571:28: error: format not a string literal and no format arguments [-Werror=format-security]
          printf(help_message);
                             ^
 cc1plus: some warnings being treated as errors
-    </programlisting></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>stackprotector</varname></term>
+    </programlisting>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>stackprotector</varname>
+    </term>
     <listitem>
-    <para>Adds the <option>-fstack-protector-strong
-    --param ssp-buffer-size=4</option>
-    compiler options. This adds safety checks against stack overwrites
-    rendering many potential code injection attacks into aborting situations.
-    In the best case this turns code injection vulnerabilities into denial
-    of service or into non-issues (depending on the application).</para>
-
-    <para>This needs to be turned off or fixed for errors similar to:</para>
-
-    <programlisting>
+     <para>
+      Adds the <option>-fstack-protector-strong --param
+      ssp-buffer-size=4</option> compiler options. This adds safety checks
+      against stack overwrites rendering many potential code injection attacks
+      into aborting situations. In the best case this turns code injection
+      vulnerabilities into denial of service or into non-issues (depending on
+      the application).
+     </para>
+     <para>
+      This needs to be turned off or fixed for errors similar to:
+     </para>
+<programlisting>
 bin/blib.a(bios_console.o): In function `bios_handle_cup':
 /tmp/nix-build-ipxe-20141124-5cbdc41.drv-0/ipxe-5cbdc41/src/arch/i386/firmware/pcbios/bios_console.c:86: undefined reference to `__stack_chk_fail'
-    </programlisting></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>fortify</varname></term>
+    </programlisting>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>fortify</varname>
+    </term>
     <listitem>
-    <para>Adds the <option>-O2 -D_FORTIFY_SOURCE=2</option> compiler
-    options. During code generation the compiler knows a great deal of
-    information about buffer sizes (where possible), and attempts to replace
-    insecure unlimited length buffer function calls with length-limited ones.
-    This is especially useful for old, crufty code. Additionally, format
-    strings in writable memory that contain '%n' are blocked. If an application
-    depends on such a format string, it will need to be worked around.
-    </para>
-
-    <para>Additionally, some warnings are enabled which might trigger build
-    failures if compiler warnings are treated as errors in the package build.
-    In this case, set <option>NIX_CFLAGS_COMPILE</option> to
-    <option>-Wno-error=warning-type</option>.</para>
-
-    <para>This needs to be turned off or fixed for errors similar to:</para>
-
-    <programlisting>
+     <para>
+      Adds the <option>-O2 -D_FORTIFY_SOURCE=2</option> compiler options.
+      During code generation the compiler knows a great deal of information
+      about buffer sizes (where possible), and attempts to replace insecure
+      unlimited length buffer function calls with length-limited ones. This is
+      especially useful for old, crufty code. Additionally, format strings in
+      writable memory that contain '%n' are blocked. If an application depends
+      on such a format string, it will need to be worked around.
+     </para>
+     <para>
+      Additionally, some warnings are enabled which might trigger build
+      failures if compiler warnings are treated as errors in the package build.
+      In this case, set <option>NIX_CFLAGS_COMPILE</option> to
+      <option>-Wno-error=warning-type</option>.
+     </para>
+     <para>
+      This needs to be turned off or fixed for errors similar to:
+     </para>
+<programlisting>
 malloc.c:404:15: error: return type is an incomplete type
 malloc.c:410:19: error: storage size of 'ms' isn't known
     </programlisting>
-    <programlisting>
+<programlisting>
 strdup.h:22:1: error: expected identifier or '(' before '__extension__'
     </programlisting>
-    <programlisting>
+<programlisting>
 strsep.c:65:23: error: register name not specified for 'delim'
     </programlisting>
-    <programlisting>
+<programlisting>
 installwatch.c:3751:5: error: conflicting types for '__open_2'
     </programlisting>
-    <programlisting>
+<programlisting>
 fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute error: open with O_CREAT or O_TMPFILE in second argument needs 3 arguments
     </programlisting>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>pic</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>pic</varname>
+    </term>
     <listitem>
-    <para>Adds the <option>-fPIC</option> compiler options. This options adds
-    support for position independent code in shared libraries and thus making
-    ASLR possible.</para>
-    <para>Most notably, the Linux kernel, kernel modules and other code
-    not running in an operating system environment like boot loaders won't
-    build with PIC enabled. The compiler will is most cases complain that
-    PIC is not supported for a specific build.
-    </para>
-
-    <para>This needs to be turned off or fixed for assembler errors similar to:</para>
-
-    <programlisting>
+     <para>
+      Adds the <option>-fPIC</option> compiler options. This options adds
+      support for position independent code in shared libraries and thus making
+      ASLR possible.
+     </para>
+     <para>
+      Most notably, the Linux kernel, kernel modules and other code not running
+      in an operating system environment like boot loaders won't build with PIC
+      enabled. The compiler will is most cases complain that PIC is not
+      supported for a specific build.
+     </para>
+     <para>
+      This needs to be turned off or fixed for assembler errors similar to:
+     </para>
+<programlisting>
 ccbLfRgg.s: Assembler messages:
 ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_len@GOTOFF'
     </programlisting>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>strictoverflow</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>strictoverflow</varname>
+    </term>
     <listitem>
-    <para>Signed integer overflow is undefined behaviour according to the C
-    standard. If it happens, it is an error in the program as it should check
-    for overflow before it can happen, not afterwards. GCC provides built-in
-    functions to perform arithmetic with overflow checking, which are correct
-    and faster than any custom implementation. As a workaround, the option
-    <option>-fno-strict-overflow</option> makes gcc behave as if signed
-    integer overflows were defined.
-    </para>
-
-    <para>This flag should not trigger any build or runtime errors.</para>
+     <para>
+      Signed integer overflow is undefined behaviour according to the C
+      standard. If it happens, it is an error in the program as it should check
+      for overflow before it can happen, not afterwards. GCC provides built-in
+      functions to perform arithmetic with overflow checking, which are correct
+      and faster than any custom implementation. As a workaround, the option
+      <option>-fno-strict-overflow</option> makes gcc behave as if signed
+      integer overflows were defined.
+     </para>
+     <para>
+      This flag should not trigger any build or runtime errors.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>relro</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>relro</varname>
+    </term>
     <listitem>
-    <para>Adds the <option>-z relro</option> linker option. During program
-    load, several ELF memory sections need to be written to by the linker,
-    but can be turned read-only before turning over control to the program.
-    This prevents some GOT (and .dtors) overwrite attacks, but at least the
-    part of the GOT used by the dynamic linker (.got.plt) is still vulnerable.
-    </para>
-
-    <para>This flag can break dynamic shared object loading. For instance, the
-    module systems of Xorg and OpenCV are incompatible with this flag. In almost
-    all cases the <varname>bindnow</varname> flag must also be disabled and
-    incompatible programs typically fail with similar errors at runtime.</para>
+     <para>
+      Adds the <option>-z relro</option> linker option. During program load,
+      several ELF memory sections need to be written to by the linker, but can
+      be turned read-only before turning over control to the program. This
+      prevents some GOT (and .dtors) overwrite attacks, but at least the part
+      of the GOT used by the dynamic linker (.got.plt) is still vulnerable.
+     </para>
+     <para>
+      This flag can break dynamic shared object loading. For instance, the
+      module systems of Xorg and OpenCV are incompatible with this flag. In
+      almost all cases the <varname>bindnow</varname> flag must also be
+      disabled and incompatible programs typically fail with similar errors at
+      runtime.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>bindnow</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>bindnow</varname>
+    </term>
     <listitem>
-    <para>Adds the <option>-z bindnow</option> linker option. During program
-    load, all dynamic symbols are resolved, allowing for the complete GOT to
-    be marked read-only (due to <varname>relro</varname>). This prevents GOT
-    overwrite attacks. For very large applications, this can incur some
-    performance loss during initial load while symbols are resolved, but this
-    shouldn't be an issue for daemons.
-    </para>
-
-    <para>This flag can break dynamic shared object loading. For instance, the
-    module systems of Xorg and PHP are incompatible with this flag. Programs
-    incompatible with this flag often fail at runtime due to missing symbols,
-    like:</para>
-
-    <programlisting>
+     <para>
+      Adds the <option>-z bindnow</option> linker option. During program load,
+      all dynamic symbols are resolved, allowing for the complete GOT to be
+      marked read-only (due to <varname>relro</varname>). This prevents GOT
+      overwrite attacks. For very large applications, this can incur some
+      performance loss during initial load while symbols are resolved, but this
+      shouldn't be an issue for daemons.
+     </para>
+     <para>
+      This flag can break dynamic shared object loading. For instance, the
+      module systems of Xorg and PHP are incompatible with this flag. Programs
+      incompatible with this flag often fail at runtime due to missing symbols,
+      like:
+     </para>
+<programlisting>
 intel_drv.so: undefined symbol: vgaHWFreeHWRec
     </programlisting>
     </listitem>
-  </varlistentry>
+   </varlistentry>
+  </variablelist>
 
-</variablelist>
+  <para>
+   The following flags are disabled by default and should be enabled with
+   <varname>hardeningEnable</varname> for packages that take untrusted input
+   like network services.
+  </para>
 
-<para>The following flags are disabled by default and should be enabled
-with <varname>hardeningEnable</varname> for packages that take untrusted
-input like network services.
-</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>pie</varname></term>
+  <variablelist>
+   <varlistentry>
+    <term><varname>pie</varname>
+    </term>
     <listitem>
-    <para>Adds the <option>-fPIE</option> compiler and <option>-pie</option>
-    linker options. Position Independent Executables are needed to take
-    advantage of Address Space Layout Randomization, supported by modern
-    kernel versions. While ASLR can already be enforced for data areas in
-    the stack and heap (brk and mmap), the code areas must be compiled as
-    position-independent. Shared libraries already do this with the
-    <varname>pic</varname> flag, so they gain ASLR automatically, but binary
-    .text regions need to be build with <varname>pie</varname> to gain ASLR.
-    When this happens, ROP attacks are much harder since there are no static
-    locations to bounce off of during a memory corruption attack.
-    </para>
+     <para>
+      Adds the <option>-fPIE</option> compiler and <option>-pie</option> linker
+      options. Position Independent Executables are needed to take advantage of
+      Address Space Layout Randomization, supported by modern kernel versions.
+      While ASLR can already be enforced for data areas in the stack and heap
+      (brk and mmap), the code areas must be compiled as position-independent.
+      Shared libraries already do this with the <varname>pic</varname> flag, so
+      they gain ASLR automatically, but binary .text regions need to be build
+      with <varname>pie</varname> to gain ASLR. When this happens, ROP attacks
+      are much harder since there are no static locations to bounce off of
+      during a memory corruption attack.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-<para>For more in-depth information on these hardening flags and hardening in
-general, refer to the
-<link xlink:href="https://wiki.debian.org/Hardening">Debian Wiki</link>,
-<link xlink:href="https://wiki.ubuntu.com/Security/Features">Ubuntu Wiki</link>,
-<link xlink:href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo Wiki</link>,
-and the <link xlink:href="https://wiki.archlinux.org/index.php/DeveloperWiki:Security">
-Arch Wiki</link>.
-</para>
-
-</section>
+   </varlistentry>
+  </variablelist>
 
+  <para>
+   For more in-depth information on these hardening flags and hardening in
+   general, refer to the
+   <link xlink:href="https://wiki.debian.org/Hardening">Debian Wiki</link>,
+   <link xlink:href="https://wiki.ubuntu.com/Security/Features">Ubuntu
+   Wiki</link>,
+   <link xlink:href="https://wiki.gentoo.org/wiki/Project:Hardened">Gentoo
+   Wiki</link>, and the
+   <link xlink:href="https://wiki.archlinux.org/index.php/DeveloperWiki:Security">
+   Arch Wiki</link>.
+  </para>
+ </section>
 </chapter>
diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index d3cf221c9b69..ffa3a90b5eb6 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -1,447 +1,513 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="chap-submitting-changes">
+ <title>Submitting changes</title>
+ <section>
+  <title>Making patches</title>
 
-<title>Submitting changes</title>
-
-<section>
-<title>Making patches</title>
-
-<itemizedlist>
-<listitem>
-<para>Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to write packages for Nix)</link>.</para>
-</listitem>
-
-<listitem>
-<para>Fork the repository on GitHub.</para>
-</listitem>
-
-<listitem>
-<para>Create a branch for your future fix.
-
-<itemizedlist>
-<listitem>
-<para>You can make branch from a commit of your local <command>nixos-version</command>. That will help you to avoid additional local compilations. Because you will receive packages from binary cache.
-
-<itemizedlist>
-<listitem>
-<para>For example: <command>nixos-version</command> returns <command>15.05.git.0998212 (Dingo)</command>. So you can do:</para>
-</listitem>
-</itemizedlist>
-
+  <itemizedlist>
+   <listitem>
+    <para>
+     Read <link xlink:href="https://nixos.org/nixpkgs/manual/">Manual (How to
+     write packages for Nix)</link>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Fork the repository on GitHub.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Create a branch for your future fix.
+     <itemizedlist>
+      <listitem>
+       <para>
+        You can make branch from a commit of your local
+        <command>nixos-version</command>. That will help you to avoid
+        additional local compilations. Because you will receive packages from
+        binary cache.
+        <itemizedlist>
+         <listitem>
+          <para>
+           For example: <command>nixos-version</command> returns
+           <command>15.05.git.0998212 (Dingo)</command>. So you can do:
+          </para>
+         </listitem>
+        </itemizedlist>
 <screen>
 $ git checkout 0998212
 $ git checkout -b 'fix/pkg-name-update'
 </screen>
-</para>
-</listitem>
-
-<listitem>
-<para>Please avoid working directly on the <command>master</command> branch.</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-<listitem>
-<para>Make commits of logical units.
-
-<itemizedlist>
-<listitem>
-<para>If you removed pkgs, made some major NixOS changes etc., write about them in <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-<listitem>
-<para>Check for unnecessary whitespace with <command>git diff --check</command> before committing.</para>
-</listitem>
-
-<listitem>
-<para>Format the commit in a following way:</para>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Please avoid working directly on the <command>master</command> branch.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Make commits of logical units.
+     <itemizedlist>
+      <listitem>
+       <para>
+        If you removed pkgs, made some major NixOS changes etc., write about
+        them in
+        <command>nixos/doc/manual/release-notes/rl-unstable.xml</command>.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Check for unnecessary whitespace with <command>git diff --check</command>
+     before committing.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Format the commit in a following way:
+    </para>
 <programlisting>
 (pkg-name | nixos/&lt;module>): (from -> to | init at version | refactor | etc)
 Additional information.
 </programlisting>
+    <itemizedlist>
+     <listitem>
+      <para>
+       Examples:
+       <itemizedlist>
+        <listitem>
+         <para>
+          <command>nginx: init at 2.0.1</command>
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          <command>firefox: 54.0.1 -> 55.0</command>
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          <command>nixos/hydra: add bazBaz option</command>
+         </para>
+        </listitem>
+        <listitem>
+         <para>
+          <command>nixos/nginx: refactor config generation</command>
+         </para>
+        </listitem>
+       </itemizedlist>
+      </para>
+     </listitem>
+    </itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Test your changes. If you work with
+     <itemizedlist>
+      <listitem>
+       <para>
+        nixpkgs:
+        <itemizedlist>
+         <listitem>
+          <para>
+           update pkg ->
+           <itemizedlist>
+            <listitem>
+             <para>
+              <command>nix-env -i pkg-name -f &lt;path to your local nixpkgs
+              folder&gt;</command>
+             </para>
+            </listitem>
+           </itemizedlist>
+          </para>
+         </listitem>
+         <listitem>
+          <para>
+           add pkg ->
+           <itemizedlist>
+            <listitem>
+             <para>
+              Make sure it's in
+              <command>pkgs/top-level/all-packages.nix</command>
+             </para>
+            </listitem>
+            <listitem>
+             <para>
+              <command>nix-env -i pkg-name -f &lt;path to your local nixpkgs
+              folder&gt;</command>
+             </para>
+            </listitem>
+           </itemizedlist>
+          </para>
+         </listitem>
+         <listitem>
+          <para>
+           <emphasis>If you don't want to install pkg in you
+           profile</emphasis>.
+           <itemizedlist>
+            <listitem>
+             <para>
+              <command>nix-build -A pkg-attribute-name &lt;path to your local
+              nixpkgs folder&gt;/default.nix</command> and check results in the
+              folder <command>result</command>. It will appear in the same
+              directory where you did <command>nix-build</command>.
+             </para>
+            </listitem>
+           </itemizedlist>
+          </para>
+         </listitem>
+         <listitem>
+          <para>
+           If you did <command>nix-env -i pkg-name</command> you can do
+           <command>nix-env -e pkg-name</command> to uninstall it from your
+           system.
+          </para>
+         </listitem>
+        </itemizedlist>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        NixOS and its modules:
+        <itemizedlist>
+         <listitem>
+          <para>
+           You can add new module to your NixOS configuration file (usually
+           it's <command>/etc/nixos/configuration.nix</command>). And do
+           <command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local
+           nixpkgs folder&gt; --fast</command>.
+          </para>
+         </listitem>
+        </itemizedlist>
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     If you have commits <command>pkg-name: oh, forgot to insert
+     whitespace</command>: squash commits in this case. Use <command>git rebase
+     -i</command>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Rebase you branch against current <command>master</command>.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+ <section>
+  <title>Submitting changes</title>
 
-<itemizedlist>
-<listitem>
-<para>Examples:
-
-<itemizedlist>
-<listitem>
-<para>
-<command>nginx: init at 2.0.1</command>
-</para>
-</listitem>
-
-<listitem>
-<para>
-<command>firefox: 54.0.1 -> 55.0</command>
-</para>
-</listitem>
-
-<listitem>
-<para>
-<command>nixos/hydra: add bazBaz option</command>
-</para>
-</listitem>
-
-<listitem>
-<para>
-<command>nixos/nginx: refactor config generation</command>
-</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-</itemizedlist>
-</listitem>
-
-<listitem>
-<para>Test your changes. If you work with
-
-<itemizedlist>
-<listitem>
-<para>nixpkgs:
-
-<itemizedlist>
-<listitem>
-<para>update pkg ->
-
-<itemizedlist>
-<listitem>
-<para>
-<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
-</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-<listitem>
-<para>add pkg ->
-
-<itemizedlist>
-<listitem>
-<para>Make sure it's in <command>pkgs/top-level/all-packages.nix</command>
-</para>
-</listitem>
-
-<listitem>
-<para>
-<command>nix-env -i pkg-name -f &lt;path to your local nixpkgs folder&gt;</command>
-</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-<listitem>
-<para>
-<emphasis>If you don't want to install pkg in you profile</emphasis>.
-
-<itemizedlist>
-<listitem>
-<para>
-<command>nix-build -A pkg-attribute-name &lt;path to your local nixpkgs folder&gt;/default.nix</command> and check results in the folder <command>result</command>. It will appear in the same directory where you did <command>nix-build</command>.</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-<listitem>
-<para>If you did <command>nix-env -i pkg-name</command> you can do <command>nix-env -e pkg-name</command> to uninstall it from your system.</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-<listitem>
-<para>NixOS and its modules:
-
-<itemizedlist>
-<listitem>
-<para>You can add new module to your NixOS configuration file (usually it's <command>/etc/nixos/configuration.nix</command>).
-            And do <command>sudo nixos-rebuild test -I nixpkgs=&lt;path to your local nixpkgs folder&gt; --fast</command>.</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-<listitem>
-<para>If you have commits <command>pkg-name: oh, forgot to insert whitespace</command>: squash commits in this case. Use <command>git rebase -i</command>.</para>
-</listitem>
-
-<listitem>
-<para>Rebase you branch against current <command>master</command>.</para>
-</listitem>
-</itemizedlist>
-</section>
-
-<section>
-<title>Submitting changes</title>
-
-<itemizedlist>
-<listitem>
-<para>Push your changes to your fork of nixpkgs.</para>
-</listitem>
-
-<listitem>
-<para>Create pull request:
-
-<itemizedlist>
-<listitem>
-<para>Write the title in format <command>(pkg-name | nixos/&lt;module>): improvement</command>.
-
-<itemizedlist>
-<listitem>
-<para>If you update the pkg, write versions <command>from -> to</command>.</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-<listitem>
-<para>Write in comment if you have tested your patch. Do not rely much on <command>TravisCI</command>.</para>
-</listitem>
-
-<listitem>
-<para>If you make an improvement, write about your motivation.</para>
-</listitem>
-
-<listitem>
-<para>Notify maintainers of the package. For example add to the message: <command>cc @jagajaga @domenkozar</command>.</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-</itemizedlist>
-</section>
-
-<section>
+  <itemizedlist>
+   <listitem>
+    <para>
+     Push your changes to your fork of nixpkgs.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Create pull request:
+     <itemizedlist>
+      <listitem>
+       <para>
+        Write the title in format <command>(pkg-name | nixos/&lt;module>):
+        improvement</command>.
+        <itemizedlist>
+         <listitem>
+          <para>
+           If you update the pkg, write versions <command>from -> to</command>.
+          </para>
+         </listitem>
+        </itemizedlist>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Write in comment if you have tested your patch. Do not rely much on
+        <command>TravisCI</command>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        If you make an improvement, write about your motivation.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Notify maintainers of the package. For example add to the message:
+        <command>cc @jagajaga @domenkozar</command>.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
+ <section>
   <title>Pull Request Template</title>
+
   <para>
-    The pull request template helps determine what steps have been made for a
-    contribution so far, and will help guide maintainers on the status of a
-    change. The motivation section of the PR should include any extra details
-    the title does not address and link any existing issues related to the pull
-    request.
+   The pull request template helps determine what steps have been made for a
+   contribution so far, and will help guide maintainers on the status of a
+   change. The motivation section of the PR should include any extra details
+   the title does not address and link any existing issues related to the pull
+   request.
   </para>
-  <para>When a PR is created, it will be pre-populated with some checkboxes detailed below:
+
+  <para>
+   When a PR is created, it will be pre-populated with some checkboxes detailed
+   below:
   </para>
+
   <section>
-    <title>Tested using sandboxing</title>
-    <para>
-      When sandbox builds are enabled, Nix will setup an isolated environment
-      for each build process. It is used to remove further hidden dependencies
-      set by the build environment to improve reproducibility. This includes
-      access to the network during the build outside of
-      <function>fetch*</function> functions and files outside the Nix store.
-      Depending on the operating system access to other resources are blocked
-      as well (ex. inter process communication is isolated on Linux); see <link
+   <title>Tested using sandboxing</title>
+
+   <para>
+    When sandbox builds are enabled, Nix will setup an isolated environment for
+    each build process. It is used to remove further hidden dependencies set by
+    the build environment to improve reproducibility. This includes access to
+    the network during the build outside of <function>fetch*</function>
+    functions and files outside the Nix store. Depending on the operating
+    system access to other resources are blocked as well (ex. inter process
+    communication is isolated on Linux); see
+    <link
       xlink:href="https://nixos.org/nix/manual/#description-45">build-use-sandbox</link>
-      in Nix manual for details.
-    </para>
-    <para>
-      Sandboxing is not enabled by default in Nix due to a small performance
-      hit on each build.  In pull requests for <link
-        xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link> people
-      are asked to test builds with sandboxing enabled (see <literal>Tested
-        using sandboxing</literal> in the pull request template) because
-      in<link
+    in Nix manual for details.
+   </para>
+
+   <para>
+    Sandboxing is not enabled by default in Nix due to a small performance hit
+    on each build. In pull requests for
+    <link
+        xlink:href="https://github.com/NixOS/nixpkgs/">nixpkgs</link>
+    people are asked to test builds with sandboxing enabled (see
+    <literal>Tested using sandboxing</literal> in the pull request template)
+    because
+    in<link
         xlink:href="https://nixos.org/hydra/">https://nixos.org/hydra/</link>
-      sandboxing is also used.
-    </para>
-    <para>
-      Depending if you use NixOS or other platforms you can use one of the
-      following methods to enable sandboxing <emphasis role="bold">before</emphasis> building the package:
-      <itemizedlist>
-        <listitem>
-          <para>
-            <emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>:
-            add the following to 
-            <filename>configuration.nix</filename>
-            <screen>nix.useSandbox = true;</screen>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <emphasis role="bold">Globally enable sandboxing on non-NixOS platforms</emphasis>:
-            add the following to: <filename>/etc/nix/nix.conf</filename>
-            <screen>build-use-sandbox = true</screen>
-          </para>
-        </listitem>
-      </itemizedlist>
-    </para>
-    
+    sandboxing is also used.
+   </para>
+
+   <para>
+    Depending if you use NixOS or other platforms you can use one of the
+    following methods to enable sandboxing
+    <emphasis role="bold">before</emphasis> building the package:
+    <itemizedlist>
+     <listitem>
+      <para>
+       <emphasis role="bold">Globally enable sandboxing on NixOS</emphasis>:
+       add the following to <filename>configuration.nix</filename>
+<screen>nix.useSandbox = true;</screen>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       <emphasis role="bold">Globally enable sandboxing on non-NixOS
+       platforms</emphasis>: add the following to:
+       <filename>/etc/nix/nix.conf</filename>
+<screen>build-use-sandbox = true</screen>
+      </para>
+     </listitem>
+    </itemizedlist>
+   </para>
   </section>
+
   <section>
-    <title>Built on platform(s)</title>
-    <para>
-      Many Nix packages are designed to run on multiple
-      platforms. As such, it's important to let the maintainer know which
-      platforms your changes have been tested on. It's not always practical to
-      test a change on all platforms, and is not required for a pull request to
-      be merged. Only check the systems you tested the build on in this
-      section.
-    </para>
+   <title>Built on platform(s)</title>
+
+   <para>
+    Many Nix packages are designed to run on multiple platforms. As such, it's
+    important to let the maintainer know which platforms your changes have been
+    tested on. It's not always practical to test a change on all platforms, and
+    is not required for a pull request to be merged. Only check the systems you
+    tested the build on in this section.
+   </para>
   </section>
+
   <section>
-    <title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title>
-    <para>
-      Packages with automated tests are much more likely to be merged in a
-      timely fashion because it doesn't require as much manual testing by the
-      maintainer to verify the functionality of the package. If there are
-      existing tests for the package, they should be run to verify your changes
-      do not break the tests. Tests only apply to packages with NixOS modules
-      defined and can only be run on Linux. For more details on writing and
-      running tests, see the <link
+   <title>Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)</title>
+
+   <para>
+    Packages with automated tests are much more likely to be merged in a timely
+    fashion because it doesn't require as much manual testing by the maintainer
+    to verify the functionality of the package. If there are existing tests for
+    the package, they should be run to verify your changes do not break the
+    tests. Tests only apply to packages with NixOS modules defined and can only
+    be run on Linux. For more details on writing and running tests, see the
+    <link
         xlink:href="https://nixos.org/nixos/manual/index.html#sec-nixos-tests">section
-        in the NixOS manual</link>.
-    </para>
+    in the NixOS manual</link>.
+   </para>
   </section>
+
   <section>
-    <title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title>
-    <para>
-      If you are updating a package's version, you can use nox to make sure all
-      packages that depend on the updated package still compile correctly. This
-      can be done using the nox utility. The <command>nox-review</command>
-      utility can look for and build all dependencies either based on
-      uncommited changes with the <literal>wip</literal> option or specifying a
-      github pull request number.
-    </para>
-    <para>
-      review uncommitted changes:
-      <screen>nix-shell -p nox --run "nox-review wip"</screen>
-    </para>
-    <para>
-      review changes from pull request number 12345:
-      <screen>nix-shell -p nox --run "nox-review pr 12345"</screen>
-    </para>
+   <title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title>
+
+   <para>
+    If you are updating a package's version, you can use nox to make sure all
+    packages that depend on the updated package still compile correctly. This
+    can be done using the nox utility. The <command>nox-review</command>
+    utility can look for and build all dependencies either based on uncommited
+    changes with the <literal>wip</literal> option or specifying a github pull
+    request number.
+   </para>
+
+   <para>
+    review uncommitted changes:
+<screen>nix-shell -p nox --run "nox-review wip"</screen>
+   </para>
+
+   <para>
+    review changes from pull request number 12345:
+<screen>nix-shell -p nox --run "nox-review pr 12345"</screen>
+   </para>
   </section>
+
   <section>
-    <title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title>
-    <para>
-      It's important to test any executables generated by a build when you
-      change or create a package in nixpkgs. This can be done by looking in
-      <filename>./result/bin</filename> and running any files in there, or at a
-      minimum, the main executable for the package. For example, if you make a change
-      to <package>texlive</package>, you probably would only check the binaries
-      associated with the change you made rather than testing all of them.
-    </para>
+   <title>Tested execution of all binary files (usually in <filename>./result/bin/</filename>)</title>
+
+   <para>
+    It's important to test any executables generated by a build when you change
+    or create a package in nixpkgs. This can be done by looking in
+    <filename>./result/bin</filename> and running any files in there, or at a
+    minimum, the main executable for the package. For example, if you make a
+    change to <package>texlive</package>, you probably would only check the
+    binaries associated with the change you made rather than testing all of
+    them.
+   </para>
   </section>
+
   <section>
-    <title>Meets nixpkgs contribution standards</title>
-    <para>
-      The last checkbox is fits <link
+   <title>Meets nixpkgs contribution standards</title>
+
+   <para>
+    The last checkbox is fits
+    <link
         xlink:href="https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md">CONTRIBUTING.md</link>.
-      The contributing document has detailed information on standards the Nix
-      community has for commit messages, reviews, licensing of contributions
-      you make to the project, etc... Everyone should read and understand the
-      standards the community has for contributing before submitting a pull
-      request.
-    </para>
-    
+    The contributing document has detailed information on standards the Nix
+    community has for commit messages, reviews, licensing of contributions you
+    make to the project, etc... Everyone should read and understand the
+    standards the community has for contributing before submitting a pull
+    request.
+   </para>
   </section>
-</section>
-
-<section>
-<title>Hotfixing pull requests</title>
-
-<itemizedlist>
-<listitem>
-<para>Make the appropriate changes in you branch.</para>
-</listitem>
-
-<listitem>
-<para>Don't create additional commits, do
-
-<itemizedlist>
-<listitem>
-<para><command>git rebase -i</command></para>
-</listitem>
-<listitem>
-<para>
-<command>git push --force</command> to your branch.</para>
-</listitem>
-</itemizedlist>
-</para>
-</listitem>
-
-</itemizedlist>
-</section>
-
-<section>
-<title>Commit policy</title>
-
-<itemizedlist>
-<listitem>
-<para>Commits must be sufficiently tested before being merged, both for the master and staging branches.</para>
-</listitem>
-
-<listitem>
-<para>Hydra builds for master and staging should not be used as testing platform, it's a build farm for changes that have been already tested.</para>
-</listitem>
-
-<listitem>
-<para>When changing the bootloader installation process, extra care must be taken. Grub installations cannot be rolled back, hence changes may break people's installations forever. For any non-trivial change to the bootloader please file a PR asking for review, especially from @edolstra.</para>
-</listitem>
-</itemizedlist>
-
-<section>
-  <title>Master branch</title>
+ </section>
+ <section>
+  <title>Hotfixing pull requests</title>
 
   <itemizedlist>
-    <listitem>
-      <para>
-        It should only see non-breaking commits that do not cause mass rebuilds.
-      </para>
-    </listitem>
+   <listitem>
+    <para>
+     Make the appropriate changes in you branch.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Don't create additional commits, do
+     <itemizedlist>
+      <listitem>
+       <para>
+        <command>git rebase -i</command>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <command>git push --force</command> to your branch.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </para>
+   </listitem>
   </itemizedlist>
-</section>
-
-<section>
-  <title>Staging branch</title>
+ </section>
+ <section>
+  <title>Commit policy</title>
 
   <itemizedlist>
-    <listitem>
-      <para>
-        It's only for non-breaking mass-rebuild commits. That means it's not to
-        be used for testing, and changes must have been well tested already.
-        <link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read policy here</link>.
-      </para>
-    </listitem>
-    <listitem>
-      <para>
-        If the branch is already in a broken state, please refrain from adding
-        extra new breakages. Stabilize it for a few days, merge into master,
-        then resume development on staging.
-        <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep an eye on the staging evaluations here</link>.
-        If any fixes for staging happen to be already in master, then master can
-        be merged into staging.
-      </para>
-    </listitem>
+   <listitem>
+    <para>
+     Commits must be sufficiently tested before being merged, both for the
+     master and staging branches.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Hydra builds for master and staging should not be used as testing
+     platform, it's a build farm for changes that have been already tested.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     When changing the bootloader installation process, extra care must be
+     taken. Grub installations cannot be rolled back, hence changes may break
+     people's installations forever. For any non-trivial change to the
+     bootloader please file a PR asking for review, especially from @edolstra.
+    </para>
+   </listitem>
   </itemizedlist>
-</section>
 
-<section>
-  <title>Stable release branches</title>
+  <section>
+   <title>Master branch</title>
 
-  <itemizedlist>
+   <itemizedlist>
     <listitem>
-      <para>
-        If you're cherry-picking a commit to a stable release branch, always use
-        <command>git cherry-pick -xe</command> and ensure the message contains a
-        clear description about why this needs to be included in the stable
-        branch.
-      </para>
-      <para>An example of a cherry-picked commit would look like this:</para>
-      <screen>
+     <para>
+      It should only see non-breaking commits that do not cause mass rebuilds.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </section>
+
+  <section>
+   <title>Staging branch</title>
+
+   <itemizedlist>
+    <listitem>
+     <para>
+      It's only for non-breaking mass-rebuild commits. That means it's not to
+      be used for testing, and changes must have been well tested already.
+      <link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
+      policy here</link>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      If the branch is already in a broken state, please refrain from adding
+      extra new breakages. Stabilize it for a few days, merge into master, then
+      resume development on staging.
+      <link xlink:href="http://hydra.nixos.org/jobset/nixpkgs/staging#tabs-evaluations">Keep
+      an eye on the staging evaluations here</link>. If any fixes for staging
+      happen to be already in master, then master can be merged into staging.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </section>
+
+  <section>
+   <title>Stable release branches</title>
+
+   <itemizedlist>
+    <listitem>
+     <para>
+      If you're cherry-picking a commit to a stable release branch, always use
+      <command>git cherry-pick -xe</command> and ensure the message contains a
+      clear description about why this needs to be included in the stable
+      branch.
+     </para>
+     <para>
+      An example of a cherry-picked commit would look like this:
+     </para>
+<screen>
 nixos: Refactor the world.
 
 The original commit message describing the reason why the world was torn apart.
@@ -451,9 +517,7 @@ Reason: I just had a gut feeling that this would also be wanted by people from
 the stone age.
       </screen>
     </listitem>
-  </itemizedlist>
-</section>
-
-</section>
+   </itemizedlist>
+  </section>
+ </section>
 </chapter>
-

From eca5c99bf8a115ffd9513f91decc064a5bb3ff6d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 1 May 2018 19:57:09 -0400
Subject: [PATCH 0910/3370] nixos docs: format =)

---
 .../manual/administration/boot-problems.xml   |  136 +-
 .../manual/administration/cleaning-store.xml  |   65 +-
 .../administration/container-networking.xml   |   63 +-
 .../doc/manual/administration/containers.xml  |   56 +-
 .../manual/administration/control-groups.xml  |   80 +-
 .../administration/declarative-containers.xml |   68 +-
 .../administration/imperative-containers.xml  |  135 +-
 nixos/doc/manual/administration/logging.xml   |   51 +-
 .../administration/maintenance-mode.xml       |   16 +-
 .../administration/network-problems.xml       |   34 +-
 nixos/doc/manual/administration/rebooting.xml |   49 +-
 nixos/doc/manual/administration/rollback.xml  |   49 +-
 nixos/doc/manual/administration/running.xml   |   33 +-
 .../manual/administration/service-mgmt.xml    |   73 +-
 .../administration/store-corruption.xml       |   43 +-
 .../manual/administration/troubleshooting.xml |   22 +-
 .../manual/administration/user-sessions.xml   |   38 +-
 .../doc/manual/configuration/abstractions.xml |  104 +-
 .../configuration/ad-hoc-network-config.xml   |   18 +-
 .../manual/configuration/ad-hoc-packages.xml  |   74 +-
 .../configuration/adding-custom-packages.xml  |   59 +-
 .../doc/manual/configuration/config-file.xml  |  215 ++-
 .../manual/configuration/config-syntax.xml    |   38 +-
 .../manual/configuration/configuration.xml    |   44 +-
 .../configuration/customizing-packages.xml    |  125 +-
 .../configuration/declarative-packages.xml    |   48 +-
 .../doc/manual/configuration/file-systems.xml |   68 +-
 nixos/doc/manual/configuration/firewall.xml   |   49 +-
 .../doc/manual/configuration/ipv4-config.xml  |   46 +-
 .../doc/manual/configuration/ipv6-config.xml  |   43 +-
 .../doc/manual/configuration/linux-kernel.xml |   93 +-
 .../configuration/luks-file-systems.xml       |   30 +-
 nixos/doc/manual/configuration/modularity.xml |  140 +-
 .../manual/configuration/network-manager.xml  |   53 +-
 nixos/doc/manual/configuration/networking.xml |   27 +-
 .../doc/manual/configuration/package-mgmt.xml |   53 +-
 nixos/doc/manual/configuration/ssh.xml        |   27 +-
 nixos/doc/manual/configuration/summary.xml    |  369 +++---
 nixos/doc/manual/configuration/user-mgmt.xml  |  124 +-
 nixos/doc/manual/configuration/wireless.xml   |   50 +-
 nixos/doc/manual/configuration/x-windows.xml  |  159 ++-
 nixos/doc/manual/configuration/xfce.xml       |  116 +-
 nixos/doc/manual/development/assertions.xml   |   64 +-
 .../doc/manual/development/building-nixos.xml |   35 +-
 .../doc/manual/development/building-parts.xml |  157 ++-
 nixos/doc/manual/development/development.xml  |   31 +-
 .../manual/development/importing-modules.xml  |   23 +-
 .../manual/development/meta-attributes.xml    |   55 +-
 nixos/doc/manual/development/nixos-tests.xml  |   25 +-
 .../development/option-declarations.xml       |  257 ++--
 nixos/doc/manual/development/option-def.xml   |  105 +-
 nixos/doc/manual/development/option-types.xml |  995 ++++++++------
 nixos/doc/manual/development/releases.xml     |  448 +++----
 .../manual/development/replace-modules.xml    |   48 +-
 .../running-nixos-tests-interactively.xml     |   37 +-
 .../development/running-nixos-tests.xml       |   31 +-
 nixos/doc/manual/development/sources.xml      |  113 +-
 .../manual/development/testing-installer.xml  |   21 +-
 .../development/writing-documentation.xml     |  252 ++--
 .../manual/development/writing-modules.xml    |  190 +--
 .../development/writing-nixos-tests.xml       |  588 +++++----
 .../manual/installation/changing-config.xml   |  131 +-
 .../doc/manual/installation/installation.xml  |   26 +-
 .../installing-from-other-distro.xml          |  577 ++++----
 .../manual/installation/installing-pxe.xml    |   74 +-
 .../manual/installation/installing-usb.xml    |   89 +-
 .../installing-virtualbox-guest.xml           |   96 +-
 nixos/doc/manual/installation/installing.xml  |  585 +++++----
 nixos/doc/manual/installation/obtaining.xml   |   84 +-
 nixos/doc/manual/installation/upgrading.xml   |  202 ++-
 nixos/doc/manual/man-configuration.xml        |   58 +-
 nixos/doc/manual/man-nixos-build-vms.xml      |  149 ++-
 nixos/doc/manual/man-nixos-enter.xml          |  194 +--
 .../doc/manual/man-nixos-generate-config.xml  |  289 ++--
 nixos/doc/manual/man-nixos-install.xml        |  381 +++---
 nixos/doc/manual/man-nixos-option.xml         |  189 ++-
 nixos/doc/manual/man-nixos-rebuild.xml        |  734 ++++++-----
 nixos/doc/manual/man-nixos-version.xml        |  171 +--
 nixos/doc/manual/man-pages.xml                |   45 +-
 nixos/doc/manual/manual.xml                   |   78 +-
 .../manual/release-notes/release-notes.xml    |   32 +-
 nixos/doc/manual/release-notes/rl-1310.xml    |    8 +-
 nixos/doc/manual/release-notes/rl-1404.xml    |  277 ++--
 nixos/doc/manual/release-notes/rl-1412.xml    |  618 ++++++---
 nixos/doc/manual/release-notes/rl-1509.xml    | 1021 +++++++++------
 nixos/doc/manual/release-notes/rl-1603.xml    |  840 +++++++-----
 nixos/doc/manual/release-notes/rl-1609.xml    |  374 +++---
 nixos/doc/manual/release-notes/rl-1703.xml    | 1063 +++++++++------
 nixos/doc/manual/release-notes/rl-1709.xml    | 1164 ++++++++++-------
 nixos/doc/manual/release-notes/rl-1803.xml    | 1163 ++++++++++------
 nixos/doc/manual/release-notes/rl-1809.xml    |  187 +--
 91 files changed, 9705 insertions(+), 7852 deletions(-)

diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml
index be6ff3aac0fe..5f05ad261ef3 100644
--- a/nixos/doc/manual/administration/boot-problems.xml
+++ b/nixos/doc/manual/administration/boot-problems.xml
@@ -3,63 +3,83 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-boot-problems">
+ <title>Boot Problems</title>
 
-<title>Boot Problems</title>
+ <para>
+  If NixOS fails to boot, there are a number of kernel command line parameters
+  that may help you to identify or fix the issue. You can add these parameters
+  in the GRUB boot menu by pressing “e” to modify the selected boot entry
+  and editing the line starting with <literal>linux</literal>. The following
+  are some useful kernel command line parameters that are recognised by the
+  NixOS boot scripts or by systemd:
+  <variablelist>
+   <varlistentry>
+    <term><literal>boot.shell_on_fail</literal>
+    </term>
+    <listitem>
+     <para>
+      Start a root shell if something goes wrong in stage 1 of the boot process
+      (the initial ramdisk). This is disabled by default because there is no
+      authentication for the root shell.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>boot.debug1</literal>
+    </term>
+    <listitem>
+     <para>
+      Start an interactive shell in stage 1 before anything useful has been
+      done. That is, no modules have been loaded and no file systems have been
+      mounted, except for <filename>/proc</filename> and
+      <filename>/sys</filename>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>boot.trace</literal>
+    </term>
+    <listitem>
+     <para>
+      Print every shell command executed by the stage 1 and 2 boot scripts.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>single</literal>
+    </term>
+    <listitem>
+     <para>
+      Boot into rescue mode (a.k.a. single user mode). This will cause systemd
+      to start nothing but the unit <literal>rescue.target</literal>, which
+      runs <command>sulogin</command> to prompt for the root password and start
+      a root login shell. Exiting the shell causes the system to continue with
+      the normal boot process.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><literal>systemd.log_level=debug systemd.log_target=console</literal>
+    </term>
+    <listitem>
+     <para>
+      Make systemd very verbose and send log messages to the console instead of
+      the journal.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+  For more parameters recognised by systemd, see <citerefentry>
+  <refentrytitle>systemd</refentrytitle>
+  <manvolnum>1</manvolnum></citerefentry>.
+ </para>
 
-<para>If NixOS fails to boot, there are a number of kernel command
-line parameters that may help you to identify or fix the issue.  You
-can add these parameters in the GRUB boot menu by pressing “e” to
-modify the selected boot entry and editing the line starting with
-<literal>linux</literal>.  The following are some useful kernel command
-line parameters that are recognised by the NixOS boot scripts or by
-systemd:
-
-<variablelist>
-
-  <varlistentry><term><literal>boot.shell_on_fail</literal></term>
-    <listitem><para>Start a root shell if something goes wrong in
-    stage 1 of the boot process (the initial ramdisk).  This is
-    disabled by default because there is no authentication for the
-    root shell.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>boot.debug1</literal></term>
-    <listitem><para>Start an interactive shell in stage 1 before
-    anything useful has been done.  That is, no modules have been
-    loaded and no file systems have been mounted, except for
-    <filename>/proc</filename> and
-    <filename>/sys</filename>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>boot.trace</literal></term>
-    <listitem><para>Print every shell command executed by the stage 1
-    and 2 boot scripts.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>single</literal></term>
-    <listitem><para>Boot into rescue mode (a.k.a. single user mode).
-    This will cause systemd to start nothing but the unit
-    <literal>rescue.target</literal>, which runs
-    <command>sulogin</command> to prompt for the root password and
-    start a root login shell.  Exiting the shell causes the system to
-    continue with the normal boot process.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>systemd.log_level=debug systemd.log_target=console</literal></term>
-    <listitem><para>Make systemd very verbose and send log messages to
-    the console instead of the journal.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-For more parameters recognised by systemd, see
-<citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>.</para>
-
-<para>If no login prompts or X11 login screens appear (e.g. due to
-hanging dependencies), you can press Alt+ArrowUp.  If you’re lucky,
-this will start rescue mode (described above).  (Also note that since
-most units have a 90-second timeout before systemd gives up on them,
-the <command>agetty</command> login prompts should appear eventually
-unless something is very wrong.)</para>
-
-</section>
\ No newline at end of file
+ <para>
+  If no login prompts or X11 login screens appear (e.g. due to hanging
+  dependencies), you can press Alt+ArrowUp. If you’re lucky, this will start
+  rescue mode (described above). (Also note that since most units have a
+  90-second timeout before systemd gives up on them, the
+  <command>agetty</command> login prompts should appear eventually unless
+  something is very wrong.)
+ </para>
+</section>
diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml
index 52512b8f1270..ee201982a40b 100644
--- a/nixos/doc/manual/administration/cleaning-store.xml
+++ b/nixos/doc/manual/administration/cleaning-store.xml
@@ -3,60 +3,51 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-nix-gc">
-
-<title>Cleaning the Nix Store</title>
-
-<para>Nix has a purely functional model, meaning that packages are
-never upgraded in place.  Instead new versions of packages end up in a
-different location in the Nix store (<filename>/nix/store</filename>).
-You should periodically run Nix’s <emphasis>garbage
-collector</emphasis> to remove old, unreferenced packages.  This is
-easy:
-
+ <title>Cleaning the Nix Store</title>
+ <para>
+  Nix has a purely functional model, meaning that packages are never upgraded
+  in place. Instead new versions of packages end up in a different location in
+  the Nix store (<filename>/nix/store</filename>). You should periodically run
+  Nix’s <emphasis>garbage collector</emphasis> to remove old, unreferenced
+  packages. This is easy:
 <screen>
 $ nix-collect-garbage
 </screen>
-
-Alternatively, you can use a systemd unit that does the same in the
-background:
-
+  Alternatively, you can use a systemd unit that does the same in the
+  background:
 <screen>
 # systemctl start nix-gc.service
 </screen>
-
-You can tell NixOS in <filename>configuration.nix</filename> to run
-this unit automatically at certain points in time, for instance, every
-night at 03:15:
-
+  You can tell NixOS in <filename>configuration.nix</filename> to run this unit
+  automatically at certain points in time, for instance, every night at 03:15:
 <programlisting>
 <xref linkend="opt-nix.gc.automatic"/> = true;
 <xref linkend="opt-nix.gc.dates"/> = "03:15";
 </programlisting>
-
-</para>
-
-<para>The commands above do not remove garbage collector roots, such
-as old system configurations.  Thus they do not remove the ability to
-roll back to previous configurations.  The following command deletes
-old roots, removing the ability to roll back to them:
+ </para>
+ <para>
+  The commands above do not remove garbage collector roots, such as old system
+  configurations. Thus they do not remove the ability to roll back to previous
+  configurations. The following command deletes old roots, removing the ability
+  to roll back to them:
 <screen>
 $ nix-collect-garbage -d
 </screen>
-You can also do this for specific profiles, e.g.
+  You can also do this for specific profiles, e.g.
 <screen>
 $ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old
 </screen>
-Note that NixOS system configurations are stored in the profile
-<filename>/nix/var/nix/profiles/system</filename>.</para>
-
-<para>Another way to reclaim disk space (often as much as 40% of the
-size of the Nix store) is to run Nix’s store optimiser, which seeks
-out identical files in the store and replaces them with hard links to
-a single copy.
+  Note that NixOS system configurations are stored in the profile
+  <filename>/nix/var/nix/profiles/system</filename>.
+ </para>
+ <para>
+  Another way to reclaim disk space (often as much as 40% of the size of the
+  Nix store) is to run Nix’s store optimiser, which seeks out identical files
+  in the store and replaces them with hard links to a single copy.
 <screen>
 $ nix-store --optimise
 </screen>
-Since this command needs to read the entire Nix store, it can take
-quite a while to finish.</para>
-
+  Since this command needs to read the entire Nix store, it can take quite a
+  while to finish.
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml
index 2fc353059dfc..4b977d1d82eb 100644
--- a/nixos/doc/manual/administration/container-networking.xml
+++ b/nixos/doc/manual/administration/container-networking.xml
@@ -3,15 +3,13 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           version="5.0"
           xml:id="sec-container-networking">
+ <title>Container Networking</title>
 
-
-<title>Container Networking</title>
-
-<para>When you create a container using <literal>nixos-container
-create</literal>, it gets it own private IPv4 address in the range
-<literal>10.233.0.0/16</literal>. You can get the container’s IPv4
-address as follows:
-
+ <para>
+  When you create a container using <literal>nixos-container create</literal>,
+  it gets it own private IPv4 address in the range
+  <literal>10.233.0.0/16</literal>. You can get the container’s IPv4 address
+  as follows:
 <screen>
 # nixos-container show-ip foo
 10.233.4.2
@@ -19,40 +17,39 @@ address as follows:
 $ ping -c1 10.233.4.2
 64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms
 </screen>
+ </para>
 
-</para>
-
-<para>Networking is implemented using a pair of virtual Ethernet
-devices. The network interface in the container is called
-<literal>eth0</literal>, while the matching interface in the host is
-called <literal>ve-<replaceable>container-name</replaceable></literal>
-(e.g., <literal>ve-foo</literal>).  The container has its own network
-namespace and the <literal>CAP_NET_ADMIN</literal> capability, so it
-can perform arbitrary network configuration such as setting up
-firewall rules, without affecting or having access to the host’s
-network.</para>
-
-<para>By default, containers cannot talk to the outside network. If
-you want that, you should set up Network Address Translation (NAT)
-rules on the host to rewrite container traffic to use your external
-IP address. This can be accomplished using the following configuration
-on the host:
+ <para>
+  Networking is implemented using a pair of virtual Ethernet devices. The
+  network interface in the container is called <literal>eth0</literal>, while
+  the matching interface in the host is called
+  <literal>ve-<replaceable>container-name</replaceable></literal> (e.g.,
+  <literal>ve-foo</literal>). The container has its own network namespace and
+  the <literal>CAP_NET_ADMIN</literal> capability, so it can perform arbitrary
+  network configuration such as setting up firewall rules, without affecting or
+  having access to the host’s network.
+ </para>
 
+ <para>
+  By default, containers cannot talk to the outside network. If you want that,
+  you should set up Network Address Translation (NAT) rules on the host to
+  rewrite container traffic to use your external IP address. This can be
+  accomplished using the following configuration on the host:
 <programlisting>
 <xref linkend="opt-networking.nat.enable"/> = true;
 <xref linkend="opt-networking.nat.internalInterfaces"/> = ["ve-+"];
 <xref linkend="opt-networking.nat.externalInterface"/> = "eth0";
 </programlisting>
-where <literal>eth0</literal> should be replaced with the desired
-external interface. Note that <literal>ve-+</literal> is a wildcard
-that matches all container interfaces.</para>
-
-<para>If you are using Network Manager, you need to explicitly prevent
-it from managing container interfaces:
+  where <literal>eth0</literal> should be replaced with the desired external
+  interface. Note that <literal>ve-+</literal> is a wildcard that matches all
+  container interfaces.
+ </para>
 
+ <para>
+  If you are using Network Manager, you need to explicitly prevent it from
+  managing container interfaces:
 <programlisting>
 networking.networkmanager.unmanaged = [ "interface-name:ve-*" ];
 </programlisting>
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml
index 4cd2c8ae5563..0d3355e56a58 100644
--- a/nixos/doc/manual/administration/containers.xml
+++ b/nixos/doc/manual/administration/containers.xml
@@ -3,32 +3,32 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="ch-containers">
-
-<title>Container Management</title>
-
-<para>NixOS allows you to easily run other NixOS instances as
-<emphasis>containers</emphasis>. Containers are a light-weight
-approach to virtualisation that runs software in the container at the
-same speed as in the host system. NixOS containers share the Nix store
-of the host, making container creation very efficient.</para>
-
-<warning><para>Currently, NixOS containers are not perfectly isolated
-from the host system. This means that a user with root access to the
-container can do things that affect the host. So you should not give
-container root access to untrusted users.</para></warning>
-
-<para>NixOS containers can be created in two ways: imperatively, using
-the command <command>nixos-container</command>, and declaratively, by
-specifying them in your <filename>configuration.nix</filename>. The
-declarative approach implies that containers get upgraded along with
-your host system when you run <command>nixos-rebuild</command>, which
-is often not what you want. By contrast, in the imperative approach,
-containers are configured and updated independently from the host
-system.</para>
-
-<xi:include href="imperative-containers.xml" />
-<xi:include href="declarative-containers.xml" />
-<xi:include href="container-networking.xml" />
-
+ <title>Container Management</title>
+ <para>
+  NixOS allows you to easily run other NixOS instances as
+  <emphasis>containers</emphasis>. Containers are a light-weight approach to
+  virtualisation that runs software in the container at the same speed as in
+  the host system. NixOS containers share the Nix store of the host, making
+  container creation very efficient.
+ </para>
+ <warning>
+  <para>
+   Currently, NixOS containers are not perfectly isolated from the host system.
+   This means that a user with root access to the container can do things that
+   affect the host. So you should not give container root access to untrusted
+   users.
+  </para>
+ </warning>
+ <para>
+  NixOS containers can be created in two ways: imperatively, using the command
+  <command>nixos-container</command>, and declaratively, by specifying them in
+  your <filename>configuration.nix</filename>. The declarative approach implies
+  that containers get upgraded along with your host system when you run
+  <command>nixos-rebuild</command>, which is often not what you want. By
+  contrast, in the imperative approach, containers are configured and updated
+  independently from the host system.
+ </para>
+ <xi:include href="imperative-containers.xml" />
+ <xi:include href="declarative-containers.xml" />
+ <xi:include href="container-networking.xml" />
 </chapter>
-
diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml
index 03db40a3bc52..bb8b7f83d9e0 100644
--- a/nixos/doc/manual/administration/control-groups.xml
+++ b/nixos/doc/manual/administration/control-groups.xml
@@ -3,20 +3,18 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-cgroups">
-
-<title>Control Groups</title>
-
-<para>To keep track of the processes in a running system, systemd uses
-<emphasis>control groups</emphasis> (cgroups).  A control group is a
-set of processes used to allocate resources such as CPU, memory or I/O
-bandwidth.  There can be multiple control group hierarchies, allowing
-each kind of resource to be managed independently.</para>
-
-<para>The command <command>systemd-cgls</command> lists all control
-groups in the <literal>systemd</literal> hierarchy, which is what
-systemd uses to keep track of the processes belonging to each service
-or user session:
-
+ <title>Control Groups</title>
+ <para>
+  To keep track of the processes in a running system, systemd uses
+  <emphasis>control groups</emphasis> (cgroups). A control group is a set of
+  processes used to allocate resources such as CPU, memory or I/O bandwidth.
+  There can be multiple control group hierarchies, allowing each kind of
+  resource to be managed independently.
+ </para>
+ <para>
+  The command <command>systemd-cgls</command> lists all control groups in the
+  <literal>systemd</literal> hierarchy, which is what systemd uses to keep
+  track of the processes belonging to each service or user session:
 <screen>
 $ systemd-cgls
 ├─user
@@ -34,40 +32,34 @@ $ systemd-cgls
   │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf
   └─ <replaceable>...</replaceable>
 </screen>
-
-Similarly, <command>systemd-cgls cpu</command> shows the cgroups in
-the CPU hierarchy, which allows per-cgroup CPU scheduling priorities.
-By default, every systemd service gets its own CPU cgroup, while all
-user sessions are in the top-level CPU cgroup.  This ensures, for
-instance, that a thousand run-away processes in the
-<literal>httpd.service</literal> cgroup cannot starve the CPU for one
-process in the <literal>postgresql.service</literal> cgroup.  (By
-contrast, it they were in the same cgroup, then the PostgreSQL process
-would get 1/1001 of the cgroup’s CPU time.)  You can limit a service’s
-CPU share in <filename>configuration.nix</filename>:
-
+  Similarly, <command>systemd-cgls cpu</command> shows the cgroups in the CPU
+  hierarchy, which allows per-cgroup CPU scheduling priorities. By default,
+  every systemd service gets its own CPU cgroup, while all user sessions are in
+  the top-level CPU cgroup. This ensures, for instance, that a thousand
+  run-away processes in the <literal>httpd.service</literal> cgroup cannot
+  starve the CPU for one process in the <literal>postgresql.service</literal>
+  cgroup. (By contrast, it they were in the same cgroup, then the PostgreSQL
+  process would get 1/1001 of the cgroup’s CPU time.) You can limit a
+  service’s CPU share in <filename>configuration.nix</filename>:
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.CPUShares = 512;
 </programlisting>
-
-By default, every cgroup has 1024 CPU shares, so this will halve the
-CPU allocation of the <literal>httpd.service</literal> cgroup.</para>
-
-<para>There also is a <literal>memory</literal> hierarchy that
-controls memory allocation limits; by default, all processes are in
-the top-level cgroup, so any service or session can exhaust all
-available memory.  Per-cgroup memory limits can be specified in
-<filename>configuration.nix</filename>; for instance, to limit
-<literal>httpd.service</literal> to 512 MiB of RAM (excluding swap):
-
+  By default, every cgroup has 1024 CPU shares, so this will halve the CPU
+  allocation of the <literal>httpd.service</literal> cgroup.
+ </para>
+ <para>
+  There also is a <literal>memory</literal> hierarchy that controls memory
+  allocation limits; by default, all processes are in the top-level cgroup, so
+  any service or session can exhaust all available memory. Per-cgroup memory
+  limits can be specified in <filename>configuration.nix</filename>; for
+  instance, to limit <literal>httpd.service</literal> to 512 MiB of RAM
+  (excluding swap):
 <programlisting>
 <link linkend="opt-systemd.services._name_.serviceConfig">systemd.services.httpd.serviceConfig</link>.MemoryLimit = "512M";
 </programlisting>
-
-</para>
-
-<para>The command <command>systemd-cgtop</command> shows a
-continuously updated list of all cgroups with their CPU and memory
-usage.</para>
-
+ </para>
+ <para>
+  The command <command>systemd-cgtop</command> shows a continuously updated
+  list of all cgroups with their CPU and memory usage.
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml
index 79b230e5fc7f..2a98fb126231 100644
--- a/nixos/doc/manual/administration/declarative-containers.xml
+++ b/nixos/doc/manual/administration/declarative-containers.xml
@@ -3,14 +3,13 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           version="5.0"
           xml:id="sec-declarative-containers">
+ <title>Declarative Container Specification</title>
 
-<title>Declarative Container Specification</title>
-
-<para>You can also specify containers and their configuration in the
-host’s <filename>configuration.nix</filename>.  For example, the
-following specifies that there shall be a container named
-<literal>database</literal> running PostgreSQL:
-
+ <para>
+  You can also specify containers and their configuration in the host’s
+  <filename>configuration.nix</filename>. For example, the following specifies
+  that there shall be a container named <literal>database</literal> running
+  PostgreSQL:
 <programlisting>
 containers.database =
   { config =
@@ -20,18 +19,18 @@ containers.database =
       };
   };
 </programlisting>
+  If you run <literal>nixos-rebuild switch</literal>, the container will be
+  built. If the container was already running, it will be updated in place,
+  without rebooting. The container can be configured to start automatically by
+  setting <literal>containers.database.autoStart = true</literal> in its
+  configuration.
+ </para>
 
-If you run <literal>nixos-rebuild switch</literal>, the container will
-be built. If the container was already running, it will be
-updated in place, without rebooting. The container can be configured to
-start automatically by setting <literal>containers.database.autoStart = true</literal>
-in its configuration.</para>
-
-<para>By default, declarative containers share the network namespace
-of the host, meaning that they can listen on (privileged)
-ports. However, they cannot change the network configuration. You can
-give a container its own network as follows:
-
+ <para>
+  By default, declarative containers share the network namespace of the host,
+  meaning that they can listen on (privileged) ports. However, they cannot
+  change the network configuration. You can give a container its own network as
+  follows:
 <programlisting>
 containers.database = {
   <link linkend="opt-containers._name_.privateNetwork">privateNetwork</link> = true;
@@ -39,22 +38,23 @@ containers.database = {
   <link linkend="opt-containers._name_.localAddress">localAddress</link> = "192.168.100.11";
 };
 </programlisting>
+  This gives the container a private virtual Ethernet interface with IP address
+  <literal>192.168.100.11</literal>, which is hooked up to a virtual Ethernet
+  interface on the host with IP address <literal>192.168.100.10</literal>. (See
+  the next section for details on container networking.)
+ </para>
 
-This gives the container a private virtual Ethernet interface with IP
-address <literal>192.168.100.11</literal>, which is hooked up to a
-virtual Ethernet interface on the host with IP address
-<literal>192.168.100.10</literal>. (See the next section for details
-on container networking.)</para>
-
-<para>To disable the container, just remove it from
-<filename>configuration.nix</filename> and run <literal>nixos-rebuild
-switch</literal>. Note that this will not delete the root directory of
-the container in <literal>/var/lib/containers</literal>. Containers can be
-destroyed using the imperative method: <literal>nixos-container destroy
- foo</literal>.</para>
-
-<para>Declarative containers can be started and stopped using the
-corresponding systemd service, e.g. <literal>systemctl start
-container@database</literal>.</para>
+ <para>
+  To disable the container, just remove it from
+  <filename>configuration.nix</filename> and run <literal>nixos-rebuild
+  switch</literal>. Note that this will not delete the root directory of the
+  container in <literal>/var/lib/containers</literal>. Containers can be
+  destroyed using the imperative method: <literal>nixos-container destroy
+  foo</literal>.
+ </para>
 
+ <para>
+  Declarative containers can be started and stopped using the corresponding
+  systemd service, e.g. <literal>systemctl start container@database</literal>.
+ </para>
 </section>
diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml
index d39ac7f8bef4..9cc7ca3e672a 100644
--- a/nixos/doc/manual/administration/imperative-containers.xml
+++ b/nixos/doc/manual/administration/imperative-containers.xml
@@ -3,101 +3,85 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           version="5.0"
           xml:id="sec-imperative-containers">
+ <title>Imperative Container Management</title>
 
-<title>Imperative Container Management</title>
-
-<para>We’ll cover imperative container management using
-<command>nixos-container</command> first.
-Be aware that container management is currently only possible
-as <literal>root</literal>.</para>
-
-<para>You create a container with
-identifier <literal>foo</literal> as follows:
+ <para>
+  We’ll cover imperative container management using
+  <command>nixos-container</command> first. Be aware that container management
+  is currently only possible as <literal>root</literal>.
+ </para>
 
+ <para>
+  You create a container with identifier <literal>foo</literal> as follows:
 <screen>
 # nixos-container create foo
 </screen>
-
-This creates the container’s root directory in
-<filename>/var/lib/containers/foo</filename> and a small configuration
-file in <filename>/etc/containers/foo.conf</filename>. It also builds
-the container’s initial system configuration and stores it in
-<filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You
-can modify the initial configuration of the container on the command
-line. For instance, to create a container that has
-<command>sshd</command> running, with the given public key for
-<literal>root</literal>:
-
+  This creates the container’s root directory in
+  <filename>/var/lib/containers/foo</filename> and a small configuration file
+  in <filename>/etc/containers/foo.conf</filename>. It also builds the
+  container’s initial system configuration and stores it in
+  <filename>/nix/var/nix/profiles/per-container/foo/system</filename>. You can
+  modify the initial configuration of the container on the command line. For
+  instance, to create a container that has <command>sshd</command> running,
+  with the given public key for <literal>root</literal>:
 <screen>
 # nixos-container create foo --config '
   <xref linkend="opt-services.openssh.enable"/> = true;
   <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.root.openssh.authorizedKeys.keys</link> = ["ssh-dss AAAAB3N…"];
 '
 </screen>
+ </para>
 
-</para>
-
-<para>Creating a container does not start it. To start the container,
-run:
-
+ <para>
+  Creating a container does not start it. To start the container, run:
 <screen>
 # nixos-container start foo
 </screen>
-
-This command will return as soon as the container has booted and has
-reached <literal>multi-user.target</literal>. On the host, the
-container runs within a systemd unit called
-<literal>container@<replaceable>container-name</replaceable>.service</literal>.
-Thus, if something went wrong, you can get status info using
-<command>systemctl</command>:
-
+  This command will return as soon as the container has booted and has reached
+  <literal>multi-user.target</literal>. On the host, the container runs within
+  a systemd unit called
+  <literal>container@<replaceable>container-name</replaceable>.service</literal>.
+  Thus, if something went wrong, you can get status info using
+  <command>systemctl</command>:
 <screen>
 # systemctl status container@foo
 </screen>
+ </para>
 
-</para>
-
-<para>If the container has started successfully, you can log in as
-root using the <command>root-login</command> operation:
-
+ <para>
+  If the container has started successfully, you can log in as root using the
+  <command>root-login</command> operation:
 <screen>
 # nixos-container root-login foo
 [root@foo:~]#
 </screen>
-
-Note that only root on the host can do this (since there is no
-authentication).  You can also get a regular login prompt using the
-<command>login</command> operation, which is available to all users on
-the host:
-
+  Note that only root on the host can do this (since there is no
+  authentication). You can also get a regular login prompt using the
+  <command>login</command> operation, which is available to all users on the
+  host:
 <screen>
 # nixos-container login foo
 foo login: alice
 Password: ***
 </screen>
-
-With <command>nixos-container run</command>, you can execute arbitrary
-commands in the container:
-
+  With <command>nixos-container run</command>, you can execute arbitrary
+  commands in the container:
 <screen>
 # nixos-container run foo -- uname -a
 Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux
 </screen>
+ </para>
 
-</para>
-
-<para>There are several ways to change the configuration of the
-container. First, on the host, you can edit
-<literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
-and run
-
+ <para>
+  There are several ways to change the configuration of the container. First,
+  on the host, you can edit
+  <literal>/var/lib/container/<replaceable>name</replaceable>/etc/nixos/configuration.nix</literal>,
+  and run
 <screen>
 # nixos-container update foo
 </screen>
-
-This will build and activate the new configuration. You can also
-specify a new configuration on the command line:
-
+  This will build and activate the new configuration. You can also specify a
+  new configuration on the command line:
 <screen>
 # nixos-container update foo --config '
   <xref linkend="opt-services.httpd.enable"/> = true;
@@ -108,26 +92,25 @@ specify a new configuration on the command line:
 # curl http://$(nixos-container show-ip foo)/
 &lt;!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">…
 </screen>
+  However, note that this will overwrite the container’s
+  <filename>/etc/nixos/configuration.nix</filename>.
+ </para>
 
-However, note that this will overwrite the container’s
-<filename>/etc/nixos/configuration.nix</filename>.</para>
-
-<para>Alternatively, you can change the configuration from within the
-container itself by running <command>nixos-rebuild switch</command>
-inside the container. Note that the container by default does not have
-a copy of the NixOS channel, so you should run <command>nix-channel
---update</command> first.</para>
-
-<para>Containers can be stopped and started using
-<literal>nixos-container stop</literal> and <literal>nixos-container
-start</literal>, respectively, or by using
-<command>systemctl</command> on the container’s service unit. To
-destroy a container, including its file system, do
+ <para>
+  Alternatively, you can change the configuration from within the container
+  itself by running <command>nixos-rebuild switch</command> inside the
+  container. Note that the container by default does not have a copy of the
+  NixOS channel, so you should run <command>nix-channel --update</command>
+  first.
+ </para>
 
+ <para>
+  Containers can be stopped and started using <literal>nixos-container
+  stop</literal> and <literal>nixos-container start</literal>, respectively, or
+  by using <command>systemctl</command> on the container’s service unit. To
+  destroy a container, including its file system, do
 <screen>
 # nixos-container destroy foo
 </screen>
-
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml
index 1d5df7770e29..a41936b373d6 100644
--- a/nixos/doc/manual/administration/logging.xml
+++ b/nixos/doc/manual/administration/logging.xml
@@ -3,26 +3,20 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-logging">
-
-<title>Logging</title>
-
-<para>System-wide logging is provided by systemd’s
-<emphasis>journal</emphasis>, which subsumes traditional logging
-daemons such as syslogd and klogd.  Log entries are kept in binary
-files in <filename>/var/log/journal/</filename>.  The command
-<literal>journalctl</literal> allows you to see the contents of the
-journal.  For example,
-
+ <title>Logging</title>
+ <para>
+  System-wide logging is provided by systemd’s <emphasis>journal</emphasis>,
+  which subsumes traditional logging daemons such as syslogd and klogd. Log
+  entries are kept in binary files in <filename>/var/log/journal/</filename>.
+  The command <literal>journalctl</literal> allows you to see the contents of
+  the journal. For example,
 <screen>
 $ journalctl -b
 </screen>
-
-shows all journal entries since the last reboot.  (The output of
-<command>journalctl</command> is piped into <command>less</command> by
-default.)  You can use various options and match operators to restrict
-output to messages of interest.  For instance, to get all messages
-from PostgreSQL:
-
+  shows all journal entries since the last reboot. (The output of
+  <command>journalctl</command> is piped into <command>less</command> by
+  default.) You can use various options and match operators to restrict output
+  to messages of interest. For instance, to get all messages from PostgreSQL:
 <screen>
 $ journalctl -u postgresql.service
 -- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. --
@@ -32,21 +26,18 @@ Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG:  database system is shut down
 Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG:  database system was shut down at 2013-01-07 15:44:14 CET
 Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG:  database system is ready to accept connections
 </screen>
-
-Or to get all messages since the last reboot that have at least a
-“critical” severity level:
-
+  Or to get all messages since the last reboot that have at least a
+  “critical” severity level:
 <screen>
 $ journalctl -b -p crit
 Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice]
 Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1)
 </screen>
-
-</para>
-
-<para>The system journal is readable by root and by users in the
-<literal>wheel</literal> and <literal>systemd-journal</literal>
-groups.  All users have a private journal that can be read using
-<command>journalctl</command>.</para>
-
-</chapter>
\ No newline at end of file
+ </para>
+ <para>
+  The system journal is readable by root and by users in the
+  <literal>wheel</literal> and <literal>systemd-journal</literal> groups. All
+  users have a private journal that can be read using
+  <command>journalctl</command>.
+ </para>
+</chapter>
diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml
index 17a1609e5579..71e3f9ea665d 100644
--- a/nixos/doc/manual/administration/maintenance-mode.xml
+++ b/nixos/doc/manual/administration/maintenance-mode.xml
@@ -3,16 +3,14 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-maintenance-mode">
+ <title>Maintenance Mode</title>
 
-<title>Maintenance Mode</title>
-
-<para>You can enter rescue mode by running:
-
+ <para>
+  You can enter rescue mode by running:
 <screen>
 # systemctl rescue</screen>
-
-This will eventually give you a single-user root shell.  Systemd will
-stop (almost) all system services.  To get out of maintenance mode,
-just exit from the rescue shell.</para>
-
+  This will eventually give you a single-user root shell. Systemd will stop
+  (almost) all system services. To get out of maintenance mode, just exit from
+  the rescue shell.
+ </para>
 </section>
diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml
index 91f9eb4e22c6..570f58358845 100644
--- a/nixos/doc/manual/administration/network-problems.xml
+++ b/nixos/doc/manual/administration/network-problems.xml
@@ -3,31 +3,25 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-nix-network-issues">
+ <title>Network Problems</title>
 
-<title>Network Problems</title>
-
-<para>Nix uses a so-called <emphasis>binary cache</emphasis> to
-optimise building a package from source into downloading it as a
-pre-built binary.  That is, whenever a command like
-<command>nixos-rebuild</command> needs a path in the Nix store, Nix
-will try to download that path from the Internet rather than build it
-from source.  The default binary cache is
-<uri>https://cache.nixos.org/</uri>.  If this cache is unreachable,
-Nix operations may take a long time due to HTTP connection timeouts.
-You can disable the use of the binary cache by adding <option>--option
-use-binary-caches false</option>, e.g.
-
+ <para>
+  Nix uses a so-called <emphasis>binary cache</emphasis> to optimise building a
+  package from source into downloading it as a pre-built binary. That is,
+  whenever a command like <command>nixos-rebuild</command> needs a path in the
+  Nix store, Nix will try to download that path from the Internet rather than
+  build it from source. The default binary cache is
+  <uri>https://cache.nixos.org/</uri>. If this cache is unreachable, Nix
+  operations may take a long time due to HTTP connection timeouts. You can
+  disable the use of the binary cache by adding <option>--option
+  use-binary-caches false</option>, e.g.
 <screen>
 # nixos-rebuild switch --option use-binary-caches false
 </screen>
-
-If you have an alternative binary cache at your disposal, you can use
-it instead:
-
+  If you have an alternative binary cache at your disposal, you can use it
+  instead:
 <screen>
 # nixos-rebuild switch --option binary-caches http://my-cache.example.org/
 </screen>
-
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml
index 23f3a3219c6a..a5abd6f02588 100644
--- a/nixos/doc/manual/administration/rebooting.xml
+++ b/nixos/doc/manual/administration/rebooting.xml
@@ -3,42 +3,33 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-rebooting">
-
-<title>Rebooting and Shutting Down</title>
-
-<para>The system can be shut down (and automatically powered off) by
-doing:
-
+ <title>Rebooting and Shutting Down</title>
+ <para>
+  The system can be shut down (and automatically powered off) by doing:
 <screen>
 # shutdown
 </screen>
-
-This is equivalent to running <command>systemctl
-poweroff</command>.</para>
-
-<para>To reboot the system, run
-
+  This is equivalent to running <command>systemctl poweroff</command>.
+ </para>
+ <para>
+  To reboot the system, run
 <screen>
 # reboot
 </screen>
-
-which is equivalent to <command>systemctl reboot</command>.
-Alternatively, you can quickly reboot the system using
-<literal>kexec</literal>, which bypasses the BIOS by directly loading
-the new kernel into memory:
-
+  which is equivalent to <command>systemctl reboot</command>. Alternatively,
+  you can quickly reboot the system using <literal>kexec</literal>, which
+  bypasses the BIOS by directly loading the new kernel into memory:
 <screen>
 # systemctl kexec
 </screen>
-
-</para>
-
-<para>The machine can be suspended to RAM (if supported) using
-<command>systemctl suspend</command>, and suspended to disk using
-<command>systemctl hibernate</command>.</para>
-
-<para>These commands can be run by any user who is logged in locally,
-i.e. on a virtual console or in X11; otherwise, the user is asked for
-authentication.</para>
-
+ </para>
+ <para>
+  The machine can be suspended to RAM (if supported) using <command>systemctl
+  suspend</command>, and suspended to disk using <command>systemctl
+  hibernate</command>.
+ </para>
+ <para>
+  These commands can be run by any user who is logged in locally, i.e. on a
+  virtual console or in X11; otherwise, the user is asked for authentication.
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml
index ae621f33de2c..07c6acaa469c 100644
--- a/nixos/doc/manual/administration/rollback.xml
+++ b/nixos/doc/manual/administration/rollback.xml
@@ -3,46 +3,39 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-rollback">
+ <title>Rolling Back Configuration Changes</title>
 
-<title>Rolling Back Configuration Changes</title>
-
-<para>After running <command>nixos-rebuild</command> to switch to a
-new configuration, you may find that the new configuration doesn’t
-work very well.  In that case, there are several ways to return to a
-previous configuration.</para>
-
-<para>First, the GRUB boot manager allows you to boot into any
-previous configuration that hasn’t been garbage-collected.  These
-configurations can be found under the GRUB submenu “NixOS - All
-configurations”.  This is especially useful if the new configuration
-fails to boot.  After the system has booted, you can make the selected
-configuration the default for subsequent boots:
+ <para>
+  After running <command>nixos-rebuild</command> to switch to a new
+  configuration, you may find that the new configuration doesn’t work very
+  well. In that case, there are several ways to return to a previous
+  configuration.
+ </para>
 
+ <para>
+  First, the GRUB boot manager allows you to boot into any previous
+  configuration that hasn’t been garbage-collected. These configurations can
+  be found under the GRUB submenu “NixOS - All configurations”. This is
+  especially useful if the new configuration fails to boot. After the system
+  has booted, you can make the selected configuration the default for
+  subsequent boots:
 <screen>
 # /run/current-system/bin/switch-to-configuration boot</screen>
+ </para>
 
-</para>
-
-<para>Second, you can switch to the previous configuration in a running
-system:
-
+ <para>
+  Second, you can switch to the previous configuration in a running system:
 <screen>
 # nixos-rebuild switch --rollback</screen>
-
-This is equivalent to running:
-
+  This is equivalent to running:
 <screen>
 # /nix/var/nix/profiles/system-<replaceable>N</replaceable>-link/bin/switch-to-configuration switch</screen>
-
-where <replaceable>N</replaceable> is the number of the NixOS system
-configuration.  To get a list of the available configurations, do:
-
+  where <replaceable>N</replaceable> is the number of the NixOS system
+  configuration. To get a list of the available configurations, do:
 <screen>
 $ ls -l /nix/var/nix/profiles/system-*-link
 <replaceable>...</replaceable>
 lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055
 </screen>
-
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml
index 9091511ed527..786dd5e2390d 100644
--- a/nixos/doc/manual/administration/running.xml
+++ b/nixos/doc/manual/administration/running.xml
@@ -3,22 +3,19 @@
       xmlns:xi="http://www.w3.org/2001/XInclude"
       version="5.0"
       xml:id="ch-running">
-
-<title>Administration</title>
-
-<partintro>
-<para>This chapter describes various aspects of managing a running
-NixOS system, such as how to use the <command>systemd</command>
-service manager.</para>
-</partintro>
-
-<xi:include href="service-mgmt.xml" />
-<xi:include href="rebooting.xml" />
-<xi:include href="user-sessions.xml" />
-<xi:include href="control-groups.xml" />
-<xi:include href="logging.xml" />
-<xi:include href="cleaning-store.xml" />
-<xi:include href="containers.xml" />
-<xi:include href="troubleshooting.xml" />
-
+ <title>Administration</title>
+ <partintro>
+  <para>
+   This chapter describes various aspects of managing a running NixOS system,
+   such as how to use the <command>systemd</command> service manager.
+  </para>
+ </partintro>
+ <xi:include href="service-mgmt.xml" />
+ <xi:include href="rebooting.xml" />
+ <xi:include href="user-sessions.xml" />
+ <xi:include href="control-groups.xml" />
+ <xi:include href="logging.xml" />
+ <xi:include href="cleaning-store.xml" />
+ <xi:include href="containers.xml" />
+ <xi:include href="troubleshooting.xml" />
 </part>
diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml
index 1627c7a2fdeb..0c2085c81559 100644
--- a/nixos/doc/manual/administration/service-mgmt.xml
+++ b/nixos/doc/manual/administration/service-mgmt.xml
@@ -3,26 +3,23 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-systemctl">
-
-<title>Service Management</title>
-
-<para>In NixOS, all system services are started and monitored using
-the systemd program.  Systemd is the “init” process of the system
-(i.e. PID 1), the parent of all other processes.  It manages a set of
-so-called “units”, which can be things like system services
-(programs), but also mount points, swap files, devices, targets
-(groups of units) and more.  Units can have complex dependencies; for
-instance, one unit can require that another unit must be successfully
-started before the first unit can be started.  When the system boots,
-it starts a unit named <literal>default.target</literal>; the
-dependencies of this unit cause all system services to be started,
-file systems to be mounted, swap files to be activated, and so
-on.</para>
-
-<para>The command <command>systemctl</command> is the main way to
-interact with <command>systemd</command>.  Without any arguments, it
-shows the status of active units:
-
+ <title>Service Management</title>
+ <para>
+  In NixOS, all system services are started and monitored using the systemd
+  program. Systemd is the “init” process of the system (i.e. PID 1), the
+  parent of all other processes. It manages a set of so-called “units”,
+  which can be things like system services (programs), but also mount points,
+  swap files, devices, targets (groups of units) and more. Units can have
+  complex dependencies; for instance, one unit can require that another unit
+  must be successfully started before the first unit can be started. When the
+  system boots, it starts a unit named <literal>default.target</literal>; the
+  dependencies of this unit cause all system services to be started, file
+  systems to be mounted, swap files to be activated, and so on.
+ </para>
+ <para>
+  The command <command>systemctl</command> is the main way to interact with
+  <command>systemd</command>. Without any arguments, it shows the status of
+  active units:
 <screen>
 $ systemctl
 -.mount          loaded active mounted   /
@@ -31,12 +28,10 @@ sshd.service     loaded active running   SSH Daemon
 graphical.target loaded active active    Graphical Interface
 <replaceable>...</replaceable>
 </screen>
-
-</para>
-
-<para>You can ask for detailed status information about a unit, for
-instance, the PostgreSQL database service:
-
+ </para>
+ <para>
+  You can ask for detailed status information about a unit, for instance, the
+  PostgreSQL database service:
 <screen>
 $ systemctl status postgresql.service
 postgresql.service - PostgreSQL Server
@@ -56,28 +51,22 @@ Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG:  database system is ready to
 Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG:  autovacuum launcher started
 Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server.
 </screen>
-
-Note that this shows the status of the unit (active and running), all
-the processes belonging to the service, as well as the most recent log
-messages from the service.
-
-</para>
-
-<para>Units can be stopped, started or restarted:
-
+  Note that this shows the status of the unit (active and running), all the
+  processes belonging to the service, as well as the most recent log messages
+  from the service.
+ </para>
+ <para>
+  Units can be stopped, started or restarted:
 <screen>
 # systemctl stop postgresql.service
 # systemctl start postgresql.service
 # systemctl restart postgresql.service
 </screen>
-
-These operations are synchronous: they wait until the service has
-finished starting or stopping (or has failed).  Starting a unit will
-cause the dependencies of that unit to be started as well (if
-necessary).</para>
-
+  These operations are synchronous: they wait until the service has finished
+  starting or stopping (or has failed). Starting a unit will cause the
+  dependencies of that unit to be started as well (if necessary).
+ </para>
 <!-- - cgroups: each service and user session is a cgroup
 
 - cgroup resource management -->
-
 </chapter>
diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml
index 9f567042b727..a4ca3b651e20 100644
--- a/nixos/doc/manual/administration/store-corruption.xml
+++ b/nixos/doc/manual/administration/store-corruption.xml
@@ -3,35 +3,34 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-nix-store-corruption">
+ <title>Nix Store Corruption</title>
 
-<title>Nix Store Corruption</title>
-
-<para>After a system crash, it’s possible for files in the Nix store
-to become corrupted.  (For instance, the Ext4 file system has the
-tendency to replace un-synced files with zero bytes.)  NixOS tries
-hard to prevent this from happening: it performs a
-<command>sync</command> before switching to a new configuration, and
-Nix’s database is fully transactional.  If corruption still occurs,
-you may be able to fix it automatically.</para>
-
-<para>If the corruption is in a path in the closure of the NixOS
-system configuration, you can fix it by doing
+ <para>
+  After a system crash, it’s possible for files in the Nix store to become
+  corrupted. (For instance, the Ext4 file system has the tendency to replace
+  un-synced files with zero bytes.) NixOS tries hard to prevent this from
+  happening: it performs a <command>sync</command> before switching to a new
+  configuration, and Nix’s database is fully transactional. If corruption
+  still occurs, you may be able to fix it automatically.
+ </para>
 
+ <para>
+  If the corruption is in a path in the closure of the NixOS system
+  configuration, you can fix it by doing
 <screen>
 # nixos-rebuild switch --repair
 </screen>
+  This will cause Nix to check every path in the closure, and if its
+  cryptographic hash differs from the hash recorded in Nix’s database, the
+  path is rebuilt or redownloaded.
+ </para>
 
-This will cause Nix to check every path in the closure, and if its
-cryptographic hash differs from the hash recorded in Nix’s database,
-the path is rebuilt or redownloaded.</para>
-
-<para>You can also scan the entire Nix store for corrupt paths:
-
+ <para>
+  You can also scan the entire Nix store for corrupt paths:
 <screen>
 # nix-store --verify --check-contents --repair
 </screen>
-
-Any corrupt paths will be redownloaded if they’re available in a
-binary cache; otherwise, they cannot be repaired.</para>
-
+  Any corrupt paths will be redownloaded if they’re available in a binary
+  cache; otherwise, they cannot be repaired.
+ </para>
 </section>
diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml
index 351fb1883310..6496e7bde387 100644
--- a/nixos/doc/manual/administration/troubleshooting.xml
+++ b/nixos/doc/manual/administration/troubleshooting.xml
@@ -3,16 +3,14 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="ch-troubleshooting">
-
-<title>Troubleshooting</title>
-
-<para>This chapter describes solutions to common problems you might
-encounter when you manage your NixOS system.</para>
-
-<xi:include href="boot-problems.xml" />
-<xi:include href="maintenance-mode.xml" />
-<xi:include href="rollback.xml" />
-<xi:include href="store-corruption.xml" />
-<xi:include href="network-problems.xml" />
-
+ <title>Troubleshooting</title>
+ <para>
+  This chapter describes solutions to common problems you might encounter when
+  you manage your NixOS system.
+ </para>
+ <xi:include href="boot-problems.xml" />
+ <xi:include href="maintenance-mode.xml" />
+ <xi:include href="rollback.xml" />
+ <xi:include href="store-corruption.xml" />
+ <xi:include href="network-problems.xml" />
 </chapter>
diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml
index 0a7eb8cd123c..1d95cfb22b69 100644
--- a/nixos/doc/manual/administration/user-sessions.xml
+++ b/nixos/doc/manual/administration/user-sessions.xml
@@ -3,14 +3,12 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-user-sessions">
-
-<title>User Sessions</title>
-
-<para>Systemd keeps track of all users who are logged into the system
-(e.g. on a virtual console or remotely via SSH).  The command
-<command>loginctl</command> allows querying and manipulating user
-sessions.  For instance, to list all user sessions:
-
+ <title>User Sessions</title>
+ <para>
+  Systemd keeps track of all users who are logged into the system (e.g. on a
+  virtual console or remotely via SSH). The command <command>loginctl</command>
+  allows querying and manipulating user sessions. For instance, to list all
+  user sessions:
 <screen>
 $ loginctl
    SESSION        UID USER             SEAT
@@ -18,12 +16,10 @@ $ loginctl
         c3          0 root             seat0
         c4        500 alice
 </screen>
-
-This shows that two users are logged in locally, while another is
-logged in remotely.  (“Seats” are essentially the combinations of
-displays and input devices attached to the system; usually, there is
-only one seat.)  To get information about a session:
-
+  This shows that two users are logged in locally, while another is logged in
+  remotely. (“Seats” are essentially the combinations of displays and input
+  devices attached to the system; usually, there is only one seat.) To get
+  information about a session:
 <screen>
 $ loginctl session-status c3
 c3 - root (0)
@@ -38,16 +34,12 @@ c3 - root (0)
                   ├─10339 -bash
                   └─10355 w3m nixos.org
 </screen>
-
-This shows that the user is logged in on virtual console 3.  It also
-lists the processes belonging to this session.  Since systemd keeps
-track of this, you can terminate a session in a way that ensures that
-all the session’s processes are gone:
-
+  This shows that the user is logged in on virtual console 3. It also lists the
+  processes belonging to this session. Since systemd keeps track of this, you
+  can terminate a session in a way that ensures that all the session’s
+  processes are gone:
 <screen>
 # loginctl terminate-session c3
 </screen>
-
-</para>
-
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml
index f794085295cf..5bf0635cc1aa 100644
--- a/nixos/doc/manual/configuration/abstractions.xml
+++ b/nixos/doc/manual/configuration/abstractions.xml
@@ -3,12 +3,11 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-module-abstractions">
+ <title>Abstractions</title>
 
-<title>Abstractions</title>
-
-<para>If you find yourself repeating yourself over and over, it’s time
-to abstract.  Take, for instance, this Apache HTTP Server configuration:
-
+ <para>
+  If you find yourself repeating yourself over and over, it’s time to
+  abstract. Take, for instance, this Apache HTTP Server configuration:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -28,11 +27,9 @@ to abstract.  Take, for instance, this Apache HTTP Server configuration:
     ];
 }
 </programlisting>
-
-It defines two virtual hosts with nearly identical configuration; the
-only difference is that the second one has SSL enabled.  To prevent
-this duplication, we can use a <literal>let</literal>:
-
+  It defines two virtual hosts with nearly identical configuration; the only
+  difference is that the second one has SSL enabled. To prevent this
+  duplication, we can use a <literal>let</literal>:
 <programlisting>
 let
   exampleOrgCommon =
@@ -53,17 +50,16 @@ in
     ];
 }
 </programlisting>
+  The <literal>let exampleOrgCommon = <replaceable>...</replaceable></literal>
+  defines a variable named <literal>exampleOrgCommon</literal>. The
+  <literal>//</literal> operator merges two attribute sets, so the
+  configuration of the second virtual host is the set
+  <literal>exampleOrgCommon</literal> extended with the SSL options.
+ </para>
 
-The <literal>let exampleOrgCommon =
-<replaceable>...</replaceable></literal> defines a variable named
-<literal>exampleOrgCommon</literal>.  The <literal>//</literal>
-operator merges two attribute sets, so the configuration of the second
-virtual host is the set <literal>exampleOrgCommon</literal> extended
-with the SSL options.</para>
-
-<para>You can write a <literal>let</literal> wherever an expression is
-allowed.  Thus, you also could have written:
-
+ <para>
+  You can write a <literal>let</literal> wherever an expression is allowed.
+  Thus, you also could have written:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -73,17 +69,16 @@ allowed.  Thus, you also could have written:
     ];
 }
 </programlisting>
+  but not <literal>{ let exampleOrgCommon = <replaceable>...</replaceable>; in
+  <replaceable>...</replaceable>; }</literal> since attributes (as opposed to
+  attribute values) are not expressions.
+ </para>
 
-but not <literal>{ let exampleOrgCommon =
-<replaceable>...</replaceable>; in <replaceable>...</replaceable>;
-}</literal> since attributes (as opposed to attribute values) are not
-expressions.</para>
-
-<para><emphasis>Functions</emphasis> provide another method of
-abstraction.  For instance, suppose that we want to generate lots of
-different virtual hosts, all with identical configuration except for
-the host name.  This can be done as follows:
-
+ <para>
+  <emphasis>Functions</emphasis> provide another method of abstraction. For
+  instance, suppose that we want to generate lots of different virtual hosts,
+  all with identical configuration except for the host name. This can be done
+  as follows:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -101,16 +96,15 @@ the host name.  This can be done as follows:
       ];
 }
 </programlisting>
+  Here, <varname>makeVirtualHost</varname> is a function that takes a single
+  argument <literal>name</literal> and returns the configuration for a virtual
+  host. That function is then called for several names to produce the list of
+  virtual host configurations.
+ </para>
 
-Here, <varname>makeVirtualHost</varname> is a function that takes a
-single argument <literal>name</literal> and returns the configuration
-for a virtual host.  That function is then called for several names to
-produce the list of virtual host configurations.</para>
-
-<para>We can further improve on this by using the function
-<varname>map</varname>, which applies another function to every
-element in a list:
-
+ <para>
+  We can further improve on this by using the function <varname>map</varname>,
+  which applies another function to every element in a list:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -120,16 +114,15 @@ element in a list:
       [ "example.org" "example.com" "example.gov" "example.nl" ];
 }
 </programlisting>
+  (The function <literal>map</literal> is called a <emphasis>higher-order
+  function</emphasis> because it takes another function as an argument.)
+ </para>
 
-(The function <literal>map</literal> is called a
-<emphasis>higher-order function</emphasis> because it takes another
-function as an argument.)</para>
-
-<para>What if you need more than one argument, for instance, if we
-want to use a different <literal>documentRoot</literal> for each
-virtual host?  Then we can make <varname>makeVirtualHost</varname> a
-function that takes a <emphasis>set</emphasis> as its argument, like this:
-
+ <para>
+  What if you need more than one argument, for instance, if we want to use a
+  different <literal>documentRoot</literal> for each virtual host? Then we can
+  make <varname>makeVirtualHost</varname> a function that takes a
+  <emphasis>set</emphasis> as its argument, like this:
 <programlisting>
 {
   <xref linkend="opt-services.httpd.virtualHosts"/> =
@@ -147,10 +140,9 @@ function that takes a <emphasis>set</emphasis> as its argument, like this:
       ];
 }
 </programlisting>
-
-But in this case (where every root is a subdirectory of
-<filename>/sites</filename> named after the virtual host), it would
-have been shorter to define <varname>makeVirtualHost</varname> as
+  But in this case (where every root is a subdirectory of
+  <filename>/sites</filename> named after the virtual host), it would have been
+  shorter to define <varname>makeVirtualHost</varname> as
 <programlisting>
 makeVirtualHost = name:
   { hostName = name;
@@ -158,9 +150,7 @@ makeVirtualHost = name:
     adminAddr = "alice@example.org";
   };
 </programlisting>
-
-Here, the construct
-<literal>${<replaceable>...</replaceable>}</literal> allows the result
-of an expression to be spliced into a string.</para>
-
+  Here, the construct <literal>${<replaceable>...</replaceable>}</literal>
+  allows the result of an expression to be spliced into a string.
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
index c53b9598109c..00e595c7cb7f 100644
--- a/nixos/doc/manual/configuration/ad-hoc-network-config.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml
@@ -3,22 +3,18 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="ad-hoc-network-config">
+ <title>Ad-Hoc Configuration</title>
 
-<title>Ad-Hoc Configuration</title>
-
-<para>You can use <xref linkend="opt-networking.localCommands"/> to specify
-shell commands to be run at the end of
-<literal>network-setup.service</literal>.  This is useful for doing
-network configuration not covered by the existing NixOS modules.  For
-instance, to statically configure an IPv6 address:
-
+ <para>
+  You can use <xref linkend="opt-networking.localCommands"/> to specify shell
+  commands to be run at the end of <literal>network-setup.service</literal>.
+  This is useful for doing network configuration not covered by the existing
+  NixOS modules. For instance, to statically configure an IPv6 address:
 <programlisting>
 <xref linkend="opt-networking.localCommands"/> =
   ''
     ip -6 addr add 2001:610:685:1::1/64 dev eth0
   '';
 </programlisting>
-
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml
index a147291c4f3d..19159d8db5b6 100644
--- a/nixos/doc/manual/configuration/ad-hoc-packages.xml
+++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml
@@ -3,61 +3,59 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-ad-hoc-packages">
+ <title>Ad-Hoc Package Management</title>
 
-<title>Ad-Hoc Package Management</title>
-
-<para>With the command <command>nix-env</command>, you can install and
-uninstall packages from the command line.  For instance, to install
-Mozilla Thunderbird:
-
+ <para>
+  With the command <command>nix-env</command>, you can install and uninstall
+  packages from the command line. For instance, to install Mozilla Thunderbird:
 <screen>
 $ nix-env -iA nixos.thunderbird</screen>
+  If you invoke this as root, the package is installed in the Nix profile
+  <filename>/nix/var/nix/profiles/default</filename> and visible to all users
+  of the system; otherwise, the package ends up in
+  <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
+  and is not visible to other users. The <option>-A</option> flag specifies the
+  package by its attribute name; without it, the package is installed by
+  matching against its package name (e.g. <literal>thunderbird</literal>). The
+  latter is slower because it requires matching against all available Nix
+  packages, and is ambiguous if there are multiple matching packages.
+ </para>
 
-If you invoke this as root, the package is installed in the Nix
-profile <filename>/nix/var/nix/profiles/default</filename> and visible
-to all users of the system; otherwise, the package ends up in
-<filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/profile</filename>
-and is not visible to other users.  The <option>-A</option> flag
-specifies the package by its attribute name; without it, the package
-is installed by matching against its package name
-(e.g. <literal>thunderbird</literal>).  The latter is slower because
-it requires matching against all available Nix packages, and is
-ambiguous if there are multiple matching packages.</para>
-
-<para>Packages come from the NixOS channel.  You typically upgrade a
-package by updating to the latest version of the NixOS channel:
+ <para>
+  Packages come from the NixOS channel. You typically upgrade a package by
+  updating to the latest version of the NixOS channel:
 <screen>
 $ nix-channel --update nixos
 </screen>
-and then running <literal>nix-env -i</literal> again.  Other packages
-in the profile are <emphasis>not</emphasis> affected; this is the
-crucial difference with the declarative style of package management,
-where running <command>nixos-rebuild switch</command> causes all
-packages to be updated to their current versions in the NixOS channel.
-You can however upgrade all packages for which there is a newer
-version by doing:
+  and then running <literal>nix-env -i</literal> again. Other packages in the
+  profile are <emphasis>not</emphasis> affected; this is the crucial difference
+  with the declarative style of package management, where running
+  <command>nixos-rebuild switch</command> causes all packages to be updated to
+  their current versions in the NixOS channel. You can however upgrade all
+  packages for which there is a newer version by doing:
 <screen>
 $ nix-env -u '*'
 </screen>
-</para>
+ </para>
 
-<para>A package can be uninstalled using the <option>-e</option>
-flag:
+ <para>
+  A package can be uninstalled using the <option>-e</option> flag:
 <screen>
 $ nix-env -e thunderbird
 </screen>
-</para>
+ </para>
 
-<para>Finally, you can roll back an undesirable
-<command>nix-env</command> action:
+ <para>
+  Finally, you can roll back an undesirable <command>nix-env</command> action:
 <screen>
 $ nix-env --rollback
 </screen>
-</para>
-
-<para><command>nix-env</command> has many more flags.  For details,
-see the
-<citerefentry><refentrytitle>nix-env</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-manpage or the Nix manual.</para>
+ </para>
 
+ <para>
+  <command>nix-env</command> has many more flags. For details, see the
+  <citerefentry>
+  <refentrytitle>nix-env</refentrytitle>
+  <manvolnum>1</manvolnum></citerefentry> manpage or the Nix manual.
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml
index ae58f61d73ed..b59287a622e6 100644
--- a/nixos/doc/manual/configuration/adding-custom-packages.xml
+++ b/nixos/doc/manual/configuration/adding-custom-packages.xml
@@ -3,43 +3,36 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-custom-packages">
+ <title>Adding Custom Packages</title>
 
-<title>Adding Custom Packages</title>
-
-<para>It’s possible that a package you need is not available in NixOS.
-In that case, you can do two things.  First, you can clone the Nixpkgs
-repository, add the package to your clone, and (optionally) submit a
-patch or pull request to have it accepted into the main Nixpkgs
-repository.  This is described in detail in the <link
-xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs manual</link>.
-In short, you clone Nixpkgs:
-
+ <para>
+  It’s possible that a package you need is not available in NixOS. In that
+  case, you can do two things. First, you can clone the Nixpkgs repository, add
+  the package to your clone, and (optionally) submit a patch or pull request to
+  have it accepted into the main Nixpkgs repository. This is described in
+  detail in the <link
+xlink:href="http://nixos.org/nixpkgs/manual">Nixpkgs
+  manual</link>. In short, you clone Nixpkgs:
 <screen>
 $ git clone git://github.com/NixOS/nixpkgs.git
 $ cd nixpkgs
 </screen>
-
-Then you write and test the package as described in the Nixpkgs
-manual.  Finally, you add it to
-<literal>environment.systemPackages</literal>, e.g.
-
+  Then you write and test the package as described in the Nixpkgs manual.
+  Finally, you add it to <literal>environment.systemPackages</literal>, e.g.
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ pkgs.my-package ];
 </programlisting>
-
-and you run <command>nixos-rebuild</command>, specifying your own
-Nixpkgs tree:
-
+  and you run <command>nixos-rebuild</command>, specifying your own Nixpkgs
+  tree:
 <screen>
 # nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs</screen>
+ </para>
 
-</para>
-
-<para>The second possibility is to add the package outside of the
-Nixpkgs tree.  For instance, here is how you specify a build of the
-<link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
-package directly in <filename>configuration.nix</filename>:
-
+ <para>
+  The second possibility is to add the package outside of the Nixpkgs tree. For
+  instance, here is how you specify a build of the
+  <link xlink:href="http://www.gnu.org/software/hello/">GNU Hello</link>
+  package directly in <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> =
   let
@@ -53,13 +46,12 @@ package directly in <filename>configuration.nix</filename>:
   in
   [ my-hello ];
 </programlisting>
-
-Of course, you can also move the definition of
-<literal>my-hello</literal> into a separate Nix expression, e.g.
+  Of course, you can also move the definition of <literal>my-hello</literal>
+  into a separate Nix expression, e.g.
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ (import ./my-hello.nix) ];
 </programlisting>
-where <filename>my-hello.nix</filename> contains:
+  where <filename>my-hello.nix</filename> contains:
 <programlisting>
 with import &lt;nixpkgs> {}; # bring all of Nixpkgs into scope
 
@@ -71,14 +63,11 @@ stdenv.mkDerivation rec {
   };
 }
 </programlisting>
-
-This allows testing the package easily:
+  This allows testing the package easily:
 <screen>
 $ nix-build my-hello.nix
 $ ./result/bin/hello
 Hello, world!
 </screen>
-
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index d4ca15bb3e72..a9420b3fc921 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -3,28 +3,25 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     version="5.0"
     xml:id="sec-configuration-file">
+ <title>NixOS Configuration File</title>
 
-<title>NixOS Configuration File</title>
-
-<para>The NixOS configuration file generally looks like this:
-
+ <para>
+  The NixOS configuration file generally looks like this:
 <programlisting>
 { config, pkgs, ... }:
 
 { <replaceable>option definitions</replaceable>
 }
 </programlisting>
-
-The first line (<literal>{ config, pkgs, ... }:</literal>) denotes
-that this is actually a function that takes at least the two arguments
- <varname>config</varname> and <varname>pkgs</varname>.  (These are
-explained later.)  The function returns a <emphasis>set</emphasis> of
-option definitions (<literal>{ <replaceable>...</replaceable> }</literal>).  These definitions have the
-form <literal><replaceable>name</replaceable> =
-<replaceable>value</replaceable></literal>, where
-<replaceable>name</replaceable> is the name of an option and
-<replaceable>value</replaceable> is its value.  For example,
-
+  The first line (<literal>{ config, pkgs, ... }:</literal>) denotes that this
+  is actually a function that takes at least the two arguments
+  <varname>config</varname> and <varname>pkgs</varname>. (These are explained
+  later.) The function returns a <emphasis>set</emphasis> of option definitions
+  (<literal>{ <replaceable>...</replaceable> }</literal>). These definitions
+  have the form <literal><replaceable>name</replaceable> =
+  <replaceable>value</replaceable></literal>, where
+  <replaceable>name</replaceable> is the name of an option and
+  <replaceable>value</replaceable> is its value. For example,
 <programlisting>
 { config, pkgs, ... }:
 
@@ -33,19 +30,19 @@ form <literal><replaceable>name</replaceable> =
   <xref linkend="opt-services.httpd.documentRoot"/> = "/webroot";
 }
 </programlisting>
+  defines a configuration with three option definitions that together enable
+  the Apache HTTP Server with <filename>/webroot</filename> as the document
+  root.
+ </para>
 
-defines a configuration with three option definitions that together
-enable the Apache HTTP Server with <filename>/webroot</filename> as
-the document root.</para>
-
-<para>Sets can be nested, and in fact dots in option names are
-shorthand for defining a set containing another set.  For instance,
-<xref linkend="opt-services.httpd.enable"/> defines a set named
-<varname>services</varname> that contains a set named
-<varname>httpd</varname>, which in turn contains an option definition
-named <varname>enable</varname> with value <literal>true</literal>.
-This means that the example above can also be written as:
-
+ <para>
+  Sets can be nested, and in fact dots in option names are shorthand for
+  defining a set containing another set. For instance,
+  <xref linkend="opt-services.httpd.enable"/> defines a set named
+  <varname>services</varname> that contains a set named
+  <varname>httpd</varname>, which in turn contains an option definition named
+  <varname>enable</varname> with value <literal>true</literal>. This means that
+  the example above can also be written as:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -58,46 +55,44 @@ This means that the example above can also be written as:
   };
 }
 </programlisting>
+  which may be more convenient if you have lots of option definitions that
+  share the same prefix (such as <literal>services.httpd</literal>).
+ </para>
 
-which may be more convenient if you have lots of option definitions
-that share the same prefix (such as
-<literal>services.httpd</literal>).</para>
-
-<para>NixOS checks your option definitions for correctness.  For
-instance, if you try to define an option that doesn’t exist (that is,
-doesn’t have a corresponding <emphasis>option declaration</emphasis>),
-<command>nixos-rebuild</command> will give an error like:
+ <para>
+  NixOS checks your option definitions for correctness. For instance, if you
+  try to define an option that doesn’t exist (that is, doesn’t have a
+  corresponding <emphasis>option declaration</emphasis>),
+  <command>nixos-rebuild</command> will give an error like:
 <screen>
 The option `services.httpd.enable' defined in `/etc/nixos/configuration.nix' does not exist.
 </screen>
-Likewise, values in option definitions must have a correct type.  For
-instance, <option>services.httpd.enable</option> must be a Boolean
-(<literal>true</literal> or <literal>false</literal>).  Trying to give
-it a value of another type, such as a string, will cause an error:
+  Likewise, values in option definitions must have a correct type. For
+  instance, <option>services.httpd.enable</option> must be a Boolean
+  (<literal>true</literal> or <literal>false</literal>). Trying to give it a
+  value of another type, such as a string, will cause an error:
 <screen>
 The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean.
 </screen>
+ </para>
 
-</para>
-
-<para>Options have various types of values.  The most important are:
-
-<variablelist>
-  <varlistentry>
+ <para>
+  Options have various types of values. The most important are:
+  <variablelist>
+   <varlistentry>
     <term>Strings</term>
     <listitem>
-      <para>Strings are enclosed in double quotes, e.g.
-
+     <para>
+      Strings are enclosed in double quotes, e.g.
 <programlisting>
 <xref linkend="opt-networking.hostName"/> = "dexter";
 </programlisting>
-
-      Special characters can be escaped by prefixing them with a
-      backslash (e.g. <literal>\"</literal>).</para>
-
-      <para>Multi-line strings can be enclosed in <emphasis>double
-      single quotes</emphasis>, e.g.
-
+      Special characters can be escaped by prefixing them with a backslash
+      (e.g. <literal>\"</literal>).
+     </para>
+     <para>
+      Multi-line strings can be enclosed in <emphasis>double single
+      quotes</emphasis>, e.g.
 <programlisting>
 <xref linkend="opt-networking.extraHosts"/> =
   ''
@@ -105,58 +100,52 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     10.0.0.1 server
   '';
 </programlisting>
-
-      The main difference is that it strips from each line
-      a number of spaces equal to the minimal indentation of
-      the string as a whole (disregarding the indentation of
-      empty lines), and that characters like
-      <literal>"</literal> and <literal>\</literal> are not special
-      (making it more convenient for including things like shell
-      code).
-      See more info about this in the Nix manual <link
-      xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.</para>
+      The main difference is that it strips from each line a number of spaces
+      equal to the minimal indentation of the string as a whole (disregarding
+      the indentation of empty lines), and that characters like
+      <literal>"</literal> and <literal>\</literal> are not special (making it
+      more convenient for including things like shell code). See more info
+      about this in the Nix manual
+      <link
+      xlink:href="https://nixos.org/nix/manual/#ssec-values">here</link>.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
+   </varlistentry>
+   <varlistentry>
     <term>Booleans</term>
     <listitem>
-      <para>These can be <literal>true</literal> or
-      <literal>false</literal>, e.g.
-
+     <para>
+      These can be <literal>true</literal> or <literal>false</literal>, e.g.
 <programlisting>
 <xref linkend="opt-networking.firewall.enable"/> = true;
 <xref linkend="opt-networking.firewall.allowPing"/> = false;
 </programlisting>
-      </para>
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
+   </varlistentry>
+   <varlistentry>
     <term>Integers</term>
     <listitem>
-      <para>For example,
-
+     <para>
+      For example,
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 60;
 </programlisting>
-
       (Note that here the attribute name
-      <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in
-      quotes to prevent it from being interpreted as a set named
-      <literal>net</literal> containing a set named
-      <literal>ipv4</literal>, and so on.  This is because it’s not a
-      NixOS option but the literal name of a Linux kernel
-      setting.)</para>
+      <literal>net.ipv4.tcp_keepalive_time</literal> is enclosed in quotes to
+      prevent it from being interpreted as a set named <literal>net</literal>
+      containing a set named <literal>ipv4</literal>, and so on. This is
+      because it’s not a NixOS option but the literal name of a Linux kernel
+      setting.)
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
+   </varlistentry>
+   <varlistentry>
     <term>Sets</term>
     <listitem>
-      <para>Sets were introduced above.  They are name/value pairs
-      enclosed in braces, as in the option definition
-
+     <para>
+      Sets were introduced above. They are name/value pairs enclosed in braces,
+      as in the option definition
 <programlisting>
 <xref linkend="opt-fileSystems"/>."/boot" =
   { device = "/dev/sda1";
@@ -164,36 +153,32 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     options = [ "rw" "data=ordered" "relatime" ];
   };
 </programlisting>
-      </para>
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
+   </varlistentry>
+   <varlistentry>
     <term>Lists</term>
     <listitem>
-      <para>The important thing to note about lists is that list
-      elements are separated by whitespace, like this:
-
+     <para>
+      The important thing to note about lists is that list elements are
+      separated by whitespace, like this:
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
-
       List elements can be any other type, e.g. sets:
-
 <programlisting>
 swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
 </programlisting>
-      </para>
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
+   </varlistentry>
+   <varlistentry>
     <term>Packages</term>
     <listitem>
-      <para>Usually, the packages you need are already part of the Nix
-      Packages collection, which is a set that can be accessed through
-      the function argument <varname>pkgs</varname>.  Typical uses:
-
+     <para>
+      Usually, the packages you need are already part of the Nix Packages
+      collection, which is a set that can be accessed through the function
+      argument <varname>pkgs</varname>. Typical uses:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> =
   [ pkgs.thunderbird
@@ -202,16 +187,12 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
 
 <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql90;
 </programlisting>
-
-      The latter option definition changes the default PostgreSQL
-      package used by NixOS’s PostgreSQL service to 9.0.  For more
-      information on packages, including how to add new ones, see
-      <xref linkend="sec-custom-packages"/>.</para>
+      The latter option definition changes the default PostgreSQL package used
+      by NixOS’s PostgreSQL service to 9.0. For more information on packages,
+      including how to add new ones, see <xref linkend="sec-custom-packages"/>.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
+   </varlistentry>
+  </variablelist>
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml
index 87847f8451ec..5ef498cf9ae3 100644
--- a/nixos/doc/manual/configuration/config-syntax.xml
+++ b/nixos/doc/manual/configuration/config-syntax.xml
@@ -3,25 +3,23 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-configuration-syntax">
-
-<title>Configuration Syntax</title>
-
-<para>The NixOS configuration file
-<filename>/etc/nixos/configuration.nix</filename> is actually a
-<emphasis>Nix expression</emphasis>, which is the Nix package
-manager’s purely functional language for describing how to build
-packages and configurations.  This means you have all the expressive
-power of that language at your disposal, including the ability to
-abstract over common patterns, which is very useful when managing
-complex systems.  The syntax and semantics of the Nix language are
-fully described in the <link
+ <title>Configuration Syntax</title>
+ <para>
+  The NixOS configuration file
+  <filename>/etc/nixos/configuration.nix</filename> is actually a <emphasis>Nix
+  expression</emphasis>, which is the Nix package manager’s purely functional
+  language for describing how to build packages and configurations. This means
+  you have all the expressive power of that language at your disposal,
+  including the ability to abstract over common patterns, which is very useful
+  when managing complex systems. The syntax and semantics of the Nix language
+  are fully described in the
+  <link
 xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
-manual</link>, but here we give a short overview of the most important
-constructs useful in NixOS configuration files.</para>
-
-<xi:include href="config-file.xml" />
-<xi:include href="abstractions.xml" />
-<xi:include href="modularity.xml" />
-<xi:include href="summary.xml" />
-
+  manual</link>, but here we give a short overview of the most important
+  constructs useful in NixOS configuration files.
+ </para>
+ <xi:include href="config-file.xml" />
+ <xi:include href="abstractions.xml" />
+ <xi:include href="modularity.xml" />
+ <xi:include href="summary.xml" />
 </chapter>
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index f092c7e207ff..8d05dcd34b4d 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -3,30 +3,24 @@
       xmlns:xi="http://www.w3.org/2001/XInclude"
       version="5.0"
       xml:id="ch-configuration">
-
-<title>Configuration</title>
-
-<partintro>
-
-<para>This chapter describes how to configure various aspects of a
-NixOS machine through the configuration file
-<filename>/etc/nixos/configuration.nix</filename>.  As described in
-<xref linkend="sec-changing-config" />, changes to this file only take
-effect after you run <command>nixos-rebuild</command>.</para>
-
-</partintro>
-
-<xi:include href="config-syntax.xml" />
-<xi:include href="package-mgmt.xml" />
-<xi:include href="user-mgmt.xml" />
-<xi:include href="file-systems.xml" />
-<xi:include href="x-windows.xml" />
-<xi:include href="xfce.xml" />
-<xi:include href="networking.xml" />
-<xi:include href="linux-kernel.xml" />
-
-<xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
-
+ <title>Configuration</title>
+ <partintro>
+  <para>
+   This chapter describes how to configure various aspects of a NixOS machine
+   through the configuration file
+   <filename>/etc/nixos/configuration.nix</filename>. As described in
+   <xref linkend="sec-changing-config" />, changes to this file only take
+   effect after you run <command>nixos-rebuild</command>.
+  </para>
+ </partintro>
+ <xi:include href="config-syntax.xml" />
+ <xi:include href="package-mgmt.xml" />
+ <xi:include href="user-mgmt.xml" />
+ <xi:include href="file-systems.xml" />
+ <xi:include href="x-windows.xml" />
+ <xi:include href="xfce.xml" />
+ <xi:include href="networking.xml" />
+ <xi:include href="linux-kernel.xml" />
+ <xi:include href="../generated/modules.xml" xpointer="xpointer(//section[@id='modules']/*)" />
 <!-- Apache; libvirtd virtualisation -->
-
 </part>
diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml
index 8b7654e9b42e..03b5bb53197b 100644
--- a/nixos/doc/manual/configuration/customizing-packages.xml
+++ b/nixos/doc/manual/configuration/customizing-packages.xml
@@ -3,53 +3,50 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-customising-packages">
+ <title>Customising Packages</title>
 
-<title>Customising Packages</title>
+ <para>
+  Some packages in Nixpkgs have options to enable or disable optional
+  functionality or change other aspects of the package. For instance, the
+  Firefox wrapper package (which provides Firefox with a set of plugins such as
+  the Adobe Flash player) has an option to enable the Google Talk plugin. It
+  can be set in <filename>configuration.nix</filename> as follows: <filename>
+  nixpkgs.config.firefox.enableGoogleTalkPlugin = true; </filename>
+ </para>
 
-<para>Some packages in Nixpkgs have options to enable or disable
-optional functionality or change other aspects of the package.  For
-instance, the Firefox wrapper package (which provides Firefox with a
-set of plugins such as the Adobe Flash player) has an option to enable
-the Google Talk plugin.  It can be set in
-<filename>configuration.nix</filename> as follows:
-
-<filename>
-nixpkgs.config.firefox.enableGoogleTalkPlugin = true;
-</filename>
-</para>
-
-<warning><para>Unfortunately, Nixpkgs currently lacks a way to query
-available configuration options.</para></warning>
-
-<para>Apart from high-level options, it’s possible to tweak a package
-in almost arbitrary ways, such as changing or disabling dependencies
-of a package.  For instance, the Emacs package in Nixpkgs by default
-has a dependency on GTK+ 2.  If you want to build it against GTK+ 3,
-you can specify that as follows:
+ <warning>
+  <para>
+   Unfortunately, Nixpkgs currently lacks a way to query available
+   configuration options.
+  </para>
+ </warning>
 
+ <para>
+  Apart from high-level options, it’s possible to tweak a package in almost
+  arbitrary ways, such as changing or disabling dependencies of a package. For
+  instance, the Emacs package in Nixpkgs by default has a dependency on GTK+ 2.
+  If you want to build it against GTK+ 3, you can specify that as follows:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ];
 </programlisting>
+  The function <varname>override</varname> performs the call to the Nix
+  function that produces Emacs, with the original arguments amended by the set
+  of arguments specified by you. So here the function argument
+  <varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>, causing
+  Emacs to depend on GTK+ 3. (The parentheses are necessary because in Nix,
+  function application binds more weakly than list construction, so without
+  them, <xref linkend="opt-environment.systemPackages"/> would be a list with
+  two elements.)
+ </para>
 
-The function <varname>override</varname> performs the call to the Nix
-function that produces Emacs, with the original arguments amended by
-the set of arguments specified by you.  So here the function argument
-<varname>gtk</varname> gets the value <literal>pkgs.gtk3</literal>,
-causing Emacs to depend on GTK+ 3.  (The parentheses are necessary
-because in Nix, function application binds more weakly than list
-construction, so without them,
-<xref linkend="opt-environment.systemPackages"/> would be a list with two
-elements.)</para>
-
-<para>Even greater customisation is possible using the function
-<varname>overrideAttrs</varname>.  While the
-<varname>override</varname> mechanism above overrides the arguments of
-a package function, <varname>overrideAttrs</varname> allows
-changing the <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>.
-This permits changing any aspect of the package, such as the source code.
-For instance, if you want to override the source code of Emacs, you
-can say:
-
+ <para>
+  Even greater customisation is possible using the function
+  <varname>overrideAttrs</varname>. While the <varname>override</varname>
+  mechanism above overrides the arguments of a package function,
+  <varname>overrideAttrs</varname> allows changing the
+  <emphasis>attributes</emphasis> passed to <literal>mkDerivation</literal>.
+  This permits changing any aspect of the package, such as the source code. For
+  instance, if you want to override the source code of Emacs, you can say:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [
   (pkgs.emacs.overrideAttrs (oldAttrs: {
@@ -58,36 +55,32 @@ can say:
   }))
 ];
 </programlisting>
+  Here, <varname>overrideAttrs</varname> takes the Nix derivation specified by
+  <varname>pkgs.emacs</varname> and produces a new derivation in which the
+  original’s <literal>name</literal> and <literal>src</literal> attribute
+  have been replaced by the given values by re-calling
+  <literal>stdenv.mkDerivation</literal>. The original attributes are
+  accessible via the function argument, which is conventionally named
+  <varname>oldAttrs</varname>.
+ </para>
 
-Here, <varname>overrideAttrs</varname> takes the Nix derivation
-specified by <varname>pkgs.emacs</varname> and produces a new
-derivation in which the original’s <literal>name</literal> and
-<literal>src</literal> attribute have been replaced by the given
-values by re-calling <literal>stdenv.mkDerivation</literal>.
-The original attributes are accessible via the function argument,
-which is conventionally named <varname>oldAttrs</varname>.</para>
-
-<para>The overrides shown above are not global.  They do not affect
-the original package; other packages in Nixpkgs continue to depend on
-the original rather than the customised package.  This means that if
-another package in your system depends on the original package, you
-end up with two instances of the package.  If you want to have
-everything depend on your customised instance, you can apply a
-<emphasis>global</emphasis> override as follows:
-
+ <para>
+  The overrides shown above are not global. They do not affect the original
+  package; other packages in Nixpkgs continue to depend on the original rather
+  than the customised package. This means that if another package in your
+  system depends on the original package, you end up with two instances of the
+  package. If you want to have everything depend on your customised instance,
+  you can apply a <emphasis>global</emphasis> override as follows:
 <screen>
 nixpkgs.config.packageOverrides = pkgs:
   { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; };
   };
 </screen>
-
-The effect of this definition is essentially equivalent to modifying
-the <literal>emacs</literal> attribute in the Nixpkgs source tree.
-Any package in Nixpkgs that depends on <literal>emacs</literal> will
-be passed your customised instance.  (However, the value
-<literal>pkgs.emacs</literal> in
-<varname>nixpkgs.config.packageOverrides</varname> refers to the
-original rather than overridden instance, to prevent an infinite
-recursion.)</para>
-
+  The effect of this definition is essentially equivalent to modifying the
+  <literal>emacs</literal> attribute in the Nixpkgs source tree. Any package in
+  Nixpkgs that depends on <literal>emacs</literal> will be passed your
+  customised instance. (However, the value <literal>pkgs.emacs</literal> in
+  <varname>nixpkgs.config.packageOverrides</varname> refers to the original
+  rather than overridden instance, to prevent an infinite recursion.)
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml
index 4c875e6f037f..be9884fe9dce 100644
--- a/nixos/doc/manual/configuration/declarative-packages.xml
+++ b/nixos/doc/manual/configuration/declarative-packages.xml
@@ -3,41 +3,41 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-declarative-package-mgmt">
+ <title>Declarative Package Management</title>
 
-<title>Declarative Package Management</title>
-
-<para>With declarative package management, you specify which packages
-you want on your system by setting the option
-<xref linkend="opt-environment.systemPackages"/>.  For instance, adding the
-following line to <filename>configuration.nix</filename> enables the
-Mozilla Thunderbird email application:
-
+ <para>
+  With declarative package management, you specify which packages you want on
+  your system by setting the option
+  <xref linkend="opt-environment.systemPackages"/>. For instance, adding the
+  following line to <filename>configuration.nix</filename> enables the Mozilla
+  Thunderbird email application:
 <programlisting>
 <xref linkend="opt-environment.systemPackages"/> = [ pkgs.thunderbird ];
 </programlisting>
+  The effect of this specification is that the Thunderbird package from Nixpkgs
+  will be built or downloaded as part of the system when you run
+  <command>nixos-rebuild switch</command>.
+ </para>
 
-The effect of this specification is that the Thunderbird package from
-Nixpkgs will be built or downloaded as part of the system when you run
-<command>nixos-rebuild switch</command>.</para>
-
-<para>You can get a list of the available packages as follows:
+ <para>
+  You can get a list of the available packages as follows:
 <screen>
 $ nix-env -qaP '*' --description
 nixos.firefox   firefox-23.0   Mozilla Firefox - the browser, reloaded
 <replaceable>...</replaceable>
 </screen>
+  The first column in the output is the <emphasis>attribute name</emphasis>,
+  such as <literal>nixos.thunderbird</literal>. (The <literal>nixos</literal>
+  prefix allows distinguishing between different channels that you might have.)
+ </para>
 
-The first column in the output is the <emphasis>attribute
-name</emphasis>, such as
-<literal>nixos.thunderbird</literal>. (The
-<literal>nixos</literal> prefix allows distinguishing between
-different channels that you might have.)</para>
+ <para>
+  To “uninstall” a package, simply remove it from
+  <xref linkend="opt-environment.systemPackages"/> and run
+  <command>nixos-rebuild switch</command>.
+ </para>
 
-<para>To “uninstall” a package, simply remove it from
-<xref linkend="opt-environment.systemPackages"/> and run
-<command>nixos-rebuild switch</command>.</para>
-
-<xi:include href="customizing-packages.xml" />
-<xi:include href="adding-custom-packages.xml" />
+ <xi:include href="customizing-packages.xml" />
 
+ <xi:include href="adding-custom-packages.xml" />
 </section>
diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml
index 0ff37c38d8b0..e4c03de71b72 100644
--- a/nixos/doc/manual/configuration/file-systems.xml
+++ b/nixos/doc/manual/configuration/file-systems.xml
@@ -3,44 +3,44 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="ch-file-systems">
-
-<title>File Systems</title>
-
-<para>You can define file systems using the
-<option>fileSystems</option> configuration option.  For instance, the
-following definition causes NixOS to mount the Ext4 file system on
-device <filename>/dev/disk/by-label/data</filename> onto the mount
-point <filename>/data</filename>:
-
+ <title>File Systems</title>
+ <para>
+  You can define file systems using the <option>fileSystems</option>
+  configuration option. For instance, the following definition causes NixOS to
+  mount the Ext4 file system on device
+  <filename>/dev/disk/by-label/data</filename> onto the mount point
+  <filename>/data</filename>:
 <programlisting>
 <xref linkend="opt-fileSystems"/>."/data" =
   { device = "/dev/disk/by-label/data";
     fsType = "ext4";
   };
 </programlisting>
-
-Mount points are created automatically if they don’t already exist.
-For <option><link linkend="opt-fileSystems._name__.device">device</link></option>, it’s best to use the topology-independent
-device aliases in <filename>/dev/disk/by-label</filename> and
-<filename>/dev/disk/by-uuid</filename>, as these don’t change if the
-topology changes (e.g. if a disk is moved to another IDE
-controller).</para>
-
-<para>You can usually omit the file system type
-(<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>), since <command>mount</command> can usually
-detect the type and load the necessary kernel module automatically.
-However, if the file system is needed at early boot (in the initial
-ramdisk) and is not <literal>ext2</literal>, <literal>ext3</literal>
-or <literal>ext4</literal>, then it’s best to specify
-<option>fsType</option> to ensure that the kernel module is
-available.</para>
-
-<note><para>System startup will fail if any of the filesystems fails to mount,
-dropping you to the emergency shell.
-You can make a mount asynchronous and non-critical by adding
-<literal><link linkend="opt-fileSystems._name__.options">options</link> = [ "nofail" ];</literal>.
-</para></note>
-
-<xi:include href="luks-file-systems.xml" />
-
+  Mount points are created automatically if they don’t already exist. For
+  <option><link linkend="opt-fileSystems._name__.device">device</link></option>,
+  it’s best to use the topology-independent device aliases in
+  <filename>/dev/disk/by-label</filename> and
+  <filename>/dev/disk/by-uuid</filename>, as these don’t change if the
+  topology changes (e.g. if a disk is moved to another IDE controller).
+ </para>
+ <para>
+  You can usually omit the file system type
+  (<option><link linkend="opt-fileSystems._name__.fsType">fsType</link></option>),
+  since <command>mount</command> can usually detect the type and load the
+  necessary kernel module automatically. However, if the file system is needed
+  at early boot (in the initial ramdisk) and is not <literal>ext2</literal>,
+  <literal>ext3</literal> or <literal>ext4</literal>, then it’s best to
+  specify <option>fsType</option> to ensure that the kernel module is
+  available.
+ </para>
+ <note>
+  <para>
+   System startup will fail if any of the filesystems fails to mount, dropping
+   you to the emergency shell. You can make a mount asynchronous and
+   non-critical by adding
+   <literal><link linkend="opt-fileSystems._name__.options">options</link> = [
+   "nofail" ];</literal>.
+  </para>
+ </note>
+ <xi:include href="luks-file-systems.xml" />
 </chapter>
diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml
index ecc21a3bdf51..b66adcedce6e 100644
--- a/nixos/doc/manual/configuration/firewall.xml
+++ b/nixos/doc/manual/configuration/firewall.xml
@@ -3,49 +3,44 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-firewall">
+ <title>Firewall</title>
 
-<title>Firewall</title>
-
-<para>NixOS has a simple stateful firewall that blocks incoming
-connections and other unexpected packets.  The firewall applies to
-both IPv4 and IPv6 traffic. It is enabled by default. It can be
-disabled as follows:
-
+ <para>
+  NixOS has a simple stateful firewall that blocks incoming connections and
+  other unexpected packets. The firewall applies to both IPv4 and IPv6 traffic.
+  It is enabled by default. It can be disabled as follows:
 <programlisting>
 <xref linkend="opt-networking.firewall.enable"/> = false;
 </programlisting>
-
-If the firewall is enabled, you can open specific TCP ports to the
-outside world:
-
+  If the firewall is enabled, you can open specific TCP ports to the outside
+  world:
 <programlisting>
 <xref linkend="opt-networking.firewall.allowedTCPPorts"/> = [ 80 443 ];
 </programlisting>
+  Note that TCP port 22 (ssh) is opened automatically if the SSH daemon is
+  enabled (<option><xref linkend="opt-services.openssh.enable"/> =
+  true</option>). UDP ports can be opened through
+  <xref linkend="opt-networking.firewall.allowedUDPPorts"/>.
+ </para>
 
-Note that TCP port 22 (ssh) is opened automatically if the SSH daemon
-is enabled (<option><xref linkend="opt-services.openssh.enable"/> = true</option>). UDP
-ports can be opened through
-<xref linkend="opt-networking.firewall.allowedUDPPorts"/>.</para>
-
-<para>To open ranges of TCP ports:
-
+ <para>
+  To open ranges of TCP ports:
 <programlisting>
 <xref linkend="opt-networking.firewall.allowedTCPPortRanges"/> = [
   { from = 4000; to = 4007; }
   { from = 8000; to = 8010; }
 ];
 </programlisting>
+  Similarly, UDP port ranges can be opened through
+  <xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.
+ </para>
 
-Similarly, UDP port ranges can be opened through
-<xref linkend="opt-networking.firewall.allowedUDPPortRanges"/>.</para>
-
-<para>Also of interest is
-
+ <para>
+  Also of interest is
 <programlisting>
 <xref linkend="opt-networking.firewall.allowPing"/> = true;
 </programlisting>
-
-to allow the machine to respond to ping requests.  (ICMPv6 pings are
-always allowed.)</para>
-
+  to allow the machine to respond to ping requests. (ICMPv6 pings are always
+  allowed.)
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml
index fbc9695c6014..71ddf41491ba 100644
--- a/nixos/doc/manual/configuration/ipv4-config.xml
+++ b/nixos/doc/manual/configuration/ipv4-config.xml
@@ -3,45 +3,41 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-ipv4">
+ <title>IPv4 Configuration</title>
 
-<title>IPv4 Configuration</title>
-
-<para>By default, NixOS uses DHCP (specifically,
-<command>dhcpcd</command>) to automatically configure network
-interfaces.  However, you can configure an interface manually as
-follows:
-
+ <para>
+  By default, NixOS uses DHCP (specifically, <command>dhcpcd</command>) to
+  automatically configure network interfaces. However, you can configure an
+  interface manually as follows:
 <programlisting>
 <link linkend="opt-networking.interfaces._name__.ipv4.addresses">networking.interfaces.eth0.ipv4.addresses</link> = [ {
   address = "192.168.1.2";
   prefixLength = 24;
 } ];
 </programlisting>
-
-Typically you’ll also want to set a default gateway and set of name
-servers:
-
+  Typically you’ll also want to set a default gateway and set of name
+  servers:
 <programlisting>
 <xref linkend="opt-networking.defaultGateway"/> = "192.168.1.1";
 <xref linkend="opt-networking.nameservers"/> = [ "8.8.8.8" ];
 </programlisting>
+ </para>
 
-</para>
-
-<note><para>Statically configured interfaces are set up by the systemd
-service
-<replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
-The default gateway and name server configuration is performed by
-<literal>network-setup.service</literal>.</para></note>
-
-<para>The host name is set using <xref linkend="opt-networking.hostName"/>:
+ <note>
+  <para>
+   Statically configured interfaces are set up by the systemd service
+   <replaceable>interface-name</replaceable><literal>-cfg.service</literal>.
+   The default gateway and name server configuration is performed by
+   <literal>network-setup.service</literal>.
+  </para>
+ </note>
 
+ <para>
+  The host name is set using <xref linkend="opt-networking.hostName"/>:
 <programlisting>
 <xref linkend="opt-networking.hostName"/> = "cartman";
 </programlisting>
-
-The default host name is <literal>nixos</literal>.  Set it to the
-empty string (<literal>""</literal>) to allow the DHCP server to
-provide the host name.</para>
-
+  The default host name is <literal>nixos</literal>. Set it to the empty string
+  (<literal>""</literal>) to allow the DHCP server to provide the host name.
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml
index e8960dc8930c..e9ab7cce4eb2 100644
--- a/nixos/doc/manual/configuration/ipv6-config.xml
+++ b/nixos/doc/manual/configuration/ipv6-config.xml
@@ -3,47 +3,48 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-ipv6">
+ <title>IPv6 Configuration</title>
 
-<title>IPv6 Configuration</title>
-
-<para>IPv6 is enabled by default.  Stateless address autoconfiguration
-is used to automatically assign IPv6 addresses to all interfaces.  You
-can disable IPv6 support globally by setting:
-
+ <para>
+  IPv6 is enabled by default. Stateless address autoconfiguration is used to
+  automatically assign IPv6 addresses to all interfaces. You can disable IPv6
+  support globally by setting:
 <programlisting>
 <xref linkend="opt-networking.enableIPv6"/> = false;
-</programlisting></para>
-
-<para>You can disable IPv6 on a single interface using a normal sysctl (in this
-example, we use interface <varname>eth0</varname>):
+</programlisting>
+ </para>
 
+ <para>
+  You can disable IPv6 on a single interface using a normal sysctl (in this
+  example, we use interface <varname>eth0</varname>):
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv6.conf.eth0.disable_ipv6" = true;
 </programlisting>
-</para>
-
-<para>As with IPv4 networking interfaces are automatically configured via
-DHCPv6. You can configure an interface manually:
+ </para>
 
+ <para>
+  As with IPv4 networking interfaces are automatically configured via DHCPv6.
+  You can configure an interface manually:
 <programlisting>
 <link linkend="opt-networking.interfaces._name__.ipv6.addresses">networking.interfaces.eth0.ipv6.addresses</link> = [ {
   address = "fe00:aa:bb:cc::2";
   prefixLength = 64;
 } ];
 </programlisting>
-</para>
-
-<para>For configuring a gateway, optionally with explicitly specified interface:
+ </para>
 
+ <para>
+  For configuring a gateway, optionally with explicitly specified interface:
 <programlisting>
 <xref linkend="opt-networking.defaultGateway6"/> = {
   address = "fe00::1";
   interface = "enp0s3";
 }
 </programlisting>
-</para>
-
-<para>See <xref linkend='sec-ipv4' /> for similar examples and additional information.
-</para>
+ </para>
 
+ <para>
+  See <xref linkend='sec-ipv4' /> for similar examples and additional
+  information.
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index b9325629256a..0990e9d932ba 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -3,29 +3,29 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-kernel-config">
-
-<title>Linux Kernel</title>
-
-<para>You can override the Linux kernel and associated packages using
-the option <option>boot.kernelPackages</option>.  For instance, this
-selects the Linux 3.10 kernel:
+ <title>Linux Kernel</title>
+ <para>
+  You can override the Linux kernel and associated packages using the option
+  <option>boot.kernelPackages</option>. For instance, this selects the Linux
+  3.10 kernel:
 <programlisting>
 <xref linkend="opt-boot.kernelPackages"/> = pkgs.linuxPackages_3_10;
 </programlisting>
-Note that this not only replaces the kernel, but also packages that
-are specific to the kernel version, such as the NVIDIA video drivers.
-This ensures that driver packages are consistent with the
-kernel.</para>
-
-<para>The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command:
+  Note that this not only replaces the kernel, but also packages that are
+  specific to the kernel version, such as the NVIDIA video drivers. This
+  ensures that driver packages are consistent with the kernel.
+ </para>
+ <para>
+  The default Linux kernel configuration should be fine for most users. You can
+  see the configuration of your current kernel with the following command:
 <programlisting>
 zcat /proc/config.gz
 </programlisting>
-If you want to change the kernel configuration, you can use the
-<option>packageOverrides</option> feature (see <xref
-linkend="sec-customising-packages" />).  For instance, to enable
-support for the kernel debugger KGDB:
-
+  If you want to change the kernel configuration, you can use the
+  <option>packageOverrides</option> feature (see
+  <xref
+linkend="sec-customising-packages" />). For instance, to enable support
+  for the kernel debugger KGDB:
 <programlisting>
 nixpkgs.config.packageOverrides = pkgs:
   { linux_3_4 = pkgs.linux_3_4.override {
@@ -36,47 +36,46 @@ nixpkgs.config.packageOverrides = pkgs:
     };
   };
 </programlisting>
-
-<varname>extraConfig</varname> takes a list of Linux kernel
-configuration options, one per line.  The name of the option should
-not include the prefix <literal>CONFIG_</literal>.  The option value
-is typically <literal>y</literal>, <literal>n</literal> or
-<literal>m</literal> (to build something as a kernel module).</para>
-
-<para>Kernel modules for hardware devices are generally loaded
-automatically by <command>udev</command>.  You can force a module to
-be loaded via <xref linkend="opt-boot.kernelModules"/>, e.g.
+  <varname>extraConfig</varname> takes a list of Linux kernel configuration
+  options, one per line. The name of the option should not include the prefix
+  <literal>CONFIG_</literal>. The option value is typically
+  <literal>y</literal>, <literal>n</literal> or <literal>m</literal> (to build
+  something as a kernel module).
+ </para>
+ <para>
+  Kernel modules for hardware devices are generally loaded automatically by
+  <command>udev</command>. You can force a module to be loaded via
+  <xref linkend="opt-boot.kernelModules"/>, e.g.
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
-If the module is required early during the boot (e.g. to mount the
-root file system), you can use
-<xref linkend="opt-boot.initrd.extraKernelModules"/>:
+  If the module is required early during the boot (e.g. to mount the root file
+  system), you can use <xref linkend="opt-boot.initrd.extraKernelModules"/>:
 <programlisting>
 <xref linkend="opt-boot.initrd.extraKernelModules"/> = [ "cifs" ];
 </programlisting>
-This causes the specified modules and their dependencies to be added
-to the initial ramdisk.</para>
-
-<para>Kernel runtime parameters can be set through
-<xref linkend="opt-boot.kernel.sysctl"/>, e.g.
+  This causes the specified modules and their dependencies to be added to the
+  initial ramdisk.
+ </para>
+ <para>
+  Kernel runtime parameters can be set through
+  <xref linkend="opt-boot.kernel.sysctl"/>, e.g.
 <programlisting>
 <xref linkend="opt-boot.kernel.sysctl"/>."net.ipv4.tcp_keepalive_time" = 120;
 </programlisting>
-sets the kernel’s TCP keepalive time to 120 seconds.  To see the
-available parameters, run <command>sysctl -a</command>.</para>
-
-<section>
+  sets the kernel’s TCP keepalive time to 120 seconds. To see the available
+  parameters, run <command>sysctl -a</command>.
+ </para>
+ <section>
   <title>Developing kernel modules</title>
 
-  <para>When developing kernel modules it's often convenient to run
-  edit-compile-run loop as quickly as possible.
-
-  See below snippet as an example of developing <literal>mellanox</literal>
-  drivers.
+  <para>
+   When developing kernel modules it's often convenient to run edit-compile-run
+   loop as quickly as possible. See below snippet as an example of developing
+   <literal>mellanox</literal> drivers.
   </para>
 
-  <screen><![CDATA[
+<screen><![CDATA[
 $ nix-build '<nixpkgs>' -A linuxPackages.kernel.dev
 $ nix-shell '<nixpkgs>' -A linuxPackages.kernel
 $ unpackPhase
@@ -84,7 +83,5 @@ $ cd linux-*
 $ make -C $dev/lib/modules/*/build M=$(pwd)/drivers/net/ethernet/mellanox modules
 # insmod ./drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko
 ]]></screen>
-
-</section>
-
+ </section>
 </chapter>
diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml
index 6c2b4cc60b5b..8a2b107e0ee8 100644
--- a/nixos/doc/manual/configuration/luks-file-systems.xml
+++ b/nixos/doc/manual/configuration/luks-file-systems.xml
@@ -3,14 +3,13 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-luks-file-systems">
+ <title>LUKS-Encrypted File Systems</title>
 
-<title>LUKS-Encrypted File Systems</title>
-
-<para>NixOS supports file systems that are encrypted using
-<emphasis>LUKS</emphasis> (Linux Unified Key Setup).  For example,
-here is how you create an encrypted Ext4 file system on the device
-<filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
-
+ <para>
+  NixOS supports file systems that are encrypted using
+  <emphasis>LUKS</emphasis> (Linux Unified Key Setup). For example, here is how
+  you create an encrypted Ext4 file system on the device
+  <filename>/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d</filename>:
 <screen>
 # cryptsetup luksFormat /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d
 
@@ -27,20 +26,15 @@ Enter passphrase for /dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d: ***
 
 # mkfs.ext4 /dev/mapper/crypted
 </screen>
-
-To ensure that this file system is automatically mounted at boot time
-as <filename>/</filename>, add the following to
-<filename>configuration.nix</filename>:
-
+  To ensure that this file system is automatically mounted at boot time as
+  <filename>/</filename>, add the following to
+  <filename>configuration.nix</filename>:
 <programlisting>
 <link linkend="opt-boot.initrd.luks.devices._name__.device">boot.initrd.luks.devices.crypted.device</link> = "/dev/disk/by-uuid/3f6b0024-3a44-4fde-a43a-767b872abe5d";
 <xref linkend="opt-fileSystems"/>."/".device = "/dev/mapper/crypted";
 </programlisting>
-
-Should grub be used as bootloader, and <filename>/boot</filename> is located
-on an encrypted partition, it is necessary to add the following grub option:
+  Should grub be used as bootloader, and <filename>/boot</filename> is located
+  on an encrypted partition, it is necessary to add the following grub option:
 <programlisting><xref linkend="opt-boot.loader.grub.enableCryptodisk"/> = true;</programlisting>
-
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml
index 2f76459a24e9..3ff96f719ec5 100644
--- a/nixos/doc/manual/configuration/modularity.xml
+++ b/nixos/doc/manual/configuration/modularity.xml
@@ -3,21 +3,21 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-modularity">
+ <title>Modularity</title>
 
-<title>Modularity</title>
-
-<para>The NixOS configuration mechanism is modular.  If your
-<filename>configuration.nix</filename> becomes too big, you can split
-it into multiple files.  Likewise, if you have multiple NixOS
-configurations (e.g. for different computers) with some commonality,
-you can move the common configuration into a shared file.</para>
-
-<para>Modules have exactly the same syntax as
-<filename>configuration.nix</filename>.  In fact,
-<filename>configuration.nix</filename> is itself a module.  You can
-use other modules by including them from
-<filename>configuration.nix</filename>, e.g.:
+ <para>
+  The NixOS configuration mechanism is modular. If your
+  <filename>configuration.nix</filename> becomes too big, you can split it into
+  multiple files. Likewise, if you have multiple NixOS configurations (e.g. for
+  different computers) with some commonality, you can move the common
+  configuration into a shared file.
+ </para>
 
+ <para>
+  Modules have exactly the same syntax as
+  <filename>configuration.nix</filename>. In fact,
+  <filename>configuration.nix</filename> is itself a module. You can use other
+  modules by including them from <filename>configuration.nix</filename>, e.g.:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -27,11 +27,9 @@ use other modules by including them from
   <replaceable>...</replaceable>
 }
 </programlisting>
-
-Here, we include two modules from the same directory,
-<filename>vpn.nix</filename> and <filename>kde.nix</filename>.  The
-latter might look like this:
-
+  Here, we include two modules from the same directory,
+  <filename>vpn.nix</filename> and <filename>kde.nix</filename>. The latter
+  might look like this:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -40,59 +38,55 @@ latter might look like this:
   <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
 }
 </programlisting>
-
-Note that both <filename>configuration.nix</filename> and
-<filename>kde.nix</filename> define the option
-<xref linkend="opt-environment.systemPackages"/>.  When multiple modules
-define an option, NixOS will try to <emphasis>merge</emphasis> the
-definitions.  In the case of
-<xref linkend="opt-environment.systemPackages"/>, that’s easy: the lists of
-packages can simply be concatenated.  The value in
-<filename>configuration.nix</filename> is merged last, so for
-list-type options, it will appear at the end of the merged list. If
-you want it to appear first, you can use <varname>mkBefore</varname>:
-
+  Note that both <filename>configuration.nix</filename> and
+  <filename>kde.nix</filename> define the option
+  <xref linkend="opt-environment.systemPackages"/>. When multiple modules
+  define an option, NixOS will try to <emphasis>merge</emphasis> the
+  definitions. In the case of <xref linkend="opt-environment.systemPackages"/>,
+  that’s easy: the lists of packages can simply be concatenated. The value in
+  <filename>configuration.nix</filename> is merged last, so for list-type
+  options, it will appear at the end of the merged list. If you want it to
+  appear first, you can use <varname>mkBefore</varname>:
 <programlisting>
 <xref linkend="opt-boot.kernelModules"/> = mkBefore [ "kvm-intel" ];
 </programlisting>
+  This causes the <literal>kvm-intel</literal> kernel module to be loaded
+  before any other kernel modules.
+ </para>
 
-This causes the <literal>kvm-intel</literal> kernel module to be
-loaded before any other kernel modules.</para>
-
-<para>For other types of options, a merge may not be possible. For
-instance, if two modules define
-<xref linkend="opt-services.httpd.adminAddr"/>,
-<command>nixos-rebuild</command> will give an error:
-
+ <para>
+  For other types of options, a merge may not be possible. For instance, if two
+  modules define <xref linkend="opt-services.httpd.adminAddr"/>,
+  <command>nixos-rebuild</command> will give an error:
 <screen>
 The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'.
 </screen>
-
-When that happens, it’s possible to force one definition take
-precedence over the others:
-
+  When that happens, it’s possible to force one definition take precedence
+  over the others:
 <programlisting>
 <xref linkend="opt-services.httpd.adminAddr"/> = pkgs.lib.mkForce "bob@example.org";
 </programlisting>
+ </para>
 
-</para>
-
-<para>When using multiple modules, you may need to access
-configuration values defined in other modules.  This is what the
-<varname>config</varname> function argument is for: it contains the
-complete, merged system configuration.  That is,
-<varname>config</varname> is the result of combining the
-configurations returned by every module<footnote><para>If you’re
-wondering how it’s possible that the (indirect)
-<emphasis>result</emphasis> of a function is passed as an
-<emphasis>input</emphasis> to that same function: that’s because Nix
-is a “lazy” language — it only computes values when they are needed.
-This works as long as no individual configuration value depends on
-itself.</para></footnote>.  For example, here is a module that adds
-some packages to <xref linkend="opt-environment.systemPackages"/> only if
-<xref linkend="opt-services.xserver.enable"/> is set to
-<literal>true</literal> somewhere else:
-
+ <para>
+  When using multiple modules, you may need to access configuration values
+  defined in other modules. This is what the <varname>config</varname> function
+  argument is for: it contains the complete, merged system configuration. That
+  is, <varname>config</varname> is the result of combining the configurations
+  returned by every module
+  <footnote>
+   <para>
+    If you’re wondering how it’s possible that the (indirect)
+    <emphasis>result</emphasis> of a function is passed as an
+    <emphasis>input</emphasis> to that same function: that’s because Nix is a
+    “lazy” language — it only computes values when they are needed. This
+    works as long as no individual configuration value depends on itself.
+   </para>
+  </footnote>
+  . For example, here is a module that adds some packages to
+  <xref linkend="opt-environment.systemPackages"/> only if
+  <xref linkend="opt-services.xserver.enable"/> is set to
+  <literal>true</literal> somewhere else:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -105,13 +99,12 @@ some packages to <xref linkend="opt-environment.systemPackages"/> only if
       [ ];
 }
 </programlisting>
+ </para>
 
-</para>
-
-<para>With multiple modules, it may not be obvious what the final
-value of a configuration option is.  The command
-<option>nixos-option</option> allows you to find out:
-
+ <para>
+  With multiple modules, it may not be obvious what the final value of a
+  configuration option is. The command <option>nixos-option</option> allows you
+  to find out:
 <screen>
 $ nixos-option <xref linkend="opt-services.xserver.enable"/>
 true
@@ -119,14 +112,11 @@ true
 $ nixos-option <xref linkend="opt-boot.kernelModules"/>
 [ "tun" "ipv6" "loop" <replaceable>...</replaceable> ]
 </screen>
-
-Interactive exploration of the configuration is possible using
-<command
+  Interactive exploration of the configuration is possible using
+  <command
 xlink:href="https://github.com/edolstra/nix-repl">nix-repl</command>,
-a read-eval-print loop for Nix expressions.  It’s not installed by
-default; run <literal>nix-env -i nix-repl</literal> to get it.  A
-typical use:
-
+  a read-eval-print loop for Nix expressions. It’s not installed by default;
+  run <literal>nix-env -i nix-repl</literal> to get it. A typical use:
 <screen>
 $ nix-repl '&lt;nixpkgs/nixos>'
 
@@ -136,7 +126,5 @@ nix-repl> config.<xref linkend="opt-networking.hostName"/>
 nix-repl> map (x: x.hostName) config.<xref linkend="opt-services.httpd.virtualHosts"/>
 [ "example.org" "example.gov" ]
 </screen>
-
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml
index bbbee3a52ed5..e217a99148b9 100644
--- a/nixos/doc/manual/configuration/network-manager.xml
+++ b/nixos/doc/manual/configuration/network-manager.xml
@@ -3,39 +3,42 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-networkmanager">
+ <title>NetworkManager</title>
 
-<title>NetworkManager</title>
-
-<para>To facilitate network configuration, some desktop environments
-use NetworkManager. You can enable NetworkManager by setting:
-
+ <para>
+  To facilitate network configuration, some desktop environments use
+  NetworkManager. You can enable NetworkManager by setting:
 <programlisting>
 <xref linkend="opt-networking.networkmanager.enable"/> = true;
 </programlisting>
+  some desktop managers (e.g., GNOME) enable NetworkManager automatically for
+  you.
+ </para>
 
-some desktop managers (e.g., GNOME) enable NetworkManager
-automatically for you.</para>
-
-<para>All users that should have permission to change network settings must
-belong to the <code>networkmanager</code> group:
-
+ <para>
+  All users that should have permission to change network settings must belong
+  to the <code>networkmanager</code> group:
 <programlisting>
 <link linkend="opt-users.users._name__.extraGroups">users.extraUsers.youruser.extraGroups</link> = [ "networkmanager" ];
 </programlisting>
-</para>
+ </para>
 
-<para>NetworkManager is controlled using either <command>nmcli</command> or
-<command>nmtui</command> (curses-based terminal user interface). See their
-manual pages for details on their usage. Some desktop environments (GNOME, KDE)
-have their own configuration tools for NetworkManager. On XFCE, there is no
-configuration tool for NetworkManager by default: by adding
-<code>networkmanagerapplet</code> to the list of system packages, the graphical
-applet will be installed and will launch automatically when XFCE is starting
-(and will show in the status tray).</para>
-
-<note><para><code>networking.networkmanager</code> and
-<code>networking.wireless</code> (WPA Supplicant) cannot be enabled at the same
-time: you can still connect to the wireless networks using
-NetworkManager.</para></note>
+ <para>
+  NetworkManager is controlled using either <command>nmcli</command> or
+  <command>nmtui</command> (curses-based terminal user interface). See their
+  manual pages for details on their usage. Some desktop environments (GNOME,
+  KDE) have their own configuration tools for NetworkManager. On XFCE, there is
+  no configuration tool for NetworkManager by default: by adding
+  <code>networkmanagerapplet</code> to the list of system packages, the
+  graphical applet will be installed and will launch automatically when XFCE is
+  starting (and will show in the status tray).
+ </para>
 
+ <note>
+  <para>
+   <code>networking.networkmanager</code> and <code>networking.wireless</code>
+   (WPA Supplicant) cannot be enabled at the same time: you can still connect
+   to the wireless networks using NetworkManager.
+  </para>
+ </note>
 </section>
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml
index 5f08bc1f1275..02cf811e0bd3 100644
--- a/nixos/doc/manual/configuration/networking.xml
+++ b/nixos/doc/manual/configuration/networking.xml
@@ -3,20 +3,17 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-networking">
-
-<title>Networking</title>
-
-<para>This section describes how to configure networking components on
-your NixOS machine.</para>
-
-<xi:include href="network-manager.xml" />
-<xi:include href="ssh.xml" />
-<xi:include href="ipv4-config.xml" />
-<xi:include href="ipv6-config.xml" />
-<xi:include href="firewall.xml" />
-<xi:include href="wireless.xml" />
-<xi:include href="ad-hoc-network-config.xml" />
-
+ <title>Networking</title>
+ <para>
+  This section describes how to configure networking components on your NixOS
+  machine.
+ </para>
+ <xi:include href="network-manager.xml" />
+ <xi:include href="ssh.xml" />
+ <xi:include href="ipv4-config.xml" />
+ <xi:include href="ipv6-config.xml" />
+ <xi:include href="firewall.xml" />
+ <xi:include href="wireless.xml" />
+ <xi:include href="ad-hoc-network-config.xml" />
 <!-- TODO: OpenVPN, NAT -->
-
 </chapter>
diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml
index 73c1722da02c..e8ac5d0681a9 100644
--- a/nixos/doc/manual/configuration/package-mgmt.xml
+++ b/nixos/doc/manual/configuration/package-mgmt.xml
@@ -3,32 +3,29 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-package-management">
-
-<title>Package Management</title>
-
-<para>This section describes how to add additional packages to your
-system.  NixOS has two distinct styles of package management:
-
-<itemizedlist>
-
-  <listitem><para><emphasis>Declarative</emphasis>, where you declare
-  what packages you want in your
-  <filename>configuration.nix</filename>.  Every time you run
-  <command>nixos-rebuild</command>, NixOS will ensure that you get a
-  consistent set of binaries corresponding to your
-  specification.</para></listitem>
-
-  <listitem><para><emphasis>Ad hoc</emphasis>, where you install,
-  upgrade and uninstall packages via the <command>nix-env</command>
-  command.  This style allows mixing packages from different Nixpkgs
-  versions.  It’s the only choice for non-root
-  users.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<xi:include href="declarative-packages.xml" />
-<xi:include href="ad-hoc-packages.xml" />
-
+ <title>Package Management</title>
+ <para>
+  This section describes how to add additional packages to your system. NixOS
+  has two distinct styles of package management:
+  <itemizedlist>
+   <listitem>
+    <para>
+     <emphasis>Declarative</emphasis>, where you declare what packages you want
+     in your <filename>configuration.nix</filename>. Every time you run
+     <command>nixos-rebuild</command>, NixOS will ensure that you get a
+     consistent set of binaries corresponding to your specification.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <emphasis>Ad hoc</emphasis>, where you install, upgrade and uninstall
+     packages via the <command>nix-env</command> command. This style allows
+     mixing packages from different Nixpkgs versions. It’s the only choice
+     for non-root users.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
+ <xi:include href="declarative-packages.xml" />
+ <xi:include href="ad-hoc-packages.xml" />
 </chapter>
diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml
index 7dbe598cffe2..6e883e3fbbc1 100644
--- a/nixos/doc/manual/configuration/ssh.xml
+++ b/nixos/doc/manual/configuration/ssh.xml
@@ -3,30 +3,25 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-ssh">
+ <title>Secure Shell Access</title>
 
-<title>Secure Shell Access</title>
-
-<para>Secure shell (SSH) access to your machine can be enabled by
-setting:
-
+ <para>
+  Secure shell (SSH) access to your machine can be enabled by setting:
 <programlisting>
 <xref linkend="opt-services.openssh.enable"/> = true;
 </programlisting>
+  By default, root logins using a password are disallowed. They can be disabled
+  entirely by setting <xref linkend="opt-services.openssh.permitRootLogin"/> to
+  <literal>"no"</literal>.
+ </para>
 
-By default, root logins using a password are disallowed.  They can be
-disabled entirely by setting
-<xref linkend="opt-services.openssh.permitRootLogin"/> to
-<literal>"no"</literal>.</para>
-
-<para>You can declaratively specify authorised RSA/DSA public keys for
-a user as follows:
-
+ <para>
+  You can declaratively specify authorised RSA/DSA public keys for a user as
+  follows:
 <!-- FIXME: this might not work if the user is unmanaged. -->
 <programlisting>
 <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">users.extraUsers.alice.openssh.authorizedKeys.keys</link> =
   [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ];
 </programlisting>
-
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml
index 38032c5d9dc3..ea980254a8fc 100644
--- a/nixos/doc/manual/configuration/summary.xml
+++ b/nixos/doc/manual/configuration/summary.xml
@@ -3,190 +3,225 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     version="5.0"
     xml:id="sec-nix-syntax-summary">
+ <title>Syntax Summary</title>
 
-<title>Syntax Summary</title>
-
-<para>Below is a summary of the most important syntactic constructs in
-the Nix expression language.  It’s not complete.  In particular, there
-are many other built-in functions.  See the <link
+ <para>
+  Below is a summary of the most important syntactic constructs in the Nix
+  expression language. It’s not complete. In particular, there are many other
+  built-in functions. See the
+  <link
 xlink:href="http://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix
-manual</link> for the rest.</para>
+  manual</link> for the rest.
+ </para>
 
-<informaltable frame='none'>
+ <informaltable frame='none'>
   <tgroup cols='2'>
-    <colspec colname='c1' rowsep='1' colsep='1' />
-    <colspec colname='c2' rowsep='1' />
-    <thead>
-      <row>
-        <entry>Example</entry>
-        <entry>Description</entry>
-      </row>
-    </thead>
-    <tbody>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Basic values</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>"Hello world"</literal></entry>
-        <entry>A string</entry>
-      </row>
-      <row>
-        <entry><literal>"${pkgs.bash}/bin/sh"</literal></entry>
-        <entry>A string containing an expression (expands to <literal>"/nix/store/<replaceable>hash</replaceable>-bash-<replaceable>version</replaceable>/bin/sh"</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>true</literal>, <literal>false</literal></entry>
-        <entry>Booleans</entry>
-      </row>
-      <row>
-        <entry><literal>123</literal></entry>
-        <entry>An integer</entry>
-      </row>
-      <row>
-        <entry><literal>./foo.png</literal></entry>
-        <entry>A path (relative to the containing Nix expression)</entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Compound values</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>{ x = 1; y = 2; }</literal></entry>
-        <entry>A set with attributes named <literal>x</literal> and <literal>y</literal></entry>
-      </row>
-      <row>
-        <entry><literal>{ foo.bar = 1; }</literal></entry>
-        <entry>A nested set, equivalent to <literal>{ foo = { bar = 1; }; }</literal></entry>
-      </row>
-      <row>
-        <entry><literal>rec { x = "foo"; y = x + "bar"; }</literal></entry>
-        <entry>A recursive set, equivalent to <literal>{ x = "foo"; y = "foobar"; }</literal></entry>
-      </row>
-      <row>
-        <entry><literal>[ "foo" "bar" ]</literal></entry>
-        <entry>A list with two elements</entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Operators</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>"foo" + "bar"</literal></entry>
-        <entry>String concatenation</entry>
-      </row>
-      <row>
-        <entry><literal>1 + 2</literal></entry>
-        <entry>Integer addition</entry>
-      </row>
-      <row>
-        <entry><literal>"foo" == "f" + "oo"</literal></entry>
-        <entry>Equality test (evaluates to <literal>true</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>"foo" != "bar"</literal></entry>
-        <entry>Inequality test (evaluates to <literal>true</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>!true</literal></entry>
-        <entry>Boolean negation</entry>
-      </row>
-      <row>
-        <entry><literal>{ x = 1; y = 2; }.x</literal></entry>
-        <entry>Attribute selection (evaluates to <literal>1</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>{ x = 1; y = 2; }.z or 3</literal></entry>
-        <entry>Attribute selection with default (evaluates to <literal>3</literal>)</entry>
-      </row>
-      <row>
-        <entry><literal>{ x = 1; y = 2; } // { z = 3; }</literal></entry>
-        <entry>Merge two sets (attributes in the right-hand set taking precedence)</entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Control structures</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>if 1 + 1 == 2 then "yes!" else "no!"</literal></entry>
-        <entry>Conditional expression</entry>
-      </row>
-      <row>
-        <entry><literal>assert 1 + 1 == 2; "yes!"</literal></entry>
-        <entry>Assertion check (evaluates to <literal>"yes!"</literal>). See <xref
+   <colspec colname='c1' rowsep='1' colsep='1' />
+   <colspec colname='c2' rowsep='1' />
+   <thead>
+    <row>
+     <entry>Example</entry>
+     <entry>Description</entry>
+    </row>
+   </thead>
+   <tbody>
+    <row>
+     <entry namest="c1" nameend="c2"><emphasis>Basic values</emphasis>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>"Hello world"</literal>
+     </entry>
+     <entry>A string</entry>
+    </row>
+    <row>
+     <entry><literal>"${pkgs.bash}/bin/sh"</literal>
+     </entry>
+     <entry>A string containing an expression (expands to <literal>"/nix/store/<replaceable>hash</replaceable>-bash-<replaceable>version</replaceable>/bin/sh"</literal>)</entry>
+    </row>
+    <row>
+     <entry><literal>true</literal>, <literal>false</literal>
+     </entry>
+     <entry>Booleans</entry>
+    </row>
+    <row>
+     <entry><literal>123</literal>
+     </entry>
+     <entry>An integer</entry>
+    </row>
+    <row>
+     <entry><literal>./foo.png</literal>
+     </entry>
+     <entry>A path (relative to the containing Nix expression)</entry>
+    </row>
+    <row>
+     <entry namest="c1" nameend="c2"><emphasis>Compound values</emphasis>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>{ x = 1; y = 2; }</literal>
+     </entry>
+     <entry>A set with attributes named <literal>x</literal> and <literal>y</literal>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>{ foo.bar = 1; }</literal>
+     </entry>
+     <entry>A nested set, equivalent to <literal>{ foo = { bar = 1; }; }</literal>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>rec { x = "foo"; y = x + "bar"; }</literal>
+     </entry>
+     <entry>A recursive set, equivalent to <literal>{ x = "foo"; y = "foobar"; }</literal>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>[ "foo" "bar" ]</literal>
+     </entry>
+     <entry>A list with two elements</entry>
+    </row>
+    <row>
+     <entry namest="c1" nameend="c2"><emphasis>Operators</emphasis>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>"foo" + "bar"</literal>
+     </entry>
+     <entry>String concatenation</entry>
+    </row>
+    <row>
+     <entry><literal>1 + 2</literal>
+     </entry>
+     <entry>Integer addition</entry>
+    </row>
+    <row>
+     <entry><literal>"foo" == "f" + "oo"</literal>
+     </entry>
+     <entry>Equality test (evaluates to <literal>true</literal>)</entry>
+    </row>
+    <row>
+     <entry><literal>"foo" != "bar"</literal>
+     </entry>
+     <entry>Inequality test (evaluates to <literal>true</literal>)</entry>
+    </row>
+    <row>
+     <entry><literal>!true</literal>
+     </entry>
+     <entry>Boolean negation</entry>
+    </row>
+    <row>
+     <entry><literal>{ x = 1; y = 2; }.x</literal>
+     </entry>
+     <entry>Attribute selection (evaluates to <literal>1</literal>)</entry>
+    </row>
+    <row>
+     <entry><literal>{ x = 1; y = 2; }.z or 3</literal>
+     </entry>
+     <entry>Attribute selection with default (evaluates to <literal>3</literal>)</entry>
+    </row>
+    <row>
+     <entry><literal>{ x = 1; y = 2; } // { z = 3; }</literal>
+     </entry>
+     <entry>Merge two sets (attributes in the right-hand set taking precedence)</entry>
+    </row>
+    <row>
+     <entry namest="c1" nameend="c2"><emphasis>Control structures</emphasis>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>if 1 + 1 == 2 then "yes!" else "no!"</literal>
+     </entry>
+     <entry>Conditional expression</entry>
+    </row>
+    <row>
+     <entry><literal>assert 1 + 1 == 2; "yes!"</literal>
+     </entry>
+     <entry>Assertion check (evaluates to <literal>"yes!"</literal>). See <xref
     linkend="sec-assertions"/> for using assertions in modules</entry>
-      </row>
-      <row>
-        <entry><literal>let x = "foo"; y = "bar"; in x + y</literal></entry>
-        <entry>Variable definition</entry>
-      </row>
-      <row>
-        <entry><literal>with pkgs.lib; head [ 1 2 3 ]</literal></entry>
-        <entry>Add all attributes from the given set to the scope
+    </row>
+    <row>
+     <entry><literal>let x = "foo"; y = "bar"; in x + y</literal>
+     </entry>
+     <entry>Variable definition</entry>
+    </row>
+    <row>
+     <entry><literal>with pkgs.lib; head [ 1 2 3 ]</literal>
+     </entry>
+     <entry>Add all attributes from the given set to the scope
         (evaluates to <literal>1</literal>)</entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Functions (lambdas)</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>x: x + 1</literal></entry>
-        <entry>A function that expects an integer and returns it increased by 1</entry>
-      </row>
-      <row>
-        <entry><literal>(x: x + 1) 100</literal></entry>
-        <entry>A function call (evaluates to 101)</entry>
-      </row>
-      <row>
-        <entry><literal>let inc = x: x + 1; in inc (inc (inc 100))</literal></entry>
-        <entry>A function bound to a variable and subsequently called by name (evaluates to 103)</entry>
-      </row>
-      <row>
-        <entry><literal>{ x, y }: x + y</literal></entry>
-        <entry>A function that expects a set with required attributes
+    </row>
+    <row>
+     <entry namest="c1" nameend="c2"><emphasis>Functions (lambdas)</emphasis>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>x: x + 1</literal>
+     </entry>
+     <entry>A function that expects an integer and returns it increased by 1</entry>
+    </row>
+    <row>
+     <entry><literal>(x: x + 1) 100</literal>
+     </entry>
+     <entry>A function call (evaluates to 101)</entry>
+    </row>
+    <row>
+     <entry><literal>let inc = x: x + 1; in inc (inc (inc 100))</literal>
+     </entry>
+     <entry>A function bound to a variable and subsequently called by name (evaluates to 103)</entry>
+    </row>
+    <row>
+     <entry><literal>{ x, y }: x + y</literal>
+     </entry>
+     <entry>A function that expects a set with required attributes
         <literal>x</literal> and <literal>y</literal> and concatenates
         them</entry>
-      </row>
-      <row>
-        <entry><literal>{ x, y ? "bar" }: x + y</literal></entry>
-        <entry>A function that expects a set with required attribute
+    </row>
+    <row>
+     <entry><literal>{ x, y ? "bar" }: x + y</literal>
+     </entry>
+     <entry>A function that expects a set with required attribute
         <literal>x</literal> and optional <literal>y</literal>, using
         <literal>"bar"</literal> as default value for
-        <literal>y</literal></entry>
-      </row>
-      <row>
-        <entry><literal>{ x, y, ... }: x + y</literal></entry>
-        <entry>A function that expects a set with required attributes
+        <literal>y</literal>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>{ x, y, ... }: x + y</literal>
+     </entry>
+     <entry>A function that expects a set with required attributes
         <literal>x</literal> and <literal>y</literal> and ignores any
         other attributes</entry>
-      </row>
-      <row>
-        <entry><literal>{ x, y } @ args: x + y</literal></entry>
-        <entry>A function that expects a set with required attributes
+    </row>
+    <row>
+     <entry><literal>{ x, y } @ args: x + y</literal>
+     </entry>
+     <entry>A function that expects a set with required attributes
         <literal>x</literal> and <literal>y</literal>, and binds the
-        whole set to <literal>args</literal></entry>
-      </row>
-
-      <row>
-        <entry namest="c1" nameend="c2"><emphasis>Built-in functions</emphasis></entry>
-      </row>
-      <row>
-        <entry><literal>import ./foo.nix</literal></entry>
-        <entry>Load and return Nix expression in given file</entry>
-      </row>
-      <row>
-        <entry><literal>map (x: x + x) [ 1 2 3 ]</literal></entry>
-        <entry>Apply a function to every element of a list (evaluates to <literal>[ 2 4 6 ]</literal>)</entry>
-      </row>
-      <!--
+        whole set to <literal>args</literal>
+     </entry>
+    </row>
+    <row>
+     <entry namest="c1" nameend="c2"><emphasis>Built-in functions</emphasis>
+     </entry>
+    </row>
+    <row>
+     <entry><literal>import ./foo.nix</literal>
+     </entry>
+     <entry>Load and return Nix expression in given file</entry>
+    </row>
+    <row>
+     <entry><literal>map (x: x + x) [ 1 2 3 ]</literal>
+     </entry>
+     <entry>Apply a function to every element of a list (evaluates to <literal>[ 2 4 6 ]</literal>)</entry>
+    </row>
+<!--
       <row>
         <entry><literal>throw "Urgh"</literal></entry>
         <entry>Raise an error condition</entry>
       </row>
       -->
-
-    </tbody>
+   </tbody>
   </tgroup>
-</informaltable>
-
+ </informaltable>
 </section>
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index 1456a5894119..66c1c6eb3a11 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -3,14 +3,12 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-user-management">
-
-<title>User Management</title>
-
-<para>NixOS supports both declarative and imperative styles of user
-management.  In the declarative style, users are specified in
-<filename>configuration.nix</filename>.  For instance, the following
-states that a user account named <literal>alice</literal> shall exist:
-
+ <title>User Management</title>
+ <para>
+  NixOS supports both declarative and imperative styles of user management. In
+  the declarative style, users are specified in
+  <filename>configuration.nix</filename>. For instance, the following states
+  that a user account named <literal>alice</literal> shall exist:
 <programlisting>
 <xref linkend="opt-users.users"/>.alice = {
   <link linkend="opt-users.users._name__.isNormalUser">isNormalUser</link> = true;
@@ -20,81 +18,71 @@ states that a user account named <literal>alice</literal> shall exist:
   <link linkend="opt-users.users._name__.openssh.authorizedKeys.keys">openssh.authorizedKeys.keys</link> = [ "ssh-dss AAAAB3Nza... alice@foobar" ];
 };
 </programlisting>
-
-Note that <literal>alice</literal> is a member of the
-<literal>wheel</literal> and <literal>networkmanager</literal> groups,
-which allows her to use <command>sudo</command> to execute commands as
-<literal>root</literal> and to configure the network, respectively.
-Also note the SSH public key that allows remote logins with the
-corresponding private key. Users created in this way do not have a
-password by default, so they cannot log in via mechanisms that require
-a password. However, you can use the <command>passwd</command> program
-to set a password, which is retained across invocations of
-<command>nixos-rebuild</command>.</para>
-
-<para>If you set <xref linkend="opt-users.mutableUsers"/> to false, then the contents of
-<literal>/etc/passwd</literal> and <literal>/etc/group</literal> will be congruent to
-your NixOS configuration. For instance, if you remove a user from <xref linkend="opt-users.users"/>
-and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users
-and groups, such as useradd, are no longer available. Passwords may still be
-assigned by setting the user's <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link>
-option. A hashed password can be generated using <command>mkpasswd -m sha-512</command>
-after installing the <literal>mkpasswd</literal> package.</para>
-
-<para>A user ID (uid) is assigned automatically.  You can also specify
-a uid manually by adding
-
+  Note that <literal>alice</literal> is a member of the
+  <literal>wheel</literal> and <literal>networkmanager</literal> groups, which
+  allows her to use <command>sudo</command> to execute commands as
+  <literal>root</literal> and to configure the network, respectively. Also note
+  the SSH public key that allows remote logins with the corresponding private
+  key. Users created in this way do not have a password by default, so they
+  cannot log in via mechanisms that require a password. However, you can use
+  the <command>passwd</command> program to set a password, which is retained
+  across invocations of <command>nixos-rebuild</command>.
+ </para>
+ <para>
+  If you set <xref linkend="opt-users.mutableUsers"/> to false, then the
+  contents of <literal>/etc/passwd</literal> and <literal>/etc/group</literal>
+  will be congruent to your NixOS configuration. For instance, if you remove a
+  user from <xref linkend="opt-users.users"/> and run nixos-rebuild, the user
+  account will cease to exist. Also, imperative commands for managing users and
+  groups, such as useradd, are no longer available. Passwords may still be
+  assigned by setting the user's
+  <link linkend="opt-users.users._name__.hashedPassword">hashedPassword</link>
+  option. A hashed password can be generated using <command>mkpasswd -m
+  sha-512</command> after installing the <literal>mkpasswd</literal> package.
+ </para>
+ <para>
+  A user ID (uid) is assigned automatically. You can also specify a uid
+  manually by adding
 <programlisting>
     uid = 1000;
 </programlisting>
-
-to the user specification.</para>
-
-<para>Groups can be specified similarly.  The following states that a
-group named <literal>students</literal> shall exist:
-
+  to the user specification.
+ </para>
+ <para>
+  Groups can be specified similarly. The following states that a group named
+  <literal>students</literal> shall exist:
 <programlisting>
 <xref linkend="opt-users.groups"/>.students.gid = 1000;
 </programlisting>
-
-As with users, the group ID (gid) is optional and will be assigned
-automatically if it’s missing.</para>
-
-<para>In the imperative style, users and groups are managed by
-commands such as <command>useradd</command>,
-<command>groupmod</command> and so on.  For instance, to create a user
-account named <literal>alice</literal>:
-
+  As with users, the group ID (gid) is optional and will be assigned
+  automatically if it’s missing.
+ </para>
+ <para>
+  In the imperative style, users and groups are managed by commands such as
+  <command>useradd</command>, <command>groupmod</command> and so on. For
+  instance, to create a user account named <literal>alice</literal>:
 <screen>
 # useradd -m alice</screen>
-
-To make all nix tools available to this new user use `su - USER` which
-opens a login shell (==shell that loads the profile) for given user.
-This will create the ~/.nix-defexpr symlink. So run:
-
+  To make all nix tools available to this new user use `su - USER` which opens
+  a login shell (==shell that loads the profile) for given user. This will
+  create the ~/.nix-defexpr symlink. So run:
 <screen>
 # su - alice -c "true"</screen>
-
-
-The flag <option>-m</option> causes the creation of a home directory
-for the new user, which is generally what you want.  The user does not
-have an initial password and therefore cannot log in.  A password can
-be set using the <command>passwd</command> utility:
-
+  The flag <option>-m</option> causes the creation of a home directory for the
+  new user, which is generally what you want. The user does not have an initial
+  password and therefore cannot log in. A password can be set using the
+  <command>passwd</command> utility:
 <screen>
 # passwd alice
 Enter new UNIX password: ***
 Retype new UNIX password: ***
 </screen>
-
-A user can be deleted using <command>userdel</command>:
-
+  A user can be deleted using <command>userdel</command>:
 <screen>
 # userdel -r alice</screen>
-
-The flag <option>-r</option> deletes the user’s home directory.
-Accounts can be modified using <command>usermod</command>.  Unix
-groups can be managed using <command>groupadd</command>,
-<command>groupmod</command> and <command>groupdel</command>.</para>
-
+  The flag <option>-r</option> deletes the user’s home directory. Accounts
+  can be modified using <command>usermod</command>. Unix groups can be managed
+  using <command>groupadd</command>, <command>groupmod</command> and
+  <command>groupdel</command>.
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml
index 6ce43a437009..999447234ad1 100644
--- a/nixos/doc/manual/configuration/wireless.xml
+++ b/nixos/doc/manual/configuration/wireless.xml
@@ -3,22 +3,20 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-wireless">
+ <title>Wireless Networks</title>
 
-<title>Wireless Networks</title>
-
-<para>For a desktop installation using NetworkManager (e.g., GNOME),
-you just have to make sure the user is in the
-<code>networkmanager</code> group and you can skip the rest of this
-section on wireless networks.</para>
-
-<para>
-NixOS will start wpa_supplicant for you if you enable this setting:
+ <para>
+  For a desktop installation using NetworkManager (e.g., GNOME), you just have
+  to make sure the user is in the <code>networkmanager</code> group and you can
+  skip the rest of this section on wireless networks.
+ </para>
 
+ <para>
+  NixOS will start wpa_supplicant for you if you enable this setting:
 <programlisting>
 <xref linkend="opt-networking.wireless.enable"/> = true;
 </programlisting>
-
-NixOS lets you specify networks for wpa_supplicant declaratively:
+  NixOS lets you specify networks for wpa_supplicant declaratively:
 <programlisting>
 <xref linkend="opt-networking.wireless.networks"/> = {
   echelon = {
@@ -27,27 +25,21 @@ NixOS lets you specify networks for wpa_supplicant declaratively:
   "free.wifi" = {};
 }
 </programlisting>
+  Be aware that keys will be written to the nix store in plaintext! When no
+  networks are set, it will default to using a configuration file at
+  <literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
+  yourself to define wireless networks, WPA keys and so on (see
+  wpa_supplicant.conf(5)).
+ </para>
 
-Be aware that keys will be written to the nix store in plaintext!
-
-When no networks are set, it will default to using a configuration file at
-<literal>/etc/wpa_supplicant.conf</literal>. You should edit this file
-yourself to define wireless networks, WPA keys and so on (see
-wpa_supplicant.conf(5)).
-</para>
-
-<para>
-If you are using WPA2 the <command>wpa_passphrase</command> tool might be useful
-to generate the <literal>wpa_supplicant.conf</literal>.
-
+ <para>
+  If you are using WPA2 the <command>wpa_passphrase</command> tool might be
+  useful to generate the <literal>wpa_supplicant.conf</literal>.
 <screen>
 # wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf</screen>
-
-After you have edited the <literal>wpa_supplicant.conf</literal>,
-you need to restart the wpa_supplicant service.
-
+  After you have edited the <literal>wpa_supplicant.conf</literal>, you need to
+  restart the wpa_supplicant service.
 <screen>
 # systemctl restart wpa_supplicant.service</screen>
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml
index fd0daf6c6e57..9a0969ad6355 100644
--- a/nixos/doc/manual/configuration/x-windows.xml
+++ b/nixos/doc/manual/configuration/x-windows.xml
@@ -3,27 +3,25 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-x11">
-
-<title>X Window System</title>
-
-<para>The X Window System (X11) provides the basis of NixOS’ graphical
-user interface.  It can be enabled as follows:
+ <title>X Window System</title>
+ <para>
+  The X Window System (X11) provides the basis of NixOS’ graphical user
+  interface. It can be enabled as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.enable"/> = true;
 </programlisting>
-The X server will automatically detect and use the appropriate video
-driver from a set of X.org drivers (such as <literal>vesa</literal>
-and <literal>intel</literal>).  You can also specify a driver
-manually, e.g.
+  The X server will automatically detect and use the appropriate video driver
+  from a set of X.org drivers (such as <literal>vesa</literal> and
+  <literal>intel</literal>). You can also specify a driver manually, e.g.
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "r128" ];
 </programlisting>
-to enable X.org’s <literal>xf86-video-r128</literal> driver.</para>
-
-<para>You also need to enable at least one desktop or window manager.
-Otherwise, you can only log into a plain undecorated
-<command>xterm</command> window.  Thus you should pick one or more of
-the following lines:
+  to enable X.org’s <literal>xf86-video-r128</literal> driver.
+ </para>
+ <para>
+  You also need to enable at least one desktop or window manager. Otherwise,
+  you can only log into a plain undecorated <command>xterm</command> window.
+  Thus you should pick one or more of the following lines:
 <programlisting>
 <xref linkend="opt-services.xserver.desktopManager.plasma5.enable"/> = true;
 <xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
@@ -33,108 +31,105 @@ the following lines:
 <xref linkend="opt-services.xserver.windowManager.icewm.enable"/> = true;
 <xref linkend="opt-services.xserver.windowManager.i3.enable"/> = true;
 </programlisting>
-</para>
-
-<para>NixOS’s default <emphasis>display manager</emphasis> (the
-program that provides a graphical login prompt and manages the X
-server) is SLiM. You can select an alternative one by picking one
-of the following lines:
+ </para>
+ <para>
+  NixOS’s default <emphasis>display manager</emphasis> (the program that
+  provides a graphical login prompt and manages the X server) is SLiM. You can
+  select an alternative one by picking one of the following lines:
 <programlisting>
 <xref linkend="opt-services.xserver.displayManager.sddm.enable"/> = true;
 <xref linkend="opt-services.xserver.displayManager.lightdm.enable"/> = true;
 </programlisting>
-</para>
-
-<para>You can set the keyboard layout (and optionally the layout variant):
+ </para>
+ <para>
+  You can set the keyboard layout (and optionally the layout variant):
 <programlisting>
 <xref linkend="opt-services.xserver.layout"/> = "de";
 <xref linkend="opt-services.xserver.xkbVariant"/> = "neo";
 </programlisting>
-</para>
-
-<para>The X server is started automatically at boot time.  If you
-don’t want this to happen, you can set:
+ </para>
+ <para>
+  The X server is started automatically at boot time. If you don’t want this
+  to happen, you can set:
 <programlisting>
 <xref linkend="opt-services.xserver.autorun"/> = false;
 </programlisting>
-The X server can then be started manually:
+  The X server can then be started manually:
 <screen>
 # systemctl start display-manager.service
 </screen>
-</para>
-
-
-<simplesect><title>NVIDIA Graphics Cards</title>
-
-<para>NVIDIA provides a proprietary driver for its graphics cards that
-has better 3D performance than the X.org drivers.  It is not enabled
-by default because it’s not free software.  You can enable it as follows:
+ </para>
+ <simplesect>
+  <title>NVIDIA Graphics Cards</title>
+  <para>
+   NVIDIA provides a proprietary driver for its graphics cards that has better
+   3D performance than the X.org drivers. It is not enabled by default because
+   it’s not free software. You can enable it as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidia" ];
 </programlisting>
-Or if you have an older card, you may have to use one of the legacy drivers:
+   Or if you have an older card, you may have to use one of the legacy drivers:
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy340" ];
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy304" ];
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "nvidiaLegacy173" ];
 </programlisting>
-You may need to reboot after enabling this driver to prevent a clash
-with other kernel modules.</para>
-
-<para>On 64-bit systems, if you want full acceleration for 32-bit
-programs such as Wine, you should also set the following:
+   You may need to reboot after enabling this driver to prevent a clash with
+   other kernel modules.
+  </para>
+  <para>
+   On 64-bit systems, if you want full acceleration for 32-bit programs such as
+   Wine, you should also set the following:
 <programlisting>
 <xref linkend="opt-hardware.opengl.driSupport32Bit"/> = true;
 </programlisting>
-</para>
-
-</simplesect>
-
-<simplesect><title>AMD Graphics Cards</title>
-
-<para>AMD provides a proprietary driver for its graphics cards that
-has better 3D performance than the X.org drivers.  It is not enabled
-by default because it’s not free software.  You can enable it as follows:
+  </para>
+ </simplesect>
+ <simplesect>
+  <title>AMD Graphics Cards</title>
+  <para>
+   AMD provides a proprietary driver for its graphics cards that has better 3D
+   performance than the X.org drivers. It is not enabled by default because
+   it’s not free software. You can enable it as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.videoDrivers"/> = [ "ati_unfree" ];
 </programlisting>
-You will need to reboot after enabling this driver to prevent a clash
-with other kernel modules.</para>
-
-<para>On 64-bit systems, if you want full acceleration for 32-bit
-programs such as Wine, you should also set the following:
+   You will need to reboot after enabling this driver to prevent a clash with
+   other kernel modules.
+  </para>
+  <para>
+   On 64-bit systems, if you want full acceleration for 32-bit programs such as
+   Wine, you should also set the following:
 <programlisting>
 <xref linkend="opt-hardware.opengl.driSupport32Bit"/> = true;
 </programlisting>
-</para>
-
-</simplesect>
-
-<simplesect><title>Touchpads</title>
-
-<para>Support for Synaptics touchpads (found in many laptops such as
-the Dell Latitude series) can be enabled as follows:
+  </para>
+ </simplesect>
+ <simplesect>
+  <title>Touchpads</title>
+  <para>
+   Support for Synaptics touchpads (found in many laptops such as the Dell
+   Latitude series) can be enabled as follows:
 <programlisting>
 <xref linkend="opt-services.xserver.libinput.enable"/> = true;
 </programlisting>
-The driver has many options (see <xref linkend="ch-options"/>).  For
-instance, the following disables tap-to-click behavior:
+   The driver has many options (see <xref linkend="ch-options"/>). For
+   instance, the following disables tap-to-click behavior:
 <programlisting>
 <xref linkend="opt-services.xserver.libinput.tapping"/> = false;
 </programlisting>
-Note: the use of <literal>services.xserver.synaptics</literal> is deprecated since NixOS 17.09.
-</para>
-
-</simplesect>
-
-<simplesect><title>GTK/Qt themes</title>
-
-<para>GTK themes can be installed either to user profile or system-wide (via
-<literal>environment.systemPackages</literal>). To make Qt 5 applications look similar
-to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal> package into your
-system environment. It should work for all Qt 5 library versions.
-</para>
-
-</simplesect>
-
+   Note: the use of <literal>services.xserver.synaptics</literal> is deprecated
+   since NixOS 17.09.
+  </para>
+ </simplesect>
+ <simplesect>
+  <title>GTK/Qt themes</title>
+  <para>
+   GTK themes can be installed either to user profile or system-wide (via
+   <literal>environment.systemPackages</literal>). To make Qt 5 applications
+   look similar to GTK2 ones, you can install <literal>qt5.qtbase.gtk</literal>
+   package into your system environment. It should work for all Qt 5 library
+   versions.
+  </para>
+ </simplesect>
 </chapter>
diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml
index 8cb592faed53..40e61d2bd691 100644
--- a/nixos/doc/manual/configuration/xfce.xml
+++ b/nixos/doc/manual/configuration/xfce.xml
@@ -3,23 +3,20 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-xfce">
-
-    <title>Xfce Desktop Environment</title>
-
-    <para>
-        To enable the Xfce Desktop Environment, set
-        <programlisting>
+ <title>Xfce Desktop Environment</title>
+ <para>
+  To enable the Xfce Desktop Environment, set
+<programlisting>
 <link linkend="opt-services.xserver.desktopManager.default">services.xserver.desktopManager</link> = {
   <link linkend="opt-services.xserver.desktopManager.xfce.enable">xfce.enable</link> = true;
   <link linkend="opt-services.xserver.desktopManager.default">default</link> = "xfce";
 };
         </programlisting>
-    </para>
-
-    <para>
-        Optionally, <emphasis>compton</emphasis>
-        can be enabled for nice graphical effects, some example settings:
-        <programlisting>
+ </para>
+ <para>
+  Optionally, <emphasis>compton</emphasis> can be enabled for nice graphical
+  effects, some example settings:
+<programlisting>
 <link linkend="opt-services.compton.enable">services.compton</link> = {
   <link linkend="opt-services.compton.enable">enable</link>          = true;
   <link linkend="opt-services.compton.fade">fade</link>            = true;
@@ -28,67 +25,48 @@
   <link linkend="opt-services.compton.fadeDelta">fadeDelta</link>       = 4;
 };
         </programlisting>
-    </para>
-
-    <para>
-        Some Xfce programs are not installed automatically.
-        To install them manually (system wide), put them into your
-        <xref linkend="opt-environment.systemPackages"/>.
-    </para>
-
-    <simplesect>
-        <title>Thunar Volume Support</title>
-
-        <para>
-            To enable
-            <emphasis>Thunar</emphasis>
-            volume support, put
-            <programlisting>
+ </para>
+ <para>
+  Some Xfce programs are not installed automatically. To install them manually
+  (system wide), put them into your
+  <xref linkend="opt-environment.systemPackages"/>.
+ </para>
+ <simplesect>
+  <title>Thunar Volume Support</title>
+  <para>
+   To enable <emphasis>Thunar</emphasis> volume support, put
+<programlisting>
 <xref linkend="opt-services.xserver.desktopManager.xfce.enable"/> = true;
             </programlisting>
-            into your <emphasis>configuration.nix</emphasis>.
-        </para>
-
-    </simplesect>
-
-    <simplesect>
-        <title>Polkit Authentication Agent</title>
-
-        <para>
-            There is no authentication agent automatically installed alongside
-            Xfce. To allow mounting of local (non-removable) filesystems, you
-            will need to install one.
-
-            Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout and
-            login did the trick.
-        </para>
-
-    </simplesect>
-
-    <simplesect>
-        <title>Troubleshooting</title>
-
-        <para>
-            Even after enabling udisks2, volume management might not work.
-            Thunar and/or the desktop takes time to show up.
-
-            Thunar will spit out this kind of message on start
-            (look at <command>journalctl --user -b</command>).
-
-            <programlisting>
+   into your <emphasis>configuration.nix</emphasis>.
+  </para>
+ </simplesect>
+ <simplesect>
+  <title>Polkit Authentication Agent</title>
+  <para>
+   There is no authentication agent automatically installed alongside Xfce. To
+   allow mounting of local (non-removable) filesystems, you will need to
+   install one. Installing <emphasis>polkit_gnome</emphasis>, a rebuild, logout
+   and login did the trick.
+  </para>
+ </simplesect>
+ <simplesect>
+  <title>Troubleshooting</title>
+  <para>
+   Even after enabling udisks2, volume management might not work. Thunar and/or
+   the desktop takes time to show up. Thunar will spit out this kind of message
+   on start (look at <command>journalctl --user -b</command>).
+<programlisting>
 Thunar:2410): GVFS-RemoteVolumeMonitor-WARNING **: remote volume monitor with dbus name org.gtk.Private.UDisks2VolumeMonitor is not supported
             </programlisting>
-
-            This is caused by some needed GNOME services not running.
-            This is all fixed by enabling "Launch GNOME services on startup" in
-            the Advanced tab of the Session and Startup settings panel.
-            Alternatively, you can run this command to do the same thing.
-            <programlisting>
+   This is caused by some needed GNOME services not running. This is all fixed
+   by enabling "Launch GNOME services on startup" in the Advanced tab of the
+   Session and Startup settings panel. Alternatively, you can run this command
+   to do the same thing.
+<programlisting>
 $ xfconf-query -c xfce4-session -p /compat/LaunchGNOME -s true
             </programlisting>
-            A log-out and re-log will be needed for this to take effect.
-        </para>
-
-    </simplesect>
-
+   A log-out and re-log will be needed for this to take effect.
+  </para>
+ </simplesect>
 </chapter>
diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml
index d3434e1f112e..17c38ffcc717 100644
--- a/nixos/doc/manual/development/assertions.xml
+++ b/nixos/doc/manual/development/assertions.xml
@@ -3,30 +3,29 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-assertions">
+ <title>Warnings and Assertions</title>
 
-<title>Warnings and Assertions</title>
+ <para>
+  When configuration problems are detectable in a module, it is a good idea to
+  write an assertion or warning. Doing so provides clear feedback to the user
+  and prevents errors after the build.
+ </para>
 
-<para>
-  When configuration problems are detectable in a module, it is a good
-  idea to write an assertion or warning. Doing so provides clear
-  feedback to the user and prevents errors after the build.
-</para>
-
-<para>
+ <para>
   Although Nix has the <literal>abort</literal> and
-  <literal>builtins.trace</literal> <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link> to perform such tasks,
-  they are not ideally suited for NixOS modules. Instead of these
-  functions, you can declare your warnings and assertions using the
+  <literal>builtins.trace</literal>
+  <link xlink:href="https://nixos.org/nix/manual/#ssec-builtins">functions</link>
+  to perform such tasks, they are not ideally suited for NixOS modules. Instead
+  of these functions, you can declare your warnings and assertions using the
   NixOS module system.
-</para>
+ </para>
 
-<section>
+ <section>
+  <title>Warnings</title>
 
-<title>Warnings</title>
-
-<para>
-  This is an example of using <literal>warnings</literal>.
-</para>
+  <para>
+   This is an example of using <literal>warnings</literal>.
+  </para>
 
 <programlisting>
 <![CDATA[
@@ -43,22 +42,19 @@
 }
 ]]>
 </programlisting>
+ </section>
 
-</section>
+ <section>
+  <title>Assertions</title>
 
-<section>
-
-<title>Assertions</title>
-
-
-<para>
-  This example, extracted from the
-  <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix">
-    <literal>syslogd</literal> module
-  </link> shows how to use <literal>assertions</literal>. Since there
-  can only be one active syslog daemon at a time, an assertion is useful to
-  prevent such a broken system from being built.
-</para>
+  <para>
+   This example, extracted from the
+   <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-17.09/nixos/modules/services/logging/syslogd.nix">
+   <literal>syslogd</literal> module </link> shows how to use
+   <literal>assertions</literal>. Since there can only be one active syslog
+   daemon at a time, an assertion is useful to prevent such a broken system
+   from being built.
+  </para>
 
 <programlisting>
 <![CDATA[
@@ -74,7 +70,5 @@
 }
 ]]>
 </programlisting>
-
-</section>
-
+ </section>
 </section>
diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml
index 2f963f8666f1..23d9ddf88a77 100644
--- a/nixos/doc/manual/development/building-nixos.xml
+++ b/nixos/doc/manual/development/building-nixos.xml
@@ -3,30 +3,25 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-building-cd">
-
-<title>Building Your Own NixOS CD</title>
-
-<para>Building a NixOS CD is as easy as configuring your own computer. The
-idea is to use another module which will replace
-your <filename>configuration.nix</filename> to configure the system that
-would be installed on the CD.</para>
-
-<para>Default CD/DVD configurations are available
-inside <filename>nixos/modules/installer/cd-dvd</filename>.
-
+ <title>Building Your Own NixOS CD</title>
+ <para>
+  Building a NixOS CD is as easy as configuring your own computer. The idea is
+  to use another module which will replace your
+  <filename>configuration.nix</filename> to configure the system that would be
+  installed on the CD.
+ </para>
+ <para>
+  Default CD/DVD configurations are available inside
+  <filename>nixos/modules/installer/cd-dvd</filename>.
 <screen>
 $ git clone https://github.com/NixOS/nixpkgs.git
 $ cd nixpkgs/nixos
 $ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix default.nix</screen>
-
-</para>
-
-<para>Before burning your CD/DVD, you can check the content of the image by mounting anywhere like
-suggested by the following command:
-
+ </para>
+ <para>
+  Before burning your CD/DVD, you can check the content of the image by
+  mounting anywhere like suggested by the following command:
 <screen>
 # mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso</screen>
-
-</para>
-
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml
index 09a40114f02e..031048aaa377 100644
--- a/nixos/doc/manual/development/building-parts.xml
+++ b/nixos/doc/manual/development/building-parts.xml
@@ -3,111 +3,110 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-building-parts">
-
-<title>Building Specific Parts of NixOS</title>
-
-<para>With the command <command>nix-build</command>, you can build
-specific parts of your NixOS configuration.  This is done as follows:
-
+ <title>Building Specific Parts of NixOS</title>
+ <para>
+  With the command <command>nix-build</command>, you can build specific parts
+  of your NixOS configuration. This is done as follows:
 <screen>
 $ cd <replaceable>/path/to/nixpkgs/nixos</replaceable>
 $ nix-build -A config.<replaceable>option</replaceable></screen>
-
-where <replaceable>option</replaceable> is a NixOS option with type
-“derivation” (i.e. something that can be built).  Attributes of
-interest include:
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>system.build.toplevel</varname></term>
+  where <replaceable>option</replaceable> is a NixOS option with type
+  “derivation” (i.e. something that can be built). Attributes of interest
+  include:
+  <variablelist>
+   <varlistentry>
+    <term><varname>system.build.toplevel</varname>
+    </term>
     <listitem>
-      <para>The top-level option that builds the entire NixOS system.
-      Everything else in your configuration is indirectly pulled in by
-      this option.  This is what <command>nixos-rebuild</command>
-      builds and what <filename>/run/current-system</filename> points
-      to afterwards.</para>
-
-      <para>A shortcut to build this is:
-
+     <para>
+      The top-level option that builds the entire NixOS system. Everything else
+      in your configuration is indirectly pulled in by this option. This is
+      what <command>nixos-rebuild</command> builds and what
+      <filename>/run/current-system</filename> points to afterwards.
+     </para>
+     <para>
+      A shortcut to build this is:
 <screen>
 $ nix-build -A system</screen>
-      </para>
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>system.build.manual.manual</varname></term>
-    <listitem><para>The NixOS manual.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>system.build.etc</varname></term>
-    <listitem><para>A tree of symlinks that form the static parts of
-    <filename>/etc</filename>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>system.build.initialRamdisk</varname></term>
-    <term><varname>system.build.kernel</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>system.build.manual.manual</varname>
+    </term>
     <listitem>
-      <para>The initial ramdisk and kernel of the system.  This allows
-      a quick way to test whether the kernel and the initial ramdisk
-      boot correctly, by using QEMU’s <option>-kernel</option> and
-      <option>-initrd</option> options:
-
+     <para>
+      The NixOS manual.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>system.build.etc</varname>
+    </term>
+    <listitem>
+     <para>
+      A tree of symlinks that form the static parts of
+      <filename>/etc</filename>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>system.build.initialRamdisk</varname>
+    </term>
+    <term><varname>system.build.kernel</varname>
+    </term>
+    <listitem>
+     <para>
+      The initial ramdisk and kernel of the system. This allows a quick way to
+      test whether the kernel and the initial ramdisk boot correctly, by using
+      QEMU’s <option>-kernel</option> and <option>-initrd</option> options:
 <screen>
 $ nix-build -A config.system.build.initialRamdisk -o initrd
 $ nix-build -A config.system.build.kernel -o kernel
 $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null
 </screen>
-
-      </para>
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>system.build.nixos-rebuild</varname></term>
-    <term><varname>system.build.nixos-install</varname></term>
-    <term><varname>system.build.nixos-generate-config</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>system.build.nixos-rebuild</varname>
+    </term>
+    <term><varname>system.build.nixos-install</varname>
+    </term>
+    <term><varname>system.build.nixos-generate-config</varname>
+    </term>
     <listitem>
-      <para>These build the corresponding NixOS commands.</para>
+     <para>
+      These build the corresponding NixOS commands.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname>
+    </term>
     <listitem>
-      <para>This builds the unit with the specified name.  Note that
-      since unit names contain dots
-      (e.g. <literal>httpd.service</literal>), you need to put them
-      between quotes, like this:
-
+     <para>
+      This builds the unit with the specified name. Note that since unit names
+      contain dots (e.g. <literal>httpd.service</literal>), you need to put
+      them between quotes, like this:
 <screen>
 $ nix-build -A 'config.systemd.units."httpd.service".unit'
 </screen>
-
-      You can also test individual units, without rebuilding the whole
-      system, by putting them in
-      <filename>/run/systemd/system</filename>:
-
+      You can also test individual units, without rebuilding the whole system,
+      by putting them in <filename>/run/systemd/system</filename>:
 <screen>
 $ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \
     /run/systemd/system/tmp-httpd.service
 # systemctl daemon-reload
 # systemctl start tmp-httpd.service
 </screen>
-
       Note that the unit must not have the same name as any unit in
-      <filename>/etc/systemd/system</filename> since those take
-      precedence over <filename>/run/systemd/system</filename>.
-      That’s why the unit is installed as
-      <filename>tmp-httpd.service</filename> here.</para>
+      <filename>/etc/systemd/system</filename> since those take precedence over
+      <filename>/run/systemd/system</filename>. That’s why the unit is
+      installed as <filename>tmp-httpd.service</filename> here.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
+   </varlistentry>
+  </variablelist>
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml
index 47343d93cde9..03dee6ff09bb 100644
--- a/nixos/doc/manual/development/development.xml
+++ b/nixos/doc/manual/development/development.xml
@@ -3,21 +3,18 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="ch-development">
-
-<title>Development</title>
-
-<partintro>
-<para>This chapter describes how you can modify and extend
-NixOS.</para>
-</partintro>
-
-<xi:include href="sources.xml" />
-<xi:include href="writing-modules.xml" />
-<xi:include href="building-parts.xml" />
-<xi:include href="writing-documentation.xml" />
-<xi:include href="building-nixos.xml" />
-<xi:include href="nixos-tests.xml" />
-<xi:include href="testing-installer.xml" />
-<xi:include href="releases.xml" />
-
+ <title>Development</title>
+ <partintro>
+  <para>
+   This chapter describes how you can modify and extend NixOS.
+  </para>
+ </partintro>
+ <xi:include href="sources.xml" />
+ <xi:include href="writing-modules.xml" />
+ <xi:include href="building-parts.xml" />
+ <xi:include href="writing-documentation.xml" />
+ <xi:include href="building-nixos.xml" />
+ <xi:include href="nixos-tests.xml" />
+ <xi:include href="testing-installer.xml" />
+ <xi:include href="releases.xml" />
 </part>
diff --git a/nixos/doc/manual/development/importing-modules.xml b/nixos/doc/manual/development/importing-modules.xml
index ec1da09b9507..1c6a5671eda8 100644
--- a/nixos/doc/manual/development/importing-modules.xml
+++ b/nixos/doc/manual/development/importing-modules.xml
@@ -3,13 +3,12 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-importing-modules">
+ <title>Importing Modules</title>
 
-<title>Importing Modules</title>
-
-<para>
-  Sometimes NixOS modules need to be used in configuration but exist
-  outside of Nixpkgs. These modules can be imported:
-</para>
+ <para>
+  Sometimes NixOS modules need to be used in configuration but exist outside of
+  Nixpkgs. These modules can be imported:
+ </para>
 
 <programlisting>
 { config, lib, pkgs, ... }:
@@ -25,12 +24,11 @@
 }
 </programlisting>
 
-<para>
-  The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is
-  an absolute path to a NixOS module that is included alongside the
-  Nixpkgs NixOS modules. Like any NixOS module, this module can import
-  additional modules:
-</para>
+ <para>
+  The environment variable <literal>NIXOS_EXTRA_MODULE_PATH</literal> is an
+  absolute path to a NixOS module that is included alongside the Nixpkgs NixOS
+  modules. Like any NixOS module, this module can import additional modules:
+ </para>
 
 <programlisting>
 # ./module-list/default.nix
@@ -55,5 +53,4 @@
   services.exampleModule1.enable = true;
 }
 </programlisting>
-
 </section>
diff --git a/nixos/doc/manual/development/meta-attributes.xml b/nixos/doc/manual/development/meta-attributes.xml
index de0870314dcb..3d019a4987e1 100644
--- a/nixos/doc/manual/development/meta-attributes.xml
+++ b/nixos/doc/manual/development/meta-attributes.xml
@@ -3,22 +3,26 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-meta-attributes">
+ <title>Meta Attributes</title>
 
-<title>Meta Attributes</title>
-
-<para>Like Nix packages, NixOS modules can declare meta-attributes to provide
-  extra information. Module meta attributes are defined in the
+ <para>
+  Like Nix packages, NixOS modules can declare meta-attributes to provide extra
+  information. Module meta attributes are defined in the
   <filename
     xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/misc/meta.nix">meta.nix</filename>
-  special module.</para>
+  special module.
+ </para>
 
-<para><literal>meta</literal> is a top level attribute like
+ <para>
+  <literal>meta</literal> is a top level attribute like
   <literal>options</literal> and <literal>config</literal>. Available
   meta-attributes are <literal>maintainers</literal> and
-  <literal>doc</literal>.</para>
+  <literal>doc</literal>.
+ </para>
 
-<para>Each of the meta-attributes must be defined at most once per module
-  file.</para>
+ <para>
+  Each of the meta-attributes must be defined at most once per module file.
+ </para>
 
 <programlisting>
 { config, lib, pkgs, ... }:
@@ -39,24 +43,21 @@
 }
 </programlisting>
 
-<calloutlist>
- <callout arearefs='modules-meta-1'>
-  <para>
+ <calloutlist>
+  <callout arearefs='modules-meta-1'>
+   <para>
     <varname>maintainers</varname> contains a list of the module maintainers.
-  </para>
- </callout>
-
- <callout arearefs='modules-meta-2'>
-  <para>
+   </para>
+  </callout>
+  <callout arearefs='modules-meta-2'>
+   <para>
     <varname>doc</varname> points to a valid DocBook file containing the module
-    documentation. Its contents is automatically added to <xref
-      linkend="ch-configuration"/>.
-    Changes to a module documentation have to be checked to not break
-    building the NixOS manual:
-  </para>
-  <programlisting>$ nix-build nixos/release.nix -A manual</programlisting>
- </callout>
-
-</calloutlist>
-
+    documentation. Its contents is automatically added to
+    <xref
+      linkend="ch-configuration"/>. Changes to a module documentation
+    have to be checked to not break building the NixOS manual:
+   </para>
+<programlisting>$ nix-build nixos/release.nix -A manual</programlisting>
+  </callout>
+ </calloutlist>
 </section>
diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml
index c09c41ea3bdc..2695082e3867 100644
--- a/nixos/doc/manual/development/nixos-tests.xml
+++ b/nixos/doc/manual/development/nixos-tests.xml
@@ -3,18 +3,17 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-nixos-tests">
-
-<title>NixOS Tests</title>
-
-<para>When you add some feature to NixOS, you should write a test for
-it. NixOS tests are kept in the directory <filename
+ <title>NixOS Tests</title>
+ <para>
+  When you add some feature to NixOS, you should write a test for it. NixOS
+  tests are kept in the directory
+  <filename
 xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/tests">nixos/tests</filename>,
-and are executed (using Nix) by a testing framework that automatically
-starts one or more virtual machines containing the NixOS system(s)
-required for the test.</para>
-
-<xi:include href="writing-nixos-tests.xml" />
-<xi:include href="running-nixos-tests.xml" />
-<xi:include href="running-nixos-tests-interactively.xml" />
-
+  and are executed (using Nix) by a testing framework that automatically starts
+  one or more virtual machines containing the NixOS system(s) required for the
+  test.
+ </para>
+ <xi:include href="writing-nixos-tests.xml" />
+ <xi:include href="running-nixos-tests.xml" />
+ <xi:include href="running-nixos-tests-interactively.xml" />
 </chapter>
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index ed718c89eb77..a8f528a0a804 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -3,14 +3,12 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-option-declarations">
+ <title>Option Declarations</title>
 
-<title>Option Declarations</title>
-
-<para>An option declaration specifies the name, type and description
-of a NixOS configuration option.  It is invalid to define an option
-that hasn’t been declared in any module.  An option declaration
-generally looks like this:
-
+ <para>
+  An option declaration specifies the name, type and description of a NixOS
+  configuration option. It is invalid to define an option that hasn’t been
+  declared in any module. An option declaration generally looks like this:
 <programlisting>
 options = {
   <replaceable>name</replaceable> = mkOption {
@@ -21,146 +19,177 @@ 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
+  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.
+  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>
-
-<para>The function <varname>mkOption</varname> accepts the following arguments.
-
-<variablelist>
-
-  <varlistentry>
-    <term><varname>type</varname></term>
+ <para>
+  The function <varname>mkOption</varname> accepts the following arguments.
+  <variablelist>
+   <varlistentry>
+    <term><varname>type</varname>
+    </term>
     <listitem>
-      <para>The type of the option (see <xref linkend='sec-option-types' />).
-      It may be omitted, but that’s not advisable since it may lead to errors
-      that are hard to diagnose.</para>
+     <para>
+      The type of the option (see <xref linkend='sec-option-types' />). It may
+      be omitted, but that’s not advisable since it may lead to errors that
+      are hard to diagnose.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>default</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>default</varname>
+    </term>
     <listitem>
-      <para>The default value used if no value is defined by any
-      module.  A default is not required; but if a default is not given,
-      then users of the module will have to define the value of the
-      option, otherwise an error will be thrown.</para>
+     <para>
+      The default value used if no value is defined by any module. A default is
+      not required; but if a default is not given, then users of the module
+      will have to define the value of the option, otherwise an error will be
+      thrown.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>example</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>example</varname>
+    </term>
     <listitem>
-      <para>An example value that will be shown in the NixOS manual.</para>
+     <para>
+      An example value that will be shown in the NixOS manual.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>description</varname></term>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>description</varname>
+    </term>
     <listitem>
-      <para>A textual description of the option, in DocBook format,
-      that will be included in the NixOS manual.</para>
+     <para>
+      A textual description of the option, in DocBook format, that will be
+      included in the NixOS manual.
+     </para>
     </listitem>
-  </varlistentry>
+   </varlistentry>
+  </variablelist>
+ </para>
 
-</variablelist>
+ <section xml:id="sec-option-declarations-eot">
+  <title>Extensible Option Types</title>
 
-</para>
-
-<section xml:id="sec-option-declarations-eot"><title>Extensible Option
-    Types</title>
-
-  <para>Extensible option types is a feature that allow to extend certain types
-    declaration through multiple module files.
-    This feature only work with a restricted set of types, namely
-    <literal>enum</literal> and <literal>submodules</literal> and any composed
-    forms of them.</para>
-
-  <para>Extensible option types can be used for <literal>enum</literal> options
-    that affects multiple modules, or as an alternative to related
-    <literal>enable</literal> options.</para>
-
-  <para>As an example, we will take the case of display managers. There is a
-    central display manager module for generic display manager options and a
-    module file per display manager backend (slim, sddm, gdm ...).
+  <para>
+   Extensible option types is a feature that allow to extend certain types
+   declaration through multiple module files. This feature only work with a
+   restricted set of types, namely <literal>enum</literal> and
+   <literal>submodules</literal> and any composed forms of them.
   </para>
 
-  <para>There are two approach to this module structure:
-
-  <itemizedlist>
-    <listitem><para>Managing the display managers independently by adding an
-        enable option to every display manager module backend. (NixOS)</para>
-    </listitem>
-    <listitem><para>Managing the display managers in the central module by
-        adding an option to select which display manager backend to use.</para>
-    </listitem>
-  </itemizedlist>
+  <para>
+   Extensible option types can be used for <literal>enum</literal> options that
+   affects multiple modules, or as an alternative to related
+   <literal>enable</literal> options.
   </para>
 
-  <para>Both approaches have problems.</para>
+  <para>
+   As an example, we will take the case of display managers. There is a central
+   display manager module for generic display manager options and a module file
+   per display manager backend (slim, sddm, gdm ...).
+  </para>
 
-  <para>Making backends independent can quickly become hard to manage. For
-    display managers, there can be only one enabled at a time, but the type
-    system can not enforce this restriction as there is no relation between
-    each backend <literal>enable</literal> option. As a result, this restriction
-    has to be done explicitely by adding assertions in each display manager
-    backend module.</para>
+  <para>
+   There are two approach to this module structure:
+   <itemizedlist>
+    <listitem>
+     <para>
+      Managing the display managers independently by adding an enable option to
+      every display manager module backend. (NixOS)
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Managing the display managers in the central module by adding an option
+      to select which display manager backend to use.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
 
-  <para>On the other hand, managing the display managers backends in the
-    central module will require to change the central module option every time
-    a new backend is added or removed.</para>
+  <para>
+   Both approaches have problems.
+  </para>
 
-  <para>By using extensible option types, it is possible to create a placeholder
-    option in the central module (<xref linkend='ex-option-declaration-eot-service'
-      />), and to extend it in each backend module (<xref
-      linkend='ex-option-declaration-eot-backend-slim' />, <xref
-      linkend='ex-option-declaration-eot-backend-sddm' />).</para>
+  <para>
+   Making backends independent can quickly become hard to manage. For display
+   managers, there can be only one enabled at a time, but the type system can
+   not enforce this restriction as there is no relation between each backend
+   <literal>enable</literal> option. As a result, this restriction has to be
+   done explicitely by adding assertions in each display manager backend
+   module.
+  </para>
 
-  <para>As a result, <literal>displayManager.enable</literal> option values can
-  be added without changing the main service module file and the type system
-  automatically enforce that there can only be a single display manager
-  enabled.</para>
+  <para>
+   On the other hand, managing the display managers backends in the central
+   module will require to change the central module option every time a new
+   backend is added or removed.
+  </para>
 
-<example xml:id='ex-option-declaration-eot-service'><title>Extensible type
-    placeholder in the service module</title>
+  <para>
+   By using extensible option types, it is possible to create a placeholder
+   option in the central module
+   (<xref linkend='ex-option-declaration-eot-service'
+      />), and to extend
+   it in each backend module
+   (<xref
+      linkend='ex-option-declaration-eot-backend-slim' />,
+   <xref
+      linkend='ex-option-declaration-eot-backend-sddm' />).
+  </para>
+
+  <para>
+   As a result, <literal>displayManager.enable</literal> option values can be
+   added without changing the main service module file and the type system
+   automatically enforce that there can only be a single display manager
+   enabled.
+  </para>
+
+  <example xml:id='ex-option-declaration-eot-service'>
+   <title>Extensible type placeholder in the service module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {
   description = "Display manager to use";
   type = with types; nullOr (enum [ ]);
-};</screen></example>
+};</screen>
+  </example>
 
-<example xml:id='ex-option-declaration-eot-backend-slim'><title>Extending
-    <literal>services.xserver.displayManager.enable</literal> in the
-    <literal>slim</literal> module</title>
+  <example xml:id='ex-option-declaration-eot-backend-slim'>
+   <title>Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>slim</literal> module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {
   type = with types; nullOr (enum [ "slim" ]);
-};</screen></example>
+};</screen>
+  </example>
 
-<example xml:id='ex-option-declaration-eot-backend-sddm'><title>Extending
-    <literal>services.xserver.displayManager.enable</literal> in the 
-    <literal>sddm</literal> module</title>
+  <example xml:id='ex-option-declaration-eot-backend-sddm'>
+   <title>Extending <literal>services.xserver.displayManager.enable</literal> in the <literal>sddm</literal> module</title>
 <screen>
 services.xserver.displayManager.enable = mkOption {
   type = with types; nullOr (enum [ "sddm" ]);
-};</screen></example>
+};</screen>
+  </example>
 
-<para>The placeholder declaration is a standard <literal>mkOption</literal>
-  declaration, but it is important that extensible option declarations only use
-  the <literal>type</literal> argument.</para>
-
-<para>Extensible option types work with any of the composed variants of
-  <literal>enum</literal> such as
-  <literal>with types; nullOr (enum [ "foo" "bar" ])</literal>
-  or <literal>with types; listOf (enum [ "foo" "bar" ])</literal>.</para>
+  <para>
+   The placeholder declaration is a standard <literal>mkOption</literal>
+   declaration, but it is important that extensible option declarations only
+   use the <literal>type</literal> argument.
+  </para>
 
-</section>
+  <para>
+   Extensible option types work with any of the composed variants of
+   <literal>enum</literal> such as <literal>with types; nullOr (enum [ "foo"
+   "bar" ])</literal> or <literal>with types; listOf (enum [ "foo" "bar"
+   ])</literal>.
+  </para>
+ </section>
 </section>
diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml
index 4e267ecfd1e3..580a5afd58cd 100644
--- a/nixos/doc/manual/development/option-def.xml
+++ b/nixos/doc/manual/development/option-def.xml
@@ -3,39 +3,36 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-option-definitions">
+ <title>Option Definitions</title>
 
-<title>Option Definitions</title>
-
-<para>Option definitions are generally straight-forward bindings of values to option names, like
-
+ <para>
+  Option definitions are generally straight-forward bindings of values to
+  option names, like
 <programlisting>
 config = {
   services.httpd.enable = true;
 };
 </programlisting>
+  However, sometimes you need to wrap an option definition or set of option
+  definitions in a <emphasis>property</emphasis> to achieve certain effects:
+ </para>
 
-However, sometimes you need to wrap an option definition or set of
-option definitions in a <emphasis>property</emphasis> to achieve
-certain effects:</para>
-
-<simplesect><title>Delaying Conditionals</title>
-
-<para>If a set of option definitions is conditional on the value of
-another option, you may need to use <varname>mkIf</varname>.
-Consider, for instance:
-
+ <simplesect>
+  <title>Delaying Conditionals</title>
+  <para>
+   If a set of option definitions is conditional on the value of another
+   option, you may need to use <varname>mkIf</varname>. Consider, for instance:
 <programlisting>
 config = if config.services.httpd.enable then {
   environment.systemPackages = [ <replaceable>...</replaceable> ];
   <replaceable>...</replaceable>
 } else {};
 </programlisting>
-
-This definition will cause Nix to fail with an “infinite recursion”
-error.  Why?  Because the value of
-<option>config.services.httpd.enable</option> depends on the value
-being constructed here.  After all, you could also write the clearly
-circular and contradictory:
+   This definition will cause Nix to fail with an “infinite recursion”
+   error. Why? Because the value of
+   <option>config.services.httpd.enable</option> depends on the value being
+   constructed here. After all, you could also write the clearly circular and
+   contradictory:
 <programlisting>
 config = if config.services.httpd.enable then {
   services.httpd.enable = false;
@@ -43,56 +40,49 @@ config = if config.services.httpd.enable then {
   services.httpd.enable = true;
 };
 </programlisting>
-
-The solution is to write:
-
+   The solution is to write:
 <programlisting>
 config = mkIf config.services.httpd.enable {
   environment.systemPackages = [ <replaceable>...</replaceable> ];
   <replaceable>...</replaceable>
 };
 </programlisting>
-
-The special function <varname>mkIf</varname> causes the evaluation of
-the conditional to be “pushed down” into the individual definitions,
-as if you had written:
-
+   The special function <varname>mkIf</varname> causes the evaluation of the
+   conditional to be “pushed down” into the individual definitions, as if
+   you had written:
 <programlisting>
 config = {
   environment.systemPackages = if config.services.httpd.enable then [ <replaceable>...</replaceable> ] else [];
   <replaceable>...</replaceable>
 };
 </programlisting>
+  </para>
+ </simplesect>
 
-</para>
-
-</simplesect>
-
-<simplesect><title>Setting Priorities</title>
-
-<para>A module can override the definitions of an option in other
-modules by setting a <emphasis>priority</emphasis>.  All option
-definitions that do not have the lowest priority value are discarded.
-By default, option definitions have priority 1000.  You can specify an
-explicit priority by using <varname>mkOverride</varname>, e.g.
-
+ <simplesect>
+  <title>Setting Priorities</title>
+  <para>
+   A module can override the definitions of an option in other modules by
+   setting a <emphasis>priority</emphasis>. All option definitions that do not
+   have the lowest priority value are discarded. By default, option definitions
+   have priority 1000. You can specify an explicit priority by using
+   <varname>mkOverride</varname>, e.g.
 <programlisting>
 services.openssh.enable = mkOverride 10 false;
 </programlisting>
+   This definition causes all other definitions with priorities above 10 to be
+   discarded. The function <varname>mkForce</varname> is equal to
+   <varname>mkOverride 50</varname>.
+  </para>
+ </simplesect>
 
-This definition causes all other definitions with priorities above 10
-to be discarded.  The function <varname>mkForce</varname> is
-equal to <varname>mkOverride 50</varname>.</para>
-
-</simplesect>
-
-<simplesect><title>Merging Configurations</title>
-
-<para>In conjunction with <literal>mkIf</literal>, it is sometimes
-useful for a module to return multiple sets of option definitions, to
-be merged together as if they were declared in separate modules.  This
-can be done using <varname>mkMerge</varname>:
-
+ <simplesect>
+  <title>Merging Configurations</title>
+  <para>
+   In conjunction with <literal>mkIf</literal>, it is sometimes useful for a
+   module to return multiple sets of option definitions, to be merged together
+   as if they were declared in separate modules. This can be done using
+   <varname>mkMerge</varname>:
 <programlisting>
 config = mkMerge
   [ # Unconditional stuff.
@@ -104,9 +94,6 @@ config = mkMerge
     })
   ];
 </programlisting>
-
-</para>
-
-</simplesect>
-
-</section>
\ No newline at end of file
+  </para>
+ </simplesect>
+</section>
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 13fa8d1e114c..7969d8124738 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -3,241 +3,346 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-option-types">
+ <title>Options Types</title>
 
-<title>Options Types</title>
+ <para>
+  Option types are a way to put constraints on the values a module option can
+  take. Types are also responsible of how values are merged in case of multiple
+  value definitions.
+ </para>
 
-  <para>Option types are a way to put constraints on the values a module option 
-    can take.
-    Types are also responsible of how values are merged in case of multiple 
-    value definitions.</para>
-  <section><title>Basic Types</title>
+ <section>
+  <title>Basic Types</title>
 
-    <para>Basic types are the simplest available types in the module system.
-      Basic types include multiple string types that mainly differ in how 
-      definition merging is handled.</para>
+  <para>
+   Basic types are the simplest available types in the module system. Basic
+   types include multiple string types that mainly differ in how definition
+   merging is handled.
+  </para>
 
-<variablelist>
-  <varlistentry>
-    <term><varname>types.bool</varname></term>
-    <listitem><para>A boolean, its values can be <literal>true</literal> or 
-        <literal>false</literal>.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.path</varname></term>
-    <listitem><para>A filesystem path, defined as anything that when coerced to 
-        a string starts with a slash. Even if derivations can be considered as 
-        path, the more specific <literal>types.package</literal> should be 
-        preferred.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.package</varname></term>
-    <listitem><para>A derivation or a store path.</para></listitem>
-  </varlistentry>
-</variablelist>
-
-<para>Integer-related types:</para>
-
-<variablelist>
-  <varlistentry>
-    <term><varname>types.int</varname></term>
-    <listitem><para>A signed integer.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>
-      <varname>types.ints.{s8, s16, s32}</varname>
+  <variablelist>
+   <varlistentry>
+    <term><varname>types.bool</varname>
     </term>
     <listitem>
-      <para>Signed integers with a fixed length (8, 16 or 32 bits).
-        They go from
-        <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase>
-        </inlineequation> to <inlineequation>
-        <mathphrase>2<superscript>n</superscript>/2−1</mathphrase>
-        </inlineequation>
-        respectively (e.g. <literal>−128</literal> to <literal>127</literal>
-        for 8 bits).
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>
-      <varname>types.ints.unsigned</varname>
-    </term>
-    <listitem><para>An unsigned integer (that is >= 0).
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>
-      <varname>types.ints.{u8, u16, u32}</varname>
+     <para>
+      A boolean, its values can be <literal>true</literal> or
+      <literal>false</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.path</varname>
     </term>
     <listitem>
-      <para>Unsigned integers with a fixed length (8, 16 or 32 bits).
-        They go from
-        <inlineequation><mathphrase>0</mathphrase></inlineequation> to <inlineequation>
-        <mathphrase>2<superscript>n</superscript>−1</mathphrase>
-        </inlineequation>
-        respectively (e.g. <literal>0</literal> to <literal>255</literal>
-        for 8 bits).
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>
-      <varname>types.ints.positive</varname>
+     <para>
+      A filesystem path, defined as anything that when coerced to a string
+      starts with a slash. Even if derivations can be considered as path, the
+      more specific <literal>types.package</literal> should be preferred.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.package</varname>
     </term>
-    <listitem><para>A positive integer (that is > 0).
-    </para></listitem>
-  </varlistentry>
-</variablelist>
+    <listitem>
+     <para>
+      A derivation or a store path.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
 
-<para>String-related types:</para>
+  <para>
+   Integer-related types:
+  </para>
 
-<variablelist>
-  <varlistentry>
-    <term><varname>types.str</varname></term>
-    <listitem><para>A string. Multiple definitions cannot be 
-        merged.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.lines</varname></term>
-    <listitem><para>A string. Multiple definitions are concatenated with a new 
-        line <literal>"\n"</literal>.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.commas</varname></term>
-    <listitem><para>A string. Multiple definitions are concatenated with a comma 
-        <literal>","</literal>.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.envVar</varname></term>
-    <listitem><para>A string. Multiple definitions are concatenated with a 
-        collon <literal>":"</literal>.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.strMatching</varname></term>
-    <listitem><para>A string matching a specific regular expression. Multiple
-    definitions cannot be merged.  The regular expression is processed using
-    <literal>builtins.match</literal>.</para></listitem>
-  </varlistentry>
-</variablelist>
+  <variablelist>
+   <varlistentry>
+    <term><varname>types.int</varname>
+    </term>
+    <listitem>
+     <para>
+      A signed integer.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.ints.{s8, s16, s32}</varname>
+    </term>
+    <listitem>
+     <para>
+      Signed integers with a fixed length (8, 16 or 32 bits). They go from
+      <inlineequation><mathphrase>−2<superscript>n</superscript>/2</mathphrase>
+      </inlineequation> to <inlineequation>
+      <mathphrase>2<superscript>n</superscript>/2−1</mathphrase>
+      </inlineequation> respectively (e.g. <literal>−128</literal> to
+      <literal>127</literal> for 8 bits).
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.ints.unsigned</varname>
+    </term>
+    <listitem>
+     <para>
+      An unsigned integer (that is >= 0).
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.ints.{u8, u16, u32}</varname>
+    </term>
+    <listitem>
+     <para>
+      Unsigned integers with a fixed length (8, 16 or 32 bits). They go from
+      <inlineequation><mathphrase>0</mathphrase></inlineequation> to
+      <inlineequation>
+      <mathphrase>2<superscript>n</superscript>−1</mathphrase>
+      </inlineequation> respectively (e.g. <literal>0</literal> to
+      <literal>255</literal> for 8 bits).
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.ints.positive</varname>
+    </term>
+    <listitem>
+     <para>
+      A positive integer (that is > 0).
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
 
+  <para>
+   String-related types:
+  </para>
+
+  <variablelist>
+   <varlistentry>
+    <term><varname>types.str</varname>
+    </term>
+    <listitem>
+     <para>
+      A string. Multiple definitions cannot be merged.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.lines</varname>
+    </term>
+    <listitem>
+     <para>
+      A string. Multiple definitions are concatenated with a new line
+      <literal>"\n"</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.commas</varname>
+    </term>
+    <listitem>
+     <para>
+      A string. Multiple definitions are concatenated with a comma
+      <literal>","</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.envVar</varname>
+    </term>
+    <listitem>
+     <para>
+      A string. Multiple definitions are concatenated with a collon
+      <literal>":"</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.strMatching</varname>
+    </term>
+    <listitem>
+     <para>
+      A string matching a specific regular expression. Multiple definitions
+      cannot be merged. The regular expression is processed using
+      <literal>builtins.match</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
  </section>
 
- <section><title>Value Types</title>
+ <section>
+  <title>Value Types</title>
 
-   <para>Value types are types that take a value parameter.</para>
+  <para>
+   Value types are types that take a value parameter.
+  </para>
 
-<variablelist>
-  <varlistentry>
-    <term><varname>types.enum</varname> <replaceable>l</replaceable></term>
-    <listitem><para>One element of the list <replaceable>l</replaceable>, e.g. 
-        <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions 
-        cannot be merged.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.separatedString</varname>
-      <replaceable>sep</replaceable></term>
-    <listitem><para>A string with a custom separator
-        <replaceable>sep</replaceable>, e.g. <literal>types.separatedString
-          "|"</literal>.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term>
-      <varname>types.ints.between</varname>
-      <replaceable>lowest</replaceable>
-      <replaceable>highest</replaceable>
+  <variablelist>
+   <varlistentry>
+    <term><varname>types.enum</varname><replaceable>l</replaceable>
     </term>
-    <listitem><para>An integer between <replaceable>lowest</replaceable>
-        and <replaceable>highest</replaceable> (both inclusive).
-        Useful for creating types like <literal>types.port</literal>.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.submodule</varname> <replaceable>o</replaceable></term>
-    <listitem><para>A set of sub options <replaceable>o</replaceable>.
-        <replaceable>o</replaceable> can be an attribute set or a function
-        returning an attribute set. Submodules are used in composed types to
-        create modular options. Submodule are detailed in <xref
-          linkend='section-option-types-submodule' />.</para></listitem>
-  </varlistentry>
-</variablelist>
+    <listitem>
+     <para>
+      One element of the list <replaceable>l</replaceable>, e.g.
+      <literal>types.enum [ "left" "right" ]</literal>. Multiple definitions
+      cannot be merged.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.separatedString</varname><replaceable>sep</replaceable>
+    </term>
+    <listitem>
+     <para>
+      A string with a custom separator <replaceable>sep</replaceable>, e.g.
+      <literal>types.separatedString "|"</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.ints.between</varname><replaceable>lowest</replaceable><replaceable>highest</replaceable>
+    </term>
+    <listitem>
+     <para>
+      An integer between <replaceable>lowest</replaceable> and
+      <replaceable>highest</replaceable> (both inclusive). Useful for creating
+      types like <literal>types.port</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.submodule</varname><replaceable>o</replaceable>
+    </term>
+    <listitem>
+     <para>
+      A set of sub options <replaceable>o</replaceable>.
+      <replaceable>o</replaceable> can be an attribute set or a function
+      returning an attribute set. Submodules are used in composed types to
+      create modular options. Submodule are detailed in
+      <xref
+          linkend='section-option-types-submodule' />.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
  </section>
 
- <section><title>Composed Types</title>
+ <section>
+  <title>Composed Types</title>
 
-   <para>Composed types are types that take a type as parameter. <literal>listOf 
-       int</literal> and <literal>either int str</literal> are examples of 
-     composed types.</para>
+  <para>
+   Composed types are types that take a type as parameter. <literal>listOf
+   int</literal> and <literal>either int str</literal> are examples of composed
+   types.
+  </para>
 
-<variablelist>
-  <varlistentry>
-    <term><varname>types.listOf</varname> <replaceable>t</replaceable></term>
-    <listitem><para>A list of <replaceable>t</replaceable> type, e.g. 
-        <literal>types.listOf int</literal>. Multiple definitions are merged 
-        with list concatenation.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.attrsOf</varname> <replaceable>t</replaceable></term>
-    <listitem><para>An attribute set of where all the values are of 
-        <replaceable>t</replaceable> type. Multiple definitions result in the 
-        joined attribute set.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.loaOf</varname> <replaceable>t</replaceable></term>
-    <listitem><para>An attribute set or a list of <replaceable>t</replaceable> 
-        type. Multiple definitions are merged according to the 
-        value.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.nullOr</varname> <replaceable>t</replaceable></term>
-    <listitem><para><literal>null</literal> or type 
-        <replaceable>t</replaceable>. Multiple definitions are merged according 
-        to type <replaceable>t</replaceable>.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.uniq</varname> <replaceable>t</replaceable></term>
-    <listitem><para>Ensures that type <replaceable>t</replaceable> cannot be 
-        merged. It is used to ensure option definitions are declared only 
-        once.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.either</varname> <replaceable>t1</replaceable> 
-      <replaceable>t2</replaceable></term>
-    <listitem><para>Type <replaceable>t1</replaceable> or type 
-        <replaceable>t2</replaceable>, e.g. <literal>with types; either int 
-          str</literal>. Multiple definitions cannot be 
-        merged.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>types.coercedTo</varname> <replaceable>from</replaceable>
-        <replaceable>f</replaceable> <replaceable>to</replaceable></term>
-    <listitem><para>Type <replaceable>to</replaceable> or type
-        <replaceable>from</replaceable> which will be coerced to
-	type <replaceable>to</replaceable> using function
-	<replaceable>f</replaceable> which takes an argument of type
-        <replaceable>from</replaceable> and return a value of type
-	<replaceable>to</replaceable>. Can be used to preserve backwards
-        compatibility of an option if its type was changed.</para></listitem>
-  </varlistentry>
-</variablelist>
+  <variablelist>
+   <varlistentry>
+    <term><varname>types.listOf</varname><replaceable>t</replaceable>
+    </term>
+    <listitem>
+     <para>
+      A list of <replaceable>t</replaceable> type, e.g. <literal>types.listOf
+      int</literal>. Multiple definitions are merged with list concatenation.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.attrsOf</varname><replaceable>t</replaceable>
+    </term>
+    <listitem>
+     <para>
+      An attribute set of where all the values are of
+      <replaceable>t</replaceable> type. Multiple definitions result in the
+      joined attribute set.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.loaOf</varname><replaceable>t</replaceable>
+    </term>
+    <listitem>
+     <para>
+      An attribute set or a list of <replaceable>t</replaceable> type. Multiple
+      definitions are merged according to the value.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.nullOr</varname><replaceable>t</replaceable>
+    </term>
+    <listitem>
+     <para>
+      <literal>null</literal> or type <replaceable>t</replaceable>. Multiple
+      definitions are merged according to type <replaceable>t</replaceable>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.uniq</varname><replaceable>t</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Ensures that type <replaceable>t</replaceable> cannot be merged. It is
+      used to ensure option definitions are declared only once.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.either</varname><replaceable>t1</replaceable><replaceable>t2</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Type <replaceable>t1</replaceable> or type <replaceable>t2</replaceable>,
+      e.g. <literal>with types; either int str</literal>. Multiple definitions
+      cannot be merged.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>types.coercedTo</varname><replaceable>from</replaceable><replaceable>f</replaceable><replaceable>to</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Type <replaceable>to</replaceable> or type
+      <replaceable>from</replaceable> which will be coerced to type
+      <replaceable>to</replaceable> using function <replaceable>f</replaceable>
+      which takes an argument of type <replaceable>from</replaceable> and
+      return a value of type <replaceable>to</replaceable>. Can be used to
+      preserve backwards compatibility of an option if its type was changed.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
 
-</section>
+ <section xml:id='section-option-types-submodule'>
+  <title>Submodule</title>
 
-<section xml:id='section-option-types-submodule'><title>Submodule</title>
+  <para>
+   <literal>submodule</literal> is a very powerful type that defines a set of
+   sub-options that are handled like a separate module.
+  </para>
 
-  <para><literal>submodule</literal> is a very powerful type that defines a set
-    of sub-options that are handled like a separate module.</para>
+  <para>
+   It takes a parameter <replaceable>o</replaceable>, that should be a set, or
+   a function returning a set with an <literal>options</literal> key defining
+   the sub-options. Submodule option definitions are type-checked accordingly
+   to the <literal>options</literal> declarations. Of course, you can nest
+   submodule option definitons for even higher modularity.
+  </para>
 
-  <para>It takes a parameter <replaceable>o</replaceable>, that should be a set,
-    or a function returning a set with an <literal>options</literal> key
-    defining the sub-options.
-    Submodule option definitions are type-checked accordingly to the
-    <literal>options</literal> declarations.
-    Of course, you can nest submodule option definitons for even higher
-    modularity.</para>
+  <para>
+   The option set can be defined directly
+   (<xref linkend='ex-submodule-direct' />) or as reference
+   (<xref linkend='ex-submodule-reference' />).
+  </para>
 
-  <para>The option set can be defined directly
-    (<xref linkend='ex-submodule-direct' />) or as reference
-    (<xref linkend='ex-submodule-reference' />).</para>
-
-<example xml:id='ex-submodule-direct'><title>Directly defined submodule</title>
+  <example xml:id='ex-submodule-direct'>
+   <title>Directly defined submodule</title>
 <screen>
 options.mod = mkOption {
   description = "submodule example";
@@ -251,10 +356,11 @@ options.mod = mkOption {
       };
     };
   };
-};</screen></example>
+};</screen>
+  </example>
 
-<example xml:id='ex-submodule-reference'><title>Submodule defined as a
-    reference</title>
+  <example xml:id='ex-submodule-reference'>
+   <title>Submodule defined as a reference</title>
 <screen>
 let
   modOptions = {
@@ -271,19 +377,20 @@ in
 options.mod = mkOption {
   description = "submodule example";
   type = with types; submodule modOptions;
-};</screen></example>
+};</screen>
+  </example>
 
-  <para>The <literal>submodule</literal> type is especially interesting when
-    used with composed types like <literal>attrsOf</literal> or
-    <literal>listOf</literal>.
-    When composed with <literal>listOf</literal>
-    (<xref linkend='ex-submodule-listof-declaration' />),
-    <literal>submodule</literal> allows multiple definitions of the submodule
-    option set (<xref linkend='ex-submodule-listof-definition' />).</para>
-    
+  <para>
+   The <literal>submodule</literal> type is especially interesting when used
+   with composed types like <literal>attrsOf</literal> or
+   <literal>listOf</literal>. When composed with <literal>listOf</literal>
+   (<xref linkend='ex-submodule-listof-declaration' />),
+   <literal>submodule</literal> allows multiple definitions of the submodule
+   option set (<xref linkend='ex-submodule-listof-definition' />).
+  </para>
 
-<example xml:id='ex-submodule-listof-declaration'><title>Declaration of a list
-    of submodules</title>
+  <example xml:id='ex-submodule-listof-declaration'>
+   <title>Declaration of a list of submodules</title>
 <screen>
 options.mod = mkOption {
   description = "submodule example";
@@ -297,24 +404,27 @@ options.mod = mkOption {
       };
     };
   });
-};</screen></example>
+};</screen>
+  </example>
 
-<example xml:id='ex-submodule-listof-definition'><title>Definition of a list of 
-    submodules</title>
+  <example xml:id='ex-submodule-listof-definition'>
+   <title>Definition of a list of submodules</title>
 <screen>
 config.mod = [
   { foo = 1; bar = "one"; }
   { foo = 2; bar = "two"; }
-];</screen></example>
+];</screen>
+  </example>
 
-  <para>When composed with <literal>attrsOf</literal>
-    (<xref linkend='ex-submodule-attrsof-declaration' />),
-    <literal>submodule</literal> allows multiple named definitions of the
-    submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
+  <para>
+   When composed with <literal>attrsOf</literal>
+   (<xref linkend='ex-submodule-attrsof-declaration' />),
+   <literal>submodule</literal> allows multiple named definitions of the
+   submodule option set (<xref linkend='ex-submodule-attrsof-definition' />).
   </para>
 
-<example xml:id='ex-submodule-attrsof-declaration'><title>Declaration of 
-    attribute sets of submodules</title>
+  <example xml:id='ex-submodule-attrsof-declaration'>
+   <title>Declaration of attribute sets of submodules</title>
 <screen>
 options.mod = mkOption {
   description = "submodule example";
@@ -328,194 +438,281 @@ options.mod = mkOption {
       };
     };
   });
-};</screen></example>
+};</screen>
+  </example>
 
-<example xml:id='ex-submodule-attrsof-definition'><title>Declaration of 
-    attribute sets of submodules</title>
+  <example xml:id='ex-submodule-attrsof-definition'>
+   <title>Declaration of attribute sets of submodules</title>
 <screen>
 config.mod.one = { foo = 1; bar = "one"; };
-config.mod.two = { foo = 2; bar = "two"; };</screen></example>
+config.mod.two = { foo = 2; bar = "two"; };</screen>
+  </example>
+ </section>
 
-</section>
+ <section>
+  <title>Extending types</title>
 
-<section><title>Extending types</title>
+  <para>
+   Types are mainly characterized by their <literal>check</literal> and
+   <literal>merge</literal> functions.
+  </para>
 
-  <para>Types are mainly characterized by their <literal>check</literal> and 
-    <literal>merge</literal> functions.</para>
-
-<variablelist>
-  <varlistentry>
-    <term><varname>check</varname></term>
-    <listitem><para>The function to type check the value. Takes a value as 
-        parameter and return a boolean.
-        It is possible to extend a type check with the 
-        <literal>addCheck</literal> function (<xref 
-          linkend='ex-extending-type-check-1' />), or to fully override the 
-        check function (<xref linkend='ex-extending-type-check-2' />).</para>
-
-<example xml:id='ex-extending-type-check-1'><title>Adding a type check</title>
+  <variablelist>
+   <varlistentry>
+    <term><varname>check</varname>
+    </term>
+    <listitem>
+     <para>
+      The function to type check the value. Takes a value as parameter and
+      return a boolean. It is possible to extend a type check with the
+      <literal>addCheck</literal> function
+      (<xref 
+          linkend='ex-extending-type-check-1' />), or to fully
+      override the check function
+      (<xref linkend='ex-extending-type-check-2' />).
+     </para>
+     <example xml:id='ex-extending-type-check-1'>
+      <title>Adding a type check</title>
 <screen>
 byte = mkOption {
   description = "An integer between 0 and 255.";
   type = addCheck types.int (x: x &gt;= 0 &amp;&amp; x &lt;= 255);
-};</screen></example>
-
-<example xml:id='ex-extending-type-check-2'><title>Overriding a type 
-    check</title>
+};</screen>
+     </example>
+     <example xml:id='ex-extending-type-check-2'>
+      <title>Overriding a type check</title>
 <screen>
 nixThings = mkOption {
   description = "words that start with 'nix'";
   type = types.str // {
     check = (x: lib.hasPrefix "nix" x)
   };
-};</screen></example>
+};</screen>
+     </example>
     </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>merge</varname></term>
-    <listitem><para>Function to merge the options values when multiple values 
-        are set.
-The function takes two parameters, <literal>loc</literal> the option path as a 
-list of strings, and <literal>defs</literal> the list of defined values as a 
-list.
-It is possible to override a type merge function for custom 
-needs.</para></listitem>
-  </varlistentry>
-</variablelist>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>merge</varname>
+    </term>
+    <listitem>
+     <para>
+      Function to merge the options values when multiple values are set. The
+      function takes two parameters, <literal>loc</literal> the option path as
+      a list of strings, and <literal>defs</literal> the list of defined values
+      as a list. It is possible to override a type merge function for custom
+      needs.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
 
-</section>
+ <section>
+  <title>Custom Types</title>
 
-<section><title>Custom Types</title>
+  <para>
+   Custom types can be created with the <literal>mkOptionType</literal>
+   function. As type creation includes some more complex topics such as
+   submodule handling, it is recommended to get familiar with
+   <filename 
+  xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename>
+   code before creating a new type.
+  </para>
 
-<para>Custom types can be created with the <literal>mkOptionType</literal> 
-  function.
-As type creation includes some more complex topics such as submodule handling, 
-it is recommended to get familiar with <filename 
-  xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/types.nix">types.nix</filename> 
-code before creating a new type.</para>
+  <para>
+   The only required parameter is <literal>name</literal>.
+  </para>
 
-<para>The only required parameter is <literal>name</literal>.</para>
-
-<variablelist>
-  <varlistentry>
-    <term><varname>name</varname></term>
-    <listitem><para>A string representation of the type function 
-        name.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>definition</varname></term>
-    <listitem><para>Description of the type used in documentation. Give 
-        information of the type and any of its arguments.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>check</varname></term>
-    <listitem><para>A function to type check the definition value. Takes the 
-        definition value as a parameter and returns a boolean indicating the 
-        type check result, <literal>true</literal> for success and 
-        <literal>false</literal> for failure.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>merge</varname></term>
-    <listitem><para>A function to merge multiple definitions values. Takes two 
-        parameters:</para>
-      <variablelist>
-        <varlistentry>
-          <term><replaceable>loc</replaceable></term>
-          <listitem><para>The option path as a list of strings, e.g. 
-              <literal>["boot" "loader "grub" 
-                "enable"]</literal>.</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><replaceable>defs</replaceable></term>
-          <listitem><para>The list of sets of defined <literal>value</literal> 
-              and <literal>file</literal> where the value was defined, e.g. 
-              <literal>[ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; 
-                value = 2 } ]</literal>. The <literal>merge</literal> function 
-              should return the merged value or throw an error in case the 
-              values are impossible or not meant to be merged.</para></listitem>
-        </varlistentry>
-      </variablelist>
+  <variablelist>
+   <varlistentry>
+    <term><varname>name</varname>
+    </term>
+    <listitem>
+     <para>
+      A string representation of the type function name.
+     </para>
     </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>getSubOptions</varname></term>
-    <listitem><para>For composed types that can take a submodule as type 
-        parameter, this function generate sub-options documentation. It takes 
-        the current option prefix as a list and return the set of sub-options. 
-        Usually defined in a recursive manner by adding a term to the prefix, 
-        e.g. <literal>prefix: elemType.getSubOptions (prefix ++ 
-          [<replaceable>"prefix"</replaceable>])</literal> where 
-        <replaceable>"prefix"</replaceable> is the newly added 
-        prefix.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>getSubModules</varname></term>
-    <listitem><para>For composed types that can take a submodule as type 
-        parameter, this function should return the type parameters submodules. 
-        If the type parameter is called <literal>elemType</literal>, the 
-        function should just recursively look into submodules by returning 
-        <literal>elemType.getSubModules;</literal>.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>substSubModules</varname></term>
-    <listitem><para>For composed types that can take a submodule as type 
-        parameter, this function can be used to substitute the parameter of a 
-        submodule type. It takes a module as parameter and return the type with 
-        the submodule options substituted. It is usually defined as a type 
-        function call with a recursive call to 
-        <literal>substSubModules</literal>, e.g for a type 
-        <literal>composedType</literal> that take an <literal>elemtype</literal> 
-        type parameter, this function should be defined as <literal>m: 
-          composedType (elemType.substSubModules m)</literal>.</para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>typeMerge</varname></term>
-    <listitem><para>A function to merge multiple type declarations. Takes the 
-        type to merge <literal>functor</literal> as parameter. A 
-        <literal>null</literal> return value means that type cannot be 
-        merged.</para>
-      <variablelist>
-        <varlistentry>
-          <term><replaceable>f</replaceable></term>
-          <listitem><para>The type to merge  
-              <literal>functor</literal>.</para></listitem>
-        </varlistentry>
-      </variablelist>
-      <para>Note: There is a generic <literal>defaultTypeMerge</literal> that 
-        work with most of value and composed types.</para>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>definition</varname>
+    </term>
+    <listitem>
+     <para>
+      Description of the type used in documentation. Give information of the
+      type and any of its arguments.
+     </para>
     </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><varname>functor</varname></term>
-    <listitem><para>An attribute set representing the type. It is used for type 
-        operations and has the following keys:</para>
-      <variablelist>
-        <varlistentry>
-          <term><varname>type</varname></term>
-          <listitem><para>The type function.</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><varname>wrapped</varname></term>
-          <listitem><para>Holds the type parameter for composed types.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><varname>payload</varname></term>
-          <listitem><para>Holds the value parameter for value types. 
-              The types that have a <literal>payload</literal> are the
-              <literal>enum</literal>, <literal>separatedString</literal> and
-              <literal>submodule</literal> types.</para></listitem>
-        </varlistentry>
-        <varlistentry>
-          <term><varname>binOp</varname></term>
-          <listitem><para>A binary operation that can merge the payloads of two 
-              same types. Defined as a function that take two payloads as 
-              parameters and return the payloads merged.</para></listitem>
-        </varlistentry>
-      </variablelist>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>check</varname>
+    </term>
+    <listitem>
+     <para>
+      A function to type check the definition value. Takes the definition value
+      as a parameter and returns a boolean indicating the type check result,
+      <literal>true</literal> for success and <literal>false</literal> for
+      failure.
+     </para>
     </listitem>
-  </varlistentry>
-</variablelist>
-
-</section>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>merge</varname>
+    </term>
+    <listitem>
+     <para>
+      A function to merge multiple definitions values. Takes two parameters:
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term><replaceable>loc</replaceable>
+       </term>
+       <listitem>
+        <para>
+         The option path as a list of strings, e.g. <literal>["boot" "loader
+         "grub" "enable"]</literal>.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><replaceable>defs</replaceable>
+       </term>
+       <listitem>
+        <para>
+         The list of sets of defined <literal>value</literal> and
+         <literal>file</literal> where the value was defined, e.g. <literal>[ {
+         file = "/foo.nix"; value = 1; } { file = "/bar.nix"; value = 2 }
+         ]</literal>. The <literal>merge</literal> function should return the
+         merged value or throw an error in case the values are impossible or
+         not meant to be merged.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>getSubOptions</varname>
+    </term>
+    <listitem>
+     <para>
+      For composed types that can take a submodule as type parameter, this
+      function generate sub-options documentation. It takes the current option
+      prefix as a list and return the set of sub-options. Usually defined in a
+      recursive manner by adding a term to the prefix, e.g. <literal>prefix:
+      elemType.getSubOptions (prefix ++
+      [<replaceable>"prefix"</replaceable>])</literal> where
+      <replaceable>"prefix"</replaceable> is the newly added prefix.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>getSubModules</varname>
+    </term>
+    <listitem>
+     <para>
+      For composed types that can take a submodule as type parameter, this
+      function should return the type parameters submodules. If the type
+      parameter is called <literal>elemType</literal>, the function should just
+      recursively look into submodules by returning
+      <literal>elemType.getSubModules;</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>substSubModules</varname>
+    </term>
+    <listitem>
+     <para>
+      For composed types that can take a submodule as type parameter, this
+      function can be used to substitute the parameter of a submodule type. It
+      takes a module as parameter and return the type with the submodule
+      options substituted. It is usually defined as a type function call with a
+      recursive call to <literal>substSubModules</literal>, e.g for a type
+      <literal>composedType</literal> that take an <literal>elemtype</literal>
+      type parameter, this function should be defined as <literal>m:
+      composedType (elemType.substSubModules m)</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>typeMerge</varname>
+    </term>
+    <listitem>
+     <para>
+      A function to merge multiple type declarations. Takes the type to merge
+      <literal>functor</literal> as parameter. A <literal>null</literal> return
+      value means that type cannot be merged.
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term><replaceable>f</replaceable>
+       </term>
+       <listitem>
+        <para>
+         The type to merge <literal>functor</literal>.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+     <para>
+      Note: There is a generic <literal>defaultTypeMerge</literal> that work
+      with most of value and composed types.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><varname>functor</varname>
+    </term>
+    <listitem>
+     <para>
+      An attribute set representing the type. It is used for type operations
+      and has the following keys:
+     </para>
+     <variablelist>
+      <varlistentry>
+       <term><varname>type</varname>
+       </term>
+       <listitem>
+        <para>
+         The type function.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><varname>wrapped</varname>
+       </term>
+       <listitem>
+        <para>
+         Holds the type parameter for composed types.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><varname>payload</varname>
+       </term>
+       <listitem>
+        <para>
+         Holds the value parameter for value types. The types that have a
+         <literal>payload</literal> are the <literal>enum</literal>,
+         <literal>separatedString</literal> and <literal>submodule</literal>
+         types.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><varname>binOp</varname>
+       </term>
+       <listitem>
+        <para>
+         A binary operation that can merge the payloads of two same types.
+         Defined as a function that take two payloads as parameters and return
+         the payloads merged.
+        </para>
+       </listitem>
+      </varlistentry>
+     </variablelist>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </section>
 </section>
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index afcb970ed700..d4e5ff3f4312 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -3,252 +3,258 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="ch-releases">
-
-<title>Releases</title>
-
-<section xml:id="release-process">
+ <title>Releases</title>
+ <section xml:id="release-process">
   <title>Release process</title>
 
   <para>
-    Going through an example of releasing NixOS 17.09:
+   Going through an example of releasing NixOS 17.09:
   </para>
 
   <section xml:id="one-month-before-the-beta">
-    <title>One month before the beta</title>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Send an email to the nix-devel mailinglist as a warning about upcoming beta "feature freeze" in a month.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline.
-          Any issue or Pull Request targeting the release should be included in the release milestone.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section xml:id="at-beta-release-time">
-    <title>At beta release time</title>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create
-            an issue for tracking Zero Hydra Failures progress. ZHF is an effort
-            to get build failures down to zero.</link>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta &amp;&amp; git push --tags</literal>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          From the master branch run <literal>git checkout -B release-17.09</literal>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18">
-            Make sure a channel is created at http://nixos.org/channels/.
-          </link>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/settings/branches">
-            Let a GitHub nixpkgs admin lock the branch on github for you.
-            (so developers can’t force push)
-          </link>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
-            Bump the <literal>system.defaultChannel</literal> attribute in
-            <literal>nixos/modules/misc/version.nix</literal>
-          </link>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">
-            Update <literal>versionSuffix</literal> in
-          <literal>nixos/release.nix</literal></link>, use
-          <literal>git log --format=%an|wc -l</literal> to get the commit
-          count
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <literal>echo -n &quot;18.03&quot; &gt; .version</literal> on
-          master.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842">
-            Pick a new name for the unstable branch.
-          </link>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Create a new release notes file for the upcoming release + 1, in this
-          case <literal>rl-1803.xml</literal>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Create two Hydra jobsets: release-17.09 and release-17.09-small with <literal>stableBranch</literal> set to false.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Edit changelog at
-          <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal>
-          (double check desktop versions are noted)
-        </para>
-        <itemizedlist spacing="compact">
-          <listitem>
-            <para>
-              Get all new NixOS modules
-              <literal>git diff release-17.03..release-17.09 nixos/modules/module-list.nix|grep ^+</literal>
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              Note systemd, kernel, glibc and Nix upgrades.
-            </para>
-          </listitem>
-        </itemizedlist>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section xml:id="during-beta">
-    <title>During Beta</title>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Monitor the master branch for bugfixes and minor updates
-          and cherry-pick them to the release branch.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section xml:id="before-the-final-release">
-    <title>Before the final release</title>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Re-check that the release notes are complete.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Release Nix (currently only Eelco Dolstra can do that).
-          <link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4">
-            Make sure fallback is updated.
-          </link>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          <link xlink:href="https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e">
-            Update README.md with new stable NixOS version information.
-          </link>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Change <literal>stableBranch</literal> to true and wait for channel to update.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-  <section xml:id="at-final-release-time">
-    <title>At final release time</title>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          <literal>git tag -s -a -m &quot;Release 15.09&quot; 15.09</literal>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Get number of commits for the release:
-          <literal>git log release-14.04..release-14.12 --format=%an|wc -l</literal>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Commits by contributor:
-          <literal>git log release-14.04..release-14.12 --format=%an|sort|uniq -c|sort -rn</literal>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Send an email to nix-dev to announce the release with above information. Best to check how previous email was formulated
-          to see what needs to be included.
-        </para>
-      </listitem>
-    </itemizedlist>
-  </section>
-</section>
+   <title>One month before the beta</title>
 
-<section xml:id="release-schedule">
+   <itemizedlist spacing="compact">
+    <listitem>
+     <para>
+      Send an email to the nix-devel mailinglist as a warning about upcoming
+      beta "feature freeze" in a month.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Discuss with Eelco Dolstra and the community (via IRC, ML) about what
+      will reach the deadline. Any issue or Pull Request targeting the release
+      should be included in the release milestone.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </section>
+
+  <section xml:id="at-beta-release-time">
+   <title>At beta release time</title>
+
+   <itemizedlist spacing="compact">
+    <listitem>
+     <para>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/issues/13559">Create
+      an issue for tracking Zero Hydra Failures progress. ZHF is an effort to
+      get build failures down to zero.</link>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <literal>git tag -a -s -m &quot;Release 17.09-beta&quot; 17.09-beta
+      &amp;&amp; git push --tags</literal>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      From the master branch run <literal>git checkout -B
+      release-17.09</literal>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <link xlink:href="https://github.com/NixOS/nixos-org-configurations/pull/18">
+      Make sure a channel is created at http://nixos.org/channels/. </link>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/settings/branches">
+      Let a GitHub nixpkgs admin lock the branch on github for you. (so
+      developers can’t force push) </link>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
+      Bump the <literal>system.defaultChannel</literal> attribute in
+      <literal>nixos/modules/misc/version.nix</literal> </link>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/d6b08acd1ccac0d9d502c4b635e00b04d3387f06">
+      Update <literal>versionSuffix</literal> in
+      <literal>nixos/release.nix</literal></link>, use <literal>git log
+      --format=%an|wc -l</literal> to get the commit count
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <literal>echo -n &quot;18.03&quot; &gt; .version</literal> on master.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/b8a4095003e27659092892a4708bb3698231a842">
+      Pick a new name for the unstable branch. </link>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Create a new release notes file for the upcoming release + 1, in this
+      case <literal>rl-1803.xml</literal>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Create two Hydra jobsets: release-17.09 and release-17.09-small with
+      <literal>stableBranch</literal> set to false.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Edit changelog at
+      <literal>nixos/doc/manual/release-notes/rl-1709.xml</literal> (double
+      check desktop versions are noted)
+     </para>
+     <itemizedlist spacing="compact">
+      <listitem>
+       <para>
+        Get all new NixOS modules <literal>git diff
+        release-17.03..release-17.09 nixos/modules/module-list.nix|grep
+        ^+</literal>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        Note systemd, kernel, glibc and Nix upgrades.
+       </para>
+      </listitem>
+     </itemizedlist>
+    </listitem>
+   </itemizedlist>
+  </section>
+
+  <section xml:id="during-beta">
+   <title>During Beta</title>
+
+   <itemizedlist spacing="compact">
+    <listitem>
+     <para>
+      Monitor the master branch for bugfixes and minor updates and cherry-pick
+      them to the release branch.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </section>
+
+  <section xml:id="before-the-final-release">
+   <title>Before the final release</title>
+
+   <itemizedlist spacing="compact">
+    <listitem>
+     <para>
+      Re-check that the release notes are complete.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Release Nix (currently only Eelco Dolstra can do that).
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/53710c752a85f00658882531bc90a23a3d1287e4">
+      Make sure fallback is updated. </link>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      <link xlink:href="https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e">
+      Update README.md with new stable NixOS version information. </link>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Change <literal>stableBranch</literal> to true and wait for channel to
+      update.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </section>
+
+  <section xml:id="at-final-release-time">
+   <title>At final release time</title>
+
+   <itemizedlist spacing="compact">
+    <listitem>
+     <para>
+      <literal>git tag -s -a -m &quot;Release 15.09&quot; 15.09</literal>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Update http://nixos.org/nixos/download.html and
+      http://nixos.org/nixos/manual in
+      https://github.com/NixOS/nixos-org-configurations
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Get number of commits for the release: <literal>git log
+      release-14.04..release-14.12 --format=%an|wc -l</literal>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Commits by contributor: <literal>git log release-14.04..release-14.12
+      --format=%an|sort|uniq -c|sort -rn</literal>
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Send an email to nix-dev to announce the release with above information.
+      Best to check how previous email was formulated to see what needs to be
+      included.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </section>
+ </section>
+ <section xml:id="release-schedule">
   <title>Release schedule</title>
 
   <informaltable>
-    <tgroup cols="2">
-      <colspec align="left" />
-      <colspec align="left" />
-      <thead>
-        <row>
-          <entry>
+   <tgroup cols="2">
+    <colspec align="left" />
+    <colspec align="left" />
+    <thead>
+     <row>
+      <entry>
             Date
           </entry>
-          <entry>
+      <entry>
             Event
           </entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry>
             2016-07-25
           </entry>
-          <entry>
+      <entry>
             Send email to nix-dev about upcoming branch-off
           </entry>
-        </row>
-        <row>
-          <entry>
+     </row>
+     <row>
+      <entry>
             2016-09-01
           </entry>
-          <entry>
-            <literal>release-16.09</literal> branch and corresponding jobsets are created,
+      <entry><literal>release-16.09</literal> branch and corresponding jobsets are created,
             change freeze
           </entry>
-        </row>
-        <row>
-          <entry>
+     </row>
+     <row>
+      <entry>
             2016-09-30
           </entry>
-          <entry>
+      <entry>
             NixOS 16.09 released
           </entry>
-        </row>
-      </tbody>
-    </tgroup>
+     </row>
+    </tbody>
+   </tgroup>
   </informaltable>
-</section>
-
+ </section>
 </chapter>
diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml
index cc0539ec5109..7b103c36d907 100644
--- a/nixos/doc/manual/development/replace-modules.xml
+++ b/nixos/doc/manual/development/replace-modules.xml
@@ -3,27 +3,31 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-replace-modules">
+ <title>Replace Modules</title>
 
-<title>Replace Modules</title>
+ <para>
+  Modules that are imported can also be disabled. The option declarations and
+  config implementation of a disabled module will be ignored, allowing another
+  to take it's place. This can be used to import a set of modules from another
+  channel while keeping the rest of the system on a stable release.
+ </para>
 
-<para>Modules that are imported can also be disabled.  The option
-  declarations and config implementation of a disabled module will be
-  ignored, allowing another to take it's place.  This can be used to
-  import a set of modules from another channel while keeping the rest
-  of the system on a stable release.</para>
-<para><literal>disabledModules</literal> is a top level attribute like
+ <para>
+  <literal>disabledModules</literal> is a top level attribute like
   <literal>imports</literal>, <literal>options</literal> and
-  <literal>config</literal>.  It contains a list of modules that will
-  be disabled. This can either be the full path to the module or a
-  string with the filename relative to the modules path
-  (eg. &lt;nixpkgs/nixos/modules&gt; for nixos).
-  </para>
+  <literal>config</literal>. It contains a list of modules that will be
+  disabled. This can either be the full path to the module or a string with the
+  filename relative to the modules path (eg. &lt;nixpkgs/nixos/modules&gt; for
+  nixos).
+ </para>
 
-<para>This example will replace the existing postgresql module with
-  the version defined in the nixos-unstable channel while keeping the
-  rest of the modules and packages from the original nixos channel.
-  This only overrides the module definition, this won't use postgresql
-  from nixos-unstable unless explicitly configured to do so.</para>
+ <para>
+  This example will replace the existing postgresql module with the version
+  defined in the nixos-unstable channel while keeping the rest of the modules
+  and packages from the original nixos channel. This only overrides the module
+  definition, this won't use postgresql from nixos-unstable unless explicitly
+  configured to do so.
+ </para>
 
 <programlisting>
 { config, lib, pkgs, ... }:
@@ -41,10 +45,11 @@
 }
 </programlisting>
 
-<para>This example shows how to define a custom module as a
-  replacement for an existing module. Importing this module will
-  disable the original module without having to know it's
-  implementation details.</para>
+ <para>
+  This example shows how to define a custom module as a replacement for an
+  existing module. Importing this module will disable the original module
+  without having to know it's implementation details.
+ </para>
 
 <programlisting>
 { config, lib, pkgs, ... }:
@@ -71,5 +76,4 @@ in
   };
 }
 </programlisting>
-
 </section>
diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.xml b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
index e47490777815..862b364a6d79 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.xml
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.xml
@@ -3,41 +3,38 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-running-nixos-tests">
-<title>Running Tests interactively</title>
-
-<para>The test itself can be run interactively.  This is
-particularly useful when developing or debugging a test:
+ <title>Running Tests interactively</title>
 
+ <para>
+  The test itself can be run interactively. This is particularly useful when
+  developing or debugging a test:
 <screen>
 $ nix-build nixos/tests/login.nix -A driver
 $ ./result/bin/nixos-test-driver
 starting VDE switch for network 1
 &gt;
 </screen>
-
-You can then take any Perl statement, e.g.
-
+  You can then take any Perl statement, e.g.
 <screen>
 &gt; startAll
 &gt; testScript
 &gt; $machine->succeed("touch /tmp/foo")
 </screen>
+  The function <command>testScript</command> executes the entire test script
+  and drops you back into the test driver command line upon its completion.
+  This allows you to inspect the state of the VMs after the test (e.g. to debug
+  the test script).
+ </para>
 
-The function <command>testScript</command> executes the entire test
-script and drops you back into the test driver command line upon its
-completion.  This allows you to inspect the state of the VMs after the
-test (e.g. to debug the test script).</para>
-
-<para>To just start and experiment with the VMs, run:
-
+ <para>
+  To just start and experiment with the VMs, run:
 <screen>
 $ nix-build nixos/tests/login.nix -A driver
 $ ./result/bin/nixos-run-vms
 </screen>
-
-The script <command>nixos-run-vms</command> starts the virtual
-machines defined by test.  The root file system of the VMs is created
-on the fly and kept across VM restarts in
-<filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.</para>
-
+  The script <command>nixos-run-vms</command> starts the virtual machines
+  defined by test. The root file system of the VMs is created on the fly and
+  kept across VM restarts in
+  <filename>./</filename><varname>hostname</varname><filename>.qcow2</filename>.
+ </para>
 </section>
diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml
index 908c0a66a32d..eadbe1ea4f26 100644
--- a/nixos/doc/manual/development/running-nixos-tests.xml
+++ b/nixos/doc/manual/development/running-nixos-tests.xml
@@ -3,20 +3,18 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-running-nixos-tests-interactively">
+ <title>Running Tests</title>
 
-<title>Running Tests</title>
-
-<para>You can run tests using <command>nix-build</command>. For
-example, to run the test <filename
+ <para>
+  You can run tests using <command>nix-build</command>. For example, to run the
+  test
+  <filename
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>,
-you just do:
-
+  you just do:
 <screen>
 $ nix-build '&lt;nixpkgs/nixos/tests/login.nix>'
 </screen>
-
-or, if you don’t want to rely on <envar>NIX_PATH</envar>:
-
+  or, if you don’t want to rely on <envar>NIX_PATH</envar>:
 <screen>
 $ cd /my/nixpkgs/nixos/tests
 $ nix-build login.nix
@@ -26,16 +24,13 @@ machine: QEMU running (pid 8841)
 …
 6 out of 6 tests succeeded
 </screen>
-
-After building/downloading all required dependencies, this will
-perform a build that starts a QEMU/KVM virtual machine containing a
-NixOS system. The virtual machine mounts the Nix store of the host;
-this makes VM creation very fast, as no disk image needs to be
-created. Afterwards, you can view a pretty-printed log of the test:
-
+  After building/downloading all required dependencies, this will perform a
+  build that starts a QEMU/KVM virtual machine containing a NixOS system. The
+  virtual machine mounts the Nix store of the host; this makes VM creation very
+  fast, as no disk image needs to be created. Afterwards, you can view a
+  pretty-printed log of the test:
 <screen>
 $ firefox result/log.html
 </screen>
-
-</para>
+ </para>
 </section>
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml
index a2896cd7a135..c7b64cb84beb 100644
--- a/nixos/doc/manual/development/sources.xml
+++ b/nixos/doc/manual/development/sources.xml
@@ -3,101 +3,84 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-getting-sources">
-
-<title>Getting the Sources</title>
-
-<para>By default, NixOS’s <command>nixos-rebuild</command> command
-uses the NixOS and Nixpkgs sources provided by the
-<literal>nixos</literal> channel (kept in
-<filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>).
-To modify NixOS, however, you should check out the latest sources from
-Git.  This is as follows:
-
+ <title>Getting the Sources</title>
+ <para>
+  By default, NixOS’s <command>nixos-rebuild</command> command uses the NixOS
+  and Nixpkgs sources provided by the <literal>nixos</literal> channel (kept in
+  <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To
+  modify NixOS, however, you should check out the latest sources from Git. This
+  is as follows:
 <screen>
 $ git clone git://github.com/NixOS/nixpkgs.git
 $ cd nixpkgs
 $ git remote add channels git://github.com/NixOS/nixpkgs-channels.git
 $ git remote update channels
 </screen>
-
-This will check out the latest Nixpkgs sources to
-<filename>./nixpkgs</filename> the NixOS sources to
-<filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in
-a subdirectory of the Nixpkgs repository.) The remote
-<literal>channels</literal> refers to a read-only repository that
-tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/>
-for more information about channels). Thus, the Git branch
-<literal>channels/nixos-17.03</literal> will contain the latest built
-and tested version available in the <literal>nixos-17.03</literal>
-channel.</para>
-
-<para>It’s often inconvenient to develop directly on the master
-branch, since if somebody has just committed (say) a change to GCC,
-then the binary cache may not have caught up yet and you’ll have to
-rebuild everything from source. So you may want to create a local
-branch based on your current NixOS version:
-
+  This will check out the latest Nixpkgs sources to
+  <filename>./nixpkgs</filename> the NixOS sources to
+  <filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in a
+  subdirectory of the Nixpkgs repository.) The remote
+  <literal>channels</literal> refers to a read-only repository that tracks the
+  Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> for more
+  information about channels). Thus, the Git branch
+  <literal>channels/nixos-17.03</literal> will contain the latest built and
+  tested version available in the <literal>nixos-17.03</literal> channel.
+ </para>
+ <para>
+  It’s often inconvenient to develop directly on the master branch, since if
+  somebody has just committed (say) a change to GCC, then the binary cache may
+  not have caught up yet and you’ll have to rebuild everything from source.
+  So you may want to create a local branch based on your current NixOS version:
 <screen>
 $ nixos-version
 17.09pre104379.6e0b727 (Hummingbird)
 
 $ git checkout -b local 6e0b727
 </screen>
-
-Or, to base your local branch on the latest version available in a
-NixOS channel:
-
+  Or, to base your local branch on the latest version available in a NixOS
+  channel:
 <screen>
 $ git remote update channels
 $ git checkout -b local channels/nixos-17.03
 </screen>
-
-(Replace <literal>nixos-17.03</literal> with the name of the channel
-you want to use.) You can use <command>git merge</command> or
-<command>git rebase</command> to keep your local branch in sync with
-the channel, e.g.
-
+  (Replace <literal>nixos-17.03</literal> with the name of the channel you want
+  to use.) You can use <command>git merge</command> or <command>git
+  rebase</command> to keep your local branch in sync with the channel, e.g.
 <screen>
 $ git remote update channels
 $ git merge channels/nixos-17.03
 </screen>
-
-You can use <command>git cherry-pick</command> to copy commits from
-your local branch to the upstream branch.</para>
-
-<para>If you want to rebuild your system using your (modified)
-sources, you need to tell <command>nixos-rebuild</command> about them
-using the <option>-I</option> flag:
-
+  You can use <command>git cherry-pick</command> to copy commits from your
+  local branch to the upstream branch.
+ </para>
+ <para>
+  If you want to rebuild your system using your (modified) sources, you need to
+  tell <command>nixos-rebuild</command> about them using the
+  <option>-I</option> flag:
 <screen>
 # nixos-rebuild switch -I nixpkgs=<replaceable>/my/sources</replaceable>/nixpkgs
 </screen>
-
-</para>
-
-<para>If you want <command>nix-env</command> to use the expressions in
-<replaceable>/my/sources</replaceable>, use <command>nix-env -f
-<replaceable>/my/sources</replaceable>/nixpkgs</command>, or change
-the default by adding a symlink in
-<filename>~/.nix-defexpr</filename>:
-
+ </para>
+ <para>
+  If you want <command>nix-env</command> to use the expressions in
+  <replaceable>/my/sources</replaceable>, use <command>nix-env -f
+  <replaceable>/my/sources</replaceable>/nixpkgs</command>, or change the
+  default by adding a symlink in <filename>~/.nix-defexpr</filename>:
 <screen>
 $ ln -s <replaceable>/my/sources</replaceable>/nixpkgs ~/.nix-defexpr/nixpkgs
 </screen>
-
-You may want to delete the symlink
-<filename>~/.nix-defexpr/channels_root</filename> to prevent root’s
-NixOS channel from clashing with your own tree (this may break the
-command-not-found utility though). If you want to go back to the default
-state, you may just remove the <filename>~/.nix-defexpr</filename>
-directory completely, log out and log in again and it should have been
-recreated with a link to the root channels.</para>
-
+  You may want to delete the symlink
+  <filename>~/.nix-defexpr/channels_root</filename> to prevent root’s NixOS
+  channel from clashing with your own tree (this may break the
+  command-not-found utility though). If you want to go back to the default
+  state, you may just remove the <filename>~/.nix-defexpr</filename> directory
+  completely, log out and log in again and it should have been recreated with a
+  link to the root channels.
+ </para>
 <!-- FIXME: not sure what this means.
 <para>You should not pass the base directory
 <filename><replaceable>/my/sources</replaceable></filename>
 to <command>nix-env</command>, as it will break after interpreting expressions
 in <filename>nixos/</filename> as packages.</para>
 -->
-
 </chapter>
diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml
index 16bc8125d9ff..63f5f3de7f4d 100644
--- a/nixos/doc/manual/development/testing-installer.xml
+++ b/nixos/doc/manual/development/testing-installer.xml
@@ -3,27 +3,20 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="ch-testing-installer">
-
-<title>Testing the Installer</title>
-
-<para>Building, burning, and booting from an installation CD is rather
-tedious, so here is a quick way to see if the installer works
-properly:
-
+ <title>Testing the Installer</title>
+ <para>
+  Building, burning, and booting from an installation CD is rather tedious, so
+  here is a quick way to see if the installer works properly:
 <screen>
 # mount -t tmpfs none /mnt
 # nixos-generate-config --root /mnt
 $ nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-install
 # ./result/bin/nixos-install</screen>
-
-To start a login shell in the new NixOS installation in
-<filename>/mnt</filename>:
-
+  To start a login shell in the new NixOS installation in
+  <filename>/mnt</filename>:
 <screen>
 $ nix-build '&lt;nixpkgs/nixos>' -A config.system.build.nixos-enter
 # ./result/bin/nixos-enter
 </screen>
-
-</para>
-
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml
index 8b787fae1fe0..8ecdd1c770f2 100644
--- a/nixos/doc/manual/development/writing-documentation.xml
+++ b/nixos/doc/manual/development/writing-documentation.xml
@@ -3,157 +3,147 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-writing-documentation">
+ <title>Writing NixOS Documentation</title>
+ <para>
+  As NixOS grows, so too does the need for a catalogue and explanation of its
+  extensive functionality. Collecting pertinent information from disparate
+  sources and presenting it in an accessible style would be a worthy
+  contribution to the project.
+ </para>
+ <section>
+  <title>Building the Manual</title>
 
-<title>Writing NixOS Documentation</title>
+  <para>
+   The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the
+   <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link>
+   subdirectory of the Nixpkgs repository.
+  </para>
 
-<para>
-  As NixOS grows, so too does the need for a catalogue and explanation
-  of its extensive functionality. Collecting pertinent information
-  from disparate sources and presenting it in an accessible style
-  would be a worthy contribution to the project.
-</para>
-
-<section>
-<title>Building the Manual</title>
-<para>
-  The DocBook sources of the <xref linkend="book-nixos-manual"/> are in the
-  <link xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/doc/manual"><filename>nixos/doc/manual</filename></link>
-  subdirectory of the Nixpkgs repository.
-</para>
-
-<para>
-  You can quickly validate your edits with <command>make</command>:
-</para>
+  <para>
+   You can quickly validate your edits with <command>make</command>:
+  </para>
 
 <screen>
   $ cd /path/to/nixpkgs/nixos/doc/manual
   $ make
 </screen>
 
-<para>
-  Once you are done making modifications to the manual, it's important
-  to build it before committing. You can do that as follows:
-</para>
+  <para>
+   Once you are done making modifications to the manual, it's important to
+   build it before committing. You can do that as follows:
+  </para>
 
 <screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen>
 
-<para>
-  When this command successfully finishes, it will tell you where the
-  manual got generated. The HTML will be accessible through the
-  <filename>result</filename> symlink at
-  <filename>./result/share/doc/nixos/index.html</filename>.
-</para>
-</section>
+  <para>
+   When this command successfully finishes, it will tell you where the manual
+   got generated. The HTML will be accessible through the
+   <filename>result</filename> symlink at
+   <filename>./result/share/doc/nixos/index.html</filename>.
+  </para>
+ </section>
+ <section>
+  <title>Editing DocBook XML</title>
 
-<section>
-<title>Editing DocBook XML</title>
+  <para>
+   For general information on how to write in DocBook, see
+   <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html"> DocBook
+   5: The Definitive Guide</link>.
+  </para>
 
-<para>
-  For general information on how to write in DocBook, see
-  <link xlink:href="http://www.docbook.org/tdg5/en/html/docbook.html">
-    DocBook 5: The Definitive Guide</link>.
-</para>
+  <para>
+   Emacs nXML Mode is very helpful for editing DocBook XML because it validates
+   the document as you write, and precisely locates errors. To use it, see
+   <xref linkend="sec-emacs-docbook-xml"/>.
+  </para>
 
-<para>
-  Emacs nXML Mode is very helpful for editing DocBook XML because it
-  validates the document as you write, and precisely locates
-  errors. To use it, see <xref linkend="sec-emacs-docbook-xml"/>.
-</para>
-
-<para>
-  <link xlink:href="http://pandoc.org">Pandoc</link> can generate
-  DocBook XML from a multitude of formats, which makes a good starting
-  point.
-
-  <example xml:id="ex-pandoc-xml-conv">
+  <para>
+   <link xlink:href="http://pandoc.org">Pandoc</link> can generate DocBook XML
+   from a multitude of formats, which makes a good starting point.
+   <example xml:id="ex-pandoc-xml-conv">
     <title>Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML</title>
-    <screen>pandoc -f markdown_github -t docbook5 docs.md -o my-section.md</screen>
-  </example>
+<screen>pandoc -f markdown_github -t docbook5 docs.md -o my-section.md</screen>
+   </example>
+   Pandoc can also quickly convert a single <filename>section.xml</filename> to
+   HTML, which is helpful when drafting.
+  </para>
 
-  Pandoc can also quickly convert a single
-  <filename>section.xml</filename> to HTML, which is helpful when
-  drafting.
-</para>
-
-<para>
-  Sometimes writing valid DocBook is simply too difficult. In this
-  case, submit your documentation updates in a <link
+  <para>
+   Sometimes writing valid DocBook is simply too difficult. In this case,
+   submit your documentation updates in a
+   <link
   xlink:href="https://github.com/NixOS/nixpkgs/issues/new">GitHub
-  Issue</link> and someone will handle the conversion to XML for you.
-</para>
-</section>
+   Issue</link> and someone will handle the conversion to XML for you.
+  </para>
+ </section>
+ <section>
+  <title>Creating a Topic</title>
 
-<section>
-<title>Creating a Topic</title>
+  <para>
+   You can use an existing topic as a basis for the new topic or create a topic
+   from scratch.
+  </para>
 
-<para>
- You can use an existing topic as a basis for the new topic or create a topic from scratch.
-</para>
+  <para>
+   Keep the following guidelines in mind when you create and add a topic:
+   <itemizedlist>
+    <listitem>
+     <para>
+      The NixOS
+      <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link>
+      element is in <filename>nixos/doc/manual/manual.xml</filename>. It
+      includes several
+      <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link>
+      which are in subdirectories.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Store the topic file in the same directory as the <tag>part</tag> to
+      which it belongs. If your topic is about configuring a NixOS module, then
+      the XML file can be stored alongside the module definition
+      <filename>nix</filename> file.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      If you include multiple words in the file name, separate the words with a
+      dash. For example: <filename>ipv6-config.xml</filename>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Make sure that the <tag>xml:id</tag> value is unique. You can use
+      abbreviations if the ID is too long. For example:
+      <varname>nixos-config</varname>.
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Determine whether your topic is a chapter or a section. If you are
+      unsure, open an existing topic file and check whether the main element is
+      chapter or section.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </section>
+ <section>
+  <title>Adding a Topic to the Book</title>
 
-<para>
-Keep the following guidelines in mind when you create and add a topic:
+  <para>
+   Open the parent XML file and add an <varname>xi:include</varname> element to
+   the list of chapters with the file name of the topic that you created. If
+   you created a <tag>section</tag>, you add the file to the <tag>chapter</tag>
+   file. If you created a <tag>chapter</tag>, you add the file to the
+   <tag>part</tag> file.
+  </para>
 
-<itemizedlist>
-  <listitem><para>
-    The NixOS <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>book</tag></link>
-    element is in <filename>nixos/doc/manual/manual.xml</filename>.
-    It includes several
-    <link xlink:href="http://www.docbook.org/tdg5/en/html/book.html"><tag>part</tag>s</link>
-    which are in subdirectories.
-  </para></listitem>
-
-  <listitem><para>
-    Store the topic file in the same directory as the <tag>part</tag>
-    to which it belongs. If your topic is about configuring a NixOS
-    module, then the XML file can be stored alongside the module
-    definition <filename>nix</filename> file.
-  </para></listitem>
-
-  <listitem><para>
-    If you include multiple words in the file name, separate the words
-    with a dash. For example: <filename>ipv6-config.xml</filename>.
-  </para></listitem>
-
-  <listitem><para>
-    Make sure that the <tag>xml:id</tag> value is unique. You can use
-    abbreviations if the ID is too long. For example:
-    <varname>nixos-config</varname>.
-  </para></listitem>
-
-  <listitem><para>
-    Determine whether your topic is a chapter or a section. If you are
-    unsure, open an existing topic file and check whether the main
-    element is chapter or section.
-  </para></listitem>
-
-</itemizedlist>
-
-</para>
-</section>
-
-<section>
-<title>Adding a Topic to the Book</title>
-
-<para>
-  Open the parent XML file and add an <varname>xi:include</varname>
-  element to the list of chapters with the file name of the topic that
-  you created. If you created a <tag>section</tag>, you add the file to
-  the <tag>chapter</tag> file. If you created a <tag>chapter</tag>, you
-  add the file to the <tag>part</tag> file.
-</para>
-
-<para>
-  If the topic is about configuring a NixOS module, it can be
-  automatically included in the manual by using the
-  <varname>meta.doc</varname> attribute. See <xref
+  <para>
+   If the topic is about configuring a NixOS module, it can be automatically
+   included in the manual by using the <varname>meta.doc</varname> attribute.
+   See <xref
   linkend="sec-meta-attributes"/> for an explanation.
-</para>
-
-</section>
-
-
-
-
-
-
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index a49f99cb2669..bbf793bb0be9 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -3,52 +3,54 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-writing-modules">
-
-<title>Writing NixOS Modules</title>
-
-<para>NixOS has a modular system for declarative configuration.  This
-system combines multiple <emphasis>modules</emphasis> to produce the
-full system configuration.  One of the modules that constitute the
-configuration is <filename>/etc/nixos/configuration.nix</filename>.
-Most of the others live in the <link
+ <title>Writing NixOS Modules</title>
+ <para>
+  NixOS has a modular system for declarative configuration. This system
+  combines multiple <emphasis>modules</emphasis> to produce the full system
+  configuration. One of the modules that constitute the configuration is
+  <filename>/etc/nixos/configuration.nix</filename>. Most of the others live in
+  the
+  <link
 xlink:href="https://github.com/NixOS/nixpkgs/tree/master/nixos/modules"><filename>nixos/modules</filename></link>
-subdirectory of the Nixpkgs tree.</para>
-
-<para>Each NixOS module is a file that handles one logical aspect of
-the configuration, such as a specific kind of hardware, a service, or
-network settings.  A module configuration does not have to handle
-everything from scratch; it can use the functionality provided by
-other modules for its implementation.  Thus a module can
-<emphasis>declare</emphasis> options that can be used by other
-modules, and conversely can <emphasis>define</emphasis> options
-provided by other modules in its own implementation.  For example, the
-module <link
+  subdirectory of the Nixpkgs tree.
+ </para>
+ <para>
+  Each NixOS module is a file that handles one logical aspect of the
+  configuration, such as a specific kind of hardware, a service, or network
+  settings. A module configuration does not have to handle everything from
+  scratch; it can use the functionality provided by other modules for its
+  implementation. Thus a module can <emphasis>declare</emphasis> options that
+  can be used by other modules, and conversely can <emphasis>define</emphasis>
+  options provided by other modules in its own implementation. For example, the
+  module
+  <link
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/security/pam.nix"><filename>pam.nix</filename></link>
-declares the option <option>security.pam.services</option> that allows
-other modules (e.g. <link
+  declares the option <option>security.pam.services</option> that allows other
+  modules (e.g.
+  <link
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/services/networking/ssh/sshd.nix"><filename>sshd.nix</filename></link>)
-to define PAM services; and it defines the option
-<option>environment.etc</option> (declared by <link
+  to define PAM services; and it defines the option
+  <option>environment.etc</option> (declared by
+  <link
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/system/etc/etc.nix"><filename>etc.nix</filename></link>)
-to cause files to be created in
-<filename>/etc/pam.d</filename>.</para>
-
-<para xml:id="para-module-syn">In <xref
+  to cause files to be created in <filename>/etc/pam.d</filename>.
+ </para>
+ <para xml:id="para-module-syn">
+  In <xref
 linkend="sec-configuration-syntax"/>, we saw the following structure
-of NixOS modules:
-
+  of NixOS modules:
 <programlisting>
 { config, pkgs, ... }:
 
 { <replaceable>option definitions</replaceable>
 }
 </programlisting>
-
-This is actually an <emphasis>abbreviated</emphasis> form of module
-that only defines options, but does not declare any.  The structure of
-full NixOS modules is shown in <xref linkend='ex-module-syntax' />.</para>
-
-<example xml:id='ex-module-syntax'><title>Structure of NixOS Modules</title>
+  This is actually an <emphasis>abbreviated</emphasis> form of module that only
+  defines options, but does not declare any. The structure of full NixOS
+  modules is shown in <xref linkend='ex-module-syntax' />.
+ </para>
+ <example xml:id='ex-module-syntax'>
+  <title>Structure of NixOS Modules</title>
 <programlisting>
 { config, pkgs, ... }: <co xml:id='module-syntax-1' />
 
@@ -65,56 +67,56 @@ full NixOS modules is shown in <xref linkend='ex-module-syntax' />.</para>
     <replaceable>option definitions</replaceable> <co xml:id='module-syntax-4' />
   };
 }</programlisting>
-</example>
-
-<para>The meaning of each part is as follows.
-
-<calloutlist>
-  <callout arearefs='module-syntax-1'>
-    <para>This line makes the current Nix expression a function.  The
-    variable <varname>pkgs</varname> contains Nixpkgs, while
-    <varname>config</varname> contains the full system configuration.
-    This line can be omitted if there is no reference to
-    <varname>pkgs</varname> and <varname>config</varname> inside the
-    module.</para>
-  </callout>
-
-  <callout arearefs='module-syntax-2'>
-    <para>This list enumerates the paths to other NixOS modules that
-    should be included in the evaluation of the system configuration.
-    A default set of modules is defined in the file
-    <filename>modules/module-list.nix</filename>.  These don't need to
-    be added in the import list.</para>
-  </callout>
-
-  <callout arearefs='module-syntax-3'>
-    <para>The attribute <varname>options</varname> is a nested set of
-    <emphasis>option declarations</emphasis> (described below).</para>
-  </callout>
-
-  <callout arearefs='module-syntax-4'>
-    <para>The attribute <varname>config</varname> is a nested set of
-    <emphasis>option definitions</emphasis> (also described
-    below).</para>
-  </callout>
-</calloutlist>
-
-</para>
-
-<para><xref linkend='locate-example' /> shows a module that handles
-the regular update of the “locate” database, an index of all files in
-the file system.  This module declares two options that can be defined
-by other modules (typically the user’s
-<filename>configuration.nix</filename>):
-<option>services.locate.enable</option> (whether the database should
-be updated) and <option>services.locate.interval</option> (when the
-update should be done).  It implements its functionality by defining
-two options declared by other modules:
-<option>systemd.services</option> (the set of all systemd services)
-and <option>systemd.timers</option> (the list of commands to be
-executed periodically by <command>systemd</command>).</para>
-
-<example xml:id='locate-example'><title>NixOS Module for the “locate” Service</title>
+ </example>
+ <para>
+  The meaning of each part is as follows.
+  <calloutlist>
+   <callout arearefs='module-syntax-1'>
+    <para>
+     This line makes the current Nix expression a function. The variable
+     <varname>pkgs</varname> contains Nixpkgs, while <varname>config</varname>
+     contains the full system configuration. This line can be omitted if there
+     is no reference to <varname>pkgs</varname> and <varname>config</varname>
+     inside the module.
+    </para>
+   </callout>
+   <callout arearefs='module-syntax-2'>
+    <para>
+     This list enumerates the paths to other NixOS modules that should be
+     included in the evaluation of the system configuration. A default set of
+     modules is defined in the file
+     <filename>modules/module-list.nix</filename>. These don't need to be added
+     in the import list.
+    </para>
+   </callout>
+   <callout arearefs='module-syntax-3'>
+    <para>
+     The attribute <varname>options</varname> is a nested set of
+     <emphasis>option declarations</emphasis> (described below).
+    </para>
+   </callout>
+   <callout arearefs='module-syntax-4'>
+    <para>
+     The attribute <varname>config</varname> is a nested set of
+     <emphasis>option definitions</emphasis> (also described below).
+    </para>
+   </callout>
+  </calloutlist>
+ </para>
+ <para>
+  <xref linkend='locate-example' /> shows a module that handles the regular
+  update of the “locate” database, an index of all files in the file
+  system. This module declares two options that can be defined by other modules
+  (typically the user’s <filename>configuration.nix</filename>):
+  <option>services.locate.enable</option> (whether the database should be
+  updated) and <option>services.locate.interval</option> (when the update
+  should be done). It implements its functionality by defining two options
+  declared by other modules: <option>systemd.services</option> (the set of all
+  systemd services) and <option>systemd.timers</option> (the list of commands
+  to be executed periodically by <command>systemd</command>).
+ </para>
+ <example xml:id='locate-example'>
+  <title>NixOS Module for the “locate” Service</title>
 <programlisting>
 { config, lib, pkgs, ... }:
 
@@ -173,14 +175,12 @@ in {
   };
 }
 </programlisting>
-</example>
-
-<xi:include href="option-declarations.xml" />
-<xi:include href="option-types.xml" />
-<xi:include href="option-def.xml" />
-<xi:include href="assertions.xml" />
-<xi:include href="meta-attributes.xml" />
-<xi:include href="importing-modules.xml" />
-<xi:include href="replace-modules.xml" />
-
+ </example>
+ <xi:include href="option-declarations.xml" />
+ <xi:include href="option-types.xml" />
+ <xi:include href="option-def.xml" />
+ <xi:include href="assertions.xml" />
+ <xi:include href="meta-attributes.xml" />
+ <xi:include href="importing-modules.xml" />
+ <xi:include href="replace-modules.xml" />
 </chapter>
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index a8f6aa00858e..89a6a4423627 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -3,11 +3,10 @@
         xmlns:xi="http://www.w3.org/2001/XInclude"
         version="5.0"
         xml:id="sec-writing-nixos-tests">
+ <title>Writing Tests</title>
 
-<title>Writing Tests</title>
-
-<para>A NixOS test is a Nix expression that has the following structure:
-
+ <para>
+  A NixOS test is a Nix expression that has the following structure:
 <programlisting>
 import ./make-test.nix {
 
@@ -32,277 +31,364 @@ import ./make-test.nix {
     '';
 }
 </programlisting>
-
-The attribute <literal>testScript</literal> is a bit of Perl code that
-executes the test (described below). During the test, it will start
-one or more virtual machines, the configuration of which is described
-by the attribute <literal>machine</literal> (if you need only one
-machine in your test) or by the attribute <literal>nodes</literal> (if
-you need multiple machines). For instance, <filename
+  The attribute <literal>testScript</literal> is a bit of Perl code that
+  executes the test (described below). During the test, it will start one or
+  more virtual machines, the configuration of which is described by the
+  attribute <literal>machine</literal> (if you need only one machine in your
+  test) or by the attribute <literal>nodes</literal> (if you need multiple
+  machines). For instance,
+  <filename
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix">login.nix</filename>
-only needs a single machine to test whether users can log in on the
-virtual console, whether device ownership is correctly maintained when
-switching between consoles, and so on. On the other hand, <filename
+  only needs a single machine to test whether users can log in on the virtual
+  console, whether device ownership is correctly maintained when switching
+  between consoles, and so on. On the other hand,
+  <filename
 xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nfs.nix</filename>,
-which tests NFS client and server functionality in the Linux kernel
-(including whether locks are maintained across server crashes),
-requires three machines: a server and two clients.</para>
-
-<para>There are a few special NixOS configuration options for test
-VMs:
+  which tests NFS client and server functionality in the Linux kernel
+  (including whether locks are maintained across server crashes), requires
+  three machines: a server and two clients.
+ </para>
 
+ <para>
+  There are a few special NixOS configuration options for test VMs:
 <!-- FIXME: would be nice to generate this automatically. -->
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>virtualisation.memorySize</option></term>
-    <listitem><para>The memory of the VM in
-    megabytes.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>virtualisation.vlans</option></term>
-    <listitem><para>The virtual networks to which the VM is
-    connected. See <filename
+  <variablelist>
+   <varlistentry>
+    <term><option>virtualisation.memorySize</option>
+    </term>
+    <listitem>
+     <para>
+      The memory of the VM in megabytes.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>virtualisation.vlans</option>
+    </term>
+    <listitem>
+     <para>
+      The virtual networks to which the VM is connected. See
+      <filename
     xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nat.nix">nat.nix</filename>
-    for an example.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>virtualisation.writableStore</option></term>
-    <listitem><para>By default, the Nix store in the VM is not
-    writable. If you enable this option, a writable union file system
-    is mounted on top of the Nix store to make it appear
-    writable. This is necessary for tests that run Nix operations that
-    modify the store.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-For more options, see the module <filename
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>.</para>
-
-<para>The test script is a sequence of Perl statements that perform
-various actions, such as starting VMs, executing commands in the VMs,
-and so on. Each virtual machine is represented as an object stored in
-the variable <literal>$<replaceable>name</replaceable></literal>,
-where <replaceable>name</replaceable> is the identifier of the machine
-(which is just <literal>machine</literal> if you didn’t specify
-multiple machines using the <literal>nodes</literal> attribute). For
-instance, the following starts the machine, waits until it has
-finished booting, then executes a command and checks that the output
-is more-or-less correct:
+      for an example.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>virtualisation.writableStore</option>
+    </term>
+    <listitem>
+     <para>
+      By default, the Nix store in the VM is not writable. If you enable this
+      option, a writable union file system is mounted on top of the Nix store
+      to make it appear writable. This is necessary for tests that run Nix
+      operations that modify the store.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+  For more options, see the module
+  <filename
+xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/qemu-vm.nix">qemu-vm.nix</filename>.
+ </para>
 
+ <para>
+  The test script is a sequence of Perl statements that perform various
+  actions, such as starting VMs, executing commands in the VMs, and so on. Each
+  virtual machine is represented as an object stored in the variable
+  <literal>$<replaceable>name</replaceable></literal>, where
+  <replaceable>name</replaceable> is the identifier of the machine (which is
+  just <literal>machine</literal> if you didn’t specify multiple machines
+  using the <literal>nodes</literal> attribute). For instance, the following
+  starts the machine, waits until it has finished booting, then executes a
+  command and checks that the output is more-or-less correct:
 <programlisting>
 $machine->start;
 $machine->waitForUnit("default.target");
 $machine->succeed("uname") =~ /Linux/;
 </programlisting>
-
-The first line is actually unnecessary; machines are implicitly
-started when you first execute an action on them (such as
-<literal>waitForUnit</literal> or <literal>succeed</literal>). If you
-have multiple machines, you can speed up the test by starting them in
-parallel:
-
+  The first line is actually unnecessary; machines are implicitly started when
+  you first execute an action on them (such as <literal>waitForUnit</literal>
+  or <literal>succeed</literal>). If you have multiple machines, you can speed
+  up the test by starting them in parallel:
 <programlisting>
 startAll;
 </programlisting>
+ </para>
 
-</para>
-
-<para>The following methods are available on machine objects:
-
-<variablelist>
-
-  <varlistentry>
-    <term><methodname>start</methodname></term>
-    <listitem><para>Start the virtual machine. This method is
-    asynchronous — it does not wait for the machine to finish
-    booting.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>shutdown</methodname></term>
-    <listitem><para>Shut down the machine, waiting for the VM to
-    exit.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>crash</methodname></term>
-    <listitem><para>Simulate a sudden power failure, by telling the VM
-    to exit immediately.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>block</methodname></term>
-    <listitem><para>Simulate unplugging the Ethernet cable that
-    connects the machine to the other machines.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>unblock</methodname></term>
-    <listitem><para>Undo the effect of
-    <methodname>block</methodname>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>screenshot</methodname></term>
-    <listitem><para>Take a picture of the display of the virtual
-    machine, in PNG format. The screenshot is linked from the HTML
-    log.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>getScreenText</methodname></term>
-    <listitem><para>Return a textual representation of what is currently
-    visible on the machine's screen using optical character
-    recognition.</para>
-    <note><para>This requires passing <option>enableOCR</option> to the test
-    attribute set.</para></note></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>sendMonitorCommand</methodname></term>
-    <listitem><para>Send a command to the QEMU monitor. This is rarely
-    used, but allows doing stuff such as attaching virtual USB disks
-    to a running machine.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>sendKeys</methodname></term>
-    <listitem><para>Simulate pressing keys on the virtual keyboard,
-    e.g., <literal>sendKeys("ctrl-alt-delete")</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>sendChars</methodname></term>
-    <listitem><para>Simulate typing a sequence of characters on the
-    virtual keyboard, e.g., <literal>sendKeys("foobar\n")</literal>
-    will type the string <literal>foobar</literal> followed by the
-    Enter key.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>execute</methodname></term>
-    <listitem><para>Execute a shell command, returning a list
-    <literal>(<replaceable>status</replaceable>,
-    <replaceable>stdout</replaceable>)</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>succeed</methodname></term>
-    <listitem><para>Execute a shell command, raising an exception if
-    the exit status is not zero, otherwise returning the standard
-    output.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>fail</methodname></term>
-    <listitem><para>Like <methodname>succeed</methodname>, but raising
-    an exception if the command returns a zero status.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitUntilSucceeds</methodname></term>
-    <listitem><para>Repeat a shell command with 1-second intervals
-    until it succeeds.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitUntilFails</methodname></term>
-    <listitem><para>Repeat a shell command with 1-second intervals
-    until it fails.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForUnit</methodname></term>
-    <listitem><para>Wait until the specified systemd unit has reached
-    the “active” state.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForFile</methodname></term>
-    <listitem><para>Wait until the specified file
-    exists.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForOpenPort</methodname></term>
-    <listitem><para>Wait until a process is listening on the given TCP
-    port (on <literal>localhost</literal>, at least).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForClosedPort</methodname></term>
-    <listitem><para>Wait until nobody is listening on the given TCP
-    port.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForX</methodname></term>
-    <listitem><para>Wait until the X11 server is accepting
-    connections.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForText</methodname></term>
-    <listitem><para>Wait until the supplied regular expressions matches
-    the textual contents of the screen by using optical character recognition
-    (see <methodname>getScreenText</methodname>).</para>
-    <note><para>This requires passing <option>enableOCR</option> to the test
-    attribute set.</para></note></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>waitForWindow</methodname></term>
-    <listitem><para>Wait until an X11 window has appeared whose name
-    matches the given regular expression, e.g.,
-    <literal>waitForWindow(qr/Terminal/)</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>copyFileFromHost</methodname></term>
-    <listitem><para>Copies a file from host to machine, e.g.,
-    <literal>copyFileFromHost("myfile", "/etc/my/important/file")</literal>.</para>
-    <para>The first argument is the file on the host. The file needs to be
-    accessible while building the nix derivation. The second argument is
-    the location of the file on the machine.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><methodname>systemctl</methodname></term>
+ <para>
+  The following methods are available on machine objects:
+  <variablelist>
+   <varlistentry>
+    <term><methodname>start</methodname>
+    </term>
     <listitem>
-      <para>Runs <literal>systemctl</literal> commands with optional support for
-      <literal>systemctl --user</literal></para>
-    <para>
-      <programlisting>
+     <para>
+      Start the virtual machine. This method is asynchronous — it does not
+      wait for the machine to finish booting.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>shutdown</methodname>
+    </term>
+    <listitem>
+     <para>
+      Shut down the machine, waiting for the VM to exit.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>crash</methodname>
+    </term>
+    <listitem>
+     <para>
+      Simulate a sudden power failure, by telling the VM to exit immediately.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>block</methodname>
+    </term>
+    <listitem>
+     <para>
+      Simulate unplugging the Ethernet cable that connects the machine to the
+      other machines.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>unblock</methodname>
+    </term>
+    <listitem>
+     <para>
+      Undo the effect of <methodname>block</methodname>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>screenshot</methodname>
+    </term>
+    <listitem>
+     <para>
+      Take a picture of the display of the virtual machine, in PNG format. The
+      screenshot is linked from the HTML log.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>getScreenText</methodname>
+    </term>
+    <listitem>
+     <para>
+      Return a textual representation of what is currently visible on the
+      machine's screen using optical character recognition.
+     </para>
+     <note>
+      <para>
+       This requires passing <option>enableOCR</option> to the test attribute
+       set.
+      </para>
+     </note>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>sendMonitorCommand</methodname>
+    </term>
+    <listitem>
+     <para>
+      Send a command to the QEMU monitor. This is rarely used, but allows doing
+      stuff such as attaching virtual USB disks to a running machine.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>sendKeys</methodname>
+    </term>
+    <listitem>
+     <para>
+      Simulate pressing keys on the virtual keyboard, e.g.,
+      <literal>sendKeys("ctrl-alt-delete")</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>sendChars</methodname>
+    </term>
+    <listitem>
+     <para>
+      Simulate typing a sequence of characters on the virtual keyboard, e.g.,
+      <literal>sendKeys("foobar\n")</literal> will type the string
+      <literal>foobar</literal> followed by the Enter key.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>execute</methodname>
+    </term>
+    <listitem>
+     <para>
+      Execute a shell command, returning a list
+      <literal>(<replaceable>status</replaceable>,
+      <replaceable>stdout</replaceable>)</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>succeed</methodname>
+    </term>
+    <listitem>
+     <para>
+      Execute a shell command, raising an exception if the exit status is not
+      zero, otherwise returning the standard output.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>fail</methodname>
+    </term>
+    <listitem>
+     <para>
+      Like <methodname>succeed</methodname>, but raising an exception if the
+      command returns a zero status.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitUntilSucceeds</methodname>
+    </term>
+    <listitem>
+     <para>
+      Repeat a shell command with 1-second intervals until it succeeds.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitUntilFails</methodname>
+    </term>
+    <listitem>
+     <para>
+      Repeat a shell command with 1-second intervals until it fails.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitForUnit</methodname>
+    </term>
+    <listitem>
+     <para>
+      Wait until the specified systemd unit has reached the “active” state.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitForFile</methodname>
+    </term>
+    <listitem>
+     <para>
+      Wait until the specified file exists.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitForOpenPort</methodname>
+    </term>
+    <listitem>
+     <para>
+      Wait until a process is listening on the given TCP port (on
+      <literal>localhost</literal>, at least).
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitForClosedPort</methodname>
+    </term>
+    <listitem>
+     <para>
+      Wait until nobody is listening on the given TCP port.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitForX</methodname>
+    </term>
+    <listitem>
+     <para>
+      Wait until the X11 server is accepting connections.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitForText</methodname>
+    </term>
+    <listitem>
+     <para>
+      Wait until the supplied regular expressions matches the textual contents
+      of the screen by using optical character recognition (see
+      <methodname>getScreenText</methodname>).
+     </para>
+     <note>
+      <para>
+       This requires passing <option>enableOCR</option> to the test attribute
+       set.
+      </para>
+     </note>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>waitForWindow</methodname>
+    </term>
+    <listitem>
+     <para>
+      Wait until an X11 window has appeared whose name matches the given
+      regular expression, e.g., <literal>waitForWindow(qr/Terminal/)</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>copyFileFromHost</methodname>
+    </term>
+    <listitem>
+     <para>
+      Copies a file from host to machine, e.g.,
+      <literal>copyFileFromHost("myfile", "/etc/my/important/file")</literal>.
+     </para>
+     <para>
+      The first argument is the file on the host. The file needs to be
+      accessible while building the nix derivation. The second argument is the
+      location of the file on the machine.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><methodname>systemctl</methodname>
+    </term>
+    <listitem>
+     <para>
+      Runs <literal>systemctl</literal> commands with optional support for
+      <literal>systemctl --user</literal>
+     </para>
+     <para>
+<programlisting>
         $machine->systemctl("list-jobs --no-pager"); // runs `systemctl list-jobs --no-pager`
         $machine->systemctl("list-jobs --no-pager", "any-user"); // spawns a shell for `any-user` and runs `systemctl --user list-jobs --no-pager`
       </programlisting>
-    </para>
+     </para>
     </listitem>
-  </varlistentry>
+   </varlistentry>
+  </variablelist>
+ </para>
 
-</variablelist>
-
-</para>
-
-<para>
-  To test user units declared by <literal>systemd.user.services</literal> the optional <literal>$user</literal>
-  argument can be used:
-
-  <programlisting>
+ <para>
+  To test user units declared by <literal>systemd.user.services</literal> the
+  optional <literal>$user</literal> argument can be used:
+<programlisting>
     $machine->start;
     $machine->waitForX;
     $machine->waitForUnit("xautolock.service", "x-session-user");
   </programlisting>
-
   This applies to <literal>systemctl</literal>, <literal>getUnitInfo</literal>,
-  <literal>waitForUnit</literal>, <literal>startJob</literal>
-  and <literal>stopJob</literal>.
-</para>
-
+  <literal>waitForUnit</literal>, <literal>startJob</literal> and
+  <literal>stopJob</literal>.
+ </para>
 </section>
diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml
index 52d8a292f8be..680160a3cb7e 100644
--- a/nixos/doc/manual/installation/changing-config.xml
+++ b/nixos/doc/manual/installation/changing-config.xml
@@ -2,101 +2,84 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          version="5.0"
          xml:id="sec-changing-config">
-
-<title>Changing the Configuration</title>
-
-<para>The file <filename>/etc/nixos/configuration.nix</filename>
-contains the current configuration of your machine.  Whenever you’ve
-<link linkend="ch-configuration">changed something</link> in that file, you should do
-
+ <title>Changing the Configuration</title>
+ <para>
+  The file <filename>/etc/nixos/configuration.nix</filename> contains the
+  current configuration of your machine. Whenever you’ve
+  <link linkend="ch-configuration">changed something</link> in that file, you
+  should do
 <screen>
 # nixos-rebuild switch</screen>
-
-to build the new configuration, make it the default configuration for
-booting, and try to realise the configuration in the running system
-(e.g., by restarting system services).</para>
-
-<warning><para>These commands must be executed as root, so you should
-either run them from a root shell or by prefixing them with
-<literal>sudo -i</literal>.</para></warning>
-
-<para>You can also do
-
+  to build the new configuration, make it the default configuration for
+  booting, and try to realise the configuration in the running system (e.g., by
+  restarting system services).
+ </para>
+ <warning>
+  <para>
+   These commands must be executed as root, so you should either run them from
+   a root shell or by prefixing them with <literal>sudo -i</literal>.
+  </para>
+ </warning>
+ <para>
+  You can also do
 <screen>
 # nixos-rebuild test</screen>
-
-to build the configuration and switch the running system to it, but
-without making it the boot default.  So if (say) the configuration
-locks up your machine, you can just reboot to get back to a working
-configuration.</para>
-
-<para>There is also
-
+  to build the configuration and switch the running system to it, but without
+  making it the boot default. So if (say) the configuration locks up your
+  machine, you can just reboot to get back to a working configuration.
+ </para>
+ <para>
+  There is also
 <screen>
 # nixos-rebuild boot</screen>
-
-to build the configuration and make it the boot default, but not
-switch to it now (so it will only take effect after the next
-reboot).</para>
-
-<para>You can make your configuration show up in a different submenu
-of the GRUB 2 boot screen by giving it a different <emphasis>profile
-name</emphasis>, e.g.
-
+  to build the configuration and make it the boot default, but not switch to it
+  now (so it will only take effect after the next reboot).
+ </para>
+ <para>
+  You can make your configuration show up in a different submenu of the GRUB 2
+  boot screen by giving it a different <emphasis>profile name</emphasis>, e.g.
 <screen>
 # nixos-rebuild switch -p test </screen>
-
-which causes the new configuration (and previous ones created using
-<literal>-p test</literal>) to show up in the GRUB submenu “NixOS -
-Profile 'test'”.  This can be useful to separate test configurations
-from “stable” configurations.</para>
-
-<para>Finally, you can do
-
+  which causes the new configuration (and previous ones created using
+  <literal>-p test</literal>) to show up in the GRUB submenu “NixOS - Profile
+  'test'”. This can be useful to separate test configurations from
+  “stable” configurations.
+ </para>
+ <para>
+  Finally, you can do
 <screen>
 $ nixos-rebuild build</screen>
-
-to build the configuration but nothing more.  This is useful to see
-whether everything compiles cleanly.</para>
-
-<para>If you have a machine that supports hardware virtualisation, you
-can also test the new configuration in a sandbox by building and
-running a QEMU <emphasis>virtual machine</emphasis> that contains the
-desired configuration.  Just do
-
+  to build the configuration but nothing more. This is useful to see whether
+  everything compiles cleanly.
+ </para>
+ <para>
+  If you have a machine that supports hardware virtualisation, you can also
+  test the new configuration in a sandbox by building and running a QEMU
+  <emphasis>virtual machine</emphasis> that contains the desired configuration.
+  Just do
 <screen>
 $ nixos-rebuild build-vm
 $ ./result/bin/run-*-vm
 </screen>
-
-The VM does not have any data from your host system, so your existing
-user accounts and home directories will not be available unless you
-have set <literal>mutableUsers = false</literal>.  Another way is to
-temporarily add the following to your configuration:
-
+  The VM does not have any data from your host system, so your existing user
+  accounts and home directories will not be available unless you have set
+  <literal>mutableUsers = false</literal>. Another way is to temporarily add
+  the following to your configuration:
 <screen>
 <link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.your-user.initialHashedPassword</link> = "test";
 </screen>
-
-<emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you
-have started the virtual machine at least once without the right
-users, otherwise the changes will not get picked up.
-
-You can forward ports on the host to the guest.  For
-instance, the following will forward host port 2222 to guest port 22
-(SSH):
-
+  <emphasis>Important:</emphasis> delete the $hostname.qcow2 file if you have
+  started the virtual machine at least once without the right users, otherwise
+  the changes will not get picked up. You can forward ports on the host to the
+  guest. For instance, the following will forward host port 2222 to guest port
+  22 (SSH):
 <screen>
 $ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm
 </screen>
-
-allowing you to log in via SSH (assuming you have set the appropriate
-passwords or SSH authorized keys):
-
+  allowing you to log in via SSH (assuming you have set the appropriate
+  passwords or SSH authorized keys):
 <screen>
 $ ssh -p 2222 localhost
 </screen>
-
-</para>
-
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml
index ee61bedc4183..d4276be95d68 100644
--- a/nixos/doc/manual/installation/installation.xml
+++ b/nixos/doc/manual/installation/installation.xml
@@ -3,19 +3,15 @@
       xmlns:xi="http://www.w3.org/2001/XInclude"
       version="5.0"
       xml:id="ch-installation">
-
-<title>Installation</title>
-
-<partintro>
-
-<para>This section describes how to obtain, install, and configure
-NixOS for first-time use.</para>
-
-</partintro>
-
-<xi:include href="obtaining.xml" />
-<xi:include href="installing.xml" />
-<xi:include href="changing-config.xml" />
-<xi:include href="upgrading.xml" />
-
+ <title>Installation</title>
+ <partintro>
+  <para>
+   This section describes how to obtain, install, and configure NixOS for
+   first-time use.
+  </para>
+ </partintro>
+ <xi:include href="obtaining.xml" />
+ <xi:include href="installing.xml" />
+ <xi:include href="changing-config.xml" />
+ <xi:include href="upgrading.xml" />
 </part>
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index e8afb97bcde5..8b0c350b064d 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -5,284 +5,325 @@
     xmlns:xi="http://www.w3.org/2001/XInclude"
     version="5.0"
     xml:id="sec-installing-from-other-distro">
+ <title>Installing from another Linux distribution</title>
 
-    <title>Installing from another Linux distribution</title>
+ <para>
+  Because Nix (the package manager) &amp; Nixpkgs (the Nix packages collection)
+  can both be installed on any (most?) Linux distributions, they can be used to
+  install NixOS in various creative ways. You can, for instance:
+ </para>
 
-    <para>
-        Because Nix (the package manager) &amp; Nixpkgs (the Nix packages
-        collection) can both be installed on any (most?) Linux distributions,
-        they can be used to install NixOS in various creative ways. You can,
-        for instance:
-    </para>
+ <orderedlist>
+  <listitem>
+   <para>
+    Install NixOS on another partition, from your existing Linux distribution
+    (without the use of a USB or optical device!)
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Install NixOS on the same partition (in place!), from your existing
+    non-NixOS Linux distribution using <literal>NIXOS_LUSTRATE</literal>.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Install NixOS on your hard drive from the Live CD of any Linux
+    distribution.
+   </para>
+  </listitem>
+ </orderedlist>
 
-    <orderedlist>
-        <listitem><para>Install NixOS on another partition, from your existing
-                Linux distribution (without the use of a USB or optical
-                device!)</para></listitem>
+ <para>
+  The first steps to all these are the same:
+ </para>
 
-        <listitem><para>Install NixOS on the same partition (in place!), from
-                your existing non-NixOS Linux distribution using
-                <literal>NIXOS_LUSTRATE</literal>.</para></listitem>
-
-        <listitem><para>Install NixOS on your hard drive from the Live CD of
-                any Linux distribution.</para></listitem>
-    </orderedlist>
-
-    <para>The first steps to all these are the same:</para>
-
-    <orderedlist>
-        <listitem>
-            <para>Install the Nix package manager:</para>
-
-            <para>Short version:</para>
-
-            <screen>
+ <orderedlist>
+  <listitem>
+   <para>
+    Install the Nix package manager:
+   </para>
+   <para>
+    Short version:
+   </para>
+<screen>
 $ bash &lt;(curl https://nixos.org/nix/install)
 $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen>
-
-            <para>More details in the <link
+   <para>
+    More details in the
+    <link
                     xlink:href="https://nixos.org/nix/manual/#chap-quick-start">
-                    Nix manual</link></para>
-        </listitem>
-
-        <listitem>
-            <para>Switch to the NixOS channel:</para>
-
-            <para>If you've just installed Nix on a non-NixOS distribution, you
-                will be on the <literal>nixpkgs</literal> channel by
-                default.</para>
-
-            <screen>
+    Nix manual</link>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Switch to the NixOS channel:
+   </para>
+   <para>
+    If you've just installed Nix on a non-NixOS distribution, you will be on
+    the <literal>nixpkgs</literal> channel by default.
+   </para>
+<screen>
 $ nix-channel --list
 nixpkgs https://nixos.org/channels/nixpkgs-unstable</screen>
-
-            <para>As that channel gets released without running the NixOS
-                tests, it will be safer to use the <literal>nixos-*</literal>
-                channels instead:</para>
-
-            <screen>
+   <para>
+    As that channel gets released without running the NixOS tests, it will be
+    safer to use the <literal>nixos-*</literal> channels instead:
+   </para>
+<screen>
 $ nix-channel --add https://nixos.org/channels/nixos-<replaceable>version</replaceable> nixpkgs</screen>
-
-            <para>You may want to throw in a <literal>nix-channel
-                    --update</literal> for good measure.</para>
-        </listitem>
-
-        <listitem>
-            <para>Install the NixOS installation tools:</para>
-
-            <para>You'll need <literal>nixos-generate-config</literal> and
-                <literal>nixos-install</literal> and we'll throw in some man
-                pages and <literal>nixos-enter</literal> just in case you want
-                to chroot into your NixOS partition. They are installed by
-                default on NixOS, but you don't have NixOS yet..</para>
-
-            <screen>$ nix-env -iE "_: with import &lt;nixpkgs/nixos&gt; { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"</screen>
-        </listitem>
-
-        <listitem>
-            <note><para>The following 5 steps are only for installing NixOS to
-                    another partition. For installing NixOS in place using
-                    <literal>NIXOS_LUSTRATE</literal>, skip ahead.</para></note>
-
-            <para>Prepare your target partition:</para>
-
-            <para>At this point it is time to prepare your target partition.
-                Please refer to the partitioning, file-system creation, and
-                mounting steps of <xref linkend="sec-installation" /></para>
-
-            <para>If you're about to install NixOS in place using
-                <literal>NIXOS_LUSTRATE</literal> there is nothing to do for
-                this step.</para>
-        </listitem>
-
-        <listitem>
-            <para>Generate your NixOS configuration:</para>
-
-            <screen>$ sudo `which nixos-generate-config` --root /mnt</screen>
-
-            <para>You'll probably want to edit the configuration files. Refer
-                to the <literal>nixos-generate-config</literal> step in <xref
-                    linkend="sec-installation" /> for more information.</para>
-
-            <para>Consider setting up the NixOS bootloader to give you the
-                ability to boot on your existing Linux partition. For instance,
-                if you're using GRUB and your existing distribution is running
-                Ubuntu, you may want to add something like this to your
-                <literal>configuration.nix</literal>:</para>
-
-            <programlisting>
+   <para>
+    You may want to throw in a <literal>nix-channel --update</literal> for good
+    measure.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Install the NixOS installation tools:
+   </para>
+   <para>
+    You'll need <literal>nixos-generate-config</literal> and
+    <literal>nixos-install</literal> and we'll throw in some man pages and
+    <literal>nixos-enter</literal> just in case you want to chroot into your
+    NixOS partition. They are installed by default on NixOS, but you don't have
+    NixOS yet..
+   </para>
+<screen>$ nix-env -iE "_: with import &lt;nixpkgs/nixos&gt; { configuration = {}; }; with config.system.build; [ nixos-generate-config nixos-install nixos-enter manual.manpages ]"</screen>
+  </listitem>
+  <listitem>
+   <note>
+    <para>
+     The following 5 steps are only for installing NixOS to another partition.
+     For installing NixOS in place using <literal>NIXOS_LUSTRATE</literal>,
+     skip ahead.
+    </para>
+   </note>
+   <para>
+    Prepare your target partition:
+   </para>
+   <para>
+    At this point it is time to prepare your target partition. Please refer to
+    the partitioning, file-system creation, and mounting steps of
+    <xref linkend="sec-installation" />
+   </para>
+   <para>
+    If you're about to install NixOS in place using
+    <literal>NIXOS_LUSTRATE</literal> there is nothing to do for this step.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Generate your NixOS configuration:
+   </para>
+<screen>$ sudo `which nixos-generate-config` --root /mnt</screen>
+   <para>
+    You'll probably want to edit the configuration files. Refer to the
+    <literal>nixos-generate-config</literal> step in
+    <xref
+                    linkend="sec-installation" /> for more
+    information.
+   </para>
+   <para>
+    Consider setting up the NixOS bootloader to give you the ability to boot on
+    your existing Linux partition. For instance, if you're using GRUB and your
+    existing distribution is running Ubuntu, you may want to add something like
+    this to your <literal>configuration.nix</literal>:
+   </para>
+<programlisting>
 <xref linkend="opt-boot.loader.grub.extraEntries"/> = ''
   menuentry "Ubuntu" {
     search --set=ubuntu --fs-uuid 3cc3e652-0c1f-4800-8451-033754f68e6e
     configfile "($ubuntu)/boot/grub/grub.cfg"
   }
 '';</programlisting>
-
-            <para>(You can find the appropriate UUID for your partition in
-                <literal>/dev/disk/by-uuid</literal>)</para>
-        </listitem>
-
-        <listitem>
-            <para>Create the <literal>nixbld</literal> group and user on your
-                original distribution:</para>
-
-            <screen>
+   <para>
+    (You can find the appropriate UUID for your partition in
+    <literal>/dev/disk/by-uuid</literal>)
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Create the <literal>nixbld</literal> group and user on your original
+    distribution:
+   </para>
+<screen>
 $ sudo groupadd -g 30000 nixbld
 $ sudo useradd -u 30000 -g nixbld -G nixbld nixbld</screen>
-        </listitem>
-
-        <listitem>
-            <para>Download/build/install NixOS:</para>
-
-            <warning><para>Once you complete this step, you might no longer be
-                    able to boot on existing systems without the help of a
-                    rescue USB drive or similar.</para></warning>
-
-            <screen>$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt</screen>
-
-            <para>Again, please refer to the <literal>nixos-install</literal>
-                step in <xref linkend="sec-installation" /> for more
-                information.</para>
-
-            <para>That should be it for installation to another partition!</para>
-        </listitem>
-
-        <listitem>
-            <para>Optionally, you may want to clean up your non-NixOS distribution:</para>
-
-            <screen>
+  </listitem>
+  <listitem>
+   <para>
+    Download/build/install NixOS:
+   </para>
+   <warning>
+    <para>
+     Once you complete this step, you might no longer be able to boot on
+     existing systems without the help of a rescue USB drive or similar.
+    </para>
+   </warning>
+<screen>$ sudo PATH="$PATH" NIX_PATH="$NIX_PATH" `which nixos-install` --root /mnt</screen>
+   <para>
+    Again, please refer to the <literal>nixos-install</literal> step in
+    <xref linkend="sec-installation" /> for more information.
+   </para>
+   <para>
+    That should be it for installation to another partition!
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Optionally, you may want to clean up your non-NixOS distribution:
+   </para>
+<screen>
 $ sudo userdel nixbld
 $ sudo groupdel nixbld</screen>
-
-            <para>If you do not wish to keep the Nix package manager
-                installed either, run something like <literal>sudo rm -rv
-                    ~/.nix-* /nix</literal> and remove the line that the Nix
-                installer added to your <literal>~/.profile</literal>.</para>
-        </listitem>
-
-        <listitem>
-            <note><para>The following steps are only for installing NixOS in
-                    place using
-                    <literal>NIXOS_LUSTRATE</literal>:</para></note>
-
-            <para>Generate your NixOS configuration:</para>
-
-            <screen>$ sudo `which nixos-generate-config` --root /</screen>
-
-            <para>Note that this will place the generated configuration files
-                in <literal>/etc/nixos</literal>. You'll probably want to edit
-                the configuration files. Refer to the
-                <literal>nixos-generate-config</literal> step in <xref
-                    linkend="sec-installation" /> for more information.</para>
-
-            <para>You'll likely want to set a root password for your first boot
-                using the configuration files because you won't have a chance
-                to enter a password until after you reboot. You can initalize
-                the root password to an empty one with this line: (and of course
-                don't forget to set one once you've rebooted or to lock the
-                account with <literal>sudo passwd -l root</literal> if you use
-                <literal>sudo</literal>)</para>
-
-              <programlisting>
+   <para>
+    If you do not wish to keep the Nix package manager installed either, run
+    something like <literal>sudo rm -rv ~/.nix-* /nix</literal> and remove the
+    line that the Nix installer added to your <literal>~/.profile</literal>.
+   </para>
+  </listitem>
+  <listitem>
+   <note>
+    <para>
+     The following steps are only for installing NixOS in place using
+     <literal>NIXOS_LUSTRATE</literal>:
+    </para>
+   </note>
+   <para>
+    Generate your NixOS configuration:
+   </para>
+<screen>$ sudo `which nixos-generate-config` --root /</screen>
+   <para>
+    Note that this will place the generated configuration files in
+    <literal>/etc/nixos</literal>. You'll probably want to edit the
+    configuration files. Refer to the <literal>nixos-generate-config</literal>
+    step in <xref
+                    linkend="sec-installation" /> for more
+    information.
+   </para>
+   <para>
+    You'll likely want to set a root password for your first boot using the
+    configuration files because you won't have a chance to enter a password
+    until after you reboot. You can initalize the root password to an empty one
+    with this line: (and of course don't forget to set one once you've rebooted
+    or to lock the account with <literal>sudo passwd -l root</literal> if you
+    use <literal>sudo</literal>)
+   </para>
+<programlisting>
 <link linkend="opt-users.users._name__.initialHashedPassword">users.extraUsers.root.initialHashedPassword</link> = "";
               </programlisting>
-        </listitem>
-
-        <listitem>
-            <para>Build the NixOS closure and install it in the
-                <literal>system</literal> profile:</para>
-
-            <screen>$ nix-env -p /nix/var/nix/profiles/system -f '&lt;nixpkgs/nixos&gt;' -I nixos-config=/etc/nixos/configuration.nix -iA system</screen>
-        </listitem>
-
-        <listitem>
-            <para>Change ownership of the <literal>/nix</literal> tree to root
-                (since your Nix install was probably single user):</para>
-
-            <screen>$ sudo chown -R 0.0 /nix</screen>
-        </listitem>
-
-        <listitem>
-            <para>Set up the <literal>/etc/NIXOS</literal> and
-                <literal>/etc/NIXOS_LUSTRATE</literal> files:</para>
-
-            <para><literal>/etc/NIXOS</literal> officializes that this is now a
-                NixOS partition (the bootup scripts require its presence).</para>
-
-            <para><literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup
-                scripts to move <emphasis>everything</emphasis> that's in the
-                root partition to <literal>/old-root</literal>. This will move
-                your existing distribution out of the way in the very early
-                stages of the NixOS bootup. There are exceptions (we do need to
-                keep NixOS there after all), so the NixOS lustrate process will
-                not touch:</para>
-
-            <itemizedlist>
-                <listitem><para>The <literal>/nix</literal>
-                        directory</para></listitem>
-
-                <listitem><para>The <literal>/boot</literal>
-                        directory</para></listitem>
-
-                <listitem><para>Any file or directory listed in
-                        <literal>/etc/NIXOS_LUSTRATE</literal> (one per
-                        line)</para></listitem>
-            </itemizedlist>
-
-            <note><para>Support for <literal>NIXOS_LUSTRATE</literal> was added
-                    in NixOS 16.09. The act of "lustrating" refers to the
-                    wiping of the existing distribution. Creating
-                    <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on
-                    NixOS to remove all mutable files from your root partition
-                    (anything that's not in <literal>/nix</literal> or
-                    <literal>/boot</literal> gets "lustrated" on the next
-                    boot.</para>
-                <para>lustrate /ˈlʌstreɪt/ verb.</para>
-                <para>purify by expiatory sacrifice, ceremonial washing, or
-                    some other ritual action.</para></note>
-
-            <para>Let's create the files:</para>
-
-            <screen>
+  </listitem>
+  <listitem>
+   <para>
+    Build the NixOS closure and install it in the <literal>system</literal>
+    profile:
+   </para>
+<screen>$ nix-env -p /nix/var/nix/profiles/system -f '&lt;nixpkgs/nixos&gt;' -I nixos-config=/etc/nixos/configuration.nix -iA system</screen>
+  </listitem>
+  <listitem>
+   <para>
+    Change ownership of the <literal>/nix</literal> tree to root (since your
+    Nix install was probably single user):
+   </para>
+<screen>$ sudo chown -R 0.0 /nix</screen>
+  </listitem>
+  <listitem>
+   <para>
+    Set up the <literal>/etc/NIXOS</literal> and
+    <literal>/etc/NIXOS_LUSTRATE</literal> files:
+   </para>
+   <para>
+    <literal>/etc/NIXOS</literal> officializes that this is now a NixOS
+    partition (the bootup scripts require its presence).
+   </para>
+   <para>
+    <literal>/etc/NIXOS_LUSTRATE</literal> tells the NixOS bootup scripts to
+    move <emphasis>everything</emphasis> that's in the root partition to
+    <literal>/old-root</literal>. This will move your existing distribution out
+    of the way in the very early stages of the NixOS bootup. There are
+    exceptions (we do need to keep NixOS there after all), so the NixOS
+    lustrate process will not touch:
+   </para>
+   <itemizedlist>
+    <listitem>
+     <para>
+      The <literal>/nix</literal> directory
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      The <literal>/boot</literal> directory
+     </para>
+    </listitem>
+    <listitem>
+     <para>
+      Any file or directory listed in <literal>/etc/NIXOS_LUSTRATE</literal>
+      (one per line)
+     </para>
+    </listitem>
+   </itemizedlist>
+   <note>
+    <para>
+     Support for <literal>NIXOS_LUSTRATE</literal> was added in NixOS 16.09.
+     The act of "lustrating" refers to the wiping of the existing distribution.
+     Creating <literal>/etc/NIXOS_LUSTRATE</literal> can also be used on NixOS
+     to remove all mutable files from your root partition (anything that's not
+     in <literal>/nix</literal> or <literal>/boot</literal> gets "lustrated" on
+     the next boot.
+    </para>
+    <para>
+     lustrate /ˈlʌstreɪt/ verb.
+    </para>
+    <para>
+     purify by expiatory sacrifice, ceremonial washing, or some other ritual
+     action.
+    </para>
+   </note>
+   <para>
+    Let's create the files:
+   </para>
+<screen>
 $ sudo touch /etc/NIXOS
 $ sudo touch /etc/NIXOS_LUSTRATE
             </screen>
-
-            <para>Let's also make sure the NixOS configuration files are kept
-                once we reboot on NixOS:</para>
-
-            <screen>
+   <para>
+    Let's also make sure the NixOS configuration files are kept once we reboot
+    on NixOS:
+   </para>
+<screen>
 $ echo etc/nixos | sudo tee -a /etc/NIXOS_LUSTRATE
             </screen>
-        </listitem>
-
-        <listitem>
-            <para>Finally, move the <literal>/boot</literal> directory of your
-                current distribution out of the way (the lustrate process will
-                take care of the rest once you reboot, but this one must be
-                moved out now because NixOS needs to install its own boot
-                files:</para>
-
-            <warning><para>Once you complete this step, your current
-                    distribution will no longer be bootable! If you didn't get
-                    all the NixOS configuration right, especially those
-                    settings pertaining to boot loading and root partition,
-                    NixOS may not be bootable either. Have a USB rescue device
-                    ready in case this happens. </para></warning>
-
-            <screen>
+  </listitem>
+  <listitem>
+   <para>
+    Finally, move the <literal>/boot</literal> directory of your current
+    distribution out of the way (the lustrate process will take care of the
+    rest once you reboot, but this one must be moved out now because NixOS
+    needs to install its own boot files:
+   </para>
+   <warning>
+    <para>
+     Once you complete this step, your current distribution will no longer be
+     bootable! If you didn't get all the NixOS configuration right, especially
+     those settings pertaining to boot loading and root partition, NixOS may
+     not be bootable either. Have a USB rescue device ready in case this
+     happens.
+    </para>
+   </warning>
+<screen>
 $ sudo mv -v /boot /boot.bak &amp;&amp;
     sudo /nix/var/nix/profiles/system/bin/switch-to-configuration boot</screen>
-
-            <para>Cross your fingers, reboot, hopefully you should get a NixOS
-                prompt!</para>
-        </listitem>
-        <listitem>
-            <para>If for some reason you want to revert to the old
-                distribution, you'll need to boot on a USB rescue disk and do
-                something along these lines:</para>
-
-            <screen>
+   <para>
+    Cross your fingers, reboot, hopefully you should get a NixOS prompt!
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    If for some reason you want to revert to the old distribution, you'll need
+    to boot on a USB rescue disk and do something along these lines:
+   </para>
+<screen>
 # mkdir root
 # mount /dev/sdaX root
 # mkdir root/nixos-root
@@ -291,23 +332,25 @@ $ sudo mv -v /boot /boot.bak &amp;&amp;
 # mv -v root/boot.bak root/boot  # We had renamed this by hand earlier
 # umount root
 # reboot</screen>
-
-            <para>This may work as is or you might also need to reinstall the
-                boot loader</para>
-
-            <para>And of course, if you're happy with NixOS and no longer need
-                the old distribution:</para>
-
-            <screen>sudo rm -rf /old-root</screen>
-        </listitem>
-
-        <listitem>
-            <para>It's also worth noting that this whole process can be
-                automated. This is especially useful for Cloud VMs, where
-                provider do not provide NixOS. For instance, <link
+   <para>
+    This may work as is or you might also need to reinstall the boot loader
+   </para>
+   <para>
+    And of course, if you're happy with NixOS and no longer need the old
+    distribution:
+   </para>
+<screen>sudo rm -rf /old-root</screen>
+  </listitem>
+  <listitem>
+   <para>
+    It's also worth noting that this whole process can be automated. This is
+    especially useful for Cloud VMs, where provider do not provide NixOS. For
+    instance,
+    <link
                     xlink:href="https://github.com/elitak/nixos-infect">nixos-infect</link>
-                uses the lustrate process to convert Digital Ocean droplets to
-                NixOS from other distributions automatically.</para>
-        </listitem>
-    </orderedlist>
+    uses the lustrate process to convert Digital Ocean droplets to NixOS from
+    other distributions automatically.
+   </para>
+  </listitem>
+ </orderedlist>
 </section>
diff --git a/nixos/doc/manual/installation/installing-pxe.xml b/nixos/doc/manual/installation/installing-pxe.xml
index 7b7597c91626..94199e5e028d 100644
--- a/nixos/doc/manual/installation/installing-pxe.xml
+++ b/nixos/doc/manual/installation/installing-pxe.xml
@@ -3,46 +3,48 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-booting-from-pxe">
+ <title>Booting from the <quote>netboot</quote> media (PXE)</title>
 
-<title>Booting from the <quote>netboot</quote> media (PXE)</title>
-<para>
-  Advanced users may wish to install NixOS using an existing PXE or
-  iPXE setup.
-</para>
-<para>
+ <para>
+  Advanced users may wish to install NixOS using an existing PXE or iPXE setup.
+ </para>
+
+ <para>
   These instructions assume that you have an existing PXE or iPXE
-  infrastructure and simply want to add the NixOS installer as another
-  option. To build the necessary files from a recent version of
-  nixpkgs, you can run:
-</para>
+  infrastructure and simply want to add the NixOS installer as another option.
+  To build the necessary files from a recent version of nixpkgs, you can run:
+ </para>
+
 <programlisting>
 nix-build -A netboot nixos/release.nix
 </programlisting>
-<para>
-  This will create a <literal>result</literal> directory containing: *
-  <literal>bzImage</literal> – the Linux kernel *
-  <literal>initrd</literal> – the initrd file *
-  <literal>netboot.ipxe</literal> – an example ipxe script
-  demonstrating the appropriate kernel command line arguments for this
-  image
-</para>
-<para>
-  If you’re using plain PXE, configure your boot loader to use the
-  <literal>bzImage</literal> and <literal>initrd</literal> files and
-  have it provide the same kernel command line arguments found in
-  <literal>netboot.ipxe</literal>.
-</para>
-<para>
-  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is
-  configured you may be able to use <literal>netboot.ipxe</literal>
-  unmodified, or you may need to update the paths to the files to
-  match your server’s directory layout
-</para>
-<para>
-  In the future we may begin making these files available as build
-  products from hydra at which point we will update this documentation
-  with instructions on how to obtain them either for placing on a
-  dedicated TFTP server or to boot them directly over the internet.
-</para>
 
+ <para>
+  This will create a <literal>result</literal> directory containing: *
+  <literal>bzImage</literal> – the Linux kernel * <literal>initrd</literal>
+  – the initrd file * <literal>netboot.ipxe</literal> – an example ipxe
+  script demonstrating the appropriate kernel command line arguments for this
+  image
+ </para>
+
+ <para>
+  If you’re using plain PXE, configure your boot loader to use the
+  <literal>bzImage</literal> and <literal>initrd</literal> files and have it
+  provide the same kernel command line arguments found in
+  <literal>netboot.ipxe</literal>.
+ </para>
+
+ <para>
+  If you’re using iPXE, depending on how your HTTP/FTP/etc. server is
+  configured you may be able to use <literal>netboot.ipxe</literal> unmodified,
+  or you may need to update the paths to the files to match your server’s
+  directory layout
+ </para>
+
+ <para>
+  In the future we may begin making these files available as build products
+  from hydra at which point we will update this documentation with instructions
+  on how to obtain them either for placing on a dedicated TFTP server or to
+  boot them directly over the internet.
+ </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index d68cd6162632..c5934111749c 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -3,17 +3,19 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-booting-from-usb">
+ <title>Booting from a USB Drive</title>
 
-<title>Booting from a USB Drive</title>
+ <para>
+  For systems without CD drive, the NixOS live CD can be booted from a USB
+  stick. You can use the <command>dd</command> utility to write the image:
+  <command>dd if=<replaceable>path-to-image</replaceable>
+  of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying
+  the correct drive; you can use the <command>lsblk</command> command to get a
+  list of block devices.
+ </para>
 
-<para>For systems without CD drive, the NixOS live CD can be booted from
-a USB stick. You can use the <command>dd</command> utility to write the image:
-<command>dd if=<replaceable>path-to-image</replaceable>
-of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the
-correct drive; you can use the <command>lsblk</command> command to get a list of
-block devices.</para>
-
-<para>On macOS:
+ <para>
+  On macOS:
 <programlisting>
 $ diskutil list
 [..]
@@ -24,36 +26,43 @@ $ diskutil unmountDisk diskN
 Unmount of all volumes on diskN was successful
 $ sudo dd bs=1m if=nix.iso of=/dev/rdiskN
 </programlisting>
-Using the 'raw' <command>rdiskN</command> device instead of <command>diskN</command>
-completes in minutes instead of hours. After <command>dd</command> completes, a GUI
-dialog "The disk you inserted was not readable by this computer" will pop up, which
-can be ignored.</para>
-         
-<para>The <command>dd</command> utility will write the image verbatim to the drive,
-making it the recommended option for both UEFI and non-UEFI installations. For
-non-UEFI installations, you can alternatively use
-<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If you
-cannot use <command>dd</command> for a UEFI installation, you can also mount the
-ISO, copy its contents verbatim to your drive, then either:
-
-<itemizedlist>
-  <listitem>
-    <para>Change the label of the disk partition to the label of the ISO
-    (visible with the blkid command), or</para>
-  </listitem>
-  <listitem>
-    <para>Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
-    and change the <literal>root=</literal> field in the <literal>options</literal>
-    line to point to your drive (see the documentation on <literal>root=</literal>
-    in <link xlink:href="https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt">
-    the kernel documentation</link> for more details).</para>
-  </listitem>
-  <listitem>
-    <para>If you want to load the contents of the ISO to ram after bootin
-    (So you can remove the stick after bootup) you can append the parameter
-    <literal>copytoram</literal> to the <literal>options</literal> field.</para>
-  </listitem>
-</itemizedlist>
-</para>
+  Using the 'raw' <command>rdiskN</command> device instead of
+  <command>diskN</command> completes in minutes instead of hours. After
+  <command>dd</command> completes, a GUI dialog "The disk you inserted was not
+  readable by this computer" will pop up, which can be ignored.
+ </para>
 
+ <para>
+  The <command>dd</command> utility will write the image verbatim to the drive,
+  making it the recommended option for both UEFI and non-UEFI installations.
+  For non-UEFI installations, you can alternatively use
+  <link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If
+  you cannot use <command>dd</command> for a UEFI installation, you can also
+  mount the ISO, copy its contents verbatim to your drive, then either:
+  <itemizedlist>
+   <listitem>
+    <para>
+     Change the label of the disk partition to the label of the ISO (visible
+     with the blkid command), or
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Edit <filename>loader/entries/nixos-livecd.conf</filename> on the drive
+     and change the <literal>root=</literal> field in the
+     <literal>options</literal> line to point to your drive (see the
+     documentation on <literal>root=</literal> in
+     <link xlink:href="https://www.kernel.org/doc/Documentation/admin-guide/kernel-parameters.txt">
+     the kernel documentation</link> for more details).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     If you want to load the contents of the ISO to ram after bootin (So you
+     can remove the stick after bootup) you can append the parameter
+     <literal>copytoram</literal> to the <literal>options</literal> field.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing-virtualbox-guest.xml b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
index 2b31b7ed3152..da78b480f5aa 100644
--- a/nixos/doc/manual/installation/installing-virtualbox-guest.xml
+++ b/nixos/doc/manual/installation/installing-virtualbox-guest.xml
@@ -3,63 +3,82 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-instaling-virtualbox-guest">
+ <title>Installing in a VirtualBox guest</title>
 
-<title>Installing in a VirtualBox guest</title>
-<para>
+ <para>
   Installing NixOS into a VirtualBox guest is convenient for users who want to
   try NixOS without installing it on bare metal. If you want to use a pre-made
-  VirtualBox appliance, it is available at <link
-  xlink:href="https://nixos.org/nixos/download.html">the downloads page</link>.
-  If you want to set up a VirtualBox guest manually, follow these instructions:
-</para>
+  VirtualBox appliance, it is available at
+  <link
+  xlink:href="https://nixos.org/nixos/download.html">the downloads
+  page</link>. If you want to set up a VirtualBox guest manually, follow these
+  instructions:
+ </para>
 
-<orderedlist>
+ <orderedlist>
+  <listitem>
+   <para>
+    Add a New Machine in VirtualBox with OS Type "Linux / Other Linux"
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Base Memory Size: 768 MB or higher.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    New Hard Disk of 8 GB or higher.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Mount the CD-ROM with the NixOS ISO (by clicking on CD/DVD-ROM)
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Click on Settings / System / Processor and enable PAE/NX
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Click on Settings / System / Acceleration and enable "VT-x/AMD-V"
+    acceleration
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Save the settings, start the virtual machine, and continue installation
+    like normal
+   </para>
+  </listitem>
+ </orderedlist>
 
-  <listitem><para>Add a New Machine in VirtualBox with OS Type "Linux / Other
-  Linux"</para></listitem>
-
-  <listitem><para>Base Memory Size: 768 MB or higher.</para></listitem>
-
-  <listitem><para>New Hard Disk of 8 GB or higher.</para></listitem>
-
-  <listitem><para>Mount the CD-ROM with the NixOS ISO (by clicking on
-  CD/DVD-ROM)</para></listitem>
-
-  <listitem><para>Click on Settings / System / Processor and enable
-  PAE/NX</para></listitem>
-
-  <listitem><para>Click on Settings / System / Acceleration and enable
-  "VT-x/AMD-V" acceleration</para></listitem>
-
-  <listitem><para>Save the settings, start the virtual machine, and continue
-  installation like normal</para></listitem>
-
-</orderedlist>
-
-<para>
-  There are a few modifications you should make in configuration.nix.
-  Enable booting:
-</para>
+ <para>
+  There are a few modifications you should make in configuration.nix. Enable
+  booting:
+ </para>
 
 <programlisting>
 <xref linkend="opt-boot.loader.grub.device"/> = "/dev/sda";
 </programlisting>
 
-<para>
+ <para>
   Also remove the fsck that runs at startup. It will always fail to run,
   stopping your boot until you press <literal>*</literal>.
-</para>
+ </para>
 
 <programlisting>
 <xref linkend="opt-boot.initrd.checkJournalingFS"/> = false;
 </programlisting>
 
-<para>
+ <para>
   Shared folders can be given a name and a path in the host system in the
   VirtualBox settings (Machine / Settings / Shared Folders, then click on the
   "Add" icon). Add the following to the
   <literal>/etc/nixos/configuration.nix</literal> to auto-mount them:
-</para>
+ </para>
 
 <programlisting>
 { config, pkgs, ...} :
@@ -74,8 +93,7 @@
 }
 </programlisting>
 
-<para>
+ <para>
   The folder will be available directly under the root directory.
-</para>
-
+ </para>
 </section>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 6b08bdb318bc..4e1fde662d6e 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -3,66 +3,92 @@
             xmlns:xi="http://www.w3.org/2001/XInclude"
             version="5.0"
             xml:id="sec-installation">
-
-<title>Installing NixOS</title>
-
-<para>NixOS can be installed on BIOS or UEFI systems.  The procedure
-for a UEFI installation is by and large the same as a BIOS installation. The differences are mentioned in the steps that follow.</para>
-
-<orderedlist>
-
-  <listitem><para>Boot from the CD.</para>
-    <variablelist>
-      <varlistentry><term>UEFI systems</term>
-      <listitem><para>You should boot the live CD in UEFI mode
-  (consult your specific hardware's documentation for instructions).
-  You may find the <link xlink:href="http://www.rodsbooks.com/refind">rEFInd boot
-  manager</link> useful.</para></listitem></varlistentry></variablelist></listitem>
-
-  <listitem><para>The CD contains a basic NixOS installation.  (It
-  also contains Memtest86+, useful if you want to test new hardware).
-  When it’s finished booting, it should have detected most of your
-  hardware.</para></listitem>
-
-  <listitem><para>The NixOS manual is available on virtual console 8
-  (press Alt+F8 to access) or by running <command>nixos-help</command>.
-  </para></listitem>
-
-  <listitem><para>You get logged in as <literal>root</literal>
-  (with empty password).</para></listitem>
-
-  <listitem><para>If you downloaded the graphical ISO image, you can
-  run <command>systemctl start display-manager</command> to start KDE. If you
-  want to continue on the terminal, you can use
-  <command>loadkeys</command> to switch to your preferred keyboard layout.
-  (We even provide neo2 via <command>loadkeys de neo</command>!)</para></listitem>
-
-  <listitem><para>The boot process should have brought up networking (check
-  <command>ip a</command>).  Networking is necessary for the
-  installer, since it will download lots of stuff (such as source
-  tarballs or Nixpkgs channel binaries).  It’s best if you have a DHCP
-  server on your network. Otherwise configure networking manually
-  using <command>ifconfig</command>.</para>
-  <para>To manually configure the network on the graphical installer,
-  first disable network-manager with
-  <command>systemctl stop network-manager</command>.</para>
-  <para>To manually configure the wifi on the minimal installer, run
-  <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID' 'key')</command>.</para></listitem>
-
-
-  <listitem><para>If you would like to continue the installation from a different
-  machine you need to activate the SSH daemon via <literal>systemctl start sshd</literal>.
-  In order to be able to login you also need to set a password for
-  <literal>root</literal> using <literal>passwd</literal>.</para></listitem>
-
-  <listitem><para>The NixOS installer doesn’t do any partitioning or
-  formatting yet, so you need to do that yourself.  Use the following
-  commands:
-
-  <itemizedlist>
-
-    <listitem><para>For partitioning:
-    <command>fdisk</command>.
+ <title>Installing NixOS</title>
+ <para>
+  NixOS can be installed on BIOS or UEFI systems. The procedure for a UEFI
+  installation is by and large the same as a BIOS installation. The differences
+  are mentioned in the steps that follow.
+ </para>
+ <orderedlist>
+  <listitem>
+   <para>
+    Boot from the CD.
+   </para>
+   <variablelist>
+    <varlistentry>
+     <term>UEFI systems</term>
+     <listitem>
+      <para>
+       You should boot the live CD in UEFI mode (consult your specific
+       hardware's documentation for instructions). You may find the
+       <link xlink:href="http://www.rodsbooks.com/refind">rEFInd boot
+       manager</link> useful.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </listitem>
+  <listitem>
+   <para>
+    The CD contains a basic NixOS installation. (It also contains Memtest86+,
+    useful if you want to test new hardware). When it’s finished booting, it
+    should have detected most of your hardware.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    The NixOS manual is available on virtual console 8 (press Alt+F8 to access)
+    or by running <command>nixos-help</command>.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    You get logged in as <literal>root</literal> (with empty password).
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    If you downloaded the graphical ISO image, you can run <command>systemctl
+    start display-manager</command> to start KDE. If you want to continue on
+    the terminal, you can use <command>loadkeys</command> to switch to your
+    preferred keyboard layout. (We even provide neo2 via <command>loadkeys de
+    neo</command>!)
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    The boot process should have brought up networking (check <command>ip
+    a</command>). Networking is necessary for the installer, since it will
+    download lots of stuff (such as source tarballs or Nixpkgs channel
+    binaries). It’s best if you have a DHCP server on your network. Otherwise
+    configure networking manually using <command>ifconfig</command>.
+   </para>
+   <para>
+    To manually configure the network on the graphical installer, first disable
+    network-manager with <command>systemctl stop network-manager</command>.
+   </para>
+   <para>
+    To manually configure the wifi on the minimal installer, run
+    <command>wpa_supplicant -B -i interface -c &lt;(wpa_passphrase 'SSID'
+    'key')</command>.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    If you would like to continue the installation from a different machine you
+    need to activate the SSH daemon via <literal>systemctl start
+    sshd</literal>. In order to be able to login you also need to set a
+    password for <literal>root</literal> using <literal>passwd</literal>.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    The NixOS installer doesn’t do any partitioning or formatting yet, so you
+    need to do that yourself. Use the following commands:
+    <itemizedlist>
+     <listitem>
+      <para>
+       For partitioning: <command>fdisk</command>.
 <screen>
 # fdisk /dev/sda # <lineannotation>(or whatever device you want to install on)</lineannotation>
 -- for UEFI systems only
@@ -86,257 +112,266 @@ for a UEFI installation is by and large the same as a BIOS installation. The dif
 > x      # <lineannotation>(enter expert mode)</lineannotation>
 > f      # <lineannotation>(fix up the partition ordering)</lineannotation>
 > r      # <lineannotation>(exit expert mode)</lineannotation>
-> w      # <lineannotation>(write the partition table to disk and exit)</lineannotation></screen></para></listitem>
-
-    <listitem><para>For initialising Ext4 partitions:
-    <command>mkfs.ext4</command>.  It is recommended that you assign a
-    unique symbolic label to the file system using the option
-    <option>-L <replaceable>label</replaceable></option>, since this
-    makes the file system configuration independent from device
-    changes.  For example:
-
+> w      # <lineannotation>(write the partition table to disk and exit)</lineannotation></screen>
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       For initialising Ext4 partitions: <command>mkfs.ext4</command>. It is
+       recommended that you assign a unique symbolic label to the file system
+       using the option <option>-L <replaceable>label</replaceable></option>,
+       since this makes the file system configuration independent from device
+       changes. For example:
 <screen>
 # mkfs.ext4 -L nixos /dev/sda1</screen>
-
-    </para></listitem>
-
-    <listitem><para>For creating swap partitions:
-    <command>mkswap</command>.  Again it’s recommended to assign a
-    label to the swap partition: <option>-L
-    <replaceable>label</replaceable></option>. For example:
-
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       For creating swap partitions: <command>mkswap</command>. Again it’s
+       recommended to assign a label to the swap partition: <option>-L
+       <replaceable>label</replaceable></option>. For example:
 <screen>
 # mkswap -L swap /dev/sda2</screen>
-
-    </para></listitem>
-
-    <listitem>
-    <variablelist>
-      <varlistentry><term>UEFI systems</term>
-      <listitem><para>For creating boot partitions:
-    <command>mkfs.fat</command>.  Again it’s recommended to assign a
-    label to the boot partition: <option>-n
-    <replaceable>label</replaceable></option>. For example:
-
+      </para>
+     </listitem>
+     <listitem>
+      <variablelist>
+       <varlistentry>
+        <term>UEFI systems</term>
+        <listitem>
+         <para>
+          For creating boot partitions: <command>mkfs.fat</command>. Again
+          it’s recommended to assign a label to the boot partition:
+          <option>-n <replaceable>label</replaceable></option>. For example:
 <screen>
 # mkfs.fat -F 32 -n boot /dev/sda3</screen>
-
-    </para></listitem></varlistentry></variablelist></listitem>
-
-    <listitem><para>For creating LVM volumes, the LVM commands, e.g.,
-    <command>pvcreate</command>, <command>vgcreate</command>, and
-    <command>lvcreate</command>.</para></listitem>
-
-    <listitem><para>For creating software RAID devices, use
-    <command>mdadm</command>.</para></listitem>
-
-  </itemizedlist>
-
-  </para></listitem>
-
-  <listitem><para>Mount the target file system on which NixOS should
-  be installed on <filename>/mnt</filename>, e.g.
-
+         </para>
+        </listitem>
+       </varlistentry>
+      </variablelist>
+     </listitem>
+     <listitem>
+      <para>
+       For creating LVM volumes, the LVM commands, e.g.,
+       <command>pvcreate</command>, <command>vgcreate</command>, and
+       <command>lvcreate</command>.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       For creating software RAID devices, use <command>mdadm</command>.
+      </para>
+     </listitem>
+    </itemizedlist>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Mount the target file system on which NixOS should be installed on
+    <filename>/mnt</filename>, e.g.
 <screen>
 # mount /dev/disk/by-label/nixos /mnt
 </screen>
-
-  </para></listitem>
-
+   </para>
+  </listitem>
   <listitem>
-    <variablelist>
-      <varlistentry><term>UEFI systems</term>
-      <listitem><para>Mount the boot file system on <filename>/mnt/boot</filename>, e.g.
-
+   <variablelist>
+    <varlistentry>
+     <term>UEFI systems</term>
+     <listitem>
+      <para>
+       Mount the boot file system on <filename>/mnt/boot</filename>, e.g.
 <screen>
 # mkdir -p /mnt/boot
 # mount /dev/disk/by-label/boot /mnt/boot
 </screen>
-
-  </para></listitem></varlistentry></variablelist></listitem>
-
-  <listitem><para>If your machine has a limited amount of memory, you
-  may want to activate swap devices now (<command>swapon
-  <replaceable>device</replaceable></command>).  The installer (or
-  rather, the build actions that it may spawn) may need quite a bit of
-  RAM, depending on your configuration.
-
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </listitem>
+  <listitem>
+   <para>
+    If your machine has a limited amount of memory, you may want to activate
+    swap devices now (<command>swapon
+    <replaceable>device</replaceable></command>). The installer (or rather, the
+    build actions that it may spawn) may need quite a bit of RAM, depending on
+    your configuration.
 <screen>
 # swapon /dev/sda2</screen>
-
-  </para></listitem>
-
+   </para>
+  </listitem>
   <listitem>
-
-    <para>You now need to create a file
-    <filename>/mnt/etc/nixos/configuration.nix</filename> that
-    specifies the intended configuration of the system.  This is
-    because NixOS has a <emphasis>declarative</emphasis> configuration
-    model: you create or edit a description of the desired
-    configuration of your system, and then NixOS takes care of making
-    it happen.  The syntax of the NixOS configuration file is
-    described in <xref linkend="sec-configuration-syntax"/>, while a
-    list of available configuration options appears in <xref
-    linkend="ch-options"/>.  A minimal example is shown in <xref
-    linkend="ex-config"/>.</para>
-
-    <para>The command <command>nixos-generate-config</command> can
-    generate an initial configuration file for you:
-
+   <para>
+    You now need to create a file
+    <filename>/mnt/etc/nixos/configuration.nix</filename> that specifies the
+    intended configuration of the system. This is because NixOS has a
+    <emphasis>declarative</emphasis> configuration model: you create or edit a
+    description of the desired configuration of your system, and then NixOS
+    takes care of making it happen. The syntax of the NixOS configuration file
+    is described in <xref linkend="sec-configuration-syntax"/>, while a list of
+    available configuration options appears in
+    <xref
+    linkend="ch-options"/>. A minimal example is shown in
+    <xref
+    linkend="ex-config"/>.
+   </para>
+   <para>
+    The command <command>nixos-generate-config</command> can generate an
+    initial configuration file for you:
 <screen>
 # nixos-generate-config --root /mnt</screen>
-
-    You should then edit
-    <filename>/mnt/etc/nixos/configuration.nix</filename> to suit your
-    needs:
-
+    You should then edit <filename>/mnt/etc/nixos/configuration.nix</filename>
+    to suit your needs:
 <screen>
 # nano /mnt/etc/nixos/configuration.nix
 </screen>
-
-    If you’re using the graphical ISO image, other editors may be
-    available (such as <command>vim</command>). If you have network
-    access, you can also install other editors — for instance, you can
-    install Emacs by running <literal>nix-env -i
-    emacs</literal>.</para>
-
-    <variablelist>
-
-      <varlistentry><term>BIOS systems</term>
-        <listitem><para>You <emphasis>must</emphasis> set the option
-            <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
-            the GRUB boot loader is to be installed.  Without it, NixOS cannot
-            boot.</para></listitem></varlistentry>
-
-      <varlistentry><term>UEFI systems</term>
-        <listitem><para>You <emphasis>must</emphasis> set the option
-            <xref linkend="opt-boot.loader.systemd-boot.enable"/> to <literal>true</literal>.
-            <command>nixos-generate-config</command> should do this automatically for new
-            configurations when booted in
-            UEFI mode.</para>
-          <para>You may want to look at the options starting with
-            <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option> and
-            <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option> as well.
-          </para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para>If there are other operating systems running on the machine before
-    installing NixOS, the
-    <xref linkend="opt-boot.loader.grub.useOSProber"/> option can be set to
-    <literal>true</literal> to automatically add them to the grub menu.</para>
-
-    <para>Another critical option is <option>fileSystems</option>,
-    specifying the file systems that need to be mounted by NixOS.
-    However, you typically don’t need to set it yourself, because
+    If you’re using the graphical ISO image, other editors may be available
+    (such as <command>vim</command>). If you have network access, you can also
+    install other editors — for instance, you can install Emacs by running
+    <literal>nix-env -i emacs</literal>.
+   </para>
+   <variablelist>
+    <varlistentry>
+     <term>BIOS systems</term>
+     <listitem>
+      <para>
+       You <emphasis>must</emphasis> set the option
+       <xref linkend="opt-boot.loader.grub.device"/> to specify on which disk
+       the GRUB boot loader is to be installed. Without it, NixOS cannot boot.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term>UEFI systems</term>
+     <listitem>
+      <para>
+       You <emphasis>must</emphasis> set the option
+       <xref linkend="opt-boot.loader.systemd-boot.enable"/> to
+       <literal>true</literal>. <command>nixos-generate-config</command> should
+       do this automatically for new configurations when booted in UEFI mode.
+      </para>
+      <para>
+       You may want to look at the options starting with
+       <option><link linkend="opt-boot.loader.efi.canTouchEfiVariables">boot.loader.efi</link></option>
+       and
+       <option><link linkend="opt-boot.loader.systemd-boot.enable">boot.loader.systemd</link></option>
+       as well.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+   <para>
+    If there are other operating systems running on the machine before
+    installing NixOS, the <xref linkend="opt-boot.loader.grub.useOSProber"/>
+    option can be set to <literal>true</literal> to automatically add them to
+    the grub menu.
+   </para>
+   <para>
+    Another critical option is <option>fileSystems</option>, specifying the
+    file systems that need to be mounted by NixOS. However, you typically
+    don’t need to set it yourself, because
     <command>nixos-generate-config</command> sets it automatically in
-    <filename>/mnt/etc/nixos/hardware-configuration.nix</filename>
-    from your currently mounted file systems.  (The configuration file
+    <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> from your
+    currently mounted file systems. (The configuration file
     <filename>hardware-configuration.nix</filename> is included from
-    <filename>configuration.nix</filename> and will be overwritten by
-    future invocations of <command>nixos-generate-config</command>;
-    thus, you generally should not modify it.)</para>
-
-    <note><para>Depending on your hardware configuration or type of
-    file system, you may need to set the option
-    <option>boot.initrd.kernelModules</option> to include the kernel
-    modules that are necessary for mounting the root file system,
-    otherwise the installed system will not be able to boot.  (If this
-    happens, boot from the CD again, mount the target file system on
-    <filename>/mnt</filename>, fix
-    <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
-    <filename>nixos-install</filename>.)  In most cases,
-    <command>nixos-generate-config</command> will figure out the
-    required modules.</para></note>
-
+    <filename>configuration.nix</filename> and will be overwritten by future
+    invocations of <command>nixos-generate-config</command>; thus, you
+    generally should not modify it.)
+   </para>
+   <note>
+    <para>
+     Depending on your hardware configuration or type of file system, you may
+     need to set the option <option>boot.initrd.kernelModules</option> to
+     include the kernel modules that are necessary for mounting the root file
+     system, otherwise the installed system will not be able to boot. (If this
+     happens, boot from the CD again, mount the target file system on
+     <filename>/mnt</filename>, fix
+     <filename>/mnt/etc/nixos/configuration.nix</filename> and rerun
+     <filename>nixos-install</filename>.) In most cases,
+     <command>nixos-generate-config</command> will figure out the required
+     modules.
+    </para>
+   </note>
   </listitem>
-
-  <listitem><para>Do the installation:
-
+  <listitem>
+   <para>
+    Do the installation:
 <screen>
 # nixos-install</screen>
-
-    Cross fingers.  If this fails due to a temporary problem (such as
-    a network issue while downloading binaries from the NixOS binary
-    cache), you can just re-run <command>nixos-install</command>.
-    Otherwise, fix your <filename>configuration.nix</filename> and
-    then re-run <command>nixos-install</command>.</para>
-
-    <para>As the last step, <command>nixos-install</command> will ask
-    you to set the password for the <literal>root</literal> user, e.g.
-
-    <screen>
+    Cross fingers. If this fails due to a temporary problem (such as a network
+    issue while downloading binaries from the NixOS binary cache), you can just
+    re-run <command>nixos-install</command>. Otherwise, fix your
+    <filename>configuration.nix</filename> and then re-run
+    <command>nixos-install</command>.
+   </para>
+   <para>
+    As the last step, <command>nixos-install</command> will ask you to set the
+    password for the <literal>root</literal> user, e.g.
+<screen>
 setting root password...
 Enter new UNIX password: ***
 Retype new UNIX password: ***
     </screen>
-
     <note>
-      <para>
-        To prevent the password prompt, set <code><xref linkend="opt-users.mutableUsers"/> = false;</code> in
-        <filename>configuration.nix</filename>, which allows unattended installation
-        necessary in automation.
-      </para>
+     <para>
+      To prevent the password prompt, set
+      <code><xref linkend="opt-users.mutableUsers"/> = false;</code> in
+      <filename>configuration.nix</filename>, which allows unattended
+      installation necessary in automation.
+     </para>
     </note>
-
-    </para>
-
+   </para>
   </listitem>
-
   <listitem>
-    <para>If everything went well:
-
-      <screen>
+   <para>
+    If everything went well:
+<screen>
         # reboot</screen>
-
-  </para></listitem>
-
+   </para>
+  </listitem>
   <listitem>
-
-    <para>You should now be able to boot into the installed NixOS. The
-      GRUB boot menu shows a list of <emphasis>available
-        configurations</emphasis> (initially just one). Every time you
-      change the NixOS configuration (see <link
-        linkend="sec-changing-config">Changing Configuration</link> ), a
-      new item is added to the menu. This allows you to easily roll back
-      to a previous configuration if something goes wrong.</para>
-
-    <para>You should log in and change the <literal>root</literal>
-    password with <command>passwd</command>.</para>
-
-    <para>You’ll probably want to create some user accounts as well,
-    which can be done with <command>useradd</command>:
-
+   <para>
+    You should now be able to boot into the installed NixOS. The GRUB boot menu
+    shows a list of <emphasis>available configurations</emphasis> (initially
+    just one). Every time you change the NixOS configuration (see
+    <link
+        linkend="sec-changing-config">Changing Configuration</link>
+    ), a new item is added to the menu. This allows you to easily roll back to
+    a previous configuration if something goes wrong.
+   </para>
+   <para>
+    You should log in and change the <literal>root</literal> password with
+    <command>passwd</command>.
+   </para>
+   <para>
+    You’ll probably want to create some user accounts as well, which can be
+    done with <command>useradd</command>:
 <screen>
 $ useradd -c 'Eelco Dolstra' -m eelco
 $ passwd eelco</screen>
-
-    </para>
-
-    <para>You may also want to install some software.  For instance,
-
+   </para>
+   <para>
+    You may also want to install some software. For instance,
 <screen>
 $ nix-env -qa \*</screen>
-
     shows what packages are available, and
-
 <screen>
 $ nix-env -i w3m</screen>
-
-    install the <literal>w3m</literal> browser.</para>
-
+    install the <literal>w3m</literal> browser.
+   </para>
   </listitem>
-
-</orderedlist>
-
-<para>To summarise, <xref linkend="ex-install-sequence" /> shows a
-typical sequence of commands for installing NixOS on an empty hard
-drive (here <filename>/dev/sda</filename>).  <xref linkend="ex-config"
-/> shows a corresponding configuration Nix expression.</para>
-
-<example xml:id='ex-install-sequence'><title>Commands for Installing NixOS on <filename>/dev/sda</filename></title>
+ </orderedlist>
+ <para>
+  To summarise, <xref linkend="ex-install-sequence" /> shows a typical sequence
+  of commands for installing NixOS on an empty hard drive (here
+  <filename>/dev/sda</filename>). <xref linkend="ex-config"
+/> shows a
+  corresponding configuration Nix expression.
+ </para>
+ <example xml:id='ex-install-sequence'>
+  <title>Commands for Installing NixOS on <filename>/dev/sda</filename></title>
 <screen>
 # fdisk /dev/sda # <lineannotation>(or whatever device you want to install on)</lineannotation>
 -- for UEFI systems only
@@ -372,10 +407,10 @@ drive (here <filename>/dev/sda</filename>).  <xref linkend="ex-config"
 # nano /mnt/etc/nixos/configuration.nix
 # nixos-install
 # reboot</screen>
-</example>
-
-<example xml:id='ex-config'><title>NixOS Configuration</title>
-  <screen>
+ </example>
+ <example xml:id='ex-config'>
+  <title>NixOS Configuration</title>
+<screen>
 { config, pkgs, ... }: {
   imports = [
     # Include the results of the hardware scan.
@@ -394,11 +429,9 @@ drive (here <filename>/dev/sda</filename>).  <xref linkend="ex-config"
   services.sshd.enable = true;
 }
   </screen>
-</example>
-
-<xi:include href="installing-usb.xml" />
-<xi:include href="installing-pxe.xml" />
-<xi:include href="installing-virtualbox-guest.xml" />
-<xi:include href="installing-from-other-distro.xml" />
-
+ </example>
+ <xi:include href="installing-usb.xml" />
+ <xi:include href="installing-pxe.xml" />
+ <xi:include href="installing-virtualbox-guest.xml" />
+ <xi:include href="installing-from-other-distro.xml" />
 </chapter>
diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml
index 9b2b474c60ce..56af5c0e25a0 100644
--- a/nixos/doc/manual/installation/obtaining.xml
+++ b/nixos/doc/manual/installation/obtaining.xml
@@ -3,46 +3,52 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-obtaining">
-
-<title>Obtaining NixOS</title>
-
-<para>NixOS ISO images can be downloaded from the <link
-xlink:href="http://nixos.org/nixos/download.html">NixOS
-download page</link>.  There are a number of installation options.  If
-you happen to have an optical drive and a spare CD, burning the
-image to CD and booting from that is probably the easiest option.
-Most people will need to prepare a USB stick to boot from.
-<xref linkend="sec-booting-from-usb"/> describes the preferred method
-to prepare a USB stick.
-A number of alternative methods are presented in the <link
+ <title>Obtaining NixOS</title>
+ <para>
+  NixOS ISO images can be downloaded from the
+  <link
+xlink:href="http://nixos.org/nixos/download.html">NixOS download
+  page</link>. There are a number of installation options. If you happen to
+  have an optical drive and a spare CD, burning the image to CD and booting
+  from that is probably the easiest option. Most people will need to prepare a
+  USB stick to boot from. <xref linkend="sec-booting-from-usb"/> describes the
+  preferred method to prepare a USB stick. A number of alternative methods are
+  presented in the
+  <link
 xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installation_media">NixOS
-Wiki</link>.</para>
-
-<para>As an alternative to installing NixOS yourself, you can get a
-running NixOS system through several other means:
-
-<itemizedlist>
-  <listitem>
-    <para>Using virtual appliances in Open Virtualization Format (OVF)
-    that can be imported into VirtualBox.  These are available from
-    the <link xlink:href="http://nixos.org/nixos/download.html">NixOS
-    download page</link>.</para>
-  </listitem>
-  <listitem>
-    <para>Using AMIs for Amazon’s EC2.  To find one for your region
-    and instance type, please refer to the <link
+  Wiki</link>.
+ </para>
+ <para>
+  As an alternative to installing NixOS yourself, you can get a running NixOS
+  system through several other means:
+  <itemizedlist>
+   <listitem>
+    <para>
+     Using virtual appliances in Open Virtualization Format (OVF) that can be
+     imported into VirtualBox. These are available from the
+     <link xlink:href="http://nixos.org/nixos/download.html">NixOS download
+     page</link>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Using AMIs for Amazon’s EC2. To find one for your region and instance
+     type, please refer to the
+     <link
     xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/virtualisation/ec2-amis.nix">list
-    of most recent AMIs</link>.</para>
-  </listitem>
-  <listitem>
-    <para>Using NixOps, the NixOS-based cloud deployment tool, which
-    allows you to provision VirtualBox and EC2 NixOS instances from
-    declarative specifications.  Check out the <link
+     of most recent AMIs</link>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Using NixOps, the NixOS-based cloud deployment tool, which allows you to
+     provision VirtualBox and EC2 NixOS instances from declarative
+     specifications. Check out the
+     <link
     xlink:href="https://nixos.org/nixops">NixOps homepage</link> for
-    details.</para>
-  </listitem>
-</itemizedlist>
-
-</para>
-
+     details.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 </chapter>
diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml
index 24881c8fec0f..20355812ec63 100644
--- a/nixos/doc/manual/installation/upgrading.xml
+++ b/nixos/doc/manual/installation/upgrading.xml
@@ -2,140 +2,130 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          version="5.0"
          xml:id="sec-upgrading">
-
-<title>Upgrading NixOS</title>
-
-<para>The best way to keep your NixOS installation up to date is to
-use one of the NixOS <emphasis>channels</emphasis>.  A channel is a
-Nix mechanism for distributing Nix expressions and associated
-binaries.  The NixOS channels are updated automatically from NixOS’s
-Git repository after certain tests have passed and all packages have
-been built.  These channels are:
-
-<itemizedlist>
-  <listitem>
-    <para><emphasis>Stable channels</emphasis>, such as <literal
+ <title>Upgrading NixOS</title>
+ <para>
+  The best way to keep your NixOS installation up to date is to use one of the
+  NixOS <emphasis>channels</emphasis>. A channel is a Nix mechanism for
+  distributing Nix expressions and associated binaries. The NixOS channels are
+  updated automatically from NixOS’s Git repository after certain tests have
+  passed and all packages have been built. These channels are:
+  <itemizedlist>
+   <listitem>
+    <para>
+     <emphasis>Stable channels</emphasis>, such as
+     <literal
     xlink:href="https://nixos.org/channels/nixos-17.03">nixos-17.03</literal>.
-    These only get conservative bug fixes and package upgrades.  For
-    instance, a channel update may cause the Linux kernel on your
-    system to be upgraded from 4.9.16 to 4.9.17 (a minor bug fix), but
-    not from 4.9.<replaceable>x</replaceable> to
-    4.11.<replaceable>x</replaceable> (a major change that has the
-    potential to break things).  Stable channels are generally
-    maintained until the next stable branch is created.</para>
+     These only get conservative bug fixes and package upgrades. For instance,
+     a channel update may cause the Linux kernel on your system to be upgraded
+     from 4.9.16 to 4.9.17 (a minor bug fix), but not from
+     4.9.<replaceable>x</replaceable> to 4.11.<replaceable>x</replaceable> (a
+     major change that has the potential to break things). Stable channels are
+     generally maintained until the next stable branch is created.
+    </para>
     <para></para>
-  </listitem>
-  <listitem>
-    <para>The <emphasis>unstable channel</emphasis>, <literal
+   </listitem>
+   <listitem>
+    <para>
+     The <emphasis>unstable channel</emphasis>,
+     <literal
     xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable</literal>.
-    This corresponds to NixOS’s main development branch, and may thus
-    see radical changes between channel updates.  It’s not recommended
-    for production systems.</para>
-  </listitem>
-  <listitem>
-    <para><emphasis>Small channels</emphasis>, such as <literal
+     This corresponds to NixOS’s main development branch, and may thus see
+     radical changes between channel updates. It’s not recommended for
+     production systems.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <emphasis>Small channels</emphasis>, such as
+     <literal
     xlink:href="https://nixos.org/channels/nixos-17.03-small">nixos-17.03-small</literal>
-    or <literal
-    xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These
-    are identical to the stable and unstable channels described above,
-    except that they contain fewer binary packages. This means they
-    get updated faster than the regular channels (for instance, when a
-    critical security patch is committed to NixOS’s source tree), but
-    may require more packages to be built from source than
-    usual. They’re mostly intended for server environments and as such
-    contain few GUI applications.</para>
-  </listitem>
-</itemizedlist>
-
-To see what channels are available, go to <link
-xlink:href="https://nixos.org/channels"/>.  (Note that the URIs of the
-various channels redirect to a directory that contains the channel’s
-latest version and includes ISO images and VirtualBox
-appliances.)</para>
-
-<para>When you first install NixOS, you’re automatically subscribed to
-the NixOS channel that corresponds to your installation source.   For
-instance, if you installed from a 17.03 ISO, you will be subscribed to
-the <literal>nixos-17.03</literal> channel.  To see which NixOS
-channel you’re subscribed to, run the following as root:
-
+     or
+     <literal
+    xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>.
+     These are identical to the stable and unstable channels described above,
+     except that they contain fewer binary packages. This means they get
+     updated faster than the regular channels (for instance, when a critical
+     security patch is committed to NixOS’s source tree), but may require
+     more packages to be built from source than usual. They’re mostly
+     intended for server environments and as such contain few GUI applications.
+    </para>
+   </listitem>
+  </itemizedlist>
+  To see what channels are available, go to
+  <link
+xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the
+  various channels redirect to a directory that contains the channel’s latest
+  version and includes ISO images and VirtualBox appliances.)
+ </para>
+ <para>
+  When you first install NixOS, you’re automatically subscribed to the NixOS
+  channel that corresponds to your installation source. For instance, if you
+  installed from a 17.03 ISO, you will be subscribed to the
+  <literal>nixos-17.03</literal> channel. To see which NixOS channel you’re
+  subscribed to, run the following as root:
 <screen>
 # nix-channel --list | grep nixos
 nixos https://nixos.org/channels/nixos-unstable
 </screen>
-
-To switch to a different NixOS channel, do
-
+  To switch to a different NixOS channel, do
 <screen>
 # nix-channel --add https://nixos.org/channels/<replaceable>channel-name</replaceable> nixos
 </screen>
-
-(Be sure to include the <literal>nixos</literal> parameter at the
-end.)  For instance, to use the NixOS 17.03 stable channel:
-
+  (Be sure to include the <literal>nixos</literal> parameter at the end.) For
+  instance, to use the NixOS 17.03 stable channel:
 <screen>
 # nix-channel --add https://nixos.org/channels/nixos-17.03 nixos
 </screen>
-
-If you have a server, you may want to use the “small” channel instead:
-
+  If you have a server, you may want to use the “small” channel instead:
 <screen>
 # nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos
 </screen>
-
-And if you want to live on the bleeding edge:
-
+  And if you want to live on the bleeding edge:
 <screen>
 # nix-channel --add https://nixos.org/channels/nixos-unstable nixos
 </screen>
-
-</para>
-
-<para>You can then upgrade NixOS to the latest version in your chosen
-channel by running
-
+ </para>
+ <para>
+  You can then upgrade NixOS to the latest version in your chosen channel by
+  running
 <screen>
 # nixos-rebuild switch --upgrade
 </screen>
+  which is equivalent to the more verbose <literal>nix-channel --update nixos;
+  nixos-rebuild switch</literal>.
+ </para>
+ <note>
+  <para>
+   Channels are set per user. This means that running <literal> nix-channel
+   --add</literal> as a non root user (or without sudo) will not affect
+   configuration in <literal>/etc/nixos/configuration.nix</literal>
+  </para>
+ </note>
+ <warning>
+  <para>
+   It is generally safe to switch back and forth between channels. The only
+   exception is that a newer NixOS may also have a newer Nix version, which may
+   involve an upgrade of Nix’s database schema. This cannot be undone easily,
+   so in that case you will not be able to go back to your original channel.
+  </para>
+ </warning>
+ <section>
+  <title>Automatic Upgrades</title>
 
-which is equivalent to the more verbose <literal>nix-channel --update
-nixos; nixos-rebuild switch</literal>.</para>
-
-<note><para>Channels are set per user. This means that running <literal>
-nix-channel --add</literal> as a non root user (or without sudo) will not
-affect configuration in <literal>/etc/nixos/configuration.nix</literal>
-</para></note>
-
-<warning><para>It is generally safe to switch back and forth between
-channels.  The only exception is that a newer NixOS may also have a
-newer Nix version, which may involve an upgrade of Nix’s database
-schema.  This cannot be undone easily, so in that case you will not be
-able to go back to your original channel.</para></warning>
-
-
-<section><title>Automatic Upgrades</title>
-
-<para>You can keep a NixOS system up-to-date automatically by adding
-the following to <filename>configuration.nix</filename>:
-
+  <para>
+   You can keep a NixOS system up-to-date automatically by adding the following
+   to <filename>configuration.nix</filename>:
 <programlisting>
 <xref linkend="opt-system.autoUpgrade.enable"/> = true;
 </programlisting>
-
-This enables a periodically executed systemd service named
-<literal>nixos-upgrade.service</literal>. It runs
-<command>nixos-rebuild switch --upgrade</command> to upgrade NixOS to
-the latest version in the current channel. (To see when the service
-runs, see <command>systemctl list-timers</command>.)  You can also
-specify a channel explicitly, e.g.
-
+   This enables a periodically executed systemd service named
+   <literal>nixos-upgrade.service</literal>. It runs <command>nixos-rebuild
+   switch --upgrade</command> to upgrade NixOS to the latest version in the
+   current channel. (To see when the service runs, see <command>systemctl
+   list-timers</command>.) You can also specify a channel explicitly, e.g.
 <programlisting>
 <xref linkend="opt-system.autoUpgrade.channel"/> = https://nixos.org/channels/nixos-17.03;
 </programlisting>
-
-</para>
-
-</section>
-
-
+  </para>
+ </section>
 </chapter>
diff --git a/nixos/doc/manual/man-configuration.xml b/nixos/doc/manual/man-configuration.xml
index 37ffb9d648a9..9f30b7925101 100644
--- a/nixos/doc/manual/man-configuration.xml
+++ b/nixos/doc/manual/man-configuration.xml
@@ -1,39 +1,31 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refmeta>
-  <refentrytitle><filename>configuration.nix</filename></refentrytitle>
-  <manvolnum>5</manvolnum>
+ <refmeta>
+  <refentrytitle><filename>configuration.nix</filename>
+  </refentrytitle><manvolnum>5</manvolnum>
   <refmiscinfo class="source">NixOS</refmiscinfo>
-  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
-</refmeta>
-
-<refnamediv>
-  <refname><filename>configuration.nix</filename></refname>
-  <refpurpose>NixOS system configuration specification</refpurpose>
-</refnamediv>
-
-
-<refsection><title>Description</title>
-
-<para>The file <filename>/etc/nixos/configuration.nix</filename>
-contains the declarative specification of your NixOS system
-configuration.  The command <command>nixos-rebuild</command> takes
-this file and realises the system configuration specified
-therein.</para>
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<para>You can use the following options in
-<filename>configuration.nix</filename>.</para>
-
-<xi:include href="./generated/options-db.xml"
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+ </refmeta>
+ <refnamediv>
+  <refname><filename>configuration.nix</filename>
+  </refname><refpurpose>NixOS system configuration specification</refpurpose>
+ </refnamediv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   The file <filename>/etc/nixos/configuration.nix</filename> contains the
+   declarative specification of your NixOS system configuration. The command
+   <command>nixos-rebuild</command> takes this file and realises the system
+   configuration specified therein.
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   You can use the following options in <filename>configuration.nix</filename>.
+  </para>
+  <xi:include href="./generated/options-db.xml"
             xpointer="configuration-variable-list" />
-
-</refsection>
-
+ </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
index f4b59a7c6d4b..02dad4c548b8 100644
--- a/nixos/doc/manual/man-nixos-build-vms.xml
+++ b/nixos/doc/manual/man-nixos-build-vms.xml
@@ -1,40 +1,39 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refmeta>
-  <refentrytitle><command>nixos-build-vms</command></refentrytitle>
-  <manvolnum>8</manvolnum>
+ <refmeta>
+  <refentrytitle><command>nixos-build-vms</command>
+  </refentrytitle><manvolnum>8</manvolnum>
   <refmiscinfo class="source">NixOS</refmiscinfo>
-  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
-</refmeta>
-
-<refnamediv>
-  <refname><command>nixos-build-vms</command></refname>
-  <refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nixos-build-vms</command>
-    <arg><option>--show-trace</option></arg>
-    <arg><option>--no-out-link</option></arg>
-    <arg><option>--help</option></arg>
-    <arg choice="plain"><replaceable>network.nix</replaceable></arg>
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+ </refmeta>
+ <refnamediv>
+  <refname><command>nixos-build-vms</command>
+  </refname><refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis><command>nixos-build-vms</command>
+   <arg><option>--show-trace</option>
+   </arg>
+   <arg><option>--no-out-link</option>
+   </arg>
+   <arg><option>--help</option>
+   </arg>
+   <arg choice="plain"><replaceable>network.nix</replaceable>
+   </arg>
   </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>This command builds a network of QEMU-KVM virtual machines of a Nix expression
-specifying a network of NixOS machines. The virtual network can be started by
-executing the <filename>bin/run-vms</filename> shell script that is generated by
-this command. By default, a <filename>result</filename> symlink is produced that
-points to the generated virtual network.
-</para>
-
-<para>A network Nix expression has the following structure:
-
+ </refsynopsisdiv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   This command builds a network of QEMU-KVM virtual machines of a Nix
+   expression specifying a network of NixOS machines. The virtual network can
+   be started by executing the <filename>bin/run-vms</filename> shell script
+   that is generated by this command. By default, a <filename>result</filename>
+   symlink is produced that points to the generated virtual network.
+  </para>
+  <para>
+   A network Nix expression has the following structure:
 <screen>
 {
   test1 = {pkgs, config, ...}:
@@ -58,53 +57,53 @@ points to the generated virtual network.
     };
 }
 </screen>
-
-Each attribute in the expression represents a machine in the network
-(e.g. <varname>test1</varname> and <varname>test2</varname>)
-referring to a function defining a NixOS configuration.
-In each NixOS configuration, two attributes have a special meaning.
-The <varname>deployment.targetHost</varname> specifies the address
-(domain name or IP address)
-of the system which is used by <command>ssh</command> to perform
-remote deployment operations. The <varname>nixpkgs.localSystem.system</varname>
-attribute can be used to specify an architecture for the target machine,
-such as <varname>i686-linux</varname> which builds a 32-bit NixOS
-configuration. Omitting this property will build the configuration
-for the same architecture as the host system.
-</para>
-
-</refsection>
-
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--show-trace</option></term>
+   Each attribute in the expression represents a machine in the network (e.g.
+   <varname>test1</varname> and <varname>test2</varname>) referring to a
+   function defining a NixOS configuration. In each NixOS configuration, two
+   attributes have a special meaning. The
+   <varname>deployment.targetHost</varname> specifies the address (domain name
+   or IP address) of the system which is used by <command>ssh</command> to
+   perform remote deployment operations. The
+   <varname>nixpkgs.localSystem.system</varname> attribute can be used to
+   specify an architecture for the target machine, such as
+   <varname>i686-linux</varname> which builds a 32-bit NixOS configuration.
+   Omitting this property will build the configuration for the same
+   architecture as the host system.
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   This command accepts the following options:
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term><option>--show-trace</option>
+    </term>
     <listitem>
-      <para>Shows a trace of the output.</para>
+     <para>
+      Shows a trace of the output.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--no-out-link</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--no-out-link</option>
+    </term>
     <listitem>
-      <para>Do not create a 'result' symlink.</para>
+     <para>
+      Do not create a 'result' symlink.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>-h</option>, <option>--help</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>-h</option>, <option>--help</option>
+    </term>
     <listitem>
-      <para>Shows the usage of this command to the user.</para>
+     <para>
+      Shows the usage of this command to the user.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
+   </varlistentry>
+  </variablelist>
+ </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml
index a2fbe07961db..7db4b72ee36e 100644
--- a/nixos/doc/manual/man-nixos-enter.xml
+++ b/nixos/doc/manual/man-nixos-enter.xml
@@ -1,119 +1,119 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refmeta>
-  <refentrytitle><command>nixos-enter</command></refentrytitle>
-  <manvolnum>8</manvolnum>
+ <refmeta>
+  <refentrytitle><command>nixos-enter</command>
+  </refentrytitle><manvolnum>8</manvolnum>
   <refmiscinfo class="source">NixOS</refmiscinfo>
-  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
-</refmeta>
-
-<refnamediv>
-  <refname><command>nixos-enter</command></refname>
-  <refpurpose>run a command in a NixOS chroot environment</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nixos-enter</command>
-    <arg>
-      <arg choice='plain'><option>--root</option></arg>
-      <replaceable>root</replaceable>
-    </arg>
-    <arg>
-      <arg choice='plain'><option>--system</option></arg>
-      <replaceable>system</replaceable>
-    </arg>
-    <arg>
-      <arg choice='plain'><option>-c</option></arg>
-      <replaceable>shell-command</replaceable>
-    </arg>
-    <arg>
-      <arg choice='plain'><option>--help</option></arg>
-    </arg>
-    <arg>
-      <arg choice='plain'><option>--</option></arg>
-      <replaceable>arguments</replaceable>
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+ </refmeta>
+ <refnamediv>
+  <refname><command>nixos-enter</command>
+  </refname><refpurpose>run a command in a NixOS chroot environment</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis><command>nixos-enter</command>
+   <arg>
+    <arg choice='plain'><option>--root</option>
+    </arg><replaceable>root</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--system</option>
+    </arg><replaceable>system</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>-c</option>
+    </arg><replaceable>shell-command</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--help</option>
     </arg>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--</option>
+    </arg><replaceable>arguments</replaceable>
+   </arg>
   </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>This command runs a command in a NixOS chroot environment, that
-is, in a filesystem hierarchy previously prepared using
-<command>nixos-install</command>.</para>
-
-</refsection>
-
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--root</option></term>
+ </refsynopsisdiv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   This command runs a command in a NixOS chroot environment, that is, in a
+   filesystem hierarchy previously prepared using
+   <command>nixos-install</command>.
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   This command accepts the following options:
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term><option>--root</option>
+    </term>
     <listitem>
-      <para>The path to the NixOS system you want to enter. It defaults to <filename>/mnt</filename>.</para>
+     <para>
+      The path to the NixOS system you want to enter. It defaults to
+      <filename>/mnt</filename>.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--system</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--system</option>
+    </term>
     <listitem>
-      <para>The NixOS system configuration to use. It defaults to
-      <filename>/nix/var/nix/profiles/system</filename>. You can enter
-      a previous NixOS configuration by specifying a path such as
-      <filename>/nix/var/nix/profiles/system-106-link</filename>.</para>
+     <para>
+      The NixOS system configuration to use. It defaults to
+      <filename>/nix/var/nix/profiles/system</filename>. You can enter a
+      previous NixOS configuration by specifying a path such as
+      <filename>/nix/var/nix/profiles/system-106-link</filename>.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--command</option></term>
-    <term><option>-c</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--command</option>
+    </term>
+    <term><option>-c</option>
+    </term>
     <listitem>
-      <para>The bash command to execute.</para>
+     <para>
+      The bash command to execute.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--</option></term>
-
-    <listitem><para>Interpret the remaining arguments as the program
-    name and arguments to be invoked. The program is not executed in a
-    shell.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>Start an interactive shell in the NixOS installation in
-<filename>/mnt</filename>:</para>
-
+   </varlistentry>
+   <varlistentry>
+    <term><option>--</option>
+    </term>
+    <listitem>
+     <para>
+      Interpret the remaining arguments as the program name and arguments to be
+      invoked. The program is not executed in a shell.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Examples</title>
+  <para>
+   Start an interactive shell in the NixOS installation in
+   <filename>/mnt</filename>:
+  </para>
 <screen>
 # nixos-enter /mnt
 </screen>
-
-<para>Run a shell command:</para>
-
+  <para>
+   Run a shell command:
+  </para>
 <screen>
 # nixos-enter -c 'ls -l /; cat /proc/mounts'
 </screen>
-
-<para>Run a non-shell command:</para>
-
+  <para>
+   Run a non-shell command:
+  </para>
 <screen>
 # nixos-enter -- cat /proc/mounts
 </screen>
-
-</refsection>
-
+ </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
index 993a932ddfbe..8bf90f452db6 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -1,152 +1,149 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refmeta>
-  <refentrytitle><command>nixos-generate-config</command></refentrytitle>
-  <manvolnum>8</manvolnum>
+ <refmeta>
+  <refentrytitle><command>nixos-generate-config</command>
+  </refentrytitle><manvolnum>8</manvolnum>
   <refmiscinfo class="source">NixOS</refmiscinfo>
-  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
-</refmeta>
-
-<refnamediv>
-  <refname><command>nixos-generate-config</command></refname>
-  <refpurpose>generate NixOS configuration modules</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nixos-generate-config</command>
-    <arg><option>--force</option></arg>
-    <arg>
-      <arg choice='plain'><option>--root</option></arg>
-      <replaceable>root</replaceable>
-    </arg>
-    <arg>
-      <arg choice='plain'><option>--dir</option></arg>
-      <replaceable>dir</replaceable>
-    </arg>
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+ </refmeta>
+ <refnamediv>
+  <refname><command>nixos-generate-config</command>
+  </refname><refpurpose>generate NixOS configuration modules</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis><command>nixos-generate-config</command>
+   <arg><option>--force</option>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--root</option>
+    </arg><replaceable>root</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--dir</option>
+    </arg><replaceable>dir</replaceable>
+   </arg>
   </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>This command writes two NixOS configuration modules:
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>/etc/nixos/hardware-configuration.nix</option></term>
+ </refsynopsisdiv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   This command writes two NixOS configuration modules:
+   <variablelist>
+    <varlistentry>
+     <term><option>/etc/nixos/hardware-configuration.nix</option>
+     </term>
+     <listitem>
+      <para>
+       This module sets NixOS configuration options based on your current
+       hardware configuration. In particular, it sets the
+       <option>fileSystem</option> option to reflect all currently mounted file
+       systems, the <option>swapDevices</option> option to reflect active swap
+       devices, and the <option>boot.initrd.*</option> options to ensure that
+       the initial ramdisk contains any kernel modules necessary for mounting
+       the root file system.
+      </para>
+      <para>
+       If this file already exists, it is overwritten. Thus, you should not
+       modify it manually. Rather, you should include it from your
+       <filename>/etc/nixos/configuration.nix</filename>, and re-run
+       <command>nixos-generate-config</command> to update it whenever your
+       hardware configuration changes.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>/etc/nixos/configuration.nix</option>
+     </term>
+     <listitem>
+      <para>
+       This is the main NixOS system configuration module. If it already
+       exists, it’s left unchanged. Otherwise,
+       <command>nixos-generate-config</command> will write a template for you
+       to customise.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   This command accepts the following options:
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term><option>--root</option>
+    </term>
     <listitem>
-      <para>This module sets NixOS configuration options based on your
-      current hardware configuration.  In particular, it sets the
-      <option>fileSystem</option> option to reflect all currently
-      mounted file systems, the <option>swapDevices</option> option to
-      reflect active swap devices, and the
-      <option>boot.initrd.*</option> options to ensure that the
-      initial ramdisk contains any kernel modules necessary for
-      mounting the root file system.</para>
-
-      <para>If this file already exists, it is overwritten.  Thus, you
-      should not modify it manually.  Rather, you should include it
-      from your <filename>/etc/nixos/configuration.nix</filename>, and
-      re-run <command>nixos-generate-config</command> to update it
-      whenever your hardware configuration changes.</para>
+     <para>
+      If this option is given, treat the directory
+      <replaceable>root</replaceable> as the root of the file system. This
+      means that configuration files will be written to
+      <filename><replaceable>root</replaceable>/etc/nixos</filename>, and that
+      any file systems outside of <replaceable>root</replaceable> are ignored
+      for the purpose of generating the <option>fileSystems</option> option.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>/etc/nixos/configuration.nix</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--dir</option>
+    </term>
     <listitem>
-      <para>This is the main NixOS system configuration module.  If it
-      already exists, it’s left unchanged.  Otherwise,
-      <command>nixos-generate-config</command> will write a template
-      for you to customise.</para>
+     <para>
+      If this option is given, write the configuration files to the directory
+      <replaceable>dir</replaceable> instead of
+      <filename>/etc/nixos</filename>.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--root</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--force</option>
+    </term>
     <listitem>
-      <para>If this option is given, treat the directory
-      <replaceable>root</replaceable> as the root of the file system.
-      This means that configuration files will be written to
-      <filename><replaceable>root</replaceable>/etc/nixos</filename>,
-      and that any file systems outside of
-      <replaceable>root</replaceable> are ignored for the purpose of
-      generating the <option>fileSystems</option> option.</para>
+     <para>
+      Overwrite <filename>/etc/nixos/configuration.nix</filename> if it already
+      exists.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--dir</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--no-filesystems</option>
+    </term>
     <listitem>
-      <para>If this option is given, write the configuration files to
-      the directory <replaceable>dir</replaceable> instead of
-      <filename>/etc/nixos</filename>.</para>
+     <para>
+      Omit everything concerning file systems and swap devices from the
+      hardware configuration.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--force</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--show-hardware-config</option>
+    </term>
     <listitem>
-      <para>Overwrite
-      <filename>/etc/nixos/configuration.nix</filename> if it already
-      exists.</para>
+     <para>
+      Don't generate <filename>configuration.nix</filename> or
+      <filename>hardware-configuration.nix</filename> and print the hardware
+      configuration to stdout only.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--no-filesystems</option></term>
-    <listitem>
-      <para>Omit everything concerning file systems and swap devices
-      from the hardware configuration.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--show-hardware-config</option></term>
-    <listitem>
-      <para>Don't generate <filename>configuration.nix</filename> or
-      <filename>hardware-configuration.nix</filename> and print the
-      hardware configuration to stdout only.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>This command is typically used during NixOS installation to
-write initial configuration modules.  For example, if you created and
-mounted the target file systems on <filename>/mnt</filename> and
-<filename>/mnt/boot</filename>, you would run:
-
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Examples</title>
+  <para>
+   This command is typically used during NixOS installation to write initial
+   configuration modules. For example, if you created and mounted the target
+   file systems on <filename>/mnt</filename> and
+   <filename>/mnt/boot</filename>, you would run:
 <screen>
 $ nixos-generate-config --root /mnt
 </screen>
-
-The resulting file
-<filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might
-look like this:
-
+   The resulting file
+   <filename>/mnt/etc/nixos/hardware-configuration.nix</filename> might look
+   like this:
 <programlisting>
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
@@ -181,28 +178,22 @@ look like this:
   nix.maxJobs = 8;
 }
 </programlisting>
-
-It will also create a basic
-<filename>/mnt/etc/nixos/configuration.nix</filename>, which you
-should edit to customise the logical configuration of your system.
-This file includes the result of the hardware scan as follows:
-
+   It will also create a basic
+   <filename>/mnt/etc/nixos/configuration.nix</filename>, which you should edit
+   to customise the logical configuration of your system. This file includes
+   the result of the hardware scan as follows:
 <programlisting>
   imports = [ ./hardware-configuration.nix ];
 </programlisting>
-</para>
-
-<para>After installation, if your hardware configuration changes, you
-can run:
-
+  </para>
+  <para>
+   After installation, if your hardware configuration changes, you can run:
 <screen>
 $ nixos-generate-config
 </screen>
-
-to update <filename>/etc/nixos/hardware-configuration.nix</filename>.
-Your <filename>/etc/nixos/configuration.nix</filename> will
-<emphasis>not</emphasis> be overwritten.</para>
-
-</refsection>
-
+   to update <filename>/etc/nixos/hardware-configuration.nix</filename>. Your
+   <filename>/etc/nixos/configuration.nix</filename> will
+   <emphasis>not</emphasis> be overwritten.
+  </para>
+ </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index d6e70d16098b..2d45e83a863f 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -1,201 +1,221 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refmeta>
-  <refentrytitle><command>nixos-install</command></refentrytitle>
-  <manvolnum>8</manvolnum>
+ <refmeta>
+  <refentrytitle><command>nixos-install</command>
+  </refentrytitle><manvolnum>8</manvolnum>
   <refmiscinfo class="source">NixOS</refmiscinfo>
-  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
-</refmeta>
-
-<refnamediv>
-  <refname><command>nixos-install</command></refname>
-  <refpurpose>install bootloader and NixOS</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nixos-install</command>
-    <arg>
-      <arg choice='plain'><option>-I</option></arg>
-      <replaceable>path</replaceable>
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+ </refmeta>
+ <refnamediv>
+  <refname><command>nixos-install</command>
+  </refname><refpurpose>install bootloader and NixOS</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis><command>nixos-install</command>
+   <arg>
+    <arg choice='plain'><option>-I</option>
+    </arg><replaceable>path</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--root</option>
+    </arg><replaceable>root</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--system</option>
+    </arg><replaceable>path</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--no-channel-copy</option>
     </arg>
-    <arg>
-      <arg choice='plain'><option>--root</option></arg>
-      <replaceable>root</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--no-root-passwd</option>
     </arg>
-    <arg>
-      <arg choice='plain'><option>--system</option></arg>
-      <replaceable>path</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--no-bootloader</option>
     </arg>
-    <arg>
-      <arg choice='plain'><option>--no-channel-copy</option></arg>
+   </arg>
+   <arg><group choice='req'>
+    <arg choice='plain'><option>--max-jobs</option>
     </arg>
-    <arg>
-      <arg choice='plain'><option>--no-root-passwd</option></arg>
+    <arg choice='plain'><option>-j</option>
+    </arg></group><replaceable>number</replaceable>
+   </arg>
+   <arg><option>--cores</option><replaceable>number</replaceable>
+   </arg>
+   <arg><option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--show-trace</option>
     </arg>
-    <arg>
-      <arg choice='plain'><option>--no-bootloader</option></arg>
-    </arg>
-    <arg>
-      <group choice='req'>
-        <arg choice='plain'><option>--max-jobs</option></arg>
-        <arg choice='plain'><option>-j</option></arg>
-      </group>
-      <replaceable>number</replaceable>
-    </arg>
-    <arg>
-      <option>--cores</option>
-      <replaceable>number</replaceable>
-    </arg>
-    <arg>
-      <option>--option</option>
-      <replaceable>name</replaceable>
-      <replaceable>value</replaceable>
-    </arg>
-    <arg>
-      <arg choice='plain'><option>--show-trace</option></arg>
-    </arg>
-    <arg>
-      <arg choice='plain'><option>--help</option></arg>
+   </arg>
+   <arg>
+    <arg choice='plain'><option>--help</option>
     </arg>
+   </arg>
   </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>This command installs NixOS in the file system mounted on
-<filename>/mnt</filename>, based on the NixOS configuration specified
-in <filename>/mnt/etc/nixos/configuration.nix</filename>.  It performs
-the following steps:
-
-<itemizedlist>
-
-  <listitem><para>It copies Nix and its dependencies to
-  <filename>/mnt/nix/store</filename>.</para></listitem>
-
-  <listitem><para>It runs Nix in <filename>/mnt</filename> to build
-  the NixOS configuration specified in
-  <filename>/mnt/etc/nixos/configuration.nix</filename>.</para></listitem>
-
-  <listitem><para>It installs the GRUB boot loader on the device
-  specified in the option <option>boot.loader.grub.device</option>
-  (unless <option>--no-bootloader</option> is specified),
-  and generates a GRUB configuration file that boots into the NixOS
-  configuration just installed.</para></listitem>
-
-  <listitem><para>It prompts you for a password for the root account
-  (unless <option>--no-root-passwd</option> is specified).</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>This command is idempotent: if it is interrupted or fails due to
-a temporary problem (e.g. a network issue), you can safely re-run
-it.</para>
-
-</refsection>
-
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--root</option></term>
+ </refsynopsisdiv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   This command installs NixOS in the file system mounted on
+   <filename>/mnt</filename>, based on the NixOS configuration specified in
+   <filename>/mnt/etc/nixos/configuration.nix</filename>. It performs the
+   following steps:
+   <itemizedlist>
     <listitem>
-      <para>Defaults to <filename>/mnt</filename>. If this option is given, treat the directory
-      <replaceable>root</replaceable> as the root of the NixOS installation.
-      </para>
+     <para>
+      It copies Nix and its dependencies to
+      <filename>/mnt/nix/store</filename>.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--system</option></term>
     <listitem>
-      <para>If this option is provided, <command>nixos-install</command> will install the specified closure
-      rather than attempt to build one from <filename>/mnt/etc/nixos/configuration.nix</filename>.</para>
-
-      <para>The closure must be an appropriately configured NixOS system, with boot loader and partition
-      configuration that fits the target host. Such a closure is typically obtained with a command such as
-      <command>nix-build -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system --no-out-link</command>
-      </para>
+     <para>
+      It runs Nix in <filename>/mnt</filename> to build the NixOS configuration
+      specified in <filename>/mnt/etc/nixos/configuration.nix</filename>.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>-I</option></term>
     <listitem>
-      <para>Add a path to the Nix expression search path. This option may be given multiple times.
-        See the NIX_PATH environment variable for information on the semantics of the Nix search path.
-        Paths added through <replaceable>-I</replaceable> take precedence over NIX_PATH.</para>
+     <para>
+      It installs the GRUB boot loader on the device specified in the option
+      <option>boot.loader.grub.device</option> (unless
+      <option>--no-bootloader</option> is specified), and generates a GRUB
+      configuration file that boots into the NixOS configuration just
+      installed.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry><term><option>--max-jobs</option></term>
-    <term><option>-j</option></term>
-  
-    <listitem><para>Sets the maximum number of build jobs that Nix will
-    perform in parallel to the specified number. The default is <literal>1</literal>.
-    A higher value is useful on SMP systems or to exploit I/O latency.</para></listitem>
-  
-  </varlistentry>
-  
-  
-  <varlistentry><term><option>--cores</option></term>
-  
-    <listitem><para>Sets the value of the <envar>NIX_BUILD_CORES</envar>
-    environment variable in the invocation of builders.  Builders can
-    use this variable at their discretion to control the maximum amount
-    of parallelism.  For instance, in Nixpkgs, if the derivation
-    attribute <varname>enableParallelBuilding</varname> is set to
-    <literal>true</literal>, the builder passes the
-    <option>-j<replaceable>N</replaceable></option> flag to GNU Make.
-    The value <literal>0</literal> means that the builder should use all
-    available CPU cores in the system.</para></listitem>
-  
-  </varlistentry>
-
-  <varlistentry><term><option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable></term>
-
-    <listitem><para>Set the Nix configuration option
-    <replaceable>name</replaceable> to <replaceable>value</replaceable>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--show-trace</option></term>
     <listitem>
-      <para>Causes Nix to print out a stack trace in case of Nix expression evaluation errors.</para>
+     <para>
+      It prompts you for a password for the root account (unless
+      <option>--no-root-passwd</option> is specified).
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--help</option></term>
+   </itemizedlist>
+  </para>
+  <para>
+   This command is idempotent: if it is interrupted or fails due to a temporary
+   problem (e.g. a network issue), you can safely re-run it.
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   This command accepts the following options:
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term><option>--root</option>
+    </term>
     <listitem>
-      <para>Synonym for <command>man nixos-install</command>.</para>
+     <para>
+      Defaults to <filename>/mnt</filename>. If this option is given, treat the
+      directory <replaceable>root</replaceable> as the root of the NixOS
+      installation.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>A typical NixOS installation is done by creating and mounting a
-file system on <filename>/mnt</filename>, generating a NixOS
-configuration in
-<filename>/mnt/etc/nixos/configuration.nix</filename>, and running
-<command>nixos-install</command>.  For instance, if we want to install
-NixOS on an <literal>ext4</literal> file system created in
-<filename>/dev/sda1</filename>:
-
+   </varlistentry>
+   <varlistentry>
+    <term><option>--system</option>
+    </term>
+    <listitem>
+     <para>
+      If this option is provided, <command>nixos-install</command> will install
+      the specified closure rather than attempt to build one from
+      <filename>/mnt/etc/nixos/configuration.nix</filename>.
+     </para>
+     <para>
+      The closure must be an appropriately configured NixOS system, with boot
+      loader and partition configuration that fits the target host. Such a
+      closure is typically obtained with a command such as <command>nix-build
+      -I nixos-config=./configuration.nix '&lt;nixos&gt;' -A system
+      --no-out-link</command>
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>-I</option>
+    </term>
+    <listitem>
+     <para>
+      Add a path to the Nix expression search path. This option may be given
+      multiple times. See the NIX_PATH environment variable for information on
+      the semantics of the Nix search path. Paths added through
+      <replaceable>-I</replaceable> take precedence over NIX_PATH.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--max-jobs</option>
+    </term>
+    <term><option>-j</option>
+    </term>
+    <listitem>
+     <para>
+      Sets the maximum number of build jobs that Nix will perform in parallel
+      to the specified number. The default is <literal>1</literal>. A higher
+      value is useful on SMP systems or to exploit I/O latency.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--cores</option>
+    </term>
+    <listitem>
+     <para>
+      Sets the value of the <envar>NIX_BUILD_CORES</envar> environment variable
+      in the invocation of builders. Builders can use this variable at their
+      discretion to control the maximum amount of parallelism. For instance, in
+      Nixpkgs, if the derivation attribute
+      <varname>enableParallelBuilding</varname> is set to
+      <literal>true</literal>, the builder passes the
+      <option>-j<replaceable>N</replaceable></option> flag to GNU Make. The
+      value <literal>0</literal> means that the builder should use all
+      available CPU cores in the system.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
+    </term>
+    <listitem>
+     <para>
+      Set the Nix configuration option <replaceable>name</replaceable> to
+      <replaceable>value</replaceable>.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--show-trace</option>
+    </term>
+    <listitem>
+     <para>
+      Causes Nix to print out a stack trace in case of Nix expression
+      evaluation errors.
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--help</option>
+    </term>
+    <listitem>
+     <para>
+      Synonym for <command>man nixos-install</command>.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Examples</title>
+  <para>
+   A typical NixOS installation is done by creating and mounting a file system
+   on <filename>/mnt</filename>, generating a NixOS configuration in
+   <filename>/mnt/etc/nixos/configuration.nix</filename>, and running
+   <command>nixos-install</command>. For instance, if we want to install NixOS
+   on an <literal>ext4</literal> file system created in
+   <filename>/dev/sda1</filename>:
 <screen>
 $ mkfs.ext4 /dev/sda1
 $ mount /dev/sda1 /mnt
@@ -204,9 +224,6 @@ $ # edit /mnt/etc/nixos/configuration.nix
 $ nixos-install
 $ reboot
 </screen>
-
-</para>
-
-</refsection>
-
+  </para>
+ </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index d2b2d5b7965c..c22c3811dedf 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -1,103 +1,96 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refmeta>
-  <refentrytitle><command>nixos-option</command></refentrytitle>
-  <manvolnum>8</manvolnum>
+ <refmeta>
+  <refentrytitle><command>nixos-option</command>
+  </refentrytitle><manvolnum>8</manvolnum>
   <refmiscinfo class="source">NixOS</refmiscinfo>
-  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
-</refmeta>
-
-<refnamediv>
-  <refname><command>nixos-option</command></refname>
-  <refpurpose>inspect a NixOS configuration</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nixos-option</command>
-    <arg>
-      <option>-I</option>
-      <replaceable>path</replaceable>
-    </arg>
-    <arg><option>--verbose</option></arg>
-    <arg><option>--xml</option></arg>
-    <arg choice="plain"><replaceable>option.name</replaceable></arg>
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+ </refmeta>
+ <refnamediv>
+  <refname><command>nixos-option</command>
+  </refname><refpurpose>inspect a NixOS configuration</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis><command>nixos-option</command>
+   <arg><option>-I</option><replaceable>path</replaceable>
+   </arg>
+   <arg><option>--verbose</option>
+   </arg>
+   <arg><option>--xml</option>
+   </arg>
+   <arg choice="plain"><replaceable>option.name</replaceable>
+   </arg>
   </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>This command evaluates the configuration specified in
-<filename>/etc/nixos/configuration.nix</filename> and returns the properties
-of the option name given as argument.</para>
-
-<para>When the option name is not an option, the command prints the list of
-attributes contained in the attribute set.</para>
-
-</refsection>
-
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>-I</option> <replaceable>path</replaceable></term>
+ </refsynopsisdiv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   This command evaluates the configuration specified in
+   <filename>/etc/nixos/configuration.nix</filename> and returns the properties
+   of the option name given as argument.
+  </para>
+  <para>
+   When the option name is not an option, the command prints the list of
+   attributes contained in the attribute set.
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   This command accepts the following options:
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term><option>-I</option><replaceable>path</replaceable>
+    </term>
     <listitem>
-      <para>
-        This option is passed to the underlying
-        <command>nix-instantiate</command> invocation.
-      </para>
+     <para>
+      This option is passed to the underlying
+      <command>nix-instantiate</command> invocation.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--verbose</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--verbose</option>
+    </term>
     <listitem>
-      <para>
-        This option enables verbose mode, which currently is just
-        the Bash <command>set</command> <option>-x</option> debug mode.
-      </para>
+     <para>
+      This option enables verbose mode, which currently is just the Bash
+      <command>set</command> <option>-x</option> debug mode.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--xml</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--xml</option>
+    </term>
     <listitem>
-      <para>
-        This option causes the output to be rendered as XML.
-      </para>
+     <para>
+      This option causes the output to be rendered as XML.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-<refsection><title>Environment</title>
-
-<variablelist>
-
-  <varlistentry>
-    <term><envar>NIXOS_CONFIG</envar></term>
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Environment</title>
+  <variablelist>
+   <varlistentry>
+    <term><envar>NIXOS_CONFIG</envar>
+    </term>
     <listitem>
-      <para>Path to the main NixOS configuration module.  Defaults to
-      <filename>/etc/nixos/configuration.nix</filename>.</para>
+     <para>
+      Path to the main NixOS configuration module. Defaults to
+      <filename>/etc/nixos/configuration.nix</filename>.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>Investigate option values:
-
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Examples</title>
+  <para>
+   Investigate option values:
 <screen>$ nixos-option boot.loader
 This attribute set contains:
 generationsDir
@@ -119,16 +112,14 @@ Declared by:
 
 Defined by:
   "/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix"
-</screen></para>
-
-</refsection>
-
-<refsection><title>Bugs</title>
-
-<para>The author listed in the following section is wrong.  If there is any
-  other bug, please report to Nicolas Pierron.</para>
-
-</refsection>
-
-
+</screen>
+  </para>
+ </refsection>
+ <refsection>
+  <title>Bugs</title>
+  <para>
+   The author listed in the following section is wrong. If there is any other
+   bug, please report to Nicolas Pierron.
+  </para>
+ </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index f74788353e67..e1a2c7108d18 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -1,399 +1,415 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refmeta>
-  <refentrytitle><command>nixos-rebuild</command></refentrytitle>
-  <manvolnum>8</manvolnum>
+ <refmeta>
+  <refentrytitle><command>nixos-rebuild</command>
+  </refentrytitle><manvolnum>8</manvolnum>
   <refmiscinfo class="source">NixOS</refmiscinfo>
-  <!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
-</refmeta>
-
-<refnamediv>
-  <refname><command>nixos-rebuild</command></refname>
-  <refpurpose>reconfigure a NixOS machine</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nixos-rebuild</command>
-    <group choice='req'>
-      <arg choice='plain'><option>switch</option></arg>
-      <arg choice='plain'><option>boot</option></arg>
-      <arg choice='plain'><option>test</option></arg>
-      <arg choice='plain'><option>build</option></arg>
-      <arg choice='plain'><option>dry-build</option></arg>
-      <arg choice='plain'><option>dry-activate</option></arg>
-      <arg choice='plain'><option>build-vm</option></arg>
-      <arg choice='plain'><option>build-vm-with-bootloader</option></arg>
-    </group>
-    <sbr />
-    <arg><option>--upgrade</option></arg>
-    <arg><option>--install-bootloader</option></arg>
-    <arg><option>--no-build-nix</option></arg>
-    <arg><option>--fast</option></arg>
-    <arg><option>--rollback</option></arg>
-    <sbr />
-    <arg>
-      <group choice='req'>
-        <arg choice='plain'><option>--profile-name</option></arg>
-        <arg choice='plain'><option>-p</option></arg>
-      </group>
-      <replaceable>name</replaceable>
+<!-- <refmiscinfo class="version"><xi:include href="version.txt" parse="text"/></refmiscinfo> -->
+ </refmeta>
+ <refnamediv>
+  <refname><command>nixos-rebuild</command>
+  </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis><command>nixos-rebuild</command><group choice='req'>
+   <arg choice='plain'><option>switch</option>
+   </arg>
+   <arg choice='plain'><option>boot</option>
+   </arg>
+   <arg choice='plain'><option>test</option>
+   </arg>
+   <arg choice='plain'><option>build</option>
+   </arg>
+   <arg choice='plain'><option>dry-build</option>
+   </arg>
+   <arg choice='plain'><option>dry-activate</option>
+   </arg>
+   <arg choice='plain'><option>build-vm</option>
+   </arg>
+   <arg choice='plain'><option>build-vm-with-bootloader</option>
+   </arg></group>
+   <sbr />
+   <arg><option>--upgrade</option>
+   </arg>
+   <arg><option>--install-bootloader</option>
+   </arg>
+   <arg><option>--no-build-nix</option>
+   </arg>
+   <arg><option>--fast</option>
+   </arg>
+   <arg><option>--rollback</option>
+   </arg>
+   <sbr />
+   <arg><group choice='req'>
+    <arg choice='plain'><option>--profile-name</option>
     </arg>
-    <sbr />
-    <arg><option>--show-trace</option></arg>
+    <arg choice='plain'><option>-p</option>
+    </arg></group><replaceable>name</replaceable>
+   </arg>
+   <sbr />
+   <arg><option>--show-trace</option>
+   </arg>
   </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>This command updates the system so that it corresponds to the
-configuration specified in
-<filename>/etc/nixos/configuration.nix</filename>.  Thus, every time
-you modify <filename>/etc/nixos/configuration.nix</filename> or any
-NixOS module, you must run <command>nixos-rebuild</command> to make
-the changes take effect.  It builds the new system in
-<filename>/nix/store</filename>, runs its activation script, and stop
-and (re)starts any system services if needed.</para>
-
-<para>This command has one required argument, which specifies the
-desired operation.  It must be one of the following:
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>switch</option></term>
-    <listitem>
-      <para>Build and activate the new configuration, and make it the
-      boot default.  That is, the configuration is added to the GRUB
-      boot menu as the default menu entry, so that subsequent reboots
-      will boot the system into the new configuration.  Previous
-      configurations activated with <command>nixos-rebuild
-      switch</command> or <command>nixos-rebuild boot</command> remain
-      available in the GRUB menu.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>boot</option></term>
-    <listitem>
-      <para>Build the new configuration and make it the boot default
-      (as with <command>nixos-rebuild switch</command>), but do not
-      activate it.  That is, the system continues to run the previous
-      configuration until the next reboot.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>test</option></term>
-    <listitem>
-      <para>Build and activate the new configuration, but do not add
-      it to the GRUB boot menu.  Thus, if you reboot the system (or if
-      it crashes), you will automatically revert to the default
-      configuration (i.e. the configuration resulting from the last
-      call to <command>nixos-rebuild switch</command> or
-      <command>nixos-rebuild boot</command>).</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>build</option></term>
-    <listitem>
-      <para>Build the new configuration, but neither activate it nor
-      add it to the GRUB boot menu.  It leaves a symlink named
-      <filename>result</filename> in the current directory, which
-      points to the output of the top-level “system” derivation.  This
-      is essentially the same as doing
+ </refsynopsisdiv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   This command updates the system so that it corresponds to the configuration
+   specified in <filename>/etc/nixos/configuration.nix</filename>. Thus, every
+   time you modify <filename>/etc/nixos/configuration.nix</filename> or any
+   NixOS module, you must run <command>nixos-rebuild</command> to make the
+   changes take effect. It builds the new system in
+   <filename>/nix/store</filename>, runs its activation script, and stop and
+   (re)starts any system services if needed.
+  </para>
+  <para>
+   This command has one required argument, which specifies the desired
+   operation. It must be one of the following:
+   <variablelist>
+    <varlistentry>
+     <term><option>switch</option>
+     </term>
+     <listitem>
+      <para>
+       Build and activate the new configuration, and make it the boot default.
+       That is, the configuration is added to the GRUB boot menu as the default
+       menu entry, so that subsequent reboots will boot the system into the new
+       configuration. Previous configurations activated with
+       <command>nixos-rebuild switch</command> or <command>nixos-rebuild
+       boot</command> remain available in the GRUB menu.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>boot</option>
+     </term>
+     <listitem>
+      <para>
+       Build the new configuration and make it the boot default (as with
+       <command>nixos-rebuild switch</command>), but do not activate it. That
+       is, the system continues to run the previous configuration until the
+       next reboot.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>test</option>
+     </term>
+     <listitem>
+      <para>
+       Build and activate the new configuration, but do not add it to the GRUB
+       boot menu. Thus, if you reboot the system (or if it crashes), you will
+       automatically revert to the default configuration (i.e. the
+       configuration resulting from the last call to <command>nixos-rebuild
+       switch</command> or <command>nixos-rebuild boot</command>).
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>build</option>
+     </term>
+     <listitem>
+      <para>
+       Build the new configuration, but neither activate it nor add it to the
+       GRUB boot menu. It leaves a symlink named <filename>result</filename> in
+       the current directory, which points to the output of the top-level
+       “system” derivation. This is essentially the same as doing
 <screen>
 $ nix-build /path/to/nixpkgs/nixos -A system
 </screen>
-      Note that you do not need to be <literal>root</literal> to run
-      <command>nixos-rebuild build</command>.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>dry-build</option></term>
-    <listitem>
-      <para>Show what store paths would be built or downloaded by any
-      of the operations above, but otherwise do nothing.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>dry-activate</option></term>
-    <listitem>
-      <para>Build the new configuration, but instead of activating it,
-      show what changes would be performed by the activation (i.e. by
-      <command>nixos-rebuild test</command>). For
-      instance, this command will print which systemd units would be
-      restarted. The list of changes is not guaranteed to be
-      complete.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>build-vm</option></term>
-    <listitem>
-      <para>Build a script that starts a NixOS virtual machine with
-      the desired configuration.  It leaves a symlink
-      <filename>result</filename> in the current directory that points
-      (under
-      <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>)
-      at the script that starts the VM.  Thus, to test a NixOS
-      configuration in a virtual machine, you should do the following:
+       Note that you do not need to be <literal>root</literal> to run
+       <command>nixos-rebuild build</command>.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>dry-build</option>
+     </term>
+     <listitem>
+      <para>
+       Show what store paths would be built or downloaded by any of the
+       operations above, but otherwise do nothing.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>dry-activate</option>
+     </term>
+     <listitem>
+      <para>
+       Build the new configuration, but instead of activating it, show what
+       changes would be performed by the activation (i.e. by
+       <command>nixos-rebuild test</command>). For instance, this command will
+       print which systemd units would be restarted. The list of changes is not
+       guaranteed to be complete.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>build-vm</option>
+     </term>
+     <listitem>
+      <para>
+       Build a script that starts a NixOS virtual machine with the desired
+       configuration. It leaves a symlink <filename>result</filename> in the
+       current directory that points (under
+       <filename>result/bin/run-<replaceable>hostname</replaceable>-vm</filename>)
+       at the script that starts the VM. Thus, to test a NixOS configuration in
+       a virtual machine, you should do the following:
 <screen>
 $ nixos-rebuild build-vm
 $ ./result/bin/run-*-vm
-</screen></para>
-
-      <para>The VM is implemented using the <literal>qemu</literal>
-      package.  For best performance, you should load the
-      <literal>kvm-intel</literal> or <literal>kvm-amd</literal>
-      kernel modules to get hardware virtualisation.</para>
-
-      <para>The VM mounts the Nix store of the host through the 9P
-      file system.  The host Nix store is read-only, so Nix commands
-      that modify the Nix store will not work in the VM.  This
-      includes commands such as <command>nixos-rebuild</command>; to
-      change the VM’s configuration, you must halt the VM and re-run
-      the commands above.
+</screen>
       </para>
-
-      <para>The VM has its own <literal>ext3</literal> root file
-      system, which is automatically created when the VM is first
-      started, and is persistent across reboots of the VM.  It is
-      stored in
-      <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
-      <!-- The entire file system hierarchy of the host is available in
-      the VM under <filename>/hostfs</filename>.--></para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>build-vm-with-bootloader</option></term>
-    <listitem>
-      <para>Like <option>build-vm</option>, but boots using the
-      regular boot loader of your configuration (e.g., GRUB 1 or 2),
-      rather than booting directly into the kernel and initial ramdisk
-      of the system.  This allows you to test whether the boot loader
-      works correctly.  However, it does not guarantee that your NixOS
-      configuration will boot successfully on the host hardware (i.e.,
-      after running <command>nixos-rebuild switch</command>), because
-      the hardware and boot loader configuration in the VM are
-      different.  The boot loader is installed on an automatically
-      generated virtual disk containing a <filename>/boot</filename>
-      partition, which is mounted read-only in the VM.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--upgrade</option></term>
-    <listitem>
-      <para>Fetch the latest version of NixOS from the NixOS
-      channel.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--install-bootloader</option></term>
-    <listitem>
-      <para>Causes the boot loader to be (re)installed on the
-      device specified by the relevant configuration options.
+      <para>
+       The VM is implemented using the <literal>qemu</literal> package. For
+       best performance, you should load the <literal>kvm-intel</literal> or
+       <literal>kvm-amd</literal> kernel modules to get hardware
+       virtualisation.
       </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--no-build-nix</option></term>
+      <para>
+       The VM mounts the Nix store of the host through the 9P file system. The
+       host Nix store is read-only, so Nix commands that modify the Nix store
+       will not work in the VM. This includes commands such as
+       <command>nixos-rebuild</command>; to change the VM’s configuration,
+       you must halt the VM and re-run the commands above.
+      </para>
+      <para>
+       The VM has its own <literal>ext3</literal> root file system, which is
+       automatically created when the VM is first started, and is persistent
+       across reboots of the VM. It is stored in
+       <literal>./<replaceable>hostname</replaceable>.qcow2</literal>.
+<!-- The entire file system hierarchy of the host is available in
+      the VM under <filename>/hostfs</filename>.-->
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><option>build-vm-with-bootloader</option>
+     </term>
+     <listitem>
+      <para>
+       Like <option>build-vm</option>, but boots using the regular boot loader
+       of your configuration (e.g., GRUB 1 or 2), rather than booting directly
+       into the kernel and initial ramdisk of the system. This allows you to
+       test whether the boot loader works correctly. However, it does not
+       guarantee that your NixOS configuration will boot successfully on the
+       host hardware (i.e., after running <command>nixos-rebuild
+       switch</command>), because the hardware and boot loader configuration in
+       the VM are different. The boot loader is installed on an automatically
+       generated virtual disk containing a <filename>/boot</filename>
+       partition, which is mounted read-only in the VM.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   This command accepts the following options:
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term><option>--upgrade</option>
+    </term>
     <listitem>
-      <para>Normally, <command>nixos-rebuild</command> first builds
-      the <varname>nixUnstable</varname> attribute in Nixpkgs, and
-      uses the resulting instance of the Nix package manager to build
-      the new system configuration.  This is necessary if the NixOS
-      modules use features not provided by the currently installed
-      version of Nix.  This option disables building a new Nix.</para>
+     <para>
+      Fetch the latest version of NixOS from the NixOS channel.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--fast</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--install-bootloader</option>
+    </term>
     <listitem>
-      <para>Equivalent to <option>--no-build-nix</option>
-      <option>--show-trace</option>.  This option is useful if you
-      call <command>nixos-rebuild</command> frequently (e.g. if you’re
-      hacking on a NixOS module).</para>
+     <para>
+      Causes the boot loader to be (re)installed on the device specified by the
+      relevant configuration options.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--rollback</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--no-build-nix</option>
+    </term>
     <listitem>
-      <para>Instead of building a new configuration as specified by
-      <filename>/etc/nixos/configuration.nix</filename>, roll back to
-      the previous configuration.  (The previous configuration is
-      defined as the one before the “current” generation of the
-      Nix profile <filename>/nix/var/nix/profiles/system</filename>.)</para>
+     <para>
+      Normally, <command>nixos-rebuild</command> first builds the
+      <varname>nixUnstable</varname> attribute in Nixpkgs, and uses the
+      resulting instance of the Nix package manager to build the new system
+      configuration. This is necessary if the NixOS modules use features not
+      provided by the currently installed version of Nix. This option disables
+      building a new Nix.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--profile-name</option></term>
-    <term><option>-p</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--fast</option>
+    </term>
     <listitem>
-      <para>Instead of using the Nix profile
-      <filename>/nix/var/nix/profiles/system</filename> to keep track
-      of the current and previous system configurations, use
+     <para>
+      Equivalent to <option>--no-build-nix</option>
+      <option>--show-trace</option>. This option is useful if you call
+      <command>nixos-rebuild</command> frequently (e.g. if you’re hacking on
+      a NixOS module).
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--rollback</option>
+    </term>
+    <listitem>
+     <para>
+      Instead of building a new configuration as specified by
+      <filename>/etc/nixos/configuration.nix</filename>, roll back to the
+      previous configuration. (The previous configuration is defined as the one
+      before the “current” generation of the Nix profile
+      <filename>/nix/var/nix/profiles/system</filename>.)
+     </para>
+    </listitem>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--profile-name</option>
+    </term>
+    <term><option>-p</option>
+    </term>
+    <listitem>
+     <para>
+      Instead of using the Nix profile
+      <filename>/nix/var/nix/profiles/system</filename> to keep track of the
+      current and previous system configurations, use
       <filename>/nix/var/nix/profiles/system-profiles/<replaceable>name</replaceable></filename>.
-      When you use GRUB 2, for every system profile created with this
-      flag, NixOS will create a submenu named “NixOS - Profile
-      '<replaceable>name</replaceable>'” in GRUB’s boot menu,
-      containing the current and previous configurations of this
-      profile.</para>
-
-      <para>For instance, if you want to test a configuration file
-      named <filename>test.nix</filename> without affecting the
-      default system profile, you would do:
-
+      When you use GRUB 2, for every system profile created with this flag,
+      NixOS will create a submenu named “NixOS - Profile
+      '<replaceable>name</replaceable>'” in GRUB’s boot menu, containing
+      the current and previous configurations of this profile.
+     </para>
+     <para>
+      For instance, if you want to test a configuration file named
+      <filename>test.nix</filename> without affecting the default system
+      profile, you would do:
 <screen>
 $ nixos-rebuild switch -p test -I nixos-config=./test.nix
 </screen>
-
-      The new configuration will appear in the GRUB 2 submenu “NixOS - Profile
-      'test'”.</para>
+      The new configuration will appear in the GRUB 2 submenu “NixOS -
+      Profile 'test'”.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--build-host</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--build-host</option>
+    </term>
     <listitem>
-      <para>Instead of building the new configuration locally, use the
-      specified host to perform the build. The host needs to be accessible
-      with ssh, and must be able to perform Nix builds. If the option
+     <para>
+      Instead of building the new configuration locally, use the specified host
+      to perform the build. The host needs to be accessible with ssh, and must
+      be able to perform Nix builds. If the option
       <option>--target-host</option> is not set, the build will be copied back
-      to the local machine when done.</para>
-
-      <para>Note that, if <option>--no-build-nix</option> is not specified,
-      Nix will be built both locally and remotely. This is because the
-      configuration will always be evaluated locally even though the building
-      might be performed remotely.</para>
-
-      <para>You can include a remote user name in
-      the host name (<replaceable>user@host</replaceable>). You can also set
-      ssh options by defining the <envar>NIX_SSHOPTS</envar> environment
-      variable.</para>
+      to the local machine when done.
+     </para>
+     <para>
+      Note that, if <option>--no-build-nix</option> is not specified, Nix will
+      be built both locally and remotely. This is because the configuration
+      will always be evaluated locally even though the building might be
+      performed remotely.
+     </para>
+     <para>
+      You can include a remote user name in the host name
+      (<replaceable>user@host</replaceable>). You can also set ssh options by
+      defining the <envar>NIX_SSHOPTS</envar> environment variable.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><option>--target-host</option></term>
+   </varlistentry>
+   <varlistentry>
+    <term><option>--target-host</option>
+    </term>
     <listitem>
-      <para>Specifies the NixOS target host. By setting this to something other
-      than <replaceable>localhost</replaceable>, the system activation will
-      happen on the remote host instead of the local machine. The remote host
-      needs to be accessible over ssh, and for the commands
-      <option>switch</option>, <option>boot</option> and <option>test</option>
-      you need root access.</para>
-
-      <para>If <option>--build-host</option> is not explicitly
-      specified, <option>--build-host</option> will implicitly be set to the
-      same value as <option>--target-host</option>. So, if you only specify
+     <para>
+      Specifies the NixOS target host. By setting this to something other than
+      <replaceable>localhost</replaceable>, the system activation will happen
+      on the remote host instead of the local machine. The remote host needs to
+      be accessible over ssh, and for the commands <option>switch</option>,
+      <option>boot</option> and <option>test</option> you need root access.
+     </para>
+     <para>
+      If <option>--build-host</option> is not explicitly specified,
+      <option>--build-host</option> will implicitly be set to the same value as
+      <option>--target-host</option>. So, if you only specify
       <option>--target-host</option> both building and activation will take
       place remotely (and no build artifacts will be copied to the local
-      machine).</para>
-
-      <para>You can include a remote user name in
-      the host name (<replaceable>user@host</replaceable>). You can also set
-      ssh options by defining the <envar>NIX_SSHOPTS</envar> environment
-      variable.</para>
+      machine).
+     </para>
+     <para>
+      You can include a remote user name in the host name
+      (<replaceable>user@host</replaceable>). You can also set ssh options by
+      defining the <envar>NIX_SSHOPTS</envar> environment variable.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-<para>In addition, <command>nixos-rebuild</command> accepts various
-Nix-related flags, including <option>--max-jobs</option> /
-<option>-j</option>, <option>--show-trace</option>,
-<option>--keep-failed</option>, <option>--keep-going</option> and
-<option>--verbose</option> / <option>-v</option>.  See
-the Nix manual for details.</para>
-
-</refsection>
-
-
-<refsection><title>Environment</title>
-
-<variablelist>
-
-  <varlistentry>
-    <term><envar>NIXOS_CONFIG</envar></term>
+   </varlistentry>
+  </variablelist>
+  <para>
+   In addition, <command>nixos-rebuild</command> accepts various Nix-related
+   flags, including <option>--max-jobs</option> / <option>-j</option>,
+   <option>--show-trace</option>, <option>--keep-failed</option>,
+   <option>--keep-going</option> and <option>--verbose</option> /
+   <option>-v</option>. See the Nix manual for details.
+  </para>
+ </refsection>
+ <refsection>
+  <title>Environment</title>
+  <variablelist>
+   <varlistentry>
+    <term><envar>NIXOS_CONFIG</envar>
+    </term>
     <listitem>
-      <para>Path to the main NixOS configuration module.  Defaults to
-      <filename>/etc/nixos/configuration.nix</filename>.</para>
+     <para>
+      Path to the main NixOS configuration module. Defaults to
+      <filename>/etc/nixos/configuration.nix</filename>.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry><term><envar>NIX_SSHOPTS</envar></term>
-
-    <listitem><para>Additional options to be passed to
-    <command>ssh</command> on the command line.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Files</title>
-
-<variablelist>
-
-  <varlistentry>
-    <term><filename>/run/current-system</filename></term>
+   </varlistentry>
+   <varlistentry>
+    <term><envar>NIX_SSHOPTS</envar>
+    </term>
     <listitem>
-      <para>A symlink to the currently active system configuration in
-      the Nix store.</para>
+     <para>
+      Additional options to be passed to <command>ssh</command> on the command
+      line.
+     </para>
     </listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><filename>/nix/var/nix/profiles/system</filename></term>
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Files</title>
+  <variablelist>
+   <varlistentry>
+    <term><filename>/run/current-system</filename>
+    </term>
     <listitem>
-      <para>The Nix profile that contains the current and previous
-      system configurations.  Used to generate the GRUB boot
-      menu.</para>
+     <para>
+      A symlink to the currently active system configuration in the Nix store.
+     </para>
     </listitem>
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Bugs</title>
-
-<para>This command should be renamed to something more
-descriptive.</para>
-
-</refsection>
-
-
-
+   </varlistentry>
+   <varlistentry>
+    <term><filename>/nix/var/nix/profiles/system</filename>
+    </term>
+    <listitem>
+     <para>
+      The Nix profile that contains the current and previous system
+      configurations. Used to generate the GRUB boot menu.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsection>
+ <refsection>
+  <title>Bugs</title>
+  <para>
+   This command should be renamed to something more descriptive.
+  </para>
+ </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml
index 615d74f90908..c173bce19136 100644
--- a/nixos/doc/manual/man-nixos-version.xml
+++ b/nixos/doc/manual/man-nixos-version.xml
@@ -1,97 +1,102 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
           xmlns:xlink="http://www.w3.org/1999/xlink"
           xmlns:xi="http://www.w3.org/2001/XInclude">
-
-<refmeta>
-  <refentrytitle><command>nixos-version</command></refentrytitle>
-  <manvolnum>8</manvolnum>
+ <refmeta>
+  <refentrytitle><command>nixos-version</command>
+  </refentrytitle><manvolnum>8</manvolnum>
   <refmiscinfo class="source">NixOS</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname><command>nixos-version</command></refname>
-  <refpurpose>show the NixOS version</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nixos-version</command>
-    <arg><option>--hash</option></arg>
-    <arg><option>--revision</option></arg>
+ </refmeta>
+ <refnamediv>
+  <refname><command>nixos-version</command>
+  </refname><refpurpose>show the NixOS version</refpurpose>
+ </refnamediv>
+ <refsynopsisdiv>
+  <cmdsynopsis><command>nixos-version</command>
+   <arg><option>--hash</option>
+   </arg>
+   <arg><option>--revision</option>
+   </arg>
   </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>This command shows the version of the currently active NixOS
-configuration. For example:
-
+ </refsynopsisdiv>
+ <refsection>
+  <title>Description</title>
+  <para>
+   This command shows the version of the currently active NixOS configuration.
+   For example:
 <screen>$ nixos-version
 16.03.1011.6317da4 (Emu)
 </screen>
-
-The version consists of the following elements:
-
-<variablelist>
-
-  <varlistentry>
-    <term><literal>16.03</literal></term>
-    <listitem><para>The NixOS release, indicating the year and month
-    in which it was released (e.g. March 2016).</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><literal>1011</literal></term>
-    <listitem><para>The number of commits in the Nixpkgs Git
-    repository between the start of the release branch and the commit
-    from which this version was built. This ensures that NixOS
-    versions are monotonically increasing. It is
-    <literal>git</literal> when the current NixOS configuration was
-    built from a checkout of the Nixpkgs Git repository rather than
-    from a NixOS channel.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><literal>6317da4</literal></term>
-    <listitem><para>The first 7 characters of the commit in the
-    Nixpkgs Git repository from which this version was
-    built.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><literal>Emu</literal></term>
-    <listitem><para>The code name of the NixOS release. The first
-    letter of the code name indicates that this is the N'th stable
-    NixOS release; for example, Emu is the fifth
-    release.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<para>This command accepts the following options:</para>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--hash</option></term>
-    <term><option>--revision</option></term>
+   The version consists of the following elements:
+   <variablelist>
+    <varlistentry>
+     <term><literal>16.03</literal>
+     </term>
+     <listitem>
+      <para>
+       The NixOS release, indicating the year and month in which it was
+       released (e.g. March 2016).
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><literal>1011</literal>
+     </term>
+     <listitem>
+      <para>
+       The number of commits in the Nixpkgs Git repository between the start of
+       the release branch and the commit from which this version was built.
+       This ensures that NixOS versions are monotonically increasing. It is
+       <literal>git</literal> when the current NixOS configuration was built
+       from a checkout of the Nixpkgs Git repository rather than from a NixOS
+       channel.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><literal>6317da4</literal>
+     </term>
+     <listitem>
+      <para>
+       The first 7 characters of the commit in the Nixpkgs Git repository from
+       which this version was built.
+      </para>
+     </listitem>
+    </varlistentry>
+    <varlistentry>
+     <term><literal>Emu</literal>
+     </term>
+     <listitem>
+      <para>
+       The code name of the NixOS release. The first letter of the code name
+       indicates that this is the N'th stable NixOS release; for example, Emu
+       is the fifth release.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+ </refsection>
+ <refsection>
+  <title>Options</title>
+  <para>
+   This command accepts the following options:
+  </para>
+  <variablelist>
+   <varlistentry>
+    <term><option>--hash</option>
+    </term>
+    <term><option>--revision</option>
+    </term>
     <listitem>
-      <para>Show the full SHA1 hash of the Git commit from which this
-      configuration was built, e.g.
+     <para>
+      Show the full SHA1 hash of the Git commit from which this configuration
+      was built, e.g.
 <screen>$ nixos-version --hash
 6317da40006f6bc2480c6781999c52d88dde2acf
 </screen>
-      </para>
+     </para>
     </listitem>
-  </varlistentry>
-</variablelist>
-
-</refsection>
+   </varlistentry>
+  </variablelist>
+ </refsection>
 </refentry>
diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml
index 80a8458fbfec..0390dda6468f 100644
--- a/nixos/doc/manual/man-pages.xml
+++ b/nixos/doc/manual/man-pages.xml
@@ -1,33 +1,20 @@
 <reference xmlns="http://docbook.org/ns/docbook"
            xmlns:xlink="http://www.w3.org/1999/xlink"
            xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <title>NixOS Reference Pages</title>
-
-  <info>
-
-    <author>
-      <personname>
-        <firstname>Eelco</firstname>
-        <surname>Dolstra</surname>
-      </personname>
-      <contrib>Author</contrib>
-    </author>
-
-    <copyright>
-      <year>2007-2018</year>
-      <holder>Eelco Dolstra</holder>
-    </copyright>
-
-  </info>
-
-  <xi:include href="man-configuration.xml" />
-  <xi:include href="man-nixos-build-vms.xml" />
-  <xi:include href="man-nixos-generate-config.xml" />
-  <xi:include href="man-nixos-install.xml" />
-  <xi:include href="man-nixos-enter.xml" />
-  <xi:include href="man-nixos-option.xml" />
-  <xi:include href="man-nixos-rebuild.xml" />
-  <xi:include href="man-nixos-version.xml" />
-
+ <title>NixOS Reference Pages</title>
+ <info>
+  <author><personname><firstname>Eelco</firstname><surname>Dolstra</surname></personname>
+   <contrib>Author</contrib>
+  </author>
+  <copyright><year>2007-2018</year><holder>Eelco Dolstra</holder>
+  </copyright>
+ </info>
+ <xi:include href="man-configuration.xml" />
+ <xi:include href="man-nixos-build-vms.xml" />
+ <xi:include href="man-nixos-generate-config.xml" />
+ <xi:include href="man-nixos-install.xml" />
+ <xi:include href="man-nixos-enter.xml" />
+ <xi:include href="man-nixos-option.xml" />
+ <xi:include href="man-nixos-rebuild.xml" />
+ <xi:include href="man-nixos-version.xml" />
 </reference>
diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml
index 676924e5c8b2..61b21203f500 100644
--- a/nixos/doc/manual/manual.xml
+++ b/nixos/doc/manual/manual.xml
@@ -3,46 +3,46 @@
       xmlns:xi="http://www.w3.org/2001/XInclude"
       version="5.0"
       xml:id="book-nixos-manual">
-
-  <info>
-    <title>NixOS Manual</title>
-    <subtitle>Version <xi:include href="./generated/version" parse="text" /></subtitle>
-  </info>
-
-  <preface>
-    <title>Preface</title>
-
-    <para>This manual describes how to install, use and extend NixOS,
-    a Linux distribution based on the purely functional package
-    management system Nix.</para>
-
-    <para>If you encounter problems, please report them on the
-    <literal
+ <info>
+  <title>NixOS Manual</title>
+  <subtitle>Version <xi:include href="./generated/version" parse="text" />
+  </subtitle>
+ </info>
+ <preface>
+  <title>Preface</title>
+  <para>
+   This manual describes how to install, use and extend NixOS, a Linux
+   distribution based on the purely functional package management system Nix.
+  </para>
+  <para>
+   If you encounter problems, please report them on the
+   <literal
     xlink:href="https://groups.google.com/forum/#!forum/nix-devel">nix-devel</literal>
-    mailing list or on the <link
+   mailing list or on the <link
     xlink:href="irc://irc.freenode.net/#nixos">
-    <literal>#nixos</literal> channel on Freenode</link>.  Bugs should
-    be reported in <link
-    xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’ GitHub
-    issue tracker</link>.</para>
-
-    <note><para>Commands prefixed with <literal>#</literal> have to be run as
-    root, either requiring to login as root user or temporarily switching
-    to it using <literal>sudo</literal> for example.</para></note>
-  </preface>
-
-  <xi:include href="installation/installation.xml" />
-  <xi:include href="configuration/configuration.xml" />
-  <xi:include href="administration/running.xml" />
-  <!-- <xi:include href="userconfiguration.xml" /> -->
-  <xi:include href="development/development.xml" />
-
-  <appendix xml:id="ch-options">
-    <title>Configuration Options</title>
-    <xi:include href="./generated/options-db.xml"
+   <literal>#nixos</literal> channel on Freenode</link>. Bugs should be
+   reported in
+   <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues">NixOS’
+   GitHub issue tracker</link>.
+  </para>
+  <note>
+   <para>
+    Commands prefixed with <literal>#</literal> have to be run as root, either
+    requiring to login as root user or temporarily switching to it using
+    <literal>sudo</literal> for example.
+   </para>
+  </note>
+ </preface>
+ <xi:include href="installation/installation.xml" />
+ <xi:include href="configuration/configuration.xml" />
+ <xi:include href="administration/running.xml" />
+<!-- <xi:include href="userconfiguration.xml" /> -->
+ <xi:include href="development/development.xml" />
+ <appendix xml:id="ch-options">
+  <title>Configuration Options</title>
+  <xi:include href="./generated/options-db.xml"
                 xpointer="configuration-variable-list" />
-  </appendix>
-
-  <xi:include href="release-notes/release-notes.xml" />
-
+ </appendix>
+ <xi:include href="release-notes/release-notes.xml" />
 </book>
diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index b7f9fab44f3b..94f176186b6e 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -3,21 +3,19 @@
           xmlns:xi="http://www.w3.org/2001/XInclude"
           version="5.0"
           xml:id="ch-release-notes">
-
-<title>Release Notes</title>
-
-<para>This section lists the release notes for each stable version of NixOS
-and current unstable revision.</para>
-
-<xi:include href="rl-1809.xml" />
-<xi:include href="rl-1803.xml" />
-<xi:include href="rl-1709.xml" />
-<xi:include href="rl-1703.xml" />
-<xi:include href="rl-1609.xml" />
-<xi:include href="rl-1603.xml" />
-<xi:include href="rl-1509.xml" />
-<xi:include href="rl-1412.xml" />
-<xi:include href="rl-1404.xml" />
-<xi:include href="rl-1310.xml" />
-
+ <title>Release Notes</title>
+ <para>
+  This section lists the release notes for each stable version of NixOS and
+  current unstable revision.
+ </para>
+ <xi:include href="rl-1809.xml" />
+ <xi:include href="rl-1803.xml" />
+ <xi:include href="rl-1709.xml" />
+ <xi:include href="rl-1703.xml" />
+ <xi:include href="rl-1609.xml" />
+ <xi:include href="rl-1603.xml" />
+ <xi:include href="rl-1509.xml" />
+ <xi:include href="rl-1412.xml" />
+ <xi:include href="rl-1404.xml" />
+ <xi:include href="rl-1310.xml" />
 </appendix>
diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixos/doc/manual/release-notes/rl-1310.xml
index 583912d70738..248bab70c36b 100644
--- a/nixos/doc/manual/release-notes/rl-1310.xml
+++ b/nixos/doc/manual/release-notes/rl-1310.xml
@@ -3,9 +3,9 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-13.10">
+ <title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
 
-<title>Release 13.10 (“Aardvark”, 2013/10/31)</title>
-
-<para>This is the first stable release branch of NixOS.</para>
-
+ <para>
+  This is the first stable release branch of NixOS.
+ </para>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml
index 137caf14cba2..8d8cea4303a3 100644
--- a/nixos/doc/manual/release-notes/rl-1404.xml
+++ b/nixos/doc/manual/release-notes/rl-1404.xml
@@ -3,158 +3,177 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-14.04">
+ <title>Release 14.04 (“Baboon”, 2014/04/30)</title>
 
-<title>Release 14.04 (“Baboon”, 2014/04/30)</title>
-
-<para>This is the second stable release branch of NixOS.  In addition
-to numerous new and upgraded packages and modules, this release has
-the following highlights:
-
-<itemizedlist>
-
-  <listitem><para>Installation on UEFI systems is now supported.  See
-  <xref linkend="sec-installation"/> for
-  details.</para></listitem>
-
-  <listitem><para>Systemd has been updated to version 212, which has
-  <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous
-  improvements</link>. NixOS now automatically starts systemd user
-  instances when you log in. You can define global user units through
-  the <option>systemd.unit.*</option> options.</para></listitem>
-
-  <listitem><para>NixOS is now based on Glibc 2.19 and GCC
-  4.8.</para></listitem>
-
-  <listitem><para>The default Linux kernel has been updated to
-  3.12.</para></listitem>
-
-  <listitem><para>KDE has been updated to 4.12.</para></listitem>
-
-  <listitem><para>GNOME 3.10 experimental support has been added.</para></listitem>
-
-  <listitem><para>Nix has been updated to 1.7 (<link
-  xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>).</para></listitem>
-
-  <listitem><para>NixOS now supports fully declarative management of
-  users and groups. If you set <option>users.mutableUsers</option> to
-  <literal>false</literal>, then the contents of
-  <filename>/etc/passwd</filename> and <filename>/etc/group</filename>
-  will be <link
+ <para>
+  This is the second stable release branch of NixOS. In addition to numerous
+  new and upgraded packages and modules, this release has the following
+  highlights:
+  <itemizedlist>
+   <listitem>
+    <para>
+     Installation on UEFI systems is now supported. See
+     <xref linkend="sec-installation"/> for details.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Systemd has been updated to version 212, which has
+     <link xlink:href="http://cgit.freedesktop.org/systemd/systemd/plain/NEWS?id=v212">numerous
+     improvements</link>. NixOS now automatically starts systemd user instances
+     when you log in. You can define global user units through the
+     <option>systemd.unit.*</option> options.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     NixOS is now based on Glibc 2.19 and GCC 4.8.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The default Linux kernel has been updated to 3.12.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     KDE has been updated to 4.12.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     GNOME 3.10 experimental support has been added.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Nix has been updated to 1.7
+     (<link
+  xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.7">details</link>).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     NixOS now supports fully declarative management of users and groups. If
+     you set <option>users.mutableUsers</option> to <literal>false</literal>,
+     then the contents of <filename>/etc/passwd</filename> and
+     <filename>/etc/group</filename> will be
+     <link
   xlink:href="https://www.usenix.org/legacy/event/lisa02/tech/full_papers/traugott/traugott_html/">congruent</link>
-  to your NixOS configuration. For instance, if you remove a user from
-  <option>users.extraUsers</option> and run
-  <command>nixos-rebuild</command>, the user account will cease to
-  exist. Also, imperative commands for managing users and groups, such
-  as <command>useradd</command>, are no longer available. If
-  <option>users.mutableUsers</option> is <literal>true</literal> (the
-  default), then behaviour is unchanged from NixOS
-  13.10.</para></listitem>
-
-  <listitem><para>NixOS now has basic container support, meaning you
-  can easily run a NixOS instance as a container in a NixOS host
-  system. These containers are suitable for testing and
-  experimentation but not production use, since they’re not fully
-  isolated from the host. See <xref linkend="ch-containers"/> for
-  details.</para></listitem>
-
-  <listitem><para>Systemd units provided by packages can now be
-  overridden from the NixOS configuration. For instance, if a package
-  <literal>foo</literal> provides systemd units, you can say:
-
+     to your NixOS configuration. For instance, if you remove a user from
+     <option>users.extraUsers</option> and run
+     <command>nixos-rebuild</command>, the user account will cease to exist.
+     Also, imperative commands for managing users and groups, such as
+     <command>useradd</command>, are no longer available. If
+     <option>users.mutableUsers</option> is <literal>true</literal> (the
+     default), then behaviour is unchanged from NixOS 13.10.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     NixOS now has basic container support, meaning you can easily run a NixOS
+     instance as a container in a NixOS host system. These containers are
+     suitable for testing and experimentation but not production use, since
+     they’re not fully isolated from the host. See
+     <xref linkend="ch-containers"/> for details.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Systemd units provided by packages can now be overridden from the NixOS
+     configuration. For instance, if a package <literal>foo</literal> provides
+     systemd units, you can say:
 <programlisting>
 systemd.packages = [ pkgs.foo ];
 </programlisting>
-
-  to enable those units. You can then set or override unit options in
-  the usual way, e.g.
-
+     to enable those units. You can then set or override unit options in the
+     usual way, e.g.
 <programlisting>
 systemd.services.foo.wantedBy = [ "multi-user.target" ];
 systemd.services.foo.serviceConfig.MemoryLimit = "512M";
 </programlisting>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 
-  </para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:
-
-<itemizedlist>
-
-  <listitem><para>Nixpkgs no longer exposes unfree packages by
-  default. If your NixOS configuration requires unfree packages from
-  Nixpkgs, you need to enable support for them explicitly by setting:
-
+ <para>
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
+  <itemizedlist>
+   <listitem>
+    <para>
+     Nixpkgs no longer exposes unfree packages by default. If your NixOS
+     configuration requires unfree packages from Nixpkgs, you need to enable
+     support for them explicitly by setting:
 <programlisting>
 nixpkgs.config.allowUnfree = true;
 </programlisting>
-
-  Otherwise, you get an error message such as:
-
+     Otherwise, you get an error message such as:
 <screen>
 error: package ‘nvidia-x11-331.49-3.12.17’ in ‘…/nvidia-x11/default.nix:56’
   has an unfree license, refusing to evaluate
 </screen>
-
-  </para></listitem>
-
-  <listitem><para>The Adobe Flash player is no longer enabled by
-  default in the Firefox and Chromium wrappers. To enable it, you must
-  set:
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The Adobe Flash player is no longer enabled by default in the Firefox and
+     Chromium wrappers. To enable it, you must set:
 <programlisting>
 nixpkgs.config.allowUnfree = true;
 nixpkgs.config.firefox.enableAdobeFlash = true; # for Firefox
 nixpkgs.config.chromium.enableAdobeFlash = true; # for Chromium
 </programlisting>
-
-  </para></listitem>
-
-  <listitem><para>The firewall is now enabled by default. If you don’t
-  want this, you need to disable it explicitly:
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The firewall is now enabled by default. If you don’t want this, you need
+     to disable it explicitly:
 <programlisting>
 networking.firewall.enable = false;
 </programlisting>
-
-  </para></listitem>
-
-  <listitem><para>The option
-  <option>boot.loader.grub.memtest86</option> has been renamed to
-  <option>boot.loader.grub.memtest86.enable</option>.</para></listitem>
-
-  <listitem><para>The <literal>mysql55</literal> service has been
-  merged into the <literal>mysql</literal> service, which no longer
-  sets a default for the option
-  <option>services.mysql.package</option>.</para></listitem>
-
-  <listitem><para>Package variants are now differentiated by suffixing
-  the name, rather than the version. For instance,
-  <filename>sqlite-3.8.4.3-interactive</filename> is now called
-  <filename>sqlite-interactive-3.8.4.3</filename>. This ensures that
-  <literal>nix-env -i sqlite</literal> is unambiguous, and that
-  <literal>nix-env -u</literal> won’t “upgrade”
-  <literal>sqlite</literal> to <literal>sqlite-interactive</literal>
-  or vice versa. Notably, this change affects the Firefox wrapper
-  (which provides plugins), as it is now called
-  <literal>firefox-wrapper</literal>. So when using
-  <command>nix-env</command>, you should do <literal>nix-env -e
-  firefox; nix-env -i firefox-wrapper</literal> if you want to keep
-  using the wrapper. This change does not affect declarative package
-  management, since attribute names like
-  <literal>pkgs.firefoxWrapper</literal> were already
-  unambiguous.</para></listitem>
-
-  <listitem><para>The symlink <filename>/etc/ca-bundle.crt</filename>
-  is gone. Programs should instead use the environment variable
-  <envar>OPENSSL_X509_CERT_FILE</envar> (which points to
-  <filename>/etc/ssl/certs/ca-bundle.crt</filename>).</para></listitem>
-
-</itemizedlist>
-
-</para>
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The option <option>boot.loader.grub.memtest86</option> has been renamed to
+     <option>boot.loader.grub.memtest86.enable</option>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <literal>mysql55</literal> service has been merged into the
+     <literal>mysql</literal> service, which no longer sets a default for the
+     option <option>services.mysql.package</option>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Package variants are now differentiated by suffixing the name, rather than
+     the version. For instance, <filename>sqlite-3.8.4.3-interactive</filename>
+     is now called <filename>sqlite-interactive-3.8.4.3</filename>. This
+     ensures that <literal>nix-env -i sqlite</literal> is unambiguous, and that
+     <literal>nix-env -u</literal> won’t “upgrade”
+     <literal>sqlite</literal> to <literal>sqlite-interactive</literal> or vice
+     versa. Notably, this change affects the Firefox wrapper (which provides
+     plugins), as it is now called <literal>firefox-wrapper</literal>. So when
+     using <command>nix-env</command>, you should do <literal>nix-env -e
+     firefox; nix-env -i firefox-wrapper</literal> if you want to keep using
+     the wrapper. This change does not affect declarative package management,
+     since attribute names like <literal>pkgs.firefoxWrapper</literal> were
+     already unambiguous.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The symlink <filename>/etc/ca-bundle.crt</filename> is gone. Programs
+     should instead use the environment variable
+     <envar>OPENSSL_X509_CERT_FILE</envar> (which points to
+     <filename>/etc/ssl/certs/ca-bundle.crt</filename>).
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml
index 42b51cd4a8ef..4d93aa644c1d 100644
--- a/nixos/doc/manual/release-notes/rl-1412.xml
+++ b/nixos/doc/manual/release-notes/rl-1412.xml
@@ -3,175 +3,465 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-14.12">
+ <title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
 
-<title>Release 14.12 (“Caterpillar”, 2014/12/30)</title>
+ <para>
+  In addition to numerous new and upgraded packages, this release has the
+  following highlights:
+  <itemizedlist>
+   <listitem>
+    <para>
+     Systemd has been updated to version 217, which has numerous
+     <link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
+     Nix has been updated to 1.8.</link>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     NixOS is now based on Glibc 2.20.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     KDE has been updated to 4.14.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The default Linux kernel has been updated to 3.14.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     If <option>users.mutableUsers</option> is enabled (the default), changes
+     made to the declaration of a user or group will be correctly realised when
+     running <command>nixos-rebuild</command>. For instance, removing a user
+     specification from <filename>configuration.nix</filename> will cause the
+     actual user account to be deleted. If <option>users.mutableUsers</option>
+     is disabled, it is no longer necessary to specify UIDs or GIDs; if
+     omitted, they are allocated dynamically.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 
-<para>In addition to numerous new and upgraded packages, this release has the following highlights:
+ <para>
+  Following new services were added since the last release:
+  <itemizedlist>
+   <listitem>
+    <para>
+     <literal>atftpd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>bosun</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>bspwm</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>chronos</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>collectd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>consul</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>cpuminer-cryptonight</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>crashplan</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>dnscrypt-proxy</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>docker-registry</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>docker</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>etcd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>fail2ban</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>fcgiwrap</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>fleet</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>fluxbox</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>gdm</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>geoclue2</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>gitlab</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>gitolite</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>gnome3.gnome-documents</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>gnome3.gnome-online-miners</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>gnome3.gvfs</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>gnome3.seahorse</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>hbase</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>i2pd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>influxdb</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>kubernetes</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>liquidsoap</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>lxc</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>mailpile</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>mesos</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>mlmmj</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>monetdb</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>mopidy</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>neo4j</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>nsd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>openntpd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>opentsdb</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>openvswitch</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>parallels-guest</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>peerflix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>phd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>polipo</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>prosody</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>radicale</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>redmine</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>riemann</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>scollector</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>seeks</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>siproxd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>strongswan</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>tcsd</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>teamspeak3</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>thermald</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>torque/mrom</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>torque/server</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>uhub</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>unifi</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>znc</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>zookeeper</literal>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 
-<itemizedlist>
-
-<listitem><para>Systemd has been updated to version 217, which has numerous
-<link xlink:href="http://lists.freedesktop.org/archives/systemd-devel/2014-October/024662.html">improvements.</link></para></listitem>
-
-<listitem><para><link xlink:href="http://thread.gmane.org/gmane.linux.distributions.nixos/15165">
-Nix has been updated to 1.8.</link></para></listitem>
-
-<listitem><para>NixOS is now based on Glibc 2.20.</para></listitem>
-
-<listitem><para>KDE has been updated to 4.14.</para></listitem>
-
-<listitem><para>The default Linux kernel has been updated to 3.14.</para></listitem>
-
-<listitem><para>If <option>users.mutableUsers</option> is enabled (the
-default), changes made to the declaration of a user or group will be
-correctly realised when running <command>nixos-rebuild</command>. For
-instance, removing a user specification from
-<filename>configuration.nix</filename> will cause the actual user
-account to be deleted. If <option>users.mutableUsers</option> is
-disabled, it is no longer necessary to specify UIDs or GIDs; if
-omitted, they are allocated dynamically.</para></listitem>
-
-</itemizedlist></para>
-
-<para>Following new services were added since the last release:
-
-<itemizedlist>
-<listitem><para><literal>atftpd</literal></para></listitem>
-<listitem><para><literal>bosun</literal></para></listitem>
-<listitem><para><literal>bspwm</literal></para></listitem>
-<listitem><para><literal>chronos</literal></para></listitem>
-<listitem><para><literal>collectd</literal></para></listitem>
-<listitem><para><literal>consul</literal></para></listitem>
-<listitem><para><literal>cpuminer-cryptonight</literal></para></listitem>
-<listitem><para><literal>crashplan</literal></para></listitem>
-<listitem><para><literal>dnscrypt-proxy</literal></para></listitem>
-<listitem><para><literal>docker-registry</literal></para></listitem>
-<listitem><para><literal>docker</literal></para></listitem>
-<listitem><para><literal>etcd</literal></para></listitem>
-<listitem><para><literal>fail2ban</literal></para></listitem>
-<listitem><para><literal>fcgiwrap</literal></para></listitem>
-<listitem><para><literal>fleet</literal></para></listitem>
-<listitem><para><literal>fluxbox</literal></para></listitem>
-<listitem><para><literal>gdm</literal></para></listitem>
-<listitem><para><literal>geoclue2</literal></para></listitem>
-<listitem><para><literal>gitlab</literal></para></listitem>
-<listitem><para><literal>gitolite</literal></para></listitem>
-<listitem><para><literal>gnome3.gnome-documents</literal></para></listitem>
-<listitem><para><literal>gnome3.gnome-online-miners</literal></para></listitem>
-<listitem><para><literal>gnome3.gvfs</literal></para></listitem>
-<listitem><para><literal>gnome3.seahorse</literal></para></listitem>
-<listitem><para><literal>hbase</literal></para></listitem>
-<listitem><para><literal>i2pd</literal></para></listitem>
-<listitem><para><literal>influxdb</literal></para></listitem>
-<listitem><para><literal>kubernetes</literal></para></listitem>
-<listitem><para><literal>liquidsoap</literal></para></listitem>
-<listitem><para><literal>lxc</literal></para></listitem>
-<listitem><para><literal>mailpile</literal></para></listitem>
-<listitem><para><literal>mesos</literal></para></listitem>
-<listitem><para><literal>mlmmj</literal></para></listitem>
-<listitem><para><literal>monetdb</literal></para></listitem>
-<listitem><para><literal>mopidy</literal></para></listitem>
-<listitem><para><literal>neo4j</literal></para></listitem>
-<listitem><para><literal>nsd</literal></para></listitem>
-<listitem><para><literal>openntpd</literal></para></listitem>
-<listitem><para><literal>opentsdb</literal></para></listitem>
-<listitem><para><literal>openvswitch</literal></para></listitem>
-<listitem><para><literal>parallels-guest</literal></para></listitem>
-<listitem><para><literal>peerflix</literal></para></listitem>
-<listitem><para><literal>phd</literal></para></listitem>
-<listitem><para><literal>polipo</literal></para></listitem>
-<listitem><para><literal>prosody</literal></para></listitem>
-<listitem><para><literal>radicale</literal></para></listitem>
-<listitem><para><literal>redmine</literal></para></listitem>
-<listitem><para><literal>riemann</literal></para></listitem>
-<listitem><para><literal>scollector</literal></para></listitem>
-<listitem><para><literal>seeks</literal></para></listitem>
-<listitem><para><literal>siproxd</literal></para></listitem>
-<listitem><para><literal>strongswan</literal></para></listitem>
-<listitem><para><literal>tcsd</literal></para></listitem>
-<listitem><para><literal>teamspeak3</literal></para></listitem>
-<listitem><para><literal>thermald</literal></para></listitem>
-<listitem><para><literal>torque/mrom</literal></para></listitem>
-<listitem><para><literal>torque/server</literal></para></listitem>
-<listitem><para><literal>uhub</literal></para></listitem>
-<listitem><para><literal>unifi</literal></para></listitem>
-<listitem><para><literal>znc</literal></para></listitem>
-<listitem><para><literal>zookeeper</literal></para></listitem>
-</itemizedlist>
-</para>
-
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:
-
-<itemizedlist>
-
-<listitem><para>The default version of Apache httpd is now 2.4. If
-you use the <option>extraConfig</option> option to pass literal
-Apache configuration text, you may need to update it — see <link
+ <para>
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
+  <itemizedlist>
+   <listitem>
+    <para>
+     The default version of Apache httpd is now 2.4. If you use the
+     <option>extraConfig</option> option to pass literal Apache configuration
+     text, you may need to update it — see
+     <link
 xlink:href="http://httpd.apache.org/docs/2.4/upgrading.html">Apache’s
-documentation</link> for details. If you wish to continue to use
-httpd 2.2, add the following line to your NixOS configuration:
-
+     documentation</link> for details. If you wish to continue to use httpd
+     2.2, add the following line to your NixOS configuration:
 <programlisting>
 services.httpd.package = pkgs.apacheHttpd_2_2;
 </programlisting>
-
-</para></listitem>
-
-<listitem><para>PHP 5.3 has been removed because it is no longer
-supported by the PHP project. A <link
-xlink:href="http://php.net/migration54">migration guide</link> is
-available.</para></listitem>
-
-<listitem><para>The host side of a container virtual Ethernet pair
-is now called <literal>ve-<replaceable>container-name</replaceable></literal>
-rather than <literal>c-<replaceable>container-name</replaceable></literal>.</para></listitem>
-
-<listitem><para>GNOME 3.10 support has been dropped. The default GNOME version is now 3.12.</para></listitem>
-
-<listitem><para>VirtualBox has been upgraded to 4.3.20 release. Users
-may be required to run <command>rm -rf /tmp/.vbox*</command>. The line
-<literal>imports = [ &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is
-no longer necessary, use <literal>services.virtualboxHost.enable =
-true</literal> instead.
-</para>
-<para>Also, hardening mode is now enabled by default, which means that unless you want to use
-USB support, you no longer need to be a member of the <literal>vboxusers</literal> group.
-</para></listitem>
-
-<listitem><para>Chromium has been updated to 39.0.2171.65. <option>enablePepperPDF</option> is now enabled by default.
-<literal>chromium*Wrapper</literal> packages no longer exist, because upstream removed NSAPI support.
-<literal>chromium-stable</literal> has been renamed to <literal>chromium</literal>.
-</para></listitem>
-
-<listitem><para>Python packaging documentation is now part of nixpkgs manual. To override
-the python packages available to a custom python you now use <literal>pkgs.pythonFull.buildEnv.override</literal>
-instead of <literal>pkgs.pythonFull.override</literal>.
-</para></listitem>
-
-<listitem><para><literal>boot.resumeDevice = "8:6"</literal> is no longer supported. Most users will
-want to leave it undefined, which takes the swap partitions automatically. There is an evaluation
-assertion to ensure that the string starts with a slash.
-</para></listitem>
-
-<listitem><para>The system-wide default timezone for NixOS installations
-changed from <literal>CET</literal> to <literal>UTC</literal>. To choose
-a different timezone for your system, configure
-<literal>time.timeZone</literal> in
-<literal>configuration.nix</literal>. A fairly complete list of possible
-values for that setting is available at <link
-xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"/>.</para></listitem>
-
-<listitem><para>GNU screen has been updated to 4.2.1, which breaks
-the ability to connect to sessions created by older versions of
-screen.</para></listitem>
-
-<listitem><para>The Intel GPU driver was updated to the 3.x prerelease
-version (used by most distributions) and supports DRI3
-now.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     PHP 5.3 has been removed because it is no longer supported by the PHP
+     project. A <link
+xlink:href="http://php.net/migration54">migration
+     guide</link> is available.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The host side of a container virtual Ethernet pair is now called
+     <literal>ve-<replaceable>container-name</replaceable></literal> rather
+     than <literal>c-<replaceable>container-name</replaceable></literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     GNOME 3.10 support has been dropped. The default GNOME version is now
+     3.12.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     VirtualBox has been upgraded to 4.3.20 release. Users may be required to
+     run <command>rm -rf /tmp/.vbox*</command>. The line <literal>imports = [
+     &lt;nixpkgs/nixos/modules/programs/virtualbox.nix&gt; ]</literal> is no
+     longer necessary, use <literal>services.virtualboxHost.enable =
+     true</literal> instead.
+    </para>
+    <para>
+     Also, hardening mode is now enabled by default, which means that unless
+     you want to use USB support, you no longer need to be a member of the
+     <literal>vboxusers</literal> group.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Chromium has been updated to 39.0.2171.65.
+     <option>enablePepperPDF</option> is now enabled by default.
+     <literal>chromium*Wrapper</literal> packages no longer exist, because
+     upstream removed NSAPI support. <literal>chromium-stable</literal> has
+     been renamed to <literal>chromium</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Python packaging documentation is now part of nixpkgs manual. To override
+     the python packages available to a custom python you now use
+     <literal>pkgs.pythonFull.buildEnv.override</literal> instead of
+     <literal>pkgs.pythonFull.override</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>boot.resumeDevice = "8:6"</literal> is no longer supported. Most
+     users will want to leave it undefined, which takes the swap partitions
+     automatically. There is an evaluation assertion to ensure that the string
+     starts with a slash.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The system-wide default timezone for NixOS installations changed from
+     <literal>CET</literal> to <literal>UTC</literal>. To choose a different
+     timezone for your system, configure <literal>time.timeZone</literal> in
+     <literal>configuration.nix</literal>. A fairly complete list of possible
+     values for that setting is available at
+     <link
+xlink:href="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones"/>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     GNU screen has been updated to 4.2.1, which breaks the ability to connect
+     to sessions created by older versions of screen.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The Intel GPU driver was updated to the 3.x prerelease version (used by
+     most distributions) and supports DRI3 now.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 6c1c46844ccb..e500c9d63422 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -3,375 +3,640 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-15.09">
+ <title>Release 15.09 (“Dingo”, 2015/09/30)</title>
 
-<title>Release 15.09 (“Dingo”, 2015/09/30)</title>
-
-<para>In addition to numerous new and upgraded packages, this release
-has the following highlights:</para>
-
-<itemizedlist>
+ <para>
+  In addition to numerous new and upgraded packages, this release has the
+  following highlights:
+ </para>
 
+ <itemizedlist>
   <listitem>
-    <para>The <link xlink:href="http://haskell.org/">Haskell</link>
-    packages infrastructure has been re-designed from the ground up
-    (&quot;Haskell NG&quot;). NixOS now distributes the latest version
-    of every single package registered on <link
-    xlink:href="http://hackage.haskell.org/">Hackage</link> -- well in
-    excess of 8,000 Haskell packages. Detailed instructions on how to
-    use that infrastructure can be found in the <link
+   <para>
+    The <link xlink:href="http://haskell.org/">Haskell</link> packages
+    infrastructure has been re-designed from the ground up (&quot;Haskell
+    NG&quot;). NixOS now distributes the latest version of every single package
+    registered on
+    <link
+    xlink:href="http://hackage.haskell.org/">Hackage</link> -- well
+    in excess of 8,000 Haskell packages. Detailed instructions on how to use
+    that infrastructure can be found in the
+    <link
     xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's
-    Guide to the Haskell Infrastructure</link>. Users migrating from an
-    earlier release may find helpful information below, in the list of
-    backwards-incompatible changes. Furthermore, we distribute 51(!)
-    additional Haskell package sets that provide every single <link
+    Guide to the Haskell Infrastructure</link>. Users migrating from an earlier
+    release may find helpful information below, in the list of
+    backwards-incompatible changes. Furthermore, we distribute 51(!) additional
+    Haskell package sets that provide every single
+    <link
     xlink:href="http://www.stackage.org/">LTS Haskell</link> release
-    since version 0.0 as well as the most recent <link
+    since version 0.0 as well as the most recent
+    <link
     xlink:href="http://www.stackage.org/">Stackage Nightly</link>
-    snapshot. The announcement <link
+    snapshot. The announcement
+    <link
     xlink:href="https://nixos.org/nix-dev/2015-September/018138.html">&quot;Full
-    Stackage Support in Nixpkgs&quot;</link> gives additional
-    details.</para>
+    Stackage Support in Nixpkgs&quot;</link> gives additional details.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Nix has been updated to version 1.10, which among other
-    improvements enables cryptographic signatures on binary caches for
-    improved security.</para>
+   <para>
+    Nix has been updated to version 1.10, which among other improvements
+    enables cryptographic signatures on binary caches for improved security.
+   </para>
   </listitem>
-
   <listitem>
-    <para>You can now keep your NixOS system up to date automatically
-    by setting
-
+   <para>
+    You can now keep your NixOS system up to date automatically by setting
 <programlisting>
 system.autoUpgrade.enable = true;
 </programlisting>
-
-    This will cause the system to periodically check for updates in
-    your current channel and run <command>nixos-rebuild</command>.</para>
+    This will cause the system to periodically check for updates in your
+    current channel and run <command>nixos-rebuild</command>.
+   </para>
   </listitem>
-
   <listitem>
-    <para>This release is based on Glibc 2.21, GCC 4.9 and Linux
-    3.18.</para>
+   <para>
+    This release is based on Glibc 2.21, GCC 4.9 and Linux 3.18.
+   </para>
   </listitem>
-
   <listitem>
-    <para>GNOME has been upgraded to 3.16.
-    </para>
+   <para>
+    GNOME has been upgraded to 3.16.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Xfce has been upgraded to 4.12.
-    </para>
+   <para>
+    Xfce has been upgraded to 4.12.
+   </para>
   </listitem>
-
   <listitem>
-    <para>KDE 5 has been upgraded to KDE Frameworks 5.10,
-      Plasma 5.3.2 and Applications 15.04.3.
-      KDE 4 has been updated to kdelibs-4.14.10.
-    </para>
+   <para>
+    KDE 5 has been upgraded to KDE Frameworks 5.10, Plasma 5.3.2 and
+    Applications 15.04.3. KDE 4 has been updated to kdelibs-4.14.10.
+   </para>
   </listitem>
-
   <listitem>
-    <para>E19 has been upgraded to 0.16.8.15.
-    </para>
+   <para>
+    E19 has been upgraded to 0.16.8.15.
+   </para>
   </listitem>
+ </itemizedlist>
 
-</itemizedlist>
-
-
-<para>The following new services were added since the last release:
-
+ <para>
+  The following new services were added since the last release:
   <itemizedlist>
-    <listitem><para><literal>services/mail/exim.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/apache-kafka.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/canto-daemon.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/confd.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/devmon.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/gitit.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/ihaskell.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/mbpfan.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/mediatomb.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/mwlib.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/parsoid.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/plex.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/ripple-rest.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/ripple-data-api.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/subsonic.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/sundtek.nix</literal></para></listitem>
-    <listitem><para><literal>services/monitoring/cadvisor.nix</literal></para></listitem>
-    <listitem><para><literal>services/monitoring/das_watchdog.nix</literal></para></listitem>
-    <listitem><para><literal>services/monitoring/grafana.nix</literal></para></listitem>
-    <listitem><para><literal>services/monitoring/riemann-tools.nix</literal></para></listitem>
-    <listitem><para><literal>services/monitoring/teamviewer.nix</literal></para></listitem>
-    <listitem><para><literal>services/network-filesystems/u9fs.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/aiccu.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/asterisk.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/bird.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/charybdis.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/docker-registry-server.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/fan.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/firefox/sync-server.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/gateone.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/heyefi.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/i2p.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/lambdabot.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/mstpd.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/nix-serve.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/nylon.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/racoon.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/skydns.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/shout.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/softether.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/sslh.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/tinc.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/tlsdated.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/tox-bootstrapd.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/tvheadend.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/zerotierone.nix</literal></para></listitem>
-    <listitem><para><literal>services/scheduling/marathon.nix</literal></para></listitem>
-    <listitem><para><literal>services/security/fprintd.nix</literal></para></listitem>
-    <listitem><para><literal>services/security/hologram.nix</literal></para></listitem>
-    <listitem><para><literal>services/security/munge.nix</literal></para></listitem>
-    <listitem><para><literal>services/system/cloud-init.nix</literal></para></listitem>
-    <listitem><para><literal>services/web-servers/shellinabox.nix</literal></para></listitem>
-    <listitem><para><literal>services/web-servers/uwsgi.nix</literal></para></listitem>
-    <listitem><para><literal>services/x11/unclutter.nix</literal></para></listitem>
-    <listitem><para><literal>services/x11/display-managers/sddm.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/coredump.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/loader/loader.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/loader/generic-extlinux-compatible</literal></para></listitem>
-    <listitem><para><literal>system/boot/networkd.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/resolved.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/timesyncd.nix</literal></para></listitem>
-    <listitem><para><literal>tasks/filesystems/exfat.nix</literal></para></listitem>
-    <listitem><para><literal>tasks/filesystems/ntfs.nix</literal></para></listitem>
-    <listitem><para><literal>tasks/filesystems/vboxsf.nix</literal></para></listitem>
-    <listitem><para><literal>virtualisation/virtualbox-host.nix</literal></para></listitem>
-    <listitem><para><literal>virtualisation/vmware-guest.nix</literal></para></listitem>
-    <listitem><para><literal>virtualisation/xen-dom0.nix</literal></para></listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/exim.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/apache-kafka.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/canto-daemon.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/confd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/devmon.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/gitit.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/ihaskell.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/mbpfan.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/mediatomb.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/mwlib.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/parsoid.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/plex.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/ripple-rest.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/ripple-data-api.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/subsonic.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/sundtek.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/cadvisor.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/das_watchdog.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/grafana.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/riemann-tools.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/teamviewer.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/network-filesystems/u9fs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/aiccu.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/asterisk.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/bird.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/charybdis.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/docker-registry-server.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/fan.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/firefox/sync-server.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/gateone.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/heyefi.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/i2p.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/lambdabot.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/mstpd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/nix-serve.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/nylon.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/racoon.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/skydns.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/shout.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/softether.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/sslh.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/tinc.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/tlsdated.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/tox-bootstrapd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/tvheadend.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/zerotierone.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/scheduling/marathon.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/fprintd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/hologram.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/munge.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/system/cloud-init.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-servers/shellinabox.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-servers/uwsgi.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/x11/unclutter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/x11/display-managers/sddm.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/coredump.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/loader/loader.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/loader/generic-extlinux-compatible</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/networkd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/resolved.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/timesyncd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>tasks/filesystems/exfat.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>tasks/filesystems/ntfs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>tasks/filesystems/vboxsf.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/virtualbox-host.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/vmware-guest.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/xen-dom0.nix</literal>
+    </para>
+   </listitem>
   </itemizedlist>
-</para>
-
-
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:
-
-<itemizedlist>
-
-<listitem><para><command>sshd</command> no longer supports DSA and ECDSA
-host keys by default. If you have existing systems with such host keys
-and want to continue to use them, please set
+ </para>
 
+ <para>
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
+  <itemizedlist>
+   <listitem>
+    <para>
+     <command>sshd</command> no longer supports DSA and ECDSA host keys by
+     default. If you have existing systems with such host keys and want to
+     continue to use them, please set
 <programlisting>
 system.stateVersion = "14.12";
 </programlisting>
-
-The new option <option>system.stateVersion</option> ensures that
-certain configuration changes that could break existing systems (such
-as the <command>sshd</command> host key setting) will maintain
-compatibility with the specified NixOS release. NixOps sets the state
-version of existing deployments automatically.</para></listitem>
-
-<listitem><para><command>cron</command> is no longer enabled by
-default, unless you have a non-empty
-<option>services.cron.systemCronJobs</option>. To force
-<command>cron</command> to be enabled, set
-<option>services.cron.enable = true</option>.</para></listitem>
-
-<listitem><para>Nix now requires binary caches to be cryptographically
-signed. If you have unsigned binary caches that you want to continue
-to use, you should set <option>nix.requireSignedBinaryCaches =
-false</option>.</para></listitem>
-
-<listitem><para>Steam now doesn't need root rights to work. Instead of using
-<literal>*-steam-chrootenv</literal>, you should now just run <literal>steam</literal>.
-<literal>steamChrootEnv</literal> package was renamed to <literal>steam</literal>,
-and old <literal>steam</literal> package -- to <literal>steamOriginal</literal>.
-</para></listitem>
-
-<listitem><para>CMPlayer has been renamed to bomi upstream. Package
-<literal>cmplayer</literal> was accordingly renamed to
-<literal>bomi</literal> </para></listitem>
-
-<listitem><para>Atom Shell has been renamed to Electron upstream.  Package <literal>atom-shell</literal>
-was accordingly renamed to <literal>electron</literal>
-</para></listitem>
-
-<listitem><para>Elm is not released on Hackage anymore. You should now use <literal>elmPackages.elm</literal>
-which contains the latest Elm platform.</para></listitem>
-
-<listitem>
-  <para>The CUPS printing service has been updated to version
-  <literal>2.0.2</literal>.  Furthermore its systemd service has been
-  renamed to <literal>cups.service</literal>.</para>
-
-  <para>Local printers are no longer shared or advertised by
-  default. This behavior can be changed by enabling
-  <option>services.printing.defaultShared</option> or
-  <option>services.printing.browsing</option> respectively.</para>
-</listitem>
-
-<listitem>
-  <para>
-    The VirtualBox host and guest options have been named more
-    consistently. They can now found in
-    <option>virtualisation.virtualbox.host.*</option> instead of
-    <option>services.virtualboxHost.*</option> and
-    <option>virtualisation.virtualbox.guest.*</option> instead of
-    <option>services.virtualboxGuest.*</option>.
-  </para>
-
-  <para>
-    Also, there now is support for the <literal>vboxsf</literal> file
-    system using the <option>fileSystems</option> configuration
-    attribute. An example of how this can be used in a configuration:
-
+     The new option <option>system.stateVersion</option> ensures that certain
+     configuration changes that could break existing systems (such as the
+     <command>sshd</command> host key setting) will maintain compatibility with
+     the specified NixOS release. NixOps sets the state version of existing
+     deployments automatically.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <command>cron</command> is no longer enabled by default, unless you have a
+     non-empty <option>services.cron.systemCronJobs</option>. To force
+     <command>cron</command> to be enabled, set <option>services.cron.enable =
+     true</option>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Nix now requires binary caches to be cryptographically signed. If you have
+     unsigned binary caches that you want to continue to use, you should set
+     <option>nix.requireSignedBinaryCaches = false</option>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Steam now doesn't need root rights to work. Instead of using
+     <literal>*-steam-chrootenv</literal>, you should now just run
+     <literal>steam</literal>. <literal>steamChrootEnv</literal> package was
+     renamed to <literal>steam</literal>, and old <literal>steam</literal>
+     package -- to <literal>steamOriginal</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     CMPlayer has been renamed to bomi upstream. Package
+     <literal>cmplayer</literal> was accordingly renamed to
+     <literal>bomi</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Atom Shell has been renamed to Electron upstream. Package
+     <literal>atom-shell</literal> was accordingly renamed to
+     <literal>electron</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Elm is not released on Hackage anymore. You should now use
+     <literal>elmPackages.elm</literal> which contains the latest Elm platform.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The CUPS printing service has been updated to version
+     <literal>2.0.2</literal>. Furthermore its systemd service has been renamed
+     to <literal>cups.service</literal>.
+    </para>
+    <para>
+     Local printers are no longer shared or advertised by default. This
+     behavior can be changed by enabling
+     <option>services.printing.defaultShared</option> or
+     <option>services.printing.browsing</option> respectively.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The VirtualBox host and guest options have been named more consistently.
+     They can now found in <option>virtualisation.virtualbox.host.*</option>
+     instead of <option>services.virtualboxHost.*</option> and
+     <option>virtualisation.virtualbox.guest.*</option> instead of
+     <option>services.virtualboxGuest.*</option>.
+    </para>
+    <para>
+     Also, there now is support for the <literal>vboxsf</literal> file system
+     using the <option>fileSystems</option> configuration attribute. An example
+     of how this can be used in a configuration:
 <programlisting>
 fileSystems."/shiny" = {
   device = "myshinysharedfolder";
   fsType = "vboxsf";
 };
 </programlisting>
-
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    &quot;<literal>nix-env -qa</literal>&quot; no longer discovers
-    Haskell packages by name. The only packages visible in the global
-    scope are <literal>ghc</literal>, <literal>cabal-install</literal>,
-    and <literal>stack</literal>, but all other packages are hidden. The
-    reason for this inconvenience is the sheer size of the Haskell
-    package set. Name-based lookups are expensive, and most
-    <literal>nix-env -qa</literal> operations would become much slower
-    if we'd add the entire Hackage database into the top level attribute
-    set. Instead, the list of Haskell packages can be displayed by
-    running:
-  </para>
-  <programlisting>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     &quot;<literal>nix-env -qa</literal>&quot; no longer discovers Haskell
+     packages by name. The only packages visible in the global scope are
+     <literal>ghc</literal>, <literal>cabal-install</literal>, and
+     <literal>stack</literal>, but all other packages are hidden. The reason
+     for this inconvenience is the sheer size of the Haskell package set.
+     Name-based lookups are expensive, and most <literal>nix-env -qa</literal>
+     operations would become much slower if we'd add the entire Hackage
+     database into the top level attribute set. Instead, the list of Haskell
+     packages can be displayed by running:
+    </para>
+<programlisting>
 nix-env -f &quot;&lt;nixpkgs&gt;&quot; -qaP -A haskellPackages
 </programlisting>
-  <para>
-    Executable programs written in Haskell can be installed with:
-  </para>
-  <programlisting>
+    <para>
+     Executable programs written in Haskell can be installed with:
+    </para>
+<programlisting>
 nix-env -f &quot;&lt;nixpkgs&gt;&quot; -iA haskellPackages.pandoc
 </programlisting>
-  <para>
-    Installing Haskell <emphasis>libraries</emphasis> this way, however, is no
-    longer supported. See the next item for more details.
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    Previous versions of NixOS came with a feature called
-    <literal>ghc-wrapper</literal>, a small script that allowed GHC to
-    transparently pick up on libraries installed in the user's profile. This
-    feature has been deprecated; <literal>ghc-wrapper</literal> was removed
-    from the distribution. The proper way to register Haskell libraries with
-    the compiler now is the <literal>haskellPackages.ghcWithPackages</literal>
-    function. The <link
+    <para>
+     Installing Haskell <emphasis>libraries</emphasis> this way, however, is no
+     longer supported. See the next item for more details.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Previous versions of NixOS came with a feature called
+     <literal>ghc-wrapper</literal>, a small script that allowed GHC to
+     transparently pick up on libraries installed in the user's profile. This
+     feature has been deprecated; <literal>ghc-wrapper</literal> was removed
+     from the distribution. The proper way to register Haskell libraries with
+     the compiler now is the <literal>haskellPackages.ghcWithPackages</literal>
+     function. The
+     <link
     xlink:href="http://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's
-    Guide to the Haskell Infrastructure</link> provides more information about
-    this subject.
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    All Haskell builds that have been generated with version 1.x of
-    the <literal>cabal2nix</literal> utility are now invalid and need
-    to be re-generated with a current version of
-    <literal>cabal2nix</literal> to function. The most recent version
-    of this tool can be installed by running
-    <literal>nix-env -i cabal2nix</literal>.
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    The <literal>haskellPackages</literal> set in Nixpkgs used to have a
-    function attribute called <literal>extension</literal> that users
-    could override in their <literal>~/.nixpkgs/config.nix</literal>
-    files to configure additional attributes, etc. That function still
-    exists, but it's now called <literal>overrides</literal>.
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    The OpenBLAS library has been updated to version
-    <literal>0.2.14</literal>. Support for the
-    <literal>x86_64-darwin</literal> platform was added. Dynamic
-    architecture detection was enabled; OpenBLAS now selects
-    microarchitecture-optimized routines at runtime, so optimal
-    performance is achieved without the need to rebuild OpenBLAS
-    locally. OpenBLAS has replaced ATLAS in most packages which use an
-    optimized BLAS or LAPACK implementation.
- </para>
-</listitem>
-
-<listitem>
-  <para>
-    The <literal>phpfpm</literal> is now using the default PHP version
-    (<literal>pkgs.php</literal>) instead of PHP 5.4 (<literal>pkgs.php54</literal>).
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    The <literal>locate</literal> service no longer indexes the Nix store
-    by default, preventing packages with potentially numerous versions from
-    cluttering the output. Indexing the store can be activated by setting
-    <option>services.locate.includeStore = true</option>.
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    The Nix expression search path (<envar>NIX_PATH</envar>) no longer
-    contains <filename>/etc/nixos/nixpkgs</filename> by default. You
-    can override <envar>NIX_PATH</envar> by setting
-    <option>nix.nixPath</option>.
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    Python 2.6 has been marked as broken (as it no longer receives
-    security updates from upstream).
-  </para>
-</listitem>
-
-<listitem>
-  <para>
-    Any use of module arguments such as <varname>pkgs</varname> to access
-    library functions, or to define <literal>imports</literal> attributes
-    will now lead to an infinite loop at the time of the evaluation.
-  </para>
-
-  <para>
-    In case of an infinite loop, use the <command>--show-trace</command>
-    command line argument and read the line just above the error message.
-
+     Guide to the Haskell Infrastructure</link> provides more information about
+     this subject.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     All Haskell builds that have been generated with version 1.x of the
+     <literal>cabal2nix</literal> utility are now invalid and need to be
+     re-generated with a current version of <literal>cabal2nix</literal> to
+     function. The most recent version of this tool can be installed by running
+     <literal>nix-env -i cabal2nix</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <literal>haskellPackages</literal> set in Nixpkgs used to have a
+     function attribute called <literal>extension</literal> that users could
+     override in their <literal>~/.nixpkgs/config.nix</literal> files to
+     configure additional attributes, etc. That function still exists, but it's
+     now called <literal>overrides</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The OpenBLAS library has been updated to version
+     <literal>0.2.14</literal>. Support for the
+     <literal>x86_64-darwin</literal> platform was added. Dynamic architecture
+     detection was enabled; OpenBLAS now selects microarchitecture-optimized
+     routines at runtime, so optimal performance is achieved without the need
+     to rebuild OpenBLAS locally. OpenBLAS has replaced ATLAS in most packages
+     which use an optimized BLAS or LAPACK implementation.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <literal>phpfpm</literal> is now using the default PHP version
+     (<literal>pkgs.php</literal>) instead of PHP 5.4
+     (<literal>pkgs.php54</literal>).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <literal>locate</literal> service no longer indexes the Nix store by
+     default, preventing packages with potentially numerous versions from
+     cluttering the output. Indexing the store can be activated by setting
+     <option>services.locate.includeStore = true</option>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The Nix expression search path (<envar>NIX_PATH</envar>) no longer
+     contains <filename>/etc/nixos/nixpkgs</filename> by default. You can
+     override <envar>NIX_PATH</envar> by setting <option>nix.nixPath</option>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Python 2.6 has been marked as broken (as it no longer receives security
+     updates from upstream).
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Any use of module arguments such as <varname>pkgs</varname> to access
+     library functions, or to define <literal>imports</literal> attributes will
+     now lead to an infinite loop at the time of the evaluation.
+    </para>
+    <para>
+     In case of an infinite loop, use the <command>--show-trace</command>
+     command line argument and read the line just above the error message.
 <screen>
 $ nixos-rebuild build --show-trace
 …
 while evaluating the module argument `pkgs' in "/etc/nixos/my-module.nix":
 infinite recursion encountered
 </screen>
-  </para>
-
-
-  <para>
-    Any use of <literal>pkgs.lib</literal>, should be replaced by
-    <varname>lib</varname>, after adding it as argument of the module.  The
-    following module
-
+    </para>
+    <para>
+     Any use of <literal>pkgs.lib</literal>, should be replaced by
+     <varname>lib</varname>, after adding it as argument of the module. The
+     following module
 <programlisting>
 { config, pkgs, ... }:
 
@@ -384,9 +649,7 @@ with pkgs.lib;
   config = mkIf config.foo { … };
 }
 </programlisting>
-
-   should be modified to look like:
-
+     should be modified to look like:
 <programlisting>
 { config, pkgs, lib, ... }:
 
@@ -399,13 +662,11 @@ with lib;
   config = mkIf config.foo { <replaceable>option definition</replaceable> };
 }
 </programlisting>
-  </para>
-
-  <para>
-    When <varname>pkgs</varname> is used to download other projects to
-    import their modules, and only in such cases, it should be replaced by
-    <literal>(import &lt;nixpkgs&gt; {})</literal>.  The following module
-
+    </para>
+    <para>
+     When <varname>pkgs</varname> is used to download other projects to import
+     their modules, and only in such cases, it should be replaced by
+     <literal>(import &lt;nixpkgs&gt; {})</literal>. The following module
 <programlisting>
 { config, pkgs, ... }:
 
@@ -420,9 +681,7 @@ in
   imports = [ "${myProject}/module.nix" ];
 }
 </programlisting>
-
-    should be modified to look like:
-
+     should be modified to look like:
 <programlisting>
 { config, pkgs, ... }:
 
@@ -437,55 +696,55 @@ in
   imports = [ "${myProject}/module.nix" ];
 }
 </programlisting>
-  </para>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 
-</listitem>
-
-</itemizedlist>
-</para>
-
-
-<para>Other notable improvements:
-
-<itemizedlist>
-
-  <listitem><para>The nixos and nixpkgs channels were unified,
-    so one <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal>
-    instead of <literal>nix-env -iA nixos.pkgs.bash</literal>.
-    See <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the commit</link> for details.
-  </para></listitem>
-
-  <listitem>
+ <para>
+  Other notable improvements:
+  <itemizedlist>
+   <listitem>
     <para>
-      Users running an SSH server who worry about the quality of their
-      <literal>/etc/ssh/moduli</literal> file with respect to the
-      <link
+     The nixos and nixpkgs channels were unified, so one
+     <emphasis>can</emphasis> use <literal>nix-env -iA nixos.bash</literal>
+     instead of <literal>nix-env -iA nixos.pkgs.bash</literal>. See
+     <link xlink:href="https://github.com/NixOS/nixpkgs/commit/2cd7c1f198">the
+     commit</link> for details.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Users running an SSH server who worry about the quality of their
+     <literal>/etc/ssh/moduli</literal> file with respect to the
+     <link
       xlink:href="https://stribika.github.io/2015/01/04/secure-secure-shell.html">vulnerabilities
-      discovered in the Diffie-Hellman key exchange</link> can now
-      replace OpenSSH's default version with one they generated
-      themselves using the new
-      <option>services.openssh.moduliFile</option> option.
-      </para>
-  </listitem>
-
-  <listitem> <para>
-    A newly packaged TeX Live 2015 is provided in <literal>pkgs.texlive</literal>,
-    split into 6500 nix packages. For basic user documentation see
-    <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
-      >the source</link>.
-    Beware of <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
-      >an issue</link> when installing a too large package set.
-
-    The plan is to deprecate and maybe delete the original TeX packages
-    until the next release.
-  </para> </listitem>
-
-  <listitem><para>
-    <option>buildEnv.env</option> on all Python interpreters
-    is now available for nix-shell interoperability.
-  </para> </listitem>
-</itemizedlist>
-
-</para>
-
+     discovered in the Diffie-Hellman key exchange</link> can now replace
+     OpenSSH's default version with one they generated themselves using the new
+     <option>services.openssh.moduliFile</option> option.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     A newly packaged TeX Live 2015 is provided in
+     <literal>pkgs.texlive</literal>, split into 6500 nix packages. For basic
+     user documentation see
+     <link xlink:href="https://github.com/NixOS/nixpkgs/blob/release-15.09/pkgs/tools/typesetting/tex/texlive/default.nix#L1"
+      >the
+     source</link>. Beware of
+     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/9757"
+      >an
+     issue</link> when installing a too large package set. The plan is to
+     deprecate and maybe delete the original TeX packages until the next
+     release.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <option>buildEnv.env</option> on all Python interpreters is now available
+     for nix-shell interoperability.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 7279dd058270..9b512c4b1e58 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -3,250 +3,471 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-16.03">
+ <title>Release 16.03 (“Emu”, 2016/03/31)</title>
 
-<title>Release 16.03 (“Emu”, 2016/03/31)</title>
-
-<para>In addition to numerous new and upgraded packages, this release
-has the following highlights:</para>
-
-<itemizedlist>
+ <para>
+  In addition to numerous new and upgraded packages, this release has the
+  following highlights:
+ </para>
 
+ <itemizedlist>
   <listitem>
-    <para>Systemd 229, bringing <link
+   <para>
+    Systemd 229, bringing
+    <link
     xlink:href="https://github.com/systemd/systemd/blob/v229/NEWS">numerous
-    improvements</link> over 217.</para>
+    improvements</link> over 217.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Linux 4.4 (was 3.18).</para>
+   <para>
+    Linux 4.4 (was 3.18).
+   </para>
   </listitem>
-
   <listitem>
-    <para>GCC 5.3 (was 4.9). Note that GCC 5 <link
+   <para>
+    GCC 5.3 (was 4.9). Note that GCC 5
+    <link
     xlink:href="https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html">changes
-    the C++ ABI in an incompatible way</link>; this may cause problems
-    if you try to link objects compiled with different versions of
-    GCC.</para>
+    the C++ ABI in an incompatible way</link>; this may cause problems if you
+    try to link objects compiled with different versions of GCC.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Glibc 2.23 (was 2.21).</para>
+   <para>
+    Glibc 2.23 (was 2.21).
+   </para>
   </listitem>
-
   <listitem>
-    <para>Binutils 2.26 (was 2.23.1). See #909</para>
+   <para>
+    Binutils 2.26 (was 2.23.1). See #909
+   </para>
   </listitem>
-
   <listitem>
-    <para>Improved support for ensuring <link
-    xlink:href="https://reproducible-builds.org/">bitwise reproducible
-    builds</link>. For example, <literal>stdenv</literal> now sets the
-    environment variable <envar
+   <para>
+    Improved support for ensuring
+    <link
+    xlink:href="https://reproducible-builds.org/">bitwise
+    reproducible builds</link>. For example, <literal>stdenv</literal> now sets
+    the environment variable
+    <envar
     xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH</envar>
-    to a deterministic value, and Nix has <link
+    to a deterministic value, and Nix has
+    <link
     xlink:href="http://nixos.org/nix/manual/#ssec-relnotes-1.11">gained
-    an option</link> to repeat a build a number of times to test
-    determinism. An ongoing project, the goal of exact reproducibility
-    is to allow binaries to be verified independently (e.g., a user
-    might only trust binaries that appear in three independent binary
-    caches).</para>
+    an option</link> to repeat a build a number of times to test determinism.
+    An ongoing project, the goal of exact reproducibility is to allow binaries
+    to be verified independently (e.g., a user might only trust binaries that
+    appear in three independent binary caches).
+   </para>
   </listitem>
-
   <listitem>
-    <para>Perl 5.22.</para>
+   <para>
+    Perl 5.22.
+   </para>
   </listitem>
+ </itemizedlist>
 
-</itemizedlist>
-
-<para>The following new services were added since the last release:
-
+ <para>
+  The following new services were added since the last release:
   <itemizedlist>
-    <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
-    <listitem><para><literal>hardware/video/webcam/facetimehd.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/input-method/default.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/input-method/fcitx.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/input-method/ibus.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/input-method/nabi.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/input-method/uim.nix</literal></para></listitem>
-    <listitem><para><literal>programs/fish.nix</literal></para></listitem>
-    <listitem><para><literal>security/acme.nix</literal></para></listitem>
-    <listitem><para><literal>security/audit.nix</literal></para></listitem>
-    <listitem><para><literal>security/oath.nix</literal></para></listitem>
-    <listitem><para><literal>services/hardware/irqbalance.nix</literal></para></listitem>
-    <listitem><para><literal>services/mail/dspam.nix</literal></para></listitem>
-    <listitem><para><literal>services/mail/opendkim.nix</literal></para></listitem>
-    <listitem><para><literal>services/mail/postsrsd.nix</literal></para></listitem>
-    <listitem><para><literal>services/mail/rspamd.nix</literal></para></listitem>
-    <listitem><para><literal>services/mail/rmilter.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/autofs.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/bepasty.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/calibre-server.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/cfdyndns.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/gammu-smsd.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/mathics.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/matrix-synapse.nix</literal></para></listitem>
-    <listitem><para><literal>services/misc/octoprint.nix</literal></para></listitem>
-    <listitem><para><literal>services/monitoring/hdaps.nix</literal></para></listitem>
-    <listitem><para><literal>services/monitoring/heapster.nix</literal></para></listitem>
-    <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
-    <listitem><para><literal>services/network-filesystems/netatalk.nix</literal></para></listitem>
-    <listitem><para><literal>services/network-filesystems/xtreemfs.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/autossh.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/dnschain.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/gale.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/miniupnpd.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/namecoind.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/ostinato.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/pdnsd.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/shairport-sync.nix</literal></para></listitem>
-    <listitem><para><literal>services/networking/supplicant.nix</literal></para></listitem>
-    <listitem><para><literal>services/search/kibana.nix</literal></para></listitem>
-    <listitem><para><literal>services/security/haka.nix</literal></para></listitem>
-    <listitem><para><literal>services/security/physlock.nix</literal></para></listitem>
-    <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem>
-    <listitem><para><literal>services/x11/hardware/libinput.nix</literal></para></listitem>
-    <listitem><para><literal>services/x11/window-managers/windowlab.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/initrd-network.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/initrd-ssh.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/loader/loader.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/networkd.nix</literal></para></listitem>
-    <listitem><para><literal>system/boot/resolved.nix</literal></para></listitem>
-    <listitem><para><literal>virtualisation/lxd.nix</literal></para></listitem>
-    <listitem><para><literal>virtualisation/rkt.nix</literal></para></listitem>
-  </itemizedlist>
-</para>
-
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>We no longer produce graphical ISO images and VirtualBox
-    images for <literal>i686-linux</literal>. A minimal ISO image is
-    still provided.</para>
-  </listitem>
-
-  <listitem>
-    <para>Firefox and similar browsers are now <emphasis>wrapped by default</emphasis>.
-    The package and attribute names are plain <literal>firefox</literal>
-    or <literal>midori</literal>, etc.  Backward-compatibility attributes were set up,
-    but note that <command>nix-env -u</command> will <emphasis>not</emphasis> update
-    your current <literal>firefox-with-plugins</literal>;
-    you have to uninstall it and install <literal>firefox</literal> instead.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>wmiiSnap</command> has been replaced with
-    <command>wmii_hg</command>, but
-    <command>services.xserver.windowManager.wmii.enable</command> has
-    been updated respectively so this only affects you if you have
-    explicitly installed <command>wmiiSnap</command>.
+   <listitem>
+    <para>
+     <literal>services/monitoring/longview.nix</literal>
     </para>
-  </listitem>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>hardware/video/webcam/facetimehd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>i18n/input-method/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>i18n/input-method/fcitx.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>i18n/input-method/ibus.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>i18n/input-method/nabi.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>i18n/input-method/uim.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/fish.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>security/acme.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>security/audit.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>security/oath.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/hardware/irqbalance.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/dspam.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/opendkim.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/postsrsd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/rspamd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/rmilter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/autofs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/bepasty.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/calibre-server.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/cfdyndns.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/gammu-smsd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/mathics.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/matrix-synapse.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/octoprint.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/hdaps.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/heapster.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/longview.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/network-filesystems/netatalk.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/network-filesystems/xtreemfs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/autossh.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/dnschain.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/gale.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/miniupnpd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/namecoind.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/ostinato.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/pdnsd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/shairport-sync.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/supplicant.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/search/kibana.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/haka.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/physlock.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/pump.io.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/x11/hardware/libinput.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/x11/window-managers/windowlab.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/initrd-network.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/initrd-ssh.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/loader/loader.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/networkd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/resolved.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/lxd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/rkt.nix</literal>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 
+ <para>
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
+ </para>
+
+ <itemizedlist>
   <listitem>
-    <para><literal>jobs</literal> NixOS option has been removed. It served as
+   <para>
+    We no longer produce graphical ISO images and VirtualBox images for
+    <literal>i686-linux</literal>. A minimal ISO image is still provided.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Firefox and similar browsers are now <emphasis>wrapped by
+    default</emphasis>. The package and attribute names are plain
+    <literal>firefox</literal> or <literal>midori</literal>, etc.
+    Backward-compatibility attributes were set up, but note that
+    <command>nix-env -u</command> will <emphasis>not</emphasis> update your
+    current <literal>firefox-with-plugins</literal>; you have to uninstall it
+    and install <literal>firefox</literal> instead.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <command>wmiiSnap</command> has been replaced with
+    <command>wmii_hg</command>, but
+    <command>services.xserver.windowManager.wmii.enable</command> has been
+    updated respectively so this only affects you if you have explicitly
+    installed <command>wmiiSnap</command>.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    <literal>jobs</literal> NixOS option has been removed. It served as
     compatibility layer between Upstart jobs and SystemD services. All services
-    have been rewritten to use <literal>systemd.services</literal></para>
+    have been rewritten to use <literal>systemd.services</literal>
+   </para>
   </listitem>
-
   <listitem>
-    <para><command>wmiimenu</command> is removed, as it has been
-    removed by the developers upstream. Use <command>wimenu</command>
-    from the <command>wmii-hg</command> package.</para>
+   <para>
+    <command>wmiimenu</command> is removed, as it has been removed by the
+    developers upstream. Use <command>wimenu</command> from the
+    <command>wmii-hg</command> package.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Gitit is no longer automatically added to the module list in
-    NixOS and as such there will not be any manual entries for it. You
-    will need to add an import statement to your NixOS configuration
-    in order to use it, e.g.
-
+   <para>
+    Gitit is no longer automatically added to the module list in NixOS and as
+    such there will not be any manual entries for it. You will need to add an
+    import statement to your NixOS configuration in order to use it, e.g.
 <programlisting><![CDATA[
 {
   imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ];
 }
 ]]></programlisting>
-
-    will include the Gitit service configuration options.</para>
+    will include the Gitit service configuration options.
+   </para>
   </listitem>
-
   <listitem>
-    <para><command>nginx</command> does not accept flags for enabling and
-    disabling modules anymore. Instead it accepts <literal>modules</literal>
-    argument, which is a list of modules to be built in. All modules now
-    reside in <literal>nginxModules</literal> set. Example configuration:
-
+   <para>
+    <command>nginx</command> does not accept flags for enabling and disabling
+    modules anymore. Instead it accepts <literal>modules</literal> argument,
+    which is a list of modules to be built in. All modules now reside in
+    <literal>nginxModules</literal> set. Example configuration:
 <programlisting><![CDATA[
 nginx.override {
   modules = [ nginxModules.rtmp nginxModules.dav nginxModules.moreheaders ];
 }
 ]]></programlisting>
-    </para>
+   </para>
   </listitem>
-
   <listitem>
-    <para><command>s3sync</command> is removed, as it hasn't been
-    developed by upstream for 4 years and only runs with ruby 1.8.
-    For an actively-developer alternative look at
-    <command>tarsnap</command> and others.
-    </para>
+   <para>
+    <command>s3sync</command> is removed, as it hasn't been developed by
+    upstream for 4 years and only runs with ruby 1.8. For an actively-developer
+    alternative look at <command>tarsnap</command> and others.
+   </para>
   </listitem>
-
   <listitem>
-    <para><command>ruby_1_8</command> has been removed as it's not
-    supported from upstream anymore and probably contains security
-    issues.
-    </para>
+   <para>
+    <command>ruby_1_8</command> has been removed as it's not supported from
+    upstream anymore and probably contains security issues.
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>tidy-html5</literal> package is removed.
-    Upstream only provided <literal>(lib)tidy5</literal> during development,
-    and now they went back to <literal>(lib)tidy</literal> to work as a drop-in
-    replacement of the original package that has been unmaintained for years.
-    You can (still) use the <literal>html-tidy</literal> package, which got updated
-    to a stable release from this new upstream.</para>
+   <para>
+    <literal>tidy-html5</literal> package is removed. Upstream only provided
+    <literal>(lib)tidy5</literal> during development, and now they went back to
+    <literal>(lib)tidy</literal> to work as a drop-in replacement of the
+    original package that has been unmaintained for years. You can (still) use
+    the <literal>html-tidy</literal> package, which got updated to a stable
+    release from this new upstream.
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>extraDeviceOptions</literal> argument is removed
-    from <literal>bumblebee</literal> package. Instead there are
-    now two separate arguments: <literal>extraNvidiaDeviceOptions</literal>
-    and <literal>extraNouveauDeviceOptions</literal> for setting
-    extra X11 options for nvidia and nouveau drivers, respectively.
-    </para>
+   <para>
+    <literal>extraDeviceOptions</literal> argument is removed from
+    <literal>bumblebee</literal> package. Instead there are now two separate
+    arguments: <literal>extraNvidiaDeviceOptions</literal> and
+    <literal>extraNouveauDeviceOptions</literal> for setting extra X11 options
+    for nvidia and nouveau drivers, respectively.
+   </para>
   </listitem>
-
   <listitem>
-    <para>The <literal>Ctrl+Alt+Backspace</literal> key combination
-    no longer kills the X server by default.
-    There's a new option <option>services.xserver.enableCtrlAltBackspace</option>
-    allowing to enable the combination again.
-    </para>
+   <para>
+    The <literal>Ctrl+Alt+Backspace</literal> key combination no longer kills
+    the X server by default. There's a new option
+    <option>services.xserver.enableCtrlAltBackspace</option> allowing to enable
+    the combination again.
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>emacsPackagesNg</literal> now contains all packages
-    from the ELPA, MELPA, and MELPA Stable repositories.
-    </para>
+   <para>
+    <literal>emacsPackagesNg</literal> now contains all packages from the ELPA,
+    MELPA, and MELPA Stable repositories.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Data directory for Postfix MTA server is moved from
+   <para>
+    Data directory for Postfix MTA server is moved from
     <filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>.
-    Old configurations are migrated automatically. <literal>service.postfix</literal>
-    module has also received many improvements, such as correct directories' access
-    rights, new <literal>aliasFiles</literal> and <literal>mapFiles</literal>
-    options and more.</para>
+    Old configurations are migrated automatically.
+    <literal>service.postfix</literal> module has also received many
+    improvements, such as correct directories' access rights, new
+    <literal>aliasFiles</literal> and <literal>mapFiles</literal> options and
+    more.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Filesystem options should now be configured as a list of strings, not
-    a comma-separated string. The old style will continue to work, but print a
+   <para>
+    Filesystem options should now be configured as a list of strings, not a
+    comma-separated string. The old style will continue to work, but print a
     warning, until the 16.09 release. An example of the new style:
-
 <programlisting>
 fileSystems."/example" = {
   device = "/dev/sdc";
@@ -254,103 +475,103 @@ fileSystems."/example" = {
   options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ];
 };
 </programlisting>
-    </para>
+   </para>
   </listitem>
-
   <listitem>
-    <para>CUPS, installed by <literal>services.printing</literal> module, now
-    has its data directory in <filename>/var/lib/cups</filename>. Old
-    configurations from <filename>/etc/cups</filename> are moved there
-    automatically, but there might be problems. Also configuration options
+   <para>
+    CUPS, installed by <literal>services.printing</literal> module, now has its
+    data directory in <filename>/var/lib/cups</filename>. Old configurations
+    from <filename>/etc/cups</filename> are moved there automatically, but
+    there might be problems. Also configuration options
     <literal>services.printing.cupsdConf</literal> and
-    <literal>services.printing.cupsdFilesConf</literal> were removed
-    because they had been allowing one to override configuration variables
-    required for CUPS to work at all on NixOS. For most use cases,
+    <literal>services.printing.cupsdFilesConf</literal> were removed because
+    they had been allowing one to override configuration variables required for
+    CUPS to work at all on NixOS. For most use cases,
     <literal>services.printing.extraConf</literal> and new option
-    <literal>services.printing.extraFilesConf</literal> should be enough;
-    if you encounter a situation when they are not, please file a bug.</para>
-
-    <para>There are also Gutenprint improvements; in particular, a new option
-    <literal>services.printing.gutenprint</literal> is added to enable automatic
-    updating of Gutenprint PPMs; it's greatly recommended to enable it instead
-    of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list.
-    </para>
+    <literal>services.printing.extraFilesConf</literal> should be enough; if
+    you encounter a situation when they are not, please file a bug.
+   </para>
+   <para>
+    There are also Gutenprint improvements; in particular, a new option
+    <literal>services.printing.gutenprint</literal> is added to enable
+    automatic updating of Gutenprint PPMs; it's greatly recommended to enable
+    it instead of adding <literal>gutenprint</literal> to the
+    <literal>drivers</literal> list.
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>services.xserver.vaapiDrivers</literal> has been removed. Use
-    <literal>hardware.opengl.extraPackages{,32}</literal> instead. You can
-    also specify VDPAU drivers there.</para>
+   <para>
+    <literal>services.xserver.vaapiDrivers</literal> has been removed. Use
+    <literal>hardware.opengl.extraPackages{,32}</literal> instead. You can also
+    specify VDPAU drivers there.
+   </para>
   </listitem>
-
   <listitem>
-    <para>
-    <literal>programs.ibus</literal> moved to <literal>i18n.inputMethod.ibus</literal>.
-    The option <literal>programs.ibus.plugins</literal> changed to <literal>i18n.inputMethod.ibus.engines</literal>
-    and the option to enable ibus changed from <literal>programs.ibus.enable</literal> to
+   <para>
+    <literal>programs.ibus</literal> moved to
+    <literal>i18n.inputMethod.ibus</literal>. The option
+    <literal>programs.ibus.plugins</literal> changed to
+    <literal>i18n.inputMethod.ibus.engines</literal> and the option to enable
+    ibus changed from <literal>programs.ibus.enable</literal> to
     <literal>i18n.inputMethod.enabled</literal>.
-    <literal>i18n.inputMethod.enabled</literal> should be set to the used input method name,
-    <literal>"ibus"</literal> for ibus.
-    An example of the new style:
-
+    <literal>i18n.inputMethod.enabled</literal> should be set to the used input
+    method name, <literal>"ibus"</literal> for ibus. An example of the new
+    style:
 <programlisting>
 i18n.inputMethod.enabled = "ibus";
 i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ];
 </programlisting>
-
-That is equivalent to the old version:
-
+    That is equivalent to the old version:
 <programlisting>
 programs.ibus.enable = true;
 programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
 </programlisting>
-
-    </para>
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>services.udev.extraRules</literal> option now writes rules
-    to <filename>99-local.rules</filename> instead of <filename>10-local.rules</filename>.
-    This makes all the user rules apply after others, so their results wouldn't be
-    overriden by anything else.</para>
+   <para>
+    <literal>services.udev.extraRules</literal> option now writes rules to
+    <filename>99-local.rules</filename> instead of
+    <filename>10-local.rules</filename>. This makes all the user rules apply
+    after others, so their results wouldn't be overriden by anything else.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Large parts of the <literal>services.gitlab</literal> module has been
-    been rewritten. There are new configuration options available. The
+   <para>
+    Large parts of the <literal>services.gitlab</literal> module has been been
+    rewritten. There are new configuration options available. The
     <literal>stateDir</literal> option was renamned to
-    <literal>statePath</literal> and the <literal>satellitesDir</literal> option
-    was removed. Please review the currently available options.</para>
+    <literal>statePath</literal> and the <literal>satellitesDir</literal>
+    option was removed. Please review the currently available options.
+   </para>
   </listitem>
-
   <listitem>
-    <para>
-    The option <option>services.nsd.zones.&lt;name&gt;.data</option> no
-    longer interpret the dollar sign ($) as a shell variable, as such it
-    should not be escaped anymore.  Thus the following zone data:
-    </para>
-    <programlisting>
+   <para>
+    The option <option>services.nsd.zones.&lt;name&gt;.data</option> no longer
+    interpret the dollar sign ($) as a shell variable, as such it should not be
+    escaped anymore. Thus the following zone data:
+   </para>
+<programlisting>
 \$ORIGIN example.com.
 \$TTL 1800
 @       IN      SOA     ns1.vpn.nbp.name.      admin.example.com. (
     </programlisting>
-    <para>
+   <para>
     Should modified to look like the actual file expected by nsd:
-    </para>
-    <programlisting>
+   </para>
+<programlisting>
 $ORIGIN example.com.
 $TTL 1800
 @       IN      SOA     ns1.vpn.nbp.name.      admin.example.com. (
     </programlisting>
   </listitem>
-
   <listitem>
-    <para>
-    <literal>service.syncthing.dataDir</literal> options now has to point
-    to exact folder where syncthing is writing to. Example configuration should
+   <para>
+    <literal>service.syncthing.dataDir</literal> options now has to point to
+    exact folder where syncthing is writing to. Example configuration should
     look something like:
-    </para>
-    <programlisting>
+   </para>
+<programlisting>
 services.syncthing = {
     enable = true;
     dataDir = "/home/somebody/.syncthing";
@@ -358,76 +579,73 @@ services.syncthing = {
 };
     </programlisting>
   </listitem>
-
   <listitem>
-    <para>
-      <literal>networking.firewall.allowPing</literal> is now enabled by
-      default. Users are encouraged to configure an appropriate rate limit for
-      their machines using the Kernel interface at
-      <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and
-      <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the
-      firewall itself, i.e. by setting the NixOS option
-      <literal>networking.firewall.pingLimit</literal>.
-    </para>
+   <para>
+    <literal>networking.firewall.allowPing</literal> is now enabled by default.
+    Users are encouraged to configure an appropriate rate limit for their
+    machines using the Kernel interface at
+    <filename>/proc/sys/net/ipv4/icmp_ratelimit</filename> and
+    <filename>/proc/sys/net/ipv6/icmp/ratelimit</filename> or using the
+    firewall itself, i.e. by setting the NixOS option
+    <literal>networking.firewall.pingLimit</literal>.
+   </para>
   </listitem>
-
   <listitem>
-    <para>
-      Systems with some broadcom cards used to result into a generated config
-      that is no longer accepted. If you get errors like
-      <screen>error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created</screen>
-      you should either re-run <command>nixos-generate-config</command> or manually replace
-      <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal>
-      by
-      <literal>config.boot.kernelPackages.broadcom_sta</literal>
-      in your <filename>/etc/nixos/hardware-configuration.nix</filename>.
-      More discussion is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595">
-      the github issue</link>.
-    </para>
+   <para>
+    Systems with some broadcom cards used to result into a generated config
+    that is no longer accepted. If you get errors like
+<screen>error: path ‘/nix/store/*-broadcom-sta-*’ does not exist and cannot be created</screen>
+    you should either re-run <command>nixos-generate-config</command> or
+    manually replace
+    <literal>"${config.boot.kernelPackages.broadcom_sta}"</literal> by
+    <literal>config.boot.kernelPackages.broadcom_sta</literal> in your
+    <filename>/etc/nixos/hardware-configuration.nix</filename>. More discussion
+    is on <link xlink:href="https://github.com/NixOS/nixpkgs/pull/12595"> the
+    github issue</link>.
+   </para>
   </listitem>
-
   <listitem>
-    <para>
-      The <literal>services.xserver.startGnuPGAgent</literal> option has been removed.
-      GnuPG 2.1.x changed the way the gpg-agent works, and that new approach no
-      longer requires (or even supports) the "start everything as a child of the
-      agent" scheme we've implemented in NixOS for older versions.
-      To configure the gpg-agent for your X session, add the following code to
-      <filename>~/.bashrc</filename> or some file that’s sourced when your shell is started:
-    <programlisting>
+   <para>
+    The <literal>services.xserver.startGnuPGAgent</literal> option has been
+    removed. GnuPG 2.1.x changed the way the gpg-agent works, and that new
+    approach no longer requires (or even supports) the "start everything as a
+    child of the agent" scheme we've implemented in NixOS for older versions.
+    To configure the gpg-agent for your X session, add the following code to
+    <filename>~/.bashrc</filename> or some file that’s sourced when your
+    shell is started:
+<programlisting>
 GPG_TTY=$(tty)
 export GPG_TTY
     </programlisting>
-      If you want to use gpg-agent for SSH, too, add the following to your session
-      initialization (e.g. <literal>displayManager.sessionCommands</literal>)
-    <programlisting>
+    If you want to use gpg-agent for SSH, too, add the following to your
+    session initialization (e.g.
+    <literal>displayManager.sessionCommands</literal>)
+<programlisting>
 gpg-connect-agent /bye
 unset SSH_AGENT_PID
 export SSH_AUTH_SOCK="''${HOME}/.gnupg/S.gpg-agent.ssh"
     </programlisting>
-      and make sure that
-    <programlisting>
+    and make sure that
+<programlisting>
 enable-ssh-support
     </programlisting>
-      is included in your <filename>~/.gnupg/gpg-agent.conf</filename>.
-      You will need to use <command>ssh-add</command> to re-add your ssh keys.
-      If gpg’s automatic transformation of the private keys to the new format fails,
-      you will need to re-import your private keyring as well:
-    <programlisting>
+    is included in your <filename>~/.gnupg/gpg-agent.conf</filename>. You will
+    need to use <command>ssh-add</command> to re-add your ssh keys. If gpg’s
+    automatic transformation of the private keys to the new format fails, you
+    will need to re-import your private keyring as well:
+<programlisting>
 gpg --import ~/.gnupg/secring.gpg
     </programlisting>
-    The <command>gpg-agent(1)</command> man page has more details about this subject,
-    i.e. in the "EXAMPLES" section.
-    </para>
+    The <command>gpg-agent(1)</command> man page has more details about this
+    subject, i.e. in the "EXAMPLES" section.
+   </para>
   </listitem>
-</itemizedlist>
+ </itemizedlist>
 
-
-<para>Other notable improvements:
-
-<itemizedlist>
-
-  <!--
+ <para>
+  Other notable improvements:
+  <itemizedlist>
+<!--
   <listitem>
     <para>The <command>command-not-found</command> hook was extended.
     Apart from <literal>$NIX_AUTO_INSTALL</literal> variable,
@@ -436,18 +654,18 @@ gpg --import ~/.gnupg/secring.gpg
     <command>nix-shell</command> (without installing anything).</para>
   </listitem>
   -->
-
-  <listitem>
-    <para><literal>ejabberd</literal> module is brought back and now works on
-    NixOS.</para>
-  </listitem>
-
-  <listitem>
-    <para>Input method support was improved. New NixOS modules (fcitx, nabi and uim),
-    fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus engines (hangul and m17n)
-    have been added.</para>
-  </listitem>
-
-</itemizedlist></para>
-
+   <listitem>
+    <para>
+     <literal>ejabberd</literal> module is brought back and now works on NixOS.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Input method support was improved. New NixOS modules (fcitx, nabi and
+     uim), fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus
+     engines (hangul and m17n) have been added.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </para>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml
index 893f894f42fe..4a2343edc970 100644
--- a/nixos/doc/manual/release-notes/rl-1609.xml
+++ b/nixos/doc/manual/release-notes/rl-1609.xml
@@ -3,237 +3,275 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-16.09">
+ <title>Release 16.09 (“Flounder”, 2016/09/30)</title>
 
-<title>Release 16.09 (“Flounder”, 2016/09/30)</title>
-
-<para>In addition to numerous new and upgraded packages, this release
-has the following highlights: </para>
-
-<itemizedlist>
+ <para>
+  In addition to numerous new and upgraded packages, this release has the
+  following highlights:
+ </para>
 
+ <itemizedlist>
   <listitem>
-    <para>Many NixOS configurations and Nix packages now use
-    significantly less disk space, thanks to the <link
+   <para>
+    Many NixOS configurations and Nix packages now use significantly less disk
+    space, thanks to the
+    <link
     xlink:href="https://github.com/NixOS/nixpkgs/issues/7117">extensive
-    work on closure size reduction</link>. For example, the closure
-    size of a minimal NixOS container went down from ~424 MiB in 16.03
-    to ~212 MiB in 16.09, while the closure size of Firefox went from
-    ~651 MiB to ~259 MiB.</para>
+    work on closure size reduction</link>. For example, the closure size of a
+    minimal NixOS container went down from ~424 MiB in 16.03 to ~212 MiB in
+    16.09, while the closure size of Firefox went from ~651 MiB to ~259 MiB.
+   </para>
   </listitem>
-
   <listitem>
-    <para>To improve security, packages are now <link
+   <para>
+    To improve security, packages are now
+    <link
     xlink:href="https://github.com/NixOS/nixpkgs/pull/12895">built
-    using various hardening features</link>. See the Nixpkgs manual
-    for more information.</para>
+    using various hardening features</link>. See the Nixpkgs manual for more
+    information.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Support for PXE netboot.  See <xref
-    linkend="sec-booting-from-pxe" /> for documentation.</para>
+   <para>
+    Support for PXE netboot. See <xref
+    linkend="sec-booting-from-pxe" />
+    for documentation.
+   </para>
   </listitem>
-
   <listitem>
-    <para>X.org server 1.18. If you use the
-    <literal>ati_unfree</literal> driver, 1.17 is still used due to an
-    ABI incompatibility.</para>
+   <para>
+    X.org server 1.18. If you use the <literal>ati_unfree</literal> driver,
+    1.17 is still used due to an ABI incompatibility.
+   </para>
   </listitem>
-
   <listitem>
-    <para>This release is based on Glibc 2.24, GCC 5.4.0 and systemd
-    231. The default Linux kernel remains 4.4.</para>
+   <para>
+    This release is based on Glibc 2.24, GCC 5.4.0 and systemd 231. The default
+    Linux kernel remains 4.4.
+   </para>
   </listitem>
+ </itemizedlist>
 
-</itemizedlist>
-
-<para>The following new services were added since the last release:</para>
-
-<itemizedlist>
-  <listitem><para><literal>(this will get automatically generated at release time)</literal></para></listitem>
-</itemizedlist>
-
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:</para>
-
-<itemizedlist>
+ <para>
+  The following new services were added since the last release:
+ </para>
 
+ <itemizedlist>
   <listitem>
-    <para>A large number of packages have been converted to use the multiple outputs feature
-      of Nix to greatly reduce the amount of required disk space, as
-      mentioned above. This may require changes
-      to any custom packages to make them build again; see the relevant chapter in the
-      Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions
-      related to multiple-output packages
-      <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were changed</link>
-      late (August 2016) in the release cycle and differ from the initial introduction of multiple outputs.)
-    </para>
+   <para>
+    <literal>(this will get automatically generated at release time)</literal>
+   </para>
   </listitem>
+ </itemizedlist>
 
+ <para>
+  When upgrading from a previous release, please be aware of the following
+  incompatible changes:
+ </para>
+
+ <itemizedlist>
   <listitem>
-    <para>Previous versions of Nixpkgs had support for all versions of the LTS
+   <para>
+    A large number of packages have been converted to use the multiple outputs
+    feature of Nix to greatly reduce the amount of required disk space, as
+    mentioned above. This may require changes to any custom packages to make
+    them build again; see the relevant chapter in the Nixpkgs manual for more
+    information. (Additional caveat to packagers: some packaging conventions
+    related to multiple-output packages
+    <link xlink:href="https://github.com/NixOS/nixpkgs/pull/14766">were
+    changed</link> late (August 2016) in the release cycle and differ from the
+    initial introduction of multiple outputs.)
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Previous versions of Nixpkgs had support for all versions of the LTS
     Haskell package set. That support has been dropped. The previously provided
     <literal>haskell.packages.lts-x_y</literal> package sets still exist in
     name to aviod breaking user code, but these package sets don't actually
     contain the versions mandated by the corresponding LTS release. Instead,
     our package set it loosely based on the latest available LTS release, i.e.
     LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will
-    drop those old names entirely. <link
+    drop those old names entirely.
+    <link
     xlink:href="https://nixos.org/nix-dev/2016-June/020585.html">The
     motivation for this change</link> has been discussed at length on the
-    <literal>nix-dev</literal> mailing list and in <link
-    xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github issue
-    #14897</link>. Development strategies for Haskell hackers who want to rely
-    on Nix and NixOS have been described in <link
+    <literal>nix-dev</literal> mailing list and in
+    <link
+    xlink:href="https://github.com/NixOS/nixpkgs/issues/14897">Github
+    issue #14897</link>. Development strategies for Haskell hackers who want to
+    rely on Nix and NixOS have been described in
+    <link
     xlink:href="https://nixos.org/nix-dev/2016-June/020642.html">another
-    nix-dev article</link>.</para>
+    nix-dev article</link>.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Shell aliases for systemd sub-commands
-    <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were dropped</link>:
-    <command>start</command>, <command>stop</command>,
-    <command>restart</command>, <command>status</command>.</para>
+   <para>
+    Shell aliases for systemd sub-commands
+    <link xlink:href="https://github.com/NixOS/nixpkgs/pull/15598">were
+    dropped</link>: <command>start</command>, <command>stop</command>,
+    <command>restart</command>, <command>status</command>.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Redis now binds to 127.0.0.1 only instead of listening to all network interfaces. This is the default
-    behavior of Redis 3.2</para>
+   <para>
+    Redis now binds to 127.0.0.1 only instead of listening to all network
+    interfaces. This is the default behavior of Redis 3.2
+   </para>
   </listitem>
-
   <listitem>
-    <para>
-      <literal>/var/empty</literal> is now immutable. Activation script runs <command>chattr +i</command>
-      to forbid any modifications inside the folder. See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365">
-      the pull request</link> for what bugs this caused.
-    </para>
+   <para>
+    <literal>/var/empty</literal> is now immutable. Activation script runs
+    <command>chattr +i</command> to forbid any modifications inside the folder.
+    See <link xlink:href="https://github.com/NixOS/nixpkgs/pull/18365"> the
+    pull request</link> for what bugs this caused.
+   </para>
   </listitem>
-
   <listitem>
-    <para>Gitlab's maintainance script
-    <command>gitlab-runner</command> was removed and split up into the
-    more clearer <command>gitlab-run</command> and
+   <para>
+    Gitlab's maintainance script <command>gitlab-runner</command> was removed
+    and split up into the more clearer <command>gitlab-run</command> and
     <command>gitlab-rake</command> scripts, because
-    <command>gitlab-runner</command> is a component of Gitlab
-    CI.</para>
+    <command>gitlab-runner</command> is a component of Gitlab CI.
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>services.xserver.libinput.accelProfile</literal> default
-    changed from <literal>flat</literal> to <literal>adaptive</literal>,
-    as per <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79">
-    official documentation</link>.</para>
+   <para>
+    <literal>services.xserver.libinput.accelProfile</literal> default changed
+    from <literal>flat</literal> to <literal>adaptive</literal>, as per
+    <link xlink:href="https://wayland.freedesktop.org/libinput/doc/latest/group__config.html#gad63796972347f318b180e322e35cee79">
+    official documentation</link>.
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>fonts.fontconfig.ultimate.rendering</literal> was removed
-    because our presets were obsolete for some time. New presets are hardcoded
-    into FreeType; you can select a preset via <literal>fonts.fontconfig.ultimate.preset</literal>.
-    You can customize those presets via ordinary environment variables, using
-    <literal>environment.variables</literal>.</para>
+   <para>
+    <literal>fonts.fontconfig.ultimate.rendering</literal> was removed because
+    our presets were obsolete for some time. New presets are hardcoded into
+    FreeType; you can select a preset via
+    <literal>fonts.fontconfig.ultimate.preset</literal>. You can customize
+    those presets via ordinary environment variables, using
+    <literal>environment.variables</literal>.
+   </para>
   </listitem>
-
   <listitem>
-    <para>The <literal>audit</literal> service is no longer enabled by default.
-    Use <literal>security.audit.enable = true</literal> to explicitly enable it.</para>
+   <para>
+    The <literal>audit</literal> service is no longer enabled by default. Use
+    <literal>security.audit.enable = true</literal> to explicitly enable it.
+   </para>
   </listitem>
-
   <listitem>
-    <para>
-      <literal>pkgs.linuxPackages.virtualbox</literal> now contains only the
-      kernel modules instead of the VirtualBox user space binaries.
-      If you want to reference the user space binaries, you have to use the new
-      <literal>pkgs.virtualbox</literal> instead.
-    </para>
+   <para>
+    <literal>pkgs.linuxPackages.virtualbox</literal> now contains only the
+    kernel modules instead of the VirtualBox user space binaries. If you want
+    to reference the user space binaries, you have to use the new
+    <literal>pkgs.virtualbox</literal> instead.
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>goPackages</literal> was replaced with separated Go
-    applications in appropriate <literal>nixpkgs</literal>
-    categories. Each Go package uses its own dependency set. There's
-    also a new <literal>go2nix</literal> tool introduced to generate a
-    Go package definition from its Go source automatically.</para>
+   <para>
+    <literal>goPackages</literal> was replaced with separated Go applications
+    in appropriate <literal>nixpkgs</literal> categories. Each Go package uses
+    its own dependency set. There's also a new <literal>go2nix</literal> tool
+    introduced to generate a Go package definition from its Go source
+    automatically.
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>services.mongodb.extraConfig</literal> configuration format
-    was changed to YAML.</para>
+   <para>
+    <literal>services.mongodb.extraConfig</literal> configuration format was
+    changed to YAML.
+   </para>
   </listitem>
-
   <listitem>
-    <para>
-      PHP has been upgraded to 7.0
-    </para>
+   <para>
+    PHP has been upgraded to 7.0
+   </para>
   </listitem>
-</itemizedlist>
+ </itemizedlist>
 
+ <para>
+  Other notable improvements:
+ </para>
 
-<para>Other notable improvements:</para>
-
-<itemizedlist>
-
-  <listitem><para>Revamped grsecurity/PaX support.  There is now only a single
-  general-purpose distribution kernel and the configuration interface has been
-  streamlined.  Desktop users should be able to simply set
-  <programlisting>security.grsecurity.enable = true</programlisting> to get
-  a reasonably secure system without having to sacrifice too much
-  functionality.
-  </para></listitem>
-
-  <listitem><para>Special filesystems, like <literal>/proc</literal>,
-  <literal>/run</literal> and others, now have the same mount options
-  as recommended by systemd and are unified across different places in
-  NixOS.  Mount options are updated during <command>nixos-rebuild
-  switch</command> if possible. One benefit from this is improved
-  security — most such filesystems are now mounted with
-  <literal>noexec</literal>, <literal>nodev</literal> and/or
-  <literal>nosuid</literal> options.</para></listitem>
-
-  <listitem><para>The reverse path filter was interfering with DHCPv4 server
-  operation in the past. An exception for DHCPv4 and a new option to log
-  packets that were dropped due to the reverse path filter was added
-  (<literal>networking.firewall.logReversePathDrops</literal>) for easier
-  debugging.</para></listitem>
-
-  <listitem><para>Containers configuration within
-  <literal>containers.&lt;name&gt;.config</literal> is <link
+ <itemizedlist>
+  <listitem>
+   <para>
+    Revamped grsecurity/PaX support. There is now only a single general-purpose
+    distribution kernel and the configuration interface has been streamlined.
+    Desktop users should be able to simply set
+<programlisting>security.grsecurity.enable = true</programlisting>
+    to get a reasonably secure system without having to sacrifice too much
+    functionality.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Special filesystems, like <literal>/proc</literal>, <literal>/run</literal>
+    and others, now have the same mount options as recommended by systemd and
+    are unified across different places in NixOS. Mount options are updated
+    during <command>nixos-rebuild switch</command> if possible. One benefit
+    from this is improved security — most such filesystems are now mounted
+    with <literal>noexec</literal>, <literal>nodev</literal> and/or
+    <literal>nosuid</literal> options.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    The reverse path filter was interfering with DHCPv4 server operation in the
+    past. An exception for DHCPv4 and a new option to log packets that were
+    dropped due to the reverse path filter was added
+    (<literal>networking.firewall.logReversePathDrops</literal>) for easier
+    debugging.
+   </para>
+  </listitem>
+  <listitem>
+   <para>
+    Containers configuration within
+    <literal>containers.&lt;name&gt;.config</literal> is
+    <link
   xlink:href="https://github.com/NixOS/nixpkgs/pull/17365">now
-  properly typed and checked</link>. In particular, partial
-  configurations are merged correctly.</para></listitem>
-
+    properly typed and checked</link>. In particular, partial configurations
+    are merged correctly.
+   </para>
+  </listitem>
   <listitem>
-    <para>The directory container setuid wrapper programs,
-    <filename>/var/setuid-wrappers</filename>, <link
+   <para>
+    The directory container setuid wrapper programs,
+    <filename>/var/setuid-wrappers</filename>,
+    <link
     xlink:href="https://github.com/NixOS/nixpkgs/pull/18124">is now
-    updated atomically to prevent failures if the switch to a new
-    configuration is interrupted.</link></para>
+    updated atomically to prevent failures if the switch to a new configuration
+    is interrupted.</link>
+   </para>
   </listitem>
-
   <listitem>
-    <para><literal>services.xserver.startGnuPGAgent</literal>
-      has been removed due to GnuPG 2.1.x bump. See <link
+   <para>
+    <literal>services.xserver.startGnuPGAgent</literal> has been removed due to
+    GnuPG 2.1.x bump. See
+    <link
         xlink:href="https://github.com/NixOS/nixpkgs/commit/5391882ebd781149e213e8817fba6ac3c503740c">
-        how to achieve similar behavior</link>. You might need to
-      <literal>pkill gpg-agent</literal> after the upgrade
-      to prevent a stale agent being in the way.
-    </para>
+    how to achieve similar behavior</link>. You might need to <literal>pkill
+    gpg-agent</literal> after the upgrade to prevent a stale agent being in the
+    way.
+   </para>
   </listitem>
-
-  <listitem><para>
+  <listitem>
+   <para>
     <link xlink:href="https://github.com/NixOS/nixpkgs/commit/e561edc322d275c3687fec431935095cfc717147">
-    Declarative users could share the uid due to the bug in
-    the script handling conflict resolution.
-    </link>
-  </para></listitem>
-
-  <listitem><para>
+    Declarative users could share the uid due to the bug in the script handling
+    conflict resolution. </link>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
     Gummi boot has been replaced using systemd-boot.
-  </para></listitem>
-
-  <listitem><para>
+   </para>
+  </listitem>
+  <listitem>
+   <para>
     Hydra package and NixOS module were added for convenience.
-  </para></listitem>
-
-</itemizedlist>
-
-
+   </para>
+  </listitem>
+ </itemizedlist>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 6147b9830137..6ca79e2bc00d 100644
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@@ -3,259 +3,588 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.03">
+ <title>Release 17.03 (“Gorilla”, 2017/03/31)</title>
 
-<title>Release 17.03 (“Gorilla”, 2017/03/31)</title>
-
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.03-highlights">
+  <title>Highlights</title>
 
-<title>Highlights</title>
+  <para>
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
+  </para>
 
-<para>In addition to numerous new and upgraded packages, this release
-has the following highlights: </para>
-
-<itemizedlist>
-  <listitem>
-    <para>Nixpkgs is now extensible through overlays. See the <link
-    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
-    manual</link> for more information.</para>
-  </listitem>
-
-  <listitem>
-    <para>This release is based on Glibc 2.25, GCC 5.4.0 and systemd
-    232. The default Linux kernel is 4.9 and Nix is at 1.11.8.</para>
-  </listitem>
-
-  <listitem>
-    <para>The default desktop environment now is KDE's Plasma 5. KDE 4 has been removed</para>
-  </listitem>
-
-  <listitem>
-    <para>The setuid wrapper functionality now supports setting
-    capabilities.</para>
-  </listitem>
-
-  <listitem>
-    <para>X.org server uses branch 1.19. Due to ABI incompatibilities,
-      <literal>ati_unfree</literal> keeps forcing 1.17
-      and <literal>amdgpu-pro</literal> starts forcing 1.18.</para>
-  </listitem>
-
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      Cross compilation has been rewritten. See the nixpkgs manual for
-      details. The most obvious breaking change is that in derivations there is no
-      <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now
-      cross by default, not native.
+     Nixpkgs is now extensible through overlays. See the
+     <link
+    xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs
+     manual</link> for more information.
     </para>
-  </listitem>
-
-  <listitem>
-    <para>The <literal>overridePackages</literal> function has been rewritten
-    to be replaced by <link
+   </listitem>
+   <listitem>
+    <para>
+     This release is based on Glibc 2.25, GCC 5.4.0 and systemd 232. The
+     default Linux kernel is 4.9 and Nix is at 1.11.8.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The default desktop environment now is KDE's Plasma 5. KDE 4 has been
+     removed
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The setuid wrapper functionality now supports setting capabilities.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     X.org server uses branch 1.19. Due to ABI incompatibilities,
+     <literal>ati_unfree</literal> keeps forcing 1.17 and
+     <literal>amdgpu-pro</literal> starts forcing 1.18.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Cross compilation has been rewritten. See the nixpkgs manual for details.
+     The most obvious breaking change is that in derivations there is no
+     <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> are now
+     cross by default, not native.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     The <literal>overridePackages</literal> function has been rewritten to be
+     replaced by
+     <link
     xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
-    overlays</link></para>
-  </listitem>
-
-  <listitem>
-    <para>Packages in nixpkgs can be marked as insecure through listed
-    vulnerabilities. See the <link
+     overlays</link>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Packages in nixpkgs can be marked as insecure through listed
+     vulnerabilities. See the
+     <link
     xlink:href="https://nixos.org/nixpkgs/manual/#sec-allow-insecure">Nixpkgs
-    manual</link> for more information.</para>
-  </listitem>
+     manual</link> for more information.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     PHP now defaults to PHP 7.1
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-  <listitem>
-    <para>PHP now defaults to PHP 7.1</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.03-new-services">
+  <title>New Services</title>
 
-<title>New Services</title>
+  <para>
+   The following new services were added since the last release:
+  </para>
 
-<para>The following new services were added since the last release:</para>
+  <itemizedlist>
+   <listitem>
+    <para>
+     <literal>hardware/ckb.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>hardware/mcelog.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>hardware/usb-wwan.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>hardware/video/capture/mwprocapture.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/adb.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/chromium.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/gphoto2.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/java.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/mtr.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/oblogout.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/vim.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/wireshark.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>security/dhparams.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/audio/ympd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/computing/boinc/client.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/continuous-integration/buildbot/master.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/continuous-integration/buildbot/worker.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/continuous-integration/gitlab-runner.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/databases/riak-cs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/databases/stanchion.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/desktops/gnome3/gnome-terminal-server.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/editors/infinoted.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/hardware/illum.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/hardware/trezord.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/logging/journalbeat.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/offlineimap.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/postgrey.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/couchpotato.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/docker-registry.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/errbot.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/geoip-updater.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/gogs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/leaps.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/nix-optimise.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/ssm-agent.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/sssd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/arbtt.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/netdata.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/alertmanager.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/blackbox-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/json-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/nginx-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/node-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/snmp-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/unifi-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/varnish-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/sysstat.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/telegraf.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/vnstat.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/network-filesystems/cachefilesd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/network-filesystems/glusterfs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/network-filesystems/ipfs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/dante.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/dnscrypt-wrapper.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/fakeroute.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/flannel.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/htpdate.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/miredo.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/nftables.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/powerdns.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/pdns-recursor.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/quagga.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/redsocks.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/wireguard.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/system/cgmanager.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/torrent/opentracker.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/atlassian/confluence.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/atlassian/crowd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/atlassian/jira.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/frab.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/nixbot.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/selfoss.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/quassel-webserver.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/x11/unclutter-xfixes.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/x11/urxvtd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>system/boot/systemd-nspawn.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/ecs-agent.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/lxcfs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/openstack/keystone.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>virtualisation/openstack/glance.nix</literal>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-<itemizedlist>
-  <listitem><para><literal>hardware/ckb.nix</literal></para></listitem>
-  <listitem><para><literal>hardware/mcelog.nix</literal></para></listitem>
-  <listitem><para><literal>hardware/usb-wwan.nix</literal></para></listitem>
-  <listitem><para><literal>hardware/video/capture/mwprocapture.nix</literal></para></listitem>
-  <listitem><para><literal>programs/adb.nix</literal></para></listitem>
-  <listitem><para><literal>programs/chromium.nix</literal></para></listitem>
-  <listitem><para><literal>programs/gphoto2.nix</literal></para></listitem>
-  <listitem><para><literal>programs/java.nix</literal></para></listitem>
-  <listitem><para><literal>programs/mtr.nix</literal></para></listitem>
-  <listitem><para><literal>programs/oblogout.nix</literal></para></listitem>
-  <listitem><para><literal>programs/vim.nix</literal></para></listitem>
-  <listitem><para><literal>programs/wireshark.nix</literal></para></listitem>
-  <listitem><para><literal>security/dhparams.nix</literal></para></listitem>
-  <listitem><para><literal>services/audio/ympd.nix</literal></para></listitem>
-  <listitem><para><literal>services/computing/boinc/client.nix</literal></para></listitem>
-  <listitem><para><literal>services/continuous-integration/buildbot/master.nix</literal></para></listitem>
-  <listitem><para><literal>services/continuous-integration/buildbot/worker.nix</literal></para></listitem>
-  <listitem><para><literal>services/continuous-integration/gitlab-runner.nix</literal></para></listitem>
-  <listitem><para><literal>services/databases/riak-cs.nix</literal></para></listitem>
-  <listitem><para><literal>services/databases/stanchion.nix</literal></para></listitem>
-  <listitem><para><literal>services/desktops/gnome3/gnome-terminal-server.nix</literal></para></listitem>
-  <listitem><para><literal>services/editors/infinoted.nix</literal></para></listitem>
-  <listitem><para><literal>services/hardware/illum.nix</literal></para></listitem>
-  <listitem><para><literal>services/hardware/trezord.nix</literal></para></listitem>
-  <listitem><para><literal>services/logging/journalbeat.nix</literal></para></listitem>
-  <listitem><para><literal>services/mail/offlineimap.nix</literal></para></listitem>
-  <listitem><para><literal>services/mail/postgrey.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/couchpotato.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/docker-registry.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/errbot.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/geoip-updater.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/gogs.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/leaps.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/nix-optimise.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/ssm-agent.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/sssd.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/arbtt.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/netdata.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/default.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/alertmanager.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/blackbox-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/json-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/nginx-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/node-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/snmp-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/unifi-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/varnish-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/sysstat.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/telegraf.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/vnstat.nix</literal></para></listitem>
-  <listitem><para><literal>services/network-filesystems/cachefilesd.nix</literal></para></listitem>
-  <listitem><para><literal>services/network-filesystems/glusterfs.nix</literal></para></listitem>
-  <listitem><para><literal>services/network-filesystems/ipfs.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/dante.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/dnscrypt-wrapper.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/fakeroute.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/flannel.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/htpdate.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/miredo.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/nftables.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/powerdns.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/pdns-recursor.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/quagga.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/redsocks.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/wireguard.nix</literal></para></listitem>
-  <listitem><para><literal>services/system/cgmanager.nix</literal></para></listitem>
-  <listitem><para><literal>services/torrent/opentracker.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/atlassian/confluence.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/atlassian/crowd.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/atlassian/jira.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/frab.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/nixbot.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/selfoss.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/quassel-webserver.nix</literal></para></listitem>
-  <listitem><para><literal>services/x11/unclutter-xfixes.nix</literal></para></listitem>
-  <listitem><para><literal>services/x11/urxvtd.nix</literal></para></listitem>
-  <listitem><para><literal>system/boot/systemd-nspawn.nix</literal></para></listitem>
-  <listitem><para><literal>virtualisation/ecs-agent.nix</literal></para></listitem>
-  <listitem><para><literal>virtualisation/lxcfs.nix</literal></para></listitem>
-  <listitem><para><literal>virtualisation/openstack/keystone.nix</literal></para></listitem>
-  <listitem><para><literal>virtualisation/openstack/glance.nix</literal></para></listitem>
-</itemizedlist>
-
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.03-incompatibilities">
+  <title>Backward Incompatibilities</title>
 
-<title>Backward Incompatibilities</title>
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
 
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:</para>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      Derivations have no <literal>.nativeDrv</literal> nor <literal>.crossDrv</literal> 
-      and are now cross by default, not native.
+     Derivations have no <literal>.nativeDrv</literal> nor
+     <literal>.crossDrv</literal> and are now cross by default, not native.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>stdenv.overrides</literal> is now expected to take <literal>self</literal>
-      and <literal>super</literal> arguments. See <literal>lib.trivial.extends</literal>
-      for what those parameters represent.
+     <literal>stdenv.overrides</literal> is now expected to take
+     <literal>self</literal> and <literal>super</literal> arguments. See
+     <literal>lib.trivial.extends</literal> for what those parameters
+     represent.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>ansible</literal> now defaults to ansible version 2 as version 1
-      has been removed due to a serious <link
+     <literal>ansible</literal> now defaults to ansible version 2 as version 1
+     has been removed due to a serious
+     <link
       xlink:href="https://www.computest.nl/advisories/CT-2017-0109_Ansible.txt">
-      vulnerability</link> unpatched by upstream.
+     vulnerability</link> unpatched by upstream.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>gnome</literal> alias has been removed along with
-      <literal>gtk</literal>, <literal>gtkmm</literal> and several others.
-      Now you need to use versioned attributes, like <literal>gnome3</literal>.
+     <literal>gnome</literal> alias has been removed along with
+     <literal>gtk</literal>, <literal>gtkmm</literal> and several others. Now
+     you need to use versioned attributes, like <literal>gnome3</literal>.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The attribute name of the Radicale daemon has been changed from
-      <literal>pythonPackages.radicale</literal> to
-      <literal>radicale</literal>.
+     The attribute name of the Radicale daemon has been changed from
+     <literal>pythonPackages.radicale</literal> to <literal>radicale</literal>.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>stripHash</literal> bash function in <literal>stdenv</literal>
-      changed according to its documentation; it now outputs the stripped name to
-      <literal>stdout</literal> instead of putting it in the variable
-      <literal>strippedName</literal>.
+     The <literal>stripHash</literal> bash function in
+     <literal>stdenv</literal> changed according to its documentation; it now
+     outputs the stripped name to <literal>stdout</literal> instead of putting
+     it in the variable <literal>strippedName</literal>.
     </para>
-  </listitem>
-
-  <listitem>
-    <para>PHP now scans for extra configuration .ini files in /etc/php.d
-    instead of /etc. This prevents accidentally loading non-PHP .ini files
-    that may be in /etc.
-    </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This
-      affects: <literal>dictdWordnet</literal> which is now at
-      <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal>
-      which is now at <literal>dictdDBs.wiktionary</literal>
+     PHP now scans for extra configuration .ini files in /etc/php.d instead of
+     /etc. This prevents accidentally loading non-PHP .ini files that may be in
+     /etc.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Parsoid service now uses YAML configuration format.
+     Two lone top-level dict dbs moved into <literal>dictdDBs</literal>. This
+     affects: <literal>dictdWordnet</literal> which is now at
+     <literal>dictdDBs.wordnet</literal> and <literal>dictdWiktionary</literal>
+     which is now at <literal>dictdDBs.wiktionary</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Parsoid service now uses YAML configuration format.
      <literal>service.parsoid.interwikis</literal> is now called
      <literal>service.parsoid.wikis</literal> and is a list of either API URLs
      or attribute sets as specified in parsoid's documentation.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
      <literal>Ntpd</literal> was replaced by
      <literal>systemd-timesyncd</literal> as the default service to synchronize
@@ -263,14 +592,12 @@ following incompatible changes:</para>
      setting <literal>services.ntp.enable</literal> to <literal>true</literal>.
      Upstream time servers for all NTP implementations are now configured using
      <literal>networking.timeServers</literal>.
-   </para>
-  </listitem>
-
-  <listitem>
+    </para>
+   </listitem>
+   <listitem>
     <para>
-      <literal>service.nylon</literal> is now declared using named instances.
-      As an example:
-
+     <literal>service.nylon</literal> is now declared using named instances. As
+     an example:
 <programlisting>
   services.nylon = {
     enable = true;
@@ -279,9 +606,7 @@ following incompatible changes:</para>
     port = 5912;
   };
 </programlisting>
-
-      should be replaced with:
-
+     should be replaced with:
 <programlisting>
   services.nylon.myvpn = {
     enable = true;
@@ -290,225 +615,203 @@ following incompatible changes:</para>
     port = 5912;
   };
 </programlisting>
-
-      this enables you to declare a SOCKS proxy for each uplink.
-
+     this enables you to declare a SOCKS proxy for each uplink.
     </para>
-  </listitem>
-
-  <listitem>
-    <para><literal>overridePackages</literal> function no longer exists.
-    It is replaced by <link
+   </listitem>
+   <listitem>
+    <para>
+     <literal>overridePackages</literal> function no longer exists. It is
+     replaced by
+     <link
     xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">
-    overlays</link>. For example, the following code:
-
+     overlays</link>. For example, the following code:
 <programlisting>
   let
     pkgs = import &lt;nixpkgs&gt; {};
   in
     pkgs.overridePackages (self: super: ...)
 </programlisting>
-
-    should be replaced by:
-
+     should be replaced by:
 <programlisting>
   let
     pkgs = import &lt;nixpkgs&gt; {};
   in
     import pkgs.path { overlays = [(self: super: ...)]; }
 </programlisting>
-
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Autoloading connection tracking helpers is now disabled by default.
-      This default was also changed in the Linux kernel and is considered
-      insecure if not configured properly in your firewall. If you need
-      connection tracking helpers (i.e. for active FTP) please enable
-      <literal>networking.firewall.autoLoadConntrackHelpers</literal> and
-      tune <literal>networking.firewall.connectionTrackingModules</literal>
-      to suit your needs.
+     Autoloading connection tracking helpers is now disabled by default. This
+     default was also changed in the Linux kernel and is considered insecure if
+     not configured properly in your firewall. If you need connection tracking
+     helpers (i.e. for active FTP) please enable
+     <literal>networking.firewall.autoLoadConntrackHelpers</literal> and tune
+     <literal>networking.firewall.connectionTrackingModules</literal> to suit
+     your needs.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>local_recipient_maps</literal> is not set to empty value by
-      Postfix service. It's an insecure default as stated by Postfix
-      documentation. Those who want to retain this setting need to set it via
-      <literal>services.postfix.extraConfig</literal>.
+     <literal>local_recipient_maps</literal> is not set to empty value by
+     Postfix service. It's an insecure default as stated by Postfix
+     documentation. Those who want to retain this setting need to set it via
+     <literal>services.postfix.extraConfig</literal>.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-    Iputils no longer provide ping6 and traceroute6. The functionality of
-    these tools has been integrated into ping and traceroute respectively. To
-    enforce an address family the new flags <literal>-4</literal> and
-    <literal>-6</literal> have been added. One notable incompatibility is that
-    specifying an interface (for link-local IPv6 for instance) is no longer done
-    with the <literal>-I</literal> flag, but by encoding the interface into the
-    address (<literal>ping fe80::1%eth0</literal>).
+     Iputils no longer provide ping6 and traceroute6. The functionality of
+     these tools has been integrated into ping and traceroute respectively. To
+     enforce an address family the new flags <literal>-4</literal> and
+     <literal>-6</literal> have been added. One notable incompatibility is that
+     specifying an interface (for link-local IPv6 for instance) is no longer
+     done with the <literal>-I</literal> flag, but by encoding the interface
+     into the address (<literal>ping fe80::1%eth0</literal>).
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The socket handling of the <literal>services.rmilter</literal> module
-      has been fixed and refactored. As rmilter doesn't support binding to
-      more than one socket, the options <literal>bindUnixSockets</literal>
-      and <literal>bindInetSockets</literal> have been replaced by
-      <literal>services.rmilter.bindSocket.*</literal>. The default is still
-      a unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to
-      the options documentation for more information.
+     The socket handling of the <literal>services.rmilter</literal> module has
+     been fixed and refactored. As rmilter doesn't support binding to more than
+     one socket, the options <literal>bindUnixSockets</literal> and
+     <literal>bindInetSockets</literal> have been replaced by
+     <literal>services.rmilter.bindSocket.*</literal>. The default is still a
+     unix socket in <literal>/run/rmilter/rmilter.sock</literal>. Refer to the
+     options documentation for more information.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>fetch*</literal> functions no longer support md5,
-      please use sha256 instead.
+     The <literal>fetch*</literal> functions no longer support md5, please use
+     sha256 instead.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The dnscrypt-proxy module interface has been streamlined around the
-      <option>extraArgs</option> option. Where possible, legacy option
-      declarations are mapped to <option>extraArgs</option> but will emit
-      warnings. The <option>resolverList</option> has been outright
-      removed: to use an unlisted resolver, use the
-      <option>customResolver</option> option.
+     The dnscrypt-proxy module interface has been streamlined around the
+     <option>extraArgs</option> option. Where possible, legacy option
+     declarations are mapped to <option>extraArgs</option> but will emit
+     warnings. The <option>resolverList</option> has been outright removed: to
+     use an unlisted resolver, use the <option>customResolver</option> option.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      torbrowser now stores local state under
-      <filename>~/.local/share/tor-browser</filename> by default. Any
-      browser profile data from the old location,
-      <filename>~/.torbrowser4</filename>, must be migrated manually.
+     torbrowser now stores local state under
+     <filename>~/.local/share/tor-browser</filename> by default. Any browser
+     profile data from the old location, <filename>~/.torbrowser4</filename>,
+     must be migrated manually.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The ihaskell, monetdb, offlineimap and sitecopy services have been removed.
+     The ihaskell, monetdb, offlineimap and sitecopy services have been
+     removed.
     </para>
-  </listitem>
-</itemizedlist>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.03-notable-changes">
+  <title>Other Notable Changes</title>
 
-<title>Other Notable Changes</title>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Module type system have a new extensible option types feature that
-      allow to extend certain types, such as enum, through multiple option
-      declarations of the same option across multiple modules.
-    </para>
-  </listitem>
-
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      <literal>jre</literal> now defaults to GTK+ UI by default. This
-      improves visual consistency and makes Java follow system font style,
-      improving the situation on HighDPI displays. This has a cost of increased
-      closure size; for server and other headless workloads it's recommended to
-      use <literal>jre_headless</literal>.
+     Module type system have a new extensible option types feature that allow
+     to extend certain types, such as enum, through multiple option
+     declarations of the same option across multiple modules.
     </para>
-  </listitem>
-
-  <listitem>
-    <para>Python 2.6 interpreter and package set have been removed.</para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The Python 2.7 interpreter does not use modules anymore. Instead, all
-      CPython interpreters now include the whole standard library except for `tkinter`,
-      which is available in the Python package set.
+     <literal>jre</literal> now defaults to GTK+ UI by default. This improves
+     visual consistency and makes Java follow system font style, improving the
+     situation on HighDPI displays. This has a cost of increased closure size;
+     for server and other headless workloads it's recommended to use
+     <literal>jre_headless</literal>.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
-      Minor modifications had to be made to the interpreters in order to generate
-      deterministic bytecode. This has security implications and is relevant for
-      those using Python in a <literal>nix-shell</literal>. See the Nixpkgs manual
-      for details.
+     Python 2.6 interpreter and package set have been removed.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The Python package sets now use a fixed-point combinator and the sets are
-      available as attributes of the interpreters.
+     The Python 2.7 interpreter does not use modules anymore. Instead, all
+     CPython interpreters now include the whole standard library except for
+     `tkinter`, which is available in the Python package set.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The Python function <literal>buildPythonPackage</literal> has been improved and can be
-      used to build from Setuptools source, Flit source, and precompiled Wheels.
+     Python 2.7, 3.5 and 3.6 are now built deterministically and 3.4 mostly.
+     Minor modifications had to be made to the interpreters in order to
+     generate deterministic bytecode. This has security implications and is
+     relevant for those using Python in a <literal>nix-shell</literal>. See the
+     Nixpkgs manual for details.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      When adding new or updating current Python libraries, the expressions should be put
-      in separate files in <literal>pkgs/development/python-modules</literal> and
-      called from <literal>python-packages.nix</literal>.
+     The Python package sets now use a fixed-point combinator and the sets are
+     available as attributes of the interpreters.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The dnscrypt-proxy service supports synchronizing the list of public
-      resolvers without working DNS resolution. This fixes issues caused by the
-      resolver list becoming outdated. It also improves the viability of
-      DNSCrypt only configurations.
+     The Python function <literal>buildPythonPackage</literal> has been
+     improved and can be used to build from Setuptools source, Flit source, and
+     precompiled Wheels.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Containers using bridged networking no longer lose their connection after
-      changes to the host networking.
+     When adding new or updating current Python libraries, the expressions
+     should be put in separate files in
+     <literal>pkgs/development/python-modules</literal> and called from
+     <literal>python-packages.nix</literal>.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      ZFS supports pool auto scrubbing.
+     The dnscrypt-proxy service supports synchronizing the list of public
+     resolvers without working DNS resolution. This fixes issues caused by the
+     resolver list becoming outdated. It also improves the viability of
+     DNSCrypt only configurations.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The bind DNS utilities (e.g. dig) have been split into their own output and
-      are now also available in <literal>pkgs.dnsutils</literal> and it is no longer
-      necessary to pull in all of <literal>bind</literal> to use them.
+     Containers using bridged networking no longer lose their connection after
+     changes to the host networking.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Per-user configuration was moved from <filename>~/.nixpkgs</filename> to
-      <filename>~/.config/nixpkgs</filename>. The former is still valid for
-      <filename>config.nix</filename> for backwards compatibility.
+     ZFS supports pool auto scrubbing.
     </para>
-  </listitem>
-</itemizedlist>
-</section>
+   </listitem>
+   <listitem>
+    <para>
+     The bind DNS utilities (e.g. dig) have been split into their own output
+     and are now also available in <literal>pkgs.dnsutils</literal> and it is
+     no longer necessary to pull in all of <literal>bind</literal> to use them.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Per-user configuration was moved from <filename>~/.nixpkgs</filename> to
+     <filename>~/.config/nixpkgs</filename>. The former is still valid for
+     <filename>config.nix</filename> for backwards compatibility.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index 66f7b01db72a..795c51d2923d 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -3,40 +3,40 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.09">
+ <title>Release 17.09 (“Hummingbird”, 2017/09/??)</title>
 
-<title>Release 17.09 (“Hummingbird”, 2017/09/??)</title>
-
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.09-highlights">
+  <title>Highlights</title>
 
-<title>Highlights</title>
+  <para>
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
+  </para>
 
-<para>In addition to numerous new and upgraded packages, this release
-has the following highlights: </para>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10,
-      KDE Applications to 17.08.1 and KDE Frameworks to 5.37.
+     The GNOME version is now 3.24. KDE Plasma was upgraded to 5.10, KDE
+     Applications to 17.08.1 and KDE Frameworks to 5.37.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The user handling now keeps track of deallocated UIDs/GIDs. When a user
-      or group is revived, this allows it to be allocated the UID/GID it had before.
-      A consequence is that UIDs and GIDs are no longer reused.
+     The user handling now keeps track of deallocated UIDs/GIDs. When a user or
+     group is revived, this allows it to be allocated the UID/GID it had
+     before. A consequence is that UIDs and GIDs are no longer reused.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The module option <option>services.xserver.xrandrHeads</option> now
-      causes the first head specified in this list to be set as the primary
-      head. Apart from that, it's now possible to also set additional options
-      by using an attribute set, for example:
+     The module option <option>services.xserver.xrandrHeads</option> now causes
+     the first head specified in this list to be set as the primary head. Apart
+     from that, it's now possible to also set additional options by using an
+     attribute set, for example:
 <programlisting>
 { services.xserver.xrandrHeads = [
     "HDMI-0"
@@ -50,365 +50,664 @@ has the following highlights: </para>
   ];
 }
 </programlisting>
-      This will set the <literal>DVI-0</literal> output to be the primary head,
-      even though <literal>HDMI-0</literal> is the first head in the list.
+     This will set the <literal>DVI-0</literal> output to be the primary head,
+     even though <literal>HDMI-0</literal> is the first head in the list.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The handling of SSL in the <literal>services.nginx</literal> module has
-      been cleaned up, renaming the misnamed <literal>enableSSL</literal> to
-      <literal>onlySSL</literal> which reflects its original intention. This
-      is not to be used with the already existing <literal>forceSSL</literal>
-      which creates a second non-SSL virtual host redirecting to the SSL
-      virtual host. This by chance had worked earlier due to specific
-      implementation details. In case you had specified both please remove
-      the <literal>enableSSL</literal> option to keep the previous behaviour.
+     The handling of SSL in the <literal>services.nginx</literal> module has
+     been cleaned up, renaming the misnamed <literal>enableSSL</literal> to
+     <literal>onlySSL</literal> which reflects its original intention. This is
+     not to be used with the already existing <literal>forceSSL</literal> which
+     creates a second non-SSL virtual host redirecting to the SSL virtual host.
+     This by chance had worked earlier due to specific implementation details.
+     In case you had specified both please remove the
+     <literal>enableSSL</literal> option to keep the previous behaviour.
     </para>
     <para>
-      Another <literal>addSSL</literal> option has been introduced to configure
-      both a non-SSL virtual host and an SSL virtual host with the same
-      configuration.
+     Another <literal>addSSL</literal> option has been introduced to configure
+     both a non-SSL virtual host and an SSL virtual host with the same
+     configuration.
     </para>
     <para>
-      Options to configure <literal>resolver</literal> options and
-      <literal>upstream</literal> blocks have been introduced. See their information
-      for further details.
+     Options to configure <literal>resolver</literal> options and
+     <literal>upstream</literal> blocks have been introduced. See their
+     information for further details.
     </para>
     <para>
-      The <literal>port</literal> option has been replaced by a more generic
-      <literal>listen</literal> option which makes it possible to specify
-      multiple addresses, ports and SSL configs dependant on the new SSL
-      handling mentioned above.
+     The <literal>port</literal> option has been replaced by a more generic
+     <literal>listen</literal> option which makes it possible to specify
+     multiple addresses, ports and SSL configs dependant on the new SSL
+     handling mentioned above.
     </para>
-  </listitem>
-</itemizedlist>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.09-new-services">
+  <title>New Services</title>
 
-<title>New Services</title>
+  <para>
+   The following new services were added since the last release:
+  </para>
 
-<para>The following new services were added since the last release:</para>
+  <itemizedlist>
+   <listitem>
+    <para>
+     <literal>config/fonts/fontconfig-penultimate.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>config/fonts/fontconfig-ultimate.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>config/terminfo.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>hardware/sensor/iio.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>hardware/nitrokey.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>hardware/raid/hpsa.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/browserpass.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/gnupg.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/qt5ct.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/slock.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>programs/thefuck.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>security/auditd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>security/lock-kernel-modules.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>service-managers/docker.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>service-managers/trivial.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/admin/salt/master.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/admin/salt/minion.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/audio/slimserver.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/cluster/kubernetes/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/cluster/kubernetes/dns.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/cluster/kubernetes/dashboard.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/continuous-integration/hail.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/databases/clickhouse.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/databases/postage.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/desktops/gnome3/gnome-disks.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/desktops/gnome3/gpaste.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/logging/SystemdJournal2Gelf.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/logging/heartbeat.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/logging/journalwatch.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/logging/syslogd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/mailhog.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/mail/nullmailer.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/airsonic.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/autorandr.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/exhibitor.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/fstrim.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/gollum.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/irkerd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/jackett.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/radarr.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/misc/snapper.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/osquery.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/collectd-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/monitoring/prometheus/fritzbox-exporter.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/network-filesystems/kbfs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/dnscache.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/fireqos.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/iwd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/keepalived/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/keybase.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/lldpd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/matterbridge.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/squid.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/tinydns.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/networking/xrdp.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/shibboleth-sp.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/sks.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/sshguard.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/torify.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/usbguard.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/security/vault.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/system/earlyoom.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/system/saslauthd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/nexus.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/pgpkeyserver-lite.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-apps/piwik.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-servers/lighttpd/collectd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/web-servers/minio.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/x11/display-managers/xpra.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>services/x11/xautolock.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>tasks/filesystems/bcachefs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>tasks/powertop.nix</literal>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-<itemizedlist>
-  <listitem><para><literal>config/fonts/fontconfig-penultimate.nix</literal></para></listitem>
-  <listitem><para><literal>config/fonts/fontconfig-ultimate.nix</literal></para></listitem>
-  <listitem><para><literal>config/terminfo.nix</literal></para></listitem>
-  <listitem><para><literal>hardware/sensor/iio.nix</literal></para></listitem>
-  <listitem><para><literal>hardware/nitrokey.nix</literal></para></listitem>
-  <listitem><para><literal>hardware/raid/hpsa.nix</literal></para></listitem>
-  <listitem><para><literal>programs/browserpass.nix</literal></para></listitem>
-  <listitem><para><literal>programs/gnupg.nix</literal></para></listitem>
-  <listitem><para><literal>programs/qt5ct.nix</literal></para></listitem>
-  <listitem><para><literal>programs/slock.nix</literal></para></listitem>
-  <listitem><para><literal>programs/thefuck.nix</literal></para></listitem>
-  <listitem><para><literal>security/auditd.nix</literal></para></listitem>
-  <listitem><para><literal>security/lock-kernel-modules.nix</literal></para></listitem>
-  <listitem><para><literal>service-managers/docker.nix</literal></para></listitem>
-  <listitem><para><literal>service-managers/trivial.nix</literal></para></listitem>
-  <listitem><para><literal>services/admin/salt/master.nix</literal></para></listitem>
-  <listitem><para><literal>services/admin/salt/minion.nix</literal></para></listitem>
-  <listitem><para><literal>services/audio/slimserver.nix</literal></para></listitem>
-  <listitem><para><literal>services/cluster/kubernetes/default.nix</literal></para></listitem>
-  <listitem><para><literal>services/cluster/kubernetes/dns.nix</literal></para></listitem>
-  <listitem><para><literal>services/cluster/kubernetes/dashboard.nix</literal></para></listitem>
-  <listitem><para><literal>services/continuous-integration/hail.nix</literal></para></listitem>
-  <listitem><para><literal>services/databases/clickhouse.nix</literal></para></listitem>
-  <listitem><para><literal>services/databases/postage.nix</literal></para></listitem>
-  <listitem><para><literal>services/desktops/gnome3/gnome-disks.nix</literal></para></listitem>
-  <listitem><para><literal>services/desktops/gnome3/gpaste.nix</literal></para></listitem>
-  <listitem><para><literal>services/logging/SystemdJournal2Gelf.nix</literal></para></listitem>
-  <listitem><para><literal>services/logging/heartbeat.nix</literal></para></listitem>
-  <listitem><para><literal>services/logging/journalwatch.nix</literal></para></listitem>
-  <listitem><para><literal>services/logging/syslogd.nix</literal></para></listitem>
-  <listitem><para><literal>services/mail/mailhog.nix</literal></para></listitem>
-  <listitem><para><literal>services/mail/nullmailer.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/airsonic.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/autorandr.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/exhibitor.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/fstrim.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/gollum.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/irkerd.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/jackett.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/radarr.nix</literal></para></listitem>
-  <listitem><para><literal>services/misc/snapper.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/osquery.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/collectd-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/monitoring/prometheus/fritzbox-exporter.nix</literal></para></listitem>
-  <listitem><para><literal>services/network-filesystems/kbfs.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/dnscache.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/fireqos.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/iwd.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/keepalived/default.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/keybase.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/lldpd.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/matterbridge.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/squid.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/tinydns.nix</literal></para></listitem>
-  <listitem><para><literal>services/networking/xrdp.nix</literal></para></listitem>
-  <listitem><para><literal>services/security/shibboleth-sp.nix</literal></para></listitem>
-  <listitem><para><literal>services/security/sks.nix</literal></para></listitem>
-  <listitem><para><literal>services/security/sshguard.nix</literal></para></listitem>
-  <listitem><para><literal>services/security/torify.nix</literal></para></listitem>
-  <listitem><para><literal>services/security/usbguard.nix</literal></para></listitem>
-  <listitem><para><literal>services/security/vault.nix</literal></para></listitem>
-  <listitem><para><literal>services/system/earlyoom.nix</literal></para></listitem>
-  <listitem><para><literal>services/system/saslauthd.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/nexus.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/pgpkeyserver-lite.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-apps/piwik.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-servers/lighttpd/collectd.nix</literal></para></listitem>
-  <listitem><para><literal>services/web-servers/minio.nix</literal></para></listitem>
-  <listitem><para><literal>services/x11/display-managers/xpra.nix</literal></para></listitem>
-  <listitem><para><literal>services/x11/xautolock.nix</literal></para></listitem>
-  <listitem><para><literal>tasks/filesystems/bcachefs.nix</literal></para></listitem>
-  <listitem><para><literal>tasks/powertop.nix</literal></para></listitem>
-</itemizedlist>
-
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.09-incompatibilities">
+  <title>Backward Incompatibilities</title>
 
-<title>Backward Incompatibilities</title>
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
 
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:</para>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-        <emphasis role="strong">
-            In an Qemu-based virtualization environment, the network interface
-            names changed from i.e. <literal>enp0s3</literal> to
-            <literal>ens3</literal>.
-        </emphasis>
+     <emphasis role="strong"> In an Qemu-based virtualization environment, the
+     network interface names changed from i.e. <literal>enp0s3</literal> to
+     <literal>ens3</literal>. </emphasis>
     </para>
     <para>
-        This is due to a kernel configuration change. The new naming
-        is consistent with those of other Linux distributions with
-        systemd. See
-        <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link>
-        for more information.
+     This is due to a kernel configuration change. The new naming is consistent
+     with those of other Linux distributions with systemd. See
+     <link xlink:href="https://github.com/NixOS/nixpkgs/issues/29197">#29197</link>
+     for more information.
     </para>
     <para>
-        A machine is affected if the <literal>virt-what</literal> tool
-        either returns <literal>qemu</literal> or
-        <literal>kvm</literal> <emphasis>and</emphasis> has
-        interface names used in any part of its NixOS configuration,
-        in particular if a static network configuration with
-        <literal>networking.interfaces</literal> is used.
+     A machine is affected if the <literal>virt-what</literal> tool either
+     returns <literal>qemu</literal> or <literal>kvm</literal>
+     <emphasis>and</emphasis> has interface names used in any part of its NixOS
+     configuration, in particular if a static network configuration with
+     <literal>networking.interfaces</literal> is used.
     </para>
     <para>
-        Before rebooting affected machines, please ensure:
-        <itemizedlist>
-          <listitem>
-            <para>
-              Change the interface names in your NixOS configuration.
-              The first interface will be called <literal>ens3</literal>,
-              the second one <literal>ens8</literal> and starting from there
-              incremented by 1.
-            </para>
-          </listitem>
-          <listitem>
-            <para>
-              After changing the interface names, rebuild your system with
-              <literal>nixos-rebuild boot</literal> to activate the new
-              configuration after a reboot. If you switch to the new
-              configuration right away you might lose network connectivity!
-              If using <literal>nixops</literal>, deploy with
-              <literal>nixops deploy --force-reboot</literal>.
-            </para>
-          </listitem>
-        </itemizedlist>
+     Before rebooting affected machines, please ensure:
+     <itemizedlist>
+      <listitem>
+       <para>
+        Change the interface names in your NixOS configuration. The first
+        interface will be called <literal>ens3</literal>, the second one
+        <literal>ens8</literal> and starting from there incremented by 1.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        After changing the interface names, rebuild your system with
+        <literal>nixos-rebuild boot</literal> to activate the new configuration
+        after a reboot. If you switch to the new configuration right away you
+        might lose network connectivity! If using <literal>nixops</literal>,
+        deploy with <literal>nixops deploy --force-reboot</literal>.
+       </para>
+      </listitem>
+     </itemizedlist>
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The following changes apply if the <literal>stateVersion</literal> is changed to 17.09 or higher.
-      For <literal>stateVersion = "17.03"</literal> or lower the old behavior is preserved.
+     The following changes apply if the <literal>stateVersion</literal> is
+     changed to 17.09 or higher. For <literal>stateVersion = "17.03"</literal>
+     or lower the old behavior is preserved.
     </para>
     <itemizedlist>
-      <listitem>
-        <para>
-          The <literal>postgres</literal> default version was changed from 9.5 to 9.6.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <literal>postgres</literal> superuser name has changed from <literal>root</literal> to <literal>postgres</literal> to more closely follow what other Linux distributions are doing.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <literal>postgres</literal> default <literal>dataDir</literal> has changed from <literal>/var/db/postgres</literal> to <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is 9.6 for example.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          The <literal>mysql</literal> default <literal>dataDir</literal> has changed from <literal>/var/mysql</literal> to <literal>/var/lib/mysql</literal>.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Radicale's default package has changed from 1.x to 2.x. Instructions to migrate can be found <link xlink:href="http://radicale.org/1to2/"> here </link>. It is also possible to use the newer version by setting the <literal>package</literal> to <literal>radicale2</literal>, which is done automatically when <literal>stateVersion</literal> is 17.09 or higher. The <literal>extraArgs</literal> option has been added to allow passing the data migration arguments specified in the instructions; see the <filename xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix">radicale.nix</filename> NixOS test for an example migration.
-        </para>
-      </listitem>
+     <listitem>
+      <para>
+       The <literal>postgres</literal> default version was changed from 9.5 to
+       9.6.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       The <literal>postgres</literal> superuser name has changed from
+       <literal>root</literal> to <literal>postgres</literal> to more closely
+       follow what other Linux distributions are doing.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       The <literal>postgres</literal> default <literal>dataDir</literal> has
+       changed from <literal>/var/db/postgres</literal> to
+       <literal>/var/lib/postgresql/$psqlSchema</literal> where $psqlSchema is
+       9.6 for example.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       The <literal>mysql</literal> default <literal>dataDir</literal> has
+       changed from <literal>/var/mysql</literal> to
+       <literal>/var/lib/mysql</literal>.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       Radicale's default package has changed from 1.x to 2.x. Instructions to
+       migrate can be found <link xlink:href="http://radicale.org/1to2/"> here
+       </link>. It is also possible to use the newer version by setting the
+       <literal>package</literal> to <literal>radicale2</literal>, which is
+       done automatically when <literal>stateVersion</literal> is 17.09 or
+       higher. The <literal>extraArgs</literal> option has been added to allow
+       passing the data migration arguments specified in the instructions; see
+       the
+       <filename xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/radicale.nix">radicale.nix</filename>
+       NixOS test for an example migration.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>aiccu</literal> package was removed. This is due to SixXS
-      <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6 tunnel.
+     The <literal>aiccu</literal> package was removed. This is due to SixXS
+     <link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6
+     tunnel.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>fanctl</literal> package and <literal>fan</literal> module
-      have been removed due to the developers not upstreaming their iproute2
-      patches and lagging with compatibility to recent iproute2 versions.
+     The <literal>fanctl</literal> package and <literal>fan</literal> module
+     have been removed due to the developers not upstreaming their iproute2
+     patches and lagging with compatibility to recent iproute2 versions.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Top-level <literal>idea</literal> package collection was renamed.
-      All JetBrains IDEs are now at <literal>jetbrains</literal>.
+     Top-level <literal>idea</literal> package collection was renamed. All
+     JetBrains IDEs are now at <literal>jetbrains</literal>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>flexget</literal>'s state database cannot be upgraded to its
-      new internal format, requiring removal of any existing
-      <literal>db-config.sqlite</literal> which will be automatically recreated.
+     <literal>flexget</literal>'s state database cannot be upgraded to its new
+     internal format, requiring removal of any existing
+     <literal>db-config.sqlite</literal> which will be automatically recreated.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>ipfs</literal> service now doesn't ignore the <literal>dataDir</literal> option anymore. If you've ever set this option to anything other than the default you'll have to either unset it (so the default gets used) or migrate the old data manually with
+     The <literal>ipfs</literal> service now doesn't ignore the
+     <literal>dataDir</literal> option anymore. If you've ever set this option
+     to anything other than the default you'll have to either unset it (so the
+     default gets used) or migrate the old data manually with
 <programlisting>
 dataDir=&lt;valueOfDataDir&gt;
 mv /var/lib/ipfs/.ipfs/* $dataDir
 rmdir /var/lib/ipfs/.ipfs
 </programlisting>
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>caddy</literal> service was previously using an extra
-      <literal>.caddy</literal> directory in the data directory specified
-      with the <literal>dataDir</literal> option. The contents of the
-      <literal>.caddy</literal> directory are now expected to be in the
-      <literal>dataDir</literal>.
+     The <literal>caddy</literal> service was previously using an extra
+     <literal>.caddy</literal> directory in the data directory specified with
+     the <literal>dataDir</literal> option. The contents of the
+     <literal>.caddy</literal> directory are now expected to be in the
+     <literal>dataDir</literal>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>ssh-agent</literal> user service is not started by default
-      anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if
-      needed. There is also a new <literal>programs.gnupg.agent</literal>
-      module that creates a <literal>gpg-agent</literal> user service. It can
-      also serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
+     The <literal>ssh-agent</literal> user service is not started by default
+     anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if
+     needed. There is also a new <literal>programs.gnupg.agent</literal> module
+     that creates a <literal>gpg-agent</literal> user service. It can also
+     serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal>
-      option had a misleading name that did not correspond to its behavior. It
-      now correctly defines the ip to listen for incoming connections on. To
-      keep the previous behaviour, use
-      <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal>
-      instead. Refer to the description of the options for more details.
+     The <literal>services.tinc.networks.&lt;name&gt;.listenAddress</literal>
+     option had a misleading name that did not correspond to its behavior. It
+     now correctly defines the ip to listen for incoming connections on. To
+     keep the previous behaviour, use
+     <literal>services.tinc.networks.&lt;name&gt;.bindToAddress</literal>
+     instead. Refer to the description of the options for more details.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>tlsdate</literal> package and module were removed. This is due to the project
-      being dead and not building with openssl 1.1.
+     <literal>tlsdate</literal> package and module were removed. This is due to
+     the project being dead and not building with openssl 1.1.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>wvdial</literal> package and module were removed. This is due to the project
-      being dead and not building with openssl 1.1.
+     <literal>wvdial</literal> package and module were removed. This is due to
+     the project being dead and not building with openssl 1.1.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>cc-wrapper</literal>'s setup-hook now exports a number of
-      environment variables corresponding to binutils binaries,
-      (e.g. <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>,
-      etc). This is done to prevent packages' build systems guessing, which is
-      harder to predict, especially when cross-compiling. However, some packages
-      have broken due to this—their build systems either not supporting, or
-      claiming to support without adequate testing, taking such environment
-      variables as parameters.
+     <literal>cc-wrapper</literal>'s setup-hook now exports a number of
+     environment variables corresponding to binutils binaries, (e.g.
+     <envar>LD</envar>, <envar>STRIP</envar>, <envar>RANLIB</envar>, etc). This
+     is done to prevent packages' build systems guessing, which is harder to
+     predict, especially when cross-compiling. However, some packages have
+     broken due to this—their build systems either not supporting, or
+     claiming to support without adequate testing, taking such environment
+     variables as parameters.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>services.firefox.syncserver</literal> now runs by default as a
-      non-root user. To accomodate this change, the default sqlite database
-      location has also been changed. Migration should work automatically.
-      Refer to the description of the options for more details.
+     <literal>services.firefox.syncserver</literal> now runs by default as a
+     non-root user. To accomodate this change, the default sqlite database
+     location has also been changed. Migration should work automatically. Refer
+     to the description of the options for more details.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>compiz</literal> window manager and package was
-      removed. The system support had been broken for several years.
+     The <literal>compiz</literal> window manager and package was removed. The
+     system support had been broken for several years.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Touchpad support should now be enabled through
-      <literal>libinput</literal> as <literal>synaptics</literal> is
-      now deprecated. See the option
-      <literal>services.xserver.libinput.enable</literal>.
+     Touchpad support should now be enabled through <literal>libinput</literal>
+     as <literal>synaptics</literal> is now deprecated. See the option
+     <literal>services.xserver.libinput.enable</literal>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      grsecurity/PaX support has been dropped, following upstream's
-      decision to cease free support.  See
-      <link xlink:href="https://grsecurity.net/passing_the_baton.php">
-      upstream's announcement</link> for more information.
-      No complete replacement for grsecurity/PaX is available presently.
+     grsecurity/PaX support has been dropped, following upstream's decision to
+     cease free support. See
+     <link xlink:href="https://grsecurity.net/passing_the_baton.php">
+     upstream's announcement</link> for more information. No complete
+     replacement for grsecurity/PaX is available presently.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>services.mysql</literal> now has declarative
-      configuration of databases and users with the <literal>ensureDatabases</literal> and
-      <literal>ensureUsers</literal> options.
+     <literal>services.mysql</literal> now has declarative configuration of
+     databases and users with the <literal>ensureDatabases</literal> and
+     <literal>ensureUsers</literal> options.
     </para>
-
     <para>
-      These options will never delete existing databases and users,
-      especially not when the value of the options are changed.
+     These options will never delete existing databases and users, especially
+     not when the value of the options are changed.
     </para>
-
     <para>
-      The MySQL users will be identified using
-      <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/">
-        Unix socket authentication</link>. This authenticates the
-        Unix user with the same name only, and that without the need
-        for a password.
+     The MySQL users will be identified using
+     <link xlink:href="https://mariadb.com/kb/en/library/authentication-plugin-unix-socket/">
+     Unix socket authentication</link>. This authenticates the Unix user with
+     the same name only, and that without the need for a password.
     </para>
-
     <para>
-      If you have previously created a MySQL <literal>root</literal>
-      user <emphasis>with a password</emphasis>, you will need to add
-      <literal>root</literal> user for unix socket authentication
-      before using the new options. This can be done by running the
-      following SQL script:
-
+     If you have previously created a MySQL <literal>root</literal> user
+     <emphasis>with a password</emphasis>, you will need to add
+     <literal>root</literal> user for unix socket authentication before using
+     the new options. This can be done by running the following SQL script:
 <programlisting language="sql">
 CREATE USER 'root'@'%' IDENTIFIED BY '';
 GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
@@ -418,194 +717,183 @@ FLUSH PRIVILEGES;
 -- DROP USER 'root'@'localhost';
 </programlisting>
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>services.mysqlBackup</literal> now works by default
-      without any user setup, including for users other than
-      <literal>mysql</literal>.
+     <literal>services.mysqlBackup</literal> now works by default without any
+     user setup, including for users other than <literal>mysql</literal>.
     </para>
-
     <para>
-      By default, the <literal>mysql</literal> user is no longer the
-      user which performs the backup. Instead a system account
-      <literal>mysqlbackup</literal> is used.
+     By default, the <literal>mysql</literal> user is no longer the user which
+     performs the backup. Instead a system account
+     <literal>mysqlbackup</literal> is used.
     </para>
-
     <para>
-      The <literal>mysqlBackup</literal> service is also now using
-      systemd timers instead of <literal>cron</literal>.
+     The <literal>mysqlBackup</literal> service is also now using systemd
+     timers instead of <literal>cron</literal>.
     </para>
-
     <para>
-      Therefore, the <literal>services.mysqlBackup.period</literal>
-      option no longer exists, and has been replaced with
-      <literal>services.mysqlBackup.calendar</literal>, which is in
-      the format of <link
+     Therefore, the <literal>services.mysqlBackup.period</literal> option no
+     longer exists, and has been replaced with
+     <literal>services.mysqlBackup.calendar</literal>, which is in the format
+     of
+     <link
       xlink:href="https://www.freedesktop.org/software/systemd/man/systemd.time.html#Calendar%20Events">systemd.time(7)</link>.
     </para>
-
     <para>
-      If you expect to be sent an e-mail when the backup fails,
-      consider using a script which monitors the systemd journal for
-      errors. Regretfully, at present there is no built-in
-      functionality for this.
+     If you expect to be sent an e-mail when the backup fails, consider using a
+     script which monitors the systemd journal for errors. Regretfully, at
+     present there is no built-in functionality for this.
     </para>
-
     <para>
-      You can check that backups still work by running
-      <command>systemctl start mysql-backup</command> then
-      <command>systemctl status mysql-backup</command>.
+     You can check that backups still work by running <command>systemctl start
+     mysql-backup</command> then <command>systemctl status
+     mysql-backup</command>.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Templated systemd services e.g <literal>container@name</literal> are
-      now handled currectly when switching to a new configuration, resulting
-      in them being reloaded.
+     Templated systemd services e.g <literal>container@name</literal> are now
+     handled currectly when switching to a new configuration, resulting in them
+     being reloaded.
     </para>
-  </listitem>
-
-  <listitem>
-    <para>Steam: the <literal>newStdcpp</literal> parameter
-    was removed and should not be needed anymore.</para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Redis has been updated to version 4 which mandates a cluster
-      mass-restart, due to changes in the network handling, in order
-      to ensure compatibility with networks NATing traffic.
+     Steam: the <literal>newStdcpp</literal> parameter was removed and should
+     not be needed anymore.
     </para>
-  </listitem>
-</itemizedlist>
+   </listitem>
+   <listitem>
+    <para>
+     Redis has been updated to version 4 which mandates a cluster mass-restart,
+     due to changes in the network handling, in order to ensure compatibility
+     with networks NATing traffic.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-17.09-notable-changes">
+  <title>Other Notable Changes</title>
 
-<title>Other Notable Changes</title>
-
-<itemizedlist>
-
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      Modules can now be disabled by using <link
+     Modules can now be disabled by using
+     <link
       xlink:href="https://nixos.org/nixpkgs/manual/#sec-replace-modules">
-      disabledModules</link>, allowing another to take it's place.  This can be
-      used to import a set of modules from another channel while keeping the
-      rest of the system on a stable release.
+     disabledModules</link>, allowing another to take it's place. This can be
+     used to import a set of modules from another channel while keeping the
+     rest of the system on a stable release.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Updated to FreeType 2.7.1, including a new TrueType engine.
-      The new engine replaces the Infinality engine which was the default in
-      NixOS. The default font rendering settings are now provided by
-      fontconfig-penultimate, replacing fontconfig-ultimate; the new defaults
-      are less invasive and provide rendering that is more consistent with
-      other systems and hopefully with each font designer's intent. Some
-      system-wide configuration has been removed from the Fontconfig NixOS
-      module where user Fontconfig settings are available.
+     Updated to FreeType 2.7.1, including a new TrueType engine. The new engine
+     replaces the Infinality engine which was the default in NixOS. The default
+     font rendering settings are now provided by fontconfig-penultimate,
+     replacing fontconfig-ultimate; the new defaults are less invasive and
+     provide rendering that is more consistent with other systems and hopefully
+     with each font designer's intent. Some system-wide configuration has been
+     removed from the Fontconfig NixOS module where user Fontconfig settings
+     are available.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable, splUnstable</literal>
-      have therefore been removed.
+     ZFS/SPL have been updated to 0.7.0, <literal>zfsUnstable,
+     splUnstable</literal> have therefore been removed.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <option>time.timeZone</option> option now allows the value
-      <literal>null</literal> in addition to timezone strings. This value
-      allows changing the timezone of a system imperatively using
-      <command>timedatectl set-timezone</command>. The default timezone
-      is still UTC.
+     The <option>time.timeZone</option> option now allows the value
+     <literal>null</literal> in addition to timezone strings. This value allows
+     changing the timezone of a system imperatively using <command>timedatectl
+     set-timezone</command>. The default timezone is still UTC.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Nixpkgs overlays may now be specified with a file as well as a directory. The
-      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
-      <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the
-      <filename>~/.config/nixpkgs/overlays</filename> directory.
+     Nixpkgs overlays may now be specified with a file as well as a directory.
+     The value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
+     <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of
+     the <filename>~/.config/nixpkgs/overlays</filename> directory.
     </para>
     <para>
-      See the overlays chapter of the Nixpkgs manual for more details.
+     See the overlays chapter of the Nixpkgs manual for more details.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Definitions for <filename>/etc/hosts</filename> can now be specified
-      declaratively with <literal>networking.hosts</literal>.
+     Definitions for <filename>/etc/hosts</filename> can now be specified
+     declaratively with <literal>networking.hosts</literal>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Two new options have been added to the installer loader, in addition
-      to the default having changed. The kernel log verbosity has been lowered
-      to the upstream default for the default options, in order to not spam
-      the console when e.g. joining a network.
+     Two new options have been added to the installer loader, in addition to
+     the default having changed. The kernel log verbosity has been lowered to
+     the upstream default for the default options, in order to not spam the
+     console when e.g. joining a network.
     </para>
     <para>
-      This therefore leads to adding a new <literal>debug</literal> option
-      to set the log level to the previous verbose mode, to make debugging
-      easier, but still accessible easily.
+     This therefore leads to adding a new <literal>debug</literal> option to
+     set the log level to the previous verbose mode, to make debugging easier,
+     but still accessible easily.
     </para>
     <para>
-      Additionally a <literal>copytoram</literal> option has been added,
-      which makes it possible to remove the install medium after booting.
-      This allows tethering from your phone after booting from it.
+     Additionally a <literal>copytoram</literal> option has been added, which
+     makes it possible to remove the install medium after booting. This allows
+     tethering from your phone after booting from it.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>services.gitlab-runner.configOptions</literal> has been added
-      to specify the configuration of gitlab-runners declaratively.
+     <literal>services.gitlab-runner.configOptions</literal> has been added to
+     specify the configuration of gitlab-runners declaratively.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>services.jenkins.plugins</literal> has been added
-      to install plugins easily, this can be generated with jenkinsPlugins2nix.
+     <literal>services.jenkins.plugins</literal> has been added to install
+     plugins easily, this can be generated with jenkinsPlugins2nix.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>services.postfix.config</literal> has been added
-      to specify the main.cf with NixOS options. Additionally other options
-      have been added to the postfix module and has been improved further.
+     <literal>services.postfix.config</literal> has been added to specify the
+     main.cf with NixOS options. Additionally other options have been added to
+     the postfix module and has been improved further.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The GitLab package and module have been updated to the latest 10.0
-      release.
+     The GitLab package and module have been updated to the latest 10.0
+     release.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>systemd-boot</literal> boot loader now lists the NixOS
-      version, kernel version and build date of all bootable generations.
+     The <literal>systemd-boot</literal> boot loader now lists the NixOS
+     version, kernel version and build date of all bootable generations.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The dnscrypt-proxy service now defaults to using a random upstream resolver,
-      selected from the list of public non-logging resolvers with DNSSEC support.
-      Existing configurations can be migrated to this mode of operation by
-      omitting the <option>services.dnscrypt-proxy.resolverName</option> option
-      or setting it to <literal>"random"</literal>.
+     The dnscrypt-proxy service now defaults to using a random upstream
+     resolver, selected from the list of public non-logging resolvers with
+     DNSSEC support. Existing configurations can be migrated to this mode of
+     operation by omitting the
+     <option>services.dnscrypt-proxy.resolverName</option> option or setting it
+     to <literal>"random"</literal>.
     </para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
+   </listitem>
+  </itemizedlist>
+ </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml
index 9221c2951ed2..c14679eea071 100644
--- a/nixos/doc/manual/release-notes/rl-1803.xml
+++ b/nixos/doc/manual/release-notes/rl-1803.xml
@@ -3,532 +3,822 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.03">
+ <title>Release 18.03 (“Impala”, 2018/04/04)</title>
 
-<title>Release 18.03 (“Impala”, 2018/04/04)</title>
-
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.03-highlights">
+  <title>Highlights</title>
 
-<title>Highlights</title>
+  <para>
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
+  </para>
 
-<para>In addition to numerous new and upgraded packages, this release
-has the following highlights: </para>
-
-<itemizedlist>
-
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      End of support is planned for end of October 2018, handing over to 18.09.
+     End of support is planned for end of October 2018, handing over to 18.09.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Platform support: x86_64-linux and x86_64-darwin since release time (the latter isn't NixOS, really).
-      Binaries for aarch64-linux are available, but no channel exists yet, as it's waiting for some test fixes, etc.
+     Platform support: x86_64-linux and x86_64-darwin since release time (the
+     latter isn't NixOS, really). Binaries for aarch64-linux are available, but
+     no channel exists yet, as it's waiting for some test fixes, etc.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Nix now defaults to 2.0; see its
-      <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release notes</link>.
+     Nix now defaults to 2.0; see its
+     <link xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-2.0">release
+     notes</link>.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 -> 7, systemd: 234 -> 237.
+     Core version changes: linux: 4.9 -> 4.14, glibc: 2.25 -> 2.26, gcc: 6 ->
+     7, systemd: 234 -> 237.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10 -> 5.12.
+     Desktop version changes: gnome: 3.24 -> 3.26, (KDE) plasma-desktop: 5.10
+     -> 5.12.
     </para>
-  </listitem>
-
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      MariaDB 10.2, updated from 10.1, is now the default MySQL implementation. While upgrading a few changes
-      have been made to the infrastructure involved:
-      <itemizedlist>
-        <listitem>
-          <para>
-            <literal>libmysql</literal> has been deprecated, please use <literal>mysql.connector-c</literal>
-            instead, a compatibility passthru has been added to the MySQL packages.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <literal>mysql57</literal> package has a new <literal>static</literal> output containing
-            the static libraries including <literal>libmysqld.a</literal>
-          </para>
-        </listitem>
-      </itemizedlist>
+     MariaDB 10.2, updated from 10.1, is now the default MySQL implementation.
+     While upgrading a few changes have been made to the infrastructure
+     involved:
+     <itemizedlist>
+      <listitem>
+       <para>
+        <literal>libmysql</literal> has been deprecated, please use
+        <literal>mysql.connector-c</literal> instead, a compatibility passthru
+        has been added to the MySQL packages.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        The <literal>mysql57</literal> package has a new
+        <literal>static</literal> output containing the static libraries
+        including <literal>libmysqld.a</literal>
+       </para>
+      </listitem>
+     </itemizedlist>
     </para>
-  </listitem>
+   </listitem>
+   <listitem>
+    <para>
+     PHP now defaults to PHP 7.2, updated from 7.1.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-  <listitem>
-    <para>PHP now defaults to PHP 7.2, updated from 7.1.</para>
-  </listitem>
-</itemizedlist>
-
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.03-new-services">
+  <title>New Services</title>
 
-<title>New Services</title>
+  <para>
+   The following new services were added since the last release:
+  </para>
 
-<para>The following new services were added since the last release:</para>
+  <itemizedlist>
+   <listitem>
+    <para>
+     <literal>./config/krb5/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./hardware/digitalbitbox.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./misc/label.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/ccache.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/criu.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/digitalbitbox/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/less.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/npm.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/plotinus.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/rootston.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/systemtap.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/sway.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/udevil.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/way-cooler.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/yabar.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./programs/zsh/zsh-autoenv.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/backup/borgbackup.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/backup/crashplan-small-business.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/desktops/dleyna-renderer.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/desktops/dleyna-server.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/desktops/pipewire.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/desktops/gnome3/chrome-gnome-shell.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/desktops/gnome3/tracker-miners.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/hardware/fwupd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/hardware/interception-tools.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/hardware/u2f.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/hardware/usbmuxd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/mail/clamsmtp.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/mail/dkimproxy-out.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/mail/pfix-srsd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/gitea.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/home-assistant.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/ihaskell.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/logkeys.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/novacomd.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/osrm.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/plexpy.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/pykms.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/misc/tzupdate.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/monitoring/fusion-inventory.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/monitoring/prometheus/exporters.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/network-filesystems/beegfs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/network-filesystems/davfs2.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/network-filesystems/openafs/client.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/network-filesystems/openafs/server.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/network-filesystems/ceph.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/aria2.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/monero.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/nghttpx/default.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/nixops-dns.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/rxe.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/networking/stunnel.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-apps/matomo.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-apps/restya-board.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/web-servers/mighttpd2.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./services/x11/fractalart.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./system/boot/binfmt.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./system/boot/grow-partition.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./tasks/filesystems/ecryptfs.nix</literal>
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     <literal>./virtualisation/hyperv-guest.nix</literal>
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-<itemizedlist>
-  <listitem><para><literal>./config/krb5/default.nix</literal></para></listitem>
-  <listitem><para><literal>./hardware/digitalbitbox.nix</literal></para></listitem>
-  <listitem><para><literal>./misc/label.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/ccache.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/criu.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/digitalbitbox/default.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/less.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/npm.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/plotinus.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/rootston.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/systemtap.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/sway.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/udevil.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/way-cooler.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/yabar.nix</literal></para></listitem>
-  <listitem><para><literal>./programs/zsh/zsh-autoenv.nix</literal></para></listitem>
-  <listitem><para><literal>./services/backup/borgbackup.nix</literal></para></listitem>
-  <listitem><para><literal>./services/backup/crashplan-small-business.nix</literal></para></listitem>
-  <listitem><para><literal>./services/desktops/dleyna-renderer.nix</literal></para></listitem>
-  <listitem><para><literal>./services/desktops/dleyna-server.nix</literal></para></listitem>
-  <listitem><para><literal>./services/desktops/pipewire.nix</literal></para></listitem>
-  <listitem><para><literal>./services/desktops/gnome3/chrome-gnome-shell.nix</literal></para></listitem>
-  <listitem><para><literal>./services/desktops/gnome3/tracker-miners.nix</literal></para></listitem>
-  <listitem><para><literal>./services/hardware/fwupd.nix</literal></para></listitem>
-  <listitem><para><literal>./services/hardware/interception-tools.nix</literal></para></listitem>
-  <listitem><para><literal>./services/hardware/u2f.nix</literal></para></listitem>
-  <listitem><para><literal>./services/hardware/usbmuxd.nix</literal></para></listitem>
-  <listitem><para><literal>./services/mail/clamsmtp.nix</literal></para></listitem>
-  <listitem><para><literal>./services/mail/dkimproxy-out.nix</literal></para></listitem>
-  <listitem><para><literal>./services/mail/pfix-srsd.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/gitea.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/home-assistant.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/ihaskell.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/logkeys.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/novacomd.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/osrm.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/plexpy.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/pykms.nix</literal></para></listitem>
-  <listitem><para><literal>./services/misc/tzupdate.nix</literal></para></listitem>
-  <listitem><para><literal>./services/monitoring/fusion-inventory.nix</literal></para></listitem>
-  <listitem><para><literal>./services/monitoring/prometheus/exporters.nix</literal></para></listitem>
-  <listitem><para><literal>./services/network-filesystems/beegfs.nix</literal></para></listitem>
-  <listitem><para><literal>./services/network-filesystems/davfs2.nix</literal></para></listitem>
-  <listitem><para><literal>./services/network-filesystems/openafs/client.nix</literal></para></listitem>
-  <listitem><para><literal>./services/network-filesystems/openafs/server.nix</literal></para></listitem>
-  <listitem><para><literal>./services/network-filesystems/ceph.nix</literal></para></listitem>
-  <listitem><para><literal>./services/networking/aria2.nix</literal></para></listitem>
-  <listitem><para><literal>./services/networking/monero.nix</literal></para></listitem>
-  <listitem><para><literal>./services/networking/nghttpx/default.nix</literal></para></listitem>
-  <listitem><para><literal>./services/networking/nixops-dns.nix</literal></para></listitem>
-  <listitem><para><literal>./services/networking/rxe.nix</literal></para></listitem>
-  <listitem><para><literal>./services/networking/stunnel.nix</literal></para></listitem>
-  <listitem><para><literal>./services/web-apps/matomo.nix</literal></para></listitem>
-  <listitem><para><literal>./services/web-apps/restya-board.nix</literal></para></listitem>
-  <listitem><para><literal>./services/web-servers/mighttpd2.nix</literal></para></listitem>
-  <listitem><para><literal>./services/x11/fractalart.nix</literal></para></listitem>
-  <listitem><para><literal>./system/boot/binfmt.nix</literal></para></listitem>
-  <listitem><para><literal>./system/boot/grow-partition.nix</literal></para></listitem>
-  <listitem><para><literal>./tasks/filesystems/ecryptfs.nix</literal></para></listitem>
-  <listitem><para><literal>./virtualisation/hyperv-guest.nix</literal></para></listitem>
-</itemizedlist>
-
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.03-incompatibilities">
+  <title>Backward Incompatibilities</title>
 
-<title>Backward Incompatibilities</title>
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
 
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:</para>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      <literal>sound.enable</literal> now defaults to false.
+     <literal>sound.enable</literal> now defaults to false.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Dollar signs in options under <option>services.postfix</option> are
-      passed verbatim to Postfix, which will interpret them as the beginning of
-      a parameter expression. This was already true for string-valued options
-      in the previous release, but not for list-valued options. If you need to
-      pass literal dollar signs through Postfix, double them.
+     Dollar signs in options under <option>services.postfix</option> are passed
+     verbatim to Postfix, which will interpret them as the beginning of a
+     parameter expression. This was already true for string-valued options in
+     the previous release, but not for list-valued options. If you need to pass
+     literal dollar signs through Postfix, double them.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>postage</literal> package (for web-based PostgreSQL
-      administration) has been renamed to <literal>pgmanage</literal>. The
-      corresponding module has also been renamed. To migrate please rename all
-      <option>services.postage</option> options to
-      <option>services.pgmanage</option>.
+     The <literal>postage</literal> package (for web-based PostgreSQL
+     administration) has been renamed to <literal>pgmanage</literal>. The
+     corresponding module has also been renamed. To migrate please rename all
+     <option>services.postage</option> options to
+     <option>services.pgmanage</option>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Package attributes starting with a digit have been prefixed with an
-      underscore sign. This is to avoid quoting in the configuration and
-      other issues with command-line tools like <literal>nix-env</literal>.
-      The change affects the following packages:
-      <itemizedlist>
-        <listitem>
-          <para><literal>2048-in-terminal</literal> → <literal>_2048-in-terminal</literal></para>
-        </listitem>
-        <listitem>
-          <para><literal>90secondportraits</literal> → <literal>_90secondportraits</literal></para>
-        </listitem>
-        <listitem>
-          <para><literal>2bwm</literal> → <literal>_2bwm</literal></para>
-        </listitem>
-        <listitem>
-          <para><literal>389-ds-base</literal> → <literal>_389-ds-base</literal></para>
-        </listitem>
-      </itemizedlist>
+     Package attributes starting with a digit have been prefixed with an
+     underscore sign. This is to avoid quoting in the configuration and other
+     issues with command-line tools like <literal>nix-env</literal>. The change
+     affects the following packages:
+     <itemizedlist>
+      <listitem>
+       <para>
+        <literal>2048-in-terminal</literal> →
+        <literal>_2048-in-terminal</literal>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>90secondportraits</literal> →
+        <literal>_90secondportraits</literal>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>2bwm</literal> → <literal>_2bwm</literal>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <literal>389-ds-base</literal> → <literal>_389-ds-base</literal>
+       </para>
+      </listitem>
+     </itemizedlist>
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <emphasis role="strong">
-        The OpenSSH service no longer enables support for DSA keys by default,
-        which could cause a system lock out. Update your keys or, unfavorably,
-        re-enable DSA support manually.
-      </emphasis>
+     <emphasis role="strong"> The OpenSSH service no longer enables support for
+     DSA keys by default, which could cause a system lock out. Update your keys
+     or, unfavorably, re-enable DSA support manually. </emphasis>
     </para>
-
     <para>
-      DSA support was
-      <link xlink:href="https://www.openssh.com/legacy.html">deprecated in OpenSSH 7.0</link>,
-      due to it being too weak. To re-enable support, add
-      <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your
-      <option>services.openssh.extraConfig</option>.
+     DSA support was
+     <link xlink:href="https://www.openssh.com/legacy.html">deprecated in
+     OpenSSH 7.0</link>, due to it being too weak. To re-enable support, add
+     <literal>PubkeyAcceptedKeyTypes +ssh-dss</literal> to the end of your
+     <option>services.openssh.extraConfig</option>.
     </para>
-
     <para>
-      After updating the keys to be stronger, anyone still on a pre-17.03
-      version is safe to jump to 17.03, as vetted
-      <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
+     After updating the keys to be stronger, anyone still on a pre-17.03
+     version is safe to jump to 17.03, as vetted
+     <link xlink:href="https://search.nix.gsc.io/?q=stateVersion">here</link>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>openssh</literal> package
-      now includes Kerberos support by default;
-      the <literal>openssh_with_kerberos</literal> package
-      is now a deprecated alias.
-      If you do not want Kerberos support,
-      you can do <literal>openssh.override { withKerberos = false; }</literal>.
-      Note, this also applies to the <literal>openssh_hpn</literal> package.
+     The <literal>openssh</literal> package now includes Kerberos support by
+     default; the <literal>openssh_with_kerberos</literal> package is now a
+     deprecated alias. If you do not want Kerberos support, you can do
+     <literal>openssh.override { withKerberos = false; }</literal>. Note, this
+     also applies to the <literal>openssh_hpn</literal> package.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>cc-wrapper</literal> has been split in two; there is now also a <literal>bintools-wrapper</literal>.
-      The most commonly used files in <filename>nix-support</filename> are now split between the two wrappers.
-      Some commonly used ones, like <filename>nix-support/dynamic-linker</filename>, are duplicated for backwards compatability, even though they rightly belong only in <literal>bintools-wrapper</literal>.
-      Other more obscure ones are just moved.
+     <literal>cc-wrapper</literal> has been split in two; there is now also a
+     <literal>bintools-wrapper</literal>. The most commonly used files in
+     <filename>nix-support</filename> are now split between the two wrappers.
+     Some commonly used ones, like
+     <filename>nix-support/dynamic-linker</filename>, are duplicated for
+     backwards compatability, even though they rightly belong only in
+     <literal>bintools-wrapper</literal>. Other more obscure ones are just
+     moved.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The propagation logic has been changed.
-      The new logic, along with new types of dependencies that go with, is thoroughly documented in the "Specifying dependencies" section of the "Standard Environment" chapter of the nixpkgs manual.
-      <!-- That's <xref linkend="ssec-stdenv-attributes"> were we to merge the manuals. -->
-      The old logic isn't but is easy to describe: dependencies were propagated as the same type of dependency no matter what.
-      In practice, that means that many <function>propagatedNativeBuildInputs</function> should instead be  <function>propagatedBuildInputs</function>.
-      Thankfully, that was and is the least used type of dependency.
-      Also, it means that some <function>propagatedBuildInputs</function> should instead be <function>depsTargetTargetPropagated</function>.
-      Other types dependencies should be unaffected.
+     The propagation logic has been changed. The new logic, along with new
+     types of dependencies that go with, is thoroughly documented in the
+     "Specifying dependencies" section of the "Standard Environment" chapter of
+     the nixpkgs manual.
+<!-- That's <xref linkend="ssec-stdenv-attributes"> were we to merge the manuals. -->
+     The old logic isn't but is easy to describe: dependencies were propagated
+     as the same type of dependency no matter what. In practice, that means
+     that many <function>propagatedNativeBuildInputs</function> should instead
+     be <function>propagatedBuildInputs</function>. Thankfully, that was and is
+     the least used type of dependency. Also, it means that some
+     <function>propagatedBuildInputs</function> should instead be
+     <function>depsTargetTargetPropagated</function>. Other types dependencies
+     should be unaffected.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>lib.addPassthru drv passthru</literal> is removed.  Use <literal>lib.extendDerivation true passthru drv</literal> instead.
+     <literal>lib.addPassthru drv passthru</literal> is removed. Use
+     <literal>lib.extendDerivation true passthru drv</literal> instead.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>memcached</literal> service no longer accept dynamic socket
-      paths via <option>services.memcached.socket</option>. Unix sockets can be
-      still enabled by <option>services.memcached.enableUnixSocket</option> and
-      will be accessible at <literal>/run/memcached/memcached.sock</literal>.
+     The <literal>memcached</literal> service no longer accept dynamic socket
+     paths via <option>services.memcached.socket</option>. Unix sockets can be
+     still enabled by <option>services.memcached.enableUnixSocket</option> and
+     will be accessible at <literal>/run/memcached/memcached.sock</literal>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <varname>hardware.amdHybridGraphics.disable</varname> option was removed for lack of a maintainer. If you still need this module, you may wish to include a copy of it from an older version of nixos in your imports.
+     The <varname>hardware.amdHybridGraphics.disable</varname> option was
+     removed for lack of a maintainer. If you still need this module, you may
+     wish to include a copy of it from an older version of nixos in your
+     imports.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The merging of config options for <varname>services.postfix.config</varname>
-      was buggy. Previously, if other options in the Postfix module like
-      <varname>services.postfix.useSrs</varname> were set and the user set config
-      options that were also set by such options, the resulting config wouldn't
-      include all options that were needed. They are now merged correctly. If
-      config options need to be overridden, <literal>lib.mkForce</literal> or
-      <literal>lib.mkOverride</literal> can be used.
+     The merging of config options for
+     <varname>services.postfix.config</varname> was buggy. Previously, if other
+     options in the Postfix module like
+     <varname>services.postfix.useSrs</varname> were set and the user set
+     config options that were also set by such options, the resulting config
+     wouldn't include all options that were needed. They are now merged
+     correctly. If config options need to be overridden,
+     <literal>lib.mkForce</literal> or <literal>lib.mkOverride</literal> can be
+     used.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The following changes apply if the <literal>stateVersion</literal> is changed to 18.03 or higher.
-      For <literal>stateVersion = "17.09"</literal> or lower the old behavior is preserved.
+     The following changes apply if the <literal>stateVersion</literal> is
+     changed to 18.03 or higher. For <literal>stateVersion = "17.09"</literal>
+     or lower the old behavior is preserved.
     </para>
     <itemizedlist>
-      <listitem>
-        <para>
-          <literal>matrix-synapse</literal> uses postgresql by default instead of sqlite.
-          Migration instructions can be found <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite"> here </link>.
-        </para>
-      </listitem>
+     <listitem>
+      <para>
+       <literal>matrix-synapse</literal> uses postgresql by default instead of
+       sqlite. Migration instructions can be found
+       <link xlink:href="https://github.com/matrix-org/synapse/blob/master/docs/postgres.rst#porting-from-sqlite">
+       here </link>.
+      </para>
+     </listitem>
     </itemizedlist>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>jid</literal> package has been removed, due to maintenance
-      overhead of a go package having non-versioned dependencies.
+     The <literal>jid</literal> package has been removed, due to maintenance
+     overhead of a go package having non-versioned dependencies.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      When using <option>services.xserver.libinput</option> (enabled by default in GNOME),
-      it now handles all input devices, not just touchpads. As a result, you might need to
-      re-evaluate any custom Xorg configuration. In particular,
-      <literal>Option "XkbRules" "base"</literal> may result in broken keyboard layout.
+     When using <option>services.xserver.libinput</option> (enabled by default
+     in GNOME), it now handles all input devices, not just touchpads. As a
+     result, you might need to re-evaluate any custom Xorg configuration. In
+     particular, <literal>Option "XkbRules" "base"</literal> may result in
+     broken keyboard layout.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>attic</literal> package was removed. A maintained fork called
-      <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used instead.
-      Migration instructions can be found
-      <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
+     The <literal>attic</literal> package was removed. A maintained fork called
+     <link xlink:href="https://www.borgbackup.org/">Borg</link> should be used
+     instead. Migration instructions can be found
+     <link xlink:href="http://borgbackup.readthedocs.io/en/stable/usage/upgrade.html#attic-and-borg-0-xx-to-borg-1-x">here</link>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The Piwik analytics software was renamed to Matomo:
-      <itemizedlist>
-        <listitem>
-          <para>The package <literal>pkgs.piwik</literal> was renamed to <literal>pkgs.matomo</literal>.</para>
-        </listitem>
-        <listitem>
-          <para>The service <literal>services.piwik</literal> was renamed to <literal>services.matomo</literal>.</para>
-        </listitem>
-        <listitem>
-          <para>
-            The data directory <filename>/var/lib/piwik</filename> was renamed to <filename>/var/lib/matomo</filename>.
-            All files will be moved automatically on first startup, but you might need to adjust your backup scripts.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The default <option>serverName</option> for the nginx configuration changed from
-            <literal>piwik.${config.networking.hostName}</literal> to
-            <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal>
-            if <option>config.networking.domain</option> is set,
-            <literal>matomo.${config.networking.hostName}</literal> if it is not set.
-            If you change your <option>serverName</option>, remember you'll need to update the
-            <literal>trustedHosts[]</literal> array in <filename>/var/lib/matomo/config/config.ini.php</filename>
-            as well.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            The <literal>piwik</literal> user was renamed to <literal>matomo</literal>.
-            The service will adjust ownership automatically for files in the data directory.
-            If you use unix socket authentication, remember to give the new <literal>matomo</literal> user
-            access to the database and to change the <literal>username</literal> to <literal>matomo</literal>
-            in the <literal>[database]</literal> section of <filename>/var/lib/matomo/config/config.ini.php</filename>.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            If you named your database `piwik`, you might want to rename it to `matomo` to keep things clean,
-            but this is neither enforced nor required.
-          </para>
-        </listitem>
-      </itemizedlist>
+     The Piwik analytics software was renamed to Matomo:
+     <itemizedlist>
+      <listitem>
+       <para>
+        The package <literal>pkgs.piwik</literal> was renamed to
+        <literal>pkgs.matomo</literal>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        The service <literal>services.piwik</literal> was renamed to
+        <literal>services.matomo</literal>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        The data directory <filename>/var/lib/piwik</filename> was renamed to
+        <filename>/var/lib/matomo</filename>. All files will be moved
+        automatically on first startup, but you might need to adjust your
+        backup scripts.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        The default <option>serverName</option> for the nginx configuration
+        changed from <literal>piwik.${config.networking.hostName}</literal> to
+        <literal>matomo.${config.networking.hostName}.${config.networking.domain}</literal>
+        if <option>config.networking.domain</option> is set,
+        <literal>matomo.${config.networking.hostName}</literal> if it is not
+        set. If you change your <option>serverName</option>, remember you'll
+        need to update the <literal>trustedHosts[]</literal> array in
+        <filename>/var/lib/matomo/config/config.ini.php</filename> as well.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        The <literal>piwik</literal> user was renamed to
+        <literal>matomo</literal>. The service will adjust ownership
+        automatically for files in the data directory. If you use unix socket
+        authentication, remember to give the new <literal>matomo</literal> user
+        access to the database and to change the <literal>username</literal> to
+        <literal>matomo</literal> in the <literal>[database]</literal> section
+        of <filename>/var/lib/matomo/config/config.ini.php</filename>.
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        If you named your database `piwik`, you might want to rename it to
+        `matomo` to keep things clean, but this is neither enforced nor
+        required.
+       </para>
+      </listitem>
+     </itemizedlist>
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>nodejs-4_x</literal> is end-of-life.
-      <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and <literal>nodePackages_4_x</literal> are removed.
+     <literal>nodejs-4_x</literal> is end-of-life.
+     <literal>nodejs-4_x</literal>, <literal>nodejs-slim-4_x</literal> and
+     <literal>nodePackages_4_x</literal> are removed.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>pump.io</literal> NixOS module was removed.
-      It is now maintained as an
-      <link xlink:href="https://github.com/rvl/pump.io-nixos">external module</link>.
+     The <literal>pump.io</literal> NixOS module was removed. It is now
+     maintained as an
+     <link xlink:href="https://github.com/rvl/pump.io-nixos">external
+     module</link>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The Prosody XMPP server has received a major update. The following modules were renamed:
-      <itemizedlist>
-        <listitem>
-          <para>
-            <option>services.prosody.modules.httpserver</option> is now <option>services.prosody.modules.http_files</option>
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            <option>services.prosody.modules.console</option> is now <option>services.prosody.modules.admin_telnet</option>
-          </para>
-        </listitem>
-      </itemizedlist>
+     The Prosody XMPP server has received a major update. The following modules
+     were renamed:
+     <itemizedlist>
+      <listitem>
+       <para>
+        <option>services.prosody.modules.httpserver</option> is now
+        <option>services.prosody.modules.http_files</option>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <option>services.prosody.modules.console</option> is now
+        <option>services.prosody.modules.admin_telnet</option>
+       </para>
+      </listitem>
+     </itemizedlist>
     </para>
+    <para>
+     Many new modules are now core modules, most notably
+     <option>services.prosody.modules.carbons</option> and
+     <option>services.prosody.modules.mam</option>.
+    </para>
+    <para>
+     The better-performing <literal>libevent</literal> backend is now enabled
+     by default.
+    </para>
+    <para>
+     <literal>withCommunityModules</literal> now passes through the modules to
+     <option>services.prosody.extraModules</option>. Use
+     <literal>withOnlyInstalledCommunityModules</literal> for modules that
+     should not be enabled directly, e.g <literal>lib_ldap</literal>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     All prometheus exporter modules are now defined as submodules. The
+     exporters are configured using
+     <literal>services.prometheus.exporters</literal>.
+    </para>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-    <para>
-      Many new modules are now core modules, most notably <option>services.prosody.modules.carbons</option>
-      and <option>services.prosody.modules.mam</option>.
-    </para>
-
-    <para>
-      The better-performing <literal>libevent</literal> backend is now enabled by default.
-    </para>
-
-    <para>
-      <literal>withCommunityModules</literal> now passes through the modules to <option>services.prosody.extraModules</option>.
-      Use <literal>withOnlyInstalledCommunityModules</literal> for modules that should not be enabled directly, e.g <literal>lib_ldap</literal>.
-    </para>
-  </listitem>
-  <listitem>
-    <para>
-      All prometheus exporter modules are now defined as submodules.
-      The exporters are configured using <literal>services.prometheus.exporters</literal>.
-    </para>
-  </listitem>
-</itemizedlist>
-
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.03-notable-changes">
+  <title>Other Notable Changes</title>
 
-<title>Other Notable Changes</title>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      ZNC option <option>services.znc.mutable</option> now defaults to
-      <literal>true</literal>. That means that old configuration is not
-      overwritten by default when update to the znc options are made.
+     ZNC option <option>services.znc.mutable</option> now defaults to
+     <literal>true</literal>. That means that old configuration is not
+     overwritten by default when update to the znc options are made.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The option <option>networking.wireless.networks.&lt;name&gt;.auth</option>
-      has been added for wireless networks with WPA-Enterprise authentication.
-      There is also a new <option>extraConfig</option> option to directly
-      configure <literal>wpa_supplicant</literal> and <option>hidden</option>
-      to connect to hidden networks.
+     The option <option>networking.wireless.networks.&lt;name&gt;.auth</option>
+     has been added for wireless networks with WPA-Enterprise authentication.
+     There is also a new <option>extraConfig</option> option to directly
+     configure <literal>wpa_supplicant</literal> and <option>hidden</option> to
+     connect to hidden networks.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      In the module <option>networking.interfaces.&lt;name&gt;</option> the
-      following options have been removed:
-      <itemizedlist>
-        <listitem>
-          <para><option>ipAddress</option></para>
-        </listitem>
-        <listitem>
-          <para><option>ipv6Address</option></para>
-        </listitem>
-        <listitem>
-          <para><option>prefixLength</option></para>
-        </listitem>
-        <listitem>
-          <para><option>ipv6PrefixLength</option></para>
-        </listitem>
-        <listitem>
-          <para><option>subnetMask</option></para>
-        </listitem>
-      </itemizedlist>
-      To assign static addresses to an interface the options
-      <option>ipv4.addresses</option> and <option>ipv6.addresses</option>
-      should be used instead.
-      The options <option>ip4</option> and <option>ip6</option> have been
-      renamed to <option>ipv4.addresses</option> <option>ipv6.addresses</option>
-      respectively.
-      The new options <option>ipv4.routes</option> and <option>ipv6.routes</option>
-      have been added to set up static routing.
+     In the module <option>networking.interfaces.&lt;name&gt;</option> the
+     following options have been removed:
+     <itemizedlist>
+      <listitem>
+       <para>
+        <option>ipAddress</option>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <option>ipv6Address</option>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <option>prefixLength</option>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <option>ipv6PrefixLength</option>
+       </para>
+      </listitem>
+      <listitem>
+       <para>
+        <option>subnetMask</option>
+       </para>
+      </listitem>
+     </itemizedlist>
+     To assign static addresses to an interface the options
+     <option>ipv4.addresses</option> and <option>ipv6.addresses</option> should
+     be used instead. The options <option>ip4</option> and <option>ip6</option>
+     have been renamed to <option>ipv4.addresses</option>
+     <option>ipv6.addresses</option> respectively. The new options
+     <option>ipv4.routes</option> and <option>ipv6.routes</option> have been
+     added to set up static routing.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The option <option>services.logstash.listenAddress</option> is now <literal>127.0.0.1</literal> by default.
-      Previously the default behaviour was to listen on all interfaces.
+     The option <option>services.logstash.listenAddress</option> is now
+     <literal>127.0.0.1</literal> by default. Previously the default behaviour
+     was to listen on all interfaces.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>services.btrfs.autoScrub</literal> has been added, to
-      periodically check btrfs filesystems for data corruption.
-      If there's a correct copy available, it will automatically repair
-      corrupted blocks.
+     <literal>services.btrfs.autoScrub</literal> has been added, to
+     periodically check btrfs filesystems for data corruption. If there's a
+     correct copy available, it will automatically repair corrupted blocks.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal>
-      has been added, the clock format string (as expected by
-      strftime, e.g. <literal>%H:%M</literal>) to use with the lightdm
-      gtk greeter panel.
+     <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> has
+     been added, the clock format string (as expected by strftime, e.g.
+     <literal>%H:%M</literal>) to use with the lightdm gtk greeter panel.
     </para>
     <para>
-      If set to null the default clock format is used.
+     If set to null the default clock format is used.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>displayManager.lightdm.greeters.gtk.indicators</literal>
-      has been added, a list of allowed indicator modules to use with
-      the lightdm gtk greeter panel.
+     <literal>displayManager.lightdm.greeters.gtk.indicators</literal> has been
+     added, a list of allowed indicator modules to use with the lightdm gtk
+     greeter panel.
     </para>
     <para>
-      Built-in indicators include <literal>~a11y</literal>,
-      <literal>~language</literal>, <literal>~session</literal>,
-      <literal>~power</literal>, <literal>~clock</literal>,
-      <literal>~host</literal>, <literal>~spacer</literal>. Unity
-      indicators can be represented by short name
-      (e.g. <literal>sound</literal>, <literal>power</literal>),
-      service file name, or absolute path.
+     Built-in indicators include <literal>~a11y</literal>,
+     <literal>~language</literal>, <literal>~session</literal>,
+     <literal>~power</literal>, <literal>~clock</literal>,
+     <literal>~host</literal>, <literal>~spacer</literal>. Unity indicators can
+     be represented by short name (e.g. <literal>sound</literal>,
+     <literal>power</literal>), service file name, or absolute path.
     </para>
     <para>
-      If set to <literal>null</literal> the default indicators are
-      used.
+     If set to <literal>null</literal> the default indicators are used.
     </para>
     <para>
-      In order to have the previous default configuration add
+     In order to have the previous default configuration add
 <programlisting>
   services.xserver.displayManager.lightdm.greeters.gtk.indicators = [
     "~host" "~spacer"
@@ -539,24 +829,27 @@ following incompatible changes:</para>
     "~power"
   ];
 </programlisting>
-      to your <literal>configuration.nix</literal>.
+     to your <literal>configuration.nix</literal>.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The NixOS test driver supports user services declared by <literal>systemd.user.services</literal>.
-      The methods <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>, <literal>startJob</literal>
-      and <literal>stopJob</literal> provide an optional <literal>$user</literal> argument for that purpose.
+     The NixOS test driver supports user services declared by
+     <literal>systemd.user.services</literal>. The methods
+     <literal>waitForUnit</literal>, <literal>getUnitInfo</literal>,
+     <literal>startJob</literal> and <literal>stopJob</literal> provide an
+     optional <literal>$user</literal> argument for that purpose.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      Enabling bash completion on NixOS, <literal>programs.bash.enableCompletion</literal>, will now also enable
-      completion for the Nix command line tools by installing the
-      <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link> package.
+     Enabling bash completion on NixOS,
+     <literal>programs.bash.enableCompletion</literal>, will now also enable
+     completion for the Nix command line tools by installing the
+     <link xlink:href="https://github.com/hedning/nix-bash-completions">nix-bash-completions</link>
+     package.
     </para>
-  </listitem>
-</itemizedlist>
-
-</section>
+   </listitem>
+  </itemizedlist>
+ </section>
 </section>
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 0743a05ba38c..47b54a411efa 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -3,153 +3,158 @@
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.09">
+ <title>Release 18.09 (“Jellyfish”, 2018/09/??)</title>
 
-<title>Release 18.09 (“Jellyfish”, 2018/09/??)</title>
-
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.09-highlights">
+  <title>Highlights</title>
 
-<title>Highlights</title>
+  <para>
+   In addition to numerous new and upgraded packages, this release has the
+   following highlights:
+  </para>
 
-<para>In addition to numerous new and upgraded packages, this release
-has the following highlights: </para>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      User channels are now in the default <literal>NIX_PATH</literal>,
-      allowing users to use their personal <command>nix-channel</command>
-      defined channels in <command>nix-build</command> and
-      <command>nix-shell</command> commands, as well as in imports like
-      <code>import &lt;mychannel&gt;</code>.
+     User channels are now in the default <literal>NIX_PATH</literal>, allowing
+     users to use their personal <command>nix-channel</command> defined
+     channels in <command>nix-build</command> and <command>nix-shell</command>
+     commands, as well as in imports like <code>import
+     &lt;mychannel&gt;</code>.
     </para>
-    <para>For example</para>
-    <programlisting>
+    <para>
+     For example
+    </para>
+<programlisting>
 $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgsunstable
 $ nix-channel --update
 $ nix-build '&lt;nixpkgsunstable&gt;' -A gitFull
 $ nix run -f '&lt;nixpkgsunstable&gt;' gitFull
 $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
 </programlisting>
-  </listitem>
-</itemizedlist>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.09-new-services">
+  <title>New Services</title>
 
-<title>New Services</title>
+  <para>
+   The following new services were added since the last release:
+  </para>
 
-<para>The following new services were added since the last release:</para>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para></para>
-  </listitem>
-</itemizedlist>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.09-incompatibilities">
+  <title>Backward Incompatibilities</title>
 
-<title>Backward Incompatibilities</title>
+  <para>
+   When upgrading from a previous release, please be aware of the following
+   incompatible changes:
+  </para>
 
-<para>When upgrading from a previous release, please be aware of the
-following incompatible changes:</para>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      <literal>lib.strict</literal> is removed. Use <literal>builtins.seq</literal> instead.
+     <literal>lib.strict</literal> is removed. Use
+     <literal>builtins.seq</literal> instead.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>clementine</literal> package points now to the free derivation.
-      <literal>clementineFree</literal> is removed now and <literal>clementineUnfree</literal>
-      points to the package which is bundled with the unfree <literal>libspotify</literal> package.
+     The <literal>clementine</literal> package points now to the free
+     derivation. <literal>clementineFree</literal> is removed now and
+     <literal>clementineUnfree</literal> points to the package which is bundled
+     with the unfree <literal>libspotify</literal> package.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      The <literal>netcat</literal> package is now taken directly from OpenBSD's
-      <literal>libressl</literal>, instead of relying on Debian's fork. The new
-      version should be very close to the old version, but there are some minor
-      differences. Importantly, flags like -b, -q, -C, and -Z are no longer
-      accepted by the nc command.
+     The <literal>netcat</literal> package is now taken directly from OpenBSD's
+     <literal>libressl</literal>, instead of relying on Debian's fork. The new
+     version should be very close to the old version, but there are some minor
+     differences. Importantly, flags like -b, -q, -C, and -Z are no longer
+     accepted by the nc command.
     </para>
-  </listitem>
-</itemizedlist>
+   </listitem>
+  </itemizedlist>
+ </section>
 
-</section>
-<section xmlns="http://docbook.org/ns/docbook"
+ <section xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
          xml:id="sec-release-18.09-notable-changes">
+  <title>Other Notable Changes</title>
 
-<title>Other Notable Changes</title>
-
-<itemizedlist>
-  <listitem>
+  <itemizedlist>
+   <listitem>
     <para>
-      <literal>lib.attrNamesToStr</literal> has been deprecated. Use
-      more specific concatenation (<literal>lib.concat(Map)StringsSep</literal>)
-      instead.
+     <literal>lib.attrNamesToStr</literal> has been deprecated. Use more
+     specific concatenation (<literal>lib.concat(Map)StringsSep</literal>)
+     instead.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use
-      <literal>builtins.addErrorContext</literal> directly.
+     <literal>lib.addErrorContextToAttrs</literal> has been deprecated. Use
+     <literal>builtins.addErrorContext</literal> directly.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>lib.showVal</literal> has been deprecated. Use
-      <literal>lib.traceSeqN</literal> instead.
+     <literal>lib.showVal</literal> has been deprecated. Use
+     <literal>lib.traceSeqN</literal> instead.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>lib.traceXMLVal</literal> has been deprecated. Use
-      <literal>lib.traceValFn builtins.toXml</literal> instead.
+     <literal>lib.traceXMLVal</literal> has been deprecated. Use
+     <literal>lib.traceValFn builtins.toXml</literal> instead.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>lib.traceXMLValMarked</literal> has been deprecated. Use
-      <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
+     <literal>lib.traceXMLValMarked</literal> has been deprecated. Use
+     <literal>lib.traceValFn (x: str + builtins.toXML x)</literal> instead.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>lib.traceValIfNot</literal> has been deprecated. Use
-      <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal>
-      instead.
+     <literal>lib.traceValIfNot</literal> has been deprecated. Use
+     <literal>if/then/else</literal> and <literal>lib.traceValSeq</literal>
+     instead.
     </para>
-  </listitem>
-  <listitem>
+   </listitem>
+   <listitem>
     <para>
-      <literal>lib.traceCallXml</literal> has been deprecated. Please complain
-      if you use the function regularly.
+     <literal>lib.traceCallXml</literal> has been deprecated. Please complain
+     if you use the function regularly.
     </para>
     <para>
-      The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in favor of
-      <literal>lib.version</literal>. Please refer to the discussion in
-      <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link> for further reference.
+     The attribute <literal>lib.nixpkgsVersion</literal> has been deprecated in
+     favor of <literal>lib.version</literal>. Please refer to the discussion in
+     <link xlink:href="https://github.com/NixOS/nixpkgs/pull/39416#discussion_r183845745">NixOS/nixpkgs#39416</link>
+     for further reference.
     </para>
-  </listitem>
-</itemizedlist>
-
-</section>
+   </listitem>
+  </itemizedlist>
+ </section>
 </section>

From c07c23b914cda1f1bfb53c0c6bdd7d56ec4fbad4 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 1 May 2018 14:27:53 +0200
Subject: [PATCH 0911/3370] chromium: 66.0.3359.117 -> 66.0.3359.139

---
 .../networking/browsers/chromium/common.nix    |  5 -----
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 6403f5441f36..923084a57385 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -154,11 +154,6 @@ let
       (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj")
       (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw")
       (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
-      (fetchpatch {
-        ## see https://groups.google.com/a/chromium.org/forum/#!msg/chromium-packagers/So-ojMYOQdI/K66hndtdCAAJ
-        url = "https://bazaar.launchpad.net/~chromium-team/chromium-browser/bionic-stable/download/head:/addmissingblinktools-20180416203514-02f50sz15c2mn6ei-1/add-missing-blink-tools.patch";
-        sha256 = "0dc4cmd05qjqyihrd4qb34kz0jlapjgah8bzgnvxf9m4791w062z";
-      })
     ] ++ optional enableWideVine ./patches/widevine.patch
       ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [
         ./patches/skia_buildfix.patch
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index d55cc12c165a..7be5d2591150 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp";
-    sha256bin64 = "067gpmiwnpdaqarkz740plg0ixpp7642xf4qqkq32w9v8flx3y57";
-    version = "66.0.3359.117";
+    sha256 = "136gx9qqbzfzaf19k0gxb8n4ypd4ycyr83i9v68nqdvy2k26vf4n";
+    sha256bin64 = "0w628afj5k4xygizlznwxkljgc1prxqc3lanaz6gdmyrl7gk1s7n";
+    version = "67.0.3396.18";
   };
   dev = {
-    sha256 = "0058g5dm5nfm7wdpd9y4fn0dmi8bq013l0ky5fsn4j7msm55rrg5";
-    sha256bin64 = "1ag8kg3jjv6jsxdjq33h4ksqhhhfaz5aqw9jaaqhfma908c5mc9y";
-    version = "67.0.3396.10";
+    sha256 = "1yspf0n385ail9qxsmax58mfk5yi473ygsraqs83q30pfgxc5z2f";
+    sha256bin64 = "1gi1xpnjwkg7sxv94ksv6fiymw13rxdq2hyvza8b9famvfcaz07j";
+    version = "68.0.3409.2";
   };
   stable = {
-    sha256 = "1mlfavs0m0lf60s42krqxqiyx73hdfd4r1mkjwv31p2gchsa7ibp";
-    sha256bin64 = "1ycfq6pqk7a9kyqf2112agcxav360rxbqqdc1yil0qkmz51i9zdg";
-    version = "66.0.3359.117";
+    sha256 = "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy";
+    sha256bin64 = "1vgrgay3h0961vj96ql2p0pb16gzfr48r4hk25rxdqbflnz7njz0";
+    version = "66.0.3359.139";
   };
 }

From 2cd5d3593c864e5780869559c640b9c19ba09d1d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 May 2018 23:39:26 +0200
Subject: [PATCH 0912/3370] mupdf: 1.12 -> 1.13

---
 pkgs/applications/misc/mupdf/default.nix      | 64 +------------------
 ...1.patch => mupdf-1.13-shared_libs-1.patch} | 14 ++--
 2 files changed, 12 insertions(+), 66 deletions(-)
 rename pkgs/applications/misc/mupdf/{mupdf-1.12-shared_libs-1.patch => mupdf-1.13-shared_libs-1.patch} (80%)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 000a916b737a..fbc7da070211 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -14,77 +14,19 @@ let
 
 
 in stdenv.mkDerivation rec {
-  version = "1.12.0";
+  version = "1.13.0";
   name = "mupdf-${version}";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
-    sha256 = "0mc7a92zri27lk17wdr2iffarbfi4lvrmxhc53sz84hm5yl56qsw";
+    sha256 = "02faww5bnjw76k6igrjzwf0lnw4xd9ckc8d6ilc3c4gfrdi6j707";
   };
 
   patches = [
-    # Compatibility with new openjpeg
-    (fetchpatch {
-      name = "mupdf-1.12-openjpeg-version.patch";
-      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/0001-mupdf-openjpeg.patch?h=packages/mupdf&id=a910cd33a2b311712f83710dc042fbe80c104306";
-      sha256 = "05i9v2ia586jyjqdb7g68ss4vkfwgp6cwhagc8zzggsba83azyqk";
-    })
-    (fetchpatch {
-      name = "CVE-2018-6544.1.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=b03def134988da8c800adac1a38a41a1f09a1d89;hp=26527eef77b3e51c2258c8e40845bfbc015e405d";
-      sha256 = "1rlmjibl73ls8xfpsz69axa3lw5l47vb0a1dsjqziszsld4lpj5i";
-    })
-    (fetchpatch {
-      name = "CVE-2018-6544.2.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=26527eef77b3e51c2258c8e40845bfbc015e405d;hp=ab98356f959c7a6e94b1ec10f78dd2c33ed3f3e7";
-      sha256 = "1brcc029s5zmd6ya0d9qk3mh9qwx5g6vhsf1j8h879092sya5627";
-    })
-    (fetchpatch {
-      # Bugs 698804/698810/698811, 698819: Keep PDF object numbers below limit.
-      name = "CVE-2017-17858.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=55c3f68d638ac1263a386e0aaa004bb6e8bde731";
-      sha256 = "1bf683d59i5009cv1hhmwmrp2rsb75cbf98qd44dk39cpvq8ydwv";
-    })
-    (fetchpatch {
-      # Bug 698825: Do not drop borrowed colorspaces.
-      name = "CVE-2018-1000051.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=321ba1de287016b0036bf4a56ce774ad11763384";
-      sha256 = "0jbcc9j565q5y305pi888qzlp83zww6nhkqbsmkk91gim958zikm";
-    })
-    (fetchpatch {
-      # Bug 698908 preprecondition: Add portable pseudo-random number generator based on the lrand48 family.
-      name = "CVE-2018-6187.0.1.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=2d5b4683e912d6e6e1f1e2ca5aa0297beb3e6807";
-      sha256 = "028bxinbjs5gg9myjr3vs366qxg9l2iyba2j3pxkxsh1851hj728";
-    })
-    (fetchpatch {
-      # Bug 698908 precondition: Fix "being able to search for redacted text" bug.
-      name = "CVE-2018-6187.0.2.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=25593f4f9df0c4a9b9adaa84aaa33fe2a89087f6";
-      sha256 = "195y69c3f8yqxcsa0bxrmxbdc3fx1dzvz8v66i56064mjj0mx04s";
-    })
-    (fetchpatch {
-      # Bug 698908: Resize object use and renumbering lists after repair.
-      name = "CVE-2018-6187.1.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=3e30fbb7bf5efd88df431e366492356e7eb969ec";
-      sha256 = "0wzbqj750h06q1wa6vxbpv5a5q9pfg0cxjdv88yggkrjb3vrkd9j";
-    })
-    (fetchpatch {
-      # Bug 698908: Plug PDF object leaks when decimating pages in pdfposter.
-      name = "CVE-2018-6187.2.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=a71e7c85a9f2313cde20d4479cd727a5f5518ed2";
-      sha256 = "1pcjkq8lg6l2m0186rl79lilg79crgdvz9hrmm3w60gy2gxkgksc";
-    })
-    (fetchpatch {
-      # Bug 698916: Indirect object numbers must be in range.
-      name = "CVE-2018-6192.patch";
-      url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=5e411a99604ff6be5db9e273ee84737204113299";
-      sha256 = "134zc07fp0p1mwqa8xrkq3drg4crajzf1hjf4mdwmcy1jfj2pfhj";
-    })
   ]
 
   # Use shared libraries to decrease size
-  ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.12-shared_libs-1.patch
+  ++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch
 
   ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
   ;
diff --git a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch
similarity index 80%
rename from pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch
rename to pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch
index b39f005ed74a..e29f1f52077c 100644
--- a/pkgs/applications/misc/mupdf/mupdf-1.12-shared_libs-1.patch
+++ b/pkgs/applications/misc/mupdf/mupdf-1.13-shared_libs-1.patch
@@ -9,22 +9,24 @@
  LIBS += $(XLIBS) -lm
  
  LIBS += $(FREETYPE_LIBS)
-@@ -312,9 +312,9 @@
+@@ -312,10 +312,10 @@
  
  # --- Library ---
  
 -MUPDF_LIB = $(OUT)/libmupdf.a
 -THIRD_LIB = $(OUT)/libmupdfthird.a
 -THREAD_LIB = $(OUT)/libmuthreads.a
+-PKCS7_LIB = $(OUT)/libmupkcs7.a
 +MUPDF_LIB = $(OUT)/libmupdf.so
 +THIRD_LIB = $(OUT)/libmupdfthird.so
 +THREAD_LIB = $(OUT)/libmuthreads.so
++PKCS7_LIB = $(OUT)/libmupkcs7.so
  
  MUPDF_OBJ := \
  	$(FITZ_OBJ) \
-@@ -343,11 +343,14 @@
- 
- THREAD_OBJ := $(THREAD_OBJ)
+@@ -343,13 +343,17 @@
+ 	$(ZLIB_OBJ) \
+ 	$(LCMS2_OBJ)
  
 -$(MUPDF_LIB) : $(MUPDF_OBJ)
 +$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)
@@ -33,9 +35,11 @@
 +	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdfthird.so -Wl,--no-undefined
  $(THREAD_LIB) : $(THREAD_OBJ)
 +	$(LINK_CMD) -shared -Wl,-soname -Wl,libmuthreads.so -Wl,--no-undefined -lpthread
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
++	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupkcs7.so
  
 -INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)
-+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB)
++INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)
  
  # --- Tools and Apps ---
  

From b82ee7c3d261e616e7db1205acbcef44353f0534 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 May 2018 23:52:09 +0200
Subject: [PATCH 0913/3370] pythonPackages.nbxmpp: 0.6.4 -> 0.6.5

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

diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index b6f94536e2fa..cb7635522621 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "0.6.4";
+  version = "0.6.5";
   name = "${pname}-${version}";
 
   # Tests aren't included in PyPI tarball.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     name = "${name}.tar.bz2";
     url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
         + "ref=${name}";
-    sha256 = "0mikgksf01w82wnnm0phmzkijk2c93g24fzd59s71n3zy7f7dx3l";
+    sha256 = "0b7jw07s4mnp20gcg8raw4bhw2h1hxf75cbn4f2ynj69fbpfr38h";
   };
 
   propagatedBuildInputs = [ pyopenssl ];

From cc6f2c09572215037d99f376a799a849dc9d23bf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 May 2018 23:53:11 +0200
Subject: [PATCH 0914/3370] gajim: 1.0.1 -> 1.0.2

---
 .../networking/instant-messengers/gajim/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 3fd8b932283e..a1c81f3f0020 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -17,11 +17,11 @@ with lib;
 buildPythonApplication rec {
   name = "gajim-${version}";
   majorVersion = "1.0";
-  version = "${majorVersion}.1";
+  version = "${majorVersion}.2";
 
   src = fetchurl {
     url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
-    sha256 = "16ynws10vhx6rhjjjmzw6iyb3hc19823xhx4gsb14hrc7l8vzd1c";
+    sha256 = "0wyyy3wrk7ka5xrsbafnajzf7iacg8vg3hi16pl4c5p104hdhjdw";
   };
 
   postPatch = ''

From 80c77a2efd5538a086bf01d0aa3fd851ab0209ec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 1 May 2018 23:59:07 +0200
Subject: [PATCH 0915/3370] slimerjs: 0.10.3 -> 1.0.0

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

diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix
index b3049736b710..041aee7a1c5c 100644
--- a/pkgs/development/tools/slimerjs/default.nix
+++ b/pkgs/development/tools/slimerjs/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="slimerjs";
-    version="0.10.3";
+    version="1.0.0";
     name="${baseName}-${version}";
     owner = "laurentj";
     repo = "${baseName}";
-    sha256="16v6a1kcq8il4snbrgsq5xmxs35alzf4qlmscr2yli95xq5fnl5y";
+    sha256="1w4sfrv520isbs7r1rlzl5y3idrpad7znw9fc92yz40jlwz7sxs4";
     rev = "${version}";
   };
   buildInputs = [

From 035d0f7d0994e10dc3dd175d7fd3e63bd0c9a1ae Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:03:47 +0200
Subject: [PATCH 0916/3370] apache-jena: 3.5.0 -> 3.7.0

---
 pkgs/servers/nosql/apache-jena/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index b028fcdf37d5..f3d5d121c387 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena";
-    version = "3.5.0";
+    version = "3.7.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
-    sha256 = "08hfn359l9s4lckba9xgghkn32r12gqzjjr5s5hn3fzkbsig7njy";
+    sha256 = "12w125hlhcib23cckk77cx7p9rzs57dbmmn90f7v8107d437j4mq";
   };
   buildInputs = [
     makeWrapper

From 2a9ba64053a5031b2bc76a6874c7de93f0fe8434 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:07:50 +0200
Subject: [PATCH 0917/3370] dd_rescue: 1.99.7 -> 1.99.8

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

diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix
index ee82af1a4707..1ea574dbe8ea 100644
--- a/pkgs/tools/system/dd_rescue/default.nix
+++ b/pkgs/tools/system/dd_rescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoconf }:
 
 stdenv.mkDerivation rec {
-  version = "1.99.7";
+  version = "1.99.8";
   name = "dd_rescue-${version}";
 
   src = fetchurl {
-    sha256 = "0d318i1i5d7hbj06wmb3xag14x542cv7fpkh5zjf5ccm64nyzir4";
+    sha256 = "1gbxm8gr9sx5g1q9dycs21hkxikcy97q09lp1lvs59pnd9qpdnwh";
     url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.bz2";
   };
 

From 18d73458c873afdcdb1773907beeb5b4336423b6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:08:18 +0200
Subject: [PATCH 0918/3370] nginxMainline: 1.13.9 -> 1.13.12

---
 pkgs/servers/http/nginx/mainline.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix
index 2bfe03295958..71cb6fc72ab9 100644
--- a/pkgs/servers/http/nginx/mainline.nix
+++ b/pkgs/servers/http/nginx/mainline.nix
@@ -1,6 +1,6 @@
 { callPackage, ... }@args:
 
 callPackage ./generic.nix (args // {
-  version = "1.13.9";
-  sha256 = "0hpsyxpxj89p5vrzv9p1hp7xjbnj5c1w6fdy626ycvsiay4a3bjz";
+  version = "1.13.12";
+  sha256 = "1pl5ii1w2ycxprxk8zdnxlpdd1dia6hyrns7mnqkm3fv5ihgb4pv";
 })

From 36f9b216eba4ec308f6e9eb06a02273130648ab7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:09:13 +0200
Subject: [PATCH 0919/3370] nginxStable: 1.12.2 -> 1.14.0

---
 pkgs/servers/http/nginx/stable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix
index 7bd74c3a3325..1b61cb87c9af 100644
--- a/pkgs/servers/http/nginx/stable.nix
+++ b/pkgs/servers/http/nginx/stable.nix
@@ -1,6 +1,6 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "1.12.2";
-  sha256 = "05h4rwja7170z0l979yjghy9i9ichllwhicylzpmmyyml6fkfprh";
+  version = "1.14.0";
+  sha256 = "1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax";
 })

From d3b3ce4b787960c801641a900c239204179c2f7a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:10:21 +0200
Subject: [PATCH 0920/3370] sgtpuzzles: 20180409 -> 20180429

---
 pkgs/games/sgt-puzzles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 30e2bcfdf524..ce8d38ca5d1d 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "sgt-puzzles-r${version}";
-  version = "20180409.d95f476";
+  version = "20180429.31384ca";
 
   src = fetchurl {
    url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-   sha256 = "1psml0abh3i577dns440h52568ggdny2wk1hhr30815nxibbribx";
+   sha256 = "0r97kyy0rxgzw78lby2kwi8fg1yimw8a3biy5psgd983d0nwcf9l";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig perl wrapGAppsHook ];

From f7bd84b6b13e7da6bfe61433406284a2a18ca531 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:13:06 +0200
Subject: [PATCH 0921/3370] smbnetfs: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix
index 7ff42c4d1f99..9c279f99b005 100644
--- a/pkgs/tools/filesystems/smbnetfs/default.nix
+++ b/pkgs/tools/filesystems/smbnetfs/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, fuse, samba, pkgconfig, glib }:
+{ stdenv, fetchurl, fuse, samba, pkgconfig, glib, autoconf, attr, libsecret }:
 
 stdenv.mkDerivation rec {
   name = "smbnetfs-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
   src = fetchurl {
     url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${name}.tar.bz2";
-    sha256 = "16sikr81ipn8v1a1zrqgnsy2as3zcaxbzkr0bm5vxy012bq0plkd";
+    sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ fuse samba glib ];
+  nativeBuildInputs = [ pkgconfig autoconf ];
+  buildInputs = [ fuse samba glib attr libsecret ];
 
   meta = with stdenv.lib; {
     description = "A FUSE FS for mounting Samba shares";

From e1ae2efa92e3911a6f9052c208dec90ecac98921 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:21:14 +0200
Subject: [PATCH 0922/3370] sbcl: 1.4.6 -> 1.4.7

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 29a192fcff24..261a2fb6432c 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.4.6";
+  version = "1.4.7";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0y46zgg3lamaqqhxbqmbwzvdakzvc9j07d0ci8f57pfl549v04a4";
+    sha256 = "1wmxly94pn8527092hyzg5mq58mg7qlc46nm31f268wb2dm67rvm";
   };
 
   patchPhase = ''

From 8b62a1b4b18854003eab4d0b21498e4e5de0a9d0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:21:44 +0200
Subject: [PATCH 0923/3370] botan2: 2.3 -> 2.6

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

diff --git a/pkgs/development/libraries/botan/2.0.nix b/pkgs/development/libraries/botan/2.0.nix
index dec08d17177d..890f37897610 100644
--- a/pkgs/development/libraries/botan/2.0.nix
+++ b/pkgs/development/libraries/botan/2.0.nix
@@ -1,9 +1,9 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  baseVersion = "2.3";
+  baseVersion = "2.6";
   revision = "0";
-  sha256 = "0z6lwv28hxnfkhd4s03cb4cdm1621bsswc2h88z4qslqwpz71y9r";
+  sha256 = "1iawmymmnp5j2mcjj70slivn6bgg8gbpppldc1rjqw5sbdan3wn1";
   postPatch = ''
     sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
   '';

From 28201b8009032f9033e837118d4c3aed77867ef7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:22:23 +0200
Subject: [PATCH 0924/3370] liblangtag: init at 0.6.1

---
 .../libraries/liblangtag/default.nix          | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/libraries/liblangtag/default.nix

diff --git a/pkgs/development/libraries/liblangtag/default.nix b/pkgs/development/libraries/liblangtag/default.nix
new file mode 100644
index 000000000000..6d9085e1741b
--- /dev/null
+++ b/pkgs/development/libraries/liblangtag/default.nix
@@ -0,0 +1,52 @@
+{stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtkdoc, gettext
+, pkgconfig, glib, libxml2, gobjectIntrospection, gnome-common, unzip
+}:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "liblangtag";
+  version = "0.6.1";
+
+  src = fetchFromBitbucket {
+    owner = "tagoh";
+    repo = "${pname}";
+    rev = "${version}";
+    sha256 = "19dk2qsg7f3ig9xz8d73jvikmf5kvrwi008wrz2psxinbdml442g";
+  };
+
+  core_zip = fetchurl {
+    # please update if an update is available
+    url = "http://www.unicode.org/Public/cldr/33/core.zip";
+    sha256 = "1faq1p5dmxpkczz6cjfsry7piksgym19cq2kf4jj2v885h490d7s";
+  };
+
+  language_subtag_registry = fetchurl {
+    url = "http://www.iana.org/assignments/language-subtag-registry";
+    sha256 = "1qfkvllyqcy40vmnvjn5w9fxw7g6ww46cb306vkgcfghnjjfhv3b";
+  };
+
+  postPatch = ''
+    gtkdocize
+    cp "${core_zip}" data/core.zip
+    touch data/stamp-core-zip
+    cp "${language_subtag_registry}" data/language-subtag-registry
+  '';
+
+  configureFlags = [
+    ''--with-locale-alias=${stdenv.cc.libc}/share/locale/locale.alias''
+  ];
+
+  buildInputs = [ gettext glib libxml2 gobjectIntrospection gnome-common 
+    unzip ];
+  nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ];
+
+  meta = {
+    inherit version;
+    description = "An interface library to access tags for identifying languages";
+    license = stdenv.lib.licenses.mpl20;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    # There are links to a homepage that are broken by a BitBucket change
+    homepage = "https://bitbucket.org/tagoh/liblangtag/overview";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 11f0d4ae4239..6cf98f3f7a7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3466,6 +3466,11 @@ with pkgs;
 
   libite = callPackage ../development/libraries/libite { };
 
+  liblangtag = callPackage ../development/libraries/liblangtag {
+    inherit (gnome2) gtkdoc;
+    inherit (gnome3) gnome-common;
+  };
+
   liblouis = callPackage ../development/libraries/liblouis { };
 
   liboauth = callPackage ../development/libraries/liboauth { };

From e09c5ed7307cf51d44daea460e8c1cc5fc7cd830 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:22:42 +0200
Subject: [PATCH 0925/3370] libe-book: 0.1.2 -> 0.1.3

---
 pkgs/development/libraries/libe-book/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libe-book/default.nix b/pkgs/development/libraries/libe-book/default.nix
index 3c900f86917e..6c52f2c0b1a6 100644
--- a/pkgs/development/libraries/libe-book/default.nix
+++ b/pkgs/development/libraries/libe-book/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu
-, cppunit, zlib
+, cppunit, zlib, liblangtag
 }:
 
 let
   s = # Generated upstream information
   rec {
     baseName="libe-book";
-    version="0.1.2";
+    version="0.1.3";
     name="${baseName}-${version}";
-    hash="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz";
-    url="mirror://sourceforge/project/libebook/libe-book-0.1.2/libe-book-0.1.2.tar.xz";
-    sha256="1v48pd32r2pfysr3a3igc4ivcf6vvb26jq4pdkcnq75p70alp2bz";
+    hash="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by";
+    url="https://kent.dl.sourceforge.net/project/libebook/libe-book-0.1.3/libe-book-0.1.3.tar.xz";
+    sha256="1yg1vws1wggzhjw672bpgh2x541g5i9wryf67g51m0r79zrqz3by";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    gperf librevenge libxml2 boost icu cppunit zlib
+    gperf librevenge libxml2 boost icu cppunit zlib liblangtag
   ];
 
   # Boost 1.59 compatability fix

From 3228dcdd3d6f34753177e1d492edb48431beb9a0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 00:23:03 +0200
Subject: [PATCH 0926/3370] libreoffice-still: try fixing icon references

---
 pkgs/applications/office/libreoffice/still.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index b4139d54af50..52baed720c5f 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -183,7 +183,7 @@ in stdenv.mkDerivation rec {
     done
 
     cp -r sysui/desktop/icons  "$out/share"
-    sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
+    sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
   '';
 
   configureFlags = [

From 1cb0cfba0197e305a39fdafc92f4d8e6d5f220a3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 02:45:55 +0200
Subject: [PATCH 0927/3370] libreoffice-fresh: 6.0.2.1 -> 6.0.3.2

---
 .../office/libreoffice/default-primary-src.nix   |  6 +++---
 pkgs/applications/office/libreoffice/default.nix |  6 +++---
 .../office/libreoffice/libreoffice-srcs.nix      | 16 ++++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix
index f8742253c519..436558283e05 100644
--- a/pkgs/applications/office/libreoffice/default-primary-src.nix
+++ b/pkgs/applications/office/libreoffice/default-primary-src.nix
@@ -3,8 +3,8 @@
 rec {
   major = "6";
   minor = "0";
-  patch = "2";
-  tweak = "1";
+  patch = "3";
+  tweak = "2";
 
   subdir = "${major}.${minor}.${patch}";
 
@@ -12,6 +12,6 @@ rec {
 
   src = fetchurl {
     url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd";
+    sha256 = "16w5f8jbicby9jgsrpaj7g9c0wzymcmk1qk1fqdxaykrgpss5f0j";
   };
 }
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 89af45814bff..c8897c87bd3c 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -42,14 +42,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl";
+      sha256 = "1cx537akvil4ci4lc9gnz83xmhxyjjrpv9xcibkif6vhdck539la";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a";
+      sha256 = "00a7iqknww28z0ifcjrx529p2nxqsa4gjavk75rwykvcfyn9x686";
     };
 
   };
@@ -184,7 +184,7 @@ in stdenv.mkDerivation rec {
     done
 
     cp -r sysui/desktop/icons  "$out/share"
-    sed -re 's@Icon=libreofficedev[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
+    sed -re 's@Icon=libreoffice(dev)?[0-9.]*-?@Icon=@' -i "$out/share/applications/"*.desktop
   '';
 
   configureFlags = [
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 28c06b65869f..251aa44a2c58 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -532,11 +532,11 @@
     md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz";
   }
   {
-    name = "libxml2-2.9.7.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz";
-    sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c";
+    name = "libxml2-2.9.8.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/libxml2-2.9.8.tar.gz";
+    sha256 = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732";
     md5 = "";
-    md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz";
+    md5name = "0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732-libxml2-2.9.8.tar.gz";
   }
   {
     name = "libxslt-1.1.32.tar.gz";
@@ -651,11 +651,11 @@
     md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz";
   }
   {
-    name = "liborcus-0.13.1.tar.gz";
-    url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz";
-    sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937";
+    name = "liborcus-0.13.3.tar.gz";
+    url = "http://dev-www.libreoffice.org/src/liborcus-0.13.3.tar.gz";
+    sha256 = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9";
     md5 = "";
-    md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz";
+    md5name = "62e76de1fd3101e77118732b860354121b40a87bbb1ebfeb8203477fffac16e9-liborcus-0.13.3.tar.gz";
   }
   {
     name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";

From 4602e611fa0b6c1b35109a5e41f093d2f12a2fe1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 2 May 2018 04:15:51 +0300
Subject: [PATCH 0928/3370] Revert "Revert "hfsprogs: init at 332.25""

This reverts commit 6c182dd14dea6a68dd80e780c763b76dfceae0a2.

No reason to drop working code, for which there is no other alternative
(in this case, formatting/checking HFS+ filesystems).
---
 pkgs/tools/filesystems/hfsprogs/default.nix | 45 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/filesystems/hfsprogs/default.nix

diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix
new file mode 100644
index 000000000000..25ec31ea698a
--- /dev/null
+++ b/pkgs/tools/filesystems/hfsprogs/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, openssl, libbsd }:
+
+let version = "332.25";
+    package_name = "hfsprogs"; in
+stdenv.mkDerivation rec {
+  name = "${package_name}-${version}";
+  srcs = [
+    (fetchurl {
+      url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz";
+      sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c";
+    })
+    (fetchurl {
+      url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz";
+      sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6";
+    })
+  ];
+
+  sourceRoot = "diskdev_cmds-" + version;
+  patches = [ "../debian/patches/*.patch" ];
+
+  buildInputs = [ openssl libbsd ];
+  makefile = "Makefile.lnx";
+
+  # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/
+  installPhase = ''
+    # Create required package directories
+    install -m 755 -d "$out/bin"
+    install -m 755 -d "$out/share/${package_name}"
+    install -m 755 -d "$out/share/man/man8/"
+    # Copy executables
+    install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus"
+    install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus"
+    # Copy shared data
+    install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata"
+    # Copy man pages
+    install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8"
+    install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8"
+  '';
+
+  meta = {
+    description = "HFS/HFS+ user space utils";
+    license = stdenv.lib.licenses.apsl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf98f3f7a7c..3a327c8cd5c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2917,6 +2917,8 @@ with pkgs;
 
   hiera-eyaml = callPackage ../tools/system/hiera-eyaml { };
 
+  hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
+
   highlight = callPackage ../tools/text/highlight ({
     lua = lua5;
   } // lib.optionalAttrs stdenv.isDarwin {

From 4b3cc9ed87a0c90898950fc1fa94d968acda1bed Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 30 Apr 2018 23:35:21 -0400
Subject: [PATCH 0929/3370] cctools: Cleanup `useOld` conditions slightly

60771af5b6fc183aa354ed95e4df32c497382414 jumped through some hoops in
order to avoid a mass-rebuild.
---
 pkgs/os-specific/darwin/cctools/port.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index d8abdc2c6f84..24f21b498aa5 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -108,17 +108,15 @@ let
       #  include_next "unistd.h"
       #endif
       EOF
-    '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-      sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
-    '' + stdenv.lib.optionalString useOld ''
+
       cd cctools
+    '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+      sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' autogen.sh
     '';
 
     # TODO: this builds an ld without support for LLVM's LTO. We need to teach it, but that's rather
     # hairy to handle during bootstrap. Perhaps it could be optional?
-    preConfigure = stdenv.lib.optionalString (!useOld) ''
-      cd cctools
-    '' + ''
+    preConfigure = ''
       sh autogen.sh
     '';
 

From 62fd669ab709fbe1b1a7a7a9220c6a42a1c57acd Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 30 Apr 2018 23:42:44 -0400
Subject: [PATCH 0930/3370] darwin.libiconv: Start to fix for cross

I think I need postPatch for `autoreconfHook`, it's better anyways, and
I'm pairing this with another mass-rebuild so its essentially free.
---
 .../darwin/apple-source-releases/libiconv/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index d9b3dfb74049..a89f9fdf90ed 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, appleDerivation }:
+{ stdenv, appleDerivation, autoreconfHook }:
 
 appleDerivation {
-  preConfigure = "cd libiconv";
+  postUnpack = "sourceRoot=$sourceRoot/libiconv";
 
   postInstall = ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
-    install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
+    ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 
     # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs
-    echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \
+    echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \
       -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \
       -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib

From 0a80a37672c5f7b4feb9411d666ea9536cdcb125 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 2 May 2018 08:49:13 +0200
Subject: [PATCH 0931/3370] virtulabox: update guest additions hash

missed in 8eb3167e2efdaa6db6cf6ff0d07bc872591dd37c
---
 .../virtualization/virtualbox/guest-additions/default.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 96e8404b3ef9..b15eed09fde1 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "04q8d2dxhkkqbghqidcwv6mx57fqpp92smh7gnaxb7vqqskb9dl0";
+    sha256 = "78a4f18eb0968c7d14dbfe9decf96759c3f85d28f7e3e7ae339266f4a0b22bd1";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

From a40020ed5f1bd466d3463a0d0aaabd821b7d5aed Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 2 May 2018 12:27:47 +0300
Subject: [PATCH 0932/3370] solc: 0.4.20 -> 0.4.23

---
 pkgs/development/compilers/solc/default.nix   | 40 ++++++++----
 .../solc/patches/boost-shared-libs.patch      | 24 +++++++
 .../solc/patches/shared-libs-install.patch    | 64 +++++++++++++++++++
 3 files changed, 115 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/compilers/solc/patches/boost-shared-libs.patch
 create mode 100644 pkgs/development/compilers/solc/patches/shared-libs-install.patch

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index 4c79fb15c5cb..d94ce75e3f55 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,7 +1,9 @@
-{ stdenv, fetchzip, fetchurl, boost, cmake, z3 }:
+{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
 
 let
-  version = "0.4.20";
+  version = "0.4.23";
+  rev = "124ca40dc525a987a88176c6e5170978e82fa290";
+  sha256 = "07l8rfqh95yrdmbxc4pfb77s06k5v65dk3rgdqscqmwchkndrmm0";
   jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
@@ -12,33 +14,45 @@ in
 stdenv.mkDerivation {
   name = "solc-${version}";
 
-  # Cannot use `fetchFromGitHub' because of submodules
-  src = fetchurl {
-    url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
-    sha256 = "0jyqnykj537ksfsf2m6ww9vganmpa6yd5fmlfpa5qm1076kq7zd6";
+  src = fetchFromGitHub {
+    owner = "ethereum";
+    repo = "solidity";
+    inherit rev sha256;
   };
 
-  patchPhase = ''
+  patches = [
+    ./patches/boost-shared-libs.patch
+    ./patches/shared-libs-install.patch
+  ];
+
+  postPatch = ''
+    touch prerelease.txt
+    echo >commit_hash.txt "${rev}"
     substituteInPlace cmake/jsoncpp.cmake \
-      --replace '${jsoncppURL}' ${jsoncpp}
+      --replace "${jsoncppURL}" ${jsoncpp}
     substituteInPlace cmake/EthCompilerSettings.cmake \
-      --replace 'add_compile_options(-Werror)' ""
+      --replace "add_compile_options(-Werror)" ""
   '';
 
   cmakeFlags = [
     "-DBoost_USE_STATIC_LIBS=OFF"
+    "-DBUILD_SHARED_LIBS=ON"
+    "-DINSTALL_LLLC=ON"
+    "-DTESTS=OFF"
   ];
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost z3 ];
 
-  meta = {
+  outputs = [ "out" "dev" ];
+
+  meta = with stdenv.lib; {
     description = "Compiler for Ethereum smart contract language Solidity";
     longDescription = "This package also includes `lllc', the LLL compiler.";
     homepage = https://github.com/ethereum/solidity;
-    license = stdenv.lib.licenses.gpl3;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = [ stdenv.lib.maintainers.dbrock ];
+    license = licenses.gpl3;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ dbrock akru ];
     inherit version;
   };
 }
diff --git a/pkgs/development/compilers/solc/patches/boost-shared-libs.patch b/pkgs/development/compilers/solc/patches/boost-shared-libs.patch
new file mode 100644
index 000000000000..499fc46c6caf
--- /dev/null
+++ b/pkgs/development/compilers/solc/patches/boost-shared-libs.patch
@@ -0,0 +1,24 @@
+diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
+index 97b01c83..0bdec4b4 100644
+--- a/libsolidity/CMakeLists.txt
++++ b/libsolidity/CMakeLists.txt
+@@ -28,7 +28,7 @@ else()
+ endif()
+ 
+ add_library(solidity ${sources} ${headers})
+-target_link_libraries(solidity PUBLIC evmasm devcore)
++target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
+ 
+ if (${Z3_FOUND})
+   target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
+diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt
+index 5c480093..d6538ee2 100644
+--- a/lllc/CMakeLists.txt
++++ b/lllc/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ add_executable(lllc main.cpp)
+-target_link_libraries(lllc PRIVATE lll)
++target_link_libraries(lllc PRIVATE lll ${Boost_SYSTEM_LIBRARY})
+ 
+ if (INSTALL_LLLC)
+ 	include(GNUInstallDirs)
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
new file mode 100644
index 000000000000..732797e5ae7d
--- /dev/null
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -0,0 +1,64 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ac56b43..dacf3853 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,6 +48,19 @@ add_subdirectory(libevmasm)
+ add_subdirectory(libsolidity)
+ add_subdirectory(libsolc)
+ 
++install(DIRECTORY libdevcore/
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore
++        FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY libevmasm/
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libevmasm
++        FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY libsolidity/
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity
++        FILES_MATCHING PATTERN "*.h")
++install(DIRECTORY liblll/
++        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll
++        FILES_MATCHING PATTERN "*.h")
++
+ if (NOT EMSCRIPTEN)
+ 	add_subdirectory(solc)
+ 	add_subdirectory(liblll)
+diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt
+index fa7e3f48..1f9f52b4 100644
+--- a/libdevcore/CMakeLists.txt
++++ b/libdevcore/CMakeLists.txt
+@@ -6,3 +6,4 @@ target_link_libraries(devcore PRIVATE jsoncpp ${Boost_FILESYSTEM_LIBRARIES} ${Bo
+ target_include_directories(devcore PUBLIC "${CMAKE_SOURCE_DIR}")
+ target_include_directories(devcore SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})
+ add_dependencies(devcore solidity_BuildInfo.h)
++install(TARGETS devcore LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
+index 86192c1b..e7f15e93 100644
+--- a/libevmasm/CMakeLists.txt
++++ b/libevmasm/CMakeLists.txt
+@@ -3,3 +3,4 @@ file(GLOB headers "*.h")
+ 
+ add_library(evmasm ${sources} ${headers})
+ target_link_libraries(evmasm PUBLIC jsoncpp devcore)
++install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
+index 4cdc073a..b61f03c7 100644
+--- a/liblll/CMakeLists.txt
++++ b/liblll/CMakeLists.txt
+@@ -3,3 +3,4 @@ file(GLOB headers "*.h")
+ 
+ add_library(lll ${sources} ${headers})
+ target_link_libraries(lll PUBLIC evmasm devcore)
++install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
+index 97b01c83..e876177e 100644
+--- a/libsolidity/CMakeLists.txt
++++ b/libsolidity/CMakeLists.txt
+@@ -28,7 +28,8 @@ else()
+ endif()
+ 
+ add_library(solidity ${sources} ${headers})
+ target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
++install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if (${Z3_FOUND})
+   target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})

From 76f32d9b41b7c6cc4c4d5e0bfeb5af8fbd2b1661 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Wed, 28 Mar 2018 12:43:07 +0100
Subject: [PATCH 0933/3370] godot: add a dev output containing the gdnative
 headers

---
 pkgs/development/tools/godot/default.nix | 26 +++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix
index 89cc7eb1bfee..88ea499d28cf 100644
--- a/pkgs/development/tools/godot/default.nix
+++ b/pkgs/development/tools/godot/default.nix
@@ -34,27 +34,29 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildPhase = ''
-    scons platform=x11 prefix=$out -j $NIX_BUILD_CORES \
+    scons target=release_debug platform=x11 prefix=$out -j $NIX_BUILD_CORES \
       ${lib.concatStringsSep " "
           (lib.mapAttrsToList (k: v: "${k}=${builtins.toJSON v}") options)}
   '';
 
+  outputs = [ "out" "dev" "man" ];
+
   installPhase = ''
-    mkdir -p $out/bin
-    cp bin/godot.x11.tools.* $out/bin/godot
+    mkdir -p "$out/bin"
+    cp bin/godot.* $out/bin/godot
 
-    mkdir -p "$out/share/applications"
+    mkdir "$dev"
+    cp -r modules/gdnative/include $dev
+
+    mkdir -p "$man/share/man/man6"
+    cp misc/dist/linux/godot.6 "$man/share/man/man6/"
+
+    mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
     cp misc/dist/linux/godot.desktop "$out/share/applications/"
-    substituteInPlace "$out/share/applications/godot.desktop" \
-                      --replace "Exec=godot" \
-                      "Exec=$out/bin/godot"
-
-    mkdir -p "$out/share/icons/hicolor/scalable/apps/"
     cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
     cp icon.png "$out/share/icons/godot.png"
-
-    mkdir -p "$out/share/man/man6"
-    cp misc/dist/linux/godot.6 "$out/share/man/man6/"
+    substituteInPlace "$out/share/applications/godot.desktop" \
+      --replace "Exec=godot" "Exec=$out/bin/godot"
   '';
 
   meta = {

From a811d1d6cc11820e3f844dc4ace20bfb132898f9 Mon Sep 17 00:00:00 2001
From: James Kay <james@hadean.com>
Date: Wed, 28 Mar 2018 12:43:45 +0100
Subject: [PATCH 0934/3370] godot_headers: remove in favour of godot.dev

---
 .../libraries/godot_headers/default.nix       | 23 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/godot_headers/default.nix

diff --git a/pkgs/development/libraries/godot_headers/default.nix b/pkgs/development/libraries/godot_headers/default.nix
deleted file mode 100644
index 940882b1742d..000000000000
--- a/pkgs/development/libraries/godot_headers/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-stdenv.mkDerivation rec {
-  name = "godot_headers";
-  version = "2018-02-09";
-  src = fetchFromGitHub {
-    owner = "GodotNativeTools";
-    repo = "godot_headers";
-    rev = "51bca3bf5d917341f3e15076c5a9191f8a5118ae";
-    sha256 = "0z562pqm8y8wldmfiya72cvwwpvcfznpl0wypagw50v0f41ilywh";
-  };
-  buildPhase = "true";
-  installPhase = ''
-    mkdir $out
-    cp -r . $out/include
-  '';
-  meta = {
-    homepage = "https://github.com/GodotNativeTools/godot_headers/";
-    description = "Headers for the Godot API supplied by the GDNative module";
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.twey ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a327c8cd5c3..2285e70bfa29 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2623,7 +2623,6 @@ with pkgs;
   gocryptfs = callPackage ../tools/filesystems/gocrypfs { };
 
   godot = callPackage ../development/tools/godot {};
-  godot_headers = callPackage ../development/libraries/godot_headers {};
 
   goklp = callPackage ../tools/networking/goklp {};
 

From a0dd9713e31bf2dfbe33ed50f2915d1c654344db Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 16 Apr 2018 17:34:07 +0800
Subject: [PATCH 0935/3370] vlc: 2.2.8 -> 3.0.1

---
 pkgs/applications/video/vlc/default.nix | 105 +++++++++++-------------
 pkgs/top-level/all-packages.nix         |  17 +---
 2 files changed, 54 insertions(+), 68 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 44c4d317d36a..6cc26baf70c0 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -1,86 +1,81 @@
-{ stdenv, fetchurl, xz, bzip2, perl, xorg, libdvdnav, libbluray
+{ stdenv, fetchurl, autoreconfHook
+, libarchive, perl, xorg, libdvdnav, libbluray
 , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib
 , pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska
-, libvorbis, libtheora, speex, lua5, libgcrypt, libupnp
+, libvorbis, libtheora, speex, lua5, libgcrypt, libgpgerror, libupnp
 , libcaca, libpulseaudio, flac, schroedinger, libxml2, librsvg
-, mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
+, mpeg2dec, systemd, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
-, libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
-, libvdpau, libsamplerate, live555, fluidsynth
-, qt4 ? null
-, withQt5 ? false, qtbase ? null, qtx11extras ? null
+, libass, libva-full, libdvbpsi, libdc1394, libraw1394, libopus
+, libvdpau, libsamplerate, live555, fluidsynth, wayland, wayland-protocols
+, onlyLibVLC ? false
+, withQt5 ? true, qtbase ? null, qtsvg ? null, qtx11extras ? null
 , jackSupport ? false
 , fetchpatch
 }:
 
 with stdenv.lib;
 
-assert (withQt5 -> qtbase != null && qtx11extras != null);
-assert (!withQt5 -> qt4 != null);
+assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.2.8";
+  version = "3.0.1";
 
   src = fetchurl {
     url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v";
+    sha256 = "008krfhykm9447wc1kkw82bsw3f6ikljgrqyb1sinwlxnkghqw6f";
   };
 
-  # Comment-out the Qt 5.5 version check, as we do apply the relevant patch.
-  # https://trac.videolan.org/vlc/ticket/16497
-  postPatch = if (!withQt5) then null else
-    "sed '/I78ef29975181ee22429c9bd4b11d96d9e68b7a9c/s/^/: #/' -i configure";
-
-  buildInputs =
-    [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
-      libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt
-      libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-      udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
-      libkate libtiger libv4l samba liboggz libass libdvbpsi libva
-      xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
-      libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
-      fluidsynth
-    ]
-    ++ [(if withQt5 then qtbase else qt4)]
-    ++ optional withQt5 qtx11extras
+  # VLC uses a *ton* of libraries for various pieces of functionality, many of
+  # which are not included here for no other reason that nobody has mentioned
+  # needing them
+  buildInputs = [
+    zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
+    libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libgpgerror
+    libupnp libcaca libpulseaudio flac schroedinger libxml2 librsvg mpeg2dec
+    systemd gnutls avahi libcddb SDL SDL_image libmtp unzip taglib libarchive
+    libkate libtiger libv4l samba liboggz libass libdvbpsi libva-full
+    xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
+    libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
+    fluidsynth wayland wayland-protocols
+  ] ++ optionals withQt5    [ qtbase qtsvg qtx11extras ]
     ++ optional jackSupport libjack2;
 
-  nativeBuildInputs = [ pkgconfig ];
-
-  LIVE555_PREFIX = live555;
-
-  preConfigure = ''
-    sed -e "s@/bin/echo@echo@g" -i configure
-  '' + optionalString withQt5 ''
-    # Make sure we only *add* "-std=c++11" to CXXFLAGS instead of overriding the
-    # values figured out by configure (for example "-g -O2").
-    sed -i -re '/^ *CXXFLAGS=("[^$"]+")? *$/s/CXXFLAGS="?/&-std=c++11 /' \
-      configure
-  '';
-
-  configureFlags =
-    [ "--enable-alsa"
-      "--with-kde-solid=$out/share/apps/solid/actions"
-      "--enable-dc1394"
-      "--enable-ncurses"
-      "--enable-vdpau"
-      "--enable-dvdnav"
-      "--enable-samplerate"
-    ];
+  nativeBuildInputs = [ autoreconfHook perl pkgconfig ];
 
   enableParallelBuilding = true;
 
-  preBuild = ''
-    substituteInPlace modules/text_renderer/freetype.c --replace \
-      /usr/share/fonts/truetype/freefont/FreeSerifBold.ttf \
-      ${freefont_ttf}/share/fonts/truetype/FreeSerifBold.ttf
+  LIVE555_PREFIX = live555;
+
+  # vlc depends on a c11-gcc wrapper script which we don't have so we need to
+  # set the path to the compiler
+  BUILDCC = "${stdenv.cc}/bin/gcc";
+
+  postPatch = ''
+    substituteInPlace configure \
+      --replace /bin/echo echo
+
+    substituteInPlace modules/text_renderer/freetype/platform_fonts.h --replace \
+      /usr/share/fonts/truetype/freefont ${freefont_ttf}/share/fonts/truetype
   '';
 
+  # https://github.com/NixOS/nixpkgs/pull/35124#issuecomment-370552830
+  postFixup = ''
+    find $out/lib/vlc/plugins -exec touch -d @1 '{}' ';'
+    $out/lib/vlc/vlc-cache-gen $out/vlc/plugins
+  '';
+
+  # Most of the libraries are auto-detected so we don't need to set a bunch of
+  # "--enable-foo" flags here
+  configureFlags = [
+    "--with-kde-solid=$out/share/apps/solid/actions"
+  ] ++ optional onlyLibVLC "--disable-vlc";
+
   meta = with stdenv.lib; {
     description = "Cross-platform media player and streaming server";
     homepage = http://www.videolan.org/vlc/;
-    platforms = platforms.linux;
     license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c81cc59d2b9..451239b54354 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11159,9 +11159,7 @@ with pkgs;
       withQt5 = true;
     };
 
-    phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {
-      withQt5 = true;
-    };
+    phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { };
 
     polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
 
@@ -11196,11 +11194,7 @@ with pkgs;
 
     telepathy = callPackage ../development/libraries/telepathy/qt { };
 
-    vlc = lowPrio (callPackage ../applications/video/vlc {
-      qt4 = null;
-      withQt5 = true;
-      ffmpeg = ffmpeg_2;
-    });
+    vlc = callPackage ../applications/video/vlc {};
 
     qtwebkit-plugins = callPackage ../development/libraries/qtwebkit-plugins { };
 
@@ -18188,16 +18182,13 @@ with pkgs;
 
   vkeybd = callPackage ../applications/audio/vkeybd {};
 
-  vlc = callPackage ../applications/video/vlc {
-    ffmpeg = ffmpeg_2;
-  };
+  vlc = libsForQt5.vlc;
+  vlc_qt5 = vlc;
 
   vlc_npapi = callPackage ../applications/video/vlc/plugin.nix {
     gtk = gtk2;
   };
 
-  vlc_qt5 = libsForQt5.vlc;
-
   vmpk = callPackage ../applications/audio/vmpk { };
 
   vnstat = callPackage ../applications/networking/vnstat { };

From 490e6fc9eb051b93482761ab667697972a259b34 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 16 Apr 2018 17:30:42 +0800
Subject: [PATCH 0936/3370] vlc_npapi: drop it as firefox no longer support
 NPAPI

---
 pkgs/applications/video/vlc/plugin.nix | 34 --------------------------
 pkgs/top-level/all-packages.nix        |  5 +---
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/applications/video/vlc/plugin.nix

diff --git a/pkgs/applications/video/vlc/plugin.nix b/pkgs/applications/video/vlc/plugin.nix
deleted file mode 100644
index 583d978a5514..000000000000
--- a/pkgs/applications/video/vlc/plugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, vlc, autoconf, automake, libtool, pkgconfig, npapi_sdk,
-libxcb, xlibsWrapper, gtk}:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "vlc-plugin-${version}";
-  version = "2.2.2"; # This 2.2.2 builds fine with vlc 2.2.4
-
-  src = fetchgit {
-    url = "https://code.videolan.org/videolan/npapi-vlc.git";
-    rev = "5fa6fbc11cf5bad983f57656c0085e47e18fbf20";
-    sha256 = "0k4s0657kv1mx1md8vj87scs0hz59xy7syqdsxb48w3w8gnfljs0";
-  };
-
-  preConfigure = "sh autogen.sh";
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ vlc autoconf automake libtool npapi_sdk libxcb
-      xlibsWrapper gtk ];
-
-  enableParallelBuilding = true;
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Webplugins based on libVLC (for firefox, npapi)";
-    homepage = https://code.videolan.org/videolan/npapi-vlc;
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 451239b54354..482f2e024844 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18183,11 +18183,8 @@ with pkgs;
   vkeybd = callPackage ../applications/audio/vkeybd {};
 
   vlc = libsForQt5.vlc;
-  vlc_qt5 = vlc;
 
-  vlc_npapi = callPackage ../applications/video/vlc/plugin.nix {
-    gtk = gtk2;
-  };
+  vlc_qt5 = vlc;
 
   vmpk = callPackage ../applications/audio/vmpk { };
 

From a3f5c424f7c863062a1020d00c46247c0550c677 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Mon, 16 Apr 2018 14:01:06 +0800
Subject: [PATCH 0937/3370] phonon-backend-vlc: 0.9.0 -> 0.10.1

---
 pkgs/development/libraries/phonon/backends/vlc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 53281ddc6578..643e36ba6cd6 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -7,7 +7,7 @@
 with lib;
 
 let
-  v = "0.9.0";
+  v = "0.10.1";
   pname = "phonon-backend-vlc";
 in
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
-    sha256 = "1gnd1j305mqajw5gxm42vg6ajkvi8611bxgc3qhj5k0saz5dgkn0";
+    sha256 = "0b87mzkw9fdkrwgnh1kw5i5wnrd05rl42hynlykb7cfymsk6v5h9";
   };
 
   buildInputs =

From 3107b4f0187d2470b836e89943b229b6c8cdb098 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Wed, 25 Apr 2018 22:44:51 +0800
Subject: [PATCH 0938/3370] firefox: remove vlc_npapi

---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 45917bf65c1e..d56ceff81842 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -7,7 +7,6 @@
 , trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
 , esteidfirefoxplugin
-, vlc_npapi
 , browserpass, chrome-gnome-shell
 , libudev
 , kerberos
@@ -57,7 +56,6 @@ let
           ++ lib.optional (cfg.enableBluejeans or false) bluejeans
           ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
           ++ lib.optional (cfg.enableEsteid or false) esteidfirefoxplugin
-          ++ lib.optional (cfg.enableVLC or false) vlc_npapi
           ++ extraPlugins
         );
       nativeMessagingHosts =

From f7a46b2a1dbd72fe0e8ee2822cda649f4f75b32b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 2 May 2018 12:45:18 +0200
Subject: [PATCH 0939/3370] nix-zsh-completions: 0.3.9 -> 0.4.0

Fix a nasty regression when completing eg. `-f`.
---
 pkgs/shells/zsh/nix-zsh-completions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix
index 8e15476451a8..3c4c3fabfd10 100644
--- a/pkgs/shells/zsh/nix-zsh-completions/default.nix
+++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub }:
 
 let
-  version = "0.3.9";
+  version = "0.4.0";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "spwhitt";
     repo = "nix-zsh-completions";
     rev = "${version}";
-    sha256 = "1ysc9g72yj63ygm915a316f1hcklmgswyrwsq5abwwj48001y01n";
+    sha256 = "0m8b9xgbz2nvk1q7m0gqy83gbqa49n062gymhk9x93zhbdh8vwky";
   };
 
   installPhase = ''

From 503f85251ccbff38c96aa13d6f6aee7f5d0fdd27 Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Mon, 13 Nov 2017 23:12:44 -0500
Subject: [PATCH 0940/3370] prometheus-surfboard-exporter: init at 2.0.0

---
 .../prometheus/surfboard-exporter.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/surfboard-exporter.nix

diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
new file mode 100644
index 000000000000..13e17d0b0192
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "surfboard_exporter-${version}";
+  version = "2.0.0";
+
+  goPackagePath = "github.com/ipstatic/surfboard_exporter";
+
+  src = fetchFromGitHub {
+    rev = version;
+    owner = "ipstatic";
+    repo = "surfboard_exporter";
+    sha256 = "11qms26648nwlwslnaflinxcr5rnp55s908rm1qpnbz0jnxf5ipw";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Arris Surfboard signal metrics exporter";
+    homepage = https://github.com/ipstatic/surfboard_exporter;
+    license = licenses.mit;
+    maintainers = with maintainers; [ disassembler ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a327c8cd5c3..f8af69b9eca1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12767,6 +12767,7 @@ with pkgs;
   prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { };
   prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { };
   prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-bridge.nix { };
+  prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { };
   prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { };
   prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { };
 

From 78f09c9102aca07e7f837fbc1ca8394b59bb741e Mon Sep 17 00:00:00 2001
From: Samuel Leathers <sam@appliedtrust.com>
Date: Mon, 13 Nov 2017 23:14:26 -0500
Subject: [PATCH 0941/3370] nixos/prometheus-surfboard-exporter: add new module

---
 .../monitoring/prometheus/exporters.nix       | 25 ++++++++-------
 .../prometheus/exporters/surfboard.nix        | 32 +++++++++++++++++++
 2 files changed, 45 insertions(+), 12 deletions(-)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 180b273d177e..780448d8bad8 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -18,18 +18,19 @@ let
   #  systemd service must be provided by specifying either
   #  `serviceOpts.script` or `serviceOpts.serviceConfig.ExecStart`
   exporterOpts = {
-    blackbox = import ./exporters/blackbox.nix { inherit config lib pkgs; };
-    collectd = import ./exporters/collectd.nix { inherit config lib pkgs; };
-    dovecot  = import ./exporters/dovecot.nix  { inherit config lib pkgs; };
-    fritzbox = import ./exporters/fritzbox.nix { inherit config lib pkgs; };
-    json     = import ./exporters/json.nix     { inherit config lib pkgs; };
-    minio    = import ./exporters/minio.nix    { inherit config lib pkgs; };
-    nginx    = import ./exporters/nginx.nix    { inherit config lib pkgs; };
-    node     = import ./exporters/node.nix     { inherit config lib pkgs; };
-    postfix  = import ./exporters/postfix.nix  { inherit config lib pkgs; };
-    snmp     = import ./exporters/snmp.nix     { inherit config lib pkgs; };
-    unifi    = import ./exporters/unifi.nix    { inherit config lib pkgs; };
-    varnish  = import ./exporters/varnish.nix  { inherit config lib pkgs; };
+    blackbox  = import ./exporters/blackbox.nix  { inherit config lib pkgs; };
+    collectd  = import ./exporters/collectd.nix  { inherit config lib pkgs; };
+    dovecot   = import ./exporters/dovecot.nix   { inherit config lib pkgs; };
+    fritzbox  = import ./exporters/fritzbox.nix  { inherit config lib pkgs; };
+    json      = import ./exporters/json.nix      { inherit config lib pkgs; };
+    minio     = import ./exporters/minio.nix     { inherit config lib pkgs; };
+    nginx     = import ./exporters/nginx.nix     { inherit config lib pkgs; };
+    node      = import ./exporters/node.nix      { inherit config lib pkgs; };
+    postfix   = import ./exporters/postfix.nix   { inherit config lib pkgs; };
+    snmp      = import ./exporters/snmp.nix      { inherit config lib pkgs; };
+    surfboard = import ./exporters/surfboard.nix { inherit config lib pkgs; };
+    unifi     = import ./exporters/unifi.nix     { inherit config lib pkgs; };
+    varnish   = import ./exporters/varnish.nix   { inherit config lib pkgs; };
   };
 
   mkExporterOpts = ({ name, port }: {
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix
new file mode 100644
index 000000000000..715dba06a3dc
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/surfboard.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.surfboard;
+in
+{
+  port = 9239;
+  extraOpts = {
+    modemAddress = mkOption {
+      type = types.str;
+      default = "192.168.100.1";
+      description = ''
+        The hostname or IP of the cable modem.
+      '';
+    };
+  };
+  serviceOpts = {
+    description = "Prometheus exporter for surfboard cable modem";
+    unitConfig.Documentation = "https://github.com/ipstatic/surfboard_exporter";
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-surfboard-exporter}/bin/surfboard_exporter \
+          --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          --modem-address ${cfg.modemAddress} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}

From c64676af19909b364720213b6543400c074d25cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 2 May 2018 14:12:11 +0200
Subject: [PATCH 0942/3370] Revert "keyring: disable testing"

This reverts commit b6567229a2a43e20ff2de0189382e20135b53dd6.
---
 pkgs/development/python-modules/keyring/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index ce5bb315581d..2029eabba026 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -17,9 +17,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ entrypoints ] ++ stdenv.lib.optional stdenv.isLinux secretstorage;
 
-  # all tests with flake8 are broken right now
-  # https://github.com/tholo/pytest-flake8/issues/45
-  doCheck = false;
+  doCheck = !stdenv.isDarwin;
 
   checkPhase = ''
     py.test

From cb9f4f1ae3c98b3628457877365b5751b3865c78 Mon Sep 17 00:00:00 2001
From: Issam Maghni <concatime@users.noreply.github.com>
Date: Sun, 29 Apr 2018 20:34:26 -0400
Subject: [PATCH 0943/3370] pythonPackages.neovim: 0.2.4 -> 0.2.6, gem-neovim &
 gem-msgpack

---
 .../editors/neovim/ruby_provider/Gemfile.lock             | 4 ++--
 pkgs/applications/editors/neovim/ruby_provider/gemset.nix | 8 ++++----
 pkgs/development/python-modules/neovim/default.nix        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
index 87b011c4f8b4..a95ced76371d 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
+++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock
@@ -1,9 +1,9 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    msgpack (1.2.2)
+    msgpack (1.2.4)
     multi_json (1.13.1)
-    neovim (0.6.2)
+    neovim (0.7.0)
       msgpack (~> 1.0)
       multi_json (~> 1.0)
 
diff --git a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
index aefecbf5ba83..af887161ea6c 100644
--- a/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
+++ b/pkgs/applications/editors/neovim/ruby_provider/gemset.nix
@@ -2,10 +2,10 @@
   msgpack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1ai0sfdv9jnr333fsvkn7a8vqvn0iwiw83yj603a3i68ds1x6di1";
+      sha256 = "09xy1wc4wfbd1jdrzgxwmqjzfdfxbz0cqdszq2gv6rmc3gv1c864";
       type = "gem";
     };
-    version = "1.2.2";
+    version = "1.2.4";
   };
   multi_json = {
     source = {
@@ -19,9 +19,9 @@
     dependencies = ["msgpack" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "15r3j9bwlpm1ry7cp6059xb0irvsvvlmw53i28z6sf2khwfj5j53";
+      sha256 = "0b487dzz41im8cwzvfjqgf8kkrp6mpkvcbzhazrmqqw8gxyvfbq4";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.7.0";
   };
 }
diff --git a/pkgs/development/python-modules/neovim/default.nix b/pkgs/development/python-modules/neovim/default.nix
index 646a8e7bb112..6d96732cbb07 100644
--- a/pkgs/development/python-modules/neovim/default.nix
+++ b/pkgs/development/python-modules/neovim/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "neovim";
-  version = "0.2.4";
+  version = "0.2.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0accfgyvihs08bwapgakx6w93p4vbrq2448n2z6gw88m2hja9jm3";
+    sha256 = "0xlj54w9bnmq4vidk6r08hwa6az7drahi08w1qf4j9q45rs8mrbc";
   };
 
   checkInputs = [ nose ];

From daef0358cbcf5327d965048fe8851e48d9bc2e15 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 May 2018 06:00:28 -0700
Subject: [PATCH 0944/3370] abcmidi: 2018.04.18 -> 2018.04.24 (#39796)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/abcMIDI/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/abc2midi -h’ got 0 exit code
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/midi2abc -h’ got 0 exit code
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/midi2abc --help’ got 0 exit code
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/abc2abc -h’ got 0 exit code
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/mftext -h’ got 0 exit code
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/mftext --help’ got 0 exit code
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/mftext help’ got 0 exit code
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/yaps -h’ got 0 exit code
- ran ‘/nix/store/s7dh3851ix5avzik864jz5abrswrmf8z-abcMIDI-2018.04.24/bin/abcmatch -h’ got 0 exit code
- directory tree listing: https://gist.github.com/d75d63bae2db4467af91a891a9a1b597
---
 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 dc5a010ec741..ff6a7af03efe 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2018.04.18";
+  version = "2018.04.24";
 
   src = fetchzip {
     url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "0kbval5ckan8vvrlpyz1mkb1ifvr149gxpb7ljbcm890p8hpaxff";
+    sha256 = "02n5xnagj1z44b23zmaxdkmn8nisrb34r8hb5xs7cr1wq7m4fmlh";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

From 9b99738c84dfc5a66ec4e9aee1a30afc580a3cb8 Mon Sep 17 00:00:00 2001
From: goibhniu <cillian.deroiste@gmail.com>
Date: Wed, 2 May 2018 15:03:39 +0200
Subject: [PATCH 0945/3370] tbs: override the kernel dvb-core.ko and
 videodev.ko

Otherwise the kernel versions of dvb-core.ko and videodev.ko get
loaded instead of the versions from this package.
---
 pkgs/os-specific/linux/tbs/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix
index db20a7ab8211..291666c0b450 100644
--- a/pkgs/os-specific/linux/tbs/default.nix
+++ b/pkgs/os-specific/linux/tbs/default.nix
@@ -43,16 +43,21 @@ in stdenv.mkDerivation {
   buildFlags = [ "VER=${kernel.modDirVersion}" ];
   installFlags = [ "DESTDIR=$(out)" ];
 
-  hardeningDisable = [ "pic" "format" ];
+  hardeningDisable = [ "all" ];
 
   nativeBuildInputs = [ patchutils kmod perl perlPackages.ProcProcessTable ]
-  ++ lib.optional (lib.versionAtLeast kernel.version "4.14") [ libelf ];
+  ++ kernel.moduleBuildDependencies;
+
+   postInstall = ''
+    xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/media/dvb-core/dvb-core.ko
+    xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/media/v4l2-core/videodev.ko
+  '';
 
   meta = with lib; {
     homepage = https://www.tbsdtv.com/;
     description = "Linux driver for TBSDTV cards";
     license = licenses.gpl2;
     maintainers = with maintainers; [ ck3d ];
-    priority = 20;
+    priority = -1;
   };
 }

From 11a244afdb68b01724a6238d84c9ed3ca701a54c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 2 May 2018 15:09:39 +0200
Subject: [PATCH 0946/3370] vulnix: drop obsolete patch

---
 pkgs/tools/security/vulnix/default.nix        | 11 +++------
 .../security/vulnix/disable-flake8.patch      | 23 -------------------
 2 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/tools/security/vulnix/disable-flake8.patch

diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index b28fa7cfd475..dbb42c2bef42 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -9,9 +9,9 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0j6v6phq3naqnpvzxxnynsyv9y7bhig1gzvg594qpknqgyzj16bf";
   };
 
-  buildInputs =
-    [ ronn ] ++
-    (with pythonPackages; [ freezegun pytest pytestcov ]);
+  buildInputs = [ ronn ];
+
+  checkInputs = with pythonPackages; [ freezegun pytest pytestcov pytest-flake8 ];
 
   propagatedBuildInputs = [
     nix
@@ -27,11 +27,6 @@ pythonPackages.buildPythonApplication rec {
 
   outputs = [ "out" "doc" ];
 
-  # pytest-flake8 is currently broken
-  # re-enable after it has been fixed
-  # https://github.com/NixOS/nixpkgs/issues/39206
-  patches = [ ./disable-flake8.patch ];
-
   postBuild = ''
     make -C doc
   '';
diff --git a/pkgs/tools/security/vulnix/disable-flake8.patch b/pkgs/tools/security/vulnix/disable-flake8.patch
deleted file mode 100644
index cd165d05ccc1..000000000000
--- a/pkgs/tools/security/vulnix/disable-flake8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index a9e37ce..41b9886 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,5 +1,5 @@
- [tool:pytest]
--addopts = --flake8 --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix
-+addopts = --tb=native --cov=src --cov-report=html --junitxml=report.xml -m 'not jenkinsonly' src/vulnix
- markers = slow: This is a non-unit test and thus is not run by default. Use ``-m slow`` to run these, or ``-m 1`` to run all tests.
- 
- [aliases]
-diff --git a/setup.py b/setup.py
-index a9315e5..d14ad59 100644
---- a/setup.py
-+++ b/setup.py
-@@ -35,7 +35,6 @@ setup(
-             'freezegun>0.3',
-             'pytest>=3.2',
-             'pytest-cov>=2.5',
--            'pytest-flake8',
-             'pytest-runner>=2.11,<3dev',
-             'pytest-timeout>=1.2',
-             'setuptools_scm>=1.15',

From ae7c71e26706c0fa6653831456468447b417b868 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Wed, 2 May 2018 15:55:04 +0200
Subject: [PATCH 0947/3370] home-assistant: 0.68.0 -> 0.68.1 (#39855)

---
 pkgs/servers/home-assistant/component-packages.nix | 3 +--
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c2f06cd6a8e3..3e95b41fb7e8 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.68.0";
+  version = "0.68.1";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -299,7 +299,6 @@
     "sensor.dsmr" = ps: with ps; [  ];
     "sensor.dweet" = ps: with ps; [  ];
     "sensor.eddystone_temperature" = ps: with ps; [ construct ];
-    "sensor.eliqonline" = ps: with ps; [  ];
     "sensor.envirophat" = ps: with ps; [  ];
     "sensor.etherscan" = ps: with ps; [  ];
     "sensor.fastdotcom" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 0751ffb3c9ed..a8091c70dfdf 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -58,7 +58,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.68.0";
+  hassVersion = "0.68.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -73,7 +73,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "037gc2sghg5n0li087vvjcf6657rd31wv0m5r23b2cdfds8lxk4w";
+    sha256 = "103py7hfdanr8zk3cl93rm7ngjz0n95kwjbphq7iy8l8hqpzs1m8";
   };
 
   propagatedBuildInputs = [

From 42170173402e3d73494a5b3ea92b3ce46d1b1a93 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Mon, 30 Apr 2018 16:32:14 +0000
Subject: [PATCH 0948/3370] facette: init at 0.4.0

---
 pkgs/servers/monitoring/facette/default.nix | 30 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/servers/monitoring/facette/default.nix

diff --git a/pkgs/servers/monitoring/facette/default.nix b/pkgs/servers/monitoring/facette/default.nix
new file mode 100644
index 000000000000..3858720bed5c
--- /dev/null
+++ b/pkgs/servers/monitoring/facette/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub
+, go, pkgconfig, nodejs, nodePackages, pandoc, rrdtool }:
+
+stdenv.mkDerivation rec {
+  name = "facette-${version}";
+  version = "0.4.0";
+  src = fetchFromGitHub {
+    owner = "facette";
+    repo = "facette";
+    rev = "${version}";
+    sha256 = "1m7krq439qlf7b4l4bfjw0xfvjgj67w59mh8rf7c398rky04p257";
+  };
+  nativeBuildInputs = [ go pkgconfig nodejs nodePackages.npm pandoc ];
+  buildInputs = [ rrdtool ];
+  preBuild = ''
+    export HOME="$NIX_BUILD_ROOT" # npm needs a writable home
+  '';
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Time series data visualization software";
+    longDescription = ''
+      Facette is a web application to display time series data from various
+      sources — such as collectd, Graphite, InfluxDB or KairosDB — on graphs.
+    '';
+    homepage = https://facette.io/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719a5c66db7f..3e6712a1f1c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12375,6 +12375,8 @@ with pkgs;
 
   exim = callPackage ../servers/mail/exim { };
 
+  facette = callPackage ../servers/monitoring/facette { };
+
   fcgiwrap = callPackage ../servers/fcgiwrap { };
 
   felix = callPackage ../servers/felix { };

From 27eb2859f270c55d06d2f5a256351576b20b5ec6 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 2 May 2018 16:03:08 +0200
Subject: [PATCH 0949/3370] prometheus-nginx-exporter: fix bool to string
 coercion

---
 .../modules/services/monitoring/prometheus/exporters/nginx.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
index 39054c2b73dd..431dd8b4ead7 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/nginx.nix
@@ -39,7 +39,7 @@ in
           --nginx.scrape_uri '${cfg.scrapeUri}' \
           --telemetry.address ${cfg.listenAddress}:${toString cfg.port} \
           --telemetry.endpoint ${cfg.telemetryEndpoint} \
-          --insecure ${cfg.insecure} \
+          --insecure ${toString cfg.insecure} \
           ${concatStringsSep " \\\n  " cfg.extraFlags}
       '';
     };

From 6846c45eed8fa48e5df175a1253cdd167e446834 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 2 May 2018 17:29:18 +0300
Subject: [PATCH 0950/3370] cjdns: 20.1 -> 20.2

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

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 817da08c05e3..60fd42962fb7 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
 
-let version = "20.1"; in
+let version = "20.2"; in
 stdenv.mkDerivation {
   name = "cjdns-"+version;
 
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     owner = "cjdelisle";
     repo = "cjdns";
     rev = "cjdns-v${version}";
-    sha256 = "033q8av46y0q8vxyqvb4yjh1lz6a17mmk8lhdpwdcqnsws8xjjsw";
+    sha256 = "13zhcfwx8c3vdcf6ifivrgf8q7mgx00vnxcspdz88zk7dh65c6jn";
   };
 
   buildInputs = [ which python27 nodejs ] ++

From f5e2cfc779975fd994f8034d8a6dc2ed68dea486 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 2 May 2018 16:30:07 +0200
Subject: [PATCH 0951/3370] Revert "libsForQt5.qscintilla: 2.9.4 -> 2.10.3"

This reverts commit 8ee6a03a3e75c6aaf4d7cf53bd6ffc6892d89950.
---
 pkgs/development/libraries/qscintilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 281dbe0a5eda..f442e1bf908e 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -10,13 +10,13 @@ let xcodePatch =
 in
 stdenv.mkDerivation rec {
   pname = "qscintilla";
-  version = "2.10.3";
+  version = "2.9.4";
 
   name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip";
-    sha256 = "0rsx0b0iz5yf3x594kzhi0c2wpbmknv9b0a3rmx5w37bvmpd6qav";
+    sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
   };
 
   buildInputs = [ (if withQt5 then qtbase else qt4) ]

From be153f6323599a0128d384471c42e1f10d0a1f00 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 2 May 2018 16:34:24 +0200
Subject: [PATCH 0952/3370] libsForQt5.qscintilla: don't apply darwin patch on
 non-darwin systems

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

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index f442e1bf908e..bc3b44413054 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
 
 
-  patches = [] ++ lib.optional withQt5 [ xcodePatch ];
+  patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];
 
   enableParallelBuilding = true;
 

From 14167763cd8407ab1fe104f0452df59271a373ae Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 2 May 2018 12:19:35 -0400
Subject: [PATCH 0953/3370] linux: 4.4.130 -> 4.4.131

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index ccc8b4ba2dc2..725f3385a80c 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.130";
+  version = "4.4.131";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1rad8fa25hzifpxqxsc7wzhcssbbv32rc03nvljygvlxcn8dz6xj";
+    sha256 = "02f7sx20l0ljkgffac0yqav1kk7x1gl6026icslcsnn46pfpl4k5";
   };
 } // (args.argsOverride or {}))

From c25aeeddb2f0a8ee06dab42f7c85f1c65986dcb3 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 2 May 2018 12:19:57 -0400
Subject: [PATCH 0954/3370] linux: 4.9.97 -> 4.9.98

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index cc4609676d4e..37520576c7d0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.97";
+  version = "4.9.98";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4";
+    sha256 = "1gdpq4w6srz2fpyi8bqpgz0p5wm3mrk7ir967c6f2285mdvcb7r6";
   };
 } // (args.argsOverride or {}))

From d9c575be8227b0d9e444575a189a82e21d427ce8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 2 May 2018 12:20:13 -0400
Subject: [PATCH 0955/3370] linux: 4.14.38 -> 4.14.39

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 177a5c878f65..f798a3a85e59 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.38";
+  version = "4.14.39";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00ibrl633d4cqnn4i0z7kj1ddj1243dh7ap783bwlicw9hkddwzg";
+    sha256 = "1gdpq4w6srz2fpyi8bqpgz0p5wm3mrk7ir967c6f2285mdvcb7r6";
   };
 } // (args.argsOverride or {}))

From d6d9d75942c6314b4d88036bd3b3a64c011a3259 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 2 May 2018 12:20:28 -0400
Subject: [PATCH 0956/3370] linux: 4.16.6 -> 4.16.7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 46bdcff66a10..acafd0bd89f7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.6";
+  version = "4.16.7";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0jwa2r3gpn4ahy38730b7g4xzavfqwxxwgyfhpn5ssvzsc4934gs";
+    sha256 = "0f81mxc5b3zf5m29bwc3afv07k60661zl18098cjjqv6qpvbwynq";
   };
 } // (args.argsOverride or {}))

From 4e3030bbf16388177d9c062094c6f66fd4e55cad Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 2 May 2018 12:24:21 -0400
Subject: [PATCH 0957/3370] Revert "linux: 4.9.97 -> 4.9.98"

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 37520576c7d0..cc4609676d4e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.98";
+  version = "4.9.97";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1gdpq4w6srz2fpyi8bqpgz0p5wm3mrk7ir967c6f2285mdvcb7r6";
+    sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4";
   };
 } // (args.argsOverride or {}))

From 89e995d215172f3d1dccbb7eb13c2a5703ad1840 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 2 May 2018 12:24:46 -0400
Subject: [PATCH 0958/3370] linux: 4.9.97 -> 4.9.98

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index cc4609676d4e..b09a58c6eb79 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.97";
+  version = "4.9.98";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "08vg8lm03s04cpyicq1jj342c25x3039nnxvcvwr80j18w4biwf4";
+    sha256 = "1vqh33wdiqf3j4xfakxndhb8x6yr5ppwv9asx7kldjfvb8sr1k8j";
   };
 } // (args.argsOverride or {}))

From 659363fb401a9916f8aa92f297f96c0584432dc7 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 18:32:50 +0200
Subject: [PATCH 0959/3370] gcc8: init at 8.1.0

---
 pkgs/development/compilers/gcc/8/default.nix  | 525 ++++++++++++++++++
 .../compilers/gcc/8/riscv-no-relax.patch      | 109 ++++
 .../gcc/8/riscv-pthread-reentrant.patch       |  13 +
 3 files changed, 647 insertions(+)
 create mode 100644 pkgs/development/compilers/gcc/8/default.nix
 create mode 100644 pkgs/development/compilers/gcc/8/riscv-no-relax.patch
 create mode 100644 pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
new file mode 100644
index 000000000000..d5e15287db02
--- /dev/null
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -0,0 +1,525 @@
+{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs
+, langC ? true, langCC ? true, langFortran ? false
+, langObjC ? targetPlatform.isDarwin
+, langObjCpp ? targetPlatform.isDarwin
+, langJava ? false
+, langGo ? false
+, profiledCompiler ? false
+, staticCompiler ? false
+, enableShared ? true
+, texinfo ? null
+, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, gmp, mpfr, libmpc, gettext, which
+, libelf                      # optional, for link-time optimizations (LTO)
+, isl ? null # optional, for the Graphite optimization framework.
+, zlib ? null, boehmgc ? null
+, zip ? null, unzip ? null, pkgconfig ? null
+, gtk2 ? null, libart_lgpl ? null
+, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
+, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
+, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
+, x11Support ? langJava
+, enableMultilib ? false
+, enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
+, name ? "gcc"
+, libcCross ? null
+, crossStageStatic ? false
+, libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
+, stripped ? true
+, gnused ? null
+, cloog # unused; just for compat with gcc4, as we override the parameter on some places
+, darwin ? null
+, buildPlatform, hostPlatform, targetPlatform
+, buildPackages
+}:
+
+assert langJava     -> zip != null && unzip != null
+                       && zlib != null && boehmgc != null
+                       && perl != null;  # for `--enable-java-home'
+
+# LTO needs libelf and zlib.
+assert libelf != null -> zlib != null;
+
+# Make sure we get GNU sed.
+assert hostPlatform.isDarwin -> gnused != null;
+
+# The go frontend is written in c++
+assert langGo -> langCC;
+
+with stdenv.lib;
+with builtins;
+
+let version = "8.1.0";
+
+    # Whether building a cross-compiler for GNU/Hurd.
+    crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
+
+    enableParallelBuilding = true;
+
+    patches =
+      [ # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html
+        /* ./riscv-pthread-reentrant.patch */ # TODO: is this needed?
+        # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html
+        /* ./riscv-no-relax.patch */
+      ]
+      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
+      ++ optional noSysDirs ../no-sys-dirs.patch
+      /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
+        url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
+        sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
+      }) */
+      ++ optional langFortran ../gfortran-driving.patch;
+
+    javaEcj = fetchurl {
+      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
+      # `configure' time.
+
+      # XXX: Eventually we might want to take it from upstream.
+      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
+      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
+    };
+
+    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
+    # binary distribution here to allow the whole chain to be bootstrapped.
+    javaAntlr = fetchurl {
+      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
+      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
+    };
+
+    xlibs = [
+      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
+      xproto renderproto xextproto inputproto randrproto
+    ];
+
+    javaAwtGtk = langJava && x11Support;
+
+    /* Platform flags */
+    platformFlags = let
+        gccArch = targetPlatform.platform.gcc.arch or null;
+        gccCpu = targetPlatform.platform.gcc.cpu or null;
+        gccAbi = targetPlatform.platform.gcc.abi or null;
+        gccFpu = targetPlatform.platform.gcc.fpu or null;
+        gccFloat = targetPlatform.platform.gcc.float or null;
+        gccMode = targetPlatform.platform.gcc.mode or null;
+      in
+        optional (gccArch != null) "--with-arch=${gccArch}" ++
+        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
+        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
+        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
+        optional (gccFloat != null) "--with-float=${gccFloat}" ++
+        optional (gccMode != null) "--with-mode=${gccMode}";
+
+    /* Cross-gcc settings (build == host != target) */
+    crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
+    crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
+    crossConfigureFlags =
+      # Ensure that -print-prog-name is able to find the correct programs.
+      [ "--with-as=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-as"
+        "--with-ld=${targetPackages.stdenv.cc.bintools}/bin/${targetPlatform.config}-ld" ] ++
+      (if crossMingw && crossStageStatic then [
+        "--with-headers=${libcCross}/include"
+        "--with-gcc"
+        "--with-gnu-as"
+        "--with-gnu-ld"
+        "--with-gnu-ld"
+        "--disable-shared"
+        "--disable-nls"
+        "--disable-debug"
+        "--enable-sjlj-exceptions"
+        "--enable-threads=win32"
+        "--disable-win32-registry"
+      ] else if crossStageStatic then [
+        "--disable-libssp"
+        "--disable-nls"
+        "--without-headers"
+        "--disable-threads"
+        "--disable-libgomp"
+        "--disable-libquadmath"
+        "--disable-shared"
+        "--disable-libatomic"  # libatomic requires libc
+        "--disable-decimal-float" # libdecnumber requires libc
+        # maybe only needed on musl, PATH_MAX
+        # https://github.com/richfelker/musl-cross-make/blob/0867cdf300618d1e3e87a0a939fa4427207ad9d7/litecross/Makefile#L62
+        "--disable-libmpx"
+      ] else [
+        (if crossDarwin then "--with-sysroot=${getLib libcCross}/share/sysroot"
+         else                "--with-headers=${getDev libcCross}/include")
+        "--enable-__cxa_atexit"
+        "--enable-long-long"
+      ] ++
+        (if crossMingw then [
+          "--enable-threads=win32"
+          "--enable-sjlj-exceptions"
+          "--enable-hash-synchronization"
+          "--enable-libssp"
+          "--disable-nls"
+          "--with-dwarf2"
+          # To keep ABI compatibility with upstream mingw-w64
+          "--enable-fully-dynamic-string"
+        ] else
+          optionals (targetPlatform.libc == "uclibc" || targetPlatform.libc == "musl") [
+            # libsanitizer requires netrom/netrom.h which is not
+            # available in uclibc.
+            "--disable-libsanitizer"
+            # In uclibc cases, libgomp needs an additional '-ldl'
+            # and as I don't know how to pass it, I disable libgomp.
+            "--disable-libgomp"
+            # musl at least, disable: https://git.buildroot.net/buildroot/commit/?id=873d4019f7fb00f6a80592224236b3ba7d657865
+            "--disable-libmpx"
+          ] ++ [
+          "--enable-threads=posix"
+          "--enable-nls"
+          "--disable-decimal-float" # No final libdecnumber (it may work only in 386)
+        ]));
+    stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
+    crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
+
+    bootstrap = targetPlatform == hostPlatform;
+
+in
+
+# We need all these X libraries when building AWT with GTK+.
+assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
+
+stdenv.mkDerivation ({
+  name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
+
+  builder = ../builder.sh;
+
+  src = fetchurl {
+    url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
+    /* sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; */
+    sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
+  };
+
+  inherit patches;
+
+  outputs = [ "out" "lib" "man" "info" ];
+  setOutputFlags = false;
+  NIX_NO_SELF_RPATH = true;
+
+  libc_dev = stdenv.cc.libc_dev;
+
+  hardeningDisable = [ "format" ];
+
+  # This should kill all the stdinc frameworks that gcc and friends like to
+  # insert into default search paths.
+  prePatch = stdenv.lib.optionalString hostPlatform.isDarwin ''
+    substituteInPlace gcc/config/darwin-c.c \
+      --replace 'if (stdinc)' 'if (0)'
+
+    substituteInPlace libgcc/config/t-slibgcc-darwin \
+      --replace "-install_name @shlib_slibdir@/\$(SHLIB_INSTALL_NAME)" "-install_name $lib/lib/\$(SHLIB_INSTALL_NAME)"
+
+    substituteInPlace libgfortran/configure \
+      --replace "-install_name \\\$rpath/\\\$soname" "-install_name $lib/lib/\\\$soname"
+  '';
+
+  postPatch = ''
+    configureScripts=$(find . -name configure)
+    for configureScript in $configureScripts; do
+      patchShebangs $configureScript
+    done
+  '' + (
+    if (hostPlatform.isHurd
+        || (libcCross != null                  # e.g., building `gcc.crossDrv'
+            && libcCross ? crossConfig
+            && libcCross.crossConfig == "i586-pc-gnu")
+        || (crossGNU && libcCross != null))
+    then
+      # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
+      # in glibc, so add the right `-I' flags to the default spec string.
+      assert libcCross != null -> libpthreadCross != null;
+      let
+        libc = if libcCross != null then libcCross else stdenv.glibc;
+        gnu_h = "gcc/config/gnu.h";
+        extraCPPDeps =
+             libc.propagatedBuildInputs
+          ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross
+          ++ stdenv.lib.optional (libpthread != null) libpthread;
+        extraCPPSpec =
+          concatStrings (intersperse " "
+                          (map (x: "-I${x.dev or x}/include") extraCPPDeps));
+        extraLibSpec =
+          if libpthreadCross != null
+          then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}"
+          else "-L${libpthread}/lib";
+      in
+        '' echo "augmenting \`CPP_SPEC' in \`${gnu_h}' with \`${extraCPPSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g'
+
+           echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..."
+           sed -i "${gnu_h}" \
+               -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g'
+
+           echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..."
+           sed -i "${gnu_h}" \
+               -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g'
+        ''
+    else if targetPlatform != hostPlatform || stdenv.cc.libc != null then
+      # On NixOS, use the right path to the dynamic linker instead of
+      # `/lib/ld*.so'.
+      let
+        libc = if libcCross != null then libcCross else stdenv.cc.libc;
+      in
+        (
+        '' echo "fixing the \`GLIBC_DYNAMIC_LINKER', \`UCLIBC_DYNAMIC_LINKER', and \`MUSL_DYNAMIC_LINKER' macros..."
+           for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
+           do
+             grep -q _DYNAMIC_LINKER "$header" || continue
+             echo "  fixing \`$header'..."
+             sed -i "$header" \
+                 -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' \
+                 -e 's|define[[:blank:]]*MUSL_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define MUSL_DYNAMIC_LINKER\1 "${libc.out}\2"|g'
+           done
+        ''
+        + stdenv.lib.optionalString (targetPlatform.libc == "musl")
+        ''
+            sed -i gcc/config/linux.h -e '1i#undef LOCAL_INCLUDE_DIR'
+        ''
+        )
+    else "");
+
+  # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
+  crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
+  inherit noSysDirs staticCompiler langJava
+    libcCross crossMingw;
+
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ texinfo which gettext ]
+    ++ (optional (perl != null) perl)
+    ++ (optional javaAwtGtk pkgconfig);
+
+  # For building runtime libs
+  depsBuildTarget =
+    if hostPlatform == buildPlatform then [
+      targetPackages.stdenv.cc.bintools # newly-built gcc will be used
+    ] else assert targetPlatform == hostPlatform; [ # build != host == target
+      stdenv.cc
+    ];
+
+  buildInputs = [
+    gmp mpfr libmpc libelf
+    targetPackages.stdenv.cc.bintools # For linking code at run-time
+  ] ++ (optional (isl != null) isl)
+    ++ (optional (zlib != null) zlib)
+    ++ (optionals langJava [ boehmgc zip unzip ])
+    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
+    ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
+
+    # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
+    # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it.
+    ++ (optional hostPlatform.isDarwin gnused)
+    ++ (optional hostPlatform.isDarwin targetPackages.stdenv.cc.bintools)
+    ;
+
+  NIX_LDFLAGS = stdenv.lib.optionalString  hostPlatform.isSunOS "-lm -ldl";
+
+  preConfigure = stdenv.lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) ''
+    export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g`
+    export LDFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $LDFLAGS_FOR_TARGET"
+    export CXXFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CXXFLAGS_FOR_TARGET"
+    export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET"
+  '';
+
+  dontDisableStatic = true;
+
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
+  configureFlags =
+    # Basic dependencies
+    [
+      "--with-gmp-include=${gmp.dev}/include"
+      "--with-gmp-lib=${gmp.out}/lib"
+      "--with-mpfr-include=${mpfr.dev}/include"
+      "--with-mpfr-lib=${mpfr.out}/lib"
+      "--with-mpc=${libmpc}"
+    ] ++
+    optional (libelf != null) "--with-libelf=${libelf}" ++
+    optional (!(crossMingw && crossStageStatic))
+      "--with-native-system-header-dir=${getDev stdenv.cc.libc}/include" ++
+
+    # Basic configuration
+    [
+      "--enable-lto"
+      "--disable-libstdcxx-pch"
+      "--without-included-gettext"
+      "--with-system-zlib"
+      "--enable-static"
+      "--enable-languages=${
+        concatStrings (intersperse ","
+          (  optional langC        "c"
+          ++ optional langCC       "c++"
+          ++ optional langFortran  "fortran"
+          ++ optional langJava     "java"
+          ++ optional langGo       "go"
+          ++ optional langObjC     "objc"
+          ++ optional langObjCpp   "obj-c++"
+          ++ optionals crossDarwin [ "objc" "obj-c++" ]
+          )
+        )
+      }"
+    ] ++
+
+    (if enableMultilib
+      then ["--enable-multilib" "--disable-libquadmath"]
+      else ["--disable-multilib"]) ++
+    optional (!enableShared) "--disable-shared" ++
+    (if enablePlugin
+      then ["--enable-plugin"]
+      else ["--disable-plugin"]) ++
+
+    # Optional features
+    optional (isl != null) "--with-isl=${isl}" ++
+
+    # Java options
+    optionals langJava [
+      "--with-ecj-jar=${javaEcj}"
+
+      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
+      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
+      "--enable-java-home"
+      "--with-java-home=\${prefix}/lib/jvm/jre"
+    ] ++
+    optional javaAwtGtk "--enable-java-awt=gtk" ++
+    optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
+
+
+    platformFlags ++
+    optional (targetPlatform != hostPlatform) crossConfigureFlags ++
+    optional (!bootstrap) "--disable-bootstrap" ++
+
+    # Platform-specific flags
+    optional (targetPlatform == hostPlatform && targetPlatform.isi686) "--with-arch=i686" ++
+    optionals hostPlatform.isSunOS [
+      "--enable-long-long" "--enable-libssp" "--enable-threads=posix" "--disable-nls" "--enable-__cxa_atexit"
+      # On Illumos/Solaris GNU as is preferred
+      "--with-gnu-as" "--without-gnu-ld"
+    ]
+    ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+  ;
+
+  targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
+
+  buildFlags =
+    optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+  installTargets =
+    if stripped
+    then "install-strip"
+    else "install";
+
+  /* For cross-built gcc (build != host == target) */
+  crossAttrs = {
+    dontStrip = true;
+    buildFlags = "";
+  };
+
+  # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
+  ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
+
+  # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
+  # library headers and binaries, regarless of the language being compiled.
+  #
+  # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
+  # `--with-gmp' et al., e.g., when building
+  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
+  # them to $CPATH and $LIBRARY_PATH in this case.
+  #
+  # Likewise, the LTO code doesn't find zlib.
+  #
+  # Cross-compiling, we need gcc not to read ./specs in order to build the g++
+  # compiler (after the specs for the cross-gcc are created). Having
+  # LIBRARY_PATH= makes gcc read the specs from ., and the build breaks.
+
+  CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
+    ++ optional (zlib != null) zlib
+    ++ optional langJava boehmgc
+    ++ optionals javaAwtGtk xlibs
+    ++ optionals javaAwtGtk [ gmp mpfr ]
+    ++ optional (libpthread != null) libpthread
+    ++ optional (libpthreadCross != null) libpthreadCross
+
+    # On GNU/Hurd glibc refers to Mach & Hurd
+    # headers.
+    ++ optionals (libcCross != null && libcCross ? propagatedBuildInputs)
+                 libcCross.propagatedBuildInputs
+  ));
+
+  LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([]
+    ++ optional (zlib != null) zlib
+    ++ optional langJava boehmgc
+    ++ optionals javaAwtGtk xlibs
+    ++ optionals javaAwtGtk [ gmp mpfr ]
+    ++ optional (libpthread != null) libpthread)
+  );
+
+  EXTRA_TARGET_FLAGS = optionals
+    (targetPlatform != hostPlatform && libcCross != null)
+    ([
+      "-idirafter ${getDev libcCross}/include"
+    ] ++ optionals (! crossStageStatic) [
+      "-B${libcCross.out}/lib"
+    ]);
+
+  EXTRA_TARGET_LDFLAGS = optionals
+    (targetPlatform != hostPlatform && libcCross != null)
+    ([
+      "-Wl,-L${libcCross.out}/lib"
+    ] ++ (if crossStageStatic then [
+        "-B${libcCross.out}/lib"
+      ] else [
+        "-Wl,-rpath,${libcCross.out}/lib"
+        "-Wl,-rpath-link,${libcCross.out}/lib"
+    ]) ++ optionals (libpthreadCross != null) [
+      "-L${libpthreadCross}/lib"
+      "-Wl,${libpthreadCross.TARGET_LDFLAGS}"
+    ]);
+
+  passthru =
+    { inherit langC langCC langObjC langObjCpp langFortran langGo version; isGNU = true; };
+
+  inherit enableParallelBuilding enableMultilib;
+
+  inherit (stdenv) is64bit;
+
+  meta = {
+    homepage = http://gcc.gnu.org/;
+    license = stdenv.lib.licenses.gpl3Plus;  # runtime support libraries are typically LGPLv3+
+    description = "GNU Compiler Collection, version ${version}"
+      + (if stripped then "" else " (with debugging info)");
+
+    longDescription = ''
+      The GNU Compiler Collection includes compiler front ends for C, C++,
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
+      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+
+      GCC development is a part of the GNU Project, aiming to improve the
+      compiler used in the GNU system including the GNU/Linux variant.
+    '';
+
+    maintainers = with stdenv.lib.maintainers; [ ];
+
+    platforms =
+      stdenv.lib.platforms.linux ++
+      stdenv.lib.platforms.freebsd ++
+      stdenv.lib.platforms.darwin;
+  };
+}
+
+// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
+  makeFlags = [ "all-gcc" "all-target-libgcc" ];
+  installTargets = "install-gcc install-target-libgcc";
+}
+
+# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
+// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
+
+// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
+)
diff --git a/pkgs/development/compilers/gcc/8/riscv-no-relax.patch b/pkgs/development/compilers/gcc/8/riscv-no-relax.patch
new file mode 100644
index 000000000000..93d9cd1d60f5
--- /dev/null
+++ b/pkgs/development/compilers/gcc/8/riscv-no-relax.patch
@@ -0,0 +1,109 @@
+commit e7c570f37384d824cb9725f237920e9691e57269
+gpg: Signature made Tue 06 Mar 2018 04:52:46 PM PST
+gpg:                using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
+gpg:                issuer "palmer@dabbelt.com"
+gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [ultimate]
+gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [ultimate]
+Author: Palmer Dabbelt <palmer@sifive.com>
+Date:   Thu Mar 1 12:01:06 2018 -0800
+
+    RISC-V: Add and document the "-mno-relax" option
+
+    RISC-V relies on aggressive linker relaxation to get good code size.  As
+    a result no text symbol addresses can be known until link time, which
+    means that alignment must be handled during the link.  This alignment
+    pass is essentially just another linker relaxation, so this has the
+    unfortunate side effect that linker relaxation is required for
+    correctness on many RISC-V targets.
+
+    The RISC-V assembler has supported an ".option norelax" for a long time
+    because there are situations in which linker relaxation is a bad idea --
+    the canonical example is when trying to materialize the initial value of
+    the global pointer into a register, which would otherwise be relaxed to
+    a NOP.  We've been relying on users who want to disable relaxation for
+    an entire link to pass "-Wl,--no-relax", but that still relies on the
+    linker relaxing R_RISCV_ALIGN to handle alignment despite it not being
+    strictly necessary.
+
+    This patch adds a GCC option, "-mno-relax", that disable linker
+    relaxation by adding ".option norelax" to the top of every generated
+    assembly file.  The assembler is smart enough to handle alignment at
+    assemble time for files that have never emitted a relaxable relocation,
+    so this is sufficient to really disable all relaxations in the linker,
+    which results in significantly faster link times for large objects.
+
+    This also has the side effect of allowing toolchains that don't support
+    linker relaxation (LLVM and the Linux module loader) to function
+    correctly.  Toolchains that don't support linker relaxation should
+    default to "-mno-relax" and error when presented with any R_RISCV_ALIGN
+    relocation as those need to be handled for correctness.
+
+    gcc/ChangeLog
+
+    2018-03-01  Palmer Dabbelt  <palmer@sifive.com>
+
+            * config/riscv/riscv.opt (mrelax): New option.
+            * config/riscv/riscv.c (riscv_file_start): Emit ".option
+            "norelax" when riscv_mrelax is disabled.
+            * doc/invoke.texi (RISC-V): Document "-mrelax" and "-mno-relax".
+
+diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
+index c38f6c394d54..3e81874de232 100644
+--- a/gcc/config/riscv/riscv.c
++++ b/gcc/config/riscv/riscv.c
+@@ -3979,6 +3979,11 @@ riscv_file_start (void)
+
+   /* Instruct GAS to generate position-[in]dependent code.  */
+   fprintf (asm_out_file, "\t.option %spic\n", (flag_pic ? "" : "no"));
++
++  /* If the user specifies "-mno-relax" on the command line then disable linker
++     relaxation in the assembler.  */
++  if (! riscv_mrelax)
++    fprintf (asm_out_file, "\t.option norelax\n");
+ }
+
+ /* Implement TARGET_ASM_OUTPUT_MI_THUNK.  Generate rtl rather than asm text
+diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt
+index 581a26bb5c1e..b37ac75d9bb4 100644
+--- a/gcc/config/riscv/riscv.opt
++++ b/gcc/config/riscv/riscv.opt
+@@ -106,6 +106,11 @@ mexplicit-relocs
+ Target Report Mask(EXPLICIT_RELOCS)
+ Use %reloc() operators, rather than assembly macros, to load addresses.
+
++mrelax
++Target Bool Var(riscv_mrelax) Init(1)
++Take advantage of linker relaxations to reduce the number of instructions
++required to materialize symbol addresses.
++
+ Mask(64BIT)
+
+ Mask(MUL)
+diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
+index 8d366c626bae..deb48af2ecad 100644
+--- a/gcc/doc/invoke.texi
++++ b/gcc/doc/invoke.texi
+@@ -1042,7 +1042,8 @@ See RS/6000 and PowerPC Options.
+ -msave-restore  -mno-save-restore @gol
+ -mstrict-align -mno-strict-align @gol
+ -mcmodel=medlow -mcmodel=medany @gol
+--mexplicit-relocs  -mno-explicit-relocs @gol}
++-mexplicit-relocs  -mno-explicit-relocs @gol
++-mrelax -mno-relax @gol}
+
+ @emph{RL78 Options}
+ @gccoptlist{-msim  -mmul=none  -mmul=g13  -mmul=g14  -mallregs @gol
+@@ -23102,6 +23103,12 @@ Use or do not use assembler relocation operators when dealing with symbolic
+ addresses.  The alternative is to use assembler macros instead, which may
+ limit optimization.
+
++@item -mrelax
++@itemx -mno-relax
++Take advantage of linker relaxations to reduce the number of instructions
++required to materialize symbol addresses. The default is to take advantage of
++linker relaxations.
++
+ @end table
+
+ @node RL78 Options
+
diff --git a/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch b/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch
new file mode 100644
index 000000000000..c7527ffb2b16
--- /dev/null
+++ b/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch
@@ -0,0 +1,13 @@
+Index: gcc/config/riscv/linux.h
+===================================================================
+--- a/gcc/config/riscv/linux.h	(revision 257620)
++++ b/gcc/config/riscv/linux.h	(revision 257621)
+@@ -47,6 +47,8 @@
+ 
+ #define ICACHE_FLUSH_FUNC "__riscv_flush_icache"
+ 
++#define CPP_SPEC "%{pthread:-D_REENTRANT}"
++
+ #define LINK_SPEC "\
+ -melf" XLEN_SPEC "lriscv \
+ %{shared} \

From 736dab4a681d9ff5e18ab4e47ed0c85303819b52 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 18:43:06 +0200
Subject: [PATCH 0960/3370] gcc8: register to all-packages

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a405a6785fec..e994da039091 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6243,6 +6243,17 @@ with pkgs;
     isl = if !stdenv.isDarwin then isl_0_17 else null;
   }));
 
+  gcc8 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/8 {
+    inherit noSysDirs;
+
+    # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+
+    libcCross = if targetPlatform != buildPlatform then libcCross else null;
+
+    isl = if !stdenv.isDarwin then isl_0_17 else null;
+  }));
+
   gcc-snapshot = lowPrio (wrapCC (callPackage ../development/compilers/gcc/snapshot {
     inherit noSysDirs;
 

From 728eb27618990cb558a88f5779eb91a25b3e1a3f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 18:52:50 +0200
Subject: [PATCH 0961/3370] gcc8: added myself as maintainer

---
 pkgs/development/compilers/gcc/8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index d5e15287db02..ea7b98efcc82 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -504,7 +504,7 @@ stdenv.mkDerivation ({
       compiler used in the GNU system including the GNU/Linux variant.
     '';
 
-    maintainers = with stdenv.lib.maintainers; [ ];
+    maintainers = with stdenv.lib.maintainers; [ synthetica ];
 
     platforms =
       stdenv.lib.platforms.linux ++

From a9f78307e61eadec958ef9d8bcc15af5f679e466 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 10:11:10 -0700
Subject: [PATCH 0962/3370] remotebox: 2.4 -> 2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/remotebox/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/lqc90dpw05j8jvi8n0klma3cipg70h6l-remotebox-2.5/bin/remotebox -h’ got 0 exit code
- found 2.5 with grep in /nix/store/lqc90dpw05j8jvi8n0klma3cipg70h6l-remotebox-2.5
- directory tree listing: https://gist.github.com/52fb098e7f7315de708c331b65eadfb4
---
 pkgs/applications/virtualization/remotebox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index 40eadad68d09..6743c8491891 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "remotebox-${version}";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
-    sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz";
+    sha256 = "0dajc9fg57gj915h5dxavbia4wx10frn4xc61pv0l8r5zp7xvqal";
   };
 
   buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ];

From 5b060e8647682cbabaf68211e616c248b2253ebc Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 2 May 2018 19:20:52 +0200
Subject: [PATCH 0963/3370] gitlab-runner: 10.6.0 -> 10.7.1

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 6cce9803c915..c834e6aacde1 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "10.6.0";
+  version = "10.7.1";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "0icn4xgnlrmxvhbw1lrdkg3x0cr9vhbi1vc51ahd708f9hd64ik6";
+    sha256 = "0vvi9czvl9ina3hrfd5qb557wyyspndagbzrjzmv0bbjspxgb4c5";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "0wgkvgcmby89w1vy06v7milj62656zflw2wi2g30645g72gz0as9";
+    sha256 = "1vb85asz5y9x7zzambvdfcy05nyr4kryx5zsfz7nbna7hidi2s86";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "113vkx3dnv3fvnracszlhf56fb5jr41fr3s0bs025hv8b9sp04zz";
+    sha256 = "0v4c2631yzizhbiym3qzl8p4vjy5a081ry66qpl21ma9ib2cm9r5";
   };
 
   patches = [ ./fix-shell-path.patch ];

From e8459cb97058f1e6ef8f1caea4351d471d8b31fb Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com>
Date: Wed, 2 May 2018 19:02:18 +0100
Subject: [PATCH 0964/3370] terraform/providers/update-all: Fix typo in help
 message (#39863)

---
 .../networking/cluster/terraform/providers/update-all           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all
index 16eb6004e3ee..24695066fa28 100755
--- a/pkgs/applications/networking/cluster/terraform/providers/update-all
+++ b/pkgs/applications/networking/cluster/terraform/providers/update-all
@@ -58,7 +58,7 @@ cd "$(dirname "$0")"
 
 if [[ -z "${GITHUB_AUTH:-}" ]]; then
   cat <<'HELP'
-Missing the GITHUB_AUTH env. Thi is required to work around the 60 request
+Missing the GITHUB_AUTH env. This is required to work around the 60 request
 per hour rate-limit.
 
 Go to https://github.com/settings/tokens and create a new token with the

From 5db2de0ea8cf69b0d7bcfb7c5ceb85fb465135ed Mon Sep 17 00:00:00 2001
From: Richard Szibele <RSzibele@users.noreply.github.com>
Date: Wed, 2 May 2018 20:06:48 +0200
Subject: [PATCH 0965/3370] unixODBCDrivers.mariadb: fix library file reference
 required for ODBC (#39841)

connections with MariaDB. Fixes #39835
---
 pkgs/development/libraries/unixODBCDrivers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index e7a2dee541d0..5f8e2442726c 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -45,7 +45,7 @@
 
     passthru = {
       fancyName = "MariaDB";
-      driver = "lib/libmyodbc3-3.51.12.so";
+      driver = "lib/libmaodbc.so";
     };
 
     meta = with stdenv.lib; {

From 3ecad270323a6f05879be9786579da6dd4ed91c3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 2 May 2018 13:24:27 -0500
Subject: [PATCH 0966/3370] ltrace: fix warnings and bugs using patches from
 debian

For details on the patches applied, see:

https://sources.debian.org/patches/ltrace/0.7.3-6/

Disabling '-Werror' may be a problem in the future again,
but for now keep things simple now that they're fixed.
---
 pkgs/development/tools/misc/ltrace/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix
index 66fbed514dc5..15eac37a53a9 100644
--- a/pkgs/development/tools/misc/ltrace/default.nix
+++ b/pkgs/development/tools/misc/ltrace/default.nix
@@ -10,10 +10,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ elfutils libunwind ];
 
-  preConfigure =
-    ''
-      configureFlags="--disable-werror"
-      makeFlagsArray=(INSTALL="install -c")
+  prePatch = let
+      debian = fetchurl {
+        url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz;
+        sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp";
+      };
+    in ''
+      tar xf '${debian}'
+      patches="$patches $(cat debian/patches/series | sed 's|^|debian/patches/|')"
     '';
 
   meta = with stdenv.lib; {

From d5105b36a7e05ad90e36bff22576a9d8eb6b0d8b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 2 May 2018 20:31:39 +0200
Subject: [PATCH 0967/3370] jekyll: 3.8.0 -> 3.8.1

---
 .../misc/jekyll/basic/Gemfile.lock            | 12 ++++------
 .../applications/misc/jekyll/basic/gemset.nix | 24 +++++++++----------
 .../misc/jekyll/full/Gemfile.lock             | 12 ++++------
 pkgs/applications/misc/jekyll/full/gemset.nix | 24 +++++++++----------
 4 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index f231df3d8e76..a0b1916fb181 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -13,17 +13,17 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.5)
+    eventmachine (1.2.6)
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.7.1)
+    html-pipeline (2.7.2)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.0)
+    jekyll (3.8.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -38,8 +38,7 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-avatar (0.6.0)
       jekyll (~> 3.0)
-    jekyll-mentions (1.3.0)
-      activesupport (~> 4.0)
+    jekyll-mentions (1.4.0)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
     jekyll-sass-converter (1.5.2)
@@ -50,8 +49,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
-    jemoji (0.9.0)
-      activesupport (~> 4.0, >= 4.2.9)
+    jemoji (0.10.0)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index 7c6ac55c2012..c93f93f457db 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -45,10 +45,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z";
+      sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.2.6";
   };
   ffi = {
     source = {
@@ -78,10 +78,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd";
+      sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.7.2";
   };
   "http_parser.rb" = {
     source = {
@@ -104,10 +104,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as";
+      sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
       type = "gem";
     };
-    version = "3.8.0";
+    version = "3.8.1";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -119,13 +119,13 @@
     version = "0.6.0";
   };
   jekyll-mentions = {
-    dependencies = ["activesupport" "html-pipeline" "jekyll"];
+    dependencies = ["html-pipeline" "jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn";
+      sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   jekyll-sass-converter = {
     dependencies = ["sass"];
@@ -164,13 +164,13 @@
     version = "2.0.0";
   };
   jemoji = {
-    dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"];
+    dependencies = ["gemoji" "html-pipeline" "jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b";
+      sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.10.0";
   };
   kramdown = {
     source = {
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 45bd34187ca9..bbcdad669da1 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -20,7 +20,7 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.5)
+    eventmachine (1.2.6)
     execjs (2.7.0)
     faraday (0.15.0)
       multipart-post (>= 1.2, < 3)
@@ -28,13 +28,13 @@ GEM
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.7.1)
+    html-pipeline (2.7.2)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.0)
+    jekyll (3.8.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -56,8 +56,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-mentions (1.3.0)
-      activesupport (~> 4.0)
+    jekyll-mentions (1.4.0)
       html-pipeline (~> 2.3)
       jekyll (~> 3.0)
     jekyll-paginate (1.1.0)
@@ -71,8 +70,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-watch (2.0.0)
       listen (~> 3.0)
-    jemoji (0.9.0)
-      activesupport (~> 4.0, >= 4.2.9)
+    jemoji (0.10.0)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index b45ea5b9d079..8473cee0be53 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -79,10 +79,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "075hdw0fgzldgss3xaqm2dk545736khcvv1fmzbf1sgdlkyh1v8z";
+      sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.2.6";
   };
   execjs = {
     source = {
@@ -137,10 +137,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hkx70z9ijgnncmrna9qdh9ajn9m7v146k91j257lrzyq2f6jdjd";
+      sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.7.2";
   };
   "http_parser.rb" = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0fdb3qfbpjhlz5vlx4aw7kg9iy4bvaa5k1v82fxapyjghs2zg8as";
+      sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
       type = "gem";
     };
-    version = "3.8.0";
+    version = "3.8.1";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -205,13 +205,13 @@
     version = "1.5.0";
   };
   jekyll-mentions = {
-    dependencies = ["activesupport" "html-pipeline" "jekyll"];
+    dependencies = ["html-pipeline" "jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11rfn2w9d50szbwbn3pajswjgcg85714d4d052mq2p803zg1i3mn";
+      sha256 = "042z02j0chv679s8imciiy44fgxh9028q8n95w48i0xrfrhyzzfb";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   jekyll-paginate = {
     source = {
@@ -267,13 +267,13 @@
     version = "2.0.0";
   };
   jemoji = {
-    dependencies = ["activesupport" "gemoji" "html-pipeline" "jekyll"];
+    dependencies = ["gemoji" "html-pipeline" "jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0acmi7mgr844dmzgfi9flcqkkb0jh5l21h579cidxwf1409w588b";
+      sha256 = "0r6ja4bw2c50hb585cmqscbmm27982kkskyh7gk6j0mr70jqlz25";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.10.0";
   };
   kramdown = {
     source = {

From d0708a30c4fa2ea612148fdf5bfe9618b8040eb6 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 20:51:01 +0200
Subject: [PATCH 0968/3370] gcc8: removed merged patches

Log:
```
patching sources
applying patch /nix/store/6m27y27zvzsjn1ir4y8mm9nc9xnh2sgx-riscv-no-relax.patch
patching file gcc/config/riscv/riscv.c
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file gcc/config/riscv/riscv.c.rej
patching file gcc/config/riscv/riscv.opt
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file gcc/config/riscv/riscv.opt.rej
patching file gcc/doc/invoke.texi
Reversed (or previously applied) patch detected!  Assume -R? [n]
Apply anyway? [n]
Skipping patch.
```
---
 pkgs/development/compilers/gcc/8/default.nix  |   7 +-
 .../compilers/gcc/8/riscv-no-relax.patch      | 109 ------------------
 .../gcc/8/riscv-pthread-reentrant.patch       |  13 ---
 3 files changed, 1 insertion(+), 128 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/8/riscv-no-relax.patch
 delete mode 100644 pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index ea7b98efcc82..9294985d99c7 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -57,12 +57,7 @@ let version = "8.1.0";
     enableParallelBuilding = true;
 
     patches =
-      [ # https://gcc.gnu.org/ml/gcc-patches/2018-02/msg00633.html
-        /* ./riscv-pthread-reentrant.patch */ # TODO: is this needed?
-        # https://gcc.gnu.org/ml/gcc-patches/2018-03/msg00297.html
-        /* ./riscv-no-relax.patch */
-      ]
-      ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
+         optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
         url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
diff --git a/pkgs/development/compilers/gcc/8/riscv-no-relax.patch b/pkgs/development/compilers/gcc/8/riscv-no-relax.patch
deleted file mode 100644
index 93d9cd1d60f5..000000000000
--- a/pkgs/development/compilers/gcc/8/riscv-no-relax.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-commit e7c570f37384d824cb9725f237920e9691e57269
-gpg: Signature made Tue 06 Mar 2018 04:52:46 PM PST
-gpg:                using RSA key 00CE76D1834960DFCE886DF8EF4CA1502CCBAB41
-gpg:                issuer "palmer@dabbelt.com"
-gpg: Good signature from "Palmer Dabbelt <palmer@dabbelt.com>" [ultimate]
-gpg:                 aka "Palmer Dabbelt <palmer@sifive.com>" [ultimate]
-Author: Palmer Dabbelt <palmer@sifive.com>
-Date:   Thu Mar 1 12:01:06 2018 -0800
-
-    RISC-V: Add and document the "-mno-relax" option
-
-    RISC-V relies on aggressive linker relaxation to get good code size.  As
-    a result no text symbol addresses can be known until link time, which
-    means that alignment must be handled during the link.  This alignment
-    pass is essentially just another linker relaxation, so this has the
-    unfortunate side effect that linker relaxation is required for
-    correctness on many RISC-V targets.
-
-    The RISC-V assembler has supported an ".option norelax" for a long time
-    because there are situations in which linker relaxation is a bad idea --
-    the canonical example is when trying to materialize the initial value of
-    the global pointer into a register, which would otherwise be relaxed to
-    a NOP.  We've been relying on users who want to disable relaxation for
-    an entire link to pass "-Wl,--no-relax", but that still relies on the
-    linker relaxing R_RISCV_ALIGN to handle alignment despite it not being
-    strictly necessary.
-
-    This patch adds a GCC option, "-mno-relax", that disable linker
-    relaxation by adding ".option norelax" to the top of every generated
-    assembly file.  The assembler is smart enough to handle alignment at
-    assemble time for files that have never emitted a relaxable relocation,
-    so this is sufficient to really disable all relaxations in the linker,
-    which results in significantly faster link times for large objects.
-
-    This also has the side effect of allowing toolchains that don't support
-    linker relaxation (LLVM and the Linux module loader) to function
-    correctly.  Toolchains that don't support linker relaxation should
-    default to "-mno-relax" and error when presented with any R_RISCV_ALIGN
-    relocation as those need to be handled for correctness.
-
-    gcc/ChangeLog
-
-    2018-03-01  Palmer Dabbelt  <palmer@sifive.com>
-
-            * config/riscv/riscv.opt (mrelax): New option.
-            * config/riscv/riscv.c (riscv_file_start): Emit ".option
-            "norelax" when riscv_mrelax is disabled.
-            * doc/invoke.texi (RISC-V): Document "-mrelax" and "-mno-relax".
-
-diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
-index c38f6c394d54..3e81874de232 100644
---- a/gcc/config/riscv/riscv.c
-+++ b/gcc/config/riscv/riscv.c
-@@ -3979,6 +3979,11 @@ riscv_file_start (void)
-
-   /* Instruct GAS to generate position-[in]dependent code.  */
-   fprintf (asm_out_file, "\t.option %spic\n", (flag_pic ? "" : "no"));
-+
-+  /* If the user specifies "-mno-relax" on the command line then disable linker
-+     relaxation in the assembler.  */
-+  if (! riscv_mrelax)
-+    fprintf (asm_out_file, "\t.option norelax\n");
- }
-
- /* Implement TARGET_ASM_OUTPUT_MI_THUNK.  Generate rtl rather than asm text
-diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt
-index 581a26bb5c1e..b37ac75d9bb4 100644
---- a/gcc/config/riscv/riscv.opt
-+++ b/gcc/config/riscv/riscv.opt
-@@ -106,6 +106,11 @@ mexplicit-relocs
- Target Report Mask(EXPLICIT_RELOCS)
- Use %reloc() operators, rather than assembly macros, to load addresses.
-
-+mrelax
-+Target Bool Var(riscv_mrelax) Init(1)
-+Take advantage of linker relaxations to reduce the number of instructions
-+required to materialize symbol addresses.
-+
- Mask(64BIT)
-
- Mask(MUL)
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 8d366c626bae..deb48af2ecad 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
-@@ -1042,7 +1042,8 @@ See RS/6000 and PowerPC Options.
- -msave-restore  -mno-save-restore @gol
- -mstrict-align -mno-strict-align @gol
- -mcmodel=medlow -mcmodel=medany @gol
---mexplicit-relocs  -mno-explicit-relocs @gol}
-+-mexplicit-relocs  -mno-explicit-relocs @gol
-+-mrelax -mno-relax @gol}
-
- @emph{RL78 Options}
- @gccoptlist{-msim  -mmul=none  -mmul=g13  -mmul=g14  -mallregs @gol
-@@ -23102,6 +23103,12 @@ Use or do not use assembler relocation operators when dealing with symbolic
- addresses.  The alternative is to use assembler macros instead, which may
- limit optimization.
-
-+@item -mrelax
-+@itemx -mno-relax
-+Take advantage of linker relaxations to reduce the number of instructions
-+required to materialize symbol addresses. The default is to take advantage of
-+linker relaxations.
-+
- @end table
-
- @node RL78 Options
-
diff --git a/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch b/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch
deleted file mode 100644
index c7527ffb2b16..000000000000
--- a/pkgs/development/compilers/gcc/8/riscv-pthread-reentrant.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gcc/config/riscv/linux.h
-===================================================================
---- a/gcc/config/riscv/linux.h	(revision 257620)
-+++ b/gcc/config/riscv/linux.h	(revision 257621)
-@@ -47,6 +47,8 @@
- 
- #define ICACHE_FLUSH_FUNC "__riscv_flush_icache"
- 
-+#define CPP_SPEC "%{pthread:-D_REENTRANT}"
-+
- #define LINK_SPEC "\
- -melf" XLEN_SPEC "lriscv \
- %{shared} \

From c7a6b3665896a5bf62c39e35a73988058f0c026f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 20:53:13 +0200
Subject: [PATCH 0969/3370] gcc8: removed commented gcc7 hash

---
 pkgs/development/compilers/gcc/8/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 9294985d99c7..15b8b99c82f0 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -183,7 +183,6 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-    /* sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"; */
     sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
   };
 

From 1095c414a67f129b01a3a86237fdd67c42fe1016 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 2 May 2018 20:57:11 +0200
Subject: [PATCH 0970/3370] signal-desktop: 1.7.1 -> 1.9.0

---
 .../instant-messengers/signal-desktop/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index d524be287cd2..479b89bcecbd 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.7.1";
+    version = "1.9.0";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "02zx8ynbvvs260mrvqbsg0fi561da4ni3i9f4bjh53vqn92vhvvq";
+          sha256 = "18i9chyarpcw369rqyldckkln1lxy5g9qy9f5gy5gsz9y5qngxqa";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";
@@ -81,7 +81,7 @@ in
       description = "Signal Private Messenger for the Desktop.";
       homepage    = https://signal.org/;
       license     = lib.licenses.gpl3;
-      maintainers = [ lib.maintainers.ixmatus ];
+      maintainers = with lib.maintainers; [ ixmatus primeos ];
       platforms   = [
         "x86_64-linux"
       ];

From 736848723e5aefa5d24396c58dc6de603399efde Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Tue, 3 Apr 2018 10:26:03 +0200
Subject: [PATCH 0971/3370] dockerTools.pullImage: Skopeo pulls images by
 digest

Skopeo is used to pull images from a Docker registry (instead of a
Docker deamon in a VM).

An image reference is specified with its name and its digest which is
an immutable image identifier (unlike image name and tag).

Skopeo can be used to get the digest of an image, for instance:
$ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
---
 pkgs/build-support/docker/default.nix  | 25 ++++++++++++++++--
 pkgs/build-support/docker/examples.nix |  6 ++---
 pkgs/build-support/docker/pull.nix     | 32 -----------------------
 pkgs/build-support/docker/pull.sh      | 36 --------------------------
 4 files changed, 26 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/build-support/docker/pull.nix
 delete mode 100644 pkgs/build-support/docker/pull.sh

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 75e279afdc37..584beb3d89b8 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -32,7 +32,28 @@ rec {
     inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb;
   };
 
-  pullImage = callPackage ./pull.nix {};
+  pullImage =
+    let
+      fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
+    in {
+      imageName,
+      # To find the digest of an image, you can use skopeo:
+      # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
+      # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
+      imageDigest,
+      sha256,
+      # This used to set a tag to the pulled image
+      finalImageTag ? "latest",
+      name ? (fixName "docker-image-${imageName}-${finalImageTag}.tar") }:
+      runCommand name {
+        impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
+        outputHashMode="flat";
+        outputHashAlgo="sha256";
+        outputHash=sha256;
+      }
+      ''
+        ${pkgs.skopeo}/bin/skopeo copy docker://${imageName}@${imageDigest} docker-archive://$out:${imageName}:${finalImageTag}
+      '';
 
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
   # And we cannot untar it, because then we cannot preserve permissions ecc.
@@ -560,7 +581,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
+        tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'^./':: -c . | pigz -nT > $out
 
         echo "Finished."
       '';
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index 315440349b6b..eb5b9fe36e41 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -85,9 +85,9 @@ rec {
   # 4. example of pulling an image. could be used as a base for other images
   nixFromDockerHub = pullImage {
     imageName = "nixos/nix";
-    imageTag = "1.11";
-    # this hash will need change if the tag is updated at docker hub
-    sha256 = "0nncn9pn5miygan51w34c2p9qssi96jgsaqv44dxxdprc8pg0g83";
+    imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b";
+    sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8";
+    finalImageTag = "1.11";
   };
 
   # 5. example of multiple contents, emacs and vi happily coexisting
diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix
deleted file mode 100644
index 5611c7785862..000000000000
--- a/pkgs/build-support/docker/pull.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, lib, docker, vmTools, utillinux, curl, kmod, dhcp, cacert, e2fsprogs }:
-let
-  nameReplace = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
-in
-# For simplicity we only support sha256.
-{ imageName, imageTag ? "latest", imageId ? "${imageName}:${imageTag}"
-, sha256, name ? (nameReplace "docker-image-${imageName}-${imageTag}.tar") }:
-let
-  pullImage = vmTools.runInLinuxVM (
-    stdenv.mkDerivation {
-      inherit name imageId;
-
-      certs = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
-      builder = ./pull.sh;
-
-      nativeBuildInputs = [ curl utillinux docker kmod dhcp cacert e2fsprogs ];
-
-      outputHashAlgo = "sha256";
-      outputHash = sha256;
-
-      impureEnvVars = lib.fetchers.proxyImpureEnvVars;
-
-      preVM = vmTools.createEmptyImage {
-        size = 2048;
-        fullName = "${name}-disk";
-      };
-
-      QEMU_OPTS = "-netdev user,id=net0 -device virtio-net-pci,netdev=net0";
-    });
-in
-  pullImage
diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh
deleted file mode 100644
index 0b1e9f310ee9..000000000000
--- a/pkgs/build-support/docker/pull.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-source $stdenv/setup
-
-mkdir -p /var/lib/docker
-mkfs.ext4 /dev/vda
-mount -t ext4 /dev/vda /var/lib/docker
-
-modprobe virtio_net
-dhclient eth0
-
-mkdir -p /etc/ssl/certs/
-cp "$certs" "/etc/ssl/certs/"
-
-# from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
-mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-cd /sys/fs/cgroup
-for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-  mkdir -p $sys
-  if ! mountpoint -q $sys; then
-    if ! mount -n -t cgroup -o $sys cgroup $sys; then
-      rmdir $sys || true
-    fi
-  fi
-done
-
-# run docker daemon
-dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock &
-
-until docker ps 2>/dev/null; do
-  printf '.'
-  sleep 1
-done
-
-rm -r $out
-
-docker pull ${imageId}
-docker save ${imageId} > $out

From d35dcb12804700c15fb398e1dce6ad8d5995929c Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 9 Apr 2018 14:52:41 +0200
Subject: [PATCH 0972/3370] dockerTools.pullImage: documentation and release
 note

---
 doc/functions.xml                          | 55 +++++++++-------------
 nixos/doc/manual/release-notes/rl-1809.xml |  7 +++
 2 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index 155ea2bd0043..cdae96703f13 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -624,10 +624,9 @@ merge:"diff3"
 
    <para>
     This function is analogous to the <command>docker pull</command> command,
-    in that can be used to fetch a Docker image from a Docker registry.
-    Currently only registry <literal>v1</literal> is supported. By default
-    <link xlink:href="https://hub.docker.com/">Docker Hub</link> is used to
-    pull images.
+    in that can be used to pull a Docker image from a Docker registry.
+    By default <link xlink:href="https://hub.docker.com/">Docker Hub</link>
+    is used to pull images.
    </para>
 
    <para>
@@ -638,13 +637,10 @@ merge:"diff3"
     <title>Docker pull</title>
 <programlisting>
   pullImage {
-    imageName = "debian"; <co xml:id='ex-dockerTools-pullImage-1' />
-    imageTag = "jessie"; <co xml:id='ex-dockerTools-pullImage-2' />
-    imageId = null; <co xml:id='ex-dockerTools-pullImage-3' />
-    sha256 = "1bhw5hkz6chrnrih0ymjbmn69hyfriza2lr550xyvpdrnbzr4gk2"; <co xml:id='ex-dockerTools-pullImage-4' />
-
-    indexUrl = "https://index.docker.io"; <co xml:id='ex-dockerTools-pullImage-5' />
-    registryVersion = "v1";
+    imageName = "nixos/nix"; <co xml:id='ex-dockerTools-pullImage-1' />
+    imageDigest = "sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b"; <co xml:id='ex-dockerTools-pullImage-2' />
+    finalImageTag = "1.11";  <co xml:id='ex-dockerTools-pullImage-3' />
+    sha256 = "0mqjy3zq2v6rrhizgb9nvhczl87lcfphq9601wcprdika2jz7qh8"; <co xml:id='ex-dockerTools-pullImage-4' />
   }
   </programlisting>
    </example>
@@ -652,24 +648,28 @@ merge:"diff3"
    <calloutlist>
     <callout arearefs='ex-dockerTools-pullImage-1'>
      <para>
-      <varname>imageName</varname> specifies the name of the image to be
-      downloaded, which can also include the registry namespace (e.g.
-      <literal>library/debian</literal>). This argument is required.
+      <varname>imageName</varname> specifies the name of the image to be downloaded,
+      which can also include the registry namespace (e.g. <literal>nixos</literal>).
+      This argument is required.
      </para>
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-2'>
      <para>
-      <varname>imageTag</varname> specifies the tag of the image to be
-      downloaded. By default it's <literal>latest</literal>.
+      <varname>imageDigest</varname> specifies the digest of the image
+      to be downloaded. Skopeo can be used to get the digest of an image
+<programlisting>
+  $ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
+  sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
+  </programlisting>
+      This argument is required.
      </para>
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-3'>
      <para>
-      <varname>imageId</varname>, if specified this exact image will be
-      fetched, instead of <varname>imageName/imageTag</varname>. However, the
-      resulting repository will still be named
-      <varname>imageName/imageTag</varname>. By default it's
-      <literal>null</literal>.
+      <varname>finalImageTag</varname>, if specified, this is the tag of
+      the image to be created. Note it is never used to fetch the image
+      since we prefer to rely on the immutable digest ID. By default
+      it's <literal>latest</literal>.
      </para>
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-4'>
@@ -677,19 +677,6 @@ merge:"diff3"
       <varname>sha256</varname> is the checksum of the whole fetched image.
       This argument is required.
      </para>
-     <note>
-      <para>
-       The checksum is computed on the unpacked directory, not on the final
-       tarball.
-      </para>
-     </note>
-    </callout>
-    <callout arearefs='ex-dockerTools-pullImage-5'>
-     <para>
-      In the above example the default values are shown for the variables
-      <varname>indexUrl</varname> and <varname>registryVersion</varname>. Hence
-      by default the Docker.io registry is used to pull the images.
-     </para>
     </callout>
    </calloutlist>
   </section>
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 2fd7b7709797..ec7b2f107e8e 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -112,6 +112,13 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <title>Other Notable Changes</title>
 
   <itemizedlist>
+   <listitem>
+    <para>
+     <literal>dockerTools.pullImage</literal> relies on image digest
+     instead of image tag to download the image. The
+     <literal>sha256</literal> of a pulled image has to be updated.
+    </para>
+   </listitem>
    <listitem>
     <para>
      <literal>lib.attrNamesToStr</literal> has been deprecated. Use more

From f431e20549e842971de755342f49bc79bd7757b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 09:10:03 -0700
Subject: [PATCH 0973/3370] sudo: 1.8.22 -> 1.8.23
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sudo/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/cvtsudoers -h’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/cvtsudoers --help’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/sudoreplay -h’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/sudoreplay --help’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/sudoreplay -V’ and found version 1.8.23
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/sudoreplay --version’ and found version 1.8.23
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/visudo -h’ got 0 exit code
- ran ‘/nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23/bin/visudo --help’ got 0 exit code
- found 1.8.23 with grep in /nix/store/d2g0ybmppcar8k38jjiqqdz8s3knwrrm-sudo-1.8.23
- directory tree listing: https://gist.github.com/4d6cfc75cde31a340e8a41bf3d969564
---
 pkgs/tools/security/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 85dba08255da..0ca4507d5d93 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -5,14 +5,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.22";
+  name = "sudo-1.8.23";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "00pxp74xkwdcmrjwy55j0k8p684jk1zx3nzdc11v30q8q8kwnmkj";
+    sha256 = "0yg62wq8rcrbr7qvh3wgfg2g4bwanbi50cr2lf2cfyy8dydx4qyq";
   };
 
   prePatch = ''

From d628d8ccb93d21282fa43ce4e541ea5780fed61d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 09:06:52 -0700
Subject: [PATCH 0974/3370] umockdev: 0.11.2 -> 0.11.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/umockdev/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/lzgyyshqfl8ma25ixvldaz40pscq30h4-umockdev-0.11.3/bin/umockdev-run -h’ got 0 exit code
- ran ‘/nix/store/lzgyyshqfl8ma25ixvldaz40pscq30h4-umockdev-0.11.3/bin/umockdev-run --help’ got 0 exit code
- ran ‘/nix/store/lzgyyshqfl8ma25ixvldaz40pscq30h4-umockdev-0.11.3/bin/umockdev-run --version’ and found version 0.11.3
- ran ‘/nix/store/lzgyyshqfl8ma25ixvldaz40pscq30h4-umockdev-0.11.3/bin/umockdev-record -h’ got 0 exit code
- ran ‘/nix/store/lzgyyshqfl8ma25ixvldaz40pscq30h4-umockdev-0.11.3/bin/umockdev-record --help’ got 0 exit code
- ran ‘/nix/store/lzgyyshqfl8ma25ixvldaz40pscq30h4-umockdev-0.11.3/bin/umockdev-record --version’ and found version 0.11.3
- found 0.11.3 with grep in /nix/store/lzgyyshqfl8ma25ixvldaz40pscq30h4-umockdev-0.11.3
- directory tree listing: https://gist.github.com/3dcf7f53d51ca4a9c739e567456cb16f
---
 pkgs/development/libraries/umockdev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index fb43af362433..0f727a9be476 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "umockdev-${version}";
-  version = "0.11.2";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "martinpitt";
     repo = "umockdev";
     rev = version;
-    sha256 ="1dvhs9nkznlnagzjny61fh574g42c47b9s5hxsqdgqb51njawdg1";
+    sha256 ="1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik";
   };
 
   buildInputs = [ glib systemd libgudev ];

From 66aedd583e4219d4e1360ec97c67983f05ac1f59 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 09:02:40 -0700
Subject: [PATCH 0975/3370] transmission-gtk: 2.93 -> 2.94
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/transmission-gtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-create -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-create --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-create help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-edit -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-edit --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-show -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-show --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-daemon -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-daemon --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-daemon help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-remote -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-remote --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-remote help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-cli -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-cli --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-gtk -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/transmission-gtk --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-create-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-create-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-create-wrapped help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-edit-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-edit-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-show-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-show-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-daemon-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-daemon-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-daemon-wrapped help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-remote-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-remote-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-remote-wrapped help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-cli-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-cli-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-gtk-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94/bin/.transmission-gtk-wrapped --help’ got 0 exit code
- found 2.94 with grep in /nix/store/2icg48qc0virpl18pf2kycp9n2kav4s1-transmission-gtk-2.94
- directory tree listing: https://gist.github.com/4473480bb991ef18fee4200012b9a449
---
 pkgs/applications/networking/p2p/transmission/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index cf825b724962..d8fc1d840d2b 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -10,11 +10,11 @@ let inherit (stdenv.lib) optional optionals optionalString; in
 
 stdenv.mkDerivation rec {
   name = "transmission-" + optionalString enableGTK3 "gtk-" + version;
-  version = "2.93";
+  version = "2.94";
 
   src = fetchurl {
-    url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.93.tar.xz";
-    sha256 = "8815920e0a4499bcdadbbe89a4115092dab42ce5199f71ff9a926cfd12b9b90b";
+    url = "https://github.com/transmission/transmission-releases/raw/master/transmission-2.94.tar.xz";
+    sha256 = "0zbbj7rlm6m7vb64x68a64cwmijhsrwx9l63hbwqs7zr9742qi1m";
   };
 
   nativeBuildInputs = [ pkgconfig ]

From 14cdf3741838e5a3774ce452dc79b8374f8ec037 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 08:11:36 -0700
Subject: [PATCH 0976/3370] lzma: 5.2.3 -> 5.2.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xz/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unxz -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unxz --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcat -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcat --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzma -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzma --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unlzma -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/unlzma --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcat -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcat --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdiff --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdiff --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzmore --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzless --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcmp --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzcmp --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzegrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzfgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzdiff --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzdiff --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcmp --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzcmp --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzegrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep -V’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzfgrep --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmore --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzless --version’ and found version 5.2.4
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdec -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xzdec --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmadec -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmadec --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xz -h’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/xz --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmainfo --help’ got 0 exit code
- ran ‘/nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin/bin/lzmainfo --version’ and found version 5.2.4
- found 5.2.4 with grep in /nix/store/04jcagznwznnhjq88jlr9pn28w2qvyqw-xz-5.2.4-bin
- directory tree listing: https://gist.github.com/5bf57c36243ce0756cb390f685d22fdf
---
 pkgs/tools/compression/xz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index da3a537da283..37c0c6d1c7e8 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "xz-5.2.3";
+  name = "xz-5.2.4";
 
   src = fetchurl {
     url = "https://tukaani.org/xz/${name}.tar.bz2";
-    sha256 = "1ha08wxcldgcl81021x5nhknr47s1p95ljfkka4sqah5w5ns377x";
+    sha256 = "1gxpayfagb4v7xfhs2w6h7k56c6hwwav1rk48bj8hggljlmgs4rk";
   };
 
   outputs = [ "bin" "dev" "out" "man" "doc" ];

From e53b92247f6f6910d8067e74bcca73ec5d694641 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 08:34:48 -0700
Subject: [PATCH 0977/3370] webtorrent_desktop: 0.19.0 -> 0.20.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/webtorrent-desktop/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.20.0 with grep in /nix/store/8fnyx3djgy1c7zx3qw88rnn3cn3nd5by-webtorrent-desktop-0.20.0
- directory tree listing: https://gist.github.com/4f5e4c39966d009716488da050623a98
---
 pkgs/applications/video/webtorrent_desktop/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index bb519ef3dab0..b03ca2328b39 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -39,13 +39,13 @@
     ]);
   in stdenv.mkDerivation rec {
     name = "webtorrent-desktop-${version}";
-    version = "0.19.0";
+    version = "0.20.0";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.19.0/webtorrent-desktop_${version}-1_amd64.deb";
-          sha256 = "0v4fgvf8qgxjwg5kz30pcxl71pi9rri0l3cy20pid07rdd6r4sgd";
+          url = "https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.20.0/webtorrent-desktop_${version}-1_amd64.deb";
+          sha256 = "1kkrnbimiip5pn2nwpln35bbdda9gc3cgrjwphq4fqasbjf2781k";
         }
         else
           throw "Webtorrent is not currently supported on ${stdenv.system}";

From 0943b76dc812d5db1e95d61a01ee6f0695f8c871 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 22:19:33 -0500
Subject: [PATCH 0978/3370] netbsd: remove mkdir -p calls

install is now hacked to ensure the parent directory exists before
running.
---
 pkgs/os-specific/bsd/netbsd/default.nix | 69 +++++++++----------------
 1 file changed, 25 insertions(+), 44 deletions(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 188d9709ee08..2b6956a63357 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, hostPlatform, fetchcvs, lib, groff, mandoc, zlib, coreutils
-, yacc, flex, libressl, bash, more }:
+, yacc, flex, libressl, bash, less, writeText }:
 
 let
   fetchNetBSD = path: version: sha256: fetchcvs {
@@ -30,13 +30,16 @@ let
     NOGCCERROR = "yes";
     LEX = "flex";
     MKUNPRIVED = "yes";
-    INSTPRIV = '' ''${INSTPRIV.unpriv}'';
     HOST_SH = "${bash}/bin/sh";
     OBJCOPY = if stdenv.isDarwin then "true" else "objcopy";
-    PRESERVE = "-p";
     MACHINE_ARCH = hostPlatform.parsed.cpu.name;
     MACHINE_CPU = hostPlatform.parsed.cpu.name;
 
+    INSTALL_FILE = "install -U -c";
+    INSTALL_DIR = "xinstall -U -d";
+    INSTALL_LINK = "install -U -l h";
+    INSTALL_SYMLINK = "install -U -l s";
+
     # libs will be provided by cc-wrapper
     LIBCRT0 = "";
     LIBCRTI = "";
@@ -106,17 +109,6 @@ let
       fi
     '';
 
-    # Need to create directories for xinstall to work. Unused ones
-    # will be removed in the postInstall.
-    preInstall = ''
-      mkdir -p $out$BINDIR $out$LIBDIR $out$INFODIR \
-               $out$DOCDIR $out$LOCALEDIR $out$INCSDIR
-      for i in 1 2 3 4 5 6 7 8 9; do
-        mkdir -p $out$MANDIR/man$i $out$MANDIR/html$i \
-                 $out$DOCDIR/reference/ref$i
-      done
-    '';
-
     preFixup = ''
       # Remove lingering /usr references
       if [ -d $out/usr ]; then
@@ -125,10 +117,6 @@ let
         find . -type f -exec mv \{} $out/\{} \;
       fi
 
-      if [ -f $out/METALOG ]; then
-        rm $out/METALOG
-      fi
-
       find $out -type d -empty -delete
     '';
 
@@ -155,11 +143,11 @@ let
       ${make.postPatch}
     '';
     buildPhase = ''
-      runHook prePatch
+      runHook preBuild
 
       sh ./buildmake.sh
 
-      runHook postPatch
+      runHook postBuild
     '';
     installPhase = ''
       runHook preInstall
@@ -229,7 +217,14 @@ let
     ] ++ libutil.extraPaths ++ libc.extraPaths;
   };
 
-  install = netBSDDerivation {
+  # HACK to ensure parent directories exist. This emulates GNU
+  # install’s -D option. No alternative seems to exist in BSD install.
+  install = let binstall = writeText "binstall" ''
+    #!/usr/bin/env sh
+    for last in $@; do true; done
+    mkdir -p $(dirname $last)
+    xinstall "$@"
+  ''; in netBSDDerivation {
     path = "usr.bin/xinstall";
     version = "7.1.2";
     sha256 = "0nzhyh714m19h61m45gzc5dszkbafp5iaphbp5mza6w020fzf2y8";
@@ -240,13 +235,12 @@ let
       runHook preInstall
 
       install -D install.1 $out/share/man/man1/install.1
-      install -D xinstall $out/bin/install
-      ln -s $out/bin/install $out/bin/xinstall
-      ln -s $out/bin/install $out/bin/binstall
+      install -D xinstall $out/bin/xinstall
+      install -D -m 0550 ${binstall} $out/bin/binstall
+      ln -s $out/bin/binstall $out/bin/install
 
       runHook postInstall
     '';
-    # INSTALL_FILE = "install -D";
   };
 
   fts = netBSDDerivation {
@@ -332,6 +326,8 @@ let
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.prog.mk \
         --replace '-Wl,-dynamic-linker=''${_SHLINKER}' "" \
         --replace '-Wl,-rpath,''${SHLIBDIR}' ""
+      substituteInPlace $NETBSDSRCDIR/share/mk/bsd.lib.mk \
+        --replace '_INSTRANLIB=''${empty(PRESERVE):?-a "''${RANLIB} -t":}' '_INSTRANLIB='
     '' + lib.optionalString stdenv.isDarwin ''
       substituteInPlace $NETBSDSRCDIR/share/mk/bsd.sys.mk \
         --replace '-Wl,--fatal-warnings' "" \
@@ -344,10 +340,6 @@ let
         --replace '-Wl,-Map=''${_LIB}.so.''${SHLIB_SOVERSION}.map' "" \
         --replace '-Wl,-rpath,''${SHLIBDIR}' ""
     '';
-    preInstall = ''
-      mkdir -p $out$BINDIR $out$DOCDIR/reference/ref1/make \
-               $out$MANDIR/man1 $out$MANDIR/html1 $out/share/mk
-    '';
     postInstall = ''
       (cd $NETBSDSRCDIR/share/mk && make FILESDIR=/share/mk install)
     '';
@@ -402,7 +394,6 @@ in rec {
     version = "7.1.2";
     sha256 = "0nickhsjwgnr2h9nvwflvgfz93kqms5hzdnpyq02crpj35w98bh4";
     makeFlags = [ "BINDIR=/share" ];
-    preInstall = "mkdir -p $out/share/dict";
   };
 
   games = netBSDDerivation {
@@ -410,20 +401,20 @@ in rec {
     sha256 = "04wjsang8f8kxsifiayklbxaaxmm3vx9rfr91hfbxj4hk8gkqzy1";
     version = "7.1.2";
     makeFlags = [ "BINDIR=/bin"
-                  "SCRIPTSDIR=/bin"
-                  "FILESDIR=/share/games" ];
+                  "SCRIPTSDIR=/bin" ];
     postPatch = ''
       sed -i '1i #include <time.h>' adventure/save.c
 
       for f in $(find . -name pathnames.h); do
         substituteInPlace $f \
-          --replace /usr/share/games/fortune $out/share/games \
           --replace /usr/share/games $out/share/games \
           --replace /usr/games $out/bin \
           --replace /usr/libexec $out/libexec \
-          --replace /usr/bin/more ${more}/bin/more \
+          --replace /usr/bin/more ${less}/bin/less \
           --replace /usr/share/dict ${dict}/share/dict
       done
+      substituteInPlace boggle/boggle/bog.h \
+        --replace /usr/share/games $out/share/games
       substituteInPlace ching/ching/ching.sh \
         --replace /usr/share $out/share \
         --replace /usr/libexec $out/libexec
@@ -457,7 +448,6 @@ in rec {
     # HACK strfile needs to be installed first & in the path. The
     # Makefile should do this for us but haven't gotten it to work
     preBuild = ''
-      mkdir -p $out/bin $out/share/man/man8 $out/share/man/html8
       (cd fortune/strfile && make && make BINDIR=/bin install)
       export PATH=$out/bin:$PATH
     '';
@@ -475,14 +465,6 @@ in rec {
       "-D__c99inline=__inline"
     ];
 
-    preInstall = ''
-      mkdir -p $out/var/games/hackdir \
-               $out/share/games \
-               $out$DOCDIR/reference/ref6/rogue \
-               $out$MANDIR/man6 $out$MANDIR/html6
-      touch $out/var/games/hackdir/perm
-    '';
-
     buildInputs = [ compat libcurses libterminfo libressl ];
     extraPaths = [ dict.src who.src ];
   };
@@ -543,7 +525,6 @@ in rec {
       substituteInPlace term.c --replace /usr/share $out/share
     '';
     postInstall = ''
-      mkdir -p $out/share/misc
       (cd $NETBSDSRCDIR/share/terminfo && make && make BINDIR=/share install)
     '';
     extraPaths = [

From e0851dfd7cb5bd48f4101eea492d582e7dd9b218 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 1 May 2018 22:20:19 -0500
Subject: [PATCH 0979/3370] netbsd.misc: init

---
 pkgs/os-specific/bsd/netbsd/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 2b6956a63357..485ad7c58f74 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -574,4 +574,11 @@ in rec {
     ];
   };
 
+  misc = netBSDDerivation {
+    path = "share/misc";
+    version = "7.1.2";
+    sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665";
+    makeFlags = [ "BINDIR=/share/misc" ];
+  };
+
 }

From 55513eed5e855245b3a60f4bce620db364797952 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 2 May 2018 00:05:54 -0500
Subject: [PATCH 0980/3370] netbsd.quiz: fixup database

---
 pkgs/os-specific/bsd/netbsd/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 485ad7c58f74..04e455246857 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -452,6 +452,11 @@ in rec {
       export PATH=$out/bin:$PATH
     '';
 
+    postInstall = ''
+      substituteInPlace $out/usr/share/games/quiz.db/index \
+        --replace /usr $out
+    '';
+
     NIX_CFLAGS_COMPILE = [
       "-D__noinline="
       "-D__scanflike(a,b)="

From 77645d6a018a627f9380bbd689431664638b43d3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 2 May 2018 00:39:30 -0500
Subject: [PATCH 0981/3370] netbsd.misc: fix BINDIR

---
 pkgs/os-specific/bsd/netbsd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 04e455246857..b4fb99504ef2 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -583,7 +583,7 @@ in rec {
     path = "share/misc";
     version = "7.1.2";
     sha256 = "1vyn30js14nnadlls55mg7g1gz8h14l75rbrrh8lgn49qg289665";
-    makeFlags = [ "BINDIR=/share/misc" ];
+    makeFlags = [ "BINDIR=/share" ];
   };
 
 }

From f1c57f487945419b8ea7d7cd40c3664fd7cf3b75 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 06:24:26 -0700
Subject: [PATCH 0982/3370] zookeeper: 3.4.11 -> 3.4.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/zookeeper/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/g0fmbsp2n6sgh4fa9k6w2m3ndq9vhcxl-zookeeper-3.4.12/bin/zkServer.sh -h’ got 0 exit code
- ran ‘/nix/store/g0fmbsp2n6sgh4fa9k6w2m3ndq9vhcxl-zookeeper-3.4.12/bin/zkServer.sh --help’ got 0 exit code
- ran ‘/nix/store/g0fmbsp2n6sgh4fa9k6w2m3ndq9vhcxl-zookeeper-3.4.12/bin/zkServer.sh help’ got 0 exit code
- ran ‘/nix/store/g0fmbsp2n6sgh4fa9k6w2m3ndq9vhcxl-zookeeper-3.4.12/bin/zkCli.sh help’ got 0 exit code
- found 3.4.12 with grep in /nix/store/g0fmbsp2n6sgh4fa9k6w2m3ndq9vhcxl-zookeeper-3.4.12
- directory tree listing: https://gist.github.com/9a91124b15dbb7aa6469746b3edb67a9
---
 pkgs/servers/zookeeper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix
index c90684e0fe0d..c382061f1ef6 100644
--- a/pkgs/servers/zookeeper/default.nix
+++ b/pkgs/servers/zookeeper/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "zookeeper-${version}";
-  version = "3.4.11";
+  version = "3.4.12";
 
   src = fetchurl {
     url = "mirror://apache/zookeeper/${name}/${name}.tar.gz";
-    sha256 = "110fs5manyaq6rxbzwzs9x3aqw8d5l4177y9qaj3xhgpr2hniggn";
+    sha256 = "1fcljn2741jw1jvjrk5a0xr8rk69wjwrq522wrc5nmjhj0qzk1n6";
   };
 
   buildInputs = [ makeWrapper jre ];

From b4d9113fbf7ad3a09f5caa8f8fc4a9229128f1e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 2 May 2018 21:53:45 +0200
Subject: [PATCH 0983/3370] ncurses: Fix shared library extension on darwin

This fixes #36898
---
 pkgs/development/libraries/ncurses/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index abb3020e5fba..4c93faedccef 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -72,7 +72,9 @@ stdenv.mkDerivation rec {
   # When building a wide-character (Unicode) build, create backward
   # compatibility links from the the "normal" libraries to the
   # wide-character libraries (e.g. libncurses.so to libncursesw.so).
-  postFixup = ''
+  postFixup = let
+    abiVersion-extension = if stdenv.isDarwin then "${abiVersion}.$dylibtype" else "$dylibtype.${abiVersion}"; in
+  ''
     # Determine what suffixes our libraries have
     suffix="$(awk -F': ' 'f{print $3; f=0} /default library suffix/{f=1}' config.log)"
     libs="$(ls $dev/lib/pkgconfig | tr ' ' '\n' | sed "s,\(.*\)$suffix\.pc,\1,g")"
@@ -95,12 +97,12 @@ stdenv.mkDerivation rec {
         for dylibtype in so dll dylib; do
           if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then
             ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype
-            ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
+            ln -svf lib''${library}$suffix.${abiVersion-extension} $out/lib/lib$library$newsuffix.${abiVersion-extension}
             if [ "ncurses" = "$library" ]
             then
               # make libtinfo symlinks
               ln -svf lib''${library}$suffix.$dylibtype $out/lib/libtinfo$newsuffix.$dylibtype
-              ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/libtinfo$newsuffix.$dylibtype.${abiVersion}
+              ln -svf lib''${library}$suffix.${abiVersion-extension} $out/lib/libtinfo$newsuffix.${abiVersion-extension}
             fi
           fi
         done

From 48e44490e907d0bf978e7cf5188a5bdfcca44fc9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 2 May 2018 14:19:28 -0500
Subject: [PATCH 0984/3370] add cc-wrapper test variants for gcc7, gcc8, add to
 release.nix

---
 pkgs/top-level/all-packages.nix | 3 +++
 pkgs/top-level/release.nix      | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e994da039091..35af73051847 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6086,6 +6086,7 @@ with pkgs;
   };
 
   gcc7Stdenv = overrideCC gccStdenv gcc7;
+  gcc8Stdenv = overrideCC gccStdenv gcc8;
 
   wrapCCMulti = cc:
     if system == "x86_64-linux" then let
@@ -21390,6 +21391,8 @@ with pkgs;
   tests = recurseIntoAttrs {
     cc-wrapper = callPackage ../test/cc-wrapper { };
     cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; };
+    cc-wrapper-gcc7 = callPackage ../test/cc-wrapper { stdenv = gcc7Stdenv; };
+    cc-wrapper-gcc8 = callPackage ../test/cc-wrapper { stdenv = gcc8Stdenv; };
     cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; };
     cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
     cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3ea873cdc7ff..5233051cad83 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -107,6 +107,10 @@ let
 
               jobs.tests.cc-wrapper.x86_64-linux
               jobs.tests.cc-wrapper.x86_64-darwin
+              jobs.tests.cc-wrapper-gcc7.x86_64-linux
+              jobs.tests.cc-wrapper-gcc7.x86_64-darwin
+              jobs.tests.cc-wrapper-gcc8.x86_64-linux
+              jobs.tests.cc-wrapper-gcc8.x86_64-darwin
               jobs.tests.cc-wrapper-clang.x86_64-linux
               jobs.tests.cc-wrapper-clang.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx.x86_64-linux

From ca30c5e061ec794d42c78718e68993dd460af2bb Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 2 May 2018 15:02:29 -0500
Subject: [PATCH 0985/3370] Revert "Merge pull request #28206 from
 edef1c/net-dbus-list-units"

This reverts commit e508f0eec142c978f6b77bf96b3887471c7fc807, reversing
changes made to bead42df5d400aba2e8686988dc39ca0f1f9e131.
---
 .../activation/switch-to-configuration.pl     | 19 ++++++++++---------
 nixos/modules/system/activation/top-level.nix |  3 +--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 2ce04ed5342c..87a4ab2a586d 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 use File::Basename;
 use File::Slurp;
-use Net::DBus;
 use Sys::Syslog qw(:standard :macros);
 use Cwd 'abs_path';
 
@@ -68,15 +67,17 @@ EOF
 $SIG{PIPE} = "IGNORE";
 
 sub getActiveUnits {
-    my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1");
-    my $units = $mgr->ListUnitsByPatterns([], []);
+    # FIXME: use D-Bus or whatever to query this, since parsing the
+    # output of list-units is likely to break.
+    # Use current version of systemctl binary before daemon is reexeced.
+    my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`;
     my $res = {};
-    for my $item (@$units) {
-        my ($id, $description, $load_state, $active_state, $sub_state,
-            $following, $unit_path, $job_id, $job_type, $job_path) = @$item;
-        next unless $following eq '';
-        next if $job_id == 0 and $active_state eq 'inactive';
-        $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state };
+    foreach my $line (split '\n', $lines) {
+        chomp $line;
+        last if $line eq "";
+        $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
+        next if $1 eq "UNIT";
+        $res->{$1} = { load => $2, state => $3, substate => $4 };
     }
     return $res;
 }
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index f4af9a580fde..091a2e412eed 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -127,8 +127,7 @@ let
       configurationName = config.boot.loader.grub.configurationName;
 
       # Needed by switch-to-configuration.
-
-      perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
+      perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
   } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
 
   # Replace runtime dependencies

From 2cca7e686b56e366e3af61d2adf8f4c20a5eaf37 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 May 2018 19:35:58 +0200
Subject: [PATCH 0986/3370] rocket-errbot: fix hash

---
 pkgs/development/python-modules/rocket-errbot/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix
index 2d2b3af0694f..fac0780982db 100644
--- a/pkgs/development/python-modules/rocket-errbot/default.nix
+++ b/pkgs/development/python-modules/rocket-errbot/default.nix
@@ -12,7 +12,7 @@ buildPythonPackage rec {
   # remove with 1.2.6
   patches = [ (fetchpatch {
     url = "https://github.com/errbotio/rocket/pull/1.patch";
-    sha256 = "0v9zjp4ls32vkpr4b6kjflz4ny2fwj6hwshbnjmhdzc4hnmnzf7x";
+    sha256 = "1s668yv5b86b78vbqwhcl44k2l16c9bhk3199yy9hayf0vkxnwif";
   }) ];
 
   meta = {

From 646865afe2df8da768ee058bdf6b53b3757df881 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 2 May 2018 22:03:27 +0200
Subject: [PATCH 0987/3370] idea.*: bump

Closes #39873
---
 .../editors/jetbrains/default.nix             | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index aedfb1fec3de..3b3a9cde76c9 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -239,12 +239,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2018.1.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "170xgm3dzakvlwxx5kpy4zilq140kzcaxx9g3dm1w0i83g4l5j48"; /* updated by script */
+      sha256 = "158ydbr0bbzm1nqi4xhrcp6bwk7kmiw78v959h7bxg3y7z55hbwa"; /* updated by script */
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml
@@ -252,25 +252,25 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2017.3.7"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "1pmkv1yd8xwqa4kdffg0vvk3whmnvrs9js7vnq4ilm39zzksqmpa"; /* updated by script */
+      sha256 = "12rihb1ppl4i1i0j3yj4ih4qx3xf30kfx022pbvng1rjy0bpikp7"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
-    update-channel = "datagrip_2017_3";
+    update-channel = "datagrip_2018_1";
   };
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.1.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "11bkbh661fpypr1v89xba4nmf02l4map9jdlj2ky6d77l9295ip3"; /* updated by script */
+      sha256 = "1qhhxarvw6mzavyzackzkbq52yfr5437gljxdvlbr6rpi99hgfzb"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "goland_release";
@@ -304,25 +304,25 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2017.3.6"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "00g86fggh8wfm02k9wwn33yqmbfr2b1x3vnvyn9gdpycdk46lqgw"; /* updated by script */
+      sha256 = "13si8g7n1qvjm5ivbrazsbqlvwwlg65nia78k74nkaqp704z92cs"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
-    update-channel = "PS2017.3";
+    update-channel = "PS2018.1";
   };
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.1.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1s26jczag12p3v3r6fdk02mmg55npzn0mzkmgcvh40fr7q7mq2pr"; /* updated by script */
+      sha256 = "1phxzsz2qnyk0b0kkccsgjkxx4ak7rbm68k1lpgr59rwyxqnazy3"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm_Release";
@@ -330,12 +330,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.1.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0k7529xhhnvjz7ycs5ab4qc4cr35g1v2qxlswy1aqcgzh2zg4c85"; /* updated by script */
+      sha256 = "08cfmrrmxs67dc61cvjc0ynzng0hnr2i78fv3m888k4x63cy6mv5"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm_Release";
@@ -356,15 +356,15 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2017.3.4"; /* updated by script */
+    version = "2018.1.1"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "094m45jhrh4n64q5lrgfyvrimqjll6kcl2cx3cbsa3pp7x16abqn"; /* updated by script */
+      sha256 = "1nh2m10ikwl85n66aspkmgxmbk98amhlgj2xl2sasjfwn5pn1wmf"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
-    update-channel = "rm2017.3";
+    update-channel = "rm2018.1";
   };
 
   webstorm = buildWebStorm rec {

From ee08469d6cf45eaa9d592c097f154cd225fdb982 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 2 May 2018 15:31:37 -0500
Subject: [PATCH 0988/3370] darwin.libiconv: fix setup hook

---
 .../darwin/apple-source-releases/libiconv/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index d9b3dfb74049..aafc15429487 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -14,7 +14,7 @@ appleDerivation {
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib
   '';
 
-  setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh;
+  setupHook = ../../../../development/libraries/libiconv/setup-hook.sh;
 
   meta = {
     platforms = stdenv.lib.platforms.darwin;

From 5794d941362df79071ffc3155a0a6fabc5051b7e Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Wed, 2 May 2018 22:31:58 +0200
Subject: [PATCH 0989/3370] gcc8: made the remove-selftests patch more robust,
 removed old hash

---
 pkgs/development/compilers/gcc/8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 15b8b99c82f0..00b3f9447134 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -60,8 +60,8 @@ let version = "8.1.0";
          optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied
-        url = "https://git.busybox.net/buildroot/plain/package/gcc/7.1.0/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
-        sha256 = "0mrvxsdwip2p3l17dscpc1x8vhdsciqw1z5q9i6p5g9yg1cqnmgs";
+        url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02";
+        sha256 = ""; # TODO: uncomment and check hash when available.
       }) */
       ++ optional langFortran ../gfortran-driving.patch;
 

From 8322b43e8e7b36a0dcde6a76b33581185457baf0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 2 May 2018 15:35:12 -0500
Subject: [PATCH 0990/3370] Revert "darwin.libiconv: fix setup hook"

This reverts commit ee08469d6cf45eaa9d592c097f154cd225fdb982.

This one should go in staging first.
---
 .../darwin/apple-source-releases/libiconv/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index aafc15429487..d9b3dfb74049 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -14,7 +14,7 @@ appleDerivation {
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib
   '';
 
-  setupHook = ../../../../development/libraries/libiconv/setup-hook.sh;
+  setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh;
 
   meta = {
     platforms = stdenv.lib.platforms.darwin;

From 3513034208aac88004e4798020cb66540a77ddad Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 2 May 2018 15:31:37 -0500
Subject: [PATCH 0991/3370] darwin.libiconv: fix setup hook

---
 .../darwin/apple-source-releases/libiconv/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index a89f9fdf90ed..c67609e96755 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -14,7 +14,7 @@ appleDerivation {
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib
   '';
 
-  setup-hook = ../../../../development/libraries/libiconv/setup-hook.sh;
+  setupHook = ../../../../development/libraries/libiconv/setup-hook.sh;
 
   meta = {
     platforms = stdenv.lib.platforms.darwin;

From c7b21cd1911f880630102996b54956d19c974295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Wed, 2 May 2018 22:35:15 +0200
Subject: [PATCH 0992/3370] epeg: init at 0.9.1.042
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 pkgs/applications/graphics/epeg/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/graphics/epeg/default.nix

diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix
new file mode 100644
index 000000000000..02528a43e31b
--- /dev/null
+++ b/pkgs/applications/graphics/epeg/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchFromGitHub, pkgconfig, libtool, autoconf, automake
+, libjpeg, libexif
+}:
+
+stdenv.mkDerivation rec {
+  name = "epeg-0.9.1.042"; # version taken from configure.ac
+
+  src = fetchFromGitHub {
+    owner = "mattes";
+    repo = "epeg";
+    rev = "248ae9fc3f1d6d06e6062a1f7bf5df77d4f7de9b";
+    sha256 = "14ad33w3pxrg2yfc2xzyvwyvjirwy2d00889dswisq8b84cmxfia";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkgconfig libtool autoconf automake ];
+
+  propagatedBuildInputs = [ libjpeg libexif ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mattes/epeg;
+    description = "Insanely fast JPEG/ JPG thumbnail scaling";
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ nh2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a84..fcc6967b08fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15571,6 +15571,8 @@ with pkgs;
 
   epdfview = callPackage ../applications/misc/epdfview { };
 
+  epeg = callPackage ../applications/graphics/epeg/default.nix { };
+
   inherit (gnome3) epiphany;
 
   epic5 = callPackage ../applications/networking/irc/epic5 { };

From 1f52bfb67cfb0c2ceec862e1aab9f5667c9100ee Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 2 May 2018 22:46:01 +0200
Subject: [PATCH 0993/3370] libreoffice: wrapper: do not set SAL_USE_VCLPLUGIN
 for now

---
 pkgs/applications/office/libreoffice/wrapper.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/wrapper.sh b/pkgs/applications/office/libreoffice/wrapper.sh
index 52cd91e8030e..cff8f200e2bc 100644
--- a/pkgs/applications/office/libreoffice/wrapper.sh
+++ b/pkgs/applications/office/libreoffice/wrapper.sh
@@ -1,13 +1,13 @@
 #!@bash@/bin/bash
 export JAVA_HOME="${JAVA_HOME:-@jdk@}"
-export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
+#export SAL_USE_VCLPLUGIN="${SAL_USE_VCLPLUGIN:-gen}"
 
 if uname | grep Linux > /dev/null && 
        ! ( test -n "$DBUS_SESSION_BUS_ADDRESS" ); then
     dbus_tmp_dir="/run/user/$(id -u)/libreoffice-dbus"
     mkdir "$dbus_tmp_dir"
     dbus_socket_dir="$(mktemp -d -p "$dbus_tmp_dir")"
-    "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session"  >&2 &
+    "@dbus@"/bin/dbus-daemon --nopidfile --nofork --config-file "@dbus@"/share/dbus-1/session.conf --address "unix:path=$dbus_socket_dir/session"  &> /dev/null &
     export DBUS_SESSION_BUS_ADDRESS="unix:path=$dbus_socket_dir/session"
 fi
 

From 2cbaa1632691feadc0da66fd03f37b7f05bb58a6 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Wed, 2 May 2018 21:54:49 +0100
Subject: [PATCH 0994/3370] mono: create mono4 & mono5 aliases and fix
 gtk-sharp/pdfmod builds

---
 pkgs/top-level/all-packages.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20cf36a05fb..1320f472186b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4286,7 +4286,7 @@ with pkgs;
 
   fmodex = callPackage ../games/zandronum/fmod.nix { };
 
-  pdfmod = callPackage ../applications/misc/pdfmod { };
+  pdfmod = callPackage ../applications/misc/pdfmod { mono = mono4; };
 
   pdf-quench = callPackage ../applications/misc/pdf-quench { };
 
@@ -6712,7 +6712,9 @@ with pkgs;
 
   mlton = callPackage ../development/compilers/mlton { };
 
-  mono = mono58;
+  mono  = mono5;
+  mono5 = mono58;
+  mono4 = mono48;
 
   mono40 = lowPrio (callPackage ../development/compilers/mono/4.0.nix {
     inherit (darwin) libobjc;
@@ -9287,7 +9289,7 @@ with pkgs;
 
   gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
 
-  gnome-sharp = callPackage ../development/libraries/gnome-sharp {};
+  gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; };
 
   granite = callPackage ../development/libraries/granite { };
   elementary-cmake-modules = callPackage ../development/libraries/elementary-cmake-modules { };
@@ -9421,7 +9423,7 @@ with pkgs;
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };
 
-  hyena = callPackage ../development/libraries/hyena { };
+  hyena = callPackage ../development/libraries/hyena { mono = mono4; };
 
   icu58 = callPackage (import ../development/libraries/icu/58.nix fetchurl) ({
     nativeBuildRoot = buildPackages.icu58.override { buildRootOnly = true; };

From 4d7d53c78a1e5a932cb9507975672f5addc72586 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 14:14:52 -0700
Subject: [PATCH 0995/3370] man-pages: 4.15 -> 4.16

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/man-pages/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/15b3577e7c69b230dc911f5a85a66cc8
---
 pkgs/data/documentation/man-pages/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index ec58dfd77492..d050a15cb794 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
-  version = "4.15";
+  version = "4.16";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
-    sha256 = "01n1rq1kvambax85xamriawbga94mh63s5mgjmjljjgf50m7yw6f";
+    sha256 = "1d2d6llazg3inwjiz22cn46mbm5ydpbyh9qb55z4j3nm4w6wrzs7";
   };
 
   makeFlags = [ "MANDIR=$(out)/share/man" ];

From 14d5bbd67e461f4b07d733b57b3159098c1957b8 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 2 May 2018 17:28:02 -0400
Subject: [PATCH 0996/3370] linux-copperhead: 4.14.38.a -> 4.14.39.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
index 4d5cd07cd95c..a1c93e565905 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.14.38";
+  version = "4.14.39";
   revision = "a";
-  sha256 = "0cad9fp1h96blbgqlgxyv8wc0jg88mildc1ayljz0zpa5dxdfzh4";
+  sha256 = "19nx537a8kbbyp5d67anrqfw8i8hliw3yb1gyrf70isl3fqifjaa";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From f36a3e683601eec443a2ccb523bfd6493e5bf7ac Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 2 May 2018 17:28:15 -0400
Subject: [PATCH 0997/3370] linux-copperhead: 4.16.6.a -> 4.16.7.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
index a931d81cf265..9d4b729060ae 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.16.6";
+  version = "4.16.7";
   revision = "a";
-  sha256 = "0lkycpb837svrvyy04a8n2ix1rrzfl87ah5293mgf9jgy4kmaa2l";
+  sha256 = "1kdy3sqrn161hm5avhk3nd75p07a21ja0rzar3ybibh1bl2mc6zq";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From c7e11a28dce73ecf13e53ce48e83096064700cb8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 May 2018 14:43:49 -0700
Subject: [PATCH 0998/3370] visualvm: 1.4 -> 1.4.1 (#39721)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/visualvm/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.1 with grep in /nix/store/a6lr7j812ja6z31lzkpr2j2hf6wc842c-visualvm-1.4.1
- directory tree listing: https://gist.github.com/40c8f8eac649d32dcacc80c5e64dd0fe
---
 pkgs/development/tools/java/visualvm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix
index 2eeefb23e042..2a707e35b918 100644
--- a/pkgs/development/tools/java/visualvm/default.nix
+++ b/pkgs/development/tools/java/visualvm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gtk2, gawk }:
 
 stdenv.mkDerivation rec {
-  version = "1.4";
+  version = "1.4.1";
   name = "visualvm-${version}";
 
   src = fetchzip {
     url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""]  version}.zip";
-    sha256 = "0qpkal3yc8c8di4dmdglq54a4m7hciqximn5n6hwx2zqnfwx909z";
+    sha256 = "10ciyggf8mcy3c53shpl03fxqwsa2ilgw3xdgqhb1ah151k18p78";
   };
 
   desktopItem = makeDesktopItem {

From 6fc670b00d36300c5b000d5c735f2796810a4c0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 14:09:00 -0700
Subject: [PATCH 0999/3370] libsass: 3.5.3 -> 3.5.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libsass/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.5.4 with grep in /nix/store/xyyfnl8z6bsziqyibdk7am96h1dz8yiz-libsass-3.5.4
- directory tree listing: https://gist.github.com/68655a774ee14cf658d685eec8c1ab27
---
 pkgs/development/libraries/libsass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix
index 3afe0e905e74..8168ff0edae4 100644
--- a/pkgs/development/libraries/libsass/default.nix
+++ b/pkgs/development/libraries/libsass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libsass-${version}";
-  version = "3.5.3";
+  version = "3.5.4";
 
   src = fetchurl {
     url = "https://github.com/sass/libsass/archive/${version}.tar.gz";
-    sha256 = "1lfdq2ahskf9yd0m71jlx3r4n6a0dhg4wxpnwbrvj2a23k7db7zi";
+    sha256 = "0w47hvzmbdpbjx8j83wn8dwcvglpab8abkszf9xfzrpqvb6wnqaz";
   };
 
   patchPhase = ''

From 8013b38de67a5635b4889c42f1c41a6cb336d1b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 14:00:05 -0700
Subject: [PATCH 1000/3370] libnetfilter_conntrack: 1.0.6 -> 1.0.7

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libnetfilter_conntrack/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.7 with grep in /nix/store/05vjszwxnlqg6vhwm32ahsi1lri60hwq-libnetfilter_conntrack-1.0.7
- directory tree listing: https://gist.github.com/36bdb6f33ffd72101417b81a2251914f
---
 pkgs/development/libraries/libnetfilter_conntrack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 1b4c471a2567..41245e6539f4 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libnetfilter_conntrack-${version}";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
-    sha256 = "1svzyf3rq9nbrcw1jsricgyhh7x1am8iqn6kjr6mzrw42810ik7g";
+    sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k";
   };
 
   buildInputs = [ libmnl ];

From 8936f8f242fd268f0ff8d9a8e99f4310c64ffdb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 2 May 2018 22:41:06 +0200
Subject: [PATCH 1001/3370] sqsh: Fix darwin build

---
 pkgs/development/tools/sqsh/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix
index f7628cf181c5..d1b1c84a3136 100644
--- a/pkgs/development/tools/sqsh/default.nix
+++ b/pkgs/development/tools/sqsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, freetds, readline }:
+{ stdenv, fetchurl, autoreconfHook, freetds, readline, libiconv }:
 
 let
   mainVersion = "2.5";
@@ -17,11 +17,13 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace src/cmd_connect.c \
       --replace CS_TDS_80 CS_TDS_73
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace configure --replace "libct.so" "libct.dylib"
   '';
 
   enableParallelBuilding = true;
 
-  buildInputs = [ freetds readline ];
+  buildInputs = [ freetds readline libiconv ];
 
   nativeBuildInputs = [ autoreconfHook ];
 

From 470b48f31e463a9083c8ba90bc4bdf0e12b8e471 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 15:19:20 -0700
Subject: [PATCH 1002/3370] libbson: 1.9.4 -> 1.9.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libbson/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.9.5 with grep in /nix/store/lmn0g67a9wq9f8mg7v2afh111gmsbv6c-libbson-1.9.5
- directory tree listing: https://gist.github.com/ef0187572a2c4e53759a875695c4d6ea
---
 pkgs/development/libraries/libbson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix
index 6b370f46e70d..6244c3a351e7 100644
--- a/pkgs/development/libraries/libbson/default.nix
+++ b/pkgs/development/libraries/libbson/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libbson-${version}";
-  version = "1.9.4";
+  version = "1.9.5";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "libbson";
     rev = version;
-    sha256 = "01lyikbpqky1ib8g4vhwpb5rjwyzm6g1z24z8m73lk4vcdl65190";
+    sha256 = "16rmzxhhmbvhp4q6qac5j9c74z2pcg5raag5w16mynzikdd2l05b";
   };
 
   nativeBuildInputs = [ cmake ];

From e9c38095c620fd03f023d14bd10efab792f348f9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 13:33:46 -0700
Subject: [PATCH 1003/3370] libnftnl: 1.0.9 -> 1.1.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libnftnl/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.1.0 with grep in /nix/store/y9gq6j60kx9ya2aj2wgbfc73siq6fhn6-libnftnl-1.1.0
- directory tree listing: https://gist.github.com/c99e0a7414adaa7a40543678fd581602
---
 pkgs/development/libraries/libnftnl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix
index ad8c7626661e..6570d1eb3c0e 100644
--- a/pkgs/development/libraries/libnftnl/default.nix
+++ b/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.9";
+  version = "1.1.0";
   name = "libnftnl-${version}";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/libnftnl/files/${name}.tar.bz2";
-    sha256 = "0d9nkdbdck8sg6msysqyv3m9kjr9sjif5amf26dfa0g3mqjdihgy";
+    sha256 = "0v4gywcjvv2vg4zk632al1zv3ad0lx87nshynv110l8n3fhsq3pc";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 2e16074180dc5f7403ed9b9039b9064e114a8e70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 14:36:13 -0700
Subject: [PATCH 1004/3370] imagemagick7: 7.0.7-27 -> 7.0.7-29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/imagemagick/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick-script -h’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick-script --help’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick -h’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick --help’ got 0 exit code
- ran ‘/nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29/bin/magick help’ got 0 exit code
- found 7.0.7-29 with grep in /nix/store/sjpf6fsvmv7aj4x1ngl8ri423cym07cj-imagemagick-7.0.7-29
- directory tree listing: https://gist.github.com/12ed56d2de915ea05dcb89d5486181f8
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 410c74ac6cfa..65a3238ef571 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-27";
-    sha256 = "04v7m1s2a89xi57fpxbq30hzxqg3fawr3lms6wfmaq4j2ax0qw6k";
+    version = "7.0.7-29";
+    sha256 = "0jfpfydz50zxs776knz6w2f5g0l4nhivp9g1fz4cf5clgjcpa3z6";
     patches = [];
   };
 in

From 7a4e98eefef777632f6a2546699fcefa0b90976d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 15:08:30 -0700
Subject: [PATCH 1005/3370] insomnia: 5.16.0 -> 5.16.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/insomnia/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.16.1 with grep in /nix/store/ipbmvgywl4835c6ryl95nigfz2cvmkd7-insomnia-5.16.1
- directory tree listing: https://gist.github.com/97908578657058f7b3c2b72b2988dcd4

Closes #39890

Co-authored-by: Robin Gloster <mail@glob.in>
---
 pkgs/development/web/insomnia/default.nix | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 9a4aaaad3ced..4e5596fee661 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -1,12 +1,9 @@
-{ stdenv, lib, makeWrapper, fetchurl, dpkg,
-
-  alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk2-x11,
-  nspr, nss,
-
-  libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr,
-  libXrender, libXtst, libxcb,
-
-  libudev0-shim, glibc, curl, openssl
+{ stdenv, lib, makeWrapper, fetchurl, dpkg
+, alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype
+, gdk_pixbuf, glib, gnome2, gtk2-x11, nspr, nss
+, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
+, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
+, libudev0-shim, glibc, curl, openssl
 }:
 
 let
@@ -15,14 +12,14 @@ let
     gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
     libXi libXrandr libXrender libXtst libxcb
   ];
-  runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl ];
+  runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "5.16.0";
+  version = "5.16.1";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1cpw63ibxaa08vms7fbxr5ap2yh4vcl8q3rjfn0ag1zkimz8cg2p";
+    sha256 = "0r1l7pfcnif8vw9jnxbh5p9sih6wvgjpx8rpfmnvw21pr8cm0zyp";
   };
 
   nativeBuildInputs = [ makeWrapper dpkg ];

From b2e9f0fd37c894209daf1c1d17b64332ebfeb6b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Thu, 3 May 2018 00:06:04 +0200
Subject: [PATCH 1006/3370] salt: Fix build

We use tornado-4.x until https://github.com/saltstack/salt/issues/45790
is resolved.
---
 pkgs/tools/admin/salt/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 4077c4fb9ecb..3bef66597353 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -6,6 +6,17 @@
   extraInputs ? []
 }:
 
+let
+  # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved
+  tornado = python2Packages.tornado.overridePythonAttrs (oldAttrs: rec {
+    version = "4.5.3";
+    name = "${oldAttrs.pname}-${version}";
+    src = oldAttrs.src.override {
+      inherit version;
+      sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d";
+    };
+  });
+in
 python2Packages.buildPythonApplication rec {
   pname = "salt";
   version = "2017.7.4";

From 51c13292bd413614a981fb4381ac8063baed14ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 15:34:35 -0700
Subject: [PATCH 1007/3370] iosevka: 1.14.1 -> 1.14.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/iosevka/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.14.2 with grep in /nix/store/57g5hfljvvnlp3pzvvg16rxp8izrdh7q-iosevka-1.14.2
- directory tree listing: https://gist.github.com/36df1a4bd1bda5184b07e7bbd902e1b4
---
 pkgs/data/fonts/iosevka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index ad2485dc4b8c..657eb80c5392 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -26,13 +26,13 @@ in
 let pname = if set != null then "iosevka-${set}" else "iosevka"; in
 
 let
-  version = "1.14.1";
+  version = "1.14.2";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "be5invis";
     repo ="Iosevka";
     rev = "v${version}";
-    sha256 = "0m6kj1zfv9w6lyykhsfqdx2a951k8qa76licqikz5spm13n22z43";
+    sha256 = "18vh5rjffqgiliyfia40lh7cygz6fv3rwgq28fxl26i9sc95qsqd";
   };
 in
 

From 59c22bf3a12f4187169e9c1fcb741cc7556b2b7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 16:04:31 -0700
Subject: [PATCH 1008/3370] go: 1.10.1 -> 1.10.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/go/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/w2wgdl5ljbx1fq6iwlavrl4nzbchq954-go-1.10.2/bin/.go-wrapped help’ got 0 exit code
- ran ‘/nix/store/w2wgdl5ljbx1fq6iwlavrl4nzbchq954-go-1.10.2/bin/go help’ got 0 exit code
- found 1.10.2 with grep in /nix/store/w2wgdl5ljbx1fq6iwlavrl4nzbchq954-go-1.10.2
- directory tree listing: https://gist.github.com/249bfa4dc4d10281576f20de902e501a
---
 pkgs/development/compilers/go/1.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix
index 69184744307d..a6639d643dcf 100644
--- a/pkgs/development/compilers/go/1.10.nix
+++ b/pkgs/development/compilers/go/1.10.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "go-${version}";
-  version = "1.10.1";
+  version = "1.10.2";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "go";
     rev = "go${version}";
-    sha256 = "1wqwy52ibb343a4v7b9q26xa6r5jk4khfxd90wbpcayws8cxly8m";
+    sha256 = "1lbxnlj5l9i8k1dg33dh8ndx9vspk9dkpcbg06jbbswy6kadmx6f";
   };
 
   # perl is used for testing go vet

From 8b4d3ed1ef94ef08f654d50451e10fbc7a69b390 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 16:12:39 -0700
Subject: [PATCH 1009/3370] groonga: 8.0.1 -> 8.0.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/groonga/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-suggest-create-dataset -h’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-suggest-create-dataset --help’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga -h’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga --help’ got 0 exit code
- ran ‘/nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2/bin/groonga-httpd -h’ got 0 exit code
- found 8.0.2 with grep in /nix/store/av4a5br78r73h7r6mlbqg3zxi9lksskq-groonga-8.0.2
- directory tree listing: https://gist.github.com/9a3a3eb436d26334ce117be25e74b45c
---
 pkgs/servers/search/groonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index 063ad8c3f576..a4b2418f58c9 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "8.0.1";
+  version = "8.0.2";
 
   src = fetchurl {
     url    = "http://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "074r71dcv1l8rm6an7b8iyfpcxbk00iysmzszssknqg8mrqvsphg";
+    sha256 = "0bsf4dbgbddij49xg6d6kl9kb1m5ywdyc1w1xz2giisqk1hdwsz4";
   };
 
   buildInputs = with stdenv.lib;

From bf762d13e3135c4daf963b19ed1a8e13155c1b95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 16:33:55 -0700
Subject: [PATCH 1010/3370] dbus: 1.12.6 -> 1.12.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dbus/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-monitor --help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-update-activation-environment help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets -h’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets --help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-cleanup-sockets help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-run-session -h’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-run-session --help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-uuidgen --help’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-launch -h’ got 0 exit code
- ran ‘/nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8/bin/dbus-launch --help’ got 0 exit code
- found 1.12.8 with grep in /nix/store/q2p724wzbngs5qrv96s2mny5bhsnm3jk-dbus-1.12.8
- directory tree listing: https://gist.github.com/598fa486a7a2da2a0887e0899dd2ed27
---
 pkgs/development/libraries/dbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 55484b85a8e6..4f6bd829099f 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.12.6";
-  sha256 = "05picaq8j60wlwyi84qvw5liw3nd0cws9va3krnc3pms0wm906v2";
+  version = "1.12.8";
+  sha256 = "1cvfi7jiby12h0f5gbysphhk99m6mch87ab3cqxkj0w36gkrkp72";
 
 self = stdenv.mkDerivation {
     name = "dbus-${version}";

From 12b78da1967df6761aeceb346c94ca0931d11014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 2 May 2018 21:09:14 -0300
Subject: [PATCH 1011/3370] terminology: 1.1.1 -> 1.2.0

- Update to version 1.2.0
- Switch build tools from autotools to meson
---
 pkgs/desktops/enlightenment/terminology.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 3a52707fcf4c..1a15092c7e77 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, efl, pcre, makeWrapper }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa_noglu, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "05ncxvzb9rzkyjvd95hzn8lswqdwr8cix6rd54nqn9559jibh4ns";
+    sha256 = "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx";
   };
 
   nativeBuildInputs = [
+    meson
+    ninja
     (pkgconfig.override { vanilla = true; })
     makeWrapper
   ];
@@ -17,11 +19,12 @@ stdenv.mkDerivation rec {
   buildInputs = [
     efl
     pcre
+    mesa_noglu
   ];
 
   meta = {
-    description = "The best terminal emulator written with the EFL";
-    homepage = http://enlightenment.org/;
+    description = "Powerful terminal emulator based on EFL";
+    homepage = https://www.enlightenment.org/about-terminology;
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.bsd2;
     maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ];

From 380c91ddfb58aef60d06d6b3c481eb0ad4c4a532 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Tue, 1 May 2018 23:33:06 +0100
Subject: [PATCH 1012/3370] libtorrent-rasterbar: 1.1.6 -> 1.1.7

Also remove the default/generic split as it seems there's only one
version anyway.
---
 .../libtorrent-rasterbar/default.nix          | 41 +++++++++++++++---
 .../libtorrent-rasterbar/generic.nix          | 43 -------------------
 2 files changed, 36 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/development/libraries/libtorrent-rasterbar/generic.nix

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 00ec22986179..e3b8024615be 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
@@ -1,6 +1,37 @@
-args@{ callPackage, ... }:
+{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
 
-callPackage (import ./generic.nix {
-  version = "1.1.6";
-  sha256 = "1xlh0sqypjbx0imw3bkbjwgwb4bm6zl7c0y01p0xsw8ncfmwjll7";
-}) args
+stdenv.mkDerivation rec {
+  name = "libtorrent-rasterbar-${version}";
+  version = "1.1.7";
+
+  src =
+    let formattedVersion = lib.replaceChars ["."] ["_"] version;
+    in fetchurl {
+      url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
+      sha256 = "0vbw7wcw8x9787rq5fwaibpvvspm3237l8ahbf20gjpzxhn4yfwc";
+    };
+
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+  buildInputs = [ boost openssl zlib python libiconv geoip ];
+
+  preConfigure = "./autotool.sh";
+
+  configureFlags = [
+    "--enable-python-binding"
+    "--with-libgeoip=system"
+    "--with-libiconv=yes"
+    "--with-boost=${boost.dev}"
+    "--with-boost-libdir=${boost.out}/lib"
+    "--with-libiconv=yes"
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.rasterbar.com/products/libtorrent/;
+    description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
deleted file mode 100644
index 8c85864f87a5..000000000000
--- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-# Version specific options
-{ version, sha256, patches ? [] }:
-
-{ stdenv, fetchurl, automake, autoconf, boost, openssl, lib, libtool, pkgconfig, zlib, python, libiconv, geoip, ... }:
-
-let formattedVersion = lib.replaceChars ["."] ["_"] version;
-
-in
-
-stdenv.mkDerivation rec {
-  name = "libtorrent-rasterbar-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/arvidn/libtorrent/archive/libtorrent-${formattedVersion}.tar.gz";
-    inherit sha256;
-  };
-
-  inherit patches;
-
-  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
-  buildInputs = [ boost openssl zlib python libiconv geoip ];
-
-  preConfigure = "./autotool.sh";
-
-  configureFlags = [ 
-    "--enable-python-binding"
-    "--with-libgeoip=system"
-    "--with-libiconv=yes"
-    "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.out}/lib"
-    "--with-libiconv=yes"
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.rasterbar.com/products/libtorrent/;
-    description = "A C++ BitTorrent implementation focusing on efficiency and scalability";
-    license = licenses.bsd3;
-    maintainers = [ maintainers.phreedom ];
-    platforms = platforms.unix;
-  };
-}

From 89b1eaa92b836628e8c8b7c5c0c19c51e6e14abb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 17:30:02 -0700
Subject: [PATCH 1013/3370] altcoins.bitcoin-abc: 0.17.0 -> 0.17.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bitcoin-abc/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoind -h’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoind --help’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-cli -h’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-cli --help’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-tx -h’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-tx --help’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/test_bitcoin --help’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-qt -h’ got 0 exit code
- ran ‘/nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1/bin/bitcoin-qt --help’ got 0 exit code
- found 0.17.1 with grep in /nix/store/ck5kx81a87c9ha625lhrfxj25s9lb31a-bitcoin-abc-0.17.1
- directory tree listing: https://gist.github.com/011ceeb08c6986692052c6b32e5f0577
---
 pkgs/applications/altcoins/bitcoin-abc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-abc.nix b/pkgs/applications/altcoins/bitcoin-abc.nix
index 35488732117d..bd365e167304 100644
--- a/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "1s2y29h2q4fnbrfg2ig1cd3h7g3kdcdyrfq7znq1ndnh8xj1j489";
+    sha256 = "1kq9n3s9vhkmfaizsyi2cb91ibi06gb6wx0hkcb9hg3nrrvcka3y";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];

From ef30e659812ec1ad6e7c093c2ea99476679e45f6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 2 May 2018 19:32:12 -0500
Subject: [PATCH 1014/3370] gllvm: 2018-04-28 -> 1.2.0

First tagged release! \o/
---
 pkgs/development/tools/gllvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index da8f90cd9406..470ba291825a 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -2,15 +2,15 @@
 
 buildGoPackage rec {
   name = "gllvm-${version}";
-  version = "2018-04-28"; # ~= 1.0.2, but no release tags yet
+  version = "1.2.0";
 
   goPackagePath = "github.com/SRI-CSL/gllvm";
 
   src = fetchFromGitHub {
     owner = "SRI-CSL";
     repo = "gllvm";
-    rev = "7755cdabb9bd2c5115059c13dce986e4e38f624e";
-    sha256 = "0a7mzmshyl4m216cxnar0pzjq98n2678x0czqfxgfdga55xp5frl";
+    rev = "v${version}";
+    sha256 = "0779828kzw9ihdnw5r3h2fzzd8ml8cskyf5hmaqqksinjb7bm3is";
   };
 
   meta = with stdenv.lib; {

From d76ac2707bd0729d73909b7d4f0ef4f4687a7224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 2 May 2018 22:29:46 -0300
Subject: [PATCH 1015/3370] enlightenment: add dependency on mesa_noglu

---
 pkgs/desktops/enlightenment/enlightenment.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index 9b782b94f7ff..b0fd5f3db2b2 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
   xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
-  luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU,
+  luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, mesa_noglu,
   xkeyboard_config, pcre
 }:
 
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
     libpthreadstubs
     gdbm
     pcre
+    mesa_noglu
   ] ++
     stdenv.lib.optionals stdenv.isLinux [ libcap ];
 

From 4680fe67dbe1e24436d2e6030b26af1791ceec30 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Thu, 3 May 2018 12:12:48 +1000
Subject: [PATCH 1016/3370] haskellPackages.blank-canvas: 0.6.3 -> 0.6.2

blank-canvas-0.6.3 depends on base-compat-batteries-0.10, which
depends on base-compat-0.10. This conflicts with the rest of the LTS
set, which uses base-compat-0.9. No base-compat-batteries-0.9 exists.

blank-canvas-0.6.2 only depends on base-compat >= 0.8 && < 0.10.
---
 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 6b18694dc8d1..c602d312a3bb 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2398,6 +2398,7 @@ extra-packages:
   - aws ^>= 0.18                        # pre-lts-11.x versions neeed by git-annex 6.20180227
   - binary > 0.7 && < 0.8               # keep a 7.x major release around for older compilers
   - binary > 0.8 && < 0.9               # keep a 8.x major release around for older compilers
+  - blank-canvas < 0.6.3                # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*
   - Cabal == 1.18.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.20.*                     # required for cabal-install et al on old GHC versions
   - Cabal == 1.24.*                     # required for jailbreak-cabal etc.

From aafe5fb246a306732584cd10b3c6e6e47ad5954d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 20:50:42 -0700
Subject: [PATCH 1017/3370] aws-sdk-cpp: 1.4.33 -> 1.4.40

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/aws-sdk-cpp/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.4.40 with grep in /nix/store/gd2sihwpr8xipj6k5ych7gzj6024kc54-aws-sdk-cpp-1.4.40
- directory tree listing: https://gist.github.com/559971e38c15ec82c70c6d9f6f785465
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 0ab102a5ec43..18aeef04a770 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.4.33";
+  version = "1.4.40";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "0fl4m3vsycd35gkrrlqsjlv0myh12bgb0jg3pm548l19qwrc0pm7";
+    sha256 = "16n5p29pf062mfsn7q8q8hw0ppxb02a0kkakd0vjrybqflpgf42j";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From d98146985cab9756e39cc5eeec5503175f9ba644 Mon Sep 17 00:00:00 2001
From: Ben Creasy <bcreasy@brightidea.com>
Date: Wed, 2 May 2018 21:57:10 -0700
Subject: [PATCH 1018/3370] vim-utils: update plugin generation instruction

Currently the pager is a problem but in general fetching
all these plugins is inefficient for the general case.
---
 pkgs/misc/vim-plugins/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 0134d5fae48a..163a1a986760 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -21,7 +21,9 @@ in
 # TL;DR
 # Add your plugin to ./vim-plugin-names
 # Regenerate via `nix-shell -I nixpkgs=/path/to/your/local/fork -p vimPlugins.pluginnames2nix --command "vim-plugin-names-to-nix +'w result' +qall"`
-# Copy the generated expression(s) into this file.
+# Note: pluginnames2nix will fetch any plugins in the file; to speed up the process,
+#       update ./vim-plugin-names to contain only plugins which need generation
+# Copy the generated expression(s) into this file from the ./result file.
 # If plugin is complicated then make changes to ./vim2nix/additional-nix-code
 
 # This attrs contains two sections:

From 3216cf6cdf5a9d0e77af10add1a9cd5c0d6106c2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 00:32:44 -0500
Subject: [PATCH 1019/3370] trash-cli: cleanup

Use wrapper instead of patch.
---
 pkgs/tools/misc/trash-cli/default.nix     | 23 ++++++++++----------
 pkgs/tools/misc/trash-cli/nix-paths.patch | 26 -----------------------
 2 files changed, 12 insertions(+), 37 deletions(-)
 delete mode 100644 pkgs/tools/misc/trash-cli/nix-paths.patch

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 77308ecf2ed8..7be2e3fc61d7 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,7 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, coreutils
-, python3, python3Packages, substituteAll }:
-
-assert stdenv.isLinux;
+{ stdenv, fetchFromGitHub, fetchpatch, python3, python3Packages
+, lib, makeWrapper, coreutils }:
 
 python3Packages.buildPythonApplication rec {
   name = "trash-cli-${version}";
@@ -16,12 +14,6 @@ python3Packages.buildPythonApplication rec {
   };
 
   patches = [
-    (substituteAll {
-      src = ./nix-paths.patch;
-      df = "${coreutils}/bin/df";
-      libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
-    })
-
     # Fix build on Python 3.6.
     (fetchpatch {
       url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch";
@@ -30,10 +22,19 @@ python3Packages.buildPythonApplication rec {
   ];
 
   buildInputs = with python3Packages; [ nose mock ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  preFixup = ''
+    for bin in $out/bin/*; do
+      wrapProgram $bin \
+        --prefix PATH : ${lib.makeBinPath [ coreutils ]} \
+        --prefix DYLD_LIBRARY_PATH : ${lib.makeSearchPath "lib" (lib.optional (stdenv.hostPlatform.libc == "glibc") (lib.getDev stdenv.cc.libc))}
+    done
+  '';
 
   checkPhase = "nosetests";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/andreafrancia/trash-cli;
     description = "Command line tool for the desktop trash can";
     maintainers = [ maintainers.rycee ];
diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch
deleted file mode 100644
index d7b485eec158..000000000000
--- a/pkgs/tools/misc/trash-cli/nix-paths.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/trashcli/list_mount_points.py	2014-12-23 10:10:43.808470486 +0100
-+++ a/trashcli/list_mount_points.py	2014-12-23 10:19:04.954796457 +0100
-@@ -12,7 +12,7 @@ def mount_points_from_getmnt():
- 
- def mount_points_from_df():
-     import subprocess
--    df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout
-+    df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout
-     return list(_mount_points_from_df_output(df_output))
- 
- def _mount_points_from_df_output(df_output):
-@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() :
-                     ("mnt_freq", c_int),       # Dump frequency (in days).
-                     ("mnt_passno", c_int)]     # Pass number for `fsck'.
- 
--    if sys.platform == "cygwin":
--        libc_name = "cygwin1.dll"
--    else:
--        libc_name = find_library("c")
--
--    if libc_name == None :
--        libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0
-+    libc_name = "@libc@"
- 
-     libc = cdll.LoadLibrary(libc_name)
-     libc.getmntent.restype = POINTER(mntent_struct)

From 4d6a14e915b8e2f4142eaf54c225bbce0d75dd87 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 3 May 2018 10:11:56 +0200
Subject: [PATCH 1020/3370] youtubeDL: 2018.04.25 -> 2018.05.01

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 55c785b06da0..d2e490373da0 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   pname = "youtube-dl";
-  version = "2018.04.25";
+  version = "2018.05.01";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw";
+    sha256 = "1mpyqdyjip5a6nn8lj1kaaab4pj75js6i8qzgap8bmn0k46awb1n";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 130aee566d8348649bd31311752809a46b314acf Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 3 May 2018 10:34:35 +0200
Subject: [PATCH 1021/3370] gnupg: 2.2.6 -> 2.2.7

See http://lists.gnu.org/archive/html/info-gnu/2018-05/msg00004.html for
release informations.
---
 pkgs/tools/security/gnupg/22.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix
index 87dcbe4e7066..0f575d748b6c 100644
--- a/pkgs/tools/security/gnupg/22.nix
+++ b/pkgs/tools/security/gnupg/22.nix
@@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
 stdenv.mkDerivation rec {
   name = "gnupg-${version}";
 
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "110rf476l3cgn52gh9ia5y0y06y2ialq9dqc12jkhnfhl9gqqkg6";
+    sha256 = "0vlpis0q7gvq9mhdc43hkyn3cdriz4mwgj20my3gyzpgwqg3cnyr";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 46aa5200f4c195d74dac6d7d6335340b97f2c03e Mon Sep 17 00:00:00 2001
From: Christian Kauhaus <kc@flyingcircus.io>
Date: Thu, 3 May 2018 11:00:48 +0200
Subject: [PATCH 1022/3370] vulnix: 1.6.1 -> 1.6.3

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

diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix
index dbb42c2bef42..70640563aa31 100644
--- a/pkgs/tools/security/vulnix/default.nix
+++ b/pkgs/tools/security/vulnix/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "vulnix";
-  version = "1.6.1";
+  version = "1.6.3";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0j6v6phq3naqnpvzxxnynsyv9y7bhig1gzvg594qpknqgyzj16bf";
+    sha256 = "0ia71l0210dgcxf63bg07csx40nmpdghr4mszz91qrri7lsa5qqi";
   };
 
   buildInputs = [ ronn ];

From ada2fc088cef052eb0071e0c226a7f0bb00bd0b5 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 2 May 2018 17:01:30 +0200
Subject: [PATCH 1023/3370] gcc49: backport retpoline support

To mitigate Spectre Variant 2, GCC needs to have retpoline
support (-mindirect-branch and -mfunction-return arguments on amd64
and i386).

Patches were pulled from H.J. Lu's backport branch to
4.9 (hjl/indirect/gcc-4_9-branch), available at
https://github.com/hjl-tools/gcc/tree/hjl/indirect/gcc-4_9-branch/master. Upstream
GCC does not apply patches to anything older than the
gcc-6-branch. H.J. Lu is the author of the upstream retpoline commits
as well.

Several Linux distributions already backported these patches to GCC 4
branches and some old kernels (3.13 for instance) have been recompiled
with these GCC patches. These kernels only allow to load kernel
modules that are compiled with the retpoline support.

References:
- Ubuntu bug: https://bugs.launchpad.net/ubuntu/+source/gcc-4.8/+bug/1749261
- Ubuntu package: https://launchpad.net/ubuntu/+source/gcc-4.8/4.8.4-2ubuntu1~14.04.4

Fixes #38394
---
 pkgs/development/compilers/gcc/4.9/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index fb82eee4ab85..fc9e72812501 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPackages, fetchurl, noSysDirs
+{ stdenv, targetPackages, fetchurl, noSysDirs, fetchpatch
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
@@ -65,7 +65,21 @@ let version = "4.9.4";
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langFortran ../gfortran-driving.patch
       ++ [ ../struct-ucontext.patch ../struct-sigaltstack-4.9.patch ] # glibc-2.26
-      ;
+      # Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits)
+      ++ builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;})
+         [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; }
+          { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; }
+          { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; }
+          { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; }
+          { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; }
+          { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; }
+          { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; }
+          { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; }
+          { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; }
+          { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; }
+          { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; }
+          { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; }
+          { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }];
 
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at

From f7abcb0752c044c59766d53dc48a28d213214fb7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 3 May 2018 11:08:25 +0100
Subject: [PATCH 1024/3370] fetchs3: allow to name the derivation output
 (#39823)

* fetchs3: add configurable name

Change the default from "foo" to the basename of the s3 URL and make it
configurable.

* fetchs3: fix error on missing credentials.session_token

The session token should default to null instead of failing

* fetchs3: make use of the region argument

Set it to null if you don't want to use it

* fetchs3: prefer local build

Fetcher-types spend more time on network than CPU
---
 pkgs/build-support/fetchs3/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchs3/default.nix b/pkgs/build-support/fetchs3/default.nix
index e6b7a3418c0c..14dac9997d94 100644
--- a/pkgs/build-support/fetchs3/default.nix
+++ b/pkgs/build-support/fetchs3/default.nix
@@ -1,6 +1,7 @@
 { stdenvNoCC, runCommand, awscli }:
 
 { s3url
+, name ? builtins.baseNameOf s3url
 , sha256
 , region ? "us-east-1"
 , credentials ? null # Default to looking at local EC2 metadata service
@@ -10,16 +11,23 @@
 }:
 
 let
-  credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) {
-    AWS_ACCESS_KEY_ID = credentials.access_key_id;
-    AWS_SECRET_ACCESS_KEY = credentials.secret_access_key;
-    AWS_SESSION_TOKEN = credentials.session_token ? null;
+  mkCredentials = { access_key_id, secret_access_key, session_token ? null }: {
+    AWS_ACCESS_KEY_ID = access_key_id;
+    AWS_SECRET_ACCESS_KEY = secret_access_key;
+    AWS_SESSION_TOKEN = session_token;
   };
-in runCommand "foo" ({
+
+  credentialAttrs = stdenvNoCC.lib.optionalAttrs (credentials != null) (mkCredentials credentials);
+in runCommand name ({
   nativeBuildInputs = [ awscli ];
+
   outputHashAlgo = "sha256";
   outputHash = sha256;
   outputHashMode = if recursiveHash then "recursive" else "flat";
+
+  preferLocalBuild = true;
+
+  AWS_DEFAULT_REGION = region;
 } // credentialAttrs) (if postFetch != null then ''
   downloadedFile="$(mktemp)"
   aws s3 cp ${s3url} $downloadedFile

From d21ff87160cfde2db368622a8044006391cae60a Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Thu, 3 May 2018 13:07:19 +0200
Subject: [PATCH 1025/3370] gcc8: Removed java as a target language

---
 pkgs/development/compilers/gcc/8/default.nix | 67 +++-----------------
 1 file changed, 8 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 00b3f9447134..16636f04982b 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -2,23 +2,22 @@
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
-, langJava ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
 , enableShared ? true
 , texinfo ? null
-, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, perl ? null # optional, for texi2pod (then pod2man)
 , gmp, mpfr, libmpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
 , isl ? null # optional, for the Graphite optimization framework.
-, zlib ? null, boehmgc ? null
-, zip ? null, unzip ? null, pkgconfig ? null
+, zlib ? null
+, pkgconfig ? null
 , gtk2 ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
-, x11Support ? langJava
+, x11Support ? false
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
@@ -33,10 +32,6 @@
 , buildPackages
 }:
 
-assert langJava     -> zip != null && unzip != null
-                       && zlib != null && boehmgc != null
-                       && perl != null;  # for `--enable-java-home'
-
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
@@ -65,29 +60,11 @@ let version = "8.1.0";
       }) */
       ++ optional langFortran ../gfortran-driving.patch;
 
-    javaEcj = fetchurl {
-      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
-      # `configure' time.
-
-      # XXX: Eventually we might want to take it from upstream.
-      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
-      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
-    };
-
-    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
-    # binary distribution here to allow the whole chain to be bootstrapped.
-    javaAntlr = fetchurl {
-      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
-      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
-    };
-
     xlibs = [
       libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
       xproto renderproto xextproto inputproto randrproto
     ];
 
-    javaAwtGtk = langJava && x11Support;
-
     /* Platform flags */
     platformFlags = let
         gccArch = targetPlatform.platform.gcc.arch or null;
@@ -277,13 +254,12 @@ stdenv.mkDerivation ({
 
   # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
   crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ texinfo which gettext ]
-    ++ (optional (perl != null) perl)
-    ++ (optional javaAwtGtk pkgconfig);
+    ++ (optional (perl != null) perl);
 
   # For building runtime libs
   depsBuildTarget =
@@ -298,8 +274,6 @@ stdenv.mkDerivation ({
     targetPackages.stdenv.cc.bintools # For linking code at run-time
   ] ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
-    ++ (optionals langJava [ boehmgc zip unzip ])
-    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
@@ -351,7 +325,6 @@ stdenv.mkDerivation ({
           (  optional langC        "c"
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
-          ++ optional langJava     "java"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -372,19 +345,6 @@ stdenv.mkDerivation ({
     # Optional features
     optional (isl != null) "--with-isl=${isl}" ++
 
-    # Java options
-    optionals langJava [
-      "--with-ecj-jar=${javaEcj}"
-
-      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
-      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
-      "--enable-java-home"
-      "--with-java-home=\${prefix}/lib/jvm/jre"
-    ] ++
-    optional javaAwtGtk "--enable-java-awt=gtk" ++
-    optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -421,11 +381,6 @@ stdenv.mkDerivation ({
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
   # library headers and binaries, regarless of the language being compiled.
   #
-  # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
-  # `--with-gmp' et al., e.g., when building
-  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
-  # them to $CPATH and $LIBRARY_PATH in this case.
-  #
   # Likewise, the LTO code doesn't find zlib.
   #
   # Cross-compiling, we need gcc not to read ./specs in order to build the g++
@@ -434,9 +389,6 @@ stdenv.mkDerivation ({
 
   CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
     ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
     ++ optional (libpthread != null) libpthread
     ++ optional (libpthreadCross != null) libpthreadCross
 
@@ -448,9 +400,6 @@ stdenv.mkDerivation ({
 
   LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([]
     ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
     ++ optional (libpthread != null) libpthread)
   );
 
@@ -491,8 +440,8 @@ stdenv.mkDerivation ({
 
     longDescription = ''
       The GNU Compiler Collection includes compiler front ends for C, C++,
-      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
-      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
+      libraries for these languages (libstdc++, libgomp,...).
 
       GCC development is a part of the GNU Project, aiming to improve the
       compiler used in the GNU system including the GNU/Linux variant.

From ae4fe67cd3dd5a28913278a4d687c8a1e66d77ef Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 3 May 2018 13:16:55 +0200
Subject: [PATCH 1026/3370] open-pdf-presenter: remove

---
 .../misc/open-pdf-presenter/default.nix       | 22 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/applications/misc/open-pdf-presenter/default.nix

diff --git a/pkgs/applications/misc/open-pdf-presenter/default.nix b/pkgs/applications/misc/open-pdf-presenter/default.nix
deleted file mode 100644
index 0f40a236c587..000000000000
--- a/pkgs/applications/misc/open-pdf-presenter/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchFromGitHub, cmake, qt4, pythonPackages }:
-
-stdenv.mkDerivation rec {
-  name = "open-pdf-presenter-git-2014-09-23";
-
-  src = fetchFromGitHub {
-    owner  = "olabini";
-    repo   = "open-pdf-presenter";
-    rev    = "f14930871b60b6ba50298c27377605e0a5fdf124";
-    sha256 = "1lfqb60zmjmsvzpbz29m8yxlzs2fscingyk8jvisng1y921726rr";
-  };
-
-  buildInputs = [ cmake qt4 pythonPackages.poppler-qt4 ];
-
-  meta = {
-    homepage = https://github.com/olabini/open-pdf-presenter;
-    description = "A program for presenting PDFs on multi-monitor settings (typically a laptop connected to a overhead projector)";
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a84..b33cca60b986 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4139,8 +4139,6 @@ with pkgs;
 
   update-resolv-conf = callPackage ../tools/networking/openvpn/update-resolv-conf.nix { };
 
-  open-pdf-presenter = callPackage ../applications/misc/open-pdf-presenter { };
-
   openvswitch = callPackage ../os-specific/linux/openvswitch { };
 
   optipng = callPackage ../tools/graphics/optipng {

From 3ae3c0c093ce4c7b29fb07003290822d6d73a9da Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 3 May 2018 13:17:26 +0200
Subject: [PATCH 1027/3370] =?UTF-8?q?python2.pkgs.popler=E2=80=94qt4:=20re?=
 =?UTF-8?q?move?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/top-level/python-packages.nix | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b7a70a66c651..ca0ee1195cc6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3882,36 +3882,6 @@ in {
 
   pomegranate = callPackage ../development/python-modules/pomegranate { };
 
-  poppler-qt4 = buildPythonPackage rec {
-    name = "poppler-qt4-${version}";
-    version = "0.18.1";
-    disabled = isPy3k || isPyPy;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-poppler-qt4/" +
-            "python-poppler-qt4-${version}.tar.gz";
-      sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c";
-    };
-
-    propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ];
-
-    preBuild = "${python}/bin/${python.executable} setup.py build_ext" +
-               " --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/";
-
-    NIX_CFLAGS_COMPILE = "-I${pkgs.poppler_qt4.dev}/include/poppler/";
-
-    meta = {
-      description = "A Python binding to Poppler-Qt4";
-      longDescription = ''
-        A Python binding to Poppler-Qt4 that aims for completeness
-        and for being actively maintained.
-      '';
-      license = licenses.lgpl21Plus;
-      maintainers = with maintainers; [ sepi ];
-      platforms = platforms.all;
-    };
-  };
-
   poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {
     inherit (pkgs.qt5) qtbase;
     inherit (pkgs.libsForQt5) poppler;

From dc25f36cf9472bde660500c951bbe3f433675d58 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 3 May 2018 13:17:50 +0200
Subject: [PATCH 1028/3370] poppler_qt4: remove

---
 pkgs/development/libraries/poppler/qt4.nix | 44 ----------------------
 pkgs/top-level/all-packages.nix            |  2 -
 2 files changed, 46 deletions(-)
 delete mode 100644 pkgs/development/libraries/poppler/qt4.nix

diff --git a/pkgs/development/libraries/poppler/qt4.nix b/pkgs/development/libraries/poppler/qt4.nix
deleted file mode 100644
index c82a543413e2..000000000000
--- a/pkgs/development/libraries/poppler/qt4.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-# TODO: get rid of this (https://github.com/NixOS/nixpkgs/issues/32883)
-{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
-, zlib, curl, cairo, freetype, fontconfig, lcms2, libjpeg, openjpeg
-, poppler_data, qt4
-}:
-
-let
-  # Last version supporting QT4
-  version = "0.61.1";
-in
-stdenv.mkDerivation rec {
-  name = "poppler-qt4-${version}";
-
-  src = fetchurl {
-    url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "1afdrxxkaivvviazxkg5blsf2x24sjkfj92ib0d3q5pm8dihjrhj";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  buildInputs = [ libiconv poppler_data ] ++ libintlOrEmpty;
-
-  propagatedBuildInputs = [ zlib freetype fontconfig libjpeg openjpeg cairo lcms2 curl qt4 ];
-
-  nativeBuildInputs = [ cmake ninja pkgconfig ];
-
-  cmakeFlags = [
-    "-DENABLE_XPDF_HEADERS=on"
-    "-DENABLE_UTILS=off"
-  ];
-
-  meta = with lib; {
-    homepage = https://poppler.freedesktop.org/;
-    description = "A PDF rendering library";
-
-    longDescription = ''
-      Poppler is a PDF rendering library based on the xpdf-3.0 code base.
-    '';
-
-    license = licenses.gpl2;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b33cca60b986..b131f9711ea4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11029,8 +11029,6 @@ with pkgs;
     suffix = "min";
   };
 
-  poppler_qt4 = callPackage ../development/libraries/poppler/qt4.nix { };
-
   poppler_utils = poppler.override { suffix = "utils"; utils = true; };
 
   popt = callPackage ../development/libraries/popt { };

From 0bfa4e8195900771aeb732ef23febb2fc99fe4dd Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Thu, 3 May 2018 13:52:41 +0200
Subject: [PATCH 1029/3370] boogie: enable usage as a vim plugin

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 43182b3f2aaa..e5be04182ca0 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -318,11 +318,23 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     postInstall = ''
         mkdir -pv "$out/lib/dotnet/${baseName}"
         ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${baseName}/z3.exe"
+
+        # so that this derivation can be used as a vim plugin to install syntax highlighting
+        vimdir=$out/share/vim-plugins/boogie
+        install -Dt $vimdir/syntax/ Util/vim/syntax/boogie.vim
+        mkdir $vimdir/ftdetect
+        echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim
     '';
 
     meta = with stdenv.lib; {
       description = "An intermediate verification language";
       homepage = "https://github.com/boogie-org/boogie";
+      longDescription = ''
+        Boogie is an intermediate verification language (IVL), intended as a
+        layer on which to build program verifiers for other languages.
+
+        This derivation may be used as a vim plugin to provide syntax highlighting.
+      '';
       license = licenses.mspl;
       maintainers = [ maintainers.taktoa ];
       platforms = with platforms; (linux ++ darwin);

From afea46bbc05641875ad744294e9cfb5d4ac6a622 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:43:25 +0200
Subject: [PATCH 1030/3370] ghc-8.4.1: drop obsolete version, we have 8.4.2 now

---
 pkgs/development/compilers/ghc/8.4.1.nix | 206 -----------------------
 pkgs/top-level/haskell-packages.nix      |  11 --
 2 files changed, 217 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghc/8.4.1.nix

diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix
deleted file mode 100644
index 8f398458fd53..000000000000
--- a/pkgs/development/compilers/ghc/8.4.1.nix
+++ /dev/null
@@ -1,206 +0,0 @@
-{ stdenv, targetPackages
-, buildPlatform, hostPlatform, targetPlatform
-
-# build-tools
-, bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchgit, fetchpatch, perl, python3
-, runCommand
-
-, libffi, libiconv ? null, ncurses
-
-, useLLVM ? !targetPlatform.isx86
-, # LLVM is conceptually a run-time-only depedendency, but for
-  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
-  # build-time dependency too.
-  buildLlvmPackages, llvmPackages
-
-, # If enabled, GHC will be built with the GPL-free but slower integer-simple
-  # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null, m4
-
-, # If enabled, use -fPIC when compiling static libs.
-  enableRelocatedStaticLibs ? targetPlatform != hostPlatform
-
-, # Whether to build dynamic libs for the standard library (on the target
-  # platform). Static libs are always built.
-  enableShared ? true
-
-, version ? "8.4.1"
-, # Whether to backport https://phabricator.haskell.org/D4388 for
-  # deterministic profiling symbol names, at the cost of a slightly
-  # non-standard GHC API
-  deterministicProfiling ? false
-}:
-
-assert !enableIntegerSimple -> gmp != null;
-
-let
-  inherit (bootPkgs) ghc;
-
-  # TODO(@Ericson2314) Make unconditional
-  targetPrefix = stdenv.lib.optionalString
-    (targetPlatform != hostPlatform)
-    "${targetPlatform.config}-";
-
-  buildMK = ''
-    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
-  '' + stdenv.lib.optionalString enableIntegerSimple ''
-    INTEGER_LIBRARY = integer-simple
-  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
-    Stage1Only = YES
-    HADDOCK_DOCS = NO
-    BUILD_SPHINX_HTML = NO
-    BUILD_SPHINX_PDF = NO
-  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
-    GhcLibHcOpts += -fPIC
-    GhcRtsHcOpts += -fPIC
-  '';
-
-  # Splicer will pull out correct variations
-  libDeps = platform: [ ncurses ]
-    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
-
-  toolsForTarget =
-    if hostPlatform == buildPlatform then
-      [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
-    else assert targetPlatform == hostPlatform; # build != host == target
-      [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
-
-  targetCC = builtins.head toolsForTarget;
-
-in
-stdenv.mkDerivation rec {
-  inherit version;
-  inherit (src) rev;
-  name = "${targetPrefix}ghc-${version}";
-
-  src = fetchgit {
-    url = "git://git.haskell.org/ghc.git";
-    rev = "0a3e2f324dbd525d626ebd3d97e8ffa1cf2f0ffb";
-    sha256 = "1m51khnmf8gw203d8kh6y4ivh0acb2wiqqnb950yfbg2a2k7bcfi";
-  };
-
-  enableParallelBuilding = true;
-
-  outputs = [ "out" "doc" ];
-
-  patches = [
-    (import ./abi-depends-determinism.nix { inherit fetchpatch runCommand; })
-  ] ++ stdenv.lib.optional deterministicProfiling
-    (fetchpatch { # https://phabricator.haskell.org/D4388 for more determinism
-      url = "https://github.com/shlevy/ghc/commit/8b2dbd869d1a64de3e99fa8b1c9bb1140eee7099.patch";
-      sha256 = "0hxpiwhbg64rsyjdr4psh6dwyp58b96mad3adccvfr0x8hc6ba2m";
-    });
-
-  postPatch = "patchShebangs .";
-
-  # GHC is a bit confused on its cross terminology.
-  preConfigure = ''
-    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
-      export "''${env#TARGET_}=''${!env}"
-    done
-    # GHC is a bit confused on its cross terminology, as these would normally be
-    # the *host* tools.
-    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
-    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
-    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
-    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
-    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
-    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
-    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
-    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
-    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
-    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
-    echo -n "${buildMK}" > mk/build.mk
-    echo ${version} >VERSION
-    echo ${src.rev} >GIT_COMMIT_ID
-    ./boot
-    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    export NIX_LDFLAGS+=" -no_dtrace_dof"
-  '';
-
-  # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ]
-    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
-  # `--with` flags for libraries needed for RTS linker
-  configureFlags = [
-    "--datadir=$doc/share/doc/ghc"
-    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
-    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
-    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
-  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
-    "--enable-bootstrap-with-devel-snapshot"
-  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
-    "CFLAGS=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
-    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
-  ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
-    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
-    "--disable-large-address-space"
-  ];
-
-  # Hack to make sure we never to the relaxation `$PATH` and hooks support for
-  # compatability. This will be replaced with something clearer in a future
-  # masss-rebuild.
-  crossConfig = true;
-
-  nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ];
-
-  # For building runtime libs
-  depsBuildTarget = toolsForTarget;
-
-  buildInputs = libDeps hostPlatform;
-
-  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
-    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
-
-  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
-  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
-
-  # required, because otherwise all symbols from HSffi.o are stripped, and
-  # that in turn causes GHCi to abort
-  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
-
-  checkTarget = "test";
-
-  # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
-  # treat that as a unary `{x,y,z,..}` repetition.
-  postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
-
-    # Install the bash completion file.
-    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
-
-    # Patch scripts to include "readelf" and "cat" in $PATH.
-    for i in "$out/bin/"*; do
-      test ! -h $i || continue
-      egrep --quiet '^#!' <(head -n 1 $i) || continue
-      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
-    done
-  '';
-
-  passthru = {
-    inherit bootPkgs targetPrefix;
-
-    inherit llvmPackages;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-8.4.1";
-  };
-
-  meta = {
-    homepage = http://haskell.org/ghc;
-    description = "The Glasgow Haskell Compiler";
-    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
-    inherit (ghc.meta) license platforms;
-  };
-
-}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 48980e48f1d4..937c930ac750 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -64,12 +64,6 @@ in rec {
       buildLlvmPackages = buildPackages.llvmPackages_39;
       llvmPackages = pkgs.llvmPackages_39;
     };
-    ghc841 = callPackage ../development/compilers/ghc/8.4.1.nix rec {
-      bootPkgs = packages.ghc821Binary;
-      inherit (bootPkgs) alex happy;
-      buildLlvmPackages = buildPackages.llvmPackages_5;
-      llvmPackages = pkgs.llvmPackages_5;
-    };
     ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec {
       bootPkgs = packages.ghc821Binary;
       inherit (bootPkgs) alex happy;
@@ -135,11 +129,6 @@ in rec {
       ghc = bh.compiler.ghc822;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
     };
-    ghc841 = callPackage ../development/haskell-modules {
-      buildHaskellPackages = bh.packages.ghc841;
-      ghc = bh.compiler.ghc841;
-      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
-    };
     ghc842 = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghc842;
       ghc = bh.compiler.ghc842;

From b33d1d6481abc13546177d94cc3ceb9a3ce69c27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 02:31:10 +0200
Subject: [PATCH 1031/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/bb0c3bef0456627502771e0db9de103774fb9f16.
---
 .../haskell-modules/hackage-packages.nix      | 953 +++++++++++++++---
 1 file changed, 797 insertions(+), 156 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f3ea3b8954f5..e9d076343f82 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7353,6 +7353,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HCodecs_0_5_1" = callPackage
+    ({ mkDerivation, array, base, bytestring, QuickCheck, random
+     , semigroups
+     }:
+     mkDerivation {
+       pname = "HCodecs";
+       version = "0.5.1";
+       sha256 = "0hrib81nw4g7qgka3brypb8k1mg7l37m8gywc7bc44mcg5mn2957";
+       libraryHaskellDepends = [
+         array base bytestring QuickCheck random semigroups
+       ];
+       testHaskellDepends = [
+         array base bytestring QuickCheck random semigroups
+       ];
+       homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
+       description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HDBC" = callPackage
     ({ mkDerivation, base, bytestring, containers, convertible, mtl
      , old-time, text, time, utf8-string
@@ -9540,8 +9560,8 @@ self: {
      }:
      mkDerivation {
        pname = "Hastodon";
-       version = "0.4.0";
-       sha256 = "00zq3kzzazqlgbh45xc6py3m23x448af34d4y3z903by79fid79f";
+       version = "0.4.1";
+       sha256 = "08skn3qvqfzll1hhzayqm46kwdl45kbckgwvzjm4bqa5w5jvh708";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit exceptions http-client
          http-conduit http-types mime-types MissingH resourcet text
@@ -10446,6 +10466,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "IPv6Addr_1_0_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
+     , network-info, random, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "1.0.3";
+       sha256 = "17bk63qi9krfghplrmck4v1hv54kwdppl50hfm7349dqfhdbf129";
+       libraryHaskellDepends = [
+         aeson attoparsec base iproute network network-info random text
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/MichelBoucey/IPv6Addr";
+       description = "Library to deal with IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IPv6DB" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
@@ -15358,8 +15398,8 @@ self: {
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "QuickCheck-safe";
-       version = "0.1.0.3";
-       sha256 = "0fwnywnmdws04f1y7qw0l8hawa2hn99x62g1mpjwcdx8dm4yal7f";
+       version = "0.1.0.4";
+       sha256 = "0ixizi0cshqqczm86rnibas8zygf8i29l3i0jivvb81zi89rscl7";
        libraryHaskellDepends = [ base QuickCheck ];
        description = "Safe reimplementation of QuickCheck's core";
        license = stdenv.lib.licenses.mit;
@@ -16619,7 +16659,7 @@ self: {
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) glib; mono = null;};
+     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
     ({ mkDerivation, base, bytestring, data-default, directory, either
@@ -21089,17 +21129,17 @@ self: {
     ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring
      , bytestring, containers, exceptions, filepath, http-client
      , http-client-tls, http-types, katip, lens, lens-aeson, mtl, random
-     , safe-exceptions, stm, tasty, tasty-hunit, text, th-format
+     , safe-exceptions, say, stm, tasty, tasty-hunit, text, th-format
      , transformers, unliftio, unliftio-core, uuid
      }:
      mkDerivation {
        pname = "access-token-provider";
-       version = "0.1.0.0";
-       sha256 = "03832v0aab3imqim8f6g1r0jj2pfrrca45qnvpkw7ry7krbq5z7q";
+       version = "0.1.1.0";
+       sha256 = "18j07sb100zb407n7dpyppi5mc20g57y73k3sscmvlgq6yqdxwk4";
        libraryHaskellDepends = [
          aeson aeson-casing base base64-bytestring bytestring containers
          exceptions filepath http-client http-client-tls http-types katip
-         lens lens-aeson mtl random safe-exceptions stm text th-format
+         lens lens-aeson mtl random safe-exceptions say stm text th-format
          transformers unliftio unliftio-core
        ];
        testHaskellDepends = [
@@ -23772,12 +23812,12 @@ self: {
      }) {};
 
   "alg" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.1.0";
-       sha256 = "13glk774rdd6fwi427djkc1q4xqmdf44smhp5lgv24vfwd5fffcq";
-       libraryHaskellDepends = [ base ];
+       version = "0.2.2.0";
+       sha256 = "1hhmzlq831618j36yq8kjh4sagmhg3w1ghr53lip06avis2c0gl7";
+       libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28464,10 +28504,8 @@ self: {
      }:
      mkDerivation {
        pname = "arbtt";
-       version = "0.10.0.1";
-       sha256 = "0pav5q0xh90vjrj77l7vk38l38xyhqas4750il5wkpqf4f5li877";
-       revision = "1";
-       editedCabalFile = "1mmrv81c9gwa2gqlp0agipg5sdxm88fhiza84y2sv8vg7zf88x82";
+       version = "0.10.0.2";
+       sha256 = "13jmv7bxiy0v2y2w6qwsb9mh5m97sxrlb5w1kaqzag8d0cnz7w6c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -32529,6 +32567,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "backprop_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, criterion, deepseq
+     , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
+     , primitive, reflection, time, transformers, type-combinators
+     , vector
+     }:
+     mkDerivation {
+       pname = "backprop";
+       version = "0.2.0.0";
+       sha256 = "1h2cb3birbcgm0fyqr4i2d85dkwrpbqkd67a6imh3z9nsc7zy66y";
+       libraryHaskellDepends = [
+         base containers deepseq microlens primitive reflection transformers
+         type-combinators vector
+       ];
+       benchmarkHaskellDepends = [
+         base bifunctors criterion deepseq directory hmatrix lens mnist-idx
+         mwc-random time transformers vector
+       ];
+       homepage = "https://github.com/mstksg/backprop#readme";
+       description = "Heterogeneous automatic differentation (backpropagation)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "backtracking-exceptions" = callPackage
     ({ mkDerivation, base, either, free, kan-extensions, mtl
      , semigroupoids, semigroups, transformers
@@ -33709,7 +33771,7 @@ self: {
      , codec-rpm, cond, conduit, conduit-combinators, conduit-extra
      , containers, content-store, cpio-conduit, cryptonite, directory
      , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree
-     , gitrev, hspec, http-conduit, HUnit, listsafe, memory
+     , gitrev, hspec, http-conduit, HUnit, lifted-base, listsafe, memory
      , monad-control, monad-logger, monad-loops, mtl, network-uri
      , ostree, parsec, parsec-numbers, persistent, persistent-sqlite
      , persistent-template, process, regex-pcre, resourcet, split, tar
@@ -33718,8 +33780,8 @@ self: {
      }:
      mkDerivation {
        pname = "bdcs";
-       version = "0.4.0";
-       sha256 = "008rd17zfg63w9szp4jrbd9z9sg4zjf4j4a5gm3skhn2nq7qaw9i";
+       version = "0.5.0";
+       sha256 = "1anb8nz25a0cvfn6ksn01y6sbjg3cn9pd8lwg8hpjza11hm33kcg";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -33728,10 +33790,10 @@ self: {
          aeson base bytestring codec-rpm cond conduit conduit-combinators
          conduit-extra containers content-store cpio-conduit cryptonite
          directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree
-         gitrev http-conduit listsafe memory monad-control monad-logger mtl
-         network-uri parsec parsec-numbers persistent persistent-sqlite
-         persistent-template process regex-pcre resourcet split tar
-         tar-conduit temporary text time unix unordered-containers
+         gitrev http-conduit lifted-base listsafe memory monad-control
+         monad-logger mtl network-uri parsec parsec-numbers persistent
+         persistent-sqlite persistent-template process regex-pcre resourcet
+         split tar tar-conduit temporary text time unix unordered-containers
          xml-conduit
        ];
        libraryPkgconfigDepends = [ ostree ];
@@ -33862,6 +33924,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "beam-migrate_0_3_2_0" = callPackage
+    ({ mkDerivation, aeson, base, beam-core, bytestring, containers
+     , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable
+     , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text
+     , time, unordered-containers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "beam-migrate";
+       version = "0.3.2.0";
+       sha256 = "1a6m27cpa2xlwmwfi1374p3a23i2hm8fjfsl6bdn0zpnawgi5rhf";
+       libraryHaskellDepends = [
+         aeson base beam-core bytestring containers deepseq dependent-map
+         dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel
+         pqueue pretty scientific text time unordered-containers uuid-types
+         vector
+       ];
+       homepage = "https://travis.athougies.net/projects/beam.html";
+       description = "SQL DDL support and migrations support library for Beam";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "beam-postgres" = callPackage
     ({ mkDerivation, aeson, base, beam-core, beam-migrate, bytestring
      , case-insensitive, conduit, free, hashable, haskell-src-exts
@@ -37989,8 +38073,8 @@ self: {
      }:
      mkDerivation {
        pname = "bloodhound-amazonka-auth";
-       version = "0.1.2.0";
-       sha256 = "1r9fj8zh9swdmy0f96112kpm1s50wlyf194w2km4rpq2hblcjlrm";
+       version = "0.1.2.1";
+       sha256 = "06h3yw5fy6y1vr0zd059p3whm2mlfqwi9vjz80rwq7w6lv0p85a8";
        libraryHaskellDepends = [
          amazonka-core amazonka-elasticsearch base bloodhound exceptions
          http-client http-types time transformers uri-bytestring
@@ -39392,33 +39476,31 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
-  "brittany_0_10_0_0" = callPackage
+  "brittany_0_11_0_0" = callPackage
     ({ mkDerivation, aeson, base, butcher, bytestring, cmdargs
      , containers, czipwith, data-tree-print, deepseq, directory, extra
      , filepath, ghc, ghc-boot-th, ghc-exactprint, ghc-paths, hspec
      , monad-memo, mtl, multistate, neat-interpolation, parsec, pretty
-     , safe, semigroups, strict, syb, text, transformers, uniplate
-     , unsafe, yaml
+     , random, safe, semigroups, strict, syb, text, transformers
+     , uniplate, unsafe, yaml
      }:
      mkDerivation {
        pname = "brittany";
-       version = "0.10.0.0";
-       sha256 = "1fm6l4ial8kp4mafwkp7w79nklc46c07i12p1in3dqxz9r5817r1";
-       revision = "1";
-       editedCabalFile = "1mq1hgakxwzk4k4d8gwfbngprcprjagnvkvq389z1m1vda3w80i8";
+       version = "0.11.0.0";
+       sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base butcher bytestring cmdargs containers czipwith
          data-tree-print deepseq directory extra filepath ghc ghc-boot-th
          ghc-exactprint ghc-paths monad-memo mtl multistate
-         neat-interpolation pretty safe semigroups strict syb text
+         neat-interpolation pretty random safe semigroups strict syb text
          transformers uniplate unsafe yaml
        ];
        executableHaskellDepends = [
          aeson base butcher bytestring cmdargs containers czipwith
          data-tree-print deepseq directory extra filepath ghc ghc-boot-th
-         ghc-exactprint ghc-paths hspec monad-memo mtl multistate
+         ghc-exactprint ghc-paths monad-memo mtl multistate
          neat-interpolation pretty safe semigroups strict syb text
          transformers uniplate unsafe yaml
        ];
@@ -40655,8 +40737,8 @@ self: {
     ({ mkDerivation, base, bytestring, terminal-progress-bar, time }:
      mkDerivation {
        pname = "bytestring-progress";
-       version = "1.0.9";
-       sha256 = "1gqcr15956zzldsc3rvds3ybd43907bv69cw3i7a1c0nfz60zg70";
+       version = "1.2";
+       sha256 = "195vsqpmaycxi0k7kk1hasrklnblr3psllc288vkh77pbnfm3vqi";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring terminal-progress-bar time
@@ -41909,6 +41991,8 @@ self: {
        pname = "cabal-test-quickcheck";
        version = "0.1.8.1";
        sha256 = "0r5fd670a5ch0lzw7wsxp6k06wzi64wvjbiy8zyfl7brmjnbh8gn";
+       revision = "1";
+       editedCabalFile = "1rq6l86sndcv8nb5nl9rki2kmblrarj9cbra0i6kixa5n1wbcmv6";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
@@ -44207,8 +44291,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.0.1";
-       sha256 = "16pzba0zc346d3azw4wd90apz7ldx68d5vd3q13dd3s9f3gqy4wv";
+       version = "0.1.0.2";
+       sha256 = "1yd1ahf2ri31lwcs0mvhn6wgpglgk3vsf5698qw6asm8rl1gcaz9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45697,14 +45781,17 @@ self: {
      }) {};
 
   "chronologique" = callPackage
-    ({ mkDerivation, base, hourglass, hspec, QuickCheck, time, vector
+    ({ mkDerivation, aeson, base, bytestring, hourglass, hspec
+     , QuickCheck, text, time, vector
      }:
      mkDerivation {
        pname = "chronologique";
-       version = "0.3.0.1";
-       sha256 = "1l3964zp7c4pj3izdcknnvsbn3avyvfychlxs9rl9hr251qbcf14";
-       libraryHaskellDepends = [ base hourglass time vector ];
-       testHaskellDepends = [ base hourglass hspec QuickCheck vector ];
+       version = "0.3.1.1";
+       sha256 = "05ly96mdm4nxmn7yz04wq9kgzlq8biaaaxs1mvsc3f8wgcpbqf65";
+       libraryHaskellDepends = [ aeson base hourglass text time vector ];
+       testHaskellDepends = [
+         aeson base bytestring hourglass hspec QuickCheck vector
+       ];
        homepage = "https://github.com/afcowie/chronologique/";
        description = "Time to manipulate time";
        license = stdenv.lib.licenses.bsd3;
@@ -47736,7 +47823,7 @@ self: {
        homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host";
        description = "Hosting the Common Language Runtime";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) glib; mono = null;};
+     }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "clr-inline" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, case-insensitive
@@ -50189,12 +50276,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "composition-prelude_1_4_0_3" = callPackage
+  "composition-prelude_1_4_0_5" = callPackage
     ({ mkDerivation, base, cpphs }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.4.0.3";
-       sha256 = "0vzd71yqnbx5pk4yvan1sbjdgg3b7k476jiyr36pjyi1ysdm13qj";
+       version = "1.4.0.5";
+       sha256 = "0bcz7lx4v25dz9d11qy8im6fk1gviqqhgcr1bwxg4yqyzbfl8bas";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
        homepage = "https://github.com/vmchale/composition-prelude#readme";
@@ -53780,6 +53867,29 @@ self: {
        license = "unknown";
      }) {};
 
+  "cql_4_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, Decimal
+     , iproute, network, QuickCheck, tasty, tasty-quickcheck
+     , template-haskell, text, time, transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "cql";
+       version = "4.0.0";
+       sha256 = "09sm9wxjfmiv62brrj6hcfsjz3s8xwc4ihrwxdq8fqsv9cf82fj7";
+       libraryHaskellDepends = [
+         base bytestring cereal containers Decimal iproute network
+         template-haskell text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         base bytestring cereal Decimal iproute network QuickCheck tasty
+         tasty-quickcheck text time uuid
+       ];
+       homepage = "https://gitlab.com/twittner/cql/";
+       description = "Cassandra CQL binary protocol";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cql-io" = callPackage
     ({ mkDerivation, async, auto-update, base, bytestring, containers
      , cql, cryptohash, data-default-class, exceptions, hashable
@@ -53791,6 +53901,8 @@ self: {
        pname = "cql-io";
        version = "0.16.0";
        sha256 = "012043s6cfkybj764hlrc7i9ql6afl79s2vnjbn9vz99p7wszrc2";
+       revision = "1";
+       editedCabalFile = "07vrizkarip8ap5hp6ngp7yf8xfdmm3r6zbaxafk48raxyfkl8xd";
        libraryHaskellDepends = [
          async auto-update base bytestring containers cql cryptohash
          data-default-class exceptions hashable HsOpenSSL iproute lens
@@ -53802,6 +53914,35 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "cql-io_1_0_0" = callPackage
+    ({ mkDerivation, async, auto-update, base, bytestring, containers
+     , cql, cryptohash, data-default-class, Decimal, exceptions
+     , hashable, HsOpenSSL, iproute, lens, monad-control, mtl
+     , mwc-random, network, raw-strings-qq, retry, semigroups, stm
+     , tasty, tasty-hunit, text, time, tinylog, transformers
+     , transformers-base, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "cql-io";
+       version = "1.0.0";
+       sha256 = "0wij5h44rk4lnnvh3i6s04bk7dhvxvv9l9y2qicm44736zrphlmx";
+       libraryHaskellDepends = [
+         async auto-update base bytestring containers cql cryptohash
+         data-default-class exceptions hashable HsOpenSSL iproute lens
+         monad-control mtl mwc-random network retry semigroups stm text time
+         tinylog transformers transformers-base unordered-containers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         base containers cql Decimal iproute mtl raw-strings-qq tasty
+         tasty-hunit text time tinylog uuid
+       ];
+       homepage = "https://gitlab.com/twittner/cql-io/";
+       description = "Cassandra CQL client";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cqrs" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -59010,6 +59151,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "datafix" = callPackage
+    ({ mkDerivation, base, Cabal, cabal-toolkit, containers, criterion
+     , deepseq, directory, doctest, filepath, ghc, ghc-paths, Glob
+     , lattices, pomaps, primitive, QuickCheck, tasty, tasty-hunit
+     , tasty-smallcheck, text, transformers, turtle, vector
+     }:
+     mkDerivation {
+       pname = "datafix";
+       version = "0.0.0.1";
+       sha256 = "0pdpqwdbc8hmwwq460yisbj4072x3jyh7gcrf1flm2545acgahvq";
+       setupHaskellDepends = [ base Cabal cabal-toolkit ];
+       libraryHaskellDepends = [
+         base containers lattices pomaps primitive transformers vector
+       ];
+       testHaskellDepends = [
+         base Cabal cabal-toolkit containers directory doctest filepath ghc
+         ghc-paths Glob lattices primitive QuickCheck tasty tasty-hunit
+         tasty-smallcheck text transformers turtle
+       ];
+       benchmarkHaskellDepends = [
+         base Cabal cabal-toolkit containers criterion deepseq directory
+         filepath ghc ghc-paths lattices primitive text transformers turtle
+       ];
+       homepage = "https://github.com/sgraf812/datafix";
+       description = "Fixing data-flow problems";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "dataflow" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
      , filepath, gitrev, hastache, hspec, HUnit, markdown, MissingH, mtl
@@ -60490,8 +60659,8 @@ self: {
     ({ mkDerivation, base, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.2.1";
-       sha256 = "0i8wzih07532zw276h271lzdk3lkinjsjyhn8lks04yqkgq4b2x8";
+       version = "0.2.3";
+       sha256 = "0v3nr8svnsqgj4rmbki4f38fndq03gxghkwb9q6qjd9w2m2hx3y1";
        libraryHaskellDepends = [ base foldl ];
        homepage = "https://github.com/metrix-ai/deferred-folds";
        description = "Abstractions over deferred folds";
@@ -71675,6 +71844,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "exhaustive_1_1_6" = callPackage
+    ({ mkDerivation, base, generics-sop, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "exhaustive";
+       version = "1.1.6";
+       sha256 = "00gdgr9xqzy14sqx31j4afljvfc4ar2jrzmwpp3z6ybfq1saw7vk";
+       libraryHaskellDepends = [
+         base generics-sop template-haskell transformers
+       ];
+       homepage = "http://github.com/ocharles/exhaustive";
+       description = "Compile time checks that a computation considers producing data through all possible constructors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exherbo-cabal" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal
      , containers, data-default, deepseq, directory, doctest, filepath
@@ -72308,15 +72493,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "extensible-effects_2_6_0_1" = callPackage
+  "extensible-effects_2_6_1_1" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, mtl
      , QuickCheck, silently, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "2.6.0.1";
-       sha256 = "1c39hn8iskn71s3hd3af3q1xym9mzdvrjswcnyqrkibws47k2lmx";
+       version = "2.6.1.1";
+       sha256 = "0rx1m6pw2prgfr0wsgnqf1hqsrwq43clpahk79z972bdmh9v3352";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base HUnit monad-control QuickCheck silently test-framework
@@ -81108,12 +81293,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity_0_5_0_0" = callPackage
+  "genvalidity_0_5_0_2" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.5.0.0";
-       sha256 = "0s640ql6i9lr8s8m39fvjv7iz1pbcnjnvb8xsdbygb49cwk3khcz";
+       version = "0.5.0.2";
+       sha256 = "1l1lv8k8gl7i5zd54636ihbwddgq49088lgb2gragm05cki823c1";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -81230,6 +81415,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-containers_0_4_0_0" = callPackage
+    ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
+     , hspec, QuickCheck, validity, validity-containers
+     }:
+     mkDerivation {
+       pname = "genvalidity-containers";
+       version = "0.4.0.0";
+       sha256 = "0q7dzmp8ik3v8ckv8i9cnc687306i4i80mx7sbh956hw5kr6bqnb";
+       libraryHaskellDepends = [
+         base containers genvalidity QuickCheck validity validity-containers
+       ];
+       testHaskellDepends = [
+         base containers genvalidity genvalidity-hspec hspec
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "GenValidity support for containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "genvalidity-hspec" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, validity
@@ -81251,14 +81456,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec_0_6_0_0" = callPackage
+  "genvalidity-hspec_0_6_0_1" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.6.0.0";
-       sha256 = "0pa4wx08yipr59nsdf5prh6j5pcixnxxfd9i4vm1rb4v89nws6al";
+       version = "0.6.0.1";
+       sha256 = "18srjw0c8li10nbnxwbnhrggkl9nhdfjy02jpxd6hpij345y3j47";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
          validity
@@ -81606,14 +81811,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-time_0_2_0_0" = callPackage
+  "genvalidity-time_0_2_0_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, time, validity-time
      }:
      mkDerivation {
        pname = "genvalidity-time";
-       version = "0.2.0.0";
-       sha256 = "04kfqs4mc9p5flr3vvb6qj3nb4agpl3hww62g7np6sl5s36cbycb";
+       version = "0.2.0.1";
+       sha256 = "0kd2rxmz197yzfhxya4pbvl77iv7knl0zc1v56089ls4vk4by2gg";
        libraryHaskellDepends = [
          base genvalidity QuickCheck time validity-time
        ];
@@ -97235,6 +97440,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "haskell-lsp_0_2_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
+     , lens, mtl, network-uri, parsec, sorted-list, stm, text, time
+     , transformers, unordered-containers, vector, yi-rope
+     }:
+     mkDerivation {
+       pname = "haskell-lsp";
+       version = "0.2.1.0";
+       sha256 = "09wv2ic66lc03pndpx4xsmmv3zxwram5i82483j340avm2rp06c0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hashable haskell-lsp-types hslogger lens mtl network-uri parsec
+         sorted-list stm text time unordered-containers yi-rope
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hslogger lens mtl network-uri parsec stm text time transformers
+         unordered-containers vector yi-rope
+       ];
+       testHaskellDepends = [
+         aeson base containers directory filepath hashable hspec lens
+         network-uri sorted-list text yi-rope
+       ];
+       homepage = "https://github.com/alanz/haskell-lsp";
+       description = "Haskell library for the Microsoft Language Server Protocol";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-lsp-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , haskell-lsp, lens, process, text, unix
@@ -97256,6 +97493,23 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "haskell-lsp-types" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, filepath
+     , hashable, lens, network-uri, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "haskell-lsp-types";
+       version = "0.2.1.0";
+       sha256 = "0byslqf8qw7rc1kva3inm8bsm9z12h19y3b3yzgwz1hlkshjl2d0";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default filepath hashable lens
+         network-uri text unordered-containers
+       ];
+       homepage = "https://github.com/alanz/haskell-lsp";
+       description = "Haskell library for the Microsoft Language Server Protocol, data types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "haskell-menu" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -97414,8 +97668,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-packages";
-       version = "0.6.1";
-       sha256 = "16lsk6djhy34k9clmaqsqrd4277dk7nva77djs91h0nl68zz3hhs";
+       version = "0.6.2";
+       sha256 = "114xkqg5fzyq1n5p8cz768z84j0xgcyzxh375p9a574j6nl6d387";
        libraryHaskellDepends = [
          base binary bytestring Cabal containers deepseq directory filepath
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
@@ -97746,6 +98000,8 @@ self: {
        pname = "haskell-src-exts-util";
        version = "0.2.2";
        sha256 = "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg";
+       revision = "1";
+       editedCabalFile = "14mrpj2xmpdhib9l5qacslkm4n0rh5yjwy6n5dhp7152m69hgfdl";
        libraryHaskellDepends = [
          base containers data-default haskell-src-exts semigroups
          transformers uniplate
@@ -97755,6 +98011,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-src-exts-util_0_2_3" = callPackage
+    ({ mkDerivation, base, containers, data-default, haskell-src-exts
+     , semigroups, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "haskell-src-exts-util";
+       version = "0.2.3";
+       sha256 = "1803718paq89f8pdck4mb88hv2k1ah9lxzq0lgjgwi9n88ryycz8";
+       libraryHaskellDepends = [
+         base containers data-default haskell-src-exts semigroups
+         transformers uniplate
+       ];
+       homepage = "https://github.com/pepeiborra/haskell-src-exts-util";
+       description = "Helper functions for working with haskell-src-exts trees";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haskell-src-meta" = callPackage
     ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb
      , template-haskell, test-framework, test-framework-hunit
@@ -105340,8 +105614,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.9";
-       sha256 = "10lsh1rayzg7gri6b2mn01ncjziga5dzw0s5a91068brrrf4rymm";
+       version = "1.9.1";
+       sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105380,21 +105654,22 @@ self: {
      }) {};
 
   "hledger-api" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, Decimal
-     , docopt, either, hledger, hledger-lib, microlens
+    ({ mkDerivation, aeson, base, bytestring, containers, data-default
+     , Decimal, docopt, either, hledger, hledger-lib, microlens
      , microlens-platform, safe, servant-server, servant-swagger
      , swagger2, text, transformers, wai, wai-extra, warp
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.9";
-       sha256 = "00bqsz8hkmx78r9d692kihbpmldkpnsdmpljs3ivi14jfay4avim";
+       version = "1.9.1";
+       sha256 = "1krg8pxqcndrs6z196lb7z5nanyp9vxk5ziqpapj0f11ifxcijj8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson base bytestring containers Decimal docopt either hledger
-         hledger-lib microlens microlens-platform safe servant-server
-         servant-swagger swagger2 text transformers wai wai-extra warp
+         aeson base bytestring containers data-default Decimal docopt either
+         hledger hledger-lib microlens microlens-platform safe
+         servant-server servant-swagger swagger2 text transformers wai
+         wai-extra warp
        ];
        homepage = "http://hledger.org";
        description = "Web API server for the hledger accounting tool";
@@ -105445,8 +105720,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-iadd";
-       version = "1.3.4";
-       sha256 = "1dii629ynrb04q4hmli6zxpz1ylkw0rm1vf8jrrcm81drvdxw6qm";
+       version = "1.3.5";
+       sha256 = "0mp8jhvf48173ixypqfm9vmsb2bsykfygxrxxfjpry6m5xqfh09c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105474,11 +105749,10 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-interest";
-       version = "1.5.1";
-       sha256 = "19hdz6lj0kxy59vzkyqlwk20l8k08w618nz02xcfflwd9r7ka0ha";
+       version = "1.5.2";
+       sha256 = "10ck23d69wxylxbp8cj7ic8slklm9l88xbb4p29nvm5lgjiqidbq";
        isLibrary = false;
        isExecutable = true;
-       enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base Cabal Decimal hledger-lib mtl text time
        ];
@@ -105511,28 +105785,28 @@ self: {
      , blaze-markup, bytestring, cmdargs, containers, csv, data-default
      , Decimal, deepseq, directory, doctest, easytest, extra, filepath
      , Glob, hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time
-     , parsec, pretty-show, regex-tdfa, safe, split, test-framework
-     , test-framework-hunit, text, time, transformers, uglymemo
-     , utf8-string
+     , parsec, pretty-show, regex-tdfa, safe, split, tabular
+     , test-framework, test-framework-hunit, text, time, transformers
+     , uglymemo, utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.9";
-       sha256 = "0bm4vdzjxyxjmq000wng6hkx9kinbzw5hx7m0i1vjj500gcp0zq1";
+       version = "1.9.1";
+       sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory extra
          filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec
-         pretty-show regex-tdfa safe split text time transformers uglymemo
-         utf8-string
+         pretty-show regex-tdfa safe split tabular text time transformers
+         uglymemo utf8-string
        ];
        testHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory
          doctest easytest extra filepath Glob hashtables HUnit megaparsec
          mtl mtl-compat old-time parsec pretty-show regex-tdfa safe split
-         test-framework test-framework-hunit text time transformers uglymemo
-         utf8-string
+         tabular test-framework test-framework-hunit text time transformers
+         uglymemo utf8-string
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
@@ -105548,8 +105822,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.9";
-       sha256 = "0z5w69vxl8f1gdc8753ndnm4mcm5xw3abjfqidyrn3gsi800pxzd";
+       version = "1.9.1";
+       sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105594,8 +105868,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.9.1";
-       sha256 = "0fkanj21ivrf5la7zxij1jws955hc0y98n2lg4qkbyw5fz54i9dj";
+       version = "1.9.2";
+       sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105728,8 +106002,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.3";
-       sha256 = "08i7b894vm0p8ipilvhx0pp04r6zgrf44w0mnlmsydq971y59g3a";
+       version = "2.1.4";
+       sha256 = "01qgnljgsd331zx9df2diijnfvy78p1j6ysqqq317v66yxpz6vlh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -106741,8 +107015,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "1.7.1";
-       sha256 = "05l2ngns8p3jvx20iv8w4yrzn1agfxafgaynfwv0340czchl7s5s";
+       version = "1.7.2";
+       sha256 = "0klkgr11p8m03ksrad59pqs0czp6hrgmzxynng4zirbmz643plvf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107054,10 +107328,10 @@ self: {
     ({ mkDerivation, base, either, mtl }:
      mkDerivation {
        pname = "hoist-error";
-       version = "0.1.0.2";
-       sha256 = "1485adrlm52jm5afcwa7qnfy4b1679nqjhhlsjp264wqmm0h9l0z";
-       revision = "3";
-       editedCabalFile = "1f2znb9x4f4m8h3d66pdyi7fqjr6v120mjqswj40dy7p2wmd6dm6";
+       version = "0.2.0.0";
+       sha256 = "1hb479bwn3z1qdsrnz85wfdd9skmmxydxd6xkcrwbcfwy5vap64h";
+       revision = "1";
+       editedCabalFile = "1nai9ds3r15x78rnj5gvy3mbps2jkq9ndqg56l8g7rxizfzidwfb";
        libraryHaskellDepends = [ base either mtl ];
        description = "Some convenience facilities for hoisting errors into a monad";
        license = stdenv.lib.licenses.mit;
@@ -108910,8 +109184,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.8";
-       sha256 = "1h3zjl1z80h7n1k1sk4a2qwsnq17c48f1lmzrdhrs9h5bnm9mjhk";
+       version = "2.4.9";
+       sha256 = "1bfar7biksa9ha6vzrh4z2lz048mf1zz261ih6mbl9q6kvyr27w4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -112186,6 +112460,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hspec-golden-aeson_0_6_0_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
+     , random, silently, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-golden-aeson";
+       version = "0.6.0.0";
+       sha256 = "0918b4y0lkz66hyhydqkd0yxna37vqqqc0pgjg4vn1h860xj0rv0";
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring directory filepath hspec
+         QuickCheck quickcheck-arbitrary-adt random transformers
+       ];
+       testHaskellDepends = [
+         aeson base directory hspec hspec-core QuickCheck
+         quickcheck-arbitrary-adt silently transformers
+       ];
+       homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme";
+       description = "Use tests to monitor changes in Aeson serialization";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-hashable" = callPackage
     ({ mkDerivation, base, hashable, hspec, hspec-core, QuickCheck
      , silently
@@ -116105,8 +116402,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.4.4";
-       sha256 = "1zw35ikrp0r07rvnm3fah3p9xj8h8bw2h4nwv94ih1ff2ab2glhf";
+       version = "2.5.0";
+       sha256 = "0cr3s26ivb46d14mglnr9phhnsj85h8n3b8p6lmcjk1xs4jidick";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116129,8 +116426,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-conduit";
-       version = "2.4.0";
-       sha256 = "0xzsdslkc069wccqihd50zxvm9jx6p5izwf4v44dizn42lfymm75";
+       version = "2.5.0";
+       sha256 = "0n495336vhikd0r5j6i8ydrxv3xwwckbg2ympaf3flcsjv4bwc08";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116272,16 +116569,16 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_11_0_0" = callPackage
+  "hw-rankselect_0_12_0_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
-     , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, mmap
-     , QuickCheck, resourcet, vector
+     , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
+     , mmap, mtl, optparse-applicative, QuickCheck, resourcet, vector
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.11.0.0";
-       sha256 = "0sywcqzrrxmlwgg4glj8fm8fn4n1a33f20lmj9bvchzh20gg340c";
+       version = "0.12.0.0";
+       sha256 = "1yp9fmxk55ikhrrpkff4r1sgqadg4b0yfz2w1xardxb3n09n4xpa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116289,7 +116586,8 @@ self: {
          vector
        ];
        executableHaskellDepends = [
-         base directory hw-bits hw-prim hw-rankselect-base mmap vector
+         base directory hw-bits hw-prim hw-rankselect-base lens mmap mtl
+         optparse-applicative vector
        ];
        testHaskellDepends = [
          base directory hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog
@@ -120204,6 +120502,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c_0_6_0_6" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
+     , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
+     , regex-posix, template-haskell, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "inline-c";
+       version = "0.6.0.6";
+       sha256 = "0ggfnnds3lshiasf2kkyxc3nd5y9b3jr6xraxmwgpikmf21yac4i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base bytestring containers hashable mtl parsec
+         parsers template-haskell transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base containers hashable hspec parsers QuickCheck
+         raw-strings-qq regex-posix template-haskell transformers
+         unordered-containers vector
+       ];
+       description = "Write Haskell source files including C code inline. No FFI required.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-cpp_0_1_0_0" = callPackage
     ({ mkDerivation, base, inline-c, template-haskell }:
      mkDerivation {
@@ -121366,6 +121690,8 @@ self: {
        pname = "io-streams";
        version = "1.5.0.1";
        sha256 = "12rcdg2d70644bvn838fxcjkssqj8pssnx5y657si5rijcbkgjsx";
+       revision = "1";
+       editedCabalFile = "1d7rpwi10rqcry58d4hc651xvk9xzni6n6k22wm9532l14i3x21c";
        configureFlags = [ "-fNoInteractiveTests" ];
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder network primitive
@@ -121389,8 +121715,8 @@ self: {
        pname = "io-streams-haproxy";
        version = "1.0.0.2";
        sha256 = "11nh9q158mgnvvb23s5ffg87lkhl5smk039yl43jghxmb214z0bp";
-       revision = "1";
-       editedCabalFile = "0mm20k4d6xcjjghwkgbfap9n35nixzvk3y0n52f88cq0rfrn1y0r";
+       revision = "2";
+       editedCabalFile = "0jrasbn4s6ac0691bf88fbflpha2vn24bd45gk0s3znvl395dxgr";
        libraryHaskellDepends = [
          attoparsec base bytestring io-streams network transformers
        ];
@@ -125180,8 +125506,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.3.2";
-       sha256 = "098vli26hrgkjxw3y1sfc7fi3wj72ka1dqy1k49z22rigisffbwj";
+       version = "0.3.5";
+       sha256 = "1ibx0pr0ddnzx5jbgkjzidkmja65gan7ji7s42v2iwn05fm125ki";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -132103,6 +132429,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {systemd = null;};
 
+  "libsystemd-journal_1_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
+     , pipes-safe, semigroups, systemd, text, transformers, uniplate
+     , unix-bytestring, unordered-containers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "libsystemd-journal";
+       version = "1.4.3";
+       sha256 = "1n79f0fzgrqyr9lw1qy8fzxsh74ai899pydpzpl6pfh2gfp7qvaq";
+       libraryHaskellDepends = [
+         base bytestring hashable hsyslog pipes pipes-safe semigroups text
+         transformers uniplate unix-bytestring unordered-containers uuid
+         vector
+       ];
+       libraryPkgconfigDepends = [ systemd ];
+       homepage = "http://github.com/ocharles/libsystemd-journal";
+       description = "Haskell bindings to libsystemd-journal";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {systemd = null;};
+
   "libtagc" = callPackage
     ({ mkDerivation, base, bytestring, glib, taglib }:
      mkDerivation {
@@ -135207,6 +135554,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_2_6" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , semigroups, stm, stm-delay, text, time, transformers
+     , transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.2.6";
+       sha256 = "091ii2cq5wns9mc3mckwjcjgav9s2jj8nnamwqd2vf24w932ilv7";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl semigroups stm
+         stm-delay text time transformers transformers-base wl-pprint-text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-effect-extra" = callPackage
     ({ mkDerivation, base, logging-effect, logging-effect-extra-file
      , logging-effect-extra-handler, wl-pprint-text
@@ -139965,6 +140336,8 @@ self: {
        pname = "megaparsec";
        version = "6.5.0";
        sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
+       revision = "1";
+       editedCabalFile = "1gfqxpzjr64jzj366ibxm5l55qba5jw7wnpc89b0mf8f752h5w1l";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -142316,8 +142689,8 @@ self: {
        pname = "mmark";
        version = "0.0.5.6";
        sha256 = "0d0jxxj0b1jy9mym6389dmm6biiw8kzdh06zj2j0gsjczn2n60zw";
-       revision = "1";
-       editedCabalFile = "02b0ycywjhzx1ll36l38mwp2gy677hgsqpq2mwyi277ykbrwnsdk";
+       revision = "2";
+       editedCabalFile = "0hzz7l9npv364yzw6i6q6699nn1raj1p2cmwmlqp43rz8s3ryawn";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -149285,6 +149658,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-carbon_1_0_12" = callPackage
+    ({ mkDerivation, base, bytestring, network, text, time, vector }:
+     mkDerivation {
+       pname = "network-carbon";
+       version = "1.0.12";
+       sha256 = "0fb1ymk1rnsppvil46pyaxlzc09l6716jbrr0h7rb5nxv0bvk5pd";
+       libraryHaskellDepends = [
+         base bytestring network text time vector
+       ];
+       homepage = "http://github.com/ocharles/network-carbon";
+       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-conduit" = callPackage
     ({ mkDerivation, base, conduit }:
      mkDerivation {
@@ -152740,8 +153128,8 @@ self: {
      }:
      mkDerivation {
        pname = "odbc";
-       version = "0.0.4";
-       sha256 = "1fh8yqdycna3if5dd55qc6hic70nwy71vjy2yflzvpjpqkdd8qz6";
+       version = "0.0.5";
+       sha256 = "06b52hd9bxidp62y2h856ac90pypcv72q533i7lywf4gjj1q0grn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -156012,8 +156400,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.1.0";
-       sha256 = "11lvsr30f0x2vsqnwr4s3j9v3n4zxx5a83qc95j5c1xijlrzcc3k";
+       version = "0.3.2.0";
+       sha256 = "0pydgdpm8fqj4dbv5swbyxkh1bkmqzj3gcas9r04vvzh6mmr22ia";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -159569,6 +159957,8 @@ self: {
        pname = "persistent";
        version = "2.8.2";
        sha256 = "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9";
+       revision = "1";
+       editedCabalFile = "18a6dfpjakcmyl9qnflgi63rss09zj3xg0py6bliary4y2cqw4fz";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers fast-logger haskell-src-meta
@@ -162583,6 +162973,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "planb-token-introspection" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers
+     , exceptions, http-client, http-client-tls, http-types, lens, mtl
+     , random, safe-exceptions, tasty, tasty-hunit, text, th-format
+     , transformers, unliftio-core
+     }:
+     mkDerivation {
+       pname = "planb-token-introspection";
+       version = "0.1.1.0";
+       sha256 = "0b54sr1zvrczjxlx9xrb5zcy1kmybv396cigqvm652k9q16zifc5";
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring containers http-client
+         http-client-tls http-types mtl safe-exceptions text transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers exceptions http-client http-types
+         lens mtl random safe-exceptions tasty tasty-hunit text th-format
+         unliftio-core
+       ];
+       homepage = "https://github.com/mtesseract/planb-token-introspection#readme";
+       description = "Token Introspection for PlanB";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plankton" = callPackage
     ({ mkDerivation, adjunctions, base, protolude }:
      mkDerivation {
@@ -162872,15 +163286,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "plot-light_0_3_3" = callPackage
+  "plot-light_0_3_3_2" = callPackage
     ({ mkDerivation, base, blaze-svg, colour, containers
      , data-default-class, hspec, mtl, QuickCheck, scientific, text
      , time
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.3.3";
-       sha256 = "1ymfrrn28l6dbvw6m6j0cqxjb027ynhcc7b7y6i7bq4gq6rd60dz";
+       version = "0.3.3.2";
+       sha256 = "0im5rw52aim1zspisdar87gyn1ar4dkk52ipcq0s41pcycbwib12";
        libraryHaskellDepends = [
          base blaze-svg colour containers data-default-class mtl scientific
          text time
@@ -168128,6 +168542,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers_2_4_9" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, filepath, mtl, parsec, syb, utf8-string
+     }:
+     mkDerivation {
+       pname = "protocol-buffers";
+       version = "2.4.9";
+       sha256 = "0d6j5k8mfxnixx9n6v7vwncy49cx9sxkhjgh1g7sbs1q15rxkn6m";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath mtl
+         parsec syb utf8-string
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
@@ -168143,6 +168575,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers-descriptor_2_4_9" = callPackage
+    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
+     mkDerivation {
+       pname = "protocol-buffers-descriptor";
+       version = "2.4.9";
+       sha256 = "0641cwi7lb53w4mi1icbgz0yghz4lwdf16y9pi0f188hp31f3b2j";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor-fork" = callPackage
     ({ mkDerivation, base, bytestring, containers
      , protocol-buffers-fork
@@ -189138,6 +189586,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "singleton-nats_0_4_1" = callPackage
+    ({ mkDerivation, base, singletons }:
+     mkDerivation {
+       pname = "singleton-nats";
+       version = "0.4.1";
+       sha256 = "1fb87qgh35z31rwzrpclf7d071krffr5vvqr1nwvpgikggfjhlss";
+       libraryHaskellDepends = [ base singletons ];
+       homepage = "https://github.com/AndrasKovacs/singleton-nats";
+       description = "Unary natural numbers relying on the singletons infrastructure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "singleton-typelits" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -190754,6 +191215,8 @@ self: {
        pname = "snap-core";
        version = "1.0.3.2";
        sha256 = "136q7l4hd5yn5hb507q1ziqx124ma1lkzh5dx0n150p8dx3rhhsc";
+       revision = "1";
+       editedCabalFile = "08ll71h3rv9bppr7xrflg4y627vnmxgfhby1kli9cj0a7ryspam1";
        libraryHaskellDepends = [
          attoparsec base bytestring bytestring-builder case-insensitive
          containers directory filepath hashable HUnit io-streams lifted-base
@@ -191005,6 +191468,8 @@ self: {
        pname = "snap-server";
        version = "1.1.0.0";
        sha256 = "0vvw9n8xs272qdlrf3dxhnva41zh3awi7pf022rrjj75lj8a77i4";
+       revision = "1";
+       editedCabalFile = "1lyx51zr1cmjyvsfplxpzv87agvvv83v3ww8m01fdh7x31np1chc";
        configureFlags = [ "-fopenssl" ];
        isLibrary = true;
        isExecutable = true;
@@ -193095,8 +193560,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.1.4";
-       sha256 = "0awj1gbrcdq4xp9dgj7q3jbfivjb4pjhkhd3acfgdqk08142fzj7";
+       version = "0.0.1.6";
+       sha256 = "10kj0ir2i72q20jbp39n5v700pivbapkyvarql9hg5sci9s73g4s";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
@@ -195013,8 +195478,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-network";
-       version = "0.1.0.0";
-       sha256 = "0l2r6r89lj1197ybsfgjxikhpgravw12zjpaz62gcsvdhdcflsak";
+       version = "0.1.0.1";
+       sha256 = "1skq3sqr5krn6gh5h684vn2w2h8zvqkdcc7yhbyri2fswahy9g1x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197336,6 +197801,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streaming-base64" = callPackage
+    ({ mkDerivation, base, safe-exceptions, streaming
+     , streaming-bytestring, tasty, tasty-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "streaming-base64";
+       version = "0.1.0.0";
+       sha256 = "0w6xj80z1z21pgxadwc48w15a08g94i4g7qkgv5gvq46kpl44bq6";
+       libraryHaskellDepends = [
+         base safe-exceptions streaming streaming-bytestring transformers
+       ];
+       testHaskellDepends = [
+         base streaming-bytestring tasty tasty-hunit
+       ];
+       description = "Streaming conversion from/to base64";
+       license = stdenv.lib.licenses.cc0;
+     }) {};
+
   "streaming-benchmarks" = callPackage
     ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, conduit
      , csv, deepseq, directory, gauge, list-t, list-transformer, logict
@@ -198735,8 +199218,8 @@ self: {
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.9.1.1";
-       sha256 = "0qvaxivxvgaz4zpgc6275j9psdipj2p7y3msv9py11z1y6r5izss";
+       version = "0.9.2.0";
+       sha256 = "16r2nm1y0s5ybrq2pzsq00nfq7k0i70nyg7ynmhx76lld82i17yv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -202825,6 +203308,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-rerun_1_1_11" = callPackage
+    ({ mkDerivation, base, containers, mtl, optparse-applicative
+     , reducers, split, stm, tagged, tasty, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-rerun";
+       version = "1.1.11";
+       sha256 = "0nk2qfdhdl71xcr0rwixmwwsyr74dy4hjwalhs4p4am2bhpfva5s";
+       libraryHaskellDepends = [
+         base containers mtl optparse-applicative reducers split stm tagged
+         tasty transformers
+       ];
+       homepage = "http://github.com/ocharles/tasty-rerun";
+       description = "Run tests by filtering the test tree depending on the result of previous test runs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-silver" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
@@ -205664,6 +206165,8 @@ self: {
        pname = "text-show-instances";
        version = "3.6.4";
        sha256 = "1a2aacy6l58b49868hhvqws4900rq9dpb8zwkb5cz45gsb7zpgjf";
+       revision = "1";
+       editedCabalFile = "0fb704bm4n99vv7cblzsg9l8i6gy2ybppp2xagh4mcrwn5g776l8";
        libraryHaskellDepends = [
          base base-compat-batteries bifunctors binary bytestring containers
          directory ghc-boot-th haskeline hoopl hpc old-locale old-time
@@ -209469,17 +209972,21 @@ self: {
      }) {};
 
   "tpdb" = callPackage
-    ({ mkDerivation, base, bytestring, containers, filepath, hashable
-     , HaXml, hxt, mtl, parsec, pretty, text, time, wl-pprint-text
+    ({ mkDerivation, base, bytestring, containers, data-default
+     , filepath, hashable, HaXml, hxt, mtl, parsec, pretty
+     , prettyprinter, text, time, xml-conduit, xml-hamlet
      }:
      mkDerivation {
        pname = "tpdb";
-       version = "1.3.3";
-       sha256 = "1xks4dcn51m3001ss231lmk8ylfpvba9d2v123vgwmjpibnkr9gs";
+       version = "1.5.2";
+       sha256 = "08cckg0n6pbj067advjppgybbwbl256igk4lirwmiav6hf1m723k";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers filepath hashable HaXml hxt mtl parsec
-         text time wl-pprint-text
+         base bytestring containers data-default filepath hashable HaXml hxt
+         mtl parsec prettyprinter text time xml-conduit xml-hamlet
        ];
+       executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring HaXml pretty ];
        homepage = "https://github.com/jwaldmann/haskell-tpdb";
        description = "Data Type for Rewriting Systems";
@@ -211526,8 +212033,8 @@ self: {
      }:
      mkDerivation {
        pname = "twee";
-       version = "2.1.4";
-       sha256 = "0anln0il67j8xhz1m73r8b02560mc8yd1rzmc03p4f7vmgxqaphv";
+       version = "2.1.5";
+       sha256 = "1v94hf1fd7n01drd6hx37zrplpzlskfmd3l8lmkb5kzy618x0cnb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -211544,8 +212051,8 @@ self: {
      }:
      mkDerivation {
        pname = "twee-lib";
-       version = "2.1.4";
-       sha256 = "0fapi6g8f6fp90hvff1g606wzi7jaacf1mnq1h801yzzi4sj3yms";
+       version = "2.1.5";
+       sha256 = "09q2dxab3s9d32ayr9a08q6lbkszrxi0hw00sar3jx31p9q3pkc2";
        libraryHaskellDepends = [
          base containers dlist ghc-prim pretty primitive transformers vector
        ];
@@ -212646,6 +213153,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-of-html_1_4_0_0" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq
+     , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck
+     , random, temporary, text, weigh
+     }:
+     mkDerivation {
+       pname = "type-of-html";
+       version = "1.4.0.0";
+       sha256 = "09dr97illgfn11javij6nmqp3cvgdf7air7kavxcdlr25nx6wkd7";
+       libraryHaskellDepends = [
+         base bytestring double-conversion ghc-prim text
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring criterion deepseq ghc ghc-paths random
+         temporary text weigh
+       ];
+       homepage = "https://github.com/knupfer/type-of-html";
+       description = "High performance type driven html generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "type-of-html-static" = callPackage
+    ({ mkDerivation, base, template-haskell, type-of-html }:
+     mkDerivation {
+       pname = "type-of-html-static";
+       version = "0.1.0.2";
+       sha256 = "00329zkxlbsjlwnw2pz2w6ahiam5c1k9j9fv2608wjfmxr8xkcr9";
+       libraryHaskellDepends = [ base template-haskell type-of-html ];
+       testHaskellDepends = [ base type-of-html ];
+       homepage = "https://github.com/knupfer/type-of-html-static";
+       description = "Optimize static parts of type-of-html";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "type-operators" = callPackage
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
@@ -213129,8 +213672,8 @@ self: {
      }:
      mkDerivation {
        pname = "typesafe-precure";
-       version = "0.6.1.1";
-       sha256 = "0dmdwlfn73anw4ap74aqnldp42383c2mi12r9y7sf1j1gyy872ac";
+       version = "0.6.2.1";
+       sha256 = "0qa9vp1fg495b2ddzbdpivlzp0maap7jxqn2xd4z2rrxbrjdlhl2";
        libraryHaskellDepends = [
          aeson aeson-pretty autoexporter base bytestring dlist
          monad-skeleton template-haskell text th-data-compat
@@ -214737,6 +215280,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "universum_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+     , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
+     , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
+     , text, transformers, type-operators, unordered-containers
+     , utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "universum";
+       version = "1.2.0";
+       sha256 = "0645gvj1p33d0fnlk09i74l11sv11bidyv44hyb2m0dls22hr89p";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq ghc-prim hashable microlens
+         microlens-mtl mtl safe-exceptions stm text transformers
+         type-operators unordered-containers utf8-string vector
+       ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
+         utf8-string
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge unordered-containers
+       ];
+       homepage = "https://github.com/serokell/universum";
+       description = "Custom prelude used in Serokell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unix_2_7_2_2" = callPackage
     ({ mkDerivation, base, bytestring, time }:
      mkDerivation {
@@ -216135,8 +216707,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
-       version = "0.1.6.0";
-       sha256 = "0qym7if90kp51f0mf8yxsw3csfpdp2mnp7aah3vc6wdh58gljva5";
+       version = "0.1.7.0";
+       sha256 = "1g5pgwkw1kqfskk131v2vaqcvyxqgslff62qamjz4dzray9fa9cp";
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -217037,6 +217609,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-unordered-containers_0_2_0_0" = callPackage
+    ({ mkDerivation, base, hashable, unordered-containers, validity }:
+     mkDerivation {
+       pname = "validity-unordered-containers";
+       version = "0.2.0.0";
+       sha256 = "08jw6acvi016lxkw6rzxfxfcx56nwfi6ka52flkq2ks8038y3syy";
+       libraryHaskellDepends = [
+         base hashable unordered-containers validity
+       ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for unordered-containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-uuid" = callPackage
     ({ mkDerivation, base, uuid, validity }:
      mkDerivation {
@@ -217049,6 +217636,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-uuid_0_1_0_0" = callPackage
+    ({ mkDerivation, base, uuid, validity }:
+     mkDerivation {
+       pname = "validity-uuid";
+       version = "0.1.0.0";
+       sha256 = "129h7cjgixq6l29n3y66zcx5ynfnxz3prqkgf2028f6w4mhd0154";
+       libraryHaskellDepends = [ base uuid validity ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for uuid";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "validity-vector" = callPackage
     ({ mkDerivation, base, hashable, validity, vector }:
      mkDerivation {
@@ -217061,6 +217661,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "validity-vector_0_2_0_0" = callPackage
+    ({ mkDerivation, base, hashable, validity, vector }:
+     mkDerivation {
+       pname = "validity-vector";
+       version = "0.2.0.0";
+       sha256 = "0kyyrcwxial9csyx40vrl0frz5yrmzqhjpy1cz8afsc7r4ph12yi";
+       libraryHaskellDepends = [ base hashable validity vector ];
+       homepage = "https://github.com/NorfairKing/validity#readme";
+       description = "Validity instances for vector";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "value-supply" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -221612,17 +222225,17 @@ self: {
     ({ mkDerivation, aeson, async, base, basement, bytestring, cereal
      , cryptonite, data-default, exceptions, generics-sop, hspec
      , hspec-contrib, hspec-discover, hspec-expectations, http-client
-     , http-client-tls, machines, memory, mtl, parsec, split, stm
-     , tagged, template-haskell, text, time, transformers
+     , machines, memory, mtl, parsec, split, stm, tagged
+     , template-haskell, text, time, transformers
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.7.0.0";
-       sha256 = "0mlrscl6f6l2jcsgw4x97p2qcd26d73wy8m13gbnhrh04d4kmd9h";
+       version = "0.7.1.0";
+       sha256 = "0ckxnnp5aqcd13p5gnk1nx7ysws6x7nmfklxqllilpzdh5ibyj59";
        libraryHaskellDepends = [
          aeson async base basement bytestring cereal cryptonite data-default
-         exceptions generics-sop http-client http-client-tls machines memory
-         mtl parsec tagged template-haskell text transformers
+         exceptions generics-sop http-client machines memory mtl parsec
+         tagged template-haskell text transformers
        ];
        testHaskellDepends = [
          async base bytestring data-default generics-sop hspec hspec-contrib
@@ -222258,8 +222871,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "1.0.3";
-       sha256 = "14hmxg7p2mq3lh7ydmjk22xr95hd37q3c95d3k6rqi2jxhjs1gvp";
+       version = "1.0.4";
+       sha256 = "0xcqhc09v81ynpfxyqb2nyjypcxw84b7ac7cwmkfwf1i71ixf28q";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -229475,6 +230088,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-test_1_6_4" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, conduit, containers
+     , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
+     , network, persistent, pretty-show, semigroups, text, time
+     , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types
+     , yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.6.4";
+       sha256 = "0nxrscg4rxdwvivpxfsc735zr8w72w5vrlgaw1mq6ikn4cwidyng";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive conduit containers cookie hspec-core html-conduit
+         http-types HUnit network persistent pretty-show semigroups text
+         time transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit text
+         unliftio wai wai-extra xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-test-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, hspec
      , http-types, HUnit, text, transformers, wai, wai-test
@@ -229500,8 +230141,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-text-markdown";
-       version = "0.1.8";
-       sha256 = "1k48wjnn4vvlh9cvh8p3yanjmr772vqz4jbz9nxk0vv9ab9dns81";
+       version = "0.1.10";
+       sha256 = "1p3xcghlazxdqwgs4d1gsbmpjpmhmx8dcxjhha5hxww4ilyqpviw";
        libraryHaskellDepends = [
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
@@ -230836,8 +231477,8 @@ self: {
      }:
      mkDerivation {
        pname = "zeromq4-patterns";
-       version = "0.3.0.0";
-       sha256 = "0y5rk13rzmyfxrxbkn38klzxgnbmqi2xg69m5l2gb2gqrza8szy7";
+       version = "0.3.1.0";
+       sha256 = "1n9yndiw0z2asslkx2nlx56w3qhb55p7ih03j52889m2f8maiwvl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From 92256a9453bde2ccb34a4d9544148f4fade924a8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:27:47 +0200
Subject: [PATCH 1032/3370] haskell-tar: drop obsolete override for ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix    | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index cf1036283126..081d53bfbe77 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -191,20 +191,6 @@ self: super: {
   });
 
   singletons = super.singletons_2_4_1;
-
-  ## Upstreamed, awaiting a Hackage release
-  tar = overrideCabal super.tar (drv: {
-    ##     • No instance for (Semigroup (Entries e))
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid (Entries e)’
-    src = pkgs.fetchFromGitHub {
-      owner  = "haskell";
-      repo   = "tar";
-      rev    = "abf2ccb8f7da0514343a0b2624cabebe081bdfa8";
-      sha256 = "0s33lgrr574i1r7zc1jqahnwx3dv47ny30mbx5zfpdzjw0jdl5ny";
-    };
-  });
-
   th-desugar = super.th-desugar_1_8;
 
   ## Upstreamed, awaiting a Hackage release

From ce6402dc79317d89a5b8bdad999c042c328b74ce Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:30:36 +0200
Subject: [PATCH 1033/3370] haskell-gi: drop obsolete override for ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix       | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 081d53bfbe77..8241500cd510 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -107,17 +107,6 @@ self: super: {
 
   ## On Hackage:
 
-  ## Upstreamed, awaiting a Hackage release
-  haskell-gi = overrideCabal super.haskell-gi (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## haskell-gi-base ==0.20.*
-    src = pkgs.fetchFromGitHub {
-      owner  = "haskell-gi";
-      repo   = "haskell-gi";
-      rev    = "30d2e6415c5b57760f8754cd3003eb07483d60e6";
-      sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr";
-    };
-  });
 
   ## Upstreamed, awaiting a Hackage release
   haskell-gi-base = overrideCabal super.haskell-gi-base (drv: {

From 756e386e417c46b7ecb142b5d6bcdb1b6801e9f1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:31:07 +0200
Subject: [PATCH 1034/3370] haskell-gi-base: drop obsolete override for
 ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix    | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 8241500cd510..7363d19fb5dc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -107,20 +107,6 @@ self: super: {
 
   ## On Hackage:
 
-
-  ## Upstreamed, awaiting a Hackage release
-  haskell-gi-base = overrideCabal super.haskell-gi-base (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## haskell-gi-base ==0.21.*
-    src = pkgs.fetchFromGitHub {
-      owner  = "haskell-gi";
-      repo   = "haskell-gi";
-      rev    = "30d2e6415c5b57760f8754cd3003eb07483d60e6";
-      sha256 = "1l3qm97gcjih695hhj80rbpnd72prnc81lg5y373yj8jk9f6ypbr";
-    };
-    prePatch        = "cd base; ";
-  });
-
   ## Upstreamed, awaiting a Hackage release
   http-api-data = overrideCabal super.http-api-data (drv: {
     ##     • No instance for (Semigroup Form)

From 0fe200796366fb154351c67e7f9dbaa595d7a74f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:37:18 +0200
Subject: [PATCH 1035/3370] haskell-simple-reflect: drop obsolete override for
 ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix     | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 7363d19fb5dc..4f76caa8918e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -152,19 +152,6 @@ self: super: {
     prePatch        = "cd lambdacube-ir.haskell; ";
   });
 
-  ## Upstreamed, awaiting a Hackage release
-  simple-reflect = overrideCabal super.simple-reflect (drv: {
-    ##     • No instance for (Semigroup Expr)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Expr’
-    src = pkgs.fetchFromGitHub {
-      owner  = "twanvl";
-      repo   = "simple-reflect";
-      rev    = "c357e55da9a712dc5dbbfe6e36394e4ada2db310";
-      sha256 = "15q41b00l8y51xzhbj5zhddyh3gi7gvml033w8mm2fih458jf6yq";
-    };
-  });
-
   singletons = super.singletons_2_4_1;
   th-desugar = super.th-desugar_1_8;
 

From 1d79794c797917d2610fae3a1a7bb99fb9147d1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:40:47 +0200
Subject: [PATCH 1036/3370] haskell-gtk2hs-buildtools: drop obsolete override
 for ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix     | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 4f76caa8918e..64d4e277d4c0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -215,19 +215,6 @@ self: super: {
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ insert-ordered-containers lens-family-core prettyprinter prettyprinter-ansi-terminal repline ]);
   });
 
-  ## Unmerged.  PR: https://github.com/gtk2hs/gtk2hs/pull/233
-  gtk2hs-buildtools = overrideCabal super.gtk2hs-buildtools (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## Cabal >=1.24.0.0 && <2.1
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "gtk2hs";
-      rev    = "08c68d5afc22dd5761ec2c92ebf49c6d252e545b";
-      sha256 = "06prn5wqq8x225n9wlbyk60f50jyjj8fm2hf181dyqjpf8wq75xa";
-    };
-    prePatch        = "cd tools; ";
-  });
-
   ## Unmerged.  PR: https://github.com/gregorycollins/hashtables/pull/46
   hashtables = overrideCabal super.hashtables (drv: {
     ##     • No instance for (Semigroup Slot)

From 451907642178743a2db96a3d0cc802d7cfc1c6d6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:41:48 +0200
Subject: [PATCH 1037/3370] haskell-dhall: update override for ghc-8.4.x to use
 the latest version

---
 .../configuration-ghc-8.4.x.nix               | 23 +------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 64d4e277d4c0..0948a70a5c79 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -193,28 +193,6 @@ self: super: {
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]);
   });
 
-  ## Unmerged.  PR: https://github.com/dhall-lang/dhall-haskell/pull/321
-  dhall = overrideCabal super.dhall (drv: {
-    ##     • No instance for (Semigroup (Parser Builder))
-    ##         arising from a use of ‘<>’
-    ##       There are instances for similar types:
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "dhall-haskell";
-      rev    = "38f3d8c861e137da6d8ac8eab88aec1c359efcac";
-      sha256 = "1pya7lhdjsygk622k1g3whj0a7jqwyym26ikxbn1anxypnb0n2wy";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## prettyprinter >=1.2.0.1 && <1.3
-    jailbreak       = true;
-    ## Setup: Encountered missing dependencies:
-    ## insert-ordered-containers -any,
-    ## lens-family-core -any,
-    ## prettyprinter-ansi-terminal -any,
-    ## repline -any
-    libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ insert-ordered-containers lens-family-core prettyprinter prettyprinter-ansi-terminal repline ]);
-  });
-
   ## Unmerged.  PR: https://github.com/gregorycollins/hashtables/pull/46
   hashtables = overrideCabal super.hashtables (drv: {
     ##     • No instance for (Semigroup Slot)
@@ -497,6 +475,7 @@ self: super: {
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;
+  dhall = self.dhall_1_13_0;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

From cdca78789946fd441461b852375277ee646c8c68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:46:23 +0200
Subject: [PATCH 1038/3370] haskell-dhall: jailbreak version 1.13.0 to fix the
 build with ansi-terminal 0.8.x

Ping: @Gabriel439
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 0948a70a5c79..b18737d97773 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -476,6 +476,7 @@ self: super: {
   pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;
   dhall = self.dhall_1_13_0;
+  dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

From 988ad012f6fe1f2f2626864f015239dc49514d83 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:48:14 +0200
Subject: [PATCH 1039/3370] haskell-hashtables: drop obsolete override for
 ghc-8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix     | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index b18737d97773..e18cd3005864 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -193,19 +193,6 @@ self: super: {
     libraryHaskellDepends = (drv.libraryHaskellDepends or []) ++ (with self; [ data-or ]);
   });
 
-  ## Unmerged.  PR: https://github.com/gregorycollins/hashtables/pull/46
-  hashtables = overrideCabal super.hashtables (drv: {
-    ##     • No instance for (Semigroup Slot)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Slot’
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "hashtables";
-      rev    = "b9eb4b10a50bd6250330422afecc065339a32412";
-      sha256 = "0l4nplpvnzzf397zyh7j2k6yiqb46k6bdy00m4zzvhlfp7p1xkaw";
-    };
-  });
-
   ## Unmerged.  PR: https://github.com/hanshoglund/monadplus/pull/3
   monadplus = overrideCabal super.monadplus (drv: {
     ##     • No instance for (Semigroup (Partial a b))

From 6ff00acd67a8067eb2bc5b3095afe2a0d11262b9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:55:11 +0200
Subject: [PATCH 1040/3370] haskell-wl-pprint-text: drop obsolete override for
 ghc-8.4.x

---
 .../configuration-ghc-8.4.x.nix               | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index e18cd3005864..4ed59fb66622 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -246,20 +246,6 @@ self: super: {
     };
   });
 
-  ## Unmerged.  PR: https://github.com/ivan-m/wl-pprint-text/pull/17
-  wl-pprint-text = overrideCabal super.wl-pprint-text (drv: {
-    ##     Ambiguous occurrence ‘<>’
-    ##     It could refer to either ‘PP.<>’,
-    ##                              imported from ‘Prelude.Compat’ at Text/PrettyPrint/Leijen/Text/Monadic.hs:73:1-36
-    src = pkgs.fetchFromGitHub {
-      owner  = "deepfire";
-      repo   = "wl-pprint-text";
-      rev    = "615b83d1e5be52d1448aa1ab2517b431a617027b";
-      sha256 = "1p67v9s878br0r152h4n37smqhkg78v8zxhf4qm6d035s4rzj76i";
-    };
-  });
-
-
   ## Non-code, configuration-only change
 
   adjunctions = overrideCabal super.adjunctions (drv: {
@@ -456,14 +442,16 @@ self: super: {
 
   # Older versions don't compile.
   brick = self.brick_0_36_3;
+  dhall = self.dhall_1_13_0;
+  dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;
   hpack = self.hpack_0_28_2;
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;
-  dhall = self.dhall_1_13_0;
-  dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
+  wl-pprint-text = self.wl-pprint-text_1_1_1_1;
+  base-compat = self.base-compat_0_10_1;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

From d59466a2e97cb0d0598cc446ad5c3cbbca85238a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 May 2018 13:59:24 +0200
Subject: [PATCH 1041/3370] all-cabal-hashes: update to latest version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 38f8030cc272..e758c56f0235 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9cd032898a8fd11b69827ff02d2f295cac0907d9.tar.gz";
-  sha256 = "1xxg3dcp5jgin978sa9510ji10p2j47x7b2n0xz00wrs9yjn5zvg";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/462dbb7e8a2ca65807ae21d1cc5f5c5454a9a327.tar.gz";
+  sha256 = "09rq2r9ydvmhk9182xl0yz4dbr84ncj8a7fc2qzln784zrd12aph";
 }

From 7c644a51a62c116339389483198c118ef8db5fd1 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 3 May 2018 14:04:50 +0200
Subject: [PATCH 1042/3370] cointop: init at 2018-05-03

---
 pkgs/applications/misc/cointop/default.nix | 30 ++++++++++++++++++++++
 pkgs/applications/misc/cointop/deps.nix    |  3 +++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 35 insertions(+)
 create mode 100644 pkgs/applications/misc/cointop/default.nix
 create mode 100644 pkgs/applications/misc/cointop/deps.nix

diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix
new file mode 100644
index 000000000000..2ac335759ce4
--- /dev/null
+++ b/pkgs/applications/misc/cointop/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name    = "cointop-unstable-${version}";
+  version = "2018-05-03";
+  rev     = "08acd96082682347d458cd4f861e2debd3255745";
+
+  goPackagePath = "github.com/miguelmota/cointop";
+
+  src = fetchgit {
+    inherit rev;
+    url    = "https://github.com/miguelmota/cointop";
+    sha256 = "14savz48wzrfpm12fgnnndpl3mpzx7wsch4jrnm3rmrfdabdx7mi";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = {
+    description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies";
+    longDescription = ''
+    cointop is a fast and lightweight interactive terminal based UI application
+    for tracking and monitoring cryptocurrency coin stats in real-time.
+
+    The interface is inspired by htop and shortcut keys are inspired by vim.
+    '';
+    homepage  = https://cointop.sh;
+    platforms = stdenv.lib.platforms.linux; # cannot test others
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/applications/misc/cointop/deps.nix b/pkgs/applications/misc/cointop/deps.nix
new file mode 100644
index 000000000000..3ba1d12a8048
--- /dev/null
+++ b/pkgs/applications/misc/cointop/deps.nix
@@ -0,0 +1,3 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82c7d36c202f..a6f300d079f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8638,6 +8638,8 @@ with pkgs;
 
   CoinMP = callPackage ../development/libraries/CoinMP { };
 
+  cointop = callPackage ../applications/misc/cointop { };
+
   commoncpp2 = callPackage ../development/libraries/commoncpp2 { };
 
   confuse = callPackage ../development/libraries/confuse { };

From 554e296c9fb46de531affb1aea54e5d29830485b Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Thu, 3 May 2018 14:00:17 +0100
Subject: [PATCH 1043/3370] Adding Zabbix agent 3.4 packages

---
 pkgs/servers/monitoring/zabbix/3.4.nix | 40 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/servers/monitoring/zabbix/3.4.nix

diff --git a/pkgs/servers/monitoring/zabbix/3.4.nix b/pkgs/servers/monitoring/zabbix/3.4.nix
new file mode 100644
index 000000000000..332e139f4283
--- /dev/null
+++ b/pkgs/servers/monitoring/zabbix/3.4.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib, pcre, libevent, libiconv }:
+
+
+let
+
+  version = "3.4.8";
+  branch = "3.4";
+
+  src = fetchurl {
+    url = "https://netix.dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
+    sha256 = "cec14993d1ec2c9d8c51f6608c9408620f27174db92edc2347bafa7b841ccc07";
+  };
+
+in
+
+{
+  agent = stdenv.mkDerivation {
+    name = "zabbix-agent-${version}";
+
+    inherit src;
+
+     configureFlags = [
+      "--enable-agent"
+      "--with-libpcre=${pcre.dev}"
+      "--with-iconv=${libiconv}"
+    ];
+    buildInputs = [ pcre libiconv ];
+
+    meta = with stdenv.lib; {
+      inherit branch;
+      description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
+      homepage = http://www.zabbix.com/;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.linux;
+    };
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a84..00c466d5add2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13002,6 +13002,7 @@ with pkgs;
 
   zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { };
   zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { };
+  zabbix34 = callPackage ../servers/monitoring/zabbix/3.4.nix { };
 
   zipkin = callPackage ../servers/monitoring/zipkin { };
 

From b62788f744225e5ff498059e7c5b9048d31f966d Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Thu, 3 May 2018 13:40:48 +0200
Subject: [PATCH 1044/3370] ledger: enable python command
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ledger in nixpkgs currently uses python (it’s in buildInputs), but the
ledger python command isn’t available until you turn it on via a cmake
flag.
---
 pkgs/applications/office/ledger/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix
index bb6e529f5d29..9675293cfe57 100644
--- a/pkgs/applications/office/ledger/default.nix
+++ b/pkgs/applications/office/ledger/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, boost, gmp, mpfr, libedit, python
-, texinfo, gnused }:
+, texinfo, gnused, usePython ? true }:
 
 stdenv.mkDerivation rec {
   name = "ledger-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
+  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" (stdenv.lib.optionalString usePython "-DUSE_PYTHON=true") ];
 
   # Skip byte-compiling of emacs-lisp files because this is currently
   # broken in ledger...

From 3641b35baee69bbe8bc41b89e0a41f4e62397003 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Thu, 3 May 2018 13:20:42 +0200
Subject: [PATCH 1045/3370] gcc7: Removed java as a target language

---
 pkgs/development/compilers/gcc/7/default.nix | 67 +++-----------------
 1 file changed, 8 insertions(+), 59 deletions(-)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index d0dd40083345..4b2624479a8e 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -2,23 +2,22 @@
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
-, langJava ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
 , enableShared ? true
 , texinfo ? null
-, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, perl ? null # optional, for texi2pod (then pod2man)
 , gmp, mpfr, libmpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
 , isl ? null # optional, for the Graphite optimization framework.
-, zlib ? null, boehmgc ? null
-, zip ? null, unzip ? null, pkgconfig ? null
+, zlib ? null
+,   pkgconfig ? null
 , gtk2 ? null, libart_lgpl ? null
 , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
 , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
 , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
-, x11Support ? langJava
+, x11Support ? false
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
@@ -33,10 +32,6 @@
 , buildPackages
 }:
 
-assert langJava     -> zip != null && unzip != null
-                       && zlib != null && boehmgc != null
-                       && perl != null;  # for `--enable-java-home'
-
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
@@ -70,29 +65,11 @@ let version = "7.3.0";
       })
       ++ optional langFortran ../gfortran-driving.patch;
 
-    javaEcj = fetchurl {
-      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
-      # `configure' time.
-
-      # XXX: Eventually we might want to take it from upstream.
-      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
-      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
-    };
-
-    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
-    # binary distribution here to allow the whole chain to be bootstrapped.
-    javaAntlr = fetchurl {
-      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
-      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
-    };
-
     xlibs = [
       libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
       xproto renderproto xextproto inputproto randrproto
     ];
 
-    javaAwtGtk = langJava && x11Support;
-
     /* Platform flags */
     platformFlags = let
         gccArch = targetPlatform.platform.gcc.arch or null;
@@ -282,13 +259,12 @@ stdenv.mkDerivation ({
 
   # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
   crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ texinfo which gettext ]
-    ++ (optional (perl != null) perl)
-    ++ (optional javaAwtGtk pkgconfig);
+    ++ (optional (perl != null) perl);
 
   # For building runtime libs
   depsBuildTarget =
@@ -303,8 +279,6 @@ stdenv.mkDerivation ({
     targetPackages.stdenv.cc.bintools # For linking code at run-time
   ] ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
-    ++ (optionals langJava [ boehmgc zip unzip ])
-    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
@@ -356,7 +330,6 @@ stdenv.mkDerivation ({
           (  optional langC        "c"
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
-          ++ optional langJava     "java"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -377,19 +350,6 @@ stdenv.mkDerivation ({
     # Optional features
     optional (isl != null) "--with-isl=${isl}" ++
 
-    # Java options
-    optionals langJava [
-      "--with-ecj-jar=${javaEcj}"
-
-      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
-      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
-      "--enable-java-home"
-      "--with-java-home=\${prefix}/lib/jvm/jre"
-    ] ++
-    optional javaAwtGtk "--enable-java-awt=gtk" ++
-    optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -428,11 +388,6 @@ stdenv.mkDerivation ({
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
   # library headers and binaries, regarless of the language being compiled.
   #
-  # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
-  # `--with-gmp' et al., e.g., when building
-  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
-  # them to $CPATH and $LIBRARY_PATH in this case.
-  #
   # Likewise, the LTO code doesn't find zlib.
   #
   # Cross-compiling, we need gcc not to read ./specs in order to build the g++
@@ -441,9 +396,6 @@ stdenv.mkDerivation ({
 
   CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
     ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
     ++ optional (libpthread != null) libpthread
     ++ optional (libpthreadCross != null) libpthreadCross
 
@@ -455,9 +407,6 @@ stdenv.mkDerivation ({
 
   LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([]
     ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
     ++ optional (libpthread != null) libpthread)
   );
 
@@ -498,8 +447,8 @@ stdenv.mkDerivation ({
 
     longDescription = ''
       The GNU Compiler Collection includes compiler front ends for C, C++,
-      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
-      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
+      libraries for these languages (libstdc++, libgomp,...).
 
       GCC development is a part of the GNU Project, aiming to improve the
       compiler used in the GNU system including the GNU/Linux variant.

From 5b6129f69c689b219ce4b92bae54216b714de819 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 3 May 2018 15:09:43 +0200
Subject: [PATCH 1046/3370] gcc49: remove darwin support

---
 pkgs/development/compilers/gcc/4.9/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index fc9e72812501..f041252495a6 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -496,8 +496,7 @@ stdenv.mkDerivation ({
     platforms =
       stdenv.lib.platforms.linux ++
       stdenv.lib.platforms.freebsd ++
-      stdenv.lib.platforms.illumos ++
-      stdenv.lib.platforms.darwin;
+      stdenv.lib.platforms.illumos;
   };
 }
 

From d4ebf4fc8f4b4eba112b0363ed149fa80bb69ccd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:01:19 -0700
Subject: [PATCH 1047/3370] opendht: 1.7.0 -> 1.7.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/opendht/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1/bin/dhtnode -h’ got 0 exit code
- ran ‘/nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1/bin/dhtnode --help’ got 0 exit code
- ran ‘/nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1/bin/dhtnode help’ got 0 exit code
- ran ‘/nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1/bin/dhtchat -h’ got 0 exit code
- ran ‘/nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1/bin/dhtchat --help’ got 0 exit code
- ran ‘/nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1/bin/dhtchat help’ got 0 exit code
- ran ‘/nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1/bin/dhtscanner -h’ got 0 exit code
- ran ‘/nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1/bin/dhtscanner --help’ got 0 exit code
- found 1.7.1 with grep in /nix/store/jaqkxg2ypkyh45w215kl1px7p8bvjvza-opendht-1.7.1
- directory tree listing: https://gist.github.com/a3f2bc9f76c4720e3fec78139e60c160
---
 pkgs/development/libraries/opendht/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index fc2068ca02ca..4265f1ee98a3 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   name = "opendht-${version}";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     rev = "${version}";
-    sha256 = "14pdih09h3bmgimmj9sa917x7kld49m91gvh0lcncink8rmbxvf1";
+    sha256 = "1702abnsaf473c56pz18xjgvc2pjhba8dyfryir5dg34zw1c94sc";
   };
 
   buildInputs = [

From ef01f17c2dcfea87669019349d7d11bb32fd4d88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 12:48:53 -0700
Subject: [PATCH 1048/3370] paml: 4.9g -> 4.9h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/paml/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/39cfy96430yznv6h3cg7zd8850i6kdl1-paml-4.9h/bin/chi2 -h’ got 0 exit code
- ran ‘/nix/store/39cfy96430yznv6h3cg7zd8850i6kdl1-paml-4.9h/bin/chi2 --help’ got 0 exit code
- ran ‘/nix/store/39cfy96430yznv6h3cg7zd8850i6kdl1-paml-4.9h/bin/chi2 help’ got 0 exit code
- found 4.9h with grep in /nix/store/39cfy96430yznv6h3cg7zd8850i6kdl1-paml-4.9h
- directory tree listing: https://gist.github.com/b2a37e7cd2b4b41178f0698f3aac69e2
---
 pkgs/applications/science/biology/paml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix
index bfadf9e704a7..fe25a04c420a 100644
--- a/pkgs/applications/science/biology/paml/default.nix
+++ b/pkgs/applications/science/biology/paml/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  version = "4.9g";
+  version = "4.9h";
   name = "paml-${version}";
   src = fetchurl {
     url = "http://abacus.gene.ucl.ac.uk/software/paml${version}.tgz";
-    sha256 = "1kxkl47azkrsmdxiymnc76c2ccc514vlfnjvvm7lwch5l43j029h";
+    sha256 = "1czdfb3naadq0d3y42isrbyja33c3p28k8dv9mxlx2h19b7zcfv2";
   };
 
   preBuild = ''

From 60dedb97c3d5ededaf447ef9b2fde0088e473133 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:15:35 -0700
Subject: [PATCH 1049/3370] liquibase: 3.6.0 -> 3.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/liquibase/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.6.1 with grep in /nix/store/h1v590v1y97p0h9l0l7fcqidh3innq8v-liquibase-3.6.1
- directory tree listing: https://gist.github.com/28753639ec583489b9e3164b2c29e0f7
---
 pkgs/development/tools/database/liquibase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
index df9addcad3cb..2c1b942169fe 100644
--- a/pkgs/development/tools/database/liquibase/default.nix
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -12,11 +12,11 @@ in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "liquibase";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
-    sha256 = "0nrszf80s5v485li7xy8jkl1wsgjq6inr33m7p85splxhdgszjlb";
+    sha256 = "0my5rh553yfb8lz1lv5gmgvqbc5pl4xjii4z5wwbbpniyxwy64q4";
   };
 
   buildInputs = [ jre makeWrapper ];

From 47e8c75a0cb20673313d639b8d070549f1ba1fac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 17:27:58 -0700
Subject: [PATCH 1050/3370] di: 4.45 -> 4.46
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/di/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/8vbvsrd7iwc19w4p86ydkmr9bxb2nnpj-di-4.46/bin/mi -h’ got 0 exit code
- ran ‘/nix/store/8vbvsrd7iwc19w4p86ydkmr9bxb2nnpj-di-4.46/bin/mi --help’ got 0 exit code
- ran ‘/nix/store/8vbvsrd7iwc19w4p86ydkmr9bxb2nnpj-di-4.46/bin/di -h’ got 0 exit code
- ran ‘/nix/store/8vbvsrd7iwc19w4p86ydkmr9bxb2nnpj-di-4.46/bin/di --help’ got 0 exit code
- found 4.46 with grep in /nix/store/8vbvsrd7iwc19w4p86ydkmr9bxb2nnpj-di-4.46
- directory tree listing: https://gist.github.com/d35cd075cfb508460c77f21a1cae002e
---
 pkgs/tools/system/di/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index 54c9bbb14060..b9fcb502124f 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "di-${version}";
-  version = "4.45";
+  version = "4.46";
 
   src = fetchurl {
     url = "http://gentoo.com/di/${name}.tar.gz";
-    sha256 = "18z56rprhpm6y0s7pqs19yf7ilq7n50020qzxdm9yra77ivdr09z";
+    sha256 = "0cskiqywiqkw44zdg4q78bjns6jjp1dz5lzdxrhpnpldc6075irw";
   };
 
   makeFlags = [ "INSTALL_DIR=$(out)" ];

From c421ed42198f287b0d0871dfac2e604c67085cc7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 23:41:21 -0700
Subject: [PATCH 1051/3370] apktool: 2.3.2 -> 2.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/apktool/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/x2im0ff8abgj4zp2al9v7339b4lqm7y2-apktool-2.3.3/bin/apktool -h’ got 0 exit code
- ran ‘/nix/store/x2im0ff8abgj4zp2al9v7339b4lqm7y2-apktool-2.3.3/bin/apktool --help’ got 0 exit code
- ran ‘/nix/store/x2im0ff8abgj4zp2al9v7339b4lqm7y2-apktool-2.3.3/bin/apktool help’ got 0 exit code
- ran ‘/nix/store/x2im0ff8abgj4zp2al9v7339b4lqm7y2-apktool-2.3.3/bin/apktool --version’ and found version 2.3.3
- found 2.3.3 with grep in /nix/store/x2im0ff8abgj4zp2al9v7339b4lqm7y2-apktool-2.3.3
- directory tree listing: https://gist.github.com/442f8aae9c8a9a0f7594fc049c97fe51
---
 pkgs/development/tools/apktool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix
index 65211ca088b4..91caf0348a4e 100644
--- a/pkgs/development/tools/apktool/default.nix
+++ b/pkgs/development/tools/apktool/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "apktool-${version}";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchurl {
     urls = [
       "https://bitbucket.org/iBotPeaches/apktool/downloads/apktool_${version}.jar"
       "https://github.com/iBotPeaches/Apktool/releases/download/v${version}/apktool_${version}.jar"
     ];
-    sha256 = "01sjrc3fwkpkr8b4w1i9amyiix02b29n0w2zcrw5sdj91n8vm3b4";
+    sha256 = "1wjpn1wxg8fid2mch5ili35xqvasa3pk8h1xaiygw5idpxh3cm0f";
   };
 
   phases = [ "installPhase" ];

From 144234bf78540d5e2c1f89428a152c7b9f92617a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 1 May 2018 00:39:27 -0700
Subject: [PATCH 1052/3370] arangodb: 3.3.7 -> 3.3.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/arangodb/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/foxx-manager --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/foxx-manager help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arangobench --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arangodump --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arangoexport --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arangoimp --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arangorestore --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arangosh --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arangovpack --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arango-dfdb --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arango-init-database --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arango-secure-installation --help’ got 0 exit code
- ran ‘/nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8/bin/arangod --help’ got 0 exit code
- found 3.3.8 with grep in /nix/store/9v5zwlwxxk5akankjbrspij0r495izy7-arangodb-3.3.8
- directory tree listing: https://gist.github.com/bf252dfee33f01f0180733cc37983efd
---
 pkgs/servers/nosql/arangodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index d460284ef045..b1003687a04d 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.7";
+  version = "3.3.8";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "1464nl2ampfkcd2kh1hmc18hh8ya73mjmxizm6wgl5yvkh56a82x";
+    sha256 = "07qz5fv4w00hs31hmx099vlzlv0x5i10b5i4h8r0bkprih8k3vg3";
   };
 
   buildInputs = [

From e1e12c04d32347df40c2ac52d2943cf8a0664327 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 11:26:17 -0700
Subject: [PATCH 1053/3370] pdfgrep: 2.0.1 -> 2.1.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pdfgrep/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.1.0 with grep in /nix/store/myh5qz0s31x6f20qqxnzbjixvsqgm7r1-pdfgrep-2.1.0
- directory tree listing: https://gist.github.com/199c1837bf332973fcb70131751ed26e
---
 pkgs/tools/typesetting/pdfgrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index 0c288ca02ccf..3509eb569b1c 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pdfgrep-${version}";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://pdfgrep.org/download/${name}.tar.gz";
-    sha256 = "07llkrkcfjwd3ybai9ad10ybhr0biffcplmy7lw4fb87nd2dfw03";
+    sha256 = "13al23c2wlpsha6c1z1h6gh5lxzphsnzpd7b78qj16rq2r46phf9";
   };
 
   postPatch = ''

From f99ded298f5b34437395cc739d52042b4dce3580 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Thu, 3 May 2018 16:02:32 +0200
Subject: [PATCH 1054/3370] Ruby: 2.3.6 -> 2.3.7, 2.4.3 -> 2.4.4, 2.5.0 ->
 2.5.1

---
 pkgs/development/interpreters/ruby/default.nix | 18 +++++++++---------
 .../interpreters/ruby/patchsets.nix            |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4ebc488d9988..b98e2c1a6739 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -200,26 +200,26 @@ let
 
 in {
   ruby_2_3 = generic {
-    version = rubyVersion "2" "3" "6" "";
+    version = rubyVersion "2" "3" "7" "";
     sha256 = {
-      src = "07jpa7fw1gyf069m7alf2b0zm53qm08w2ns45mhzmvgrg4r528l3";
-      git = "1bk59i0ygdc5z3zz3k6indfrxd2ix55np6rwvkcdpdw8svm749ds";
+      src = "0zvx5kdp1frjs9n95n7ba7dy0alax33wi3nj8034m3ppvnf39k9m";
+      git = "11wbzw2ywwfnvlkg3qjg0as2pzk5zyk63y2iis42d91lg1l2flrk";
     };
   };
 
   ruby_2_4 = generic {
-    version = rubyVersion "2" "4" "3" "";
+    version = rubyVersion "2" "4" "4" "";
     sha256 = {
-      src = "161smb52q19r9lrzy22b3bhnkd0z8wjffm0qsfkml14j5ic7a0zx";
-      git = "0x2lqbqm2rq9j5zh1p72dma56nqvdkfbgzb9wybm4y4hwhiw8c1m";
+      src = "0nmfr2lijik6cykk0zbj11zcapcrvmdvq83k3r6q3k74g4d1qkr5";
+      git = "103cs7hz1v0h84lbrippl87s4lawi20m406rs5dgxl2gr2wyjpy5";
     };
   };
 
   ruby_2_5 = generic {
-    version = rubyVersion "2" "5" "0" "";
+    version = rubyVersion "2" "5" "1" "";
     sha256 = {
-      src = "1azj0d2lzziw6iml7bx3sxpxzcdmfwfq3yhm7djyp20q1xiz7rj6";
-      git = "0d436nqmp3ykdkp4sck5bb8sf3qvx30x1p58xh8axv66mvsyc2jd";
+      src = "1c99k0fjaq7k09104h1b1cqx6mrk2b14ic1jjnxc6yav68i1ij6s";
+      git = "1j0fd16aq9x98n0kq9c3kfp2sh6xcsq8q4733p0wfqjh3vz50kyj";
     };
   };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index fc79761252f2..e53f231884d9 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -6,17 +6,17 @@ rec {
     "${patchSet}/patches/ruby/2.2/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.2/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.3.6" = ops useRailsExpress [
+  "2.3.7" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.3/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.3/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.4.3" = ops useRailsExpress [
+  "2.4.4" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
-  "2.5.0" = ops useRailsExpress [
+  "2.5.1" = ops useRailsExpress [
     "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"

From a4eedafbf8fcca68e2c46ff02c718d33a3eb9da4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 2 May 2018 21:13:02 -0700
Subject: [PATCH 1055/3370] alsaUtils: 1.1.5 -> 1.1.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/alsa-utils/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/arecord -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/arecord --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsamixer -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsamixer --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsamixer help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amixer -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amixer --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amixer help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amixer -v’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amixer --version’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amidi -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amidi --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amidi -V’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/amidi --version’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aplay -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aplay --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/speaker-test -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/speaker-test --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsaloop -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsaloop --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsabat -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsabat --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aplaymidi -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aplaymidi --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aplaymidi -V’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aplaymidi --version’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/arecordmidi -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/arecordmidi --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/arecordmidi -V’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/arecordmidi --version’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aseqdump -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aseqdump --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aseqdump -V’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/aseqdump --version’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsaucm -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsaucm --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsaucm help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsatplg -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsatplg --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsa-info.sh -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsa-info.sh --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsa-info.sh help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsaconf -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsaconf --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsactl -h’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsactl --help’ got 0 exit code
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsactl -v’ and found version 1.1.6
- ran ‘/nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6/bin/alsactl --version’ and found version 1.1.6
- found 1.1.6 with grep in /nix/store/kg9h54hxdg6hxs3agkfadacx5z8gaxiz-alsa-utils-1.1.6
- directory tree listing: https://gist.github.com/325af09e0dbb84a155838bdb37c5f89a
---
 pkgs/os-specific/linux/alsa-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index e2340939fce7..b8498c096d33 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-utils-${version}";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
       "http://alsa.cybermirror.org/utils/${name}.tar.bz2"
     ];
-    sha256 = "1s727md6mb408y2cfwzjkx23abxhampyrjdkgpyygdhxx62x42rj";
+    sha256 = "0vnkyymgwj9rfdb11nvab30dnfrylmakdfildxl0y8mj836awp0m";
   };
 
   patchPhase = ''

From 07ee2b907d8deabcf6d7fb4269ad0b681f9c0f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 3 May 2018 15:22:01 +0100
Subject: [PATCH 1056/3370] john: build with recent gcc

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f13edf9eba44..77f55ad2cbcc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3138,9 +3138,7 @@ with pkgs;
 
   go-jira = callPackage ../applications/misc/go-jira { };
 
-  john = callPackage ../tools/security/john {
-    gcc = gcc49; # doesn't build with gcc5
-  };
+  john = callPackage ../tools/security/john { };
 
   journalbeat = callPackage ../tools/system/journalbeat { };
 

From 1bb22952ce3ab473da345cc5a1403611c3f213c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 14:07:58 -0700
Subject: [PATCH 1057/3370] makeself: 2.3.1 -> 2.4.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/makeself/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/5j88qgnbbry87m8164s0a9agvz92z36q-makeself-2.4.0/bin/makeself -v’ and found version 2.4.0
- ran ‘/nix/store/5j88qgnbbry87m8164s0a9agvz92z36q-makeself-2.4.0/bin/makeself --version’ and found version 2.4.0
- found 2.4.0 with grep in /nix/store/5j88qgnbbry87m8164s0a9agvz92z36q-makeself-2.4.0
- directory tree listing: https://gist.github.com/5a4661783df3d9d6558c8f6670385b79
---
 pkgs/applications/misc/makeself/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix
index 8a752bbaf86e..a9ec2760e8ad 100644
--- a/pkgs/applications/misc/makeself/default.nix
+++ b/pkgs/applications/misc/makeself/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2.3.1";
+  version = "2.4.0";
   name = "makeself-${version}";
 
   src = fetchFromGitHub {
     owner = "megastep";
     repo = "makeself";
     rev = "release-${version}";
-    sha256 = "01r7vb9vyb99s3g5cw0c04s1ahcingynk3ki17wknlk2asjrbc4p";
+    sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n";
   };
 
   patchPhase = ''

From 51ac1d8df08d606ae5d8af95073bb74e330249f3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Thu, 3 May 2018 16:30:32 +0200
Subject: [PATCH 1058/3370] gcc8: Removed X11 components, since they were only
 used by langJava

---
 pkgs/development/compilers/gcc/8/default.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 16636f04982b..2465e6149c0a 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -12,12 +12,6 @@
 , libelf                      # optional, for link-time optimizations (LTO)
 , isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null
-, pkgconfig ? null
-, gtk2 ? null, libart_lgpl ? null
-, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
-, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
-, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
-, x11Support ? false
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
@@ -60,11 +54,6 @@ let version = "8.1.0";
       }) */
       ++ optional langFortran ../gfortran-driving.patch;
 
-    xlibs = [
-      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
-      xproto renderproto xextproto inputproto randrproto
-    ];
-
     /* Platform flags */
     platformFlags = let
         gccArch = targetPlatform.platform.gcc.arch or null;
@@ -150,9 +139,6 @@ let version = "8.1.0";
 
 in
 
-# We need all these X libraries when building AWT with GTK+.
-assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
-
 stdenv.mkDerivation ({
   name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
 

From 719810d47423a636f5d07391095220fadc3b7e41 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Thu, 3 May 2018 16:43:51 +0200
Subject: [PATCH 1059/3370] gcc7: Removed X11 components, since they were only
 used by langJava

See also:

https://github.com/NixOS/nixpkgs/pull/39866/commits/51ac1d8df08d606ae5d8af95073bb74e330249f3
https://github.com/NixOS/nixpkgs/pull/39866#discussion_r185813776
---
 pkgs/development/compilers/gcc/7/default.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 4b2624479a8e..c25c2a260295 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -12,12 +12,6 @@
 , libelf                      # optional, for link-time optimizations (LTO)
 , isl ? null # optional, for the Graphite optimization framework.
 , zlib ? null
-,   pkgconfig ? null
-, gtk2 ? null, libart_lgpl ? null
-, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
-, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
-, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
-, x11Support ? false
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
@@ -65,11 +59,6 @@ let version = "7.3.0";
       })
       ++ optional langFortran ../gfortran-driving.patch;
 
-    xlibs = [
-      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
-      xproto renderproto xextproto inputproto randrproto
-    ];
-
     /* Platform flags */
     platformFlags = let
         gccArch = targetPlatform.platform.gcc.arch or null;
@@ -155,9 +144,6 @@ let version = "7.3.0";
 
 in
 
-# We need all these X libraries when building AWT with GTK+.
-assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
-
 stdenv.mkDerivation ({
   name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
 

From 1991f5b223214e6f824c91a890fb3335e69ccec4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 May 2018 09:27:21 -0700
Subject: [PATCH 1060/3370] electrum-ltc: 3.1.2.1 -> 3.1.3.1 (#39440)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/electrum-ltc/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/j1k6vy1aswd5nm2h1y5b5807jwv5lvz8-electrum-ltc-3.1.3.1/bin/.electrum-ltc-wrapped -h’ got 0 exit code
- ran ‘/nix/store/j1k6vy1aswd5nm2h1y5b5807jwv5lvz8-electrum-ltc-3.1.3.1/bin/.electrum-ltc-wrapped --help’ got 0 exit code
- ran ‘/nix/store/j1k6vy1aswd5nm2h1y5b5807jwv5lvz8-electrum-ltc-3.1.3.1/bin/.electrum-ltc-wrapped help’ got 0 exit code
- ran ‘/nix/store/j1k6vy1aswd5nm2h1y5b5807jwv5lvz8-electrum-ltc-3.1.3.1/bin/electrum-ltc -h’ got 0 exit code
- ran ‘/nix/store/j1k6vy1aswd5nm2h1y5b5807jwv5lvz8-electrum-ltc-3.1.3.1/bin/electrum-ltc --help’ got 0 exit code
- ran ‘/nix/store/j1k6vy1aswd5nm2h1y5b5807jwv5lvz8-electrum-ltc-3.1.3.1/bin/electrum-ltc help’ got 0 exit code
- found 3.1.3.1 with grep in /nix/store/j1k6vy1aswd5nm2h1y5b5807jwv5lvz8-electrum-ltc-3.1.3.1
- directory tree listing: https://gist.github.com/b26f1ac3c0cbfa08852ab2610031bb4c
---
 pkgs/applications/misc/electrum/ltc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 7852e6eb790e..45c448804626 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -5,11 +5,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "electrum-ltc-${version}";
-  version = "3.1.2.1";
+  version = "3.1.3.1";
 
   src = fetchurl {
     url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
-    sha256 = "0sdql4k8g3py941rzdskm3k4hkwam4hzvg4qlvs0b5pw139mri86";
+    sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 7bb789bc984016730a019fa5cf65e387e0798b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 May 2018 14:17:38 -0300
Subject: [PATCH 1061/3370] jwm: 1653 -> 1685

---
 pkgs/applications/window-managers/jwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 05f89728f6a7..9085385fe256 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "jwm-${version}";
-  version = "1653";
+  version = "1685";
   
   src = fetchFromGitHub {
     owner = "joewing";
     repo = "jwm";
     rev = "s${version}";
-    sha256 = "09ci3g97xmif66pp9n4sdvdmlxpw67pwp8lbjynxhdvha5pwwpv5";
+    sha256 = "1kyvy022sij898g2hm5spy5vq0kw6aqd7fsnawl2xyh06gwh29wg";
   };
 
   nativeBuildInputs = [ pkgconfig automake autoconf libtool gettext which ];

From 542ef2b182dff9756abf782a650f80599c515e4a Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Thu, 3 May 2018 19:21:51 +0200
Subject: [PATCH 1062/3370] terraform-provider-ibm: 0.8.0 -> 0.9.1 (#39933)

---
 .../networking/cluster/terraform-provider-ibm/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
index 9764e029d277..304df0947acf 100644
--- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix
@@ -12,7 +12,7 @@
 
 buildGoPackage rec {
   name = "terraform-provider-ibm-${version}";
-  version = "0.8.0";
+  version = "0.9.1";
 
   goPackagePath = "github.com/terraform-providers/terraform-provider-ibm";
   subPackages = [ "./" ];
@@ -20,7 +20,7 @@ buildGoPackage rec {
   src = fetchFromGitHub {
     owner = "IBM-Cloud";
     repo = "terraform-provider-ibm";
-    sha256 = "1jc1g2jadh02z4lfqnvgqk5cqrzk8pnn3cj3cwsm3ksa8pccf6w4";
+    sha256 = "1j8v7r5lsvrg1afdbwxi8vq665qr47a9pddqgmpkirh99pzixgr6";
     rev = "v${version}";
   };
 

From 0a4622cfe9e6ba800e57e0cbe8515a6e6fac8783 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <philhorst@science.ru.nl>
Date: Thu, 3 May 2018 19:42:42 +0200
Subject: [PATCH 1063/3370] gcc-snapshot: Removed java as a target language

---
 .../compilers/gcc/snapshot/default.nix        | 76 ++-----------------
 1 file changed, 6 insertions(+), 70 deletions(-)

diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index d37cfac3fa85..ed7634b87db3 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -2,23 +2,16 @@
 , langC ? true, langCC ? true, langFortran ? false
 , langObjC ? targetPlatform.isDarwin
 , langObjCpp ? targetPlatform.isDarwin
-, langJava ? false
 , langGo ? false
 , profiledCompiler ? false
 , staticCompiler ? false
 , enableShared ? true
 , texinfo ? null
-, perl ? null # optional, for texi2pod (then pod2man); required for Java
+, perl ? null # optional, for texi2pod (then pod2man)
 , gmp, mpfr, libmpc, gettext, which
 , libelf                      # optional, for link-time optimizations (LTO)
 , isl ? null # optional, for the Graphite optimization framework.
-, zlib ? null, boehmgc ? null
-, zip ? null, unzip ? null, pkgconfig ? null
-, gtk2 ? null, libart_lgpl ? null
-, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
-, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
-, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
-, x11Support ? langJava
+, zlib ? null
 , enableMultilib ? false
 , enablePlugin ? hostPlatform == buildPlatform # Whether to support user-supplied plug-ins
 , name ? "gcc"
@@ -34,10 +27,6 @@
 , buildPackages
 }:
 
-assert langJava     -> zip != null && unzip != null
-                       && zlib != null && boehmgc != null
-                       && perl != null;  # for `--enable-java-home'
-
 # LTO needs libelf and zlib.
 assert libelf != null -> zlib != null;
 
@@ -63,29 +52,6 @@ let version = "7-20170409";
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langFortran ../gfortran-driving.patch;
 
-    javaEcj = fetchurl {
-      # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
-      # `configure' time.
-
-      # XXX: Eventually we might want to take it from upstream.
-      url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
-      sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
-    };
-
-    # Antlr (optional) allows the Java `gjdoc' tool to be built.  We want a
-    # binary distribution here to allow the whole chain to be bootstrapped.
-    javaAntlr = fetchurl {
-      url = http://www.antlr.org/download/antlr-4.4-complete.jar;
-      sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz";
-    };
-
-    xlibs = [
-      libX11 libXt libSM libICE libXtst libXrender libXrandr libXi
-      xproto renderproto xextproto inputproto randrproto
-    ];
-
-    javaAwtGtk = langJava && x11Support;
-
     /* Platform flags */
     platformFlags = let
         gccArch = targetPlatform.platform.gcc.arch or null;
@@ -166,9 +132,6 @@ let version = "7-20170409";
 
 in
 
-# We need all these X libraries when building AWT with GTK+.
-assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
-
 stdenv.mkDerivation ({
   name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;
 
@@ -245,13 +208,12 @@ stdenv.mkDerivation ({
 
   # TODO(@Ericson2314): Make passthru instead. Weird to avoid mass rebuild,
   crossStageStatic = targetPlatform == hostPlatform || crossStageStatic;
-  inherit noSysDirs staticCompiler langJava
+  inherit noSysDirs staticCompiler
     libcCross crossMingw;
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ texinfo which gettext ]
-    ++ (optional (perl != null) perl)
-    ++ (optional javaAwtGtk pkgconfig);
+    ++ (optional (perl != null) perl);
 
   # For building runtime libs
   depsBuildTarget =
@@ -266,8 +228,6 @@ stdenv.mkDerivation ({
     targetPackages.stdenv.cc.bintools # For linking code at run-time
   ] ++ (optional (isl != null) isl)
     ++ (optional (zlib != null) zlib)
-    ++ (optionals langJava [ boehmgc zip unzip ])
-    ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs))
     ++ (optionals (targetPlatform != hostPlatform) [targetPackages.stdenv.cc.bintools])
 
     # The builder relies on GNU sed (for instance, Darwin's `sed' fails with
@@ -319,7 +279,6 @@ stdenv.mkDerivation ({
           (  optional langC        "c"
           ++ optional langCC       "c++"
           ++ optional langFortran  "fortran"
-          ++ optional langJava     "java"
           ++ optional langGo       "go"
           ++ optional langObjC     "objc"
           ++ optional langObjCpp   "obj-c++"
@@ -340,18 +299,6 @@ stdenv.mkDerivation ({
     # Optional features
     optional (isl != null) "--with-isl=${isl}" ++
 
-    # Java options
-    optionals langJava [
-      "--with-ecj-jar=${javaEcj}"
-
-      # Follow Sun's layout for the convenience of IcedTea/OpenJDK.  See
-      # <http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2010-April/008888.html>.
-      "--enable-java-home"
-      "--with-java-home=\${prefix}/lib/jvm/jre"
-    ] ++
-    optional javaAwtGtk "--enable-java-awt=gtk" ++
-    optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" ++
-
     platformFlags ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
@@ -388,11 +335,6 @@ stdenv.mkDerivation ({
   # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find the
   # library headers and binaries, regarless of the language being compiled.
   #
-  # Note: When building the Java AWT GTK+ peer, the build system doesn't honor
-  # `--with-gmp' et al., e.g., when building
-  # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just add
-  # them to $CPATH and $LIBRARY_PATH in this case.
-  #
   # Likewise, the LTO code doesn't find zlib.
   #
   # Cross-compiling, we need gcc not to read ./specs in order to build the g++
@@ -401,9 +343,6 @@ stdenv.mkDerivation ({
 
   CPATH = optionals (targetPlatform == hostPlatform) (makeSearchPathOutput "dev" "include" ([]
     ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
     ++ optional (libpthread != null) libpthread
     ++ optional (libpthreadCross != null) libpthreadCross
 
@@ -415,9 +354,6 @@ stdenv.mkDerivation ({
 
   LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath ([]
     ++ optional (zlib != null) zlib
-    ++ optional langJava boehmgc
-    ++ optionals javaAwtGtk xlibs
-    ++ optionals javaAwtGtk [ gmp mpfr ]
     ++ optional (libpthread != null) libpthread)
   );
 
@@ -458,8 +394,8 @@ stdenv.mkDerivation ({
 
     longDescription = ''
       The GNU Compiler Collection includes compiler front ends for C, C++,
-      Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well
-      as libraries for these languages (libstdc++, libgcj, libgomp,...).
+      Objective-C, Fortran, OpenMP for C/C++/Fortran, and Ada, as well as
+      libraries for these languages (libstdc++, libgomp,...).
 
       GCC development is a part of the GNU Project, aiming to improve the
       compiler used in the GNU system including the GNU/Linux variant.

From 143978a477e4891bd94be6d9fcf257f726b403cd Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 00:58:11 -0500
Subject: [PATCH 1064/3370] treewide: remove platform assertions

linux: readd assertion
---
 pkgs/applications/audio/spotify/default.nix          |  2 --
 pkgs/applications/editors/jetbrains/default.nix      |  2 --
 pkgs/applications/editors/sublime/2/default.nix      |  4 ++--
 pkgs/applications/editors/sublime/3/common.nix       |  3 +--
 pkgs/applications/graphics/draftsight/default.nix    |  4 +---
 pkgs/applications/misc/ipmiview/default.nix          |  2 --
 pkgs/applications/misc/minergate/default.nix         | 11 ++++-------
 pkgs/applications/misc/playonlinux/default.nix       |  2 --
 .../networking/browsers/firefox-bin/default.nix      |  2 --
 .../browsers/mozilla-plugins/trezor/default.nix      |  7 +++----
 pkgs/applications/networking/ike/default.nix         |  2 --
 .../networking/instant-messengers/jitsi/default.nix  |  2 --
 .../networking/instant-messengers/viber/default.nix  |  4 +---
 pkgs/applications/networking/irc/quassel/default.nix |  2 --
 .../mailreaders/thunderbird-bin/default.nix          |  2 --
 pkgs/applications/office/mendeley/default.nix        |  4 +---
 pkgs/applications/science/logic/verifast/default.nix |  1 -
 .../version-management/git-and-tools/default.nix     |  2 +-
 .../git-and-tools/git-recent/default.nix             | 12 +++---------
 .../desktops/gnome-2/desktop/libgweather/default.nix |  2 --
 pkgs/development/compilers/oraclejdk/jdk10-linux.nix |  1 -
 pkgs/development/libraries/glib/default.nix          |  1 -
 pkgs/development/mobile/androidenv/androidndk.nix    |  2 --
 .../development/mobile/androidenv/androidndk_r8e.nix |  2 --
 pkgs/development/mobile/flashtool/default.nix        |  4 +---
 pkgs/development/tools/iaca/2.1.nix                  |  1 -
 pkgs/development/tools/iaca/3.0.nix                  |  1 -
 pkgs/development/tools/misc/saleae-logic/default.nix |  4 +---
 pkgs/development/tools/phantomjs/default.nix         |  1 -
 pkgs/games/adom/default.nix                          |  3 ---
 pkgs/games/sdlmame/default.nix                       |  4 +---
 pkgs/games/terraria-server/default.nix               |  3 +--
 pkgs/games/tibia/default.nix                         |  1 -
 pkgs/games/ue4demos/default.nix                      |  6 +-----
 pkgs/misc/drivers/gutenprint/bin.nix                 |  8 +++-----
 pkgs/misc/emulators/pcsx2/default.nix                |  2 --
 pkgs/misc/emulators/wine/base.nix                    |  5 ++---
 pkgs/misc/foldingathome/default.nix                  |  5 ++---
 .../darwin/native-x11-and-opengl/default.nix         |  2 --
 pkgs/os-specific/linux/blcr/default.nix              |  1 -
 pkgs/os-specific/linux/bluez/default.nix             |  2 --
 pkgs/os-specific/linux/cpufrequtils/default.nix      |  2 --
 pkgs/os-specific/linux/drbd/default.nix              |  2 --
 pkgs/os-specific/linux/libcap/default.nix            |  8 +++-----
 pkgs/os-specific/linux/lsscsi/default.nix            |  2 --
 pkgs/os-specific/linux/mdadm/default.nix             |  2 --
 pkgs/os-specific/linux/mwprocapture/default.nix      |  3 ---
 pkgs/os-specific/linux/phc-intel/default.nix         |  1 -
 pkgs/os-specific/linux/psmisc/default.nix            |  2 --
 .../linux/systemd/cryptsetup-generator.nix           |  2 --
 pkgs/os-specific/linux/systemd/default.nix           |  2 --
 pkgs/os-specific/linux/uclibc/default.nix            |  1 -
 pkgs/os-specific/linux/upower/default.nix            |  2 --
 .../linux/xf86-input-multitouch/default.nix          |  2 --
 pkgs/servers/sql/oracle-xe/default.nix               |  3 +--
 pkgs/tools/audio/aucdtect/default.nix                |  2 --
 pkgs/tools/filesystems/yandex-disk/default.nix       |  5 +----
 pkgs/tools/misc/megacli/default.nix                  |  3 +--
 pkgs/tools/misc/pk2cmd/default.nix                   |  2 --
 pkgs/tools/networking/filegive/default.nix           |  2 --
 pkgs/tools/networking/logmein-hamachi/default.nix    |  2 --
 pkgs/tools/networking/miniupnpd/default.nix          |  2 --
 pkgs/tools/networking/ssmtp/default.nix              |  4 ++--
 pkgs/tools/security/enpass/default.nix               | 12 ++++++------
 pkgs/tools/system/storebrowse/default.nix            |  2 --
 65 files changed, 43 insertions(+), 158 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 324818736694..1a4f2bdd1b5b 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -2,8 +2,6 @@
 , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }:
 
-assert stdenv.system == "x86_64-linux";
-
 let
   # Please update the stable branch!
   # Latest version number can be found at:
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 3b3a9cde76c9..98172ce1905b 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -3,8 +3,6 @@
 , androidsdk, jdk, cmake, libxml2, zlib, python3, ncurses
 }:
 
-assert stdenv.isLinux;
-
 with stdenv.lib;
 
 let
diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix
index 9cf5bd97d0a3..78c2d9aaa0c4 100644
--- a/pkgs/applications/editors/sublime/2/default.nix
+++ b/pkgs/applications/editors/sublime/2/default.nix
@@ -2,11 +2,10 @@
 let
   libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo];
 in
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
   name = "sublimetext-2.0.2";
-  src = 
+  src =
     if stdenv.system == "i686-linux" then
       fetchurl {
         name = "sublimetext-2.0.2.tar.bz2";
@@ -55,5 +54,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Sophisticated text editor for code, markup and prose";
     license = stdenv.lib.licenses.unfree;
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix
index 7185a82a9601..628993dbf5be 100644
--- a/pkgs/applications/editors/sublime/3/common.nix
+++ b/pkgs/applications/editors/sublime/3/common.nix
@@ -4,7 +4,6 @@
   pkexecPath ? "/run/wrappers/bin/pkexec", libredirect,
   gksuSupport ? false, gksu, unzip, zip, bash}:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 assert gksuSupport -> gksu != null;
 
 let
@@ -114,6 +113,6 @@ in stdenv.mkDerivation (rec {
     homepage = https://www.sublimetext.com/;
     maintainers = with maintainers; [ wmertens demin-dmitriy zimbatm ];
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
   };
 })
diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index 9ab43ff94337..b604099096ff 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -4,8 +4,6 @@
   libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
   libXrender, libXcomposite }:
 
-assert stdenv.system == "x86_64-linux";
-
 let version = "2017-SP2"; in
 stdenv.mkDerivation {
   name = "draftsight-${version}";
@@ -71,6 +69,6 @@ stdenv.mkDerivation {
     homepage = https://www.3ds.com/products-services/draftsight-cad-software/;
     license = stdenv.lib.licenses.unfree;
     maintainers = with maintainers; [ hodapp ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
index ebc13766cccb..638765840cb9 100644
--- a/pkgs/applications/misc/ipmiview/default.nix
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
    name = "IPMIView-${version}";
    version = "2.13.0";
diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix
index acf0731f0aeb..d11e889e932c 100644
--- a/pkgs/applications/misc/minergate/default.nix
+++ b/pkgs/applications/misc/minergate/default.nix
@@ -1,12 +1,10 @@
 { fetchurl, stdenv, dpkg, makeWrapper, fontconfig, freetype, openssl, xorg, xkeyboard_config }:
 
-assert stdenv.system == "x86_64-linux";
-
 stdenv.mkDerivation rec {
   version = "8.1";
   name = "minergate-${version}";
   src = fetchurl {
-  	url = "https://minergate.com/download/ubuntu";
+    url = "https://minergate.com/download/ubuntu";
     sha256 = "1dbbbb8e0735cde239fca9e82c096dcc882f6cecda20bba7c14720a614c16e13";
   };
 
@@ -15,12 +13,12 @@ stdenv.mkDerivation rec {
   phases = [ "installPhase" ];
 
   installPhase = ''
-    dpkg-deb -x $src $out    
+    dpkg-deb -x $src $out
     pgm=$out/opt/minergate/minergate
 
     interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
     patchelf --set-interpreter "$interpreter" $pgm
-   
+
     wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ fontconfig freetype openssl stdenv.cc.cc xorg.libX11 xorg.libxcb ]} --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
 
     rm $out/usr/bin/minergate
@@ -35,5 +33,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ bfortz ];
     platforms = [ "x86_64-linux" ];
 };
-}	
-
+}
diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index 9fb15aab2d45..2ad6321d5191 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -21,8 +21,6 @@
 , curl
 }:
 
-assert stdenv.isLinux;
-
 let
   version = "4.2.12";
 
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 5b01daeef510..97ce7d06c411 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -48,8 +48,6 @@
 , gnupg
 }:
 
-assert stdenv.isLinux;
-
 let
 
   inherit (generated) version sources;
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
index db871c0c9a5b..fb6e85ccdbba 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/trezor/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, dpkg, zlib }:
 
-assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
-
 stdenv.mkDerivation {
   name = "TREZOR-bridge-1.0.5";
 
@@ -42,6 +40,7 @@ stdenv.mkDerivation {
       # Download URL, .deb content & hash (yikes) changed, not version.
       # New archive doesn't contain any Mozilla plugin at all.
       broken = true;
-    };
+      platforms = platforms.linux;
+   };
 
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix
index a5c21e28c3d6..7953f35507d1 100644
--- a/pkgs/applications/networking/ike/default.nix
+++ b/pkgs/applications/networking/ike/default.nix
@@ -1,8 +1,6 @@
 { stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper
 , gcc, nettools, iproute, linuxHeaders }:
 
-assert stdenv.isLinux;
-
 # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp";
 # launch with "iked -f /etc/iked.conf"
 
diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
index 1d03c2f47c89..681a8119ac03 100644
--- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix
@@ -3,8 +3,6 @@
 , alsaLib, dbus_libs, gtk2, libpulseaudio, openssl, xorg
 }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "jitsi-${version}";
   version = "2.10.5550";
diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix
index 3c164820019b..781912f665d5 100644
--- a/pkgs/applications/networking/instant-messengers/viber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/viber/default.nix
@@ -3,8 +3,6 @@
  libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
 }:
 
-assert stdenv.system == "x86_64-linux";
-
 stdenv.mkDerivation rec {
   name = "viber-${version}";
   version = "7.0.0.1035";
@@ -99,7 +97,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.viber.com;
     description = "An instant messaging and Voice over IP (VoIP) app";
     license = stdenv.lib.licenses.unfree;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with stdenv.lib.maintainers; [ jagajaga ];
   };
 
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix
index 7c685b9df6b9..739842bbec3a 100644
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@@ -24,8 +24,6 @@ let
     buildCore = monolithic || daemon;
 in
 
-assert stdenv.isLinux;
-
 assert monolithic -> !client && !daemon;
 assert client || daemon -> !monolithic;
 assert !buildClient -> !withKDE; # KDE is used by the client only
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 9dbc99cac7d0..759cf74ba9d0 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -43,8 +43,6 @@
 , gnupg
 }:
 
-assert stdenv.isLinux;
-
 # imports `version` and `sources`
 with (import ./release_sources.nix);
 
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index a0a825201524..15a57ba9de4b 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -34,8 +34,6 @@
 , writeScript
 }:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
 let
   arch32 = "i686-linux";
   arch64 = "x86_64-linux";
@@ -140,7 +138,7 @@ stdenv.mkDerivation {
     homepage = http://www.mendeley.com;
     description = "A reference manager and academic social network";
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers  = with maintainers; [ dtzWill ];
   };
 
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index 8229af9649f8..22eb5d07f1c1 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype
 , fontconfig, libxml2, gnome2 }:
 
-assert stdenv.isLinux;
 let
 
   libPath = stdenv.lib.makeLibraryPath
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 73659a32f4bf..2bd8697c8ec1 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -82,7 +82,7 @@ rec {
   git-radar = callPackage ./git-radar { };
 
   git-recent = callPackage ./git-recent {
-    utillinux = if stdenv.isLinux then utillinuxMinimal else null;
+    utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
   };
 
   git-remote-hg = callPackage ./git-remote-hg { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
index 0272d4414607..82bcbf74a9eb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-recent/default.nix
@@ -1,15 +1,9 @@
 {stdenv, git, less, fetchFromGitHub, makeWrapper
 # utillinuxMinimal is included because we need the column command
-, utillinux ? null
+, utillinux
 }:
 
-assert stdenv.isLinux -> utillinux != null;
-
-let
-  binpath = stdenv.lib.makeBinPath
-    ([ git less ]
-    ++ stdenv.lib.optional (utillinux != null) utillinux);
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "git-recent-${version}";
   version = "1.0.4";
 
@@ -28,7 +22,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp git-recent $out/bin
     wrapProgram $out/bin/git-recent \
-      --prefix PATH : "${binpath}"
+      --prefix PATH : "${stdenv.lib.makeBinPath [ git less utillinux ]}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
index 4b1daa3af90b..ab68acda2770 100644
--- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "libgweather-2.30.3";
   src = fetchurl {
diff --git a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
index 642c17dc6d3f..b93a13abc9ca 100644
--- a/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk10-linux.nix
@@ -25,7 +25,6 @@
 , setJavaClassPath
 }:
 
-assert stdenv.system == "x86_64-linux";
 assert swingSupport -> xorg != null;
 
 let
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index d2dc9a8c637b..403f0e8aa995 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -9,7 +9,6 @@
 
 with stdenv.lib;
 
-assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU || hostPlatform.isCygwin;
 assert stdenv.isLinux -> utillinuxMinimal != null;
 
 # TODO:
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 81ec5732b9a2..2fe4005532d4 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -3,8 +3,6 @@
 , platformTools
 }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "android-ndk-r10e";
 
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index 271a18e4ee06..3b5da19da9e1 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -3,8 +3,6 @@
 , platformTools
 }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "android-ndk-r8e";
 
diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index be4fc0f7f545..601b0b319bc8 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -1,7 +1,5 @@
 { stdenv, requireFile, p7zip, jre, libusb1, platformTools, gtk2, glib, libXtst }:
 
-assert stdenv.system == "i686-linux";
-
 # TODO:
 #
 #   The FlashTool and FlashToolConsole scripts are messy and should probably we
@@ -57,7 +55,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.flashtool.net/;
     description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra";
     license = stdenv.lib.licenses.unfreeRedistributableFirmware;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "i686-linux" ];
     hydraPlatforms = stdenv.lib.platforms.none;
     broken = true;
   };
diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix
index c434fd5a7dec..e71e296212cd 100644
--- a/pkgs/development/tools/iaca/2.1.nix
+++ b/pkgs/development/tools/iaca/2.1.nix
@@ -1,5 +1,4 @@
 { stdenv, makeWrapper, requireFile, patchelf, gcc, unzip }:
-assert stdenv.system == "x86_64-linux";
 with stdenv.lib;
 
 # v2.1: last version with NHM/WSM arch support
diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix
index 025dfc56721d..af738bc71a93 100644
--- a/pkgs/development/tools/iaca/3.0.nix
+++ b/pkgs/development/tools/iaca/3.0.nix
@@ -1,5 +1,4 @@
 { stdenv, requireFile, patchelf, unzip }:
-assert stdenv.system == "x86_64-linux";
 with stdenv.lib;
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix
index de2d6c5b7bfd..a8183aa4ba08 100644
--- a/pkgs/development/tools/misc/saleae-logic/default.nix
+++ b/pkgs/development/tools/misc/saleae-logic/default.nix
@@ -21,8 +21,6 @@ let
 
 in
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
 stdenv.mkDerivation rec {
   pname = "saleae-logic";
   version = "1.2.10";
@@ -93,7 +91,7 @@ stdenv.mkDerivation rec {
     description = "Software for Saleae logic analyzers";
     homepage = http://www.saleae.com/;
     license = licenses.unfree;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "i686-linux" ];
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index 8b6b655b6a56..51a83760be39 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -3,7 +3,6 @@
 let
   platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
 in
-assert lib.elem stdenv.system platforms;
 
 stdenv.mkDerivation rec {
   name = "phantomjs-1.9.8";
diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix
index fd575975fed5..9766e58c15ae 100644
--- a/pkgs/games/adom/default.nix
+++ b/pkgs/games/adom/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU_combined, alsaLib, libpulseaudio
 , xorg }:
 
-assert stdenv.system == "x86_64-linux";
 let
 
   inherit (xorg) libXext libX11;
@@ -58,5 +57,3 @@ stdenv.mkDerivation rec {
     platforms = ["x86_64-linux"];
   };
 }
-
-
diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix
index 947e52e1f13d..fa498b8e0411 100644
--- a/pkgs/games/sdlmame/default.nix
+++ b/pkgs/games/sdlmame/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, alsaLib, qt48, SDL, fontconfig, freetype, SDL_ttf, xorg }:
 
-assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
-
 stdenv.mkDerivation rec {
   version = "0.151.u0-1";
   name    = "sdlmame-${version}";
@@ -39,6 +37,6 @@ stdenv.mkDerivation rec {
     description = "A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support";
     license     = "MAME";
     maintainers = with maintainers; [ lovek323 ];
-    platforms   = platforms.linux;
+    platforms   = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix
index 1c145f6d71c0..65dc77fbf16f 100644
--- a/pkgs/games/terraria-server/default.nix
+++ b/pkgs/games/terraria-server/default.nix
@@ -1,5 +1,4 @@
 { stdenv, lib, file, fetchurl, unzip }:
-assert stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
   name    = "terraria-server-${version}";
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = http://terraria.org;
     description = "Dedicated server for Terraria, a 2D action-adventure sandbox";
-    platforms = platforms.linux;
+    platforms = ["x86_64-linux"];
     license = licenses.unfree;
   };
 }
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index e5bb211eb227..e0f9bae2e39b 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }:
 
 with stdenv.lib;
-assert stdenv.isi686;
 stdenv.mkDerivation {
   name = "tibia-10.90";
 
diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
index 4bac1cd1bb35..0bdb759048ad 100644
--- a/pkgs/games/ue4demos/default.nix
+++ b/pkgs/games/ue4demos/default.nix
@@ -1,8 +1,5 @@
 { stdenv, fetchurl, unzip, patchelf, xorg, openal }:
 
-assert stdenv.isLinux;
-assert stdenv.isx86_64;
-
 let
   buildDemo = { name, src }:
     stdenv.mkDerivation rec {
@@ -47,7 +44,7 @@ let
       meta = {
         description = "Unreal Engine 4 Linux demos";
         homepage = https://wiki.unrealengine.com/Linux_Demos;
-        platforms = stdenv.lib.platforms.linux;
+        platforms = [ "x86_64-linux" ];
         license = stdenv.lib.licenses.unfree;
       };
     };
@@ -189,4 +186,3 @@ in {
     };
   };
 }
-
diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix
index ac3e96e26589..021852f3505c 100644
--- a/pkgs/misc/drivers/gutenprint/bin.nix
+++ b/pkgs/misc/drivers/gutenprint/bin.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, rpm, cpio, zlib }:
 
-assert stdenv.system == "x86_64-linux";
-
 /* usage: (sorry, its still impure but works!)
 
 impure directory:
@@ -23,7 +21,7 @@ sed -n 's/^ServerBin //p' $(sed -n 's/respawn.*-c \(.*''\) -F.*''/\1/p' /etc/eve
 then. I've tried that.
 
 TODO tidy this all up. Find source instead of binary. Fix paths ... Find out how to check ink levels etc
- 
+
 */
 
 stdenv.mkDerivation {
@@ -56,13 +54,13 @@ stdenv.mkDerivation {
       patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
           --set-rpath $libPath $p
     done
-    
+
     mkdir $out/lib
     ln -s $out/cups/lib $out/lib/cups
   '';
 
   meta = {
     description = "Some additional CUPS drivers including Canon drivers";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
index 673e4c3ed087..2e28fd297ec0 100644
--- a/pkgs/misc/emulators/pcsx2/default.nix
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -2,8 +2,6 @@
 , makeWrapper, perl, pkgconfig, portaudio, SDL2, soundtouch, stdenv
 , wxGTK30, zlib }:
 
-assert stdenv.isi686;
-
 stdenv.mkDerivation rec {
   name = "pcsx2-${version}";
   version = "1.4.0";
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index db58c398526a..0b71797eeec8 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -6,7 +6,6 @@
   buildScript ? null, configureFlags ? ""
 }:
 
-assert stdenv.isLinux;
 assert stdenv.cc.cc.isGNU or false;
 
 with import ./util.nix { inherit lib; };
@@ -83,7 +82,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   # Add capability to ignore known failing tests
   # and enable doCheck
   doCheck = false;
-  
+
   postInstall = let
     links = prefix: pkg: "ln -s ${pkg} $out/${prefix}/${pkg.name}";
   in ''
@@ -100,7 +99,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
       fi
     done
   '';
-  
+
   enableParallelBuilding = true;
 
   # https://bugs.winehq.org/show_bug.cgi?id=43530
diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix
index aaa932c0a1c4..1aae47e603b5 100644
--- a/pkgs/misc/foldingathome/default.nix
+++ b/pkgs/misc/foldingathome/default.nix
@@ -1,7 +1,5 @@
 {stdenv, fetchurl}:
 
-assert stdenv.system == "i686-linux";
-
 stdenv.mkDerivation {
   name = "folding-at-home-6.02";
 
@@ -22,7 +20,7 @@ stdenv.mkDerivation {
   # be considered a gcroot.
   installPhase = ''
     BINFILES="fah6 mpiexec";
-    for a in $BINFILES; do 
+    for a in $BINFILES; do
       patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a
     done
     mkdir -p $out/bin
@@ -33,5 +31,6 @@ stdenv.mkDerivation {
     homepage = http://folding.stanford.edu/;
     description = "Folding@home distributed computing client";
     license = stdenv.lib.licenses.unfree;
+    platforms = [ "i686-linux" ];
   };
 }
diff --git a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
index 3844912f6ba3..fa3d4284e597 100644
--- a/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
+++ b/pkgs/os-specific/darwin/native-x11-and-opengl/default.nix
@@ -1,7 +1,5 @@
 { stdenv, writeScript }:
 
-assert stdenv.isDarwin;
-
 stdenv.mkDerivation rec {
   name = "darwin-native-x11-and-opengl";
 
diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix
index ab1a93b3a703..275600d42785 100644
--- a/pkgs/os-specific/linux/blcr/default.nix
+++ b/pkgs/os-specific/linux/blcr/default.nix
@@ -2,7 +2,6 @@
 
 # BLCR version 0.8.6 should works with linux kernel up to version 3.17.x
 
-assert stdenv.isLinux;
 assert builtins.compareVersions "3.18" kernel.version == 1;
 
 stdenv.mkDerivation {
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index d4595d73d942..bbf01e5027c3 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -2,8 +2,6 @@
   pythonPackages, readline, udev, libical,
   systemd, enableWiimote ? false, enableMidi ? false }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "bluez-5.49";
 
diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix
index 65be409a75e3..e36aaa5e38d0 100644
--- a/pkgs/os-specific/linux/cpufrequtils/default.nix
+++ b/pkgs/os-specific/linux/cpufrequtils/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, libtool, gettext }:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
-
 stdenv.mkDerivation rec {
   name = "cpufrequtils-008";
 
diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 971eef6a8b52..8d18d5980207 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, flex, systemd, perl }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "drbd-8.4.4";
 
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index f00d6272902d..8248a628f0ac 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, buildPackages, fetchurl, attr, perl, pam ? null }:
-assert pam != null -> stdenv.isLinux;
+{ stdenv, buildPackages, fetchurl, attr, perl, pam }:
 
 stdenv.mkDerivation rec {
   name = "libcap-${version}";
@@ -10,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qjiqc5pknaal57453nxcbz3mn1r4hkyywam41wfcglq3v2qlg39";
   };
 
-  outputs = [ "out" "dev" "lib" "man" "doc" ]
-    ++ stdenv.lib.optional (pam != null) "pam";
+  outputs = [ "out" "dev" "lib" "man" "doc" "pam" ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl ];
@@ -22,7 +20,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "lib=lib"
-    (stdenv.lib.optional (pam != null) "PAM_CAP=yes")
+    "PAM_CAP=yes"
     "BUILD_CC=$(CC_FOR_BUILD)"
     "CC:=$(CC)"
   ];
diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix
index 833c032ccd2c..084a7e7c9a3b 100644
--- a/pkgs/os-specific/linux/lsscsi/default.nix
+++ b/pkgs/os-specific/linux/lsscsi/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation {
   name = "lsscsi-0.28";
 
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index 7a59c2ea7573..b6fdae75bac2 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -3,8 +3,6 @@
 , buildPlatform, hostPlatform
 }:
 
-assert stdenv.isLinux;
-
 let
   sendmail-script = writeScript "sendmail-script" ''
     #!/bin/sh
diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix
index e2abbd7335ee..72095bc8cdab 100644
--- a/pkgs/os-specific/linux/mwprocapture/default.nix
+++ b/pkgs/os-specific/linux/mwprocapture/default.nix
@@ -5,9 +5,6 @@ with stdenv.lib;
 # The Magewell Pro Capture drivers are not supported for kernels older than 3.2
 assert versionAtLeast kernel.version "3.2.0";
 
-# this package currently only supports x86 and x86_64, as I have no ARM device to test on
-assert (stdenv.system == "x86_64-linux") || (stdenv.system == "i686-linux");
-
 let
   bits =
   if stdenv.is64bit then "64"
diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index cc6ac64d58ad..68acbb83531e 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, kernel, which }:
 
-assert stdenv.isLinux;
 # Don't bother with older versions, though some might even work:
 assert stdenv.lib.versionAtLeast kernel.version "4.10";
 
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix
index edc7220d6586..358fa700382f 100644
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -1,7 +1,5 @@
 {stdenv, fetchurl, ncurses}:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "psmisc-23.1";
 
diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
index f69269347e37..d02a531f67fc 100644
--- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
+++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
@@ -1,7 +1,5 @@
 { stdenv, systemd, cryptsetup }:
 
-assert stdenv.isLinux;
-
 stdenv.lib.overrideDerivation systemd (p: {
   version = p.version;
   name = "systemd-cryptsetup-generator";
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 615e4f867c4d..58a1c7ca7147 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -13,8 +13,6 @@
 , withSelinux ? false, libselinux
 }:
 
-assert stdenv.isLinux;
-
 let
   pythonLxmlEnv = buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]);
 
diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 180aabc94cc6..ed3567ffdad3 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -1,7 +1,6 @@
 {stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
 extraConfig ? ""}:
 
-assert stdenv.isLinux;
 assert cross != null -> gccCross != null;
 
 let
diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 713ef974f9fb..8c1d117bc8b8 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -3,8 +3,6 @@
 , useSystemd ? true, systemd, gobjectIntrospection
 }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "upower-0.99.7";
 
diff --git a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
index e1bafa93ea6f..527471bad328 100644
--- a/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
+++ b/pkgs/os-specific/linux/xf86-input-multitouch/default.nix
@@ -11,8 +11,6 @@
 , libpciaccess
 }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation {
   name = "xf86-input-multitouch-20110312";
 
diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix
index 9068ca70cc6e..a50d623acbce 100644
--- a/pkgs/servers/sql/oracle-xe/default.nix
+++ b/pkgs/servers/sql/oracle-xe/default.nix
@@ -1,7 +1,5 @@
 { stdenv, makeWrapper, requireFile, patchelf, rpmextract, libaio }:
 
-assert stdenv.system == "x86_64-linux";
-
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
@@ -79,5 +77,6 @@ stdenv.mkDerivation rec {
     description = "Oracle Database Express Edition";
     homepage = http://www.oracle.com/technetwork/products/express-edition/;
     license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/tools/audio/aucdtect/default.nix b/pkgs/tools/audio/aucdtect/default.nix
index 244f7b406731..825e1a0cc072 100644
--- a/pkgs/tools/audio/aucdtect/default.nix
+++ b/pkgs/tools/audio/aucdtect/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, lib, rpmextract }:
 
-assert stdenv.isLinux;
-
 with lib;
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 77302f3d4a2b..2f7e80dd912c 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, writeText, zlib, rpmextract, patchelf, which }:
 
-assert stdenv.isLinux;
-
 let
   p = if stdenv.is64bit then {
       arch = "x86_64";
@@ -13,7 +11,7 @@ let
       gcclib = "${stdenv.cc.cc.lib}/lib";
       sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx";
     };
-in 
+in
 stdenv.mkDerivation rec {
 
   name = "yandex-disk-${version}";
@@ -64,4 +62,3 @@ stdenv.mkDerivation rec {
     '';
   };
 }
-
diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix
index 5341c9840be8..b91c7d2378bb 100644
--- a/pkgs/tools/misc/megacli/default.nix
+++ b/pkgs/tools/misc/megacli/default.nix
@@ -1,7 +1,5 @@
 { stdenv, rpmextract, ncurses5, patchelf, makeWrapper, requireFile, unzip }:
 
-assert stdenv.system == "x86_64-linux";
-
 stdenv.mkDerivation rec {
   name = "megacli-8.07.07";
 
@@ -31,5 +29,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "CLI program for LSI MegaRAID cards, which also works with some Dell PERC RAID cards";
     license = stdenv.lib.licenses.unfree;
+    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix
index 2f69517e4bd2..4312aecaacd6 100644
--- a/pkgs/tools/misc/pk2cmd/default.nix
+++ b/pkgs/tools/misc/pk2cmd/default.nix
@@ -1,7 +1,5 @@
 {stdenv, fetchurl, libusb, makeWrapper}:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation {
   name = "pk2cmd-1.20";
   src = fetchurl {
diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix
index 3dfd136ad060..6fef6a9e7fa9 100644
--- a/pkgs/tools/networking/filegive/default.nix
+++ b/pkgs/tools/networking/filegive/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, fetchgit, go }:
 
-assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32);
-
 let
 
   # Code with BSD license
diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix
index bbee6546b2f4..0b585d10316c 100644
--- a/pkgs/tools/networking/logmein-hamachi/default.nix
+++ b/pkgs/tools/networking/logmein-hamachi/default.nix
@@ -2,8 +2,6 @@
 
 with stdenv.lib;
 
-assert stdenv.isLinux;
-
 let
   arch =
     if stdenv.system == "x86_64-linux" then "x64"
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 99e12084ccb5..3a1bba4ce8c1 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, iptables, libuuid, pkgconfig }:
 
-assert stdenv.isLinux;
-
 stdenv.mkDerivation rec {
   name = "miniupnpd-2.0.20180422";
 
diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix
index ceac5a58800c..031f32b53626 100644
--- a/pkgs/tools/networking/ssmtp/default.nix
+++ b/pkgs/tools/networking/ssmtp/default.nix
@@ -4,7 +4,7 @@ assert tlsSupport -> openssl != null;
 
 stdenv.mkDerivation {
   name = "ssmtp-2.64";
-  
+
   src = fetchurl {
     url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2;
     sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2";
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
   installFlags = "etcdir=$(out)/etc";
 
   installTargets = [ "install" "install-sendmail" ];
-  
+
   buildInputs = stdenv.lib.optional tlsSupport openssl;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix
index 38104b8b213d..f27f9af59c68 100644
--- a/pkgs/tools/security/enpass/default.nix
+++ b/pkgs/tools/security/enpass/default.nix
@@ -3,15 +3,15 @@
 , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig
 , makeWrapper , makeDesktopItem, python, pythonPackages, lib
 , libredirect, lsof}:
-assert system == "i686-linux" || system == "x86_64-linux";
+
 let
-  all_data = (with builtins; fromJSON (readFile ./data.json));
+  all_data = builtins.fromJSON (builtins.readFile ./data.json);
   system_map = {
     i686-linux = "i386";
     x86_64-linux = "amd64";
   };
 
-  data = (with builtins; getAttr (getAttr system system_map) all_data);
+  data = all_data.${system_map.${system} or (throw "Unsupported platform")};
 
   baseUrl = http://repo.sinew.in;
 
@@ -54,7 +54,7 @@ let
       description = "a well known password manager";
       homepage = https://www.enpass.io/;
       license = lib.licenses.unfree;
-      platforms = lib.platforms.linux;
+      platforms = [ "x86_64-linux" "i686-linux"];
     };
 
     buildInputs = [makeWrapper dpkg];
@@ -70,8 +70,8 @@ let
       cp $out/bin/EnpassHelper/EnpassNMHost{,.untampered}
 
       sed \
-      	-i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
-      	$out/share/applications/enpass.desktop
+        -i s@/opt/Enpass/bin/runenpass.sh@$out/bin/Enpass@ \
+        $out/share/applications/enpass.desktop
 
       for i in $out/bin/{Enpass,EnpassHelper/{EnpassHelper,EnpassNMHost}}; do
         patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i
diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix
index 179b4cb1a4c0..e56919acc5d5 100644
--- a/pkgs/tools/system/storebrowse/default.nix
+++ b/pkgs/tools/system/storebrowse/default.nix
@@ -1,7 +1,5 @@
 { stdenv, fetchurl, fetchhg, go, sqlite}:
 
-assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isAarch32);
-
 stdenv.mkDerivation rec {
   name = "storebrowse-20130318212204";
 

From 54a13b07d5925c8e890e0d9aaa0842cd7ae0d8d6 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Sat, 12 Aug 2017 21:14:36 +0200
Subject: [PATCH 1065/3370] switch-to-configuration: use Net::DBus to retrieve
 the list of units

This resolves the FIXME, and opens up the possibility of using more of
the systemd DBus interface to make things more robust.
---
 .../activation/switch-to-configuration.pl     | 19 +++++++++----------
 nixos/modules/system/activation/top-level.nix |  3 ++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 87a4ab2a586d..2ce04ed5342c 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use File::Basename;
 use File::Slurp;
+use Net::DBus;
 use Sys::Syslog qw(:standard :macros);
 use Cwd 'abs_path';
 
@@ -67,17 +68,15 @@ EOF
 $SIG{PIPE} = "IGNORE";
 
 sub getActiveUnits {
-    # FIXME: use D-Bus or whatever to query this, since parsing the
-    # output of list-units is likely to break.
-    # Use current version of systemctl binary before daemon is reexeced.
-    my $lines = `LANG= /run/current-system/sw/bin/systemctl list-units --full --no-legend`;
+    my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1");
+    my $units = $mgr->ListUnitsByPatterns([], []);
     my $res = {};
-    foreach my $line (split '\n', $lines) {
-        chomp $line;
-        last if $line eq "";
-        $line =~ /^(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s/ or next;
-        next if $1 eq "UNIT";
-        $res->{$1} = { load => $2, state => $3, substate => $4 };
+    for my $item (@$units) {
+        my ($id, $description, $load_state, $active_state, $sub_state,
+            $following, $unit_path, $job_id, $job_type, $job_path) = @$item;
+        next unless $following eq '';
+        next if $job_id == 0 and $active_state eq 'inactive';
+        $res->{$id} = { load => $load_state, state => $active_state, substate => $sub_state };
     }
     return $res;
 }
diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index 091a2e412eed..e2d1dd49ef0e 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -127,7 +127,8 @@ let
       configurationName = config.boot.loader.grub.configurationName;
 
       # Needed by switch-to-configuration.
-      perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
+
+      perl = "${pkgs.perl}/bin/perl " + (concatMapStringsSep " " (lib: "-I${lib}/${pkgs.perl.libPrefix}") (with pkgs.perlPackages; [ FileSlurp NetDBus XMLParser XMLTwig ]));
   } else throw "\nFailed assertions:\n${concatStringsSep "\n" (map (x: "- ${x}") failed)}");
 
   # Replace runtime dependencies

From bfb3232a13c2261a13eeb3bbfad0b3b3a6ed92c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 May 2018 15:19:54 -0300
Subject: [PATCH 1066/3370] theme-obsidian2: init at 2.5

---
 pkgs/misc/themes/obsidian2/default.nix | 28 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/misc/themes/obsidian2/default.nix

diff --git a/pkgs/misc/themes/obsidian2/default.nix b/pkgs/misc/themes/obsidian2/default.nix
new file mode 100644
index 000000000000..41f29f34be88
--- /dev/null
+++ b/pkgs/misc/themes/obsidian2/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "theme-obsidian2-${version}";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "madmaxms";
+    repo = "theme-obsidian-2";
+    rev = "v${version}";
+    sha256 = "12jya1gzmhpfh602vbf51vi69fmis7sanvx278h3skm03a7civlv";
+  };
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -a Obsidian-2 $out/share/themes
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gnome theme, based upon Adwaita-Maia dark skin";
+    homepage = https://github.com/madmaxms/theme-obsidian-2;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97e2ee5a3a65..93fae25f5f05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19715,6 +19715,8 @@ with pkgs;
 
   numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { };
 
+  theme-obsidian2 = callPackage ../misc/themes/obsidian2 { };
+
   onestepback = callPackage ../misc/themes/onestepback { };
 
   theme-vertex = callPackage ../misc/themes/vertex { };

From 40f809c214d4e83b8cbc8efcd13276cac9237ac8 Mon Sep 17 00:00:00 2001
From: Aristid Breitkreuz <aristidb@gmail.com>
Date: Thu, 3 May 2018 20:28:52 +0200
Subject: [PATCH 1067/3370] insync: 1.3.22.36179 -> 1.4.5.37069

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

diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix
index cf3725c35e3d..e718dc6562fb 100644
--- a/pkgs/applications/networking/insync/default.nix
+++ b/pkgs/applications/networking/insync/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "insync-${version}";
-  version = "1.3.22.36179";
+  version = "1.4.5.37069";
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://s.insynchq.com/builds/insync-portable_${version}_amd64.tar.bz2";
-        sha256 = "0jmycpbmfvvpilcycyg6zgpjz6449bs17d2w4jx7m1rvzmpkk140";
+        sha256 = "0mkqgpq4isngkj20c0ygmxf4cj975d446svhwvl3cqdrjkjm1ybd";
       }
     else
       throw "${name} is not supported on ${stdenv.system}";

From c0ebcab789af5927e67117baae97534b72fea207 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 13:35:01 -0500
Subject: [PATCH 1068/3370] darwin.ICU: delete old /usr files

This is a huge directory & not referenced anywhere.
---
 pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index eef26f4b79a6..6cf7ee07b70b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -20,5 +20,6 @@ appleDerivation {
 
   postInstall = ''
     mv $out/usr/local/include $out/include
+    rm -rf $out/usr
   '';
 }

From 69d1b7ab79cc5e46d4b419cfe95c30e58f801a85 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 13:36:06 -0500
Subject: [PATCH 1069/3370] darwin.libSystem: multiple outputs

adds 2 outputs for libSystem:

- out
- dev

should shrink closure sizes
---
 .../darwin/apple-source-releases/Libsystem/default.nix          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 28406c9751dc..89dc6eb74de9 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -7,6 +7,8 @@ appleDerivation rec {
 
   nativeBuildInputs = [ cpio ];
 
+  outputs = [ "out" "dev" ];
+
   installPhase = ''
     export NIX_ENFORCE_PURITY=
 

From e25efa9673f3b274132875a4a95aae012b0b3467 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 13:36:38 -0500
Subject: [PATCH 1070/3370] gettext: add dev output

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

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 6dec7747c7e8..e64c045ad819 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
   patches = [ ./absolute-paths.diff ];
 
-  outputs = [ "out" "man" "doc" "info" ];
+  outputs = [ "out" "dev" "man" "doc" "info" ];
 
   hardeningDisable = [ "format" ];
 

From 919d824efe142c6e23d7808621f571890b0d0503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 May 2018 15:45:57 -0300
Subject: [PATCH 1071/3370] iconpack-obsidian: init at 4.0.1

---
 pkgs/data/icons/iconpack-obsidian/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/data/icons/iconpack-obsidian/default.nix

diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
new file mode 100644
index 000000000000..efcaa1cbc53e
--- /dev/null
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "iconpack-obsidian-${version}";
+  version = "4.0.1";
+
+  src = fetchFromGitHub {
+    owner = "madmaxms";
+    repo = "iconpack-obsidian";
+    rev = "v${version}";
+    sha256 = "1mlaldqjc3am2d2m577fhsidlnfqlhmnf1l8hh50iqr94mc14fab";
+  };
+
+  nativeBuildInputs = [ gtk3 ];
+
+  installPhase = ''
+     mkdir -p $out/share/icons
+     mv Obsidian* $out/share/icons
+  '';
+
+  postFixup = ''
+    for theme in $out/share/icons/*; do
+      gtk-update-icon-cache $theme
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gnome Icon Pack based upon Faenza";
+    homepage = https://github.com/madmaxms/iconpack-obsidian;
+    license = licenses.lgpl3;
+    platforms = platforms.all;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97e2ee5a3a65..ff4e788e515b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14396,6 +14396,8 @@ with pkgs;
 
   ibm-plex = callPackage ../data/fonts/ibm-plex { };
 
+  iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { };
+
   inconsolata = callPackage ../data/fonts/inconsolata {};
   inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {};
 

From d88a61e43996ab6b1a5f72adabfd19f4c97b9275 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 15:11:00 -0500
Subject: [PATCH 1072/3370] libsystem: fix phases

---
 .../darwin/apple-source-releases/Libsystem/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 89dc6eb74de9..8575e0676253 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -3,7 +3,8 @@
   removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
 
 appleDerivation rec {
-  phases = [ "unpackPhase" "installPhase" ];
+  dontBuild = true;
+  dontConfigure = true;
 
   nativeBuildInputs = [ cpio ];
 

From adce6bf638bc6032f17e002334e444a3c8656ad2 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Thu, 3 May 2018 21:54:09 +0200
Subject: [PATCH 1073/3370] refind: fix runtime errors

In newer versions, instead of using $PWD to locate its ressource files,
Refind now refers to the dir containing $0.
This causes runtime errors due to missing ressources.

In lieu a wrapper binary, we now simply patch the variable 'RefindDir'
which stores the path to the ressource dir.
---
 pkgs/tools/bootloaders/refind/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index f305cff0ea25..80add316094c 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     install -D -m0644 gptsync/gptsync_${efiPlatform}.efi $out/share/refind/tools_${efiPlatform}/gptsync_${efiPlatform}.efi
 
     # helper scripts
-    install -D -m0755 refind-install $out/share/refind/refind-install
+    install -D -m0755 refind-install $out/bin/refind-install
     install -D -m0755 mkrlconf $out/bin/refind-mkrlconf
     install -D -m0755 mvrefind $out/bin/refind-mvrefind
     install -D -m0755 fonts/mkfont.sh $out/bin/refind-mkfont
@@ -86,21 +86,13 @@ stdenv.mkDerivation rec {
     # keys
     install -D -m0644 keys/* $out/share/refind/keys/
 
-    # The refind-install script assumes that all resource files are
-    # installed under the same directory as the script itself. To avoid
-    # having to patch around this assumption, generate a wrapper that
-    # cds into $out/share/refind and executes the real script from
-    # there.
-    cat >$out/bin/refind-install <<EOF
-#! ${stdenv.shell}
-cd $out/share/refind && exec -a $out/bin/refind-install ./refind-install \$*
-EOF
-    chmod +x $out/bin/refind-install
+    # Fix variable definition of 'RefindDir' which is used to locate ressource files.
+    sed -i "s,\bRefindDir=.*,RefindDir=$out/share/refind,g" $out/bin/refind-install
 
     # Patch uses of `which`.  We could patch in calls to efibootmgr,
     # openssl, convert, and openssl, but that would greatly enlarge
     # refind's closure (from ca 28MB to over 400MB).
-    sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/share/refind/refind-install
+    sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-install
     sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mvrefind
     sed -i 's,`which \(.*\)`,`type -p \1`,g' $out/bin/refind-mkfont
   '';

From 481ca447715a9f71c51ac4c3591b2e9c6593a472 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 3 May 2018 15:14:24 -0500
Subject: [PATCH 1074/3370] git: disable failing test w/musl for now

I'm working to resolve this but it will take some time
(patches sent to upstream musl, maybe to git afterwards)
and for now this blocks quite a lot.

If that doesn't work out we can explore options such as
always using GNU libiconv with musl.
---
 .../version-management/git-and-tools/git/default.nix           | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 21e9a805c108..a3f61f3399db 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -277,6 +277,9 @@ EOF
     # XXX: I failed to understand why this one fails.
     # Could someone try to re-enable it on the next release ?
     disable_test t1700-split-index "null sha1"
+  '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
+    # Test fails (as of 2.17.0, musl 1.1.19)
+    disable_test t3900-i18n-commit
   '';
 
 

From 67e4ed96937dbbb663a66a9f0228f4811b5020df Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 7 Dec 2017 09:55:48 -0500
Subject: [PATCH 1075/3370] mmc-utils: Enable cross-compilation

---
 pkgs/os-specific/linux/mmc-utils/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix
index a17f687a2550..b491d5bbda7e 100644
--- a/pkgs/os-specific/linux/mmc-utils/default.nix
+++ b/pkgs/os-specific/linux/mmc-utils/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0hkdzc71pdnscbpdpgwljcchiyancarldjyd0w609sy18bky833x";
   };
 
+  makeFlags = "CC=${stdenv.cc.targetPrefix}cc";
+
   installPhase = ''
     make install prefix=$out
     mkdir -p $out/share/man/man1

From edd92f9182e63d6f118a1c5136590694fb1793dc Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Thu, 7 Dec 2017 09:55:37 -0500
Subject: [PATCH 1076/3370] net-tools: Enable cross-compilation

---
 pkgs/os-specific/linux/net-tools/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix
index ce287dc18415..42f745b02e30 100644
--- a/pkgs/os-specific/linux/net-tools/default.nix
+++ b/pkgs/os-specific/linux/net-tools/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     '';
 
   makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "AR=${stdenv.cc.targetPrefix}ar"
     "BASEDIR=$(out)"
     "mandir=/share/man"
     "HAVE_ARP_TOOLS=1"

From 10fa4a571c0669e44acfedc3bf1917b3ffcfbf61 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 29 Oct 2017 16:57:54 -0400
Subject: [PATCH 1077/3370] tcp-wrappers: Enable cross-compilation

This package, like so many others, assumes that ar is unprefixed.
---
 pkgs/os-specific/linux/tcp-wrappers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix
index e3aae30babca..5df7bb827aad 100644
--- a/pkgs/os-specific/linux/tcp-wrappers/default.nix
+++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ libnsl ];
 
-  makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" ];
+  makeFlags = [ "REAL_DAEMON_DIR=$(out)/bin" "linux" "AR:=$(AR)" ];
 
   installPhase = ''
     mkdir -p "$out/bin"

From d8c744b862e718ccf52ca6197a1c2383d77e9482 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 29 Oct 2017 15:21:06 -0400
Subject: [PATCH 1078/3370] libnl: Enable parallel building

This is a long enough derivation to make this worthwhile.
---
 pkgs/os-specific/linux/libnl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index f66df8163ff1..c79a4314d6f1 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
       sha256 = "0dd7xxikib201i99k2if066hh7gwf2i4ffckrjplq6lr206jn00r";
     });
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
 
   meta = with lib; {

From 6971c503af84da630e518697740789cb4c38a46f Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 29 Oct 2017 14:00:31 -0400
Subject: [PATCH 1079/3370] runit: Enable cross-compilation

---
 pkgs/tools/system/runit/default.nix         |  8 ++++++--
 pkgs/tools/system/runit/fix-ar-ranlib.patch | 18 ++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/system/runit/fix-ar-ranlib.patch

diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix
index aa2f50f2df07..4d5de56fbf0d 100644
--- a/pkgs/tools/system/runit/default.nix
+++ b/pkgs/tools/system/runit/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
     sha256 = "065s8w62r6chjjs6m9hapcagy33m75nlnxb69vg0f4ngn061dl3g";
   };
 
+  patches = [
+    ./fix-ar-ranlib.patch
+  ];
+
   outputs = [ "out" "man" ];
 
   sourceRoot = "admin/${name}";
@@ -34,8 +38,8 @@ stdenv.mkDerivation rec {
     cd src
 
     # Both of these are originally hard-coded to gcc
-    echo cc > conf-cc
-    echo cc > conf-ld
+    echo ${stdenv.cc.targetPrefix}cc > conf-cc
+    echo ${stdenv.cc.targetPrefix}cc > conf-ld
   '';
 
   installPhase = ''
diff --git a/pkgs/tools/system/runit/fix-ar-ranlib.patch b/pkgs/tools/system/runit/fix-ar-ranlib.patch
new file mode 100644
index 000000000000..c65a037d5242
--- /dev/null
+++ b/pkgs/tools/system/runit/fix-ar-ranlib.patch
@@ -0,0 +1,18 @@
+--- runit-2.1.2/src/print-ar.sh
++++ runit-2.1.2/src/print-ar.sh
+@@ -1,7 +1,7 @@
+ cat warn-auto.sh
+ echo 'main="$1"; shift'
+ echo 'rm -f "$main"'
+-echo 'ar cr "$main" ${1+"$@"}'
++echo '$AR cr "$main" ${1+"$@"}'
+ case "`cat systype`" in
+   sunos-5.*) ;;
+   unix_sv*) ;;
+@@ -10,5 +10,5 @@ case "`cat systype`" in
+   dgux-*) ;;
+   hp-ux-*) ;;
+   sco*) ;;
+-  *) echo 'ranlib "$main"' ;;
++  *) echo '$RANLIB "$main"' ;;
+ esac

From d23f71deaa161054ef449c0014c5043d85ae950b Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 27 Oct 2017 23:17:55 -0400
Subject: [PATCH 1080/3370] curl: Enable cross-compilation

By fixing toolchain paths
---
 pkgs/tools/networking/curl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 4a1ff7f1798a..5980392267b0 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
     ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}";
 
-  CXX = "c++";
-  CXXCPP = "c++ -E";
+  CXX = "${stdenv.cc.targetPrefix}c++";
+  CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
 
   doCheck = false; # expensive, fails
 

From a09aa86ece6b39fb38fed510396abea779fa4d76 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Mon, 26 Feb 2018 18:17:23 -0500
Subject: [PATCH 1081/3370] rng-tools: Enable cross-compilation

---
 pkgs/tools/security/rng-tools/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix
index 1885940e7f31..d2326c7e8c38 100644
--- a/pkgs/tools/security/rng-tools/default.nix
+++ b/pkgs/tools/security/rng-tools/default.nix
@@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "13h7lc8wl9khhvkr0i3bl5j9bapf8anhqis1lcnwxg1vc2v058b0";
   };
 
+  # For cross-compilation
+  makeFlags = [ "AR:=$(AR)" ];
+
   meta = {
     description = "A random number generator daemon";
 

From 8b32cfdbc06e4839e71e9b11ab23aff726d48535 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Tue, 24 Apr 2018 16:25:33 -0400
Subject: [PATCH 1082/3370] lib.systems.gnu: Accept gnueabi as a gnu platform

---
 lib/systems/for-meta.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 9e85cea3ad11..4ecd9ffc6ac6 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -19,7 +19,11 @@ in rec {
   darwin  = [ patterns.isDarwin ];
   freebsd = [ patterns.isFreeBSD ];
   # Should be better, but MinGW is unclear, and HURD is bit-rotted.
-  gnu     = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ];
+  gnu     = [
+    { kernel = parse.kernels.linux; abi = parse.abis.gnu; }
+    { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }
+    { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }
+  ];
   illumos = [ patterns.isSunOS ];
   linux   = [ patterns.isLinux ];
   netbsd  = [ patterns.isNetBSD ];

From 860c81d6f70aac3f653fc240e35e7d6f7e98a187 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 25 Feb 2018 14:42:23 -0500
Subject: [PATCH 1083/3370] ldns: Enable cross-compilation

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

diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix
index 6c2a8f84d232..e9d81d3ab785 100644
--- a/pkgs/development/libraries/ldns/default.nix
+++ b/pkgs/development/libraries/ldns/default.nix
@@ -40,6 +40,9 @@ stdenv.mkDerivation rec {
     "--with-trust-anchor=${dns-root-data}/root.key"
     "--with-drill"
     "--disable-gost"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "ac_cv_func_malloc_0_nonnull=yes"
+    "ac_cv_func_realloc_0_nonnull=yes"
   ];
 
   postInstall = ''

From da481541585d5c6feb237f1559320dc7dfc064f7 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 29 Apr 2018 16:35:31 -0400
Subject: [PATCH 1084/3370] glib: Enable cross-compilation

glib needs gettext for the build machine. Since gettext is also a
propagatedBuildInput I'm assuming that it's also used at runtime.
---
 pkgs/development/libraries/glib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 403f0e8aa995..ac921227740c 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount
     ++ optionals doCheck [ tzdata libxml2 desktop-file-utils shared-mime-info ];
 
-  nativeBuildInputs = [ pkgconfig perl python ];
+  nativeBuildInputs = [ pkgconfig perl python gettext ];
 
   propagatedBuildInputs = [ zlib libffi gettext libiconv ];
 

From 86a778a80a3e4a8eca8fad3a6a4a93142255ebbc Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Wed, 20 Dec 2017 13:58:56 -0500
Subject: [PATCH 1085/3370] avahi: Enable cross-compilation

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

diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix
index 098378701d57..53e3f5468abc 100644
--- a/pkgs/development/libraries/avahi/default.nix
+++ b/pkgs/development/libraries/avahi/default.nix
@@ -20,13 +20,15 @@ stdenv.mkDerivation rec {
   buildInputs = [ libdaemon dbus perl perlXMLParser glib expat libiconv ]
     ++ (stdenv.lib.optional qt4Support qt4);
 
-  nativeBuildInputs = [ pkgconfig gettext intltool ];
+  nativeBuildInputs = [ pkgconfig gettext intltool glib ];
 
   configureFlags =
     [ "--disable-qt3" "--disable-gdbm" "--disable-mono"
       "--disable-gtk" "--disable-gtk3"
       "--${if qt4Support then "enable" else "disable"}-qt4"
-      "--disable-python" "--localstatedir=/var" "--with-distro=none" ]
+      "--disable-python" "--localstatedir=/var" "--with-distro=none"
+      # A systemd unit is provided by the avahi-daemon NixOS module
+      "--with-systemdsystemunitdir=no" ]
     ++ stdenv.lib.optional withLibdnssdCompat "--enable-compat-libdns_sd"
     # autoipd won't build on darwin
     ++ stdenv.lib.optional stdenv.isDarwin "--disable-autoipd";

From 0f62284972aff639bc772245311446161911a985 Mon Sep 17 00:00:00 2001
From: florianjacob <accounts+github@florianjacob.de>
Date: Thu, 3 May 2018 23:38:14 +0200
Subject: [PATCH 1086/3370] matrix-synapse: 0.27.4 -> 0.28.1 (#39922)

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 4c82f5cfdde8..77bcc98da04e 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.27.4";
+  version = "0.28.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "051bwr4vz8mwglh1m9rqlljbn8g3alvd52f09ff887nsi6z3jc17";
+    sha256 = "1xgiprnhp893zc0g3i7wpwzgjy6q5nb858p0s6kcsca60vr9j6h0";
   };
 
   patches = [

From 39df5831cae0dce4628e80cf7f6f5520a9dae18e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 3 May 2018 17:52:11 -0400
Subject: [PATCH 1087/3370] lib{std,}c++: Fix setup hooks for cross

---
 pkgs/development/compilers/gcc/libstdc++-hook.sh  | 15 +++++++++++++--
 .../compilers/llvm/3.5/libc++/setup-hook.sh       | 15 +++++++++++++--
 .../compilers/llvm/3.7/libc++/setup-hook.sh       | 15 +++++++++++++--
 .../compilers/llvm/3.8/libc++/setup-hook.sh       | 15 +++++++++++++--
 .../compilers/llvm/3.9/libc++/setup-hook.sh       | 15 +++++++++++++--
 .../compilers/llvm/4/libc++/setup-hook.sh         | 15 +++++++++++++--
 .../compilers/llvm/5/libc++/setup-hook.sh         | 15 +++++++++++++--
 .../compilers/llvm/6/libc++/setup-hook.sh         | 15 +++++++++++++--
 8 files changed, 104 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh
index 893bbbc0c2dc..2325eeb9e2cf 100644
--- a/pkgs/development/compilers/gcc/libstdc++-hook.sh
+++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh
@@ -1,2 +1,13 @@
-export NIX_CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libstdc++"
+# The `hostOffset` describes how the host platform of the dependencies are slid
+# relative to the depending package. It is brought into scope of the setup hook
+# defined as the role of the dependency whose hooks is being run.
+case $hostOffset in
+    -1) local role='BUILD_' ;;
+    0)  local role='' ;;
+    1)  local role='TARGET_' ;;
+    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
+        return 1 ;;
+esac
+
+export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
+export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libstdc++"
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
index 9022fced6ecf..e18733b5ea3a 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
@@ -1,3 +1,14 @@
+# The `hostOffset` describes how the host platform of the dependencies are slid
+# relative to the depending package. It is brought into scope of the setup hook
+# defined as the role of the dependency whose hooks is being run.
+case $hostOffset in
+    -1) local role='BUILD_' ;;
+    0)  local role='' ;;
+    1)  local role='TARGET_' ;;
+    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
+        return 1 ;;
+esac
+
 linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
index 9022fced6ecf..e18733b5ea3a 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
@@ -1,3 +1,14 @@
+# The `hostOffset` describes how the host platform of the dependencies are slid
+# relative to the depending package. It is brought into scope of the setup hook
+# defined as the role of the dependency whose hooks is being run.
+case $hostOffset in
+    -1) local role='BUILD_' ;;
+    0)  local role='' ;;
+    1)  local role='TARGET_' ;;
+    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
+        return 1 ;;
+esac
+
 linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
index 9022fced6ecf..bcd93cf486ff 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
@@ -1,3 +1,14 @@
+# The `hostOffset` describes how the host platform of the dependencies
+# relative to the depending package. It is brought into scope of the setup hook
+# defined as the role of the dependency whose hooks is being run.
+case $hostOffset in
+    -1) local role='BUILD_' ;;
+    0)  local role='' ;;
+    1)  local role='TARGET_' ;;
+    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
+        return 1 ;;
+esac
+
 linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
index 9022fced6ecf..bcd93cf486ff 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
@@ -1,3 +1,14 @@
+# The `hostOffset` describes how the host platform of the dependencies
+# relative to the depending package. It is brought into scope of the setup hook
+# defined as the role of the dependency whose hooks is being run.
+case $hostOffset in
+    -1) local role='BUILD_' ;;
+    0)  local role='' ;;
+    1)  local role='TARGET_' ;;
+    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
+        return 1 ;;
+esac
+
 linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
index 9022fced6ecf..bcd93cf486ff 100644
--- a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
@@ -1,3 +1,14 @@
+# The `hostOffset` describes how the host platform of the dependencies
+# relative to the depending package. It is brought into scope of the setup hook
+# defined as the role of the dependency whose hooks is being run.
+case $hostOffset in
+    -1) local role='BUILD_' ;;
+    0)  local role='' ;;
+    1)  local role='TARGET_' ;;
+    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
+        return 1 ;;
+esac
+
 linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
index 9022fced6ecf..bcd93cf486ff 100644
--- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
@@ -1,3 +1,14 @@
+# The `hostOffset` describes how the host platform of the dependencies
+# relative to the depending package. It is brought into scope of the setup hook
+# defined as the role of the dependency whose hooks is being run.
+case $hostOffset in
+    -1) local role='BUILD_' ;;
+    0)  local role='' ;;
+    1)  local role='TARGET_' ;;
+    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
+        return 1 ;;
+esac
+
 linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
index 9022fced6ecf..bcd93cf486ff 100644
--- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
@@ -1,3 +1,14 @@
+# The `hostOffset` describes how the host platform of the dependencies
+# relative to the depending package. It is brought into scope of the setup hook
+# defined as the role of the dependency whose hooks is being run.
+case $hostOffset in
+    -1) local role='BUILD_' ;;
+    0)  local role='' ;;
+    1)  local role='TARGET_' ;;
+    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
+        return 1 ;;
+esac
+
 linkCxxAbi="@linkCxxAbi@"
-export NIX_CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"

From c770e6162276fde2e4120ce632eb0a553b21304c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Fri, 4 May 2018 00:46:05 +0200
Subject: [PATCH 1088/3370] nheko: 0.3.1 -> 0.4.0

---
 .../networking/instant-messengers/nheko/default.nix       | 8 ++++----
 .../instant-messengers/nheko/external-deps.patch          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 8405769582f7..688ac6d10d6f 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -17,8 +17,8 @@ let
     src = fetchFromGitHub {
       owner = "mujx";
       repo = "matrix-structs";
-      rev = "91bb2b85a75d664007ef81aeb500d35268425922";
-      sha256 = "1v544pv18sd91gdrhbk0nm54fggprsvwwrkjmxa59jrvhwdk7rsx";
+      rev = "690080daa3bc1984297c4d7103cde9ea07e2e0b7";
+      sha256 = "0l6mncpdbjmrzp5a3q1jv0sxf7bwl5ljslrcjca1j2bjjbqb61bz";
     };
 
     postUnpack = ''
@@ -47,13 +47,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "1dqd698p6wicz0x1lb6mzlwcp68sjkivanb9lwz3yy1mlmy8i3jn";
+    sha256 = "1yg6bk193mqj99x3sy0f20x3ggpl0ahrp36w6hhx7pyw5qm17342";
   };
 
   # This patch is likely not strictly speaking needed, but will help detect when
diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
index 661ae756a4dd..a3425a780454 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
+++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
@@ -54,7 +54,7 @@ index cef00f6..e69de29 100644
 -  MatrixStructs
 -
 -  GIT_REPOSITORY https://github.com/mujx/matrix-structs
--  GIT_TAG 91bb2b85a75d664007ef81aeb500d35268425922
+-  GIT_TAG 690080daa3bc1984297c4d7103cde9ea07e2e0b7
 -
 -  BUILD_IN_SOURCE 1
 -  SOURCE_DIR ${MATRIX_STRUCTS_ROOT}

From ef82607d90b45683740f70bacc218566093a4455 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 17:57:51 -0500
Subject: [PATCH 1089/3370] qt48: fix patch url

See #39927
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 10f892bc4d00..d0319cdb43ba 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
       })
       (fetchpatch {
         name = "fix-medium-font.patch";
-        url = "http://anonscm.debian.org/cgit/pkg-kde/qt/qt4-x11.git/plain/debian/patches/"
-          + "kubuntu_39_fix_medium_font.diff?id=21b342d71c19e6d68b649947f913410fe6129ea4";
+        url = "https://salsa.debian.org/qt-kde-team/qt/qt4-x11/raw/"
+          + "21b342d71c19e6d68b649947f913410fe6129ea4/debian/patches/kubuntu_39_fix_medium_font.diff";
         sha256 = "0bli44chn03c2y70w1n8l7ss4ya0b40jqqav8yxrykayi01yf95j";
       })
       (fetchpatch {

From 5206574be32cbcfa8464dbf83db7d93dee784b5c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 18:02:57 -0500
Subject: [PATCH 1090/3370] stdenv: add libSystem.dev to allowedRequisites

---
 pkgs/stdenv/darwin/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 9563f52ea263..98102cd56545 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -225,7 +225,7 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
-      (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
+      (with pkgs.darwin; [ dyld Libsystem Libsystem.dev CF ICU locale ]);
 
     overrides = persistent;
   };
@@ -263,7 +263,7 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
-      (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
+      (with pkgs.darwin; [ dyld ICU Libsystem Libsystem.dev locale ]);
 
     overrides = persistent;
   };
@@ -383,7 +383,7 @@ in rec {
       binutils.bintools darwin.binutils darwin.binutils.bintools
       cc.expand-response-params
     ]) ++ (with pkgs.darwin; [
-      dyld Libsystem CF cctools ICU libiconv locale
+      dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale
     ]);
 
     overrides = self: super:

From 4f1f7c4655ffe484858600a75d574db2c76e7321 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 18:05:04 -0500
Subject: [PATCH 1091/3370] libgweather: fixup assertion error

---
 pkgs/desktops/gnome-2/desktop/libgweather/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
index ab68acda2770..47f2b8c90fb7 100644
--- a/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libgweather/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, GConf, libsoup, libtasn1, nettle, gmp }:
 
+assert stdenv ? glibc;
+
 stdenv.mkDerivation rec {
   name = "libgweather-2.30.3";
   src = fetchurl {

From 51998c675acfd6b2bb4f07bc4910bca7e8a96c9c Mon Sep 17 00:00:00 2001
From: Michael Bishop <michael.bishop@iohk.io>
Date: Thu, 3 May 2018 20:04:11 -0300
Subject: [PATCH 1092/3370] runInLinuxVM: fix ext4 and crc32c-intel
 interactions

---
 pkgs/build-support/vm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 08d0a358e61f..622fba0686f4 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -92,7 +92,7 @@ rec {
 
     echo "loading kernel modules..."
     for i in $(cat ${modulesClosure}/insmod-list); do
-      insmod $i
+      insmod $i || echo "warning: unable to load $i"
     done
 
     mount -t devtmpfs devtmpfs /dev

From 8f5c258cc13fd989fde6911d8c0b8077a77241a9 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 3 May 2018 20:04:56 -0500
Subject: [PATCH 1093/3370] icestorm: 2018.03.21 -> 2018.05.03

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/icestorm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index 3c87abbdce97..cb203a431d4b 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "icestorm-${version}";
-  version = "2018.03.21";
+  version = "2018.05.03";
 
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";
-    rev    = "4476d83f76fa0222be0b691fe27c1e0228266f82";
-    sha256 = "1r43vwwz61rvdpc3kylg8yzv0flz9p4j3yc1cc4h904zsdwjx39a";
+    rev    = "237280ce44f72c7b2e1ca671d5113dba34cc4fca";
+    sha256 = "0r9xh024snaf1g2r5k524yl6lvf5rkfhqwjzcixh1m12012i5hrh";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 922e78896c3053a3b31f7ff36bc9b9f6b895c058 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 3 May 2018 20:05:13 -0500
Subject: [PATCH 1094/3370] arachne-pnr: 2018.03.07 -> 2018.05.03

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/arachne-pnr/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix
index 70acb79dc7e4..bf8511704f80 100644
--- a/pkgs/development/compilers/arachne-pnr/default.nix
+++ b/pkgs/development/compilers/arachne-pnr/default.nix
@@ -4,13 +4,13 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "arachne-pnr-${version}";
-  version = "2018.03.07";
+  version = "2018.05.03";
 
   src = fetchFromGitHub {
     owner  = "cseed";
     repo   = "arachne-pnr";
-    rev    = "6701132cbd5c7b31edd0ff18ca6727eb3691186b";
-    sha256 = "1c55k9gpq042mkyxrblwskbmr3v0baj4gkwm45v1gvmhdza6gfw8";
+    rev    = "ea2d04215bc0fd6072cda244caeb6670892033b3";
+    sha256 = "0qhf5djyh0pzmgv33rjnnqq6asmmwxjdadvr18a83iy9pll6gg5k";
   };
 
   enableParallelBuilding = true;

From f17f6866842c0bf398c2c3bbe431a082afd9ce96 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 3 May 2018 20:05:41 -0500
Subject: [PATCH 1095/3370] yosys: 2018.03.21 -> 2018.05.03

ABC has now moved to GitHub, so we can eliminate the usage of
fetchFromBitbucket now, too.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index c20bffe26ed1..4bd5640c854c 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchFromBitbucket
+{ stdenv, fetchFromGitHub
 , pkgconfig, tcl, readline, libffi, python3, bison, flex
 }:
 
@@ -6,25 +6,25 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2018.03.21";
+  version = "2018.05.03";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "3f0070247590458c5ed28c5a7abfc3b9d1ec138b";
-      sha256 = "0rsnjk25asg7dkxcmim464rmxgvm7x7njmcp5nyl8y4iwn8i9p8v";
+      rev    = "a572b495387743a58111e7264917a497faa17ebf";
+      sha256 = "0q4xh4sy3n83c8il8lygzv0i6ca4qw36i2k6qz6giw0wd2pkibkb";
       name   = "yosys";
     })
 
     # NOTE: the version of abc used here is synchronized with
     # the one in the yosys Makefile of the version above;
     # keep them the same for quality purposes.
-    (fetchFromBitbucket {
-      owner  = "alanmi";
+    (fetchFromGitHub {
+      owner  = "berkeley-abc";
       repo   = "abc";
-      rev    = "6e3c24b3308a";
-      sha256 = "1i4wv0si4fb6dpv2yrpkp588mdlfrnx2s02q2fgra5apdm54c53w";
+      rev    = "f23ea8e33f6d5cc54f58bec6d9200483e5d8c704";
+      sha256 = "1xwmq3k5hfavdrs7zbqjxh35kr2pis4i6hhzrq7qzyzs0az0hls9";
       name   = "yosys-abc";
     })
   ];

From 301f14e993e54d1fa79b47c2efa699ea2c774b4b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 3 May 2018 20:06:20 -0500
Subject: [PATCH 1096/3370] symbiyosys: 2018.03.21 -> 2018.05.03

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/symbiyosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 98acebcf2cc5..2580b9b0fbe0 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "symbiyosys-${version}";
-  version = "2018.03.21";
+  version = "2018.05.03";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "symbiyosys";
-    rev    = "76a624a363bc44df102359595d34f29370c6668b";
-    sha256 = "1ikax1yiqgj5442wcgp1iigw8wiyw7k848z4ykn7k068kbc320bm";
+    rev    = "35d956c7bb77c0602d198035b2d73a9c61cb4de4";
+    sha256 = "02zg3nkwp3fdjwz1agvsn55k1xipwh2rradb0bgjrjpsmmw63gda";
   };
 
   buildInputs = [ python3 yosys ];

From e730e05d5c1502220e0252a069c4b27d6c6e8f7e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Fri, 4 May 2018 12:41:44 +0800
Subject: [PATCH 1097/3370] freetds: 1.00.80 -> 1.00.91

---
 pkgs/development/libraries/freetds/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix
index b097e5cbb64c..52d439918aa3 100644
--- a/pkgs/development/libraries/freetds/default.nix
+++ b/pkgs/development/libraries/freetds/default.nix
@@ -4,19 +4,17 @@
 
 assert odbcSupport -> unixODBC != null;
 
+# Work is in progress to move to cmake so revisit that later
+
 stdenv.mkDerivation rec {
   name = "freetds-${version}";
-  version = "1.00.80";
+  version = "1.00.91";
 
   src = fetchurl {
     url    = "http://www.freetds.org/files/stable/${name}.tar.bz2";
-    sha256 = "17s15avxcyhfk0zsj8rggizhpd2j2sa41w5xlnshzd2r3piqyl6k";
+    sha256 = "04c344xdvh2j36r01ph7yhy5rb1668il0z9vyphwdy6qqwywh622";
   };
 
-  configureFlags = [
-    "--with-tdsver=7.3"
-  ];
-
   buildInputs = [
     openssl
   ] ++ stdenv.lib.optional odbcSupport unixODBC;

From d8ebe4f2cfce622066f174bc33a35910ea52093e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 3 May 2018 18:37:47 +0000
Subject: [PATCH 1098/3370] ocamlPackages.git: 1.11.4 -> 1.11.5

Also enable tests
---
 pkgs/development/ocaml-modules/git-http/default.nix |  9 +++++++--
 pkgs/development/ocaml-modules/git/default.nix      | 10 +++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/git-http/default.nix b/pkgs/development/ocaml-modules/git-http/default.nix
index 5b93b9607658..5e757b5b6727 100644
--- a/pkgs/development/ocaml-modules/git-http/default.nix
+++ b/pkgs/development/ocaml-modules/git-http/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt }:
+{ stdenv, ocaml, findlib, jbuilder, git, cohttp-lwt
+, alcotest, mtime, nocrypto
+}:
 
 stdenv.mkDerivation rec {
 	name = "ocaml${ocaml.version}-git-http-${version}";
 	inherit (git) version src;
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ];
 
 	propagatedBuildInputs = [ git cohttp-lwt ];
 
@@ -12,6 +14,9 @@ stdenv.mkDerivation rec {
 
 	inherit (jbuilder) installPhase;
 
+	doCheck = true;
+	checkPhase = "jbuilder runtest -p git-http";
+
 	meta = {
 		description = "Client implementation of the “Smart” HTTP Git protocol in pure OCaml";
 		inherit (git.meta) homepage license maintainers platforms;
diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix
index 9347c6ad00cd..6f0f0d0b120b 100644
--- a/pkgs/development/ocaml-modules/git/default.nix
+++ b/pkgs/development/ocaml-modules/git/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam
 , astring, decompress, fmt, hex, logs, mstruct, ocaml_lwt, ocamlgraph, uri
+, alcotest, mtime, nocrypto
 }:
 
 stdenv.mkDerivation rec {
-	version = "1.11.4";
+	version = "1.11.5";
 	name = "ocaml${ocaml.version}-git-${version}";
 
 	src = fetchFromGitHub {
 		owner = "mirage";
 		repo = "ocaml-git";
 		rev = version;
-		sha256 = "182b6shcfcq50r5snm01hwalnmck43x1xgdd4fvjb6q78pbwag2x";
+		sha256 = "0r1bxpxjjnl9hh8xbabsxl7svzvd19hfy73a2y1m4kljmw64dpfh";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder ];
+	buildInputs = [ ocaml findlib jbuilder alcotest mtime nocrypto ];
 
 	propagatedBuildInputs = [ astring decompress fmt hex logs mstruct ocaml_lwt ocamlgraph uri ];
 
@@ -21,6 +22,9 @@ stdenv.mkDerivation rec {
 
 	inherit (jbuilder) installPhase;
 
+	doCheck = true;
+	checkPhase = "jbuilder runtest -p git";
+
 	meta = {
 		description = "Git format and protocol in pure OCaml";
 		license = stdenv.lib.licenses.isc;

From cf50edf58385c4ca261b53ad09c9be2d94349427 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 3 May 2018 15:35:51 +0200
Subject: [PATCH 1099/3370] python3Packages.yowsup: 2.5.2 -> 2.5.7

The latest update of `yowsup` (https://github.com/tgalal/yowsup/releases/tag/v2.5.7)
contains the following fixes:

* Updated tokens
* Fixed tgalal/yowsup#1842: Bug in protocol_groups RemoveGroupsNotificationProtocolEntity
* Other minor bug fixes

The `argparse-dependency.patch` required a rebase onto the latest
version of `setup.py` and ensures that `argparse` won't be needed as
extra dependency as our `python3` package ships `argparse` by default.

A short note to Python 2 support:

the actual issue related to Python 2.x support has been resolved
(https://github.com/tgalal/yowsup/issues/2325#issuecomment-354533727),
however this relies on `six==1.10` which isn't support by `nixpkgs` as
`six` has been bumped to `1.11`. When trying to inject a patched version
of our `six` package based on `six==1.10` you'll run into issues with
duplicated libraries in your closure as further build dependencies
(`pytest` in this case) use the latest `six` version. As Python 2.7 will
die in 2020 (https://pythonclock.org/) and patching around in the
dependencies of `pytest` to get `yowsup` running isn't worth the effort
in my opinion I decided to keep the Python 2.x build disabled for now.
---
 .../python-modules/yowsup/argparse-dependency.patch      | 6 +++---
 pkgs/development/python-modules/yowsup/default.nix       | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/yowsup/argparse-dependency.patch b/pkgs/development/python-modules/yowsup/argparse-dependency.patch
index 364f0054fe78..e2b9f0c9a74c 100644
--- a/pkgs/development/python-modules/yowsup/argparse-dependency.patch
+++ b/pkgs/development/python-modules/yowsup/argparse-dependency.patch
@@ -1,13 +1,13 @@
 diff --git a/setup.py b/setup.py
-index 053ed07..60f0d9a 100755
+index 991e89c..7a96ccf 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -5,7 +5,7 @@ import yowsup
  import platform
  import sys
  
--deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six']
+-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six==1.10']
 +deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
  
  if sys.version_info < (2,7):
-     deps += ['importlib']
+     deps += ['importlib', "protobuf==3.4.0"]
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
index f7ee986aebb3..5fa4af18c089 100644
--- a/pkgs/development/python-modules/yowsup/default.nix
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -3,19 +3,18 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "yowsup";
-  version = "2.5.2";
+  version = "2.5.7";
 
-  # python2 is currently incompatible with yowsup:
-  # https://github.com/tgalal/yowsup/issues/2325#issuecomment-343516519
+  # The Python 2.x support of this package is incompatible with `six==1.11`:
+  # https://github.com/tgalal/yowsup/issues/2416#issuecomment-365113486
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "tgalal";
     repo = "yowsup";
     rev = "v${version}";
-    sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl";
+    sha256 = "1p0hdj5x38v2cxjnhdnqcnp5g7la57mbi365m0z83wa01x2n73w6";
   };
 
   checkInputs = [ pytest ];

From 1f1e16af732a579bf9967494473eaf7079aeaed5 Mon Sep 17 00:00:00 2001
From: Lengyel Balazs <ikervagyok@gmail.com>
Date: Fri, 4 May 2018 13:02:02 +0200
Subject: [PATCH 1100/3370] mathematica: add mesa, fix `libGL.so.1 not found`
 messages

---
 pkgs/applications/science/math/mathematica/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 9b9d5b250ef6..97781a69ce64 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -19,6 +19,8 @@
 , libxml2
 , libuuid
 , lang ? "en"
+, libGL
+, libGLU
 }:
 
 let
@@ -56,6 +58,8 @@ stdenv.mkDerivation rec {
     libxml2
     libuuid
     zlib
+    libGL
+    libGLU
   ] ++ (with xorg; [
     libX11
     libXext

From 20bb5fb0d94823eca8a4b68bc5ddfce459346d72 Mon Sep 17 00:00:00 2001
From: Yorick <yorick@yorickvanpelt.nl>
Date: Fri, 4 May 2018 13:12:09 +0200
Subject: [PATCH 1101/3370] impure.nix: stringify path from NIX_PATH

If impure.nix gets the path from NIX_PATH, the type is `path`, and `path+"/."` is a no-op. Stringify it first so `isDir` will return false if it's not, in fact, a dir. This way, single files can be specified with nixpkgs-overlays in the NIX_PATH.
---
 pkgs/top-level/impure.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index a9f21e45aed4..df462665dd16 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -41,7 +41,7 @@ in
   # fix-point made by Nixpkgs.
   overlays ? let
       isDir = path: pathExists (path + "/.");
-      pathOverlays = try <nixpkgs-overlays> "";
+      pathOverlays = try (toString <nixpkgs-overlays>) "";
       homeOverlaysFile = homeDir + "/.config/nixpkgs/overlays.nix";
       homeOverlaysDir = homeDir + "/.config/nixpkgs/overlays";
       overlays = path:

From 23d98f9e8ff8d88ba1adc576c14285e0d84a1785 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Fri, 4 May 2018 13:21:50 +0200
Subject: [PATCH 1102/3370] prometheus-postfix-exporter: 0.1.1 -> 0.1.2

With this release systemd support became optional.
It can now be disabled by passing `withSystemdSupport = false` to `callPackage`.
---
 .../prometheus/postfix-exporter-deps.nix      | 26 ++-----------
 .../prometheus/postfix-exporter.nix           | 38 +++++++++++++++----
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
index 194651f43326..07bedaba9f36 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter-deps.nix
@@ -9,31 +9,13 @@
       sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
     };
   }
-  {
-    goPackagePath = "github.com/coreos/go-systemd";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/go-systemd";
-      rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78";
-      sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv";
-    };
-  }
-  {
-    goPackagePath = "github.com/coreos/pkg";
-    fetch = {
-      type = "git";
-      url = "https://github.com/coreos/pkg";
-      rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
-      sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
-    };
-  }
   {
     goPackagePath = "github.com/golang/protobuf";
     fetch = {
       type = "git";
       url = "https://github.com/golang/protobuf";
-      rev = "e09c5db296004fbe3f74490e84dcd62c3c5ddb1b";
-      sha256 = "1acnmalkqwrq6k3l71c4pyws0zn18r2609kqaq55lhbdcjgzid31";
+      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
     };
   }
   {
@@ -68,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/prometheus/common";
-      rev = "d0f7cd64bda49e08b22ae8a730aa57aa0db125d6";
-      sha256 = "1d4hfbb66xsf0wq317fwhgrwakqzhvryw4d7ip851lwrpql5fqcx";
+      rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c";
+      sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1";
     };
   }
   {
diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
index 3c2f01c0a5ce..97df26aea4e5 100644
--- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix
@@ -1,8 +1,11 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, systemd, makeWrapper
+, withSystemdSupport ? true }:
+
+with stdenv.lib;
 
 buildGoPackage rec {
   name = "postfix_exporter-${version}";
-  version = "0.1.1";
+  version = "0.1.2";
 
   goPackagePath = "github.com/kumina/postfix_exporter";
 
@@ -10,20 +13,41 @@ buildGoPackage rec {
     owner = "kumina";
     repo = "postfix_exporter";
     rev = version;
-    sha256 = "1p2j66jzzgyv2w832pw57g02vrac6ldrblqllgwyy0i8krb3ibyz";
+    sha256 = "1b9ib3scxni6hlw55wv6f0z1xfn27l0p29as24f71rs70pyzy4hm";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ systemd ];
+  nativeBuildInputs = optional withSystemdSupport makeWrapper;
+  buildInputs = optional withSystemdSupport systemd;
+  buildFlags = optional (!withSystemdSupport) "-tags nosystemd";
 
   goDeps = ./postfix-exporter-deps.nix;
+  extraSrcs = optionals withSystemdSupport [
+    {
+      goPackagePath = "github.com/coreos/go-systemd";
+      src = fetchFromGitHub {
+        owner = "coreos";
+        repo = "go-systemd";
+        rev = "d1b7d058aa2adfc795ad17ff4aaa2bc64ec11c78";
+        sha256 = "1nz3v1b90hnmj2vjjwq96pr6psxlndqjyd30v9sgiwygzb7db9mv";
+      };
+    }
+    {
+      goPackagePath = "github.com/coreos/pkg";
+      src = fetchFromGitHub {
+        owner = "coreos";
+        repo = "pkg";
+        rev = "97fdf19511ea361ae1c100dd393cc47f8dcfa1e1";
+        sha256 = "1srn87wih25l09f75483hnxsr8fc6rq3bk7w1x8125ym39p6mg21";
+      };
+    }
+  ];
 
-  postInstall = ''
+  postInstall = optionalString withSystemdSupport ''
     wrapProgram $bin/bin/postfix_exporter \
       --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib"
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     inherit (src.meta) homepage;
     description = "A Prometheus exporter for Postfix";
     license = licenses.asl20;

From 9d0b6b9dfc92a2704e2111aa836f5bdbf8c9ba42 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 4 May 2018 13:26:10 +0200
Subject: [PATCH 1103/3370] nix: 2.0.1 -> 2.0.2

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 6bb556a0123c..5ad28ea9499e 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/2gk7rk2sx2dkmsjr59gignrfdmya8f6s-nix-2.0.1";
-  i686-linux = "/nix/store/5160glkphiv13qggnivyidg8r0491pbl-nix-2.0.1";
-  aarch64-linux = "/nix/store/jk29zz3ns9vdkkclcyzzkpzp8dhv1x3i-nix-2.0.1";
-  x86_64-darwin = "/nix/store/4a9czmrpd4hf3r80zcmga2c2lm3hbbvv-nix-2.0.1";
+  x86_64-linux = "/nix/store/z6avpvg24f6d1br2sr6qlphsq3h4d91v-nix-2.0.2";
+  i686-linux = "/nix/store/cdqjyb9srhwkc4gqbknnap7y31lws4yq-nix-2.0.2";
+  aarch64-linux = "/nix/store/fbgaa3fb2am30klwv4lls44njwqh487a-nix-2.0.2";
+  x86_64-darwin = "/nix/store/hs8mxsvdhm95dxgx943d74fws01j2zj3-nix-2.0.2";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 230994897234..1d15bd11b7fa 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -132,10 +132,10 @@ in rec {
   }) // { perl-bindings = nixStable; };
 
   nixStable = (common rec {
-    name = "nix-2.0.1";
+    name = "nix-2.0.2";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "689c33b9885b56b7817bf94aad3bc7ccf50710ebb34b01c5a5a2ac4e472750b1";
+      sha256 = "2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435";
     };
   }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
 

From 39c63320cbf4654eabdc7e15aebf1d3a74598dbd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 May 2018 16:06:47 +0200
Subject: [PATCH 1104/3370] minitube: 2.4 -> 2.9

Version 2.9 is based on QT5 (with a much better interface) and requires
additionally the dependencies `qtbase`, `qtdeclarative` and `qttools`.

Furthermore the `QT_PLUGIN_PATH` had to be altered, however the
`phonon-backend` contains versioned paths, so we provide the plugin path
that matches the QT version used to build this package.

See #33248
---
 pkgs/applications/video/minitube/default.nix | 15 +++++++++------
 pkgs/top-level/all-packages.nix              |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 8b94204cd627..3b8dce90243b 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,21 +1,23 @@
-{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qtbase, qmake
+, qtdeclarative, qttools
+
 # "Free" key generated by nckx <github@tobias.gr>. I no longer have a Google
 # account. You'll need to generate (and please share :-) a new one if it breaks.
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
 stdenv.mkDerivation rec {
   name = "minitube-${version}";
-  version = "2.4";
+  version = "2.9";
 
   src = fetchFromGitHub {
-    sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5";
+    sha256 = "11zkmwqadlgrrghs3rxq0h0fllfnyd3g09d7gdd6vd9r1a1yz73f";
     rev = version;
     repo = "minitube";
     owner = "flaviotordini";
   };
 
-  buildInputs = [ phonon phonon-backend-vlc qt4 ];
-  nativeBuildInputs = [ makeWrapper qmake4Hook ];
+  buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qttools ];
+  nativeBuildInputs = [ makeWrapper qmake ];
 
   qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
 
@@ -23,7 +25,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/minitube \
-      --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins"
+      --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/qt-5.${stdenv.lib.versions.minor qtbase.version}/plugins"
   '';
 
   meta = with stdenv.lib; {
@@ -36,5 +38,6 @@ stdenv.mkDerivation rec {
     homepage = https://flavio.tordini.org/minitube;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ ma27 ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a84..684fb560d9dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16778,7 +16778,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) vmnet;
   };
 
-  minitube = callPackage ../applications/video/minitube { };
+  minitube = libsForQt5.callPackage ../applications/video/minitube { };
 
   mimms = callPackage ../applications/audio/mimms {};
 

From 5777272bd2f4bde3ec9b048c0da3c388a8e0239e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Wed, 2 May 2018 23:10:43 +0200
Subject: [PATCH 1105/3370] nixos/plymouth: multi-user.target wants
 plymouth-quit-wait.service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is apparent from the service file directory in plymouth:
├── multi-user.target.wants
│   ├── plymouth-quit.service -> ../plymouth-quit.service
│   └── plymouth-quit-wait.service -> ../plymouth-quit-wait.service

Leaving it unspecified caused gdm-wayland to crash on boot, see #39615.

The change made other display managers not quit plymouth properly however. By
removing "multi-user.target" from `plymouth-quit.after` this is resolved.
---
 nixos/modules/system/boot/plymouth.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index f8fb8a64cb9b..e4223bae7d32 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -87,9 +87,10 @@ in
 
     systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ];
     systemd.services.plymouth-halt.wantedBy = [ "halt.target" ];
+    systemd.services.plymouth-quit-wait.wantedBy = [ "multi-user.target" ];
     systemd.services.plymouth-quit = {
       wantedBy = [ "multi-user.target" ];
-      after = [ "display-manager.service" "multi-user.target" ];
+      after = [ "display-manager.service" ];
     };
     systemd.services.plymouth-poweroff.wantedBy = [ "poweroff.target" ];
     systemd.services.plymouth-reboot.wantedBy = [ "reboot.target" ];

From ce00943916f81d26d15fab054315aa494233496c Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 4 May 2018 10:19:31 -0400
Subject: [PATCH 1106/3370] =?UTF-8?q?pytorch:=200.2.0=20=E2=86=92=200.3.1?=
 =?UTF-8?q?=20with=20CUDA=20and=20cuDNN=20(#38530)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* pytorch-0.3 with optional cuda and cudnn

* pytorch tests reenabled if compiling without cuda

* pytorch: Conditionalize cudnn dependency on cudaSupport

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Compile with the same GCC version used by CUDA if cudaSupport

Fixes this error:

In file included from /nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/host_config.h:50:0,
                 from /nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/cuda_runtime.h:78,
                 from <command-line>:0:
/nix/store/gv7w3c71jg627cpcff04yi6kwzpzjyap-cudatoolkit-9.1.85.1/include/crt/host_config.h:121:2: error: #error -- unsupported GNU version! gcc versions later than 6 are not supported!
 #error -- unsupported GNU version! gcc versions later than 6 are not supported!
  ^~~~~

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Build with joined cudatoolkit

Similar to #30058 for TensorFlow.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: 0.3.0 -> 0.3.1

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Patch for “refcounted file mapping not supported” failure

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Skip distributed tests

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

* pytorch: Use the stub libcuda.so from cudatoolkit for running tests

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../python-modules/pytorch/default.nix        | 66 ++++++++++++++++---
 pkgs/top-level/python-packages.nix            | 12 +++-
 2 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index a510eedee4fd..c8376196d3ac 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,8 +1,31 @@
-{ buildPythonPackage, fetchFromGitHub, lib, numpy, pyyaml, cffi, cmake,
-  git, stdenv }:
+{ buildPythonPackage,
+  cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
+  fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, cmake,
+  git, stdenv, linkFarm, symlinkJoin,
+  utillinux, which }:
 
-buildPythonPackage rec {
-  version = "0.2.0";
+assert cudnn == null || cudatoolkit != null;
+assert !cudaSupport || cudatoolkit != null;
+
+let
+  cudatoolkit_joined = symlinkJoin {
+    name = "${cudatoolkit.name}-unsplit";
+    paths = [ cudatoolkit.out cudatoolkit.lib ];
+  };
+
+  # Normally libcuda.so.1 is provided at runtime by nvidia-x11 via
+  # LD_LIBRARY_PATH=/run/opengl-driver/lib.  We only use the stub
+  # libcuda.so from cudatoolkit for running tests, so that we don’t have
+  # to recompile pytorch on every update to nvidia-x11 or the kernel.
+  cudaStub = linkFarm "cuda-stub" [{
+    name = "libcuda.so.1";
+    path = "${cudatoolkit}/lib/stubs/libcuda.so";
+  }];
+  cudaStubEnv = lib.optionalString cudaSupport
+    "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
+
+in buildPythonPackage rec {
+  version = "0.3.1";
   pname = "pytorch";
   name = "${pname}-${version}";
 
@@ -10,18 +33,41 @@ buildPythonPackage rec {
     owner  = "pytorch";
     repo   = "pytorch";
     rev    = "v${version}";
-    sha256 = "1s3f46ga1f4lfrcj3lpvvhgkdr1pi8i2hjd9xj9qiz3a9vh2sj4n";
+    fetchSubmodules = true;
+    sha256 = "1k8fr97v5pf7rni5cr2pi21ixc3pdj3h3lkz28njbjbgkndh7mr3";
   };
 
-  checkPhase = ''
-    ${stdenv.shell} test/run_test.sh
+  patches = [
+    (fetchpatch {
+      # make sure stdatomic.h is included when checking for ATOMIC_INT_LOCK_FREE
+      # Fixes this test failure:
+      # RuntimeError: refcounted file mapping not supported on your system at /tmp/nix-build-python3.6-pytorch-0.3.0.drv-0/source/torch/lib/TH/THAllocator.c:525
+      url = "https://github.com/pytorch/pytorch/commit/502aaf39cf4a878f9e4f849e5f409573aa598aa9.patch";
+      stripLen = 3;
+      extraPrefix = "torch/lib/";
+      sha256 = "1miz4lhy3razjwcmhxqa4xmlcmhm65lqyin1czqczj8g16d3f62f";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace test/run_test.sh --replace \
+      "INIT_METHOD='file://'\$TEMP_DIR'/shared_init_file' \$PYCMD ./test_distributed.py" \
+      "echo Skipped for Nix package"
+  '';
+
+  preConfigure = lib.optionalString cudaSupport ''
+    export CC=${cudatoolkit.cc}/bin/gcc
+  '' + lib.optionalString (cudaSupport && cudnn != null) ''
+    export CUDNN_INCLUDE_DIR=${cudnn}/include
   '';
 
   buildInputs = [
      cmake
      git
      numpy.blas
-  ];
+     utillinux
+     which
+  ] ++ lib.optionals cudaSupport [cudatoolkit_joined cudnn];
 
   propagatedBuildInputs = [
     cffi
@@ -29,8 +75,8 @@ buildPythonPackage rec {
     pyyaml
   ];
 
-  preConfigure = ''
-    export NO_CUDA=1
+  checkPhase = ''
+    ${cudaStubEnv}${stdenv.shell} test/run_test.sh
   '';
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca0ee1195cc6..4da4910bbbdf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5623,7 +5623,17 @@ in {
     };
   };
 
-  pytorch = callPackage ../development/python-modules/pytorch { };
+  pytorch = callPackage ../development/python-modules/pytorch {
+    cudaSupport = pkgs.config.cudaSupport or false;
+  };
+
+  pytorchWithCuda = self.pytorch.override {
+    cudaSupport = true;
+  };
+
+  pytorchWithoutCuda = self.pytorch.override {
+    cudaSupport = false;
+  };
 
   python2-pythondialog = buildPythonPackage rec {
     name = "python2-pythondialog-${version}";

From 7f53ee8412b6f4777f827acf15db119e000d8f6f Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 3 May 2018 21:30:06 +0200
Subject: [PATCH 1107/3370] restic-rest-server module: init

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/backup/restic-rest-server.nix    | 107 ++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 nixos/modules/services/backup/restic-rest-server.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0ed820a32acc..805d83c7ce3d 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -306,6 +306,7 @@
       ceph = 288;
       duplicati = 289;
       monetdb = 290;
+      restic = 291;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -580,6 +581,7 @@
       ceph = 288;
       duplicati = 289;
       monetdb = 290;
+      restic = 291;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 505c5497d36d..26804d3682de 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -167,6 +167,7 @@
   ./services/backup/mysql-backup.nix
   ./services/backup/postgresql-backup.nix
   ./services/backup/restic.nix
+  ./services/backup/restic-rest-server.nix
   ./services/backup/rsnapshot.nix
   ./services/backup/tarsnap.nix
   ./services/backup/znapzend.nix
diff --git a/nixos/modules/services/backup/restic-rest-server.nix b/nixos/modules/services/backup/restic-rest-server.nix
new file mode 100644
index 000000000000..d4b47a099410
--- /dev/null
+++ b/nixos/modules/services/backup/restic-rest-server.nix
@@ -0,0 +1,107 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.restic.server;
+in
+{
+  meta.maintainers = [ maintainers.bachp ];
+
+  options.services.restic.server = {
+    enable = mkEnableOption "Restic REST Server";
+
+    listenAddress = mkOption {
+      default = ":8000";
+      example = "127.0.0.1:8080";
+      type = types.str;
+      description = "Listen on a specific IP address and port.";
+    };
+
+    dataDir = mkOption {
+      default = "/var/lib/restic";
+      type = types.path;
+      description = "The directory for storing the restic repository.";
+    };
+
+    appendOnly = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enable append only mode.
+        This mode allows creation of new backups but prevents deletion and modification of existing backups.
+        This can be useful when backing up systems that have a potential of being hacked.
+      '';
+    };
+
+    privateRepos = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Enable private repos.
+        Grants access only when a subdirectory with the same name as the user is specified in the repository URL.
+      '';
+    };
+
+    prometheus = mkOption {
+      default = false;
+      type = types.bool;
+      description = "Enable Prometheus metrics at /metrics.";
+    };
+
+    extraFlags = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      description = ''
+        Extra commandline options to pass to Restic REST server.
+      '';
+    };
+
+    package = mkOption {
+      default = pkgs.restic-rest-server;
+      defaultText = "pkgs.restic-rest-server";
+      type = types.package;
+      description = "Restic REST server package to use.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.restic-rest-server = {
+      description = "Restic REST Server";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/rest-server \
+          --listen ${cfg.listenAddress} \
+          --path ${cfg.dataDir} \
+          ${optionalString cfg.appendOnly "--append-only"} \
+          ${optionalString cfg.privateRepos "--private-repos"} \
+          ${optionalString cfg.prometheus "--prometheus"} \
+          ${escapeShellArgs cfg.extraFlags} \
+        '';
+        Type = "simple";
+        User = "restic";
+        Group = "restic";
+
+        # Security hardening
+        ReadWritePaths = [ cfg.dataDir ];
+        PrivateTmp = true;
+        ProtectSystem = "strict";
+        ProtectKernelTunables = true;
+        ProtectKernelModules = true;
+        ProtectControlGroups = true;
+        PrivateDevices = true;
+      };
+    };
+
+    users.extraUsers.restic = {
+      group = "restic";
+      home = cfg.dataDir;
+      createHome = true;
+      uid = config.ids.uids.restic;
+    };
+
+    users.extraGroups.restic.gid = config.ids.uids.restic;
+  };
+}

From 9fe26eed9ed92ab3899e7aa30f9d40a793af64ed Mon Sep 17 00:00:00 2001
From: Lionello Lunesu <lio+git@lunesu.com>
Date: Fri, 4 May 2018 07:41:06 +0800
Subject: [PATCH 1108/3370] nix-prefetch-git: fix handling of submodules with
 spaces

The script would parse the output of `git submodule status` but
didn't handle paths with spaces in them. This would result in the
following error when trying to determine the URL of the submodule:

error: key does not contain a section: .url
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 2441da156d1a..1d993dcc1094 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -185,7 +185,7 @@ init_submodules(){
 
         # checkout each submodule
         hash=$(echo "$l" | awk '{print $1}' | tr -d '-')
-        dir=$(echo "$l" | awk '{print $2}')
+        dir=$(echo "$l" | sed -n 's/^ \{0,1\}[^ ]* \(.*\) ([^ ]*)$/\1/p')
         name=$(
             git config -f .gitmodules --get-regexp submodule\..*\.path |
             sed -n "s,^\(.*\)\.path $dir\$,\\1,p")

From 27d716f4b5f56ec3c1230f4c97aa8fcd8696bfb2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 4 May 2018 10:54:06 -0500
Subject: [PATCH 1109/3370] llvm5: 5.0.1 -> 5.0.2

---
 pkgs/development/compilers/llvm/5/clang/default.nix  | 2 +-
 pkgs/development/compilers/llvm/5/default.nix        | 6 +++---
 pkgs/development/compilers/llvm/5/libc++/default.nix | 2 +-
 pkgs/development/compilers/llvm/5/libc++abi.nix      | 2 +-
 pkgs/development/compilers/llvm/5/lld.nix            | 2 +-
 pkgs/development/compilers/llvm/5/lldb.nix           | 2 +-
 pkgs/development/compilers/llvm/5/llvm.nix           | 2 +-
 pkgs/development/compilers/llvm/5/openmp.nix         | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index 6499be2a0bdc..8027733bc527 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -9,7 +9,7 @@ let
     name = "clang-${version}";
 
     unpackPhase = ''
-      unpackFile ${fetch "cfe" "1zyh4dggxd55lnfg73c8fybnkssqcaa6bq2h4bzimnnj1jdnqpqk"}
+      unpackFile ${fetch "cfe" "0018520c4qxf5hgjdqgpz2dgl3faf4gsz87fdlb8zdmx99rfk77s"}
       mv cfe-${version}* clang
       sourceRoot=$PWD/clang
       unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 13e1d2308f8c..67fceb317499 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -6,7 +6,7 @@
 let
   callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
 
-  release_version = "5.0.1";
+  release_version = "5.0.2";
   version = release_version; # differentiating these is important for rc's
 
   fetch = name: sha256: fetchurl {
@@ -14,8 +14,8 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "1nlmm0b3wpdwxkldqp1klzv3rpqf94q2a248xgqb7aapyhbi9paf";
-  clang-tools-extra_src = fetch "clang-tools-extra" "09fjii7w43kvxvsxxs6gig9vz95vnvx1779rqd36h8kksvws3bcs";
+  compiler-rt_src = fetch "compiler-rt" "0ipd4jdxpczgr2w6lzrabymz6dhzj69ywmyybjjc1q397zgrvziy";
+  clang-tools-extra_src = fetch "clang-tools-extra" "018b3fiwah8f8br5i26qmzh6sjvzchpn358sn8v079m49f2jldm3";
 
   # Add man output without introducing extra dependencies.
   overrideManOutput = drv:
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 9ddeea7ef79a..6a486636d33a 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
-  src = fetch "libcxx" "003wwniwlikgh38cbqbcshc5gkiv3a2jkmbn6am9s46y5gfrk3zs";
+  src = fetch "libcxx" "1672aaf95fgy4xsfra8pw24f6r93zwzpan1033hkcm8p2glqipvf";
 
   postUnpack = ''
     unpackFile ${libcxxabi.src}
diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix
index 6d27dcd47b0b..69970543674c 100644
--- a/pkgs/development/compilers/llvm/5/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/5/libc++abi.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "libc++abi-${version}";
 
-  src = fetch "libcxxabi" "0m78yr4arlz2b9m96xcygk15m2pbz8i10snk78i3q7pjnwn1a9as";
+  src = fetch "libcxxabi" "12lp799rskr4fc2xr64qn4jfkjnfd8b1aymvsxyn4k9ar7r9pgqv";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind;
diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix
index 1d00b16cce1f..05801f2f08f0 100644
--- a/pkgs/development/compilers/llvm/5/lld.nix
+++ b/pkgs/development/compilers/llvm/5/lld.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "lld-${version}";
 
-  src = fetch "lld" "15fq2zvkliyiw5qi7ig2r8bshgbz4kzvs5in16mhfkw20l06rcym";
+  src = fetch "lld" "1ah75rjly6747jk1zbwca3z0svr9b09ylgxd4x9ns721xir6sia6";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ llvm ];
diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix
index 559c52831cd2..5e670d4de159 100644
--- a/pkgs/development/compilers/llvm/5/lldb.nix
+++ b/pkgs/development/compilers/llvm/5/lldb.nix
@@ -17,7 +17,7 @@
 stdenv.mkDerivation {
   name = "lldb-${version}";
 
-  src = fetch "lldb" "0sipv8k37ai44m7jcf6wsbm2q41dgk3sk9m3i6823jkmg7kckhdp";
+  src = fetch "lldb" "05j2a63yzln43852nng8a7y47spzlyr1cvdmgmbxgd29c8r0bfkq";
 
   postPatch = ''
     # Fix up various paths that assume llvm and clang are installed in the same place
diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix
index ac575a0bf7aa..66985861e386 100644
--- a/pkgs/development/compilers/llvm/5/llvm.nix
+++ b/pkgs/development/compilers/llvm/5/llvm.nix
@@ -20,7 +20,7 @@
 }:
 
 let
-  src = fetch "llvm" "1c07i0b61j69m578lgjkyayg419sh7sn40xb3j112nr2q2gli9sz";
+  src = fetch "llvm" "0g1bbj2n6xv4p1n6hh17vj3vpvg56wacipc81dgwga9mg2lys8nm";
 
   # Used when creating a version-suffixed symlink of libLLVM.dylib
   shortVersion = with stdenv.lib;
diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix
index 5a01c191b5ae..5c2b7501f979 100644
--- a/pkgs/development/compilers/llvm/5/openmp.nix
+++ b/pkgs/development/compilers/llvm/5/openmp.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   name = "openmp-${version}";
 
-  src = fetch "openmp" "0lr6r87xzg87w1q9rrh04nqpyr8c929dh4qy3csjiy7rsb6kbdmd";
+  src = fetch "openmp" "0p2n52676wlq6y9q99n5pivq6pvvda1p994r69fxj206ahn59jir";
 
   nativeBuildInputs = [ cmake perl ];
   buildInputs = [ llvm ];

From 04d126a3f02e8f07bb18bc4300715aeddc0a0632 Mon Sep 17 00:00:00 2001
From: voobscout <voobscout@archlinux.info>
Date: Fri, 4 May 2018 18:21:43 +0200
Subject: [PATCH 1110/3370] ntfs-3g: fix debian url

---
 pkgs/tools/filesystems/ntfs-3g/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 6acf5e221d47..4bcef5a83f04 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch";
+      url = "https://sources.debian.org/data/main/n/ntfs-3g/1:2016.2.22AR.1+dfsg-1/debian/patches/0003-CVE-2017-0358.patch";
       sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3";
     })
   ];

From 7873fe26693e86e38195e07ee0fd31d1a7f44e6c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 11:37:58 -0500
Subject: [PATCH 1111/3370] dunst: remove fetchpatch

Closes #39962
---
 pkgs/applications/misc/dunst/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 9906b1fd8587..5396299943c5 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch
+{ stdenv, fetchFromGitHub
 , pkgconfig, which, perl, libXrandr
 , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
 , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg

From d2028096ae86debc762381ad2f539d822a734b9d Mon Sep 17 00:00:00 2001
From: Florian Engel <florianengel39@gmail.com>
Date: Fri, 4 May 2018 18:51:38 +0200
Subject: [PATCH 1112/3370] lolcat: 99.9.10 -> 99.9.11

---
 pkgs/tools/misc/lolcat/Gemfile.lock | 2 +-
 pkgs/tools/misc/lolcat/gemset.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock
index 1ef7e5527961..3c4646ddf48f 100644
--- a/pkgs/tools/misc/lolcat/Gemfile.lock
+++ b/pkgs/tools/misc/lolcat/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    lolcat (99.9.10)
+    lolcat (99.9.11)
       manpages (~> 0.6.1)
       paint (~> 2.0.0)
       trollop (~> 2.1.2)
diff --git a/pkgs/tools/misc/lolcat/gemset.nix b/pkgs/tools/misc/lolcat/gemset.nix
index 78677edcc34b..86069f7ecc0e 100644
--- a/pkgs/tools/misc/lolcat/gemset.nix
+++ b/pkgs/tools/misc/lolcat/gemset.nix
@@ -3,10 +3,10 @@
     dependencies = ["manpages" "paint" "trollop"];
     source = {
       remotes = ["http://rubygems.org"];
-      sha256 = "0fidwmgywkklxf2a4f4dl82b8mx4w4n73vqm6jqgyqd3nfmgysnl";
+      sha256 = "1z0j354sj2qm2srgz3i28s347fwylvv1j614806cr33zcd1j4mwp";
       type = "gem";
     };
-    version = "99.9.10";
+    version = "99.9.11";
   };
   manpages = {
     source = {

From c68dc2212e22899de52d470198c74abd51935dab Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 May 2018 18:55:09 +0200
Subject: [PATCH 1113/3370] openscad: fix build by switching to git master and
 Qt5

---
 .../graphics/openscad/default.nix             | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 33fddf6c8d01..9ab5288700cc 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -1,20 +1,30 @@
-{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
-, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext
+{ stdenv, fetchurl, fetchFromGitHub, qt5, libsForQt5
+, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
+, mpfr, gmp, glib, pkgconfig, harfbuzz, gettext
 }:
 
 stdenv.mkDerivation rec {
-  version = "2015.03-3";
+  version = "2018.04-git";
   name = "openscad-${version}";
 
-  src = fetchurl {
-    url = "http://files.openscad.org/${name}.src.tar.gz";
-    sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
+#  src = fetchurl {
+#    url = "http://files.openscad.org/${name}.src.tar.gz";
+#    sha256 = "0djsgi9yx1nxr2gh1kgsqw5vrbncp8v5li0p1pp02higqf1psajx";
+#  };
+  src = fetchFromGitHub {
+    owner = "openscad";
+    repo = "openscad";
+    rev = "179074dff8c23cbc0e651ce8463737df0006f4ca";
+    sha256 = "1y63yqyd0v255liik4ff5ak6mj86d8d76w436x76hs5dk6jgpmfb";
   };
 
   buildInputs = [
-    qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
-    pkgconfig harfbuzz qscintilla gettext
-  ];
+    bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
+    pkgconfig harfbuzz gettext
+  ]
+    ++ (with qt5; [qtbase qmake])
+    ++ (with libsForQt5; [qscintilla])
+  ;
 
   qmakeFlags = [ "VERSION=${version}" ];
 

From 19445fa145d17929ff09447b7670401d071c3da6 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Fri, 4 May 2018 10:33:42 -0700
Subject: [PATCH 1114/3370] nixos/powerManagement: add "med_power_with_dipm"
 scsiLinkPolicy

---
 .../tasks/scsi-link-power-management.nix      | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/tasks/scsi-link-power-management.nix b/nixos/modules/tasks/scsi-link-power-management.nix
index 484c0a0186d7..69599bda6d32 100644
--- a/nixos/modules/tasks/scsi-link-power-management.nix
+++ b/nixos/modules/tasks/scsi-link-power-management.nix
@@ -2,7 +2,20 @@
 
 with lib;
 
-let cfg = config.powerManagement.scsiLinkPolicy; in
+let
+
+  cfg = config.powerManagement.scsiLinkPolicy;
+
+  kernel = config.boot.kernelPackages.kernel;
+
+  allowedValues = [
+    "min_power"
+    "max_performance"
+    "medium_power"
+    "med_power_with_dipm"
+  ];
+
+in
 
 {
   ###### interface
@@ -11,10 +24,13 @@ let cfg = config.powerManagement.scsiLinkPolicy; in
 
     powerManagement.scsiLinkPolicy = mkOption {
       default = null;
-      type = types.nullOr (types.enum [ "min_power" "max_performance" "medium_power" ]);
+      type = types.nullOr (types.enum allowedValues);
       description = ''
         SCSI link power management policy. The kernel default is
         "max_performance".
+        </para><para>
+        "med_power_with_dipm" is supported by kernel versions
+        4.15 and newer.
       '';
     };
 
@@ -24,6 +40,12 @@ let cfg = config.powerManagement.scsiLinkPolicy; in
   ###### implementation
 
   config = mkIf (cfg != null) {
+
+    assertions = singleton {
+      assertion = (cfg == "med_power_with_dipm") -> versionAtLeast kernel.version "4.15";
+      message = "med_power_with_dipm is not supported for kernels older than 4.15";
+    };
+
     services.udev.extraRules = ''
       SUBSYSTEM=="scsi_host", ACTION=="add", KERNEL=="host*", ATTR{link_power_management_policy}="${cfg}"
     '';

From 0c2a7fa4dceb8d57780330c626d86a78978a11e3 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Wed, 18 Apr 2018 12:27:03 -0700
Subject: [PATCH 1115/3370] pass: refactor extension packaging

---
 pkgs/tools/security/pass/default.nix          | 176 +++++++++---------
 .../security/pass/extensions/default.nix      |  12 ++
 .../tools/security/pass/extensions/import.nix |  37 ++++
 .../default.nix => pass/extensions/otp.nix}   |  11 +-
 pkgs/tools/security/pass/extensions/tomb.nix  |  32 ++++
 .../tools/security/pass/extensions/update.nix |  25 +++
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   3 +-
 8 files changed, 205 insertions(+), 92 deletions(-)
 create mode 100644 pkgs/tools/security/pass/extensions/default.nix
 create mode 100644 pkgs/tools/security/pass/extensions/import.nix
 rename pkgs/tools/security/{pass-otp/default.nix => pass/extensions/otp.nix} (82%)
 create mode 100644 pkgs/tools/security/pass/extensions/tomb.nix
 create mode 100644 pkgs/tools/security/pass/extensions/update.nix

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 4f9e6c06697c..5ce0ce0dbc21 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub
+{ stdenv, lib, pkgs, fetchurl, fetchFromGitHub, buildEnv
 , coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
 , makeWrapper
 
 , xclip ? null, xdotool ? null, dmenu ? null
 , x11Support ? !stdenv.isDarwin
-, tombPluginSupport ? false, tomb
+
+# For backwards-compatibility
+, tombPluginSupport ? false
 }:
 
 with lib;
@@ -14,98 +16,100 @@ assert x11Support -> xclip != null
                   && dmenu != null;
 
 let
-  plugins = map (p: (fetchFromGitHub {
-    owner  = "roddhjav";
-    repo   = "pass-${p.name}";
-    inherit (p) rev sha256;
-  }))
-  ([
-    { name = "import";
-      rev = "491935bd275f29ceac2b876b3a288011d1ce31e7";
-      sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; }
-    { name = "update";
-      rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde";
-      sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; }
-    ] ++ stdenv.lib.optional tombPluginSupport {
-      name = "tomb";
-      rev = "3368134898a42c1b758fabac625ec240e125c6be";
-      sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; }
-  );
+  passExtensions = import ./extensions { inherit pkgs; };
 
-in stdenv.mkDerivation rec {
-  version = "1.7.1";
-  name    = "password-store-${version}";
+  env = extensions:
+    let
+      selected = extensions passExtensions
+        ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb;
+    in buildEnv {
+      name = "pass-extensions-env";
+      paths = selected;
+      buildInputs = concatMap (x: x.buildInputs) selected;
+    };
 
-  src = fetchurl {
-    url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-    sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn";
-  };
+  generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec {
+    version = "1.7.1";
+    name    = "password-store-${version}";
 
-  patches = [ ./set-correct-program-name-for-sleep.patch
-            ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
+    src = fetchurl {
+      url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
+      sha256 = "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn";
+    };
 
-  nativeBuildInputs = [ makeWrapper ];
+    patches = [ ./set-correct-program-name-for-sleep.patch
+              ] ++ stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
 
-  installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
+    nativeBuildInputs = [ makeWrapper ];
 
-  postInstall = ''
-    # plugins
-    ${stdenv.lib.concatStringsSep "\n" (map (plugin: ''
-      pushd ${plugin}
-      PREFIX=$out make install
-      popd
-    '') plugins)}
+    buildInputs = [ extensionsEnv ];
 
-    # Install Emacs Mode. NOTE: We can't install the necessary
-    # dependencies (s.el and f.el) here. The user has to do this
-    # himself.
-    mkdir -p "$out/share/emacs/site-lisp"
-    cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
-  '' + optionalString x11Support ''
-    cp "contrib/dmenu/passmenu" "$out/bin/"
-  '';
+    installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ];
 
-  wrapperPath = with stdenv.lib; makeBinPath ([
-    coreutils
-    getopt
-    git
-    gnupg
-    gnused
-    tree
-    which
-    qrencode
-    procps
-  ] ++ optional tombPluginSupport tomb
-    ++ ifEnable x11Support [ dmenu xclip xdotool ]);
-
-  postFixup = ''
-    # Fix program name in --help
-    substituteInPlace $out/bin/pass \
-      --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
-
-    # Ensure all dependencies are in PATH
-    wrapProgram $out/bin/pass \
-      --prefix PATH : "${wrapperPath}"
-  '' + stdenv.lib.optionalString x11Support ''
-    # We just wrap passmenu with the same PATH as pass. It doesn't
-    # need all the tools in there but it doesn't hurt either.
-    wrapProgram $out/bin/passmenu \
-      --prefix PATH : "$out/bin:${wrapperPath}"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Stores, retrieves, generates, and synchronizes passwords securely";
-    homepage    = https://www.passwordstore.org/;
-    license     = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lovek323 the-kenny fpletz ];
-    platforms   = platforms.unix;
-
-    longDescription = ''
-      pass is a very simple password store that keeps passwords inside gpg2
-      encrypted files inside a simple directory tree residing at
-      ~/.password-store. The pass utility provides a series of commands for
-      manipulating the password store, allowing the user to add, remove, edit,
-      synchronize, generate, and manipulate passwords.
+    postInstall = ''
+      # Install Emacs Mode. NOTE: We can't install the necessary
+      # dependencies (s.el and f.el) here. The user has to do this
+      # himself.
+      mkdir -p "$out/share/emacs/site-lisp"
+      cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/"
+    '' + optionalString x11Support ''
+      cp "contrib/dmenu/passmenu" "$out/bin/"
     '';
+
+    wrapperPath = with stdenv.lib; makeBinPath ([
+      coreutils
+      getopt
+      git
+      gnupg
+      gnused
+      tree
+      which
+      qrencode
+      procps
+    ] ++ ifEnable x11Support [ dmenu xclip xdotool ]);
+
+    postFixup = ''
+      # Link extensions env
+      rmdir $out/lib/password-store/extensions
+      ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/.
+
+      # Fix program name in --help
+      substituteInPlace $out/bin/pass \
+        --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass"
+
+      # Ensure all dependencies are in PATH
+      wrapProgram $out/bin/pass \
+        --prefix PATH : "${wrapperPath}"
+    '' + stdenv.lib.optionalString x11Support ''
+      # We just wrap passmenu with the same PATH as pass. It doesn't
+      # need all the tools in there but it doesn't hurt either.
+      wrapProgram $out/bin/passmenu \
+        --prefix PATH : "$out/bin:${wrapperPath}"
+    '';
+
+    passthru = {
+      extensions = passExtensions;
+    } // extraPassthru;
+
+    meta = with stdenv.lib; {
+      description = "Stores, retrieves, generates, and synchronizes passwords securely";
+      homepage    = https://www.passwordstore.org/;
+      license     = licenses.gpl2Plus;
+      maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
+      platforms   = platforms.unix;
+
+      longDescription = ''
+        pass is a very simple password store that keeps passwords inside gpg2
+        encrypted files inside a simple directory tree residing at
+        ~/.password-store. The pass utility provides a series of commands for
+        manipulating the password store, allowing the user to add, remove, edit,
+        synchronize, generate, and manipulate passwords.
+      '';
+    };
   };
+
+in
+
+generic (env (_: [])) {
+  withExtensions = extensions: generic (env extensions) {};
 }
diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix
new file mode 100644
index 000000000000..dfb853c0a0bf
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/default.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+with pkgs;
+
+{
+  pass-import = callPackage ./import.nix {
+    pythonPackages = python3Packages;
+  };
+  pass-otp = callPackage ./otp.nix {};
+  pass-tomb = callPackage ./tomb.nix {};
+  pass-update = callPackage ./update.nix {};
+}
diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix
new file mode 100644
index 000000000000..8ba4abc5e3db
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/import.nix
@@ -0,0 +1,37 @@
+{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }:
+
+let
+  pythonEnv = pythonPackages.python.withPackages (p: [ p.defusedxml ]);
+
+in stdenv.mkDerivation rec {
+  name = "pass-import-${version}";
+  version = "2.2";
+
+  src = fetchFromGitHub {
+    owner = "roddhjav";
+    repo = "pass-import";
+    rev = "v${version}";
+    sha256 = "189wf2jz2j43k27930cnl53sm2drh1s0nq1nmh4is3rzn8cna6wq";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ pythonEnv ];
+
+  dontBuild = true;
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    wrapProgram $out/lib/password-store/extensions/import.bash \
+      --prefix PATH : "${pythonEnv}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pass extension for importing data from existing password managers";
+    homepage = https://github.com/roddhjav/pass-import;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/security/pass-otp/default.nix b/pkgs/tools/security/pass/extensions/otp.nix
similarity index 82%
rename from pkgs/tools/security/pass-otp/default.nix
rename to pkgs/tools/security/pass/extensions/otp.nix
index 7f0f44bdfa44..60198675b29d 100644
--- a/pkgs/tools/security/pass-otp/default.nix
+++ b/pkgs/tools/security/pass/extensions/otp.nix
@@ -1,4 +1,5 @@
-{ stdenv, pass, fetchFromGitHub, oathToolkit }:
+{ stdenv, fetchFromGitHub, oathToolkit }:
+
 stdenv.mkDerivation rec {
   name = "pass-otp-${version}";
   version = "1.1.0";
@@ -10,15 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb";
   };
 
-  buildInputs = [ pass oathToolkit ];
+  buildInputs = [ oathToolkit ];
+
+  dontBuild = true;
 
   patchPhase = ''
     sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash
   '';
 
-  installPhase = ''
-    make PREFIX=$out install
-  '';
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "A pass extension for managing one-time-password (OTP) tokens";
diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix
new file mode 100644
index 000000000000..b9f458cd4e12
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/tomb.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, tomb }:
+
+stdenv.mkDerivation rec {
+  name = "pass-tomb-${version}";
+  version = "1.1";
+
+  src = fetchFromGitHub {
+    owner = "roddhjav";
+    repo = "pass-tomb";
+    rev = "v${version}";
+    sha256 = "0wxa673yyzasjlkpd5f3yl5zf7bhsw7h1jbhf6sdjz65bypr2596";
+  };
+
+  buildInputs = [ tomb ];
+
+  dontBuild = true;
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    substituteInPlace $out/lib/password-store/extensions/tomb.bash \
+      --replace 'TOMB="''${PASSWORD_STORE_TOMB:-tomb}"' 'TOMB="''${PASSWORD_STORE_TOMB:-${tomb}/bin/tomb}"'
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pass extension that keeps the password store encrypted inside a tomb";
+    homepage = https://github.com/roddhjav/pass-tomb;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix
new file mode 100644
index 000000000000..dd145b069720
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/update.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "pass-update-${version}";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "roddhjav";
+    repo = "pass-update";
+    rev = "v${version}";
+    sha256 = "0a81q0jfni185zmbislzbcv0qr1rdp0cgr9wf9riygis2xv6rs6k";
+  };
+
+  dontBuild = true;
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Pass extension that provides an easy flow for updating passwords";
+    homepage = https://github.com/roddhjav/pass-update;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 334905b79f2b..8b0812f8305d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -151,6 +151,7 @@ mapAliases (rec {
   openssh_with_kerberos = openssh; # added 2018-01-28
   owncloudclient = owncloud-client;  # added 2016-08
   p11_kit = p11-kit; # added 2018-02-25
+  pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
   pgp-tools = signing-party; # added 2017-03-26
   pidgin-with-plugins = pidgin; # added 2016-06
   pidginlatexSF = pidgin-latex; # added 2014-11-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37de17c6969..7631b357eaae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -656,7 +656,8 @@ with pkgs;
   lastpass-cli = callPackage ../tools/security/lastpass-cli { };
 
   pass = callPackage ../tools/security/pass { };
-  pass-otp = callPackage ../tools/security/pass-otp { };
+
+  passExtensions = recurseIntoAttrs pass.extensions;
 
   gopass = callPackage ../tools/security/gopass { };
 

From e9ac594ea1cc805aabcad5b24b25c0ca3d541624 Mon Sep 17 00:00:00 2001
From: Sander Hollaar <git@humilis.net>
Date: Fri, 4 May 2018 19:53:23 +0200
Subject: [PATCH 1116/3370] fix-way-cooler - remove 'mv' commands not needed
 anymore, and replace '_' with '-' to fix multiple way-cooler compile failures

---
 .../window-managers/way-cooler/default.nix           | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index c8b67ec047ae..442bf5e08dfa 100644
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -20,24 +20,16 @@ let
       mkdir -p $out/etc
       cp -r config $out/etc/way-cooler
     '';
-    postFixup = ''
-      cd $out/bin
-      mv way_cooler way-cooler
-    '';
   });
   wc-bg = ((callPackage ./wc-bg.nix {}).wc_bg {}).overrideAttrs (oldAttrs: rec {
     nativeBuildInputs = [ makeWrapper ];
 
     postFixup = ''
-      makeWrapper $out/bin/wc_bg $out/bin/wc-bg \
+      makeWrapper $out/bin/wc-bg $out/bin/wc-bg \
         --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ wayland ]}"
     '';
   });
   wc-grab = ((callPackage ./wc-grab.nix {}).wc_grab {}).overrideAttrs (oldAttrs: rec {
-    postFixup = ''
-      cd $out/bin
-      mv wc_grab wc-grab
-    '';
   });
   wc-lock = (((callPackage ./wc-lock.nix {}).wc_lock {}).override {
     crateOverrides = defaultCrateOverrides // {
@@ -47,7 +39,7 @@ let
     nativeBuildInputs = [ makeWrapper ];
 
     postFixup = ''
-      makeWrapper $out/bin/wc_lock $out/bin/wc-lock \
+      makeWrapper $out/bin/wc-lock $out/bin/wc-lock \
         --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ libxkbcommon wayland ]}"
     '';
   });

From 814938a7ce2d9bd25c90065fdde6c98c1e389c5c Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Fri, 4 May 2018 19:56:38 +0200
Subject: [PATCH 1117/3370] ruby: fix darwin dependencies

---
 pkgs/development/interpreters/ruby/default.nix | 15 +++++++--------
 pkgs/top-level/all-packages.nix                |  5 ++++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index b98e2c1a6739..89d394c87569 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -1,8 +1,8 @@
 { stdenv, buildPackages, lib
 , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
 , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison
-, autoconf, darwin ? null
-, buildEnv, bundler, bundix, Foundation
+, autoconf, libiconv, libobjc, libunwind, Foundation
+, buildEnv, bundler, bundix
 } @ args:
 
 let
@@ -37,7 +37,7 @@ let
     isRuby25 = ver.majMin == "2.5";
     baseruby = self.override { useRailsExpress = false; };
     self = lib.makeOverridable (
-  { stdenv, buildPackages, lib
+      { stdenv, buildPackages, lib
       , fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub
       , useRailsExpress ? true
       , zlib, zlibSupport ? true
@@ -48,8 +48,8 @@ let
       , libyaml, yamlSupport ? true
       , libffi, fiddleSupport ? true
       , autoreconfHook, bison, autoconf
-      , darwin ? null
-      , buildEnv, bundler, bundix, Foundation
+      , buildEnv, bundler, bundix
+      , libiconv, libobjc, libunwind, Foundation
       }:
       let rubySrc =
         if useRailsExpress then fetchFromGitHub {
@@ -93,9 +93,8 @@ let
           # support is not enabled, so add readline to the build inputs if curses
           # support is disabled (if it's enabled, we already have it) and we're
           # running on darwin
-          ++ (op (!cursesSupport && stdenv.isDarwin) readline)
-          ++ (op (isRuby25 && stdenv.isDarwin) Foundation)
-          ++ (ops stdenv.isDarwin (with darwin; [ libiconv libobjc libunwind ]));
+          ++ op (!cursesSupport && stdenv.isDarwin) readline
+          ++ ops stdenv.isDarwin [ libiconv libobjc libunwind Foundation ];
 
         enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a84..206873d8e292 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7355,7 +7355,10 @@ with pkgs;
   bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
   bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
 
-  inherit (callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk.frameworks) Foundation; })
+  inherit (callPackage ../development/interpreters/ruby {
+    inherit (darwin) libiconv libobjc libunwind;
+    inherit (darwin.apple_sdk.frameworks) Foundation;
+  })
     ruby_2_3
     ruby_2_4
     ruby_2_5;

From 77a54ea59fede09c7acb413add8c4f1f75b1dd95 Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <beb82@cornell.edu>
Date: Fri, 4 May 2018 18:05:08 +0000
Subject: [PATCH 1118/3370] adding untested git-secrets

---
 .../git-and-tools/git-secrets/default.nix     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-secrets/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
new file mode 100644
index 000000000000..ac4d2e474b2f
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, lib, fetchFromGitHub, makeWrapper, git }:
+
+let
+  version = "1.2.1";
+  repo = "git-secrets";
+
+in stdenv.mkDerivation {
+  name = "${repo}-${version}";
+
+  src = fetchFromGitHub {
+    inherit repo;
+    owner = "awslabs";
+    rev = "v${version}";
+    sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -D git-secrets $out/bin/git-secrets
+
+    wrapProgram $out/bin/git-secrets \
+      --prefix PATH : "${lib.makeBinPath [ git ]}"
+
+    mkdir $out/share
+    cp -r man $out/share
+  '';
+
+  meta = {
+    description = "Prevents you from committing passwords and other sensitive information to a git repository";
+    homepage = https://github.com/awslabs/git-secretshttps://github.com/awslabs/git-secrets;
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.all;
+  };
+}

From 3837dddedb64ae9456e0b07ae2915c828e92eb7f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 May 2018 03:19:25 +0200
Subject: [PATCH 1119/3370] firefox: remove GStreamer

Apparently, it has been dropped:

https://bugzilla.mozilla.org/show_bug.cgi?id=1234092
---
 .../networking/browsers/firefox/wrapper.nix            | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index ed6cf712ed9a..b619941820e6 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -2,7 +2,7 @@
 
 ## various stuff that can be plugged in
 , flashplayer, hal-flash
-, MPlayerPlugin, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra-gtk2
+, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2
 , jrePlugin, icedtea_web
 , trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
@@ -67,13 +67,12 @@ let
           ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
           ++ extraNativeMessagingHosts
         );
-      libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ])
+      libs = lib.optional ffmpegSupport ffmpeg
             ++ lib.optional gssSupport kerberos
             ++ lib.optionals (cfg.enableQuakeLive or false)
             (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib libudev ])
             ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
             ++ lib.optional (config.pulseaudio or true) libpulseaudio;
-      gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
       gtk_modules = [ libcanberra-gtk2 ];
 
     in stdenv.mkDerivation {
@@ -99,7 +98,6 @@ let
       };
 
       buildInputs = [makeWrapper]
-        ++ lib.optional (!ffmpegSupport) gst-plugins
         ++ lib.optional (browser ? gtk3) browser.gtk3;
 
       buildCommand = ''
@@ -119,9 +117,7 @@ let
             --suffix PATH ':' "$out/bin" \
             --set MOZ_APP_LAUNCHER "${browserName}${nameSuffix}" \
             --set MOZ_SYSTEM_DIR "$out/lib/mozilla" \
-            ${lib.optionalString (!ffmpegSupport)
-                ''--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"''
-            + lib.optionalString (browser ? gtk3)
+            ${lib.optionalString (browser ? gtk3)
                 ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
                   --suffix XDG_DATA_DIRS : '${gnome3.defaultIconTheme}/share'
                 ''

From db78fe50e6e6729b12f8c8b4414de1c71192c069 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 May 2018 03:51:07 +0200
Subject: [PATCH 1120/3370] opencv: use GStreamer 1.0

---
 pkgs/development/libraries/opencv/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix
index cbac7210a10e..d2d106827169 100644
--- a/pkgs/development/libraries/opencv/default.nix
+++ b/pkgs/development/libraries/opencv/default.nix
@@ -8,7 +8,7 @@
 , enableEXR ? (!stdenv.isDarwin), openexr, ilmbase
 , enableJPEG2K ? true, jasper
 , enableFfmpeg ? false, ffmpeg
-, enableGStreamer ? false, gst_all
+, enableGStreamer ? false, gst_all_1
 , enableEigen ? true, eigen
 , darwin
 }:
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     ++ lib.optionals enableEXR [ openexr ilmbase ]
     ++ lib.optional enableJPEG2K jasper
     ++ lib.optional enableFfmpeg ffmpeg
-    ++ lib.optionals enableGStreamer (with gst_all; [ gstreamer gst-plugins-base ])
+    ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base ])
     ++ lib.optional enableEigen eigen
     ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa QTKit ])
     ;
@@ -69,6 +69,7 @@ stdenv.mkDerivation rec {
     (opencvFlag "JPEG" enableJPEG)
     (opencvFlag "PNG" enablePNG)
     (opencvFlag "OPENEXR" enableEXR)
+    (opencvFlag "GSTREAMER" enableGStreamer)
   ];
 
   enableParallelBuilding = true;

From 1c33dff43315303649f9189656a7b26f24f20218 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 May 2018 15:30:54 +0200
Subject: [PATCH 1121/3370] libcanberra: fix GStreamer support

---
 pkgs/development/libraries/libcanberra/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index 54f2273c2fcf..83f86c40c0d1 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libtool, gtk ? null, libcap
-, alsaLib, libpulseaudio, gstreamer, gst-plugins-base, libvorbis }:
+, alsaLib, libpulseaudio, gst_all_1, libvorbis }:
 
 stdenv.mkDerivation rec {
   name = "libcanberra-0.30";
@@ -9,11 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0wps39h8rx2b00vyvkia5j40fkak3dpipp1kzilqla0cgvk73dn2";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
-    libtool alsaLib libpulseaudio libvorbis gtk libcap
-    /*gstreamer gst-plugins-base*/      # ToDo: gstreamer not found (why?), add (g)udev?
-  ];
+    alsaLib libpulseaudio libvorbis gtk libcap
+  ] ++ (with gst_all_1; [ gstreamer gst-plugins-base ]);
 
   configureFlags = "--disable-oss";
 

From 91b092986b3ed2c0109d69331287937834496677 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Fri, 4 May 2018 19:11:45 +0000
Subject: [PATCH 1122/3370] poco: support MySQL

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

diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix
index d44bc78a533d..4dffa7486a1c 100644
--- a/pkgs/development/libraries/poco/default.nix
+++ b/pkgs/development/libraries/poco/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib pcre expat sqlite openssl unixODBC mysql.connector-c ];
 
+  MYSQL_DIR = mysql.connector-c;
+  MYSQL_INCLUDE_DIR = "${MYSQL_DIR}/include/mysql";
+
   cmakeFlags = [
     "-DPOCO_UNBUNDLED=ON"
   ];

From 8723594059695b1ed2f03ec997f8b9db18cd0b16 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 14:41:13 -0500
Subject: [PATCH 1123/3370] rl-1809: add googleearth

---
 nixos/doc/manual/release-notes/rl-1809.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index ec7b2f107e8e..7136f4540502 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -101,6 +101,12 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <literal>googleearth</literal> has been removed from Nixpkgs. Google does not provide
+     a stable URL for Nixpkgs to use to package this proprietary software.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 62855fc04a46e80bb45347cc55f4b6422ebb1779 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Thu, 3 May 2018 14:42:01 +0000
Subject: [PATCH 1124/3370] pythonPackages.supervise_api: 0.4.0 -> 0.5.3

Upstream added tests, so we run those too now.
---
 .../python-modules/supervise_api/default.nix          | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix
index f73aba0a5f9a..35600357d2cc 100644
--- a/pkgs/development/python-modules/supervise_api/default.nix
+++ b/pkgs/development/python-modules/supervise_api/default.nix
@@ -4,17 +4,16 @@
 , supervise
 , isPy3k
 , whichcraft
+, utillinux
 }:
 
 buildPythonPackage rec {
   pname = "supervise_api";
-  version = "0.4.0";
-
-  name = "${pname}-${version}";
+  version = "0.5.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "029h1mlfhkm9lw043rawh24ld8md620y94k6c1l9hs5vvyq4fs84";
+    sha256 = "0dakc1h2ih1bw67y137wp0vph8d3y2lx5d70b8dgggy1zbpqxl1m";
   };
 
   propagatedBuildInputs = [
@@ -22,9 +21,7 @@ buildPythonPackage rec {
   ] ++ lib.optionals ( !isPy3k ) [
     whichcraft
   ];
-
-  # no tests
-  doCheck = false;
+  checkInputs = [ utillinux ];
 
   meta = {
     description = "An API for running processes safely and securely";

From 397a618e34ea132df500b3d92f06775f3d0292b8 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 15:10:30 -0500
Subject: [PATCH 1125/3370] kotlin: move LICENSE to separate place

Fixes #39641
---
 pkgs/development/compilers/kotlin/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index d5ce240b4a5f..762449133158 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -22,6 +22,11 @@ in stdenv.mkDerivation rec {
     for p in $(ls $out/bin/) ; do
       wrapProgram $out/bin/$p --prefix PATH ":" ${jre}/bin ;
     done
+
+    if [ -f $out/LICENSE ]; then
+      install -D $out/LICENSE $out/share/kotlin/LICENSE
+      rm $out/LICENSE
+    fi
   '';
 
   meta = {

From cf84d6c275b1cd65ba6a42dc7beaa74da7f47c3b Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 15:11:09 -0500
Subject: [PATCH 1126/3370] openjdk: move license

---
 pkgs/development/compilers/openjdk/darwin/8.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix
index cc7c5fd371d2..7457ffceab1f 100644
--- a/pkgs/development/compilers/openjdk/darwin/8.nix
+++ b/pkgs/development/compilers/openjdk/darwin/8.nix
@@ -26,6 +26,11 @@ let
 
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/darwin/*_md.h $out/include/
+
+      if [ -f $out/LICENSE ]; then
+        install -D $out/LICENSE $out/share/zulu/LICENSE
+        rm $out/LICENSE
+      fi
     '';
 
     preFixup = ''

From b5e558b573f1989889e423df8b48e1084608022f Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 4 May 2018 15:11:45 -0500
Subject: [PATCH 1127/3370] openjdk: move license (again)

---
 pkgs/development/compilers/openjdk/darwin/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/openjdk/darwin/default.nix b/pkgs/development/compilers/openjdk/darwin/default.nix
index 6ecc785be3b9..54239e58002f 100644
--- a/pkgs/development/compilers/openjdk/darwin/default.nix
+++ b/pkgs/development/compilers/openjdk/darwin/default.nix
@@ -16,6 +16,11 @@ let
 
       # jni.h expects jni_md.h to be in the header search path.
       ln -s $out/include/darwin/*_md.h $out/include/
+
+      if [ -f $out/LICENSE ]; then
+        install -D $out/LICENSE $out/share/zulu/LICENSE
+        rm $out/LICENSE
+      fi
     '';
 
     preFixup = ''

From b4bfc02d352a737b08d11592efe0128bf1075a8d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 May 2018 15:11:12 +0200
Subject: [PATCH 1128/3370] simplescreenrecorder: port to qt5

See #33248
---
 .../video/simplescreenrecorder/default.nix             | 10 ++++++----
 pkgs/top-level/all-packages.nix                        |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 0ae9de046801..d1f6f8b6ad1b 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext
-, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja
+{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext, qtx11extras
+, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qtbase, cmake, ninja
 }:
 
 stdenv.mkDerivation rec {
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g";
   };
 
+  cmakeFlags = [ "-DWITH_QT5=TRUE" ];
+
   patches = [ ./fix-paths.patch ];
 
   postPatch = ''
@@ -24,14 +26,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig cmake ninja ];
   buildInputs = [
     alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined
-    libpulseaudio qt4
+    libpulseaudio qtbase qtx11extras
   ];
 
   meta = with stdenv.lib; {
     description = "A screen recorder for Linux";
     homepage = http://www.maartenbaert.be/simplescreenrecorder;
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = [ maintainers.goibhniu ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d1c4e2e09a84..529298d1759c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4878,7 +4878,7 @@ with pkgs;
 
   simpleproxy = callPackage ../tools/networking/simpleproxy { };
 
-  simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
+  simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { };
 
   sipsak = callPackage ../tools/networking/sipsak { };
 

From 40226e647e5481f8276f2265207d262d4ab750ea Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 3 May 2018 11:25:19 +0200
Subject: [PATCH 1129/3370] shutter: wrap `XDG_DATA_DIRS` with
 `hicolor-icon-theme`

When opening `shutter` it adds an indicator icon to the status bar.
However this doesn't happen (and an ugly default icon will be used) if
`shutter` can't find the `hicolor-icon-theme`. In such a case a warning
like this can be found in `stderr`:

```
Gtk-WARNING **: Could not find the icon 'image-png'. The 'hicolor' theme
was not found either, perhaps you need to install it.
```

As I don't think that we should force users to install this theme
globally and several other packages including `tor-browser`, `gparted`
or `clawsmail` add `hicolor-icon-theme` to their closure this seems to
be a fair measure.
---
 pkgs/applications/graphics/shutter/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 2cc127a3fc6f..3bc814e1e758 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }:
+{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
+, hicolor-icon-theme
+}:
 
 let
   perlModules = with perlPackages;
@@ -29,6 +31,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/shutter \
       --set PERL5LIB "${stdenv.lib.makePerlPath perlModules}" \
       --prefix PATH : "${imagemagick.out}/bin" \
+      --suffix XDG_DATA_DIRS : "${hicolor-icon-theme}/share" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
   '';
 

From 401fa33429d0265f7f300a2d933dd446ea29646e Mon Sep 17 00:00:00 2001
From: Unknown <iulian.meghea@gmail.com>
Date: Fri, 4 May 2018 23:59:46 +0300
Subject: [PATCH 1130/3370] Upgrade gitkraken to 3.6.0

---
 pkgs/applications/version-management/gitkraken/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 1e29b458a314..cf68da44a5fa 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.4.0";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0jj3a02bz30xa7p4migyhvxd9s0cllymsp1rdh2pbh40p79g1fp1";
+    sha256 = "0zrxw7rrlspm3ic847dy1ly4rlcdkizdr6m8nycmrxg4s98yxkb8";
   };
 
   libPath = makeLibraryPath [
@@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
 
     find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \;
 
-    rm $out/bin/gitkraken
+    mkdir $out/bin
     ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
   '';
 

From a0502800cf4927d16285eb1a731f82b859d340e9 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 May 2018 23:07:40 +0200
Subject: [PATCH 1131/3370] yubikey-personalization-gui: port to qt5

Uses QT5's `qmake` hook (http://doc.qt.io/qt-5/qmake-manual.html) to
build `yubikey-personalization-gui` with a non-90s interface.

See #33248
---
 pkgs/tools/misc/yubikey-personalization-gui/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
index e6a1c93d2bb6..d507816dbd38 100644
--- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix
+++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qt4, qmake4Hook, libyubikey }:
+{ stdenv, fetchurl, pkgconfig, yubikey-personalization, qtbase, qmake, libyubikey }:
 
 stdenv.mkDerivation rec {
   name = "yubikey-personalization-gui-3.1.25";
@@ -8,8 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1knyv5yss8lhzaff6jpfqv12fjf1b8b21mfxzx3qi0hw4nl8n2v8";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake4Hook ];
-  buildInputs = [ yubikey-personalization qt4 libyubikey ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ yubikey-personalization qtbase libyubikey ];
   
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52a3c0619feb..3dc6294d3e3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11994,7 +11994,7 @@ with pkgs;
     libusb = libusb1;
   };
 
-  yubikey-personalization-gui = callPackage ../tools/misc/yubikey-personalization-gui { };
+  yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { };
 
   zeitgeist = callPackage ../development/libraries/zeitgeist { };
 

From b41ede5e3a398683d5722b7c0503e019a365d222 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 4 May 2018 23:10:21 +0200
Subject: [PATCH 1132/3370] libgdiplus: remove conflicting libungif that causes
 segfaults when opening a GIF file

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

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index f84cc677d16d..d3a21ee7fa29 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig
-, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer
+, libtiff, giflib, libjpeg, libpng, monoDLLFixer
 , libXrender, libexif }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   patchFlags = "-p0";
 
   buildInputs =
-    [ pkgconfig glib cairo fontconfig libtiff giflib libungif
+    [ pkgconfig glib cairo fontconfig libtiff giflib
       libjpeg libpng libXrender libexif
     ]
     ++ stdenv.lib.optional stdenv.isDarwin Carbon;

From 5deb50c038a40d9331be0359c84b0e3ade78db9d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 May 2018 23:22:09 +0200
Subject: [PATCH 1133/3370] firefox-bin: remove unneeded GStreamer dependency

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 97ce7d06c411..6b2bb541a3a7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -12,8 +12,6 @@
 , gdk_pixbuf
 , glib
 , glibc
-, gst-plugins-base
-, gstreamer
 , gtk2
 , gtk3
 , kerberos
@@ -98,8 +96,6 @@ stdenv.mkDerivation {
       gdk_pixbuf
       glib
       glibc
-      gst-plugins-base
-      gstreamer
       gtk2
       gtk3
       kerberos

From 0b2b174bbaf84e4065f05c8f4a9168ed1a62539a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 5 May 2018 00:00:59 +0200
Subject: [PATCH 1134/3370] qstopmotion: remove unnecessary gstreamer
 dependency
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

According to 2.3.1 release notes: “All gstreamer grabber are removed from the application. The reason is the end of the support for gstreamer 0.10 in many distributions.”
---
 pkgs/applications/video/qstopmotion/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix
index 2454044bb48e..a689697e0a0f 100644
--- a/pkgs/applications/video/qstopmotion/default.nix
+++ b/pkgs/applications/video/qstopmotion/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, qt5, gstreamer, gstreamermm, gst_plugins_bad
-, gst_plugins_base, gst_plugins_good, ffmpeg, guvcview, automoc4
-, cmake, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils
+{ stdenv, fetchurl, qt5, ffmpeg, guvcview, automoc4
+, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils
 , libv4l, pcre }:
 
 stdenv.mkDerivation rec {
@@ -13,11 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf";
   };
 
-  buildInputs = [ qt5.qtbase gstreamer gstreamermm gst_plugins_bad gst_plugins_good
-                  gst_plugins_base ffmpeg guvcview v4l_utils libv4l pcre
-		];
+  buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ];
 
-  nativeBuildInputs = [ pkgconfig cmake gettext libgphoto2 gphoto2 libxml2 libv4l ];
+  nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ];
 
   meta = with stdenv.lib; {
     homepage = http://www.qstopmotion.org;

From ee270fe647e2dd5f21028dbf5a1f9213a627a149 Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <beb82@cornell.edu>
Date: Fri, 4 May 2018 22:02:55 +0000
Subject: [PATCH 1135/3370] confirmed git-secrets is now working

---
 .../version-management/git-and-tools/default.nix    |  2 ++
 .../git-and-tools/git-secrets/default.nix           | 13 +++++++++----
 pkgs/top-level/all-packages.nix                     |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 2bd8697c8ec1..13b861d0a9ed 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -89,6 +89,8 @@ rec {
 
   git-secret = callPackage ./git-secret { };
 
+  git-secrets = callPackage ./git-secrets { };
+
   git-stree = callPackage ./git-stree { };
 
   git2cl = callPackage ./git2cl { };
diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index ac4d2e474b2f..14026df81853 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -10,20 +10,25 @@ in stdenv.mkDerivation {
   src = fetchFromGitHub {
     inherit repo;
     owner = "awslabs";
-    rev = "v${version}";
+    rev = "${version}";
     sha256 = "14jsm4ks3k5d9iq3jr23829izw040pqpmv7dz8fhmvx6qz8fybzg";
   };
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper git];
 
+  # buildPhase = ''
+  #  make man # TODO: need rst2man.py
+  # '';
+  
   installPhase = ''
     install -D git-secrets $out/bin/git-secrets
 
     wrapProgram $out/bin/git-secrets \
       --prefix PATH : "${lib.makeBinPath [ git ]}"
 
-    mkdir $out/share
-    cp -r man $out/share
+    # TODO: see above note on rst2man.py
+    # mkdir $out/share
+    # cp -r man $out/share
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a37de17c6969..9811f33c310c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15969,7 +15969,7 @@ with pkgs;
 
   gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});
 
-  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret transcrypt git-crypt;
+  inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar git-secret git-secrets transcrypt git-crypt;
 
   gitMinimal = git.override {
     withManual = false;

From f039bf9abc91ec812f66126dc54a05d8a84a95f2 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 5 May 2018 00:22:18 +0200
Subject: [PATCH 1136/3370] panamax: remove packages, module and test

was broken and depends on (deprecated) fleet
packages: panamax_api, panamax_ui
---
 nixos/modules/misc/ids.nix                    |   4 +-
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/services/cluster/panamax.nix    | 156 ----
 nixos/release.nix                             |   1 -
 nixos/tests/panamax.nix                       |  21 -
 .../networking/cluster/panamax/api/Gemfile    |  23 -
 .../cluster/panamax/api/Gemfile.lock          | 164 ----
 .../cluster/panamax/api/default.nix           |  74 --
 .../networking/cluster/panamax/api/gemset.nix | 568 -------------
 .../networking/cluster/panamax/ui/Gemfile     |  31 -
 .../cluster/panamax/ui/Gemfile.lock           | 226 -----
 .../networking/cluster/panamax/ui/default.nix |  72 --
 .../networking/cluster/panamax/ui/gemset.nix  | 789 ------------------
 pkgs/top-level/all-packages.nix               |   3 -
 14 files changed, 2 insertions(+), 2131 deletions(-)
 delete mode 100644 nixos/modules/services/cluster/panamax.nix
 delete mode 100644 nixos/tests/panamax.nix
 delete mode 100644 pkgs/applications/networking/cluster/panamax/api/Gemfile
 delete mode 100644 pkgs/applications/networking/cluster/panamax/api/Gemfile.lock
 delete mode 100644 pkgs/applications/networking/cluster/panamax/api/default.nix
 delete mode 100644 pkgs/applications/networking/cluster/panamax/api/gemset.nix
 delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/Gemfile
 delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
 delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/default.nix
 delete mode 100644 pkgs/applications/networking/cluster/panamax/ui/gemset.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 0ed820a32acc..7a538210d10e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -190,7 +190,7 @@
       cadvisor = 167;
       nylon = 168;
       apache-kafka = 169;
-      panamax = 170;
+      #panamax = 170; # unused
       exim = 172;
       #fleet = 173; # unused
       #input = 174; # unused
@@ -473,7 +473,7 @@
       #chronos = 164; # unused
       gitlab = 165;
       nylon = 168;
-      panamax = 170;
+      #panamax = 170; # unused
       exim = 172;
       fleet = 173;
       input = 174;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 505c5497d36d..6f6a81bbda80 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -174,7 +174,6 @@
   ./services/cluster/kubernetes/default.nix
   ./services/cluster/kubernetes/dns.nix
   ./services/cluster/kubernetes/dashboard.nix
-  ./services/cluster/panamax.nix
   ./services/computing/boinc/client.nix
   ./services/computing/torque/server.nix
   ./services/computing/torque/mom.nix
diff --git a/nixos/modules/services/cluster/panamax.nix b/nixos/modules/services/cluster/panamax.nix
deleted file mode 100644
index 4475e8d8c24b..000000000000
--- a/nixos/modules/services/cluster/panamax.nix
+++ /dev/null
@@ -1,156 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.panamax;
-
-  panamax_api = pkgs.panamax_api.override { dataDir = cfg.dataDir + "/api"; };
-  panamax_ui = pkgs.panamax_ui.override { dataDir = cfg.dataDir + "/ui"; };
-
-in {
-
-  ##### Interface
-  options.services.panamax = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to enable Panamax service.
-      '';
-    };
-
-    UIPort = mkOption {
-      type = types.int;
-      default = 8888;
-      description = ''
-        Panamax UI listening port.
-      '';
-    };
-
-    APIPort = mkOption {
-      type = types.int;
-      default = 3000;
-      description = ''
-        Panamax UI listening port.
-      '';
-    };
-
-    dataDir = mkOption {
-      type = types.str;
-      default = "/var/lib/panamax";
-      description = ''
-        Data dir for Panamax.
-      '';
-    };
-
-    fleetctlEndpoint = mkOption {
-      type = types.str;
-      default = "http://127.0.0.1:2379";
-      description = ''
-        Panamax fleetctl endpoint.
-      '';
-    };
-
-    journalEndpoint = mkOption {
-      type = types.str;
-      default = "http://127.0.0.1:19531";
-      description = ''
-        Panamax journal endpoint.
-      '';
-    };
-
-    secretKey = mkOption {
-      type = types.str;
-      default = "SomethingVeryLong.";
-      description = ''
-        Panamax secret key (do change this).
-      '';
-    };
-
-  };
-
-  ##### Implementation
-  config = mkIf cfg.enable {
-    systemd.services.panamax-api = {
-      description = "Panamax API";
-
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "fleet.service" "etcd.service" "docker.service" ];
-
-      path = [ panamax_api ];
-      environment = {
-        RAILS_ENV = "production";
-        JOURNAL_ENDPOINT = cfg.journalEndpoint;
-        FLEETCTL_ENDPOINT = cfg.fleetctlEndpoint;
-        PANAMAX_DATABASE_PATH = "${cfg.dataDir}/api/db/mnt/db.sqlite3";
-      };
-
-      preStart = ''
-        rm -rf ${cfg.dataDir}/state/tmp
-        mkdir -p ${cfg.dataDir}/api/{db/mnt,state/log,state/tmp}
-        ln -sf ${panamax_api}/share/panamax-api/_db/{schema.rb,seeds.rb,migrate} ${cfg.dataDir}/api/db/
-
-        if [ ! -f ${cfg.dataDir}/.created ]; then
-          bundle exec rake db:setup
-          bundle exec rake db:seed
-          bundle exec rake panamax:templates:load || true
-          touch ${cfg.dataDir}/.created
-        else
-          bundle exec rake db:migrate
-        fi
-      '';
-
-      serviceConfig = {
-        ExecStart = "${panamax_api}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.APIPort}";
-        User = "panamax";
-        Group = "panamax";
-      };
-    };
-
-    systemd.services.panamax-ui = {
-      description = "Panamax UI";
-
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "panamax_api.service" ];
-
-      path = [ panamax_ui ];
-      environment = {
-        RAILS_ENV = "production";
-        JOURNAL_ENDPOINT = cfg.journalEndpoint;
-        PMX_API_PORT_3000_TCP_ADDR = "localhost";
-        PMX_API_PORT_3000_TCP_PORT = toString cfg.APIPort;
-        SECRET_KEY_BASE = cfg.secretKey;
-      };
-
-      preStart = ''
-        mkdir -p ${cfg.dataDir}/ui/state/{log,tmp}
-        chown -R panamax:panamax ${cfg.dataDir}
-      '';
-
-      serviceConfig = {
-        ExecStart = "${panamax_ui}/bin/bundle exec rails server --binding 127.0.0.1 --port ${toString cfg.UIPort}";
-        User = "panamax";
-        Group = "panamax";
-        PermissionsStartOnly = true;
-      };
-    };
-
-    users.extraUsers.panamax =
-    { uid = config.ids.uids.panamax;
-      description = "Panamax user";
-      createHome = true;
-      home = cfg.dataDir;
-      extraGroups = [ "docker" ];
-    };
-
-    services.journald.enableHttpGateway = mkDefault true;
-    services.fleet.enable = mkDefault true;
-    services.cadvisor.enable = mkDefault true;
-    services.cadvisor.port = mkDefault 3002;
-    virtualisation.docker.enable = mkDefault true;
-
-    environment.systemPackages = [ panamax_api panamax_ui ];
-    users.extraGroups.panamax.gid = config.ids.gids.panamax;
-  };
-}
diff --git a/nixos/release.nix b/nixos/release.nix
index 5b6640f1d3cc..ebe23ebed02a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -360,7 +360,6 @@ in rec {
   tests.openldap = callTest tests/openldap.nix {};
   tests.owncloud = callTest tests/owncloud.nix {};
   tests.pam-oath-login = callTest tests/pam-oath-login.nix {};
-  #tests.panamax = callTestOnMatchingSystems ["x86_64-linux"] tests/panamax.nix {};
   tests.peerflix = callTest tests/peerflix.nix {};
   tests.php-pcre = callTest tests/php-pcre.nix {};
   tests.postgresql = callSubTests tests/postgresql.nix {};
diff --git a/nixos/tests/panamax.nix b/nixos/tests/panamax.nix
deleted file mode 100644
index 088aa79f8c61..000000000000
--- a/nixos/tests/panamax.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "panamax";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ offline ];
-  };
-
-  machine = { config, pkgs, ... }: {
-    services.panamax.enable = true;
-  };
-
-  testScript =
-    ''
-      startAll;
-      $machine->waitForUnit("panamax-api.service");
-      $machine->waitForUnit("panamax-ui.service");
-      $machine->waitForOpenPort(3000);
-      $machine->waitForOpenPort(8888);
-      $machine->succeed("curl --fail http://localhost:8888/ > /dev/null");
-      $machine->shutdown;
-    '';
-})
diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile b/pkgs/applications/networking/cluster/panamax/api/Gemfile
deleted file mode 100644
index 82085aa6db08..000000000000
--- a/pkgs/applications/networking/cluster/panamax/api/Gemfile
+++ /dev/null
@@ -1,23 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '4.1.7'
-gem 'puma', '2.8.2'
-gem 'sqlite3', '1.3.9'
-gem 'faraday_middleware', '0.9.0'
-gem 'docker-api', '1.13.0', require: 'docker'
-gem 'fleet-api', '0.6.0', require: 'fleet'
-gem 'active_model_serializers', '0.9.0'
-gem 'octokit', '3.2.0'
-gem 'kmts', '2.0.1'
-
-group :test, :development do
-  gem 'rspec-rails'
-  gem 'its'
-end
-
-group :test do
-  gem 'coveralls', '0.7.0'
-  gem 'shoulda-matchers', '2.6.1'
-  gem 'database_cleaner', '1.3.0'
-  gem 'webmock', '1.20.0'
-end
diff --git a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock
deleted file mode 100644
index 597c691700ad..000000000000
--- a/pkgs/applications/networking/cluster/panamax/api/Gemfile.lock
+++ /dev/null
@@ -1,164 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    active_model_serializers (0.9.0)
-      activemodel (>= 3.2)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    archive-tar-minitar (0.5.2)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    database_cleaner (1.3.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    docker-api (1.13.0)
-      archive-tar-minitar
-      excon (>= 0.37.0)
-      json
-    erubis (2.7.0)
-    excon (0.37.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    faraday_middleware (0.9.0)
-      faraday (>= 0.7.4, < 0.9)
-    fleet-api (0.6.0)
-      faraday (= 0.8.9)
-      faraday_middleware (= 0.9.0)
-    hike (1.2.3)
-    i18n (0.7.0)
-    its (0.2.0)
-      rspec-core
-    json (1.8.1)
-    kmts (2.0.1)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    minitest (5.5.1)
-    multi_json (1.10.1)
-    multipart-post (1.2.0)
-    octokit (3.2.0)
-      sawyer (~> 0.5.3)
-    puma (2.8.2)
-      rack (>= 1.1, < 2.0)
-    rack (1.5.2)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    sawyer (0.5.4)
-      addressable (~> 2.3.5)
-      faraday (~> 0.8, < 0.10)
-    shoulda-matchers (2.6.1)
-      activesupport (>= 3.0.0)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.9)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tins (1.3.0)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    webmock (1.20.0)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  active_model_serializers (= 0.9.0)
-  coveralls (= 0.7.0)
-  database_cleaner (= 1.3.0)
-  docker-api (= 1.13.0)
-  faraday_middleware (= 0.9.0)
-  fleet-api (= 0.6.0)
-  its
-  kmts (= 2.0.1)
-  octokit (= 3.2.0)
-  puma (= 2.8.2)
-  rails (= 4.1.7)
-  rspec-rails
-  shoulda-matchers (= 2.6.1)
-  sqlite3 (= 1.3.9)
-  webmock (= 1.20.0)
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
deleted file mode 100644
index 1c2e2ccac27b..000000000000
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
-, ruby, libxslt, libxml2, sqlite, openssl, docker
-, dataDir ? "/var/lib/panamax-api" }@args:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "panamax-api-${version}";
-  version = "0.2.16";
-
-  env = bundlerEnv {
-    name = "panamax-api-gems-${version}";
-    inherit ruby;
-    gemdir = ./.;
-  };
-
-  bundler = args.bundler.override { inherit ruby; };
-
-  database_yml = builtins.toFile "database.yml" ''
-    production:
-      adapter: sqlite3
-      database: <%= ENV["PANAMAX_DATABASE_PATH"] || "${dataDir}/db/mnt/db.sqlite3" %>
-      timeout: 5000
-  '';
-
-  src = fetchgit {
-    rev = "refs/tags/v${version}";
-    url = "git://github.com/CenturyLinkLabs/panamax-api";
-    sha256 = "0dqg0fbmy5cgjh0ql8yqlybhjyyrslgghjrc24wjhd1rghjn2qi6";
-  };
-
-  buildInputs = [ makeWrapper sqlite openssl env.ruby bundler ];
-
-  setSourceRoot = ''
-    mkdir -p $out/share
-    cp -R panamax-api $out/share/panamax-api
-    export sourceRoot="$out/share/panamax-api"
-  '';
-
-  postPatch = ''
-    find . -type f -exec sed -e 's|/usr/bin/docker|${docker}/bin/docker|g' -i "{}" \;
-  '';
-
-  configurePhase = ''
-    export HOME=$PWD
-    export GEM_HOME=${env}/${env.ruby.gemPath}
-    export RAILS_ENV=production
-
-    ln -sf ${database_yml} config/database.yml
-  '';
-
-  installPhase = ''
-    rm -rf log tmp
-    mv ./db ./_db
-    ln -sf ${dataDir}/{db,state/log,state/tmp} .
-
-    mkdir -p $out/bin
-    makeWrapper bin/bundle "$out/bin/bundle" \
-      --run "cd $out/share/panamax-api" \
-      --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
-      --prefix "HOME" : "$out/share/panamax-api" \
-      --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
-  '';
-
-  meta = with stdenv.lib; {
-    broken = true; # needs ruby 2.1
-    homepage = https://github.com/CenturyLinkLabs/panamax-api;
-    description = "The API behind The Panamax UI";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ matejc offline ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/cluster/panamax/api/gemset.nix b/pkgs/applications/networking/cluster/panamax/api/gemset.nix
deleted file mode 100644
index 8182543a2bb9..000000000000
--- a/pkgs/applications/networking/cluster/panamax/api/gemset.nix
+++ /dev/null
@@ -1,568 +0,0 @@
-{
-  "actionmailer" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5";
-    };
-    dependencies = [
-      "actionpack"
-      "actionview"
-      "mail"
-    ];
-  };
-  "actionpack" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax";
-    };
-    dependencies = [
-      "actionview"
-      "activesupport"
-      "rack"
-      "rack-test"
-    ];
-  };
-  "actionview" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-      "erubis"
-    ];
-  };
-  "active_model_serializers" = {
-    version = "0.9.0";
-    source = {
-      type = "gem";
-      sha256 = "1ws3gx3wwlm17w7k0agwzmcmww6627lvqaqm828lzm3g1xqilkkl";
-    };
-    dependencies = [
-      "activemodel"
-    ];
-  };
-  "activemodel" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-    ];
-  };
-  "activerecord" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5";
-    };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "arel"
-    ];
-  };
-  "activesupport" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs";
-    };
-    dependencies = [
-      "i18n"
-      "json"
-      "minitest"
-      "thread_safe"
-      "tzinfo"
-    ];
-  };
-  "addressable" = {
-    version = "2.3.6";
-    source = {
-      type = "gem";
-      sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8";
-    };
-  };
-  "archive-tar-minitar" = {
-    version = "0.5.2";
-    source = {
-      type = "gem";
-      sha256 = "1j666713r3cc3wb0042x0wcmq2v11vwwy5pcaayy5f0lnd26iqig";
-    };
-  };
-  "arel" = {
-    version = "5.0.1.20140414130214";
-    source = {
-      type = "gem";
-      sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9";
-    };
-  };
-  "builder" = {
-    version = "3.2.2";
-    source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "coveralls" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4";
-    };
-    dependencies = [
-      "multi_json"
-      "rest-client"
-      "simplecov"
-      "term-ansicolor"
-      "thor"
-    ];
-  };
-  "crack" = {
-    version = "0.4.2";
-    source = {
-      type = "gem";
-      sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a";
-    };
-    dependencies = [
-      "safe_yaml"
-    ];
-  };
-  "database_cleaner" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "19w25yda684pg29bggq26wy4lpyjvzscwg2hx3hmmmpysiwfnxgn";
-    };
-  };
-  "diff-lcs" = {
-    version = "1.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
-    };
-  };
-  "docile" = {
-    version = "1.1.5";
-    source = {
-      type = "gem";
-      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
-    };
-  };
-  "docker-api" = {
-    version = "1.13.0";
-    source = {
-      type = "gem";
-      sha256 = "1rara27gn7lxaf12dqkx8s1clssg10jndfcy4wz2fv6ms1i1lnp6";
-    };
-    dependencies = [
-      "archive-tar-minitar"
-      "excon"
-      "json"
-    ];
-  };
-  "erubis" = {
-    version = "2.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-    };
-  };
-  "excon" = {
-    version = "0.37.0";
-    source = {
-      type = "gem";
-      sha256 = "05x7asmsq5m419n1lhzk9bic02gwng4cqmrcqsfnd6kmkwm8csv2";
-    };
-  };
-  "faraday" = {
-    version = "0.8.9";
-    source = {
-      type = "gem";
-      sha256 = "17d79fsgx0xwh0mfxyz5pbr435qlw79phlfvifc546w2axdkp718";
-    };
-    dependencies = [
-      "multipart-post"
-    ];
-  };
-  "faraday_middleware" = {
-    version = "0.9.0";
-    source = {
-      type = "gem";
-      sha256 = "1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2";
-    };
-    dependencies = [
-      "faraday"
-    ];
-  };
-  "fleet-api" = {
-    version = "0.6.0";
-    source = {
-      type = "gem";
-      sha256 = "0136mzc0fxp6mzh38n6xbg87cw9g9vq1nrlr3ylazbflvmlxgan6";
-    };
-    dependencies = [
-      "faraday"
-      "faraday_middleware"
-    ];
-  };
-  "hike" = {
-    version = "1.2.3";
-    source = {
-      type = "gem";
-      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
-    };
-  };
-  "i18n" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
-    };
-  };
-  "its" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g";
-    };
-    dependencies = [
-      "rspec-core"
-    ];
-  };
-  "json" = {
-    version = "1.8.1";
-    source = {
-      type = "gem";
-      sha256 = "0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn";
-    };
-  };
-  "kmts" = {
-    version = "2.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1wk680q443lg35a25am6i8xawf16iqg5xnq1m8xd2gib4dsy1d8v";
-    };
-  };
-  "mail" = {
-    version = "2.6.3";
-    source = {
-      type = "gem";
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
-    };
-    dependencies = [
-      "mime-types"
-    ];
-  };
-  "mime-types" = {
-    version = "2.4.3";
-    source = {
-      type = "gem";
-      sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq";
-    };
-  };
-  "minitest" = {
-    version = "5.5.1";
-    source = {
-      type = "gem";
-      sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn";
-    };
-  };
-  "multi_json" = {
-    version = "1.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c";
-    };
-  };
-  "multipart-post" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc";
-    };
-  };
-  "octokit" = {
-    version = "3.2.0";
-    source = {
-      type = "gem";
-      sha256 = "07ll3x1hv72zssb4hkdw56xg3xk6x4fch4yf38zljvbh388r11ng";
-    };
-    dependencies = [
-      "sawyer"
-    ];
-  };
-  "puma" = {
-    version = "2.8.2";
-    source = {
-      type = "gem";
-      sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack" = {
-    version = "1.5.2";
-    source = {
-      type = "gem";
-      sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6";
-    };
-  };
-  "rack-test" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rails" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0";
-    };
-    dependencies = [
-      "actionmailer"
-      "actionpack"
-      "actionview"
-      "activemodel"
-      "activerecord"
-      "activesupport"
-      "railties"
-      "sprockets-rails"
-    ];
-  };
-  "railties" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "rake"
-      "thor"
-    ];
-  };
-  "rake" = {
-    version = "10.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8";
-    };
-  };
-  "rest-client" = {
-    version = "1.6.7";
-    source = {
-      type = "gem";
-      sha256 = "0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853";
-    };
-    dependencies = [
-      "mime-types"
-    ];
-  };
-  "rspec-core" = {
-    version = "3.1.7";
-    source = {
-      type = "gem";
-      sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-expectations" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-mocks" = {
-    version = "3.1.3";
-    source = {
-      type = "gem";
-      sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-rails" = {
-    version = "3.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "railties"
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-      "rspec-support"
-    ];
-  };
-  "rspec-support" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb";
-    };
-  };
-  "safe_yaml" = {
-    version = "1.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-    };
-  };
-  "sawyer" = {
-    version = "0.5.4";
-    source = {
-      type = "gem";
-      sha256 = "01kl4zpf0gaacnkra5nikrzfpwj8f10hsvgyzm7z2s1mz4iipx2v";
-    };
-    dependencies = [
-      "addressable"
-      "faraday"
-    ];
-  };
-  "shoulda-matchers" = {
-    version = "2.6.1";
-    source = {
-      type = "gem";
-      sha256 = "1p3jhvd4dsj6d7nbmvnqhqhpmb8pnr05pi7jv9ajwqcys8140mc1";
-    };
-    dependencies = [
-      "activesupport"
-    ];
-  };
-  "simplecov" = {
-    version = "0.9.1";
-    source = {
-      type = "gem";
-      sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf";
-    };
-    dependencies = [
-      "docile"
-      "multi_json"
-      "simplecov-html"
-    ];
-  };
-  "simplecov-html" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9";
-    };
-  };
-  "sprockets" = {
-    version = "2.12.3";
-    source = {
-      type = "gem";
-      sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2";
-    };
-    dependencies = [
-      "hike"
-      "multi_json"
-      "rack"
-      "tilt"
-    ];
-  };
-  "sprockets-rails" = {
-    version = "2.2.4";
-    source = {
-      type = "gem";
-      sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "sprockets"
-    ];
-  };
-  "sqlite3" = {
-    version = "1.3.9";
-    source = {
-      type = "gem";
-      sha256 = "07m6a6flmyyi0rkg0j7x1a9861zngwjnximfh95cli2zzd57914r";
-    };
-  };
-  "term-ansicolor" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b";
-    };
-    dependencies = [
-      "tins"
-    ];
-  };
-  "thor" = {
-    version = "0.19.1";
-    source = {
-      type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-    };
-  };
-  "thread_safe" = {
-    version = "0.3.4";
-    source = {
-      type = "gem";
-      sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n";
-    };
-  };
-  "tilt" = {
-    version = "1.4.1";
-    source = {
-      type = "gem";
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
-    };
-  };
-  "tins" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1yxa5kyp9mw4w866wlg7c32ingzqxnzh3ir9yf06pwpkmq3mrbdi";
-    };
-  };
-  "tzinfo" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "webmock" = {
-    version = "1.20.0";
-    source = {
-      type = "gem";
-      sha256 = "0bl5v0xzcj24lx7xpsnywv3liqnqb5lfxysmmfb2fgi0n8586i6m";
-    };
-    dependencies = [
-      "addressable"
-      "crack"
-    ];
-  };
-}
\ No newline at end of file
diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile b/pkgs/applications/networking/cluster/panamax/ui/Gemfile
deleted file mode 100644
index 6f7dc59d04d0..000000000000
--- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile
+++ /dev/null
@@ -1,31 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '4.1.7'
-gem 'puma', '2.8.2'
-gem 'sass', '3.3.9'
-gem 'therubyracer', '0.12.1', platforms: :ruby
-gem 'haml', '4.0.5'
-gem 'uglifier', '2.5.1'
-gem 'ctl_base_ui'
-gem 'activeresource', '4.0.0'
-gem 'kramdown', '1.4.0'
-gem 'zeroclipboard-rails'
-
-
-group :test, :development do
-  gem 'rspec-rails'
-  gem 'its'
-  gem 'capybara'
-  gem 'teaspoon'
-  gem 'phantomjs'
-  gem 'dotenv-rails', '0.11.1'
-  gem 'pry'
-  gem 'pry-byebug'
-  gem 'pry-stack_explorer'
-end
-
-group :test do
-  gem 'webmock'
-  gem 'sinatra', '1.4.5'
-  gem 'coveralls', '0.7.0'
-end
diff --git a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock b/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
deleted file mode 100644
index b273595bbb05..000000000000
--- a/pkgs/applications/networking/cluster/panamax/ui/Gemfile.lock
+++ /dev/null
@@ -1,226 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.7)
-      actionview (= 4.1.7)
-      activesupport (= 4.1.7)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.7)
-      activesupport (= 4.1.7)
-      builder (~> 3.1)
-    activerecord (4.1.7)
-      activemodel (= 4.1.7)
-      activesupport (= 4.1.7)
-      arel (~> 5.0.0)
-    activeresource (4.0.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      rails-observers (~> 0.1.1)
-    activesupport (4.1.7)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    addressable (2.3.6)
-    arel (5.0.1.20140414130214)
-    binding_of_caller (0.7.2)
-      debug_inspector (>= 0.0.1)
-    builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    capybara (2.4.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    coderay (1.1.0)
-    columnize (0.8.9)
-    coveralls (0.7.0)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    ctl_base_ui (0.0.5)
-      haml (~> 4.0)
-      jquery-rails (~> 3.1)
-      jquery-ui-rails (~> 4.2)
-      rails (~> 4.1)
-      sass (~> 3.3)
-    debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
-    diff-lcs (1.2.5)
-    docile (1.1.5)
-    dotenv (0.11.1)
-      dotenv-deployment (~> 0.0.2)
-    dotenv-deployment (0.0.2)
-    dotenv-rails (0.11.1)
-      dotenv (= 0.11.1)
-    erubis (2.7.0)
-    execjs (2.2.2)
-    haml (4.0.5)
-      tilt
-    hike (1.2.3)
-    i18n (0.7.0)
-    its (0.2.0)
-      rspec-core
-    jquery-rails (3.1.2)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.1)
-      railties (>= 3.2.16)
-    json (1.8.2)
-    kramdown (1.4.0)
-    libv8 (3.16.14.11)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.5.1)
-    multi_json (1.10.1)
-    netrc (0.8.0)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    phantomjs (1.9.7.1)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    pry-byebug (2.0.0)
-      byebug (~> 3.4)
-      pry (~> 0.10)
-    pry-stack_explorer (0.4.9.1)
-      binding_of_caller (>= 0.7)
-      pry (>= 0.9.11)
-    puma (2.8.2)
-      rack (>= 1.1, < 2.0)
-    rack (1.5.2)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.1.7)
-      actionmailer (= 4.1.7)
-      actionpack (= 4.1.7)
-      actionview (= 4.1.7)
-      activemodel (= 4.1.7)
-      activerecord (= 4.1.7)
-      activesupport (= 4.1.7)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.7)
-      sprockets-rails (~> 2.0)
-    rails-observers (0.1.2)
-      activemodel (~> 4.0)
-    railties (4.1.7)
-      actionpack (= 4.1.7)
-      activesupport (= 4.1.7)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.0)
-    ref (1.0.5)
-    rest-client (1.7.2)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-    safe_yaml (1.0.4)
-    sass (3.3.9)
-    simplecov (0.9.1)
-      docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
-    sinatra (1.4.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
-    slop (3.6.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    teaspoon (0.8.0)
-      railties (>= 3.2.5, < 5)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
-      ref
-    thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
-    tins (1.3.3)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-    uglifier (2.5.1)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
-    webmock (1.20.4)
-      addressable (>= 2.3.6)
-      crack (>= 0.3.2)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
-    zeroclipboard-rails (0.1.0)
-      railties (>= 3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activeresource (= 4.0.0)
-  capybara
-  coveralls (= 0.7.0)
-  ctl_base_ui
-  dotenv-rails (= 0.11.1)
-  haml (= 4.0.5)
-  its
-  kramdown (= 1.4.0)
-  phantomjs
-  pry
-  pry-byebug
-  pry-stack_explorer
-  puma (= 2.8.2)
-  rails (= 4.1.7)
-  rspec-rails
-  sass (= 3.3.9)
-  sinatra (= 1.4.5)
-  teaspoon
-  therubyracer (= 0.12.1)
-  uglifier (= 2.5.1)
-  webmock
-  zeroclipboard-rails
diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix
deleted file mode 100644
index 2f60942f014b..000000000000
--- a/pkgs/applications/networking/cluster/panamax/ui/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
-, ruby, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}@args:
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "panamax-ui-${version}";
-  version = "0.2.14";
-
-  env = bundlerEnv {
-    name = "panamax-ui-gems-${version}";
-    inherit ruby;
-    gemdir = ./.;
-  };
-
-  bundler = args.bundler.override { inherit ruby; };
-
-  src = fetchgit {
-    rev = "refs/tags/v${version}";
-    url = "git://github.com/CenturyLinkLabs/panamax-ui";
-    sha256 = "01k0h0rjqp5arvwxm2xpfxjsag5qw0qqlg7hx4v8f6jsyc4wmjfl";
-  };
-
-  buildInputs = [ makeWrapper env.ruby openssl sqlite bundler ];
-
-  setSourceRoot = ''
-    mkdir -p $out/share
-    cp -R panamax-ui $out/share/panamax-ui
-    export sourceRoot="$out/share/panamax-ui"
-  '';
-
-  postPatch = ''
-    find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Journal|NixOS Journal|g' -i "{}" \;
-    find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Local|NixOS Local|g' -i "{}" \;
-    find . -type f -iname "*.haml" -exec sed -e 's|CoreOS Host|NixOS Host|g' -i "{}" \;
-    sed -e 's|CoreOS Local|NixOS Local|g' -i "spec/features/manage_application_spec.rb"
-    # fix libv8 dependency
-    substituteInPlace Gemfile.lock --replace "3.16.14.7" "3.16.14.11"
-  '';
-
-  configurePhase = ''
-    export HOME=$PWD
-    export GEM_HOME=${env}/${env.ruby.gemPath}
-  '';
-
-  buildPhase = ''
-    rm -f ./bin/*
-    bundle exec rake rails:update:bin
-  '';
-
-  installPhase = ''
-    rm -rf log tmp db
-    ln -sf ${dataDir}/{db,state/log,state/tmp} .
-
-    mkdir -p $out/bin
-    makeWrapper bin/bundle "$out/bin/bundle" \
-      --run "cd $out/share/panamax-ui" \
-      --prefix "PATH" : "$out/share/panamax-ui/bin:${env.ruby}/bin:$PATH" \
-      --prefix "HOME" : "$out/share/panamax-ui" \
-      --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "GEM_PATH" : "$out/share/panamax-ui:${bundler}/${env.ruby.gemPath}"
-  '';
-
-  meta = with stdenv.lib; {
-    broken = true; # needs ruby 2.1
-    homepage = https://github.com/CenturyLinkLabs/panamax-ui;
-    description = "The Web GUI for Panamax";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ matejc offline ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix b/pkgs/applications/networking/cluster/panamax/ui/gemset.nix
deleted file mode 100644
index b41b482edb73..000000000000
--- a/pkgs/applications/networking/cluster/panamax/ui/gemset.nix
+++ /dev/null
@@ -1,789 +0,0 @@
-{
-  "actionmailer" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0qjv5akjbpgd4cx518k522mssvc3y3nki65hi6fj5nbzi7a6rwq5";
-    };
-    dependencies = [
-      "actionpack"
-      "actionview"
-      "mail"
-    ];
-  };
-  "actionpack" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "07y1ny00h69xklq260smyl5md052f617gqrzkyw5sxafs5z25zax";
-    };
-    dependencies = [
-      "actionview"
-      "activesupport"
-      "rack"
-      "rack-test"
-    ];
-  };
-  "actionview" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "06sp37gfpn2jn7j6vlpp1y6vfi5kig60vyvixrjhyz0g4vgm13ax";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-      "erubis"
-    ];
-  };
-  "activemodel" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0rlqzz25l7vsphgkilg80kmk20d9h357awi27ax6zzb9klkqh0jr";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-    ];
-  };
-  "activerecord" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "0j4r0m32mjbwmz9gs8brln35jzr1cn7h585ggj0w0f1ai4hjsby5";
-    };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "arel"
-    ];
-  };
-  "activeresource" = {
-    version = "4.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0fc5igjijyjzsl9q5kybkdzhc92zv8wsv0ifb0y90i632jx6d4jq";
-    };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "rails-observers"
-    ];
-  };
-  "activesupport" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "13i3mz66d5kp5y39gjwmcfqv0wb6mxm5k1nnz40wvd38dsf7n3bs";
-    };
-    dependencies = [
-      "i18n"
-      "json"
-      "minitest"
-      "thread_safe"
-      "tzinfo"
-    ];
-  };
-  "addressable" = {
-    version = "2.3.6";
-    source = {
-      type = "gem";
-      sha256 = "137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8";
-    };
-  };
-  "arel" = {
-    version = "5.0.1.20140414130214";
-    source = {
-      type = "gem";
-      sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9";
-    };
-  };
-  "binding_of_caller" = {
-    version = "0.7.2";
-    source = {
-      type = "gem";
-      sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
-    };
-    dependencies = [
-      "debug_inspector"
-    ];
-  };
-  "builder" = {
-    version = "3.2.2";
-    source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "byebug" = {
-    version = "3.5.1";
-    source = {
-      type = "gem";
-      sha256 = "0ldc2r0b316rrn2fgdgiznskj9gb0q9n60243laq7nqw9na8wdan";
-    };
-    dependencies = [
-      "columnize"
-      "debugger-linecache"
-      "slop"
-    ];
-  };
-  "capybara" = {
-    version = "2.4.4";
-    source = {
-      type = "gem";
-      sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f";
-    };
-    dependencies = [
-      "mime-types"
-      "nokogiri"
-      "rack"
-      "rack-test"
-      "xpath"
-    ];
-  };
-  "coderay" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
-    };
-  };
-  "columnize" = {
-    version = "0.8.9";
-    source = {
-      type = "gem";
-      sha256 = "1f3azq8pvdaaclljanwhab78hdw40k908ma2cwk59qzj4hvf7mip";
-    };
-  };
-  "coveralls" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "0sz30d7b83qqsj3i0fr691w05d62wj7x3afh0ryjkqkis3fq94j4";
-    };
-    dependencies = [
-      "multi_json"
-      "rest-client"
-      "simplecov"
-      "term-ansicolor"
-      "thor"
-    ];
-  };
-  "crack" = {
-    version = "0.4.2";
-    source = {
-      type = "gem";
-      sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a";
-    };
-    dependencies = [
-      "safe_yaml"
-    ];
-  };
-  "ctl_base_ui" = {
-    version = "0.0.5";
-    source = {
-      type = "gem";
-      sha256 = "1pji85xmddgld5lqx52zxi5r2kx6rsjwkqlr26bp62xb29r10x57";
-    };
-    dependencies = [
-      "haml"
-      "jquery-rails"
-      "jquery-ui-rails"
-      "rails"
-      "sass"
-    ];
-  };
-  "debug_inspector" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m";
-    };
-  };
-  "debugger-linecache" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "0iwyx190fd5vfwj1gzr8pg3m374kqqix4g4fc4qw29sp54d3fpdz";
-    };
-  };
-  "diff-lcs" = {
-    version = "1.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
-    };
-  };
-  "docile" = {
-    version = "1.1.5";
-    source = {
-      type = "gem";
-      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
-    };
-  };
-  "dotenv" = {
-    version = "0.11.1";
-    source = {
-      type = "gem";
-      sha256 = "09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m";
-    };
-    dependencies = [
-      "dotenv-deployment"
-    ];
-  };
-  "dotenv-deployment" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c";
-    };
-  };
-  "dotenv-rails" = {
-    version = "0.11.1";
-    source = {
-      type = "gem";
-      sha256 = "0r6hif0i1lipbi7mkxx7wa5clsn65n6wyd9jry262cx396lsfrqy";
-    };
-    dependencies = [
-      "dotenv"
-    ];
-  };
-  "erubis" = {
-    version = "2.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-    };
-  };
-  "execjs" = {
-    version = "2.2.2";
-    source = {
-      type = "gem";
-      sha256 = "05m41mnxn4b2p133qzbz5cy9cc5rn57aa0pp2943hxmzbk379z1f";
-    };
-  };
-  "haml" = {
-    version = "4.0.5";
-    source = {
-      type = "gem";
-      sha256 = "1xmzb0k5q271090crzmv7dbw8ss4289bzxklrc0fhw6pw3kcvc85";
-    };
-    dependencies = [
-      "tilt"
-    ];
-  };
-  "hike" = {
-    version = "1.2.3";
-    source = {
-      type = "gem";
-      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
-    };
-  };
-  "i18n" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
-    };
-  };
-  "its" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "0rxwds9ipqp48mzqcaxzmfcqhawazg0zlhc1avv3i2cmm3np1z8g";
-    };
-    dependencies = [
-      "rspec-core"
-    ];
-  };
-  "jquery-rails" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0h5a565i3l2mbd221m6mz9d1nr53pz19i9qxv08qr1dv0yx2pr3y";
-    };
-    dependencies = [
-      "railties"
-      "thor"
-    ];
-  };
-  "jquery-ui-rails" = {
-    version = "4.2.1";
-    source = {
-      type = "gem";
-      sha256 = "1garrnqwh35acj2pp4sp6fpm2g881h23y644lzbic2qmcrq9wd2v";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "json" = {
-    version = "1.8.2";
-    source = {
-      type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
-    };
-  };
-  "kramdown" = {
-    version = "1.4.0";
-    source = {
-      type = "gem";
-      sha256 = "001vy0ymiwbvkdbb9wpqmswv6imliv7xim00gq6rlk0chnbiaq80";
-    };
-  };
-  libv8 = {
-    version = "3.16.14.11";
-    source = {
-      type = "gem";
-      sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp";
-    };
-  };
-  "mail" = {
-    version = "2.6.3";
-    source = {
-      type = "gem";
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
-    };
-    dependencies = [
-      "mime-types"
-    ];
-  };
-  "method_source" = {
-    version = "0.8.2";
-    source = {
-      type = "gem";
-      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
-    };
-  };
-  "mime-types" = {
-    version = "2.4.3";
-    source = {
-      type = "gem";
-      sha256 = "16nissnb31wj7kpcaynx4gr67i7pbkzccfg8k7xmplbkla4rmwiq";
-    };
-  };
-  "mini_portile" = {
-    version = "0.6.1";
-    source = {
-      type = "gem";
-      sha256 = "07gah4k84sar9d850v9gip9b323pw74vwwndh3bbzxpw5iiwsd3l";
-    };
-  };
-  "minitest" = {
-    version = "5.5.1";
-    source = {
-      type = "gem";
-      sha256 = "1h8jn0rgmwy37jnhfcg55iilw0n370vgp8xnh0g5laa8rhv32fyn";
-    };
-  };
-  "multi_json" = {
-    version = "1.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c";
-    };
-  };
-  "netrc" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "1j4jbdvd19kq34xiqx1yqb4wmcywyrlaky8hrh09c1hz3c0v5dkb";
-    };
-  };
-  "nokogiri" = {
-    version = "1.6.5";
-    source = {
-      type = "gem";
-      sha256 = "1xmxz6fa0m4p7c7ngpgz6gjgv65lzz63dsf0b6vh7gs2fkiw8j7l";
-    };
-    dependencies = [
-      "mini_portile"
-    ];
-  };
-  "phantomjs" = {
-    version = "1.9.7.1";
-    source = {
-      type = "gem";
-      sha256 = "14as0yzwbzvshbp1f8igjxcdxc5vbjgh0jhdvy393il084inlrl7";
-    };
-  };
-  "pry" = {
-    version = "0.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z";
-    };
-    dependencies = [
-      "coderay"
-      "method_source"
-      "slop"
-    ];
-  };
-  "pry-byebug" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "17b6720ci9345wkzj369ydyj6hdlg2krd26zivpd4dvaijszzgzq";
-    };
-    dependencies = [
-      "byebug"
-      "pry"
-    ];
-  };
-  "pry-stack_explorer" = {
-    version = "0.4.9.1";
-    source = {
-      type = "gem";
-      sha256 = "1828jqcfdr9nk86n15ky199vf33cfz51wkpv6kx230g0dsh9r85z";
-    };
-    dependencies = [
-      "binding_of_caller"
-      "pry"
-    ];
-  };
-  "puma" = {
-    version = "2.8.2";
-    source = {
-      type = "gem";
-      sha256 = "1l57fmf8vyxfjv7ab5znq0k339cym5ghnm5xxfvd1simjp73db0k";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack" = {
-    version = "1.5.2";
-    source = {
-      type = "gem";
-      sha256 = "19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6";
-    };
-  };
-  "rack-protection" = {
-    version = "1.5.3";
-    source = {
-      type = "gem";
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack-test" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rails" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "059mpljplmhfz8rr4hk40q67fllcpsy809m4mwwbkm8qwif2z5r0";
-    };
-    dependencies = [
-      "actionmailer"
-      "actionpack"
-      "actionview"
-      "activemodel"
-      "activerecord"
-      "activesupport"
-      "railties"
-      "sprockets-rails"
-    ];
-  };
-  "rails-observers" = {
-    version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy";
-    };
-    dependencies = [
-      "activemodel"
-    ];
-  };
-  "railties" = {
-    version = "4.1.7";
-    source = {
-      type = "gem";
-      sha256 = "1n08h0rgj0aq5lvslnih6lvqz9wadpz6nnb25i4qhp37fhhyz9yz";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "rake"
-      "thor"
-    ];
-  };
-  "rake" = {
-    version = "10.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8";
-    };
-  };
-  "ref" = {
-    version = "1.0.5";
-    source = {
-      type = "gem";
-      sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la";
-    };
-  };
-  "rest-client" = {
-    version = "1.7.2";
-    source = {
-      type = "gem";
-      sha256 = "0h8c0prfi2v5p8iim3wm60xc4yripc13nqwq601bfl85k4gf25i0";
-    };
-    dependencies = [
-      "mime-types"
-      "netrc"
-    ];
-  };
-  "rspec-core" = {
-    version = "3.1.7";
-    source = {
-      type = "gem";
-      sha256 = "01bawvln663gffljwzpq3mrpa061cghjbvfbq15jvhmip3csxqc9";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-expectations" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0m8d36wng1lpbcs54zhg1rxh63rgj345k3p0h0c06lgknz339nzh";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-mocks" = {
-    version = "3.1.3";
-    source = {
-      type = "gem";
-      sha256 = "0gxk5w3klia4zsnp0svxck43xxwwfdqvhr3srv6p30f3m5q6rmzr";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-rails" = {
-    version = "3.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1b1in3n1dc1bpf9wb3p3b2ynq05iacmr48jxzc73lj4g44ksh3wq";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "railties"
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-      "rspec-support"
-    ];
-  };
-  "rspec-support" = {
-    version = "3.1.2";
-    source = {
-      type = "gem";
-      sha256 = "14y6v9r9lrh91ry9r79h85v0f3y9ja25w42nv5z9n0bipfcwhprb";
-    };
-  };
-  "safe_yaml" = {
-    version = "1.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-    };
-  };
-  "sass" = {
-    version = "3.3.9";
-    source = {
-      type = "gem";
-      sha256 = "0k19vj73283i907z4wfkc9qdska2b19z7ps6lcr5s4qzwis1zkmz";
-    };
-  };
-  "simplecov" = {
-    version = "0.9.1";
-    source = {
-      type = "gem";
-      sha256 = "06hylxlalaxxldpbaqa54gc52wxdff0fixdvjyzr6i4ygxwzr7yf";
-    };
-    dependencies = [
-      "docile"
-      "multi_json"
-      "simplecov-html"
-    ];
-  };
-  "simplecov-html" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0jhn3jql73x7hsr00wwv984iyrcg0xhf64s90zaqv2f26blkqfb9";
-    };
-  };
-  "sinatra" = {
-    version = "1.4.5";
-    source = {
-      type = "gem";
-      sha256 = "0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s";
-    };
-    dependencies = [
-      "rack"
-      "rack-protection"
-      "tilt"
-    ];
-  };
-  "slop" = {
-    version = "3.6.0";
-    source = {
-      type = "gem";
-      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
-    };
-  };
-  "sprockets" = {
-    version = "2.12.3";
-    source = {
-      type = "gem";
-      sha256 = "1bn2drr8bc2af359dkfraq0nm0p1pib634kvhwn5lvj3r4vllnn2";
-    };
-    dependencies = [
-      "hike"
-      "multi_json"
-      "rack"
-      "tilt"
-    ];
-  };
-  "sprockets-rails" = {
-    version = "2.2.4";
-    source = {
-      type = "gem";
-      sha256 = "172cdg38cqsfgvrncjzj0kziz7kv6b1lx8pccd0blyphs25qf4gc";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "sprockets"
-    ];
-  };
-  "teaspoon" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "1j3brbm9cv5km9d9wzb6q2b3cvc6m254z48h7h77z1w6c5wr0p3z";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "term-ansicolor" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b";
-    };
-    dependencies = [
-      "tins"
-    ];
-  };
-  "therubyracer" = {
-    version = "0.12.1";
-    source = {
-      type = "gem";
-      sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6";
-    };
-    dependencies = [
-      "libv8"
-      "ref"
-    ];
-  };
-  "thor" = {
-    version = "0.19.1";
-    source = {
-      type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-    };
-  };
-  "thread_safe" = {
-    version = "0.3.4";
-    source = {
-      type = "gem";
-      sha256 = "1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n";
-    };
-  };
-  "tilt" = {
-    version = "1.4.1";
-    source = {
-      type = "gem";
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
-    };
-  };
-  "tins" = {
-    version = "1.3.3";
-    source = {
-      type = "gem";
-      sha256 = "14jnsg15wakdk1ljh2iv9yvzk8nb7gpzd2zw4yvjikmffqjyqvna";
-    };
-  };
-  "tzinfo" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "uglifier" = {
-    version = "2.5.1";
-    source = {
-      type = "gem";
-      sha256 = "1vihq309mzv9a2i0s8v4imrn1g2kj8z0vr88q3i5b657c4kxzfp0";
-    };
-    dependencies = [
-      "execjs"
-      "json"
-    ];
-  };
-  "webmock" = {
-    version = "1.20.4";
-    source = {
-      type = "gem";
-      sha256 = "01cz13ybxbbvkpl21bcfv0p9ir8m2zcplx93ps01ma54p25z4mxr";
-    };
-    dependencies = [
-      "addressable"
-      "crack"
-    ];
-  };
-  "xpath" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
-    };
-    dependencies = [
-      "nokogiri"
-    ];
-  };
-  "zeroclipboard-rails" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "00ixal0a0mxaqsyzp06c6zz4qdwqydy1qv4n7hbyqfhbmsdalcfc";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a405901f741..f8d319d02376 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17008,9 +17008,6 @@ with pkgs;
 
   p4v = libsForQt5.callPackage ../applications/version-management/p4v { };
 
-  panamax_api = callPackage ../applications/networking/cluster/panamax/api { };
-  panamax_ui = callPackage ../applications/networking/cluster/panamax/ui { };
-
   partio = callPackage ../development/libraries/partio {};
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };

From c3eefe801a55586445125d49f159c1c0c5e76f76 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 5 May 2018 00:09:43 +0200
Subject: [PATCH 1137/3370] fleet: remove package, module, test

deprecated and unmaintained upstream
---
 nixos/modules/misc/ids.nix               |   2 +-
 nixos/modules/module-list.nix            |   1 -
 nixos/modules/services/cluster/fleet.nix | 150 -----------------------
 nixos/release.nix                        |   1 -
 nixos/tests/fleet.nix                    |  76 ------------
 pkgs/servers/fleet/default.nix           |  37 ------
 pkgs/top-level/all-packages.nix          |   2 -
 7 files changed, 1 insertion(+), 268 deletions(-)
 delete mode 100644 nixos/modules/services/cluster/fleet.nix
 delete mode 100644 nixos/tests/fleet.nix
 delete mode 100644 pkgs/servers/fleet/default.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 7a538210d10e..7c0750c1a32e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -475,7 +475,7 @@
       nylon = 168;
       #panamax = 170; # unused
       exim = 172;
-      fleet = 173;
+      #fleet = 173; # unused
       input = 174;
       sddm = 175;
       tss = 176;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6f6a81bbda80..33191de14c4b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -170,7 +170,6 @@
   ./services/backup/rsnapshot.nix
   ./services/backup/tarsnap.nix
   ./services/backup/znapzend.nix
-  ./services/cluster/fleet.nix
   ./services/cluster/kubernetes/default.nix
   ./services/cluster/kubernetes/dns.nix
   ./services/cluster/kubernetes/dashboard.nix
diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix
deleted file mode 100644
index ec03be395948..000000000000
--- a/nixos/modules/services/cluster/fleet.nix
+++ /dev/null
@@ -1,150 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.fleet;
-
-in {
-
-  ##### Interface
-  options.services.fleet = {
-    enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        Whether to enable fleet service.
-      '';
-    };
-
-    listen = mkOption {
-      type = types.listOf types.str;
-      default = [ "/var/run/fleet.sock" ];
-      example = [ "/var/run/fleet.sock" "127.0.0.1:49153" ];
-      description = ''
-        Fleet listening addresses.
-      '';
-    };
-
-    etcdServers = mkOption {
-      type = types.listOf types.str;
-      default = [ "http://127.0.0.1:2379" ];
-      description = ''
-        Fleet list of etcd endpoints to use.
-      '';
-    };
-
-    publicIp = mkOption {
-      type = types.nullOr types.str;
-      default = "";
-      description = ''
-        Fleet IP address that should be published with the local Machine's
-        state and any socket information. If not set, fleetd will attempt
-        to detect the IP it should publish based on the machine's IP
-        routing information.
-      '';
-    };
-
-    etcdCafile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        Fleet TLS ca file when SSL certificate authentication is enabled
-        in etcd endpoints.
-      '';
-    };
-
-    etcdKeyfile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        Fleet TLS key file when SSL certificate authentication is enabled
-        in etcd endpoints.
-      '';
-    };
-
-    etcdCertfile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        Fleet TLS cert file when SSL certificate authentication is enabled
-        in etcd endpoints.
-      '';
-    };
-
-    metadata = mkOption {
-      type = types.attrsOf types.str;
-      default = {};
-      apply = attrs: concatMapStringsSep "," (n: "${n}=${attrs."${n}"}") (attrNames attrs);
-      example = literalExample ''
-        {
-          region = "us-west";
-          az = "us-west-1";
-        }
-      '';
-      description = ''
-        Key/value pairs that are published with the local to the fleet registry.
-        This data can be used directly by a client of fleet to make scheduling decisions.
-      '';
-    };
-
-    extraConfig = mkOption {
-      type = types.attrsOf types.str;
-      apply = mapAttrs' (n: v: nameValuePair ("FLEET_" + n) v);
-      default = {};
-      example = literalExample ''
-        {
-          VERBOSITY = 1;
-          ETCD_REQUEST_TIMEOUT = "2.0";
-          AGENT_TTL = "40s";
-        }
-      '';
-      description = ''
-        Fleet extra config. See
-        <link xlink:href="https://github.com/coreos/fleet/blob/master/Documentation/deployment-and-configuration.md"/>
-        for configuration options.
-      '';
-    };
-
-  };
-
-  ##### Implementation
-  config = mkIf cfg.enable {
-    systemd.services.fleet = {
-      description = "Fleet Init System Daemon";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" "fleet.socket" "etcd.service" "docker.service" ];
-      requires = [ "fleet.socket" ];
-      environment = {
-        FLEET_ETCD_SERVERS = concatStringsSep "," cfg.etcdServers;
-        FLEET_PUBLIC_IP = cfg.publicIp;
-        FLEET_ETCD_CAFILE = cfg.etcdCafile;
-        FLEET_ETCD_KEYFILE = cfg.etcdKeyfile;
-        FLEET_ETCD_CERTFILE = cfg.etcdCertfile;
-        FLEET_METADATA = cfg.metadata;
-      } // cfg.extraConfig;
-      serviceConfig = {
-        ExecStart = "${pkgs.fleet}/bin/fleetd";
-        Group = "fleet";
-      };
-    };
-
-    systemd.sockets.fleet = {
-      description = "Fleet Socket for the API";
-      wantedBy = [ "sockets.target" ];
-      listenStreams = cfg.listen;
-      socketConfig = {
-        ListenStream = "/var/run/fleet.sock";
-        SocketMode = "0660";
-        SocketUser = "root";
-        SocketGroup = "fleet";
-      };
-    };
-
-    services.etcd.enable = mkDefault true;
-    virtualisation.docker.enable = mkDefault true;
-
-    environment.systemPackages = [ pkgs.fleet ];
-    users.extraGroups.fleet.gid = config.ids.gids.fleet;
-  };
-}
diff --git a/nixos/release.nix b/nixos/release.nix
index ebe23ebed02a..55b4f19b8688 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -284,7 +284,6 @@ in rec {
   tests.ferm = callTest tests/ferm.nix {};
   tests.firefox = callTest tests/firefox.nix {};
   tests.firewall = callTest tests/firewall.nix {};
-  tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {};
   tests.fwupd = callTest tests/fwupd.nix {};
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gitolite = callTest tests/gitolite.nix {};
diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix
deleted file mode 100644
index 67c95446526f..000000000000
--- a/nixos/tests/fleet.nix
+++ /dev/null
@@ -1,76 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : rec {
-  name = "simple";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ offline ];
-  };
-
-  nodes = {
-    node1 =
-      { config, pkgs, ... }:
-        {
-          services = {
-            etcd = {
-              enable = true;
-              listenPeerUrls = ["http://0.0.0.0:7001"];
-              initialAdvertisePeerUrls = ["http://node1:7001"];
-              initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"];
-            };
-         };
-
-          services.fleet = {
-            enable = true;
-            metadata.name = "node1";
-          };
-
-          networking.firewall.allowedTCPPorts = [ 7001 ];
-        };
-
-    node2 =
-      { config, pkgs, ... }:
-        {
-          services = {
-            etcd = {
-              enable = true;
-              listenPeerUrls = ["http://0.0.0.0:7001"];
-              initialAdvertisePeerUrls = ["http://node2:7001"];
-              initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"];
-            };
-           };
-
-          services.fleet = {
-            enable = true;
-            metadata.name = "node2";
-          };
-
-          networking.firewall.allowedTCPPorts = [ 7001 ];
-        };
-  };
-
-  service = builtins.toFile "hello.service" ''
-    [Unit]
-    Description=Hello World
-
-    [Service]
-    ExecStart=/bin/sh -c "while true; do echo \"Hello, world\"; /var/run/current-system/sw/bin/sleep 1; done"
-
-    [X-Fleet]
-    MachineMetadata=name=node2
-  '';
-
-  testScript =
-    ''
-      startAll;
-      $node1->waitForUnit("fleet.service");
-      $node2->waitForUnit("fleet.service");
-
-      $node2->waitUntilSucceeds("fleetctl list-machines | grep node1");
-      $node1->waitUntilSucceeds("fleetctl list-machines | grep node2");
-
-      $node1->succeed("cp ${service} hello.service && fleetctl submit hello.service");
-      $node1->succeed("fleetctl list-unit-files | grep hello");
-      $node1->succeed("fleetctl start hello.service");
-      $node1->waitUntilSucceeds("fleetctl list-units | grep running");
-      $node1->succeed("fleetctl stop hello.service");
-      $node1->succeed("fleetctl destroy hello.service");
-    '';
-})
diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix
deleted file mode 100644
index 98daab253b3c..000000000000
--- a/pkgs/servers/fleet/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, lib, go, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  name = "fleet-${version}";
-  version = "1.0.0";
-
-  src = fetchFromGitHub {
-    owner = "coreos";
-    repo = "fleet";
-    rev = "v${version}";
-    sha256 = "0j48ajz19aqfzv9iyznnn39aw51y1nqcl270grmvi5cbqycmrfm0";
-  };
-
-  buildInputs = [ go ];
-
-  buildPhase = ''
-    patchShebangs build
-    ./build
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    mv bin $out
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A distributed init system";
-    homepage = https://coreos.com/using-coreos/clustering/;
-    license = licenses.asl20;
-    maintainers = with maintainers; [
-      cstrahan
-      jgeerds
-      offline
-    ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8d319d02376..3d2e488f1460 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12407,8 +12407,6 @@ with pkgs;
   firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; };
   firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; };
 
-  fleet = callPackage ../servers/fleet { };
-
   foswiki = callPackage ../servers/foswiki { };
 
   frab = callPackage ../servers/web-apps/frab { };

From 841a5553cb411577b5421701b41530e0981d5d82 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 5 May 2018 00:29:01 +0200
Subject: [PATCH 1138/3370] baresip: switch to GStreamer 1.0

---
 .../instant-messengers/baresip/default.nix           | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 538e9a3786be..eff33643ebcf 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -1,6 +1,5 @@
-{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig
-, cairo, mpg123, gstreamer, gst-ffmpeg, gst-plugins-base, gst-plugins-bad
-, gst-plugins-good, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
+{stdenv, fetchurl, zlib, openssl, libre, librem, pkgconfig, gst_all_1
+, cairo, mpg123, alsaLib, SDL, libv4l, celt, libsndfile, srtp, ffmpeg
 , gsm, speex, portaudio, spandsp, libuuid, ccache, libvpx
 }:
 stdenv.mkDerivation rec {
@@ -11,11 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "02bf4fwirf3b7h3cr1jqm0xsjzza4fi9kg88424js2l0xywwzpgf";
   };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [zlib openssl libre librem
-    cairo mpg123 gstreamer gst-ffmpeg gst-plugins-base gst-plugins-bad gst-plugins-good
+  buildInputs = [zlib openssl libre librem cairo mpg123
     alsaLib SDL libv4l celt libsndfile srtp ffmpeg gsm speex portaudio spandsp libuuid
     ccache libvpx
-    ];
+  ] ++ (with gst_all_1; [ gstreamer gst-libav gst-plugins-base gst-plugins-bad gst-plugins-good ]);
   makeFlags = [
     "LIBRE_MK=${libre}/share/re/re.mk"
     "LIBRE_INC=${libre}/include/re"
@@ -26,7 +24,7 @@ stdenv.mkDerivation rec {
     "CCACHE_DISABLE=1"
 
     "USE_ALSA=1" "USE_AMR=1" "USE_CAIRO=1" "USE_CELT=1"
-    "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST=1"
+    "USE_CONS=1" "USE_EVDEV=1" "USE_FFMPEG=1"  "USE_GSM=1" "USE_GST1=1"
     "USE_L16=1" "USE_MPG123=1" "USE_OSS=1" "USE_PLC=1" "USE_VPX=1"
     "USE_PORTAUDIO=1" "USE_SDL=1" "USE_SNDFILE=1" "USE_SPEEX=1"
     "USE_SPEEX_AEC=1" "USE_SPEEX_PP=1" "USE_SPEEX_RESAMP=1" "USE_SRTP=1"

From 97ca2f5d58cd96e9d27975c78d3801ef168ac093 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 4 May 2018 22:34:27 +0000
Subject: [PATCH 1139/3370] vscode: 1.22.2 -> 1.23.0

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 5c10f6fb3bbc..41d4c114c75a 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.22.2";
+  version = "1.23.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "17iqqg6vdccbl1k4k2ks3kkgg7619j6qdvca4k27pjfqm17mvw5n";
-    "x86_64-linux" = "1ng2jhhaghsf7a2dmrimazh817jh0ag88whija179ywgrg3i6xam";
-    "x86_64-darwin" = "083hizigzxm45hcy6yqwznj9ibqdaxg2xv8rsyas4ig9x55irrcj";
+    "i686-linux" = "1nyrcgnf18752n3i7xaq6gpb2k4wsfzk671kxg6za4ycrriw1f5l";
+    "x86_64-linux" = "1mkxyavzav522sl3fjn2hdlbj0bkdl3hagqiw9i6h8wgkxcvsszy";
+    "x86_64-darwin" = "123ggzssd5qd80jxar2pf5g2n2473pd2j8pfjyir1c7xkaqji2w6";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 3bd1fcc4ad8c3223636b66fd2e647b12bd46c8dd Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Sat, 5 May 2018 09:16:19 +0800
Subject: [PATCH 1140/3370] parity-ui: init at 0.1.1

---
 pkgs/applications/altcoins/default.nix        |  1 +
 .../altcoins/parity-ui/default.nix            | 50 +++++++++++++++++++
 pkgs/applications/altcoins/parity-ui/env.nix  | 19 +++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/altcoins/parity-ui/default.nix
 create mode 100644 pkgs/applications/altcoins/parity-ui/env.nix

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index c58178e3edbb..fa704b596591 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -86,4 +86,5 @@ rec {
 
   parity = callPackage ./parity { };
   parity-beta = callPackage ./parity/beta.nix { };
+  parity-ui = callPackage ./parity-ui { };
 }
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
new file mode 100644
index 000000000000..56a95b6d5968
--- /dev/null
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, pkgs, fetchurl, lib, makeWrapper, nodePackages }:
+
+let
+
+uiEnv = pkgs.callPackage ./env.nix { };
+
+in stdenv.mkDerivation rec {
+  name = "parity-ui-${version}";
+  version = "0.1.1";
+
+  src = fetchurl {
+    url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
+    sha256 = "1jym6q63m5f4xm06dxiiabhbqnr0hysf2d3swysncs5hg6w00lh3";
+    name = "${name}.deb";
+  };
+
+  nativeBuildInputs = [ makeWrapper nodePackages.asar ];
+
+  buildCommand = ''
+    mkdir -p $out/usr/
+    ar p $src data.tar.xz | tar -C $out -xJ .
+    substituteInPlace $out/usr/share/applications/parity-ui.desktop \
+      --replace "/opt/Parity UI" $out/bin
+    mv $out/usr/* $out/
+    mv "$out/opt/Parity UI" $out/share/parity-ui
+    rm -r $out/usr/
+    rm -r $out/opt/
+
+    fixupPhase
+
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" \
+      $out/share/parity-ui/parity-ui
+
+    find $out/share/parity-ui -name "*.node" -exec patchelf --set-rpath "${uiEnv.libPath}:$out/share/parity-ui" {} \;
+
+    paxmark m $out/share/parity-ui/parity-ui
+
+    mkdir -p $out/bin
+    ln -s $out/share/parity-ui/parity-ui $out/bin/parity-ui
+  '';
+
+  meta = with stdenv.lib; {
+    description = "UI for Parity. Fast, light, robust Ethereum implementation";
+    homepage = http://parity.io;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.sorpaas ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix
new file mode 100644
index 000000000000..a273bf33d100
--- /dev/null
+++ b/pkgs/applications/altcoins/parity-ui/env.nix
@@ -0,0 +1,19 @@
+{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
+, libgnome-keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr
+, nss, xorg, libcap, systemd, libnotify, libsecret, gnome3 }:
+
+let
+  packages = [
+    stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
+    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
+    xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
+    xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
+    xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
+    xorg.libxcb libsecret gnome3.gconf
+  ];
+
+  libPathNative = lib.makeLibraryPath packages;
+  libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
+  libPath = "${libPathNative}:${libPath64}";
+
+in { inherit packages libPath; }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24b33231f77e..189e00ae3988 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14883,6 +14883,7 @@ with pkgs;
 
   parity = self.altcoins.parity;
   parity-beta = self.altcoins.parity-beta;
+  parity-ui = self.altcoins.parity-ui;
 
   stellar-core = self.altcoins.stellar-core;
 

From 5146fad639a8a6f4b4136216aa37c62d31e20053 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Thu, 3 May 2018 02:13:09 -0400
Subject: [PATCH 1141/3370] vscode-extension-ms-vscode-cpptools: 0.12.3 ->
 0.16.1

---
 .../vscode-extensions/cpptools/default.nix    |  47 ++---
 .../cpptools/missing_elf_deps.sh              |  52 ++++++
 .../package-activation-events-0-16-1.json     |  22 +++
 .../cpptools/update_helper.sh                 | 168 ++++++++++++++++++
 .../vscode-cpptools-0-12-3-package-json.patch |  82 ---------
 5 files changed, 260 insertions(+), 111 deletions(-)
 create mode 100755 pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
 create mode 100644 pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
 create mode 100755 pkgs/misc/vscode-extensions/cpptools/update_helper.sh
 delete mode 100644 pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch

diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix
index c537aa8a1f92..c29611c0c662 100644
--- a/pkgs/misc/vscode-extensions/cpptools/default.nix
+++ b/pkgs/misc/vscode-extensions/cpptools/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, vscode-utils, unzip, dos2unix, mono46, clang-tools, writeScript
-, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise. 
+{ stdenv, lib, fetchurl, fetchzip, vscode-utils, jq, mono46, clang-tools, writeScript
+, gdbUseFixed ? true, gdb # The gdb default setting will be fixed to specified. Use version from `PATH` otherwise.
 }:
 
 assert gdbUseFixed -> null != gdb;
@@ -33,13 +33,11 @@ let
   langComponentBinaries = stdenv.mkDerivation {
     name = "cpptools-language-component-binaries";
 
-    src = fetchurl {
-      url = https://download.visualstudio.microsoft.com/download/pr/11151953/d3cc8b654bffb8a2f3896d101f3c3155/Bin_Linux.zip;
-      sha256 = "12qbxsrdc73cqjb84xdck1xafzhfkcyn6bqbpcy1bxxr3b7hxbii";
+    src = fetchzip {
+      url = https://download.visualstudio.microsoft.com/download/pr/11991016/8a81aa8f89aac452956b0e4c68e6620b/Bin_Linux.zip;
+      sha256 = "0ma59fxfldbgh6ijlvfbs3hnl4g0cnw5gs6286zdrp065n763sv4";
     };
 
-    buildInputs = [ unzip ];
-
     patchPhase = ''
       elfInterpreter="${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2"
       patchelf --set-interpreter "$elfInterpreter" ./Microsoft.VSCode.CPP.Extension.linux
@@ -53,13 +51,6 @@ let
     '';
   };
 
-  cpptoolsJsonFile = fetchurl {
-    url = https://download.visualstudio.microsoft.com/download/pr/11070848/7b97d6724d52cae8377c61bb4601c989/cpptools.json;
-    sha256 = "124f091aic92rzbg2vg831y22zr5wi056c1kh775djqs3qv31ja6";
-  };
-
-
-
   openDebugAD7Script = writeScript "OpenDebugAD7" ''
     #!${stdenv.shell}
     BIN_DIR="$(cd "$(dirname "$0")" && pwd -P)"
@@ -76,23 +67,24 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "0.12.3";
-    sha256 = "1dcqy54n1w29xhbvxscd41hdrbdwar6g12zx02f6kh2f1kw34z5z";
+    version = "0.16.1";
+    sha256 = "0m4cam8sf3zwp8ss1dii908g7rc8b9l6pry0dglg0rmf45pkiaj3";
   };
 
   buildInputs = [
-    dos2unix
-  ];
-
-  prePatch = ''
-    dos2unix package.json      
-  '';
-
-  patches = [
-    ./vscode-cpptools-0-12-3-package-json.patch
+    jq
   ];
 
   postPatch = ''
+    mv ./package.json ./package_ori.json
+
+    # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime.
+    # 2. Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`.
+    cat ./package_ori.json | \
+      jq --slurpfile actEvts ${./package-activation-events-0-16-1.json} '(.activationEvents) = $actEvts[0]' | \
+      jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \
+      ./package.json
+
     # Patch `packages.json` so that nix's *gdb* is used as default value for `miDebuggerPath`.
     substituteInPlace "./package.json" \
       --replace "\"default\": \"/usr/bin/gdb\"" "\"default\": \"${gdbDefaultsTo}\""
@@ -103,9 +95,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     # Move unused files out of the way.
     mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused
 
-    # Bring the `cpptools.json` file at the root of the package, same as the extension would do.
-    cp -p "${cpptoolsJsonFile}" "./cpptools.json"
-
     # Combining the language component binaries as part of our package.
     find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin"
 
@@ -121,7 +110,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     meta = with stdenv.lib; {
       license = licenses.unfree;
       maintainers = [ maintainers.jraygauthier ];
-      # A 32 bit linux would also be possible with some effort (specific download of binaries + 
+      # A 32 bit linux would also be possible with some effort (specific download of binaries +
       # patching of the elf files with 32 bit interpreter).
       platforms = [ "x86_64-linux" ];
     };
diff --git a/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
new file mode 100755
index 000000000000..f5eb08d78a5d
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/missing_elf_deps.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -p coreutils -i bash
+
+scriptDir=$(cd "`dirname "$0"`"; pwd)
+echo "scriptDir='$scriptDir'"
+
+function get_pkg_out() {
+  local pkg="$1"
+  local suffix="${2:-}"
+  local nixExp="with (import <nixpkgs> {}); ${pkg}"
+  echo "$(nix-build -E "$nixExp" --no-out-link)${suffix}"
+}
+
+interpreter="$(get_pkg_out "stdenv.glibc" "/lib/ld-linux-x86-64.so.2")"
+echo "interpreter='$interpreter'"
+
+# For clangformat dep on 'libtinfo.so.5'.
+ncursesLibDir="$(get_pkg_out "ncurses5.out" "/lib")"
+echo "ncursesLibDir='$ncursesLibDir'"
+
+# For clanformat dep on 'libstdc++.so.6'.
+stdcppLibDir="$(get_pkg_out "stdenv.cc.cc.lib" "/lib")"
+echo "stdcppLibDir='$stdcppLibDir'"
+
+# For clangformat dep on 'libz.so.1'.
+zlibLibDir="$(get_pkg_out "zlib.out" "/lib")"
+echo "zlibLibDir='$zlibLibDir'"
+
+function patchelf_mono() {
+  local exe="$1"
+  patchelf --set-interpreter "$interpreter" "$exe"
+}
+
+function patchelf_clangformat() {
+  local exe="$1"
+  patchelf --set-interpreter "$interpreter" "$exe"
+  local rpath="$ncursesLibDir:$stdcppLibDir:$zlibLibDir"
+  patchelf --set-rpath "$rpath" "$exe"
+}
+
+function print_nix_version_clangtools() {
+  nixClangToolsBin="$(get_pkg_out "clang-tools" "/bin")"
+  echo "nixClangToolsBin='$nixClangToolsBin'"
+  $nixClangToolsBin/clang-format --version
+}
+
+function print_nix_version_mono() {
+  nixMonoBin="$(get_pkg_out "mono" "/bin")"
+  echo "nixMonoBin='$nixMonoBin'"
+  $nixMonoBin/mono --version
+}
+
diff --git a/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
new file mode 100644
index 000000000000..3a12a8bc0474
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/package-activation-events-0-16-1.json
@@ -0,0 +1,22 @@
+[
+"onLanguage:cpp",
+"onLanguage:c",
+"onCommand:extension.pickNativeProcess",
+"onCommand:extension.pickRemoteNativeProcess",
+"onCommand:C_Cpp.ConfigurationEdit",
+"onCommand:C_Cpp.ConfigurationSelect",
+"onCommand:C_Cpp.SwitchHeaderSource",
+"onCommand:C_Cpp.Navigate",
+"onCommand:C_Cpp.GoToDeclaration",
+"onCommand:C_Cpp.PeekDeclaration",
+"onCommand:C_Cpp.ToggleErrorSquiggles",
+"onCommand:C_Cpp.ToggleIncludeFallback",
+"onCommand:C_Cpp.ToggleDimInactiveRegions",
+"onCommand:C_Cpp.ShowReleaseNotes",
+"onCommand:C_Cpp.ResetDatabase",
+"onCommand:C_Cpp.PauseParsing",
+"onCommand:C_Cpp.ResumeParsing",
+"onCommand:C_Cpp.ShowParsingCommands",
+"onCommand:C_Cpp.TakeSurvey",
+"onDebug"
+]
\ No newline at end of file
diff --git a/pkgs/misc/vscode-extensions/cpptools/update_helper.sh b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh
new file mode 100755
index 000000000000..00ef77553242
--- /dev/null
+++ b/pkgs/misc/vscode-extensions/cpptools/update_helper.sh
@@ -0,0 +1,168 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -p coreutils -p jq -p unzip -i bash
+set -euo pipefail
+
+#
+# A little script to help maintaining this package. It will:
+#
+#  -  download the specified version of the extension to the store and print its url, packed store path and hash
+#  -  unpack the extension, bring it to the store and print its store path and hash
+#  -  fetch its runtimes dependencies from the 'package.json' file using the 'jq' utility, unpack those to the store
+#     and print its url store path and hash
+#  -  patch elf of the binaries that got a nix replacement
+#  -  bring the patched version to the store
+#  -  run their '--version' and call 'ldd'
+#  -  print the version of the runtime deps nix replacements.
+#
+# TODO: Print to a properly formated nix file all the required information to fetch everything (extension + runtime deps).
+# TODO: Print x86 and maybe darwin runtime dependencies.
+#
+
+scriptDir=$(cd "`dirname "$0"`"; pwd)
+echo "scriptDir='$scriptDir'"
+
+extPublisher="vscode"
+extName="cpptools"
+defaultExtVersion="0.16.1"
+extVersion="${1:-$defaultExtVersion}"
+
+echo
+echo "------------- Downloading extension ---------------"
+
+extZipStoreName="${extPublisher}-${extName}.zip"
+extUrl="https://ms-vscode.gallery.vsassets.io/_apis/public/gallery/publisher/ms-vscode/extension/cpptools/${extVersion}/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage"
+echo "extUrl='$extUrl'"
+storePathWithSha=$(nix-prefetch-url --name "$extZipStoreName" --print-path "$extUrl" 2> /dev/null)
+
+cpptoolsZipStorePath="$(echo "$storePathWithSha" | tail -n1)"
+cpptoolsZipSha256="$(echo "$storePathWithSha" | head -n1)"
+echo "cpptoolsZipStorePath='$cpptoolsZipStorePath'"
+echo "cpptoolsZipSha256='$cpptoolsZipSha256'"
+
+
+extStoreName="${extPublisher}-${extName}"
+
+
+function rm_tmpdir() {
+  #echo "Removing \`tmpDir='$tmpDir'\`"
+  rm -rf -- "$tmpDir"
+  unset tmpDir
+  trap - INT TERM HUP EXIT
+}
+function make_trapped_tmpdir() {
+  tmpDir=$(mktemp -d)
+  trap rm_tmpdir INT TERM HUP EXIT
+}
+
+echo
+echo "------------- Unpacked extension ---------------"
+
+make_trapped_tmpdir
+unzip -q -d "$tmpDir" "$cpptoolsZipStorePath"
+
+cpptoolsStorePath="$(nix add-to-store -n "$extStoreName" "$tmpDir")"
+cpptoolsSha256="$(nix hash-path --base32 --type sha512 "$cpptoolsStorePath")"
+echo "cpptoolsStorePath='$cpptoolsStorePath'"
+echo "cpptoolsSha256='$cpptoolsSha256'"
+
+rm_tmpdir
+
+storePathWithSha=$(nix-prefetch-url --print-path "file://${cpptoolsStorePath}/extension/package.json" 2> /dev/null)
+
+extPackageJSONStorePath="$(echo "$storePathWithSha" | tail -n1)"
+extPackageJSONSha256="$(echo "$storePathWithSha" | head -n1)"
+echo "extPackageJSONStorePath='$extPackageJSONStorePath'"
+echo "extPackageJSONSha256='$extPackageJSONSha256'"
+
+print_runtime_dep() {
+
+  local outName="$1"
+  local extPackageJSONStorePath="$2"
+  local depDesc="$3"
+
+  local urlRaw=$(cat "$extPackageJSONStorePath" | jq -r --arg desc "$depDesc" '.runtimeDependencies[] | select(.description == $desc) | .url')
+  local url=$(echo $urlRaw | xargs curl -Ls -o /dev/null -w %{url_effective})
+
+  local urlRawVarStr="${outName}_urlRaw='$urlRaw'"
+  local urlVarStr="${outName}_url='$url'"
+  echo "$urlRawVarStr"
+  echo "$urlVarStr"
+
+  local storePathWithSha="$(nix-prefetch-url --unpack --print-path "$url" 2> /dev/null)"
+
+  local storePath="$(echo "$storePathWithSha" | tail -n1)"
+  local sha256="$(echo "$storePathWithSha" | head -n1)"
+
+  local sha256VarStr="${outName}_sha256='$sha256'"
+  local storePathVarStr="${outName}_storePath='$storePath'"
+  echo "$sha256VarStr"
+  echo "$storePathVarStr"
+
+  eval "$urlRawVarStr"
+  eval "$urlVarStr"
+  eval "$sha256VarStr"
+  eval "$storePathVarStr"
+}
+
+echo
+echo "------------- Runtime dependencies ---------------"
+
+print_runtime_dep "langComponentBinaries" "$extPackageJSONStorePath" "C/C++ language components (Linux / x86_64)"
+print_runtime_dep "monoRuntimeBinaries" "$extPackageJSONStorePath" "Mono Runtime (Linux / x86_64)"
+print_runtime_dep "clanFormatBinaries" "$extPackageJSONStorePath" "ClangFormat (Linux / x86_64)"
+
+
+echo
+echo "------------- Runtime deps missing elf deps ---------------"
+
+source "$scriptDir/missing_elf_deps.sh"
+
+echo
+echo "------------- Runtime dep mono ---------------"
+
+make_trapped_tmpdir
+find "$monoRuntimeBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir"
+chmod -R a+rwx "$tmpDir"
+
+ls -la "$tmpDir/debugAdapters"
+
+patchelf_mono "$tmpDir/debugAdapters/mono.linux-x86_64"
+
+chmod a+x "$tmpDir/debugAdapters/mono.linux-x86_64"
+ldd "$tmpDir/debugAdapters/mono.linux-x86_64"
+"$tmpDir/debugAdapters/mono.linux-x86_64" --version
+
+monoRuntimeBinariesPatched_storePath="$(nix add-to-store -n "monoRuntimeBinariesPatched" "$tmpDir")"
+echo "monoRuntimeBinariesPatched_storePath='$monoRuntimeBinariesPatched_storePath'"
+
+rm_tmpdir
+
+
+echo
+echo "------------- Runtime dep clang ---------------"
+make_trapped_tmpdir
+find "$clanFormatBinaries_storePath" -mindepth 1 -maxdepth 1 | xargs -d '\n' cp -rp -t "$tmpDir"
+chmod -R a+rwx "$tmpDir"
+
+ls -la "$tmpDir/bin"
+
+patchelf_clangformat "$tmpDir/bin/clang-format"
+
+chmod a+x "$tmpDir/bin/clang-format"
+ldd "$tmpDir/bin/clang-format"
+"$tmpDir/bin/clang-format" --version
+
+
+clanFormatBinariesPatched_storePath="$(nix add-to-store -n "clanFormatBinariesPatched" "$tmpDir")"
+echo "clanFormatBinariesPatched_storePath='$clanFormatBinariesPatched_storePath'"
+
+rm_tmpdir
+
+echo
+echo "------------- Nix mono ---------------"
+print_nix_version_clangtools
+
+echo
+echo "------------- Nix mono ---------------"
+print_nix_version_mono
+
diff --git a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch b/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch
deleted file mode 100644
index 1873963f460d..000000000000
--- a/pkgs/misc/vscode-extensions/cpptools/vscode-cpptools-0-12-3-package-json.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff --git a/package.json b/package.json
-index 518e839..1c17c35 100644
---- a/package.json
-+++ b/package.json
-@@ -37,7 +37,26 @@
-     "Linters"
-   ],
-   "activationEvents": [
--    "*"
-+    "onLanguage:cpp",
-+    "onLanguage:c",
-+    "onCommand:extension.pickNativeProcess",
-+    "onCommand:extension.pickRemoteNativeProcess",
-+    "onCommand:extension.provideInitialConfigurations_cppvsdbg",
-+    "onCommand:extension.provideInitialConfigurations_cppdbg",
-+    "onCommand:C_Cpp.ConfigurationEdit",
-+    "onCommand:C_Cpp.ConfigurationSelect",
-+    "onCommand:C_Cpp.SwitchHeaderSource",
-+    "onCommand:C_Cpp.UnloadLanguageServer",
-+    "onCommand:C_Cpp.Navigate",
-+    "onCommand:C_Cpp.GoToDeclaration",
-+    "onCommand:C_Cpp.PeekDeclaration",
-+    "onCommand:C_Cpp.ToggleErrorSquiggles",
-+    "onCommand:C_Cpp.ToggleIncludeFallback",
-+    "onCommand:C_Cpp.ShowReleaseNotes",
-+    "onCommand:C_Cpp.ResetDatabase",
-+    "workspaceContains:.vscode/c_cpp_properties.json",
-+    "onDebug:cppdbg",
-+    "onDebug:cppvsdbg"
-   ],
-   "main": "./out/src/main",
-   "contributes": {
-@@ -281,8 +300,7 @@
-             "cpp"
-           ]
-         },
--        "runtime": "node",
--        "program": "./out/src/Debugger/Proxy/debugProxy.js",
-+        "program": "./debugAdapters/OpenDebugAD7",
-         "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217",
-         "variables": {
-           "pickProcess": "extension.pickNativeProcess",
-@@ -722,7 +740,29 @@
-               }
-             }
-           }
--        }
-+        },
-+        "configurationSnippets": [
-+          {
-+            "label": "C/C++: (gdb) Launch",
-+            "description": "Launch with gdb.",
-+            "bodyText": "{\n\t\"name\": \"(gdb) Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t    {\n\t        \"description\": \"Enable pretty-printing for gdb\",\n\t        \"text\": \"-enable-pretty-printing\",\n\t        \"ignoreFailures\": true\n\t    }\n\t]\n}"
-+          },
-+          {
-+            "label": "C/C++: (gdb) Attach",
-+            "description": "Attach with gdb.",
-+            "bodyText": "{ \n\t\"name\": \"(gdb) Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickProcess}\",\n\t\"MIMode\": \"gdb\"\n}"
-+          },
-+          {
-+            "label": "C/C++: (gdb) Pipe Launch",
-+            "description": "Pipe Launch with gdb.",
-+            "bodyText": "{\n\t\"name\": \"(gdb) Pipe Launch\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"launch\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"args\": [],\n\t\"stopAtEntry\": false,\n\t\"cwd\": \"\\${workspaceRoot}\",\n\t\"environment\": [],\n\t\"externalConsole\": true,\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\",\n\t\"setupCommands\": [\n\t    {\n\t        \"description\": \"Enable pretty-printing for gdb\",\n\t        \"text\": \"-enable-pretty-printing\",\n\t        \"ignoreFailures\": true\n\t    }\n\t]\n}"
-+          },
-+          {
-+            "label": "C/C++: (gdb) Pipe Attach",
-+            "description": "Pipe Attach with gdb.",
-+            "bodyText": "{\n\t\"name\": \"(gdb) Pipe Attach\",\n\t\"type\": \"cppdbg\",\n\t\"request\": \"attach\",\n\t\"program\": \"enter program name, for example \\${workspaceRoot}/a.out\",\n\t\"processId\": \"\\${command:pickRemoteProcess}\",\n\t\"pipeTransport\": {\n\t\t\"debuggerPath\": \"/usr/bin/gdb\",\n\t\t\"pipeProgram\": \"/usr/bin/ssh\",\n\t\t\"pipeArgs\": [],\n\t\t\"pipeCwd\": \"\"\n\t},\n\t\"MIMode\": \"gdb\"\n}"
-+          }
-+        ]
-       },
-       {
-         "type": "cppvsdbg",
-@@ -741,7 +781,7 @@
-         "variables": {
-           "pickProcess": "extension.pickNativeProcess"
-         },
--        "initialConfigurations": "extension.provideInitialConfigurations_cppvsdbg",
-+        "initialConfigurations": "",
-         "configurationAttributes": {
-           "launch": {
-             "required": [

From b99d7727b9acfdb80d85f4179423d7273d10d9a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 5 May 2018 07:27:10 +0200
Subject: [PATCH 1142/3370] python.pkgs.bootstrapped-pip: remove pkg_resources
 patch

---
 .../python-modules/bootstrapped-pip/default.nix        | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 28962d0c9361..e6f751714451 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -14,14 +14,6 @@ let
     sha256 = "8010754433e3211b9cdbbf784b50f30e80bf40fc6b05eb5f865fab83300599b8";
   };
 
-  # TODO: Shouldn't be necessary anymore for pip >= 10!
-  # https://github.com/NixOS/nixpkgs/issues/26392
-  # https://github.com/pypa/setuptools/issues/885
-  pkg_resources = fetchurl {
-    url = "https://raw.githubusercontent.com/pypa/setuptools/v36.0.1/pkg_resources/__init__.py";
-    sha256 = "1wdnq3mammk75mifkdmmjx7yhnpydvnvi804na8ym4mj934l2jkv";
-  };
-
 in stdenv.mkDerivation rec {
   pname = "pip";
   version = "10.0.1";
@@ -38,8 +30,6 @@ in stdenv.mkDerivation rec {
     unzip -d $out/${python.sitePackages} $src
     unzip -d $out/${python.sitePackages} ${setuptools_source}
     unzip -d $out/${python.sitePackages} ${wheel_source}
-    # TODO: Shouldn't be necessary anymore for pip >= 10!
-    cp ${pkg_resources} $out/${python.sitePackages}/pip/_vendor/pkg_resources/__init__.py
   '';
 
   patchPhase = ''

From c580919791d5eacde29a457030f69f09187dc2a4 Mon Sep 17 00:00:00 2001
From: Richard DW Redcroft <Richard@mythreed.com>
Date: Sat, 5 May 2018 06:29:03 +0100
Subject: [PATCH 1143/3370] houdini: 16.5.405 -> 16.5.439

* Update version 16.5.439

Update to version to 16.5.439 (current prod build)

* Update runtime.nix

forgot to update sha256
---
 pkgs/applications/misc/houdini/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 097386547f57..7477e5c0af2a 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -29,11 +29,11 @@ let
   license_dir = "~/.config/houdini";
 in
 stdenv.mkDerivation rec {
-  version = "16.5.405";
+  version = "16.5.439";
   name = "houdini-runtime-${version}";
   src = requireFile rec {
     name = "houdini-${version}-linux_x86_64_gcc4.8.tar.gz";
-    sha256 = "14i0kzv881jqd5z9jshri1fxxi3pkxdmi5l4p2b51c9i3apsxmw6";
+    sha256 = "7e483072a0e6e751a93f2a2f968cccb2d95559c61106ffeb344c95975704321b";
     message = ''
       This nix expression requires that ${name} is already part of the store.
       Download it from https://sidefx.com and add it to the nix store with:

From 21b926003d50f2f2365f234b9a0bf911607287d2 Mon Sep 17 00:00:00 2001
From: bricewge <brice.wge@gmail.com>
Date: Sat, 5 May 2018 07:29:44 +0200
Subject: [PATCH 1144/3370] sshguard: service creates /var/lib/sshguard

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

diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix
index 7f09e8893c4d..137c3d610186 100644
--- a/nixos/modules/services/security/sshguard.nix
+++ b/nixos/modules/services/security/sshguard.nix
@@ -133,6 +133,7 @@ in {
             ReadOnlyDirectories = "/";
             ReadWriteDirectories = "/run/sshguard /var/lib/sshguard";
             RuntimeDirectory = "sshguard";
+            StateDirectory = "sshguard";
             CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW";
          };
       };

From 9f1da665876cdd4f68750a2241d2bd5fc203f275 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sat, 5 May 2018 08:33:20 +0300
Subject: [PATCH 1145/3370] ndppd module: init (#35533)

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/networking/ndppd.nix   | 47 +++++++++++++++++++
 .../applications/networking/ndppd/default.nix | 19 +++++++-
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/networking/ndppd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 26804d3682de..cb4c09176789 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -515,6 +515,7 @@
   ./services/networking/murmur.nix
   ./services/networking/namecoind.nix
   ./services/networking/nat.nix
+  ./services/networking/ndppd.nix
   ./services/networking/networkmanager.nix
   ./services/networking/nftables.nix
   ./services/networking/ngircd.nix
diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix
new file mode 100644
index 000000000000..1d6c48dd8d37
--- /dev/null
+++ b/nixos/modules/services/networking/ndppd.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.ndppd;
+
+  configFile = pkgs.runCommand "ndppd.conf" {} ''
+    substitute ${pkgs.ndppd}/etc/ndppd.conf $out \
+      --replace eth0 ${cfg.interface} \
+      --replace 1111:: ${cfg.network}
+  '';
+in {
+  options = {
+    services.ndppd = {
+      enable = mkEnableOption "daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces";
+      interface = mkOption {
+        type = types.string;
+        default = "eth0";
+        example = "ens3";
+        description = "Interface which is on link-level with router.";
+      };
+      network = mkOption {
+        type = types.string;
+        default = "1111::";
+        example = "2001:DB8::/32";
+        description = "Network that we proxy.";
+      };
+      configFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = "Path to configuration file.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.packages = [ pkgs.ndppd ];
+    environment.etc."ndppd.conf".source = if (cfg.configFile != null) then cfg.configFile else configFile;
+    systemd.services.ndppd = {
+      serviceConfig.RuntimeDirectory = [ "ndppd" ];
+      wantedBy = [ "multi-user.target" ];
+    };
+  };
+
+  meta.maintainers = with maintainers; [ gnidorah ];
+}
diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix
index 5314d3668eb0..a5eb9021048e 100644
--- a/pkgs/applications/networking/ndppd/default.nix
+++ b/pkgs/applications/networking/ndppd/default.nix
@@ -1,6 +1,11 @@
-{ stdenv, fetchFromGitHub, gzip, ... }:
+{ stdenv, fetchFromGitHub, fetchurl, gzip, ... }:
 
-stdenv.mkDerivation rec {
+let
+  serviceFile = fetchurl {
+    url = "https://raw.githubusercontent.com/DanielAdolfsson/ndppd/f37e8eb33dc68b3385ecba9b36a5efd92755580f/ndppd.service";
+    sha256 = "1zf54pzjfj9j9gr48075njqrgad4myd3dqmhvzxmjy4gjy9ixmyh";
+  };
+in stdenv.mkDerivation rec {
   name = "ndppd-${version}";
   version = "0.2.5";
 
@@ -19,6 +24,16 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace /bin/gzip ${gzip}/bin/gzip
   '';
 
+  postInstall = ''
+    mkdir -p $out/etc
+    cp ndppd.conf-dist $out/etc/ndppd.conf
+
+    mkdir -p $out/lib/systemd/system
+    # service file needed for our module is not in release yet
+    substitute ${serviceFile} $out/lib/systemd/system/ndppd.service \
+      --replace /usr/sbin/ndppd $out/sbin/ndppd
+  '';
+
   meta = {
     description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces";
     homepage = https://github.com/DanielAdolfsson/ndppd;

From f13cf52a843f2bca9ecdeb6f58db0b20244672f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 5 May 2018 07:36:39 +0200
Subject: [PATCH 1146/3370] python.pkgs.bootstrapped-pip: wheel: 0.30.0 ->
 0.31.0

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

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index e6f751714451..250703cbc53b 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -3,9 +3,9 @@
 let
   wheel_source = fetchPypi {
     pname = "wheel";
-    version = "0.30.0";
+    version = "0.31.0";
     format = "wheel";
-    sha256 = "e721e53864f084f956f40f96124a74da0631ac13fbbd1ba99e8e2b5e9cafdf64";
+    sha256 = "9cdc8ab2cc9c3c2e2727a4b67c22881dbb0e1c503d592992594c5e131c867107";
   };
   setuptools_source = fetchPypi {
     pname = "setuptools";

From 34a71a80b8fb74cb07b7239845a667172e0d374f Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 5 May 2018 01:29:39 -0500
Subject: [PATCH 1147/3370] foundationdb: rename jar file to match upstream

And don't install the fdb_java.so file: it's already included inside of
the jar itself.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/servers/foundationdb/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix
index b1745dd53716..5ebb510be467 100644
--- a/pkgs/servers/foundationdb/default.nix
+++ b/pkgs/servers/foundationdb/default.nix
@@ -56,14 +56,12 @@ let
           mkdir -vp $out/{bin,libexec/plugins} $lib/{lib,share/java} $dev/include/foundationdb
 
           cp -v ./lib/libfdb_c.so     $lib/lib
-          cp -v ./lib/libfdb_java.so  $lib/lib
-
           cp -v ./lib/libFDBLibTLS.so $out/libexec/plugins/FDBLibTLS.so
 
           cp -v ./bindings/c/foundationdb/fdb_c.h           $dev/include/foundationdb
           cp -v ./bindings/c/foundationdb/fdb_c_options.g.h $dev/include/foundationdb
 
-          cp -v ./bindings/java/foundationdb-client.jar     $lib/share/java
+          cp -v ./bindings/java/foundationdb-client.jar     $lib/share/java/fdb-java.jar
 
           for x in fdbbackup fdbcli fdbserver fdbmonitor; do
             cp -v "./bin/$x" $out/bin;

From b79d1e803154cc29debedb7ed4c1aa3de05e2af5 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Sat, 5 May 2018 02:32:09 -0400
Subject: [PATCH 1148/3370] platformio: add git to chroot so it is usable by
 platformio command

---
 pkgs/development/arduino/platformio/chrootenv.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/arduino/platformio/chrootenv.nix b/pkgs/development/arduino/platformio/chrootenv.nix
index f46e705fb901..ae68e84ab1c2 100644
--- a/pkgs/development/arduino/platformio/chrootenv.nix
+++ b/pkgs/development/arduino/platformio/chrootenv.nix
@@ -20,6 +20,7 @@ let
       };
     in (with pkgs; [
       zlib
+      git
     ]) ++ (with python.pkgs; [
       python
       setuptools

From d25607c79db9fca7f1c8696b792e376b42fb2ecb Mon Sep 17 00:00:00 2001
From: Unknown <iulian.meghea@gmail.com>
Date: Sat, 5 May 2018 11:22:23 +0300
Subject: [PATCH 1149/3370] Fix pci_get_bus_and_slot removed in kernel 4.17

---
 .../virtualization/virtualbox/default.nix      |  4 +---
 .../virtualization/virtualbox/kernpcidev.patch | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/virtualization/virtualbox/kernpcidev.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index ca0520f32a8f..d09a30f98a74 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -94,9 +94,7 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-  ++ [ ./qtx11extras.patch ];
-
-
+  ++ [ ./qtx11extras.patch ./kernpcidev.patch ];
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch
new file mode 100644
index 000000000000..5192227d7d01
--- /dev/null
+++ b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch
@@ -0,0 +1,18 @@
+diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+index b8019f7..b7d2e39 100644
+--- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
++++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
+@@ -73,8 +73,11 @@ MODULE_LICENSE("GPL");
+ MODULE_VERSION(VBOX_VERSION_STRING);
+ #endif
+ 
+-
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
++# define PCI_DEV_GET(v,d,p)            pci_get_device(v,d,p)
++# define PCI_DEV_PUT(x)                pci_dev_put(x)
++# define PCI_DEV_GET_SLOT(bus, devfn)  pci_get_domain_bus_and_slot(0, bus, devfn)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+ # define PCI_DEV_GET(v,d,p)            pci_get_device(v,d,p)
+ # define PCI_DEV_PUT(x)                pci_dev_put(x)
+ # define PCI_DEV_GET_SLOT(bus, devfn)  pci_get_bus_and_slot(bus, devfn)

From 43650115e34ea610e53f718d9e02de7222ac0ba2 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <git@danielschaefer.me>
Date: Sat, 5 May 2018 15:41:28 +0700
Subject: [PATCH 1150/3370] nixos/documentation: Correct use of lib.optional

lib.optional returns a singleton or an empty list. Therefore the
argument does not need to be wrapped in a list.
An alternative patch could have used lib.optionals but seems like no
more elements are going to be added to the optional list.
---
 nixos/modules/misc/documentation.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index 2e426c017080..b482a5a67523 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -75,20 +75,20 @@ let cfg = config.documentation; in
     (mkIf cfg.man.enable {
       environment.systemPackages = [ pkgs.man-db ];
       environment.pathsToLink = [ "/share/man" ];
-      environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable [ "devman" ];
+      environment.extraOutputsToInstall = [ "man" ] ++ optional cfg.dev.enable "devman";
     })
 
     (mkIf cfg.info.enable {
       environment.systemPackages = [ pkgs.texinfoInteractive ];
       environment.pathsToLink = [ "/share/info" ];
-      environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable [ "devinfo" ];
+      environment.extraOutputsToInstall = [ "info" ] ++ optional cfg.dev.enable "devinfo";
     })
 
     (mkIf cfg.doc.enable {
       # TODO(@oxij): put it here and remove from profiles?
       # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
       environment.pathsToLink = [ "/share/doc" ];
-      environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable [ "devdoc" ];
+      environment.extraOutputsToInstall = [ "doc" ] ++ optional cfg.dev.enable "devdoc";
     })
 
   ]);

From 3cce9b107a7531c52e8b85bba33ec396d2fefda6 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sat, 5 May 2018 19:53:40 +1000
Subject: [PATCH 1151/3370] nix-pin: 0.2.2 -> 0.3.0

---
 pkgs/tools/package-management/nix-pin/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index bb3a1faa0c3b..6f109cd9f413 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,20 +1,22 @@
-{ pkgs, stdenv, fetchFromGitHub, mypy, python3 }:
+{ lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.2.2";
+  version = "0.3.0";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.2.2";
-    sha256 = "1kw43kzy4m6lnnif51r2a8i4vcgr7d4vqb1c75p7pk2b9y3jwxsz";
+    rev = "version-0.3.0";
+    sha256 = "1kq50v8m8y1wji63b7y3wh6nv3ahvdxvvbsb07day2zzf5ysy8kj";
   };
-  buildInputs = [ python3 mypy ];
+  buildInputs = [ python3 mypy makeWrapper ];
   buildPhase = ''
     mypy bin/*
   '';
   installPhase = ''
     mkdir "$out"
     cp -r bin share "$out"
+    wrapProgram $out/bin/nix-pin \
+      --prefix PATH : "${lib.makeBinPath [ nix git ]}"
   '';
   passthru =
     let

From edbf4b0eb2c3c8788451f50bbe4e9170267e50e2 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 5 May 2018 11:37:37 +0200
Subject: [PATCH 1152/3370] powerline-rs: init at 0.1.6

---
 maintainers/maintainer-list.nix          |  5 +++++
 pkgs/tools/misc/powerline-rs/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/misc/powerline-rs/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4b584e6a1151..9369a76688cb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1740,6 +1740,11 @@
     github = "jdagilliland";
     name = "Jason Gilliland";
   };
+  jD91mZM2 = {
+    email = "me@krake.one";
+    github = "jD91mZM2";
+    name = "jD91mZM2";
+  };
   jefdaj = {
     email = "jefdaj@gmail.com";
     github = "jefdaj";
diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
new file mode 100644
index 000000000000..1a386a9f6193
--- /dev/null
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -0,0 +1,25 @@
+{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }:
+rustPlatform.buildRustPackage rec {
+  name = "powerline-rs-${version}";
+  version = "0.1.6";
+
+  src = fetchFromGitHub {
+    owner = "jD91mZM2";
+    repo = "powerline-rs";
+    rev = version;
+
+    sha256 = "11rhirnk8zh4vf00df9cgy9vw5h8n7kgnhjbjbnlpl9i6wal9nvl";
+  };
+
+  cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
+
+  nativeBuildInputs = [ pkgconfig file perl cmake ];
+  buildInputs = [ libgit2 ];
+  propagatedBuildInputs = [ openssl_1_1_0 libssh2 libzip ];
+
+  meta = with lib; {
+    description = "powerline-shell rewritten in Rust, inspired by powerline-go";
+    maintainers = with maintainers; [ jD91mZM2 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24b33231f77e..ffed1c356f61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14574,6 +14574,8 @@ with pkgs;
 
   powerline-go = callPackage ../tools/misc/powerline-go { };
 
+  powerline-rs = callPackage ../tools/misc/powerline-rs { };
+
   profont = callPackage ../data/fonts/profont { };
 
   proggyfonts = callPackage ../data/fonts/proggyfonts { };

From 9f31a4d622ad760fd33223297acec4ba8bb84347 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 7 Jan 2018 17:54:08 +0200
Subject: [PATCH 1153/3370] nano-wallet: init at 12.1

---
 .../altcoins/nano-wallet/CMakeLists.txt.patch | 13 +++++
 .../altcoins/nano-wallet/default.nix          | 57 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
 create mode 100644 pkgs/applications/altcoins/nano-wallet/default.nix

diff --git a/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
new file mode 100644
index 000000000000..5bbec1d39bea
--- /dev/null
+++ b/pkgs/applications/altcoins/nano-wallet/CMakeLists.txt.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b43f02f6..4470abbf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -119,7 +119,7 @@ endif (RAIBLOCKS_SECURE_RPC)
+ 
+ include_directories (${CMAKE_SOURCE_DIR})
+ 
+-set(Boost_USE_STATIC_LIBS        ON)
++add_definitions(-DBOOST_LOG_DYN_LINK)
+ set(Boost_USE_MULTITHREADED      ON)
+ 
+ if (BOOST_CUSTOM)
diff --git a/pkgs/applications/altcoins/nano-wallet/default.nix b/pkgs/applications/altcoins/nano-wallet/default.nix
new file mode 100644
index 000000000000..8c4722bd9917
--- /dev/null
+++ b/pkgs/applications/altcoins/nano-wallet/default.nix
@@ -0,0 +1,57 @@
+{lib, pkgs, stdenv, fetchFromGitHub, cmake, pkgconfig, boost, libGL, qtbase}:
+
+stdenv.mkDerivation rec {
+
+  name = "nano-wallet-${version}";
+  version = "12.1";
+
+  src = fetchFromGitHub {
+    owner = "nanocurrency";
+    repo = "raiblocks";
+    rev = "V${version}";
+    sha256 = "10ng7qn6y31s2bjahmpivw2plx90ljjjzb87j3l7zmppsjd2iq03";
+    fetchSubmodules = true;
+  };
+
+  # Use a patch to force dynamic linking
+  patches = [
+    ./CMakeLists.txt.patch
+  ];
+
+  cmakeFlags = let
+    options = {
+      BOOST_ROOT = "${boost}";
+      Boost_USE_STATIC_LIBS = "OFF";
+      RAIBLOCKS_GUI = "ON";
+      RAIBLOCKS_TEST = "ON";
+      Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
+      Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core";
+      Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui";
+      Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets";
+    };
+    optionToFlag = name: value: "-D${name}=${value}";
+  in lib.mapAttrsToList optionToFlag options;
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ boost libGL qtbase ];
+
+  buildPhase = ''
+    make nano_wallet
+  '';
+
+  checkPhase = ''
+    ./core_test
+  '';
+
+  meta = {
+    inherit version;
+    description = "Wallet for Nano cryptocurrency";
+    homepage = https://nano.org/en/wallet/;
+    license = lib.licenses.bsd2;
+    # Fails on Darwin. See:
+    # https://github.com/NixOS/nixpkgs/pull/39295#issuecomment-386800962
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ jluttine ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 849a90cd6f96..0d4a7b893bf1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3846,6 +3846,8 @@ with pkgs;
 
   namazu = callPackage ../tools/text/namazu { };
 
+  nano-wallet = libsForQt5.callPackage ../applications/altcoins/nano-wallet { };
+
   nasty = callPackage ../tools/security/nasty { };
 
   nat-traverse = callPackage ../tools/networking/nat-traverse { };

From 4feaecc23de45b37a3ca1f4b886b951d0be6d8f1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 3 May 2018 13:56:23 +0200
Subject: [PATCH 1154/3370] evolution-data-server: fix SSL support on non-GNOME
 platforms

---
 .../core/evolution-data-server/default.nix       | 16 ++++------------
 1 file changed, 4 insertions(+), 12 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 01891ad82473..2e87c4a44a1b 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -1,6 +1,6 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python3, dconf, gobjectIntrospection
+{ fetchurl, stdenv, pkgconfig, gnome3, python3, gobjectIntrospection
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11-kit, db, nspr, nss, libical, gperf, makeWrapper
+, p11-kit, db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking
 , vala, cmake, ninja, kerberos, openldap, webkitgtk, libaccounts-glib, json-glib }:
 
 stdenv.mkDerivation rec {
@@ -15,12 +15,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cmake ninja pkgconfig intltool python3 gperf makeWrapper gobjectIntrospection vala
+    cmake ninja pkgconfig intltool python3 gperf wrapGAppsHook gobjectIntrospection 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
+    icu sqlite kerberos openldap webkitgtk glib-networking
   ];
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];
@@ -36,14 +36,6 @@ stdenv.mkDerivation rec {
     cmakeFlags="-DINCLUDE_INSTALL_DIR=$dev/include $cmakeFlags"
   '';
 
-  preFixup = ''
-    for f in $(find $out/libexec/ -type f -executable); do
-      wrapProgram "$f" \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-        --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"
-    done
-  '';
-
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = "evolution-data-server";

From 8e18b7c409600faf9b60685944a00fb1bb4f1c3f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 5 May 2018 15:24:03 +0200
Subject: [PATCH 1155/3370] sublime: re-introduce accidentally removed
 attribute

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 849a90cd6f96..aa84c64e8dd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17948,6 +17948,8 @@ with pkgs;
     inherit sbcl lispPackages;
   };
 
+  sublime = callPackage ../applications/editors/sublime/2 { };
+
   sublime3Packages = recurseIntoAttrs (callPackage ../applications/editors/sublime/3/packages.nix { });
 
   sublime3 = sublime3Packages.sublime3;

From 558c8a280fe7cec13c728c44fdbc3c92861fa9db Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Sat, 5 May 2018 15:26:44 +0200
Subject: [PATCH 1156/3370] eid-mw: 4.1.19 -> 4.3.7

Urgent version bump as tax season is coming and 4.1.19 is not compatible
with firefox anymore.
---
 pkgs/tools/security/eid-mw/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index a11b70917c8d..02e5e77c33e2 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.1.19";
+  version = "4.3.7";
 
   src = fetchFromGitHub {
     sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5";
@@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
       and remove all ~/.pki and/or /etc/pki directories no longer needed.
     '';
     platforms = platforms.linux;
+    maintainers = with maintainers; [ bfortz ];
   };
 }

From c462aa070659925c449750a1921e00b9cae7fbf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= <felix@alternativebit.fr>
Date: Sat, 5 May 2018 16:46:27 +0200
Subject: [PATCH 1157/3370] maria-db: Fix mariadb_config include path.

Fixes #39984.

Co-authored-by: Ekaitz Zarraga <ekaitz.zarraga@protonmail.com>
---
 pkgs/servers/sql/mariadb/default.nix             |  2 +-
 pkgs/servers/sql/mariadb/include-dirs-path.patch | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/sql/mariadb/include-dirs-path.patch

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index a9de5508371a..170cc6c84a6a 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -34,7 +34,7 @@ common = rec { # attributes common to both builds
     sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
   '';
 
-  patches = [ ./cmake-includedir.patch ]
+  patches = [ ./cmake-includedir.patch ./include-dirs-path.patch ]
     ++ stdenv.lib.optional stdenv.cc.isClang ./clang-isfinite.patch;
 
   cmakeFlags = [
diff --git a/pkgs/servers/sql/mariadb/include-dirs-path.patch b/pkgs/servers/sql/mariadb/include-dirs-path.patch
new file mode 100644
index 000000000000..8d468cf546a4
--- /dev/null
+++ b/pkgs/servers/sql/mariadb/include-dirs-path.patch
@@ -0,0 +1,13 @@
+diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in
+index 45d2f4e..e5666db 100644
+--- a/libmariadb/mariadb_config/mariadb_config.c.in
++++ b/libmariadb/mariadb_config/mariadb_config.c.in
+@@ -5,7 +5,7 @@
+ 
+ static char *mariadb_progname;
+ 
+-#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
++#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mysql"
+ #define LIBS    "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@"
+ #define LIBS_SYS "@extra_dynamic_LDFLAGS@"
+ #define CFLAGS  INCLUDE

From 0c4f72c377ff0042aafe9d083692c8b15bdde70a Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Sat, 5 May 2018 17:48:36 +0200
Subject: [PATCH 1158/3370] eid-mw: 4.1.19 -> 4.4.1

Urgent version bump as tax season is coming and 4.1.19 is not compatible
with firefox anymore.

eid-viewer was merged upstream with eid-mw, so it is included here now.
---
 pkgs/tools/security/eid-mw/default.nix     | 17 ++++++---
 pkgs/tools/security/eid-viewer/default.nix | 42 ----------------------
 pkgs/top-level/all-packages.nix            |  2 --
 3 files changed, 13 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/tools/security/eid-viewer/default.nix

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 02e5e77c33e2..39090a19582e 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,20 +1,29 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig
-, gtk3, nssTools, pcsclite }:
+, gtk3, nssTools, pcsclite
+, libxml2, libproxy 
+, openssl, curl }:
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.3.7";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
-    sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5";
+    sha256 = "0an7xgj5rzl75kq6qfrmm886v639hhlh7c9yfs8iihc47wghpma8"; 
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ gtk3 pcsclite ];
+  buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];
+  preConfigure = ''
+    mkdir openssl
+    ln -s ${openssl.out}/lib openssl
+    ln -s ${openssl.bin}/bin openssl
+    ln -s ${openssl.dev}/include openssl
+    export SSL_PREFIX=$(realpath openssl)
+    '';
 
   postPatch = ''
     sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
deleted file mode 100644
index 10cc314fe1db..000000000000
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, jre, pcsclite }:
-
-stdenv.mkDerivation rec {
-  name = "eid-viewer-${version}";
-  version = "4.1.9";
-
-  src = fetchurl {
-    url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz";
-    sha256 = "0bq9jl4kl97j0dfhz4crcb1wqhn420z5vpg510zadvrmqjhy1x4g";
-  };
-
-  buildInputs = [ jre pcsclite ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  unpackPhase = "tar -xzf ${src} --strip-components=1";
-
-  preConfigure = ''
-    substituteInPlace eid-viewer.sh.in --replace "exec java" "exec ${jre}/bin/java"
-  '';
-
-  postInstall = ''
-    wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib
-    cat >> $out/share/applications/eid-viewer.desktop << EOF
-    # eid-viewer creates XML without a header, making it "plain text":
-    MimeType=application/xml;text/xml;text/plain
-    EOF
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "Belgian electronic identity card (eID) viewer";
-    homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
-    license = licenses.lgpl3;
-    longDescription = ''
-      A simple, graphical Java application to view, print and save data from
-      Belgian electronic identity cards. Independent of the eid-mw package,
-      which is required to actually use your eID for authentication or signing.
-    '';
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 849a90cd6f96..608f6097a2b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2108,8 +2108,6 @@ with pkgs;
 
   eid-mw = callPackage ../tools/security/eid-mw { };
 
-  eid-viewer = callPackage ../tools/security/eid-viewer { };
-
   mcrcon = callPackage ../tools/networking/mcrcon {};
 
   tealdeer = callPackage ../tools/misc/tealdeer/default.nix { };

From bc828721ed4ac138d791de47469a40e39046fb4a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 5 May 2018 19:02:50 +0300
Subject: [PATCH 1159/3370] nixos/lib/make-ext4-fs: Add a sanity check

I ended up with a corrupted image with the debugfs contraption once, and
given I couldn't reproduce the problem I suppose that happens if the
filesystem of the builder runs out of space.

At least in this instance fsck could detect it, so let's add it as a
sanity check.
---
 nixos/lib/make-ext4-fs.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 986d80ff1b99..4095d9c6d00d 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -14,7 +14,7 @@ in
 pkgs.stdenv.mkDerivation {
   name = "ext4-fs.img";
 
-  nativeBuildInputs = with pkgs; [e2fsprogs libfaketime perl];
+  nativeBuildInputs = with pkgs; [e2fsprogs.bin libfaketime perl];
 
   buildCommand =
     ''
@@ -83,5 +83,12 @@ pkgs.stdenv.mkDerivation {
         echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
         return 1
       fi
+
+      # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
+      if ! fsck.ext4 -n -f $out; then
+        echo "--- Fsck failed for EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
+        cat errorlog
+        return 1
+      fi
     '';
 }

From c6a82cc40c3092a056768415c25ba6d93cbfde27 Mon Sep 17 00:00:00 2001
From: Jon Banafato <jon@jonafato.com>
Date: Fri, 4 May 2018 20:56:43 -0400
Subject: [PATCH 1160/3370] liferea: 1.12.2 -> 1.12.3

New patch release. Changelog at
https://github.com/lwindolf/liferea/releases/tag/v1.12.3.
---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 0b8a584fc6a6..74d59c05ec91 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "liferea";
-  version = "1.12.2";
+  version = "1.12.3";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "18mz1drp6axvjbr9jdw3i0ijl3l2m191198p4c93qnm7g96ldh15";
+    sha256 = "0wm2c8qrgnadq63fivai53xm7vl05wgxc0nk39jcriscdikzqpcg";
   };
 
   nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ];

From 7ac652df4b151f62b9627522a11c3937fb137603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 3 May 2018 17:06:37 +0100
Subject: [PATCH 1161/3370] john: disable aarch64

---
 pkgs/tools/security/john/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix
index 7552b21ed333..e55e97656f63 100644
--- a/pkgs/tools/security/john/default.nix
+++ b/pkgs/tools/security/john/default.nix
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     homepage = https://github.com/magnumripper/JohnTheRipper/;
     maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
+    platforms = [ "x86_64-linux" "x86_64-darwin"];
   };
 }

From b53182b437eaed25c24ba29aaf14d492674e457d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sat, 5 May 2018 20:37:37 +0200
Subject: [PATCH 1162/3370] plasma5: 5.12.4 -> 5.12.5

---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 352 ++++++++++++++++----------------
 2 files changed, 177 insertions(+), 177 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 117401b0eab1..c73598f03d02 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.4/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.12.5/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index df031ba06275..cc1fdb889207 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,355 +3,355 @@
 
 {
   bluedevil = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/bluedevil-5.12.4.tar.xz";
-      sha256 = "1gr7zrs2h3xk6rc16wqh2fx40q6q2vm5nwk2fy9r6z639wyxhk2x";
-      name = "bluedevil-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/bluedevil-5.12.5.tar.xz";
+      sha256 = "0rjxvvg64g4panri4f09fgm571igdijfh92jp616pcqw8v1xqp2a";
+      name = "bluedevil-5.12.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-5.12.4.tar.xz";
-      sha256 = "12baji960mfkb9ynkhz6c2a76m8fwx4kvzwifwn40sxqv5m857w7";
-      name = "breeze-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-5.12.5.tar.xz";
+      sha256 = "1xxgyq3lhliv6p54akgpclficbcs2xdv15a92jkl8a2s9wbisk3n";
+      name = "breeze-5.12.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-grub-5.12.4.tar.xz";
-      sha256 = "0jnpwznhfml9mshx9zl9wsi8s6ygfplfw4bycq1r9gyxzlcm9zvs";
-      name = "breeze-grub-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-grub-5.12.5.tar.xz";
+      sha256 = "1w9f2xm4abqcqk2pdb7hi7d4hd1krkhrs9j3zlncxahfvf67ljad";
+      name = "breeze-grub-5.12.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-gtk-5.12.4.tar.xz";
-      sha256 = "183pj18ldhql845xd2lvd4klp6m2xiiaszprw83n7048s9b0bk4c";
-      name = "breeze-gtk-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-gtk-5.12.5.tar.xz";
+      sha256 = "0040z43r69kk8l90mvkk8xxzhaw35xm7z2w097sp8xd053y3pdqd";
+      name = "breeze-gtk-5.12.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/breeze-plymouth-5.12.4.tar.xz";
-      sha256 = "1apv2jqcjmsfvj4xi736vqsly57wwzxv088hsqcryv3l4v4qkyfr";
-      name = "breeze-plymouth-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/breeze-plymouth-5.12.5.tar.xz";
+      sha256 = "15204zqk81rwmdq07jzaiv2aninbbgqmg76dhzcz43lckjfhczq9";
+      name = "breeze-plymouth-5.12.5.tar.xz";
     };
   };
   discover = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/discover-5.12.4.tar.xz";
-      sha256 = "1gyddpafis1yfhh1dz0zvjca8pxnq5z0xvwfbmyh062xmhfy66wq";
-      name = "discover-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/discover-5.12.5.tar.xz";
+      sha256 = "02fjs016825l35gc173mblii2x9ys5cisqw8niyyvllsls4rp27m";
+      name = "discover-5.12.5.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/drkonqi-5.12.4.tar.xz";
-      sha256 = "0ijrhd689w6pg4biikfv7w6h5hwfjmsp7wcbpd2dq0xwjp3vnyb6";
-      name = "drkonqi-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/drkonqi-5.12.5.tar.xz";
+      sha256 = "0av0rqgc5a9c8lvpdphp3ifw56qc10qkbjhajlslagxswys73cfq";
+      name = "drkonqi-5.12.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kactivitymanagerd-5.12.4.tar.xz";
-      sha256 = "1llni6dz8014r8gaihnaxg0nn6ihjvqy7bfyigfda6iz5gwfbpcg";
-      name = "kactivitymanagerd-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kactivitymanagerd-5.12.5.tar.xz";
+      sha256 = "1mpldy47fklm9d91wjj734yw3j3pkfrj377b9c5d8l07agwnk2j1";
+      name = "kactivitymanagerd-5.12.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kde-cli-tools-5.12.4.tar.xz";
-      sha256 = "0w6iz9rqi9b6vy18jxksah5lr44211dhfgaxccm0gmggqpiqm5wb";
-      name = "kde-cli-tools-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kde-cli-tools-5.12.5.tar.xz";
+      sha256 = "0gs0d9p2x3q6pvjj6l7f9xq741rfqgzhbxwvz1s3cx385b85lplh";
+      name = "kde-cli-tools-5.12.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kdecoration-5.12.4.tar.xz";
-      sha256 = "0njs3b05hvm5s04cfn56dc98yc8sw52hwlclx0qf1hqcsjmm8bnj";
-      name = "kdecoration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kdecoration-5.12.5.tar.xz";
+      sha256 = "0qd5pqm3s1wcmy49mry2plzivg6dhmdp521yahx0mmlk2bssxc3d";
+      name = "kdecoration-5.12.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kde-gtk-config-5.12.4.tar.xz";
-      sha256 = "00j2279z4b9qknip4rpaliwpwv25g3d6j9s0ajs151x94cl18wd6";
-      name = "kde-gtk-config-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kde-gtk-config-5.12.5.tar.xz";
+      sha256 = "1p5vpk85v50dkm787ljf77xa7f25lamxf5jn2qc31r8dnlc25dnh";
+      name = "kde-gtk-config-5.12.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kdeplasma-addons-5.12.4.tar.xz";
-      sha256 = "0ggvxmsj4r25sjaap377i6ap2qkdhjqwslcjym9bcyys1lldbcg5";
-      name = "kdeplasma-addons-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kdeplasma-addons-5.12.5.tar.xz";
+      sha256 = "1339sapqi0b6pzbsdyhpfssrvfg9sfc3amlfijxsn63swkjvbw2s";
+      name = "kdeplasma-addons-5.12.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kgamma5-5.12.4.tar.xz";
-      sha256 = "1v19ay77vv8y37pxqainkrlh0lpajwxgx4xxra84gzd8g7l4zs0h";
-      name = "kgamma5-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kgamma5-5.12.5.tar.xz";
+      sha256 = "0p4x8vzjngw7xxnnviiqw89lzs23nrq007211dprnfzgay9c571c";
+      name = "kgamma5-5.12.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/khotkeys-5.12.4.tar.xz";
-      sha256 = "1lj8axpimh34vbpgwnfhkh3f7njmqy7jihqk51vkq7ngcy1bmd6f";
-      name = "khotkeys-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/khotkeys-5.12.5.tar.xz";
+      sha256 = "1yivh10g66h9dmnabnxx1i26rpg8wf9ibpmc7jcmh7j4h5q0lkzg";
+      name = "khotkeys-5.12.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kinfocenter-5.12.4.tar.xz";
-      sha256 = "0dgybc8xa5lxgmw3nxfh5y085921qm5x6aw0233mwx3zj4v6nsj3";
-      name = "kinfocenter-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kinfocenter-5.12.5.tar.xz";
+      sha256 = "1g42hk49fjg4rvgvy5phshk8mna3idh55gn4cy1w0q2rl8f0y6b5";
+      name = "kinfocenter-5.12.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kmenuedit-5.12.4.tar.xz";
-      sha256 = "063509xbvpk2n86anpl2kcsb1v4zvx6ycwl1ppyjhgg4jim9p099";
-      name = "kmenuedit-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kmenuedit-5.12.5.tar.xz";
+      sha256 = "0vbq2s1ibqna19njw421ai4qwq4apww74qcfgk7gwd6p75k37lkw";
+      name = "kmenuedit-5.12.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kscreen-5.12.4.tar.xz";
-      sha256 = "1pix8gfvgig5phvcqjc7yqvn1pgmdn6l8g56n06pijicrpksq315";
-      name = "kscreen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kscreen-5.12.5.tar.xz";
+      sha256 = "1cscy7vimznwy29qr0x11wqxlxcwxvybdhw703mj44bq1szw8s0l";
+      name = "kscreen-5.12.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kscreenlocker-5.12.4.tar.xz";
-      sha256 = "187c6azmbcfs5w18f450f75hikpvh3lhz7qn8zb93kfm65yvjz1m";
-      name = "kscreenlocker-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kscreenlocker-5.12.5.tar.xz";
+      sha256 = "08l8knfvhrd3h8z70xq1jiq02bg56jdddxx0ml6jbd8ja9r1svdq";
+      name = "kscreenlocker-5.12.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/ksshaskpass-5.12.4.tar.xz";
-      sha256 = "0k405qp8ji84gd7h3lsyfhsya7z55kw2klj9a0ld9z5r7jpr95z5";
-      name = "ksshaskpass-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/ksshaskpass-5.12.5.tar.xz";
+      sha256 = "0vgqp09cfdlf22xxi0pdzdv0i4hrgvbfj3yrxrfqhfh9zlc3q6y4";
+      name = "ksshaskpass-5.12.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/ksysguard-5.12.4.tar.xz";
-      sha256 = "0svk5ggdbjqq9lg4ggwijy7nbwmn3mdkmvm1jqbd174myyd6hmwk";
-      name = "ksysguard-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/ksysguard-5.12.5.tar.xz";
+      sha256 = "11wh4skx3vjjrdfaa85a8ijdvsw3fnk02s1n9g6yv0c8h74q2nqv";
+      name = "ksysguard-5.12.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwallet-pam-5.12.4.tar.xz";
-      sha256 = "058xxqkyyiwn34iwbmapk6bk6fi3l1g4vwbf125vc9pcbx6nqn2q";
-      name = "kwallet-pam-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwallet-pam-5.12.5.tar.xz";
+      sha256 = "18pbsmc44pqbdylczqsx6cargzkkp4vcd44yk7mwjhniw8pi6x33";
+      name = "kwallet-pam-5.12.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwayland-integration-5.12.4.tar.xz";
-      sha256 = "1lcz12iqisls2icv4jmgjndlamz2zlfyd9lbn6j2hizz7riybsla";
-      name = "kwayland-integration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwayland-integration-5.12.5.tar.xz";
+      sha256 = "05qcsqyw2n1hpdsiqjvg98i77kwgcdpsr0096nqr62pzf36bsqz3";
+      name = "kwayland-integration-5.12.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwin-5.12.4.tar.xz";
-      sha256 = "0br27craalz6vqcv2g7jkskk0ia91hrir1wf1phm2lrnn4yadgf8";
-      name = "kwin-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwin-5.12.5.tar.xz";
+      sha256 = "1mkmh90pl4pz1bb3n9zl6x6lxvr8xkj7r795qj70s9jxavl40fj3";
+      name = "kwin-5.12.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/kwrited-5.12.4.tar.xz";
-      sha256 = "0m2snmvyxfnmlhfpvghp3w6apmba7rna9xsp5szdzrxgrd92ibgy";
-      name = "kwrited-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/kwrited-5.12.5.tar.xz";
+      sha256 = "0vvlkr4w4vwgkl9sili63cwlp0lsxlnzwfwmhpa5nrwcjgbyfbmz";
+      name = "kwrited-5.12.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/libkscreen-5.12.4.tar.xz";
-      sha256 = "1dq5mbz7vqz4dzgnpsxgmygnz00d7ziqs98qcdgfcbvkh0j4sqsr";
-      name = "libkscreen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/libkscreen-5.12.5.tar.xz";
+      sha256 = "0hzdchkxlv5l3zx7lxzj0x44kn3086gxnhmas9w1n9b6qrf0sjb4";
+      name = "libkscreen-5.12.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/libksysguard-5.12.4.tar.xz";
-      sha256 = "09mqfr4dxiq4xs4ihrxvsa9wf8azmilpnl5jbi06pfw5bd1q6fpd";
-      name = "libksysguard-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/libksysguard-5.12.5.tar.xz";
+      sha256 = "0dbf3xx52xqyzaxvybmjra0z1lc3qcbb0aqmsga8rjj77bmj3kx9";
+      name = "libksysguard-5.12.5.tar.xz";
     };
   };
   milou = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/milou-5.12.4.tar.xz";
-      sha256 = "0v0m4a0idah99dvsmgng6kmlcqwpwh1rbd2j9ih7ka1xmlshdml7";
-      name = "milou-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/milou-5.12.5.tar.xz";
+      sha256 = "0v0zkwmh7rzqbgw1ypqz18bd3gn3x8iag0q9lrk6zzpd66j2r1fc";
+      name = "milou-5.12.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/oxygen-5.12.4.tar.xz";
-      sha256 = "1k9kls7xzwb49gwjlhyxhg2jn9zh034csbdlz0pnq9h1yzwph4wa";
-      name = "oxygen-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/oxygen-5.12.5.tar.xz";
+      sha256 = "0336bkvn8mqrbswnhg87ah7k3w7i99c8rfpfvhw5qq3mm6jvbi4l";
+      name = "oxygen-5.12.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-desktop-5.12.4.tar.xz";
-      sha256 = "16g2vnbfd7nl61hfx7i6b3m0hms2aw4v85nbj8mf2i6csc1vzhmy";
-      name = "plasma-desktop-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz";
+      sha256 = "0rm7j8n3yflzl6wpivmjsgrhc5arrnmzfg81arfs06gjdnvwnmd6";
+      name = "plasma-desktop-5.12.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-integration-5.12.4.tar.xz";
-      sha256 = "0qdyckmm52d0bf0062v103hy5szqqgfbh4z6h9bbjcz5l372aklb";
-      name = "plasma-integration-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-integration-5.12.5.tar.xz";
+      sha256 = "14iciz6zjxrvig58hpqa51cj5r949xq9xgqvs8glzldzg34928sm";
+      name = "plasma-integration-5.12.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-nm-5.12.4.tar.xz";
-      sha256 = "1mvj41hxd42wk8ja186vxv080igrdza6sqbgcajk48r2klybpfzj";
-      name = "plasma-nm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-nm-5.12.5.tar.xz";
+      sha256 = "1awnd9gdciwrwyl2xs9h778fizhnbw8wm8ddbqr8050v7fkc7fs6";
+      name = "plasma-nm-5.12.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-pa-5.12.4.tar.xz";
-      sha256 = "1mngqa9957m45ij73xp3lzp19hmwwq9h40ig39mwh20gm5jrdw56";
-      name = "plasma-pa-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-pa-5.12.5.tar.xz";
+      sha256 = "13z9shlnprbjgqy1w8lf3brjcvmh76fpl0xv3q2r7kvcgm1ndjdd";
+      name = "plasma-pa-5.12.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-sdk-5.12.4.tar.xz";
-      sha256 = "1mw477p1z396gsbdx3m9cp0b2ljhqjw39grklg7l4cgrhiwrnjk2";
-      name = "plasma-sdk-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-sdk-5.12.5.tar.xz";
+      sha256 = "0rrwis63khq1b6shxrp5cj6dgz9lhrccs7752f7j73pi5fpmbz0g";
+      name = "plasma-sdk-5.12.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-tests-5.12.4.tar.xz";
-      sha256 = "13gq7mfimh4xd4f2vqaqri3f1v8nh7yixqppjip8s9mq3amf6xd9";
-      name = "plasma-tests-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-tests-5.12.5.tar.xz";
+      sha256 = "1rq8li7y3qf1ipyhy869lw3znmssf5grbh522qla4sn08d1lhxij";
+      name = "plasma-tests-5.12.5.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-vault-5.12.4.tar.xz";
-      sha256 = "022vqjra25v9bw9j14j0a5jl9r08iqvzd5zn0dhz6l4bj0amcd8n";
-      name = "plasma-vault-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-vault-5.12.5.tar.xz";
+      sha256 = "0zrwsqcpkssrfhy2xgg4y2k2w6l7vyn7mqani9lw18i13vp2fh1d";
+      name = "plasma-vault-5.12.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-5.12.4.tar.xz";
-      sha256 = "00n2i6hj0fqss69gmmdhf32sfybak3l1iw379ljc3l4k6b3kzmh7";
-      name = "plasma-workspace-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-5.12.5.tar.xz";
+      sha256 = "1vy5p22y6jckhm09171pjacdrndl7vak6grwvzg8bmhqk1ahzdwk";
+      name = "plasma-workspace-5.12.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plasma-workspace-wallpapers-5.12.4.tar.xz";
-      sha256 = "1y2mqkql2nadq3npxjp5hr2vzq3i45b4xp7gzcjl9bb2wppmhv4j";
-      name = "plasma-workspace-wallpapers-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-wallpapers-5.12.5.tar.xz";
+      sha256 = "1p6kcakdw020pjwdfdhh1v8bha8r6j9934nid7vv7ldp388mq6a7";
+      name = "plasma-workspace-wallpapers-5.12.5.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/plymouth-kcm-5.12.4.tar.xz";
-      sha256 = "1aakf2qrbnnv2n2rp57jql6nvl9i5mxpy0f4f5bjlqjxhzjlwwkn";
-      name = "plymouth-kcm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/plymouth-kcm-5.12.5.tar.xz";
+      sha256 = "1fv2b792d7bg5vdix823fks8capgbnda94fc8z91nsffa894p0i9";
+      name = "plymouth-kcm-5.12.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.12.4";
+    version = "1-5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/polkit-kde-agent-1-5.12.4.tar.xz";
-      sha256 = "0wwk1cr4mh2csjv0xrahzwyxyg8znd839zz518hfxdcv9a1rba2q";
-      name = "polkit-kde-agent-1-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/polkit-kde-agent-1-5.12.5.tar.xz";
+      sha256 = "01plpzhj2fc2i3hjqb75skmyiy9dg3mw2h1sxsl7hxmbvm9fv9if";
+      name = "polkit-kde-agent-1-5.12.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/powerdevil-5.12.4.tar.xz";
-      sha256 = "043k0zhab6nqa1kc09d9d8jg7j1sd7jy0zhrwb66lf29yc6iyahx";
-      name = "powerdevil-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz";
+      sha256 = "07f3kqvfqgqpz50fk8dwyr5z1hylli0k4ndlcp5mkybiraz1rdjk";
+      name = "powerdevil-5.12.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/sddm-kcm-5.12.4.tar.xz";
-      sha256 = "0bm8h5r4nin0hx1nfqya1lxcp93745shk6ifqrizgzw1ldqqyah7";
-      name = "sddm-kcm-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/sddm-kcm-5.12.5.tar.xz";
+      sha256 = "13qqyvq7rk7h65krjaqgil2rxjj7073arxp4bij5g534ckpwkz3h";
+      name = "sddm-kcm-5.12.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/systemsettings-5.12.4.tar.xz";
-      sha256 = "0af2vqnlwxa7ldra78y0gwq1cra227q49ww7w1cnvgq0il7cav4a";
-      name = "systemsettings-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/systemsettings-5.12.5.tar.xz";
+      sha256 = "0ackzdyfmssq6lh9dranc8nv6bhk633zq1mixibqhswl3pz8n4h8";
+      name = "systemsettings-5.12.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/user-manager-5.12.4.tar.xz";
-      sha256 = "1y144lw1a4q4pp9hw31lr806fpm1p397ibpbagcdr3xaka2z36lm";
-      name = "user-manager-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/user-manager-5.12.5.tar.xz";
+      sha256 = "1566scbw6f02gskwdc2kk6xcbbf7hq6jkz3ka1avkwmyi3xhh010";
+      name = "user-manager-5.12.5.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.12.4";
+    version = "5.12.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.12.4/xdg-desktop-portal-kde-5.12.4.tar.xz";
-      sha256 = "18b97mbyfqvf2ygwrggi5zvkv8a9givqjlyaqi184h8mgndn044c";
-      name = "xdg-desktop-portal-kde-5.12.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.12.5/xdg-desktop-portal-kde-5.12.5.tar.xz";
+      sha256 = "1rmjwjx7x481607vp0pjxsabbjhm7qfqa0ax4ciqqlv676hcr5cv";
+      name = "xdg-desktop-portal-kde-5.12.5.tar.xz";
     };
   };
 }

From d84a06feca9b6d43df669610523665067a26d41d Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Sat, 5 May 2018 21:00:06 +0200
Subject: [PATCH 1163/3370] eid-mw: 4.1.19 -> 4.4.1

Urgent version bump as tax season is coming and 4.1.19 is not compatible
with firefox anymore.

eid-viewer was merged upstream with eid-mw, so it is included here now.
---
 pkgs/tools/security/eid-mw/default.nix | 35 +++++++++++++++-----------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 39090a19582e..eb8861486747 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -2,7 +2,8 @@
 , autoreconfHook, pkgconfig
 , gtk3, nssTools, pcsclite
 , libxml2, libproxy 
-, openssl, curl }:
+, openssl, curl
+, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "Fedict";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
   buildInputs = [ gtk3 pcsclite libxml2 libproxy curl openssl ];
   preConfigure = ''
     mkdir openssl
@@ -31,39 +32,45 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-dialogs=yes" ];
 
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
   postInstall = ''
     install -D ${./eid-nssdb.in} $out/bin/eid-nssdb
     substituteInPlace $out/bin/eid-nssdb \
       --replace "modutil" "${nssTools}/bin/modutil"
 
-    # Only provides a useless "about-eid-mw.desktop" that segfaults anyway:
-    rm -r $out/share/applications $out/bin/about-eid-mw
+    rm $out/bin/about-eid-mw
+    wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" 
   '';
 
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) middleware";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
     license = licenses.lgpl3;
     longDescription = ''
       Allows user authentication and digital signatures with Belgian ID cards.
-      Also requires a running pcscd service and compatible card reader.
+      Also requires a running pcscd service and compatible card reader. 
 
+      eid-viewer is also installed.
+
+      **TO FIX:** 
+      The procedure below did not work for me, I had to install the .so directly in firefox as instructed at
+      https://eid.belgium.be/en/log-eid#7507
+      and specify
+      /run/current-system/sw/lib/libbeidpkcs11.so
+      as the path to the module.
+
+      This package only installs the libraries. To use eIDs in Firefox or
+      Chromium, the eID Belgium add-on must be installed.
       This package only installs the libraries. To use eIDs in NSS-compatible
       browsers like Chrom{e,ium} or Firefox, each user must first execute:
-
         ~$ eid-nssdb add
-
       (Running the script once as root with the --system option enables eID
       support for all users, but will *not* work when using Chrom{e,ium}!)
-
       Before uninstalling this package, it is a very good idea to run
-
         ~$ eid-nssdb [--system] remove
-
       and remove all ~/.pki and/or /etc/pki directories no longer needed.
     '';
     platforms = platforms.linux;

From bf65cf4d28da2715a6f113aee8d714111848946f Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Sat, 5 May 2018 22:31:21 +0200
Subject: [PATCH 1164/3370] skhd: 0.0.12 -> 0.0.14

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

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index 24eb644e96fb..3331084d807e 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.0.12";
+  version = "0.0.14";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "09ihfd7cfqnfv095skn6rbrmjji61skwgg36b6s055fycrlbyp0h";
+    sha256 = "0kkmlka1hxsjdkx0ywkm48p9v1jhld26lfplls20n0hj97i5iwlz";
   };
 
   buildInputs = [ Carbon ];

From 8143383aabbc1d8049c3c3984aa998c9a64b3f47 Mon Sep 17 00:00:00 2001
From: danbst <abcz2.uprola@gmail.com>
Date: Sun, 6 May 2018 01:42:32 +0300
Subject: [PATCH 1165/3370] zoom-us: update 2.0.106600.0904 -> 2.0.123200.0405,
 cleanup

Apart from version update:
- remove some packages from `LD_LIBRARY_PATH`. I haven't found any
references for them. Most of them were copypasted from AUR expression
- found an implicit reference to `pidof`, in my case this caused warnings
about mismatched Glibc version. I've found implicit reference to `sh` too,
with Glibc warning too, but I don't know how to fix this, and looks like it's
only a warning
---
 .../instant-messengers/zoom-us/default.nix    | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 03b4b980929c..db32dd0c23e2 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
-  alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
-  libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
+  alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio,
+  utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }:
 
 let
 
-  version = "2.0.106600.0904";
+  version = "2.0.123200.0405";
   srcs = {
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz";
-      sha256 = "1dcr0rqgjingjqbqv37hqjhhwy8axnjyirrnmjk44b5xnh239w9s";
+      sha256 = "1ifwa2xf5mw1ll2j1f39qd7mpyxpc6xj3650dmlnxf525dsm573z";
     };
   };
 
@@ -17,25 +17,20 @@ in stdenv.mkDerivation {
 
   src = srcs.${system};
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   libPath = stdenv.lib.makeLibraryPath [
     alsaLib
-    dbus
+    expat
     glib
-    gstreamer
-    fontconfig
     freetype
     libpulseaudio
-    libxml2
-    libxslt
-    nspr
-    nss
+    zlib
+    dbus
+    fontconfig
     sqlite
     utillinux
-    zlib
     udev
-    expat
 
     xorg.libX11
     xorg.libSM
@@ -79,6 +74,7 @@ in stdenv.mkDerivation {
     makeWrapper $packagePath/zoom $out/bin/zoom-us \
         --prefix LD_LIBRARY_PATH : "$packagePath:$libPath" \
         --prefix LD_PRELOAD : "${libv4l}/lib/v4l1compat.so" \
+        --prefix PATH : "${procps}/bin" \
         --set QT_PLUGIN_PATH "$packagePath/platforms" \
         --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
         --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale"

From b21da3704499367621cc776bf49675687bb4c911 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 15:28:31 +0200
Subject: [PATCH 1166/3370] nodePackages_8_x.three: Init at 0.92.0

---
 .../node-packages/node-packages-v6.nix        | 3639 ++++++++---------
 .../node-packages/node-packages-v8.json       |    1 +
 .../node-packages/node-packages-v8.nix        |  400 +-
 3 files changed, 1958 insertions(+), 2082 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index e5d9ff18eb0d..e50628e014fe 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -94,22 +94,31 @@ let
         sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4";
       };
     };
-    "@types/node-8.10.4" = {
+    "@types/node-10.0.4" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.4";
+      version = "10.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.4.tgz";
-        sha512 = "345l7fbkr415rdf3p0akk11k8shxibfl77crpj3wd3a8d4lbsdpylfzm8ihkg6wnj88gjpcwy4nw6vb2x58kwx15fbl09bz96dlrahn";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz";
+        sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6";
       };
     };
-    "@types/node-9.6.2" = {
+    "@types/node-8.10.12" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "9.6.2";
+      version = "8.10.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz";
-        sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.12.tgz";
+        sha512 = "199k4d6vmwxd4bkmxmpszdvz6nxby7px5w2cw0yrhrp5clmxvsfc1xnwirjlpidfc4a76i6pzprmdkrpli8i454s909bx6z7wd584b9";
+      };
+    };
+    "@types/node-9.6.12" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "9.6.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-9.6.12.tgz";
+        sha512 = "2515a59dsfswy2l4i7hid0krh69mzz42byi55a12a0cz21masdmd3j0zc8aq7qyh2sm6lmhzbxy1n8vhb563ybjhiygavn9d24k77yr";
       };
     };
     "@types/request-2.47.0" = {
@@ -481,6 +490,15 @@ let
         sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
+    "adm-zip-0.4.9" = {
+      name = "adm-zip";
+      packageName = "adm-zip";
+      version = "0.4.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.9.tgz";
+        sha512 = "03k8g7lxi05n57v16vv32x32lkikh9qvv4pmkycrw52j3r031fkvns49z8wvfbj3rjj6vh712ahyfz5k3m5b9v832n9dz18f8kxljbs";
+      };
+    };
     "after-0.8.1" = {
       name = "after";
       packageName = "after";
@@ -616,13 +634,13 @@ let
         sha1 = "617997fc5f60576894c435f940d819e135b80762";
       };
     };
-    "ajv-keywords-3.1.0" = {
+    "ajv-keywords-3.2.0" = {
       name = "ajv-keywords";
       packageName = "ajv-keywords";
-      version = "3.1.0";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz";
-        sha1 = "ac2b27939c543e95d2c06e7f7f5c27be4aa543be";
+        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz";
+        sha1 = "e86b819c602cf8821ad637413698f1dec021847a";
       };
     };
     "ajv-merge-patch-3.0.0" = {
@@ -1030,13 +1048,13 @@ let
         sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
       };
     };
-    "args-3.0.8" = {
+    "args-4.0.0" = {
       name = "args";
       packageName = "args";
-      version = "3.0.8";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/args/-/args-3.0.8.tgz";
-        sha512 = "26h2nssgwzgc9y1mywgjcx2rbbkxlpx23zj9gh81bayjr8522zi78rwrhpkkqwh7dwqx6mv8gphcx8zyv3vm8hxw5s89kjlzm66k7y9";
+        url = "https://registry.npmjs.org/args/-/args-4.0.0.tgz";
+        sha512 = "2xd628jhziygi9jr16ckq557189nw5lracgzcpv8ddvymc3mjxvqzffgp68wmgknw6ps7nliwwyismriv6z4snvn0xmm7kwbrafbgp1";
       };
     };
     "arr-diff-2.0.0" = {
@@ -1579,13 +1597,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "atob-2.1.0" = {
+    "atob-2.1.1" = {
       name = "atob";
       packageName = "atob";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz";
-        sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a";
+        url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz";
+        sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a";
       };
     };
     "atomic-batcher-1.0.2" = {
@@ -1615,13 +1633,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.223.1" = {
+    "aws-sdk-2.233.1" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.223.1";
+      version = "2.233.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.223.1.tgz";
-        sha1 = "b264bf6407d7c74152f08b4a8fda8aad3a84baa4";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.233.1.tgz";
+        sha1 = "b4f541069a9f2781e9f73e1336ce81a9fc08bcf1";
       };
     };
     "aws-sign-0.2.0" = {
@@ -2038,13 +2056,13 @@ let
         sha1 = "63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b";
       };
     };
-    "babel-core-6.26.0" = {
+    "babel-core-6.26.3" = {
       name = "babel-core";
       packageName = "babel-core";
-      version = "6.26.0";
+      version = "6.26.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz";
-        sha1 = "af32f78b31a6fcef119c87b0fd8d9753f03a0bb8";
+        url = "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz";
+        sha512 = "0617drz6fkpdpkl4snbfz7ivd296j19182m7x4klhqac60qr77wn8bkgpz696sscxykcv1n8cdv09pz7v9xq6s1k552fyp6w0p8ag7a";
       };
     };
     "babel-generator-6.26.1" = {
@@ -2236,13 +2254,13 @@ let
         sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
       };
     };
-    "bail-1.0.2" = {
+    "bail-1.0.3" = {
       name = "bail";
       packageName = "bail";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bail/-/bail-1.0.2.tgz";
-        sha1 = "f7d6c1731630a9f9f0d4d35ed1f962e2074a1764";
+        url = "https://registry.npmjs.org/bail/-/bail-1.0.3.tgz";
+        sha512 = "1v31szd5dwn62xh8a9cy95yby0ibq9j9barzs03hxjr4vcjnwz1mgjdb9p4rqgymjm3f5zrxgrnqkjd9h9viykd56zfchsm66g04zym";
       };
     };
     "balanced-match-1.0.0" = {
@@ -2326,6 +2344,15 @@ let
         sha512 = "3kqp8hzql2ccdqf7vqizav1lrwp5gynn081718g9slxcs428sv02n037xb9hfgrqybbk4qacnk5mcv63z8fm3l4h6fi06xm8nqj3h1j";
       };
     };
+    "base64-js-1.3.0" = {
+      name = "base64-js";
+      packageName = "base64-js";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz";
+        sha512 = "2bvd1ja1kbighx0vm4ia3gqv15m70pldsx2igl37ayq11715w3g0vfmfq1yb8w80hlzblvszig3fr4sdhn8rr800lsaz8dg47zsziki";
+      };
+    };
     "base64-url-1.2.1" = {
       name = "base64-url";
       packageName = "base64-url";
@@ -2524,13 +2551,13 @@ let
         sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
       };
     };
-    "big-integer-1.6.27" = {
+    "big-integer-1.6.28" = {
       name = "big-integer";
       packageName = "big-integer";
-      version = "1.6.27";
+      version = "1.6.28";
       src = fetchurl {
-        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.27.tgz";
-        sha512 = "2v5f59yjsa3hzwhk333s84nfl1x24w52h9hqpwbav0p5v5d5prkna0flw25ywccrrjziq3lylbl874qqikzljkyz2g6jjdqhlqhld9p";
+        url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.28.tgz";
+        sha512 = "3b56jaa0yvrl9p90c0phnhyh02sv9hxssl8y0nghv91ra8akrcdpxm55c1gf5w1is9991wm2g0wqcr4hm5ri9lmzwd8gc9d72pzg51q";
       };
     };
     "big.js-3.2.0" = {
@@ -2677,13 +2704,13 @@ let
         sha512 = "10md5792s6q3xwdrmwh1a8ax9w128g607b5qsbxzw8x0gl9184g754hprchl6mq8lmf4f8qylk2h8vavsnbn9yy9gzjnyh2kwrzmxky";
       };
     };
-    "bittorrent-dht-8.2.0" = {
+    "bittorrent-dht-8.3.0" = {
       name = "bittorrent-dht";
       packageName = "bittorrent-dht";
-      version = "8.2.0";
+      version = "8.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.2.0.tgz";
-        sha512 = "291qfv5f3w3d7zcq9xyjplpnaaahy7mzj664w5g9w1zgiwv3dikl38r8wx0rdb3afsv5ih0ghrzc2r1k19c52axsagnpsc10hihlkii";
+        url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-8.3.0.tgz";
+        sha512 = "2p2fxhvwin4xnjdmbhrlwivx4a8pjzfn6mc5qxnxzl1q40xxp56wd6xrcxfq9viqjkvpc7g0j3dvgmvcywhgw41nvjyxi8pgm5v43kp";
       };
     };
     "bittorrent-peerid-1.2.0" = {
@@ -2695,13 +2722,13 @@ let
         sha1 = "9f675612f0e6afc6ef3450dfba51ff7238abf371";
       };
     };
-    "bittorrent-protocol-2.4.0" = {
+    "bittorrent-protocol-2.4.1" = {
       name = "bittorrent-protocol";
       packageName = "bittorrent-protocol";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.0.tgz";
-        sha512 = "3xggi5fxwkzkkgy3z7v5b9w7fk2bjan077b4s9rvqfp7cmnw6l96p36qlkqgp38rd57lzdlkay42dkqhcb8r7gzszp5598nviy0p4mb";
+        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-2.4.1.tgz";
+        sha512 = "0vx3k29q25mp4ind4745868n0hc7xcggwbj0hyqp0hfblfxpdwddv1gwdh0x0m9skja637bxvn2i1ssvqrc80qyjfy4asw63rpvg99m";
       };
     };
     "bittorrent-tracker-7.7.0" = {
@@ -2713,13 +2740,13 @@ let
         sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c";
       };
     };
-    "bittorrent-tracker-9.7.0" = {
+    "bittorrent-tracker-9.9.1" = {
       name = "bittorrent-tracker";
       packageName = "bittorrent-tracker";
-      version = "9.7.0";
+      version = "9.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.7.0.tgz";
-        sha512 = "06jp495xv047v5n3wclbga8laqmgjis5wjwhc7ggq2qx4xszp395mg2v0147p7v0ybpw5bpvdfhr1zp12barvn2lgj9f0c9iji4jr5r";
+        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-9.9.1.tgz";
+        sha512 = "06yb4m1bbllq52hhm7cp5j35bd9my3rhlsgaycpv6g9iymxq0qr8bx9fmxr673i9m6nxvkbrjym7ykp9f8w674inpp3csplqf2apl1x";
       };
     };
     "bl-0.8.2" = {
@@ -3037,15 +3064,6 @@ let
         sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb";
       };
     };
-    "boxen-0.3.1" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.3.1.tgz";
-        sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
-      };
-    };
     "boxen-1.3.0" = {
       name = "boxen";
       packageName = "boxen";
@@ -3190,15 +3208,6 @@ let
         sha1 = "089a3463af58d0e48d8cd4070b3f74654d5abca9";
       };
     };
-    "browserify-14.5.0" = {
-      name = "browserify";
-      packageName = "browserify";
-      version = "14.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserify/-/browserify-14.5.0.tgz";
-        sha512 = "3p941rcrmn44115ylbnq53sdsnfm08rlvckdbkrnxvl00ibis5sxyhgrx33vm8sfyb5vgbk8x4b0fv3vwirvd7frwbdmzigsjqcx9w0";
-      };
-    };
     "browserify-aes-1.2.0" = {
       name = "browserify-aes";
       packageName = "browserify-aes";
@@ -3217,22 +3226,22 @@ let
         sha1 = "96247e853f068fd6e0d45cc73f0bb2cd9778ef02";
       };
     };
-    "browserify-cipher-1.0.0" = {
+    "browserify-cipher-1.0.1" = {
       name = "browserify-cipher";
       packageName = "browserify-cipher";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz";
-        sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
+        url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz";
+        sha512 = "3bz6v63l37ndb18236yjdkbxjcvy4x16a8j7vsqxqprvnkcnkq1hg1ffd1c9zk9a3j555ppnpisfyh0x4adlb8lmpwbfa8i837n9y5h";
       };
     };
-    "browserify-des-1.0.0" = {
+    "browserify-des-1.0.1" = {
       name = "browserify-des";
       packageName = "browserify-des";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz";
-        sha1 = "daa277717470922ed2fe18594118a175439721dd";
+        url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz";
+        sha512 = "35rl28vzg80fa81b0a7rdaj71zf0ymxxhlmdpisps4dlgvkazbxz47q9fnl1n9wnbq7ilk6vnbxa399zcwdjdz3i0lii1mpnyhh4bfg";
       };
     };
     "browserify-incremental-3.1.1" = {
@@ -3892,6 +3901,15 @@ let
         sha1 = "d545635be1e33c542649c69173e5de6acfae34dd";
       };
     };
+    "camelcase-5.0.0" = {
+      name = "camelcase";
+      packageName = "camelcase";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz";
+        sha512 = "2q57983k3n95gzbhqhc0cv6krvq7nd37h837xg6favqywdda14ha7k2xbdaryni3xzzm55pvi0adrl1fbgxypaxz1kvrifnm5kb1akx";
+      };
+    };
     "camelcase-keys-2.1.0" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -3973,13 +3991,13 @@ let
         sha512 = "2wa0gi2wljxw00rvqz454sgdr8yy90z8lhprxjc1prwi695lnzrh6sk0qqhp63h9gmbldyvvzfvm8k1jk0sbv6icdawcss441jky3qa";
       };
     };
-    "ccount-1.0.2" = {
+    "ccount-1.0.3" = {
       name = "ccount";
       packageName = "ccount";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ccount/-/ccount-1.0.2.tgz";
-        sha1 = "53b6a2f815bb77b9c2871f7b9a72c3a25f1d8e89";
+        url = "https://registry.npmjs.org/ccount/-/ccount-1.0.3.tgz";
+        sha512 = "2dqnm6wybhq4zcdf3x97zjibb5zvvcbq3p837sp61rk6wvbk3nqq4lpivvxgvgg4cgl346aqzkpwry1sl7l1yw7ab7d6wqi34h6vpr6";
       };
     };
     "center-align-0.1.3" = {
@@ -4072,31 +4090,49 @@ let
         sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
       };
     };
-    "character-entities-1.2.1" = {
+    "chalk-2.4.0" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.0.tgz";
+        sha512 = "0bnfi1y6b0wl6wn93ykm3awxyjnsknai0hrnvvkxfvjrcsld722r3ljdac9zifvvg8vqd4pxlrhrc4r58yp0xxfxj2bpx18zv8z1gss";
+      };
+    };
+    "chalk-2.4.1" = {
+      name = "chalk";
+      packageName = "chalk";
+      version = "2.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz";
+        sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr";
+      };
+    };
+    "character-entities-1.2.2" = {
       name = "character-entities";
       packageName = "character-entities";
-      version = "1.2.1";
+      version = "1.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.1.tgz";
-        sha1 = "f76871be5ef66ddb7f8f8e3478ecc374c27d6dca";
+        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz";
+        sha512 = "30y1wgwpay9yfcz4l3wj9yslp751hch7vhing2f748qn8clk0im3f32xn25k57s6q94mkq0gnk6ga8icz3yzhm752vjq1p7mxghgjmh";
       };
     };
-    "character-entities-html4-1.1.1" = {
+    "character-entities-html4-1.1.2" = {
       name = "character-entities-html4";
       packageName = "character-entities-html4";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.1.tgz";
-        sha1 = "359a2a4a0f7e29d3dc2ac99bdbe21ee39438ea50";
+        url = "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-1.1.2.tgz";
+        sha512 = "0ikbsydxv9ap7im4i2l4nv5gqgilwwbbpxf8xgyknz3cv2jgp4285f0kdl0qcv1xbh9946a9wkcyd4b7mg5nzg0s5dyxnys571xg2mh";
       };
     };
-    "character-entities-legacy-1.1.1" = {
+    "character-entities-legacy-1.1.2" = {
       name = "character-entities-legacy";
       packageName = "character-entities-legacy";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.1.tgz";
-        sha1 = "f40779df1a101872bb510a3d295e1fccf147202f";
+        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz";
+        sha512 = "2ag1akl7wv9ysm4qkkrx8r59mj08xgnavah9hn79ggzknkb5hikn15fdgbcql4yln4a5kbi0b8xykwhy80vrarsbyfqapgdnmapdl7l";
       };
     };
     "character-parser-1.2.1" = {
@@ -4117,13 +4153,13 @@ let
         sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0";
       };
     };
-    "character-reference-invalid-1.1.1" = {
+    "character-reference-invalid-1.1.2" = {
       name = "character-reference-invalid";
       packageName = "character-reference-invalid";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz";
-        sha1 = "942835f750e4ec61a308e60c2ef8cc1011202efc";
+        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz";
+        sha512 = "1wm395ypw8d7xpq3jffx9m3j24simj28sf9symc9pa94s8l04maqagcy79j62yngip7rvcg4c7zvvxx7hygw9r0k44jaayzwmqz33zc";
       };
     };
     "chardet-0.4.2" = {
@@ -4234,13 +4270,13 @@ let
         sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
       };
     };
-    "chrome-trace-event-0.1.2" = {
+    "chrome-trace-event-0.1.3" = {
       name = "chrome-trace-event";
       packageName = "chrome-trace-event";
-      version = "0.1.2";
+      version = "0.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.2.tgz";
-        sha1 = "90f36885d5345a50621332f0717b595883d5d982";
+        url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-0.1.3.tgz";
+        sha512 = "3y9nwc7vk3r253x4yrz1ibinpd6xcfy75skh9i5s5gkh3c93sddvlp7dkr5fjs6aarr9n8cy0ck8zwfw10h4fqnw6p6ibgbj74xsfdj";
       };
     };
     "chromecast-player-0.2.3" = {
@@ -4333,13 +4369,13 @@ let
         sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji";
       };
     };
-    "circular-json-0.5.1" = {
+    "circular-json-0.5.3" = {
       name = "circular-json";
       packageName = "circular-json";
-      version = "0.5.1";
+      version = "0.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.1.tgz";
-        sha512 = "1myzlq58v42dc2b1i17rcmvj7529spwcqgzc7j2q663a7xkk4nhzqk6hpw20lvp99iaq0k0zg5p0jzf19n7p0vrg45hk160ai31qf2j";
+        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.3.tgz";
+        sha512 = "0gpz4w5khkmnx6wpsh9ccxkwc2cp9i4s9dgf2fi9dgq78ik42cld3sgil5lc3rkjvdp5fgv33c1b8pjvx3dw7kk3q3888ly54x4np32";
       };
     };
     "clarinet-0.11.0" = {
@@ -4540,15 +4576,6 @@ let
         sha512 = "0j60cwp5vpc7v13m0d5rgh6h5jf6yxnywfb1wgbdn7lalklrr5ncvfkkqk6xj7b046bl2jabfqifk3yl6agd93ixfmywif2xfc4hqyr";
       };
     };
-    "clite-0.3.0" = {
-      name = "clite";
-      packageName = "clite";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clite/-/clite-0.3.0.tgz";
-        sha1 = "e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441";
-      };
-    };
     "cliui-2.1.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -4567,13 +4594,13 @@ let
         sha1 = "120601537a916d29940f934da3b48d585a39213d";
       };
     };
-    "cliui-4.0.0" = {
+    "cliui-4.1.0" = {
       name = "cliui";
       packageName = "cliui";
-      version = "4.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz";
-        sha512 = "0mh539939k4z2nhj5h1m8kdr3bfy2f1kmdkss02cdbyabmpdkc6m22llyykymriahf54gpx6qg9v3vrs51gqgrrfhpsgbdndgjdd3cx";
+        url = "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz";
+        sha512 = "26knyxdavl3y7kq82vfa094ym3n05vy2h2j5srb9fhhy8l43l0kwlasah5i78jks77zqgc373hbf96xcxv6am042gpbw35x452vwlg0";
       };
     };
     "clivas-0.1.4" = {
@@ -4846,13 +4873,13 @@ let
         sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
       };
     };
-    "collapse-white-space-1.0.3" = {
+    "collapse-white-space-1.0.4" = {
       name = "collapse-white-space";
       packageName = "collapse-white-space";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz";
-        sha1 = "4b906f670e5a963a87b76b0e1689643341b6023c";
+        url = "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.4.tgz";
+        sha512 = "0iifkywgm8zqn27w0maj5c1yarf294qm5qqcbsajafv8r5f9w02ss33qfngyp59mamv8h8yqx93xpsqnabzn0wnpssrx6qr0ns3bx31";
       };
     };
     "collection-visit-1.0.0" = {
@@ -4945,13 +4972,13 @@ let
         sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
     };
-    "colors-1.2.1" = {
+    "colors-1.2.4" = {
       name = "colors";
       packageName = "colors";
-      version = "1.2.1";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz";
-        sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk";
+        url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz";
+        sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9";
       };
     };
     "colour-0.7.1" = {
@@ -5630,13 +5657,13 @@ let
         sha1 = "bd727a7faed77e71ff3985ac93351a912733ad0f";
       };
     };
-    "conventional-changelog-1.1.23" = {
+    "conventional-changelog-1.1.24" = {
       name = "conventional-changelog";
       packageName = "conventional-changelog";
-      version = "1.1.23";
+      version = "1.1.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.23.tgz";
-        sha512 = "2775l94nr8rbnvhihkrwyszncc2g7z1kvbsqpbvni86h8072xvxngbba6yxzzw4dfs57ghklkh9l0ibjy17rl7ldrh6q9lpyd9xf8y8";
+        url = "https://registry.npmjs.org/conventional-changelog/-/conventional-changelog-1.1.24.tgz";
+        sha512 = "3ap10i691k1bd6kslyrxrlrcqzdgdv1mibnraknwvls1n1kcbw77w9d6sljjdan766bhx0md07gz6ihjwsk3s3vhiw7cqvqrd914ryr";
       };
     };
     "conventional-changelog-angular-1.6.6" = {
@@ -5657,13 +5684,13 @@ let
         sha512 = "3m1yhgjwbz0x993dfdw3g2n4svz4ym4k1snhg57iraw1418glgdwpz52j01300v8d1p6ldjjbrv7x3gqa08xcqq6inpkbhv2fmdk4zj";
       };
     };
-    "conventional-changelog-cli-1.3.21" = {
+    "conventional-changelog-cli-1.3.22" = {
       name = "conventional-changelog-cli";
       packageName = "conventional-changelog-cli";
-      version = "1.3.21";
+      version = "1.3.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.21.tgz";
-        sha512 = "1n93839r75vwj9fl4i3x3l06zc84kin92cp8nrlxksga9lqdpxc8b8i72wvi9jvwk0z6i29wisxdpiw6y7rrmdl13ch9f3k7jb43m9b";
+        url = "https://registry.npmjs.org/conventional-changelog-cli/-/conventional-changelog-cli-1.3.22.tgz";
+        sha512 = "1kb6qrs4myjknqg4cpl530gxzbainsvhrzg6hm6xhdjhprby9flw28y92cbimq9cqpc6qq2bldzbnlxf1yzq5yhamwld3pijqhdsy56";
       };
     };
     "conventional-changelog-codemirror-0.3.8" = {
@@ -5675,22 +5702,22 @@ let
         sha512 = "24l71rg9rqfl9aa8fi3c1dc2iqxmdsh6ba8b9rwrrj7dg1gzfc5afw03rns5b1h6zld15942aqsjvwklwp6myzw3q1aakaps0m5jwfw";
       };
     };
-    "conventional-changelog-core-2.0.10" = {
+    "conventional-changelog-core-2.0.11" = {
       name = "conventional-changelog-core";
       packageName = "conventional-changelog-core";
-      version = "2.0.10";
+      version = "2.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz";
-        sha512 = "19pvarpv78qfmlnsz11c8anrwfg1v04qmwrsrcnai8p3xmbzdyvp1znz9j23l0i6l26yabkd4b631wybnkgxr4qgwzgb9hvf8fhvz8l";
+        url = "https://registry.npmjs.org/conventional-changelog-core/-/conventional-changelog-core-2.0.11.tgz";
+        sha512 = "13c6y0mi0wqrx2rklaiqn2dxy9bsn53fb0w1r7072y8fp2cbnwdvijn8b42qidrmzcbbpcgn4pcx05h9ghl3vak6izlcy3a37lw9x0y";
       };
     };
-    "conventional-changelog-ember-0.3.11" = {
+    "conventional-changelog-ember-0.3.12" = {
       name = "conventional-changelog-ember";
       packageName = "conventional-changelog-ember";
-      version = "0.3.11";
+      version = "0.3.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz";
-        sha512 = "1pm9wncjsfizvxzf84fp9ywdfm0znj0af0h2012ylazva8iis7zp4vph9ymrnd87kfmdv5gk2s0nsq8gqm6vxh87vbdykg640zczf0j";
+        url = "https://registry.npmjs.org/conventional-changelog-ember/-/conventional-changelog-ember-0.3.12.tgz";
+        sha512 = "2hi3q231r8izwb8863rcmm3craji5glcr8icm0ijxa8jdlanshghdb5pnqrqay09kjkaiff9qxpnggb4b1p8gazg2mb6vmkpc1p6qls";
       };
     };
     "conventional-changelog-eslint-1.0.9" = {
@@ -6143,13 +6170,13 @@ let
         sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4";
       };
     };
-    "create-ecdh-4.0.0" = {
+    "create-ecdh-4.0.1" = {
       name = "create-ecdh";
       packageName = "create-ecdh";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz";
-        sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz";
+        sha512 = "2whpg1253714sq60ayvsap6n3qdwa9l0zhdlxv2gz8frppds69w1q079pmf55qlygnc7ad499511xsbswy0a39asqcp9a0p1w5c56w9";
       };
     };
     "create-error-class-3.0.2" = {
@@ -6161,31 +6188,31 @@ let
         sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
       };
     };
-    "create-hash-1.1.3" = {
+    "create-hash-1.2.0" = {
       name = "create-hash";
       packageName = "create-hash";
-      version = "1.1.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz";
-        sha1 = "606042ac8b9262750f483caddab0f5819172d8fd";
+        url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz";
+        sha512 = "055xaldi3hy1bjxhvznh3470j1kq2xk827mxal79bgqik3lblax6s4inxqby27ymgcghl2hn7wnx9fnacmyq3q93hk6y327cc41nkfg";
       };
     };
-    "create-hmac-1.1.6" = {
+    "create-hmac-1.1.7" = {
       name = "create-hmac";
       packageName = "create-hmac";
-      version = "1.1.6";
+      version = "1.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz";
-        sha1 = "acb9e221a4e17bdb076e90657c42b93e3726cf06";
+        url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz";
+        sha512 = "0p2jhk94k3as67lhrr1jyljkr0y65snxjzqnix0nifnfcanhilccrzkc47gwlg5wy0m8l1gv12lj78ivgmw5m1ww4f8iylr52bbv49h";
       };
     };
-    "create-torrent-3.30.0" = {
+    "create-torrent-3.31.0" = {
       name = "create-torrent";
       packageName = "create-torrent";
-      version = "3.30.0";
+      version = "3.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.30.0.tgz";
-        sha512 = "15hphpabh12fwvjbaihwjr1sqzj6c4lzcms4jbyy0s2jk1rirrg3cb9743g2a8jw2ihz15yfw0dxqwnc6n5nixiazdg7hwaj8d5nfmi";
+        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-3.31.0.tgz";
+        sha512 = "1na322prpyqfv81davvqya3rs9pv99rsh611kvqfaps96izmysyw7ppfm3n8qj94y4z6ib8mjs591f6vhdx501v0nqv27pn09qbsfnh";
       };
     };
     "cron-1.3.0" = {
@@ -6638,13 +6665,13 @@ let
         sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad";
       };
     };
-    "dat-doctor-1.3.1" = {
+    "dat-doctor-1.4.0" = {
       name = "dat-doctor";
       packageName = "dat-doctor";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz";
-        sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk";
+        url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz";
+        sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl";
       };
     };
     "dat-encoding-4.0.2" = {
@@ -6737,13 +6764,13 @@ let
         sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c";
       };
     };
-    "dat-swarm-defaults-1.0.0" = {
+    "dat-swarm-defaults-1.0.1" = {
       name = "dat-swarm-defaults";
       packageName = "dat-swarm-defaults";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz";
-        sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354";
+        url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz";
+        sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag";
       };
     };
     "data-uri-to-buffer-1.2.0" = {
@@ -6809,15 +6836,6 @@ let
         sha512 = "3fxpn11cnyqcz25h9krfrpnra9zi1zri0l4f42a89acybqgj6dyr6p0lskcjffahiwxxmmc0zvgalnlk2wa74b764cm7pd5si78884g";
       };
     };
-    "datland-swarm-defaults-1.0.2" = {
-      name = "datland-swarm-defaults";
-      packageName = "datland-swarm-defaults";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz";
-        sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0";
-      };
-    };
     "debounce-1.1.0" = {
       name = "debounce";
       packageName = "debounce";
@@ -6944,6 +6962,15 @@ let
         sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9";
       };
     };
+    "decimal.js-10.0.0" = {
+      name = "decimal.js";
+      packageName = "decimal.js";
+      version = "10.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.0.0.tgz";
+        sha512 = "1zfwp3adsdq838zcpkpm59x7kdqny1lcdk04r7fw28zy3va4jpjkrkpyyz7ifnzazpks9ky9mjb2xdrkx07nzrh909nzasps0aplcm1";
+      };
+    };
     "decode-uri-component-0.2.0" = {
       name = "decode-uri-component";
       packageName = "decode-uri-component";
@@ -7079,6 +7106,15 @@ let
         sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
       };
     };
+    "deep-extend-0.5.1" = {
+      name = "deep-extend";
+      packageName = "deep-extend";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz";
+        sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp";
+      };
+    };
     "deep-is-0.1.3" = {
       name = "deep-is";
       packageName = "deep-is";
@@ -7457,13 +7493,13 @@ let
         sha1 = "31bb815881c975634c7f3907a5e789341e1560bc";
       };
     };
-    "diffie-hellman-5.0.2" = {
+    "diffie-hellman-5.0.3" = {
       name = "diffie-hellman";
       packageName = "diffie-hellman";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz";
-        sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
+        url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";
+        sha512 = "37186rz3862gn294acnwnm59jwm62x1rz9ca0y5anvmj0a7abs4rhw974qp1j684qpd4rxb8c2kagv21hapxfddr2q72zvyv7ya19lj";
       };
     };
     "difflib-0.2.4" = {
@@ -7538,6 +7574,15 @@ let
         sha1 = "f805211dcac74f6bb3a4d5d5541ad783b1b67d22";
       };
     };
+    "dnd-page-scroll-0.0.4" = {
+      name = "dnd-page-scroll";
+      packageName = "dnd-page-scroll";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dnd-page-scroll/-/dnd-page-scroll-0.0.4.tgz";
+        sha512 = "29fmw2g96bpgniybrcvpic1s5bwffgrckiasf479q7lrgca1b8726rr6kwymwsg7d702dgnvii6fjl48pvsfs4jp2svk5mjj15x9y3f";
+      };
+    };
     "dns-discovery-5.6.1" = {
       name = "dns-discovery";
       packageName = "dns-discovery";
@@ -7925,13 +7970,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "duplexify-3.5.4" = {
+    "duplexify-3.6.0" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.5.4";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz";
-        sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz";
+        sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw";
       };
     };
     "each-async-1.1.1" = {
@@ -8087,13 +8132,13 @@ let
         sha1 = "cac9af8762c85836187003c8dfe193e5e2eae5df";
       };
     };
-    "email-validator-1.1.1" = {
+    "email-validator-2.0.3" = {
       name = "email-validator";
       packageName = "email-validator";
-      version = "1.1.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/email-validator/-/email-validator-1.1.1.tgz";
-        sha512 = "3ydmy134p48c4zswbvjllak53h545dmzsz77bwpfxjf7aw510yyg4w58pazc2yz9agm93rphfgglrlj9cfkfdygcg1rbv0vj4jhjixy";
+        url = "https://registry.npmjs.org/email-validator/-/email-validator-2.0.3.tgz";
+        sha1 = "33e50d66f526b97cd72c17205aefaec79c8a2a1e";
       };
     };
     "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = {
@@ -8934,13 +8979,13 @@ let
         sha1 = "1c86991d816ad1e504750e73874224ecf3bec508";
       };
     };
-    "eventemitter3-3.0.1" = {
+    "eventemitter3-3.1.0" = {
       name = "eventemitter3";
       packageName = "eventemitter3";
-      version = "3.0.1";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.0.1.tgz";
-        sha512 = "0c5685grn5npm90n22lw5hjz93ga3ffc3j6jk5rs4sz0w7ymwj942v3w94ikkgxpvxj7mfawsdrczwad0b7srbkynbwac7xvsxqzq20";
+        url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz";
+        sha512 = "1q3lcjzcm6cva1avw6qkzynnk6rlcp0pblgxxliwry2z52rz9fy82wh630clfv12i64ygywca69hfbj3ki71hy1in94nqxzka32zwla";
       };
     };
     "events-1.1.1" = {
@@ -9690,13 +9735,13 @@ let
         sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695";
       };
     };
-    "filesize-3.6.0" = {
+    "filesize-3.6.1" = {
       name = "filesize";
       packageName = "filesize";
-      version = "3.6.0";
+      version = "3.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/filesize/-/filesize-3.6.0.tgz";
-        sha512 = "1vldkz70kikg8b3ac8l686hm1aplkwqmllm9lg32cvy50hqzcqhari8pl2c41zsvl3bpzzfv7v8db0j91c0qd9vx8wz4w2nhsv9d4w3";
+        url = "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz";
+        sha512 = "1rfby2136b86m318244b42lrcx9hc28vz71cv9i84cd5z7dd3cwvj1gx8mykbjh937yyi1h4q5kk3vhjcldc8pkd2f7iapszgbd3a7c";
       };
     };
     "filestream-4.1.3" = {
@@ -9726,15 +9771,6 @@ let
         sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7";
       };
     };
-    "filled-array-1.1.0" = {
-      name = "filled-array";
-      packageName = "filled-array";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
-        sha1 = "c3c4f6c663b923459a9aa29912d2d031f1507f84";
-      };
-    };
     "filter-obj-1.1.0" = {
       name = "filter-obj";
       packageName = "filter-obj";
@@ -10365,6 +10401,15 @@ let
         sha512 = "13w7dc43h1mv5a43zps5rwsgvlgpd1pj8rwlhmp1fsbyddysv2zy6d8xyaf9hllnqx3ykw62yv1j5z1y79kvyi6hjgymn9cj2cwj61a";
       };
     };
+    "fs-constants-1.0.0" = {
+      name = "fs-constants";
+      packageName = "fs-constants";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz";
+        sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb";
+      };
+    };
     "fs-ext-0.6.0" = {
       name = "fs-ext";
       packageName = "fs-ext";
@@ -10500,13 +10545,13 @@ let
         sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja";
       };
     };
-    "fsevents-1.1.3" = {
+    "fsevents-1.2.3" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.1.3";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz";
-        sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz";
+        sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz";
       };
     };
     "fstream-0.1.31" = {
@@ -10734,6 +10779,15 @@ let
         sha1 = "122e161591e21ff4c52530305693f20e6393a398";
       };
     };
+    "get-stdin-6.0.0" = {
+      name = "get-stdin";
+      packageName = "get-stdin";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz";
+        sha512 = "3p9jcnfk7nqnw43xammn5v5z63nxrxgz675sn70q8sma9ick6wq2plbw8b9r5il5f8f9krdamp316rdxvwcm2j4jagvymrjmhfjv7lf";
+      };
+    };
     "get-stream-2.3.1" = {
       name = "get-stream";
       packageName = "get-stream";
@@ -11104,13 +11158,22 @@ let
         sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe";
       };
     };
-    "globals-11.4.0" = {
+    "global-tunnel-ng-2.1.1" = {
+      name = "global-tunnel-ng";
+      packageName = "global-tunnel-ng";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.1.1.tgz";
+        sha1 = "dab824432260b6dcb70d173b78288e2fa6e0b880";
+      };
+    };
+    "globals-11.5.0" = {
       name = "globals";
       packageName = "globals";
-      version = "11.4.0";
+      version = "11.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-11.4.0.tgz";
-        sha512 = "0fgjya5jfxjd8gzgpnpig973bbplfq2i5fkfpi5lxyjsi3988wq3by19ka2ql2j4a80l9bk5g5brq4vvd2hr61ak79pzwm5z24ycb0g";
+        url = "https://registry.npmjs.org/globals/-/globals-11.5.0.tgz";
+        sha512 = "0lyc1vv873r8cgcxlnj32p6nhdbdsjash1kv2cb1chvawmbr0m83kl565iwhvjd3dyz4ba3d3mr80wa21sqj8hv77knsxiw8bx9z345";
       };
     };
     "globals-9.18.0" = {
@@ -11176,15 +11239,6 @@ let
         sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
       };
     };
-    "got-5.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
-        sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
-      };
-    };
     "got-6.7.1" = {
       name = "got";
       packageName = "got";
@@ -11203,13 +11257,13 @@ let
         sha512 = "0phvycaq4yl6jjpyc9vwmgghfy7a6nnpynscpgpbx74zjaa5dbpl1ag0jf7jvimfk0vf6xfjqgh67xdlvi0ycgvp1kasajapjiqr5b3";
       };
     };
-    "got-8.3.0" = {
+    "got-8.3.1" = {
       name = "got";
       packageName = "got";
-      version = "8.3.0";
+      version = "8.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-8.3.0.tgz";
-        sha512 = "2yzcsaq1ajn6bxgq2c4cmzbvysgdd88zypwa96yw57x2rb9gkbww5djfr8m8b1j0bal94khxaz98qjqjf9777ilh3c0l6w25pyp44wh";
+        url = "https://registry.npmjs.org/got/-/got-8.3.1.tgz";
+        sha512 = "3by57aak00z7wr6h4sax941f2q8mmvcvy815wxm3lzzdkm8l6i6hxbapxxqzsl0mayv96mmlcqnzkx3axzzwk9yx4wr16yqp7wxf8mn";
       };
     };
     "graceful-fs-1.2.3" = {
@@ -11626,15 +11680,6 @@ let
         sha1 = "78c5926893c80215c2b568ae1fd3fcab7a2696b0";
       };
     };
-    "hash-base-2.0.2" = {
-      name = "hash-base";
-      packageName = "hash-base";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz";
-        sha1 = "66ea1d856db4e8a5470cadf6fce23ae5244ef2e1";
-      };
-    };
     "hash-base-3.0.4" = {
       name = "hash-base";
       packageName = "hash-base";
@@ -12004,13 +12049,13 @@ let
         sha1 = "29691b6fc58f4f7e81a3605dca82682b068e4430";
       };
     };
-    "http-parser-js-0.4.11" = {
+    "http-parser-js-0.4.12" = {
       name = "http-parser-js";
       packageName = "http-parser-js";
-      version = "0.4.11";
+      version = "0.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.11.tgz";
-        sha512 = "1y4az74zgv7jy1cav126lbrbvfqv30p7v3ijmj91ychbg0337k71cwy2n5dvmdfvwhgv3vxxzw2ymxlbj6wh1wf6aycb313c0xpj920";
+        url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.12.tgz";
+        sha1 = "b9cfbf4a2cf26f0fc34b10ca1489a27771e3474f";
       };
     };
     "http-proxy-1.0.2" = {
@@ -12031,6 +12076,15 @@ let
         sha1 = "06dff292952bf64dbe8471fa9df73066d4f37742";
       };
     };
+    "http-proxy-1.17.0" = {
+      name = "http-proxy";
+      packageName = "http-proxy";
+      version = "1.17.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz";
+        sha512 = "3z80svhb9hi5fawc8za5qn75lybr53646gfsqm2hkqss4pr186pp7k6f5jnjgw7vrkgjy4yzvb34729q6kvrikn4xgq9gfdg7xsgajd";
+      };
+    };
     "http-proxy-agent-1.0.0" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -12040,6 +12094,15 @@ let
         sha1 = "cc1ce38e453bf984a0f7702d2dd59c73d081284a";
       };
     };
+    "http-proxy-agent-2.1.0" = {
+      name = "http-proxy-agent";
+      packageName = "http-proxy-agent";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz";
+        sha512 = "21cixh55jg0m41bhn1xh9pydf31jq4ip5j525hprkimg376jjxms69raxfbsryi0mzhmgw84g1nb3paqznb1l2ajy0zhnkvnl2dn0db";
+      };
+    };
     "http-proxy-middleware-0.17.4" = {
       name = "http-proxy-middleware";
       packageName = "http-proxy-middleware";
@@ -12175,13 +12238,13 @@ let
         sha512 = "3bml62y8rmpga8wbcxfqm6izvc9xxlblx0vc08r778qa42jgw6fjif4i7f9bj2y98bz4xyimg5vfgch92j6i2l7zcwiq5za8l34cziw";
       };
     };
-    "hypercore-6.13.0" = {
+    "hypercore-6.14.0" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.13.0";
+      version = "6.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz";
-        sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz";
+        sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh";
       };
     };
     "hypercore-protocol-6.6.4" = {
@@ -12337,13 +12400,13 @@ let
         sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
       };
     };
-    "ignore-3.3.7" = {
+    "ignore-3.3.8" = {
       name = "ignore";
       packageName = "ignore";
-      version = "3.3.7";
+      version = "3.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.7.tgz";
-        sha512 = "0f6xhxww989yic6hwdm8mbylcyakfkrrn22a39wdcc9k842xxyyhzfxkmi79s9gjk3rp3h07n265lf4n51z8yafpdm78d617dxbfqb0";
+        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.8.tgz";
+        sha512 = "1pcaabfvizn9sa1m16vdnp2rn54fhkmaw4ayj2vb1amgsjn9w7yw64ac4km7avly142z4gzsgyv8g3im9d1qirlpvg0r18h8k2pwj55";
       };
     };
     "ignore-by-default-1.0.1" = {
@@ -12598,15 +12661,6 @@ let
         sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df";
       };
     };
-    "inquirer-1.0.3" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-1.0.3.tgz";
-        sha1 = "ebe3a0948571bcc46ccccbe2f9bcec251e984bd0";
-      };
-    };
     "inquirer-1.2.3" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -12832,22 +12886,22 @@ let
         sha512 = "1qllik6fjwfq17ic0fxwqyll8mrhmcm36xfsq45xc57mq9ah4i4nn4f8fvgb0gx4kpl3jlpkzndp0xlmmf2mh0xmggw6mhw74fng64v";
       };
     };
-    "is-alphabetical-1.0.1" = {
+    "is-alphabetical-1.0.2" = {
       name = "is-alphabetical";
       packageName = "is-alphabetical";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.1.tgz";
-        sha1 = "c77079cc91d4efac775be1034bf2d243f95e6f08";
+        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.2.tgz";
+        sha512 = "33gw3lnhmg5snnpbjafj2dnv8f55g5wqmssczl998knajppvmp85gwz712jbk0wcj14np1zmghm3j8lsh0xb6r20pf33k0y2vh4sk2p";
       };
     };
-    "is-alphanumerical-1.0.1" = {
+    "is-alphanumerical-1.0.2" = {
       name = "is-alphanumerical";
       packageName = "is-alphanumerical";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.1.tgz";
-        sha1 = "dfb4aa4d1085e33bdb61c2dee9c80e9c6c19f53b";
+        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.2.tgz";
+        sha512 = "2r2l14mwrzcvxayr6ib04k4apkpgcs7m41pnw51999y0nld0a8fjhwhvlw2arkda8hf9anc9ld3bxlxgn9psif9ha488x0797zx89x7";
       };
     };
     "is-arguments-1.0.2" = {
@@ -12958,13 +13012,13 @@ let
         sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16";
       };
     };
-    "is-decimal-1.0.1" = {
+    "is-decimal-1.0.2" = {
       name = "is-decimal";
       packageName = "is-decimal";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.1.tgz";
-        sha1 = "f5fb6a94996ad9e8e3761fbfbd091f1fca8c4e82";
+        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.2.tgz";
+        sha512 = "1g028jya2ymjyzj2gwna1zpajbhhxh2xh2vsi8dp3zzn9a04sgs9vvbcb66gb439mzb95vfpyydhb2h09r7yzhkfbhijwl2cgpfa72d";
       };
     };
     "is-descriptor-0.1.6" = {
@@ -13129,13 +13183,13 @@ let
         sha1 = "9521c76845cc2610a85203ddf080a958c2ffabc0";
       };
     };
-    "is-hexadecimal-1.0.1" = {
+    "is-hexadecimal-1.0.2" = {
       name = "is-hexadecimal";
       packageName = "is-hexadecimal";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.1.tgz";
-        sha1 = "6e084bbc92061fbb0971ec58b6ce6d404e24da69";
+        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.2.tgz";
+        sha512 = "3y2isd2s41r430x4v5hbln61sibalz4af6wp5alq3svvvsmnlg0bhyjjf8nzmcgvrc49hw8w3r32bisxc90r8ia6z65v98sgcdpzsvf";
       };
     };
     "is-installed-globally-0.1.0" = {
@@ -13795,6 +13849,24 @@ let
         sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06";
       };
     };
+    "jquery-3.3.1" = {
+      name = "jquery";
+      packageName = "jquery";
+      version = "3.3.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz";
+        sha512 = "0d5v4s4626l13llvp6hq5wlghysf7lmfxpp0x0ymvcrvikz2xmyrag81wxndb9fy48mx61gcdlbmdwln78s43givdwpmrk9dir5vfai";
+      };
+    };
+    "jquery-ui-1.12.1" = {
+      name = "jquery-ui";
+      packageName = "jquery-ui";
+      version = "1.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz";
+        sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
+      };
+    };
     "js-select-0.6.0" = {
       name = "js-select";
       packageName = "js-select";
@@ -14362,6 +14434,15 @@ let
         sha512 = "0a7k7qcmcik3dwcjd6f0ngq3i3pdz1cc7xz9ck30gd65nd0ylmgx0kf6b686qd1kk32v3rcila2hdj12cnrjwrjqzs96vjqw5jhj04s";
       };
     };
+    "k-rpc-5.0.0" = {
+      name = "k-rpc";
+      packageName = "k-rpc";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/k-rpc/-/k-rpc-5.0.0.tgz";
+        sha512 = "3frk0pf1y988y12m54vkfa2anc0mg6p4yiq5ca8pkvwb56g8n9n58j7f4gh3rnjgw8xb5ib8gc54nmgk8mlsbjm6azf8c2z0ynzc8dw";
+      };
+    };
     "k-rpc-socket-1.8.0" = {
       name = "k-rpc-socket";
       packageName = "k-rpc-socket";
@@ -14543,13 +14624,13 @@ let
         sha1 = "59c128e0dc5ce410201151194eeb9cbf858650f6";
       };
     };
-    "knockout-3.5.0-beta" = {
+    "knockout-3.5.0-rc" = {
       name = "knockout";
       packageName = "knockout";
-      version = "3.5.0-beta";
+      version = "3.5.0-rc";
       src = fetchurl {
-        url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-beta.tgz";
-        sha512 = "2qh1bqb9lj7l92pwcrwmpcanbyn65rmni3swyv6hrphn7xbaw8mkir3w67sf4ardk1iqvz9waalq2wf2rgpvvblhva2n2hssq6as6yr";
+        url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0-rc.tgz";
+        sha512 = "2nys4zw0rwz0601pzq748gvs8x78n570f2j00ggwakyhbzpdgm90ivscnaym52hf226isgqfdjikxr0nig0hbb28d1xf3s1kpks24vr";
       };
     };
     "kuduscript-1.0.16" = {
@@ -14588,15 +14669,6 @@ let
         sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
       };
     };
-    "latest-version-2.0.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
-        sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
-      };
-    };
     "latest-version-3.1.0" = {
       name = "latest-version";
       packageName = "latest-version";
@@ -14759,6 +14831,15 @@ let
         sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3";
       };
     };
+    "leven-2.1.0" = {
+      name = "leven";
+      packageName = "leven";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz";
+        sha1 = "c2e7a9f772094dee9d34202ae8acce4687875580";
+      };
+    };
     "levn-0.3.0" = {
       name = "levn";
       packageName = "levn";
@@ -14957,13 +15038,22 @@ let
         sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e";
       };
     };
-    "lockfile-1.0.3" = {
+    "lockfile-1.0.4" = {
       name = "lockfile";
       packageName = "lockfile";
-      version = "1.0.3";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.3.tgz";
-        sha1 = "2638fc39a0331e9cac1a04b71799931c9c50df79";
+        url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz";
+        sha512 = "1c3gz9fvn9lz8b2whpi7cifz94b28c4gglngjhlcsfgmgbv0093pdkb4865hv6f2dyypr32f7am9ajrhrbjzv3iw9hw2zni8k0d7xkj";
+      };
+    };
+    "locks-0.2.2" = {
+      name = "locks";
+      packageName = "locks";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/locks/-/locks-0.2.2.tgz";
+        sha1 = "259933d1327cbaf0fd3662f8fffde36809d84ced";
       };
     };
     "lodash-1.0.2" = {
@@ -15029,6 +15119,15 @@ let
         sha1 = "bbccce6373a400fbfd0a8c67ca42f6d1ef416432";
       };
     };
+    "lodash-4.17.10" = {
+      name = "lodash";
+      packageName = "lodash";
+      version = "4.17.10";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+        sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i";
+      };
+    };
     "lodash-4.17.5" = {
       name = "lodash";
       packageName = "lodash";
@@ -15254,15 +15353,6 @@ let
         sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c";
       };
     };
-    "lodash.defaultsdeep-4.6.0" = {
-      name = "lodash.defaultsdeep";
-      packageName = "lodash.defaultsdeep";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.0.tgz";
-        sha1 = "bec1024f85b1bd96cbea405b23c14ad6443a6f81";
-      };
-    };
     "lodash.escape-3.2.0" = {
       name = "lodash.escape";
       packageName = "lodash.escape";
@@ -15506,6 +15596,15 @@ let
         sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805";
       };
     };
+    "lodash.set-4.3.2" = {
+      name = "lodash.set";
+      packageName = "lodash.set";
+      version = "4.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz";
+        sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23";
+      };
+    };
     "lodash.some-4.6.0" = {
       name = "lodash.some";
       packageName = "lodash.some";
@@ -15704,6 +15803,15 @@ let
         sha1 = "d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848";
       };
     };
+    "lossless-json-1.0.2" = {
+      name = "lossless-json";
+      packageName = "lossless-json";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lossless-json/-/lossless-json-1.0.2.tgz";
+        sha512 = "2aa3jc0qwf051bd2qwy43qzyfhh8cnqd419qg8cscni65ancjabyrradx3m06r6k84b8r4fc58khm4n6bhk8bpmf282qln79kzpfvfp";
+      };
+    };
     "loud-rejection-1.6.0" = {
       name = "loud-rejection";
       packageName = "loud-rejection";
@@ -15776,6 +15884,15 @@ let
         sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
       };
     };
+    "lru-cache-2.2.4" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
+        sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
+      };
+    };
     "lru-cache-2.5.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -16118,13 +16235,13 @@ let
         sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
       };
     };
-    "mdn-data-1.1.0" = {
+    "mdn-data-1.1.2" = {
       name = "mdn-data";
       packageName = "mdn-data";
-      version = "1.1.0";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.0.tgz";
-        sha512 = "3av1cblh8aix05jyfib9mhm57qx8fnkxgxs2g493mdm4815pisrn8rzgf9yxjiww6psa619aa8l62xigrbwfcag741bgls227f82blc";
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.2.tgz";
+        sha512 = "3x1bk7zqpzy2m8cc3qv575crg71dgj4mb0vl7nq4g3y8bjl2hw0qv2c6ss1iss6gpdrslaif4yp7ggrf0ldiplmk2ld4p9yhmzsljhx";
       };
     };
     "mdns-js-0.5.0" = {
@@ -16172,13 +16289,13 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
-    "mediasource-2.1.3" = {
+    "mediasource-2.2.0" = {
       name = "mediasource";
       packageName = "mediasource";
-      version = "2.1.3";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mediasource/-/mediasource-2.1.3.tgz";
-        sha1 = "27a9c1aac51bfb6eba96af2d13a84d0b2a8eac68";
+        url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.0.tgz";
+        sha512 = "2y4j45xwbrb5cd7b66ndvk5hqy18slbkcvji5krlcg07vpszsrvz732y2ih9li0wn9qh56rx5fz6qb3kdnx877b0snjxhgyj74jlicg";
       };
     };
     "mediawiki-title-0.6.5" = {
@@ -16271,13 +16388,13 @@ let
         sha1 = "72cb668b425228290abbfa856892587308a801fb";
       };
     };
-    "meow-4.0.0" = {
+    "meow-4.0.1" = {
       name = "meow";
       packageName = "meow";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-4.0.0.tgz";
-        sha512 = "2rvzq4615rj5x6za96as8f2xx6zs8m8lzraql20fiv5kr03dm9cy3zqq93ccryl42j9mp2n846pmdpkkh79i15962pnxrppbmxf9vri";
+        url = "https://registry.npmjs.org/meow/-/meow-4.0.1.tgz";
+        sha512 = "3y4j4aqwlphwsfw770c3x06m26vd7lx810g9q39qdg1gsl1hilx48qfig40d9h3i3nj4pc66w1qg6xsmd9g7fyg77darwsr7qf83i65";
       };
     };
     "merge-1.2.0" = {
@@ -16397,13 +16514,13 @@ let
         sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
       };
     };
-    "micro-9.1.0" = {
+    "micro-9.1.4" = {
       name = "micro";
       packageName = "micro";
-      version = "9.1.0";
+      version = "9.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/micro/-/micro-9.1.0.tgz";
-        sha512 = "232sjz2wv3xlfz5wf20jihj8avic507avydzwcf4d8zgy07ha9x3pqc6xkw0y8bjk8f8w30fmih38gsdvz7ph92c4kj4cxxfinph2nh";
+        url = "https://registry.npmjs.org/micro/-/micro-9.1.4.tgz";
+        sha512 = "0zajgsz4m4z0cbibs2vz4brzp6ihq647id9zq67lrcy6nkc9fzjc8fx4g1bsf6nnbjha22fi5sz7lmfq46qixcz807v1p5pjd13kr6r";
       };
     };
     "micro-compress-1.0.0" = {
@@ -16505,13 +16622,13 @@ let
         sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7";
       };
     };
-    "mime-2.2.2" = {
+    "mime-2.3.1" = {
       name = "mime";
       packageName = "mime";
-      version = "2.2.2";
+      version = "2.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-2.2.2.tgz";
-        sha512 = "2ahs0dpq95sf8rrpc024h6jqrvknjnj5v046k755kz6br3pr371y9j9df0srgfszdqviaw4fc6vgngbyik866272hmckw1qif1w7cq3";
+        url = "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz";
+        sha512 = "1xa7b4k7mp4apq8mvj7912m38gzbcbbddaa92lmbb9cbs08z0b2a4x3kds1sr86br6x6r19kygscf20ky6g6wyx313x1jb8qnajai9q";
       };
     };
     "mime-db-1.12.0" = {
@@ -16595,13 +16712,13 @@ let
         sha1 = "d2d0f1887ca363d1acf0ea86d5c4df293b3fb675";
       };
     };
-    "minimalistic-assert-1.0.0" = {
+    "minimalistic-assert-1.0.1" = {
       name = "minimalistic-assert";
       packageName = "minimalistic-assert";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
-        sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
+        url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz";
+        sha512 = "3y39pa1xxg7j49vya7xca4p1mg89d0df56hj4yjhpyhmza3g5qvpgp11xs11wkd48zzy7ym970jfbn0ppimmczpijns249j7q05rljj";
       };
     };
     "minimalistic-crypto-utils-1.0.1" = {
@@ -16730,13 +16847,13 @@ let
         sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1";
       };
     };
-    "mirror-folder-2.1.1" = {
+    "mirror-folder-2.2.0" = {
       name = "mirror-folder";
       packageName = "mirror-folder";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz";
-        sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604";
+        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz";
+        sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r";
       };
     };
     "mississippi-2.0.0" = {
@@ -16865,6 +16982,15 @@ let
         sha512 = "2zf8ycbhqnh9hc6zd3h5s1ii6bjg41z721ffg760j8i045vjjzpzzg542c02ylkic68p0skw1ss97lwphblcw8rip3ik29x9pglhq19";
       };
     };
+    "mold-source-map-0.4.0" = {
+      name = "mold-source-map";
+      packageName = "mold-source-map";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mold-source-map/-/mold-source-map-0.4.0.tgz";
+        sha1 = "cf67e0b31c47ab9badb5c9c25651862127bb8317";
+      };
+    };
     "moment-2.1.0" = {
       name = "moment";
       packageName = "moment";
@@ -16901,13 +17027,13 @@ let
         sha512 = "2zc9qgzsrnp9g4jm4qsb1g1h7w5zmnkz8690br52l83yr9kwhch0mh7r2vdhc706jkrqczia9wbrgkscz0x6k8cwmb3r5jifbpp47v2";
       };
     };
-    "moment-2.22.0" = {
+    "moment-2.22.1" = {
       name = "moment";
       packageName = "moment";
-      version = "2.22.0";
+      version = "2.22.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz";
-        sha512 = "1v5hxqrwy3yd5023aflf2r1nlkayx1sh9cjjyk3415lba199gkimbq72ba26j3rf2azc0zwhqcz86jh8garynvlh1zm6vr33w59fsyn";
+        url = "https://registry.npmjs.org/moment/-/moment-2.22.1.tgz";
+        sha512 = "1hzs2jf69lrw76a4diywsl4451qpm3iavk8f324hgb6x3njb64bd77375kwv4ydllzc5cy1v1mabgciln7yhfd9avn7nvcy6i2n84mj";
       };
     };
     "moment-2.6.0" = {
@@ -16928,13 +17054,13 @@ let
         sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       };
     };
-    "moment-timezone-0.5.14" = {
+    "moment-timezone-0.5.16" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.14";
+      version = "0.5.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.14.tgz";
-        sha1 = "4eb38ff9538b80108ba467a458f3ed4268ccfcb1";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.16.tgz";
+        sha512 = "0vnhrg02rgwwa4zzdm7g9j3sd17j8vn30cjiflg86lac0k2fvfaixl7fwd1yx990yr6abq6zhk5gmaqx2vgz22a6akxld35dbvnbpg1";
       };
     };
     "mongodb-1.2.14" = {
@@ -16991,13 +17117,13 @@ let
         sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92";
       };
     };
-    "mp4-box-encoding-1.1.3" = {
+    "mp4-box-encoding-1.1.4" = {
       name = "mp4-box-encoding";
       packageName = "mp4-box-encoding";
-      version = "1.1.3";
+      version = "1.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.3.tgz";
-        sha512 = "0ma1r4wxwlnxb4xjmq6gga6m4ilsarrcvgj4yrjhngbh5l6gng87i4nakbkm4iqxbnchw75ybivhlfhx8bn4qm525qxirs7gh77i8c9";
+        url = "https://registry.npmjs.org/mp4-box-encoding/-/mp4-box-encoding-1.1.4.tgz";
+        sha512 = "2i0lx4lji8zy0xwa6bzhqp1wdsigp38jlm3k7h7k6k013j8bp5z0nwyvwkr79ax2f1cw2gp7i2vwx99w5swmwy95l8a6188rvq0v857";
       };
     };
     "mp4-stream-2.0.3" = {
@@ -17441,15 +17567,6 @@ let
         sha512 = "349rr7x0djrlkav4gbhkg355852ingn965r0kkch8rr4cwp7qki9676zpq8cq988yszzd2hld6szsbbnd1v6rghzf11abn1nyzlj1vc";
       };
     };
-    "nan-2.3.5" = {
-      name = "nan";
-      packageName = "nan";
-      version = "2.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz";
-        sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08";
-      };
-    };
     "nan-2.5.1" = {
       name = "nan";
       packageName = "nan";
@@ -17607,6 +17724,15 @@ let
         sha1 = "17b09581988979fddafe0201e931ba933c96cbb4";
       };
     };
+    "nconf-0.10.0" = {
+      name = "nconf";
+      packageName = "nconf";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nconf/-/nconf-0.10.0.tgz";
+        sha512 = "3sx74c63qv1f3qy4gg717mvjyxc0zf66w8n5d156zs30vq256h4akw8d723ggf1qprb0q5yda14zn67rx1jlcwlb2cb0gz918qrga3w";
+      };
+    };
     "nconf-0.6.9" = {
       name = "nconf";
       packageName = "nconf";
@@ -17625,15 +17751,6 @@ let
         sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b";
       };
     };
-    "nconf-0.7.2" = {
-      name = "nconf";
-      packageName = "nconf";
-      version = "0.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nconf/-/nconf-0.7.2.tgz";
-        sha1 = "a05fdf22dc01c378dd5c4df27f2dc90b9aa8bb00";
-      };
-    };
     "ncp-0.4.2" = {
       name = "ncp";
       packageName = "ncp";
@@ -17697,13 +17814,13 @@ let
         sha1 = "02a71b008eaf7d55ae89fb9fd7685b7b88d7bc29";
       };
     };
-    "needle-2.2.0" = {
+    "needle-2.2.1" = {
       name = "needle";
       packageName = "needle";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz";
-        sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq";
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz";
+        sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp";
       };
     };
     "negotiator-0.3.0" = {
@@ -17743,13 +17860,13 @@ let
         sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
       };
     };
-    "neo-async-2.5.0" = {
+    "neo-async-2.5.1" = {
       name = "neo-async";
       packageName = "neo-async";
-      version = "2.5.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz";
-        sha512 = "3mgwi8gsgy9lazh0qbpaz8f2l8gvvpn3jp0ghc6xnn0xq0ajdmzp7lfklby1n4s67fy1w5g5gzizyqzds8l3fqsj76cy0mq06rr56cw";
+        url = "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz";
+        sha512 = "3256b78wjq1hf7ycvh6ll1wr0kxpqb01lgj1fdirkrx5lpzz12c4ygifw09c2bag30njm8sfjkwkg3gxpy32kl1w3n9x4cizdzgg8nw";
       };
     };
     "nested-error-stacks-1.0.2" = {
@@ -17860,13 +17977,13 @@ let
         sha512 = "34msnfifpdmxl414b8rch1p1six59jd9251b7wkb37n78fa84xfa5f5f5cxxp477wb846nfrsg6b1py3rahz4xdpk17lzzy9kvdjr5f";
       };
     };
-    "node-abi-2.3.0" = {
+    "node-abi-2.4.1" = {
       name = "node-abi";
       packageName = "node-abi";
-      version = "2.3.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.3.0.tgz";
-        sha512 = "2ijjyzh7bcyyhjaa5m0kdfg6hvxkq6czwxfg6y5d2nl6v7m9qab2ixwgvzbaaivn0r0ig48j4443905167vnpzgvlq5icfj9nyvl2fg";
+        url = "https://registry.npmjs.org/node-abi/-/node-abi-2.4.1.tgz";
+        sha512 = "3mhfjq1a2ahvkjijw39q6wg6hdiqhz9nf02wjmn61sc0fc7fn0631wxafvny4gjnljin7yv808lhcswg0v1lrcg7k3bqhs7mb16qjd5";
       };
     };
     "node-alias-1.0.4" = {
@@ -17995,13 +18112,13 @@ let
         sha512 = "2cwrivwc0ha272cly9r61bbb14kkl1s1hsmn53yr88b6pfjqj512nac6c5rphc6ak88v8gpl1f879qdd3v7386103zzr7miibpmbhis";
       };
     };
-    "node-red-node-email-0.1.27" = {
+    "node-red-node-email-0.1.29" = {
       name = "node-red-node-email";
       packageName = "node-red-node-email";
-      version = "0.1.27";
+      version = "0.1.29";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.27.tgz";
-        sha512 = "0r799aswbfv6f9rjdrh6bddfzwj1mpinlani8cwc7zbmipcf4dsyffmf3xghb3hpb15k26jvpb46f2ia8cff1vyn4i9h3jn5dnzflnc";
+        url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.29.tgz";
+        sha512 = "0xrn1958dc81s10r3ynp4v7697py7bdhawvk71cgca1wi6ysj9w8r1dbfc29znpzz0kpmqy07v0y98nxasy6ing7hsc0kyd8rmrvnps";
       };
     };
     "node-red-node-feedparser-0.1.12" = {
@@ -18049,15 +18166,6 @@ let
         sha512 = "3a22r0jr4112h0vr1smzrsaygc607v13arhjbjwzmy1jvmcrdlq9ydnw96ailkrlnwl3k0l65hjcgnrgkdwyc2qhbfnq2bgk0xz7pkd";
       };
     };
-    "node-status-codes-1.0.0" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
-        sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
-      };
-    };
     "node-swt-0.1.1" = {
       name = "node-swt";
       packageName = "node-swt";
@@ -18094,13 +18202,13 @@ let
         sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907";
       };
     };
-    "node-version-1.1.0" = {
+    "node-version-1.1.3" = {
       name = "node-version";
       packageName = "node-version";
-      version = "1.1.0";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz";
-        sha512 = "0kc13ygbwm9zdjqv43ccb3mvfhmkwack6ziqcadw58b0f8ssv8h2gdr0br8xaqxpxp0h6pz9vm28yns03nl1vbqbgdankcsb127cmdp";
+        url = "https://registry.npmjs.org/node-version/-/node-version-1.1.3.tgz";
+        sha512 = "0zdxwcfi3gca8d1jdg3m1gh6b3xxsc7sxpdrnvabc5j5fdgmhcdqaxv3q28rl95ibb7qjcvw7c7k5wzhrvhayb9vn6lr7snabkh8k5c";
       };
     };
     "node-wsfederation-0.1.1" = {
@@ -18355,13 +18463,13 @@ let
         sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
-    "npm-6.0.0-next.0" = {
+    "npm-6.0.0" = {
       name = "npm";
       packageName = "npm";
-      version = "6.0.0-next.0";
+      version = "6.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-6.0.0-next.0.tgz";
-        sha512 = "06yn34ji94fcadvnj3mafxlv8hnin0mgrdpdjplk33nkjc8niq5kr1kfwikqxj36kyzwdcz8a27599sakryvgvb14mqjabc525ik35x";
+        url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
+        sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
       };
     };
     "npm-bundled-1.0.3" = {
@@ -18391,13 +18499,13 @@ let
         sha1 = "99b85aec29fcb388d2dd351f0013bf5268787e67";
       };
     };
-    "npm-package-arg-6.0.0" = {
+    "npm-package-arg-6.1.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
-      version = "6.0.0";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.0.0.tgz";
-        sha512 = "15a1x3fjip5waxap8dbjkm88j0c2bcnay8pw14p74h1499wznynw2if91shrqlrbzwia09x4xiphp6wkxga5z8vf9k08bjarn1vn047";
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.0.tgz";
+        sha512 = "14dqycy588sf0k73livvvpmp1dqmbhacc97pq3ksxk1wrm9j82r7hhlrxigj0nb58gz4cbvbh3isj1x3sjiqxs60dhv439xd4zy31nd";
       };
     };
     "npm-packlist-1.1.10" = {
@@ -18941,15 +19049,6 @@ let
         sha1 = "7abc22e644dff63b0a96d5ab7f2790c0f01abc95";
       };
     };
-    "opn-5.2.0" = {
-      name = "opn";
-      packageName = "opn";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opn/-/opn-5.2.0.tgz";
-        sha512 = "12iyalgghs3dj0pfb7rxa013x946169yfsjfd15fsfrx5kv80z2qh082x7v7d91hh7bf9vxcm4wqmyyj9ckk3gnvc7mw77j6fkwdpr5";
-      };
-    };
     "opn-5.3.0" = {
       name = "opn";
       packageName = "opn";
@@ -19292,6 +19391,15 @@ let
         sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0";
       };
     };
+    "pac-proxy-agent-2.0.2" = {
+      name = "pac-proxy-agent";
+      packageName = "pac-proxy-agent";
+      version = "2.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz";
+        sha512 = "3222l2ayjn9gj3q7br4vxqz1a5bq5h53fcqvrns3zdlqfinarbi0kgkrlf7vyc7arr7ljks5988y4a6lyd663br23wvg391a4vl0cvh";
+      };
+    };
     "pac-resolver-2.0.0" = {
       name = "pac-resolver";
       packageName = "pac-resolver";
@@ -19301,6 +19409,15 @@ let
         sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd";
       };
     };
+    "pac-resolver-3.0.0" = {
+      name = "pac-resolver";
+      packageName = "pac-resolver";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz";
+        sha512 = "1w6mzypllad7wy658kd56fqih6i8x0f841a2pnnn97dhkk810nw3r9f73kpxqa6llkrgy6p1ax4xy1rgbzvrf4zczblvf13pgqkgixm";
+      };
+    };
     "package-json-1.2.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -19310,15 +19427,6 @@ let
         sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
       };
     };
-    "package-json-2.4.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
-        sha1 = "0d15bd67d1cbbddbb2ca222ff2edb86bcb31a8bb";
-      };
-    };
     "package-json-4.0.1" = {
       name = "package-json";
       packageName = "package-json";
@@ -19400,22 +19508,22 @@ let
         sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
       };
     };
-    "parse-asn1-5.1.0" = {
+    "parse-asn1-5.1.1" = {
       name = "parse-asn1";
       packageName = "parse-asn1";
-      version = "5.1.0";
+      version = "5.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz";
-        sha1 = "37c4f9b7ed3ab65c74817b5f2480937fbf97c712";
+        url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz";
+        sha512 = "1vq07bq1c0b5v82mknyg2y4lrdy1qmqkzw432f406rx9v2hni3040z270kpsvi2vf4ikq6x0k9g8p16n7aafrwsrpwvx0wpa9z7pz18";
       };
     };
-    "parse-entities-1.1.1" = {
+    "parse-entities-1.1.2" = {
       name = "parse-entities";
       packageName = "parse-entities";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz";
-        sha1 = "8112d88471319f27abae4d64964b122fe4e1b890";
+        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.2.tgz";
+        sha512 = "192kwdas18b36rdffjp98qvq4ssnmnndryvcz2lzz6g8dnn5pfglabpjcj4p9bngkyp5z0fwvpb0vj4i9zdskp8gzbig6zd1scnbpz4";
       };
     };
     "parse-filepath-1.0.2" = {
@@ -19499,13 +19607,22 @@ let
         sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7";
       };
     };
-    "parse-torrent-5.8.3" = {
+    "parse-torrent-5.9.1" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "5.8.3";
+      version = "5.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.8.3.tgz";
-        sha1 = "f95ef23301239609de406794ad9f958a1bca1b6c";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.9.1.tgz";
+        sha512 = "31lm2ifw06p00gc0qvxinqvy8afhq0lrg3fpf5rrhb6dqx3avd3ykps8sjv2nj91wf06k62yvn9cvf1f243yzl9xpzy9255556x8bnb";
+      };
+    };
+    "parse-torrent-6.0.0" = {
+      name = "parse-torrent";
+      packageName = "parse-torrent";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-6.0.0.tgz";
+        sha512 = "1yr12djspi83lybgycwsaz5wbikbsazwhk2w4xf3niri1lx0p3965br1xbsjw1m0xrzc71q6mw5xz44w0hd3ic5wmb2v62abl7kld16";
       };
     };
     "parse-torrent-file-2.1.4" = {
@@ -19517,15 +19634,6 @@ let
         sha1 = "32d4b6afde631420e5f415919a222b774b575707";
       };
     };
-    "parse-torrent-file-4.1.0" = {
-      name = "parse-torrent-file";
-      packageName = "parse-torrent-file";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-4.1.0.tgz";
-        sha512 = "2cxnv563f946k2ng808an4gcj7yi23drqv8agns3h69drrbv0rq47wdi0xjs0lsvi1i36i7l1wzaci4c4gzzfy8ghfmv4k06hpb5ph5";
-      };
-    };
     "parse5-3.0.3" = {
       name = "parse5";
       packageName = "parse5";
@@ -19940,13 +20048,13 @@ let
         sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
       };
     };
-    "pbkdf2-3.0.14" = {
+    "pbkdf2-3.0.16" = {
       name = "pbkdf2";
       packageName = "pbkdf2";
-      version = "3.0.14";
+      version = "3.0.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.14.tgz";
-        sha512 = "30bb7vx0m1k1m3d1i1khgvmgddx3ahqgprs421ssrh5plpx50k5bazsj67gdi7qiknircqy59yxbclq95s2rnmk8ysgkqdpsddijfw2";
+        url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz";
+        sha512 = "1q07jjlhbbn9fd1aqyrqqxlv184k8ppbafavwvb19lvgbzvp8fnrx7qd9lkbfzb6g4592czp178wizmgvhrhandxngiljv1gczrg06b";
       };
     };
     "peer-wire-protocol-0.7.1" = {
@@ -20157,13 +20265,13 @@ let
         sha1 = "a32b907f28d17f61b74d45d46fd89dea3c4e88b5";
       };
     };
-    "please-upgrade-node-3.0.1" = {
+    "please-upgrade-node-3.0.2" = {
       name = "please-upgrade-node";
       packageName = "please-upgrade-node";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.1.tgz";
-        sha1 = "0a681f2c18915e5433a5ca2cd94e0b8206a782db";
+        url = "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.0.2.tgz";
+        sha512 = "2x54acxamqkr98gwnwf5h8bajcrcsv8b4156laym47ibf2093kbnki8v4dlk7zs8q5dclqnhqdr6p183phna67v0wdwb4mywm4mzjbf";
       };
     };
     "plist-1.2.0" = {
@@ -20319,13 +20427,13 @@ let
         sha512 = "174sg3cs8v8bqg8rnk673qp365n46kls3f3a41pp0jx48qivkg06rck0j2bfyzm5hr1i6kjbcn82h1rkjgfi5jbd0amrd877m3wfpbz";
       };
     };
-    "postcss-6.0.21" = {
+    "postcss-6.0.22" = {
       name = "postcss";
       packageName = "postcss";
-      version = "6.0.21";
+      version = "6.0.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-6.0.21.tgz";
-        sha512 = "1vvp2mzw4gq6zm875fi7hgyypy0a44mbdpv0i4aqxsq8xajdxfyaz4ap4idh29v74ag4z26wla48k315yyg3d0h83zxkn1kniywmxnb";
+        url = "https://registry.npmjs.org/postcss/-/postcss-6.0.22.tgz";
+        sha512 = "0fdfvn2pq9hvw40s9l174v5rv4d5x3i9xmd8p3mln6bhzrny3v1h0y1324ghq30jnbrvyfam0725r3hsmj28lhhmc32q08lpaa3v1sf";
       };
     };
     "prebuild-install-2.1.2" = {
@@ -20337,13 +20445,13 @@ let
         sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505";
       };
     };
-    "prebuild-install-2.5.1" = {
+    "prebuild-install-2.5.3" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "2.5.1";
+      version = "2.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.1.tgz";
-        sha512 = "013s09xwdppxw3n9h0vz22br6q1dc5rkh8pk9nk3xl0pqsv495qj1y8k5srgmgm7692q1hlyj08nrfbr9nr232bsrkcvhbkm8pzsdfw";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz";
+        sha512 = "3z8bc2sx9ibs343jllm11azqkcc7vxpf0skfm68dqwz9l59z381vbqip00sgpzg9di2zagjm3wbx65s6g2kg5kj8b1vp0vnqglkgcpy";
       };
     };
     "precond-0.2.3" = {
@@ -20715,6 +20823,15 @@ let
         sha1 = "57eb5347aa805d74ec681cb25649dba39c933499";
       };
     };
+    "proxy-agent-3.0.0" = {
+      name = "proxy-agent";
+      packageName = "proxy-agent";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz";
+        sha512 = "1krp2s6sjv452zj0xhmknrm0769jx2v21bfas1aw2kvg2zhdxcq32w7i6kg87fd9ajyynss694bylaw8khkg8clsgxifz9wg6zgmac3";
+      };
+    };
     "proxy-from-env-1.0.0" = {
       name = "proxy-from-env";
       packageName = "proxy-from-env";
@@ -20787,13 +20904,13 @@ let
         sha512 = "3jqj1qpjdy5lizvm5mir14vqzzqgaim2yl0iwa164ps6mlp20liyaid1mhr62k23dg0zbkk11zcnzk56d0xvzy9ddbdfmjcnjy3k4mb";
       };
     };
-    "public-encrypt-4.0.0" = {
+    "public-encrypt-4.0.2" = {
       name = "public-encrypt";
       packageName = "public-encrypt";
-      version = "4.0.0";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz";
-        sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
+        url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz";
+        sha512 = "38qgcvnxnp4lva9c0x6xhq05hb811n8q5s8dxchm5mg04rv64693a1w2hrhy8lcgbvs36kv003ar1xsh312c866hzvwb0qwr897jhp2";
       };
     };
     "pug-2.0.3" = {
@@ -20994,13 +21111,13 @@ let
         sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
       };
     };
-    "pumpify-1.4.0" = {
+    "pumpify-1.5.0" = {
       name = "pumpify";
       packageName = "pumpify";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pumpify/-/pumpify-1.4.0.tgz";
-        sha512 = "1h37biy199n445y10vpyiswwcxv8zigfqp0b1xwgbyjq51f2dhjn1pcggjc4j5ccbd64l1ivfi0bqinx4m5clcawvwggy7jv93qsjfs";
+        url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz";
+        sha512 = "0kf28xyrgm26kblaainzcxi4dqyxv0q1a03b55a9sma3b37sf9nkk2ysk7df2r4864ic4yr4j47plap1l0lck1raxnwraz8a29b8s2i";
       };
     };
     "punycode-1.3.2" = {
@@ -21219,6 +21336,15 @@ let
         sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
       };
     };
+    "qs-6.5.2" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
+      };
+    };
     "qtdatastream-0.7.1" = {
       name = "qtdatastream";
       packageName = "qtdatastream";
@@ -21309,13 +21435,13 @@ let
         sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2";
       };
     };
-    "random-access-storage-1.1.1" = {
+    "random-access-storage-1.2.0" = {
       name = "random-access-storage";
       packageName = "random-access-storage";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz";
-        sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1";
+        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz";
+        sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118";
       };
     };
     "random-bytes-1.0.0" = {
@@ -21453,13 +21579,13 @@ let
         sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
       };
     };
-    "raw-socket-1.5.2" = {
+    "raw-socket-1.6.0" = {
       name = "raw-socket";
       packageName = "raw-socket";
-      version = "1.5.2";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.2.tgz";
-        sha512 = "0afwhc6rx359xqdsjiyxdlj46kb8mq4lkwy9fhmgszkp8cai9pk8927vxvg4gpg522clwx3dv1xsbnx745pip7crbjdb7kn2i8p2iqy";
+        url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.6.0.tgz";
+        sha512 = "2268lfw8q4mz0v988by3y0hbad848sx7kmmqm3rk7nbj7xc3sy045adcdbnh3c8vrhk57ljk61wshphgr69y8pw3987f1if369ny7pr";
       };
     };
     "rc-0.4.0" = {
@@ -21471,13 +21597,13 @@ let
         sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
       };
     };
-    "rc-1.2.6" = {
+    "rc-1.2.7" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz";
-        sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz";
+        sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid";
       };
     };
     "rc-config-loader-2.0.1" = {
@@ -21705,13 +21831,13 @@ let
         sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
       };
     };
-    "record-cache-1.0.1" = {
+    "record-cache-1.0.2" = {
       name = "record-cache";
       packageName = "record-cache";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.1.tgz";
-        sha512 = "3a25qmwmlljwlcc1zpn80lrq3hmwwaykiac95q2gcm1im4wchk9mdhbgak2lidqijaf6mil2rp5sbm0zfzvvh39nz1lmlz72sll39iy";
+        url = "https://registry.npmjs.org/record-cache/-/record-cache-1.0.2.tgz";
+        sha512 = "2iykkjgwmmcma3306cjzsq34dg6rxfvwr4r11fyq56dfsybp9qwnvhc4fbi3l854zfj71fbw887bgab78ykr6b3m9gdw2lpf5sa53c0";
       };
     };
     "recursive-readdir-2.2.2" = {
@@ -21957,13 +22083,13 @@ let
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "render-media-2.12.0" = {
+    "render-media-3.0.0" = {
       name = "render-media";
       packageName = "render-media";
-      version = "2.12.0";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/render-media/-/render-media-2.12.0.tgz";
-        sha512 = "1y1njral1kn6s6g797ji5pl475zcmvcmrgdnv1vliq8q33vw3b4i4i5fsx9yj2ap7jdpb461507wpijixf56rc5q4r97542zvzxq0by";
+        url = "https://registry.npmjs.org/render-media/-/render-media-3.0.0.tgz";
+        sha512 = "27zqxwa89zq3m0h5qykra6yx9jbc5cljfpx80nrm3y3rhl7ngm17fyb42xhw2sa584x2ld6ll1lnyrhvs3cihfm1ivd9g1hlvjvjaai";
       };
     };
     "render-readme-1.3.1" = {
@@ -22200,13 +22326,13 @@ let
         sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
       };
     };
-    "resolve-1.7.0" = {
+    "resolve-1.7.1" = {
       name = "resolve";
       packageName = "resolve";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/resolve/-/resolve-1.7.0.tgz";
-        sha512 = "2f21aw16zyl0cnz3cr5pvskv4f4lxhp2c14ak8p80kam37nayxdsi9j9n9bcdpilnqbw2pbipxc4nx4vqhyg3mnlhjn1mfip3jikn21";
+        url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz";
+        sha512 = "1zhdyfbs9gfd5iswb8dbra3gljv9mglapgcirci1zsfs78rfn557rp6z81drxxsz0m4w4imm2n9qf7yrchkfjhxz9a0vwp9hwpg1fkk";
       };
     };
     "resolve-dir-1.0.1" = {
@@ -22407,13 +22533,13 @@ let
         sha512 = "3kmrqh8xli7rzfm8wc6j9lp0c6vml172iv3z088an9xlwl1xvkvh3fn92za66ms4c9yww80qa5kan31k1z1ypqvkchmh1mznb09xdwn";
       };
     };
-    "ripemd160-2.0.1" = {
+    "ripemd160-2.0.2" = {
       name = "ripemd160";
       packageName = "ripemd160";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz";
-        sha1 = "0f4584295c53a3628af7e6d79aca21ce57d1c6e7";
+        url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz";
+        sha512 = "0hbd4cqbkycj691cj7gm40x3x5w46xk56xkg6n11wskc3k4xbdz1xxxyy6r27rcwipkzp19y1fmpfmb4lgf10l8asn6prdn11m24bla";
       };
     };
     "rndm-1.2.0" = {
@@ -22488,22 +22614,22 @@ let
         sha1 = "0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0";
       };
     };
-    "run-parallel-1.1.8" = {
+    "run-parallel-1.1.9" = {
       name = "run-parallel";
       packageName = "run-parallel";
-      version = "1.1.8";
+      version = "1.1.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.8.tgz";
-        sha512 = "1jzs29b3g9xx5408i8gzyflx0wajfa1ai9sgm63pbvkaas0351j9y92kxq06x8dhg7w829skizs88cdlf156zfm1yk5brbbb0spb6vv";
+        url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz";
+        sha512 = "3sl2kbxcwy92faw7zm0z4vql32622mag0bh6dv4bjk7cvc8a9sarvdclr9508hknhl0b7v8kzqvg3klvvff7psmvkfg9hy32i4sfjhc";
       };
     };
-    "run-parallel-limit-1.0.4" = {
+    "run-parallel-limit-1.0.5" = {
       name = "run-parallel-limit";
       packageName = "run-parallel-limit";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.4.tgz";
-        sha512 = "2y7d7x3kwlwgyqvhlklxl08rkc63c2ww0jf8pcwlnw4nl2k3wcbkid5fwg130cbkwzslv8c4xrrxccng4yqib8dbcgivyq0h855k4yf";
+        url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz";
+        sha512 = "2b87xk6x0fxs3bls9zzprvxiy2ldgvjxckkfv3ccg23j6f8qv58379pmylkkiv61w6b8qcsmsciwch7lg41nxx0qk6bpgp076h3xiin";
       };
     };
     "run-queue-1.0.3" = {
@@ -22515,13 +22641,13 @@ let
         sha1 = "e848396f057d223f24386924618e25694161ec47";
       };
     };
-    "run-series-1.1.6" = {
+    "run-series-1.1.8" = {
       name = "run-series";
       packageName = "run-series";
-      version = "1.1.6";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/run-series/-/run-series-1.1.6.tgz";
-        sha512 = "2rpksrvsfrz5kv3cwr448d60521dlky61p5hp3ci7g8140yfm58g7xak4gkqysfc9cm6hknxyizfs832939fxg01qslxrzlx7l805a1";
+        url = "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz";
+        sha512 = "1gg6q66zyhqr3ylp9zx79v9qyxns1j643p9gkk2kqkijihpvp27ilhzg0qb8kiqxcsw2m0y5rbmdkq6qdhnkar4l088p96i8dhfsv7q";
       };
     };
     "rusha-0.8.13" = {
@@ -22578,13 +22704,13 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "rxjs-5.5.8" = {
+    "rxjs-5.5.10" = {
       name = "rxjs";
       packageName = "rxjs";
-      version = "5.5.8";
+      version = "5.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.8.tgz";
-        sha512 = "32whnkvnay58zbcwimj3lpagg52k7swjdcys6i14a0im2hj1svh602bpvpb3zrqv36k96a1gsjjzbjxvfy6aj89i838l06mxsiflgh7";
+        url = "https://registry.npmjs.org/rxjs/-/rxjs-5.5.10.tgz";
+        sha512 = "3lc28jznaclc3qcipvf29dnfa11m4xdzyr4gkas29pgp0s4c44f8cyzsxyfwkqzqa8k06q7j7hl5wwyy671d8gdkwl9j76lh2cf4629";
       };
     };
     "safe-buffer-5.0.1" = {
@@ -22605,6 +22731,15 @@ let
         sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
       };
     };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
+      };
+    };
     "safe-json-parse-1.0.1" = {
       name = "safe-json-parse";
       packageName = "safe-json-parse";
@@ -22641,6 +22776,15 @@ let
         sha512 = "2v99f22kh56y72d3s8wrgdvf5n10ry40dh3fwnsxr4d5rfvxdfxfmc3qyqkscnj4f8799jy9bpg6cm21x2d811dr9ib83wjrlmkg6k1";
       };
     };
+    "sander-0.5.1" = {
+      name = "sander";
+      packageName = "sander";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sander/-/sander-0.5.1.tgz";
+        sha1 = "741e245e231f07cafb6fdf0f133adfa216a502ad";
+      };
+    };
     "sanitize-html-1.18.2" = {
       name = "sanitize-html";
       packageName = "sanitize-html";
@@ -22722,6 +22866,15 @@ let
         sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8";
       };
     };
+    "secure-keys-1.0.0" = {
+      name = "secure-keys";
+      packageName = "secure-keys";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz";
+        sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
+      };
+    };
     "seek-bzip-1.0.5" = {
       name = "seek-bzip";
       packageName = "seek-bzip";
@@ -22821,6 +22974,15 @@ let
         sha512 = "0h32zh035y8m6dzcqhcymbhwgmc8839fa1hhj0jfh9ivp9kmqfj1sbwnsnkzcn9qm3sqn38sa8ys2g4c638lpnmzjr0a0qndmv7f8p1";
       };
     };
+    "semver-compare-1.0.0" = {
+      name = "semver-compare";
+      packageName = "semver-compare";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz";
+        sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc";
+      };
+    };
     "semver-diff-2.1.0" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -22965,13 +23127,13 @@ let
         sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c";
       };
     };
-    "serialize-javascript-1.4.0" = {
+    "serialize-javascript-1.5.0" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
-      version = "1.4.0";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.4.0.tgz";
-        sha1 = "7c958514db6ac2443a8abc062dc9f7886a7f6005";
+        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz";
+        sha512 = "2hiydb59y0q07hp3qfs8g9qjhgmhmajps769wpw2f5ghxwy3ibr7y7lnx7q23snmc3asgzhik0444jvfs3d4gmy0qx9w0n0v3q1rbqr";
       };
     };
     "serve-favicon-2.3.2" = {
@@ -23316,13 +23478,22 @@ let
         sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb";
       };
     };
-    "simple-get-2.7.0" = {
+    "simple-get-2.8.1" = {
       name = "simple-get";
       packageName = "simple-get";
-      version = "2.7.0";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.7.0.tgz";
-        sha512 = "2r1w3cxxmd92r19mjrlzwn6xypjd5vrx0gk21l2bmxcp1x54pavhmifbhq8llxfk6z2lmzly7g3l8rrdl19m65nzlcicwy7cfn3sha6";
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz";
+        sha512 = "13j7pz8kfspyi25dkkvb6wm5r95yf7adskwf7z46g02vv27clgq9lgpbxx2hy1s5qip45dim625sby77fm4c67h31a0769p5i2qf94m";
+      };
+    };
+    "simple-get-3.0.2" = {
+      name = "simple-get";
+      packageName = "simple-get";
+      version = "3.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/simple-get/-/simple-get-3.0.2.tgz";
+        sha512 = "021na7dsxyawdzbif9l56dzgvzdd5s4kwm09rb8hg3abvr94i05arvn0z6q5vmpi24bmnnp2i677rf7964fza0frx3zx406a82x6kbm";
       };
     };
     "simple-git-1.92.0" = {
@@ -23352,13 +23523,13 @@ let
         sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3";
       };
     };
-    "simple-peer-9.0.0" = {
+    "simple-peer-9.1.1" = {
       name = "simple-peer";
       packageName = "simple-peer";
-      version = "9.0.0";
+      version = "9.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.0.0.tgz";
-        sha512 = "1fwihnw60ayp1hyj2rp40cshqhi32rj1gjhr060awg35rk762z9a4d15zapvxi76bmdhgs3vs8lv7xmdqxbabg8d3z1xlkq5vnhq0d1";
+        url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.1.1.tgz";
+        sha512 = "27d9j7ah5ync1cndpinw966zb81lc9z6pc38y8dkc1l5rxdkv3fmf5ilhf0jq94m3qvb2ipldjmvbs1sza5ccvazwlr4pjgfr07ym23";
       };
     };
     "simple-plist-0.2.1" = {
@@ -23658,121 +23829,121 @@ let
         sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
       };
     };
-    "snyk-1.71.0" = {
+    "snyk-1.78.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.71.0";
+      version = "1.78.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.71.0.tgz";
-        sha1 = "842cfed35ffac591ac34824ce0f1467655c5f8f1";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.78.1.tgz";
+        sha1 = "a9eefbc97c6f0179f3cc318a4232aacd57e347fe";
       };
     };
-    "snyk-config-1.0.1" = {
+    "snyk-config-2.1.0" = {
       name = "snyk-config";
       packageName = "snyk-config";
-      version = "1.0.1";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-1.0.1.tgz";
-        sha1 = "f27aec2498b24027ac719214026521591111508f";
+        url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.1.0.tgz";
+        sha512 = "0r81kdx8az7nfiv0r36ggarzdw5rzai06qivv1r48xdfax2gdz9axxjhnwyzhf3mpz6245fz2ilc8l349h85s01yh05rxjsjvbg6m8g";
       };
     };
-    "snyk-go-plugin-1.4.6" = {
+    "snyk-go-plugin-1.5.0" = {
       name = "snyk-go-plugin";
       packageName = "snyk-go-plugin";
-      version = "1.4.6";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.4.6.tgz";
-        sha512 = "3002f73liv15dpg1ls92j4m50374z69p9ic74zpqmr8mjlxcdv09gcxkdmg0bdkzlj3s02bpmdj7vrkw5jb2k2f6zbrr5g4d18pjy8n";
+        url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.5.0.tgz";
+        sha512 = "20i967dg1n1pir2j0ivpd72i5j3y9xa3826jvl8jspmg9wfnpfq6x0isp3irw42zrcvflshi0nhk3sckcj3lqgjaw82g14wda28g80z";
       };
     };
-    "snyk-gradle-plugin-1.2.0" = {
+    "snyk-gradle-plugin-1.3.0" = {
       name = "snyk-gradle-plugin";
       packageName = "snyk-gradle-plugin";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.2.0.tgz";
-        sha512 = "1b2bxvwl2v4prlj942i4jkz4mahgp39j7lvy91jzv00nsk59l76b1icn48zj4zk84s00jil3pnxnfzsclhcc612d70s4wwi3x2hrrqn";
+        url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-1.3.0.tgz";
+        sha512 = "22av46k72s8cgigsj0ppir7cd1150079mg1hhb8qgkg9a4asdw3wn48ahwra08rai0rd4z4jhwhmhpc7d63np4ivvjdqcy30qzmr9mc";
       };
     };
-    "snyk-module-1.8.1" = {
+    "snyk-module-1.8.2" = {
       name = "snyk-module";
       packageName = "snyk-module";
-      version = "1.8.1";
+      version = "1.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.1.tgz";
-        sha1 = "31d5080fb1c0dfd6fa8567dd34a523fd02bf1fca";
+        url = "https://registry.npmjs.org/snyk-module/-/snyk-module-1.8.2.tgz";
+        sha512 = "03372r6cvic19gajy5sa3q11sjal4499svhv50bglywf9jfi2555lpnvsshh08kr6krwcmnm7vb3fm4va3pb616h5wy4ln2kxnmva2y";
       };
     };
-    "snyk-mvn-plugin-1.1.1" = {
+    "snyk-mvn-plugin-1.2.0" = {
       name = "snyk-mvn-plugin";
       packageName = "snyk-mvn-plugin";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.1.1.tgz";
-        sha512 = "3h9drys1g2wh3w072rn00zw57g5xy42ap38k05gvdryiphx8p9iksb4azg4dyf2vd616jzslqid45hjd6iphafdzpk4b90mws880hqa";
+        url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-1.2.0.tgz";
+        sha512 = "3pq0wqa8isczv7pcwfm9jfh5qkwjd482hw45m40c5vnnzbxxbji4m1zvxybpzb08azfp6rigblr0hkrhb8m59qf24hcy1scgn3ddr49";
       };
     };
-    "snyk-nuget-plugin-1.3.9" = {
+    "snyk-nuget-plugin-1.4.0" = {
       name = "snyk-nuget-plugin";
       packageName = "snyk-nuget-plugin";
-      version = "1.3.9";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.3.9.tgz";
-        sha512 = "017qpf5cy1f0x8apjc1a3qp3aa9w7v7zlyy8jb8r7q4ilsnpdzvywrxhd6s1yy3b9fiylmgmldgdcz77srqq9pm2njvdi80pyd00zqp";
+        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.4.0.tgz";
+        sha512 = "1frla7fsnn7ijg088bjqqy7iq5q0if7sz337rb1g6h5kg760z7968yjgi3nprp218vbpqjrf75xpi6m8dj8k04gpfdkb2am9klnymh4";
       };
     };
-    "snyk-php-plugin-1.3.2" = {
+    "snyk-php-plugin-1.5.0" = {
       name = "snyk-php-plugin";
       packageName = "snyk-php-plugin";
-      version = "1.3.2";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.3.2.tgz";
-        sha512 = "2fihlcs2qxdbdfy1pjnf7110l6h4r16vkp0q51wqsfd8fw5s1qgb34plii6yhbfbs8a1il93i6hfn93yclbv50m2129wg7naf57jlqi";
+        url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.0.tgz";
+        sha512 = "10p6nq7sxfdfzaqh87s2hnw00vr904bklcscp26yvimdsa5p5n0x4m8ynbiiqa0b35rgp2lpq5qxmybgnshwv8b97fh89vq2i5lsbhx";
       };
     };
-    "snyk-policy-1.10.2" = {
+    "snyk-policy-1.12.0" = {
       name = "snyk-policy";
       packageName = "snyk-policy";
-      version = "1.10.2";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.10.2.tgz";
-        sha1 = "2a7bf0f07c7b811b9dda93cf9bbb10dc992dd7bc";
+        url = "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.12.0.tgz";
+        sha512 = "3pmnx9hjrlz0gpxy6b2gia65h1rpdalc1g68s759p0ik0xq5rgi8hm3cqnvicg24cgqm8qwdsf5v7bcfxcj3m6yi7rc2wgkf0vahj08";
       };
     };
-    "snyk-python-plugin-1.5.7" = {
+    "snyk-python-plugin-1.6.0" = {
       name = "snyk-python-plugin";
       packageName = "snyk-python-plugin";
-      version = "1.5.7";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.5.7.tgz";
-        sha512 = "3fqq6dbx31yysvd835ng60linxmbkzixiqqf28yxq9pdx3x8dq55syhv1g6as3s85wd04q5vc5qlfgdl91jlhwcgjvdwjjr2wwp84pq";
+        url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.6.0.tgz";
+        sha512 = "06n8zx8az0afp7b2gnav664hzmjxg5dp96a5vmy5a58dhr278x6fl7pgsd332ykxanphrm59dsm0hyka2s8wibam2v8wjbgm4xxrlzz";
       };
     };
-    "snyk-resolve-1.0.0" = {
+    "snyk-resolve-1.0.1" = {
       name = "snyk-resolve";
       packageName = "snyk-resolve";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.0.tgz";
-        sha1 = "bbe9196d37f57c39251e6be75ccdd5b2097e99a2";
+        url = "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz";
+        sha512 = "2kh7wgl3yjw4am7ay4ag5d6qynbj06jzqf6wph17lhwx9ichwl6adqaf8nbsksib1y65kmvmvqm90j5zqdxfx6qj97qs1kdp0nbxs7g";
       };
     };
-    "snyk-resolve-deps-1.7.0" = {
+    "snyk-resolve-deps-3.1.0" = {
       name = "snyk-resolve-deps";
       packageName = "snyk-resolve-deps";
-      version = "1.7.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-1.7.0.tgz";
-        sha1 = "13743a058437dff890baaf437c333c966a743cb6";
+        url = "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-3.1.0.tgz";
+        sha512 = "3qk3349lw5q1spqk4q1arw496hbp4d8qlj576whfl710kf7ajwpv4kcak5wprzhvwmqs656q7w71sc0jvz9afprh65rlklx3yaiwl31";
       };
     };
-    "snyk-sbt-plugin-1.2.5" = {
+    "snyk-sbt-plugin-1.3.0" = {
       name = "snyk-sbt-plugin";
       packageName = "snyk-sbt-plugin";
-      version = "1.2.5";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.2.5.tgz";
-        sha512 = "183dfn89vslcl63y76jxyndz67f5c8ii4wh0pvbxgzqb3161rz5j5p4k7dv69shiw55q1lyb1j70pjng6rafw5k0jnqc58x63bpqgz8";
+        url = "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-1.3.0.tgz";
+        sha512 = "03bdn4g3836nyv06flg4g6jnr9j297z8ay67jg0k7zfanwg7glaaqbkxzas1bl36jj1snyb8ifb8xvhshbxjbvl6xpngxxpbq3ly729";
       };
     };
     "snyk-tree-1.0.0" = {
@@ -23784,13 +23955,13 @@ let
         sha1 = "0fb73176dbf32e782f19100294160448f9111cc8";
       };
     };
-    "snyk-try-require-1.2.0" = {
+    "snyk-try-require-1.3.0" = {
       name = "snyk-try-require";
       packageName = "snyk-try-require";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz";
-        sha1 = "30fc2b11c07064591ee35780c826be91312f2144";
+        url = "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.0.tgz";
+        sha1 = "f35706acf91c8af788d58e1f1ad6bf0fcf6c5493";
       };
     };
     "socket.io-0.9.14" = {
@@ -23982,6 +24153,15 @@ let
         sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh";
       };
     };
+    "socks-proxy-agent-3.0.1" = {
+      name = "socks-proxy-agent";
+      packageName = "socks-proxy-agent";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz";
+        sha512 = "2a5lsw4fry6nqk3jdxvwqrnpasypvl8c4d0kg32912820lc72l7s9jzidfsrn2an9c66xqicspxb2vnir5cjspprs9qklxnd75060b7";
+      };
+    };
     "sodium-javascript-0.5.5" = {
       name = "sodium-javascript";
       packageName = "sodium-javascript";
@@ -23991,13 +24171,13 @@ let
         sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah";
       };
     };
-    "sodium-native-2.1.5" = {
+    "sodium-native-2.1.6" = {
       name = "sodium-native";
       packageName = "sodium-native";
-      version = "2.1.5";
+      version = "2.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz";
-        sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var";
+        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz";
+        sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx";
       };
     };
     "sodium-universal-2.0.0" = {
@@ -24009,6 +24189,15 @@ let
         sha512 = "2rd6r7v2i3z76rzvllqx9ywk5f64q23944njcf14vv7x3l0illqn41bgdiifik4kswgys99mxsrqinq8akf3n7b15r9871km74mbivj";
       };
     };
+    "sorcery-0.10.0" = {
+      name = "sorcery";
+      packageName = "sorcery";
+      version = "0.10.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sorcery/-/sorcery-0.10.0.tgz";
+        sha1 = "8ae90ad7d7cb05fc59f1ab0c637845d5c15a52b7";
+      };
+    };
     "sort-keys-1.1.2" = {
       name = "sort-keys";
       packageName = "sort-keys";
@@ -24207,6 +24396,15 @@ let
         sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3";
       };
     };
+    "sourcemap-codec-1.4.1" = {
+      name = "sourcemap-codec";
+      packageName = "sourcemap-codec";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz";
+        sha512 = "3645hn4agfzixljvwx4l0fwxqvcr6f0j7pvgcdcy34788n1qaabrs1nawn8c10qk8pw4b21mb0f0chgfhl10rzir7y5i2kf2cs5wzc5";
+      };
+    };
     "sparkles-1.0.0" = {
       name = "sparkles";
       packageName = "sparkles";
@@ -24450,13 +24648,13 @@ let
         sha512 = "00qc3iqsi21cc2az3nz36q88psab4ickpzranndk6vmrb6yhn5xsq3kgp21x3lp0406bdaalpb59xy7zzqnl40ans69v3z2l8z8h52x";
       };
     };
-    "stable-0.1.6" = {
+    "stable-0.1.8" = {
       name = "stable";
       packageName = "stable";
-      version = "0.1.6";
+      version = "0.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stable/-/stable-0.1.6.tgz";
-        sha1 = "910f5d2aed7b520c6e777499c1f32e139fdecb10";
+        url = "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz";
+        sha512 = "3mw0cg71gcp6hfg3x0snaxcva4yqnifs11vbs3ba4agmcz8njmz70ndk5d8z97441jdvjhvb8aq8r44ngd8z4iw5hpgfmff372nlbwf";
       };
     };
     "stack-trace-0.0.10" = {
@@ -24891,13 +25089,13 @@ let
         sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r";
       };
     };
-    "string2compact-1.2.2" = {
+    "string2compact-1.2.3" = {
       name = "string2compact";
       packageName = "string2compact";
-      version = "1.2.2";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.2.tgz";
-        sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b";
+        url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.3.tgz";
+        sha512 = "2v32r74gw45hwccyyv9br6r685nps3c7z95ik5c9sip5nva4flx1scz0mg3h47hw0xrnfj0wh89binqz26ld86zvqxhai2067g3bi7d";
       };
     };
     "string_decoder-0.10.31" = {
@@ -24927,13 +25125,13 @@ let
         sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
       };
     };
-    "stringify-entities-1.3.1" = {
+    "stringify-entities-1.3.2" = {
       name = "stringify-entities";
       packageName = "stringify-entities";
-      version = "1.3.1";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.1.tgz";
-        sha1 = "b150ec2d72ac4c1b5f324b51fb6b28c9cdff058c";
+        url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-1.3.2.tgz";
+        sha512 = "3f4kckmssz5nm8qwm7plgq1vl73jwzc9k7cf80gwjqvzdysa558x5gfhjws59hhni39yncaly8dm0rwa590k1pblxvg602955041c4y";
       };
     };
     "stringstream-0.0.5" = {
@@ -25188,13 +25386,13 @@ let
         sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
       };
     };
-    "superagent-3.8.2" = {
+    "superagent-3.8.3" = {
       name = "superagent";
       packageName = "superagent";
-      version = "3.8.2";
+      version = "3.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.2.tgz";
-        sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1";
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
+        sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q";
       };
     };
     "supports-color-0.2.0" = {
@@ -25251,22 +25449,13 @@ let
         sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
       };
     };
-    "supports-color-4.5.0" = {
+    "supports-color-5.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "4.5.0";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz";
-        sha1 = "be7a0de484dec5c5cddf8b3d59125044912f635b";
-      };
-    };
-    "supports-color-5.3.0" = {
-      name = "supports-color";
-      packageName = "supports-color";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz";
-        sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz";
+        sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf";
       };
     };
     "symbol-observable-1.0.1" = {
@@ -25405,22 +25594,22 @@ let
         sha512 = "1ryql8hyrrhd0gdd71ishbj3cnr8ay0i0wpvy9mj3hjiy35cc1wa0h07wz8jwils98j00gr03ix3cf2j1xm43xjn9bsavwn1yr4a0x5";
       };
     };
-    "tar-4.4.1" = {
+    "tar-4.4.2" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.1";
+      version = "4.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz";
-        sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz";
+        sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85";
       };
     };
-    "tar-fs-1.16.0" = {
+    "tar-fs-1.16.2" = {
       name = "tar-fs";
       packageName = "tar-fs";
-      version = "1.16.0";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.0.tgz";
-        sha512 = "1i39d75rgrl2a3v3x65w7bz6az06sg7xdvp7j9zk5bqilj5znclmr7r5n9l6la6nkqikn4lkhnfrgp4hzbvp6ph77nn53g6zvmdpni3";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.2.tgz";
+        sha512 = "0ywy8jh175q90rbr38yxx8dzhiyj8ch0jjxxidvjwmkh4s6hi1cp56ibq3aydlqflybssn9cc2cjdq717yqcw70kjsr12f46dd2gn9d";
       };
     };
     "tar-pack-3.4.1" = {
@@ -25432,13 +25621,13 @@ let
         sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
       };
     };
-    "tar-stream-1.5.5" = {
+    "tar-stream-1.6.0" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "1.5.5";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz";
-        sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz";
+        sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn";
       };
     };
     "temp-0.6.0" = {
@@ -25486,6 +25675,15 @@ let
         sha1 = "5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2";
       };
     };
+    "tempfile-2.0.0" = {
+      name = "tempfile";
+      packageName = "tempfile";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz";
+        sha1 = "6b0446856a9b1114d1856ffcbe509cccb0977265";
+      };
+    };
     "term-size-1.2.0" = {
       name = "term-size";
       packageName = "term-size";
@@ -25603,6 +25801,15 @@ let
         sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
       };
     };
+    "through-2.2.7" = {
+      name = "through";
+      packageName = "through";
+      version = "2.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/through/-/through-2.2.7.tgz";
+        sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
+      };
+    };
     "through-2.3.4" = {
       name = "through";
       packageName = "through";
@@ -25720,15 +25927,6 @@ let
         sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
       };
     };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha1 = "95860bfcc5c76c277f8f8326fd0f5b2e20eba217";
-      };
-    };
     "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -25747,13 +25945,13 @@ let
         sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
       };
     };
-    "timers-browserify-2.0.6" = {
+    "timers-browserify-2.0.10" = {
       name = "timers-browserify";
       packageName = "timers-browserify";
-      version = "2.0.6";
+      version = "2.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.6.tgz";
-        sha512 = "0zvmxvcvmv91k667dy2hzd9a2knvhizxvbx73gcnbi5na3ypc3mldfljw062d7n6y2mf7n2gwwc5wr4wrdih927fxahg8s0hinyf38x";
+        url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz";
+        sha512 = "37aksk3ydmwy2n7ffsnbvyrwb5kmz5bhvi5fhyg593qs61x7vi9drblwnri5z4x9mzaz91xxqdgg15f0qmf8cd85wdfax2pbm4vbw32";
       };
     };
     "timespan-2.3.0" = {
@@ -25873,13 +26071,13 @@ let
         sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
       };
     };
-    "to-buffer-1.1.0" = {
+    "to-buffer-1.1.1" = {
       name = "to-buffer";
       packageName = "to-buffer";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz";
-        sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa";
+        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz";
+        sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp";
       };
     };
     "to-fast-properties-1.0.3" = {
@@ -25972,13 +26170,13 @@ let
         sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
       };
     };
-    "torrent-discovery-8.4.0" = {
+    "torrent-discovery-8.4.1" = {
       name = "torrent-discovery";
       packageName = "torrent-discovery";
-      version = "8.4.0";
+      version = "8.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.0.tgz";
-        sha512 = "39hhpi3mzygr52pgdah0fvll7mdgmchilxshqjykypiz9167p476sjph4w1qbv98254ij6kdwn9b0j4bwqkcbnr3mspmjh1sm5n8fak";
+        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-8.4.1.tgz";
+        sha512 = "39wg1cq3w31h0yhwjl9aacpl9654psnwigdfbxli93xqvfm9w403gppc2r295ikc9rvglirzcyqiafpd6f8jpf65d6119xnwhgvyz1w";
       };
     };
     "torrent-piece-1.1.1" = {
@@ -26170,22 +26368,22 @@ let
         sha1 = "cb2e1203067e0c8de1f614094b9fe45704ea6003";
       };
     };
-    "trim-trailing-lines-1.1.0" = {
+    "trim-trailing-lines-1.1.1" = {
       name = "trim-trailing-lines";
       packageName = "trim-trailing-lines";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.0.tgz";
-        sha1 = "7aefbb7808df9d669f6da2e438cac8c46ada7684";
+        url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.1.tgz";
+        sha512 = "2d7isckw2m4zqhp0qd4d8d272j8jp09qvqnp1fj3igzqkl7mx75l3fcnr8x1kh64xgf5afr9zyw6wk221mb7ajsk9xvfvfn2vsfyqkd";
       };
     };
-    "trough-1.0.1" = {
+    "trough-1.0.2" = {
       name = "trough";
       packageName = "trough";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz";
-        sha1 = "a9fd8b0394b0ae8fff82e0633a0a36ccad5b5f86";
+        url = "https://registry.npmjs.org/trough/-/trough-1.0.2.tgz";
+        sha512 = "2qhjpmwnyz01jcf1yqjq00my48a3imn5z2z0ha4alfcr3imfpvrcbnv893cw71s7rh9h5icjga9nk180qk07nfmpwmlis66kd8jhy8l";
       };
     };
     "truncate-2.0.1" = {
@@ -26251,6 +26449,15 @@ let
         sha1 = "f23bcd8b7a7b8a864261b2084f66f93193396334";
       };
     };
+    "tunnel-0.0.4" = {
+      name = "tunnel";
+      packageName = "tunnel";
+      version = "0.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz";
+        sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213";
+      };
+    };
     "tunnel-0.0.5" = {
       name = "tunnel";
       packageName = "tunnel";
@@ -26386,13 +26593,13 @@ let
         sha512 = "2gjv6xyp9rqfdfqadayc4b36b79sjdiwsxa38z43v01cdn3xbc06ax90mjv36hxj9j96nfbwr6w1wn7n0zq8f3y3fw4jfy0j1hw5557";
       };
     };
-    "typescript-2.8.1" = {
+    "typescript-2.8.3" = {
       name = "typescript";
       packageName = "typescript";
-      version = "2.8.1";
+      version = "2.8.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz";
-        sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2";
+        url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz";
+        sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b";
       };
     };
     "typewise-1.0.3" = {
@@ -26431,13 +26638,13 @@ let
         sha1 = "09ec54cd5b11dd5f1ef2fc0ab31d37002ca2b5ad";
       };
     };
-    "ua-parser-js-0.7.17" = {
+    "ua-parser-js-0.7.18" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
-      version = "0.7.17";
+      version = "0.7.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.17.tgz";
-        sha512 = "39ac4xrr9v9ya7rbn5cz8dss5j3s36yhpj9qrhfxxqzgy1vljns0qfyv7d76lqgdgdbfbrd91kb5x7jlg0fw2r4f3kml0v8xmv545xr";
+        url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz";
+        sha512 = "2fa0nkj7g5jpslp45h1icl5hsw01qmm64x4s6vlxw07v2b80b3myi38r8b2s06h0chbva92bi9dd7hync3lmkfpls9m3h27algg1p1f";
       };
     };
     "uc.micro-1.0.5" = {
@@ -26503,13 +26710,13 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.3.20" = {
+    "uglify-js-3.3.23" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.3.20";
+      version = "3.3.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz";
-        sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz";
+        sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra";
       };
     };
     "uglify-js-3.3.6" = {
@@ -26530,13 +26737,13 @@ let
         sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
       };
     };
-    "uglifyjs-webpack-plugin-1.2.4" = {
+    "uglifyjs-webpack-plugin-1.2.5" = {
       name = "uglifyjs-webpack-plugin";
       packageName = "uglifyjs-webpack-plugin";
-      version = "1.2.4";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.4.tgz";
-        sha512 = "14jcr2nd1d4l940llkm93b2rm9886qi9vz16ab85nji84bmsr99rvzvv4vwzj3j0m2lpkkm2gskd4p29lv4vzjr76zp6vxwjn71nhng";
+        url = "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz";
+        sha512 = "15z1mr0hms0qbrip49l6c03ljb7243ag7smh13l8xfd0lgmky3b5pa1c1q4r4cdfwvl4m3yr9adj9grdfqqpgr5vc012gj05kbhk144";
       };
     };
     "uid-0.0.2" = {
@@ -26665,15 +26872,6 @@ let
         sha1 = "e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa";
       };
     };
-    "undefsafe-0.0.3" = {
-      name = "undefsafe";
-      packageName = "undefsafe";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz";
-        sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f";
-      };
-    };
     "undefsafe-2.0.2" = {
       name = "undefsafe";
       packageName = "undefsafe";
@@ -26737,6 +26935,15 @@ let
         sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
       };
     };
+    "underscore-1.9.0" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.9.0.tgz";
+        sha512 = "3w8byp6gw4jzam7sl3g72zy9k8qb67jc9h4fhlhd6xj3zn07rnnm812g9jc6ygfxqi4yv54l800ijnl9b8kizf8wc5582xi4h6pb1g0";
+      };
+    };
     "underscore-contrib-0.3.0" = {
       name = "underscore-contrib";
       packageName = "underscore-contrib";
@@ -26764,13 +26971,13 @@ let
         sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
       };
     };
-    "unherit-1.1.0" = {
+    "unherit-1.1.1" = {
       name = "unherit";
       packageName = "unherit";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unherit/-/unherit-1.1.0.tgz";
-        sha1 = "6b9aaedfbf73df1756ad9e316dd981885840cd7d";
+        url = "https://registry.npmjs.org/unherit/-/unherit-1.1.1.tgz";
+        sha512 = "3k40pnw86jz2238r4fv4sp5sdykrva5gl4azq3yxnhk1mw8biy17b5c71hrzq0sfd48dp0kpq3k04f0k11bxd623qrpw2kmmxbnwxpr";
       };
     };
     "unicode-emoji-modifier-base-1.0.0" = {
@@ -26854,31 +27061,31 @@ let
         sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a";
       };
     };
-    "unist-util-is-2.1.1" = {
+    "unist-util-is-2.1.2" = {
       name = "unist-util-is";
       packageName = "unist-util-is";
-      version = "2.1.1";
+      version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.1.tgz";
-        sha1 = "0c312629e3f960c66e931e812d3d80e77010947b";
+        url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-2.1.2.tgz";
+        sha512 = "1bk26f0rhka8jhrbjg0jhfc4cqxz7g5k7z8qxqw0353mfx7nvaq9dqj73s9vr3a0jd1yx4lv64cm6ajji7p55xj3cka1bgxy4mw2ib2";
       };
     };
-    "unist-util-remove-position-1.1.1" = {
+    "unist-util-remove-position-1.1.2" = {
       name = "unist-util-remove-position";
       packageName = "unist-util-remove-position";
-      version = "1.1.1";
+      version = "1.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.1.tgz";
-        sha1 = "5a85c1555fc1ba0c101b86707d15e50fa4c871bb";
+        url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.2.tgz";
+        sha512 = "3nrir95gy69ywsf99s11xmdk5dwjkaf1d7jriasr0nljg57cj4i5jxjh70f2hzazfwqfikb6blpn8dl3ck9sq3w578nbmga3cw0s6jz";
       };
     };
-    "unist-util-visit-1.3.0" = {
+    "unist-util-visit-1.3.1" = {
       name = "unist-util-visit";
       packageName = "unist-util-visit";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.0.tgz";
-        sha512 = "24s5gpqr3vip7zfd3c81k1mhcj1qzlmjhxpn80n3ay8kkg3zycjdkvi6d78j1d3lva7qr1lqrf2mcz5k41as5vwh8w5xdn52drmhyzn";
+        url = "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.3.1.tgz";
+        sha512 = "1lbrqw43r1ckx1i8zqjpyfbvdh3dngb9c6qsk5hcflqkryxzc8icc5vn50xf6vxsgcj4bznzfj10c17rrfd2jlvldhlnlq98ks43xyi";
       };
     };
     "universalify-0.1.1" = {
@@ -27025,13 +27232,22 @@ let
         sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p";
       };
     };
-    "update-check-1.2.0" = {
+    "upath-1.0.5" = {
+      name = "upath";
+      packageName = "upath";
+      version = "1.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz";
+        sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9";
+      };
+    };
+    "update-check-1.3.2" = {
       name = "update-check";
       packageName = "update-check";
-      version = "1.2.0";
+      version = "1.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-check/-/update-check-1.2.0.tgz";
-        sha512 = "1w28g23994qxxlkbmahrqsakjmr6hhknxyg6y109y5ghgph52w51wzyxz2y2z22417298cmyinbc8fjkv64840g61cqv0iziy7bsy14";
+        url = "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz";
+        sha512 = "16lfi8gzdrmk0sq5fbqrq8vy3gmpssr05xac487hmsph1hk0i82n1bp8dklmvnkqk28w74bl8gphkanjn0v8f1walwcbbhpg3mss8fj";
       };
     };
     "update-notifier-0.5.0" = {
@@ -27043,15 +27259,6 @@ let
         sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc";
       };
     };
-    "update-notifier-0.6.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "0.6.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.6.3.tgz";
-        sha1 = "776dec8daa13e962a341e8a1d98354306b67ae08";
-      };
-    };
     "update-notifier-2.3.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
@@ -27061,13 +27268,13 @@ let
         sha1 = "4e8827a6bb915140ab093559d7014e3ebb837451";
       };
     };
-    "update-notifier-2.4.0" = {
+    "update-notifier-2.5.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz";
-        sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz";
+        sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3";
       };
     };
     "update-section-0.3.3" = {
@@ -27205,22 +27412,22 @@ let
         sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
       };
     };
-    "useragent-2.3.0" = {
+    "useragent-2.2.1" = {
       name = "useragent";
       packageName = "useragent";
-      version = "2.3.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz";
-        sha512 = "1vqmf9ng5navlr0kvklslvzbqym47sbqblc3i74ln0hswdyd0yx86fj3cnhb2pjjyy3cqs1mq9ywkz92j5x7km2iv1g2jkfkki0f2p0";
+        url = "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz";
+        sha1 = "cf593ef4f2d175875e8bb658ea92e18a4fd06d8e";
       };
     };
-    "ut_metadata-3.2.0" = {
+    "ut_metadata-3.2.1" = {
       name = "ut_metadata";
       packageName = "ut_metadata";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.0.tgz";
-        sha512 = "3c8a0bnic4symhd8m0gy22adlj8pkmiclsxbr6j979fwabrj0z74xp2bknfqp57vndr4f79d4mnhygrbvp69xdn911j0q6ljgd1bw8i";
+        url = "https://registry.npmjs.org/ut_metadata/-/ut_metadata-3.2.1.tgz";
+        sha512 = "0d0wdjn4cdn5jqsdma0624pvsxv2zakshxlcx2hm9vrxnr1pvm5al0lzwchkpri3nmsdimf3liv6rr7g5c9z79gphdijzrz19lg7ydn";
       };
     };
     "ut_pex-1.2.0" = {
@@ -27340,13 +27547,13 @@ let
         sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30";
       };
     };
-    "utp-native-1.7.0" = {
+    "utp-native-1.7.1" = {
       name = "utp-native";
       packageName = "utp-native";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz";
-        sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz";
+        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz";
+        sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm";
       };
     };
     "uue-3.1.2" = {
@@ -27610,13 +27817,13 @@ let
         sha1 = "c0fd6fa484f8debdb771f68c31ed75d88da97fe7";
       };
     };
-    "vfile-location-2.0.2" = {
+    "vfile-location-2.0.3" = {
       name = "vfile-location";
       packageName = "vfile-location";
-      version = "2.0.2";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.2.tgz";
-        sha1 = "d3675c59c877498e492b4756ff65e4af1a752255";
+        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.3.tgz";
+        sha512 = "3l6rl79knh2zld6jvcxwjk17697nijqykbma3wxj5gcdixc8i4vjj92ad5372yf00x9j7h760s53km1n4ljcxzwl20m1hszi6bpzknc";
       };
     };
     "vhost-3.0.2" = {
@@ -27718,6 +27925,15 @@ let
         sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
       };
     };
+    "vm-browserify-1.0.1" = {
+      name = "vm-browserify";
+      packageName = "vm-browserify";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.0.1.tgz";
+        sha512 = "2cfjhw3c398d3nlbi0z1f6jlmjymyk13clnsnvwpa6cgcpbhh0zsghs7zi1fz6ydnbg6ignbbhvzrk44k0mcaps8iiv0q0c29rcpb0j";
+      };
+    };
     "voc-1.1.0" = {
       name = "voc";
       packageName = "voc";
@@ -27880,6 +28096,15 @@ let
         sha512 = "003dzsqf9q7awjnkv00gwrqw7s8n29y8nmfcmpsl845j2m7rgxxvvd3gld643c92jfwq9yw7ysbaavw9pq1yc5df8yfxmh1sjj64aa5";
       };
     };
+    "watchpack-1.6.0" = {
+      name = "watchpack";
+      packageName = "watchpack";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz";
+        sha512 = "34gp4bbaidicl7azgivrrxb9kvdz501gg0xyf88lya75j9wmrbd1rs5rlk2h5g07q5rb453fkjkck54j2qzsdam1qk36bijf5xlg9wb";
+      };
+    };
     "wcwidth-1.0.1" = {
       name = "wcwidth";
       packageName = "wcwidth";
@@ -27943,13 +28168,13 @@ let
         sha512 = "1bq9cabpvsx4b0aajmbhsgkdzh816rrixhbnsmvcr0ypcndhn5zz9fggfc8i4l2s00b6jhif65phkc9l6zvika8ngb21rip9qx4pj4m";
       };
     };
-    "webtorrent-0.98.24" = {
+    "webtorrent-0.99.4" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "0.98.24";
+      version = "0.99.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.98.24.tgz";
-        sha512 = "1jf65qy9fq5ngb1sv296r6wbahjwac8vkdddpfhwmyvmbxabfyn8vz09d5di8sy69d4w0kyi74kjx09v7rd954cg135kr9smyy615yk";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.99.4.tgz";
+        sha512 = "1d0rpdlr8flkbipr3qhr59qknfc3mlmz8ka9w6mnkbxhdflwky2l1f3z244xzgis509c8r1qyyjskv99ccrmc10rz93l52f4bb7m0kj";
       };
     };
     "whatwg-fetch-2.0.4" = {
@@ -28060,15 +28285,6 @@ let
         sha512 = "39m5b8qc31vxhh0bz14vh9a1kf9znarvlpkf0v6vv1f2dxi61gihav2djq2mn7ns1z3yq6l8pyydj52fyzbm2q04rssrcrv4jbwnc4a";
       };
     };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha1 = "0c09c85c2a94683d0d7eaf8ee097d564bf0e105c";
-      };
-    };
     "widest-line-2.0.0" = {
       name = "widest-line";
       packageName = "widest-line";
@@ -28123,15 +28339,6 @@ let
         sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876";
       };
     };
-    "window-size-0.2.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
-        sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075";
-      };
-    };
     "windows-no-runnable-0.0.6" = {
       name = "windows-no-runnable";
       packageName = "windows-no-runnable";
@@ -28222,13 +28429,13 @@ let
         sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
       };
     };
-    "winston-2.4.1" = {
+    "winston-2.4.2" = {
       name = "winston";
       packageName = "winston";
-      version = "2.4.1";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-2.4.1.tgz";
-        sha512 = "2m8ya9y2s295czzzd8yffyny528vfnbjlzz4xpix3c5y51yfmczzbh3v1hkj0kmxwr25c7yp3xxz1vz4skbj93n4ir9gxbp6y9q7zwk";
+        url = "https://registry.npmjs.org/winston/-/winston-2.4.2.tgz";
+        sha512 = "1n2jk29vqjj4v60j3553gyy1lz5mnm90bf999p4nz6chnmh0izg8c9kf4chy1j68fx8d3mnr5ci5llqr4cjy0n775ydjj2zhrvw0bz1";
       };
     };
     "with-4.0.3" = {
@@ -28862,15 +29069,6 @@ let
         sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
       };
     };
-    "yargs-3.15.0" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "3.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-3.15.0.tgz";
-        sha1 = "3d9446ef21fb3791b3985690662e4b9683c7f181";
-      };
-    };
     "yargs-3.32.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -28880,15 +29078,6 @@ let
         sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995";
       };
     };
-    "yargs-4.8.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "4.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
-        sha1 = "c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0";
-      };
-    };
     "yargs-6.6.0" = {
       name = "yargs";
       packageName = "yargs";
@@ -28925,15 +29114,6 @@ let
         sha1 = "52acc23feecac34042078ee78c0c007f5085db4c";
       };
     };
-    "yargs-parser-2.4.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
-        sha1 = "85568de3cf150ff49fa51825f03a8c880ddcc5c4";
-      };
-    };
     "yargs-parser-4.2.1" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -29111,10 +29291,10 @@ in
   alloy = nodeEnv.buildNodePackage {
     name = "alloy";
     packageName = "alloy";
-    version = "1.12.0";
+    version = "1.13.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/alloy/-/alloy-1.12.0.tgz";
-      sha512 = "1sk9p5lng0hwngvzbz28nwaamf73hyz4pa14fxzmwq11syjfiw8b3p95vig8sabn2zfwi8ddginhg5rvf10a5rgpq3cy608yy7qk21z";
+      url = "https://registry.npmjs.org/alloy/-/alloy-1.13.0.tgz";
+      sha512 = "30a11iiiihsrqj8dc11n5m57im2300l46cygfh4r1q121m2l0vhzaqkg6p65kd7law25xkviw92zwmkd926n674hkv9gr6vsxrskimh";
     };
     dependencies = [
       sources."JSV-4.0.2"
@@ -29123,7 +29303,7 @@ in
       sources."array-unique-0.3.2"
       sources."async-2.6.0"
       sources."babel-code-frame-6.26.0"
-      (sources."babel-core-6.26.0" // {
+      (sources."babel-core-6.26.3" // {
         dependencies = [
           sources."source-map-0.5.7"
         ];
@@ -29145,7 +29325,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."chalk-1.1.3"
       sources."chmodr-1.0.2"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."commander-2.15.1"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
@@ -29187,7 +29367,7 @@ in
           sources."strip-ansi-0.1.1"
         ];
       })
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."loose-envify-1.3.1"
       sources."matcher-collection-1.0.5"
       sources."minimatch-3.0.4"
@@ -29207,7 +29387,7 @@ in
       sources."private-0.1.8"
       sources."regenerator-runtime-0.11.1"
       sources."repeating-2.0.1"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."sax-0.5.8"
       sources."slash-1.0.0"
       sources."source-map-0.6.1"
@@ -29320,11 +29500,11 @@ in
       sources."performance-now-2.1.0"
       sources."punycode-1.4.1"
       sources."q-1.5.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-1.1.14"
       sources."request-2.85.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sntp-2.1.0"
       sources."sshpk-1.14.1"
       sources."string_decoder-0.10.31"
@@ -29363,7 +29543,7 @@ in
     dependencies = [
       sources."@types/caseless-0.12.1"
       sources."@types/form-data-2.2.1"
-      sources."@types/node-8.10.4"
+      sources."@types/node-8.10.12"
       sources."@types/request-2.47.0"
       sources."@types/tough-cookie-2.3.2"
       sources."@types/uuid-3.4.3"
@@ -29634,7 +29814,7 @@ in
           sources."streamline-0.4.11"
         ];
       })
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."map-stream-0.1.0"
       sources."md5.js-1.3.4"
       sources."mime-db-1.33.0"
@@ -29642,7 +29822,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       (sources."ms-rest-2.3.3" // {
         dependencies = [
           sources."extend-3.0.1"
@@ -29653,10 +29833,10 @@ in
       })
       (sources."ms-rest-azure-2.5.5" // {
         dependencies = [
-          sources."@types/node-9.6.2"
+          sources."@types/node-9.6.12"
           (sources."adal-node-0.1.28" // {
             dependencies = [
-              sources."@types/node-8.10.4"
+              sources."@types/node-8.10.12"
             ];
           })
           sources."async-2.6.0"
@@ -29695,7 +29875,7 @@ in
       })
       sources."punycode-1.4.1"
       sources."q-0.9.7"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."read-1.0.7"
       (sources."readable-stream-1.0.34" // {
         dependencies = [
@@ -29728,7 +29908,7 @@ in
       })
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-0.5.2"
       sources."sntp-2.1.0"
       sources."source-map-0.1.43"
@@ -29933,10 +30113,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.1.1";
+    version = "16.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.1.1.tgz";
-      sha512 = "01ay1w7sndfvwjdc5n7sa9a4yzzrwdr8agj1655dz50f0g034scaqli9v1dngxasi8gk8gqvqcsqnmphvwkj1y6awlq1y5l6bbgc8c9";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.2.0.tgz";
+      sha512 = "02kwwi6cvxwcyhv9n13j05y67xdkb4b09p5z7n2sl97sif012i5cibmbz6wqqy89ybqh7s3sbdxqf7g6y2hbl61g81vhrbz9815v2ya";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -29949,7 +30129,7 @@ in
       sources."assert-1.4.1"
       sources."astw-2.2.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
       sources."brorand-1.1.0"
@@ -29960,8 +30140,8 @@ in
         ];
       })
       sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
@@ -29978,20 +30158,16 @@ in
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
-      (sources."crypto-browserify-3.12.0" // {
-        dependencies = [
-          sources."hash-base-2.0.2"
-        ];
-      })
+      sources."create-ecdh-4.0.1"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
+      sources."crypto-browserify-3.12.0"
       sources."date-now-0.1.4"
       sources."defined-1.0.0"
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
       sources."detective-5.1.0"
-      sources."diffie-hellman-5.0.2"
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
       sources."elliptic-6.4.0"
@@ -30007,7 +30183,6 @@ in
       sources."htmlescape-1.1.1"
       sources."https-browserify-1.0.0"
       sources."ieee754-1.1.11"
-      sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
@@ -30022,7 +30197,7 @@ in
       sources."lodash.memoize-3.0.4"
       sources."md5.js-1.3.4"
       sources."miller-rabin-4.0.1"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -30037,15 +30212,15 @@ in
       sources."os-browserify-0.3.0"
       sources."pako-1.0.6"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
+      sources."parse-asn1-5.1.1"
       sources."path-browserify-0.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
-      sources."public-encrypt-4.0.0"
+      sources."public-encrypt-4.0.2"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -30055,12 +30230,11 @@ in
       (sources."readable-stream-2.3.6" // {
         dependencies = [
           sources."isarray-1.0.0"
-          sources."string_decoder-1.1.1"
         ];
       })
-      sources."resolve-1.7.0"
-      sources."ripemd160-2.0.1"
-      sources."safe-buffer-5.1.1"
+      sources."resolve-1.7.1"
+      sources."ripemd160-2.0.2"
+      sources."safe-buffer-5.1.2"
       sources."sha.js-2.4.11"
       sources."shasum-1.0.2"
       sources."shell-quote-1.6.1"
@@ -30069,7 +30243,7 @@ in
       sources."stream-combiner2-1.1.1"
       sources."stream-http-2.8.1"
       sources."stream-splicer-2.0.0"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-1.1.1"
       (sources."subarg-1.0.0" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -30094,7 +30268,7 @@ in
         ];
       })
       sources."util-deprecate-1.0.2"
-      sources."vm-browserify-0.0.4"
+      sources."vm-browserify-1.0.1"
       sources."wrappy-1.0.2"
       sources."xtend-4.0.1"
     ];
@@ -30129,7 +30303,7 @@ in
       sources."async-0.2.10"
       sources."aws-sign-0.2.0"
       sources."balanced-match-1.0.0"
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."bencode-2.0.0"
       sources."bitfield-0.1.0"
       sources."bittorrent-dht-6.4.2"
@@ -30273,8 +30447,8 @@ in
       sources."optjs-3.2.2"
       sources."pad-0.0.5"
       sources."parse-json-2.2.0"
-      sources."parse-torrent-5.8.3"
-      sources."parse-torrent-file-4.1.0"
+      sources."parse-torrent-5.9.1"
+      sources."parse-torrent-file-2.1.4"
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-1.1.0"
@@ -30289,13 +30463,12 @@ in
           sources."bencode-0.7.0"
           sources."debug-3.1.0"
           sources."end-of-stream-0.1.5"
-          sources."get-stdin-5.0.1"
+          sources."get-stdin-6.0.0"
           sources."isarray-1.0.0"
           sources."magnet-uri-4.2.3"
           sources."minimist-0.0.10"
           sources."object-assign-4.1.1"
           sources."once-1.2.0"
-          sources."parse-torrent-file-2.1.4"
           sources."readable-stream-2.3.6"
           sources."safe-buffer-5.0.1"
           sources."string_decoder-1.1.1"
@@ -30326,7 +30499,7 @@ in
       sources."qs-0.5.6"
       sources."query-string-1.0.1"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
@@ -30336,7 +30509,6 @@ in
       sources."read-pkg-up-1.0.1"
       (sources."read-torrent-1.3.0" // {
         dependencies = [
-          sources."bencode-0.7.0"
           sources."magnet-uri-2.0.1"
           sources."mime-1.2.11"
           (sources."parse-torrent-4.1.0" // {
@@ -30344,7 +30516,6 @@ in
               sources."magnet-uri-4.2.3"
             ];
           })
-          sources."parse-torrent-file-2.1.4"
           sources."thirty-two-0.0.2"
         ];
       })
@@ -30355,16 +30526,16 @@ in
       sources."request-2.16.6"
       sources."rimraf-2.6.2"
       sources."router-0.6.2"
-      sources."run-parallel-1.1.8"
-      sources."run-series-1.1.6"
+      sources."run-parallel-1.1.9"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
       sources."rx-2.5.3"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-1.2.4"
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.7.0"
+      sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
       sources."simple-sha1-2.1.0"
       (sources."simple-websocket-4.3.1" // {
@@ -30387,7 +30558,7 @@ in
         ];
       })
       sources."stream-transcoder-0.0.5"
-      sources."string2compact-1.2.2"
+      sources."string2compact-1.2.3"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-2.0.1"
       sources."strip-bom-2.0.0"
@@ -30494,14 +30665,14 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-3.2.1"
       sources."axios-0.17.1"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
       sources."cli-table2-0.2.0"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."commander-2.15.1"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
@@ -30521,7 +30692,7 @@ in
       sources."signal-exit-3.0.2"
       sources."string-width-1.0.2"
       sources."strip-ansi-3.0.1"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30555,7 +30726,7 @@ in
       sources."stack-trace-0.0.10"
       sources."statsd-parser-0.0.4"
       sources."strftime-0.10.0"
-      sources."winston-2.4.1"
+      sources."winston-2.4.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -30601,7 +30772,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."big-integer-1.6.27"
+      sources."big-integer-1.6.28"
       sources."block-stream-0.0.9"
       sources."bn.js-4.11.8"
       (sources."body-parser-1.18.2" // {
@@ -30626,8 +30797,8 @@ in
         ];
       })
       sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-transform-tools-1.7.0"
@@ -30684,9 +30855,8 @@ in
       (sources."cordova-lib-8.0.0" // {
         dependencies = [
           sources."acorn-4.0.13"
-          sources."base64-js-1.2.3"
+          sources."base64-js-1.3.0"
           sources."glob-7.1.1"
-          sources."hash-base-2.0.2"
           sources."isarray-1.0.0"
           sources."minimist-1.2.0"
           sources."nopt-4.0.1"
@@ -30698,7 +30868,9 @@ in
           sources."process-nextick-args-2.0.0"
           sources."q-1.0.1"
           sources."qs-6.3.2"
+          sources."safe-buffer-5.1.1"
           sources."shelljs-0.3.0"
+          sources."underscore-1.8.3"
           sources."uuid-3.2.1"
           sources."xmlbuilder-8.2.2"
         ];
@@ -30710,15 +30882,15 @@ in
         ];
       })
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
+      sources."create-ecdh-4.0.1"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
       sources."cryptiles-2.0.5"
       sources."crypto-browserify-3.12.0"
       sources."dashdash-1.14.1"
       sources."date-now-0.1.4"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."defined-1.0.0"
       sources."delayed-stream-1.0.0"
       (sources."dep-graph-1.1.0" // {
@@ -30737,11 +30909,11 @@ in
       sources."destroy-1.0.4"
       sources."detect-indent-5.0.0"
       sources."detective-4.7.1"
-      sources."diffie-hellman-5.0.2"
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.1.7"
       sources."dot-prop-3.0.0"
       sources."duplexer2-0.1.4"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
       sources."editor-1.0.0"
       sources."ee-first-1.1.1"
@@ -30862,7 +31034,7 @@ in
       sources."mime-1.4.1"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -30874,7 +31046,7 @@ in
       sources."nested-error-stacks-1.0.2"
       sources."nopt-3.0.1"
       sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-6.0.0"
+      sources."npm-package-arg-6.1.0"
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
@@ -30894,14 +31066,14 @@ in
       sources."package-json-1.2.0"
       sources."pako-0.2.9"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
+      sources."parse-asn1-5.1.1"
       sources."parseurl-1.3.2"
       sources."path-browserify-0.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
       sources."path-to-regexp-0.1.7"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."pegjs-0.10.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
@@ -30912,7 +31084,7 @@ in
       sources."promzard-0.3.0"
       sources."properties-parser-0.3.1"
       sources."proxy-addr-2.0.3"
-      sources."public-encrypt-4.0.0"
+      sources."public-encrypt-4.0.2"
       sources."punycode-1.4.1"
       sources."q-1.5.1"
       sources."qs-6.5.1"
@@ -30927,7 +31099,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."read-1.0.7"
       sources."read-all-stream-3.1.0"
       sources."read-only-stream-2.0.0"
@@ -30942,13 +31114,13 @@ in
       sources."registry-url-3.1.0"
       sources."repeating-1.1.3"
       sources."request-2.79.0"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."restore-cursor-1.0.1"
       sources."rimraf-2.6.2"
-      sources."ripemd160-2.0.1"
+      sources."ripemd160-2.0.2"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-0.3.5"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
@@ -31002,7 +31174,7 @@ in
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
       sources."umd-3.0.3"
-      sources."underscore-1.8.3"
+      sources."underscore-1.9.0"
       sources."unorm-1.4.1"
       sources."unpipe-1.0.0"
       (sources."update-notifier-0.5.0" // {
@@ -31110,7 +31282,7 @@ in
       sources."pseudomap-1.0.2"
       sources."readable-stream-1.1.14"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-3.0.1"
@@ -31155,7 +31327,7 @@ in
     dependencies = [
       sources."ansi-styles-3.2.1"
       sources."babel-runtime-6.26.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."core-js-2.5.5"
@@ -31176,7 +31348,7 @@ in
       sources."shebang-regex-1.0.0"
       sources."source-map-0.5.7"
       sources."source-map-support-0.4.18"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."universalify-0.1.1"
       sources."which-1.3.0"
       sources."yallist-2.1.2"
@@ -31268,7 +31440,7 @@ in
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."circular-append-file-1.0.1"
       sources."cli-truncate-1.1.0"
       sources."cliclopts-1.1.1"
@@ -31276,7 +31448,7 @@ in
       sources."codecs-1.2.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -31292,7 +31464,7 @@ in
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
       sources."dat-dns-1.3.2"
-      (sources."dat-doctor-1.3.1" // {
+      (sources."dat-doctor-1.4.0" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."dns-packet-1.3.1"
@@ -31333,8 +31505,7 @@ in
       sources."dat-registry-4.0.0"
       sources."dat-secret-storage-4.0.1"
       sources."dat-storage-1.0.4"
-      sources."dat-swarm-defaults-1.0.0"
-      sources."datland-swarm-defaults-1.0.2"
+      sources."dat-swarm-defaults-1.0.1"
       sources."debug-3.1.0"
       sources."deep-equal-0.2.2"
       sources."delayed-stream-1.0.0"
@@ -31359,7 +31530,7 @@ in
       sources."dns-socket-3.0.0"
       sources."dns-txt-2.0.2"
       sources."dom-walk-0.1.1"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
       sources."end-of-stream-1.4.1"
       sources."escape-string-regexp-1.0.5"
@@ -31394,7 +31565,7 @@ in
       sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.13.0" // {
+      (sources."hypercore-6.14.0" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
@@ -31457,7 +31628,7 @@ in
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mirror-folder-2.1.1"
+      sources."mirror-folder-2.2.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
@@ -31503,10 +31674,10 @@ in
       sources."protocol-buffers-encodings-1.1.0"
       sources."pump-2.0.1"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
       sources."random-access-memory-2.4.0"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       (sources."randomatic-1.1.7" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -31529,14 +31700,14 @@ in
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."signed-varint-2.0.1"
       sources."simple-sha1-2.1.0"
       sources."siphash24-1.1.0"
       sources."slice-ansi-1.0.0"
       sources."sntp-2.1.0"
       sources."sodium-javascript-0.5.5"
-      sources."sodium-native-2.1.5"
+      sources."sodium-native-2.1.6"
       sources."sodium-universal-2.0.0"
       sources."sorted-array-functions-1.1.0"
       sources."sorted-indexof-1.0.0"
@@ -31558,7 +31729,7 @@ in
           sources."debug-2.6.9"
         ];
       })
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       (sources."throttle-1.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -31566,7 +31737,7 @@ in
       })
       sources."through2-2.0.3"
       sources."thunky-1.0.2"
-      sources."to-buffer-1.1.0"
+      sources."to-buffer-1.1.1"
       sources."toiletdb-1.4.1"
       sources."tough-cookie-2.3.4"
       sources."township-client-1.3.2"
@@ -31582,7 +31753,7 @@ in
       sources."untildify-3.0.2"
       sources."util-deprecate-1.0.2"
       sources."utile-0.3.0"
-      sources."utp-native-1.7.0"
+      sources."utp-native-1.7.1"
       sources."uuid-3.2.1"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
@@ -31610,10 +31781,10 @@ in
   dhcp = nodeEnv.buildNodePackage {
     name = "dhcp";
     packageName = "dhcp";
-    version = "0.2.11";
+    version = "0.2.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.11.tgz";
-      sha512 = "287rcz01q13rn3b83ds5kh05l176wag4p9vxxzrx3q63nhjmy6pvkxf1c1d7k0bd8r8nhqdldn5f1p50r4a1y1ybgy9zz0gqfbwb0d7";
+      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.12.tgz";
+      sha512 = "1ks1wdfgj703sxp1ys7hjfkw0sm6sm9z7iviqxicvmy9r3mj7irq3vjyk4nvxgyq29j3qz8bi8lvm38r4w8j1j2xbkx85fk0l3vpa7r";
     };
     dependencies = [
       sources."minimist-1.2.0"
@@ -31683,7 +31854,7 @@ in
       sources."fresh-0.2.4"
       sources."from-0.1.7"
       sources."hiredis-0.4.1"
-      sources."http-parser-js-0.4.11"
+      sources."http-parser-js-0.4.12"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
       sources."ipaddr.js-1.0.5"
@@ -31783,6 +31954,9 @@ in
       sources."basic-auth-1.1.0"
       sources."bindings-1.2.1"
       sources."bl-0.8.2"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-fill-0.1.1"
       sources."bytewise-1.1.0"
       sources."bytewise-core-1.2.3"
       sources."cookie-signature-1.1.0"
@@ -31790,7 +31964,7 @@ in
       sources."cors-2.8.4"
       sources."deferred-leveldown-0.2.0"
       sources."docker-parse-image-3.0.1"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."end-of-stream-1.4.1"
       (sources."errno-0.1.7" // {
         dependencies = [
@@ -31805,6 +31979,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
+      sources."fs-constants-1.0.0"
       sources."inherits-2.0.3"
       sources."isarray-0.0.1"
       sources."json-stringify-safe-5.0.1"
@@ -31871,7 +32046,7 @@ in
       sources."pull-stream-3.6.7"
       sources."pull-window-2.1.4"
       sources."pump-1.0.3"
-      (sources."pumpify-1.4.0" // {
+      (sources."pumpify-1.5.0" // {
         dependencies = [
           sources."pump-2.0.1"
         ];
@@ -31879,7 +32054,7 @@ in
       sources."readable-stream-1.1.14"
       sources."relative-date-1.1.3"
       sources."root-2.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.1.1"
       sources."sorted-union-stream-1.0.2"
       sources."split2-0.2.1"
@@ -31887,7 +32062,7 @@ in
       sources."stream-shift-1.0.0"
       sources."stream-to-pull-stream-1.7.2"
       sources."string_decoder-0.10.31"
-      (sources."tar-stream-1.5.5" // {
+      (sources."tar-stream-1.6.0" // {
         dependencies = [
           sources."bl-1.2.2"
           sources."isarray-1.0.0"
@@ -31902,6 +32077,7 @@ in
         ];
       })
       sources."thunky-0.1.0"
+      sources."to-buffer-1.1.1"
       sources."typewise-1.0.3"
       sources."typewise-core-1.2.0"
       sources."typewiselite-1.0.0"
@@ -31922,10 +32098,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.3.8";
+    version = "3.3.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.8.tgz";
-      sha512 = "3bahinp16ajfxy06ihrl022906h6zdxhsgmwh28k1p04blzqzgddbryx4l1a8ncg5fdjlj7ka9k3f6lam68fanjw4093hgyns7iclf4";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.12.tgz";
+      sha512 = "3jj2vxmyham5bhfxvbilsd60sgkdabzl0mbid2i4hfjjgqjs76f4av2qifnvphn4a0ds727wjcp4kjz2963pjqrq53ik0k87706arn1";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -31934,10 +32110,10 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.0"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.223.1"
+      sources."aws-sdk-2.233.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."bcrypt-pbkdf-1.0.1"
       sources."boom-4.3.1"
       sources."buffer-4.9.1"
@@ -31951,6 +32127,7 @@ in
         ];
       })
       sources."dashdash-1.14.1"
+      sources."decimal.js-10.0.0"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."events-1.1.1"
@@ -31978,7 +32155,8 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsonparse-1.3.1"
       sources."jsprim-1.4.1"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
+      sources."lossless-json-1.0.2"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimist-0.0.10"
@@ -31986,14 +32164,14 @@ in
       sources."optimist-0.6.1"
       sources."performance-now-2.1.0"
       sources."punycode-1.3.2"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."querystring-0.2.0"
       (sources."request-2.85.0" // {
         dependencies = [
           sources."punycode-1.4.1"
         ];
       })
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-1.2.1"
       sources."sntp-2.1.0"
       sources."sshpk-1.14.1"
@@ -32187,7 +32365,7 @@ in
       sources."repeat-string-1.6.1"
       sources."request-2.79.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."sntp-1.0.9"
       sources."split-1.0.1"
@@ -32242,7 +32420,7 @@ in
       sources."asap-2.0.6"
       sources."auto-bind-1.2.0"
       sources."babel-code-frame-6.26.0"
-      sources."babel-core-6.26.0"
+      sources."babel-core-6.26.3"
       sources."babel-generator-6.26.1"
       sources."babel-helper-builder-react-jsx-6.26.0"
       sources."babel-helpers-6.24.1"
@@ -32314,10 +32492,10 @@ in
       (sources."ink-0.3.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."core-js-1.2.7"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."ink-text-input-1.1.1"
@@ -32340,7 +32518,7 @@ in
       sources."json5-0.5.1"
       sources."load-json-file-1.1.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash.debounce-4.0.8"
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.isequal-4.5.0"
@@ -32403,7 +32581,7 @@ in
       sources."require-from-string-1.2.1"
       sources."resolve-from-3.0.0"
       sources."restore-cursor-2.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."setimmediate-1.0.5"
@@ -32428,7 +32606,7 @@ in
       sources."to-fast-properties-1.0.3"
       sources."trim-newlines-1.0.0"
       sources."trim-right-1.0.1"
-      sources."ua-parser-js-0.7.17"
+      sources."ua-parser-js-0.7.18"
       sources."unicode-emoji-modifier-base-1.0.0"
       sources."url-parse-lax-1.0.0"
       sources."url-to-options-1.0.1"
@@ -32483,10 +32661,10 @@ in
       sources."buffer-from-1.0.0"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
-      (sources."chalk-2.3.2" // {
+      (sources."chalk-2.4.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."chardet-0.4.2"
@@ -32523,13 +32701,13 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
-      sources."globals-11.4.0"
+      sources."globals-11.5.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.21"
-      sources."ignore-3.3.7"
+      sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -32547,7 +32725,7 @@ in
       sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lru-cache-4.1.2"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
@@ -32580,7 +32758,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."shebang-command-1.2.0"
@@ -32679,9 +32857,9 @@ in
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          (sources."chalk-2.3.2" // {
+          (sources."chalk-2.4.1" // {
             dependencies = [
-              sources."supports-color-5.3.0"
+              sources."supports-color-5.4.0"
             ];
           })
           sources."strip-ansi-4.0.0"
@@ -32706,13 +32884,13 @@ in
       sources."fs.realpath-1.0.0"
       sources."functional-red-black-tree-1.0.1"
       sources."glob-7.1.2"
-      sources."globals-11.4.0"
+      sources."globals-11.5.0"
       sources."globby-5.0.0"
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.4.21"
-      sources."ignore-3.3.7"
+      sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -32730,7 +32908,7 @@ in
       sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lru-cache-4.1.2"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
@@ -32759,14 +32937,14 @@ in
       sources."readable-stream-2.3.6"
       sources."regexpp-1.1.0"
       sources."require-uncached-1.0.3"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."resolve-from-1.0.1"
       sources."restore-cursor-2.0.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."shebang-command-1.2.0"
@@ -32808,10 +32986,10 @@ in
   emojione = nodeEnv.buildNodePackage {
     name = "emojione";
     packageName = "emojione";
-    version = "3.1.2";
+    version = "3.1.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.2.tgz";
-      sha1 = "991e30c80db4b1cf15eacb257620a7edce9c6ef4";
+      url = "https://registry.npmjs.org/emojione/-/emojione-3.1.4.tgz";
+      sha1 = "828767fbbe2ffd4fa75ebeeba9873e83643d6664";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -32933,11 +33111,11 @@ in
       (sources."ora-1.4.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."cli-cursor-2.1.0"
           sources."onetime-2.0.1"
           sources."restore-cursor-2.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."os-tmpdir-1.0.2"
@@ -32958,7 +33136,7 @@ in
       sources."progress-1.1.8"
       sources."promise-phantom-3.1.6"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
@@ -32967,7 +33145,7 @@ in
       sources."request-2.85.0"
       sources."request-progress-2.0.1"
       sources."restore-cursor-1.0.1"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."signal-exit-3.0.2"
       sources."sntp-2.1.0"
@@ -33094,7 +33272,7 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."glob-7.1.2"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
@@ -33144,7 +33322,7 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.2.1"
+          sources."colors-1.2.4"
           sources."minimist-1.2.0"
         ];
       })
@@ -33170,7 +33348,7 @@ in
       sources."resumer-0.0.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."shush-1.0.0"
       sources."stack-trace-0.0.10"
@@ -33209,7 +33387,7 @@ in
     dependencies = [
       sources."async-2.6.0"
       sources."debug-3.1.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash.groupby-4.6.0"
       sources."microee-0.0.6"
       sources."minilog-3.1.0"
@@ -33395,7 +33573,7 @@ in
       sources."array-uniq-1.0.3"
       sources."array-unique-0.3.2"
       sources."assign-symbols-1.0.0"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -33618,11 +33796,11 @@ in
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."replace-ext-0.0.1"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."resolve-dir-1.0.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."semver-4.3.6"
       sources."sequencify-0.0.7"
@@ -33735,7 +33913,7 @@ in
       sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5";
     };
     dependencies = [
-      sources."eventemitter3-3.0.1"
+      sources."eventemitter3-3.1.0"
       sources."http-proxy-1.0.2"
       sources."lru-cache-2.5.2"
       sources."minimist-0.0.8"
@@ -33831,10 +34009,10 @@ in
   html-minifier = nodeEnv.buildNodePackage {
     name = "html-minifier";
     packageName = "html-minifier";
-    version = "3.5.14";
+    version = "3.5.15";
     src = fetchurl {
-      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.14.tgz";
-      sha512 = "0ai1rga42v2z8mbnn2kv238fzi9p2nxzj7l2b4csgcg4wddmh697h1s4kmwipqqfd6ppi6xd26m2ynipkjm63sj48kjb0sh73mz165i";
+      url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.15.tgz";
+      sha512 = "01ni8s31nr1rb70wqi980nyfwir4z2z5mjvs454rgylns4nfyqvci581b40s1b67hgd95anq46j4yf5r947y5wzvncr7dgsysnvi5ir";
     };
     dependencies = [
       sources."camel-case-3.0.0"
@@ -33846,7 +34024,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.5.7"
-      (sources."uglify-js-3.3.20" // {
+      (sources."uglify-js-3.3.23" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -33879,7 +34057,9 @@ in
           sources."is-extglob-2.1.1"
           sources."is-glob-3.1.0"
           sources."mime-1.4.1"
+          sources."qs-6.5.1"
           sources."raw-body-1.1.7"
+          sources."safe-buffer-5.1.1"
           sources."setprototypeof-1.0.3"
           sources."statuses-1.4.0"
           sources."string_decoder-0.10.31"
@@ -33914,9 +34094,12 @@ in
           sources."kind-of-4.0.0"
         ];
       })
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
       sources."buffer-crc32-0.2.13"
+      sources."buffer-fill-0.1.1"
       sources."bytes-3.0.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."chokidar-1.7.0"
       sources."chownr-1.0.1"
@@ -33953,7 +34136,7 @@ in
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
-      sources."eventemitter3-1.2.0"
+      sources."eventemitter3-3.1.0"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
       (sources."express-4.16.3" // {
@@ -33969,24 +34152,30 @@ in
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.3"
       sources."finalhandler-1.1.1"
+      sources."follow-redirects-1.4.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."form-data-2.3.2"
       sources."formidable-1.2.1"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
+      sources."fs-constants-1.0.0"
       sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."glob-7.1.2"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
       sources."has-flag-3.0.0"
       sources."http-errors-1.6.3"
-      sources."http-parser-js-0.4.11"
-      sources."http-proxy-1.16.2"
-      sources."http-proxy-middleware-0.17.4"
+      sources."http-parser-js-0.4.12"
+      sources."http-proxy-1.17.0"
+      (sources."http-proxy-middleware-0.17.4" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."iconv-lite-0.4.19"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -34012,7 +34201,7 @@ in
       sources."lazystream-1.0.0"
       sources."leek-0.0.24"
       sources."livereload-js-2.3.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash._baseassign-3.2.0"
       sources."lodash._basecopy-3.0.1"
       sources."lodash._bindcallback-3.0.1"
@@ -34062,7 +34251,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       (sources."randomatic-1.1.7" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -34092,7 +34281,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-json-parse-1.0.1"
       sources."sax-1.1.4"
       sources."semver-5.5.0"
@@ -34110,14 +34299,15 @@ in
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-4.0.0"
-      sources."superagent-3.8.2"
-      sources."supports-color-5.3.0"
-      (sources."tar-4.4.1" // {
+      sources."superagent-3.8.3"
+      sources."supports-color-5.4.0"
+      (sources."tar-4.4.2" // {
         dependencies = [
           sources."minimist-0.0.8"
+          sources."safe-buffer-5.1.2"
         ];
       })
-      sources."tar-stream-1.5.5"
+      sources."tar-stream-1.6.0"
       sources."through-2.3.8"
       (sources."tiny-lr-1.1.1" // {
         dependencies = [
@@ -34125,6 +34315,7 @@ in
         ];
       })
       sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
       sources."tslib-1.9.0"
       sources."type-is-1.6.16"
       sources."ultron-1.1.1"
@@ -34279,7 +34470,7 @@ in
       sources."bufrw-1.2.1"
       sources."chai-4.1.2"
       sources."chai-as-promised-7.1.1"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."check-error-1.0.2"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
@@ -34302,7 +34493,7 @@ in
           sources."opentracing-0.13.0"
         ];
       })
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."long-2.4.0"
       sources."minimatch-3.0.4"
       sources."mz-2.7.0"
@@ -34313,11 +34504,11 @@ in
       sources."opentracing-0.14.3"
       sources."path-is-absolute-1.0.1"
       sources."pathval-1.1.0"
-      sources."rxjs-5.5.8"
+      sources."rxjs-5.5.10"
       sources."semaphore-async-await-1.5.1"
       sources."string-similarity-1.2.0"
       sources."string-template-0.2.1"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."symbol-observable-1.0.1"
       sources."thenify-3.3.0"
       sources."thenify-all-1.6.0"
@@ -34605,7 +34796,7 @@ in
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
       sources."js-yaml-3.11.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
@@ -34615,13 +34806,13 @@ in
       sources."path-loader-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.0"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."slash-1.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
-      sources."superagent-3.8.2"
+      sources."superagent-3.8.3"
       sources."uri-js-3.0.2"
       sources."util-deprecate-1.0.2"
     ];
@@ -34637,10 +34828,10 @@ in
   json-server = nodeEnv.buildNodePackage {
     name = "json-server";
     packageName = "json-server";
-    version = "0.12.1";
+    version = "0.12.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-0.12.1.tgz";
-      sha512 = "3isg3ph43vqfq6m6pg0d1iy7gj2gc6jgym0gp3ng7p9fv7bf1q43isf3wbc7bc9w5swsxqjc3v304ic8iinilwrkwxgks1alaxjs3si";
+      url = "https://registry.npmjs.org/json-server/-/json-server-0.12.2.tgz";
+      sha512 = "3dqw05mkw5k42zdpjhg3cjiq7bfh8x1zxllrwyz0jgwmd4p79079fhsiifazqa5is659lzdnmiyiabxy62jjjk55xa296rdhyajc2vm";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -34667,10 +34858,10 @@ in
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."ci-info-1.1.3"
       sources."cli-boxes-1.0.0"
-      sources."cliui-4.0.0"
+      sources."cliui-4.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
@@ -34697,7 +34888,7 @@ in
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
@@ -34775,7 +34966,7 @@ in
       sources."latest-version-3.1.0"
       sources."lcid-1.0.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash-id-0.14.0"
       sources."lowdb-0.15.5"
       sources."lowercase-keys-1.0.1"
@@ -34814,7 +35005,7 @@ in
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
       sources."pify-3.0.0"
-      sources."please-upgrade-node-3.0.1"
+      sources."please-upgrade-node-3.0.2"
       sources."pluralize-7.0.0"
       sources."prepend-http-1.0.4"
       sources."proxy-addr-2.0.3"
@@ -34828,7 +35019,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."request-2.85.0"
@@ -34836,6 +35027,7 @@ in
       sources."require-main-filename-1.0.1"
       sources."safe-buffer-5.1.1"
       sources."semver-5.5.0"
+      sources."semver-compare-1.0.0"
       sources."semver-diff-2.1.0"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
@@ -34854,7 +35046,7 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."term-size-1.2.0"
       sources."timed-out-4.0.1"
       sources."tough-cookie-2.3.4"
@@ -34864,7 +35056,7 @@ in
       sources."unique-string-1.0.0"
       sources."unpipe-1.0.0"
       sources."unzip-response-2.0.1"
-      sources."update-notifier-2.4.0"
+      sources."update-notifier-2.5.0"
       sources."url-parse-lax-1.0.0"
       sources."utils-merge-1.0.1"
       sources."uuid-3.2.1"
@@ -34925,16 +35117,13 @@ in
   karma = nodeEnv.buildNodePackage {
     name = "karma";
     packageName = "karma";
-    version = "2.0.0";
+    version = "2.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/karma/-/karma-2.0.0.tgz";
-      sha512 = "0iyj9ic6sj94x4xdd6wy8zgabqbl2ydrsp8h76lwrcx27ns8pzd7bg8yibsjgddzkisb9p1gp6bn46b8g5m2lh3yj5vqx55q2ks7lib";
+      url = "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz";
+      sha1 = "4d2db9402850a66551fa784b0164fb0824ed8c4b";
     };
     dependencies = [
-      sources."JSONStream-1.3.2"
       sources."accepts-1.3.5"
-      sources."acorn-4.0.13"
-      sources."acorn-node-1.3.0"
       sources."addressparser-1.0.1"
       sources."after-0.8.2"
       sources."agent-base-2.1.1"
@@ -34949,18 +35138,12 @@ in
       sources."anymatch-1.3.2"
       sources."arr-diff-2.0.0"
       sources."arr-flatten-1.1.0"
-      sources."array-filter-0.0.1"
-      sources."array-map-0.0.0"
-      sources."array-reduce-0.0.0"
       sources."array-slice-0.2.3"
       sources."array-unique-0.2.1"
       sources."arraybuffer.slice-0.0.7"
       sources."asn1-0.2.3"
-      sources."asn1.js-4.10.1"
-      sources."assert-1.4.1"
       sources."assert-plus-1.0.0"
       sources."ast-types-0.11.3"
-      sources."astw-2.2.0"
       sources."async-2.1.5"
       sources."async-each-1.0.1"
       sources."async-limiter-1.0.0"
@@ -34976,7 +35159,6 @@ in
       sources."backo2-1.0.2"
       sources."balanced-match-1.0.0"
       sources."base64-arraybuffer-0.1.5"
-      sources."base64-js-1.2.3"
       sources."base64id-1.0.0"
       sources."bcrypt-pbkdf-1.0.1"
       sources."better-assert-1.0.2"
@@ -34985,7 +35167,6 @@ in
       sources."bl-1.1.2"
       sources."blob-0.0.4"
       sources."bluebird-3.5.1"
-      sources."bn.js-4.11.8"
       (sources."body-parser-1.18.2" // {
         dependencies = [
           sources."setprototypeof-1.0.3"
@@ -34998,102 +35179,51 @@ in
           sources."kind-of-4.0.0"
         ];
       })
-      sources."brorand-1.1.0"
-      sources."browser-pack-6.1.0"
-      (sources."browser-resolve-1.11.2" // {
-        dependencies = [
-          sources."resolve-1.1.7"
-        ];
-      })
-      (sources."browserify-14.5.0" // {
-        dependencies = [
-          sources."acorn-5.5.3"
-          sources."hash-base-2.0.2"
-          sources."isarray-2.0.4"
-          sources."process-nextick-args-2.0.0"
-          sources."source-map-0.5.7"
-        ];
-      })
-      sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
-      sources."browserify-rsa-4.0.1"
-      sources."browserify-sign-4.0.4"
-      sources."browserify-zlib-0.2.0"
-      sources."buffer-5.1.0"
-      sources."buffer-from-1.0.0"
       sources."buffer-more-ints-0.0.2"
-      sources."buffer-xor-1.0.3"
       sources."buildmail-4.0.1"
-      sources."builtin-status-codes-3.0.0"
       sources."bytes-3.0.0"
-      sources."cached-path-relative-1.0.1"
       sources."callsite-1.0.0"
       sources."caseless-0.12.0"
       sources."chalk-1.1.3"
       sources."chokidar-1.7.0"
-      sources."cipher-base-1.0.4"
-      sources."circular-json-0.5.1"
+      sources."circular-json-0.5.3"
       sources."co-4.6.0"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combine-lists-1.0.1"
-      sources."combine-source-map-0.8.0"
       sources."combined-stream-1.0.6"
       sources."commander-2.15.1"
       sources."component-bind-1.0.0"
       sources."component-emitter-1.2.1"
       sources."component-inherit-0.0.3"
       sources."concat-map-0.0.1"
-      (sources."concat-stream-1.5.2" // {
-        dependencies = [
-          sources."readable-stream-2.0.6"
-          sources."string_decoder-0.10.31"
-        ];
-      })
       (sources."connect-3.6.6" // {
         dependencies = [
           sources."statuses-1.3.1"
         ];
       })
-      sources."console-browserify-1.1.0"
-      sources."constants-browserify-1.0.0"
       sources."content-type-1.0.4"
-      sources."convert-source-map-1.1.3"
       sources."cookie-0.3.1"
       sources."core-js-2.5.5"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
       (sources."cryptiles-3.1.2" // {
         dependencies = [
           sources."boom-5.2.0"
         ];
       })
-      sources."crypto-browserify-3.12.0"
       sources."custom-event-1.0.1"
       sources."dashdash-1.14.1"
       sources."data-uri-to-buffer-1.2.0"
       sources."date-format-1.2.0"
-      sources."date-now-0.1.4"
       sources."debug-2.6.9"
       sources."deep-is-0.1.3"
-      sources."defined-1.0.0"
       sources."degenerator-1.0.4"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
-      sources."deps-sort-2.0.0"
-      sources."des.js-1.0.0"
-      sources."detective-4.7.1"
       sources."di-0.0.1"
-      sources."diffie-hellman-5.0.2"
       sources."dom-serialize-2.2.1"
-      sources."domain-browser-1.1.7"
       sources."double-ended-queue-2.1.0-0"
-      sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.1"
       sources."ee-first-1.1.1"
-      sources."elliptic-6.4.0"
       sources."encodeurl-1.0.2"
       (sources."engine.io-3.1.5" // {
         dependencies = [
@@ -35113,9 +35243,7 @@ in
       sources."esprima-3.1.3"
       sources."estraverse-4.2.0"
       sources."esutils-2.0.2"
-      sources."eventemitter3-1.2.0"
-      sources."events-1.1.1"
-      sources."evp_bytestokey-1.0.3"
+      sources."eventemitter3-3.1.0"
       (sources."expand-braces-0.1.2" // {
         dependencies = [
           sources."braces-0.1.5"
@@ -35136,19 +35264,18 @@ in
       sources."filename-regex-2.0.1"
       sources."fill-range-2.2.3"
       sources."finalhandler-1.1.0"
-      sources."follow-redirects-1.0.0"
+      sources."follow-redirects-1.4.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       (sources."ftp-0.3.10" // {
         dependencies = [
           sources."readable-stream-1.1.14"
         ];
       })
-      sources."function-bind-1.1.1"
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
       sources."get-uri-2.0.1"
@@ -35159,37 +35286,28 @@ in
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-1.0.1"
       sources."has-ansi-2.0.0"
       sources."has-binary2-1.0.2"
       sources."has-cors-1.1.0"
-      sources."hash-base-3.0.4"
-      sources."hash.js-1.1.3"
       sources."hawk-6.0.2"
       sources."hipchat-notifier-1.1.0"
-      sources."hmac-drbg-1.0.1"
       sources."hoek-4.2.1"
-      sources."htmlescape-1.1.1"
       sources."http-errors-1.6.3"
-      sources."http-proxy-1.16.2"
+      (sources."http-proxy-1.17.0" // {
+        dependencies = [
+          sources."debug-3.1.0"
+        ];
+      })
       sources."http-proxy-agent-1.0.0"
       sources."http-signature-1.2.0"
       sources."httpntlm-1.6.1"
       sources."httpreq-0.4.24"
-      sources."https-browserify-1.0.0"
       sources."https-proxy-agent-1.0.0"
       sources."iconv-lite-0.4.19"
-      sources."ieee754-1.1.11"
       sources."indexof-0.0.1"
       sources."inflection-1.10.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."inline-source-map-0.6.2"
-      (sources."insert-module-globals-7.0.6" // {
-        dependencies = [
-          sources."concat-stream-1.6.2"
-        ];
-      })
       sources."ip-1.0.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -35213,21 +35331,15 @@ in
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
-      sources."json-stable-stringify-0.0.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.0"
-      sources."jsonparse-1.3.1"
       sources."jsonpointer-4.0.1"
       sources."jsprim-1.4.1"
       sources."kind-of-3.2.2"
-      sources."labeled-stream-splicer-2.0.1"
       sources."levn-0.3.0"
-      sources."lexical-scope-1.2.0"
       sources."libbase64-0.1.0"
       sources."libmime-3.0.0"
       sources."libqp-1.1.0"
-      sources."lodash-4.17.5"
-      sources."lodash.memoize-3.0.4"
+      sources."lodash-4.17.10"
       (sources."log4js-2.5.3" // {
         dependencies = [
           sources."assert-plus-0.2.0"
@@ -35237,6 +35349,7 @@ in
           sources."co-3.0.6"
           sources."cryptiles-2.0.5"
           sources."debug-3.1.0"
+          sources."follow-redirects-1.0.0"
           sources."form-data-2.0.0"
           sources."har-validator-2.0.6"
           sources."hawk-3.1.3"
@@ -35245,8 +35358,8 @@ in
           sources."iconv-lite-0.4.15"
           sources."ip-1.1.5"
           sources."isarray-0.0.1"
-          sources."minimist-0.0.8"
           sources."ms-0.7.1"
+          sources."process-nextick-args-1.0.7"
           sources."qs-6.2.3"
           sources."readable-stream-2.0.6"
           sources."request-2.75.0"
@@ -35266,19 +35379,14 @@ in
           sources."semver-5.0.3"
         ];
       })
-      sources."md5.js-1.3.4"
       sources."media-typer-0.3.0"
       sources."micromatch-2.3.11"
-      sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
-      sources."minimalistic-assert-1.0.0"
-      sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
-      sources."minimist-1.2.0"
+      sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."module-deps-4.1.1"
       sources."ms-2.0.0"
       sources."nan-2.10.0"
       sources."negotiator-0.6.1"
@@ -35299,48 +35407,34 @@ in
       sources."once-1.4.0"
       (sources."optimist-0.6.1" // {
         dependencies = [
-          sources."minimist-0.0.10"
           sources."wordwrap-0.0.3"
         ];
       })
       sources."optionator-0.8.2"
-      sources."os-browserify-0.3.0"
       sources."os-tmpdir-1.0.2"
       sources."pac-proxy-agent-1.1.0"
       sources."pac-resolver-2.0.0"
-      sources."pako-1.0.6"
-      sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
       sources."parse-glob-3.0.4"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
       sources."parseurl-1.3.2"
-      sources."path-browserify-0.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.5"
-      sources."path-platform-0.11.15"
       (sources."path-proxy-1.0.0" // {
         dependencies = [
           sources."inflection-1.3.8"
         ];
       })
-      sources."pbkdf2-3.0.14"
       sources."performance-now-2.1.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prelude-ls-1.1.2"
       sources."preserve-0.2.0"
-      sources."process-0.11.10"
-      sources."process-nextick-args-1.0.7"
+      sources."process-nextick-args-2.0.0"
       sources."proxy-agent-2.0.0"
-      sources."pseudomap-1.0.2"
-      sources."public-encrypt-4.0.0"
       sources."punycode-1.4.1"
       sources."q-1.4.1"
       sources."qjobs-1.2.0"
       sources."qs-6.5.1"
-      sources."querystring-0.2.0"
-      sources."querystring-es3-0.2.1"
       (sources."randomatic-1.1.7" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -35350,8 +35444,6 @@ in
           })
         ];
       })
-      sources."randombytes-2.0.6"
-      sources."randomfill-1.0.4"
       sources."range-parser-1.2.0"
       (sources."raw-body-2.3.2" // {
         dependencies = [
@@ -35359,13 +35451,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."read-only-stream-2.0.0"
-      (sources."readable-stream-2.3.6" // {
-        dependencies = [
-          sources."isarray-1.0.0"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."redis-2.8.0"
       sources."redis-commands-1.3.5"
@@ -35377,16 +35463,11 @@ in
       sources."request-2.85.0"
       sources."requestretry-1.13.0"
       sources."requires-port-1.0.0"
-      sources."resolve-1.7.0"
       sources."rimraf-2.6.2"
-      sources."ripemd160-2.0.1"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."set-immediate-shim-1.0.1"
       sources."setprototypeof-1.1.0"
-      sources."sha.js-2.4.11"
-      sources."shasum-1.0.2"
-      sources."shell-quote-1.6.1"
       sources."slack-node-0.2.0"
       sources."smart-buffer-1.1.15"
       sources."smtp-connection-2.12.0"
@@ -35408,50 +35489,27 @@ in
       sources."source-map-0.6.1"
       sources."sshpk-1.14.1"
       sources."statuses-1.5.0"
-      sources."stream-browserify-2.0.1"
-      sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.1"
-      sources."stream-splicer-2.0.0"
       sources."streamroller-0.7.0"
-      sources."string_decoder-1.0.3"
+      sources."string_decoder-1.1.1"
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
-      sources."subarg-1.0.0"
       sources."supports-color-2.0.0"
-      sources."syntax-error-1.4.0"
-      sources."through-2.3.8"
-      sources."through2-2.0.3"
       sources."thunkify-2.1.2"
-      sources."timers-browserify-1.4.2"
       sources."timespan-2.3.0"
       sources."tmp-0.0.33"
       sources."to-array-0.1.4"
-      sources."to-arraybuffer-1.0.1"
       sources."tough-cookie-2.3.4"
       sources."tsscmp-1.0.5"
-      sources."tty-browserify-0.0.1"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."type-is-1.6.16"
-      sources."typedarray-0.0.6"
       sources."ultron-1.1.1"
-      sources."umd-3.0.3"
       sources."underscore-1.7.0"
       sources."unpipe-1.0.0"
-      (sources."url-0.11.0" // {
+      (sources."useragent-2.2.1" // {
         dependencies = [
-          sources."punycode-1.3.2"
-        ];
-      })
-      (sources."useragent-2.3.0" // {
-        dependencies = [
-          sources."lru-cache-4.1.2"
-        ];
-      })
-      (sources."util-0.10.3" // {
-        dependencies = [
-          sources."inherits-2.0.1"
+          sources."lru-cache-2.2.4"
         ];
       })
       sources."util-deprecate-1.0.2"
@@ -35459,7 +35517,6 @@ in
       sources."uuid-3.2.1"
       sources."uws-9.14.0"
       sources."verror-1.10.0"
-      sources."vm-browserify-0.0.4"
       sources."void-elements-2.0.1"
       sources."when-3.7.8"
       sources."wordwrap-1.0.0"
@@ -35468,7 +35525,6 @@ in
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xregexp-2.0.0"
       sources."xtend-4.0.1"
-      sources."yallist-2.1.2"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -35644,10 +35700,10 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "2.10.1";
+    version = "2.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-2.10.1.tgz";
-      sha512 = "1y2pnipc1wsra1gdj77c4217xcycdwycda28drnh7sf43hcw4ang1x859i95m084v9ahcjysdb7ap2c3zk6ivm0q3way48k1xxnci57";
+      url = "https://registry.npmjs.org/lerna/-/lerna-2.11.0.tgz";
+      sha512 = "22hg2kpml4wkbgp15nzbhcs81kdaynq0prspzmbfrr5hpbga1cz8vl2adc4dry1lcxs36s2w5pbsvrdic4bw623vx8nngxn0z7kl0wj";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -35674,7 +35730,7 @@ in
       sources."camelcase-keys-2.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."center-align-0.1.3"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."ci-info-1.1.3"
       sources."cli-cursor-2.1.0"
@@ -35691,7 +35747,7 @@ in
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."console-control-strings-1.1.0"
-      (sources."conventional-changelog-1.1.23" // {
+      (sources."conventional-changelog-1.1.24" // {
         dependencies = [
           sources."camelcase-4.1.0"
           sources."map-obj-1.0.1"
@@ -35700,7 +35756,7 @@ in
       })
       sources."conventional-changelog-angular-1.6.6"
       sources."conventional-changelog-atom-0.2.8"
-      (sources."conventional-changelog-cli-1.3.21" // {
+      (sources."conventional-changelog-cli-1.3.22" // {
         dependencies = [
           sources."camelcase-2.1.1"
           sources."camelcase-keys-4.2.0"
@@ -35724,12 +35780,12 @@ in
         ];
       })
       sources."conventional-changelog-codemirror-0.3.8"
-      (sources."conventional-changelog-core-2.0.10" // {
+      (sources."conventional-changelog-core-2.0.11" // {
         dependencies = [
-          sources."meow-4.0.0"
+          sources."meow-4.0.1"
         ];
       })
-      sources."conventional-changelog-ember-0.3.11"
+      sources."conventional-changelog-ember-0.3.12"
       sources."conventional-changelog-eslint-1.0.9"
       sources."conventional-changelog-express-0.3.6"
       sources."conventional-changelog-jquery-0.1.0"
@@ -35754,7 +35810,7 @@ in
       sources."decamelize-1.2.0"
       sources."decamelize-keys-1.1.0"
       sources."dedent-0.7.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."defaults-1.0.3"
       sources."delegates-1.0.0"
       sources."detect-indent-5.0.0"
@@ -35843,7 +35899,7 @@ in
         ];
       })
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash._reinterpolate-3.0.0"
       sources."lodash.template-4.4.0"
       sources."lodash.templatesettings-4.1.0"
@@ -35854,7 +35910,7 @@ in
       sources."make-dir-1.2.0"
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
-      (sources."meow-4.0.0" // {
+      (sources."meow-4.0.1" // {
         dependencies = [
           sources."find-up-2.1.0"
           sources."load-json-file-4.0.0"
@@ -35870,7 +35926,7 @@ in
       sources."minimist-options-3.0.2"
       sources."mkdirp-0.5.1"
       sources."modify-values-1.0.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."mute-stream-0.0.7"
       sources."normalize-package-data-2.4.0"
       sources."npm-run-path-2.0.2"
@@ -35911,7 +35967,7 @@ in
       sources."pseudomap-1.0.2"
       sources."q-1.5.1"
       sources."quick-lru-1.1.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."read-cmd-shim-1.0.1"
       sources."read-pkg-3.0.0"
       sources."read-pkg-up-1.0.1"
@@ -35929,7 +35985,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
@@ -35957,7 +36013,7 @@ in
           sources."minimist-0.1.0"
         ];
       })
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."temp-dir-1.0.0"
       (sources."temp-write-3.4.0" // {
         dependencies = [
@@ -36031,74 +36087,71 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.0.1";
+    version = "3.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.0.1.tgz";
-      sha512 = "25qmszxk5bzrjgyy1m0k87zc1c5h19ckvnlkhl9j3ncm3zfx7rzmydj6f4sw5c7ldc4npzs41fmgd1hw113kilrk8sggwzwvfw7hi59";
+      url = "https://registry.npmjs.org/less/-/less-3.0.2.tgz";
+      sha512 = "1hs3nj50rw6qlk3hjkd6ynhdv7mdlawwl4jzl3d43kbijkych51dm15ccb1ra7i9pmaq13nm24rkzf3bxv3fcpcrqq499cp0lbyg2cj";
     };
     dependencies = [
-      sources."ajv-4.11.8"
+      sources."ajv-5.5.2"
       sources."asap-2.0.6"
       sources."asn1-0.2.3"
-      sources."assert-plus-0.2.0"
+      sources."assert-plus-1.0.0"
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.6.0"
+      sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."bcrypt-pbkdf-1.0.1"
-      sources."boom-2.10.1"
+      sources."boom-4.3.1"
       sources."caseless-0.12.0"
       sources."co-4.6.0"
       sources."combined-stream-1.0.6"
       sources."core-util-is-1.0.2"
-      sources."cryptiles-2.0.5"
+      (sources."cryptiles-3.1.2" // {
+        dependencies = [
+          sources."boom-5.2.0"
+        ];
+      })
       sources."dashdash-1.14.1"
       sources."delayed-stream-1.0.0"
       sources."ecc-jsbn-0.1.1"
       sources."errno-0.1.7"
       sources."extend-3.0.1"
       sources."extsprintf-1.3.0"
+      sources."fast-deep-equal-1.1.0"
+      sources."fast-json-stable-stringify-2.0.0"
       sources."forever-agent-0.6.1"
-      sources."form-data-2.1.4"
+      sources."form-data-2.3.2"
       sources."getpass-0.1.7"
       sources."graceful-fs-4.1.11"
-      sources."har-schema-1.0.5"
-      sources."har-validator-4.2.1"
-      sources."hawk-3.1.3"
-      sources."hoek-2.16.3"
-      sources."http-signature-1.1.1"
+      sources."har-schema-2.0.0"
+      sources."har-validator-5.0.3"
+      sources."hawk-6.0.2"
+      sources."hoek-4.2.1"
+      sources."http-signature-1.2.0"
       sources."image-size-0.5.5"
       sources."is-typedarray-1.0.0"
       sources."isstream-0.1.2"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
-      sources."json-stable-stringify-1.0.1"
+      sources."json-schema-traverse-0.3.1"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.0"
-      (sources."jsprim-1.4.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."jsprim-1.4.1"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."oauth-sign-0.8.2"
-      sources."performance-now-0.2.0"
+      sources."performance-now-2.1.0"
       sources."promise-7.3.1"
       sources."prr-1.0.1"
       sources."punycode-1.4.1"
-      sources."qs-6.4.0"
-      sources."request-2.81.0"
-      sources."safe-buffer-5.1.1"
-      sources."sntp-1.0.9"
+      sources."qs-6.5.2"
+      sources."request-2.85.0"
+      sources."safe-buffer-5.1.2"
+      sources."sntp-2.1.0"
       sources."source-map-0.5.7"
-      (sources."sshpk-1.14.1" // {
-        dependencies = [
-          sources."assert-plus-1.0.0"
-        ];
-      })
+      sources."sshpk-1.14.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
@@ -36164,7 +36217,7 @@ in
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
       sources."core-util-is-1.0.2"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."end-of-stream-1.4.1"
       sources."expand-brackets-0.1.5"
       sources."expand-range-1.8.2"
@@ -36242,7 +36295,7 @@ in
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."replace-ext-1.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."stream-shift-1.0.0"
       sources."string_decoder-1.1.1"
       sources."strip-bom-2.0.0"
@@ -36363,6 +36416,7 @@ in
       sources."expand-range-1.8.2"
       (sources."express-4.16.3" // {
         dependencies = [
+          sources."safe-buffer-5.1.1"
           sources."statuses-1.4.0"
         ];
       })
@@ -36380,7 +36434,7 @@ in
       sources."form-data-2.3.2"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."getpass-0.1.7"
       sources."github-slugger-1.2.0"
       sources."glob-base-0.3.0"
@@ -36480,7 +36534,7 @@ in
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
       sources."request-2.85.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
       sources."set-immediate-shim-1.0.1"
@@ -36555,7 +36609,7 @@ in
         ];
       })
       sources."chokidar-1.7.0"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."concat-map-0.0.1"
       sources."connect-3.5.1"
       sources."core-util-is-1.0.2"
@@ -36580,13 +36634,13 @@ in
       sources."for-own-0.1.5"
       sources."fresh-0.5.2"
       sources."from-0.1.7"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
       sources."http-auth-3.1.3"
       sources."http-errors-1.6.3"
-      sources."http-parser-js-0.4.11"
+      sources."http-parser-js-0.4.12"
       sources."inherits-2.0.3"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
@@ -36612,6 +36666,7 @@ in
         dependencies = [
           sources."debug-2.6.9"
           sources."ms-2.0.0"
+          sources."safe-buffer-5.1.1"
         ];
       })
       sources."ms-0.7.1"
@@ -36646,7 +36701,7 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       (sources."send-0.16.2" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -36724,10 +36779,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.5";
+    version = "5.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz";
-      sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz";
+      sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -36790,7 +36845,7 @@ in
       sources."isarray-1.0.0"
       sources."js-yaml-3.11.0"
       sources."json-refs-2.1.7"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
@@ -36800,13 +36855,13 @@ in
       sources."path-loader-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."punycode-2.1.0"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."slash-1.0.0"
       sources."sprintf-js-1.0.3"
       sources."string_decoder-1.1.1"
-      sources."superagent-3.8.2"
+      sources."superagent-3.8.3"
       sources."uri-js-3.0.2"
       sources."util-deprecate-1.0.2"
     ];
@@ -36928,7 +36983,7 @@ in
       sources."nijs-0.0.25"
       sources."nopt-3.0.6"
       sources."normalize-package-data-2.4.0"
-      sources."npm-package-arg-6.0.0"
+      sources."npm-package-arg-6.1.0"
       sources."npm-registry-client-8.5.1"
       (sources."npmconf-2.1.2" // {
         dependencies = [
@@ -36949,12 +37004,12 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.85.0"
       sources."retry-0.10.1"
       sources."rimraf-2.2.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
@@ -37085,11 +37140,11 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.85.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
@@ -37168,7 +37223,7 @@ in
           sources."yargs-1.3.3"
         ];
       })
-      sources."big-integer-1.6.27"
+      sources."big-integer-1.6.28"
       sources."block-stream-0.0.9"
       (sources."body-parser-1.18.2" // {
         dependencies = [
@@ -37204,7 +37259,7 @@ in
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."default-browser-id-1.0.4"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -37327,7 +37382,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
@@ -37419,10 +37474,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.9.0";
+    version = "0.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz";
-      sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz";
+      sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -37437,7 +37492,7 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
       sources."fs-minipass-1.2.5"
@@ -37458,7 +37513,7 @@ in
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."needle-2.2.0"
+      sources."needle-2.2.1"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.3"
       sources."npm-packlist-1.1.10"
@@ -37471,14 +37526,14 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
-      (sources."rc-1.2.6" // {
+      (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."readable-stream-2.3.6"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."semver-5.5.0"
@@ -37488,7 +37543,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.1"
+      sources."tar-4.4.2"
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.2"
       sources."wrappy-1.0.2"
@@ -37506,10 +37561,10 @@ in
   nodemon = nodeEnv.buildNodePackage {
     name = "nodemon";
     packageName = "nodemon";
-    version = "1.17.3";
+    version = "1.17.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz";
-      sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz";
+      sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -37530,7 +37585,7 @@ in
       sources."array-unique-0.3.2"
       sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -37555,7 +37610,7 @@ in
       sources."cache-base-1.0.1"
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       (sources."chokidar-2.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -37602,7 +37657,7 @@ in
       sources."crypto-random-string-1.0.0"
       sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."define-property-2.0.2"
       sources."dot-prop-4.2.0"
       sources."duplexer-0.1.1"
@@ -37627,7 +37682,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."from-0.1.7"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       (sources."glob-parent-3.1.0" // {
@@ -37721,7 +37776,7 @@ in
       sources."ps-tree-1.1.0"
       sources."pseudomap-1.0.2"
       sources."pstree.remy-1.1.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."regex-not-1.0.2"
@@ -37732,7 +37787,7 @@ in
       sources."repeat-string-1.6.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
@@ -37771,7 +37826,7 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."term-size-1.2.0"
       sources."through-2.3.8"
       sources."timed-out-4.0.1"
@@ -37800,8 +37855,8 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.0.4"
-      sources."update-notifier-2.4.0"
+      sources."upath-1.0.5"
+      sources."update-notifier-2.5.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
       (sources."use-3.1.0" // {
@@ -37902,7 +37957,7 @@ in
       sources."css-what-2.1.0"
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -37912,7 +37967,7 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
       sources."domutils-1.5.1"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
@@ -38043,8 +38098,8 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
-      sources."moment-timezone-0.5.14"
+      sources."moment-2.22.1"
+      sources."moment-timezone-0.5.16"
       (sources."mqtt-2.15.1" // {
         dependencies = [
           sources."ws-3.3.3"
@@ -38067,7 +38122,7 @@ in
       sources."needle-0.11.0"
       sources."negotiator-0.6.1"
       sources."node-pre-gyp-0.6.36"
-      (sources."node-red-node-email-0.1.27" // {
+      (sources."node-red-node-email-0.1.29" // {
         dependencies = [
           sources."addressparser-1.0.1"
           sources."clone-1.0.4"
@@ -38121,7 +38176,7 @@ in
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
       sources."pump-2.0.1"
-      sources."pumpify-1.4.0"
+      sources."pumpify-1.5.0"
       sources."punycode-1.4.1"
       sources."qs-6.5.1"
       sources."random-bytes-1.0.0"
@@ -38133,7 +38188,7 @@ in
           sources."setprototypeof-1.0.3"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
@@ -38293,7 +38348,7 @@ in
       sources."natives-1.1.3"
       (sources."net-ping-1.1.7" // {
         dependencies = [
-          sources."nan-2.3.5"
+          sources."nan-2.10.0"
         ];
       })
       sources."nodemailer-0.3.35"
@@ -38308,7 +38363,7 @@ in
       sources."qs-0.5.1"
       sources."rai-0.1.12"
       sources."range-parser-0.0.4"
-      sources."raw-socket-1.5.2"
+      sources."raw-socket-1.6.0"
       sources."redis-0.7.3"
       sources."semver-1.1.0"
       sources."send-0.1.0"
@@ -38344,10 +38399,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.8.0";
+    version = "6.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz";
-      sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f";
+      url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
+      sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -38486,12 +38541,12 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.85.0"
       sources."retry-0.6.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-4.3.6"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
@@ -38538,153 +38593,74 @@ in
   npm-check-updates = nodeEnv.buildNodePackage {
     name = "npm-check-updates";
     packageName = "npm-check-updates";
-    version = "2.14.1";
+    version = "2.14.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.1.tgz";
-      sha512 = "1ciz9n8wmwq3lpi3g6xmjr4plqf3ydpqznrcci5bbrq7d9clkmkcg3gzbaqwkgrjgmvahby0akylk66zq8n8zm5mqn0vj0jsrxhryf4";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.14.2.tgz";
+      sha512 = "20p92czrssb8mfn5lmaswrzv0wy5va0r7xlmh5f6sd7zj46iydqkhfmfy9lv3d6zf7x42zdbkdrj4mk420gzlmgb3wgd608cafcnalk";
     };
     dependencies = [
-      sources."abbrev-1.1.1"
-      sources."align-text-0.1.4"
       sources."ansi-align-2.0.0"
-      sources."ansi-escapes-1.4.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
-      sources."ansicolors-0.3.2"
-      sources."archy-1.0.0"
       sources."argparse-1.0.10"
-      sources."asap-2.0.6"
-      sources."async-1.5.2"
-      sources."balanced-match-1.0.0"
-      sources."base64-js-0.0.2"
       sources."bluebird-3.5.1"
-      sources."bops-0.1.1"
-      sources."boxen-0.3.1"
-      sources."brace-expansion-1.1.11"
-      sources."builtin-modules-1.1.1"
-      sources."camelcase-1.2.1"
+      sources."boxen-1.3.0"
+      sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
-      sources."center-align-0.1.3"
       sources."chalk-1.1.3"
       sources."ci-info-1.1.3"
       sources."cint-8.2.1"
       sources."cli-boxes-1.0.0"
-      sources."cli-cursor-1.0.2"
       sources."cli-table-0.3.1"
-      sources."cli-width-2.2.0"
-      sources."clite-0.3.0"
-      sources."cliui-2.1.0"
-      sources."clone-deep-0.3.0"
-      sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."colors-1.0.3"
       sources."commander-2.15.1"
-      sources."concat-map-0.0.1"
-      (sources."configstore-1.4.0" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
-      sources."core-util-is-1.0.2"
+      sources."configstore-3.1.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
-      sources."dot-prop-3.0.0"
-      sources."duplexer2-0.1.4"
+      sources."deep-extend-0.5.1"
+      sources."dot-prop-4.2.0"
       sources."duplexer3-0.1.4"
-      sources."duplexify-3.5.4"
-      sources."email-validator-1.1.1"
-      sources."end-of-stream-1.4.1"
-      sources."error-ex-1.3.1"
-      sources."es6-promise-3.3.1"
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.0"
       sources."execa-0.7.0"
-      sources."exit-hook-1.1.1"
       sources."fast-diff-1.1.2"
-      sources."figures-1.7.0"
-      sources."filled-array-1.1.0"
       sources."find-up-1.1.2"
-      sources."for-in-1.0.2"
-      sources."for-own-1.0.0"
-      sources."get-caller-file-1.0.2"
       sources."get-stdin-5.0.1"
       sources."get-stream-3.0.0"
       sources."global-dirs-0.1.1"
-      sources."got-5.7.1"
+      sources."got-6.7.1"
       sources."graceful-fs-4.1.11"
-      sources."graphlib-2.1.5"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."hasbin-1.2.3"
-      sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.21"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
-      sources."infinity-agent-2.0.3"
-      sources."inherits-2.0.3"
       sources."ini-1.3.5"
-      sources."inquirer-1.0.3"
-      sources."invert-kv-1.0.0"
-      sources."is-arrayish-0.2.1"
-      sources."is-buffer-1.1.6"
-      sources."is-builtin-module-1.0.0"
       sources."is-ci-1.1.0"
-      sources."is-extendable-0.1.1"
-      sources."is-finite-1.0.2"
-      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-fullwidth-code-point-2.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
       sources."is-obj-1.0.1"
       sources."is-path-inside-1.0.1"
-      sources."is-plain-object-2.0.4"
-      sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
       sources."is-retry-allowed-1.1.0"
       sources."is-stream-1.1.0"
-      sources."is-utf8-0.2.1"
-      sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
       sources."jju-1.3.0"
       sources."js-yaml-3.11.0"
       sources."json-parse-helpfulerror-1.0.3"
       sources."json5-0.5.1"
-      sources."kind-of-3.2.2"
-      sources."latest-version-2.0.0"
-      sources."lazy-cache-1.0.4"
-      sources."lcid-1.0.0"
-      sources."load-json-file-1.1.0"
-      sources."lodash-4.17.5"
-      sources."lodash.assign-4.2.0"
-      sources."lodash.clonedeep-4.5.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.defaultsdeep-4.6.0"
-      sources."lodash.mergewith-4.6.1"
-      sources."longest-1.0.1"
+      sources."latest-version-3.1.0"
+      sources."lodash-4.17.10"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.2"
       sources."make-dir-1.2.0"
-      sources."minimatch-3.0.4"
-      sources."minimist-0.0.8"
-      sources."mixin-object-2.0.1"
-      sources."mkdirp-0.5.1"
+      sources."minimist-1.2.0"
       sources."ms-2.0.0"
-      sources."mute-stream-0.0.6"
-      sources."nconf-0.7.2"
-      (sources."needle-2.2.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."nested-error-stacks-1.0.2"
       sources."node-alias-1.0.4"
-      sources."node-status-codes-1.0.0"
-      sources."normalize-package-data-2.4.0"
       sources."npm-3.10.10"
       sources."npm-run-path-2.0.2"
       (sources."npmi-2.0.1" // {
@@ -38692,214 +38668,56 @@ in
           sources."semver-4.3.6"
         ];
       })
-      sources."number-is-nan-1.0.1"
       sources."object-assign-4.1.1"
       sources."object-keys-1.0.11"
-      sources."once-1.4.0"
-      sources."onetime-1.1.0"
-      sources."open-0.0.5"
-      sources."os-homedir-1.0.2"
-      sources."os-locale-1.4.0"
-      sources."os-name-1.0.3"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."osx-release-1.1.0"
       sources."p-finally-1.0.0"
-      sources."package-json-2.4.0"
-      sources."parse-json-2.2.0"
+      sources."package-json-4.0.1"
       sources."path-exists-2.1.0"
-      sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
-      sources."path-type-1.1.0"
-      sources."pify-2.3.0"
+      sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
       sources."prepend-http-1.0.4"
-      sources."process-nextick-args-2.0.0"
-      sources."promise-7.3.1"
-      sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
-      sources."punycode-1.3.2"
-      sources."querystring-0.2.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."rc-config-loader-2.0.1"
-      sources."read-all-stream-3.1.0"
-      sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.6"
-      sources."recursive-readdir-2.2.2"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
-      sources."repeat-string-1.6.1"
-      sources."repeating-2.0.1"
-      sources."require-directory-2.1.1"
       sources."require-from-string-2.0.2"
-      sources."require-main-filename-1.0.1"
-      sources."restore-cursor-1.0.1"
-      sources."right-align-0.1.3"
-      sources."run-async-2.3.0"
-      sources."rx-4.1.0"
-      sources."safe-buffer-5.1.1"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.2.4"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
       sources."semver-utils-1.1.2"
-      sources."set-blocking-2.0.0"
-      (sources."shallow-clone-0.1.2" // {
-        dependencies = [
-          sources."kind-of-2.0.1"
-        ];
-      })
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
-      sources."slide-1.1.6"
-      (sources."snyk-1.71.0" // {
-        dependencies = [
-          sources."async-0.9.2"
-          sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
-          sources."debug-3.1.0"
-          sources."for-in-0.1.8"
-          sources."got-3.3.1"
-          sources."latest-version-1.0.1"
-          sources."lazy-cache-0.2.7"
-          sources."minimist-1.2.0"
-          sources."object-assign-3.0.0"
-          sources."package-json-1.2.0"
-          sources."repeating-1.1.3"
-          sources."timed-out-2.0.0"
-          sources."update-notifier-0.5.0"
-          sources."window-size-0.2.0"
-          sources."yargs-4.8.1"
-        ];
-      })
-      (sources."snyk-config-1.0.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-go-plugin-1.4.6"
-      sources."snyk-gradle-plugin-1.2.0"
-      (sources."snyk-module-1.8.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-mvn-plugin-1.1.1"
-      (sources."snyk-nuget-plugin-1.3.9" // {
-        dependencies = [
-          sources."es6-promise-4.2.4"
-        ];
-      })
-      sources."snyk-php-plugin-1.3.2"
-      (sources."snyk-policy-1.10.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-python-plugin-1.5.7"
-      (sources."snyk-resolve-1.0.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      (sources."snyk-resolve-deps-1.7.0" // {
-        dependencies = [
-          sources."configstore-2.1.0"
-          sources."debug-2.6.9"
-          sources."update-notifier-0.6.3"
-          sources."uuid-2.0.3"
-        ];
-      })
-      (sources."snyk-sbt-plugin-1.2.5" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-tree-1.0.0"
-      (sources."snyk-try-require-1.2.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
       sources."spawn-please-0.3.0"
-      sources."spdx-correct-3.0.0"
-      sources."spdx-exceptions-2.1.0"
-      sources."spdx-expression-parse-3.0.0"
-      sources."spdx-license-ids-3.0.0"
       sources."sprintf-js-1.0.3"
-      sources."stream-shift-1.0.0"
-      sources."string-length-1.0.1"
-      sources."string-width-1.0.2"
-      sources."string_decoder-1.1.1"
+      sources."string-width-2.1.1"
       sources."strip-ansi-3.0.1"
-      sources."strip-bom-2.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-2.0.0"
-      (sources."tempfile-1.1.1" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
       sources."term-size-1.2.0"
-      sources."then-fs-2.0.0"
-      sources."through-2.3.8"
-      sources."timed-out-3.1.3"
-      sources."to-utf8-0.0.1"
-      sources."toml-2.3.3"
-      sources."undefsafe-0.0.3"
+      sources."timed-out-4.0.1"
       sources."unique-string-1.0.0"
-      sources."unzip-response-1.0.2"
-      (sources."update-notifier-2.4.0" // {
+      sources."unzip-response-2.0.1"
+      (sources."update-notifier-2.5.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          sources."boxen-1.3.0"
-          sources."camelcase-4.1.0"
-          sources."chalk-2.3.2"
-          sources."configstore-3.1.2"
-          sources."dot-prop-4.2.0"
-          sources."got-6.7.1"
-          sources."is-fullwidth-code-point-2.0.0"
-          sources."latest-version-3.1.0"
-          sources."package-json-4.0.1"
-          sources."pify-3.0.0"
-          sources."string-width-2.1.1"
+          sources."chalk-2.4.1"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.3.0"
-          sources."timed-out-4.0.1"
-          sources."unzip-response-2.0.1"
-          sources."widest-line-2.0.0"
-          sources."write-file-atomic-2.3.0"
-          sources."xdg-basedir-3.0.0"
+          sources."supports-color-5.4.0"
         ];
       })
-      sources."url-0.11.0"
       sources."url-parse-lax-1.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-3.2.1"
-      sources."validate-npm-package-license-3.0.3"
       sources."which-1.3.0"
-      sources."which-module-1.0.0"
-      sources."widest-line-1.0.0"
-      sources."win-release-1.1.1"
-      sources."window-size-0.1.4"
-      sources."wordwrap-0.0.2"
-      sources."wrap-ansi-2.1.0"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-1.3.4"
-      sources."xdg-basedir-2.0.0"
-      sources."xml2js-0.4.19"
-      sources."xmlbuilder-9.0.7"
-      sources."y18n-3.2.1"
+      sources."widest-line-2.0.0"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
       sources."yallist-2.1.2"
-      sources."yargs-3.15.0"
-      sources."yargs-parser-2.4.1"
-      sources."zip-1.2.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -38926,7 +38744,7 @@ in
       sources."boom-5.2.0"
       sources."builtin-modules-1.1.1"
       sources."camelcase-4.1.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."cli-cursor-2.1.0"
       sources."cli-table2-0.2.0"
@@ -38939,7 +38757,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."cross-spawn-5.1.0"
       sources."cvss-1.0.2"
       sources."debug-3.1.0"
@@ -38964,7 +38782,7 @@ in
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."is-fullwidth-code-point-2.0.0"
-          sources."lodash-4.17.5"
+          sources."lodash-4.17.10"
           sources."string-width-2.1.1"
           sources."strip-ansi-4.0.0"
         ];
@@ -39024,7 +38842,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
       sources."strip-eof-1.0.0"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."validate-npm-package-license-3.0.3"
@@ -39143,7 +38961,7 @@ in
       sources."cliui-2.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combined-stream-1.0.6"
       sources."compressible-2.0.13"
       sources."compression-1.7.2"
@@ -39271,7 +39089,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."ms-2.0.0"
       sources."msgpack5-3.6.0"
       sources."mv-2.1.1"
@@ -39400,10 +39218,10 @@ in
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
-    version = "0.37.0";
+    version = "0.38.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.37.0.tgz";
-      sha512 = "0i2j5pgw72bkg5s5crh3p534sz6m6yvbyg174kkgyj1l0sgaqmzj22xmh0dvxqk7r3rp79w2vs27gdqzb8azmlr6ag13m17h20cyhhf";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.38.0.tgz";
+      sha512 = "0jy97ypdv4a36cdcszfcj0qmv1z1k896h17xb7n2jzj26r4bz8kpj0dcnx255mj5bpxv3074gmabdk2da9jmp2awryyxj7f6l31p2bi";
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
@@ -39418,7 +39236,7 @@ in
       sources."balanced-match-1.0.0"
       sources."base64-js-0.0.8"
       sources."bencode-2.0.0"
-      sources."big-integer-1.6.27"
+      sources."big-integer-1.6.28"
       sources."bitfield-0.1.0"
       sources."bittorrent-dht-6.4.2"
       sources."bittorrent-tracker-7.7.0"
@@ -39456,7 +39274,7 @@ in
       sources."decamelize-1.2.0"
       sources."decompress-response-3.3.0"
       sources."deep-equal-1.0.1"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."dns-equal-1.0.0"
       sources."dns-packet-1.3.1"
       sources."dns-txt-2.0.2"
@@ -39491,7 +39309,7 @@ in
       sources."ini-1.3.5"
       (sources."inquirer-1.2.3" // {
         dependencies = [
-          sources."lodash-4.17.5"
+          sources."lodash-4.17.10"
         ];
       })
       sources."internal-ip-1.2.0"
@@ -39548,12 +39366,12 @@ in
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
       sources."parse-json-2.2.0"
-      (sources."parse-torrent-5.8.3" // {
+      (sources."parse-torrent-5.9.1" // {
         dependencies = [
-          sources."get-stdin-5.0.1"
+          sources."get-stdin-6.0.0"
         ];
       })
-      sources."parse-torrent-file-4.1.0"
+      sources."parse-torrent-file-2.1.4"
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-type-1.1.0"
@@ -39570,11 +39388,11 @@ in
       sources."process-nextick-args-2.0.0"
       sources."pump-1.0.3"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."re-emitter-1.1.3"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
@@ -39585,16 +39403,16 @@ in
       sources."reverse-http-1.3.0"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."run-parallel-1.1.8"
-      sources."run-series-1.1.6"
+      sources."run-parallel-1.1.9"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
       sources."rx-4.1.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.5.0"
       sources."server-destroy-1.0.1"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.7.0"
+      sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
       sources."simple-sha1-2.1.0"
       (sources."simple-websocket-4.3.1" // {
@@ -39611,7 +39429,7 @@ in
       sources."speedometer-0.1.4"
       sources."stream-buffers-2.2.0"
       sources."string-width-1.0.2"
-      sources."string2compact-1.2.2"
+      sources."string2compact-1.2.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -39641,7 +39459,6 @@ in
           sources."minimist-0.0.8"
           sources."once-1.3.3"
           sources."parse-torrent-4.1.0"
-          sources."parse-torrent-file-2.1.4"
           sources."readable-stream-1.1.14"
           sources."safe-buffer-5.0.1"
           sources."string_decoder-0.10.31"
@@ -39878,9 +39695,9 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-1.0.10"
       sources."pump-1.0.3"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       sources."random-bytes-1.0.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
@@ -39907,10 +39724,10 @@ in
       })
       sources."rimraf-2.6.2"
       sources."rndm-1.2.0"
-      sources."run-parallel-1.1.8"
-      sources."run-series-1.1.6"
+      sources."run-parallel-1.1.9"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       (sources."send-0.13.0" // {
         dependencies = [
           sources."ms-0.7.1"
@@ -39925,7 +39742,7 @@ in
         ];
       })
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.7.0"
+      sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
       sources."simple-sha1-2.1.0"
       (sources."simple-websocket-4.3.1" // {
@@ -39955,7 +39772,7 @@ in
       sources."speedometer-0.1.4"
       sources."statuses-1.5.0"
       sources."stream-counter-0.2.0"
-      sources."string2compact-1.2.2"
+      sources."string2compact-1.2.3"
       sources."string_decoder-0.10.31"
       sources."thirty-two-0.0.2"
       sources."thunky-1.0.2"
@@ -40079,7 +39896,7 @@ in
       })
       sources."kew-0.7.0"
       sources."klaw-1.3.1"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
@@ -40133,10 +39950,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "1.11.1";
+    version = "1.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz";
-      sha512 = "33s27xnirdx15j0dkp0i79bawmn7pysqxjiksh1jd5gcl4fdzvhd1sr9n7lh4k1ik37g1lmi3gb33j3kz31psqlxxyz1l5djgmq7wjg";
+      url = "https://registry.npmjs.org/prettier/-/prettier-1.12.1.tgz";
+      sha1 = "c1ad20e803e7749faf905a409d2367e06bbe7325";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -40150,10 +39967,10 @@ in
   pulp = nodeEnv.buildNodePackage {
     name = "pulp";
     packageName = "pulp";
-    version = "12.0.1";
+    version = "12.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pulp/-/pulp-12.0.1.tgz";
-      sha512 = "3n09lgnyd4p3h3jlhgcvbh6n6m9h89hwvbhli5ic32fkl5y4g7yi61m1vw483479jxkif2zyqs89l6j6hq4iy15jdknx1lcp9qbyvwy";
+      url = "https://registry.npmjs.org/pulp/-/pulp-12.2.0.tgz";
+      sha512 = "1kgjvji88fvdi6vazqq6gx32zqgkg9qp639952cz2v2g5izl7yblgawy1xra5dypv5c1a43wk4ch4iskr1kxxpfmn7pnql92q1nvxgg";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -40188,7 +40005,7 @@ in
       sources."astw-2.2.0"
       sources."async-1.5.2"
       sources."async-each-1.0.1"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -40200,7 +40017,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."binary-extensions-1.11.0"
       sources."bn.js-4.11.8"
       sources."brace-expansion-1.1.11"
@@ -40224,15 +40041,14 @@ in
               sources."readable-stream-2.0.6"
             ];
           })
-          sources."hash-base-2.0.2"
           sources."isarray-2.0.4"
           sources."process-nextick-args-2.0.0"
         ];
       })
       sources."browserify-aes-1.2.0"
       sources."browserify-cache-api-3.0.1"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       (sources."browserify-incremental-3.1.1" // {
         dependencies = [
           sources."JSONStream-0.10.0"
@@ -40243,6 +40059,7 @@ in
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.1.4"
       sources."buffer-4.9.1"
+      sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.0.0"
       sources."buffer-xor-1.0.3"
       sources."builtin-status-codes-3.0.0"
@@ -40263,7 +40080,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combine-source-map-0.8.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
@@ -40273,9 +40090,9 @@ in
       sources."convert-source-map-1.1.3"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
+      sources."create-ecdh-4.0.1"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."date-now-0.1.4"
       sources."debug-2.6.9"
@@ -40285,10 +40102,11 @@ in
       sources."deps-sort-2.0.0"
       sources."des.js-1.0.0"
       sources."detective-4.7.1"
-      sources."diffie-hellman-5.0.2"
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.1.7"
       sources."duplexer2-0.1.4"
       sources."elliptic-6.4.0"
+      sources."es6-promise-3.3.1"
       sources."events-1.1.1"
       sources."evp_bytestokey-1.0.3"
       (sources."expand-brackets-2.1.4" // {
@@ -40308,7 +40126,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."function-bind-1.1.1"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
@@ -40364,17 +40182,23 @@ in
       sources."micromatch-3.1.10"
       sources."miller-rabin-4.0.1"
       sources."mime-1.6.0"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mixin-deep-1.3.1"
+      sources."mkdirp-0.5.1"
       sources."module-deps-4.1.1"
+      (sources."mold-source-map-0.4.0" // {
+        dependencies = [
+          sources."through-2.2.7"
+        ];
+      })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."nan-2.10.0"
       sources."nanomatch-1.2.9"
-      sources."neo-async-2.5.0"
+      sources."neo-async-2.5.1"
       (sources."node-static-0.7.10" // {
         dependencies = [
           sources."minimist-0.0.10"
@@ -40391,18 +40215,18 @@ in
       sources."os-tmpdir-1.0.2"
       sources."pako-0.2.9"
       sources."parents-1.0.1"
-      sources."parse-asn1-5.1.0"
+      sources."parse-asn1-5.1.1"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.0"
       sources."path-dirname-1.0.2"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.5"
       sources."path-platform-0.11.15"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."posix-character-classes-0.1.1"
       sources."process-0.11.10"
       sources."process-nextick-args-1.0.7"
-      sources."public-encrypt-4.0.0"
+      sources."public-encrypt-4.0.2"
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -40421,13 +40245,18 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
-      sources."rimraf-2.2.8"
-      sources."ripemd160-2.0.1"
-      sources."safe-buffer-5.1.1"
+      sources."rimraf-2.6.2"
+      sources."ripemd160-2.0.2"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
+      (sources."sander-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
       sources."sha.js-2.4.11"
@@ -40446,9 +40275,11 @@ in
       })
       sources."snapdragon-node-2.1.1"
       sources."snapdragon-util-3.0.1"
+      sources."sorcery-0.10.0"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.1"
       sources."source-map-url-0.4.0"
+      sources."sourcemap-codec-1.4.1"
       (sources."split-string-3.1.0" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -40464,7 +40295,11 @@ in
       sources."string_decoder-0.10.31"
       sources."subarg-1.0.0"
       sources."syntax-error-1.4.0"
-      sources."temp-0.8.3"
+      (sources."temp-0.8.3" // {
+        dependencies = [
+          sources."rimraf-2.2.8"
+        ];
+      })
       sources."through-2.3.8"
       sources."through2-2.0.3"
       sources."timers-browserify-1.4.2"
@@ -40490,7 +40325,7 @@ in
           })
         ];
       })
-      sources."upath-1.0.4"
+      sources."upath-1.0.5"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -40509,7 +40344,7 @@ in
       })
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
-      (sources."watchpack-1.5.0" // {
+      (sources."watchpack-1.6.0" // {
         dependencies = [
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
@@ -40591,6 +40426,9 @@ in
         ];
       })
       sources."boom-2.10.1"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
+      sources."buffer-fill-0.1.1"
       sources."bufferutil-2.0.1"
       sources."bytes-3.0.0"
       sources."camelcase-1.2.1"
@@ -40617,7 +40455,7 @@ in
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -40645,6 +40483,7 @@ in
       sources."form-data-2.1.4"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
+      sources."fs-constants-1.0.0"
       sources."function-bind-1.1.1"
       sources."gauge-2.7.4"
       sources."getpass-0.1.7"
@@ -40695,7 +40534,7 @@ in
       })
       sources."less-middleware-2.2.1"
       sources."libquassel-2.1.9"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."longest-1.0.1"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
@@ -40716,7 +40555,7 @@ in
           sources."tunnel-agent-0.4.3"
         ];
       })
-      sources."node-abi-2.3.0"
+      sources."node-abi-2.4.1"
       sources."node.extend-2.0.0"
       sources."noop-logger-0.1.1"
       sources."npmlog-4.1.2"
@@ -40763,12 +40602,12 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."regenerator-runtime-0.11.1"
       sources."repeat-string-1.6.1"
       sources."request-2.81.0"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."right-align-0.1.3"
       sources."safe-buffer-5.1.1"
       sources."semver-5.5.0"
@@ -40798,8 +40637,9 @@ in
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-fs-1.16.0"
-      sources."tar-stream-1.5.5"
+      sources."tar-fs-1.16.2"
+      sources."tar-stream-1.6.0"
+      sources."to-buffer-1.1.1"
       sources."to-fast-properties-1.0.3"
       sources."token-stream-0.0.1"
       sources."tough-cookie-2.3.4"
@@ -41055,7 +40895,7 @@ in
       sources."oauth-sign-0.8.2"
       (sources."openid-2.0.6" // {
         dependencies = [
-          sources."qs-6.5.1"
+          sources."qs-6.5.2"
           sources."request-2.85.0"
         ];
       })
@@ -41067,7 +40907,7 @@ in
       sources."raw-body-0.0.3"
       sources."readable-stream-1.1.14"
       sources."request-2.9.203"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-1.2.4"
       sources."send-0.1.4"
       sources."sntp-2.1.0"
@@ -41112,10 +40952,10 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "6.5.4";
+    version = "6.5.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-6.5.4.tgz";
-      sha512 = "3dhp8p2c9i86bwaxlxxlhml4p7ps2ph09pap35g5ivy0ndxv6av87axckmm4g7dwvz6c8y6mvc8c0v93m9hlk2rqm07y211621b1hhh";
+      url = "https://registry.npmjs.org/serve/-/serve-6.5.6.tgz";
+      sha512 = "1gfw9s3jh8ymzv26733pp33xkvhihlb25w8aznc3yqcx7wg82k7fzz6f3w3aw758dy7cshb89ijliaqcf1p4bgrchfqbxv1613wgmmd";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -41126,24 +40966,23 @@ in
       sources."ansi-regex-3.0.0"
       sources."ansi-styles-3.2.1"
       sources."arch-2.1.0"
-      (sources."args-3.0.8" // {
+      (sources."args-4.0.0" // {
         dependencies = [
-          sources."chalk-2.1.0"
+          sources."chalk-2.3.2"
         ];
       })
       sources."async-1.5.2"
       sources."basic-auth-2.0.0"
       sources."bluebird-3.5.1"
-      sources."boxen-1.3.0"
-      sources."bytes-3.0.0"
-      sources."camelcase-4.1.0"
-      sources."center-align-0.1.3"
-      (sources."chalk-2.3.2" // {
+      (sources."boxen-1.3.0" // {
         dependencies = [
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.3.0"
+          sources."camelcase-4.1.0"
         ];
       })
+      sources."bytes-3.0.0"
+      sources."camelcase-5.0.0"
+      sources."center-align-0.1.3"
+      sources."chalk-2.4.0"
       sources."cli-boxes-1.0.0"
       (sources."clipboardy-1.2.3" // {
         dependencies = [
@@ -41160,7 +40999,7 @@ in
       sources."dargs-5.1.0"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."depd-1.1.1"
       sources."destroy-1.0.4"
       sources."detect-port-1.2.2"
@@ -41170,7 +41009,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."etag-1.8.1"
       sources."execa-0.7.0"
-      sources."filesize-3.6.0"
+      sources."filesize-3.6.1"
       sources."fresh-0.5.2"
       sources."fs-extra-5.0.0"
       sources."get-stream-3.0.0"
@@ -41181,7 +41020,7 @@ in
           sources."wordwrap-0.0.2"
         ];
       })
-      sources."has-flag-2.0.0"
+      sources."has-flag-3.0.0"
       sources."http-errors-1.6.2"
       sources."iconv-lite-0.4.19"
       sources."inherits-2.0.3"
@@ -41195,10 +41034,10 @@ in
       sources."jsonfile-4.0.0"
       sources."kind-of-3.2.2"
       sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.5"
+      sources."leven-2.1.0"
       sources."longest-1.0.1"
       sources."lru-cache-4.1.2"
-      sources."micro-9.1.0"
+      sources."micro-9.1.4"
       sources."micro-compress-1.0.0"
       sources."mime-1.4.1"
       sources."mime-db-1.33.0"
@@ -41207,23 +41046,22 @@ in
       sources."mri-1.1.0"
       sources."ms-2.0.0"
       sources."negotiator-0.6.1"
-      sources."node-version-1.1.0"
+      sources."node-version-1.1.3"
       sources."npm-run-path-2.0.2"
       sources."on-finished-2.3.0"
       sources."on-headers-1.0.1"
       sources."openssl-self-signed-certificate-1.1.6"
-      sources."opn-5.2.0"
+      sources."opn-5.3.0"
       sources."optimist-0.6.1"
       sources."p-finally-1.0.0"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
       sources."path-type-3.0.0"
       sources."pify-3.0.0"
-      sources."pkginfo-0.4.1"
       sources."pseudomap-1.0.2"
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.2"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
       sources."repeat-string-1.6.1"
@@ -41241,12 +41079,11 @@ in
       sources."signal-exit-3.0.2"
       sources."source-map-0.4.4"
       sources."statuses-1.5.0"
-      sources."string-similarity-1.2.0"
       sources."string-width-2.1.1"
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."supports-color-4.5.0"
+      sources."supports-color-5.4.0"
       sources."term-size-1.2.0"
       (sources."uglify-js-2.8.29" // {
         dependencies = [
@@ -41256,7 +41093,7 @@ in
       sources."uglify-to-browserify-1.0.2"
       sources."universalify-0.1.1"
       sources."unpipe-1.0.0"
-      (sources."update-check-1.2.0" // {
+      (sources."update-check-1.3.2" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -41544,7 +41381,7 @@ in
       })
       sources."bytes-1.0.0"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."co-4.6.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
@@ -41660,7 +41497,7 @@ in
       sources."minimatch-1.0.0"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."ms-2.0.0"
       sources."mv-2.1.1"
       sources."nan-2.10.0"
@@ -41676,7 +41513,7 @@ in
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."performance-now-2.1.0"
-      sources."postcss-6.0.21"
+      sources."postcss-6.0.22"
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-1.1.5"
       sources."punycode-1.4.1"
@@ -41697,7 +41534,7 @@ in
       })
       (sources."request-2.85.0" // {
         dependencies = [
-          sources."qs-6.5.1"
+          sources."qs-6.5.2"
         ];
       })
       sources."rimraf-2.4.5"
@@ -41724,7 +41561,7 @@ in
       sources."statuses-1.3.1"
       sources."string_decoder-1.1.1"
       sources."stringstream-0.0.5"
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       sources."through-2.3.8"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
@@ -41775,12 +41612,12 @@ in
       sources."graceful-readlink-1.0.1"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."minimatch-3.0.4"
       sources."process-nextick-args-2.0.0"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."string_decoder-1.1.1"
       sources."util-deprecate-1.0.2"
@@ -41863,7 +41700,7 @@ in
         ];
       })
       sources."rimraf-2.4.5"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.1.0"
       sources."semver-4.3.6"
       (sources."smartdc-auth-2.3.1" // {
@@ -41968,7 +41805,7 @@ in
       sources."object-component-0.0.3"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."socket.io-adapter-1.1.1"
       sources."socket.io-client-2.1.0"
       sources."socket.io-parser-3.2.0"
@@ -42151,7 +41988,7 @@ in
       sources."is-regex-1.0.4"
       sources."is-symbol-1.0.1"
       sources."js-yaml-3.10.0"
-      sources."mdn-data-1.1.0"
+      sources."mdn-data-1.1.2"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."nth-check-1.0.1"
@@ -42162,7 +41999,7 @@ in
       sources."sax-1.2.4"
       sources."source-map-0.5.7"
       sources."sprintf-js-1.0.3"
-      sources."stable-0.1.6"
+      sources."stable-0.1.8"
       sources."unquote-1.1.1"
       sources."util.promisify-1.0.0"
     ];
@@ -42206,7 +42043,7 @@ in
       sources."prr-1.0.1"
       sources."readable-stream-2.3.6"
       sources."resolve-from-2.0.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."string_decoder-1.1.1"
       sources."tapable-0.2.8"
       sources."util-deprecate-1.0.2"
@@ -42305,7 +42142,7 @@ in
       sources."keypress-0.2.1"
       sources."kind-of-3.2.2"
       sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."longest-1.0.1"
       sources."longjohn-0.2.11"
       sources."mime-db-1.33.0"
@@ -42341,7 +42178,7 @@ in
       })
       sources."right-align-0.1.3"
       sources."rimraf-2.2.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.3.0"
       sources."sntp-1.0.9"
       sources."source-map-0.1.32"
@@ -42388,10 +42225,10 @@ in
   typescript = nodeEnv.buildNodePackage {
     name = "typescript";
     packageName = "typescript";
-    version = "2.8.1";
+    version = "2.8.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-2.8.1.tgz";
-      sha512 = "1v0ac83sjf21wg11fpllicxz8irx9yg341zmng7vz15524gbfphc9ch70n4x9r70gm0r4ak79xyaxw9zh6b2cwcs7mg447qvzlxz3q2";
+      url = "https://registry.npmjs.org/typescript/-/typescript-2.8.3.tgz";
+      sha512 = "2vwhgmdrdw42wwaqbmrnz7zy197hrxl6smkmhrb3n93vsjmqg24a4r10czdralib6qpj82bx2gw97r3gxlspj7y54jswigs2vj3bf1b";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -42451,7 +42288,7 @@ in
       sources."cross-spawn-5.1.0"
       sources."crypto-random-string-1.0.0"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."defaults-1.0.3"
       sources."delayed-stream-1.0.0"
       sources."detect-indent-5.0.0"
@@ -42505,7 +42342,7 @@ in
       sources."jspm-config-0.3.4"
       sources."latest-version-3.1.0"
       sources."listify-1.0.0"
-      sources."lockfile-1.0.3"
+      sources."lockfile-1.0.4"
       sources."log-update-1.0.2"
       sources."loose-envify-1.3.1"
       sources."lowercase-keys-1.0.1"
@@ -42541,7 +42378,7 @@ in
       sources."promise-finally-3.0.0"
       sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
-      (sources."rc-1.2.6" // {
+      (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -42551,7 +42388,7 @@ in
       sources."registry-url-3.1.0"
       sources."restore-cursor-1.0.1"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.0.3"
       sources."semver-diff-2.1.0"
       sources."shebang-command-1.2.0"
@@ -42574,7 +42411,7 @@ in
       sources."touch-1.0.0"
       sources."tough-cookie-2.3.4"
       sources."typedarray-0.0.6"
-      sources."typescript-2.8.1"
+      sources."typescript-2.8.3"
       (sources."typings-core-2.3.3" // {
         dependencies = [
           sources."minimist-0.0.8"
@@ -42583,12 +42420,12 @@ in
       sources."unc-path-regex-0.1.2"
       sources."unique-string-1.0.0"
       sources."unzip-response-2.0.1"
-      (sources."update-notifier-2.4.0" // {
+      (sources."update-notifier-2.5.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."semver-5.5.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."url-parse-lax-1.0.0"
@@ -42616,10 +42453,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.3.20";
+    version = "3.3.23";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.20.tgz";
-      sha512 = "3x6k1plb2hrmm51fn2w7nmi9pixipwj224a4afly17p2mwk75qhycib3zlaj9m0bk43ydfh0h2gv01l1xfhabvjcv36pc7x4xcf94js";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz";
+      sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra";
     };
     dependencies = [
       sources."commander-2.15.1"
@@ -42637,10 +42474,10 @@ in
   ungit = nodeEnv.buildNodePackage {
     name = "ungit";
     packageName = "ungit";
-    version = "1.4.18";
+    version = "1.4.22";
     src = fetchurl {
-      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.18.tgz";
-      sha512 = "3mdb4qpdmm6n3c34z8pkrn3yx2nxyvqszw3rb24lcf8mbpbx2d534bpb3mcg2lg4lxsysijp652pkwbxd492sm7z9bz296r8cgppmqm";
+      url = "https://registry.npmjs.org/ungit/-/ungit-1.4.22.tgz";
+      sha512 = "22lf4pk1mn1vn8rgakj6z2dllv4xr7nybymkgrpvkfkglrlh6s9ch5cbbqsdy7mgrhgkmqwrygyb5xypwil4rrfw4a2x1q15jpg229w";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -42654,7 +42491,7 @@ in
       sources."arraybuffer.slice-0.0.7"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
-      sources."async-2.6.0"
+      sources."async-0.9.2"
       sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
       sources."aws-sign2-0.7.0"
@@ -42683,7 +42520,7 @@ in
       sources."camelcase-4.1.0"
       sources."caseless-0.12.0"
       sources."charenc-0.0.2"
-      (sources."cliui-4.0.0" // {
+      (sources."cliui-4.1.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
         ];
@@ -42723,7 +42560,7 @@ in
       sources."dashdash-1.14.1"
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delayed-stream-0.0.5"
       sources."delegates-1.0.0"
       sources."depd-1.1.2"
@@ -42734,6 +42571,7 @@ in
           sources."mkdirp-0.3.0"
         ];
       })
+      sources."dnd-page-scroll-0.0.4"
       sources."eachr-3.2.0"
       sources."ecc-jsbn-0.1.1"
       sources."editions-1.3.4"
@@ -42786,7 +42624,7 @@ in
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
       sources."iconv-lite-0.4.19"
-      sources."ignore-3.3.7"
+      sources."ignore-3.3.8"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -42802,6 +42640,8 @@ in
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
+      sources."jquery-3.3.1"
+      sources."jquery-ui-1.12.1"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
@@ -42810,17 +42650,17 @@ in
       sources."just-detect-adblock-1.0.0"
       (sources."keen.io-0.1.3" // {
         dependencies = [
-          sources."async-0.9.2"
           sources."methods-1.0.1"
           sources."mime-1.2.11"
           sources."qs-1.2.0"
           sources."superagent-0.21.0"
         ];
       })
-      sources."knockout-3.5.0-beta"
+      sources."knockout-3.5.0-rc"
       sources."lcid-1.0.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."locks-0.2.2"
+      sources."lodash-4.17.10"
       sources."lru-cache-4.1.2"
       sources."md5-2.2.1"
       sources."media-typer-0.3.0"
@@ -42839,14 +42679,14 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."ms-2.0.0"
       sources."negotiator-0.6.1"
       sources."node-cache-4.2.0"
       sources."nopt-1.0.10"
       sources."normalize-package-data-2.4.0"
-      sources."npm-6.0.0-next.0"
-      sources."npm-package-arg-6.0.0"
+      sources."npm-6.0.0"
+      sources."npm-package-arg-6.1.0"
       (sources."npm-registry-client-8.5.1" // {
         dependencies = [
           sources."combined-stream-1.0.6"
@@ -42908,7 +42748,7 @@ in
           sources."http-errors-1.6.2"
         ];
       })
-      (sources."rc-1.2.6" // {
+      (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -42958,7 +42798,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      (sources."superagent-3.8.2" // {
+      (sources."superagent-3.8.3" // {
         dependencies = [
           sources."combined-stream-1.0.6"
           sources."component-emitter-1.2.1"
@@ -43001,7 +42841,7 @@ in
       sources."which-1.3.0"
       sources."which-module-2.0.0"
       sources."wide-align-1.1.2"
-      (sources."winston-2.4.1" // {
+      (sources."winston-2.4.2" // {
         dependencies = [
           sources."async-1.0.0"
         ];
@@ -43074,7 +42914,10 @@ in
       sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-3.6.0"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
       sources."buffer-crc32-0.2.13"
+      sources."buffer-fill-0.1.1"
       sources."builtins-1.0.3"
       sources."camelcase-1.2.1"
       sources."capture-stack-trace-1.0.0"
@@ -43085,7 +42928,7 @@ in
         ];
       })
       sources."center-align-0.1.3"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
@@ -43154,6 +42997,7 @@ in
       sources."filenamify-2.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
+      sources."fs-constants-1.0.0"
       sources."fs-extra-0.26.7"
       sources."fs.realpath-1.0.0"
       sources."get-proxy-2.1.0"
@@ -43212,7 +43056,7 @@ in
       sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
       sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."log-symbols-2.2.0"
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
@@ -43257,7 +43101,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."read-metadata-1.0.0"
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
@@ -43273,7 +43117,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."seek-bzip-1.0.5"
       sources."semver-5.5.0"
@@ -43289,14 +43133,15 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-dirs-2.1.0"
       sources."strip-outer-1.0.1"
-      sources."supports-color-5.3.0"
-      sources."tar-stream-1.5.5"
+      sources."supports-color-5.4.0"
+      sources."tar-stream-1.6.0"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
       sources."thunkify-wrap-1.0.4"
       sources."tildify-1.2.0"
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
       sources."toml-2.3.3"
       sources."tough-cookie-2.3.4"
       sources."trim-repeated-1.0.0"
@@ -43349,7 +43194,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."adm-zip-0.4.7"
+      sources."adm-zip-0.4.9"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."asn1-0.2.3"
@@ -43422,7 +43267,7 @@ in
       })
       sources."kew-0.1.7"
       sources."klaw-1.3.1"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimatch-3.0.4"
@@ -43470,7 +43315,7 @@ in
       sources."tunnel-agent-0.4.3"
       sources."tweetnacl-0.14.5"
       sources."typedarray-0.0.6"
-      sources."underscore-1.8.3"
+      sources."underscore-1.9.0"
       sources."util-deprecate-1.0.2"
       sources."verror-1.10.0"
       sources."which-1.2.14"
@@ -43490,16 +43335,16 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.5.0";
+    version = "4.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.5.0.tgz";
-      sha512 = "3m4zqjmw0byxpxxx35zfrpng2sawkk71mna6b7b5vx1ba534kvsrs3i6332vz7m0dskp9k8ywqv545kg8x7xnv8xvl6x709yjrdjsp8";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.7.0.tgz";
+      sha512 = "3qmpyw1gbcmwgc42iss0vqam6vgi5kqvzv5s4xba1ww50824vq5yb3p7zbh0is33q76axrkhj4d7p1cigp5w0jnhhd2v3v6ky580wrr";
     };
     dependencies = [
       sources."acorn-5.5.3"
       sources."acorn-dynamic-import-3.0.0"
       sources."ajv-6.4.0"
-      sources."ajv-keywords-3.1.0"
+      sources."ajv-keywords-3.2.0"
       sources."anymatch-2.0.0"
       sources."aproba-1.2.0"
       sources."arr-diff-4.0.0"
@@ -43510,7 +43355,7 @@ in
       sources."assert-1.4.1"
       sources."assign-symbols-1.0.0"
       sources."async-each-1.0.1"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -43523,7 +43368,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."base64-js-1.2.3"
+      sources."base64-js-1.3.0"
       sources."big.js-3.2.0"
       sources."binary-extensions-1.11.0"
       sources."bluebird-3.5.1"
@@ -43538,8 +43383,8 @@ in
       })
       sources."brorand-1.1.0"
       sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.0"
-      sources."browserify-des-1.0.0"
+      sources."browserify-cipher-1.0.1"
+      sources."browserify-des-1.0.1"
       sources."browserify-rsa-4.0.1"
       sources."browserify-sign-4.0.4"
       sources."browserify-zlib-0.2.0"
@@ -43551,7 +43396,7 @@ in
       sources."cache-base-1.0.1"
       sources."chokidar-2.0.3"
       sources."chownr-1.0.1"
-      sources."chrome-trace-event-0.1.2"
+      sources."chrome-trace-event-0.1.3"
       sources."cipher-base-1.0.4"
       (sources."class-utils-0.3.6" // {
         dependencies = [
@@ -43569,9 +43414,9 @@ in
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.0"
-      sources."create-hash-1.1.3"
-      sources."create-hmac-1.1.6"
+      sources."create-ecdh-4.0.1"
+      sources."create-hash-1.2.0"
+      sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."cyclist-0.2.2"
       sources."date-now-0.1.4"
@@ -43579,9 +43424,9 @@ in
       sources."decode-uri-component-0.2.0"
       sources."define-property-2.0.2"
       sources."des.js-1.0.0"
-      sources."diffie-hellman-5.0.2"
+      sources."diffie-hellman-5.0.3"
       sources."domain-browser-1.2.0"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."elliptic-6.4.0"
       sources."emojis-list-2.1.0"
       sources."end-of-stream-1.4.1"
@@ -43617,7 +43462,7 @@ in
       sources."from2-2.3.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
       (sources."glob-parent-3.1.0" // {
@@ -43683,7 +43528,7 @@ in
         ];
       })
       sources."miller-rabin-4.0.1"
-      sources."minimalistic-assert-1.0.0"
+      sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -43694,10 +43539,9 @@ in
       sources."ms-2.0.0"
       sources."nan-2.10.0"
       sources."nanomatch-1.2.9"
-      sources."neo-async-2.5.0"
+      sources."neo-async-2.5.1"
       (sources."node-libs-browser-2.1.0" // {
         dependencies = [
-          sources."hash-base-2.0.2"
           sources."inherits-2.0.1"
           sources."punycode-1.4.1"
         ];
@@ -43713,13 +43557,13 @@ in
       sources."p-try-1.0.0"
       sources."pako-1.0.6"
       sources."parallel-transform-1.1.0"
-      sources."parse-asn1-5.1.0"
+      sources."parse-asn1-5.1.1"
       sources."pascalcase-0.1.1"
       sources."path-browserify-0.0.0"
       sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
-      sources."pbkdf2-3.0.14"
+      sources."pbkdf2-3.0.16"
       sources."pify-3.0.0"
       sources."pkg-dir-2.0.0"
       sources."posix-character-classes-0.1.1"
@@ -43728,9 +43572,9 @@ in
       sources."promise-inflight-1.0.1"
       sources."prr-1.0.1"
       sources."pseudomap-1.0.2"
-      sources."public-encrypt-4.0.0"
+      sources."public-encrypt-4.0.2"
       sources."pump-2.0.1"
-      sources."pumpify-1.4.0"
+      sources."pumpify-1.5.0"
       sources."punycode-2.1.0"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -43745,12 +43589,12 @@ in
       sources."resolve-url-0.2.1"
       sources."ret-0.1.15"
       sources."rimraf-2.6.2"
-      sources."ripemd160-2.0.1"
+      sources."ripemd160-2.0.2"
       sources."run-queue-1.0.3"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."schema-utils-0.4.5"
-      sources."serialize-javascript-1.4.0"
+      sources."serialize-javascript-1.5.0"
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
       sources."setimmediate-1.0.5"
@@ -43814,7 +43658,7 @@ in
       sources."string_decoder-1.1.1"
       sources."tapable-1.0.0"
       sources."through2-2.0.3"
-      sources."timers-browserify-2.0.6"
+      sources."timers-browserify-2.0.10"
       sources."to-arraybuffer-1.0.1"
       sources."to-object-path-0.3.0"
       sources."to-regex-3.0.2"
@@ -43822,7 +43666,7 @@ in
       sources."tty-browserify-0.0.0"
       sources."typedarray-0.0.6"
       sources."uglify-es-3.3.10"
-      (sources."uglifyjs-webpack-plugin-1.2.4" // {
+      (sources."uglifyjs-webpack-plugin-1.2.5" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -43843,7 +43687,7 @@ in
           })
         ];
       })
-      sources."upath-1.0.4"
+      sources."upath-1.0.5"
       sources."uri-js-3.0.2"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
@@ -43859,7 +43703,7 @@ in
       sources."util-0.10.3"
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
-      sources."watchpack-1.5.0"
+      sources."watchpack-1.6.0"
       (sources."webpack-sources-1.1.0" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -43883,10 +43727,10 @@ in
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "1.11.0";
+    version = "1.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.11.0.tgz";
-      sha512 = "04agjsk7s1fdmiy195shkjqxswpkadyg08vgj4pqxpwy6d5d4kbngz3gmg9vvnm2z9hi2sdc6ryx0r59nws7xjkifi3grzfkxzz1c06";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.1.tgz";
+      sha512 = "2hnm4r244as9zcld8hf884vwp4iwqvrnjc01c5037bpwa0zzc8y5zss9xc75ffbhw8dp54kbfzvlfwfn6q49hymbnsfj44ckqfalavr";
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
@@ -43906,10 +43750,10 @@ in
       sources."binary-search-1.3.3"
       sources."bindings-1.3.0"
       sources."bitfield-2.0.0"
-      sources."bittorrent-dht-8.2.0"
+      sources."bittorrent-dht-8.3.0"
       sources."bittorrent-peerid-1.2.0"
-      sources."bittorrent-protocol-2.4.0"
-      sources."bittorrent-tracker-9.7.0"
+      sources."bittorrent-protocol-2.4.1"
+      sources."bittorrent-tracker-9.9.1"
       sources."bl-1.2.2"
       sources."blob-to-buffer-1.2.7"
       sources."block-stream2-1.1.0"
@@ -43922,13 +43766,21 @@ in
       sources."buffer-fill-0.1.1"
       sources."buffer-from-1.0.0"
       sources."buffer-indexof-1.1.1"
-      sources."bufferutil-3.0.4"
+      (sources."bufferutil-3.0.4" // {
+        dependencies = [
+          sources."simple-get-2.8.1"
+        ];
+      })
       sources."bufferview-1.0.1"
       sources."bytebuffer-3.5.5"
       sources."castv2-0.1.9"
       sources."castv2-client-1.2.0"
       sources."chownr-1.0.1"
-      sources."chromecasts-1.9.1"
+      (sources."chromecasts-1.9.1" // {
+        dependencies = [
+          sources."mime-1.6.0"
+        ];
+      })
       sources."chunk-store-stream-2.1.0"
       sources."clivas-0.2.0"
       sources."closest-to-2.0.0"
@@ -43939,17 +43791,25 @@ in
       sources."concat-stream-1.6.2"
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
-      sources."create-torrent-3.30.0"
+      sources."create-torrent-3.31.0"
       sources."debug-2.6.9"
       sources."decompress-response-3.3.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."defined-1.0.0"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
-      sources."dlnacasts-0.1.0"
+      (sources."dlnacasts-0.1.0" // {
+        dependencies = [
+          sources."mime-1.6.0"
+        ];
+      })
       sources."dns-packet-1.3.1"
       sources."dns-txt-2.0.2"
-      sources."ecstatic-3.2.0"
+      (sources."ecstatic-3.2.0" // {
+        dependencies = [
+          sources."mime-1.6.0"
+        ];
+      })
       sources."elementtree-0.1.7"
       sources."end-of-stream-1.4.1"
       sources."executable-4.1.1"
@@ -43957,10 +43817,11 @@ in
       sources."filestream-4.1.3"
       sources."flatten-1.0.2"
       sources."fs-chunk-store-1.7.0"
+      sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."gauge-2.7.4"
       sources."get-browser-rtc-1.0.2"
-      sources."get-stdin-5.0.1"
+      sources."get-stdin-6.0.0"
       sources."github-from-package-0.0.0"
       sources."glob-7.1.2"
       sources."has-unicode-2.0.1"
@@ -43979,24 +43840,28 @@ in
       sources."isarray-1.0.0"
       sources."junk-2.1.0"
       sources."k-bucket-4.0.0"
-      sources."k-rpc-4.3.1"
+      sources."k-rpc-5.0.0"
       sources."k-rpc-socket-1.8.0"
       sources."last-one-wins-1.0.4"
-      sources."load-ip-set-1.3.1"
+      (sources."load-ip-set-1.3.1" // {
+        dependencies = [
+          sources."simple-get-2.8.1"
+        ];
+      })
       sources."long-2.4.0"
       sources."lru-3.1.0"
       sources."magnet-uri-5.1.7"
       sources."mdns-js-0.5.0"
       sources."mdns-js-packet-0.2.0"
-      sources."mediasource-2.1.3"
+      sources."mediasource-2.2.0"
       sources."memory-chunk-store-1.3.0"
-      sources."mime-1.6.0"
+      sources."mime-2.3.1"
       sources."mimic-response-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
       sources."mkdirp-0.5.1"
-      sources."moment-2.22.0"
-      sources."mp4-box-encoding-1.1.3"
+      sources."moment-2.22.1"
+      sources."mp4-box-encoding-1.1.4"
       sources."mp4-stream-2.0.3"
       sources."ms-2.0.0"
       (sources."multicast-dns-6.2.3" // {
@@ -44009,7 +43874,7 @@ in
       sources."netmask-1.0.6"
       sources."network-address-1.1.2"
       sources."next-event-1.0.0"
-      sources."node-abi-2.3.0"
+      sources."node-abi-2.4.1"
       sources."node-ssdp-2.9.1"
       sources."nodebmc-0.0.7"
       sources."noop-logger-0.1.1"
@@ -44021,45 +43886,48 @@ in
       sources."optjs-3.2.2"
       sources."os-homedir-1.0.2"
       sources."package-json-versionify-1.0.4"
-      sources."parse-torrent-5.8.3"
-      sources."parse-torrent-file-4.1.0"
+      (sources."parse-torrent-6.0.0" // {
+        dependencies = [
+          sources."simple-get-3.0.2"
+        ];
+      })
       sources."path-is-absolute-1.0.1"
       sources."piece-length-1.0.0"
       sources."pify-2.3.0"
       sources."plist-with-patches-0.5.1"
-      sources."prebuild-install-2.5.1"
+      sources."prebuild-install-2.5.3"
       sources."prettier-bytes-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."protobufjs-3.8.2"
       sources."pump-3.0.0"
       sources."qap-3.3.1"
       sources."random-access-file-2.0.1"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       sources."random-iterate-1.0.1"
       sources."randombytes-2.0.6"
       sources."range-parser-1.2.0"
       sources."range-slice-stream-1.2.0"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
-      sources."record-cache-1.0.1"
-      (sources."render-media-2.12.0" // {
+      sources."record-cache-1.0.2"
+      (sources."render-media-3.0.0" // {
         dependencies = [
           sources."pump-1.0.3"
         ];
       })
       sources."rimraf-2.6.2"
-      sources."run-parallel-1.1.8"
-      sources."run-parallel-limit-1.0.4"
-      sources."run-series-1.1.6"
+      sources."run-parallel-1.1.9"
+      sources."run-parallel-limit-1.0.5"
+      sources."run-series-1.1.8"
       sources."rusha-0.8.13"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."sax-1.1.4"
       sources."semver-5.5.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
       sources."simple-concat-1.0.0"
-      sources."simple-get-2.7.0"
-      sources."simple-peer-9.0.0"
+      sources."simple-get-2.8.1"
+      sources."simple-peer-9.1.1"
       sources."simple-sha1-2.1.0"
       (sources."simple-websocket-7.0.2" // {
         dependencies = [
@@ -44072,21 +43940,22 @@ in
       sources."stream-to-blob-url-2.1.0"
       sources."stream-with-known-length-to-buffer-1.0.1"
       sources."string-width-1.0.2"
-      sources."string2compact-1.2.2"
+      sources."string2compact-1.2.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      (sources."tar-fs-1.16.0" // {
+      (sources."tar-fs-1.16.2" // {
         dependencies = [
           sources."pump-1.0.3"
         ];
       })
-      sources."tar-stream-1.5.5"
+      sources."tar-stream-1.6.0"
       sources."thirty-two-1.0.2"
       sources."through-2.3.8"
       sources."thunky-0.1.0"
       sources."to-arraybuffer-1.0.1"
-      (sources."torrent-discovery-8.4.0" // {
+      sources."to-buffer-1.1.1"
+      (sources."torrent-discovery-8.4.1" // {
         dependencies = [
           sources."minimist-1.2.0"
           sources."pump-2.0.1"
@@ -44102,16 +43971,16 @@ in
       sources."upnp-device-client-1.0.2"
       sources."upnp-mediarenderer-client-1.2.4"
       sources."url-join-2.0.5"
-      sources."ut_metadata-3.2.0"
+      sources."ut_metadata-3.2.1"
       sources."ut_pex-1.2.0"
       sources."util-deprecate-1.0.2"
       sources."videostream-2.4.2"
       sources."vlc-command-1.1.1"
-      (sources."webtorrent-0.98.24" // {
+      (sources."webtorrent-0.99.4" // {
         dependencies = [
           sources."debug-3.1.0"
-          sources."mime-2.2.2"
           sources."minimist-0.0.8"
+          sources."simple-get-3.0.2"
           sources."thunky-1.0.2"
         ];
       })
@@ -44146,7 +44015,7 @@ in
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-9.6.2"
+      sources."@types/node-10.0.4"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
       sources."acorn-5.5.3"
@@ -44165,32 +44034,26 @@ in
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."async-2.6.0"
-          sources."camelcase-1.2.1"
+          sources."camelcase-2.1.1"
           sources."cli-cursor-1.0.2"
-          sources."cliui-3.2.0"
+          sources."cliui-4.1.0"
           sources."debug-3.1.0"
           sources."decamelize-1.2.0"
           sources."domelementtype-1.1.3"
-          sources."es6-promise-3.3.1"
+          sources."es6-promise-4.2.4"
           sources."figures-1.7.0"
-          sources."find-up-2.1.0"
           sources."for-in-0.1.8"
-          sources."globals-11.4.0"
-          sources."got-3.3.1"
+          sources."globals-11.5.0"
+          sources."iconv-lite-0.4.19"
           sources."inquirer-0.12.0"
           sources."is-fullwidth-code-point-1.0.0"
-          sources."latest-version-1.0.1"
-          sources."lazy-cache-0.2.7"
+          sources."isarray-0.0.1"
           sources."mute-stream-0.0.5"
-          sources."object-assign-3.0.0"
           sources."onetime-1.1.0"
-          sources."package-json-1.2.0"
-          sources."parse-json-2.2.0"
-          sources."path-exists-3.0.0"
+          sources."pify-3.0.0"
           sources."pluralize-1.2.1"
           sources."progress-1.1.8"
-          sources."punycode-1.3.2"
-          sources."repeating-1.1.3"
+          sources."punycode-2.1.0"
           sources."restore-cursor-1.0.1"
           sources."run-async-0.1.0"
           sources."rx-lite-3.1.2"
@@ -44198,33 +44061,26 @@ in
           sources."source-map-0.6.1"
           sources."source-map-support-0.5.4"
           sources."string-width-1.0.2"
+          sources."string_decoder-0.10.31"
           sources."strip-ansi-4.0.0"
-          sources."strip-bom-2.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
           sources."table-3.8.3"
-          sources."timed-out-2.0.0"
           sources."traverse-0.6.6"
           sources."underscore-1.6.0"
-          sources."update-notifier-0.5.0"
-          sources."which-module-2.0.0"
-          sources."window-size-0.2.0"
-          sources."wordwrap-0.0.2"
           (sources."yargs-11.0.0" // {
             dependencies = [
               sources."camelcase-4.1.0"
-              sources."cliui-4.0.0"
               sources."is-fullwidth-code-point-2.0.0"
               sources."string-width-2.1.1"
             ];
           })
-          sources."yargs-parser-9.0.2"
         ];
       })
-      sources."adm-zip-0.4.7"
+      sources."adm-zip-0.4.9"
+      sources."agent-base-4.2.0"
       sources."ajv-6.3.0"
       sources."ajv-keywords-2.1.1"
       sources."ajv-merge-patch-3.0.0"
-      sources."align-text-0.1.4"
       sources."anchor-markdown-header-0.5.7"
       sources."ansi-align-2.0.0"
       sources."ansi-escapes-3.1.0"
@@ -44267,14 +44123,15 @@ in
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
       sources."assign-symbols-1.0.0"
+      sources."ast-types-0.11.3"
       sources."async-0.2.10"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."babel-code-frame-6.26.0"
-      sources."babel-core-6.26.0"
+      sources."babel-core-6.26.3"
       sources."babel-generator-6.26.1"
       sources."babel-helpers-6.24.1"
       sources."babel-messages-6.23.0"
@@ -44294,7 +44151,7 @@ in
       sources."babel-traverse-6.26.0"
       sources."babel-types-6.26.0"
       sources."babylon-6.18.0"
-      sources."bail-1.0.2"
+      sources."bail-1.0.3"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -44316,11 +44173,14 @@ in
       sources."boom-4.3.1"
       sources."bops-0.1.1"
       sources."boundary-1.0.1"
-      sources."boxen-0.3.1"
+      sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
       sources."buffer-crc32-0.2.13"
       sources."buffer-equal-constant-time-1.0.1"
+      sources."buffer-fill-0.1.1"
       sources."buffer-from-1.0.0"
       sources."builtin-modules-1.1.1"
       (sources."bunyan-1.8.12" // {
@@ -44329,19 +44189,19 @@ in
           sources."rimraf-2.4.5"
         ];
       })
+      sources."bytes-3.0.0"
       sources."cache-base-1.0.1"
       sources."caller-path-0.1.0"
       sources."callsites-0.2.0"
       sources."camelcase-4.1.0"
       sources."capture-stack-trace-1.0.0"
       sources."caseless-0.12.0"
-      sources."ccount-1.0.2"
-      sources."center-align-0.1.3"
+      sources."ccount-1.0.3"
       sources."chalk-2.3.2"
-      sources."character-entities-1.2.1"
-      sources."character-entities-html4-1.1.1"
-      sources."character-entities-legacy-1.1.1"
-      sources."character-reference-invalid-1.1.1"
+      sources."character-entities-1.2.2"
+      sources."character-entities-html4-1.1.2"
+      sources."character-entities-legacy-1.1.2"
+      sources."character-reference-invalid-1.1.2"
       sources."chardet-0.4.2"
       (sources."cheerio-1.0.0-rc.2" // {
         dependencies = [
@@ -44366,13 +44226,12 @@ in
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
       sources."cli-width-2.2.0"
-      sources."clite-0.3.0"
-      sources."cliui-2.1.0"
+      sources."cliui-3.2.0"
       sources."clone-1.0.4"
       sources."clone-deep-0.3.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."collapse-white-space-1.0.3"
+      sources."collapse-white-space-1.0.4"
       sources."collection-visit-1.0.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
@@ -44385,11 +44244,7 @@ in
       sources."compress-commons-1.2.2"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
-      (sources."configstore-1.4.0" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
+      sources."configstore-3.1.2"
       sources."convert-source-map-1.5.1"
       sources."copy-descriptor-0.1.1"
       sources."core-js-2.5.5"
@@ -44409,19 +44264,26 @@ in
       sources."css-what-2.1.0"
       sources."d-1.0.0"
       sources."dashdash-1.14.1"
+      sources."data-uri-to-buffer-1.2.0"
       sources."debounce-1.1.0"
       sources."debug-2.6.9"
-      sources."decamelize-2.0.0"
+      (sources."decamelize-2.0.0" // {
+        dependencies = [
+          sources."xregexp-4.0.0"
+        ];
+      })
       sources."decode-uri-component-0.2.0"
       sources."deep-equal-1.0.1"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."deep-is-0.1.3"
       sources."deepcopy-0.6.3"
       sources."deepmerge-2.1.0"
       sources."defaults-1.0.3"
       sources."define-property-2.0.2"
+      sources."degenerator-1.0.4"
       sources."del-2.2.2"
       sources."delayed-stream-1.0.0"
+      sources."depd-1.1.1"
       sources."detect-indent-4.0.0"
       (sources."dispensary-0.16.0" // {
         dependencies = [
@@ -44434,14 +44296,12 @@ in
       sources."domelementtype-1.3.0"
       sources."domhandler-2.4.1"
       sources."domutils-1.5.1"
-      sources."dot-prop-3.0.0"
+      sources."dot-prop-4.2.0"
       sources."dtrace-provider-0.8.6"
-      sources."duplexer2-0.1.4"
       sources."duplexer3-0.1.4"
-      sources."duplexify-3.5.4"
       sources."ecc-jsbn-0.1.1"
       sources."ecdsa-sig-formatter-1.0.9"
-      sources."email-validator-1.1.1"
+      sources."email-validator-2.0.3"
       sources."emoji-regex-6.1.3"
       sources."encoding-0.1.12"
       sources."end-of-stream-1.4.1"
@@ -44461,6 +44321,7 @@ in
       sources."es6-symbol-3.1.1"
       sources."es6-weak-map-2.0.2"
       sources."escape-string-regexp-1.0.5"
+      sources."escodegen-1.9.1"
       sources."escope-3.6.0"
       (sources."eslint-4.19.0" // {
         dependencies = [
@@ -44526,9 +44387,9 @@ in
       sources."fd-slicer-1.0.1"
       sources."figures-2.0.0"
       sources."file-entry-cache-2.0.0"
+      sources."file-uri-to-path-1.0.0"
       sources."fill-range-4.0.0"
-      sources."filled-array-1.1.0"
-      sources."find-up-1.1.2"
+      sources."find-up-2.1.0"
       (sources."firefox-profile-1.1.0" // {
         dependencies = [
           sources."async-2.5.0"
@@ -44543,9 +44404,15 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."fragment-cache-0.2.1"
+      sources."fs-constants-1.0.0"
       sources."fs-extra-4.0.3"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
+      (sources."ftp-0.3.10" // {
+        dependencies = [
+          sources."readable-stream-1.1.14"
+        ];
+      })
       sources."function-bind-1.1.1"
       sources."functional-red-black-tree-1.0.1"
       (sources."fx-runner-1.0.8" // {
@@ -44560,6 +44427,11 @@ in
       sources."generate-object-property-1.2.0"
       sources."get-caller-file-1.0.2"
       sources."get-stream-3.0.0"
+      (sources."get-uri-2.0.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."gettext-parser-1.1.0"
@@ -44577,7 +44449,7 @@ in
       sources."global-dirs-0.1.1"
       sources."globals-9.18.0"
       sources."globby-5.0.0"
-      sources."got-5.7.1"
+      sources."got-6.7.1"
       sources."graceful-fs-4.1.11"
       sources."graceful-readlink-1.0.1"
       sources."graphlib-2.1.5"
@@ -44596,12 +44468,14 @@ in
       sources."home-or-tmp-2.0.0"
       sources."hosted-git-info-2.6.0"
       sources."htmlparser2-3.9.2"
+      sources."http-errors-1.6.2"
+      sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
+      sources."https-proxy-agent-2.2.1"
       sources."iconv-lite-0.4.21"
-      sources."ignore-3.3.7"
+      sources."ignore-3.3.8"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
-      sources."infinity-agent-2.0.3"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -44609,23 +44483,24 @@ in
       sources."interpret-1.1.0"
       sources."invariant-2.2.4"
       sources."invert-kv-1.0.0"
+      sources."ip-1.1.5"
       sources."is-absolute-0.1.7"
       sources."is-accessor-descriptor-1.0.0"
-      sources."is-alphabetical-1.0.1"
-      sources."is-alphanumerical-1.0.1"
+      sources."is-alphabetical-1.0.2"
+      sources."is-alphanumerical-1.0.2"
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-builtin-module-1.0.0"
       sources."is-data-descriptor-1.0.0"
-      sources."is-decimal-1.0.1"
+      sources."is-decimal-1.0.2"
       sources."is-descriptor-1.0.2"
       sources."is-extendable-0.1.1"
       sources."is-extglob-2.1.1"
       sources."is-finite-1.0.2"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-glob-4.0.0"
-      sources."is-hexadecimal-1.0.1"
+      sources."is-hexadecimal-1.0.2"
       sources."is-installed-globally-0.1.0"
       sources."is-mergeable-object-1.1.0"
       sources."is-my-ip-valid-1.0.0"
@@ -44648,6 +44523,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
       sources."is-windows-1.0.2"
+      sources."is-wsl-1.1.0"
       sources."isarray-1.0.0"
       sources."isemail-1.2.0"
       sources."isexe-2.0.0"
@@ -44678,26 +44554,27 @@ in
       sources."jwa-1.1.5"
       sources."jws-3.1.4"
       sources."kind-of-3.2.2"
-      sources."latest-version-2.0.0"
-      sources."lazy-cache-1.0.4"
+      sources."latest-version-3.1.0"
+      sources."lazy-cache-0.2.7"
       sources."lazystream-1.0.0"
       sources."lcid-1.0.0"
       sources."levn-0.3.0"
       sources."load-json-file-1.1.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash.assign-4.2.0"
+      sources."lodash.assignin-4.2.0"
       sources."lodash.clonedeep-4.5.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.defaultsdeep-4.6.0"
-      sources."lodash.mergewith-4.6.1"
+      sources."lodash.flatten-4.4.0"
+      sources."lodash.get-4.4.2"
       sources."lodash.once-4.1.1"
+      sources."lodash.set-4.3.2"
       sources."lodash.sortby-4.7.0"
-      sources."longest-1.0.1"
       sources."longest-streak-1.0.0"
       sources."loose-envify-1.3.1"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-4.1.2"
+      sources."macos-release-1.1.0"
       sources."make-dir-1.2.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
@@ -44721,7 +44598,7 @@ in
           sources."minimist-0.0.8"
         ];
       })
-      sources."moment-2.22.0"
+      sources."moment-2.22.1"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
       sources."mv-2.1.1"
@@ -44730,19 +44607,18 @@ in
       sources."nanomatch-1.2.9"
       sources."natural-compare-1.4.0"
       sources."natural-compare-lite-1.4.0"
-      sources."nconf-0.7.2"
+      sources."nconf-0.10.0"
       sources."ncp-2.0.0"
-      (sources."needle-2.2.0" // {
+      (sources."needle-2.2.1" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
       })
-      sources."neo-async-2.5.0"
-      sources."nested-error-stacks-1.0.2"
+      sources."neo-async-2.5.1"
+      sources."netmask-1.0.6"
       sources."next-tick-1.0.0"
       sources."node-forge-0.7.5"
       sources."node-notifier-5.2.1"
-      sources."node-status-codes-1.0.0"
       sources."nomnom-1.8.1"
       sources."normalize-package-data-2.4.0"
       sources."normalize-path-2.1.1"
@@ -44757,26 +44633,27 @@ in
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-0.0.5"
+      sources."opn-5.3.0"
       sources."optionator-0.8.2"
       sources."os-homedir-1.0.2"
       sources."os-locale-2.1.0"
-      sources."os-name-1.0.3"
+      sources."os-name-2.0.1"
       sources."os-shim-0.1.3"
       sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."osx-release-1.1.0"
       sources."p-finally-1.0.0"
       sources."p-limit-1.2.0"
       sources."p-locate-2.0.0"
       sources."p-try-1.0.0"
-      sources."package-json-2.4.0"
+      sources."pac-proxy-agent-2.0.2"
+      sources."pac-resolver-3.0.0"
+      sources."package-json-4.0.1"
       sources."pako-1.0.6"
-      sources."parse-entities-1.1.1"
+      sources."parse-entities-1.1.2"
       sources."parse-json-4.0.0"
       sources."parse5-3.0.3"
       sources."pascalcase-0.1.1"
       sources."path-dirname-1.0.2"
-      sources."path-exists-2.1.0"
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
       sources."path-key-2.0.1"
@@ -44810,15 +44687,15 @@ in
       sources."process-nextick-args-2.0.0"
       sources."progress-2.0.0"
       sources."promise-7.3.1"
+      sources."proxy-agent-3.0.0"
       sources."proxy-from-env-1.0.0"
       sources."pseudomap-1.0.2"
       sources."pump-3.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
-      sources."querystring-0.2.0"
+      sources."qs-6.5.2"
       sources."quick-format-unescaped-1.1.2"
-      sources."rc-1.2.6"
-      sources."read-all-stream-3.1.0"
+      sources."raw-body-2.3.2"
+      sources."rc-1.2.7"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-2.3.6"
@@ -44851,27 +44728,27 @@ in
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."require-uncached-1.0.3"
-      sources."resolve-1.7.0"
+      sources."resolve-1.7.1"
       sources."resolve-from-1.0.1"
       sources."resolve-url-0.2.1"
       sources."restore-cursor-2.0.0"
       sources."ret-0.1.15"
-      sources."right-align-0.1.3"
       sources."rimraf-2.6.2"
       sources."run-async-2.3.0"
-      sources."rx-4.1.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.1.0"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
+      sources."secure-keys-1.0.0"
       sources."semver-5.5.0"
       sources."semver-diff-2.1.0"
       sources."set-blocking-2.0.0"
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
+      sources."setprototypeof-1.0.3"
       sources."sha.js-2.4.11"
       (sources."shallow-clone-0.1.2" // {
         dependencies = [
@@ -44911,7 +44788,7 @@ in
       sources."signal-exit-3.0.2"
       sources."slash-1.0.0"
       sources."slice-ansi-1.0.0"
-      sources."slide-1.1.6"
+      sources."smart-buffer-1.1.15"
       (sources."snapdragon-0.8.2" // {
         dependencies = [
           (sources."define-property-0.2.5" // {
@@ -44926,73 +44803,52 @@ in
       sources."snapdragon-node-2.1.1"
       sources."snapdragon-util-3.0.1"
       sources."sntp-2.1.0"
-      (sources."snyk-1.71.0" // {
+      (sources."snyk-1.78.1" // {
         dependencies = [
+          sources."ansi-escapes-3.1.0"
           sources."ansi-regex-2.1.1"
-          sources."ansi-styles-2.2.1"
           sources."async-1.5.2"
-          sources."camelcase-3.0.0"
-          sources."chalk-1.1.3"
-          sources."inquirer-1.0.3"
-          sources."mute-stream-0.0.6"
+          sources."chalk-2.4.1"
+          sources."cli-cursor-2.1.0"
+          sources."figures-2.0.0"
+          sources."inquirer-3.3.0"
+          sources."is-fullwidth-code-point-2.0.0"
+          sources."mute-stream-0.0.7"
+          sources."onetime-2.0.1"
           sources."os-locale-1.4.0"
+          sources."restore-cursor-2.0.0"
           sources."run-async-2.3.0"
+          sources."rx-lite-4.0.8"
+          sources."string-width-2.1.1"
           sources."strip-ansi-3.0.1"
-          sources."supports-color-2.0.0"
-          sources."yargs-3.15.0"
+          sources."yargs-3.32.0"
         ];
       })
-      (sources."snyk-config-1.0.1" // {
+      (sources."snyk-config-2.1.0" // {
         dependencies = [
-          sources."async-0.9.2"
-          sources."debug-2.6.9"
+          sources."is-fullwidth-code-point-1.0.0"
+          sources."string-width-1.0.2"
         ];
       })
-      sources."snyk-go-plugin-1.4.6"
-      sources."snyk-gradle-plugin-1.2.0"
-      (sources."snyk-module-1.8.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-mvn-plugin-1.1.1"
-      (sources."snyk-nuget-plugin-1.3.9" // {
-        dependencies = [
-          sources."es6-promise-4.2.4"
-        ];
-      })
-      sources."snyk-php-plugin-1.3.2"
-      (sources."snyk-policy-1.10.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      sources."snyk-python-plugin-1.5.7"
-      (sources."snyk-resolve-1.0.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
-      (sources."snyk-resolve-deps-1.7.0" // {
-        dependencies = [
-          sources."configstore-2.1.0"
-          sources."debug-2.6.9"
-          sources."update-notifier-0.6.3"
-          sources."uuid-2.0.3"
-          sources."yargs-4.8.1"
-        ];
-      })
-      (sources."snyk-sbt-plugin-1.2.5" // {
+      sources."snyk-go-plugin-1.5.0"
+      sources."snyk-gradle-plugin-1.3.0"
+      sources."snyk-module-1.8.2"
+      sources."snyk-mvn-plugin-1.2.0"
+      sources."snyk-nuget-plugin-1.4.0"
+      sources."snyk-php-plugin-1.5.0"
+      sources."snyk-policy-1.12.0"
+      sources."snyk-python-plugin-1.6.0"
+      sources."snyk-resolve-1.0.1"
+      sources."snyk-resolve-deps-3.1.0"
+      (sources."snyk-sbt-plugin-1.3.0" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
       })
       sources."snyk-tree-1.0.0"
-      (sources."snyk-try-require-1.2.0" // {
-        dependencies = [
-          sources."debug-2.6.9"
-        ];
-      })
+      sources."snyk-try-require-1.3.0"
+      sources."socks-1.1.10"
+      sources."socks-proxy-agent-3.0.1"
       sources."source-map-0.5.7"
       sources."source-map-resolve-0.5.1"
       (sources."source-map-support-0.5.3" // {
@@ -45017,8 +44873,8 @@ in
       sources."sprintf-js-1.0.3"
       sources."sshpk-1.14.1"
       sources."static-extend-0.1.2"
+      sources."statuses-1.5.0"
       sources."stream-parser-0.3.1"
-      sources."stream-shift-1.0.0"
       sources."stream-to-array-2.3.0"
       (sources."stream-to-promise-2.2.0" // {
         dependencies = [
@@ -45026,10 +44882,9 @@ in
           sources."once-1.3.3"
         ];
       })
-      sources."string-length-1.0.1"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."stringify-entities-1.3.1"
+      sources."stringify-entities-1.3.2"
       sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
@@ -45040,12 +44895,9 @@ in
       sources."structured-source-3.0.2"
       sources."supports-color-2.0.0"
       sources."table-4.0.2"
-      sources."tar-stream-1.5.5"
-      (sources."tempfile-1.1.1" // {
-        dependencies = [
-          sources."uuid-2.0.3"
-        ];
-      })
+      sources."tar-stream-1.6.0"
+      sources."temp-dir-1.0.0"
+      sources."tempfile-2.0.0"
       sources."term-size-1.2.0"
       sources."text-table-0.2.0"
       sources."then-fs-2.0.0"
@@ -45053,8 +44905,10 @@ in
       sources."thenify-all-1.6.0"
       sources."through-2.3.8"
       sources."through2-2.0.3"
-      sources."timed-out-3.1.3"
+      sources."thunkify-2.1.2"
+      sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
       sources."to-fast-properties-1.0.3"
       sources."to-object-path-0.3.0"
       sources."to-regex-3.0.2"
@@ -45068,15 +44922,19 @@ in
       sources."traverse-0.4.6"
       sources."trim-0.0.1"
       sources."trim-right-1.0.1"
-      sources."trim-trailing-lines-1.1.0"
-      sources."trough-1.0.1"
+      sources."trim-trailing-lines-1.1.1"
+      sources."trough-1.0.2"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."typedarray-0.0.6"
-      sources."undefsafe-0.0.3"
+      (sources."undefsafe-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."underscore-1.8.3"
-      sources."unherit-1.1.0"
+      sources."unherit-1.1.1"
       sources."unified-4.2.1"
       (sources."union-value-1.0.0" // {
         dependencies = [
@@ -45084,10 +44942,11 @@ in
         ];
       })
       sources."unique-string-1.0.0"
-      sources."unist-util-is-2.1.1"
-      sources."unist-util-remove-position-1.1.1"
-      sources."unist-util-visit-1.3.0"
+      sources."unist-util-is-2.1.2"
+      sources."unist-util-remove-position-1.1.2"
+      sources."unist-util-visit-1.3.1"
       sources."universalify-0.1.1"
+      sources."unpipe-1.0.0"
       (sources."unset-value-1.0.0" // {
         dependencies = [
           (sources."has-value-0.3.1" // {
@@ -45097,27 +44956,11 @@ in
           })
         ];
       })
-      sources."unzip-response-1.0.2"
+      sources."unzip-response-2.0.1"
       sources."upath-1.0.4"
-      (sources."update-notifier-2.3.0" // {
-        dependencies = [
-          sources."boxen-1.3.0"
-          sources."configstore-3.1.2"
-          sources."dot-prop-4.2.0"
-          sources."got-6.7.1"
-          sources."latest-version-3.1.0"
-          sources."package-json-4.0.1"
-          sources."pify-3.0.0"
-          sources."timed-out-4.0.1"
-          sources."unzip-response-2.0.1"
-          sources."widest-line-2.0.0"
-          sources."write-file-atomic-2.3.0"
-          sources."xdg-basedir-3.0.0"
-        ];
-      })
+      sources."update-notifier-2.3.0"
       sources."update-section-0.3.3"
       sources."urix-0.1.0"
-      sources."url-0.11.0"
       sources."url-parse-lax-1.0.0"
       (sources."use-3.1.0" // {
         dependencies = [
@@ -45130,7 +44973,7 @@ in
       sources."validate-npm-package-license-3.0.3"
       sources."verror-1.10.0"
       sources."vfile-1.4.0"
-      sources."vfile-location-2.0.2"
+      sources."vfile-location-2.0.3"
       (sources."watchpack-1.5.0" // {
         dependencies = [
           sources."define-property-1.0.0"
@@ -45158,15 +45001,11 @@ in
       })
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-4.0.2"
-      (sources."whatwg-url-6.3.0" // {
-        dependencies = [
-          sources."punycode-2.1.0"
-        ];
-      })
+      sources."whatwg-url-6.3.0"
       sources."when-3.7.7"
       sources."which-1.3.0"
-      sources."which-module-1.0.0"
-      sources."widest-line-1.0.0"
+      sources."which-module-2.0.0"
+      sources."widest-line-2.0.0"
       sources."win-release-1.1.1"
       sources."window-size-0.1.4"
       sources."winreg-0.0.12"
@@ -45174,27 +45013,31 @@ in
       sources."wrap-ansi-2.1.0"
       sources."wrappy-1.0.2"
       sources."write-0.2.1"
-      sources."write-file-atomic-1.3.4"
-      sources."xdg-basedir-2.0.0"
+      sources."write-file-atomic-2.3.0"
+      sources."xdg-basedir-3.0.0"
       sources."xml2js-0.4.19"
       sources."xmlbuilder-9.0.7"
       sources."xmldom-0.1.27"
-      sources."xregexp-4.0.0"
+      sources."xregexp-2.0.0"
       sources."xtend-4.0.1"
       sources."y18n-3.2.1"
       sources."yallist-2.1.2"
       (sources."yargs-6.6.0" // {
         dependencies = [
           sources."camelcase-3.0.0"
-          sources."cliui-3.2.0"
           sources."decamelize-1.2.0"
+          sources."find-up-1.1.2"
           sources."is-fullwidth-code-point-1.0.0"
           sources."os-locale-1.4.0"
+          sources."parse-json-2.2.0"
+          sources."path-exists-2.1.0"
           sources."string-width-1.0.2"
+          sources."strip-bom-2.0.0"
+          sources."which-module-1.0.0"
           sources."yargs-parser-4.2.1"
         ];
       })
-      sources."yargs-parser-2.4.1"
+      sources."yargs-parser-9.0.2"
       sources."yauzl-2.9.1"
       sources."zip-1.2.0"
       (sources."zip-dir-1.0.2" // {
@@ -45233,10 +45076,10 @@ in
   yarn = nodeEnv.buildNodePackage {
     name = "yarn";
     packageName = "yarn";
-    version = "1.5.1";
+    version = "1.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yarn/-/yarn-1.5.1.tgz";
-      sha1 = "e8680360e832ac89521eb80dad3a7bc27a40bab4";
+      url = "https://registry.npmjs.org/yarn/-/yarn-1.6.0.tgz";
+      sha1 = "9cec6f7986dc237d39ec705ce74d95155fe55d4b";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -45250,10 +45093,10 @@ in
   yo = nodeEnv.buildNodePackage {
     name = "yo";
     packageName = "yo";
-    version = "2.0.1";
+    version = "2.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/yo/-/yo-2.0.1.tgz";
-      sha512 = "390n0gdbxr25mr804mrwfqw6r6srk4q9spnsnnlfvlsfvr6dwd93nrgh0l2sr76a9jdw2jiycwc0241h6zch6hi0jlhg3w8hk6i4hyy";
+      url = "https://registry.npmjs.org/yo/-/yo-2.0.2.tgz";
+      sha512 = "13z42dkmgbs67a3i6wfzf1h3lp54r6xj9p063kyx2nq0v132lqnkss2srl2kayfljcdprr7pw7dfm6h08kqnkhzrlzi1ls7h7cz2qgy";
     };
     dependencies = [
       sources."@sindresorhus/is-0.7.0"
@@ -45333,7 +45176,7 @@ in
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
       sources."decompress-response-3.3.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."default-uid-1.0.0"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
@@ -45376,8 +45219,9 @@ in
       sources."getpass-0.1.7"
       sources."glob-7.1.2"
       sources."global-dirs-0.1.1"
+      sources."global-tunnel-ng-2.1.1"
       sources."globby-6.1.0"
-      sources."got-8.3.0"
+      sources."got-8.3.1"
       sources."graceful-fs-4.1.11"
       sources."grouped-queue-0.3.3"
       sources."har-schema-2.0.0"
@@ -45404,9 +45248,9 @@ in
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       (sources."insight-0.8.4" // {
@@ -45471,7 +45315,7 @@ in
       sources."latest-version-3.1.0"
       sources."load-json-file-1.1.0"
       sources."locate-path-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash._getnative-3.9.1"
       sources."lodash.debounce-3.1.1"
       sources."lodash.pad-4.5.1"
@@ -45568,9 +45412,9 @@ in
       sources."process-nextick-args-2.0.0"
       sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."query-string-5.1.1"
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."read-pkg-1.1.0"
       (sources."read-pkg-up-2.0.0" // {
         dependencies = [
@@ -45598,7 +45442,7 @@ in
       sources."rx-4.1.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."scoped-regex-1.0.0"
       sources."semver-5.5.0"
@@ -45661,6 +45505,7 @@ in
       sources."tmp-0.0.33"
       sources."tough-cookie-2.3.4"
       sources."trim-newlines-1.0.0"
+      sources."tunnel-0.0.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."twig-0.8.9"
@@ -45668,13 +45513,13 @@ in
       sources."unique-string-1.0.0"
       sources."untildify-3.0.2"
       sources."unzip-response-2.0.1"
-      (sources."update-notifier-2.4.0" // {
+      (sources."update-notifier-2.5.0" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."camelcase-4.1.0"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."execa-0.7.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."url-parse-lax-3.0.0"
@@ -45714,11 +45559,11 @@ in
       (sources."yeoman-environment-2.0.6" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."debug-3.1.0"
           sources."log-symbols-2.2.0"
           sources."pify-2.3.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       (sources."yosay-2.0.2" // {
diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 2d987cbfb1bd..62428e9dbf3b 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -15,4 +15,5 @@
 , "vue-cli"
 , "swagger"
 , "npm"
+, "three"
 ]
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 4b2e714c42db..88aed5fd8237 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -22,13 +22,13 @@ let
         sha512 = "0ahsk9basb6qimsb40yr40vxxkmmfiqlig23brc5dymic61gfhzg2mzqz5cvkiz2y8g2rwnlwb619fkd3f4hw1yg8bkbczcaxzcrqn0";
       };
     };
-    "@cycle/isolate-3.2.0" = {
+    "@cycle/isolate-3.3.0" = {
       name = "_at_cycle_slash_isolate";
       packageName = "@cycle/isolate";
-      version = "3.2.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.2.0.tgz";
-        sha512 = "1g3jcq2dmxpqn3nyvclbf9hnp18h4c41vsqywp2yf2mda92bzdjwidq8f231yxb6rs6r39zpvn741kjify4h5zl4d8ix1xigilbcyj7";
+        url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.3.0.tgz";
+        sha512 = "0406glnab9c4579lfqikh8w67xjd7fvll3sysxy80sxjv3iaks6w08bgjl8418pk2x0iid8shd3ad7xqiw1lvdjarxnrydmnj3c8mjq";
       };
     };
     "@cycle/run-3.4.0" = {
@@ -49,13 +49,13 @@ let
         sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7";
       };
     };
-    "@types/node-9.6.2" = {
+    "@types/node-10.0.4" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "9.6.2";
+      version = "10.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz";
-        sha512 = "30kq6rikl2ya5krnyglrbi52xrm0f3q0nyzj99haady8c2s03l3rcp42cxkkd4v3mrvsw3jan0kz7vb4j148qg8wklh2igvsmii2sai";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz";
+        sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6";
       };
     };
     "@types/superagent-3.5.6" = {
@@ -481,13 +481,13 @@ let
         sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79";
       };
     };
-    "atob-2.1.0" = {
+    "atob-2.1.1" = {
       name = "atob";
       packageName = "atob";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz";
-        sha512 = "0dyf7054n94f1pwp9chcy6vawgwd2wqp8jqrnvxl489jyxxbg46n2vkb5vfs5jqnkmh6kbyv4lpysrn13hzzh5q021frc6vrcgqms2a";
+        url = "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz";
+        sha1 = "ae2d5a729477f289d60dd7f96a6314a22dd6c22a";
       };
     };
     "atomic-batcher-1.0.2" = {
@@ -940,13 +940,13 @@ let
         sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
       };
     };
-    "chalk-2.3.2" = {
+    "chalk-2.4.1" = {
       name = "chalk";
       packageName = "chalk";
-      version = "2.3.2";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chalk/-/chalk-2.3.2.tgz";
-        sha512 = "06jlrzx0nb92910rcfhx55n28jgvhc0qda49scnfyifnmc31dyfqsl5qqiwhsxkrhrc6c07x69q037f1pwg06kkfd1qdzaxz7dj7kk4";
+        url = "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz";
+        sha512 = "1yl5ffjp5w65b9ydnw4vp13n563121hs64xbnajif51grhpqmslaqllj24zm1pfaw9ywvdx69n8ppa3riwlps25k5934zgnbf3pmcrr";
       };
     };
     "chardet-0.4.2" = {
@@ -1228,13 +1228,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "colors-1.2.1" = {
+    "colors-1.2.4" = {
       name = "colors";
       packageName = "colors";
-      version = "1.2.1";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz";
-        sha512 = "0m8vssxhc3xlx639gz68425ll6mqh0rib6yr7s2v2vg1hwnqka02zijxmg16iyvzmd5sbsczjs2mqs0n428pc1cgkgj439fsa9b1kxk";
+        url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz";
+        sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9";
       };
     };
     "combine-errors-3.0.3" = {
@@ -1570,13 +1570,13 @@ let
         sha512 = "0yyadc98mdpvqdszc1v26zcgd6zqxink2wrhxw9ax60wk0sxqw6mm3m2jbqvibj54p1gjsmgsf1yhv20xsm77kkb7qwj79jlx8kvfad";
       };
     };
-    "dat-doctor-1.3.1" = {
+    "dat-doctor-1.4.0" = {
       name = "dat-doctor";
       packageName = "dat-doctor";
-      version = "1.3.1";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.3.1.tgz";
-        sha512 = "19cfxdik2pv94dbfsz4nm6a0v6vfx5s1isaagmsjrb44czbcl55sjj9nf1302hqc8ckijsdmlsrna02hb0mjzzhsy0m6c8r3cv0wabk";
+        url = "https://registry.npmjs.org/dat-doctor/-/dat-doctor-1.4.0.tgz";
+        sha512 = "3ysgc2z0pjbka9617lqykw8c0bqbacgixd6j8nlcdi7sz7j94w2sl17mq3xaq7b6kr5wdngi64y584hj8baqgxw2aaavgvk96kff3fl";
       };
     };
     "dat-encoding-4.0.2" = {
@@ -1669,22 +1669,13 @@ let
         sha512 = "13cbr004milnmjisg774rqqw82vyjg1p1d6gvm3xji516rq7zzc1x7da397njig5s2rg2qmw1dixdn4cpkmvc8irq4y1dzb3h46sz2c";
       };
     };
-    "dat-swarm-defaults-1.0.0" = {
+    "dat-swarm-defaults-1.0.1" = {
       name = "dat-swarm-defaults";
       packageName = "dat-swarm-defaults";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.0.tgz";
-        sha1 = "ba7d58c309cf60c3924afad869b75192b61fe354";
-      };
-    };
-    "datland-swarm-defaults-1.0.2" = {
-      name = "datland-swarm-defaults";
-      packageName = "datland-swarm-defaults";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/datland-swarm-defaults/-/datland-swarm-defaults-1.0.2.tgz";
-        sha1 = "277b895a39f1aa7f96a495a02fb3662a5ed9f2e0";
+        url = "https://registry.npmjs.org/dat-swarm-defaults/-/dat-swarm-defaults-1.0.1.tgz";
+        sha512 = "0kgq4nz4axx3kpfam6lxid88x5gx39gbk3kzcgmbhxld9vwl3469q58hkd2zjripg3955483j450yvszk1pwpn895adz62mn0xsarag";
       };
     };
     "debug-2.2.0" = {
@@ -1786,13 +1777,13 @@ let
         sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d";
       };
     };
-    "deep-extend-0.4.2" = {
+    "deep-extend-0.5.1" = {
       name = "deep-extend";
       packageName = "deep-extend";
-      version = "0.4.2";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz";
-        sha1 = "48b699c27e334bf89f10892be432f6e4c7d34a7f";
+        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz";
+        sha512 = "3bzqm7nqgh7m8xjhl0q8jc0ccm9riymsfmy0144x6n2qy9v1gin2ww8s9wjlayk0xyzq9cz9pyar02yiv30mhqsj7rmw35ywrsc3jrp";
       };
     };
     "define-property-0.2.5" = {
@@ -2047,13 +2038,13 @@ let
         sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2";
       };
     };
-    "duplexify-3.5.4" = {
+    "duplexify-3.6.0" = {
       name = "duplexify";
       packageName = "duplexify";
-      version = "3.5.4";
+      version = "3.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.5.4.tgz";
-        sha512 = "2qcky919ps17a9ndimxvcqc73wlrcjmq8ppddbnl45xs9yqp1dmzzfaspfn63xzp14rl3dlk4g6y2ia71s6r9nggd0mb891hcni4di7";
+        url = "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz";
+        sha512 = "12hhn0igd7y8nmni0qd63wpc9w1fl5rgdh4d1mq65n6r00l7byh7fs5v6m6pd8xzwmnxhrxqrc1y5yh6hswbh2i9ic9la21if5w7vbw";
       };
     };
     "ecc-jsbn-0.1.1" = {
@@ -2605,6 +2596,15 @@ let
         sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af";
       };
     };
+    "fs-constants-1.0.0" = {
+      name = "fs-constants";
+      packageName = "fs-constants";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz";
+        sha512 = "2iv1j05gzx1sgpckd597sdd2f5x54rgcib3rpwgf31050wqxn5h27map6cn9wk4vix393s4ws2xv6kgps5zfby2iirb2zw8hk1818yb";
+      };
+    };
     "fs-extra-0.24.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -2641,13 +2641,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.1.3" = {
+    "fsevents-1.2.3" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.1.3";
+      version = "1.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz";
-        sha512 = "3jw51f4iayxvp9wfxczk1xgcvhsydhlgah64jmpl0mqiii2h8i5pp0lrqac5xn7296gxqrvy4lgm4k4hkifk8gipgqxd68x764gp2jq";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz";
+        sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz";
       };
     };
     "fstream-1.0.11" = {
@@ -3046,13 +3046,13 @@ let
         sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1";
       };
     };
-    "hypercore-6.13.0" = {
+    "hypercore-6.14.0" = {
       name = "hypercore";
       packageName = "hypercore";
-      version = "6.13.0";
+      version = "6.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.13.0.tgz";
-        sha512 = "056r7rmx6zkfivza10a0fs5p2wlgxrb82gb1sz8hmjgczvc9gx652ybhbckmr0a0bjknc1yzd23zw6v3r2svasymvdfgcp9k98qf1hw";
+        url = "https://registry.npmjs.org/hypercore/-/hypercore-6.14.0.tgz";
+        sha512 = "3liw77yhvn3nlrczf9s30vvn4bxrn3glh65a2psy1va9pvcnjwx6wfh52v5l9qbd7zyp4q4nb7qrq0n3am7jwmz3dkb5fzvdnlwikkh";
       };
     };
     "hypercore-protocol-6.6.4" = {
@@ -3910,13 +3910,13 @@ let
         sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
       };
     };
-    "lodash-4.17.5" = {
+    "lodash-4.17.10" = {
       name = "lodash";
       packageName = "lodash";
-      version = "4.17.5";
+      version = "4.17.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz";
-        sha512 = "11hikgyas884mz8a58vyixaahxbpdwljdw4cb6qp15xa3sfqikp2mm6wgv41jsl34nzsv1hkx9kw3nwczvas5p73whirmaz4sxggwmj";
+        url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
+        sha512 = "1ba5b80jjzwrh9fbdk5ywv8sic0dynij21wgrfxsfjzwvwd7x1n6azdhdc0vjdxqmcpm0mhshd1k7n2ascxpz00z3p8a3k97mwg1s2i";
       };
     };
     "lodash-compat-3.10.2" = {
@@ -4567,13 +4567,13 @@ let
         sha512 = "2agpbdf9h90nhafdam3jwrw8gcz3jw1i40cx6bhwaw8qaf2s863gi2b77l73dc3hmf5dx491hv5km1rqzabgsbpkjxrvdcwy6pr8gp1";
       };
     };
-    "mirror-folder-2.1.1" = {
+    "mirror-folder-2.2.0" = {
       name = "mirror-folder";
       packageName = "mirror-folder";
-      version = "2.1.1";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.1.1.tgz";
-        sha1 = "1ad3b777b39e403cc27bf52086c23e41ef4c9604";
+        url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-2.2.0.tgz";
+        sha512 = "3js8pwgmj4lzzi6nzl0wp021rhsnz31jpkkzdf35xzwm1l65m6ygjf4hz77vvy3dk2h5jb2d32nvzy26n3d5hswg3nb8s0rylvv510r";
       };
     };
     "mixin-deep-1.3.1" = {
@@ -4801,13 +4801,13 @@ let
         sha512 = "15fbq2bchsjk85zklc34xl74skmdxbipsf0zjf1k6jfq1fr31h5bn7c6438ff55i9yzrhf11k85ahvahyb73khfjl4sj59zjrqksj9d";
       };
     };
-    "needle-2.2.0" = {
+    "needle-2.2.1" = {
       name = "needle";
       packageName = "needle";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/needle/-/needle-2.2.0.tgz";
-        sha512 = "3ry4wyih9w3nc3d319bmfd9l4jj8fn00lqfs1d00sfy6azvy66yhm6jv411cn1c1zqc01hvj59dlavm82mzxw5mlar8ck9ylz5s0mkq";
+        url = "https://registry.npmjs.org/needle/-/needle-2.2.1.tgz";
+        sha512 = "3wnlvqmkxw69bl3clghqpsl1kxqm7hkq4v4ab0rm6dx7xqyg3bn8q38i6hmxm47ccfn6bxcvl53c4madxdgblnm06ika99x4g06rxmp";
       };
     };
     "nets-3.2.0" = {
@@ -4846,13 +4846,13 @@ let
         sha512 = "0vkilw1ghsjca0lrj9gsdgsi8wj4bvpfr25q1qzx1kp5hhvjdhapmvpmrd2hikwq9dxydw6sdvv0730wwvmsg36xqf0hgp9777l3ns8";
       };
     };
-    "nodemon-1.17.3" = {
+    "nodemon-1.17.4" = {
       name = "nodemon";
       packageName = "nodemon";
-      version = "1.17.3";
+      version = "1.17.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.3.tgz";
-        sha512 = "1i6m13ad9c1p8xilw0vjcgmj0nnk1y9b3lncx6kwljxw89hmk5z9vv8m452wfd5qg9bqf9r0b236d9vxbc3i2sx2flamfrr03xm42zh";
+        url = "https://registry.npmjs.org/nodemon/-/nodemon-1.17.4.tgz";
+        sha512 = "3bmxd7fd494gy4ddax3mihjz1iy484iakyssbhy87cc2kwbky9xkb8l47vphc3n858q9p9afxl57w0849i24amsdjhwbqh8vxhjy1v5";
       };
     };
     "nopt-1.0.10" = {
@@ -5503,13 +5503,13 @@ let
         sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
       };
     };
-    "qs-6.5.1" = {
+    "qs-6.5.2" = {
       name = "qs";
       packageName = "qs";
-      version = "6.5.1";
+      version = "6.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz";
-        sha512 = "3waqapyj1k4g135sgj636rmswiaixq19is1rw0rpv4qp6k7dl0a9nwy06m7yl5lbdk9p6xpwwngnggbzlzaz6rh11c86j2nvnnf273r";
+        url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz";
+        sha512 = "0c46ws0x9g3mmkgfmvd78bzvnmv2b8ryg4ah6jvyyqgjv9v994z7xdyvsc4vg9sf98gg7phvy3q1ahgaj5fy3dwzf2rki6bixgl15ip";
       };
     };
     "raf-3.3.2" = {
@@ -5539,13 +5539,13 @@ let
         sha1 = "72f3d865b4b55a259879473e2fb2de3569c69ee2";
       };
     };
-    "random-access-storage-1.1.1" = {
+    "random-access-storage-1.2.0" = {
       name = "random-access-storage";
       packageName = "random-access-storage";
-      version = "1.1.1";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.1.1.tgz";
-        sha512 = "1dswb4yr7m8350bx8z0z19iqgk2a43qbfc1qf8n3w483mqqg0f5gsykd5cg14yy8jik0n9ghy7j2f5kp1anzjna46ih9ncxpm0vq0k1";
+        url = "https://registry.npmjs.org/random-access-storage/-/random-access-storage-1.2.0.tgz";
+        sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118";
       };
     };
     "randomatic-1.1.7" = {
@@ -5584,13 +5584,13 @@ let
         sha1 = "a2c2f98c8531cee99c63d8d238b7de97bb659fca";
       };
     };
-    "rc-1.2.6" = {
+    "rc-1.2.7" = {
       name = "rc";
       packageName = "rc";
-      version = "1.2.6";
+      version = "1.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rc/-/rc-1.2.6.tgz";
-        sha1 = "eb18989c6d4f4f162c399f79ddd29f3835568092";
+        url = "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz";
+        sha512 = "30b4pqzhk8f4ppzyk5diwxac7xpf4hd3rysyin012l59da9v5iaai4wd6yzlz3rjspfvvy191q6qcsw47mwlw9y07n35kzq23rw7lid";
       };
     };
     "read-1.0.7" = {
@@ -5881,13 +5881,13 @@ let
         sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be";
       };
     };
-    "safe-buffer-5.1.1" = {
+    "safe-buffer-5.1.2" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
-      version = "5.1.1";
+      version = "5.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "1p28rllll1w65yzq5azi4izx962399xdsdlfbaynn7vmp981hiss05jhiy9hm7sbbfk3b4dhlcv0zy07fc59mnc07hdv6wcgqkcvawh";
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "3xbm0dkya4bc3zwfwpdzbl8ngq0aai5ihlp2v3s39y7162c7wyvv9izj3g8hv6dy6vm2lq48lmfzygk0kxwbjb6xic7k4a329j99p8r";
       };
     };
     "safe-regex-1.1.0" = {
@@ -6187,13 +6187,13 @@ let
         sha512 = "3451wvpagbw2ib50galmlfrb5za3zh0ml1irbm2ijd0lbjblg9va4fnag6sfs7msb1m0i5zicz93jwp90c22v0n40qzpczhicg85jah";
       };
     };
-    "sodium-native-2.1.5" = {
+    "sodium-native-2.1.6" = {
       name = "sodium-native";
       packageName = "sodium-native";
-      version = "2.1.5";
+      version = "2.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.5.tgz";
-        sha512 = "3cwd4rvsggx0lzc7433v6321fjs65q9nqr3c9gcz7j51ca580aq6ciacmmq788yxb3ih78b1fkpkprm75d0hadj3ng2bznc6qsl1var";
+        url = "https://registry.npmjs.org/sodium-native/-/sodium-native-2.1.6.tgz";
+        sha512 = "3y0f008galwxign4qb49q2kfkhz68nfxazpcq5y63wahaqly89x640nnv8cv4rg9xn1vbp5wia76vkmh1ja13dp95vjzw2lv5q2zymx";
       };
     };
     "sodium-universal-2.0.0" = {
@@ -6574,6 +6574,15 @@ let
         sha512 = "0sxwwjllf26hx079lw1w3c1zywq2af9ssi7f0n334xzz1mgnfx2lr5l532a988zyi3bigzmfidqgdrfmwv6ghgzs77qsw87yr0zhlc1";
       };
     };
+    "superagent-3.8.3" = {
+      name = "superagent";
+      packageName = "superagent";
+      version = "3.8.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
+        sha512 = "0a4ra91hgzbhnyccsx319r1xzaw4cb3k144g7xrp10y3wckzd98vxhf5vk34cfvvlrav8pyf2vqr11scimkiyivg2w84458q0n2vd0q";
+      };
+    };
     "supports-color-1.2.0" = {
       name = "supports-color";
       packageName = "supports-color";
@@ -6601,13 +6610,13 @@ let
         sha512 = "1flwwfdd7gg94xrc0b2ard3qjx4cpy600q49gx43y8pzvs7j56q78bjhv8mk18vgbggr4fd11jda8ck5cdrkc5jcjs04nlp7kwbg85c";
       };
     };
-    "supports-color-5.3.0" = {
+    "supports-color-5.4.0" = {
       name = "supports-color";
       packageName = "supports-color";
-      version = "5.3.0";
+      version = "5.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.3.0.tgz";
-        sha512 = "0v9skvg8c5hgqfsm98p7d7hisk11syjdvl3nxid3ik572hbjwv4vyzws7q0n1yz8mvb1asbk00838fi09hyfskrng54icn8nbag98yi";
+        url = "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz";
+        sha512 = "3ks7qkl6s064qcdc5qnpzcwzcrnlzccz9m3faw54fnmsm2k8fzb9saqr5nhx7w9lnd4nbp0zg047zz8mwsd4fxfnalpb7kra619fdnf";
       };
     };
     "swagger-converter-0.1.7" = {
@@ -6673,22 +6682,22 @@ let
         sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
       };
     };
-    "tar-4.4.1" = {
+    "tar-4.4.2" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.1";
+      version = "4.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.1.tgz";
-        sha512 = "33gymcvk33znj1lscj0kds60g5jzagw2dcx1fcbpxz85pi21kqlazvwz579p301x0vqvir1nslh901zq28sfx2zpsnd7qldvjpzbsrv";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.2.tgz";
+        sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85";
       };
     };
-    "tar-stream-1.5.5" = {
+    "tar-stream-1.6.0" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "1.5.5";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz";
-        sha512 = "219gn10gvilrq6h3yshbhn25fx46n0wlgg66h0v326jhzz8gmpxsinb8bnhx1py35z0cv2248v91k2vy6vmkajmvpmkfmizywn601wr";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz";
+        sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn";
       };
     };
     "term-size-1.2.0" = {
@@ -6790,13 +6799,13 @@ let
         sha512 = "0drg2bck1cj8677rgs1l98v7vqaxawcqh6ja87qilwnd719l5y0lzv5ssn3pcwa37fdbg4188y6x15a90vkllyvfpd9v7fai2b8j44d";
       };
     };
-    "to-buffer-1.1.0" = {
+    "to-buffer-1.1.1" = {
       name = "to-buffer";
       packageName = "to-buffer";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.0.tgz";
-        sha1 = "375bc03edae5c35a8fa0b3fe95a1f3985db1dcfa";
+        url = "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz";
+        sha512 = "1b8wsfz1rp8fsb2kz7isrsx292vl5w4cmx9qvivxqsj61avx9ph1azxa6zr3mc85cz8qddbkxm6ski8zvacmpadc22wp6pv5gk427wp";
       };
     };
     "to-iso-string-0.0.2" = {
@@ -7114,22 +7123,22 @@ let
         sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
       };
     };
-    "upath-1.0.4" = {
+    "upath-1.0.5" = {
       name = "upath";
       packageName = "upath";
-      version = "1.0.4";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/upath/-/upath-1.0.4.tgz";
-        sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p";
+        url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz";
+        sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9";
       };
     };
-    "update-notifier-2.4.0" = {
+    "update-notifier-2.5.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "2.4.0";
+      version = "2.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.4.0.tgz";
-        sha1 = "f9b4c700fbfd4ec12c811587258777d563d8c866";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz";
+        sha512 = "07vkna9y5i0ak6rwcbinrrgpabrcmav91ys805c42jskyc6kfla3wd12klsr858vzv5civi7arh5xz8bv7jdj81zgzyh6j70a31s0w3";
       };
     };
     "uri-js-3.0.2" = {
@@ -7222,13 +7231,13 @@ let
         sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
       };
     };
-    "utp-native-1.7.0" = {
+    "utp-native-1.7.1" = {
       name = "utp-native";
       packageName = "utp-native";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.0.tgz";
-        sha512 = "1d0ccaz56506y44838shld6zkqx9rcx3cpw5qddbfbyjyjr73704gysrl3qwii6i80kx1i2ysnn8bdx6q0i4biwzjj36ksx2865i0yz";
+        url = "https://registry.npmjs.org/utp-native/-/utp-native-1.7.1.tgz";
+        sha512 = "2mflgna04nng4cj8z4pr53pw0fm3z447mvbnvcahlvq8wpg46znrvg4fkgh18k14bkiq3gic5d2h975bgy7h7l64cfjpc8r2km3naqm";
       };
     };
     "uuid-3.2.1" = {
@@ -7519,13 +7528,13 @@ let
         sha1 = "a81981ea70a57946133883f029c5821a89359a7f";
       };
     };
-    "z-schema-3.19.1" = {
+    "z-schema-3.20.0" = {
       name = "z-schema";
       packageName = "z-schema";
-      version = "3.19.1";
+      version = "3.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.19.1.tgz";
-        sha512 = "29crh8y7kjqp652n8wpbh4ljd4j579jg9kwaw9anmd8nhkdz5ljg9arxm8wpcpir5rka60l7h3i13mahcrsq95ydl3f1pxfcfm77wwc";
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.20.0.tgz";
+        sha512 = "2fmqk4rayvsp7kjhfmr7ldrwvfvg1aif9dwpsqbqvmsz8j18q5lxs1vm4frg7pla8fwj2xacjzy0fsm2xfqvwmsxa5yxvsb21y5v2pn";
       };
     };
   };
@@ -7576,23 +7585,23 @@ in
     dependencies = [
       sources."@cycle/dom-18.3.0"
       sources."@cycle/http-14.9.0"
-      sources."@cycle/isolate-3.2.0"
+      sources."@cycle/isolate-3.3.0"
       sources."@cycle/run-3.4.0"
       (sources."@cycle/time-0.10.1" // {
         dependencies = [
           sources."chalk-1.1.3"
         ];
       })
-      sources."@types/node-9.6.2"
+      sources."@types/node-10.0.4"
       sources."@types/superagent-3.5.6"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."asynckit-0.4.0"
-      (sources."chalk-2.3.2" // {
+      (sources."chalk-2.4.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."chardet-0.4.2"
@@ -7638,7 +7647,7 @@ in
       sources."is-promise-2.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."lodash._baseiteratee-4.7.0"
       sources."lodash._basetostring-4.12.0"
       sources."lodash._baseuniq-4.6.0"
@@ -7662,14 +7671,14 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."pseudomap-1.0.2"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.6"
       sources."restore-cursor-2.0.0"
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."setimmediate-1.0.5"
       sources."shebang-command-1.2.0"
@@ -7758,7 +7767,7 @@ in
       sources."bytes-3.0.0"
       sources."call-me-maybe-1.0.1"
       sources."caseless-0.12.0"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."circular-append-file-1.0.1"
       sources."cli-truncate-1.1.0"
       sources."cliclopts-1.1.1"
@@ -7766,7 +7775,7 @@ in
       sources."codecs-1.2.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.1"
+      sources."colors-1.2.4"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -7782,7 +7791,7 @@ in
       sources."cycle-1.0.3"
       sources."dashdash-1.14.1"
       sources."dat-dns-1.3.2"
-      (sources."dat-doctor-1.3.1" // {
+      (sources."dat-doctor-1.4.0" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."dns-packet-1.3.1"
@@ -7823,8 +7832,7 @@ in
       sources."dat-registry-4.0.0"
       sources."dat-secret-storage-4.0.1"
       sources."dat-storage-1.0.4"
-      sources."dat-swarm-defaults-1.0.0"
-      sources."datland-swarm-defaults-1.0.2"
+      sources."dat-swarm-defaults-1.0.1"
       sources."debug-3.1.0"
       sources."deep-equal-0.2.2"
       sources."delayed-stream-1.0.0"
@@ -7849,7 +7857,7 @@ in
       sources."dns-socket-3.0.0"
       sources."dns-txt-2.0.2"
       sources."dom-walk-0.1.1"
-      sources."duplexify-3.5.4"
+      sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
       sources."end-of-stream-1.4.1"
       sources."escape-string-regexp-1.0.5"
@@ -7884,7 +7892,7 @@ in
       sources."hoek-4.2.1"
       sources."http-methods-0.1.0"
       sources."http-signature-1.2.0"
-      (sources."hypercore-6.13.0" // {
+      (sources."hypercore-6.14.0" // {
         dependencies = [
           sources."varint-5.0.0"
         ];
@@ -7947,7 +7955,7 @@ in
       sources."min-document-2.19.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."mirror-folder-2.1.1"
+      sources."mirror-folder-2.2.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."multi-random-access-2.1.1"
@@ -7993,10 +8001,10 @@ in
       sources."protocol-buffers-encodings-1.1.0"
       sources."pump-2.0.1"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."random-access-file-2.0.1"
       sources."random-access-memory-2.4.0"
-      sources."random-access-storage-1.1.1"
+      sources."random-access-storage-1.2.0"
       (sources."randomatic-1.1.7" // {
         dependencies = [
           (sources."is-number-3.0.0" // {
@@ -8019,14 +8027,14 @@ in
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."signed-varint-2.0.1"
       sources."simple-sha1-2.1.0"
       sources."siphash24-1.1.0"
       sources."slice-ansi-1.0.0"
       sources."sntp-2.1.0"
       sources."sodium-javascript-0.5.5"
-      sources."sodium-native-2.1.5"
+      sources."sodium-native-2.1.6"
       sources."sodium-universal-2.0.0"
       sources."sorted-array-functions-1.1.0"
       sources."sorted-indexof-1.0.0"
@@ -8048,7 +8056,7 @@ in
           sources."debug-2.6.9"
         ];
       })
-      sources."supports-color-5.3.0"
+      sources."supports-color-5.4.0"
       (sources."throttle-1.0.3" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -8056,7 +8064,7 @@ in
       })
       sources."through2-2.0.3"
       sources."thunky-1.0.2"
-      sources."to-buffer-1.1.0"
+      sources."to-buffer-1.1.1"
       sources."toiletdb-1.4.1"
       sources."tough-cookie-2.3.4"
       sources."township-client-1.3.2"
@@ -8072,7 +8080,7 @@ in
       sources."untildify-3.0.2"
       sources."util-deprecate-1.0.2"
       sources."utile-0.3.0"
-      sources."utp-native-1.7.0"
+      sources."utp-native-1.7.1"
       sources."uuid-3.2.1"
       sources."varint-3.0.1"
       sources."verror-1.10.0"
@@ -8134,10 +8142,10 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "5.0.5";
+    version = "5.1.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-5.0.5.tgz";
-      sha512 = "20cyp9x4b3gfrd50w8dcfkm0dv2mc6z0ikvfpkc8dzca6hppslgn0yiw2qdzc4ggf234kzcdvs0hw7lnv7ywilaml4w39vr6r93ghyw";
+      url = "https://registry.npmjs.org/mocha/-/mocha-5.1.1.tgz";
+      sha512 = "23wcnn35p90xhsc5z94w45s30j756s97acm313h6lacnbliqlaka3drq2xbsi4br8gdkld3r4dc33vglq8kf5jb408c7b2agpyar8lh";
     };
     dependencies = [
       sources."balanced-match-1.0.0"
@@ -8282,11 +8290,11 @@ in
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.0"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
       sources."request-2.85.0"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."semver-5.3.0"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.2"
@@ -8336,10 +8344,10 @@ in
   node-pre-gyp = nodeEnv.buildNodePackage {
     name = "node-pre-gyp";
     packageName = "node-pre-gyp";
-    version = "0.9.0";
+    version = "0.10.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.9.0.tgz";
-      sha1 = "bdd4c3afac9b1b1ebff0a9ff3362859eb6781bb8";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz";
+      sha512 = "10s7f95mxnxcwziwzx44l62zy3yjmhky942pw134dbd48wshl7abr1ja8qx1rfzz9vgygcx1vlz1jlldy61da33zq0bfi8bfji09f8v";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -8354,7 +8362,7 @@ in
       sources."console-control-strings-1.1.0"
       sources."core-util-is-1.0.2"
       sources."debug-2.6.9"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."delegates-1.0.0"
       sources."detect-libc-1.0.3"
       sources."fs-minipass-1.2.5"
@@ -8375,7 +8383,7 @@ in
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
-      sources."needle-2.2.0"
+      sources."needle-2.2.1"
       sources."nopt-4.0.1"
       sources."npm-bundled-1.0.3"
       sources."npm-packlist-1.1.10"
@@ -8388,14 +8396,14 @@ in
       sources."osenv-0.1.5"
       sources."path-is-absolute-1.0.1"
       sources."process-nextick-args-2.0.0"
-      (sources."rc-1.2.6" // {
+      (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
       })
       sources."readable-stream-2.3.6"
       sources."rimraf-2.6.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
       sources."semver-5.5.0"
@@ -8405,7 +8413,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
-      sources."tar-4.4.1"
+      sources."tar-4.4.2"
       sources."util-deprecate-1.0.2"
       sources."wide-align-1.1.2"
       sources."wrappy-1.0.2"
@@ -8423,10 +8431,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "1.38.3";
+    version = "1.41.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.38.3.tgz";
-      sha1 = "84b7ce1eee5d893c51995752e8afc2ee726539e3";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.41.3.tgz";
+      sha1 = "66b38792c8447702c47553a87dddc5748a3aefca";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -8475,12 +8483,12 @@ in
       sources."graceful-readlink-1.0.1"
       sources."inherits-2.0.3"
       sources."isarray-1.0.0"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."minimatch-3.0.4"
       sources."process-nextick-args-2.0.0"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."set-immediate-shim-1.0.1"
       sources."string_decoder-1.1.1"
       sources."util-deprecate-1.0.2"
@@ -8531,7 +8539,10 @@ in
       sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-3.6.0"
+      sources."buffer-alloc-1.1.0"
+      sources."buffer-alloc-unsafe-0.1.1"
       sources."buffer-crc32-0.2.13"
+      sources."buffer-fill-0.1.1"
       sources."builtins-1.0.3"
       sources."camelcase-1.2.1"
       sources."capture-stack-trace-1.0.0"
@@ -8542,7 +8553,7 @@ in
         ];
       })
       sources."center-align-0.1.3"
-      sources."chalk-2.3.2"
+      sources."chalk-2.4.1"
       sources."chardet-0.4.2"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-1.3.1"
@@ -8611,6 +8622,7 @@ in
       sources."filenamify-2.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
+      sources."fs-constants-1.0.0"
       sources."fs-extra-0.26.7"
       sources."fs.realpath-1.0.0"
       sources."get-proxy-2.1.0"
@@ -8669,7 +8681,7 @@ in
       sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
       sources."lazy-cache-1.0.4"
-      sources."lodash-4.17.5"
+      sources."lodash-4.17.10"
       sources."log-symbols-2.2.0"
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
@@ -8714,7 +8726,7 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proto-list-1.2.4"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."read-metadata-1.0.0"
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
@@ -8730,7 +8742,7 @@ in
       sources."run-async-2.3.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."seek-bzip-1.0.5"
       sources."semver-5.5.0"
@@ -8746,14 +8758,15 @@ in
       sources."strip-ansi-4.0.0"
       sources."strip-dirs-2.1.0"
       sources."strip-outer-1.0.1"
-      sources."supports-color-5.3.0"
-      sources."tar-stream-1.5.5"
+      sources."supports-color-5.4.0"
+      sources."tar-stream-1.6.0"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
       sources."thunkify-wrap-1.0.4"
       sources."tildify-1.2.0"
       sources."timed-out-4.0.1"
       sources."tmp-0.0.33"
+      sources."to-buffer-1.1.1"
       sources."toml-2.3.3"
       sources."tough-cookie-2.3.4"
       sources."trim-repeated-1.0.0"
@@ -8839,7 +8852,7 @@ in
       sources."async-1.5.2"
       sources."async-each-1.0.1"
       sources."asynckit-0.4.0"
-      sources."atob-2.1.0"
+      sources."atob-2.1.1"
       sources."balanced-match-1.0.0"
       (sources."base-0.11.2" // {
         dependencies = [
@@ -8917,7 +8930,7 @@ in
       sources."debug-2.6.9"
       sources."decamelize-1.2.0"
       sources."decode-uri-component-0.2.0"
-      sources."deep-extend-0.4.2"
+      sources."deep-extend-0.5.1"
       sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."depd-1.1.2"
@@ -8961,7 +8974,7 @@ in
       sources."from-0.1.7"
       sources."fs-extra-0.24.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.1.3"
+      sources."fsevents-1.2.3"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
@@ -9026,13 +9039,13 @@ in
         dependencies = [
           sources."debug-3.1.0"
           sources."ms-2.0.0"
-          sources."qs-6.5.1"
-          sources."superagent-3.8.2"
+          sources."qs-6.5.2"
+          sources."superagent-3.8.3"
         ];
       })
       (sources."json-schema-deref-sync-0.3.4" // {
         dependencies = [
-          sources."lodash-4.17.5"
+          sources."lodash-4.17.10"
         ];
       })
       sources."jsonfile-2.4.0"
@@ -9115,11 +9128,11 @@ in
       sources."nan-2.10.0"
       sources."nanomatch-1.2.9"
       sources."native-promise-only-0.8.1"
-      (sources."nodemon-1.17.3" // {
+      (sources."nodemon-1.17.4" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
-          sources."chalk-2.3.2"
+          sources."chalk-2.4.1"
           sources."debug-3.1.0"
           sources."define-property-1.0.0"
           sources."extend-shallow-2.0.1"
@@ -9146,7 +9159,7 @@ in
           sources."lru-cache-4.1.2"
           sources."minimist-1.2.0"
           sources."strip-ansi-4.0.0"
-          sources."supports-color-5.3.0"
+          sources."supports-color-5.4.0"
         ];
       })
       sources."nopt-1.0.10"
@@ -9187,7 +9200,7 @@ in
           sources."bytes-2.1.0"
         ];
       })
-      sources."rc-1.2.6"
+      sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."readline2-1.0.1"
@@ -9205,7 +9218,7 @@ in
       sources."rimraf-2.6.2"
       sources."run-async-0.1.0"
       sources."rx-lite-3.1.2"
-      sources."safe-buffer-5.1.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."sanitize-filename-1.6.1"
       sources."semver-5.5.0"
@@ -9287,7 +9300,7 @@ in
           sources."form-data-1.0.0-rc3"
           sources."formidable-1.0.17"
           sources."isarray-0.0.1"
-          sources."lodash-4.17.5"
+          sources."lodash-4.17.10"
           sources."mime-1.3.4"
           sources."ms-0.7.1"
           sources."object-assign-3.0.0"
@@ -9337,8 +9350,8 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.0.4"
-      sources."update-notifier-2.4.0"
+      sources."upath-1.0.5"
+      sources."update-notifier-2.5.0"
       sources."uri-js-3.0.2"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
@@ -9362,7 +9375,7 @@ in
       sources."xtend-4.0.1"
       sources."yallist-2.1.2"
       sources."yargs-3.10.0"
-      sources."z-schema-3.19.1"
+      sources."z-schema-3.20.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -9376,10 +9389,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "5.8.0";
+    version = "6.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-5.8.0.tgz";
-      sha512 = "32zs775qksijpj23rwly4h8gs435lbsgaxzw6dmyjjg3i8qd40bmmadv3ac9mdxd0cd2x0m3ncsqa0j5vkmkvh8dknn0j9d1k6ig30f";
+      url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
+      sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -9390,4 +9403,21 @@ in
     production = true;
     bypassCache = true;
   };
+  three = nodeEnv.buildNodePackage {
+    name = "three";
+    packageName = "three";
+    version = "0.92.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/three/-/three-0.92.0.tgz";
+      sha1 = "8d3d1f5af890e62da7f4cb45d20c09fa51057dcd";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "JavaScript 3D library";
+      homepage = https://threejs.org/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+  };
 }
\ No newline at end of file

From 4e9892f84591b16333c51da081b6d69d6e875f59 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 15:36:02 +0200
Subject: [PATCH 1167/3370] nodePackages_8_x.mathjax: Init at 2.7.4

---
 .../node-packages/node-packages-v8.json         |  1 +
 .../node-packages/node-packages-v8.nix          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json
index 62428e9dbf3b..4236064c7545 100644
--- a/pkgs/development/node-packages/node-packages-v8.json
+++ b/pkgs/development/node-packages/node-packages-v8.json
@@ -16,4 +16,5 @@
 , "swagger"
 , "npm"
 , "three"
+, "mathjax"
 ]
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index 88aed5fd8237..e64364eb68b1 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -9420,4 +9420,21 @@ in
     production = true;
     bypassCache = true;
   };
+  mathjax = nodeEnv.buildNodePackage {
+    name = "mathjax";
+    packageName = "mathjax";
+    version = "2.7.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mathjax/-/mathjax-2.7.4.tgz";
+      sha512 = "37hnj84ls531nqjxr4r6k4bjbqz4zqpb9adg7k6klah8dlj3rh38j4p8mbjh4h0v7r575kkc528rspincfabpm4j8y5v68kh6v8p907";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers.";
+      homepage = "https://github.com/mathjax/MathJax#readme";
+      license = "Apache-2.0";
+    };
+    production = true;
+    bypassCache = true;
+  };
 }
\ No newline at end of file

From fe24a0fa386e8a45919904ee62a35c11712f71ae Mon Sep 17 00:00:00 2001
From: Demyan Rogozhin <demyan.rogozhin@gmail.com>
Date: Sat, 5 May 2018 00:45:24 +0200
Subject: [PATCH 1168/3370] particl-core: init at 0.16.0.4

Particl is privacy-focused altcoin build for p2p eCommerce.
Added Particl Core - daemon used to run staking node.
---
 maintainers/maintainer-list.nix               |  5 ++
 pkgs/applications/altcoins/default.nix        |  2 +
 .../altcoins/particl/particl-core.nix         | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/altcoins/particl/particl-core.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9369a76688cb..782a3ee6aadd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -998,6 +998,11 @@
     github = "demin-dmitriy";
     name = "Dmitriy Demin";
   };
+  demyanrogozhin = {
+    email = "demyan.rogozhin@gmail.com";
+    github = "demyanrogozhin";
+    name = "Demyan Rogozhin";
+  };
   derchris = {
     email = "derchris@me.com";
     github = "derchrisuk";
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index fa704b596591..9915e0a301a1 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -87,4 +87,6 @@ rec {
   parity = callPackage ./parity { };
   parity-beta = callPackage ./parity/beta.nix { };
   parity-ui = callPackage ./parity-ui { };
+
+  particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; };
 }
diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
new file mode 100644
index 000000000000..c9454963b22e
--- /dev/null
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -0,0 +1,47 @@
+{ stdenv
+, autoconf
+, automake
+, autoreconfHook
+, boost
+, db48
+, fetchurl
+, libevent
+, libtool
+, miniupnpc
+, openssl
+, pkgconfig
+, utillinux
+, zeromq
+, zlib
+, withGui
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "particl-core-${version}";
+  version     = "0.16.0.4";
+
+  src = fetchurl {
+    url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
+    sha256 = "1yy8pw13rn821jpi1zvzwi3ipxi1bgfxv8g6jz49qlbjzjmjcr68";
+  };
+
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ openssl db48 boost zlib
+                  miniupnpc libevent zeromq ]
+                  ++ optionals stdenv.isLinux [ utillinux ];
+
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
+
+  meta = {
+    description = "Privacy-Focused Marketplace & Decentralized Application Platform";
+    longDescription= ''
+      An open source, decentralized privacy platform built for global person to person eCommerce.
+    '';
+    homepage = https://particl.io/;
+    maintainers = with maintainers; [ demyanrogozhin ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c4d182d2d3a..512e8b150623 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14896,6 +14896,8 @@ with pkgs;
 
   stellar-core = self.altcoins.stellar-core;
 
+  particl-core = self.altcoins.particl-core;
+
   aumix = callPackage ../applications/audio/aumix {
     gtkGUI = false;
   };

From 42a0b11450948fd83b45e1ee60c252f8b9e84e81 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 6 May 2018 04:38:47 +0200
Subject: [PATCH 1169/3370] dockerTools.pullImage: Fix build with sandboxing

Regression introduced in 736848723e5aefa5d24396c58dc6de603399efde.

This commit most certainly hasn't been tested with sandboxing enabled
and breaks not only pullImage but also the docker-tools NixOS VM test
because it doesn't find it's certificate path and also relies on
/var/tmp being there.

Fixing the certificate path is the easiest one because it can be done
via environment variable.

I've used overrideAttrs for changing the hardcoded path to /tmp (which
is available in sandboxed builds and even hardcoded in Nix), so that
whenever someone uses Skopeo from all-packages.nix the path is still
/var/tmp.

The reason why this is hardcoded to /var/tmp can be seen in a comment in
vendor/github.com/containers/image/storage/storage_image.go:

  Do not use the system default of os.TempDir(), usually /tmp, because
  with systemd it could be a tmpfs.

With sandboxed builds this isn't the case, however for using Nix without
NixOS this could turn into a problem if this indeed is the case.

So in the long term this needs to have a proper solution.

In addition to that, I cleaned up the expression a bit.

Tested by building dockerTools.examples.nixFromDockerHub and the
docker-tools NixOS VM test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @nlewo, @Mic92, @Profpatsch, @globin, @LnL7
---
 pkgs/build-support/docker/default.nix | 50 +++++++++++++++++----------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 584beb3d89b8..374b71d42a39 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -32,28 +32,42 @@ rec {
     inherit pkgs buildImage pullImage shadowSetup buildImageWithNixDb;
   };
 
-  pullImage =
-    let
-      fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
-    in {
-      imageName,
+  pullImage = let
+    fixName = name: builtins.replaceStrings ["/" ":"] ["-" "-"] name;
+  in
+    { imageName
       # To find the digest of an image, you can use skopeo:
       # skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
       # sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
-      imageDigest,
-      sha256,
+    , imageDigest
+    , sha256
       # This used to set a tag to the pulled image
-      finalImageTag ? "latest",
-      name ? (fixName "docker-image-${imageName}-${finalImageTag}.tar") }:
-      runCommand name {
-        impureEnvVars=pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
-        outputHashMode="flat";
-        outputHashAlgo="sha256";
-        outputHash=sha256;
-      }
-      ''
-        ${pkgs.skopeo}/bin/skopeo copy docker://${imageName}@${imageDigest} docker-archive://$out:${imageName}:${finalImageTag}
-      '';
+    , finalImageTag ? "latest"
+    , name ? fixName "docker-image-${imageName}-${finalImageTag}.tar"
+    }:
+
+    runCommand name {
+      impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
+      outputHashMode = "flat";
+      outputHashAlgo = "sha256";
+      outputHash = sha256;
+
+      # One of the dependencies of Skopeo uses a hardcoded /var/tmp for storing
+      # big image files, which is not available in sandboxed builds.
+      nativeBuildInputs = lib.singleton (pkgs.skopeo.overrideAttrs (drv: {
+        postPatch = (drv.postPatch or "") + ''
+          sed -i -e 's!/var/tmp!/tmp!g' \
+            vendor/github.com/containers/image/storage/storage_image.go \
+            vendor/github.com/containers/image/internal/tmpdir/tmpdir.go
+        '';
+      }));
+      SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt";
+
+      sourceURL = "docker://${imageName}@${imageDigest}";
+      destNameTag = "${imageName}:${finalImageTag}";
+    } ''
+      skopeo copy "$sourceURL" "docker-archive://$out:$destNameTag"
+    '';
 
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
   # And we cannot untar it, because then we cannot preserve permissions ecc.

From 8ce802e8c8e99a0a7aed26e4f22725c56dd4cf80 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 6 May 2018 05:07:39 +0200
Subject: [PATCH 1170/3370] gopass: Add xclip to wrapperPath

This is another dependency needed when invoked with "gopass -c".

I opted for xclip instead of xsel, because xclip is tried first in
order.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @andir, @suvash, @mkaito
---
 pkgs/tools/security/gopass/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 743f9136ae53..1bbd4169f2eb 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }:
+{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }:
 
 buildGoPackage rec {
   version = "1.6.11";
@@ -18,6 +18,7 @@ buildGoPackage rec {
   wrapperPath = with stdenv.lib; makeBinPath ([
     git
     gnupg
+    xclip
   ]);
 
   postInstall = ''

From f8351ba5f0cf067579ceac19b67a797d0a4de3fc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 5 May 2018 23:28:36 -0500
Subject: [PATCH 1171/3370] pythonPackages.scrapy: enable darwin build

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

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 005d02e60472..f33acc79a2bb 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -1,4 +1,4 @@
-{ buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore,
+{ stdenv, buildPythonPackage, fetchurl, glibcLocales, mock, pytest, botocore,
   testfixtures, pillow, six, twisted, w3lib, lxml, queuelib, pyopenssl,
   service-identity, parsel, pydispatcher, cssselect, lib }:
 buildPythonPackage rec {
@@ -20,8 +20,9 @@ buildPythonPackage rec {
     LC_ALL="en_US.UTF-8";
 
     checkPhase = ''
-      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py
+      py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py ${lib.optionalString stdenv.isDarwin "--ignore=tests/test_utils_iterators.py"}
       # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3
+      # Ignore iteration test, because lxml can't find encodings on darwin https://bugs.launchpad.net/lxml/+bug/707396
     '';
 
     src = fetchurl {
@@ -34,6 +35,6 @@ buildPythonPackage rec {
       homepage = http://scrapy.org/;
       license = licenses.bsd3;
       maintainers = with maintainers; [ drewkett ];
-      platforms = platforms.linux;
+      platforms = platforms.unix;
     };
 }

From 4e906935ccb27ccdfcc2bc5af8bd2867dcbc679e Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 6 May 2018 07:28:42 +0200
Subject: [PATCH 1172/3370] powerline-rs: 0.1.6 -> 0.1.7

---
 pkgs/tools/misc/powerline-rs/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 1a386a9f6193..ff020d451012 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,14 +1,14 @@
 { lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }:
 rustPlatform.buildRustPackage rec {
   name = "powerline-rs-${version}";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "jD91mZM2";
     repo = "powerline-rs";
     rev = version;
 
-    sha256 = "11rhirnk8zh4vf00df9cgy9vw5h8n7kgnhjbjbnlpl9i6wal9nvl";
+    sha256 = "0ry1axia78sp9vmn6p119l69sj3dqx2san1k71a5npf60rf4gfkc";
   };
 
   cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
@@ -19,6 +19,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "powerline-shell rewritten in Rust, inspired by powerline-go";
+    license = licenses.mit;
     maintainers = with maintainers; [ jD91mZM2 ];
     platforms = platforms.unix;
   };

From f76301c6cb2a4eaeb4364aa2480bd0c7a2cb1115 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 6 May 2018 09:43:01 +0300
Subject: [PATCH 1173/3370] emby: 3.3.1.0 -> 3.4.0.0

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 964fa77c31a9..4defe9787ba3 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.3.1.0";
+  version = "3.4.0.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "04qq3rl3pwxnsr8z6x3dwplh6brn1nd0jpmmnvizln4ffx9wspb8";
+    sha256 = "1936d5bcrf23av5nc8yh6708gxngsbkh86gvmzpsv3d33jgqv1nl";
   };
 
   buildInputs = with pkgs; [

From 295815bec71ccee51cbc35582e7300df00c7fd6b Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 3 May 2018 21:17:14 -0500
Subject: [PATCH 1174/3370] treewide: Remove phases

---
 .../darwin/apple-source-releases/CarbonHeaders/default.nix    | 2 --
 .../darwin/apple-source-releases/CommonCrypto/default.nix     | 2 --
 .../darwin/apple-source-releases/Libc/825_40_1.nix            | 2 --
 .../os-specific/darwin/apple-source-releases/Libc/default.nix | 2 --
 .../darwin/apple-source-releases/Libinfo/default.nix          | 2 --
 .../os-specific/darwin/apple-source-releases/Libm/default.nix | 4 +---
 .../darwin/apple-source-releases/Libnotify/default.nix        | 2 --
 .../darwin/apple-source-releases/Librpcsvc/default.nix        | 2 --
 .../darwin/apple-source-releases/Libsystem/default.nix        | 3 ---
 .../darwin/apple-source-releases/architecture/default.nix     | 4 +---
 .../darwin/apple-source-releases/copyfile/default.nix         | 4 +---
 .../os-specific/darwin/apple-source-releases/dyld/default.nix | 2 --
 .../darwin/apple-source-releases/eap8021x/default.nix         | 4 +---
 .../darwin/apple-source-releases/launchd/default.nix          | 4 +---
 .../darwin/apple-source-releases/libclosure/default.nix       | 4 +---
 .../darwin/apple-source-releases/libdispatch/default.nix      | 2 --
 .../darwin/apple-source-releases/libplatform/default.nix      | 2 --
 .../darwin/apple-source-releases/libpthread/default.nix       | 2 --
 .../darwin/apple-source-releases/libresolv/default.nix        | 2 --
 .../darwin/apple-source-releases/libutil/default.nix          | 2 --
 pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix | 2 --
 .../darwin/apple-source-releases/removefile/default.nix       | 4 +---
 pkgs/os-specific/darwin/xcode/default.nix                     | 1 -
 23 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
index 38215fa8f900..648770660d3d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include
     cp MacTypes.h          $out/include
diff --git a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
index 5bcf94a18cef..ad51f1df2bcd 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CommonCrypto/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include/CommonCrypto
     cp include/* $out/include/CommonCrypto
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
index 0fa9294f2290..302a657992aa 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation, ed, unifdef }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   nativeBuildInputs = [ ed unifdef ];
 
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
index 40237b27bd26..d73dc8f3ec24 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation, ed, unifdef, Libc_old, Libc_10-9 }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   nativeBuildInputs = [ ed unifdef ];
 
   # TODO: asl.h actually comes from syslog project now
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
index 2756857ba677..d3ffa1fa2834 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libinfo/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     substituteInPlace xcodescripts/install_files.sh \
       --replace "/usr/local/" "/" \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
index b409a7347ef2..1a01d0321918 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libm/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include
 
@@ -10,4 +8,4 @@ appleDerivation {
     cp Source/Intel/fenv.h $out/include
     cp Source/complex.h    $out/include
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
index 810c8e8315a5..de691a056f3e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libnotify/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include
     cp notify.h      $out/include
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
index 512ec6253c78..7002f82fe561 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation, developer_cmds }:
 
 appleDerivation rec {
-  phases = [ "unpackPhase" "installPhase" ];
-
   buildInputs = [ developer_cmds ];
 
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 8575e0676253..9759810ef686 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -3,9 +3,6 @@
   removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
 
 appleDerivation rec {
-  dontBuild = true;
-  dontConfigure = true;
-
   nativeBuildInputs = [ cpio ];
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
index edb7869269ac..2638a0afb76d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
@@ -1,9 +1,7 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
-  postUnpack = ''
+  postPatch = ''
     substituteInPlace $sourceRoot/Makefile \
       --replace "/usr/include" "/include" \
       --replace "/usr/bin/" "" \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
index c1a2acccaa97..bbc8c5e5e81d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
@@ -1,10 +1,8 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include/
     cp copyfile.h $out/include/
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
index 56b0d93f99be..ddadf1f3940b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/lib $out/include
     ln -s /usr/lib/dyld $out/lib/dyld
diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
index af9493fe32e8..c8a40a20c9d3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
@@ -1,11 +1,9 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   installPhase = ''
     mkdir -p $out/Library/Frameworks/EAP8021X.framework/Headers
 
     cp EAP8021X.fproj/EAPClientProperties.h $out/Library/Frameworks/EAP8021X.framework/Headers
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
index c0e00ca1636e..86bc6e598f7d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/launchd/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   # No clue why the same file has two different names. Ask Apple!
   installPhase = ''
     mkdir -p $out/include/ $out/include/servers
@@ -11,4 +9,4 @@ appleDerivation {
     cp liblaunch/bootstrap.h $out/include/servers
     cp liblaunch/bootstrap.h $out/include/servers/bootstrap_defs.h
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
index a0201f9db2c1..826dbed1dfe0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libclosure/default.nix
@@ -1,10 +1,8 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include
     cp *.h $out/include/
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index c80e37575697..44c50e468384 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include/dispatch $out/include/os
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
index 65accc870d71..41b1bf74af9e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libplatform/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir $out
     cp -r include $out/include
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
index b4d8004d3e66..650c6415defc 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libpthread/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation, libdispatch, xnu }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   propagatedBuildInputs = [ libdispatch xnu ];
 
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
index a565971a6fa4..5a2cd33d8a03 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation, Libinfo, configd, mDNSResponder }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
-
   buildInputs = [ Libinfo configd mDNSResponder ];
 
   buildPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix
index c943c2068e6d..a6f484ba4e8d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/default.nix
@@ -2,8 +2,6 @@
 
 # all symbols are located in libSystem
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include
     cp *.h $out/include
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
index ffc19801c5dc..9ee8f2255b44 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
@@ -1,8 +1,6 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   installPhase = ''
     mkdir -p $out/include/ppp
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
index 315f93bef084..8baf62dba01b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/default.nix
@@ -1,10 +1,8 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  phases = [ "unpackPhase" "installPhase" ];
-
   installPhase = ''
     mkdir -p $out/include/
     cp removefile.h checkint.h $out/include/
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index d3a9ec012ebf..bea8bc5d3c21 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -14,7 +14,6 @@ in stdenv.mkDerivation rec {
     sha256 = "70bb550cc14eca80b9825f4ae9bfbf7f076bb75777311be428bc30a7eb7a6f7e";
   };
 
-  phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
   outputs = [ "out" "toolchain" ];
 
 

From 560e91f1a79f8bae58ce609da26cdbc981b14704 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@users.noreply.github.com>
Date: Sun, 6 May 2018 11:49:04 +0200
Subject: [PATCH 1175/3370] nixos/matrix-synapse service:
 url_preview_url_blacklist fix (#40027)

Moved list of ip ranges to url_preview_ip_range_blacklist defaults.
Fixes #40017
---
 nixos/modules/services/misc/matrix-synapse.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 7e880ad09b89..10901e102225 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -395,7 +395,14 @@ in {
       };
       url_preview_ip_range_blacklist = mkOption {
         type = types.listOf types.str;
-        default = [];
+        default = [
+          "127.0.0.0/8"
+          "10.0.0.0/8"
+          "172.16.0.0/12"
+          "192.168.0.0/16"
+          "100.64.0.0/10"
+          "169.254.0.0/16"
+        ];
         description = ''
           List of IP address CIDR ranges that the URL preview spider is denied
           from accessing.
@@ -412,14 +419,7 @@ in {
       };
       url_preview_url_blacklist = mkOption {
         type = types.listOf types.str;
-        default = [
-          "127.0.0.0/8"
-          "10.0.0.0/8"
-          "172.16.0.0/12"
-          "192.168.0.0/16"
-          "100.64.0.0/10"
-          "169.254.0.0/16"
-        ];
+        default = [];
         description = ''
           Optional list of URL matches that the URL preview spider is
           denied from accessing.

From f57986597fb287478db18445e785e7dcb708b997 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 6 May 2018 12:27:31 +0200
Subject: [PATCH 1176/3370] mkcast: drop and replace with `xscast` (#40026)

The package has been declared as unmaintained, `xscast` is the way to
go: https://github.com/KeyboardFire/mkcast#obsolete

Replacement for `mkcast` (https://github.com/KeyboardFire/mkcast#obsolete)
---
 pkgs/applications/video/mkcast/default.nix | 37 ----------------------
 pkgs/applications/video/xscast/default.nix | 35 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +--
 3 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/video/mkcast/default.nix
 create mode 100644 pkgs/applications/video/xscast/default.nix

diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix
deleted file mode 100644
index 2d5d2d3b102c..000000000000
--- a/pkgs/applications/video/mkcast/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz
-, xdpyinfo, makeWrapper, gtk2, xorg, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "mkcast-2015-03-13";
-
-  src = fetchFromGitHub {
-    owner = "KeyboardFire";
-    repo = "mkcast";
-    rev = "cac22cb6c6f8ec2006339698af5e9199331759e0";
-    sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p";
-  };
-
-  buildInputs = with pythonPackages; [ makeWrapper pygtk gtk2 xlib ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  postInstall = ''
-    for f in $out/bin/*; do #*/
-      wrapProgram $f --prefix PATH : "${stdenv.lib.makeBinPath [ xdpyinfo wmctrl byzanz gnome3.gnome-terminal ]}:$out/bin"
-    done
-
-    rm -r screenkey/.bzr
-    cp -R screenkey $out/bin
-
-    wrapProgram $out/bin/screenkey/screenkey \
-      --prefix PATH : "${xorg.xmodmap}/bin"\
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A tool for creating GIF screencasts of a terminal, with key presses overlaid";
-    homepage = https://github.com/KeyboardFire/mkcast;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ domenkozar pSub ];
-  };
-}
diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix
new file mode 100644
index 000000000000..ae048f1bdac4
--- /dev/null
+++ b/pkgs/applications/video/xscast/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, makeWrapper, ffmpeg, imagemagick, dzen2, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "xscast-unstable-${version}";
+  version = "2016-07-26";
+
+  src = fetchFromGitHub {
+    owner = "KeyboardFire";
+    repo = "xscast";
+    rev = "9e6fd3c28d3f5ae630619f6dbccaf1f6ca594b21";
+    sha256 = "0br27bq9bpglfdpv63h827bipgvhlh10liyhmhcxls4227kagz72";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 xscast.sh $out/bin/xscast
+    install -Dm644 xscast.1 $out/share/man/man1/xscast.1
+    patchShebangs $out/bin
+
+    wrapProgram "$out/bin/xscast" \
+      --prefix PATH : ${stdenv.lib.makeBinPath [ ffmpeg dzen2 xorg.xwininfo xorg.xinput xorg.xmodmap imagemagick ]}
+
+    runHook postInstall
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/KeyboardFire/xscast;
+    license = licenses.mit;
+    description = "Screencasts of windows with list of keystrokes overlayed";
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c4d182d2d3a..9199f7af2f87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3334,8 +3334,6 @@ with pkgs;
 
   motion = callPackage ../applications/video/motion { };
 
-  mkcast = callPackage ../applications/video/mkcast { };
-
   mtail = callPackage ../servers/monitoring/mtail { };
 
   multitail = callPackage ../tools/misc/multitail { };
@@ -5576,6 +5574,8 @@ with pkgs;
 
   xprintidle-ng = callPackage ../tools/X11/xprintidle-ng {};
 
+  xscast = callPackage ../applications/video/xscast { };
+
   xsettingsd = callPackage ../tools/X11/xsettingsd { };
 
   xsensors = callPackage ../os-specific/linux/xsensors { };

From 4b69aab023a146e317f4d13f7dc94886b3a4a40f Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 6 May 2018 13:34:23 +0200
Subject: [PATCH 1177/3370] prometheus-dnsmasq-exporter: init at
 unstable-2018-05-05

---
 .../prometheus/dnsmasq-exporter-deps.nix      | 93 +++++++++++++++++++
 .../prometheus/dnsmasq-exporter.nix           | 23 +++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 117 insertions(+)
 create mode 100644 pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix
 create mode 100644 pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix

diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix
new file mode 100644
index 000000000000..1acf859e81a6
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix
@@ -0,0 +1,93 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/beorn7/perks";
+    fetch = {
+      type = "git";
+      url = "https://github.com/beorn7/perks";
+      rev = "3a771d992973f24aa725d07868b467d1ddfceafb";
+      sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+  {
+    goPackagePath = "github.com/matttproud/golang_protobuf_extensions";
+    fetch = {
+      type = "git";
+      url = "https://github.com/matttproud/golang_protobuf_extensions";
+      rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c";
+      sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya";
+    };
+  }
+  {
+    goPackagePath = "github.com/miekg/dns";
+    fetch = {
+      type = "git";
+      url = "https://github.com/miekg/dns";
+      rev = "9c76f9827e170bfcd354c2cb02a6fd428faf81a6";
+      sha256 = "0yym4jr15cqwlppnqfsp92i7p1ir12ys695wffb3in7gnnm0d38n";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_golang";
+      rev = "82f5ff156b29e276022b1a958f7d385870fb9814";
+      sha256 = "111j329yrlgvh73dm80gawwxsh9dgjkw74254kyj5c2rfmra7znz";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/client_model";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/client_model";
+      rev = "99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c";
+      sha256 = "19y4ywsivhpxj7ikf2j0gm9k3cmyw37qcbfi78n526jxcc7kw998";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/common";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/common";
+      rev = "d811d2e9bf898806ecfb6ef6296774b13ffc314c";
+      sha256 = "0r4067r4ysmljksqw3awcxx5qplqhykahc5igdzgkky7i4bvaik1";
+    };
+  }
+  {
+    goPackagePath = "github.com/prometheus/procfs";
+    fetch = {
+      type = "git";
+      url = "https://github.com/prometheus/procfs";
+      rev = "8b1c2da0d56deffdbb9e48d4414b4e674bd8083e";
+      sha256 = "0x128p15h35mgwqxkigfkk1lfrcz9g697ahl8v6xp9kwvcqvjrrf";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "640f4622ab692b87c2f3a94265e6f579fe38263d";
+      sha256 = "097m4qhcljhp180171j5fjhq4740iirfkkajfd7yrxqhp4s9hljx";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+]
diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
new file mode 100644
index 000000000000..bcfc82adf478
--- /dev/null
+++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "dnsmasq_exporter-unstable-2018-05-05";
+
+  goPackagePath = "github.com/google/dnsmasq_exporter";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "dnsmasq_exporter";
+    sha256 = "1kzq4h7z28xadx425nbgxadk62yiz6279d300fyiyi83hwq0ay8c";
+    rev = "e1f281b435bbefbb2d17fc57c051ede0ab973c59";
+  };
+
+  goDeps = ./dnsmasq-exporter-deps.nix;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "A dnsmasq exporter for Prometheus";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ willibutz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9199f7af2f87..cd5a7b06ca76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12775,6 +12775,7 @@ with pkgs;
   prometheus-blackbox-exporter = callPackage ../servers/monitoring/prometheus/blackbox-exporter.nix { };
   prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { };
   prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { };
+  prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { };
   prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { };
   prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { };
   prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { };

From e2dfac67f7feee6c53b1df3e42c89c649278df6b Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Sun, 6 May 2018 13:57:59 +0200
Subject: [PATCH 1178/3370] nixos/promtheus-dnsmasq-exporter: add module

---
 .../monitoring/prometheus/exporters.nix       |  1 +
 .../prometheus/exporters/dnsmasq.nix          | 39 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 780448d8bad8..8d2c303a69e8 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -20,6 +20,7 @@ let
   exporterOpts = {
     blackbox  = import ./exporters/blackbox.nix  { inherit config lib pkgs; };
     collectd  = import ./exporters/collectd.nix  { inherit config lib pkgs; };
+    dnsmasq   = import ./exporters/dnsmasq.nix   { inherit config lib pkgs; };
     dovecot   = import ./exporters/dovecot.nix   { inherit config lib pkgs; };
     fritzbox  = import ./exporters/fritzbox.nix  { inherit config lib pkgs; };
     json      = import ./exporters/json.nix      { inherit config lib pkgs; };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
new file mode 100644
index 000000000000..b1fab85109af
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/dnsmasq.nix
@@ -0,0 +1,39 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.dnsmasq;
+in
+{
+  port = 9153;
+  extraOpts = {
+    dnsmasqListenAddress = mkOption {
+      type = types.str;
+      default = "localhost:53";
+      description = ''
+        Address on which dnsmasq listens.
+      '';
+    };
+    leasesPath = mkOption {
+      type = types.path;
+      default = "/var/lib/misc/dnsmasq.leases";
+      example = "/var/lib/dnsmasq/dnsmasq.leases";
+      description = ''
+        Path to the <literal>dnsmasq.leases</literal> file.
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-dnsmasq-exporter}/bin/dnsmasq_exporter \
+          --listen ${cfg.listenAddress}:${toString cfg.port} \
+          --dnsmasq ${cfg.dnsmasqListenAddress} \
+          --leases_path ${cfg.leasesPath} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}

From 5fada46e88dca3ae889b29ffd4bf410d0e94b232 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 6 May 2018 13:17:32 +0200
Subject: [PATCH 1179/3370] powerline-rs: add bash & fish completion

---
 pkgs/tools/misc/powerline-rs/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index ff020d451012..e48816db935a 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,6 +1,7 @@
-{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, libgit2, openssl_1_1_0, libssh2, libzip }:
+{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, openssl_1_1_0, libssh2, libgit2, libzip }:
 rustPlatform.buildRustPackage rec {
-  name = "powerline-rs-${version}";
+  pname = "powerline-rs";
+  name = "${pname}-${version}";
   version = "0.1.7";
 
   src = fetchFromGitHub {
@@ -14,8 +15,12 @@ rustPlatform.buildRustPackage rec {
   cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
 
   nativeBuildInputs = [ pkgconfig file perl cmake ];
-  buildInputs = [ libgit2 ];
-  propagatedBuildInputs = [ openssl_1_1_0 libssh2 libzip ];
+  buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ];
+
+  postInstall = ''
+    install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"
+    install -Dm 755 "${pname}.fish" "$out/share/fish/vendor_completions.d/${pname}"
+  '';
 
   meta = with lib; {
     description = "powerline-shell rewritten in Rust, inspired by powerline-go";

From 2d08df417fa9008440081a6d2d1cd6db9d854ff9 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 5 May 2018 20:15:59 +0200
Subject: [PATCH 1180/3370] termplay: init at 2.0.4

---
 pkgs/tools/misc/termplay/default.nix | 38 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/misc/termplay/default.nix

diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix
new file mode 100644
index 000000000000..5771ec6aff19
--- /dev/null
+++ b/pkgs/tools/misc/termplay/default.nix
@@ -0,0 +1,38 @@
+{ rustPlatform, fetchFromGitHub, lib, makeWrapper, gst_all_1, libsixel }:
+rustPlatform.buildRustPackage rec {
+  name = "termplay-${version}";
+  version = "2.0.4";
+
+  src = fetchFromGitHub {
+    owner = "jD91mZM2";
+    repo = "termplay";
+    rev = version;
+
+    sha256 = "0qgx9xmi8n3sq5n5m6gai777sllw9hyki2kwsj2k4h1ykibzq9r0";
+  };
+
+  cargoBuildFlags = ["--features" "bin"];
+  cargoSha256 = "1ghvp4n6mvckamvn3hk672wh29jlrwmhrd4hv3mh98li1x9ssbmf";
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-plugins-bad
+    libsixel
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/termplay --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
+  '';
+
+  meta = with lib; {
+    description = "Play an image/video in your terminal";
+    homepage = https://jd91mzm2.github.io/termplay/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jD91mZM2 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e502294289fe..47619b28cfa6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5143,6 +5143,8 @@ with pkgs;
 
   telepresence = callPackage ../tools/networking/telepresence { };
 
+  termplay = callPackage ../tools/misc/termplay { };
+
   tewisay = callPackage ../tools/misc/tewisay { };
 
   texmacs = if stdenv.isDarwin

From f92cf4b93fecdd6b9ff91640ed6062dbd43aafd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 6 May 2018 14:06:15 +0200
Subject: [PATCH 1181/3370] pythonPackages.pyopengl: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4da4910bbbdf..75cf7561ab6c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11567,11 +11567,15 @@ in {
       sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf";
     };
     propagatedBuildInputs = [ pkgs.libGLU_combined pkgs.freeglut self.pillow ];
-    patchPhase = ''
-      sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py
-      sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py
-      sed -i "s|'GLU',|'${pkgs.libGLU_combined}/lib/libGLU.so',|" OpenGL/platform/glx.py
-      sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py
+    patchPhase = let
+      ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''
+      substituteInPlace OpenGL/platform/glx.py \
+        --replace "'GL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
+        --replace "'GLU'" "'${pkgs.libGLU}/lib/libGLU${ext}'" \
+        --replace "'glut'" "'${pkgs.freeglut}/lib/libglut${ext}'"
+      substituteInPlace OpenGL/platform/darwin.py \
+        --replace "'OpenGL'" "'${pkgs.libGL}/lib/libGL${ext}'" \
+        --replace "'GLUT'" "'${pkgs.freeglut}/lib/libglut${ext}'"
     '';
     meta = {
       homepage = http://pyopengl.sourceforge.net/;

From 80ea03ee79e66fc1ebbe48ac36d02fd82b880171 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Sat, 5 May 2018 21:41:54 -0400
Subject: [PATCH 1182/3370] draftsight: 2017-SP2 -> 2018-SP2, remove gstreamer

Also, fixed URL scheme to link directly.

Addressing https://github.com/NixOS/nixpkgs/issues/39975
---
 .../graphics/draftsight/default.nix           | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix
index b604099096ff..d817424c4525 100644
--- a/pkgs/applications/graphics/draftsight/default.nix
+++ b/pkgs/applications/graphics/draftsight/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
+{ stdenv, fetchurl, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
   dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
-  xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc,
+  xkeyboard_config, zlib, libxslt, libxml2, sqlite, orc,
   libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
   libXrender, libXcomposite }:
 
-let version = "2017-SP2"; in
+let version = "2018SP2"; in
 stdenv.mkDerivation {
   name = "draftsight-${version}";
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
           $out/bin/$exe \
           --prefix "QT_XKB_CONFIG_ROOT" ":" "${xkeyboard_config}/share/X11/xkb"
     done
-    for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so; do
+    for lib in $out/draftsight/opt/dassault-systemes/DraftSight/Libraries/*.so*; do
       # DraftSight ships with broken symlinks for some reason
       if [ -f $(readlink -f $lib) ]
       then
@@ -41,6 +41,19 @@ stdenv.mkDerivation {
         echo "Ignoring broken link $lib"
       fi
     done
+    for lib in $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/lib/cpp/*.so*; do
+      if [ -f $(readlink $lib) ]
+      then
+        echo "Patching $lib..."
+        chmod u+w $lib
+        patchelf --set-rpath $libPath:\$ORIGIN/../Libraries $lib
+      else
+        echo "Ignoring broken link $lib"
+      fi
+    done
+    # These libraries shouldn't really be here anyway:
+    find $out/draftsight/opt/dassault-systemes/DraftSight/APISDK/Samples/C++ \
+         -type d -name _lib | xargs rm -r
   '';
 
   # TODO: Figure out why HelpGuide segfaults at startup.
@@ -51,15 +64,15 @@ stdenv.mkDerivation {
   # that it dlopen()'s libraries in paths removed by shrinking RPATH.
   dontPatchELF = true;
 
-  src = requireFile {
+  src = fetchurl {
     name = "draftSight.deb";
-    url = "https://www.3ds.com/?eID=3ds_brand_download&uid=41&pidDown=13426&L=0";
-    sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr";
+    url = "http://dl-ak.solidworks.com/nonsecure/draftsight/${version}/draftSight.deb";
+    sha256 = "05lrvml0zkzqg0sj6sj2h8h66hxdmsw5fg9fwz923r1y8j48qxdx";
   };
 
   libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
     dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
-    xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11
+    xkeyboard_config zlib libxslt libxml2 sqlite orc libX11
     libXcursor libXrandr libxcb libXi libSM libICE libXrender
     libXcomposite ];
 

From cf09900bbcca8f09a4af4927e3d6554647d695db Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Thu, 3 May 2018 16:58:32 +0200
Subject: [PATCH 1183/3370] xidlehook: init at 0.4.6

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

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
new file mode 100644
index 000000000000..a71531eebc5b
--- /dev/null
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -0,0 +1,32 @@
+{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }:
+
+rustPlatform.buildRustPackage rec {
+  name = "xidlehook-${version}";
+  version = "0.4.6";
+
+  src = fetchFromGitHub {
+    owner = "jD91mZM2";
+    repo = "xidlehook";
+    rev = version;
+
+    sha256 = "0h84ichm1v2wdmm4w1n7jr70yfb9hhi7kykvd99ppg00h1x9lr7w";
+  };
+
+  cargoSha256 = "0a1bl6fnfw6xy71q3b5zij52p9skylj1ivqj8my44bfsid2qfn7d";
+
+  buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ];
+  nativeBuildInputs = [ pkgconfig patchelf ];
+
+  postFixup = ''
+    RPATH="$(patchelf --print-rpath $out/bin/xidlehook)"
+    patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook
+  '';
+
+  meta = with lib; {
+    description = "xautolock rewrite in Rust, with a few extra features";
+    homepage = https://github.com/jD91mZM2/xidlehook;
+    license = licenses.mit;
+    maintainers = with maintainers; [ jD91mZM2 ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c4d182d2d3a..bd6e3086f432 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5770,6 +5770,8 @@ with pkgs;
 
   xiccd = callPackage ../tools/misc/xiccd { };
 
+  xidlehook = callPackage ../tools/X11/xidlehook {};
+
   xorriso = callPackage ../tools/cd-dvd/xorriso { };
 
   xpf = callPackage ../tools/text/xml/xpf {

From 17950abc787d00451b3e5dd5a15a8bcffd351a5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 6 May 2018 15:05:11 +0100
Subject: [PATCH 1184/3370] wllvm: 1.1.5 -> 1.2.0

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

diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index c78767e115a2..399a8e66860b 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,13 +1,13 @@
 { stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.1.5";
+  version = "1.2.0";
   pname = "wllvm";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "02lnilhqz7mq0w6mp574rmjxiszp1wyla16jqr89r0z9vjg2j9rv";
+    sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z";
   };
 
   meta = with stdenv.lib; {

From 71a8d0ca59a081299aa15391a04518a35ead0b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 6 May 2018 15:15:04 +0100
Subject: [PATCH 1185/3370] particl-core: replace utillinux with
 unixtools.hexdump

to make it platform agnostic
---
 pkgs/applications/altcoins/particl/particl-core.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index c9454963b22e..2524408429c3 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -1,6 +1,4 @@
 { stdenv
-, autoconf
-, automake
 , autoreconfHook
 , boost
 , db48
@@ -14,6 +12,7 @@
 , zeromq
 , zlib
 , withGui
+, unixtools
 }:
 
 with stdenv.lib;
@@ -28,9 +27,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
-  buildInputs = [ openssl db48 boost zlib
-                  miniupnpc libevent zeromq ]
-                  ++ optionals stdenv.isLinux [ utillinux ];
+  buildInputs = [
+    openssl db48 boost zlib miniupnpc libevent zeromq
+    unixtools.hexdump
+  ];
 
   configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 

From 716d877d0f8449f66ef7824460823711fb653aa7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 6 May 2018 17:10:35 +0100
Subject: [PATCH 1186/3370] gitea: 1.4.0 -> 1.4.1

---
 pkgs/applications/version-management/gitea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index da9ee9b40811..71b59ed4aef7 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "07fbcd134n7giwxpqli5hfywmi0vb8awgdh3gyiwyzhjwwzfrxkq";
+    sha256 = "1mid67c4021m7mi4ablx1w5v43831gzn8xpg8n30a4zmr70781wm";
   };
 
   patches = [ ./static-root-path.patch ];

From 472f21951a6e5bf4170594a5dc3c2616c7af316d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 6 May 2018 16:46:55 +0200
Subject: [PATCH 1187/3370] qt5.qtwebkit: Reduce log size to fix hydra build

This should fix the darwin build of qtwebkit.
---
 pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
index 6834b7ce87b6..d73bc370f990 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@@ -28,10 +28,15 @@ qtModule {
   preConfigure = ''
     QMAKEPATH="$PWD/Tools/qmake''${QMAKEPATH:+:}$QMAKEPATH"
     fixQtBuiltinPaths . '*.pr?'
+    # Fix hydra's "Log limit exceeded"
+    export qmakeFlags="$qmakeFlags CONFIG+=silent"
   '';
 
   NIX_CFLAGS_COMPILE =
-    [ "-Wno-expansion-to-defined" ] # with gcc7 this warning blows the log over Hydra's limit
+    # with gcc7 this warning blows the log over Hydra's limit
+    [ "-Wno-expansion-to-defined" ]
+    # with clang this warning blows the log over Hydra's limit
+    ++ optional stdenv.isDarwin "-Wno-inconsistent-missing-override"
     ++ optionals flashplayerFix
       [
         ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''

From 11096b2cfef32136132361fabeb38cd1baed8a11 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 May 2018 18:08:44 +0200
Subject: [PATCH 1188/3370] hackage2nix: disable failing Hydra builds

@gebner: hledger-diff no longer compiles
---
 .../configuration-hackage2nix.yaml            | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index c602d312a3bb..412c3bfd57ef 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2479,8 +2479,6 @@ package-maintainers:
     - streamproc
     - structured-haskell-mode
     - titlecase
-  gebner:
-    - hledger-diff
   gridaphobe:
     - ghc-srcspan-plugin
     - located-base
@@ -2740,6 +2738,7 @@ dont-distribute-packages:
   alerta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alex-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  alg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic-prelude:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3089,6 +3088,7 @@ dont-distribute-packages:
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-compat-batteries:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base-compat-migrate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-noprelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3168,6 +3168,7 @@ dont-distribute-packages:
   bindings-friso:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-gsl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-gts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-hamlib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-levmar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3294,6 +3295,7 @@ dont-distribute-packages:
   bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  buchhaltung:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3327,6 +3329,7 @@ dont-distribute-packages:
   c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   c2hsc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ca:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-bounds:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-cargs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3427,7 +3430,9 @@ dont-distribute-packages:
   categorical-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   category-traced:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  category:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   catnplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cautious-gen:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3693,6 +3698,7 @@ dont-distribute-packages:
   constrained-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint-manip:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constraint:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   consul-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3896,6 +3902,7 @@ dont-distribute-packages:
   data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  datafix:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   datetime-sb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3910,6 +3917,7 @@ dont-distribute-packages:
   dbmigrations-sqlite:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dbus-hslogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbus-th-introspection:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4318,6 +4326,7 @@ dont-distribute-packages:
   exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expiring-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   explain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-determinant:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   explicit-iomodes-bytestring:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4326,6 +4335,7 @@ dont-distribute-packages:
   explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions-z3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4957,6 +4967,7 @@ dont-distribute-packages:
   gore-and-ash-actor:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-async:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-demo:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gore-and-ash-glfw:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-lambdacube:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-network:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gore-and-ash-sdl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5019,6 +5030,7 @@ dont-distribute-packages:
   gridfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridland:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  groot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gross:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-converters:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5037,6 +5049,7 @@ dont-distribute-packages:
   gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-sni-tray:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-strut:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5594,6 +5607,7 @@ dont-distribute-packages:
   HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-diff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-irr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5619,7 +5633,9 @@ dont-distribute-packages:
   hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nlopt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-sparse:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hmatrix-sundials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5720,6 +5736,7 @@ dont-distribute-packages:
   hpqtypes-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpqtypes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hprotoc-fork:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hprotoc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps-cairo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps-kmeans:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6088,6 +6105,7 @@ dont-distribute-packages:
   instant-hashable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-zipper:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   instapaper-sender:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  int-multimap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   integer-pure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6262,6 +6280,7 @@ dont-distribute-packages:
   katip-syslog:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kazura-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   kd-tree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6700,6 +6719,7 @@ dont-distribute-packages:
   mattermost-api-qc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   mattermost-api:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   maude:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  maxent-learner-hw-gui:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxsharing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   maybench:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6766,6 +6786,7 @@ dont-distribute-packages:
   MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microaeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   microlens-each:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   micrologger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6962,6 +6983,7 @@ dont-distribute-packages:
   mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mxnet-dataiter:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-nn:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mxnet-nnvm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7279,6 +7301,7 @@ dont-distribute-packages:
   pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pang-a-lambda:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pangraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   panpipe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pansite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-export:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7394,6 +7417,7 @@ dont-distribute-packages:
   pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   phaser:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  phoityne:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-metadata:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-numbers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-push:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7410,6 +7434,7 @@ dont-distribute-packages:
   picoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   picosat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pictikz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pier:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pinchot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7570,6 +7595,7 @@ dont-distribute-packages:
   preprocessor:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   press:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pretty-relative-time:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   primesieve:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7597,6 +7623,7 @@ dont-distribute-packages:
   procrastinating-variable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   procstat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   producer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  product:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   profiteur:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7666,6 +7693,7 @@ dont-distribute-packages:
   puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pvd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PyF:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pyffi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pyfi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   python-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7746,6 +7774,7 @@ dont-distribute-packages:
   rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-access-list:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  random-class:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-eff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8514,6 +8543,8 @@ dont-distribute-packages:
   stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-bump:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run-auto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8587,6 +8618,7 @@ dont-distribute-packages:
   stream-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-base64:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-benchmarks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-concurrency:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-eversion:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8784,6 +8816,7 @@ dont-distribute-packages:
   termplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tersmu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-sandbox:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9015,6 +9048,7 @@ dont-distribute-packages:
   twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  txt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   txtblk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tyfam-witnesses:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9133,6 +9167,7 @@ dont-distribute-packages:
   utc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  util:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   uu-options:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   uuid-aeson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9206,6 +9241,7 @@ dont-distribute-packages:
   vk-aws-route53:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vpq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vrpn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]

From fe95c5c64f9eb8a8766a6ea1ddcf69ca9436fb46 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 May 2018 02:30:40 +0200
Subject: [PATCH 1189/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/d2c0010babe227d411d0f5c207ae391c5b56b5e6.
---
 .../haskell-modules/hackage-packages.nix      | 1017 +++++++++++++----
 1 file changed, 797 insertions(+), 220 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e9d076343f82..f0b8c3d63168 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15223,6 +15223,7 @@ self: {
        ];
        description = "Quasiquotations for a python like interpolated string formater";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QIO" = callPackage
@@ -19370,12 +19371,12 @@ self: {
          shell32 = null; shfolder = null; shlwapi = null; user32 = null; 
          winmm = null;};
 
-  "Win32_2_7_0_0" = callPackage
+  "Win32_2_8_0_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "Win32";
-       version = "2.7.0.0";
-       sha256 = "1583c2x208bpwgvk0gyy2931604vikx57kyiiaxf7mp8shh13fhi";
+       version = "2.8.0.0";
+       sha256 = "0ppvpf2zx6547bqx7ysbq9ld99hf1v9rfa9s4f57hkn758l9ldm4";
        homepage = "https://github.com/haskell/win32";
        description = "A binding to Windows Win32 API";
        license = stdenv.lib.licenses.bsd3;
@@ -19800,6 +19801,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) xinput;};
 
+  "XML" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, smallcheck, tasty
+     , tasty-smallcheck, txt, util, vector
+     }:
+     mkDerivation {
+       pname = "XML";
+       version = "0.0.0.0";
+       sha256 = "1arlnyzj3zdzqrsr9lhicx2y1ag00cgf6jzn6nyxa7d7avp42025";
+       libraryHaskellDepends = [
+         base base-unicode-symbols txt util vector
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Extensible Markup Language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "XMLParser" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -23476,8 +23493,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-distributed";
-       version = "1.3";
-       sha256 = "1sm56b6z8ajkap3nlcrsl592m40vgb5zmhhnc8al6arrra2j21pc";
+       version = "1.4";
+       sha256 = "0fpl6xa32w4f1bl4l8b5pwagm68k42nn45w7d1hsh9ffy4bfsq0k";
        libraryHaskellDepends = [
          aivika aivika-transformers array base binary containers
          distributed-process exceptions mtl mwc-random random stm time
@@ -23820,6 +23837,7 @@ self: {
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alga" = callPackage
@@ -27269,6 +27287,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ansi-terminal_0_8_0_3" = callPackage
+    ({ mkDerivation, base, colour }:
+     mkDerivation {
+       pname = "ansi-terminal";
+       version = "0.8.0.3";
+       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base colour ];
+       homepage = "https://github.com/feuerbach/ansi-terminal";
+       description = "Simple ANSI terminal support, with Windows compatibility";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ansi-terminal-game" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, bytestring, cereal
      , clock, hspec, linebreak, split, terminal-size, timers-tick
@@ -30181,8 +30214,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.6.0";
-       sha256 = "1yyc5cp10zqhmi2hay0hiz526lxfcn56g13ikfh25pqzayrxnd8b";
+       version = "0.4.7.0";
+       sha256 = "0n9a0bkf525gw1fcik6gmaarf5l7zmn29whiyrcp3dv7afqdfhwa";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -30509,8 +30542,10 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.10.0.20";
-       sha256 = "0k73jcj2za79wvb6nki1k02d6rj7zrnl0vz494ajh4d96gwdwacp";
+       version = "2.10.1.5";
+       sha256 = "14y4mpk6hkqvw8jh49idj9gx2wxcy2ppz00abny6fsbw6iff4xrs";
+       revision = "1";
+       editedCabalFile = "0ff0nslsi5b4g8gp63x6js3c026ajgfamd8pg2k1aygwx8x3zqk9";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -30551,21 +30586,21 @@ self: {
 
   "ats-storable" = callPackage
     ({ mkDerivation, base, bytestring, composition-prelude, hspec
-     , microlens, microlens-th, text
+     , storable, text
      }:
      mkDerivation {
        pname = "ats-storable";
-       version = "0.3.0.1";
-       sha256 = "1apzmyq9a4hjn9d0fz7pxvxflq61kp26fa6gz3c50pdjby55zhns";
+       version = "0.3.0.3";
+       sha256 = "1a9id432vhvr3n69m1f7iyc899nc2wa4w8jpa7s7aqkixw2vqlr2";
        libraryHaskellDepends = [
-         base bytestring composition-prelude microlens microlens-th text
+         base bytestring composition-prelude text
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com//ats-generic#readme";
+       testSystemDepends = [ storable ];
        description = "Marshal ATS types into Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {storable = null;};
 
   "attempt" = callPackage
     ({ mkDerivation, base, failure }:
@@ -30927,6 +30962,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec-varword" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring
+     , bytestring-builder-varword, hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "attoparsec-varword";
+       version = "0.1.0.0";
+       sha256 = "1rrc4pqi7slsq2rhiasid7m7fm489vd851jvakb8z5z64mrxc409";
+       libraryHaskellDepends = [ attoparsec base ];
+       testHaskellDepends = [
+         attoparsec base bytestring bytestring-builder-varword hspec
+         QuickCheck
+       ];
+       homepage = "https://github.com/concert/hs-varword#readme";
+       description = "Variable-length integer decoding for Attoparsec";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "attosplit" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring }:
      mkDerivation {
@@ -31542,8 +31595,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.0.0";
-       sha256 = "0sfi6jc7pcigpwgkfqq9ckwm7bzhfc9kf2rhznrrsy9qw5i7xrll";
+       version = "0.3.0.1";
+       sha256 = "1day4zpypk1jirkn0zfvmfwy0pnsvggibi9k2gk23kqnn904sv77";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -33098,6 +33151,7 @@ self: {
        homepage = "https://github.com/bergmark/base-compat-migrate#readme";
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-encoding" = callPackage
@@ -35779,6 +35833,7 @@ self: {
        homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) hamlib;};
 
   "bindings-hdf5" = callPackage
@@ -37432,6 +37487,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "blank-canvas_0_6_2" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, base64-bytestring
+     , bytestring, colour, containers, data-default-class, directory
+     , http-types, kansas-comet, mime-types, process, scotty, semigroups
+     , shake, stm, text, text-show, time, transformers, unix, vector
+     , wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "blank-canvas";
+       version = "0.6.2";
+       sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84";
+       revision = "4";
+       editedCabalFile = "03l1k5b58b9p8ajm2aiq5xfryj45zipzv04mxc2qnl5xk9jz0iqw";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base base-compat base64-bytestring bytestring colour
+         containers data-default-class http-types kansas-comet mime-types
+         scotty semigroups stm text text-show transformers vector wai
+         wai-extra warp
+       ];
+       testHaskellDepends = [
+         base containers directory process shake stm text time unix vector
+       ];
+       homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
+       description = "HTML5 Canvas Graphics Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blank-canvas" = callPackage
     ({ mkDerivation, aeson, base, base-compat-batteries
      , base64-bytestring, bytestring, colour, containers
@@ -39836,6 +39920,7 @@ self: {
        homepage = "http://johannesgerer.com/buchhaltung";
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer" = callPackage
@@ -40565,6 +40650,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bytestring-builder-varword" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-varword, base, bytestring
+     , hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "bytestring-builder-varword";
+       version = "0.1.0.0";
+       sha256 = "1lpcy47z3jf023iv0vdwsy5l2bsjb4i8vbnzjk9hzg0n9866f2g1";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         attoparsec attoparsec-varword base bytestring hspec QuickCheck
+       ];
+       homepage = "https://github.com/concert/hs-varword#readme";
+       description = "Variable-length integer encoding";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "bytestring-class" = callPackage
     ({ mkDerivation, base, bytestring, utf8-string }:
      mkDerivation {
@@ -41207,6 +41309,7 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Cellular Automata";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cab" = callPackage
@@ -44002,6 +44105,7 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Categorical types and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "category-extras" = callPackage
@@ -44119,6 +44223,7 @@ self: {
        ];
        homepage = "https://github.com/Nickske666/cautious#readme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cayley-client" = callPackage
@@ -44291,8 +44396,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.0.2";
-       sha256 = "1yd1ahf2ri31lwcs0mvhn6wgpglgk3vsf5698qw6asm8rl1gcaz9";
+       version = "0.1.1.0";
+       sha256 = "1pgarp84p757jyx71qma64g84fcyg6rrhrmrh4c1sszykqjnw7g0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44836,22 +44941,23 @@ self: {
   "cgrep" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, async, base
      , bytestring, cmdargs, containers, directory, dlist, either
-     , filepath, ghc-prim, mtl, process, regex-base, regex-pcre
-     , regex-posix, safe, split, stm, stringsearch, transformers
-     , unicode-show, unix-compat, unordered-containers, utf8-string
-     , yaml
+     , exceptions, filepath, ghc-prim, mtl, process, regex-base
+     , regex-pcre, regex-posix, safe, split, stm, stringsearch
+     , transformers, unicode-show, unix-compat, unordered-containers
+     , utf8-string, yaml
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.24";
-       sha256 = "0clnnhr5srrl3z2crfrs7csihrgcq5p9d9vgqbgxsf741jnfmhcx";
+       version = "6.6.25";
+       sha256 = "0cary2b5jg8151n48a4vij32g68mrql791mhw43v44wvhlag8plw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-terminal array async base bytestring cmdargs containers
-         directory dlist either filepath ghc-prim mtl process regex-base
-         regex-pcre regex-posix safe split stm stringsearch transformers
-         unicode-show unix-compat unordered-containers utf8-string yaml
+         directory dlist either exceptions filepath ghc-prim mtl process
+         regex-base regex-pcre regex-posix safe split stm stringsearch
+         transformers unicode-show unix-compat unordered-containers
+         utf8-string yaml
        ];
        homepage = "http://awgn.github.io/cgrep/";
        description = "Command line tool";
@@ -50918,8 +51024,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "concurrent-utilities";
-       version = "0.2.0.1";
-       sha256 = "168prywiw4fhh2syzj452pyqj8byy4sb929mgkv5srgwkzqr6g0f";
+       version = "0.2.0.2";
+       sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi";
        libraryHaskellDepends = [ base ];
        homepage = "-";
        description = "More utilities and broad-used datastructures for concurrency";
@@ -52126,6 +52232,7 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Reified constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constraint-classes" = callPackage
@@ -52190,12 +52297,12 @@ self: {
      }) {};
 
   "constrictor" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "constrictor";
-       version = "0.1.1.0";
-       sha256 = "0vid1m5lsmpdx9bpc78ad3nk720z62chd0j9rx03laiz2fjzx2bh";
-       libraryHaskellDepends = [ base transformers ];
+       version = "0.1.1.1";
+       sha256 = "0rw36xbrrqm40rqacl8zps7hm424nqwkhxr82c98b16n182zvnan";
+       libraryHaskellDepends = [ base ghc-prim transformers ];
        homepage = "https://github.com/chessai/constrictor.git";
        description = "strict versions of many things in base";
        license = stdenv.lib.licenses.mit;
@@ -52503,8 +52610,8 @@ self: {
     ({ mkDerivation, base, criterion, hspec, recursion-schemes }:
      mkDerivation {
        pname = "continued-fraction";
-       version = "0.1.0.8";
-       sha256 = "1izjdvm65zj960dcgg8xamg6ysfhn04qjxb9q7mpgzg8yi6f326c";
+       version = "0.1.0.9";
+       sha256 = "1831a093wnbf7kvplsp59xkdhj0g8wva08ixf9w12x6vl0yyj6sb";
        libraryHaskellDepends = [ base recursion-schemes ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -56298,21 +56405,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "curl-runnings_0_3_0" = callPackage
+  "curl-runnings_0_6_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , case-insensitive, cmdargs, directory, hspec, hspec-expectations
-     , http-conduit, http-types, text, unordered-containers, vector
-     , yaml
+     , http-conduit, http-types, megaparsec, text, unordered-containers
+     , vector, yaml
      }:
      mkDerivation {
        pname = "curl-runnings";
-       version = "0.3.0";
-       sha256 = "0bcapr5kcwlc65bkg6w3aq69jzrb2rydkw13v99dcf9fn43kwcfj";
+       version = "0.6.0";
+       sha256 = "06dcxwhmzsinmay63m9wnsjsy1cgwyms64c0jicndnc3nhbl0824";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring case-insensitive directory hspec
-         hspec-expectations http-conduit http-types text
+         hspec-expectations http-conduit http-types megaparsec text
          unordered-containers vector yaml
        ];
        executableHaskellDepends = [ base cmdargs text ];
@@ -57886,14 +57993,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse_3_0_0_0" = callPackage
+  "data-diverse_3_1_0_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
      , hspec, tagged
      }:
      mkDerivation {
        pname = "data-diverse";
-       version = "3.0.0.0";
-       sha256 = "1sxv9pyggdpwba0771vpvrawnycjrnvpayq0fjf7ly57mrdi3zd0";
+       version = "3.1.0.0";
+       sha256 = "0jg8g8zp8s14qalrmqa3faspg9kfifzdv0mi8a25xmqgi6rz64aq";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim tagged
        ];
@@ -57924,14 +58031,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse-lens_3_1_0_0" = callPackage
+  "data-diverse-lens_3_1_1_0" = callPackage
     ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec
      , lens, profunctors, tagged
      }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "3.1.0.0";
-       sha256 = "0g1cnn1kw36ac68wm8qmd8pdzjpl4xcil7shailxwawldi52v549";
+       version = "3.1.1.0";
+       sha256 = "1ynw9j8a92ny8327i0r037swsc3rj3723dnlar77x640849nif0p";
        libraryHaskellDepends = [
          base data-diverse data-has generic-lens lens profunctors tagged
        ];
@@ -59177,6 +59284,7 @@ self: {
        homepage = "https://github.com/sgraf812/datafix";
        description = "Fixing data-flow problems";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dataflow" = callPackage
@@ -59683,6 +59791,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "dbus-hslogger" = callPackage
+    ({ mkDerivation, base, dbus, hslogger, optparse-applicative }:
+     mkDerivation {
+       pname = "dbus-hslogger";
+       version = "0.1.0.1";
+       sha256 = "0i2y69kagp53cmlb7p3y6ysr9k5wvfd0vcnpwsasyn1jpk6g80zi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base dbus hslogger ];
+       executableHaskellDepends = [
+         base dbus hslogger optparse-applicative
+       ];
+       homepage = "https://github.com/IvanMalison/dbus-hslogger#readme";
+       description = "Expose a dbus server to control hslogger";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dbus-qq" = callPackage
     ({ mkDerivation, base, containers, dbus, parsec, QuickCheck
      , template-haskell
@@ -60659,8 +60785,8 @@ self: {
     ({ mkDerivation, base, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.2.3";
-       sha256 = "0v3nr8svnsqgj4rmbki4f38fndq03gxghkwb9q6qjd9w2m2hx3y1";
+       version = "0.4.0.1";
+       sha256 = "1n2wr03bqpp2yfm1jl54b3xrq4q2dwdj0ijssk8hbk3mzr4pac00";
        libraryHaskellDepends = [ base foldl ];
        homepage = "https://github.com/metrix-ai/deferred-folds";
        description = "Abstractions over deferred folds";
@@ -61698,7 +61824,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_13_0" = callPackage
+  "dhall_1_13_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
      , containers, contravariant, cryptonite, deepseq, directory
      , exceptions, filepath, formatting, haskeline, http-client
@@ -61710,8 +61836,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.13.0";
-       sha256 = "1fn3yi2zv2l88jjapk0zhij247cy4yh0w07icyr41g341wx7gfv4";
+       version = "1.13.1";
+       sha256 = "1mjhxkdpw7blcdci6cmm3x2c9ascp7djc8c77dblfpzyqa3sqxf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -61932,8 +62058,8 @@ self: {
      }:
      mkDerivation {
        pname = "di";
-       version = "0.2";
-       sha256 = "1vmhd8zph5ai13n2cfrjaxcdifwqv7wiggqbfi5ifhancxwlfq7p";
+       version = "0.3";
+       sha256 = "1kwkr2lb4vii530sijlrll9nj1k93pixcqk4bn96877bzf5963wj";
        libraryHaskellDepends = [ base stm time transformers ];
        testHaskellDepends = [
          base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck
@@ -63467,6 +63593,8 @@ self: {
        pname = "directory";
        version = "1.3.2.2";
        sha256 = "0m4dhcz7d1y0y08hn8ny378ly67gqbx676srgardq6800w2iqhzj";
+       revision = "1";
+       editedCabalFile = "1qdpglb2xzgcm1yja9d9hvw75cg85wai292f7rb6h0hsjnhrans3";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -68137,8 +68265,8 @@ self: {
        pname = "ekg";
        version = "0.4.0.15";
        sha256 = "1k3d5kiqm034qs04k0pcisf4zbdmx2fcgl9a6c1lzzjw96zf6aj8";
-       revision = "1";
-       editedCabalFile = "05995gywwysmfhrvalvqnkvw7gh6z85jrb91a1knnvi0jwq4c6m3";
+       revision = "2";
+       editedCabalFile = "0dn8xysffy7pgz88h4h6lpjpl5n978dm3yxlzyxbk2k1byhzzx7d";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath network snap-core
@@ -68379,6 +68507,8 @@ self: {
        pname = "ekg-statsd";
        version = "0.2.3.0";
        sha256 = "05lakyb0sp6g8nziy6jzk2l19v2371cdnih6pp6myyj6iflx9smf";
+       revision = "1";
+       editedCabalFile = "1k4sndkjg1prvzhiii9gcgkx8zfkk9c4nf548x0hrbmj1laj8d62";
        libraryHaskellDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
@@ -71281,8 +71411,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.8.2.6";
-       sha256 = "1f3dmkrxjfj128pdkarrc6mka09jmh360bn6vgbp4qm2xv5hl16s";
+       version = "0.8.2.7";
+       sha256 = "0rqgb224v9zy2kkchk2v3zwpdwh805ff03j5y5vswmc0l52bkw7w";
        libraryHaskellDepends = [
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
@@ -71672,6 +71802,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exception-transformers_0_4_0_7" = callPackage
+    ({ mkDerivation, base, HUnit, stm, test-framework
+     , test-framework-hunit, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "exception-transformers";
+       version = "0.4.0.7";
+       sha256 = "1vzjy6mz6y9jacpwq2bax86nwzq9mk4b9y3r3r98l50r7pmn2nwj";
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit transformers
+         transformers-compat
+       ];
+       description = "Type classes and monads for unchecked extensible exceptions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exceptional" = callPackage
     ({ mkDerivation, base, exceptions }:
      mkDerivation {
@@ -72152,6 +72302,7 @@ self: {
        homepage = "https://github.com/metrix-ai/expiring-containers";
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expiring-mvar" = callPackage
@@ -72355,6 +72506,7 @@ self: {
        ];
        description = "Encode and Decode expressions from Z3 ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extcore" = callPackage
@@ -79627,6 +79779,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fuzzy-dates" = callPackage
+    ({ mkDerivation, base, hourglass, hspec, lens, parsec }:
+     mkDerivation {
+       pname = "fuzzy-dates";
+       version = "0.1.1.1";
+       sha256 = "1hanmwzr1g11am4z3r9wrkzfycvk76a03cg9bqpifidv7y9hcd73";
+       libraryHaskellDepends = [ base hourglass hspec lens parsec ];
+       testHaskellDepends = [ base hourglass hspec lens parsec ];
+       homepage = "https://github.com/ReedOei/fuzzy-dates#readme";
+       description = "Libary for parsing dates in strings in varied formats";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fuzzy-timings" = callPackage
     ({ mkDerivation, base, containers, glpk-hs, HUnit, mtl, QuickCheck
      , random, test-framework, test-framework-hunit
@@ -81456,14 +81621,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec_0_6_0_1" = callPackage
+  "genvalidity-hspec_0_6_0_2" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.6.0.1";
-       sha256 = "18srjw0c8li10nbnxwbnhrggkl9nhdfjy02jpxd6hpij345y3j47";
+       version = "0.6.0.2";
+       sha256 = "0l14vn5hddkvyzhch8l9abwh3naya27p9f6lz918zd8i5l5pd32n";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
          validity
@@ -81695,14 +81860,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity-property_0_2_0_0" = callPackage
+  "genvalidity-property_0_2_0_1" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-property";
-       version = "0.2.0.0";
-       sha256 = "10przvvqrmjyr9cmbna79kj15wjhi0r4j64qn5824gslyy7g39pa";
+       version = "0.2.0.1";
+       sha256 = "02ypm53llfdrqasji79bng3ybkjs8ak7klcrhkg15k6jgk0ca877";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -81851,15 +82016,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-unordered-containers_0_2_0_0" = callPackage
+  "genvalidity-unordered-containers_0_2_0_2" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
      , hspec, QuickCheck, unordered-containers, validity
      , validity-unordered-containers
      }:
      mkDerivation {
        pname = "genvalidity-unordered-containers";
-       version = "0.2.0.0";
-       sha256 = "1kfn6g3h33g215qy0iffhr35vd2np9nsf6634fjk40mbz1san0m8";
+       version = "0.2.0.2";
+       sha256 = "0sjs06qf0pk6xvgc38qayzfqk6wm1qgpx3yzglpkhdy809gl5pfa";
        libraryHaskellDepends = [
          base genvalidity hashable QuickCheck unordered-containers validity
          validity-unordered-containers
@@ -81893,14 +82058,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-uuid_0_1_0_0" = callPackage
+  "genvalidity-uuid_0_1_0_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, uuid, validity, validity-uuid
      }:
      mkDerivation {
        pname = "genvalidity-uuid";
-       version = "0.1.0.0";
-       sha256 = "1j4q3smhz812cfgsv6vmjgng068knd9v7xg0hkvx868wbndgk37h";
+       version = "0.1.0.1";
+       sha256 = "1ssihh980iz9kx2apygbw0r5qdb40hnvjkpsn2qw55r8d5hc4sa6";
        libraryHaskellDepends = [
          base genvalidity QuickCheck uuid validity validity-uuid
        ];
@@ -81933,14 +82098,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-vector_0_2_0_0" = callPackage
+  "genvalidity-vector_0_2_0_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, validity, validity-vector, vector
      }:
      mkDerivation {
        pname = "genvalidity-vector";
-       version = "0.2.0.0";
-       sha256 = "0ww3hzkzhblx8qp062vz74vwaqvv38l0sl0dwyxrqra68qglxr4f";
+       version = "0.2.0.1";
+       sha256 = "1xinffnzcaws7i6k0l3x89g6kzkg1vhiwkngh5ag69wvpzq3if7n";
        libraryHaskellDepends = [
          base genvalidity QuickCheck validity validity-vector vector
        ];
@@ -85481,6 +85646,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-webhooks_0_10_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "github-webhooks";
+       version = "0.10.0";
+       sha256 = "1pvif863yi6qxwjd43insjvrzizaz78b3kf8l13rmy3irjlqljh8";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptonite deepseq
+         deepseq-generics memory text time vector
+       ];
+       testHaskellDepends = [ aeson base bytestring hspec text vector ];
+       homepage = "https://github.com/onrock-eng/github-webhooks#readme";
+       description = "Aeson instances for GitHub Webhook payloads";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "githud" = callPackage
     ({ mkDerivation, base, mtl, parsec, process, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck, text, unix
@@ -89074,6 +89259,7 @@ self: {
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-glfw";
        description = "Core module for Gore&Ash engine for GLFW input events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash-lambdacube" = callPackage
@@ -90526,6 +90712,7 @@ self: {
        homepage = "https://github.com/alonsodomin/groot#readme";
        description = "Command line utility to manage AWS ECS resources";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gross" = callPackage
@@ -91135,20 +91322,22 @@ self: {
 
   "gtk-sni-tray" = callPackage
     ({ mkDerivation, base, bytestring, containers, dbus, directory
-     , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut
-     , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative
+     , enclosed-exceptions, filepath, gi-dbusmenugtk3, gi-gdk
+     , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi
+     , haskell-gi-base, hslogger, optparse-applicative
      , status-notifier-item, text, transformers, unix
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.1.0";
-       sha256 = "16wif6b94ipw49810jyjgl6h8mhx7bkz0pkl8ri6ir9ljp0mnvp0";
+       version = "0.1.2.0";
+       sha256 = "1imgna34fdsg2fwlxk5xb0dvw8sbqjk7qgvh1p3wc8q9yx8zl0qm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dbus directory gi-dbusmenugtk3 gi-gdk
-         gi-gdkpixbuf gi-glib gi-gtk gtk-strut haskell-gi haskell-gi-base
-         hslogger status-notifier-item text transformers unix
+         base bytestring containers dbus directory enclosed-exceptions
+         filepath gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk
+         gtk-strut haskell-gi haskell-gi-base hslogger status-notifier-item
+         text transformers unix
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [
@@ -91158,6 +91347,7 @@ self: {
        homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme";
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gtk-strut" = callPackage
@@ -91627,20 +91817,23 @@ self: {
      }) {};
 
   "h-gpgme" = callPackage
-    ({ mkDerivation, base, bindings-gpgme, bytestring, either, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, time
+    ({ mkDerivation, base, bindings-gpgme, bytestring, data-default
+     , directory, email-validate, exceptions, filepath, HUnit
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, temporary, time
      , transformers, unix
      }:
      mkDerivation {
        pname = "h-gpgme";
-       version = "0.4.0.0";
-       sha256 = "0v85bz57jn265v5pnr0xjw838qmiy7v6vinvvd6m7pj5zls5hx9m";
+       version = "0.5.0.0";
+       sha256 = "0fvkj7cz7nfz52a2zccngb8gbs8p94whvgccvnxpwmkg90m45mfp";
        libraryHaskellDepends = [
-         base bindings-gpgme bytestring either time unix
+         base bindings-gpgme bytestring data-default email-validate time
+         transformers unix
        ];
        testHaskellDepends = [
-         base bindings-gpgme bytestring either HUnit QuickCheck tasty
-         tasty-hunit tasty-quickcheck time transformers unix
+         base bindings-gpgme bytestring data-default directory
+         email-validate exceptions filepath HUnit QuickCheck tasty
+         tasty-hunit tasty-quickcheck temporary time transformers unix
        ];
        homepage = "https://github.com/rethab/h-gpgme";
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
@@ -97440,7 +97633,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_2_1_0" = callPackage
+  "haskell-lsp_0_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
      , lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -97448,8 +97641,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.2.1.0";
-       sha256 = "09wv2ic66lc03pndpx4xsmmv3zxwram5i82483j340avm2rp06c0";
+       version = "0.2.2.0";
+       sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97499,8 +97692,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.2.1.0";
-       sha256 = "0byslqf8qw7rc1kva3inm8bsm9z12h19y3b3yzgwz1hlkshjl2d0";
+       version = "0.2.2.0";
+       sha256 = "0wchy8qrd450s90j6d26psznrd3n245lvn01qxa42l5akljmlymx";
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath hashable lens
          network-uri text unordered-containers
@@ -104823,6 +105016,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hint_0_8_0" = callPackage
+    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
+     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix
+     }:
+     mkDerivation {
+       pname = "hint";
+       version = "0.8.0";
+       sha256 = "0h8wan0hb16m1gcil1csaay9f9f1pq3kfgbzfsfpjszmr1i2sw1f";
+       libraryHaskellDepends = [
+         base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+         random unix
+       ];
+       testHaskellDepends = [
+         base directory exceptions extensible-exceptions filepath HUnit unix
+       ];
+       homepage = "https://github.com/mvdan/hint";
+       description = "Runtime Haskell interpreter (GHC API wrapper)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hint-server" = callPackage
     ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl
      }:
@@ -104839,6 +105053,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hinter" = callPackage
+    ({ mkDerivation, base, directory, exceptions, extensible-exceptions
+     , filepath, ghc, ghc-boot, ghc-paths, HUnit, mtl, random, unix
+     }:
+     mkDerivation {
+       pname = "hinter";
+       version = "0.1.0.0";
+       sha256 = "0r790y7j64y79rqg7ip4dk5a8pbpryisp008lcmswzc0si35jfgl";
+       libraryHaskellDepends = [
+         base directory exceptions filepath ghc ghc-boot ghc-paths mtl
+         random unix
+       ];
+       testHaskellDepends = [
+         base directory exceptions extensible-exceptions filepath HUnit unix
+       ];
+       homepage = "https://github.com/strake/hint.hs";
+       description = "Runtime Haskell interpreter (GHC API wrapper)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hinterface" = callPackage
     ({ mkDerivation, array, async, base, binary, bytestring, containers
      , cryptonite, exceptions, hspec, lifted-async, lifted-base, memory
@@ -105708,7 +105942,7 @@ self: {
        homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ gebner ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-iadd" = callPackage
@@ -106002,8 +106236,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.4";
-       sha256 = "01qgnljgsd331zx9df2diijnfvy78p1j6ysqqq317v66yxpz6vlh";
+       version = "2.1.5";
+       sha256 = "00kib9b80s0bhdv267dgybl68knmzzmq7n0maygzc0kxc9k1bwj1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -106260,6 +106494,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hmatrix-backprop_0_1_2_1" = callPackage
+    ({ mkDerivation, backprop, base, finite-typelits
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
+     , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
+     , vector, vector-sized
+     }:
+     mkDerivation {
+       pname = "hmatrix-backprop";
+       version = "0.1.2.1";
+       sha256 = "0qcm2hkdh50xgvxhs6nr303h0gs1x9apiklgnk8xjzgibsy8vb1n";
+       libraryHaskellDepends = [
+         backprop base finite-typelits ghc-typelits-knownnat
+         ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens
+         vector vector-sized
+       ];
+       testHaskellDepends = [
+         backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
+         microlens microlens-platform vector-sized
+       ];
+       homepage = "https://github.com/mstksg/hmatrix-backprop#readme";
+       description = "hmatrix operations lifted for backprop";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hmatrix-banded" = callPackage
     ({ mkDerivation, base, hmatrix, liblapack, transformers }:
      mkDerivation {
@@ -106450,6 +106709,7 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Sparse linear solver";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mkl_core = null; mkl_intel = null; mkl_sequential = null;};
 
   "hmatrix-special" = callPackage
@@ -106515,6 +106775,7 @@ self: {
        homepage = "https://github.com/idontgetoutmuch/hmatrix/tree/sundials";
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sundials_arkode = null;};
 
   "hmatrix-svdlibc" = callPackage
@@ -109203,6 +109464,7 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hprotoc-fork" = callPackage
@@ -115230,6 +115492,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-streams_0_8_6_1" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
+     , base64-bytestring, blaze-builder, bytestring, Cabal
+     , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec
+     , hspec-expectations, http-common, HUnit, io-streams, lifted-base
+     , mtl, network, network-uri, openssl-streams, snap-core
+     , snap-server, system-fileio, system-filepath, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "http-streams";
+       version = "0.8.6.1";
+       sha256 = "18vxd35n7s3z4gjvad94bknc8z1w9d7ccgphnhsxlz5cackizmxq";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring blaze-builder bytestring
+         case-insensitive directory HsOpenSSL http-common io-streams mtl
+         network network-uri openssl-streams text transformers
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
+         bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
+         hspec-expectations http-common HUnit io-streams lifted-base mtl
+         network network-uri openssl-streams snap-core snap-server
+         system-fileio system-filepath text transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/afcowie/http-streams/";
+       description = "An HTTP client using io-streams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-test" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client, lens
      , lens-aeson, mtl, tasty, tasty-hunit, text, time, wreq
@@ -116569,7 +116865,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_12_0_0" = callPackage
+  "hw-rankselect_0_12_0_1" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
@@ -116577,8 +116873,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.12.0.0";
-       sha256 = "1yp9fmxk55ikhrrpkff4r1sgqadg4b0yfz2w1xardxb3n09n4xpa";
+       version = "0.12.0.1";
+       sha256 = "0jg27cpdw341gr1mjnqm5rq66q84q1rzwa5bp8czzws71m5kpfpy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120924,18 +121220,24 @@ self: {
      }) {};
 
   "int-multimap" = callPackage
-    ({ mkDerivation, base, containers, hashable, unordered-containers
+    ({ mkDerivation, base, containers, hashable, tasty, tasty-hunit
+     , tasty-quickcheck, unordered-containers
      }:
      mkDerivation {
        pname = "int-multimap";
-       version = "0.2";
-       sha256 = "17hwqly7v5224fddan9nkywv4pp478nby7iswaj32x27qwn9p11f";
+       version = "0.2.1";
+       sha256 = "080ypcd99pvw0wsrydz6hzd9hrr18v4kcb3wihz6v8ylfn08d6ci";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
+       testHaskellDepends = [
+         base containers hashable tasty tasty-hunit tasty-quickcheck
+         unordered-containers
+       ];
        homepage = "https://github.com/metrix-ai/int-multimap";
        description = "A data structure that associates each Int key with a set of values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integer-gmp_1_0_2_0" = callPackage
@@ -126520,6 +126822,7 @@ self: {
        homepage = "http://github.com/asakamirai/kazura-queue";
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kbq-gu" = callPackage
@@ -132637,6 +132940,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lift-read-show" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "lift-read-show";
+       version = "0.1.0.0";
+       sha256 = "0sp725nflvqzxvhycjj1v9j46y4cx1vvbr9k6pfwz585n35gs1a0";
+       libraryHaskellDepends = [ base ];
+       description = "Helper methods to define `Read1`, `Read2`, `Show1`, `Show2` instances";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lifted-async" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
      , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
@@ -134599,7 +134913,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {llvm-config = null;};
 
-  "llvm-hs_6_0_0" = callPackage
+  "llvm-hs_6_1_1" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , containers, exceptions, llvm-config, llvm-hs-pure, mtl
      , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -134607,10 +134921,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs";
-       version = "6.0.0";
-       sha256 = "1hll3s40bbrzyylyfnh0w907cpkbxx6qn3a6wv7kfi107zfx2rgd";
-       revision = "1";
-       editedCabalFile = "1apyscxr48g37qw15wmqb98si8gcnx8cky6bj68ai3jfjfphbjly";
+       version = "6.1.1";
+       sha256 = "0vlp1rgddgavs4kg0s1qmny6mlx4rpz12ybcrqg6vmv68w1qyr5r";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -134629,22 +134941,22 @@ self: {
 
   "llvm-hs-pretty" = callPackage
     ({ mkDerivation, array, base, bytestring, directory, filepath
-     , llvm-hs, llvm-hs-pure, mtl, pretty-show, tasty, tasty-golden
-     , tasty-hspec, tasty-hunit, text, transformers, wl-pprint-text
+     , llvm-hs, llvm-hs-pure, mtl, tasty, tasty-golden, tasty-hspec
+     , tasty-hunit, text, transformers, wl-pprint-text
      }:
      mkDerivation {
        pname = "llvm-hs-pretty";
-       version = "0.2.0.0";
-       sha256 = "133kyksbp88q0wavp3wdjg69h9fpwi7nq626nvikdy46cf7lgklh";
+       version = "0.2.1.0";
+       sha256 = "1v8nz7c7wvvh29c48li10m12lj8y3yn5b8rs1b86y351s11vsag6";
        libraryHaskellDepends = [
          array base bytestring llvm-hs-pure text wl-pprint-text
        ];
        testHaskellDepends = [
-         base directory filepath llvm-hs llvm-hs-pure mtl pretty-show tasty
-         tasty-golden tasty-hspec tasty-hunit text transformers
+         base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden
+         tasty-hspec tasty-hunit text transformers
        ];
        homepage = "https://github.com/llvm-hs/llvm-hs-pretty";
-       description = "Pretty printer for LLVM IR";
+       description = "A pretty printer for LLVM IR";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -134671,24 +134983,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "llvm-hs-pure_6_0_0" = callPackage
+  "llvm-hs-pure_6_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, fail
-     , hspec, mtl, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, transformers, unordered-containers
+     , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "llvm-hs-pure";
-       version = "6.0.0";
-       sha256 = "005414p1jv5nyf3awiybksc1paf092a9070x23l2y6fvd9jhy0sl";
-       revision = "1";
-       editedCabalFile = "05idczj2c9iv3kb7fyfhc0ypfsmcjkf9n46w24ivarjbs8fykrb3";
+       version = "6.1.0";
+       sha256 = "12fivm5w4nz306p7w0bxsmgb2cnbkp06dyrdfi64vrsgm9kgbqmw";
        libraryHaskellDepends = [
          attoparsec base bytestring containers fail mtl template-haskell
          transformers unordered-containers
        ];
        testHaskellDepends = [
-         base bytestring containers hspec mtl tasty tasty-hunit
-         tasty-quickcheck text transformers unordered-containers
+         base containers mtl tasty tasty-hunit tasty-quickcheck transformers
        ];
        homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "Pure Haskell LLVM functionality (no FFI)";
@@ -135090,19 +135399,16 @@ self: {
      }) {};
 
   "locators" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
-     , hspec, hspec-expectations, HUnit, QuickCheck
+    ({ mkDerivation, base, bytestring, containers, cryptohash, hspec
+     , HUnit, QuickCheck
      }:
      mkDerivation {
        pname = "locators";
-       version = "0.2.4.3";
-       sha256 = "0wcp56hy8zs7sngspzywyq4j39y0pji0xwqj7x1i26rg77wi7xw4";
-       libraryHaskellDepends = [
-         base bytestring cereal containers cryptohash
-       ];
+       version = "0.2.4.4";
+       sha256 = "19csw13qbxxv7lr3blx856k2y21sidgpnv56dq45la3f4100jv9d";
+       libraryHaskellDepends = [ base bytestring containers cryptohash ];
        testHaskellDepends = [
-         base bytestring cereal containers cryptohash hspec
-         hspec-expectations HUnit QuickCheck
+         base bytestring containers cryptohash hspec HUnit QuickCheck
        ];
        description = "Human exchangable identifiers and locators";
        license = stdenv.lib.licenses.bsd3;
@@ -139482,17 +139788,17 @@ self: {
      , brick, brick-skylighting, bytestring, cheapskate, checkers
      , config-ini, connection, containers, directory, filepath, gitrev
      , hashable, Hclip, mattermost-api, mattermost-api-qc
-     , microlens-platform, mtl, process, quickcheck-text, semigroups
-     , skylighting-core, stm, stm-delay, strict, string-conversions
-     , tasty, tasty-hunit, tasty-quickcheck, temporary, text
-     , text-zipper, time, timezone-olson, timezone-series, transformers
-     , Unique, unix, unordered-containers, utf8-string, vector, vty
-     , word-wrap, xdg-basedir
+     , microlens-platform, mtl, process, quickcheck-text, random
+     , semigroups, skylighting-core, stm, stm-delay, strict
+     , string-conversions, tasty, tasty-hunit, tasty-quickcheck
+     , temporary, text, text-zipper, time, timezone-olson
+     , timezone-series, transformers, Unique, unix, unordered-containers
+     , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir
      }:
      mkDerivation {
        pname = "matterhorn";
-       version = "40900.0.1";
-       sha256 = "1ygnh27dv5hprb5fqqxwjxsf43ik784pwdagndn3sdiddy2k3yf7";
+       version = "40901.0.0";
+       sha256 = "1ra1ikivf5y17mzwjvfsvg1kz4438wllv2qwxzaigb9cirrz0n4r";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -139500,9 +139806,9 @@ self: {
          aeson aspell-pipe async base base-compat brick brick-skylighting
          bytestring cheapskate config-ini connection containers directory
          filepath gitrev hashable Hclip mattermost-api microlens-platform
-         mtl process semigroups skylighting-core stm stm-delay strict
+         mtl process random semigroups skylighting-core stm stm-delay strict
          temporary text text-zipper time timezone-olson timezone-series
-         transformers unix unordered-containers utf8-string vector vty
+         transformers unix unordered-containers utf8-string uuid vector vty
          word-wrap xdg-basedir
        ];
        testHaskellDepends = [
@@ -139511,8 +139817,8 @@ self: {
          mattermost-api mattermost-api-qc microlens-platform mtl process
          quickcheck-text semigroups stm strict string-conversions tasty
          tasty-hunit tasty-quickcheck text text-zipper time timezone-olson
-         timezone-series transformers Unique unordered-containers vector vty
-         xdg-basedir
+         timezone-series transformers Unique unordered-containers uuid
+         vector vty xdg-basedir
        ];
        description = "Terminal client for the Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
@@ -139648,6 +139954,7 @@ self: {
        homepage = "https://github.com/george-steel/maxent-learner";
        description = "GUI for maxent-learner-hw";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maximal-cliques" = callPackage
@@ -141195,6 +141502,7 @@ self: {
        ];
        description = "A tiny JSON library with light dependency footprint";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microbench" = callPackage
@@ -143298,8 +143606,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-classes";
-       version = "0.3.2.0";
-       sha256 = "0r6wfl7xd870ml1mysznih1yly9rnj869cpr30fjwy9dsybkbfwr";
+       version = "0.3.2.1";
+       sha256 = "0vclcwxy0qc9y1i3iw0ysymcvikn12mi5lfbarxykdhygmi1w5m5";
        libraryHaskellDepends = [
          base ghc-prim mmorph monad-control peano reflection transformers
          transformers-base transformers-compat
@@ -144118,6 +144426,8 @@ self: {
        pname = "monad-ste";
        version = "0.1.0.0";
        sha256 = "0yqkx7rlrfms7wiymb41y5nxh8fyi4049729iamwablx6hdpsrw6";
+       revision = "1";
+       editedCabalFile = "17xfha8zn0snlqwi8cr44my3d1zbyvhh83qlmb747dblhmj1rdi1";
        libraryHaskellDepends = [ base exceptions ghc-prim primitive ];
        testHaskellDepends = [ base hspec HUnit ];
        homepage = "http://github.com/cartazio/monad-ste";
@@ -144696,6 +145006,38 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "mongoDB_2_4_0_0" = callPackage
+    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
+     , binary, bson, bytestring, conduit, conduit-extra, containers
+     , criterion, cryptohash, data-default-class, hashtables, hspec
+     , lifted-base, monad-control, mtl, network, nonce, old-locale
+     , parsec, pureMD5, random, random-shuffle, resourcet, stm, tagged
+     , text, time, tls, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "mongoDB";
+       version = "2.4.0.0";
+       sha256 = "06g7mvazsymbyzm1zhsyfpbmhvlizidb4lp5l6axfw2wh90h5f7x";
+       libraryHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring conduit conduit-extra containers cryptohash
+         data-default-class hashtables lifted-base monad-control mtl network
+         nonce parsec pureMD5 random random-shuffle resourcet stm tagged
+         text time tls transformers transformers-base
+       ];
+       testHaskellDepends = [ base hspec mtl old-locale text time ];
+       benchmarkHaskellDepends = [
+         array base base16-bytestring base64-bytestring binary bson
+         bytestring containers criterion cryptohash data-default-class
+         hashtables lifted-base monad-control mtl network nonce parsec
+         random random-shuffle stm text transformers-base
+       ];
+       homepage = "https://github.com/mongodb-haskell/mongodb";
+       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mongodb-queue" = callPackage
     ({ mkDerivation, base, data-default, hspec, lifted-base
      , monad-control, mongoDB, network, text, transformers
@@ -146615,6 +146957,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "multivector" = callPackage
+    ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck, Vector
+     , vector
+     }:
+     mkDerivation {
+       pname = "multivector";
+       version = "0.1.0.0";
+       sha256 = "183i59ri20fci2f2w4algmr8crz6q2aj1yirhgwjilkj3f4h6h4d";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [
+         base smallcheck tasty tasty-smallcheck Vector
+       ];
+       description = "Vectors of packed tuples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {Vector = null;};
+
   "muon" = callPackage
     ({ mkDerivation, base, blaze-html, ConfigFile, directory, Glob
      , happstack-server, HStringTemplate, markdown, MissingH, process
@@ -147340,6 +147700,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mxnet;};
 
+  "mxnet-dataiter" = callPackage
+    ({ mkDerivation, base, conduit, conduit-combinators, hspec, mxnet
+     , mxnet-nn, streaming, template-haskell
+     }:
+     mkDerivation {
+       pname = "mxnet-dataiter";
+       version = "0.1.0.0";
+       sha256 = "1cicxgasx0s840vvkc6n6v6rsrr8rk9jhpqh96kiy6dk0m4k02s9";
+       libraryHaskellDepends = [
+         base conduit conduit-combinators mxnet mxnet-nn streaming
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec mxnet streaming ];
+       homepage = "https://github.com/pierric/mxnet-dataiter#readme";
+       description = "mxnet dataiters";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mxnet-examples" = callPackage
     ({ mkDerivation, base, mxnet }:
      mkDerivation {
@@ -147359,16 +147738,17 @@ self: {
     ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
      , exceptions, ghc-prim, lens, mmorph, mtl, mxnet, resourcet
      , streaming, streaming-bytestring, streaming-utils
-     , unordered-containers, vector
+     , transformers-base, unordered-containers, vector
      }:
      mkDerivation {
        pname = "mxnet-nn";
-       version = "0.0.1.2";
-       sha256 = "0w5ri77ccav65dza3a4aanzvylcwscs4rf4yqylc12w03xh0rshp";
+       version = "0.0.1.3";
+       sha256 = "0693ca7rwai4s8i8vqbmmq3q50pd23svcnnnd1cxjbqxh6hgsbs1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base lens mtl mxnet resourcet unordered-containers vector
+         base lens mtl mxnet resourcet transformers-base
+         unordered-containers vector
        ];
        executableHaskellDepends = [
          attoparsec attoparsec-binary base bytestring exceptions ghc-prim
@@ -148860,8 +149240,8 @@ self: {
      }:
      mkDerivation {
        pname = "nest";
-       version = "0.0.1";
-       sha256 = "1ndd93z9yqa1slhb8wq3j5fr3rc2fna0cb5xqh9s3dynb966zqqk";
+       version = "0.0.2";
+       sha256 = "15q7c2ppw1ajnhglfawlc2a65k7d2cvcpav88y8kjqmp68hvgpic";
        libraryHaskellDepends = [
          base bytestring containers text transformers unix
        ];
@@ -156573,18 +156953,18 @@ self: {
 
   "pandoc-placetable" = callPackage
     ({ mkDerivation, aeson, base, bytestring, explicit-exception
-     , http-conduit, pandoc-types, spreadsheet, utf8-string
+     , http-conduit, pandoc-types, spreadsheet, text, utf8-string
      }:
      mkDerivation {
        pname = "pandoc-placetable";
-       version = "0.4.2";
-       sha256 = "0y8mz2jgnfzr8ib7w4bfwwdsljs3a2qpq3pxgvl2jwi7wdrcslai";
+       version = "0.5";
+       sha256 = "0kjlx2krgwf32y30cca09xnf1h3c91s0pzsv5xf7l8zw85jikxah";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          aeson base bytestring explicit-exception http-conduit pandoc-types
-         spreadsheet utf8-string
+         spreadsheet text utf8-string
        ];
        homepage = "https://github.com/mb21/pandoc-placetable";
        description = "Pandoc filter to include CSV files";
@@ -156786,6 +157166,7 @@ self: {
        homepage = "https://github.com/tuura/pangraph#readme";
        description = "A set of parsers for graph languages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "panhandle" = callPackage
@@ -158362,8 +158743,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.6.1.1";
-       sha256 = "153d2ij27jjsh0h014d1v3y06diri1njbmwzvq2kgwdbdqgkhf0y";
+       version = "0.7.0.0";
+       sha256 = "0w7k1s8nma0bp4cvacmpa3fxxslarcijpxvbvasjyik3inazqhsd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160954,6 +161335,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Deprecated - ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phoityne-vscode" = callPackage
@@ -161177,6 +161559,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pi-hoole" = callPackage
+    ({ mkDerivation, aeson, base, base58-bytestring, blaze-html
+     , bytestring, containers, directory, filepath, http-types
+     , megaparsec, optparse-generic, process, regex-pcre, shakespeare
+     , text, unix, wai, warp, yaml
+     }:
+     mkDerivation {
+       pname = "pi-hoole";
+       version = "0.2.0.0";
+       sha256 = "0qjs8b7ljybvklx9s5xmb9kg2mxlaqfwjf7d52c31y3f21d5q8q0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers directory filepath megaparsec process text
+       ];
+       executableHaskellDepends = [
+         aeson base base58-bytestring blaze-html bytestring containers
+         directory filepath http-types megaparsec optparse-generic
+         regex-pcre shakespeare text unix wai warp yaml
+       ];
+       testHaskellDepends = [ base ];
+       description = "Lightweight access control solution for the pijul vcs";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "pi-lcd" = callPackage
     ({ mkDerivation, base, bytestring, clock, deepseq, text, unix
      , unordered-containers
@@ -161396,6 +161803,7 @@ self: {
        homepage = "https://github.com/judah/pier#readme";
        description = "Yet another Haskell build system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "piet" = callPackage
@@ -162159,6 +162567,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pipes-group_1_0_10" = callPackage
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-group";
+       version = "1.0.10";
+       sha256 = "1j37sj0i7lkmk228lchp5kkvf86fiwrkikwwrfibpb6xwixjmlr8";
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
+       testHaskellDepends = [ base doctest lens-family-core ];
+       description = "Group streams into substreams";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , pipes
@@ -162981,8 +163406,8 @@ self: {
      }:
      mkDerivation {
        pname = "planb-token-introspection";
-       version = "0.1.1.0";
-       sha256 = "0b54sr1zvrczjxlx9xrb5zcy1kmybv396cigqvm652k9q16zifc5";
+       version = "0.1.2.0";
+       sha256 = "09b54m2m90g8ci6sxsgayvfxd9gmkwp2xw16gk1afxnha39lzwlq";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers http-client
          http-client-tls http-types mtl safe-exceptions text transformers
@@ -163714,6 +164139,8 @@ self: {
        pname = "pointfree-fancy";
        version = "1.1.1.7";
        sha256 = "1xw2p96ghclfxmc12kwxyh25r5k9k6h3zriaf38wz5d3j36npa7w";
+       revision = "1";
+       editedCabalFile = "0mdanymbifnxc85z3aixmn5v08kxa1fjazadrhc0jjf5y110sxc2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -165510,8 +165937,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki";
-       version = "0.11.2";
-       sha256 = "1c07q872d6k75cah1rfjw7wfam76fn8dc4x265v0xrngys6k9iwh";
+       version = "0.11.3";
+       sha256 = "134wy711qnkrwa9c78d7lv8vnc3b5a2dqyslzvs59xqx4csh61xj";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring directory foldl hashable
          potoki-core profunctors ptr text transformers unagi-chan
@@ -166331,6 +166758,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "preprocessor-tools_2_0_2" = callPackage
+    ({ mkDerivation, base, mtl, parsec, syb }:
+     mkDerivation {
+       pname = "preprocessor-tools";
+       version = "2.0.2";
+       sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp";
+       libraryHaskellDepends = [ base mtl parsec syb ];
+       homepage = "https://github.com/tov/preprocessor-tools-hs";
+       description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "presburger" = callPackage
     ({ mkDerivation, base, containers, pretty, QuickCheck }:
      mkDerivation {
@@ -166516,6 +166956,7 @@ self: {
        homepage = "https://github.com/NorfairKing/pretty-relative-time#readme";
        description = "Pretty relative time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-show" = callPackage
@@ -166798,6 +167239,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "prim-ref" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive, semigroups }:
+     mkDerivation {
+       pname = "prim-ref";
+       version = "0.1";
+       sha256 = "0fyjxpk4xllkh3r5b7fbb4sb6whxwbdm5lr9zn44qb9v4g0nx2d8";
+       libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
+       homepage = "https://github.com/andrewthad/prim-array#readme";
+       description = "Primitive byte array with type variable";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prim-spoon" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck
      , spoon
@@ -167532,6 +167985,7 @@ self: {
        libraryHaskellDepends = [ base category ];
        description = "Product category";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "product-isomorphic" = callPackage
@@ -170940,15 +171394,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-classes_0_4_9" = callPackage
+  "quickcheck-classes_0_4_10" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, primitive
      , QuickCheck, semigroupoids, semigroups, tagged, transformers
      , vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.9";
-       sha256 = "1m5qszs50hjfycds84arfcfqj7z4l622479bd2w55vin49mp12pn";
+       version = "0.4.10";
+       sha256 = "1x01746853wbfrfry807gva15wn02jcd0cfqbag7f5xm1fd8nlss";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
          semigroups tagged transformers
@@ -171189,6 +171643,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-state-machine-distributed" = callPackage
+    ({ mkDerivation, base, binary, containers, directory
+     , distributed-process, mtl, network-transport
+     , network-transport-tcp, QuickCheck, random, stm, strict, tasty
+     , tasty-quickcheck, temporary
+     }:
+     mkDerivation {
+       pname = "quickcheck-state-machine-distributed";
+       version = "0.0.1";
+       sha256 = "0451xx4c3698nk3c2jhq7xmc0nnaxlj422i30sh7cgyrfrbdw9wj";
+       libraryHaskellDepends = [
+         base binary containers distributed-process mtl network-transport
+         network-transport-tcp QuickCheck random stm
+       ];
+       testHaskellDepends = [
+         base binary containers directory distributed-process mtl
+         network-transport network-transport-tcp QuickCheck random stm
+         strict tasty tasty-quickcheck temporary
+       ];
+       homepage = "https://github.com/advancedtelematic/quickcheck-state-machine-distributed#readme";
+       description = "Test monadic programs using state machine based models";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "quickcheck-string-random" = callPackage
     ({ mkDerivation, base, QuickCheck, string-random, tasty
      , tasty-quickcheck, text
@@ -172213,6 +172691,7 @@ self: {
        libraryHaskellDepends = [ base primitive transformers util ];
        description = "Class of random value generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-derive" = callPackage
@@ -173557,8 +174036,8 @@ self: {
     ({ mkDerivation, base, doctest, reactive-banana, stm, time }:
      mkDerivation {
        pname = "reactive-banana-automation";
-       version = "0.1.1";
-       sha256 = "0fn3frv0idgdg9faysri7x5nzrxrzhpy41s5nm6v8ckqcnzq7vvv";
+       version = "0.3.0";
+       sha256 = "1f752kmfmgdx9mhvzljm37vrn18jn7wgz0m4byl3v4npcv502cyr";
        libraryHaskellDepends = [ base reactive-banana stm time ];
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
@@ -174119,6 +174598,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "record-dot-preprocessor" = callPackage
+    ({ mkDerivation, base, extra, filepath }:
+     mkDerivation {
+       pname = "record-dot-preprocessor";
+       version = "0.1";
+       sha256 = "1py5bkwxwwq1jjsa16rmjm92hxnil0clim5579h5mizzq47fczrd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base extra filepath ];
+       homepage = "https://github.com/ndmitchell/record-dot-preprocessor#readme";
+       description = "Preprocessor to allow record.field syntax";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "record-gl" = callPackage
     ({ mkDerivation, base, base-prelude, containers, GLUtil, HUnit
      , linear, OpenGL, record, tagged, template-haskell, test-framework
@@ -180329,21 +180822,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "s3-signer_0_4_0_0" = callPackage
+  "s3-signer_0_5_0_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, byteable
      , bytestring, case-insensitive, cryptohash, http-types, time
      , utf8-string
      }:
      mkDerivation {
        pname = "s3-signer";
-       version = "0.4.0.0";
-       sha256 = "1s1l5zj4azbgl0p6w52498d6shc5c0yqnzrbjfz1hh45hh2182qf";
+       version = "0.5.0.0";
+       sha256 = "1r48j7ni8byzdi0girkj6lf2hp4q85ir2xnqpckzdxd0ppap2dnp";
        libraryHaskellDepends = [
          base base64-bytestring blaze-builder byteable bytestring
          case-insensitive cryptohash http-types time utf8-string
        ];
-       testHaskellDepends = [ base blaze-builder bytestring time ];
-       doHaddock = false;
+       testHaskellDepends = [
+         base base64-bytestring blaze-builder byteable bytestring
+         case-insensitive cryptohash http-types time utf8-string
+       ];
        homepage = "https://github.com/dmjio/s3-signer";
        description = "Pre-signed Amazon S3 URLs";
        license = stdenv.lib.licenses.bsd3;
@@ -183655,15 +184150,16 @@ self: {
 
   "semirings" = callPackage
     ({ mkDerivation, base, constrictor, containers, hashable
-     , integer-gmp, unordered-containers, vector
+     , integer-gmp, semigroups, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.1.1";
-       sha256 = "1vrvid3ix80vwmf7qmp5f1f97nyzkq4a01bxf62kpqlbri2m9mz3";
+       version = "0.1.2";
+       sha256 = "1fn1hbrnljgx8kdnmk0c01zi1r0pk59cildla9gb6bykqs4rwmws";
        libraryHaskellDepends = [
-         base constrictor containers hashable integer-gmp
-         unordered-containers vector
+         base constrictor containers hashable integer-gmp semigroups
+         transformers unordered-containers vector
        ];
        homepage = "http://github.com/chessai/semirings";
        description = "two monoids as one, in holy haskimony";
@@ -187151,8 +187647,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.8.0.2";
-       sha256 = "16gmyn1rbfx33dxxkyxrswa8cvjpiq3i2vm59hy4y9lag10nq9xn";
+       version = "1.8.0.4";
+       sha256 = "036clj4q6rwgzjc3abirir5yqrn78vnj7c5w8p9b82jkrlka8w6g";
        libraryHaskellDepends = [
          base binary dependency directory hashable hs2ats language-ats lens
          shake shake-ext text
@@ -187186,8 +187682,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.11.0.2";
-       sha256 = "1wmvk91gfmrd1cqj3k70h3lc2xypiqs2d2dh4xlq97fsqm2kmfmy";
+       version = "2.11.0.3";
+       sha256 = "0v5n7l3xx1a0y4vvrn0zi61pb3wd41pqh1g3vnq1dr12dhrrx1ac";
        libraryHaskellDepends = [
          base Cabal cdeps composition-prelude cpphs directory shake
          template-haskell
@@ -195465,6 +195961,7 @@ self: {
        homepage = "https://github.com/clintonmead/stack-lib#readme";
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-network" = callPackage
@@ -195507,6 +196004,7 @@ self: {
        homepage = "https://github.com/McGizzle/stack-network#readme";
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-prism" = callPackage
@@ -197817,6 +198315,7 @@ self: {
        ];
        description = "Streaming conversion from/to base64";
        license = stdenv.lib.licenses.cc0;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-benchmarks" = callPackage
@@ -201410,8 +201909,8 @@ self: {
     ({ mkDerivation, attoparsec, base, process, text }:
      mkDerivation {
        pname = "system-info";
-       version = "0.4.0.0";
-       sha256 = "1sl1m19ia5n8rws49596lipjzx5q3jn9yjqhjlfs4vvh9rc2dnkh";
+       version = "0.4.0.1";
+       sha256 = "1v18ds9k7vnvzghpyqkh1ixskf27cb94f9r696982h2vp373zh43";
        libraryHaskellDepends = [ attoparsec base process text ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/ChaosGroup/system-info";
@@ -201931,34 +202430,37 @@ self: {
 
   "taffybar" = callPackage
     ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers
-     , dbus, directory, dyre, either, enclosed-exceptions, filepath
-     , gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-gtk, glib, gtk-traymanager
-     , gtk3, haskell-gi-base, HStringTemplate, HTTP, mtl, multimap
-     , network, network-uri, old-locale, parsec, process, rate-limit
-     , safe, split, stm, text, time, time-locale-compat, time-units
-     , transformers, transformers-base, tuple, unix, utf8-string, X11
-     , xdg-basedir, xml, xml-helpers, xmonad, xmonad-contrib
+     , dbus, dbus-hslogger, directory, dyre, either, enclosed-exceptions
+     , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib
+     , gi-gtk, glib, gtk-sni-tray, gtk-strut, gtk-traymanager, gtk3
+     , haskell-gi, haskell-gi-base, hslogger, HStringTemplate, HTTP, mtl
+     , multimap, network, network-uri, old-locale, optparse-applicative
+     , parsec, process, rate-limit, regex-compat, safe, split
+     , status-notifier-item, stm, text, time, time-locale-compat
+     , time-units, transformers, transformers-base, tuple, unix
+     , utf8-string, X11, xdg-basedir, xml, xml-helpers, xmonad
+     , xmonad-contrib
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "1.0.2";
-       sha256 = "05061nfnp0m833z1hqz8q6v4gphal03w4prvpfb12vwvsvsvsin9";
-       revision = "1";
-       editedCabalFile = "02ip0c6fq3ra6zhhq2adxjx8j4w07x19zndkk0jj6jn6kj5qggf3";
+       version = "2.0.0";
+       sha256 = "1s3nqvsivi4wgi6hi7b3f83r75sl5qp0hsqr0cdwd7s8fqai3wia";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         alsa-mixer base cairo ConfigFile containers dbus directory dyre
-         either enclosed-exceptions filepath gi-gdk gi-gdkpixbuf gi-gdkx11
-         gi-gtk glib gtk-traymanager gtk3 haskell-gi-base HStringTemplate
-         HTTP mtl multimap network network-uri old-locale parsec process
-         rate-limit safe split stm text time time-locale-compat time-units
+         alsa-mixer base cairo ConfigFile containers dbus dbus-hslogger
+         directory dyre either enclosed-exceptions filepath gi-cairo gi-gdk
+         gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk glib gtk-sni-tray gtk-strut
+         gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger
+         HStringTemplate HTTP mtl multimap network network-uri old-locale
+         parsec process rate-limit regex-compat safe split
+         status-notifier-item stm text time time-locale-compat time-units
          transformers transformers-base tuple unix utf8-string X11
          xdg-basedir xml xml-helpers xmonad xmonad-contrib
        ];
-       executableHaskellDepends = [ base ];
-       homepage = "http://github.com/travitch/taffybar";
+       executableHaskellDepends = [ base hslogger optparse-applicative ];
+       homepage = "http://github.com/taffybar/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203769,16 +204271,16 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "teardown_0_4_1_0" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, gauge, rio, tasty
+  "teardown_0_5_0_0" = callPackage
+    ({ mkDerivation, base, gauge, prettyprinter, rio, tasty
      , tasty-hunit, typed-process, unliftio
      }:
      mkDerivation {
        pname = "teardown";
-       version = "0.4.1.0";
-       sha256 = "1w8yblzn0i8i03bfg97qgq4c6i6l2p04krvwg41q157rcgb91gq0";
+       version = "0.5.0.0";
+       sha256 = "0p1rjvl36gl4dqpvcjsb06jyiwsxg2qyha8rfdiddljb4ixw1sjh";
        libraryHaskellDepends = [
-         ansi-wl-pprint base rio typed-process unliftio
+         base prettyprinter rio typed-process unliftio
        ];
        testHaskellDepends = [
          base rio tasty tasty-hunit typed-process unliftio
@@ -204775,6 +205277,7 @@ self: {
        homepage = "http://mbays.freeshell.org/tersmu";
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-fixture" = callPackage
@@ -212608,6 +213111,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "txt" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, smallcheck, tasty
+     , tasty-smallcheck, utf8-string, util
+     }:
+     mkDerivation {
+       pname = "txt";
+       version = "0.0.2.1";
+       sha256 = "0cdng6qlskycpmr1yxvr25q5j876nji5iw3hlx2xb7n0rvk3ylh5";
+       libraryHaskellDepends = [
+         base bytestring deepseq utf8-string util
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "txt-sushi" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , parsec, regex-posix
@@ -216712,6 +217232,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "util-plus" = callPackage
@@ -217422,14 +217943,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-aeson_0_2_0_0" = callPackage
+  "validity-aeson_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, validity, validity-scientific
      , validity-text, validity-unordered-containers, validity-vector
      }:
      mkDerivation {
        pname = "validity-aeson";
-       version = "0.2.0.0";
-       sha256 = "01ck9kbclrjxbjb7rvr1y95cizbdq5lzdd0xfpbpaf4rfgjd3w56";
+       version = "0.2.0.1";
+       sha256 = "001smpck69y4bmrzrykjvjnrwjllny83kh1l1c2fyy4zzjw14lpy";
        libraryHaskellDepends = [
          aeson base validity validity-scientific validity-text
          validity-unordered-containers validity-vector
@@ -219408,6 +219929,28 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "voicebase" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, http-client
+     , http-client-openssl, json-autotype, lens, mime-types, options
+     , text, wreq
+     }:
+     mkDerivation {
+       pname = "voicebase";
+       version = "0.1.1.1";
+       sha256 = "1nc2cmfmdalggb7f9xw4xrhms31cky478wxxkq50as6bryl3k3q3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring HsOpenSSL http-client http-client-openssl
+         json-autotype lens mime-types text wreq
+       ];
+       executableHaskellDepends = [ base bytestring mime-types options ];
+       testHaskellDepends = [ base ];
+       homepage = "https://bitbucket.org/daisee/voicebase";
+       description = "Upload audio files to voicebase to get a transcription";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "void" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -219460,6 +220003,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vpq" = callPackage
+    ({ mkDerivation, base, primitive, smallcheck, tasty
+     , tasty-smallcheck, util, vector
+     }:
+     mkDerivation {
+       pname = "vpq";
+       version = "0.1.0.0";
+       sha256 = "1qa3l71ch96slan8s2zx9wc4ljsl4jgl83m7h0rfb9nd9cawflf7";
+       libraryHaskellDepends = [ base primitive util vector ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Priority queue based on vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vrpn" = callPackage
     ({ mkDerivation, base, vrpn }:
      mkDerivation {
@@ -222871,14 +223429,15 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "1.0.4";
-       sha256 = "0xcqhc09v81ynpfxyqb2nyjypcxw84b7ac7cwmkfwf1i71ixf28q";
-       isLibrary = false;
+       version = "1.0.5";
+       sha256 = "0blaknr11j95sxdm6k2pyfmq1f2llg4hdmy24rvjy9jb82d3vrsi";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
+       libraryHaskellDepends = [
          aeson base bytestring cmdargs deepseq directory extra filepath
          foundation hashable process text unordered-containers vector yaml
        ];
+       executableHaskellDepends = [ base ];
        homepage = "https://github.com/ndmitchell/weeder#readme";
        description = "Detect dead code";
        license = stdenv.lib.licenses.bsd3;
@@ -223990,6 +224549,8 @@ self: {
        pname = "wordchoice";
        version = "0.1.2.6";
        sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w";
+       revision = "1";
+       editedCabalFile = "1igc5fc91ilva7yqhcmdsd6yq6q974ybb2hwk856cpqpmas0402j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224033,21 +224594,21 @@ self: {
 
   "wordpass" = callPackage
     ({ mkDerivation, base, containers, deepseq, directory, filepath
-     , hflags, random-fu, random-source, text, unix-compat, vector
+     , optparse-applicative, QuickCheck, text, unix-compat, vector
      }:
      mkDerivation {
        pname = "wordpass";
-       version = "1.0.0.7";
-       sha256 = "1n6r47ki83xzvms90sxnyqfyqzrs7j705ji2832mf5160xld30r2";
+       version = "1.0.0.9";
+       sha256 = "0gkcqcfl0n9z94bjg2ajzlwjm55qxsc9yd2q97azw4g2c69sn8lq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers deepseq directory filepath random-fu random-source
-         text unix-compat vector
+         base containers deepseq directory filepath optparse-applicative
+         QuickCheck text unix-compat vector
        ];
        executableHaskellDepends = [
-         base containers deepseq directory filepath hflags random-fu
-         random-source text unix-compat vector
+         base containers deepseq directory filepath optparse-applicative
+         QuickCheck text unix-compat vector
        ];
        homepage = "https://github.com/mgajda/wordpass";
        description = "Dictionary-based password generator";
@@ -224844,6 +225405,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_9" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.9";
+       sha256 = "1la0zvdsb1w0k2sj8f9wrnsirljjnbx0a1kalzwalh6d82h2jd9z";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       homepage = "https://github.com/tfausak/wuss#readme";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {

From 4764a6e2e9d375ec7ecba642fe5f2666ca0c6256 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Sat, 5 May 2018 07:33:37 -0400
Subject: [PATCH 1190/3370] haskell-gi, gi-gdkx11: fix builds

The `haskell-gi` build fails its doctests because of a missing
library; I'm not 100% convinced that setting it to `dontCheck` is the
right thing to do, but I don't have a better idea at the moment.

The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by
looking around in my store, I found that that that library seems to
live in gtk3 these days; this override is just a stop-gap, though,
I've also submitted the change to cabal2nix that I believe will fix
the automatic generation of the package in the future.
---
 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 8c7ef561f171..84c08aaffdd3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,6 +422,9 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
+  haskell-gi = dontCheck super.haskell-gi;
+  gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; };
+
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
 

From 127de7480e8dfc6c29aae06eb4669bb08c41763e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 6 May 2018 18:05:08 +0200
Subject: [PATCH 1191/3370] haskell-attoparsec-varword: fix infinite recursion
 in test dependencies

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 84c08aaffdd3..7dc1145411bf 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -47,12 +47,12 @@ self: super: {
   hoogleLocal = { packages ? [] }: self.callPackage ./hoogle.nix { inherit packages; };
 
   # Break infinite recursions.
+  attoparsec-varword = super.attoparsec-varword.override { bytestring-builder-varword = dontCheck self.bytestring-builder-varword; };
   clock = dontCheck super.clock;
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
   hspec = super.hspec.override { stringbuilder = dontCheck self.stringbuilder; };
   hspec-core = super.hspec-core.override { silently = dontCheck self.silently; temporary = dontCheck self.temporary; };
-
   hspec-expectations = dontCheck super.hspec-expectations;
   HTTP = dontCheck super.HTTP;
   http-streams = dontCheck super.http-streams;

From bd7c16e9c3e392950b7e8d7b2574aac170ea735b Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sun, 6 May 2018 21:10:24 +0300
Subject: [PATCH 1192/3370] iwd: 0.1 -> 0.2

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

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index a1c577d2bb57..792c7bcb0849 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -3,17 +3,17 @@
 let
   ell = fetchgit {
      url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
-     rev = "0.4";
-     sha256 = "0l203n1jnqa2mcifir8ydxhcvbiwlvk89ailm0lida83l9vdlwpv";
+     rev = "0.5";
+     sha256 = "0xw53bigh99nhacjb67qs1g145fwls7065l8vsrziwzpkyd5s6a8";
   };
 in stdenv.mkDerivation rec {
   name = "iwd-${version}";
-  version = "0.1";
+  version = "0.2";
 
   src = fetchgit {
     url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
     rev = version;
-    sha256 = "1f8c6xvcvqw8z78mskynd2fkghggcl7vfz8vxzvpx0fkqcprn5n0";
+    sha256 = "0khc017s27n6y6c6wbqhmcghzggnagxbi8j36hl5g73y6s44vx42";
   };
 
   nativeBuildInputs = [

From fdebbce7262d671ce3cd4020a7b4d8de1535a83c Mon Sep 17 00:00:00 2001
From: Alex Brandt <alunduil@gmail.com>
Date: Sun, 6 May 2018 11:24:09 -0700
Subject: [PATCH 1193/3370] nixos/modules/services/scheduling/fcron: add setuid
 to fcrontab

Without fcrontab being setuid, every attempt by an user in the fcron
group to edit their own crontab (via `fcrontab -e`) results in the
following error:

```
2018-05-06 11:29:07 ERROR could not change euid to 273: Operation not permitted
2018-05-06 11:29:07 ERROR fcron child aborted: this does not affect the main fcron daemon, but this may prevent a job from being run or an email from being sent.
```

Adding setuid by hand has resolved this issue and aligns with the way
fcrontab is installed on other distributions.
---
 nixos/modules/services/scheduling/fcron.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/scheduling/fcron.nix b/nixos/modules/services/scheduling/fcron.nix
index e3b6b638f5a7..0ea41f3c3985 100644
--- a/nixos/modules/services/scheduling/fcron.nix
+++ b/nixos/modules/services/scheduling/fcron.nix
@@ -128,6 +128,7 @@ in
         owner = "fcron";
         group = "fcron";
         setgid = true;
+        setuid = true;
       };
       fcrondyn = {
         source = "${pkgs.fcron}/bin/fcrondyn";

From ca9ea31ae1052c7b563e9ab48129dcfc9173fe00 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Sun, 6 May 2018 21:09:56 +0200
Subject: [PATCH 1194/3370] liblapack: 3.4.1 -> 3.8.0

---
 .../science/math/liblapack/3.5.0.nix          | 64 -------------------
 .../science/math/liblapack/default.nix        |  7 +-
 pkgs/top-level/all-packages.nix               |  5 +-
 3 files changed, 4 insertions(+), 72 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix

diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
deleted file mode 100644
index 61a45cbab94b..000000000000
--- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  stdenv,
-  fetchurl,
-  gfortran,
-  cmake,
-  python2,
-  atlas ? null,
-  shared ? false
-}:
-let
-  atlasMaybeShared = if atlas != null then atlas.override { inherit shared; }
-                     else null;
-  usedLibExtension = if shared then ".so" else ".a";
-  inherit (stdenv.lib) optional optionals concatStringsSep;
-  inherit (builtins) hasAttr attrNames;
-  version = "3.5.0";
-in
-
-stdenv.mkDerivation rec {
-  name = "liblapack-${version}";
-  src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
-    sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
-  };
-
-  propagatedBuildInputs = [ atlasMaybeShared ];
-  buildInputs = [ gfortran cmake ];
-  nativeBuildInputs = [ python2 ];
-
-  cmakeFlags = [
-    "-DUSE_OPTIMIZED_BLAS=ON"
-    "-DCMAKE_Fortran_FLAGS=-fPIC"
-  ]
-  ++ (optionals (atlas != null) [
-    "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}"
-    "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}"
-  ])
-  ++ (optional shared "-DBUILD_SHARED_LIBS=ON")
-  # If we're on darwin, CMake will automatically detect impure paths. This switch
-  # prevents that.
-  ++ (optional stdenv.isDarwin "-DCMAKE_OSX_SYSROOT:PATH=''")
-  ;
-
-  doCheck = ! shared;
-
-  checkPhase = "
-    sed -i 's,^#!.*,#!${python2.interpreter},' lapack_testing.py
-    ctest
-  ";
-
-  enableParallelBuilding = true;
-
-  passthru = {
-    blas = atlas;
-  };
-
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Linear Algebra PACKage";
-    homepage = http://www.netlib.org/lapack/;
-    license = licenses.bsd3;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index baf77696b16f..c68454fbe4a1 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -13,14 +13,14 @@ let
   usedLibExtension = if shared then ".so" else ".a";
   inherit (stdenv.lib) optional optionals concatStringsSep;
   inherit (builtins) hasAttr attrNames;
-  version = "3.4.1";
+  version = "3.8.0";
 in
 
 stdenv.mkDerivation rec {
   name = "liblapack-${version}";
   src = fetchurl {
-    url = "http://www.netlib.org/lapack/lapack-${version}.tgz";
-    sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f";
+    url = "http://www.netlib.org/lapack/lapack-${version}.tar.gz";
+    sha256 = "1xmwi2mqmipvg950gb0rhgprcps8gy8sjm8ic9rgy2qjlv22rcny";
   };
 
   propagatedBuildInputs = [ atlasMaybeShared ];
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
   doCheck = ! shared;
 
   checkPhase = "
-    sed -i 's,^#!.*,#!${python2.interpreter},' lapack_testing.py
     ctest
   ";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fb532e14c47..f4bc65ad4784 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19943,7 +19943,7 @@ with pkgs;
     # great feature, but it's of limited use with pre-built binaries
     # coming from a central build farm.
     tolerateCpuTimingInaccuracy = true;
-    liblapack = liblapack_3_5_0WithoutAtlas;
+    liblapack = liblapackWithoutAtlas;
     withLapack = false;
   };
 
@@ -19966,10 +19966,7 @@ with pkgs;
   # without atlas. Etc.
   liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {};
   liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; };
-  liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {};
-  liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; };
   liblapack = liblapackWithAtlas;
-  liblapack_3_5_0 = liblapack_3_5_0WithAtlas;
 
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 

From c642fce38277c4ebd53067fce348e50f498d0972 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 6 May 2018 22:03:53 +0200
Subject: [PATCH 1195/3370] lynx: enable IPv6 support

---
 pkgs/applications/networking/browsers/lynx/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 9cad2838a39b..2a6abfb945b8 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
 
   hardeningEnable = [ "pie" ];
 
-  configureFlags = [ "--enable-widec" ] ++ stdenv.lib.optional sslSupport "--with-ssl";
+  configureFlags = [
+    "--enable-widec"
+    "--enable-ipv6"
+  ] ++ stdenv.lib.optional sslSupport "--with-ssl";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ nukeReferences ]

From b131db5f9b0f9314a2deab3cfd1c1738bd02b67c Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 6 May 2018 22:04:09 +0200
Subject: [PATCH 1196/3370] lynx: 2.8.9dev.16 -> 2.8.9dev.17

---
 pkgs/applications/networking/browsers/lynx/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix
index 2a6abfb945b8..9cdd32d2aaed 100644
--- a/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/pkgs/applications/networking/browsers/lynx/default.nix
@@ -9,14 +9,14 @@ assert sslSupport -> openssl != null;
 
 stdenv.mkDerivation rec {
   name = "lynx-${version}";
-  version = "2.8.9dev.16";
+  version = "2.8.9dev.17";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/lynx/tarballs/lynx${version}.tar.bz2"
       "https://invisible-mirror.net/archives/lynx/tarballs/lynx${version}.tar.bz2"
     ];
-    sha256 = "1j0vx871ghkm7fgrafnvd2ml3ywcl8d3gyhq02fhfb851c88lc84";
+    sha256 = "1lvfsnrw5mmwrmn1m76q9mx287xwm3h5lg8sv7bcqilc0ywi2f54";
   };
 
   enableParallelBuilding = true;
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A text-mode web browser";
-    homepage = http://lynx.invisible-island.net/;
+    homepage = https://lynx.invisible-island.net/;
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };

From faa0d2fa78310bd6331543d2657d773e9805df3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Sun, 6 May 2018 22:13:15 +0200
Subject: [PATCH 1197/3370] todiff: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 049a9eff347c..6af7fae34972 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "todiff-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "Ekleog";
     repo = "todiff";
     rev = version;
-    sha256 = "0n3sifinwhny651q1v1a6y9ybim1b0nd5s1z26sigjdhdvxckn65";
+    sha256 = "0xnqw98nccnkqfdmbkblm897v981rw1fagbi5q895bpwfg0p71lk";
   };
 
-  cargoSha256 = "0mxdpn98fvmxrp656vwxvzl9vprz5mvqj7d1hvvs4gsjrsiyp0fy";
+  cargoSha256 = "0ih7lw5hbayvc66fjqwga0i7l3sb9qn0m26vnham5li39f5i3rqp";
 
   meta = with stdenv.lib; {
     description = "Human-readable diff for todo.txt files";

From 300af6677760944a3c27f7bf33a1366c380c3317 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 2 May 2018 04:16:27 +0200
Subject: [PATCH 1198/3370] gnome3.gdm: fix session chooser

We are patching GDM to respect GDM_SESSIONS_DIR environment
variable, which we are setting in the GDM module. Previously, we
only took care of a single code path, the one that handled session
start-up; missing the one obtaining the list of sessions.

This commit patches the second code path, and also whitelists the
GDM_SESSIONS_DIR so that it can be passed to the greeter.

Fixes #34101
---
 .../gnome-3/core/gdm/sessions_dir.patch       | 39 ++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
index bbc803d49c19..7722e2550bdb 100644
--- a/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/sessions_dir.patch
@@ -1,8 +1,17 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index ff3a1acb..b8705d8f 100644
+--- a/daemon/gdm-launch-environment.c
++++ b/daemon/gdm-launch-environment.c
+@@ -126,7 +126,7 @@
+                 "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
+                 "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
+                 "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH",
+-                "XDG_CONFIG_DIRS", NULL
++                "XDG_CONFIG_DIRS", "GDM_SESSIONS_DIR", NULL
+         };
+         char *system_data_dirs;
+         int i;
 --- a/daemon/gdm-session.c
 +++ b/daemon/gdm-session.c
-@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self)
+@@ -345,12 +345,17 @@
          char **search_dirs;
  
          static const char *x_search_dirs[] = {
@@ -10,8 +19,7 @@ index ff3a1acb..b8705d8f 100644
                  "/etc/X11/sessions/",
                  DMCONFDIR "/Sessions/",
                  DATADIR "/gdm/BuiltInSessions/",
-@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self)
-                 NULL
+                 DATADIR "/xsessions/",
          };
  
 +        if (getenv("GDM_SESSIONS_DIR") != NULL) {
@@ -21,3 +29,24 @@ index ff3a1acb..b8705d8f 100644
          static const char *wayland_search_dir = DATADIR "/wayland-sessions/";
  
          search_array = g_array_new (TRUE, TRUE, sizeof (char *));
+--- a/libgdm/gdm-sessions.c
++++ b/libgdm/gdm-sessions.c
+@@ -217,6 +217,7 @@
+ {
+         int         i;
+         const char *xorg_search_dirs[] = {
++                "/var/empty/",
+                 "/etc/X11/sessions/",
+                 DMCONFDIR "/Sessions/",
+                 DATADIR "/gdm/BuiltInSessions/",
+@@ -224,6 +225,10 @@
+                 NULL
+         };
+ 
++        if (g_getenv("GDM_SESSIONS_DIR") != NULL) {
++                xorg_search_dirs[0] = g_getenv("GDM_SESSIONS_DIR");
++        };
++
+ #ifdef ENABLE_WAYLAND_SUPPORT
+         const char *wayland_search_dirs[] = {
+                 DATADIR "/wayland-sessions/",

From 9811bf225876f0200a10e360800dd081d60253ec Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 6 May 2018 16:07:55 -0500
Subject: [PATCH 1199/3370] treewide: cleanup phases from last commit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The last commit broken Darwin stdenv. We still need to skip some
phases when Apple provides a Makefile that shouldn’t be used.
---
 .../darwin/apple-source-releases/CarbonHeaders/default.nix | 2 ++
 .../darwin/apple-source-releases/architecture/default.nix  | 7 +------
 .../darwin/apple-source-releases/copyfile/default.nix      | 1 +
 .../darwin/apple-source-releases/eap8021x/default.nix      | 1 +
 .../darwin/apple-source-releases/libdispatch/default.nix   | 2 ++
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
index 648770660d3d..5c6d54aeb9c3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/CarbonHeaders/default.nix
@@ -1,6 +1,8 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out/include
     cp MacTypes.h          $out/include
diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
index 2638a0afb76d..07c36ebfe120 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
@@ -1,12 +1,7 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  postPatch = ''
-    substituteInPlace $sourceRoot/Makefile \
-      --replace "/usr/include" "/include" \
-      --replace "/usr/bin/" "" \
-      --replace "/bin/" ""
-  '';
+  dontBuild = true;
 
   installPhase = ''
     export DSTROOT=$out
diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
index bbc8c5e5e81d..37dffaa9b20e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/default.nix
@@ -1,6 +1,7 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
+  dontBuild = true;
   installPhase = ''
     mkdir -p $out/include/
     cp copyfile.h $out/include/
diff --git a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
index c8a40a20c9d3..80d629dfa3e6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/eap8021x/default.nix
@@ -1,6 +1,7 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
+  dontBuild = true;
   installPhase = ''
     mkdir -p $out/Library/Frameworks/EAP8021X.framework/Headers
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index 44c50e468384..a43c00f7691b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -1,6 +1,8 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
+  dontConfigure = true;
+  dontBuild = true;
   installPhase = ''
     mkdir -p $out/include/dispatch $out/include/os
 

From e9366d1e6fce80c6bb9da632b6191bc1cf1e5844 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 6 May 2018 16:14:00 -0500
Subject: [PATCH 1200/3370] Revert "gettext: add dev output"

This reverts commit e25efa9673f3b274132875a4a95aae012b0b3467.

Breaks shadow. See:

https://hydra.nixos.org/build/73664024/nixlog/1
---
 pkgs/development/libraries/gettext/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index e64c045ad819..6dec7747c7e8 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
   patches = [ ./absolute-paths.diff ];
 
-  outputs = [ "out" "dev" "man" "doc" "info" ];
+  outputs = [ "out" "man" "doc" "info" ];
 
   hardeningDisable = [ "format" ];
 

From 85b5fc7c9854d5b147fca2399d8ca6c3412afa2f Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com>
Date: Sun, 6 May 2018 22:34:05 +0100
Subject: [PATCH 1201/3370] xcodeenv: fix typo

---
 pkgs/development/mobile/xcodeenv/simulate-app.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/xcodeenv/simulate-app.nix b/pkgs/development/mobile/xcodeenv/simulate-app.nix
index 5f71b5994080..04b6f2cbc834 100644
--- a/pkgs/development/mobile/xcodeenv/simulate-app.nix
+++ b/pkgs/development/mobile/xcodeenv/simulate-app.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
         echo "Please provide a UDID of a simulator:"
         read udid
     else
-        # If a parameter has been provided, consider that a device UDID an use that
+        # If a parameter has been provided, consider that a device UDID and use that
         udid="$1"
     fi
     

From ef8996f15ea2dd5aace0f61f9ab03f3dfa3d4975 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Fri, 9 Mar 2018 13:41:55 +0100
Subject: [PATCH 1202/3370] lib/types: Fix coercedTo check

Without this change

  (coercedTo str toInt int).check "foo"

would evaluate to true, even though

  (coercedTo str toInt int).merge {} [{ value = "foo"; }]

will throw an error because "foo" can't be coerced to an int.
---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index a334db5c7247..45b0ae5042ce 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -420,7 +420,7 @@ rec {
       mkOptionType rec {
         name = "coercedTo";
         description = "${finalType.description} or ${coercedType.description}";
-        check = x: finalType.check x || coercedType.check x;
+        check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x));
         merge = loc: defs:
           let
             coerceVal = val:

From b16a69289aae7a8aeb7d0410649764d9d2328e2f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 4 Apr 2018 16:51:46 +0200
Subject: [PATCH 1203/3370] lib/types: Add coercedTo unsound tests

---
 lib/tests/modules.sh                                |  5 +++++
 lib/tests/modules/declare-coerced-value-unsound.nix | 10 ++++++++++
 lib/tests/modules/define-value-string-arbitrary.nix |  3 +++
 lib/tests/modules/define-value-string-bigint.nix    |  3 +++
 4 files changed, 21 insertions(+)
 create mode 100644 lib/tests/modules/declare-coerced-value-unsound.nix
 create mode 100644 lib/tests/modules/define-value-string-arbitrary.nix
 create mode 100644 lib/tests/modules/define-value-string-bigint.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 96a91c0fffbc..45fd2d624e1e 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -138,6 +138,11 @@ checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
 checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
 checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix
 
+# Check coerced value with unsound coercion
+checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
+checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string.*' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
+checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
diff --git a/lib/tests/modules/declare-coerced-value-unsound.nix b/lib/tests/modules/declare-coerced-value-unsound.nix
new file mode 100644
index 000000000000..7a017f24e77d
--- /dev/null
+++ b/lib/tests/modules/declare-coerced-value-unsound.nix
@@ -0,0 +1,10 @@
+{ lib, ... }:
+
+{
+  options = {
+    value = lib.mkOption {
+      default = "12";
+      type = lib.types.coercedTo lib.types.str lib.toInt lib.types.ints.s8;
+    };
+  };
+}
diff --git a/lib/tests/modules/define-value-string-arbitrary.nix b/lib/tests/modules/define-value-string-arbitrary.nix
new file mode 100644
index 000000000000..8e3abaf536a0
--- /dev/null
+++ b/lib/tests/modules/define-value-string-arbitrary.nix
@@ -0,0 +1,3 @@
+{
+  value = "foobar";
+}
diff --git a/lib/tests/modules/define-value-string-bigint.nix b/lib/tests/modules/define-value-string-bigint.nix
new file mode 100644
index 000000000000..f27e31985c92
--- /dev/null
+++ b/lib/tests/modules/define-value-string-bigint.nix
@@ -0,0 +1,3 @@
+{
+  value = "1000";
+}

From cd5736116c971ed08826b71a15a2221233b3d44f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 4 Apr 2018 16:55:45 +0200
Subject: [PATCH 1204/3370] lib/types: clear up coercedTo description

---
 lib/tests/modules.sh | 4 ++--
 lib/types.nix        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 45fd2d624e1e..c6b3fd912a9b 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -136,11 +136,11 @@ checkConfigOutput "true" "$@" ./define-module-check.nix
 # Check coerced value.
 checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
 checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
-checkConfigError 'The option value .* in .* is not.*string or signed integer.*' config.value ./declare-coerced-value.nix ./define-value-list.nix
+checkConfigError 'The option value .* in .* is not.*string or signed integer convertible to it' config.value ./declare-coerced-value.nix ./define-value-list.nix
 
 # Check coerced value with unsound coercion
 checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
-checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string.*' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
+checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
 checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
 
 cat <<EOF
diff --git a/lib/types.nix b/lib/types.nix
index 45b0ae5042ce..4ee9affcb297 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -256,7 +256,7 @@ rec {
       functor = (defaultFunctor name) // { wrapped = elemType; };
     };
 
-    nonEmptyListOf = elemType: 
+    nonEmptyListOf = elemType:
       let list = addCheck (types.listOf elemType) (l: l != []);
       in list // { description = "non-empty " + list.description; };
 
@@ -419,7 +419,7 @@ rec {
       assert coercedType.getSubModules == null;
       mkOptionType rec {
         name = "coercedTo";
-        description = "${finalType.description} or ${coercedType.description}";
+        description = "${finalType.description} or ${coercedType.description} convertible to it";
         check = x: finalType.check x || (coercedType.check x && finalType.check (coerceFunc x));
         merge = loc: defs:
           let

From facd51575e23ef485ef233d76327a0a82b230aa0 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 4 Apr 2018 17:40:47 +0200
Subject: [PATCH 1205/3370] lib/types: remove unnecessary coerceFunc assertion

---
 lib/types.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index 4ee9affcb297..17acb92a9441 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -425,10 +425,7 @@ rec {
           let
             coerceVal = val:
               if finalType.check val then val
-              else let
-                coerced = coerceFunc val;
-              in assert finalType.check coerced; coerced;
-
+              else coerceFunc val;
           in finalType.merge loc (map (def: def // { value = coerceVal def.value; }) defs);
         getSubOptions = finalType.getSubOptions;
         getSubModules = finalType.getSubModules;

From 6e7f4f99d152fef88ed70654f7946d55d2643fcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Mon, 7 May 2018 00:35:45 +0200
Subject: [PATCH 1206/3370] manual: Document `types.attrs`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 nixos/doc/manual/development/option-types.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 7969d8124738..5cb747e6d9f1 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -21,6 +21,15 @@
   </para>
 
   <variablelist>
+   <varlistentry>
+    <term><varname>types.attrs</varname>
+    </term>
+    <listitem>
+     <para>
+      A free-form attribute set.
+     </para>
+    </listitem>
+   </varlistentry>
    <varlistentry>
     <term><varname>types.bool</varname>
     </term>

From d79609ac93662396064454d9f67431ce2b80ca66 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 7 May 2018 01:17:16 +0200
Subject: [PATCH 1207/3370] firefox-bin: use native notifications

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

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 6b2bb541a3a7..eaf304ca9fd4 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -28,6 +28,7 @@
 , libcanberra-gtk2
 , libgnome
 , libgnomeui
+, libnotify
 , defaultIconTheme
 , libGLU_combined
 , nspr
@@ -112,6 +113,7 @@ stdenv.mkDerivation {
       libcanberra-gtk2
       libgnome
       libgnomeui
+      libnotify
       libGLU_combined
       nspr
       nss

From 5855459f49b56a0f4e59a08583be1d1f5d111c47 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 7 May 2018 01:42:37 +0200
Subject: [PATCH 1208/3370] modules/system/boot/luksroot: remove comment about
 input_leds for caps lock

Since f2a9f9aeab5016d28ab4bcf6da81924ceecdd676, we already load
"input_leds", so this comment isn't useful anymore.
---
 nixos/modules/system/boot/luksroot.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 54dfb53fd30f..7ebfdb134d7d 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -454,7 +454,6 @@ in
       ["firewire_ohci" "firewire_core" "firewire_sbp2"];
 
     # Some modules that may be needed for mounting anything ciphered
-    # Also load input_leds to get caps lock light working (#12456)
     boot.initrd.availableKernelModules = [ "dm_mod" "dm_crypt" "cryptd" "input_leds" ]
       ++ luks.cryptoModules
       # workaround until https://marc.info/?l=linux-crypto-vger&m=148783562211457&w=4 is merged

From 4d0ab5d698fcb198c462adedff47e15c4edea36e Mon Sep 17 00:00:00 2001
From: Andrew Scott <3648487+ayyjayess@users.noreply.github.com>
Date: Mon, 7 May 2018 00:39:32 +0100
Subject: [PATCH 1209/3370] polybar: add i3 to path

---
 pkgs/applications/misc/polybar/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix
index a3b87fd34f68..05ad3e2a9066 100644
--- a/pkgs/applications/misc/polybar/default.nix
+++ b/pkgs/applications/misc/polybar/default.nix
@@ -1,6 +1,6 @@
 { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig
 , python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil
-, xcbutilwm, xcbutilxrm, fetchpatch
+, xcbutilwm, xcbutilxrm, fetchpatch, makeWrapper
 
 # optional packages-- override the variables ending in 'Support' to enable or
 # disable modules
@@ -52,8 +52,15 @@ stdenv.mkDerivation rec {
       (if i3Support || i3GapsSupport then jsoncpp else null)
       (if i3Support then i3 else null)
       (if i3GapsSupport then i3-gaps else null)
+
+      (if i3Support || i3GapsSupport then makeWrapper else null)
     ];
 
+    fixupPhase = if (i3Support || i3GapsSupport) then ''
+    wrapProgram $out/bin/polybar \
+      --prefix PATH : "${if i3Support then i3 else i3-gaps}/bin"
+  '' else null;
+
     nativeBuildInputs = [
       cmake pkgconfig
     ];

From 2b499afa63f01473a19c7166c1f3750fa45a1bab Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 03:00:22 +0200
Subject: [PATCH 1210/3370] wget: 1.19.4 -> 1.19.5 for CVE-2018-0494

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

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index e2d4712d5bc3..5c1636ddb862 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -5,11 +5,11 @@
 , openssl ? null }:
 
 stdenv.mkDerivation rec {
-  name = "wget-1.19.4";
+  name = "wget-1.19.5";
 
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.lz";
-    sha256 = "16jmcqcasx3q9k4azssryli9qyxfq0sfijw998g8zp58cnwzzh1g";
+    sha256 = "0xfaxmlnih7dhkyks5wi4vrn0n1xshmy6gx6fb2k1120sprydyr9";
   };
 
   patches = [

From 1eeeceb9c7e52734536a4e10323634d4ada2f27e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 7 May 2018 03:59:38 +0200
Subject: [PATCH 1211/3370] nixos/nsd: Allow to configure root zone

When trying to run NSD to serve the root zone, one gets the following
error message:

error: illegal name: '.'

This is because the name of the zone is used as the derivation name for
building the zone file. However, Nix doesn't allow derivation names
starting with a period.

So whenever the zone is "." now, the file name generated is "root"
instead of ".".

I also added an assertion that makes sure the user sets
services.nsd.rootServer, otherwise NSD will fail at runtime because it
prevents serving the root zone without an explicit compile-time option.

Tested this by adding a root zone to the "nsd" NixOS VM test.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @hrdinka, @qknight
---
 nixos/modules/services/networking/nsd.nix | 14 +++++++++++---
 nixos/tests/nsd.nix                       |  9 +++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 0b52b1d3e302..fc910e59c323 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -20,6 +20,7 @@ let
     zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0;
   };
 
+  mkZoneFileName = name: if name == "." then "root" else name;
 
   nsdEnv = pkgs.buildEnv {
     name = "nsd-env";
@@ -50,8 +51,9 @@ let
   };
 
   writeZoneData = name: text: pkgs.writeTextFile {
-    inherit name text;
-    destination = "/zones/${name}";
+    name = "nsd-zone-${mkZoneFileName name}";
+    inherit text;
+    destination = "/zones/${mkZoneFileName name}";
   };
 
 
@@ -146,7 +148,7 @@ let
   zoneConfigFile = name: zone: ''
     zone:
       name:         "${name}"
-      zonefile:     "${stateDir}/zones/${name}"
+      zonefile:     "${stateDir}/zones/${mkZoneFileName name}"
       ${maybeString "outgoing-interface: " zone.outgoingInterface}
     ${forEach     "  rrl-whitelist: "      zone.rrlWhitelist}
       ${maybeString "zonestats: "          zone.zoneStats}
@@ -887,6 +889,12 @@ in
 
   config = mkIf cfg.enable {
 
+    assertions = singleton {
+      assertion = zoneConfigs ? "." -> cfg.rootServer;
+      message = "You have a root zone configured. If this is really what you "
+              + "want, please enable 'services.nsd.rootServer'.";
+    };
+
     environment.systemPackages = [ nsdPkg ];
 
     users.extraGroups = singleton {
diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix
index ad4d4f822435..c3c91e71b5ca 100644
--- a/nixos/tests/nsd.nix
+++ b/nixos/tests/nsd.nix
@@ -41,6 +41,7 @@ in import ./make-test.nix ({ pkgs, ...} : {
         { address = "dead:beef::1"; prefixLength = 64; }
       ];
       services.nsd.enable = true;
+      services.nsd.rootServer = true;
       services.nsd.interfaces = lib.mkForce [];
       services.nsd.zones."example.com.".data = ''
         @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600
@@ -55,6 +56,11 @@ in import ./make-test.nix ({ pkgs, ...} : {
         @ A 9.8.7.6
         @ AAAA fedc::bbaa
       '';
+      services.nsd.zones.".".data = ''
+        @ SOA ns.example.com noc.example.com 666 7200 3600 1209600 3600
+        root A 1.8.7.4
+        root AAAA acbd::4
+      '';
     };
   };
 
@@ -86,6 +92,9 @@ in import ./make-test.nix ({ pkgs, ...} : {
 
         assertHost($_, "a", "deleg.example.com", qr/address 9.8.7.6$/);
         assertHost($_, "aaaa", "deleg.example.com", qr/address fedc::bbaa$/);
+
+        assertHost($_, "a", "root", qr/address 1.8.7.4$/);
+        assertHost($_, "aaaa", "root", qr/address acbd::4$/);
       };
     }
   '';

From 2f467dd584338fd3315e2bcd4dac7a6f12553024 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 19:49:06 -0700
Subject: [PATCH 1212/3370] xmrig: 2.5.3 -> 2.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xmrig/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.6.1 with grep in /nix/store/wsy4vdhmqcr0mydcgp77dncf2xq906kf-xmrig-2.6.1
- directory tree listing: https://gist.github.com/ff33b30777a95f9fa0654b4da0ae47c2
---
 pkgs/applications/misc/xmrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 88adbfff3b9a..9814ec92f021 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-${version}";
-  version = "2.5.3";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "1f9z9akgaf27r5hjrsjw0clk47p7igi0slbg7z6c3rvy5q9kq0wp";
+    sha256 = "05gd3jl8nvj2b73l4x72rfbbxrkw3r8q1h761ly4z35v4f3lahk8";
   };
 
   nativeBuildInputs = [ cmake ];

From 0fb4672113f014abc12f4805aec5288ef6fb2e03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 19:52:46 -0700
Subject: [PATCH 1213/3370] xterm: 332 -> 333
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xterm/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/koi8rxterm -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/koi8rxterm help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/uxterm -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/uxterm help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/xterm -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/xterm help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.xterm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.xterm-wrapped help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.koi8rxterm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.koi8rxterm-wrapped help’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.uxterm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333/bin/.uxterm-wrapped help’ got 0 exit code
- found 333 with grep in /nix/store/w5f067zkhadadsz7a2xh1qg435a8cirw-xterm-333
- directory tree listing: https://gist.github.com/1317219946b26e2c85846fe9e169a9e4
---
 pkgs/applications/misc/xterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index bcaf89797b44..8b15b0307897 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-332";
+  name = "xterm-333";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
      "https://invisible-mirror.net/archives/xterm/${name}.tgz"
    ];
-    sha256 = "0zdjiik4ravc3zld5c9i2ndrvazjmwiwbgl2c21348762wki2jsx";
+    sha256 = "0y7gl26mxw6kwqx9j9mi6lx1lp1v3nrlga19ddn07j2m9q0l479g";
   };
 
   buildInputs =

From 81fc2c35097f81ecb29a576148486cc1ce5a5bcc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 7 May 2018 04:33:56 +0200
Subject: [PATCH 1214/3370] nixos/dhparams: Add a defaultBitSize option

This allows to set the default bit size for all the Diffie-Hellman
parameters defined in security.dhparams.params and it's particularly
useful so that we can set it to a very low value in tests (so it doesn't
take ages to generate).

Regardless for the use in testing, this also has an impact in production
systems if the owner wants to set all of them to a different size than
2048, they don't need to set it individually for every params that are
set.

I've added a subtest to the "dhparams" NixOS test to ensure this is
working properly.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/modules/security/dhparams.nix | 27 ++++++++++++++++++++++-----
 nixos/tests/dhparams.nix            | 14 ++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix
index beac125fc6e0..e2b84c3e3b38 100644
--- a/nixos/modules/security/dhparams.nix
+++ b/nixos/modules/security/dhparams.nix
@@ -4,13 +4,15 @@ let
   inherit (lib) mkOption types;
   cfg = config.security.dhparams;
 
+  bitType = types.addCheck types.int (b: b >= 16) // {
+    name = "bits";
+    description = "integer of at least 16 bits";
+  };
+
   paramsSubmodule = { name, config, ... }: {
     options.bits = mkOption {
-      type = types.addCheck types.int (b: b >= 16) // {
-        name = "bits";
-        description = "integer of at least 16 bits";
-      };
-      default = 2048;
+      type = bitType;
+      default = cfg.defaultBitSize;
       description = ''
         The bit size for the prime that is used during a Diffie-Hellman
         key exchange.
@@ -70,6 +72,11 @@ in {
           existing ones won't be cleaned up. Of course this only applies if
           <option>security.dhparams.stateful</option> is
           <literal>true</literal>.</para></warning>
+
+          <note><title>For module implementers:</title><para>It's recommended
+          to not set a specific bit size here, so that users can easily
+          override this by setting
+          <option>security.dhparams.defaultBitSize</option>.</para></note>
         '';
       };
 
@@ -89,6 +96,16 @@ in {
         '';
       };
 
+      defaultBitSize = mkOption {
+        type = bitType;
+        default = 2048;
+        description = ''
+          This allows to override the default bit size for all of the
+          Diffie-Hellman parameters set in
+          <option>security.dhparams.params</option>.
+        '';
+      };
+
       path = mkOption {
         type = types.str;
         default = "/var/lib/dhparams";
diff --git a/nixos/tests/dhparams.nix b/nixos/tests/dhparams.nix
index da75391e4ce5..d11dfeec5d0c 100644
--- a/nixos/tests/dhparams.nix
+++ b/nixos/tests/dhparams.nix
@@ -54,6 +54,13 @@ in import ./make-test.nix {
     security.dhparams.params.bar2.bits = 19;
   };
 
+  nodes.generation5 = {
+    imports = [ common ];
+    security.dhparams.defaultBitSize = 30;
+    security.dhparams.params.foo3 = {};
+    security.dhparams.params.bar3 = {};
+  };
+
   testScript = { nodes, ... }: let
     getParamPath = gen: name: let
       node = "generation${toString gen}";
@@ -126,5 +133,12 @@ in import ./make-test.nix {
         'expr match ${getParamPath 4 "bar2"} ${builtins.storeDir}',
       );
     };
+
+    ${switchToGeneration 5}
+
+    subtest "check whether defaultBitSize works as intended", sub {
+      ${assertParamBits 5 "foo3" 30}
+      ${assertParamBits 5 "bar3" 30}
+    };
   '';
 }

From a8b7372380725af56c213cdb01893640d5097c16 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 7 May 2018 05:02:41 +0200
Subject: [PATCH 1215/3370] nixos: Add release notes about dhparams changes

This is not only to make users aware of the changes but also to give a
heads up to developers which are using the module. Specifically if they
rely on security.dhparams.path only.

Signed-off-by: aszlig <aszlig@nix.build>
---
 nixos/doc/manual/release-notes/rl-1809.xml | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 61f9ec8ba995..acf9db8f3e3f 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -77,7 +77,57 @@ following incompatible changes:</para>
 <itemizedlist>
   <listitem>
     <para>
+      The module for <option>security.dhparams</option> has two new options
+      now:
     </para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>security.dhparams.stateless</option></term>
+        <listitem><para>
+          Puts the generated Diffie-Hellman parameters into the Nix store
+          instead of managing them in a stateful manner in
+          <filename class="directory">/var/lib/dhparams</filename>.
+        </para></listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>security.dhparams.defaultBitSize</option></term>
+        <listitem><para>
+          The default bit size to use for the generated Diffie-Hellman
+          parameters.
+        </para></listitem>
+      </varlistentry>
+    </variablelist>
+
+    <note><para>
+      The path to the actual generated parameter files should now be queried
+      using
+      <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>
+      because it might be either in the Nix store or in a directory configured
+      by <option>security.dhparams.path</option>.
+    </para></note>
+
+    <note>
+      <title>For developers:</title>
+      <para>
+        Module implementers should not set a specific bit size in order to let
+        users configure it by themselves if they want to have a different bit
+        size than the default (2048).
+      </para>
+      <para>
+        An example usage of this would be:
+<programlisting>
+{ config, ... }:
+
+{
+  security.dhparams.params.myservice = {};
+  environment.etc."myservice.conf".text = ''
+    dhparams = ${config.security.dhparams.params.myservice.path}
+  '';
+}
+</programlisting>
+      </para>
+    </note>
   </listitem>
 </itemizedlist>
 

From 64bb57972c7a9bf365281f376b991fda1ebab19c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 20:13:16 -0700
Subject: [PATCH 1216/3370] unbound: 1.7.0 -> 1.7.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/unbound/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/456crrnsgkrbicb54bwrwwl76n2645gq-unbound-1.7.1/bin/unbound-host help’ got 0 exit code
- found 1.7.1 with grep in /nix/store/456crrnsgkrbicb54bwrwwl76n2645gq-unbound-1.7.1
- directory tree listing: https://gist.github.com/ab82a0d52e5fd8bda918bbdaa6ce7609
---
 pkgs/tools/networking/unbound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index ed5c30aa42b5..d7ef54a2497d 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "https://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "18i6p6zqmbs9gj57mz3iwz828csaab26gb534b8wrn0kzdqr1pcl";
+    sha256 = "13b210hd200xxvaffyzqb4g58knv1sfigph70ai74lrcb3pqbq2n";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

From 834b6049c0a9790a991235f3d725dd2a5a40276e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 20:45:38 -0700
Subject: [PATCH 1217/3370] snd: 18.2 -> 18.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/snd/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/18mdi0m90asngnmnf313bbkpyyzjs96b-snd-18.3/bin/snd --help’ got 0 exit code
- found 18.3 with grep in /nix/store/18mdi0m90asngnmnf313bbkpyyzjs96b-snd-18.3
- directory tree listing: https://gist.github.com/3e3d90a56bba746c97163a9bc00919f2
---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 660f342dc9d9..cacc6e04429d 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-18.2";
+  name = "snd-18.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "0b0ija3cf2c9sqh3cclk5a7i73vagfkyw211aykfd76w7ibirs3r";
+    sha256 = "117sgvdv0a03ys1v27bs99mgzpfm2a7xg6s0q6m1f79jniia12ss";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b917daaf60fbc27f03822ee5e79eae5b34b806fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C3=ADas=20Lang?= <yo@matiaslang.me>
Date: Mon, 7 May 2018 00:42:05 -0300
Subject: [PATCH 1218/3370] fzf: fix vim plugin patch phase

During patch phase, the path to the fzf binary is overwritten in the vim
plugin source. The sed expression doing this wasn't working because the fzf
code changed in this commit:
https://github.com/junegunn/fzf/commit/02ceae15a235de6b5cd2aca9de070fb3fff78e5b
making the patch useless.

I fixed it and added a check to verify that the plugin was effecively
patched to prevent this to happen in the future.
---
 pkgs/tools/misc/fzf/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix
index 1eb4393c978b..d9da04c1fa1b 100644
--- a/pkgs/tools/misc/fzf/default.nix
+++ b/pkgs/tools/misc/fzf/default.nix
@@ -23,8 +23,13 @@ buildGoPackage rec {
   goDeps = ./deps.nix;
 
   patchPhase = ''
-    sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim
-    sed -i -e "s|expand('<sfile>:h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim
+    sed -i -e "s|expand('<sfile>:h:h')|'$bin'|" plugin/fzf.vim
+
+    # Original and output files can't be the same
+    if cmp -s $src/plugin/fzf.vim plugin/fzf.vim; then
+      echo "Vim plugin patch not applied properly. Aborting" && \
+      exit 1
+    fi
   '';
 
   preInstall = ''

From 871bffd98f41aa0e9d49fcabf74909b227366581 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 21:43:10 -0700
Subject: [PATCH 1219/3370] qutebrowser: 1.2.1 -> 1.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qutebrowser/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/qutebrowser -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/qutebrowser --help’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/..qutebrowser-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/..qutebrowser-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/.qutebrowser-wrapped -h’ got 0 exit code
- ran ‘/nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0/bin/.qutebrowser-wrapped --help’ got 0 exit code
- found 1.3.0 with grep in /nix/store/nckfqg5crmyrx3aazk6szii42qy7v1g3-qutebrowser-1.3.0
- directory tree listing: https://gist.github.com/b9f575b232cde51598aeed723a03f7ec
---
 pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 2e31f625f2e7..0cebdd62140c 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -29,13 +29,13 @@ let
 in python3Packages.buildPythonApplication rec {
   name = "qutebrowser-${version}${versionPostfix}";
   namePrefix = "";
-  version = "1.2.1";
+  version = "1.3.0";
   versionPostfix = "";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1svbski378x276033v07jailm81b0i6hxdakbiqkwvgh6hkczrhw";
+    sha256 = "159h669x60pfla71zx28wnrik8rvsrw5i8kbd3xccynk6klm3kw3";
   };
 
   # Needs tox

From 5b3b3a1e83b32246c6093a878b9c299cfc4c3d36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 21:51:32 -0700
Subject: [PATCH 1220/3370] riot-web: 0.14.1 -> 0.14.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/riot-web/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.14.2 with grep in /nix/store/zglwk185bfl8x2dmkqpl51801rk58gvi-riot-web-0.14.2
- directory tree listing: https://gist.github.com/eae072ce5bb48e5e8b59f7e04caf5b0d
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index ce558130a6ce..4946c065492f 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "08paca7wc135hspkv97bgh2a29hbg8vxv0mrp68mgwscpyrl6vnf";
+    sha256 = "1qma49a6lvr9anrry3vbhjhvy06bgapknnvbdljnbb3l9c99nmxi";
   };
 
   installPhase = ''

From cfdcc03feb7c22d6dffc55f7f9f6f0a611624077 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 22:00:49 -0700
Subject: [PATCH 1221/3370] qbittorrent: 4.0.4 -> 4.1.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qbittorrent/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.1.0 with grep in /nix/store/dyvbm73pl2qs0khv1yzyfsxsyf8kx7yi-qbittorrent-4.1.0
- directory tree listing: https://gist.github.com/a5b770d088c453aa2a25dc90cfc3c348
---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 90d68a96e5c0..b2e9333beb3e 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "4.0.4";
+  version = "4.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "13sw0sdw2agm49plp9xvkg6wva274drpvgz76dqj4j2kfxx9s2jk";
+    sha256 = "0fdr74sc31x421sb69vlgal1hxpccjxxk8hrrzz9f5bg4jv895pw";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From a600e0c8a5f498a6518603a4495cc0fc38d826e7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 29 Apr 2018 05:57:32 +0000
Subject: [PATCH 1222/3370] ocaml: default to 4.06 on aarch64 (since 4.05 is
 broken there)

---
 pkgs/top-level/ocaml-packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 92f772bb25ea..bce2662abfd1 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1043,5 +1043,10 @@ in rec
 
   ocamlPackages_latest = ocamlPackages_4_06;
 
-  ocamlPackages = ocamlPackages_4_05;
+  ocamlPackages =
+    # OCaml 4.05 is broken on aarch64
+    if system == "aarch64-linux" then
+      ocamlPackages_4_06
+    else
+      ocamlPackages_4_05;
 }

From abea0c6eebb427df3950e0c2f36c62b4e111a62a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 30 Apr 2018 09:52:30 +0000
Subject: [PATCH 1223/3370] jbuilder: 1.0+beta17 -> 1.0+beta20

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

diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index d48bc4101113..38fd4323d5ca 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -2,16 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "jbuilder-${version}";
-  version = "1.0+beta17";
+  version = "1.0+beta20";
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "dune";
     rev = "${version}";
-    sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x";
+    sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f";
   };
 
   buildInputs = [ ocaml ];
 
+  dontAddPrefix = true;
+
   installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
 
   preFixup = "rm -rf $out/jbuilder";

From e973188bcc9f35dbd12f00c0ef5dd9240da1d9d3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 7 May 2018 00:16:50 -0500
Subject: [PATCH 1224/3370] souffle: fix on darwin

Fixes #39854
---
 pkgs/development/compilers/souffle/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/souffle/default.nix b/pkgs/development/compilers/souffle/default.nix
index 5289540e944c..099a591b407d 100644
--- a/pkgs/development/compilers/souffle/default.nix
+++ b/pkgs/development/compilers/souffle/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, boost, bison, flex, openjdk, doxygen, perl, graphviz, libtool, lsb-release, ncurses, zlib, sqlite }:
+{ stdenv, fetchFromGitHub
+, boost, bison, flex, openjdk, doxygen
+, perl, graphviz, libtool, ncurses, zlib, sqlite
+, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   version = "1.2.0";
@@ -11,12 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "1g8yvm40h102mab8lacpl1cwgqsw1js0s1yn4l84l9fjdvlh2ygd";
   };
 
+  nativeBuildInputs = [ autoreconfHook bison flex ];
+
   buildInputs = [
-    autoconf automake boost bison flex openjdk
-    # Used for 1.2.0
-    libtool lsb-release ncurses zlib sqlite
-    # Used for docs
-    doxygen perl graphviz
+    boost openjdk ncurses zlib sqlite doxygen perl graphviz
   ];
 
   patchPhase = ''
@@ -29,8 +30,6 @@ stdenv.mkDerivation rec {
   # for boost and failing there, so we tell it what's what here.
   configureFlags = [ "--with-boost-libdir=${boost}/lib" ];
 
-  preConfigure = "./bootstrap";
-
   meta = with stdenv.lib; {
     description = "A translator of declarative Datalog programs into the C++ language";
     homepage    = "http://souffle-lang.github.io/";

From 3b4ee14a834d791b07f1b597317cce5762cd568a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 22:49:59 -0700
Subject: [PATCH 1225/3370] pspg: 1.1.0 -> 1.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pspg/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg --help’ got 0 exit code
- ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg -V’ and found version 1.1.1
- ran ‘/nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1/bin/pspg --version’ and found version 1.1.1
- found 1.1.1 with grep in /nix/store/g5s0d7h461nd55hnzp5k6v74dlfcz6dh-pspg-1.1.1
- directory tree listing: https://gist.github.com/ba99487fab26f86a314d4a727749a490
---
 pkgs/tools/misc/pspg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix
index ddd76a344e01..0a261671872d 100644
--- a/pkgs/tools/misc/pspg/default.nix
+++ b/pkgs/tools/misc/pspg/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pspg-${version}";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "okbob";
     repo = "pspg";
     rev = "${version}";
-    sha256 = "10r6jfcqw4wclp84f07g3bda844csgm4sh7cjsnk2smmal7nhybs";
+    sha256 = "19jiixanyghasd2awkxx7c224fz01d9v0c4qxn4msvkny39m3gz9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 9389f3f8b3c8acc4adb5535da8fb76320693ae89 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 23:05:28 -0700
Subject: [PATCH 1226/3370] osinfo-db: 20180416 -> 20180502

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/osinfo-db/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 20180502 with grep in /nix/store/xsgfilzqf0fkahxgp24ivs90xy8mz6rs-osinfo-db-20180502
- directory tree listing: https://gist.github.com/38c69c0bcc2f185f90e5c56f329dc980
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 09c677c35bda..82122335f695 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180416";
+  name = "osinfo-db-20180502";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "0qam3qbrwzrz40pikhb8y11lidpb6snsa80ym8s6hp5kh4icr1h6";
+    sha256 = "05036mpc5hapx616lfzc67xj157hw3mgyk0arv3brjcx0qmzaram";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From 716f4ab3a4765295c11f77ff16e7c3b543e9d5b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 23:23:35 -0700
Subject: [PATCH 1227/3370] pdfpc: 4.1 -> 4.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pdfpc/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/pdfpc -h’ got 0 exit code
- ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/pdfpc --help’ got 0 exit code
- ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/.pdfpc-wrapped -h’ got 0 exit code
- ran ‘/nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1/bin/.pdfpc-wrapped --help’ got 0 exit code
- found 4.1.1 with grep in /nix/store/dvwwb2myl9351rzj9gf2p3x1731d9vnc-pdfpc-4.1.1
- directory tree listing: https://gist.github.com/88ef2cda6a77852e5d7541ebd43e4fec
---
 pkgs/applications/misc/pdfpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 515127e12ebb..f3fd091363f0 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.1";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "02cp0x5prqrizxdp0sf2sk5ip0363vyw6fxsb3zwyx4dw0vz4g96";
+    sha256 = "1yjh9rx49d24wlwg44r2a6b5scybp8l1fi9wyf05sig6zfziw1mm";
   };
 
   nativeBuildInputs = [

From ce74ef08c8db63b92c01df3e5c478ae81c2d0e76 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 00:10:39 -0700
Subject: [PATCH 1228/3370] metabase: 0.28.6 -> 0.29.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/metabase/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/599c8c50c67bdbbb242bf3136072727a
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index d36810b9f5c1..4eae86b00b0f 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.28.6";
+  version = "0.29.0";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "1dzs57yyx6k93gvyva9y38xdb4pbvdliad3zzgk3vs74fp1zh2vq";
+    sha256 = "1dfq06cm8k36pkqpng4cd8ax8cdxbcssww4vapq2w9ccflpnlam2";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7c8d500825ac1a0294ca7275d2a89345443dd823 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 00:14:33 -0700
Subject: [PATCH 1229/3370] mbedtls: 2.8.0 -> 2.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mbedtls/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_aescrypt2 help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_hello help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ecdh_curve25519 help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_key_app help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_mpi_demo help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pk_decrypt help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_genkey help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_rsa_sign help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_entropy help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_ctr_drbg help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_gen_random_havege help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_mail_client help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_benchmark help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_ssl_cert_test help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_pem2der help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_strerror help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_crl_app help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app -h’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app --help’ got 0 exit code
- ran ‘/nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0/bin/mbedtls_req_app help’ got 0 exit code
- found 2.9.0 with grep in /nix/store/3k23m5xwfjjwmyj7q311blpk4wl204ks-mbedtls-2.9.0
- directory tree listing: https://gist.github.com/fc0f8e7848649388caae66bddc561fb8
---
 pkgs/development/libraries/mbedtls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 8c2a2a694b03..bd10824bfa1e 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.8.0";
+  name = "mbedtls-2.9.0";
 
   src = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
     rev = name;
-    sha256 = "1pnwmy0qg8g9lz26fpr5fzpvrdjm59winxpwdjfp6d62qxdjbgmn";
+    sha256 = "1pb1my8wwa757hvd06qwidkj58fa1wayf16g98q600xhya5fj3vx";
   };
 
   nativeBuildInputs = [ perl ];

From 8d2588fd16b43055ce6be56f36c5a9ff23f86383 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 00:16:15 -0700
Subject: [PATCH 1230/3370] mypy: 0.590 -> 0.600
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mypy/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.dmypy-wrapped help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/dmypy help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped -V’ and found version 0.600
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.mypy-wrapped --version’ and found version 0.600
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy -V’ and found version 0.600
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/mypy --version’ and found version 0.600
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/.stubgen-wrapped help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen -h’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen --help’ got 0 exit code
- ran ‘/nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600/bin/stubgen help’ got 0 exit code
- found 0.600 with grep in /nix/store/vzgfxa5pw3dprk1afv5r55kzhld2bkhw-mypy-0.600
- directory tree listing: https://gist.github.com/157118da991905110fee19075e61f99b
---
 pkgs/development/tools/mypy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index fd21a8a23d34..d021f994e491 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonApplication rec {
   pname = "mypy";
-  version = "0.590";
+  version = "0.600";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ynyrrj0wjyw130ay9x1ca88lbhbblp06bfsjrpzbcvp4grgxgq4";
+    sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw";
   };
 
   propagatedBuildInputs = [ lxml typed-ast psutil ];

From 994307899020df62dc25528961a93ac3359a5370 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb.giraudeau@lombardodier.com>
Date: Mon, 7 May 2018 09:31:02 +0200
Subject: [PATCH 1231/3370] blobfuse: 1.0.1-RC-Preview -> 1.0.2

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

diff --git a/pkgs/tools/filesystems/blobfuse/default.nix b/pkgs/tools/filesystems/blobfuse/default.nix
index f847cde98a9e..b5694535e946 100644
--- a/pkgs/tools/filesystems/blobfuse/default.nix
+++ b/pkgs/tools/filesystems/blobfuse/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "blobfuse-${version}";
-  version = "1.0.1-RC-Preview";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner  = "Azure";
     repo   = "azure-storage-fuse";
     rev    = "v${version}";
-    sha256 = "143rxgfmprir4a7frrv8llkv61jxzq50w2v8wn32vx6gl6vci1zs";
+    sha256 = "1qh04z1fsj1l6l12sz9yl2sy9hwlrnzac54hwrr7wvsgv90n9gbp";
   };
 
   buildInputs = [ curl gnutls libgcrypt libuuid fuse ];
@@ -20,4 +20,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ jbgi ];
     platforms = platforms.linux;
   };
-}
+}
\ No newline at end of file

From 201dd87507d1fe5d77413ae740ce3e96e8df21c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 01:37:54 -0700
Subject: [PATCH 1232/3370] mydumper: 0.9.3 -> 0.9.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mydumper/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5/bin/mydumper --help’ got 0 exit code
- ran ‘/nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5/bin/myloader --help’ got 0 exit code
- found 0.9.5 with grep in /nix/store/agcvkgqnz979a024p7brjgrz8cgagsh0-mydumper-0.9.5
- directory tree listing: https://gist.github.com/593eb6f7d15a3b04c925f61d0dc068e7
---
 pkgs/tools/backup/mydumper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index da8805bc226e..b6c5bfd91faa 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -2,14 +2,14 @@
 , glib, zlib, pcre, mysql, libressl }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.3";
+  version = "0.9.5";
   name = "mydumper-${version}";
 
   src = fetchFromGitHub {
     owner  = "maxbube";
     repo   = "mydumper";
     rev    = "v${version}";
-    sha256 = "139v6707sxyslg7n1fii8b1ybdq50hbqhc8zf6p1cr3h2hhl6ns9";
+    sha256 = "0vbz0ri5hm6yzkrcgnaj8px6bf59myr5dbhyy7fd4cv44hr685k6";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 7169c8a31accf8dc37deff9243f7499d2468924f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 01:42:32 -0700
Subject: [PATCH 1233/3370] miniupnpd: 2.0.20180422 -> 2.0.20180503

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/miniupnpd/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/0808e377cf01f4f52c13c600fb4d5e22
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 3a1bba4ce8c1..2f907df8dcac 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, iptables, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.0.20180422";
+  name = "miniupnpd-2.0.20180503";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy";
+    sha256 = "031aw66b09ij2yv640xjbp302vkwr8ima5cz7a0951jzhqbfs6xn";
     name = "${name}.tar.gz";
   };
 

From a45e8d962b72287a977456d529394d55043de500 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 01:50:49 -0700
Subject: [PATCH 1234/3370] libofx: 0.9.12 -> 0.9.13
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libofx/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif -h’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif --help’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofx2qif help’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump -h’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump --help’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump help’ got 0 exit code
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump -V’ and found version 0.9.13
- ran ‘/nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13/bin/ofxdump --version’ and found version 0.9.13
- found 0.9.13 with grep in /nix/store/3yhk4sd6brh5z7ksmhw9sznflcc3bl8s-libofx-0.9.13
- directory tree listing: https://gist.github.com/408d21f6a77f49bceb283d4730ff7884
---
 pkgs/development/libraries/libofx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix
index 1c8f33d82f72..86166ec608fd 100644
--- a/pkgs/development/libraries/libofx/default.nix
+++ b/pkgs/development/libraries/libofx/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, opensp, pkgconfig, libxml2, curl }:
         
 stdenv.mkDerivation rec {
-  name = "libofx-0.9.12";
+  name = "libofx-0.9.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/libofx/${name}.tar.gz";
-    sha256 = "0wvkgffq9qjhjrggg8r1nbhmw65j3lcl4y4cdpmmkrqiz9ia0py1";
+    sha256 = "1r60pj1jn269mk4s4025qxllkzgvnbw5r3vby8j2ry5svmygksjp";
   };
 
   configureFlags = [ "--with-opensp-includes=${opensp}/include/OpenSP" ];

From a6670c01bfa6ca05d29c3246f2f3111d712e6986 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 01:57:17 -0700
Subject: [PATCH 1235/3370] libcouchbase: 2.8.6 -> 2.8.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libcouchbase/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-cat --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-create --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-observe --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-observe-seqno --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-incr --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-decr --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-mcflush --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-hash --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-lock --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-unlock --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-rm --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-stats --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version -h’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-version help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-verbosity --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-view --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-n1ql --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-admin --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-admin help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-ping --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-create --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-create help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-delete --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-delete help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-bucket-flush --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-connstr --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-connstr help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-write-config --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-write-config help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-strerror --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-touch --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-role-list --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-role-list help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-list --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-list help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-upsert --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-delete --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-user-delete help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-watch --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-pillowfight --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-n1qlback --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-subdoc --help’ got 0 exit code
- ran ‘/nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7/bin/cbc-proxy --help’ got 0 exit code
- found 2.8.7 with grep in /nix/store/j51scwxfvfpv4r9qfm4dk1pl4g424n2s-libcouchbase-2.8.7
- directory tree listing: https://gist.github.com/9d8d235fa65642471ef25d1986614fab
---
 pkgs/development/libraries/libcouchbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index c3050bf8c676..d6447e449cfb 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.8.6";
+  version = "2.8.7";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "1in0fdl5mgzhwmd8kvniqkizi7isf2g2gvbknfbbdmxkki7a8p95";
+    sha256 = "1hx66dlbb3sc3xaj6nsav4rp7qghl9zyv796kxj1sammw9wp98b1";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From 1c67dc2f35615d4f3f8bff71f6704db07cfb2357 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:08:52 -0700
Subject: [PATCH 1236/3370] libfm-extra: 1.3.0 -> 1.3.0.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libfm-extra/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.3.0.2 with grep in /nix/store/5am33wnj853b12vfyyccsm213yv686kg-libfm-extra-1.3.0.2
- directory tree listing: https://gist.github.com/21b078659a3a745638c69b3d9ef063c4
---
 pkgs/development/libraries/libfm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 01bfe1653fe6..ce1d3b138f88 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
   name = if extraOnly
     then "libfm-extra-${version}"
     else "libfm-${version}";
-  version = "1.3.0";
+  version = "1.3.0.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/pcmanfm/libfm-${version}.tar.xz";
-    sha256 = "151jyy8ipmp2h829gd9s4s429qafv1zxl7j6zaj1k1gzm9s5rmnb";
+    sha256 = "0wkwbi1nyvqza3r1dhrq846axiiq0fy0dqgngnagh76fjrwnzl0q";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b8e09cdb1e08ca406c4b921b7f21d266bbe6a322 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:12:56 -0700
Subject: [PATCH 1237/3370] lynis: 2.6.3 -> 2.6.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/lynis/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/lynis -V’ and found version 2.6.4
- ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/lynis --version’ and found version 2.6.4
- ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/.lynis-wrapped -V’ and found version 2.6.4
- ran ‘/nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4/bin/.lynis-wrapped --version’ and found version 2.6.4
- found 2.6.4 with grep in /nix/store/6z5szmm4m9jix1062zrp1m556g75lbwf-lynis-2.6.4
- directory tree listing: https://gist.github.com/bb3a08cde57013b3af4f2511af3cc77c
---
 pkgs/tools/security/lynis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index e0a11f574181..56a47ea38743 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "2.6.3";
+  version = "2.6.4";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "17xfs0jr0rf8xvk860l2wpxg0h1m2c1dq41lqnq6wga9jifxmzqd";
+    sha256 = "1p449gsackcavw5h9yn0ckk1fkakx9d55izi22gh8wfvijdfhw10";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From 69bf313e74bc25245e377c68d4a2e7aea8d775c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 10:19:16 +0100
Subject: [PATCH 1238/3370] nodePackages{v6,v8}: update

---
 .../node-packages/node-packages-v6.nix        | 81 ++++++++++---------
 .../node-packages/node-packages-v8.nix        | 34 ++++----
 2 files changed, 62 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index e50628e014fe..27f58d5ad1da 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -3514,13 +3514,13 @@ let
         sha1 = "8de37f5a300730c305fc3edd9f93348ee8a46288";
       };
     };
-    "bufferutil-3.0.4" = {
+    "bufferutil-3.0.5" = {
       name = "bufferutil";
       packageName = "bufferutil";
-      version = "3.0.4";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.4.tgz";
-        sha512 = "1q344kiig9b8ssskrp7r77kf3xk516bfcjlilgz0a8q5zflz35rnp8im2kx1y9smcp23hw2q1aqsi39i6cb7svzf40a7dk6h4ds54pf";
+        url = "https://registry.npmjs.org/bufferutil/-/bufferutil-3.0.5.tgz";
+        sha512 = "2b5ha7z8v5gkanyakrbax9k9d00cv9gs2nfnk5g4d16ljmpv40jv3pljawxmnw2jj04z57cqlzbw1w8wr5kyblin8c2jz7a2av09xfi";
       };
     };
     "bufferview-1.0.1" = {
@@ -12355,13 +12355,13 @@ let
         sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
       };
     };
-    "iconv-lite-0.4.21" = {
+    "iconv-lite-0.4.22" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.21";
+      version = "0.4.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz";
-        sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz";
+        sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l";
       };
     };
     "iconv-lite-0.4.8" = {
@@ -16829,13 +16829,13 @@ let
         sha512 = "1slngp5z9rczjirv9lpdwiv1ap4xmp28jxl4r0i5hpds1khlm89qp70ziz8k5h2vwjph6srjqi3gb2yrwwsnnwli6p8yxvlyx7nn80p";
       };
     };
-    "minipass-2.2.4" = {
+    "minipass-2.3.0" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.2.4";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz";
-        sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz";
+        sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d";
       };
     };
     "minizlib-1.1.0" = {
@@ -17180,6 +17180,15 @@ let
         sha1 = "5c0a3f29c8ccffbbb1ec941dcec09d71fa32f36a";
       };
     };
+    "mri-1.1.1" = {
+      name = "mri";
+      packageName = "mri";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mri/-/mri-1.1.1.tgz";
+        sha1 = "85aa26d3daeeeedf80dc5984af95cc5ca5cad9f1";
+      };
+    };
     "ms-0.1.0" = {
       name = "ms";
       packageName = "ms";
@@ -20445,13 +20454,13 @@ let
         sha1 = "d9ae0ca85330e03962d93292f95a8b44c2ebf505";
       };
     };
-    "prebuild-install-2.5.3" = {
+    "prebuild-install-4.0.0" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
-      version = "2.5.3";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.5.3.tgz";
-        sha512 = "3z8bc2sx9ibs343jllm11azqkcc7vxpf0skfm68dqwz9l59z381vbqip00sgpzg9di2zagjm3wbx65s6g2kg5kj8b1vp0vnqglkgcpy";
+        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-4.0.0.tgz";
+        sha512 = "2ffx8smnrj269a2r9lsiv4s71rvzhanb3a3hqg1i8daznmhl0w9lfsylh9hw5si1agsmbsn0j2syp8sn9r7cwxm8ps9b80vwv2v5mpf";
       };
     };
     "precond-0.2.3" = {
@@ -32480,7 +32489,7 @@ in
       sources."has-to-string-tag-x-1.4.1"
       sources."home-or-tmp-2.0.0"
       sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       (sources."import-jsx-1.3.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -32706,7 +32715,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -32889,7 +32898,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -34225,7 +34234,7 @@ in
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
-      sources."minipass-2.2.4"
+      sources."minipass-2.3.0"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
@@ -35853,7 +35862,7 @@ in
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."imurmurhash-0.1.4"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
@@ -36087,10 +36096,10 @@ in
   less = nodeEnv.buildNodePackage {
     name = "less";
     packageName = "less";
-    version = "3.0.2";
+    version = "3.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less/-/less-3.0.2.tgz";
-      sha512 = "1hs3nj50rw6qlk3hjkd6ynhdv7mdlawwl4jzl3d43kbijkych51dm15ccb1ra7i9pmaq13nm24rkzf3bxv3fcpcrqq499cp0lbyg2cj";
+      url = "https://registry.npmjs.org/less/-/less-3.0.4.tgz";
+      sha512 = "1qmi7lbjfq3w5ygilwf5sagk463c0j6kj2wsidzh6100v02bpfi05c8kbycf395hrdmmy5ffb5f0rsvkvqyhxw9hxrlyvnafc9b4x5b";
     };
     dependencies = [
       sources."ajv-5.5.2"
@@ -36150,7 +36159,7 @@ in
       sources."request-2.85.0"
       sources."safe-buffer-5.1.2"
       sources."sntp-2.1.0"
-      sources."source-map-0.5.7"
+      sources."source-map-0.6.1"
       sources."sshpk-1.14.1"
       sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.4"
@@ -36976,7 +36985,7 @@ in
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."minimist-0.0.8"
-      sources."minipass-2.2.4"
+      sources."minipass-2.3.0"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -37500,7 +37509,7 @@ in
       sources."gauge-2.7.4"
       sources."glob-7.1.2"
       sources."has-unicode-2.0.1"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -37509,7 +37518,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.2.4"
+      sources."minipass-2.3.0"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
@@ -38106,7 +38115,7 @@ in
         ];
       })
       sources."mqtt-packet-5.5.0"
-      sources."mri-1.1.0"
+      sources."mri-1.1.1"
       sources."ms-2.0.0"
       (sources."multer-1.3.0" // {
         dependencies = [
@@ -38777,7 +38786,7 @@ in
       sources."hoek-4.2.1"
       sources."hosted-git-info-2.6.0"
       sources."https-proxy-agent-2.2.1"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       (sources."inquirer-3.3.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -40699,7 +40708,7 @@ in
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.11"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       (sources."jstransform-10.1.0" // {
@@ -43025,7 +43034,7 @@ in
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ieee754-1.1.11"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -43766,7 +43775,7 @@ in
       sources."buffer-fill-0.1.1"
       sources."buffer-from-1.0.0"
       sources."buffer-indexof-1.1.1"
-      (sources."bufferutil-3.0.4" // {
+      (sources."bufferutil-3.0.5" // {
         dependencies = [
           sources."simple-get-2.8.1"
         ];
@@ -43895,7 +43904,7 @@ in
       sources."piece-length-1.0.0"
       sources."pify-2.3.0"
       sources."plist-with-patches-0.5.1"
-      sources."prebuild-install-2.5.3"
+      sources."prebuild-install-4.0.0"
       sources."prettier-bytes-1.0.4"
       sources."process-nextick-args-2.0.0"
       sources."protobufjs-3.8.2"
@@ -44472,7 +44481,7 @@ in
       sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
       sources."https-proxy-agent-2.2.1"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-3.3.8"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -45237,7 +45246,7 @@ in
       sources."http-cache-semantics-3.8.1"
       sources."http-signature-1.2.0"
       sources."humanize-string-1.0.2"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-3.2.0"
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index e64364eb68b1..cfaa4f0634f4 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -3100,13 +3100,13 @@ let
         sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
       };
     };
-    "iconv-lite-0.4.21" = {
+    "iconv-lite-0.4.22" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.21";
+      version = "0.4.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.21.tgz";
-        sha512 = "0myjcmxx7dn5liikg8d2zgwb433sk761dfxwwnszyam16rzv5dzva352jrvav7cnambn0ha8fzh6g6xhdhxsd20l5v1p65r6vvmazhj";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz";
+        sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l";
       };
     };
     "iconv-lite-0.4.8" = {
@@ -4549,13 +4549,13 @@ let
         sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
       };
     };
-    "minipass-2.2.4" = {
+    "minipass-2.3.0" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.2.4";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.2.4.tgz";
-        sha512 = "3r74gps1yd2fabj46qd42hknvpkg4aqwg3cdz8xjn8aqww0rsk3nmbgh8p2h0rkjlpxihg1wnpfa4bmpgmnydlbhpb1rz5dcxcwhdc7";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.3.0.tgz";
+        sha512 = "1p0pbj1iwnzb7kkqbh5h0vd6byh1l6na1yx69qmbb0wbmwm0qc5g4hn4z6lr8wkzb4kybvd1hjm4hxd93nrdr8ydbqqd9wd1w9bcq4d";
       };
     };
     "minizlib-1.1.0" = {
@@ -6646,13 +6646,13 @@ let
         sha1 = "a4316ccb0d40a77d30dadf91f0f4db7e475f948a";
       };
     };
-    "swagger-test-templates-1.4.3" = {
+    "swagger-test-templates-1.5.0" = {
       name = "swagger-test-templates";
       packageName = "swagger-test-templates";
-      version = "1.4.3";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.4.3.tgz";
-        sha1 = "e047473aec06b938992e427665cafdbb6a01cfc0";
+        url = "https://registry.npmjs.org/swagger-test-templates/-/swagger-test-templates-1.5.0.tgz";
+        sha512 = "0jmilcls10zf18f7nlcdn29qdf21bl4xsk1kzzayp5h92ljkwx3c9jyy3a3p2yrd6pjnzh0k5c4yih3kbv6nxcd2rpf5vlfm44lg06l";
       };
     };
     "swagger-tools-0.9.16" = {
@@ -7635,7 +7635,7 @@ in
       sources."formidable-1.2.1"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."inherits-2.0.3"
       (sources."inquirer-3.3.0" // {
         dependencies = [
@@ -8370,7 +8370,7 @@ in
       sources."gauge-2.7.4"
       sources."glob-7.1.2"
       sources."has-unicode-2.0.1"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -8379,7 +8379,7 @@ in
       sources."isarray-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.2.4"
+      sources."minipass-2.3.0"
       sources."minizlib-1.1.0"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
@@ -8650,7 +8650,7 @@ in
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.21"
+      sources."iconv-lite-0.4.22"
       sources."ieee754-1.1.11"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -9281,7 +9281,7 @@ in
       sources."supports-color-2.0.0"
       sources."swagger-converter-0.2.0"
       sources."swagger-editor-2.10.5"
-      (sources."swagger-test-templates-1.4.3" // {
+      (sources."swagger-test-templates-1.5.0" // {
         dependencies = [
           sources."camelcase-1.2.1"
           sources."is-extglob-1.0.0"

From 639376aff6679e9add23f64089c95944bd2e6b41 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:24:49 -0700
Subject: [PATCH 1239/3370] lean: 3.3.0 -> 3.4.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/lean/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/lean -h’ got 0 exit code
- ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/lean --help’ got 0 exit code
- ran ‘/nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1/bin/leanpkg help’ got 0 exit code
- found 3.4.1 with grep in /nix/store/kdbjdracd2m6fv18k9kc5bcmr0p60glx-lean-3.4.1
- directory tree listing: https://gist.github.com/198504c00746718749b3019653fe78fd
---
 pkgs/applications/science/logic/lean/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 095aa5a7f8c8..16fdab59ea02 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "3.3.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "0irh9b4haz0pzzxrb4hwcss91a0xb499kjrcrmr2s59p3zq8bbd9";
+    sha256 = "0ww8azlyy3xikhd7nh96f507sg23r53zvayij1mwv5513vmblhhw";
   };
 
   nativeBuildInputs = [ cmake ];

From 0e5d6a6644f63ab910cb1103b075148cce6e70d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 10:28:09 +0100
Subject: [PATCH 1240/3370] nodePackages.imapnotify: init at 0.4.1

fixes #38025 #37179
---
 .../node-packages/node-packages-v6.json       |  1 +
 .../node-packages/node-packages-v6.nix        | 80 +++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 9b19a4f5a628..4e9d9e71e8db 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -38,6 +38,7 @@
 , "ionic"
 , "ios-deploy"
 , "istanbul"
+, "imapnotify"
 , "javascript-typescript-langserver"
 , "jayschema"
 , "jsdoc"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 27f58d5ad1da..039401c822f4 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -20553,6 +20553,15 @@ let
         sha512 = "2x2535hml3hmhh6qbsl9r97mpa264mbpvmv0lbsqsfkv3sfd8wv7zw1b68555qsj5c6ma4b66qkgdsrr6355lhbmz052hqzq2qx082h";
       };
     };
+    "printf-0.2.5" = {
+      name = "printf";
+      packageName = "printf";
+      version = "0.2.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/printf/-/printf-0.2.5.tgz";
+        sha1 = "c438ca2ca33e3927671db4ab69c0e52f936a4f0f";
+      };
+    };
     "private-0.1.8" = {
       name = "private";
       packageName = "private";
@@ -28699,6 +28708,15 @@ let
         sha1 = "496b2cc109eca8dbacfe2dc72b603c17c5870ad4";
       };
     };
+    "xenvar-0.5.1" = {
+      name = "xenvar";
+      packageName = "xenvar";
+      version = "0.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xenvar/-/xenvar-0.5.1.tgz";
+        sha1 = "f82d2fedee63af76687b70115ce6274dc71310e9";
+      };
+    };
     "xhr-2.4.1" = {
       name = "xhr";
       packageName = "xhr";
@@ -34461,6 +34479,68 @@ in
     production = true;
     bypassCache = false;
   };
+  imapnotify = nodeEnv.buildNodePackage {
+    name = "imapnotify";
+    packageName = "imapnotify";
+    version = "0.4.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/imapnotify/-/imapnotify-0.4.1.tgz";
+      sha512 = "0fn58ydrck0mwpq48pj2in6aql522avzyabrddq4ixykr1h29ha3cvh1v0mga8ghg1v9zpkii81qqac74qwm9ikr1kll616fcz0cc0s";
+    };
+    dependencies = [
+      sources."async-0.2.10"
+      sources."balanced-match-1.0.0"
+      sources."brace-expansion-1.1.11"
+      sources."bunyan-1.8.12"
+      sources."colors-0.6.2"
+      sources."concat-map-0.0.1"
+      sources."core-util-is-1.0.2"
+      sources."cycle-1.0.3"
+      sources."dtrace-provider-0.8.6"
+      sources."eyes-0.1.8"
+      sources."glob-6.0.4"
+      sources."imap-0.8.19"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."isarray-0.0.1"
+      sources."isstream-0.1.2"
+      sources."minimatch-3.0.4"
+      sources."minimist-0.0.10"
+      (sources."mkdirp-0.5.1" // {
+        dependencies = [
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."moment-2.22.1"
+      sources."mv-2.1.1"
+      sources."nan-2.10.0"
+      sources."ncp-2.0.0"
+      sources."once-1.4.0"
+      sources."optimist-0.6.1"
+      sources."path-is-absolute-1.0.1"
+      sources."pkginfo-0.3.1"
+      sources."printf-0.2.5"
+      sources."readable-stream-1.1.14"
+      sources."rimraf-2.4.5"
+      sources."safe-json-stringify-1.1.0"
+      sources."semver-5.3.0"
+      sources."stack-trace-0.0.10"
+      sources."string_decoder-0.10.31"
+      sources."utf7-1.0.2"
+      sources."winston-0.8.3"
+      sources."wordwrap-0.0.3"
+      sources."wrappy-1.0.2"
+      sources."xenvar-0.5.1"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Execute scripts on new messages using IDLE imap command";
+      homepage = "https://github.com/a-sk/node-imapnotify#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = false;
+  };
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";

From d3a8e055386bae4e0113e86adb11fe8bcabff854 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:28:31 -0700
Subject: [PATCH 1241/3370] libraw: 0.18.9 -> 0.18.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libraw/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/raw-identify help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/unprocessed_raw help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/4channels help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/simple_dcraw help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/mem_image help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_half help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/half_mt help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test --help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/multirender_test help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/postprocessing_benchmark -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/postprocessing_benchmark help’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_emu -h’ got 0 exit code
- ran ‘/nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10/bin/dcraw_emu help’ got 0 exit code
- found 0.18.10 with grep in /nix/store/2x920hvy7c1w6m9jv3w592ksj4vmnpyj-libraw-0.18.10
- directory tree listing: https://gist.github.com/8de105fd367301af8971e9bc3012a0d3
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 4ad2f7ba34dc..1213f93112f6 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.9";
+  version = "0.18.10";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "0kmjfdr409k9q9n17k9ywims5z4kqc16s81ba7y09n7669q1gvyj";
+    sha256 = "0klrzg1cn8ksxqbhx52dldi5bbmad190npnhhgkyr2jzpgrbpj88";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];

From f343efcf9bb1b8c0a8c44b3417cfd52eb4d71565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 10:30:25 +0100
Subject: [PATCH 1242/3370] nodePackages.elm-oracle: init at 1.1.1

fixes #38353 #31036
---
 .../node-packages/node-packages-v6.json         |  1 +
 .../node-packages/node-packages-v6.nix          | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 4e9d9e71e8db..5f18a286ad77 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -19,6 +19,7 @@
 , "dnschain"
 , "docker-registry-server"
 , "elasticdump"
+, "elm-oracle"
 , "elm-test"
 , "emoj"
 , "eslint"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 039401c822f4..66a016ceb510 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -32223,6 +32223,23 @@ in
     production = true;
     bypassCache = false;
   };
+  elm-oracle = nodeEnv.buildNodePackage {
+    name = "elm-oracle";
+    packageName = "elm-oracle";
+    version = "1.1.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/elm-oracle/-/elm-oracle-1.1.1.tgz";
+      sha1 = "61f6d783221b4ad08e7d101d678b9d5a67d3961c";
+    };
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Query for information about values in elm source files.";
+      homepage = "https://github.com/ElmCast/elm-oracle#readme";
+      license = "BSD-3-Clause";
+    };
+    production = true;
+    bypassCache = false;
+  };
   elm-test = nodeEnv.buildNodePackage {
     name = "elm-test";
     packageName = "elm-test";

From d813ba2dbf86042d98abf472ead0c251c7a15d73 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:43:51 -0700
Subject: [PATCH 1243/3370] libx86emu: 1.12 -> 1.14

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libx86emu/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/1727e070918ad2877736d62030608e9a
---
 pkgs/development/libraries/libx86emu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libx86emu/default.nix b/pkgs/development/libraries/libx86emu/default.nix
index b745098bd64b..bbaa6b089610 100644
--- a/pkgs/development/libraries/libx86emu/default.nix
+++ b/pkgs/development/libraries/libx86emu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libx86emu-${version}";
-  version = "1.12";
+  version = "1.14";
 
   src = fetchFromGitHub {
     owner = "wfeldt";
     repo = "libx86emu";
     rev = version;
-    sha256 = "0dlzvwdkk0vc6qf0a0zzbxki3pig1mda8p3fa54rxqaxkwp4mqr6";
+    sha256 = "120a01jrrd4rwwjfr5f612xq9hbh35c87a6wnqn7zzw3fqydc2lw";
   };
 
   nativeBuildInputs = [ perl ];

From f08e06ba2f955d7c900b6c0a18ad0102db363871 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:44:50 -0700
Subject: [PATCH 1244/3370] libcue: 2.2.0 -> 2.2.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libcue/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.2.1 with grep in /nix/store/lqppvr2arq1jmmdil3519c2y7hhm0vq3-libcue-2.2.1
- directory tree listing: https://gist.github.com/49da59ef9dfe640d50f9bc6ee72a7457
---
 pkgs/development/libraries/libcue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix
index fb0f0d3d3f9c..dbc5f1cf4ec6 100644
--- a/pkgs/development/libraries/libcue/default.nix
+++ b/pkgs/development/libraries/libcue/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcue-${version}";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "lipnitsk";
     repo = "libcue";
     rev = "v${version}";
-    sha256 = "0znn9scamy1nsz1dzvsamqg46zr7ldfvpxiyzi1ss9d6gbcm0frs";
+    sha256 = "1iqw4n01rv2jyk9lksagyxj8ml0kcfwk67n79zy1r6zv1xfp5ywm";
   };
 
   nativeBuildInputs = [ cmake bison flex ];

From fe89c1be0308390918f0b4efd384ee9be59d5c3e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:01:21 -0700
Subject: [PATCH 1245/3370] hwdata: 0.311 -> 0.312

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/hwdata/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.312 with grep in /nix/store/sfzsz7mns2n1kj0s9wdhv38s5xm0a1c3-hwdata-0.312
- directory tree listing: https://gist.github.com/7c5e5f17dc28268564e6ebf71204803d
---
 pkgs/os-specific/linux/hwdata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix
index 15b3903ddd1a..070ddfd77789 100644
--- a/pkgs/os-specific/linux/hwdata/default.nix
+++ b/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "hwdata-${version}";
-  version = "0.311";
+  version = "0.312";
 
   src = fetchurl {
-    url = "https://github.com/vcrhonek/hwdata/archive/v0.311.tar.gz";
-    sha256 = "159av9wvl3biryxd5pgqcwz6wkdaa0ydmcysmzznx939mfv7w18z";
+    url = "https://github.com/vcrhonek/hwdata/archive/v0.312.tar.gz";
+    sha256 = "04dbxfn40b8vyw49qpkslv20akbqm5hwl3cndmqacp6cik1l0gai";
   };
 
   preConfigure = "patchShebangs ./configure";

From e3261386ba07a8db1d015a2d8654d89c793d1760 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:15:08 -0700
Subject: [PATCH 1246/3370] hiawatha: 10.7 -> 10.8.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/hiawatha/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/ssi-cgi -h’ got 0 exit code
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/ssi-cgi -v’ and found version 10.8.1
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/hiawatha -h’ got 0 exit code
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/wigwam -h’ got 0 exit code
- ran ‘/nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1/bin/wigwam -v’ and found version 10.8.1
- found 10.8.1 with grep in /nix/store/pk9y5j3rn2kh3jyh6shf16x7fwif5j8b-hiawatha-10.8.1
- directory tree listing: https://gist.github.com/bed64b3bf49236cbbfafddbb1f63c00a
---
 pkgs/servers/http/hiawatha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 99900bbdb3ea..277fa06a7079 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -12,11 +12,11 @@ assert enableSSL -> openssl !=null;
 
 stdenv.mkDerivation rec {
   name = "hiawatha-${version}";
-  version = "10.7";
+  version = "10.8.1";
 
   src = fetchurl {
     url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz";
-    sha256 = "1k0vgpfkmdxmkimq4ab70cqwhj5qwr4pzq7nnv957ah8cw2ijy1z";
+    sha256 = "1f2hlw2lp98b4dx87i7pz7h66vsy2g22b5adfrlij3kj0vfv61w8";
   };
 
   buildInputs =  [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ;

From ee95ed11ca1e0df43caf927adb2287bbd7eeeb3a Mon Sep 17 00:00:00 2001
From: Wanja Chresta <wanja.chresta@finnova.com>
Date: Mon, 7 May 2018 12:18:06 +0200
Subject: [PATCH 1247/3370] tamarin-prover: Fix compile issues

---
 .../science/logic/tamarin-prover/default.nix      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 7a9dcc231929..4461fa675e89 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -8,8 +8,8 @@ let
   src = fetchFromGitHub {
     owner  = "tamarin-prover";
     repo   = "tamarin-prover";
-    rev    = "120c7e706f3e1d4646b233faf2bc9936834ed9d3";
-    sha256 = "064blwjjwnkycwgsrdn1xkjya976wndpz9h5pjmgjqqirinc8c5x";
+    rev    = "ab8a155452e9e9c57ccb4bbe1b94d7677ea5ce21";
+    sha256 = "02ycxxkcpc0dzybaq63viciydq1ik8wiv2blk8mvnz3ssxw3sjik";
   };
 
   # tamarin has its own dependencies, but they're kept inside the repo,
@@ -65,6 +65,15 @@ mkDerivation (common "tamarin-prover" src // {
   enableSharedExecutables = false;
   postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc";
 
+  # Fix problem with MonadBaseControl not being found
+  patchPhase = ''
+    sed -ie 's,\(import *\)Control\.Monad$,&\
+    \1Control.Monad.Trans.Control,' src/Web/Handler.hs
+
+    sed -ie 's~\( *, \)mtl~&\
+    \1monad-control~' tamarin-prover.cabal
+  '';
+
   # wrap the prover to be sure it can find maude, sapic, etc
   executableToolDepends = [ makeWrapper which maude graphviz sapic ];
   postInstall = ''
@@ -79,7 +88,7 @@ mkDerivation (common "tamarin-prover" src // {
 
   executableHaskellDepends = (with haskellPackages; [
     base binary binary-orphans blaze-builder blaze-html bytestring
-    cmdargs conduit containers deepseq directory fclabels file-embed
+    cmdargs conduit containers monad-control deepseq directory fclabels file-embed
     filepath gitrev http-types HUnit lifted-base mtl parsec process
     resourcet safe shakespeare tamarin-prover-term
     template-haskell text threads time wai warp yesod-core yesod-static

From 9ee600a06f600c91bc5afa90ff58e598ea7f0797 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:18:20 -0700
Subject: [PATCH 1248/3370] insomnia: 5.16.1 -> 5.16.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/insomnia/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 5.16.2 with grep in /nix/store/9jcvxvs1y2jycaq8n26zidh7y3shicp0-insomnia-5.16.2
- directory tree listing: https://gist.github.com/a02ce6405af5678bfbbd0fd9a116e95e
---
 pkgs/development/web/insomnia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 4e5596fee661..6d1eb0dbe3eb 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -15,11 +15,11 @@ let
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "5.16.1";
+  version = "5.16.2";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "0r1l7pfcnif8vw9jnxbh5p9sih6wvgjpx8rpfmnvw21pr8cm0zyp";
+    sha256 = "1sjcbi45n10lf69a48447lfbxxjib7v2isshaykz43qqasqqrd18";
   };
 
   nativeBuildInputs = [ makeWrapper dpkg ];

From 941b2a17cbc27535d65628f1a48731b9b3648619 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:41:32 -0700
Subject: [PATCH 1249/3370] gnuplot: 5.2.2 -> 5.2.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gnuplot/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/gnuplot -h’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/gnuplot --help’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/.gnuplot-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3/bin/.gnuplot-wrapped --help’ got 0 exit code
- found 5.2.3 with grep in /nix/store/3kixi49gqbpjnkrgdavmzkbsg7aaw51p-gnuplot-5.2.3
- directory tree listing: https://gist.github.com/c09c0907f914e36a3f7c086d4b978dbf
---
 pkgs/tools/graphics/gnuplot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index a177f33bb377..b2b8508640bf 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -20,11 +20,11 @@ let
   withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
 stdenv.mkDerivation rec {
-  name = "gnuplot-5.2.2";
+  name = "gnuplot-5.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
-    sha256 = "18diyy7aib9mn098x07g25c7jij1x7wbfpicz0z8gwxx08px45m4";
+    sha256 = "0977vgjszjpqhz2jahq07zmcmi0k9d6v7wq70ph2klfrb29qrdgy";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools;

From fcf66ef1d53850bf3cf8b95c204ceb82815fbb6b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:48:36 -0700
Subject: [PATCH 1250/3370] fswatch: 1.11.2 -> 1.11.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fswatch/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3/bin/fswatch -h’ got 0 exit code
- ran ‘/nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3/bin/fswatch --help’ got 0 exit code
- found 1.11.3 with grep in /nix/store/c05hlqp57zslb3imjx6m5dary3ak601d-fswatch-1.11.3
- directory tree listing: https://gist.github.com/cc22e26348bfd98159c6519a470d3bdb
---
 pkgs/development/tools/misc/fswatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix
index 2b26383ed310..9c0c357e1867 100644
--- a/pkgs/development/tools/misc/fswatch/default.nix
+++ b/pkgs/development/tools/misc/fswatch/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "fswatch-${version}";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "emcrisostomo";
     repo = "fswatch";
     rev = version;
-    sha256 = "05vgpd1fx9fy3vnnmq5gz236avgva82axix127xy98gaxrac52vq";
+    sha256 = "1w83bpgx0wsgn70jyxwrvh9dsivrq41ifcignjzdxdwz9j0rwhh1";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From fb5fbbe29e08eae9fb1cf4a87f6d41e7fdb1eb59 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:59:01 -0700
Subject: [PATCH 1251/3370] gsm: 1.0.17 -> 1.0.18
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gsm/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/toast -h’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/toast help’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/tcat -h’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/tcat help’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/untoast -h’ got 0 exit code
- ran ‘/nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18/bin/untoast help’ got 0 exit code
- found 1.0.18 with grep in /nix/store/99q2w40pn8n5mihvg5ar9jwlzafpp9gl-gsm-1.0.18
- directory tree listing: https://gist.github.com/af6b37d2f0a0b0757d66e91dce102967
---
 pkgs/development/libraries/gsm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix
index 57112e2825ee..33583a4c6bb3 100644
--- a/pkgs/development/libraries/gsm/default.nix
+++ b/pkgs/development/libraries/gsm/default.nix
@@ -9,11 +9,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gsm-${version}";
-  version = "1.0.17";
+  version = "1.0.18";
 
   src = fetchurl {
     url = "http://www.quut.com/gsm/${name}.tar.gz";
-    sha256 = "00bns0d4wwrvc60lj2w7wz4yk49q1f6rpdrwqzrxsha9d78mfnl5";
+    sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4";
   };
 
   patchPhase = ''

From fc509faa8786b5293a3fedb037eb2c16a8190a79 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:00:55 -0700
Subject: [PATCH 1252/3370] freeipmi: 1.6.1 -> 1.6.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/freeipmi/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-device --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/bmc-info --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-chassis --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-chassis-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-console --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-dcmi --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-detect --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-fru --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-locate --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-oem --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-oem help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-pef-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-pet --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-ping -V’ and found version 1.6.2
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-power --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-raw --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sel --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sensors --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmi-sensors-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiconsole --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmidetect --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmidetectd --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmimonitoring --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiping -V’ and found version 1.6.2
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmipower --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/ipmiseld --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/pef-config --help’ got 0 exit code
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/rmcp-ping -V’ and found version 1.6.2
- ran ‘/nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2/bin/rmcpping -V’ and found version 1.6.2
- found 1.6.2 with grep in /nix/store/g447zn3rvabmg3gi8cpg86k268hlbsly-freeipmi-1.6.2
- directory tree listing: https://gist.github.com/15391c2b5273ea7e8b859877efa69d3b
---
 pkgs/tools/system/freeipmi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix
index 6996d66abe0c..9c7a5b36c5bd 100644
--- a/pkgs/tools/system/freeipmi/default.nix
+++ b/pkgs/tools/system/freeipmi/default.nix
@@ -1,12 +1,12 @@
 { fetchurl, stdenv, libgcrypt, readline, libgpgerror }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.1";
+  version = "1.6.2";
   name = "freeipmi-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/freeipmi/${name}.tar.gz";
-    sha256 = "0jdm1nwsnkj0nzjmcqprmjk25449mhjj25khwzpq3mpjw440wmd2";
+    sha256 = "0jhjf21gn1m9lhjsc1ard9zymq25mk7rxcyygjfxgy0vb4j36l9i";
   };
 
   buildInputs = [ libgcrypt readline libgpgerror ];

From 5ec51c5d7c863a335d31c6ea5bae3c1da37131ff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:20:37 -0700
Subject: [PATCH 1253/3370] fossil: 2.5 -> 2.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fossil/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil --help’ got 0 exit code
- ran ‘/nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6/bin/fossil help’ got 0 exit code
- found 2.6 with grep in /nix/store/by0my4ix1gpichp15gf3i8w3fgfxmsrc-fossil-2.6
- directory tree listing: https://gist.github.com/673b50672a3bb2c22d7e37175d1f37d4
---
 pkgs/applications/version-management/fossil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index cadc72f0f87b..f46a704ea9ca 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   name = "fossil-${version}";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchurl {
     urls =
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
         "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz"
       ];
     name = "${name}.tar.gz";
-    sha256 = "1lxawkhr1ki9fqw8076fxib2b1w673449yzb6vxjshqzh5h77c7r";
+    sha256 = "1nbfzxwnq66f8162nmddd22xn3nyazqr16kka2c1gghqb5ar99vn";
   };
 
   buildInputs = [ zlib openssl readline sqlite which ed ]

From 5ef7241e1aaf4d55b8160d4fe1b168465cfe68e7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:25:49 -0700
Subject: [PATCH 1254/3370] fwup: 1.0.0 -> 1.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fwup/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup -h’ got 0 exit code
- ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup --help’ got 0 exit code
- ran ‘/nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0/bin/fwup --version’ and found version 1.1.0
- found 1.1.0 with grep in /nix/store/37baank8iw1ksnyhg0m90y0p9sazyhv7-fwup-1.1.0
- directory tree listing: https://gist.github.com/eafe4f2b1c0b7a6fac5a4910f383ee94
---
 pkgs/tools/misc/fwup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix
index e334a2a8813e..3903fde3302e 100644
--- a/pkgs/tools/misc/fwup/default.nix
+++ b/pkgs/tools/misc/fwup/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "fwup-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "fhunleth";
     repo = "fwup";
     rev = "v${version}";
-    sha256 = "1v79q5s4lm8scrz9nmqcszyh40is6k7hkr15r4aljyfbp1gamsfs";
+    sha256 = "1jhl50yj5h6wl3fx1hcqi4vb7633srmbbcpsgajprc5fxscjgapm";
   };
 
   doCheck = true;

From 95e317bf54ed5b78dafc4aa873615f33d123d714 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:32:20 -0700
Subject: [PATCH 1255/3370] dash: 0.5.9.1 -> 0.5.10

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dash/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/ac71c74097484baeb4301fc8048b372d
---
 pkgs/shells/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index 1de2a52634bc..5f26801ca6d3 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dash-0.5.9.1";
+  name = "dash-0.5.10";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
-    sha256 = "5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659";
+    sha256 = "1arimvc9zcghhb3nin9z3yr5706vxfri4a9r3j9j9d0n676f0w5d";
   };
 
   hardeningDisable = [ "format" ];

From 7d915bd28d4e5cc91f9d0a1dd7d14c7974698119 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 04:59:30 -0700
Subject: [PATCH 1256/3370] fanficfare: 2.23.0 -> 2.25.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fanficfare/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped -h’ got 0 exit code
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped --help’ got 0 exit code
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped -v’ and found version 2.25.0
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/.fanficfare-wrapped --version’ and found version 2.25.0
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare -h’ got 0 exit code
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare --help’ got 0 exit code
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare -v’ and found version 2.25.0
- ran ‘/nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0/bin/fanficfare --version’ and found version 2.25.0
- found 2.25.0 with grep in /nix/store/v61hi3r06i5xxsmcdk4cs7jijflf1fxh-fanficfare-2.25.0
- directory tree listing: https://gist.github.com/a5ca8fdb686eb942eb92828f63be5af0
---
 pkgs/tools/text/fanficfare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index cffce8e3b883..2ebab9d63904 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
-  version = "2.23.0";
+  version = "2.25.0";
   name = "fanficfare-${version}";
   nameprefix = "";
 
   src = fetchurl {
     url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
-    sha256 = "0589b5pg03rfv9x753cnbkz6pz508xs1n2lla3qfpagxc0pyg8i1";
+    sha256 = "1fval2jhrv3w762rmrbhbn8zj161aalvqy8n8q74yr8hzmpcvlwn";
   };
 
   propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];

From fcb6a0a56ed34d43aa234eb1f3b717c3e24b695b Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 May 2018 14:04:15 +0200
Subject: [PATCH 1257/3370] spotify: remove/update gnome2 references

Part of #39976
---
 pkgs/applications/audio/spotify/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix             | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 1a4f2bdd1b5b..fefab263065f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,6 +1,8 @@
 { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype
-, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf
-, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }:
+, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng
+, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }:
+
+assert stdenv.system == "x86_64-linux";
 
 let
   # Please update the stable branch!
@@ -20,7 +22,6 @@ let
     ffmpeg_0_10
     fontconfig
     freetype
-    GConf
     gdk_pixbuf
     glib
     gtk2
@@ -93,7 +94,7 @@ stdenv.mkDerivation {
       librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
       wrapProgram $out/share/spotify/spotify \
         --prefix LD_LIBRARY_PATH : "$librarypath" \
-        --prefix PATH : "${gnome2.zenity}/bin"
+        --prefix PATH : "${gnome3.zenity}/bin"
 
       # Desktop file
       mkdir -p "$out/share/applications/"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ea5d55a2817..a4d07741f1c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17925,7 +17925,6 @@ with pkgs;
   };
 
   spotify = callPackage ../applications/audio/spotify {
-    inherit (gnome2) GConf;
     libgcrypt = libgcrypt_1_5;
     libpng = libpng12;
     curl = curl.override {

From 2dbb29c3340b916ec83892bf514c457f9d88af01 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 May 2018 14:06:35 +0200
Subject: [PATCH 1258/3370] spotify: remove platform assertion

---
 pkgs/applications/audio/spotify/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index fefab263065f..5f6772256cab 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -2,8 +2,6 @@
 , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }:
 
-assert stdenv.system == "x86_64-linux";
-
 let
   # Please update the stable branch!
   # Latest version number can be found at:

From 335931b012d1fcacd3dc908bc14d98b9001480f5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:13:43 -0700
Subject: [PATCH 1259/3370] certbot: 0.23.0 -> 0.24.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/certbot/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/certbot --version’ and found version 0.24.0
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/..certbot-wrapped-wrapped --version’ and found version 0.24.0
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped -h’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped --help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped help’ got 0 exit code
- ran ‘/nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0/bin/.certbot-wrapped --version’ and found version 0.24.0
- found 0.24.0 with grep in /nix/store/lbjfbczzss4a59sy4wz4mhg7bm70qhc4-certbot-0.24.0
- directory tree listing: https://gist.github.com/ecc49ff604fc592bc8d187e494c0e9cc
---
 pkgs/tools/admin/certbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 3106552a6610..7a26896bbc28 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -4,13 +4,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "certbot-${version}";
-  version = "0.23.0";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
     rev = "v${version}";
-    sha256 = "0dv9d1byppnvx54rhi2w3gqjk01444m5hbr9553n9gin4ribviii";
+    sha256 = "0gsq4si0bqwzd7ywf87y7bbprqg1m72qdj11h64qmwb5zl4vh444";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 1d5843550144b8293c2c84e3a8110881594647a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:20:34 -0700
Subject: [PATCH 1260/3370] asdf: 3.3.1 -> 3.3.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/asdf/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.3.2 with grep in /nix/store/mcks1swd685sksr4yjrsyfhphzcrw9nk-asdf-3.3.2
- directory tree listing: https://gist.github.com/3a13d7343736c1454dc2701b3ea3009f
---
 pkgs/development/lisp-modules/asdf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 27089ee3e52d..c9d8d52b0682 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.3.1";
+    version="3.3.2";
     name="${baseName}-${version}";
-    hash="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.3.1.tar.gz";
-    sha256="1yhlhyllabsha84wycqk0mhbcq2w332jdlp19ccx4rplczzn2w3g";
+    hash="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.3.2.tar.gz";
+    sha256="1bdrybn97qhny5192ifis8fp8m79djql2k4h9r9q2wnwxf9q2d4x";
   };
   buildInputs = [
     texinfo texLive perl

From 1e01a6ef38215dd4082bb4035b3e89c4dc94a9cc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:20:59 -0700
Subject: [PATCH 1261/3370] alfred: 2018.0 -> 2018.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/alfred/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.1 with grep in /nix/store/2fj5i6zd4mp4asxchsig266lqz8acliv-alfred-2018.1
- directory tree listing: https://gist.github.com/64f566e02d8018fe290dc3db29fd7c7f
---
 pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index 9b7484932ebd..90489e12d690 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }:
 
 let
-  ver = "2018.0";
+  ver = "2018.1";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "0mzjgjkmgdrrqa6fbpii9q1xqvg3kvwgq2k2kpdf0vy4xxnypky7";
+    sha256 = "0xkd842yp227jzfybjq8c5s7y5c7amm1f5ai80k8wyjwysnad3w0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 253ea95d289221bcb72377b2fa33625ce2cc1dac Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 May 2018 02:30:46 +0200
Subject: [PATCH 1262/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/f60ac8c0ef62f4e6a5aae3dfb9c4ac25a79918a2.
---
 .../haskell-modules/hackage-packages.nix      | 236 ++++++++++++++----
 1 file changed, 182 insertions(+), 54 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f0b8c3d63168..197f2d7cb750 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -33676,8 +33676,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.2";
-       sha256 = "0gkchw2dqg3cps5xf88qmmn9mzd7zpws1ngsr3k9lh7krah8a7fc";
+       version = "0.1.0.3";
+       sha256 = "0kvw69br5nrx4nnrp0r00wr55w15wq5kh68df2r89yrd8l5vp02x";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -61729,6 +61729,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "df1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , QuickCheck, tasty, tasty-quickcheck, text, time
+     }:
+     mkDerivation {
+       pname = "df1";
+       version = "0.1";
+       sha256 = "0crcwg63d1m47qj44774ydk9v5sssg08vwbjgh1lg8qvqss7qk8l";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers text time
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring QuickCheck tasty tasty-quickcheck text
+         time
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "Type, render and parse the df1 hierarchical structured log format";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dfrac" = callPackage
     ({ mkDerivation, base, scientific }:
      mkDerivation {
@@ -62053,19 +62073,86 @@ self: {
      }) {};
 
   "di" = callPackage
-    ({ mkDerivation, base, bytestring, QuickCheck, stm, tasty
-     , tasty-hunit, tasty-quickcheck, time, transformers
+    ({ mkDerivation, base, df1, di-core, di-df1, di-handle, di-monad
+     , exceptions
      }:
      mkDerivation {
        pname = "di";
-       version = "0.3";
-       sha256 = "1kwkr2lb4vii530sijlrll9nj1k93pixcqk4bn96877bzf5963wj";
-       libraryHaskellDepends = [ base stm time transformers ];
-       testHaskellDepends = [
-         base bytestring QuickCheck stm tasty tasty-hunit tasty-quickcheck
+       version = "1.0";
+       sha256 = "1bsgq1x4xc1nhfx2wkzmhy3hfy11xkdic35x0lxdc282k2iw7f4i";
+       libraryHaskellDepends = [
+         base df1 di-core di-df1 di-handle di-monad exceptions
        ];
        homepage = "https://github.com/k0001/di";
-       description = "Easy, powerful, structured and typeful logging without monad towers";
+       description = "Typeful hierarchical structured logging using di, mtl and df1";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "di-core" = callPackage
+    ({ mkDerivation, base, containers, exceptions, QuickCheck, stm
+     , tasty, tasty-hunit, tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "di-core";
+       version = "1.0";
+       sha256 = "0slggv1c2q8amznf0j38x12v0f4lhg7z7mr0qaayj6v6pkpp5s6j";
+       libraryHaskellDepends = [ base containers exceptions stm time ];
+       testHaskellDepends = [
+         base exceptions QuickCheck stm tasty tasty-hunit tasty-quickcheck
+         time
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "Typeful hierarchical structured logging without monad towers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "di-df1" = callPackage
+    ({ mkDerivation, base, bytestring, df1, di-core, di-handle
+     , di-monad, QuickCheck, stm, tasty, tasty-quickcheck, text, time
+     }:
+     mkDerivation {
+       pname = "di-df1";
+       version = "1.0";
+       sha256 = "07lz6vb4dxa6j3xxlwxv23gps5xv4rimz571h2n95hhldx8n9jnp";
+       libraryHaskellDepends = [
+         base df1 di-core di-handle di-monad stm
+       ];
+       testHaskellDepends = [
+         base bytestring df1 di-core QuickCheck tasty tasty-quickcheck text
+         time
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "Write logs in the df1 format using the di logging framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "di-handle" = callPackage
+    ({ mkDerivation, base, bytestring, di-core, exceptions, unix }:
+     mkDerivation {
+       pname = "di-handle";
+       version = "1.0";
+       sha256 = "1v4jn1dvvfa6nbqx34hhjg47lbjafkmdps8aalq3n5sah99iy26d";
+       libraryHaskellDepends = [
+         base bytestring di-core exceptions unix
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "IO support for file handles in di-core";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "di-monad" = callPackage
+    ({ mkDerivation, base, containers, di-core, exceptions, mtl, pipes
+     , stm, transformers
+     }:
+     mkDerivation {
+       pname = "di-monad";
+       version = "1.0";
+       sha256 = "1kb2dx4whbl0lp0yb5y7m66ma0qywprzy5zs3msxiqfdbc3ghqvx";
+       libraryHaskellDepends = [
+         base containers di-core exceptions mtl pipes stm transformers
+       ];
+       homepage = "https://github.com/k0001/di";
+       description = "mtl flavoured typeful hierarchical structured logging for di-core";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -84093,8 +84180,8 @@ self: {
      }) {inherit (pkgs) gdk_pixbuf;};
 
   "gi-gdkx11" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-x11
-     , gi-gdk, gi-gio, gi-gobject, gi-xlib, haskell-gi, haskell-gi-base
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
+     , gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
@@ -84106,13 +84193,13 @@ self: {
          base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib
          haskell-gi haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gdk-x11 ];
+       libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gdk-x11 = null;};
+     }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gi-ggit" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio
@@ -84159,18 +84246,18 @@ self: {
      }) {inherit (pkgs) glib;};
 
   "gi-girepository" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gobject
-     , gobjectIntrospection, haskell-gi, haskell-gi-base
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "1.0.15";
-       sha256 = "1g9bvf850zsbqi4dw8i1nbclqwi599zvwny4fsl0hp8lqb9w7ps6";
+       version = "1.0.16";
+       sha256 = "1kb7vyqks6br8z2bjp9wzj0dvh76s35dbx93iijgl138270ikww6";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gobject haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
        ];
        libraryPkgconfigDepends = [ gobjectIntrospection ];
        doHaddock = false;
@@ -84343,8 +84430,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gstvideo";
-       version = "1.0.15";
-       sha256 = "1k35x6cc1kiyhwq978dlckib2sfz7k3w2gxfqsha591a0661k10d";
+       version = "1.0.16";
+       sha256 = "0g6z15di4lk3l6hxpl6yqffw23kya3r2khxs4ah6vmkdn42wcalw";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
@@ -84687,8 +84774,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "4.0.18";
-       sha256 = "0qxqsg9p2380z6cyvky8g0a90v1zyf90ff9mmislnzm89fmc8013";
+       version = "4.0.19";
+       sha256 = "1hnxp1vk2qhi7shr4qd7khi2nq0vpn58f1g6j7dkl0h23266fwz2";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
@@ -84711,8 +84798,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "4.0.16";
-       sha256 = "010svwg3p3sdd209l8cnwhsm2dp9n6qf0shzqjdx5l1pkjv32zqm";
+       version = "4.0.17";
+       sha256 = "0lpz5a9395bqfmxbhfjfbqi4832a68ybbr1y0c475r8ya6pnx4cq";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-gobject gi-gtk
@@ -109614,8 +109701,8 @@ self: {
        pname = "hquantlib";
        version = "0.0.4.0";
        sha256 = "0x24qkbpclir0ik52hyxw3ahnqk1nqscxpx1ahnxs4w1bv7bkcmp";
-       revision = "1";
-       editedCabalFile = "02wp531cckdgj11sjamyafnij0cri7svrg4ddbvak9yki0xpm286";
+       revision = "2";
+       editedCabalFile = "1wx32kkv1as3rras5b1y3v77abx0sqsam6ssa5s7vm83pncx38y4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126702,24 +126789,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katydid_0_2_0_1" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, directory
-     , filepath, HUnit, hxt, json, mtl, parsec, regex-tdfa, tasty
-     , tasty-hunit, text
+  "katydid_0_3_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
+     , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl
+     , parsec, primes, regex-tdfa, tasty, tasty-hunit, text
      }:
      mkDerivation {
        pname = "katydid";
-       version = "0.2.0.1";
-       sha256 = "1m3rclgrjc7f1rirn39w55rw4vlr769kvm0byw53kg2ib95l2nlg";
+       version = "0.3.0.0";
+       sha256 = "1r95yxhrsw0ghv55xlq987yzhly69ihiy4bz6k3k41mfj8d7kj8v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers deepseq hxt json mtl parsec regex-tdfa
+         base bytestring containers deepseq either extra hxt ilist json mtl
+         parsec regex-tdfa text
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [
-         base containers directory filepath HUnit hxt json mtl parsec tasty
-         tasty-hunit
+         base containers directory filepath HUnit hxt ilist json mtl parsec
+         primes tasty tasty-hunit text
        ];
        benchmarkHaskellDepends = [
          base criterion deepseq directory filepath hxt mtl text
@@ -131551,12 +131639,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens-labels_0_2_0_0" = callPackage
+  "lens-labels_0_2_0_1" = callPackage
     ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
      mkDerivation {
        pname = "lens-labels";
-       version = "0.2.0.0";
-       sha256 = "137axpd2j7q4k34mav0338spk985ksh760nfv3vsm59aq9ab76xf";
+       version = "0.2.0.1";
+       sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj";
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
        homepage = "https://github.com/google/proto-lens#readme";
        description = "Integration of lenses with OverloadedLabels";
@@ -168755,15 +168843,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens_0_3_0_0" = callPackage
+  "proto-lens_0_3_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , data-default-class, deepseq, lens-family, lens-labels, parsec
      , pretty, text, transformers, void
      }:
      mkDerivation {
        pname = "proto-lens";
-       version = "0.3.0.0";
-       sha256 = "0skbqawzz58ilpvkdcx1hmpaj67pyjz449qmdrp2scdpdcc1nica";
+       version = "0.3.1.0";
+       sha256 = "1awlp7101vhqf2hhz3h93mf38lyyfx5ay3gvrdna0k3msykimgw7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base bytestring containers data-default-class deepseq
@@ -168791,14 +168879,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "proto-lens-arbitrary_0_1_2_0" = callPackage
+  "proto-lens-arbitrary_0_1_2_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
      }:
      mkDerivation {
        pname = "proto-lens-arbitrary";
-       version = "0.1.2.0";
-       sha256 = "1xkvv822qsi1h99f7xpbprq4j9yf5ykz6bd5lj5jn8626vfq0n67";
+       version = "0.1.2.1";
+       sha256 = "08qwn60pih64lk6xnqwzx3q1qja46pvaw6539r1m4kbw3wyh2kl2";
        libraryHaskellDepends = [
          base bytestring containers lens-family proto-lens QuickCheck text
        ];
@@ -168815,8 +168903,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-combinators";
-       version = "0.1.0.9";
-       sha256 = "1kkns9p2ipq4b3jy1l4lbh9h1m3vvg1l5r6ncqs0ydc2rqy1iasf";
+       version = "0.1.0.10";
+       sha256 = "0yv6wrg3wsp6617mw02n3d9gmlb9nyvfabffrznpvlaywwk8cnir";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
          base data-default-class lens-family proto-lens-protoc transformers
@@ -168861,14 +168949,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-optparse_0_1_1_1" = callPackage
+    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
+     mkDerivation {
+       pname = "proto-lens-optparse";
+       version = "0.1.1.1";
+       sha256 = "1zi6kv6af39bbbcf2v7d1l2fc2f3m6r1i2yvv4ddm6w0i7vhd1qw";
+       libraryHaskellDepends = [
+         base optparse-applicative proto-lens text
+       ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "Adapting proto-lens to optparse-applicative ReadMs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-protobuf-types" = callPackage
     ({ mkDerivation, base, Cabal, lens-family, proto-lens
      , proto-lens-protoc, text
      }:
      mkDerivation {
        pname = "proto-lens-protobuf-types";
-       version = "0.3.0.0";
-       sha256 = "1r9pbpapgi8bq938m1fliwbv8cxr18v3a3hbziq33psvas48kwa4";
+       version = "0.3.0.1";
+       sha256 = "0630yl73s11dnfripbz5pa25mzpsnjzd278qcm5yiy6zmcz0a6ca";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
          base lens-family proto-lens proto-lens-protoc text
@@ -168887,8 +168990,8 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.3.0.0";
-       sha256 = "0fh6q3alm8pw32zsg6yrf8b3gf2ww5yqsjax2hmij3y20fl26s79";
+       version = "0.3.1.0";
+       sha256 = "0hihwynqlxhbc7280v7syag0p5php4gdvchbpzvwl54hvcjakgvx";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182598,6 +182701,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scientific_0_3_6_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, criterion
+     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
+     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
+     }:
+     mkDerivation {
+       pname = "scientific";
+       version = "0.3.6.0";
+       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq hashable integer-gmp
+         integer-logarithms primitive text
+       ];
+       testHaskellDepends = [
+         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
+         tasty-hunit tasty-quickcheck tasty-smallcheck text
+       ];
+       benchmarkHaskellDepends = [ base criterion ];
+       homepage = "https://github.com/basvandijk/scientific";
+       description = "Numbers represented using scientific notation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scion" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , filepath, ghc, ghc-paths, ghc-syb, hslogger, json, multiset
@@ -219066,8 +219194,8 @@ self: {
        pname = "vector-space-points";
        version = "0.2.1.2";
        sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy";
-       revision = "3";
-       editedCabalFile = "07jrxmjw7yzrgkncam4axy3b3j5iha1d632kyd24n805b6p7vym3";
+       revision = "4";
+       editedCabalFile = "1bw8l4nlxsx2nlam9kry60k75vszfx9zxr8zj0mcb3r0r7s178mx";
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;

From 394d0f2ed947c620213bd75c8c177ef871bf24f0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 May 2018 13:01:03 +0200
Subject: [PATCH 1263/3370] haskell-gi-gdkx11: drop obsolete override

Closes https://github.com/NixOS/nixpkgs/issues/37724.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7dc1145411bf..b74515e9e04a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,8 +422,9 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
+  # The doctest phase fails because it does not have a proper environment in
+  # which to run the commands it's ought to test.
   haskell-gi = dontCheck super.haskell-gi;
-  gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; };
 
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;

From 8b11e30b84f26a92dfc0b54435e121cf31cf7a7a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 May 2018 13:26:42 +0200
Subject: [PATCH 1264/3370] github-backup: jailbreak to fix the build

---
 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 b74515e9e04a..eea7e1758162 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1026,6 +1026,9 @@ self: super: {
   # https://github.com/dmwit/encoding/pull/3
   encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;
 
+  # Work around overspecified constraint on github ==0.18.
+  github-backup = doJailbreak super.github-backup;
+
 }
 
 //

From d3784373ad0e34daa9f4e3425d69ad997355aecc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 May 2018 14:24:58 +0200
Subject: [PATCH 1265/3370] haskell-dbus-hslogger & status-notifier-item: use
 latest dbus despite lts-11.x

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index eea7e1758162..2c16b37bba88 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -638,6 +638,8 @@ self: super: {
 
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
+  dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
+  status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
 
   # https://github.com/bos/configurator/issues/22
   configurator = dontCheck super.configurator;

From 3f96895417a8ae9ad13b69b49fa3bb4da8bdddca Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 03:24:52 -0700
Subject: [PATCH 1266/3370] keepass: 2.38 -> 2.39
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/keepass/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39/bin/.keepass-wrapped --help’ got 0 exit code
- ran ‘/nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39/bin/keepass --help’ got 0 exit code
- found 2.39 with grep in /nix/store/0w1c39pg7347dwhkwz3b5jizzzc5v885-keepass-2.39
- directory tree listing: https://gist.github.com/da7324a17ad7e95a053f6a2655ec07bc
---
 pkgs/applications/misc/keepass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 5e492fc621fe..8676ba70858f 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -3,11 +3,11 @@
 
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.38";
+  version = "2.39";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "0m33gfpvv01xc28k4rrc8llbyk6qanm9rsqcnv8ydms0cr78dbbk";
+    sha256 = "05mrbzlkr2h42cls6xhas76dg8kyic4fijwckrh0b0qv5pp71c11";
   };
 
   sourceRoot = ".";

From d513634e6c590eca232e1ab3828bdf46e882bd6a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:59:21 -0700
Subject: [PATCH 1267/3370] avrgcc: 7.3.0 -> 8.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/avr-gcc/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-g++ --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-c++ --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-8.1.0 --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-tool -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-tool --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcov-dump help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-cpp --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ar -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ar --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-nm -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-nm --help’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ranlib -h’ got 0 exit code
- ran ‘/nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0/bin/avr-gcc-ranlib --help’ got 0 exit code
- found 8.1.0 with grep in /nix/store/kj1gijncvyaz6a0v4fg78420i9xrhzg2-avr-gcc-8.1.0
- directory tree listing: https://gist.github.com/bc5f032e2fae6d464814f0d61feb07dd
---
 pkgs/development/misc/avr/gcc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/misc/avr/gcc/default.nix b/pkgs/development/misc/avr/gcc/default.nix
index 824979291833..cce11616e2f1 100644
--- a/pkgs/development/misc/avr/gcc/default.nix
+++ b/pkgs/development/misc/avr/gcc/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, gmp, mpfr, libmpc, zlib, avrbinutils, texinfo }:
 
 let
-  version = "7.3.0";
+  version = "8.1.0";
 in
 stdenv.mkDerivation {
 
   name = "avr-gcc-${version}";
   src = fetchurl {
     url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz";
-    sha256 = "0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43";
+    sha256 = "0lxil8x0jjx7zbf90cy1rli650akaa6hpk8wk8s62vk2jbwnc60x";
   };
 
   patches = [

From 36368d99b78aa0143b8dca55e569e333bd8baae1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:01:20 -0700
Subject: [PATCH 1268/3370] abcm2ps: 8.13.20 -> 8.13.21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/abcm2ps/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/jz4zd20m2cmgcgyixg5xc08y6srqskyv-abcm2ps-8.13.21/bin/abcm2ps -h’ got 0 exit code
- found 8.13.21 with grep in /nix/store/jz4zd20m2cmgcgyixg5xc08y6srqskyv-abcm2ps-8.13.21
- directory tree listing: https://gist.github.com/8743b1d2b794435906fc0d11cbfcb803
---
 pkgs/tools/audio/abcm2ps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index f93231d80222..6d782fdba35c 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "abcm2ps-${version}";
-  version = "8.13.20";
+  version = "8.13.21";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "0zgwrclky6b1l1pd07s31azyxf4clwi3cp5x0wjix0wp78b89pbx";
+    sha256 = "03r98xdw2vdwsi726i0zb7p0ljp3fpzjl1nhzfwz57m3zmqvz6r1";
   };
 
   prePatch = ''

From cabd64a83b047c5769e11218f2b2f3a4db90900c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:03:41 -0700
Subject: [PATCH 1269/3370] abcmidi: 2018.04.24 -> 2018.05.02
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/abcMIDI/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abc2midi -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/midi2abc -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/midi2abc --help’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abc2abc -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext --help’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/mftext help’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/yaps -h’ got 0 exit code
- ran ‘/nix/store/cw3374p08xihakpimdka1afpa8s0kqh9-abcMIDI-2018.05.02/bin/abcmatch -h’ got 0 exit code
- directory tree listing: https://gist.github.com/ab3313bb3097bf194e4ac83d6cc0b9bc
---
 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 ff6a7af03efe..a0e7b1f906c9 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2018.04.24";
+  version = "2018.05.02";
 
   src = fetchzip {
     url = "http://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "02n5xnagj1z44b23zmaxdkmn8nisrb34r8hb5xs7cr1wq7m4fmlh";
+    sha256 = "0pva0kwkwdrq4mfgiz389dhaqv66csqjaddirzxmhvvi6qji5d24";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

From 084efc26e728ed801283375438b524a3bc5c41a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 7 May 2018 10:07:54 -0300
Subject: [PATCH 1270/3370] iconpack-obsidian: restrict platforms to linux

---
 pkgs/data/icons/iconpack-obsidian/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix
index efcaa1cbc53e..b033f510f0b9 100644
--- a/pkgs/data/icons/iconpack-obsidian/default.nix
+++ b/pkgs/data/icons/iconpack-obsidian/default.nix
@@ -28,7 +28,8 @@ stdenv.mkDerivation rec {
     description = "Gnome Icon Pack based upon Faenza";
     homepage = https://github.com/madmaxms/iconpack-obsidian;
     license = licenses.lgpl3;
-    platforms = platforms.all;
+    # darwin cannot deal with file names differing only in case
+    platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];
   };
 }

From 9fde82e3ff7f1106643d40f21c636309922b6506 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:27:02 -0700
Subject: [PATCH 1271/3370] cfr: 0_125 -> 0.128
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cfr/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr -h’ got 0 exit code
- ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr --help’ got 0 exit code
- ran ‘/nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128/bin/cfr help’ got 0 exit code
- found 0.128 with grep in /nix/store/8hlizlz9d6cp6n3w3qx7s0wm2z3d3g8f-cfr-0.128
- directory tree listing: https://gist.github.com/3d40ccd7bfb3d81eb71e8a9033d1a127
---
 pkgs/development/tools/java/cfr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index c7cc05439763..39677ba719e2 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cfr-${version}";
-  version = "0_125";
+  version = "0.128";
 
   src = fetchurl {
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
-    sha256 = "1ad9ddg79cybv8j8l3mm67znyw54z5i55x4m9n239fn26p1ndawa";
+    sha256 = "09mx1f6d1p57q5r05nvgm1xrhqv34n7v7rwq875whb441h1dnsix";
   };
 
   buildInputs = [ makeWrapper ];

From b083a86d745f42faddba24c127c3ce71701c33dc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:34:51 -0700
Subject: [PATCH 1272/3370] bzflag: 2.4.12 -> 2.4.14

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bzflag/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.14 with grep in /nix/store/z93gp3xa0spbywriag5pg04k2yy8jy3z-bzflag-2.4.14
- directory tree listing: https://gist.github.com/b4b3a993ddc5d7c26bb2c23aad53029c
---
 pkgs/games/bzflag/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index 332e84402bb1..e6d23cf1b9f0 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bzflag";
-  version = "2.4.12";
+  version = "2.4.14";
 
   src = fetchurl {
     url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
-    sha256 = "0380y47kgl97ld3dybjgjr2zwxqky8f938k9z7vad647cic3m8d8";
+    sha256 = "1p4vaap8msk7cfqkcc2nrchw7pp4inbyx706zmlwnmpr9k0nx909";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 9167bd48507d4a9e28540e3c105f8d93191d781e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 14:44:30 +0100
Subject: [PATCH 1273/3370] mydumper: restrict to linux

---
 pkgs/tools/backup/mydumper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix
index b6c5bfd91faa..e87878551254 100644
--- a/pkgs/tools/backup/mydumper/default.nix
+++ b/pkgs/tools/backup/mydumper/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = ''High-perfomance MySQL backup tool'';
     homepage = https://github.com/maxbube/mydumper;
     license = licenses.gpl3;
-    platforms = platforms.all;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ izorkin ];
   };
 }

From f5249fa04211d7f66ab9c1f4037816b2bfc13ffa Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 7 May 2018 15:39:38 +0200
Subject: [PATCH 1274/3370] grafana: 5.1.0 -> 5.1.1

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index df89e67bffc1..bcae836cbf21 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.1.0";
+  version = "5.1.1";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "1j8l8v5iq1mpvc8j7vbwqqd0xhv9ysl05lxwm524cqljynslaq8f";
+    sha256 = "0b8i293bfxyblfqwxpb1dkgva95f0bljpvp27j4l4hmjm2g8bpd9";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "08wha1n3lqn27pc3bc3sg94y47npy69ydh2ad1rbkmvllnjbwx3z";
+    sha256 = "0kyfyxcj2yy9v1in6h6kh6sl5p7m03g643qpjriplwwa93bdmk8k";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From a75aee39236d5e343fcc8bfa3602a7e1b9ee30c9 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 27 Mar 2018 19:57:52 -0400
Subject: [PATCH 1275/3370] nixos/grub: support initrd secrets

---
 nixos/doc/manual/release-notes/rl-1809.xml    |  9 ++++++
 .../modules/system/boot/loader/grub/grub.nix  | 20 ++++---------
 .../system/boot/loader/grub/install-grub.pl   | 30 +++++++++++--------
 3 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 7136f4540502..8cce0db7a546 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -107,6 +107,15 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      a stable URL for Nixpkgs to use to package this proprietary software.
     </para>
    </listitem>
+   <listitem>
+    <para>
+      The GRUB specific option <option>boot.loader.grub.extraInitrd</option>
+      has been replaced with the generic option
+      <option>boot.initrd.secrets</option>. This option creates a secondary
+      initrd from the specified files, rather than using a manually created
+      initrd file.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index e2cff1c1bd94..9d9f5e41e54e 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -35,6 +35,7 @@ let
     let
       efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
       efiSysMountPoint' = replaceChars [ "/" ] [ "-" ] efiSysMountPoint;
+      initrdSecrets = config.boot.initrd.secrets != {};
     in
     pkgs.writeText "grub-config.xml" (builtins.toXML
     { splashImage = f cfg.splashImage;
@@ -49,12 +50,12 @@ let
       storePath = config.boot.loader.grub.storePath;
       bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId;
       timeout = if config.boot.loader.timeout == null then -1 else config.boot.loader.timeout;
-      inherit efiSysMountPoint;
+      inherit efiSysMountPoint initrdSecrets;
       inherit (args) devices;
       inherit (efi) canTouchEfiVariables;
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber
-        extraEntriesBeforeNixOS extraPrepareConfig extraInitrd configurationLimit copyKernels
+        extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels
         default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios;
       path = (makeBinPath ([
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
@@ -283,19 +284,6 @@ in
         '';
       };
 
-      extraInitrd = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        example = "/boot/extra_initramfs.gz";
-        description = ''
-          The path to a second initramfs to be supplied to the kernel.
-          This ramfs will not be copied to the store, so that it can
-          contain secrets such as LUKS keyfiles or ssh keys.
-          This implies that rolling back to a previous configuration
-          won't rollback the state of this file.
-        '';
-      };
-
       useOSProber = mkOption {
         default = false;
         type = types.bool;
@@ -528,6 +516,8 @@ in
         { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; }
       ];
 
+      boot.loader.supportsInitrdSecrets = true;
+
       system.build.installBootLoader =
         let
           install-grub-pl = pkgs.substituteAll {
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 8bd203106f55..60d952889895 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -49,7 +49,7 @@ my $extraPrepareConfig = get("extraPrepareConfig");
 my $extraPerEntryConfig = get("extraPerEntryConfig");
 my $extraEntries = get("extraEntries");
 my $extraEntriesBeforeNixOS = get("extraEntriesBeforeNixOS") eq "true";
-my $extraInitrd = get("extraInitrd");
+my $initrdSecrets = get("initrdSecrets");
 my $splashImage = get("splashImage");
 my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
@@ -228,13 +228,6 @@ my $grubStore;
 if ($copyKernels == 0) {
     $grubStore = GrubFs($storePath);
 }
-my $extraInitrdPath;
-if ($extraInitrd) {
-    if (! -f $extraInitrd) {
-        print STDERR "Warning: the specified extraInitrd " . $extraInitrd . " doesn't exist. Your system won't boot without it.\n";
-    }
-    $extraInitrdPath = GrubFs($extraInitrd);
-}
 
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";
@@ -348,9 +341,23 @@ sub addEntry {
 
     my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel"));
     my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd"));
-    if ($extraInitrd) {
-        $initrd .= " " .$extraInitrdPath->path;
+
+    # Include second initrd with secrets
+    if ($initrdSecrets) {
+      # Get last element of path
+      $initrd =~ /\/([^\/]+)$/;
+      my $initrdSecretsPath = "$bootPath/kernels/$1-secrets";
+      $initrd .= " $initrd-secrets";
+      my $oldUmask = umask;
+      # Make sure initrd is not world readable (won't work if /boot is FAT)
+      umask 0137;
+      my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX");
+      system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets\n";
+      rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place\n";
+      umask $oldUmask;
+      $copied{$initrdSecretsPath} = 1;
     }
+
     my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef;
 
     # FIXME: $confName
@@ -373,9 +380,6 @@ sub addEntry {
         if ($copyKernels == 0) {
             $conf .= $grubStore->search . "\n";
         }
-        if ($extraInitrd) {
-            $conf .= $extraInitrdPath->search . "\n";
-        }
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";

From 8be7bb656f3131d57e71aed37b46aa263653ba51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Mon, 7 May 2018 17:10:19 +0200
Subject: [PATCH 1276/3370] sublime3: 3162(dev), 3143(stable) -> 3170(stable,
 dev)

---
 pkgs/applications/editors/sublime/3/packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 01445ade4732..98cfc03c3d26 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,14 +5,14 @@ let
 in
   rec {
     sublime3-dev = common {
-      buildVersion = "3162";
-      x32sha256 = "190il02hqvv64w17w7xc1fz2wkbhk5a5y96jb25dvafmslm46d4i";
-      x64sha256 = "1nsjhjs6zajhx7m3dk7i450krg6pb03zffm1n3m1v0xb9zr37xz3";
+      buildVersion = "3170";
+      x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
+      x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
     } {};
 
     sublime3 = common {
-      buildVersion = "3143";
-      x32sha256 = "0dgpx4wij2m77f478p746qadavab172166bghxmj7fb61nvw9v5i";
-      x64sha256 = "06b554d2cvpxc976rvh89ix3kqc7klnngvk070xrs8wbyb221qcw";
+      buildVersion = "3170";
+      x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
+      x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
     } {};
   }

From 9f1017c67927998fb2ff29ea48f4df43c1b91cee Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Sun, 6 May 2018 09:35:01 -0700
Subject: [PATCH 1277/3370] sit: 0.3.0 -> 0.3.2

---
 .../version-management/sit/default.nix             | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 84211543c3b3..0cc75f8bd5a3 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, fetchFromGitHub, rustPlatform }:
+{ stdenv, fetchFromGitHub, rustPlatform, cmake, libzip }:
 
 rustPlatform.buildRustPackage rec {
   name = "sit-${version}";
-  version = "0.3.0";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "sit-it";
     repo = "sit";
     rev = "v${version}";
-    sha256 = "1si4fg02wxi35hpkr58na06h19yjw6qd9c5mbb9xfkkzgz5mnssj";
+    sha256 = "0lhl4rrfmsi76498mg5si2xagl8l2pi5d92dxhsyzszpwn5jdp57";
   };
 
-  cargoSha256 = "083p7z7blj064840ddgnxvqjmih4bmy92clds3qgv5v7lh63wfmn";
+  buildInputs = [ cmake libzip ];
+
+  cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg";
 
   meta = with stdenv.lib; {
     description = "Serverless Information Tracker";
-    homepage = http://sit-it.org/;
+    homepage = https://sit.sh/;
     license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ dywedir ];
+    maintainers = with maintainers; [ dywedir yrashk ];
     platforms = platforms.all;
   };
 }

From 04002e2b7186c166af87c20da7a7ceb8c0edb021 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Mon, 7 May 2018 11:01:50 -0500
Subject: [PATCH 1278/3370] tamarin-prover: 1.3.1 -> 1.4.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../science/logic/tamarin-prover/default.nix           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index 4461fa675e89..fb37554b65fe 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -4,12 +4,12 @@
 }:
 
 let
-  version = "1.3.1";
+  version = "1.4.0";
   src = fetchFromGitHub {
     owner  = "tamarin-prover";
     repo   = "tamarin-prover";
-    rev    = "ab8a155452e9e9c57ccb4bbe1b94d7677ea5ce21";
-    sha256 = "02ycxxkcpc0dzybaq63viciydq1ik8wiv2blk8mvnz3ssxw3sjik";
+    rev    = "7ced07a69f8e93178f9a95797479277a736ae572";
+    sha256 = "02pyw22h90228g6qybjpdvpcm9d5lh96f5qwmy2hv2bylz05z3nn";
   };
 
   # tamarin has its own dependencies, but they're kept inside the repo,
@@ -80,7 +80,7 @@ mkDerivation (common "tamarin-prover" src // {
     wrapProgram $out/bin/tamarin-prover \
       --prefix PATH : ${lib.makeBinPath [ which maude graphviz sapic ]}
     # so that the package can be used as a vim plugin to install syntax coloration
-    install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim 
+    install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/{spthy,sapic}.vim
     install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim
   '';
 
@@ -89,7 +89,7 @@ mkDerivation (common "tamarin-prover" src // {
   executableHaskellDepends = (with haskellPackages; [
     base binary binary-orphans blaze-builder blaze-html bytestring
     cmdargs conduit containers monad-control deepseq directory fclabels file-embed
-    filepath gitrev http-types HUnit lifted-base mtl parsec process
+    filepath gitrev http-types HUnit lifted-base mtl monad-unlift parsec process
     resourcet safe shakespeare tamarin-prover-term
     template-haskell text threads time wai warp yesod-core yesod-static
   ]) ++ [ tamarin-prover-utils

From 046e374c9958969462919d192872606bb9f0ed4a Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 00:11:10 +0200
Subject: [PATCH 1279/3370] virtualisation/qemu-vm.nix: use lib.optionalString

---
 nixos/modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 66ff43c8547d..6acaf63c26a8 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -23,7 +23,7 @@ let
 
   cfg = config.virtualisation;
 
-  qemuGraphics = if cfg.graphics then "" else "-nographic";
+  qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";
   kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
   ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
 

From 36f4b7f6ba9506a336587c5a528416e948299448 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 00:12:06 +0200
Subject: [PATCH 1280/3370] virtualisation/qemu-vm.nix: remove ttys

unused.
---
 nixos/modules/virtualisation/qemu-vm.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 6acaf63c26a8..5b98f359de02 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -25,7 +25,6 @@ let
 
   qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";
   kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
-  ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ];
 
   # XXX: This is very ugly and in the future we really should use attribute
   # sets to build ALL of the QEMU flags instead of this mixed mess of Nix

From 70c57fe3638555d3ae1366e26be445d7f67a81e7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 13:44:45 +0200
Subject: [PATCH 1281/3370] qemu: fix spaces in postInstall

---
 pkgs/applications/virtualization/qemu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index dd68eb19380f..eee42d2ce1ea 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
   postInstall =
     if stdenv.isx86_64       then ''makeWrapper $out/bin/qemu-system-x86_64  $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else if stdenv.isi686    then ''makeWrapper $out/bin/qemu-system-i386    $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
-    else if stdenv.isAarch32     then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
+    else if stdenv.isAarch32 then ''makeWrapper $out/bin/qemu-system-arm     $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else if stdenv.isAarch64 then ''makeWrapper $out/bin/qemu-system-aarch64 $out/bin/qemu-kvm --add-flags "\$([ -e /dev/kvm ] && echo -enable-kvm)"''
     else "";
 

From d4468bedb52bf03ff125d721634f83604bddd589 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 13:51:04 +0200
Subject: [PATCH 1282/3370] modules/virtualisation/qemu-vm: always enable
 serial console

Always enable both tty and serial console, but set preferred console
depending on cfg.graphical.
Even in qemu graphical mode, you can switch to the serial console via
Ctrl+Alt+3.

With that being done, you also don't need to specify
`systemd.services."serial-getty@ttyS0".enable = true;` either as described in
https://nixos.wiki/wiki/Cheatsheet#Building_a_service_as_a_VM_.28for_testing.29,
as systemd automatically spawns a getty on consoles passwd via cmdline.

This also means, vms built by 'nixos-rebuild build-vm' can simply be run
properly in nographic mode by appending `-nographic` to `result/bin/run-*-vm`,
without the need to explicitly add platform-specific QEMU_KERNEL_PARAMS.
---
 nixos/modules/virtualisation/qemu-vm.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 5b98f359de02..c788f3ff8baf 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -24,7 +24,11 @@ let
   cfg = config.virtualisation;
 
   qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";
-  kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";
+
+  # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics
+  kernelConsoles = let
+    consoles = [ "console=${qemuSerialDevice}" "console=tty0" ];
+    in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles);
 
   # XXX: This is very ugly and in the future we really should use attribute
   # sets to build ALL of the QEMU flags instead of this mixed mess of Nix
@@ -107,7 +111,7 @@ let
             ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
-            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \
+            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsoles} $QEMU_KERNEL_PARAMS" \
           ''} \
           $extraDisks \
           ${qemuGraphics} \
@@ -247,9 +251,10 @@ in
         default = true;
         description =
           ''
-            Whether to run QEMU with a graphics window, or access
-            the guest computer serial port through the host tty.
-          '';
+            Whether to run QEMU with a graphics window, or in nographic mode.
+            Serial console will be enabled on both settings, but this will
+            change the preferred console.
+            '';
       };
 
     virtualisation.cores =

From 7499e4a5b917227696b7292ae1bd728d6b1978b0 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 5 May 2018 14:12:10 +0200
Subject: [PATCH 1283/3370] modules/virtualisation/qemu-vm: set console
 baudrate to 115200

---
 nixos/modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index c788f3ff8baf..f7ec5b088c1b 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -27,7 +27,7 @@ let
 
   # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics
   kernelConsoles = let
-    consoles = [ "console=${qemuSerialDevice}" "console=tty0" ];
+    consoles = [ "console=${qemuSerialDevice},115200n8" "console=tty0" ];
     in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles);
 
   # XXX: This is very ugly and in the future we really should use attribute

From 1bcd9c48fc30b02bc5565f01aaca4d3a9fb5178f Mon Sep 17 00:00:00 2001
From: Risto Helinko <risto.helinko@gmail.com>
Date: Mon, 7 May 2018 20:46:39 +0300
Subject: [PATCH 1284/3370] libu2f-server: 1.0.1 -> 1.1.0

---
 pkgs/development/libraries/libu2f-server/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix
index 5d7da127c2a9..6140c13e493d 100644
--- a/pkgs/development/libraries/libu2f-server/default.nix
+++ b/pkgs/development/libraries/libu2f-server/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, json_c, openssl, check }:
+{ stdenv, fetchurl, pkgconfig, json_c, openssl, check, file, help2man, which, gengetopt }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-server-1.0.1";
-
+  name = "libu2f-server-1.1.0";
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-server/Releases/${name}.tar.xz";
-    sha256 = "0vhzixz1s629qv9dpdj6b7fxfyxnr5j2vx2cq9q6v790a68ga656";
+    sha256 = "0xx296nmmqa57w0v5p2kasl5zr1ms2gh6qi4lhv6xvzbmjp3rkcd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ json_c openssl check ];
+  buildInputs = [ json_c openssl check file help2man which gengetopt ];
 
   meta = with stdenv.lib; {
     homepage = https://developers.yubico.com/libu2f-server/;

From 1c87d77efea75e29061d13e11af68efa6f50aee2 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 7 May 2018 12:47:07 -0500
Subject: [PATCH 1285/3370] ppp: add dontBuild = true

Hopefully this is the last one.
---
 pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
index 9ee8f2255b44..17c24bebfda7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ppp/default.nix
@@ -1,6 +1,7 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
+  dontBuild = true;
   installPhase = ''
     mkdir -p $out/include/ppp
 

From 0b04ed61771d9f4848347d468b73ed581d43f847 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 7 May 2018 12:53:03 -0500
Subject: [PATCH 1286/3370] xidlehook: only fixup on linux

---
 pkgs/tools/X11/xidlehook/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index a71531eebc5b..e5717f7f7d4f 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ];
   nativeBuildInputs = [ pkgconfig patchelf ];
 
-  postFixup = ''
+  postFixup = lib.optionalString stdenv.isLinux ''
     RPATH="$(patchelf --print-rpath $out/bin/xidlehook)"
     patchelf --set-rpath "$RPATH:${libpulseaudio}/lib" $out/bin/xidlehook
   '';

From a55484469259bf6074ce7e4e1c025678c397d6af Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Mon, 7 May 2018 19:53:08 +0200
Subject: [PATCH 1287/3370] pythonPackages.phonenumbers: 8.9.3 -> 8.9.5

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

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 47a154a529c7..5f1c1b767040 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.9.3";
+  version = "8.9.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "68f7402c6d2646adff4df895471f2b47fd61d0cf57c59a06aacc88dfff04a1cb";
+    sha256 = "09swdf3f9sdvqyyzkap93012m9fnhamizf42d5kzpdjwikvsfx8x";
   };
 
   meta = {

From 4b93f21ced4f648de11a92e2d8c5d9bdfc39d086 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 May 2018 19:44:56 +0200
Subject: [PATCH 1288/3370] unixtools: refactor for less redundancy

---
 pkgs/top-level/unix-tools.nix | 216 +++++++++++++++++-----------------
 1 file changed, 105 insertions(+), 111 deletions(-)

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 26adcda8ee17..6d6e2b2f2516 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -11,7 +11,6 @@
 # input, not "procps" which requires Linux.
 
 let
-
   singleBinary = cmd: providers: let
       provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
     in runCommand cmd {
@@ -27,8 +26,6 @@ let
       ln -s "${provider}" "$out/bin/${cmd}"
     '';
 
-in rec {
-
   # more is unavailable in darwin
   # just use less
   more_compat = runCommand "more" {} ''
@@ -36,117 +33,114 @@ in rec {
     ln -s ${pkgs.less}/bin/less $out/bin/more
   '';
 
-  # singular binaries
-  arp = singleBinary "arp" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.network_cmds;
+  bins = lib.mapAttrs singleBinary {
+    # singular binaries
+    arp = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    col = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.text_cmds;
+    };
+    eject = {
+      linux = pkgs.utillinux;
+    };
+    getopt = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.getopt;
+    };
+    fdisk = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    fsck = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    hexdump = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    hostname = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    ifconfig = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    logger = {
+      linux = pkgs.utillinux;
+    };
+    more = {
+      linux = pkgs.utillinux;
+      darwin = more_compat;
+    };
+    mount = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    netstat = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    ping = {
+      linux = pkgs.iputils;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    ps = {
+      linux = pkgs.procps;
+      darwin = pkgs.darwin.ps;
+    };
+    quota = {
+      linux = pkgs.linuxquota;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    route = {
+      linux = pkgs.nettools;
+      darwin = pkgs.darwin.network_cmds;
+    };
+    script = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    sysctl = {
+      linux = pkgs.procps;
+      darwin = pkgs.darwin.system_cmds;
+    };
+    top = {
+      linux = pkgs.procps;
+      darwin = pkgs.darwin.top;
+    };
+    umount = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.diskdev_cmds;
+    };
+    whereis = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.shell_cmds;
+    };
+    wall = {
+      linux = pkgs.utillinux;
+    };
+    write = {
+      linux = pkgs.utillinux;
+      darwin = pkgs.darwin.basic_cmds;
+    };
   };
-  col = singleBinary "col" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.text_cmds;
-  };
-  eject = singleBinary "eject" {
-    linux = pkgs.utillinux;
-  };
-  getopt = singleBinary "getopt" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.getopt;
-  };
-  fdisk = singleBinary "fdisk" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  fsck = singleBinary "fsck" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  hexdump = singleBinary "hexdump" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.shell_cmds;
-  };
-  hostname = singleBinary "hostname" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.shell_cmds;
-  };
-  ifconfig = singleBinary "ifconfig" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.network_cmds;
-  };
-  logger = singleBinary "logger" {
-    linux = pkgs.utillinux;
-  };
-  more = singleBinary "more" {
-    linux = pkgs.utillinux;
-    darwin = more_compat;
-  };
-  mount = singleBinary "mount" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  netstat = singleBinary "netstat" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.network_cmds;
-  };
-  ping = singleBinary "ping" {
-    linux = pkgs.iputils;
-    darwin = pkgs.darwin.network_cmds;
-  };
-  ps = singleBinary "ps" {
-    linux = pkgs.procps;
-    darwin = pkgs.darwin.ps;
-  };
-  quota = singleBinary "quota" {
-    linux = pkgs.linuxquota;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  route = singleBinary "route" {
-    linux = pkgs.nettools;
-    darwin = pkgs.darwin.network_cmds;
-  };
-  script = singleBinary "script" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.shell_cmds;
-  };
-  sysctl = singleBinary "sysctl" {
-    linux = pkgs.procps;
-    darwin = pkgs.darwin.system_cmds;
-  };
-  top = singleBinary "top" {
-    linux = pkgs.procps;
-    darwin = pkgs.darwin.top;
-  };
-  umount = singleBinary "umount" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.diskdev_cmds;
-  };
-  whereis = singleBinary "whereis" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.shell_cmds;
-  };
-  wall = singleBinary "wall" {
-    linux = pkgs.utillinux;
-  };
-  write = singleBinary "write" {
-    linux = pkgs.utillinux;
-    darwin = pkgs.darwin.basic_cmds;
+
+  makeCompat = name': value: buildEnv {
+      name = name' + "-compat";
+      paths = value;
   };
 
   # Compatibility derivations
   # Provided for old usage of these commands.
-
-  procps = buildEnv {
-    name = "procps-compat";
-    paths = [ ps sysctl top ];
+  compat = with bins; lib.mapAttrs makeCompat {
+    procps = [ ps sysctl top ];
+    utillinux = [ fsck fdisk getopt hexdump mount
+                  script umount whereis write col ];
+    nettools = [ arp hostname ifconfig netstat route ];
   };
-
-  utillinux = buildEnv {
-    name = "utillinux-compat";
-    paths = [ fsck fdisk getopt hexdump mount
-              script umount whereis write col ];
-  };
-
-  nettools = buildEnv {
-    name = "nettools-compat";
-    paths = [ arp hostname ifconfig netstat route ];
-  };
-}
+in bins // compat

From ab0d4f26ff6a35df04968dd97e2a79a5fd901cfb Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Mon, 7 May 2018 20:16:58 +0200
Subject: [PATCH 1289/3370] unixtools: use 2-space indent

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

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 6d6e2b2f2516..36fba3fbd479 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -131,8 +131,8 @@ let
   };
 
   makeCompat = name': value: buildEnv {
-      name = name' + "-compat";
-      paths = value;
+    name = name' + "-compat";
+    paths = value;
   };
 
   # Compatibility derivations

From 08e8701673a84b800e0960c50f78793a23e635ba Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 24 Mar 2018 17:38:45 +0100
Subject: [PATCH 1290/3370] lib.types: fix loaOf behavior for long lists

Assigning a list of 10 or more elements to an option having the type
`loaOf a` produces a configuration value that is not honoring the
order of the original list. This commit fixes this and a related issue
arising when 10 or more lists are merged into this type of option.
---
 lib/tests/modules.sh                          |  6 ++++
 lib/tests/modules/loaOf-with-long-list.nix    | 19 ++++++++++++
 .../modules/loaOf-with-many-list-merges.nix   | 19 ++++++++++++
 lib/types.nix                                 | 29 +++++++++++++------
 4 files changed, 64 insertions(+), 9 deletions(-)
 create mode 100644 lib/tests/modules/loaOf-with-long-list.nix
 create mode 100644 lib/tests/modules/loaOf-with-many-list-merges.nix

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index c6b3fd912a9b..b83e1eb7d82d 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -143,6 +143,12 @@ checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
 checkConfigError 'The option value .* in .* is not.*8 bit signed integer.* or string convertible to it' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
 checkConfigError 'unrecognised JSON value' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
 
+# Check loaOf with long list.
+checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-long-list.nix
+
+# Check loaOf with many merges of lists.
+checkConfigOutput "1 2 3 4 5 6 7 8 9 10" config.result ./loaOf-with-many-list-merges.nix
+
 cat <<EOF
 ====== module tests ======
 $pass Pass
diff --git a/lib/tests/modules/loaOf-with-long-list.nix b/lib/tests/modules/loaOf-with-long-list.nix
new file mode 100644
index 000000000000..f30903c47e50
--- /dev/null
+++ b/lib/tests/modules/loaOf-with-long-list.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+{
+  options = {
+    loaOfInt = lib.mkOption {
+      type = lib.types.loaOf lib.types.int;
+    };
+
+    result = lib.mkOption {
+      type = lib.types.str;
+    };
+  };
+
+  config = {
+    loaOfInt = [ 1 2 3 4 5 6 7 8 9 10 ];
+
+    result = toString (lib.attrValues config.loaOfInt);
+  };
+}
diff --git a/lib/tests/modules/loaOf-with-many-list-merges.nix b/lib/tests/modules/loaOf-with-many-list-merges.nix
new file mode 100644
index 000000000000..f8f8a8da82bc
--- /dev/null
+++ b/lib/tests/modules/loaOf-with-many-list-merges.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+{
+  options = {
+    loaOfInt = lib.mkOption {
+      type = lib.types.loaOf lib.types.int;
+    };
+
+    result = lib.mkOption {
+      type = lib.types.str;
+    };
+  };
+
+  config = {
+    loaOfInt = lib.mkMerge (map lib.singleton [ 1 2 3 4 5 6 7 8 9 10 ]);
+
+    result = toString (lib.attrValues config.loaOfInt);
+  };
+}
diff --git a/lib/types.nix b/lib/types.nix
index 17acb92a9441..772716897725 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -280,15 +280,26 @@ rec {
     # List or attribute set of ...
     loaOf = elemType:
       let
-        convertIfList = defIdx: def:
+        convertAllLists = defs:
+          let
+            padWidth = stringLength (toString (length defs));
+            unnamedPrefix = i: "unnamed-" + fixedWidthNumber padWidth i + ".";
+          in
+            imap1 (i: convertIfList (unnamedPrefix i)) defs;
+
+        convertIfList = unnamedPrefix: def:
           if isList def.value then
-            { inherit (def) file;
-              value = listToAttrs (
-                imap1 (elemIdx: elem:
-                  { name = elem.name or "unnamed-${toString defIdx}.${toString elemIdx}";
-                    value = elem;
-                  }) def.value);
-            }
+            let
+              padWidth = stringLength (toString (length def.value));
+              unnamed = i: unnamedPrefix + fixedWidthNumber padWidth i;
+            in
+              { inherit (def) file;
+                value = listToAttrs (
+                  imap1 (elemIdx: elem:
+                    { name = elem.name or (unnamed elemIdx);
+                      value = elem;
+                    }) def.value);
+              }
           else
             def;
         listOnly = listOf elemType;
@@ -297,7 +308,7 @@ rec {
         name = "loaOf";
         description = "list or attribute set of ${elemType.description}s";
         check = x: isList x || isAttrs x;
-        merge = loc: defs: attrOnly.merge loc (imap1 convertIfList defs);
+        merge = loc: defs: attrOnly.merge loc (convertAllLists defs);
         getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
         getSubModules = elemType.getSubModules;
         substSubModules = m: loaOf (elemType.substSubModules m);

From c7577fa1c3aab76f20c5798948f9448c33cb3ae6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 7 May 2018 19:11:18 +0100
Subject: [PATCH 1291/3370] mbedtls: remove darwin patch

---
 .../libraries/mbedtls/darwin_dylib.patch      | 28 -------------------
 .../development/libraries/mbedtls/default.nix | 20 ++++++-------
 2 files changed, 10 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/libraries/mbedtls/darwin_dylib.patch

diff --git a/pkgs/development/libraries/mbedtls/darwin_dylib.patch b/pkgs/development/libraries/mbedtls/darwin_dylib.patch
deleted file mode 100644
index bc6992d6e779..000000000000
--- a/pkgs/development/libraries/mbedtls/darwin_dylib.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/library/Makefile b/library/Makefile
-index 28f9231..ad9cc32 100644
---- a/library/Makefile
-+++ b/library/Makefile
-@@ -103,9 +103,9 @@ libmbedtls.so: libmbedtls.$(SOEXT_TLS)
- 	echo "  LN    $@ -> $<"
- 	ln -sf $< $@
- 
--libmbedtls.dylib: $(OBJS_TLS)
-+libmbedtls.dylib: $(OBJS_TLS) libmbedx509.dylib
- 	echo "  LD    $@"
--	$(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS)
-+	$(CC) -dynamiclib -L. -lmbedcrypto -lmbedx509 $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_TLS)
- 
- libmbedtls.dll: $(OBJS_TLS) libmbedx509.dll
- 	echo "  LD    $@"
-@@ -126,9 +126,9 @@ libmbedx509.so: libmbedx509.$(SOEXT_X509)
- 	echo "  LN    $@ -> $<"
- 	ln -sf $< $@
- 
--libmbedx509.dylib: $(OBJS_X509)
-+libmbedx509.dylib: $(OBJS_X509) libmbedcrypto.dylib
- 	echo "  LD    $@"
--	$(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509)
-+	$(CC) -dynamiclib -L. -lmbedcrypto  $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_X509)
- 
- libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll
- 	echo "  LD    $@"
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index bd10824bfa1e..74be133b0687 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -12,8 +12,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl ];
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin_dylib.patch ];
-
   postPatch = ''
     patchShebangs .
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
@@ -34,15 +32,17 @@ stdenv.mkDerivation rec {
   ];
 
   postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-      install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib
-      install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib
-      install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib
+    install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedtls.dylib
+    install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $out/lib/libmbedx509.dylib
+    install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $out/lib/libmbedtls.dylib
 
-      for exe in $out/bin/*; do
-          install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe
-          install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe
-          install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe
-      done
+    for exe in $out/bin/*; do
+      if [[ $exe != *.sh ]]; then
+        install_name_tool -change libmbedtls.dylib $out/lib/libmbedtls.dylib $exe
+        install_name_tool -change libmbedx509.dylib $out/lib/libmbedx509.dylib $exe
+        install_name_tool -change libmbedcrypto.dylib $out/lib/libmbedcrypto.dylib $exe
+      fi
+    done
   '';
 
   doCheck = true;

From 248b05046222d1bcd2df6ef49769e233df3d21d7 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 7 May 2018 13:38:23 -0500
Subject: [PATCH 1292/3370] xidlehook: fix eavl

---
 pkgs/tools/X11/xidlehook/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index e5717f7f7d4f..733a8eb630dd 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -1,4 +1,5 @@
-{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }:
+{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf
+, stdenv}:
 
 rustPlatform.buildRustPackage rec {
   name = "xidlehook-${version}";

From 34a3233a2e1e8ed2f005a3a86cfca02d5f2769ae Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 6 May 2018 15:58:03 -0400
Subject: [PATCH 1293/3370] stdenv: Support concatenating setup hooks from
 multiple parts.

---
 pkgs/stdenv/generic/setup.sh | 91 ++++++++++++++++++++++++------------
 1 file changed, 62 insertions(+), 29 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d7a4781448ae..82ae09122bd5 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -641,22 +641,9 @@ fi
 # Textual substitution functions.
 
 
-substitute() {
-    local input="$1"
-    local output="$2"
-    shift 2
-
-    if [ ! -f "$input" ]; then
-      echo "substitute(): ERROR: file '$input' does not exist" >&2
-      return 1
-    fi
-
-    local content
-    # read returns non-0 on EOF, so we want read to fail
-    if IFS='' read -r -N 0 content < "$input"; then
-        echo "substitute(): ERROR: File \"$input\" has null bytes, won't process" >&2
-        return 1
-    fi
+substituteStream() {
+    local var=$1
+    shift
 
     while (( "$#" )); do
         case "$1" in
@@ -671,7 +658,7 @@ substitute() {
                 shift 2
                 # check if the used nix attribute name is a valid bash name
                 if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
-                    echo "substitute(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2
+                    echo "substituteStream(): ERROR: substitution variables must be valid Bash names, \"$varName\" isn't." >&2
                     return 1
                 fi
                 pattern="@$varName@"
@@ -685,18 +672,41 @@ substitute() {
                 ;;
 
             *)
-                echo "substitute(): ERROR: Invalid command line argument: $1" >&2
+                echo "substituteStream(): ERROR: Invalid command line argument: $1" >&2
                 return 1
                 ;;
         esac
 
-        content="${content//"$pattern"/$replacement}"
+        eval "$var"'=${'"$var"'//"$pattern"/"$replacement"}'
     done
 
-    if [ -e "$output" ]; then chmod +w "$output"; fi
-    printf "%s" "$content" > "$output"
+    printf "%s" "${!var}"
 }
 
+consumeEntire() {
+    # read returns non-0 on EOF, so we want read to fail
+    if IFS='' read -r -N 0 $1; then
+        echo "consumeEntire(): ERROR: Input null bytes, won't process" >&2
+        return 1
+    fi
+}
+
+substitute() {
+    local input="$1"
+    local output="$2"
+    shift 2
+
+    if [ ! -f "$input" ]; then
+        echo "substitute(): ERROR: file '$input' does not exist" >&2
+        return 1
+    fi
+
+    local content
+    consumeEntire content < "$input"
+
+    if [ -e "$output" ]; then chmod +w "$output"; fi
+    substituteStream content "$@" > "$output"
+}
 
 substituteInPlace() {
     local fileName="$1"
@@ -704,20 +714,30 @@ substituteInPlace() {
     substitute "$fileName" "$fileName" "$@"
 }
 
-
-# Substitute all environment variables that start with a lowercase character and
-# are valid Bash names.
-substituteAll() {
-    local input="$1"
-    local output="$2"
-    local -a args=()
-
+_allFlags() {
     for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do
         if (( "${NIX_DEBUG:-0}" >= 1 )); then
             printf "@%s@ -> %q\n" "${varName}" "${!varName}"
         fi
         args+=("--subst-var" "$varName")
     done
+}
+
+substituteAllStream() {
+    local -a args=()
+    _allFlags
+
+    substituteStream "$1" "${args[@]}"
+}
+
+# Substitute all environment variables that start with a lowercase character and
+# are valid Bash names.
+substituteAll() {
+    local input="$1"
+    local output="$2"
+
+    local -a args=()
+    _allFlags
 
     substitute "$input" "$output" "${args[@]}"
 }
@@ -1091,6 +1111,19 @@ fixupPhase() {
         substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook"
     fi
 
+    # TODO(@Ericson2314): Remove after https://github.com/NixOS/nixpkgs/pull/31414
+    if [ -n "${setupHooks:-}" ]; then
+        mkdir -p "${!outputDev}/nix-support"
+        local hook
+        for hook in $setupHooks; do
+            local content
+            consumeEntire content < "$hook"
+            substituteAllStream content >> "${!outputDev}/nix-support/setup-hook"
+            unset -v content
+        done
+        unset -v hook
+    fi
+
     # Propagate user-env packages into the output with binaries, TODO?
 
     if [ -n "${propagatedUserEnvPkgs:-}" ]; then

From 97947e680b63f63a47363224d2615b457cbd5862 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Mon, 7 May 2018 20:45:37 +0200
Subject: [PATCH 1294/3370] pgpdump: 0.32 -> 0.33

---
 pkgs/tools/security/pgpdump/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix
index 09b5b5f58ca4..82bec2486e81 100644
--- a/pkgs/tools/security/pgpdump/default.nix
+++ b/pkgs/tools/security/pgpdump/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "pgpdump-${version}";
-  version = "0.32";
+  version = "0.33";
 
   src = fetchFromGitHub {
     owner = "kazu-yamamoto";
     repo = "pgpdump";
     rev = "v${version}";
-    sha256 = "1ip7q5sgh3nwdqbrzpp6sllkls5kma98kns53yspw1830xi1n8xc";
+    sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23";
   };
 
   buildInputs = stdenv.lib.optionals supportCompressedPackets [ zlib bzip2 ];
@@ -27,4 +27,3 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ primeos ];
   };
 }
-

From 2110c0bd3009279ceec291f07bfbf063cb5ba6a0 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 7 May 2018 13:07:19 -0400
Subject: [PATCH 1295/3370] treewide: Use pkgs/build-support/roles.bash to
 remove copy pasta

Also fix some setup hooks that unnecessarily used environment hooks,
which revolted in the same variable being modified too many times.
---
 .../bintools-wrapper/default.nix              |  7 +-
 .../bintools-wrapper/setup-hook.sh            | 38 ++--------
 pkgs/build-support/cc-wrapper/default.nix     |  7 +-
 pkgs/build-support/cc-wrapper/setup-hook.sh   | 49 ++----------
 pkgs/build-support/setup-hooks/role.bash      | 75 +++++++++++++++++++
 .../compilers/gcc/libstdc++-hook.sh           | 16 +---
 .../compilers/llvm/3.5/libc++/default.nix     |  5 +-
 .../compilers/llvm/3.5/libc++/setup-hook.sh   | 16 +---
 .../compilers/llvm/3.7/libc++/default.nix     |  5 +-
 .../compilers/llvm/3.7/libc++/setup-hook.sh   | 16 +---
 .../compilers/llvm/3.8/libc++/default.nix     |  5 +-
 .../compilers/llvm/3.8/libc++/setup-hook.sh   | 16 +---
 .../compilers/llvm/3.9/libc++/default.nix     |  5 +-
 .../compilers/llvm/3.9/libc++/setup-hook.sh   | 16 +---
 .../compilers/llvm/4/libc++/default.nix       |  5 +-
 .../compilers/llvm/4/libc++/setup-hook.sh     | 16 +---
 .../compilers/llvm/5/libc++/default.nix       |  5 +-
 .../compilers/llvm/5/libc++/setup-hook.sh     | 16 +---
 .../compilers/llvm/6/libc++/default.nix       |  5 +-
 .../compilers/llvm/6/libc++/setup-hook.sh     | 16 +---
 .../development/libraries/gettext/default.nix |  5 +-
 .../libraries/gettext/gettext-setup-hook.sh   | 23 ++----
 .../libraries/libiconv/default.nix            |  5 +-
 .../libraries/libiconv/setup-hook.sh          | 18 +----
 .../bsd/netbsd/compat-setup-hook.sh           | 22 ++----
 pkgs/os-specific/bsd/netbsd/default.nix       | 10 ++-
 pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh | 18 +----
 pkgs/os-specific/linux/musl/fts-setup-hook.sh | 19 +----
 pkgs/os-specific/linux/musl/fts.nix           |  5 +-
 29 files changed, 203 insertions(+), 261 deletions(-)
 create mode 100644 pkgs/build-support/setup-hooks/role.bash

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 47301bbdde69..c0aea2d11312 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -190,7 +190,12 @@ stdenv.mkDerivation {
 
   depsTargetTargetPropagated = extraPackages;
 
-  setupHook = ./setup-hook.sh;
+  wrapperName = "BINTOOLS_WRAPPER";
+
+  setupHooks = [
+    ../setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   postFixup =
     ''
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 48a00b0b9b07..dbe0a0572a48 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -11,44 +11,22 @@ set -u
 [[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0
 
 bintoolsWrapper_addLDVars () {
-    case $depHostOffset in
-        -1) local role='BUILD_' ;;
-        0)  local role='' ;;
-        1)  local role='TARGET_' ;;
-        *)  echo "bintools-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
-            return 1 ;;
-    esac
+    # See ../setup-hooks/role.bash
+    local role_post role_pre
+    getTargetRoleEnvHook
 
     if [[ -d "$1/lib64" && ! -L "$1/lib64" ]]; then
-        export NIX_${role}LDFLAGS+=" -L$1/lib64"
+        export NIX_${role_pre}LDFLAGS+=" -L$1/lib64"
     fi
 
     if [[ -d "$1/lib" ]]; then
-        export NIX_${role}LDFLAGS+=" -L$1/lib"
+        export NIX_${role_pre}LDFLAGS+=" -L$1/lib"
     fi
 }
 
-case $targetOffset in
-    -1)
-        export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD=1
-        role_pre='BUILD_'
-        role_post='_FOR_BUILD'
-        ;;
-    0)
-        export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST=1
-        role_pre=''
-        role_post=''
-        ;;
-    1)
-        export NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET=1
-        role_pre='TARGET_'
-        role_post='_FOR_TARGET'
-        ;;
-    *)
-        echo "cc-wrapper: used as improper sort of dependency" >2;
-        return 1
-        ;;
-esac
+# See ../setup-hooks/role.bash
+getTargetRole
+getTargetRoleWrapper
 
 addEnvHooks "$targetOffset" bintoolsWrapper_addLDVars
 
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 43cd87fb4597..0ea9dd0cb9f4 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -191,7 +191,12 @@ stdenv.mkDerivation {
   propagatedBuildInputs = [ bintools ];
   depsTargetTargetPropagated = extraPackages;
 
-  setupHook = ./setup-hook.sh;
+  wrapperName = "CC_WRAPPER";
+
+  setupHooks = [
+    ../setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   postFixup =
     ''
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 29a7306b9b7e..17d34c1e1f1b 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -66,55 +66,22 @@ set -u
 # over no state, and there's no @-substitutions within, so any redefined
 # function is guaranteed to be exactly the same.
 ccWrapper_addCVars () {
-    # The `depHostOffset` describes how the host platform of the dependencies
-    # are slid relative to the depending package. It is brought into scope of
-    # the environment hook defined as the role of the dependency being applied.
-    case $depHostOffset in
-        -1) local role='BUILD_' ;;
-        0)  local role='' ;;
-        1)  local role='TARGET_' ;;
-        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
-            return 1 ;;
-    esac
+    # See ../setup-hooks/role.bash
+    local role_post role_pre
+    getTargetRoleEnvHook
 
     if [[ -d "$1/include" ]]; then
-        export NIX_${role}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
+        export NIX_${role_pre}CFLAGS_COMPILE+=" ${ccIncludeFlag:--isystem} $1/include"
     fi
 
     if [[ -d "$1/Library/Frameworks" ]]; then
-        export NIX_${role}CFLAGS_COMPILE+=" -F$1/Library/Frameworks"
+        export NIX_${role_pre}CFLAGS_COMPILE+=" -F$1/Library/Frameworks"
     fi
 }
 
-# Since the same cc-wrapper derivation can be depend on in multiple ways, we
-# need to accumulate *each* role (i.e. target platform relative the depending
-# derivation) in which the cc-wrapper derivation is used.
-# `NIX_CC_WRAPPER_@infixSalt@_TARGET_*` tracks this (needs to be an exported env
-# var so can't use fancier data structures).
-#
-# We also need to worry about what role is being added on *this* invocation of
-# setup-hook, which `role` tracks.
-case $targetOffset in
-    -1)
-        export NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD=1
-        role_pre='BUILD_'
-        role_post='_FOR_BUILD'
-        ;;
-    0)
-        export NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST=1
-        role_pre=''
-        role_post=''
-        ;;
-    1)
-        export NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET=1
-        role_pre='TARGET_'
-        role_post='_FOR_TARGET'
-        ;;
-    *)
-        echo "cc-wrapper: used as improper sort of dependency" >2;
-        return 1
-        ;;
-esac
+# See ../setup-hooks/role.bash
+getTargetRole
+getTargetRoleWrapper
 
 # We use the `targetOffset` to choose the right env hook to accumulate the right
 # sort of deps (those with that offset).
diff --git a/pkgs/build-support/setup-hooks/role.bash b/pkgs/build-support/setup-hooks/role.bash
new file mode 100644
index 000000000000..6f1c36f5c050
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/role.bash
@@ -0,0 +1,75 @@
+# Since the same derivation can be depend on in multiple ways, we need to
+# accumulate *each* role (i.e. host and target platforms relative the depending
+# derivation) in which the derivation is used.
+#
+# The role is intened to be use as part of other variables names like
+#  - $NIX_${role_pre}_SOMETHING
+#  - $NIX_SOMETHING_${role_post}
+
+function getRole() {
+    case $1 in
+        -1)
+            role_pre='BUILD_'
+            role_post='_FOR_BUILD'
+            ;;
+        0)
+            role_pre=''
+            role_post=''
+            ;;
+        1)
+            role_pre='TARGET_'
+            role_post='_FOR_TARGET'
+            ;;
+        *)
+            echo "@name@: used as improper sort of dependency" >2
+            return 1
+            ;;
+    esac
+}
+
+# `hostOffset` describes how the host platform of the package is slid relative
+# to the depending package. `targetOffset` likewise describes the target
+# platform of the package. Both are brought into scope of the setup hook defined
+# for dependency whose setup hook is being processed relative to the package
+# being built.
+
+function getHostRole()   {
+    getRole "$hostOffset"
+}
+function getTargetRole() {
+    getRole "$targetOffset"
+}
+
+# `depHostOffset` describes how the host platform of the dependencies are slid
+# relative to the depending package. `depTargetOffset` likewise describes the
+# target platform of dependenices. Both are brought into scope of the
+# environment hook defined for the dependency being applied relative to the
+# package being built.
+
+function getHostRoleEnvHook()   {
+    getRole "$depHostOffset"
+}
+function getTargetRoleEnvHook() {
+    getRole "$depTargetOffset"
+}
+
+# This variant is inteneded specifically for code-prodocing tool wrapper scripts
+# `NIX_@wrapperName@_@infixSalt@_TARGET_*` tracks this (needs to be an exported
+# env var so can't use fancier data structures).
+function getTargetRoleWrapper() {
+    case $targetOffset in
+        -1)
+            export NIX_@wrapperName@_@infixSalt@_TARGET_BUILD=1
+            ;;
+        0)
+            export NIX_@wrapperName@_@infixSalt@_TARGET_HOST=1
+            ;;
+        1)
+            export NIX_@wrapperName@_@infixSalt@_TARGET_TARGET=1
+            ;;
+        *)
+            echo "@name@: used as improper sort of dependency" >2
+            return 1
+            ;;
+    esac
+}
diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh
index 2325eeb9e2cf..8b1d5d2da678 100644
--- a/pkgs/development/compilers/gcc/libstdc++-hook.sh
+++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh
@@ -1,13 +1,5 @@
-# The `hostOffset` describes how the host platform of the dependencies are slid
-# relative to the depending package. It is brought into scope of the setup hook
-# defined as the role of the dependency whose hooks is being run.
-case $hostOffset in
-    -1) local role='BUILD_' ;;
-    0)  local role='' ;;
-    1)  local role='TARGET_' ;;
-    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
-        return 1 ;;
-esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
-export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
-export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libstdc++"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libstdc++"
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
index 1f1129f578f4..6edd5e9798c7 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix
@@ -39,7 +39,10 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
-  setupHook = ./setup-hook.sh;
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   meta = {
     homepage = http://libcxx.llvm.org/;
diff --git a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
index e18733b5ea3a..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.5/libc++/setup-hook.sh
@@ -1,14 +1,6 @@
-# The `hostOffset` describes how the host platform of the dependencies are slid
-# relative to the depending package. It is brought into scope of the setup hook
-# defined as the role of the dependency whose hooks is being run.
-case $hostOffset in
-    -1) local role='BUILD_' ;;
-    0)  local role='' ;;
-    1)  local role='TARGET_' ;;
-    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
-        return 1 ;;
-esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
 linkCxxAbi="@linkCxxAbi@"
-export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
index 4296c0fd192c..462e35a483f4 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix
@@ -33,7 +33,10 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
-  setupHook = ./setup-hook.sh;
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   meta = {
     homepage = http://libcxx.llvm.org/;
diff --git a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
index e18733b5ea3a..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.7/libc++/setup-hook.sh
@@ -1,14 +1,6 @@
-# The `hostOffset` describes how the host platform of the dependencies are slid
-# relative to the depending package. It is brought into scope of the setup hook
-# defined as the role of the dependency whose hooks is being run.
-case $hostOffset in
-    -1) local role='BUILD_' ;;
-    0)  local role='' ;;
-    1)  local role='TARGET_' ;;
-    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
-        return 1 ;;
-esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
 linkCxxAbi="@linkCxxAbi@"
-export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
index ea468b3772e0..cc3f5545146c 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix
@@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
-  setupHook = ./setup-hook.sh;
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   meta = {
     homepage = http://libcxx.llvm.org/;
diff --git a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
index bcd93cf486ff..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.8/libc++/setup-hook.sh
@@ -1,14 +1,6 @@
-# The `hostOffset` describes how the host platform of the dependencies
-# relative to the depending package. It is brought into scope of the setup hook
-# defined as the role of the dependency whose hooks is being run.
-case $hostOffset in
-    -1) local role='BUILD_' ;;
-    0)  local role='' ;;
-    1)  local role='TARGET_' ;;
-    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
-        return 1 ;;
-esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
 linkCxxAbi="@linkCxxAbi@"
-export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
index ad514b0daa54..7e5c30bdfd35 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix
@@ -31,7 +31,10 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
-  setupHook = ./setup-hook.sh;
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   meta = {
     homepage = http://libcxx.llvm.org/;
diff --git a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
index bcd93cf486ff..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/3.9/libc++/setup-hook.sh
@@ -1,14 +1,6 @@
-# The `hostOffset` describes how the host platform of the dependencies
-# relative to the depending package. It is brought into scope of the setup hook
-# defined as the role of the dependency whose hooks is being run.
-case $hostOffset in
-    -1) local role='BUILD_' ;;
-    0)  local role='' ;;
-    1)  local role='TARGET_' ;;
-    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
-        return 1 ;;
-esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
 linkCxxAbi="@linkCxxAbi@"
-export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/4/libc++/default.nix b/pkgs/development/compilers/llvm/4/libc++/default.nix
index f28957c35185..718abc420a97 100644
--- a/pkgs/development/compilers/llvm/4/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/4/libc++/default.nix
@@ -44,7 +44,10 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
-  setupHook = ./setup-hook.sh;
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   meta = {
     homepage = http://libcxx.llvm.org/;
diff --git a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
index bcd93cf486ff..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/4/libc++/setup-hook.sh
@@ -1,14 +1,6 @@
-# The `hostOffset` describes how the host platform of the dependencies
-# relative to the depending package. It is brought into scope of the setup hook
-# defined as the role of the dependency whose hooks is being run.
-case $hostOffset in
-    -1) local role='BUILD_' ;;
-    0)  local role='' ;;
-    1)  local role='TARGET_' ;;
-    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
-        return 1 ;;
-esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
 linkCxxAbi="@linkCxxAbi@"
-export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix
index 9ddeea7ef79a..cb6dfe2808eb 100644
--- a/pkgs/development/compilers/llvm/5/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/5/libc++/default.nix
@@ -40,7 +40,10 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
-  setupHook = ./setup-hook.sh;
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   meta = {
     homepage = http://libcxx.llvm.org/;
diff --git a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
index bcd93cf486ff..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/5/libc++/setup-hook.sh
@@ -1,14 +1,6 @@
-# The `hostOffset` describes how the host platform of the dependencies
-# relative to the depending package. It is brought into scope of the setup hook
-# defined as the role of the dependency whose hooks is being run.
-case $hostOffset in
-    -1) local role='BUILD_' ;;
-    0)  local role='' ;;
-    1)  local role='TARGET_' ;;
-    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
-        return 1 ;;
-esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
 linkCxxAbi="@linkCxxAbi@"
-export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix
index 3c6c009a58fa..27d8cd18b666 100644
--- a/pkgs/development/compilers/llvm/6/libc++/default.nix
+++ b/pkgs/development/compilers/llvm/6/libc++/default.nix
@@ -40,7 +40,10 @@ stdenv.mkDerivation rec {
 
   linkCxxAbi = stdenv.isLinux;
 
-  setupHook = ./setup-hook.sh;
+  setupHooks = [
+    ../../../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   meta = {
     homepage = http://libcxx.llvm.org/;
diff --git a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
index bcd93cf486ff..6611259165ae 100644
--- a/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
+++ b/pkgs/development/compilers/llvm/6/libc++/setup-hook.sh
@@ -1,14 +1,6 @@
-# The `hostOffset` describes how the host platform of the dependencies
-# relative to the depending package. It is brought into scope of the setup hook
-# defined as the role of the dependency whose hooks is being run.
-case $hostOffset in
-    -1) local role='BUILD_' ;;
-    0)  local role='' ;;
-    1)  local role='TARGET_' ;;
-    *)  echo "cc-wrapper: Error: Cannot be used with $hostOffset-offset deps" >2;
-        return 1 ;;
-esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
 linkCxxAbi="@linkCxxAbi@"
-export NIX_${role}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
-export NIX_${role}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
+export NIX_${role_pre}CXXSTDLIB_COMPILE+=" -isystem @out@/include/c++/v1"
+export NIX_${role_pre}CXXSTDLIB_LINK=" -stdlib=libc++${linkCxxAbi:+" -lc++abi"}"
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 6dec7747c7e8..a7c79ee600ec 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -48,7 +48,10 @@ stdenv.mkDerivation rec {
   # HACK, see #10874 (and 14664)
   buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv;
 
-  setupHook = ./gettext-setup-hook.sh;
+  setupHooks = [
+    ../../../build-support/setup-hooks/role.bash
+    ./gettext-setup-hook.sh
+  ];
   gettextNeedsLdflags = hostPlatform.libc != "glibc" && !hostPlatform.isMusl;
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/gettext/gettext-setup-hook.sh b/pkgs/development/libraries/gettext/gettext-setup-hook.sh
index 074d313e48aa..0a6bc0dd253a 100644
--- a/pkgs/development/libraries/gettext/gettext-setup-hook.sh
+++ b/pkgs/development/libraries/gettext/gettext-setup-hook.sh
@@ -1,6 +1,8 @@
 gettextDataDirsHook() {
+    # See pkgs/build-support/setup-hooks/role.bash
+    getHostRoleEnvHook
     if [ -d "$1/share/gettext" ]; then
-        addToSearchPath GETTEXTDATADIRS "$1/share/gettext"
+        addToSearchPath "GETTEXTDATADIRS${role_post}" "$1/share/gettext"
     fi
 }
 
@@ -8,21 +10,8 @@ addEnvHooks "$hostOffset" gettextDataDirsHook
 
 # libintl must be listed in load flags on non-Glibc
 # it doesn't hurt to have it in Glibc either though
-gettextLdflags() {
-    # The `depHostOffset` describes how the host platform of the dependencies
-    # are slid relative to the depending package. It is brought into scope of
-    # the environment hook defined as the role of the dependency being applied.
-    case $depHostOffset in
-        -1) local role='BUILD_' ;;
-        0)  local role='' ;;
-        1)  local role='TARGET_' ;;
-        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
-            return 1 ;;
-    esac
-
-    export NIX_${role}LDFLAGS+=" -lintl"
-}
-
 if [ ! -z "@gettextNeedsLdflags@" ]; then
-    addEnvHooks "$hostOffset" gettextLdflags
+    # See pkgs/build-support/setup-hooks/role.bash
+    getHostRole
+    export NIX_${role_pre}LDFLAGS+=" -lintl"
 fi
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index a4e6fed88e1c..169a4d38bb53 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "0y1ij745r4p48mxq84rax40p10ln7fc7m243p8k8sia519i3dxfc";
   };
 
-  setupHook = ./setup-hook.sh;
+  setupHooks = [
+    ../../../build-support/setup-hooks/role.bash
+    ./setup-hook.sh
+  ];
 
   postPatch =
     lib.optionalString ((hostPlatform != buildPlatform && hostPlatform.libc == "msvcrt") || stdenv.cc.nativeLibc)
diff --git a/pkgs/development/libraries/libiconv/setup-hook.sh b/pkgs/development/libraries/libiconv/setup-hook.sh
index 78222dddbf1d..d20e94513e26 100644
--- a/pkgs/development/libraries/libiconv/setup-hook.sh
+++ b/pkgs/development/libraries/libiconv/setup-hook.sh
@@ -1,18 +1,6 @@
 # libiconv must be listed in load flags on non-Glibc
 # it doesn't hurt to have it in Glibc either though
-iconvLdflags() {
-    # The `depHostOffset` describes how the host platform of the dependencies
-    # are slid relative to the depending package. It is brought into scope of
-    # the environment hook defined as the role of the dependency being applied.
-    case $depHostOffset in
-        -1) local role='BUILD_' ;;
-        0)  local role='' ;;
-        1)  local role='TARGET_' ;;
-        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
-            return 1 ;;
-    esac
 
-    export NIX_${role}LDFLAGS+=" -liconv"
-}
-
-addEnvHooks "$hostOffset" iconvLdflags
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
+export NIX_${role_pre}LDFLAGS+=" -liconv"
diff --git a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
index d47d602e2edb..81df09eba176 100644
--- a/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
+++ b/pkgs/os-specific/bsd/netbsd/compat-setup-hook.sh
@@ -1,18 +1,6 @@
-setupCompatFlags() {
-    # The `depHostOffset` describes how the host platform of the dependencies
-    # are slid relative to the depending package. It is brought into scope of
-    # the environment hook defined as the role of the dependency being applied.
-    case $depHostOffset in
-        -1) local role='BUILD_' ;;
-        0)  local role='' ;;
-        1)  local role='TARGET_' ;;
-        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
-            return 1 ;;
-    esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
-    export NIX_${role}LDFLAGS+=" -lnbcompat"
-    export NIX_${role}CFLAGS_COMPILE+=" -DHAVE_NBTOOL_CONFIG_H"
-    export NIX_${role}CFLAGS_COMPILE+=" -include nbtool_config.h"
-}
-
-addEnvHooks "$hostOffset" setupCompatFlags
+export NIX_${role_pre}LDFLAGS+=" -lnbcompat"
+export NIX_${role_pre}CFLAGS_COMPILE+=" -DHAVE_NBTOOL_CONFIG_H"
+export NIX_${role_pre}CFLAGS_COMPILE+=" -include nbtool_config.h"
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index b4fb99504ef2..84d6926c50c7 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -167,7 +167,10 @@ let
     sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z";
     version = "7.1.2";
 
-    setupHook = ./compat-setup-hook.sh;
+    setupHooks = [
+      ../../../build-support/setup-hooks/role.bash
+      ./compat-setup-hook.sh
+    ];
 
     # override defaults to prevent infinite recursion
     nativeBuildInputs = [ makeMinimal ];
@@ -270,7 +273,10 @@ let
 
       runHook postInstall
     '';
-    setupHook = ./fts-setup-hook.sh;
+    setupHooks = [
+      ../../../build-support/setup-hooks/role.bash
+      ./fts-setup-hook.sh
+    ];
   };
 
   stat = netBSDDerivation {
diff --git a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
index 6b7064174931..5cf8c753aec3 100644
--- a/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
+++ b/pkgs/os-specific/bsd/netbsd/fts-setup-hook.sh
@@ -1,16 +1,4 @@
-ftsLdflags() {
-    # The `depHostOffset` describes how the host platform of the dependencies
-    # are slid relative to the depending package. It is brought into scope of
-    # the environment hook defined as the role of the dependency being applied.
-    case $depHostOffset in
-        -1) local role='BUILD_' ;;
-        0)  local role='' ;;
-        1)  local role='TARGET_' ;;
-        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
-            return 1 ;;
-    esac
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
-    export NIX_${role}LDFLAGS+=" -lfts"
-}
-
-addEnvHooks "$hostOffset" ftsLdflags
+export NIX_${role_pre}LDFLAGS+=" -lfts"
diff --git a/pkgs/os-specific/linux/musl/fts-setup-hook.sh b/pkgs/os-specific/linux/musl/fts-setup-hook.sh
index 3962dcb19a20..5cf8c753aec3 100644
--- a/pkgs/os-specific/linux/musl/fts-setup-hook.sh
+++ b/pkgs/os-specific/linux/musl/fts-setup-hook.sh
@@ -1,17 +1,4 @@
-ftsLdflags() {
-    # The `depHostOffset` describes how the host platform of the dependencies
-    # are slid relative to the depending package. It is brought into scope of
-    # the environment hook defined as the role of the dependency being applied.
-    case $depHostOffset in
-        -1) local role='BUILD_' ;;
-        0)  local role='' ;;
-        1)  local role='TARGET_' ;;
-        *)  echo "cc-wrapper: Error: Cannot be used with $depHostOffset-offset deps" >2;
-            return 1 ;;
-    esac
-
-    export NIX_${role}LDFLAGS+=" -lfts"
-}
-
-addEnvHooks "$hostOffset" ftsLdflags
+# See pkgs/build-support/setup-hooks/role.bash
+getHostRole
 
+export NIX_${role_pre}LDFLAGS+=" -lfts"
diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix
index 0f16e8cc79bf..24d25de3a2d9 100644
--- a/pkgs/os-specific/linux/musl/fts.nix
+++ b/pkgs/os-specific/linux/musl/fts.nix
@@ -12,5 +12,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  setupHook = ./fts-setup-hook.sh;
+  setupHooks = [
+    ../../../build-support/setup-hooks/role.bash
+    ./fts-setup-hook.sh
+  ];
 }

From 8b0fce8cb1013837cd2108193653a1763cd68266 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 7 May 2018 13:15:34 -0400
Subject: [PATCH 1296/3370] {bintools,cc}-wrapper: Factor out role accumulation
 logic

---
 pkgs/build-support/bintools-wrapper/add-flags.sh  | 11 +----------
 pkgs/build-support/bintools-wrapper/default.nix   |  4 ++--
 pkgs/build-support/bintools-wrapper/ld-wrapper.sh |  2 +-
 pkgs/build-support/cc-wrapper/add-flags.sh        | 13 +------------
 pkgs/build-support/cc-wrapper/cc-wrapper.sh       |  2 +-
 pkgs/build-support/cc-wrapper/default.nix         |  4 ++--
 .../utils.sh => wrapper-common/utils.bash}        | 15 +++++++++++++++
 7 files changed, 23 insertions(+), 28 deletions(-)
 rename pkgs/build-support/{cc-wrapper/utils.sh => wrapper-common/utils.bash} (83%)

diff --git a/pkgs/build-support/bintools-wrapper/add-flags.sh b/pkgs/build-support/bintools-wrapper/add-flags.sh
index 7d118d20fc68..d02a25fe697b 100644
--- a/pkgs/build-support/bintools-wrapper/add-flags.sh
+++ b/pkgs/build-support/bintools-wrapper/add-flags.sh
@@ -11,16 +11,7 @@ var_templates_bool=(
     NIX+DONT_SET_RPATH
 )
 
-declare -a role_infixes=()
-if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then
-    role_infixes+=(_BUILD_)
-fi
-if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then
-    role_infixes+=(_)
-fi
-if [ "${NIX_BINTOOLS_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then
-    role_infixes+=(_TARGET_)
-fi
+accumulateRoles
 
 for var in "${var_templates_list[@]}"; do
     mangleVarList "$var" "${role_infixes[@]}"
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index c0aea2d11312..bfcd3292729b 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -294,7 +294,7 @@ stdenv.mkDerivation {
       set +u
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
-      substituteAll ${../cc-wrapper/utils.sh} $out/nix-support/utils.sh
+      substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
 
       ##
       ## Extra custom steps
@@ -305,7 +305,7 @@ stdenv.mkDerivation {
 
   inherit dynamicLinker expand-response-params;
 
-  # for substitution in utils.sh
+  # for substitution in utils.bash
   expandResponseParams = "${expand-response-params}/bin/expand-response-params";
 
   meta =
diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
index 991ed0fe263c..2ad1fdcadc27 100644
--- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
@@ -14,7 +14,7 @@ if [ -n "@coreutils_bin@" ]; then
     PATH="@coreutils_bin@/bin"
 fi
 
-source @out@/nix-support/utils.sh
+source @out@/nix-support/utils.bash
 
 if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
     source @out@/nix-support/add-flags.sh
diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh
index 604aaf6b6cf0..ee4cc1ec06d4 100644
--- a/pkgs/build-support/cc-wrapper/add-flags.sh
+++ b/pkgs/build-support/cc-wrapper/add-flags.sh
@@ -14,18 +14,7 @@ var_templates_bool=(
     NIX+ENFORCE_NO_NATIVE
 )
 
-# Accumulate infixes for taking in the right input parameters. See setup-hook
-# for details.
-declare -a role_infixes=()
-if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_BUILD:-}" ]; then
-    role_infixes+=(_BUILD_)
-fi
-if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_HOST:-}" ]; then
-    role_infixes+=(_)
-fi
-if [ "${NIX_CC_WRAPPER_@infixSalt@_TARGET_TARGET:-}" ]; then
-    role_infixes+=(_TARGET_)
-fi
+accumulateRoles
 
 # We need to mangle names for hygiene, but also take parameters/overrides
 # from the environment.
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index c2e6c1406358..b2bacec5e9b5 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -15,7 +15,7 @@ if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then
     PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
 fi
 
-source @out@/nix-support/utils.sh
+source @out@/nix-support/utils.bash
 
 # Flirting with a layer violation here.
 if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 0ea9dd0cb9f4..1b1c82b9294f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -282,7 +282,7 @@ stdenv.mkDerivation {
     + ''
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
-      substituteAll ${./utils.sh} $out/nix-support/utils.sh
+      substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash
 
       ##
       ## Extra custom steps
@@ -293,7 +293,7 @@ stdenv.mkDerivation {
 
   inherit expand-response-params;
 
-  # for substitution in utils.sh
+  # for substitution in utils.bash
   expandResponseParams = "${expand-response-params}/bin/expand-response-params";
 
   meta =
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/wrapper-common/utils.bash
similarity index 83%
rename from pkgs/build-support/cc-wrapper/utils.sh
rename to pkgs/build-support/wrapper-common/utils.bash
index 9215fe2dc397..12b596a83e6f 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/wrapper-common/utils.bash
@@ -1,3 +1,18 @@
+# Accumulate infixes for taking in the right input parameters with the `mangle*`
+# functions below. See setup-hook for details.
+accumulateRoles() {
+    declare -ga role_infixes=()
+    if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_BUILD:-}" ]; then
+        role_infixes+=(_BUILD_)
+    fi
+    if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_HOST:-}" ]; then
+        role_infixes+=(_)
+    fi
+    if [ "${NIX_@wrapperName@_@infixSalt@_TARGET_TARGET:-}" ]; then
+        role_infixes+=(_TARGET_)
+    fi
+}
+
 mangleVarList() {
     local var="$1"
     shift

From 95928538a5fb206b414fb69206b6363365b09aa6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:33:38 +0200
Subject: [PATCH 1297/3370] pythonPackages.aiohue: init at 1.3.1

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

diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix
new file mode 100644
index 000000000000..0211fef16060
--- /dev/null
+++ b/pkgs/development/python-modules/aiohue/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, aiohttp }:
+
+buildPythonPackage rec {
+  pname = "aiohue";
+  version = "1.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "05b2fj8pzbij8hglx6p5ckfx0h1b7wcfpys306l853vp56d882yh";
+  };
+
+  propagatedBuildInputs = [ aiohttp ];
+
+  meta = with lib; {
+    description = "asyncio package to talk to Philips Hue";
+    homepage = https://github.com/balloob/aiohue;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 75cf7561ab6c..69cdef2c9073 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18253,6 +18253,8 @@ EOF
   h11 = callPackage ../development/python-modules/h11 { };
 
   python-docx = callPackage ../development/python-modules/python-docx { };
+
+  aiohue = callPackage ../development/python-modules/aiohue { };
 });
 
 in fix' (extends overrides packages)

From c7d735a27bc187d3e375a680680424f077162add Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:34:29 +0200
Subject: [PATCH 1298/3370] pythonPackages.PyMVGLive: init at 1.1.4

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

diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix
new file mode 100644
index 000000000000..1263c498a46b
--- /dev/null
+++ b/pkgs/development/python-modules/pymvglive/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "PyMVGLive";
+  version = "1.1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0sh4xm74im9qxzpbrlc5h1vnpgvpybnpvdcav1iws0b561zdr08c";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = with lib; {
+    description = "get live-data from mvg-live.de";
+    homepage = https://github.com/pc-coholic/PyMVGLive;
+    license = licenses.free;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 69cdef2c9073..0a8b65e42a56 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18255,6 +18255,8 @@ EOF
   python-docx = callPackage ../development/python-modules/python-docx { };
 
   aiohue = callPackage ../development/python-modules/aiohue { };
+
+  PyMVGLive = callPackage ../development/python-modules/pymvglive { };
 });
 
 in fix' (extends overrides packages)

From 509a340d901228667cc8484d29319dfaee59ddf1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:35:16 +0200
Subject: [PATCH 1299/3370] pythonPackages.coinmarketcap: init at 4.2.1

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

diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix
new file mode 100644
index 000000000000..52afdee46ab7
--- /dev/null
+++ b/pkgs/development/python-modules/coinmarketcap/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests-cache }:
+
+buildPythonPackage rec {
+  pname = "coinmarketcap";
+  version = "4.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bk530cmfqri84m9386ydn3f89gq23nxylvnl523gr5589vw54bj";
+  };
+
+  propagatedBuildInputs = [ requests-cache ];
+
+  meta = with lib; {
+    description = "A python wrapper around the https://coinmarketcap.com API.";
+    homepage = https://github.com/barnumbirr/coinmarketcap;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0a8b65e42a56..034622e213b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18257,6 +18257,8 @@ EOF
   aiohue = callPackage ../development/python-modules/aiohue { };
 
   PyMVGLive = callPackage ../development/python-modules/pymvglive { };
+
+  coinmarketcap = callPackage ../development/python-modules/coinmarketcap { };
 });
 
 in fix' (extends overrides packages)

From 11ad51893516dbc284a5eb5958f12de9b2230b84 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:35:40 +0200
Subject: [PATCH 1300/3370] pythonPackages.pyowm: init at 2.8.0

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

diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix
new file mode 100644
index 000000000000..26606a580a4d
--- /dev/null
+++ b/pkgs/development/python-modules/pyowm/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "pyowm";
+  version = "2.8.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0y2r322pcamabar70513pbyiq26x33l1aq9cim6k30lk9p4aq310";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  meta = with lib; {
+    description = "A Python wrapper around the OpenWeatherMap web API";
+    homepage = https://pyowm.readthedocs.io/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 034622e213b5..7868f7d7ff06 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18259,6 +18259,8 @@ EOF
   PyMVGLive = callPackage ../development/python-modules/pymvglive { };
 
   coinmarketcap = callPackage ../development/python-modules/coinmarketcap { };
+
+  pyowm = callPackage ../development/python-modules/pyowm { };
 });
 
 in fix' (extends overrides packages)

From 1a7a886234b4cf638c0d6ebd42016333edffb428 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 May 2018 12:36:03 +0200
Subject: [PATCH 1301/3370] home-assistant: use new python modules for
 components

---
 pkgs/servers/home-assistant/component-packages.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 3e95b41fb7e8..6e0e216488d5 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -116,7 +116,7 @@
     "homematic" = ps: with ps; [ pyhomematic ];
     "homematicip_cloud" = ps: with ps; [  ];
     "http" = ps: with ps; [ aiohttp-cors ];
-    "hue" = ps: with ps; [  ];
+    "hue" = ps: with ps; [ aiohue ];
     "ifttt" = ps: with ps; [  ];
     "ihc" = ps: with ps; [  ];
     "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ];
@@ -285,7 +285,7 @@
     "sensor.bme680" = ps: with ps; [  ];
     "sensor.broadlink" = ps: with ps; [  ];
     "sensor.buienradar" = ps: with ps; [  ];
-    "sensor.coinmarketcap" = ps: with ps; [  ];
+    "sensor.coinmarketcap" = ps: with ps; [ coinmarketcap ];
     "sensor.cpuspeed" = ps: with ps; [  ];
     "sensor.crimereports" = ps: with ps; [  ];
     "sensor.cups" = ps: with ps; [ pycups ];
@@ -335,12 +335,12 @@
     "sensor.miflora" = ps: with ps; [  ];
     "sensor.modem_callerid" = ps: with ps; [  ];
     "sensor.mopar" = ps: with ps; [  ];
-    "sensor.mvglive" = ps: with ps; [  ];
+    "sensor.mvglive" = ps: with ps; [ PyMVGLive ];
     "sensor.nederlandse_spoorwegen" = ps: with ps; [  ];
     "sensor.neurio_energy" = ps: with ps; [  ];
     "sensor.nut" = ps: with ps; [  ];
     "sensor.openevse" = ps: with ps; [  ];
-    "sensor.openweathermap" = ps: with ps; [  ];
+    "sensor.openweathermap" = ps: with ps; [ pyowm ];
     "sensor.otp" = ps: with ps; [  ];
     "sensor.plex" = ps: with ps; [  ];
     "sensor.pocketcasts" = ps: with ps; [  ];
@@ -453,7 +453,7 @@
     "weather.buienradar" = ps: with ps; [  ];
     "weather.darksky" = ps: with ps; [  ];
     "weather.metoffice" = ps: with ps; [  ];
-    "weather.openweathermap" = ps: with ps; [  ];
+    "weather.openweathermap" = ps: with ps; [ pyowm ];
     "weather.yweather" = ps: with ps; [ yahooweather ];
     "wemo" = ps: with ps; [  ];
     "wink" = ps: with ps; [  ];

From b0d70d336dd769bf06ff336882faabe5cebf2343 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Mon, 7 May 2018 21:48:08 +0200
Subject: [PATCH 1302/3370] iml: use openblas instead of atlas

---
 pkgs/development/libraries/iml/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix
index 4af2bba9160d..b55d13ecc3f4 100644
--- a/pkgs/development/libraries/iml/default.nix
+++ b/pkgs/development/libraries/iml/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gmp, atlas}:
+{stdenv, autoreconfHook, fetchurl, gmp, openblas}:
 stdenv.mkDerivation rec {
   name = "iml-${version}";
   version = "1.0.5";
@@ -6,8 +6,18 @@ stdenv.mkDerivation rec {
     url = "http://www.cs.uwaterloo.ca/~astorjoh/iml-${version}.tar.bz2";
     sha256 = "0akwhhz9b40bz6lrfxpamp7r7wkk48p455qbn04mfnl9a1l6db8x";
   };
-  buildInputs = [gmp atlas];
-  configureFlags = "--with-gmp-include=${gmp.dev}/include --with-gmp-lib=${gmp}/lib";
+  buildInputs = [
+    gmp
+    openblas
+  ];
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+  configureFlags = [
+    "--with-gmp-include=${gmp.dev}/include"
+    "--with-gmp-lib=${gmp}/lib"
+    "--with-cblas=-lopenblas"
+  ];
   meta = {
     inherit version;
     description = ''Algorithms for computing exact solutions to dense systems of linear equations over the integers'';

From fcfecf8c2009d6dd67bed14e82fbbc44a1bd8a17 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 7 May 2018 21:47:26 +0200
Subject: [PATCH 1303/3370] =?UTF-8?q?telepathy-logger:=200.8.0=20=E2=86=92?=
 =?UTF-8?q?=200.8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The previous update attempt (76f9a4d7111a362035ee741cd08ea22a27bbd6bc) did not change the hash 😞
---
 .../networking/instant-messengers/telepathy/logger/default.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index f1b3c55d14c3..1791a7ff1ddc 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
-    sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
+    sha256 = "1bjx85k7jyfi5pvl765fzc7q2iz9va51anrc2djv7caksqsdbjlg";
   };
 
   nativeBuildInputs = [

From 4ee409a59c106a63697b82f8f2c7e2df45a748f7 Mon Sep 17 00:00:00 2001
From: Roland Koebler <rk@simple-is-better.org>
Date: Mon, 7 May 2018 22:25:14 +0200
Subject: [PATCH 1304/3370] i3lock/i3lock-color: meta: improve description

- i3lock-color: extend description to differ from i3lock
- i3lock/i3lock-color: add long description
---
 .../window-managers/i3/lock-color.nix         | 25 +++++++++++++++++--
 pkgs/applications/window-managers/i3/lock.nix |  5 ++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 66a6af2fbb08..ea1f1bda9f14 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -27,8 +27,29 @@ stdenv.mkDerivation rec {
     mv $out/bin/i3lock $out/bin/i3lock-color
   '';
   meta = with stdenv.lib; {
-    description = "A simple screen locker like slock";
-    homepage = https://i3wm.org/i3lock/;
+    description = "A simple screen locker like slock, enhanced version with extra configuration options";
+    longDescription = ''
+      Simple screen locker. After locking, a colored background (default: white) or
+      a configurable image is shown, and a ring-shaped unlock-indicator gives feedback
+      for every keystroke. After entering your password, the screen is unlocked again.
+
+      i3lock-color is forked from i3lock (https://i3wm.org/i3lock/) with the following
+      enhancements / additional configuration options:
+
+      - indicator:
+        - shape: ring or bar
+        - size: configurable
+        - all colors: configurable
+        - all texts: configurable
+        - visibility: can be always visible, can be restricted to some screens
+
+      - background: optionally show a blurred screen instead of a single color
+
+      - more information: show text at configurable positions:
+        - clock: time/date with configurable format
+        - keyboard-layout
+    '';
+    homepage = http://github.com/PandorasFox/i3lock-color;
     maintainers = with maintainers; [ garbas malyn ];
     license = licenses.bsd3;
 
diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix
index 4d572e8c040d..d4bb3cdc1c2e 100644
--- a/pkgs/applications/window-managers/i3/lock.nix
+++ b/pkgs/applications/window-managers/i3/lock.nix
@@ -23,6 +23,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A simple screen locker like slock";
+    longDescription = ''
+      Simple screen locker. After locking, a colored background (default: white) or
+      a configurable image is shown, and a ring-shaped unlock-indicator gives feedback
+      for every keystroke. After entering your password, the screen is unlocked again.
+    '';
     homepage = https://i3wm.org/i3lock/;
     maintainers = with maintainers; [ garbas malyn domenkozar ];
     license = licenses.bsd3;

From 783d547bddf66070b3a33b1fd4b972d945e5942c Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Mon, 7 May 2018 13:33:51 -0700
Subject: [PATCH 1305/3370] sit: fix tests on aarch64

As we found out in #40032, sit tests won't pass on
aarch64. The problem seems to be related to
`create_dir` not returning an error if the directory
already exists, happening specifically on aarch64+debug
(not aarch64+release)

This update injects a patch for tests that will also
be included in subsequent versions of SIT.
---
 .../version-management/sit/aarch64-eexist.patch | 17 +++++++++++++++++
 .../version-management/sit/default.nix          |  2 ++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/version-management/sit/aarch64-eexist.patch

diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch
new file mode 100644
index 000000000000..8b45e77d040d
--- /dev/null
+++ b/pkgs/applications/version-management/sit/aarch64-eexist.patch
@@ -0,0 +1,17 @@
+diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs
+index ebd357d..074dcc9 100644
+--- a/sit-core/src/repository.rs
++++ b/sit-core/src/repository.rs
+@@ -305,6 +305,12 @@ impl Repository {
+         let id: String = name.into();
+         let mut path = self.items_path.clone();
+         path.push(&id);
++        #[cfg(all(debug_assertions, target_arch = "aarch64"))] {
++          use std::io;
++          if path.is_dir() {
++             return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST
++          }
++        }
+         fs::create_dir(path)?;
+         let id = OsString::from(id);
+         Ok(Item {
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index 0cc75f8bd5a3..ae84add283e6 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -15,6 +15,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg";
 
+  patches = [ ./aarch64-eexist.patch ];
+
   meta = with stdenv.lib; {
     description = "Serverless Information Tracker";
     homepage = https://sit.sh/;

From 810976e5912771722ee0331d59c5451c914da44a Mon Sep 17 00:00:00 2001
From: Roland Koebler <rk@simple-is-better.org>
Date: Mon, 7 May 2018 23:19:02 +0200
Subject: [PATCH 1306/3370] i3lock-color: fix manpage-name and manpage (#40095)

- rename manpage from i3lock.1 to i3lock-color.1
- change "i3lock" to "i3lock-color" in manpage-synopsis
---
 pkgs/applications/window-managers/i3/lock-color.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix
index 66a6af2fbb08..b7545d5cd1c5 100644
--- a/pkgs/applications/window-managers/i3/lock-color.nix
+++ b/pkgs/applications/window-managers/i3/lock-color.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
   installFlags = "PREFIX=\${out} SYSCONFDIR=\${out}/etc MANDIR=\${out}/share/man";
   postInstall = ''
     mv $out/bin/i3lock $out/bin/i3lock-color
+    mv $out/share/man/man1/i3lock.1 $out/share/man/man1/i3lock-color.1
+    sed -i 's/\(^\|\s\|"\)i3lock\(\s\|$\)/\1i3lock-color\2/g' $out/share/man/man1/i3lock-color.1
   '';
   meta = with stdenv.lib; {
     description = "A simple screen locker like slock";

From ec198337c4d50e4bd94e84db6bc886d375761564 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 7 May 2018 23:57:48 +0200
Subject: [PATCH 1307/3370] love_11: init at 11.1

---
 pkgs/development/interpreters/love/11.1.nix | 41 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/interpreters/love/11.1.nix

diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix
new file mode 100644
index 000000000000..e92a84b40b86
--- /dev/null
+++ b/pkgs/development/interpreters/love/11.1.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit,
+  libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
+  libtheora, which, autoconf, automake, libtool
+}:
+
+let
+  pname = "love";
+  version = "11.1";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  src = fetchFromBitbucket {
+    owner = "rude";
+    repo = "love";
+    rev = "${version}";
+    sha256 = "16jn6klbsz8qi2wn3llbr7ri5arlc0b19la19ypzk6p7v20z4sfr";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123
+    libvorbis libogg libtheora autoconf which libtool automake
+  ];
+
+  preConfigure = "$shell ./platform/unix/automagic";
+
+  configureFlags = [
+    "--with-lua=luajit"
+  ];
+
+  NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3
+
+  meta = {
+    homepage = http://love2d.org;
+    description = "A Lua-based 2D game engine/scripting language";
+    license = stdenv.lib.licenses.zlib;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35daa86a6153..3d0b125b8a23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7115,6 +7115,7 @@ with pkgs;
   love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; };
   love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
   love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
+  love_11 = callPackage ../development/interpreters/love/11.1.nix { };
   love = love_0_10;
 
   ### LUA MODULES

From b45fa92de64c4df29587e78ccbeb69052d032596 Mon Sep 17 00:00:00 2001
From: Roland Koebler <rk@simple-is-better.org>
Date: Tue, 8 May 2018 00:39:38 +0200
Subject: [PATCH 1308/3370] ext4magic: init at 0.3.2

---
 maintainers/maintainer-list.nix              |  5 +++
 pkgs/tools/filesystems/ext4magic/default.nix | 39 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/tools/filesystems/ext4magic/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9369a76688cb..91db07f4795b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3144,6 +3144,11 @@
     github = "rittelle";
     name = "Lennart Rittel";
   };
+  rkoe = {
+    email = "rk@simple-is-better.org";
+    github = "rkoe";
+    name = "Roland Koebler";
+  };
   rlupton20 = {
     email = "richard.lupton@gmail.com";
     github = "rlupton20";
diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix
new file mode 100644
index 000000000000..0211ab63b3e9
--- /dev/null
+++ b/pkgs/tools/filesystems/ext4magic/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchurl, fetchpatch, file, libuuid, e2fsprogs, zlib, bzip2 }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.2";
+  name = "ext4magic-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/ext4magic/${name}.tar.gz";
+    sha256 = "8d9c6a594f212aecf4eb5410d277caeaea3adc03d35378257dfd017ef20ea115";
+  };
+
+  patches = [
+    (fetchpatch {
+        url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch;
+        sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c";
+    })
+  ];
+
+  buildInputs = [ file libuuid e2fsprogs zlib bzip2 ];
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "Recover / undelete files from ext3 or ext4 partitions";
+    longDescription = ''
+      ext4magic can recover/undelete files from ext3 or ext4 partitions
+      by retrieving file-information from the filesystem journal.
+
+      If the information in the journal are sufficient, ext4magic can
+      recover the most file types, with original filename, owner and group,
+      file mode bits and also the old atime/mtime stamps. 
+
+      It's much more effective and works much better than extundelete.
+    '';
+    homepage = http://ext4magic.sourceforge.net/ext4magic_en.html;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.rkoe ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fb532e14c47..8f8184075a5c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2209,6 +2209,8 @@ with pkgs;
 
   exiftool = perlPackages.ImageExifTool;
 
+  ext4magic = callPackage ../tools/filesystems/ext4magic { };
+
   extundelete = callPackage ../tools/filesystems/extundelete { };
 
   expect = callPackage ../tools/misc/expect { };

From 480d52ebed1c80e3eff8e8dc6ddb2a402bf3d102 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Mon, 7 May 2018 16:18:22 -0700
Subject: [PATCH 1309/3370] sit: better fix for aarch64 bug

---
 .../version-management/sit/aarch64-eexist.patch | 17 -----------------
 .../version-management/sit/aarch64-isel.patch   |  9 +++++++++
 .../version-management/sit/default.nix          |  2 +-
 3 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/applications/version-management/sit/aarch64-eexist.patch
 create mode 100644 pkgs/applications/version-management/sit/aarch64-isel.patch

diff --git a/pkgs/applications/version-management/sit/aarch64-eexist.patch b/pkgs/applications/version-management/sit/aarch64-eexist.patch
deleted file mode 100644
index 8b45e77d040d..000000000000
--- a/pkgs/applications/version-management/sit/aarch64-eexist.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/sit-core/src/repository.rs b/sit-core/src/repository.rs
-index ebd357d..074dcc9 100644
---- a/sit-core/src/repository.rs
-+++ b/sit-core/src/repository.rs
-@@ -305,6 +305,12 @@ impl Repository {
-         let id: String = name.into();
-         let mut path = self.items_path.clone();
-         path.push(&id);
-+        #[cfg(all(debug_assertions, target_arch = "aarch64"))] {
-+          use std::io;
-+          if path.is_dir() {
-+             return Err(io::Error::from_raw_os_error(17).into()); // 17 is EEXIST
-+          }
-+        }
-         fs::create_dir(path)?;
-         let id = OsString::from(id);
-         Ok(Item {
diff --git a/pkgs/applications/version-management/sit/aarch64-isel.patch b/pkgs/applications/version-management/sit/aarch64-isel.patch
new file mode 100644
index 000000000000..411922cfd8e7
--- /dev/null
+++ b/pkgs/applications/version-management/sit/aarch64-isel.patch
@@ -0,0 +1,9 @@
+diff --git a/.cargo/config b/.cargo/config
+new file mode 100644
+index 0000000..15e7649
+--- /dev/null
++++ b/.cargo/config
+@@ -0,0 +1,3 @@
++# https://github.com/rust-lang/rust/issues/50516
++[target.'cfg(all(debug_assertions, target_arch = "aarch64"))']
++rustflags = ["-C", "llvm-args=-fast-isel"]
diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix
index ae84add283e6..e189241531d6 100644
--- a/pkgs/applications/version-management/sit/default.nix
+++ b/pkgs/applications/version-management/sit/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "102haqix13nwcncng1s8qkw68spn6fhh3vysk2nbahw6f78zczqg";
 
-  patches = [ ./aarch64-eexist.patch ];
+  patches = [ ./aarch64-isel.patch ];
 
   meta = with stdenv.lib; {
     description = "Serverless Information Tracker";

From 8b5ecf9141ded0e10e33537b17bb48b01669fbc4 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Tue, 24 Apr 2018 23:30:27 +0200
Subject: [PATCH 1310/3370] brial: init at 1.2.3

---
 .../libraries/science/math/brial/default.nix  | 46 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/brial/default.nix

diff --git a/pkgs/development/libraries/science/math/brial/default.nix b/pkgs/development/libraries/science/math/brial/default.nix
new file mode 100644
index 000000000000..0c0332f13662
--- /dev/null
+++ b/pkgs/development/libraries/science/math/brial/default.nix
@@ -0,0 +1,46 @@
+{ stdenv
+, fetchFromGitHub
+, autoreconfHook
+, pkgconfig
+, boost
+, m4ri
+, gd
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.2.3";
+  name = "brial-${version}";
+
+  src = fetchFromGitHub {
+    owner = "BRiAl";
+    repo = "BRiAl";
+    rev = version;
+    sha256 = "0qy4cwy7qrk4zg151cmws5cglaa866z461cnj9wdnalabs7v7qbg";
+  };
+
+  # FIXME package boost-test and enable checks
+  doCheck = false;
+
+  configureFlags = [
+    "--with-boost-unit-test-framework=no"
+  ];
+
+  buildInputs = [
+    boost
+    m4ri
+    gd
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkgconfig
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/BRiAl/BRiAl;
+    description = "Legacy version of PolyBoRi maintained by sagemath developers";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ timokau ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9199f7af2f87..442c4b21d68a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19947,6 +19947,8 @@ with pkgs;
 
   blas = callPackage ../development/libraries/science/math/blas { };
 
+  brial = callPackage ../development/libraries/science/math/brial { };
+
   clblas = callPackage ../development/libraries/science/math/clblas {
     inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo OpenCL;
   };

From 16463d728b81f159e3b5f4eaae241841b227d86f Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 8 May 2018 01:00:36 +0200
Subject: [PATCH 1311/3370] zoom-us: liblgvnd fix for libGL.so in libpath

---
 .../networking/instant-messengers/zoom-us/default.nix          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index db32dd0c23e2..692a43629355 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
   alsaLib, dbus, glib, fontconfig, freetype, libpulseaudio,
-  utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps }:
+  utillinux, zlib, xorg, udev, sqlite, expat, libv4l, procps, libGL }:
 
 let
 
@@ -24,6 +24,7 @@ in stdenv.mkDerivation {
     expat
     glib
     freetype
+    libGL
     libpulseaudio
     zlib
     dbus

From 302c4c5f2da82794f2f7fb217a1b977897f852fa Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 7 May 2018 19:53:56 -0400
Subject: [PATCH 1312/3370] stdenv: Put back isArm, with deprecation notice.

This was always meant to be deprecated rather than removed.
---
 pkgs/stdenv/generic/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 190fc500068c..e9ae54811a21 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -118,6 +118,7 @@ let
       inherit (hostPlatform)
         isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
         isi686 isx86_64 is64bit isAarch32 isAarch64 isMips isBigEndian;
+      isArm = builtins.trace "stdenv.isArm is deprecated after 18.03" hostPlatform.isArm;
 
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;

From 3e7bcb69377fdb18cf283c9c18b884536a1326bb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:34:14 +0200
Subject: [PATCH 1313/3370] =?UTF-8?q?meld:=203.18.0=20=E2=86=92=203.18.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/version-management/meld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index e3cafe6b6464..f6816ec15484 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -5,14 +5,14 @@
 
 let
   pname = "meld";
-  version = "3.18.0";
+  version = "3.18.1";
   inherit (python3Packages) python buildPythonApplication pycairo pygobject3;
 in buildPythonApplication rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0gi2jzgsrd5q2icyp6wphbn532ddg82nxhfxlffkniy7wnqmi0c4";
+    sha256 = "0yg8i1ff3rsavsaxbnd6dxmfsiyv49kk8rv5wqnyhf2zmfp8rxis";
   };
 
   buildInputs = [

From 9ad901ae1f4c7e9bb9aedf497b1a904dd960359e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:34:36 +0200
Subject: [PATCH 1314/3370] =?UTF-8?q?gnome3.bijiben:=203.28.1=20=E2=86=92?=
 =?UTF-8?q?=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
index 93a2c41caf35..5ed4b487bdd9 100644
--- a/pkgs/desktops/gnome-3/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/apps/bijiben/default.nix
@@ -5,13 +5,13 @@
 , gnome3, libxml2 }:
 
 let
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "bijiben-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/bijiben/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0ivx3hbpg7qaqzpbbn06lz9w3q285vhwgfr353b14bg0nsidwy17";
+    sha256 = "1z1dqspjpyym27yav7pr813x7k0jdxifgj5rdxgp4m6cs1ixcvjs";
   };
 
   doCheck = true;

From 715adbfad3e2c8d5638bbf8d4f747936f8cf9502 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:34:50 +0200
Subject: [PATCH 1315/3370] =?UTF-8?q?evolution:=203.28.1=20=E2=86=92=203.2?=
 =?UTF-8?q?8.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index d7def6e27091..4470f11597eb 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -5,13 +5,13 @@
 , libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:
 
 let
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "evolution-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0sdv5lg2vlz5f4raymz9d8a5jq4j18vbqyigaip6508p3bjnfj8l";
+    sha256 = "0lx9amjxmfnwc0089griyxms9prmb78wfnfvdsvli8yw1cns4i74";
   };
 
   propagatedUserEnvPkgs = [ gnome3.evolution-data-server ];

From cafac77e205abebc42dec80eafe9a021116b7236 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:35:09 +0200
Subject: [PATCH 1316/3370] =?UTF-8?q?gnome3.gnome-boxes:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.28.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 8921d70787ca..0ba4199630ab 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -9,13 +9,13 @@
 # TODO: ovirt (optional)
 
 let
-  version = "3.28.2";
+  version = "3.28.3";
 in stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0xss6wrs4hkmr0aa9qxr9b6wxbygrkjz4p0c4xnymicq97jnwra1";
+    sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d";
   };
 
   doCheck = true;

From df8665d04e81be9434a0887f38c563b5f5e4066f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:35:29 +0200
Subject: [PATCH 1317/3370] =?UTF-8?q?gnome3.gnome-calendar:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
index b88bad2f6497..347cd7a16ae0 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "gnome-calendar";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1jacznnjql5jgzvzcp5kh2k0cd0y41cri6qz2bsakpllf7adbrq6";
+    sha256 = "0x6wxngf8fkwgbl6x7rzp0srrb43rm55klpb2vfjk2hahpbjvxyw";
   };
 
   passthru = {

From 2a5ce6157af7192bce259c4d2d088aab1c86401d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:35:43 +0200
Subject: [PATCH 1318/3370] =?UTF-8?q?gnome3.gnome-characters:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
index 1587fec2c695..b07417ecc35a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-characters-${version}";
-  version = "3.28.0";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "14q92ysg7krawxlwv6ymgsxz2plk81wgfz6knlma7lm13jsczmf0";
+    sha256 = "04nmn23iw65wsczx1l6fa4jfdsv65klb511p39zj1pgwyisgj5l0";
   };
 
   postPatch = ''

From 048de32f28baff1e0defd5c27370dbb56559ea04 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:35:52 +0200
Subject: [PATCH 1319/3370] =?UTF-8?q?gnome3.gnome-logs:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
index c184bcbb42d8..614308f7b631 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-logs-${version}";
-  version = "3.28.0";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0j3wkbz7c2snmx4kjmh767175nf2lqxx2p8b8xa2qslknxc3gq6b";
+    sha256 = "0qqmw55rrxdz2n9xwn85nm7j9y9i85fxlxjfgv683mbpdyv0gbg0";
   };
 
   configureFlags = [ "--disable-tests" ];

From 2415bdc78e04068fc79a54d2bf694b761061b2f9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:02 +0200
Subject: [PATCH 1320/3370] =?UTF-8?q?gnome3.gnome-maps:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index b5c8188bd064..cade274e69a8 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -5,13 +5,13 @@
 
 let
   pname = "gnome-maps";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "19xx1v25ycr8ih4jwb1vc662jcx6kynaf7baj4i569ccrcwaj2d5";
+    sha256 = "1yzi08a9316jplgsl2z0qzlqxhghyqcjhv0m6i94wcain4mxk1z7";
   };
 
   doCheck = true;

From 47d29c502f00afc6949baaa22e537fda7ef0c1e8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:10 +0200
Subject: [PATCH 1321/3370] =?UTF-8?q?gnome3.gnome-music:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index c2d5045e79ea..9aa8eee0bca8 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.28.1";
+  version = "3.28.2";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
-    sha256 = "0xbwndfl72292dx4x99vm0iyrcy8xw2i5fhsch7b073rk4ydbyfx";
+    sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid";
   };
 
   nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];

From ffda669690e5b91ba55cc2ce5803a3dcb46c539c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:21 +0200
Subject: [PATCH 1322/3370] =?UTF-8?q?gnome3.eog:=203.28.1=20=E2=86=92=203.?=
 =?UTF-8?q?28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 85587d11178d..7f7a533a5502 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -4,13 +4,13 @@
 
 let
   pname = "eog";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1v3s4x4xdmfa488drwvxfps33jiyh3qz9z8v8s3779n1jn92rmbq";
+    sha256 = "1gasrfqi7qrzdq1idh29r0n6ikkqjb6pbp7a8k5krfz5hkhyfin0";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobjectIntrospection ];

From 44e49b9e450f9b532f59cc75d9969e731ad7a37d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:37 +0200
Subject: [PATCH 1323/3370] =?UTF-8?q?evolution-data-server:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 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 2e87c4a44a1b..a95162068599 100644
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "evolution-data-server-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution-data-server/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "12b9lfgwd57rzn9394xrbvl9ym5aqldpz9v7c9a421dsv8dgq13b";
+    sha256 = "1azk8zh167a6hyxzz73yh36gbpf7i52b7zi10hnnnsywh80pj6jk";
   };
 
   nativeBuildInputs = [

From 6353a952ceae4785e879d5614a92121d4987452a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:36:57 +0200
Subject: [PATCH 1324/3370] =?UTF-8?q?gnome3.gjs:=201.52.2=20=E2=86=92=201.?=
 =?UTF-8?q?52.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index fc352de2acf8..1bf640f713f7 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gjs-${version}";
-  version = "1.52.2";
+  version = "1.52.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "00x08ypx61i3k84bmvkhdj37q81g79lzm5sxqm1lz4xzzad9rg98";
+    sha256 = "1z4n15wdz6pbqd2hfzrqc8mmprhv50v4jk43p08v0xv07yldh8ff";
   };
 
   passthru = {

From 6465aaac0640f88d1fe0d9aa56543381e118769d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:37:17 +0200
Subject: [PATCH 1325/3370] =?UTF-8?q?gnome3.gnome-contacts:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
index c8636cb1dc1f..5799e613d5bc 100644
--- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
@@ -5,13 +5,13 @@
 , vala, meson, ninja }:
 
 let
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "gnome-contacts-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "17iinxqf221kk9yppv3yhg0m7jxk5zvwxmdf3hjygf9xgfw7z3zi";
+    sha256 = "1ilgmvgprn1slzmrzbs0zwgbzxp04rn5ycqd9c8zfvyh6zzwwr8w";
   };
 
   propagatedUserEnvPkgs = [ evolution-data-server ];

From fef1129d4e648d7beebff3bcc7fc00d37e798fb6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:37:35 +0200
Subject: [PATCH 1326/3370] =?UTF-8?q?gnome3.gnome-keyring:=203.28.0.2=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
index 740748631ee2..39108141c93c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-keyring-${version}";
-  version = "3.28.0.2";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-keyring/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0a52xz535vgfymjw3cxmryi3xn2ik24vwk6sixyb7q6jgmqi4bw8";
+    sha256 = "0sk4las4ji8wv9nx8mldzqccmpmkvvr9pdwv9imj26r10xyin5w1";
   };
 
   passthru = {

From 2b1db532967ec7d902868e286dd00a9b237b5032 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:37:59 +0200
Subject: [PATCH 1327/3370] =?UTF-8?q?gnome3.gnome-shell-extensions:=203.28?=
 =?UTF-8?q?.0=20=E2=86=92=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/core/gnome-shell-extensions/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
index 7ba3545848f7..a963ea148bad 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-extensions-${version}";
-  version = "3.28.0";
+  version = "3.28.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "00xm5r4q40c0ji80vrsqg2fkrvzb1nm75p3ikv6bsmd3gfvwwp91";
+    sha256 = "0n4h8rdnq3knrvlg6inrl62a73h20dbhfgniwy18572jicrh5ip9";
   };
 
   passthru = {
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     # Fixup adapted from export-zips.sh in the source.
 
     extensiondir=$out/share/gnome-shell/extensions
-    schemadir=$out/share/gsettings-schemas/gnome-shell-extensions-3.28.0/glib-2.0/schemas/
+    schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/
 
     glib-compile-schemas $schemadir
 

From df805805213aa1a6b699e194f2aa4f3570fd3919 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:38:21 +0200
Subject: [PATCH 1328/3370] =?UTF-8?q?gnome3.gnome-shell:=203.28.0=20?=
 =?UTF-8?q?=E2=86=92=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 70177d0a516e..6b1e15bbc993 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core
 , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
-, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42
+, libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
 , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook
 , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet
 , sassc, systemd, gst_all_1 }:
@@ -13,11 +13,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "gnome-shell-${version}";
-  version = "3.28.0";
+  version = "3.28.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0kmsh305cfr3fg40rhwykqbl466lwcq9djda25kf29ib7h6w1pn7";
+    sha256 = "1k2cgaky293kcjis0pmh9hw1aby3yyilb5dzrbww62wxzppc9s35";
   };
 
   # Needed to find /etc/NetworkManager/VPN
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     meson ninja pkgconfig gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales
-    sassc
+    sassc desktop-file-utils
   ];
   buildInputs = with gnome3; [
     systemd caribou

From c477acec9efc4347fb5bdc36f84d14f94a523731 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:38:42 +0200
Subject: [PATCH 1329/3370] =?UTF-8?q?gnome3.mutter:=203.28.0=20=E2=86=92?=
 =?UTF-8?q?=203.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 623d2b1251e1..866888feba0c 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mutter-${version}";
-  version = "3.28.0";
+  version = "3.28.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1c46sf10mgvwgym4c6hbjm7wa82dvfv8j8dx4zdbc7zj4n0grzsq";
+    sha256 = "1bhmjvf6l1fj5igsw2xlg3nv5526laiwaxh47dgk50f40qax1qin";
   };
 
   passthru = {

From fd0d1f35a5f6d8dd321df74828144aa67da7f15f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 8 May 2018 02:39:09 +0200
Subject: [PATCH 1330/3370] =?UTF-8?q?gvfs:=201.36.1=20=E2=86=92=201.36.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index 238edddaf3ad..4f3bc64b5d40 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -18,14 +18,14 @@
 
 let
   pname = "gvfs";
-  version = "1.36.1";
+  version = "1.36.2";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "09phj9kqk8lzcmkjfq7qmzpkj4xp1vg4mskv6d2s9j62hvrxyh1q";
+    sha256 = "1xq105596sk9yram5a143b369wpaiiwc9gz86n0j1kfr7nipkqn4";
   };
 
   # Uncomment when switching back to meson

From 376c55fcea12e76dee22f74efa6fba5b4228891b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Tue, 8 May 2018 03:36:41 +0200
Subject: [PATCH 1331/3370] cargo-fuzz: init at 0.5.3

---
 .../tools/rust/cargo-fuzz/default.nix         | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/rust/cargo-fuzz/default.nix

diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix
new file mode 100644
index 000000000000..cc5d90b223d6
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "cargo-fuzz-${version}";
+  version = "0.5.3"; # Note to self: on 0.5.4, remove the hand-added Cargo.lock
+
+  src =
+    let
+      source = fetchFromGitHub {
+        owner = "rust-fuzz";
+        repo = "cargo-fuzz";
+        rev = version;
+        sha256 = "1l452fnjw7i10nrd4y4rssi5d457vgjp6rhdr9cnq32bjhdkprrs";
+      };
+      cargo-lock = fetchurl {
+        url = "https://gist.githubusercontent.com/Ekleog/7d5b62d13b7207aafa4c37d1bbdf2de7/raw/c6027fc1c531947f4d6836a3c4cba1b3e24df24c/Cargo.lock";
+        sha256 = "0d7b6kxfbfvwksybzrihylamg2zv5fmsk9m6xshryhwipskzzvmd";
+      };
+    in
+    runCommand "cargo-fuzz-src" {} ''
+      cp -R ${source} $out
+      chmod +w $out
+      cp ${cargo-lock} $out/Cargo.lock
+    '';
+
+  cargoSha256 = "0ajm8qp8hi7kn7199ywv26cmjv13phxv72lz8kcq97hxg17x0dkk";
+
+  meta = with stdenv.lib; {
+    description = "Command line helpers for fuzzing";
+    homepage = https://github.com/rust-fuzz/cargo-fuzz;
+    license = with licenses; [ mit asl20 ];
+    maintainers = [ maintainers.ekleog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567167fc4605..53635e51b4b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6848,7 +6848,7 @@ with pkgs;
 
   buildRustCrate = callPackage ../build-support/rust/build-rust-crate.nix { };
 
-  cargo-vendor = callPackage ../build-support/rust/cargo-vendor {};
+  cargo-vendor = callPackage ../build-support/rust/cargo-vendor { };
 
   carnix = (callPackage ../build-support/rust/carnix.nix { }).carnix { };
 
@@ -6873,6 +6873,8 @@ with pkgs;
 
   cargo-edit = callPackage ../tools/package-management/cargo-edit { };
 
+  cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
+
   rainicorn = callPackage ../development/tools/rust/rainicorn { };
   rustfmt = callPackage ../development/tools/rust/rustfmt { };
   rustracer = callPackage ../development/tools/rust/racer { };

From a33756a866e1d64337e58c78e3fef2303a00af3d Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 7 May 2018 23:48:04 -0400
Subject: [PATCH 1332/3370] Use build packages GHC for
 haskell.packages.integer-simple

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 937c930ac750..8a395fbec186 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -159,7 +159,7 @@ in rec {
         (name: ! builtins.elem name integerSimpleExcludes)
         (pkgs.lib.attrNames packages);
     in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages."${name}".override {
-      ghc = compiler.integer-simple."${name}";
+      ghc = bh.compiler.integer-simple."${name}";
       overrides = _self : _super : {
         integer-simple = null;
         integer-gmp = null;

From 0afb45d5747d812d434e687ce8bfc78e40a54060 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 7 May 2018 23:52:05 -0400
Subject: [PATCH 1333/3370] Set the C standard when building GHC

Should this be in cc-wrapper?
---
 pkgs/development/compilers/ghc/8.4.2.nix | 2 ++
 pkgs/development/compilers/ghc/head.nix  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index cf4e57727198..bbe82354c8c1 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -50,6 +50,8 @@ let
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 51497e0d9cee..f0e21b0cf5b3 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -50,6 +50,8 @@ let
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
     GhcLibHcOpts += -fPIC
     GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
   '';
 
   # Splicer will pull out correct variations

From 8012aee0a7d9fe14fe77d20b6fdd8d2e6120bcc1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Mon, 7 May 2018 23:52:34 -0400
Subject: [PATCH 1334/3370] Don't enableShared in GHC when using android
 prebuilt

---
 pkgs/development/compilers/ghc/8.4.2.nix | 2 +-
 pkgs/development/compilers/ghc/head.nix  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index bbe82354c8c1..b588592a71cf 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -22,7 +22,7 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? true
+  enableShared ? !targetPlatform.useAndroidPrebuilt
 
 , version ? "8.4.2"
 }:
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index f0e21b0cf5b3..7e1c73d166a2 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -22,7 +22,7 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? true
+  enableShared ? !targetPlatform.useAndroidPrebuilt
 
 , version ? "8.5.20180118"
 }:

From 219b1c1e1bfbf2ec56584c2e6fd7c1fb937d253a Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 8 May 2018 15:14:54 +0900
Subject: [PATCH 1335/3370] flashplayer: 29.0.0.140 -> 29.0.0.171

---
 .../networking/browsers/chromium/plugins.nix           |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix   | 10 +++++-----
 .../mozilla-plugins/flashplayer/standalone.nix         |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index f0862aebafe5..cb2121553ace 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,12 +98,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "29.0.0.140";
+    version = "29.0.0.171";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1p0jr7s6vyzxw1mhbrl5yx092z2wpvfw0jjw127gs576z0zwamwh";
+      sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 162dd88054c7..6c19b684aaa5 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,7 +73,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "29.0.0.140";
+  version = "29.0.0.171";
 
   src = fetchurl {
     url =
@@ -84,14 +84,14 @@ stdenv.mkDerivation rec {
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "0bj0d899dswfbkbrm08c381yzm0hlqdv53sgbl2z9zj4x8rqyi3p"
+          "140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc"
         else
-          "16as2dydgqip6qlg13jh83sd4lb2cgrny4ibqg7jlx1d1a1i0jwh"
+          "0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig"
       else
         if arch == "x86_64" then
-          "10s6j5izsy2v2ljljcv2vk898jg9xmp6zqqazmj07zy7m5vywfi7"
+          "17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3"
         else
-          "0xk8a2brpzfxi87mqqfv8l5xi5j9x71cy0ik64dzwcq7ka16gpz1";
+          "06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 42d7aa2f56f0..fa9c89b442bb 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,7 +55,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "29.0.0.140";
+  version = "29.0.0.171";
 
   src = fetchurl {
     url =
@@ -65,9 +65,9 @@ stdenv.mkDerivation rec {
         "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "1gvfm4z46m2y39fswpzhx18dlwcxwwy5mins3kx2m425dgp76zd5"
+        "1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67"
       else
-        "08a21c0l47w97xhwiby8j5055kl37ld5insfd459gz92d3f145fl";
+        "0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502";
   };
 
   nativeBuildInputs = [ unzip ];

From 5d66a6bbdb78e8c25876146e185898b1afb71993 Mon Sep 17 00:00:00 2001
From: Joel Burget <joelburget@gmail.com>
Date: Tue, 8 May 2018 00:23:07 -0700
Subject: [PATCH 1336/3370] 1password: init at version 0.4 (#40158)

---
 maintainers/maintainer-list.nix              |  5 +++
 pkgs/applications/misc/1password/default.nix | 34 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/misc/1password/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 782a3ee6aadd..e31b84b03b0b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1825,6 +1825,11 @@
     github = "joamaki";
     name = "Jussi Maki";
   };
+  joelburget = {
+    email = "joelburget@gmail.com";
+    github = "joelburget";
+    name = "Joel Burget";
+  };
   joelmo = {
     email = "joel.moberg@gmail.com";
     github = "joelmo";
diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
new file mode 100644
index 000000000000..b0b6111b334a
--- /dev/null
+++ b/pkgs/applications/misc/1password/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchzip, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "1password-${version}";
+  version = "0.4";
+  src = if stdenv.system == "i686-linux" then fetchzip {
+    url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
+    sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41";
+    stripRoot = false;
+  } else fetchzip {
+    url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
+    sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf";
+    stripRoot = false;
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D op $out/share/1password/op
+
+    # https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051
+    makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \
+      --argv0 op \
+      --add-flags $out/share/1password/op
+  '';
+
+  meta = with stdenv.lib; {
+    description = "1Password command-line tool";
+    homepage    = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/";
+    maintainers = with maintainers; [ joelburget ];
+    license     = licenses.unfree;
+    platforms   = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 546a9d9bd76f..6a5d8e6f0df7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -400,6 +400,8 @@ with pkgs;
 
   ### TOOLS
 
+  _1password = callPackage ../applications/misc/1password { };
+
   _9pfs = callPackage ../tools/filesystems/9pfs { };
 
   a2ps = callPackage ../tools/text/a2ps { };

From c2b4cfbe0827d309efd9ccf25352b3e32caa8dd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 8 May 2018 09:12:13 +0100
Subject: [PATCH 1337/3370] xmrig: restrict to x86

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

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 9814ec92f021..5b389d99da76 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     description = "Monero (XMR) CPU miner";
     homepage = "https://github.com/xmrig/xmrig";
     license = licenses.gpl3Plus;
+    platforms   = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ fpletz ];
   };
 }

From a8768c610efdbe27af26256c001609b5f05f0af9 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <github@tazj.in>
Date: Tue, 8 May 2018 10:22:25 +0200
Subject: [PATCH 1338/3370] bluemix-cli: init at 0.6.6 (#40147)

Adds the (non-free, binary) IBM Bluemix CLI which is required to
administrate IBM Bluemix services.
---
 pkgs/tools/admin/bluemix-cli/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/admin/bluemix-cli/default.nix

diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix
new file mode 100644
index 000000000000..f014d09b5c72
--- /dev/null
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -0,0 +1,25 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "bluemix-cli-${version}";
+  version = "0.6.6";
+
+  src = fetchurl {
+    name = "linux64.tar.gz";
+    url = "https://clis.ng.bluemix.net/download/bluemix-cli/${version}/linux64";
+    sha256 = "1swjawc4szqrl0wgjcb4na1hbxylaqp2mp53lxsbfbk1db0c3y85";
+  };
+
+  installPhase = ''
+    install -m755 -D --target $out/bin bin/bluemix bin/bluemix-analytics bin/cfcli/cf
+  '';
+
+  meta = with lib; {
+    description  = "Administration CLI for IBM BlueMix";
+    homepage     = "https://console.bluemix.net/docs/cli/index.html";
+    downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install";
+    license      = licenses.unfree;
+    maintainers  = maintainers.tazjin;
+    platforms    = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a5d8e6f0df7..b65b28bb0201 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -833,6 +833,8 @@ with pkgs;
 
   blink = callPackage ../applications/networking/instant-messengers/blink { };
 
+  bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
+
   libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };
 
   quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { };

From aad0a825f9190539002fbac010b06b268c1dadbf Mon Sep 17 00:00:00 2001
From: scalavision <scalavision@gmail.com>
Date: Tue, 8 May 2018 10:40:10 +0200
Subject: [PATCH 1339/3370] singularity: 2.4.6 -> 2.5.1

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

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index d6913a94432b..2048d7d2ed92 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -13,11 +13,12 @@
 , gnused
 , curl
 , utillinux
+, libarchive
  }:
 
 stdenv.mkDerivation rec {
   name = "singularity-${version}";
-  version = "2.4.6";
+  version = "2.5.1";
 
   enableParallelBuilding = true;
 
@@ -45,11 +46,11 @@ stdenv.mkDerivation rec {
     owner = "singularityware";
     repo = "singularity";
     rev = version;
-    sha256 = "0bs1jqm7v7wv1kdxq8kyqn3gl5m76j0wwwgjyjnndrhczlsh5m1d";
+    sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];
-  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux ];
+  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive ];
 
   meta = with stdenv.lib; {
     homepage = http://singularity.lbl.gov/;

From 41d4bd29acbbbc65dc7412cdc1596fd7c2d861dc Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Mon, 23 Apr 2018 10:37:15 +0200
Subject: [PATCH 1340/3370] nixos/keepalived: Implemented vrrp-instance
 tracking scripts and interfaces. Tracking scripts in particular, cannot be
 included in extraOpts, because script declaration has to be above script
 usage in keepalived.conf. Changes are fully backward compatible.

---
 .../networking/keepalived/default.nix         | 62 +++++++++++++++++-
 ...-options.nix => vrrp-instance-options.nix} | 14 ++++
 .../keepalived/vrrp-script-options.nix        | 64 +++++++++++++++++++
 3 files changed, 138 insertions(+), 2 deletions(-)
 rename nixos/modules/services/networking/keepalived/{vrrp-options.nix => vrrp-instance-options.nix} (88%)
 create mode 100644 nixos/modules/services/networking/keepalived/vrrp-script-options.nix

diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix
index 378cd9365848..c9ac2ee25990 100644
--- a/nixos/modules/services/networking/keepalived/default.nix
+++ b/nixos/modules/services/networking/keepalived/default.nix
@@ -8,10 +8,12 @@ let
 
   keepalivedConf = pkgs.writeText "keepalived.conf" ''
     global_defs {
+      ${optionalString cfg.enableScriptSecurity "enable_script_security"}
       ${snmpGlobalDefs}
       ${cfg.extraGlobalDefs}
     }
 
+    ${vrrpScriptStr}
     ${vrrpInstancesStr}
     ${cfg.extraConfig}
   '';
@@ -26,6 +28,22 @@ let
     + optionalString enableTraps "enable_traps"
   );
 
+  vrrpScriptStr = concatStringsSep "\n" (map (s:
+    ''
+      vrrp_script ${s.name} {
+        script "${s.script}"
+        interval ${toString s.interval}
+        fall ${toString s.fall}
+        rise ${toString s.rise}
+        timeout ${toString s.timeout}
+        weight ${toString s.weight}
+        user ${s.user} ${optionalString (s.group != null) s.group}
+
+        ${s.extraConfig}
+      }
+    ''
+  ) vrrpScripts);
+
   vrrpInstancesStr = concatStringsSep "\n" (map (i:
     ''
       vrrp_instance ${i.name} {
@@ -49,6 +67,18 @@ let
           ${concatMapStringsSep "\n" virtualIpLine i.virtualIps}
         }
 
+        ${optionalString (builtins.length i.trackScripts > 0) ''
+          track_script {
+            ${concatStringsSep "\n" i.trackScripts}
+          }
+        ''}
+
+        ${optionalString (builtins.length i.trackInterfaces > 0) ''
+          track_interface {
+            ${concatStringsSep "\n" i.trackInterfaces}
+          }
+        ''}
+
         ${i.extraConfig}
       }
     ''
@@ -64,6 +94,12 @@ let
 
   notNullOrEmpty = s: !(s == null || s == "");
 
+  vrrpScripts = mapAttrsToList (name: config:
+    {
+      inherit name;
+    } // config
+  ) cfg.vrrpScripts;
+
   vrrpInstances = mapAttrsToList (iName: iConfig:
     {
       name = iName;
@@ -86,7 +122,8 @@ let
     { assertion = !i.vmacXmitBase || i.useVmac;
       message = "services.keepalived.vrrpInstances.${i.name}.vmacXmitBase has no effect when services.keepalived.vrrpInstances.${i.name}.useVmac is not set.";
     }
-  ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps);
+  ] ++ flatten (map (virtualIpAssertions i.name) i.virtualIps)
+    ++ flatten (map (vrrpScriptAssertion i.name) i.trackScripts);
 
   virtualIpAssertions = vrrpName: ip: [
     { assertion = ip.addr != "";
@@ -94,6 +131,11 @@ let
     }
   ];
 
+  vrrpScriptAssertion = vrrpName: scriptName: {
+    assertion = builtins.hasAttr scriptName cfg.vrrpScripts;
+    message = "services.keepalived.vrrpInstances.${vrrpName} trackscript ${scriptName} is not defined in services.keepalived.vrrpScripts.";
+  };
+
   pidFile = "/run/keepalived.pid";
 
 in
@@ -110,6 +152,14 @@ in
         '';
       };
 
+      enableScriptSecurity = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Don't run scripts configured to be run as root if any part of the path is writable by a non-root user.
+        '';
+      };
+
       snmp = {
 
         enable = mkOption {
@@ -181,8 +231,16 @@ in
 
       };
 
+      vrrpScripts = mkOption {
+        type = types.attrsOf (types.submodule (import ./vrrp-script-options.nix {
+          inherit lib;
+        }));
+        default = {};
+        description = "Declarative vrrp script config";
+      };
+
       vrrpInstances = mkOption {
-        type = types.attrsOf (types.submodule (import ./vrrp-options.nix {
+        type = types.attrsOf (types.submodule (import ./vrrp-instance-options.nix {
           inherit lib;
         }));
         default = {};
diff --git a/nixos/modules/services/networking/keepalived/vrrp-options.nix b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
similarity index 88%
rename from nixos/modules/services/networking/keepalived/vrrp-options.nix
rename to nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
index 79eff3ae5419..85b9bc337726 100644
--- a/nixos/modules/services/networking/keepalived/vrrp-options.nix
+++ b/nixos/modules/services/networking/keepalived/vrrp-instance-options.nix
@@ -108,6 +108,20 @@ with lib;
       description = "Declarative vhost config";
     };
 
+    trackScripts = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "chk_cmd1" "chk_cmd2" ];
+      description = "List of script names to invoke for health tracking.";
+    };
+
+    trackInterfaces = mkOption {
+      type = types.listOf types.str;
+      default = [];
+      example = [ "eth0" "eth1" ];
+      description = "List of network interfaces to monitor for health tracking.";
+    };
+
     extraConfig = mkOption {
       type = types.lines;
       default = "";
diff --git a/nixos/modules/services/networking/keepalived/vrrp-script-options.nix b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix
new file mode 100644
index 000000000000..a3f794c40a89
--- /dev/null
+++ b/nixos/modules/services/networking/keepalived/vrrp-script-options.nix
@@ -0,0 +1,64 @@
+{ lib } :
+
+with lib;
+with lib.types;
+{
+  options = {
+
+    script = mkOption {
+      type = str;
+      example = "\${pkgs.curl} -f http://localhost:80";
+      description = "(Path of) Script command to execute followed by args, i.e. cmd [args]...";
+    };
+
+    interval = mkOption {
+      type = int;
+      default = 1;
+      description = "Seconds between script invocations.";
+    };
+
+    timeout = mkOption {
+      type = int;
+      default = 5;
+      description = "Seconds after which script is considered to have failed.";
+    };
+
+    weight = mkOption {
+      type = int;
+      default = 0;
+      description = "Following a failure, adjust the priority by this weight.";
+    };
+
+    rise = mkOption {
+      type = int;
+      default = 5;
+      description = "Required number of successes for OK transition.";
+    };
+
+    fall = mkOption {
+      type = int;
+      default = 3;
+      description = "Required number of failures for KO transition.";
+    };
+
+    user = mkOption {
+      type = str;
+      default = "keepalived_script";
+      description = "Name of user to run the script under.";
+    };
+
+    group = mkOption {
+      type = nullOr str;
+      default = null;
+      description = "Name of group to run the script under. Defaults to user group.";
+    };
+
+    extraConfig = mkOption {
+      type = lines;
+      default = "";
+      description = "Extra lines to be added verbatim to the vrrp_script section.";
+    };
+
+  };
+
+}

From bf02618e1f26f914283a29ab458ad67464a20f82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rton=20Boros?= <martonboros@gmail.com>
Date: Tue, 8 May 2018 11:41:52 +0200
Subject: [PATCH 1341/3370] idrisPackages.vdom: init at 0.6.0

---
 pkgs/development/idris-modules/default.nix |  2 ++
 pkgs/development/idris-modules/vdom.nix    | 28 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/idris-modules/vdom.nix

diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 12fbc8dfd17a..1dfa4e48899a 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -194,6 +194,8 @@
 
     union_type = callPackage ./union_type.nix {};
 
+    vdom = callPackage ./vdom.nix {};
+
     vecspace = callPackage ./vecspace.nix {};
 
     webgl = callPackage ./webgl.nix {};
diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix
new file mode 100644
index 000000000000..034bda583dbc
--- /dev/null
+++ b/pkgs/development/idris-modules/vdom.nix
@@ -0,0 +1,28 @@
+{ build-idris-package
+, fetchFromGitHub
+, prelude
+, base
+, lib
+, idris
+}:
+build-idris-package  {
+  name = "vdom";
+  version = "0.6.0";
+
+  idrisDeps = [ prelude base ];
+
+  src = fetchFromGitHub {
+    owner = "brandondyck";
+    repo = "idris-vdom";
+    rev = "ff32c14feeac937f7418830a9a3463cd9582be8a";
+    sha256 = "0aila1qdpmhrp556dzaxk7yn7vgkwcnbp9jhw8f8pl51xs3s2kvf";
+  };
+
+  meta = {
+    description = "Virtual DOM in pure Idris";
+    homepage = https://github.com/brandondyck/idris-vdom;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.brainrape ];
+    inherit (idris.meta) platforms;
+  };
+}

From eb774f30475547033d7059b1ea5de6393e3996bc Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 8 May 2018 11:10:09 +0200
Subject: [PATCH 1342/3370] akonadi-import-wizard: Add package expression

This is required for kdepim-addons and packaging this is pretty much
straightforward with no hurdles.

I tried to keep the coding style close to other packages in
kdeApplications so that it stays consistent.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel, @vandenoever
---
 .../kde/akonadi-import-wizard.nix             | 20 +++++++++++++++++++
 pkgs/applications/kde/default.nix             |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/applications/kde/akonadi-import-wizard.nix

diff --git a/pkgs/applications/kde/akonadi-import-wizard.nix b/pkgs/applications/kde/akonadi-import-wizard.nix
new file mode 100644
index 000000000000..cc1acbc6dd05
--- /dev/null
+++ b/pkgs/applications/kde/akonadi-import-wizard.nix
@@ -0,0 +1,20 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  akonadi, karchive, kcontacts, kcrash, kidentitymanagement, kio,
+  kmailtransport, kwallet, mailcommon, mailimporter, messagelib
+}:
+
+mkDerivation {
+  name = "akonadi-import-wizard";
+  meta = {
+    license = with lib.licenses; [ gpl2Plus lgpl21Plus fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    akonadi karchive kcontacts kcrash kidentitymanagement kio
+    kmailtransport kwallet mailcommon mailimporter messagelib
+  ];
+  outputs = [ "out" "dev" ];
+}
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5870179b6c0b..5b21844dd184 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -67,6 +67,7 @@ let
       akonadi = callPackage ./akonadi {};
       akonadi-calendar = callPackage ./akonadi-calendar.nix {};
       akonadi-contacts = callPackage ./akonadi-contacts.nix {};
+      akonadi-import-wizard = callPackage ./akonadi-import-wizard.nix {};
       akonadi-mime = callPackage ./akonadi-mime.nix {};
       akonadi-notes = callPackage ./akonadi-notes.nix {};
       akonadi-search = callPackage ./akonadi-search.nix {};

From dace4813771fa3563eda06b83d8362388ba8a96b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 8 May 2018 11:22:28 +0200
Subject: [PATCH 1343/3370] kdepim-addons: Add package expression

This is needed in order to add location information to contacts in
KAddressbook.

Packaging was quite straightforward except that it needed
akonadi-import-wizard, which I have packaged in the previous commit.

I'm committing this directly to master without a pull request, because
nothing depends on it (for obvious reasons) and packaging was trivial
enough so that if things are not as they supposed to be it can still be
changed very easily.

Tested this using the following VM configuration, because I don't run a
Plasma desktop:

(import <nixpkgs/nixos> {
  configuration = { pkgs, ... }: {
    environment.systemPackages = with import <nixpkgs> {}; [
      kdeApplications.kaddressbook kdeApplications.kdepim-addons
    ];
    users.users.test.isNormalUser = true;
    virtualisation.diskSize = 4096;
    virtualisation.memorySize = 2048;

    services.xserver = {
      enable = true;
      inherit ((import <nixpkgs/nixos> {}).config.services.xserver) layout;
      displayManager.sddm.enable = true;
      displayManager.sddm.autoLogin.enable = true;
      displayManager.sddm.autoLogin.user = "test";
      desktopManager.default = "plasma5";
      desktopManager.plasma5.enable = true;
    };
  };
}).vm

The test I've done is using KAddressbook and check whether the location
tab is working and it does now.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @ttuegel, @vandenoever
---
 pkgs/applications/kde/default.nix       |  1 +
 pkgs/applications/kde/kdepim-addons.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/kde/kdepim-addons.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5b21844dd184..f602e5c92d9f 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -102,6 +102,7 @@ let
       kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
       kdenlive = callPackage ./kdenlive.nix {};
       kdepim-runtime = callPackage ./kdepim-runtime.nix {};
+      kdepim-addons = callPackage ./kdepim-addons.nix {};
       kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
       kdf = callPackage ./kdf.nix {};
       kdialog = callPackage ./kdialog.nix {};
diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix
new file mode 100644
index 000000000000..fd3fe2d6c098
--- /dev/null
+++ b/pkgs/applications/kde/kdepim-addons.nix
@@ -0,0 +1,23 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, shared-mime-info,
+  akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews,
+  incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative,
+  kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar,
+  libksieve, mailcommon, mailimporter, messagelib, poppler_qt5, prison
+}:
+
+mkDerivation {
+  name = "kdepim-addons";
+  meta = {
+    license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
+  buildInputs = [
+    akonadi-import-wizard akonadi-notes calendarsupport eventviews
+    incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative
+    kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar
+    libksieve mailcommon mailimporter messagelib poppler_qt5 prison
+  ];
+}

From 199e7f18ede0057777ef19648ea7d27c623ed4dc Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Tue, 8 May 2018 11:53:33 +0200
Subject: [PATCH 1344/3370] bluemix: Fix eval of maintainers

---
 pkgs/tools/admin/bluemix-cli/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/bluemix-cli/default.nix b/pkgs/tools/admin/bluemix-cli/default.nix
index f014d09b5c72..2c24728fab9f 100644
--- a/pkgs/tools/admin/bluemix-cli/default.nix
+++ b/pkgs/tools/admin/bluemix-cli/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage     = "https://console.bluemix.net/docs/cli/index.html";
     downloadPage = "https://console.bluemix.net/docs/cli/reference/bluemix_cli/download_cli.html#download_install";
     license      = licenses.unfree;
-    maintainers  = maintainers.tazjin;
+    maintainers  = [ maintainers.tazjin ];
     platforms    = [ "x86_64-linux" ];
   };
 }

From a604fc6fcb4c645ffe2d2738b1b0990c2f715707 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@gmail.com>
Date: Tue, 8 May 2018 12:08:06 +0200
Subject: [PATCH 1345/3370] kontemplate: 1.4.0 -> 1.5.0

Moves to release version 1.5.0 (released 2018-05-08).
---
 pkgs/applications/networking/cluster/kontemplate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index 56cbef7f0055..fd599cd86586 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name          = "kontemplate-${version}";
-  version       = "1.4.0";
+  version       = "1.5.0";
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps        = ./deps.nix;
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "tazjin";
     repo   = "kontemplate";
     rev    = "v${version}";
-    sha256 = "11aqc9sgyqz3pscx7njnb3xghl7d61vzdgl3bqndady0dxsccrpj";
+    sha256 = "0k3yr0ypw6brj1lxqs041zsyi0r09113i0x3xfj48zv4ralq74b6";
   };
 
   meta = with lib; {

From f5e169c608f738de2469af27770f9a95d60faf82 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 4 Mar 2018 08:30:00 +0900
Subject: [PATCH 1346/3370] openntpd: make -s flag work

after seeing
`adjtime failed: Invalid argument` in my syslog, I tried using
`ntpd -s` but it would trigger
`/etc/ntpd.conf: No such file or directory`
see https://github.com/NixOS/nixpkgs/issues/31885

Instead of running the daemon with a specific config file, use the
standard file so that user are able to use the ntp executable without
having to look for the current config file.
---
 nixos/modules/services/networking/openntpd.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix
index 4bb9da54fe09..241038ca12ed 100644
--- a/nixos/modules/services/networking/openntpd.nix
+++ b/nixos/modules/services/networking/openntpd.nix
@@ -7,7 +7,7 @@ let
 
   package = pkgs.openntpd_nixos;
 
-  cfgFile = pkgs.writeText "openntpd.conf" ''
+  configFile = ''
     ${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)}
     ${cfg.extraConfig}
   '';
@@ -31,8 +31,8 @@ in
       type = with types; lines;
       default = "";
       example = ''
-        listen on 127.0.0.1 
-        listen on ::1 
+        listen on 127.0.0.1
+        listen on ::1
       '';
       description = ''
         Additional text appended to <filename>openntpd.conf</filename>.
@@ -57,6 +57,8 @@ in
     # Add ntpctl to the environment for status checking
     environment.systemPackages = [ package ];
 
+    environment.etc."ntpd.conf".text = configFile;
+
     users.extraUsers = singleton {
       name = "ntp";
       uid = config.ids.uids.ntp;
@@ -71,7 +73,7 @@ in
       before = [ "time-sync.target" ];
       after = [ "dnsmasq.service" "bind.service" "network-online.target" ];
       serviceConfig = {
-        ExecStart = "${package}/sbin/ntpd -f ${cfgFile} -p ${pidFile} ${cfg.extraOptions}";
+        ExecStart = "${package}/sbin/ntpd -p ${pidFile} ${cfg.extraOptions}";
         Type = "forking";
         PIDFile = pidFile;
       };

From 6c4c36fcbc2fcf4b7c1fcf4b372a94b069d3ee3d Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Thu, 3 May 2018 14:05:43 +0200
Subject: [PATCH 1347/3370] NetworkManager: add noDns option

---
 nixos/doc/manual/release-notes/rl-1809.xml    |  6 +++++
 nixos/modules/rename.nix                      |  1 +
 .../services/networking/networkmanager.nix    | 23 ++++++++++++-------
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 7259be4c904c..01b5e9d77460 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -227,6 +227,12 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      </para>
     </note>
    </listitem>
+   <listitem>
+    <para>
+     <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use
+     <literal>networking.networkmanager.dns</literal> instead.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a1ead80cc215..56b7bf00448c 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -17,6 +17,7 @@ with lib;
     (mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
     (mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
     (mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
+    (mkRenamedOptionModule [ "networking" "networkmanager" "useDnsmasq" ] [ "networking" "networkmanager" "dns" ])
 
     (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
     (mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 10e96eb40362..f4c4adcaaeb8 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -10,7 +10,8 @@ let
   stateDirs = "/var/lib/NetworkManager /var/lib/dhclient /var/lib/misc";
 
   dns =
-    if cfg.useDnsmasq then "dnsmasq"
+    if cfg.dns == "none" then "none"
+    else if cfg.dns == "dnsmasq" then "dnsmasq"
     else if config.services.resolved.enable then "systemd-resolved"
     else if config.services.unbound.enable then "unbound"
     else "default";
@@ -205,14 +206,20 @@ in {
         };
       };
 
-      useDnsmasq = mkOption {
-        type = types.bool;
-        default = false;
+      dns = mkOption {
+        type = types.enum [ "auto" "dnsmasq" "none" ];
+        default = "auto";
         description = ''
-          Enable NetworkManager's dnsmasq integration. NetworkManager will run
-          dnsmasq as a local caching nameserver, using a "split DNS"
-          configuration if you are connected to a VPN, and then update
-          resolv.conf to point to the local nameserver.
+          Options:
+            - auto: Check for systemd-resolved, unbound, or use default.
+            - dnsmasq:
+              Enable NetworkManager's dnsmasq integration. NetworkManager will run
+              dnsmasq as a local caching nameserver, using a "split DNS"
+              configuration if you are connected to a VPN, and then update
+              resolv.conf to point to the local nameserver.
+            - none:
+              Disable NetworkManager's DNS integration completely.
+              It will not touch your /etc/resolv.conf.
         '';
       };
 

From 9ef306bb4dc930f967678d9a2e9b4d4f2d1d5d03 Mon Sep 17 00:00:00 2001
From: Ben Barclay <benbarclay@gmail.com>
Date: Tue, 8 May 2018 22:46:24 +1000
Subject: [PATCH 1348/3370] bazel: 0.11.1 -> 0.12.0 (#39585)

---
 pkgs/development/tools/build-managers/bazel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix
index 593fe6c159b2..d5eaa24c1675 100644
--- a/pkgs/development/tools/build-managers/bazel/default.nix
+++ b/pkgs/development/tools/build-managers/bazel/default.nix
@@ -6,7 +6,7 @@
 
 stdenv.mkDerivation rec {
 
-  version = "0.11.1";
+  version = "0.12.0";
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/bazelbuild/bazel/";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    sha256 = "e8d762bcc01566fa50952c8028e95cfbe7545a39b8ceb3a0d0d6df33b25b333f";
+    sha256 = "3b3e7dc76d145046fdc78db7cac9a82bc8939d3b291e53a7ce85315feb827754";
   };
 
   sourceRoot = ".";

From 851d5d72a3c87d06d26dd78f8b3a421537fc8a52 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 25 Apr 2018 21:18:26 +0000
Subject: [PATCH 1349/3370] dovecot2: added ssl_dh using security.dhparams

The 18.03 channel includes dovecot 2.3, which requires ssl_dh to be set.
-> fixes https://github.com/nixcloud/nixcloud-webservices/issues/21
---
 nixos/modules/services/mail/dovecot.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 543e732127a5..96e60f9c88ea 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -25,6 +25,7 @@ let
       ssl_cert = <${cfg.sslServerCert}
       ssl_key = <${cfg.sslServerKey}
       ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)}
+      ssl_dh = <${config.security.dhparams.path}/dovecot2.pem
       disable_plaintext_auth = yes
     '')
 
@@ -297,10 +298,15 @@ in
 
 
   config = mkIf cfg.enable {
-
     security.pam.services.dovecot2 = mkIf cfg.enablePAM {};
 
-    services.dovecot2.protocols =
+    security.dhparams = mkIf (! isNull cfg.sslServerCert) {
+      enable = true;
+      params = {
+        dovecot2 = 2048;
+      };
+    };
+   services.dovecot2.protocols =
      optional cfg.enableImap "imap"
      ++ optional cfg.enablePop3 "pop3"
      ++ optional cfg.enableLmtp "lmtp";

From d541169e1a28d22f591ad7ca0edc48f76fa8eff4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 8 May 2018 16:03:52 +0300
Subject: [PATCH 1350/3370] wesnoth: unite with wesnoth-dev

There's no Wesnoth development version now.
---
 pkgs/games/wesnoth/default.nix  | 27 ++++++++--------------
 pkgs/games/wesnoth/dev.nix      | 41 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 +-
 3 files changed, 11 insertions(+), 59 deletions(-)
 delete mode 100644 pkgs/games/wesnoth/dev.nix

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index d3128210a1be..81ffd6b135fc 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,35 +1,28 @@
-{ stdenv, fetchurl, cmake, pkgconfig, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf
-, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre
-, makeWrapper, enableTools ? false
+{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
+, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
+, enableTools ? false
 }:
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.12.6";
+  version = "1.14.0";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "0kifp6g1dsr16m6ngjq2hx19h851fqg326ps3krnhpyix963h3x5";
+    sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ SDL SDL_image SDL_mixer SDL_net SDL_ttf pango gettext boost
-                  libvorbis fribidi dbus libpng pcre ];
+  buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
+                  libvorbis fribidi dbus libpng pcre openssl icu ];
 
   cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
 
   enableParallelBuilding = true;
 
-  # Wesnoth doesn't support input frameworks and Unicode input breaks when they are enabled.
-  postInstall = ''
-    for i in $out/bin/*; do
-      wrapProgram "$i" --unset XMODIFIERS
-    done
-  '';
-
   meta = with stdenv.lib; {
     description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
     longDescription = ''
@@ -42,7 +35,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.wesnoth.org/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ kkallio abbradar ];
-    platforms = platforms.unix;
+    maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/games/wesnoth/dev.nix b/pkgs/games/wesnoth/dev.nix
deleted file mode 100644
index 81ffd6b135fc..000000000000
--- a/pkgs/games/wesnoth/dev.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
-, pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
-, enableTools ? false
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wesnoth";
-  version = "1.14.0";
-
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
-  };
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
-                  libvorbis fribidi dbus libpng pcre openssl icu ];
-
-  cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
-    longDescription = ''
-      The Battle for Wesnoth is a Free, turn-based tactical strategy
-      game with a high fantasy theme, featuring both single-player, and
-      online/hotseat multiplayer combat. Fight a desperate battle to
-      reclaim the throne of Wesnoth, or take hand in any number of other
-      adventures.
-    '';
-
-    homepage = http://www.wesnoth.org/;
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b65b28bb0201..7ab3665873bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19622,7 +19622,7 @@ with pkgs;
 
   wesnoth = callPackage ../games/wesnoth { };
 
-  wesnoth-dev = callPackage ../games/wesnoth/dev.nix { };
+  wesnoth-dev = wesnoth;
 
   widelands = callPackage ../games/widelands {
     lua = lua5_2;

From 9c50f53065917249a47693041e8ab52ae96e0d06 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 8 May 2018 13:19:14 +0200
Subject: [PATCH 1351/3370] squashfsTools: apply reproducibility patches

Without these patches, the output of mksquashfs is not reproducible.
The patches are taken from https://github.com/squashfskit/squashfskit,
a fork of squashfs-tools, licensed under the GPL2 or later like
squashfs-tools itself.
---
 ...POCH-is-set-override-timestamps-with.patch |  90 +++++++
 ...POCH-is-set-also-clamp-content-times.patch |  83 +++++++
 .../0003-remove-frag-deflator-thread.patch    | 220 ++++++++++++++++++
 pkgs/tools/filesystems/squashfs/default.nix   |   9 +
 4 files changed, 402 insertions(+)
 create mode 100644 pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
 create mode 100644 pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
 create mode 100644 pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch

diff --git a/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
new file mode 100644
index 000000000000..5626800e723c
--- /dev/null
+++ b/pkgs/tools/filesystems/squashfs/0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
@@ -0,0 +1,90 @@
+From 0ab12a8585373be2de5129e14d979c62e7a90d82 Mon Sep 17 00:00:00 2001
+From: Chris Lamb <lamby@debian.org>
+Date: Mon, 21 Nov 2016 09:33:05 +0100
+Subject: [PATCH] If SOURCE_DATE_EPOCH is set, override timestamps with that
+ value.
+
+See https://reproducible-builds.org/specs/source-date-epoch/ for more
+information about this environment variable.
+
+Based on a patch by Alexander Couzens <lynxis@fe...> posted on
+https://sourceforge.net/p/squashfs/mailman/message/34673610/
+
+Signed-off-by: Chris Lamb <lamby@debian.org>
+---
+ squashfs-tools/mksquashfs.c | 38 ++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 37 insertions(+), 1 deletion(-)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index c2098bd..b49e956 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0;
+ /* inode lookup table */
+ squashfs_inode *inode_lookup_table = NULL;
+ 
++/* override filesystem creation time */
++time_t mkfs_fixed_time = -1;
++
+ /* in memory directory data */
+ #define I_COUNT_SIZE		128
+ #define DIR_ENTRIES		32
+@@ -5104,6 +5107,9 @@ int main(int argc, char *argv[])
+ 	int total_mem = get_default_phys_mem();
+ 	int progress = TRUE;
+ 	int force_progress = FALSE;
++	char *source_date_epoch, *endptr;
++	unsigned long long epoch;
++
+ 	struct file_buffer **fragment = NULL;
+ 
+ 	if(argc > 1 && strcmp(argv[1], "-version") == 0) {
+@@ -5641,6 +5647,36 @@ printOptions:
+ 		}
+ 	}
+ 
++	/* if SOURCE_DATE_EPOCH is set, use that timestamp for the mkfs time */
++	source_date_epoch = getenv("SOURCE_DATE_EPOCH");
++	if(source_date_epoch) {
++		errno = 0;
++		epoch = strtoull(source_date_epoch, &endptr, 10);
++		if((errno == ERANGE && (epoch == ULLONG_MAX || epoch == 0))
++				|| (errno != 0 && epoch == 0)) {
++			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
++				"strtoull: %s\n", strerror(errno));
++			EXIT_MKSQUASHFS();
++		}
++		if(endptr == source_date_epoch) {
++			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
++				"No digits were found: %s\n", endptr);
++			EXIT_MKSQUASHFS();
++		}
++		if(*endptr != '\0') {
++			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
++				"Trailing garbage: %s\n", endptr);
++			EXIT_MKSQUASHFS();
++		}
++		if(epoch > ULONG_MAX) {
++			ERROR("Environment variable $SOURCE_DATE_EPOCH: "
++				"value must be smaller than or equal to "
++				"%lu but was found to be: %llu \n", ULONG_MAX, epoch);
++			EXIT_MKSQUASHFS();
++		}
++		mkfs_fixed_time = (time_t)epoch;
++	}
++
+ 	/*
+ 	 * Some compressors may need the options to be checked for validity
+ 	 * once all the options have been processed
+@@ -5993,7 +6029,7 @@ printOptions:
+	sBlk.flags = SQUASHFS_MKFLAGS(noI, noD, noF, noX, no_fragments,
+		always_use_fragments, duplicate_checking, exportable,
+		no_xattrs, comp_opts);
+-	sBlk.mkfs_time = time(NULL);
++	sBlk.mkfs_time = mkfs_fixed_time != -1 ? mkfs_fixed_time : time(NULL);
+ 
+ 	disable_info();
+ 
+-- 
+2.17.0
+
diff --git a/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
new file mode 100644
index 000000000000..5002375887fb
--- /dev/null
+++ b/pkgs/tools/filesystems/squashfs/0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
@@ -0,0 +1,83 @@
+From 32a07d4156a281084c90a4b78affc8b0b32a26fc Mon Sep 17 00:00:00 2001
+From: intrigeri <intrigeri@boum.org>
+Date: Mon, 21 Nov 2016 11:41:28 +0000
+Subject: [PATCH] If SOURCE_DATE_EPOCH is set, also clamp content timestamps
+ with that value.
+
+Based on a patch by Alexander Couzens <lynxis@fe...> posted on
+https://sourceforge.net/p/squashfs/mailman/message/34673610/
+---
+ squashfs-tools/mksquashfs.c | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index b49e956..9f020bf 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -137,6 +137,9 @@ unsigned int cache_bytes = 0, cache_size = 0, inode_count = 0;
+ /* inode lookup table */
+ squashfs_inode *inode_lookup_table = NULL;
+ 
++/* clamp all timestamps to SOURCE_DATE_EPOCH */
++time_t content_clamp_time = -1;
++
+ /* override filesystem creation time */
+ time_t mkfs_fixed_time = -1;
+ 
+@@ -2246,6 +2249,8 @@ restat:
+ 			  pathname_reader(dir_ent), strerror(errno));
+ 		goto read_err;
+ 	}
++	if(content_clamp_time != -1 && buf2.st_mtime >= content_clamp_time)
++		buf2.st_mtime = content_clamp_time;
+ 
+ 	if(read_size != buf2.st_size) {
+ 		close(file);
+@@ -3101,7 +3106,7 @@ void dir_scan(squashfs_inode *inode, char *pathname,
+ 		buf.st_mode = S_IRWXU | S_IRWXG | S_IRWXO | S_IFDIR;
+ 		buf.st_uid = getuid();
+ 		buf.st_gid = getgid();
+-		buf.st_mtime = time(NULL);
++		buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL);
+ 		buf.st_dev = 0;
+ 		buf.st_ino = 0;
+ 		dir_ent->inode = lookup_inode2(&buf, PSEUDO_FILE_OTHER, 0);
+@@ -3127,6 +3115,8 @@ void dir_scan(squashfs_inode *inode, char *pathname,
+			/* source directory has disappeared? */
+			BAD_ERROR("Cannot stat source directory %s because %s\n",
+				pathname, strerror(errno));
++		if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time)
++			buf.st_mtime = content_clamp_time;
+ 		dir_ent->inode = lookup_inode(&buf);
+ 	}
+ 
+@@ -3365,6 +3372,8 @@ struct dir_info *dir_scan1(char *filename, char *subpath,
+ 			free_dir_entry(dir_ent);
+ 			continue;
+ 		}
++		if(content_clamp_time != -1 && buf.st_mtime >= content_clamp_time)
++			buf.st_mtime = content_clamp_time;
+ 
+ 		if((buf.st_mode & S_IFMT) != S_IFREG &&
+ 				(buf.st_mode & S_IFMT) != S_IFDIR &&
+@@ -3544,7 +3553,7 @@ void dir_scan2(struct dir_info *dir, struct pseudo *pseudo)
+		buf.st_gid = pseudo_ent->dev->gid;
+		buf.st_rdev = makedev(pseudo_ent->dev->major,
+			pseudo_ent->dev->minor);
+-		buf.st_mtime = time(NULL);
++		buf.st_mtime = content_clamp_time != -1 ? content_clamp_time : time(NULL);
+ 		buf.st_ino = pseudo_ino ++;
+ 
+ 		if(pseudo_ent->dev->type == 'd') {
+@@ -5674,7 +5683,7 @@ printOptions:
+ 				"%lu but was found to be: %llu \n", ULONG_MAX, epoch);
+ 			EXIT_MKSQUASHFS();
+ 		}
+-		mkfs_fixed_time = (time_t)epoch;
++		mkfs_fixed_time = content_clamp_time = (time_t)epoch;
+ 	}
+ 
+ 	/*
+-- 
+2.17.0
+
diff --git a/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
new file mode 100644
index 000000000000..4be4b96369a8
--- /dev/null
+++ b/pkgs/tools/filesystems/squashfs/0003-remove-frag-deflator-thread.patch
@@ -0,0 +1,220 @@
+From afc0c76a170bd17cbd29bbec6ae6d2227e398570 Mon Sep 17 00:00:00 2001
+From: Alexander Couzens <lynxis@fe80.eu>
+Date: Fri, 13 Jan 2017 22:00:37 +0100
+Subject: [PATCH] remove frag_deflator_thread
+
+frag_deflator_thread compress fragments.
+Replace the deflator_thread with a function and
+use the function instead of the to_frag queue.
+---
+ squashfs-tools/info.c       |  5 ---
+ squashfs-tools/mksquashfs.c | 76 +++++++++++++------------------------
+ squashfs-tools/mksquashfs.h |  2 +-
+ squashfs-tools/restore.c    | 15 +-------
+ 4 files changed, 30 insertions(+), 68 deletions(-)
+
+diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
+index 7968c77..028d578 100644
+--- a/squashfs-tools/info.c
++++ b/squashfs-tools/info.c
+@@ -96,11 +96,6 @@ void dump_state()
+ 	printf("compressed block queue (deflate thread(s) -> main thread)\n");
+ 	dump_seq_queue(to_main, 0);
+ 
+-	printf("uncompressed packed fragment queue (main thread -> fragment"
+-						" deflate thread(s))\n");
+-	dump_queue(to_frag);
+-
+-
+ 	printf("locked frag queue (compressed frags waiting while multi-block"
+ 						" file is written)\n");
+ 	dump_queue(locked_fragment);
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index cf48e40..cacf14c 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -270,10 +270,10 @@ unsigned int sid_count = 0, suid_count = 0, sguid_count = 0;
+ struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
+ struct cache *bwriter_buffer, *fwriter_buffer;
+ struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
+-	*to_frag, *locked_fragment, *to_process_frag;
++	*locked_fragment, *to_process_frag;
+ struct seq_queue *to_main;
+ pthread_t reader_thread, writer_thread, main_thread;
+-pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread;
++pthread_t *deflator_thread, *frag_thread;
+ pthread_t *restore_thread = NULL;
+ pthread_mutex_t	fragment_mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_mutex_t	pos_mutex = PTHREAD_MUTEX_INITIALIZER;
+@@ -323,7 +323,7 @@ struct dir_info *scan1_opendir(char *pathname, char *subpath, int depth);
+ void write_filesystem_tables(struct squashfs_super_block *sBlk, int nopad);
+ unsigned short get_checksum_mem(char *buff, int bytes);
+ void check_usable_phys_mem(int total_mem);
+-
++void frag_deflator(struct file_buffer *file_buffer);
+ 
+ void prep_exit()
+ {
+@@ -1540,7 +1540,7 @@ void write_fragment(struct file_buffer *fragment)
+ 	pthread_mutex_lock(&fragment_mutex);
+ 	fragment_table[fragment->block].unused = 0;
+ 	fragments_outstanding ++;
+-	queue_put(to_frag, fragment);
++	frag_deflator(fragment);
+ 	pthread_cleanup_pop(1);
+ }
+ 
+@@ -2412,51 +2412,34 @@ void *deflator(void *arg)
+ }
+ 
+ 
+-void *frag_deflator(void *arg)
++void frag_deflator(struct file_buffer *file_buffer)
+ {
+-	void *stream = NULL;
+-	int res;
+ 
+-	res = compressor_init(comp, &stream, block_size, 1);
+-	if(res)
+-		BAD_ERROR("frag_deflator:: compressor_init failed\n");
+-
+-	pthread_cleanup_push((void *) pthread_mutex_unlock, &fragment_mutex);
+-
+-	while(1) {
+-		int c_byte, compressed_size;
+-		struct file_buffer *file_buffer = queue_get(to_frag);
+-		struct file_buffer *write_buffer =
++	int c_byte, compressed_size;
++	struct file_buffer *write_buffer =
+ 			cache_get(fwriter_buffer, file_buffer->block);
+ 
+-		c_byte = mangle2(stream, write_buffer->data, file_buffer->data,
+-			file_buffer->size, block_size, noF, 1);
+-		compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
+-		write_buffer->size = compressed_size;
+-		pthread_mutex_lock(&fragment_mutex);
+-		if(fragments_locked == FALSE) {
+-			fragment_table[file_buffer->block].size = c_byte;
+-			fragment_table[file_buffer->block].start_block = bytes;
+-			write_buffer->block = bytes;
+-			bytes += compressed_size;
+-			fragments_outstanding --;
+-			queue_put(to_writer, write_buffer);
+-			pthread_mutex_unlock(&fragment_mutex);
+-			TRACE("Writing fragment %lld, uncompressed size %d, "
+-				"compressed size %d\n", file_buffer->block,
+-				file_buffer->size, compressed_size);
+-		} else {
+-				add_pending_fragment(write_buffer, c_byte,
+-					file_buffer->block);
+-				pthread_mutex_unlock(&fragment_mutex);
+-		}
+-		cache_block_put(file_buffer);
++	c_byte = mangle2(stream, write_buffer->data, file_buffer->data,
++			 file_buffer->size, block_size, noF, 1);
++	compressed_size = SQUASHFS_COMPRESSED_SIZE_BLOCK(c_byte);
++	write_buffer->size = compressed_size;
++	if(fragments_locked == FALSE) {
++		fragment_table[file_buffer->block].size = c_byte;
++		fragment_table[file_buffer->block].start_block = bytes;
++		write_buffer->block = bytes;
++		bytes += compressed_size;
++		fragments_outstanding --;
++		queue_put(to_writer, write_buffer);
++		TRACE("Writing fragment %lld, uncompressed size %d, "
++		      "compressed size %d\n", file_buffer->block,
++		      file_buffer->size, compressed_size);
++	} else {
++		add_pending_fragment(write_buffer, c_byte,
++				     file_buffer->block);
+ 	}
+-
+-	pthread_cleanup_pop(0);
++	cache_block_put(file_buffer);
+ }
+ 
+-
+ struct file_buffer *get_file_buffer()
+ {
+ 	struct file_buffer *file_buffer = seq_queue_get(to_main);
+@@ -4257,19 +4240,17 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
+ 			multiply_overflow(processors * 3, sizeof(pthread_t)))
+ 		BAD_ERROR("Processors too large\n");
+ 
+-	deflator_thread = malloc(processors * 3 * sizeof(pthread_t));
++	deflator_thread = malloc(processors * 2 * sizeof(pthread_t));
+ 	if(deflator_thread == NULL)
+ 		MEM_ERROR();
+ 
+-	frag_deflator_thread = &deflator_thread[processors];
+-	frag_thread = &frag_deflator_thread[processors];
++	frag_thread = &deflator_thread[processors];
+ 
+ 	to_reader = queue_init(1);
+ 	to_deflate = queue_init(reader_size);
+ 	to_process_frag = queue_init(reader_size);
+ 	to_writer = queue_init(bwriter_size + fwriter_size);
+ 	from_writer = queue_init(1);
+-	to_frag = queue_init(fragment_size);
+ 	locked_fragment = queue_init(fragment_size);
+ 	to_main = seq_queue_init();
+ 	reader_buffer = cache_init(block_size, reader_size, 0, 0);
+@@ -4285,9 +4266,6 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
+ 	for(i = 0; i < processors; i++) {
+ 		if(pthread_create(&deflator_thread[i], NULL, deflator, NULL))
+ 			BAD_ERROR("Failed to create thread\n");
+-		if(pthread_create(&frag_deflator_thread[i], NULL, frag_deflator,
+-				NULL) != 0)
+-			BAD_ERROR("Failed to create thread\n");
+ 		if(pthread_create(&frag_thread[i], NULL, frag_thrd,
+ 				(void *) destination_file) != 0)
+ 			BAD_ERROR("Failed to create thread\n");
+diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
+index 55708a3..dc5bde4 100644
+--- a/squashfs-tools/mksquashfs.h
++++ b/squashfs-tools/mksquashfs.h
+@@ -135,7 +135,7 @@ struct append_file {
+ extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
+ struct cache *bwriter_buffer, *fwriter_buffer;
+ extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
+-	*to_frag, *locked_fragment, *to_process_frag;
++	*locked_fragment, *to_process_frag;
+ extern struct append_file **file_mapping;
+ extern struct seq_queue *to_main;
+ extern pthread_mutex_t fragment_mutex, dup_mutex;
+diff --git a/squashfs-tools/restore.c b/squashfs-tools/restore.c
+index 5e336b3..a7aaf2e 100644
+--- a/squashfs-tools/restore.c
++++ b/squashfs-tools/restore.c
+@@ -47,8 +47,8 @@
+ #define TRUE 1
+ 
+ extern pthread_t reader_thread, writer_thread, main_thread;
+-extern pthread_t *deflator_thread, *frag_deflator_thread, *frag_thread;
+-extern struct queue *to_deflate, *to_writer, *to_frag, *to_process_frag;
++extern pthread_t *deflator_thread, *frag_thread;
++extern struct queue *to_deflate, *to_writer, *to_process_frag;
+ extern struct seq_queue *to_main;
+ extern void restorefs();
+ extern int processors;
+@@ -120,17 +120,6 @@ void *restore_thrd(void *arg)
+ 		pthread_cancel(main_thread);
+ 		pthread_join(main_thread, NULL);
+ 
+-		/* then flush the main thread to fragment deflator thread(s)
+-		 * queue.  The fragment deflator thread(s) will idle
+-		 */
+-		queue_flush(to_frag);
+-
+-		/* now kill the fragment deflator thread(s) */
+-		for(i = 0; i < processors; i++)
+-			pthread_cancel(frag_deflator_thread[i]);
+-		for(i = 0; i < processors; i++)
+-			pthread_join(frag_deflator_thread[i], NULL);
+-
+ 		/*
+ 		 * then flush the main thread/fragment deflator thread(s)
+ 		 * to writer thread queue.  The writer thread will idle
+-- 
+2.17.0
+
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index a2fc5bc3d40b..08951113b3b7 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -15,6 +15,15 @@ stdenv.mkDerivation rec {
     rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d";
   };
 
+  # These patches ensures that mksquashfs output is reproducible.
+  # See also https://reproducible-builds.org/docs/system-images/
+  # and https://github.com/NixOS/nixpkgs/issues/40144.
+  patches = [
+    ./0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
+    ./0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
+    ./0003-remove-frag-deflator-thread.patch
+  ];
+
   buildInputs = [ zlib xz ]
     ++ stdenv.lib.optional lz4Support lz4;
 

From 61a87491dc226267f7a979ea0f7ab81386c453d9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 May 2018 13:08:11 +0300
Subject: [PATCH 1352/3370] pacparser: init at 1.3.7

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

diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix
new file mode 100644
index 000000000000..54b3cf8fd81e
--- /dev/null
+++ b/pkgs/tools/networking/pacparser/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "pacparser-${version}";
+  version = "1.3.7";
+
+  src = fetchurl {
+    url = "https://github.com/manugarg/pacparser/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0jfjm8lqyhdy9ny8a8icyd4rhclhfn608cr1i15jml82q8pyqj7b";
+  };
+
+  makeFlags = [ "NO_INTERNET=1" ];
+
+  preConfigure = ''
+    export makeFlags="$makeFlags PREFIX=$out"
+    patchShebangs tests/runtests.sh
+    cd src
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A library to parse proxy auto-config (PAC) files";
+    homepage = http://pacparser.manugarg.com/;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ab3665873bb..d6759098dfaa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -657,6 +657,8 @@ with pkgs;
 
   lastpass-cli = callPackage ../tools/security/lastpass-cli { };
 
+  pacparser = callPackage ../tools/networking/pacparser { };
+
   pass = callPackage ../tools/security/pass { };
 
   passExtensions = recurseIntoAttrs pass.extensions;

From a08645e9bea56a19df944763347269cf18a1b8ab Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 3 Apr 2018 10:43:15 +0300
Subject: [PATCH 1353/3370] nginx module: add upstream extraConfig

---
 nixos/modules/services/web-servers/nginx/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 815c3147e647..0aa780bf6da1 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -38,6 +38,7 @@ let
       ${toString (flip mapAttrsToList upstream.servers (name: server: ''
         server ${name} ${optionalString server.backup "backup"};
       ''))}
+      ${upstream.extraConfig}
     }
   ''));
 
@@ -492,6 +493,13 @@ in
               '';
               default = {};
             };
+            extraConfig = mkOption {
+              type = types.lines;
+              default = "";
+              description = ''
+                These lines go to the end of the upstream verbatim.
+              '';
+            };
           };
         });
         description = ''

From 3510b983c41196fce90729289c8c300ada1ccaea Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 8 May 2018 10:01:48 -0400
Subject: [PATCH 1354/3370] linux: 4.17-rc3 -> 4.17-rc4

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index d02ab4157191..922256703307 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc3";
-  modDirVersion = "4.17.0-rc3";
+  version = "4.17-rc4";
+  modDirVersion = "4.17.0-rc4";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1divgjzmpl98b5j416vhkq53li0y9v5vvdwbgwpr2xznspzbkygq";
+    sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 7936474efcef8fae93e96fe66d36b5cb363d4857 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Tue, 8 May 2018 10:49:49 -0400
Subject: [PATCH 1355/3370] gnucash: restore version 2.4

---
 pkgs/applications/office/gnucash/2.4.nix | 85 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  8 +++
 2 files changed, 93 insertions(+)
 create mode 100644 pkgs/applications/office/gnucash/2.4.nix

diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix
new file mode 100644
index 000000000000..252c6d878d0c
--- /dev/null
+++ b/pkgs/applications/office/gnucash/2.4.nix
@@ -0,0 +1,85 @@
+{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
+, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
+, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
+, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar
+}:
+
+/* If you experience GConf errors when running GnuCash on NixOS, see
+ * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications
+ * for a possible solution.
+ */
+
+stdenv.mkDerivation rec {
+  name = "gnucash-2.4.15";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
+    sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [
+    libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
+    libgnomeprint goffice enchant gettext intltool perl guile slibGuile
+    swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
+    perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
+  ];
+  propagatedUserEnvPkgs = [ gconf ];
+
+  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
+
+  postInstall = ''
+    # Auto-updaters don't make sense in Nix.
+    rm $out/bin/gnc-fq-update
+
+    sed -i $out/bin/update-gnucash-gconf \
+       -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
+
+    for prog in $(echo "$out/bin/"*)
+    do
+      # Don't wrap the gnc-fq-* scripts, since gnucash calls them as
+      # "perl <script>', i.e. they must be Perl scripts.
+      if [[ $prog =~ gnc-fq ]]; then continue; fi
+      wrapProgram "$prog"                                               \
+        --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH"                \
+        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"                 \
+        --prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0"   \
+        --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0"  \
+        --prefix PERL5LIB ":" "$PERL5LIB"                               \
+        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
+        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
+    done
+
+    rm $out/share/icons/hicolor/icon-theme.cache
+  '';
+
+  # The following settings fix failures in the test suite. It's not required otherwise.
+  NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
+  preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
+
+  doCheck = false;      # https://github.com/NixOS/nixpkgs/issues/11084
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Personal and small-business financial-accounting application";
+
+    longDescription = ''
+      GnuCash is personal and small-business financial-accounting software,
+      freely licensed under the GNU GPL and available for GNU/Linux, BSD,
+      Solaris, macOS and Microsoft Windows.
+
+      Designed to be easy to use, yet powerful and flexible, GnuCash allows
+      you to track bank accounts, stocks, income and expenses.  As quick and
+      intuitive to use as a checkbook register, it is based on professional
+      accounting principles to ensure balanced books and accurate reports.
+    '';
+
+    license = stdenv.lib.licenses.gpl2Plus;
+
+    homepage = http://www.gnucash.org/;
+
+    maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfaa..028106713c16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16056,6 +16056,14 @@ with pkgs;
     inherit (gnome3) dconf;
   };
 
+  gnucash24 = callPackage ../applications/office/gnucash/2.4.nix {
+    inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl;
+    gconf = gnome2.GConf;
+    guile = guile_1_8;
+    slibGuile = slibGuile.override { scheme = guile_1_8; };
+    goffice = goffice_0_8;
+  };
+
   gnucash26 = lowPrio (callPackage ../applications/office/gnucash/2.6.nix {
     inherit (gnome2) libgnomecanvas;
     inherit (gnome3) dconf;

From 277ca33bee0a2b66ef21f4ed8e14414605ab42be Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2018 11:27:46 +0200
Subject: [PATCH 1356/3370] LTS Haskell 11.8

---
 .../configuration-hackage2nix.yaml            | 63 +++++++++----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 412c3bfd57ef..b3f8efa3963e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.7
+  # LTS Haskell 11.8
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -94,7 +94,7 @@ default-package-overrides:
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
   - ansigraph ==0.3.0.5
-  - ansi-terminal ==0.8.0.2
+  - ansi-terminal ==0.8.0.3
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - apecs ==0.2.4.7
@@ -158,7 +158,7 @@ default-package-overrides:
   - bbdb ==0.8
   - bcrypt ==0.0.11
   - beam-core ==0.7.2.1
-  - beam-migrate ==0.3.1.0
+  - beam-migrate ==0.3.2.0
   - beam-sqlite ==0.3.2.0
   - bench ==1.0.9
   - benchpress ==0.2.2.10
@@ -331,7 +331,7 @@ default-package-overrides:
   - codec ==0.2.1
   - code-page ==0.1.3
   - codo-notation ==0.5.2
-  - colorful-monoids ==0.2.1.0
+  - colorful-monoids ==0.2.1.1
   - colorize-haskell ==1.0.1
   - colour ==2.3.4
   - colour-accelerate ==0.2.0.0
@@ -488,7 +488,7 @@ default-package-overrides:
   - dice ==0.1
   - dictionaries ==0.2.0.4
   - Diff ==0.3.4
-  - diff3 ==0.3.0
+  - diff3 ==0.3.1
   - digest ==0.0.1.2
   - digits ==0.3.1
   - dimensional ==1.1
@@ -600,10 +600,10 @@ default-package-overrides:
   - exceptional ==0.3.0.0
   - exception-mtl ==0.4.0.1
   - exceptions ==0.8.3
-  - exception-transformers ==0.4.0.6
+  - exception-transformers ==0.4.0.7
   - executable-hash ==0.2.0.4
   - executable-path ==0.0.3.1
-  - exhaustive ==1.1.5
+  - exhaustive ==1.1.6
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9.2
   - exp-pairs ==0.1.6.0
@@ -798,7 +798,7 @@ default-package-overrides:
   - hackage-db ==2.0
   - hackage-security ==0.5.3.0
   - haddock-library ==1.4.5
-  - hailgun ==0.4.1.6
+  - hailgun ==0.4.1.7
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.12.2.0
   - half ==0.2.2.3
@@ -830,7 +830,7 @@ default-package-overrides:
   - haskell-spacegoo ==0.2.0.1
   - haskell-src ==1.0.3.0
   - haskell-src-exts ==1.20.2
-  - haskell-src-exts-util ==0.2.2
+  - haskell-src-exts-util ==0.2.3
   - haskell-src-meta ==0.8.0.2
   - haskell-tools-ast ==1.0.1.1
   - haskell-tools-backend-ghc ==1.0.1.1
@@ -852,7 +852,7 @@ default-package-overrides:
   - haxr ==3000.11.2
   - hbeanstalk ==0.2.4
   - Hclip ==3.0.0.4
-  - HCodecs ==0.5
+  - HCodecs ==0.5.1
   - hdaemonize ==0.5.5
   - HDBC ==2.4.0.2
   - HDBC-mysql ==0.7.1.0
@@ -931,8 +931,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - HSet ==0.0.1
   - hset ==2.2.0
+  - HSet ==0.0.1
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -991,7 +991,7 @@ default-package-overrides:
   - http-link-header ==1.0.3
   - http-media ==0.7.1.2
   - http-reverse-proxy ==0.5.0.1
-  - http-streams ==0.8.5.5
+  - http-streams ==0.8.6.1
   - http-types ==0.12.1
   - human-readable-duration ==0.2.0.3
   - HUnit ==1.6.0.0
@@ -1054,7 +1054,7 @@ default-package-overrides:
   - inflections ==0.4.0.1
   - influxdb ==1.3.0.1
   - ini ==0.3.6
-  - inline-c ==0.6.0.5
+  - inline-c ==0.6.0.6
   - inline-c-cpp ==0.2.1.0
   - inline-java ==0.8.2
   - inline-r ==0.9.1
@@ -1083,7 +1083,7 @@ default-package-overrides:
   - ip ==1.1.2
   - ip6addr ==0.5.3
   - iproute ==1.7.4
-  - IPv6Addr ==1.0.2
+  - IPv6Addr ==1.0.3
   - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
@@ -1183,7 +1183,7 @@ default-package-overrides:
   - libinfluxdb ==0.0.4
   - libmpd ==0.9.0.8
   - liboath-hs ==0.0.1.0
-  - libsystemd-journal ==1.4.2
+  - libsystemd-journal ==1.4.3
   - libxml-sax ==0.7.5
   - LibZip ==1.0.1
   - licensor ==0.2.2
@@ -1212,7 +1212,7 @@ default-package-overrides:
   - log-elasticsearch ==0.9.1.0
   - logfloat ==0.13.3.3
   - logger-thread ==0.1.0.2
-  - logging-effect ==1.2.5
+  - logging-effect ==1.2.6
   - logging-effect-extra ==1.2.2
   - logging-effect-extra-file ==1.1.2
   - logging-effect-extra-handler ==1.1.4
@@ -1387,13 +1387,13 @@ default-package-overrides:
   - network-anonymous-i2p ==0.10.0
   - network-anonymous-tor ==0.11.0
   - network-attoparsec ==0.12.2
-  - network-carbon ==1.0.11
+  - network-carbon ==1.0.12
   - network-conduit-tls ==1.3.0
   - network-house ==0.1.0.2
   - network-info ==0.2.0.10
   - network-ip ==0.3.0.2
   - network-multicast ==0.2.0
-  - Network-NineP ==0.4.2
+  - Network-NineP ==0.4.3
   - network-simple ==0.4.0.5
   - network-transport ==0.5.2
   - network-transport-composed ==0.2.1
@@ -1537,7 +1537,7 @@ default-package-overrides:
   - pipes-extras ==1.0.14
   - pipes-fastx ==0.3.0.0
   - pipes-fluid ==0.6.0.0
-  - pipes-group ==1.0.9
+  - pipes-group ==1.0.10
   - pipes-misc ==0.4.0.1
   - pipes-mongodb ==0.1.0.0
   - pipes-network ==0.6.4.1
@@ -1611,19 +1611,19 @@ default-package-overrides:
   - prompt ==0.1.1.2
   - protobuf ==0.2.1.1
   - protobuf-simple ==0.1.0.5
-  - protocol-buffers ==2.4.8
-  - protocol-buffers-descriptor ==2.4.8
+  - protocol-buffers ==2.4.9
+  - protocol-buffers-descriptor ==2.4.9
   - protocol-radius ==0.0.1.0
   - protocol-radius-test ==0.0.1.0
   - proto-lens ==0.2.2.0
   - proto-lens-arbitrary ==0.1.1.1
   - proto-lens-descriptors ==0.2.2.0
-  - proto-lens-optparse ==0.1.1.0
+  - proto-lens-optparse ==0.1.1.1
   - protolude ==0.2.2
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
-  - psqueues ==0.2.6.0
+  - psqueues ==0.2.7.0
   - pthread ==0.2.0
   - publicsuffix ==0.20171229
   - pure-io ==0.2.1
@@ -1705,7 +1705,7 @@ default-package-overrides:
   - regex-tdfa ==1.2.3
   - regex-tdfa-text ==1.0.0.3
   - reinterpret-cast ==0.1.0
-  - relational-query ==0.11.0.0
+  - relational-query ==0.11.1.0
   - relational-query-HDBC ==0.6.6.1
   - relational-record ==0.2.1.2
   - relational-schemas ==0.1.6.1
@@ -1754,13 +1754,13 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
   - schematic ==0.4.2.0
-  - scientific ==0.3.5.3
+  - scientific ==0.3.6.0
   - scotty ==0.11.1
   - scrypt ==0.5.0
   - sdl2 ==2.4.0.1
@@ -1842,7 +1842,7 @@ default-package-overrides:
   - simple-session ==0.10.1.1
   - simple-templates ==0.8.0.1
   - singleton-bool ==0.1.4
-  - singleton-nats ==0.4.0.4
+  - singleton-nats ==0.4.1
   - singletons ==2.3.1
   - siphash ==1.0.3
   - skein ==1.0.9.4
@@ -1989,7 +1989,7 @@ default-package-overrides:
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.9.2
-  - tasty-rerun ==1.1.10
+  - tasty-rerun ==1.1.11
   - tasty-silver ==3.1.11
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.3
@@ -2262,12 +2262,11 @@ default-package-overrides:
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.2.5
-  - weigh ==0.0.7
+  - weigh ==0.0.11
   - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.2.0
   - wild-bind-x11 ==0.2.0.3
-  - Win32 ==2.5.4.1
   - Win32-notify ==0.3.0.3
   - wire-streams ==0.1.1.0
   - withdependencies ==0.2.4.2
@@ -2296,7 +2295,7 @@ default-package-overrides:
   - writer-cps-morph ==0.1.0.2
   - writer-cps-mtl ==0.1.1.4
   - writer-cps-transformers ==0.1.1.3
-  - wuss ==1.1.8
+  - wuss ==1.1.9
   - X11 ==1.8
   - X11-xft ==0.3.1
   - x11-xim ==0.0.9.0
@@ -2358,7 +2357,7 @@ default-package-overrides:
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.0
   - yesod-table ==2.0.3
-  - yesod-test ==1.6.3
+  - yesod-test ==1.6.4
   - yesod-websockets ==0.3.0
   - yes-precure5-command ==5.5.3
   - yi-core ==0.17.1

From 26e961c1fb194678b7438152081cb9eb4faa6e34 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2018 02:31:25 +0200
Subject: [PATCH 1357/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/7b40a148a0a32f0150b0a72f3f916af9723601b7.
---
 .../haskell-modules/hackage-packages.nix      | 919 ++++++------------
 1 file changed, 307 insertions(+), 612 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 197f2d7cb750..3c6a7949df6c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7339,21 +7339,6 @@ self: {
      }) {};
 
   "HCodecs" = callPackage
-    ({ mkDerivation, array, base, bytestring, QuickCheck, random }:
-     mkDerivation {
-       pname = "HCodecs";
-       version = "0.5";
-       sha256 = "0mhp1alx0p9lzq3vm0k802f8ndm2386sshprn9zb8xq8bsd11gxi";
-       libraryHaskellDepends = [
-         array base bytestring QuickCheck random
-       ];
-       testHaskellDepends = [ array base bytestring QuickCheck random ];
-       homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
-       description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HCodecs_0_5_1" = callPackage
     ({ mkDerivation, array, base, bytestring, QuickCheck, random
      , semigroups
      }:
@@ -7370,7 +7355,6 @@ self: {
        homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HDBC" = callPackage
@@ -10448,25 +10432,6 @@ self: {
      }) {};
 
   "IPv6Addr" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
-     , network-info, random, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "IPv6Addr";
-       version = "1.0.2";
-       sha256 = "09gb38m1fw0a1x8saldgsd5x58ycqirk8h6z8dqzpcd7vz23vayn";
-       libraryHaskellDepends = [
-         aeson attoparsec base iproute network network-info random text
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit text
-       ];
-       homepage = "https://github.com/MichelBoucey/IPv6Addr";
-       description = "Library to deal with IPv6 address text representations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "IPv6Addr_1_0_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
      , network-info, random, test-framework, test-framework-hunit, text
      }:
@@ -10483,7 +10448,6 @@ self: {
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IPv6DB" = callPackage
@@ -13338,26 +13302,6 @@ self: {
      }) {inherit (pkgs) net_snmp;};
 
   "Network-NineP" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, convertible
-     , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl
-     , network, NineP, regex-posix, stateref, transformers
-     }:
-     mkDerivation {
-       pname = "Network-NineP";
-       version = "0.4.2";
-       sha256 = "136pqyxpjyml0hfblpj6hmhsy2i8r796shcnl0rwljmvw1mhcg6d";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers convertible exceptions hslogger
-         monad-loops monad-peel mstate mtl network NineP regex-posix
-         stateref transformers
-       ];
-       description = "High-level abstraction over 9P protocol";
-       license = "unknown";
-     }) {};
-
-  "Network-NineP_0_4_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, convertible
      , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl
      , network, NineP, regex-posix, stateref, transformers
@@ -13375,7 +13319,6 @@ self: {
        ];
        description = "High-level abstraction over 9P protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NewBinary" = callPackage
@@ -19352,26 +19295,6 @@ self: {
      }) {};
 
   "Win32" = callPackage
-    ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32
-     , msimg32, shell32, shfolder, shlwapi, user32, winmm
-     }:
-     mkDerivation {
-       pname = "Win32";
-       version = "2.5.4.1";
-       sha256 = "0r1xzm0w3kg8rqq24j17405ic6yix53r9sq9wpl4zl2sajg3w66c";
-       libraryHaskellDepends = [ base bytestring filepath ];
-       librarySystemDepends = [
-         advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm
-       ];
-       homepage = "https://github.com/haskell/win32";
-       description = "A binding to part of the Win32 library";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = stdenv.lib.platforms.none;
-     }) {advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null; 
-         shell32 = null; shfolder = null; shlwapi = null; user32 = null; 
-         winmm = null;};
-
-  "Win32_2_8_0_0" = callPackage
     ({ mkDerivation }:
      mkDerivation {
        pname = "Win32";
@@ -23832,8 +23755,8 @@ self: {
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.2.0";
-       sha256 = "1hhmzlq831618j36yq8kjh4sagmhg3w1ghr53lip06avis2c0gl7";
+       version = "0.2.4.0";
+       sha256 = "1brpqs6xxi7vlpa7230n7910j2zq3w79kw6hfs2xi07kaz0f2lyd";
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
@@ -27277,8 +27200,8 @@ self: {
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.8.0.2";
-       sha256 = "1yph18lklk9hrj1m5gjwygnqbmpg333zyf4bmmm1zvlzflrwj6l9";
+       version = "0.8.0.3";
+       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
@@ -27287,12 +27210,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ansi-terminal_0_8_0_3" = callPackage
+  "ansi-terminal_0_8_0_4" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
-       version = "0.8.0.3";
-       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
+       version = "0.8.0.4";
+       sha256 = "0428gq8m3fdnb7ldcsyk97qcch76hcxbgh2666p6f76fs2qbhg7b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
@@ -33828,14 +33751,14 @@ self: {
      , gitrev, hspec, http-conduit, HUnit, lifted-base, listsafe, memory
      , monad-control, monad-logger, monad-loops, mtl, network-uri
      , ostree, parsec, parsec-numbers, persistent, persistent-sqlite
-     , persistent-template, process, regex-pcre, resourcet, split, tar
-     , tar-conduit, temporary, text, time, unix, unordered-containers
-     , xml-conduit
+     , persistent-template, regex-pcre, resourcet, split
+     , string-conversions, tar, tar-conduit, temporary, text, time
+     , typed-process, unix, unordered-containers, xml-conduit
      }:
      mkDerivation {
        pname = "bdcs";
-       version = "0.5.0";
-       sha256 = "1anb8nz25a0cvfn6ksn01y6sbjg3cn9pd8lwg8hpjza11hm33kcg";
+       version = "0.6.0";
+       sha256 = "0irxrabxrdf20mc7b0kknnch0fhxgafh2mdrrksj78jx2dbmn85h";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -33846,15 +33769,15 @@ self: {
          directory esqueleto exceptions filepath gi-gio gi-glib gi-ostree
          gitrev http-conduit lifted-base listsafe memory monad-control
          monad-logger mtl network-uri parsec parsec-numbers persistent
-         persistent-sqlite persistent-template process regex-pcre resourcet
-         split tar tar-conduit temporary text time unix unordered-containers
-         xml-conduit
+         persistent-sqlite persistent-template regex-pcre resourcet split
+         string-conversions tar tar-conduit temporary text time
+         typed-process unix unordered-containers xml-conduit
        ];
        libraryPkgconfigDepends = [ ostree ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring cond conduit content-store
-         directory filepath monad-logger monad-loops mtl network-uri
-         persistent-sqlite process regex-pcre text time
+         directory filepath lifted-base monad-logger monad-loops mtl
+         network-uri persistent-sqlite regex-pcre text time typed-process
        ];
        testHaskellDepends = [
          aeson base bytestring codec-rpm cond conduit conduit-combinators
@@ -33957,28 +33880,6 @@ self: {
      }) {};
 
   "beam-migrate" = callPackage
-    ({ mkDerivation, aeson, base, beam-core, bytestring, containers
-     , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable
-     , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text
-     , time, unordered-containers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "beam-migrate";
-       version = "0.3.1.0";
-       sha256 = "03chg3xbsvpcq4m4vvmr1jwslaj9ik8v3x8fiw8b5r6x401pf8za";
-       libraryHaskellDepends = [
-         aeson base beam-core bytestring containers deepseq dependent-map
-         dependent-sum free ghc-prim hashable haskell-src-exts mtl parallel
-         pqueue pretty scientific text time unordered-containers uuid-types
-         vector
-       ];
-       homepage = "https://travis.athougies.net/projects/beam.html";
-       description = "SQL DDL support and migrations support library for Beam";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "beam-migrate_0_3_2_0" = callPackage
     ({ mkDerivation, aeson, base, beam-core, bytestring, containers
      , deepseq, dependent-map, dependent-sum, free, ghc-prim, hashable
      , haskell-src-exts, mtl, parallel, pqueue, pretty, scientific, text
@@ -35852,8 +35753,8 @@ self: {
     ({ mkDerivation, base, bindings-DSL, blas, liblapack }:
      mkDerivation {
        pname = "bindings-levmar";
-       version = "1.1.0.4";
-       sha256 = "1dxr9lbgf08a143d4vm78d1iibafzjx6zdlvpdxfri1v523z3sgd";
+       version = "1.1.0.5";
+       sha256 = "1pbxwzslg2b1nn66nk8w5z1ryfz205m94ry9vidzyalpz2wnr074";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ blas liblapack ];
        homepage = "https://github.com/basvandijk/bindings-levmar";
@@ -42480,8 +42381,8 @@ self: {
        pname = "cacophony";
        version = "0.10.0";
        sha256 = "1hjxzpbnp5qzbjl9m0hyvlr7yflfgxr5kqbviamhpgc0lj5igizv";
-       revision = "1";
-       editedCabalFile = "0j73lknyxlj5zs36sjm3z1z4azqi2zzm5aas6c635k6bqpn4wac6";
+       revision = "2";
+       editedCabalFile = "0w7nq4c5i89vmslxhvzw8299gig2wrr0ayddqjk5dxghmmly3hdw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45905,17 +45806,17 @@ self: {
 
   "chronos" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
-     , hashable, HUnit, primitive, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, torsor
-     , vector
+     , hashable, HUnit, primitive, QuickCheck, semigroups
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, torsor, vector
      }:
      mkDerivation {
        pname = "chronos";
-       version = "1.0.1";
-       sha256 = "1vbjjnsp61km96adlk6ywhhfakmcac680aliavbh18rc00vfi3cj";
+       version = "1.0.3";
+       sha256 = "0xaw13qq3ifjk4x33q5vvbv2k1ydg673s0hsxrdi5kwl2rw0zi70";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring clock hashable primitive text
-         torsor vector
+         aeson attoparsec base bytestring clock hashable primitive
+         semigroups text torsor vector
        ];
        testHaskellDepends = [
          attoparsec base bytestring HUnit QuickCheck test-framework
@@ -49116,19 +49017,6 @@ self: {
      }) {};
 
   "colorful-monoids" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "colorful-monoids";
-       version = "0.2.1.0";
-       sha256 = "0ck5n318al2w0kb00n3vjd17db8bj3laws09iw81kg4y474kcvj2";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/minad/colorful-monoids#readme";
-       description = "Styled console text output using ANSI escape sequences";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "colorful-monoids_0_2_1_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "colorful-monoids";
@@ -49139,7 +49027,6 @@ self: {
        homepage = "https://github.com/minad/colorful-monoids#readme";
        description = "Styled console text output using ANSI escape sequences";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colorize-haskell" = callPackage
@@ -50400,8 +50287,8 @@ self: {
     ({ mkDerivation, base, doctest, QuickCheck }:
      mkDerivation {
        pname = "composition-tree";
-       version = "0.2.0.3";
-       sha256 = "1k2mnb2cy42k0fk2q6lh6qzqm5jnmbjxx1k9g9frlyjmxf8k2920";
+       version = "0.2.0.4";
+       sha256 = "0n707qc1xx96wpq4vl1fs47jkm9vbxp8ff3hi7bj1cnd77yzhf01";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
        homepage = "https://github.com/liamoc/composition-tree";
@@ -61735,8 +61622,8 @@ self: {
      }:
      mkDerivation {
        pname = "df1";
-       version = "0.1";
-       sha256 = "0crcwg63d1m47qj44774ydk9v5sssg08vwbjgh1lg8qvqss7qk8l";
+       version = "0.1.1";
+       sha256 = "1qrgf823bf33g6vvilg9q4v1avdwh0iprf26qypzjsbzykbhj91n";
        libraryHaskellDepends = [
          attoparsec base bytestring containers text time
        ];
@@ -62112,8 +61999,8 @@ self: {
      }:
      mkDerivation {
        pname = "di-df1";
-       version = "1.0";
-       sha256 = "07lz6vb4dxa6j3xxlwxv23gps5xv4rimz571h2n95hhldx8n9jnp";
+       version = "1.0.1";
+       sha256 = "1l83xl2ljql615h33h2l3ckqdx8r0wqjfpygd4xhx975lm3gllck";
        libraryHaskellDepends = [
          base df1 di-core di-handle di-monad stm
        ];
@@ -62146,8 +62033,8 @@ self: {
      }:
      mkDerivation {
        pname = "di-monad";
-       version = "1.0";
-       sha256 = "1kb2dx4whbl0lp0yb5y7m66ma0qywprzy5zs3msxiqfdbc3ghqvx";
+       version = "1.0.2";
+       sha256 = "1s2f2rvchfc6ha8w75rcz5w9706vf9zmxgrimav211vph3hpjkdq";
        libraryHaskellDepends = [
          base containers di-core exceptions mtl pipes stm transformers
        ];
@@ -62945,23 +62832,6 @@ self: {
      }) {};
 
   "diff3" = callPackage
-    ({ mkDerivation, base, Diff, QuickCheck, test-framework
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "diff3";
-       version = "0.3.0";
-       sha256 = "09gamh675nqw8ac6whn05i716k089p7zbyisglifgvvhf1gpmicd";
-       libraryHaskellDepends = [ base Diff ];
-       testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
-       ];
-       homepage = "http://github.com/ocharles/diff3.git";
-       description = "Perform a 3-way difference of documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "diff3_0_3_1" = callPackage
     ({ mkDerivation, base, Diff, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
@@ -62976,7 +62846,6 @@ self: {
        homepage = "http://github.com/ocharles/diff3.git";
        description = "Perform a 3-way difference of documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diffarray" = callPackage
@@ -67276,8 +67145,8 @@ self: {
      }:
      mkDerivation {
        pname = "dynamodb-simple";
-       version = "0.5.0.0";
-       sha256 = "12jkl425nzgds8zszhk41ns4mg3rn9mjfmd853b88x6dn9wk95g7";
+       version = "0.6.0.0";
+       sha256 = "0dshi4binsfjrlw7sl1jxa09a1s4qkp3g48x6hchaipk6b1nx960";
        libraryHaskellDepends = [
          aeson amazonka amazonka-core amazonka-dynamodb base bytestring
          conduit containers double-conversion exceptions generics-sop
@@ -71870,26 +71739,6 @@ self: {
      }) {};
 
   "exception-transformers" = callPackage
-    ({ mkDerivation, base, HUnit, stm, test-framework
-     , test-framework-hunit, transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "exception-transformers";
-       version = "0.4.0.6";
-       sha256 = "0abxwkq28wasy06njhaibf8cki9hifk5rjck6r3izbnswjcdn65m";
-       libraryHaskellDepends = [
-         base stm transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base HUnit test-framework test-framework-hunit transformers
-         transformers-compat
-       ];
-       description = "Type classes and monads for unchecked extensible exceptions";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "exception-transformers_0_4_0_7" = callPackage
     ({ mkDerivation, base, HUnit, stm, test-framework
      , test-framework-hunit, transformers, transformers-compat
      }:
@@ -72067,21 +71916,6 @@ self: {
      }) {};
 
   "exhaustive" = callPackage
-    ({ mkDerivation, base, generics-sop, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "exhaustive";
-       version = "1.1.5";
-       sha256 = "1qkv6ibdp0a7hi57dhxy3yfbwbs1asmjvqs5nh1p34awz7npvrh9";
-       libraryHaskellDepends = [
-         base generics-sop template-haskell transformers
-       ];
-       homepage = "http://github.com/ocharles/exhaustive";
-       description = "Compile time checks that a computation considers producing data through all possible constructors";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "exhaustive_1_1_6" = callPackage
     ({ mkDerivation, base, generics-sop, template-haskell, transformers
      }:
      mkDerivation {
@@ -72094,7 +71928,6 @@ self: {
        homepage = "http://github.com/ocharles/exhaustive";
        description = "Compile time checks that a computation considers producing data through all possible constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exherbo-cabal" = callPackage
@@ -72375,17 +72208,22 @@ self: {
      }) {};
 
   "expiring-containers" = callPackage
-    ({ mkDerivation, base, containers, hashable, int-multimap, time
+    ({ mkDerivation, base, containers, hashable, int-multimap
+     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, time
      , timestamp, unordered-containers
      }:
      mkDerivation {
        pname = "expiring-containers";
-       version = "0.1.1.1";
-       sha256 = "0v35m5bl6y5l4m8gfs6wrcs0pqmgk52aaa261jg92jkvhji21ki5";
+       version = "0.1.2";
+       sha256 = "10j5hqlp7bmiywa79xcgp1a87x6a9kxvzdg061innyh08344k0sv";
        libraryHaskellDepends = [
          base containers hashable int-multimap time timestamp
          unordered-containers
        ];
+       testHaskellDepends = [
+         base containers hashable int-multimap quickcheck-instances tasty
+         tasty-hunit tasty-quickcheck time timestamp unordered-containers
+       ];
        homepage = "https://github.com/metrix-ai/expiring-containers";
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
@@ -72732,15 +72570,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "extensible-effects_2_6_1_1" = callPackage
+  "extensible-effects_2_6_2_0" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, mtl
      , QuickCheck, silently, test-framework, test-framework-hunit
      , test-framework-quickcheck2, test-framework-th, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "2.6.1.1";
-       sha256 = "0rx1m6pw2prgfr0wsgnqf1hqsrwq43clpahk79z972bdmh9v3352";
+       version = "2.6.2.0";
+       sha256 = "1gc7packzrh405sz2v4h088knn192kq0hq6zvjab6xqxmrl6bm6f";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base HUnit monad-control QuickCheck silently test-framework
@@ -76180,14 +76018,14 @@ self: {
      }) {};
 
   "flay" = callPackage
-    ({ mkDerivation, base, constraints, ghc-prim, tasty
-     , tasty-quickcheck
+    ({ mkDerivation, base, constraints, tasty, tasty-quickcheck
+     , transformers
      }:
      mkDerivation {
        pname = "flay";
-       version = "0.2";
-       sha256 = "1sdwcjjsgq0ba84474pdnvppg66vmqsqn6frb97ricdnyy78lg11";
-       libraryHaskellDepends = [ base constraints ghc-prim ];
+       version = "0.3";
+       sha256 = "1m5580xbmk9113ksx7b5z27b03b9w21ayn9y13hv7dk5khlividx";
+       libraryHaskellDepends = [ base constraints transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        homepage = "https://github.com/k0001/flay";
        description = "Work generically on your datatype without knowing its shape nor its contents";
@@ -85627,6 +85465,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-release_1_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.2.0";
+       sha256 = "0rfg0l5f0g1qdpvj5xsynxkkwgdaxnsphrif02fk48khhad0i4p9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -89152,8 +89015,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-translate";
-       version = "0.4.1";
-       sha256 = "0xpi3qss2cnv0dxgiwffzk6isgfgb95hfd5j62vc5jkjgkyzfqxn";
+       version = "0.5";
+       sha256 = "09mkhbdfcyw2hiqlijnv0lwlk9rka64hqmx8jhrdyksgsz6hc6gl";
        libraryHaskellDepends = [
          aeson base bytestring http-api-data http-client servant
          servant-client text transformers
@@ -93966,25 +93829,6 @@ self: {
      }) {};
 
   "hailgun" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, email-validate
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , tagsoup, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "hailgun";
-       version = "0.4.1.6";
-       sha256 = "0hkz666vd02iknkxv0l60l3ara0yaszc6583sry0shk2cd74lv06";
-       libraryHaskellDepends = [
-         aeson base bytestring email-validate exceptions filepath
-         http-client http-client-tls http-types tagsoup text time
-         transformers
-       ];
-       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
-       description = "Mailgun REST api interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hailgun_0_4_1_7" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
      , tagsoup, text, time, transformers
@@ -94001,7 +93845,6 @@ self: {
        homepage = "https://bitbucket.org/robertmassaioli/hailgun";
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun-send" = callPackage
@@ -98273,25 +98116,6 @@ self: {
      }) {};
 
   "haskell-src-exts-util" = callPackage
-    ({ mkDerivation, base, containers, data-default, haskell-src-exts
-     , semigroups, transformers, uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-src-exts-util";
-       version = "0.2.2";
-       sha256 = "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg";
-       revision = "1";
-       editedCabalFile = "14mrpj2xmpdhib9l5qacslkm4n0rh5yjwy6n5dhp7152m69hgfdl";
-       libraryHaskellDepends = [
-         base containers data-default haskell-src-exts semigroups
-         transformers uniplate
-       ];
-       homepage = "https://github.com/pepeiborra/haskell-src-exts-util";
-       description = "Helper functions for working with haskell-src-exts trees";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src-exts-util_0_2_3" = callPackage
     ({ mkDerivation, base, containers, data-default, haskell-src-exts
      , semigroups, transformers, uniplate
      }:
@@ -98306,7 +98130,6 @@ self: {
        homepage = "https://github.com/pepeiborra/haskell-src-exts-util";
        description = "Helper functions for working with haskell-src-exts trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-meta" = callPackage
@@ -110091,8 +109914,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "hs-functors";
-       version = "0.1.1.0";
-       sha256 = "0fd9sn0l5q6qxk8br0pa6k3sbv3r0ccij6lb9jm1a174kxjfxzma";
+       version = "0.1.2.0";
+       sha256 = "0jhhli0hhhmrh313nnydblyz68rhhmf4g6yrn35m8davj5cg1wd7";
        libraryHaskellDepends = [ base transformers ];
        description = "Functors from products of Haskell and its dual to Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -115545,41 +115368,6 @@ self: {
      }) {};
 
   "http-streams" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
-     , base64-bytestring, blaze-builder, bytestring, Cabal
-     , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec
-     , hspec-expectations, http-common, HUnit, io-streams, lifted-base
-     , mtl, network, network-uri, openssl-streams, snap-core
-     , snap-server, system-fileio, system-filepath, text, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "http-streams";
-       version = "0.8.5.5";
-       sha256 = "1g2ygxyfq2x923df5q83wkrwhy2631r33zvffgj3fn0zwr024hhf";
-       revision = "1";
-       editedCabalFile = "0mgj62khq2abq53y03qww66k74pxhnid8yiqrlhggj9cjv7m2my5";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson attoparsec base base64-bytestring blaze-builder bytestring
-         case-insensitive directory HsOpenSSL http-common io-streams mtl
-         network network-uri openssl-streams text transformers
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty attoparsec base base64-bytestring blaze-builder
-         bytestring case-insensitive directory ghc-prim HsOpenSSL hspec
-         hspec-expectations http-common HUnit io-streams lifted-base mtl
-         network network-uri openssl-streams snap-core snap-server
-         system-fileio system-filepath text transformers
-         unordered-containers
-       ];
-       homepage = "http://github.com/afcowie/http-streams/";
-       description = "An HTTP client using io-streams";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http-streams_0_8_6_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
      , base64-bytestring, blaze-builder, bytestring, Cabal
      , case-insensitive, directory, ghc-prim, HsOpenSSL, hspec
@@ -115610,7 +115398,6 @@ self: {
        homepage = "https://github.com/afcowie/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-test" = callPackage
@@ -120868,8 +120655,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.6.0.5";
-       sha256 = "0fy19z3r6xyzhkkagi050rasc4ak8xmvdgidy4wplayck9fr3z47";
+       version = "0.6.0.6";
+       sha256 = "0ggfnnds3lshiasf2kkyxc3nd5y9b3jr6xraxmwgpikmf21yac4i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120885,7 +120672,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inline-c_0_6_0_6" = callPackage
+  "inline-c_0_6_1_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers
      , hashable, hspec, mtl, parsec, parsers, QuickCheck, raw-strings-qq
      , regex-posix, template-haskell, transformers, unordered-containers
@@ -120893,8 +120680,8 @@ self: {
      }:
      mkDerivation {
        pname = "inline-c";
-       version = "0.6.0.6";
-       sha256 = "0ggfnnds3lshiasf2kkyxc3nd5y9b3jr6xraxmwgpikmf21yac4i";
+       version = "0.6.1.0";
+       sha256 = "0vbfrsqsi7mdziqsnj68bsqlwbqxxhvrmy9rv6w8z18d1m8w3n6h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120940,6 +120727,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "inline-c-cpp_0_2_2_0" = callPackage
+    ({ mkDerivation, base, hspec, inline-c, safe-exceptions
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "inline-c-cpp";
+       version = "0.2.2.0";
+       sha256 = "1sglwjg8agzi3gspv97g999vb0zzsf5c41znqnnnvqx605jpsd5g";
+       libraryHaskellDepends = [
+         base inline-c safe-exceptions template-haskell
+       ];
+       testHaskellDepends = [ base hspec inline-c safe-exceptions ];
+       description = "Lets you embed C++ code into Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "inline-c-win32" = callPackage
     ({ mkDerivation, base, containers, inline-c, template-haskell
      , Win32
@@ -122283,6 +122087,8 @@ self: {
        pname = "ip";
        version = "1.2.0";
        sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f";
+       revision = "1";
+       editedCabalFile = "09g6nhh6r52dnk6adnxv6qiin6fxif567dl1nca49z5njphcvyl3";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive semigroups text
          vector
@@ -126133,6 +125939,8 @@ self: {
        pname = "jwt";
        version = "0.8.0";
        sha256 = "0ij921vgm0sqlc2ryymqxz6ipgl2iwm0916ny7g5l47qh2fjhcjg";
+       revision = "1";
+       editedCabalFile = "0b0znxxh6zgbq5xhxds2a1yxaqg5rka3xkhlchrbjabi9m5ndp84";
        libraryHaskellDepends = [
          aeson base bytestring containers cryptonite HsOpenSSL http-types
          memory network-uri RSA scientific semigroups text time
@@ -131990,8 +131798,8 @@ self: {
     ({ mkDerivation, base, bindings-levmar, hmatrix, vector }:
      mkDerivation {
        pname = "levmar";
-       version = "1.2.1.7";
-       sha256 = "07sdxa5xbgp26bjpchiy1g2n37chy95v0hfy8al5wyfbnlfws5xg";
+       version = "1.2.1.8";
+       sha256 = "0v2mfqw4irzpfq100i1rm5djfqzvxilq9i7pcslsb92jkcv2zgbc";
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
@@ -132802,25 +132610,6 @@ self: {
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
-    ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
-     , pipes-safe, systemd, text, transformers, uniplate
-     , unix-bytestring, unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "libsystemd-journal";
-       version = "1.4.2";
-       sha256 = "0pdb4spffm4q7xxc3nd8zn4y91v5cf4xmdgb4zls3nnh579h1ygk";
-       libraryHaskellDepends = [
-         base bytestring hashable hsyslog pipes pipes-safe text transformers
-         uniplate unix-bytestring unordered-containers uuid vector
-       ];
-       libraryPkgconfigDepends = [ systemd ];
-       homepage = "http://github.com/ocharles/libsystemd-journal";
-       description = "Haskell bindings to libsystemd-journal";
-       license = stdenv.lib.licenses.bsd3;
-     }) {systemd = null;};
-
-  "libsystemd-journal_1_4_3" = callPackage
     ({ mkDerivation, base, bytestring, hashable, hsyslog, pipes
      , pipes-safe, semigroups, systemd, text, transformers, uniplate
      , unix-bytestring, unordered-containers, uuid, vector
@@ -132838,7 +132627,6 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {systemd = null;};
 
   "libtagc" = callPackage
@@ -135679,17 +135467,18 @@ self: {
      }) {};
 
   "log-effect" = callPackage
-    ({ mkDerivation, base, bytestring, extensible-effects, fast-logger
-     , time
+    ({ mkDerivation, base, bytestring, extensible-effects
+     , monad-control, text, transformers-base
      }:
      mkDerivation {
        pname = "log-effect";
-       version = "0.4.0.1";
-       sha256 = "05rx54bsypisw6k8xm87a4rssyb0lwx7xavwamb1ciiwmvg3j14m";
+       version = "1.0.0";
+       sha256 = "0xj0g5g054ayycdajryischj2yy9rb75cm782sgsj67p04943c5y";
        libraryHaskellDepends = [
-         base bytestring extensible-effects fast-logger time
+         base bytestring extensible-effects monad-control text
+         transformers-base
        ];
-       homepage = "https://github.com/ibotty/log-effect";
+       homepage = "https://github.com/greydot/log-effect";
        description = "An extensible log effect using extensible-effects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135926,29 +135715,6 @@ self: {
      }) {};
 
   "logging-effect" = callPackage
-    ({ mkDerivation, async, base, bytestring, criterion, exceptions
-     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
-     , semigroups, stm, stm-delay, text, time, transformers
-     , transformers-base, wl-pprint-text
-     }:
-     mkDerivation {
-       pname = "logging-effect";
-       version = "1.2.5";
-       sha256 = "1db8x2rihkddww54cyzww0c65vk90nlnp82xrw226wliknbikri3";
-       libraryHaskellDepends = [
-         async base exceptions free monad-control mtl semigroups stm
-         stm-delay text time transformers transformers-base wl-pprint-text
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion fast-logger lifted-async monad-logger
-         text time wl-pprint-text
-       ];
-       homepage = "https://github.com/ocharles/logging-effect";
-       description = "A mtl-style monad transformer for general purpose & compositional logging";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "logging-effect_1_2_6" = callPackage
     ({ mkDerivation, async, base, bytestring, criterion, exceptions
      , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
      , semigroups, stm, stm-delay, text, time, transformers
@@ -135969,7 +135735,6 @@ self: {
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-effect-extra" = callPackage
@@ -142773,6 +142538,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mintty_0_1_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "mintty";
+       version = "0.1.2";
+       sha256 = "1njhz7wjmsk5pbr7gfkl95k50npkmm0iyxp3j93bbsg4rmxzg2kw";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/RyanGlScott/mintty";
+       description = "A reliable way to detect the presence of a MinTTY console on Windows";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mios" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, primitive, vector }:
      mkDerivation {
@@ -143694,8 +143472,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-classes";
-       version = "0.3.2.1";
-       sha256 = "0vclcwxy0qc9y1i3iw0ysymcvikn12mi5lfbarxykdhygmi1w5m5";
+       version = "0.3.2.2";
+       sha256 = "15g4llzym636ynf8jrfmlcqn6z4ybwfbg6l8ij73h5m1fkrzwgi7";
        libraryHaskellDepends = [
          base ghc-prim mmorph monad-control peano reflection transformers
          transformers-base transformers-compat
@@ -150113,20 +149891,6 @@ self: {
      }) {};
 
   "network-carbon" = callPackage
-    ({ mkDerivation, base, bytestring, network, text, time, vector }:
-     mkDerivation {
-       pname = "network-carbon";
-       version = "1.0.11";
-       sha256 = "1nkyj9114k2b6gwdd93yfrmf9zbziymbnbh3wxnz0vnk1hl2j5yq";
-       libraryHaskellDepends = [
-         base bytestring network text time vector
-       ];
-       homepage = "http://github.com/ocharles/network-carbon";
-       description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-carbon_1_0_12" = callPackage
     ({ mkDerivation, base, bytestring, network, text, time, vector }:
      mkDerivation {
        pname = "network-carbon";
@@ -150138,7 +149902,6 @@ self: {
        homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-conduit" = callPackage
@@ -162639,23 +162402,6 @@ self: {
      }) {};
 
   "pipes-group" = callPackage
-    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
-     , pipes-parse, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-group";
-       version = "1.0.9";
-       sha256 = "16yczij987r6j7gzp3nvgl1c5x2b7skvqsq38ns7p9z34kvy8sby";
-       libraryHaskellDepends = [
-         base free pipes pipes-parse transformers
-       ];
-       testHaskellDepends = [ base doctest lens-family-core ];
-       description = "Group streams into substreams";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "pipes-group_1_0_10" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
      }:
@@ -166085,8 +165831,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-hasql";
-       version = "1.2";
-       sha256 = "1viq19rycrm8zdwj3anqam45hlmdlh9wqji3xf120nk8ffqnwks1";
+       version = "1.3";
+       sha256 = "0n8ysdcg8p40idbbnyrmhjyh1hxhg7nrv5yf03fb0cvx5mwdgh11";
        libraryHaskellDepends = [
          base bytestring hasql potoki potoki-core profunctors text vector
        ];
@@ -168936,20 +168682,6 @@ self: {
      }) {};
 
   "proto-lens-optparse" = callPackage
-    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
-     mkDerivation {
-       pname = "proto-lens-optparse";
-       version = "0.1.1.0";
-       sha256 = "0m32sb05mjajwli9ivrcblkxyy8hrgi8sm2zwjlrjai6aq0ckh1c";
-       libraryHaskellDepends = [
-         base optparse-applicative proto-lens text
-       ];
-       homepage = "https://github.com/google/proto-lens#readme";
-       description = "Adapting proto-lens to optparse-applicative ReadMs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "proto-lens-optparse_0_1_1_1" = callPackage
     ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
      mkDerivation {
        pname = "proto-lens-optparse";
@@ -168961,7 +168693,6 @@ self: {
        homepage = "https://github.com/google/proto-lens#readme";
        description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-protobuf-types" = callPackage
@@ -169083,23 +168814,6 @@ self: {
      }) {};
 
   "protocol-buffers" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, filepath, mtl, parsec, syb, utf8-string
-     }:
-     mkDerivation {
-       pname = "protocol-buffers";
-       version = "2.4.8";
-       sha256 = "0inwj82pqbfqbgrzbs47g51k5nkx74hvbr76qc0a7kq0ss0rgnyb";
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath mtl
-         parsec syb utf8-string
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers_2_4_9" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
      }:
@@ -169114,25 +168828,9 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
-    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
-     mkDerivation {
-       pname = "protocol-buffers-descriptor";
-       version = "2.4.8";
-       sha256 = "1j8q6qj1gck13qxwrq2cslhw3pcc9kr6h7iqs4229lhsf73lql9a";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers protocol-buffers
-       ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
-       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers-descriptor_2_4_9" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
@@ -169145,7 +168843,6 @@ self: {
        homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -169447,29 +169144,6 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, deepseq
-     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
-     , QuickCheck, random, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, unordered-containers
-     }:
-     mkDerivation {
-       pname = "psqueues";
-       version = "0.2.6.0";
-       sha256 = "0n39s1i88j6s7vvsdhpbhcr3gpbwlzabwcc3nbd7nqb4kb4i0sls";
-       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
-       testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq fingertree-psqueue ghc-prim
-         hashable mtl PSQueue random unordered-containers
-       ];
-       description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "psqueues_0_2_7_0" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
      , QuickCheck, random, tagged, test-framework, test-framework-hunit
@@ -169490,7 +169164,6 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pstemmer" = callPackage
@@ -171099,6 +170772,8 @@ self: {
        pname = "quantification";
        version = "0.3";
        sha256 = "0hljd4m55254kmcrp3iar8ya7ky5a73vk3vrmgandmb15fsp2wvy";
+       revision = "1";
+       editedCabalFile = "1kcx4z6xwpbzkydl1kknf5kr1p2ry163jrw5k58f5jpv5gkn7mgn";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable path-pieces text
          unordered-containers vector
@@ -176684,29 +176359,6 @@ self: {
      }) {};
 
   "relational-query" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, dlist
-     , names-th, persistable-record, product-isomorphic
-     , quickcheck-simple, sql-words, template-haskell, text
-     , th-reify-compat, time, time-locale-compat, transformers
-     }:
-     mkDerivation {
-       pname = "relational-query";
-       version = "0.11.0.0";
-       sha256 = "0v0syrcagwmwqs9gikhdj0ji3cypfvfy9if8zyajkvxdkxpwvmaz";
-       libraryHaskellDepends = [
-         array base bytestring containers dlist names-th persistable-record
-         product-isomorphic sql-words template-haskell text th-reify-compat
-         time time-locale-compat transformers
-       ];
-       testHaskellDepends = [
-         base containers product-isomorphic quickcheck-simple transformers
-       ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Typeful, Modular, Relational, algebraic query engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "relational-query_0_11_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, dlist
      , names-th, persistable-record, product-isomorphic
      , quickcheck-simple, sql-words, template-haskell, text
@@ -176727,7 +176379,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query-HDBC" = callPackage
@@ -177685,6 +177336,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "req_1_1_0" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder
+     , bytestring, case-insensitive, connection, data-default-class
+     , hspec, hspec-core, hspec-discover, http-api-data, http-client
+     , http-client-tls, http-types, monad-control, mtl, QuickCheck
+     , retry, text, time, transformers, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "req";
+       version = "1.1.0";
+       sha256 = "08jfq1fsqd57l7csw4fg22wppq06wddh8qxxms5z6bay55nqikc7";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson authenticate-oauth base blaze-builder bytestring
+         case-insensitive connection data-default-class http-api-data
+         http-client http-client-tls http-types monad-control mtl retry text
+         time transformers transformers-base
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive
+         data-default-class hspec hspec-core http-client http-types
+         monad-control mtl QuickCheck text time unordered-containers
+       ];
+       testToolDepends = [ hspec-discover ];
+       doCheck = false;
+       homepage = "https://github.com/mrkkrp/req";
+       description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "req-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec
      , http-client, req, resourcet, temporary, transformers, weigh
@@ -182685,8 +182368,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.5.3";
-       sha256 = "0j67qa7iqlkx0l9xlgxsyzv53bnrs7fdhv2xj1zlnkn22wsd39hj";
+       version = "0.3.6.0";
+       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable integer-gmp
          integer-logarithms primitive text
@@ -182701,7 +182384,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "scientific_0_3_6_0" = callPackage
+  "scientific_0_3_6_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, hashable, integer-gmp, integer-logarithms, primitive
      , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
@@ -182709,8 +182392,8 @@ self: {
      }:
      mkDerivation {
        pname = "scientific";
-       version = "0.3.6.0";
-       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
+       version = "0.3.6.2";
+       sha256 = "03ql2f0ac8bsl524idy9xxa3kxisb2sj3avflzw580j5hzy0m397";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq hashable integer-gmp
          integer-logarithms primitive text
@@ -190199,18 +189882,6 @@ self: {
      }) {};
 
   "singleton-nats" = callPackage
-    ({ mkDerivation, base, singletons }:
-     mkDerivation {
-       pname = "singleton-nats";
-       version = "0.4.0.4";
-       sha256 = "1cizvqiv1hw7an2c2k1mbj9089n6rrggyf5pv2pcl7knpy07hph4";
-       libraryHaskellDepends = [ base singletons ];
-       homepage = "https://github.com/AndrasKovacs/singleton-nats";
-       description = "Unary natural numbers relying on the singletons infrastructure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "singleton-nats_0_4_1" = callPackage
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "singleton-nats";
@@ -190220,7 +189891,6 @@ self: {
        homepage = "https://github.com/AndrasKovacs/singleton-nats";
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singleton-typelits" = callPackage
@@ -200429,10 +200099,11 @@ self: {
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "superdoc";
-       version = "0.1.2.5";
-       sha256 = "0b0610pg2b9j5phc0mwsyk8rzp4w77453g4631p3j2wgrjiw425n";
+       version = "0.1.2.7";
+       sha256 = "0pfqvw6a9c29fsar1xiqwbsdc294l9iy3jlc6ax0wxdkfqyqwagv";
        isLibrary = true;
        isExecutable = true;
+       setupHaskellDepends = [ base Cabal containers directory filepath ];
        libraryHaskellDepends = [
          base Cabal containers directory filepath
        ];
@@ -200478,8 +200149,8 @@ self: {
      }:
      mkDerivation {
        pname = "supermonad";
-       version = "0.2.0.1";
-       sha256 = "15hw8bzafvg492zcdj5f0r67fmrqay5kj9jwfm9wd3qv7k8iszrk";
+       version = "0.2.1.1";
+       sha256 = "1bnj0kva6nh1565fvakwqbx8as7v415fqd7s33dvbfzk8dpkld8z";
        libraryHaskellDepends = [
          base containers fgl ghc mtl transformers
        ];
@@ -203922,23 +203593,6 @@ self: {
      }) {};
 
   "tasty-rerun" = callPackage
-    ({ mkDerivation, base, containers, mtl, optparse-applicative
-     , reducers, split, stm, tagged, tasty, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-rerun";
-       version = "1.1.10";
-       sha256 = "1776fx700wlc9spn0dh3x4nh44x2yg33z9zyqzqlpwrhrkpaz91b";
-       libraryHaskellDepends = [
-         base containers mtl optparse-applicative reducers split stm tagged
-         tasty transformers
-       ];
-       homepage = "http://github.com/ocharles/tasty-rerun";
-       description = "Run tests by filtering the test tree depending on the result of previous test runs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-rerun_1_1_11" = callPackage
     ({ mkDerivation, base, containers, mtl, optparse-applicative
      , reducers, split, stm, tagged, tasty, transformers
      }:
@@ -203953,7 +203607,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-rerun";
        description = "Run tests by filtering the test tree depending on the result of previous test runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-silver" = callPackage
@@ -211353,8 +211006,8 @@ self: {
      }:
      mkDerivation {
        pname = "trasa";
-       version = "0.2";
-       sha256 = "1570f4612nfslcxr0mjwf4zzgfninb0mv1d0n6livcks8jd4w4ph";
+       version = "0.3";
+       sha256 = "0v1srhmzwc8vdkwwpik91bvrq73driryl0lyazx7zvpvmqhxkmi6";
        libraryHaskellDepends = [
          base binary bytestring hashable http-media http-types text
          unordered-containers vinyl
@@ -211370,15 +211023,17 @@ self: {
      }) {};
 
   "trasa-client" = callPackage
-    ({ mkDerivation, aeson, base, binary, bytestring, http-client
-     , http-media, http-types, ip, text, trasa, unordered-containers
+    ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
+     , containers, http-client, http-media, http-types, ip, text, trasa
+     , unordered-containers
      }:
      mkDerivation {
        pname = "trasa-client";
-       version = "0.2";
-       sha256 = "0cgsjaclcqy4nprp7ndr4di1km0fp70zfgv1r4v172mk2q0n06nx";
+       version = "0.3";
+       sha256 = "1cq0wbjv0kbhvprrggbkqqy6h6ixywfr816b9pd2qqmsnw4lq6ns";
        libraryHaskellDepends = [
-         base binary bytestring http-client http-media http-types text trasa
+         base binary bytestring case-insensitive containers http-client
+         http-media http-types text trasa
        ];
        testHaskellDepends = [
          aeson base http-client http-types ip text trasa
@@ -212449,8 +212104,8 @@ self: {
     ({ mkDerivation, base, generics-sop }:
      mkDerivation {
        pname = "tuple-sop";
-       version = "0.2.0.1";
-       sha256 = "1l2llpn3b3v5hly3bpzyhzagnrrs830xgpqaab8w1rcbhkmqby12";
+       version = "0.3.0.0";
+       sha256 = "1m9xsjnnyavms4hxgdam79vc9c4bf6ssmammmzvvidqvyl9z1g15";
        libraryHaskellDepends = [ base generics-sop ];
        testHaskellDepends = [ base generics-sop ];
        homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme";
@@ -213005,23 +212660,18 @@ self: {
      }) {};
 
   "twiml" = callPackage
-    ({ mkDerivation, base, Cabal, data-default, deepseq, Diff, HUnit
-     , lens, network-uri, parsec, should-not-typecheck, template-haskell
-     , text, void, xml
+    ({ mkDerivation, base, data-default, deepseq, doctest, lens
+     , network-uri, parsec, template-haskell, text, void, xml
      }:
      mkDerivation {
        pname = "twiml";
-       version = "0.2.0.1";
-       sha256 = "1x4jhvz0590zlpy74yjwjxkrllk7yvpgf2srkisi10klmarsjygd";
-       enableSeparateDataOutput = true;
+       version = "0.2.1.0";
+       sha256 = "1y6szzr951if5lal2rfknybd11a2r13xrykpsyrqvq5dzq2yx67z";
        libraryHaskellDepends = [
          base data-default deepseq lens network-uri parsec template-haskell
          text void xml
        ];
-       testHaskellDepends = [
-         base Cabal data-default deepseq Diff HUnit lens
-         should-not-typecheck void
-       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/markandrus/twiml-haskell";
        description = "TwiML library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -215077,6 +214727,31 @@ self: {
        license = "unknown";
      }) {};
 
+  "unexceptionalio_0_4_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "unexceptionalio";
+       version = "0.4.0";
+       sha256 = "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/singpolyma/unexceptionalio";
+       description = "IO without any non-error, synchronous exceptions";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "unexceptionalio-trans" = callPackage
+    ({ mkDerivation, base, transformers, unexceptionalio }:
+     mkDerivation {
+       pname = "unexceptionalio-trans";
+       version = "0.4.0";
+       sha256 = "19jzvxx0z4w7d1mp09spiz01sd349376hf5xkg8r2zfr8fx7hj71";
+       libraryHaskellDepends = [ base transformers unexceptionalio ];
+       homepage = "https://github.com/singpolyma/unexceptionalio-trans";
+       description = "A wrapper around UnexceptionalIO using monad transformers";
+       license = "unknown";
+     }) {};
+
   "unfoldable" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck
      , random, transformers
@@ -217355,14 +217030,25 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
-       version = "0.1.7.0";
-       sha256 = "1g5pgwkw1kqfskk131v2vaqcvyxqgslff62qamjz4dzray9fa9cp";
+       version = "0.1.10.0";
+       sha256 = "1cp7vxhg6m02j7zj7z6zss38rsykrk596qakzczsxjx7yraxwdxb";
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "util-exception" = callPackage
+    ({ mkDerivation, base, lifted-base, monad-control, util }:
+     mkDerivation {
+       pname = "util-exception";
+       version = "0.1.0.0";
+       sha256 = "0y1d1y421sx8imibi235zc2f3cpjgg9pl6wkmigrxn4q4nwigkbr";
+       libraryHaskellDepends = [ base lifted-base monad-control util ];
+       description = "Exceptional utilities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "util-plus" = callPackage
     ({ mkDerivation, array, base, containers, hashable, HTF, QuickCheck
      , safe, unordered-containers
@@ -223572,23 +223258,6 @@ self: {
      }) {};
 
   "weigh" = callPackage
-    ({ mkDerivation, base, deepseq, mtl, process, split
-     , template-haskell, temporary
-     }:
-     mkDerivation {
-       pname = "weigh";
-       version = "0.0.7";
-       sha256 = "1k5mxk0cn82x1lc1j0ik4sfkr0q4ipa2ls9sm5g39hl6bjwp1lp3";
-       libraryHaskellDepends = [
-         base deepseq mtl process split template-haskell temporary
-       ];
-       testHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/fpco/weigh#readme";
-       description = "Measure allocations of a Haskell functions/values";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "weigh_0_0_11" = callPackage
     ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
      mkDerivation {
        pname = "weigh";
@@ -223601,7 +223270,6 @@ self: {
        homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted" = callPackage
@@ -224429,12 +224097,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "wl-pprint-text_1_1_1_1" = callPackage
+  "wl-pprint-text_1_2_0_0" = callPackage
     ({ mkDerivation, base, base-compat, text }:
      mkDerivation {
        pname = "wl-pprint-text";
-       version = "1.1.1.1";
-       sha256 = "1v227rc24ibb6qxiyhq9v9hv8ilkrm6i1snl5icblm8zgvpymplb";
+       version = "1.2.0.0";
+       sha256 = "0g3w92rad6x5appfb22rbzcas2ix2h0hy91sdxhq8a4a5cnlrpa0";
        libraryHaskellDepends = [ base base-compat text ];
        description = "A Wadler/Leijen Pretty Printer for Text values";
        license = stdenv.lib.licenses.bsd3;
@@ -225519,21 +225187,6 @@ self: {
      }) {};
 
   "wuss" = callPackage
-    ({ mkDerivation, base, bytestring, connection, network, websockets
-     }:
-     mkDerivation {
-       pname = "wuss";
-       version = "1.1.8";
-       sha256 = "1isw32n4qdaip350928v7v7cph4p4sb28hva5vd3jvq4309n65df";
-       libraryHaskellDepends = [
-         base bytestring connection network websockets
-       ];
-       homepage = "https://github.com/tfausak/wuss#readme";
-       description = "Secure WebSocket (WSS) clients";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "wuss_1_1_9" = callPackage
     ({ mkDerivation, base, bytestring, connection, network, websockets
      }:
      mkDerivation {
@@ -225546,7 +225199,6 @@ self: {
        homepage = "https://github.com/tfausak/wuss#readme";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wx" = callPackage
@@ -228247,6 +227899,36 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
 
+  "yaml_0_8_30" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
+     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
+     , mockery, resourcet, scientific, semigroups, template-haskell
+     , temporary, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.30";
+       sha256 = "11dyjqs1rzhpidzfqdw3lg8rsm32jhjph54kc68k4dwib6fnwnyi";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         filepath resourcet scientific semigroups template-haskell text
+         transformers unordered-containers vector
+       ];
+       libraryPkgconfigDepends = [ libyaml ];
+       testHaskellDepends = [
+         aeson base base-compat bytestring conduit directory hspec HUnit
+         mockery resourcet temporary text transformers unordered-containers
+         vector
+       ];
+       homepage = "http://github.com/snoyberg/yaml/";
+       description = "Support for parsing and rendering YAML documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libyaml;};
+
   "yaml-combinators" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop
      , scientific, tasty, tasty-hunit, text, transformers
@@ -229545,6 +229227,47 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-core_1_6_5" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
+     , blaze-markup, byteable, bytestring, case-insensitive, cereal
+     , clientsession, conduit, conduit-extra, containers, cookie
+     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
+     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
+     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
+     , resourcet, safe, semigroups, shakespeare, streaming-commons
+     , template-haskell, text, time, transformers, unix-compat, unliftio
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.6.5";
+       sha256 = "0yj06bfw7cln4waf76nfj1dm1f5fd13i896f5iy33035xc0bwiml";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-html blaze-markup byteable bytestring
+         case-insensitive cereal clientsession conduit conduit-extra
+         containers cookie deepseq deepseq-generics directory fast-logger
+         http-types monad-logger mtl old-locale parsec path-pieces primitive
+         random resourcet safe semigroups shakespeare template-haskell text
+         time transformers unix-compat unliftio unordered-containers vector
+         wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base bytestring clientsession conduit conduit-extra
+         containers cookie hspec hspec-expectations http-types HUnit network
+         path-pieces QuickCheck random resourcet shakespeare
+         streaming-commons template-haskell text transformers unliftio wai
+         wai-extra
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-html bytestring gauge shakespeare text transformers
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-crud" = callPackage
     ({ mkDerivation, base, classy-prelude, containers, MissingH
      , monad-control, persistent, random, safe, stm, uuid, yesod-core
@@ -230767,33 +230490,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, conduit, containers
-     , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
-     , network, persistent, pretty-show, semigroups, text, time
-     , transformers, unliftio, wai, wai-extra, xml-conduit, xml-types
-     , yesod-core, yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.6.3";
-       sha256 = "0mxjkk6bkxgjpdifvz7qlqg0ms1xh19b8r7f96lp0pcnfksnil4d";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive conduit containers cookie hspec-core html-conduit
-         http-types HUnit network persistent pretty-show semigroups text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit text
-         unliftio wai wai-extra xml-conduit yesod-core yesod-form
-       ];
-       homepage = "http://www.yesodweb.com";
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_6_4" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, conduit, containers
      , cookie, hspec, hspec-core, html-conduit, http-types, HUnit
@@ -230818,7 +230514,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage

From c5338e5acb9c1af43aa95ffa31a24c4cde1fec1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2018 11:30:36 +0200
Subject: [PATCH 1358/3370] haskell-gi: remember the URL to the PR that
 explains why the override is necessary

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2c16b37bba88..45560de984f3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,8 +422,7 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
-  # The doctest phase fails because it does not have a proper environment in
-  # which to run the commands it's ought to test.
+  # https://github.com/haskell-gi/haskell-gi/pull/163
   haskell-gi = dontCheck super.haskell-gi;
 
   # https://github.com/basvandijk/threads/issues/10

From 6db7f92cc2af827e8b8b181bf5ed828a1d0f141d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 8 May 2018 17:48:02 +0200
Subject: [PATCH 1359/3370] all-cabal-hashes: update to latest version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index e758c56f0235..1ef00de5b83b 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/462dbb7e8a2ca65807ae21d1cc5f5c5454a9a327.tar.gz";
-  sha256 = "09rq2r9ydvmhk9182xl0yz4dbr84ncj8a7fc2qzln784zrd12aph";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a2febcad5a83b15dea74462890e3c48c13f55f1.tar.gz";
+  sha256 = "1z6mfk49hsxvcpv183wayirspx78xd1l0w42wf8mfyf0jh8grfff";
 }

From 014f2cdb890df62a3afa7ca1270b9bc1e7bd5ab3 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 8 May 2018 11:18:43 -0500
Subject: [PATCH 1360/3370] mesa: 17.3.9 -> 18.0.3

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 0811362bfcae..4fd3b38a3be1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.3.9";
+  version = "18.0.3";
   branch  = head (splitString "." version);
 in
 
@@ -81,7 +81,7 @@ let self = stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "0yg4nvagg5y2fxyl3jjdgbi6gjqqw4z3j6pyzsac5q7h0pybbgn5";
+    sha256 = "0c4yskqwmh5k0wavjrkfcldafvnpcx8gjcx584bscxks69krd789";
   };
 
   prePatch = "patchShebangs .";

From a365b59deb07f0ffd0eff329a92a3cbc56ae1521 Mon Sep 17 00:00:00 2001
From: Valentin Heidelberger <github@valentinsblog.com>
Date: Tue, 8 May 2018 19:19:49 +0200
Subject: [PATCH 1361/3370] keepassxc: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 0e1aecaab1d1..373320dfe15a 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -26,13 +26,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassxc-${version}";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "1xlg8zb22c2f1pi2has4f4qwggd0m2z254f0d6jrgz368x4g3p87";
+    sha256 = "13gf7rsan6fjkdr46xkr08d150nh194fkbzb4cazwd7rf05agw1y";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [

From 4a30fc25228a02d3aa3bf374b1643a400433cb39 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 8 May 2018 01:36:33 +0200
Subject: [PATCH 1362/3370] bamf: init at 0.5.3

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

diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix
new file mode 100644
index 000000000000..dd926ac20817
--- /dev/null
+++ b/pkgs/development/libraries/bamf/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, libgtop, libwnck3, glib, vala, pkgconfig
+, libstartup_notification, gobjectIntrospection, gtk-doc
+, python27, pythonPackages, libxml2 }:
+
+stdenv.mkDerivation rec {
+  pname = "bamf";
+  version = "0.5.3";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/${pname}/0.5/${version}/+download/${name}.tar.gz";
+    sha256 = "051vib8ndp09ph5bfwkgmzda94varzjafwxf6lqx7z1s8rd7n39l";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    gtk-doc
+    gobjectIntrospection
+  ];
+
+  buildInputs = [ libgtop libwnck3 vala libstartup_notification
+                  python27 pythonPackages.libxslt libxml2 glib ];
+
+  postPatch = ''
+    substituteInPlace data/Makefile.in \
+      --replace '/usr/lib/systemd/user' '@datarootdir@/systemd/user'
+  '';
+
+  # fix paths
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
+  # ignore deprecation errors
+  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
+
+  meta = with stdenv.lib; {
+    description = "Application matching framework";
+    longDescription = ''
+      Removes the headache of applications matching
+      into a simple DBus daemon and c wrapper library.
+    '';
+    homepage = https://launchpad.net/bamf;
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ davidak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d0b125b8a23..a654d197d3ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8527,6 +8527,8 @@ with pkgs;
 
   backward-cpp = callPackage ../development/libraries/backward-cpp { };
 
+  bamf = callPackage ../development/libraries/bamf { };
+
   bctoolbox = callPackage ../development/libraries/bctoolbox {
     mbedtls = mbedtls_1_3;
   };

From 296e7717e0be6d45ce5da17d4d42d81f9647b6d5 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Tue, 8 May 2018 01:36:59 +0200
Subject: [PATCH 1363/3370] plank: init at 0.11.4

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

diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
new file mode 100644
index 000000000000..3e69f4a97c11
--- /dev/null
+++ b/pkgs/applications/misc/plank/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
+, libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
+, bamf, gdk_pixbuf, libdbusmenu-gtk3, file
+, wrapGAppsHook, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  pname = "plank";
+  version = "0.11.4";
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://launchpad.net/${pname}/1.0/${version}/+download/${name}.tar.xz";
+    sha256 = "1f41i45xpqhjxql9nl4a1sz30s0j46aqdhbwbvgrawz6himcvdc8";
+  };
+
+  nativeBuildInputs = [
+    pkgconfig
+    intltool
+    libxml2 # xmllint
+    wrapGAppsHook
+    gobjectIntrospection
+  ];
+
+  buildInputs = [ vala atk cairo glib gnome3.gnome-menus
+                  gtk3 gnome3.libgee libwnck3 libX11 libXfixes
+                  libXi pango gnome3.gnome-common bamf gdk_pixbuf
+                  libdbusmenu-gtk3 gnome3.dconf ];
+
+  # fix paths
+  makeFlags = [
+    "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/"
+    "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
+  ];
+
+  postPatch = ''
+    substituteInPlace ./configure \
+      --replace "/usr/bin/file" "${file}/bin/file"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Elegant, simple, clean dock";
+    homepage = https://launchpad.net/plank;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ davidak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a654d197d3ce..8bdb6666e3f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17088,6 +17088,8 @@ with pkgs;
 
   pijul = callPackage ../applications/version-management/pijul {};
 
+  plank = callPackage ../applications/misc/plank { };
+
   planner = callPackage ../applications/office/planner { };
 
   playonlinux = callPackage ../applications/misc/playonlinux {

From 882e08ced1b29fa0819198bf444922c52b3588c5 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 8 May 2018 15:37:10 -0500
Subject: [PATCH 1364/3370] unixtools: fixup bad merge

This should hopefully fix the eval issue.
---
 pkgs/top-level/unix-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index a73f11e69a4a..c42cf8aa0267 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -47,7 +47,7 @@ let
     eject = {
       linux = pkgs.utillinux;
     };
-    getconf = singleBinary "getconf" {
+    getconf = {
       linux = if hostPlatform.isMusl then pkgs.musl-getconf
               else lib.getBin stdenv.cc.libc;
       darwin = pkgs.darwin.system_cmds;

From c4cac55d6979ccdbc48cf0daf26e44c79cf5d0f9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 8 May 2018 15:46:57 -0500
Subject: [PATCH 1365/3370] qt510: disable framework build on macOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We prefer to have $out/include & $out/lib installed so that things
like multiple outputs can work. There is no way to do this in Qt
currently without also disabling the ‘framework’ install. Not sure if
this will break anything but it will fix issues we run into on some
projects like python2.7-pyside:

Linux: https://hydra.nixos.org/build/73219181
macOS: https://hydra.nixos.org/build/73059550

Hopefully this gives us consistency between the two.
---
 .../libraries/qt-5/5.10/default.nix           |  4 +--
 .../qt-5/5.10/restore-pc-files.patch          | 27 -------------------
 .../libraries/qt-5/mkDerivation.nix           |  3 +++
 3 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch

diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix
index a45e055e60b2..3969e01a2b91 100644
--- a/pkgs/development/libraries/qt-5/5.10/default.nix
+++ b/pkgs/development/libraries/qt-5/5.10/default.nix
@@ -37,9 +37,7 @@ let
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
   patches = {
-    qtbase = [ ./qtbase.patch ] ++
-      optionals stdenv.isDarwin [ ./qtbase-darwin.patch
-                                  ./restore-pc-files.patch ];
+    qtbase = [ ./qtbase.patch ./qtbase-darwin.patch ];
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
diff --git a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch b/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
deleted file mode 100644
index a012c3f583e3..000000000000
--- a/pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index e6a0d97f1a..b50ce77d51 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -266,7 +266,7 @@ load(qt_installs)
- load(qt_targets)
- 
- # this builds on top of qt_common
--!internal_module:!lib_bundle:if(unix|mingw) {
-+!internal_module:if(unix|mingw) {
-     CONFIG += create_pc
-     QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-     host_build: \
-diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
-index 62b88c6fe2..f302f1e202 100644
---- a/mkspecs/features/qt_module_headers.prf
-+++ b/mkspecs/features/qt_module_headers.prf
-@@ -102,8 +102,7 @@ git_build: \
- else: \
-     INC_PATH = $$MODULE_BASE_INDIR
- include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)
--!lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.
--    CONFIG += qt_install_headers
-+CONFIG += qt_install_headers
- 
- alien_syncqt: return()
- 
diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix
index 96014cfbc779..53949ddd4925 100644
--- a/pkgs/development/libraries/qt-5/mkDerivation.nix
+++ b/pkgs/development/libraries/qt-5/mkDerivation.nix
@@ -16,6 +16,9 @@ let
       optional (!debug) "-DQT_NO_DEBUG"
       ++ lib.toList (args.NIX_CFLAGS_COMPILE or []);
 
+    configureFlags = [ "-no-framework" ]
+                  ++ (args.configureFlags or []);
+
     cmakeFlags =
       (args.cmakeFlags or [])
       ++ [

From e711da345ca51744b37aa9249bb84d4faea10082 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 28 Oct 2017 17:58:59 +0300
Subject: [PATCH 1366/3370] base profile: add mkpasswd to system packages

Allows the user to generate password hashes for the installed system easier.
---
 nixos/modules/profiles/base.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 3bf06a951193..52481d90eab9 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -17,6 +17,7 @@
     pkgs.ddrescue
     pkgs.ccrypt
     pkgs.cryptsetup # needed for dm-crypt volumes
+    pkgs.mkpasswd # for generating password files
 
     # Some networking tools.
     pkgs.fuse

From 88946527a50324ab0c8c0861529ad679b33c9e0d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 8 May 2018 23:19:47 +0200
Subject: [PATCH 1367/3370] eclipse-plugin-jsonedit: 1.1.0 -> 1.1.1

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 136ef7dfc23d..adb763c12507 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -432,11 +432,11 @@ rec {
 
   jsonedit = buildEclipsePlugin rec {
     name = "jsonedit-${version}";
-    version = "1.1.0";
+    version = "1.1.1";
 
     srcFeature = fetchurl {
       url = "https://boothen.github.io/Json-Eclipse-Plugin/features/jsonedit-feature_${version}.jar";
-      sha256 = "1qqbzh9sv0s9p0irim7kimvzdkw0hg6yv090bz5ifpzqdxc4v9r5";
+      sha256 = "0zkg8d8x3l5jpfxi0mz9dn62wmy4fjgpwdikj280fvsklmcw5b86";
     };
 
     srcPlugins =
@@ -448,13 +448,13 @@ rec {
           };
       in
         map fetch [
-          { n = "core"; h = "1fl4api6j0wp4vfbyabxqsrjvvpclp8p3b4xnxxpn4v8g12q526m"; }
-          { n = "editor"; h = "1kn15qampdlpxblj2bv94b3bb15qfwng27lk0n578585yqmb3p66"; }
-          { n = "folding"; h = "1qnzdx4xx9ma3p6lg1ab8xf3nik1yrww33nksi0j3vnvh8i9ihdm"; }
-          { n = "model"; h = "0n8855ma1h2as0skrrp2qy3sdkmnhl5vlqxcjv8xlc3faa72174a"; }
-          { n = "outline"; h = "07i2spmzghs49pkxl8z9c29n6l38x26v20prkh4a7i1rf9whg1q8"; }
-          { n = "preferences"; h = "0d1m8pb903wpc4vvhsp0gx0h65r432ax898wif3a23c5wxj4nh9i"; }
-          { n = "text"; h = "0z80d9qgpbx88jrq8b4r478lrcrf52gxqkl94l13wrk7rszjpldh"; }
+          { n = "core"; h = "0svs0aswnhl26cqw6bmw30cisx4cr50kc5njg272sy5c1dqjm1zq"; }
+          { n = "editor"; h = "1q62dinrbb18aywbvii4mlr7rxa20rdsxxd6grix9y8h9776q4l5"; }
+          { n = "folding"; h = "1qh4ijfb1gl9xza5ydi87v1kyima3a9sh7lncwdy1way3pdhln1y"; }
+          { n = "model"; h = "1pr6k2pdfdwx8jqs7gx7wzn3gxsql3sk6lnjha8m15lv4al6d4kj"; }
+          { n = "outline"; h = "1jgr2g16j3id8v367jbgd6kx6g2w636fbzmd8jvkvkh7y1jgjqxm"; }
+          { n = "preferences"; h = "027fhaqa5xbil6dmhvkbpha3pgw6dpmc2im3nlliyds57mdmdb1h"; }
+          { n = "text"; h = "0clywylyidrxlqs0n816nhgjmk1c3xl7sn904ki4q050amfy0wb2"; }
         ];
 
     propagatedBuildInputs = [ antlr-runtime_4_7 ];

From ae8d6b08fdcae10d38e3ead70e708c85466a128e Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 9 May 2018 00:18:09 +0200
Subject: [PATCH 1368/3370] Revert "poppler_utils: 0.63.0 -> 0.64.0" (#39742)

This reverts commit 3dfe97c62d15d812e422b3e3e469fe9a862a0069.
Breaks texlive.bin.core build, see discussion in #39742
---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index a96de20ccfeb..11dd8ec32910 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.64.0";
+  version = "0.63.0";
   mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj";
+    sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17";
   };
 
   outputs = [ "out" "dev" ];

From b7ad8d667c8d1bd7d531126f19a15050379731b9 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 9 May 2018 00:20:26 +0200
Subject: [PATCH 1369/3370] Revert "poppler_data: 0.4.8 -> 0.4.9" (#39524)

This reverts commit 95d1d753dc874faa88a32f3c851afcd8a88cdff7.
See discussion in #39742
---
 pkgs/data/misc/poppler-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index d7a5ce33bd26..5c8e0970518b 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, cmake, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.4.9";
+  name = "poppler-data-0.4.8";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z";
+    sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh";
   };
 
   nativeBuildInputs = [ cmake ninja ];

From 92af917827cd7f56ffcb525ff05cad3d633e587e Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Tue, 8 May 2018 18:17:44 -0500
Subject: [PATCH 1370/3370] git-secrets: fix homepage url

---
 .../version-management/git-and-tools/git-secrets/default.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
index 14026df81853..a2f0c8ae4142 100644
--- a/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-secrets/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation {
 
   meta = {
     description = "Prevents you from committing passwords and other sensitive information to a git repository";
-    homepage = https://github.com/awslabs/git-secretshttps://github.com/awslabs/git-secrets;
+    homepage = https://github.com/awslabs/git-secrets;
     license = stdenv.lib.licenses.asl20;
     platforms = stdenv.lib.platforms.all;
   };

From 2cac5d73ce022d2c6e82cec39b7de973c08b55c4 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Mon, 5 Mar 2018 14:31:01 -0800
Subject: [PATCH 1371/3370] cloud-sql-proxy: init at 1.11

---
 pkgs/tools/misc/cloud-sql-proxy/default.nix | 28 ++++++++++++
 pkgs/tools/misc/cloud-sql-proxy/deps.nix    | 48 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 3 files changed, 78 insertions(+)
 create mode 100644 pkgs/tools/misc/cloud-sql-proxy/default.nix
 create mode 100644 pkgs/tools/misc/cloud-sql-proxy/deps.nix

diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix
new file mode 100644
index 000000000000..5059b395610d
--- /dev/null
+++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "cloud-sql-proxy-${version}";
+  version = "1.11";
+
+  goPackagePath = "github.com/GoogleCloudPlatform/cloudsql-proxy";
+
+  subPackages = [ "cmd/cloud_sql_proxy" ];
+
+  src = fetchgit {
+    rev = version;
+    url = "https://${goPackagePath}";
+    sha256 = "13g68i51f03xdh7a1qjmj8j5ljn4drd3n44fn348xfdxqclnx90l";
+  };
+
+  goDeps = ./deps.nix;
+
+  buildFlagsArray = [ "-ldflags=" "-X main.versionString=${version}" ];
+
+  meta = with stdenv.lib; {
+    description = "An authenticating proxy for Second Generation Google Cloud SQL databases";
+    homepage = https://github.com/GoogleCloudPlatform/cloudsql-proxy;
+    license = licenses.asl20;
+    maintainers = [ maintainers.nicknovitski ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/tools/misc/cloud-sql-proxy/deps.nix b/pkgs/tools/misc/cloud-sql-proxy/deps.nix
new file mode 100644
index 000000000000..7021b4b05b23
--- /dev/null
+++ b/pkgs/tools/misc/cloud-sql-proxy/deps.nix
@@ -0,0 +1,48 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "bazil.org/fuse";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bazil/fuse";
+      rev = "65cc252bf6691cb3c7014bcb2c8dc29de91e3a7e";
+      sha256 = "0qjm9yrhc5h632wwhklqzhalid4lxcm9iwsqs3jahp303rm27vpk";
+    };
+  }
+  {
+    goPackagePath = "cloud.google.com/go";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/gocloud";
+      rev = "e9284bade4f43071dac5ec56c73a03a3c9fa7772";
+      sha256 = "0qm0s97bj21m04a07yni09hdh0aycgmklm5mg6flx17lrp2av9j8";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "3a7846fea0afe8cc88deb31d8cfb1fa15a3615ef";
+      sha256 = "1dxvliqc79bl0waczzy8ajm7jpbnn2bszwfcd71zjjxph8jz75kg";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/oauth2";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/oauth2";
+      rev = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269";
+      sha256 = "182is558nfvk4x1cm8sqzaym8kfcaaxaga9ggqhvzqrs8mncbj22";
+    };
+  }
+  {
+    goPackagePath = "google.golang.org/api";
+    fetch = {
+      type = "git";
+      url = "https://code.googlesource.com/google-api-go-client";
+      rev = "20530fd5d65ad2caee87891f9896d7547cb400c9";
+      sha256 = "06fsnml2kfzifxp2d5anb6vxjlgpkwl82xcddf0cg0v1bnx5mnrd";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24b33231f77e..d8e1943157d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -609,6 +609,8 @@ with pkgs;
 
   bonfire = callPackage ../tools/misc/bonfire { };
 
+  cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { };
+
   container-linux-config-transpiler = callPackage ../development/tools/container-linux-config-transpiler { };
 
   cconv = callPackage ../tools/text/cconv { };

From 48808f1c93502359147bf92aca298db093339ae4 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Wed, 9 May 2018 10:19:38 +1000
Subject: [PATCH 1372/3370] singularity: add missing file dependency

---
 pkgs/applications/virtualization/singularity/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix
index 2048d7d2ed92..b6f4a5976e44 100644
--- a/pkgs/applications/virtualization/singularity/default.nix
+++ b/pkgs/applications/virtualization/singularity/default.nix
@@ -14,6 +14,7 @@
 , curl
 , utillinux
 , libarchive
+, file
  }:
 
 stdenv.mkDerivation rec {
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];
-  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive ];
+  buildInputs = [ coreutils gnugrep python e2fsprogs which gnutar squashfsTools gzip gnused curl utillinux libarchive file ];
 
   meta = with stdenv.lib; {
     homepage = http://singularity.lbl.gov/;

From 2be9f022012a499c941e3a044a70f90388cd946d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 9 May 2018 03:12:24 +0200
Subject: [PATCH 1373/3370] gnome3.gnome-clocks: add fallback sound theme

---
 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index 09c006771997..78366755ad6a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
-, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound
+, vala, gobjectIntrospection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
 , gnome3, gdk_pixbuf, geoclue2, libgweather }:
 
 stdenv.mkDerivation rec {
@@ -30,6 +30,13 @@ stdenv.mkDerivation rec {
     gnome3.gnome-desktop gnome3.geocode-glib geoclue2 libgweather gsound
   ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      # Fallback sound theme
+      --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
+    )
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Clocks;
     description = "Clock application designed for GNOME 3";

From a4c86b421f13a8dec9c2a639ebb78d50f4f0461c Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Tue, 8 May 2018 21:33:38 -0400
Subject: [PATCH 1374/3370] webkitgtk: add missing libXdamage dependency

Closes #40193
---
 pkgs/development/libraries/webkitgtk/2.4.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 18d20bf9c780..39a76a74711f 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk2 libwebp enchant
     libxml2 libxslt
-    gst-plugins-base sqlite xorg.libXt
+    gst-plugins-base sqlite xorg.libXt xorg.libXdamage
   ] ++ optionals enableCredentialStorage [
     libsecret
   ] ++ (if stdenv.isDarwin then [

From 95ad9695a8b1b309f847175c5167daa19cc620a5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 9 May 2018 03:58:06 +0200
Subject: [PATCH 1375/3370] =?UTF-8?q?librsvg:=202.42.3=20=E2=86=92=202.42.?=
 =?UTF-8?q?4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../development/libraries/librsvg/default.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index dfd45f8e4ff2..76b7e7ccaee9 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -5,17 +5,17 @@
 
 let
   pname = "librsvg";
-  version = "2.42.3";
+  version = "2.42.4";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0mz6rdxpnnjnk15nahlwpa2gba0ws1hs2dnyk1agqw5ip522qkvh";
+    sha256 = "1qsd0j7s97ab5fzy5b5gix5b7hbw57cr46ia8pkcrr4ylsi80li2";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "installedTests" ];
 
   buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ];
 
@@ -26,8 +26,17 @@ stdenv.mkDerivation rec {
       ApplicationServices
     ]);
 
-  configureFlags = [ "--enable-introspection" "--enable-vala" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+  configureFlags = [
+    "--enable-introspection"
+    "--enable-vala"
+    "--enable-installed-tests"
+    "--enable-always-build-tests"
+  ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
+
+  makeFlags = [
+    "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG"
+    "installed_testdir=$(installedTests)/libexec/installed-tests/RSVG"
+  ];
 
   NIX_CFLAGS_COMPILE
     = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo";

From 33bc4a7b3bf25caa4f2d16da2ced4d80b4724189 Mon Sep 17 00:00:00 2001
From: Jack Kelly <jack@jackkelly.name>
Date: Wed, 9 May 2018 12:05:26 +1000
Subject: [PATCH 1376/3370] haskellPackages.blank-canvas_0_6_2: dontCheck

Same reason as 2d01bb7f6a5ab80fa7e7f03559e082ba42140db6, but for the
specific-version package.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index acbcb1320e61..9f6959542dfb 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -502,6 +502,7 @@ self: super: builtins.intersectAttrs super {
 
   # Tests require a browser: https://github.com/ku-fpg/blank-canvas/issues/73
   blank-canvas = dontCheck super.blank-canvas;
+  blank-canvas_0_6_2 = dontCheck super.blank-canvas_0_6_2;
 
   # cabal2nix generates a dependency on base-compat, which is the wrong version
   base-compat-batteries = super.base-compat-batteries.override {

From f6e061f62f63028959f0921963c4e6738db5662f Mon Sep 17 00:00:00 2001
From: Nathan Smyth <nathan.smyth@mongodb.com>
Date: Wed, 9 May 2018 12:14:37 +1000
Subject: [PATCH 1377/3370] mongodb-compass: init at 1.13.1

---
 pkgs/tools/misc/mongodb-compass/default.nix | 86 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 88 insertions(+)
 create mode 100644 pkgs/tools/misc/mongodb-compass/default.nix

diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix
new file mode 100644
index 000000000000..f8475ee2e0e0
--- /dev/null
+++ b/pkgs/tools/misc/mongodb-compass/default.nix
@@ -0,0 +1,86 @@
+{ stdenv, fetchurl, dpkg
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
+, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }:
+
+let
+
+  version = "1.13.1";
+
+  rpath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    atk
+    cairo
+    cups
+    curl
+    dbus
+    expat
+    fontconfig
+    freetype
+    glib
+    gnome2.GConf
+    gnome2.gdk_pixbuf
+    gnome2.gtk
+    gnome2.pango
+    libnotify
+    libxcb
+    nspr
+    nss
+    stdenv.cc.cc
+    systemd
+
+    xorg.libxkbfile
+    xorg.libX11
+    xorg.libXcomposite
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXext
+    xorg.libXfixes
+    xorg.libXi
+    xorg.libXrandr
+    xorg.libXrender
+    xorg.libXtst
+    xorg.libXScrnSaver
+  ] + ":${stdenv.cc.cc.lib}/lib64";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb";
+        sha256 = "0x23jshnr0rafm5sn2vhq2y2gryg8mksahzyv5fszblgaxay234p";
+      }
+    else
+      throw "MongoDB compass is not supported on ${stdenv.system}";
+
+in stdenv.mkDerivation {
+  name = "mongodb-compass-${version}";
+
+  inherit src;
+
+  buildInputs = [ dpkg ];
+  unpackPhase = "true";
+
+  buildCommand = ''
+    IFS=$'\n'
+    dpkg -x $src $out
+    cp -av $out/usr/* $out
+    rm -rf $out/share/lintian
+    #The node_modules are bringing in non-linux files/dependencies
+    find $out -name "*.app" -exec rm -rf {} \; || true
+    find $out -name "*.dll" -delete
+    find $out -name "*.exe" -delete
+    # Otherwise it looks "suspicious"
+    chmod -R g-w $out
+    for file in `find $out -type f -perm /0111 -o -name \*.so\*`; do
+      echo "Manipulating file: $file"
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+      patchelf --set-rpath ${rpath}:$out/share/mongodb-compass "$file" || true
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The GUI for MongoDB";
+    homepage = https://www.mongodb.com/products/compass;
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 719a5c66db7f..e76826407f63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1420,6 +1420,8 @@ with pkgs;
 
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
+  mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
+  
   mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
 
   mozlz4a = callPackage ../tools/compression/mozlz4a {

From b6f3fcf1405415dd290f23f955568ab290e8de2f Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Tue, 8 May 2018 20:03:14 +0200
Subject: [PATCH 1378/3370] multibootusb: init at 9.2.0

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

diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix
new file mode 100644
index 000000000000..02541842c36e
--- /dev/null
+++ b/pkgs/applications/misc/multibootusb/default.nix
@@ -0,0 +1,59 @@
+{ lib, python36Packages, fetchFromGitHub, libxcb, mtools, p7zip, parted, procps, utillinux, qt5 }:
+python36Packages.buildPythonApplication rec {
+  pname = "multibootusb";
+  name = "${pname}-${version}";
+  version = "9.2.0";
+
+  buildInputs = [
+    python36Packages.dbus-python
+    python36Packages.pyqt5
+    python36Packages.pytest-shutil
+    python36Packages.python
+    python36Packages.pyudev
+    python36Packages.six
+    libxcb
+    mtools
+    p7zip
+    parted
+    procps
+    qt5.full
+    utillinux
+  ];
+
+  src = fetchFromGitHub {
+    owner = "mbusb";
+    repo = pname;
+    rev = "v${version}";
+
+    sha256 = "0wlan0cp6c2i0nahixgpmkm0h4n518gj8rc515d579pqqp91p2h3";
+  };
+
+  # Skip the fixup stage where stuff is shrinked (can't shrink text files)
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    share="$out/share/${pname}"
+    mkdir -p "$share"
+    cp -r data "$share/data"
+    cp -r scripts "$share/scripts"
+    cp "${pname}" "$share/${pname}"
+
+    mkdir "$out/bin"
+    cat > "$out/bin/${pname}" <<EOF
+      #!/bin/sh
+      cd "$share"
+      export PYTHONPATH="$PYTHONPATH:$share"
+      export PATH="$PATH:${parted}/bin:${procps}/bin"
+
+      "${python36Packages.python}/bin/python" "${pname}"
+    EOF
+    chmod +x "$out/bin/${pname}"
+  '';
+
+  meta = with lib; {
+    description = "Multiboot USB creator for Linux live disks";
+    homepage = http://multibootusb.org/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ jD91mZM2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfaa..c2708ef7bfb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16094,6 +16094,8 @@ with pkgs;
 
   moe =  callPackage ../applications/editors/moe { };
 
+  multibootusb = callPackage ../applications/misc/multibootusb {};
+
   praat = callPackage ../applications/audio/praat { };
 
   quvi = callPackage ../applications/video/quvi/tool.nix {

From 444d43de3f5719c6d632893fb55179f8a4e756d6 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Wed, 9 May 2018 00:40:32 -0400
Subject: [PATCH 1379/3370] twine: update 1.9.1 -> 1.11.0

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

diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix
index 63f8c3b90554..9cb3a09d363e 100644
--- a/pkgs/development/python-modules/twine/default.nix
+++ b/pkgs/development/python-modules/twine/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "twine";
-  version = "1.9.1";
+  version = "1.11.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "caa45b7987fc96321258cd7668e3be2ff34064f5c66d2d975b641adca659c1ab";
+    sha256 = "09cz9v63f8mrs4znbjapjj2z3wdfryq8q364zm0wzjhbzzcs9n9g";
   };
 
   propagatedBuildInputs = [ pkginfo requests requests_toolbelt tqdm pyblake2 ];

From ab613b933671e2d4bbdfeda81ad8356ea3a88152 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 9 May 2018 14:31:26 +0900
Subject: [PATCH 1380/3370] wireshark: run binary from nix-shell

when in a shell, export variable WIRESHARK_RUN_FROM_BUILD_DIRECTORY to be able to run the newly built wireshark
else one get:
./build/run/wireshark: error while loading shared libraries: libwscodecs.so.0: cannot open shared object file: No such file or directory

see https://github.com/NixOS/nixpkgs/issues/29638
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index d8ff5f3100ac..8c745a4aa3f8 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -82,6 +82,11 @@ in stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
+  shellHook = ''
+    # to be able to run the resulting binary
+    export WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://www.wireshark.org/;
     description = "Powerful network protocol analyzer";

From 1276e82c2ec22fc17c14f6d1a5933acf87320e7b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 2 May 2018 15:14:22 +0000
Subject: [PATCH 1381/3370] coqPackages.dpdgraph: init at 0.6.3 for Coq 8.8

---
 pkgs/development/coq-modules/dpdgraph/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix
index 390ced8fdad3..5b9437e7c279 100644
--- a/pkgs/development/coq-modules/dpdgraph/default.nix
+++ b/pkgs/development/coq-modules/dpdgraph/default.nix
@@ -1,6 +1,11 @@
 { stdenv, fetchFromGitHub, autoreconfHook, coq, ocamlPackages }:
 
 let params = {
+  "8.8" = {
+    version = "0.6.3";
+    rev = "0acbd0a594c7e927574d5f212cc73a486b5305d2";
+    sha256 = "0c95b0bz2kjm6swr5na4gs06lxxywradszxbr5ldh2zx02r3f3rx";
+  };
   "8.7" = {
     version = "0.6.2";
     rev = "d76ddde37d918569945774733b7997e8b24daf51";

From 97263dfb928646b40a9a1407e79b9fb257df33fb Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Wed, 9 May 2018 09:59:52 +0300
Subject: [PATCH 1382/3370] bat: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 5516f4a26a3d..b869f1e634c5 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -2,24 +2,24 @@
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "bat";
     rev    = "v${version}";
-    sha256 = "0qbjkrakcpvnzzljifykw88g0qmmk60id23sjvhp4md54h4xg29p";
+    sha256 = "15d7i0iy5lks3jg9js6n6fy4xanjk76fpryl2kq88kdkq67hpzfp";
   };
 
-  cargoSha256 = "07r10wwxv8svrw94djl092zj512868izlxldsiljfj34230abl02";
+  cargoSha256 = "179a7abhzpxjp3cc820jzxg0qk1fiv9rkpazwnzhkjl8yd7b7qi3";
 
-  buildInputs = with pkgs; [ openssl pkgconfig cmake zlib file perl curl ];
+  buildInputs = with pkgs; [ pkgconfig cmake zlib file perl curl ];
 
   meta = with stdenv.lib; {
     description = "A cat(1) clone with syntax highlighting and Git integration";
     homepage    = https://github.com/sharkdp/bat;
-    license     = licenses.mit;
-    maintainers = [];
+    license     = with licenses; [ asl20 /* or */ mit ];
+    maintainers = with maintainers; [ dywedir ];
     platforms   = platforms.linux;
   };
 }

From e203a9a553fb4e1218ca15a57a0b7944abeacbca Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 02:51:59 -0500
Subject: [PATCH 1383/3370] pthread-w32: add missing args

Fixes #40207
---
 pkgs/os-specific/windows/pthread-w32/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/windows/pthread-w32/default.nix b/pkgs/os-specific/windows/pthread-w32/default.nix
index f0b6852d5bf9..ef42dadc2973 100644
--- a/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/pkgs/os-specific/windows/pthread-w32/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, mingw_headers }:
+{ fetchurl, stdenv, mingw_header, hostPlatform, buildPlatform }:
 
 # This file is tweaked for cross-compilation only.
 assert hostPlatform != buildPlatform;

From 9b7d3f10e43bbad23730467ceb37acd7f0891074 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 18 Apr 2018 18:53:42 -0400
Subject: [PATCH 1384/3370] graphicsmagick-imagemagick-compat: init at 1.3.28

---
 .../graphics/graphicsmagick/compat.nix        | 37 +++++++++++++++++++
 .../graphics/graphicsmagick/default.nix       |  5 +--
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/graphics/graphicsmagick/compat.nix

diff --git a/pkgs/applications/graphics/graphicsmagick/compat.nix b/pkgs/applications/graphics/graphicsmagick/compat.nix
new file mode 100644
index 000000000000..bd1ce2ed893a
--- /dev/null
+++ b/pkgs/applications/graphics/graphicsmagick/compat.nix
@@ -0,0 +1,37 @@
+{ stdenv, graphicsmagick }:
+
+stdenv.mkDerivation rec {
+  name = "graphicsmagick-imagemagick-compat-${version}";
+  inherit (graphicsmagick) version;
+
+  unpackPhase = "true";
+  buildPhase = "true";
+
+  utils = [
+    "composite"
+    "conjure"
+    "convert"
+    "identify"
+    "mogrify"
+    "montage"
+    "animate"
+    "display"
+    "import"
+  ];
+
+  # TODO: symlink libraries?
+  installPhase = ''
+    mkdir -p "$out"/bin
+    mkdir -p "$out"/share/man/man1
+    for util in ''${utils[@]}; do
+      ln -s ${graphicsmagick}/bin/gm "$out/bin/$util"
+      ln -s ${graphicsmagick}/share/man/man1/gm.1.gz "$out/share/man/man1/$util.1.gz"
+    done
+  '';
+
+  meta = {
+    description = "ImageMagick interface for GraphicsMagick";
+    license = stdenv.lib.licenses.free;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix
index 4258d91b42af..872afb39ec6f 100644
--- a/pkgs/applications/graphics/graphicsmagick/default.nix
+++ b/pkgs/applications/graphics/graphicsmagick/default.nix
@@ -2,10 +2,9 @@
 , libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11
 , libwebp, quantumdepth ? 8, fixDarwinDylibNames }:
 
-let version = "1.3.29"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "graphicsmagick-${version}";
+  version = "1.3.29";
 
   src = fetchurl {
     url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfaa..1079126521e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16142,6 +16142,8 @@ with pkgs;
   graphicsmagick = callPackage ../applications/graphics/graphicsmagick { };
   graphicsmagick_q16 = callPackage ../applications/graphics/graphicsmagick { quantumdepth = 16; };
 
+  graphicsmagick-imagemagick-compat = callPackage ../applications/graphics/graphicsmagick/compat.nix { };
+
   grisbi = callPackage ../applications/office/grisbi { gtk = gtk2; };
 
   gtkpod = callPackage ../applications/audio/gtkpod { };

From 0d78386e21d0dcb72aeaac5cedac65b6170d9c84 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 18 Apr 2018 19:02:46 -0400
Subject: [PATCH 1385/3370] rivet: switch to graphicsmagick

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1079126521e8..3f1adea55f43 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20540,7 +20540,9 @@ with pkgs;
 
   pythia = callPackage ../development/libraries/physics/pythia { };
 
-  rivet = callPackage ../development/libraries/physics/rivet { };
+  rivet = callPackage ../development/libraries/physics/rivet {
+    imagemagick = graphicsmagick-imagemagick-compat;
+  };
 
   thepeg = callPackage ../development/libraries/physics/thepeg { };
 

From 1d55c211cbc494d3882fc2f6819a961a3dca0465 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 03:57:38 -0500
Subject: [PATCH 1386/3370] kpmcore: fix build

Fixes #39834

Fallout from moving "eject" command to unixtools.
---
 pkgs/development/libraries/kpmcore/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix
index 2a2f0c79490e..c6c3ba53d2c3 100644
--- a/pkgs/development/libraries/kpmcore/default.nix
+++ b/pkgs/development/libraries/kpmcore/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, fetchurl, extra-cmake-modules, pkgconfig
 , qtbase, kdeFrameworks
-, eject, libatasmart, parted }:
+, libatasmart, parted
+, utillinux }:
 
 let
   pname = "kpmcore";
@@ -16,11 +17,12 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     qtbase
-    eject # this is to get libblkid
     libatasmart
     parted # we only need the library
 
     kdeFrameworks.kio
+
+    utillinux # needs blkid (note that this is not provided by utillinux-compat)
   ];
   nativeBuildInputs = [ extra-cmake-modules ];
   enableParallelBuilding = true;

From f8f65f837f130ca68c1caf068a05d13eb1219095 Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Wed, 9 May 2018 11:20:38 +0200
Subject: [PATCH 1387/3370] monero: fix daemon crash

---
 pkgs/applications/altcoins/monero/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 8be24522f564..cbba1ecba145 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, git
+{ stdenv, fetchFromGitHub, fetchpatch
+, cmake, pkgconfig, git
 , boost, miniupnpc, openssl, unbound, cppzmq
 , zeromq, pcsclite, readline
 , CoreData, IOKit, PCSC
@@ -21,6 +22,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig git ];
 
+  patches = [
+    # fix daemon crash, remove with 0.12.1.0 update
+    (fetchpatch {
+      url    = "https://github.com/monero-project/monero/commit/08343ab.diff";
+      sha256 = "0f1snrl2mk2czwk1ysympzr8ismjx39fcqgy13276vcmw0cfqi83";
+    })
+  ];
+
   buildInputs = [
     boost miniupnpc openssl unbound
     cppzmq zeromq pcsclite readline

From 1f2647aad5ab9c50e3a6c84a23a57da23b98c1b6 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 9 May 2018 11:40:10 +0200
Subject: [PATCH 1388/3370] grafana: 5.1.1 -> 5.1.2

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index bcae836cbf21..f9fb4efa04be 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.1.1";
+  version = "5.1.2";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0b8i293bfxyblfqwxpb1dkgva95f0bljpvp27j4l4hmjm2g8bpd9";
+    sha256 = "0iw0mr6m99z6vy9mz9fdhmn4fxi359n3ns71bm5a71np8lf4qs36";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "0kyfyxcj2yy9v1in6h6kh6sl5p7m03g643qpjriplwwa93bdmk8k";
+    sha256 = "18bqmvyfjkvkrdbxa989aa6c7ri3b4wdb7ai543hiaz00s9mnpzm";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From dd32c31605cd635f56030f0392f69044ad657cab Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 9 May 2018 13:00:08 +0300
Subject: [PATCH 1389/3370] jetbrains.idea-community: 2018.1.2 -> 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 98172ce1905b..fa9985a665cc 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -276,12 +276,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "0s5vbdg8ajaac1jqh8ypy20fp061aqjhiyi20kdcsb0856nw5frg"; /* updated by script */
+      sha256 = "0ws5s8bvjpz60pdyak3vb22x27qi00ajxx18wia1hql8831gsk3m"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From b184f60d7a65d0a8fa1091e9900f1c2e1eb8f7d7 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 9 May 2018 13:00:26 +0300
Subject: [PATCH 1390/3370] jetbrains.idea-ultimate: 2018.1.2 -> 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index fa9985a665cc..f81d4c544b75 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -289,12 +289,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "1rrqc9sj0ibkkj627hzwdh7l5z8zm6cmaz0yzx6xhyi989ivfy2r"; /* updated by script */
+      sha256 = "14h71x3jidwiwv73g48f6bd0y4p3s33jb4wdr5grdhm677pqb702"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";

From 494188557bda81c6e4362faa157c3e487af8b7e1 Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 9 May 2018 13:00:48 +0300
Subject: [PATCH 1391/3370] jetbrains.ruby-mine: 2018.1.1 -> 2018.1.2

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index f81d4c544b75..3f5ca9342216 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -354,12 +354,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2018.1.1"; /* updated by script */
+    version = "2018.1.2"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "1nh2m10ikwl85n66aspkmgxmbk98amhlgj2xl2sasjfwn5pn1wmf"; /* updated by script */
+      sha256 = "0bnzn811rmgn0kig3mzbwgx85490dqg4sg3pmmmk20n8hcph8zca"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "rm2018.1";

From 27dc2a68836d33263ae9b1b11e57f915c2922a8e Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 9 May 2018 13:01:08 +0300
Subject: [PATCH 1392/3370] jetbrains.webstorm: 2018.1.2 -> 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 3f5ca9342216..2de973d41f66 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -367,12 +367,12 @@ in
 
   webstorm = buildWebStorm rec {
     name = "webstorm-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     description = "Professional IDE for Web and JavaScript development";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz";
-      sha256 = "14fmny9i0cgkplna0li5q2c5wiqk71k6c5h480ia85jaqi2vm8jh"; /* updated by script */
+      sha256 = "03nhs4vmqbm5s4ykjz475nvcbwvp2hb0bq5ijfjxwayj3jgv0zbm"; /* updated by script */
     };
     wmClass = "jetbrains-webstorm";
     update-channel = "WS_Release";

From 844698c436d8857fe07cd95a89e967506d9cf98b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 9 May 2018 12:38:09 +0200
Subject: [PATCH 1393/3370] nixos/tests/statsd: fix non-deterministic failure

Test failed sometimes because the service took more time to start.
---
 nixos/tests/statsd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix
index a9d7dc61cb60..c71949249a4b 100644
--- a/nixos/tests/statsd.nix
+++ b/nixos/tests/statsd.nix
@@ -35,6 +35,6 @@ with lib;
   testScript = ''
     $statsd1->start();
     $statsd1->waitForUnit("statsd.service");
-    $statsd1->succeed("nc -z 127.0.0.1 8126");
+    $statsd1->waitUntilSucceeds("nc -z 127.0.0.1 8126");
   '';
 })

From 04703916cf1d962cd932d49f53a0ea0b116b4257 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Wed, 9 May 2018 21:14:44 +1000
Subject: [PATCH 1394/3370] nix-pin: 0.3.0 -> 0.3.1

---
 pkgs/tools/package-management/nix-pin/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix-pin/default.nix b/pkgs/tools/package-management/nix-pin/default.nix
index 6f109cd9f413..893429537050 100644
--- a/pkgs/tools/package-management/nix-pin/default.nix
+++ b/pkgs/tools/package-management/nix-pin/default.nix
@@ -1,15 +1,15 @@
 { lib, pkgs, stdenv, fetchFromGitHub, mypy, python3, nix, git, makeWrapper }:
 let self = stdenv.mkDerivation rec {
   name = "nix-pin-${version}";
-  version = "0.3.0";
+  version = "0.3.1";
   src = fetchFromGitHub {
     owner = "timbertson";
     repo = "nix-pin";
-    rev = "version-0.3.0";
-    sha256 = "1kq50v8m8y1wji63b7y3wh6nv3ahvdxvvbsb07day2zzf5ysy8kj";
+    rev = "version-0.3.1";
+    sha256 = "1sldbrz33wz30d3vv3d2clyqyd6x1y6h6xjz1xv55fa97ig1h481";
   };
   buildInputs = [ python3 mypy makeWrapper ];
-  buildPhase = ''
+  checkPhase = ''
     mypy bin/*
   '';
   installPhase = ''

From f0353d417f87caf532a70100f74fba76e886d7b5 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Tue, 8 May 2018 13:32:06 +0200
Subject: [PATCH 1395/3370] squashfsTools: update package metadata

I am adding myself as maintainer here for lack of a better candidate,
but I am not experienced with Nix, and I am not a squashfs expert
either.
---
 maintainers/maintainer-list.nix             | 5 +++++
 pkgs/tools/filesystems/squashfs/default.nix | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e31b84b03b0b..4683a02e123e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3234,6 +3234,11 @@
     github = "rushmorem";
     name = "Rushmore Mushambi";
   };
+  ruuda = {
+    email = "dev+nix@veniogames.com";
+    github = "ruuda";
+    name = "Ruud van Asseldonk";
+  };
   rvl = {
     email = "dev+nix@rodney.id.au";
     github = "rvl";
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index 08951113b3b7..a7f4e85eb34f 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -38,5 +38,7 @@ stdenv.mkDerivation rec {
     homepage = http://squashfs.sourceforge.net/;
     description = "Tool for creating and unpacking squashfs filesystems";
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [ ruuda ];
   };
 }

From 77a6cbb1c1feeb6b6424d35319ac6226c780b34a Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Wed, 9 May 2018 14:58:29 +0200
Subject: [PATCH 1396/3370] zsh: move setEnvironment stuff to zprofile

---
 nixos/modules/programs/zsh/zsh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index f689250dc61f..b88f54678ee1 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -108,8 +108,6 @@ in
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
         export __ETC_ZSHENV_SOURCED=1
 
-        ${config.system.build.setEnvironment.text}
-
         ${cfge.shellInit}
 
         ${cfg.shellInit}
@@ -129,6 +127,8 @@ in
         if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
         __ETC_ZPROFILE_SOURCED=1
 
+        ${config.system.build.setEnvironment.text}
+
         ${cfge.loginShellInit}
 
         ${cfg.loginShellInit}

From 4a2bf9c4ec6477c4ca4440c29115e227b5092c89 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 6 May 2018 15:19:41 -0400
Subject: [PATCH 1397/3370] input-utils: init at 1.3

---
 .../os-specific/linux/input-utils/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/os-specific/linux/input-utils/default.nix

diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix
new file mode 100644
index 000000000000..cd0fc01384bc
--- /dev/null
+++ b/pkgs/os-specific/linux/input-utils/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, linuxHeaders }:
+
+stdenv.mkDerivation rec {
+  name = "input-utils-${version}";
+  version = "1.3";
+  
+  src = fetchurl {
+    url = "https://www.kraxel.org/releases/input/input-${version}.tar.gz";
+    sha256 = "11w0pp20knx6qpgzmawdbk1nj2z3fzp8yd6nag6s8bcga16w6hli";
+  };
+
+  prePatch = ''
+    # Use proper include path for kernel include files.
+    substituteInPlace ./name.sh --replace "/usr/include/linux/" "${linuxHeaders}/include/linux/"
+    substituteInPlace ./lirc.sh --replace "/usr/include/linux/" "${linuxHeaders}/include/linux/"
+  '';
+
+  makeFlags = [
+    "prefix=$(out)"
+    "STRIP=-s"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Input layer utilities, includes lsinput";
+    homepage    = https://www.kraxel.org/blog/linux/input/;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ samueldr ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567167fc4605..45ca547b7bb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3047,6 +3047,8 @@ with pkgs;
 
   innoextract = callPackage ../tools/archivers/innoextract { };
 
+  input-utils = callPackage ../os-specific/linux/input-utils { };
+
   intecture-agent = callPackage ../tools/admin/intecture/agent.nix { };
 
   intecture-auth = callPackage ../tools/admin/intecture/auth.nix { };

From 59beaf7fa22cf2fe979e9a8fee17335ec34e3c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 May 2018 13:59:10 +0200
Subject: [PATCH 1398/3370] python: 2.7.14 -> 2.7.15 (bugfix + security)

Fixes CVE-2018-1000030, /cc #38993.

The ncurses patch no longer applied, and it appears the problems have
been resolved upstream https://bugs.python.org/issue25720
https://github.com/python/cpython/commit/6ba0b583d67
---
 .../python/cpython/2.7/default.nix            |   6 +-
 .../cpython/2.7/properly-detect-curses.patch  | 116 ------------------
 2 files changed, 2 insertions(+), 120 deletions(-)
 delete mode 100644 pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 9d89e96383f5..ed1bc9dc817b 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -31,7 +31,7 @@ with stdenv.lib;
 
 let
   majorVersion = "2.7";
-  minorVersion = "14";
+  minorVersion = "15";
   minorVersionSuffix = "";
   pythonVersion = majorVersion;
   version = "${majorVersion}.${minorVersion}${minorVersionSuffix}";
@@ -40,7 +40,7 @@ let
 
   src = fetchurl {
     url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz";
-    sha256 = "0rka541ys16jwzcnnvjp2v12m4cwgd2jp6wj4kj511p715pb5zvi";
+    sha256 = "0x2mvz9dp11wj7p5ccvmk9s0hzjk2fa1m462p395l4r6bfnb3n92";
   };
 
   hasDistutilsCxxPatch = !(stdenv.cc.isGNU or false);
@@ -58,8 +58,6 @@ let
       # if DETERMINISTIC_BUILD env var is set
       ./deterministic-build.patch
 
-      ./properly-detect-curses.patch
-
     ] ++ optionals (x11Support && stdenv.isDarwin) [
       ./use-correct-tcl-tk-on-darwin.patch
     ] ++ optionals stdenv.isLinux [
diff --git a/pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch b/pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch
deleted file mode 100644
index e2640bab0e9a..000000000000
--- a/pkgs/development/interpreters/python/cpython/2.7/properly-detect-curses.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From 6dc83db69b5e29d25ba6d73646ea2e9a1097848a Mon Sep 17 00:00:00 2001
-From: Roumen Petrov <local@example.net>
-Date: Sun, 19 Feb 2012 16:13:24 +0200
-Subject: [PATCH] CROSS-properly detect WINDOW _flags for different ncurses versions
-
----
- Include/py_curses.h |    5 +++++
- configure.ac        |   40 ++++++++++++++++++++++++++++++++++++++--
- pyconfig.h.in       |    6 ++++++
- 3 files changed, 49 insertions(+), 2 deletions(-)
-
-diff --git a/Include/py_curses.h b/Include/py_curses.h
-index f2c08f6..a9b5260 100644
---- a/Include/py_curses.h
-+++ b/Include/py_curses.h
-@@ -14,7 +14,9 @@
- /* the following define is necessary for OS X 10.6; without it, the
-    Apple-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
-    can't get at the WINDOW flags field. */
-+/* NOTE configure check if ncurses require such definition
- #define NCURSES_OPAQUE 0
-+*/
- #endif /* __APPLE__ */
- 
- #ifdef __FreeBSD__
-@@ -57,9 +59,12 @@
- #ifdef HAVE_NCURSES_H
- /* configure was checking <curses.h>, but we will
-    use <ncurses.h>, which has all these features. */
-+/* NOTE configure check for existence of flags
-+ * Also flags are visible only if WINDOW structure is not opaque
- #ifndef WINDOW_HAS_FLAGS
- #define WINDOW_HAS_FLAGS 1
- #endif
-+*/
- #ifndef MVWDELCH_IS_EXPRESSION
- #define MVWDELCH_IS_EXPRESSION 1
- #endif
-diff --git a/configure.ac b/configure.ac
-index 0a3a186..75f5142 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -4150,15 +4150,51 @@ then
- fi
- 
- AC_MSG_CHECKING(whether WINDOW has _flags)
--AC_CACHE_VAL(ac_cv_window_has_flags,
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <curses.h>]], [[
-   WINDOW *w;
-   w->_flags = 0;
- ]])],
- [ac_cv_window_has_flags=yes],
--[ac_cv_window_has_flags=no]))
-+[ac_cv_window_has_flags=no])
- AC_MSG_RESULT($ac_cv_window_has_flags)
- 
-+py_curses_window_is_opaque=no
-+if test no = $ac_cv_window_has_flags; then
-+  AC_MSG_CHECKING([whether WINDOW has _flags in non-opaque structure])
-+  AC_COMPILE_IFELSE([
-+  AC_LANG_PROGRAM([[
-+    #define NCURSES_OPAQUE 0
-+    #include <curses.h>
-+  ]],[[
-+    WINDOW *w;
-+    w->_flags = 0;
-+  ]])],
-+  [py_curses_window_is_opaque=yes])
-+  AC_MSG_RESULT([$py_curses_window_is_opaque])
-+fi
-+if test yes = $py_curses_window_is_opaque; then
-+  ac_cv_window_has_flags=yes
-+  AC_DEFINE([NCURSES_OPAQUE], [0], [Define to 0 if you have WINDOW _flags in non-opaque structure.])
-+fi
-+
-+py_curses_window_is_internal=no
-+if test no = $ac_cv_window_has_flags; then
-+  AC_MSG_CHECKING([whether WINDOW has _flags as internal structure])
-+  AC_COMPILE_IFELSE([
-+  AC_LANG_PROGRAM([[
-+    #define NCURSES_INTERNALS 1
-+    #include <curses.h>
-+  ]],[[
-+    WINDOW *w;
-+    w->_flags = 0;
-+  ]])],
-+  [py_curses_window_is_internal=yes])
-+  AC_MSG_RESULT([$py_curses_window_is_internal])
-+fi
-+if test yes = $py_curses_window_is_internal; then
-+  ac_cv_window_has_flags=yes
-+  AC_DEFINE([NCURSES_INTERNALS], [1], [Define to 1 if you have WINDOW _flags as internal structure.])
-+fi
- 
- if test "$ac_cv_window_has_flags" = yes
- then
-diff --git a/pyconfig.h.in b/pyconfig.h.in
-index 3ca3a4f..484c817 100644
---- a/pyconfig.h.in
-+++ b/pyconfig.h.in
-@@ -1130,6 +1130,12 @@
- /* Define if mvwdelch in curses.h is an expression. */
- #undef MVWDELCH_IS_EXPRESSION
- 
-+/* Define to 1 if you have WINDOW _flags as internal structure. */
-+#undef NCURSES_INTERNALS
-+
-+/* Define to 0 if you have WINDOW _flags in non-opaque structure. */
-+#undef NCURSES_OPAQUE
-+
- /* Define to the address where bug reports for this package should be sent. */
- #undef PACKAGE_BUGREPORT
- 
--- 
-1.6.4
-

From d0cfb273f0ee499261746a414c653f9a82dcd73f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 May 2018 06:41:45 +0000
Subject: [PATCH 1399/3370] ocamlPackages.ocaml_pcre: cleanup

---
 pkgs/development/ocaml-modules/pcre/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index e5533d3ad4be..fb3b67b03b78 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -1,21 +1,19 @@
-{stdenv, buildOcaml, fetchurl, pcre, ocaml, findlib}:
+{ stdenv, fetchurl, pcre, ocaml, findlib, ocamlbuild }:
 
-buildOcaml {
-  name = "pcre";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-pcre-${version}";
   version = "7.2.3";
 
   src = fetchurl {
-    url = "https://github.com/mmottl/pcre-ocaml/releases/download/v7.2.3/pcre-ocaml-7.2.3.tar.gz";
+    url = "https://github.com/mmottl/pcre-ocaml/releases/download/v${version}/pcre-ocaml-${version}.tar.gz";
     sha256 = "0rj6dw79px4sj2kq0iss2nzq3rnsn9wivvc0f44wa1mppr6njfb3";
   };
 
-  buildInputs = [ocaml findlib];
+  buildInputs = [ ocaml findlib ocamlbuild ];
   propagatedBuildInputs = [pcre];
 
   createFindlibDestdir = true;
 
-  hasSharedObjects = true;
-
   configurePhase = "true";	# Skip configure phase
 
   meta = with stdenv.lib; {

From 4a0c93f078f6fd74aec90d6a0fb8feb4ec1446ca Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 May 2018 15:56:27 +0000
Subject: [PATCH 1400/3370] =?UTF-8?q?ocamlPackages.ocaml=5Fhttp:=20disable?=
 =?UTF-8?q?=20on=20OCaml=20=E2=89=A5=204.06?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix
index f25a6f97b392..b9b530ac599e 100644
--- a/pkgs/development/ocaml-modules/http/default.nix
+++ b/pkgs/development/ocaml-modules/http/default.nix
@@ -1,5 +1,9 @@
 {stdenv, fetchurl, ocaml_pcre, ocamlnet, ocaml, findlib, camlp4}:
 
+if stdenv.lib.versionAtLeast ocaml.version "4.06"
+then throw "ocaml-http is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation {
   name = "ocaml-http-0.1.5";
 

From 9c6be76276f0f318ccdd48c6f551a54977e5a4a9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 May 2018 16:38:47 +0000
Subject: [PATCH 1401/3370] ocamlPackages.gapi_ocaml: disable for OCaml < 4.02

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

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index b4e06d3c999d..a7c32a069fc8 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
 
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "gapi-ocaml is not available for OCaml ${ocaml.version}"
+else
+
 stdenv.mkDerivation rec {
   name = "gapi-ocaml-${version}";
   version = "0.3.6";

From ca7eb9901ee75b7af6546095bba756179dce2905 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 9 May 2018 05:59:18 +0000
Subject: [PATCH 1402/3370] ocamlPackages.ocamlnet: 4.1.5 -> 4.1.6

---
 pkgs/development/ocaml-modules/ocamlnet/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 492bb9c67cdf..33f328792110 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -1,23 +1,17 @@
 { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip
-, gnutls, nettle, fetchpatch
+, gnutls, nettle
 }:
 
-let version = "4.1.5"; in
+let version = "4.1.6"; in
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-ocamlnet-${version}";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
-    sha256 = "1ppcd2zjhj6s3ib9q8dngnr53qlmkhvv7a8hzp88r79k6jygn4cm";
+    sha256 = "1j0k0drybcjpysvs8xpq3cnpg3wqk6d5sy7y1h5rq8jk7hrirf0k";
   };
 
-  patches = [ (fetchpatch {
-      url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocamlnet/ocamlnet.4.1.5/files/netgzip.patch";
-      sha256 = "1say7zzgk24qcy9m91gcfgvz4fv7nksx4j5qnbxyq8wqw0g88ba0";
-    })
-  ];
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls nettle ];
 

From 0198bcc1eb018c2891ca89b902ddf950cd048393 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Wed, 9 May 2018 13:21:38 -0400
Subject: [PATCH 1403/3370] gnucash: add upgrade instructions to NixOS release
 notes

---
 nixos/doc/manual/release-notes/rl-1809.xml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 01b5e9d77460..e10827d5db22 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -107,6 +107,17 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      a stable URL for Nixpkgs to use to package this proprietary software.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <literal>gnucash</literal> has changed from version 2.4 to 3.x.
+     If you've been using <literal>gnucash</literal> (version 2.4) instead of
+     <literal>gnucash26</literal> (version 2.6) you must open your Gnucash 
+     data file(s) with <literal>gnucash26</literal> and then save them to
+     upgrade the file format. Then you may use your data file(s) with
+     Gnucash 3.x. See the upgrade <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.
+     Gnucash 2.4 is still available under the attribute <literal>gnucash24</literal>.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 

From 8a9402c207189b3c3604c60d84f8dcbc0e1a9371 Mon Sep 17 00:00:00 2001
From: Brian Dawn <brian.t.dawn@gmail.com>
Date: Tue, 8 May 2018 13:53:23 -0500
Subject: [PATCH 1404/3370] librealsense: init at 2.11.0

---
 maintainers/maintainer-list.nix               |  5 +++
 .../libraries/librealsense/default.nix        | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/libraries/librealsense/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e31b84b03b0b..d5020b77b22d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -676,6 +676,11 @@
     github = "bramd";
     name = "Bram Duvigneau";
   };
+  brian-dawn = {
+    email = "brian.t.dawn@gmail.com";
+    github = "brian-dawn";
+    name = "Brian Dawn";
+  };
   bstrik = {
     email = "dutchman55@gmx.com";
     github = "bstrik";
diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
new file mode 100644
index 000000000000..c61000066f4d
--- /dev/null
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, cmake, libusb, ninja, pkgconfig}:
+
+stdenv.mkDerivation rec {
+  name = "librealsense-${version}";
+  version = "2.11.0";
+
+  src = fetchFromGitHub {
+    owner = "IntelRealSense";
+    repo = "librealsense";
+    rev = "v${version}";
+    sha256 = "11vzs2m6jh9v1xbffr2k541pymmih6g4w641mp8rll8qzqfh89i0";
+  };
+
+  buildInputs = [
+    libusb
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkgconfig
+  ];
+
+  cmakeFlags = [ "-DBUILD_EXAMPLES=false" ];
+
+  meta = with stdenv.lib; {
+    description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)";
+    homepage = https://github.com/IntelRealSense/librealsense;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ brian-dawn ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfaa..0a0c0302b050 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13801,6 +13801,8 @@ with pkgs;
 
   libraw1394 = callPackage ../development/libraries/libraw1394 { };
 
+  librealsense = callPackage ../development/libraries/librealsense { };
+
   libsass = callPackage ../development/libraries/libsass { };
 
   libsexy = callPackage ../development/libraries/libsexy { };

From 7a64b0726a6be48a35d71ea14d5fa643b61ce240 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 9 May 2018 14:05:29 -0400
Subject: [PATCH 1405/3370] bicgl: init at 2017-09-10

---
 .../science/biology/bicgl/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/science/biology/bicgl/default.nix

diff --git a/pkgs/development/libraries/science/biology/bicgl/default.nix b/pkgs/development/libraries/science/biology/bicgl/default.nix
new file mode 100644
index 000000000000..3c9b8f8257ce
--- /dev/null
+++ b/pkgs/development/libraries/science/biology/bicgl/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake, libminc, bicpl, freeglut, mesa_glu }:
+
+stdenv.mkDerivation rec {
+  pname = "bicgl";
+  name  = "${pname}-2017-09-10";
+
+  owner = "BIC-MNI";
+
+  src = fetchFromGitHub {
+    inherit owner;
+    repo   = pname;
+    rev    = "b7f7e52d1039d6202a93d9055f516186033656cc";
+    sha256 = "0lzirdi1mf4yl8srq7vjn746sbydz7h0wjh7wy8gycy6hq04qrg4";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libminc bicpl freeglut mesa_glu ];
+
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib" "-DBICPL_DIR=${bicpl}/lib" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/${owner}/${pname}";
+    description = "Brain Imaging Centre graphics library";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license   = licenses.free;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26f3e499eeec..d2700233f1cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8561,6 +8561,8 @@ with pkgs;
 
   bicpl = callPackage ../development/libraries/science/biology/bicpl { };
 
+  bicgl = callPackage ../development/libraries/science/biology/bicgl { };
+
   # TODO(@Ericson2314): Build bionic libc from source
   bionic = assert hostPlatform.useAndroidPrebuilt;
     androidenv.androidndkPkgs.libraries;

From 5c26dd319570ff94c73b4311007d921594675685 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 May 2018 02:30:36 +0200
Subject: [PATCH 1406/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6ab957cb8135bd5eb47a0e335db40a956ee28349.
---
 .../haskell-modules/hackage-packages.nix      | 520 +++++++++++++-----
 1 file changed, 386 insertions(+), 134 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3c6a7949df6c..bad45c3a27e7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5957,6 +5957,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Frames_0_4_0" = callPackage
+    ({ mkDerivation, base, contravariant, criterion, deepseq, directory
+     , discrimination, ghc-prim, hashable, hspec, htoml, HUnit, pipes
+     , pipes-bytestring, pipes-group, pipes-parse, pipes-safe
+     , pipes-text, pretty, primitive, readable, regex-applicative
+     , template-haskell, temporary, text, transformers
+     , unordered-containers, vector, vinyl
+     }:
+     mkDerivation {
+       pname = "Frames";
+       version = "0.4.0";
+       sha256 = "06yh8vl3s5543nxhndjd2wsbclka4in4nsbjqzbpcg9g8s8x3z20";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base contravariant deepseq discrimination ghc-prim hashable pipes
+         pipes-bytestring pipes-group pipes-parse pipes-safe pipes-text
+         primitive readable template-haskell text transformers vector vinyl
+       ];
+       testHaskellDepends = [
+         base directory hspec htoml HUnit pipes pretty regex-applicative
+         template-haskell temporary text unordered-containers vinyl
+       ];
+       benchmarkHaskellDepends = [ base criterion pipes transformers ];
+       description = "Data frames For working with tabular data files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Frank" = callPackage
     ({ mkDerivation, base, mtl, newtype, she, void }:
      mkDerivation {
@@ -16498,17 +16527,17 @@ self: {
     ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg
      , bytestring, cereal, cereal-vector, containers, data-default-class
      , diagrams-core, diagrams-lib, directory, parsec, split, text
-     , tuple, vector, xml
+     , vector, xml
      }:
      mkDerivation {
        pname = "SVGFonts";
-       version = "1.6.0.3";
-       sha256 = "11sqycvvsg9avxqh3z82x3wllhy6a9c0d36qzm2w6w4hg5iqi3xw";
+       version = "1.7";
+       sha256 = "1k9ili7l9pp5a009jh55vigb917wdnsl6iaz0ggp6d4nw1jwsg6s";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          attoparsec base blaze-markup blaze-svg bytestring cereal
          cereal-vector containers data-default-class diagrams-core
-         diagrams-lib directory parsec split text tuple vector xml
+         diagrams-lib directory parsec split text vector xml
        ];
        description = "Fonts from the SVG-Font format";
        license = stdenv.lib.licenses.bsd3;
@@ -17727,8 +17756,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "StringUtils";
-       version = "0.2.0.1";
-       sha256 = "1sxqcc17949kn9xbspyz4npbnqzsz05di22g3qdqc78b8mxi2psg";
+       version = "0.2.0.2";
+       sha256 = "1wbixjgzad3s9jj16kl0gvwg82g3hqvkag9wr5j58w98a4qyqw8i";
        libraryHaskellDepends = [ base ];
        description = "String manipulation utilities";
        license = stdenv.lib.licenses.lgpl3;
@@ -23755,8 +23784,8 @@ self: {
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.4.0";
-       sha256 = "1brpqs6xxi7vlpa7230n7910j2zq3w79kw6hfs2xi07kaz0f2lyd";
+       version = "0.2.4.1";
+       sha256 = "0fx3q5ivd942yly212k0qdrhwbjpx0y4sj1r2r9lbhxb2941rg4n";
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
@@ -31518,8 +31547,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.0.1";
-       sha256 = "1day4zpypk1jirkn0zfvmfwy0pnsvggibi9k2gk23kqnn904sv77";
+       version = "0.3.0.2";
+       sha256 = "0kfw8srq675hinf1gajkngbpx15xc5w74vvf76yarmaal1vaavm4";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -32543,7 +32572,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_2_0_0" = callPackage
+  "backprop_0_2_1_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, criterion, deepseq
      , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
      , primitive, reflection, time, transformers, type-combinators
@@ -32551,8 +32580,8 @@ self: {
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.0.0";
-       sha256 = "1h2cb3birbcgm0fyqr4i2d85dkwrpbqkd67a6imh3z9nsc7zy66y";
+       version = "0.2.1.0";
+       sha256 = "0qm352klwjv1fy2gpsr8xhd9byaydps6fwhwrr9fldmj2bn1220m";
        libraryHaskellDepends = [
          base containers deepseq microlens primitive reflection transformers
          type-combinators vector
@@ -33599,8 +33628,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.3";
-       sha256 = "0kvw69br5nrx4nnrp0r00wr55w15wq5kh68df2r89yrd8l5vp02x";
+       version = "0.1.0.4";
+       sha256 = "0n3fw4z48hz188i4f02ya2wcaicl0l5nhb2w1r8hsvvgf0cixsxl";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -39229,7 +39258,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_36_3" = callPackage
+  "brick_0_37" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -39237,8 +39266,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.36.3";
-       sha256 = "1j53pj4axgyah3qj9zkaicbccmypm8cjfrpdjzarpcnb1za9y60n";
+       version = "0.37";
+       sha256 = "1v9ydqwaq116n8f4q9ln4zf9jr28y730y7l7m1r2ipjfjassxfq2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -52146,6 +52175,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "constraint-reflection" = callPackage
+    ({ mkDerivation, base, category, constraint, reflection }:
+     mkDerivation {
+       pname = "constraint-reflection";
+       version = "0.1.0.0";
+       sha256 = "1v1m5vvicjmmz7mdp6fqf75fi2vf0hy25fyxgxpd4d7fbbyjvnh1";
+       libraryHaskellDepends = [ base category constraint reflection ];
+       description = "Constraint reflection";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "constraints" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec
      , hspec-discover, mtl, semigroups, transformers
@@ -52275,20 +52315,13 @@ self: {
      }) {};
 
   "container" = callPackage
-    ({ mkDerivation, base, containers, data-default, data-layer
-     , functor-utils, lens, lens-utils, mtl, template-haskell, text
-     , transformers, transformers-base, typelevel, vector
-     }:
+    ({ mkDerivation, base, containers, convert, lens, text }:
      mkDerivation {
        pname = "container";
-       version = "1.0.2";
-       sha256 = "0y8vyh9a3fv3jpjal22fg1r7ms7f2vc3ax2lhnxci6cg9zgz4gj1";
-       libraryHaskellDepends = [
-         base containers data-default data-layer functor-utils lens
-         lens-utils mtl template-haskell text transformers transformers-base
-         typelevel vector
-       ];
-       homepage = "https://github.com/wdanilo/containers";
+       version = "1.1.0";
+       sha256 = "19x7jvzc499y4349gallwwy4wpw4pf4azbsp4gr8ly4j0flfgk6g";
+       libraryHaskellDepends = [ base containers convert lens text ];
+       homepage = "https://github.com/luna/container";
        description = "Containers abstraction and utilities";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53694,6 +53727,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cppfilt" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec }:
+     mkDerivation {
+       pname = "cppfilt";
+       version = "0.1.0.0";
+       sha256 = "0ls98z5bswcsayqday350b90m256dscr2li14dnlkfckynpnqqzk";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://github.com/0xd34df00d/cppfilt#readme";
+       description = "Bindings for C++ demangling routines";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cpphs" = callPackage
     ({ mkDerivation, base, directory, old-locale, old-time, polyparse
      }:
@@ -61965,8 +62012,8 @@ self: {
      }:
      mkDerivation {
        pname = "di";
-       version = "1.0";
-       sha256 = "1bsgq1x4xc1nhfx2wkzmhy3hfy11xkdic35x0lxdc282k2iw7f4i";
+       version = "1.0.1";
+       sha256 = "0h7c6s18vj60higi23icjsf1ky756l553v3a18bdkf4dgcxfs4r9";
        libraryHaskellDepends = [
          base df1 di-core di-df1 di-handle di-monad exceptions
        ];
@@ -61999,8 +62046,8 @@ self: {
      }:
      mkDerivation {
        pname = "di-df1";
-       version = "1.0.1";
-       sha256 = "1l83xl2ljql615h33h2l3ckqdx8r0wqjfpygd4xhx975lm3gllck";
+       version = "1.0.2";
+       sha256 = "1imk26njmr7hj56227yxgshjh4dicgr2c9bpc2m9nvsw2qbqslfh";
        libraryHaskellDepends = [
          base df1 di-core di-handle di-monad stm
        ];
@@ -62373,8 +62420,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.4.2.1";
-       sha256 = "17vmjcshq6kdpy4qvwabrd7yp7is7zrs6lf3zn25l2ya8a3m0a17";
+       version = "1.4.2.2";
+       sha256 = "1rfn1fk251n84bxfn6p82p62gdjiq4yp4dwqmspp7ha2x6abn2s7";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -65113,14 +65160,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "docker-build-cacher_1_9_3" = callPackage
+  "docker-build-cacher_1_9_4" = callPackage
     ({ mkDerivation, base, containers, foldl, language-docker
      , system-filepath, text, turtle
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.9.3";
-       sha256 = "12x91w3wq0hndssz48xka0cb7ajmlrvdv2ysc0pv333smkmclsw1";
+       version = "1.9.4";
+       sha256 = "1p62q8hq19zgjwaqgclkjqh6ylpbr5jxw82f36xzqximws1jsmkp";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -71670,8 +71717,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "exception-hierarchy";
-       version = "0.0.0.2";
-       sha256 = "1lk73pmz2qhzmsj29vc8c1xsq0rcn7gqv4yik7av7iscrq49r2cc";
+       version = "0.1.0.1";
+       sha256 = "1zk06z8fwr4g701c79vvsqmagjcm2h850d9m96zrig08kz3lshm9";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "yet";
        description = "Exception type hierarchy with TemplateHaskell";
@@ -73035,6 +73082,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "familiar-reflection" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "familiar-reflection";
+       version = "0.1.0.0";
+       sha256 = "1yqbq038axx9a2j3kbdm11w3fgvkix2w7dqhrbf353r2n8vigxg8";
+       libraryHaskellDepends = [ base ];
+       description = "Reifies arbitrary terms into types that can be reflected back into terms";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "family-tree" = callPackage
     ({ mkDerivation, base, binary, containers, hashable, intervals
      , lens, tables, text, time, unordered-containers
@@ -74369,8 +74427,8 @@ self: {
      }:
      mkDerivation {
        pname = "ffmpeg-light";
-       version = "0.12.0.1";
-       sha256 = "1ikyhdkr3pvkpmqw7j4xgz07bnxnvckld8kd06191kgqlvr2k764";
+       version = "0.12.1.0";
+       sha256 = "081qrvf3hpnn7mgj6i7z8lh1jfmz0ndawc7ya9x3nx7kx3d35crp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77219,8 +77277,8 @@ self: {
        pname = "force-layout";
        version = "0.4.0.6";
        sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp";
-       revision = "2";
-       editedCabalFile = "1dj785ih5bla68yzxkpsilwj1p1xv6a8rh76rz799aap5injda0z";
+       revision = "3";
+       editedCabalFile = "0rp5ggzdqy9i8bsjz7i36l8l2b04vjy6sqm6gxmb4pqmakj1x8q6";
        libraryHaskellDepends = [
          base containers data-default-class lens linear
        ];
@@ -79547,6 +79605,45 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "funflow" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, clock, constraints
+     , containers, contravariant, cryptonite, data-default, directory
+     , exceptions, filepath, ghc-prim, hashable, hedis, hinotify
+     , hostname, integer-gmp, katip, lens, lifted-async, memory
+     , monad-control, mtl, optparse-applicative, path, path-io, pretty
+     , process, random, safe-exceptions, scientific, sqlite-simple, stm
+     , store, tasty, tasty-hunit, template-haskell, temporary, text
+     , time, transformers, unix, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "funflow";
+       version = "1.0.0";
+       sha256 = "1lcww83dzhbmml5l4yrypbw18l8x1m3pzblcnmgd90a9874gmq0f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring clock constraints containers
+         contravariant cryptonite data-default directory exceptions filepath
+         ghc-prim hashable hedis hinotify hostname integer-gmp katip lens
+         lifted-async memory monad-control mtl path path-io pretty process
+         random safe-exceptions scientific sqlite-simple stm store
+         template-haskell text time transformers unix unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring clock hedis optparse-applicative path
+         safe-exceptions text unix
+       ];
+       testHaskellDepends = [
+         async base containers data-default directory filepath hedis path
+         path-io process random safe-exceptions tasty tasty-hunit temporary
+         text unix
+       ];
+       homepage = "https://github.com/tweag/funflow";
+       description = "Workflows with arrows";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "funion" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, haskell98
      , HFuse, unix
@@ -83238,6 +83335,19 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-tcplugins-extra_0_3" = callPackage
+    ({ mkDerivation, base, ghc }:
+     mkDerivation {
+       pname = "ghc-tcplugins-extra";
+       version = "0.3";
+       sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
+       libraryHaskellDepends = [ base ghc ];
+       homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
+       description = "Utilities for writing GHC type-checker plugins";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-time-alloc-prof" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, tasty, tasty-hunit, temporary, text, time
@@ -83293,6 +83403,29 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_2_5" = callPackage
+    ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
+     , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
+     , tasty, tasty-hunit, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.2.5";
+       sha256 = "0waznf99wryc0sjyk9xb5c0vsalmmhx0v5vbqsyf5q7r6cjcig4s";
+       libraryHaskellDepends = [
+         base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
+         ghc-typelits-natnormalise integer-gmp transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
+         tasty-hunit template-haskell
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-knownnat" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
@@ -83314,6 +83447,28 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-knownnat_0_5" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-knownnat";
+       version = "0.5";
+       sha256 = "0mix7zgbnyc3216ykcrjl09rpidq5n2y886k03g8r5pziq1xki00";
+       libraryHaskellDepends = [
+         base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
+         template-haskell transformers
+       ];
+       testHaskellDepends = [
+         base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "http://clash-lang.org/";
+       description = "Derive KnownNat constraints from other KnownNat constraints";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell
@@ -83331,14 +83486,14 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
-  "ghc-typelits-natnormalise_0_6" = callPackage
+  "ghc-typelits-natnormalise_0_6_1" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty
      , tasty-hunit, template-haskell, transformers
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.6";
-       sha256 = "0xs5d7bsyp53nzg509gs2qyfrj5fjp7bpyw3pjnnqk8d4xcgmf2w";
+       version = "0.6.1";
+       sha256 = "0xzwlxcmd3vll86mdjk8pph6f0nw3vq0h3airzv7jagc4j3x9c7x";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp transformers
        ];
@@ -83926,9 +84081,9 @@ self: {
      }) {inherit (pkgs) cairo;};
 
   "gi-dbusmenu" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-glib
-     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
-     , haskell-gi-overloading, text, transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
+     , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
+     , libdbusmenu-glib, text, transformers
      }:
      mkDerivation {
        pname = "gi-dbusmenu";
@@ -83939,19 +84094,19 @@ self: {
          base bytestring containers gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ dbusmenu-glib ];
+       libraryPkgconfigDepends = [ libdbusmenu-glib ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {dbusmenu-glib = null;};
+     }) {inherit (pkgs) libdbusmenu-glib;};
 
   "gi-dbusmenugtk3" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-gtk3
-     , gi-atk, gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject
-     , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading
+     , libdbusmenu-gtk3, text, transformers
      }:
      mkDerivation {
        pname = "gi-dbusmenugtk3";
@@ -83963,13 +84118,13 @@ self: {
          gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ dbusmenu-gtk3 ];
+       libraryPkgconfigDepends = [ libdbusmenu-gtk3 ];
        doHaddock = false;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {dbusmenu-gtk3 = null;};
+     }) {inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -102061,8 +102216,8 @@ self: {
      }:
      mkDerivation {
        pname = "hedgehog-gen-json";
-       version = "0.3.0";
-       sha256 = "09b362v9cdl9jwrx0hyb7hhf2krg3rhrsgssz4dl3sjz3y2a8i1h";
+       version = "0.5.1";
+       sha256 = "0cc46l1ls4dzlchwcd6cqmsa66qffjq01dhcj2k84gjw8gg4wnnx";
        libraryHaskellDepends = [
          aeson base bytestring containers exceptions hedgehog lens protolude
          regex-genex scientific text time timerep tz unordered-containers
@@ -104321,24 +104476,24 @@ self: {
 
   "hierarchy" = callPackage
     ({ mkDerivation, base, directory, doctest, exceptions, filepath
-     , free, hspec, hspec-expectations, mmorph, monad-control, mtl
-     , pipes, semigroups, transformers, transformers-base
+     , free, mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat
      }:
      mkDerivation {
        pname = "hierarchy";
-       version = "0.3.1.4";
-       sha256 = "0bli7mv2d6lmxc89fysmkhb9kamhzs2rqx75rn4mbcw61il1cznq";
+       version = "1.0.1";
+       sha256 = "11xnqf5s0vda2wjgdazkgkmjp46jyl9zcaia5r01szfwjihj5ldg";
        libraryHaskellDepends = [
-         base exceptions free mmorph monad-control mtl pipes semigroups
-         transformers transformers-base transformers-compat
+         base exceptions free mmorph monad-control mtl transformers
+         transformers-base transformers-compat
        ];
        testHaskellDepends = [
-         base directory doctest filepath hspec hspec-expectations mtl pipes
-         semigroups transformers
+         base directory doctest exceptions filepath free mmorph
+         monad-control mtl transformers transformers-base
+         transformers-compat
        ];
-       homepage = "https://github.com/jwiegley/hierarchy";
-       description = "Pipes-based library for predicated traversal of generated trees";
+       homepage = "https://github.com/jwiegley/hierarchy#readme";
+       description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -107040,30 +107195,61 @@ self: {
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, containers, criterion
-     , data-fix, deepseq, deriving-compat, parsers, regex-tdfa
-     , regex-tdfa-text, semigroups, tasty, tasty-hunit, tasty-th, text
-     , transformers, trifecta, unordered-containers
+    ({ mkDerivation, aeson, ansi-wl-pprint, array, base
+     , base16-bytestring, binary, bytestring, containers, criterion
+     , cryptohash-md5, cryptohash-sha1, cryptohash-sha256
+     , cryptohash-sha512, data-fix, deepseq, deriving-compat, Diff
+     , directory, exceptions, filepath, generic-random, Glob, hashable
+     , hashing, haskeline, http-client, http-client-tls, http-types
+     , interpolate, lens-family, lens-family-core, lens-family-th
+     , logict, megaparsec, monadlist, mtl, optparse-applicative
+     , pretty-show, process, QuickCheck, quickcheck-instances
+     , regex-tdfa, regex-tdfa-text, repline, scientific, semigroups
+     , serialise, split, syb, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-th, template-haskell, text, these, time, transformers, unix
+     , unordered-containers, vector, xml
      }:
      mkDerivation {
        pname = "hnix";
-       version = "0.4.0";
-       sha256 = "0rgx97ckv5zvly6x76h7nncswfw0ik4bhnlj8n5bpl4rqzd7d4fd";
+       version = "0.5.1";
+       sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base containers data-fix deepseq deriving-compat
-         parsers regex-tdfa regex-tdfa-text semigroups text transformers
-         trifecta unordered-containers
+         aeson ansi-wl-pprint array base base16-bytestring binary bytestring
+         containers cryptohash-md5 cryptohash-sha1 cryptohash-sha256
+         cryptohash-sha512 data-fix deepseq deriving-compat directory
+         exceptions filepath hashable hashing haskeline http-client
+         http-client-tls http-types lens-family lens-family-core
+         lens-family-th logict megaparsec monadlist mtl optparse-applicative
+         pretty-show process regex-tdfa regex-tdfa-text scientific
+         semigroups serialise split syb template-haskell text these time
+         transformers unix unordered-containers vector xml
        ];
        executableHaskellDepends = [
-         ansi-wl-pprint base containers data-fix deepseq
+         aeson ansi-wl-pprint base base16-bytestring bytestring containers
+         cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+         data-fix deepseq exceptions filepath hashing haskeline mtl
+         optparse-applicative pretty-show repline serialise template-haskell
+         text time transformers unordered-containers
        ];
        testHaskellDepends = [
-         base containers data-fix tasty tasty-hunit tasty-th text
+         ansi-wl-pprint base base16-bytestring bytestring containers
+         cryptohash-md5 cryptohash-sha1 cryptohash-sha256 cryptohash-sha512
+         data-fix deepseq Diff directory exceptions filepath generic-random
+         Glob hashing interpolate megaparsec mtl optparse-applicative
+         pretty-show process QuickCheck quickcheck-instances serialise split
+         tasty tasty-hunit tasty-quickcheck tasty-th template-haskell text
+         time transformers unix unordered-containers
        ];
-       benchmarkHaskellDepends = [ base containers criterion text ];
-       homepage = "http://github.com/jwiegley/hnix";
+       benchmarkHaskellDepends = [
+         ansi-wl-pprint base base16-bytestring bytestring containers
+         criterion cryptohash-md5 cryptohash-sha1 cryptohash-sha256
+         cryptohash-sha512 data-fix deepseq exceptions filepath hashing mtl
+         optparse-applicative serialise template-haskell text time
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/jwiegley/hnix#readme";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109801,6 +109987,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hs-conllu" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, megaparsec
+     , void
+     }:
+     mkDerivation {
+       pname = "hs-conllu";
+       version = "0.1.2";
+       sha256 = "1dvayafvf14gbir7cafhzlscqlffaws5ajilm5h520ji449jh2aa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath megaparsec void
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath megaparsec
+       ];
+       homepage = "https://github.com/odanoburu/hs-conllu";
+       description = "Conllu validating parser and utils";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "hs-di" = callPackage
     ({ mkDerivation, base, compose-ltr, containers, deepseq
      , foreign-store, ghcid, haskell-src-meta, hspec, hspec-core
@@ -123914,6 +124121,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "javascript-extras_0_4_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, ghcjs-base-stub, parallel, text }:
+     mkDerivation {
+       pname = "javascript-extras";
+       version = "0.4.0.0";
+       sha256 = "0qpz8q5pr939y35y3r8x83irb2nl9vmh50wzjii824kr25z5wipd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base deepseq ghcjs-base-stub parallel text
+       ];
+       executableHaskellDepends = [ base ghcjs-base-stub ];
+       homepage = "https://github.com/louispan/javascript-extras#readme";
+       description = "Extra javascript functions when using GHCJS";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "javasf" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, doctest
      , filepath, language-java-classfile, QuickCheck
@@ -126597,20 +126822,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katydid_0_3_0_0" = callPackage
+  "katydid_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl
      , parsec, primes, regex-tdfa, tasty, tasty-hunit, text
+     , transformers-either
      }:
      mkDerivation {
        pname = "katydid";
-       version = "0.3.0.0";
-       sha256 = "1r95yxhrsw0ghv55xlq987yzhly69ihiy4bz6k3k41mfj8d7kj8v";
+       version = "0.3.0.1";
+       sha256 = "08q8qmvxc47y8rxs8vam31xwjgwyjga4bdd65m1n4plpndi0zhyg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq either extra hxt ilist json mtl
-         parsec regex-tdfa text
+         parsec regex-tdfa text transformers-either
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [
@@ -129244,15 +129470,15 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_5_0_0" = callPackage
+  "language-docker_5_0_1" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
      , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split
      , template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "5.0.0";
-       sha256 = "16shdy1dh0bsalj0ciwg7h9dkjfjgkrfmq7g81z3k8fgy1w2y81n";
+       version = "5.0.1";
+       sha256 = "0y2kb2g9w34p3yw8cdjr4f0xkq9j065khlk1mbk7061gg2rhpykv";
        libraryHaskellDepends = [
          base bytestring free mtl parsec pretty split template-haskell text
          th-lift time
@@ -130585,8 +130811,8 @@ self: {
      }:
      mkDerivation {
        pname = "layouting";
-       version = "1.1.2";
-       sha256 = "1j3bki62ldi5gbl3asa31rjjlah2842rhgylxwab13c3r50a7p85";
+       version = "1.1.3";
+       sha256 = "1ji0hmfa87n3pl61gmgk4phmpir29j5r81ack95s3h7nxh0q5qh7";
        libraryHaskellDepends = [
          base container layered-state prologue terminal-text text
        ];
@@ -134789,7 +135015,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {llvm-config = null;};
 
-  "llvm-hs_6_1_1" = callPackage
+  "llvm-hs_6_2_0" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
      , containers, exceptions, llvm-config, llvm-hs-pure, mtl
      , pretty-show, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
@@ -134797,8 +135023,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs";
-       version = "6.1.1";
-       sha256 = "0vlp1rgddgavs4kg0s1qmny6mlx4rpz12ybcrqg6vmv68w1qyr5r";
+       version = "6.2.0";
+       sha256 = "1s7n0sansq1mhs6dibp3ikkpn3n0h6cw2ja5m36nphjmzn47dvrk";
        setupHaskellDepends = [ base Cabal containers ];
        libraryHaskellDepends = [
          array attoparsec base bytestring containers exceptions llvm-hs-pure
@@ -134859,15 +135085,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "llvm-hs-pure_6_1_0" = callPackage
+  "llvm-hs-pure_6_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, fail
      , mtl, tasty, tasty-hunit, tasty-quickcheck, template-haskell
      , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "llvm-hs-pure";
-       version = "6.1.0";
-       sha256 = "12fivm5w4nz306p7w0bxsmgb2cnbkp06dyrdfi64vrsgm9kgbqmw";
+       version = "6.2.0";
+       sha256 = "1qqwhq9mjlgpyy5h8wnk1zg8y16c229397fslxyyz3bjqg5a0ghv";
        libraryHaskellDepends = [
          attoparsec base bytestring containers fail mtl template-haskell
          transformers unordered-containers
@@ -144602,16 +144828,19 @@ self: {
      }) {};
 
   "monadiccp" = callPackage
-    ({ mkDerivation, base, containers, mtl, parsec, pretty, random }:
+    ({ mkDerivation, base, containers, mtl, parsec, pretty, random
+     , semigroups
+     }:
      mkDerivation {
        pname = "monadiccp";
-       version = "0.7.6";
-       sha256 = "083ppr53ac85r5ybndngsfwxgalj63giz32aa7wpcm629b9g4lxc";
+       version = "0.7.7";
+       sha256 = "1l6g2gbxmw0avyr7mfjadhads6raz6cwvmg57vb7ssryd9j21vp4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         base containers mtl parsec pretty random
+         base containers mtl parsec pretty random semigroups
        ];
-       homepage = "http://users.ugent.be/~tschrijv/MCP/";
+       testHaskellDepends = [ base ];
+       homepage = "https://people.cs.kuleuven.be/~tom.schrijvers/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152602,12 +152831,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask_0_2_0_0" = callPackage
+  "numhask_0_2_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numhask";
-       version = "0.2.0.0";
-       sha256 = "1n465rjgmpwjixnnwn054323rg55abbj98brqzw4ff17hrvy97g0";
+       version = "0.2.1.0";
+       sha256 = "04bz8ddip48fiszjqc6km9xg63sn26jrnjxswc3qfls37jqzk2c3";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/tonyday567/numhask#readme";
        description = "numeric classes";
@@ -152622,8 +152851,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-array";
-       version = "0.2.0.1";
-       sha256 = "05y41d8xnrzgrb5w6skkac5hr6c7npwzmryx308cd0lp4nbfmvql";
+       version = "0.2.1.0";
+       sha256 = "0d800ghafzfyz6afnaqza6b44pmjh8zq0gbxvxg2ach2wfcknd0h";
        libraryHaskellDepends = [
          adjunctions base deepseq dimensions distributive numhask-prelude
          protolude QuickCheck singletons vector
@@ -152661,12 +152890,12 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-prelude";
-       version = "0.0.3.0";
-       sha256 = "128hnq32826d2rmrlik4p0c72jnsy586gz9lgfk7hnx0fqpr94gy";
+       version = "0.0.4.0";
+       sha256 = "11kwszs98c00bcjr318rm7yfc0h304s6vnrmh97mp4xp4bk7fqq1";
        libraryHaskellDepends = [
          base numhask protolude QuickCheck tasty tasty-quickcheck
        ];
-       testHaskellDepends = [ base doctest tasty ];
+       testHaskellDepends = [ base doctest QuickCheck tasty ];
        homepage = "https://github.com/tonyday567/numhask#readme";
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
@@ -152779,6 +153008,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nuxeo" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit
+     , conduit-extra, text, time
+     }:
+     mkDerivation {
+       pname = "nuxeo";
+       version = "0.2.0.1";
+       sha256 = "046vwj0p53pzrdmni08gqyzrr0mhz8qrf5zn09plgzjadq3yp2p2";
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit conduit-extra text time
+       ];
+       description = "Nuxeo";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nvim-hs" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
      , containers, data-default, deepseq, directory, dyre, filepath
@@ -156403,12 +156647,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "palette_0_3" = callPackage
+  "palette_0_3_0_1" = callPackage
     ({ mkDerivation, array, base, colour, containers, MonadRandom }:
      mkDerivation {
        pname = "palette";
-       version = "0.3";
-       sha256 = "1wpzrhr3b9psa7b56ys34vnaag6z12xam2rymld2g8fd13jlkxh6";
+       version = "0.3.0.1";
+       sha256 = "0ylwgb7a0mhffz00hmhx93y4kyjb9xgm96jrfcxl464x8cjka5gi";
        libraryHaskellDepends = [
          array base colour containers MonadRandom
        ];
@@ -158594,8 +158838,8 @@ self: {
      }:
      mkDerivation {
        pname = "patat";
-       version = "0.7.0.0";
-       sha256 = "0w7k1s8nma0bp4cvacmpa3fxxslarcijpxvbvasjyik3inazqhsd";
+       version = "0.7.2.0";
+       sha256 = "1kn739dywchvvvcp972yyxg7r4n81s3qbrni684ag7493nck12iw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -167935,8 +168179,8 @@ self: {
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.4.4.0";
-       sha256 = "08pnybyr6l39h7lxvgxi014wb7cf6i8qfygx4xkfzkj9p23mp3h9";
+       version = "0.4.5.0";
+       sha256 = "18wyq1czj99zxgqmv6v2qpwlax3a4r7d93pc24ihzg5v8ps6iz89";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -173811,12 +174055,16 @@ self: {
      }) {};
 
   "reactive-banana-automation" = callPackage
-    ({ mkDerivation, base, doctest, reactive-banana, stm, time }:
+    ({ mkDerivation, base, doctest, reactive-banana, stm, time
+     , transformers
+     }:
      mkDerivation {
        pname = "reactive-banana-automation";
-       version = "0.3.0";
-       sha256 = "1f752kmfmgdx9mhvzljm37vrn18jn7wgz0m4byl3v4npcv502cyr";
-       libraryHaskellDepends = [ base reactive-banana stm time ];
+       version = "0.4.0";
+       sha256 = "1zc24p1jqild85k049ixbfcdhxdy66l4m5ddr1g3bkxq8apilnrr";
+       libraryHaskellDepends = [
+         base reactive-banana stm time transformers
+       ];
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
        license = stdenv.lib.licenses.agpl3;
@@ -174536,8 +174784,8 @@ self: {
      }:
      mkDerivation {
        pname = "recursion-schemes-ext";
-       version = "1.0.0.3";
-       sha256 = "00yj7h46pmy76iqsx1n0mlg04gzdrhyq10xm1xcl28y13jcjx9lc";
+       version = "1.0.0.4";
+       sha256 = "0n25cz8w48p8fxjnv83raxrvn7v892z8ip3jklgxj1vgh4rms3xx";
        libraryHaskellDepends = [
          base composition-prelude lens recursion-schemes
        ];
@@ -189738,8 +189986,8 @@ self: {
      }:
      mkDerivation {
        pname = "simplest-sqlite";
-       version = "0.0.0.14";
-       sha256 = "063x0s7klp510v9gz2qffpwnrsrfh5kady5n0j0cl1x65kis0d2m";
+       version = "0.1.0.0";
+       sha256 = "0vjx01bls2z99hmynqhxm4j2cq17334wz3pz0gm5saxslkldw2sz";
        libraryHaskellDepends = [
          base bytestring exception-hierarchy template-haskell text
        ];
@@ -202244,6 +202492,8 @@ self: {
        pname = "taffybar";
        version = "2.0.0";
        sha256 = "1s3nqvsivi4wgi6hi7b3f83r75sl5qp0hsqr0cdwd7s8fqai3wia";
+       revision = "1";
+       editedCabalFile = "1sqgzjv0nhp5nmzn4qh80ghq38p5q7c8nvm1v1wh1dx2j7lkjnzc";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -217726,12 +217976,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity_0_5_0_0" = callPackage
+  "validity_0_6_0_0" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "validity";
-       version = "0.5.0.0";
-       sha256 = "0hpdj3ckp2r8dklpjdrrbfd02maskxw2vrjnqnxsgi8s3j8avqsv";
+       version = "0.6.0.0";
+       sha256 = "1ba7dvxz2x3ng4k221xawp0bz4gk4lz5gklklgypavp1fdrhf27q";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -219228,8 +219478,8 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.16";
-       sha256 = "123dqm0rardrvvvrj8sjjs9z8yysk9qzwvrs3skqzxrq5pffyarp";
+       version = "0.0.0.17";
+       sha256 = "0wj0y6dyyy11flkywv96m95nq0qlmj4wykfwj4xw8fwjjmsmg91f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -219825,6 +220075,8 @@ self: {
        pname = "vpq";
        version = "0.1.0.0";
        sha256 = "1qa3l71ch96slan8s2zx9wc4ljsl4jgl83m7h0rfb9nd9cawflf7";
+       revision = "1";
+       editedCabalFile = "16wnqvfblg8gimixc9pjdii4anbqjlkn12xrb6aw3sqk26pq7khb";
        libraryHaskellDepends = [ base primitive util vector ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Priority queue based on vector";
@@ -220048,8 +220300,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "vulkan-api";
-       version = "1.1.2.0";
-       sha256 = "0l52494zi9r3fq3nx21r8pkbb7zkynz1gbrn58k8pramx7nhksb1";
+       version = "1.1.2.1";
+       sha256 = "0iwzjr2w6ifsj6lah8viahsxcqxiqy0dk1v6lnzi77nb05sjpr6d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/achirkin/vulkan#readme";
        description = "Low-level low-overhead vulkan api bindings";

From 77fbd14d8552c311c6bd8e54c94fe41e5edd7c79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 May 2018 20:01:49 +0200
Subject: [PATCH 1407/3370] haskell-gi: apply upstream patch to fix the doctest
 suite

---
 pkgs/development/haskell-modules/configuration-common.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 45560de984f3..c18c69f9a447 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,8 +422,11 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
-  # https://github.com/haskell-gi/haskell-gi/pull/163
-  haskell-gi = dontCheck super.haskell-gi;
+  # Version 0.21.2 calls its doctest suite with incorrect paths.
+  haskell-gi = appendPatch super.haskell-gi (pkgs.fetchpatch {
+    url = https://github.com/haskell-gi/haskell-gi/pull/163/commits/b876c4f351893370d4ae597aab6ecc0422e7f665.patch;
+    sha256 = "03vzpvnr3vnz2zgsr504iyf0n9aw6mkz8rkj6zhazfixl3dzfkyd";
+  });
 
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;

From a9577da115fbd5a04e9650e22d4b378acb1ebca6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 9 May 2018 20:02:35 +0200
Subject: [PATCH 1408/3370] haskell-brick: update override for ghc-8.4.x to the
 latest version

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 4ed59fb66622..70624d1ed6a8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -441,7 +441,7 @@ self: super: {
   });
 
   # Older versions don't compile.
-  brick = self.brick_0_36_3;
+  brick = self.brick_0_37;
   dhall = self.dhall_1_13_0;
   dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;

From 32d8a7d249880c25079eb580caf3c94d58f35c23 Mon Sep 17 00:00:00 2001
From: Valentin Heidelberger <github@valentinsblog.com>
Date: Wed, 9 May 2018 20:50:06 +0200
Subject: [PATCH 1409/3370] keepassxc: 2.3.2 -> 2.3.3

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

diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix
index 373320dfe15a..6b37f9b9145d 100644
--- a/pkgs/applications/misc/keepassx/community.nix
+++ b/pkgs/applications/misc/keepassx/community.nix
@@ -26,13 +26,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "keepassxc-${version}";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "keepassxreboot";
     repo = "keepassxc";
     rev = "${version}";
-    sha256 = "13gf7rsan6fjkdr46xkr08d150nh194fkbzb4cazwd7rf05agw1y";
+    sha256 = "08cj1nxbjy2m80h3irnra2qha7fc5ahhzcgkyk9jv4zyys9xv998";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [

From e745d087c6700c81486e87484012cb201f55f81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 9 May 2018 16:44:28 -0300
Subject: [PATCH 1410/3370] plano-theme: 3.24-3 -> 3.28-1

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

diff --git a/pkgs/misc/themes/plano/default.nix b/pkgs/misc/themes/plano/default.nix
index 64d4e807e425..2d10ff7c607d 100644
--- a/pkgs/misc/themes/plano/default.nix
+++ b/pkgs/misc/themes/plano/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "plano-theme-${version}";
-  version = "3.24-3";
+  version = "3.28-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "plano-theme";
     rev = "v${version}";
-    sha256 = "079gj3kgsim01r7yb9dcxvrci3my1y0zkn86igdlspxcnjzmxkq0";
+    sha256 = "1862nx7c8786vfa0qdg4aqa13whsk3j5n93v9m91wpccv19n0ryn";
   };
 
   buildInputs = [ gdk_pixbuf gtk_engines ];

From 7b0b4cd3977fe261f34e928bb375a5760b27d93a Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Wed, 9 May 2018 10:58:33 -0400
Subject: [PATCH 1411/3370] perlPackages.NetZooKeeper: init at 0.41

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3278311f25c0..3dc0ed43a5a6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11758,6 +11758,22 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  NetZooKeeper = buildPerlPackage rec {
+    name = "Net-ZooKeeper-0.41";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MA/MAF/${name}.tar.gz";
+      sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9";
+    };
+    buildInputs = [ pkgs.zookeeper_mt ];
+    NIX_CFLAGS_COMPILE = "-I${pkgs.zookeeper_mt}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt";
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      homepage = https://github.com/mark-5/p5-net-zookeeper;
+      license = stdenv.lib.licenses.asl20;
+    };
+  };
+
   PackageConstants = buildPerlPackage {
     name = "Package-Constants-0.06";
     src = fetchurl {

From 9410c39b9a8a2f598eb2cc407d9f314c09597818 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Wed, 9 May 2018 08:48:28 -0400
Subject: [PATCH 1412/3370] perlPackages.LinuxACL: init at 0.05

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 3dc0ed43a5a6..933169f9eb7f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -450,6 +450,21 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  LinuxACL = buildPerlPackage rec {
+    name = "Linux-ACL-0.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz";
+      sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371";
+    };
+    buildInputs = [ pkgs.acl ];
+    NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl";
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ListCompare = buildPerlPackage rec {
     name = "List-Compare-0.53";
     src = fetchurl {

From df37647ab2d7069288b6535a9fd6deb2f630d866 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Wed, 9 May 2018 13:15:22 -0400
Subject: [PATCH 1413/3370] Fix alphabetization of perl modules

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 933169f9eb7f..22733443ed19 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -450,35 +450,6 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LinuxACL = buildPerlPackage rec {
-    name = "Linux-ACL-0.05";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz";
-      sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371";
-    };
-    buildInputs = [ pkgs.acl ];
-    NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl";
-    meta = {
-      maintainers = [ maintainers.limeytexan ];
-      description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
-
-  ListCompare = buildPerlPackage rec {
-    name = "List-Compare-0.53";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz";
-      sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550";
-    };
-    buildInputs = [ IOCaptureOutput ];
-    meta = {
-      homepage = http://thenceforward.net/perl/modules/List-Compare/;
-      description = "Compare elements of two or more lists";
-      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-    };
-  };
-
   ArchiveCpio = buildPerlPackage rec {
     name = "Archive-Cpio-0.10";
     src = fetchurl {
@@ -8539,6 +8510,21 @@ let self = _self // overrides; _self = with self; {
     doCheck = false;
   };
 
+  LinuxACL = buildPerlPackage rec {
+    name = "Linux-ACL-0.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/N/NA/NAZAROV/${name}.tar.gz";
+      sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371";
+    };
+    buildInputs = [ pkgs.acl ];
+    NIX_CFLAGS_LINK = "-L${pkgs.acl.out}/lib -lacl";
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      description = "Perl extension for reading and setting Access Control Lists for files by libacl linux library";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   LinuxDistribution = buildPerlModule {
     name = "Linux-Distribution-0.23";
     src = fetchurl {
@@ -8586,6 +8572,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ListCompare = buildPerlPackage rec {
+    name = "List-Compare-0.53";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JK/JKEENAN/${name}.tar.gz";
+      sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550";
+    };
+    buildInputs = [ IOCaptureOutput ];
+    meta = {
+      homepage = http://thenceforward.net/perl/modules/List-Compare/;
+      description = "Compare elements of two or more lists";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   ListMoreUtils = buildPerlPackage rec {
     name = "List-MoreUtils-0.428";
     src = fetchurl {

From 6266387bfade09b17bdb4dea86f2f67f04cfb21d Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 9 May 2018 16:23:04 -0400
Subject: [PATCH 1414/3370] libminc: 2017-09-14 -> 2018-01-17

---
 pkgs/development/libraries/libminc/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix
index 704c73284ae1..ddab3439f02a 100644
--- a/pkgs/development/libraries/libminc/default.nix
+++ b/pkgs/development/libraries/libminc/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libminc";
-  name  = "${pname}-2017-09-14";
+  name  = "${pname}-2018-01-17";
 
   owner = "BIC-MNI";
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     inherit owner;
     repo   = pname;
-    rev    = "e11c6df9321b4061bf87a7d43171ec55e9e3908f";
-    sha256 = "0lmd0js3jgni2mw1zfvd4qg6byxiv3ndgv2z3nm7975i83zw48xk";
+    rev    = "a9cbe1353eae9791b7d5b03af16e0f86922ce40b";
+    sha256 = "0mn4n3ihzcr1jw2g1vy6c8p4lkc88jwljk04argmj7k4djrgpxpa";
   };
 
   nativeBuildInputs = [ cmake ];

From 7fb1a79b8fe9f028a05457a5af84eb3b60b9115f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 9 May 2018 22:38:16 +0200
Subject: [PATCH 1415/3370] androidStudioPackages.{dev,canary}: 3.2.0.12 ->
 3.2.0.13

---
 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 630f5dd34471..328370c25016 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
   };
   latestVersion = {
-    version = "3.2.0.12"; # "Android Studio 3.2 Canary 13"
-    build = "181.4749738";
-    sha256Hash = "0mwsbmxzrs7yavgkckpmfvpz46v7fpa0nxvf8zqa9flmsv8p8l10";
+    version = "3.2.0.13"; # "Android Studio 3.2 Canary 14"
+    build = "181.4763614";
+    sha256Hash = "1rx3bip5a7v349whg26kxvj05qlvm7zwacfqnfzfmvvhzbh7xnyh";
   };
 in rec {
   # Old alias

From 8a98cf97e92cecba4feda766f4b7ac36cd82f8ea Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 6 May 2018 15:44:24 -0500
Subject: [PATCH 1416/3370] lib.makeSearchPath: allow null in search path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes things match ‘buildInputs’ where inputs are allowed to be
null.
---
 lib/strings.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index e6df7d99cb2e..61babf0b1aa3 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -82,7 +82,7 @@ rec {
        => "//bin"
   */
   makeSearchPath = subDir: packages:
-    concatStringsSep ":" (map (path: path + "/" + subDir) packages);
+    concatStringsSep ":" (map (path: path + "/" + subDir) (builtins.filter (x: x != null) packages));
 
   /* Construct a Unix-style search path, using given package output.
      If no output is found, fallback to `.out` and then to the default.

From 527abe59cf051350ad153a8756753d0ae93b94d4 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 15:46:48 -0500
Subject: [PATCH 1417/3370] generic-stack-builder: attempt to add propagation

Fixes #40039

This adds a shellHook to handle propagated dependencies like that seen
in #40039 where gpgme needed libgpg-error.
---
 .../haskell-modules/generic-stack-builder.nix     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 6e43df9aba69..5c2fced3f2e6 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -20,10 +20,17 @@ in stdenv.mkDerivation (args // {
 
   STACK_PLATFORM_VARIANT="nix";
   STACK_IN_NIX_SHELL=1;
-  STACK_IN_NIX_EXTRA_ARGS =
-    concatMap (pkg: ["--extra-lib-dirs=${getLib pkg}/lib"
-                     "--extra-include-dirs=${getDev pkg}/include"]) buildInputs ++
-    extraArgs;
+  STACK_IN_NIX_EXTRA_ARGS = extraArgs;
+  shellHook = ''
+    for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
+    do
+      [ -d "$pkg/lib" ] && \
+        export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
+      [ -d "$pkg/include" ] && \
+        export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
+    done
+  '';
+
 
   # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
   LD_LIBRARY_PATH = makeLibraryPath (LD_LIBRARY_PATH ++ buildInputs);

From 1e50e178ae2268ab0fd655a80d9d0c0db0aa62a5 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 9 May 2018 13:50:01 -0700
Subject: [PATCH 1418/3370] simpleitk: init at 1.1.0 (note this only builds the
 C++ libs, not the Python/Lua/... bindings) (#27451)

* conglomerate: init at 2017-09-10

* simpleitk: init at 1.1.0 (note this only builds the C++ libs, not the Python/Lua/... bindings)
---
 .../libraries/simpleitk/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/libraries/simpleitk/default.nix

diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
new file mode 100644
index 000000000000..4802683079d1
--- /dev/null
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, git, swig, lua, itk }:
+
+stdenv.mkDerivation rec {
+  pname    = "simpleitk";
+  version = "1.0.0";
+  name  = "${pname}-${version}";
+
+  src = fetchurl {
+    url    = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz";
+    sha256 = "0554j0zp314zhs8isfg31fi6gvsl7xq3xjyyxkx1b1mjkn5qx673";
+  };
+
+  nativeBuildInputs = [ cmake git swig ];
+  buildInputs = [ lua itk ];
+
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ];
+
+  checkPhase = "ctest";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://www.simpleitk.org;
+    description = "Simplified interface to ITK";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d52cc8c5de6b..555ed2a24ff6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11519,6 +11519,8 @@ with pkgs;
 
   simp_le = callPackage ../tools/admin/simp_le { };
 
+  simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; };
+
   sfml = callPackage ../development/libraries/sfml { };
   csfml = callPackage ../development/libraries/csfml { };
 

From 53d6997e5d51e50f6864a1c8dc55bfef914130af Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Wed, 9 May 2018 22:59:54 +0200
Subject: [PATCH 1419/3370] haskell: fix build of base-compat-batteries

---
 pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index acbcb1320e61..ca3d4efed34d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -505,6 +505,6 @@ self: super: builtins.intersectAttrs super {
 
   # cabal2nix generates a dependency on base-compat, which is the wrong version
   base-compat-batteries = super.base-compat-batteries.override {
-    base-compat = pkgs.haskellPackages.base-compat_0_10_1;
+    base-compat = super.base-compat_0_10_1;
   };
 }

From c218cd38d39aa9e7e8487afed7995446772a7ea6 Mon Sep 17 00:00:00 2001
From: Anders Riutta <git@andersriutta.com>
Date: Wed, 9 May 2018 14:12:55 -0700
Subject: [PATCH 1420/3370] pgmanage: update to current name (minor).

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

diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix
index 7da71df7814c..d08b183d9d00 100644
--- a/pkgs/applications/misc/pgmanage/default.nix
+++ b/pkgs/applications/misc/pgmanage/default.nix
@@ -24,9 +24,10 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A fast replacement for PGAdmin";
     longDescription = ''
-      At the heart of Postage is a modern, fast, event-based C-binary, built in
-      the style of NGINX and Node.js. This heart makes Postage as fast as any
-      PostgreSQL interface can hope to be.
+      At the heart of pgManage is a modern, fast, event-based C-binary, built in
+      the style of NGINX and Node.js. This heart makes pgManage as fast as any
+      PostgreSQL interface can hope to be. (Note: pgManage replaces Postage,
+      which is no longer maintained.)
     '';
     homepage = https://github.com/pgManage/pgManage;
     license = licenses.postgresql;

From c37b93bd52f3f5a0dd6ba2a41823c56e7f31f71e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 16:13:38 -0500
Subject: [PATCH 1421/3370] treewide: remove lib.meta.enableIfAvailable

---
 lib/meta.nix                                  |  2 --
 pkgs/os-specific/linux/systemd/default.nix    | 12 +++++++-----
 pkgs/tools/package-management/nix/default.nix |  5 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/meta.nix b/lib/meta.nix
index 8516cc1cd6f1..199030c103af 100644
--- a/lib/meta.nix
+++ b/lib/meta.nix
@@ -86,6 +86,4 @@ rec {
         then { system = elem; }
         else { parsed = elem; };
     in lib.matchAttrs pattern platform;
-
-  enableIfAvailable = p: if p.meta.available or true then [ p ] else [];
 }
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 58a1c7ca7147..c1f139d42a64 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap, kmod
 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor
-, audit, lz4, bzip2, kexectools, libmicrohttpd
+, audit, lz4, bzip2, libmicrohttpd
 , linuxHeaders ? stdenv.cc.libc.linuxHeaders
-, libseccomp, iptables, gnu-efi
+, iptables, gnu-efi
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 , ninja, meson, python3Packages, glibcLocales
 , patchelf
@@ -11,6 +11,8 @@
 , hostPlatform
 , buildPackages
 , withSelinux ? false, libselinux
+, withLibseccomp ? libseccomp.meta.available, libseccomp
+, withKexectools ? kexectools.meta.available, kexectools
 }:
 
 let
@@ -42,13 +44,13 @@ in stdenv.mkDerivation rec {
     [ linuxHeaders libcap kmod xz pam acl
       /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2
       libmicrohttpd ] ++
-      stdenv.lib.meta.enableIfAvailable kexectools ++
-      stdenv.lib.meta.enableIfAvailable libseccomp ++
+      stdenv.lib.optional withKexectools kexectools ++
+      stdenv.lib.optional withLibseccomp libseccomp ++
     [ libffi audit lz4 bzip2 libapparmor
       iptables gnu-efi
       # This is actually native, but we already pull it from buildPackages
       pythonLxmlEnv
-    ] ++ stdenv.lib.optionals withSelinux [ libselinux ];
+    ] ++ stdenv.lib.optional withSelinux libselinux;
 
   #dontAddPrefix = true;
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 1d15bd11b7fa..8f503d12935e 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,11 +1,12 @@
 { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz
 , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
-, libseccomp, busybox-sandbox-shell
+, busybox-sandbox-shell
 , hostPlatform, buildPlatform
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
+, withLibseccomp ? libseccomp.meta.available, libseccomp
 }:
 
 let
@@ -30,7 +31,7 @@ let
     buildInputs = [ curl openssl sqlite xz bzip2 ]
       ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
       ++ lib.optionals is20 [ brotli ] # Since 1.12
-      ++ lib.meta.enableIfAvailable libseccomp
+      ++ lib.optional withLibseccomp libseccomp
       ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
           (aws-sdk-cpp.override {
             apis = ["s3"];

From 038bf4f68b866ef59ab9a61372c05ee7cfcf9ec3 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 9 May 2018 23:20:20 +0200
Subject: [PATCH 1422/3370] tdesktopPackages.preview: 1.2.17 -> 1.2.19

---
 .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index c47ce04f1f7d..0e2c232e6d21 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,5 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
+    version = "1.2.19";
+    sha256Hash = "0val6lfcg3ghcksflm3jclqly0x8plpn3an8v9bix0s5yll1ka4h";
   });
 }

From 0cdb56dfa85872b227c696b491681c67e9e62ca9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 9 May 2018 23:42:22 +0200
Subject: [PATCH 1423/3370] perl-URI: 1.73 -> 1.74

---
 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 3278311f25c0..e3329b1efc7c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17169,10 +17169,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   URI = buildPerlPackage rec {
-    name = "URI-1.73";
+    name = "URI-1.74";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "cca7ab4a6f63f3ccaacae0f2e1337e8edf84137e73f18548ec7d659f23efe413";
+      sha256 = "a9c254f45f89cb1dd946b689dfe433095404532a4543bdaab0b71ce0fdcdd53d";
     };
     buildInputs = [ TestNeeds ];
     meta = {

From 3fa0ba917742c0790ff5418de0db65d94ee8b82e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 6 May 2018 15:10:46 -0400
Subject: [PATCH 1424/3370] lib/systems: Parse more arm cpu types

---
 lib/systems/parse.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 8a6c951d5e5e..ffedd98c98d8 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -69,9 +69,15 @@ rec {
   cpuTypes = with significantBytes; setTypes types.openCpuType {
     arm      = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv6m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv7r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv7m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv8a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
+    armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };

From 2b9db24768a0a4cc9c1c69d9c6f48046948439cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 9 May 2018 20:03:48 -0300
Subject: [PATCH 1425/3370] zuki-themes: 3.26-1 -> 3.28-1

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

diff --git a/pkgs/misc/themes/zuki/default.nix b/pkgs/misc/themes/zuki/default.nix
index dbdc4632dc70..35c8e58b0ae9 100644
--- a/pkgs/misc/themes/zuki/default.nix
+++ b/pkgs/misc/themes/zuki/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "zuki-themes-${version}";
-  version = "3.26-1";
+  version = "3.28-1";
 
   src = fetchFromGitHub {
     owner = "lassekongo83";
     repo = "zuki-themes";
     rev = "v${version}";
-    sha256 = "17p75h1i3hbpshhhliliq0mm88amvfnxq8659vabqd17ccgzwzns";
+    sha256 = "1if39k8vgk4cpshl625vdf8lz6jgicgybd5nilycj66sf1k5jgb9";
   };
 
   buildInputs = [ gdk_pixbuf gtk_engines ];

From 1682353805e37b29b2dc0f06efdbe8a33a07363c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 9 May 2018 18:12:13 -0500
Subject: [PATCH 1426/3370] generic-stack-builder: also support nix-build

We need to add the STACK_IN_NIX_EXTRA_ARGS hook in configurePhase also to ensure we get the right args when calling ```nix-build``` (as opposed to nix-shell).
---
 .../haskell-modules/generic-stack-builder.nix | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 5c2fced3f2e6..9ea9dae02db1 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -11,6 +11,18 @@ with stdenv.lib;
 }@args:
 
 let stackCmd = "stack --internal-re-exec-version=${stack.version}";
+
+    # Add all dependencies in buildInputs including propagated ones to
+    # STACK_IN_NIX_EXTRA_ARGS.
+    addStackArgsHook = ''
+for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
+do
+  [ -d "$pkg/lib" ] && \
+    export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
+  [ -d "$pkg/include" ] && \
+    export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
+done
+    '';
 in stdenv.mkDerivation (args // {
 
   buildInputs =
@@ -21,15 +33,7 @@ in stdenv.mkDerivation (args // {
   STACK_PLATFORM_VARIANT="nix";
   STACK_IN_NIX_SHELL=1;
   STACK_IN_NIX_EXTRA_ARGS = extraArgs;
-  shellHook = ''
-    for pkg in ''${pkgsHostHost[@]} ''${pkgsHostBuild[@]} ''${pkgsHostTarget[@]}
-    do
-      [ -d "$pkg/lib" ] && \
-        export STACK_IN_NIX_EXTRA_ARGS+=" --extra-lib-dirs=$pkg/lib"
-      [ -d "$pkg/include" ] && \
-        export STACK_IN_NIX_EXTRA_ARGS+=" --extra-include-dirs=$pkg/include"
-    done
-  '';
+  shellHook = addStackArgsHook;
 
 
   # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
@@ -46,6 +50,7 @@ in stdenv.mkDerivation (args // {
 
   configurePhase = args.configurePhase or ''
     export STACK_ROOT=$NIX_BUILD_TOP/.stack
+    ${addStackArgsHook}
   '';
 
   buildPhase = args.buildPhase or "${stackCmd} build";

From 58ab75c63917f9c09df1063d549344b892ab569a Mon Sep 17 00:00:00 2001
From: Yannik Sander <ysndr@users.noreply.github.com>
Date: Thu, 10 May 2018 01:34:57 +0200
Subject: [PATCH 1427/3370] atom: fix git integration (#40163)

---
 pkgs/applications/editors/atom/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index ca223803f04d..f646fab86294 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
     rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
     ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
+    rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git
+    ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git
 
     find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
 
@@ -45,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "A hackable text editor for the 21st Century";
     homepage = https://atom.io/;
     license = licenses.mit;
-    maintainers = [ maintainers.offline maintainers.nequissimus ];
+    maintainers = [ maintainers.offline maintainers.nequissimus maintainers.ysndr ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 948503440135e4b111b19d205b7d13ed76c2f1e3 Mon Sep 17 00:00:00 2001
From: Thorsten Weber <cpt.chaos83@googlemail.com>
Date: Thu, 10 May 2018 01:46:51 +0200
Subject: [PATCH 1428/3370] slic3r-prusa3d: 1.39.1 -> 1.39.2

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

diff --git a/pkgs/applications/misc/slic3r/prusa3d.nix b/pkgs/applications/misc/slic3r/prusa3d.nix
index 1ee2bfab94c3..371bf26fe6c8 100644
--- a/pkgs/applications/misc/slic3r/prusa3d.nix
+++ b/pkgs/applications/misc/slic3r/prusa3d.nix
@@ -33,7 +33,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "slic3r-prusa-edition-${version}";
-  version = "1.39.1";
+  version = "1.39.2";
 
   enableParallelBuilding = true;
 
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "Slic3r";
-    sha256 = "0frkjgzmiy788ijkcqz3baxcrncqmk9s2vcd99hb8p2q13cg51ff";
+    sha256 = "0vbqkmd2yqi469ijqm4wyzjmq9w1kwiy8av1kchm4429z5hpmxcd";
     rev = "version_${version}";
   };
 

From 18f4abb0ad4a76cc88b6f9c150a62fa68093294a Mon Sep 17 00:00:00 2001
From: Ruben Maher <ruben@maher.fyi>
Date: Wed, 9 May 2018 17:13:25 +0930
Subject: [PATCH 1429/3370] cocoapods: 1.3.1 -> 1.5.0

---
 .../development/mobile/cocoapods/Gemfile.lock | 42 +++++++-------
 pkgs/development/mobile/cocoapods/gemset.nix  | 58 +++++++++++--------
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock
index 0ab15f1efd2f..7ca6e40406a4 100644
--- a/pkgs/development/mobile/cocoapods/Gemfile.lock
+++ b/pkgs/development/mobile/cocoapods/Gemfile.lock
@@ -1,38 +1,39 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.6)
+    CFPropertyList (3.0.0)
     activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    atomos (0.1.2)
     claide (1.0.2)
-    cocoapods (1.3.1)
+    cocoapods (1.5.0)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.3.1)
-      cocoapods-deintegrate (>= 1.0.1, < 2.0)
-      cocoapods-downloader (>= 1.1.3, < 2.0)
+      cocoapods-core (= 1.5.0)
+      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-downloader (>= 1.2.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.2.0, < 2.0)
+      cocoapods-trunk (>= 1.3.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
       fourflusher (~> 2.0.1)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.5.7)
+      molinillo (~> 0.6.5)
       nap (~> 1.0)
       ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.1, < 2.0)
-    cocoapods-core (1.3.1)
+      xcodeproj (>= 1.5.7, < 2.0)
+    cocoapods-core (1.5.0)
       activesupport (>= 4.0.2, < 6)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.1)
-    cocoapods-downloader (1.1.3)
+    cocoapods-deintegrate (1.0.2)
+    cocoapods-downloader (1.2.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
@@ -46,23 +47,24 @@ GEM
     escape (0.0.4)
     fourflusher (2.0.1)
     fuzzy_match (2.0.4)
-    gh_inspector (1.0.3)
-    i18n (0.9.1)
+    gh_inspector (1.1.3)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.10.3)
-    molinillo (0.5.7)
-    nanaimo (0.2.3)
+    minitest (5.11.3)
+    molinillo (0.6.5)
+    nanaimo (0.2.5)
     nap (1.1.0)
     netrc (0.11.0)
     ruby-macho (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.5.3)
-      CFPropertyList (~> 2.3.3)
+    xcodeproj (1.5.7)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.2)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.3)
+      nanaimo (~> 0.2.4)
 
 PLATFORMS
   ruby
diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix
index ff7b14e6dd8a..cd4156d141c5 100644
--- a/pkgs/development/mobile/cocoapods/gemset.nix
+++ b/pkgs/development/mobile/cocoapods/gemset.nix
@@ -8,13 +8,21 @@
     };
     version = "4.2.10";
   };
+  atomos = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10z69hjv30r2w5q5wmlf0cq4jv3w744jrac8ylln8sf45ckqj7wk";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
   CFPropertyList = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0hadm41xr1fq3qp74jd9l5q8l0j9083rgklgzsilllwaav7qrrid";
+      sha256 = "0ykjag3k5msz3sf1j91rb55da2xh596y06m3a4yl79fiy2id0w9z";
       type = "gem";
     };
-    version = "2.3.6";
+    version = "3.0.0";
   };
   claide = {
     source = {
@@ -28,35 +36,35 @@
     dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "050b7795jc6802wcpcgi702qkgy8vjidgq6c6mbx2alrq7l0n8q7";
+      sha256 = "0pg2rkw6rlqq0y2vpajw4946hmvcnrg6lhr1i5p7j7kj8y5az167";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.5.0";
   };
   cocoapods-core = {
     dependencies = ["activesupport" "fuzzy_match" "nap"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0pr42lpqs6q51gnnfxmgmbx7sw0dwyawylssj588izj8av18rhpy";
+      sha256 = "0mqxgd22rj49pfasvinsn7z1bzm899m8cfw38yr38nspri10acad";
       type = "gem";
     };
-    version = "1.3.1";
+    version = "1.5.0";
   };
   cocoapods-deintegrate = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1x4hxlip6zkrs1vcmw7sh45ayn5pxvsg782iifnmgjwn2pyskj7l";
+      sha256 = "10b49glw3jd0r1vj36zb0vz2idwgziq8qgzf7yjkrsm41xm098zz";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.0.2";
   };
   cocoapods-downloader = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1664qg1wml70slcfklpnyq5ixp145f6iyn3c6pcqkqc64i1bsg87";
+      sha256 = "1azzwyxvcqk5g394ica80x7pj7bh9zysk2q7x1jh8zbwrp6c0x8c";
       type = "gem";
     };
-    version = "1.1.3";
+    version = "1.2.0";
   };
   cocoapods-plugins = {
     dependencies = ["nap"];
@@ -143,43 +151,43 @@
   gh_inspector = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x";
+      sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.1.3";
   };
   i18n = {
     dependencies = ["concurrent-ruby"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "032wbfixfpwa67c893x5sn02ab0928vfqfshcs02bwkkxpqy9x8s";
+      sha256 = "038qvz7kd3cfxk8bvagqhakx68pfbnmghpdkx7573wbf0maqp9a3";
       type = "gem";
     };
-    version = "0.9.1";
+    version = "0.9.5";
   };
   minitest = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2";
+      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
       type = "gem";
     };
-    version = "5.10.3";
+    version = "5.11.3";
   };
   molinillo = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758";
+      sha256 = "19zlshd1ra15x0a4jzss6ilz2xsnq293p43kxsljiy7xxq7bipx7";
       type = "gem";
     };
-    version = "0.5.7";
+    version = "0.6.5";
   };
   nanaimo = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd";
+      sha256 = "03x5f7hk0s21hlkj309w0qipjxz34kyd3c5yj25zq3s2yyn57idi";
       type = "gem";
     };
-    version = "0.2.3";
+    version = "0.2.5";
   };
   nap = {
     source = {
@@ -217,18 +225,18 @@
     dependencies = ["thread_safe"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp";
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
       type = "gem";
     };
-    version = "1.2.4";
+    version = "1.2.5";
   };
   xcodeproj = {
-    dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"];
+    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7";
+      sha256 = "16743g16mrh47f1lxkbw28xn9mmlf1r0zicin4malalsxxkc7ykz";
       type = "gem";
     };
-    version = "1.5.3";
+    version = "1.5.7";
   };
 }
\ No newline at end of file

From e42a7a5c0bdeb4c40921d319ae6a14f7e304e4df Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 9 May 2018 23:33:31 -0400
Subject: [PATCH 1430/3370] lib/systems: Add uClibc just like MUSL

---
 lib/systems/default.nix | 1 +
 lib/systems/inspect.nix | 1 +
 lib/systems/parse.nix   | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index bd408e00bb14..9b9308246098 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -29,6 +29,7 @@ rec {
         /**/ if final.isDarwin              then "libSystem"
         else if final.isMinGW               then "msvcrt"
         else if final.isMusl                then "musl"
+        else if final.isUClibc              then "uclibc"
         else if final.isAndroid             then "bionic"
         else if final.isLinux /* default */ then "glibc"
         # TODO(@Ericson2314) think more about other operating systems
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 91ae2cd2557e..6738ae3d441e 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -36,6 +36,7 @@ rec {
 
     isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
     isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
+    isUClibc       = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
 
     isKexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
                        [ "x86" "arm" "aarch64" "mips" ];
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index ffedd98c98d8..7ba06f129db8 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -193,6 +193,9 @@ rec {
     musleabi = {};
     musleabihf = {};
     musl = {};
+    uclibceabihf = {};
+    uclibceabi = {};
+    uclibc = {};
 
     unknown = {};
   };

From f063a860d69c5fbf3695a262da6a551ddd92a5f2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 May 2018 22:40:27 -0400
Subject: [PATCH 1431/3370] xbursttools: Cleanup slightly

---
 lib/systems/examples.nix                 | 14 ++++++++++++++
 pkgs/tools/misc/xburst-tools/default.nix |  4 ++--
 pkgs/top-level/all-packages.nix          | 18 ++----------------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 848737700b0b..f3abfe2c621f 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -57,6 +57,20 @@ rec {
     platform = platforms.pogoplug4;
   };
 
+  ben-nanonote = rec {
+    config = "mipsel-unknown-linux-uclibc";
+    arch = "mips";
+    float = "soft";
+    platform = {
+      name = "ben_nanonote";
+      kernelMajor = "2.6";
+      kernelArch = "mips";
+      gcc = {
+        arch = "mips32";
+      };
+    };
+  };
+
   fuloongminipc = rec {
     config = "mipsel-unknown-linux-gnu";
     arch = "mips";
diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix
index c64ae609bcbb..21aabc4e89cc 100644
--- a/pkgs/tools/misc/xburst-tools/default.nix
+++ b/pkgs/tools/misc/xburst-tools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, libusb, libusb1, autoconf, automake, confuse, pkgconfig
-, gccCross ? null, crossPrefix
+, gccCross ? null
 }:
 
 let
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
   '';
 
   configureFlags = if gccCross != null then
-    "--enable-firmware CROSS_COMPILE=${crossPrefix}-"
+    "--enable-firmware CROSS_COMPILE=${gccCross.targetPrefix}"
     else "";
 
   # Not to strip cross build binaries (this is for the gcc-cross-wrapper)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d38f8d201889..627bac20e938 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5512,28 +5512,14 @@ with pkgs;
 
   x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { };
 
-  xbursttools = assert stdenv ? glibc; callPackage ../tools/misc/xburst-tools rec {
+  xbursttools = callPackage ../tools/misc/xburst-tools {
     # It needs a cross compiler for mipsel to build the firmware it will
     # load into the Ben Nanonote
-    crossPrefix = "mipsel-unknown-linux-gnu";
     gccCross =
       let
         pkgsCross = nixpkgsFun {
           # Ben Nanonote system
-          crossSystem = {
-            config = crossPrefix;
-            arch = "mips";
-            float = "soft";
-            libc = "uclibc";
-            platform = {
-              name = "ben_nanonote";
-              kernelMajor = "2.6";
-              kernelArch = "mips";
-            };
-            gcc = {
-              arch = "mips32";
-            };
-          };
+          crossSystem = lib.systems.examples.ben-nanonote;
         };
       in
         pkgsCross.buildPackages.gccCrossStageStatic;

From 9dadb9e3cb20003d2510d1911a44f93a60cdf87a Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 9 May 2018 03:40:34 -0400
Subject: [PATCH 1432/3370] Fix hsc2hs cross compiler build

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

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index b588592a71cf..94555482d28b 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -3,7 +3,7 @@
 
 # build-tools
 , bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchurl, perl, python3
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3
 
 , libffi, libiconv ? null, ncurses
 
@@ -81,6 +81,13 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "doc" ];
 
+  patches = [(fetchpatch {
+    url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
+    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
+    extraPrefix = "utils/hsc2hs/";
+    stripLen = 1;
+  })];
+
   postPatch = "patchShebangs .";
 
   # GHC is a bit confused on its cross terminology.

From 17b2ef2461ccaae59aef957babcdfc7a57d71bb3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 11:54:33 +0800
Subject: [PATCH 1433/3370] hugo: 0.36.1 -> 0.40.3

---
 pkgs/applications/misc/hugo/default.nix |   4 +-
 pkgs/applications/misc/hugo/deps.nix    | 122 ++++++++++++------------
 2 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix
index f984cb712c7a..e4e45dd570bf 100644
--- a/pkgs/applications/misc/hugo/default.nix
+++ b/pkgs/applications/misc/hugo/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "hugo-${version}";
-  version = "0.36.1";
+  version = "0.40.3";
 
   goPackagePath = "github.com/gohugoio/hugo";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "gohugoio";
     repo   = "hugo";
     rev    = "v${version}";
-    sha256 = "179lzkd6f81rssgcwlngx2mhr9nvbj0rsh6yjbf1fsrpxfzr2q9z";
+    sha256 = "08d4y6x19cd4qy9pf80zrqarcyarbzxph0yp8mfb1sp2bvq42308";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix
index cf55ef4b64b2..a99eb563dc27 100644
--- a/pkgs/applications/misc/hugo/deps.nix
+++ b/pkgs/applications/misc/hugo/deps.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/PuerkitoBio/purell";
-      rev = "1c4bec281e4bbc75b4f4a1bd923bdf1bd989a969";
-      sha256 = "05aif0xf3i6j6r0ivas8ywagkz92iynsa0xnkbrif4w1chzalx0f";
+      rev = "975f53781597ed779763b7b65566e74c4004d8de";
+      sha256 = "1j5l793zxrjv09z3cdgs05qn45sbhbm9njsw5cfv168x8z88pd3l";
     };
   }
   {
@@ -32,8 +32,17 @@
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/chroma";
-      rev = "df4ec264daccb2ecb17bde9134830100701199c5";
-      sha256 = "1snw7byfkfvvw0579jc0yxk79j1v1rb0jdcvivfsalh064zmjdvd";
+      rev = "222a1f0fc811afd47471d4a4e32f3aa09b6f9cdf";
+      sha256 = "090yb9f9gld4l0r6x8y2a6a3ghiqbyh19fgmjcjfq8qlv0vj5n4s";
+    };
+  }
+  {
+    goPackagePath = "github.com/bep/debounce";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bep/debounce";
+      rev = "844797fa1dd9ba969d71b62797ff19d1e49d4eac";
+      sha256 = "1sh4zv0hv7f454mhzpl2mbv7ar5rm00wyy5qr78x1h84bgph87wy";
     };
   }
   {
@@ -41,8 +50,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/bep/gitmap";
-      rev = "de8030ebafb76c6e84d50ee6d143382637c00598";
-      sha256 = "0adkv2ghi0zd104akksa9wjzj7s849wpa1rij03mycgxp4si9ami";
+      rev = "012701e8669671499fc43e9792335a1dcbfe2afb";
+      sha256 = "10ixv4zwmrpxvpchws78yzsjvw1zplljw3iqvwpina2mkwwp71ql";
     };
   }
   {
@@ -77,8 +86,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/disintegration/imaging";
-      rev = "1884593a19ddc6f2ea050403430d02c1d0fc1283";
-      sha256 = "13wlkidihz7gc36hd1vy7i81d0v1rbnw97118z3slq1kv1j56zll";
+      rev = "bbcee2f5c9d5e94ca42c8b50ec847fec64a6c134";
+      sha256 = "0dzwqy1xcm0d481z1fa2r60frdlf5fzjligpiqh5g8lhqskk2lx8";
     };
   }
   {
@@ -113,8 +122,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gobuffalo/envy";
-      rev = "50fabbbaf1e65fc9b739f37a00590c396485d84d";
-      sha256 = "0js2hggb1gybk28pk3hcsb1m6rswfdzvvr194z4my4za09ly5jax";
+      rev = "ef60bfc50c8f92d1ee64674d8ce7a48f1f67625e";
+      sha256 = "15qrmw3l2achpd3hz8fkkz7yzpbvldm1pf1vsr250q24nsh6x7iz";
     };
   }
   {
@@ -122,8 +131,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gobwas/glob";
-      rev = "19c076cdf202b3d1c0489bdfa2f2f289f634474b";
-      sha256 = "0176psz3m0pks0ka6pb62g7ccq5izzj0i7c0j20lb7dp3kawphxs";
+      rev = "f00a7392b43971b2fdb562418faab1f18da2067a";
+      sha256 = "1b7jnb7rx99na25lkm9m9jr583mv7y0lwp57w58sv7ir9iiilx29";
     };
   }
   {
@@ -131,8 +140,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/gorilla/websocket";
-      rev = "f37d1588608ec036fa9b0b7b8afbde47dc06aea9";
-      sha256 = "1y0z7k4yi8aaw6yjm8s92hvbkyc51b5azpiywminjj1a84czvzvq";
+      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
+      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
     };
   }
   {
@@ -158,8 +167,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/hashicorp/hcl";
-      rev = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8";
-      sha256 = "0db4lpqb5m130rmfy3s3gjjf4dxllypmyrzxv6ggqhkmwmc7w4mc";
+      rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
     };
   }
   {
@@ -176,8 +185,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/joho/godotenv";
-      rev = "6bb08516677f8c8274c557fc801bee9ab564ab2c";
-      sha256 = "0jqczq5x5zwgs29vrmq87335c99gi5jrvxkwcpidz98yqg95db4f";
+      rev = "1709ab122c988931ad53508747b3c061400c2984";
+      sha256 = "1pym5lydb28ggxrz80q9s26bj2bd80ax1igm1zfhyhx9i3060kif";
     };
   }
   {
@@ -203,8 +212,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/markbates/inflect";
-      rev = "80fa1ea41b0dc859816314ab0b85f07a6bc57923";
-      sha256 = "0fmpfcz8g0qsb6h94yqpcms2bdb68qac706b54x0k1crfzl1d1mj";
+      rev = "fbc6b23ce49e2578f572d2e72bb72fa03c7145de";
+      sha256 = "10rf7kfqnic8x4z8c29whb76w9v847y63wh5b2kfx6rqhrjfilis";
     };
   }
   {
@@ -212,8 +221,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mattn/go-runewidth";
-      rev = "97311d9f7767e3d6f422ea06661bc2c7a19e8a5d";
-      sha256 = "0dxlrzn570xl7gb11hjy1v4p3gw3r41yvqhrffgw95ha3q9p50cg";
+      rev = "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
     };
   }
   {
@@ -225,15 +234,6 @@
       sha256 = "0hlqcwx6qqgy3vs13r10wn0d9x0xmww1v9jm09y2dp1ykgbampnk";
     };
   }
-  {
-    goPackagePath = "github.com/mitchellh/go-homedir";
-    fetch = {
-      type = "git";
-      url = "https://github.com/mitchellh/go-homedir";
-      rev = "b8bc1bf767474819792c23f32d8286a45736f1c6";
-      sha256 = "13ry4lylalkh4g2vny9cxwvryslzyzwp9r92z0b10idhdq3wad1q";
-    };
-  }
   {
     goPackagePath = "github.com/mitchellh/mapstructure";
     fetch = {
@@ -248,8 +248,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/muesli/smartcrop";
-      rev = "c2a0373a193bac1daf8b6691e2ece069c5d7ac7f";
-      sha256 = "1jv68g9wddm2a1kf838anjnr4w17k7sqzz01h4z2lfashw3nanar";
+      rev = "f6ebaa786a12a0fdb2d7c6dee72808e68c296464";
+      sha256 = "0xbv5wbn0z36nkw9ay3ly6z23lpsrs0khryl1w54fz85lvwh66gp";
     };
   }
   {
@@ -257,8 +257,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nicksnyder/go-i18n";
-      rev = "ec04da47793482067e2e376d810e1622277368e4";
-      sha256 = "1c7ip5jidvssr8d4dbx9nchf99m13wblgaz630f7wm73y99dc3lr";
+      rev = "8c6996ea1058153460146b16c341a4ae611f7cf7";
+      sha256 = "1k8ai8mdi5cqbcxihzx727z3gg46lpkw0s1byb3lrdnmp31l7p9r";
     };
   }
   {
@@ -266,8 +266,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/olekukonko/tablewriter";
-      rev = "b8a9be070da40449e501c3c4730a889e42d87a9e";
-      sha256 = "1z9frlk9avqhzjv6zz2rg7mvdhzcr9acdgagblijwwkx01f02hw7";
+      rev = "d4647c9c7a84d847478d890b816b7d8b62b0b279";
+      sha256 = "1274k5r9ardh1f6gsmadxmdds7zy8rkr55fb9swvnm0vazr3y01l";
     };
   }
   {
@@ -275,8 +275,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/pelletier/go-toml";
-      rev = "acdc4509485b587f5e675510c4f2c63e90ff68a8";
-      sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
+      rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
+      sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
     };
   }
   {
@@ -284,8 +284,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/russross/blackfriday";
-      rev = "55d61fa8aa702f59229e6cff85793c22e580eaf5";
-      sha256 = "0qmavm5d14kj6im6sqzpqnlhpy524428vkn4hnfwknndr9rycmn0";
+      rev = "11635eb403ff09dbc3a6b5a007ab5ab09151c229";
+      sha256 = "14j8ibm6h9rydiwfp9b5c7rwhnx04yqyxv1a7p7rmfwyg4zd714n";
     };
   }
   {
@@ -302,8 +302,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/afero";
-      rev = "bbf41cb36dffe15dff5bf7e18c447801e7ffe163";
-      sha256 = "19jgsm6y1yp99h0fr77rhamdsn34r8545if7y9q377l3phrz2s0l";
+      rev = "63644898a8da0bc22138abf860edaf5277b6102e";
+      sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
     };
   }
   {
@@ -320,8 +320,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/cobra";
-      rev = "be77323fc05148ef091e83b3866c0d47c8e74a8b";
-      sha256 = "0kl0psbdg8cyznwvq13sva6r4ggmhwzfxdjmkl2vqhy83xq3a6yn";
+      rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
     };
   }
   {
@@ -356,8 +356,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/pflag";
-      rev = "ee5fd03fd6acfd43e44aea0b4135958546ed8e73";
-      sha256 = "1fgb1ph3vrqcpdvypp3c1fwj15r587l9yvv5wqcq08shln5rbsnk";
+      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
     };
   }
   {
@@ -365,8 +365,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/spf13/viper";
-      rev = "aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5";
-      sha256 = "089balmspfs2x68wr4riwh7qvhf0b061wqqqfw8j4p9pxvwrxsdc";
+      rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
+      sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
     };
   }
   {
@@ -383,8 +383,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/image";
-      rev = "12117c17ca67ffa1ce22e9409f3b0b0a93ac08c7";
-      sha256 = "017xpcshrj1r2w20xvpcx0rklpfmbz6h16msv12l3x0w6vy0800s";
+      rev = "f315e440302883054d0c2bd85486878cb4f8572c";
+      sha256 = "010pc6qjppqd9c7rramiwz7myvip9vhridfxy7wc2qj1kr92b4dc";
     };
   }
   {
@@ -392,8 +392,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "cbe0f9307d0156177f9dd5dc85da1a31abc5f2fb";
-      sha256 = "1hmpqkxh97ayyy0xcdvf1bwirwja4wyin3sh0fzjlh93aqmqgylf";
+      rev = "f73e4c9ed3b7ebdd5f699a16a880c2b1994e50dd";
+      sha256 = "1mvnpln6vm0y1i5bb0ycswds49hyapg3jz643lmlw6d183jdcg0q";
     };
   }
   {
@@ -401,8 +401,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
-      sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
+      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
     };
   }
   {
@@ -410,8 +410,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "37707fdb30a5b38865cfb95e5aab41707daec7fd";
-      sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
+      rev = "64746a42f36bf0832f86b76004f1699dbeb33e4f";
+      sha256 = "1hbk7cnbywiwxdzbx7lqw6iym9dpwvdyacg06gchxpfw7nfa9r27";
     };
   }
   {
@@ -419,8 +419,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "9e2b64d659da1afe07ce1c9c1dfefc09d188f21e";
-      sha256 = "00ichxdybvs76gj805j828qxg7x4h4v64pq1s56ydaw07ja6lmry";
+      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
+      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
     };
   }
   {
@@ -428,8 +428,8 @@
     fetch = {
       type = "git";
       url = "https://gopkg.in/yaml.v2";
-      rev = "d670f9405373e636a5a2765eea47fac0c9bc91a4";
-      sha256 = "1w1xid51n8v1mydn2m3vgggw8qgpd5a5sr62snsc77d99fpjsrs0";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
     };
   }
 ]

From d65fe65616f28b60102fd9d05e593676e5a75555 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 May 2018 20:49:12 -0400
Subject: [PATCH 1434/3370] uclibc: Fix eval

---
 pkgs/os-specific/linux/uclibc/default.nix | 38 ++++++++++++-----------
 pkgs/top-level/all-packages.nix           |  9 +++---
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 180aabc94cc6..426834d42255 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null,
-extraConfig ? ""}:
-
-assert stdenv.isLinux;
-assert cross != null -> gccCross != null;
+{ stdenv, buildPackages
+, fetchzip, linuxHeaders, libiconvReal
+, buildPlatform, hostPlatform
+, extraConfig ? ""
+}:
 
 let
   configParser = ''
@@ -28,9 +28,6 @@ let
     }
   '';
 
-  archMakeFlag = if cross != null then "ARCH=${cross.arch}" else "";
-  crossMakeFlag = if cross != null then "CROSS=${cross.config}-" else "";
-
   # UCLIBC_SUSV4_LEGACY defines 'tmpnam', needed for gcc libstdc++ builds.
   nixConfig = ''
     RUNTIME_PREFIX "/"
@@ -43,7 +40,7 @@ let
     UCLIBC_SUSV4_LEGACY y
     UCLIBC_HAS_THREADS_NATIVE y
     KERNEL_HEADERS "${linuxHeaders}/include"
-  '' + stdenv.lib.optionalString (stdenv.isAarch32 && cross == null) ''
+  '' + stdenv.lib.optionalString (stdenv.isAarch32 && buildPlatform != hostPlatform) ''
     CONFIG_ARM_EABI y
     ARCH_WANTS_BIG_ENDIAN n
     ARCH_BIG_ENDIAN n
@@ -58,7 +55,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = name + stdenv.lib.optionalString (cross != null) ("-" + cross.config);
+  inherit name;
 
   src = fetchzip {
     name = name + "-source";
@@ -68,13 +65,12 @@ stdenv.mkDerivation {
 
   # 'ftw' needed to build acl, a coreutils dependency
   configurePhase = ''
-    make defconfig ${archMakeFlag}
+    make defconfig
     ${configParser}
     cat << EOF | parseconfig
     ${nixConfig}
     ${extraConfig}
-    ${if cross != null then stdenv.lib.attrByPath [ "uclibc" "extraConfig" ] "" cross else ""}
-    $extraCrossConfig
+    ${hostPlatform.platform.uclibc.extraConfig or ""}
     EOF
     ( set +o pipefail; yes "" | make oldconfig )
   '';
@@ -82,11 +78,16 @@ stdenv.mkDerivation {
   hardeningDisable = [ "stackprotector" ];
 
   # Cross stripping hurts.
-  dontStrip = cross != null;
+  dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
-  makeFlags = [ crossMakeFlag "VERBOSE=1" ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  buildInputs = stdenv.lib.optional (gccCross != null) gccCross;
+  makeFlags = [
+    "ARCH=${hostPlatform.parsed.cpu.name}"
+    "VERBOSE=1"
+  ] ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+    "CROSS=${stdenv.cc.targetPrefix}"
+  ];
 
   # `make libpthread/nptl/sysdeps/unix/sysv/linux/lowlevelrwlock.h`:
   # error: bits/sysnum.h: No such file or directory
@@ -94,7 +95,7 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out
-    make PREFIX=$out VERBOSE=1 install ${crossMakeFlag}
+    make PREFIX=$out VERBOSE=1 install
     (cd $out/include && ln -s $(ls -d ${linuxHeaders}/include/* | grep -v "scsi$") .)
     # libpthread.so may not exist, so I do || true
     sed -i s@/lib/@$out/lib/@g $out/lib/libc.so $out/lib/libpthread.so || true
@@ -110,6 +111,7 @@ stdenv.mkDerivation {
     description = "A small implementation of the C library";
     maintainers = with maintainers; [ rasendubi ];
     license = licenses.lgpl2;
-    platforms = subtractLists ["aarch64-linux"] platforms.linux;
+    platforms = platforms.linux;
+    broken = hostPlatform.isAarch64;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 627bac20e938..c27168530e0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8903,7 +8903,7 @@ with pkgs;
     # hack fixes the hack, *sigh*.
     /**/ if name == "glibc" then targetPackages.glibcCross or glibcCross
     else if name == "bionic" then targetPackages.bionic
-    else if name == "uclibc" then uclibcCross
+    else if name == "uclibc" then targetPackages.uclibcCross
     else if name == "musl" then targetPackages.muslCross or muslCross
     else if name == "msvcrt" then targetPackages.windows.mingw_w64 or windows.mingw_w64
     else if name == "libSystem" then darwin.xcode
@@ -13819,10 +13819,9 @@ with pkgs;
 
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
-  uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-    gccCross = gccCrossStageStatic;
-    cross = assert targetPlatform != buildPlatform; targetPlatform;
-  });
+  uclibcCross = callPackage ../os-specific/linux/uclibc {
+    stdenv = crossLibcStdenv;
+  };
 
   udev = systemd;
   libudev = udev;

From a31984ecdaf7b011163c3c71679eb285d951d735 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Wed, 9 May 2018 23:20:29 -0400
Subject: [PATCH 1435/3370] uclibc: Bump to uclibc-ng 1.0.30

---
 pkgs/os-specific/linux/uclibc/default.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix
index 426834d42255..3da12c41dc12 100644
--- a/pkgs/os-specific/linux/uclibc/default.nix
+++ b/pkgs/os-specific/linux/uclibc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPackages
-, fetchzip, linuxHeaders, libiconvReal
+, fetchurl, linuxHeaders, libiconvReal
 , buildPlatform, hostPlatform
 , extraConfig ? ""
 }:
@@ -49,18 +49,17 @@ let
     UCLIBC_HAS_FPU n
   '';
 
-  name = "uclibc-0.9.34-pre-20150131";
-  rev = "343f6b8f1f754e397632b0552e4afe586c8b392b";
-
+  version = "1.0.30";
 in
 
 stdenv.mkDerivation {
-  inherit name;
+  name = "uclibc-ng-${version}";
+  inherit version;
 
-  src = fetchzip {
-    name = name + "-source";
-    url = "http://git.uclibc.org/uClibc/snapshot/uClibc-${rev}.tar.bz2";
-    sha256 = "1kgylzpid7da5i7wz7slh5q9rnq1m8bv5h9ilm76g0xwc2iwlhbw";
+  src = fetchurl {
+    url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2";
+    # from "${url}.sha256";
+    sha256 = "3e0f057f24882823d697126015aa4d7d48fa2542be3939985cb3c26dcbcab5a8";
   };
 
   # 'ftw' needed to build acl, a coreutils dependency
@@ -107,11 +106,10 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
-    homepage = http://www.uclibc.org/;
+    homepage = "https://uclibc-ng.org";
     description = "A small implementation of the C library";
     maintainers = with maintainers; [ rasendubi ];
     license = licenses.lgpl2;
     platforms = platforms.linux;
-    broken = hostPlatform.isAarch64;
   };
 }

From 3390592cfc5d5406f7316a31661e6b0eeb2d352b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 10 May 2018 07:16:18 +0200
Subject: [PATCH 1436/3370] python.pkgs.traitlets: fix build and don't include
 .pytest_cache

Fixes build and prevents including `.pytest_cache` file (#40259).
---
 pkgs/development/python-modules/traitlets/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix
index c34bb09b794c..8cc1332b473f 100644
--- a/pkgs/development/python-modules/traitlets/default.nix
+++ b/pkgs/development/python-modules/traitlets/default.nix
@@ -7,6 +7,8 @@
 , ipython_genutils
 , decorator
 , enum34
+, pythonOlder
+, six
 }:
 
 buildPythonPackage rec {
@@ -20,12 +22,14 @@ buildPythonPackage rec {
   };
 
   checkInputs = [ glibcLocales pytest mock ];
-  propagatedBuildInputs = [ ipython_genutils decorator enum34 ];
+  propagatedBuildInputs = [ ipython_genutils decorator six ] ++ lib.optional (pythonOlder "3.4") enum34;
 
   checkPhase = ''
-    LC_ALL="en_US.UTF-8" py.test $out
+    LC_ALL="en_US.UTF-8" py.test
   '';
 
+#   doCheck = false;
+
   meta = {
     description = "Traitlets Python config system";
     homepage = http://ipython.org/;

From 6e62f01912afe4cd81e993945d731c1cccd9b281 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 13:25:31 +0800
Subject: [PATCH 1437/3370] slang: 2.3.1a -> 2.3.2

---
 pkgs/development/libraries/slang/default.nix | 23 +++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 70e9d6181d92..bcce457e78e8 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, ncurses, pcre, libpng, zlib, readline, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "slang-2.3.1a";
+  name = "slang-2.3.2";
   src = fetchurl {
     url = "http://www.jedsoft.org/releases/slang/${name}.tar.bz2";
-    sha256 = "0dlcy0hn0j6cj9qj5x6hpb0axifnvzzmv5jqq0wq14fygw0c7w2l";
+    sha256 = "06p379fqn6w38rdpqi98irxi2bf4llb0rja3dlgkqz7nqh7kp7pw";
   };
 
   outputs = [ "out" "dev" "man" "doc" ];
@@ -16,10 +16,23 @@ stdenv.mkDerivation rec {
     sed -i -e "s|/bin/ln|ln|" src/Makefile.in
     sed -i -e "s|-ltermcap|-lncurses|" ./configure
   '';
-  configureFlags = "--with-png=${libpng.dev} --with-z=${zlib.dev} --with-pcre=${pcre.dev} --with-readline=${readline.dev}";
-  buildInputs = [ pcre libpng zlib readline ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
+
+  configureFlags = [
+    "--with-png=${libpng.dev}"
+    "--with-z=${zlib.dev}"
+    "--with-pcre=${pcre.dev}"
+    "--with-readline=${readline.dev}"
+  ];
+
+  buildInputs = [
+    pcre libpng zlib readline
+  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ libiconv ];
+
   propagatedBuildInputs = [ ncurses ];
 
+  # slang 2.3.2 does not support parallel building
+  enableParallelBuilding = false;
+
   postInstall = ''
     find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \;
     sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc
@@ -29,7 +42,7 @@ stdenv.mkDerivation rec {
     description = "A multi-platform programmer's library designed to allow a developer to create robust software";
     homepage = http://www.jedsoft.org/slang/;
     license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ fuuzetsu ];
     platforms = platforms.unix;
-    maintainers = [ maintainers.fuuzetsu ];
   };
 }

From 0c810eeae1294ed2d6454c8d114f64a58671e3b8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 13:25:48 +0800
Subject: [PATCH 1438/3370] mc: parallel build

---
 pkgs/tools/misc/mc/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index f9983cc0a7f6..bc097e2a0857 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -11,8 +11,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ perl glib slang zip unzip file gettext libX11 libICE
-    libssh2 openssl ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
+
+  buildInputs = [
+    perl glib slang zip unzip file gettext libX11 libICE libssh2 openssl
+  ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];
+
+  enableParallelBuilding = true;
 
   configureFlags = [ "--enable-vfs-smb" ];
 

From a02be2bd85b37ed8b257e969d9439357844baa24 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 00:57:52 -0400
Subject: [PATCH 1439/3370] treewide: Get rid of `*Platform.arch`

Use `parsed.cpu.name` or `platform.gcc.arch` instead.
---
 lib/systems/examples.nix                           | 12 +-----------
 pkgs/applications/video/omxplayer/default.nix      |  2 +-
 pkgs/development/libraries/ffmpeg-full/default.nix |  2 +-
 pkgs/development/libraries/ffmpeg/generic.nix      |  2 +-
 pkgs/development/libraries/fontconfig/2.10.nix     |  4 +++-
 pkgs/development/libraries/fontconfig/default.nix  |  4 +++-
 pkgs/development/libraries/libav/default.nix       |  2 +-
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index f3abfe2c621f..80e320406bf4 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -11,22 +11,19 @@ rec {
 
   sheevaplug = rec {
     config = "armv5tel-unknown-linux-gnueabi";
-    arch = "armv5tel";
     float = "soft";
     platform = platforms.sheevaplug;
   };
 
   raspberryPi = rec {
     config = "armv6l-unknown-linux-gnueabihf";
-    arch = "armv6l";
     float = "hard";
     fpu = "vfp";
     platform = platforms.raspberrypi;
   };
 
   armv7l-hf-multiplatform = rec {
-    config = "arm-unknown-linux-gnueabihf";
-    arch = "armv7-a";
+    config = "armv7a-unknown-linux-gnueabihf";
     float = "hard";
     fpu = "vfpv3-d16";
     platform = platforms.armv7l-hf-multiplatform;
@@ -34,13 +31,11 @@ rec {
 
   aarch64-multiplatform = rec {
     config = "aarch64-unknown-linux-gnu";
-    arch = "aarch64";
     platform = platforms.aarch64-multiplatform;
   };
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
-    arch = "aarch64";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
@@ -51,7 +46,6 @@ rec {
   };
 
   pogoplug4 = rec {
-    arch = "armv5tel";
     config = "armv5tel-unknown-linux-gnueabi";
     float = "soft";
     platform = platforms.pogoplug4;
@@ -59,7 +53,6 @@ rec {
 
   ben-nanonote = rec {
     config = "mipsel-unknown-linux-uclibc";
-    arch = "mips";
     float = "soft";
     platform = {
       name = "ben_nanonote";
@@ -73,7 +66,6 @@ rec {
 
   fuloongminipc = rec {
     config = "mipsel-unknown-linux-gnu";
-    arch = "mips";
     float = "hard";
     platform = platforms.fuloong2f_n32;
   };
@@ -122,7 +114,6 @@ rec {
   # 32 bit mingw-w64
   mingw32 = {
     config = "i686-pc-mingw32";
-    arch = "x86"; # Irrelevant
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
     platform = {};
   };
@@ -131,7 +122,6 @@ rec {
   mingwW64 = {
     # That's the triplet they use in the mingw-w64 docs.
     config = "x86_64-pc-mingw32";
-    arch = "x86_64"; # Irrelevant
     libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain
     platform = {};
   };
diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
index 825bfe7955a8..520451df400f 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -52,7 +52,7 @@ let
         "--cross-prefix=${stdenv.cc.targetPrefix}"
         "--enable-cross-compile"
         "--target_os=linux"
-        "--arch=${hostPlatform.arch}"
+        "--arch=${hostPlatform.parsed.cpu.name}"
         ];
     };
 
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 67e364715f09..f991418ffdab 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -442,7 +442,7 @@ stdenv.mkDerivation rec {
       "--cross-prefix=${stdenv.cc.targetPrefix}"
       "--enable-cross-compile"
       "--target_os=${hostPlatform.parsed.kernel.name}"
-      "--arch=${hostPlatform.arch}"
+      "--arch=${hostPlatform.parsed.cpu.name}"
     ];
   };
 
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 4a05eab87bd7..530639d757de 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -176,7 +176,7 @@ stdenv.mkDerivation rec {
       "--cross-prefix=${stdenv.cc.targetPrefix}"
       "--enable-cross-compile"
       "--target_os=${hostPlatform.parsed.kernel.name}"
-      "--arch=${hostPlatform.arch}"
+      "--arch=${hostPlatform.parsed.cpu.name}"
     ];
   };
 
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix
index 3f3c04b15a30..5fb0ea4429e7 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/pkgs/development/libraries/fontconfig/2.10.nix
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
   ];
 
   # We should find a better way to access the arch reliably.
-  crossArch = hostPlatform.arch or null;
+  crossArch = if stdenv.hostPlatform != stdenv.buildPlatform
+    then hostPlatform.parsed.cpu.name
+    else null;
 
   preConfigure = ''
     if test -n "$crossConfig"; then
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 9c4116c8f0ba..ce41f1ac7ebc 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -56,7 +56,9 @@ stdenv.mkDerivation rec {
   ];
 
   # We should find a better way to access the arch reliably.
-  crossArch = hostPlatform.arch or null;
+  crossArch = if stdenv.hostPlatform != stdenv.buildPlatform
+    then hostPlatform.parsed.cpu.name
+    else null;
 
   preConfigure = ''
     if test -n "$crossConfig"; then
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index a069894f6c8c..1b52d18fd6b1 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -113,7 +113,7 @@ let
         "--cross-prefix=${stdenv.cc.targetPrefix}"
         "--enable-cross-compile"
         "--target_os=linux"
-        "--arch=${hostPlatform.arch}"
+        "--arch=${hostPlatform.parsed.cpu.name}"
         ];
     };
 

From 7d0906eea89f94b24d9df9af90579a88422dc126 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 01:38:34 -0400
Subject: [PATCH 1440/3370] fontconfig: Clean up cross

---
 pkgs/development/libraries/fontconfig/2.10.nix    | 12 +-----------
 pkgs/development/libraries/fontconfig/default.nix | 12 +-----------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix
index 5fb0ea4429e7..6f711341fad3 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/pkgs/development/libraries/fontconfig/2.10.nix
@@ -17,23 +17,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ expat ];
 
   configureFlags = [
+    "--with-arch=${hostPlatform.parsed.cpu.name}"
     "--sysconfdir=/etc"
     "--with-cache-dir=/var/cache/fontconfig"
     "--disable-docs"
     "--with-default-fonts="
   ];
 
-  # We should find a better way to access the arch reliably.
-  crossArch = if stdenv.hostPlatform != stdenv.buildPlatform
-    then hostPlatform.parsed.cpu.name
-    else null;
-
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      configureFlags="$configureFlags --with-arch=$crossArch";
-    fi
-  '';
-
   enableParallelBuilding = true;
 
   doCheck = true;
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index a4f6fe007d06..4d0b1a7f1153 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -40,23 +40,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ expat ];
 
   configureFlags = [
+    "--with-arch=${hostPlatform.parsed.cpu.name}"
     "--with-cache-dir=/var/cache/fontconfig" # otherwise the fallback is in $out/
     "--disable-docs"
     # just <1MB; this is what you get when loading config fails for some reason
     "--with-default-fonts=${dejavu_fonts.minimal}"
   ];
 
-  # We should find a better way to access the arch reliably.
-  crossArch = if stdenv.hostPlatform != stdenv.buildPlatform
-    then hostPlatform.parsed.cpu.name
-    else null;
-
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      configureFlags="$configureFlags --with-arch=$crossArch";
-    fi
-  '';
-
   enableParallelBuilding = true;
 
   doCheck = true;

From 7864a17bfb1fce9195e024e1e2ff1dfa14a942f3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 01:38:51 -0400
Subject: [PATCH 1441/3370] misc video players: Clean up cross

---
 pkgs/applications/video/omxplayer/default.nix | 22 ++++----
 .../libraries/ffmpeg-full/default.nix         | 21 +++-----
 pkgs/development/libraries/ffmpeg/generic.nix | 18 +++----
 pkgs/development/libraries/libav/default.nix  | 52 +++++++++----------
 4 files changed, 47 insertions(+), 66 deletions(-)

diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix
index 520451df400f..00a419d0a85d 100644
--- a/pkgs/applications/video/omxplayer/default.nix
+++ b/pkgs/applications/video/omxplayer/default.nix
@@ -12,9 +12,13 @@ let
       sha256 = "03s1zsprz5p6gjgwwqcf7b6cvzwwid6l8k7bamx9i0f1iwkgdm0j";
     };
     
+    configurePlatforms = [];
     configureFlags = [
-      "--arch=arm"
+      "--arch=${hostPlatform.parsed.cpu.name}"
+    ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch32 [
+      # TODO be better with condition
       "--cpu=arm1176jzf-s"
+    ] ++ [
       "--disable-muxers"
       "--enable-muxer=spdif"
       "--enable-muxer=adts"
@@ -42,19 +46,14 @@ let
       "--enable-hardcoded-tables"
       "--disable-runtime-cpudetect"
       "--disable-debug"
+      "--arch=${hostPlatform.parsed.cpu.name}"
+      "--target_os=${hostPlatform.parsed.kernel.name}"
+    ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+      "--cross-prefix=${stdenv.cc.targetPrefix}"
+      "--enable-cross-compile"
     ];
 
     enableParallelBuilding = true;
-      
-    crossAttrs = {
-      configurePlatforms = [];
-      configureFlags = configureFlags ++ [
-        "--cross-prefix=${stdenv.cc.targetPrefix}"
-        "--enable-cross-compile"
-        "--target_os=linux"
-        "--arch=${hostPlatform.parsed.cpu.name}"
-        ];
-    };
 
     meta = {
       homepage = http://www.ffmpeg.org/;
@@ -83,5 +82,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/huceke/omxplayer;
     description = "Commandline OMX player for the Raspberry Pi";
     license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.arm;
   };
 }
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index d2ef075beee1..6fd8bfc3e195 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -249,7 +249,10 @@ stdenv.mkDerivation rec {
       --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1
   '';
 
+  configurePlatforms = [];
   configureFlags = [
+    "--target_os=${hostPlatform.parsed.kernel.name}"
+    "--arch=${hostPlatform.parsed.cpu.name}"
     /*
      *  Licensing flags
      */
@@ -371,8 +374,6 @@ stdenv.mkDerivation rec {
     #(enableFeature quvi "libquvi")
     (enableFeature (rtmpdump != null) "librtmp")
     #(enableFeature (schroedinger != null) "libschroedinger")
-    #(enableFeature (shine != null) "libshine")
-    (enableFeature (samba != null && gplLicensing && version3Licensing) "libsmbclient")
     (enableFeature (SDL2 != null) "sdl2")
     (enableFeature (soxr != null) "libsoxr")
     (enableFeature (speex != null) "libspeex")
@@ -396,6 +397,9 @@ stdenv.mkDerivation rec {
     (enableFeature optimizationsDeveloper "optimizations")
     (enableFeature extraWarningsDeveloper "extra-warnings")
     (enableFeature strippingDeveloper "stripping")
+  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--cross-prefix=${stdenv.cc.targetPrefix}"
+    "--enable-cross-compile"
   ];
 
   nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
@@ -432,21 +436,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
-
   enableParallelBuilding = true;
 
-  /* Cross-compilation is untested, consider this an outline, more work
-     needs to be done to portions of the build to get it to work correctly */
-  crossAttrs = {
-    configurePlatforms = [];
-    configureFlags = configureFlags ++ [
-      "--cross-prefix=${stdenv.cc.targetPrefix}"
-      "--enable-cross-compile"
-      "--target_os=${hostPlatform.parsed.kernel.name}"
-      "--arch=${hostPlatform.parsed.cpu.name}"
-    ];
-  };
-
   meta = with stdenv.lib; {
     description = "A complete, cross-platform solution to record, convert and stream audio and video";
     homepage = https://www.ffmpeg.org/;
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 530639d757de..b71a1c253c11 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -79,7 +79,10 @@ stdenv.mkDerivation rec {
     ++ optional (reqMin "1.0") "doc" ; # just dev-doc
   setOutputFlags = false; # doesn't accept all and stores configureFlags in libs!
 
+  configurePlatforms = [];
   configureFlags = [
+      "--arch=${hostPlatform.parsed.cpu.name}"
+      "--target_os=${hostPlatform.parsed.kernel.name}"
     # License
       "--enable-gpl"
       "--enable-version3"
@@ -145,6 +148,9 @@ stdenv.mkDerivation rec {
       "--disable-stripping"
     # Disable mmx support for 0.6.90
       (verFix null "0.6.90" "--disable-mmx")
+  ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
+      "--cross-prefix=${stdenv.cc.targetPrefix}"
+      "--enable-cross-compile"
   ] ++ optional stdenv.cc.isClang "--cc=clang";
 
   nativeBuildInputs = [ perl pkgconfig texinfo yasm ];
@@ -168,18 +174,6 @@ stdenv.mkDerivation rec {
     moveToOutput share/ffmpeg/examples "$doc"
   '';
 
-  /* Cross-compilation is untested, consider this an outline, more work
-     needs to be done to portions of the build to get it to work correctly */
-  crossAttrs = {
-    configurePlatforms = [];
-    configureFlags = configureFlags ++ [
-      "--cross-prefix=${stdenv.cc.targetPrefix}"
-      "--enable-cross-compile"
-      "--target_os=${hostPlatform.parsed.kernel.name}"
-      "--arch=${hostPlatform.parsed.cpu.name}"
-    ];
-  };
-
   installFlags = [ "install-man" ];
 
   passthru = {
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 85fe902dae06..b726d9c2b42a 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -18,7 +18,7 @@
 
 assert faacSupport -> enableUnfree;
 
-let inherit (stdenv.lib) optional optionals hasPrefix; in
+let inherit (stdenv.lib) optional optionals hasPrefix enableFeature; in
 
 /* ToDo:
     - more deps, inspiration: http://packages.ubuntu.com/raring/libav-tools
@@ -51,29 +51,35 @@ let
       substituteInPlace ./configure --replace "#! /bin/sh" "#!${bash}/bin/sh"
     '';
 
-    configureFlags =
-      assert stdenv.lib.all (x: x!=null) buildInputs;
-    [
+    configurePlatforms = [];
+    configureFlags = assert stdenv.lib.all (x: x!=null) buildInputs; [
+      "--arch=${hostPlatform.parsed.cpu.name}"
+      "--target_os=${hostPlatform.parsed.kernel.name}"
       #"--enable-postproc" # it's now a separate package in upstream
       "--disable-avserver" # upstream says it's in a bad state
       "--enable-avplay"
       "--enable-shared"
       "--enable-runtime-cpudetect"
       "--cc=cc"
-    ]
-      ++ optionals enableGPL [ "--enable-gpl" "--enable-swscale" ]
-      ++ optional mp3Support "--enable-libmp3lame"
-      ++ optional speexSupport "--enable-libspeex"
-      ++ optional theoraSupport "--enable-libtheora"
-      ++ optional vorbisSupport "--enable-libvorbis"
-      ++ optional vpxSupport "--enable-libvpx"
-      ++ optional x264Support "--enable-libx264"
-      ++ optional xvidSupport "--enable-libxvid"
-      ++ optional faacSupport "--enable-libfaac --enable-nonfree"
-      ++ optional vaapiSupport "--enable-vaapi"
-      ++ optional vdpauSupport "--enable-vdpau"
-      ++ optional freetypeSupport "--enable-libfreetype"
-      ;
+      (enableFeature enableGPL "gpl")
+      (enableFeature enableGPL "swscale")
+      (enableFeature mp3Support "libmp3lame")
+      (enableFeature mp3Support "libmp3lame")
+      (enableFeature speexSupport "libspeex")
+      (enableFeature theoraSupport "libtheora")
+      (enableFeature vorbisSupport "libvorbis")
+      (enableFeature vpxSupport "libvpx")
+      (enableFeature x264Support "libx264")
+      (enableFeature xvidSupport "libxvid")
+      (enableFeature faacSupport "libfaac")
+      (enableFeature faacSupport "nonfree")
+      (enableFeature vaapiSupport "vaapi")
+      (enableFeature vdpauSupport "vdpau")
+      (enableFeature freetypeSupport "libfreetype")
+    ] ++ optional (stdenv.hostPlatform != stdenv.buildPlatform) [
+      "--cross-prefix=${stdenv.cc.targetPrefix}"
+      "--enable-cross-compile"
+    ];
 
   nativeBuildInputs = [ pkgconfig perl ];
     buildInputs = [ lame yasm zlib bzip2 SDL bash ]
@@ -112,16 +118,6 @@ let
     doInstallCheck = false; # fails randomly
     installCheckTarget = "check"; # tests need to be run *after* installation
 
-    crossAttrs = {
-      configurePlatforms = [];
-      configureFlags = configureFlags ++ [
-        "--cross-prefix=${stdenv.cc.targetPrefix}"
-        "--enable-cross-compile"
-        "--target_os=linux"
-        "--arch=${hostPlatform.parsed.cpu.name}"
-        ];
-    };
-
     passthru = { inherit vdpauSupport; };
 
     meta = with stdenv.lib; {

From fb9f5e4a0322da74201145a3ecbc816525972ab3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 10 May 2018 08:10:19 +0200
Subject: [PATCH 1442/3370] nixos/testing: Fix output of systemd messages

Regression introduced by d4468bedb52bf03ff125d721634f83604bddd589.

No systemd messages are shown anymore during VM test runs, which is not
very helpful if you want to find out about failures.

There is a bit of a conflict between testing and the change that
introduced the regression. While the mentioned commit makes sure that
the primary console is tty0 for virtualisation.graphics = false, our VM
tests need to have the serial console as primary console.

So in order to support both, I added a new virtualisation.qemu.consoles
option, which allows to specify those options using the module system.

The default of this option is to use the changes that were introduced
and in test-instrumentation.nix we use only the serial console the same
way as before.

For test-instrumentation.nix I didn't add a baudrate to the serial
console because I can't find a reason on top of my head why it should
need it. There also wasn't a reason stated when that was introduced in
7499e4a5b917227696b7292ae1bd728d6b1978b0.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @flokli, @dezgeg, @edolstra
---
 .../modules/testing/test-instrumentation.nix  |  3 +++
 nixos/modules/virtualisation/qemu-vm.nix      | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 41dec2af9ed4..98da55ed68a7 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -58,6 +58,9 @@ in
     systemd.services."serial-getty@${qemuSerialDevice}".enable = false;
     systemd.services."serial-getty@hvc0".enable = false;
 
+    # Only use a serial console, no TTY.
+    virtualisation.qemu.consoles = [ qemuSerialDevice ];
+
     boot.initrd.preDeviceCommands =
       ''
         echo 600 > /proc/sys/kernel/hung_task_timeout_secs
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index d271144af48b..0abf7b11703c 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -25,10 +25,7 @@ let
 
   qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";
 
-  # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics
-  kernelConsoles = let
-    consoles = [ "console=${qemuSerialDevice},115200n8" "console=tty0" ];
-    in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles);
+  consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
 
   # XXX: This is very ugly and in the future we really should use attribute
   # sets to build ALL of the QEMU flags instead of this mixed mess of Nix
@@ -111,7 +108,7 @@ let
             ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \
             -kernel ${config.system.build.toplevel}/kernel \
             -initrd ${config.system.build.toplevel}/initrd \
-            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsoles} $QEMU_KERNEL_PARAMS" \
+            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS" \
           ''} \
           $extraDisks \
           ${qemuGraphics} \
@@ -336,6 +333,23 @@ in
           description = "Options passed to QEMU.";
         };
 
+      consoles = mkOption {
+        type = types.listOf types.str;
+        default = let
+          consoles = [ "${qemuSerialDevice},115200n8" "tty0" ];
+        in if cfg.graphics then consoles else reverseList consoles;
+        example = [ "console=tty1" ];
+        description = ''
+          The output console devices to pass to the kernel command line via the
+          <literal>console</literal> parameter, the primary console is the last
+          item of this list.
+
+          By default it enables both serial console and
+          <literal>tty0</literal>. The preferred console (last one) is based on
+          the value of <option>virtualisation.graphics</option>.
+        '';
+      };
+
       networkingOptions =
         mkOption {
           default = [

From 67a8c66f68d9703cd2bf0a706c683de6c362f0d8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Thu, 10 May 2018 08:29:29 +0200
Subject: [PATCH 1443/3370] nixos/dovecot: Fix usage of dhparams option

The pull request that added dhparams (#39507) was made at the time where
the dhparams module overhaul (#39526) wasn't done yet, so it's still
using the old mechanics of the module.

As stated in the release notes:

  Module implementers should not set a specific bit size in order to let
  users configure it by themselves if they want to have a different bit
  size than the default (2048).

  An example usage of this would be:

    { config, ... }:

    {
      security.dhparams.params.myservice = {};
      environment.etc."myservice.conf".text = ''
        dhparams = ${config.security.dhparams.params.myservice.path}
      '';
    }

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @qknight, @abbradar, @hrdinka, @leenaars
---
 nixos/modules/services/mail/dovecot.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 96e60f9c88ea..50477fdd25ba 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -25,7 +25,7 @@ let
       ssl_cert = <${cfg.sslServerCert}
       ssl_key = <${cfg.sslServerKey}
       ${optionalString (!(isNull cfg.sslCACert)) ("ssl_ca = <" + cfg.sslCACert)}
-      ssl_dh = <${config.security.dhparams.path}/dovecot2.pem
+      ssl_dh = <${config.security.dhparams.params.dovecot2.path}
       disable_plaintext_auth = yes
     '')
 
@@ -302,9 +302,7 @@ in
 
     security.dhparams = mkIf (! isNull cfg.sslServerCert) {
       enable = true;
-      params = {
-        dovecot2 = 2048;
-      };
+      params.dovecot2 = {};
     };
    services.dovecot2.protocols =
      optional cfg.enableImap "imap"

From 5cfbfb662b4623272e4f31026a7c510b74cc73ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:44:47 +0200
Subject: [PATCH 1444/3370] python: Cython: 0.28.1 -> 0.28.2

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

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index cffad983a450..a9488b540e28 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "Cython";
-  version = "0.28.1";
+  version = "0.28.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "152ee5f345012ca3bb7cc71da2d3736ee20f52cd8476e4d49e5e25c5a4102b12";
+    sha256 = "634e2f10fc8d026c633cffacb45cd8f4582149fa68e1428124e762dbc566e68a";
   };
 
   nativeBuildInputs = [

From a8c7973a427d187e6e086e9f5fd19df8b504d606 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:44:54 +0200
Subject: [PATCH 1445/3370] python: Nikola: 7.8.14 -> 7.8.15

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

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index bb6eddb46d1e..d0045c9fb7fd 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "Nikola";
-  version = "7.8.14";
+  version = "7.8.15";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -46,7 +46,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d838817ac30ac6d4b8139a2adc8b49bed22dbb8fbc6261958d2775e10447d92";
+    sha256 = "182b4b9254f0d710603ba491853429ad6ef3f955f3e718191336b44cfd649000";
   };
 
   meta = {

From 3977666717286cc772ee4677d6dd0ee6ebf93f1f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:00 +0200
Subject: [PATCH 1446/3370] python: XlsxWriter: 1.0.2 -> 1.0.4

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

diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix
index c512b17332fc..d8209b233977 100644
--- a/pkgs/development/python-modules/XlsxWriter/default.nix
+++ b/pkgs/development/python-modules/XlsxWriter/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "XlsxWriter";
-  version = "1.0.2";
+  version = "1.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0mpq4l1jfghdqx2vzbzl9v28vw69lkx5vz9gb77gzaw8zypvnsx2";
+    sha256 = "ad947fd9e8edfb64f25e0ccfb161e109f279e5a5520b3dd22ddc03b7f8220887";
   };
 
   meta = {

From 3cf2fb1fa76db3833a21505379e2e0c9ff6d4851 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:07 +0200
Subject: [PATCH 1447/3370] python: aenum: 2.1.0 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index facf86c58988..63db18e844e0 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aenum";
-  version = "2.1.0";
+  version = "2.1.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9eb1c8f48ae13c56d22a7227db0e4b1717131b284c6c0db6e4ccca6f5894df95";
+    sha256 = "a3208e4b28db3a7b232ff69b934aef2ea1bf27286d9978e1e597d46f490e4687";
   };
 
   # For Python 3, locale has to be set to en_US.UTF-8 for

From 48c82cac4d71d0d1d118a678ee2f3c340776634a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:13 +0200
Subject: [PATCH 1448/3370] python: aiohttp: 3.1.2 -> 3.1.3

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

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index ab5c4b625780..947f4341e6df 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "df49fe4452a942e0031174c78917f9926d122d4603bf56bae4591639f2a3dc6a";
+    sha256 = "9fcef0489e3335b200d31a9c1fb6ba80fdafe14cd82b971168c2f9fa1e4508ad";
   };
 
   disabled = pythonOlder "3.5";

From ec5dcae625da7d4a9a53755d3825bd7cbbd08be5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:20 +0200
Subject: [PATCH 1449/3370] python: astral: 1.6 -> 1.6.1

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

diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix
index 488c5ed66512..1be99b5d4dde 100644
--- a/pkgs/development/python-modules/astral/default.nix
+++ b/pkgs/development/python-modules/astral/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "astral";
-  version = "1.6";
+  version = "1.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";
+    sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d";
   };
 
   propagatedBuildInputs = [ pytz requests ];

From 698b94b54000b17541f47c7df75f1b30502b7692 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:28 +0200
Subject: [PATCH 1450/3370] python: astropy: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index d4c038a1afdc..0dcd5dfca364 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "astropy";
-  version = "3.0.1";
+  version = "3.0.2";
 
   disabled = !isPy3k; # according to setup.py
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c35f4433c14ddfcaf2407cc815385f3d85396727e9a1e660cf66a7c4f5dd1067";
+    sha256 = "22e682904a3b8884595addfb743cf1a3ecf2b539c6616d98f8426208d822d84a";
   };
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires

From a7ec7402f15c10ed54f7bfb7d368e3a80f699d5d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:35 +0200
Subject: [PATCH 1451/3370] python: bayespy: 0.5.14 -> 0.5.17

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

diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix
index dcc1a45b1cf0..83bb10631958 100644
--- a/pkgs/development/python-modules/bayespy/default.nix
+++ b/pkgs/development/python-modules/bayespy/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "bayespy";
-  version = "0.5.14";
+  version = "0.5.17";
   name = "${pname}-${version}";
 
   # Python 2 not supported and not some old Python 3 because MPL doesn't support
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "129bac6a1c494eedabdd04abf14aac35db176d25db44e27f755c758a18adf03c";
+    sha256 = "2e04cd9873eea6891ea8dfd5fc6d718727ea7cc416bc2ced50e00a741386925f";
   };
 
   checkInputs = [ pytest glibcLocales ];

From e80b4912885ed5f14eb44857ab52de50eb69b6f8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:41 +0200
Subject: [PATCH 1452/3370] python: zc.buildout: 2.11.2 -> 2.11.3

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

diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix
index cb54f588f9d2..95b0f8dddc55 100644
--- a/pkgs/development/python-modules/buildout-nix/default.nix
+++ b/pkgs/development/python-modules/buildout-nix/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.11.2";
+  version = "2.11.3";
   name = "${pname}-nix-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "e304f3604a4235e896e94ea79230cfb9c0bc54569f04d5c6c4b49cc9dc4fdbf6";
+    sha256 = "f7fde2cde7b937f67e52a3e94b76f9294b73c1e9bb698430e96778f3f735544c";
   };
 
   patches = [ ./nix.patch ];

From 06bab760f332bf759ac602ca37da1b0ae23d761c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:48 +0200
Subject: [PATCH 1453/3370] python: zc.buildout: 2.2.1 -> 2.2.5

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

diff --git a/pkgs/development/python-modules/buildout/default.nix b/pkgs/development/python-modules/buildout/default.nix
index 080fd2f2a790..9efc53ebe6da 100644
--- a/pkgs/development/python-modules/buildout/default.nix
+++ b/pkgs/development/python-modules/buildout/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "zc.buildout";
-  version = "2.2.1";
+  version = "2.2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xafi6ndlm964qj7pnmzmvhp719c8pgs7r7wkr508v3cq2jjw4m6";
+    sha256 = "fb08f24f9e51e647e29d714f6e9ad51a4ea28673dddeed831315617bb5a805d0";
   };
 
   meta = with stdenv.lib; {

From e2d1c747fa9a70cdc0390c264722e68633fcf985 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:45:54 +0200
Subject: [PATCH 1454/3370] python: cmarkgfm: 0.4.0 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix
index 5867c33642f5..b2f58887ffb5 100644
--- a/pkgs/development/python-modules/cmarkgfm/default.nix
+++ b/pkgs/development/python-modules/cmarkgfm/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "cmarkgfm";
-  version = "0.4.0";
+  version = "0.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "977d7061779c7ebc5cbe7af71adb795ced96058552fe5f6b646d95b5055959be";
+    sha256 = "f20900f16377f2109783ae9348d34bc80530808439591c3d3df73d5c7ef1a00c";
   };
 
   propagatedBuildInputs = [ cffi ];

From 216e90c6ff487a9733eb3c234cc8e685bde9d512 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:01 +0200
Subject: [PATCH 1455/3370] python: colorlog: 3.1.2 -> 3.1.4

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

diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix
index e737b8848975..3045e61db607 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/pkgs/development/python-modules/colorlog/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "colorlog";
-  version = "3.1.2";
+  version = "3.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0i21sd6pggr2gqza41vyq2rqyb552wf5iwl4bc16i7kqislbd53z";
+    sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d";
   };
 
   checkInputs = [ pytest ];

From 282aee8799e28e07db8eec4b23d618e47085bd06 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:08 +0200
Subject: [PATCH 1456/3370] python: confluent-kafka: 0.11.0 -> 0.11.4

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

diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index c8cbfe9d9be1..c8ef038ec504 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
-  version = "0.11.0";
+  version = "0.11.4";
   pname = "confluent-kafka";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4c34bfe8f823ee3777d93820ec6578365d2bde3cd1302cbd0e44c86b68643667";
+    sha256 = "8cf480199685127c9692b0bf1e15eac82e71ae34b7967a016ab31a318741abb1";
   };
 
   buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;

From 3ffc398d20e07f87e4e84222b5b028691e4249c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:15 +0200
Subject: [PATCH 1457/3370] python: dask: 0.17.2 -> 0.17.4

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

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 5527e4617e7c..9bbf1da7a65e 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.17.2";
+  version = "0.17.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "27e470b8cfdd0516189e641b1213fceec0ddc4f37ead1fbce733d3381134fccd";
+    sha256 = "c111475a3d1f8cba41c8094e1fb1831c65015390dcef0308042a11a9606a2f6d";
   };
 
   checkInputs = [ pytest ];

From 0aaa1fac54af98435fd9522182759197b77e3809 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:22 +0200
Subject: [PATCH 1458/3370] python: devpi-common: 3.2.1 -> 3.2.3

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

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index c43d34a9b555..bf2808745ecd 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -2,12 +2,12 @@
 
 with pythonPackages;buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.2.1";
+  version = "3.2.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e9afa277a9b227d92335c49fab40be2e9bb112c0f4dda84906c14addb1ded2f7";
+    sha256 = "d2ecae3a92b2da62ecc6586d1c40d265e61bce70d7f1be2327e8b98598ba2687";
   };
 
   propagatedBuildInputs = [ requests py ];

From 712b0bc7197f94a26e8d5b436bf0f092481a2a08 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:29 +0200
Subject: [PATCH 1459/3370] python: django-ipware: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix
index 1f3aedab8102..5deccb34d894 100644
--- a/pkgs/development/python-modules/django-ipware/default.nix
+++ b/pkgs/development/python-modules/django-ipware/default.nix
@@ -3,7 +3,7 @@
 buildPythonPackage rec {
   pname = "django-ipware";
   name = "${pname}-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   meta = {
     description = "A Django application to retrieve user's IP address";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fba8821298c8533ce5609debf31dc8a22f228c50e100f42d97637a9f9357d43";
+    sha256 = "abf2bfbf0ec6c04679372a55c25889c9b08f55ec404bca3dfc08f3cf6c832a11";
   };
 
   propagatedBuildInputs = [ django ];

From 26f175e44a48db9f6a47ac2a651d26590085af09 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:37 +0200
Subject: [PATCH 1460/3370] python: Django: 2.0.4 -> 2.0.5

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

diff --git a/pkgs/development/python-modules/django/2_0.nix b/pkgs/development/python-modules/django/2_0.nix
index 89bd0407ca00..9c8cde3a0d8a 100644
--- a/pkgs/development/python-modules/django/2_0.nix
+++ b/pkgs/development/python-modules/django/2_0.nix
@@ -7,13 +7,13 @@
 buildPythonPackage rec {
   pname = "Django";
   name = "${pname}-${version}";
-  version = "2.0.4";
+  version = "2.0.5";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d81a1652963c81488e709729a80b510394050e312f386037f26b54912a3a10d0";
+    sha256 = "71d1a584bb4ad2b4f933d07d02c716755c1394feaac1ce61ce37843ac5401092";
   };
 
   patches = stdenv.lib.optionals withGdal [

From 6c60f396fa13cae058fc90b1e7baeb512077b3c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:44 +0200
Subject: [PATCH 1461/3370] python: Faker: 0.8.12 -> 0.8.13

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

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 7a7d24d070cb..9fd37f86f740 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.8.12";
+  version = "0.8.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9cc12b821f32ff45f6edfdc1ab7be3893b60b1224e952d68322a57e5b26a4a15";
+    sha256 = "48fed4b4a191e2b42ad20c14115f1c6d36d338b80192075d7573f0f42d7fb321";
   };
 
   checkInputs = [

From ecd18e40b4d799fae65fdd5c1e1fc7bfea3a055c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:51 +0200
Subject: [PATCH 1462/3370] python: fastimport: 0.9.6 -> 0.9.8

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

diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix
index 44f7bcdab068..02c1ea60e611 100644
--- a/pkgs/development/python-modules/fastimport/default.nix
+++ b/pkgs/development/python-modules/fastimport/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fastimport";
-  version = "0.9.6";
+  version = "0.9.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1aqjsin4rmqm7ln4j0p73fzxifws6c6ikgyhav7r137m2ixsxl43";
+    sha256 = "b2f2e8eb97000256e1aab83d2a0a053fc7b93c3aa4f7e9b971a5703dfc5963b9";
   };
 
   checkPhase = ''

From 60f26a166f847959885ead7d03bc9ec006705e9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:46:58 +0200
Subject: [PATCH 1463/3370] python: Fiona: 1.7.11.post1 -> 1.7.11.post2

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

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index bd249dea5d24..7e9e2e1da64c 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "Fiona";
-  version = "1.7.11.post1";
+  version = "1.7.11.post2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "35df044fa805e6b420450f5d4281fc0edf96e1da0545c31032045cd3cfad3abf";
+    sha256 = "5804c6f5f7e02cf1f95ca404c22653dd47d64e4496a0ba7af5a2d6b2051b872a";
   };
 
   buildInputs = [

From 07cec56a0437057ada98e31ce493d5c6289c6343 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:05 +0200
Subject: [PATCH 1464/3370] python: Flask-Cors: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix
index acd9430316b4..491ee22b0212 100644
--- a/pkgs/development/python-modules/flask-cors/default.nix
+++ b/pkgs/development/python-modules/flask-cors/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Flask-Cors";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "62ebc5ad80dc21ca0ea9f57466c2c74e24a62274af890b391790c260eb7b754b";
+    sha256 = "bec996f0603a0693c0ea63c8126e5f8e966bb679cf82e6104b254e9c7f3a7d08";
   };
 
   buildInputs = [ nose ];

From af6be7b0c79c6711c1ecbdb115315ad672e3f01b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:11 +0200
Subject: [PATCH 1465/3370] python: Flask: 0.12.2 -> 0.12.4

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

diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix
index 5e77de84fed1..1a2c6417167b 100644
--- a/pkgs/development/python-modules/flask/default.nix
+++ b/pkgs/development/python-modules/flask/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
-  version = "0.12.2";
+  version = "0.12.4";
   pname = "Flask";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hfs2jr2m5lr51xd4gblb28rncd0xrpycz6c07cyqsbv4dhl9x29";
+    sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd";
   };
 
   checkInputs = [ pytest ];

From 7450cccaa799ab77f156ab6d2316734da12f1683 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:18 +0200
Subject: [PATCH 1466/3370] python: google-api-python-client: 1.6.6 -> 1.6.7

---
 .../python-modules/google-api-python-client/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index d4de33b5a837..74fe88be4475 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "1.6.6";
+  version = "1.6.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ec72991f95201996a4edcea44a079cae0292798086beaadb054d91921632fe1b";
+    sha256 = "05583a386e323f428552419253765314a4b29828c3cee15be735f9ebfa5aebf2";
   };
 
   # No tests included in archive

From 228900dc85b8a4dfeee7acfd42856bd7eaa340ba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:25 +0200
Subject: [PATCH 1467/3370] python: google-api-core: 1.1.0 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index baf590f99572..9e1a0c308047 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "1.1.0";
+  version = "1.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b4f103de6bd38ab346f7d17236f6098a51ebdff733ff69956a0f1e29cb35f10b";
+    sha256 = "2000963305e95410a66e6ef6cfcc9f4627a4a95cb1c10abc98268814f2a6cd80";
   };
 
   propagatedBuildInputs = [

From 8fbbd261d80f78e2678dd2c628add332f37b9f79 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:32 +0200
Subject: [PATCH 1468/3370] python: hdbscan: 0.8.12 -> 0.8.13

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

diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix
index 3d57ff371666..e75b04e97923 100644
--- a/pkgs/development/python-modules/hdbscan/default.nix
+++ b/pkgs/development/python-modules/hdbscan/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "hdbscan";
-  version = "0.8.12";
+  version = "0.8.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0yxi34frg2jwyvjl942qy4gq5pbx8dq4pf4p28d1xah8njchfqir";
+    sha256 = "31874db29375816688b5541287a051c9bd768f2499ccf1f6a4d88d266530e2a6";
   };
 
   checkInputs = [ nose ];

From 4dd0f741a20ea770a2edd954973aef187e4e6d68 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:39 +0200
Subject: [PATCH 1469/3370] python: ipywidgets: 7.2.0 -> 7.2.1

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

diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index af7ebfb1c432..67d7d551522d 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "7.2.0";
+  version = "7.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f23aac2447f593dbdc89a86833a2d59666ed44af42b23c267de380c324599507";
+    sha256 = "ab9869cda5af7ba449d8f707b29b7e97a7db97d6366805d6b733338f51096f54";
   };
 
   # Tests are not distributed

From 7a6bf668fb73cd4d1096fa1c0162d9c6009f1d7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:46 +0200
Subject: [PATCH 1470/3370] python: jira: 1.0.14 -> 1.0.15

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

diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
index 03f1abd7abca..2a1abe7b59ce 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "jira";
-  version = "1.0.14";
+  version = "1.0.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xncrcaqgj0gnva3bz5c4vwnn7z84v9cmr37pc93zx676w62fpm3";
+    sha256 = "20108a1d5b0dd058d5d4e0047f2d09ee06aaa413b22ca4d5c249e86167417fe8";
   };
 
   buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ];

From 5a014fdfa6bbaf23eb0576e35d7e55dfb8211c60 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:52 +0200
Subject: [PATCH 1471/3370] python: Jug: 1.6.6 -> 1.6.7

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

diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix
index d9315193d19f..4b0444e40d44 100644
--- a/pkgs/development/python-modules/jug/default.nix
+++ b/pkgs/development/python-modules/jug/default.nix
@@ -6,7 +6,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Jug";
-  version = "1.6.6";
+  version = "1.6.7";
   buildInputs = [ nose numpy ];
   propagatedBuildInputs = [
     bottle
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "897ffbbbe8061772c238b4f436512ea3696016a04473c45a716d78c0de103ec1";
+    sha256 = "a7faba838f3437163ae8459bff96e2c6ca1298312bdb9104c702685178d17269";
   };
 
   meta = with stdenv.lib; {

From dac15220fd3053ea0a20bda1df38d16b4241d01b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:47:59 +0200
Subject: [PATCH 1472/3370] python: Keras: 2.1.5 -> 2.1.6

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

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 860a14f7a4da..053ebb0fd019 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.1.5";
+  version = "2.1.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "907ad29add1fff27342a9f4fe3e60003d450d3af41a38f22f629c7736fc8399d";
+    sha256 = "c14af1081242c25617ade7eb62121d58d01f16e1e744bae9fc4f1f95a417716e";
   };
 
   checkInputs = [

From c29398faa4eac33327f0eaf533d3a35dc62651ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:05 +0200
Subject: [PATCH 1473/3370] python: keyring: 12.0.1 -> 12.0.2

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

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 2029eabba026..98295ff802fa 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "12.0.1";
+  version = "12.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "846c9c709ee1203bac5444abec19b5228f4601377686f33cba672aa0ba313abd";
+    sha256 = "445d9521b4fcf900e51c075112e25ddcf8af1db7d1d717380b64eda2cda84abc";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 29490c8029625df70b448752216cc12be63ddc81 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:11 +0200
Subject: [PATCH 1474/3370] python: llfuse: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix
index f53ff3cbebaa..7eac54d84d87 100644
--- a/pkgs/development/python-modules/llfuse/default.nix
+++ b/pkgs/development/python-modules/llfuse/default.nix
@@ -4,12 +4,12 @@
 
 buildPythonPackage rec {
   pname = "llfuse";
-  version = "1.3.3";
+  version = "1.3.4";
   name = pname + "-" + version;
 
   src = fetchurl {
     url = "mirror://pypi/l/llfuse/${name}.tar.bz2";
-    sha256 = "e514fa390d143530c7395f640c6b527f4f80b03f90995c7b38ff0b2f86e11ce7";
+    sha256 = "50396c5f3c49c3145e696e5b62df4fcca8b66634788020fba7b6932a858c78c2";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d7898e1a7fe95e06671d5df87852807184daf5e9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:18 +0200
Subject: [PATCH 1475/3370] python: marisa-trie: 0.7.4 -> 0.7.5

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

diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix
index ad9f6d6f2457..71be4f5726d1 100644
--- a/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/pkgs/development/python-modules/marisa-trie/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "marisa-trie";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n4pxnaranbh3x2fcqxwh8j1z2918vy7i4q1z4jn75m9rkm5h8ia";
+    sha256 = "c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf";
   };
 
   postPatch = ''

From a2ed092ea24ee923c9c9ff9af891f07379af5d6e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:25 +0200
Subject: [PATCH 1476/3370] python: marshmallow: 2.15.0 -> 2.15.1

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

diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index a9db6ef1e84c..71cc0cddf1b9 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -5,7 +5,7 @@
 buildPythonPackage rec {
   pname = "marshmallow";
   name = "${pname}-${version}";
-  version = "2.15.0";
+  version = "2.15.1";
 
   meta = {
     homepage = "https://github.com/marshmallow-code/marshmallow";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d3f31fe7be2106b1d783cbd0765ef4e1c6615505514695f33082805f929dd584";
+    sha256 = "b73361eab812af97eaf8e8691333a1096787968450051d132c8b9fb90aa1db5a";
   };
 
   propagatedBuildInputs = [ dateutil simplejson ];

From 0144105da2732a575a2511087e001dbbc95428f1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:31 +0200
Subject: [PATCH 1477/3370] python: moto: 1.3.1 -> 1.3.3

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

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index 222e54c871a0..a0269e92d086 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "1.3.1";
+  version = "1.3.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e6b25a32b61ba97bbc2236960ad6865ab111962a927de720c907475adff4499b";
+    sha256 = "45d14aca2b06b0083d5e82cfd770ebca0ba77b5070aec6928670240939a78681";
   };
 
   postPatch = ''

From 82333e0e230a858dfeb0fc46c4995d1ad4ed4790 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:37 +0200
Subject: [PATCH 1478/3370] python: nipype: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index 39fc0995b43d..372eeeec94a2 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -33,11 +33,11 @@ assert !isPy3k -> configparser != null;
 
 buildPythonPackage rec {
   pname = "nipype";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ed65f3e97fd0f82c418ad48af2107050e86d9e39eea4d22381ad7df932bf1ec";
+    sha256 = "17850c2a34f10f93d12c994101ce86b5a0b7e939e5b854e9f9920c9513cc8e76";
   };
 
   # see https://github.com/nipy/nipype/issues/2240

From 572c6972815b0ccc9adb0b410daf0e7247a4bda8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:44 +0200
Subject: [PATCH 1479/3370] python: numexpr: 2.6.4 -> 2.6.5

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

diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index e6fc5888feaf..8ba4e0061fa3 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "numexpr";
-  version = "2.6.4";
+  version = "2.6.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f0bef9a3a5407fb8d6344cf91b658bef7c13ec8a8eb13f423822d9d2ca5af6ce";
+    sha256 = "f8ad8014085628eab91bc82fb9d10cf9ab8e04ede4884e4a1061445d395b36bb";
   };
 
   propagatedBuildInputs = [ numpy ];

From 18b323b0747bef74393eeb7b42626eaa2acb9c14 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:50 +0200
Subject: [PATCH 1480/3370] python: numpy: 1.14.2 -> 1.14.3

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

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index ec727994b09c..3d64863c30d9 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "numpy";
-  version = "1.14.2";
+  version = "1.14.3";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "facc6f925c3099ac01a1f03758100772560a0b020fb9d70f210404be08006bcb";
+    sha256 = "9016692c7d390f9d378fc88b7a799dc9caa7eb938163dda5276d3f3d6f75debf";
   };
 
   disabled = isPyPy;

From 5d938387ccd4ef977541cf375ee328e84b225f28 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:48:57 +0200
Subject: [PATCH 1481/3370] python: onkyo-eiscp: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix
index c0a1e39b384b..a4adc1f2a6f6 100644
--- a/pkgs/development/python-modules/onkyo-eiscp/default.nix
+++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "onkyo-eiscp";
-  version = "1.2.4";
+  version = "1.2.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qb5w2g2cnckq7psh92g1w3gf76437x1vwfhwnd247wshs5h7hxj";
+    sha256 = "cfcca6bc6c36992095f5aa4a15870a3ef89b9a26d991da2333891c2675d4ef1b";
   };
 
   propagatedBuildInputs = [ docopt netifaces ];

From 7e924926316fe360440c4f02d6ce53dca3e84e1d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:03 +0200
Subject: [PATCH 1482/3370] python: openpyxl: 2.5.2 -> 2.5.3

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

diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix
index d8a419189312..09e3bde6f8af 100644
--- a/pkgs/development/python-modules/openpyxl/default.nix
+++ b/pkgs/development/python-modules/openpyxl/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "openpyxl";
-  version = "2.5.2";
+  version = "2.5.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "63165adcc806a5c281febb344f3594541f778f05b99a3a5e802941a3c0a85f71";
+    sha256 = "0046fca88d6731875a385bf7edd689d7c4133f829203ea615a81291de3fa48b6";
   };
 
   checkInputs = [ pytest ];

From 22931cec66873491ef0af06beb777bdddfcb7b8b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:10 +0200
Subject: [PATCH 1483/3370] python: pathlib2: 2.3.0 -> 2.3.2

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

diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index 09d759c97ee3..7ba0966de025 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -10,11 +10,11 @@
 
 if !(pythonOlder "3.4") then null else buildPythonPackage rec {
   pname = "pathlib2";
-  version = "2.3.0";
+  version = "2.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d32550b75a818b289bd4c1f96b60c89957811da205afcceab75bc8b4857ea5b3";
+    sha256 = "8eb170f8d0d61825e09a95b38be068299ddeda82f35e96c3301a8a5e7604cb83";
   };
 
   propagatedBuildInputs = [ six ] ++ lib.optional (pythonOlder "3.5") scandir;

From 0b90e884d96dd0c22a4a326e75d882962eac79b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:17 +0200
Subject: [PATCH 1484/3370] python: pbr: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 993dab3aceeb..9b249f0a2b6f 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "4.0.1";
+  version = "4.0.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "56b7a8ba7d64bf6135a9dfefb85a80d95924b3fde5ed6343a1a1d464a040dae3";
+    sha256 = "dae4aaa78eafcad10ce2581fc34d694faa616727837fd8e55c1a00951ad6744f";
   };
 
   # circular dependencies with fixtures

From a2402da7fb9f8fe422af1c78aa051d79ef13bbd6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:23 +0200
Subject: [PATCH 1485/3370] python: pip-tools: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index abe2dff6441b..926b625f7006 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "2.0.1";
+  version = "2.0.2";
   name = pname + "-" + version;
 
   src = fetchurl {
     url = "mirror://pypi/p/pip-tools/${name}.tar.gz";
-    sha256 = "81abea4ba206051ddaf90854b7302849002fdd0084450d2dd7f5c44a6d0ddf16";
+    sha256 = "f11fc3bf1d87a0b4a68d4d595f619814e2396e92d75d7bdd2500edbf002ea6de";
   };
 
   LC_ALL = "en_US.UTF-8";

From adf9c673b8658f005e960656140c4e8a2de678ff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:30 +0200
Subject: [PATCH 1486/3370] python: pretend: 1.0.8 -> 1.0.9

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

diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix
index 3572d938a0dc..fed0499624af 100644
--- a/pkgs/development/python-modules/pretend/default.nix
+++ b/pkgs/development/python-modules/pretend/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pretend";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk";
+    sha256 = "c90eb810cde8ebb06dafcb8796f9a95228ce796531bc806e794c2f4649aa1b10";
   };
 
   # No tests in archive

From 5287f27a8f43beaef2b32b5aa7f71cb7dfb52e89 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:37 +0200
Subject: [PATCH 1487/3370] python: psutil: 5.4.3 -> 5.4.5

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

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 6221e08ae574..f357aec914a4 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "5.4.3";
+  version = "5.4.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e2467e9312c2fa191687b89ff4bc2ad8843be4af6fb4dc95a7cc5f7d7a327b18";
+    sha256 = "ebe293be36bb24b95cdefc5131635496e88b17fabbcf1e4bc9b5c01f5e489cfe";
   };
 
   # No tests in archive

From 7e450b65f6bc7dbdc2391e11b14cef9c9b8c3cef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:44 +0200
Subject: [PATCH 1488/3370] python: pyblake2: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix
index 7d70fd30a254..2de46c0d1ed1 100644
--- a/pkgs/development/python-modules/pyblake2/default.nix
+++ b/pkgs/development/python-modules/pyblake2/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "pyblake2";
-  version = "1.1.1";
+  version = "1.1.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8ec8e9087d13c99b354ab6d8b4cadb1758633db5946ff95a6bc7ac538b6d7b3d";
+    sha256 = "5ccc7eb02edb82fafb8adbb90746af71460fbc29aa0f822526fc976dff83e93f";
   };
 
   # requires setting up sphinx doctest

From 75ab17b2b93a74e0d3d49bdd6d50c80f5863cef0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:51 +0200
Subject: [PATCH 1489/3370] python: pygit2: 0.26.3 -> 0.26.4

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

diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix
index d8eb05cf3485..3f05aa7b7896 100644
--- a/pkgs/development/python-modules/pygit2/default.nix
+++ b/pkgs/development/python-modules/pygit2/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pygit2";
-  version = "0.26.3";
+  version = "0.26.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "29baa530d6fcbf7cca6a75cf9c78fb88613ca81afb39c62fe492f226f6b61800";
+    sha256 = "a8a0ecce4aadac2675afa5bcda0f698bfe39ec61ac1e15b9264704d1b41bb390";
   };
 
   preConfigure = lib.optionalString stdenv.isDarwin ''

From f875632ca254fbe9e78b9e445872f5028ff6a81f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:49:57 +0200
Subject: [PATCH 1490/3370] python: pyglet: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index 3fc7f8ddb683..4bc1cd0608c5 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -2,12 +2,12 @@
 , libGLU_combined, xorg, freetype, fontconfig, future}:
 
 buildPythonPackage rec {
-  version = "1.3.1";
+  version = "1.3.2";
   pname = "pyglet";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a73280fa3949ea4890fee28f625c10b1e10a7cda390a08b6bce4740948167cd";
+    sha256 = "b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743";
   };
 
   postPatch = let

From 8a9dd7b871b5220acca32ee14d5c103c477ecdad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:04 +0200
Subject: [PATCH 1491/3370] python: pypcap: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix
index e2d4e1efe285..ead63c2c1b34 100644
--- a/pkgs/development/python-modules/pypcap/default.nix
+++ b/pkgs/development/python-modules/pypcap/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pypcap";
-  version = "1.2.0";
+  version = "1.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n01xjgg8n5mf1cs9yg9ljsx1kvir8cm6wwrd2069fawjxdbk0b9";
+    sha256 = "9ca9f79ca839fdc8fd37393509e2cb06be70f8db03f8cfe1857ca40cac1149f0";
   };
 
   patches = [

From 2c3e3b8af1141febc70e36056d8f755c16ce7ee8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:10 +0200
Subject: [PATCH 1492/3370] python: pytest: 3.5.0 -> 3.5.1

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

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 457826f26cbc..8e6b73b9c5e1 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -2,7 +2,7 @@
 , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
 }:
 buildPythonPackage rec {
-  version = "3.5.0";
+  version = "3.5.1";
   pname = "pytest";
 
   preCheck = ''
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1";
+    sha256 = "54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8";
   };
 
   checkInputs = [ hypothesis ];

From ce1d9f768ae2eec41ba890ac254f434de2461a4c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:17 +0200
Subject: [PATCH 1493/3370] python: QtPy: 1.4.0 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix
index d1aa4f096fe6..e433d922e10f 100644
--- a/pkgs/development/python-modules/qtpy/default.nix
+++ b/pkgs/development/python-modules/qtpy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "QtPy";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e78e7ce28015c1041be68b90f43048c9815e8c89d3362f8073feecdc70eafba";
+    sha256 = "1d1a4343540433a203280f162d43226e4c87489155fe4a9a6f1923ba11362bf9";
   };
 
   # no concrete propagatedBuildInputs as multiple backends are supposed

From d3e682ef0f9a09d5b396507d1abc3306bace19ca Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:23 +0200
Subject: [PATCH 1494/3370] python: robotframework: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix
index be3316cf697e..f07d0208167c 100644
--- a/pkgs/development/python-modules/robotframework/default.nix
+++ b/pkgs/development/python-modules/robotframework/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, buildPythonPackage, isPy3k }:
 
 buildPythonPackage rec {
-  version = "3.0.3";
+  version = "3.0.4";
   pname = "robotframework";
   disabled = isPy3k;
   name = pname + "-" + version;
 
   src = fetchurl {
     url = "mirror://pypi/r/robotframework/${name}.tar.gz";
-    sha256 = "a5ffe9283c9247c3a1e81228fcc009819d8f94b48768170268a3e6274a998bca";
+    sha256 = "ab94257cbd848dfca7148e092d233a12853cc7e840ce8231af9cbb5e7f51aa47";
   };
 
   meta = with stdenv.lib; {

From 7907ae6b1e6bfc24c4c7211fcb19fc2fa02da56d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:30 +0200
Subject: [PATCH 1495/3370] python: rpy2: 2.8.2 -> 2.8.6

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

diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index 8db7ae3b3372..c689bd482404 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -16,12 +16,12 @@
 }:
 
 buildPythonPackage rec {
-    version = "2.8.2";
+    version = "2.8.6";
     pname = "rpy2";
     disabled = isPyPy;
     src = fetchPypi {
       inherit version pname;
-      sha256 = "0k5jp6n1lfab7a6r5568aq31hg4fgf2cwy0hzvf3chp6yhyk26ic";
+      sha256 = "004d13734a7b9a85cbc1e7a93ec87df741e28db1273ab5b0d9efaac04a9c5f98";
     };
     buildInputs = [
       readline

From f1cb0e57d9e9b00f72cc4c7311035edf72fd2c90 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:36 +0200
Subject: [PATCH 1496/3370] python: s3fs: 0.1.4 -> 0.1.5

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

diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix
index 956a96f14046..c605d43888c1 100644
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "s3fs";
-  version = "0.1.4";
+  version = "0.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f19b2e81cfcf6f2849fa8195c366c6e81d2378400bab0611f461c4e55d4f6bed";
+    sha256 = "4fbab74d72ceeb1a6f249165bde7b1d1c4dd758390339f52c84f0832bc5117a7";
   };
 
   buildInputs = [ docutils ];

From ea6e06a2d65f5a312aada0a3cb9e78c18fb6a371 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:43 +0200
Subject: [PATCH 1497/3370] python: Sphinx: 1.7.2 -> 1.7.4

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

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index a87362dfc3c0..3ccccdbf77d8 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -27,10 +27,10 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.7.2";
+  version = "1.7.4";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5a1c9a0fec678c24b9a2f5afba240c04668edb7f45c67ce2ed008996b3f21ae2";
+    sha256 = "e9b1a75a3eae05dded19c80eb17325be675e0698975baae976df603b6ed1eb10";
   };
   LC_ALL = "en_US.UTF-8";
 

From eaccf2b38499275411d9382aaae82643081296a8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:50 +0200
Subject: [PATCH 1498/3370] python: SQLAlchemy: 1.2.6 -> 1.2.7

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

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 6ac6fe21e4d2..882574aa675a 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7cb00cc9b9f92ef8b4391c8a2051f81eeafefe32d63c6b395fd51401e9a39edb";
+    sha256 = "d6cda03b0187d6ed796ff70e87c9a7dce2c2c9650a7bc3c022cd331416853c31";
   };
 
   checkInputs = [

From 072f4f83c12abd7a7c1999e9670f3fe68fb8d778 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:50:56 +0200
Subject: [PATCH 1499/3370] python: sqlmap: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index d5c89aefef7c..9a2aaeaa5538 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.2.4";
+  version = "1.2.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cb70fdedd8dc0a30cf361d8e5401a5b07fc75c13847b13567b98966be4e3d063";
+    sha256 = "93fe37e535f4aabd05a7456295f39c0af73cbcd0511750663fc7a718c5915919";
   };
 
   # No tests in archive

From 74a5c32dbe96bb7dd7fdbdd423417e0f63cded4a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:51:03 +0200
Subject: [PATCH 1500/3370] python: tables: 3.4.2 -> 3.4.3

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

diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index 2ae41832569e..d2346b7addbd 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -2,13 +2,13 @@
 , cython, bzip2, lzo, numpy, numexpr, hdf5, six, c-blosc }:
 
 buildPythonPackage rec {
-  version = "3.4.2";
+  version = "3.4.3";
   pname = "tables";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/t/tables/${name}.tar.gz";
-    sha256 = "fdbbea4edb6bad0ac0e53fc7bc6970e78e12eef4944aa4146bcdcb573201676c";
+    sha256 = "b6aafe47154e2140c0a91bb38ebdb6ba67a24dd86263f1c294af8c11cb7deed4";
   };
 
   buildInputs = [ hdf5 cython bzip2 lzo c-blosc ];

From 588a305714ec3620094284df4409f3baccc74621 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:51:10 +0200
Subject: [PATCH 1501/3370] python: testfixtures: 6.0.0 -> 6.0.2

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

diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix
index 55631f291c74..2b9ef2e24a16 100644
--- a/pkgs/development/python-modules/testfixtures/default.nix
+++ b/pkgs/development/python-modules/testfixtures/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "testfixtures";
-  version = "6.0.0";
+  version = "6.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f6c4cf24d043f9d8e9a9337371ec1d2f6638a0032504bd67dbd724224fd64969";
+    sha256 = "f8827cfc91e5cc9ac669727fdd48a85880f391b935a0a212b5cedb807879feec";
   };
 
   checkInputs = [ mock manuel pytest sybil zope_component ];

From 081a805d1591c962fe272d947e7072c4c25848e5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:51:16 +0200
Subject: [PATCH 1502/3370] python: textacy: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/development/python-modules/textacy/default.nix b/pkgs/development/python-modules/textacy/default.nix
index 47b8b04c4f6a..4ffe8ec735c6 100644
--- a/pkgs/development/python-modules/textacy/default.nix
+++ b/pkgs/development/python-modules/textacy/default.nix
@@ -25,11 +25,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "textacy";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "70ebd8f6536c1536132c997988a4f27731a2db5a7ca7bab29fb33746b444959f";
+    sha256 = "32ffb796f2abf0577af480d482608cca2baf85d366a4e2981ffd3e632ebeb76c";
   };
 
   disabled = isPy27; # 2.7 requires backports.csv

From 7a428dc4cdf5aa8abe8ab6334a93314e7e84d13c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:51:22 +0200
Subject: [PATCH 1503/3370] python: transitions: 0.6.4 -> 0.6.5

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

diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix
index edf13782b078..4bda41dd66b9 100644
--- a/pkgs/development/python-modules/transitions/default.nix
+++ b/pkgs/development/python-modules/transitions/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "transitions";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ikxsjg7vil0yhiwhiimnjzcb1ig6g6g79sdhs9v8rnrszk1mi2n";
+    sha256 = "f72b6c5fcac3d1345bbf829e1a48a810255bcb4fc2c11a634af68107c378c1be";
   };
 
   postPatch = ''

From 56537d6b77427b0878d05d6d632892dd283e34c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:51:29 +0200
Subject: [PATCH 1504/3370] python: widgetsnbextension: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index 2e21ead19e09..cae05c74268f 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -8,11 +8,11 @@
 buildPythonPackage rec {
   pname = "widgetsnbextension";
   name = "${pname}-${version}";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9b584b9210dadc98f1fae384fff5f4db047df0b94a81b2388c7b0b14a99c3f32";
+    sha256 = "5417789ee6064ff515fd10be24870660af3561c02d3d48b26f6f44285d0f70cc";
   };
 
   propagatedBuildInputs = [ notebook ];

From bef6bac92929c47085ee6d3967609fd5986ea96d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:51:35 +0200
Subject: [PATCH 1505/3370] python: xarray: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 1d18b5830aaf..4035575915f0 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dd5af05cc9ddd5713016ec1a7f0d481daf2f0bb4d4e0bd66790503f6412bbc59";
+    sha256 = "72fafe29ba00633483aed39e405442226ef66d2ddc1021a39527ae1522b7067a";
   };
 
   checkInputs = [ pytest ];

From 53446a74ab439c797b90d542627828127d4f628c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:51:42 +0200
Subject: [PATCH 1506/3370] python: zetup: 0.2.42 -> 0.2.43

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

diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix
index c6b5900c6272..d72752a59884 100644
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "zetup";
-  version = "0.2.42";
+  version = "0.2.43";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6c9e25249f3014ed2162398772ccf1a5e8a4e9e66c74e3c7f6683945a6a3d84c";
+    sha256 = "ee92ba93a03336962525536f237ae0decf99a9b5d484ba34a3cf06ef017dae8e";
   };
 
   checkPhase = ''

From 292eb914a44e3e9d9ae7e0330731f59ed3e38849 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 May 2018 16:51:49 +0200
Subject: [PATCH 1507/3370] python: zxcvbn-python: 4.4.22 -> 4.4.24

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

diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix
index 633270b9480f..4f34d7d02883 100644
--- a/pkgs/development/python-modules/zxcvbn-python/default.nix
+++ b/pkgs/development/python-modules/zxcvbn-python/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "zxcvbn-python";
-  version = "4.4.22";
+  version = "4.4.24";
 
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "402d4222dc9994baed66a19a1cf5cb5c3fafd065f9cabc4cf7d5a2915e980979";
+    sha256 = "900b28cc5e96be4091d8778f19f222832890264e338765a1c1c09fca2db64b2d";
   };
 
   # No tests in archive

From c248aa40b1102e1d450c1730424d9048648ffc19 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 10 May 2018 10:13:30 +0200
Subject: [PATCH 1508/3370] python.pkgs.Keras: fix build

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

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 053ebb0fd019..f5590e11120b 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -1,12 +1,11 @@
 { stdenv, lib, buildPythonPackage, fetchPypi
 , pytest, pytestcov, pytestpep8, pytest_xdist
-, six, numpy, scipy, pyyaml
+, six, numpy, scipy, pyyaml, h5py
 }:
 
 buildPythonPackage rec {
   pname = "Keras";
   version = "2.1.6";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
@@ -21,7 +20,7 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    six pyyaml numpy scipy
+    six pyyaml numpy scipy h5py
   ];
 
   # Couldn't get tests working

From f154aa32fc1d94eb6f564b120b284f4ae13e38e3 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:14:04 +0300
Subject: [PATCH 1509/3370] handbrake: updated notes

---
 pkgs/applications/video/handbrake/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index d13995f6e9bd..9f1dfb2d6b07 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -1,13 +1,9 @@
-# Handbrake normally uses its own copies of the libraries it uses, for better
-# control over library patches.
+# Upstream distributes HandBrake with bundle of according versions of libraries and patches to them.
 #
-# This derivation patches HB so it doesn't do that. The relevant patches
-# are added to the Nix packages and proposed upstream instead. In several cases
-# upstream already incorporated these patches.
-# This has the benefits of providing improvements to other packages,
-# making licenses more clear and reducing compile time/install size.
+# Derivation patches HandBrake to use our closure.
 #
-# Only tested on Linux
+
+# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
 
 { stdenv, lib, fetchurl,
   python2, pkgconfig, yasm, harfbuzz, zlib,
@@ -34,7 +30,7 @@ stdenv.mkDerivation rec {
   };
 
   patched_libav_12 = libav_12.overrideAttrs (super: {
-    # 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream.
+    # NOTE: 2018-04-26: HandBrake compilation (1.1.0) requires a patch of LibAV (12.3) from HandBrake team. This patch not went LibAV upstream.
     patches = (super.patches or []) ++ [(
       fetchurl {
         url = ''https://raw.githubusercontent.com/HandBrake/HandBrake/9e1f245708a157231c427c0ef9b91729d59a30e1/contrib/ffmpeg/A21-mp4-sdtp.patch'';
@@ -107,7 +103,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2;
     maintainers = with maintainers; [ Anton-Latukha wmertens ];
-    # Not tested on anything else
     platforms = platforms.linux;
   };
 }

From 8c5557dc70ff083d574588188e6b5b6dbb67216a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 05:33:50 -0700
Subject: [PATCH 1510/3370] calibre: 3.22.1 -> 3.23.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/calibre/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped_ help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-customize -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-customize --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-customize help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped_ help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-debug -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-debug --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-debug help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-server-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-server-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-server -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-server --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-smtp-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-smtp-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-smtp -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/calibre-smtp --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-meta-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-meta-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-meta -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-meta --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-polish-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-polish-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-polish -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-polish --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-viewer-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.ebook-viewer-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-viewer -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/ebook-viewer --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.fetch-ebook-metadata-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.fetch-ebook-metadata-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/fetch-ebook-metadata -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/fetch-ebook-metadata --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrf2lrs-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrf2lrs-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrf2lrs -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrf2lrs --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrfviewer-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrfviewer-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrfviewer-wrapped_ help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrfviewer -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrfviewer --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrfviewer help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrs2lrf-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.lrs2lrf-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrs2lrf -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/lrs2lrf --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.markdown-calibre-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.markdown-calibre-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/markdown-calibre -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/markdown-calibre --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.web2disk-wrapped_ -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.web2disk-wrapped_ --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.web2disk-wrapped_ help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/web2disk -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/web2disk --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/web2disk help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-customize-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-customize-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-customize-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-customize-wrapped help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-debug-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-debug-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-debug-wrapped-wrapped help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-debug-wrapped help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-smtp-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..calibre-smtp-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-smtp-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.calibre-smtp-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..markdown-calibre-wrapped-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/..markdown-calibre-wrapped-wrapped --help’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.markdown-calibre-wrapped -h’ got 0 exit code
- ran ‘/nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0/bin/.markdown-calibre-wrapped --help’ got 0 exit code
- found 3.23.0 with grep in /nix/store/3s07jf9pkvyj8m3kidq7158mzjphi1yx-calibre-3.23.0
- directory tree listing: https://gist.github.com/8d953bc43339923b5dbd925cef68e5aa
---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 479aa26a19ea..3c1f426fb1b6 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.22.1";
+  version = "3.23.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1nd8pbcfpfw9b26511mhvsvjyfmgnfpdmzwhi7wpkx36wpa4sask";
+    sha256 = "0ds3i3dhkgpwa3c1lcq4zjmiaza8k9and0lbqqw4i6jrnpk691f9";
   };
 
   patches = [

From 19ac1d7fd62b500326c2a1bad15b9e2fd7cb082c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 06:19:32 -0700
Subject: [PATCH 1511/3370] alembic: 1.7.7 -> 1.7.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/alembic/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abcls -h’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abcls --help’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abcls help’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abctree -h’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abctree --help’ got 0 exit code
- ran ‘/nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin/bin/abcconvert --help’ got 0 exit code
- found 1.7.8 with grep in /nix/store/7w88c8acygk8igrg5s6snyzhyf13mjbj-alembic-1.7.8-bin
- directory tree listing: https://gist.github.com/0d7ea213b28bd60d9e8cfe5bfbaa4363
---
 pkgs/development/libraries/alembic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix
index 2276264e03f1..015c48d01411 100644
--- a/pkgs/development/libraries/alembic/default.nix
+++ b/pkgs/development/libraries/alembic/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec
 {
   name = "alembic-${version}";
-  version = "1.7.7";
+  version = "1.7.8";
 
   src = fetchFromGitHub {
     owner = "alembic";
     repo = "alembic";
     rev = "${version}";
-    sha256 = "16cgzn8cz3qbfpfh53bhn4ibwp5ddam3vxgz8zaglbj7z1a3pxfv";
+    sha256 = "1xmndhcliz25cgdzb7ybkvb05w4klmngpk76fzghamwyi79zfs2c";
   };
 
   outputs = [ "bin" "dev" "out" "lib" ];

From 104c019ade9fd15200de6a8270f3f459ee87af33 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:18:18 +0300
Subject: [PATCH 1512/3370] a52dec: rm old HandBrake patches

Patches no longer used in HandBrake upstream
---
 .../a52dec/A00-a52-state-t-public.patch       | 152 ------
 .../libraries/a52dec/A01-thread-safe.patch    | 462 ------------------
 .../libraries/a52dec/A02-imdct-shutup.patch   |  11 -
 .../libraries/a52dec/A03-automake.patch       |  12 -
 pkgs/development/libraries/a52dec/default.nix |  10 +-
 5 files changed, 1 insertion(+), 646 deletions(-)
 delete mode 100644 pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
 delete mode 100644 pkgs/development/libraries/a52dec/A01-thread-safe.patch
 delete mode 100644 pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
 delete mode 100644 pkgs/development/libraries/a52dec/A03-automake.patch

diff --git a/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch b/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
deleted file mode 100644
index 5e0af3577d6a..000000000000
--- a/pkgs/development/libraries/a52dec/A00-a52-state-t-public.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
---- a52dec.old/include/a52.h	2002-01-28 06:37:54.000000000 +0100
-+++ a52dec.new/include/a52.h	2012-07-16 14:13:35.000000000 +0200
-@@ -30,7 +30,71 @@
- typedef double sample_t;
- #endif
- 
--typedef struct a52_state_s a52_state_t;
-+typedef struct {
-+    uint8_t bai;              /* fine SNR offset, fast gain */
-+    uint8_t deltbae;          /* delta bit allocation exists */
-+    int8_t deltba[50];        /* per-band delta bit allocation */
-+} ba_t;
-+
-+typedef struct {
-+    uint8_t exp[256];         /* decoded channel exponents */
-+    int8_t bap[256];          /* derived channel bit allocation */
-+} expbap_t;
-+
-+typedef struct {
-+    uint8_t fscod;            /* sample rate */
-+    uint8_t halfrate;         /* halfrate factor */
-+    uint8_t acmod;            /* coded channels */
-+    uint8_t lfeon;            /* coded lfe channel */
-+    sample_t clev;            /* centre channel mix level */
-+    sample_t slev;            /* surround channels mix level */
-+
-+    int output;               /* type of output */
-+    sample_t level;           /* output level */
-+    sample_t bias;            /* output bias */
-+
-+    int dynrnge;              /* apply dynamic range */
-+    sample_t dynrng;          /* dynamic range */
-+    void * dynrngdata;        /* dynamic range callback funtion and data */
-+    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
-+
-+    uint8_t chincpl;          /* channel coupled */
-+    uint8_t phsflginu;        /* phase flags in use (stereo only) */
-+    uint8_t cplstrtmant;      /* coupling channel start mantissa */
-+    uint8_t cplendmant;       /* coupling channel end mantissa */
-+    uint32_t cplbndstrc;      /* coupling band structure */
-+    sample_t cplco[5][18];    /* coupling coordinates */
-+
-+    /* derived information */
-+    uint8_t cplstrtbnd;       /* coupling start band (for bit allocation) */
-+    uint8_t ncplbnd;          /* number of coupling bands */
-+
-+    uint8_t rematflg;         /* stereo rematrixing */
-+
-+    uint8_t endmant[5];       /* channel end mantissa */
-+
-+    uint16_t bai;             /* bit allocation information */
-+
-+    uint32_t * buffer_start;
-+    uint16_t lfsr_state;      /* dither state */
-+    uint32_t bits_left;
-+    uint32_t current_word;
-+
-+    uint8_t csnroffst;        /* coarse SNR offset */
-+    ba_t cplba;               /* coupling bit allocation parameters */
-+    ba_t ba[5];               /* channel bit allocation parameters */
-+    ba_t lfeba;               /* lfe bit allocation parameters */
-+
-+    uint8_t cplfleak;         /* coupling fast leak init */
-+    uint8_t cplsleak;         /* coupling slow leak init */
-+
-+    expbap_t cpl_expbap;
-+    expbap_t fbw_expbap[5];
-+    expbap_t lfe_expbap;
-+
-+    sample_t * samples;
-+    int downmixed;
-+} a52_state_t;
- 
- #define A52_CHANNEL 0
- #define A52_MONO 1
-diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
---- a52dec.old/liba52/a52_internal.h	2002-07-28 03:52:06.000000000 +0200
-+++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:11:47.000000000 +0200
-@@ -21,72 +21,6 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-  */
- 
--typedef struct {
--    uint8_t bai;		/* fine SNR offset, fast gain */
--    uint8_t deltbae;		/* delta bit allocation exists */
--    int8_t deltba[50];		/* per-band delta bit allocation */
--} ba_t;
--
--typedef struct {
--    uint8_t exp[256];		/* decoded channel exponents */
--    int8_t bap[256];		/* derived channel bit allocation */
--} expbap_t;
--
--struct a52_state_s {
--    uint8_t fscod;		/* sample rate */
--    uint8_t halfrate;		/* halfrate factor */
--    uint8_t acmod;		/* coded channels */
--    uint8_t lfeon;		/* coded lfe channel */
--    sample_t clev;		/* centre channel mix level */
--    sample_t slev;		/* surround channels mix level */
--
--    int output;			/* type of output */
--    sample_t level;		/* output level */
--    sample_t bias;		/* output bias */
--
--    int dynrnge;		/* apply dynamic range */
--    sample_t dynrng;		/* dynamic range */
--    void * dynrngdata;		/* dynamic range callback funtion and data */
--    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
--
--    uint8_t chincpl;		/* channel coupled */
--    uint8_t phsflginu;		/* phase flags in use (stereo only) */
--    uint8_t cplstrtmant;	/* coupling channel start mantissa */
--    uint8_t cplendmant;		/* coupling channel end mantissa */
--    uint32_t cplbndstrc;	/* coupling band structure */
--    sample_t cplco[5][18];	/* coupling coordinates */
--
--    /* derived information */
--    uint8_t cplstrtbnd;		/* coupling start band (for bit allocation) */
--    uint8_t ncplbnd;		/* number of coupling bands */
--
--    uint8_t rematflg;		/* stereo rematrixing */
--
--    uint8_t endmant[5];		/* channel end mantissa */
--
--    uint16_t bai;		/* bit allocation information */
--
--    uint32_t * buffer_start;
--    uint16_t lfsr_state;	/* dither state */
--    uint32_t bits_left;
--    uint32_t current_word;
--
--    uint8_t csnroffst;		/* coarse SNR offset */
--    ba_t cplba;			/* coupling bit allocation parameters */
--    ba_t ba[5];			/* channel bit allocation parameters */
--    ba_t lfeba;			/* lfe bit allocation parameters */
--
--    uint8_t cplfleak;		/* coupling fast leak init */
--    uint8_t cplsleak;		/* coupling slow leak init */
--
--    expbap_t cpl_expbap;
--    expbap_t fbw_expbap[5];
--    expbap_t lfe_expbap;
--
--    sample_t * samples;
--    int downmixed;
--};
--
- #define LEVEL_PLUS6DB 2.0
- #define LEVEL_PLUS3DB 1.4142135623730951
- #define LEVEL_3DB 0.7071067811865476
diff --git a/pkgs/development/libraries/a52dec/A01-thread-safe.patch b/pkgs/development/libraries/a52dec/A01-thread-safe.patch
deleted file mode 100644
index 4ca2d1a08734..000000000000
--- a/pkgs/development/libraries/a52dec/A01-thread-safe.patch
+++ /dev/null
@@ -1,462 +0,0 @@
-diff -Naur a52dec.old/include/a52.h a52dec.new/include/a52.h
---- a52dec.old/include/a52.h	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/include/a52.h	2012-07-16 14:31:37.000000000 +0200
-@@ -42,6 +42,11 @@
- } expbap_t;
- 
- typedef struct {
-+    sample_t real;
-+    sample_t imag;
-+} complex_t;
-+
-+typedef struct {
-     uint8_t fscod;            /* sample rate */
-     uint8_t halfrate;         /* halfrate factor */
-     uint8_t acmod;            /* coded channels */
-@@ -94,6 +99,20 @@
- 
-     sample_t * samples;
-     int downmixed;
-+
-+    /* Root values for IFFT */
-+    sample_t * roots16;           // size 3
-+    sample_t * roots32;           // size 7
-+    sample_t * roots64;           // size 15
-+    sample_t * roots128;          // size 31
-+
-+    /* Twiddle factors for IMDCT */
-+    complex_t * pre1;             // size 128
-+    complex_t * post1;            // size 64
-+    complex_t * pre2;             // size 64
-+    complex_t * post2;            // size 32
-+
-+    sample_t * a52_imdct_window;  // size 256
- } a52_state_t;
- 
- #define A52_CHANNEL 0
-diff -Naur a52dec.old/liba52/a52_internal.h a52dec.new/liba52/a52_internal.h
---- a52dec.old/liba52/a52_internal.h	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/a52_internal.h	2012-07-16 14:28:33.000000000 +0200
-@@ -49,6 +49,6 @@
- 		  sample_t clev, sample_t slev);
- void a52_upmix (sample_t * samples, int acmod, int output);
- 
--void a52_imdct_init (uint32_t mm_accel);
--void a52_imdct_256 (sample_t * data, sample_t * delay, sample_t bias);
--void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias);
-+void a52_imdct_init (a52_state_t * state, uint32_t mm_accel);
-+void a52_imdct_256 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
-+void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias);
-diff -Naur a52dec.old/liba52/imdct.c a52dec.new/liba52/imdct.c
---- a52dec.old/liba52/imdct.c	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/imdct.c	2012-07-16 14:33:00.000000000 +0200
-@@ -40,11 +40,6 @@
- #include "a52_internal.h"
- #include "mm_accel.h"
- 
--typedef struct complex_s {
--    sample_t real;
--    sample_t imag;
--} complex_t;
--
- static uint8_t fftorder[] = {
-       0,128, 64,192, 32,160,224, 96, 16,144, 80,208,240,112, 48,176,
-       8,136, 72,200, 40,168,232,104,248,120, 56,184, 24,152,216, 88,
-@@ -56,22 +51,8 @@
-       6,134, 70,198, 38,166,230,102,246,118, 54,182, 22,150,214, 86
- };
- 
--/* Root values for IFFT */
--static sample_t roots16[3];
--static sample_t roots32[7];
--static sample_t roots64[15];
--static sample_t roots128[31];
--
--/* Twiddle factors for IMDCT */
--static complex_t pre1[128];
--static complex_t post1[64];
--static complex_t pre2[64];
--static complex_t post2[32];
--
--static sample_t a52_imdct_window[256];
--
--static void (* ifft128) (complex_t * buf);
--static void (* ifft64) (complex_t * buf);
-+static void (* ifft128) (a52_state_t * state, complex_t * buf);
-+static void (* ifft64) (a52_state_t * state, complex_t * buf);
- 
- static inline void ifft2 (complex_t * buf)
- {
-@@ -167,7 +148,7 @@
-     a1.imag += tmp4;				\
- } while (0)
- 
--static inline void ifft8 (complex_t * buf)
-+static inline void ifft8 (a52_state_t * state, complex_t * buf)
- {
-     double tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8;
- 
-@@ -175,7 +156,7 @@
-     ifft2 (buf + 4);
-     ifft2 (buf + 6);
-     BUTTERFLY_ZERO (buf[0], buf[2], buf[4], buf[6]);
--    BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], roots16[1]);
-+    BUTTERFLY_HALF (buf[1], buf[3], buf[5], buf[7], state->roots16[1]);
- }
- 
- static void ifft_pass (complex_t * buf, sample_t * weight, int n)
-@@ -205,66 +186,66 @@
-     } while (--i);
- }
- 
--static void ifft16 (complex_t * buf)
-+static void ifft16 (a52_state_t * state, complex_t * buf)
- {
--    ifft8 (buf);
-+    ifft8 (state, buf);
-     ifft4 (buf + 8);
-     ifft4 (buf + 12);
--    ifft_pass (buf, roots16 - 4, 4);
-+    ifft_pass (buf, state->roots16 - 4, 4);
- }
- 
--static void ifft32 (complex_t * buf)
-+static void ifft32 (a52_state_t * state, complex_t * buf)
- {
--    ifft16 (buf);
--    ifft8 (buf + 16);
--    ifft8 (buf + 24);
--    ifft_pass (buf, roots32 - 8, 8);
-+    ifft16 (state, buf);
-+    ifft8 (state, buf + 16);
-+    ifft8 (state, buf + 24);
-+    ifft_pass (buf, state->roots32 - 8, 8);
- }
- 
--static void ifft64_c (complex_t * buf)
-+static void ifft64_c (a52_state_t * state, complex_t * buf)
- {
--    ifft32 (buf);
--    ifft16 (buf + 32);
--    ifft16 (buf + 48);
--    ifft_pass (buf, roots64 - 16, 16);
-+    ifft32 (state, buf);
-+    ifft16 (state, buf + 32);
-+    ifft16 (state, buf + 48);
-+    ifft_pass (buf, state->roots64 - 16, 16);
- }
- 
--static void ifft128_c (complex_t * buf)
-+static void ifft128_c (a52_state_t * state, complex_t * buf)
- {
--    ifft32 (buf);
--    ifft16 (buf + 32);
--    ifft16 (buf + 48);
--    ifft_pass (buf, roots64 - 16, 16);
-+    ifft32 (state, buf);
-+    ifft16 (state, buf + 32);
-+    ifft16 (state, buf + 48);
-+    ifft_pass (buf, state->roots64 - 16, 16);
- 
--    ifft32 (buf + 64);
--    ifft32 (buf + 96);
--    ifft_pass (buf, roots128 - 32, 32);
-+    ifft32 (state, buf + 64);
-+    ifft32 (state, buf + 96);
-+    ifft_pass (buf, state->roots128 - 32, 32);
- }
- 
--void a52_imdct_512 (sample_t * data, sample_t * delay, sample_t bias)
-+void a52_imdct_512 (a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias)
- {
-     int i, k;
-     sample_t t_r, t_i, a_r, a_i, b_r, b_i, w_1, w_2;
--    const sample_t * window = a52_imdct_window;
-+    const sample_t * window = state->a52_imdct_window;
-     complex_t buf[128];
- 	
-     for (i = 0; i < 128; i++) {
- 	k = fftorder[i];
--	t_r = pre1[i].real;
--	t_i = pre1[i].imag;
-+	t_r = state->pre1[i].real;
-+	t_i = state->pre1[i].imag;
- 
- 	buf[i].real = t_i * data[255-k] + t_r * data[k];
- 	buf[i].imag = t_r * data[255-k] - t_i * data[k];
-     }
- 
--    ifft128 (buf);
-+    ifft128 (state, buf);
- 
-     /* Post IFFT complex multiply plus IFFT complex conjugate*/
-     /* Window and convert to real valued signal */
-     for (i = 0; i < 64; i++) {
- 	/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
--	t_r = post1[i].real;
--	t_i = post1[i].imag;
-+	t_r = state->post1[i].real;
-+	t_i = state->post1[i].imag;
- 
- 	a_r = t_r * buf[i].real     + t_i * buf[i].imag;
- 	a_i = t_i * buf[i].real     - t_r * buf[i].imag;
-@@ -285,18 +266,18 @@
-     }
- }
- 
--void a52_imdct_256(sample_t * data, sample_t * delay, sample_t bias)
-+void a52_imdct_256(a52_state_t * state, sample_t * data, sample_t * delay, sample_t bias)
- {
-     int i, k;
-     sample_t t_r, t_i, a_r, a_i, b_r, b_i, c_r, c_i, d_r, d_i, w_1, w_2;
--    const sample_t * window = a52_imdct_window;
-+    const sample_t * window = state->a52_imdct_window;
-     complex_t buf1[64], buf2[64];
- 
-     /* Pre IFFT complex multiply plus IFFT cmplx conjugate */
-     for (i = 0; i < 64; i++) {
- 	k = fftorder[i];
--	t_r = pre2[i].real;
--	t_i = pre2[i].imag;
-+	t_r = state->pre2[i].real;
-+	t_i = state->pre2[i].imag;
- 
- 	buf1[i].real = t_i * data[254-k] + t_r * data[k];
- 	buf1[i].imag = t_r * data[254-k] - t_i * data[k];
-@@ -305,15 +286,15 @@
- 	buf2[i].imag = t_r * data[255-k] - t_i * data[k+1];
-     }
- 
--    ifft64 (buf1);
--    ifft64 (buf2);
-+    ifft64 (state, buf1);
-+    ifft64 (state, buf2);
- 
-     /* Post IFFT complex multiply */
-     /* Window and convert to real valued signal */
-     for (i = 0; i < 32; i++) {
- 	/* y1[n] = z1[n] * (xcos2[n] + j * xs in2[n]) ; */ 
--	t_r = post2[i].real;
--	t_i = post2[i].imag;
-+	t_r = state->post2[i].real;
-+	t_i = state->post2[i].imag;
- 
- 	a_r = t_r * buf1[i].real    + t_i * buf1[i].imag;
- 	a_i = t_i * buf1[i].real    - t_r * buf1[i].imag;
-@@ -362,7 +343,7 @@
-     return bessel;
- }
- 
--void a52_imdct_init (uint32_t mm_accel)
-+void a52_imdct_init (a52_state_t * state, uint32_t mm_accel)
- {
-     int i, k;
-     double sum;
-@@ -371,50 +352,50 @@
-     sum = 0;
-     for (i = 0; i < 256; i++) {
- 	sum += besselI0 (i * (256 - i) * (5 * M_PI / 256) * (5 * M_PI / 256));
--	a52_imdct_window[i] = sum;
-+	state->a52_imdct_window[i] = sum;
-     }
-     sum++;
-     for (i = 0; i < 256; i++)
--	a52_imdct_window[i] = sqrt (a52_imdct_window[i] / sum);
-+	state->a52_imdct_window[i] = sqrt (state->a52_imdct_window[i] / sum);
- 
-     for (i = 0; i < 3; i++)
--	roots16[i] = cos ((M_PI / 8) * (i + 1));
-+	state->roots16[i] = cos ((M_PI / 8) * (i + 1));
- 
-     for (i = 0; i < 7; i++)
--	roots32[i] = cos ((M_PI / 16) * (i + 1));
-+	state->roots32[i] = cos ((M_PI / 16) * (i + 1));
- 
-     for (i = 0; i < 15; i++)
--	roots64[i] = cos ((M_PI / 32) * (i + 1));
-+	state->roots64[i] = cos ((M_PI / 32) * (i + 1));
- 
-     for (i = 0; i < 31; i++)
--	roots128[i] = cos ((M_PI / 64) * (i + 1));
-+	state->roots128[i] = cos ((M_PI / 64) * (i + 1));
- 
-     for (i = 0; i < 64; i++) {
- 	k = fftorder[i] / 2 + 64;
--	pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
--	pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].real = cos ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].imag = sin ((M_PI / 256) * (k - 0.25));
-     }
- 
-     for (i = 64; i < 128; i++) {
- 	k = fftorder[i] / 2 + 64;
--	pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
--	pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].real = -cos ((M_PI / 256) * (k - 0.25));
-+	state->pre1[i].imag = -sin ((M_PI / 256) * (k - 0.25));
-     }
- 
-     for (i = 0; i < 64; i++) {
--	post1[i].real = cos ((M_PI / 256) * (i + 0.5));
--	post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
-+	state->post1[i].real = cos ((M_PI / 256) * (i + 0.5));
-+	state->post1[i].imag = sin ((M_PI / 256) * (i + 0.5));
-     }
- 
-     for (i = 0; i < 64; i++) {
- 	k = fftorder[i] / 4;
--	pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
--	pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
-+	state->pre2[i].real = cos ((M_PI / 128) * (k - 0.25));
-+	state->pre2[i].imag = sin ((M_PI / 128) * (k - 0.25));
-     }
- 
-     for (i = 0; i < 32; i++) {
--	post2[i].real = cos ((M_PI / 128) * (i + 0.5));
--	post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
-+	state->post2[i].real = cos ((M_PI / 128) * (i + 0.5));
-+	state->post2[i].imag = sin ((M_PI / 128) * (i + 0.5));
-     }
- 
- #ifdef LIBA52_DJBFFT
-diff -Naur a52dec.old/liba52/parse.c a52dec.new/liba52/parse.c
---- a52dec.old/liba52/parse.c	2012-07-16 14:24:14.000000000 +0200
-+++ a52dec.new/liba52/parse.c	2012-07-16 14:33:00.000000000 +0200
-@@ -56,16 +56,53 @@
-     a52_state_t * state;
-     int i;
- 
--    state = malloc (sizeof (a52_state_t));
-+    state = calloc (1, sizeof (a52_state_t));
-     if (state == NULL)
- 	return NULL;
- 
-     state->samples = memalign (16, 256 * 12 * sizeof (sample_t));
-     if (state->samples == NULL) {
--	free (state);
--	return NULL;
-+        goto fail;
-     }
- 
-+    /* Root values for IFFT */
-+    state->roots16 = memalign (16, 3 * sizeof (sample_t));
-+    if (state->roots16 == NULL)
-+        goto fail;
-+
-+    state->roots32 = memalign (16, 7 * sizeof (sample_t));
-+    if (state->roots32 == NULL)
-+        goto fail;
-+
-+    state->roots64 = memalign (16, 15 * sizeof (sample_t));
-+    if (state->roots64 == NULL)
-+        goto fail;
-+
-+    state->roots128 = memalign (16, 31 * sizeof (sample_t));
-+    if (state->roots128 == NULL)
-+        goto fail;
-+
-+    /* Twiddle factors for IMDCT */
-+    state->pre1 = memalign (16, 128 * sizeof (complex_t));
-+    if (state->pre1 == NULL)
-+        goto fail;
-+
-+    state->post1 = memalign (16, 64 * sizeof (complex_t));
-+    if (state->post1 == NULL)
-+        goto fail;
-+
-+    state->pre2 = memalign (16, 64 * sizeof (complex_t));
-+    if (state->pre2 == NULL)
-+        goto fail;
-+
-+    state->post2 = memalign (16, 32 * sizeof (complex_t));
-+    if (state->post2 == NULL)
-+        goto fail;
-+
-+    state->a52_imdct_window = memalign (16, 256 * sizeof (sample_t));
-+    if (state->a52_imdct_window == NULL)
-+        goto fail;
-+
-     for (i = 0; i < 256 * 12; i++)
- 	state->samples[i] = 0;
- 
-@@ -73,9 +110,27 @@
- 
-     state->lfsr_state = 1;
- 
--    a52_imdct_init (mm_accel);
-+    a52_imdct_init (state, mm_accel);
- 
-     return state;
-+
-+fail:
-+    if ( state )
-+    {
-+        free (state->a52_imdct_window);
-+        free (state->post2);
-+        free (state->pre2);
-+        free (state->post1);
-+        free (state->pre1);
-+        free (state->roots128);
-+        free (state->roots64);
-+        free (state->roots32);
-+        free (state->roots16);
-+        free (state->samples);
-+        free (state);
-+    }
-+    return NULL;
-+
- }
- 
- sample_t * a52_samples (a52_state_t * state)
-@@ -825,7 +880,7 @@
- 		       state->dynrng, 0, 7);
- 	    for (i = 7; i < 256; i++)
- 		(samples-256)[i] = 0;
--	    a52_imdct_512 (samples - 256, samples + 1536 - 256, state->bias);
-+	    a52_imdct_512 (state, samples - 256, samples + 1536 - 256, state->bias);
- 	} else {
- 	    /* just skip the LFE coefficients */
- 	    coeff_get (state, samples + 1280, &state->lfe_expbap, &quantizer,
-@@ -854,10 +909,10 @@
- 
- 	    if (coeff[i]) {
- 		if (blksw[i])
--		    a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i,
-+		    a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 				   bias);
- 		else 
--		    a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i,
-+		    a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 				   bias);
- 	    } else {
- 		int j;
-@@ -883,11 +938,11 @@
- 
- 	if (blksw[0])
- 	    for (i = 0; i < nfchans; i++)
--		a52_imdct_256 (samples + 256 * i, samples + 1536 + 256 * i,
-+		a52_imdct_256 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 			       state->bias);
- 	else 
- 	    for (i = 0; i < nfchans; i++)
--		a52_imdct_512 (samples + 256 * i, samples + 1536 + 256 * i,
-+		a52_imdct_512 (state, samples + 256 * i, samples + 1536 + 256 * i,
- 			       state->bias);
-     }
- 
-@@ -896,6 +951,15 @@
- 
- void a52_free (a52_state_t * state)
- {
-+    free (state->a52_imdct_window);
-+    free (state->post2);
-+    free (state->pre2);
-+    free (state->post1);
-+    free (state->pre1);
-+    free (state->roots128);
-+    free (state->roots64);
-+    free (state->roots32);
-+    free (state->roots16);
-     free (state->samples);
-     free (state);
- }
diff --git a/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch b/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
deleted file mode 100644
index a22e5979e665..000000000000
--- a/pkgs/development/libraries/a52dec/A02-imdct-shutup.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a52dec_original/liba52/imdct.c a52dec_patched/liba52/imdct.c
---- a52dec.old/liba52/imdct.c	2002-07-28 03:52:07.000000000 +0200
-+++ a52dec.new/liba52/imdct.c	2011-07-15 20:29:09.000000000 +0200
-@@ -425,7 +425,6 @@
-     } else
- #endif
-     {
--	fprintf (stderr, "No accelerated IMDCT transform found\n");
- 	ifft128 = ifft128_c;
- 	ifft64 = ifft64_c;
-     }
diff --git a/pkgs/development/libraries/a52dec/A03-automake.patch b/pkgs/development/libraries/a52dec/A03-automake.patch
deleted file mode 100644
index 142091dc6957..000000000000
--- a/pkgs/development/libraries/a52dec/A03-automake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a52dec.orig/configure.in a52dec/configure.in
---- a52dec.orig/configure.in	2002-07-27 23:50:20.000000000 -0400
-+++ a52dec/configure.in	2013-01-28 21:06:27.000000000 -0500
-@@ -6,7 +6,7 @@
- AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
-     doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
- AM_INIT_AUTOMAKE([a52dec],[0.7.4])
--AM_CONFIG_HEADER(include/config.h)
-+AC_CONFIG_HEADER(include/config.h)
- AM_MAINTAINER_MODE
- AC_CANONICAL_HOST
- 
diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index d8a56a3d28ed..0bfe3a88e9f4 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -2,20 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "a52dec-0.7.4p4";
-  
+
   src = fetchurl {
     url = "${meta.homepage}/files/a52dec-0.7.4.tar.gz";
     sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
   };
 
-  # From Handbrake
-  patches = [
-    ./A00-a52-state-t-public.patch
-    ./A01-thread-safe.patch
-    ./A02-imdct-shutup.patch
-    ./A03-automake.patch
-  ];
-
   meta = {
     description = "ATSC A/52 stream decoder";
     homepage = http://liba52.sourceforge.net/;

From 3d879e0fcf3a96a1bbf3f04a19eedfd365132165 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:20:28 +0300
Subject: [PATCH 1513/3370] libdvdnav: rm old HandBrake pathes

Patches no longer used in HandBrake upstream
---
 .../development/libraries/libdvdnav/4.2.1.nix |   5 +-
 .../libraries/libdvdnav/A08-dvdnav-dup.patch  | 137 ------------------
 .../libdvdnav/P00-mingw-no-examples.patch     |  21 ---
 3 files changed, 1 insertion(+), 162 deletions(-)
 delete mode 100644 pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
 delete mode 100644 pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch

diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix
index 0d3f8349413c..18e2689002e8 100644
--- a/pkgs/development/libraries/libdvdnav/4.2.1.nix
+++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "libdvdnav-4.2.1";
-  
+
   src = fetchurl {
     url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz;
     sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372";
@@ -17,9 +17,6 @@ stdenv.mkDerivation {
     mkdir -p $out
   '';
 
-  # From Handbrake
-  patches = [ ./A08-dvdnav-dup.patch ./P00-mingw-no-examples.patch ];
-
   meta = {
     homepage = http://dvdnav.mplayerhq.hu/;
     description = "A library that implements DVD navigation features such as DVD menus";
diff --git a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch b/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
deleted file mode 100644
index c0991b43555a..000000000000
--- a/pkgs/development/libraries/libdvdnav/A08-dvdnav-dup.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-Index: src/dvdnav.c
-===================================================================
---- libdvdnav.orig/src/dvdnav.c	(revision 1168)
-+++ libdvdnav/src/dvdnav.c	(working copy)
-@@ -71,6 +71,67 @@
-   return DVDNAV_STATUS_OK;
- }
- 
-+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src) {
-+  dvdnav_t *this;
-+
-+  (*dest) = NULL;
-+  this = (dvdnav_t*)malloc(sizeof(dvdnav_t));
-+  if(!this)
-+    return DVDNAV_STATUS_ERR;
-+
-+  memcpy(this, src, sizeof(dvdnav_t));
-+  this->file = NULL;
-+
-+  pthread_mutex_init(&this->vm_lock, NULL);
-+
-+  this->vm = vm_new_copy(src->vm);
-+  if(!this->vm) {
-+    printerr("Error initialising the DVD VM.");
-+    pthread_mutex_destroy(&this->vm_lock);
-+    free(this);
-+    return DVDNAV_STATUS_ERR;
-+  }
-+
-+  /* Start the read-ahead cache. */
-+  this->cache = dvdnav_read_cache_new(this);
-+
-+  (*dest) = this;
-+  return DVDNAV_STATUS_OK;
-+}
-+
-+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this) {
-+
-+#ifdef LOG_DEBUG
-+  fprintf(MSG_OUT, "libdvdnav: free_dup:called\n");
-+#endif
-+
-+  if (this->file) {
-+    pthread_mutex_lock(&this->vm_lock);
-+    DVDCloseFile(this->file);
-+#ifdef LOG_DEBUG
-+    fprintf(MSG_OUT, "libdvdnav: close:file closing\n");
-+#endif
-+    this->file = NULL;
-+    pthread_mutex_unlock(&this->vm_lock);
-+  }
-+
-+  /* Free the VM */
-+  if(this->vm)
-+    vm_free_copy(this->vm);
-+
-+  pthread_mutex_destroy(&this->vm_lock);
-+
-+  /* We leave the final freeing of the entire structure to the cache,
-+   * because we don't know, if there are still buffers out in the wild,
-+   * that must return first. */
-+  if(this->cache)
-+    dvdnav_read_cache_free(this->cache);
-+  else
-+    free(this);
-+
-+  return DVDNAV_STATUS_OK;
-+}
-+
- dvdnav_status_t dvdnav_open(dvdnav_t** dest, const char *path) {
-   dvdnav_t *this;
-   struct timeval time;
-Index: src/dvdnav/dvdnav.h
-===================================================================
---- libdvdnav.orig/src/dvdnav/dvdnav.h	(revision 1168)
-+++ libdvdnav/src/dvdnav.h	(working copy)
-@@ -89,6 +89,9 @@
-  */
- dvdnav_status_t dvdnav_open(dvdnav_t **dest, const char *path);
- 
-+dvdnav_status_t dvdnav_dup(dvdnav_t **dest, dvdnav_t *src);
-+dvdnav_status_t dvdnav_free_dup(dvdnav_t *this);
-+
- /*
-  * Closes a dvdnav_t previously opened with dvdnav_open(), freeing any
-  * memory associated with it.
-Index: src/vm/vm.c
-===================================================================
---- libdvdnav.orig/src/vm/vm.c	(revision 1168)
-+++ libdvdnav/src/vm/vm.c	(working copy)
-@@ -96,6 +98,7 @@
- 
- static pgcit_t* get_MENU_PGCIT(vm_t *vm, ifo_handle_t *h, uint16_t lang);
- static pgcit_t* get_PGCIT(vm_t *vm);
-+static void vm_close(vm_t *vm);
- 
- 
- /* Helper functions */
-@@ -262,7 +265,7 @@
- }
- 
- void vm_free_vm(vm_t *vm) {
--  vm_stop(vm);
-+  vm_close(vm);
-   free(vm);
- }
- 
-@@ -289,12 +292,20 @@
- 
- int vm_start(vm_t *vm) {
-   /* Set pgc to FP (First Play) pgc */
-+  if (vm->stopped) {
-+    vm_reset(vm, NULL);
-+    vm->stopped = 0;
-+  }
-   set_FP_PGC(vm);
-   process_command(vm, play_PGC(vm));
-   return !vm->stopped;
- }
- 
- void vm_stop(vm_t *vm) {
-+  vm->stopped = 1;
-+}
-+
-+static void vm_close(vm_t *vm) {
-   if(vm->vmgi) {
-     ifoClose(vm->vmgi);
-     vm->vmgi=NULL;
-@@ -346,7 +357,7 @@
- 
-   if (vm->dvd && dvdroot) {
-     /* a new dvd device has been requested */
--    vm_stop(vm);
-+    vm_close(vm);
-   }
-   if (!vm->dvd) {
-     vm->dvd = DVDOpen(dvdroot);
diff --git a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch b/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch
deleted file mode 100644
index 0e0618617359..000000000000
--- a/pkgs/development/libraries/libdvdnav/P00-mingw-no-examples.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur libdvdnav.orig/Makefile.am libdvdnav/Makefile.am
---- libdvdnav.orig/Makefile.am	2008-10-03 16:11:46.000000000 -0400
-+++ libdvdnav/Makefile.am	2009-04-24 02:53:15.000000000 -0400
-@@ -1,7 +1,7 @@
- include $(top_srcdir)/misc/Makefile.common
- 
- 
--SUBDIRS = src examples doc misc m4
-+SUBDIRS = src doc misc m4
- 
- EXTRA_DIST = autogen.sh \
- 	     AUTHORS \
-diff -Naur libdvdnav.orig/configure.ac libdvdnav/configure.ac
---- libdvdnav.orig/configure.ac	2009-01-08 17:57:11.000000000 -0500
-+++ libdvdnav/configure.ac	2009-04-24 02:52:34.000000000 -0400
-@@ -252,5 +252,4 @@
- misc/relchk.sh
- m4/Makefile
- doc/Makefile
--examples/Makefile
- ])

From e619a49e2e66f061922d9377af1abd899e1c7b23 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:23:26 +0300
Subject: [PATCH 1514/3370] libmkv: rm old HandBrake patches

Patches no longer used in HandBrake upstream
---
 .../libraries/libmkv/A01-hbmv-pgs.patch       | 12 --------
 .../libmkv/A02-audio-out-sampling-freq.patch  | 28 -------------------
 .../libmkv/P00-mingw-large-file.patch         | 24 ----------------
 pkgs/development/libraries/libmkv/default.nix | 15 +++-------
 4 files changed, 4 insertions(+), 75 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
 delete mode 100644 pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
 delete mode 100644 pkgs/development/libraries/libmkv/P00-mingw-large-file.patch

diff --git a/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch b/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
deleted file mode 100644
index 9f863cac4122..000000000000
--- a/pkgs/development/libraries/libmkv/A01-hbmv-pgs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/libmkv.h b/include/libmkv.h
-index 146a91f..f03d608 100644
---- a/include/libmkv.h
-+++ b/include/libmkv.h
-@@ -94,6 +94,7 @@ extern "C" {
- #define MK_SUBTITLE_USF    "S_TEXT/USF"
- #define MK_SUBTITLE_VOBSUB "S_VOBSUB"
- #define MK_SUBTITLE_BMP    "S_IMAGE/BMP"
-+#define MK_SUBTITLE_PGS    "S_HDMV/PGS"
- 
- /* Official Tags */
- #define MK_TAG_TITLE		"TITLE"
diff --git a/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch b/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
deleted file mode 100644
index ea31957c1d29..000000000000
--- a/pkgs/development/libraries/libmkv/A02-audio-out-sampling-freq.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/include/libmkv.h b/include/libmkv.h
-index 146a91f..f03d608 100644
---- a/include/libmkv.h
-+++ b/include/libmkv.h
-@@ -203,6 +204,7 @@ struct mk_TrackConfig_s {
- 		} video;
- 		struct {
- 			float samplingFreq;	/* Sampling Frequency in Hz */
-+			float outputSamplingFreq;	/* Playback Sampling Frequency in Hz (e.g. for AAC w/SBR) */
- 			unsigned channels;	/* Number of channels for this track */
- 			unsigned bitDepth;	/* Bits per sample (PCM) */
- 		} audio;
-diff --git a/src/tracks.c b/src/tracks.c
-index f9c7e48..a2a60ca 100644
---- a/src/tracks.c
-+++ b/src/tracks.c
-@@ -174,6 +174,11 @@ mk_Track *mk_createTrack(mk_Writer *w, mk_TrackConfig *tc)
- 			/* SamplingFrequency */
- 			if (mk_writeFloat(v, MATROSKA_ID_AUDIOSAMPLINGFREQ, tc->extra.audio.samplingFreq) < 0)
- 				return NULL;
-+			if (tc->extra.audio.outputSamplingFreq) {
-+				/* Output SamplingFrequency */
-+				if (mk_writeFloat(v, MATROSKA_ID_AUDIOOUTSAMPLINGFREQ, tc->extra.audio.outputSamplingFreq) < 0)
-+					return NULL;
-+			}
- 			/* Channels */
- 			if (mk_writeUInt(v, MATROSKA_ID_AUDIOCHANNELS, tc->extra.audio.channels) < 0)
- 				return NULL;
diff --git a/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch b/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch
deleted file mode 100644
index 6a83eacca83e..000000000000
--- a/pkgs/development/libraries/libmkv/P00-mingw-large-file.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- libmkv.orig/src/matroska.c	2009-01-12 23:14:26.000000000 -0800
-+++ libmkv/src/matroska.c	2009-03-25 15:22:30.000000000 -0700
-@@ -27,6 +27,11 @@
- 
- #include <sys/time.h>
- 
-+#if defined( __MINGW32__ )
-+#undef fseeko
-+#define fseeko fseeko64
-+#endif
-+
- #define RESERVED_SEEKHEAD 0x100
- /* 256 bytes should be enough room for our Seek entries. */
- #define RESERVED_CHAPTERS 0x800
-@@ -34,7 +39,7 @@
- 
- int mk_seekFile(mk_Writer *w, uint64_t pos)
- {
--	if (fseek(w->fp, pos, SEEK_SET))
-+	if (fseeko(w->fp, pos, SEEK_SET))
- 		return -1;
- 
- 	w->f_pos = pos;
-
diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix
index ab451fcd5fde..48e710c208f4 100644
--- a/pkgs/development/libraries/libmkv/default.nix
+++ b/pkgs/development/libraries/libmkv/default.nix
@@ -1,26 +1,19 @@
 { stdenv, fetchgit, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  name = "libmkv-0.6.5.1p2";
-  
+  name = "libmkv-${version}";
+  version = "0.6.5.1";
+
   src = fetchgit {
     url = https://github.com/saintdev/libmkv.git;
-    rev = "refs/tags/0.6.5.1";
+    rev = "refs/tags/${version}";
     sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl";
   };
 
   nativeBuildInputs = [ libtool autoconf automake ];
 
-  # TODO fix library version
   preConfigure = "sh bootstrap.sh";
 
-  # From Handbrake
-  patches = [
-    ./A01-hbmv-pgs.patch
-    ./A02-audio-out-sampling-freq.patch
-    ./P00-mingw-large-file.patch
-  ];
-
   meta = {
     homepage = https://github.com/saintdev/libmkv;
     license = stdenv.lib.licenses.gpl2;

From fd3466d8d89494ba3406829a78394762be2511a9 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Thu, 10 May 2018 11:25:40 +0300
Subject: [PATCH 1515/3370] mp4v2: rm old HandBrake patch

Patch no longer used by HandBrake upstream
---
 .../mp4v2/A02-meaningful-4gb-warning.patch         | 14 --------------
 pkgs/development/libraries/mp4v2/default.nix       |  4 ----
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch

diff --git a/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch b/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch
deleted file mode 100644
index 987298bd5b00..000000000000
--- a/pkgs/development/libraries/mp4v2/A02-meaningful-4gb-warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur mp4v2-trunk-r355/src/mp4atom.cpp mp4v2-trunk-r355/src/mp4atom.cpp
---- mp4v2-trunk-r355/src/mp4atom.cpp	2012-02-21 19:40:03.000000000 +0100
-+++ mp4v2-trunk-r355/src/mp4atom.cpp	2012-02-21 19:36:38.000000000 +0100
-@@ -543,6 +543,10 @@
-         m_pFile->SetPosition(m_start + 8);
-         m_pFile->WriteUInt64(m_size);
-     } else {
-+        if (!(m_size <= (uint64_t)0xFFFFFFFF)) {
-+            // Let the user know what the following assert is all about
-+            fprintf(stderr, "MP4ERROR: File size exceeded 4 GB; output unplayable. Enable \"Large file size\" to fix it.\n");
-+        }
-         ASSERT(m_size <= (uint64_t)0xFFFFFFFF);
-         m_pFile->SetPosition(m_start);
-         m_pFile->WriteUInt32(m_size);
diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix
index a5542ebb659a..e55d9989bffc 100644
--- a/pkgs/development/libraries/mp4v2/default.nix
+++ b/pkgs/development/libraries/mp4v2/default.nix
@@ -9,10 +9,6 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    # From Handbrake
-    # mp4v2 doesn't seem to be actively maintained any more :-/
-    ./A02-meaningful-4gb-warning.patch
-
     (fetchurl {
       name = "gcc-7.patch";
       url = "https://src.fedoraproject.org/cgit/rpms/libmp4v2.git/plain/"

From 8c45acac4e1f083ea9732cf8e8550f11f4460494 Mon Sep 17 00:00:00 2001
From: Demyan Rogozhin <demyan.rogozhin@gmail.com>
Date: Thu, 10 May 2018 10:37:13 +0200
Subject: [PATCH 1516/3370] particl-core: 0.16.0.4 -> 0.16.0.5

---
 pkgs/applications/altcoins/particl/particl-core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/particl/particl-core.nix b/pkgs/applications/altcoins/particl/particl-core.nix
index 2524408429c3..f47b04c1daea 100644
--- a/pkgs/applications/altcoins/particl/particl-core.nix
+++ b/pkgs/applications/altcoins/particl/particl-core.nix
@@ -19,11 +19,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "particl-core-${version}";
-  version     = "0.16.0.4";
+  version     = "0.16.0.5";
 
   src = fetchurl {
     url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz";
-    sha256 = "1yy8pw13rn821jpi1zvzwi3ipxi1bgfxv8g6jz49qlbjzjmjcr68";
+    sha256 = "070crn6nnzrbcaj30w0qbybpm9kfd2ghnvmxp29gckgknw6n0vam";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From 9c8353aa9b8035e87fc1810b04c7a54f8e341566 Mon Sep 17 00:00:00 2001
From: Andre Ramos <andre.stylianos@gmail.com>
Date: Thu, 10 May 2018 11:13:36 +0200
Subject: [PATCH 1517/3370] joker: 0.9.1 -> 0.9.2

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

diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 929827ce1120..4c32c0684d0e 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "joker-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   goPackagePath = "github.com/candid82/joker";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "candid82";
     repo = "joker";
-    sha256 = "10flfjnb9mz3dir3882agcs1lyr5qdpd9qfyvphrh08zr3jnb3hz";
+    sha256 = "1ayp7arygd3l4a1zbkhvix84fpqnnncbdxhimymr3c75ymwmmdr8";
   };
 
   preBuild = "go generate ./...";

From 9938bb6c8259a6772e937b0f01318bc816f67ebe Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Thu, 10 May 2018 12:21:45 +0200
Subject: [PATCH 1518/3370] opencv3: fix $out/lib/pkgconfig/opencv.pc

---
 pkgs/development/libraries/opencv/3.x.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index efb9a7cdbe43..1d3a9629fd0c 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -254,6 +254,21 @@ stdenv.mkDerivation rec {
     make doxygen
   '';
 
+  # By default $out/lib/pkgconfig/opencv.pc looks something like this:
+  #
+  #   prefix=/nix/store/10pzq1a8fkh8q4sysj8n6mv0w0nl0miq-opencv-3.4.1
+  #   exec_prefix=${prefix}
+  #   libdir=${exec_prefix}//nix/store/10pzq1a8fkh8q4sysj8n6mv0w0nl0miq-opencv-3.4.1/lib
+  #   ...
+  #   Libs: -L${exec_prefix}//nix/store/10pzq1a8fkh8q4sysj8n6mv0w0nl0miq-opencv-3.4.1/lib ...
+  #
+  # Note that ${exec_prefix} is set to $out but that $out is also appended to
+  # ${exec_prefix}. This causes linker errors in downstream packages so we strip
+  # of $out after the ${exec_prefix} prefix:
+  postInstall = ''
+    sed -i "s|\''${exec_prefix}/$out|\''${exec_prefix}|" "$out/lib/pkgconfig/opencv.pc"
+  '';
+
   hardeningDisable = [ "bindnow" "relro" ];
 
   passthru = lib.optionalAttrs enablePython { pythonPath = []; };

From db0286b5f6cf85cd8c812a60da7258f8d42ca08c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 10 May 2018 12:58:23 +0200
Subject: [PATCH 1519/3370] monetdb: Build with readline for better
 interactivity

Readline is e.g. required for autocomplete, history, and advanced line
editing support in mclient.
---
 pkgs/servers/sql/monetdb/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 5f7e879819e9..6067d4983865 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, bison, openssl }:
+{ stdenv, fetchurl, pkgconfig
+, bison, openssl, readline
+}:
 
 let
   version = "11.29.3";
@@ -12,7 +14,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ bison openssl ];
+  buildInputs = [ bison openssl readline ];
 
   meta = with stdenv.lib; {
     description = "An open source database system";

From da58afdd68e87ad2cca0d510c3530accf31a98f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 10 May 2018 13:11:26 +0200
Subject: [PATCH 1520/3370] nixos/tests/home-assistant: print log before
 failing

---
 nixos/tests/home-assistant.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 4ebccb7ab868..3d920dccc166 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -65,12 +65,12 @@ in {
     $hass->waitUntilSucceeds("mosquitto_pub -V mqttv311 -t home-assistant/test -u homeassistant -P '${apiPassword}' -m let_there_be_light");
     $hass->succeed("curl http://localhost:8123/api/states/binary_sensor.mqtt_binary_sensor -H 'x-ha-access: ${apiPassword}' | grep -qF '\"state\": \"on\"'");
 
-    # Check that no errors were logged
-    $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
-
     # Print log to ease debugging
     my $log = $hass->succeed("cat ${configDir}/home-assistant.log");
     print "\n### home-assistant.log ###\n";
     print "$log\n";
+
+    # Check that no errors were logged
+    $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
   '';
 })

From 2f9fd6ff591ff6d1ef43492b4524ee5894c20c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 10 May 2018 12:16:39 +0100
Subject: [PATCH 1521/3370] plank: add autoreconfHook

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

diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index 3e69f4a97c11..46e26666b408 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
 , bamf, gdk_pixbuf, libdbusmenu-gtk3, file
-, wrapGAppsHook, gobjectIntrospection }:
+, wrapGAppsHook, autoreconfHook, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   pname = "plank";
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     libxml2 # xmllint
     wrapGAppsHook
     gobjectIntrospection
+    autoreconfHook
   ];
 
   buildInputs = [ vala atk cairo glib gnome3.gnome-menus

From 1bb5a80ab9d92fe8c9a7bc108a9f883669294b03 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 10 May 2018 07:57:11 -0400
Subject: [PATCH 1522/3370] linux: 4.9.98 -> 4.9.99

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index b09a58c6eb79..c6a94b194b68 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.98";
+  version = "4.9.99";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1vqh33wdiqf3j4xfakxndhb8x6yr5ppwv9asx7kldjfvb8sr1k8j";
+    sha256 = "1pqk88h8wyqz2ijp0pav1b35m2hs9d9is1kcir649jlbj66fphrx";
   };
 } // (args.argsOverride or {}))

From 6c8aff71c15103ffcd6f60e3933e2be64762b48d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 10 May 2018 07:57:41 -0400
Subject: [PATCH 1523/3370] linux: 4.14.39 -> 4.9.40

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index f798a3a85e59..f1e0bf82cec7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.39";
+  version = "4.14.40";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1gdpq4w6srz2fpyi8bqpgz0p5wm3mrk7ir967c6f2285mdvcb7r6";
+    sha256 = "03nh71nqgifkamkb0gn12jny5h3lbn5kmpdy0ff886wyrl34sw6l";
   };
 } // (args.argsOverride or {}))

From d21ec84b051337c4ae0613f7eefd0e584573b670 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 10 May 2018 07:58:04 -0400
Subject: [PATCH 1524/3370] linux: 4.16.7 -> 4.16.8

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index acafd0bd89f7..40d7d5d865fe 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.7";
+  version = "4.16.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0f81mxc5b3zf5m29bwc3afv07k60661zl18098cjjqv6qpvbwynq";
+    sha256 = "1z4q7khag48wildvq4hf4vwaipkfbh9yywm2m9zfj43vk1ysvyp4";
   };
 } // (args.argsOverride or {}))

From bcaff3c3e0a49b854cfd959796ec6e4daa899dc3 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 10 May 2018 17:04:04 +0300
Subject: [PATCH 1525/3370] tty: init at 1.30

---
 pkgs/tools/misc/tio/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/tools/misc/tio/default.nix

diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix
new file mode 100644
index 000000000000..475d444c6007
--- /dev/null
+++ b/pkgs/tools/misc/tio/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchzip, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "tio-${version}";
+  version = "1.30";
+
+  src = fetchzip {
+    url = "https://github.com/tio/tio/archive/v${version}.tar.gz";
+    sha256 = "1cyjy1jg2s32h1jkb99qb79sxkxh92niiyig0vysr14m4xnw01mr";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  meta = with stdenv.lib; {
+    description = "Serial console TTY";
+    homepage = https://tio.github.io/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ yegortimoshenko ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b628e94db1e3..2c56ad44db5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5203,6 +5203,8 @@ with pkgs;
 
   tiny8086 = callPackage ../applications/virtualization/8086tiny { };
 
+  tio = callPackage ../tools/misc/tio { };
+
   tldr = callPackage ../tools/misc/tldr { };
 
   tldr-hs = haskellPackages.tldr;

From d4e71a2321f04b590d58eb2292934214c20a4bca Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Thu, 10 May 2018 06:47:31 -0400
Subject: [PATCH 1526/3370] perlPackages.Paranoid: init at 2.05

---
 .../perl-modules/Paranoid-blessed-path.patch  | 23 +++++++++++++++++++
 pkgs/top-level/perl-packages.nix              | 19 +++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/perl-modules/Paranoid-blessed-path.patch

diff --git a/pkgs/development/perl-modules/Paranoid-blessed-path.patch b/pkgs/development/perl-modules/Paranoid-blessed-path.patch
new file mode 100644
index 000000000000..5e8002501100
--- /dev/null
+++ b/pkgs/development/perl-modules/Paranoid-blessed-path.patch
@@ -0,0 +1,23 @@
+diff -ru Paranoid-2.05/lib/Paranoid.pm /tmp/Paranoid-2.05/lib/Paranoid.pm
+--- Paranoid-2.05/lib/Paranoid.pm	2017-02-06 05:48:57.000000000 -0500
++++ /tmp/Paranoid-2.05/lib/Paranoid.pm	2018-05-10 06:40:35.286313299 -0400
+@@ -61,7 +61,7 @@
+ 
+     my $path = shift;
+ 
+-    $path = '/bin:/usr/bin' unless defined $path;
++    $path = '__BLESSED_PATH__' unless defined $path;
+ 
+     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+     $ENV{PATH} = $path;
+Binary files Paranoid-2.05/lib/.Paranoid.pm.swp and /tmp/Paranoid-2.05/lib/.Paranoid.pm.swp differ
+diff -ru Paranoid-2.05/t/01_init_core.t /tmp/Paranoid-2.05/t/01_init_core.t
+--- Paranoid-2.05/t/01_init_core.t	2016-07-12 04:49:33.000000000 -0400
++++ /tmp/Paranoid-2.05/t/01_init_core.t	2018-05-10 06:43:41.323183381 -0400
+@@ -35,5 +35,5 @@
+ ok( psecureEnv('/bin:/sbin'), 'psecureEnv 1' );
+ is( $ENV{PATH}, '/bin:/sbin', 'Validated PATH' );
+ ok( psecureEnv(), 'psecureEnv 2' );
+-is( $ENV{PATH}, '/bin:/usr/bin', 'Validated PATH' );
++is( $ENV{PATH}, '__BLESSED_PATH__', 'Validated PATH' );
+ 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 22733443ed19..5237f2a2c8e1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11954,6 +11954,25 @@ let self = _self // overrides; _self = with self; {
      };
   };
 
+  Paranoid = buildPerlPackage rec {
+    name = "Paranoid-2.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/${name}.tar.gz";
+      sha256 = "583dfa0279733531f360795ad1cf4aa652d537b2b0bbd3c6925d0c8d75cbb3df";
+    };
+    patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ];
+    preConfigure = ''
+      # Capture the path used when compiling this module as the "blessed"
+      # system path, analogous to the module's own use of '/bin:/sbin'.
+      sed -i "s#__BLESSED_PATH__#$PATH#" lib/Paranoid.pm t/01_init_core.t
+    '';
+    meta = {
+      description = "General function library for safer, more secure programming";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.limeytexan ];
+    };
+  };
+
   PARDist = buildPerlPackage {
     name = "PAR-Dist-0.49";
     src = fetchurl {

From 988c56ee115a74ff1878fe8713f68c57c43d4e23 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Thu, 10 May 2018 08:55:53 -0400
Subject: [PATCH 1527/3370] perlPackages.Paranoid: employ more restrictive
 blessed path

Decided it would be better to employ an even more restrictive default
"blessed" path by only including the coreutils package bin directory.
---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5237f2a2c8e1..46006366f192 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11964,7 +11964,7 @@ let self = _self // overrides; _self = with self; {
     preConfigure = ''
       # Capture the path used when compiling this module as the "blessed"
       # system path, analogous to the module's own use of '/bin:/sbin'.
-      sed -i "s#__BLESSED_PATH__#$PATH#" lib/Paranoid.pm t/01_init_core.t
+      sed -i "s#__BLESSED_PATH__#${pkgs.coreutils}/bin#" lib/Paranoid.pm t/01_init_core.t
     '';
     meta = {
       description = "General function library for safer, more secure programming";

From 56bd3b7db8e2958121b963f9d87f5d1851724710 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Thu, 10 May 2018 07:01:57 -0400
Subject: [PATCH 1528/3370] perlPackages.ClassEHierarchy: init at 2.00

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 46006366f192..9a23eff2e7ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2064,6 +2064,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  ClassEHierarchy = buildPerlPackage rec {
+    name = "Class-EHierarchy-2.00";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/${name}.tar.gz";
+      sha256 = "8498baaf7539eaa3422c6fe1055a0fc9a0c02e94dad0c63405373528e622bacb";
+    };
+    meta = {
+      description = "Base class for hierarchally ordered objects";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.limeytexan ];
+    };
+  };
+
   ClassFactory = buildPerlPackage {
     name = "Class-Factory-1.06";
     src = fetchurl {

From 468841cea41a9ba33c4c262518e6f0796b99a440 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 22:27:56 +0800
Subject: [PATCH 1529/3370] owl-lisp: 0.1.14 -> 0.1.15

---
 pkgs/development/compilers/owl-lisp/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix
index 4e2f8b2af5b4..ee076acd8b17 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -1,16 +1,18 @@
-{ stdenv, fetchFromGitHub, coreutils }:
+{ stdenv, fetchFromGitHub, coreutils, which }:
 
 stdenv.mkDerivation rec {
   name    = "owl-lisp-${version}";
-  version = "0.1.14";
+  version = "0.1.15";
 
   src = fetchFromGitHub {
     owner  = "aoh";
     repo   = "owl-lisp";
     rev    = "v${version}";
-    sha256 = "1rr0icprna3zs834q1pj4xy21cql3pcfknfkqipq01rhnl2893sz";
+    sha256 = "0pczmra2x6icyz6b6g66pp5ij83cq4wszg0ssw8qm7a5314kxkq4";
   };
 
+  nativeBuildInputs = [ which ];
+
   prePatch = ''
     substituteInPlace Makefile --replace /usr $out
 
@@ -19,7 +21,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  # tests are already run as part of the compilation process
+  # tests are run as part of the compilation process
   doCheck = false;
 
   meta = with stdenv.lib; {

From 956d174c8da0195dd99805c6962165cff6c1f871 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 10 May 2018 17:44:40 +0300
Subject: [PATCH 1530/3370] ffmpeg_4: init

---
 pkgs/development/libraries/ffmpeg/4.nix       | 12 ++++++++++++
 pkgs/development/libraries/ffmpeg/generic.nix |  2 +-
 pkgs/top-level/all-packages.nix               |  4 ++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/ffmpeg/4.nix

diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
new file mode 100644
index 000000000000..a6e67052cd03
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchpatch
+# Darwin frameworks
+, Cocoa, CoreMedia
+, ...
+}@args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}";
+  branch = "4.0";
+  sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii";
+  darwinFrameworks = [ Cocoa CoreMedia ];
+})
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 4a05eab87bd7..b27db14528ca 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation rec {
       "--enable-ffmpeg"
       "--disable-ffplay"
       (ifMinVer "0.6" "--enable-ffprobe")
-      "--disable-ffserver"
+      (if reqMin "4" then null else "--disable-ffserver")
     # Libraries
       (ifMinVer "0.6" "--enable-avcodec")
       (ifMinVer "0.6" "--enable-avdevice")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4d1ed8d89a1..7856fe4b387e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8818,6 +8818,10 @@ with pkgs;
   ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
   };
+  ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
+  };
+
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;

From d691c8170ae2a8ef73c40f6187e7181015f8cdca Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 10 May 2018 17:45:05 +0300
Subject: [PATCH 1531/3370] mpv: 0.27.2 -> 0.28.2

---
 pkgs/applications/video/mpv/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 421e0dbb8a39..d990bad665c5 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeWrapper
-, docutils, perl, pkgconfig, python3, which, ffmpeg
+, docutils, perl, pkgconfig, python3, which, ffmpeg_4
 , freefont_ttf, freetype, libass, libpthreadstubs
 , lua, luasocket, libuchardet, libiconv ? null, darwin
 
@@ -83,22 +83,15 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.27.2";
+  version = "0.28.2";
 
   src = fetchFromGitHub {
     owner = "mpv-player";
     repo  = "mpv";
     rev    = "v${version}";
-    sha256 = "1ivyyqajkxq5c1zxp0dm7pljvianhgvwl3dbghgpzyrch59k5wnr";
+    sha256 = "0bldxhqjz7z9fgvx4k40l49awpay17fscp8ypswb459yicy8npmg";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f.patch";
-      sha256 = "1sr0770rvhsgz8d7ysr9qqp4g9gwdhgj8g3rgnz90wl49lgrykhb";
-    })
-  ];
-
   postPatch = ''
     patchShebangs ./TOOLS/
   '';
@@ -131,7 +124,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    ffmpeg freetype libass libpthreadstubs
+    ffmpeg_4 freetype libass libpthreadstubs
     lua luasocket libuchardet
   ] ++ optional alsaSupport        alsaLib
     ++ optional xvSupport          libXv

From 06e394bbb451d7cd35dd3576216a8f2fb5cfdbf4 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 14:09:15 +0800
Subject: [PATCH 1532/3370] ansible: update point releases and unify build

1) We had lots of copy paste - instead use a generic builder for the various reasons.

2) Default version changed to latest (2.5 instead of 2.4)

3) Point release updates to all
---
 pkgs/tools/admin/ansible/2.1.nix     | 55 -------------------
 pkgs/tools/admin/ansible/2.2.nix     | 57 -------------------
 pkgs/tools/admin/ansible/2.3.nix     | 40 --------------
 pkgs/tools/admin/ansible/2.4.nix     | 40 --------------
 pkgs/tools/admin/ansible/2.5.nix     | 40 --------------
 pkgs/tools/admin/ansible/default.nix | 82 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      | 15 ++---
 7 files changed, 90 insertions(+), 239 deletions(-)
 delete mode 100644 pkgs/tools/admin/ansible/2.1.nix
 delete mode 100644 pkgs/tools/admin/ansible/2.2.nix
 delete mode 100644 pkgs/tools/admin/ansible/2.3.nix
 delete mode 100644 pkgs/tools/admin/ansible/2.4.nix
 delete mode 100644 pkgs/tools/admin/ansible/2.5.nix
 create mode 100644 pkgs/tools/admin/ansible/default.nix

diff --git a/pkgs/tools/admin/ansible/2.1.nix b/pkgs/tools/admin/ansible/2.1.nix
deleted file mode 100644
index b8b335bd6186..000000000000
--- a/pkgs/tools/admin/ansible/2.1.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv
-, fetchurl
-, fetchFromGitHub
-, pythonPackages
-, windowsSupport ? false
-}:
-
-with pythonPackages;
-
-let
-  jinja = jinja2.overridePythonAttrs (old: rec {
-    version = "2.8.1";
-    name = "${old.pname}-${version}";
-    src = fetchFromGitHub {
-      owner = "pallets";
-      repo = "jinja";
-      rev = version;
-      sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a";
-    };
-  });
-in buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.1.4.0";
-  name = "${pname}-${version}";
-
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "05nc68900qrzqp88970j2lmyvclgrjki66xavcpzyzamaqrh7wg9";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = [
-    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3] ;
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/2.2.nix b/pkgs/tools/admin/ansible/2.2.nix
deleted file mode 100644
index ccca64b86b64..000000000000
--- a/pkgs/tools/admin/ansible/2.2.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv
-, fetchurl
-, fetchFromGitHub
-, pythonPackages
-, windowsSupport ? false
-}:
-
-with pythonPackages;
-
-let
-  # Shouldn't be needed anymore in next version
-  # https://github.com/NixOS/nixpkgs/pull/22345#commitcomment-20718521
-  jinja = jinja2.overridePythonAttrs (old: rec {
-    version = "2.8.1";
-    name = "${old.pname}-${version}";
-    src = fetchFromGitHub {
-      owner = "pallets";
-      repo = "jinja";
-      rev = version;
-      sha256 = "0m6g6fx6flxb6hrkw757mbx1gxyrmj50w27m2afdsvmvz0zpdi2a";
-    };
-  });
-in buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.2.1.0";
-  name = "${pname}-${version}";
-
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "0gz9i30pdmkchi936ijy873k8di6fmf3v5rv551hxyf0hjkjx8b3";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = [
-    pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3] ;
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/2.3.nix b/pkgs/tools/admin/ansible/2.3.nix
deleted file mode 100644
index b827bdcc9c31..000000000000
--- a/pkgs/tools/admin/ansible/2.3.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, fetchurl
-, pythonPackages
-, windowsSupport ? false
-}:
-
-pythonPackages.buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.3.2.0";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "1sv8666vw6fi93jlgkwd4lxkfn75yqczfvk129zlh8ll4wjv8qq5";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = with pythonPackages; [
-    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3 ] ;
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix
deleted file mode 100644
index 4f90e80202e4..000000000000
--- a/pkgs/tools/admin/ansible/2.4.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, fetchurl
-, pythonPackages
-, windowsSupport ? false
-}:
-
-pythonPackages.buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.4.2.0";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "0n3n9py4s3aykiii31xq8g4wmd6693jvby0424pjrg0bna01apri";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = with pythonPackages; [
-    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/2.5.nix b/pkgs/tools/admin/ansible/2.5.nix
deleted file mode 100644
index 32d83861cd8c..000000000000
--- a/pkgs/tools/admin/ansible/2.5.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv
-, fetchurl
-, pythonPackages
-, windowsSupport ? false
-}:
-
-pythonPackages.buildPythonPackage rec {
-  pname = "ansible";
-  version = "2.5.1";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://releases.ansible.com/ansible/${name}.tar.gz";
-    sha256 = "06h0cmz0cgj1xszzn6rsypfc8lkazgh5g1yxyss1yx242d0wkw2i";
-  };
-
-  prePatch = ''
-    sed -i "s,/usr/,$out," lib/ansible/constants.py
-  '';
-
-  doCheck = false;
-  dontStrip = true;
-  dontPatchELF = true;
-  dontPatchShebangs = false;
-
-  propagatedBuildInputs = with pythonPackages; [
-    pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
-  ] ++ stdenv.lib.optional windowsSupport pywinrm;
-
-  meta = with stdenv.lib; {
-    homepage = http://www.ansible.com;
-    description = "A simple automation tool";
-    license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [
-      jgeerds
-      joamaki
-    ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
new file mode 100644
index 000000000000..4d9eff899b92
--- /dev/null
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, fetchurl, fetchFromGitHub, python2
+, windowsSupport ? false
+}:
+
+let
+  oldJinja = python2.override {
+    packageOverrides = self: super: {
+      jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec {
+        version = "2.8.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m";
+        };
+        doCheck = false;
+      });
+    };
+  };
+
+  generic = { version, sha256, py ? python2 }: py.pkgs.buildPythonPackage rec {
+    pname = "ansible";
+    inherit version;
+
+    src = fetchurl {
+      url = "http://releases.ansible.com/ansible/${pname}-${version}.tar.gz";
+      inherit sha256;
+    };
+
+    prePatch = ''
+      sed -i "s,/usr/,$out," lib/ansible/constants.py
+    '';
+
+    doCheck = false;
+    dontStrip = true;
+    dontPatchELF = true;
+    dontPatchShebangs = false;
+
+    propagatedBuildInputs = with py.pkgs; [
+      pycrypto paramiko jinja2 pyyaml httplib2 boto six netaddr dnspython
+    ] ++ stdenv.lib.optional windowsSupport pywinrm;
+
+    meta = with stdenv.lib; {
+      homepage = http://www.ansible.com;
+      description = "A simple automation tool";
+      license = with licenses; [ gpl3 ] ;
+      maintainers = with maintainers; [ jgeerds joamaki ];
+      platforms = with platforms; linux ++ darwin;
+    };
+  };
+
+in rec {
+  # We will carry all the supported versions
+
+  ansible_2_1 = generic {
+    version = "2.1.6.0";
+    sha256  = "0fhsmarjl9h401pm0gmcy68q80fiq544cxzcxyjzbnxr2a2cimz5";
+    py      = oldJinja;
+  };
+
+  ansible_2_2 = generic {
+    version = "2.2.3.0";
+    sha256  = "141aa76qy9hsc3h02yipyxg39maqq2r2c4nx53lm48kiy0fan66y";
+    py      = oldJinja;
+  };
+
+  ansible_2_3 = generic {
+    version = "2.3.3.0";
+    sha256  = "1yhaqgbx4zlwvi3cklnsqarjhhq28hgbvx603h07cjm1digp2ans";
+  };
+
+  ansible_2_4 = generic {
+    version = "2.4.4.0";
+    sha256  = "0n1k6h0h6av74nw8vq98fmh6q4pq6brpwmx45282vh3bkdmpa0ib";
+  };
+
+  ansible_2_5 = generic {
+    version = "2.5.2";
+    sha256  = "1r9sq30xz3jrvx6yqssj5wmkml1f75rx1amd7g89f3ryngrq6m59";
+  };
+
+  ansible2 = ansible_2_5;
+  ansible  = ansible2;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 567167fc4605..36532e55f938 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7518,13 +7518,14 @@ with pkgs;
 
   augeas = callPackage ../tools/system/augeas { };
 
-  ansible_2_1 = callPackage ../tools/admin/ansible/2.1.nix {};
-  ansible_2_2 = callPackage ../tools/admin/ansible/2.2.nix {};
-  ansible_2_3 = callPackage ../tools/admin/ansible/2.3.nix {};
-  ansible_2_4 = callPackage ../tools/admin/ansible/2.4.nix {};
-  ansible_2_5 = callPackage ../tools/admin/ansible/2.5.nix {};
-  ansible  = ansible_2_4;
-  ansible2 = ansible_2_4;
+  inherit (callPackages ../tools/admin/ansible {})
+    ansible_2_1
+    ansible_2_2
+    ansible_2_3
+    ansible_2_4
+    ansible_2_5
+    ansible2
+    ansible;
 
   ansible-lint = callPackage ../development/tools/ansible-lint {};
 

From efbeca76fe7845d7f2d9c2be7a611f1475bf64a2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 10 May 2018 23:10:02 +0800
Subject: [PATCH 1533/3370] ansible: drop 2.1, 2.2 and 2.3 as they are EOL

---
 pkgs/tools/admin/ansible/default.nix | 17 -----------------
 pkgs/top-level/all-packages.nix      |  3 ---
 2 files changed, 20 deletions(-)

diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 4d9eff899b92..11ab58bc62f8 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -50,23 +50,6 @@ let
 in rec {
   # We will carry all the supported versions
 
-  ansible_2_1 = generic {
-    version = "2.1.6.0";
-    sha256  = "0fhsmarjl9h401pm0gmcy68q80fiq544cxzcxyjzbnxr2a2cimz5";
-    py      = oldJinja;
-  };
-
-  ansible_2_2 = generic {
-    version = "2.2.3.0";
-    sha256  = "141aa76qy9hsc3h02yipyxg39maqq2r2c4nx53lm48kiy0fan66y";
-    py      = oldJinja;
-  };
-
-  ansible_2_3 = generic {
-    version = "2.3.3.0";
-    sha256  = "1yhaqgbx4zlwvi3cklnsqarjhhq28hgbvx603h07cjm1digp2ans";
-  };
-
   ansible_2_4 = generic {
     version = "2.4.4.0";
     sha256  = "0n1k6h0h6av74nw8vq98fmh6q4pq6brpwmx45282vh3bkdmpa0ib";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36532e55f938..3f3ef87b65d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7519,9 +7519,6 @@ with pkgs;
   augeas = callPackage ../tools/system/augeas { };
 
   inherit (callPackages ../tools/admin/ansible {})
-    ansible_2_1
-    ansible_2_2
-    ansible_2_3
     ansible_2_4
     ansible_2_5
     ansible2

From 9cb1d82be6b10398c70b925e56baf8578d6b906a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 11:33:26 -0400
Subject: [PATCH 1534/3370] zeromqpp: Init at 4.2.0

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

diff --git a/pkgs/development/libraries/zmqpp/default.nix b/pkgs/development/libraries/zmqpp/default.nix
new file mode 100644
index 000000000000..f7e849f6a334
--- /dev/null
+++ b/pkgs/development/libraries/zmqpp/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, zeromq }:
+
+stdenv.mkDerivation rec {
+  name = "zmqpp-${version}";
+  version = "4.2.0";
+
+  src = fetchFromGitHub {
+    owner = "zeromq";
+    repo = "zmqpp";
+    rev = version;
+    sha256 = "08v34q3sd8g1b95k73n7jwryb0xzwca8ib9dz8ngczqf26j8k72i";
+  };
+
+  outputs = [ "out" "dev" ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  propagatedBuildInputs = [ zeromq ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
+    license = licenses.lgpl3;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ chris-martin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71ef037ab9dd..79dc32dd790e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12059,6 +12059,8 @@ with pkgs;
     czmq = czmq3;
   };
 
+  zmqpp = callPackage ../development/libraries/zmqpp { };
+
   zig = callPackage ../development/compilers/zig {
     llvmPackages = llvmPackages_6;
   };

From ae429f8e5527263240b21e7641b84a7e7d6898d7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 02:10:09 -0400
Subject: [PATCH 1535/3370] yacas: 1.2.2 -> 1.6.1

They switched to cmake and talk about mingw cross, so I can kill
crossAttrs too.
---
 .../science/math/yacas/default.nix            | 59 +++++++++----------
 .../science/math/yacas/gcc43.patch            | 17 ------
 2 files changed, 27 insertions(+), 49 deletions(-)
 delete mode 100644 pkgs/applications/science/math/yacas/gcc43.patch

diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix
index 0f6dc35fe0cb..c02ef73df119 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/applications/science/math/yacas/default.nix
@@ -1,44 +1,39 @@
-{stdenv, fetchurl, perl}: 
+{ stdenv, fetchFromGitHub, cmake, perl
+, enableGui ? false, qt5
+, enableJupyter ? false, boost, jsoncpp, openssl, zmqpp
+}:
 
 stdenv.mkDerivation rec {
-  name = "yacas-1.2.2";
+  name = "yacas-${version}";
+  version = "1.6.1";
 
-  src = fetchurl {
-    url = "http://yacas.sourceforge.net/backups/${name}.tar.gz";
-    sha256 = "1dmafm3w0lm5w211nwkfzaid1rvvmgskz7k4500pjhgdczi5sd78";
+  src = fetchFromGitHub {
+    owner = "grzegorzmazur";
+    repo = "yacas";
+    rev = "v${version}";
+    sha256 = "0awvlvf607r4hwl1vkhs6jq2s6ig46c66pmr4vspj2cdnypx99cc";
   };
 
   hardeningDisable = [ "format" ];
 
+  cmakeFlags = [
+    "-DENABLE_CYACAS_GUI=${if enableGui then "ON" else "OFF"}"
+    "-DENABLE_CYACAS_KERNEL=${if enableJupyter then "ON" else "OFF"}"
+  ];
+
   # Perl is only for the documentation
-  nativeBuildInputs = [ perl ];
-
-  patches = [ ./gcc43.patch ];
-
-  crossAttrs = {
-    # Trick to get host-built programs needed for the cross-build.
-    # If yacas had proper makefiles, this would not be needed.
-    preConfigure = ''
-      ./configure
-      pushd src
-      make mkfastprimes 
-      cp mkfastprimes ../..
-      popd
-      pushd manmake
-      make manripper removeduplicates
-      cp manripper removeduplicates ../..
-      popd
-    '';
-    preBuild = ''
-      cp ../mkfastprimes ../manripper ../removeduplicates src
-    '';
-  };
+  nativeBuildInputs = [ cmake perl ];
+  buildInputs = [
+  ] ++ stdenv.lib.optionals enableGui (with qt5; [ qtbase qtwebkit ])
+    ++ stdenv.lib.optionals enableJupyter [ boost jsoncpp openssl zmqpp ]
+    ;
 
   meta = {
-      description = "Easy to use, general purpose Computer Algebra System";
-      homepage = http://yacas.sourceforge.net/;
-      license = stdenv.lib.licenses.gpl2Plus;
-      maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; linux;
+    description = "Easy to use, general purpose Computer Algebra System";
+    homepage = http://www.yacas.org/;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+    broken = enableGui || enableJupyter;
   };
 }
diff --git a/pkgs/applications/science/math/yacas/gcc43.patch b/pkgs/applications/science/math/yacas/gcc43.patch
deleted file mode 100644
index 054f80cff927..000000000000
--- a/pkgs/applications/science/math/yacas/gcc43.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Taken from gentoo:
-http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-mathematics/yacas/files/yacas-1.2.2-gcc43.patch?rev=1.1&view=markup
-Index: yacas-1.2.2-gcc43.patch
-===================================================================
---- a/manmake/manripper.cpp
-+++ b/manmake/manripper.cpp
-@@ -1,7 +1,8 @@
- 
--#include <stdio.h>
--#include <ctype.h>
-+#include <cstdio>
-+#include <cctype>
- #include <string>
-+#include <cstring>
- #include <map>
- 
- using namespace std;

From a1f4d033ddc30a17a982f0f5a2a3497d766c63ae Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 02:20:53 -0400
Subject: [PATCH 1536/3370] fossil: Remove crossAttrs

TCC= (and BCC=) no longer needed as new Makefile defines with CC (and
CC_FOR_BUILD).
---
 .../version-management/fossil/default.nix         | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index f46a704ea9ca..1373e13c4147 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -1,5 +1,7 @@
-{stdenv, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which
-, tcllib, withJson ? true}:
+{ stdenv
+, libiconv, fetchurl, zlib, openssl, tcl, readline, sqlite, ed, which
+, tcllib, withJson ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "fossil-${version}";
@@ -18,11 +20,11 @@ stdenv.mkDerivation rec {
              ++ stdenv.lib.optional stdenv.isDarwin libiconv;
   nativeBuildInputs = [ tcl ];
 
-  doCheck = true;
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
 
   checkTarget = "test";
 
-  preCheck = ''
+  preCheck = stdenv.lib.optional doCheck ''
     export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}"
   '';
   configureFlags = if withJson then  "--json" else  "";
@@ -36,11 +38,6 @@ stdenv.mkDerivation rec {
     INSTALLDIR=$out/bin make install
   '';
 
-  crossAttrs = {
-    doCheck = false;
-    makeFlags = [ "TCC=$CC" ];
-  };
-
   meta = {
     description = "Simple, high-reliability, distributed software configuration management";
     longDescription = ''

From 1174526004cf25cc9fb0701a95c853521bad778d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 02:28:21 -0400
Subject: [PATCH 1537/3370] cloog-ppl: No crossAttrs needed

---
 pkgs/development/libraries/cloog-ppl/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix
index 442b115a4082..0ce0af97ec94 100644
--- a/pkgs/development/libraries/cloog-ppl/default.nix
+++ b/pkgs/development/libraries/cloog-ppl/default.nix
@@ -20,10 +20,6 @@ stdenv.mkDerivation rec {
     touch NEWS ChangeLog AUTHORS
   '';
 
-  crossAttrs = {
-    configureFlags = "--with-ppl=${ppl.crossDrv}";
-  };
-
   doCheck = true;
 
   meta = {

From 79adb993fbafeb89062e9b948e916d89311f7ca6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 02:32:51 -0400
Subject: [PATCH 1538/3370] cscope: Remove unneeded crossAttrs

---
 pkgs/development/tools/misc/cscope/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix
index b737bb7a7dab..0b1bbf5f9e4d 100644
--- a/pkgs/development/tools/misc/cscope/default.nix
+++ b/pkgs/development/tools/misc/cscope/default.nix
@@ -31,11 +31,6 @@ stdenv.mkDerivation rec {
     cp xcscope.el{,c} "$out/share/emacs/site-lisp"
   '';
 
-  crossAttrs = {
-    postInstall = "";
-    propagatedBuildInputs = [ ncurses.crossDrv ];
-  };
-
   meta = {
     description = "A developer's tool for browsing source code";
 

From 515ca1a7c8ca1c57b472826ae2b5dd2965b8b4bf Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:16:29 -0400
Subject: [PATCH 1539/3370] guile: Remove old crossAttrs

We fixed the linker issue with propagated dependencies.
---
 pkgs/development/interpreters/guile/2.0.nix     | 9 ---------
 pkgs/development/interpreters/guile/default.nix | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 2c9aec5b6952..3a11dc78c6cb 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -92,15 +92,6 @@
 
   setupHook = ./setup-hook-2.0.sh;
 
-  crossAttrs.preConfigure =
-    stdenv.lib.optionalString (hostPlatform.isHurd)
-       # On GNU, libgc depends on libpthread, but the cross linker doesn't
-       # know where to find libpthread, which leads to erroneous test failures
-       # in `configure', where `-pthread' and `-lpthread' aren't explicitly
-       # passed.  So it needs some help (XXX).
-       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
-
-
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 3d5c51dc420b..748b3c5e200a 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -88,15 +88,6 @@
 
   setupHook = ./setup-hook-2.2.sh;
 
-  crossAttrs.preConfigure =
-    stdenv.lib.optionalString (hostPlatform.isHurd)
-       # On GNU, libgc depends on libpthread, but the cross linker doesn't
-       # know where to find libpthread, which leads to erroneous test failures
-       # in `configure', where `-pthread' and `-lpthread' aren't explicitly
-       # passed.  So it needs some help (XXX).
-       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
-
-
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;

From 219b74d71bdd8c93d099cc921cc4f192bd8753ad Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:31:03 -0400
Subject: [PATCH 1540/3370] SDL, SDL2: Remove crossAttrs

Cross drvs are now the default for precisely this reason.
---
 pkgs/development/libraries/SDL/default.nix  | 36 ++++++++-------------
 pkgs/development/libraries/SDL2/default.nix | 18 +++--------
 2 files changed, 17 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 5e1c527eb8b5..7e96cf84686f 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -15,24 +15,6 @@ with lib;
 assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
 assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null && libGLU != null);
 
-let
-
-  configureFlagsFun = attrs: [
-    "--disable-oss"
-    "--disable-video-x11-xme"
-    "--enable-rpath"
-  # Building without this fails on Darwin with
-  #
-  #   ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
-  #   SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
-  #
-  # Please try revert the change that introduced this comment when updating SDL.
-  ] ++ optional stdenv.isDarwin "--disable-x11-shared"
-    ++ optional (!x11Support) "--without-x"
-    ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
-
-in
-
 stdenv.mkDerivation rec {
   name    = "SDL-${version}";
   version = "1.2.15";
@@ -62,11 +44,19 @@ stdenv.mkDerivation rec {
     ++ optional (!hostPlatform.isMinGW) audiofile
     ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
 
-  configureFlags = configureFlagsFun { inherit alsaLib; };
-
-  crossAttrs = {
-    configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
-  };
+  configureFlags = [
+    "--disable-oss"
+    "--disable-video-x11-xme"
+    "--enable-rpath"
+  # Building without this fails on Darwin with
+  #
+  #   ./src/video/x11/SDL_x11sym.h:168:17: error: conflicting types for '_XData32'
+  #   SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
+  #
+  # Please try revert the change that introduced this comment when updating SDL.
+  ] ++ optional stdenv.isDarwin "--disable-x11-shared"
+    ++ optional (!x11Support) "--without-x"
+    ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
 
   patches = [
     ./find-headers.patch
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index fe19ecadd0ef..d852b594f6dd 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -19,15 +19,6 @@ with lib;
 assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport;
 assert openglSupport -> (stdenv.isDarwin || x11Support && libGL != null);
 
-let
-
-  configureFlagsFun = attrs: [
-    "--disable-oss"
-  ] ++ optional (!x11Support) "--without-x"
-    ++ optional alsaSupport "--with-alsa-prefix=${attrs.alsaLib.out}/lib";
-
-in
-
 stdenv.mkDerivation rec {
   name = "SDL2-${version}";
   version = "2.0.8";
@@ -61,11 +52,10 @@ stdenv.mkDerivation rec {
   #   pointer-constraints-unstable-v1-client-protocol.h: No such file or directory
   enableParallelBuilding = false;
 
-  configureFlags = configureFlagsFun { inherit alsaLib; };
-
-  crossAttrs = {
-    configureFlags = configureFlagsFun { alsaLib = alsaLib.crossDrv; };
-  };
+  configureFlags = [
+    "--disable-oss"
+  ] ++ optional (!x11Support) "--without-x"
+    ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
 
   postInstall = ''
     moveToOutput lib/libSDL2main.a "$dev"

From 88ff3c0f5d5381351daeb38099efb303f970c810 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:32:09 -0400
Subject: [PATCH 1541/3370] freetype: Remove crossAttrs

These sorts of C compiler confusions aren't really a problem anymore.
Everything is on the path with the right environment variables.
---
 pkgs/development/libraries/freetype/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 4d2455d4872b..23aa86af377c 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -62,11 +62,4 @@ in stdenv.mkDerivation rec {
     wrapProgram "$dev/bin/freetype-config" \
       --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH:$dev/lib/pkgconfig"
   '';
-
-  crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc or null != "msvcrt") {
-    # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
-    # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't
-    # know why it's on the PATH.
-    configureFlags = "--disable-static CC_BUILD=gcc";
-  };
 }

From e84b9401c5ee56b5085ffaf49e2b60514b9794cc Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:34:12 -0400
Subject: [PATCH 1542/3370] libdrm: Remove crossAttrs

No hashes should be changed.
---
 pkgs/development/libraries/libdrm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index ccae6ce50142..50d9a565a6cf 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--enable-install-test-programs" ]
     ++ stdenv.lib.optionals (stdenv.isAarch32 || stdenv.isAarch64)
       [ "--enable-tegra-experimental-api" "--enable-etnaviv-experimental-api" ]
-    ++ stdenv.lib.optional stdenv.isDarwin "-C";
-
-  crossAttrs.configureFlags = configureFlags ++ [ "--disable-intel" ];
+    ++ stdenv.lib.optional stdenv.isDarwin "-C"
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--disable-intel"
+    ;
 
   meta = {
     homepage = https://dri.freedesktop.org/libdrm/;

From 7afe4f1df070f0f63fd1bc1158109dbc8fe3dfef Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 13:06:09 -0400
Subject: [PATCH 1543/3370] libpng: Remove stale crossAttrs

Random ancient stuff for Darwin cross that seems not worth it.
---
 pkgs/development/libraries/libpng/12.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 457f99ef13bd..01a828f95da5 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit zlib; };
 
-  crossAttrs = stdenv.lib.optionalAttrs (hostPlatform.libc == "libSystem") {
-    propagatedBuildInputs = [];
-    passthru = {};
-  };
-
   configureFlags = "--enable-static";
 
   postInstall = ''mv "$out/bin" "$dev/bin"'';

From 2b28312bc2146e6a2729cd46ae79ab666d3c6521 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 13:10:39 -0400
Subject: [PATCH 1544/3370] libssh2: Remove crossAttrs

 - --with-<lib> stuff isn't needed with new default

 - `mingw_w64` probably also isn't needed, but kept with better code
   just in case.
---
 pkgs/development/libraries/libssh2/default.nix | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index a09a76707390..f85b709cf397 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -12,22 +12,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" "devdoc" ];
 
-  buildInputs = [ openssl zlib ];
-
-  crossAttrs = {
-    # link against cross-built libraries
-    configureFlags = [
-      "--with-openssl"
-      "--with-libssl-prefix=${openssl.crossDrv}"
-      "--with-libz"
-      "--with-libz-prefix=${zlib.crossDrv}"
-    ];
-  } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
-    # mingw needs import library of ws2_32 to build the shared library
-    preConfigure = ''
-      export LDFLAGS="-L${windows.mingw_w64}/lib $LDFLAGS"
-    '';
-  };
+  buildInputs = [ openssl zlib ]
+    ++ stdenv.lib.optional hostPlatform.isMinGW windows.mingw_w64;
 
   meta = {
     description = "A client-side C library implementing the SSH2 protocol";

From 08eba842b071971dd42df24e12160a1d78f7c3b4 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Mon, 7 May 2018 19:28:13 +0200
Subject: [PATCH 1545/3370] graylog: 2.4.3 -> 2.4.4

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

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index b9945a3afd38..cc7addb668e4 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.3";
+  version = "2.4.4";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0kwgg9m9sqzl4y2ri69fpi7w9961psbmfdq3avjsbgbs60ly1hn6";
+    sha256 = "0wiqwwsy306hr7zn57f5hvh8wvcc2q46x0hdlabi0n9m44wk993i";
   };
 
   dontBuild = true;

From 9817b4aa5f6a1a2ee44866bd77ef72132a0b8891 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Tue, 8 May 2018 15:48:18 +0200
Subject: [PATCH 1546/3370] graylog: wrap graylogctl

Wrapper ensures graylogctl script can find java
---
 pkgs/tools/misc/graylog/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index cc7addb668e4..f79be961378b 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
   version = "2.4.4";
@@ -12,9 +12,13 @@ stdenv.mkDerivation rec {
   dontBuild = true;
   dontStrip = true;
 
+  buildInputs = [ makeWrapper ];
+  makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ];
+
   installPhase = ''
     mkdir -p $out
     cp -r {graylog.jar,lib,bin,plugin,data} $out
+    wrapProgram $out/bin/graylogctl $makeWrapperArgs
   '';
 
   meta = with stdenv.lib; {

From f8d047da50dbc7d012a8d322b4d5e5a0b639733c Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Thu, 10 May 2018 19:36:58 +0200
Subject: [PATCH 1547/3370] nixos/release-combined.nix: make tests consistent
 (#40131)

... with release-small.nix
Tests for small channel should be a subset of tests for full channel.
---
 nixos/release-combined.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index e010b532a688..deb28835968d 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -58,6 +58,8 @@ in rec {
         nixos.ova.x86_64-linux or []
 
         #(all nixos.tests.containers)
+        (all nixos.tests.containers-imperative)
+        (all nixos.tests.containers-ipv4)
         nixos.tests.chromium.x86_64-linux or []
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
@@ -98,6 +100,7 @@ in rec {
         (all nixos.tests.misc)
         (all nixos.tests.mutableUsers)
         (all nixos.tests.nat.firewall)
+        (all nixos.tests.nat.firewall-conntrack)
         (all nixos.tests.nat.standalone)
         (all nixos.tests.networking.scripted.loopback)
         (all nixos.tests.networking.scripted.static)
@@ -112,6 +115,7 @@ in rec {
         (all nixos.tests.nfs4)
         (all nixos.tests.openssh)
         (all nixos.tests.php-pcre)
+        (all nixos.tests.predictable-interface-names)
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
         (all nixos.tests.sddm.default)

From 558f4b3368b83844837fccd58e9e89490911a1b3 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Thu, 10 May 2018 19:38:02 +0200
Subject: [PATCH 1548/3370] nixos/tests/plotinus: fix non-deterministic failure
 (#40239)

Test failed sometimes, likely because a window didn't get focus.
---
 nixos/tests/plotinus.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix
index 557d65f7960a..9058c59c92de 100644
--- a/nixos/tests/plotinus.nix
+++ b/nixos/tests/plotinus.nix
@@ -15,11 +15,11 @@ import ./make-test.nix ({ pkgs, ... }: {
   testScript =
     ''
       $machine->waitForX;
-      $machine->execute("xterm -e 'gnome-calculator' &");
-      $machine->waitForWindow(qr/Calculator/);
-      $machine->execute("xdotool key ctrl+shift+p");
-      $machine->sleep(1); # wait for the popup
-      $machine->execute("xdotool key p r e f e r e n c e s Return");
+      $machine->succeed("gnome-calculator &");
+      $machine->waitForWindow(qr/gnome-calculator/);
+      $machine->succeed("xdotool search --sync --onlyvisible --class gnome-calculator windowfocus --sync key ctrl+shift+p");
+      $machine->sleep(5); # wait for the popup
+      $machine->succeed("xdotool key --delay 100 p r e f e r e n c e s Return");
       $machine->waitForWindow(qr/Preferences/);
       $machine->screenshot("screen");
     '';

From 461903974e2510fe3e7a5cd82a96c3909501ae14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 10 May 2018 14:46:32 -0300
Subject: [PATCH 1549/3370] theme-jade1: init at 3.2

---
 pkgs/misc/themes/jade1/default.nix | 28 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  6 ++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/misc/themes/jade1/default.nix

diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix
new file mode 100644
index 000000000000..9870b3fefebb
--- /dev/null
+++ b/pkgs/misc/themes/jade1/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  name = "theme-jade1-${version}";
+  version = "3.2";
+
+  src = fetchFromGitHub {
+    owner = "madmaxms";
+    repo = "theme-jade-1";
+    rev = "v${version}";
+    sha256 = "0lf8cawn2s2x1b9af0cznhqzx3dsr8h18srcwjz7af3y5daxf311";
+  };
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+    cp -a Jade-1 $out/share/themes
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications";
+    homepage = https://github.com/madmaxms/theme-jade-1;
+    license = with licenses; [ gpl3 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb37b8a1744f..6e445747be11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19806,10 +19806,12 @@ with pkgs;
 
   numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { };
 
-  theme-obsidian2 = callPackage ../misc/themes/obsidian2 { };
-
   onestepback = callPackage ../misc/themes/onestepback { };
 
+  theme-jade1 = callPackage ../misc/themes/jade1 { };
+
+  theme-obsidian2 = callPackage ../misc/themes/obsidian2 { };
+
   theme-vertex = callPackage ../misc/themes/vertex { };
 
   rox-filer = callPackage ../desktops/rox/rox-filer {

From 1080e264fb19f55e5c20edb0fad744ff2366c3dc Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 13:46:38 -0400
Subject: [PATCH 1550/3370] groff: Get rid of crossAttrs

---
 pkgs/tools/text/groff/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 4495a85b2885..27581134ca34 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -50,15 +50,14 @@ stdenv.mkDerivation rec {
     "ac_cv_path_PERL=${buildPackages.perl}/bin/perl"
   ];
 
-  doCheck = true;
-
-  crossAttrs = {
+  makeFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
     # Trick to get the build system find the proper 'native' groff
     # http://www.mail-archive.com/bug-groff@gnu.org/msg01335.html
-    preBuild = ''
-      makeFlags="GROFF_BIN_PATH=${buildPackages.groff}/bin GROFFBIN=${buildPackages.groff}/bin/groff"
-    '';
-  };
+    "GROFF_BIN_PATH=${buildPackages.groff}/bin"
+    "GROFFBIN=${buildPackages.groff}/bin/groff"
+  ];
+
+  doCheck = true;
 
   # Remove example output with (random?) colors and creation date
   # to avoid non-determinism in the output.

From 8db05ade402e2baac59078ea73fc689bc4b3b1c7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 14:11:23 -0400
Subject: [PATCH 1551/3370] gnused: Remove crossAttrs

Use a cleaner help2man trick from coreutils
---
 pkgs/tools/text/gnused/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 72d632533ffa..b463a92ba741 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -14,13 +14,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl ];
   preConfigure = "patchShebangs ./build-aux/help2man";
 
-  crossAttrs = {
-    # The tarball ships with a fine prebuilt manpage, but the make rules try to rebuild it,
-    # which won't work when cross compiling as help2man needs to execute the binaries.
-    postConfigure = ''
-      sed -i Makefile -e 's|doc/sed\.1:|dummy:|'
-    '';
-  };
+  # Prevents attempts of running 'help2man' on cross-built binaries.
+  PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing";
 
   meta = {
     homepage = http://www.gnu.org/software/sed/;

From 48300199566229bd1409eb8f1f2cf8b8871d6b67 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:55:36 -0400
Subject: [PATCH 1552/3370] libpcap: Remove crossAttrs

---
 .../development/libraries/libpcap/default.nix | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix
index bef5f9a9da34..945554386930 100644
--- a/pkgs/development/libraries/libpcap/default.nix
+++ b/pkgs/development/libraries/libpcap/default.nix
@@ -12,10 +12,16 @@ stdenv.mkDerivation rec {
 
   # We need to force the autodetection because detection doesn't
   # work in pure build enviroments.
-  configureFlags =
-    if stdenv.isLinux then [ "--with-pcap=linux" ]
-    else if stdenv.isDarwin then [ "--with-pcap=bpf" ]
-    else [];
+  configureFlags = [
+    ("--with-pcap=" + {
+      linux = "linux";
+      darwin = "bpf";
+    }.${stdenv.hostPlatform.parsed.kernel.name})
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [
+    "ac_cv_linux_vers=2"
+  ];
+
+  dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace " -arch i386" ""
@@ -39,12 +45,6 @@ stdenv.mkDerivation rec {
 
   preInstall = ''mkdir -p $out/bin'';
 
-  crossAttrs = {
-    # Stripping hurts in static libraries
-    dontStrip = true;
-    configureFlags = configureFlags ++ [ "ac_cv_linux_vers=2" ];
-  };
-
   meta = with stdenv.lib; {
     homepage = http://www.tcpdump.org;
     description = "Packet Capture Library";

From d1cf0a8a3ad50f6e34f0cef7aee914552c1127ec Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 14:17:24 -0400
Subject: [PATCH 1553/3370] tcpdump: Remove crossAttrs and obsolete options

---
 pkgs/tools/networking/tcpdump/default.nix | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 324a58cf7edb..59cc89ac5727 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, libpcap, enableStatic ? false
-, hostPlatform
-}:
+{ stdenv, fetchurl, fetchpatch, libpcap }:
 
 stdenv.mkDerivation rec {
   name = "tcpdump-${version}";
@@ -20,11 +18,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpcap ];
 
-  crossAttrs = {
-    LDFLAGS = if enableStatic then "-static" else "";
-    configureFlags = [ "ac_cv_linux_vers=2" ] ++ (stdenv.lib.optional
-      (hostPlatform.platform.kernelMajor or null == "2.4") "--disable-ipv6");
-  };
+  configureFlags = stdenv.lib.optional
+    (stdenv.hostPlatform != stdenv.buildPlatform)
+    "ac_cv_linux_vers=2";
 
   meta = {
     description = "Network sniffer";

From 507a64cd8da1647cd801ab01e1b95b4d6b43842e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:42:43 -0400
Subject: [PATCH 1554/3370] libmsgpack: Remove crossAttrs

Just set cmakeFlags directly. Also improve conditions.
---
 pkgs/development/libraries/libmsgpack/generic.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/libmsgpack/generic.nix
index 889ef1347732..947960d23592 100644
--- a/pkgs/development/libraries/libmsgpack/generic.nix
+++ b/pkgs/development/libraries/libmsgpack/generic.nix
@@ -13,13 +13,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  crossAttrs = {
-  } // stdenv.lib.optionalAttrs (hostPlatform.libc == "msvcrt") {
-    cmakeFlags = [
-      "-DMSGPACK_BUILD_EXAMPLES=OFF"
-      "-DCMAKE_SYSTEM_NAME=Windows"
-    ];
-  };
+  cmakeFlags = []
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+                           "-DMSGPACK_BUILD_EXAMPLES=OFF"
+    ++ stdenv.lib.optional (hostPlatform.libc == "msvcrt")
+                           "-DCMAKE_SYSTEM_NAME=Windows"
+    ;
 
   meta = with stdenv.lib; {
     description = "MessagePack implementation for C and C++";

From 01b274ce0d9923eb960b1a55e13527545f381f41 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 13:08:07 -0400
Subject: [PATCH 1555/3370] librsync: Remove crossAttrs

---
 pkgs/development/libraries/librsync/0.9.nix     | 4 +---
 pkgs/development/libraries/librsync/default.nix | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix
index 0954694cf290..115f4cd90a0c 100644
--- a/pkgs/development/libraries/librsync/0.9.nix
+++ b/pkgs/development/libraries/librsync/0.9.nix
@@ -12,9 +12,7 @@ stdenv.mkDerivation {
 
   configureFlags = if stdenv.isCygwin then "--enable-static" else "--enable-shared";
 
-  crossAttrs = {
-    dontStrip = true;
-  };
+  dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
   meta = {
     homepage = http://librsync.sourceforge.net/;
diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix
index 80acaf57d625..afb83051b211 100644
--- a/pkgs/development/libraries/librsync/default.nix
+++ b/pkgs/development/libraries/librsync/default.nix
@@ -14,9 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ perl zlib bzip2 popt ];
 
-  crossAttrs = {
-    dontStrip = true;
-  };
+  dontStrip = stdenv.hostPlatform != stdenv.buildPlatform;
 
   meta = with stdenv.lib; {
     homepage = http://librsync.sourceforge.net/;

From 1e966f9aa6684c7a19493bbb470aafffce399dd9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 13:43:12 -0400
Subject: [PATCH 1556/3370] libvpx: Get rid of crossAttrs

Only breaks native hashes because configurePlatforms
---
 pkgs/development/libraries/libvpx/default.nix | 52 +++++++++----------
 pkgs/development/libraries/libvpx/git.nix     | 34 ++++++------
 2 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 272761cc6af3..011e1450d474 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -72,6 +72,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" ];
   setOutputFlags = false;
 
+  configurePlatforms = [];
   configureFlags = [
     (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
     (enableFeature vp8EncoderSupport "vp8-encoder")
@@ -131,8 +132,29 @@ stdenv.mkDerivation rec {
     (enableFeature (experimentalSpatialSvcSupport ||
                     experimentalFpMbStatsSupport ||
                     experimentalEmulateHardwareSupport) "experimental")
-    # Experimental features
-  ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
+  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    #"--extra-cflags="
+    #"--extra-cxxflags="
+    #"--prefix="
+    #"--libc="
+    #"--libdir="
+    "--enable-external-build"
+    # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
+    # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
+    # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
+    "--force-target=${hostPlatform.config}${
+            if hostPlatform.isDarwin then
+              if      hostPlatform.osxMinVersion == "10.10" then "14"
+              else if hostPlatform.osxMinVersion == "10.9"  then "13"
+              else if hostPlatform.osxMinVersion == "10.8"  then "12"
+              else if hostPlatform.osxMinVersion == "10.7"  then "11"
+              else if hostPlatform.osxMinVersion == "10.6"  then "10"
+              else if hostPlatform.osxMinVersion == "10.5"  then "9"
+              else "8"
+            else ""}-gcc"
+    (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
+  ] # Experimental features
+    ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
     ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
     ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
 
@@ -145,32 +167,6 @@ stdenv.mkDerivation rec {
 
   postInstall = ''moveToOutput bin "$bin" '';
 
-  crossAttrs = {
-    configurePlatforms = [];
-    configureFlags = configureFlags ++ [
-      #"--extra-cflags="
-      #"--extra-cxxflags="
-      #"--prefix="
-      #"--libc="
-      #"--libdir="
-      "--enable-external-build"
-      # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version)
-      # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure
-      # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14
-      "--force-target=${hostPlatform.config}${
-              if hostPlatform.isDarwin then
-                if      hostPlatform.osxMinVersion == "10.10" then "14"
-                else if hostPlatform.osxMinVersion == "10.9"  then "13"
-                else if hostPlatform.osxMinVersion == "10.8"  then "12"
-                else if hostPlatform.osxMinVersion == "10.7"  then "11"
-                else if hostPlatform.osxMinVersion == "10.6"  then "10"
-                else if hostPlatform.osxMinVersion == "10.5"  then "9"
-                else "8"
-              else ""}-gcc"
-      (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
-    ];
-  };
-
   meta = with stdenv.lib; {
     description = "WebM VP8/VP9 codec SDK";
     homepage    = https://www.webmproject.org/;
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index e2b94dda28e7..7d4b75d6cdf8 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
   outputs = [ "bin" "dev" "out" ];
   setOutputFlags = false;
 
+  configurePlatforms = [];
   configureFlags = [
     (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
     (enableFeature vp8EncoderSupport "vp8-encoder")
@@ -139,23 +140,7 @@ stdenv.mkDerivation rec {
     (enableFeature (experimentalSpatialSvcSupport ||
                     experimentalFpMbStatsSupport ||
                     experimentalEmulateHardwareSupport) "experimental")
-    # Experimental features
-  ] ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
-    ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
-    ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
-
-  nativeBuildInputs = [ perl yasm ];
-
-  buildInputs = [ ]
-    ++ optionals unitTestsSupport [ coreutils curl ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''moveToOutput bin "$bin" '';
-
-  crossAttrs = {
-    configurePlatforms = [];
-    configureFlags = configureFlags ++ [
+  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       #"--extra-cflags="
       #"--prefix="
       #"--libc="
@@ -175,8 +160,19 @@ stdenv.mkDerivation rec {
                 else "8"
               else ""}-gcc"
       (if hostPlatform.isCygwin then "--enable-static-msvcrt" else "")
-    ];
-  };
+  ] # Experimental features
+    ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc"
+    ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats"
+    ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware";
+
+  nativeBuildInputs = [ perl yasm ];
+
+  buildInputs = [ ]
+    ++ optionals unitTestsSupport [ coreutils curl ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''moveToOutput bin "$bin" '';
 
   meta = with stdenv.lib; {
     description = "WebM VP8/VP9 codec SDK";

From c42118bb822ae35431343109aeb903f2c2d121af Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 11:56:52 -0400
Subject: [PATCH 1557/3370] gcc: Get rid of crossAttrs

Only a little bit was left
---
 .../development/compilers/gcc/4.8/default.nix | 20 +++++++------------
 .../development/compilers/gcc/4.9/default.nix | 20 +++++++------------
 pkgs/development/compilers/gcc/5/default.nix  | 20 +++++++------------
 pkgs/development/compilers/gcc/6/default.nix  | 19 +++++++-----------
 pkgs/development/compilers/gcc/7/default.nix  | 19 +++++++-----------
 pkgs/development/compilers/gcc/8/default.nix  | 19 +++++++-----------
 .../compilers/gcc/snapshot/default.nix        | 15 +++++---------
 7 files changed, 47 insertions(+), 85 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 532c56d52573..8aeb531e3ebe 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -25,7 +25,8 @@
 , libcCross ? null
 , crossStageStatic ? false
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
-, stripped ? true
+, # Strip kills static libs of other archs (hence no cross)
+  stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
@@ -371,21 +372,17 @@ stdenv.mkDerivation ({
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
-  buildFlags = if bootstrap then
-    (if profiledCompiler then "profiledbootstrap" else "bootstrap")
-    else "";
+  buildFlags = optional
+    (bootstrap && hostPlatform == buildPlatform)
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+  dontStrip = !stripped;
 
   installTargets =
     if stripped
     then "install-strip"
     else "install";
 
-  /* For cross-built gcc (build != host == target) */
-  crossAttrs =  {
-    dontStrip = true;
-    buildFlags = "";
-  };
-
   # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
@@ -487,8 +484,5 @@ stdenv.mkDerivation ({
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
-// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index f041252495a6..7bd9f5460f12 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -25,7 +25,8 @@
 , libcCross ? null
 , crossStageStatic ? false
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
-, stripped ? true
+, # Strip kills static libs of other archs (hence no cross)
+  stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , darwin ? null
 , buildPlatform, hostPlatform, targetPlatform
@@ -393,21 +394,17 @@ stdenv.mkDerivation ({
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
-  buildFlags = if bootstrap then
-    (if profiledCompiler then "profiledbootstrap" else "bootstrap")
-    else "";
+  buildFlags = optional
+    (bootstrap && hostPlatform == buildPlatform)
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+  dontStrip = !stripped;
 
   installTargets =
     if stripped
     then "install-strip"
     else "install";
 
-  /* For cross-built gcc (build != host == target) */
-  crossAttrs = {
-    dontStrip = true;
-    buildFlags = "";
-  };
-
   # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
@@ -505,9 +502,6 @@ stdenv.mkDerivation ({
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
-// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 
 // optionalAttrs (langJava) {
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index dee798eb09b1..b61a3719cc69 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -25,7 +25,8 @@
 , libcCross ? null
 , crossStageStatic ? false
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
-, stripped ? true
+, # Strip kills static libs of other archs (hence no cross)
+  stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
@@ -396,21 +397,17 @@ stdenv.mkDerivation ({
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
-  buildFlags = if bootstrap then
-    (if profiledCompiler then "profiledbootstrap" else "bootstrap")
-    else "";
+  buildFlags = optional
+    (bootstrap && hostPlatform == buildPlatform)
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+  dontStrip = !stripped;
 
   installTargets =
     if stripped
     then "install-strip"
     else "install";
 
-  /* For cross-built gcc (build != host == target) */
-  crossAttrs = {
-    dontStrip = true;
-    buildFlags = "";
-  };
-
   # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
@@ -508,8 +505,5 @@ stdenv.mkDerivation ({
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
-// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index b99ab8fce7fb..9a26d4dae26a 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -25,7 +25,8 @@
 , libcCross ? null
 , crossStageStatic ? false
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
-, stripped ? true
+, # Strip kills static libs of other archs (hence no cross)
+  stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
@@ -400,20 +401,17 @@ stdenv.mkDerivation ({
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
-  buildFlags =
-    optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+  buildFlags = optional
+    (bootstrap && hostPlatform == buildPlatform)
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+  dontStrip = !stripped;
 
   installTargets =
     if stripped
     then "install-strip"
     else "install";
 
-  /* For cross-built gcc (build != host == target) */
-  crossAttrs = {
-    dontStrip = true;
-    buildFlags = "";
-  };
-
   # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
@@ -511,9 +509,6 @@ stdenv.mkDerivation ({
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
-// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 
 // optionalAttrs (langJava) {
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 493e50d9f327..dd5e42f7642e 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -25,7 +25,8 @@
 , libcCross ? null
 , crossStageStatic ? false
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
-, stripped ? true
+, # Strip kills static libs of other archs (hence no cross)
+  stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
@@ -406,20 +407,17 @@ stdenv.mkDerivation ({
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
-  buildFlags =
-    optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+  buildFlags = optional
+    (bootstrap && hostPlatform == buildPlatform)
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+  dontStrip = !stripped;
 
   installTargets =
     if stripped
     then "install-strip"
     else "install";
 
-  /* For cross-built gcc (build != host == target) */
-  crossAttrs = {
-    dontStrip = true;
-    buildFlags = "";
-  };
-
   # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
@@ -517,8 +515,5 @@ stdenv.mkDerivation ({
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
-// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix
index 2465e6149c0a..239735bc6574 100644
--- a/pkgs/development/compilers/gcc/8/default.nix
+++ b/pkgs/development/compilers/gcc/8/default.nix
@@ -18,7 +18,8 @@
 , libcCross ? null
 , crossStageStatic ? false
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
-, stripped ? true
+, # Strip kills static libs of other archs (hence no cross)
+  stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
@@ -347,20 +348,17 @@ stdenv.mkDerivation ({
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
 
-  buildFlags =
-    optional bootstrap (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+  buildFlags = optional
+    (bootstrap && hostPlatform == buildPlatform)
+    (if profiledCompiler then "profiledbootstrap" else "bootstrap");
+
+  dontStrip = !stripped;
 
   installTargets =
     if stripped
     then "install-strip"
     else "install";
 
-  /* For cross-built gcc (build != host == target) */
-  crossAttrs = {
-    dontStrip = true;
-    buildFlags = "";
-  };
-
   # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
@@ -447,8 +445,5 @@ stdenv.mkDerivation ({
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
-// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; }
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index d37cfac3fa85..d87df9972891 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -25,7 +25,8 @@
 , libcCross ? null
 , crossStageStatic ? false
 , libpthread ? null, libpthreadCross ? null  # required for GNU/Hurd
-, stripped ? true
+, # Strip kills static libs of other archs (hence no cross)
+  stripped ? hostPlatform == buildPlatform && targetPlatform == hostPlatform
 , gnused ? null
 , cloog # unused; just for compat with gcc4, as we override the parameter on some places
 , darwin ? null
@@ -371,17 +372,14 @@ stdenv.mkDerivation ({
     (if profiledCompiler then "profiledbootstrap" else "bootstrap")
     else "";
 
+  dontStrip = !stripped;
+  NIX_STRIP_DEBUG = !stripped;
+
   installTargets =
     if stripped
     then "install-strip"
     else "install";
 
-  /* For cross-built gcc (build != host == target) */
-  crossAttrs = {
-    dontStrip = true;
-    buildFlags = "";
-  };
-
   # http://gcc.gnu.org/install/specific.html#x86-64-x-solaris210
   ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64";
 
@@ -481,8 +479,5 @@ stdenv.mkDerivation ({
   installTargets = "install-gcc install-target-libgcc";
 }
 
-# Strip kills static libs of other archs (hence targetPlatform != hostPlatform)
-// optionalAttrs (!stripped || targetPlatform != hostPlatform) { dontStrip = true; NIX_STRIP_DEBUG = 0; }
-
 // optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
 )

From b12850d4214e40e8514163a47fa4545c7196f717 Mon Sep 17 00:00:00 2001
From: Periklis Tsirakidis <periklis.tsirakidis@holidaycheck.com>
Date: Thu, 10 May 2018 19:16:03 +0200
Subject: [PATCH 1558/3370] skhd: Bump 0.0.14 to 0.1.1

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

diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix
index 3331084d807e..c51ada10d688 100644
--- a/pkgs/os-specific/darwin/skhd/default.nix
+++ b/pkgs/os-specific/darwin/skhd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "skhd-${version}";
-  version = "0.0.14";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "koekeishiya";
     repo = "skhd";
     rev = "v${version}";
-    sha256 = "0kkmlka1hxsjdkx0ywkm48p9v1jhld26lfplls20n0hj97i5iwlz";
+    sha256 = "1wh7v90ydh27gbaiwn2r6ncx6yiic4mph3w9vi1282nz2q02zxss";
   };
 
   buildInputs = [ Carbon ];

From 58b2e875c212f10129a2320f38f03988dee13bed Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 May 2018 18:50:51 -0400
Subject: [PATCH 1559/3370] lib/systems: Prohibit "gnu" ABI (*-gnu) with 32-bit
 ARM

It is ambiguous, and therefore banned within GCC.
---
 lib/systems/default.nix |  7 +++++++
 lib/systems/parse.nix   | 12 ++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 0e1a10c1f64b..ee4c29660a55 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -50,5 +50,12 @@ rec {
     } // mapAttrs (n: v: v final.parsed) inspect.predicates
       // args;
   in assert final.useAndroidPrebuilt -> final.isAndroid;
+     assert lib.foldl
+       (pass: { assertion, message }:
+         if assertion final
+         then pass
+         else throw message)
+       true
+       (final.parsed.abi.assertions or []);
     final;
 }
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 16d657a5435a..08f2fb445de3 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -192,7 +192,15 @@ rec {
   abis = setTypes types.openAbi {
     android = {};
     cygnus = {};
-    gnu = {};
+    gnu = {
+      assertions = [
+        { assertion = platform: !platform.isAarch32;
+          message = ''
+            The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead.
+          '';
+        }
+      ];
+    };
     msvc = {};
     eabi = {};
     androideabi = {};
@@ -270,7 +278,7 @@ rec {
       kernel = getKernel args.kernel;
       abi =
         /**/ if args ? abi       then getAbi args.abi
-        else if isLinux   parsed then abis.gnu
+        else if isLinux   parsed then (if isAarch32 parsed then abis.gnueabi else abis.gnu)
         else if isWindows parsed then abis.gnu
         else                     abis.unknown;
     };

From cc083fa9070cdef426457142a2b38c2708547d51 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 10 May 2018 21:41:40 +0200
Subject: [PATCH 1560/3370] pytrainer: 1.12.0 -> 1.12.1

---
 pkgs/applications/misc/pytrainer/default.nix       |  4 ++--
 pkgs/applications/misc/pytrainer/fix-test-tz.patch | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index dcbd14198f76..cdeca96568df 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -14,13 +14,13 @@ in
 
 python.pkgs.buildPythonApplication rec {
   name = "pytrainer-${version}";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "pytrainer";
     repo = "pytrainer";
     rev = "v${version}";
-    sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581";
+    sha256 = "0rzf8kks96qzlknh6g3b9pjq04j7qk6rmz58scp7sck8xz9rjbwx";
   };
 
   namePrefix = "";
diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
index 761064077a98..ca4875769013 100644
--- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch
+++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch
@@ -30,13 +30,16 @@ diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrain
 +        summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')]
          activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1')
          self.ddbb.session.add(activity)
-         self.ddbb.session.commit()
+         self.ddbb.session.commit(
 diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py
---- source.orig/pytrainer/test/lib/test_date.py	2018-02-27 22:15:32.079243364 +0100
-+++ source/pytrainer/test/lib/test_date.py	2018-02-27 22:16:33.936867052 +0100
-@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase
+--- source.orig/pytrainer/test/lib/test_date.py	2018-05-10 21:15:22.196275555 +0200
++++ source/pytrainer/test/lib/test_date.py	2018-05-10 21:22:43.647870401 +0200
+@@ -47,7 +47,7 @@ class DateFunctionTest(unittest.TestCase
      def test_getDateTime(self):
          utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015')
          self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime)
 -        self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime)
 +        self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime)
+ 
+ class DateRangeTest(unittest.TestCase):
+ 

From 938ff5401adc7ae43bd185d8fa610f1fd4f6ead1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 10 May 2018 23:03:28 +0200
Subject: [PATCH 1561/3370] signal-desktop: 1.9.0 -> 1.10.0

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 479b89bcecbd..4fe4d6ceca2c 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.9.0";
+    version = "1.10.0";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "18i9chyarpcw369rqyldckkln1lxy5g9qy9f5gy5gsz9y5qngxqa";
+          sha256 = "0fjc5zf3lr5pmlc57yv3spjk2hq4b3lxngc6iw6c73ficnz4ij7i";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";

From 840e5d8bda527bb0986efee9df0d45b6e59521d2 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 10 May 2018 23:30:56 +0200
Subject: [PATCH 1562/3370] nixos/tests/graphite: fix test

- adapt netcat options to libressl-nc
- wait for services to be started and accepting connections
---
 nixos/tests/graphite.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix
index a22ef224580a..5a1f50bd29b1 100644
--- a/nixos/tests/graphite.nix
+++ b/nixos/tests/graphite.nix
@@ -4,6 +4,7 @@ import ./make-test.nix ({ pkgs, ...} :
   nodes = {
     one =
       { config, pkgs, ... }: {
+        virtualisation.memorySize = 1024;
         time.timeZone = "UTC";
         services.graphite = {
           web.enable = true;
@@ -21,12 +22,17 @@ import ./make-test.nix ({ pkgs, ...} :
   testScript = ''
     startAll;
     $one->waitForUnit("default.target");
-    $one->requireActiveUnit("graphiteWeb.service");
-    $one->requireActiveUnit("graphiteApi.service");
-    $one->requireActiveUnit("graphitePager.service");
-    $one->requireActiveUnit("carbonCache.service");
-    $one->requireActiveUnit("seyren.service");
-    $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003");
-    $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo")
+    $one->waitForUnit("graphiteWeb.service");
+    $one->waitForUnit("graphiteApi.service");
+    $one->waitForUnit("graphitePager.service");
+    $one->waitForUnit("carbonCache.service");
+    $one->waitForUnit("seyren.service");
+    # The services above are of type "simple". systemd considers them active immediately
+    # even if they're still in preStart (which takes quite long for graphiteWeb).
+    # Wait for ports to open so we're sure the services are up and listening.
+    $one->waitForOpenPort(8080);
+    $one->waitForOpenPort(2003);
+    $one->succeed("echo \"foo 1 `date +%s`\" | nc -N localhost 2003");
+    $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2");
   '';
 })

From c9f6a82b619675a4ee1eb4fe9eac57efb69232fe Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 17:13:52 -0400
Subject: [PATCH 1563/3370] gcc: Factor out "platform flags"

---
 pkgs/development/compilers/gcc/4.5/default.nix | 18 +-----------------
 pkgs/development/compilers/gcc/4.8/default.nix | 18 +-----------------
 pkgs/development/compilers/gcc/4.9/default.nix | 18 +-----------------
 pkgs/development/compilers/gcc/5/default.nix   | 18 +-----------------
 pkgs/development/compilers/gcc/6/default.nix   | 18 +-----------------
 pkgs/development/compilers/gcc/7/default.nix   | 18 +-----------------
 .../compilers/gcc/common/platform-flags.nix    | 12 ++++++++++++
 .../compilers/gcc/snapshot/default.nix         | 18 +-----------------
 8 files changed, 19 insertions(+), 119 deletions(-)
 create mode 100644 pkgs/development/compilers/gcc/common/platform-flags.nix

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 8cee08c09261..36b48b880211 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -64,22 +64,6 @@ let version = "4.5.4";
 
     javaAwtGtk = langJava && gtk2 != null;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings */
     crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");
 
@@ -312,7 +296,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
 
     # Platform-specific flags
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index c798a67de840..dea8b912b272 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -108,22 +108,6 @@ let version = "4.8.5";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -372,7 +356,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index c729bbeb66f9..343d820fa236 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -99,22 +99,6 @@ let version = "4.9.4";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -380,7 +364,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index f2a091e34dc9..0d9565de0a77 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -103,22 +103,6 @@ let version = "5.5.0";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -396,7 +380,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 3de5b4dd2702..29f2bad7eac1 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -97,22 +97,6 @@ let version = "6.4.0";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -400,7 +384,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 888e455488ca..e75e22efce1f 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -98,22 +98,6 @@ let version = "7.3.0";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -396,7 +380,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
new file mode 100644
index 000000000000..71997752ad1c
--- /dev/null
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -0,0 +1,12 @@
+{ lib, targetPlatform }:
+
+let
+  p = targetPlatform.platform.gcc or {};
+in lib.concatLists [
+  (lib.optional (p ? arch) "--with-arch=${p.arch}")
+  (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
+  (lib.optional (p ? abi) "--with-abi=${p.abi}")
+  (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
+  (lib.optional (p ? float) "--with-float=${p.float}")
+  (lib.optional (p ? mode) "--with-mode=${p.mode}")
+]
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 3c98b7a58f76..609d418693d7 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -95,22 +95,6 @@ let version = "7-20170409";
 
     javaAwtGtk = langJava && x11Support;
 
-    /* Platform flags */
-    platformFlags = let
-        gccArch = targetPlatform.platform.gcc.arch or null;
-        gccCpu = targetPlatform.platform.gcc.cpu or null;
-        gccAbi = targetPlatform.platform.gcc.abi or null;
-        gccFpu = targetPlatform.platform.gcc.fpu or null;
-        gccFloat = targetPlatform.platform.gcc.float or null;
-        gccMode = targetPlatform.platform.gcc.mode or null;
-      in
-        optional (gccArch != null) "--with-arch=${gccArch}" ++
-        optional (gccCpu != null) "--with-cpu=${gccCpu}" ++
-        optional (gccAbi != null) "--with-abi=${gccAbi}" ++
-        optional (gccFpu != null) "--with-fpu=${gccFpu}" ++
-        optional (gccFloat != null) "--with-float=${gccFloat}" ++
-        optional (gccMode != null) "--with-mode=${gccMode}";
-
     /* Cross-gcc settings (build == host != target) */
     crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
     crossDarwin = targetPlatform != hostPlatform && targetPlatform.libc == "libSystem";
@@ -368,7 +352,7 @@ stdenv.mkDerivation ({
     # Ada
     optional langAda "--enable-libada" ++
 
-    platformFlags ++
+    (import ../common/platform-flags.nix { inherit (stdenv) lib targetPlatform; }) ++
     optional (targetPlatform != hostPlatform) crossConfigureFlags ++
     optional (!bootstrap) "--disable-bootstrap" ++
 

From 1fe81a4bcd25dba9319bc1bb49b078872f28ffa6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 17:31:07 -0400
Subject: [PATCH 1564/3370] lib: Clean up float/fpu options

ARM ABIs now have a float field. This is used as a fallback to lessen
our use of `platform.gcc.float`. I didn't know what the MIPs convention
is so I kept using `platform.gcc.float` in that case.
---
 lib/systems/examples.nix                      |  9 +-----
 lib/systems/parse.nix                         | 32 +++++++++++--------
 lib/systems/platforms.nix                     |  6 +---
 .../compilers/gcc/common/platform-flags.nix   |  3 +-
 pkgs/development/libraries/glibc/common.nix   |  4 ++-
 5 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 80e320406bf4..32c24bab7c98 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -11,21 +11,16 @@ rec {
 
   sheevaplug = rec {
     config = "armv5tel-unknown-linux-gnueabi";
-    float = "soft";
     platform = platforms.sheevaplug;
   };
 
   raspberryPi = rec {
     config = "armv6l-unknown-linux-gnueabihf";
-    float = "hard";
-    fpu = "vfp";
     platform = platforms.raspberrypi;
   };
 
   armv7l-hf-multiplatform = rec {
     config = "armv7a-unknown-linux-gnueabihf";
-    float = "hard";
-    fpu = "vfpv3-d16";
     platform = platforms.armv7l-hf-multiplatform;
   };
 
@@ -47,26 +42,24 @@ rec {
 
   pogoplug4 = rec {
     config = "armv5tel-unknown-linux-gnueabi";
-    float = "soft";
     platform = platforms.pogoplug4;
   };
 
   ben-nanonote = rec {
     config = "mipsel-unknown-linux-uclibc";
-    float = "soft";
     platform = {
       name = "ben_nanonote";
       kernelMajor = "2.6";
       kernelArch = "mips";
       gcc = {
         arch = "mips32";
+        float = "soft";
       };
     };
   };
 
   fuloongminipc = rec {
     config = "mipsel-unknown-linux-gnu";
-    float = "hard";
     platform = platforms.fuloong2f_n32;
   };
 
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 7ba06f129db8..3667766aa9f7 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -182,20 +182,24 @@ rec {
   types.abi = enum (attrValues abis);
 
   abis = setTypes types.openAbi {
-    android = {};
-    cygnus = {};
-    gnu = {};
-    msvc = {};
-    eabi = {};
-    androideabi = {};
-    gnueabi = {};
-    gnueabihf = {};
-    musleabi = {};
-    musleabihf = {};
-    musl = {};
-    uclibceabihf = {};
-    uclibceabi = {};
-    uclibc = {};
+    cygnus       = {};
+    msvc         = {};
+    eabi         = {};
+
+    androideabi  = {};
+    android      = {};
+
+    gnueabi      = { float = "soft"; };
+    gnueabihf    = { float = "hard"; };
+    gnu          = {};
+
+    musleabi     = { float = "soft"; };
+    musleabihf   = { float = "hard"; };
+    musl         = {};
+
+    uclibceabihf = { float = "soft"; };
+    uclibceabi   = { float = "hard"; };
+    uclibc       = {};
 
     unknown = {};
   };
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index f39e890fbf1c..d6587ac49a89 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -25,7 +25,6 @@ rec {
 
     gcc = {
       arch = "armv5te";
-      float = "soft";
     };
 
     kernelMajor = "2.6";
@@ -158,7 +157,6 @@ rec {
     kernelDTB = true; # Beyond 3.10
     gcc = {
       arch = "armv5te";
-      float = "soft";
     };
   };
 
@@ -336,7 +334,6 @@ rec {
     gcc = {
       cpu = "cortex-a9";
       fpu = "vfpv3";
-      float = "hard";
     };
   };
 
@@ -363,7 +360,6 @@ rec {
     gcc = {
       cpu = "cortex-a9";
       fpu = "neon";
-      float = "hard";
     };
   };
 
@@ -449,6 +445,7 @@ rec {
     kernelTarget = "vmlinux";
     gcc = {
       arch = "loongson2f";
+      float = "hard";
       abi = "n32";
     };
   };
@@ -498,7 +495,6 @@ rec {
       # and the above page suggests NEON is only an improvement with hand-written assembly.
       arch = "armv7-a";
       fpu = "vfpv3-d16";
-      float = "hard";
 
       # For Raspberry Pi the 2 the best would be:
       #   cpu = "cortex-a7";
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index 71997752ad1c..e261f54f582d 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -2,11 +2,12 @@
 
 let
   p = targetPlatform.platform.gcc or {};
+  float = p.float or (targetPlatform.parsed.abi.float or null);
 in lib.concatLists [
   (lib.optional (p ? arch) "--with-arch=${p.arch}")
   (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
   (lib.optional (p ? abi) "--with-abi=${p.abi}")
   (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
-  (lib.optional (p ? float) "--with-float=${p.float}")
+  (lib.optional (float != null) "--with-float=${float}")
   (lib.optional (p ? mode) "--with-mode=${p.mode}")
 ]
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 5179ce4a9a88..0e363fe4a256 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -127,7 +127,9 @@ stdenv.mkDerivation ({
     ] ++ lib.optionals withLinuxHeaders [
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
     ] ++ lib.optionals (cross != null) [
-      (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
+      (if cross.platform.gcc.float or (cross.parsed.abi.float or "hard") == "soft"
+       then "--without-fp"
+       else "--with-fp")
     ] ++ lib.optionals (cross != null) [
       "--with-__thread"
     ] ++ lib.optionals (cross == null && stdenv.isAarch32) [

From e98814461d40c2907a46bbd7a81f8e0b7053019e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 17:42:48 -0400
Subject: [PATCH 1565/3370] glibc: Remove old-style nullable "cross" variable

Much better to just use {build,host}Platform directly.
---
 .../development/libraries/glibc/common-2.27.nix | 17 +++++++----------
 pkgs/development/libraries/glibc/common.nix     | 15 +++++----------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/glibc/common-2.27.nix b/pkgs/development/libraries/glibc/common-2.27.nix
index 272e18905c13..7d2cf7d14b78 100644
--- a/pkgs/development/libraries/glibc/common-2.27.nix
+++ b/pkgs/development/libraries/glibc/common-2.27.nix
@@ -23,7 +23,6 @@ let
   version = "2.27";
   patchSuffix = "";
   sha256 = "0wpwq7gsm7sd6ysidv0z575ckqdg13cr2njyfgrbgh4f65adwwji";
-  cross = if buildPlatform != hostPlatform then hostPlatform else null;
 in
 
 assert withLinuxHeaders -> linuxHeaders != null;
@@ -33,9 +32,6 @@ stdenv.mkDerivation ({
   inherit  installLocales;
   linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
 
-  # The host/target system.
-  crossConfig = if cross != null then cross.config else null;
-
   inherit (stdenv) is64bit;
 
   enableParallelBuilding = true;
@@ -106,11 +102,12 @@ stdenv.mkDerivation ({
        else "--disable-profile")
     ] ++ lib.optionals withLinuxHeaders [
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
-    ] ++ lib.optionals (cross != null) [
-      (if cross ? float && cross.float == "soft" then "--without-fp" else "--with-fp")
-    ] ++ lib.optionals (cross != null) [
+    ] ++ lib.optionals (hostPlatform != buildPlatform) [
+      (if hostPlatform.platform.gcc.float or (hostPlatform.parsed.abi.float or "hard") == "soft"
+       then "--without-fp"
+       else "--with-fp")
       "--with-__thread"
-    ] ++ lib.optionals (cross == null && stdenv.isAarch32) [
+    ] ++ lib.optionals (hostPlatform == buildPlatform && hostPlatform.isAarch32) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
 
@@ -162,7 +159,7 @@ stdenv.mkDerivation ({
     }
 
 
-  '' + lib.optionalString (cross != null) ''
+  '' + lib.optionalString (hostPlatform != buildPlatform) ''
     sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"
 
     cat > config.cache << "EOF"
@@ -196,7 +193,7 @@ stdenv.mkDerivation ({
   passthru = { inherit version; };
 }
 
-// lib.optionalAttrs (cross != null) {
+// lib.optionalAttrs (hostPlatform != buildPlatform) {
   preInstall = null; # clobber the native hook
 
   dontStrip = true;
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 0e363fe4a256..a1c3a90162ef 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -22,7 +22,6 @@ let
   version = "2.26";
   patchSuffix = "-131";
   sha256 = "1ggnj1hzjym7sn93rbwydcqd562q73lsb7g7kd199g6j9j9hlkp5";
-  cross = if buildPlatform != hostPlatform then hostPlatform else null;
 in
 
 assert withLinuxHeaders -> linuxHeaders != null;
@@ -32,9 +31,6 @@ stdenv.mkDerivation ({
   inherit  installLocales;
   linuxHeaders = if withLinuxHeaders then linuxHeaders else null;
 
-  # The host/target system.
-  crossConfig = if cross != null then cross.config else null;
-
   inherit (stdenv) is64bit;
 
   enableParallelBuilding = true;
@@ -126,13 +122,12 @@ stdenv.mkDerivation ({
        else "--disable-profile")
     ] ++ lib.optionals withLinuxHeaders [
       "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26
-    ] ++ lib.optionals (cross != null) [
-      (if cross.platform.gcc.float or (cross.parsed.abi.float or "hard") == "soft"
+    ] ++ lib.optionals (hostPlatform != buildPlatform) [
+      (if hostPlatform.platform.gcc.float or (hostPlatform.parsed.abi.float or "hard") == "soft"
        then "--without-fp"
        else "--with-fp")
-    ] ++ lib.optionals (cross != null) [
       "--with-__thread"
-    ] ++ lib.optionals (cross == null && stdenv.isAarch32) [
+    ] ++ lib.optionals (hostPlatform == buildPlatform && hostPlatform.isAarch32) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
 
@@ -183,7 +178,7 @@ stdenv.mkDerivation ({
     }
 
 
-  '' + lib.optionalString (cross != null) ''
+  '' + lib.optionalString (hostPlatform != buildPlatform) ''
     sed -i s/-lgcc_eh//g "../$sourceRoot/Makeconfig"
 
     cat > config.cache << "EOF"
@@ -215,7 +210,7 @@ stdenv.mkDerivation ({
   } // meta;
 }
 
-// lib.optionalAttrs (cross != null) {
+// lib.optionalAttrs (hostPlatform != buildPlatform) {
   preInstall = null; # clobber the native hook
 
   dontStrip = true;

From 50efa1979d86a852bbc713f624ca9897fd22e65d Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 00:47:43 +0200
Subject: [PATCH 1566/3370] nixos/release-combined.nix: fix eval of tested job

bug introduced by f8d047da50dbc7d012a8d322b4d5e5a0b639733c
---
 nixos/release-combined.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index deb28835968d..989764874c48 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -115,7 +115,10 @@ in rec {
         (all nixos.tests.nfs4)
         (all nixos.tests.openssh)
         (all nixos.tests.php-pcre)
-        (all nixos.tests.predictable-interface-names)
+        (all nixos.tests.predictable-interface-names.predictable)
+        (all nixos.tests.predictable-interface-names.unpredictable)
+        (all nixos.tests.predictable-interface-names.predictableNetworkd)
+        (all nixos.tests.predictable-interface-names.unpredictableNetworkd)
         (all nixos.tests.printing)
         (all nixos.tests.proxy)
         (all nixos.tests.sddm.default)

From 97dde3ca009caeb5283235d16d4b7ebd59972ce3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 18:08:03 -0700
Subject: [PATCH 1567/3370] python27Packages.youtube-dl: 2018.05.01 ->
 2018.05.09
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/youtube-dl/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/.youtube-dl-wrapped -h’ got 0 exit code
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/.youtube-dl-wrapped --help’ got 0 exit code
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/.youtube-dl-wrapped --version’ and found version 2018.05.09
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/youtube-dl -h’ got 0 exit code
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/youtube-dl --help’ got 0 exit code
- ran ‘/nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09/bin/youtube-dl --version’ and found version 2018.05.09
- found 2018.05.09 with grep in /nix/store/0shcgv9l70mwrzwsii5hgya7nx89j6w6-youtube-dl-2018.05.09
- directory tree listing: https://gist.github.com/e65e7afdbb0bcdbcf461cd2a77c6ad50
---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index d2e490373da0..19173de41e5f 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   pname = "youtube-dl";
-  version = "2018.05.01";
+  version = "2018.05.09";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1mpyqdyjip5a6nn8lj1kaaab4pj75js6i8qzgap8bmn0k46awb1n";
+    sha256 = "0sl4bi2jls3417rd62awbqdq1b6wskkjbfwpnyw4a61qarfxid1d";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8408c36da9e12067544df981c0f1481865f5525e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 10 May 2018 22:26:47 -0300
Subject: [PATCH 1568/3370] enlightenment: remove bashism from patch

---
 pkgs/desktops/enlightenment/enlightenment.suid-exes.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch b/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
index 7a89309c89ff..f53f6ffa7ca8 100644
--- a/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
+++ b/pkgs/desktops/enlightenment/enlightenment.suid-exes.patch
@@ -14,9 +14,9 @@
  for x in "$@" ; do
 -	chown root "$DESTDIR/$x"
 -	chmod a=rx,u+xs "$DESTDIR/$x"
-+	f="$DESTDIR/$x";
++	f="$DESTDIR$x";
 +	b=$(basename "$f".orig)
-+	mv -v "$f"{,.orig}
++	mv -v "$f" "$f".orig
 +	ln -sv /run/wrappers/bin/"$b" "$f"
 +	echo "    \"$b\".source = \"$f.orig\";" >> $w
  done

From a9ac651764341c8789ceac2d6b649cac7856679f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 21:07:28 -0500
Subject: [PATCH 1569/3370] libjpeg: always use libjpeg_turbo

libjpeg_turbo is consistently built on Darwin now. I have no way to
verify FreeBSD so if anyone can confirm libjpeg_turbo is still broken
please revert this!
---
 pkgs/development/libraries/libjpeg-turbo/default.nix | 3 ---
 pkgs/top-level/all-packages.nix                      | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index 4ec0e5ebd9f4..e4f70b792fd5 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
     description = "A faster (using SIMD) libjpeg implementation";
     license = licenses.ijg; # and some parts under other BSD-style licenses
     maintainers = [ maintainers.vcunat ];
-    # upstream supports darwin (and others), but it doesn't build currently
     platforms = platforms.all;
-    hydraPlatforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3a71edbb6bb..9ef98ef0e461 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10143,7 +10143,7 @@ with pkgs;
   libjpeg_original = callPackage ../development/libraries/libjpeg { };
   libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
   libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { };
-  libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin
+  libjpeg = libjpeg_turbo;
 
   libjreen = callPackage ../development/libraries/libjreen { };
 

From 4baafa9c16c856cf2a8a00e05f9909113e311f83 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Thu, 10 May 2018 23:38:22 +0200
Subject: [PATCH 1570/3370] backup (gem) : remove

It is not working since 18.03 and nobody than me seems to use it, because I couldn't find a package.
Also I'm not willing to continue maintaining this package.
---
 pkgs/tools/backup/backup/Gemfile      |  23 -
 pkgs/tools/backup/backup/Gemfile.lock | 276 ---------
 pkgs/tools/backup/backup/default.nix  |  19 -
 pkgs/tools/backup/backup/gemset.nix   | 778 --------------------------
 pkgs/top-level/all-packages.nix       |   2 -
 5 files changed, 1098 deletions(-)
 delete mode 100644 pkgs/tools/backup/backup/Gemfile
 delete mode 100644 pkgs/tools/backup/backup/Gemfile.lock
 delete mode 100644 pkgs/tools/backup/backup/default.nix
 delete mode 100644 pkgs/tools/backup/backup/gemset.nix

diff --git a/pkgs/tools/backup/backup/Gemfile b/pkgs/tools/backup/backup/Gemfile
deleted file mode 100644
index 2f1825b590ea..000000000000
--- a/pkgs/tools/backup/backup/Gemfile
+++ /dev/null
@@ -1,23 +0,0 @@
-source "https://rubygems.org"
-
-gem 'backup'
-gem 'thor'
-gem 'open4'
-gem 'fog'
-gem 'unf' 
-gem 'dropbox-sdk', '= 1.5.1' # patched
-gem 'net-ssh'
-gem 'net-scp'
-gem 'net-sftp'
-gem 'mail', '= 2.5.4' # patched
-gem 'pagerduty'
-gem 'twitter'
-gem 'hipchat'
-gem 'flowdock'
-gem 'json'
-gem 'dogapi'
-gem 'aws-ses'
-gem 'rspec'
-gem 'fuubar'
-gem 'mocha'
-gem 'timecop'
diff --git a/pkgs/tools/backup/backup/Gemfile.lock b/pkgs/tools/backup/backup/Gemfile.lock
deleted file mode 100644
index 0725ded8add0..000000000000
--- a/pkgs/tools/backup/backup/Gemfile.lock
+++ /dev/null
@@ -1,276 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    CFPropertyList (2.3.1)
-    addressable (2.3.5)
-    atomic (1.1.14)
-    aws-ses (0.5.0)
-      builder
-      mail (> 2.2.5)
-      mime-types
-      xml-simple
-    backup (4.2.2)
-      CFPropertyList (= 2.3.1)
-      addressable (= 2.3.5)
-      atomic (= 1.1.14)
-      aws-ses (= 0.5.0)
-      buftok (= 0.2.0)
-      builder (= 3.2.2)
-      descendants_tracker (= 0.0.3)
-      dogapi (= 1.11.0)
-      dropbox-sdk (= 1.5.1)
-      equalizer (= 0.0.9)
-      excon (= 0.44.4)
-      faraday (= 0.8.8)
-      fission (= 0.5.0)
-      flowdock (= 0.4.0)
-      fog (= 1.28.0)
-      fog-atmos (= 0.1.0)
-      fog-aws (= 0.1.1)
-      fog-brightbox (= 0.7.1)
-      fog-core (= 1.29.0)
-      fog-ecloud (= 0.0.2)
-      fog-json (= 1.0.0)
-      fog-profitbricks (= 0.0.2)
-      fog-radosgw (= 0.0.3)
-      fog-riakcs (= 0.1.0)
-      fog-sakuracloud (= 1.0.0)
-      fog-serverlove (= 0.1.1)
-      fog-softlayer (= 0.4.1)
-      fog-storm_on_demand (= 0.1.0)
-      fog-terremark (= 0.0.4)
-      fog-vmfusion (= 0.0.1)
-      fog-voxel (= 0.0.2)
-      fog-xml (= 0.1.1)
-      formatador (= 0.2.5)
-      hipchat (= 1.0.1)
-      http (= 0.5.0)
-      http_parser.rb (= 0.6.0)
-      httparty (= 0.12.0)
-      inflecto (= 0.0.2)
-      ipaddress (= 0.8.0)
-      json (= 1.8.2)
-      mail (= 2.5.4)
-      memoizable (= 0.4.0)
-      mime-types (= 1.25.1)
-      mini_portile (= 0.6.2)
-      multi_json (= 1.10.1)
-      multi_xml (= 0.5.5)
-      multipart-post (= 1.2.0)
-      net-scp (= 1.2.1)
-      net-sftp (= 2.1.2)
-      net-ssh (= 2.9.2)
-      nokogiri (= 1.6.6.2)
-      open4 (= 1.3.0)
-      pagerduty (= 2.0.0)
-      polyglot (= 0.3.3)
-      simple_oauth (= 0.2.0)
-      thor (= 0.18.1)
-      thread_safe (= 0.1.3)
-      treetop (= 1.4.15)
-      twitter (= 5.5.0)
-      unf (= 0.1.3)
-      unf_ext (= 0.0.6)
-      xml-simple (= 1.1.4)
-    buftok (0.2.0)
-    builder (3.2.2)
-    descendants_tracker (0.0.3)
-    diff-lcs (1.2.5)
-    dogapi (1.11.0)
-      json (>= 1.5.1)
-    dropbox-sdk (1.5.1)
-      json
-    equalizer (0.0.9)
-    excon (0.44.4)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    flowdock (0.4.0)
-      httparty (~> 0.7)
-      multi_json
-    fog (1.28.0)
-      fog-atmos
-      fog-aws (~> 0.0)
-      fog-brightbox (~> 0.4)
-      fog-core (~> 1.27, >= 1.27.3)
-      fog-ecloud
-      fog-json
-      fog-profitbricks
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      nokogiri (~> 1.5, >= 1.5.11)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (0.1.1)
-      fog-core (~> 1.27)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.7.1)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-core (1.29.0)
-      builder
-      excon (~> 0.38)
-      formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-    fog-ecloud (0.0.2)
-      fog-core
-      fog-xml
-    fog-json (1.0.0)
-      multi_json (~> 1.0)
-    fog-profitbricks (0.0.2)
-      fog-core
-      fog-xml
-      nokogiri
-    fog-radosgw (0.0.3)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.0.0)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.1)
-      fog-core
-      fog-json
-    fog-softlayer (0.4.1)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.0)
-      fog-core
-      fog-json
-    fog-terremark (0.0.4)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.0.1)
-      fission
-      fog-core
-    fog-voxel (0.0.2)
-      fog-core
-      fog-xml
-    fog-xml (0.1.1)
-      fog-core
-      nokogiri (~> 1.5, >= 1.5.11)
-    formatador (0.2.5)
-    fuubar (2.0.0)
-      rspec (~> 3.0)
-      ruby-progressbar (~> 1.4)
-    hipchat (1.0.1)
-      httparty
-    http (0.5.0)
-      http_parser.rb
-    http_parser.rb (0.6.0)
-    httparty (0.12.0)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
-    inflecto (0.0.2)
-    ipaddress (0.8.0)
-    json (1.8.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    memoizable (0.4.0)
-      thread_safe (~> 0.1.3)
-    metaclass (0.0.4)
-    mime-types (1.25.1)
-    mini_portile (0.6.2)
-    mocha (1.1.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.10.1)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    open4 (1.3.0)
-    pagerduty (2.0.0)
-      json (>= 1.7.7)
-    polyglot (0.3.3)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    ruby-progressbar (1.7.5)
-    simple_oauth (0.2.0)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
-    timecop (0.8.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    twitter (5.5.0)
-      addressable (~> 2.3)
-      buftok (~> 0.2.0)
-      descendants_tracker (~> 0.0.3)
-      equalizer (~> 0.0.9)
-      faraday (>= 0.8, < 0.10)
-      http (~> 0.5.0)
-      http_parser.rb (~> 0.6.0)
-      json (~> 1.8)
-      memoizable (~> 0.4.0)
-      simple_oauth (~> 0.2.0)
-    unf (0.1.3)
-      unf_ext
-    unf_ext (0.0.6)
-    xml-simple (1.1.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aws-ses
-  backup
-  dogapi
-  dropbox-sdk (= 1.5.1)
-  flowdock
-  fog
-  fuubar
-  hipchat
-  json
-  mail (= 2.5.4)
-  mocha
-  net-scp
-  net-sftp
-  net-ssh
-  open4
-  pagerduty
-  rspec
-  thor
-  timecop
-  twitter
-  unf
-
-BUNDLED WITH
-   1.10.6
diff --git a/pkgs/tools/backup/backup/default.nix b/pkgs/tools/backup/backup/default.nix
deleted file mode 100644
index 23affbb8af66..000000000000
--- a/pkgs/tools/backup/backup/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, lib, bundlerEnv, ruby, curl }:
-
-bundlerEnv {
-  name = "backup_v4";
-
-  inherit ruby;
-  gemdir = ./.;
-
-  buildInputs = [ curl ];
-
-  meta = with lib; {
-    broken = true; # need ruby 2.1
-    description = "Easy full stack backup operations on UNIX-like systems";
-    homepage    = http://backup.github.io/backup/v4/;
-    license     = licenses.mit;
-    maintainers = [ maintainers.mrVanDalo ];
-    platforms   = platforms.unix;
-  };
-}
diff --git a/pkgs/tools/backup/backup/gemset.nix b/pkgs/tools/backup/backup/gemset.nix
deleted file mode 100644
index e2de995996e1..000000000000
--- a/pkgs/tools/backup/backup/gemset.nix
+++ /dev/null
@@ -1,778 +0,0 @@
-{
-  "CFPropertyList" = {
-    version = "2.3.1";
-    source = {
-      type = "gem";
-      sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k";
-    };
-  };
-  "addressable" = {
-    version = "2.3.5";
-    source = {
-      type = "gem";
-      sha256 = "11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7";
-    };
-  };
-  "atomic" = {
-    version = "1.1.14";
-    source = {
-      type = "gem";
-      sha256 = "09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4";
-    };
-  };
-  "aws-ses" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "1kpfcdnakngypgkzn1f8cl8p4jg1rvmx3ag4ggcl0c7gs91ki8k3";
-    };
-    dependencies = [
-      "builder"
-      "mail"
-      "mime-types"
-      "xml-simple"
-    ];
-  };
-  "backup" = {
-    version = "4.2.2";
-    source = {
-      type = "gem";
-      sha256 = "0fj5jq6s1kpgp4bl1sr7qw1dgyc9zk0afh6mrfgbscg82irfxi1p";
-    };
-    dependencies = [
-      "CFPropertyList"
-      "addressable"
-      "atomic"
-      "aws-ses"
-      "buftok"
-      "builder"
-      "descendants_tracker"
-      "dogapi"
-      "dropbox-sdk"
-      "equalizer"
-      "excon"
-      "faraday"
-      "fission"
-      "flowdock"
-      "fog"
-      "fog-atmos"
-      "fog-aws"
-      "fog-brightbox"
-      "fog-core"
-      "fog-ecloud"
-      "fog-json"
-      "fog-profitbricks"
-      "fog-radosgw"
-      "fog-riakcs"
-      "fog-sakuracloud"
-      "fog-serverlove"
-      "fog-softlayer"
-      "fog-storm_on_demand"
-      "fog-terremark"
-      "fog-vmfusion"
-      "fog-voxel"
-      "fog-xml"
-      "formatador"
-      "hipchat"
-      "http"
-      "http_parser.rb"
-      "httparty"
-      "inflecto"
-      "ipaddress"
-      "json"
-      "mail"
-      "memoizable"
-      "mime-types"
-      "mini_portile"
-      "multi_json"
-      "multi_xml"
-      "multipart-post"
-      "net-scp"
-      "net-sftp"
-      "net-ssh"
-      "nokogiri"
-      "open4"
-      "pagerduty"
-      "polyglot"
-      "simple_oauth"
-      "thor"
-      "thread_safe"
-      "treetop"
-      "twitter"
-      "unf"
-      "unf_ext"
-      "xml-simple"
-    ];
-  };
-  "buftok" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1rzsy1vy50v55x9z0nivf23y0r9jkmq6i130xa75pq9i8qrn1mxs";
-    };
-  };
-  "builder" = {
-    version = "3.2.2";
-    source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "descendants_tracker" = {
-    version = "0.0.3";
-    source = {
-      type = "gem";
-      sha256 = "0819j80k85j62qjg90v8z8s3h4nf3v6afxxz73hl6iqxr2dhgmq1";
-    };
-  };
-  "diff-lcs" = {
-    version = "1.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
-    };
-  };
-  "dogapi" = {
-    version = "1.11.0";
-    source = {
-      type = "gem";
-      sha256 = "01v5jphxbqdn8h0pifgl97igcincd1pjwd177a80ig9fpwndd19d";
-    };
-    dependencies = [
-      "json"
-    ];
-  };
-  "dropbox-sdk" = {
-    version = "1.5.1";
-    source = {
-      type = "gem";
-      sha256 = "1zrzxzjfgwkdnn5vjvkhhjh10azyy28982hpkw5xv0kwrqg07axj";
-    };
-    dependencies = [
-      "json"
-    ];
-  };
-  "equalizer" = {
-    version = "0.0.9";
-    source = {
-      type = "gem";
-      sha256 = "1i6vfh2lzyrvvm35qa9cf3xh2gxj941x0v78pp0c7bwji3f5hawr";
-    };
-  };
-  "excon" = {
-    version = "0.44.4";
-    source = {
-      type = "gem";
-      sha256 = "062ynrdazix4w1lz6n8qgm3dasi2837sfn88ma96pbp4sk11gbp5";
-    };
-  };
-  "faraday" = {
-    version = "0.8.8";
-    source = {
-      type = "gem";
-      sha256 = "1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4";
-    };
-    dependencies = [
-      "multipart-post"
-    ];
-  };
-  "fission" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
-    };
-    dependencies = [
-      "CFPropertyList"
-    ];
-  };
-  "flowdock" = {
-    version = "0.4.0";
-    source = {
-      type = "gem";
-      sha256 = "1myza5n6wqk550ky3ld4np89cd491prndqy0l1fqsddxpap6pp60";
-    };
-    dependencies = [
-      "httparty"
-      "multi_json"
-    ];
-  };
-  "fog" = {
-    version = "1.28.0";
-    source = {
-      type = "gem";
-      sha256 = "12b03r77vdicbsc7j6by2gysm16wij32z65qp6bkrxkfba9yb37h";
-    };
-    dependencies = [
-      "fog-atmos"
-      "fog-aws"
-      "fog-brightbox"
-      "fog-core"
-      "fog-ecloud"
-      "fog-json"
-      "fog-profitbricks"
-      "fog-radosgw"
-      "fog-riakcs"
-      "fog-sakuracloud"
-      "fog-serverlove"
-      "fog-softlayer"
-      "fog-storm_on_demand"
-      "fog-terremark"
-      "fog-vmfusion"
-      "fog-voxel"
-      "fog-xml"
-      "ipaddress"
-      "nokogiri"
-    ];
-  };
-  "fog-atmos" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-aws" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "17a3sspf81bgvkrrrmwx7aci7fjy1m7b3w61ljc2mpqbafz80v7i";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-      "ipaddress"
-    ];
-  };
-  "fog-brightbox" = {
-    version = "0.7.1";
-    source = {
-      type = "gem";
-      sha256 = "1cpa92q2ls51gidxzn407x53f010k0hmrl94ipw7rdzdapp8c4cn";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "inflecto"
-    ];
-  };
-  "fog-core" = {
-    version = "1.29.0";
-    source = {
-      type = "gem";
-      sha256 = "0ayv9j3i7jy2d1l4gw6sfchgb8l62590a6fpvpr7qvdjc79mvm3p";
-    };
-    dependencies = [
-      "builder"
-      "excon"
-      "formatador"
-      "mime-types"
-      "net-scp"
-      "net-ssh"
-    ];
-  };
-  "fog-ecloud" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0lhxjp6gi48zanqmkblyhxjp0lknl1akifgfk5lq3j3vj2d3pnr8";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-json" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1517sm8bl0bmaw2fbaf5ra6midq3wzgkpm55lb9rw6jm5ys23lyw";
-    };
-    dependencies = [
-      "multi_json"
-    ];
-  };
-  "fog-profitbricks" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0hk290cw99qx727sxfhxlmczv9kv15hlnrflh00wfprqxk4r8rd4";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-      "nokogiri"
-    ];
-  };
-  "fog-radosgw" = {
-    version = "0.0.3";
-    source = {
-      type = "gem";
-      sha256 = "1fbpi0sfff5f5hrn4f7ish260cykzcqvzwmvm61i6mprfrfnx10r";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-riakcs" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-sakuracloud" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1805m44x2pclhjyvdrpj6zg8l9dldgnc20h0g61r7hqxpydz066x";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-serverlove" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "094plkkr6xiss8k85fp66g7z544kxgfx1ck0f3sqndk27miw26jk";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-softlayer" = {
-    version = "0.4.1";
-    source = {
-      type = "gem";
-      sha256 = "1cf6y6xxjjpjglz31kf6jmmyh687x7sxhn4bx3hlr1nb1hcy19sq";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-storm_on_demand" = {
-    version = "0.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0rrfv37x9y07lvdd03pbappb8ybvqb6g8rxzwvgy3mmbmbc6l6d2";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-terremark" = {
-    version = "0.0.4";
-    source = {
-      type = "gem";
-      sha256 = "0bxznlc904zaw3qaxhkvhqqbrv9n6nf5idih8ra9dihvacifwhvc";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-vmfusion" = {
-    version = "0.0.1";
-    source = {
-      type = "gem";
-      sha256 = "0x1vxc4a627g7ambcprhxiqvywy64li90145r96b2ig9z23hmy7g";
-    };
-    dependencies = [
-      "fission"
-      "fog-core"
-    ];
-  };
-  "fog-voxel" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0by7cs0c044b8dkcmcf3pjzydnrakj8pnbcxzhw8hwlgqr0jfqgn";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
-  };
-  "fog-xml" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "0kgxjwz0mzyp7bgj1ycl9jyfmzfqc1fjdz9sm57fgj5w31jfvxw5";
-    };
-    dependencies = [
-      "fog-core"
-      "nokogiri"
-    ];
-  };
-  "formatador" = {
-    version = "0.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
-    };
-  };
-  "fuubar" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv";
-    };
-    dependencies = [
-      "rspec"
-      "ruby-progressbar"
-    ];
-  };
-  "hipchat" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1khcb6cxrr1qn104rl87wq85anigykf45x7knxnyqfpwnbda2nh1";
-    };
-    dependencies = [
-      "httparty"
-    ];
-  };
-  "http" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "1vw10xxs0i7kn90lx3b2clfkm43nb59jjph902bafpsaarqsai8d";
-    };
-    dependencies = [
-      "http_parser.rb"
-    ];
-  };
-  "http_parser.rb" = {
-    version = "0.6.0";
-    source = {
-      type = "gem";
-      sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi";
-    };
-  };
-  "httparty" = {
-    version = "0.12.0";
-    source = {
-      type = "gem";
-      sha256 = "10y3znh7s1fx88lbnbsmyx5zri6jr1gi48zzzq89wir8q9zlp28c";
-    };
-    dependencies = [
-      "json"
-      "multi_xml"
-    ];
-  };
-  "inflecto" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
-    };
-  };
-  "ipaddress" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir";
-    };
-  };
-  "json" = {
-    version = "1.8.2";
-    source = {
-      type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
-    };
-  };
-  "mail" = {
-    version = "2.5.4";
-    source = {
-      type = "gem";
-      sha256 = "0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4";
-    };
-    dependencies = [
-      "mime-types"
-      "treetop"
-    ];
-  };
-  "memoizable" = {
-    version = "0.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0xhg8c9qw4y35qp1k8kv20snnxk6rlyilx354n1d72r0y10s7qcr";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "metaclass" = {
-    version = "0.0.4";
-    source = {
-      type = "gem";
-      sha256 = "0hp99y2b1nh0nr8pc398n3f8lakgci6pkrg4bf2b2211j1f6hsc5";
-    };
-  };
-  "mime-types" = {
-    version = "1.25.1";
-    source = {
-      type = "gem";
-      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
-    };
-  };
-  "mini_portile" = {
-    version = "0.6.2";
-    source = {
-      type = "gem";
-      sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w";
-    };
-  };
-  "mocha" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "107nmnngbv8lq2g7hbjpn5kplb4v2c8gs9lxrg6vs8gdbddkilzi";
-    };
-    dependencies = [
-      "metaclass"
-    ];
-  };
-  "multi_json" = {
-    version = "1.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c";
-    };
-  };
-  "multi_xml" = {
-    version = "0.5.5";
-    source = {
-      type = "gem";
-      sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8";
-    };
-  };
-  "multipart-post" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc";
-    };
-  };
-  "net-scp" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-sftp" = {
-    version = "2.1.2";
-    source = {
-      type = "gem";
-      sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-ssh" = {
-    version = "2.9.2";
-    source = {
-      type = "gem";
-      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
-    };
-  };
-  "nokogiri" = {
-    version = "1.6.6.2";
-    source = {
-      type = "gem";
-      sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30";
-    };
-    dependencies = [
-      "mini_portile"
-    ];
-  };
-  "open4" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "12jyp97p7pq29q1zmkdrhzvg5cg2x3hlfdbq6asnb9nqlkx6vhf2";
-    };
-  };
-  "pagerduty" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1ads8bj2swm3gbhr6193ls83pnwsy39xyh3i8sw6rl8fxfdf717v";
-    };
-    dependencies = [
-      "json"
-    ];
-  };
-  "polyglot" = {
-    version = "0.3.3";
-    source = {
-      type = "gem";
-      sha256 = "082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v";
-    };
-  };
-  "rspec" = {
-    version = "3.4.0";
-    source = {
-      type = "gem";
-      sha256 = "12axhz2nj2m0dy350lxym76m36m1hq48hc59mf00z9dajbpnj78s";
-    };
-    dependencies = [
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-    ];
-  };
-  "rspec-core" = {
-    version = "3.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0zl4fbrzl4gg2bn3fhv910q04sm2jvzdidmvd71gdgqwbzk0zngn";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-expectations" = {
-    version = "3.4.0";
-    source = {
-      type = "gem";
-      sha256 = "07pz570glwg87zpyagxxal0daa1jrnjkiksnn410s6846884fk8h";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-mocks" = {
-    version = "3.4.0";
-    source = {
-      type = "gem";
-      sha256 = "0iw9qvpawj3cfcg3xipi1v4y11g9q4f5lvmzgksn6f0chf97sjy1";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-support" = {
-    version = "3.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0l6zzlf22hn3pcwnxswsjsiwhqjg7a8mhvm680k5vq98307bkikr";
-    };
-  };
-  "ruby-progressbar" = {
-    version = "1.7.5";
-    source = {
-      type = "gem";
-      sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
-    };
-  };
-  "simple_oauth" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1vsjhxybif9r53jx4dhhwf80qjkg7gbwpfmskjqns223qrhwsxig";
-    };
-  };
-  "thor" = {
-    version = "0.18.1";
-    source = {
-      type = "gem";
-      sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3";
-    };
-  };
-  "thread_safe" = {
-    version = "0.1.3";
-    source = {
-      type = "gem";
-      sha256 = "0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq";
-    };
-    dependencies = [
-      "atomic"
-    ];
-  };
-  "timecop" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0zf46hkd36y2ywysjfgkvpcc5v04s2rwlg2k7k8j23bh7k8sgiqs";
-    };
-  };
-  "treetop" = {
-    version = "1.4.15";
-    source = {
-      type = "gem";
-      sha256 = "1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz";
-    };
-    dependencies = [
-      "polyglot"
-      "polyglot"
-    ];
-  };
-  "twitter" = {
-    version = "5.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0yl1im3s4svl4hxxsyc60mm7cxvwz538amc9y0vzw6lkiii5f197";
-    };
-    dependencies = [
-      "addressable"
-      "buftok"
-      "descendants_tracker"
-      "equalizer"
-      "faraday"
-      "http"
-      "http_parser.rb"
-      "json"
-      "memoizable"
-      "simple_oauth"
-    ];
-  };
-  "unf" = {
-    version = "0.1.3";
-    source = {
-      type = "gem";
-      sha256 = "1f2q8mxxngg8q608r6xajpharp9zz1ia3336y1lsg1asn2ach2sm";
-    };
-    dependencies = [
-      "unf_ext"
-    ];
-  };
-  "unf_ext" = {
-    version = "0.0.6";
-    source = {
-      type = "gem";
-      sha256 = "07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg";
-    };
-  };
-  "xml-simple" = {
-    version = "1.1.4";
-    source = {
-      type = "gem";
-      sha256 = "0x5c3mqhahh8hzqqq41659bxj0wn3n6bhj5p6b4hsia2k4akzg6s";
-    };
-  };
-}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e445747be11..d651b251e68e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -774,8 +774,6 @@ with pkgs;
 
   backblaze-b2 = python.pkgs.callPackage ../development/tools/backblaze-b2 { };
 
-  backup = callPackage ../tools/backup/backup { };
-
   bar = callPackage ../tools/system/bar {};
 
   base16-builder = callPackage ../misc/base16-builder { };

From eb2ba8ac0d86fbbc35ad2a4b3cd840318cb11533 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 10 May 2018 09:52:22 +0900
Subject: [PATCH 1571/3370] pythonPackages.configobj: enable tests

I found a bug in configobj and wanted to run the testsuite to confirm it
was a bugs rather than a nixos oddity. Now that tests work let's upstream it.
---
 .../python-modules/configobj/default.nix      | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix
index 98631b6920b3..dd2b26e0f591 100644
--- a/pkgs/development/python-modules/configobj/default.nix
+++ b/pkgs/development/python-modules/configobj/default.nix
@@ -1,19 +1,30 @@
-{ stdenv, buildPythonPackage, fetchPypi, six }:
+{ stdenv, buildPythonPackage
+, fetchFromGitHub
+, six
+, mock, pytest
+}:
 
 buildPythonPackage rec {
   pname = "configobj";
   version = "5.0.6";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2";
+  # Pypi archives don't contain the tests
+  src = fetchFromGitHub {
+    owner = "DiffSK";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0x97794nk3dfn0i3si9fv7y19jnpnarb34bkdwlz7ii7ag6xihhw";
   };
 
-  # error: invalid command 'test'
-  doCheck = false;
 
   propagatedBuildInputs = [ six ];
 
+  checkPhase = ''
+    pytest --deselect=tests/test_configobj.py::test_options_deprecation
+  '';
+
+  checkInputs = [ mock pytest ];
+
   meta = with stdenv.lib; {
     description = "Config file reading, writing and validation";
     homepage = https://pypi.python.org/pypi/configobj;

From 215dcb728547a8693fa458e3b554a458cce301e9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 2 Oct 2017 15:40:26 +0200
Subject: [PATCH 1572/3370] flatpak: init at 0.11.7

---
 .../development/libraries/flatpak/default.nix | 74 +++++++++++++++++++
 .../libraries/flatpak/fix-test-paths.patch    | 46 ++++++++++++
 .../respect-xml-catalog-files-var.patch       | 13 ++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 135 insertions(+)
 create mode 100644 pkgs/development/libraries/flatpak/default.nix
 create mode 100644 pkgs/development/libraries/flatpak/fix-test-paths.patch
 create mode 100644 pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
new file mode 100644
index 000000000000..f26dad3ce15e
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -0,0 +1,74 @@
+{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
+, gobjectIntrospection, gtk_doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc
+, bubblewrap, bzip2, dbus, glib, gpgme, json_glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
+, libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }:
+
+let
+  version = "0.11.7";
+  desktop_schemas = gnome3.gsettings_desktop_schemas;
+in stdenv.mkDerivation rec {
+  name = "flatpak-${version}";
+
+  outputs = [ "out" "man" "doc" "installedTests" ];
+
+  src = fetchurl {
+    url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
+    sha256 = "1vq4j7v68lp4fsvpas1bcsx1z4snpj0mkbq2mi00kx3jb48z768h";
+  };
+
+  patches = [
+    (substituteAll {
+      src = ./fix-test-paths.patch;
+      inherit coreutils python2 glibcLocales;
+      hicolorIconTheme = hicolor-icon-theme;
+    })
+    # patch taken from gtk_doc
+    ./respect-xml-catalog-files-var.patch
+  ];
+
+  nativeBuildInputs = [
+    autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobjectIntrospection
+    gtk_doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
+  ] ++ stdenv.lib.optionals doCheck checkInputs;
+
+  buildInputs = [
+    bubblewrap bzip2 dbus glib gpgme json_glib libarchive libcap libseccomp
+    libsoup lzma ostree polkit python3 systemd xlibs.libXau
+  ];
+
+  checkInputs = [ valgrind ];
+
+  doCheck = false; # TODO: some issues with temporary files
+
+  enableParallelBuilding = true;
+
+  configureFlags = [
+    "--with-system-bubblewrap=${bubblewrap}/bin/bwrap"
+    "--localstatedir=/var"
+    "--enable-installed-tests"
+  ];
+
+  makeFlags = [
+    "installed_testdir=$(installedTests)/libexec/installed-tests/flatpak"
+    "installed_test_metadir=$(installedTests)/share/installed-tests/flatpak"
+  ];
+
+  postPatch = ''
+    patchShebangs buildutil
+    patchShebangs tests
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/flatpak \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Linux application sandboxing and distribution framework";
+    homepage = https://flatpak.org/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
new file mode 100644
index 000000000000..e0734009420c
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -0,0 +1,46 @@
+--- a/tests/libtest.sh
++++ b/tests/libtest.sh
+@@ -322,7 +322,7 @@
+         # running installed-tests: assume we know what we're doing
+         :
+     elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
+-            --ro-bind / / /bin/true > bwrap-result 2>&1; then
++            --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then
+         sed -e 's/^/# /' < bwrap-result
+         echo "1..0 # SKIP Cannot run bwrap"
+         exit 0
+@@ -330,7 +330,7 @@
+ }
+ 
+ skip_without_python2 () {
+-    if ! test -f /usr/bin/python2 || ! /usr/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
++    if ! test -f @python2@/bin/python2 || ! @python2@/bin/python2 -c "import sys; sys.exit(0 if sys.version_info >= (2, 7) else 1)" ; then
+         echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support"
+         exit 0
+     fi
+@@ -350,12 +350,12 @@
+ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
+ DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
+ 
+-if ! /bin/kill -0 "$DBUS_SESSION_BUS_PID"; then
++if ! @coreutils@/bin/kill -0 "$DBUS_SESSION_BUS_PID"; then
+     assert_not_reached "Failed to start dbus-daemon"
+ fi
+ 
+ cleanup () {
+-    /bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}
++    @coreutils@/bin/kill $DBUS_SESSION_BUS_PID ${FLATPAK_HTTP_PID:-}
+     gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
+     fusermount -u $XDG_RUNTIME_DIR/doc || :
+     if test -n "${TEST_SKIP_CLEANUP:-}"; then
+--- a/tests/testlibrary.c
++++ b/tests/testlibrary.c
+@@ -378,7 +378,7 @@
+     {
+       gint exit_code = 0;
+       char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net",
+-          "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL };
++          "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL };
+       g_autofree char *argv_str = g_strjoinv (" ", argv);
+       g_test_message ("Spawning %s", argv_str);
+       g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);
diff --git a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
new file mode 100644
index 000000000000..0e259aebd8a5
--- /dev/null
+++ b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,8 +40,8 @@
+ [
+   AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+   AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+-  if $jh_found_xmlcatalog && \
+-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++  # empty argument forces libxml to use XML_CATALOG_FILES variable
++  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+     AC_MSG_RESULT([found])
+     ifelse([$3],,,[$3
+ ])dnl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfaa..cd2f4482922e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2297,6 +2297,8 @@ with pkgs;
 
   flashbench = callPackage ../os-specific/linux/flashbench { };
 
+  flatpak = callPackage ../development/libraries/flatpak { };
+
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };

From fe54e14cefbd88c939e07735f61f8dc9fd054a1e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 3 Oct 2017 01:19:20 +0200
Subject: [PATCH 1573/3370] xdg-desktop-portal: init at 0.11

---
 .../libraries/xdg-desktop-portal/default.nix  | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/xdg-desktop-portal/default.nix

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
new file mode 100644
index 000000000000..6721d5f00acb
--- /dev/null
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
+
+let
+  version = "0.11";
+in stdenv.mkDerivation rec {
+  name = "xdg-desktop-portal-${version}";
+
+  outputs = [ "out" "installedTests" ];
+
+  src = fetchFromGitHub {
+    owner = "flatpak";
+    repo = "xdg-desktop-portal";
+    rev = version;
+    sha256 = "06gipd51snvlp2jp68v2c8rwbsv36kjzg9xacm81n1w4b2dpz4g0";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];
+  buildInputs = [ glib pipewire fuse ];
+
+  doCheck = true;
+
+  configureFlags = [
+    "--enable-installed-tests"
+  ];
+
+  makeFlags = [
+    "installed_testdir=$(installedTests)/libexec/installed-tests/xdg-desktop-portal"
+    "installed_test_metadir=$(installedTests)/share/installed-tests/xdg-desktop-portal"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Desktop integration portals for sandboxed apps";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cd2f4482922e..272bb1441fd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18718,6 +18718,8 @@ with pkgs;
 
   xdaliclock = callPackage ../tools/misc/xdaliclock {};
 
+  xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
+
   xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
 
   xdg_utils = callPackage ../tools/X11/xdg-utils {

From 556c40c0e2e63b5f04a7f9f5d1af88a2fbfbcb3b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 31 Dec 2017 04:01:07 +0100
Subject: [PATCH 1574/3370] xdg-desktop-portal-gtk: init at 0.10

---
 .../xdg-desktop-portal-gtk/default.nix        | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix

diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
new file mode 100644
index 000000000000..720e394afc70
--- /dev/null
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:
+
+let
+  version = "0.11";
+in stdenv.mkDerivation rec {
+  name = "xdg-desktop-portal-gtk-${version}";
+
+  src = fetchFromGitHub {
+    owner = "flatpak";
+    repo = "xdg-desktop-portal-gtk";
+    rev = version;
+    sha256 = "03ysv29k7fp14hx0gakjigzzlniwicqd81nrhnc6w4pgin0y0zwg";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];
+  buildInputs = [ glib gtk3 ];
+
+  meta = with stdenv.lib; {
+    description = "Desktop integration portals for sandboxed apps";
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+    license = licenses.lgpl21;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 272bb1441fd7..51ac42970914 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18720,6 +18720,8 @@ with pkgs;
 
   xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
 
+  xdg-desktop-portal-gtk = callPackage ../development/libraries/xdg-desktop-portal-gtk { };
+
   xdg-user-dirs = callPackage ../tools/X11/xdg-user-dirs { };
 
   xdg_utils = callPackage ../tools/X11/xdg-utils {

From 2c591d6622a044b65067e771861e1c966eb04e20 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 21:10:34 -0700
Subject: [PATCH 1575/3370] virtualbox: 5.2.10 -> 5.2.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/virtualbox/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage -h’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage --help’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxManage help’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl -h’ got 0 exit code
- ran ‘/nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12/bin/VBoxBalloonCtrl --help’ got 0 exit code
- found 5.2.12 with grep in /nix/store/6769l9s88jlcv3qgxpjsfr1ybkq3yvvb-virtualbox-5.2.12
- directory tree listing: https://gist.github.com/f9bf852a0a8e6e0b4c44a9b68764850b
---
 pkgs/applications/virtualization/virtualbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index d09a30f98a74..6a3781d58ee0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -23,8 +23,8 @@ let
   # Do not forget to update the hash in ./guest-additions/default.nix!
   extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b";
   extpackRev = "122406";
-  main = "1k14ngz1gcz02qwbpzfp4kgxv8s24js8pwd5nyyqs6jpxx6557pd";
-  version = "5.2.10";
+  main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s";
+  version = "5.2.12";
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
   extensionPack = requireFile rec {

From 352f8cb6b6dd402107e7d26f4b2cba8c56b9818a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 20:07:11 -0500
Subject: [PATCH 1576/3370] retroarch: fix on macOS

---
 pkgs/misc/emulators/retroarch/default.nix | 36 +++++++++++++++++++++--
 pkgs/misc/emulators/retroarch/wrapper.nix |  4 +++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index e898a5804b06..c834f6c9047d 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -12,11 +12,20 @@
 , udev ? null
 , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null
 , withVulkan ? stdenv.isLinux, vulkan-loader ? null
+, targetPlatform, fetchurl
 }:
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
+let
+
+  # ibtool is closed source so we have to download the blob
+  osx-MainMenu = fetchurl {
+    url = "https://github.com/matthewbauer/RetroArch/raw/b146a9ac6b2b516652a7bf05a9db5a804eab323d/pkg/apple/OSX/en.lproj/MainMenu.nib";
+    sha256 = "13k1l628wy0rp6wxrpwr4g1m9c997d0q8ks50f8zhmh40l5j2sp8";
+  };
+
+in stdenv.mkDerivation rec {
   name = "retroarch-bare-${version}";
   version = "1.7.1";
 
@@ -39,8 +48,31 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = optional withVulkan ''
+  postInstall = optionalString withVulkan ''
     wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib
+  '' + optionalString targetPlatform.isDarwin ''
+    EXECUTABLE_NAME=RetroArch
+    PRODUCT_NAME=RetroArch
+    MACOSX_DEPLOYMENT_TARGET=10.5
+    app=$out/Applications/$PRODUCT_NAME.app
+
+    install -D pkg/apple/OSX/Info.plist $app/Contents/Info.plist
+    echo "APPL????" > $app/Contents/PkgInfo
+    mkdir -p $app/Contents/MacOS
+    ln -s $out/bin/retroarch $app/Contents/MacOS/$EXECUTABLE_NAME
+
+    # Hack to fill in Info.plist template w/o using xcode
+    sed -i -e 's,''${EXECUTABLE_NAME}'",$EXECUTABLE_NAME," \
+           -e 's,''${MACOSX_DEPLOYMENT_TARGET}'",$MACOSX_DEPLOYMENT_TARGET," \
+           -e 's,''${PRODUCT_NAME}'",$PRODUCT_NAME," \
+           -e 's,''${PRODUCT_NAME:rfc1034identifier}'",$PRODUCT_NAME," \
+           $app/Contents/Info.plist
+
+    install -D ${osx-MainMenu} \
+               $app/Contents/Resources/en.lproj/MainMenu.nib
+    install -D pkg/apple/OSX/en.lproj/InfoPlist.strings \
+               $app/Contents/Resources/en.lproj/InfoPlist.strings
+    install -D media/retroarch.icns $app/Contents/Resources/retroarch.icns
   '';
 
   preFixup = "rm $out/bin/retroarch-cg2glsl";
diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix
index 58d41699854c..71b26b4af6ff 100644
--- a/pkgs/misc/emulators/retroarch/wrapper.nix
+++ b/pkgs/misc/emulators/retroarch/wrapper.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation {
 
     ln -s -t $out ${retroarch}/share
 
+    if [ -d ${retroarch}/Applications ]; then
+      ln -s -t $out ${retroarch}/Applications
+    fi
+
     makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch \
       --suffix-each LD_LIBRARY_PATH ':' "$cores" \
       --add-flags "-L $out/lib/ --menu" \

From 4d141bd463ad39c3a783ce9bd725495ceab2a97c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 20:08:26 -0500
Subject: [PATCH 1577/3370] tests: move to attribute set

---
 pkgs/test/default.nix           | 26 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix | 26 ++------------------------
 2 files changed, 28 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/test/default.nix

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
new file mode 100644
index 000000000000..38f6cb8e564e
--- /dev/null
+++ b/pkgs/test/default.nix
@@ -0,0 +1,26 @@
+{ pkgs, callPackage }:
+
+with pkgs;
+
+{
+  cc-wrapper = callPackage ./cc-wrapper { };
+  cc-wrapper-gcc = callPackage ./cc-wrapper { stdenv = gccStdenv; };
+  cc-wrapper-gcc7 = callPackage ./cc-wrapper { stdenv = gcc7Stdenv; };
+  cc-wrapper-gcc8 = callPackage ./cc-wrapper { stdenv = gcc8Stdenv; };
+  cc-wrapper-clang = callPackage ./cc-wrapper { stdenv = llvmPackages.stdenv; };
+  cc-wrapper-libcxx = callPackage ./cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
+  cc-wrapper-clang-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.stdenv; };
+  cc-wrapper-libcxx-39 = callPackage ./cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; };
+  cc-wrapper-clang-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.stdenv; };
+  cc-wrapper-libcxx-4 = callPackage ./cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
+  cc-wrapper-clang-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.stdenv; };
+  cc-wrapper-libcxx-5 = callPackage ./cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
+  cc-wrapper-clang-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.stdenv; };
+  cc-wrapper-libcxx-6 = callPackage ./cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
+  stdenv-inputs = callPackage ./stdenv-inputs { };
+
+  cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
+  cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
+
+  macOSSierraShared = callPackage ./macos-sierra-shared {};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e445747be11..a83e4f5fa7eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -61,6 +61,8 @@ with pkgs;
     by Hydra.
   '';
 
+  tests = recurseIntoAttrs (callPackages ../test {});
+
   ### Nixpkgs maintainer tools
 
   nix-generate-from-cpan = callPackage ../../maintainers/scripts/nix-generate-from-cpan.nix { };
@@ -21470,30 +21472,6 @@ with pkgs;
 
   openfst = callPackage ../development/libraries/openfst {};
 
-  # `recurseIntoAttrs` for sake of hydra, not nix-env
-  tests = recurseIntoAttrs {
-    cc-wrapper = callPackage ../test/cc-wrapper { };
-    cc-wrapper-gcc = callPackage ../test/cc-wrapper { stdenv = gccStdenv; };
-    cc-wrapper-gcc7 = callPackage ../test/cc-wrapper { stdenv = gcc7Stdenv; };
-    cc-wrapper-gcc8 = callPackage ../test/cc-wrapper { stdenv = gcc8Stdenv; };
-    cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = llvmPackages.stdenv; };
-    cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = llvmPackages.libcxxStdenv; };
-    cc-wrapper-clang-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.stdenv; };
-    cc-wrapper-libcxx-39 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_39.libcxxStdenv; };
-    cc-wrapper-clang-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.stdenv; };
-    cc-wrapper-libcxx-4 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_4.libcxxStdenv; };
-    cc-wrapper-clang-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.stdenv; };
-    cc-wrapper-libcxx-5 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_5.libcxxStdenv; };
-    cc-wrapper-clang-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.stdenv; };
-    cc-wrapper-libcxx-6 = callPackage ../test/cc-wrapper { stdenv = llvmPackages_6.libcxxStdenv; };
-    stdenv-inputs = callPackage ../test/stdenv-inputs { };
-
-    cc-multilib-gcc = callPackage ../test/cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
-    cc-multilib-clang = callPackage ../test/cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
-
-    macOSSierraShared = callPackage ../test/macos-sierra-shared {};
-  };
-
   duti = callPackage ../os-specific/darwin/duti {};
 
   dnstracer = callPackage ../tools/networking/dnstracer {

From a0ab41ca96cc632ee8f840e66a27101e73683db2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 20:10:06 -0500
Subject: [PATCH 1578/3370] release: disable
 tests.cc-wrapper-gcc8.x86_64-darwin

This test is broken because gcc8.x86_64-darwin is broken. Please add
the test back in once we have fixed it!

Job: https://hydra.nixos.org/job/nixpkgs/trunk/gcc8.x86_64-darwin
Issue: #40038
---
 pkgs/top-level/release.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 5233051cad83..efced59ad91b 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -110,7 +110,10 @@ let
               jobs.tests.cc-wrapper-gcc7.x86_64-linux
               jobs.tests.cc-wrapper-gcc7.x86_64-darwin
               jobs.tests.cc-wrapper-gcc8.x86_64-linux
-              jobs.tests.cc-wrapper-gcc8.x86_64-darwin
+
+              # broken see issue #40038
+              # jobs.tests.cc-wrapper-gcc8.x86_64-darwin
+
               jobs.tests.cc-wrapper-clang.x86_64-linux
               jobs.tests.cc-wrapper-clang.x86_64-darwin
               jobs.tests.cc-wrapper-libcxx.x86_64-linux

From b45552c35aea6e2cd3ef1edb877574fcec191859 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 23:54:38 -0500
Subject: [PATCH 1579/3370] fmod: supports darwin

---
 pkgs/games/zandronum/fmod.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix
index 7f76101d8ce1..2c53d93e4011 100644
--- a/pkgs/games/zandronum/fmod.nix
+++ b/pkgs/games/zandronum/fmod.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, alsaLib, libpulseaudio }:
+{ stdenv, lib, fetchurl, alsaLib, libpulseaudio, undmg }:
 
 let
   bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64";
@@ -8,20 +8,30 @@ in
 stdenv.mkDerivation rec {
   name = "fmod-${version}";
   version = "4.44.64";
+  shortVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
-  src = fetchurl {
-    url = "https://zdoom.org/files/fmod/fmodapi44464linux.tar.gz";
+  src = fetchurl (if stdenv.isLinux then {
+    url = "https://zdoom.org/files/fmod/fmodapi${shortVersion}linux.tar.gz";
     sha256 = "047hk92xapwwqj281f4zwl0ih821rrliya70gfj82sdfjh9lz8i1";
-  };
+  } else {
+    url = "https://zdoom.org/files/fmod/fmodapi${shortVersion}mac-installer.dmg";
+    sha256 = "1m1y4cpcwpkl8x31d3s68xzp107f343ma09w2437i2adn5y7m8ii";
+  });
+
+  nativeBuildInputs = [ undmg ];
 
   dontStrip = true;
   dontPatchELF = true;
   dontBuild = true;
 
-  installPhase = ''
+  installPhase = lib.optionalString stdenv.isLinux ''
     install -Dm755 api/lib/libfmodex${bits}-${version}.so $out/lib/libfmodex-${version}.so
     ln -s libfmodex-${version}.so $out/lib/libfmodex.so
     patchelf --set-rpath ${libPath} $out/lib/libfmodex.so
+  '' + lib.optionalString stdenv.isDarwin ''
+    install -D api/lib/libfmodex.dylib $out/lib/libfmodex.dylib
+    install -D api/lib/libfmodexL.dylib $out/lib/libfmodexL.dylib
+  '' + ''
     cp -r api/inc $out/include
   '';
 
@@ -29,7 +39,7 @@ stdenv.mkDerivation rec {
     description = "Programming library and toolkit for the creation and playback of interactive audio";
     homepage    = http://www.fmod.org/;
     license     = licenses.unfreeRedistributable;
-    platforms   = [ "x86_64-linux" "i686-linux" ];
+    platforms   = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
     maintainers = [ maintainers.lassulus ];
   };
 }

From 236b89afebaf55a09c7ec3bea6136871c4d03884 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 10 May 2018 23:55:06 -0500
Subject: [PATCH 1580/3370] dwarf-fortress: supports darwin

---
 pkgs/games/dwarf-fortress/default.nix         |  6 +-
 pkgs/games/dwarf-fortress/game.nix            | 80 ++++++++++++++-----
 pkgs/games/dwarf-fortress/wrapper/default.nix |  2 +
 .../wrapper/dwarf-fortress-init.in            |  1 +
 .../dwarf-fortress/wrapper/dwarf-fortress.in  |  5 +-
 5 files changed, 69 insertions(+), 25 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index c759c4c60dae..82710256c631 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, pkgsi686Linux }:
+{ pkgs, pkgsi686Linux, stdenv }:
 
 let
   callPackage = pkgs.newScope self;
@@ -13,7 +13,9 @@ let
 
     soundSense = callPackage ./soundsense.nix { };
 
-    dwarf-fortress-unfuck = callPackage ./unfuck.nix { };
+    # unfuck is linux-only right now, we will just use it there
+    dwarf-fortress-unfuck = if stdenv.isLinux then callPackage ./unfuck.nix { }
+                                              else null;
 
     dwarf-fortress = callPackage ./wrapper {
       themes = {
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 79dd46c21919..2dbe8ba098b4 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -1,57 +1,93 @@
 { stdenv, lib, fetchurl
 , SDL, dwarf-fortress-unfuck
+
+# Our own "unfuck" libs for macOS
+, ncurses, fmodex, gcc
 }:
 
+with lib;
+
 let
   baseVersion = "44";
-  patchVersion = "09";
+  patchVersion = "10";
   dfVersion = "0.${baseVersion}.${patchVersion}";
-  libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
-  platform =
-    if stdenv.system == "x86_64-linux" then "linux"
-    else if stdenv.system == "i686-linux" then "linux32"
-    else throw "Unsupported platform";
-  sha256 =
-    if stdenv.system == "x86_64-linux" then "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy"
-    else if stdenv.system == "i686-linux" then "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8"
-    else throw "Unsupported platform";
+
+  libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
+
+  homepage = http://www.bay12games.com/dwarves/;
+
+  # Other srcs are avilable like 32-bit mac & win, but I have only
+  # included the ones most likely to be needed by Nixpkgs users.
+  srcs = {
+    "x86_64-linux" = fetchurl {
+      url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
+      sha256 = "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy";
+    };
+    "i686-linux" = fetchurl {
+      url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
+      sha256 = "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8";
+    };
+    "x86_64-darwin" = fetchurl {
+      url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
+      sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g";
+    };
+  };
 
 in
 
-assert dwarf-fortress-unfuck.dfVersion == dfVersion;
+assert dwarf-fortress-unfuck != null ->
+       dwarf-fortress-unfuck.dfVersion == dfVersion;
 
 stdenv.mkDerivation {
   name = "dwarf-fortress-original-${dfVersion}";
 
-  src = fetchurl {
-    url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_${platform}.tar.bz2";
-    inherit sha256;
-  };
+  src = if builtins.hasAttr stdenv.system srcs
+        then builtins.getAttr stdenv.system srcs
+        else throw "Unsupported systems";
 
   installPhase = ''
     mkdir -p $out
     cp -r * $out
     rm $out/libs/lib*
 
-    # Store the original hash
-    md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }' > $out/hash.md5.orig
+    exe=$out/${if stdenv.isLinux then "libs/Dwarf_Fortress"
+                                 else "dwarfort.exe"}
 
+    # Store the original hash
+    md5sum $exe | awk '{ print $1 }' > $out/hash.md5.orig
+  '' + optionalString stdenv.isLinux ''
     patchelf \
       --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
       --set-rpath "${libpath}" \
-      $out/libs/Dwarf_Fortress
+      $exe
+  '' + optionalString stdenv.isDarwin ''
+    # My custom unfucked dwarfort.exe for macOS. Can't use
+    # absolute paths because original doesn't have enough
+    # header space. Someone plz break into Tarn's house & put
+    # -headerpad_max_install_names into his LDFLAGS.
 
+    ln -s ${getLib ncurses}/lib/libncurses.dylib $out/libs
+    ln -s ${getLib gcc.cc}/lib/libstdc++.6.dylib $out/libs
+    ln -s ${getLib fmodex}/lib/libfmodex.dylib $out/libs
+
+    install_name_tool \
+      -change /usr/lib/libncurses.5.4.dylib \
+              @executable_path/libs/libncurses.dylib \
+      -change /usr/local/lib/x86_64/libstdc++.6.dylib \
+              @executable_path/libs/libstdc++.6.dylib \
+      $exe
+  '' + ''
     # Store the new hash
-    md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }' > $out/hash.md5
+    md5sum $exe | awk '{ print $1 }' > $out/hash.md5
   '';
 
   passthru = { inherit baseVersion patchVersion dfVersion; };
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "A single-player fantasy game with a randomly generated adventure world";
-    homepage = http://www.bay12games.com/dwarves;
+    inherit homepage;
     license = licenses.unfreeRedistributable;
-    platforms = platforms.linux;
+    platforms = attrNames srcs;
     maintainers = with maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
   };
 }
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 3d904d006e46..e82cc2be680d 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -47,6 +47,8 @@ stdenv.mkDerivation rec {
     name = "dwarf-fortress-init";
     src = ./dwarf-fortress-init.in;
     inherit env;
+    exe = if stdenv.isLinux then "libs/Dwarf_Fortress"
+                             else "dwarfort.exe";
   };
 
   runDF = ./dwarf-fortress.in;
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
index 093dae562c24..054935af012e 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
@@ -2,6 +2,7 @@ shopt -s extglob
 
 [ -z "$DF_DIR" ] && DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux"
 env_dir="@env@"
+exe="$env_dir/@exe@"
 
 update_path() {
   local path="$1"
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
index f405f1b0e393..4448bd05fda5 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
@@ -2,5 +2,8 @@
 
 source @dfInit@
 
+export DYLD_LIBRARY_PATH="$env_dir/libs"
+export DYLD_FRAMEWORK_PATH="$env_dir/libs"
+
 cd "$DF_DIR"
-exec "$env_dir/libs/Dwarf_Fortress" "$@"
+exec "$exe" "$@"

From 2dc883159162f9c1d198092cfd4ccb62904bd36a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 00:00:40 -0500
Subject: [PATCH 1581/3370] dwarf-fortress: revert to 44.09

Was at 44.10 but i have no way to test it on linux (and unsure how to
update dwarf-fortress-unfucked).
---
 pkgs/games/dwarf-fortress/game.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 2dbe8ba098b4..79eb6e191329 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -9,7 +9,7 @@ with lib;
 
 let
   baseVersion = "44";
-  patchVersion = "10";
+  patchVersion = "09";
   dfVersion = "0.${baseVersion}.${patchVersion}";
 
   libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
@@ -29,7 +29,7 @@ let
     };
     "x86_64-darwin" = fetchurl {
       url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
-      sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g";
+      sha256 = "01dss8g9lmi8majp6lxcfw166ydz4himkz6am5pi29gixaf4vfqs";
     };
   };
 

From 14a9c7bc1d9ff4b974c455d28058ccab3b6851ec Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 21:45:45 -0700
Subject: [PATCH 1582/3370] wesnoth: 1.14.0 -> 1.14.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wesnoth/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnoth -h’ got 0 exit code
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnoth --help’ got 0 exit code
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnothd -h’ got 0 exit code
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnothd --help’ got 0 exit code
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnothd -V’ and found version 1.14.1
- ran ‘/nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1/bin/wesnothd --version’ and found version 1.14.1
- found 1.14.1 with grep in /nix/store/rzsmm117p5z6094z5k1ndc1v9pzms2gn-wesnoth-1.14.1
- directory tree listing: https://gist.github.com/8868591a076d925d789cd1cfb562344c
---
 pkgs/games/wesnoth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 81ffd6b135fc..4a3d2bd78a0b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.14.0";
+  version = "1.14.1";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "09niq53y17faizhmd98anx3dha7hvacvj9a0a64lg8wn915cm0bw";
+    sha256 = "1mzrnbv71b4s41c5x8clhb53l8lidiwzny1hl828228pvys5bxkb";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From cbbd556473c40b4094e865d92c38eb9acfef6383 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:07:10 -0700
Subject: [PATCH 1583/3370] sleuthkit: 4.6.0 -> 4.6.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sleuthkit/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/img_cat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/img_stat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/mmls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/mmstat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/mmcat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/blkcalc -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/blkcat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/blkls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/blkstat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/ffind -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/fls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/fcat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/fsstat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/icat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/ifind -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/ils -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/istat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jcat -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/usnjls -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/hfind -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/srch_strings -h’ got 0 exit code
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/sigfind -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/tsk_recover -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/tsk_loaddb -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/tsk_comparedir -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/tsk_gettimes -V’ and found version 4.6.1
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/fiwalk help’ got 0 exit code
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jpeg_extract -h’ got 0 exit code
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jpeg_extract --help’ got 0 exit code
- ran ‘/nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1/bin/jpeg_extract help’ got 0 exit code
- found 4.6.1 with grep in /nix/store/pc0f17b5r90g2xvf1yqp2cs44hzgmwzb-sleuthkit-4.6.1
- directory tree listing: https://gist.github.com/11dd945b5f40cfc632e6fca6df6a6600
---
 pkgs/tools/system/sleuthkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix
index 616498593972..ad16746a2666 100644
--- a/pkgs/tools/system/sleuthkit/default.nix
+++ b/pkgs/tools/system/sleuthkit/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, autoreconfHook, libewf, afflib, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "4.6.0";
+  version = "4.6.1";
   name = "sleuthkit-${version}";
 
   src = fetchFromGitHub {
     owner = "sleuthkit";
     repo = "sleuthkit";
     rev = name;
-    sha256 = "0m5ll5sx0pxkn58y582b3v90rsfdrh8dm02kmv61psd0k6q0p91x";
+    sha256 = "1hf783mwa5ws9qvjpj6zgvivi0cfhs8r8m1869ajz5m80lv8fggw";
   };
 
   postPatch = ''

From 35a3194e7f6bd965f72660e83f468a092d4e6ac4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:19:05 -0700
Subject: [PATCH 1584/3370] scowl: 2017.08.24 -> 2018.04.16

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/scowl/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2018.04.16 with grep in /nix/store/amyjmpkyvsn53x3fac7b01mwyi9jl30i-scowl-2018.04.16
- directory tree listing: https://gist.github.com/e67c69e3e02df834f3b040f36b261c13
---
 pkgs/data/misc/scowl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix
index e54dc3fa9feb..c90b8aa7e37d 100644
--- a/pkgs/data/misc/scowl/default.nix
+++ b/pkgs/data/misc/scowl/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "scowl";
-  version = "2017.08.24";
+  version = "2018.04.16";
 
   src = fetchFromGitHub {
     owner = "en-wl";
     repo = "wordlist";
     rev = "rel-${version}";
-    sha256 = "16mgk6scbw8i38g63kh60bsnzgzfs8gvvz2n5jh4x5didbwly8nz";
+    sha256 = "0p0hgg5y88bb802z210cdk1c4fjwlpxxkci6yph3fk7g6s9xc73g";
   };
 
   postPatch = ''

From d12afa66427d83a5f9d7dc26b16831c6bbb6ced6 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 10 May 2018 09:44:08 +0200
Subject: [PATCH 1585/3370] googleearth: init at 7.1.8.3036

---
 nixos/doc/manual/release-notes/rl-1809.xml    |  6 --
 .../applications/misc/googleearth/default.nix | 97 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/misc/googleearth/default.nix

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index e10827d5db22..fd998b1b3183 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -101,12 +101,6 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
     </para>
    </listitem>
-   <listitem>
-    <para>
-     <literal>googleearth</literal> has been removed from Nixpkgs. Google does not provide
-     a stable URL for Nixpkgs to use to package this proprietary software.
-    </para>
-   </listitem>
    <listitem>
     <para>
      <literal>gnucash</literal> has changed from version 2.4 to 3.x.
diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix
new file mode 100644
index 000000000000..c77f8658220b
--- /dev/null
+++ b/pkgs/applications/misc/googleearth/default.nix
@@ -0,0 +1,97 @@
+{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
+, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
+, zlib, fontconfig, dpkg, libproxy, libxml2, gstreamer, gst_all_1, dbus }:
+
+let
+  arch =
+    if stdenv.system == "x86_64-linux" then "amd64"
+    else if stdenv.system == "i686-linux" then "i386"
+    else throw "Unsupported system ${stdenv.system}";
+  sha256 =
+    if arch == "amd64"
+    then "0dwnppn5snl5bwkdrgj4cyylnhngi0g66fn2k41j3dvis83x24k6"
+    else "0gndbxrj3kgc2dhjqwjifr3cl85hgpm695z0wi01wvwzhrjqs0l2";
+  version = "7.1.8.3036";
+  fullPath = stdenv.lib.makeLibraryPath [
+    glibc
+    glib
+    stdenv.cc.cc
+    libSM
+    libICE
+    libXi
+    libXv
+    libGLU_combined
+    libXrender
+    libXrandr
+    libXfixes
+    libXcursor
+    libXinerama
+    freetype
+    libXext
+    libX11
+    zlib
+    fontconfig
+    libproxy
+    libxml2
+    gstreamer
+    dbus
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+  ];
+in
+stdenv.mkDerivation rec {
+  name = "googleearth-${version}";
+  src = fetchurl {
+    url = "https://dl.google.com/linux/earth/deb/pool/main/g/google-earth-stable/google-earth-stable_${version}-r0_${arch}.deb";
+    inherit sha256;
+  };
+
+  phases = [ "unpackPhase" "installPhase" "checkPhase" ];
+
+  doCheck = true;
+
+  buildInputs = [ dpkg ];
+
+  unpackPhase = ''
+    dpkg-deb -x ${src} ./
+  '';
+
+  installPhase =''
+    mkdir $out
+    mv usr/* $out/
+    rmdir usr
+    mv * $out/
+    rm $out/bin/google-earth $out/opt/google/earth/free/googleearth
+
+    # patch and link googleearth binary
+    ln -s $out/opt/google/earth/free/googleearth-bin $out/bin/googleearth
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${fullPath}:\$ORIGIN" \
+      $out/opt/google/earth/free/googleearth-bin
+
+    # patch and link gpsbabel binary
+    ln -s $out/opt/google/earth/free/gpsbabel $out/bin/gpsbabel
+    patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${fullPath}:\$ORIGIN" \
+      $out/opt/google/earth/free/gpsbabel
+
+    # patch libraries
+    for a in $out/opt/google/earth/free/*.so* ; do
+      patchelf --set-rpath "${fullPath}:\$ORIGIN" $a
+    done
+  '';
+
+  checkPhase = ''
+    $out/bin/gpsbabel -V > /dev/null
+  '';
+
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    description = "A world sphere viewer";
+    homepage = http://earth.google.com;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ markus1189 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a83e4f5fa7eb..afd339f6fd20 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16181,6 +16181,8 @@ with pkgs;
 
   gollum = callPackage ../applications/misc/gollum { };
 
+  googleearth = callPackage ../applications/misc/googleearth { };
+
   google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; };
 
   google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; };

From 83b3e6d705e73d8bb9bbd7bc17a7c68d3f5b47bb Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 11 May 2018 12:25:30 +0300
Subject: [PATCH 1586/3370] kernel: Drop bitrotted MIPS patches

Not a single one of these applies to even 4.4 anymore, so these have
clearly bitrotted a long, long time ago.
---
 .../linux/kernel/mips-ext3-n32.patch          |  17 -
 .../linux/kernel/mips-fpu-sigill.patch        | 507 ------------------
 .../linux/kernel/mips-fpureg-emulation.patch  | 144 -----
 pkgs/os-specific/linux/kernel/patches.nix     |  15 -
 pkgs/top-level/all-packages.nix               |  34 --
 5 files changed, 717 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/mips-ext3-n32.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch

diff --git a/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch b/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch
deleted file mode 100644
index fcb6f9177c7d..000000000000
--- a/pkgs/os-specific/linux/kernel/mips-ext3-n32.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Dirty patch that makes ext3 work again on 3.5 and 3.6 kernels,
-on mips n32.
-
-http://www.linux-mips.org/archives/linux-mips/2012-11/msg00030.html
-
-diff --git a/fs/ext3/dir.c b/fs/ext3/dir.c
-index 92490e9..bf63d7b 100644
---- a/fs/ext3/dir.c
-+++ b/fs/ext3/dir.c
-@@ -228,6 +228,7 @@ out:
- 
- static inline int is_32bit_api(void)
- {
-+	return 1;
- #ifdef CONFIG_COMPAT
- 	return is_compat_task();
- #else
diff --git a/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch b/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch
deleted file mode 100644
index 248aba2b2c20..000000000000
--- a/pkgs/os-specific/linux/kernel/mips-fpu-sigill.patch
+++ /dev/null
@@ -1,507 +0,0 @@
-From bf55ef4e3c2f622ac013f196affbd11b67b59223 Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw@netris.org>
-Date: Fri, 28 Oct 2011 13:24:37 -0400
-Subject: [PATCH 2/4] Fix handling of prefx instruction in mips/math-emu
-
-* The instruction is named prefx, not pfetch, and its function
-  field is 0x17, not 0x07.
-
-* Recognize the prefx instruction regardless of what bits happen to be
-  in bits 21-25, which is the format field of the floating-point ops,
-  but holds the base register of the prefx instruction.
----
- arch/mips/include/asm/inst.h |    4 ++--
- arch/mips/math-emu/cp1emu.c  |   16 +++++++---------
- 2 files changed, 9 insertions(+), 11 deletions(-)
-
-diff --git a/arch/mips/include/asm/inst.h b/arch/mips/include/asm/inst.h
-index ab84064..3048edc 100644
---- a/arch/mips/include/asm/inst.h
-+++ b/arch/mips/include/asm/inst.h
-@@ -161,8 +161,8 @@ enum cop1_sdw_func {
-  */
- enum cop1x_func {
- 	lwxc1_op     =  0x00, ldxc1_op     =  0x01,
--	pfetch_op    =  0x07, swxc1_op     =  0x08,
--	sdxc1_op     =  0x09, madd_s_op    =  0x20,
-+	swxc1_op     =  0x08, sdxc1_op     =  0x09,
-+	prefx_op     =  0x17, madd_s_op    =  0x20,
- 	madd_d_op    =  0x21, madd_e_op    =  0x22,
- 	msub_s_op    =  0x28, msub_d_op    =  0x29,
- 	msub_e_op    =  0x2a, nmadd_s_op   =  0x30,
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index dbf2f93..87ddba1 100644
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -739,7 +739,7 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 			break;
- 
- 		default:
--			return SIGILL;
-+			goto SIGILL_unless_prefx_op;
- 		}
- 		break;
- 	}
-@@ -809,19 +809,17 @@ static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 			goto copcsr;
- 
- 		default:
--			return SIGILL;
-+			goto SIGILL_unless_prefx_op;
- 		}
- 		break;
- 	}
- 
--	case 0x7:		/* 7 */
--		if (MIPSInst_FUNC(ir) != pfetch_op) {
--			return SIGILL;
--		}
--		/* ignore prefx operation */
--		break;
--
- 	default:
-+	      SIGILL_unless_prefx_op:
-+		if (MIPSInst_FUNC(ir) == prefx_op) {
-+			/* ignore prefx operation */
-+			break;
-+		}
- 		return SIGILL;
- 	}
- 
--- 
-1.7.5.4
-
-From 97a564e3eddbfb84844b8eccb3bd751c71dfb3eb Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw@netris.org>
-Date: Fri, 28 Oct 2011 13:35:27 -0400
-Subject: [PATCH 3/4] Don't process empty cause flags after simple fp move on
- mips
-
----
- arch/mips/math-emu/cp1emu.c |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index 87ddba1..fefcba2 100644
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -912,7 +912,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		case fmov_op:
- 			/* an easy one */
- 			SPFROMREG(rv.s, MIPSInst_FS(ir));
--			goto copcsr;
-+			break;
- 
- 			/* binary op on handler */
- 		      scopbop:
-@@ -1099,7 +1099,7 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		case fmov_op:
- 			/* an easy one */
- 			DPFROMREG(rv.d, MIPSInst_FS(ir));
--			goto copcsr;
-+			break;
- 
- 			/* binary op on handler */
- 		      dcopbop:{
--- 
-1.7.5.4
-
-From 4051727b3007ef3675e7258ed86fa8517f86d929 Mon Sep 17 00:00:00 2001
-From: Mark H Weaver <mhw@netris.org>
-Date: Fri, 28 Oct 2011 13:39:10 -0400
-Subject: [PATCH 4/4] Support Loongson2f floating-point instructions in
- mips/math-emu
-
-* (arch/mips/include/asm/inst.h): Add Loongson2f function field values
-  for madd/msub/nmadd/nmsub that use the spec2 opcode, and the
-  Loongson2f/MIPS-5 format field value for paired-single
-  floating-point operations.
-
-* (arch/mips/math-emu/cp1emu.c): Add support for the Loongson2f
-  instructions for madd/msub/nmadd/nmsub, which use the spec2 opcode.
-  Also add support for the Loongson2f instructions that use the
-  paired-single floating-point format.
----
- arch/mips/include/asm/inst.h |    4 +-
- arch/mips/math-emu/cp1emu.c  |  287 +++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 289 insertions(+), 2 deletions(-)
-
-diff --git a/arch/mips/include/asm/inst.h b/arch/mips/include/asm/inst.h
-index 3048edc..0e8ba7c 100644
---- a/arch/mips/include/asm/inst.h
-+++ b/arch/mips/include/asm/inst.h
-@@ -61,6 +61,8 @@ enum spec_op {
- enum spec2_op {
- 	madd_op, maddu_op, mul_op, spec2_3_unused_op,
- 	msub_op, msubu_op, /* more unused ops */
-+	loongson_madd_op = 0x18, loongson_msub_op,
-+	loongson_nmadd_op, loongson_nmsub_op,
- 	clz_op = 0x20, clo_op,
- 	dclz_op = 0x24, dclo_op,
- 	sdbpp_op = 0x3f
-@@ -133,7 +135,7 @@ enum cop0_com_func {
-  */
- enum cop1_fmt {
- 	s_fmt, d_fmt, e_fmt, q_fmt,
--	w_fmt, l_fmt
-+	w_fmt, l_fmt, ps_fmt
- };
- 
- /*
-diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
-index fefcba2..166b2a4 100644
---- a/arch/mips/math-emu/cp1emu.c
-+++ b/arch/mips/math-emu/cp1emu.c
-@@ -7,6 +7,9 @@
-  * Kevin D. Kissell, kevink@mips.com and Carsten Langgaard, carstenl@mips.com
-  * Copyright (C) 2000  MIPS Technologies, Inc.
-  *
-+ * Loongson instruction support
-+ * Copyright (C) 2011  Mark H Weaver <mhw@netris.org>
-+ *
-  *  This program is free software; you can distribute it and/or modify it
-  *  under the terms of the GNU General Public License (Version 2) as
-  *  published by the Free Software Foundation.
-@@ -57,6 +60,14 @@
- #endif
- #define __mips 4
- 
-+#ifdef __loongson_fp
-+#undef __loongson_fp
-+#endif
-+#if __mips >= 4 && __mips != 32
-+/* Include support for Loongson floating point instructions */
-+#define __loongson_fp 1
-+#endif
-+
- /* Function which emulates a floating point instruction. */
- 
- static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
-@@ -66,6 +77,10 @@ static int fpu_emu(struct pt_regs *, struct mips_fpu_struct *,
- static int fpux_emu(struct pt_regs *,
- 	struct mips_fpu_struct *, mips_instruction, void *__user *);
- #endif
-+#ifdef __loongson_fp
-+static int loongson_spec2_emu(struct pt_regs *,
-+	struct mips_fpu_struct *, mips_instruction, void *__user *);
-+#endif
- 
- /* Further private data for which no space exists in mips_fpu_struct */
- 
-@@ -203,6 +218,14 @@ static inline int cop1_64bit(struct pt_regs *xcp)
- #define DPFROMREG(dp, x)	DIFROMREG((dp).bits, x)
- #define DPTOREG(dp, x)	DITOREG((dp).bits, x)
- 
-+/* Support for Loongson paired single floating-point format */
-+#define PSIFROMREG(si1, si2, x) ({ u64 di; DIFROMREG(di, x);		\
-+			(si1) = (u32)di; (si2) = (u32)(di >> 32); })
-+#define PSITOREG(si1, si2, x) DITOREG((si1) | ((u64)(si2) << 32), x)
-+
-+#define PSPFROMREG(sp1, sp2, x) PSIFROMREG((sp1).bits, (sp2).bits, x)
-+#define PSPTOREG(sp1, sp2, x)	PSITOREG((sp1).bits, (sp2).bits, x)
-+
- /*
-  * Emulate the single floating point instruction pointed at by EPC.
-  * Two instructions if the instruction is in a branch delay slot.
-@@ -568,6 +591,15 @@ static int cop1Emulate(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		break;
- #endif
- 
-+#ifdef __loongson_fp
-+	case spec2_op:{
-+		int sig = loongson_spec2_emu(xcp, ctx, ir, fault_addr);
-+		if (sig)
-+			return sig;
-+		break;
-+	}
-+#endif
-+
- 	default:
- 		return SIGILL;
- 	}
-@@ -646,6 +678,172 @@ DEF3OP(msub, dp, ieee754dp_mul, ieee754dp_sub, );
- DEF3OP(nmadd, dp, ieee754dp_mul, ieee754dp_add, ieee754dp_neg);
- DEF3OP(nmsub, dp, ieee754dp_mul, ieee754dp_sub, ieee754dp_neg);
- 
-+#ifdef __loongson_fp
-+static int loongson_spec2_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
-+	mips_instruction ir, void *__user *fault_addr)
-+{
-+	int rfmt;		/* resulting format */
-+	unsigned rcsr = 0;	/* resulting csr */
-+	union {
-+		ieee754dp d;
-+		struct {
-+			ieee754sp s;
-+			ieee754sp s2;
-+		};
-+	} rv;			/* resulting value */
-+
-+	/* XXX maybe add a counter for loongson spec2 fp instructions? */
-+	/* MIPS_FPU_EMU_INC_STATS(cp1xops); */
-+
-+	switch (rfmt = (MIPSInst_FFMT(ir) & 0xf)) {
-+	case s_fmt:{
-+		ieee754sp(*handler) (ieee754sp, ieee754sp, ieee754sp);
-+		ieee754sp fd, fs, ft;
-+
-+		switch (MIPSInst_FUNC(ir)) {
-+		case loongson_madd_op:
-+			handler = fpemu_sp_madd;
-+			goto scoptop;
-+		case loongson_msub_op:
-+			handler = fpemu_sp_msub;
-+			goto scoptop;
-+		case loongson_nmadd_op:
-+			handler = fpemu_sp_nmadd;
-+			goto scoptop;
-+		case loongson_nmsub_op:
-+			handler = fpemu_sp_nmsub;
-+			goto scoptop;
-+
-+		      scoptop:
-+			SPFROMREG(fd, MIPSInst_FD(ir));
-+			SPFROMREG(fs, MIPSInst_FS(ir));
-+			SPFROMREG(ft, MIPSInst_FT(ir));
-+			rv.s = (*handler) (fd, fs, ft);
-+
-+		      copcsr:
-+			if (ieee754_cxtest(IEEE754_INEXACT))
-+				rcsr |= FPU_CSR_INE_X | FPU_CSR_INE_S;
-+			if (ieee754_cxtest(IEEE754_UNDERFLOW))
-+				rcsr |= FPU_CSR_UDF_X | FPU_CSR_UDF_S;
-+			if (ieee754_cxtest(IEEE754_OVERFLOW))
-+				rcsr |= FPU_CSR_OVF_X | FPU_CSR_OVF_S;
-+			if (ieee754_cxtest(IEEE754_INVALID_OPERATION))
-+				rcsr |= FPU_CSR_INV_X | FPU_CSR_INV_S;
-+
-+			break;
-+
-+		default:
-+			return SIGILL;
-+		}
-+		break;
-+	}
-+
-+	case d_fmt:{
-+		ieee754dp(*handler) (ieee754dp, ieee754dp, ieee754dp);
-+		ieee754dp fd, fs, ft;
-+
-+		switch (MIPSInst_FUNC(ir)) {
-+		case loongson_madd_op:
-+			handler = fpemu_dp_madd;
-+			goto dcoptop;
-+		case loongson_msub_op:
-+			handler = fpemu_dp_msub;
-+			goto dcoptop;
-+		case loongson_nmadd_op:
-+			handler = fpemu_dp_nmadd;
-+			goto dcoptop;
-+		case loongson_nmsub_op:
-+			handler = fpemu_dp_nmsub;
-+			goto dcoptop;
-+
-+		      dcoptop:
-+			DPFROMREG(fd, MIPSInst_FD(ir));
-+			DPFROMREG(fs, MIPSInst_FS(ir));
-+			DPFROMREG(ft, MIPSInst_FT(ir));
-+			rv.d = (*handler) (fd, fs, ft);
-+			goto copcsr;
-+
-+		default:
-+			return SIGILL;
-+		}
-+		break;
-+	}
-+
-+	case ps_fmt:{
-+		ieee754sp(*handler) (ieee754sp, ieee754sp, ieee754sp);
-+		struct _ieee754_csr ieee754_csr_save;
-+		ieee754sp fd1, fs1, ft1;
-+		ieee754sp fd2, fs2, ft2;
-+
-+		switch (MIPSInst_FUNC(ir)) {
-+		case loongson_madd_op:
-+			handler = fpemu_sp_madd;
-+			goto pscoptop;
-+		case loongson_msub_op:
-+			handler = fpemu_sp_msub;
-+			goto pscoptop;
-+		case loongson_nmadd_op:
-+			handler = fpemu_sp_nmadd;
-+			goto pscoptop;
-+		case loongson_nmsub_op:
-+			handler = fpemu_sp_nmsub;
-+			goto pscoptop;
-+
-+		      pscoptop:
-+			PSPFROMREG(fd1, fd2, MIPSInst_FD(ir));
-+			PSPFROMREG(fs1, fs2, MIPSInst_FS(ir));
-+			PSPFROMREG(ft1, ft2, MIPSInst_FT(ir));
-+			rv.s = (*handler) (fd1, fs1, ft1);
-+			ieee754_csr_save = ieee754_csr;
-+			rv.s2 = (*handler) (fd2, fs2, ft2);
-+			ieee754_csr.cx |= ieee754_csr_save.cx;
-+			ieee754_csr.sx |= ieee754_csr_save.sx;
-+			goto copcsr;
-+
-+		default:
-+			return SIGILL;
-+		}
-+		break;
-+	}
-+
-+	default:
-+		return SIGILL;
-+	}
-+
-+	/*
-+	 * Update the fpu CSR register for this operation.
-+	 * If an exception is required, generate a tidy SIGFPE exception,
-+	 * without updating the result register.
-+	 * Note: cause exception bits do not accumulate, they are rewritten
-+	 * for each op; only the flag/sticky bits accumulate.
-+	 */
-+	ctx->fcr31 = (ctx->fcr31 & ~FPU_CSR_ALL_X) | rcsr;
-+	if ((ctx->fcr31 >> 5) & ctx->fcr31 & FPU_CSR_ALL_E) {
-+		/*printk ("SIGFPE: fpu csr = %08x\n",ctx->fcr31); */
-+		return SIGFPE;
-+	}
-+
-+	/*
-+	 * Now we can safely write the result back to the register file.
-+	 */
-+	switch (rfmt) {
-+	case d_fmt:
-+		DPTOREG(rv.d, MIPSInst_FD(ir));
-+		break;
-+	case s_fmt:
-+		SPTOREG(rv.s, MIPSInst_FD(ir));
-+		break;
-+	case ps_fmt:
-+		PSPTOREG(rv.s, rv.s2, MIPSInst_FD(ir));
-+		break;
-+	default:
-+		return SIGILL;
-+	}
-+
-+	return 0;
-+}
-+#endif
-+
- static int fpux_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 	mips_instruction ir, void *__user *fault_addr)
- {
-@@ -840,7 +1038,12 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 	unsigned cond;
- 	union {
- 		ieee754dp d;
--		ieee754sp s;
-+		struct {
-+			ieee754sp s;
-+#ifdef __loongson_fp
-+			ieee754sp s2; /* for Loongson paired singles */
-+#endif
-+		};
- 		int w;
- #ifdef __mips64
- 		s64 l;
-@@ -1210,6 +1413,83 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		break;
- 	}
- 
-+#ifdef __loongson_fp
-+	case ps_fmt:{		/* 6 */
-+		/* Support for Loongson paired single fp instructions */
-+		union {
-+			ieee754sp(*b) (ieee754sp, ieee754sp);
-+			ieee754sp(*u) (ieee754sp);
-+		} handler;
-+
-+		switch (MIPSInst_FUNC(ir)) {
-+			/* binary ops */
-+		case fadd_op:
-+			handler.b = ieee754sp_add;
-+			goto pscopbop;
-+		case fsub_op:
-+			handler.b = ieee754sp_sub;
-+			goto pscopbop;
-+		case fmul_op:
-+			handler.b = ieee754sp_mul;
-+			goto pscopbop;
-+
-+			/* unary  ops */
-+		case fabs_op:
-+			handler.u = ieee754sp_abs;
-+			goto pscopuop;
-+		case fneg_op:
-+			handler.u = ieee754sp_neg;
-+			goto pscopuop;
-+		case fmov_op:
-+			/* an easy one */
-+			PSPFROMREG(rv.s, rv.s2, MIPSInst_FS(ir));
-+			break;
-+
-+		      pscopbop: /* paired binary op handler */
-+			{
-+				struct _ieee754_csr ieee754_csr_save;
-+				ieee754sp fs1, ft1;
-+				ieee754sp fs2, ft2;
-+
-+				PSPFROMREG(fs1, fs2, MIPSInst_FS(ir));
-+				PSPFROMREG(ft1, ft2, MIPSInst_FT(ir));
-+				rv.s  = (*handler.b) (fs1, ft1);
-+				ieee754_csr_save = ieee754_csr;
-+				rv.s2 = (*handler.b) (fs2, ft2);
-+				ieee754_csr.cx |= ieee754_csr_save.cx;
-+				ieee754_csr.sx |= ieee754_csr_save.sx;
-+				goto copcsr;
-+			}
-+		      pscopuop: /* paired unary op handler */
-+			{
-+				struct _ieee754_csr ieee754_csr_save;
-+				ieee754sp fs1;
-+				ieee754sp fs2;
-+
-+				PSPFROMREG(fs1, fs2, MIPSInst_FS(ir));
-+				rv.s  = (*handler.u) (fs1);
-+				ieee754_csr_save = ieee754_csr;
-+				rv.s2 = (*handler.u) (fs2);
-+				ieee754_csr.cx |= ieee754_csr_save.cx;
-+				ieee754_csr.sx |= ieee754_csr_save.sx;
-+				goto copcsr;
-+			}
-+			break;
-+
-+		default:
-+			if (MIPSInst_FUNC(ir) >= fcmp_op) {
-+				/* Loongson fp hardware handles all
-+				   cases of fp compare insns, so we
-+				   shouldn't have to */
-+				printk ("Loongson paired-single fp compare"
-+					" unimplemented in cp1emu.c\n");
-+			}
-+			return SIGILL;
-+		}
-+		break;
-+	}
-+#endif
-+
- 	case w_fmt:{
- 		ieee754sp fs;
- 
-@@ -1299,6 +1579,11 @@ static int fpu_emu(struct pt_regs *xcp, struct mips_fpu_struct *ctx,
- 		DITOREG(rv.l, MIPSInst_FD(ir));
- 		break;
- #endif
-+#ifdef __loongson_fp
-+	case ps_fmt:
-+		PSPTOREG(rv.s, rv.s2, MIPSInst_FD(ir));
-+		break;
-+#endif
- 	default:
- 		return SIGILL;
- 	}
--- 
-1.7.5.4
-
diff --git a/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch b/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch
deleted file mode 100644
index 452c4f26f6fd..000000000000
--- a/pkgs/os-specific/linux/kernel/mips-fpureg-emulation.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From ab1ce0a6cd51ca83194a865837f3b90f366a733d Mon Sep 17 00:00:00 2001
-From: Lluis Batlle i Rossell <viric@viric.name>
-Date: Sat, 16 Jun 2012 00:22:53 +0200
-Subject: [PATCH] MIPS: Add emulation for fpureg-mem unaligned access
-To: linux-mips@linux-mips.org
-Cc: loongson-dev@googlegroups.com
-
-Reusing most of the code from lw,ld,sw,sd emulation,
-I add the emulation for lwc1,ldc1,swc1,sdc1.
-
-This avoids the direct SIGBUS sent to userspace processes that have
-misaligned memory accesses.
-
-I've tested the change in Loongson2F, with an own test program, and
-WebKit 1.4.0, as both were killed by sigbus without this patch.
-
-Signed-off: Lluis Batlle i Rossell <viric@viric.name>
----
- arch/mips/kernel/unaligned.c |   43 +++++++++++++++++++++++++++++-------------
- 1 file changed, 30 insertions(+), 13 deletions(-)
-
-diff --git a/arch/mips/kernel/unaligned.c b/arch/mips/kernel/unaligned.c
-index 9c58bdf..4531e6c 100644
---- a/arch/mips/kernel/unaligned.c
-+++ b/arch/mips/kernel/unaligned.c
-@@ -85,6 +85,7 @@
- #include <asm/cop2.h>
- #include <asm/inst.h>
- #include <asm/uaccess.h>
-+#include <asm/fpu.h>
- 
- #define STR(x)  __STR(x)
- #define __STR(x)  #x
-@@ -108,6 +109,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 	union mips_instruction insn;
- 	unsigned long value;
- 	unsigned int res;
-+	fpureg_t *fpuregs;
- 
- 	perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, regs, 0);
- 
-@@ -183,6 +185,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		break;
- 
- 	case lw_op:
-+	case lwc1_op:
- 		if (!access_ok(VERIFY_READ, addr, 4))
- 			goto sigbus;
- 
-@@ -209,7 +212,12 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		if (res)
- 			goto fault;
- 		compute_return_epc(regs);
--		regs->regs[insn.i_format.rt] = value;
-+		if (insn.i_format.opcode == lw_op) {
-+			regs->regs[insn.i_format.rt] = value;
-+		} else {
-+			fpuregs = get_fpu_regs(current);
-+			fpuregs[insn.i_format.rt] = value;
-+		}
- 		break;
- 
- 	case lhu_op:
-@@ -291,6 +299,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		goto sigill;
- 
- 	case ld_op:
-+	case ldc1_op:
- #ifdef CONFIG_64BIT
- 		/*
- 		 * A 32-bit kernel might be running on a 64-bit processor.  But
-@@ -325,7 +334,12 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		if (res)
- 			goto fault;
- 		compute_return_epc(regs);
--		regs->regs[insn.i_format.rt] = value;
-+		if (insn.i_format.opcode == ld_op) {
-+			regs->regs[insn.i_format.rt] = value;
-+		} else {
-+			fpuregs = get_fpu_regs(current);
-+			fpuregs[insn.i_format.rt] = value;
-+		}
- 		break;
- #endif /* CONFIG_64BIT */
- 
-@@ -370,10 +384,16 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		break;
- 
- 	case sw_op:
-+	case swc1_op:
- 		if (!access_ok(VERIFY_WRITE, addr, 4))
- 			goto sigbus;
- 
--		value = regs->regs[insn.i_format.rt];
-+		if (insn.i_format.opcode == sw_op) {
-+			value = regs->regs[insn.i_format.rt];
-+		} else {
-+			fpuregs = get_fpu_regs(current);
-+			value = fpuregs[insn.i_format.rt];
-+		}
- 		__asm__ __volatile__ (
- #ifdef __BIG_ENDIAN
- 			"1:\tswl\t%1,(%2)\n"
-@@ -401,6 +421,7 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		break;
- 
- 	case sd_op:
-+	case sdc1_op:
- #ifdef CONFIG_64BIT
- 		/*
- 		 * A 32-bit kernel might be running on a 64-bit processor.  But
-@@ -412,7 +433,12 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		if (!access_ok(VERIFY_WRITE, addr, 8))
- 			goto sigbus;
- 
--		value = regs->regs[insn.i_format.rt];
-+		if (insn.i_format.opcode == sd_op) {
-+			value = regs->regs[insn.i_format.rt];
-+		} else {
-+			fpuregs = get_fpu_regs(current);
-+			value = fpuregs[insn.i_format.rt];
-+		}
- 		__asm__ __volatile__ (
- #ifdef __BIG_ENDIAN
- 			"1:\tsdl\t%1,(%2)\n"
-@@ -443,15 +469,6 @@ static void emulate_load_store_insn(struct pt_regs *regs,
- 		/* Cannot handle 64-bit instructions in 32-bit kernel */
- 		goto sigill;
- 
--	case lwc1_op:
--	case ldc1_op:
--	case swc1_op:
--	case sdc1_op:
--		/*
--		 * I herewith declare: this does not happen.  So send SIGBUS.
--		 */
--		goto sigbus;
--
- 	/*
- 	 * COP2 is available to implementor for application specific use.
- 	 * It's up to applications to register a notifier chain and do
--- 
-1.7.9.5
-
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cedb2dfc2230..4ba182ea5a59 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -31,21 +31,6 @@ rec {
       patch = ./p9-fixes.patch;
     };
 
-  mips_fpureg_emu =
-    { name = "mips-fpureg-emulation";
-      patch = ./mips-fpureg-emulation.patch;
-    };
-
-  mips_fpu_sigill =
-    { name = "mips-fpu-sigill";
-      patch = ./mips-fpu-sigill.patch;
-    };
-
-  mips_ext3_n32 =
-    { name = "mips-ext3-n32";
-      patch = ./mips-ext3-n32.patch;
-    };
-
   modinst_arg_list_too_long =
     { name = "modinst-arglist-too-long";
       patch = ./modinst-arg-list-too-long.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index afd339f6fd20..d466e57041af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13444,11 +13444,6 @@ with pkgs;
         kernelPatches.p9_fixes
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13463,11 +13458,6 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.4"
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13476,11 +13466,6 @@ with pkgs;
       [ kernelPatches.bridge_stp_helper
         kernelPatches.cpu-cgroup-v2."4.9"
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13491,11 +13476,6 @@ with pkgs;
         # when adding a new linux version
         kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13507,11 +13487,6 @@ with pkgs;
         # kernelPatches.cpu-cgroup-v2."4.11"
         kernelPatches.modinst_arg_list_too_long
         kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 
@@ -13519,10 +13494,6 @@ with pkgs;
     kernelPatches = [
       kernelPatches.bridge_stp_helper
       kernelPatches.modinst_arg_list_too_long
-    ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [
-      kernelPatches.mips_fpureg_emu
-      kernelPatches.mips_fpu_sigill
-      kernelPatches.mips_ext3_n32
     ];
   };
 
@@ -13530,11 +13501,6 @@ with pkgs;
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
         kernelPatches.modinst_arg_list_too_long
-      ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
       ];
   };
 

From 79dcdce63387d8b0c624abbc00d00acaa7912a43 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 04:35:42 -0500
Subject: [PATCH 1587/3370] openbsm: add audit_token_to_pid symbol

This is needed by some projects like Chromium that use openbsm/libbsm.
---
 .../openbsm/bsm-add-audit_token_to_pid.patch  | 24 +++++++++++++++++++
 .../development/libraries/openbsm/default.nix |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch

diff --git a/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch b/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
new file mode 100644
index 000000000000..77b9e1febddc
--- /dev/null
+++ b/pkgs/development/libraries/openbsm/bsm-add-audit_token_to_pid.patch
@@ -0,0 +1,24 @@
+Subject: Add audit_token_to_pid()
+
+Description: Apple provides audit_token_to_pid to get the pid of an
+audit token. Unfortunately, they have never released this to the
+OpenBSM project.
+
+diff -r -u -p1 a/bsm/libbsm.h b/bsm/libbsm.h
+--- a/bsm/libbsm.h	      2009-04-15 16:45:54.000000000 -0500
++++ b/bsm/libbsm.h	      2018-05-11 04:11:14.063083147 -0500
+@@ -1298,1 +1298,2 @@ int audit_set_stat(au_stat_t *stats, siz
+ int audit_send_trigger(int *trigger);
++pid_t audit_token_to_pid(audit_token_t atoken);
+
+diff -r -u -p1 a/libbsm/bsm_wrappers.c b/libbsm/bsm_wrappers.c
+--- a/libbsm/bsm_wrappers.c	       2009-04-15 16:46:06.000000000 -0500
++++ b/libbsm/bsm_wrappers.c	       2018-05-11 04:10:15.710820393 -0500
+@@ -823,1 +823,6 @@ audit_get_car(char *path, size_t sz)
+ }
++
++pid_t audit_token_to_pid(audit_token_t atoken)
++{
++	return atoken.val[5];
++}
+ 
\ No newline at end of file
diff --git a/pkgs/development/libraries/openbsm/default.nix b/pkgs/development/libraries/openbsm/default.nix
index a6e62cea9d7e..9f75bff40e9a 100644
--- a/pkgs/development/libraries/openbsm/default.nix
+++ b/pkgs/development/libraries/openbsm/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "0b98359hd8mm585sh145ss828pg2y8vgz38lqrb7nypapiyqdnd1";
   };
 
+  patches = [ ./bsm-add-audit_token_to_pid.patch ];
+
   meta = {
     homepage = http://www.openbsm.org/;
     platforms = lib.platforms.unix;

From b7074a600bfb39cfd5385fca2b0c24966b5f7ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 11 May 2018 12:07:56 +0200
Subject: [PATCH 1588/3370] i3status: 2.11 -> 2.12

---
 pkgs/applications/window-managers/i3/status.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index fa964e86974b..ae6d8bd22b74 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -2,11 +2,11 @@
   }:
 
 stdenv.mkDerivation rec {
-  name = "i3status-2.11";
+  name = "i3status-2.12";
 
   src = fetchurl {
     url = "https://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "0pwcy599fw8by1a1sf91crkqba7679qhvhbacpmhis8c1xrpxnwq";
+    sha256 = "06krpbijv4yi33nypg6qcn4hilcrdyarsdpd9fmr2cq46qaqiikg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 35375aa7edeec272947179d78328667bc928ca3a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Fri, 11 May 2018 13:56:18 +0300
Subject: [PATCH 1589/3370] hostapd: remove assertion (allow 5GHz channels)

---
 nixos/modules/services/networking/hostapd.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix
index bf2d0916fa36..63f56437d1c8 100644
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@@ -151,11 +151,6 @@ in
 
   config = mkIf cfg.enable {
 
-    assertions = [
-      { assertion = (cfg.channel >= 1 && cfg.channel <= 13);
-        message = "channel must be between 1 and 13";
-      }];
-
     environment.systemPackages =  [ pkgs.hostapd ];
 
     systemd.services.hostapd =

From d510ab9339b3d97d964af08927ea74acc6589b6b Mon Sep 17 00:00:00 2001
From: Tristan Helmich <fadenb@utzutzutz.net>
Date: Fri, 11 May 2018 13:14:28 +0200
Subject: [PATCH 1590/3370] emby: 3.4.0.0 -> 3.4.1.0

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

diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix
index 4defe9787ba3..f781e1114ebe 100644
--- a/pkgs/servers/emby/default.nix
+++ b/pkgs/servers/emby/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "emby-${version}";
-  version = "3.4.0.0";
+  version = "3.4.1.0";
 
   src = fetchurl {
     url = "https://github.com/MediaBrowser/Emby/releases/download/${version}/Emby.Mono.zip";
-    sha256 = "1936d5bcrf23av5nc8yh6708gxngsbkh86gvmzpsv3d33jgqv1nl";
+    sha256 = "08jr6v8xhmiwbby0lfvpjrlma280inwh5qp6v4p93lzd07fjynh5";
   };
 
   buildInputs = with pkgs; [

From c3dba0b7a79c780ac8359f00d65af29930c7ae20 Mon Sep 17 00:00:00 2001
From: Philipp Steinpass <philipp@xndr.de>
Date: Sun, 29 Apr 2018 20:36:06 +0200
Subject: [PATCH 1591/3370] nixos/gnunet: create switch for package.

---
 nixos/modules/services/networking/gnunet.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/gnunet.nix b/nixos/modules/services/networking/gnunet.nix
index 02cd53c6fa38..008b09e81a57 100644
--- a/nixos/modules/services/networking/gnunet.nix
+++ b/nixos/modules/services/networking/gnunet.nix
@@ -102,6 +102,14 @@ in
         };
       };
 
+      package = mkOption {
+        type = types.package;
+        default = pkgs.gnunet;
+        defaultText = "pkgs.gnunet";
+        description = "Overridable attribute of the gnunet package to use.";
+        example = literalExample "pkgs.gnunet_git";
+      };
+
       extraOptions = mkOption {
         default = "";
         description = ''
@@ -130,16 +138,16 @@ in
 
     # The user tools that talk to `gnunetd' should come from the same source,
     # so install them globally.
-    environment.systemPackages = [ pkgs.gnunet ];
+    environment.systemPackages = [ cfg.package ];
 
     systemd.services.gnunet = {
       description = "GNUnet";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.gnunet pkgs.miniupnpc ];
+      path = [ cfg.package pkgs.miniupnpc ];
       environment.TMPDIR = "/tmp";
       serviceConfig.PrivateTemp = true;
-      serviceConfig.ExecStart = "${pkgs.gnunet}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
+      serviceConfig.ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
       serviceConfig.User = "gnunet";
       serviceConfig.UMask = "0007";
       serviceConfig.WorkingDirectory = homeDir;

From b15da3e3308d37b0c976ea809e3f4d07d7fdd6ad Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 11 May 2018 04:43:23 +0200
Subject: [PATCH 1592/3370] tor-browser-bundle-bin: 7.5.3 -> 7.5.4

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index a2094305db55..97b719c1471b 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.3";
+  version = "7.5.4";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0vgw1qsd6rqbbgnsw9zwcv5m308abh7wp1p12mp8g04xndxnzw0d";
+      sha256 = "1d5q2vc7kyd2wizl4551yf54rcagh3y2xf1lzvrswxq4kasii3h9";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "0scjy51zmyn7za0gii0dvndq06slip64nd0ik2cjyq232agvbxmr";
+      sha256 = "18v7ykv23gsylvn9mlkp5547yz3y833i9h126r7195wsqdshizdj";
     };
   };
 in

From 16b4691dd1b4cc4c551f54bd4220f62244c11a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 11 May 2018 14:35:17 +0200
Subject: [PATCH 1593/3370] seafile-client: 6.1.7 -> 6.1.8

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

diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 35926836e30d..279dc508225b 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -5,14 +5,14 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.1.7";
+  version = "6.1.8";
   name = "seafile-client-${version}";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     rev = "v${version}";
-    sha256 = "1wf258sxn4pqdn1xypqwlxbnls771k2c6whpbinpns3knv5zvgaq";
+    sha256 = "0gy7jfxr5f8qvbqj80g7fzaw9b3vax750c4z5cr7f43rv99284pc";
   };
 
   nativeBuildInputs = [ pkgconfig cmake makeWrapper ];

From 73833ee4465369c9eead8e00ce699053e010de2f Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 08:14:21 -0500
Subject: [PATCH 1594/3370] darwin.architecture: add postPatch back in

I didn't think it was even being called before, but now getting this error:

https://hydra.nixos.org/build/73955984/nixlog/1
---
 .../darwin/apple-source-releases/architecture/default.nix  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
index 07c36ebfe120..8b3eb2017e27 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
@@ -3,6 +3,13 @@
 appleDerivation {
   dontBuild = true;
 
+  postPatch = ''
+    substituteInPlace $sourceRoot/Makefile \
+      --replace "/usr/include" "/include" \
+      --replace "/usr/bin/" "" \
+      --replace "/bin/" ""
+  '';
+
   installPhase = ''
     export DSTROOT=$out
     make install

From 5862c6835a3280089a8258a9067fde69f827396c Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 8 May 2018 22:14:03 +0000
Subject: [PATCH 1595/3370] pythonPackages.immutables: init at 0.5

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

diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix
new file mode 100644
index 000000000000..975353406ca9
--- /dev/null
+++ b/pkgs/development/python-modules/immutables/default.nix
@@ -0,0 +1,19 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "immutables";
+  version = "0.5";
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hba0vkqanwfnb5b3rs14bs7schsmczhan5nd93c1i6fzi17glap";
+  };
+
+  meta = {
+    description = "An immutable mapping type for Python";
+    homepage = https://github.com/MagicStack/immutables;
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7868f7d7ff06..f1be56353425 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3120,6 +3120,8 @@ in {
 
   imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { };
 
+  immutables = callPackage ../development/python-modules/immutables {};
+
   imread = buildPythonPackage rec {
     name = "python-imread-${version}";
     version = "0.6";

From 1bfa8c294c6034c60a54cdd93e86229a44499509 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 8 May 2018 22:14:21 +0000
Subject: [PATCH 1596/3370] pythonPackages.contextvars: init at 2.2

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

diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix
new file mode 100644
index 000000000000..d8ee3b1ca9ef
--- /dev/null
+++ b/pkgs/development/python-modules/contextvars/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, isPy36, immutables }:
+
+buildPythonPackage rec {
+  pname = "contextvars";
+  version = "2.2";
+  disabled = !isPy36;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "046b385nfzkjh0wqmd268p2jkgn9fg6hz40npq7j1w3c8aqzhwvx";
+  };
+
+  propagatedBuildInputs = [ immutables ];
+
+  meta = {
+    description = "A backport of the Python 3.7 contextvars module for Python 3.6";
+    homepage = https://github.com/MagicStack/contextvars;
+    license = with lib.licenses; [ asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f1be56353425..cfeeb96e8834 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1629,6 +1629,8 @@ in {
 
   contexter = callPackage ../development/python-modules/contexter { };
 
+  contextvars = callPackage ../development/python-modules/contextvars {};
+
   contextlib2 = callPackage ../development/python-modules/contextlib2 { };
 
   cookiecutter = callPackage ../development/python-modules/cookiecutter { };

From 46440d3426bf3eaeb5082713543ed008c8661a03 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Fri, 11 May 2018 09:19:41 -0400
Subject: [PATCH 1597/3370] docker-edge: 18.04.0-ce -> 18.05.0-ce

---
 pkgs/applications/virtualization/docker/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                     | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2a271a96ecd4..2ab2bd022199 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -209,10 +209,10 @@ rec {
     tiniSha256 = "0zj4kdis1vvc6dwn4gplqna0bs7v6d1y2zc8v80s3zi018inhznw";
   };
 
-  docker_18_04 = dockerGen rec {
-    version = "18.04.0-ce";
-    rev = "3d479c0af67cb9ea43a9cfc1bf2ef097e06a3470"; # git commit
-    sha256 = "1askbk8b92cdv7vlm688g2f1v2xjhmx77578318x76dydfql3jfl";
+  docker_18_05 = dockerGen rec {
+    version = "18.05.0-ce";
+    rev = "f150324782643a5268a04e7d1a675587125da20e"; # git commit
+    sha256 = "0vgh03qwlfm25sm3yaa6vf5ap2ag575f814ccgcrp5zlcal13r0z";
     runcRev = "4fc53a81fb7c994640722ac585fa9ca548971871";
     runcSha256 = "1ikqw39jn8dzb4snc4pcg3z85jb67ivskdhx028k17ss29bf4062";
     containerdRev = "773c489c9c1b21a6d78b5c538cd395416ec50f88";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9e89c1ac4b3..f6d3a7a5b937 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15306,10 +15306,10 @@ with pkgs;
   # go 1.9 pin until https://github.com/moby/moby/pull/35739
   inherit (callPackage ../applications/virtualization/docker { go = go_1_9; })
     docker_18_03
-    docker_18_04;
+    docker_18_05;
 
   docker = docker_18_03;
-  docker-edge = docker_18_04;
+  docker-edge = docker_18_05;
 
   docker-proxy = callPackage ../applications/virtualization/docker/proxy.nix { };
 

From ea502c686f115abb03b6b24e57d812d845bb74f2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:30:55 -0700
Subject: [PATCH 1598/3370] libdrm: 2.4.91 -> 2.4.92

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libdrm/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.4.92 with grep in /nix/store/9n9nnxcq129pwmynmbpsb2h86w6aafkr-libdrm-2.4.92
- directory tree listing: https://gist.github.com/f9b660cd3c8012a94adf29b9d2931d70
---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 50d9a565a6cf..4d1b4e4c3fdc 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.91";
+  name = "libdrm-2.4.92";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "0068dn47c478vm1lyyhy02gilrpsma0xmcblhvs0dzqyrk80wjk3";
+    sha256 = "1yirzx8hmlvv6r0l7lb3zxmgy5la2mri9al0k16xqfg19pdqzr79";
   };
 
   outputs = [ "out" "dev" "bin" ];

From 93b4e6956e0fe80bce72733804ef4983c402120f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 10 May 2018 01:01:21 +0200
Subject: [PATCH 1599/3370] acpid: fix cross

---
 pkgs/os-specific/linux/acpid/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index 7a234b16c913..f5a0cb25c803 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "acpid-2.0.29";
@@ -8,6 +8,15 @@ stdenv.mkDerivation rec {
     sha256 = "1zq38al07z92r2md18zivrzgjqnn7m2wahdpgri6wijwjwkknl2q";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace "AC_FUNC_MALLOC" "" \
+      --replace "AC_FUNC_REALLOC" "" \
+      --replace "strrchr strtol" "strrchr strtol malloc realloc"
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://tedfelix.com/linux/acpid-netlink.html;
     description = "A daemon for delivering ACPI events to userspace programs";

From 183f56f2d62eabb3f60fb7417fdbdfb930d1da31 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 May 2018 14:44:54 +0200
Subject: [PATCH 1600/3370] acpid: 2.0.28 -> 2.0.29

---
 pkgs/os-specific/linux/acpid/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix
index f5a0cb25c803..ad763d2ee298 100644
--- a/pkgs/os-specific/linux/acpid/default.nix
+++ b/pkgs/os-specific/linux/acpid/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  # remove when https://sourceforge.net/p/acpid2/code/merge-requests/1/ is merged
   postPatch = ''
     substituteInPlace configure.ac \
       --replace "AC_FUNC_MALLOC" "" \

From cb44120b8159c0f3f49f6c8ec181b69059da2ff6 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Fri, 11 May 2018 14:41:24 +0100
Subject: [PATCH 1601/3370] Fix typo

---
 pkgs/os-specific/darwin/osx-private-sdk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/osx-private-sdk/default.nix b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
index 1eecdbc5618d..115512a6febd 100644
--- a/pkgs/os-specific/darwin/osx-private-sdk/default.nix
+++ b/pkgs/os-specific/darwin/osx-private-sdk/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0bv0884yxpvk2ishxj8gdy1w6wb0gwfq55q5qjp0s8z0z7f63zqh";
   };
 
-  # NOTE: we install only headers that are really needed to keep closure sie
+  # NOTE: we install only headers that are really needed to keep closure size
   # reasonable.
   installPhase = ''
     mkdir -p $out/include

From 5f8ee95642587a4186dacc0beb978193507d6255 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Jos=C3=A9=20Ruiz-Henestrosa=20Ruiz?=
 <ruizh.cj@gmail.com>
Date: Fri, 11 May 2018 15:55:24 +0200
Subject: [PATCH 1602/3370] tdesktop: Fix the icon path (#40298)

The `.desktop` file now refers to the icon as `telegram` instead of `telegram-desktop`. This caused a placeholder icon to be shown instead.
---
 .../networking/instant-messengers/telegram/tdesktop/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
index 2588340de1de..7581482504b7 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix
@@ -114,7 +114,7 @@ mkDerivation rec {
     install -m444 "$src/lib/xdg/telegramdesktop.desktop" "$out/share/applications/telegram-desktop.desktop"
     sed "s,/usr/bin,$out/bin,g" $archPatches/tg.protocol > $out/share/kde4/services/tg.protocol
     for icon_size in 16 32 48 64 128 256 512; do
-      install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
+      install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram.png"
     done
   '';
 

From 095219565f04916fe5589e7c4757cfb0b777e567 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 08:05:21 -0700
Subject: [PATCH 1603/3370] falkon: 3.0.0 -> 3.0.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/falkon/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.1 with grep in /nix/store/daa848kdkmv0l77b796h86djs0yn2wwh-falkon-3.0.1
- directory tree listing: https://gist.github.com/f0235aa275d8b64a8b8f61cf7b328049
---
 pkgs/applications/networking/browsers/falkon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix
index de56a0605b86..9dad2df7fd0a 100644
--- a/pkgs/applications/networking/browsers/falkon/default.nix
+++ b/pkgs/applications/networking/browsers/falkon/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "falkon-${version}";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner  = "KDE";
     repo   = "falkon";
     rev    = "v${version}";
-    sha256 = "148idxvx32iwg18m3b7s22awcijnbrywz9r8gnfrq6gpwr0m2jna";
+    sha256 = "1ay1ljrdjcfqwjv4rhf4psh3dfihnvhpmpqcayd3p9lh57x7fh41";
   };
 
   preConfigure = ''

From 9e9cdd7027e6d941fc08c2eb71ed5423cf4a8f01 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 11:12:15 -0400
Subject: [PATCH 1604/3370] lib: Add more configure flag helpers

Add with/without to match enable/disable, and add
`--{enable,with}-key=value` versions of both.
---
 lib/default.nix | 39 ++++++++++++++++++++-------------------
 lib/strings.nix | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 60ce01a93cd2..4ca2e2ea6e37 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -51,11 +51,11 @@ let
     # back-compat aliases
     platforms = systems.forMeta;
 
-    inherit (builtins) add addErrorContext attrNames
-      concatLists deepSeq elem elemAt filter genericClosure genList
-      getAttr hasAttr head isAttrs isBool isInt isList
-      isString length lessThan listToAttrs pathExists readFile
-      replaceStrings seq stringLength sub substring tail;
+    inherit (builtins) add addErrorContext attrNames concatLists
+      deepSeq elem elemAt filter genericClosure genList getAttr
+      hasAttr head isAttrs isBool isInt isList isString length
+      lessThan listToAttrs pathExists readFile replaceStrings seq
+      stringLength sub substring tail;
     inherit (trivial) id const concat or and boolToString mergeAttrs
       flip mapNullable inNixShell min max importJSON warn info
       nixpkgsVersion version mod compare splitByAndCompare
@@ -74,30 +74,32 @@ 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 naturalSort compareLists take drop sublist
-      last init crossLists unique intersectLists subtractLists
-      mutuallyExclusive;
+      reverseList listDfs toposort sort naturalSort compareLists take
+      drop sublist last init crossLists unique intersectLists
+      subtractLists mutuallyExclusive;
     inherit (strings) concatStrings concatMapStrings concatImapStrings
       intersperse concatStringsSep concatMapStringsSep
       concatImapStringsSep makeSearchPath makeSearchPathOutput
       makeLibraryPath makeBinPath makePerlPath optionalString
       hasPrefix hasSuffix stringToCharacters stringAsChars escape
-      escapeShellArg escapeShellArgs replaceChars lowerChars upperChars
-      toLower toUpper addContextFrom splitString removePrefix
-      removeSuffix versionOlder versionAtLeast getVersion nameFromURL
-      enableFeature fixedWidthString fixedWidthNumber isStorePath
+      escapeShellArg escapeShellArgs replaceChars lowerChars
+      upperChars toLower toUpper addContextFrom splitString
+      removePrefix removeSuffix versionOlder versionAtLeast getVersion
+      nameFromURL enableFeature enableFeatureAs withFeature
+      withFeatureAs fixedWidthString fixedWidthNumber isStorePath
       toInt readPathsFromFile fileContents;
     inherit (stringsWithDeps) textClosureList textClosureMap
       noDepEntry fullDepEntry packEntry stringAfter;
     inherit (customisation) overrideDerivation makeOverridable
-      callPackageWith callPackagesWith extendDerivation
-      hydraJob makeScope;
+      callPackageWith callPackagesWith extendDerivation hydraJob
+      makeScope;
     inherit (meta) addMetaAttrs dontDistribute setName updateName
       appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
       hiPrioSet;
     inherit (sources) pathType pathIsDirectory cleanSourceFilter
       cleanSource sourceByRegex sourceFilesBySuffices
-      commitIdFromGitRepo cleanSourceWith pathHasContext canCleanSource;
+      commitIdFromGitRepo cleanSourceWith pathHasContext
+      canCleanSource;
     inherit (modules) evalModules closeModules unifyModuleSyntax
       applyIfFunction unpackSubmodule packSubmodule mergeModules
       mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions
@@ -119,8 +121,7 @@ let
       traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq
       traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal
       traceShowValMarked showVal traceCall traceCall2 traceCall3
-      traceValIfNot runTests testAllTrue traceCallXml
-      attrNamesToStr;
+      traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr;
     inherit (misc) maybeEnv defaultMergeArg defaultMerge foldArgs
       defaultOverridableDelayableArgs composedArgsAndFun
       maybeAttrNullable maybeAttr ifEnable checkFlag getValue
@@ -129,7 +130,7 @@ let
       closePropagation mapAttrsFlatten nvs setAttr setAttrMerge
       mergeAttrsWithFunc mergeAttrsConcatenateValues
       mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults
-      mergeAttrsByFuncDefaultsClean mergeAttrBy
-      prepareDerivationArgs nixType imap overridableDelayableArgs;
+      mergeAttrsByFuncDefaultsClean mergeAttrBy prepareDerivationArgs
+      nixType imap overridableDelayableArgs;
   });
 in lib
diff --git a/lib/strings.nix b/lib/strings.nix
index 61babf0b1aa3..e09ec42bfea2 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -414,6 +414,39 @@ rec {
   */
   enableFeature = enable: feat: "--${if enable then "enable" else "disable"}-${feat}";
 
+  /* Create an --{enable-<feat>=<value>,disable-<feat>} string that can be passed to
+     standard GNU Autoconf scripts.
+
+     Example:
+       enableFeature true "shared" "foo"
+       => "--enable-shared=foo"
+       enableFeature false "shared" (throw "ignored")
+       => "--disable-shared"
+  */
+  enableFeatureAs = enable: feat: value: enableFeature enable feat + optionalString enable "=${value}";
+
+  /* Create an --{with,without}-<feat> string that can be passed to
+     standard GNU Autoconf scripts.
+
+     Example:
+       withFeature true "shared"
+       => "--with-shared"
+       withFeature false "shared"
+       => "--without-shared"
+  */
+  withFeature = with_: feat: "--${if with_ then "with" else "without"}-${feat}";
+
+  /* Create an --{with-<feat>=<value>,without-<feat>} string that can be passed to
+     standard GNU Autoconf scripts.
+
+     Example:
+       with_Feature true "shared" "foo"
+       => "--with-shared=foo"
+       with_Feature false "shared" (throw "ignored")
+       => "--without-shared"
+  */
+  withFeatureAs = with_: feat: value: withFeature with_ feat + optionalString with_ "=${value}";
+
   /* Create a fixed width string with additional prefix to match
      required width.
 

From 9d0202faa123aac3067065bb3f2ffd47d4610f0b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 8 May 2018 00:19:20 +0200
Subject: [PATCH 1605/3370] tzdata: 2017c -> 2018e

Notable changes:

  - North Korea switches back to +09 on 2018-05-05.
---
 pkgs/data/misc/tzdata/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 6c8fd6229a3f..9d2790ff1b5f 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -2,28 +2,31 @@
 
 stdenv.mkDerivation rec {
   name = "tzdata-${version}";
-  version = "2017c";
+  version = "2018e";
 
   srcs =
     [ (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzdata${version}.tar.gz";
-        sha256 = "02yrrfj0p7ar885ja41ylijzbr8wc6kz6kzlw8c670i9m693ym6n";
+        sha256 = "0bk97fv2i5ns42prpmlaadsswdjwv0ifi7whj2s4q6l44rcqwa3b";
       })
       (fetchurl {
         url = "http://www.iana.org/time-zones/repository/releases/tzcode${version}.tar.gz";
-        sha256 = "1dvrq0b2hz7cjqdyd7x21wpy4qcng3rvysr61ij0c2g64fyb9s41";
+        sha256 = "1kpb02631s58i068mwq63xlamcv1ffj4p6y4wpb9kdl01vr0qd6a";
       })
     ];
 
   sourceRoot = ".";
 
-  outputs = [ "out" "man" "dev" ];
+  outputs = [ "out" "bin" "man" "dev" ];
   propagatedBuildOutputs = [];
 
   makeFlags = [
     "TOPDIR=$(out)"
     "TZDIR=$(out)/share/zoneinfo"
+    "BINDIR=$(bin)/bin"
+    "ZICDIR=$(bin)/bin"
     "ETCDIR=$(TMPDIR)/etc"
+    "TZDEFAULT=$(TMPDIR)/etc"
     "LIBDIR=$(dev)/lib"
     "MANDIR=$(man)/share/man"
     "AWK=awk"
@@ -58,9 +61,10 @@ stdenv.mkDerivation rec {
 
   setupHook = ./tzdata-setup-hook.sh;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.iana.org/time-zones;
     description = "Database of current and historical time zones";
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ fpletz ];
   };
 }

From 59a6f939f83789c2f132bfda50fe0b1dc190f102 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 May 2018 18:21:41 +0200
Subject: [PATCH 1606/3370] pythonPackages.prometheus_client: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix
new file mode 100644
index 000000000000..eaf353af0823
--- /dev/null
+++ b/pkgs/development/python-modules/prometheus_client/default.nix
@@ -0,0 +1,19 @@
+{ lib, stdenv, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  pname = "prometheus_client";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1r3510jq6iryd2a8jln2qpvqy112y5502ncbfkn116xl7gj74r6r";
+  };
+
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Prometheus instrumentation library for Python applications";
+    homepage = https://github.com/prometheus/client_python;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c805a8ba520e..2e8f77d8a90e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18267,6 +18267,8 @@ EOF
   coinmarketcap = callPackage ../development/python-modules/coinmarketcap { };
 
   pyowm = callPackage ../development/python-modules/pyowm { };
+
+  prometheus_client = callPackage ../development/python-modules/prometheus_client { };
 });
 
 in fix' (extends overrides packages)

From c4f5d559dad3f86071ddb8de02a9f3ed715d13b8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 May 2018 18:22:03 +0200
Subject: [PATCH 1607/3370] home-assistant: add prometheus component dependency

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 6e0e216488d5..1fc3a828603a 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -256,7 +256,7 @@
     "nuheat" = ps: with ps; [  ];
     "nuimo_controller" = ps: with ps; [  ];
     "pilight" = ps: with ps; [  ];
-    "prometheus" = ps: with ps; [  ];
+    "prometheus" = ps: with ps; [ prometheus_client ];
     "python_script" = ps: with ps; [  ];
     "qwikswitch" = ps: with ps; [  ];
     "rainbird" = ps: with ps; [  ];

From 1a695870402a2f0bc949eb520665991cb181583d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 11 May 2018 18:31:49 +0200
Subject: [PATCH 1608/3370] git-cola: port to qt5

`git-cola` is a simple GUI `git` wrapper based on QT. Since 2.7
(namely https://github.com/git-cola/git-cola/commit/293364b45c4cbf3faff3fd7aba79b474d0abc845)
it supports QT5 which provides a nicer inteface.

See #33248
---
 .../version-management/git-and-tools/git-cola/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index 73f9921d4865..391ca26de257 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pythonPackages, makeWrapper, gettext, git }:
 
 let
-  inherit (pythonPackages) buildPythonApplication pyqt4 sip pyinotify python mock;
+  inherit (pythonPackages) buildPythonApplication pyqt5 sip pyinotify python mock;
 in buildPythonApplication rec {
   name = "git-cola-${version}";
   version = "3.1";
@@ -14,7 +14,7 @@ in buildPythonApplication rec {
   };
 
   buildInputs = [ git gettext ];
-  propagatedBuildInputs = [ pyqt4 sip pyinotify ];
+  propagatedBuildInputs = [ pyqt5 sip pyinotify ];
 
   doCheck = false;
 

From 46fa7ab6863326af795ab34e96cce2719f4961f2 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 8 May 2018 22:19:22 +0000
Subject: [PATCH 1609/3370] pythonPackages.outcome: init at 0.1.0a0

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

diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix
new file mode 100644
index 000000000000..e91925c75d50
--- /dev/null
+++ b/pkgs/development/python-modules/outcome/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
+, attrs
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "outcome";
+  version = "0.1.0a0";
+  disabled = pythonOlder "3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0cqwakzigw0602dxlb7c1882jwr8hn5nrxk1l8iwlmzc9whh48wn";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ attrs ];
+  # Has a test dependency on trio, which depends on outcome.
+  doCheck = false;
+
+  meta = {
+    description = "Capture the outcome of Python function calls.";
+    homepage = https://github.com/python-trio/outcome;
+    license = with lib.licenses; [ mit asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2e8f77d8a90e..05d956de7887 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -303,6 +303,8 @@ in {
 
   oauthenticator = callPackage ../development/python-modules/oauthenticator { };
 
+  outcome = callPackage ../development/python-modules/outcome {};
+
   plantuml = callPackage ../tools/misc/plantuml { };
 
   Pmw = callPackage ../development/python-modules/Pmw { };

From c983bbb557d5d201015d71868796777fab46d52b Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Fri, 11 May 2018 16:38:30 +0000
Subject: [PATCH 1610/3370] pythonPackages.trustme: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix
new file mode 100644
index 000000000000..0c3ccb5258e7
--- /dev/null
+++ b/pkgs/development/python-modules/trustme/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, fetchPypi, cryptography, pytest, pyopenssl, service-identity }:
+
+buildPythonPackage rec {
+  pname = "trustme";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1215vr6l6c0fzsv5gyay82fxd4fidvq2rd94wvjrljs6h2wajazk";
+  };
+
+  checkInputs = [ pytest pyopenssl service-identity ];
+  checkPhase = ''
+    py.test
+  '';
+  propagatedBuildInputs = [
+    cryptography
+  ];
+
+  meta = {
+    description = "#1 quality TLS certs while you wait, for the discerning tester";
+    homepage = https://github.com/python-trio/trustme;
+    license = with lib.licenses; [ mit asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 05d956de7887..7a7616e7fff2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -438,6 +438,8 @@ in {
     hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; };
   };
 
+  trustme = callPackage ../development/python-modules/trustme {};
+
   tokenserver = callPackage ../development/python-modules/tokenserver {};
 
   toml = callPackage ../development/python-modules/toml { };

From f78c25239e9aaaec67851ce3a5af150b49d6ac49 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Tue, 8 May 2018 22:19:48 +0000
Subject: [PATCH 1611/3370] pythonPackages.trio: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
new file mode 100644
index 000000000000..2bd607170fd5
--- /dev/null
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -0,0 +1,42 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder
+, attrs
+, sortedcontainers
+, async_generator
+, idna
+, outcome
+, contextvars
+, pytest
+, pyopenssl
+, trustme
+}:
+
+buildPythonPackage rec {
+  pname = "trio";
+  version = "0.4.0";
+  disabled = pythonOlder "3.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ib1x47knlad9pljb64ywfiv6m3dfrqqjwka6j1b73hixmszb5h4";
+  };
+
+  checkInputs = [ pytest pyopenssl trustme ];
+  # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it.
+  checkPhase = ''
+    py.test -k 'not test_getnameinfo and not test_SocketType_resolve and not test_getprotobyname'
+  '';
+  propagatedBuildInputs = [
+    attrs
+    sortedcontainers
+    async_generator
+    idna
+    outcome
+  ] ++ lib.optionals (pythonOlder "3.7") [ contextvars ];
+
+  meta = {
+    description = "An async/await-native I/O library for humans and snake people";
+    homepage = https://github.com/python-trio/trio;
+    license = with lib.licenses; [ mit asl20 ];
+    maintainers = with lib.maintainers; [ catern ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a7616e7fff2..4a4717ea6a73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -440,6 +440,8 @@ in {
 
   trustme = callPackage ../development/python-modules/trustme {};
 
+  trio = callPackage ../development/python-modules/trio {};
+
   tokenserver = callPackage ../development/python-modules/tokenserver {};
 
   toml = callPackage ../development/python-modules/toml { };

From 2d4e30ccb028e2d0369460e2b9b3462a89bf954e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 11 May 2018 19:05:39 +0200
Subject: [PATCH 1612/3370] graphite2: fix cross

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

diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index a5dc1f41e984..30a99415981b 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0xdg6bc02bl8yz39l5i2skczfg17q4lif0qqan0dhvk0mibpcpj7";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ freetype cmake ];
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ freetype ];
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ];
 

From 0d2a4ed49c81a0cda44b406d454dc58637e94c3a Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 19:26:35 +0200
Subject: [PATCH 1613/3370] nixos/tests/mesos: wait for all services and ports

to be available before sending requests.
Avoids non-deterministic test failure.
---
 nixos/tests/mesos.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix
index 34671df047c8..007d7ac21603 100644
--- a/nixos/tests/mesos.nix
+++ b/nixos/tests/mesos.nix
@@ -66,9 +66,11 @@ import ./make-test.nix ({ pkgs, ...} : rec {
   testScript =
     ''
       startAll;
+      $master->waitForUnit("zookeeper.service");
       $master->waitForUnit("mesos-master.service");
+      $slave->waitForUnit("docker.service");
       $slave->waitForUnit("mesos-slave.service");
-
+      $master->waitForOpenPort(2181);
       $master->waitForOpenPort(5050);
       $slave->waitForOpenPort(5051);
 

From ec00b6fbb3669e1852f537a8b624c6102f3eeb32 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 19:29:33 +0200
Subject: [PATCH 1614/3370] nixos/mesos-slave: start after docker

If docker is enabled, start mesos-slave.service after docker.service
to avoid a race condition that could result in mesos-slave to fail
with "Failed to create docker: Timed out getting docker version"
---
 nixos/modules/services/misc/mesos-slave.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix
index effa29b64f63..468c7f36ecc5 100644
--- a/nixos/modules/services/misc/mesos-slave.nix
+++ b/nixos/modules/services/misc/mesos-slave.nix
@@ -187,7 +187,7 @@ in {
     systemd.services.mesos-slave = {
       description = "Mesos Slave";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      after = [ "network.target" ] ++ optionals cfg.withDocker [ "docker.service" ] ;
       path = [ pkgs.runtimeShellPackage ];
       serviceConfig = {
         ExecStart = ''

From 170d799146a02952ead929fb267d40aba977fdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Fri, 11 May 2018 20:53:01 +0200
Subject: [PATCH 1615/3370] kitty: 0.9.0 -> 0.9.1 (#40335)

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

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index 496353325255..e9c860f0b901 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -5,7 +5,7 @@
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.9.0";
+  version = "0.9.1";
   name = "kitty-${version}";
   format = "other";
 
@@ -13,7 +13,7 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "0q6dwwzq1qq3rgh4myxhidgk4bj1p23bhaw5cxb1q0hdgpc54ni8";
+    sha256 = "08j2k3852c64z4mgh1j0dgdj6c2alkckpav67lzg1lxsz3w2izh2";
   };
 
   buildInputs = [

From ac369f6fe8fc102d5bbbb7e25ed15a1bd8f103cd Mon Sep 17 00:00:00 2001
From: mingchuan <sifmelcara@users.noreply.github.com>
Date: Sat, 12 May 2018 02:54:09 +0800
Subject: [PATCH 1616/3370] powerline-go: 1.10.0 -> 1.11.0 (#40369)

---
 pkgs/tools/misc/powerline-go/default.nix |  4 ++--
 pkgs/tools/misc/powerline-go/deps.nix    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix
index e31c0da6306a..b0d1afc654d8 100644
--- a/pkgs/tools/misc/powerline-go/default.nix
+++ b/pkgs/tools/misc/powerline-go/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   pname = "powerline-go";
-  version = "1.10.0";
+  version = "1.11.0";
   name = "${pname}-${version}";
   rev = "v${version}";
 
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "justjanne";
     repo = pname;
     inherit rev;
-    sha256 = "1bmgim61cx6i4m24a474nm3w4zqjflm0wnw3y24299n9dj14izs3";
+    sha256 = "1s3d9p4jf23n63n6vx3frnw3wkmg3kyiazapixy66790qkx6ddi9";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/misc/powerline-go/deps.nix b/pkgs/tools/misc/powerline-go/deps.nix
index 78e28efb3b10..e033a1cf48cf 100644
--- a/pkgs/tools/misc/powerline-go/deps.nix
+++ b/pkgs/tools/misc/powerline-go/deps.nix
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/shirou/gopsutil";
-      rev = "63047d776e07105e370af46ecbd0ae96850f5ef2";
-      sha256 = "0204f0gx3fd8ya6rb478a7a4gr2v4i3m71148iv3jrdfvr5q5aaw";
+      rev = "57f370e13068146efe1cb7129f79e5d51da8a242";
+      sha256 = "1ij0bbnfjj65afin8vhccr3cxvg6r0awmvcvb2ilza5wbbsslggb";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "2b6c08872f4b66da917bb4ce98df4f0307330f78";
-      sha256 = "07wgdhs7ac3qmx0lfr4zazg2l159jqbwmn7jx49rr9811vivl1yh";
+      rev = "2d027ae1dddd4694d54f7a8b6cbe78dca8720226";
+      sha256 = "1fdab3scp9fm88jxwjw8a3hh5ykx6ads3zcacgy48k2n6b0rqrdw";
     };
   }
   {
@@ -32,8 +32,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "79b0c6888797020a994db17c8510466c72fe75d9";
-      sha256 = "0aydjw886c4dwcjg7ssb7xp39ag1529nh3ly1la71rqjr94cjnag";
+      rev = "9950ad118b73f9207b991f01920a3509c68f7f2b";
+      sha256 = "1607m89kpdxgc2lj14mrp02bg7c42g1zv0fzrl5961gvm5qzbjja";
     };
   }
   {
@@ -41,8 +41,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
-      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
+      rev = "7dd2c8130f5e924233f5543598300651c386d431";
+      sha256 = "0ja6skzplirb7dgf5d4wi0navinf8j5iakak020lwm7287wnpcrg";
     };
   }
   {

From 1d2f7dff36517acfabd69d2ad5455c9b2c2655bb Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 13:51:20 -0500
Subject: [PATCH 1617/3370] gimp: only use libgudev on linux

libgudev relies on udev which is a part of systemd. These are very
tightly coupled to Linux so we just enable them on Linux.
---
 pkgs/applications/graphics/gimp/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 2536367f6ceb..80bc2d49efce 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -43,11 +43,12 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];
   propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
   buildInputs = [
-    babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes libgudev
+    babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes
     freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr
     libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp
     python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ];
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ];
 
   pythonPath = [ pygtk ];
 

From 341794a4b9e8e88e7a346e6972797be134688e1d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 15:02:18 -0400
Subject: [PATCH 1618/3370] lib/systems: Sort platforms, and space CPUs

---
 lib/systems/examples.nix  |  10 +--
 lib/systems/parse.nix     |   5 ++
 lib/systems/platforms.nix | 178 +++++++++++++++++++++-----------------
 3 files changed, 106 insertions(+), 87 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 32c24bab7c98..05c788ddd1ae 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -47,15 +47,7 @@ rec {
 
   ben-nanonote = rec {
     config = "mipsel-unknown-linux-uclibc";
-    platform = {
-      name = "ben_nanonote";
-      kernelMajor = "2.6";
-      kernelArch = "mips";
-      gcc = {
-        arch = "mips32";
-        float = "soft";
-      };
-    };
+    platform = platforms.ben_nanonote;
   };
 
   fuloongminipc = rec {
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 3667766aa9f7..33daf0791641 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -79,15 +79,20 @@ rec {
     armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
+
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
+
     mips     = { bits = 32; significantByte = bigEndian;    family = "mips"; };
     mipsel   = { bits = 32; significantByte = littleEndian; family = "mips"; };
     mips64   = { bits = 64; significantByte = bigEndian;    family = "mips"; };
     mips64el = { bits = 64; significantByte = littleEndian; family = "mips"; };
+
     powerpc  = { bits = 32; significantByte = bigEndian;    family = "power"; };
+
     riscv32  = { bits = 32; significantByte = littleEndian; family = "riscv"; };
     riscv64  = { bits = 64; significantByte = littleEndian; family = "riscv"; };
+
     wasm32   = { bits = 32; significantByte = littleEndian; family = "wasm"; };
     wasm64   = { bits = 64; significantByte = littleEndian; family = "wasm"; };
   };
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index d6587ac49a89..cceaecf01843 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -20,6 +20,10 @@ rec {
     kernelAutoModules = false;
   };
 
+  ##
+  ## ARM
+  ##
+
   pogoplug4 = {
     name = "pogoplug4";
 
@@ -372,84 +376,6 @@ rec {
     kernelBaseConfig = "guruplug_defconfig";
   };
 
-  fuloong2f_n32 = {
-    name = "fuloong2f_n32";
-    kernelMajor = "2.6";
-    kernelBaseConfig = "lemote2f_defconfig";
-    kernelArch = "mips";
-    kernelAutoModules = false;
-    kernelExtraConfig = ''
-      MIGRATION n
-      COMPACTION n
-
-      # nixos mounts some cgroup
-      CGROUPS y
-
-      BLK_DEV_RAM y
-      BLK_DEV_INITRD y
-      BLK_DEV_CRYPTOLOOP m
-      BLK_DEV_DM m
-      DM_CRYPT m
-      MD y
-      REISERFS_FS m
-      EXT4_FS m
-      USB_STORAGE_CYPRESS_ATACB m
-
-      IP_PNP y
-      IP_PNP_DHCP y
-      IP_PNP_BOOTP y
-      NFS_FS y
-      ROOT_NFS y
-      TUN m
-      NFS_V4 y
-      NFS_V4_1 y
-      NFS_FSCACHE y
-      NFSD m
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-
-      # Fail to build
-      DRM n
-      SCSI_ADVANSYS n
-      USB_ISP1362_HCD n
-      SND_SOC n
-      SND_ALI5451 n
-      FB_SAVAGE n
-      SCSI_NSP32 n
-      ATA_SFF n
-      SUNGEM n
-      IRDA n
-      ATM_HE n
-      SCSI_ACARD n
-      BLK_DEV_CMD640_ENHANCED n
-
-      FUSE_FS m
-
-      # Needed for udev >= 150
-      SYSFS_DEPRECATED_V2 n
-
-      VGA_CONSOLE n
-      VT_HW_CONSOLE_BINDING y
-      SERIAL_8250_CONSOLE y
-      FRAMEBUFFER_CONSOLE y
-      EXT2_FS y
-      EXT3_FS y
-      REISERFS_FS y
-      MAGIC_SYSRQ y
-
-      # The kernel doesn't boot at all, with FTRACE
-      FTRACE n
-    '';
-    kernelTarget = "vmlinux";
-    gcc = {
-      arch = "loongson2f";
-      float = "hard";
-      abi = "n32";
-    };
-  };
-
   beaglebone = armv7l-hf-multiplatform // {
     name = "beaglebone";
     kernelBaseConfig = "bb.org_defconfig";
@@ -537,6 +463,102 @@ rec {
     };
   };
 
+  ##
+  ## MIPS
+  ##
+
+  ben_nanonote = {
+    name = "ben_nanonote";
+    kernelMajor = "2.6";
+    kernelArch = "mips";
+    gcc = {
+      arch = "mips32";
+      float = "soft";
+    };
+  };
+
+  fuloong2f_n32 = {
+    name = "fuloong2f_n32";
+    kernelMajor = "2.6";
+    kernelBaseConfig = "lemote2f_defconfig";
+    kernelArch = "mips";
+    kernelAutoModules = false;
+    kernelExtraConfig = ''
+      MIGRATION n
+      COMPACTION n
+
+      # nixos mounts some cgroup
+      CGROUPS y
+
+      BLK_DEV_RAM y
+      BLK_DEV_INITRD y
+      BLK_DEV_CRYPTOLOOP m
+      BLK_DEV_DM m
+      DM_CRYPT m
+      MD y
+      REISERFS_FS m
+      EXT4_FS m
+      USB_STORAGE_CYPRESS_ATACB m
+
+      IP_PNP y
+      IP_PNP_DHCP y
+      IP_PNP_BOOTP y
+      NFS_FS y
+      ROOT_NFS y
+      TUN m
+      NFS_V4 y
+      NFS_V4_1 y
+      NFS_FSCACHE y
+      NFSD m
+      NFSD_V2_ACL y
+      NFSD_V3 y
+      NFSD_V3_ACL y
+      NFSD_V4 y
+
+      # Fail to build
+      DRM n
+      SCSI_ADVANSYS n
+      USB_ISP1362_HCD n
+      SND_SOC n
+      SND_ALI5451 n
+      FB_SAVAGE n
+      SCSI_NSP32 n
+      ATA_SFF n
+      SUNGEM n
+      IRDA n
+      ATM_HE n
+      SCSI_ACARD n
+      BLK_DEV_CMD640_ENHANCED n
+
+      FUSE_FS m
+
+      # Needed for udev >= 150
+      SYSFS_DEPRECATED_V2 n
+
+      VGA_CONSOLE n
+      VT_HW_CONSOLE_BINDING y
+      SERIAL_8250_CONSOLE y
+      FRAMEBUFFER_CONSOLE y
+      EXT2_FS y
+      EXT3_FS y
+      REISERFS_FS y
+      MAGIC_SYSRQ y
+
+      # The kernel doesn't boot at all, with FTRACE
+      FTRACE n
+    '';
+    kernelTarget = "vmlinux";
+    gcc = {
+      arch = "loongson2f";
+      float = "hard";
+      abi = "n32";
+    };
+  };
+
+  ##
+  ## Other
+  ##
+
   riscv-multiplatform = bits: {
     name = "riscv-multiplatform";
     kernelArch = "riscv";

From cd9b1b16659fa200359e0a28a1c3cfa9c7c796a0 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Fri, 11 May 2018 21:29:45 +0200
Subject: [PATCH 1619/3370] openmpi: 3.0.1 -> 3.1.0 (#40344)

---
 pkgs/development/libraries/openmpi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 2d3b9780090d..1748ebd5f3cd 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -8,15 +8,15 @@
 }:
 
 let
-  majorVersion = "3.0";
-  minorVersion = "1";
+  majorVersion = "3.1";
+  minorVersion = "0";
 
 in stdenv.mkDerivation rec {
   name = "openmpi-${majorVersion}.${minorVersion}";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
-    sha256 = "0pbqrm5faf57nasy1s81wqivl7zvxmv8lzjh8hvb0f3qxv8m0d36";
+    sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j";
   };
 
   postPatch = ''

From 7c2d43f3f93fbffec09cbf7a1b9b0b53bc58568b Mon Sep 17 00:00:00 2001
From: Scott Trinh <scottyparade@gmail.com>
Date: Fri, 11 May 2018 15:31:56 -0400
Subject: [PATCH 1620/3370] Fix small typo in configuration documentation
 (#40357)

* Fix small typo in configuration documentation
* doc: Fix second instance of same typo
---
 doc/configuration.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/configuration.xml b/doc/configuration.xml
index 4411b4844e99..c91f38f30930 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -378,7 +378,7 @@
     myPackages = pkgs.buildEnv {
       name = "my-packages";
       paths = [ aspell bc coreutils ffmpeg nixUnstable emscripten jq nox silver-searcher ];
-      pathsToLink = [ "/share/man" "/share/doc" /bin" ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" ];
       extraOutputsToInstall = [ "man" "doc" ];
     };
   };
@@ -416,7 +416,7 @@ cp ${myProfile} $out/etc/profile.d/my-profile.sh
         nox
         silver-searcher
       ];
-      pathsToLink = [ "/share/man" "/share/doc" /bin" "/etc" ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];
       extraOutputsToInstall = [ "man" "doc" ];
     };
   };

From 4f06c77709cb23bd10927c85d4bf24ed4ed82eb2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 11 May 2018 12:35:27 -0700
Subject: [PATCH 1621/3370] hstr: 1.24 -> 1.25 (#40352)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/hstr/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25/bin/hh -h’ got 0 exit code
- ran ‘/nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25/bin/hh --help’ got 0 exit code
- ran ‘/nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25/bin/hstr -h’ got 0 exit code
- ran ‘/nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25/bin/hstr --help’ got 0 exit code
- found 1.25 with grep in /nix/store/7z31mpl2b4dh98vvb04nx4hzrrh5k6ak-hstr-1.25
- directory tree listing: https://gist.github.com/78f6aa615325f274537cb003e3aabf26
---
 pkgs/applications/misc/hstr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index db50b0d2169a..026cf9ecc14a 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "hstr-${version}";
-  version = "1.24";
+  version = "1.25";
 
   src = fetchurl {
     url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
-    sha256 = "0w8is777fwq6r17zhl9xwrv9f7vanllzjiasx1pg6pxvppq7rh0x";
+    sha256 = "10njj0a3s5czv497wk3whka3gxr7vmhabs12vaw7kgb07h4ssnhg";
   };
 
   buildInputs = [ readline ncurses ];

From d3e3e131f565be1d72e98980e0e22cc0b05f46ec Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 11 May 2018 21:48:38 +0200
Subject: [PATCH 1622/3370] fuse3: 3.2.2 -> 3.2.3

---
 pkgs/os-specific/linux/fuse/common.nix              | 13 +++++--------
 pkgs/os-specific/linux/fuse/default.nix             |  7 ++-----
 pkgs/os-specific/linux/fuse/fuse3-fix-version.patch |  8 --------
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/fuse/fuse3-fix-version.patch

diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix
index 95011653ad01..04a4a1a0e1f1 100644
--- a/pkgs/os-specific/linux/fuse/common.nix
+++ b/pkgs/os-specific/linux/fuse/common.nix
@@ -1,4 +1,4 @@
-{ version, sha256Hash, maintainers }:
+{ version, sha256Hash }:
 
 { stdenv, fetchFromGitHub, fetchpatch
 , fusePackages, utillinux, gettext
@@ -28,10 +28,7 @@ in stdenv.mkDerivation rec {
         url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch";
         sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa";
       })
-    ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch
-    # TODO: Only relevant for 3.2.2 (opened an upstream issue)
-    ++ stdenv.lib.optional isFuse3 ./fuse3-fix-version.patch;
-
+    ++ stdenv.lib.optional isFuse3 ./fuse3-install.patch;
 
   nativeBuildInputs = if isFuse3
     then [ meson ninja pkgconfig ]
@@ -76,10 +73,10 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     inherit (src.meta) homepage;
     description = "Kernel module and library that allows filesystems to be implemented in user space";
-    platforms = stdenv.lib.platforms.linux;
-    inherit maintainers;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.primeos ];
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index ddf280bbe2f7..f308930f0dc5 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -4,17 +4,14 @@ let
   mkFuse = args: callPackage (import ./common.nix args) {
     inherit utillinux;
   };
-  maintainers = stdenv.lib.maintainers;
 in {
   fuse_2 = mkFuse {
     version = "2.9.7";
     sha256Hash = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2";
-    maintainers = [ ];
   };
 
   fuse_3 = mkFuse {
-    version = "3.2.2";
-    sha256Hash = "1a0x4vpyg9lc6clwvx995mk0v6jqd37xabzp9rpdir37x814g3wh";
-    maintainers = [ maintainers.primeos ];
+    version = "3.2.3";
+    sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d";
   };
 }
diff --git a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch b/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch
deleted file mode 100644
index b6351aab3c01..000000000000
--- a/pkgs/os-specific/linux/fuse/fuse3-fix-version.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/meson.build	2018-04-01 01:05:19.612723597 +0200
-+++ b/meson.build	2018-04-01 01:40:58.171109615 +0200
-@@ -1,4 +1,4 @@
--project('libfuse3', 'c', version: '3.2.1',
-+project('libfuse3', 'c', version: '3.2.2',
-         meson_version: '>= 0.38',
-         default_options: [ 'buildtype=debugoptimized' ])
-

From 18370267efa8f210b96ce74c7fdc37fc419ec187 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Sat, 12 May 2018 02:12:04 +0400
Subject: [PATCH 1623/3370] chromium: 66.0.3359.139 -> 66.0.3359.170

Update includes 4 security fixes, including one critical (see [0]):

* [835887] Critical: Chain leading to sandbox escape. Reported by Anonymous on 2018-04-23:
* [836858] High CVE-2018-6121: Privilege Escalation in extensions.
* [836141] High CVE-2018-6122: Type confusion in V8.
* [$5000][833721] High CVE-2018-6120: Heap buffer overflow in PDFium.  Reported by Zhou Aiting(@zhouat1) of Qihoo 360 Vulcan Team on 2018-04-17

[0] https://chromereleases.googleblog.com/2018/05/stable-channel-update-for-desktop.html

PS: Didn't build Beta and Dev, verified only Stable for now

cc @bendlas @aszlig
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 7be5d2591150..147e8d33a0e3 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "136gx9qqbzfzaf19k0gxb8n4ypd4ycyr83i9v68nqdvy2k26vf4n";
-    sha256bin64 = "0w628afj5k4xygizlznwxkljgc1prxqc3lanaz6gdmyrl7gk1s7n";
-    version = "67.0.3396.18";
+    sha256 = "169lxj6rhpqcnrg3n2api82975hkifz6wmks1bh04jkxw0z2vkny";
+    sha256bin64 = "1hd4s35yhi2xidy3xncp66p03cv715bzbf3gcv5dl0d1h3nmhhdf";
+    version = "67.0.3396.40";
   };
   dev = {
-    sha256 = "1yspf0n385ail9qxsmax58mfk5yi473ygsraqs83q30pfgxc5z2f";
-    sha256bin64 = "1gi1xpnjwkg7sxv94ksv6fiymw13rxdq2hyvza8b9famvfcaz07j";
-    version = "68.0.3409.2";
+    sha256 = "0j4vcfbdj8cvdsmnb6pz0k71w559rm3ka1yyv0yfq7f756hinpvp";
+    sha256bin64 = "1qqhyjdd227psvr904w3d3lq47bfwmpk6f7sam2gp4j0wxn23w8w";
+    version = "68.0.3423.2";
   };
   stable = {
-    sha256 = "1ck4wbi28702p1lfs4sz894ysbgm7fj79wrqj8srsy65z2ssaxdy";
-    sha256bin64 = "1vgrgay3h0961vj96ql2p0pb16gzfr48r4hk25rxdqbflnz7njz0";
-    version = "66.0.3359.139";
+    sha256 = "1pki90vnc8amzdwagcsnkwnqnw4k442234x8wfc7cf0rkmjackc6";
+    sha256bin64 = "0a68w4p0dqxal7xh7nlfzsj7yl9xxp1bq3khfnpa3r7r38zbxnpw";
+    version = "66.0.3359.170";
   };
 }

From 2490c50346250a15d84067b16722a1a9ec3e2aae Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 12 May 2018 00:23:34 +0200
Subject: [PATCH 1624/3370] signal-desktop: 1.10.0 -> 1.10.1

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 4fe4d6ceca2c..80f219560e36 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.10.0";
+    version = "1.10.1";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "0fjc5zf3lr5pmlc57yv3spjk2hq4b3lxngc6iw6c73ficnz4ij7i";
+          sha256 = "1ndk2in9mbsm5i2k7pgpbd6smbgpswxmjvr12zmbmw893ay015h3";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";

From e3f6c6d18d8ffbb4f9462adbf6648500b9514bbb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 17:35:56 -0400
Subject: [PATCH 1625/3370] lib: Add 32-bit Android platforms

---
 lib/systems/examples.nix  | 12 ++++++++++++
 lib/systems/platforms.nix | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 05c788ddd1ae..87da31f3137f 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -29,6 +29,18 @@ rec {
     platform = platforms.aarch64-multiplatform;
   };
 
+  armv5te-android-prebuilt = rec {
+    config = "armv5tel-unknown-linux-androideabi";
+    platform = platforms.armv5te-android;
+    useAndroidPrebuilt = true;
+  };
+
+  armv7a-android-prebuilt = rec {
+    config = "armv7a-unknown-linux-androideabi";
+    platform = platforms.armv7a-android;
+    useAndroidPrebuilt = true;
+  };
+
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
     platform = platforms.aarch64-multiplatform;
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index cceaecf01843..5becaf581a45 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -384,6 +384,27 @@ rec {
     kernelTarget = "zImage";
   };
 
+  # https://developer.android.com/ndk/guides/abis#armeabi
+  armv5te-android = {
+    name = "armeabi";
+    gcc = {
+      arch = "armv5te";
+      float = "soft";
+      float-abi = "soft";
+    };
+  };
+
+  # https://developer.android.com/ndk/guides/abis#v7a
+  armv7a-android =  {
+    name = "armeabi-v7a";
+    gcc = {
+      arch = "armv7-a";
+      float = "hard";
+      float-abi = "softfp";
+      fpu = "vfpv3-d16";
+    };
+  };
+
   armv7l-hf-multiplatform = {
     name = "armv7l-hf-multiplatform";
     kernelMajor = "2.6"; # Using "2.6" enables 2.6 kernel syscalls in glibc.

From f4de66977749f733b9a13d5f03550960ff800b0b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 18:30:38 -0400
Subject: [PATCH 1626/3370] lib/systems/inspect: Fix after assertions

Function are never equal in Nix, so we need to filter out this attribute
in ABIs.
---
 lib/systems/inspect.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index 9960954e4649..c0c283469fe9 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -3,6 +3,9 @@ with import ./parse.nix { inherit lib; };
 with lib.attrsets;
 with lib.lists;
 
+let abis_ = abis; in
+let abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) abis_; in
+
 rec {
   patterns = rec {
     isi686         = { cpu = cpuTypes.i686; };

From 28bacc2093a43c21f34a192397d2b2561a9fd29d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 17:35:56 -0400
Subject: [PATCH 1627/3370] lib/systems: Add assertion to "android" ABI

This is analogous to the GNU assertion.
---
 lib/systems/parse.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 02ca3a6b3614..3dba5ad46984 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -199,8 +199,16 @@ rec {
     msvc         = {};
     eabi         = {};
 
-    androideabi  = {};
-    android      = {};
+    androideabi  = { float = "hard"; };
+    android      = {
+      assertions = [
+        { assertion = platform: !platform.isAarch32;
+          message = ''
+            The "android" ABI is not for 32-bit ARM. Use "androideabi" instead.
+          '';
+        }
+      ];
+    };
 
     gnueabi      = { float = "soft"; };
     gnueabihf    = { float = "hard"; };

From 827ef0914089e1a2bba140b49e1311eff28cc156 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 27 Feb 2018 18:36:48 -0500
Subject: [PATCH 1628/3370] prebuilt android cc: Edit wrapper to pass the right
 -m flags for armv7a

---
 lib/systems/examples.nix                      |  3 ++
 .../mobile/androidenv/androidndk-pkgs.nix     | 33 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 897ba448b951..9c43d9b1bbc7 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -31,18 +31,21 @@ rec {
 
   armv5te-android-prebuilt = rec {
     config = "armv5tel-unknown-linux-androideabi";
+    sdkVer = "21";
     platform = platforms.armv5te-android;
     useAndroidPrebuilt = true;
   };
 
   armv7a-android-prebuilt = rec {
     config = "armv7a-unknown-linux-androideabi";
+    sdkVer = "21";
     platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
   };
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
+    sdkVer = "21";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 19fc0dc812d8..f0557390988d 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -15,7 +15,12 @@ let
     "x86_64-unknown-linux-gnu" = {
       double = "linux-x86_64";
     };
-    "arm-unknown-linux-androideabi" = {
+   "armv5tel-unknown-linux-androideabi" = {
+      arch = "arm";
+      triple = "arm-linux-androideabi";
+      gccVer = "4.8";
+    };
+   "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
       gccVer = "4.8";
@@ -59,9 +64,29 @@ rec {
     cc = binaries;
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
-    extraBuildCommands =
+    extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let
+        p = targetPlatform.platform.gcc or {};
+        float = p.float or (targetPlatform.parsed.abi.float or null);
+        flags = lib.concatLists [
+          (lib.optional (p ? arch) "-march=${p.arch}")
+          (lib.optional (p ? cpu) "-mcpu=${p.cpu}")
+          (lib.optional (p ? abi) "-mabi=${p.abi}")
+          (lib.optional (p ? fpu) "-mfpu=${p.fpu}")
+          (lib.optional (float != null) "-mfloat=${float}")
+          (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
+          (lib.optional (p ? mode) "-mmode=${p.mode}")
+        ];
+      in ''
+        sed -E -i \
+          $out/bin/${targetPlatform.config}-cc \
+          $out/bin/${targetPlatform.config}-c++ \
+          $out/bin/${targetPlatform.config}-gcc \
+          $out/bin/${targetPlatform.config}-g++ \
+          -e '130i    extraBefore+=(-Wl,--fix-cortex-a8)' \
+          -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|'
+      '')
       # GCC 4.9 is the first relase with "-fstack-protector"
-      lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
+      + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
         sed -E \
         -i $out/nix-support/add-hardening.sh \
         -e 's|(-fstack-protector)-strong|\1|g'
@@ -76,7 +101,7 @@ rec {
   libraries = {
     name = "bionic-prebuilt";
     type = "derivation";
-    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-21/arch-${hostInfo.arch}/usr/";
+    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/";
     drvPath = throw "fake derivation, build ${buildAndroidndk} to use";
   };
 }

From e4777ae2d84c5f38740b744fe85e305f1a2f0209 Mon Sep 17 00:00:00 2001
From: Ihor Antonov <ngortheone@gmail.com>
Date: Wed, 2 May 2018 11:13:13 -0400
Subject: [PATCH 1629/3370] Fix kernel panic on ec2 kvm instances caused by io
 timeout on nvme root volume

---
 nixos/maintainers/scripts/ec2/amazon-image.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 972c04453aef..5ab5d400e05c 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -8,6 +8,11 @@ in {
 
   imports = [ ../../../modules/virtualisation/amazon-image.nix ];
 
+  # Required to avoid kernel panics on KVM instances where nvme volume availability can get delayed
+  # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
+  # TODO change value to 4294967295 when kernel is updated to 4.15 or later
+  config.boot.kernelParams = [ "nvme_core.io_timeout=255" ];
+
   options.amazonImage = {
     name = mkOption {
       type = types.str;

From 08ebd830a559692f9b34a1619cca44b1888468a0 Mon Sep 17 00:00:00 2001
From: Ihor Antonov <ngortheone@gmail.com>
Date: Wed, 9 May 2018 10:15:16 -0400
Subject: [PATCH 1630/3370] Fix kernel crash caused by absent root device

---
 .../maintainers/scripts/ec2/amazon-image.nix  |  2 +-
 nixos/modules/system/boot/grow-partition.nix  |  2 +-
 nixos/modules/system/boot/stage-1-init.sh     | 50 ++++++++++---------
 nixos/modules/virtualisation/amazon-image.nix |  7 ---
 4 files changed, 28 insertions(+), 33 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 5ab5d400e05c..eeae27ede0f8 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -8,7 +8,7 @@ in {
 
   imports = [ ../../../modules/virtualisation/amazon-image.nix ];
 
-  # Required to avoid kernel panics on KVM instances where nvme volume availability can get delayed
+  # Required to provide good EBS experience,
   # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes
   # TODO change value to 4294967295 when kernel is updated to 4.15 or later
   config.boot.kernelParams = [ "nvme_core.io_timeout=255" ];
diff --git a/nixos/modules/system/boot/grow-partition.nix b/nixos/modules/system/boot/grow-partition.nix
index 1e6f9e442b67..8c9b1502558a 100644
--- a/nixos/modules/system/boot/grow-partition.nix
+++ b/nixos/modules/system/boot/grow-partition.nix
@@ -30,7 +30,7 @@ with lib;
 
     boot.initrd.postDeviceCommands = ''
       rootDevice="${config.fileSystems."/".device}"
-      if [ -e "$rootDevice" ]; then
+      if waitDevice "$rootDevice"; then
         rootDevice="$(readlink -f "$rootDevice")"
         parentDevice="$rootDevice"
         while [ "''${parentDevice%[0-9]}" != "''${parentDevice}" ]; do
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 964ec68cfe2f..1facf419ed06 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -74,6 +74,32 @@ ln -s /proc/mounts /etc/mtab # to shut up mke2fs
 touch /etc/udev/hwdb.bin # to shut up udev
 touch /etc/initrd-release
 
+# Function for waiting a device to appear.
+waitDevice() {
+    local device="$1"
+
+    # USB storage devices tend to appear with some delay.  It would be
+    # great if we had a way to synchronously wait for them, but
+    # alas...  So just wait for a few seconds for the device to
+    # appear.
+    if test ! -e $device; then
+        echo -n "waiting for device $device to appear..."
+        try=20
+        while [ $try -gt 0 ]; do
+            sleep 1
+            # also re-try lvm activation now that new block devices might have appeared
+            lvm vgchange -ay
+            # and tell udev to create nodes for the new LVs
+            udevadm trigger --action=add
+            if test -e $device; then break; fi
+            echo -n "."
+            try=$((try - 1))
+        done
+        echo
+        [ $try -ne 0 ]
+    fi
+}
+
 # Mount special file systems.
 specialMount() {
   local device="$1"
@@ -377,31 +403,7 @@ lustrateRoot () {
     exec 4>&-
 }
 
-# Function for waiting a device to appear.
-waitDevice() {
-    local device="$1"
 
-    # USB storage devices tend to appear with some delay.  It would be
-    # great if we had a way to synchronously wait for them, but
-    # alas...  So just wait for a few seconds for the device to
-    # appear.
-    if test ! -e $device; then
-        echo -n "waiting for device $device to appear..."
-        try=20
-        while [ $try -gt 0 ]; do
-            sleep 1
-            # also re-try lvm activation now that new block devices might have appeared
-            lvm vgchange -ay
-            # and tell udev to create nodes for the new LVs
-            udevadm trigger --action=add
-            if test -e $device; then break; fi
-            echo -n "."
-            try=$((try - 1))
-        done
-        echo
-        [ $try -ne 0 ]
-    fi
-}
 
 
 # Try to resume - all modules are loaded now.
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index f74c42a777f5..e9e935e90202 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -48,13 +48,6 @@ let cfg = config.ec2; in
     boot.loader.grub.extraPerEntryConfig = mkIf (!cfg.hvm) "root (hd0)";
     boot.loader.timeout = 0;
 
-    boot.initrd.postDeviceCommands =
-      ''
-        # Force udev to exit to prevent random "Device or resource busy
-        # while trying to open /dev/xvda" errors from fsck.
-        udevadm control --exit || true
-      '';
-
     boot.initrd.network.enable = true;
 
     # Mount all formatted ephemeral disks and activate all swap devices.

From 13f83ba05fbf8a70a497f3136f35e7fe604d0bc0 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 12 May 2018 02:16:25 +0200
Subject: [PATCH 1631/3370] nixos/tests/kafka: fix and refactor tests

- refactor into single file for all versions
- improve timing, prevent non-deterministic failures
- fix tests for i686-linux
---
 nixos/release.nix          |  5 +--
 nixos/tests/kafka.nix      | 68 ++++++++++++++++++++++++++++++++++++++
 nixos/tests/kafka_0_10.nix | 48 ---------------------------
 nixos/tests/kafka_0_11.nix | 48 ---------------------------
 nixos/tests/kafka_0_9.nix  | 48 ---------------------------
 nixos/tests/kafka_1_0.nix  | 48 ---------------------------
 6 files changed, 69 insertions(+), 196 deletions(-)
 create mode 100644 nixos/tests/kafka.nix
 delete mode 100644 nixos/tests/kafka_0_10.nix
 delete mode 100644 nixos/tests/kafka_0_11.nix
 delete mode 100644 nixos/tests/kafka_0_9.nix
 delete mode 100644 nixos/tests/kafka_1_0.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index ae70b535a5e2..57fc245e57dd 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -313,10 +313,7 @@ in rec {
   tests.plotinus = callTest tests/plotinus.nix {};
   tests.keymap = callSubTests tests/keymap.nix {};
   tests.initrdNetwork = callTest tests/initrd-network.nix {};
-  tests.kafka_0_9 = callTest tests/kafka_0_9.nix {};
-  tests.kafka_0_10 = callTest tests/kafka_0_10.nix {};
-  tests.kafka_0_11 = callTest tests/kafka_0_11.nix {};
-  tests.kafka_1_0 = callTest tests/kafka_1_0.nix {};
+  tests.kafka = callSubTests tests/kafka.nix {};
   tests.kernel-copperhead = callTest tests/kernel-copperhead.nix {};
   tests.kernel-latest = callTest tests/kernel-latest.nix {};
   tests.kernel-lts = callTest tests/kernel-lts.nix {};
diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
new file mode 100644
index 000000000000..6209b4b8e2b7
--- /dev/null
+++ b/nixos/tests/kafka.nix
@@ -0,0 +1,68 @@
+{ system ? builtins.currentSystem }:
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+let
+  makeKafkaTest = name: kafkaPackage: (makeTest {
+    inherit name;
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ nequissimus ];
+    };
+
+    nodes = {
+      zookeeper1 = { config, ... }: {
+        services.zookeeper = {
+          enable = true;
+        };
+
+        networking.firewall.allowedTCPPorts = [ 2181 ];
+        virtualisation.memorySize = 1024;
+      };
+      kafka = { config, ... }: {
+        services.apache-kafka = {
+          enable = true;
+          extraProperties = ''
+            offsets.topic.replication.factor = 1
+            zookeeper.session.timeout.ms = 600000
+          '';
+          package = kafkaPackage;
+          zookeeper = "zookeeper1:2181";
+          # These are the default options, but UseCompressedOops doesn't work with 32bit JVM
+          jvmOptions = [
+            "-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled"
+            "-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true"
+          ] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ];
+        };
+
+        networking.firewall.allowedTCPPorts = [ 9092 ];
+        # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048)
+        virtualisation.memorySize = 2047; 
+      };
+    };
+
+    testScript = ''
+      startAll;
+
+      $zookeeper1->waitForUnit("default.target");
+      $zookeeper1->waitForUnit("zookeeper.service");
+      $zookeeper1->waitForOpenPort(2181);
+
+      $kafka->waitForUnit("default.target");
+      $kafka->waitForUnit("apache-kafka.service");
+      $kafka->waitForOpenPort(9092);
+
+      $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
+      $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
+    '' + (if name == "kafka_0_9" then ''
+      $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+    '' else ''
+      $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
+    '');
+  });
+
+in with pkgs; {
+  kafka_0_9  = makeKafkaTest "kafka_0_9"  apacheKafka_0_9;
+  kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10;
+  kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
+  kafka_1_0  = makeKafkaTest "kafka_1_0"  apacheKafka_1_0;
+}
diff --git a/nixos/tests/kafka_0_10.nix b/nixos/tests/kafka_0_10.nix
deleted file mode 100644
index 6e7820f64bc4..000000000000
--- a/nixos/tests/kafka_0_10.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... } :
-let
-  kafkaPackage = pkgs.apacheKafka_0_10;
-in {
-  name = "kafka_0_10";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  nodes = {
-    zookeeper1 = { config, ... }: {
-      services.zookeeper = {
-        enable = true;
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2181 ];
-    };
-    kafka = { config, ... }: {
-      services.apache-kafka = {
-        enable = true;
-        extraProperties = ''
-          offsets.topic.replication.factor = 1
-        '';
-        package = kafkaPackage;
-        zookeeper = "zookeeper1:2181";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 9092 ];
-      virtualisation.memorySize = 2048;
-    };
-  };
-
-  testScript = ''
-    startAll;
-
-    $zookeeper1->waitForUnit("zookeeper");
-    $zookeeper1->waitForUnit("network.target");
-    $zookeeper1->waitForOpenPort(2181);
-
-    $kafka->waitForUnit("apache-kafka");
-    $kafka->waitForUnit("network.target");
-    $kafka->waitForOpenPort(9092);
-
-    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
-    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
-    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
-  '';
-})
diff --git a/nixos/tests/kafka_0_11.nix b/nixos/tests/kafka_0_11.nix
deleted file mode 100644
index 39f9c36bb229..000000000000
--- a/nixos/tests/kafka_0_11.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... } :
-let
-  kafkaPackage = pkgs.apacheKafka_0_11;
-in {
-  name = "kafka_0_11";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  nodes = {
-    zookeeper1 = { config, ... }: {
-      services.zookeeper = {
-        enable = true;
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2181 ];
-    };
-    kafka = { config, ... }: {
-      services.apache-kafka = {
-        enable = true;
-        extraProperties = ''
-          offsets.topic.replication.factor = 1
-        '';
-        package = kafkaPackage;
-        zookeeper = "zookeeper1:2181";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 9092 ];
-      virtualisation.memorySize = 2048;
-    };
-  };
-
-  testScript = ''
-    startAll;
-
-    $zookeeper1->waitForUnit("zookeeper");
-    $zookeeper1->waitForUnit("network.target");
-    $zookeeper1->waitForOpenPort(2181);
-
-    $kafka->waitForUnit("apache-kafka");
-    $kafka->waitForUnit("network.target");
-    $kafka->waitForOpenPort(9092);
-
-    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
-    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
-    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
-  '';
-})
diff --git a/nixos/tests/kafka_0_9.nix b/nixos/tests/kafka_0_9.nix
deleted file mode 100644
index fee82aba2bda..000000000000
--- a/nixos/tests/kafka_0_9.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... } :
-let
-  kafkaPackage = pkgs.apacheKafka_0_9;
-in {
-  name = "kafka_0_9";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  nodes = {
-    zookeeper1 = { config, ... }: {
-      services.zookeeper = {
-        enable = true;
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2181 ];
-    };
-    kafka = { config, ... }: {
-      services.apache-kafka = {
-        enable = true;
-        extraProperties = ''
-          offsets.topic.replication.factor = 1
-        '';
-        package = kafkaPackage;
-        zookeeper = "zookeeper1:2181";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 9092 ];
-      virtualisation.memorySize = 2048;
-    };
-  };
-
-  testScript = ''
-    startAll;
-
-    $zookeeper1->waitForUnit("zookeeper");
-    $zookeeper1->waitForUnit("network.target");
-    $zookeeper1->waitForOpenPort(2181);
-
-    $kafka->waitForUnit("apache-kafka");
-    $kafka->waitForUnit("network.target");
-    $kafka->waitForOpenPort(9092);
-
-    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
-    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
-    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --zookeeper zookeeper1:2181 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
-  '';
-})
diff --git a/nixos/tests/kafka_1_0.nix b/nixos/tests/kafka_1_0.nix
deleted file mode 100644
index 936840dbcfdc..000000000000
--- a/nixos/tests/kafka_1_0.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-import ./make-test.nix ({ pkgs, lib, ... } :
-let
-  kafkaPackage = pkgs.apacheKafka_1_0;
-in {
-  name = "kafka_1_0";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ nequissimus ];
-  };
-
-  nodes = {
-    zookeeper1 = { config, ... }: {
-      services.zookeeper = {
-        enable = true;
-      };
-
-      networking.firewall.allowedTCPPorts = [ 2181 ];
-    };
-    kafka = { config, ... }: {
-      services.apache-kafka = {
-        enable = true;
-        extraProperties = ''
-          offsets.topic.replication.factor = 1
-        '';
-        package = kafkaPackage;
-        zookeeper = "zookeeper1:2181";
-      };
-
-      networking.firewall.allowedTCPPorts = [ 9092 ];
-      virtualisation.memorySize = 2048;
-    };
-  };
-
-  testScript = ''
-    startAll;
-
-    $zookeeper1->waitForUnit("zookeeper");
-    $zookeeper1->waitForUnit("network.target");
-    $zookeeper1->waitForOpenPort(2181);
-
-    $kafka->waitForUnit("apache-kafka");
-    $kafka->waitForUnit("network.target");
-    $kafka->waitForOpenPort(9092);
-
-    $kafka->waitUntilSucceeds("${kafkaPackage}/bin/kafka-topics.sh --create --zookeeper zookeeper1:2181 --partitions 1 --replication-factor 1 --topic testtopic");
-    $kafka->mustSucceed("echo 'test 1' | ${kafkaPackage}/bin/kafka-console-producer.sh --broker-list localhost:9092 --topic testtopic");
-    $kafka->mustSucceed("${kafkaPackage}/bin/kafka-console-consumer.sh --bootstrap-server localhost:9092 --topic testtopic --from-beginning --max-messages 1 | grep 'test 1'");
-  '';
-})

From 6a96dc041727859cd36a861d37c8b68d26c41933 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 11 May 2018 20:14:38 -0400
Subject: [PATCH 1632/3370] lib/system: Remove float from androideabi

There are two different official variations which differ in their float
support, so such a blanket statement is invalid.
`lib.systems.platforms.*android` already handles each case correctly.

Correcting an error in 827ef0914089e1a2bba140b49e1311eff28cc156.
---
 lib/systems/parse.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 3dba5ad46984..4c34ace3f277 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -199,7 +199,7 @@ rec {
     msvc         = {};
     eabi         = {};
 
-    androideabi  = { float = "hard"; };
+    androideabi  = {};
     android      = {
       assertions = [
         { assertion = platform: !platform.isAarch32;

From c839771129f17cad501effb6676b0e0cde5cbd0b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 11 May 2018 16:01:40 -0500
Subject: [PATCH 1633/3370] xquartz: fix build

Things done:

- use libGLU instead of mesa for darwin support
- move patches from local to github url
- fixup xquartz install

There may still be some issues at runtime. PRs welcome!

Fixes #40196
---
 ...2-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch |  41 ---
 ...iTrapezoids-and-miTriangles-routines.patch | 297 ------------------
 ...Revert-fb-changes-that-broke-XQuartz.patch | 243 --------------
 .../servers/x11/xorg/darwin/bundle_main.patch | 118 -------
 .../x11/xorg/darwin/private-extern.patch      |  12 -
 pkgs/servers/x11/xorg/darwin/stub.patch       |  80 -----
 pkgs/servers/x11/xorg/overrides.nix           |  36 ++-
 pkgs/servers/x11/xquartz/system-fonts.nix     |   4 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 9 files changed, 28 insertions(+), 805 deletions(-)
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/bundle_main.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/private-extern.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/stub.patch

diff --git a/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch b/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
deleted file mode 100644
index ed0518da5ce1..000000000000
--- a/pkgs/servers/x11/xorg/darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 91971455ee46b1059de75260ef0d1a45170d8b65 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Fri, 13 Jan 2012 12:00:57 -0800
-Subject: [PATCH 2/6] sdksyms.sh: Use CPPFLAGS, not CFLAGS
-
-CFLAGS can include flags which are not useful to the preprocessor
-or can even cause it to fail.  This fixes a build issue on darwin
-when building for more than one architecture.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
----
- hw/xfree86/Makefile.am | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
-index 27f2cc6..d898c43 100644
---- a/hw/xfree86/Makefile.am
-+++ b/hw/xfree86/Makefile.am
-@@ -48,8 +48,7 @@ DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
- bin_PROGRAMS = Xorg
- nodist_Xorg_SOURCES = sdksyms.c
- 
--AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
--AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
-+AM_CPPFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@ $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
- 	-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
- 	-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
- 
-@@ -135,7 +134,7 @@ CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
- EXTRA_DIST += sdksyms.sh
- 
- sdksyms.dep sdksyms.c: sdksyms.sh
--	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
-+	$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CPPFLAGS) $(AM_CPPFLAGS)
- 
- SDKSYMS_DEP = sdksyms.dep
- -include $(SDKSYMS_DEP)
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch b/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
deleted file mode 100644
index 4027227bb53f..000000000000
--- a/pkgs/servers/x11/xorg/darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
+++ /dev/null
@@ -1,297 +0,0 @@
-From b229a04bde765424542eeba17a7e2bc25785a890 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 2 Nov 2013 11:00:23 -0700
-Subject: [PATCH 4/6] Use old miTrapezoids and miTriangles routines
-
-Reverts commits:
-    788ccb9a8bcf6a4fb4054c507111eec3338fb969
-    566f1931ee2916269e164e114bffaf2da1d039d1
-
-http://xquartz.macosforge.org/trac/ticket/525
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
----
- fb/fbpict.c     |   2 -
- render/mipict.c |   4 +-
- render/mipict.h |  27 ++++++++++++++
- render/mitrap.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- render/mitri.c  |  61 +++++++++++++++++++++++++++++++
- 5 files changed, 201 insertions(+), 4 deletions(-)
-
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index c8378ad..cafb027 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -499,10 +499,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-     ps->UnrealizeGlyph = fbUnrealizeGlyph;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
--    ps->Trapezoids = fbTrapezoids;
-     ps->AddTraps = fbAddTraps;
-     ps->AddTriangles = fbAddTriangles;
--    ps->Triangles = fbTriangles;
- 
-     return TRUE;
- }
-diff --git a/render/mipict.c b/render/mipict.c
-index a725104..e14293a 100644
---- a/render/mipict.c
-+++ b/render/mipict.c
-@@ -575,8 +575,8 @@ miPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-     ps->Composite = 0;          /* requires DDX support */
-     ps->Glyphs = miGlyphs;
-     ps->CompositeRects = miCompositeRects;
--    ps->Trapezoids = 0;
--    ps->Triangles = 0;
-+    ps->Trapezoids = miTrapezoids;
-+    ps->Triangles = miTriangles;
- 
-     ps->RasterizeTrapezoid = 0; /* requires DDX support */
-     ps->AddTraps = 0;           /* requires DDX support */
-diff --git a/render/mipict.h b/render/mipict.h
-index 23ce9e8..e0f1d4c 100644
---- a/render/mipict.h
-+++ b/render/mipict.h
-@@ -122,6 +122,16 @@ miCompositeRects(CARD8 op,
-                  xRenderColor * color, int nRect, xRectangle *rects);
- 
- extern _X_EXPORT void
-+miTriangles (CARD8	    op,
-+	     PicturePtr	    pSrc,
-+	     PicturePtr	    pDst,
-+	     PictFormatPtr  maskFormat,
-+	     INT16	    xSrc,
-+	     INT16	    ySrc,
-+	     int	    ntri,
-+	     xTriangle	    *tris);
-+
-+extern _X_EXPORT void
- 
- miTriStrip(CARD8 op,
-            PicturePtr pSrc,
-@@ -137,10 +147,27 @@ miTriFan(CARD8 op,
-          PictFormatPtr maskFormat,
-          INT16 xSrc, INT16 ySrc, int npoints, xPointFixed * points);
- 
-+extern _X_EXPORT PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height);
-+
- extern _X_EXPORT void
-  miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box);
- 
- extern _X_EXPORT void
-+miTrapezoids (CARD8        op,
-+             PicturePtr    pSrc,
-+             PicturePtr    pDst,
-+             PictFormatPtr maskFormat,
-+             INT16         xSrc,
-+             INT16         ySrc,
-+             int           ntrap,
-+             xTrapezoid    *traps);
-+
-+extern _X_EXPORT void
-  miPointFixedBounds(int npoint, xPointFixed * points, BoxPtr bounds);
- 
- extern _X_EXPORT void
-diff --git a/render/mitrap.c b/render/mitrap.c
-index 17b6dcd..71c1857 100644
---- a/render/mitrap.c
-+++ b/render/mitrap.c
-@@ -34,6 +34,55 @@
- #include "picturestr.h"
- #include "mipict.h"
- 
-+PicturePtr
-+miCreateAlphaPicture (ScreenPtr	    pScreen, 
-+		      PicturePtr    pDst,
-+		      PictFormatPtr pPictFormat,
-+		      CARD16	    width,
-+		      CARD16	    height)
-+{
-+    PixmapPtr	    pPixmap;
-+    PicturePtr	    pPicture;
-+    GCPtr	    pGC;
-+    int		    error;
-+    xRectangle	    rect;
-+
-+    if (width > 32767 || height > 32767)
-+	return 0;
-+
-+    if (!pPictFormat)
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	if (!pPictFormat)
-+	    return 0;
-+    }
-+
-+    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
-+					pPictFormat->depth, 0);
-+    if (!pPixmap)
-+	return 0;
-+    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
-+    if (!pGC)
-+    {
-+	(*pScreen->DestroyPixmap) (pPixmap);
-+	return 0;
-+    }
-+    ValidateGC (&pPixmap->drawable, pGC);
-+    rect.x = 0;
-+    rect.y = 0;
-+    rect.width = width;
-+    rect.height = height;
-+    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
-+    FreeScratchGC (pGC);
-+    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
-+			      0, 0, serverClient, &error);
-+    (*pScreen->DestroyPixmap) (pPixmap);
-+    return pPicture;
-+}
-+
- static xFixed
- miLineFixedX(xLineFixed * l, xFixed y, Bool ceil)
- {
-@@ -79,3 +128,65 @@ miTrapezoidBounds(int ntrap, xTrapezoid * traps, BoxPtr box)
-             box->x2 = x2;
-     }
- }
-+
-+
-+void
-+miTrapezoids (CARD8        op,
-+             PicturePtr    pSrc,
-+             PicturePtr    pDst,
-+             PictFormatPtr maskFormat,
-+             INT16         xSrc,
-+             INT16         ySrc,
-+             int           ntrap,
-+             xTrapezoid    *traps)
-+{
-+    ScreenPtr          pScreen = pDst->pDrawable->pScreen;
-+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-+
-+    /*
-+     * Check for solid alpha add
-+     */
-+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-+    {
-+       for (; ntrap; ntrap--, traps++)
-+           (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
-+    } 
-+    else if (maskFormat)
-+    {
-+       PicturePtr      pPicture;
-+       BoxRec          bounds;
-+       INT16           xDst, yDst;
-+       INT16           xRel, yRel;
-+       
-+       xDst = traps[0].left.p1.x >> 16;
-+       yDst = traps[0].left.p1.y >> 16;
-+
-+       miTrapezoidBounds (ntrap, traps, &bounds);
-+       if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
-+           return;
-+       pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-+                                        bounds.x2 - bounds.x1,
-+                                        bounds.y2 - bounds.y1);
-+       if (!pPicture)
-+           return;
-+       for (; ntrap; ntrap--, traps++)
-+           (*ps->RasterizeTrapezoid) (pPicture, traps, 
-+                                      -bounds.x1, -bounds.y1);
-+       xRel = bounds.x1 + xSrc - xDst;
-+       yRel = bounds.y1 + ySrc - yDst;
-+       CompositePicture (op, pSrc, pPicture, pDst,
-+                         xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-+                         bounds.x2 - bounds.x1,
-+                         bounds.y2 - bounds.y1);
-+       FreePicture (pPicture, 0);
-+    }
-+    else
-+    {
-+       if (pDst->polyEdge == PolyEdgeSharp)
-+           maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+       else
-+           maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+       for (; ntrap; ntrap--, traps++)
-+           miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
-+    }
-+}
-diff --git a/render/mitri.c b/render/mitri.c
-index 922f22a..bdca9ca 100644
---- a/render/mitri.c
-+++ b/render/mitri.c
-@@ -65,3 +65,64 @@ miTriangleBounds(int ntri, xTriangle * tris, BoxPtr bounds)
- {
-     miPointFixedBounds(ntri * 3, (xPointFixed *) tris, bounds);
- }
-+
-+
-+void
-+miTriangles (CARD8	    op,
-+	     PicturePtr	    pSrc,
-+	     PicturePtr	    pDst,
-+	     PictFormatPtr  maskFormat,
-+	     INT16	    xSrc,
-+	     INT16	    ySrc,
-+	     int	    ntri,
-+	     xTriangle	    *tris)
-+{
-+    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
-+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
-+    
-+    /*
-+     * Check for solid alpha add
-+     */
-+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
-+    {
-+	(*ps->AddTriangles) (pDst, 0, 0, ntri, tris);
-+    }
-+    else if (maskFormat)
-+    {
-+	BoxRec		bounds;
-+	PicturePtr	pPicture;
-+	INT16		xDst, yDst;
-+	INT16		xRel, yRel;
-+	
-+	xDst = tris[0].p1.x >> 16;
-+	yDst = tris[0].p1.y >> 16;
-+
-+	miTriangleBounds (ntri, tris, &bounds);
-+	if (bounds.x2 <= bounds.x1 || bounds.y2 <= bounds.y1)
-+	    return;
-+	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
-+					 bounds.x2 - bounds.x1,
-+					 bounds.y2 - bounds.y1);
-+	if (!pPicture)
-+	    return;
-+	(*ps->AddTriangles) (pPicture, -bounds.x1, -bounds.y1, ntri, tris);
-+	
-+	xRel = bounds.x1 + xSrc - xDst;
-+	yRel = bounds.y1 + ySrc - yDst;
-+	CompositePicture (op, pSrc, pPicture, pDst,
-+			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
-+			  bounds.x2 - bounds.x1, bounds.y2 - bounds.y1);
-+	FreePicture (pPicture, 0);
-+    }
-+    else
-+    {
-+	if (pDst->polyEdge == PolyEdgeSharp)
-+	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
-+	else
-+	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
-+	
-+	for (; ntri; ntri--, tris++)
-+	    miTriangles (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, tris);
-+    }
-+}
-+
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch b/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
deleted file mode 100644
index 03d4decdb1c9..000000000000
--- a/pkgs/servers/x11/xorg/darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-From 4c7572abafeac9b2dcd884c444c5a5bae5b302c3 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sat, 31 May 2014 13:14:20 -0700
-Subject: [PATCH 6/6] fb: Revert fb changes that broke XQuartz
-
-    http://bugs.freedesktop.org/show_bug.cgi?id=26124
-
-Revert "Use new pixman_glyph_cache_t API that will be in pixman 0.28.0"
-Revert "fb: Fix origin of source picture in fbGlyphs"
-Revert "fb: Publish fbGlyphs and fbUnrealizeGlyph"
-
-This reverts commit 9cbcb5bd6a5360a128d15b77a02d8d3351f74366.
-This reverts commit 983e30361f49a67252d0b5d82630e70724d69dbf.
-This reverts commit 3c2c59eed3c68c0e5a93c38cf01eedad015e3157.
----
- fb/fb.h       |   3 --
- fb/fbpict.c   | 149 +---------------------------------------------------------
- fb/fbpict.h   |  11 +----
- fb/fbscreen.c |   1 -
- 4 files changed, 2 insertions(+), 162 deletions(-)
-
-diff --git a/fb/fb.h b/fb/fb.h
-index 59eaac3..046b948 100644
---- a/fb/fb.h
-+++ b/fb/fb.h
-@@ -1116,9 +1116,6 @@ extern _X_EXPORT void
- extern _X_EXPORT Bool
-  fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
- 
--extern _X_EXPORT void
--fbDestroyGlyphCache(void);
--
- /*
-  * fbpixmap.c
-  */
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 6ee63e9..9c4cc42 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -65,152 +65,6 @@ fbComposite(CARD8 op,
-     free_pixman_pict(pDst, dest);
- }
- 
--static pixman_glyph_cache_t *glyphCache;
--
--void
--fbDestroyGlyphCache(void)
--{
--    if (glyphCache)
--    {
--	pixman_glyph_cache_destroy (glyphCache);
--	glyphCache = NULL;
--    }
--}
--
--static void
--fbUnrealizeGlyph(ScreenPtr pScreen,
--		 GlyphPtr pGlyph)
--{
--    if (glyphCache)
--	pixman_glyph_cache_remove (glyphCache, pGlyph, NULL);
--}
--
--void
--fbGlyphs(CARD8 op,
--	 PicturePtr pSrc,
--	 PicturePtr pDst,
--	 PictFormatPtr maskFormat,
--	 INT16 xSrc,
--	 INT16 ySrc, int nlist,
--	 GlyphListPtr list,
--	 GlyphPtr *glyphs)
--{
--#define N_STACK_GLYPHS 512
--    ScreenPtr pScreen = pDst->pDrawable->pScreen;
--    pixman_glyph_t stack_glyphs[N_STACK_GLYPHS];
--    pixman_glyph_t *pglyphs = stack_glyphs;
--    pixman_image_t *srcImage, *dstImage;
--    int srcXoff, srcYoff, dstXoff, dstYoff;
--    GlyphPtr glyph;
--    int n_glyphs;
--    int x, y;
--    int i, n;
--    int xDst = list->xOff, yDst = list->yOff;
--
--    miCompositeSourceValidate(pSrc);
--
--    n_glyphs = 0;
--    for (i = 0; i < nlist; ++i)
--	n_glyphs += list[i].len;
--
--    if (!glyphCache)
--	glyphCache = pixman_glyph_cache_create();
--
--    pixman_glyph_cache_freeze (glyphCache);
--
--    if (n_glyphs > N_STACK_GLYPHS) {
--	if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t))))
--	    goto out;
--    }
--
--    i = 0;
--    x = y = 0;
--    while (nlist--) {
--        x += list->xOff;
--        y += list->yOff;
--        n = list->len;
--        while (n--) {
--	    const void *g;
--
--            glyph = *glyphs++;
--
--	    if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) {
--		pixman_image_t *glyphImage;
--		PicturePtr pPicture;
--		int xoff, yoff;
--
--		pPicture = GetGlyphPicture(glyph, pScreen);
--		if (!pPicture) {
--		    n_glyphs--;
--		    goto next;
--		}
--
--		if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff)))
--		    goto out;
--
--		g = pixman_glyph_cache_insert(glyphCache, glyph, NULL,
--					      glyph->info.x,
--					      glyph->info.y,
--					      glyphImage);
--
--		free_pixman_pict(pPicture, glyphImage);
--
--		if (!g)
--		    goto out;
--	    }
--
--	    pglyphs[i].x = x;
--	    pglyphs[i].y = y;
--	    pglyphs[i].glyph = g;
--	    i++;
--
--	next:
--            x += glyph->info.xOff;
--            y += glyph->info.yOff;
--	}
--	list++;
--    }
--
--    if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff)))
--	goto out;
--
--    if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff)))
--	goto out_free_src;
--
--    if (maskFormat) {
--	pixman_format_code_t format;
--	pixman_box32_t extents;
--
--	format = maskFormat->format | (maskFormat->depth << 24);
--
--	pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
--
--	pixman_composite_glyphs(op, srcImage, dstImage, format,
--				xSrc + srcXoff + extents.x1 - xDst, ySrc + srcYoff + extents.y1 - yDst,
--				extents.x1, extents.y1,
--				extents.x1 + dstXoff, extents.y1 + dstYoff,
--				extents.x2 - extents.x1,
--				extents.y2 - extents.y1,
--				glyphCache, n_glyphs, pglyphs);
--    }
--    else {
--	pixman_composite_glyphs_no_mask(op, srcImage, dstImage,
--					xSrc + srcXoff - xDst, ySrc + srcYoff - yDst,
--					dstXoff, dstYoff,
--					glyphCache, n_glyphs, pglyphs);
--    }
--
--    free_pixman_pict(pDst, dstImage);
--
--out_free_src:
--    free_pixman_pict(pSrc, srcImage);
--
--out:
--    pixman_glyph_cache_thaw(glyphCache);
--    if (pglyphs != stack_glyphs)
--	free(pglyphs);
--}
--
- static pixman_image_t *
- create_solid_fill_image(PicturePtr pict)
- {
-@@ -461,8 +315,7 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-         return FALSE;
-     ps = GetPictureScreen(pScreen);
-     ps->Composite = fbComposite;
--    ps->Glyphs = fbGlyphs;
--    ps->UnrealizeGlyph = fbUnrealizeGlyph;
-+    ps->Glyphs = miGlyphs;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
-     ps->AddTraps = fbAddTraps;
-diff --git a/fb/fbpict.h b/fb/fbpict.h
-index 5cb8663..110f32d 100644
---- a/fb/fbpict.h
-+++ b/fb/fbpict.h
-@@ -65,20 +65,11 @@ fbTrapezoids(CARD8 op,
-              INT16 xSrc, INT16 ySrc, int ntrap, xTrapezoid * traps);
- 
- extern _X_EXPORT void
-+
- fbTriangles(CARD8 op,
-             PicturePtr pSrc,
-             PicturePtr pDst,
-             PictFormatPtr maskFormat,
-             INT16 xSrc, INT16 ySrc, int ntris, xTriangle * tris);
- 
--extern _X_EXPORT void
--fbGlyphs(CARD8 op,
--	 PicturePtr pSrc,
--	 PicturePtr pDst,
--	 PictFormatPtr maskFormat,
--	 INT16 xSrc,
--	 INT16 ySrc, int nlist,
--	 GlyphListPtr list,
--	 GlyphPtr *glyphs);
--
- #endif                          /* _FBPICT_H_ */
-diff --git a/fb/fbscreen.c b/fb/fbscreen.c
-index 71bcc5d..55330fc 100644
---- a/fb/fbscreen.c
-+++ b/fb/fbscreen.c
-@@ -32,7 +32,6 @@ fbCloseScreen(ScreenPtr pScreen)
-     int d;
-     DepthPtr depths = pScreen->allowedDepths;
- 
--    fbDestroyGlyphCache();
-     for (d = 0; d < pScreen->numDepths; d++)
-         free(depths[d].vids);
-     free(depths);
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/bundle_main.patch b/pkgs/servers/x11/xorg/darwin/bundle_main.patch
deleted file mode 100644
index e60ca5738d14..000000000000
--- a/pkgs/servers/x11/xorg/darwin/bundle_main.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-cstrahan:
-
-This patch makes it possible (and necessary) to specify the default
-shell, xterm client, and startx script from environment variables. These
-defaults are used when launching the XQuartz.app, which in turn needs to know
-how to start the X server. I've patched `command_from_prefs' so that it ignores
-the preferences settings and immediately sets them to whatever the environment
-variables are.
-
-When developing an installable package for XQuartz/XQuartz.app, we'll need to
-set an `LSEnvironment' entry in the plist for the XQuartz.app, we'll also need
-to wrap the XQuartz.app/Contents/MacOS/X11 script (the Xquartz server will
-invoke this script during initialization. See stub.patch for more details.).
-
-diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
-index b403662..b1e2070 100644
---- a/hw/xquartz/mach-startup/bundle-main.c
-+++ b/hw/xquartz/mach-startup/bundle-main.c
-@@ -77,13 +77,7 @@ FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1, 2) _X_NORETURN;
- 
- extern int noPanoramiXExtension;
- 
--#define DEFAULT_CLIENT X11BINDIR "/xterm"
--#define DEFAULT_STARTX X11BINDIR "/startx -- " X11BINDIR "/Xquartz"
--#define DEFAULT_SHELL  "/bin/sh"
--
--#ifndef BUILD_DATE
- #define BUILD_DATE ""
--#endif
- #ifndef XSERVER_VERSION
- #define XSERVER_VERSION "?"
- #endif
-@@ -718,14 +712,14 @@ main(int argc, char **argv, char **envp)
-         pid_t child1, child2;
-         int status;
- 
--        pref_app_to_run = command_from_prefs("app_to_run", DEFAULT_CLIENT);
-+        pref_app_to_run = command_from_prefs("app_to_run", getenv("XQUARTZ_DEFAULT_CLIENT"));
-         assert(pref_app_to_run);
- 
--        pref_login_shell = command_from_prefs("login_shell", DEFAULT_SHELL);
-+        pref_login_shell = command_from_prefs("login_shell", getenv("XQUARTZ_DEFAULT_SHELL"));
-         assert(pref_login_shell);
- 
-         pref_startx_script = command_from_prefs("startx_script",
--                                                DEFAULT_STARTX);
-+                                                getenv("XQUARTZ_DEFAULT_STARTX"));
-         assert(pref_startx_script);
- 
-         /* Do the fork-twice trick to avoid having to reap zombies */
-@@ -804,10 +798,12 @@ execute(const char *command)
- static char *
- command_from_prefs(const char *key, const char *default_value)
- {
-+    if (default_value == NULL)
-+        return NULL;
-+
-     char *command = NULL;
- 
-     CFStringRef cfKey;
--    CFPropertyListRef PlistRef;
- 
-     if (!key)
-         return NULL;
-@@ -817,40 +813,24 @@ command_from_prefs(const char *key, const char *default_value)
-     if (!cfKey)
-         return NULL;
- 
--    PlistRef = CFPreferencesCopyAppValue(cfKey,
--                                         kCFPreferencesCurrentApplication);
-+    CFStringRef cfDefaultValue = CFStringCreateWithCString(
-+        NULL, default_value, kCFStringEncodingASCII);
-+    int len = strlen(default_value) + 1;
- 
--    if ((PlistRef == NULL) ||
--        (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
--        CFStringRef cfDefaultValue = CFStringCreateWithCString(
--            NULL, default_value, kCFStringEncodingASCII);
--        int len = strlen(default_value) + 1;
-+    if (!cfDefaultValue)
-+        goto command_from_prefs_out;
- 
--        if (!cfDefaultValue)
--            goto command_from_prefs_out;
-+    CFPreferencesSetAppValue(cfKey, cfDefaultValue,
-+                             kCFPreferencesCurrentApplication);
-+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
-+    CFRelease(cfDefaultValue);
- 
--        CFPreferencesSetAppValue(cfKey, cfDefaultValue,
--                                 kCFPreferencesCurrentApplication);
--        CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
--        CFRelease(cfDefaultValue);
--
--        command = (char *)malloc(len * sizeof(char));
--        if (!command)
--            goto command_from_prefs_out;
--        strcpy(command, default_value);
--    }
--    else {
--        int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
--        command = (char *)malloc(len * sizeof(char));
--        if (!command)
--            goto command_from_prefs_out;
--        CFStringGetCString((CFStringRef)PlistRef, command, len,
--                           kCFStringEncodingASCII);
--    }
-+    command = (char *)malloc(len * sizeof(char));
-+    if (!command)
-+        goto command_from_prefs_out;
-+    strcpy(command, default_value);
- 
- command_from_prefs_out:
--    if (PlistRef)
--        CFRelease(PlistRef);
-     if (cfKey)
-         CFRelease(cfKey);
-     return command;
diff --git a/pkgs/servers/x11/xorg/darwin/private-extern.patch b/pkgs/servers/x11/xorg/darwin/private-extern.patch
deleted file mode 100644
index 87af7865c376..000000000000
--- a/pkgs/servers/x11/xorg/darwin/private-extern.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/hw/xquartz/xpr/x-list.new.h b/hw/xquartz/xpr/x-list.h
-index 28385fd..71f9d26 100644
---- a/hw/xquartz/xpr/x-list.new.h
-+++ b/hw/xquartz/xpr/x-list.h
-@@ -45,6 +45,7 @@ struct x_list_struct {
- #endif
- 
- #ifndef X_EXTERN
-+#define __private_extern__ extern
- #define X_EXTERN __private_extern__
- #endif
- 
diff --git a/pkgs/servers/x11/xorg/darwin/stub.patch b/pkgs/servers/x11/xorg/darwin/stub.patch
deleted file mode 100644
index db3215b498aa..000000000000
--- a/pkgs/servers/x11/xorg/darwin/stub.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-cstrahan:
-
-When the X / Xquartz server initiallizes, it starts the XQuartz.app and
-hands-off the display FD. To start the XQuartz.app, Xquartz normally uses some
-system calls to get the path of the application by app bundle id, and then
-executes the Contents/MacOS/X11 script contained inside, which in turn executes
-Contents/MacOS/X11.bin (the actual app).
-
-This patch replaces that discovery technique with a simple call to
-`getenv'. In order to make Xquartz actually work, we'll need another wrapper
-that sets the `XQUARTZ_X11' environment variable to point to the `X11' script.
-
-diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
-index 756e4ef..3313a55 100644
---- a/hw/xquartz/mach-startup/stub.c
-+++ b/hw/xquartz/mach-startup/stub.c
-@@ -61,54 +61,16 @@ aslclient aslc;
- static void
- set_x11_path(void)
- {
--#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
--
--    CFURLRef appURL = NULL;
--    OSStatus osstatus =
--        LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(
--                                     kX11AppBundleId), nil, nil, &appURL);
--
--    switch (osstatus) {
--    case noErr:
--        if (appURL == NULL) {
--            asl_log(
--                aslc, NULL, ASL_LEVEL_ERR,
--                "Xquartz: Invalid response from LSFindApplicationForInfo(%s)",
--                kX11AppBundleId);
--            exit(1);
--        }
--
--        if (!CFURLGetFileSystemRepresentation(appURL, true,
--                                              (unsigned char *)x11_path,
--                                              sizeof(x11_path))) {
--            asl_log(aslc, NULL, ASL_LEVEL_ERR,
--                    "Xquartz: Error resolving URL for %s",
--                    kX11AppBundleId);
--            exit(3);
--        }
--
--        strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
--        asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: X11.app = %s", x11_path);
--        break;
--
--    case kLSApplicationNotFoundErr:
--        asl_log(aslc, NULL, ASL_LEVEL_ERR,
--                "Xquartz: Unable to find application for %s",
--                kX11AppBundleId);
--        exit(10);
--
--    default:
--        asl_log(aslc, NULL, ASL_LEVEL_ERR,
--                "Xquartz: Unable to find application for %s, error code = %d",
--                kX11AppBundleId,
--                (int)osstatus);
--        exit(11);
-+    char *xquartzX11 = getenv("XQUARTZ_X11");
-+    if (xquartzX11) {
-+        strlcpy(x11_path, xquartzX11,
-+                sizeof(x11_path));
-+    } else {
-+        asl_log(
-+            aslc, NULL, ASL_LEVEL_ERR,
-+            "Xquartz: XQUARTZ_X11 environment variable not set");
-+        exit(1);
-     }
--#else
--    /* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */
--    strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11",
--            sizeof(x11_path));
--#endif
- }
- 
- static int
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 5efa4bfcfd5d..ce78eba4b432 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -456,7 +456,7 @@ in
             };
             nativeBuildInputs = [ pkgconfig ];
             buildInputs = [ dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ];
-            postPatch = "sed '1i#include <malloc.h>' -i include/os.h";
+            postPatch = stdenv.lib.optionalString stdenv.isLinux "sed '1i#include <malloc.h>' -i include/os.h";
             meta.platforms = stdenv.lib.platforms.unix;
         } else throw "unsupported xorg abiCompat ${args.abiCompat} for ${attrs_passed.name}";
 
@@ -465,7 +465,7 @@ in
       version = (builtins.parseDrvName attrs.name).version;
       commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
       commonPropagatedBuildInputs = [
-        args.zlib args.libGL args.mesa_noglu args.dbus
+        args.zlib args.libGL args.libGLU args.dbus
         xf86bigfontproto glproto xf86driproto
         compositeproto scrnsaverproto resourceproto
         xf86dgaproto
@@ -526,6 +526,7 @@ in
         '';
         passthru.version = version; # needed by virtualbox guest additions
       } else {
+        nativeBuildInputs = attrs.nativeBuildInputs ++ [ args.autoreconfHook xorg.utilmacros xorg.fontutil ];
         buildInputs = commonBuildInputs ++ [
           args.bootstrap_cmds args.automake args.autoconf
           args.apple_sdk.libs.Xplugin
@@ -535,16 +536,31 @@ in
         propagatedBuildInputs = commonPropagatedBuildInputs ++ [
           libAppleWM applewmproto
         ];
-        # Patches can be pulled from the server-*-apple branches of:
-        # http://cgit.freedesktop.org/~jeremyhu/xserver/
+
+        # XQuartz patchset
         patches = commonPatches ++ [
-          ./darwin/0002-sdksyms.sh-Use-CPPFLAGS-not-CFLAGS.patch
-          ./darwin/0004-Use-old-miTrapezoids-and-miTriangles-routines.patch
-          ./darwin/0006-fb-Revert-fb-changes-that-broke-XQuartz.patch
-          ./darwin/private-extern.patch
-          ./darwin/bundle_main.patch
-          ./darwin/stub.patch
+          (args.fetchpatch {
+            url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
+            sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";
+            name = "use-cppflags-not-cflags.patch";
+          })
+          (args.fetchpatch {
+            url = "https://github.com/XQuartz/xorg-server/commit/75ee9649bcfe937ac08e03e82fd45d9e18110ef4.patch";
+            sha256 = "1vlfylm011y00j8mig9zy6gk9bw2b4ilw2qlsc6la49zi3k0i9fg";
+            name = "use-old-mitrapezoids-and-mitriangles-routines.patch";
+          })
+          (args.fetchpatch {
+            url = "https://github.com/XQuartz/xorg-server/commit/c58f47415be79a6564a9b1b2a62c2bf866141e73.patch";
+            sha256 = "19sisqzw8x2ml4lfrwfvavc2jfyq2bj5xcf83z89jdxg8g1gdd1i";
+            name = "revert-fb-changes-1.patch";
+          })
+          (args.fetchpatch {
+            url = "https://github.com/XQuartz/xorg-server/commit/56e6f1f099d2821e5002b9b05b715e7b251c0c97.patch";
+            sha256 = "0zm9g0g1jvy79sgkvy0rjm6ywrdba2xjd1nsnjbxjccckbr6i396";
+            name = "revert-fb-changes-2.patch";
+          })
         ];
+
         configureFlags = [
           # note: --enable-xquartz is auto
           "CPPFLAGS=-I${./darwin/dri}"
diff --git a/pkgs/servers/x11/xquartz/system-fonts.nix b/pkgs/servers/x11/xquartz/system-fonts.nix
index cf24bb439b91..db47f8afe015 100644
--- a/pkgs/servers/x11/xquartz/system-fonts.nix
+++ b/pkgs/servers/x11/xquartz/system-fonts.nix
@@ -26,9 +26,7 @@ stdenv.mkDerivation {
       fi;
     done;
     cd $out/share/X11-fonts/
-    rm fonts.dir
-    rm fonts.scale
-    rm fonts.alias
+    rm -f fonts.dir fonts.scale fonts.alias
     mkfontdir
     mkfontscale
     cat $( find ${xorg.fontalias}/ -name fonts.alias) >fonts.alias
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6d3a7a5b937..a4766030f04d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13043,7 +13043,7 @@ with pkgs;
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig
       libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind
       dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
-      autoconf automake libtool mtdev pixman libGL
+      autoconf automake libtool mtdev pixman libGL libGLU
       cairo epoxy;
     inherit (buildPackages) pkgconfig xmlto asciidoc flex bison;
     inherit (darwin) apple_sdk cf-private libobjc;

From c41675bce0ce3eb4d79180c804892e8e3c268e55 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 12 May 2018 01:06:47 -0400
Subject: [PATCH 1634/3370] GHCJS 8.2

---
 .../compilers/ghcjs-ng/8.2/dep-overrides.nix  |   6 +
 .../compilers/ghcjs-ng/8.2/git.json           |   6 +
 .../compilers/ghcjs-ng/8.2/stage0.nix         | 168 ++++++++++++++++++
 pkgs/development/compilers/ghcjs-ng/README.md |  20 +++
 .../compilers/ghcjs-ng/common-overrides.nix   |   8 +
 .../ghcjs-ng/configured-ghcjs-src.nix         |  44 +++++
 .../compilers/ghcjs-ng/default.nix            |  77 ++++++++
 .../compilers/ghcjs-ng/mk-stage0.nix          |  25 +++
 pkgs/top-level/haskell-packages.nix           |  28 ++-
 9 files changed, 377 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/git.json
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/README.md
 create mode 100644 pkgs/development/compilers/ghcjs-ng/common-overrides.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/default.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/mk-stage0.nix

diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
new file mode 100644
index 000000000000..72066ee17018
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
@@ -0,0 +1,6 @@
+{ haskellLib }:
+
+let inherit (haskellLib) dontHaddock;
+in self: super: {
+  ghcjs = dontHaddock super.ghcjs;
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/git.json b/pkgs/development/compilers/ghcjs-ng/8.2/git.json
new file mode 100644
index 000000000000..efe7794a103e
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.2/git.json
@@ -0,0 +1,6 @@
+{
+  "url": "https://github.com/ghcjs/ghcjs",
+  "rev": "0cff73c3ee13b464adba90f308b77751c75b9f26",
+  "sha256": "1shg34zi6ryaihar62qdkkalv8dsrsqbv58jzkhk9in38sdfkjxv",
+  "fetchSubmodules": true
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix
new file mode 100644
index 000000000000..0680ff156e14
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.2/stage0.nix
@@ -0,0 +1,168 @@
+{ callPackage, configuredSrc }:
+
+{
+
+  ghcjs = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring
+    , base64-bytestring, binary, bytestring, Cabal, containers
+    , cryptohash, data-default, deepseq, directory, executable-path
+    , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs
+    , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
+    , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
+    , network, optparse-applicative, parallel, parsec, process, random
+    , regex-posix, safe, shelly, split, stdenv, stringsearch, syb
+    , system-fileio, system-filepath, tar, template-haskell
+    , template-haskell-ghcjs, terminfo, test-framework
+    , test-framework-hunit, text, time, transformers
+    , transformers-compat, unix, unix-compat, unordered-containers
+    , vector, wai, wai-app-static, wai-extra, wai-websockets, warp
+    , webdriver, websockets, wl-pprint-text, yaml
+    }:
+    mkDerivation {
+      pname = "ghcjs";
+      version = "8.2.0.1";
+      src = configuredSrc + /.;
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      setupHaskellDepends = [
+        base Cabal containers directory filepath process template-haskell
+        transformers
+      ];
+      libraryHaskellDepends = [
+        aeson array attoparsec base base16-bytestring base64-bytestring
+        binary bytestring Cabal containers cryptohash data-default deepseq
+        directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs
+        ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl
+        optparse-applicative parallel parsec process regex-posix safe split
+        stringsearch syb template-haskell template-haskell-ghcjs text time
+        transformers unordered-containers vector wl-pprint-text yaml
+      ];
+      executableHaskellDepends = [
+        aeson base binary bytestring Cabal containers directory
+        executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs
+        lens mtl optparse-applicative process shelly system-fileio
+        system-filepath tar terminfo text time transformers
+        transformers-compat unix unix-compat unordered-containers vector
+        yaml
+      ];
+      testHaskellDepends = [
+        aeson base bytestring data-default deepseq directory http-types
+        HUnit lens lifted-base network optparse-applicative process random
+        shelly system-fileio system-filepath test-framework
+        test-framework-hunit text time transformers unordered-containers
+        wai wai-app-static wai-extra wai-websockets warp webdriver
+        websockets yaml
+      ];
+      description = "Haskell to JavaScript compiler";
+      license = stdenv.lib.licenses.mit;
+    }) {};
+
+  ghc-api-ghcjs = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+    , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs
+    , hoopl, hpc, process, stdenv, template-haskell-ghcjs, terminfo
+    , time, transformers, unix
+    }:
+    mkDerivation {
+      pname = "ghc-api-ghcjs";
+      version = "8.2.2";
+      src = configuredSrc + /lib/ghc-api-ghcjs;
+      libraryHaskellDepends = [
+        array base binary bytestring containers deepseq directory filepath
+        ghc-boot ghc-boot-th ghci-ghcjs hoopl hpc process
+        template-haskell-ghcjs terminfo time transformers unix
+      ];
+      homepage = "http://www.haskell.org/ghc/";
+      description = "The GHC API (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  ghci-ghcjs = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+    , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
+    , template-haskell-ghcjs, transformers, unix
+    }:
+    mkDerivation {
+      pname = "ghci-ghcjs";
+      version = "8.2.2";
+      src = configuredSrc + /lib/ghci-ghcjs;
+      libraryHaskellDepends = [
+        array base binary bytestring containers deepseq filepath ghc-boot
+        ghc-boot-th template-haskell-ghcjs transformers unix
+      ];
+      description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  ghcjs-th = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, ghc-prim
+    , ghci-ghcjs, stdenv, template-haskell-ghcjs
+    }:
+    mkDerivation {
+      pname = "ghcjs-th";
+      version = "0.1.0.0";
+      src = configuredSrc + /lib/ghcjs-th;
+      libraryHaskellDepends = [
+        base binary bytestring containers ghc-prim ghci-ghcjs
+        template-haskell-ghcjs
+      ];
+      homepage = "http://github.com/ghcjs";
+      license = stdenv.lib.licenses.mit;
+    }) {};
+
+  haddock-api-ghcjs = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
+    , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
+    , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
+    , transformers, xhtml
+    }:
+    mkDerivation {
+      pname = "haddock-api-ghcjs";
+      version = "2.18.1";
+      src = configuredSrc + /lib/haddock-api-ghcjs;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        array base bytestring Cabal containers deepseq directory filepath
+        ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers
+        xhtml
+      ];
+      testHaskellDepends = [
+        base containers ghc-api-ghcjs hspec QuickCheck
+      ];
+      testToolDepends = [ hspec-discover ];
+      homepage = "http://www.haskell.org/haddock/";
+      description = "A documentation-generation tool for Haskell libraries (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  haddock-library-ghcjs = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, deepseq, hspec
+    , hspec-discover, QuickCheck, stdenv, transformers
+    }:
+    mkDerivation {
+      pname = "haddock-library-ghcjs";
+      version = "1.4.4";
+      src = configuredSrc + /lib/haddock-library-ghcjs;
+      libraryHaskellDepends = [ base bytestring deepseq transformers ];
+      testHaskellDepends = [
+        base base-compat bytestring deepseq hspec QuickCheck transformers
+      ];
+      testToolDepends = [ hspec-discover ];
+      homepage = "http://www.haskell.org/haddock/";
+      description = "Library exposing some functionality of Haddock";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  template-haskell-ghcjs = callPackage
+    ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
+    mkDerivation {
+      pname = "template-haskell-ghcjs";
+      version = "2.12.0.0";
+      src = configuredSrc + /lib/template-haskell-ghcjs;
+      libraryHaskellDepends = [ base ghc-boot-th pretty ];
+      description = "Support library for Template Haskell (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/README.md b/pkgs/development/compilers/ghcjs-ng/README.md
new file mode 100644
index 000000000000..3e1598c83b05
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/README.md
@@ -0,0 +1,20 @@
+New build system for GHCJS 8.2
+---
+
+`ghcjs-8.2` reworked the build system, and now comes with its own
+small package set of dependencies. This involves autogenerating
+several sources and cabal files, based on a GHC
+checkout. `callCabal2nix` is off limits, since we don't like "import
+from derivation" in nixpkgs. So there is a derivation that builds the
+nix expression that should be checked in whenever GHCJS is updated.
+
+Updating
+---
+
+```
+$ nix-prefetch-git https://github.com/ghcjs/ghcjs --rev refs/heads/ghc-8.2 \
+  | jq '{ url, rev, fetchSubmodules, sha256 }' \
+  > 8.2/git.json
+$ cat $(nix-build ../../../.. -A haskell.compiler.ghcjs82.genStage0 --no-out-link) > 8.2/stage0.nix
+```
+
diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
new file mode 100644
index 000000000000..172a48a5a654
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
@@ -0,0 +1,8 @@
+{ haskellLib, alex, happy }:
+
+let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
+in self: super: {
+  ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
+  ghcjs = appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install";
+  haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
new file mode 100644
index 000000000000..b9435b311572
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
@@ -0,0 +1,44 @@
+{ perl
+, autoconf
+, automake
+, python3
+, gcc
+, cabal-install
+, gmp
+, runCommand
+
+, ghc
+, happy
+, alex
+
+, ghcjsSrc
+}:
+
+runCommand "configured-ghcjs-src" {
+  buildInputs = [
+    perl
+    autoconf
+    automake
+    python3
+    ghc
+    happy
+    alex
+    cabal-install
+  ];
+  inherit ghcjsSrc;
+} ''
+  export HOME=$(pwd)
+  cp -r "$ghcjsSrc" "$out"
+  chmod -R +w "$out"
+  cd "$out"
+
+  # TODO: Find a better way to avoid impure version numbers
+  sed -i 's/RELEASE=NO/RELEASE=YES/' ghc/configure.ac
+
+  # TODO: How to actually fix this?
+  # Seems to work fine and produce the right files.
+  touch ghc/includes/ghcautoconf.h
+
+  patchShebangs .
+  ./utils/makePackages.sh copy
+''
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
new file mode 100644
index 000000000000..c2fb6a03c6b1
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -0,0 +1,77 @@
+{ stdenv
+, callPackage
+, fetchgit
+, ghcjsSrcJson ? null
+, ghcjsSrc ? fetchgit (builtins.fromJSON (builtins.readFile ghcjsSrcJson))
+, bootPkgs
+, alex
+, happy
+, stage0
+, haskellLib
+, cabal-install
+, nodejs
+, makeWrapper
+, xorg
+, gmp
+, lib
+, ghcjsDepOverrides ? (_:_:{})
+}:
+
+let
+  passthru = {
+    configuredSrc = callPackage ./configured-ghcjs-src.nix {
+      inherit ghcjsSrc alex happy;
+      inherit (bootPkgs) ghc;
+    };
+    genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; };
+    bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [
+      (self: _: import stage0 {
+        inherit (passthru) configuredSrc;
+        inherit (self) callPackage;
+      })
+
+      (callPackage ./common-overrides.nix { inherit haskellLib alex happy; })
+      ghcjsDepOverrides
+    ]);
+
+    targetPrefix = "";
+    inherit (passthru.bootPkgs.ghcjs) version;
+    isGhcjs = true;
+
+    # Relics of the old GHCJS build system
+    stage1Packages = [];
+    mkStage2 = _: {};
+  };
+
+  libexec =
+    if builtins.compareVersions passthru.bootPkgs.ghcjs.version "8.3" <= 0
+      then "${passthru.bootPkgs.ghcjs}/bin"
+      else "${passthru.bootPkgs.ghcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${passthru.bootPkgs.ghcjs.name}";
+
+in stdenv.mkDerivation {
+    name = "ghcjs";
+    src = passthru.configuredSrc;
+    nativeBuildInputs = [passthru.bootPkgs.ghcjs passthru.bootPkgs.ghc cabal-install nodejs makeWrapper xorg.lndir gmp];
+    phases = ["unpackPhase" "buildPhase"];
+    buildPhase = ''
+      export HOME=$TMP
+      cd lib/boot
+
+      mkdir -p $out/bin
+      mkdir -p $out/libexec
+      lndir ${libexec} $out/bin
+
+      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
+      wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
+      wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
+
+      env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j $NIX_BUILD_CORES --with-ghcjs-bin $out/bin
+    '';
+
+    enableParallelBuilding = true;
+
+    inherit passthru;
+
+    meta.platforms = passthru.bootPkgs.ghc.meta.platforms;
+  }
+
diff --git a/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix b/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix
new file mode 100644
index 000000000000..f45ebb4511d6
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/mk-stage0.nix
@@ -0,0 +1,25 @@
+{ configuredSrc
+, runCommand
+, cabal2nix
+, yq
+}:
+
+runCommand "stage0.nix" {
+  buildInputs = [cabal2nix yq];
+} ''
+  (
+    printf '{ callPackage, configuredSrc }:\n\n{\n\n'
+    yq '.packages | .[]' ${configuredSrc}/stack.yaml -r | sed 's|^\.$|./.|' | sed 's|^\.||' | while read f; do
+      printf '  %s = callPackage\n' \
+        "$(find ${configuredSrc}/$f -name "*.cabal" -maxdepth 1 \
+          | xargs basename \
+          | sed 's/.cabal$//')"
+      printf '(%s) {};' \
+        "$(cabal2nix ${configuredSrc}/$f \
+          | sed 's|${configuredSrc}/|configuredSrc + |g')" \
+        | sed 's/^/    /'
+      printf '\n\n'
+    done
+    printf '}\n'
+  ) > $out
+''
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 8a395fbec186..837f8eb794d0 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -10,7 +10,10 @@ let
     "ghc821Binary"
     "ghcCross"
     "ghcjs"
-    "ghcjsHEAD"
+    "ghcjs710"
+    "ghcjs80"
+    "ghcjs82"
+    "ghcjs84"
     "integer-simple"
   ];
 
@@ -76,14 +79,22 @@ in rec {
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };
-    ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
+    ghcjs = compiler.ghcjs82;
+    ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs {
       bootPkgs = packages.ghc7103;
       inherit (pkgs) cabal-install;
     };
-    ghcjsHEAD = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
+    ghcjs80 = packages.ghc802.callPackage ../development/compilers/ghcjs/head.nix {
       bootPkgs = packages.ghc802;
       inherit (pkgs) cabal-install;
     };
+    ghcjs82 = callPackage ../development/compilers/ghcjs-ng rec {
+      bootPkgs = packages.ghc822;
+      inherit (bootPkgs) alex happy;
+      ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
+      stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
+      ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {};
+    };
 
     # The integer-simple attribute set contains all the GHC compilers
     # build with integer-simple instead of integer-gmp.
@@ -139,18 +150,25 @@ in rec {
       ghc = bh.compiler.ghcHEAD;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { };
     };
-    ghcjs = callPackage ../development/haskell-modules rec {
+    ghcjs = packages.ghcjs82;
+    ghcjs710 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
       ghc = bh.compiler.ghcjs;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
-    ghcjsHEAD = callPackage ../development/haskell-modules rec {
+    ghcjs80 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
       ghc = bh.compiler.ghcjsHEAD;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
+    ghcjs82 = callPackage ../development/haskell-modules rec {
+      buildHaskellPackages = ghc.bootPkgs;
+      ghc = bh.compiler.ghcjs82;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+    };
 
     # The integer-simple attribute set contains package sets for all the GHC compilers
     # using integer-simple instead of integer-gmp.

From 69b584ac3ba7c816f865b8a21b31d013683b86ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 11 May 2018 19:39:37 +0200
Subject: [PATCH 1635/3370] home-assistant: 0.68.1 -> 0.69.0

---
 .../home-assistant/component-packages.nix     | 10 +++++--
 pkgs/servers/home-assistant/default.nix       | 29 ++++++++++++++-----
 pkgs/servers/home-assistant/frontend.nix      |  4 +--
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 1fc3a828603a..c530301bbc90 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.68.1";
+  version = "0.69.0";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
@@ -165,6 +165,7 @@
     "lock.sesame" = ps: with ps; [  ];
     "lutron" = ps: with ps; [  ];
     "lutron_caseta" = ps: with ps; [  ];
+    "matrix" = ps: with ps; [ matrix-client ];
     "maxcube" = ps: with ps; [  ];
     "media_extractor" = ps: with ps; [  ];
     "media_player.anthemav" = ps: with ps; [  ];
@@ -239,7 +240,6 @@
     "notify.lametric" = ps: with ps; [  ];
     "notify.mailgun" = ps: with ps; [  ];
     "notify.mastodon" = ps: with ps; [  ];
-    "notify.matrix" = ps: with ps; [ matrix-client ];
     "notify.message_bird" = ps: with ps; [  ];
     "notify.pushbullet" = ps: with ps; [ pushbullet ];
     "notify.pushetta" = ps: with ps; [  ];
@@ -261,6 +261,7 @@
     "qwikswitch" = ps: with ps; [  ];
     "rainbird" = ps: with ps; [  ];
     "raincloud" = ps: with ps; [  ];
+    "rainmachine" = ps: with ps; [  ];
     "raspihats" = ps: with ps; [  ];
     "recorder" = ps: with ps; [ sqlalchemy ];
     "remember_the_milk" = ps: with ps; [ httplib2 ];
@@ -299,6 +300,7 @@
     "sensor.dsmr" = ps: with ps; [  ];
     "sensor.dweet" = ps: with ps; [  ];
     "sensor.eddystone_temperature" = ps: with ps; [ construct ];
+    "sensor.eliqonline" = ps: with ps; [  ];
     "sensor.envirophat" = ps: with ps; [  ];
     "sensor.etherscan" = ps: with ps; [  ];
     "sensor.fastdotcom" = ps: with ps; [  ];
@@ -333,6 +335,7 @@
     "sensor.mfi" = ps: with ps; [  ];
     "sensor.mhz19" = ps: with ps; [  ];
     "sensor.miflora" = ps: with ps; [  ];
+    "sensor.mitemp_bt" = ps: with ps; [  ];
     "sensor.modem_callerid" = ps: with ps; [  ];
     "sensor.mopar" = ps: with ps; [  ];
     "sensor.mvglive" = ps: with ps; [ PyMVGLive ];
@@ -345,6 +348,7 @@
     "sensor.plex" = ps: with ps; [  ];
     "sensor.pocketcasts" = ps: with ps; [  ];
     "sensor.pollen" = ps: with ps; [  ];
+    "sensor.postnl" = ps: with ps; [  ];
     "sensor.pushbullet" = ps: with ps; [ pushbullet ];
     "sensor.qnap" = ps: with ps; [  ];
     "sensor.ripple" = ps: with ps; [  ];
@@ -360,6 +364,7 @@
     "sensor.sma" = ps: with ps; [  ];
     "sensor.snmp" = ps: with ps; [ pysnmp ];
     "sensor.sochain" = ps: with ps; [  ];
+    "sensor.socialblade" = ps: with ps; [  ];
     "sensor.speedtest" = ps: with ps; [  ];
     "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
@@ -412,7 +417,6 @@
     "switch.netio" = ps: with ps; [  ];
     "switch.orvibo" = ps: with ps; [  ];
     "switch.rachio" = ps: with ps; [  ];
-    "switch.rainmachine" = ps: with ps; [  ];
     "switch.rpi_rf" = ps: with ps; [  ];
     "switch.snmp" = ps: with ps; [ pysnmp ];
     "switch.thinkingcleaner" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index a8091c70dfdf..ab5125c035fd 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -28,11 +28,18 @@ let
           sha256 = "af7315c9fa99e0bfd195a21106c82c81619b42f0bd9b6e287b797c6b6b6a9918";
         };
       });
-      astral = super.astral.overridePythonAttrs (oldAttrs: rec {
-        version = "1.6";
+      attrs = super.attrs.overridePythonAttrs (oldAttrs: rec {
+        version = "18.1.0";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "874b397ddbf0a4c1d8d644b21c2481e8a96b61343f820ad52d8a322d61a15083";
+          sha256 = "e0d0eb91441a3b53dab4d9b743eafc1ac44476296a2053b6ca3af0b139faf87b";
+        };
+      });
+      astral = super.astral.overridePythonAttrs (oldAttrs: rec {
+        version = "1.6.1";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "ab0c08f2467d35fcaeb7bad15274743d3ac1ad18b5391f64a0058a9cd192d37d";
         };
       });
       async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
@@ -42,6 +49,15 @@ let
           sha256 = "00cff4d2dce744607335cba84e9929c3165632da2d27970dbc55802a0c7873d0";
         };
       });
+      # used by check_config script
+      # can be unpinned once https://github.com/home-assistant/home-assistant/issues/11917 is resolved
+      colorlog = super.colorlog.overridePythonAttrs (oldAttrs: rec {
+        version = "3.1.4";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "418db638c9577f37f0fae4914074f395847a728158a011be2a193ac491b9779d";
+        };
+      });
       hass-frontend = super.callPackage ./frontend.nix { };
     };
   };
@@ -58,7 +74,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.68.1";
+  hassVersion = "0.69.0";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -73,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "103py7hfdanr8zk3cl93rm7ngjz0n95kwjbphq7iy8l8hqpzs1m8";
+    sha256 = "05hagifi1338law2mwwik2gjjw1ckjdjh0lg9l8ldsz999dkc2zz";
   };
 
   propagatedBuildInputs = [
@@ -91,8 +107,7 @@ in with py.pkgs; buildPythonApplication rec {
     # The components' dependencies are not included, so they cannot be tested
     py.test --ignore tests/components
     # Some basic components should be tested however
-    # test_not_log_password fails because nothing is logged at all
-    py.test -k "not test_not_log_password" \
+    py.test \
       tests/components/{group,http} \
       tests/components/test_{api,configurator,demo,discovery,frontend,init,introduction,logger,script,shell_command,system_log,websocket_api}.py
   '';
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index 678b5d3826c7..168a1ec3b9dd 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-frontend";
-  version = "20180426.0";
+  version = "20180509.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "60ff4e0b0c4538fa0be0db9407f95333546940e119a8d3edb9b0d7e1c86b1f3b";
+    sha256 = "11d9c4a07565358e6ee001f5c57c8393b4aaadac0d993a0a39a0387a33644fba";
   };
 
   propagatedBuildInputs = [ user-agents ];

From a707c1365c4f0c43e352402fef5ffebbc93ad246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 12 May 2018 06:10:11 +0200
Subject: [PATCH 1636/3370] python: deluge-client: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix
index 0c06bc55c7a9..cc991c7aeb4d 100644
--- a/pkgs/development/python-modules/deluge-client/default.nix
+++ b/pkgs/development/python-modules/deluge-client/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "deluge-client";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "27a7f4c6da8f057e03171a493f17340f39f288199a21beb3226a188ab3c02cea";
+    sha256 = "86979ebcb9f1f991554308e88c7a57469cbf339958b44c71cbdcba128291b043";
   };
 
   # it will try to connect to a running instance

From 4ee37b7421fccf01ed6e124ea586736fe2aa5456 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 May 2018 10:30:48 +0200
Subject: [PATCH 1637/3370] python.pkgs.ply: move expression

---
 .../python-modules/ply/default.nix            | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 41 +-----------------
 2 files changed, 43 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/python-modules/ply/default.nix

diff --git a/pkgs/development/python-modules/ply/default.nix b/pkgs/development/python-modules/ply/default.nix
new file mode 100644
index 000000000000..463468a9b404
--- /dev/null
+++ b/pkgs/development/python-modules/ply/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "ply";
+  version = "3.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} test/testlex.py
+    ${python.interpreter} test/testyacc.py
+  '';
+
+  # Test suite appears broken
+  doCheck = false;
+
+  meta = {
+    homepage = http://www.dabeaz.com/ply/;
+    description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python";
+    longDescription = ''
+      PLY is an implementation of lex and yacc parsing tools for Python.
+      In a nutshell, PLY is nothing more than a straightforward lex/yacc
+      implementation.  Here is a list of its essential features: It's
+      implemented entirely in Python; It uses LR-parsing which is
+      reasonably efficient and well suited for larger grammars; PLY
+      provides most of the standard lex/yacc features including support for
+      empty productions, precedence rules, error recovery, and support for
+      ambiguous grammars; PLY is straightforward to use and provides very
+      extensive error checking; PLY doesn't try to do anything more or less
+      than provide the basic lex/yacc functionality.  In other words, it's
+      not a large parsing framework or a component of some larger system.
+    '';
+    license = lib.licenses.bsd3;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a4717ea6a73..c9033c3d825d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9099,46 +9099,7 @@ in {
 
   plone-testing = callPackage ../development/python-modules/plone-testing { };
 
-  ply = buildPythonPackage (rec {
-    name = "ply-3.8";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/ply/${name}.tar.gz";
-      sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8";
-    };
-
-    checkPhase = ''
-      ${python.interpreter} test/testlex.py
-      ${python.interpreter} test/testyacc.py
-    '';
-
-    # Test suite appears broken
-    doCheck = false;
-
-    meta = {
-      homepage = http://www.dabeaz.com/ply/;
-
-      description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python";
-
-      longDescription = ''
-        PLY is an implementation of lex and yacc parsing tools for Python.
-        In a nutshell, PLY is nothing more than a straightforward lex/yacc
-        implementation.  Here is a list of its essential features: It's
-        implemented entirely in Python; It uses LR-parsing which is
-        reasonably efficient and well suited for larger grammars; PLY
-        provides most of the standard lex/yacc features including support for
-        empty productions, precedence rules, error recovery, and support for
-        ambiguous grammars; PLY is straightforward to use and provides very
-        extensive error checking; PLY doesn't try to do anything more or less
-        than provide the basic lex/yacc functionality.  In other words, it's
-        not a large parsing framework or a component of some larger system.
-      '';
-
-      license = licenses.bsd3;
-
-      maintainers = [ ];
-    };
-  });
+  ply = callPackage ../development/python-modules/ply { };
 
   plyvel = buildPythonPackage (rec {
     name = "plyvel-0.9";

From 1d43798d250403ea866ade067c5f4afca31abc2a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 12 May 2018 10:32:53 +0200
Subject: [PATCH 1638/3370] python.pkgs.ply: 3.8 -> 3.11

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

diff --git a/pkgs/development/python-modules/ply/default.nix b/pkgs/development/python-modules/ply/default.nix
index 463468a9b404..ae55cac642f5 100644
--- a/pkgs/development/python-modules/ply/default.nix
+++ b/pkgs/development/python-modules/ply/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "ply";
-  version = "3.8";
+  version = "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8";
+    sha256 = "00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3";
   };
 
   checkPhase = ''

From af46398f2be1b7f96d54b01c7334d0c5a8dea973 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 02:00:03 -0700
Subject: [PATCH 1639/3370] ibus-engines.table: 1.9.18 -> 1.9.20 (#40100)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ibus-table/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20/bin/ibus-table-createdb -h’ got 0 exit code
- ran ‘/nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20/bin/ibus-table-createdb --help’ got 0 exit code
- found 1.9.20 with grep in /nix/store/k3qfsk06xxrm7sp4fwv7h5shdq7j1msk-ibus-table-1.9.20
- directory tree listing: https://gist.github.com/ace63b0dd5941c9f17222549a08ee23c
---
 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 04a0a1e36dbc..0d467a6875b9 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
-  version = "1.9.18";
+  version = "1.9.20";
 
   src = fetchFromGitHub {
     owner  = "kaio";
     repo   = "ibus-table";
     rev    = version;
-    sha256 = "0isxgz7f6xhrcv5qrdd6gm3ysmqp3mi5ngnbqz08f7pclllaridp";
+    sha256 = "12rsbg8pfh567bd0n376qciclq5jr63h5gwcm54cs796bxls4w2j";
   };
 
   postPatch = ''

From 23d902a90ffe10b90c3b77f2b9e0a707e143a232 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 02:04:27 -0700
Subject: [PATCH 1640/3370] tsearch_extras: 0.2 -> 0.3 (#40057)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/tsearch-extras/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/4cc503c3c6f22711358d01e0ae7f7d76
---
 pkgs/servers/sql/postgresql/tsearch_extras/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
index c3a452132f28..5140ae1a228f 100644
--- a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
+++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "tsearch-extras-${version}";
-  version = "0.2";
+  version = "0.3";
 
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "tsearch_extras";
     rev = version;
-    sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg";
+    sha256 = "0i3i99lw80jwd4xflgdqabxmn1dnm1gm7dzf1mqv2drllxcy3yix";
   };
 
   nativenativeBuildInputs = [ pkgconfig ];

From d9aa9e950b2a9d68a06a0c42aa34f848421e2a9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 02:14:56 -0700
Subject: [PATCH 1641/3370] sakura: 3.5.0 -> 3.6.0 (#40064)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sakura/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/pzgl7k3a4c92m6jc7mka9jy9xrhjijdq-sakura-3.6.0/bin/sakura --help’ got 0 exit code
- ran ‘/nix/store/pzgl7k3a4c92m6jc7mka9jy9xrhjijdq-sakura-3.6.0/bin/.sakura-wrapped --help’ got 0 exit code
- found 3.6.0 with grep in /nix/store/pzgl7k3a4c92m6jc7mka9jy9xrhjijdq-sakura-3.6.0
- directory tree listing: https://gist.github.com/cc68e1af204099f1847caeb61afaf03d
---
 pkgs/applications/misc/sakura/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix
index 7c74bb6cd459..94782bdd860f 100644
--- a/pkgs/applications/misc/sakura/default.nix
+++ b/pkgs/applications/misc/sakura/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sakura-${version}";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "http://launchpad.net/sakura/trunk/${version}/+download/${name}.tar.bz2";
-    sha256 = "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b";
+    sha256 = "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1";
   };
 
   nativeBuildInputs = [ cmake perl pkgconfig ];

From 14720761763a06e98508f31bcba6626a95fd7518 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 02:17:32 -0700
Subject: [PATCH 1642/3370] nnn: 1.7 -> 1.8 (#40083)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/nnn/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/ry70cgfhdagmk70n6wn6968mqg8h3js8-nnn-1.8/bin/nlay -h’ got 0 exit code
- ran ‘/nix/store/ry70cgfhdagmk70n6wn6968mqg8h3js8-nnn-1.8/bin/nlay --help’ got 0 exit code
- ran ‘/nix/store/ry70cgfhdagmk70n6wn6968mqg8h3js8-nnn-1.8/bin/nlay help’ got 0 exit code
- found 1.8 with grep in /nix/store/ry70cgfhdagmk70n6wn6968mqg8h3js8-nnn-1.8
- directory tree listing: https://gist.github.com/261e9182ffd2085e4d82ca4daefdcee6
---
 pkgs/applications/misc/nnn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index ae1c178e5716..b4832a72c2b8 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nnn-${version}";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "nnn";
     rev = "v${version}";
-    sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89";
+    sha256 = "0sd8djig56163k0b0y4a7kg3malxlg08gayjw4zmvqaihvbbkc6v";
   };
 
   configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);

From a19cc36e1a2f55767a7413effd02598278c6003f Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 12 May 2018 11:37:35 +0200
Subject: [PATCH 1643/3370] nixos/tests/mysql-backup: fix non-deterministic
 failure (#40258)

Sometimes failed because of delayed creation of the backup file.
---
 nixos/tests/mysql-backup.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix
index f5bcc460cba7..ff3650988836 100644
--- a/nixos/tests/mysql-backup.nix
+++ b/nixos/tests/mysql-backup.nix
@@ -23,17 +23,25 @@ import ./make-test.nix ({ pkgs, ... } : {
   testScript =
     '' startAll;
 
+       # Delete backup file that may be left over from a previous test run.
+       # This is not needed on Hydra but useful for repeated local test runs.
+       $master->execute("rm -f /var/backup/mysql/testdb.gz");
+
        # Need to have mysql started so that it can be populated with data.
        $master->waitForUnit("mysql.service");
 
-       # Wait for testdb to be populated.
-       $master->sleep(10);
+       # Wait for testdb to be fully populated (5 rows).
+       $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
 
-       # Do a backup and wait for it to finish.
+       # Do a backup and wait for it to start
        $master->startJob("mysql-backup.service");
        $master->waitForJob("mysql-backup.service");
 
-       # Check that data appears in backup
+       # wait for backup to fail, because of database 'doesnotexist'
+       $master->waitUntilFails("systemctl is-active -q mysql-backup.service");
+
+       # wait for backup file and check that data appears in backup
+       $master->waitForFile("/var/backup/mysql/testdb.gz");
        $master->succeed("${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello");
 
        # Check that a failed backup is logged

From fc8566532dfa005dc0f15e21dc551ed39fa17036 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 30 Apr 2018 21:13:02 +0900
Subject: [PATCH 1644/3370] firefox-bin: 59.0.2 -> 59.0.3

---
 .../browsers/firefox-bin/release_sources.nix  | 778 +++++++++---------
 1 file changed, 389 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 3dd7d9e8e659..cab39047212a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,975 @@
 {
-  version = "59.0.2";
+  version = "59.0.3";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ach/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ach/firefox-59.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "6242d81b96456c52a25af82049ffae548f7b5e14e47e2e643cea94f338e10027270d67b13c27a4a77fddc378b1e0869b5a0f897b9b269fecbe1d55336dfa4718";
+      sha512 = "404b4cdd02a1d25379f3627824d7790bf1c73af9f58e94a8fb6208f8907b3a7e7599821edcee65838255fdee69914eb8c916218d7714226d7cce5180fb01ab2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/af/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/af/firefox-59.0.3.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "e2aa156326a38c4ac55b4ebcbcd460ce64d5e9abc210bd53d484cb97bded59bd73045fb7b3099ff3301f0262938ce8b4b90f5b0f807f73d9b7637a826a5055d9";
+      sha512 = "59ef32fb550404f6e4572cc9b5e34d6a7875a16dc62ead78b02fe944e4f3d2128e71cdac236e074238c6ca45d3fda959e17df3f6c056f13b149058f156bb97a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/an/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/an/firefox-59.0.3.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "2946fdb675ac86e32e91b3a6cf4c26d14a5c977f22a587315a1c5a03db69f84efcd5057d7bd7f8b37e7433f53d915e9e9e5ab0c9d35739ce82e1c3183b1c4d5e";
+      sha512 = "a3d0b8785bfc1250c8b5deda2a876469c1c2c3c7c5bb22b45a6aebf7d4e3c1813c7a7ed99257a4ec52b7f56f1c183e50e515a88bcb5d47213095382ab1355485";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ar/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ar/firefox-59.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "2d497f930358fdd36ae5e708bd73e151461497f8715b11efd5a2b6c23b71fbf985faeeb2bfa5cc2816982e81f27091705f849923cb724078764b50fa684374f4";
+      sha512 = "15f410bed4f64d8f3f8acf0275647aa0a94985e3172b4c5e0c5f52a3a1f1c132b1677032f361fec075667ce733e288cd79382abc5b4aa630281e72f889e35990";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/as/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/as/firefox-59.0.3.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "a1d51a99f8a5b47668c74414372d11120160f264762a3bfb988be2aaeb958ad5d3897472618a86a4a8422850c46f2895cf426fe9d064938c263bca96a9592eb4";
+      sha512 = "f61f4e1bf0487657fa538ced9ddfb01fae19bc973a3a44e602b4d68547386fab4b730ad69ebabd14617fc4a6b291a4c5c50a09c60d5cfdfc1a01254a9cc70c4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ast/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ast/firefox-59.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "dcd450fb49cce376f27e8135f8c27400af1c2cf139120602c000091231703db2cac791c82de157c9335fb09050cd4e4ee6013da3068b1527dcd9e0aedda16c5d";
+      sha512 = "30fc099cc873ad3159406018386033b251738cb258fbce3ad7428e6db359a263648d3c5f394150e5e162791e767e30de2907a16385669478706f66395ac60fb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/az/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/az/firefox-59.0.3.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "fb004315a6ad15cc9ccb6d3b36901c4c495ea21fe146df3869711fc7ae8fb625a109fc416079e85163e79524bb987b366b2d057cd0808d0dfc61f78910fbef96";
+      sha512 = "7b3fff9d731b1700461fdde8e4943fb5e01a73e2c89ae40511315b2f219524dc3ed67458f9c91ca0b4ba34ec9ff7e5edc5382dee25b23d46f468d597024adf46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/be/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/be/firefox-59.0.3.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "ba51003823e74734726f655cfd20fe968ebe5feacd0c985f7c8b2cf9766d7b68fe74dafc8baa0605b8fb46b22312a593218c5a57fdfabddea6a51491de74cc13";
+      sha512 = "f9913874e839249b892281b90cce9fa93243560a599c942e5dddf22b51e4b5774ef91d582a170d5a591b3e47dffb7015aef5d4ff39c165213ff8b24e238b8c6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bg/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bg/firefox-59.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "f9df1a70c569f853b94c912d8cdbc7cf98a57eda9d461777f9f94c776f4db0a70b6093478ae1e7c87e80f37cfc5a39af3d2b37897ca60496f0d00ac9b45c1713";
+      sha512 = "1a84a38460ac8a144e4dfef1b1e5ddb6dcfaff1f0cdc1497e477614b60b63405f0e573c25307957d52a91808af88b9906daac8c956d7ee74bb907bf90c94f526";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-BD/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bn-BD/firefox-59.0.3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "85758a1ac327b067a59358d3faa0663244a24a4769ac0dfe03bf9dddd5a680503ea4bc9313294d9771bc7e4f3341904c68e0059d912b563aba8061dd0b6cc793";
+      sha512 = "72b33e221e8d111bf8796879f8797c760e752e17d515a036c9c84172115a845cc82d34b4a16ad27a84db4c1d32fd74c066b6fb7810a4a06ba97140e5b8330fea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bn-IN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bn-IN/firefox-59.0.3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "895d63b62be42947e955ce426e03f7f8cbf8333d77fd3ff4ca6623db18cc740fb1ea6c41aefbc75aa79d60fca2f00b75f1b2e6b5b0bb1ddcec61f9c0772dedfb";
+      sha512 = "0ddec8964bbc6bf0aff10a96d5797166f4445ee26acc155a8777cab8755b6a119b61c38f9acc011f3857d97d35b808b72f22c5493c4091cc4c17694b1d8b4f0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/br/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/br/firefox-59.0.3.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "e62f445437a07f9fa070335328064355715d2e5ef81e5572f04a8644f47dd1c8cf8a3a7ac6fa88038c4e996229ab695e692aa1c0b0b3becf214579aaa76a5569";
+      sha512 = "9171f0547ce9d0c244a959294d62477bac7fcb7e611666f394ac47fb0c8f3579f85b08fa837e5e834a38e4908e0e1a4fe3b96e5759825a41996afd3fc2308e8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/bs/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bs/firefox-59.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "d3adea6061daa0fd54d5cd7d9d8a00f8b88db8ed36545f9fcaee7520c1cfe58534d1fb57e8297fdc8b4f348bd6c728891f6a88f1d4d36f59a7f2ffbe0e4eb229";
+      sha512 = "6322d2e315937a4b7007ff68a8e491e76fc13e07cc881ee9c7a0a20e57f75ea4ad245f1849902aaa80eadc380bf107dcbaac229f05bcc67f775844880a514b97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ca/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ca/firefox-59.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "5bab1fe909680ff6eacf8fadc9aba7786d801379a2e79e5da04e973a3a218de8807c3d08f7641be554fd49c592028949e30b262fcda52413303d9044e161a60e";
+      sha512 = "e1080f2bf6a9fd9b20498c454231315387fc12e9f27a5e6637113d5121c1e3c4f7c9c1dcaf8ceef6af5245d9b5b9388aca63678431ff54e58378f3faf45f42a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cak/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cak/firefox-59.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "f54a09501c7311890542d91b0ec96dfa5cb634685af4ef0fcc69e633157183f0c5ef906a205fadba6e132c9ee657f7161879a83ea382bbe400694e92c065de64";
+      sha512 = "770a9990136bcaf0e8d8a8056972de603c1f6e181c7b37c0b3dd2bf694a9402c981d4699e25d92c10a78808f9a56596f533107c941c29c8f3f318b40c79eacf9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cs/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cs/firefox-59.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "28f17b2ef72356a058976da30960af1c8d4f2a02a946aec57b3671d71887573a98375eecca4a2f0f21b37bcbe0dd189ce4ee17ccb9af8fc60d63e9bd20ca44b6";
+      sha512 = "e1a65b8f97f106985714f221c0221b66c086f6a4aaeddf994089a4924d1f73ea5345de147870ab46201466e5bf7ae6d7de103f666ee40207141b5e64f5cc2534";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/cy/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cy/firefox-59.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "36c8a1ac125a55db15d0bf7c8d8fed1ca3b0031a9421437b683adf7691fca281a499af6812cccd608e65bbcda3e1e94469b16ead2a9093708c8c2daf4ea7d588";
+      sha512 = "7d150f5ed948a9ea25777e9d4f15c21076e72340150140aeb26db5d39ba124087f7e93362bf9b9b8104087b84a998ebf8fc006198527ecbe441d1701fe7fc7a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/da/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/da/firefox-59.0.3.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "fd8c669362fcf945b6280d103d1b9524741993db8d38b78e494ae14106309999d09f4b13d55b8521612cac9e5dad622ef361fa16f197389405ff620b3eeac467";
+      sha512 = "636bc1610c521bdf85976aafba91969641ad7cf77a00a51b095c84698f42fc27f5f4bef227f9f9d0128b8d68a99d2ca7d8d915e74c8428aed269a67e15851343";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/de/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/de/firefox-59.0.3.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "32cbc3d054628a11959ccc7b553fdcf98f863a86373307bf8f558a78482de0161e533b71cbfc03142b0ac7aded506e53e821213e42c574d28132fd2f98a753e4";
+      sha512 = "8dbf02a5533a84cff9c41584e91416859a06623f24936eb559238f0ccd5618c047f1b549036398aa8bd4f879a8eaae7b0f199576427dedbf9708cb55514cf169";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/dsb/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/dsb/firefox-59.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "4e7c2f6b980dd4872850f7dfcc068c7e40a8bc896e27ede759029bf0324e1189e605ffdd2291d2e6a4a0c61e56bff6cd760b77e232209127e9a90a38b012e4fb";
+      sha512 = "b42bb2a2e75713e9c0c2f0602251ad5c3ab8683800ee08b0b5f36f055a63dca6e88e6e0c88806149217f20833538bde557c699c7f815eea59ab571e3b2db4df4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/el/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/el/firefox-59.0.3.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ecf743c23ef70e92e1f7ddfd2f1862b5b60b446f0e1020778a79ec11af94ce5f03ffea9b0b7048a7ee0861602d5c32f4f4bc8cd4b7171ae306987e1ca9993ddf";
+      sha512 = "32c61f7110084caf8cc3aed151f5b374e35ab4a4b7d5c3159f0e44007f3398e6fde02ca460e13400ce6d507bf2dccdcf88c50945420802dcd7cf2ba6ac3ba8dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-GB/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-GB/firefox-59.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ddec1dfcf976f93d1eb310ccacd9e04dac8e0b075d37b54be1402531d12c11ee9dce2be7d0bfa92c9b654192c71781fd2631cad24c8153275e786552b9ab11e6";
+      sha512 = "ee19670513499ce3cde705e1dc19db9ae16018cf8672d5c1c1f7029ce4a44437239150dcad425592dbab2746571b5317fb0e1d7eed87f65e121ddca4a8efaf31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-US/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-US/firefox-59.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "3257084102282621f15207af04e6dcbb98887b13a8be911069572c151d8ad96f90e7c083e571b4ecd4d4d4ff3bfeee1dc539042d8e5bc6a0fbd7f36c427da402";
+      sha512 = "d42ae9f95b85a2678c895ba920435059f920df656bd41156c9e300a97827f58bcb689d0152f9732fabad792c084b47719124bd96d286744d2d787909e7844ae2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/en-ZA/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-ZA/firefox-59.0.3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "35d2f29daddfb6ba439b160644869bf806ce7a2e36c26d4dc9ef2ff2eb5079e0bda9095edd727fca9c64c3be5a5646e56892bd7ff76b2c67300c1ec7f074d98f";
+      sha512 = "9ca481e4a072eba9d0bd373df8d4038b08d95af5ad69e08ee0d3499cbb422e1df20b2a56615675d2663ce1df6cf4cc01ec773a8b99e43301b4f5e13dfdc70cc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eo/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/eo/firefox-59.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "867ac54d47f2266ad357d1666c9206c00e45d7184f6b3a0199c2474b63829ad1d41e95491d2c977885e878d36e2d7e93d215c53e629886e7cb04abc198a06e42";
+      sha512 = "750ee8058e9c79047a5abb3b8219ce6c10d0aa8667ff788c921891d5bb8e85a400bc28c7be9a8d0479d7a64c7b6788a22a5a8545f4665e2c90513251f87bae30";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-AR/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-AR/firefox-59.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "3d577099cb28dd4c4d1349141a715783215510d015f7b2b02739d530222ece5229ab3e6cfe481be4e9d1d17c40aaacac10af9d9c2be37f7956620924e56c87e8";
+      sha512 = "dc0350f8da5ab3deb8dccd05e71fc873051d8a935f75af95a3fcb0bb81e86f18eca3f14c1be2f9fd491662ad9c908c5770cf1e6d22a4f3ffacdf5aaadb54b13b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-CL/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-CL/firefox-59.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "821738beffdb260b6b3d8b5c3a1395b6b7d58db6b05a744899c0eb83a291855152f5055c3ca6d9a460bd032d5e72829198cb72dedfcf6614aafe1d7b8189dc26";
+      sha512 = "04f9c3a5bb4e87778a5b7f10bdc4f6ac5f8eee39f50db72e20e4e94babaad0411d14eacefddb084469b7540cb5104b718e29020188ff05069faec919420083b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-ES/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-ES/firefox-59.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "10ae818fd27acc38a5386d06cd7d890d4eaa44407fe6334b81cdbe3f43ded90be72e749f075e165105e9a6f02e08014aabd7cd783860d6790b67eb2889718e5d";
+      sha512 = "f70157ee4afe65cf65529d1dbc1c93307f4a79cd89d0ef7c05bb9f8723c95c561eb3a122506509e83dc6056b603e203bdd5464dc1db7e6497c0fb7cd7035d039";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/es-MX/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-MX/firefox-59.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "239d3c287eeface29994c8c2bb9bacd739d638cb277e18e57dc729e35cc0c11f6c7168673c110206f3e931c850bfebaf1a26d4f690d8f3ff6f85a61147522941";
+      sha512 = "aec14d9c54a116047193596304ef235d05089c2e94eec9caa40ef12498800fafc88b3e094e1c72e25be06c8288daff20fe8859a62157544ee3233ed620fa0daf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/et/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/et/firefox-59.0.3.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "824b63c3c596191f1f1c60734bbed70058cb9bf71959dbba759a2b2e75a76d0b0c50ead203c093d568a18bb622372ae112ac22da0a33e4cfe89e5a42d7329b04";
+      sha512 = "32dbdd743b65fb5f5941ca3a83272b49a47c7742377cd46bab19a9c2e75bf5726cfa7afa55c7cc33a4a9daceacdaf59019ab0f302af84edc6ea6beb9db7fd6c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/eu/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/eu/firefox-59.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "01e0991d3a1926f41708353bd98e3aa00d3cc71dc7635b9cce52c3699aa5ee670818db76e9d82de4afce338165fa01bb0e88c3e8b86ab2d92d1b8d3845183510";
+      sha512 = "9b47c791bf12a2782930c62f4973a2d49cef28e4b5fca24824da28dc2f9b7bb64f9dbe8208c77d77f924962db35e0190969cf65b2d2b520cba94ae6747082038";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fa/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fa/firefox-59.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "726100abc12832418c5cdc15b9e9083d88d72a70a0f6a1a567ce781173a554cc4495da0e53539185e6ec27143bae98e952a5002dea91fceaa5f8d8e51b6d6a2d";
+      sha512 = "bb0e0c3a8c5bb31b1959626a2d8e13a47f60815af3041e0463e9148c61fcf626cf1ed0a9a6f27ebf8fb5fcda60b306ca679f4d4c6f4080d7a542782b2805b22c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ff/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ff/firefox-59.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "1a0d97e27008ff5f3bf3fe85cb14c303320a3015cf928b2ea4c2e115a5a1cfd809743d801157f53d6ffdfcc359c3738f2e2a0e12e5ca7ac8e3f2b93253654e8f";
+      sha512 = "3e9f478f3712cd084ece2492f384c0ff4e92058d20df30893b5b96ff20bed8c3903cb66c23a4dc9fcdc12320addcc9da948c05bdf3c84232d307bb8360b163fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fi/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fi/firefox-59.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "ba0278c06463d0ef44308f46326a3fb9dfc0cc4243086dd9acb856e54465ad672bcfac68afd9ff81d08a1d0c924a044e0ac5afb299be9d06b657c159f6c8ceec";
+      sha512 = "9f85727e929ecc8915530c5cd57bb6e76d7972636ae607e0ef211ab562694e825406e23b8ff98b39447fe9f5fbe6ab586370ba0a90331d5dbac04882baa13643";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fr/firefox-59.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "bd8ca7884937574f0d6b4dc5399771135778aef06bd09aac275ca11c2a8dff580be45ffbea5ceb58f8baa7d7007587aa07c3ddedd407f0852c1a3940e7ccfc8e";
+      sha512 = "d150100a8d0eb9fe38bb40e5791735975a94d866778623c649fc9cca9907b773f3f5762dca0ffb707d50d72b48cfe3da0d3a203f310a119b1d2c17988a345233";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/fy-NL/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fy-NL/firefox-59.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "9e5fa467a99cd7a9ab102eb2a50ef14a4402d03ad3dec5b6d511c7da3843e779b1492b1ba22cc72f83070ff88353ffdbf1a9d26636462c0e3bdaa6dccd6a6200";
+      sha512 = "6110e624c28606720ba7383179573ba047e3a5f975d2790f9c647995a0821b17d04dcf1108672b5c8eff3c5c7fd6fc8bd0fda53a293d13217526e6f5f959e09b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ga-IE/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ga-IE/firefox-59.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "1226faa2c14196824f31da863aca7d076972a47d71a971847c09c66d268d07a9aa2677fa0a7e8f11f149b77261636d62c39e7a382db3abb2917bbbac74330d45";
+      sha512 = "1d6015e42bf94eaba47a9cc75134eac83cd2ad6b18d86350eeb2df0ed7d38c3d39abae49f2b57d1b66f6d75c7e233e0e31c4fcaf7da76b6b8b90dd07e7519e99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gd/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gd/firefox-59.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "eb0dd803b7ba91574a044503d2edbf633e08c834f8eaa5e546975d91ac7254b3fd4357710fe4627d742a2ea3e64f568a5ef1a893363c516f958e4a153f528f12";
+      sha512 = "ca5cfa0b930147a88280f12a56ec7e112edc66079139cc0d7d5282dc6078dead6cca66b8725ed9cd59203e3121ec480454fd42d535c42ee6d002bfb99a323a58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gl/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gl/firefox-59.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "e789fdf2452043165df90c83ce4bc0ca641366ffe5f89026bb763480973073d79c097313b744c3b2017be3d80f690d18459d1b8969538ce310b802163a2eec45";
+      sha512 = "0fa94d9f494e2b8c90931889fc0191540b8999526e6140cebffd93fd02c0035e206de09fd4f28f168ada7b8c13f61a7a327efe19909024779751090178add2ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gn/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gn/firefox-59.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "c368f07013b7b4fcc74e88d68a07d5d0a1fb5133991fb343d5b1a86145108e14a762962f3a3d5c7188d8cd75188cba7f26bee5555d3a5e7cfb9741e2e11ed42a";
+      sha512 = "640518a9f2137495adc18fa689444335e4a663cdb9a4beeb3ae6dda6c4b5d2af166ecaae8068352852c3455ec8fe81cf945faf2742f8096dd6966fa37affaa12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/gu-IN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gu-IN/firefox-59.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "34795309248224a31ef64cef9ff335f357505684f38edc06b9365dc0da98c5b96aa38f21e317e5f0cff0d3d3fa94ef7f8aea6c27f67501aeac68c3112b63cc43";
+      sha512 = "9cdd5186c99b5ba464a3931e443a7ac24f8236bd6e92f23314e0595525ce17757d58637b3d9db318816d704644b600a2f2bd1eaf156011c5d22bf58ecf0c0c90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/he/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/he/firefox-59.0.3.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "05e21abbec43babe818f28f2f12e55159e413b0e6e0871fee76f50c380085ea129620864642d3d26e80e039a50a8434015ed348c51341b6d87190c627b90bb82";
+      sha512 = "a2ccb4a8ad24143c9b82d16c816527acf9022a2457695a66144d2b917ea2c933f15cb238b3afc61be2e590bdc966a009fe4aa5e08bc94e2d297f768344d6596d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hi-IN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hi-IN/firefox-59.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "f6964340a688305ac3855efa57280e3b5eb64f22e11445d76fe28edbe04216318a16c1fd02009b8a66ccc2ec689d8e0bc374e485bc03e964dd5b65ad27e535e4";
+      sha512 = "ee0f077a4001fab75b8d4386e8ed4b72a3240417cd4db4d9aafecd8cde7728bdf3dc1ea1c96dd7a568ff547dfe2ccd984a679ca464adf9528fef886b913224cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hr/firefox-59.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "e0966ea4bfa256eb3a255eab7c89fc9073789512941311863199d96db4014f657acbd1e403a6a4dfc8165dc39d54fb1f9ef48790e942eadaf90f0cb7ffe15ef4";
+      sha512 = "28c158c5b2895b16a599f3122d0742b8e48528f3a319fb48b5f2c500727dcb877ed7660a3a674883b3aab71cef66d76a6c1cb222dc16925e0bfcb044a5d510c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hsb/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hsb/firefox-59.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "e8ac60e1b925e7530884777a4ae05037e5c577fe6dc834ff8a007f473846b052290787d3d2f0c19b56e573385b6471336208d360c4c13a3ea3dd686429c28fe2";
+      sha512 = "6fb2b3fab3559b87c62d7c63fd522c7e0c8d51adc60a49ad87340ecc05e1d27ed3be84a0593d40173e25fe0445d776ede6db6d3d0e8ebe1dbc11f1ace4feded7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hu/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hu/firefox-59.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "737634b022794a37223779592ec948015a90c6c96c952acff5821c3af9c060e7fc60c988f17d87d5faa822fb860e6697e233601c7fb910ab5596935fce12ba49";
+      sha512 = "21f30c5e8e2f23f39b149545fdd5ce0fe0169bf580a574b8da6f141e09334a010b21ac076aa62b4df2c335ad8bd433344c58bfb7d9b80f26261a0f927e3ef455";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/hy-AM/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hy-AM/firefox-59.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "53d3a10011e8cbd22bbe86c6ed256775de580f7b8094ce30d8337268362cffa2df85267fe11432f659a012047a164a63d1c143014c0dd26ff865760119223f5c";
+      sha512 = "619190e969e7d9faf0b0d9b6eab902577a19183f1412a8f22a4615eda035ab06c10ea2ba0769febf3466ed97a964c7b7070a03d4ca2ba33f312e04fa20eddd5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ia/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ia/firefox-59.0.3.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "5d1ba2fa31d3c5ee692d3bf8ae0995ab166ea0c31044e056b4806bca141d34f93ed5117630c311c072d22cf65d12efefa812203a8237464cc9a285c236439810";
+      sha512 = "8cc986bd03f6d9c66c7916ea8c7086a18ecdfacd9e117136bd8489ca5f91af6d87447ec1a9b998c9bd222dd83e679b4081dce4a98959c8ea8b3bf541e46a2c8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/id/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/id/firefox-59.0.3.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "b94a086208cff6fa7b4b3f7eb4d681e77d2042ef1c6b21af322ef7316b8551344aa72c3d7a39b86826b8c6d69f847b9d20f60143a048ee28db88847dedfd1d37";
+      sha512 = "9debe3c7c1310d567a960985269e56f40a0a85eb99dc26bf7ba1c009f78dd66243ec9f8bef3cafa1f00f078d8cc76f84d4c4367b315418456f7f694faa9373f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/is/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/is/firefox-59.0.3.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "9767dcbe58dd91364b313f4b7b8f85e1768148080ff97220fa1dfb3dc8d5a69e6fb8fbd607a92411d5f4adbfb856c101bc80f922b0b1ce8b63a79039e84c329b";
+      sha512 = "f0f676e21ec9ce7625f6925e524d0ee2cfe11aad4a97cc9041b0cc03678a8059f3d32c931edf56173b5300d91620fdb9401919addffa4a76d060e31bba8000cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/it/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/it/firefox-59.0.3.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "f8ffccb521f97f0f18f70a0cd2cecc1c31162072bbbd929a1952823275d7b7d07f36e64bf6811e1aaba64b880c432b1dd342483b9ad5a594971a0bd068c45197";
+      sha512 = "30fe899358440fb54c779470548dcff9ceb8eb55b72bd298aebd7281309f24fd256865b7db83461c83d212f6b66e3e81d505245ae9556594aff78e86ad12fa97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ja/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ja/firefox-59.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "bd97cbffe8c4c1ca0fd8e44615a6e04dc5929c8ab896952911a04da3796a9132f797a4e32ee262af7a2d8bad294a30e11349731306d86ad18200715408337437";
+      sha512 = "309f6e3a24fc2f9ed859f0133e38cbc47b74d6d04fdf439c14d6328f25c16697eac7b49e1441c9cc32877938aec1f8e862df6a44fa85156b9d29109713f61dcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ka/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ka/firefox-59.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "1b5a69053263a0571227e614e0ed05ca1cf8bfd7a6294fb82778c2bc99b209fc68b7d644cafa223686ae2a54ee125036a91a3a847a753c194982c0f2327b3b49";
+      sha512 = "d2bdbe00907e43f1673616dbfd52182651e2aab4b356079537d361c8c88945f06ce23a953386d64e4aa6516a490674f3cc20973558d83990c8b9c35807941bf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kab/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kab/firefox-59.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "33805bf3976c9ff6699767ef69336f06eb86f08b540b54b33c8997b6af42eaac6be7b9dc8f29d3099ca9530209516ef84e819fcf98f3a7bef3e8d47be8d372b2";
+      sha512 = "a144e1fd69291e5f30a0aefbfd2c9113e8d3f3dd38522b6c12e227c47626a7bda74d4663ab2c2aa10d85963689db4fbd3141e8c49ffe77d59f273c7031b31d55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kk/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kk/firefox-59.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "c2bc89ceadb7ea2c81ee2b4d72bfbeac8a34cd1838f0c2201d7ef0c819e597b87a935a0e6be0831b997ecd290e286de7a1c9b903a10daaa5dfc0fdec2309b260";
+      sha512 = "cb826eeddacab068f2b5ddfbbe05ffdc3862c23eece9e2b11cfa9c86780eba659cf6cb0917cc5d41737bf9f9fa59ed274ce29c3ae94c41c9d2c70be3249adea9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/km/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/km/firefox-59.0.3.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "cb1919f31651b38a77683850077cccd73c27496e1f9b4354accfc35f294d479b92549ebbfa173fdfadf95b03bbb45cf1baa0c8a4e51f132448ffb9fb2293a67b";
+      sha512 = "d968692a7626bb8b831c747cc64c713b1209218cfe4bd4f1ed6e645ccff86dd4c4ca529f07a163915b155c72fad4e2637e2d1f52e0ee184f572743cb0b2c8de9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/kn/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kn/firefox-59.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "4293747292be73ccf60a19744120f9cc13b45a7be0c5de4243dacb5a2258eb88391d6dc6b240420ca5097ff5f5e2d5d36240289f6a5c51ba7d0fd31729d342fe";
+      sha512 = "ebcece13e28b4e5009a60dd88752b7f5c756a5fb974b606c3dccbe037401c30b684faba5d7b4c76d21dc369855c38b66fd160544efe7105235412dd10c16761e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ko/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ko/firefox-59.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "1a4723d890649ae29e9030ed2fe3208e44ed10adbe35c25877003a6adc21e033278874241bf5fc971b93f94d33fb4b503dda438153a8bc80b187b584841423ae";
+      sha512 = "5272a4d40ef663ed9f9774ce61e73a5f42be4ab08222e45755dc400e4a596d91f7833f7510cdd199932baa8eaa54fe56458513517d712ccf24bc1b40ddf62c2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lij/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lij/firefox-59.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "564260546bc6436dc47ebe6b413abad6d2d25dd7a64d9b5ddbd52fdec49af951b9ce26f3aeccc330aa9601605bec7b3b1f8701668d2b01ee06a228f723600fc1";
+      sha512 = "cb09361665412b9c5a0865d59197d0f7234a5005a2e147010c7d40f94d749e22719d150da70e8e415a9f9ff3f01a0f0aa9158d58f45d34232f4d6d40c6b7871f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lt/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lt/firefox-59.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "0aa6b9bb99ae8284f7287def5048af21372d03211a279f2226de7a739523fe189b3e06e207660be7ab35751b5ccc6aaa1b53dc293417971300a4a8e7cc162b6d";
+      sha512 = "f5e5ea9eb648c3d1c0363f275a1d262326cecb3e33f539614242d05e819e4fe58276eaef58f03f088c4f0bc8fd416e35c4ed5303f962daa80dc9fc7e90b6ffa1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/lv/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lv/firefox-59.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "f63955b57e40d2d49d5d1b276ad5b2bdd5122daf476c560dc64e82afa36e4a649e384957c69609e74ff96935004ddbd45c8043a27991d082e59e0f42e7221aac";
+      sha512 = "97bb94f1f8e30acb1f86cdecc272f56bca9dcc617f02e43fa024a0d9fbb7a111c01245e578684570886bdc67d706c5f41d02fec7cdc7b298467241a6b5ae9a1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mai/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mai/firefox-59.0.3.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "7e857033b14656e972ecbb6f60454cc63f79a9c775bb1fdc669f44af3bde4e1d04ceac3f7028eaab17fccd8136c417d937009b6fc0e80c45200b279660924bd5";
+      sha512 = "00fcb9eabe9779878a8b73e98dbf025ea5d69adc2f84d828e3532257bdcacc9fced522228c330b3286fa9a9bc11806227c698dc4b6bc87482e838974652a8d77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mk/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mk/firefox-59.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "8f7bf3418145af3ab47372af8e131b4a8b350dcfa8a7f74720a96812563327a4e4816976c2fd655fbaced91fadeb98489bf0fd043e103e5e0923b9c2ee408188";
+      sha512 = "469394ce137bb09223123e84b36a2f6cc3f4679db831e787b26c674045025eb96c00e68eb8ca3c18dbcfc41ea91c31b4071c3d9c392b1cd5386e3c4b92352799";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ml/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ml/firefox-59.0.3.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "b9e65dd54f8b4c1da28f6079938320f9943ff94ea0a0a7857192805ff84b53e7de6b762d05f8a66b6dee9f8586623932c5cac7163db2829fe41a13b3c73c27a2";
+      sha512 = "0736b067e98e30c411e2996428a9abb596a38574ed6e2225cbb2e32ba3ca5c7793281d019f1f0b73d6fa9861c9526d7e504f49fb5100ab93d7b625061b356754";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/mr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mr/firefox-59.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "80e20cc4d30dd2ce2a7d5c40b4c98271a0c0834cff7bf201c3db8df4bece056becbe71dce7056d24b837d16889cb15ec73be7e853384d88447d9d00eada4fcd6";
+      sha512 = "bb34429687408dc07c24959c93f38959ff3f3ce0804f1bfd33df9ac7f2218287d6f3a63029dfd73bad6aea47fa132cabf716c50c9f6f06258fb4fd667ee9b186";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ms/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ms/firefox-59.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ab4e6a3c244a7e1c4683f58252d02865cc9e8be51a2fe189d8bf555c968260dde63af130a491a8c3b093776a1d1d6b883e32b4054c19a20a9d1856685b4cbe35";
+      sha512 = "a96e7f57519a7672feee1a4fa84f6bb4de31a5a66d79905413ce8502d9b272d2e77bbe92a36cefc5ee050e8099f314054c81d440a73a2787bfe02a097d6e21ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/my/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/my/firefox-59.0.3.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "aef82a1dff4adc9d93c967ca4fa3e4601772e8b748c3d41a08d2893667bc661a0c640b02450bfa647d35b9c097919ce90a4a4034f83cf4ec51d2341651205aab";
+      sha512 = "25ebb5e15975848a1e66eb1ef6494fc42d5f8b42de77fc6e66313a0d00d5874271aae0cb883ee1f1139f9664bdafb902a3cb5fc73d2dc64f4a97ce686137bb12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nb-NO/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nb-NO/firefox-59.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "edd9601c678f8f551fa379d7f3c31d2e4c68434d9d3401b40f2945622e6c844993fcf3aaf010ec5b3bc13eb8c8cbe951d76b66a908b4824526b8da368361a347";
+      sha512 = "b2281d8946e6367f9153f7201c2bf021a1ff20f69fd6a52a5074d195f8c7e1936ec811a57cf71f4cf10d7f128b6ac0f5229f1fea4fda3511d6e113f131f210ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ne-NP/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ne-NP/firefox-59.0.3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "6d7a5d81e0551e675d8dee4be7fc0b8a39afb37b74949d408f197562bb8d7866706dd1b9fad60de4410cac9bc91a4ecdb92aa75a60b2fc2e2b7cc51fc9e46c60";
+      sha512 = "63c6772968397c738f4866ea68d07f9aa74f0e593010cc80a613f4c59713e81f29e6715caafc91a1e8d68df906abfe498146be1cdebe56f085cbf576bf26eeef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nl/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nl/firefox-59.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "3d4c3714c7d1c7d4865bace3827df94068bf0cfa4037af130cb7ce0a5f6cf7eaa0e37d091fb36758b13f52a5307288e5480ddcae50bd8645cec527481c03d7f3";
+      sha512 = "bc75476bbb8791cc7b67f0403b31efe165775708961b849351cbab604a828e4f846630f9c4172a24a519cff0ebd2d86ba3d498659b1a4fb81554d0b3cc4da9b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/nn-NO/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nn-NO/firefox-59.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "753e792e3402a5b75043899a5f50f5926ce31d2439ee1eed16193932e962338cddd974194ac94f7aa1ef0df548d95f901a50988abbf9f3e9820f89ac372e39d0";
+      sha512 = "5baadd863abe9c385b050e55748785f6d0dfe539781327713e0fd746a4546b7bd86b9b4ee2281092e733594106028ea36d37c254705f5f39447c152593c74035";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/or/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/or/firefox-59.0.3.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "ac0068afcdd2b6bf5416298e1be065387606bb0b79cffa364aeef9011535ca5c155d1d28fec0715a648f065628efd2c847f47785ac7f27415ceda1902da1add8";
+      sha512 = "bb444d06d25d782923803db81d446f12324e70d13daad1d014f4d938d466f946d6922a5f21a560e4c82e9ae27c3ac72422875518f37bcba268f7884c0de98d86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pa-IN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pa-IN/firefox-59.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "fe77072b374c34f5026de80ffae16fd4b30705969a795079ef9e81dcf66dddddfe01287dd44bb4f0001427935671d2753d22a8b80469f9c4e896e215400dd9f1";
+      sha512 = "79881db61e611083c35d2730753ddd7d06e28e5dd1703fa5b500562ad66222d0f3b731e1cc475760cc726e34e12585c3059025f60a1a7a7c512286a92268313c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pl/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pl/firefox-59.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e4b05ab04418e65880f989d642478023bde4ba5ce17627f806b223d19005b4e6825d8a9d5c532c878a397b3cbd8220c4aa4c2627b17b83fd6f4acc395c0a1923";
+      sha512 = "33c8a94cde2263b78c32ebf7dc8646d041c8071e3f26926776b7cec635cbeb7aeda74b31e6e59de186cf1f9f929139e1165635e6340fd3f3d56a400722d3f897";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-BR/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pt-BR/firefox-59.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "9d67c1264b90dc58ac62fa094792955b75724791b7941354d5836cecf2c5c13ec279cad12f93287e524f0f0dfc2302f68f7585dd783998630007dac806f7e2d3";
+      sha512 = "a5e14da9ea50e92a6e48bab8f0626ef6a155eda72cc0ac068943e948c942f291d36a5ac4b06e802358153bdfee6a7278b524834c3e5c79c8f4adfae6c7877437";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/pt-PT/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pt-PT/firefox-59.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a241e003b6d1a3537b5232fc793aa6dce194433028987753bbeaa5c21cdec58b326e12bd4136656cb35bae3cdece5dac100f912151aeee7548420de2d3875e93";
+      sha512 = "991544ee16e1cc3b5dfe3e8426f2f7ca47d72003f60efefd9947b2cb72f614583225f81d5c49ed1bc72979ca548d749592888a01778c4cd8d2261c69e47a7cc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/rm/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/rm/firefox-59.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "87ada5bbfeb43e3a42f1eaa44c58e025f66ddce965e1c97de8ca0df190ca18106eacd2d1f28c959a104e79df583672206c047eb79c51a32f431f8cb6fd68bccb";
+      sha512 = "6f2cd65aa98c546a9a19144dc24da9cad112fef735618b5ec23ffbcf32ba4bd515838fd0d8f2147a2193b3146a913a2683f23889fb913e62bd26519135aa5f12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ro/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ro/firefox-59.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "97c5d69e1e40bcb779ce058820b0a4afa4000b3c12170c63ecff1ad4b5994f71ddf36c49536280edefb971fafa6be52a3b436a405ca9a1762aa08d2cd61022c0";
+      sha512 = "4c1704d334a76c62c5407dc433861ca2afb063830703f5ed2b76e987a42935bc569d340f8e2e9d47efaf4e27cf820437f662981a1734a9f65022424847c70fcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ru/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ru/firefox-59.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "74fb10b42eef3a2391aeab0e3dd1ce463b58cadba5c42e2fc8a5e0bdb1f9df122aec65a662c9ecb8a14b1ee76bb060c64de93f116a37d207b4cc0887ecc0e2bd";
+      sha512 = "a3e941b5f14d1371c1321353566460b03546a9eb5238c72ce9fc9a06dd4f4f91c616fe15efe553cb87765ad64e71ef2abd7ea4ed8931067575c45d86a88c5348";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/si/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/si/firefox-59.0.3.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "d63503345ef7896e9d9a3ecfc80395b6ced67c38b02c19f7afcf94a9efde01f3ac53f1d581b8151d78eed6c7f8eb69f9edccaa3be49133aa3abf2a1eb759a02e";
+      sha512 = "aa8459ea3e1318485e9b73caef32f87958072a0f067bc86ff679cd65b58190a6ed358a7b6c9b1e59512c2a204cbb6545ccdd9178c4ea8fd60d003914872b9575";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sk/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sk/firefox-59.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "1020baafadd4a1de8118bbdf4e281c704595730937d3aca9c8185a6ada54f4a72b8efcc7c493200c32a6a11e7121ef52d7aace68c47784eb5d17ed7fdda32d60";
+      sha512 = "6759a550e8652902e9de653f160d2e50e89cfcd2328a5eb47d6dd79cb71326d88263ad0a820183b859b000bcfd575299b77107a0c409e92397918539289accbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sl/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sl/firefox-59.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "a93e20498b5b3a2b5d19197bbeb48c4502217e44a25c48372f8855a49f762e89438262ccf5dde1fea24af1199bc8cc5c935b1bc886e0bb581d698d10a59d60e9";
+      sha512 = "6411d82a4a8cd9a710c755d8f588b4e7b936bd3f14726a6b0a8b5d90cbdda12390d9fd9f99b01b9a595e20c6a3ae50d7c5d7f242f542dc1f3a86b0051c3ea498";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/son/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/son/firefox-59.0.3.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "24411644b553e6f3c305b8a893a7bcd4ed59568a6fb7001b999be114a3e88f30d40ac6f3351c28b3287bd2a9e6aec461c54433caa45fdd349aea07e83401fc2f";
+      sha512 = "dbd99f23a8bda258cebefeb680cf205c75552850e59560d9df2683070c79147f5063fda983f95a5fa985732ae369007aa0d57bb1997e3dcd11e964c59fb9f46a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sq/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sq/firefox-59.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "40ec8fdcc4fcec937a710e5d19077243d0ff5cd832bd20365817e4f4ff1cae5eeb2a664906ce7f60a5184fb053735df5825ffddce41276797fcce3a11548f4db";
+      sha512 = "c2ff4a76aec95237747f740f052b943bc92009a232ef4e77af66a2e7afc26fee15c76b45e1dfe4f10a1e62f28e7372ace069200f93848dfb3fde71b85953b2c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sr/firefox-59.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "e538596cf0de4a9d8af4e801d7c17d00c1e63c56775cef0d087a77e320cda2269cca74f0c73f679208a184c6cbf4b20c56d1d222e8846f15fc4a91c16ae3ea5e";
+      sha512 = "b69a111b27d05d88e8416ae1f8f0e3b2e48714694bc01fe14a299cd9ade7fb8d6b16e063bfd35a7579ba5a226e6d47872639b31f77bd4db7237d54277b0d7628";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/sv-SE/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sv-SE/firefox-59.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "3466f482ec04f5e8827f437c9456908f04e78c67ffd299b841f2f82cdc2c38a61a566c8d85405312c144aa5c45698b5f6e81190aaee739adf4384f95c81f9e76";
+      sha512 = "16c23e86ff3f22935830c500acfbe6ff7d4d41f0840328407d540f17aa48c5ab45032194bbb5af9820dc03896b683e09e016a9ad6d0c23859524bc4ece0d16c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ta/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ta/firefox-59.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "7598994ca03afb1c2933b640298453a618d140791fe20255789081babb0d9788c4f3ab34d5ede82e1d688f5dc0486fa0f842f1d125dc5a955580d14b1efb6489";
+      sha512 = "2aecef72d4847e2cb1bf857f8c3375c14be09c23b9ff211cf908c56cc1b2e4f5e20019ff7e6cbb0be6bbc882663fe0d539e9b3c7e3543e46f348d8ac9e829738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/te/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/te/firefox-59.0.3.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "759be69dcd9b795f7b1b8192928e27799061d83d86e0234cd2a1fdda0d922a7a9d958b19655bbe976d409297f2e2fb2d2a6a525f90f77fa53071d510ffdc6438";
+      sha512 = "0967879b336d27c933ba606de57c3b60aa9b61d6bc01bf2fa0f5bdd43a08299a6f15d7792e1f4abd641fc9296c95a1ab874af8256292074532f7c69ef0369997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/th/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/th/firefox-59.0.3.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "a46d7eae4a2670615e100707ec3e340d48502b63d6f6f98d4a3140c1bc9d0826b44001bd8ef940c4e786ba5d3f8a00e350faa18d30fcc7663f9c29f20e7a20fd";
+      sha512 = "81c57006aea7a18ccc8e42299dba497528680567f1cb6cf96b069f2832eb8f305fbcfdcfad1ced9d90ab89a59d8d2e471da427fe4b3e77a88140073b0b78c4ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/tr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/tr/firefox-59.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "ec5ecf9c76315d1fdc508c94023cdd60edaeba44ef6ee49859ba0689413819f11f54c9ba787000a166b0fd7f628e3c2b42f42c9014f9e7823da257d0abe88cba";
+      sha512 = "df076aaa8e2478d5c7f4929c9c798dbe18d21d6601c48651653fb7f134f6c2c379e290168b0f7faca4e47ede8c571eed04e1337702787f0f64d4bc84aeba1d27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uk/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/uk/firefox-59.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "430cbe8281803ca0a4e124fb62a8d2dcafb751ae20441e22dbfd45e544cf906371eef4889f16df5c1be91a4eafa193303e053f75ff15fbe82a836df3ef19a5ff";
+      sha512 = "4c53c231aea6f63312fe8b218adf56b2012921460ef1a82f32a9587db9ccf74154b04859d26a7574c6290d492c8189fab80990092f289c7e96f24337689c8659";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/ur/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ur/firefox-59.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b293eaea548f8d1e96087e111e96fa35940254477599a3c2aec9bbe005347cdcfdcd79f9e3e6d22829fe52b091d6d18dc04ce768724f9709a6e397838974c45a";
+      sha512 = "278d330c4409e931a02f7585dfd0185f30a733afa448bc0cbcb471bb67c41b0d46bb229d8c480342604201639b34d607ac0433c093d0bef205ef9918ec61b966";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/uz/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/uz/firefox-59.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "dc0a6b771469b89cca470a50afe47c642fe6bae284599c876c51c2c5834147cec435508c101f33d76d1e4ce5760f52f3a59592495c82db314de426a9602097ab";
+      sha512 = "a9a714b9a9e9439a12be8248d9fbd9d92dd7ab9c12bc0ad280b9753f2c369061d554129404ba6ca546918b33d87731623926c15aa908408392d27e89768027f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/vi/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/vi/firefox-59.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "6f7b9acc584e41be34b884da9b9f2d7aae602958cbac9843d73dada11d1a584101e603f9111c24983dc3ca0b70462091cbcf755c93b7811469b179aa2b3ecc60";
+      sha512 = "de35687482f7e2cec359a8878bddc9facdd612fe077cfeaa9dbb1db8609727386b575b63afda66cb301902f3e39a6c7b703d46cca3359529eadfce7dc446a934";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/xh/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/xh/firefox-59.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "7623715582708bf3e18ce924aa6e1d0fc6c8bf38503691d3ede092070860db3a116b2f39ee1e467d286e0566bad594679b489b39d2c5b5885321982689b8a56a";
+      sha512 = "c97bd14cc26e6fade88ef23abb6cb211634ca65f37cc429327cb1c48bbd2ae90123f96d8b395e5490eafb795844541f04d3994c391a2e668264e70dc6194721d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-CN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/zh-CN/firefox-59.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "9d0e41df6cf6a7244c4aa29913ac664c67463ad50b91ffa1e7e345601eaeba76d8553523b322ae477ef0f0c5fce55ad2e1cf5bfc5fd777d9433ebedcd2474d98";
+      sha512 = "eac667946684308e4635c6e855a7c34ac41b804ad688dd2797dcba0ccd27bffc5174f0360ebeac5c3da1735b3f8fc43fce52e05aba94bdd7d99089ccfac157e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-x86_64/zh-TW/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/zh-TW/firefox-59.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "c65832ecb353527c6b9e11dacccc9e3d1cbfbb16db1872c8afb4472f632a0e2b4f994af43144e430aa8c8ba6aa6a579d3c024c9111fcbfa6531a4b2b7377414c";
+      sha512 = "c5b5565ef561c3b62b3a20f1b3af62a42c60f51783d1cfa0552c707b090834666d530ff579d7ff0b72b7d8b792b909c3c589dfbf377c8c9c56373ebc37695300";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ach/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ach/firefox-59.0.3.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "468b25a5e90b385514b0f486bc3fd09a1e7c8c7230b8e31b04dc4bd18027396078b525fc5b51c9747e642d1bc60be49a7e2cfafafd528d95f08033abd12b0757";
+      sha512 = "e8f63441044b74f377a7cf28e26cdb26bbf243799361d254c01853875318f0bfc366daca1bcdf49cf8e7e888c8eb154712c113f72f000c14eddc662e00888774";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/af/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/af/firefox-59.0.3.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "a3b92e792d1ef58e029fc097eb354940094c8a94da97dd39b1f69610ffdb9a1a6527b01da2b6716c6c199d85886b6e05aa084bab30f8a2d0ba33ad4c2f6c36ef";
+      sha512 = "f2e0da9b8c395ca966f9fbe4500990f35188e599b5e6b5a6131b717510b7593db1aa6760308e10b04c0693fef7aba00e1fa9afeda7ed27bdff1459e9cbe176d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/an/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/an/firefox-59.0.3.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "9fcb76d123b657b9eb7c62c53c703ea27afa2f41b5107cd67dc01923ffb9dc6d3f334f5d801058f05925b18afea289eac03dfc3c2b188bd2059f4dd0c40710fe";
+      sha512 = "6971a436397420c8832d853fea0f36df80422ed96bed1bd7c8e0b83aa61e081789a8458528a0b8005056ab37d34a931a13dfa40c0fbf544433ca7276ea18c460";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ar/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ar/firefox-59.0.3.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "eee65b88c2269081dd04fbb37d360b0738e6527581e60dfef60093719a3a15b44d0d594321b4865a35784d2f378e8d86f308736d8be76c1cb7d39152b916bbc8";
+      sha512 = "cc770512915404b138e9dc0b48070e3986a4eb00824b65e94788ab78462bdd2f13ba2001f7cf57b56eca37a712a6bdf88a46effc9aa330fbc8244cae82aad674";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/as/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/as/firefox-59.0.3.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "f2e54d00258b6f1c55bd8a1deed5e9c9b1e6f1579447ad832f348b50bec8fce66e50c78b2ee6e05c885359a6b2b1f9d298e907fe99478536967103708143f24a";
+      sha512 = "b0407f2700faef6d8dc87a9e2ad6ad6aef8f5bb88aa4940fdb514be1b568b2b5b3e9ef7ee340d167a37f410e6aabd02bd74bb5fdd6c262f50f5b099ded5ec42f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ast/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ast/firefox-59.0.3.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "4f23798708447a4a3801b392a2ac27207df7d2b722291d3836163b3900c7745404399cb700873cf6afa70121c429ba31bbd8b0b1f597e8c91b2f970d0d6421e5";
+      sha512 = "0f4aec8ad23012e0001fdeaa49e0e526c4f15b8dde73b6fb7d29582eeeb6ef8e4833b3cb0b371df745321e612969336a30852a449356bfcf7a0e946025ea0a93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/az/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/az/firefox-59.0.3.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "2f12c45870d5ac1a6baea455bda954cf3b112b0a3b46249a23b7cfc064c6eb00cf0ed2952deb220777cc084fa2345368b95388e143dad6e45042e7863c6c3038";
+      sha512 = "29f3ae8f53a5c7eb4c9c2e4c750b9c2b3a11cf519ee75822442c862023b4da960c2b494f4e15dbcf1bf80a2ae237426c99480f3c2eabd733b68dab6e5b33b288";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/be/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/be/firefox-59.0.3.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "f70af6a6f464b6098802e65226b198f670e5d9ecb2fd56f9c375cabec1e602211c4cf7d80e430f961bb56694cb1d546aa116c7a5aaeb06d13319ed41e3e69ddb";
+      sha512 = "2f776f2a6d2b5ddff6d487df2ce71c9896b9f411fc4a7fc4e9f8c6a4c89bba4301e759754771e628aed2db51ab478236e860a2eb7d915b3f9e79291f5b1c8ce4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bg/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bg/firefox-59.0.3.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "87377e96a52ed8866be4a3e6ee9c20c6d8acfaaccb53de0d2a4fd553060166c20b3677a2cd3322523f3b3f7d03618e6a6c27e485113184698207cd4b88b7e699";
+      sha512 = "6a16d832d8398dbb70b3ae5d9e7caf36ac03f85862338f96809e83b408363fbc7563556287ecee3fdf6f62ac575b8c4f4f79aefbf80d5239394beeee42a518d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-BD/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bn-BD/firefox-59.0.3.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "0d275fdd76d8ee85615f67a11ef46bbf8b718c54a09cf6f3c7f2336098e0bc282caf429a4b228e31e7c3622be41f41384af174da9fa856fe36dc46271f55ed1f";
+      sha512 = "8df02f3e41c38c2ba9988d17611b43e8c7cd1000b579d767d4ba7ec4fff29208c61e9e4b618bad9024c7e2f082cb9c5f3e30f0dafce9833928cfbc8fa7eaf256";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bn-IN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bn-IN/firefox-59.0.3.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "b77374481f21f37e246eb325ee41202fed9916ce36065a88f51e28fe5a015e2df341417b3420d2bff0df93437a56adb4e1fae0422bb094918a19157c655fa34d";
+      sha512 = "3439a65d5217570b92d7ff32d868b5e562a88d8973e644f3e9a0d0bc65ce0fdf9c2f31a028cf4f4a694041c57f080cc2bd9d4d674d48e12426e9a53df3a224d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/br/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/br/firefox-59.0.3.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "ba071fe6a668ebc7c00baec930a568a90d03c866a0b5f0011b25e8427f40fd32d54fd770e94610da43775a882eb27eff6359c67d65670fa0fc6179e788cd1394";
+      sha512 = "433e5b36204f2350f39ea985e642ff5b2e375f08b5034167f353cc29c18c07d3e6cf9a8b0555f265dd8dcf55731ad472304f077b9abd0ee6ed1e06ea672559c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/bs/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bs/firefox-59.0.3.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "de70dff3aa71422c96e17e637bd56c18d4b74c8cf1ef5834f1f077249f6d7d1e95703f55063737b464916b2aa87eb4469d197e3fe772d168d184e72979712e65";
+      sha512 = "eb4a09ab24c0a25f780eafb544af4e8622d96fbbc417b0e967fc927bef222638d062a348e5f14bcf3e7485bcda1c0d7fc04a7fc61e1b3bce7487fe9f760ba88d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ca/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ca/firefox-59.0.3.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e197d847b044a9ff4e09b67c64a2e4bca5eb2a1770ed4cd9ba965342106b7ec809950d611367308fe2c556c4b413640f050cbbaa00532402d71b59d51c4b60c6";
+      sha512 = "9f5f05299942911442386a6c86bee3b38e8a312ce331d5236be6e00900a8727cf3952bdff45fbbb0037f60b5a1d865e26d46173276466f091f4f9d8709cacea9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cak/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cak/firefox-59.0.3.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "a716ff884d1d5260b9ed830877223eff731ad301c1349c9f1dcfea5b9dbed0770269c27aa8a336516270386c4b896a87721e3a5e433e92bd579e0d88311271e9";
+      sha512 = "3c32f5932799d9b9ca1b28acb77495e8c326990630cf84b051ad15853c419d4817bc101ec95551ed33e1cfded60620168a7915e3c1a6978f472ca38da6d0d5e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cs/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cs/firefox-59.0.3.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "d66e5f440b2bcece18013499129462ed20d85d9b27ec803ed27bb7d4302d2369331b2320970d256b6e61ba77d93e362171ed012843ec926047c281223218a25a";
+      sha512 = "9adaddd0c480574ab67afa9b9149904c24ea396494649b113c19a33422f204dc23d9c8b141d7b155cdbdce8226a20a2f1d54a06f7fe68bd90bc3aded007b71a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/cy/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cy/firefox-59.0.3.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "87c2c1056bb56b5fc3d1fa9aaf8a1d99a5ad5558016b3953d0dd1f7c70b989863fd1d66f6a8d7a0d14fff351dee8f436b89d5dc593e610721068fe187055aca4";
+      sha512 = "7e9acff49b9713eda7eb4323ab2d829622fbb7a7795ac4013a1a5f644dd84074278989e416744730eb575b9eaa2c6ee802aa0cba735d338797afadd5b3121064";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/da/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/da/firefox-59.0.3.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "6243867a2a5a7a30176c4698888e7998c35ad84790a75a86808e6490f013990890a8137579928573564ac7dadaee6efe921579423773a0c25aa57db17a216eeb";
+      sha512 = "ce57898ac9daa0299456a65ab8bfc84e549869b7ed0049e6657370ee4591ad4208500ce76c3a45370dfd7669084dcf5b5611177a61189e9cb00562dac4575345";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/de/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/de/firefox-59.0.3.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "d21c6a44def103db09a072ad72fc42d3876fee9095c5b660fd491084301e2d3bbe383b4c7f9419d666dbf280bec59743a034b4f576cd618142dc7f498fc69e5b";
+      sha512 = "40304528aa2e0f7991138ae096372dd0ab5094ea4bad4eaed40d589f43e892ed092e6cac724ef603d55a96c8b18ebd6c96eccfe1ffca05ce79786c4df3b0e80a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/dsb/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/dsb/firefox-59.0.3.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "34446bdb17e81da9ec3689eac248b2ca0fb11ceff7a153bb502a5e0d62a16d2d4a090f9a29e4ff61ae1f87ec68f2fef94be53895a409678d14ad99331058495c";
+      sha512 = "8e004141d679f98a4045b22dee36ed8860283515708372f8231b2ba73648424cdce41f8ceb6ade33705d18dd70a7afd3a8f36c07d79c1194ea8cd55e82da3581";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/el/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/el/firefox-59.0.3.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "f5d73ccbe24e30eed81546b6132dc70f08feaac68dffb749ecd7af14052b343aaa4de7bf0ff73924b28b4c5b86c29ca1f6a69caf85ee77d4c4088b925547825b";
+      sha512 = "8a61347c08e80763efca8a76338a4fc7c16ed0f9ee30b0b0a3b0c381d5788ef9961e7a39373af3bc8c9171b463ae481e56640c3548d6240c41a51765bac133ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-GB/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-GB/firefox-59.0.3.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4dbf56a7aa86341c2d08b799d76c7e0dde04d418539657f74e18a088df29d390ee10b60c1b9625bdf46ffc4f458b6ca3e86aa93b1a2d948f10b7d7bb6ac250d4";
+      sha512 = "a48d79a2465aa99afe29d83f12822812dd80c1e8d2053e737c7c97dde49addffa38a9987d36c3b3fdf82e8d1f076d4ee8cb0fdc3a3afa84a61ae85fcfb25fb1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-US/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-US/firefox-59.0.3.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "15e93c9d069d0e4761520cefa508fdd7e06cca979ddb9cfa1762d70d104f5758fdccfecb531c6099f9372f112abc88dd273a29a67f720cbfa1be5c440378363e";
+      sha512 = "24caf749a1202893753a791ab88c100e91a372f05b600f53b0668eb17a0772cf3a404609c46662ad545a789b9f326c1f157ff046e1407e6e02e498e81a8282b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/en-ZA/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-ZA/firefox-59.0.3.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "772ca9b0318e1175e455d2243ea537a5bfab8d84541a7ee306b3670084240b9eb165935f41ef874650c3b1f5e4632ad2d5c0bce3f29a05a0676ed3ddf133cbd0";
+      sha512 = "b156d3f2b266ecca8d767976fc25c8a532c96029384cb284f496d2c45e96da0a588e9c5ba8daaa9cecdd2074c40d1e2f0d4e4c010eaeeb04e8e806a6d8158222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eo/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/eo/firefox-59.0.3.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "cc3c98e80c343b065ac8f6af6875d1b2146113303ebaac42c5866d03ff254aebab2cafe398aa1fe38ef8c9d4fb8ece87345e09114145e06a2a7d6c783f1ef601";
+      sha512 = "564ca3321c9349e73aec5695bf1af885bb2bb4f802d6580f82aad5a3c5501ad38d40029cf03b1a0fcf540296dfec985eb5478a0a9f8244244292573295c9059e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-AR/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-AR/firefox-59.0.3.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "fea909cd16c4558ed05602cab2c3a22186d727da969143b77deb9515ef4d87dd41e59e7fc6a322e924f0b809b6205f37297576106a50b5896b4920cdab2e4749";
+      sha512 = "a8cb0ecc609919d3707fd5766fa64389c8ccefdc8dc395fde64c93075d7c4b23a3a0a6cddccd612d04d2f25211e05e744bdc59b141211e1ca6df1db4de5171d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-CL/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-CL/firefox-59.0.3.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "5015cdb3a1d803abed9a143fca7a118a239e37a38a65898de7ae60981066113f270260fe8e9b83822385115c2b5e378cc58ed68949ef6297e0f7fc1e28c9c8e8";
+      sha512 = "e38be1cb60807e75f6d68864a925e11abb337ee909359dadc268d57352510a9b4f046ad3dd8dde499d771a00766de7d5a20a79a1d4b8aadacc63fe74f7150294";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-ES/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-ES/firefox-59.0.3.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "81fe49a2f31913c030cb801180daf730855dedc5f6adbd39d7d1d8a4b359a3aeee063d7fef0ce35641f163f5f8c965603bc549a1ae3b2458682c390d16a0faf0";
+      sha512 = "829eeb7a4cdc8b58e0dd558761817681cfab451a977c13d1d484d1aa350fe8f88be0c87eb81274ee766c1315196c10245dd7c4f227b42246ba96b8aa09f94735";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/es-MX/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-MX/firefox-59.0.3.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "24bff972bb2f27530b18cb7a640f2f85190977725cd82b1e86c1b47578f1d3058fcb7387d19cb2e1dece49b72c17048829bf6a66aabee2592a4b9503e3c4e546";
+      sha512 = "d62b35f47e3c40f698d17d4bbde1b545c97c39dca80cf15c852776c52e27c7d36bf1b6451a31b1e00a64359e16110a9917f412ad576027f4bb800b055b158200";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/et/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/et/firefox-59.0.3.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "d60b637f9d78a2b9e53dbab8e6db27aafa701af3cde841e056158d3de53d1c0c1032c5381f7c388edf59b1476078e0dc8166e82f39f7c006fc28c5d897f0e1b4";
+      sha512 = "4c3d6e2bbc8d77f51b6d28fec555b746df955c5043c7ad0f573e81dacd7f651658483fbefb0442458449104468ecbb1af4a5bc815bf9f43fe0ce902365e70c18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/eu/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/eu/firefox-59.0.3.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "47ed51fa6f27e8b7bd9dd0c3556af3d85e6b004d5c6a5868db8c844ba97a06eba4d3998295058ef92c4a49dad31fca0a3c24b19603e1fafccbf6b7d461596080";
+      sha512 = "bce4a19bab38960aa3b96a74c41bac79f449e12adcdf5ffc97843d0e85555bf49d3e3d4d691a4fb2615a359eb1edc23762c08830b9817c43993e6832da1e071c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fa/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fa/firefox-59.0.3.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "8919e1daf708630e397200f09b3e9810b3aa40feb87769af5e1f0ae44ab49c63fcda1982cae5ac4753c600164b34f533054e055293a87e5a8fcf55809cda61c0";
+      sha512 = "4d1fb11d8f7c4f31bc4a8649d8c68ee8d89ae9f56693f58d48c46c312efa41d716d894a3756f174ba7a4c417b2388cb254e941354287eb60ea9397584e271f2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ff/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ff/firefox-59.0.3.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b0a6f5a974750f3ee5b485872d1e7c51a3d894c4118de139b718e85eab94624be302ce2603233fdc3a75df3f12242d4d57c9a96ca1f429bf9e0613d2b299ee86";
+      sha512 = "8b63609ed0b80386aa82e40bdd61eea53db70dc451e5ccf83290bcbfd2a88be781918b44d95a91fca8d75abc14699030281880d6826b9313ba3a61f371f0c132";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fi/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fi/firefox-59.0.3.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "7dc300de36cd860d566a9b84de0ce2c4fdd5eeda4bf641a45e40779e98087c7dc881d2c623c99f8551c08bc84b98b1ab4547ab8144b1a22795710f57112285c6";
+      sha512 = "2ab60636f442da71b01bd293e5ec68b0fc99cb98b7de707a27f725661bddc954c2ed9296b5862afec24d9a3dab0d1da6c2beab7ddf505c0951aacbf42c697033";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fr/firefox-59.0.3.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "ff793e4873e8895259b2657d613513404953d27d81bcb0c26ac97c3c2ef2c1ed8db3ec909ecb744dcaa7d194b4fa0660885daf96932270f1382742dd55e0f5b0";
+      sha512 = "422916b8a03cf8e7271ca629ded5b8fa5990cbcf63495c196782e3a8e219156d66adfad2c3ccf450e9b7a357ef8d8cf99dd1c341a63379a20adf083a0ec5b736";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/fy-NL/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fy-NL/firefox-59.0.3.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "cbb9bf54a401aad2bc8bb869f8680ee4c00e5ae206ca9b7db732c955ee256e4ad226ccb8ffa320cb3e08aaaa787032b3dbed06aad548e733ba43ec87ddb52bb9";
+      sha512 = "9da3085dd1c6e8a23a51545c8971d90e82c98d000f4eae3053b0edbd217879eafd9218edadb4776f592613b1f6641ab76dea3c63e30886a8fe727f282847c1a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ga-IE/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ga-IE/firefox-59.0.3.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "bdfc3de17be432cb55219bf3f2a3d1371f3fe4776f452a0fb37ce4f5259fadb46487778ec63f6065dfec2cce43758be2e5ed8c5f75394f1604f3318e96f56363";
+      sha512 = "471456518971454c4f85d005bea9afa64998173ec2ba164ecafb833899e597fbe67217782f4e61d4edc102bad53c04f3aa652862ebbb88669351df8ae2500cd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gd/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gd/firefox-59.0.3.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "008548e75853625b690bd92e60cea25c1d9b302f7f78f42fdb4536413c10b8203f337c8384b45c3c9b729e6541f57a22e12ba264594ccfa82742373df571ebff";
+      sha512 = "f086dc7c12948ab1d052f9de433e6121a43281d514d16d85163afed61eb8ab9f059e9e7e1f671d4207d5449087c9cc1432ced11322b95383e1bdfa8c9d48032d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gl/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gl/firefox-59.0.3.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "212ce344a4592ff36006e4671c29b7a4734e513d5267c4ed0e7c50c6d0b794547cb042d543feeb55a48ced69bf001670683df159354f152f9d45786cc7184c03";
+      sha512 = "b5d5b475015d8c3b76310e6baa19da872ce6b5ee5d4a69b4acd229536527e5718f8a6669323b968fdb1dcc6ee998be62798bf914310b91896845e953a0c2c72a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gn/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gn/firefox-59.0.3.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "6f60fe0c208b6447b4ee9f8c550805f070f4b3209632de91fd0a60853cdba70aa9e6653a29429ea4686dff3ccfe5dcc5a1fedd6495c7d7c38b623f31c2cfe19d";
+      sha512 = "6bab886661997a8edbb71c86d938f3a798298c1000c4ccd0495a543f9104735d1f462e809bcd11a81750cf2743c19e476d352ac5fe99da47055c27dc35101084";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/gu-IN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gu-IN/firefox-59.0.3.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "0ec6bdefeffbbd52655d332b9c21be2b372f6ee260684cd28216679aa1af267d0408d5ba641a5dcee145b80c357936a090700427520f9ee7d712e20eec13c57f";
+      sha512 = "7dfeaadc772bef003700fcff66d2ffa4466aa443e1a822ed1b638f9d929d5479abdfa86de33b880eb0d89ec7f7e33474ba6644b5fb68c6708a7bd2df208c4204";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/he/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/he/firefox-59.0.3.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "2a4a76c674fd53eed5a73f3ef5d143138752e9d52db5c69d56fd5d0dff1c19349afba6987c4736d53391bc602245c1d4ac9f5c9b60a0c1d561f4162c859ae3b5";
+      sha512 = "b88a00c1aa346d1a1e1948a0ffffb79d86576c6b6c70419cfa06fd1687c4f5c124804f807e3d5db66cb9c49d168a80188c8e622dda5e6ce172d286ecfaffc3e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hi-IN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hi-IN/firefox-59.0.3.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "34d932f073e803678990098623149dc0ea427a70ed3e604651fb622a87404ddaf25c3a79503f4e343315101704f5cd1db058a262ed47ae02eba85f102a64f780";
+      sha512 = "5344123a20046864605e26c388a79257d9a7b08c0ce981b7f47678d9894b710c0e765f14afa50d6ef80c89bac0ef1990a1cf51e225ad2a885be344027d583e0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hr/firefox-59.0.3.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "474f5d71087f8eb2646750bb6a14c993b2d3708234a09b4ecee7b43e2ed75a8b9d249749f16408751a019b9a32ed8be57c5d61f9fdc36ad0f1e7aa7b5863ab9f";
+      sha512 = "674a80317eb215d405a937df50e4c417feaf54795266dfba5bd4049d60764ed4d2750d390ac08e9d11762d34c80bf84d7e8b6cc58c9232f6e75268ea04316eae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hsb/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hsb/firefox-59.0.3.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "9b9127af72f9f4d780714c41a54d26ac3e8065c8ec42e0ed1318013896a3e8d920786713c79ba626f4930c92d44f2acad72ac600b5735122470fa3e3ea317965";
+      sha512 = "8c18833f2d0896d39e4be8b226f8ceda350e1c35bffda11cf0f752bf71fd130f2272345dfbf4b4d766a749b2d11624d41f77e6fcbad4c11849878a4bd0a154a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hu/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hu/firefox-59.0.3.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "cec7b19e6e3fc11708c4b67105b191433880b53da8316fc8fa4d6af9eea23cf17423bbfa2f6283490815ee5c7ab33ba8e66ee7bdc201e3eef39808db34d572e0";
+      sha512 = "99c44f9307ed391bdc75a59291ca1e6b9c6e8c0dddf29c137dd93b62d3a9f3d19f23f2fd371f56257aa9dfaeebd150b29aec9141e8741f9edca4be0356541414";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/hy-AM/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hy-AM/firefox-59.0.3.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "4c25802601dadbac82dc260e329db69dff3b69d1eb9237fff76ae6de98a00a79dde0702d4cecfe67016a26e2a7ea4b1f15ce70eb82f422ea3bb8afb9810313bb";
+      sha512 = "891abdd7a6a671c55568736d7b25ff5c4ea37c59d7ca4fc64e2ae2f3752138ec17b91f375de636e09683fa30a252d5ff8adf7ed6f9ef08c860c54e263896d288";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ia/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ia/firefox-59.0.3.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "99b3d9c4533d376ee7a9f8fd364b9b44a8f0b9f235346a60755f144fae4550a6d51993952736b58e28ed3d07a549cd1d2da5223d7af28f187c78b41959e5d733";
+      sha512 = "9f6609688c613fad6f00c3196122183d1480ac5a80b383e47cb1d1ffe8670d4bfbd9cb492cf0beeebcb9759f78283d6ee9b740e2d9bc2289bd72768b63603c57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/id/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/id/firefox-59.0.3.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "27275c8e2deb6716c8492fbc4ff56b8a2061be51101a2a7085c0a4bdf35c0bfec77af1f650236d13096ad204b93df695d5ab238ff6c312f9092f4d8adbc8d431";
+      sha512 = "99dcc0f7d52dca3b172d138ea0ff2ff597c4c6c31f185cd2621acf3a1fa100c81e264993805bf74604857ed945e22b9b90c51fd19958f675f73a00a46fabb646";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/is/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/is/firefox-59.0.3.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "54b6be973aab07231843455b3e0adf8f7dbc19ecd1e484795af7d6a3e346ae717621d0950297379c88a955bd75af0a19497f55015cc624609510fc3ff7b8355e";
+      sha512 = "42c108d4ec83aafe6f27ca45ac5f32172e1481291a7b105dde8f565b8ca600307478deea0f59ad153398a78c0fb228c211d6907ad0a7a8a950dbf717cc8f89e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/it/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/it/firefox-59.0.3.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "bea36ccf3c3202bb41d09ef07cf4a30d8f3b7d64a96e4955f1e62c6ce1c252726991bb3dbd1d41b840ad7d626ca2abc83eca59a1997325d0f54231daea95ff06";
+      sha512 = "e68944d88a96a4405de772c6b5e7fbaa518474e6594fb358884eb5473c8a9c9662dc67c5619d492721cf047af5244d2af8eeef7de7fb8ffc37333f2c0f362933";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ja/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ja/firefox-59.0.3.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "bfc409fd6487ff113045732d1826589f8020597958cad12d2b821f496eeb53e65cd4e1b1d002527f6255350254b60a96d9d04c47bcde8bac89483b04270f5b86";
+      sha512 = "dff549f43bc4185a7f5baa9ee0655c1a752f114c8abf51e086eb340afcc628822899775284b37ab1704c2e0435b87fc7c9ece70d878db811be2c7aac9c7e1b59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ka/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ka/firefox-59.0.3.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f62ff3d950324b140238dc9e521e6a038a64dcc22c2679b36b59900b0f58b15d774084fdea7a1f82125a7d09d1b5c831808424e63612aac9e0a61320f6a3e4f8";
+      sha512 = "d9291224b245006c5c2922b8bbb52411ba1852aa6ecc95969e623d68d5bae7e6c2d84ecb5d4723a3b6d0c3a48aea5bfb173f6192c4d150e0b75f7ca748883cf9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kab/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kab/firefox-59.0.3.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "573b7cbca69294ac56fd714308caed1549dbaff2c3716887765cf968c20d0ed37b1e0f2849af2481ef237d7c617c6641c42ecf0337fb0fc18afba82c89def034";
+      sha512 = "6e27a03b7ad1d84b1ffa383be8df8036d431f1e2a7c861a21064b553e71cf71b846c65021ae7dc49921057c7eb526c3790601de39cdd243a427929a69506b38f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kk/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kk/firefox-59.0.3.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "0503e33fc8716dd94c455a0a6201334ad2bbe1f3ad9cbce057d69ec77d65bdda48a126464335cee62117b3638be636e8f2908a003951dd2866908c964a9f889d";
+      sha512 = "d270d5f0519b88469d01d953e01e426a7c91516e7336c1e21de82fe5b09193e41d2bd56ca06f24c843ff96ef4dc560a405bf9b1f4de66c201fc051d0e1299f31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/km/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/km/firefox-59.0.3.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "15797d366faf6f4daa60191e4c91cd9feab242e0879204ae8114ca5824a78fc42941c79d190526e1387ec28d2c150d008d4f69c78c450fa6c6aa9d3cbbd151c9";
+      sha512 = "22822889c2406adfc717eea2ca4fabe005e055be1c6eec66b0e777c9ab11beacbb9abb3d7824e84225fb58da6214094e005946b3f3c78caee4cd76cd4e42bf93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/kn/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kn/firefox-59.0.3.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "53908d7a78feb6b4ac8365aeacfa7cc845af5f324b57e0fed6bce78eb4298b316ccad268d022e9adc409eb9be49b9777c7f01197dad4ab79746b8805877c1706";
+      sha512 = "ca9ef014bc339feb1c1732286762bca9b869cf38cdea3794124175d26bc1759e4f2f6dbc0167badecf3481eefdf76355d972d7c90c4890c1b3ca0268260267b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ko/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ko/firefox-59.0.3.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "ee4bc8ffdbd1a329df5dac2580122d883895418b93c69146206ae4e516ba1e5e993b23870ff487fb26df198b3ad73b708f9cd1f8c3f6a9f60dab73dea6ecd373";
+      sha512 = "769b06aea04de7fc084e38e33a73b008420540c7f6ffa24f126fee65eff5f22d21784332932f9814faef1839605e6ebd29afd468debaf6800e523a63b92edb7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lij/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lij/firefox-59.0.3.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "a3e92d13e071ec8e76c9a4b946fadc146664263b5176ecd56dc6d412d4a0b8165b67c6be568805455e2179dacb2dc9d5d917981e3b6d52b8ce994d4062d7aae5";
+      sha512 = "c9ddef72418c957fcb413fc19accc83987aea01321b0417af027257bf6884f419ab90d936ab2005595617bbe042542101cd09152eed23eb0f4dea49bcb285e2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lt/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lt/firefox-59.0.3.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "47c6066bea50fa958812ac3389efa3408b2c35ace30c99d9ffb91ae037f1a2444933eb081992b97e3419554ef6ede9aff7c445b5262a59a324e7c1301059f149";
+      sha512 = "870563459a55d7b40718643d0c348518a10bcc48765b48899ba185d65d303249d58a365bd4d8662c7788279567a98dac4826e1e12c77e7ffd7eb927c2e76e222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/lv/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lv/firefox-59.0.3.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "090db495b0e0883e0e378d992a855aee03e2f2fa02ea257522485742e5a879ca42231029c2e36b8a8c31425e343ea0fcc2568a9a961752ca709737c3b3bc32ce";
+      sha512 = "c8db9d0ebab798fdec91855cb3bd762a391576cc6c6391395faf074bfc1e8b2c82953af34206fbfecb2ca10703d8a5af0837528af07de365da19c45eed371c6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mai/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mai/firefox-59.0.3.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "b073c397f8d5196e14d0bbd45485532ac11cd01c42fba883c6d2f3b8f831b6cd6ce095f44e279b17ec60a12e48b776004edbc22ab76fde69af875842a48fb2c6";
+      sha512 = "4e5dfd66e44e6ba839bf59e68122fd3207f0082029746795aeee6ae8545d3ff6dbdf4f6b15984f4fb0ecadcdf78ad0f4afddebdfd240c5f75f10b4854986f983";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mk/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mk/firefox-59.0.3.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "eb20befd569cf18a9bd8455d56d152e48b194e6703cc21457af6407348f5db0405d9fa6a7b503b8c72c96b9cda953c3e0167e5803f6f62947751e042562ad427";
+      sha512 = "95fbf34fe70e3ca3927ad587c02ccfe5e6d5494ab53af0c9d3578ab8ccbef8bc3766779a1e7fe1a275dbccbc855beac9585abe4dc45c04d43d830a98eb5aab34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ml/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ml/firefox-59.0.3.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "d91c916c45e9ac2abeb655bb318030553139294859701ad99cbaed1c946a24b71ebe63b7efc2d66f995cefe09b7d04bc5bda17784713d8e4a5f27702c4ac7797";
+      sha512 = "49b3270031a43cb304121b3f889a3d101828e60d733fddc4184be437236c829c8a82bb60fa509c66625268505756a799e3001d8c673f5f405bbfc5d9bde6f119";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/mr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mr/firefox-59.0.3.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "9d925c4828a427bc77631b28ffd6857f5adc38266731be58e283aa99b2fb4ed304ab464b32f33bce4ce1506c13c76947264891eabd7e63dfdbd020605bb1e8c6";
+      sha512 = "83a010f59bd6c17f9aaaafab14786b8ab11ad4298e91cf101c7e2b1566beb9499990de1cebe7c721ba107f79e7e719dc9aca26bfedba230a97355689e71014ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ms/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ms/firefox-59.0.3.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "2e0f463f9db9f6c0e44e354ea495cc06f5dda8c92af586745744434c112073f4f46eab7576d1e26c93a7a8b739deb09930b10cca01eea70f6bc245a44d58fa74";
+      sha512 = "0148a5ce8c124b40b7501d2f6e6102e182adbac4226c5783826278b65a2076dcbdde535819fe57076febb142efc13bd8632458fdfd54b3a7d7012228a1933063";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/my/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/my/firefox-59.0.3.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "3e279289928231a02436cb344f1629b990b220c22df04e4cd3583a4995e59901a0062763e246e8cbc44ec696c7a94eb8e25ab7534a9f32b957f1332228af9b7f";
+      sha512 = "5e988af0d46c5a1efe8b113194537ba711151c693810e761fe77e3cbae15994527459346abce3846825fa49eee0443149d2b4f2cdca33d33bc7791c52648b26c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nb-NO/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nb-NO/firefox-59.0.3.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "abf3048155dff62d4225471531568292410bae499f10a7f51caa493bf3c66d45a30fd3fe62db2bc21447259aa75e024681abd8b1f8567fd7647202b7399b256e";
+      sha512 = "0dc5f04d92341f2fc3fa47f3836234edbbf1c3aa4785470f323eafb27f7cd9c5ced5301f3dbdbcf40f35bc12037b12d9c12e86b19f687372e8793c762ce1f2cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ne-NP/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ne-NP/firefox-59.0.3.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "a0a9a872bb6f92cc1f5fbf17e8ffa06fe841d5c0f50bfc543779caf10726e1a0a18bd003aef9619b25110b5a37510375de077461c3fab276cd58b319f4107a1c";
+      sha512 = "6f4e88a48c2514f9ab2ded5e5e08842003a282c5dfebcab23183c1271d57ec765a41163ae217ddb2fe2cac7860e189dabaf5822725dd505c8f27673165e22603";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nl/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nl/firefox-59.0.3.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "0b0a0b5df01a72c4a433938dd8f750c60594e393108564ba20745205fa87e30231e8518e28bedb770d5b988c3684ea80f27f7de28d864a26da69fda3a5c39617";
+      sha512 = "23ea428a562d7c9cc17199294be927c15394a098d881208c05a558450f5df9d85dd65f934b2cce967d43004797d6f7f6838340ebac726308f6e12a4d9187f3b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/nn-NO/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nn-NO/firefox-59.0.3.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "0a8c474d2e0103dad61e7efbfe8bdabcf246395e7abc213a6b195aff79ae28d843c4dbcfcdbb1740c6d49e2329a1afbbde8e798dc50044be4924450c7f024396";
+      sha512 = "75bbcaa6b84da1f1aa0963e588207e256b09a68dd56590811333834e2cceeb3c24eec4deacc2d049d051005149a70aaedacd5af02ede684aa9d72aa1777f0a58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/or/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/or/firefox-59.0.3.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "3b97c26b98859f1fa6e8cd682908c46fcfac7bc4aa6d6e8b0495bcdd4e1ddb53f924d4436499dcf0f059ab24d516439c2c8b4881c938d74ebb7c0e2b30911a14";
+      sha512 = "c856da11eea56f3dff269c49a70c7c3eb760b18cac6491c6ebd365dbd5f9353b51e6264c44d0cc798e4d6deab68c9928f84ba2ea2205c77251586060aa794940";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pa-IN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pa-IN/firefox-59.0.3.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "978e0143198910d4c8c47764f7fce401cace00018318e5deb71a22666d7f94df735304354dd07ec2ca4386898ed4c15c8cd3efb1104dd054a4c1c11661b7619a";
+      sha512 = "c6982d378aca49e32f968be08c3d9fc6cf1fe706543bb0f6356b4107b90be1e233880bd71a32abb36a57e47d76a62b8dc241d72a0613416b755b2746fae6710e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pl/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pl/firefox-59.0.3.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "618f2dd7460090dd0b1c0edff4b33d5ae51f1298f20ec5ccf845e5e6e5e4128c55b937496257ef49064806a720b5c8326cedca9764702824391447a83ed2118c";
+      sha512 = "a263ae839be17284c8ce8bceb94fdc04d29d61fec480d936e5f3b0d67581b2fac65c3712013ed7611f61f7a054e0fff9d3cd3b97be824671a73277ec74ac3c1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-BR/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pt-BR/firefox-59.0.3.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "7e12f0f18562fb628b994df2e2c2a9bac4fe85ad593a0de37f3e1c3b1dce60406d2f28606aec5cf84ecec05570b38e7dd95d6f348dbadee09bf27ac34d52b47e";
+      sha512 = "00cc236a6ff2e3cf20b4f9d00418104ff7a5e0d86b21166958714f388b356022c20907ecb1f40cde695a70a088e5cddee955ee4754c9ccbb99be86d5b07ea067";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/pt-PT/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pt-PT/firefox-59.0.3.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "80d9c00f741ab177a5d0ffd94a8462077240c07a56dfb49213e222264224d5df5f4f964dac55d097b0ba9d658dd42ed50761ca86fc087c29cc4ef9d2972956ae";
+      sha512 = "daaa2c6de1c534ebb04904a9e987dd190883b37254ef8b41c6d3c9c29f53f44006c8d6e6fd8ec4c722143d4d666a234ca892d8820b9b382252586f079a9aa75f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/rm/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/rm/firefox-59.0.3.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "9ef01b038cb0971b41fbb19d250db4ca96adc31f0a9cf8b7197ebe700acfab69b2dae35f2c3487ae1983df0793cacd5a7aca7d9fdec8b7fa94cb245ff1308338";
+      sha512 = "5ada38c5aecb0003a0d6a814ccf60043fb9caed23f143192b4ea739c004c73c6a20c8326fcc6fb7a63073c74ffca2dcf6fad2d87a1b1445b220e074781d085e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ro/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ro/firefox-59.0.3.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "d60ec8a9bddaabdae7b210c7b8f4229b10ae1080a89a3a661b6ffbffae479c81ec8f620b82655d92a792e31d4f1fad9477d195005dfdc803a7f3998d4a091413";
+      sha512 = "ddb9cbad7cd1d16da0552f7922433a73186e17f0f1181e415a522f1d68daa0b564c226c5b8a0a2883cf627bf23f53db7db8c4373beb366df518af457d4da20fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ru/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ru/firefox-59.0.3.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "8a42c89e4a0ac8f26421450637c2781c2dac2fd4469080f5d17a86cbbaa2c1cae56cc641797e6c1efb1576467c2d9e960b8a486f4b79556eba1d8a099d82e567";
+      sha512 = "e113811aafcf713e12d225097442e4f1df2bd79f24fde84b543d3c4e3aeac2abde4c19aa98708577391c4b016c32af5a188c200954e0750dca1a4f13412da3f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/si/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/si/firefox-59.0.3.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "230b155c90db9c05a8f896357c1cb2baca0f96cada2a62fced73caa94a49116459b4ae42a4f61ce03dd08d9ce03541067a5cc64a53ad17cd63debbfe645a2614";
+      sha512 = "faa98d902ff56f2d3978337f69cc146de506f8eea86f671057ad6b9b72e00a1de9ee90e5d7945826aedfcd996fa8d5476c11fb0aaa77ee9a7fe49b5e1e9b4b70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sk/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sk/firefox-59.0.3.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "1072c117830b85c54e7c1ead8ca552e92ce0c1971f26a28d27490802ceeb15fc105323599fd768a8ecd94597b3f51f8efdfb3e91743395c19b52a152ffb383d5";
+      sha512 = "aee696579b46e4f0db7eef3d78a8d12d3bf7f1910049b7dec9de7f1598005ea7c9c2b1e5cc12a6258595b7c4ecc5be8cdce03e2566c539eeb0be0a545ab792b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sl/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sl/firefox-59.0.3.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "5580f6777ce0acd2d47af993a8bec2e23ef16d77e6fb653147637e1efa08e82006a41108b94b213e7bb6d57b9dc27e8cc2bc1f0a26e9c2cf766e9c82dcc673d9";
+      sha512 = "7fd3522a56107f054fd852ff3ce5100276a63d423c8481ef0f90dbd87edcf4bbd71424c25fd78535a3cffb1bb273c9e61f7b332923409f0838b81d31bebbaf7a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/son/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/son/firefox-59.0.3.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "0f930af28da8a3643d424dc957643682909d86f83d2cde87656abb33fd5d9c5277a46cf46d4ed28a790eaa0b5681f48cc43a2184c8273cb85c821359d07ad46e";
+      sha512 = "302d73075dfe7e12f06bc58cbeb7aa6985c9c6c82850d70cccc0854797a78ef4759136d1a9254d0d1407dc8ef39fac5501f14c2cff24ca3cd1db14ea337ae3e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sq/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sq/firefox-59.0.3.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "08589b3b4bfb670a912045614bb408a856b48aee4184b98e475101b1ff0ce3f6659c13ae4ffeb981e28f0b7243ba6b340065224dae0cef85e6f5877b0b150db0";
+      sha512 = "21f943834dc04a35f3e3f097e31614b18040ebb7decee4d3bd54916c79b5d16840d0265e7d20aa1d0a508f3d2bca38ee28046f017629c85ba49d98c2b8a543e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sr/firefox-59.0.3.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "2abe8a5c502564823ffeaf59925d6749463e4aa0fcb0732f0c68acd8243b5a1bf5a71834fd9e519df8aa4b7b32fe69336ed9976b1ffb2ca67068cbe47f9b6987";
+      sha512 = "48af03fb3cd68774535bb873cd452f3ee907b96cd5aa4fa662079eab069ebc57eaecaa17726337190d1e528e927aed48fb5a58de97158898de87b318012aea24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/sv-SE/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sv-SE/firefox-59.0.3.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ff79a7639d654cc2714f75e619c0c6c5862c1e4216fe7e2eeaf3876c47e16a6555dfa28e9be6b8215fe9e308e4c8753c5d70bcc6f3979c8a70fd7330652126ed";
+      sha512 = "33a1becac255b82ec3d20d37ee4ec97975df55cbe2f3760a802021ac571b5f88a25ca591378fae990870fc03c552067f136209245a878c86d0c386245d6042f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ta/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ta/firefox-59.0.3.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "fb4d4c6def12ffe32eb9517858488921f1c77380f3d1d35a8652ebe7b9e14429709debffa6dd6a1008fee71c664fd8f582db1052a203dc1d7c10ba418222f7fc";
+      sha512 = "a924970ef03b4f719bec64c507fe4e4c9ee8d18188c0a5a11785798ac28bb69397403a34b5e20f1d4e0affdb82037190dcb77042f5c5b62af79bb332022aaafb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/te/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/te/firefox-59.0.3.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ae97d60ac98c6cd9bad620a7c5dba8d51bdb2b035132daa0d915d1fc1e04802a25137bbbac82009ec51c0d858346e2f5c43f9981c48e991cc094cf11711fdeef";
+      sha512 = "0fbd8b103da9080c56b94d319b1e60b16a8b525c3c4071e12f390b52f870aa17db0d153c099fc77f1b70fde0302431b94549abbf713c7255a8b01c0c9c247341";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/th/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/th/firefox-59.0.3.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "695fae213cc6705ec130c4dc08dd1c28f6ad605e0a2d0e92deef13737cc2780cd420dd883dc5153bf9cd174e1740effbc817054b16417fed90d04be04f21ab24";
+      sha512 = "6079f0e2bdaa67bcef0f850df24dca79473bbdc2ba0668b59c5d8fcc23627c4156ebadff4ea01744c50a50571d5fc65ee7c680ba48f67997817dbb729170cabf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/tr/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/tr/firefox-59.0.3.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "f79e1f5027a84b772358d25f0441744036f60da7de5c0b26428ebd81900977e70d2c36b454e73f7026b7e20c058830502c92bdb8cc7d55c3ab40df43b7380d31";
+      sha512 = "86c02b0bfb19f7461b9a2d31ba7a0f4473f52ec09350b9898f0c5c42eedb74c67e5fe3fdedec53bf9fa57497a970d286de6c1cfc141d0b0cb5deeee1df9ebdf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uk/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/uk/firefox-59.0.3.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "30b7661e84a875ff356284a87d1dc00a9e8fc1c03c953c471d785445e78cf4568450fec97bb16a1c63b092931719119510f33f55f02ff56e38adf4fb3be3f2c8";
+      sha512 = "63afd6b42202ac16c7c638af84b10f1f655d8144af44c79e29894a123dff2eb1f445550a82e8aeba558cf759f2aa68752461301128c3adb9d7c18f39d9f45de8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/ur/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ur/firefox-59.0.3.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "9ef6fed1bea2857fc60e22eb9a87db8261316ba0852a3c5d35d65c3ead474ae34ee532588e25942f76be2f13a341c9bd9b672e5b192db1d3ccfee3f6a6787b83";
+      sha512 = "02e1341a4ac5e2e2fcf2cbfe1dcb10f82ba726d437e5de9d132eb58f5a68ce9e13d646ad004d5638f356a717f23d4a38f25171eb4c773da953042729fda19bbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/uz/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/uz/firefox-59.0.3.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "ab75b5c8e81b6bfc12b07b4fb2872cf2297c7249c352f5b66d95d867698f3e9a601f273e708bcb8855505eaba87b384e2b62f9d0b85e5976acf1c948e5e5a3e1";
+      sha512 = "fd346ea8650222cac69531b28c70bbd0a069e24ef0383d169fe05dc966e5d8e523e87d33b1ce4b696b33e6182f5373e762fd40ceaaf1bbe7313c67f3905003c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/vi/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/vi/firefox-59.0.3.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d08e244d22c92c0e64c1104d5bbaaa19fa3b0d8f7a3616ae0df71d8f141039f1e7e87480f52d319f57d545f58c7095da643d4bac150e47c3e595b27cb793076f";
+      sha512 = "af4d11f8eeeb07457810e73f25d04d59131ada91c0142af486a8726c5abce26b2e16a51b539c5c47b2c2c220dd9cfbc6c95a81f114b382192528c50e431ee211";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/xh/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/xh/firefox-59.0.3.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "b956f01619afc421ed23ac644af51f62fa9f5cffcd7f5b6bf640014d1326583f8ba871e4e4f5cf8e81ab0a2b46335b5e921243e71ed16d51b2c89f0a7d1a1280";
+      sha512 = "06084e0b1c2e18cae797519ef3ea12e8af851c9d33c385e55418cd2cbe733d64e350958d0125664dba7317dc5579409a5dd33722bb1f504cc0406cf3dbc05806";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-CN/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/zh-CN/firefox-59.0.3.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "80f3c557a7fa2d51f5ba2d07adef2bd6980a4cd256b95702ee4fac2967d039476ea3b828ce951b354be9fea9508ecae2ea12a8b29f8feb0101b2101d741bf633";
+      sha512 = "5b63ec90f6ba20001c3696081ca2048c6ad9b2a0f061aded8c5a7b2b25a906f95c0c3ea297b5b51db346d1af96819cdffefc3c3a0632308ec5a27a7ea1a5bdde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.2/linux-i686/zh-TW/firefox-59.0.2.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/zh-TW/firefox-59.0.3.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "50668a428310083cd175ce0dd9d09742866143d56efb0b13d11de1905d5b1d9f61e441bf1364e518aa87ebc790a335cc3b69d2438d3a4f92b4802345b8a443fa";
+      sha512 = "164af70d9ec69685dd0bc909436a4c7dbb126716b28f0f4fc92e75777431e8a037833778ca8a9a5e35d883d940873b899ac2edfdca50be2c1167c320fb4dec65";
     }
     ];
 }

From 459312c4239a439d9f0924f4713c33a12be1f4f2 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 30 Apr 2018 21:20:14 +0900
Subject: [PATCH 1645/3370] firefox: 59.0.2 -> 59.0.3

---
 pkgs/applications/networking/browsers/firefox/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 07495e7d4707..e0b00985de96 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -18,10 +18,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "59.0.2";
+    version = "59.0.3";
     src = fetchurl {
-      url = "https://hg.mozilla.org/releases/mozilla-release/archive/239e434d6d2b8e1e2b697c3416d1e96d48fe98e5.tar.bz2";
-      sha512 = "3kfh224sfc9ig4733frnskcs49xzjkrs00lxllsvx1imm6f4sf117mqlvc7bhgrn8ldiqn6vaa5g6gd9b7awkk1g975bbzk9namb3yv";
+      url = "https://hg.mozilla.org/releases/mozilla-release/archive/6b51784853e47e091d213d421a19cb623af718f0.tar.bz2";
+      sha512 = "2dh2hp307iz90969i8r96hdmd0d2v2d5zjp0n3klsn789sd6b3jdznb4mc5ghpm2rpcl48rqakw6apvmhidcahc1zbc1fq6j6a86jqp";
     };
 
     patches = nixpkgsPatches ++ [

From ae85f48652de786f5401f169b564456e979acf30 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 5 May 2018 22:24:32 +0900
Subject: [PATCH 1646/3370] firefox-esr: 52.7.3esr -> 52.7.4esr

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index e0b00985de96..651bfb7bae19 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -41,10 +41,10 @@ rec {
 
   firefox-esr = common rec {
     pname = "firefox-esr";
-    version = "52.7.3esr";
+    version = "52.7.4esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "31y3qrslg61724vmly6gr1lqcrqgpkh3zsl8riax45gizfcp3qbgkvmd5wwfn9fiwjqi6ww3i08j51wxrfxcxznv7c6qzsvzzc30mgw";
+      sha512 = "971ac97a749e5d322fec95ca1e86af5b633deab37d2d8fb49ab129c7ba20753a802c620315bc5b92a0a7ab7afe00e71aca04b3238670c4732d8e6816c645f53a";
     };
 
     patches = nixpkgsPatches;

From c1db0cdc4ba97a6c079f52cba2b1a7e038cdaf9b Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Tue, 8 May 2018 20:31:44 +0900
Subject: [PATCH 1647/3370] firefox: use fetchzip instead of fetchurl

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 651bfb7bae19..4c17f2c98069 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,4 +1,5 @@
-{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
+{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchzip
+, fetchFromGitHub, fetchpatch }:
 
 let
 
@@ -19,9 +20,9 @@ rec {
   firefox = common rec {
     pname = "firefox";
     version = "59.0.3";
-    src = fetchurl {
+    src = fetchzip {
       url = "https://hg.mozilla.org/releases/mozilla-release/archive/6b51784853e47e091d213d421a19cb623af718f0.tar.bz2";
-      sha512 = "2dh2hp307iz90969i8r96hdmd0d2v2d5zjp0n3klsn789sd6b3jdznb4mc5ghpm2rpcl48rqakw6apvmhidcahc1zbc1fq6j6a86jqp";
+      sha512 = "0wcvs0lzdddbrxp8prg1w1g4xq9xqzvqlgs9r22zjblfnp703nw82zr09ys7jd63mr77g3rgglhi3d5k42aqrbmsx1r5dn5qqf5jlkz";
     };
 
     patches = nixpkgsPatches ++ [

From e39706ce498016599cd46e34b924eb12069dd8df Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 11 May 2018 09:07:53 +0900
Subject: [PATCH 1648/3370] firefox-bin: 59.0.3 -> 60.0

---
 .../browsers/firefox-bin/release_sources.nix  | 788 +++++++++---------
 1 file changed, 399 insertions(+), 389 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index cab39047212a..478728cf09e5 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,975 +1,985 @@
 {
-  version = "59.0.3";
+  version = "60.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ach/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ach/firefox-60.0.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "404b4cdd02a1d25379f3627824d7790bf1c73af9f58e94a8fb6208f8907b3a7e7599821edcee65838255fdee69914eb8c916218d7714226d7cce5180fb01ab2c";
+      sha512 = "1e7d2419e488a14eed5af7f2aec9a0092f830cea256f69cf654b2bbf783b192ead4512538fe3b2566dd55061cccaced91a7aa54732fc0987a4b24f676b9cabd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/af/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/af/firefox-60.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "59ef32fb550404f6e4572cc9b5e34d6a7875a16dc62ead78b02fe944e4f3d2128e71cdac236e074238c6ca45d3fda959e17df3f6c056f13b149058f156bb97a7";
+      sha512 = "5714025668a2a9856571c743870f3401f0bfba66bb216936df7fbc977d9a935ae8b66fcb3042e45a934584a2571289fdac4f8fe8af2ec6a52c93d6fbf21484fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/an/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/an/firefox-60.0.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "a3d0b8785bfc1250c8b5deda2a876469c1c2c3c7c5bb22b45a6aebf7d4e3c1813c7a7ed99257a4ec52b7f56f1c183e50e515a88bcb5d47213095382ab1355485";
+      sha512 = "678a060be20453e11fa2e8dc92db8a510789082d026a768dfb6cb3ac6a77924a1f6a9cce4e8c83e19a4aa6702b1e7e0b17846c52d2de2719dc5f8141a95d1c47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ar/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ar/firefox-60.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "15f410bed4f64d8f3f8acf0275647aa0a94985e3172b4c5e0c5f52a3a1f1c132b1677032f361fec075667ce733e288cd79382abc5b4aa630281e72f889e35990";
+      sha512 = "0c8e9cff9d7a349dfb18e3c5924efb068e1f9f145347b08feb158521b3ebf331ee01b035052ddb889d09b728745465fb6b7ba79c3608719c6f14a36e1da061c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/as/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/as/firefox-60.0.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "f61f4e1bf0487657fa538ced9ddfb01fae19bc973a3a44e602b4d68547386fab4b730ad69ebabd14617fc4a6b291a4c5c50a09c60d5cfdfc1a01254a9cc70c4a";
+      sha512 = "0ec81546fa30b6ff5fd8b66df5b97eff25b359ea0ff258cd24aeab63cc87ecec3deb5f4173d9da46efbf82f70a3fd1579aff819de4e299a464abe289e7c77890";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ast/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ast/firefox-60.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "30fc099cc873ad3159406018386033b251738cb258fbce3ad7428e6db359a263648d3c5f394150e5e162791e767e30de2907a16385669478706f66395ac60fb5";
+      sha512 = "ca9eceb89df3d618756618d961be5115846c1c6426f7f145379c2a127c807ba17c4796e9a16395e6f2d05b5638366b7f0a77ca19a75f89bbdf6a2a2f93269c74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/az/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/az/firefox-60.0.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "7b3fff9d731b1700461fdde8e4943fb5e01a73e2c89ae40511315b2f219524dc3ed67458f9c91ca0b4ba34ec9ff7e5edc5382dee25b23d46f468d597024adf46";
+      sha512 = "e99295b469fb85cba099424700267f875e7d4ad9c3e8398c7ed8bd4427a3d173feec957edec2847ade3735df77a7313ca99a98b66b67c158b33bd17e39fe98df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/be/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/be/firefox-60.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "f9913874e839249b892281b90cce9fa93243560a599c942e5dddf22b51e4b5774ef91d582a170d5a591b3e47dffb7015aef5d4ff39c165213ff8b24e238b8c6e";
+      sha512 = "ce80aa81c5b04da5f0f89d9e527b8e1d7ebc287ddb05d2ecc08994c0e31ea8860b68316af5e00f59e1ba85a4abb29e1e9403cedde40faa294af6b130be2a4ef1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bg/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bg/firefox-60.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "1a84a38460ac8a144e4dfef1b1e5ddb6dcfaff1f0cdc1497e477614b60b63405f0e573c25307957d52a91808af88b9906daac8c956d7ee74bb907bf90c94f526";
+      sha512 = "5a5f0fa8745c9c649dc26e8d235729bcdcbc397c4deb56bc0d8bff954ec64c2acd9f4d9fbeab9b0484d3fe91ed3717f8e37d5602f139fb5bc4fb22d0a372b926";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bn-BD/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bn-BD/firefox-60.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "72b33e221e8d111bf8796879f8797c760e752e17d515a036c9c84172115a845cc82d34b4a16ad27a84db4c1d32fd74c066b6fb7810a4a06ba97140e5b8330fea";
+      sha512 = "62989d16accef0717ec9360d66cd169d89847701cab64f06fae6290b9be6d67acb0dd6c5d7f0e0c79107301512f57b44da04ce66096232291c5947a903e446e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bn-IN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bn-IN/firefox-60.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "0ddec8964bbc6bf0aff10a96d5797166f4445ee26acc155a8777cab8755b6a119b61c38f9acc011f3857d97d35b808b72f22c5493c4091cc4c17694b1d8b4f0c";
+      sha512 = "fd75cfe4d3e9e7534d4b99452c05e4ee8bb45ddeb0b6cbac979b65db0a783f342b346204428c9b0787ab4e1bcccf4d4f056f4043a906dee41e7753ab8e53fc9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/br/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/br/firefox-60.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "9171f0547ce9d0c244a959294d62477bac7fcb7e611666f394ac47fb0c8f3579f85b08fa837e5e834a38e4908e0e1a4fe3b96e5759825a41996afd3fc2308e8c";
+      sha512 = "5c17a47e0fcc7231e6d1a9fb632f5f55c6dcb4dbfdf02ca6607ddcc54db3e198d563b0247fd4e95226ca29dfda25bf092e1b427d1b532b6544c2f2c5c498ee02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/bs/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bs/firefox-60.0.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "6322d2e315937a4b7007ff68a8e491e76fc13e07cc881ee9c7a0a20e57f75ea4ad245f1849902aaa80eadc380bf107dcbaac229f05bcc67f775844880a514b97";
+      sha512 = "290f57558d2d0b6abee4e6220047e0e6082f328bf3c1c7ba02474d7885ad3bbe77ead7875ec2726ae5ab4db25bf9659147c5abe9fea771a54acd4a9cefa18c8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ca/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ca/firefox-60.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "e1080f2bf6a9fd9b20498c454231315387fc12e9f27a5e6637113d5121c1e3c4f7c9c1dcaf8ceef6af5245d9b5b9388aca63678431ff54e58378f3faf45f42a8";
+      sha512 = "cfd5654a3ac3a50885621bc4be9918f5e71dd8150e4fe4e54acf35685a42ea82d6115e8a50593866e186860c7d5de5408c5a0e7325050b1bc39d6964e828a3e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cak/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cak/firefox-60.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "770a9990136bcaf0e8d8a8056972de603c1f6e181c7b37c0b3dd2bf694a9402c981d4699e25d92c10a78808f9a56596f533107c941c29c8f3f318b40c79eacf9";
+      sha512 = "479d713253b99a19c6ec305e7986062b3a1ee476afb8968dfa2f57c52f22b734df82661bf487ad1fe7e706dfb581a99b247ea4128e89c9105b719b96f37e1cc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cs/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cs/firefox-60.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "e1a65b8f97f106985714f221c0221b66c086f6a4aaeddf994089a4924d1f73ea5345de147870ab46201466e5bf7ae6d7de103f666ee40207141b5e64f5cc2534";
+      sha512 = "5139f4a2820ee921bd3c02acca7f57c5c2cc510c0e364129ecc07f17843cf92c565770fd0829515bfae94f96f6c9c68e8eb05c87fe5800da0be64f2400bf876a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/cy/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cy/firefox-60.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "7d150f5ed948a9ea25777e9d4f15c21076e72340150140aeb26db5d39ba124087f7e93362bf9b9b8104087b84a998ebf8fc006198527ecbe441d1701fe7fc7a7";
+      sha512 = "d26fa97dae91eaaf0b09a580880ff0bb70f67c473cd8dd804d835823ac6cd97306b0bfab9b8fabd45b35330ddbef72e779dd09b47580b0347d4d857dd04182e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/da/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/da/firefox-60.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "636bc1610c521bdf85976aafba91969641ad7cf77a00a51b095c84698f42fc27f5f4bef227f9f9d0128b8d68a99d2ca7d8d915e74c8428aed269a67e15851343";
+      sha512 = "66a187b067f2e71f8ef43e3eed3eb12d02b407a230692e653111407c2dec82dce552eb5f9716733b0b3112d2d07ba6d917e4166e9bdac030dc0569a8630b566e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/de/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/de/firefox-60.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "8dbf02a5533a84cff9c41584e91416859a06623f24936eb559238f0ccd5618c047f1b549036398aa8bd4f879a8eaae7b0f199576427dedbf9708cb55514cf169";
+      sha512 = "aab4cfcf1c47d99c01cc93b0e26babecb4619b67df65a2400259249a870aa765152b7e4be625a9708e3e44b90f5a20b77f282b6939f2d092cc0bd180d8167c0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/dsb/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/dsb/firefox-60.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "b42bb2a2e75713e9c0c2f0602251ad5c3ab8683800ee08b0b5f36f055a63dca6e88e6e0c88806149217f20833538bde557c699c7f815eea59ab571e3b2db4df4";
+      sha512 = "8726bd887b610e74b8b7073b8e797a98e009150594f2dd5e0f301f375b7bd6af02b5c8915c444145fadc6ae3e77f494a6c39632858d172b6324a2e4c84c0d6f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/el/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/el/firefox-60.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "32c61f7110084caf8cc3aed151f5b374e35ab4a4b7d5c3159f0e44007f3398e6fde02ca460e13400ce6d507bf2dccdcf88c50945420802dcd7cf2ba6ac3ba8dc";
+      sha512 = "f67a778f0aa15bac7450a210287f8e1e29cb9f4abc0f9e3c037d15a0f9341cdfff80b38a936724e5d18b5ceb373233fd8d038579e3a044c177887e05f5834310";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-GB/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-GB/firefox-60.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "ee19670513499ce3cde705e1dc19db9ae16018cf8672d5c1c1f7029ce4a44437239150dcad425592dbab2746571b5317fb0e1d7eed87f65e121ddca4a8efaf31";
+      sha512 = "fecd277c434cf3d4509371a5abf09fad81aba3fc7807470fcb91975939fef0d1384a97c4322411a787bb3fb27e3b043f9dd3ac182e41d35ea59824d109ff483e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-US/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-US/firefox-60.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "d42ae9f95b85a2678c895ba920435059f920df656bd41156c9e300a97827f58bcb689d0152f9732fabad792c084b47719124bd96d286744d2d787909e7844ae2";
+      sha512 = "263b6e827b8e6f8757c82a2ca24f78bd649ee07254cfde454e6d6ed879cfe816ed61c94aab3c10f3d63a38f83f391bf66bc578ae958343327298801fc30eaf3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/en-ZA/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-ZA/firefox-60.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "9ca481e4a072eba9d0bd373df8d4038b08d95af5ad69e08ee0d3499cbb422e1df20b2a56615675d2663ce1df6cf4cc01ec773a8b99e43301b4f5e13dfdc70cc9";
+      sha512 = "6ffa936e9f5e495309ff535fa9775200f8110bc0162d97f8d8bd00cbf3606c47b88b566114224f882a323c6e9538150ef79e1340e1e1eead8ddaf030b4ffb3fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/eo/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/eo/firefox-60.0.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "750ee8058e9c79047a5abb3b8219ce6c10d0aa8667ff788c921891d5bb8e85a400bc28c7be9a8d0479d7a64c7b6788a22a5a8545f4665e2c90513251f87bae30";
+      sha512 = "f65bf2b40299c5260cb857c781445c9213dea8a49751d6701f43f6dd11fccec206b5850d54e96a4eba544d59b6a470f21b3e15b60116615c343d78726e7402f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-AR/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-AR/firefox-60.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "dc0350f8da5ab3deb8dccd05e71fc873051d8a935f75af95a3fcb0bb81e86f18eca3f14c1be2f9fd491662ad9c908c5770cf1e6d22a4f3ffacdf5aaadb54b13b";
+      sha512 = "50a912c5d4cb1e73bbe5b4c6cd8a112cf88377ca78cb45a073bfe74b4b5618a39fe088c908e278eedaf50308e70e63d38c06343c4d60fdfc346684ce7042a5ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-CL/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-CL/firefox-60.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "04f9c3a5bb4e87778a5b7f10bdc4f6ac5f8eee39f50db72e20e4e94babaad0411d14eacefddb084469b7540cb5104b718e29020188ff05069faec919420083b1";
+      sha512 = "b12f0fca0d307b280ec2a44f9dceed0073b0b9e898e05a55fdfd15623e022eac7b937e6b4ce470c7892e9ed429fd98a4d09141a5e1141fe05e3b21ab838a21d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-ES/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-ES/firefox-60.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "f70157ee4afe65cf65529d1dbc1c93307f4a79cd89d0ef7c05bb9f8723c95c561eb3a122506509e83dc6056b603e203bdd5464dc1db7e6497c0fb7cd7035d039";
+      sha512 = "492aed6ef8fa3e51ad1604cf858dd1223ccc8a949b3cef4ec37be1596640421b057f50d3ad1827fe139230013ba4c040466682e61ebee59e7b6c168f35a14b1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/es-MX/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-MX/firefox-60.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "aec14d9c54a116047193596304ef235d05089c2e94eec9caa40ef12498800fafc88b3e094e1c72e25be06c8288daff20fe8859a62157544ee3233ed620fa0daf";
+      sha512 = "8f12520b74b0899c58f29217f9ecc6223635b627ddf525e3d36b7a0616ad2ea39e239bdb3cf3e0570ba4be03ebd93a2aa2739cb7cbfb851e84d2549970fd0bec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/et/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/et/firefox-60.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "32dbdd743b65fb5f5941ca3a83272b49a47c7742377cd46bab19a9c2e75bf5726cfa7afa55c7cc33a4a9daceacdaf59019ab0f302af84edc6ea6beb9db7fd6c0";
+      sha512 = "c24e822fbd147ae85a8f02dcbb070764c31b96056a07b2b344f85641517e1e8fa78fff860bc7e951675f9ba30616dcb567e279db93638f241a75632f7fd97b9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/eu/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/eu/firefox-60.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "9b47c791bf12a2782930c62f4973a2d49cef28e4b5fca24824da28dc2f9b7bb64f9dbe8208c77d77f924962db35e0190969cf65b2d2b520cba94ae6747082038";
+      sha512 = "61ebe8e2e353419f7ed3ef8f944f4d8ae54d3c1c21ed7c1707212ac31e20c6f0607c00d0f3039e83c1aba832653f9c352b4976af4100b968045ad103862cee6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fa/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fa/firefox-60.0.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "bb0e0c3a8c5bb31b1959626a2d8e13a47f60815af3041e0463e9148c61fcf626cf1ed0a9a6f27ebf8fb5fcda60b306ca679f4d4c6f4080d7a542782b2805b22c";
+      sha512 = "d47f63bedfc12a2e14eab57eeca7f946513b3067ea84b7931237a32841c40e477dfb4f3979fdd617b6b43787631f97fa4e28f996038f3eac7c2be7c82f8edfaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ff/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ff/firefox-60.0.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "3e9f478f3712cd084ece2492f384c0ff4e92058d20df30893b5b96ff20bed8c3903cb66c23a4dc9fcdc12320addcc9da948c05bdf3c84232d307bb8360b163fb";
+      sha512 = "91fbab65d71da4416df7501ef392154844a6e5fafde529e9a9a42f01b44eb87ad248d83387b68fbda5b964b8d18b1b22b978dac8751cd73bf30c46d3cafda868";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fi/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fi/firefox-60.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "9f85727e929ecc8915530c5cd57bb6e76d7972636ae607e0ef211ab562694e825406e23b8ff98b39447fe9f5fbe6ab586370ba0a90331d5dbac04882baa13643";
+      sha512 = "483408626eaec192e753277b02de5c5bb68ca6056f35756fd7f80ff6c6ab3e6ff15f23d4cd5d1a28c8e662bc278ce7cb285513504663340451b912126e4d4fbe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fr/firefox-60.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "d150100a8d0eb9fe38bb40e5791735975a94d866778623c649fc9cca9907b773f3f5762dca0ffb707d50d72b48cfe3da0d3a203f310a119b1d2c17988a345233";
+      sha512 = "adb7d295ba37c0cc7b51e312ffc3f60e8ee13106bacbb833086d160535504fa2f8f859ea3c1d30eb6a823ed9c2c6efc97bb691dde8cdcf991090e29e15d5c21b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/fy-NL/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fy-NL/firefox-60.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "6110e624c28606720ba7383179573ba047e3a5f975d2790f9c647995a0821b17d04dcf1108672b5c8eff3c5c7fd6fc8bd0fda53a293d13217526e6f5f959e09b";
+      sha512 = "ff44abaf4ec57162bdeb3197c3f75f312029934a8546018dab76aee8bab44cf2411c59d04a4dee9bebd618f26b466fd074f7533d839f1202e643d255e97e8015";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ga-IE/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ga-IE/firefox-60.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "1d6015e42bf94eaba47a9cc75134eac83cd2ad6b18d86350eeb2df0ed7d38c3d39abae49f2b57d1b66f6d75c7e233e0e31c4fcaf7da76b6b8b90dd07e7519e99";
+      sha512 = "5d511a4dbc00b39199500b30c98ecd6bc009217644b82f58beed9fbb74699fdeca7cc31b59a046a7c56fa57c53c2aef7cc55232fedbca751b85347460c014d3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gd/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gd/firefox-60.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "ca5cfa0b930147a88280f12a56ec7e112edc66079139cc0d7d5282dc6078dead6cca66b8725ed9cd59203e3121ec480454fd42d535c42ee6d002bfb99a323a58";
+      sha512 = "c7c893d0acb97541d9545a35c031aec967405113a4855d6833b5ade0418004fb8b6efab82abb551499c4b4f8a32010634b64a96e8c9b12f27b764dc50b33a23e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gl/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gl/firefox-60.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "0fa94d9f494e2b8c90931889fc0191540b8999526e6140cebffd93fd02c0035e206de09fd4f28f168ada7b8c13f61a7a327efe19909024779751090178add2ef";
+      sha512 = "aadd92086094860936f1c0436bab9742170533a1b233022313439c9aa968269835b2f63bf33226c1fc52bafbcbe1e00677e8f1e04579193c474600e5dc3d94c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gn/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gn/firefox-60.0.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "640518a9f2137495adc18fa689444335e4a663cdb9a4beeb3ae6dda6c4b5d2af166ecaae8068352852c3455ec8fe81cf945faf2742f8096dd6966fa37affaa12";
+      sha512 = "cf566c8adb01873712708f76bb976a92a3b729459639faabd22ab5515cf59951142af734c9eab7d67ec4eabf9590f1d7bab65787f70908dbc01aece73bf52277";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/gu-IN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gu-IN/firefox-60.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "9cdd5186c99b5ba464a3931e443a7ac24f8236bd6e92f23314e0595525ce17757d58637b3d9db318816d704644b600a2f2bd1eaf156011c5d22bf58ecf0c0c90";
+      sha512 = "ecc4afe4acebf476fb0c4bd089679d8fdfb88c06769a75dc473ca3cefae09c01c8e71f88cf3c8130f4576eac17445032223f2713327ef6386fda6a2e3f588bbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/he/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/he/firefox-60.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "a2ccb4a8ad24143c9b82d16c816527acf9022a2457695a66144d2b917ea2c933f15cb238b3afc61be2e590bdc966a009fe4aa5e08bc94e2d297f768344d6596d";
+      sha512 = "604048649305e7abe426b831c8b3fd0eb3cb26cabc7b055f85b7fcad8d0f9cb8bb06a431a28013ae8fd24ab4b21d8f8e68053dd7397a88546305f241adab476a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hi-IN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hi-IN/firefox-60.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ee0f077a4001fab75b8d4386e8ed4b72a3240417cd4db4d9aafecd8cde7728bdf3dc1ea1c96dd7a568ff547dfe2ccd984a679ca464adf9528fef886b913224cb";
+      sha512 = "1f1d56c762166cd8c099f636c610c361ca94d388bd4d627ddae6d94e4424074686b5fb6a3aae5562e9250dc82576bc52abac4e1b09386dc2f81799a1804bb7c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hr/firefox-60.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "28c158c5b2895b16a599f3122d0742b8e48528f3a319fb48b5f2c500727dcb877ed7660a3a674883b3aab71cef66d76a6c1cb222dc16925e0bfcb044a5d510c7";
+      sha512 = "f5968a481d92aa0b57ed6319e7bba0d11ff00e0ec8beab9c6b66e18f4a6d128979ce1efaaf6fa07d4202130698216e58b8580833c13e1420dcfadbcda925b908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hsb/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hsb/firefox-60.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "6fb2b3fab3559b87c62d7c63fd522c7e0c8d51adc60a49ad87340ecc05e1d27ed3be84a0593d40173e25fe0445d776ede6db6d3d0e8ebe1dbc11f1ace4feded7";
+      sha512 = "6dee0423afa3ab5c173568aa91a2e92927cd6aae390033f34d8e63ad224d813b3f688a0287872cd8b08efad823b05804ddf54efcb57d1503bb70731391fafebf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hu/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hu/firefox-60.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "21f30c5e8e2f23f39b149545fdd5ce0fe0169bf580a574b8da6f141e09334a010b21ac076aa62b4df2c335ad8bd433344c58bfb7d9b80f26261a0f927e3ef455";
+      sha512 = "688103282fbc64a541bf6b914f757ef4cdf58ac6eaa942f45bb8b20b661136913b62735b7352c2118643118c48d94dd9a7cc18dcac184c3080e078d6bafbb278";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/hy-AM/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hy-AM/firefox-60.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "619190e969e7d9faf0b0d9b6eab902577a19183f1412a8f22a4615eda035ab06c10ea2ba0769febf3466ed97a964c7b7070a03d4ca2ba33f312e04fa20eddd5b";
+      sha512 = "f836cd764ddd7f9f48295c103b4ec0c091c8eaceb756825fbc9f4a03b9dab786fc94781903975167d93c8d9ee73940a6607403ae6d0ef97a7c83b89989ec628c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ia/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ia/firefox-60.0.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "8cc986bd03f6d9c66c7916ea8c7086a18ecdfacd9e117136bd8489ca5f91af6d87447ec1a9b998c9bd222dd83e679b4081dce4a98959c8ea8b3bf541e46a2c8e";
+      sha512 = "61ed80fa61e7e8247ac1b59dd26582b063fd1313a02bf1ab73c696389cdf5f3d8bc0c3b58a15fd9ff08ca9514e3a3b53fb16aa532758586d412a8155131fa457";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/id/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/id/firefox-60.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9debe3c7c1310d567a960985269e56f40a0a85eb99dc26bf7ba1c009f78dd66243ec9f8bef3cafa1f00f078d8cc76f84d4c4367b315418456f7f694faa9373f1";
+      sha512 = "a87de8f34c82d35a5bfc77ba7a5be2c5afa6b5015d79f25280d162f9563cf8e48ff54386c03b67e4743a376c0d679f1d90b7f87924126028f2a4b990e7d28182";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/is/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/is/firefox-60.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "f0f676e21ec9ce7625f6925e524d0ee2cfe11aad4a97cc9041b0cc03678a8059f3d32c931edf56173b5300d91620fdb9401919addffa4a76d060e31bba8000cb";
+      sha512 = "3b51c777930363c3085f11f3fd54a58a3ebf63a1a35384ec8d324acd670cb35e8bf8f9d1bd3b6ba735b63b5b2f0901d064e7802c5fea6edd5b36d7cc022cfd94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/it/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/it/firefox-60.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "30fe899358440fb54c779470548dcff9ceb8eb55b72bd298aebd7281309f24fd256865b7db83461c83d212f6b66e3e81d505245ae9556594aff78e86ad12fa97";
+      sha512 = "84ab4fc30b8753fd7586239b6f7313828862793581932aba00394ba59f6070a5ce69455a102f2ad05fe19e8cdfcd78de82d488bc31918b63f4d8aa810db2be76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ja/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ja/firefox-60.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "309f6e3a24fc2f9ed859f0133e38cbc47b74d6d04fdf439c14d6328f25c16697eac7b49e1441c9cc32877938aec1f8e862df6a44fa85156b9d29109713f61dcb";
+      sha512 = "345b9ed332637d74064064894d34d32263725af9d288da3de3b2c05d2e38ee97355bba5a871698980d772a7b6847642c19716e00514d2965900f12b8a5d7a633";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ka/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ka/firefox-60.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "d2bdbe00907e43f1673616dbfd52182651e2aab4b356079537d361c8c88945f06ce23a953386d64e4aa6516a490674f3cc20973558d83990c8b9c35807941bf7";
+      sha512 = "fa3baf6c474e883c94e5d862739e2124980e3d7cb7692dee8507d13bd1aaf389c849b218ec0cde02f60db479c1ecd32e8e444afe3e09c6ebb4e7afa0b273a2a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kab/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kab/firefox-60.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a144e1fd69291e5f30a0aefbfd2c9113e8d3f3dd38522b6c12e227c47626a7bda74d4663ab2c2aa10d85963689db4fbd3141e8c49ffe77d59f273c7031b31d55";
+      sha512 = "a86ccc40c7a7460acf3242a8ab85fdae4146bf0efbae20ea44fb0251f18bbc803f55748348022ad5196c2347e3da7b79a03418ae281835af184d2245e4bb7635";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kk/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kk/firefox-60.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "cb826eeddacab068f2b5ddfbbe05ffdc3862c23eece9e2b11cfa9c86780eba659cf6cb0917cc5d41737bf9f9fa59ed274ce29c3ae94c41c9d2c70be3249adea9";
+      sha512 = "420956435202d7166c3d29c795974034b43c758fe19d0d55dfbd207e4e1862272a55a6770294ffa54a4cb9259985eac7f17a290e13a49006661b18beb7f27a23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/km/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/km/firefox-60.0.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "d968692a7626bb8b831c747cc64c713b1209218cfe4bd4f1ed6e645ccff86dd4c4ca529f07a163915b155c72fad4e2637e2d1f52e0ee184f572743cb0b2c8de9";
+      sha512 = "cfc262238316cd3dcab2e2a11647cdf3a7ba38004d4fa18f83286d6cf1320a78534cb88727635c330e6ca8c8608aae748786a83fb68484f6d2f6ee23cff603f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/kn/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kn/firefox-60.0.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "ebcece13e28b4e5009a60dd88752b7f5c756a5fb974b606c3dccbe037401c30b684faba5d7b4c76d21dc369855c38b66fd160544efe7105235412dd10c16761e";
+      sha512 = "27c445445080f6642d4f95022d8bd07824ea81549f80da041ad1273db6d4a0eccb9e1bdcacb89e269e69dc63a33af2c131f193545624771e25444e212592c45b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ko/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ko/firefox-60.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "5272a4d40ef663ed9f9774ce61e73a5f42be4ab08222e45755dc400e4a596d91f7833f7510cdd199932baa8eaa54fe56458513517d712ccf24bc1b40ddf62c2e";
+      sha512 = "21f8dedddbcc5da3788abbc17ae07c422b2f1476fea3c45f173376b1ba38736f1a85b7d11bfc0e50ad610d605680b3333c39b18b89e9e4990086a782f8559881";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lij/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lij/firefox-60.0.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "cb09361665412b9c5a0865d59197d0f7234a5005a2e147010c7d40f94d749e22719d150da70e8e415a9f9ff3f01a0f0aa9158d58f45d34232f4d6d40c6b7871f";
+      sha512 = "706bb394d90ac405773448cd4869c8880a649569d15af420e15851131194a014b0b9f72a9b60b2f621596d4215f606b3b81e0409ea4eff5da0c04a91691bd99f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lt/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lt/firefox-60.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "f5e5ea9eb648c3d1c0363f275a1d262326cecb3e33f539614242d05e819e4fe58276eaef58f03f088c4f0bc8fd416e35c4ed5303f962daa80dc9fc7e90b6ffa1";
+      sha512 = "6cf1735fb80b7fd945a2b993f1963ed14c903791dd720fb9821a728251b0c006cfda12f80f55e96bb821c7988f7e73144254e7e3a3c92a4a66680be9293771cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/lv/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lv/firefox-60.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "97bb94f1f8e30acb1f86cdecc272f56bca9dcc617f02e43fa024a0d9fbb7a111c01245e578684570886bdc67d706c5f41d02fec7cdc7b298467241a6b5ae9a1a";
+      sha512 = "5feccbfe1088ed569e67e3a54f9cff0f7fcac91dccb8fa447febfd96ef2a4f25a2f51b8dce2f397b2b09fd8654bfcf292339cc5d25140a1892894425f2d86e3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mai/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mai/firefox-60.0.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "00fcb9eabe9779878a8b73e98dbf025ea5d69adc2f84d828e3532257bdcacc9fced522228c330b3286fa9a9bc11806227c698dc4b6bc87482e838974652a8d77";
+      sha512 = "0b75fa47591f6ed9cdab76ceda17636a7f666b6469e2fef948d29c77f559328320cb1108105590a240a0004976cc922439eaa800a5234f7064396e2d56e5a45c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mk/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mk/firefox-60.0.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "469394ce137bb09223123e84b36a2f6cc3f4679db831e787b26c674045025eb96c00e68eb8ca3c18dbcfc41ea91c31b4071c3d9c392b1cd5386e3c4b92352799";
+      sha512 = "bcecbd3a82a66abc1918f03ff0c5da822526f3c1a8ad72ca9a021d5c036a382734251513dacef9ca6f290b130b67edeea5a79a37606ac34f34b27528ba7cffac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ml/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ml/firefox-60.0.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "0736b067e98e30c411e2996428a9abb596a38574ed6e2225cbb2e32ba3ca5c7793281d019f1f0b73d6fa9861c9526d7e504f49fb5100ab93d7b625061b356754";
+      sha512 = "14d844aa0c430376d17224e0172234bf028f1bdc56b931aad2455c221affb93f1048866b8bb3418dd10fe12367178e7504842762fa9fff381a21ef8599bf9f37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/mr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mr/firefox-60.0.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "bb34429687408dc07c24959c93f38959ff3f3ce0804f1bfd33df9ac7f2218287d6f3a63029dfd73bad6aea47fa132cabf716c50c9f6f06258fb4fd667ee9b186";
+      sha512 = "b25b3aad52c6670c27c977084cacaf526b4c64b24c679dd7f45f4ab583a80799912b6e6b9eac195ba19c94d70dc5a1fcdac46e2c1234fac777d706fa51008221";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ms/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ms/firefox-60.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "a96e7f57519a7672feee1a4fa84f6bb4de31a5a66d79905413ce8502d9b272d2e77bbe92a36cefc5ee050e8099f314054c81d440a73a2787bfe02a097d6e21ed";
+      sha512 = "5df8c5ca3e8dec6b84066ce0c4e2db00d12cbf7c0c51d229a88072653166359652caf4c51e7470f06151d9ddda0075f8f53eebe2bd83e25bec9920db7654a97a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/my/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/my/firefox-60.0.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "25ebb5e15975848a1e66eb1ef6494fc42d5f8b42de77fc6e66313a0d00d5874271aae0cb883ee1f1139f9664bdafb902a3cb5fc73d2dc64f4a97ce686137bb12";
+      sha512 = "eb35f499f6d2ad6e71eb780767abef864b2611e8cf83669e1a8a08f6fdd098ea183234e157a5ea442773c45348b13c55b2811398a2440d5e579cf57ffd1620fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nb-NO/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nb-NO/firefox-60.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "b2281d8946e6367f9153f7201c2bf021a1ff20f69fd6a52a5074d195f8c7e1936ec811a57cf71f4cf10d7f128b6ac0f5229f1fea4fda3511d6e113f131f210ee";
+      sha512 = "bf8b5d719d507faed5f2f9c34d6a78471b16f0452286ab3f79d63d516bdd6af54186cb4cd896d09400da51ec4a923f711791e4040048ed546a0d30a065dac129";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ne-NP/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ne-NP/firefox-60.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "63c6772968397c738f4866ea68d07f9aa74f0e593010cc80a613f4c59713e81f29e6715caafc91a1e8d68df906abfe498146be1cdebe56f085cbf576bf26eeef";
+      sha512 = "e389da15177b36b9f480630e88491252b37ae1c4b9874804eda96a259fd8d0dd5c53975056246dbfb1ec8b5d47c90a9eddd2dc665c19dda64d35fb1af4d1a531";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nl/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nl/firefox-60.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "bc75476bbb8791cc7b67f0403b31efe165775708961b849351cbab604a828e4f846630f9c4172a24a519cff0ebd2d86ba3d498659b1a4fb81554d0b3cc4da9b4";
+      sha512 = "d4b4978889d9acd79e60c05f9e088c8850ef234e475bc05b27abe79596f74db47da748fa228b0b9706ff8f7e747b28edda36555dca8a3c8a70bb3a2ee147b8cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/nn-NO/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nn-NO/firefox-60.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "5baadd863abe9c385b050e55748785f6d0dfe539781327713e0fd746a4546b7bd86b9b4ee2281092e733594106028ea36d37c254705f5f39447c152593c74035";
+      sha512 = "7f27fefba306c82b7227889f56059d271623ac40af272ecf810c53224cdfca8a79225bdc1dbf267be8b8a4db4a5c870f5f969f0e30cb3bc6488c8ce101c43bd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/or/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/oc/firefox-60.0.tar.bz2";
+      locale = "oc";
+      arch = "linux-x86_64";
+      sha512 = "f5dd23837b4c6d60a3efece4f70fa4ad2c69a0d560d2dba884ca0bf004619c26aca11348e4eaecebb0a92c46a835ea766b09a9734f7ae34dab88c4849aae5151";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/or/firefox-60.0.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "bb444d06d25d782923803db81d446f12324e70d13daad1d014f4d938d466f946d6922a5f21a560e4c82e9ae27c3ac72422875518f37bcba268f7884c0de98d86";
+      sha512 = "f3224d03f3a264498167e62fa8df8b1d4ad0cd9de07f9bfe26eb85977214a00d64daa0d3ed8ae9d2d4ba30e606bb006a0399918dcda34d6eb5b9009eb3db6dcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pa-IN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pa-IN/firefox-60.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "79881db61e611083c35d2730753ddd7d06e28e5dd1703fa5b500562ad66222d0f3b731e1cc475760cc726e34e12585c3059025f60a1a7a7c512286a92268313c";
+      sha512 = "47b347b899f7300a9bc9fb15f00ea5b05ed26f422b4836d24da1a795b8f35fa8cdce292fcd92b8730e54078318794cf942b27425c367ed4090f3ea9237611cb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pl/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pl/firefox-60.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "33c8a94cde2263b78c32ebf7dc8646d041c8071e3f26926776b7cec635cbeb7aeda74b31e6e59de186cf1f9f929139e1165635e6340fd3f3d56a400722d3f897";
+      sha512 = "844eb1c7e46ef7bea66317220a6a57daa0cca6022457da4184550974cb9f616bc25ea01ccd8f158c3d195d39e74cab4d04f51d41406a9cbaffb423c87ea24b3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pt-BR/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pt-BR/firefox-60.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "a5e14da9ea50e92a6e48bab8f0626ef6a155eda72cc0ac068943e948c942f291d36a5ac4b06e802358153bdfee6a7278b524834c3e5c79c8f4adfae6c7877437";
+      sha512 = "ba3418e27df6f0e037c37d1afde5e96c5415257fb0ad70f95bec98d50084f8f0aaf1a5d8752163bfaf00b390db6d0dfb88867d3afe48bb246664e7a9361b2d87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/pt-PT/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pt-PT/firefox-60.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "991544ee16e1cc3b5dfe3e8426f2f7ca47d72003f60efefd9947b2cb72f614583225f81d5c49ed1bc72979ca548d749592888a01778c4cd8d2261c69e47a7cc4";
+      sha512 = "6f675e939407e19ddea4962e2f8cb0fcfc7f573ff76689d1f434416b02024bf8786ad78b03fcd4150301309fbfbb91be078340a47d9fa413d2312c6b8aebdb8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/rm/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/rm/firefox-60.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "6f2cd65aa98c546a9a19144dc24da9cad112fef735618b5ec23ffbcf32ba4bd515838fd0d8f2147a2193b3146a913a2683f23889fb913e62bd26519135aa5f12";
+      sha512 = "d6623710addc98457977ff62337a3aaccf1953874e6df5fb6d4ecfe2d7650920d5c1d4593793f37b5397e688ee3e745ac7007f3925e0982b7ce168f5a1fd90ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ro/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ro/firefox-60.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "4c1704d334a76c62c5407dc433861ca2afb063830703f5ed2b76e987a42935bc569d340f8e2e9d47efaf4e27cf820437f662981a1734a9f65022424847c70fcb";
+      sha512 = "38c6a14a6ac375ce700cea3853b4fa208929ab6814bf2037c2b9d03b15d85ce81833c09e889ef5a8966c61658055fc11e4d1ece2a16370e7436adb52ab321bc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ru/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ru/firefox-60.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "a3e941b5f14d1371c1321353566460b03546a9eb5238c72ce9fc9a06dd4f4f91c616fe15efe553cb87765ad64e71ef2abd7ea4ed8931067575c45d86a88c5348";
+      sha512 = "730d26ce8e54b9b4e8379c475e6db9bfc293cd6bd233f566ac54ef6512f3f3bcf687b18f8a31f3869821a9fa1d26cd8e6149e3721b5950ff7633a645df4df8fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/si/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/si/firefox-60.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "aa8459ea3e1318485e9b73caef32f87958072a0f067bc86ff679cd65b58190a6ed358a7b6c9b1e59512c2a204cbb6545ccdd9178c4ea8fd60d003914872b9575";
+      sha512 = "37b72c9fd02ca03087458b58080da505fd334fd7059291a7d83557212af0e30273ef002a3fdd9a8797e76f1178fba731c127a28051b1bbf74f570f13d6d8064f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sk/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sk/firefox-60.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6759a550e8652902e9de653f160d2e50e89cfcd2328a5eb47d6dd79cb71326d88263ad0a820183b859b000bcfd575299b77107a0c409e92397918539289accbd";
+      sha512 = "5ad4c596575cf5ee63d7ee6c9df3f9b9dead8fe41fc66dd09c010755d069f2c6dc2a920ce4cd82f23df7a22d600aa502b3accbdb05976ad5f08f1ec19772fd51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sl/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sl/firefox-60.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "6411d82a4a8cd9a710c755d8f588b4e7b936bd3f14726a6b0a8b5d90cbdda12390d9fd9f99b01b9a595e20c6a3ae50d7c5d7f242f542dc1f3a86b0051c3ea498";
+      sha512 = "5c7181d319b5bc4c9c731640360fec12a862975fb8d6b59f913a9a113b88a65ab3b9db9ff759f9faef6088f25c5f59462f0f82b62a8e5115836f498289478f6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/son/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/son/firefox-60.0.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "dbd99f23a8bda258cebefeb680cf205c75552850e59560d9df2683070c79147f5063fda983f95a5fa985732ae369007aa0d57bb1997e3dcd11e964c59fb9f46a";
+      sha512 = "f1ff760bc5516ac6a5beb251d541e38cadf0652ff51f9f1798b9677e9d3e33c844d56e6397288c898ba38c6bfc80129c7318e1e9cba3ef9ab4b9f07405dd628a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sq/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sq/firefox-60.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "c2ff4a76aec95237747f740f052b943bc92009a232ef4e77af66a2e7afc26fee15c76b45e1dfe4f10a1e62f28e7372ace069200f93848dfb3fde71b85953b2c8";
+      sha512 = "d57cd7cf4669cb537d96d6b9b4bc81446d7e54d6cc294776f2155b1280352289c1afc3d0b2744973280bc980c4f6200a0cf114e449c15c339535cb30ed153766";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sr/firefox-60.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "b69a111b27d05d88e8416ae1f8f0e3b2e48714694bc01fe14a299cd9ade7fb8d6b16e063bfd35a7579ba5a226e6d47872639b31f77bd4db7237d54277b0d7628";
+      sha512 = "2aaaa459fc730feb75428dc4af773d001bd18fd0afbe564d919925f159cd95abc22a21db9919a0c3f16f12ffdb30e8f0d91c0d3c113578804c35a1764b86af1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/sv-SE/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sv-SE/firefox-60.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "16c23e86ff3f22935830c500acfbe6ff7d4d41f0840328407d540f17aa48c5ab45032194bbb5af9820dc03896b683e09e016a9ad6d0c23859524bc4ece0d16c0";
+      sha512 = "223f00e509c53a88f102c2f9da9b75640bea329307251b59aaf2ccc759fa0246701b1877c400f3fef2337099f2c070f33ffb92c8313612a384e7f5ec7cf66ffd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ta/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ta/firefox-60.0.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2aecef72d4847e2cb1bf857f8c3375c14be09c23b9ff211cf908c56cc1b2e4f5e20019ff7e6cbb0be6bbc882663fe0d539e9b3c7e3543e46f348d8ac9e829738";
+      sha512 = "910ff3e81fda8c94989b3d6cefc5ade22ff0dce21a81907e84f1573d631253ca3b3f45383552193fb46875e09b770ff8e28fe945558fd897bf0b64bfb4e01004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/te/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/te/firefox-60.0.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0967879b336d27c933ba606de57c3b60aa9b61d6bc01bf2fa0f5bdd43a08299a6f15d7792e1f4abd641fc9296c95a1ab874af8256292074532f7c69ef0369997";
+      sha512 = "3fb89f3620d5a39a44cef228a9fdd11362bb3bff59fc64815468376221bc151e3538f929023fe634a163e0c7ec47c45c54388d4f5dc911b53a3f2565caaa6edf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/th/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/th/firefox-60.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "81c57006aea7a18ccc8e42299dba497528680567f1cb6cf96b069f2832eb8f305fbcfdcfad1ced9d90ab89a59d8d2e471da427fe4b3e77a88140073b0b78c4ef";
+      sha512 = "78a66d69b6225ee29c5c1084c9059a9f1bb867c22886ad42e628fd7e0316bc2eb8eb02522972817508557f1be5369e00ba489260b7b6882a4f12448808b9af16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/tr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/tr/firefox-60.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "df076aaa8e2478d5c7f4929c9c798dbe18d21d6601c48651653fb7f134f6c2c379e290168b0f7faca4e47ede8c571eed04e1337702787f0f64d4bc84aeba1d27";
+      sha512 = "afb9c372e5b1f0f69c53b4c0ea9dcd8ba73672c163bd63cf88b7d8c9bf24af3656a924b29c6b3e28f826ea710c452cde789ee68e0a80bf269b034428ca2de577";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/uk/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/uk/firefox-60.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4c53c231aea6f63312fe8b218adf56b2012921460ef1a82f32a9587db9ccf74154b04859d26a7574c6290d492c8189fab80990092f289c7e96f24337689c8659";
+      sha512 = "ff3cd139b34652446807063c4d68f4a5ff8b5643bfe786527114a11a4cfe2838f64ff151d5d77ffc9c51e4b057d3f1058dee1dde521ea95bc9f17392a641c5ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/ur/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ur/firefox-60.0.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "278d330c4409e931a02f7585dfd0185f30a733afa448bc0cbcb471bb67c41b0d46bb229d8c480342604201639b34d607ac0433c093d0bef205ef9918ec61b966";
+      sha512 = "f075ecd1d15e9737ea6079c2dad94f7e3bda9503ae8a17f017fba27c166f1721ff9e5956c3a7a3704594d8f4154f9e11dd2df19630aa735aa7d3e533283af43f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/uz/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/uz/firefox-60.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "a9a714b9a9e9439a12be8248d9fbd9d92dd7ab9c12bc0ad280b9753f2c369061d554129404ba6ca546918b33d87731623926c15aa908408392d27e89768027f5";
+      sha512 = "8c885715f9df669d79fa4c0b0bc054c4e760916ddef288deda943ce372dfc85693a2297ed591b4f540f618e4044321fd3812c9fb037561969a11a7b472dba2ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/vi/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/vi/firefox-60.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "de35687482f7e2cec359a8878bddc9facdd612fe077cfeaa9dbb1db8609727386b575b63afda66cb301902f3e39a6c7b703d46cca3359529eadfce7dc446a934";
+      sha512 = "19b398ae13e9cb74f61fbfeefe68fa8fcdf8785fdba2dece9e2674900cd9ab71b401029e1f1fb91174c9996e65522eabea975d3bf9d46de0f76c29d0ff6d3812";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/xh/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/xh/firefox-60.0.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c97bd14cc26e6fade88ef23abb6cb211634ca65f37cc429327cb1c48bbd2ae90123f96d8b395e5490eafb795844541f04d3994c391a2e668264e70dc6194721d";
+      sha512 = "e236beb0e0d5a7fda5c6bde0141884a0d5e09628e579ad0e31280db64d2f373946bba15fa1fc40a7c5ac7d468896d9e7af41b587378a999dd7fc1d9b89d7a11d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/zh-CN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/zh-CN/firefox-60.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "eac667946684308e4635c6e855a7c34ac41b804ad688dd2797dcba0ccd27bffc5174f0360ebeac5c3da1735b3f8fc43fce52e05aba94bdd7d99089ccfac157e8";
+      sha512 = "d4865b13e94ed4ecaddee1458700ad6ac3850aed5c5298761fc1dee3b483a302a60256ceae15fb0b8d2b212420aedf1e66345b951dc90e5d8368242bcdd0cebb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-x86_64/zh-TW/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/zh-TW/firefox-60.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "c5b5565ef561c3b62b3a20f1b3af62a42c60f51783d1cfa0552c707b090834666d530ff579d7ff0b72b7d8b792b909c3c589dfbf377c8c9c56373ebc37695300";
+      sha512 = "2165c1971c390be50a8af0e7a17766952a28c62355ac6c017c0871696b4073dd164795b3a347c3db99fd6b625f02c7e1ab8dfedb48943bcd50a1fcd46aca797d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ach/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ach/firefox-60.0.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "e8f63441044b74f377a7cf28e26cdb26bbf243799361d254c01853875318f0bfc366daca1bcdf49cf8e7e888c8eb154712c113f72f000c14eddc662e00888774";
+      sha512 = "ae783339b7f51f9e7fdddd36086fee47545b0624d42498627b65233bdc157cd30b2efd2272e27699e495b617b888c6c0a179d9026b7e22b5f96112f9cb520837";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/af/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/af/firefox-60.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "f2e0da9b8c395ca966f9fbe4500990f35188e599b5e6b5a6131b717510b7593db1aa6760308e10b04c0693fef7aba00e1fa9afeda7ed27bdff1459e9cbe176d5";
+      sha512 = "8591da90fb08f30445457e84464219f47e685b973b118829878e5c9bda41a58296190f34959549bec9cfda400cf4dd29b2bff99b8411a3f255b04da4f67789b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/an/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/an/firefox-60.0.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "6971a436397420c8832d853fea0f36df80422ed96bed1bd7c8e0b83aa61e081789a8458528a0b8005056ab37d34a931a13dfa40c0fbf544433ca7276ea18c460";
+      sha512 = "f60502441cc1d58194329d9853cc5d893ef1255dbf0d07a9344d9d49ebf328473bc978a5cd8ec43de5b57751b698774e090c2ee471ce65423f5a33750262c280";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ar/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ar/firefox-60.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "cc770512915404b138e9dc0b48070e3986a4eb00824b65e94788ab78462bdd2f13ba2001f7cf57b56eca37a712a6bdf88a46effc9aa330fbc8244cae82aad674";
+      sha512 = "c0174c009dce15fc2836d28cf80063e04ce34d12c04ce2230c5a9e01bbdcdc8073856601db45158bee68b410c4b9d9c53c78bfbe24c8293536c866b2cd13c3cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/as/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/as/firefox-60.0.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "b0407f2700faef6d8dc87a9e2ad6ad6aef8f5bb88aa4940fdb514be1b568b2b5b3e9ef7ee340d167a37f410e6aabd02bd74bb5fdd6c262f50f5b099ded5ec42f";
+      sha512 = "19f81fb36908e5959818c74c0534d4189025b061222bcd01745033891321a2931ffcfec76a893249a8e7026489ced55497c00ef0dab156416a644a9b88c72a05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ast/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ast/firefox-60.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "0f4aec8ad23012e0001fdeaa49e0e526c4f15b8dde73b6fb7d29582eeeb6ef8e4833b3cb0b371df745321e612969336a30852a449356bfcf7a0e946025ea0a93";
+      sha512 = "a9bcf4be3e09509d34f70ea2cbffd4ecbf3aeb15f535080851c63aa2cc8e473fcc9453ef76d25fd525ae79f74eb76a6269919261aff5e8637cac139587b92c95";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/az/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/az/firefox-60.0.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "29f3ae8f53a5c7eb4c9c2e4c750b9c2b3a11cf519ee75822442c862023b4da960c2b494f4e15dbcf1bf80a2ae237426c99480f3c2eabd733b68dab6e5b33b288";
+      sha512 = "14dc7149a69e6dce184e4526cc31f1a8d2f5a833c49ffd1c0ec51d67e8746d27334fa49abf9d487b7656b9f1e71ee0f24e7ef69b9888e6da640ffeab1da12ef0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/be/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/be/firefox-60.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "2f776f2a6d2b5ddff6d487df2ce71c9896b9f411fc4a7fc4e9f8c6a4c89bba4301e759754771e628aed2db51ab478236e860a2eb7d915b3f9e79291f5b1c8ce4";
+      sha512 = "38dc8e028feb9a523190346b01b9342e865af18db67eda7dd65189087ec1302085a141c708da5834339f5abb36e5eb91cf727eab1dd4feca3b4fda8035f8b423";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bg/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bg/firefox-60.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "6a16d832d8398dbb70b3ae5d9e7caf36ac03f85862338f96809e83b408363fbc7563556287ecee3fdf6f62ac575b8c4f4f79aefbf80d5239394beeee42a518d3";
+      sha512 = "d8f0df46d689c512996623657d3b2e893d2a465bf22be0679c1ff9204e8e773172f6a857d392fe2278c59c44e91eb588ba4b035b1dca1540ed59645a9d8708b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bn-BD/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bn-BD/firefox-60.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "8df02f3e41c38c2ba9988d17611b43e8c7cd1000b579d767d4ba7ec4fff29208c61e9e4b618bad9024c7e2f082cb9c5f3e30f0dafce9833928cfbc8fa7eaf256";
+      sha512 = "98902ccb5f3b34e3dfcf101c6f1333428a6a1579d5c5c390cfc134fcf64ae0b4fdb493094bd654c39e9e6708bcdb1ffab377003544432a73e4d80c150a17e871";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bn-IN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bn-IN/firefox-60.0.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "3439a65d5217570b92d7ff32d868b5e562a88d8973e644f3e9a0d0bc65ce0fdf9c2f31a028cf4f4a694041c57f080cc2bd9d4d674d48e12426e9a53df3a224d5";
+      sha512 = "d2582614773a08192d0ef87eba9392dc4023c15affbfd14227b642ff93bffa8339fcafad0ef0ee8428c8d5f84a4e84f67af376cbd2e14f187c37a294e710dd12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/br/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/br/firefox-60.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "433e5b36204f2350f39ea985e642ff5b2e375f08b5034167f353cc29c18c07d3e6cf9a8b0555f265dd8dcf55731ad472304f077b9abd0ee6ed1e06ea672559c6";
+      sha512 = "62457d015c193a77d12bfe58dff76a23c8b71e184965130699d7d97ba9dcdac47cdbbe9858e5a571185e4c56621f5aa4d8ec01a8c081f6157a98c6ef68ee90d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/bs/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bs/firefox-60.0.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "eb4a09ab24c0a25f780eafb544af4e8622d96fbbc417b0e967fc927bef222638d062a348e5f14bcf3e7485bcda1c0d7fc04a7fc61e1b3bce7487fe9f760ba88d";
+      sha512 = "5fe3bdeabe8804b4604440541565fd45854c82f421714a182b93f5b455935743ccb8f29d7b177316513a3f86bf31f549bfbda296c68f5808071dd3f74744fd4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ca/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ca/firefox-60.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "9f5f05299942911442386a6c86bee3b38e8a312ce331d5236be6e00900a8727cf3952bdff45fbbb0037f60b5a1d865e26d46173276466f091f4f9d8709cacea9";
+      sha512 = "05240abcb093d8a643e636f05fc24f58cd79aebdfd9050dbea00cbec8f25bd61f521f4f85492df0bb4b7db1a69b0d73a322604a0d3741ebd88a3c961495924e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cak/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cak/firefox-60.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "3c32f5932799d9b9ca1b28acb77495e8c326990630cf84b051ad15853c419d4817bc101ec95551ed33e1cfded60620168a7915e3c1a6978f472ca38da6d0d5e4";
+      sha512 = "9bd35d87ee4b3e0d867088c5c788c3871ed6c1bdfb5443d7cc4c88501a59a2cd16d58ebe38343d7e9789292ef9ba1392d7a26d86dc56ca916330cf91e7e859d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cs/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cs/firefox-60.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "9adaddd0c480574ab67afa9b9149904c24ea396494649b113c19a33422f204dc23d9c8b141d7b155cdbdce8226a20a2f1d54a06f7fe68bd90bc3aded007b71a6";
+      sha512 = "643daf0dabf25827872158e746355b2cce1df12b696e03e2e1e1ee9beb70339eae1175c3eacb31bef8af45d82772310bbcda00fa4d19219421c636a79b85fd0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/cy/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cy/firefox-60.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "7e9acff49b9713eda7eb4323ab2d829622fbb7a7795ac4013a1a5f644dd84074278989e416744730eb575b9eaa2c6ee802aa0cba735d338797afadd5b3121064";
+      sha512 = "3742cf47692ef0a6cc3597678601c260bbbcedf1828286ecef73c55b51113b63954d8f1577050f7db647fc5c520c080fd476e2b714c1c7fc4d2a2eb7bb5ef450";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/da/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/da/firefox-60.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ce57898ac9daa0299456a65ab8bfc84e549869b7ed0049e6657370ee4591ad4208500ce76c3a45370dfd7669084dcf5b5611177a61189e9cb00562dac4575345";
+      sha512 = "500ac0b682d60e92a695da8b63c87414f2d86f48fea269946b978fe2e1adb79583c813764d039e2201736d367c86dd91a2ca62a555d3355d25b7c4dc96f9fea7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/de/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/de/firefox-60.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "40304528aa2e0f7991138ae096372dd0ab5094ea4bad4eaed40d589f43e892ed092e6cac724ef603d55a96c8b18ebd6c96eccfe1ffca05ce79786c4df3b0e80a";
+      sha512 = "4d0e210832d9a3290271b804bcf3a64c125764c6236bb84af88988c8ffd0aa57ba7e1060985005100476f36a4a93da93469717634665a634d726a1eda372cf73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/dsb/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/dsb/firefox-60.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "8e004141d679f98a4045b22dee36ed8860283515708372f8231b2ba73648424cdce41f8ceb6ade33705d18dd70a7afd3a8f36c07d79c1194ea8cd55e82da3581";
+      sha512 = "39b5f2aaf2617a021d15a9da5a3bdb9ce5e56b28e8d61d7d422d5e95918fe10b5608aeb255595f9f92879fc48686337dcb93fc5b8e4a04610523156c8097f579";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/el/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/el/firefox-60.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "8a61347c08e80763efca8a76338a4fc7c16ed0f9ee30b0b0a3b0c381d5788ef9961e7a39373af3bc8c9171b463ae481e56640c3548d6240c41a51765bac133ce";
+      sha512 = "bc8d884f1b850d0b76625d4abf1a919481d23a0632e89396ade24841d7bbc9e23eeabed768b7d937bd7d69adeb2146551e25065251d65021240459f197a6d533";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-GB/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-GB/firefox-60.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "a48d79a2465aa99afe29d83f12822812dd80c1e8d2053e737c7c97dde49addffa38a9987d36c3b3fdf82e8d1f076d4ee8cb0fdc3a3afa84a61ae85fcfb25fb1b";
+      sha512 = "905394e0add0e530b4a0202237ce6c77bbc124543f2fada77ff6d578b52deeb90861ce4b7df907b9be0c12863b4aea9f545ad55729b83e713cdb556c7d1c4404";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-US/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-US/firefox-60.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "24caf749a1202893753a791ab88c100e91a372f05b600f53b0668eb17a0772cf3a404609c46662ad545a789b9f326c1f157ff046e1407e6e02e498e81a8282b1";
+      sha512 = "75d3f38d13033717486a7b9cd686cdda1dc15d2064f47311b1bc4c7cbd4c1fd783fb1b8298751360f1513e74dcd1f9eefd73967fb248dc52e26bbc92f5914b3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/en-ZA/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-ZA/firefox-60.0.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "b156d3f2b266ecca8d767976fc25c8a532c96029384cb284f496d2c45e96da0a588e9c5ba8daaa9cecdd2074c40d1e2f0d4e4c010eaeeb04e8e806a6d8158222";
+      sha512 = "9ce1abed9f7bc0debbd34e70c036ae48afe36d87b1cd4df108fd5ff698b3d8e8b32cdf5c8d9ba8b9bba2c7113eddaf9f7a5d015e1b908b47c98f066bff644b40";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/eo/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/eo/firefox-60.0.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "564ca3321c9349e73aec5695bf1af885bb2bb4f802d6580f82aad5a3c5501ad38d40029cf03b1a0fcf540296dfec985eb5478a0a9f8244244292573295c9059e";
+      sha512 = "bf671aa74bd9f22d56864b46d12ac131255c43b2820cda77264f08c48223627e4dff88872240b39d6404a7cec2135788ce5b08506eeeee571c14e2d933d8eb35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-AR/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-AR/firefox-60.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "a8cb0ecc609919d3707fd5766fa64389c8ccefdc8dc395fde64c93075d7c4b23a3a0a6cddccd612d04d2f25211e05e744bdc59b141211e1ca6df1db4de5171d3";
+      sha512 = "b282c35954eed46ddf46ed1f0e0ad52440811f6bb0b351337716eed5bd595c519792853003a6f7a742f83beb5231abe8f11deaaa176febe2dcbf84a43eda4077";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-CL/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-CL/firefox-60.0.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "e38be1cb60807e75f6d68864a925e11abb337ee909359dadc268d57352510a9b4f046ad3dd8dde499d771a00766de7d5a20a79a1d4b8aadacc63fe74f7150294";
+      sha512 = "278245defd36da337383e6970b8afc59c37b207248638db8947a8fa970ca025620dfa8c8045ac2c0f53b4f3e8167425c2f6dc2071574931b43190560ca511ad5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-ES/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-ES/firefox-60.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "829eeb7a4cdc8b58e0dd558761817681cfab451a977c13d1d484d1aa350fe8f88be0c87eb81274ee766c1315196c10245dd7c4f227b42246ba96b8aa09f94735";
+      sha512 = "f0fb467bbace051bc229fbe07f21f29db492d35f3901cfa9b488c72f303a5dcc85a7969517165980ea7182a85c45a3758a7ceedea3c51bb8a31b9e81ae197214";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/es-MX/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-MX/firefox-60.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "d62b35f47e3c40f698d17d4bbde1b545c97c39dca80cf15c852776c52e27c7d36bf1b6451a31b1e00a64359e16110a9917f412ad576027f4bb800b055b158200";
+      sha512 = "9a0bfa7ec953da8564b34d0e17efb6935bac51399f604ede83f4c0497494a93ce087ea35daa8ba0c52839e8722ce3bdbceb2e1ed17810f5816c5dbc9778bcd72";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/et/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/et/firefox-60.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "4c3d6e2bbc8d77f51b6d28fec555b746df955c5043c7ad0f573e81dacd7f651658483fbefb0442458449104468ecbb1af4a5bc815bf9f43fe0ce902365e70c18";
+      sha512 = "12209ad383627aaafdc4a89b462494f23eb239c736d5f3a1f2541b0ebd5487d6348ac63ccfd4da40df9c8bb929c02a9a54563bd6c53ec5dd87edfdeaece0bb5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/eu/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/eu/firefox-60.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "bce4a19bab38960aa3b96a74c41bac79f449e12adcdf5ffc97843d0e85555bf49d3e3d4d691a4fb2615a359eb1edc23762c08830b9817c43993e6832da1e071c";
+      sha512 = "afc9e8e0fed835420c385f0c19e81d1711a8c99a7b02f1a8e09218ac2a30aac6380ed88040e96a36edd39a057b98581cdc3a043d6222aaf30bab92ca81669729";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fa/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fa/firefox-60.0.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "4d1fb11d8f7c4f31bc4a8649d8c68ee8d89ae9f56693f58d48c46c312efa41d716d894a3756f174ba7a4c417b2388cb254e941354287eb60ea9397584e271f2d";
+      sha512 = "6e8821bc7678a1d486693b2043031064618ff06309cd5b0dcaad0c9b712a312e43cb948bfa0e5e5af1eb54ac8e258bb6a5464b1369c9759ac72803709f5d86b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ff/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ff/firefox-60.0.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "8b63609ed0b80386aa82e40bdd61eea53db70dc451e5ccf83290bcbfd2a88be781918b44d95a91fca8d75abc14699030281880d6826b9313ba3a61f371f0c132";
+      sha512 = "ecf9565c6d6e8442836dfb50f1ad833cf88ea9eab884dd3d2fe6f1296d6230658093f27e30e953a51c2bd6ba5d69823f1f4e3f5457cc40a4e516b14baa17d884";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fi/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fi/firefox-60.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "2ab60636f442da71b01bd293e5ec68b0fc99cb98b7de707a27f725661bddc954c2ed9296b5862afec24d9a3dab0d1da6c2beab7ddf505c0951aacbf42c697033";
+      sha512 = "ca10ece92ea7114a4c91bdebadbab97933232f8610719b5130e2658600b9ff7667834708a992500f31628249bca5c585f08fbced1e98ff31e318a20b68d3e27c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fr/firefox-60.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "422916b8a03cf8e7271ca629ded5b8fa5990cbcf63495c196782e3a8e219156d66adfad2c3ccf450e9b7a357ef8d8cf99dd1c341a63379a20adf083a0ec5b736";
+      sha512 = "2458452a4c239cdc36e744e4116791a310f2a300b913b61dee64e20349dbce8c0290e544027f0b9eca6d50dcc57561e63f4c618ef5ece9cc05815337ce639498";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/fy-NL/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fy-NL/firefox-60.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9da3085dd1c6e8a23a51545c8971d90e82c98d000f4eae3053b0edbd217879eafd9218edadb4776f592613b1f6641ab76dea3c63e30886a8fe727f282847c1a6";
+      sha512 = "51cf096cd74d98bb081f9d397ff7eebc4624bfc4b90de8000bdf07dd739a441543d631dc783af1bb8aa3c639492aa1e402541ea979fd7837535874d8a4adb771";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ga-IE/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ga-IE/firefox-60.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "471456518971454c4f85d005bea9afa64998173ec2ba164ecafb833899e597fbe67217782f4e61d4edc102bad53c04f3aa652862ebbb88669351df8ae2500cd4";
+      sha512 = "680c47e14f7c6a1abd94ac73bba738a44c0bab8745176639283efea617974c40efecf5b43538940c43599bcdb21ff6c4cb380c3c53c0c9915fc542cc647240d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gd/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gd/firefox-60.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "f086dc7c12948ab1d052f9de433e6121a43281d514d16d85163afed61eb8ab9f059e9e7e1f671d4207d5449087c9cc1432ced11322b95383e1bdfa8c9d48032d";
+      sha512 = "3702012b6a32bb9878747d85a0a66c69ee68fe2eac25be428b9e07081a90c867cafd70d2cae32b48229fb333c3f3dddc339f43212aaca29508db33f5807ee6a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gl/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gl/firefox-60.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "b5d5b475015d8c3b76310e6baa19da872ce6b5ee5d4a69b4acd229536527e5718f8a6669323b968fdb1dcc6ee998be62798bf914310b91896845e953a0c2c72a";
+      sha512 = "bbc4986b7d03bd11041e969ef8341023a95e2f4a524c6cbd2290555ced2669edaf89971bd58b30b8193dd880a068d9bc8b2c0a3b16310a678b19e3f5e60c3c65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gn/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gn/firefox-60.0.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "6bab886661997a8edbb71c86d938f3a798298c1000c4ccd0495a543f9104735d1f462e809bcd11a81750cf2743c19e476d352ac5fe99da47055c27dc35101084";
+      sha512 = "a27c80bd7041fc80939716b55c631796e2421a5bdd05843d411d6f0dda84a636fbd366cffa214fba133635332318af2d2e67f5e03c719b12368437dcb4341142";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/gu-IN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gu-IN/firefox-60.0.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "7dfeaadc772bef003700fcff66d2ffa4466aa443e1a822ed1b638f9d929d5479abdfa86de33b880eb0d89ec7f7e33474ba6644b5fb68c6708a7bd2df208c4204";
+      sha512 = "14edc663057b200f32f9a4437c0141d079fa5b77eeeee357d3a09342299643aa0ee5146c6dc2fe0a178285d39f530c58c456f8bf6533e7f901cba551ad84f1fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/he/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/he/firefox-60.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "b88a00c1aa346d1a1e1948a0ffffb79d86576c6b6c70419cfa06fd1687c4f5c124804f807e3d5db66cb9c49d168a80188c8e622dda5e6ce172d286ecfaffc3e1";
+      sha512 = "ce57395416083abb353c45050b6f6fcc8c7b9affe81d6e8504b8c6264b806ce33a44bc018918df92cfcdef047d31c67640074c63447a76c65f5928fbf6b0f50a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hi-IN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hi-IN/firefox-60.0.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "5344123a20046864605e26c388a79257d9a7b08c0ce981b7f47678d9894b710c0e765f14afa50d6ef80c89bac0ef1990a1cf51e225ad2a885be344027d583e0d";
+      sha512 = "a3621b49b47f835381df92712044a1d9d4655bb0d4a8502841761a60c8d00f0fd0288b8a6574aa2baba88ab8cfbe714c866bbb493aaa1bb382f75ca069f1a97f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hr/firefox-60.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "674a80317eb215d405a937df50e4c417feaf54795266dfba5bd4049d60764ed4d2750d390ac08e9d11762d34c80bf84d7e8b6cc58c9232f6e75268ea04316eae";
+      sha512 = "49cb57fc321b67e1b5c9e516b72d36025d22abfdc49bda180cca0194cdc0465be5c0e7edd9b98714eb3b1a7c0a1946bd28d8b9ae59e2ac4e9f45d48916cbfeb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hsb/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hsb/firefox-60.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "8c18833f2d0896d39e4be8b226f8ceda350e1c35bffda11cf0f752bf71fd130f2272345dfbf4b4d766a749b2d11624d41f77e6fcbad4c11849878a4bd0a154a2";
+      sha512 = "c8488108906636a4a93447ca28176013e161c56e86d16b535cd73bd27dc568ce22fccff1d26a520a76578c31d870637afcf04ae9e104fc6b347701d4021eb98c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hu/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hu/firefox-60.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "99c44f9307ed391bdc75a59291ca1e6b9c6e8c0dddf29c137dd93b62d3a9f3d19f23f2fd371f56257aa9dfaeebd150b29aec9141e8741f9edca4be0356541414";
+      sha512 = "69bc30e00e39f2c3ae4da333fbd48a595dcc84f7e9e2cc0691e04658ab02e48d2ac6a1e9194faba7a0c28df3637ff9d213708812436200213721136775243d91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/hy-AM/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hy-AM/firefox-60.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "891abdd7a6a671c55568736d7b25ff5c4ea37c59d7ca4fc64e2ae2f3752138ec17b91f375de636e09683fa30a252d5ff8adf7ed6f9ef08c860c54e263896d288";
+      sha512 = "155c1a34a252cb1789c85ce4d757f483cc51b62d1f8bbe6179adfe5642a9693f1d202240a1765c5966602c03f95dba5c8ae58cd9a0c98edd65da101e61593cfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ia/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ia/firefox-60.0.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "9f6609688c613fad6f00c3196122183d1480ac5a80b383e47cb1d1ffe8670d4bfbd9cb492cf0beeebcb9759f78283d6ee9b740e2d9bc2289bd72768b63603c57";
+      sha512 = "7e603f5d72c0b060404d6639858051951a4aef9d61f3e1e813e8c0167896e15a4b837d6f0eae5da8b26acd8b5899c7a557e5e259a797b096a6e6d8eca2cc7177";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/id/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/id/firefox-60.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "99dcc0f7d52dca3b172d138ea0ff2ff597c4c6c31f185cd2621acf3a1fa100c81e264993805bf74604857ed945e22b9b90c51fd19958f675f73a00a46fabb646";
+      sha512 = "82179d401af39f949057153062190214bf294445964a6d1c63102da1a7f94ce3327351e6257e82bd66c4586791a73c11e2394207514cab6b8ac76fc7f4a2f147";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/is/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/is/firefox-60.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "42c108d4ec83aafe6f27ca45ac5f32172e1481291a7b105dde8f565b8ca600307478deea0f59ad153398a78c0fb228c211d6907ad0a7a8a950dbf717cc8f89e2";
+      sha512 = "20237dc74245241a289a4a51964d19ec0ae60732c2a528de412d5ae70aebc1b58c4d4ad514109c01bfb1bbd83d4be22bfcf18b89361eeff0e9024bd07acfec35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/it/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/it/firefox-60.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e68944d88a96a4405de772c6b5e7fbaa518474e6594fb358884eb5473c8a9c9662dc67c5619d492721cf047af5244d2af8eeef7de7fb8ffc37333f2c0f362933";
+      sha512 = "d15b7b6a4e56676a45d2a0c55612de6b57a5d90558bd826d3c9047db831551893cc288771826b95a0ceb587b9bd82e5b30c914f9dc7070bb09a93073222e2bea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ja/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ja/firefox-60.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "dff549f43bc4185a7f5baa9ee0655c1a752f114c8abf51e086eb340afcc628822899775284b37ab1704c2e0435b87fc7c9ece70d878db811be2c7aac9c7e1b59";
+      sha512 = "e47706e58a216f0f468bd6972d0373c3795a33318f811064b1c7dbf78a955bc65a62f8f27d66c656b002a4301043485abeaef8c5ef28622e65bc355cb1fa05db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ka/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ka/firefox-60.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "d9291224b245006c5c2922b8bbb52411ba1852aa6ecc95969e623d68d5bae7e6c2d84ecb5d4723a3b6d0c3a48aea5bfb173f6192c4d150e0b75f7ca748883cf9";
+      sha512 = "84c141262f4c2a7ece6ae6effb47ac2ce277da9db4bf1683dfc62e78dea5a0daac52647279da7ef19e439c8622678e235fc90763a0e19dcbf156aa0e2b30d8d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kab/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kab/firefox-60.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "6e27a03b7ad1d84b1ffa383be8df8036d431f1e2a7c861a21064b553e71cf71b846c65021ae7dc49921057c7eb526c3790601de39cdd243a427929a69506b38f";
+      sha512 = "d5ca56b0d58f9acf8577cc1a69f1e0213a2d9e6c6ad70f6ef2b234d6ca87ae4b37489f69f7d8003a71a7992c6443700c8aa2739c58bafb34d3f99ecbe2b9aca3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kk/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kk/firefox-60.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "d270d5f0519b88469d01d953e01e426a7c91516e7336c1e21de82fe5b09193e41d2bd56ca06f24c843ff96ef4dc560a405bf9b1f4de66c201fc051d0e1299f31";
+      sha512 = "8b892727929298025c9f7c212da27c6941afbea15a07b5212bae363b358c05ca5373a1fcaf487e2f4f2aa5a491ac0a244e74240b22d80125140ea563432bb7b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/km/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/km/firefox-60.0.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "22822889c2406adfc717eea2ca4fabe005e055be1c6eec66b0e777c9ab11beacbb9abb3d7824e84225fb58da6214094e005946b3f3c78caee4cd76cd4e42bf93";
+      sha512 = "11326282020f7b673b78490452fd47bfd932c99ed523b87ef4d99b55a189069665d1e8cb7d39d0f45a673e1e36e0bb689b9454c9047c1f701dc1c9b18055f043";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/kn/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kn/firefox-60.0.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "ca9ef014bc339feb1c1732286762bca9b869cf38cdea3794124175d26bc1759e4f2f6dbc0167badecf3481eefdf76355d972d7c90c4890c1b3ca0268260267b2";
+      sha512 = "842005f68c58fbfc6c831a7515e0ad5078697e6eabf40294fb1c0b8bf45497549f0636b6a9d53973f64d0d522d601cc0d872ce6f515c4a488c2aaa563b70da60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ko/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ko/firefox-60.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "769b06aea04de7fc084e38e33a73b008420540c7f6ffa24f126fee65eff5f22d21784332932f9814faef1839605e6ebd29afd468debaf6800e523a63b92edb7f";
+      sha512 = "aa8bf2c373fe549a59f3412e3b155164c3f4953257f7adb6535c3e4cec494e1191f25dfff9475fa610cd3ab765c10c4a303c895c78b35720483677a87613923a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lij/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lij/firefox-60.0.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c9ddef72418c957fcb413fc19accc83987aea01321b0417af027257bf6884f419ab90d936ab2005595617bbe042542101cd09152eed23eb0f4dea49bcb285e2b";
+      sha512 = "fbcfad4fae4dcd132ccbc2fdbf7cb6f0deb49357c987c52edcf87b25d55684732b5e6a834d0263996620c2b4149e06b5e82a097807d8673a8b7df6c0cb9a0561";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lt/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lt/firefox-60.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "870563459a55d7b40718643d0c348518a10bcc48765b48899ba185d65d303249d58a365bd4d8662c7788279567a98dac4826e1e12c77e7ffd7eb927c2e76e222";
+      sha512 = "f388751a01ed0214c284ec1ef1045a7c66c7a201901ad48370d7fa3c0e06e2b66c3ecc42357c781b58f6308efcf74e6b0c3902a8db46b11d0b39435294eb5e42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/lv/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lv/firefox-60.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "c8db9d0ebab798fdec91855cb3bd762a391576cc6c6391395faf074bfc1e8b2c82953af34206fbfecb2ca10703d8a5af0837528af07de365da19c45eed371c6f";
+      sha512 = "f932a06b7667762f41c410e394b4ec5cd91116cf82a774899b48045143c6fe88840ba472d91c71f7088f420563857b185c99cbaee884acb2ad760ce7f83abcc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mai/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mai/firefox-60.0.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "4e5dfd66e44e6ba839bf59e68122fd3207f0082029746795aeee6ae8545d3ff6dbdf4f6b15984f4fb0ecadcdf78ad0f4afddebdfd240c5f75f10b4854986f983";
+      sha512 = "34da4ab327eba8076fd9944ad1c86b6e0e300df870b5a7ce906c7666df8c8ba7c76c792da7d8776150710bf2e8098a0ee9de86c273b19f6fdeadb5978258357a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mk/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mk/firefox-60.0.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "95fbf34fe70e3ca3927ad587c02ccfe5e6d5494ab53af0c9d3578ab8ccbef8bc3766779a1e7fe1a275dbccbc855beac9585abe4dc45c04d43d830a98eb5aab34";
+      sha512 = "8b92fd90754604535c641286e465b720400505e86d778d554364ba6e3fea9db038607bc0638e426123760de59a4a920d21fc4522d8e3e155f47d834ef7db4cd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ml/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ml/firefox-60.0.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "49b3270031a43cb304121b3f889a3d101828e60d733fddc4184be437236c829c8a82bb60fa509c66625268505756a799e3001d8c673f5f405bbfc5d9bde6f119";
+      sha512 = "4ce610e4b8979027e12dc07cca350f467d9f48c9c8cff1f52d08452616cab30dc8c49ce967ee49afca1c4905121d93ec00be9892b7b613736f1daced144f4347";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/mr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mr/firefox-60.0.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "83a010f59bd6c17f9aaaafab14786b8ab11ad4298e91cf101c7e2b1566beb9499990de1cebe7c721ba107f79e7e719dc9aca26bfedba230a97355689e71014ee";
+      sha512 = "1c1092ee47d62addc304dc81ddef6fa2987afd778ed8deb2796c862496bba584812a9acad11deb045c050fe80aec523de3b007488bbd23fc039767254b8f5918";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ms/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ms/firefox-60.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "0148a5ce8c124b40b7501d2f6e6102e182adbac4226c5783826278b65a2076dcbdde535819fe57076febb142efc13bd8632458fdfd54b3a7d7012228a1933063";
+      sha512 = "d0e4257f953e907c2ebdeafb7c60e3407906f908a9724ce6674842a2c87692963d0d932ba16e92ab0506cb91461ad07712178914f38feeb0662cde7b0fe035c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/my/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/my/firefox-60.0.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "5e988af0d46c5a1efe8b113194537ba711151c693810e761fe77e3cbae15994527459346abce3846825fa49eee0443149d2b4f2cdca33d33bc7791c52648b26c";
+      sha512 = "d77bce209f0b333abf132f9d8220b5d808e7aa45930f509278b9666c4f0bf03d09cd9a38752af7924a66f3c1171260a92ffee2ed550c75c304065e413d9d25ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nb-NO/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nb-NO/firefox-60.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "0dc5f04d92341f2fc3fa47f3836234edbbf1c3aa4785470f323eafb27f7cd9c5ced5301f3dbdbcf40f35bc12037b12d9c12e86b19f687372e8793c762ce1f2cd";
+      sha512 = "a1d86b6859599df2680e68e166e411590eda852923117051e28c14832c061a975dd535b11439639e44b1ea85bc4b409aada94e01bbda8847d4ca5239268306f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ne-NP/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ne-NP/firefox-60.0.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "6f4e88a48c2514f9ab2ded5e5e08842003a282c5dfebcab23183c1271d57ec765a41163ae217ddb2fe2cac7860e189dabaf5822725dd505c8f27673165e22603";
+      sha512 = "5cd668f8c4295bffd14d769557f0be86b643ade50990497d72f15f5da15e1b4e82cb9b671045f445e87987f13fc97d05d04970d9fb559db1edc0122bf08871e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nl/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nl/firefox-60.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "23ea428a562d7c9cc17199294be927c15394a098d881208c05a558450f5df9d85dd65f934b2cce967d43004797d6f7f6838340ebac726308f6e12a4d9187f3b4";
+      sha512 = "a0aac7fda38ac8f85ba341a11b1e90bb21dd5827e5201c782adc854a5b159a5555eaacc8df78bd6ccfe6945fa4502711b655688e61bf1d24748872da7830f522";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/nn-NO/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nn-NO/firefox-60.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "75bbcaa6b84da1f1aa0963e588207e256b09a68dd56590811333834e2cceeb3c24eec4deacc2d049d051005149a70aaedacd5af02ede684aa9d72aa1777f0a58";
+      sha512 = "e40c0bab77e5437c77a2db272444d0fe6874b9e153f84033f0bbc21a3d987562d77b5e37da82accc1e996682b8cdfc8eb67c104134191414e6a86f755130aac0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/or/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/oc/firefox-60.0.tar.bz2";
+      locale = "oc";
+      arch = "linux-i686";
+      sha512 = "86a2193d5d442dad54fa55d83f0788d3e30b278370ef6b5836ad06e36307b599155ce2bef6760e6c73c56f4badfb1ad63073d3348395c598e13be73b2fef762d";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/or/firefox-60.0.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "c856da11eea56f3dff269c49a70c7c3eb760b18cac6491c6ebd365dbd5f9353b51e6264c44d0cc798e4d6deab68c9928f84ba2ea2205c77251586060aa794940";
+      sha512 = "b10a8f799764a2933d6a3843848028bbd8f6cc7fbe2566550426c2f066699158f654bb6913e57585fd695bd775efa29c054c5b7992efd1110d3e7135723ce206";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pa-IN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pa-IN/firefox-60.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "c6982d378aca49e32f968be08c3d9fc6cf1fe706543bb0f6356b4107b90be1e233880bd71a32abb36a57e47d76a62b8dc241d72a0613416b755b2746fae6710e";
+      sha512 = "5b0e9b50dd17472919cbcbc04dd8edcdde706d08421723e7afeb978fb31422e49751a4377a414b330ee81a6ad0e6ecb508db28d9a6a9fddd6e915819c1895fe5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pl/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pl/firefox-60.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a263ae839be17284c8ce8bceb94fdc04d29d61fec480d936e5f3b0d67581b2fac65c3712013ed7611f61f7a054e0fff9d3cd3b97be824671a73277ec74ac3c1a";
+      sha512 = "49f9ff7f27dd04ff0c05b82b82d9f3864b3fa10cc27fe86099773e4984f6ae8d6ab8be964d345801a4bbf84b5fd28e794eb850d67f5e82d8a1a693ad77e8f396";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pt-BR/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pt-BR/firefox-60.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "00cc236a6ff2e3cf20b4f9d00418104ff7a5e0d86b21166958714f388b356022c20907ecb1f40cde695a70a088e5cddee955ee4754c9ccbb99be86d5b07ea067";
+      sha512 = "e4e6a6b5017297faff42ea399519c414530b2a281a9e8d20858c10b464e06d989f145b78b955e653fa5f11895a2b375d549bf8bad01b10fb4b8c88e7b5aab2e1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/pt-PT/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pt-PT/firefox-60.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "daaa2c6de1c534ebb04904a9e987dd190883b37254ef8b41c6d3c9c29f53f44006c8d6e6fd8ec4c722143d4d666a234ca892d8820b9b382252586f079a9aa75f";
+      sha512 = "6acb042f4e22f67afb66a2a34f7c3865b77fa59dee2e163594f87c0aff0e409d3f252ffdb1986a4f7d776ece974ccb8701c90e72ee4782ea774298f801782271";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/rm/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/rm/firefox-60.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "5ada38c5aecb0003a0d6a814ccf60043fb9caed23f143192b4ea739c004c73c6a20c8326fcc6fb7a63073c74ffca2dcf6fad2d87a1b1445b220e074781d085e5";
+      sha512 = "822ca52c4be4a5ac19fd1c0436603d587816b3771f39ba1c6bb9e2e047b8e5fce8d8b4ae5109a07c79cbe35ece397cbd9644a45b4a8dd3d79d0e5162bdc6f68d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ro/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ro/firefox-60.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "ddb9cbad7cd1d16da0552f7922433a73186e17f0f1181e415a522f1d68daa0b564c226c5b8a0a2883cf627bf23f53db7db8c4373beb366df518af457d4da20fa";
+      sha512 = "0c85d51248e95ba3a6a871b99e97dad557af06686949616990aca8ff939fdc1e4fa3414f91c03f7c9f6b8b1a90d13d8b080bc1a04af40daf57b01681efb8ff46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ru/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ru/firefox-60.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e113811aafcf713e12d225097442e4f1df2bd79f24fde84b543d3c4e3aeac2abde4c19aa98708577391c4b016c32af5a188c200954e0750dca1a4f13412da3f1";
+      sha512 = "cf2b8f766237534342c31f6227e653fbe171222caeb4ba8a234dd23389ac5fd4e1ff7a75cb9fa66d25a3022e73c148cce9872f976cc9e0f8b275c828cb30fd5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/si/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/si/firefox-60.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "faa98d902ff56f2d3978337f69cc146de506f8eea86f671057ad6b9b72e00a1de9ee90e5d7945826aedfcd996fa8d5476c11fb0aaa77ee9a7fe49b5e1e9b4b70";
+      sha512 = "4b480cec371499a48f01455a908b1acc90525b8f92a7cc0e0a4dbb7f81daac6ee60b96ef2c8439dd3e8b38d721317b07928afd59ac329ec80575e10d16579f67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sk/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sk/firefox-60.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "aee696579b46e4f0db7eef3d78a8d12d3bf7f1910049b7dec9de7f1598005ea7c9c2b1e5cc12a6258595b7c4ecc5be8cdce03e2566c539eeb0be0a545ab792b5";
+      sha512 = "415a8231ef4303fabe66b9e4f3e34ec8fbabd1d56feb5a2f7e9c63dd30907786255992f56ce340609fdfccec6eb88583c00473fdc52245456aa16078cfe6a834";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sl/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sl/firefox-60.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "7fd3522a56107f054fd852ff3ce5100276a63d423c8481ef0f90dbd87edcf4bbd71424c25fd78535a3cffb1bb273c9e61f7b332923409f0838b81d31bebbaf7a";
+      sha512 = "e3f4374669d2ef1cb029695ac2945147f7a47d6b97a711f99a0e622aa6919dc30505f19879018f6df4c1f3086937c5317ad85945770ff3cfd7d86e89bbd22886";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/son/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/son/firefox-60.0.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "302d73075dfe7e12f06bc58cbeb7aa6985c9c6c82850d70cccc0854797a78ef4759136d1a9254d0d1407dc8ef39fac5501f14c2cff24ca3cd1db14ea337ae3e9";
+      sha512 = "0ca8209e1ca51d4529b6dc20b7c7d15f8e5307a4b4b292a6c6eaabf4919d91c35a6d35694031eac5889ea17ef691f34683210de3590c9bc768bcc5f444b6a0c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sq/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sq/firefox-60.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "21f943834dc04a35f3e3f097e31614b18040ebb7decee4d3bd54916c79b5d16840d0265e7d20aa1d0a508f3d2bca38ee28046f017629c85ba49d98c2b8a543e8";
+      sha512 = "27613a71060a22665d6332b2f8e5e3c91c98a8cd3207b94a67ebfd08b8604c7bad834e4cc2bfab10f9f0897696925e19addee42eb45eaca9b358fe15136c09a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sr/firefox-60.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "48af03fb3cd68774535bb873cd452f3ee907b96cd5aa4fa662079eab069ebc57eaecaa17726337190d1e528e927aed48fb5a58de97158898de87b318012aea24";
+      sha512 = "6234e96196069614a25ddf751f820f5787e77f75d0adf91c9a479749471c75cef114d4a3816b4d63227344c4ae9915756c81e862aca3282d467f86fd42faee99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/sv-SE/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sv-SE/firefox-60.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "33a1becac255b82ec3d20d37ee4ec97975df55cbe2f3760a802021ac571b5f88a25ca591378fae990870fc03c552067f136209245a878c86d0c386245d6042f2";
+      sha512 = "3b5f8c85ffd4037aea0f8de95c77ac29f227e6ea02cbd8fdebbfc50ef6a03c6b7d31f695c7e0eb54dbd4d1d5471edf0c4793bf39e78b846c287f35ffc5a01aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ta/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ta/firefox-60.0.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "a924970ef03b4f719bec64c507fe4e4c9ee8d18188c0a5a11785798ac28bb69397403a34b5e20f1d4e0affdb82037190dcb77042f5c5b62af79bb332022aaafb";
+      sha512 = "e965954447ea2b47b949b74c06857c75b31edf724987559fc13ec25c4eb2766811da9929f0430297d4c7354ffe8bc9ee2b8ef7274bc47d1a07af3ed3f0ceaf61";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/te/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/te/firefox-60.0.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "0fbd8b103da9080c56b94d319b1e60b16a8b525c3c4071e12f390b52f870aa17db0d153c099fc77f1b70fde0302431b94549abbf713c7255a8b01c0c9c247341";
+      sha512 = "05b795c817f46fdbb1b15055203f4622fc231d5344993d96db81c98466724b72e99f8293cab8d560e9c297f7b4197e3cc0449e037096455c480020817aa24a0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/th/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/th/firefox-60.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "6079f0e2bdaa67bcef0f850df24dca79473bbdc2ba0668b59c5d8fcc23627c4156ebadff4ea01744c50a50571d5fc65ee7c680ba48f67997817dbb729170cabf";
+      sha512 = "6e10c20163819045bafd07216f7d29ef4d737bf60c9f38e4981871fda4c19112b19aa628ede00f45b71c7b549b2611c2cf74044a1d153fb9fab9b9014184bf84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/tr/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/tr/firefox-60.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "86c02b0bfb19f7461b9a2d31ba7a0f4473f52ec09350b9898f0c5c42eedb74c67e5fe3fdedec53bf9fa57497a970d286de6c1cfc141d0b0cb5deeee1df9ebdf8";
+      sha512 = "1ed74dc5b302c70c9d980f6c19dcda00b399879034f6d49368b0a859434d5ba3097360e15de8d47b136dccd3567d60dbef1f0ac20cdcea3ca8757b2dc189a19c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/uk/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/uk/firefox-60.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "63afd6b42202ac16c7c638af84b10f1f655d8144af44c79e29894a123dff2eb1f445550a82e8aeba558cf759f2aa68752461301128c3adb9d7c18f39d9f45de8";
+      sha512 = "be15de40cc87999b145178e5009e144aa1a68d6c7c422dd3f7c1669bdf8c200787ffe650670d29b2ab8230dd25a3ece9bdf9dc5b93331da96df6f28bb2388b1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/ur/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ur/firefox-60.0.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "02e1341a4ac5e2e2fcf2cbfe1dcb10f82ba726d437e5de9d132eb58f5a68ce9e13d646ad004d5638f356a717f23d4a38f25171eb4c773da953042729fda19bbe";
+      sha512 = "c4d853ce32374513df113fc95e28c26c2dfdd4e7d2f4771cd23fbad78f29068cd003fd2aad657ea582a5229ee217d3c05c2acc0ee248c10b1630c0bd8b521625";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/uz/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/uz/firefox-60.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "fd346ea8650222cac69531b28c70bbd0a069e24ef0383d169fe05dc966e5d8e523e87d33b1ce4b696b33e6182f5373e762fd40ceaaf1bbe7313c67f3905003c5";
+      sha512 = "9912cef59e3f2457126a6623f0e3913248335b29d5c5412b6ddd451aa32e455cf3d4a752f975c6b06a9a4dcbb2511cff6cb918b0bf3564c8e8c37a06f79e862d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/vi/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/vi/firefox-60.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "af4d11f8eeeb07457810e73f25d04d59131ada91c0142af486a8726c5abce26b2e16a51b539c5c47b2c2c220dd9cfbc6c95a81f114b382192528c50e431ee211";
+      sha512 = "5ae557d429613cc9bb3fb4220d3242fad8b7b5a625b01bbe662283b78153b9d96f4d27907e63488500a766606196d8292b61614d007c6c5a4391dc8f88332e5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/xh/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xh/firefox-60.0.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "06084e0b1c2e18cae797519ef3ea12e8af851c9d33c385e55418cd2cbe733d64e350958d0125664dba7317dc5579409a5dd33722bb1f504cc0406cf3dbc05806";
+      sha512 = "4fac1b8bce8770812566dd05460d7d580f2fca9b4b006c5aefe50ecb8e24d104f725c0fe952e59492d438e5c98e683bf4b55df12a18748eb3daffa59aa4de35e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/zh-CN/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/zh-CN/firefox-60.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "5b63ec90f6ba20001c3696081ca2048c6ad9b2a0f061aded8c5a7b2b25a906f95c0c3ea297b5b51db346d1af96819cdffefc3c3a0632308ec5a27a7ea1a5bdde";
+      sha512 = "0f1adcc43685a0da2e855ad8b679270be7131343f92c4f3f19048049696ce75b03e5a8b508a0d025b1348a66f18e65ccbb7def6382d3bb51152d7b9389f53656";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/59.0.3/linux-i686/zh-TW/firefox-59.0.3.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/zh-TW/firefox-60.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "164af70d9ec69685dd0bc909436a4c7dbb126716b28f0f4fc92e75777431e8a037833778ca8a9a5e35d883d940873b899ac2edfdca50be2c1167c320fb4dec65";
+      sha512 = "9a53a37523125ae165f2fd71957f748841302918812b0dea1b1b088eb56906524ddb0a3dc27bbfe7e0b9e7adec2823d5656561eed662c9239473fa21feaf8184";
     }
     ];
 }

From 38bf731db45c5736b3de387ec3a2b109f01573c3 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 11 May 2018 09:09:36 +0900
Subject: [PATCH 1649/3370] firefox: 59.0.3 -> 60.0

---
 .../networking/browsers/firefox/no-buildconfig.patch  |  6 +++---
 .../networking/browsers/firefox/packages.nix          | 11 +++++------
 .../networking/browsers/firefox/update.nix            |  6 +-----
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
index 83f9a1329bea..de278152f978 100644
--- a/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
+++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig.patch
@@ -1,7 +1,7 @@
 diff -ru -x '*~' firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp firefox-55.0.3/docshell/base/nsAboutRedirector.cpp
 --- firefox-55.0.3-orig/docshell/base/nsAboutRedirector.cpp	2017-07-31 18:20:51.000000000 +0200
 +++ firefox-55.0.3/docshell/base/nsAboutRedirector.cpp	2017-09-26 22:02:00.814151731 +0200
-@@ -40,10 +40,6 @@
+@@ -36,10 +36,6 @@
      nsIAboutModule::ALLOW_SCRIPT
    },
    {
@@ -20,6 +20,6 @@ diff -ru -x '*~' firefox-55.0.3-orig/toolkit/content/jar.mn firefox-55.0.3/toolk
     content/global/browser-child.js
     content/global/browser-content.js
 -*   content/global/buildconfig.html
+    content/global/buildconfig.css
     content/global/contentAreaUtils.js
- #ifndef MOZ_FENNEC
-    content/global/customizeToolbar.css
+    content/global/datepicker.xhtml
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 4c17f2c98069..09572ecba7fe 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -1,5 +1,4 @@
-{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchzip
-, fetchFromGitHub, fetchpatch }:
+{ lib, callPackage, stdenv, overrideCC, gcc5, fetchurl, fetchFromGitHub, fetchpatch }:
 
 let
 
@@ -19,10 +18,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "59.0.3";
-    src = fetchzip {
-      url = "https://hg.mozilla.org/releases/mozilla-release/archive/6b51784853e47e091d213d421a19cb623af718f0.tar.bz2";
-      sha512 = "0wcvs0lzdddbrxp8prg1w1g4xq9xqzvqlgs9r22zjblfnp703nw82zr09ys7jd63mr77g3rgglhi3d5k42aqrbmsx1r5dn5qqf5jlkz";
+    version = "60.0";
+    src = fetchurl {
+      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+      sha512 = "3ya0rq50cwryza7d56mm3g2h7kayh17vry565qvaq7wsi9gcd4cbjk4z7a1s4bdka0xsxg2l7v0zkaj666nbllky2462svbi8imdhb3";
     };
 
     patches = nixpkgsPatches ++ [
diff --git a/pkgs/applications/networking/browsers/firefox/update.nix b/pkgs/applications/networking/browsers/firefox/update.nix
index 997bccbe9a95..8cc03cf8212a 100644
--- a/pkgs/applications/networking/browsers/firefox/update.nix
+++ b/pkgs/applications/networking/browsers/firefox/update.nix
@@ -28,9 +28,5 @@ writeScript "update-${attrPath}" ''
            sort --version-sort | \
            tail -n 1`
 
-  source_url=`curl --silent $url$version/SOURCE | grep -o 'https://.*\.tar\.bz2'`
-
-  shasum=`curl --silent $url$version/SHA512SUMS | grep 'source\.tar\.xz' | cut -d ' ' -f 1`
-
-  update-source-version ${attrPath} "$version" "$shasum" "$source_url"
+  update-source-version ${attrPath} "$version"
 ''

From 873af991ef77952b475a8e7d5cb9111c0a69563a Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 11 May 2018 09:10:15 +0900
Subject: [PATCH 1650/3370] firefox-esr: 52.7.4esr -> 52.8.0esr, 60.0esr

---
 .../networking/browsers/firefox/packages.nix  | 27 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  7 +++--
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 09572ecba7fe..33bdb62929e6 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -39,12 +39,12 @@ rec {
     };
   } {};
 
-  firefox-esr = common rec {
+  firefox-esr-52 = common rec {
     pname = "firefox-esr";
-    version = "52.7.4esr";
+    version = "52.8.0esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "971ac97a749e5d322fec95ca1e86af5b633deab37d2d8fb49ab129c7ba20753a802c620315bc5b92a0a7ab7afe00e71aca04b3238670c4732d8e6816c645f53a";
+      sha512 = "4136fa582e4ffd754d46a79bdb562bd12da4d013d87dfe40fa92addf377e95f5f642993c8b783edd5290089619beeb5a907a0810b68b8808884f087986977df1";
     };
 
     patches = nixpkgsPatches;
@@ -58,6 +58,27 @@ rec {
     };
   } {};
 
+  firefox-esr-60 = common rec {
+    pname = "firefox-esr";
+    version = "60.0esr";
+    src = fetchurl {
+      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
+      sha512 = "20whvk4spdi4yb3alb492c1jca60p4p70mgj2bypa7r8fgjqn57pyh9rcvnci61asar0zvmlihq46ywzrijm1804iw8c4wmlv7qy8dv";
+    };
+
+    patches = nixpkgsPatches ++ [
+      ./no-buildconfig.patch
+    ];
+
+    meta = firefox.meta // {
+      description = "A web browser built from Firefox Extended Support Release source tree";
+    };
+    updateScript = callPackage ./update.nix {
+      attrPath = "firefox-esr-unwrapped";
+      versionSuffix = "esr";
+    };
+  } {};
+
 } // (let
 
   commonAttrs = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04a356be18a8..f51ac0aa3557 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15737,11 +15737,14 @@ with pkgs;
   });
 
   firefox-unwrapped = firefoxPackages.firefox;
-  firefox-esr-unwrapped = firefoxPackages.firefox-esr;
+  firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52;
+  firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60;
   tor-browser-unwrapped = firefoxPackages.tor-browser;
 
   firefox = wrapFirefox firefox-unwrapped { };
-  firefox-esr = wrapFirefox firefox-esr-unwrapped { };
+  firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { };
+  firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { };
+  firefox-esr = firefox-esr-52;
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
     channel = "release";

From c0e48427c68c7e4128f3da2f8cf49ff32bc379b2 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 12 May 2018 12:19:20 +0900
Subject: [PATCH 1651/3370] firefox-esr: make 60.x as the default

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f51ac0aa3557..0d337c92efd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15744,7 +15744,7 @@ with pkgs;
   firefox = wrapFirefox firefox-unwrapped { };
   firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { };
   firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { };
-  firefox-esr = firefox-esr-52;
+  firefox-esr = firefox-esr-60;
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
     channel = "release";

From 4320c1151d985dd2ed0fdf6d4cdb4ead91503144 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 12 May 2018 11:43:19 +0200
Subject: [PATCH 1652/3370] nss: removed aarch64 patch

With the update to 3.36 the patch introduced with e96473b is no longer
required.
---
 pkgs/development/libraries/nss/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 840b349035b1..29d6e9a5670a 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,13 +1,6 @@
 { stdenv, fetchurl, nspr, perl, zlib, sqlite, fixDarwinDylibNames }:
 
 let
-
-  # Fix aarch64 build, shouldn't be needed after 3.35
-  aarch64Patch = fetchurl {
-    url = https://hg.mozilla.org/projects/nss/raw-rev/74e679158d1b;
-    sha256 = "1lhs4h32mb2al3z461yylk227nid769di1pdjr7p0kqm2z1qm3jq";
-  };
-
   nssPEM = fetchurl {
     url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz;
     sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw";
@@ -29,8 +22,6 @@ in stdenv.mkDerivation rec {
 
   prePatch = ''
     xz -d < ${nssPEM} | patch -p1
-  '' + stdenv.lib.optionalString stdenv.isAarch64 ''
-      (cd nss && patch -p1 < ${aarch64Patch})
   '';
 
   patches =

From ec95930b20936e01d1bf1718a86af08472617f8a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:36:01 -0700
Subject: [PATCH 1653/3370] jackett: 0.8.929 -> 0.8.953
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jackett/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/n7k1adzjashxif5k4m84ywij7bh2ck14-jackett-0.8.953/bin/Jackett -h’ got 0 exit code
- ran ‘/nix/store/n7k1adzjashxif5k4m84ywij7bh2ck14-jackett-0.8.953/bin/Jackett help’ got 0 exit code
- found 0.8.953 with grep in /nix/store/n7k1adzjashxif5k4m84ywij7bh2ck14-jackett-0.8.953
- directory tree listing: https://gist.github.com/32e346c875f3b936a083c815724f8a9f
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 8324af8b3d0d..2bbb46744405 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.929";
+  version = "0.8.953";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "1dq69734f6x8iw1jpvln5lq7bykpwky6iiwz8iwwamwg8143f20p";
+    sha256 = "0jc7c0z315wh73b75fxz1ad2qy1z5nsvpr7iml4998k15sl7w7mi";
   };
 
   buildInputs = [ makeWrapper ];

From 18f09e43e3b04310f08312a1c7aada259babfb95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:15:23 -0700
Subject: [PATCH 1654/3370] libfilezilla: 0.12.1 -> 0.12.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libfilezilla/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.12.2 with grep in /nix/store/1a0qm1j932zsiysy0hjhs8fvg3hsq6cf-libfilezilla-0.12.2
- directory tree listing: https://gist.github.com/13640dfb6e0ad1f3a5005c8c75cbc6c1
---
 pkgs/development/libraries/libfilezilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 3b27ffc6d386..f3a6983acae2 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "1gbqm42dd0m3fvqz3bk53889479dvn8679zp6ba8a9q2br2wkvv0";
+    sha256 = "1v461hwdk74whp89s490dj1z18gfqf9bz9140m5f11rsvrpid33p";
   };
 
   meta = with stdenv.lib; {

From 9572c5415fb9ee0f9bc27955b3ba0756fcc0fa3c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:14:45 -0700
Subject: [PATCH 1655/3370] libraw: 0.18.10 -> 0.18.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libraw/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/raw-identify help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/unprocessed_raw help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/4channels help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/simple_dcraw help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/mem_image help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_half help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/half_mt help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test --help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/multirender_test help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/postprocessing_benchmark -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/postprocessing_benchmark help’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_emu -h’ got 0 exit code
- ran ‘/nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11/bin/dcraw_emu help’ got 0 exit code
- found 0.18.11 with grep in /nix/store/0ghav8lhx7nd7rl2d7rhyiwycmh2n618-libraw-0.18.11
- directory tree listing: https://gist.github.com/237be4ff577316cefd0205ca6699ea88
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 1213f93112f6..d70a9fc29f53 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.18.10";
+  version = "0.18.11";
 
   src = fetchurl {
     url = "http://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "0klrzg1cn8ksxqbhx52dldi5bbmad190npnhhgkyr2jzpgrbpj88";
+    sha256 = "07a7k83hx7icahh6jaxfbd7pw5jjm5i11xcqjj31b28d1aj29xvw";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];

From af8ddc3db770e41705fe81ea1a9768fa7c206c13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 06:12:17 -0700
Subject: [PATCH 1656/3370] libpqxx: 6.2.2 -> 6.2.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libpqxx/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/6mshwwzcsvpxxwn4hw9msm5ffwyy5wv3-libpqxx-6.2.3/bin/pqxx-config -h’ got 0 exit code
- ran ‘/nix/store/6mshwwzcsvpxxwn4hw9msm5ffwyy5wv3-libpqxx-6.2.3/bin/pqxx-config --help’ got 0 exit code
- ran ‘/nix/store/6mshwwzcsvpxxwn4hw9msm5ffwyy5wv3-libpqxx-6.2.3/bin/pqxx-config help’ got 0 exit code
- found 6.2.3 with grep in /nix/store/6mshwwzcsvpxxwn4hw9msm5ffwyy5wv3-libpqxx-6.2.3
- directory tree listing: https://gist.github.com/509fd3c73bc4d5401153a2eb6e21a804
---
 pkgs/development/libraries/libpqxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index a6dd719a3812..f027b767db68 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libpqxx-${version}";
-  version = "6.2.2";
+  version = "6.2.3";
 
   src = fetchFromGitHub {
     owner = "jtv";
     repo = "libpqxx";
     rev = version;
-    sha256 = "0f7mkl29v6d47kkdpl2gkb9xc5lnih2pq9pk3cq6nc2j6w758yp5";
+    sha256 = "130mkkq46l23aaxfc2bnlf9mi3qxfn5465ziz0048bxymbxa7b58";
   };
 
   nativeBuildInputs = [ gnused python2 ];

From cbfde5e8f278c4a75efbcaf161faf73fd5135e11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 05:58:09 -0700
Subject: [PATCH 1657/3370] krita: 4.0.1 -> 4.0.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/krita/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.0.2 with grep in /nix/store/frfrgq3pkda5hjpgjzm6bw9b1zp8c575-krita-4.0.2
- directory tree listing: https://gist.github.com/dc5ab15c03d296eeef4134cf33666c30
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 5af0e627d7d8..f86694ebc6cb 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0k55ybvna40dx4fqygnix7bnhjaanak3ckb108hny2k7sspy62pc";
+    sha256 = "136nia6z8l9czk3ls2c9dpk617cvfilfhx0s838g5nrqxh4kn0cf";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From 578d3a81aca532fd45f07ac24e6a7cfa1f5ec31a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:45:54 -0700
Subject: [PATCH 1658/3370] miniupnpd: 2.0.20180503 -> 2.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/miniupnpd/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.1 with grep in /nix/store/1gdrqzzksdxk4vnbgaa2zlsvyx1qdn7h-miniupnpd-2.1
- directory tree listing: https://gist.github.com/033415d078a1ec6d4641ed723b27e29b
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 2f907df8dcac..07112d1497af 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, iptables, libuuid, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-2.0.20180503";
+  name = "miniupnpd-2.1";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "031aw66b09ij2yv640xjbp302vkwr8ima5cz7a0951jzhqbfs6xn";
+    sha256 = "1hg0zzvvzfgpnmngmd3ffnsk9x18lwlxlpw5jgh7y6b1jrvr824m";
     name = "${name}.tar.gz";
   };
 

From 5f41c98f89855d69c838e26f1e2effdb0d43973d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:21:19 -0700
Subject: [PATCH 1659/3370] libwebsockets: 2.4.2 -> 3.0.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libwebsockets/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.0.0 with grep in /nix/store/m8jcyxq9zxn19vzwmvy8jld4kmjcwnmj-libwebsockets-3.0.0
- directory tree listing: https://gist.github.com/3fda3b4331b75bec575d1a71ba21e84a
---
 pkgs/development/libraries/libwebsockets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix
index 3bc04f9ae3db..1147c9606ad4 100644
--- a/pkgs/development/libraries/libwebsockets/default.nix
+++ b/pkgs/development/libraries/libwebsockets/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libwebsockets-${version}";
-  version = "2.4.2";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "warmcat";
     repo = "libwebsockets";
     rev = "v${version}";
-    sha256 = "0gbprzsi054f9gr31ihcf0cq7zfkybrmdp6894pmzb5hcv4wnh9i";
+    sha256 = "0cz4f05qd9b2bm27h5pkwym2cl7ff73lgirzwjppwf9b18if58yv";
   };
 
   buildInputs = [ cmake openssl zlib libuv ];

From 5d402612d5f01d2ecb3218a996f2ee4f9a9cbcf0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:49:53 -0700
Subject: [PATCH 1660/3370] streamlink: 0.10.0 -> 0.12.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/streamlink/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/.streamlink-wrapped -h’ got 0 exit code
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/.streamlink-wrapped --help’ got 0 exit code
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/.streamlink-wrapped -V’ and found version 0.12.1
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/.streamlink-wrapped --version’ and found version 0.12.1
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/streamlink -h’ got 0 exit code
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/streamlink --help’ got 0 exit code
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/streamlink -V’ and found version 0.12.1
- ran ‘/nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1/bin/streamlink --version’ and found version 0.12.1
- found 0.12.1 with grep in /nix/store/7rxcwgcznrsqj6kkvrxi8j2ggjx3il4v-streamlink-0.12.1
- directory tree listing: https://gist.github.com/09fbfb8c035d471bd38a592acf455d9a
---
 pkgs/applications/video/streamlink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 9ff54bd681f8..3f5f0c05c308 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -1,14 +1,14 @@
 { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.10.0";
+  version = "0.12.1";
   name = "streamlink-${version}";
 
   src = fetchFromGitHub {
     owner = "streamlink";
     repo = "streamlink";
     rev = "${version}";
-    sha256 = "1p9gkwcvqlnv09ihqh71nh82nnmq9ybp1v8d8kd2vhkg1vm5ximn";
+    sha256 = "0r63fjp5qhnbp5kr4w2nn3gnj0wr0ik1pw1gyry8jl9rp2jq9db5";
   };
 
   checkInputs = with pythonPackages; [ pytest mock requests-mock ];

From 66186deea3a6495393987a8b2ec40a70e93a3e55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:14:40 -0700
Subject: [PATCH 1661/3370] mediainfo-gui: 18.03.1 -> 18.05

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mediainfo-gui/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/c27b5456712218aff8abefa573efd9d6
---
 pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 4fa3b4ee4353..b6ec3305cb3a 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop-file-utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "18.03.1";
+  version = "18.05";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr";
+    sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From c10c977e00c4bae28215460b73432eed27cd360a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:10:04 -0700
Subject: [PATCH 1662/3370] mediainfo: 18.03.1 -> 18.05
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mediainfo/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/5ckclh9xvqkrp4a329s8w294ggv0mm48-mediainfo-18.05/bin/mediainfo -h’ got 0 exit code
- ran ‘/nix/store/5ckclh9xvqkrp4a329s8w294ggv0mm48-mediainfo-18.05/bin/mediainfo --help’ got 0 exit code
- directory tree listing: https://gist.github.com/5fa8e019ba53a84987e3b8d9e47a91af
---
 pkgs/applications/misc/mediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index dcc2a1bf43ce..5b2f8125f72c 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.03.1";
+  version = "18.05";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1mpwbqvw6awni5jq7i5yqvf6wgwjc37sl42q20rdq2agdlslqrkr";
+    sha256 = "0rgsfplisf729n1j3fyg82wpw88aahisrddn5wq9yx8hz6m96h6r";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From d35604d9107844db233976c41ccbdb3138f37bf4 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 11 May 2018 23:53:10 +0900
Subject: [PATCH 1663/3370] rPackages: fix binutils path on Darwin

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 6c00e58d9e73..451fc1dc6fee 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -392,7 +392,7 @@ let
     nat = [ pkgs.which ];
     nat_nblast = [ pkgs.which ];
     nat_templatebrains = [ pkgs.which ];
-    pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ];
+    pbdZMQ = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
     RMark = [ pkgs.which ];
     RPushbullet = [ pkgs.which ];
     qtpaint = [ pkgs.cmake ];
@@ -409,7 +409,7 @@ let
     fftw = [ pkgs.pkgconfig ];
     geoCount = [ pkgs.pkgconfig ];
     gdtools = [ pkgs.pkgconfig ];
-    JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.binutils.bintools ];
+    JuniperKernel = lib.optionals stdenv.isDarwin [ pkgs.darwin.binutils ];
     kza = [ pkgs.pkgconfig ];
     magick = [ pkgs.pkgconfig ];
     mwaved = [ pkgs.pkgconfig ];
@@ -759,7 +759,7 @@ let
     JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {
       postPatch = ''
         for file in {R,src}/*.R; do
-            sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file
+            sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
         done
       '';
       preConfigure = ''
@@ -774,7 +774,7 @@ let
     pbdZMQ = old.pbdZMQ.overrideDerivation (attrs: {
       postPatch = lib.optionalString stdenv.isDarwin ''
         for file in R/*.{r,r.in}; do
-            sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.binutils.bintools}/bin/\1"#g' $file
+            sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
         done
       '';
     });

From 1bf84200473ab95fe983b9b15731d693f205d1bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 04:07:39 -0700
Subject: [PATCH 1664/3370] mopidy-iris: 3.17.5 -> 3.18.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/Mopidy-Iris/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.18.0 with grep in /nix/store/nldsjybf1v0fbjnbfgcknykr4q6fjq9c-Mopidy-Iris-3.18.0
- directory tree listing: https://gist.github.com/0ad20de473538813e443e421603c7997
---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index cfd2a4173da7..eb4dce814166 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.17.5";
+  version = "3.18.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "011bccvjy1rdrc43576hgfb7md404ziqmkam6na2z6v9km1b9gwr";
+    sha256 = "0j56pj7cqymdk22bjw33c9rz4n36k693gs3w6kg6y68as8l6qpvb";
   };
 
   propagatedBuildInputs = [

From 32558af970435de96be7fea08e3eabce96334ddb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 03:51:40 -0700
Subject: [PATCH 1665/3370] opendht: 1.7.1 -> 1.7.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/opendht/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtnode -h’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtnode --help’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtnode help’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtchat -h’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtchat --help’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtscanner -h’ got 0 exit code
- ran ‘/nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2/bin/dhtscanner --help’ got 0 exit code
- found 1.7.2 with grep in /nix/store/j00w2x6mfk421h6z7ma1ndvp0yy3is7g-opendht-1.7.2
- directory tree listing: https://gist.github.com/bae66cd16ade0c7ae0789b34e0528267
---
 pkgs/development/libraries/opendht/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 4265f1ee98a3..19d3d4f888fe 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   name = "opendht-${version}";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     rev = "${version}";
-    sha256 = "1702abnsaf473c56pz18xjgvc2pjhba8dyfryir5dg34zw1c94sc";
+    sha256 = "0nia3gkn5jqs7lf0v6jkhh1c0czdx9743imgi77kcvn98k2n6sjc";
   };
 
   buildInputs = [

From 35ba9e780653c8d010f4c71edeed331ae45652a1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 03:39:36 -0700
Subject: [PATCH 1666/3370] palemoon: 27.9.0 -> 27.9.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/palemoon/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon -h’ got 0 exit code
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon --help’ got 0 exit code
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon -V’ and found version 27.9.1
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon -v’ and found version 27.9.1
- ran ‘/nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1/bin/palemoon --version’ and found version 27.9.1
- found 27.9.1 with grep in /nix/store/zcw80dly8ka0wa1afkl8wb01mg4aqdhx-palemoon-27.9.1
- directory tree listing: https://gist.github.com/5f0a5b316dd9c9cc0a59be36561c1b66
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index aa77f0847344..3f44d1576602 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.9.0";
+  version = "27.9.1";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "181g1hy4k9xr6nlrw8jamp541gr5znny4mmpwwaa1lzq5v1w1sw6";
+    sha256 = "1cjd0liy3x7iqx8g8mbwdrr0f2aiqjiaifzzkngcvx3vfmphj97k";
   };
 
   desktopItem = makeDesktopItem {

From d6d6b1e6960cf6c21591615dc6c4228023dbf6df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 02:00:26 -0700
Subject: [PATCH 1667/3370] pdfpc: 4.1.1 -> 4.1.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pdfpc/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.1.2 with grep in /nix/store/5mwaxcqfbb807ywds98xl27rrwb51nv1-pdfpc-4.1.2
- directory tree listing: https://gist.github.com/5767dc3e3f368aaecb0c729b053b9209
---
 pkgs/applications/misc/pdfpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index f3fd091363f0..e61613a4b305 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "1yjh9rx49d24wlwg44r2a6b5scybp8l1fi9wyf05sig6zfziw1mm";
+    sha256 = "01c2bswvxqk4biidpfj3hzf0kdk69i56ibk2wfi8v50qm105psli";
   };
 
   nativeBuildInputs = [

From 47c672b4b1fc512e8b5f0fb2e4566f41402d60f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 01:48:31 -0700
Subject: [PATCH 1668/3370] picard-tools: 2.18.3 -> 2.18.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/picard-tools/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.18.4 with grep in /nix/store/k62ym9i08d0w9sgmdjjfyy4lf2n9ig7p-picard-tools-2.18.4
- directory tree listing: https://gist.github.com/4d9e3062e701681d9b53033dc9511663
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index ed90ed5aa047..e215b6f3862e 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.3";
+  version = "2.18.4";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0w4v30vnyr549hd9lhj1sm69whssabqvhfrbavxfjbl2k9fw83qf";
+    sha256 = "0qwalb49g8s6dswhhk12ny33xzzj38xa2rj6p6ar0hrwh7aijlqc";
   };
 
   buildInputs = [ jre makeWrapper ];

From d7a71b3003e5eadba3756a35ef3b4c9f3fd8e3d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 01:45:55 -0700
Subject: [PATCH 1669/3370] powerdns: 4.1.1 -> 4.1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/powerdns/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_control -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_control --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdnsutil -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdnsutil --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdnsutil help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdnsutil --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2sql --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2sql --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2json --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2json --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsgram -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsgram --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsgram help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsgram --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsreplay -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsreplay --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsreplay help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsreplay --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscan -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscan --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscan help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscan --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscope -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscope --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscope help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsscope --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnswasher --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnswasher --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dumresp --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dumresp --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_notify --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_notify --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nproxy -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nproxy --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nproxy --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nsec3dig --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/nsec3dig --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/stubquery -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/stubquery --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/stubquery help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/stubquery --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/ixplore --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/ixplore --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/sdig --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/sdig --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/calidns -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/calidns --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/calidns --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsbulktest -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsbulktest --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnsbulktest --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnstcpbench -h’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnstcpbench --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnstcpbench --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2ldap --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/zone2ldap --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnspcap2protobuf --help’ got 0 exit code
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/dnspcap2protobuf --version’ and found version 4.1.2
- ran ‘/nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2/bin/pdns_server --help’ got 0 exit code
- found 4.1.2 with grep in /nix/store/wc0f44gmgaxq2qh1w1x9k3i8z0z7i304-powerdns-4.1.2
- directory tree listing: https://gist.github.com/35d763a9dcfb4d88e41f300f06f27168
---
 pkgs/servers/dns/powerdns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index cde2fe1a426c..0ef24a97f888 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "powerdns-${version}";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "1fh4zgj0gxgcnnhnih8k6fbw18hb9brkkrfpx3mj8b4a3hr8ilq8";
+    sha256 = "15anf9x4h3acf7rhvaim4595v2hrz7mn4va9qv18bfnif40vxn46";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 2cedd441750b205b832eb2b78d3c2d880784f592 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 01:27:57 -0700
Subject: [PATCH 1670/3370] poppler_utils: 0.63.0 -> 0.64.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/poppler-utils/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftoppm -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftoppm --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftocairo -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftocairo --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdffonts -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdffonts --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfimages -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfimages --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfinfo -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfinfo --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftops -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftops --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftotext -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftotext --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftohtml -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdftohtml --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfseparate -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfseparate --help’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfunite -h’ got 0 exit code
- ran ‘/nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0/bin/pdfunite --help’ got 0 exit code
- found 0.64.0 with grep in /nix/store/k4ir4j8s5skczlgnscf0gfvxp1kpv2ll-poppler-utils-0.64.0
- directory tree listing: https://gist.github.com/117a95ee3c53e7aa2ec1e2404a22f621
---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 11dd8ec32910..a96de20ccfeb 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.63.0";
+  version = "0.64.0";
   mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "04d1z1ygyb3llzc6s6c99wxafvljj2sc5b76djif34f7mzfqmk17";
+    sha256 = "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj";
   };
 
   outputs = [ "out" "dev" ];

From da1eb254b0e36fbb65416e9ad084ec99f7248279 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 05:00:03 -0700
Subject: [PATCH 1671/3370] syslogng: 3.14.1 -> 3.15.1 (#40062)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/syslog-ng/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/loggen -h’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/loggen --help’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/loggen -V’ and found version 3.15.1
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/loggen --version’ and found version 3.15.1
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng -h’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng --help’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng-ctl --help’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng-debun -h’ got 0 exit code
- ran ‘/nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1/bin/syslog-ng-debun help’ got 0 exit code
- found 3.15.1 with grep in /nix/store/dwmr0h5zbh22ijcwcsg74m301hg8hab9-syslog-ng-3.15.1
- directory tree listing: https://gist.github.com/e99978b52b48e592a7c12121b246128c
---
 pkgs/tools/system/syslog-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index b356cd1d484a..b47f5c98c4d2 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.14.1";
+  version = "3.15.1";
 
   src = fetchurl {
     url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz";
-    sha256 = "0i79qib47cwg6kd5h4w277h942d6ahb1aj09243rlallr46jci82";
+    sha256 = "1vzrg6s30wc2as2s42h7a1qvyxqx26nq895r9y75aasfcwlbvnm2";
   };
 
   nativeBuildInputs = [ pkgconfig which ];

From 0c556f6f60a50a49577800146acf6ced5553f3a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 01:21:04 -0700
Subject: [PATCH 1672/3370] poppler_data: 0.4.8 -> 0.4.9

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/poppler-data/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.4.9 with grep in /nix/store/vcpqkfixqx9gdd3mf07lqil5q7kivlfm-poppler-data-0.4.9
- directory tree listing: https://gist.github.com/582309ee358dd7c8e622f5b89fdf8f88
---
 pkgs/data/misc/poppler-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix
index 5c8e0970518b..d7a5ce33bd26 100644
--- a/pkgs/data/misc/poppler-data/default.nix
+++ b/pkgs/data/misc/poppler-data/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, cmake, ninja }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-data-0.4.8";
+  name = "poppler-data-0.4.9";
 
   src = fetchurl {
     url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "0wi8yyynladny51r4q53z7ygh7y491ayp8nqqv6wqqzjc60s35hh";
+    sha256 = "04i0wgdkn5lhda8cyxd1ll4a2p41pwqrwd47n9mdpl7cx5ypx70z";
   };
 
   nativeBuildInputs = [ cmake ninja ];

From ae587fcd422cfe10be5af9934ab8be6c2a1ccd48 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:58:11 -0700
Subject: [PATCH 1673/3370] skrooge: 2.12.0 -> 2.13.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/skrooge/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/l83qij463yvk1nqxahdcm9amfnp7zdm8-skrooge-2.13.0/bin/skroogeconvert -h’ got 0 exit code
- ran ‘/nix/store/l83qij463yvk1nqxahdcm9amfnp7zdm8-skrooge-2.13.0/bin/skroogeconvert --help’ got 0 exit code
- found 2.13.0 with grep in /nix/store/l83qij463yvk1nqxahdcm9amfnp7zdm8-skrooge-2.13.0
- directory tree listing: https://gist.github.com/699ec87fffb73399c86ad11632ed9b17
---
 pkgs/applications/office/skrooge/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index cd83205172bf..e2abba26ff71 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -7,11 +7,11 @@
 
 mkDerivation rec {
   name = "skrooge-${version}";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchurl {
     url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "0f7jwl05y4gjwasjcbsx2rrva81abyf0hgdbkh7h3dl7nxz9h6g1";
+    sha256 = "1f1k0fkfhism1jyx3yxi8rdf1jrmp2vaphmz7fgh9hk18ndvss7d";
   };
 
   nativeBuildInputs = [

From 21ac09ebdf075b84cb04770ad9ee32fbe61c57f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:21:28 -0700
Subject: [PATCH 1674/3370] sfml: 2.4.2 -> 2.5.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sfml/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.5.0 with grep in /nix/store/j708rilms5fpihj454xv4m8yph07v3y5-sfml-2.5.0
- directory tree listing: https://gist.github.com/2efaabd811738a49adb17b7c96980837
---
 pkgs/development/libraries/sfml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index d34280c16246..f52b7905c6ec 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -3,14 +3,14 @@
 }:
 
 let
-  version = "2.4.2";
+  version = "2.5.0";
 in
 
 stdenv.mkDerivation rec {
   name = "sfml-${version}";
   src = fetchurl {
     url = "https://github.com/SFML/SFML/archive/${version}.tar.gz";
-    sha256 = "cf268fb487e4048c85e5b2f53d62596854762c98cba1c1b61ccd91f78253ef4b";
+    sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab";
   };
   buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
                   libXrandr libXrender udev xcbutilimage

From bb950e22e1cfbca677e09deb56342aed6294b752 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:19:40 -0700
Subject: [PATCH 1675/3370] rabbitmq-c: 0.8.0 -> 0.9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/rabbitmq-c/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-publish --help’ got 0 exit code
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-get --help’ got 0 exit code
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-consume --help’ got 0 exit code
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-declare-queue --help’ got 0 exit code
- ran ‘/nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0/bin/amqp-delete-queue --help’ got 0 exit code
- found 0.9.0 with grep in /nix/store/4k9n5w1zcpnx1qq6rvdy2nc7zl7pkb7i-rabbitmq-c-0.9.0
- directory tree listing: https://gist.github.com/15d9dcbdbc027933140607d48794a9a3
---
 pkgs/development/libraries/rabbitmq-c/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix
index c841d82ccce0..2a0125de01f1 100644
--- a/pkgs/development/libraries/rabbitmq-c/default.nix
+++ b/pkgs/development/libraries/rabbitmq-c/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "rabbitmq-c-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "alanxz";
     repo = "rabbitmq-c";
     rev = "v${version}";
-    sha256 = "0vjh1q3hyzrq1iiddy28vvwpwwn4px00mjc2hqp4zgfpis2xlqbj";
+    sha256 = "1mhzxyh9pmpxjjbyy8hd34gm39sxf73r1ldk8zjfsfbs26ggrppz";
   };
 
   buildInputs = [ cmake openssl popt xmlto ];

From 366b16d8e10f9a700d45d5f2d95fc906f6257292 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:17:23 -0700
Subject: [PATCH 1676/3370] rust-bindgen: 0.36.0 -> 0.36.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/rust-bindgen/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1/bin/bindgen -h’ got 0 exit code
- ran ‘/nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1/bin/bindgen --help’ got 0 exit code
- ran ‘/nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1/bin/bindgen -V’ and found version 0.36.1
- ran ‘/nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1/bin/bindgen --version’ and found version 0.36.1
- found 0.36.1 with grep in /nix/store/vpn165c8nv09k30dsl7gx0crzbdzw4im-rust-bindgen-0.36.1
- directory tree listing: https://gist.github.com/6731d17415819fe988768028fda0e150
---
 pkgs/development/tools/rust/bindgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 2f4c89ab43be..36fa1019705f 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.36.0";
+  version = "0.36.1";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "1bpya490qh2jvq99mdlcifj6mgn3yxr0sqas6y5xw842b46g6hi6";
+    sha256 = "0y99dvkbkd4vhac26dmc3bwf6z2m85p2il7mndvv8liam012pkbz";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0ad25d6ae2a4a4bb6f64c129f2f25bfd77a20b0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 00:09:54 -0700
Subject: [PATCH 1677/3370] remarshal: 0.7.0 -> 0.8.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/remarshal/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2json-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2json-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2json-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2json-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2json -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2json --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2json -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2json --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2toml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2toml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2toml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2toml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2toml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2toml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2toml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2toml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2yaml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2yaml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2yaml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.json2yaml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2yaml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2yaml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2yaml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/json2yaml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.remarshal-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.remarshal-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.remarshal-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.remarshal-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/remarshal -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/remarshal --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/remarshal -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/remarshal --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2json-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2json-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2json-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2json-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2json -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2json --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2json -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2json --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2toml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2toml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2toml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2toml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2toml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2toml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2toml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2toml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2yaml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2yaml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2yaml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.toml2yaml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2yaml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2yaml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2yaml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/toml2yaml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2json-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2json-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2json-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2json-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2json -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2json --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2json -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2json --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2toml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2toml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2toml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2toml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2toml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2toml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2toml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2toml --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2yaml-wrapped -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2yaml-wrapped --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2yaml-wrapped -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/.yaml2yaml-wrapped --version’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2yaml -h’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2yaml --help’ got 0 exit code
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2yaml -v’ and found version 0.8.0
- ran ‘/nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0/bin/yaml2yaml --version’ and found version 0.8.0
- found 0.8.0 with grep in /nix/store/8cafzxn7ffa6kzy55xf7y0hslgwnn4br-remarshal-0.8.0
- directory tree listing: https://gist.github.com/8dc1ba1b525a1d9d051b9cbbbf7fbe08
---
 pkgs/development/tools/remarshal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix
index 23c9768f7e05..79cca444a1e9 100644
--- a/pkgs/development/tools/remarshal/default.nix
+++ b/pkgs/development/tools/remarshal/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "remarshal";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner  = "dbohdan";
     repo   = "remarshal";
     rev    = "v${version}";
-    sha256 = "1wsgvzfp40lvly7nyyhv9prip4vi32rfc8kdji587jpw28zc1dfb";
+    sha256 = "192r1mfd5yj6kg6fqmkjngdlgn25g5rkvm0p6xaflpvavnhvhnsj";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 6557ea2b454b9d720487e5a56c5ab1e065f30abd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:35:24 -0700
Subject: [PATCH 1678/3370] sundials: 3.1.0 -> 3.1.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sundials/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 3.1.1 with grep in /nix/store/fkdjdcj8ydq78an3dxgg2ppalahccla5-sundials-3.1.1
- directory tree listing: https://gist.github.com/bc116dd93142b639fe041213e8223715
---
 pkgs/development/libraries/sundials/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index 41f7267fdca9..7bf314997433 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
 
   pname = "sundials";
-  version = "3.1.0";
+  version = "3.1.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
   url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-  sha256 = "0fnlrpj6qjamxahd70r4vsgv85kxbgh93gxqk5xzf9ln6a7jzm8q";
+  sha256 = "090s8ymhd0g1s1d44fa73r5yi32hb4biwahhbfi327zd64yn8kd2";
   };
 
   preConfigure = ''

From 5956939f352a31b2ce749d0570f38896574a856b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:32:51 -0700
Subject: [PATCH 1679/3370] wireless-regdb: 2017.12.23 -> 2018.05.09

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireless-regdb/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/6eb5b27b95c943023d5aa76dab9d870e
---
 pkgs/data/misc/wireless-regdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index 70f217f1b7e9..0805a62b15e0 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2017.12.23";
+  version = "2018.05.09";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
-    sha256 = "1faa394frq0126h2z28kp4dwknx6zqm5nar4552g7rwqvl2yclqf";
+    sha256 = "0db4p8m194cjydrv9q7ygx62v202sighb9pizbn8a29anvm0cmzd";
   };
 
   dontBuild = true;

From 4feaaf68fbed9d1607d3029958c38bd15544c805 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 05:04:41 -0700
Subject: [PATCH 1680/3370] urh: 2.0.2 -> 2.0.4 (#40059)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/urh/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/g2bnnh1shkjhn7jyvjfrjyfv7li4wrld-urh-2.0.4/bin/.urh-wrapped --version’ and found version 2.0.4
- ran ‘/nix/store/g2bnnh1shkjhn7jyvjfrjyfv7li4wrld-urh-2.0.4/bin/urh --version’ and found version 2.0.4
- found 2.0.4 with grep in /nix/store/g2bnnh1shkjhn7jyvjfrjyfv7li4wrld-urh-2.0.4
- directory tree listing: https://gist.github.com/f984d6b54a7cfcf840ab5c9a24c0ac95
---
 pkgs/applications/misc/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index fa2f16166446..b1966539f2c6 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.0.2";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "1qqb31y65rd85rf3gvxxxy06hm89ary00km1ac84qz5bwm6n5fyb";
+    sha256 = "1b796lfwasp02q1340g43z0gmza5y6jn1ga6nb22vfas0yvqpz6p";
   };
 
   buildInputs = [ hackrf rtl-sdr ];

From 926dc3881eb4e69dab6000c4bff473c658608a7e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:31:50 -0700
Subject: [PATCH 1681/3370] gnome3.webkitgtk: 2.20.1 -> 2.20.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/webkitgtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver -h’ got 0 exit code
- ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver --help’ got 0 exit code
- found 2.20.2 with grep in /nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2
- directory tree listing: https://gist.github.com/e3496e2d8a6b933a107141f5caecb92d
---
 pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
index 3cc26b512c89..8b25a20d8eb9 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.20.1";
+  version = "2.20.2";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23";
+    sha256 = "1qi6nnj4qidzija1am9xscwjxwfqwhiy7x39ndriqgzh86i97znz";
   };
 
   patches = optionals stdenv.isDarwin [

From 058e10f24171fa20d0ef536281812b65b347c44c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 23:31:50 -0700
Subject: [PATCH 1682/3370] gnome3.webkitgtk: 2.20.1 -> 2.20.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/webkitgtk/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver -h’ got 0 exit code
- ran ‘/nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2/bin/WebKitWebDriver --help’ got 0 exit code
- found 2.20.2 with grep in /nix/store/h4aballc6wsb4kj32kcjcx5x4vbax6fj-webkitgtk-2.20.2
- directory tree listing: https://gist.github.com/e3496e2d8a6b933a107141f5caecb92d

(cherry picked from commit 926dc3881eb4e69dab6000c4bff473c658608a7e)

Note from @obadz: merged #40315 to staging accidentally but this should go to
master due to CVE hence this cherry-pick.
---
 pkgs/development/libraries/webkitgtk/2.20.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.20.nix b/pkgs/development/libraries/webkitgtk/2.20.nix
index 3cc26b512c89..8b25a20d8eb9 100644
--- a/pkgs/development/libraries/webkitgtk/2.20.nix
+++ b/pkgs/development/libraries/webkitgtk/2.20.nix
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.20.1";
+  version = "2.20.2";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "0nc9dj05dbk31ciip08b3rdsfja7ckc5mgagrj030fafza2k5r23";
+    sha256 = "1qi6nnj4qidzija1am9xscwjxwfqwhiy7x39ndriqgzh86i97znz";
   };
 
   patches = optionals stdenv.isDarwin [

From 280fba591d8839919110081839b542133a5dbf9a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 05:08:55 -0700
Subject: [PATCH 1683/3370] wayland-protocols: 1.13 -> 1.14 (#40312)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wayland-protocols/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.14 with grep in /nix/store/ibl7b0wvz8l75vrp86mbm80ds7xzcwkb-wayland-protocols-1.14
- directory tree listing: https://gist.github.com/f3bc0989bebcd51aafb53ff19f920d69
---
 pkgs/development/libraries/wayland/protocols.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
index ed9866048191..c1065b20e6b4 100644
--- a/pkgs/development/libraries/wayland/protocols.nix
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "wayland-protocols-${version}";
-  version = "1.13";
+  version = "1.14";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0f4gqvmz53q9d8h0ilhf4z773nb4vskzx11a3d1jycym120bqn07";
+    sha256 = "1xknjcfhqvdi1s4iq4kk1q61fg2rar3g8q4vlqarpd324imqjj4n";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 032c04ebd7ba9f45ea0ce402ee00deb055653029 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 05:14:34 -0700
Subject: [PATCH 1684/3370] znc: 1.6.6 -> 1.7.0 (#40055)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/znc/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/kkf4gxgjxcq0j8cm6yv5mnv6b8klbgrf-znc-1.7.0/bin/znc -h’ got 0 exit code
- ran ‘/nix/store/kkf4gxgjxcq0j8cm6yv5mnv6b8klbgrf-znc-1.7.0/bin/znc --help’ got 0 exit code
- found 1.7.0 with grep in /nix/store/kkf4gxgjxcq0j8cm6yv5mnv6b8klbgrf-znc-1.7.0
- directory tree listing: https://gist.github.com/766f104f22de520d85cc6b31c46cd5db
---
 pkgs/applications/networking/znc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix
index b1e2258271bf..d1b333587a68 100644
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@@ -9,11 +9,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "znc-${version}";
-  version = "1.6.6";
+  version = "1.7.0";
 
   src = fetchurl {
     url = "http://znc.in/releases/archive/${name}.tar.gz";
-    sha256 = "09cmsnxvi7jg9a0dicf60fxnxdff4aprw7h8vjqlj5ywf6y43f3z";
+    sha256 = "0vxra50418bsjfdpf8vl70fijv8syvasjqdxfyjliff6k91k2zn0";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b6708a4c9a7f7779e9288d33a09f1dcb2e701be7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 11 May 2018 14:11:52 +0200
Subject: [PATCH 1685/3370] virtualbox: update extpack and guest additions
 checksums

---
 pkgs/applications/virtualization/virtualbox/default.nix       | 4 ++--
 .../virtualization/virtualbox/guest-additions/default.nix     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6a3781d58ee0..4a4204f06c02 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -21,8 +21,8 @@ let
   buildType = "release";
   # Manually sha256sum the extensionPack file, must be hex!
   # Do not forget to update the hash in ./guest-additions/default.nix!
-  extpack = "5eef217dbe0a8e8caf383ea8db83344517af0f9093041b5345c8468a427b327b";
-  extpackRev = "122406";
+  extpack = "4c36d129f17dcab2bb37292022f1b1adfefa5f32a3161b0d5d40784bc8acf4d0";
+  extpackRev = "122591";
   main = "0n1lip8lkz4qqq5ml47xldsx41919ncfh060i7yj51bhas604q6s";
   version = "5.2.12";
 
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index b15eed09fde1..6ea0333936b2 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "78a4f18eb0968c7d14dbfe9decf96759c3f85d28f7e3e7ae339266f4a0b22bd1";
+    sha256 = "b81d283d9ef88a44e7ac8983422bead0823c825cbfe80417423bd12de91b8046";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";

From d4ec02fa7bb79ca1765a6220206b2f633cc080ef Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 12 May 2018 13:16:03 +0100
Subject: [PATCH 1686/3370] Revert "Fix pci_get_bus_and_slot removed in kernel
 4.17"

This reverts commit d25607c79db9fca7f1c8696b792e376b42fb2ecb.

Reverted as part of #40313 based on commit author's comment:
https://github.com/NixOS/nixpkgs/pull/40313#issuecomment-388409185
---
 .../virtualization/virtualbox/default.nix      |  4 +++-
 .../virtualization/virtualbox/kernpcidev.patch | 18 ------------------
 2 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/virtualbox/kernpcidev.patch

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 4a4204f06c02..71c9c8fa6441 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -94,7 +94,9 @@ in stdenv.mkDerivation {
 
   patches =
      optional enableHardening ./hardened.patch
-  ++ [ ./qtx11extras.patch ./kernpcidev.patch ];
+  ++ [ ./qtx11extras.patch ];
+
+
 
   postPatch = ''
     sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \
diff --git a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch b/pkgs/applications/virtualization/virtualbox/kernpcidev.patch
deleted file mode 100644
index 5192227d7d01..000000000000
--- a/pkgs/applications/virtualization/virtualbox/kernpcidev.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-index b8019f7..b7d2e39 100644
---- a/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-+++ b/src/VBox/HostDrivers/VBoxPci/linux/VBoxPci-linux.c
-@@ -73,8 +73,11 @@ MODULE_LICENSE("GPL");
- MODULE_VERSION(VBOX_VERSION_STRING);
- #endif
- 
--
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0)
-+# define PCI_DEV_GET(v,d,p)            pci_get_device(v,d,p)
-+# define PCI_DEV_PUT(x)                pci_dev_put(x)
-+# define PCI_DEV_GET_SLOT(bus, devfn)  pci_get_domain_bus_and_slot(0, bus, devfn)
-+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
- # define PCI_DEV_GET(v,d,p)            pci_get_device(v,d,p)
- # define PCI_DEV_PUT(x)                pci_dev_put(x)
- # define PCI_DEV_GET_SLOT(bus, devfn)  pci_get_bus_and_slot(bus, devfn)

From 108cf05ff06618a5eed65267bcb68a140acc11dc Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 11 May 2018 17:04:52 +0200
Subject: [PATCH 1687/3370] poppler_min: pin to poppler_0_61

poppler_min is only used by texlive.bin, which doesn't build
with poppler 0.64 and blocked the update poppler 0.63->0.64.
Pin to poppler_0_61 (which we currently need for libreoffice)
so we don't have to keep 0_63 as a third version.
See discussion in #40327 and #40180
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04a356be18a8..e03ec7f207af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11011,7 +11011,10 @@ with pkgs;
     introspectionSupport = true;
   });
 
-  poppler_min = poppler.override { # TODO: maybe reduce even more
+  poppler_min = poppler_0_61.override { # TODO: maybe reduce even more
+    # this is currently only used by texlive.bin.
+    # pinned to 0.61 because texlive 2017 doesn't build w/poppler 0.64
+    # TODO: review poppler version for texlive 2018
     minimal = true;
     suffix = "min";
   };

From 99fa3c8d67c7e682b1037d57fd8ee50cf30bf12b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 07:46:58 -0700
Subject: [PATCH 1688/3370] flow: 0.71.0 -> 0.72.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/flow/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/sxq54vh13q17bn31lsz9gszx4abr8qcc-flow-0.72.0/bin/flow --help’ got 0 exit code
- ran ‘/nix/store/sxq54vh13q17bn31lsz9gszx4abr8qcc-flow-0.72.0/bin/flow version’ and found version 0.72.0
- found 0.72.0 with grep in /nix/store/sxq54vh13q17bn31lsz9gszx4abr8qcc-flow-0.72.0
- directory tree listing: https://gist.github.com/cf04036cc5756f0589397f496e3e5e87
---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 31bc1848d580..7ba4bbf25d12 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -4,14 +4,14 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.71.0";
+  version = "0.72.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "1z9qf3kahaincy3i3ynqx7gr1sf470ym8h690a0kc7ah5fwsyr5w";
+    sha256 = "1lfnl1crwkygzbv3l85n30dqsfz627xrnmn4z3zxh7lazir5h8b8";
   };
 
   installPhase = ''

From f7532666073252367b4483509ec558957f65b142 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 10 May 2018 17:53:08 -0700
Subject: [PATCH 1689/3370] xmrig: 2.6.1 -> 2.6.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xmrig/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.6.2 with grep in /nix/store/fql94ka6winbdld6zs5y34f2y0fbzavg-xmrig-2.6.2
- directory tree listing: https://gist.github.com/109bef229b0b8564b89f489b69f6f0b5
---
 pkgs/applications/misc/xmrig/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix
index 5b389d99da76..91fdb37432ea 100644
--- a/pkgs/applications/misc/xmrig/default.nix
+++ b/pkgs/applications/misc/xmrig/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-${version}";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig";
     rev = "v${version}";
-    sha256 = "05gd3jl8nvj2b73l4x72rfbbxrkw3r8q1h761ly4z35v4f3lahk8";
+    sha256 = "09dcjvnm74j1d26mvdiz0sl1qwns5xfkdwx46nqd4xlgvg9x4rpx";
   };
 
   nativeBuildInputs = [ cmake ];

From f25e118432bf391706a401d048462fc4c6ba6f6d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 08:14:35 -0700
Subject: [PATCH 1690/3370] dunst: 1.3.1 -> 1.3.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dunst/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2/bin/dunst -h’ got 0 exit code
- ran ‘/nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2/bin/dunst --help’ got 0 exit code
- ran ‘/nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2/bin/dunst -v’ and found version 1.3.2
- ran ‘/nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2/bin/dunst --version’ and found version 1.3.2
- found 1.3.2 with grep in /nix/store/41nqz94x6682ylch4vhg5pca977ffsd0-dunst-1.3.2
- directory tree listing: https://gist.github.com/e6f68836d92d5855b650ece5004da126
---
 pkgs/applications/misc/dunst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 5396299943c5..75640b2c54ec 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "dunst-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "dunst-project";
     repo = "dunst";
     rev = "v${version}";
-    sha256 = "0i518v2z9fklzl5w60gkwwmg30yz3bd0k4rxjrxjabx73pvxm1mz";
+    sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514";
   };
 
   nativeBuildInputs = [ perl pkgconfig which systemd ];

From eb8bc80998d2c391b11049fa04977ff46b735a80 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 7 May 2018 02:39:43 -0700
Subject: [PATCH 1691/3370] ldb: 1.1.31 -> 1.3.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ldb/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbadd --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbsearch --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbdel --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbmodify --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbedit --help’ got 0 exit code
- ran ‘/nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3/bin/ldbrename --help’ got 0 exit code
- found 1.3.3 with grep in /nix/store/mffzix64mb7vjl2kandfj05n4lz0k8fy-ldb-1.3.3
- directory tree listing: https://gist.github.com/c6a5cda289b4f02fa7a87af2345baf74
---
 pkgs/development/libraries/ldb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix
index c178f2f76a4d..356433b54eb5 100644
--- a/pkgs/development/libraries/ldb/default.nix
+++ b/pkgs/development/libraries/ldb/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ldb-1.1.31";
+  name = "ldb-1.3.3";
 
   src = fetchurl {
     url = "mirror://samba/ldb/${name}.tar.gz";
-    sha256 = "04d53e2ab5b35688f5ed7a4471f5b273da121016e1af0630b36a36506afaeb46"                                                                                                                                                             ;
+    sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b"                                                                                                                                                             ;
   };
 
   outputs = [ "out" "dev" ];

From 408563d055e7043ecdf9571bafeb4ad1208e63af Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 12 May 2018 14:47:44 +0200
Subject: [PATCH 1692/3370] rtl-sdr: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/applications/misc/rtl-sdr/default.nix b/pkgs/applications/misc/rtl-sdr/default.nix
index f1c3cbc55577..92e96a7fb5ee 100644
--- a/pkgs/applications/misc/rtl-sdr/default.nix
+++ b/pkgs/applications/misc/rtl-sdr/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "rtl-sdr-${version}";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchgit {
     url = "git://git.osmocom.org/rtl-sdr.git";
     rev = "refs/tags/v${version}";
-    sha256 = "1dh52xcvxkjb3mj80wlm20grz8cqf5wipx2ksi91ascz12b5pym6";
+    sha256 = "0c56a9dhlqgs6y15ns0mn4r5giz0x6y7x151jcq755f711pc3y01";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From da45c8278c670eef69cb9f51f1a5456fe1b9cb11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 22:51:31 -0700
Subject: [PATCH 1693/3370] pmd: 6.2.0 -> 6.3.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pmd/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 6.3.0 with grep in /nix/store/12qshljzfqb92vr12gm03p641ljmzasb-pmd-6.3.0
- directory tree listing: https://gist.github.com/3172d5a09b7c81f7fa86a30c71e4fd4d
---
 pkgs/development/tools/analysis/pmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 83da9926170a..6f908128e599 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pmd-${version}";
-  version = "6.2.0";
+  version = "6.3.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "12j6m6lhp4xw27x0x8jcy0vlwbanjwks7w6zl56xihv6r8cm40fz";
+    sha256 = "09x6mpqz4z583lvliipkmvlv3qmmwi7zjzgfjhwyp27faf2pz1ym";
   };
 
   installPhase = ''

From 899bb981664b43d939480325ff3efccab9abdf75 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 6 May 2018 21:06:23 -0700
Subject: [PATCH 1694/3370] salt: 2017.7.4 -> 2018.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/salt/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-proxy-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-proxy-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-proxy -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-proxy --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-run-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-run-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-run -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-run --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-minion-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-minion-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-minion -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-minion --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-master-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-master-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-master -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-master --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-key-wrapped help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-key help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-call-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-call-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-call -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-call --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-api-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-api-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-api -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-api --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cp-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cp-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cp -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cp --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-syndic-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-syndic-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-syndic -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-syndic --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-ssh-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-ssh-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-ssh -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-ssh --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cloud-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.salt-cloud-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cloud -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/salt-cloud --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.spm-wrapped -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/.spm-wrapped --help’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/spm -h’ got 0 exit code
- ran ‘/nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0/bin/spm --help’ got 0 exit code
- found 2018.3.0 with grep in /nix/store/gr9dzi64rs3pyxhxqzac3wkjqzkcrpmd-salt-2018.3.0
- directory tree listing: https://gist.github.com/e33aa60ebbbc7b62d8ac84faff16ce6d
---
 pkgs/tools/admin/salt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 3bef66597353..eaae8f40bfab 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -19,11 +19,11 @@ let
 in
 python2Packages.buildPythonApplication rec {
   pname = "salt";
-  version = "2017.7.4";
+  version = "2018.3.0";
 
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "15xfvclk3ns8vk17j7bfy4alq7ab5x3y3jnpqzp5583bfyak0mqx";
+    sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950";
   };
 
   propagatedBuildInputs = with python2Packages; [

From 1b3abbbd7445462706d2917eb9785077b24097c0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 12 May 2018 06:02:16 -0700
Subject: [PATCH 1695/3370] mkvtoolnix: 22.0.0 -> 23.0.0 (#40081)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mkvtoolnix/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvmerge -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvmerge --help’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvinfo -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvinfo --help’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvextract -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvextract --help’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvpropedit -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvpropedit --help’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvtoolnix-gui -h’ got 0 exit code
- ran ‘/nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0/bin/mkvtoolnix-gui --help’ got 0 exit code
- found 23.0.0 with grep in /nix/store/k4lfj957aamgj0nav6mvb43zmzx7xip8-mkvtoolnix-23.0.0
- directory tree listing: https://gist.github.com/659909909b82ce86f9ec71f713bc7c6b
---
 pkgs/applications/video/mkvtoolnix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 3a3a009d18f1..544e4917f453 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -12,13 +12,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "22.0.0";
+  version = "23.0.0";
 
   src = fetchFromGitLab {
     owner  = "mbunkus";
     repo   = "mkvtoolnix";
     rev    = "release-${version}";
-    sha256 = "07nggqkpl6dkfcqli8y9dn0jbznldz03nqj2l3fgj3vhqa0phlab";
+    sha256 = "13n2jvwws87bws483dncvhf9vqsjy3l0lxh7x741g71075299w73";
   };
 
   nativeBuildInputs = [

From 204049763b8fe80c383457976a0c9957308a11e2 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 12 May 2018 14:03:05 +0100
Subject: [PATCH 1696/3370] citrix-receiver: 13.9.0 -> 13.9.1

---
 .../networking/remote/citrix-receiver/default.nix     | 11 +++++++++++
 pkgs/top-level/all-packages.nix                       |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index d5982f33e78e..e1fee1bd78b6 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -91,6 +91,17 @@ let
       x86hash   = "117fwynpxfnrw98933y8z8v2q4g6ycs1sngvpbki2qj09bjkwmag";
       x64suffix = "102";
       x86suffix = "102";
+      homepage  = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html; # This version has disappeared from Citrix's website... *sigh*
+    };
+
+    "13.9.1" = {
+      major     = "13";
+      minor     = "9";
+      patch     = "1";
+      x64hash   = "A9A9157CE8C287E8AA11447A0E3C3AB7C227330E9D8882C6F7B938A4DD5925BC";
+      x86hash   = "A93E9770FD10FDD3586A2D47448559EA037265717A7000B9BD2B1DCCE7B0A483";
+      x64suffix = "6";
+      x86suffix = "6";
       homepage  = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
     };
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4766030f04d..9195f1e7c899 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1636,7 +1636,8 @@ with pkgs;
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
-  citrix_receiver        = hiPrio citrix_receiver_13_9_0;
+  citrix_receiver        = hiPrio citrix_receiver_13_9_1;
+  citrix_receiver_13_9_1 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.1"; };
   citrix_receiver_13_9_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.9.0"; };
   citrix_receiver_13_8_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.8.0"; };
   citrix_receiver_13_7_0 = callPackage ../applications/networking/remote/citrix-receiver { version = "13.7.0"; };

From efbbd8196248fe571ff096d9c5e5eaa276e2408f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 30 Apr 2018 12:40:30 -0700
Subject: [PATCH 1697/3370] opencpn: 4.8.2 -> 4.8.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/opencpn/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.8.4 with grep in /nix/store/jlmxcb41bg1v2blsl2vgbjszaafkcvgv-opencpn-4.8.4
- directory tree listing: https://gist.github.com/8becdf1d24e33d05a2f0afdac7c9d764
---
 pkgs/applications/misc/opencpn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/opencpn/default.nix b/pkgs/applications/misc/opencpn/default.nix
index 1c5fde9353aa..7713b5256bfa 100644
--- a/pkgs/applications/misc/opencpn/default.nix
+++ b/pkgs/applications/misc/opencpn/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "opencpn-${version}";
-  version = "4.8.2";
+  version = "4.8.4";
 
   src = fetchFromGitHub {
     owner = "OpenCPN";
     repo = "OpenCPN";
     rev = "v${version}";
-    sha256 = "0r6a279xhhf4jrmjb2xi5arxb4xd5wvqbs4hyyildlgpr1x7bd09";
+    sha256 = "0v4klprzddmpq7w8h2pm69sgbshirdmjrlzhz62b606gbr58fazf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 9cf4d541def0a38cb3008af33593b750d2c81bdd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 08:20:55 -0700
Subject: [PATCH 1698/3370] closurecompiler: 20180402 -> 20180506
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/closure-compiler/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/qh5lv1f6c84mvndiivba30y3n3whw82j-closure-compiler-20180506/bin/closure-compiler --help’ got 0 exit code
- found 20180506 with grep in /nix/store/qh5lv1f6c84mvndiivba30y3n3whw82j-closure-compiler-20180506
- directory tree listing: https://gist.github.com/9013b4a27653c964fee876223f0b579b
---
 pkgs/development/compilers/closure/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index e73871fcb095..0dfa10f28a12 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20180402";
+  version = "20180506";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "1xbr2wvppzhq189z9m70zqry2a3hh6cdydwbc1jm2z7imsg1i6c1";
+    sha256 = "10w9vs61fs14k8g3wlng0ifj0knfm0xfc4rsnd2c75464hkdxvr9";
   };
 
   sourceRoot = ".";

From 2da3d7551fde6ad2c2d348585f84a717fe502b53 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 08:47:38 -0700
Subject: [PATCH 1699/3370] acpica-tools: 20180427 -> 20180508
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/acpica-tools/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpibin help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpidump -h’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpidump --help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpiexec -h’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpiexec --help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpihelp help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpinames -h’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpinames --help’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpixtract -h’ got 0 exit code
- ran ‘/nix/store/jisv58p5q3zi4q6n88d600fb5n5xli8v-acpica-tools-20180508/bin/acpixtract --help’ got 0 exit code
- directory tree listing: https://gist.github.com/e4b9d9cff7b7db6da524b3560e3405b0
---
 pkgs/tools/system/acpica-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix
index f26142260fef..edb7828f95b7 100644
--- a/pkgs/tools/system/acpica-tools/default.nix
+++ b/pkgs/tools/system/acpica-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "acpica-tools-${version}";
-  version = "20180427";
+  version = "20180508";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "05hczn82dpn7irh8zy9m17hm8r3ngwrbmk69zsldr4k1w3cv40df";
+    sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From c24d8363879de3dc2a36eb38d0be694ea4dd5002 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 09:13:58 -0700
Subject: [PATCH 1700/3370] bobcat: 4.07.00 -> 4.08.03

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bobcat/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.08.03 with grep in /nix/store/dqhrp35b4vijwd6k77is0ma96vq9arwj-bobcat-4.08.03
- directory tree listing: https://gist.github.com/d768d97dc8cf8403bf62c2981e533bed
---
 pkgs/development/libraries/bobcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index dd7d6a348671..812ad546f866 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "bobcat-${version}";
-  version = "4.07.00";
+  version = "4.08.03";
 
   src = fetchFromGitHub {
-    sha256 = "0ja6rgdw4ng10acp2c0cv9k72i5sgng03i3xi2yshlm2811lgxcs";
+    sha256 = "163mdl8hxids7123bjxmqhcaqyc1dv7hv8k33s713ac6lzawarq2";
     rev = version;
     repo = "bobcat";
     owner = "fbb-git";

From 90dfae3267421697eaf4e2d1da02a918d1500a54 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 09:36:32 -0700
Subject: [PATCH 1701/3370] cava: 0.6.0 -> 0.6.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cava/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.1 with grep in /nix/store/vgyd88qajn21azx58dlgz6yqkkxdrjg2-cava-0.6.1
- directory tree listing: https://gist.github.com/53f8a5084fe5a35d7a946122d848491f
---
 pkgs/applications/audio/cava/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix
index 1420627c02a0..439175b090a8 100644
--- a/pkgs/applications/audio/cava/default.nix
+++ b/pkgs/applications/audio/cava/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   name = "cava-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   buildInputs = [
     alsaLib
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     owner = "karlstav";
     repo = "cava";
     rev = version;
-    sha256 = "01maaq5pfd4a7zilgarwr1nl7jbqyrvir6w7ikchggsckrlk23wr";
+    sha256 = "1kvhqgijs29909w3sq9m0bslx2zxxn4b3i07kdz4hb0dqkppxpjy";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 6a0ec8d8ccac1d58347ebad8d6efe6c994544eab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 11 May 2018 09:31:17 -0700
Subject: [PATCH 1702/3370] adapta-gtk-theme: 3.93.1.1 -> 3.93.1.14

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/0aedec168a2b1c219c86840c99bb541f
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index f524c7d95792..c8e7d860bcfc 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.1.1";
+  version = "3.93.1.14";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "00k67qpq62swz7p6dk4g8ak31h97lxyddpyr6xii1jpbygwkk9zc";
+    sha256 = "11iviw9gj4jwp6v32a3y1n6hq8m9pf14drfqxhp3dnygylvxxdr2";
   };
 
   preferLocalBuild = true;

From fbe7ebca5fc0f26acee161c45d075bdbdff4204b Mon Sep 17 00:00:00 2001
From: Artem Kazakov <kazakov@gmail.com>
Date: Fri, 11 May 2018 13:07:15 -0400
Subject: [PATCH 1703/3370] Update pants to 1.6.0

Also fixing the missing dependency (wheel). Not sure when this
got broken, but 1.5.0 did not work either.
---
 pkgs/development/tools/build-managers/pants/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/pants/default.nix b/pkgs/development/tools/build-managers/pants/default.nix
index 54e6d38f716a..b99bc4f6b758 100644
--- a/pkgs/development/tools/build-managers/pants/default.nix
+++ b/pkgs/development/tools/build-managers/pants/default.nix
@@ -4,7 +4,7 @@ with stdenv.lib;
 with pythonPackages;
 
 let
-  version = "1.5.0";
+  version = "1.6.0";
 in buildPythonApplication rec {
   inherit version;
   pname = "pantsbuild.pants";
@@ -12,7 +12,7 @@ in buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7c0a1206594c615fce0a7f6daa4ea1028645bc20afa5599c2cf0ad7c06223fa7";
+    sha256 = "0ahvcj33xribypgyh515mb3ack1djr0cq27nlyk0qhwgwv6acfnj";
   };
 
   prePatch = ''
@@ -27,7 +27,7 @@ in buildPythonApplication rec {
     twitter-common-collections setproctitle ansicolors packaging pathspec
     scandir twitter-common-dirutil psutil requests pystache pex docutils
     markdown pygments twitter-common-confluence fasteners pywatchman
-    futures cffi subprocess32 contextlib2 faulthandler pyopenssl
+    futures cffi subprocess32 contextlib2 faulthandler pyopenssl wheel
   ];
 
   meta = {

From 5829045fc55302480f6b637127caa1d4fa403695 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 12 May 2018 16:47:58 +0200
Subject: [PATCH 1704/3370] dbus-glib: diable tests

Test fails in sandbox due to some path impurity but passes locally.
Not worth fixing since dbus-glib is deprecated.
---
 pkgs/development/libraries/dbus-glib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 5d78e084e983..c8bc96f80fde 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     configureFlagsArray+=("--exec-prefix=$dev")
   '';
 
-  doCheck = true;
+  doCheck = false;
 
   passthru = { inherit dbus glib; };
 

From d000198ab7f845406e055bdfd4d4ce4f76aca890 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 12 May 2018 10:02:30 -0500
Subject: [PATCH 1705/3370] darwin.architecture: correctly install headers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I’m not going to fix all of them but this is the best way to do this
in Apple things. Just add ‘EXPORT_DSTDIR’ to the installFlags & set
‘DSTDIR’ to $(out). Please do this instead of the patching!
---
 .../apple-source-releases/architecture/default.nix   | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
index 8b3eb2017e27..4a155a4c403a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/architecture/default.nix
@@ -3,17 +3,9 @@
 appleDerivation {
   dontBuild = true;
 
-  postPatch = ''
-    substituteInPlace $sourceRoot/Makefile \
-      --replace "/usr/include" "/include" \
-      --replace "/usr/bin/" "" \
-      --replace "/bin/" ""
-  '';
+  installFlags = [ "EXPORT_DSTDIR=/include/architecture" ];
 
-  installPhase = ''
-    export DSTROOT=$out
-    make install
-  '';
+  DSTROOT = "$(out)";
 
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ copumpkin ];

From 326d0bf2aa86ccff1611f8350969b0213857174a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 12 May 2018 10:03:48 -0500
Subject: [PATCH 1706/3370] darwin.libSystem: cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don’t want to rely on a certain output so just use ‘getDev’ so Nix
will choose the right output for us.
---
 .../apple-source-releases/Libsystem/default.nix       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 9759810ef686..152f3c5bae38 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -7,6 +7,13 @@ appleDerivation rec {
 
   outputs = [ "out" "dev" ];
 
+  bundledHeaders = map stdenv.lib.getDev [ Libc Libm Libinfo dyld architecture
+                                           libclosure CarbonHeaders libdispatch
+                                           ncurses CommonCrypto copyfile
+                                           removefile libresolv Libnotify
+                                           libplatform mDNSResponder launchd
+                                           libutil libpthread ];
+
   installPhase = ''
     export NIX_ENFORCE_PURITY=
 
@@ -17,9 +24,7 @@ appleDerivation rec {
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h        $out/include
 
-    for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \
-               ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
-               ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
+    for dep in $bundledHeaders; do
       (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
     done
 

From 22cd5eb643b7f992c5195e0373f9d6a3b0ddcaf2 Mon Sep 17 00:00:00 2001
From: Philipp <philipp+github@xndr.de>
Date: Sat, 12 May 2018 17:35:53 +0200
Subject: [PATCH 1707/3370] gnunet-svn: remove outdated package (#40401)

Gnunet switched develpoment from svn to git and removed the svn repositories.
---
 .../networking/p2p/gnunet/svn.nix             | 93 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 95 deletions(-)
 delete mode 100644 pkgs/applications/networking/p2p/gnunet/svn.nix

diff --git a/pkgs/applications/networking/p2p/gnunet/svn.nix b/pkgs/applications/networking/p2p/gnunet/svn.nix
deleted file mode 100644
index 688bb11acd03..000000000000
--- a/pkgs/applications/networking/p2p/gnunet/svn.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{ stdenv, fetchsvn, libextractor, libmicrohttpd, libgcrypt
-, zlib, gmp, curl, libtool, adns, sqlite, pkgconfig
-, libxml2, ncurses, gettext, libunistring, libidn
-, makeWrapper, autoconf, automake
-, withVerbose ? false }:
-
-let
-  rev = "27840";
-in
-stdenv.mkDerivation rec {
-  name = "gnunet-svn-${rev}";
-
-  src = fetchsvn {
-    url =  https://gnunet.org/svn/gnunet;
-    inherit rev;
-    sha256 = "0zhxvvj5rbhca2ykfx3g93dv94xyhqsnj011a6gql7zd5vfhaf6v";
-  };
-
-  buildInputs = [
-    libextractor libmicrohttpd libgcrypt gmp curl libtool
-    zlib adns sqlite libxml2 ncurses libidn
-    pkgconfig gettext libunistring makeWrapper
-    autoconf automake
-  ];
-
-  configureFlags = stdenv.lib.optional withVerbose "--enable-logging=verbose ";
-
-  preConfigure = ''
-    # Brute force: since nix-worker chroots don't provide
-    # /etc/{resolv.conf,hosts}, replace all references to `localhost'
-    # by their IPv4 equivalent.
-    for i in $(find . \( -name \*.c -or -name \*.conf \) \
-                    -exec grep -l '\<localhost\>' {} \;)
-    do
-      echo "$i: substituting \`127.0.0.1' to \`localhost'..."
-      sed -i "$i" -e's/\<localhost\>/127.0.0.1/g'
-    done
-
-    # Make sure the tests don't rely on `/tmp', for the sake of chroot
-    # builds.
-    for i in $(find . \( -iname \*test\*.c -or -name \*.conf \) \
-                    -exec grep -l /tmp {} \;)
-    do
-      echo "$i: replacing references to \`/tmp' by \`$TMPDIR'..."
-      substituteInPlace "$i" --replace "/tmp" "$TMPDIR"
-    done
-
-    # Ensure NSS installation works fine
-    configureFlags="$configureFlags --with-nssdir=$out/lib"
-    patchShebangs src/gns/nss/install-nss-plugin.sh
-
-    sh contrib/pogen.sh
-    sh bootstrap
-  '';
-
-  doCheck = false;
-
-  /* FIXME: Tests must be run this way, but there are still a couple of
-     failures.
-
-  postInstall =
-    '' export GNUNET_PREFIX="$out"
-       export PATH="$out/bin:$PATH"
-       make -k check
-    '';
-  */
-
-  meta = {
-    description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework";
-
-    longDescription = ''
-      GNUnet is a framework for secure peer-to-peer networking that
-      does not use any centralized or otherwise trusted services.  A
-      first service implemented on top of the networking layer
-      allows anonymous censorship-resistant file-sharing.  Anonymity
-      is provided by making messages originating from a peer
-      indistinguishable from messages that the peer is routing.  All
-      peers act as routers and use link-encrypted connections with
-      stable bandwidth utilization to communicate with each other.
-      GNUnet uses a simple, excess-based economic model to allocate
-      resources.  Peers in GNUnet monitor each others behavior with
-      respect to resource usage; peers that contribute to the
-      network are rewarded with better service.
-    '';
-
-    homepage = https://gnunet.org/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9195f1e7c899..5497a0356e08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16101,8 +16101,6 @@ with pkgs;
 
   gnunet_git = lowPrio (callPackage ../applications/networking/p2p/gnunet/git.nix { });
 
-  gnunet_svn = lowPrio (callPackage ../applications/networking/p2p/gnunet/svn.nix { });
-
   gocr = callPackage ../applications/graphics/gocr { };
 
   gobby5 = callPackage ../applications/editors/gobby {

From 0c321443d54570148f780cd402cdd72afb6a27d7 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sat, 12 May 2018 10:43:05 -0500
Subject: [PATCH 1708/3370] unibilium: add ncurses as build input

unibilium expects to use the `ncursesw6-config` command to find terminfo dirs. Before that would fail & default to some nonexistant TERMINFO_DIRS value (on pure systems at least). This will add `ncurses.out` which is a little bit unfortunate because unibilium is meant as a replacement for ncurses. In the future, we should add a `terminfo` output to ncurses so that other things can use its db without pulling in its libraries & binaries.

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

diff --git a/pkgs/development/libraries/unibilium/default.nix b/pkgs/development/libraries/unibilium/default.nix
index 7c92e7224f9e..717edda18a2b 100644
--- a/pkgs/development/libraries/unibilium/default.nix
+++ b/pkgs/development/libraries/unibilium/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl }:
+{ stdenv, lib, fetchFromGitHub, libtool, pkgconfig, perl, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "unibilium-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
 
   nativeBuildInputs = [ pkgconfig perl ];
-  buildInputs = [ libtool ];
+  buildInputs = [ libtool ncurses ];
 
   meta = with lib; {
     description = "A very basic terminfo library";

From 7f79a4fe118943b0d8dcc3aa475079ad3cfd7986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Sat, 12 May 2018 17:44:57 +0200
Subject: [PATCH 1709/3370] manual: Clarify that limits.conf doesn't apply to
 systemd services. (#40267)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Say how systemd services can be set instead.

Sources:

* https://bugzilla.redhat.com/show_bug.cgi?id=754285
* https://ro-che.info/articles/2017-03-26-increase-open-files-limit

Signed-off-by: Niklas Hambüchen <mail@nh2.me>
---
 nixos/modules/security/pam.nix         | 4 ++++
 nixos/modules/system/boot/coredump.nix | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 48998285d89d..bef10b4fe614 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -449,6 +449,10 @@ in
           <varname>item</varname>, and <varname>value</varname>
           attribute.  The syntax and semantics of these attributes
           must be that described in the limits.conf(5) man page.
+
+          Note that these limits do not apply to systemd services,
+          whose limits can be changed via <option>systemd.extraConfig</option>
+          instead.
        '';
     };
 
diff --git a/nixos/modules/system/boot/coredump.nix b/nixos/modules/system/boot/coredump.nix
index b27a35b6257d..30f367da7666 100644
--- a/nixos/modules/system/boot/coredump.nix
+++ b/nixos/modules/system/boot/coredump.nix
@@ -15,8 +15,11 @@ with lib;
           Enables storing core dumps in systemd.
           Note that this alone is not enough to enable core dumps. The maximum
           file size for core dumps must be specified in limits.conf as well. See
-          <option>security.pam.loginLimits</option> as well as the limits.conf(5)
-          man page.
+          <option>security.pam.loginLimits</option> and the limits.conf(5)
+          man page (these specify the core dump limits for user login sessions)
+          and <option>systemd.extraConfig</option> (where e.g.
+          <literal>DefaultLimitCORE=1000000</literal> can be specified to set
+          the core dump limit for systemd system-level services).
         '';
       };
 

From d7e49cfc5605828db27d2511c1a9f2e3fd1ef01f Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sun, 6 May 2018 11:19:59 +0200
Subject: [PATCH 1710/3370] vala-panel-appmenu: init at 0.6.94

---
 pkgs/desktops/xfce/default.nix                |  2 +
 .../appmenu-gtk-module.nix                    | 31 ++++++++++++
 .../default.nix                               | 49 +++++++++++++++++++
 .../fix-bamf-dependency.patch                 | 12 +++++
 4 files changed, 94 insertions(+)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index d83e51a676cd..67580c530726 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -97,6 +97,8 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   #### PANEL PLUGINS
 
+  xfce4-vala-panel-appmenu-plugin = callPackage ./panel-plugins/xfce4-vala-panel-appmenu-plugin { };
+
   xfce4-battery-plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { };
 
   xfce4-clipman-plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { };
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
new file mode 100644
index 000000000000..4db9e03ae721
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, substituteAll, cmake, vala, glib, gtk2, gtk3 }:
+stdenv.mkDerivation rec {
+  name = "vala-panel-appmenu-xfce-${version}";
+  version = "0.6.94";
+
+  src = "${fetchFromGitHub {
+    owner = "rilian-la-te";
+    repo = "vala-panel-appmenu";
+    rev = version;
+    fetchSubmodules = true;
+
+    sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
+  }}/subprojects/appmenu-gtk-module";
+
+  nativeBuildInputs = [ cmake vala ];
+  buildInputs = [ glib gtk2 gtk3 ];
+
+  configurePhase = ''
+    cmake . -DGTK3_INCLUDE_GDK=
+  '';
+  installPhase = ''
+    make DESTDIR=output install
+    cp -r output/var/empty/* "$out"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Port of the Unity GTK+ Module";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ jD91mZM2 ];
+  };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
new file mode 100644
index 000000000000..e1825d21ca7e
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchFromGitHub, substituteAll, callPackage, pkgconfig, cmake, vala, libxml2,
+  glib, pcre, gtk2, gtk3, xorg, libxkbcommon, epoxy, at-spi2-core, dbus-glib, bamf,
+  xfce, libwnck3, libdbusmenu-glib, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "xfce4-vala-panel-appmenu-plugin-${version}";
+  version = "0.6.94";
+
+  src = fetchFromGitHub {
+    owner = "rilian-la-te";
+    repo = "vala-panel-appmenu";
+    rev = version;
+    fetchSubmodules = true;
+
+    sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p";
+  };
+
+  nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ];
+  buildInputs = [ (callPackage ./appmenu-gtk-module.nix {})
+                  glib pcre gtk2 gtk3 xorg.libpthreadstubs xorg.libXdmcp libxkbcommon epoxy
+                  at-spi2-core dbus-glib bamf xfce.xfce4panel_gtk3 xfce.libxfce4util xfce.xfconf
+                  libwnck3 libdbusmenu-glib gobjectIntrospection ];
+
+  patches = [
+    (substituteAll {
+      src = ./fix-bamf-dependency.patch;
+      bamf = bamf;
+    })
+  ];
+
+  cmakeFlags = [
+      "-DENABLE_XFCE=ON"
+      "-DENABLE_BUDGIE=OFF"
+      "-DENABLE_VALAPANEL=OFF"
+      "-DENABLE_MATE=OFF"
+      "-DENABLE_JAYATANA=OFF"
+      "-DENABLE_APPMENU_GTK_MODULE=OFF"
+  ];
+
+  preConfigure = ''
+    mv cmake/FallbackVersion.cmake.in cmake/FallbackVersion.cmake
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Global Menu applet for XFCE4";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ jD91mZM2 ];
+  };
+}
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
new file mode 100644
index 000000000000..1ed86a67f727
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/fix-bamf-dependency.patch
@@ -0,0 +1,12 @@
++++ source/cmake/FindBAMF.cmake	2018-05-11 17:03:44.385917811 +0200
+@@ -80,9 +80,7 @@
+ 
+ find_program(BAMF_DAEMON_EXECUTABLE
+ 	bamfdaemon
+-	HINTS ${CMAKE_INSTALL_FULL_LIBDIR}
+-		  ${CMAKE_INSTALL_FULL_LIBEXECDIR}
+-		  ${BAMF_LIBDIR}
++	HINTS "@bamf@/libexec/bamf/"
+ 	PATH_SUFFIXES bamf
+ )
+ 

From f245f537a8fcbf73ae959792a552b43fbc1c8d71 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Sat, 12 May 2018 12:51:28 -0400
Subject: [PATCH 1711/3370] netperf: cleanup

* netperf: fix build

* maintainers: add myself

* netperf: add myself as maintainer

* netperf: update to current git master to get bugfixes

* netperf: enable-demo mode

* fixup! netperf: fix build

* fixup! netperf: update to current git master to get bugfixes
---
 maintainers/maintainer-list.nix                |  5 +++++
 .../networking/netperf/default.nix             | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1960e3efc859..0ff1d9efb571 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2491,6 +2491,11 @@
     github = "mmahut";
     name = "Marek Mahut";
   };
+  mmlb = {
+    email = "me.mmlb@mmlb.me";
+    github = "mmlb";
+    name = "Manuel Mendez";
+  };
   moaxcp = {
     email = "moaxcp@gmail.com";
     github = "moaxcp";
diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix
index fe58b1d3e28a..421a3cfbe3b7 100644
--- a/pkgs/applications/networking/netperf/default.nix
+++ b/pkgs/applications/networking/netperf/default.nix
@@ -1,21 +1,29 @@
-{ stdenv, fetchFromGitHub }:
+{ libsmbios, stdenv, autoreconfHook, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "netperf-2.7.0";
+  name = "netperf-20180504";
 
   src = fetchFromGitHub {
     owner = "HewlettPackard";
     repo = "netperf";
-    rev = name;
-    sha256 = "034indn3hicwbvyzgw9f32bv2i7c5iv8b4a11imyn03pw97jzh10";
+    rev = "c0a0d9f31f9940abf375a41b43a343cdbf87caab";
+    sha256 = "0wfj9kkhar6jb5639f5wxpwsraxw4v9yzg71rsdidvj5fyncjjq2";
   };
 
+  buildInputs = [ libsmbios ];
+  nativeBuildInputs = [ autoreconfHook ];
+  autoreconfPhase = ''
+    autoreconf -i -I src/missing/m4
+  '';
+  configureFlags = [ "--enable-demo" ];
+  enableParallelBuilding = true;
+
   meta = {
     description = "Benchmark to measure the performance of many different types of networking";
     homepage = http://www.netperf.org/netperf/;
     license = "Hewlett-Packard BSD-like license";
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [];
+    maintainers = [ stdenv.lib.maintainers.mmlb ];
   };
 }

From 37af5704f91c7c908e2866b51b4dfbc5b598537e Mon Sep 17 00:00:00 2001
From: Unknown <iulian.meghea@gmail.com>
Date: Wed, 9 May 2018 22:02:47 +0300
Subject: [PATCH 1712/3370] distrobuilder: init at HEAD

Implement feedback
---
 maintainers/maintainer-list.nix               |  5 ++
 .../virtualization/distrobuilder/default.nix  | 36 ++++++++++
 .../virtualization/distrobuilder/deps.nix     | 67 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 110 insertions(+)
 create mode 100644 pkgs/tools/virtualization/distrobuilder/default.nix
 create mode 100644 pkgs/tools/virtualization/distrobuilder/deps.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0ff1d9efb571..b60d5643434c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2378,6 +2378,11 @@
     github = "meditans";
     name = "Carlo Nucera";
   };
+  megheaiulian  = {
+    email = "iulian.meghea@gmail.com";
+    github = "megheaiulian";
+    name = "Meghea Iulian";
+  };
   mehandes = {
     email = "niewskici@gmail.com";
     github = "mehandes";
diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix
new file mode 100644
index 000000000000..55a8352fe77a
--- /dev/null
+++ b/pkgs/tools/virtualization/distrobuilder/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, pkgconfig, buildGoPackage, fetchFromGitHub
+, makeWrapper, coreutils, gnupg, gnutar, squashfsTools}:
+
+buildGoPackage rec {
+  name = "distrobuilder-${version}";
+  version = "2018_04_28";
+  rev = "406fd5fe7dec4a969ec08bdf799c8ae483d37489";
+
+  goPackagePath = "github.com/lxc/distrobuilder";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "lxc";
+    repo = "distrobuilder";
+    sha256 = "11bd600g36pf89vza9jl7fp7cjy5h67nfvhxlnwghb3z40pq9lnc";
+  };
+
+  goDeps = ./deps.nix;
+
+  postInstall = ''
+    wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${stdenv.lib.makeBinPath [
+      coreutils gnupg gnutar squashfsTools
+    ]}
+  '';
+
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+
+  meta = with stdenv.lib; {
+    description = "System container image builder for LXC and LXD";
+    homepage = "https://github.com/lxc/distrobuilder";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ megheaiulian ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/tools/virtualization/distrobuilder/deps.nix b/pkgs/tools/virtualization/distrobuilder/deps.nix
new file mode 100644
index 000000000000..56ff3c0cc12c
--- /dev/null
+++ b/pkgs/tools/virtualization/distrobuilder/deps.nix
@@ -0,0 +1,67 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
+      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
+    };
+  }
+  {
+    goPackagePath = "github.com/lxc/lxd";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lxc/lxd";
+      rev = "a81aac803bc22dcb14982b80dce005444e2b22f1";
+      sha256 = "1pjwgh6551mjzkdzmvxx065sxxn8ixb3vdq2i6g1pyb56h5hnayi";
+    };
+  }
+  {
+    goPackagePath = "github.com/pkg/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pkg/errors";
+      rev = "816c9085562cd7ee03e7f8188a1cfd942858cded";
+      sha256 = "1ws5crb7c70wdicavl6qr4g03nn6m92zd6wwp9n2ygz5c8rmxh8k";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cobra";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cobra";
+      rev = "ef82de70bb3f60c65fb8eebacbb2d122ef517385";
+      sha256 = "1q1nsx05svyv9fv3fy6xv6gs9ffimkyzsfm49flvl3wnvf1ncrkd";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/flosch/pongo2.v3";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/flosch/pongo2.v3";
+      rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9";
+      sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+]
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01a60be87166..c04fb6bf6d70 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1133,6 +1133,8 @@ with pkgs;
 
   dislocker = callPackage ../tools/filesystems/dislocker { };
 
+  distrobuilder = callPackage ../tools/virtualization/distrobuilder { };
+
   ditaa = callPackage ../tools/graphics/ditaa { };
 
   dino = callPackage ../applications/networking/instant-messengers/dino { };

From 6f40d18d4432858199e14d2323b4f8503ee47a7e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 27 Feb 2018 18:36:48 -0500
Subject: [PATCH 1713/3370] prebuilt android cc: Edit wrapper to pass the right
 -m flags for armv7a

(cherry picked from commit 827ef0914089e1a2bba140b49e1311eff28cc156)
---
 lib/systems/examples.nix                      |  3 ++
 .../mobile/androidenv/androidndk-pkgs.nix     | 33 ++++++++++++++++---
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 87da31f3137f..4b1a3c8ebf44 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -31,18 +31,21 @@ rec {
 
   armv5te-android-prebuilt = rec {
     config = "armv5tel-unknown-linux-androideabi";
+    sdkVer = "21";
     platform = platforms.armv5te-android;
     useAndroidPrebuilt = true;
   };
 
   armv7a-android-prebuilt = rec {
     config = "armv7a-unknown-linux-androideabi";
+    sdkVer = "21";
     platform = platforms.armv7a-android;
     useAndroidPrebuilt = true;
   };
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
+    sdkVer = "21";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 19fc0dc812d8..1413e35e904a 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -15,7 +15,12 @@ let
     "x86_64-unknown-linux-gnu" = {
       double = "linux-x86_64";
     };
-    "arm-unknown-linux-androideabi" = {
+    "armv5tel-unknown-linux-androideabi" = {
+      arch = "arm";
+      triple = "arm-linux-androideabi";
+      gccVer = "4.8";
+    };
+    "armv7a-unknown-linux-androideabi" = {
       arch = "arm";
       triple = "arm-linux-androideabi";
       gccVer = "4.8";
@@ -59,9 +64,29 @@ rec {
     cc = binaries;
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
-    extraBuildCommands =
+    extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let
+        p = targetPlatform.platform.gcc or {};
+        float = p.float or (targetPlatform.parsed.abi.float or null);
+        flags = lib.concatLists [
+          (lib.optional (p ? arch) "-march=${p.arch}")
+          (lib.optional (p ? cpu) "-mcpu=${p.cpu}")
+          (lib.optional (p ? abi) "-mabi=${p.abi}")
+          (lib.optional (p ? fpu) "-mfpu=${p.fpu}")
+          (lib.optional (float != null) "-mfloat=${float}")
+          (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
+          (lib.optional (p ? mode) "-mmode=${p.mode}")
+        ];
+      in ''
+        sed -E -i \
+          $out/bin/${targetPlatform.config}-cc \
+          $out/bin/${targetPlatform.config}-c++ \
+          $out/bin/${targetPlatform.config}-gcc \
+          $out/bin/${targetPlatform.config}-g++ \
+          -e '130i    extraBefore+=(-Wl,--fix-cortex-a8)' \
+          -e 's|^(extraBefore=)\(\)$|\1(${builtins.toString flags})|'
+      '')
       # GCC 4.9 is the first relase with "-fstack-protector"
-      lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
+      + lib.optionalString (lib.versionOlder targetInfo.gccVer "4.9") ''
         sed -E \
         -i $out/nix-support/add-hardening.sh \
         -e 's|(-fstack-protector)-strong|\1|g'
@@ -76,7 +101,7 @@ rec {
   libraries = {
     name = "bionic-prebuilt";
     type = "derivation";
-    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-21/arch-${hostInfo.arch}/usr/";
+    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/";
     drvPath = throw "fake derivation, build ${buildAndroidndk} to use";
   };
 }

From f2004e62870aa6b21dd52612295da973194c7c73 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 12 May 2018 15:07:31 -0400
Subject: [PATCH 1714/3370] lib: Fix float handling for Aarch32

Forgot to adjust default so abi with explicit float attr would be used.
---
 lib/systems/parse.nix                         | 29 +++++++++++--------
 lib/systems/platforms.nix                     |  1 -
 .../compilers/gcc/common/platform-flags.nix   |  6 ++--
 .../mobile/androidenv/androidndk-pkgs.nix     |  6 ++--
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 33daf0791641..856ab297d5be 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -68,17 +68,17 @@ rec {
 
   cpuTypes = with significantBytes; setTypes types.openCpuType {
     arm      = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv6m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv7r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv7m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv8a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
+    armv5tel = { bits = 32; significantByte = littleEndian; family = "arm"; version = "5"; };
+    armv6m   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; };
+    armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "6"; };
+    armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
+    armv7r   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
+    armv7m   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
+    armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "7"; };
+    armv8a   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
+    armv8r   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
+    armv8m   = { bits = 32; significantByte = littleEndian; family = "arm"; version = "8"; };
+    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; version = "8"; };
 
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
@@ -271,7 +271,12 @@ rec {
       kernel = getKernel args.kernel;
       abi =
         /**/ if args ? abi       then getAbi args.abi
-        else if isLinux   parsed then abis.gnu
+        else if isLinux   parsed then
+          if isAarch32 parsed then
+            if lib.versionAtLeast (parsed.cpu.version or "0") "6"
+            then abis.gnueabihf
+            else abis.gnueabi
+          else abis.gnu
         else if isWindows parsed then abis.gnu
         else                     abis.unknown;
     };
diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 5becaf581a45..32f055b6b1c5 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -245,7 +245,6 @@ rec {
     gcc = {
       arch = "armv6";
       fpu = "vfp";
-      float = "hard";
       # TODO(@Ericson2314) what is this and is it a good idea? It was
       # used in some cross compilation examples but not others.
       #
diff --git a/pkgs/development/compilers/gcc/common/platform-flags.nix b/pkgs/development/compilers/gcc/common/platform-flags.nix
index e261f54f582d..9a6d3f8f6203 100644
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,13 +1,13 @@
 { lib, targetPlatform }:
 
 let
-  p = targetPlatform.platform.gcc or {};
-  float = p.float or (targetPlatform.parsed.abi.float or null);
+  p =  targetPlatform.platform.gcc or {}
+    // targetPlatform.parsed.abi;
 in lib.concatLists [
   (lib.optional (p ? arch) "--with-arch=${p.arch}")
   (lib.optional (p ? cpu) "--with-cpu=${p.cpu}")
   (lib.optional (p ? abi) "--with-abi=${p.abi}")
   (lib.optional (p ? fpu) "--with-fpu=${p.fpu}")
-  (lib.optional (float != null) "--with-float=${float}")
+  (lib.optional (p ? float) "--with-float=${p.float}")
   (lib.optional (p ? mode) "--with-mode=${p.mode}")
 ]
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 1413e35e904a..663a1f1ee8f4 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -65,14 +65,14 @@ rec {
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
     extraBuildCommands = lib.optionalString targetPlatform.isAarch32 (let
-        p = targetPlatform.platform.gcc or {};
-        float = p.float or (targetPlatform.parsed.abi.float or null);
+        p =  targetPlatform.platform.gcc or {}
+          // targetPlatform.parsed.abi;
         flags = lib.concatLists [
           (lib.optional (p ? arch) "-march=${p.arch}")
           (lib.optional (p ? cpu) "-mcpu=${p.cpu}")
           (lib.optional (p ? abi) "-mabi=${p.abi}")
           (lib.optional (p ? fpu) "-mfpu=${p.fpu}")
-          (lib.optional (float != null) "-mfloat=${float}")
+          (lib.optional (p ? float) "-mfloat=${p.float}")
           (lib.optional (p ? float-abi) "-mfloat-abi=${p.float-abi}")
           (lib.optional (p ? mode) "-mmode=${p.mode}")
         ];

From 095fe5b43def40279a243e663c662b02caac5318 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Fri, 6 Apr 2018 01:19:06 +0000
Subject: [PATCH 1715/3370] nixos: rename system.{stateVersion,defaultChannel}
 -> system.nixos.\1

---
 nixos/doc/manual/development/releases.xml            |  2 +-
 nixos/doc/manual/release-notes/rl-1509.xml           |  4 ++--
 .../modules/installer/tools/nixos-generate-config.pl |  2 +-
 nixos/modules/misc/version.nix                       | 12 ++++++------
 nixos/modules/programs/shell.nix                     |  2 +-
 nixos/modules/rename.nix                             |  2 ++
 nixos/modules/services/databases/mysql.nix           |  2 +-
 nixos/modules/services/databases/postgresql.nix      | 10 +++++-----
 nixos/modules/services/misc/matrix-synapse.nix       |  2 +-
 nixos/modules/services/network-filesystems/ipfs.nix  |  2 +-
 nixos/modules/services/networking/radicale.nix       |  4 ++--
 nixos/modules/services/web-servers/caddy.nix         |  2 +-
 nixos/modules/virtualisation/amazon-options.nix      |  2 +-
 nixos/modules/virtualisation/containers.nix          |  4 ++--
 nixos/tests/radicale.nix                             |  4 ++--
 15 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml
index d4e5ff3f4312..863110a1c7ca 100755
--- a/nixos/doc/manual/development/releases.xml
+++ b/nixos/doc/manual/development/releases.xml
@@ -70,7 +70,7 @@
     <listitem>
      <para>
       <link xlink:href="https://github.com/NixOS/nixpkgs/compare/bdf161ed8d21...6b63c4616790">
-      Bump the <literal>system.defaultChannel</literal> attribute in
+      Bump the <literal>system.nixos.defaultChannel</literal> attribute in
       <literal>nixos/modules/misc/version.nix</literal> </link>
      </para>
     </listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index e500c9d63422..734bc076b852 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -433,9 +433,9 @@ system.autoUpgrade.enable = true;
      default. If you have existing systems with such host keys and want to
      continue to use them, please set
 <programlisting>
-system.stateVersion = "14.12";
+system.nixos.stateVersion = "14.12";
 </programlisting>
-     The new option <option>system.stateVersion</option> ensures that certain
+     The new option <option>system.nixos.stateVersion</option> ensures that certain
      configuration changes that could break existing systems (such as the
      <command>sshd</command> host key setting) will maintain compatibility with
      the specified NixOS release. NixOps sets the state version of existing
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 74b61a64667e..a198c2d49b53 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -628,7 +628,7 @@ $bootLoaderConfig
   # compatible, in order to avoid breaking some software such as database
   # servers. You should change this only after NixOS release notes say you
   # should.
-  system.stateVersion = "${\(qw(@release@))}"; # Did you read the comment?
+  system.nixos.stateVersion = "${\(qw(@release@))}"; # Did you read the comment?
 
 }
 EOF
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 74c86443ab90..c45d5b077481 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -12,29 +12,29 @@ in
 
 {
 
-  options.system = {
+  options.system.nixos = {
 
-    nixos.version = mkOption {
+    version = mkOption {
       internal = true;
       type = types.str;
       description = "The full NixOS version (e.g. <literal>16.03.1160.f2d4ee1</literal>).";
     };
 
-    nixos.release = mkOption {
+    release = mkOption {
       readOnly = true;
       type = types.str;
       default = trivial.release;
       description = "The NixOS release (e.g. <literal>16.03</literal>).";
     };
 
-    nixos.versionSuffix = mkOption {
+    versionSuffix = mkOption {
       internal = true;
       type = types.str;
       default = trivial.versionSuffix;
       description = "The NixOS version suffix (e.g. <literal>1160.f2d4ee1</literal>).";
     };
 
-    nixos.revision = mkOption {
+    revision = mkOption {
       internal = true;
       type = types.str;
       default = if pathIsDirectory gitRepo then commitIdFromGitRepo gitRepo
@@ -43,7 +43,7 @@ in
       description = "The Git revision from which this NixOS configuration was built.";
     };
 
-    nixos.codeName = mkOption {
+    codeName = mkOption {
       readOnly = true;
       type = types.str;
       description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index d8845fd8f446..3504a8a924b0 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -40,7 +40,7 @@ in
 
           # Subscribe the root user to the NixOS channel by default.
           if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-              echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
+              echo "${config.system.nixos.defaultChannel} nixos" > $HOME/.nix-channels
           fi
 
           # Create the per-user garbage collector roots directory.
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 56b7bf00448c..8820a6da8c0b 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -204,6 +204,8 @@ with lib;
     (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ])
     (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ])
     (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ])
+    (mkRenamedOptionModule [ "system" "stateVersion" ] [ "system" "nixos" "stateVersion" ])
+    (mkRenamedOptionModule [ "system" "defaultChannel" ] [ "system" "nixos" "defaultChannel" ])
 
     # Users
     (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 21a131b90a81..66c9330c3550 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -218,7 +218,7 @@ in
   config = mkIf config.services.mysql.enable {
 
     services.mysql.dataDir =
-      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/mysql"
+      mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/mysql"
                  else "/var/mysql");
 
     users.extraUsers.mysql = {
diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index f022e0863dfd..4ad4728ccda6 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -147,7 +147,7 @@ in
       };
       superUser = mkOption {
         type = types.str;
-        default= if versionAtLeast config.system.stateVersion "17.09" then "postgres" else "root";
+        default= if versionAtLeast config.system.nixos.stateVersion "17.09" then "postgres" else "root";
         internal = true;
         description = ''
           NixOS traditionally used 'root' as superuser, most other distros use 'postgres'.
@@ -166,14 +166,14 @@ in
 
     services.postgresql.package =
       # Note: when changing the default, make it conditional on
-      # ‘system.stateVersion’ to maintain compatibility with existing
+      # ‘system.nixos.stateVersion’ to maintain compatibility with existing
       # systems!
-      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then pkgs.postgresql96
-            else if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95
+      mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then pkgs.postgresql96
+            else if versionAtLeast config.system.nixos.stateVersion "16.03" then pkgs.postgresql95
             else pkgs.postgresql94);
 
     services.postgresql.dataDir =
-      mkDefault (if versionAtLeast config.system.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
+      mkDefault (if versionAtLeast config.system.nixos.stateVersion "17.09" then "/var/lib/postgresql/${config.services.postgresql.package.psqlSchema}"
                  else "/var/db/postgresql");
 
     services.postgresql.authentication = mkAfter
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 10901e102225..f7441988b272 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -342,7 +342,7 @@ in {
       };
       database_type = mkOption {
         type = types.enum [ "sqlite3" "psycopg2" ];
-        default = if versionAtLeast config.system.stateVersion "18.03"
+        default = if versionAtLeast config.system.nixos.stateVersion "18.03"
           then "psycopg2"
           else "sqlite3";
         description = ''
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index 39a4fd6beff8..e2122ddb8ede 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -14,7 +14,7 @@ let
     (optionalString (cfg.defaultMode == "norouting") "--routing=none")
   ] ++ cfg.extraFlags);
 
-  defaultDataDir = if versionAtLeast config.system.stateVersion "17.09" then
+  defaultDataDir = if versionAtLeast config.system.nixos.stateVersion "17.09" then
     "/var/lib/ipfs" else
     "/var/lib/ipfs/.ipfs";
 
diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix
index 391f4bdebbab..97ee05046ff0 100644
--- a/nixos/modules/services/networking/radicale.nix
+++ b/nixos/modules/services/networking/radicale.nix
@@ -9,7 +9,7 @@ let
   confFile = pkgs.writeText "radicale.conf" cfg.config;
 
   # This enables us to default to version 2 while still not breaking configurations of people with version 1
-  defaultPackage = if versionAtLeast config.system.stateVersion "17.09" then {
+  defaultPackage = if versionAtLeast config.system.nixos.stateVersion "17.09" then {
     pkg = pkgs.radicale2;
     text = "pkgs.radicale2";
   } else {
@@ -35,7 +35,7 @@ in
       defaultText = defaultPackage.text;
       description = ''
         Radicale package to use. This defaults to version 1.x if
-        <literal>system.stateVersion &lt; 17.09</literal> and version 2.x
+        <literal>system.nixos.stateVersion &lt; 17.09</literal> and version 2.x
         otherwise.
       '';
     };
diff --git a/nixos/modules/services/web-servers/caddy.nix b/nixos/modules/services/web-servers/caddy.nix
index 2124a42f01a1..fe65fba42a46 100644
--- a/nixos/modules/services/web-servers/caddy.nix
+++ b/nixos/modules/services/web-servers/caddy.nix
@@ -66,7 +66,7 @@ in {
       description = "Caddy web server";
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment = mkIf (versionAtLeast config.system.stateVersion "17.09")
+      environment = mkIf (versionAtLeast config.system.nixos.stateVersion "17.09")
         { CADDYPATH = cfg.dataDir; };
       serviceConfig = {
         ExecStart = ''
diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix
index 349fd3adfc96..9ecdcf23e5fb 100644
--- a/nixos/modules/virtualisation/amazon-options.nix
+++ b/nixos/modules/virtualisation/amazon-options.nix
@@ -3,7 +3,7 @@
   options = {
     ec2 = {
       hvm = lib.mkOption {
-        default = lib.versionAtLeast config.system.stateVersion "17.03";
+        default = lib.versionAtLeast config.system.nixos.stateVersion "17.03";
         internal = true;
         description = ''
           Whether the EC2 instance is a HVM instance.
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix
index 248c2fc1fb23..c3044ea124cf 100644
--- a/nixos/modules/virtualisation/containers.nix
+++ b/nixos/modules/virtualisation/containers.nix
@@ -606,8 +606,8 @@ in
                   { config, pkgs, ... }:
                   { services.postgresql.enable = true;
                     services.postgresql.package = pkgs.postgresql96;
-                    
-                    system.stateVersion = "17.03";
+
+                    system.nixos.stateVersion = "17.03";
                   };
               };
           }
diff --git a/nixos/tests/radicale.nix b/nixos/tests/radicale.nix
index 8ac0639c6a8c..e38430385415 100644
--- a/nixos/tests/radicale.nix
+++ b/nixos/tests/radicale.nix
@@ -43,7 +43,7 @@ in
             });
           })
         ];
-        system.stateVersion = "17.03";
+        system.nixos.stateVersion = "17.03";
       };
       radicale1_export = lib.recursiveUpdate radicale1 {
         services.radicale.extraArgs = [
@@ -54,7 +54,7 @@ in
         services.radicale.extraArgs = [ "--verify-storage" ];
       };
       radicale2 = lib.recursiveUpdate (common args) {
-        system.stateVersion = "17.09";
+        system.nixos.stateVersion = "17.09";
       };
     };
 

From 4017fdcafdd4a1a2063b74bc46c744c85ffcc22e Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 22 Feb 2018 21:31:38 +0000
Subject: [PATCH 1716/3370] lib: modules: propagate `highestPrio`

Yeah, it's ugly. But it's the minimal change that doesn't break anything
else.
---
 lib/modules.nix | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/lib/modules.nix b/lib/modules.nix
index 6c8033322a54..41a5fb89fde5 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -310,6 +310,7 @@ rec {
 
     in opt //
       { value = builtins.addErrorContext "while evaluating the option `${showOption loc}':" value;
+        inherit (res.defsFinal') highestPrio;
         definitions = map (def: def.value) res.defsFinal;
         files = map (def: def.file) res.defsFinal;
         inherit (res) isDefined;
@@ -317,7 +318,7 @@ rec {
 
   # Merge definitions of a value of a given type.
   mergeDefinitions = loc: type: defs: rec {
-    defsFinal =
+    defsFinal' =
       let
         # Process mkMerge and mkIf properties.
         defs' = concatMap (m:
@@ -325,15 +326,20 @@ rec {
         ) defs;
 
         # Process mkOverride properties.
-        defs'' = filterOverrides defs';
+        defs'' = filterOverrides' defs';
 
         # Sort mkOrder properties.
         defs''' =
           # Avoid sorting if we don't have to.
-          if any (def: def.value._type or "" == "order") defs''
-          then sortProperties defs''
-          else defs'';
-      in defs''';
+          if any (def: def.value._type or "" == "order") defs''.values
+          then sortProperties defs''.values
+          else defs''.values;
+      in {
+        values = defs''';
+        inherit (defs'') highestPrio;
+      };
+
+    defsFinal = defsFinal'.values;
 
     # Type-check the remaining definitions, and merge them.
     mergedValue = foldl' (res: def:
@@ -416,13 +422,18 @@ rec {
 
      Note that "z" has the default priority 100.
   */
-  filterOverrides = defs:
+  filterOverrides = defs: (filterOverrides' defs).values;
+
+  filterOverrides' = defs:
     let
       defaultPrio = 100;
       getPrio = def: if def.value._type or "" == "override" then def.value.priority else defaultPrio;
       highestPrio = foldl' (prio: def: min (getPrio def) prio) 9999 defs;
       strip = def: if def.value._type or "" == "override" then def // { value = def.value.content; } else def;
-    in concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
+    in {
+      values = concatMap (def: if getPrio def == highestPrio then [(strip def)] else []) defs;
+      inherit highestPrio;
+    };
 
   /* Sort a list of properties.  The sort priority of a property is
      1000 by default, but can be overridden by wrapping the property

From 1f0b6922d3c2de3da235a7075d0d3cb9255b7cd7 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 22 Feb 2018 21:31:57 +0000
Subject: [PATCH 1717/3370] nixos: version: produce a warning when no
 `system.nixos.stateVersion` is explicitly set

---
 nixos/modules/misc/version.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index c45d5b077481..33d8a7861693 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ options, config, lib, pkgs, ... }:
 
 with lib;
 
@@ -76,6 +76,9 @@ in
 
   config = {
 
+    warnings = lib.optional (options.system.nixos.stateVersion.highestPrio > 1000)
+      "You don't have `system.nixos.stateVersion` explicitly set. Expect things to break.";
+
     system.nixos = {
       # These defaults are set here rather than up there so that
       # changing them would not rebuild the manual

From 8e7f0bc862300e8d9b59f7c603faa330b8efcd1c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Sat, 12 May 2018 21:44:47 +0200
Subject: [PATCH 1718/3370] youtube-dl: Disable phantomjs support by default

This caused a massive increase in closure size (217 -> 530 MiB).
---
 pkgs/tools/misc/youtube-dl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 19173de41e5f..b7e3116b672e 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -8,7 +8,7 @@
 , generateManPage ? false
 , ffmpegSupport ? true
 , rtmpSupport ? true
-, phantomjsSupport ? !targetPlatform.isDarwin # phantomjs2 is broken on darwin
+, phantomjsSupport ? false
 , hlsEncryptedSupport ? true
 , makeWrapper }:
 

From 3eabf15f9b10d6b4ea67e787697802c263ae7994 Mon Sep 17 00:00:00 2001
From: Tmplt <tmplt@dragons.rocks>
Date: Tue, 8 May 2018 00:40:10 +0200
Subject: [PATCH 1719/3370] soxt: init at 1.3.0

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

diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix
new file mode 100644
index 000000000000..13f037960b08
--- /dev/null
+++ b/pkgs/development/libraries/soxt/default.nix
@@ -0,0 +1,21 @@
+{ fetchurl, stdenv, coin3d, motif, xlibsWrapper, libGLU_combined }:
+
+stdenv.mkDerivation rec {
+  name = "soxt-${version}";
+  version = "1.3.0";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/Coin3D/coin/downloads/SoXt-${version}.tar.gz";
+    sha256= "f5443aadafe8e2222b9b5a23d1f228bb0f3e7d98949b8ea8676171b7ea5bf013";
+  };
+
+  buildInputs = [ coin3d motif xlibsWrapper libGLU_combined ];
+
+  meta = with stdenv.lib; {
+    homepage = http://www.coin3d.org/;
+    license = licenses.bsd3;
+    description = "A GUI binding for using Open Inventor with Xt/Motif";
+    maintainers = with maintainers; [ tmplt ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fea71173109..f50bc1d027df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8623,6 +8623,8 @@ with pkgs;
 
   coin3d = callPackage ../development/libraries/coin3d { };
 
+  soxt = callPackage ../development/libraries/soxt { };
+
   CoinMP = callPackage ../development/libraries/CoinMP { };
 
   commoncpp2 = callPackage ../development/libraries/commoncpp2 { };

From 024efc950923730bc3e7e05a87b90c157324e912 Mon Sep 17 00:00:00 2001
From: Tmplt <tmplt@dragons.rocks>
Date: Thu, 26 Apr 2018 01:39:11 +0200
Subject: [PATCH 1720/3370] geant4: v10.0.2 -> v10.4.1, define datasets
 seperately, add deps for enableInventor

By seperating the datasets, geant4 now builds in a sandbox.

Resolves #39766
---
 maintainers/maintainer-list.nix               |   5 +
 .../libraries/physics/geant4/datasets-hook.sh |   5 +
 .../libraries/physics/geant4/datasets.nix     | 103 ++++++++++++++++++
 .../libraries/physics/geant4/default.nix      |  88 ++++++---------
 .../libraries/physics/geant4/fetch.nix        |  12 +-
 .../geant4/{setup-hook.sh => geant4-hook.sh}  |   0
 6 files changed, 157 insertions(+), 56 deletions(-)
 create mode 100644 pkgs/development/libraries/physics/geant4/datasets-hook.sh
 create mode 100644 pkgs/development/libraries/physics/geant4/datasets.nix
 rename pkgs/development/libraries/physics/geant4/{setup-hook.sh => geant4-hook.sh} (100%)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index aec6f67a9191..5352d4027bb6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3726,6 +3726,11 @@
     github = "titanous";
     name = "Jonathan Rudenberg";
   };
+  tmplt = {
+    email = "tmplt@dragons.rocks";
+    github = "tmplt";
+    name = "Viktor";
+  };
   tnias = {
     email = "phil@grmr.de";
     github = "tnias";
diff --git a/pkgs/development/libraries/physics/geant4/datasets-hook.sh b/pkgs/development/libraries/physics/geant4/datasets-hook.sh
new file mode 100644
index 000000000000..14e3b8f2fc38
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/datasets-hook.sh
@@ -0,0 +1,5 @@
+@name@ () {
+    export G4@envvar@DATA="@out@/data"
+}
+
+postHooks+=(@name@)
diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
new file mode 100644
index 000000000000..88f2dc2cd6d4
--- /dev/null
+++ b/pkgs/development/libraries/physics/geant4/datasets.nix
@@ -0,0 +1,103 @@
+{ stdenv, fetchurl, }:
+
+let
+  mkDataset = { name, version, sha256, envvar}:
+    stdenv.mkDerivation {
+      inherit name version;
+
+      src = fetchurl {
+        url = "https://geant4-data.web.cern.ch/geant4-data/datasets/${name}.${version}.tar.gz";
+        inherit sha256;
+      };
+
+      preferLocalBuild = true;
+      dontBuild = true;
+      dontConfigure = true;
+
+      installPhase = ''
+        mkdir -p $out/data
+        mv ./* $out/data
+      '';
+
+      inherit envvar;
+      setupHook = ./datasets-hook.sh;
+
+      meta = with stdenv.lib; {
+        description = "Data files for the Geant4 toolkit";
+        homepage = "https://geant4.web.cern.ch/support/download";
+        license = licenses.g4sl;
+        platforms = platforms.all;
+      };
+    };
+in
+  builtins.listToAttrs (map (a: { inherit (a) name; value = mkDataset a; }) [
+    {
+      name = "G4NDL";
+      version = "4.5";
+      sha256 = "cba928a520a788f2bc8229c7ef57f83d0934bb0c6a18c31ef05ef4865edcdf8e";
+      envvar = "NEUTRONHP";
+    }
+
+    {
+      name = "G4EMLOW";
+      version = "7.3";
+      sha256 = "583aa7f34f67b09db7d566f904c54b21e95a9ac05b60e2bfb794efb569dba14e";
+      envvar = "LE";
+    }
+
+    {
+      name = "G4PhotonEvaporation";
+      version = "5.2";
+      sha256 = "83607f8d36827b2a7fca19c9c336caffbebf61a359d0ef7cee44a8bcf3fc2d1f";
+      envvar = "LEVELGAMMA";
+    }
+
+    {
+      name = "G4RadioactiveDecay";
+      version = "5.2";
+      sha256 = "99c038d89d70281316be15c3c98a66c5d0ca01ef575127b6a094063003e2af5d";
+      envvar = "RADIOACTIVE";
+    }
+
+    {
+      name = "G4SAIDDATA";
+      version = "1.1";
+      sha256 = "a38cd9a83db62311922850fe609ecd250d36adf264a88e88c82ba82b7da0ed7f";
+      envvar = "SAIDXS";
+    }
+
+    {
+      name = "G4NEUTRONXS";
+      version = "1.4";
+      sha256 = "57b38868d7eb060ddd65b26283402d4f161db76ed2169437c266105cca73a8fd";
+      envvar = "NEUTRONXS";
+    }
+
+    {
+      name = "G4ABLA";
+      version = "3.1";
+      sha256 = "7698b052b58bf1b9886beacdbd6af607adc1e099fc730ab6b21cf7f090c027ed";
+      envvar = "ABLA";
+    }
+
+    {
+      name = "G4PII";
+      version = "1.3";
+      sha256 = "6225ad902675f4381c98c6ba25fc5a06ce87549aa979634d3d03491d6616e926";
+      envvar = "PII";
+    }
+
+    {
+      name = "G4ENSDFSTATE";
+      version = "2.2";
+      sha256 = "dd7e27ef62070734a4a709601f5b3bada6641b111eb7069344e4f99a01d6e0a6";
+      envvar = "ENSDFSTATE";
+    }
+
+    {
+      name = "G4RealSurface";
+      version = "2.1";
+      sha256 = "2a287adbda1c0292571edeae2082a65b7f7bd6cf2bf088432d1d6f889426dcf3";
+      envvar = "REALSURFACE";
+    }
+  ])
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
index 794d0b24c778..87af069c18a5 100644
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ b/pkgs/development/libraries/physics/geant4/default.nix
@@ -24,9 +24,14 @@
 # For enableXM.
 , motif ? null # motif or lesstif
 
+# For enableInventor
+, coin3d
+, soxt
+, libXpm ? null
+
 # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU_combined   ? null
-, xlibsWrapper    ? null
+, libGLU_combined ? null
+, xlibsWrapper ? null
 , libXmu ? null
 }:
 
@@ -43,6 +48,7 @@ assert enableXM -> motif != null;
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined   != null;
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper    != null;
 assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null;
+assert enableInventor -> libXpm != null;
 
 let
   buildGeant4 =
@@ -52,18 +58,11 @@ let
       inherit version src;
       name = "geant4-${version}";
 
-      # The data directory holds not just interaction cross section data, but other
-      # files which the installer needs to write, so we link to the previously installed
-      # data instead. This assumes the default data installation location of $out/share.
-      preConfigure = ''
-        mkdir -p $out/share/Geant4-${version}
-        ln -s ${g4data}/Geant4-${version}/data $out/share/Geant4-${version}/data
-      '';
-
       multiThreadingFlag = if multiThreadingCapable then "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" else "";
 
       cmakeFlags = ''
         ${multiThreadingFlag}
+        -DGEANT4_INSTALL_DATA=OFF
         -DGEANT4_USE_GDML=${if enableGDML then "ON" else "OFF"}
         -DGEANT4_USE_G3TOG4=${if enableG3toG4 then "ON" else "OFF"}
         -DGEANT4_USE_QT=${if enableQT then "ON" else "OFF"}
@@ -74,24 +73,31 @@ let
         -DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}
         -DGEANT4_USE_SYSTEM_EXPAT=${if expat != null then "ON" else "OFF"}
         -DGEANT4_USE_SYSTEM_ZLIB=${if zlib != null then "ON" else "OFF"}
+        -DINVENTOR_INCLUDE_DIR=${coin3d}/include
+        -DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so
       '';
 
-      g4data = installData {
-        inherit version src;
-      };
-
       enableParallelBuilding = true;
-      buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ];
-      propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ];
+      buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
+      propagatedBuildInputs = [ clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu libXpm coin3d soxt ];
 
-      setupHook = ./setup-hook.sh;
+      postFixup = ''
+        # Don't try to export invalid environment variables.
+        sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
+      '';
+
+      setupHook = ./geant4-hook.sh;
+
+      passthru = {
+        data = import ./datasets.nix { inherit stdenv fetchurl; };
+      };
 
       # Set the myriad of envars required by Geant4 if we use a nix-shell.
       shellHook = ''
         source $out/nix-support/setup-hook
       '';
 
-      meta = {
+      meta = with stdenv.lib; {
         description = "A toolkit for the simulation of the passage of particles through matter";
         longDescription = ''
           Geant4 is a toolkit for the simulation of the passage of particles through matter.
@@ -99,44 +105,12 @@ let
           The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
         '';
         homepage = http://www.geant4.org;
-        license = stdenv.lib.licenses.g4sl;
-        maintainers = [ ];
-        platforms = stdenv.lib.platforms.all;
+        license = licenses.g4sl;
+        maintainers = with maintainers; [ tmplt ];
+        platforms = platforms.all;
       };
     };
 
-  installData = 
-    { version, src }:
- 
-    stdenv.mkDerivation rec {
-      inherit version src;
-      name = "g4data-${version}";
-
-      cmakeFlags = ''
-        -DGEANT4_INSTALL_DATA="ON"
-      '';
-
-      buildInputs = [ cmake expat ];
-
-      enableParallelBuilding = true;
-      buildPhase = ''
-        make G4EMLOW G4NDL G4NEUTRONXS G4PII G4SAIDDATA PhotonEvaporation RadioactiveDecay RealSurface
-      '';
-
-      installPhase = ''
-        mkdir -p $out/Geant4-${version}
-        cp -R data/ $out/Geant4-${version}
-      '';
-
-      meta = {
-        description = "Data files for the Geant4 toolkit";
-        homepage = http://www.geant4.org;
-        license = stdenv.lib.licenses.g4sl;
-        maintainers = [ ];
-        platforms = stdenv.lib.platforms.all;
-      };
-    }; 
-
   fetchGeant4 = import ./fetch.nix {
     inherit stdenv fetchurl;
   };
@@ -146,5 +120,9 @@ in {
     inherit (fetchGeant4.v10_0_2) version src;
     multiThreadingCapable = true;
   };
-} 
- 
+
+  v10_4_1 = buildGeant4 {
+    inherit (fetchGeant4.v10_4_1) version src;
+    multiThreadingCapable = true;
+  };
+}
diff --git a/pkgs/development/libraries/physics/geant4/fetch.nix b/pkgs/development/libraries/physics/geant4/fetch.nix
index 0e5dd54c6ae7..7dc4c8656279 100644
--- a/pkgs/development/libraries/physics/geant4/fetch.nix
+++ b/pkgs/development/libraries/physics/geant4/fetch.nix
@@ -13,7 +13,17 @@ in {
     src = fetchurl{
       url = "http://geant4.cern.ch/support/source/geant4.10.00.p02.tar.gz";
       sha256 = "9d615200901f1a5760970e8f5970625ea146253e4f7c5ad9df2a9cf84549e848";
-    };  
+    };
   };
+
+  v10_4_1 = fetch {
+    version = "10.4.1";
+
+    src = fetchurl{
+      url = "http://cern.ch/geant4-data/releases/geant4.10.04.p01.tar.gz";
+      sha256 = "a3eb13e4f1217737b842d3869dc5b1fb978f761113e74bd4eaf6017307d234dd";
+    };
+  };
+
 }
 
diff --git a/pkgs/development/libraries/physics/geant4/setup-hook.sh b/pkgs/development/libraries/physics/geant4/geant4-hook.sh
similarity index 100%
rename from pkgs/development/libraries/physics/geant4/setup-hook.sh
rename to pkgs/development/libraries/physics/geant4/geant4-hook.sh

From 59844d7a6e1a1fce86f7c9f5e0dada4a447e8f6e Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 12 May 2018 23:02:52 +0300
Subject: [PATCH 1721/3370] xsv: 0.12.2 -> 0.13.0

---
 pkgs/tools/text/xsv/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix
index 23f172f4ebe1..960449cd0228 100644
--- a/pkgs/tools/text/xsv/default.nix
+++ b/pkgs/tools/text/xsv/default.nix
@@ -1,24 +1,22 @@
 { stdenv, fetchFromGitHub, rustPlatform }:
 
-with rustPlatform;
-
-buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
   name = "xsv-${version}";
-  version = "0.12.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "xsv";
-    rev = "${version}";
-    sha256 = "0z1z3b6nzaid510jaikkawvpmv4kjphzz84p0hppq6vcp5jy00s2";
+    rev = version;
+    sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045";
   };
 
-  cargoSha256 = "0pdzh2xr40dgwravh3i58g602bpszj6c8inggzgmq2kfk8ck6rgj";
+  cargoSha256 = "1qk5wkjm3d4dz5fldlq7rjlm602v0l04hxrbar2j6vhcz9w2r4n6";
 
   meta = with stdenv.lib; {
     description = "A fast CSV toolkit written in Rust";
     homepage = https://github.com/BurntSushi/xsv;
-    license = with licenses; [ unlicense ];
+    license = with licenses; [ unlicense /* or */ mit ];
     maintainers = [ maintainers.jgertm ];
     platforms = platforms.all;
   };

From 0e57b81b2dd69a9fdf2166cdf2d2c129176081de Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 12 May 2018 22:57:05 +0200
Subject: [PATCH 1722/3370] gnome3.gnome-shell: fix libgnomekdb path

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix    |  1 +
 .../desktops/gnome-3/core/gnome-shell/fix-paths.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index 6b1e15bbc993..ae9aa047ba02 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -59,6 +59,7 @@ in stdenv.mkDerivation rec {
     })
     (substituteAll {
       src = ./fix-paths.patch;
+      inherit (gnome3) libgnomekbd;
       inherit unzip;
     })
   ];
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
index 7b7ff85a7c81..32a0cc476da0 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
@@ -9,3 +9,14 @@
                                            null,
                                            GLib.SpawnFlags.SEARCH_PATH | GLib.SpawnFlags.DO_NOT_REAP_CHILD,
                                            null);
+--- a/js/ui/status/keyboard.js
++++ b/js/ui/status/keyboard.js
+@@ -1019,7 +1019,7 @@
+         if (xkbVariant.length > 0)
+             description = description + '\t' + xkbVariant;
+ 
+-        Util.spawn(['gkbd-keyboard-display', '-l', description]);
++        Util.spawn(['@libgnomekbd@/bin/gkbd-keyboard-display', '-l', description]);
+     },
+ 
+     _containerGetPreferredWidth: function(container, for_height, alloc) {

From ea8a62add90c7f8704a31c8c28a59e2873a978ae Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 12 May 2018 23:17:03 +0200
Subject: [PATCH 1723/3370] pythonPackages.sasmodels: fix build (#40381)

* The revision checksum changed, so it's safer to pin the package
  against an explicit `git` tag (https://github.com/NixOS/nixpkgs/pull/40381#issuecomment-388484695)

* Repaired `checkPhase` to run `py.test` properly on Python {2,3}

* Bumped to latest revision (unstable-2018-04-27) as it supports the entire test suite
  properly.
---
 .../python-modules/sasmodels/default.nix      | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix
index d33de9c2a73a..d84e83299039 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/pkgs/development/python-modules/sasmodels/default.nix
@@ -1,20 +1,26 @@
-{lib, fetchgit, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils}:
+{ lib, fetchFromGitHub, buildPythonPackage, pytest, numpy, scipy, matplotlib, docutils
+, pyopencl, opencl-headers
+}:
 
 buildPythonPackage rec {
-  pname = "sasmodels";
-  version = "0.96";
+  pname = "sasmodels-unstable";
+  version = "2018-04-27";
 
-  buildInputs = [pytest];
-  propagatedBuildInputs = [docutils matplotlib numpy scipy];
-
-  preCheck = ''export HOME=$(mktemp -d)'';
-
-  src = fetchgit {
-    url = "https://github.com/SasView/sasmodels.git";
-    rev = "v${version}";
-    sha256 = "11qaaqdc23qzb75zs48fkypksmcb332vl0pkjqr5bijxxymgm7nw";
+  src = fetchFromGitHub {
+    owner = "SasView";
+    repo = "sasmodels";
+    rev = "33969b656596e8b6cc8ce934cd1f8062f7b11cf2";
+    sha256 = "00rvhafg08qvx0k9mzn1ppdkc9i5yfn2gr3hidrf416srf8zgb85";
   };
 
+  buildInputs = [ opencl-headers ];
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ docutils matplotlib numpy scipy pyopencl ];
+
+  checkPhase = ''
+    HOME=$(mktemp -d) py.test -c ./pytest.ini
+  '';
+
   meta = {
     description = "Library of small angle scattering models";
     homepage = http://sasview.org;

From ba4b1d2beedeeb2a20a71d3685457d3f36f1813d Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Sun, 13 May 2018 07:21:34 +0900
Subject: [PATCH 1724/3370] neovim: fix gperf error on dev-version

[ 50%] Generating auto/api/private/dispatch_wrappers.c.generated.h, ../../include/api/private/dispatch_wrappers.h.generated.h
[ 50%] Generating auto/funcs.generated.h, ../../funcs_data.mpack
/nix/store/xn5gv3lpfy91yvfy9b0i7klfcxh9xskz-bash-4.4-p19/bin/bash: ../../../.deps/usr/bin/gperf: No such file or directory
---
 pkgs/applications/editors/neovim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 149f7804a799..480b749d201c 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -75,6 +75,7 @@ let
 
     cmakeFlags = [
       "-DLUA_PRG=${luaPackages.lua}/bin/lua"
+      "-DGPERF_PRG=${gperf}/bin/gperf"
     ];
 
     # triggers on buffer overflow bug while running tests

From 70ef1faa253d635b0d492406363ceb7f472041e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 12 May 2018 18:20:38 -0300
Subject: [PATCH 1725/3370] materia-theme: unset $name in install script

- install.sh uses a global environment variable called $name, if defined,
to name the theme. This is an issue because nix sets this variable to
the package name.

- Replace gnome-themes-standard to gnome-themes-extra.
---
 pkgs/misc/themes/materia-theme/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 69a874d07c3f..4b6d364a8569 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];
 
-  buildInputs = [ gnome3.gnome-themes-standard gdk_pixbuf librsvg ];
+  buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
       -e "s|if .*which gnome-shell.*;|if true;|" \
       -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
     mkdir -p $out/share/themes
-    ./install.sh --dest $out/share/themes
+    # name is used internally by the package installation script
+    name= ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
   '';
 

From 64df9b6b899fc734577f9b832f17ba3286db1634 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 12 May 2018 17:11:41 -0400
Subject: [PATCH 1726/3370] GHCJS 8.4

---
 .../compilers/ghcjs-ng/8.4/dep-overrides.nix  |   7 +
 .../compilers/ghcjs-ng/8.4/git.json           |   6 +
 .../compilers/ghcjs-ng/8.4/stage0.nix         | 175 ++++++++++++++++++
 .../configuration-ghc-8.4.x.nix               |   5 +-
 pkgs/top-level/haskell-packages.nix           |  13 ++
 5 files changed, 205 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/git.json
 create mode 100644 pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix

diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
new file mode 100644
index 000000000000..2d0ed55c6cd1
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/dep-overrides.nix
@@ -0,0 +1,7 @@
+{ haskellLib }:
+
+let inherit (haskellLib) dontCheck doJailbreak;
+in self: super: {
+  haddock-library-ghcjs = dontCheck super.haddock-library-ghcjs;
+  haddock-api-ghcjs = doJailbreak super.haddock-api-ghcjs;
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
new file mode 100644
index 000000000000..2d4a7a42667b
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
@@ -0,0 +1,6 @@
+{
+  "url": "https://github.com/ghcjs/ghcjs",
+  "rev": "c494a598d1e5b6d70ddcb97177dc4b6cc71f5bd0",
+  "sha256": "1gpn1y3m2gk2x4anfh11p4cp49blabj761wicawvkw0w9bfhcfhn",
+  "fetchSubmodules": true
+}
diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
new file mode 100644
index 000000000000..051b0a19b5b5
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/stage0.nix
@@ -0,0 +1,175 @@
+{ callPackage, configuredSrc }:
+
+{
+
+  ghcjs = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, base16-bytestring
+    , base64-bytestring, binary, bytestring, Cabal, containers
+    , cryptohash, data-default, deepseq, directory, executable-path
+    , filepath, ghc-api-ghcjs, ghc-boot, ghc-paths, ghci-ghcjs
+    , ghcjs-th, haddock-api-ghcjs, hashable, haskell-src-exts
+    , haskell-src-meta, http-types, HUnit, lens, lifted-base, mtl
+    , network, optparse-applicative, parallel, parsec, process, random
+    , regex-posix, safe, shelly, split, stdenv, stringsearch, syb
+    , system-fileio, system-filepath, tar, template-haskell
+    , template-haskell-ghcjs, terminfo, test-framework
+    , test-framework-hunit, text, time, transformers
+    , transformers-compat, unix, unix-compat, unordered-containers
+    , vector, wai, wai-app-static, wai-extra, wai-websockets, warp
+    , webdriver, websockets, wl-pprint-text, yaml
+    }:
+    mkDerivation {
+      pname = "ghcjs";
+      version = "8.4.0.1";
+      src = configuredSrc + /.;
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      setupHaskellDepends = [
+        base Cabal containers directory filepath process template-haskell
+        transformers
+      ];
+      libraryHaskellDepends = [
+        aeson array attoparsec base base16-bytestring base64-bytestring
+        binary bytestring Cabal containers cryptohash data-default deepseq
+        directory filepath ghc-api-ghcjs ghc-boot ghc-paths ghci-ghcjs
+        ghcjs-th hashable haskell-src-exts haskell-src-meta lens mtl
+        optparse-applicative parallel parsec process regex-posix safe split
+        stringsearch syb template-haskell template-haskell-ghcjs text time
+        transformers unordered-containers vector wl-pprint-text yaml
+      ];
+      executableHaskellDepends = [
+        aeson base binary bytestring Cabal containers directory
+        executable-path filepath ghc-api-ghcjs ghc-boot haddock-api-ghcjs
+        lens mtl optparse-applicative process shelly system-fileio
+        system-filepath tar terminfo text time transformers
+        transformers-compat unix unix-compat unordered-containers vector
+        yaml
+      ];
+      testHaskellDepends = [
+        aeson base bytestring data-default deepseq directory http-types
+        HUnit lens lifted-base network optparse-applicative process random
+        shelly system-fileio system-filepath test-framework
+        test-framework-hunit text time transformers unordered-containers
+        wai wai-app-static wai-extra wai-websockets warp webdriver
+        websockets yaml
+      ];
+      description = "Haskell to JavaScript compiler";
+      license = stdenv.lib.licenses.mit;
+    }) {};
+
+  ghc-api-ghcjs = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+    , deepseq, directory, filepath, ghc-boot, ghc-boot-th, ghci-ghcjs
+    , hpc, process, stdenv, template-haskell-ghcjs, terminfo, time
+    , transformers, unix
+    }:
+    mkDerivation {
+      pname = "ghc-api-ghcjs";
+      version = "8.4.0";
+      src = configuredSrc + /lib/ghc-api-ghcjs;
+      libraryHaskellDepends = [
+        array base binary bytestring containers deepseq directory filepath
+        ghc-boot ghc-boot-th ghci-ghcjs hpc process template-haskell-ghcjs
+        terminfo time transformers unix
+      ];
+      homepage = "http://www.haskell.org/ghc/";
+      description = "The GHC API (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  ghci-ghcjs = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+    , deepseq, filepath, ghc-boot, ghc-boot-th, stdenv
+    , template-haskell-ghcjs, transformers, unix
+    }:
+    mkDerivation {
+      pname = "ghci-ghcjs";
+      version = "8.4.0";
+      src = configuredSrc + /lib/ghci-ghcjs;
+      libraryHaskellDepends = [
+        array base binary bytestring containers deepseq filepath ghc-boot
+        ghc-boot-th template-haskell-ghcjs transformers unix
+      ];
+      description = "The library supporting GHC's interactive interpreter (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  ghcjs-th = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, ghc-prim
+    , ghci-ghcjs, stdenv, template-haskell-ghcjs
+    }:
+    mkDerivation {
+      pname = "ghcjs-th";
+      version = "0.1.0.0";
+      src = configuredSrc + /lib/ghcjs-th;
+      libraryHaskellDepends = [
+        base binary bytestring containers ghc-prim ghci-ghcjs
+        template-haskell-ghcjs
+      ];
+      homepage = "http://github.com/ghcjs";
+      license = stdenv.lib.licenses.mit;
+    }) {};
+
+  haddock-api-ghcjs = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers, deepseq
+    , directory, filepath, ghc-api-ghcjs, ghc-boot, ghc-paths
+    , haddock-library-ghcjs, hspec, hspec-discover, QuickCheck, stdenv
+    , transformers, xhtml
+    }:
+    mkDerivation {
+      pname = "haddock-api-ghcjs";
+      version = "2.20.0";
+      src = configuredSrc + /lib/haddock-api-ghcjs;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        array base bytestring Cabal containers deepseq directory filepath
+        ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs transformers
+        xhtml
+      ];
+      testHaskellDepends = [
+        array base bytestring Cabal containers deepseq directory filepath
+        ghc-api-ghcjs ghc-boot ghc-paths haddock-library-ghcjs hspec
+        QuickCheck transformers xhtml
+      ];
+      testToolDepends = [ hspec-discover ];
+      homepage = "http://www.haskell.org/haddock/";
+      description = "A documentation-generation tool for Haskell libraries";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  haddock-library-ghcjs = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
+    , directory, filepath, haddock-library, hspec, hspec-discover
+    , optparse-applicative, QuickCheck, stdenv, transformers, tree-diff
+    }:
+    mkDerivation {
+      pname = "haddock-library-ghcjs";
+      version = "1.6.0";
+      src = configuredSrc + /lib/haddock-library-ghcjs;
+      libraryHaskellDepends = [
+        base bytestring containers deepseq transformers
+      ];
+      testHaskellDepends = [
+        base base-compat bytestring containers deepseq directory filepath
+        haddock-library hspec optparse-applicative QuickCheck transformers
+        tree-diff
+      ];
+      testToolDepends = [ hspec-discover ];
+      homepage = "http://www.haskell.org/haddock/";
+      description = "Library exposing some functionality of Haddock";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+  template-haskell-ghcjs = callPackage
+    ({ mkDerivation, base, ghc-boot-th, pretty, stdenv }:
+    mkDerivation {
+      pname = "template-haskell-ghcjs";
+      version = "2.13.0.0";
+      src = configuredSrc + /lib/template-haskell-ghcjs;
+      libraryHaskellDepends = [ base ghc-boot-th pretty ];
+      description = "Support library for Template Haskell (customized for GHCJS)";
+      license = stdenv.lib.licenses.bsd3;
+    }) {};
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 70624d1ed6a8..12fd59748307 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -105,6 +105,9 @@ self: super: {
   ## hspec-discover ==2.4.8
   hspec-discover = super.hspec-discover_2_5_0;
 
+  # https://github.com/jcristovao/enclosed-exceptions/issues/12
+  enclosed-exceptions = dontCheck super.enclosed-exceptions;
+
   ## On Hackage:
 
   ## Upstreamed, awaiting a Hackage release
@@ -450,7 +453,7 @@ self: super: {
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2;
   pandoc-types = self.pandoc-types_1_17_4_2;
-  wl-pprint-text = self.wl-pprint-text_1_1_1_1;
+  wl-pprint-text = self.wl-pprint-text_1_2_0_0;
   base-compat = self.base-compat_0_10_1;
 
   # https://github.com/xmonad/xmonad/issues/155
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 837f8eb794d0..c00bce430c3c 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -95,6 +95,13 @@ in rec {
       stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
       ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {};
     };
+    ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
+      bootPkgs = packages.ghc842;
+      inherit (bootPkgs) alex happy;
+      ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.4/git.json;
+      stage0 = ../development/compilers/ghcjs-ng/8.4/stage0.nix;
+      ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.4/dep-overrides.nix {};
+    };
 
     # The integer-simple attribute set contains all the GHC compilers
     # build with integer-simple instead of integer-gmp.
@@ -169,6 +176,12 @@ in rec {
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
+    ghcjs84 = callPackage ../development/haskell-modules rec {
+      buildHaskellPackages = ghc.bootPkgs;
+      ghc = bh.compiler.ghcjs84;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
+    };
 
     # The integer-simple attribute set contains package sets for all the GHC compilers
     # using integer-simple instead of integer-gmp.

From da0883134532ee35a4d7c477ae0a1fcb0380605b Mon Sep 17 00:00:00 2001
From: CrazedProgrammer <crazedprogrammer@gmail.com>
Date: Sun, 13 May 2018 00:10:36 +0200
Subject: [PATCH 1727/3370] compsize: init at 2018-04-07 (#40217)

---
 maintainers/maintainer-list.nix             |  5 ++++
 pkgs/os-specific/linux/compsize/default.nix | 30 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/os-specific/linux/compsize/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b8746b04283b..fe9b45a6b220 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -43,6 +43,11 @@
     github = "ChengCat";
     name = "Yucheng Zhang";
   };
+  CrazedProgrammer = {
+    email = "crazedprogrammer@gmail.com";
+    github = "CrazedProgrammer";
+    name = "CrazedProgrammer";
+  };
   CrystalGamma = {
     email = "nixos@crystalgamma.de";
     github = "CrystalGamma";
diff --git a/pkgs/os-specific/linux/compsize/default.nix b/pkgs/os-specific/linux/compsize/default.nix
new file mode 100644
index 000000000000..a18011836f97
--- /dev/null
+++ b/pkgs/os-specific/linux/compsize/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, btrfs-progs }:
+
+stdenv.mkDerivation rec {
+  name = "compsize-${version}";
+  version = "2018-04-07";
+
+  src = fetchFromGitHub {
+    owner = "kilobyte";
+    repo = "compsize";
+    rev = "903f772e37fc0ac6d6cf94ddbc98c691763c1e62";
+    sha256 = "0jps8n0xsdh4mcww5q29rzysbv50iq6rmihxrf99lzgrw0sw5m7k";
+  };
+
+  buildInputs = [ btrfs-progs ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/man/man8
+    install -m 0755 compsize $out/bin
+    install -m 0444 compsize.8 $out/share/man/man8
+  '';
+
+  meta = with stdenv.lib; {
+    description = "btrfs: Find compression type/ratio on a file or set of files";
+    homepage    = https://github.com/kilobyte/compsize;
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ CrazedProgrammer ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49bd8adaf333..a65dfde553c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1062,6 +1062,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Foundation AddressBook;
   };
 
+  compsize = callPackage ../os-specific/linux/compsize { };
+
   coturn = callPackage ../servers/coturn { };
 
   coursier = callPackage ../development/tools/coursier {};

From 03d4694e6110fa9c16e88ee74085ea2068c27494 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Sun, 13 May 2018 00:17:49 +0200
Subject: [PATCH 1728/3370] hwloc: 1.11.9 -> 1.11.10 (#40382)

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

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index ad39a4fde319..90a16bcf7f94 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -7,11 +7,11 @@ assert x11Support -> libX11 != null && cairo != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "hwloc-1.11.9";
+  name = "hwloc-1.11.10";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
-    sha256 = "0r2im1s5lp7zjwqalcqcnlxx0dsky1bnx5waf2r3rmj888c36hrr";
+    sha256 = "1ryibcng40xcq22lsj85fn2vcvrksdx9rr3wwxpq8dw37lw0is1b";
   };
 
   configureFlags = [

From 3fd8dea3545e551c7e50bd9cc8c760001faf8b8a Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sun, 29 Apr 2018 03:09:11 +0900
Subject: [PATCH 1729/3370] rounded-mgenplus: init at 20150602

---
 pkgs/data/fonts/rounded-mgenplus/default.nix | 37 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/data/fonts/rounded-mgenplus/default.nix

diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/data/fonts/rounded-mgenplus/default.nix
new file mode 100644
index 000000000000..24a29b56bcc8
--- /dev/null
+++ b/pkgs/data/fonts/rounded-mgenplus/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, p7zip }:
+
+let
+  pname = "rounded-mgenplus";
+  version = "20150602";
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  inherit version;
+
+  src = fetchurl {
+    url = "https://osdn.jp/downloads/users/8/8598/${name}.7z";
+    sha256 = "1k15xvzd3s5ppp151wv31wrfq2ri8v96xh7i71i974rxjxj6gspc";
+  };
+
+  nativeBuildInputs = [ p7zip ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackPhase = ''
+    7z x $src
+  '';
+
+  installPhase = ''
+    install -m 444 -D -t $out/share/fonts/${pname} ${pname}-*.ttf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A Japanese font based on Rounded M+ and Noto Sans Japanese";
+    homepage = http://jikasei.me/font/rounded-mgenplus/;
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65dfde553c9..1a386721febb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4712,6 +4712,8 @@ with pkgs;
 
   rnv = callPackage ../tools/text/xml/rnv { };
 
+  rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { };
+
   roundup = callPackage ../tools/misc/roundup { };
 
   routino = callPackage ../tools/misc/routino { };

From 50f5a417b229264937230a6628594bc2a978c91d Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sun, 13 May 2018 07:13:46 +0900
Subject: [PATCH 1730/3370] rounded-mgenplus: add mnacamura as maintainer

---
 maintainers/maintainer-list.nix              | 5 +++++
 pkgs/data/fonts/rounded-mgenplus/default.nix | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fe9b45a6b220..a2db508d4d29 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2506,6 +2506,11 @@
     github = "mmlb";
     name = "Manuel Mendez";
   };
+  mnacamura = {
+    email = "m.nacamura@gmail.com";
+    github = "mnacamura";
+    name = "Mitsuhiro Nakamura";
+  };
   moaxcp = {
     email = "moaxcp@gmail.com";
     github = "moaxcp";
diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/data/fonts/rounded-mgenplus/default.nix
index 24a29b56bcc8..c6cb61b7bd1a 100644
--- a/pkgs/data/fonts/rounded-mgenplus/default.nix
+++ b/pkgs/data/fonts/rounded-mgenplus/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = http://jikasei.me/font/rounded-mgenplus/;
     license = licenses.ofl;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ mnacamura ];
   };
 }

From 98ae4b46c3ee3329c3ae814f5bf54987ebcda07c Mon Sep 17 00:00:00 2001
From: James  Kay <twey@twey.co.uk>
Date: Sat, 12 May 2018 23:37:42 +0100
Subject: [PATCH 1731/3370] pythonPackages.plover.dev: 4.0.0.dev6 -> 4.0.0.dev8
 (#40345)

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

diff --git a/pkgs/applications/misc/plover/default.nix b/pkgs/applications/misc/plover/default.nix
index 09558ff4c47f..b9323ece1f44 100644
--- a/pkgs/applications/misc/plover/default.nix
+++ b/pkgs/applications/misc/plover/default.nix
@@ -24,7 +24,7 @@
 
   dev = with python36Packages; buildPythonPackage rec {
     name    = "plover-${version}";
-    version = "4.0.0.dev6";
+    version = "4.0.0.dev8";
 
     meta = with stdenv.lib; {
       description = "OpenSteno Plover stenography software";
@@ -34,14 +34,14 @@
 
     src = fetchurl {
       url    = "https://github.com/openstenoproject/plover/archive/v${version}.tar.gz";
-      sha256 = "067rkpqnjjxwyv9cwh9i925ndba6fvj6q0r56lizy0l26b4jc8rp";
+      sha256 = "1wxkmik1zyw5gqig5r0cas5v6f5408fbnximzw610rdisqy09rxp";
     };
 
     # I'm not sure why we don't find PyQt5 here but there's a similar
     # sed on many of the platforms Plover builds for
     postPatch = "sed -i /PyQt5/d setup.cfg";
 
-    buildInputs           = [ pytest mock ];
-    propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs ];
+    checkInputs           = [ pytest mock ];
+    propagatedBuildInputs = [ Babel pyqt5 xlib pyserial appdirs wcwidth ];
   };
 }

From 78fba374c47f487824dbd4c75ba7f0366f61608c Mon Sep 17 00:00:00 2001
From: pbogdan <ppbogdan@gmail.com>
Date: Sat, 12 May 2018 23:55:05 +0100
Subject: [PATCH 1732/3370] libsmbios: re-enable python utilities (#39022)

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

diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 62898675f2be..c61fa683c758 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, help2man, gettext
-, libxml2, perl, doxygen }:
+, libxml2, perl, python3, doxygen }:
 
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook doxygen gettext libxml2 help2man perl pkgconfig ];
 
-  configureFlags = [ "--disable-python" "--disable-graphviz" ];
+  buildInputs = [ python3 ];
+
+  configureFlags = [ "--disable-graphviz" ];
 
   enableParallelBuilding = true;
 

From 59edce641426242e510aa5dc7c16cf5d9da0d821 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sun, 13 May 2018 03:16:59 +0300
Subject: [PATCH 1733/3370] kernel: drop tuxOnIce patch (#40411)

Hasn't been updated since 3.14, abandoned by its author, not actually used despite being inside a let binding.
---
 pkgs/os-specific/linux/kernel/patches.nix | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 4ba182ea5a59..fb28bba1c32f 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -1,26 +1,6 @@
 { stdenv, fetchurl, fetchpatch, pkgs }:
 
-let
-
-  makeTuxonicePatch = { version, kernelVersion, sha256,
-    url ? "http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-${kernelVersion}-${version}.patch.bz2" }:
-    { name = "tuxonice-${kernelVersion}";
-      patch = stdenv.mkDerivation {
-        name = "tuxonice-${version}-for-${kernelVersion}.patch";
-        src = fetchurl {
-          inherit url sha256;
-        };
-        phases = [ "installPhase" ];
-        installPhase = ''
-          source $stdenv/setup
-          bunzip2 -c $src > $out
-        '';
-      };
-    };
-in
-
 rec {
-
   bridge_stp_helper =
     { name = "bridge-stp-helper";
       patch = ./bridge-stp-helper.patch;

From 261bc1dc3a90fe938018ee6bcdac86ee01d27cab Mon Sep 17 00:00:00 2001
From: Fahad Sadah <92872+fahadsadah@users.noreply.github.com>
Date: Sun, 6 May 2018 01:43:55 +0100
Subject: [PATCH 1734/3370] sunxi-tools: master20151216 -> master20171130

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

diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
index 59252a938637..7e20d807e61e 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -1,25 +1,25 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libusb }:
+{ stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }:
 
 stdenv.mkDerivation {
-  name = "sunxi-tools-1.3";
+  name = "sunxi-tools-20171130";
 
   src = fetchFromGitHub {
     owner = "linux-sunxi";
     repo = "sunxi-tools";
-    rev = "be1b4c7400161b90437432076360c1f99970f54f";
-    sha256 = "02pqaaahra4wbv325264qh5i17mxwicmjx9nm33nw2dpmfmg9xhr";
+    rev = "5c1971040c6c44caefb98e371bfca9e18d511da9";
+    sha256 = "0qzm515i3dfn82a6sf7372080zb02d365z52bh0b1q711r4dvjgp";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libusb ];
+  buildInputs = [ libusb zlib ];
 
   buildPhase = ''
-    make all misc
+    make tools misc
   '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-part sunxi-pio $out/bin
+    cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-image-builder sunxi-nand-part sunxi-pio $out/bin
   '';
 
   meta = with stdenv.lib; {

From 714aff4004cbd8396624f798a485f2d724d1233c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 13 May 2018 03:53:26 +0300
Subject: [PATCH 1735/3370] sunxi-tools: Use upstream install rule

---
 pkgs/development/tools/sunxi-tools/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
index 7e20d807e61e..0bddd0d3e17c 100644
--- a/pkgs/development/tools/sunxi-tools/default.nix
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -13,14 +13,11 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libusb zlib ];
 
-  buildPhase = ''
-    make tools misc
-  '';
+  makeFlags = [ "PREFIX=$(out)" ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-image-builder sunxi-nand-part sunxi-pio $out/bin
-  '';
+  buildFlags = [ "tools" "misc" ];
+
+  installTargets = [ "install-tools" "install-misc" ];
 
   meta = with stdenv.lib; {
     description = "Tools for Allwinner A10 devices";

From 44d612d6e5188cf6fcb3f2fefb0116e2c979e9c3 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:15:23 +0000
Subject: [PATCH 1736/3370] nixos:
 services.xserver.desktopManager.xterm.enable: fix type

---
 nixos/modules/services/x11/desktop-managers/xterm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/xterm.nix b/nixos/modules/services/x11/desktop-managers/xterm.nix
index 29752ff405e2..6ff1ef0e4c9a 100644
--- a/nixos/modules/services/x11/desktop-managers/xterm.nix
+++ b/nixos/modules/services/x11/desktop-managers/xterm.nix
@@ -12,6 +12,7 @@ in
   options = {
 
     services.xserver.desktopManager.xterm.enable = mkOption {
+      type = types.bool;
       default = true;
       description = "Enable a xterm terminal as a desktop manager.";
     };

From fb2a8d66699c96d6a687eb71ebfcca08e3405037 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:15:37 +0000
Subject: [PATCH 1737/3370] nixos: systemd.services.*.environment: fix type

---
 nixos/modules/system/boot/systemd-unit-options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 5255f1a1b97a..2cff25a8c854 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -217,7 +217,7 @@ in rec {
 
     environment = mkOption {
       default = {};
-      type = with types; attrsOf (nullOr (either str package));
+      type = with types; attrsOf (nullOr (either str (either path package)));
       example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
       description = "Environment variables passed to the service's processes.";
     };

From 1c3492f358f1073253823b76134e24f0d335647a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 12 May 2018 20:23:09 -0500
Subject: [PATCH 1738/3370] kde-gtk-config: Set path for GSettings schemas

Fixes: #38919

The KCModule is patched to set the appropriate environment variables in
the parent process when it is initialized.
---
 .../plasma-5/kde-gtk-config/default.nix       | 10 ++++--
 .../follow-symlinks.patch}                    | 35 +++++++++----------
 .../kde-gtk-config/patches/gsettings.patch    | 21 +++++++++++
 .../plasma-5/kde-gtk-config/patches/series    |  2 ++
 4 files changed, 46 insertions(+), 22 deletions(-)
 rename pkgs/desktops/plasma-5/kde-gtk-config/{0001-follow-symlinks.patch => patches/follow-symlinks.patch} (62%)
 create mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
 create mode 100644 pkgs/desktops/plasma-5/kde-gtk-config/patches/series

diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 35d90a246bc6..8cfc947d30bd 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,21 +1,25 @@
 {
   mkDerivation,
-  extra-cmake-modules,
+  extra-cmake-modules, wrapGAppsHook,
   glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
   knewstuff, gsettings-desktop-schemas
 }:
 
 mkDerivation {
   name = "kde-gtk-config";
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  dontWrapGApps = true;  # There is nothing to wrap
   buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff gsettings-desktop-schemas
   ];
-  patches = [ ./0001-follow-symlinks.patch ];
+  patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
     "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
   ];
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\""
+  '';
 }
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
similarity index 62%
rename from pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
index d610d19eedd2..f30a0a4588fa 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch
@@ -8,11 +8,11 @@ Subject: [PATCH] follow symlinks
  src/iconthemesmodel.cpp | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
-index b1e0b52..095cddc 100644
---- a/src/appearancegtk2.cpp
-+++ b/src/appearancegtk2.cpp
-@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
+Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp
++++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp
+@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile(
      QStringList themes=installedThemes();
      themes=themes.filter(QRegExp("/"+themeName+"/?$"));
      if(themes.size()==1) {
@@ -21,12 +21,12 @@ index b1e0b52..095cddc 100644
          while(it.hasNext()) {
              it.next();
              if(it.fileName()=="gtkrc") {
-diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
-index 07c7ad7..b04d978 100644
---- a/src/iconthemesmodel.cpp
-+++ b/src/iconthemesmodel.cpp
-@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
-     
+Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp
++++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
+@@ -47,7 +47,7 @@ QList<QDir> IconThemesModel::installedTh
+ 
      foreach(const QString& dir, dirs) {
          QDir userIconsDir(dir);
 -        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
@@ -34,14 +34,11 @@ index 07c7ad7..b04d978 100644
          while(it.hasNext()) {
              QString currentPath = it.next();
              QDir dir(currentPath);
--- 
-2.6.2
-
-diff --git a/src/cursorthemesmodel.cpp b/src/cursorthemesmodel.cpp
-index 926a666..85b10f8 100644
---- a/src/cursorthemesmodel.cpp
-+++ b/src/cursorthemesmodel.cpp
-@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installedThemesPaths()
+Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp
++++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
+@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installed
  
      foreach(const QString& dir, dirs) {
          QDir userIconsDir(dir);
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
new file mode 100644
index 000000000000..b4bc89d59e9e
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch
@@ -0,0 +1,21 @@
+Index: kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp
+===================================================================
+--- kde-gtk-config-5.12.4.orig/src/gtkconfigkcmodule.cpp
++++ kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp
+@@ -78,6 +78,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWi
+     m_iconsModel = new IconThemesModel(false, this);
+     ui->cb_icon->setModel(m_iconsModel);
+     ui->cb_icon_fallback->setModel(m_iconsModel);
++
++    // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
++    // Normally this would be done by wrapGAppsHook, but this plugin
++    // (shared object) cannot be wrapped.
++    QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
++    if (!xdgdata.isEmpty()) {
++        xdgdata.push_front(":");
++    }
++    xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
++    qputenv("XDG_DATA_DIRS", xdgdata);
+     
+     m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0";
+     m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini";
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series b/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
new file mode 100644
index 000000000000..7aad1acf6ac4
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/patches/series
@@ -0,0 +1,2 @@
+follow-symlinks.patch
+gsettings.patch

From a2981671523416ad5c9a49de8c16ac8fccb2306b Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sun, 13 May 2018 03:28:27 +0300
Subject: [PATCH 1739/3370] stage-1: remove tuxonice handling

---
 nixos/modules/system/boot/stage-1-init.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 1facf419ed06..92e68b72664a 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -405,15 +405,6 @@ lustrateRoot () {
 
 
 
-
-# Try to resume - all modules are loaded now.
-if test -e /sys/power/tuxonice/resume; then
-    if test -n "$(cat /sys/power/tuxonice/resume)"; then
-        echo 0 > /sys/power/tuxonice/user_interface/enabled
-        echo 1 > /sys/power/tuxonice/do_resume || echo "failed to resume..."
-    fi
-fi
-
 if test -e /sys/power/resume -a -e /sys/power/disk; then
     if test -n "@resumeDevice@" && waitDevice "@resumeDevice@"; then
         resumeDev="@resumeDevice@"

From f14841f3ce734b27988a605fc9775a035d313d23 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 13 May 2018 00:01:52 +0200
Subject: [PATCH 1740/3370] Revert "darwin.libSystem: multiple outputs"

Broke the stdenv.

This reverts commit 69d1b7ab79cc5e46d4b419cfe95c30e58f801a85.
---
 .../apple-source-releases/Libsystem/default.nix  | 16 ++++++----------
 pkgs/stdenv/darwin/default.nix                   |  6 +++---
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index 152f3c5bae38..386480d62902 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -3,17 +3,10 @@
   removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
 
 appleDerivation rec {
+  phases = [ "unpackPhase" "installPhase" ];
+
   nativeBuildInputs = [ cpio ];
 
-  outputs = [ "out" "dev" ];
-
-  bundledHeaders = map stdenv.lib.getDev [ Libc Libm Libinfo dyld architecture
-                                           libclosure CarbonHeaders libdispatch
-                                           ncurses CommonCrypto copyfile
-                                           removefile libresolv Libnotify
-                                           libplatform mDNSResponder launchd
-                                           libutil libpthread ];
-
   installPhase = ''
     export NIX_ENFORCE_PURITY=
 
@@ -24,10 +17,13 @@ appleDerivation rec {
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h        $out/include
 
-    for dep in $bundledHeaders; do
+    for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \
+               ${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
+               ${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
       (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
     done
 
+
     (cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
 
     cat <<EOF > $out/include/TargetConditionals.h
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 98102cd56545..9563f52ea263 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -225,7 +225,7 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
-      (with pkgs.darwin; [ dyld Libsystem Libsystem.dev CF ICU locale ]);
+      (with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
 
     overrides = persistent;
   };
@@ -263,7 +263,7 @@ in rec {
     allowedRequisites =
       [ bootstrapTools ] ++
       (with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
-      (with pkgs.darwin; [ dyld ICU Libsystem Libsystem.dev locale ]);
+      (with pkgs.darwin; [ dyld ICU Libsystem locale ]);
 
     overrides = persistent;
   };
@@ -383,7 +383,7 @@ in rec {
       binutils.bintools darwin.binutils darwin.binutils.bintools
       cc.expand-response-params
     ]) ++ (with pkgs.darwin; [
-      dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale
+      dyld Libsystem CF cctools ICU libiconv locale
     ]);
 
     overrides = self: super:

From e9ed8dd78ea0804d0cb5c6d27d5728f3c8dbd4dd Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 12:17:05 +0200
Subject: [PATCH 1741/3370] sass: 3.4.22 -> 3.5.6

---
 pkgs/development/tools/sass/Gemfile.lock | 12 +++++--
 pkgs/development/tools/sass/default.nix  | 11 +++----
 pkgs/development/tools/sass/gemset.nix   | 41 ++++++++++++++++++++++--
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock
index 82dcddb9ece1..ecd1404e3398 100644
--- a/pkgs/development/tools/sass/Gemfile.lock
+++ b/pkgs/development/tools/sass/Gemfile.lock
@@ -1,7 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    sass (3.4.22)
+    ffi (1.9.23)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
 
 PLATFORMS
   ruby
@@ -10,4 +18,4 @@ DEPENDENCIES
   sass
 
 BUNDLED WITH
-   1.11.2
+   1.14.6
diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix
index cfeb3ccc0f9d..96354acaec48 100644
--- a/pkgs/development/tools/sass/default.nix
+++ b/pkgs/development/tools/sass/default.nix
@@ -1,14 +1,13 @@
-{ lib, bundlerEnv, ruby }:
+{ lib, bundlerApp }:
 
-bundlerEnv {
-  name = "sass-3.4.22";
-
-  inherit ruby;
+bundlerApp {
+  pname = "sass";
   gemdir = ./.;
+  exes = [ "sass" "sass-convert" "scss" ];
 
   meta = with lib; {
     description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS";
-    homepage    = http://sass-lang.com/;
+    homepage    = https://sass-lang.com;
     license     = licenses.mit;
     maintainers = [ maintainers.romildo ];
     platforms   = platforms.unix;
diff --git a/pkgs/development/tools/sass/gemset.nix b/pkgs/development/tools/sass/gemset.nix
index 31e4e6ab6d37..bd25281f14fc 100644
--- a/pkgs/development/tools/sass/gemset.nix
+++ b/pkgs/development/tools/sass/gemset.nix
@@ -1,10 +1,45 @@
 {
-  sass = {
+  ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dkj6v26fkg1g0majqswwmhxva7cd6p3psrhdlx93qal72dssywy";
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
       type = "gem";
     };
-    version = "3.4.22";
+    version = "1.9.23";
+  };
+  rb-fsevent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
+      type = "gem";
+    };
+    version = "0.10.3";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+      type = "gem";
+    };
+    version = "0.9.10";
+  };
+  sass = {
+    dependencies = ["sass-listen"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
+      type = "gem";
+    };
+    version = "3.5.6";
+  };
+  sass-listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+      type = "gem";
+    };
+    version = "4.0.0";
   };
 }
\ No newline at end of file

From 6d8bf113bd9630c7671065871b5b60a4127ec985 Mon Sep 17 00:00:00 2001
From: Stefan Matting <stefan.matting@gmail.com>
Date: Sun, 13 May 2018 14:17:32 +0200
Subject: [PATCH 1742/3370] libgpuarray: add nvidia_x11 as dependency when
 cudaSupport

---
 pkgs/development/python-modules/libgpuarray/default.nix | 7 +++++--
 pkgs/top-level/python-packages.nix                      | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix
index 26fe33995ed8..14e83584678c 100644
--- a/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/pkgs/development/python-modules/libgpuarray/default.nix
@@ -9,10 +9,13 @@
 , nose
 , Mako
 , python
-, cudaSupport ? false, cudatoolkit
+, cudaSupport ? false, cudatoolkit , nvidia_x11
 , openclSupport ? true, ocl-icd, clblas
 }:
 
+assert cudaSupport -> nvidia_x11 != null
+                   && cudatoolkit != null;
+
 buildPythonPackage rec {
   pname = "libgpuarray";
   version = "0.7.5";
@@ -32,7 +35,7 @@ buildPythonPackage rec {
 
   libraryPath = lib.makeLibraryPath (
     []
-    ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out ]
+    ++ lib.optionals cudaSupport [ cudatoolkit.lib cudatoolkit.out nvidia_x11 ]
     ++ lib.optionals openclSupport ([ clblas ] ++ lib.optional (!stdenv.isDarwin) ocl-icd)
   );
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9033c3d825d..ce520ca71193 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7114,6 +7114,7 @@ in {
   libgpuarray = callPackage ../development/python-modules/libgpuarray {
     clblas = pkgs.clblas.override { boost = self.boost; };
     cudaSupport = pkgs.config.cudaSupport or false;
+    inherit (pkgs.linuxPackages) nvidia_x11;
   };
 
   librepo = toPythonModule (pkgs.librepo.override {

From e0cf582493ad249acbf69267e1a2e35f08e37f47 Mon Sep 17 00:00:00 2001
From: Stefan Matting <stefan.matting@gmail.com>
Date: Sun, 13 May 2018 14:23:12 +0200
Subject: [PATCH 1743/3370] Theano: fix broken compiler; Add nvidia_x11 as
 dependency when cudaSupport

---
 pkgs/development/python-modules/Theano/default.nix | 9 ++++++++-
 pkgs/top-level/python-packages.nix                 | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix
index 03dc825218e2..9eb04782d6f8 100644
--- a/pkgs/development/python-modules/Theano/default.nix
+++ b/pkgs/development/python-modules/Theano/default.nix
@@ -15,17 +15,24 @@
 , libgpuarray
 , cudaSupport ? false, cudatoolkit
 , cudnnSupport ? false, cudnn
+, nvidia_x11
 }:
 
 assert cudnnSupport -> cudaSupport;
 
+assert cudaSupport -> nvidia_x11 != null
+                   && cudatoolkit != null
+                   && cudnn != null;
+
 let
   extraFlags =
     lib.optionals cudaSupport [ "-I ${cudatoolkit}/include" "-L ${cudatoolkit}/lib" ]
-    ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ];
+    ++ lib.optionals cudnnSupport [ "-I ${cudnn}/include" "-L ${cudnn}/lib" ]
+    ++ lib.optionals cudaSupport [ "-I ${libgpuarray}/include" "-L ${libgpuarray}/lib" ];
 
   gcc_ = writeScriptBin "g++" ''
     #!${stdenv.shell}
+    export NIX_CC_WRAPPER_${stdenv.cc.infixSalt}_TARGET_HOST=1
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${toString extraFlags}"
     exec ${gcc}/bin/g++ "$@"
   '';
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce520ca71193..a5a24e42865a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12986,6 +12986,7 @@ in {
   Theano = callPackage ../development/python-modules/Theano rec {
     cudaSupport = pkgs.config.cudaSupport or false;
     cudnnSupport = cudaSupport;
+    inherit (pkgs.linuxPackages) nvidia_x11;
   };
 
   TheanoWithoutCuda = self.Theano.override {

From a4b7be9e847c8cd2c3394f20aed734918c03ba45 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 13 May 2018 13:00:24 +0000
Subject: [PATCH 1744/3370] perlPackages.DBFile: db -> db.lib

fix regression after https://github.com/NixOS/nixpkgs/commit/4b0638394d9fb0c4ce505b1187cc4ff3c5f54a10
---
 pkgs/development/perl-modules/DB_File/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index 7dd04463d18f..b6158a61da5f 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -12,7 +12,7 @@ buildPerlPackage rec {
     cat > config.in <<EOF
     PREFIX = size_t
     HASH = u_int32_t
-    LIB = ${db}/lib
+    LIB = ${db.lib}/lib
     INCLUDE = ${db}/include
     EOF
   '';

From 4371e5be0b5f5c45491915658dc20ed6b93e0469 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sun, 13 May 2018 15:25:24 +0200
Subject: [PATCH 1745/3370] libressl_2_7: init at 2.7.3

---
 pkgs/development/libraries/libressl/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                 | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 51162979e630..7e9f187b1f18 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -43,4 +43,9 @@ in {
     version = "2.6.4";
     sha256 = "07yi37a2ghsgj2b4w30q1s4d2inqnix7ika1m21y57p9z71212k3";
   };
+
+  libressl_2_7 = generic {
+    version = "2.7.3";
+    sha256 = "1597kj9jy3jyw52ys19sd4blg2gkam5q0rqdxbnrnvnyw67hviqn";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a386721febb..3a4357a6ec3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10947,7 +10947,8 @@ with pkgs;
 
   inherit (callPackages ../development/libraries/libressl { })
     libressl_2_5
-    libressl_2_6;
+    libressl_2_6
+    libressl_2_7;
 
   libressl = libressl_2_5;
 

From 3e293b2dc3e80490c5275f9b9db69c1232ef757b Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sun, 13 May 2018 15:26:34 +0200
Subject: [PATCH 1746/3370] libressl: use https url in metadata

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

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 7e9f187b1f18..5dfb61f172ff 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -26,7 +26,7 @@ let
 
     meta = with lib; {
       description = "Free TLS/SSL implementation";
-      homepage    = "http://www.libressl.org";
+      homepage    = "https://www.libressl.org";
       platforms   = platforms.all;
       maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
     };

From 991f8db51a6e2d75a4ec774f1de95fbe99a476ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 13 May 2018 14:41:31 +0100
Subject: [PATCH 1747/3370] xorgserver: add mesa_noglu for dri package

---
 pkgs/servers/x11/xorg/overrides.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ce78eba4b432..23aae1134837 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -476,8 +476,6 @@ in
         dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto
         libXfont2
       ];
-      # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316
-      commonPatches = [ ];
       # XQuartz requires two compilations: the first to get X / XQuartz,
       # and the second to get Xvfb, Xnest, etc.
       darwinOtherX = overrideDerivation xorgserver (oldAttrs: {
@@ -494,11 +492,10 @@ in
       if (!isDarwin)
       then {
         outputs = [ "out" "dev" ];
-        buildInputs = [ makeWrapper args.libdrm ] ++ commonBuildInputs;
+        buildInputs = commonBuildInputs ++ [ makeWrapper args.libdrm args.mesa_noglu ];
         propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev
         ];
-        patches = commonPatches;
         prePatch = stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
           export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t"
         '';
@@ -515,6 +512,7 @@ in
         ] ++ lib.optionals stdenv.hostPlatform.isMusl [
           "--disable-tls"
         ];
+
         postInstall = ''
           rm -fr $out/share/X11/xkb/compiled # otherwise X will try to write in it
           ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
@@ -538,7 +536,7 @@ in
         ];
 
         # XQuartz patchset
-        patches = commonPatches ++ [
+        patches = [
           (args.fetchpatch {
             url = "https://github.com/XQuartz/xorg-server/commit/e88fd6d785d5be477d5598e70d105ffb804771aa.patch";
             sha256 = "1q0a30m1qj6ai924afz490xhack7rg4q3iig2gxsjjh98snikr1k";

From 8712ea5ccf70fcd17234edae157ec6631d5dbbc0 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sun, 13 May 2018 17:02:51 +0300
Subject: [PATCH 1748/3370] avocode: init at 2.26.0 (#40425)

---
 .../applications/graphics/avocode/default.nix | 99 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 101 insertions(+)
 create mode 100644 pkgs/applications/graphics/avocode/default.nix

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
new file mode 100644
index 000000000000..7bcbc8f2e400
--- /dev/null
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -0,0 +1,99 @@
+{ stdenv, lib, makeDesktopItem, fetchurl, unzip
+, gdk_pixbuf, glib, gtk2, atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome2
+, xorg, mozjpeg
+}:
+
+stdenv.mkDerivation rec {
+  name = "avocode-${version}";
+  version = "2.26.0";
+
+  src = fetchurl {
+    url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
+    sha256 = "11d3nlshyzh5aqf5vsvnjwhr9qn8a2kd848x0ylv91y9p9njgsl5";
+  };
+
+  libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
+    stdenv.cc.cc.lib
+    gdk_pixbuf
+    glib
+    gtk2
+    atk
+    pango
+    cairo
+    freetype
+    fontconfig
+    dbus
+    nss
+    nspr
+    alsaLib
+    cups
+    expat
+    udev
+    GConf
+    libX11
+    libxcb
+    libXi
+    libXcursor
+    libXdamage
+    libXrandr
+    libXcomposite
+    libXext
+    libXfixes
+    libXrender
+    libXtst
+    libXScrnSaver
+  ]);
+
+  desktopItem = makeDesktopItem {
+    name = "Avocode";
+    exec = "avocode";
+    icon = "avocode";
+    desktopName = "Avocode";
+    genericName = "Design Inspector";
+    categories = "Application;Development;";
+    comment = "The bridge between designers and developers";
+  };
+
+  buildInputs = [ unzip ];
+
+  # src is producing multiple folder on unzip so we must
+  # override unpackCmd to extract it into newly created folder
+  unpackCmd = ''
+    mkdir out
+    unzip $curSrc -d out
+  '';
+
+  installPhase = ''
+    substituteInPlace avocode.desktop.in \
+      --replace /path/to/avocode-dir/Avocode $out/bin/avocode \
+      --replace /path/to/avocode-dir/avocode.png avocode
+
+    mkdir -p share/applications share/pixmaps
+    mv avocode.desktop.in share/applications/avocode.desktop
+    mv avocode.png share/pixmaps/
+
+    rm resources/cjpeg
+    cp -av . $out
+
+    mkdir $out/bin
+    ln -s $out/avocode $out/bin/avocode
+    ln -s ${mozjpeg}/bin/cjpeg $out/resources/cjpeg
+  '';
+
+  postFixup = ''
+    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode
+        patchelf --set-rpath ${libPath}:$out/ $file
+    done
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://avocode.com/;
+    description = "The bridge between designers and developers";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ megheaiulian ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a386721febb..774f2becdd4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14880,6 +14880,8 @@ with pkgs;
 
   autotrace = callPackage ../applications/graphics/autotrace {};
 
+  avocode = callPackage ../applications/graphics/avocode {};
+
   milkytracker = callPackage ../applications/audio/milkytracker { };
 
   schismtracker = callPackage ../applications/audio/schismtracker { };

From be53a0f2effc8933f7a6429da9692e469341bc4b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 13 May 2018 17:25:18 +0200
Subject: [PATCH 1749/3370] sasview: fix build (#40433)

The package breaks currently breaks with the following message:

```
fixed-output derivation produced path '/nix/store/5dh1mdj027ad8sprk12fqa5h5bpdxs5n-sasview' with sha256 hash '12k1w4yq1mzjxcp2cqb562c7cbwzhi54rsbmgi0fax0i1660q167' instead of the expected hash '05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx'
```

To fix the build the following changes were applied:

* Switched to latest master for now as the older releases have a broken
  `py.test` configuration and altering hashes.

* Added `checkPhase` which invokes `py.test` directly and drops
  duplicated files from `dist/tmpbuild`.

* Rebased the patches `pyparsing-fix.patch` and `local_config.patch` for
  the latest master revision.

Additionally refer to the discussion in #40381 for further reference.
---
 .../science/misc/sasview/default.nix          | 45 ++++++++++++-------
 .../science/misc/sasview/local_config.patch   | 20 +++++++--
 .../science/misc/sasview/pyparsing-fix.patch  | 15 ++++---
 3 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix
index d0a4f74924c5..bad29df9dc88 100644
--- a/pkgs/applications/science/misc/sasview/default.nix
+++ b/pkgs/applications/science/misc/sasview/default.nix
@@ -1,7 +1,8 @@
-{lib, fetchgit, gcc, python}:
+{ lib, fetchFromGitHub, gcc, python }:
 
 let
-  xhtml2pdf = import ./xhtml2pdf.nix { inherit lib;
+  xhtml2pdf = import ./xhtml2pdf.nix {
+    inherit lib;
     fetchPypi = python.pkgs.fetchPypi;
     buildPythonPackage = python.pkgs.buildPythonPackage;
     html5lib = python.pkgs.html5lib;
@@ -10,17 +11,29 @@ let
     pillow = python.pkgs.pillow;
     pypdf2 = python.pkgs.pypdf2;
     reportlab = python.pkgs.reportlab;
-};
+  };
 
 in
 
 python.pkgs.buildPythonApplication rec {
   pname = "sasview";
-  version = "4.1.2";
+  version = "unstable-2018-05-05";
 
-  buildInputs = with python.pkgs; [
+  checkInputs = with python.pkgs; [
     pytest
-    unittest-xml-reporting];
+    unittest-xml-reporting
+  ];
+
+  checkPhase = ''
+    # fix the following error:
+    # imported module 'sas.sascalc.data_util.uncertainty' has this __file__ attribute:
+    #   /build/source/build/lib.linux-x86_64-2.7/sas/sascalc/data_util/uncertainty.py
+    # which is not the same as the test file we want to collect:
+    #   /build/source/dist/tmpbuild/sasview/sas/sascalc/data_util/uncertainty.py
+    rm -r dist/tmpbuild
+
+    HOME=$(mktemp -d) py.test
+  '';
 
   propagatedBuildInputs = with python.pkgs; [
     bumps
@@ -41,20 +54,22 @@ python.pkgs.buildPythonApplication rec {
     six
     sphinx
     wxPython
-    xhtml2pdf];
+    xhtml2pdf
+  ];
 
-  src = fetchgit {
-    url = "https://github.com/SasView/sasview.git";
-    rev = "v${version}";
-    sha256 ="05la54wwzzlkhmj8vkr0bvzagyib6z6mgwqbddzjs5y1wd48vpcx";
+  src = fetchFromGitHub {
+    owner = "SasView";
+    repo = "sasview";
+    rev = "de431924d0ddf73cfb952df88bd6661181947019";
+    sha256 = "01bk0i0g65yzyq16n1a61rgjna8rrc2i51x2ndf1z7khb1fl16vg";
   };
 
-  patches = [./pyparsing-fix.patch ./local_config.patch];
+  patches = [ ./pyparsing-fix.patch ./local_config.patch ];
 
-  meta = {
+  meta = with lib; {
     homepage = https://www.sasview.org;
     description = "Fitting and data analysis for small angle scattering data";
-    maintainers = with lib.maintainers; [ rprospero ];
-    license = lib.licenses.bsd3;
+    maintainers = with maintainers; [ rprospero ];
+    license = licenses.bsd3;
   };
 }
diff --git a/pkgs/applications/science/misc/sasview/local_config.patch b/pkgs/applications/science/misc/sasview/local_config.patch
index 91972a913bc4..5b6c3436494a 100644
--- a/pkgs/applications/science/misc/sasview/local_config.patch
+++ b/pkgs/applications/science/misc/sasview/local_config.patch
@@ -1,10 +1,22 @@
+diff --git a/src/sas/_config.py b/src/sas/_config.py
+index ece08fd4c..926768593 100644
 --- a/src/sas/_config.py
 +++ b/src/sas/_config.py
-@@ -70,2 +70,2 @@
+@@ -67,8 +67,8 @@ def load_local_config(app_dir):
+         logger.info("GuiManager loaded %s", path)
+         return module
+     except Exception as exc:
 -        logger.critical("Error loading %s: %s", path, exc)
 -        sys.exit()
 +        import sas.sasview.local_config
 +        return sas.sasview.local_config
--- 
-2.15.0
-
+ 
+ def make_custom_config_path(user_dir):
+     """
+@@ -116,4 +116,4 @@ def load_custom_config(path):
+ 
+     from sas.sasview import custom_config
+     logger.info("GuiManager custom_config defaults to sas.sasview.custom_config")
+-    return custom_config
+\ No newline at end of file
++    return custom_config
diff --git a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
index 7729292cb344..c3cd164a899a 100644
--- a/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
+++ b/pkgs/applications/science/misc/sasview/pyparsing-fix.patch
@@ -1,8 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 866ab7e36..78727b276 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -5,1 +5,1 @@
--    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing<2.0.0',
+@@ -401,7 +401,7 @@ package_data['sas.sasview'] = ['images/*',
+ packages.append("sas.sasview")
+ 
+ required = [
+-    'bumps>=0.7.5.9', 'periodictable>=1.5.0', 'pyparsing>=2.0.0',
 +    'bumps>=0.7.5.9', 'periodictable>=1.5.0',
--- 
-2.15.0
-
+ 
+     # 'lxml>=2.2.2',
+     'lxml', 'h5py',

From 6131989a7d606c5a33a9a6a91ea55ac37cf0c95f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sun, 13 May 2018 17:28:22 +0200
Subject: [PATCH 1750/3370] ocamlPackages.bitstring: 2.1.1 -> 3.0.0 (#40034)

---
 .../ocaml-modules/bitstring/camlp4-git.patch  | 44 -------------------
 .../ocaml-modules/bitstring/default.nix       | 31 +++++++------
 .../ocaml-modules/bitstring/srcdir.patch      | 11 -----
 3 files changed, 18 insertions(+), 68 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
 delete mode 100644 pkgs/development/ocaml-modules/bitstring/srcdir.patch

diff --git a/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch b/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
deleted file mode 100644
index 24d2e362dfac..000000000000
--- a/pkgs/development/ocaml-modules/bitstring/camlp4-git.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index d040f4c..cc1a8f5 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -40,7 +40,7 @@ pkg_extlib	= @OCAML_PKG_extlib@
- enable_coverage = @enable_coverage@
- 
- OCAMLCFLAGS	= -g
--OCAMLCPACKAGES	=
-+OCAMLCPACKAGES	= -package camlp4
- OCAMLCLIBS	= -linkpkg
- OCAMLOPTFLAGS	= $(OCAMLCFLAGS)
- OCAMLOPTPACKAGES = $(OCAMLCPACKAGES)
-@@ -110,12 +110,13 @@ bitstring_persistent.cmi: bitstring_persistent.mli
- 	  -I +camlp4 -pp camlp4of -c $<
- 
- pa_bitstring.cmo: pa_bitstring.ml bitstring.cma bitstring_persistent.cma
--	$(OCAMLFIND) ocamlc bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+	$(OCAMLFIND) ocamlc $(OCAMLCPACKAGES) \
-+          bitstring.cma -I +camlp4 dynlink.cma camlp4lib.cma \
- 	  -pp camlp4of -c $< -o $@
- 
- bitstring-objinfo: bitstring_objinfo.cmo bitstring.cma bitstring_persistent.cma
- 	$(OCAMLFIND) ocamlc -I +camlp4 unix.cma dynlink.cma camlp4lib.cma \
--	  $(OCAMLCFLAGS) $(OCAMLCLIBS) \
-+	  $(OCAMLCFLAGS) $(OCAMLCLIBS) $(OCAMLCPACKAGES) \
- 	  bitstring.cma bitstring_persistent.cma \
- 	  $< -o $@
- 
-@@ -158,12 +159,13 @@ tests/test.bmpp: create_test_pattern
- 
- create_test_pattern: create_test_pattern.cmo
- 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
--	  unix.cma -I +camlp4 dynlink.cma camlp4lib.cma \
-+	  unix.cma -I `ocamlfind query camlp4` dynlink.cma camlp4lib.cma \
- 	  $(OCAMLCLIBS) \
- 	  -I . bitstring.cma bitstring_persistent.cma $< -o $@
- 
- create_test_pattern.cmo: create_test_pattern.ml
- 	$(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -pp camlp4of \
-+	  $(OCAMLCPACKAGES) \
- 	  unix.cma -I +camlp4 \
- 	  -I . -c $< -o $@
- 
diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix
index b13eda071f62..13424272bcf8 100644
--- a/pkgs/development/ocaml-modules/bitstring/default.nix
+++ b/pkgs/development/ocaml-modules/bitstring/default.nix
@@ -1,26 +1,31 @@
-{ stdenv, fetchurl, buildOcaml, time, autoconf, automake }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
+, ppx_tools_versioned
+, ounit
+}:
 
-buildOcaml rec {
-  name = "bitstring";
-  version = "2.1.1";
-  src = fetchurl {
-    url = http://github.com/xguerin/bitstring/archive/v2.1.1.tar.gz;
-    sha256 = "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8";
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-bitstring-${version}";
+  version = "3.0.0";
+  src = fetchFromGitHub {
+    owner = "xguerin";
+    repo = "bitstring";
+    rev = "v${version}";
+    sha256 = "0r49qax7as48jgknzaq6p9rbpmrvnmlic713wzz5bj60j5h0396f";
   };
 
-  patches = [ ./camlp4-git.patch ./srcdir.patch ];
+  buildInputs = [ ocaml findlib jbuilder ppx_tools_versioned ounit ];
+
+  buildPhase = "jbuilder build";
 
-  buildInputs = [time autoconf automake];
   doCheck = true;
+  checkPhase = "jbuilder runtest";
 
-  createFindlibDestdir = true;
-  hasSharedObjects = true;
-
-  preConfigure = "./bootstrap";
+  inherit (jbuilder) installPhase;
 
   meta = with stdenv.lib; {
     description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
     homepage = https://github.com/xguerin/bitstring;
+    inherit (ocaml.meta) platforms;
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.maurer ];
   };
diff --git a/pkgs/development/ocaml-modules/bitstring/srcdir.patch b/pkgs/development/ocaml-modules/bitstring/srcdir.patch
deleted file mode 100644
index d53760f1d6f6..000000000000
--- a/pkgs/development/ocaml-modules/bitstring/srcdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.in	2015-09-01 06:32:15.111441188 +0200
-+++ b/Makefile.in	2015-09-01 06:32:56.001084480 +0200
-@@ -125,7 +125,7 @@
- 
- byteswap.h: byteswap.in.h
- 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
--	  cat $(srcdir)/byteswap.in.h; \
-+	  cat $(top_srcdir)/byteswap.in.h; \
- 	} > $@-t
- 	mv -f $@-t $@
- 

From db5ab167dfb3225339674835cfe4c7b1db3977aa Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 17:31:54 +0200
Subject: [PATCH 1751/3370] nginxModules.ipscrub: init at 99230f6

---
 pkgs/servers/http/nginx/modules.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 0e53b35e06d0..f482c92ed9f7 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -15,6 +15,15 @@
     inputs = [ pkgs.brotli ];
   };
 
+  ipscrub = {
+    src = fetchFromGitHub {
+      owner = "masonicboom";
+      repo = "ipscrub";
+      rev = "99230f66d5afe1f929cf4ed217901acb6206f620";
+      sha256 = "0mfrwkg4srql38w713pg6qxi0h4hgy8inkvgc9cm80bwlv2ng9s1";
+    } + "/ipscrub";
+  };
+
   rtmp ={
     src = fetchFromGitHub {
       owner = "arut";

From 68573a61a932050815f64a1150c417f903a3dd59 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 12 May 2018 10:38:11 -0400
Subject: [PATCH 1752/3370] smmap2: init at 2.0.3

This commit adds smmap2, which is a separate pypi package from the existing
smmap 0.9.0, though they both come from the same repo. It also moves smmap into
the new python modules location.
---
 .../python-modules/smmap/default.nix          | 19 ++++++++++++++++++
 .../python-modules/smmap2/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 13 ++----------
 3 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/smmap/default.nix
 create mode 100644 pkgs/development/python-modules/smmap2/default.nix

diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix
new file mode 100644
index 000000000000..366897d3e198
--- /dev/null
+++ b/pkgs/development/python-modules/smmap/default.nix
@@ -0,0 +1,19 @@
+{ lib, fetchPypi, buildPythonPackage, nosexcover }:
+
+buildPythonPackage rec {
+  pname = "smmap";
+  version = "0.9.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf";
+  };
+
+  checkInputs = [ nosexcover ];
+
+  meta = {
+    description = "A pure python implementation of a sliding window memory map manager";
+    homepage = https://github.com/gitpython-developers/smmap;
+    maintainers = [ ];
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/smmap2/default.nix b/pkgs/development/python-modules/smmap2/default.nix
new file mode 100644
index 000000000000..ea0f0859bbd2
--- /dev/null
+++ b/pkgs/development/python-modules/smmap2/default.nix
@@ -0,0 +1,20 @@
+{ lib, fetchPypi, buildPythonPackage, nosexcover }:
+
+buildPythonPackage rec {
+  pname = "smmap2";
+  version = "2.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hvn28p3zvxa98sbi9lrqvv2ps4q284j4jq9a619zw0m7yv0sly7";
+  };
+
+  checkInputs = [ nosexcover ];
+
+  meta = {
+    description = "A pure python implementation of a sliding window memory map manager";
+    homepage = https://pypi.org/project/smmap2;
+    maintainers = [ ];
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5a24e42865a..7e1ece5c77c2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14241,18 +14241,9 @@ in {
 
   tqdm = callPackage ../development/python-modules/tqdm { };
 
-  smmap = buildPythonPackage rec {
-    name = "smmap-0.9.0";
-    disabled = isPyPy;  # This fails the tests if built with pypy
-    meta.maintainers = with maintainers; [ ];
+  smmap = callPackage ../development/python-modules/smmap { };
 
-    buildInputs = with self; [ nosexcover ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/smmap/${name}.tar.gz";
-      sha256 = "0qlx25f6n2n9ff37w9gg62f217fzj16xlbh0pkz0lpxxjys64aqf";
-    };
-  };
+  smmap2 = callPackage ../development/python-modules/smmap2 { };
 
   traits = buildPythonPackage rec {
     name = "traits-${version}";

From 318ce72a050a32ba2d0f5ce1192ae7c039e9c323 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 12 May 2018 10:46:59 -0400
Subject: [PATCH 1753/3370] gitdb2: init at 2.0.3

Also move gitdb and gitdb2 to the new python module structure.
---
 .../python-modules/gitdb/default.nix          | 23 ++++++++++++++++
 .../python-modules/gitdb2/default.nix         | 23 ++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 ++-----------------
 3 files changed, 48 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/gitdb/default.nix
 create mode 100644 pkgs/development/python-modules/gitdb2/default.nix

diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix
new file mode 100644
index 000000000000..ceca6e3719b4
--- /dev/null
+++ b/pkgs/development/python-modules/gitdb/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, smmap }:
+
+buildPythonPackage rec {
+  pname = "gitdb";
+  version = "0.6.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3";
+  };
+
+  propagatedBuildInputs = [ smmap ];
+
+  # Bunch of tests fail because they need an actual git repo
+  doCheck = false;
+
+  meta = {
+    description = "Git Object Database";
+    maintainers = [ ];
+    homepage = https://github.com/gitpython-developers/gitdb;
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/development/python-modules/gitdb2/default.nix b/pkgs/development/python-modules/gitdb2/default.nix
new file mode 100644
index 000000000000..1ebbd3de7850
--- /dev/null
+++ b/pkgs/development/python-modules/gitdb2/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildPythonPackage, fetchPypi, smmap2 }:
+
+buildPythonPackage rec {
+  pname = "gitdb2";
+  version = "2.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "02azg62mr99b7cllyjrly77np3vw32y8nrxpa2xjapiyaga2j3mn";
+  };
+
+  propagatedBuildInputs = [ smmap2 ];
+
+  # Bunch of tests fail because they need an actual git repo
+  doCheck = false;
+
+  meta = {
+    description = "Git Object Database";
+    maintainers = [ ];
+    homepage = https://github.com/gitpython-developers/gitdb;
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7e1ece5c77c2..f20b6d2f2473 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2820,31 +2820,9 @@ in {
 
   gpy = callPackage ../development/python-modules/gpy { };
 
-  gitdb = buildPythonPackage rec {
-    name = "gitdb-0.6.4";
+  gitdb = callPackage ../development/python-modules/gitdb { };
 
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gitdb/${name}.tar.gz";
-      sha256 = "0n4n2c7rxph9vs2l6xlafyda5x1mdr8xy16r9s3jwnh3pqkvrsx3";
-    };
-
-    buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ smmap ];
-
-    checkPhase = ''
-      nosetests
-    '';
-
-    doCheck = false; # Bunch of tests fail because they need an actual git repo
-
-    meta = {
-      description = "Git Object Database";
-      maintainers = with maintainers; [ ];
-      homepage = https://github.com/gitpython-developers/gitdb;
-      license = licenses.bsd3;
-    };
-
-  };
+  gitdb2 = callPackage ../development/python-modules/gitdb2 { };
 
   GitPython = buildPythonPackage rec {
     version = "2.0.8";

From 5efce7c43d269c7e95a17c289ce6ca146341cfcf Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 12 May 2018 10:52:04 -0400
Subject: [PATCH 1754/3370] GitPython: 2.0.8 -> 2.1.9

Also moves GitPython into the newer python module folder structure.
---
 .../python-modules/GitPython/default.nix      | 24 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +------------------
 2 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/python-modules/GitPython/default.nix

diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix
new file mode 100644
index 000000000000..c2f3706923a3
--- /dev/null
+++ b/pkgs/development/python-modules/GitPython/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildPythonPackage, fetchPypi, gitdb2, mock, nose, ddt }:
+
+buildPythonPackage rec {
+  version = "2.1.9";
+  pname = "GitPython";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0a9in1jfv9ssxhckl6sasw45bhm762y2r5ikgb2pk2g8yqdc6z64";
+  };
+
+  checkInputs = [ mock nose ddt ];
+  propagatedBuildInputs = [ gitdb2 ];
+
+  # Tests require a git repo
+  doCheck = false;
+
+  meta = {
+    description = "Python Git Library";
+    maintainers = [ ];
+    homepage = https://github.com/gitpython-developers/GitPython;
+    license = lib.licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f20b6d2f2473..c3435520877e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2824,30 +2824,7 @@ in {
 
   gitdb2 = callPackage ../development/python-modules/gitdb2 { };
 
-  GitPython = buildPythonPackage rec {
-    version = "2.0.8";
-    name = "GitPython-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/G/GitPython/GitPython-${version}.tar.gz";
-      sha256 = "7c03d1130f903aafba6ae5b89ccf8eb433a995cd3120cbb781370e53fc4eb222";
-    };
-
-    buildInputs = with self; [ mock nose ];
-    propagatedBuildInputs = with self; [ gitdb ];
-
-    # All tests error with
-    # InvalidGitRepositoryError: /tmp/nix-build-python2.7-GitPython-1.0.1.drv-0/GitPython-1.0.1
-    # Maybe due to being in a chroot?
-    doCheck = false;
-
-    meta = {
-      description = "Python Git Library";
-      maintainers = with maintainers; [ ];
-      homepage = https://github.com/gitpython-developers/GitPython;
-      license = licenses.bsd3;
-    };
-  };
+  GitPython = callPackage ../development/python-modules/GitPython { };
 
   git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter {
     inherit (pkgs.gitAndTools) git-annex;

From 0fcad047b9563f5b5ec4442d5337d8fc5f802397 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 25 Feb 2018 20:36:43 -0500
Subject: [PATCH 1755/3370] Guile: Fix cross-compilation

(cherry picked from commit f79fa7794176c11530a3be3f05ffbc10f1e53003)
---
 pkgs/development/interpreters/guile/2.0.nix     | 10 +++++-----
 pkgs/development/interpreters/guile/default.nix | 10 +++++-----
 pkgs/development/interpreters/guile/riscv.patch | 13 +++++++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/interpreters/guile/riscv.patch

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 5746300fca09..ea8ff924064a 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
 , libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform
+, hostPlatform, buildPackages
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -19,7 +19,9 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
+    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile_2_0;
   buildInputs = [ readline libtool libunistring libffi ];
   propagatedBuildInputs = [ gmp boehmgc ]
 
@@ -29,9 +31,6 @@
     # see below.
     ++ [ libtool libunistring ];
 
-  # A native Guile 2.0 is needed to cross-build Guile.
-  selfNativeBuildInput = true;
-
   enableParallelBuilding = true;
 
   patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch
@@ -40,6 +39,7 @@
       url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4";
       sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v";
     })
+    ./riscv.patch
   ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index e10c5fbb5684..fc7cd2b60ead 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
 , libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform
+, hostPlatform, buildPackages
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -20,7 +20,9 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
+    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile;
   buildInputs = [ readline libtool libunistring libffi ];
 
   propagatedBuildInputs = [ gmp boehmgc ]
@@ -30,13 +32,11 @@
     # see below.
     ++ [ libtool libunistring ];
 
-  # A native Guile 2.0 is needed to cross-build Guile.
-  selfNativeBuildInput = true;
-
   enableParallelBuilding = true;
 
   patches = [
     ./eai_system.patch
+    ./riscv.patch
   ] ++
     (stdenv.lib.optional (coverageAnalysis != null) ./gcov-file-name.patch);
 
diff --git a/pkgs/development/interpreters/guile/riscv.patch b/pkgs/development/interpreters/guile/riscv.patch
new file mode 100644
index 000000000000..b835e1613838
--- /dev/null
+++ b/pkgs/development/interpreters/guile/riscv.patch
@@ -0,0 +1,13 @@
+diff --git a/module/system/base/target.scm b/module/system/base/target.scm
+index 95ab8d8c9..93616f4a3 100644
+--- a/module/system/base/target.scm
++++ b/module/system/base/target.scm
+@@ -86,6 +86,8 @@
+              (endianness big))
+             ((string=? "aarch64" cpu)
+              (endianness little))
++            ((string-match "riscv[1-9][0-9]*" cpu)
++             (endianness little))
+             (else
+              (error "unknown CPU endianness" cpu)))))
+ 

From 8415682658752910f9142165d483f861aa8d99be Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 5 Mar 2018 18:45:16 -0500
Subject: [PATCH 1756/3370] guile: Fix cross more, including 1.8

(cherry picked from commit 76bc1d3fae46f28dd28cad8bc998dba74d03285e)
---
 pkgs/development/interpreters/guile/1.8.nix   | 37 +++++++++++--------
 pkgs/development/interpreters/guile/2.0.nix   | 17 +++++----
 .../interpreters/guile/default.nix            | 15 +++++---
 3 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index c50a5fbab077..6a2fdbdea436 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -1,25 +1,33 @@
-{ fetchurl, stdenv, libtool, readline, gmp
-, gawk, makeWrapper }:
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, makeWrapper, gawk, pkgconfig
+, libtool, readline, gmp
+}:
 
 stdenv.mkDerivation rec {
   name = "guile-1.8.8";
 
   src = fetchurl {
-    url = "mirror://gnu/guile/" + name + ".tar.gz";
+    url = "mirror://gnu/guile/${name}.tar.gz";
     sha256 = "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3";
   };
 
-  patches = [ ./cpp-4.5.patch ];
-
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
   # GCC 4.6 raises a number of set-but-unused warnings.
   configureFlags = [ "--disable-error-on-warning" ];
 
-  nativeBuildInputs = [ makeWrapper gawk ];
-  propagatedBuildInputs = [ readline gmp libtool ];
-  selfNativeBuildInput = true;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile_1_8;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
+  buildInputs = [ readline libtool ];
+
+  propagatedBuildInputs = [ gmp ];
+
+  patches = [ ./cpp-4.5.patch ];
+
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
@@ -46,17 +54,16 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   meta = {
-    description = "GNU Guile, an embeddable Scheme interpreter";
+    description = "Embeddable Scheme implementation";
+    homepage    = http://www.gnu.org/software/guile/;
+    license     = stdenv.lib.licenses.lgpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms   = stdenv.lib.platforms.unix;
+
     longDescription = ''
       GNU Guile is an interpreter for the Scheme programming language,
       packaged as a library that can be embedded into programs to make
       them extensible.  It supports many SRFIs.
     '';
-
-    homepage = http://www.gnu.org/software/guile/;
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index ea8ff924064a..afd90397e232 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -1,6 +1,8 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform, buildPackages
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchpatch, fetchurl, makeWrapper, gawk, pkgconfig
+, libffi, libtool, readline, gmp, boehmgc, libunistring
+, coverageAnalysis ? null, gnu ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -19,12 +21,13 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
-    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile_2_0;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile_2_0;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
-  propagatedBuildInputs = [ gmp boehmgc ]
 
+  propagatedBuildInputs = [ gmp boehmgc ]
     # XXX: These ones aren't normally needed here, but since
     # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
     # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index fc7cd2b60ead..dc6e18ae1afd 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -1,6 +1,8 @@
-{ fetchurl, stdenv, libtool, readline, gmp, pkgconfig, boehmgc, libunistring
-, libffi, gawk, makeWrapper, fetchpatch, coverageAnalysis ? null, gnu ? null
-, hostPlatform, buildPackages
+{ stdenv, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, makeWrapper, gawk, pkgconfig
+, libffi, libtool, readline, gmp, boehmgc, libunistring
+, coverageAnalysis ? null, gnu ? null
 }:
 
 # Do either a coverage analysis build or a standard build.
@@ -20,9 +22,10 @@
   outputs = [ "out" "dev" "info" ];
   setOutputFlags = false; # $dev gets into the library otherwise
 
-  depsBuildBuild = [ buildPackages.stdenv.cc ];
-  nativeBuildInputs = [ makeWrapper gawk pkgconfig ] ++
-    stdenv.lib.optional stdenv.isCross buildPackages.buildPackages.guile;
+  depsBuildBuild = [ buildPackages.stdenv.cc ]
+    ++ stdenv.lib.optional (hostPlatform != buildPlatform)
+                           buildPackages.buildPackages.guile;
+  nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
 
   propagatedBuildInputs = [ gmp boehmgc ]

From 9a4cc93522aeee59fafe01bcba65d1675675f9d6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 21 Mar 2018 14:20:04 -0400
Subject: [PATCH 1757/3370] guile-1.8: Fix and clean up `libtool` propagation
 fixes

Fixes #37548

(cherry picked from commit 2119041dbf4323ff3e92e605b70b75fc2c252741)
---
 pkgs/development/interpreters/guile/1.8.nix | 36 +++++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index 6a2fdbdea436..cf42c9a7b683 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -24,19 +24,19 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool ];
 
-  propagatedBuildInputs = [ gmp ];
+  propagatedBuildInputs = [
+    gmp
+
+    # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
+    # flags for them without corresponding '-L' flags. Adding them here will add
+    # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
+    # see below.
+    libtool
+  ];
+
 
   patches = [ ./cpp-4.5.patch ];
 
-
-  postInstall = ''
-    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-  '';
-
-  preBuild = ''
-    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
-  '';
-
   # Guile needs patching to preset results for the configure tests
   # about pthreads, which work only in native builds.
   preConfigure = ''
@@ -45,6 +45,22 @@ stdenv.mkDerivation rec {
     fi
   '';
 
+  preBuild = ''
+    sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
+  '';
+
+
+  postInstall = ''
+    wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
+  ''
+    # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
+    # why `--with-libunistring-prefix' and similar options coming from
+    # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
+        -e "s|-lltdl|-L${libtool.lib}/lib -lltdl|g"
+  '';
+
   # One test fails.
   # ERROR: file: "libtest-asmobs", message: "file not found"
   # This is fixed here:

From d77dab3ecc3b7db3724368966ce791c378739a90 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Wed, 21 Mar 2018 14:20:04 -0400
Subject: [PATCH 1758/3370] guile: Fix and clean up `libtool` propagation fixes

Fixes #37548

(cherry picked from commit 72984210ab06dc3a56a1c2b666f3528ec5dcaadf)
---
 pkgs/development/interpreters/guile/2.0.nix     | 16 ++++++++++------
 pkgs/development/interpreters/guile/default.nix | 16 ++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index afd90397e232..2c9aec5b6952 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -27,12 +27,15 @@
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
 
-  propagatedBuildInputs = [ gmp boehmgc ]
-    # XXX: These ones aren't normally needed here, but since
-    # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
+  propagatedBuildInputs = [
+    gmp boehmgc
+
+    # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
+    # flags for them without corresponding '-L' flags. Adding them here will add
     # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
     # see below.
-    ++ [ libtool libunistring ];
+    libtool libunistring
+  ];
 
   enableParallelBuilding = true;
 
@@ -70,11 +73,12 @@
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-
+  ''
     # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
     # why `--with-libunistring-prefix' and similar options coming from
     # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    sed -i "$out/lib/pkgconfig/guile-2.0.pc"    \
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
         -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
             s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
             s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index dc6e18ae1afd..3d5c51dc420b 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -28,12 +28,15 @@
   nativeBuildInputs = [ makeWrapper gawk pkgconfig ];
   buildInputs = [ readline libtool libunistring libffi ];
 
-  propagatedBuildInputs = [ gmp boehmgc ]
-    # XXX: These ones aren't normally needed here, but since
-    # `libguile-2.0.la' reads `-lltdl -lunistring', adding them here will add
+  propagatedBuildInputs = [
+    gmp boehmgc
+
+    # XXX: These ones aren't normally needed here, but `libguile*.la' has '-l'
+    # flags for them without corresponding '-L' flags. Adding them here will add
     # the needed `-L' flags.  As for why the `.la' file lacks the `-L' flags,
     # see below.
-    ++ [ libtool libunistring ];
+    libtool libunistring
+  ];
 
   enableParallelBuilding = true;
 
@@ -66,11 +69,12 @@
 
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
-
+  ''
     # XXX: See http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/18903 for
     # why `--with-libunistring-prefix' and similar options coming from
     # `AC_LIB_LINKFLAGS_BODY' don't work on NixOS/x86_64.
-    sed -i "$out/lib/pkgconfig/guile-2.2.pc"    \
+  + ''
+    sed -i "$out/lib/pkgconfig/guile"-*.pc    \
         -e "s|-lunistring|-L${libunistring}/lib -lunistring|g ;
             s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
             s|-lltdl|-L${libtool.lib}/lib -lltdl|g ;

From 130a0cbde6feae6b51f35a007c78cc8a25a6c3c9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 May 2018 12:16:29 -0400
Subject: [PATCH 1759/3370] guile: Remove old crossAttrs

We fixed the linker issue with propagated dependencies.

(cherry picked from commit 515ca1a7c8ca1c57b472826ae2b5dd2965b8b4bf)
---
 pkgs/development/interpreters/guile/2.0.nix     | 9 ---------
 pkgs/development/interpreters/guile/default.nix | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
index 2c9aec5b6952..3a11dc78c6cb 100644
--- a/pkgs/development/interpreters/guile/2.0.nix
+++ b/pkgs/development/interpreters/guile/2.0.nix
@@ -92,15 +92,6 @@
 
   setupHook = ./setup-hook-2.0.sh;
 
-  crossAttrs.preConfigure =
-    stdenv.lib.optionalString (hostPlatform.isHurd)
-       # On GNU, libgc depends on libpthread, but the cross linker doesn't
-       # know where to find libpthread, which leads to erroneous test failures
-       # in `configure', where `-pthread' and `-lpthread' aren't explicitly
-       # passed.  So it needs some help (XXX).
-       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
-
-
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;
diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index 3d5c51dc420b..748b3c5e200a 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -88,15 +88,6 @@
 
   setupHook = ./setup-hook-2.2.sh;
 
-  crossAttrs.preConfigure =
-    stdenv.lib.optionalString (hostPlatform.isHurd)
-       # On GNU, libgc depends on libpthread, but the cross linker doesn't
-       # know where to find libpthread, which leads to erroneous test failures
-       # in `configure', where `-pthread' and `-lpthread' aren't explicitly
-       # passed.  So it needs some help (XXX).
-       "export LDFLAGS=-Wl,-rpath-link=${gnu.libpthreadCross}/lib";
-
-
   meta = {
     description = "Embeddable Scheme implementation";
     homepage    = http://www.gnu.org/software/guile/;

From 3fc1694e8ae7fe148288e9e0a0f3e47008fdd580 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 12 May 2018 10:59:54 -0400
Subject: [PATCH 1760/3370] truffleHog: init at 2.0.91

This commit adds the python3 application truffleHog, which is a stand-alone tool
that scans a git repo for unencrypted passwords.

This depends on a newer GitPython, which depends on a new major version of
gitdb, which depends on a new major version of smmap, so I've packaged those
as well in the preceding commits.
---
 pkgs/tools/security/trufflehog/default.nix | 38 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/security/trufflehog/default.nix

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
new file mode 100644
index 000000000000..f805670a5d5e
--- /dev/null
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -0,0 +1,38 @@
+{ lib, pythonPackages }:
+
+let
+  truffleHogRegexes = pythonPackages.buildPythonPackage rec {
+    pname = "truffleHogRegexes";
+    version = "0.0.4";
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z";
+    };
+  };
+in
+  pythonPackages.buildPythonApplication rec {
+    pname = "truffleHog";
+    version = "2.0.91";
+
+    src = pythonPackages.fetchPypi {
+      inherit pname version;
+      sha256 = "0r4c9ihy6wjh5cwli7lb6cr2yfvxrh7r6cgznql1src5gzlnkymx";
+    };
+
+    # Relax overly restricted version constraint
+    postPatch = ''
+      substituteInPlace setup.py --replace "GitPython ==" "GitPython >= "
+    '';
+
+    propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ];
+
+    # Test cases run git clone and require network access
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/dxa4481/truffleHog;
+      description = "Searches through git repositories for high entropy strings and secrets, digging deep into commit history";
+      license = with lib.licenses; [ gpl2 ];
+      maintainers = with lib.maintainers; [ bhipple ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 774f2becdd4d..90f9edcd9f11 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21119,6 +21119,8 @@ with pkgs;
 
   tup = callPackage ../development/tools/build-managers/tup { };
 
+  trufflehog = callPackage ../tools/security/trufflehog { };
+
   tvheadend = callPackage ../servers/tvheadend { };
 
   ums = callPackage ../servers/ums { };

From 468c09edc6d3e4c9f0ee84636cf0e795792d3e71 Mon Sep 17 00:00:00 2001
From: florianjacob <accounts+github@florianjacob.de>
Date: Sun, 13 May 2018 17:48:41 +0200
Subject: [PATCH 1761/3370] matomo: 3.4.0 -> 3.5.0 (#40439)

---
 pkgs/servers/web-apps/matomo/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index c8a918c2bd22..27cf873e7908 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matomo-${version}";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchurl {
     # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
     # url = "https://builds.matomo.org/${name}.tar.gz";
     url = "https://builds.matomo.org/piwik-${version}.tar.gz";
-    sha256 = "1hnja8mvjvlbqgw7maa76lxd5hxxg7d5ggq9wyrff25mapj398wc";
+    sha256 = "1l656b194h7z3k52ywl7sfa2h6sxa5gf22wcfrp0pp07v9p6pc5f";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   #   unix socket authentication only works with localhost,
   #   but password-based SQL authentication works with both.
   # TODO: is upstream interested in this?
+  # -> discussion at https://github.com/matomo-org/matomo/issues/12646
   patches = [ ./make-localhost-default-database-host.patch ];
 
   # this bootstrap.php adds support for getting PIWIK_USER_PATH

From 960c657074b80d6bd7b216bf8b6f988b0ee3d6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 13 May 2018 18:30:58 +0200
Subject: [PATCH 1762/3370] home-assistant: 0.69.0 -> 0.69.1

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c530301bbc90..8d6c6cfaeaf9 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "0.69.0";
+  version = "0.69.1";
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index ab5125c035fd..60b005ed54cc 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -74,7 +74,7 @@ let
   extraBuildInputs = extraPackages py.pkgs;
 
   # Don't forget to run parse-requirements.py after updating
-  hassVersion = "0.69.0";
+  hassVersion = "0.69.1";
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "homeassistant";
@@ -89,7 +89,7 @@ in with py.pkgs; buildPythonApplication rec {
     owner = "home-assistant";
     repo = "home-assistant";
     rev = version;
-    sha256 = "05hagifi1338law2mwwik2gjjw1ckjdjh0lg9l8ldsz999dkc2zz";
+    sha256 = "1y74zq1nah9k6rif8k384ri11h1f23ggr613f7qnn0107b23asr4";
   };
 
   propagatedBuildInputs = [

From 5550015b200a0a4df003f087f5fd0b233123998f Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <eisfreak7@gmail.com>
Date: Sun, 13 May 2018 18:33:51 +0200
Subject: [PATCH 1763/3370] giac: remove liblapackWithAtlas dependency (#40430)

---
 pkgs/applications/science/math/giac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index dd92e264889f..f6e1deb86068 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, texlive, bison, flex
-, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
+, gmp, mpfr, pari, ntl, gsl, blas, mpfi
 , readline, gettext, libpng, libao, gfortran, perl
 , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   # perl is only needed for patchShebangs fixup.
   buildInputs = [
-    gmp mpfr pari ntl gsl blas mpfi liblapackWithAtlas
+    gmp mpfr pari ntl gsl blas mpfi
     readline gettext libpng libao perl
     # gfortran.cc default output contains static libraries compiled without -fPIC
     # we want libgfortran.so.3 instead

From 03318efe0937a8070ae9b02051cd04aca3770017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 11 May 2018 17:00:48 +0200
Subject: [PATCH 1764/3370] libb2: 0.97 -> 0.98

---
 pkgs/development/libraries/libb2/default.nix | 23 ++++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index eae08f0071cb..5ba2f9a0b97b 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,17 +1,26 @@
-{stdenv, fetchurl}:
-with stdenv; with lib;
-mkDerivation rec {
-  name = "libb2-${meta.version}";
+{ stdenv, fetchurl, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "libb2-${version}";
+  version = "0.98";
 
   src = fetchurl {
     url = "https://blake2.net/${name}.tar.gz";
-    sha256 = "7829c7309347650239c76af7f15d9391af2587b38f0a65c250104a2efef99051";
+    sha256 = "1852gh8wwnsghdb9zhxdhw0173plpqzk684npxbl4bzk1hhzisal";
   };
 
+  preConfigure = ''
+    patchShebangs autogen.sh
+    ./autogen.sh
+  '';
+
   configureFlags = [ "--enable-fat=yes" ];
 
-  meta = {
-    version = "0.97";
+  nativeBuildInputs = [ autoconf automake libtool ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     description = "The BLAKE2 family of cryptographic hash functions";
     platforms = platforms.all;
     maintainers = with maintainers; [ dfoxfranke ];

From 409b97c95f80537a94d6183131b20d82e669a8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 11 May 2018 17:14:31 +0200
Subject: [PATCH 1765/3370] libb2: fix build on ARM

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

diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix
index 5ba2f9a0b97b..58961a18df17 100644
--- a/pkgs/development/libraries/libb2/default.nix
+++ b/pkgs/development/libraries/libb2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ stdenv, hostPlatform, fetchurl, autoconf, automake, libtool }:
 
 stdenv.mkDerivation rec {
   name = "libb2-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  configureFlags = [ "--enable-fat=yes" ];
+  configureFlags = stdenv.lib.optional hostPlatform.isx86 "--enable-fat=yes";
 
   nativeBuildInputs = [ autoconf automake libtool ];
 

From 66d204188b21e3156907e66165c2898076145bd2 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sun, 13 May 2018 19:58:10 +0200
Subject: [PATCH 1766/3370] virtmanager: add missing virt-install runtime deps
 (#40380)

virt-install calls some programs from initrdinject.py
that were missing on PATH
---
 pkgs/applications/virtualization/virt-manager/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index d0e270558874..c7d86ad9fd60 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -3,6 +3,7 @@
 , gobjectIntrospection, libvirt-glib, system-libvirt
 , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3
 , spiceSupport ? true, spice-gtk ? null
+, cpio, e2fsprogs, findutils, gzip
 }:
 
 with stdenv.lib;
@@ -47,6 +48,8 @@ python2Packages.buildPythonApplication rec {
 
   preFixup = ''
     gappsWrapperArgs+=(--set PYTHONPATH "$PYTHONPATH")
+    # these are called from virt-install in initrdinject.py
+    gappsWrapperArgs+=(--prefix PATH : "${makeBinPath [ cpio e2fsprogs file findutils gzip ]}")
   '';
 
   # Failed tests

From 642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sun, 13 May 2018 19:59:59 +0200
Subject: [PATCH 1767/3370] nixos/tests/acme: fix on i686, improve timing
 (#40410)

... to prevent non-deterministic failures
---
 nixos/tests/acme.nix               | 4 +++-
 nixos/tests/common/letsencrypt.nix | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index d7452744e17b..21b0fedcfefe 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -54,9 +54,11 @@ in import ./make-test.nix {
   };
 
   testScript = ''
+    $letsencrypt->waitForUnit("default.target");
     $letsencrypt->waitForUnit("boulder.service");
-    startAll;
+    $webserver->waitForUnit("default.target");
     $webserver->waitForUnit("acme-certificates.target");
+    $client->waitForUnit("default.target");
     $client->succeed('curl https://example.com/ | grep -qF "hello world"');
   '';
 }
diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix
index 10cde45d18a8..7c6b3b29e36d 100644
--- a/nixos/tests/common/letsencrypt.nix
+++ b/nixos/tests/common/letsencrypt.nix
@@ -386,6 +386,10 @@ in {
 
     services.nginx.enable = true;
     services.nginx.recommendedProxySettings = true;
+    # This fixes the test on i686
+    services.nginx.commonHttpConfig = ''
+      server_names_hash_bucket_size 64;
+    '';
     services.nginx.virtualHosts.${wfeDomain} = {
       onlySSL = true;
       enableACME = false;

From d2f7acf30c6dc1fe3a742f4035b11fe57514952b Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 4 May 2018 18:00:50 -0400
Subject: [PATCH 1768/3370] pytorch: 0.3.1 -> 0.4.0

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../python-modules/pytorch/default.nix        | 35 +++++--------------
 pkgs/top-level/python-packages.nix            | 14 +++++++-
 2 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix
index c8376196d3ac..b0ac4e070935 100644
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -1,7 +1,7 @@
-{ buildPythonPackage,
+{ buildPythonPackage, pythonOlder,
   cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
-  fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, cmake,
-  git, stdenv, linkFarm, symlinkJoin,
+  fetchFromGitHub, fetchpatch, lib, numpy, pyyaml, cffi, typing, cmake,
+  stdenv, linkFarm, symlinkJoin,
   utillinux, which }:
 
 assert cudnn == null || cudatoolkit != null;
@@ -25,7 +25,7 @@ let
     "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} ";
 
 in buildPythonPackage rec {
-  version = "0.3.1";
+  version = "0.4.0";
   pname = "pytorch";
   name = "${pname}-${version}";
 
@@ -34,36 +34,17 @@ in buildPythonPackage rec {
     repo   = "pytorch";
     rev    = "v${version}";
     fetchSubmodules = true;
-    sha256 = "1k8fr97v5pf7rni5cr2pi21ixc3pdj3h3lkz28njbjbgkndh7mr3";
+    sha256 = "12d5vqqaprk0igmih7fwa65ldmaawgijxl58h6dnw660wysc132j";
   };
 
-  patches = [
-    (fetchpatch {
-      # make sure stdatomic.h is included when checking for ATOMIC_INT_LOCK_FREE
-      # Fixes this test failure:
-      # RuntimeError: refcounted file mapping not supported on your system at /tmp/nix-build-python3.6-pytorch-0.3.0.drv-0/source/torch/lib/TH/THAllocator.c:525
-      url = "https://github.com/pytorch/pytorch/commit/502aaf39cf4a878f9e4f849e5f409573aa598aa9.patch";
-      stripLen = 3;
-      extraPrefix = "torch/lib/";
-      sha256 = "1miz4lhy3razjwcmhxqa4xmlcmhm65lqyin1czqczj8g16d3f62f";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace test/run_test.sh --replace \
-      "INIT_METHOD='file://'\$TEMP_DIR'/shared_init_file' \$PYCMD ./test_distributed.py" \
-      "echo Skipped for Nix package"
-  '';
-
   preConfigure = lib.optionalString cudaSupport ''
-    export CC=${cudatoolkit.cc}/bin/gcc
+    export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++
   '' + lib.optionalString (cudaSupport && cudnn != null) ''
     export CUDNN_INCLUDE_DIR=${cudnn}/include
   '';
 
   buildInputs = [
      cmake
-     git
      numpy.blas
      utillinux
      which
@@ -73,10 +54,10 @@ in buildPythonPackage rec {
     cffi
     numpy
     pyyaml
-  ];
+  ] ++ lib.optional (pythonOlder "3.5") typing;
 
   checkPhase = ''
-    ${cudaStubEnv}${stdenv.shell} test/run_test.sh
+    ${cudaStubEnv}python test/run_test.py --exclude distributed
   '';
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7868f7d7ff06..95b7f8a5718c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5623,8 +5623,20 @@ in {
     };
   };
 
-  pytorch = callPackage ../development/python-modules/pytorch {
+  pytorch = let
+    # Fails with CUDA 9.1 and GCC 6.4:
+    # https://github.com/pytorch/pytorch/issues/5831
+    # https://devtalk.nvidia.com/default/topic/1028112
+    # We should be able to remove this when CUDA 9.2 is released.
+    cudatoolkit9 = pkgs.cudatoolkit9.override {
+      gcc6 = pkgs.gcc5;
+    };
+  in callPackage ../development/python-modules/pytorch {
     cudaSupport = pkgs.config.cudaSupport or false;
+    cudatoolkit = cudatoolkit9;
+    cudnn = pkgs.cudnn_cudatoolkit9.override {
+      inherit cudatoolkit9;
+    };
   };
 
   pytorchWithCuda = self.pytorch.override {

From 3b6486f8572512d7d13debba9049fb745afd0e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 May 2018 21:17:53 +0200
Subject: [PATCH 1769/3370] xorg.xorgserver: drop makeWrapper

It's been unused since 65da25997db.
---
 pkgs/servers/x11/xorg/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 23aae1134837..0da75f941f09 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -492,7 +492,7 @@ in
       if (!isDarwin)
       then {
         outputs = [ "out" "dev" ];
-        buildInputs = commonBuildInputs ++ [ makeWrapper args.libdrm args.mesa_noglu ];
+        buildInputs = commonBuildInputs ++ [ args.libdrm args.mesa_noglu ];
         propagatedBuildInputs = [ libpciaccess args.epoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev
         ];

From 836be60200badf15f31b4719f7ca527c2de550d0 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 21:30:50 +0200
Subject: [PATCH 1770/3370] beets: install zsh completion

---
 pkgs/tools/audio/beets/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index b8f3318057b4..b53a9b7eb0f3 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -174,6 +174,11 @@ in pythonPackages.buildPythonApplication rec {
       test/test_replaygain.py
   '';
 
+  postInstall = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp extra/_beet $out/share/zsh/site-functions/
+  '';
+
   doCheck = true;
 
   preCheck = ''
@@ -222,7 +227,7 @@ in pythonPackages.buildPythonApplication rec {
 
   meta = {
     description = "Music tagger and library organizer";
-    homepage = http://beets.radbox.org;
+    homepage = http://beets.io;
     license = licenses.mit;
     maintainers = with maintainers; [ aszlig domenkozar pjones ];
     platforms = platforms.linux;

From d29202bc48be6069e3d7ddc7b7760aac8c0c19b7 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 17:50:24 -0500
Subject: [PATCH 1771/3370] uboot: 2017.11 -> 2018.03, cross fixes

(cherry picked from commit 5804547243010ec8e341e98e8acbc5c96263682e)
(cherry picked from commit 7c46833b047710f220971d7d7d3b1dbe6fed805b)
---
 pkgs/misc/uboot/default.nix | 77 ++++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 39 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 1bfcea1057e9..9e07c22fe2ab 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,10 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2
-, hostPlatform
+{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, hostPlatform, buildPackages
 }:
 
 let
-  buildUBoot = { targetPlatforms
-            , filesToInstall
+  buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
             , extraMakeFlags ? []
@@ -13,18 +12,14 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2017.11";
+    version = "2018.03";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "01bcsah5imy6m3fbjwhqywxg0pfk5fl8ks9ylb7kv3zmrb9qy0ba";
+      sha256 = "1z9x635l5164c5hnf7qs19w7j3qghbkgs7rpn673dm898i9pfx3y";
     };
 
     patches = [
-      (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/cbsize-2017-11.patch;
-        sha256 = "08rqsrj78aif8vaxlpwiwwv1jwf0diihbj0h88hc0mlp0kmyqxwm";
-      })
       (fetchpatch {
         url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch;
         sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9";
@@ -34,8 +29,8 @@ let
         sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4";
       })
       (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2017-11.patch;
-        sha256 = "162b2lglp307pzxsf9m7nnmzwxqd7xkwp5j85bm6bg1a38ngpl9v";
+        url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
+        sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
       })
     ];
 
@@ -43,14 +38,22 @@ let
       patchShebangs tools
     '';
 
-    nativeBuildInputs = [ bc dtc openssl python2 ];
+    nativeBuildInputs = [ bc dtc openssl python2 swig ];
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
 
     hardeningDisable = [ "all" ];
 
-    makeFlags = [ "DTC=dtc" ] ++ extraMakeFlags;
+    makeFlags = [
+      "DTC=dtc"
+      "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+    ] ++ extraMakeFlags;
 
     configurePhase = ''
+      runHook preConfigure
+
       make ${defconfig}
+
+      runHook postConfigure
     '';
 
     installPhase = ''
@@ -65,21 +68,13 @@ let
     enableParallelBuilding = true;
     dontStrip = true;
 
-    crossAttrs = {
-      makeFlags = [
-        "ARCH=${hostPlatform.platform.kernelArch}"
-        "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
-      ];
-    };
-
     meta = with stdenv.lib; {
       homepage = http://www.denx.de/wiki/U-Boot/;
       description = "Boot loader for embedded systems";
       license = licenses.gpl2;
       maintainers = [ maintainers.dezgeg ];
-      platforms = targetPlatforms;
     } // extraMeta;
-  } // args);
+  } // removeAttrs args [ "extraMeta" ]);
 
 in rec {
   inherit buildUBoot;
@@ -88,10 +83,14 @@ in rec {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
     buildFlags = "tools NO_SDL=1";
+    hardeningDisable = [];
     dontStrip = false;
-    targetPlatforms = stdenv.lib.platforms.linux;
+    extraMeta.platforms = stdenv.lib.platforms.linux;
     # build tools/kwboot
     extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+    postConfigure = ''
+      sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
+    '';
     filesToInstall = [
       "tools/dumpimage"
       "tools/fdtgrep"
@@ -103,86 +102,86 @@ in rec {
 
   ubootA20OlinuxinoLime = buildUBoot rec {
     defconfig = "A20-OLinuXino-Lime_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBananaPi = buildUBoot rec {
     defconfig = "Bananapi_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootBeagleboneBlack = buildUBoot rec {
     defconfig = "am335x_boneblack_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     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"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-spl.kwb"];
   };
 
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
   };
 
   ubootOdroidXU3 = buildUBoot rec {
     defconfig = "odroid-xu3_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-dtb.bin"];
   };
 
   ubootOrangePiPc = buildUBoot rec {
     defconfig = "orangepi_pc_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootPcduino3Nano = buildUBoot rec {
     defconfig = "Linksprite_pcDuino3_Nano_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
   ubootQemuArm = buildUBoot rec {
     defconfig = "qemu_arm_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi = buildUBoot rec {
     defconfig = "rpi_defconfig";
-    targetPlatforms = ["armv6l-linux"];
+    extraMeta.platforms = ["armv6l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi2 = buildUBoot rec {
     defconfig = "rpi_2_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_32bit = buildUBoot rec {
     defconfig = "rpi_3_32b_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootRaspberryPi3_64bit = buildUBoot rec {
     defconfig = "rpi_3_defconfig";
-    targetPlatforms = ["aarch64-linux"];
+    extraMeta.platforms = ["aarch64-linux"];
     filesToInstall = ["u-boot.bin"];
   };
 
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot-with-nand-spl.imx"];
     buildFlags = "u-boot-with-nand-spl.imx";
     postConfigure = ''
@@ -196,7 +195,7 @@ in rec {
 
   ubootWandboard = buildUBoot rec {
     defconfig = "wandboard_defconfig";
-    targetPlatforms = ["armv7l-linux"];
+    extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot.img" "SPL"];
   };
 }

From 2a450cec19028bb7ea533bbb3d98966722b22d7e Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 3 Mar 2018 21:17:13 -0500
Subject: [PATCH 1772/3370] uboot: add patch to increase maximum path length in
 extlinux.conf

This fixes problems with cross compiled kernels failing to boot.

(cherry picked from commit 1f4bb8c61d71f2ac12f1cc6cf50aaa590df40a45)
(cherry picked from commit 828fdd61b9b5ae0d3c9253309f3d115210348096)
---
 pkgs/misc/uboot/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9e07c22fe2ab..800c00572821 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -32,6 +32,10 @@ let
         url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
         sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd";
       })
+      (fetchpatch {
+        url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
+        sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
+      })
     ];
 
     postPatch = ''

From 3a4eda2e38fd80e6c9bd36606e9da16a47e41922 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sun, 13 May 2018 20:12:02 +0000
Subject: [PATCH 1773/3370] perlPackages.GD: fix build on staging (#40449)

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 509cb405ff61..d9e11b54b7c3 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6461,6 +6461,9 @@ let self = _self // overrides; _self = with self; {
     # Patch has been sent upstream.
     patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ];
 
+    # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
+    NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
+
     # tests fail
     doCheck = false;
 

From d50bcaa8168b2b41d0e6d195d9ccb03e9d332d6c Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Fri, 23 Feb 2018 23:47:27 -0500
Subject: [PATCH 1774/3370] uboot: sheevplug and guruplug: use mainline U-Boot

These derivations have not seen any updates since they were created in 2010,
and some of their sources have disappeared. There are upstream configs for
these boards, so these are now used, and they build correctly. I have no way
of testing them, and I don't if anyone even uses either board with Nix anymore.

(cherry picked from commit 01020b3263629be5a8697aa781dcb267df8de0a0)
(cherry picked from commit 48ade50d8ece09d3ff732b07f0facdcd78084ac3)
---
 pkgs/misc/uboot/default.nix                   |  12 ++
 pkgs/misc/uboot/gas220.patch                  |  18 ---
 pkgs/misc/uboot/guruplug-file-systems.patch   |  48 --------
 .../uboot/guruplug-usb-msd-multi-lun.patch    | 106 ------------------
 pkgs/misc/uboot/guruplug.nix                  |  57 ----------
 pkgs/misc/uboot/sheevaplug.nix                |  61 ----------
 pkgs/top-level/all-packages.nix               |   6 +-
 7 files changed, 14 insertions(+), 294 deletions(-)
 delete mode 100644 pkgs/misc/uboot/gas220.patch
 delete mode 100644 pkgs/misc/uboot/guruplug-file-systems.patch
 delete mode 100644 pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
 delete mode 100644 pkgs/misc/uboot/guruplug.nix
 delete mode 100644 pkgs/misc/uboot/sheevaplug.nix

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 800c00572821..9da52e494371 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -129,6 +129,12 @@ in rec {
     filesToInstall = ["u-boot-spl.kwb"];
   };
 
+  ubootGuruplug = buildUBoot rec {
+    defconfig = "guruplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
@@ -183,6 +189,12 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootSheevaplug = buildUBoot rec {
+    defconfig = "sheevaplug_defconfig";
+    extraMeta.platforms = ["armv5tel-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/misc/uboot/gas220.patch b/pkgs/misc/uboot/gas220.patch
deleted file mode 100644
index c5a91b0f3d00..000000000000
--- a/pkgs/misc/uboot/gas220.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Patch to allow assembling with binutils 2.20. It worked without this patch in 2.19.1
-diff --git a/board/mv_feroceon/USP/jump.S b/board/mv_feroceon/USP/jump.S
-index 4b6b9ee..58037fc 100644
---- a/board/mv_feroceon/USP/jump.S
-+++ b/board/mv_feroceon/USP/jump.S
-@@ -29,9 +29,11 @@ disclaimer.
- #include "sys/mvCpuIfRegs.h"
- 
- 
--jumpStart:
- 
- .section	".reset_vector_sect",#alloc, #execinstr
-+
-+jumpStart:
-+
- #if defined(MV_88F6082) || defined(MV_88F6183) || defined(DB_88F5181_OLD) || defined(DB_FPGA) || \
- 	defined(MV88F6281) || defined(MV88F6192) || defined(MV88F6180)  || defined(MV_88F6183L) || \
-     defined(MV88F6190)
diff --git a/pkgs/misc/uboot/guruplug-file-systems.patch b/pkgs/misc/uboot/guruplug-file-systems.patch
deleted file mode 100644
index 30dc1994303d..000000000000
--- a/pkgs/misc/uboot/guruplug-file-systems.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Add support for the various file systems as found in `sheevaplug.h'.
-As for the SheevaPlug, the increase in size means that the environment
-must be pushed further away.
-
-In addition, increase the malloc area size to allow compilation of UbiFS.
-
---- u-boot/include/configs/guruplug.h	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/include/configs/guruplug.h	2010-09-29 18:59:52.000000000 +0200
-@@ -123,8 +123,8 @@
-  * it has to be rounded to sector size
-  */
- #define CONFIG_ENV_SIZE			0x20000	/* 128k */
--#define CONFIG_ENV_ADDR			0x40000
--#define CONFIG_ENV_OFFSET		0x40000	/* env starts here */
-+#define CONFIG_ENV_ADDR			0x60000
-+#define CONFIG_ENV_OFFSET		0x60000	/* env starts here */
- 
- /*
-  * Default environment variables
-@@ -145,7 +145,7 @@
- /*
-  * Size of malloc() pool
-  */
--#define CONFIG_SYS_MALLOC_LEN	(1024 * 128) /* 128kB for malloc() */
-+#define CONFIG_SYS_MALLOC_LEN	(1024 * 1024) /* 1 MiB for malloc() */
- /* size in bytes reserved for initial data */
- #define CONFIG_SYS_GBL_DATA_SIZE	128
- 
-@@ -195,4 +195,18 @@
- 
- #define CONFIG_SYS_ALT_MEMTEST
- 
-+/*
-+ * File system
-+ */
-+#define CONFIG_CMD_EXT2
-+#define CONFIG_CMD_FAT
-+#define CONFIG_CMD_JFFS2
-+#define CONFIG_CMD_UBI
-+#define CONFIG_CMD_UBIFS
-+#define CONFIG_RBTREE
-+#define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
-+#define CONFIG_MTD_PARTITIONS
-+#define CONFIG_CMD_MTDPARTS
-+#define CONFIG_LZO
-+
- #endif /* _CONFIG_GURUPLUG_H */
-
diff --git a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch b/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
deleted file mode 100644
index 4f32dd89031f..000000000000
--- a/pkgs/misc/uboot/guruplug-usb-msd-multi-lun.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-The GuruPlug's microSD card reader is a USB mass storage device that
-has two logical units (LUNs), i.e., two "SCSI disks".  This patch
-adds multi-LUN support to the USB MSD driver.
-
-See the thread at <http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/85425>.
-
---- u-boot/common/usb_storage.c	1970-01-01 01:00:01.000000000 +0100
-+++ u-boot/common/usb_storage.c	2010-10-02 00:38:15.000000000 +0200
-@@ -204,6 +204,22 @@ int usb_stor_info(void)
- 	return 1;
- }
- 
-+static unsigned int usb_get_max_lun(struct us_data *us)
-+{
-+	int len;
-+	unsigned char result;
-+	len = usb_control_msg(us->pusb_dev,
-+			      usb_rcvctrlpipe(us->pusb_dev, 0),
-+			      US_BBB_GET_MAX_LUN,
-+			      USB_TYPE_CLASS | USB_RECIP_INTERFACE | USB_DIR_IN,
-+			      0, us->ifnum,
-+			      &result, sizeof(result),
-+			      USB_CNTL_TIMEOUT * 5);
-+	USB_STOR_PRINTF("Get Max LUN -> len = %i, result = %i\n",
-+			len, (int) result);
-+	return (len > 0) ? result : 0;
-+}
-+
- /*******************************************************************************
-  * scan the usb and reports device info
-  * to the user if mode = 1
-@@ -241,13 +257,21 @@ int usb_stor_scan(int mode)
- 			break; /* no more devices avaiable */
- 
- 		if (usb_storage_probe(dev, 0, &usb_stor[usb_max_devs])) {
--			/* ok, it is a storage devices
--			 * get info and fill it in
--			 */
--			if (usb_stor_get_info(dev, &usb_stor[usb_max_devs],
--						&usb_dev_desc[usb_max_devs]) == 1)
-+			/* OK, it's a storage device.  Iterate over its LUNs
-+			 * and populate `usb_dev_desc'.  */
-+			int lun, max_lun, start = usb_max_devs;
-+
-+			max_lun = usb_get_max_lun(&usb_stor[usb_max_devs]);
-+			for (lun = 0;
-+			     lun <= max_lun && usb_max_devs < USB_MAX_STOR_DEV;
-+			     lun++) {
-+				usb_dev_desc[usb_max_devs].lun = lun;
-+				if (usb_stor_get_info(dev, &usb_stor[start],
-+						      &usb_dev_desc[usb_max_devs]) == 1) {
- 				usb_max_devs++;
- 		}
-+			}
-+		}
- 		/* if storage device */
- 		if (usb_max_devs == USB_MAX_STOR_DEV) {
- 			printf("max USB Storage Device reached: %d stopping\n",
-@@ -882,6 +906,7 @@ static int usb_inquiry(ccb *srb, struct 
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_INQUIRY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->cmd[4] = 36;
- 		srb->datalen = 36;
- 		srb->cmdlen = 12;
-@@ -905,6 +930,7 @@ static int usb_request_sense(ccb *srb, s
- 	ptr = (char *)srb->pdata;
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_REQ_SENSE;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[4] = 18;
- 	srb->datalen = 18;
- 	srb->pdata = &srb->sense_buf[0];
-@@ -924,6 +950,7 @@ static int usb_test_unit_ready(ccb *srb,
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_TST_U_RDY;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 0;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -943,6 +970,7 @@ static int usb_read_capacity(ccb *srb, s
- 	do {
- 		memset(&srb->cmd[0], 0, 12);
- 		srb->cmd[0] = SCSI_RD_CAPAC;
-+		srb->cmd[1] = srb->lun << 5;
- 		srb->datalen = 8;
- 		srb->cmdlen = 12;
- 		if (ss->transport(srb, ss) == USB_STOR_TRANSPORT_GOOD)
-@@ -957,6 +985,7 @@ static int usb_read_10(ccb *srb, struct 
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_READ10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
-@@ -973,6 +1002,7 @@ static int usb_write_10(ccb *srb, struct
- {
- 	memset(&srb->cmd[0], 0, 12);
- 	srb->cmd[0] = SCSI_WRITE10;
-+	srb->cmd[1] = srb->lun << 5;
- 	srb->cmd[2] = ((unsigned char) (start >> 24)) & 0xff;
- 	srb->cmd[3] = ((unsigned char) (start >> 16)) & 0xff;
- 	srb->cmd[4] = ((unsigned char) (start >> 8)) & 0xff;
diff --git a/pkgs/misc/uboot/guruplug.nix b/pkgs/misc/uboot/guruplug.nix
deleted file mode 100644
index 9f24f1da86a4..000000000000
--- a/pkgs/misc/uboot/guruplug.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{stdenv, fetchgit, unzip}:
-
-# Marvell's branch of U-Boot for the GuruPlug.
-
-let
-  # Aug 2010 revision of the `testing' branch of Marvell's U-Boot repository.
-  # See
-  # <http://www.openplug.org/plugwiki/index.php/Re-building_the_kernel_and_U-Boot>
-  # for details.
-  rev = "f106056095049c2c748c2a2797e5353295240e04";
-in
-stdenv.mkDerivation {
-  name = "uboot-guruplug-0.0-pre-${stdenv.lib.strings.substring 0 7 rev}";
-
-  src = fetchgit {
-    url = "git://git.denx.de/u-boot-marvell.git";
-    sha256 = "18gwyj16vml7aja9cyan51jwfcysy4cs062z7wmgdc0l9bha6iw7";
-    inherit rev;
-  };
-
-  patches =
-    [ ./guruplug-file-systems.patch ./guruplug-usb-msd-multi-lun.patch ];
-
-  enableParallelBuilding = true;
-
-  # Remove the cross compiler prefix.
-  configurePhase = ''
-    make mrproper
-    make guruplug_config
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make all u-boot.kwb
-    else
-        make all u-boot.kwb ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -v u-boot u-boot.{kwb,map} $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/misc/uboot/sheevaplug.nix b/pkgs/misc/uboot/sheevaplug.nix
deleted file mode 100644
index 53d811d1a44e..000000000000
--- a/pkgs/misc/uboot/sheevaplug.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-# We should enable this check once we have the cross target system information
-# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux";
-
-# All this file is made for the Marvell Sheevaplug
-   
-stdenv.mkDerivation {
-  name = "uboot-sheevaplug-3.4.27";
-   
-  src = fetchurl {
-    url = "ftp://ftp.denx.de/pub/u-boot/u-boot-1.1.4.tar.bz2";
-    sha256 = "19vp4rlikz7h72pqsjhgz7nmgjy4c6vabvxkw67wni70vy5ddy8s";
-  };
-
-  srcAddon = fetchurl {
-    url = "http://www.plugcomputer.org/405/us/plug-basic/uboot/u-boot-3.4.27.zip";
-    sha256 = "1wqxznpdb6d2kx58gral4q0mg5ddxyrv7az8c6v29nr3cd9yrfsg";
-  };
-
-  postUnpack = ''
-    mv u-boot-1.1.4 u-boot-3.4.27
-    unzip -o $srcAddon
-    sourceRoot=u-boot-3.4.27
-  '';
-
-  patches = [ ./gas220.patch ];
-
-  # Remove the cross compiler prefix, and add reiserfs support
-  configurePhase = ''
-    make mrproper
-    make rd88f6281Sheevaplug_config NBOOT=1 LE=1
-    sed -i /CROSS_COMPILE/d include/config.mk
-  '';
-
-  buildPhase = ''
-    unset src
-    if test -z "$crossConfig"; then
-        make clean all
-    else
-        make clean all ARCH=arm CROSS_COMPILE=$crossConfig-
-    fi
-  '';
-
-  nativeBuildInputs = [ unzip ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp u-boot-rd88f6281Sheevaplug_400db_nand.bin $out
-    cp u-boot u-boot.map $out
-
-    mkdir -p $out/bin
-    cp tools/{envcrc,mkimage} $out/bin
-  '';
-
-  meta = {
-    platforms = [ "armv5tel-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c27168530e0e..6e4d75f78c38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13797,6 +13797,7 @@ with pkgs;
     ubootBananaPi
     ubootBeagleboneBlack
     ubootClearfog
+    ubootGuruplug
     ubootJetsonTK1
     ubootOdroidXU3
     ubootOrangePiPc
@@ -13806,17 +13807,14 @@ with pkgs;
     ubootRaspberryPi2
     ubootRaspberryPi3_32bit
     ubootRaspberryPi3_64bit
+    ubootSheevaplug
     ubootUtilite
     ubootWandboard
     ;
 
   # Non-upstream U-Boots:
-  ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };
-
   ubootNanonote = callPackage ../misc/uboot/nanonote.nix { };
 
-  ubootGuruplug = callPackage ../misc/uboot/guruplug.nix { };
-
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = callPackage ../os-specific/linux/uclibc {

From b63124dfc5f4f1f868a8132efc159d99f1b73516 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Tue, 6 Mar 2018 00:04:10 -0500
Subject: [PATCH 1775/3370] uboot: fix cross-build of ubootTools

(cherry picked from commit 28fd7d9594fa0ed1a1b80a9652b5ab065a29e077)
(cherry picked from commit 4c669db598aba04b9a6dd3ecaf0811329d80a072)
---
 pkgs/misc/uboot/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 9da52e494371..dbb2bbef1a4e 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -86,12 +86,11 @@ in rec {
   ubootTools = buildUBoot rec {
     defconfig = "allnoconfig";
     installDir = "$out/bin";
-    buildFlags = "tools NO_SDL=1";
     hardeningDisable = [];
     dontStrip = false;
     extraMeta.platforms = stdenv.lib.platforms.linux;
     # build tools/kwboot
-    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" ];
+    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
     postConfigure = ''
       sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
     '';

From 7dffe0d38c7be19537b9fe67ba24be8c37f96a0c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 15 Mar 2018 09:03:39 +0200
Subject: [PATCH 1776/3370] U-Boot: Add AArch64 QEMU build

See

https://github.com/u-boot/u-boot/blob/master/doc/README.qemu-arm

on how to use it.

(cherry picked from commit 6b069c656abf9704662317dc0173f18cdf4dfc91)
(cherry picked from commit eff6d9628c9e0bae2096251f8e97789c0b9afe6f)
---
 pkgs/misc/uboot/default.nix     | 6 ++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index dbb2bbef1a4e..b56ca2693570 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -158,6 +158,12 @@ in rec {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootQemuAarch64 = buildUBoot rec {
+    defconfig = "qemu_arm64_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootQemuArm = buildUBoot rec {
     defconfig = "qemu_arm_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e4d75f78c38..78641135ef60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13802,6 +13802,7 @@ with pkgs;
     ubootOdroidXU3
     ubootOrangePiPc
     ubootPcduino3Nano
+    ubootQemuAarch64
     ubootQemuArm
     ubootRaspberryPi
     ubootRaspberryPi2

From 566d3feb4e5b785513f1ed1c6a23faee96d96077 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 10 Dec 2017 20:56:36 -0500
Subject: [PATCH 1777/3370] U-Boot: Add SOPINE Baseboard build

This build is compatible with PINE A64-LTS.

[dezgeg changed the original device tree patch to v4 of the patch series
"sunxi: sync H3, H5, A64 DTs from mainline Linux" submitted to the
upstream mailing list by Andre Przywara. Also install the
u-boot-sunxi-with-spl.bin binary similar to 32-bit boards
since it's now being built by the upstream build system.]

(cherry picked from commit 2ff31f71ae1f10b3d1779b876ac94bf2a9998bd9)
(cherry picked from commit 176d151f4d98d54adf293ee58427da649f28452c)
---
 pkgs/misc/uboot/default.nix     | 19 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index b56ca2693570..aac5f5a2c802 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,11 +1,20 @@
 { stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig
+, armTrustedFirmwareAllwinner
 , hostPlatform, buildPackages
 }:
 
 let
+  # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
+  sunxiPatch = fetchpatch {
+    name = "sunxi.patch";
+    url = "https://github.com/u-boot/u-boot/compare/v2018.03...dezgeg:2018-03-sunxi.patch";
+    sha256 = "1pqn7c6c06hfygwpcgaraqvqxcjhz99j0rx5psfhj8igy0qvk2dq";
+  };
+
   buildUBoot = { filesToInstall
             , installDir ? "$out"
             , defconfig
+            , extraPatches ? []
             , extraMakeFlags ? []
             , extraMeta ? {}
             , ... } @ args:
@@ -36,7 +45,7 @@ let
         url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch;
         sha256 = "07jafdnxvqv8lz256qy29agjc2k1zj5ad4k28r1w5qkhwj4ixmf8";
       })
-    ];
+    ] ++ extraPatches;
 
     postPatch = ''
       patchShebangs tools
@@ -200,6 +209,14 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootSopine = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "sopine_baseboard_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootUtilite = buildUBoot rec {
     defconfig = "cm_fx6_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78641135ef60..96c76b955195 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13809,6 +13809,7 @@ with pkgs;
     ubootRaspberryPi3_32bit
     ubootRaspberryPi3_64bit
     ubootSheevaplug
+    ubootSopine
     ubootUtilite
     ubootWandboard
     ;

From f2ea9e0ebf32754c0a9ad3ff5385b943b48bae3f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 19 Jan 2018 22:14:00 +0200
Subject: [PATCH 1778/3370] U-Boot: Add Pine64 build

(cherry picked from commit 4b77663edfba2c4e15db46c1ba900fa9819e4325)
(cherry picked from commit 1896fcff609d7b99b4be1781a5c9523193c33e4f)
---
 pkgs/misc/uboot/default.nix     | 8 ++++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 9 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index aac5f5a2c802..4a96deadaea2 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -167,6 +167,14 @@ in rec {
     filesToInstall = ["u-boot-sunxi-with-spl.bin"];
   };
 
+  ubootPine64 = buildUBoot rec {
+    extraPatches = [sunxiPatch];
+    defconfig = "pine64_plus_defconfig";
+    extraMeta.platforms = ["aarch64-linux"];
+    BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin";
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootQemuAarch64 = buildUBoot rec {
     defconfig = "qemu_arm64_defconfig";
     extraMeta.platforms = ["aarch64-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96c76b955195..d18e51772cea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13802,6 +13802,7 @@ with pkgs;
     ubootOdroidXU3
     ubootOrangePiPc
     ubootPcduino3Nano
+    ubootPine64
     ubootQemuAarch64
     ubootQemuArm
     ubootRaspberryPi

From d884ece1daa254b39c0fae9910bde0771c8fd496 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 16 Mar 2018 19:27:01 +0200
Subject: [PATCH 1779/3370] U-Boot: Make ubootJetsonTK1 install even more files

(cherry picked from commit 4fe75d11b2efdd3325ee8eaa4347626f1a950dbd)
(cherry picked from commit a68e60f450b5be76d40627066b2c34a0e2360fab)
---
 pkgs/misc/uboot/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 4a96deadaea2..807bc48a6428 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -147,6 +147,11 @@ in rec {
     defconfig = "jetson-tk1_defconfig";
     extraMeta.platforms = ["armv7l-linux"];
     filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
+    # tegra-uboot-flasher expects this exact directory layout, sigh...
+    postInstall = ''
+      mkdir -p $out/spl
+      cp spl/u-boot-spl $out/spl/
+    '';
   };
 
   ubootOdroidXU3 = buildUBoot rec {

From ba172467cc728e5345205c9f3d7fc992d4eed081 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 24 Mar 2018 16:07:50 +0200
Subject: [PATCH 1780/3370] U-Boot: Disable parallel build

https://hydra.nixos.org/build/71880710
(cherry picked from commit 50dc85ed6283bb17684597cbf95f9405d5637fea)
(cherry picked from commit 91b09422cf6f8e44d3d06274761053d9e21d6fa2)
---
 pkgs/misc/uboot/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 807bc48a6428..4cf1748bad44 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -78,7 +78,9 @@ let
       runHook postInstall
     '';
 
-    enableParallelBuilding = true;
+    # make[2]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
+    enableParallelBuilding = false;
+
     dontStrip = true;
 
     meta = with stdenv.lib; {

From 5cb25c4406222745350d1df6ed9b93cc08f598d3 Mon Sep 17 00:00:00 2001
From: Anders Lundstedt <git@anderslundstedt.se>
Date: Sun, 13 May 2018 01:28:28 +0200
Subject: [PATCH 1781/3370] plex: 1.9.6 -> 1.13.0

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 29be86d16029..57de5281fdfc 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -6,9 +6,9 @@
 let
   plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass";
   plexpkg = if enablePlexPass then plexPass else {
-    version = "1.9.6.4429";
-    vsnHash = "23901a099";
-    sha256 = "0bmqf8b2d9h2h5q3n4ahs8y6a9aihj63rch7wd82rcr1l9xnqk9d";
+    version = "1.13.0.5023";
+    vsnHash = "31d3c0c65";
+    sha256 = "b94d571bcd47bc3201fd7f54b910f5693cabd1b543d5d0b4705668b7b7c24602";
   };
 
 in stdenv.mkDerivation rec {

From bb07e8903d25dd294b58426e9e5ad559d6717a5e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 21:43:43 +0200
Subject: [PATCH 1782/3370] borgbackup: install shell completions

---
 pkgs/tools/backup/borg/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 43f45a1783f5..6de4d3d859ed 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -44,11 +44,20 @@ python3Packages.buildPythonApplication rec {
     make -C docs man
     mkdir -p $out/share/man
     cp -R docs/_build/man $out/share/man/man1
+
+    mkdir -p $out/share/bash-completion/completions
+    cp scripts/shell_completions/bash/borg $out/share/bash-completion/completions/
+
+    mkdir -p $out/share/fish/vendor_completions.d
+    cp scripts/shell_completions/fish/borg.fish $out/share/fish/vendor_completions.d/
+
+    mkdir -p $out/share/zsh/site-functions
+    cp scripts/shell_completions/zsh/_borg $out/share/zsh/site-functions/
   '';
 
   meta = with stdenv.lib; {
     description = "A deduplicating backup program (attic fork)";
-    homepage = https://borgbackup.github.io/;
+    homepage = https://www.borgbackup.org;
     license = licenses.bsd3;
     platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage
     maintainers = with maintainers; [ flokli ];

From 5948024c40942999f5411914767f6a8bde9739b5 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 21:49:23 +0200
Subject: [PATCH 1783/3370] exa: install man page and shell completions

---
 pkgs/tools/misc/exa/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
index c07420821ed4..2e6753cec347 100644
--- a/pkgs/tools/misc/exa/default.nix
+++ b/pkgs/tools/misc/exa/default.nix
@@ -23,6 +23,20 @@ buildRustPackage rec {
     libiconv darwin.apple_sdk.frameworks.Security ]
   ;
 
+  postInstall = ''
+    mkdir -p $out/share/man/man1
+    cp contrib/man/exa.1 $out/share/man/man1/
+
+    mkdir -p $out/share/bash-completion/completions
+    cp contrib/completions.bash $out/share/bash-completion/completions/exa
+
+    mkdir -p $out/share/fish/vendor_completions.d
+    cp contrib/completions.fish $out/share/fish/vendor_completions.d/exa.fish
+
+    mkdir -p $out/share/zsh/site-functions
+    cp contrib/completions.zsh $out/share/zsh/site-functions/_exa
+  '';
+
   # Some tests fail, but Travis ensures a proper build
   doCheck = false;
 

From 0764d5992c0caf539fc3abe711a6f8c5a50d8c4e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Sun, 13 May 2018 22:03:17 +0200
Subject: [PATCH 1784/3370] youtube-dl: install zsh completion

---
 pkgs/tools/misc/youtube-dl/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index d2e490373da0..29ece1b8b0fb 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -38,11 +38,16 @@ buildPythonApplication rec {
         ++ optional phantomjsSupport phantomjs2;
     in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ];
 
+  postInstall = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp youtube-dl.zsh $out/share/zsh/site-functions/_youtube-dl
+  '';
+
   # Requires network
   doCheck = false;
 
   meta = {
-    homepage = http://rg3.github.io/youtube-dl/;
+    homepage = https://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;
     description = "Command-line tool to download videos from YouTube.com and other sites";
     longDescription = ''

From 5bd19cfceb51e2185c969c894da35473b7a254c3 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sun, 13 May 2018 23:05:04 +0200
Subject: [PATCH 1785/3370] libressl: 2.5.5 -> 2.7.3

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3a4357a6ec3b..bcd2de7ab62f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10950,7 +10950,7 @@ with pkgs;
     libressl_2_6
     libressl_2_7;
 
-  libressl = libressl_2_5;
+  libressl = libressl_2_7;
 
   boringssl = callPackage ../development/libraries/boringssl { };
 

From 989fd880a16c662277dad3a75318b1dc216a49a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Sun, 13 May 2018 22:46:52 +0200
Subject: [PATCH 1786/3370] gnome3.gnome-shell: 3.28.1 -> 3.28.2

---
 pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++--
 pkgs/desktops/gnome-3/core/mutter/default.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index ae9aa047ba02..772df5d24417 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -13,11 +13,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "gnome-shell-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1k2cgaky293kcjis0pmh9hw1aby3yyilb5dzrbww62wxzppc9s35";
+    sha256 = "1b9n89ij2g5nqaqp7a13jnqcd8qa2v9p55rbi71al3xvqk091ri7";
   };
 
   # Needed to find /etc/NetworkManager/VPN
diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix
index 866888feba0c..20dda08f9800 100644
--- a/pkgs/desktops/gnome-3/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/core/mutter/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "mutter-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1bhmjvf6l1fj5igsw2xlg3nv5526laiwaxh47dgk50f40qax1qin";
+    sha256 = "0ighs1zvlssgq16v1h3vg280za7y448snq65gc5m1zmqqawqkymg";
   };
 
   passthru = {

From f252c72669399b95827e000bbaa535510b952785 Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 13 May 2018 14:19:35 -0700
Subject: [PATCH 1787/3370] hiro: init at 0.1.4

---
 .../python-modules/hiro/default.nix           | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 pkgs/development/python-modules/hiro/default.nix

diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix
new file mode 100644
index 000000000000..0289c008e7e8
--- /dev/null
+++ b/pkgs/development/python-modules/hiro/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi, six, mock }:
+buildPythonPackage rec {
+  pname = "hiro";
+  version = "0.1.4";
+  src = fetchPypi {
+    inherit pname version;
+
+    sha256 = "1340lhg7k522bqpz5iakl51qb47mjw804mfwwzm77i7qcm5cwiz8";
+  };
+
+  propagatedBuildInputs = [ six mock ];
+
+  meta = with stdenv.lib; {
+    description = "Time manipulation utilities for Python";
+    homepage = http://hiro.readthedocs.io/en/latest/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ nyarly ];
+  };
+}

From 42d0ce8a28c63058004e38d0fb9a1dee4c0d00bc Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 13 May 2018 14:20:59 -0700
Subject: [PATCH 1788/3370] keyrings.alt: init at 2.3

---
 .../python-modules/keyrings-alt/default.nix   | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/keyrings-alt/default.nix

diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
new file mode 100644
index 000000000000..140d4297cda5
--- /dev/null
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, six
+, pytest, unittest2, mock, keyring
+}:
+
+buildPythonPackage rec {
+  pname = "keyrings.alt";
+  version = "2.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d";
+  };
+  propagatedBuildInputs = [ six ];
+
+  # Fails with "ImportError: cannot import name mock"
+  doCheck = false;
+  checkInputs = [ pytest unittest2 mock keyring ];
+
+  meta = with stdenv.lib; {
+    license = licenses.mit;
+    description = "Alternate keyring implementations";
+    homepage = https://github.com/jaraco/keyrings.alt;
+    maintainers = with maintainers; [ nyarly ];
+  };
+}

From 51f4a46af29c4dc47659e687799146a2ac6c04af Mon Sep 17 00:00:00 2001
From: Judson <nyarly@gmail.com>
Date: Sun, 13 May 2018 14:35:42 -0700
Subject: [PATCH 1789/3370] jira_cli: init at 2.2

---
 pkgs/development/tools/jira_cli/default.nix | 32 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 pkgs/top-level/python-packages.nix          |  3 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/tools/jira_cli/default.nix

diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix
new file mode 100644
index 000000000000..37b76c50e902
--- /dev/null
+++ b/pkgs/development/tools/jira_cli/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, libffi, openssl, pythonPackages }:
+let
+  inherit (pythonPackages) fetchPypi buildPythonApplication vcrpy mock hiro;
+in
+  buildPythonApplication rec {
+    pname = "jira-cli";
+    version = "2.2";
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "314118d5d851394ebf910122fd7ce871f63581393968c71456441eb56be3b112";
+    };
+
+    postPatch = ''
+      substituteInPlace requirements/main.txt --replace "argparse" ""
+    '';
+
+    # Tests rely on VCR cassettes being written during tests. R/O nix store prevents this.
+    doCheck = false;
+    checkInputs = with pythonPackages; [ vcrpy mock hiro ];
+    buildInputs = [ libffi openssl ];
+    propagatedBuildInputs = with pythonPackages; [
+      argparse ordereddict requests six suds-jurko termcolor keyring
+      jira  keyrings-alt
+    ];
+
+    meta = with stdenv.lib; {
+      description = "A command line interface to Jira";
+      homepage = http://github.com/alisaifee/jira-cli;
+      maintainers = with maintainers; [ nyarly ];
+      license = licenses.mit;
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a386721febb..702dfd5d4731 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3150,6 +3150,8 @@ with pkgs;
   jing = self.jing-trang;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 
+  jira-cli = callPackage ../development/tools/jira_cli { };
+ 
   jl = haskellPackages.callPackage ../development/tools/jl { };
 
   jmespath = callPackage ../development/tools/jmespath { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9033c3d825d..15737f335c29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2994,6 +2994,8 @@ in {
 
   };
 
+  hiro = callPackage ../development/python-modules/hiro {};
+
   hglib = callPackage ../development/python-modules/hglib {};
 
   humanize = buildPythonPackage rec {
@@ -5070,6 +5072,7 @@ in {
     };
   };
 
+  keyrings-alt = callPackage ../development/python-modules/keyrings-alt {};
 
   SPARQLWrapper = buildPythonPackage rec {
     name = "SPARQLWrapper-${version}";

From 88fa50c2f2bbc472fe7169eac8f2a1b2312ef03b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 14 May 2018 00:01:15 +0200
Subject: [PATCH 1790/3370] nixos/tests: set default stateVersion in test VMs

... to avoid lots of warnings during eval
introduced by 1f0b6922d3c
---
 nixos/modules/testing/test-instrumentation.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index 98da55ed68a7..3d46ba72493c 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -129,6 +129,9 @@ in
     users.extraUsers.root.initialHashedPassword = mkOverride 150 "";
 
     services.xserver.displayManager.job.logToJournal = true;
+
+    # set default stateVersion to avoid warnings during eval
+    system.nixos.stateVersion = mkDefault "18.03";
   };
 
 }

From 8f3a541a3d096e5b8cd70112632bd8a6af283010 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 13 May 2018 16:59:51 -0400
Subject: [PATCH 1791/3370] nixos/grub: Updates `splashImage` description to
 match reality.

Fixes #4911
---
 nixos/modules/system/boot/loader/grub/grub.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index e2cff1c1bd94..67daaa333e5e 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -308,10 +308,22 @@ in
         type = types.nullOr types.path;
         example = literalExample "./my-background.png";
         description = ''
-          Background image used for GRUB.  It must be a 640x480,
+          Background image used for GRUB.
+          Set to <literal>null</literal> to run GRUB in text mode.
+
+          <note><para>
+          For grub 1:
+          It must be a 640x480,
           14-colour image in XPM format, optionally compressed with
-          <command>gzip</command> or <command>bzip2</command>.  Set to
-          <literal>null</literal> to run GRUB in text mode.
+          <command>gzip</command> or <command>bzip2</command>.
+          </para></note>
+
+          <note><para>
+          For grub 2:
+          File must be one of .png, .tga, .jpg, or .jpeg. JPEG images must
+          not be progressive.
+          The image will be scaled if necessary to fit the screen.
+          </para></note>
         '';
       };
 

From 0ccfe14e25771d83460305ee09d99cb449eea15a Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 13 May 2018 19:51:50 -0400
Subject: [PATCH 1792/3370] nixos/grub: Implements use of file format for
 splashImage.

GRUB 2.0 supports png, jpeg and tga. This will use the image's suffix to
load the right module.

As jpeg module is named jpeg, jpg is renamed jpeg.

If the user uses wrong image suffix for an image, it wouldn't work anyway.

This will leave up to two additional left-over files in /boot/ if user switches
through all the supported file formats. The module already left the png
image if the user disabled the splash image.
---
 .../system/boot/loader/grub/install-grub.pl        | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 8bd203106f55..1aa14729a75c 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -299,12 +299,16 @@ else {
         copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n";
     }
     if ($splashImage) {
-        # FIXME: GRUB 1.97 doesn't resize the background image if it
-        # doesn't match the video resolution.
-        copy $splashImage, "$bootPath/background.png" or die "cannot copy $splashImage to $bootPath\n";
+        # Keeps the image's extension.
+        my ($filename, $dirs, $suffix) = fileparse($splashImage, qr"\..[^.]*$");
+        # The module for jpg is jpeg.
+        if ($suffix eq ".jpg") {
+            $suffix = ".jpeg";
+        }
+        copy $splashImage, "$bootPath/background$suffix" or die "cannot copy $splashImage to $bootPath\n";
         $conf .= "
-            insmod png
-            if background_image " . $grubBoot->path . "/background.png; then
+            insmod " . substr($suffix, 1) . "
+            if background_image " . $grubBoot->path . "/background$suffix; then
               set color_normal=white/black
               set color_highlight=black/white
             else

From f8dc3abbb053f3732afc016109a47febad94ff71 Mon Sep 17 00:00:00 2001
From: Yorick <yorick@yorickvanpelt.nl>
Date: Mon, 14 May 2018 02:03:42 +0200
Subject: [PATCH 1793/3370] linux: add CONFIG_KEY_DH_OPERATIONS

---
 pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4af5889fd1cd..ebb569689b29 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -636,6 +636,11 @@ with stdenv.lib;
     X86_X2APIC y
     IRQ_REMAP y
   ''}
+  
+  # needed for iwd WPS support (wpa_supplicant replacement)
+  ${optionalString (versionAtLeast version "4.7") ''
+    CONFIG_KEY_DH_OPERATIONS y
+  ''}
 
   # Disable the firmware helper fallback, udev doesn't implement it any more
   FW_LOADER_USER_HELPER_FALLBACK? n

From 83e237d92a962b2b3c831d61efa6d4aee1b786be Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 13 May 2018 12:35:02 +0800
Subject: [PATCH 1794/3370] firefox-devedition-bin: 60.0b8 -> 61.0b4

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index bf7e7cfe9d3f..d0c87fd35b88 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b8";
+  version = "61.0b4";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ach/firefox-61.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "3cfc027c422936911f669825d03be090788fb94a33e0e67b2b7d58aed52b719eab4ff1a7e19ac368543a4b662766a41062971b9a5fb5588b76029fd8a78dcb1b";
+      sha512 = "79f2d4d476d87e3a66b5985eb05b4c2c67da500c4f655fc917bea787b2745cf2275bc1a0a60f2a7d8edd29339f9db8bddac9c079687c212076e2c51811784ff6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/af/firefox-61.0b4.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "a8d96e9d9529b4c068371cda82219bb334d54e069b3e63caa6de4054cf917eea2aec9e8767d64999ce72323ced179477e07791ec8bb23d8231fe268f92c72042";
+      sha512 = "6bff0f1fbd1ac000a2d3eaa6b65e115a2d4ab3fb7d8c267f1aa13e0edc42f3f1a390eac87dc516b144969473106fc492ad471f696a885b8994db05c19e386a0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/an/firefox-61.0b4.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "18b5d0188d6ddd22c2de16c02a3b3f8eeffc25cee1c1afcb2bc9f80c722bca7c15f9561c9215e65a5390b45989c235f5720cfdf01005d7ef7e1ab1119a7ee294";
+      sha512 = "26665a323860a567e6daf053324a895c5b639c720325612b923fc9c62365983c9d6af48274a068b51a22476c9c005e31ad6c95dd291bd8705f700111191cbad3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ar/firefox-61.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "8f8c83b0f4f0031dad8d3fef2db67ed7ee19e794a7c20525dd91f5024cbc1b7d1b0c9c847173b2aa187050b8bbf68f537b7ef91ad7bdf557759a3ecb4ae7a98f";
+      sha512 = "6b98ba510a4c5db95205ffb0a56ca3307093631bd905358ec8800a421506f7d880b599324f2a39150796d719c1d83c614e18db25933ff06980941319e648d8f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/as/firefox-61.0b4.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "866bc322de99f428e09ce5cafa26dadf77117ead452a527fcaa536da749e9eeda0a82f4d1c5e1aceb202fe931a79fc99d2512acc643a88638c5f37c48e19454f";
+      sha512 = "68650b9b92be7e65e9bdb833ef97320ad5475255e1b040487925a2172d16168bf0c36f70698379f194b7a41e1619152142ddc9e8ee46d4347b7d6b0de71946f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ast/firefox-61.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e91d908997d5924be2f5f7e7afd30a1e5d16d2227ea066a3136a12976fca7fcc89989160a3249ba47145518b53c4285cc7a9d39440cf8953c1729179efc1c690";
+      sha512 = "11e775167faf1a9d6f1b1a14009ac8f45569156fec5c550cffc90abb0fccc601827cbba8b805d82df8cf2239caebad3dd35e3e54818af69dd98aef45d12bbf63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/az/firefox-61.0b4.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "2dbb8d8df8177b4f4f7c69d321817b3ffb4f4430fd8e8250c2cc3678d758c01d9568873270b7aef2368145b6f5ffb0e358ed6c74864c9b883b6c04e11709fff5";
+      sha512 = "7c5347d7997fbe7a540153fb931a1d6e143c6f9200bb3692fbbdd0b9b5e3b38ba9e55d7579d448bb63816d4007c8944f0bedb5ee446c4ed1ecfdb8e8957fc717";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/be/firefox-61.0b4.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "6728628f6b71a6d495b49dd32472a64ddb3c41e2d9e2923cd033a37f19d1149ba5d3594598209ff5b59f0aaf6b0c2fcfd4313fcf34c9ddf3d5b6bda034dcb6c8";
+      sha512 = "78877031b48f257b7070d9ab9b261df1414b5e7447f0855811abdf47f35edc8f6ef8e59264a73a57ef5eeca0afa261557d18cf348cf38e48c7f0f24cc8b13305";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bg/firefox-61.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "1b71d585449f3da51da9c9934c9f5bf15b618bfd6a80e5054137c15c16b245eddcd50458cff69fb70ba2ac050b7fb6f316825bbb49e2ed640d63055a4b80f145";
+      sha512 = "8c57bfc0361de65a0bc7a19ede9aba1af4808aa4f07e0dede04c262429489791c84c0e3f2a2ae6d0cb457b1cbf0a44a966f6f5a636bf897fa9475858b6922ab5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bn-BD/firefox-61.0b4.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a84a384debb371c3cd7b4c4a30cd66f69cccd658c089c10339c0fc7c0b0badbe8600f18451bec4352cde253ba7c4cc9566def047d7df9551214dfe88d0965ef0";
+      sha512 = "19f197b25b3792e7660d062341ed047c2983c6a375947c9c09b7d0c39b5630f88b2f0ea70b6865199caec8bf19f0f927f05347b85ebdd176f26ae6a1997747f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bn-IN/firefox-61.0b4.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "b2f2c879b067d752c69a841c40b319db0d36a2805d441ee832246da199a0099cd359c0e925996c152d67e7d5f733ddcc776a393d86090c455f4c5cdfe79752da";
+      sha512 = "09c01a7da3e77a4c07fefeb8fbb33317a90b14d5b4d33286152c494238da9436b0db54a410a57046a183786a006fe8e3328fd4a2192465fabcb0e5b2686a4536";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/br/firefox-61.0b4.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "db7d9c6e991b3be123f80e62f5b1f9107ae537f3a298d65f910c71397183129a4527e324f75273605a5b945516ac5d2bcde05a3fa3de9748fb880bf0582d4e74";
+      sha512 = "2b8a1a9cb5127e678e783742876a94b8bdc25a0d392d90ccaa0747c3c7b50afef665bc950b20858194a2a2bc3617fe1421f7acd95968cdd67c7e7b88b7972675";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bs/firefox-61.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "df4dbb35c37726af2d5fa1dbcabd8d926f171896b5dda453a07989cede18f58705617e67f9b0702623ee4cbfe570cb81fd5cd9b93a050d2b75e28843fa5a81ae";
+      sha512 = "4a451248f826726a606b025b9acdf8b41fb3993906a7481aa60fe7110b8abe9b5206525fb188bb16159370ab9ecccbc199f0d1bed475db124c923461546167d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ca/firefox-61.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "2386672d892863c4d1ad4a063270125703aeeb2f2afa8bc09cd6d813088c9c80f5837096207c8a662d28025f9c457903f036f79aca3fc3b7ba97660ae861f1b9";
+      sha512 = "02b9ad16ba37bda6a60f980293eb402657c612bb78a1911c8ae2b60657fbde2a1d41ff7849a653a8ff2f8c77bdb4d8a774d856ae90d3112b89846dcdec988533";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cak/firefox-61.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "6f6d1604cd1060a5efa633cb09ef8525369245ef753fa7894f17299d0df2b3bd62c7d2ac8cacb93cf93961dbbf9b240a43d47a0c73cbcc7ea09a2cea2b86755a";
+      sha512 = "2a87fd3ba1e96a7cf850c3795300e488f61cd29c17ef4f02b4957a9859f65b63e3a8a3479a56818e28dd08b2b7399eadf027b305fb10b5a4cb7fb7052c655646";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cs/firefox-61.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "5b8dd67086cfa08fb76b066e2c10be109e0a4eddeb5e4579aa9366dff50642f5e56f6aec37f9aa21299fab0ae7005ae0e6ab4db05e079870e2f4620a4d96c54b";
+      sha512 = "128f7466d1bd1b2a091cbf64d9f521ce77dfc1ff27b4d1bd3bc5d9f297d6ea5b326eb822dd6f1f9a20220f1032afdf89f04296e1810c95e28029b1846fcb9c45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cy/firefox-61.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "31347a1cb6fa703ccbf444830fa88f8535a2717da85fee09f6a544ee8aba1aaea093f4ab1368f0dc4fd7b0dcc3570bbd60bf8855de06a8725d2ee1b345242bad";
+      sha512 = "a99bb3ae930f47a8c7ea43ba50e6dd780b8aad4f3171530c8d8f730c395e4844fd6d4b37a1372ce5aca631b95a196cebafaeae1e4467f22240d5e0033ef505e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/da/firefox-61.0b4.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "20785e095d45c22ebab25f4a2fc224aa6e4a4b7c86db1e94a304c41598cba74ce1d1200effd78bd185e5bc90a11bb66f223e28c0cc65d6663229bb724ad1c791";
+      sha512 = "ccdd547ae7a31e4edb5ea980f55b8e58753e47845ae1b33b45bc1c3def18ba3a716cc8e23061038480ea71c43d682fc48548adefdc480ca6499ac3842e7508db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/de/firefox-61.0b4.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "e070625687172f84d1d5d82ec2ef385291a60c2bf011a4a075892413ded629ac16b7688d2ccc698ace07cde309e782a1b7b16707bc42d2b47ef9394a0deb6872";
+      sha512 = "afb82ce313001463da8763615ec9f6a52f019ceb1ed52616e0771081472455df2d252bf2e06700aa8add39ec1a6db0e51ad1f46026a1367cdd7e02ef070e3f9c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/dsb/firefox-61.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "38df16c7aa84fe2cfbff1e19e702b2c1ea4e2c5f1523cd3094144685fa1d5d561e00270881d0a113b14e926f540b25ceeb1562ecf4876cc35cd93fb794de448c";
+      sha512 = "8fa44ec6ea0726cada8491d2b47675a283ddd669a0bc6d7708b3807fad6007941325c430f5a01358977d6827cabbf79ba57e32b816adf6bc846c2f729f887273";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/el/firefox-61.0b4.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e9846b81293eef5d593eb5175d9d73b7a42de7316c23251d94015da0554ec15981932fcbade6a5fcd726f6a89c6db461564f7ab9351342b9c4d8d915eb768219";
+      sha512 = "73cdbe7ecc09520bb3efb10f74b3792e079589bef18bb9e78f3eeb3aa99ebfd598fde9fb4dc1b1f7cca8f168f5677cf7c96941d1ee08799a41335faba1b6ddf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-GB/firefox-61.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "53cc5276c35d94f263cdb4ee4a92dbbd356eeff382c2a69dba006f6b5a3ce022c528b4e6102374b97c618e70ef7ad692b1799f6ee3987b26378b742c18145cac";
+      sha512 = "53b28a49f42c2d5a18ea81070da3dfe08609b1e967068e3eb99d369b9e16c95683dcae080954a3d89231b2b136caab4632e9c79bdafdd1860c2d642ba46d66d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-US/firefox-61.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "2b0e15a85f5d9a7fe6e8ac198c86d3746d880f96ec13f8e78d69d4618d86e73f76e64bc8dca214a73f2ed95a12ba674f57c697e54f0b869760129176dfae14fa";
+      sha512 = "1d68fb1e26f70e54e32dccda9ce56ba3d6ee4925c8a46ee04321fb88438df4cd9051772e3da23113f95d4ab684b154ac9c7732b1025bada5a7a71b03d683370e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-ZA/firefox-61.0b4.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "c751b4ec0567c5fdcf3b8660ab7bf100366b9c819f78c957c79f217a0e7658d1a7c4bd141baced6e7ba36596a8c07c89b825ade20becf380249d90e0517e1096";
+      sha512 = "e694b56888823d91888c92eebd9778429f92a749453efc2188013c83dbb71c6b4f9aca31d0cf1036ff3e22cbe229bab266319fdaa0efe2b3cd1a6844f0dcf93b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/eo/firefox-61.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "d556386436ad4c226f0986500de244a2efc5cf57ac8d792f328616deabb5884cbd3127d0530add7f7a9dc5c2ac61512456abecd6b1cb8c84c74b2d2bf18d9113";
+      sha512 = "b8007be22bd2e84fcc99f76fc2ac6edbc48b8f529ed055aab31dd7212ec3aabe47d7870a6812eec554ace6a41f98654fdce32e15620b872e9898bff020c5e56e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-AR/firefox-61.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "1fdfea27dd45fbec3727804c49c8db28e624e8240a8589d28621b4f03ca12d184395632db2f629032eebbcd6f0d0f514eb3944d60c2b54bef3c187e06b9add92";
+      sha512 = "3b0998405d2a019b049b80f077eaae13ed7b562b5767a821cb73dcfe50d4c243267e5bb5490911c384a5f5e34f13e0338f768a0119098b1222671ae410efaa7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-CL/firefox-61.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "fc171dc5fad703344d0ec1a9d1800650d0469b1d4f10533e102031c776aaf14d5df7b9375a73583112b9bbd1d1e7df267873da0cb3e7937f5473b2d4652f19d5";
+      sha512 = "a28fe0c2be869e0038da0156601714e33e4e5ead47b9546e9328e06fb7c690b633f28c7f029747cbd438d4854ebe665f58244a18c309358d1877ff769557f99b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-ES/firefox-61.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "7d8f9c31417bb03d02278c5567eff23d07cc2d9de93a5874938db0108c8c0eca0c0e3f924eb8d9887b14d7c058bf4b4fbe1aee1925f0a150212e76e11a0b587c";
+      sha512 = "450b32e899da5077b3e633917324c93132682d9bab4da0f44e63eebc0e406c1ae7c5ea5adf2863363ba4cf8dc8b235b5f3d1ab0be790ea63f5f51feaf5c8723a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-MX/firefox-61.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "95b43192a707943cda58d98fba2bbb96b745d6997932113c1807f12de7fe3fe165c9dff7c000dafdf21192b24eaa42c874f068e3cef6a2e7c6cabb8f0e1fcc32";
+      sha512 = "bebdc8924ae2d3a6d329a86c838bc54e99335e087dac0696fa833e13af17b81ac2a937f7327db970e55fce04cb3cf66f645f8a0e15c3a421c2487a30e29f6d0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/et/firefox-61.0b4.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "3e379c3389fe3a1a97dd3d6ad39abca49273e6e36bfcc9b5b6b2eda948529bf6e744fb9550b89edce2d9ea9145a2c7a0a5d9466f2975d4c2193696871b32ec58";
+      sha512 = "522acba62d532c6d96235862101f14cd0b7ff38bc52957d5e77783d3299820969c576713bd85c8c6bc63e7bbefaa09d0308110d3390594ac4612299ef8d751a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/eu/firefox-61.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "a1b6197535661193818b0ece5d28112073fa03824aa4bf4de999b554acf751da7117b073c875c7b2265b05af0bbbba7307b59c0f4ea02258e7ed438bc6e0bfaa";
+      sha512 = "799508fd282cc99417f040481d1988d2eb45bc2b7537ff5ee984ba88560819fb20df4ef0de8ed5304e5920bb7e271d05f1faa5e2400428a59ae8e25f4c1c3b3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fa/firefox-61.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "28927abe6b2e33868c37473378b5915ca325ab26e87b6c83566cf9a6974eef28a1ff1a800c164d2d79d613ab1482c0e563597aba20de2179b8645e8dfc5b40d0";
+      sha512 = "4068a191f7a66cbb11fc6938722b6a1a5cc902f024d63dd1f27187d35d1f2d28e1cb17c74e73ee4f4b2ef10925d858973ff51a779314a32ed22a91b78c2fed12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ff/firefox-61.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "07e3f102f8324d3b613c972651b80f83575129a3d23fddea3d02d3880bb66d3697c1d7c9cb47fb2b8dfb24acb4bf9029080675a5295d3ea1d2f7b31114ce4d13";
+      sha512 = "051d7945af28916ccfc39647617f81041f3fff0cc305027dce6408ba7575213c0cd1064d2d48986f4b2740533c7c770ee4b28802b9cde01681fad5baf2fdf27c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fi/firefox-61.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "90bfbe9cd103b981413d57f74d416098ee1bb284e871bc40676fd8f8240a7fea891b4d68a079c1d23d2c62e6f84dbeddc884b4ba31e446dc59fcc4d1b3422469";
+      sha512 = "371f8f0e5d14323a5274923d6745a3aa327b11a18b06b3ff4f4e1c9843985a83b675cff17fcf0c6927d34e771a56a1a605248b32cb04890e202a14251e0ff13c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fr/firefox-61.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "a71571118b26ffb823da9723a6c84a2f10c04c4f52b0a5aa9dc6832ca008071bca761adc71b67959fad643711f1ff859b7e1093b5df8a6f26fb03b01de8c234c";
+      sha512 = "0b5270611797881954b4c2ab8a506ad8104b895c33fe0ee32bc786e45b96f9fad47dfac84955fbae2091c63bf0f7a0c0e189d48366f623b2740aa8bf0115c0bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fy-NL/firefox-61.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "371d1292c4b9fb561bddfbda150eafe227f9c0c6525f5b9bc4ecb178c2768c2e837ae6f213cbf0dd4f64e16d51e56fbb0775d4df1b019587d5bb51428f21fe22";
+      sha512 = "a48ac0ce28c4a689afc7196de17e4235709b239f4c1b6c1150ae706dedc858edc973291998e6f72e36a233c5c316848ae70234fc6c7fd80923894947f2897bd3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ga-IE/firefox-61.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "2477da8f55c599acfd8091a420885f795841f55bb7a0b399c2dfa51db860d9ef03626cf62c6ed99c7c89d7549d1d0b5053c44580894d0c896169fc23dd2568e0";
+      sha512 = "d96b456a2e77dbc0ddb47702c94772b7f75d58ce9fb4473c7f9b4455461e6ea5e0507da2128810f194a74ad6f58d5c3b373a501a1d28ddf7111eb90f9d2e3851";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gd/firefox-61.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "b9849c5d545c40bdcb7bae8d5e3447894a7637d59b1b413f7a42f9fbfe3509a45afb03b20bbee3ce1a625a08404f903a1b79bde183f51b043326d560794e501b";
+      sha512 = "4c9d9adfb6236e011c0048810716a9d44e6251d2122443f7be1a2761fd12ef085c4b8aec06bbdad54d056962ada81f8034d3e87f9dc17551ca74ca9a0630d304";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gl/firefox-61.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f5c014f18422c09f96d63efbd1dd3cd5e880ee5f4c1cb6a2a0eaf939a755a952ace065237b74ed8c4e70508062f69ec545d24aa55b21416cbdc449e840e8bdb9";
+      sha512 = "fe6a9944ce2e595c436aa3aa4556d3e24b2595e7aa3cfe54eacdb23d16d461b1e0e1f4ecb1185f776f19b9f7ceebc01177d624443827d21c5697755f92cb4fbd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gn/firefox-61.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "e35e1d007c0f1371fa4e95ea6498a87949f9f0fde93dbc960f44ad14fb8f2d4587a08fd456bd6898ba864153344a2ac8093f45264d7305a5db88fc920a8e79db";
+      sha512 = "5ed38fd1a5d0414c95c0ca1ded08f3f31e9a3bcc3860a3127a5568c3c8891a958071d1923a208174d27f479811a9053b0e217fe81d51d130b15b8c5ff8ad135d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gu-IN/firefox-61.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "cc8740fd82ca6cb4aff2a5bb2bcc02d6d3457cf7f10c619b087c94d278f79a80da26a7f5f5a995fd77915c95789e1d263feec9bf1b52a9e511835565861e0bdd";
+      sha512 = "b6f850d0a828b24d0c81be758aad2402b749701c09f40c19d47860aa6e9b8e595c223ad14b94560513044ab9e96113bd509aa049e8caa6ce502ac005fd59cf36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/he/firefox-61.0b4.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7547c1099276b4683012cf286482f37af3d8e3c0afa6f95aff2e2030b7ef81c5accb4116ea178134c916f9ff09cf9aebee30c0a698c8f88cdac6f91af64ee66c";
+      sha512 = "ff989985b24a8b4ea0ebc9dcaa73406b3031733d925477487b4ec53ac5dd39d879601bacd1a69a1190c0438df1403adf9fafa67419e098ff618c1cdf1abbb86b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hi-IN/firefox-61.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ff3db0fa7c76764d836b94b7a8e7028a2c3f39c6a3340e90cd1396564bcbf9540b9adb9b235206146c3fde2b8845968817e5eb34095aa5d27cf5ce7cff885504";
+      sha512 = "ffae6c7f92f2c4dc83c65aa4caac0baaef54cce44e7da771a5523e57c15c2d1b2bf4685f8a9fbf0c0d83a234367ed4a30e037e8855fa909fcc3cef2e54c4e01c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hr/firefox-61.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "c13fde2cc3d39d87203239e442feeeb9caa7a0fa03fa1b98f7c49eddf79ed60b88fcd4ceaf5a3d70fd48b64270ee770bc03bf0bc4fbda15fa72090d0e0b3ce03";
+      sha512 = "d63f360161802fd7a680a412bd11ebd47ddc33e234ea97d9725b58ad35c7ec41b598497847077e991a3744024a384d5fd636d66c9f2a31a32d59040ee684700f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hsb/firefox-61.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "e688ecdbcbdab4a821ca17aaae031874c454b8e78cda40ab8d2ac8258a71730c656c6ea5e8542fe3bba975f8203c63bbc82a45f47a4af4da606a446a5a9c0d75";
+      sha512 = "6c5cf6db753f03a108a13303c2a4ccd1be0a8a7dacc4c60de95beaa0395c41bf93921a81e56cb8f65ad7d2ed6e45177c80c8ac9a516e5b72b23942016b62f78a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hu/firefox-61.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "72d6977d4709f04b282301b6f1b803e924f1b1f1b6488b871206cb323457c9cfc01d0a683dc24b3cb16b26d160271d4f234e5f8308f01cb7c8183059e3036415";
+      sha512 = "d98013b7aa341be6efce51e9d7d61668c232958066e8e3b9ea7a8ff886450946b30b9ce089b0bd4c12e43da85f922d58be37863eae552d76a953badccf135514";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hy-AM/firefox-61.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "380bb6c5e7dba01547fc64e10e20234e571ea1aab0dff8ef8fba971a25038ea99694e235269321b38b346872314d64bc31529aae8623cd21c934dfdf82f2f87f";
+      sha512 = "044962ffc10cb00cee9c7a4e7025d3bc08768f4b955a0df9ec8e183de27ac06366b9cdf4a07611cee23fafb27258e9ddf0b3aea4104193d9ebe58577406cd7f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ia/firefox-61.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "12cbea767896b7e20b0c717666b87d7de9f6f818c4f35920d5a0eaf847fc6fd29911d1e8f3cd8bced453e38493359f4e3e644d9c1d92e91285caf9e9b8e75cdd";
+      sha512 = "3a810b0a95babf1e51fc02f54d2be4cfe0a3596b216a85c1e676f7d90bd322abb63d9ad1dab135d268d996fa409a30d6a247d14f8780b9c5daf7dcb09e3c49e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/id/firefox-61.0b4.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "3be7d341d036d4899dccaa6a92fdf117a46a441b4eb481b65f8a94e32b15f5d98662a4bd5ac0c45985142027af811cfa0bed9ea1d7d1ec45439df5b9b6210be2";
+      sha512 = "2faf68616257b9d4a81677676fa86c014fabcd0164d9b851c37176bf60b0495d493c5434d5f677b7d29c91e97a02aff92d3d3ec9449f5df4c85c261410492785";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/is/firefox-61.0b4.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "67f9ae05aef3eb743559401bfe1abe662f748ac11f788fe1407b9d77f6fc2974e8e4ca9e107d2b9500e01283f07a06d35dcd7a1a7223c92e09aa38022e077b88";
+      sha512 = "aa312acb041a1d8f3aaa6f85c0bbd09703d1c5ae972bd80006b929c415dfaebacd849b5297aa2f6d047cb4f21df601a71b3143c451088532f3cd116199373fd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/it/firefox-61.0b4.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "e529d48adce27340bafa07dfd7da2b6eef3559ba2caf2be59fc953028b48c3ead9974632ceaa1ae1a3c6983d2bd7a0b3beb094e8aa0cb5bb28a9e4166a8c50b4";
+      sha512 = "edbb5f0922521d17ffe3e3481ce5ac440b48af65bca441166c26cd9b1b9a12053b6212d3caf29e4f2b32611ce846aed9e157a537eb20f5785ec8fb92990765fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ja/firefox-61.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "35fbee4fe54f18627a647a610b178a5387428375ce743c8c91caf24ebcd37062183dd8d64b090925343e77530a0dd3a384ed5e4b2f8bccf9eba2815213721a46";
+      sha512 = "20d9c4e1cd8515432163daf732aea418fb0eef6f164c9f72bb8519c896a2e119a4774c00308d8fe49640838d166da673f5def9e99af2c88adb3191cf94ac545f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ka/firefox-61.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "5298adaa040804ae5311da123475f746beb2890406c47d0a15d530ad1754f78fd695c0355b3709e7416537dc1965ea8d714feb12865d183788f0962104a169e7";
+      sha512 = "291ab0b8da0b4ffb634967a298499b880e3fe8aac73fbf22cf90744aec1ee2d0eae38b32a970e4650243de5aa547986b78bde59e241668be3f363762922d56ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kab/firefox-61.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "0729b8a96b8cb56b2e57fe29355792b70ba253aa1bcc34e13aa6f8c1e63358c9b315c2193c3f72ed40f47544c14f2f05768a293270bd07a2b735af9bb000ab5e";
+      sha512 = "edf8a27e6a745e2ab7db9cb3a5a270f50c12bf089846d9050176847b29698203c7a298bcce311001d69a22a3049e34506c77bfe08b6dca3b2f2a8a9fe9dab54b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kk/firefox-61.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "4df76c0efd75cb75da4756add7a95dfba2a8a2834c90639687e4a963072e30d22dfeb4e9f5cfd4ea471bf97926844e561a2043423957baa1d60a64b9f1d152ec";
+      sha512 = "1b3972db8aa56fa61b7729029aec794c03b20378b7bbfea93dbbf4d14b9b9bff3be30b94fcc214531bd0067679c5dc5fc3bded774eaa9da1582706166331923b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/km/firefox-61.0b4.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "7d44c52fd2b384a6212e3a5ad11ab1523d0689a61562b05fcbfd7578e47fa39368bc1fd605bc6f4a27a382f4a62bb5301a103a5cdee7e5f8353596e80edf3723";
+      sha512 = "210d65fbb16d3f63e5b94b7df2b33655fe29dc3bb1707f0cff4875f480b7b5731aab65306ccf8d19c78041284bdc6343b5bfa195a03503a27e1e687ab14dfeae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kn/firefox-61.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "953f22af390aeb1f13a10a47003f0f97051e83d3cd0a8f30fc9e3f7e99b82519da6ce0afdfae5f89e88b6bd017af858010aab624e1de8ab39ff9787b9d804dc3";
+      sha512 = "081d883a7f9982418347463a1bab7a361ef915654314b254993c22e1cc6a37dab197950dfc742dbb76c2e520628c12ee190b33d12b89675de3b87adcac4fd389";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ko/firefox-61.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "4cde6ff0a032c6c222e2f36e33398d6acf72b0e944d9d9b6c75c34893082fe3847ac87e837848b3866e55819fed1f41c0a1807ea2c2dcd264f793df9548a5ec0";
+      sha512 = "f00a78552a06c759f353d39a6a3abead6d10d8f4d7276b4eee2d81b7572e96b14aeb7801f6382fab96b355264f391093726bd35b94ce4e4c97d221b0eb18fe0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lij/firefox-61.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "d6ffcad6fdfdaadef0b8225f30d9d0a80e7f918d6b2ff6468f4e460643034286cd561dd63391f79c3b32222d783c09842fe4979c6d94dfce4ebab41fcc6580be";
+      sha512 = "2f681b55c324601f297f56b7f7fd83af21a4a176602275d00f75f919923d6006ec1c7a5178877aae406559f2d9acb27de89aeb9fc94e14e273b2729eb27e5fd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lt/firefox-61.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "8814f08d6d26a05e7f003280a0272886a44fcf3b88da93d0088f0d2a9e517c34c264229ad8ccea8efdf15247631e3cd28f82b589afc4d2d3973127e1227c6c67";
+      sha512 = "2c7388340d8bf4dd7163e7515158d79da26428219f3b2c8a11dfd6d04f85966fde0013fa4209c297d28d8b6bf6ddaed6dcdb3209e1cf3ed6b359f35576d64d23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lv/firefox-61.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "b80fdf0b0ac0f8decc7e4329a23f8ee1005aecc70f7d0d8a000eade3d406221ffff8015beb99c77403f903487ec71870dafa92003aca86f5b0cfdd8ee1f297eb";
+      sha512 = "c6f2d1c64793e63cd9c5f0a5e0346d6d20af95e8ee46e6a68c41a1af7c584137c2cfda7c9bdfcce22dc23a0f7f5b9dab93117d52133bf78b94a6dc78fa3d2261";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mai/firefox-61.0b4.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "63b69aae0a219ad993e557d7125cf91ccbe8a19310a17a09536d5c2a80e7f3292e3aace28342a4b8eb73042ac2ce5d728af5a745416b4b6401d29fae95c7f9ed";
+      sha512 = "c1e0b25fe89e0d27c27942a3c93b2a5f1d861620e2b5e2a077952d806e66183319c5613b099afca667564a9d3f55109b5acb99a5b33da3e8362eae873099b83e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mk/firefox-61.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "18ddb3ff53baf7efd11ccb432d87dcb7a89260c080f29691785bd44999a43e8f9fed99b636b26bd21e557921b82ad9e69d729c498bfcb45077adcfedcc3208fa";
+      sha512 = "b1da2340de04e9535461cd14e8bd203975b6d570d214288da2af3b1b9eeded470325b5a1048e277e173fa3159e7ead212efd4c10748444469ab90ae8ee36d49b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ml/firefox-61.0b4.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "2164dc4beed74c24bd3015d9d294ff0361bd5912728fb64854ce5146188414d4e8402d4ba88ac20944e499e24be103853b4820433a99d6aa8e4e48bed5b3abcc";
+      sha512 = "41e686c0ae341a4f3b5c89c1c3f583b05d78fdb9b45f51b4791cb0b6e8d32b08fa4b1b98d76e9e41241e90ffd60a43d0a1d43a3a33a20d1f24c1a0efb4ad6f43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mr/firefox-61.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "476e3031b7a850cd52f2f20ec712b1fd0f4f55dc74ac10985c5957ab74b303b1eb4cb00ed1303a820ad4a6cea1729d282794e9b8f6b425280a05b413d86f8975";
+      sha512 = "3ceed12270a4d9f8c705d6cabc11e362ed56c7ae9d8ec550abeb3fc1df1a727dd836ab53a9301ccb10ac4f6c0552f614452c23c19c5371b00e5eae85ccd16e72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ms/firefox-61.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "25d07f7f5013a1bd7de9bf977a1b16d193446e0003000362073d26f982139ff8bf0d17990173e77b40a808f845fd590543b7ef1de5a41d3bacc9491438d4aa36";
+      sha512 = "e4efd20a943b934c304b8a1a873dcf70a8f48e5d5c95314c7ddff0c5030afa0d80868b6f1bad6dc553c93d28c219183edcc474ae6a9905c26b2c4bb2a10cf9b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/my/firefox-61.0b4.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "131dc61a6c8a07c593e304cb5c1c887794a597a3ed98ccee1188081da0002bb2ea29a946b12fce1ac7287c5df74864bd881e9f99c2c485b2fbf7684196489248";
+      sha512 = "7f9f8eba68930d62624321470066a25ddefa3c85df9791829633cbe7c23b928e1e00e7682d8d9d11added730be19087d68701ca428078fd3bbf21dcc69ef639a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nb-NO/firefox-61.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "115698e54318f4107c565337c266109925310d79cfd2f1908fd5a6114128ffe827e8e81db630665907a942300664af2ece8cb6888be80f009d6fc2d8d065cdd3";
+      sha512 = "184fcfccde9ec2190ef34cdcdacb3781c7f4d003a79672b78729512be1b899138a10f45e4570b837d5b4e64a1db13c1fe3bb0f2ca16defb5315dd495b1dd18c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ne-NP/firefox-61.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "b89572ed1e0620ec29a762e49394ebaebc98ec964a9d98e8896927eda35155403883e734880ffed51d13405641c569085824ec36356cb2c3e8d57090b5f0301a";
+      sha512 = "19cd13b90d7cc501d2198019d05d33ab8afda90cce2fb805648aa5be8100f0ff15f4a2898b33e3b2d2a39f847ab736b87a77d0f8edf64146a0a5efc18b38df9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nl/firefox-61.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "4a62b79d27361b324269488d1dceb4405f469d8e9a5f4764cf46a2ca31561d759e3f63ba5c23b21b45a43e07181aabd06f01aa699b04b9d1b75f0ca338e161c1";
+      sha512 = "6f716a77ad36a1c73103cea5d0c3c7021bbf70e33cbdb4d7cbf4148036a2888ffa6fa64e7e386038ce247e53e3538538c3cede0e8f1d300b393343b32f59b5c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nn-NO/firefox-61.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "d8407d6930a11e73e1338e13f980f7575df5233dccd633625175c21387c5c697c5ad3fca95db99d52b50248b257586145fac8d57ddcab8d4bb7dc97dd7dc6dbb";
+      sha512 = "6c44f966dd099fdc355245bfd96edc6749dfdac74ac711ede0bd770b43f154927d78dd8b3413ea70b3992a8a2271cd6e67895fcb2e9fc5fe0b4488c6ffcd1c98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/oc/firefox-61.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "1e963bf3f340dba469ae928d87fae73c112be3d8df0bd5b0667c5d7ba3a140d919b96bee2cb1a40a235bc1b80a174ba8a8615dc4ffcfad156fe87e1da2ab0fed";
+      sha512 = "dad6e6c63936b40e5a05dbe7b0a8dd9dcdf9ed8b80b50963067dea80dbe4c95e13ca890f0b7c4e3c134c1a4db8252fb03bbf32534ffa74d6de1a7213a43d2143";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/or/firefox-61.0b4.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "60c29bd2eb3a4abb984d495ac7e1679a66e951022b975b57ce1f5c23db3f2c43363f22626842d0a2750b7275ddb711f7ff868ddb209d37f3d790460169c5ac29";
+      sha512 = "5c1fcdea8c87acb46d74c3fead0da078316f8fc5edb97a379b613c2ec992c24296dd7e83468472f7f453794f6079f485724d154ca70c87483f803b17bd770c32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pa-IN/firefox-61.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "de2c7b09e0973a6b2c86bda0f5fe2a5e29b4a18fdb53cd73301a135fef2212c0fc792c532dda5131cc9a1ee2b097e9a40d5ff4fa4e07f8b640422f9bd2e14490";
+      sha512 = "9c60479466d6dee01492a04250f77dc496438ec8f2cf3888f504df20a014f0e614a3651dea6eb4617a8eb7ccceb04415377edf04e87fb6bc01eede0ca41cd195";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pl/firefox-61.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "2a999ee49e7152227bcc18fcb0c17047df73b27c6330eba701ce12c4283dcd7643d824310cde1bf7571da403e3d3e9db8c34ec04ece7a3e72aa55a8e21da483a";
+      sha512 = "cac19ecc04fe84e3056c77f6c7ab2e497671cbb5900be1d7f8d296599d0a8a892d557a13711a46b1a73fbb0e0d30dd51a70399dd08680e5e5b119a7bd6f9443c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pt-BR/firefox-61.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c62b8aefcd8b5fe59d0e2e643a73b0f6e4c8e6334ba5c223d44e14bead88e81f3622b717afb5af24b7f3d668852572942d555e5a38a577c242534d4328269b68";
+      sha512 = "580fbe7a4ece0ebbf08a4642d83724735f2075bcdbfed5d9883e8a94fb5708bf2496bb72c5357c53d7db995e98db7636f4a72da8492607ad4df5c1699302e95b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pt-PT/firefox-61.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "c0738d209d9686dbd28e8219fbb40d497ee418450210613749355c57a64578b5591a78f38b78bd3dc2d838e65738ae91d6c69a13d9eeff5e2721be46e7ebd66f";
+      sha512 = "6d64a54de0468261ad3ebdbd96b390dc26bd11167ce93450f651b20167fb3796fb4a30aa5fc5cbef2c48a48637a4bc4b5f79a40bddd2744c89038ba339814b61";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/rm/firefox-61.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "925db7b71d25a8e1c5485c92a4c0ba420d541a5c8c919bfd55a7a40357e83ee9728488bfc38eab789ff205513110f6c8f5894ec02d9fc5f47f9ae829a34a71d9";
+      sha512 = "faf3cd4948bbbfef3ed8f78bec64ac2aecb27d9a6a2ca695cc0cf79d44eff57450aaa1aad25c65b6bf934df007674fb2e6e97979798990827e01c5e17bfd96a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ro/firefox-61.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "c718cee842c5bd456282b1daa7b697a7a1bd5eb63108a5ff63dc4dc8f4ce67fcf0b433e65b6128877636f8a2bcfb469d7340052a9347d3b43ab5d87c03b82b38";
+      sha512 = "563fb9c0b44eaf13a82d8e8ad6a4cf45e5fa5ace7797b774687a1ca779bd8c455719cfa1ff2ca567323d4b282135e9e30757be8d432386bd9875f4c32bfbe391";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ru/firefox-61.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "fb650b4ad152cf230c23a4c849671e2fc96982d01785261ac643375e51eda259a9ac725d668b6d7fb50d3db14e7a2dc26babe208774a37444ee25eedaeb8b414";
+      sha512 = "5598552aa4e7cc7e97f327343cd6e5b717b8aa5b1a80e8955f08c37cbd87c3baa6fbde9c1bdb8be41687fa89d0b93d2720fb106193ba50efbd9736ac47661845";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/si/firefox-61.0b4.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "f2fb270f51fe996b829e1d49bfed793ab6ef61bccedcc6f3cedf02b2a50aa214e2942c9f90676f3339de8aac977b561879376513c0815e1157c510ecad29f2d9";
+      sha512 = "0a5dfd926c217c84b5fb022eb9d60e12bd9869a5abe4c2d8a575f72c8b1bcd6bcfd91a40d2b41c9beed97e5611f400d99546db3bdfb2ab77267f0babf843b091";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sk/firefox-61.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "533bcb8ce4d54fec85f0c74e04c6ab6635ccdc462bbd80771919700220e2fa48a12e1d5afa684a2cf4d00bd892fb3ccf219dd288926a16c13eb79dd64b9c7bcf";
+      sha512 = "483faaf1444715cea3f576db1b90963da3fa5999545c16f66506f60659f803158c5080f513bcaa0d51de6c56dfcecc1cfdcc2d7675c26b1dccd31e6ac6fbb70a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sl/firefox-61.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "d0e3d28147a6ef4e33b25790c9c205016d7495c0342221dbe3e3c56cc7de34c8fb4f319fcc8ca39fe14365c2ebc44bef4571e42b9254b6f093ec3eaf4e28b3aa";
+      sha512 = "25b17017b66ad20c1a895819fbbf4b5d33b536a14991131af6be536033376e53373b82aac17137bb6599672c179de9e039a71f468450ff9fa370a971dbee4162";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/son/firefox-61.0b4.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "a883303cf4805a251344be37563ceb16197fe41c5120f549449e507383b0737bf8a7ffab58cce6c13e57432e4c452a8cea8abfe4e776cf962436621f16ab1692";
+      sha512 = "4334e40cbfe4c531f04362bce012e03428138ddf9dc94abb75a94b76c1ae8881e8552b82b3e7e608bfd7a4b8684f9ad3105d65ed7fc378865b003e25cc389b3d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sq/firefox-61.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "9b2cefd313e9bed5d21dd937c6427313cb186f268449521af18bb48077f241f2c7fcc2a62145287dbcc9ad3e6532beb46a58fe3a05c195ece2eb5c2b9be9a76c";
+      sha512 = "355f71742b7f7de9523c388d3debc116b79cda128f0da877401f9a664fe0985edeba82c9a1f3819a8b0132b20b7f596830c94b4d49f57f6b924ce07c5995e410";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sr/firefox-61.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "6da0c24c43ae42e1ee778ce6f190b3159824d16b9072f72af13b9a33e43bc08551b66e7f0f6f101c2845bbd8bc0b88603390205888b640a01c36a61925eddf35";
+      sha512 = "c095d671593b63b17bc48a0bfc1683b96e0a1590e15735194a2e8bd9180df7c6484165ffda4e2f328589f1afbc561d8ef3e79d1474c91734aa77ebe5d53c7a67";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sv-SE/firefox-61.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "17ec7de363cd11814d4de5df4c88350bca1a30033f98fdcd415c408f40b34aed5c0c10cfea0d94e1a31f0325878319b7b8cfdeb787bde0e65320f4d914c7a3dd";
+      sha512 = "d9a80a6e41703831cab25e9ae7237d4122dfaa5bf992faf5fd5ad16d9dc9b5c6ee5d1919b25b545c4a2a9b8f52838e5ffc3af39f69266f9a4629925be1aee424";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ta/firefox-61.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "821564902471cc3b36bc14a9f168262dee1b4e527445f93f8f8c39b7db2af71c80eb4637da2471247983c600c50ba44f6581d6fdf792ef5774fdb08bbe357aa4";
+      sha512 = "6da53d55c5ebc813b6c2ad8275745ee2d9b93374c1b6bbf4cfd28c490210a4828655ccffc9c37657892bad50c9b08c87ce43a587126ab58131a50217e626818a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/te/firefox-61.0b4.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0757f19aab0c1b9fdc9d80e82fa5eedeb43e7302903add9b4c7f68e030de42527237d2f5d1b1b0fc7d88c3de670aef25c3014546e01783b65cc6b25fa8a75217";
+      sha512 = "75d23d05b365d2bd6e06a2c737c3febb7e45c0ee944e26da78f5bd247aeb5853e5abd1ae638f95bc124f3657b23d457c62b9a1595a11588cf13bbb8528ada3ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/th/firefox-61.0b4.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "811815fc732896e6e90a860647152c1c9196ad7280cf7274b8d224aa5ffff6ccee1c10c127d6750c4bf5b8ccef5659eebf43241db32b516ed1f95e3d2af99a52";
+      sha512 = "f43d0c98bd1af2e19c6723bc4a4c28dcf594bbb37ebed416d0493883a4389c79d47f6d63a844a3d2f1c6ae9a84670f059faa3ef3d5ed01ff4eeaee6573da7a76";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/tr/firefox-61.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "bc07e863014d7be3a783a90b4373794ce491b57fc47ceb55382c816cd47c8b19e9b71d209217ff4af79e0b333953c4b791025e3760c7a04d7f8d2c672d9e36f3";
+      sha512 = "a6ceb28b89763e46f19307cd6f384dff8c8d7b69a1c89b29a40653b88bf3ec13955247d565c72a0df47a7ab0e3bafabf45b59fc6a22fa3ac6dd3213d3629cd80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/uk/firefox-61.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "1d48c99480c0db287b4ac3b7f183a6b708b61b1ebeb542aac37133bcb3dce61aaa2ab38b4fcf08130ca068c79494f6e1896ed3f0d26d88ee364f5c48842d8ddd";
+      sha512 = "64332b903dec3002fdb99bc4c13821c830fa29db868c37d6eee4f26b46cbd5b6b2c2b6f9aa1b2cbf36e5a68b7a18ce068431f229182c8dd380847550845e54e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ur/firefox-61.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "ae2c95bcd342bf2362266e460cc6303653771926789cf3ae689bbef6bb4d59c24baa3537329315ecf91d7a483f1f97a961049c2e866112978602096470cd28d0";
+      sha512 = "796361fbbb849c1ebfd5e44d97443c151be90275d101c1e124def82073cbc9ec22ae4e88b1767896f4ee0edb6b1ae20de508df1fce99a0846b4388b768ca5c3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/uz/firefox-61.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "6c349ead6a53f417bb693dce2fc06664796a1781ec78a38e4b2df72505808cc63fdb5629a9264c9bc93c3a8f61be6a832b42a0a1ae56c38e064c61d105ecc09e";
+      sha512 = "2bd641e76281fe1740890ebe91a4d87326179d5b45683d5667d523d2ef3300213342ce027578a6c510b46939cfb5d1d3b25b671b17095c9cd22cc7a8b7920a42";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/vi/firefox-61.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "df4a98d33d15d1e4cd8fef2f5ef80c8db43a47c7715c4f5ef8c3a8e3afa7515193557c5a779dbd93b905ede42563d6c266506dc881bae5b534dd2f5d091f593f";
+      sha512 = "d6f14d45db8551005cd37e386bab3ba1cef2b58bc3b5925dcd7fcb83627823edb9f49ccab2e8092158b7ea83ad263cf01635c9d639873581558234d1d1664a69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/xh/firefox-61.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "853dd4a017b7f53b32c08a3984ab3e0584ea461e3fccf18fafaa461ca07fa40450d248c9b5df38800c8978d2d74b024861ab11e385b6edd99fe6637c2af6fe1b";
+      sha512 = "0bcb49577f8063b2378e6434e41429205b6ecab7dbbddb071b5a32f40533c2c2c1eea65870cde99a760ed0be34b7ceee4ab2f1a2d5cbb8734dfe1fe176129991";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/zh-CN/firefox-61.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "76f72bb1563001978c39de8b44a01167d1c8a4bbef7d6fa34f2f904ca039ccb00534e4856413fceb0e49d2afaba06d40ba7b92c8c2cf9cdf55412755dfd8382a";
+      sha512 = "d0eb45a490fd8306113176ad3c42b7e8ab317db4f9b9004c70206e0fc51c4fb84274ca7410732f2003afa058b7f2c8ae2d1b8ec52f58d96ed79a2210db23c7d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/zh-TW/firefox-61.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "df08afbc8bfa7d82d9ea2e5e212494198270cf9f401aeab34d31cd36df8311f92d8cba0cdf46d6f82afec42897a3ddbee0d949d73a17ae962efcee72be728d3e";
+      sha512 = "51f43754fe3840886a3e8ba195055bfc597eefab9f056ffef25974ebcbbb3b05ccef9b35c99af8b5021249cd076b10a5d40307fca31b18f1b7aa315f0a9e57f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ach/firefox-61.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9dcefe6cd21b403bf51a54addcbc4776db92aa1e722f592ed5bc2cb39a52a1255c88134500ae0905193dadec89147ff7bf95499180678177e29fc872bb71e5cd";
+      sha512 = "9787c6977c6d50b2c9b2f4a6bbb3ee43a5a8298858cafa24d4abe0bf6bbf1b78eabadfd5b27e69f9fe96269f7a530bc6d0ec0c7afcc6800d88841115c55e5fcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/af/firefox-61.0b4.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "ec5a3058b71d81c2e30804942d8d39ecb2ed4f8cf801c0464993b4521ad5992dc9c6bc2aaa63b646f7202a19a4243e37f32e1af095827a63d7ec044e9c47754d";
+      sha512 = "61400c29445bd6d7c2b5040788dd6db236678c6fc4f9a7a23414f97757e70cb235ed6d8c39dd35dca66924f40e62c4c4460f3b11cb6da57e2b6928109c2a661a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/an/firefox-61.0b4.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "814de6c9e194b42d2d4b6f5f1c0b88d5bba4f64f92a4819f8fead0c3806c52a3b9d8bcafb11c02abaab6a37253fa27efefba5133587e60ec25b76c94a004fa35";
+      sha512 = "cb9dc92f0c490accb006e0fc6d44c37c415e8df5b06e97f0d004e53e5662391b09e0def195c6f5ed41b2c5803f966fb3a151f140e048ae12b2f7aa1ff537fab6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ar/firefox-61.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "ba5afe64785c45fcbc7577e519bd996dbc324cf1da87f0e3044db968f9e67d16cf2958346ece84b57bf34775b05f27cecdb6043bd09bbd594dbbc277624787ac";
+      sha512 = "fbb4af4bce19250e42e362c43ca68b00080020673691b3917ade54e35028908b8938b924a4a8d1b4823a24857c10324b171944caf21a16b0f1cdd6aef8478905";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/as/firefox-61.0b4.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "fdf9cefa473363a7bd7027b05f412a260aa69742743cd121900f1bc5f2ca45c45011d068a6db01b6c5849d53719beefa4da659aadf7116e9c2b17ea251188586";
+      sha512 = "5fe55f0ff65e819ee7ed194a0d2c7a0cfba052e7efc6fb813a6faca7370031d8a679beceefcac33edcf221de5a5701badcf29276b1f835c39eb8665207147297";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ast/firefox-61.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f6236d368e813b3aa88847cea48510be3c2be2fb7ff054eff0c1458205db70f645d83f6ef20285f774686ade01f58751cb082fdb2dd632511089ef2c63209253";
+      sha512 = "129218d8d08c39e118a47497e38c3cc30fefddc6a08ea363a08341da4da85b1cf2070a86b34ffa75038b27366222c8d03489d3a4eb4be35e31500fd32d606ec7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/az/firefox-61.0b4.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "74658505a2462cfd26032a837db50bcdd092a927f8f8427bfa3182301f25a15da346091d73689ffcb0c0e7c59b154da343b7be917e1ef4e1761948bbfe1bcc7b";
+      sha512 = "b30d0836f1ef35ad01c929dd43688976a2fd9917d56ec99be65298ff2ea88b4608ff0b5e398fc016718c62aabe6373cd85394b1a9da927c539fc1999dd49659b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/be/firefox-61.0b4.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "c168ac1509e7fcd3715b8f1eea47c64999028256b442f11ebfacb7809d61553f251fb1e3fb80bbe4050c7fd0371e6f1a417b7fcb3eeefdd0b2e30e547da3b8a9";
+      sha512 = "7a3dd71f5e22c03b76290d34eab1dddb83662d80977c99580bd7abb1bf80f448a6b4a3b866a1656c0b51018b323c28f921a7489d7e10fa3ed2b092fd77463fb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bg/firefox-61.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a2440702f8382ff965b17641e9d9dbc6cfb4d536427f92f51a3b8df63ae61ec869760d6eaa38202a7f19acc0ebd6895f1c57a27a5ece8bd1f6a29781d5a298da";
+      sha512 = "48b75a86c8cd4d288ef7b39d2a2998ee01082db7c32767c0188d6d930362e0ddc391062d69b2dd420ade553d13145b0f11233f85e68de27469f287ec1a788b73";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bn-BD/firefox-61.0b4.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "c1aa573de2ed71b85392bff6b8c9279633a142ce51bc26e690c02ed059f6f7db47cdde3fecff902617d27fecca1824b8ebad1b10a7889b918de2056991921c76";
+      sha512 = "065841bd9ce5877c7e7c9732eedc96a61c424ed7d1ad797ae8411f3ab8ed6d24f8490f067ad96d0ef77af3343a201e3cee8e31e6b9cb4589969afcea03fba6f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bn-IN/firefox-61.0b4.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "a728779adf7644f3fe8363080d93a8180ef2ba09fb78f0d05989fa57585f77897757c5b587a318886eb54d805ee8de625c7cbee44908badc14b47dfbe2dd2885";
+      sha512 = "7c11742660e36861c6acb0d4022feaaae13ac4d3ea3c3a8dd0ed0c8634c39bd4f36f893ffcaa8bc7170a03b69fe98b8a426722ac9d394a3b0ce6c3b5ba00036b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/br/firefox-61.0b4.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "5bf79cb726263b8aab120c6b826a09524594bfd8ab7c6464937d23f02e866e353cf8ce71adc8dcb621d6df71e4e7d9dc8d60eeba4023cc3d7c8358eae2058d40";
+      sha512 = "e3b15b6c19340b8be15c72c926759bece00e26a1ff82c5fb0ee7f6a92e59c075af3cee82285af7ea9eb666c087193d6b19048043ee84cd6fdb8749395785f3a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bs/firefox-61.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "84f717ea9067ea2ae636aa15fae1821e2660c84db5c6d3f1f656d9170312b31e44abcdaa1298a29adfed9b221e72301faf2fb1253672729c7fe7ce275cf37b45";
+      sha512 = "ad8ee06512e4f9a6354284548359c6f27915ab10d5ba171ca16ca2f928a4fd07a586d6db8923faeaba18c1c2e8f6d62a7db36bf124ec8d3e3e36879b131f2800";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ca/firefox-61.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "66a6ca250c2d916503b825c05dc108e865ef63aaa851a658198869a0fecbad3e31b7572873b2b39f53220c0c1472e30d5822700512675cc9b1df9cda782185de";
+      sha512 = "e34d1c3c85e41bb8d63df460390473ede1f5591b1c261edcdb15fc8e2b892b4899b82f5a7de77ebfdee54c1dec78108064c716d36c221cd856b98ae79f5f5e44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cak/firefox-61.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c953bde75215054be5be2364394aa89bebc4489dfd930ce1088ea770fe5b94ef9682f8a17065674dc674303a558dfbc77973c751b7e52d975b2138ba5be823cb";
+      sha512 = "53ecf3572525dbfb1af987ebdacb2b2e2a6a1e88ada6974f5f831abb9756059006f63b7980cd30d18ff1b803db395731f4efb4de4d8f6fcaf2d52cef3d37ef29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cs/firefox-61.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "d2ef4e665ce29f2df4ea9a9322962bf934b4e8eb8f2396fe532e2873a68a3d7124c53f3afafc541ac67799f01b8e75595de849a2a7d5bb7f552e0893add7ffab";
+      sha512 = "58c6b6878e2d519527771ae44c1253625276382aaacae50bdde525ed3cba0c2fe92dfd38244e0e7eb12c60705388e1d8d1dbf69e7f5010113fb44d1a466d0089";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cy/firefox-61.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "e5f8b77ca5fa59d5236984e6141b909e2d232a5d279a295eee7fb83eeadf17d0078c936d2c560bdd9ce9df5809b0138547946d9052842d93e699fb7ad7161062";
+      sha512 = "e1d0316ccf08dd913131fe2c0c7286d8bd0f76e95103c2b112bae5a93f85f2860848a4e1fd48360be941f6ac0204b9e9a5d47371b6a8b0a3960eafdfa9a32d52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/da/firefox-61.0b4.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f241d4d26266231e063bd556d07b34477eb5d93452ce29a1c0518a5414eeba3398bfba5b6113a9c7cbc7ff3dc5371cd2eb470de4a00891a97a9e8f5a6ffb6d3c";
+      sha512 = "a8273ee29ed1614adcd45dbe5fc78959a8bc17629dd92b1019a4b017bb0cb49ad2e6a65fb361483ec88d0124880e8d8994c3cd502d6e2d2f8ba7aa67043a9c37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/de/firefox-61.0b4.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "2e72ba457794ae8c40f0cc84a7f8f4ec66a2157a61853fa9ac7fb088e9320b85ca6d2b32653266dd4042b786596b9e03abdaa8f3f26157d354c070e3bd3cce52";
+      sha512 = "6e81e858d7933940e6866142cea5ebf1c7009a018ca322ae35ca05c0813b82b19796ab445105c9b274431aded2713d25992fa91730e837335596a8f5ccc9e574";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/dsb/firefox-61.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "b3bfa0ebfe62ddaebaaa35a90e220e6092b269ade846a07f45f12ba78050ff1d9c430ae98c84467dcb4449eec93c8216aaf9046a40a74b23d289beef89c347af";
+      sha512 = "fa4e6ee982554045afcbe798a3113a4a1a5baadd0bf20b79d08186d781a739c9ac01bbdcad7c1e473844c997bfdab03feb590d133be5aba465eb737938f8ef5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/el/firefox-61.0b4.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "d85b8c718e82115f1d653e4cbaa87e5713dbf4046e7c81701b6d9f7d7d3020142de5ff181bb3a46916a65954a743716f0b2898d098b8b582a14703a7a0169abd";
+      sha512 = "3865e8d77801bebd4036a69e0d5a4e7f96e676808bf8379c3165142b42ed9e2f1eb4cdf9e3aa0c1a1688c2d882b72d49f2e8ba04c4ba31da3d31d2672ec897f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-GB/firefox-61.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "ad456cf1fb209f0a7f3f567fb79684657074eaf9f40bfe46716e52c482fd3f6e63cd4ff2bccf9d47a2a70d59c02c1953ecd70eff89f95608c25caf100be31f02";
+      sha512 = "5133291dd265109496669babd12fa97685e83e7ed08b98b8fe202d2d8baba0f3fce4fafeb71a09d16ded277bb809600af792f2e8dde8a2418fd7bf28f993119c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-US/firefox-61.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "c70393c2ff8eb5bfaefc5bb646a327f685d16ddf5e9f6839d9d064fe51b51ef12e82716dc247fe9533f97bd33641d242049d1cb09130d29bd72faf497f989bad";
+      sha512 = "f2a9a678f3082f85848a87cf784e774f36e374a872103c0b324b1de755f02889e844a78c6faff30109b301e1729898826a779f1f690ff0757e02e9485f23aba6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-ZA/firefox-61.0b4.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "6a4260b28a9d3f1bf118f4e32a64395a636395a98e0cf33546530d3439d74bcb773dd4493c9634c16f455cd7d034235d2c1f06830371033940a8cceef7a786f3";
+      sha512 = "7f5560724d00f3dba6249e4c38d61701dcf3007d1e4a2521353be771eb50fa1937bdd346008c1b912723e17a6b13708b1d57d5b385cbb1eba4ed7438e2d64a50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/eo/firefox-61.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e0a0812ac3a24a0b9358f68a63d136b4dd0d140bd299bbc7b9b4c7a72e88c6ecbd149d1419478642b0b9bb662d625f9134febe5d6d210f9856fe99a6bd566832";
+      sha512 = "6be242be300413c2e9e96f233f651c19472934c63b7a850957b32316b5a387ec81f25e84a885b0796317ef1d5f413be7793f7bb98629ea4550d31d33f7c540ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-AR/firefox-61.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "171772bdf3fd38225db4f1dd0321f7c47101f804d94ad6b558423761ac0a3e464ff992b23e118c2ee05e053213ebf27807413007c5dab0bd9429e6612e52acc6";
+      sha512 = "59c78ef47c350d2afe16d2d135028a9831c5a8a458582e9909f5a9e3e13db8dc9bd102b46dec06c606ff1f74b3c1c410b1bd8df2c38cf3816817ca56c32d0ad2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-CL/firefox-61.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "c7f96bc59b36c6ba7c4cd1d2ad0ce4e572dd489edadd39690aadf4cbb7e4573353fd73cfff94b2defdb6923a8a23d1857ec16621130cc106bdb6000fc054f98e";
+      sha512 = "b969bb7762821084db87f0da0ca0898671dba0ee2deb7a134065ef607765cf40f9b4858edb198e044bc8520221511cb26a55254a4870f01bbc216704668c0deb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-ES/firefox-61.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "b4f28a2c5b303af01f1fab300a3c09554496cdae9ea15a0a6ab816411e7493a8a8fac2360e12a39be050a8de9ff2bde5bc4f6f8e0b6dc25cd8adad49a0d7514f";
+      sha512 = "cea1b56365a4a6fffcbce53ad3540ec9dbc9faa01500f8924c67a25828ce14d03e3a9338900d1aa44bb1b17e913f58e5ae50d8027359f6070c947bd419cef075";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-MX/firefox-61.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "d847c11a5f207a27221a6b022cbb78e770a6d060eeb05065bd770101bc0238c0309bf4aaa063d070e23c1e8ab8c955c4318c09215bec8184b279f653ea05838b";
+      sha512 = "864580e8940a5d6cee69c14b3483ebc27abe06cd441f322aef3102c5b38d87502f514a3f315e7bae6ded19ce2f0c8d31f59d654ff3b067226923cee70987412b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/et/firefox-61.0b4.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "9a0a608abdf8040be460483ce8c291eaa5cfa5ff719ac113c03bb1092ace9017f9beb10cc78edf8a6169452f6f46169673f856dd58f6d8eb7cdb49d9378c82cd";
+      sha512 = "cf7cb0590a7d2ecf6f2286c9b2c14935a44bfb546be69985c109948e610c5ba501a87c80c983e7646420f41be27e4d4bf329242e2557a3706a40d2254fceab34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/eu/firefox-61.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "ca8e503ae4c7e6e457dce0674116a9beaa6360ba50df5d97d0b56375794c940c91028bbc1424f5f7628a80560220a169c8a8ff59a3739e2555bd9b091842d7dd";
+      sha512 = "968fe509ae134626a51d066b2f054f604ba35d0d4ae48ccf3d56a76aa5a73c9af43660b88f90c650234987fd9b8ded64779675e18ba7b67876e87e91e2b119c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fa/firefox-61.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "842bf6fa0d8b6ad46a17e1f1d54207522cc6d65051138e73063fbc0c9623ef56d0861f524d441105ff606753e95a072124c3538dbf87ce333d22bdc1a448bc3f";
+      sha512 = "bb72ed23df33434b4a1ea1d141e4e918200285d0ac1491376c520b16436e1a22ca04d391c8fe22780aca312962807c165dd2aebced2c1a2db6de95c51ef15c10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ff/firefox-61.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "f83218ecd31e86ce402b47cd00abec4065355e64e9d884fb5aacbde86977cf8e0ead693fd939f27c735d74b8b483ec18d4b185d7023c2124993fc52109238234";
+      sha512 = "5d68fbc01a5d55309af596520097b863dc670b51daa48f0fc03a3bc593871b68fe67252774d7a52c71932a08d84d8faa2c42aba1f48b4d26f765fa34561b0c34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fi/firefox-61.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "5d00e98297f9a9d768467c981bd789fa15945a5c70ffcb2f402f68cf13efea72106de8aa947963d58e25365d17456538e6e76c8bf4ae62f8ea5c0aef0b4d109f";
+      sha512 = "eb669bc4c743e3b4ddc241ea101ce1ca7c0e68ea80046ba15c6001a90bbfe148561ebb8d32cc6d353ceae12772ac4ca600ef48f9ce3f4896b5a99842a0298829";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fr/firefox-61.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "a30c6c7d0f50cc1db0505ec34ae1d5714737305c3e8e1e1660b6f519aabb699ba2a2bb14ecb77e1deda1d30cfd50ee69de3a308be004ca6a4b9e6df50eeb94de";
+      sha512 = "bfad13dc2450ac4e486d3e2555d9056a8ca3442f2e215fcf27e86d3a70dc78b601c711f47a70e75f77098a2f4025d0c0b49a1a0e82d8635efd248ea8f2be2abc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fy-NL/firefox-61.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9f3a5a32d4be8c9941293eb1d8c18968502eaa28fad44ae89df20c2170809b850a7a0460a95f6aa189c148c2c54a881ab138d12f3029f21a863c5307e4aa11e5";
+      sha512 = "9e9e7532aaa30467a080cbb7fea380ad25a244fc17f89bd0be04f73508163580b7fae1b6151ce6e451904cdcf04b389605883a937150cfbdba5b20e9521b5207";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ga-IE/firefox-61.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "93547d639642d8c0ed10f23344ea01a66b43f99ecdcdd7a0e2e1a9b2a895a1fc10b44231db8c6d948a19a84b820a8dbbaa9ecec4df0bfc4555cfa62385ece6f3";
+      sha512 = "580f5e6d0ebbb7baa80084472c3b89817c83a674dfb73f00949648d42c8c9c327dace1fc0162d389e06c347f0a0fade4fee906b80931217662d59f1f1515535d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gd/firefox-61.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "73c501b9a4a329acf953881a795444baf4291ca6dd152cc05c698f661b2ad1f979fa7f45f4cbd6abb6b79b6b41ca0079658d32c1b5cfb6dd166eff486f0ff067";
+      sha512 = "2499205db938c19f749dfa303e859084d6801f86a384a5e88be0e9e0900863e1970bb7314929ab8441944b8cd4fd23f2b487167c7803ee58ff4a50da4af371de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gl/firefox-61.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "b505c3ef839778b713c42ba61ab2616d389184e6268313537ec12e648c341c8ff57b739622ec118daaad900b54fb4f8eb57f43526f711f59f368db88f788aa51";
+      sha512 = "cca1a6adb4096f91abffbcbb1969322d8c60a53c0fefd8cb98bfac1c1c324134a7cbcea53fa15217f41b2c54893f1dd26e4dea2a0fbfec9bcd0d7dd928c1673c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gn/firefox-61.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "744247e1441b2c44cd427179e5008ec2a25bf4b6d4e3195c910e8943c76deabd63dd5ce5c5ce6de2968d5f00e67990d8fce2322d901d2a5bcba6b2fbfb4f51df";
+      sha512 = "8484312cd5f4d38babbaf2757f1b0548fa0a291c1de76e751bf0235b67f1fdacc5f3c6e4d54729a91fe9f5451c527972346d36adc0d80bbd110ea1c0a0025b85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gu-IN/firefox-61.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "1784177b07a777972dbbe14b259af9c0f5e4e8453d82ed0a9dfc7c0f548f6909cd9a986b4a03c2c40a5d1e88bcaea32c75909e5f085c652637512e8cc56ce38e";
+      sha512 = "019deda9993a2d02cec8577f5542cfe247c04a4c0a7c7d6faf65cefb1a8338ed86e24e51c74e6ba30a4f5b6e644655de9df1c99584172ea51e07eafddad65f6c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/he/firefox-61.0b4.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7a56deb3e7014ab4ed95f70e537c1613fdbca8a0a538820f903808e8d881a7259033ec6d0c8512ee17dca4b55dd5bf54789be78a6018f6c21f5176e7d9cef09e";
+      sha512 = "7a5285965e37b112803f0b533c8ba501ca70a9fd09ffd1e83e630174c4966a21d53f6c6054e7b60b76818acd47813a2062fa9f986d11d78c714c127b0864de58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hi-IN/firefox-61.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "d47f44b37418d61131cf1b804e2914b6dbfcb8bb30efa771d2d41d0e3768e20660bc4c8c3b36b1611ea3e992825cbb9548a4c3b975578d6c218fe10f743d37a2";
+      sha512 = "6bbc86f071ff51ef1cd4aea468ec2165a6ca991ecef2524bcedc0ed3d25c7b3e0729dbbfe5df3c236d14d996629824486f064d554a0eb5f89f46d69f3a8d61a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hr/firefox-61.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "8e9229d45bd3484c76fcabfa66845b41de87b33c1dafadc9a06ff6d36396cdd9a1d5d86a7e85728b9b658c39197962f20f374453c594cb92b82f0a14536522be";
+      sha512 = "924ff70afb07ee9379c202bb684e7ef85d0793fdaabedde7c8889c0eb798c64cb7fd5a309a03abd94cb56e4a194d9b7b9f7a212abef4ed314d1b79ef4c8f0433";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hsb/firefox-61.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "f656f3bbc00dd0c3c4a0a9c4a7d5d74f2049c343284b891ea455ac093f15ef24bcb4acb244213516272b730cd42798115ce3e9013cc7ac6bcd648e97aaf6ef3b";
+      sha512 = "4e6fa9f275896bc32e426b91aa5b26867a27f52dd767e030872ca365ba56a57fc4a0df7ab877c282113333d94ac3a1ba0159fe8563f45d01650fa595568bad38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hu/firefox-61.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "de412f63269b4e89bea1fc854c9a0ac9f37ef73d19ec900f32aef0fb444fb49daac0bb2e1df9ad01ec01810f64eb8f9d96d17816e7f062f5f3a324406a863efe";
+      sha512 = "13593a85271fe064f0d201d14fcb830ae2f9ceb965b4b3ed1f3a7f7c9a7a6b889bedf551bbae07a385b9ff97a3d79e0f9081b1746d00c827af3c2c20092fe965";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hy-AM/firefox-61.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "5b6a9f82c85318e21a4a4bb44e74db28e690372d3fd93c8ad8ab4db8b1efcd9014fe365df1c95cae4ab4e7a3abde9ab4dc8873e8d9440c3a5716cce8b38407c4";
+      sha512 = "a8357f7eb7ab322a1a5552a8852772ecc8bc36f8509d1f165aa226442c67d00649aac802ba405e1ae722c957b6c3f6fd7c2d546db2968f28bcc2c9a7e9fa7ec9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ia/firefox-61.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "8a44046e7a0c0345575fd9b715dddfb88bff2cae6b674421724056e9142570b3499c645691c4c0bf37cb4ed59026a6e4827801b32fc865e6e2f9ed7653e13c30";
+      sha512 = "b370703f8984192be45b07e30b0737ab296494aae0a9a5f3f31f276beb9548dcea441aa245cb1e12ed04fa9ae11d2f00a699483e02f8f47f35db625faecb1f2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/id/firefox-61.0b4.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "57dd98bc122a433f4f2bc0a07d167344087a26bc7dbf728a9d9770b61b108f953826d88889e73c2c6599fba5edfeeca3dd6eee2377faab254bd7f741ae30939b";
+      sha512 = "e8bf96e09bd1c919848fe86b87769fd7d60086919f71b1f92896c6d785206c9fda2e7cc57aa79234765fe55b29575135d05db4181155b8e7607c28d3ad92fa4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/is/firefox-61.0b4.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "58e47133a1a1e018ef4eb64cf099abc7676a63d3edc86024d024ce3e95e2c007e37480dd9e015bf45fa7c53fc46f9ee95214199d25cf57dce8dbac6a56356c22";
+      sha512 = "9668851619bb97b32d043032931bb0a0f1df8f9cfc35a308594983a32de504a6a64830d265b46bdb30a23c58fbd4c7e6571a042e44382930d183849880c1ba3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/it/firefox-61.0b4.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7825ff6f4f2645e4577dc472cba3e4cb0cbd8f7881671f99f48df03fd509489ae74c000705b212fd5033b7da7345b09aafd68171009f5ebc40753f7da43e36de";
+      sha512 = "fccd8388e7466ed46aae6d157f3baef23d742ec797fa26a7cc861da97f19650e09f8ba5e94aa9f9ac779555a1c7873e0aaecdc9bb691af773767b55ee0b820b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ja/firefox-61.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0401f4890ba1f21c7dc1139046f0aa6e218891c69de964c7e0ea32c50ace9cf743990548b6d544c8047719b189f4af4594231c2c30abc48a8dbb888c9f6ff339";
+      sha512 = "6d8bb09d098b94be37d41d73a6587885240f15b83094714adfbac8ed595f3de4ecc78de82b5516270b57ca093439209a3093b2e737b2d773984cc3a28e8e27b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ka/firefox-61.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "f54ca89091125043d38ce7a197ea2e1675cd3f308ca0f93b0d57cd1ad8e341e2f8fc41dba925c85c12947cce4cc4ebae13e248a48fe5fb229e4e06e4ed0e1436";
+      sha512 = "902e6cec903dffa2e3227f8cf67b472857145bfca6e228a896f14fb347707b753beef3a2836be90e0a17161248adb7b916b2dc9dbf4f780989a09bfba757b5d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kab/firefox-61.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "c6aeb9254c51fcaaeeabb973ba7c6b7cbbdf1547300b8149abac8b35bf9d319a3d1efd7a9d252b23d6fdcfffe0f311014c17c475b27bfedc15798fdd8fa08fc1";
+      sha512 = "7ac062a6523a91dff3573a9f8b664ed85877ba1d192baa196cac1e3576ca285c2368d1d5582a439b5693cffcddbc08b35ad093d322eba7dd8181c4ab797c4ebb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kk/firefox-61.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f3451dc01dad8018b4709a6af7c8829d41ee3de4e028b3529be556480e0c5a48b257dc33ada9527b88550b2f68985bb71b1fe7cb6fb84e505ef3165a58d94c1a";
+      sha512 = "83ba96c3675c4cdeb9a7c661c73314485430058280118ecaf2135318c238ec78ad88e6e09e2c7cb4c43f4e9dbada55cf010301b2b1b6d1b49355039e6bad9763";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/km/firefox-61.0b4.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "3364456a57641e1bb20bc2255c0eeced49b67043eafef74867fdffb6e6abc3eeb3871159859bbd9ff4aa823f8060409db068fbe2f44a16c09ec2170a6b8f858b";
+      sha512 = "71716deb9304033c46b72a277aadbdeea99fa936fe63830df79fad5e7a79f76eb9527cfd38da5ece4511fe19fdfc32eb301877a26d590b20d3c3c051bece2496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kn/firefox-61.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "e206b0ff442462a150b60a72ed29653e64e2d277d887e622f31fddf2332cef1f75b6d6ddc27bd9c5dc89bfd87b67ce3fed72491e4d29a77809f4f901a2e87c18";
+      sha512 = "2f296eead5f73a279309d68aa6d7fcd433bf133861f158cf6c24a766f28d902d00e3ecc25df07d51794706461bbf2bafb4228dd61cc3dfa3baecbbc4f967ee12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ko/firefox-61.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "a0873fc6ed8c69e205d4c01783ecabbc403317d94ea7fd21077e00f8cdc264424c00e32b6dd27202b2d6ed8ac08299eb6693a38c288cf9b9a24c722745ab0eb9";
+      sha512 = "51f4b2409f822b1ae357f194fb308e35f6436dc0319629a436c03b789373887eb0cf6f8ec2d11c005f7d63a79dfb035e8661d7833cac083648def49d1fb1acf3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lij/firefox-61.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "95183a50d86bd9463ae2ceff374c2c16d563cde9c2bd7395ac900195fc7f663239289baea37ecf9941abd0d8b43b5c63214fd40b8eade0419e2ffef2aad51095";
+      sha512 = "19a2b183bd086aa57e5dda573e422e3721fdead13b0ffe62beaa1ec437544e6138747a5ac22d990c772bc75b58cfd69cfb218f518a6fe01c3fd375ecf7ca6373";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lt/firefox-61.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "758cf8c198165c0579207ad8d67d998eaa81c32a8ddd269ce1c76a05082349cdfe38c0fd969188e7d4e86eb128b88cf88daa9e3c283820311972773b075bda10";
+      sha512 = "36ae93add3821233d16fb3f9baeffcbbb061f77824f5030043f1f9b3222e7612afa227022ff7ebf05ea5760dce1e727777f148c77d1eb2e4ba2e0bf35adb4911";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lv/firefox-61.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b38a18191221d6fdf1386c72ec07e198d10dfb2cb33bca34aa5d960f5c7be2ae61fb543409559e3308db188ec949261eac4949391f8b699f63948fe3177a2ec7";
+      sha512 = "a3474036735619ef1ba34caff598f17572b32ec1138b2535983055dae6b4969428ce634930e2805b25d5b5a56a731831d681f12a6506429fbe1149e8cf57e8c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mai/firefox-61.0b4.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "f0b09948695397b53cb3fc500d6ae47aabc4f84da9314867816e2c4f21e4228e601731756b1b87253d2a2d5f6057fa115bf667d115de5d54ef4baa1a5dc181e5";
+      sha512 = "185f3e1953c05a496dac5027e899054ed376a09ad0c08c88f183c4f91b7210b4244ebdbfa224ab88f7e695998faf50899551379b30e7ad04ceb2c9938099df4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mk/firefox-61.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "46ef2273ff40e516c9deabe4b42bbb57abbc813a6717b0ecde42720e9d54ef3b332df05f48a5db516f8030aa984bbb0d91afbe3f0b84c604f9d106c39e124bde";
+      sha512 = "4c04cd14c893461ff87ddf5a17955c5a80eb5e9ce929aa6a37204530f1fc10f359e9af451918f98d30fce80f595a4f14498e26c07b48ad0dee6b3720f72842f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ml/firefox-61.0b4.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "43a1803e07b496571f35e005b8ba0adfd9281c9c907b00b92bd0fcf37e9b4c8236af90d145456725feaf3ef2c7baa12f9e5651e88a239795d90cb401079ca4d4";
+      sha512 = "304abcd82e0bd2e0f0e2cb639558340f3424be9485ee9378aa8d59db49aea096013798132df26d14c0fe83529b211ab40c5b708ac62f117969a59d0516f2a3d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mr/firefox-61.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "4a79bd0bb319c8851828a4a395d7a3f12df8ac812582048758ab007a61ec656785322687dadc46b023caf6fdde6226b25fb31e2c08ced97e73832517196c5b1e";
+      sha512 = "2f05f7cf18e4de46cbeca27910bff036ff34c4564f5ab66c4830f2e8c6a2d016fc87d700d2085141e01fac19a0226f27b0ab467f4a4146c1a6bb54fa549030e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ms/firefox-61.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "5c5c465daedb590f848415ac1781909d3645a3634da35ffe76c8e91b9a154f3f848efe23f348e0da4e2e7b79d92b41f98988fb68e59b54103ddcde913a7c8cb0";
+      sha512 = "767328afb8582def36c31911e5bb798acd19b2b47603decf6e21772626e0ba1fd139f9a79c2bd6a79f56b84480f2ec3564506db84841a6bbaeb95041d4b192e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/my/firefox-61.0b4.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "338af2c5ff8fc81401cbdd4559b8371bc18a77f07c28c87d71da2d4a164a697aa6f4651e631a507c94adb962059dd6ce772d78d75b2b9224e22e555687422b9a";
+      sha512 = "f68de98e766df5192a266dbfe9d9cd167d6ed4f3976ab58e768f8a6939d36f6903004e6bf0e09b8304a4a30cc0b36c084fb75eaaf9084804cae318727796c4ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nb-NO/firefox-61.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "95c2dcf9a5f9abd0c2f12e9a40f9f0828a1f05c20b981d0b6c66d85b6e57c689fc443e8ca7504f592baf2e89dceb7e01c0aa9bf34fc06165bb1dcdeeaf5062bd";
+      sha512 = "fb1a96d11944441f8e7e74c8efd55d59d11ab3c38f446dd8ead4729346a0d8030c3e801debf517746fb78f338af0a178d45045e31d8178fbc1a1d9704c33f1c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ne-NP/firefox-61.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "89c255dd709b9215d2fc933b6d09b0205495455ceceff96dcb9e2ea5b12c98b9fda258aaa12f5aa0a1806067cef1a8434c865c0d7a53c039b1612e0c8d548aa0";
+      sha512 = "e4764fa38c66196bbd7034bdc7216ce43b9d4d0ad550fb1faf89a0b030f3781605766d0ee95b67255656b1eba40825def39a25cd059e74bac558af511cbc6e1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nl/firefox-61.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "39e6043e5caff0925e1f9d475c3a3e1281023336eb79cdfece1a8a5a73d973589258719b517cd6686cfd69400eeedc7b744287286e055e4cbdcb188818c3e94a";
+      sha512 = "8177521f43ad209734de5903746c366b08aed805067b0a195fa19c8d134527f8ef4226b79be8f603e96c451816511e2a38961e694e0a284ab54f272bd93b80ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nn-NO/firefox-61.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "570fbffe7e1b70cfc0613e4b230e3dc0bace2225bf52b9b5ddea4812d1a9795aa385ff97e2471209e9a6aa3c5c03fa861741bc8f4dc499a2cd3ffe5cfffa0c0e";
+      sha512 = "a62c38672ff3ee43cafa8d3b8f03429414578f0a1bbe2cc39e3fc8dddd5edb430d6f12ea6fd40811e382694f925650224d7a59f27b3d5cb817e0e51f77c3c918";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/oc/firefox-61.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "bb58207314655f500418321d6c04f9849a6263495b0406ad0ae53b43de395dec471ca401dfadd157307d942da3cfd94df8f112cdd4aa37ed249920fc64c8d4a7";
+      sha512 = "8d406f76157a5b8890a7d6b1bc0bdb820acde82b29aa4798d7020e140b336796e0ba309186044de42ac6efd3bb66b9ad8b9f56104376d81e3b0277354cca6aba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/or/firefox-61.0b4.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "744a0b481604d7f5ce312f0d9cd979e768e5c53c4b251bf3e9e6d97c67450d951bcd5bf4f4e38e830a17a08e6fc98aee30fc862db27013909592ea1e953a57dd";
+      sha512 = "2c23189d5342608f39d05342d9070094e2485bb11067e436da5aab307bcfbc6e4c92ea9ae28f4cc707b6171e2f708c9f0e6aa8e0e32afbfab592f45766c5f642";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pa-IN/firefox-61.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "baa1bbbc3c813a168b742a4b20c209c66bdba60b799cc307b99bf08e8975c72deebd5ae6a9aad53d7172305eb2a09cc6292d9f9533f3318de4061a8744e9686e";
+      sha512 = "6c586e3c9e7c4b10505fd5ba37ff4188415e1566b456f6c929b060e44f09151b9ef9bbe9f3bbacc36533ff6789805b9e007c7a32148e9c9517053ab4e20f2225";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pl/firefox-61.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "06840fb56bebc72b391907853474b29104107d7b7e2ee719ba48a2197cb166507f95d69ff215f29cfb806350e588c84d5f289460ae8743ba03c7d6c212b91b0d";
+      sha512 = "d26f54ffafeeff89e91e826614b4f55c8a78cc8a149845c5700fb024e20defdae937a2a9dd75d0a156932a9b7a13f5b39666051cbe8b50827e057400b8eab244";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pt-BR/firefox-61.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "48e4c56091a1cece6ac3f93e769760b71b8e79cf223ead1f2ed4ac3de89c309cf50bf9a6e86c9b7a22b8d84befee91d65d909c1fa2bba8b04cc7502dd0a57e5a";
+      sha512 = "8ec8ad7a5bbcfb9c020511915c07fe891ebf3e7f88977bd8a03e3a9020f9293122f6d3a6d257fd2867a34ed257e74d85f87e65490e037d28d5eec37d97ba0cb2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pt-PT/firefox-61.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "8a1af26ab745b2efd03ea44a850cdc8a9f2e4259de8c568db40e54fcf57d902b898eaa7240a5d2621a7f456a8ec717875d1a2e4abe4f8a0c67e9bcd1bd9b4d77";
+      sha512 = "0ff4e05427926f408ed4310d63e01b46ce3b7ca618336faa289666924a203641102c02ddc3b171b9ce964bd7e7fb260a365ed1ba44c37e837a14df3c0bde7c25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/rm/firefox-61.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "784a233f3098ca62ba0edc67a27af8fceb49f778f500c825cbca54c595d9c5f4a918a16c9bc6d121838981dc006a28bf53d3e3e0531861f261f8ffeb638c0ee5";
+      sha512 = "13465556af41b81d328b98a38361534dc4a4f9151b17fac0d20121cda3e4d5d2c21580ee7f1e966fda8e910dd26647806159bb7f556509a13dd456e22509e44b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ro/firefox-61.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "a585d1c972a039f82fb69268f4a7a6daa9bcab77db9d045720f5a98cd788ee1be0128bb9f112098536975cfc9533d369e6b6b0ccbe5a1e43e93406eff45da5cc";
+      sha512 = "1c54f88ed76c1c9f3863e67e4088e823dbd80c3e696d3b480a7bf15022b5abcde86b10953df18ba667d0cf9c5a264c4b8e59cb1d6031e937562c6fa207071013";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ru/firefox-61.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "93d5fd02be91c5e9b0304badbbe360b8755eb5e383168555712ab316ac353c2c8853a9f34ab1a028ede4f31b6b49499c5c31a0e992a0e349b6eafe6fe523285f";
+      sha512 = "4583bc0174b8e7b98f882571bdf0d9502cbeb5c2e4a44473229653c383df30b78beeab446d299d465425c7c8106642b6ad0672a436a9f74c76a3d4e131bf645c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/si/firefox-61.0b4.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d5e197e5727cdec1d83b05a823e4379fa229673adb3d3c2c0125b028cc229747302de8f423bc0972190e01a5658f843c1baf3e1bbc268d541dc07889e8c8ef62";
+      sha512 = "66acf2ae9e2db8702085154883a6412ad1b15dd830b7297a1bf489a0b173884d54497ed5a91cdc1e11e179f8abaa0ce8cf2953a180febd3b6e5059468b2fb496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sk/firefox-61.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "6b285afe17533f9cff61eb7001b5099128bf475a999a393d21f94f6ef734b123824bd5fd6d3fc77437943145865cfbf3469b23104bcb509707594c1a5a718960";
+      sha512 = "61837b2d91606c1d6c54e7e955843f1914bac69cdbd99558a25520c05a0a0c45b80a90cbee17d30f272cd969e352f6e6511cbfdb0734694eb7409f603a7c8114";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sl/firefox-61.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "b14bf0b48de19048a6c8188ff064e4012055d3b6ff21eeac10a19c03b6aa85208e7dcc1f2fd28a01b6ffe87eecc968d62082e7fa5ae9b2e5391730fb794e8a97";
+      sha512 = "2d8b99bae7442394760fc1100456d2bef3f65532217cc554e2c064622d7e1b56de1ee96114b7f31c7098afec3770a8ff4f7bc7b64c2cd4b72b2f41ff2a80ba89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/son/firefox-61.0b4.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "771e77e3533c9273ccc08cd88dcda7a07cbf89cd1b5939daceebd24944b3c336c7c203ca1b0d1f7ea2236775099b0edf91d75064b07e4ca76c1bc7eb3b5bb816";
+      sha512 = "5850028adba338641444a2fd62bceda5f03048321f70b3ebc090d362541b23e4900a2a37d5fd4f22ffeed422a63b7fe640e7aec829610397f2635de1e75ec1fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sq/firefox-61.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "75da529909fc77d0ad288f63d0e89103d63ce3f815eb8d713b43b712e122255ee4dcc059276dc8c53abb64693de650c8674302987999be5155c19001d8e95ed2";
+      sha512 = "6028d2498f800e0179b2102fe90d8217f719b9c00aad1e03ce8f5e593fab2467c628b2f9a60e643348f567c242bd6e2b600d989dafb1a664ace0d0aee2fa8372";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sr/firefox-61.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "a6ebf4ecaddbb57cca585eb0d2883336b98a0c1c7249e2db78a8f2042140d2d01c787444331f5c9d98efc7fc4b5ccf63ff50c4214263ce242b9c37c943a6079b";
+      sha512 = "3cd1bdc2a7536b5416e81b8e20617de047907a7a7b80c9c3bf2fd1defb5440be72f2102d28159b1b8133f2b2669fbfa765afbe999936ab7ea4d1fb8188960037";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sv-SE/firefox-61.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e6bddf3f932171acd6560bb3a69129f71db73805dcbf01743940d652613ac4cc40875c684cb8ca46b6fd0b2baaf05710e18f1457ec41e9fe4fec08b7dad6193d";
+      sha512 = "d9be8928075973a22a15c2ea9fbb10968e5189fe34b13924ad6c33742e17c9b6c493d484024e3a1d3b1529826f129aa308e13549675560fee80244f98bafb04c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ta/firefox-61.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "863142d61d13085023eed212bc8fd24ef919e22141a560e06deb78b61a822c3af0d9f38c2dfe1574e80f04942682aa1bc0c10361c08e781dcf1ad8b4ef13b108";
+      sha512 = "86921b7228c6f2b2aedb68299ac21e22c82ad4fd5b55e428dae00e29f69721dff52060792b396a0f43b3ad6a571d977c87f7f3d420b52e665fff42e1daec95c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/te/firefox-61.0b4.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "40eb771258cfffb080462e465dc0daa0b6a3bae27ef6b5cf3e8b9e1fdec47ebc7c00f8af392a421971d2e3463456839d3fd0a5fb50d7226e5e27e3346a32b828";
+      sha512 = "fc2847ae6864ad852791edeb2d2228a1d5484052c87966c9b29b3471218366d74f53dca4b0564f2206134ccfb5bbb39fddd6b44fb6b53ea7ef1acb7949668aef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/th/firefox-61.0b4.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "08426effef46a0b26a35dd0bd37d5021a1968d2a7edfa7617e44bd561502722dc7a98c7fd63be853dc21c29241f0767a7ef31e07d3e8ba1241adc9537edc26d2";
+      sha512 = "61e412edeb4bba9c00cb853cf953c61c5e669b2655d08990aedc4388ce3a836405b0cc805a6c4b5e6041f6f1657c3586252803338f85e9f1c2902ef1187802e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/tr/firefox-61.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "c86de3b4b96d3520e7c4483e86aacaa1c3c56f524ac37dbfa7558a372c12130ff2b55a89bcebf3fc48d361a9e5204c059dd5ce70ca04343ae913b565eb4f193a";
+      sha512 = "c0e9cdb54766e2e05bd124a71d68b8023834ed8c701b721658bd43e27b17805c17a378f645a53710ea800752149d7930fff14050604ddcf6825147347a56ac6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/uk/firefox-61.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "2445e60d7dc548e1da0b79c4518bbf1aa16777ce1e944d8c70599c3c78ab9c4ae24a3c58c7c02734b0d0bf4f4bfe0a777671b82857a95dda69b8d584e6b77a54";
+      sha512 = "b8fe37b1922275e2bb717dac3ab24f5872bd1b15d48120504b018b28319956ba6a4d4587a9d87b128d7420fcf19fa09c0821fbce21d0136b35882aa3e2586e3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ur/firefox-61.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "c69f7306906fdb8f7757e2e814103467c859aa7da852e3a2e77a8b10d37d327b78ae79fd0e9170593bf82e1975126efb6296a48683e30474bc43fbe026cea046";
+      sha512 = "fdf65d54545271e79b118787a28a903b130c17569cc763d495c62150949cda4dcc6c1697fde0d038229a7cdd8c99f2d43dc530844f2ae1b75f87512901c763d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/uz/firefox-61.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "b550a887851e2efa5c31da29b83b4152faac726bf64c2fc334ebb72b2fdfc8e74ef6ef2471e431a0efcf2491c22b0c98dd43d1d41373425b0e70216f6a58ada5";
+      sha512 = "caa53302be25bef37d7a40e3853cb175eb68a828abfc1e1f8562cd69312f785b9e7e853dbe796c758e01fa92129937f0625c7eae3aed07690395a92ab845d3c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/vi/firefox-61.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "0b84043d07e62e5a7ba38a769f9949cef05cde65852e90b21e27a09b3d40fbfcbee66c74dbb50e463b3f01e3a07b1c137496feae1856c1c3ba2f4c27ee17b3a5";
+      sha512 = "cfad4746a9357219a29f9d55e455e11e7d3c49a8d231ed18b64e728edb44ea3f5200bccd8b2115bc1e00cefb73a5a74af4f9a23aae4ded7f29d8f04678ee9f28";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/xh/firefox-61.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "bedfadc5e0c075c284f33a5463b207fd5056117c8de9b5d0b89134be6a5489a43c95e2e741688026b21b09f3e95d3216361bbf767533173d23d5b394025ea82a";
+      sha512 = "a17d844b4ad6498c7b7c937d674f2129ad365c59a7178b9ed51cbcab6695f08746949b485c02bfcc72916a0a37b138aa9fa651897a5719504050783901f78ba9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/zh-CN/firefox-61.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "3a6f79a49f183e920740d306483c697ce4b315b5a25e06c2b74faff74082d632078997f78caacbfdf7b97f598d1510fe1ad4f7a0c57e7eebbf543a263f46f279";
+      sha512 = "1a2ff744cac644e67aecaf838f5050324dfe4101842820fe847e86e55c3d711f661b59ceac1e7c3fe3d648576a93591951a74be5696c820956ba712418c3c52d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/zh-TW/firefox-61.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "c445fa9f12599a11aa5c13f5c88e5a510ac4ba99e852976504c5030008193e00194603971e1f4078d8e370f74bd3134b3702a5c97be3e6a0e4fb841e24b609e7";
+      sha512 = "86e03ba89c9918542305d35d18aff083a8e618e741dead7f11d7a01a05ff5addabf8fad060112b6c2cd5ef0ef7b3389fdf02cda4c65370449b2f4049049407a4";
     }
     ];
 }

From 75305528ab1d7cc9ae1e180173436e12b6c7fd80 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 13 May 2018 12:35:11 +0800
Subject: [PATCH 1795/3370] firefox-beta-bin: 60.0b8 -> 61.0b4

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index d8afbf9aa193..2ac0e9c1b26c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0b8";
+  version = "61.0b4";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ach/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ach/firefox-61.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "f45033523be148f3cf43d800ec7186791045104eba8c6eb10bb427a5048e826152c4d129bf97a4efda41281b5854643f239b9a124b488740c1cd2bc55acb2504";
+      sha512 = "1253b49fcb5705c5f35ba972ef6949cc9be52b0b509c15f1ad3197918cade88df3a69c6dcd1ba32fcaecf5485d0e614b008a1e05adb5c0675de50345cb2ef7bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/af/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/af/firefox-61.0b4.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "8d4ca433ad148cd3ac62cb142009a64c8aa09e49d04a060040d42c9e5720ec3619f1896a7b2e91f9bc0f4a78be0dbfa30fef7f19c233b78228413335cbfc9a93";
+      sha512 = "0668158d59973ebc1a6701066bd736304e8cb8d41095aef296b0a807eb0baf23edb1e399605c097dbfddbdbec191ad570d56a92e40edf4801cd2e857d03fc8e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/an/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/an/firefox-61.0b4.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "16d132420f991376b3dc15d43f118aa12d1d617cadb65d16d645b1a82a65cc7a17a4fa36a03a4280a6e6c3d05d5f4c6d97d5f1df24fbb4d6420a16d271dffcd1";
+      sha512 = "97f9ea677bd851dfe37d5d4f1fa54f0286f5245a7f13924bbd576a1c6ac19f14c96937e78c3c05e3f13cea146ab91d4e36c8501cda2026663f09536e12e5af80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ar/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ar/firefox-61.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "2a362ddb4a263a228b93494b8b39071b85cdf05264ef1541df5dd75a84f7d7391b0d68c19e76ee68fb0a4cab7e4de6c1b39d2f97f8f16e6d7c06ad1b630562c8";
+      sha512 = "85dc5ce10e6aa418d5f035a53cc392230010a89a3994579d40b926d5e2d1ccd41ff14bf86f634212c49ed2c24a10558e449fd82836deee2002039330b1b5baf4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/as/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/as/firefox-61.0b4.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b9172bb80eec38221065e89e0e244c1a93f52e2a5754c0b0d93e78b338783188460fdb4aad13eb69a205f7af1b831451f07b19a9633ab1737e1d48e88108647c";
+      sha512 = "58d67ff5acacc6458d3ea24d017185a44072d2552e664c9d5867fce16e77c679a3f886dd5e680a12f0a09e77af82d50e375f43fd724dba10e62c52c9611b300c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ast/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ast/firefox-61.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c1b665bf08317624aec791a4cf97a240c8bd192f28b31a3a4283846628216bb98b60b50a44d7a14b37b0339fa7cf51af9f3a47cc1ced764f560567eb19c31d56";
+      sha512 = "c1cad96695ceed2c9f8461d3a00c7f4c79064e79e808f0daf3f7b240c7af3fc076dde7a5c70b1ddba4b6291e51658f11937c9155c1c130bb9aad6a2bb83d8bef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/az/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/az/firefox-61.0b4.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "fefa5958fd2bd47125b5a8601fbd0834b6498a4ef4b38c73246575b090b94981d39f086534fa5844432554134f590ef28fd9ba0a9e656a4be16c82e4dc368f75";
+      sha512 = "8340347da83edd0d74543b7ccf8add125cf1a3722d182753cfbc5270b350e0b5268925b17dfea35ca565d360fc9fe03e1ba42939df2ea342329639eec98803c9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/be/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/be/firefox-61.0b4.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "3ad059b65ac9a5d6e8af9745df0ff35ecacdd0af756fc1d5a22a272fd94c49b163d62c7a59ba5cf485d860dfc096209ebd814673b909c047a5c0a8fe3b551701";
+      sha512 = "be2f46fbd814e464d5db068ce0d5c3f1f5531b90c13c8b420813559f99f9c511f1505943dbdd94bce01dafa7e709ed6fddcde7ac13d9d6e7b28eed56062d799e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bg/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bg/firefox-61.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "0eae9cbaba7eebe0fbbac423538afc7dbf439c55d1d29eea9f14468764febbb3f1141fde29642f485f5d7c690ac1ba3b91c9fa436f1cfa50fa87191f1b76d6d0";
+      sha512 = "128835294278c381e4800cf5fc4b572e2ddae72f02f6f3c077f3b1c7557eb106858d3c40e254fd328a31d5520644bdc3263deadbfd2cbf31ae6092a5ed9d43a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-BD/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bn-BD/firefox-61.0b4.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "0c056092cac3a3660d8397a5f14f2ea0cfadf7253d23d97280d7ab3c6086ef1292bcd5cf42fcff3b1ac6bc55e98ba5aae707d5b205472bab9c37d4fc7869485d";
+      sha512 = "205bfe4d02cc73560eb11ee79ff2f737ee96a3234e62589399adaa03ea48cc8d0abf81567536f7fb11dbe037c751ef317a841fde5a2b1a6d29fb9a0fdc71d05d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bn-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bn-IN/firefox-61.0b4.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "f98a1efb8dc56319429a06e9b52d0431591ed70573c76e80a4b4c419c47a2d810ad9f3f9ea1c9a5457cd55e8f98155165b7922000d750033503eacab2e8b40bf";
+      sha512 = "5d4c5b3f7b025b77089246889209d3f7e3c0ca924da9a6d4886ed0c96d437c7c47452e8a2cf3d030ad4e4859565e3b0cb18ee1132852e1460bb1529058cd4198";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/br/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/br/firefox-61.0b4.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "475d9a65a6041570a4bed8c96e63aba067a7eb659a1f303b0ebf27e55478dbe3597ec7d968329f352498a58a5256b2fb36505e09e35d1af9ac1219adaf0e607a";
+      sha512 = "3d6baadab9b20598e8d4fb604720dfab67eefb89e9e9d58f220a8b7165f8162506e19ada83d0085349a63ca31b861a3b6ff1df4b15436d2256f7591db58ff3d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/bs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bs/firefox-61.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "ceea5a1b8fd3f8ef3d719acb62c5653ee00a3fdf7ffb2e81cfc22936aed53e726d447564a7173e53f27946f55d37816a7bb01abde95e8a6c1718d0f7cea35437";
+      sha512 = "29a8df8006287fd38a283cc499a799174a14359d7a540cf5ed1983da98d1efbbd504489eeb6b2b5d420c06f42a0a3f9b5e7afd1c1d5cc70f9eff8b354bf3cfb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ca/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ca/firefox-61.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "97b687e518ea024c510365b18a220ff22fa0f722645c927519778bb8ccbce55b1bc3a909d4d06b3cfb1ed20b3dfa3761593b7967f516623b4ddc8b26e97359aa";
+      sha512 = "3daa8bdb22e64dc39a359ab15a55d001c95ecf53ade50c0779e0b744043b21d41f36cdc1d3fff53f59c71dd0205a089f7af21074e6ae34d1b03744ad7cd38631";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cak/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cak/firefox-61.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "6e846c894d67da44f5734f409b6822afc043bd02ac6bd3801daf47891fbb1b3bab10ded1f980f11c7f41a8ce4d59b6d99b20eecc33fb60d189cc15df9bfd63f4";
+      sha512 = "031311b5ad4173778f879f5241cdeb559739875bb49330d20c37d5733b7e58a226480b6c456a297d509a9a379803bd5de38343249dca1fcccdc74b9ec1b97ac3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cs/firefox-61.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "4c647b30775cd27e6955e8ebc4e9b375283ecf0b068fc7a49d3a3f99212a8f318a83879f975d85c6c83a88735e9851296869374edcb43dcaa167c2b954edf939";
+      sha512 = "979985e5a292bacd3031554288b92d8d90f9b05ce8f59ca2126a5f0d2b38436cf39fec21d830e16204982157d722e8fa9483062d3bd3c78cf2cb462a5c13d597";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/cy/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cy/firefox-61.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "f1d742720553ce31bef0881fe5da8c20d5bb2ca99710a882c8805b26c35e2677653ad2d4ec91371dc724410d0edeb884813f8d88ceb0f9019963cc98121e6bb2";
+      sha512 = "3572e150c1effc9d5b67cad7954a69ddd50f6aa5159adb6ac40f0e2c557cf03f6760e664be604edb27faeed8235b43793122223fadd61ba6923694ae689fb740";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/da/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/da/firefox-61.0b4.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "ff07e1c11f23091084361ff20404cd154e89d483b98b3d960b2e72567adf66192debe1862c1dd461477469d8c6b07a02a6dfbb9f0ff644c6743380159df5fe30";
+      sha512 = "241dc58b57f683b3a568f456f1235a78af6b8089837b508c98c5e223eb1c9e98507df80aeb805752a9bfa15b0837f457e3b2cbab683982ab7ef29cbb1177b4c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/de/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/de/firefox-61.0b4.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "2338b344b5507478c36f900f76e264580ed7f62e46d042252ea90251c1c80a9262746dfe7d40c6bb593de89737c848527fe33d555dd7aa7fa3971fd0d4483e9a";
+      sha512 = "d86f8658348a006b8f0baa020f273cb40c46fe82b34a2de4a2193439777ff6d0874bd63cb143c976c6de9eac4170ed8081d446267d2dd1185fc8625268f11f1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/dsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/dsb/firefox-61.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "72cbf626c69a54d18d8c63895e59c2464e7e2f9e0c6f78e58548a8f861e7b2033533c3569ddc2ec3a2e4fe54d0e064a855a23485a68c08e1ea672e2499183258";
+      sha512 = "bf73cd3a94aae19e1e58fa492d766ce43be171f349c7f5cf3f889bbd1c3c0f8aca3378eda8583b9c9007b1b26f4d159b281f85b5a33279635acd22289badcc3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/el/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/el/firefox-61.0b4.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ee3ba405eeb7ee4d0622af5ed377e39ee4049b33637d122b1395cb00a9db8558454d8d371ee16ced37e1a9f5df7c07b8df5c0db67822117287c58a7b08d45fc6";
+      sha512 = "fc7acf24643996c6f3c63f1ef392883b24875914111128ec5c3cd4aaa3fe45b3a8b86ffa0a32f288231d10229f1824526fe7130a96524b7abc4917f375f3d96f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-GB/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-GB/firefox-61.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "203e6881ebfe4e1c238b83ceee8e59666856640417dfb27478027ba204823f78400b03e7e060c8e070207654f522893c321a9efe3671a212fc3d93519bf6c960";
+      sha512 = "d79ebb446402325a043acf700c1aa05ed85793423a0795e6afd397a004ac4f01bef39ad7c31d3dafaed2ee665c86b4ea4293292773a3eb7442c995c73c47ae48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-US/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-US/firefox-61.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "51690eb72296dfe440216bcc85f31312da6c10feb251a94396944af3fcecefa9cc07a4a278775214df2841a3530575fd385ade2dacce18b33231ea7abbfadb75";
+      sha512 = "13d1ff7486bc06daa37b1d9e98034fd463f663bae35d1163fbb4f033c327c5d85e8fcbecd2d9854456fe4e176748b921cc96d02b0889beab332a4a6987b2c457";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/en-ZA/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-ZA/firefox-61.0b4.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "2c802cba2c2d9c6627136f83fa3bf31ac2a1da1a8803a0d816ebcb16ed36111ace5fd229617e88a9a6e25818dc350261650969f05f3b2c3e7bd252a0d29ee54f";
+      sha512 = "843fc740b224b07307517a17fae1ea342dcb71564b511172da3f8d96f566908e485da5f0de81fb924625edd5b182e9855d4c39485b5d5e6b1f03d227a1582cdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eo/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/eo/firefox-61.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "407f5e44710733635f1508ac205186a182891415615be886da185b856903fd3c5d4b61c55c89f4d9a5ddc5e275918dc9e2881a2d3c1b5f038e1d7f7d490334d2";
+      sha512 = "fd62f3c1b4295fd91c3b0e3606761da2f4dbf534ff9c29d63c150b3e0c08663c8639499643163868fc3a205159afaf1766127d68dfbbe91262109b4673d6e4d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-AR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-AR/firefox-61.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "f6d00c92c423e09c61f23ce9c743c91efbc4f24a140d136f0b567fae3ecb45168eaf3ad5d886a1f15bf269c63cf8d8ed4f35468fb887371610ef55ea71322a62";
+      sha512 = "098bbb5b7e60d72561e99fbe55d5aa7fdad0ca78daa9085ef47814e525a284fc69d5dc2723974df97b4567dc050a7c23c77a92f16ac29f8f1f2c32feb0fed5a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-CL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-CL/firefox-61.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "4f8fe24bbda036402225b42b27bb48b46166bd9fe1963f0c802ecba2f186bc72c300d59e10a0fae384448ee2374ae88f311606d69b939669441c33dbde352795";
+      sha512 = "1e518d4c0149e51452b7710791dde0e51c92a16183e36d2130beb1a9471bb213853cced03604cb81b209a550c8c19b27f69c2ec13774f63dd143abfd27187568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-ES/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-ES/firefox-61.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "e3051d9beb78b3ff9fc2ea969ea9e8b672b03162f94a5cd290c8953c08f106d4bf141b749f3ea8c2d38a2d4711d3585fd0a358a45862b4968f6b1a1b38bccee9";
+      sha512 = "cbec05d15f141e61612d9eb2e0001104500839d1cff156398d58fdab027d446a7f936d96e257d6ea8c35082f1a519f16155a6e45f6186989a09bc75fdcff4e7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/es-MX/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-MX/firefox-61.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "a1b7c28fde683783d5e36ade55ae051bddfdb829f6568a0ede19d038ad9e5cf25fce0e5669d7fee50cecd8b476dc9f0d4d401c9d6b30f2c4589bb086731fc5b6";
+      sha512 = "33670d131c9746823f205260829d789144079c71e089c399f4fc9ece9c19ea1e2f840f48ea8b629cc1101e3e776bfc12dff3e6ddb48c27547d458f7ae9a61744";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/et/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/et/firefox-61.0b4.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "70f839dca4b337a3161b71ae8e2007e8075a0b8fbb1b17ccc0e78c9e1f34e50b5711e5678f183cb3fb14fb6b961fad82fbe32393f15c1476e57ecdf58881d1d6";
+      sha512 = "ceb2cbca7b75b2dc083d40ed6c9fedf0fcaf6e2b7a626cd93e3de0d92b6cf73b60374d8b90d6fa57ae2910c06af84f00e55a2769725be87b37e2291b15d1f0b8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/eu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/eu/firefox-61.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "e242ec15f4b6d136d9018df3edebc2eb94ab9e02f0ec1737e10ad3f17a2c24696a0cc2d0314e3b09e07d979a2f0fbaed5a8ac10b9954d5c54cac0dd0a2b01ae4";
+      sha512 = "4e6a8878c8adfe5e8fd5ba0b6eaa6ba88ff4f76cc5f3a8178040ef72d838141360fa56b0f125490a1effcadaf964cddaabe3c769a69e67c94400bc07ece89cb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fa/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fa/firefox-61.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "4fb727e5d8b8c3519fba218a8d4bd49a58ea4d7c20f3143b183fb6ab5d1b17cb373933da645c5d3856906a97bfe6648964495ff7a85bb85e01938abf79139f45";
+      sha512 = "9aa36ed9b2e9770d56302d41a373ae19510caa8c5442928dbeb70bfdf46ce2746a68776713ae54b0b996c1f3b6e36a5efc45d5b2a4508d1b0bea0e49adc0f380";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ff/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ff/firefox-61.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "ee25d95b8f9a5db60fa5adb7c656e8f39a1420b380ddabb3b39fa2a50322fa104934380b6698cd4f6d941d9b63e77a98e5cb002ba9dd3548111c9e6d6741f7b8";
+      sha512 = "53955ae8ddd8d46863cb960e2709d643869b882c15cb5b13f73c05a6442a38d3be5df47f3da670031bc99f22dfbb10ae80ac9799a71ef775fbe34649c803c82a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fi/firefox-61.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "5344184aee16ccdd0b8de303c788134b8435364a760c1ea0a706c44f36d344ca6b25dc5dc6821c84cdff2c5f0a8a7da8427ef4234d94d649e951c901200c087e";
+      sha512 = "78d9adc8c5b05cae1def5260aee2ca9419cf1e46ac2f4e5272f565ff73fa2cf57912120c7bf2160cf4df18722e63a4aebcd3574ec3c61c2f35c757ac677d5862";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fr/firefox-61.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "67f5f6d342262e8bd3eb9ac0561b7bbf170b3f8dbe861e8b9c0607b087410a24c1e4b453502f77eebb5a045d5980bc9e1680bb0c6585223d4aa809c872fb9d3c";
+      sha512 = "1235a994606f43e3c9d8660adbd9d3049da19cf5e654d8deab2affa18835a65a3bb297dc99de7ac6949bdb4c1c47296e2dcadc859833740c235c4364c418b5f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/fy-NL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fy-NL/firefox-61.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "b4a3d6a3be694d00809de9d78a1b36958f9150714b8ec068fdf9e79982bff82d3dc7c54f9857812b2ea9b2708aa0290d4fdf787993697f99ff719b213e50b0f0";
+      sha512 = "44d97d3842a2ac5f816e7c74301cd85a8e09884438e5130cee9d17f0b4a59015831169afa47bc2dc6f89d7934d356bec18bbfc20bc97c0a85b441214afc9de71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ga-IE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ga-IE/firefox-61.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "14411beefc9729e07b80f1f036ac651312fa4d257479882841f82b0c5c10ccfaf83f31b2597c9076dedd3af4dcdcd62ee660a38d48a864c09519bb1c75728e34";
+      sha512 = "5f1e8aff2b70032c5907a73f99b1d62500a583ce7c5d5aab50faa5e40f4cfc01f1ae10936ecec9436ef4dfc8b5db1fbfc1603f0a5bbbec0a9c04eea32f9f9907";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gd/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gd/firefox-61.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a6e40bbcda17d41a9972e56794847fad10bdd14d3e09d9ceda82b09d0d8c65559667b69afa2807fb9ecd26b8daeebe29a8cef6975bfa9e769886bcb94526f14f";
+      sha512 = "1d971abafa1636d154f015d874e97db108b48a1f6e188145afb7f3f4da1c01f4b80fc152e917fe3baf419af767172b965657f75afc4cd694523d458498631b42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gl/firefox-61.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "39d93aad369a22207d052611355b8868159b8fcef54fb86bd7bb1323ffad34d90ddf870d4cf21fcd3db0418b7e12335043d683c5f533454e19201ba6b9090c77";
+      sha512 = "cf9cccd08695208227d0cbdc1531df4957817327c95f8aacb8314d0991f7c0226fb8e4cb565c18830cf5026d7e87e32b4e445a4580ed27c0fa0ce643c9f37657";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gn/firefox-61.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "83f4351f9c7217aae381b2ba3ff8cd00d1e60ac0a05e87598633ebcf70804d8aa235f0b6af0f5218b90292970a5f18ba923a1a20b6343b3a8a5fb67195034d58";
+      sha512 = "79dcd2747c22484002bacbc7266a793c984a0f51b34921256d351a0df5d5d0fe041f2cb6db0757ff48c9b32551c882fa60c0d052d8d59a94f0747f40728a5e85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/gu-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gu-IN/firefox-61.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "82a3f443e757dfbe47cba8c6fd0099b55537eb290529a3d93569d7f044147e37518e6be82bfdf1b9bf13541615007c11d12ae7feea6c20c35e5cf74e00aac1d2";
+      sha512 = "425f0864046581340110ea61a6a3abc87a5b12c2c24401b91273fc5c55014a0af9d1868e4e2918b30576394d97f16854252fe999d0a5b84ffc15c7b7765e20b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/he/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/he/firefox-61.0b4.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "71bea5afbb118e32e2e8c88f2eb88a044124068115301e1eccd892293fa59b2296d548cb662f6b67c6b52d8d9dcac6c7f395e70183c2881b72b7fd3fcf1fa759";
+      sha512 = "7a2b5119651e391164f514e8deba75cbbc7fb2b89353d5386758e3f1442d0a9d61bfcc9fa5ac28c20a0b4eaa793c04d7c45c6dc43aeb4d0042aa07a1efb22d26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hi-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hi-IN/firefox-61.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "3cd583e0bf4d646fcea81b4c20a25731b9b69dacc61384e8aca6bbb3e1cbd795e31ff980f4079a51ce76f71d84c5cc6a3e486ff23f1ef2447d249aba48af9434";
+      sha512 = "b0bca544fda321aeb18e91c6c639434084ba508cd0bb3027271d61075fbe11c10c9114d5f3bacb3538bf5bf41dd83f37b9231ecba7c8586a19f64c367d7bc0a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hr/firefox-61.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "79393657fda529897b2f13e842f44f1bb76b2f90889bc86511a23238fe930eaa8abb55eb5541640fb214119ee2e0472b3688e75bd5f00c87f5b47b193bce8e70";
+      sha512 = "baf8526abbdac323b3976c0561a4f7152465db2f7acbafca467c06794ced55f851d30c1a02161945791097351ad5e07a4a77d89bb8e6084e682fd39813ab5af5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hsb/firefox-61.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b391dd863b6d336cc6c9c60c287e9f85f73c91cdc8463f1b3ded0239953ff7e0bf04cd8daf12185277175a71b55ba002ec74cc1256882e453fede8034c9a9a34";
+      sha512 = "21678434d8b8c90ccd8e6f04f29c0d5d99376a0ee8a0c34b4748982b48591cc5f6f361b3c8e50bc90fb45668e439db9b1e7e1e0bcd88bf65d42186463decd348";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hu/firefox-61.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "ecc51ff78e3343c72bd1337a025ffe81fbd62e98bf1028f892ef59591a3893bf99bc0f58dec5e183672c6ff9a7fe36ab140a8dbfd892bcb99206b7683b7f7189";
+      sha512 = "7964a915f1bb67cbe69a62ea5d707e81cea6a1f1e221cb8b35754a90c074d70822357bf71562877aaae41d53d58a310a4db39d388f53a011fdbc195160038525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/hy-AM/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hy-AM/firefox-61.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "e0fe7721850ce3dc21aa5fb587e205d3833fcbf1b513df3fe67e9e3326ed57411920c6ba7d8872bd92a5df073362f67b101ae865e0954731549c7b25cc34400e";
+      sha512 = "71f1f37b090e370ce5152290a6ba89cee3d29dea718247c5c472cc0d619e37c60910445f4cf57e0e0693a8af9d439820e2da57fb0b88e85f2c13db042252e8a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ia/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ia/firefox-61.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "fa1f58e589f1d5453e8b349f87bd798a0b7fbf396890b6531c433fd27043d3a599f218093398de09387b2bd1d98ab50e92bed3c211617cfea700bafa0c846f80";
+      sha512 = "92ce50a687a76bd51d852a65e5bd2495d572adbdcb250183c5a757d7c4ca09f2420c5b3e2abf968a956a5625bef4e28fd46f048bd79ea8be0a5a49e783986add";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/id/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/id/firefox-61.0b4.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "73a0214561b02b4b30e495c5e62c1883409cc20b8f26c7aaa2bc32edbe197e8aed2e4165122ae84dd3035d36296d91a30c4460e9a5a319fb222f0d813601486b";
+      sha512 = "668db99ee60ed9553076f8de71e228386d04bb337a3ef6efd25e9cc8a193ab98a472562bee667314cae745895089d34d08e8a11e0f21d6407b6f4d443be9f52d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/is/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/is/firefox-61.0b4.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ff6d9319998a1c9d394fec7c484b96cda4a473e374b193b47de3c473ba91684000d5a909e5bc460b83fd92562e225476671d42781968051a9701a5e0f760a385";
+      sha512 = "409d8b328287e504128f1e5a76793e8bfffc43453d3fde593c0a3048b4c3d5cfcba155269b629039acd6d29d53f862a00cb1e9f63fe2ea49c9c96793f440db16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/it/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/it/firefox-61.0b4.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "3b31ae6a9d84266007d7a61840782f3e1621a5d4b5dc05c7352e682132ede5225990712b4371edd59edd47004a87319e11c347b18a39e4477afc267186b2f1e7";
+      sha512 = "d6ebeec88e354b3fe1e21a259e85c67c1aeed0278eb82c8da5d4df1990a94cb3bc239ae0094146da31f53715722d225ec7ecdc13c62bc69ac6a0d99854cdffca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ja/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ja/firefox-61.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d5342196a66b2feb19352b5792bea6579e1921b573d583ea8223a3ec1e7c59df375a3ebe83345330bf42e6a01c54a5947111d0951025f6c57e55bf374bec1c52";
+      sha512 = "d81dc550cb3b8c07da81205268ca7411a81fbe481f289f7a35bc84cb8fcea978ce1c30d8d36b6b87349b5bf2c9bea45d98c6e0e96ee376e2fcdbf2f1fdddbdfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ka/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ka/firefox-61.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "ab045e67a005d31da572c30c6a90266e82a892c3c99af55ba97de6dba0f2be029d58d6ea259ee13d63e15b27f124dac528879109ae4342dcbfb46eb376021846";
+      sha512 = "9005824d0555987b997366cf6bdc776f2df18e4e15b32a3953acda22ad669ea073233c91f8c2b12b5d1f783611bbd3acd9859778ec19d21d929595f206b55a73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kab/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kab/firefox-61.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "aef5375d4d9ec0f34cc3417d68cfefd7f4ecb489a66bd668ce1bdad9ab804fea267557439bdab5d6685007a3d16cff85c9e92f7c1434e3a76bfcc94bea8353b7";
+      sha512 = "955c96dfb14225b9249323a4be404a4a2acc5523398c3456b22406f6aac4ba9a7e84607c7d9f3ef203feaaf66ab190b04d17ebb3562a0789143fe78b79fb6d26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kk/firefox-61.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "d3c86d1afc103a1db53e1a03ae36f3c7da7a1dcddcb5ff9e2c8ec06ffe60a8e4f767a012e375191063f0c40a80bea08b66ab0a2db3ceccf796de15bcf232f04f";
+      sha512 = "a6519912de9d60fe4eb11bd14b65c946b9d80ef21c001689363d2f34ea3dcb6cfd108068538a96e0c566db48ffd4322ba3ca7ef4d6c4f95e8c22e4a41ada9cd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/km/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/km/firefox-61.0b4.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "0effdf51a9ecb2312f34e14edcaa7ef40d392f6f969c46b1dc204471da276ba5b73416ede2cf6ea69205f67ef44df815e6038137c2400df2e2581564cde5b1b3";
+      sha512 = "af3a016e28b9a2d0150298878188f798f781dcbe3553bb7231ce9d5a7bcd3b3c2c9ccc9a5a867efee4d0bfbdfe70355ada38e2e3531bfc63382bc2d2d9db7377";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/kn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kn/firefox-61.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "f57499563c17f119472fcb48afd54d4df98c85c854814f872e12e5ef4d3dac3192905f43453849ca7f024b4ae9a96528c2f9a55866133e3ba0651d046fc4ee8f";
+      sha512 = "872a6d1dd69a540e253a15376a5ed0af35ccd65d400c110ac82046749c05a43b73c6f8980a0d1d8f4bc11cb8e01d412ec170b3d905461d8f896f37f3cbb6cdab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ko/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ko/firefox-61.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "50defae5a904a2dccfe8cd34aa2ddffa05a18a8b8b7181029f7b5b2a6bf612445bee2c3a4cb4c4f272bb97dfaaa487f2ed31dabf200631c53d963bc5f66fec1e";
+      sha512 = "d8890110362ce85decec314f885cfba90c8ee7c0287a60b8b747176bf45426706f88f78642d2c92e4542913cf64a602cc36a706d3331330fd3d37579af1b12dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lij/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lij/firefox-61.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "9bee6742358a2c726b23e5c51d79fafa92ab8a3df7ac4acd2ebcf9b0d6a3661ee65d6335ec91b4e02a0f8cc3c3b452ff642ff2682788a647fc5d29c80b8a6d16";
+      sha512 = "73b79ee6702844e66ca565f10ec28d4640345303e1cf51e57a064eb01ce9be9c02332d8dc9700466e11ef38a03c99203ad7935fa6ca14cd751b8ee2096c2972c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lt/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lt/firefox-61.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "1c2d6e3f62ff24b4590163da626a92e461b9e7035346309bc7cbf1185f21ce318ef6e072902249da5c59d1f37724e4079b1d673492d2dd94ba0f50c38af818a7";
+      sha512 = "d463bfd3766e950e40309845ec88f1ae52a72f38dbc41ccdb1652882f5aabc94b9b204b0d3e1bf1a0e4959eb2a23694bb189bda14f9dac3c91401c2a646be8a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/lv/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lv/firefox-61.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "be9704ccfae945863ddd60ac9a4cf4bd2642bfb11fe3adc20d396c9fb0a85189fdd31200e59f06aa4a1c50f46c799ab07864e7f677bec2133b9e2e60ebe3175f";
+      sha512 = "2616476c2280b7e1c21ab7f850342e8deaff2c97b1f0ef05496ed1b87c15578dca206eed0f853866c5d018be4a2d6281472033f490466b41132c5623abc7574b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mai/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mai/firefox-61.0b4.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "0bfb640ce98b3e16b01b12db7c28753d9d90d46beb7ca7f205fcfb9d90537eeeab6b29ee999108e549b257c26ec4e13d64e470ab79531f83895403ca7ebe7d0c";
+      sha512 = "3628ddce5fe431663d46c4973059112b3384f907d3e76ea99266968a855cf88de932985e2912ea6513c0bba7b321bcb125024d9b52a1920cb6c02211a876bbcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mk/firefox-61.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "7f8ee664f3f4f91c3b13f2e9f0cfc8d575f9a0da263370b0575a16e6e9bc7ba9e449f62df6494ee9837fd8e4620c2d4848d0cb7d99a3cd675a87bd65c1ae96e4";
+      sha512 = "be145f4a7919433312a25c318b072e40160285542b9d9a9659aabc0a90f2d6641329745ca3950b4da2c0e58ee9c106b93cb93bd5e806cd35e0884217eec3a20f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ml/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ml/firefox-61.0b4.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "1161e096b7d01fa4de5ae618045cd0528715f961434eaa569f8492a7ef0c059c2369f2dca348ffe0f24376cf6ed529be9b7077bffada3b0812a4aaa6677a6c82";
+      sha512 = "4cd05fa46a357eff1a1121abc72e07b992763e702b5c58a82fed7b4a8b731154b4d6e5578a6334e4ea5a58323ef0bb0761beb10ff971ca25482e973144f2f6ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/mr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mr/firefox-61.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "cefca3f2f8c94cafea0e473a44a1068ab7a26956b9bf2eb3cd0dbdef851288df0bfc05ec0cfd6cd804963d1fbed7b5226cd1171d2fbe86372c977c22b162df4e";
+      sha512 = "5aa015d9a68c5d840cb20cb86ad98b837a97ff08da1ddd7f2c4b003d7aceefe9f82574248a39e86b45f5567adcdea2efe7821ad0fc019042fc507a3c673e628a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ms/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ms/firefox-61.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "7b6801cde7734c77318de91dfbfcb3e039012d048fd83014e66079d797a9d4b4c7394b7a39f330a24c82c0761436bfe6d7d5915e26e4ca18f4095fc68c728caa";
+      sha512 = "e02b8441994cd826bc308f0a5955d0a646b60acee04a254e35b9b3ec4dbc36374bbc2405e917fae352b9f000b7e72d3242520f092f27b7fa171ea5f9808d240a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/my/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/my/firefox-61.0b4.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "c4257963ea60c4d932326dc5fd468b96bfb6a35b35ef3c7950981ba92f6ba07dda586177ebfe20c386fb8b61d0ad406e102163f43a2f96e9710a4b0e7c241245";
+      sha512 = "1a20e82aeea3151d66b673f774a6c284ba8155f3f724c1f1cf79195a41cffbcf56af3399a7b526ba9a43f294a7a6c155c5914035417b36616ebb88d9e9125dc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nb-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nb-NO/firefox-61.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "6061bc7c8c0fea22bcaadebd2a264f0726b43c71b9f4b8c4b33ded9dea7ce9765e88fd1e4dd47935ceb5791a43785db5f4381fd2bd0181a281e62b6de025ef13";
+      sha512 = "0bfba4dc5ad7f20a5660b1492e356c1ad2113a7e67e74cb86950600c0a209b47bc398e8c9f6fef8d27bde502b706c04965046316d952fbd8f2eb7d1f87af3e10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ne-NP/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ne-NP/firefox-61.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "ad4b705bcf4ce2b819f92b45e4fcdaa2003b37dd6823e75caa153ecf5afb1940ef79984c8602c94e96ee2be025d46a52956a78de57e3261bdacfdbde605f568c";
+      sha512 = "f373d90059cb2b65f3eaf34af16dd5644c28f3bfad9fff8a02b855b5b3a0da3146b876e835add7e70e94d59a911c68ab61dcdae8739d2e2a39afda3cde6e813f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nl/firefox-61.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "d74352e12bd6f7a948f9ef8cc383811f361c8b68eaa060ed9859d3680674c07a4ff922c818bc502fda85dd94ffefea679e6f9ddc927fd193ead7685f40beba75";
+      sha512 = "bd971832a63eb6d8a2df4ba1ee69db7390ac8da13894aaccea7bbb79d27d1c29dc541144202b1e44ae95dff5e0c1425ee17c2845acad9c55b9126fe20d53e85c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/nn-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nn-NO/firefox-61.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "7fdfb976b9c586cc5cafda4cae0e6d379eed5ab0524bfe5cd5384612667a2949e5cf1e741786828b30e8ba67a4150bf34c4f10f2cd2c7aa89caede413501adc4";
+      sha512 = "a5017881f6b2ba0453b3ef41d6a47763fabf7a87e18e47e9b97d8c7d3ed4dead67687fbe3b1ed18d23e6ca3a85db4ca4dc3632537f74432faa1ea5fb69deccad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/oc/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/oc/firefox-61.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "3a967f09b09bdb3b0009dee7896cfe787b65ae15095e88be6acacbe79f69411afc6d90638f0cd82171a4f8f858e366821d3b3f3cbe0fd50b03172768ad2525d6";
+      sha512 = "f0593858258ec794dccaa420dcc39fb3bc35dda0c5b9996c7069d53d2b68fb2e373fbbb40859099ab8d85044308da500cf931dfb6e2d6132c7be2ffa350d653f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/or/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/or/firefox-61.0b4.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "2f9d078b65e479427c1a91714aa7290a2aec04cf3a6414df82ddeb5e830210575656d7e3cb35304c2d1fbbad264d85ccbea2e2408a477a396c368fcd4aab95ff";
+      sha512 = "33cbdcb3331097ab29581595579a2bff78c2af99dd20ccc9b0308cab6ae73335b990582d559cf8d9459c422f03f4dc0dfcba4b72c3e66bd286db001e0064a6c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pa-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pa-IN/firefox-61.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "bc3b65a2db74bd04e31082b9dbf3aad9434c9db2021d28f6a058ce78ade53b6ead38b9a7f123bf58e8a25f25d76a0e5fdff6372b04e34c88f4cf7e58ef80daea";
+      sha512 = "b5af8ed8a500d8b7b8ccc7ac44be235c8182dad44a55e461365f7b9089190c40d7ab7d2ec0fef7189d19ee0d80f96bdcecdaadc563c7d281f61ede5d19ba227e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pl/firefox-61.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "e1910f17681e058fca270e37939e5b6003195499080d747f3bc5a4ee9dbb960919a440a7f627050dbd0b66988067f32e41599d72fd6bf38f07e23ad317f83938";
+      sha512 = "77a651fb2b5bcb33754adbaf09e1c5abaf9c07af78fe5907b8954a1d0439d2853186070124e926a4ea2dae6acdefc5487632110557e96fda274556e97fdf2061";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-BR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pt-BR/firefox-61.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "a5993b73b475483deab792e4f657a27994aea194c716246707a0612a7b5c4f6b8b7a23befafd7c6fe50855a11fef8513b5bf16cfc6125a786b7fc0d50b102687";
+      sha512 = "0de1974b69f3d95381be1ac1366e9e7cf1057e26adeb655e20b088bd77035fc00bf94f0db24e676e5dffb320efc99481a9c9ccdeb5f6b0ca5c7050313daa3ba4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/pt-PT/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pt-PT/firefox-61.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "306c7f964d09d8d73b7c35161e28dc856917e7798c1a6a57bae7ccead2abce5a6a6a151f8e5a66473d3ffac43e0d0e2e4dd9d1bfcf66b23818e6bec246bd547f";
+      sha512 = "dde0ba1bdee706596f0da206c9c30d959db7f1bd0ca7d98482bbff5c8554a7e9049b8b8f905a0cf0138c00e9cf136dd8a805db7653849215733268025720ce43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/rm/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/rm/firefox-61.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "fb29e90b0728b2a0b23e2d87c8baeb6140301cd0d6d89fcaa3e047da25c8333f5eda67a5a1582f98c6711f894cc08542a6e8ab0a326726e02c08195cd88131c3";
+      sha512 = "c75a77ed854bc309bd20551a1dd99811043be9a1344b81831ef38dadcb31b0155bdffe7511e928b1fb877050b10a425c5f76520fedff88dd41388db7ff3085ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ro/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ro/firefox-61.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "8cc66ac0b88632bc40d92764f0efdb71a69949d29a14a2ea06907356fecac5faf472399fa2c55dd515579ed8c3501925286db600f9239a82a4963aafba2b56b5";
+      sha512 = "b9cf50d440e405114f055b597b85cdf8c78e67a42213d0a1c7c81346fbf8768408d0ea0defa173b41283a239d12b037f4a6b6ee6458e1aeb0e68822351b849be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ru/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ru/firefox-61.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "d346b5e10da51dd30b1b404f567673fec759ba0f8e44f0f0dcad1375df212aee58d34147599beef8eb78d12ff6911ba703ecbc3daf8edf206d19a3566a83cd49";
+      sha512 = "9075f179b98ada166c203d044b55aff03a66c2e8c3c1478f919acf34a02682a126a5fbe7076cfbc8b34f5c4c68243b324e71056dd92cbf316b3ff23c36d3228f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/si/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/si/firefox-61.0b4.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "ec97cbfb74a86d96e05c70f73ac2e45448720c25845cf24e9c45d8d3174fe540911b691fa12fa96ed4b82cbf291a539311247d2b2c8073f790e1a3054997f50c";
+      sha512 = "2f8215d03ebdf28d74c4dd30f5a3db568e32e1a169a3902a71bbbbd546e4b9f9e2de2b25ee83a2fc512ba34888139ac2a1cad1625a8a70dc16233cde8babc28c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sk/firefox-61.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "86676135408c0d9c268f93a271d959dc250d6cbd9e47273abafef0e5d8ba86a03e560539008034b5895ee0e9c415748c10586be538adfaeb5c7fac5f3f54a4f2";
+      sha512 = "12cf08203e22eff69adcbac620cafd5bae56ed137c257ace48930cb3f70d7877780dca32ed65afefe7015413581c9493a069d463c5285e9ededf8bf3b9045ba6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sl/firefox-61.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "7fd5bbc7c046a09ab05f8751015d9c04f01d8cea0cd5252ad49f7dae612ac87d65d5992e840bc7701b3d99c90869143c721e690e51f45ac0311e27c45471b23f";
+      sha512 = "c4f20a2d20d89e9795cc8f67cfabe1563e69649015850e1e9e26c21a536325d760f4494d734b351b6e60e789e9d23b726a77b7ab8c970c820f6fe0a1e1de379e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/son/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/son/firefox-61.0b4.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "b1fb2a67f132d420cf47707e0f8c4cac748b2c010ae5df7720921e742c13af851b7962c6808316db3eddb31520fdc84367f9dcd4cd0549bfc5a0aafc02cd9b4c";
+      sha512 = "d86ec2e9961d5802cd16d1e98e79dad8f758bc10f875c24048eab2b3114b55109e781c3dce3f8498436ab6f542671e9d4b883f0017be71d7321e2fa86bfd1dac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sq/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sq/firefox-61.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "979ba11bdc4a19cd0ff71c6626ec9bacd18738758b1748218206590c29474532ecf28aa9284e94e57db72b24330632913df89128a6e4297582ee64ed47e63065";
+      sha512 = "3ad5d9d572cb30aa8e373174e866701494548acb471f29b3477477606b6f856ed984b3fc84cb2302927363ee62009fbaa0a4a0a9e51ebabd431fa17b8d472445";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sr/firefox-61.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "65fc8854f5dbe87f0f548eb755b08f9dde3141c765eb6e891fc85cb91814a72edfd09d0aeeec2d98949a788a11a775e49a8ab16829358d8499b5ee27565da4bd";
+      sha512 = "0b684b2a726f849cc61d4b3dd4d8618280961a59f80e479689cab06d499aac6f1c0eee82705fa6d0295abbebb498d5652f9e745060323ccfdc2a7cb1b800ebe3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/sv-SE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sv-SE/firefox-61.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2ed2dc8618c8864497174245c50f6e4c64cb00225c7ce77c04a81619bf56fc5e93bbdaf7c215576e521a7951aae5d22ef606f8b93fb5d5a302bde3e92d2bfda8";
+      sha512 = "50cc112c5aa0404dba0760b183f6849e74fa57aa28c7f4ec03ef3c68c8726ba212655fb5ac49df12f4492454a2fc8431550a9ae84b9e9f86eb6dc575617f77b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ta/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ta/firefox-61.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "f8bacb758829611b730ae584107964b4fdb3e202e45ce5ddceae9d6697c655377242a1550884051c7d6c18126fa24f8859ec9a8527368bb28348d16e69ab656f";
+      sha512 = "0821005fcb9010e14db315283d178438eab03f02e1dc7a524815cb1175509343265c2c972a8115d229f5346d5a5bcf99c6383fbd294f5862386665748112ab42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/te/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/te/firefox-61.0b4.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "b20773a0ee3be91af9635e4bc92b148c91f1cc62597294f5b37608368b1c5fccda1fc203938a8ad7f2f59274dd6dd74e98d1436e74b6e4cd8ea21a6cf2263cbf";
+      sha512 = "0dfc09db03347201731214c987856f22c63a89272d9fba0fb130f12a56e5ef2b932850f13af117551fef949803b9622717df02c7b164e10035243181168fa0fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/th/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/th/firefox-61.0b4.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "ea05713f6f615280317d3deb14a5f8c3ab6895333333da165aac253c7cd9d62e6b913b56a850e82c0713abd1fa92c9f447771755b557d0056e10f39e54b5c663";
+      sha512 = "4a54abbc01a456433ac601823dce9f22f1f19ce1def11d4469a8f5aac4b529aed09828fc75aee1a47855a9283bd54477994ab0be06fc0b4996153a1d0df43ff5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/tr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/tr/firefox-61.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "73a8207478a59a2cf2291ae848dd1e8edc7274b4de4feaff4703279750406bfb9f74a3928f717d0d2274f0475b449c8327cdbbfe367a31f35499fe3401029f26";
+      sha512 = "c3b90f4197f7c99e3c24b6ac6aae31567f5f5fa6907a5eb9cf026904bc627bc8c0f4b3b889e30d63ca871499ced0a0349fb1fadfd84c8171eb0ff52a771fef18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/uk/firefox-61.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7a6f6ab7e282150b7020bdcc4d025883709088206df00f1eb47979a937f5b7f1b1f7984c3e9148e14ea669bcb4b9022c885816e52aeaf695098f55d9c00739e5";
+      sha512 = "2067902285dbbfeb7f3c8dd946f2f2997a8ca6f7a731deda8fe53b3bec1a980793010beebdb5360d8c08ce643a2edc0c86676f50961b7e531b4b59610ad9e151";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/ur/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ur/firefox-61.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "b8f7af681ee9f83d6f0ef76f860a399612a4431447f77b16750cc09c03e2b78b98f2b2ccd9b661221a17a2a45a3e383a12346215fc3970d6105c44ba4e655e62";
+      sha512 = "f2d12deb0147d178e53444e6f047e3cd809ed53124f78dadf698cce75f8f9fed76cc94cbd32d606c0e7ac5d1c6cd07356a35739651650bd3e3f95a6b2f655ac8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/uz/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/uz/firefox-61.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "85978c209c7519862d72adc61065c52a2f7e2d3f37fa5fbc10190fc896506737a42bb33fca3f7532805617932e7f824bef010c43f51510b8c9e0609560c1918d";
+      sha512 = "4b6c73553ab6f4f20bafbfc1c45e41bf342c76de27562514d2662047e78435d95ee0c20442b5328f13ea0ecc6451f18166fe10e6fb0b16975fda4000c713c80c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/vi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/vi/firefox-61.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "c7dce64af32f44b09811fd42c2edbc58556c931d9e4d11e763b27d969e74d860a682108b5011335fc75f1ceb09107dc27ef1e4c0b196f0048fe8b3541bad8f59";
+      sha512 = "172f81ad5505494ae3fb3a170e2c38507c89a2627896e8889b3d128f68099bba5b9a91af7d102b70fdf10e827a4b7fb6c0aed117cd1576910e44cc5e72372207";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/xh/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/xh/firefox-61.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "b63e73be6f0f7667fea700592407adf7599935c5a25ed93d140565d17f563fdc5c7e0cb688733916312287952b95f16e82496905c187d92832e0da296d925164";
+      sha512 = "3ee80235b5bb3b717930fd9366c43c3c30d519945673ba16b550fb8665b91ae929b52c7852281f5b275f2c0a140553bc348e2323960516d2ccbaeedf5999804e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-CN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/zh-CN/firefox-61.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "8b1de2e32b3450c84184d20df16991ad0a84cefc745ef110c93697841fa5cb3f4bbd9d3f21c8df6807d6cacf97dea1b856cf651567858b4c7403738e7c8445bf";
+      sha512 = "735e577a352aeffeb8110d4385e35741f28a5f7471cf77dd7cf146a48d5fe9aaabdf80dc468807b15b74601532a5eeddb27d3fa158cffc32623d929111f67c47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-x86_64/zh-TW/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/zh-TW/firefox-61.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "4dacea538fe5885bc5030512ade78787be53db7625ca4a006c48787e6d62c4ac82b0c7d40976767ac483a6b88e4f44abe5339e7909b211cf1f720d584105de89";
+      sha512 = "ebbadae639f4a3c9de64909b52a56ba192f832c0200fb983339b16fcf3dedb0b28589c73599990c572aadf85256701b579311a0d4e30b45a507e0c7186ec4d2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ach/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ach/firefox-61.0b4.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "6a2681ba41f8449503b9a55d551ca72a94c51903865062baf0f80e29a4cd98953ebfb239c72706e42795dc1a49d087822e4f13790298a78b0d12a0a08468691d";
+      sha512 = "61779e2106c89aa37e7ff2b0e2bfdcc2fe5f6d3de0c96e913149dfac19d93d2f572298214bdc9ac32d26ef81f69710f55ab888d9b432928c6473b2c510c23d60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/af/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/af/firefox-61.0b4.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "7835ee1925c7e097cd16c92a9455e331573baa0a7c5150df27698199b423cfe0e511400955be5fecfe342d537b8a0d66e10042bfbe1f411b5b9563dfcd2f4875";
+      sha512 = "39e88a0db67b553ae149626c34cc988a2164b64ab634fbd9d1f649ecdfcedfc5e2a62a017c3048df74aad8285be7d904dd6f4b8edd9ced2e0a8beb25ea5cdbcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/an/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/an/firefox-61.0b4.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "bcad9e4ce854ae1a36ffcf82690cd8f2240aa04f0a525c1c0d9149e5ebed1e78813488a4eb8330b39e61399907fd421542f1b10c616819b2567215e5ff5f972b";
+      sha512 = "addb893599cf0e376c37905a76cfc4e05d17816a0def36ae8b163c44f994a10533e0a55ff9a3ecd19bf8f8b6627ba68afb1dee11125554132a5509b095412eff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ar/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ar/firefox-61.0b4.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "205217f6214d77d0d8a9c33f5d09abc7c32488bdbb7f5e5221968ed490c10f634dc2ae561700f63408ac38d020f6d17937af2b711f2451585ff34affd52dd25f";
+      sha512 = "a0598263fb3ad1aa67a75fb47a92633c31b0c769b05b1279f8c8a65989bee532a04480b47aa41cd6e03159ea407db910efa2cd15ce80b47faef18e15bebbabd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/as/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/as/firefox-61.0b4.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "7fff85971ce1150b1ba030b11b637c51f166ddc038acd78297aea2251b3b2383fec376fce58610bfa3579825ba66d9859a8f3e7d2e33939c82d4e692d9df5b24";
+      sha512 = "d3d7eea767b6ed9097585c91ca81bbb83567749c9998896287338dff19fcb78c9b641ff9f3abb28ade7624b110e2a129495ec4e3d7906779633c319e950bfa90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ast/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ast/firefox-61.0b4.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f3bc3e70cbc691ff611b6bac2900d7e547d80ac84b3e1caad250c11e3b3776d9ab4db7fca8db0c6888378a540f966aa57e100becb810b1a3fa5b0e8944ae81a6";
+      sha512 = "4e12e39c1061c14db738372ad8fd0c9488a42490682ae0f0450a5d02d08d959ea33c87c3e4c1e66ae58fa446b8faa6643455bb21cbb03d2aeabad0207f8f4180";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/az/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/az/firefox-61.0b4.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "e9c25cedcc9684b88f442918e0a5606c1bc8986edb8c1ac8e885b00241a792c115f118799d425a876c462aa25abb36708b819ac712ed0c854e114a835998e30c";
+      sha512 = "8ec2ddefa9530e1135ad70a8ce5b2304a756efaa201414f657bf865699b02e26b19431fc86d2404b41c3d3557b81b9147a94033739c59b17690be4d3f250643e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/be/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/be/firefox-61.0b4.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "0e27ac6e9ef47d8e54ed5da4e88b02468596869613dd214066bee13c11c5a3f614fce3dc92f6e4b49250a175195a14fa4e11e0a576e24a550c02fc64187a7da1";
+      sha512 = "55d15c013df53929560584d3586a946e1cd3b0fd481881d10f0ded8513257ab4fc4a77d0495708c203b15bb749eb92abc2a4231dc892987ae4b2955a5fbc93db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bg/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bg/firefox-61.0b4.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "06a1a97d89230b344d72544e7d16cf9249b608d5a8957efbd5fc72eeea09ca791cf17d040d3a8adb64493d2eb10dc9cc1c334a0236aa41b087b9dade15345f6e";
+      sha512 = "229c10bb56080d50a88657b7595fa4d0f33f79570a00bdc9207c4b583aff5ad27ce309d6dab77988789cf6fa2671c7fb21dcdc5d69b0a4a7b87a767c7a7ca98a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-BD/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bn-BD/firefox-61.0b4.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "6acec4d29d2a40e0d946fcd72ff1f623d54daf9d9c5c00099560fbb286dc91f1e2ba341153e97bdcf62f54fe616bfcf38ff1e6c0b774a7917653a7e422e26320";
+      sha512 = "81d57db09707f13efc8fba2a13a0bffbb40224e837a50f5fe3c59b1648d89c8f7965cb4eae60ba0b1616cc77316c00ea2189012c4d8b8677649c042907683ae1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bn-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bn-IN/firefox-61.0b4.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "b492f32f37ed40ab42fd628cd01d063a4705c8fd14ea599327f417231951a610b307cf1035cc81edaae2e784e38c55dda17275f77921e1a63936872d48944ae6";
+      sha512 = "f674542115e8d9117f6255dbfc96507577791f7a29ffaf1de263ec6b75c0aa332beea348dc9be60c24ef6ffa822b100037030985157fa4e8540eddf2a9d6d769";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/br/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/br/firefox-61.0b4.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e4a2432e279ee0046606ebbe84f0249afc225fc1276cd28bbe989049ac59b8c2fd09ef787fbf269367b45ff9c8092c6779cbafa45a05382976dfde3479527148";
+      sha512 = "9adbfb3ee70096a03dc75235e2a0ad60a9d90f1b240d3ae35a36186c013aadd283470b0878a8514759f04952208210bd4f2ab63a987e055bdbc9652296333259";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/bs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bs/firefox-61.0b4.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "c8172442b52b48396b57b36a9099c3dbfac36020769101c6c2fbe0a1e857700817dadea56a775d62f127fe8f86b714be0d1be63c9dbd8a2aff15b6698fca84eb";
+      sha512 = "b9267ccda43e947096337b02a5c40bcdca497755aeac2df06930232b1b1bf1b7e245c32733990575719c6e998c2103d8d29f46c804024cb4cc15d1400d459ad7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ca/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ca/firefox-61.0b4.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e199d2b24e0a1f559a551bef9f0658d23dd69b0a6f9e1c2b02885eaeade95144bea2a29bbdbdb0cf7e34cf9f7c6ceb49c407c34ef61f855e260b2b84436e38e1";
+      sha512 = "59a5ac9116bfbfe296595cafb11c13cfe50a4483e3079a4112d04a10e1d6168b67183874f25047fa7c3e0e93a7932e5778bc78930e0cc48ff9a4a661fea202dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cak/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cak/firefox-61.0b4.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "32552d0a4ec557950d64b0e67c572a7696ea7e58a99960b192e5b383ee30a39382c5b80e0fdb1b14f3643ec8c48a422098dbee1d99ad6b2c9eef1bdc3d0dba91";
+      sha512 = "3ea669f0050922163e4450ce8a1e72432dfb9c64b9317796b0648e9079333a2204ad1691c9c8e293714aade59c57aff75ded358911f4bcf161ddd140126dc164";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cs/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cs/firefox-61.0b4.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "07f772b65b234ecdac971fd0a4c0ba049d17e148701b286223e972cfc77fbfb28c357e60e2311519459806b48ee8f10f5df96686a360b5148ad88c6e9de3d545";
+      sha512 = "39391f7b6b1ac13ec573040c5b7ada54c29fbe202cd5efb9bccf0ba5b38c962ba199afa845a5d7df0ecc58f3f205ce0b120acf70f5cf5c66fe8b465f324efdf8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/cy/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cy/firefox-61.0b4.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "1ae9d11b2911997ecbdf06c66072ba5584c70b33024a18aa348a50ce91019c62c862ad201d6cb7b427397eeaf0c7133136047241cc61fcba4cc761d9665bce00";
+      sha512 = "2c44aa81963f6285bb8f5e689c18a9e5f15d449d1a1f7983c5e65c0049a8da72bf9e07c368b68da408839e4e4c58b35692cbb7dd3fd565c5d53c21514ca33628";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/da/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/da/firefox-61.0b4.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "71786ab9acb16d3d2bb102863efb79e716a67ab0b32c6a6475bdcf93211d9517b862939576d258b98b543be9301c26e210c9f420ae084233e56d497ab49b8763";
+      sha512 = "0d49ed761fc55d137c4337c43d0ac8e2ee36c15fdcba2ffdd6f536a2d51ee42227eb32f553ff15bcc1313476a12d7f51d59a112c2c23aa47f753a01adf121755";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/de/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/de/firefox-61.0b4.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "36067646d3459c6893f3504d5e9a7ae3fffa7291fc32969e98d4ce3223b09ccdf7e0b04a6b73fa2584f9aa45e9b38a8135fa243a88a50fa2cf745b17e7c17de7";
+      sha512 = "51cf51f85b68346dd0eeac98706e097e1a42b6da1e3d740459d58e7954367c3dfa4bbd423a07eda4b2f89e03de1c3c6ac169b0bf0657922c9c2f0ec865623a47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/dsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/dsb/firefox-61.0b4.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e6fbb31e7db958d00a937a8565e691c4a65b975c0cd3f852c9eb13e97ed195dff660bf36c40764d3f9169059884e384fdea25ec55e49226a02b693b9e2fc3c0f";
+      sha512 = "06d58745022be40d690483d0f96b232df31de994efca42bdc43d57554ed38a6c4b36b466dd5b9a28b6f9ad8bad8c672a0cbd1bee5c7dcf0820da479ce4c03b55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/el/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/el/firefox-61.0b4.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "15d300f31ce324e89f7927e66e39c25a0437609817f321185b385ad4026eb2646f065f81a1cdd0ae1f7b120582603c83e8c2b845530a6d44871741a23f219261";
+      sha512 = "74fac2b70c3a5eda6859b7eecb4609569c56ae76b82f880ff9cf9d8bc1af2a3a6efd09ddb2bd32315205faaa6e5cc471cf41edaf139a3da486ce4e7a2788b635";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-GB/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-GB/firefox-61.0b4.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "7ee1708cea3282fb0de47147bc54d5738ec4420c3d8e41af445e138fe88b453572d6848de2edb7e48258bf3ac25e03fdcf22d768b220af6998e97fd16d4588d2";
+      sha512 = "f842a7fab1eb6bb15a9782838bcda4b69188c2a36114316f984e5e2f21fbde9d8d07b7a680ce3516ee359f638c82524c1961dd67b1f05a430a045851aa6e41e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-US/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-US/firefox-61.0b4.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "2dd63530379b00312b310ddf63f7796b6eec97edfe6638dcc82dbc2648c42e9e96932c73f16518687f922cb1d45212b82b04abd39b2e6e7aed54fa4924a5da34";
+      sha512 = "68797571e5cb045872c78db9cf9ba06bbe2982f464199a2c89f35d1b42369f49ce3abff1d01bb6be612efea2a102c2cde5f00d4ae71f02ac0728abfb96bafb65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/en-ZA/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-ZA/firefox-61.0b4.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "a04e3c3202e12f7f53b11107e0db92282bb5d8fc6627f3bc8729c520481d9a3566d39c68c283a97959020fc62ce1095c5b19d8dd85577bd5b0b171f7b67abec9";
+      sha512 = "22369e8b23cb8b30a8e1680f35acfefc3198e2cca558c58ddb0478da8ba11b08f1336cddf1fd9d3bbc7330f43f930ddc9c81b4b25bcbb6f2919aad8b60a30def";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eo/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/eo/firefox-61.0b4.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "87afb472bc3cf46a4af7d7bef7b063a09208927fce7060824575ddf7197e6f58810e5e36631402deed1cfd5d921323ba9326547a57792e0c8f4166c061214018";
+      sha512 = "44b5d9b3a4fd149942277700ab3ce73246eaa8ab2826843bbd4f4f5db5aca100e6aee1149389cb9d21335b1f928035f872afec1a62874942932614afa01482d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-AR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-AR/firefox-61.0b4.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "c963b697c4ecbde0432170a068143d03486156622294ab46e1426e3a3535031ce4c8e2b49d5a5b0de721cf1dde2abd60b6619fd4f8dfea90b12ce64ad4744ef6";
+      sha512 = "7ac6beeb77e49d5439825a6e909355f95dea535978b8639173c6903013cd1218461b1a8c3f4fc1baf291e9063e7f16c0ad0a985f02fc7c41f1f654ca872c9797";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-CL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-CL/firefox-61.0b4.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "f88736bd06a98e2a03550b7134ed4b6dfd06ea0506f83f0974d1c4b3226a3a37c1fbc5ffb085c5cb044dd282c594ec8899ddd3aa1ab153f9a5214432ffafdf4b";
+      sha512 = "7b6c6daacb63eb5435a908e9ea95eb205c57e0626059f80237083290af22b4b12feaefc0d47ca23345238fd1f665b08e1f97e6b26633b7fe231b9526137a29a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-ES/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-ES/firefox-61.0b4.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "ae0368b758e8a19c96a4344a0519b2b5c645e6bb19a3babc0b0fce9c7b43df83a5586406144d08df049fa984ace65f86282bbd14307364d99139549e0873be4e";
+      sha512 = "37e8968ccac78447e07fe54965474dd6cfde6fee86be113bff29161af76a83b29806b3ea6c651e8e014f550832012032750daa72d7d1ddbcf99549bae1a6a345";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/es-MX/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-MX/firefox-61.0b4.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a003622d0b5b048087e80baaee0776ef0f41189bbab81441bd31f430947521149ef8671aeef02308049192d4184d2fa0dabea8c4b29eeff6abb005992278da7d";
+      sha512 = "c61dd6fa039da4724cd5f058c838624f0e5fa8246b6c15fd28e5f501077ff0136dd9f45a3c249eec339b2ebb253a7563e06ec080bfa6bbee823bafddc36bee55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/et/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/et/firefox-61.0b4.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "71a81507a18ee16d947441f76daaff9c35a7d1f509ec4699143a7018534524f5d0c64340541efebacdbc7a163955ae06a143a165ac178a5d26c1b87b2479d669";
+      sha512 = "635bc450686fb89bb67573a313a8b06c4c7ac3f0a7ce2b8d9ae9cfb128e63f6cba4a4701c93016d9111d1ece4b5466bcef7497ef83c9b8c664f903f0ed79da10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/eu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/eu/firefox-61.0b4.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "d9fbed6bd402b3d21eb2ba032c4776888629e68f9dca68421418e1d293e4eac154bc26b0d8297e814dca2cc754e69b33e307e9a896bfa8edc0f2da7a75a8cef2";
+      sha512 = "9fa8d908bb5b656afa68b67a3289e576a3c64b845a9688261e21de10908c123879bcb87eb1ee8e3f151295c97596a8a122ca57d61eac56badf48e0c1c3efd245";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fa/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fa/firefox-61.0b4.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "bb024088948f3be6d37418eaa0e987ddf4d9854e7d06513e1691c4944e1d8ad8fff1e65118e9f45557601a238f0adf07a1596e82293728f2b011d0f1784a8afa";
+      sha512 = "f8e8a56dffd9c82289b7bb5c2c953292dfaec1c4737fffef17f8ed32a8abedee90c4d484fd9a8a27d24163bd3005e1931df5bb0b50efba5d42362517861997f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ff/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ff/firefox-61.0b4.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "e3f21493b6dff7cea9564ee067445076b2a9967b752530a0f922a70794fd5dd120982833574240d0ef854734a397651eb77a8edd0715da6c8e1710c3515e40e5";
+      sha512 = "91d0571155490d847b9bd5bdd8cec98e4edb7841a7c32da07b52fb7e3d67fd286ae5d770af47d66d7e80638c5e741f02a3e38e2cef28f08cbf332ae5f1cc50de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fi/firefox-61.0b4.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "9ad7444691a95c1b21fe149ab4468031a6886a42738f31d5aa81e2321c737d2c53a6d817523de2722394a47eeecf514d218d7e41158f42a80b9bf2ac3515a0b4";
+      sha512 = "8a363ade6138222a39520a7e3b02fad03ae846ad0b015f90259c5b6e09f4d309bd84a5b545f67288e3415f406e3efbf6c2dc9e1aba1aceba116318734de30f35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fr/firefox-61.0b4.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "d3eade70bde9bae372fa275912f3c1970c10978ac9e83f84c018b02443d341c21441b100f723c6856a5b61b742285606c5049328838444e7813e7427e1a0feb6";
+      sha512 = "47f2830f33753931516be570f1984624b41009fb0e8402ac6f5bc769fc6791ea50ff7c33ed79deee913539461f1ccb2eb0a0b9b33b9da9d03c204cd0d77c1dae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/fy-NL/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fy-NL/firefox-61.0b4.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "412a873708341e94fefcbb5fd72661559a83b4c897f5bea8a17051759afc0ba214dbb9732f65d5f4d9dfdff98498106a3cce73cb4c6314ec7f7bebafd8e63113";
+      sha512 = "df144500225be3ed718e4276062903b4e7cbd9b9d176cab88469ce5ba57960817be80a106bfd20da2e6cf14807dbece026167572e941b3c4d75cdd49e753e4ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ga-IE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ga-IE/firefox-61.0b4.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "59f0b8e533575841f768cd80390d8237c2db3fc2f2e99bd87011a8868fdc76ee8e5a87401c029f55c990fb0775fabc163ad4d9ad1531dfdb7bf9fbb9b601e08b";
+      sha512 = "b063d3701661a1d3298f268efceb4ace079a56b8017a0476df13677d1871fb36708984d0a0d03d56e90a02229e7c3b005501259884af0ff8b38c503deb581c68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gd/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gd/firefox-61.0b4.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "29cfb3bb6bffe5960968cae3096c63d92e50c514fcde9a26940e8304b688a869d6b03ce7479df514281fc609ea767c69fa66fc1f42e9b0f3cfe3be9ea0efad7b";
+      sha512 = "68f34cfd93b5e84017ee06cabef3945797c29668ad6c5574ec11d2bd3f4e6480d48c2161f5908a1782b9ef5b139fab855bfaad2db17646c94f33de2d2e84aca4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gl/firefox-61.0b4.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "f7b425e76607833cf4ed8e4381da101667c94d2942fa06a9be94193da350d03e8bd0f1f6d500ed0c231bddc3db5e458e9e94bd8ff77580ceb321ffdbd8a5e320";
+      sha512 = "3bdbcd0efe048104c09e44645bf11d3bc2daf61d3158d02d4407c8290fdd51c7c63d8ae7a111132b173a0fa86e73350617aed47fb33d9a97b911b20d552602c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gn/firefox-61.0b4.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "4f4a07552616989448bf5eb12d0a0ddbfb12b10b8f876d8a08f86bf58f113436b364f99ec26a20fc29eeef1030eb81546e0db1e92a8c86f46f6db1e60e784698";
+      sha512 = "1fded332e034a7ad70fa2a33d4033301291098b5deed26cce6e3007198f0ed998ad32fb019d0126c5fef7bbc546f5c483be56ff0d0ae299b42482b283c27d4bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/gu-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gu-IN/firefox-61.0b4.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "5510e8a069b7444c20af0c95258e21d5d7e35baea46b83ed7fa3546af41e76299191fb8e14beb459c79a4a2aa5f195f6c99240f5f54a54291e2bd7256e8a9979";
+      sha512 = "36b1c695fcd4db371c27d6560c1d39f8cb692a297423fed0e8bd11ec861b26ad0b94c97e7283828954d183ca69c4347b378725e04454fb4ea146836602ab3447";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/he/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/he/firefox-61.0b4.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "c3b140194ef9fefe85f2aff0cfb44c49ddbfa3bef89b9b53d4fd92eea4532753d19617a57809c7d5413833e8055547daa1296e4cdc8f6d2a1cc792adfff65a79";
+      sha512 = "5c96152e5244b5da39b4c86a24282c289516c7555e23d0152796c7ae78ecc186cbe870affde2d25f5d30533d2f73970d28ef7595b9ff5f006f1b7eb17fe78fc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hi-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hi-IN/firefox-61.0b4.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "34e457813bdb5201b862dac75309ed6e0f4d7915111e9956517de12a809cf7cdf8f18238dea9e480434334d61f0e02cb1d3b7b63ee1e83f4854bc76507093838";
+      sha512 = "ddcd5ad522fcc041028d82d212dfb0c05c8ffd6737af6ed044bd7d26d34317cad252cfea2002075dd855a52a86be84e54f02c2038bf1aafb1b10adee90415d31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hr/firefox-61.0b4.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "b65b6560c82225baed727e8831c549512d0d900f41c337a759d941b6d78462221649f6ccf2a3cbf889a838518c773cadc034d70cc34ae1253afe74af8e173220";
+      sha512 = "a4131caebecb7d340f8a006684118f801cc8a9987cb51d219d5463e4de5fb934a0a9856655224a3977657879bb45f823ebf41271aea26878efa52ebb1357cf34";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hsb/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hsb/firefox-61.0b4.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "c0966d7b799648a279dc1e53729bb1eb740eda31cbe008623e617085ebd2c6e76fcba68ad038b6b25e9f22032ca6075a66dd3fc068de7edcc9a297ced0353793";
+      sha512 = "ad25dd1d0e795150537860b60174ce0c475b341605328d68f4cd1e0bf0c5609e08b6d637ef4ea654f2683a15b8a5dfe2ddf6a9fbc609ae13a4add26d4ddab4c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hu/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hu/firefox-61.0b4.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d324a1a87dd4ce1d39691e1f5bce35b0576abdcff72786703f9a1c336706faae885b7cf3578fd5436d3a6c5e30aea2f80276cbde72c38bfc546fbfda60ba29e6";
+      sha512 = "15227814eb13d55b9a5274cd21da6127b4012292403b06fdd76306b1ca40fa32992ed735a43be6229cb0ada49424c23dd655fe9ecc8361c107352fc40357a804";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/hy-AM/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hy-AM/firefox-61.0b4.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "7aea87a05327f9d322931c79f39635d4b395a648af26177cbf2b4bf261d2fce0c756668f0de5ea6d3bbeb1fd51f7d4673882573a5f67ebb4406434ab42dae86a";
+      sha512 = "10a88c32862badf5db544470dc0f3b08276e74f0571b6f4e3af80f6f29009288d9760d553776fd273e0bef41b039a318f09deef478fa63694096d4ed9fb7667a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ia/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ia/firefox-61.0b4.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "cb0a81af96aa96923a49ce75c5dd6ece2597c1c7741127b9727df9f403437e41da674958dc3680d60ff599bdcfe7320d3c18fabb7cf28ea1db27a321e25506b9";
+      sha512 = "4a44abb56c89dd65cc89be06fc17edc79bd6fcdbc600860bfddedaca277e03a5cc146bc89be4e3529bc320e1dad14d080efa6d388a56f0511fad8e69c5752ca4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/id/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/id/firefox-61.0b4.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "546a0f63b7221de9bbba1d055d9d27a220d61527957b236031a062a092d73a55dbc8699154c6cae7d24cdee4715080fc99c4d15d592a7dd6af8a1f05811199d4";
+      sha512 = "611036954d22acf9b82283e44e869a6cbe6e46f2111b30c410576af281e907f19abe4b885ed1ba68d67de7450ca22bd02c020a9aaf43dce6b64828c55aeac373";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/is/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/is/firefox-61.0b4.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "8ad727a32508f339880f10cfb059c7f3efdd2a195490586d59566e622f99d58a9f0e72d2975453e795a51c6087b0e400c7deac34fcd250510eb85094df08128d";
+      sha512 = "051b1f604bae1d65d8001dc524b2edfe36e1a07e4f8625aa908bf912e7791840f6ee83581cecadec079eabc67961bbe8204f5992795b2cf4b29edc242d741837";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/it/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/it/firefox-61.0b4.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "21d1b28d39098f9580f8573a85e50c2ad9aceee4c9183dd4a6c9ec673cdfb1411c743c44a26737a662fcf9b4acd9193ffba69016a8ad1ad8a2e85eb1723aa55a";
+      sha512 = "3939de7cb78afe4749d9981cc40bbd8157f028f6f19b247e09d25ce43af7341d2b8544be37a1052ffae17a0de796333c203fd89408fd9d390b16f41947bcb985";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ja/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ja/firefox-61.0b4.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "71bc02ba091f38f0cbeb76c14e0009152a37a6f0adbac5886918fd2b6e75d04f3be3fcfb85230cc88664199422c15041d44991d476b8d5e827e502b145751fd0";
+      sha512 = "63ca3b592e0473a2cc24bbad734091d90e35464da526d6696b68bc2478d1fed2571f3ba6af51d5d19898d7640c6afc5cc3354593ef9d3d389410b7e50495b326";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ka/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ka/firefox-61.0b4.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "dde038391cacfa4acdb25b3c703cc16a98c1a6115f82907d5dc40dc9512c904772f73e8f27651ea0dccdaf703bbe1dc4fa8f8249937933ae7ddbb51d0787d9cb";
+      sha512 = "75a3ea5b87058d3e793cffff69c6b13b0e65395241ed2bcb3f566adbfb6c9a7f6f419f211f1fe11c2d44008091f3b7132495961d145c155191d9fc7af29682f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kab/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kab/firefox-61.0b4.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "5879b59629f09cc265a1ab6a477899538f1ddaafefe6357fbe655698096d084df9e0f0cb7c7b4387e3ba14d3997cb36744c7e9f92e8967a44124df59cf1d00d9";
+      sha512 = "290ebd2df481ed5b4b3663e1746b5804d9d7fe6aaedd2e81f10f566fd7668dc27f869e992ef023fa921c77818d8e389676de5cb94459ece81aa3828e02f527b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kk/firefox-61.0b4.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "fe41667306010fd00ad3611b4c426373617c5eb64345ca3b08d86f0a28fa2055f61c1ce3320fc5b26223b851eef19168a2f43ed2e4e00167ab937d1a1f3133fe";
+      sha512 = "372ec57b95d63469552683d709862d66cd5ef16c3b6c91c618193799eb9cc1b882666be8137bd1d037e656d7841e4a18cb1f5cd5c477e49e7f933bf7860d4116";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/km/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/km/firefox-61.0b4.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "5520a9cbabd270113dedda63162a21af2d284e0df6a9eb9b5b9a55d11989eb1ab72e6b0cde32245716de15e7d89ff54f26ea67b56871c4ab94de690a015c80c4";
+      sha512 = "56202e87711e0f23e46f361d135f36ed4a2a55f8743db57cdd91d433e70a1d0d45f8b52f574c683f65980df220b194c93726e036624778385bbf1ad7f499a899";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/kn/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kn/firefox-61.0b4.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "e9f33a0476c90be99f3e66da6f4c244496a5b20a45dd81b8294446cab71e423e8a6a77442b2af268b87b62b329525690200b54996856039cdd857e5ba4e07f84";
+      sha512 = "2c507240bf10fde9b7576b95a129e33a06f88d8c962c39a50366d4efa72d2520bb96cf756fcc911c92c04b008ca0199fb8f79f871df6153eab247d228ef5af64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ko/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ko/firefox-61.0b4.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "e021722d534ab811c632fd472ac1b3cc24a49865fc625476db9e142b8210dad7d9eca87aac1537b1447f38f2264b7f61ac7a780edca4929637f78587378fb66c";
+      sha512 = "925c3d9a67b697493de83c8fd1d59ba7cc309f37c42f7db60668c82790cb90ddde405cc90a0a88073419788dc040c5bcbd4efca38ad415cac73e3e21f6f64fe1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lij/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lij/firefox-61.0b4.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "c7e8e77b2a71e57d8114ea0f4aa3f9653bf5fa695091211534ec1eae3185b68c557550e8cf7a506b361310b95274e4a5f21073957af25ea4d19c8fee33b07c50";
+      sha512 = "bbfc7409fde63525642c12f82af5693f7e6857e3abe7ca21c298e45ede687797efe35dd4f874f94729f5eaf01392c49899ee62cc1a48c6565c606267ed59c825";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lt/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lt/firefox-61.0b4.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "c82b411a66b0385ec8e9708ecb9e68a3c6cccb4088d299727b639adcdc41edb740b79721025c6ff17b8e3b3f9783ad7405ffe1da3c3e844f82e640ccf076dae6";
+      sha512 = "2770ac893a60bba546fc44c3e88deb098eea8c04874d363dbbb974f3bc0037fb600f681e95b7184a5e8d74aa61e4721fae21225b9e5506d18e6bcfb39ba24027";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/lv/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lv/firefox-61.0b4.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "a45966d7dd15c325588705d209409730ec21f828c5dd690e705a8540b58f278f4ec67d3ea17c4fa0c94f2de9765de7fff71c2fa2d3dac851f01bc5df856f6c8f";
+      sha512 = "5a9e58ba15226a919d92efa893e3e8d05ad905eebe737cb7637259279403a545845cbe612389d5aace5cc1791640d9aa0d0e8e73dae032de48312ec55123c387";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mai/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mai/firefox-61.0b4.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "bd205990181115edb1b9134c5a7ddc7725699ade854737b8d27018b80c4d6d5d0774ae92e6d64c5bb160f85bbe8a3cff7033893dbb698adcd4bca0a189b6dd20";
+      sha512 = "73ced087da65a903dd9233103dc955b8429cb07dcc262a15e02dd0782c2eed68eb239745d14598ac261e40f7abb5c8004724389956f05a3f607917fd1c68aaaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mk/firefox-61.0b4.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "0cf7a3617c4cc9e8fe6753b1a6eb2199b3ddc8739efac499c45f41b79f319c4cedbf8c9e522c13150a7afd622c569c66057f934ff03176ca33cd35cf51a792c4";
+      sha512 = "71c65bd3d47fcf2dc295f595618856f6d37d794655ed5b443c0d4a57667792eeed18a262df3a1c29661ccfe163d5628c1f5980f01fd7bf5781ddaae617118e56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ml/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ml/firefox-61.0b4.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "a65f9f11ad6dbd82b64576a1dae5b76d30a353478932b5f8afd046764f9fb438c10d631935ede3743155ecc05612247766a1b3b603e3a9206538e68e015b6eb6";
+      sha512 = "f7b9fc140cf6f2632e5b62e1747d0c5e4fa8622f3b1a267d2f43143a4167f99c73a08b54a535ed3b4853a115dd11831143afe100d128aebb07ff46ee406552bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/mr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mr/firefox-61.0b4.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "3385e2cbee86b9fbb44a1cf719a3fc6dcfebcb67f8adc884bf207e887651befa00f55aad6c74e009bbd4b1e07fcf39bd299abd3ff9d1c9f44f9ab33a1f4bd129";
+      sha512 = "7829daa88913ef2d0bdc07549030e6659825e7ec2a22b3431565080e0a18da24e29f057c51fcf1d6b8705b994720c203e04fb71c5dea7ec5780b27f2e6cd463d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ms/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ms/firefox-61.0b4.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "0c3a323e1e72cc8fcfa153def5ce4b2fb90d69e16ca4e4b6472561b72d7cfddc28e8ee3f90f5b9909837330f6521cee5b1ee86329ff0db245c0ba94cbc87da9a";
+      sha512 = "576c4996091d788d2ef814dd150972abf909bdad4f351b1fc2de31b4b45910e5e565c873b386b88c44f2a4472386335a68a22fe36544b033a7963d80b3252ac1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/my/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/my/firefox-61.0b4.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "18e7e4fabb8a42491bf083863b2979ddab9a3a914ae476b2cbb8a290179d3685164543e637bfdf905655c482634b1914903253d7ac120bb18d122d0e60ae1f85";
+      sha512 = "869ab9e2bf7494203d44917ef254ed0d74465abf93e93fe6feed03c60988a1e20d932c92290028fc3dfd4e9f53194cfeb229b7f9b254fd45d05451c776ebd077";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nb-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nb-NO/firefox-61.0b4.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "2f7a98b86c52b35ec5cac1b866b844474020eb0076cb5a2fab4abf6bd12ab3882a54b7b324ee3491ea173c206655aec3f854a9f0a29d934405359c56a34bc9b0";
+      sha512 = "bd2b1e3707d233d248b54dce532b70455414d740993c5526834acaf0ac72f273500e5f601d1fe5c1d747780ce5300317d1e6d0e106726311ebd3e8f3568f721e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ne-NP/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ne-NP/firefox-61.0b4.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "18b8472b4af585b65995b3d25e6fe290d5758a06b1cc1dfea4ed3a6512a8c250c2d3e0157a274a35677183b2e4a89d1b0970d310e8dc319ec8aa8f1c02a6b70b";
+      sha512 = "ddaac816dacc0d07940dcbb034a6c117e557733b51706ad32aa974ccf76722961aff057e0bac299315a064000d65c92d8547a89cb8e522a8bc8b473e2d3e6425";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nl/firefox-61.0b4.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f62dd81c30ae0201d1f7f98804c10e8e431bf19ea3249b4a4edc71ad2103ecb63efdddd5153059837dcf4d70499bcef5b874aa69a15a391255af0d7c37a65b5c";
+      sha512 = "56711c59af60b7082bf3f2c413ad94aaea489d3984e4afa55304022f0c57fe072efa597533dbec5ba8e3aefb2ced9d365a7564ebcaf93e77b4911cc28150cc80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/nn-NO/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nn-NO/firefox-61.0b4.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "955b9faf5f17f598c13d51d9845c4c520b5cc93c0c0433da189cfc43d177665f47f2894f77d2dcc195da7ebb16870200d49703e45eec6769624d6f4c52d85879";
+      sha512 = "a6939789ea572a5687d2d542d9a5fd57159e7d5c8384e82816fdf69417f5416d23883d571041dce6c285b66e6ab1b90190818f87105f7c06c0f6bb0eac45ab3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/oc/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/oc/firefox-61.0b4.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "6a400ceada231224f3e38d4583ab064fb6a2aaaa89b886f21eb51435ecca32c5cc0bf4c67041a3e04ff2006b1d12899679e0cd6e425e39b005ddb5ca80e4aaaf";
+      sha512 = "9b51e1b2dd125e12bf8de2517432fc9d60a6e807372ad375a949c0c6ed3d8ccd4095eeb30e275ede31aa89a9c831c7f9108173ea2d207e0ecc37593094f67020";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/or/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/or/firefox-61.0b4.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "ef19a79b8ccf2c5418009abb06131a46b7205899a71b48baac0958062f73c54fe000ccee3984c42cc2fec2ceb2aff3644ee260754af5ff40317c375e22edd9c3";
+      sha512 = "6f3e10d95af809d98fee038039d048dd9da04d97465c6ce16a97d3a6bb1d77bc3481dc347b8e120ecd9e10daa47242ea11601e13236c4d7804d993b4ee455ed6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pa-IN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pa-IN/firefox-61.0b4.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "590785f0a3cfca1f8f7518cd6cf93398d71f1bd01e5bb6add5c79e3acb7fe8322d37b77994ac33d4ca33e19a81dce016dd0dd479fc38a7ba611d7a4d8fc30955";
+      sha512 = "e9d5a3618744e99604a476d39b04b35618b589e90d655ae7ceae942e0944a2395d01a6a05e386adbf3dbf13f6e3eaf8823a04d307d92fdab4086261736800e07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pl/firefox-61.0b4.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "77d6741dc35da55b92cd3eb5ebd3a32a96cde805e53314cdd64ac0ecca6a74bbb042af6cb778d344cfe01e88ef5005c067f964609404e55d4076f1427479d629";
+      sha512 = "cc5cbf37e8af29d9a186ea5e91ea263a77db7ff7758e58877a9227bb1e3591b80bf112e0bd7535d8e30a519427724b52a557799d60acfef053f02b383b25940a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-BR/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pt-BR/firefox-61.0b4.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "1aac86496779b9b6b570a7e7b0b4c8b443c4ac13e5dc548290d33dfc64ad940d6058afb7cf062d8e89baabbba5d55f285d1724322006c15476005cb0a04c163e";
+      sha512 = "296054c1424fc160b8688d89700b37271d3d16fd29ffb85275e0488fc45a3465c2f060bf77d5b6c1e8d81c2d53ee5cae6853cf26704ae7fb5222351b09e652d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/pt-PT/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pt-PT/firefox-61.0b4.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "3ae95a9255c6dccc8551d59b5428345a672b9c39fc08dd6e5b509ddb64ae0af197e6f1823e1bee08a2393c54c17077529a474757aa0a4bb70de3d868ca934023";
+      sha512 = "c32d68de0fb3a54b38db13f6416be06745e61767d3dd2dbcfa3d397ba54899318aff0ccede0f562b3cb8b5a2b4a126f5f0300c146e9d4d847148d1392bb1a2be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/rm/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/rm/firefox-61.0b4.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "41d5e3a61b7d8ede3c040720fd6be629f948a8fb55617a9cc6333c275c00304e990e6a0924d2eb4fc16544d855208cb2bbfa633ff829fdc37385b51492e49416";
+      sha512 = "92bf05ae92adbb08e70e610d46e260c63158073598718fc64ba5e14f8f15c8ff712353586da0b2d693d070bdeb48824b0c68a36acb101b483b8af4bf37f74eef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ro/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ro/firefox-61.0b4.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "bc409d8cb772d57ac8729ec61d5fb71b7df32d20ec9836cb1c2870bda85ac8f1d6263f607ab0be0e2818795969bdd4fe41b48c9fac5827b363868505867dcf87";
+      sha512 = "3e5da35749bd3a5da3172b9d567e4baa121d268a0d13611becec3e497cec2bf652effd26310a4147204940499fcf837bf20138555c4c0bd7c034ec3d36d983b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ru/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ru/firefox-61.0b4.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "4c2c6342a08da3991c4b6a436cc638be0f600b34e7fe02d75fbb6c10d297e693d2aee44624e6ef8543164f36b11a466f4f7c7bec709682aeb870e591523d72b8";
+      sha512 = "a83c33ead97106e384a4d16f4436e639bc736db9811e162e889f159ed38d37a670c6256a0f3d5b5dd7e62e03dd140cb763c02d5d915b2fdc1de35650de0fa165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/si/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/si/firefox-61.0b4.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "6708d0ad517b3551302f0b3533b8e365a8c27489b781f375fb469e45b8e9c84df11e0ff4299154ff7e3132e233b5b64f9e41432f61a399ade7ee0409fb1c5654";
+      sha512 = "272cb7022e819e930ada868f2260c991bf21fcbbd8f219ca9d3199e2152059d2956c490bd7ebd10441ccc261210f9b8fabce4a41cf4e01939aaa2054e4ab99b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sk/firefox-61.0b4.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "cfcb6141b3bc780f2bd27f9226f5b0f82d86ef9f22a15066ce57f8f156727f437b67b3f165c2b450fbf0c0492a2c9d246f2fcef417a511164ca29a4a7fbef6ff";
+      sha512 = "dbe0b1c1e63836eb695a24ff2576190d4a0552c9a7b6b2373a3b55774fbd9891b0cf32f53e95923fc267e8fc052bceb79d3d900ef060b92cbe40d7f0dddbcb49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sl/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sl/firefox-61.0b4.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "2df73ada8ee40a4a6f01143c4dcef7fc5b5efd486a20057e86c1036d68018651c2451e02c10ba127a110fcf8bf88f43928ed8b65958b1c7598b81973b79ef9f1";
+      sha512 = "7422cc10f57ebacd937a3153035cb8acf369639f117d71447e002fa151cd108f2a8609563fb9575c2c71271f3f4e50fa5211cdda88a1ae53847045aad8af9b9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/son/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/son/firefox-61.0b4.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "75f0025e6d7f6d63fd4e017ec68dab3de9cda824944d73319580861bc3be599d5ed6e4e81b7b4b4fb8bc8be7d530ccc52dfcfa920ca160682ea20e499a863b20";
+      sha512 = "8eafe8f6e1fc8170f622f29e598c6a06ccc507dc97d180e0810ff971d7fc4a4a965a75f1eb878483b03069ec0484833bdd0c0c1aafc732982b8cc802249914c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sq/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sq/firefox-61.0b4.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "763bb5692bbb818688ce3ec8ea78a9734b4de8ee29ec9ca8516c33e406913907affe211cf7146428b176c230353f0468824bef69c4f5ccff69b75ef7c302a1b1";
+      sha512 = "32a5e3d158e8931cca10777a59765cd8aa823678cb339b013519b07045b8a6614082bd6ae81d7871cf22fda10570fb4934c05be5dd16b0610f9bf7a1f19d671c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sr/firefox-61.0b4.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "eb0eeb897688fc2f2c29ddf31b76e8e67a40e620f7892bcf2379f2d28dd033070fad749d58770709f73610dbfa512331bc090ef5f4a8c561b196485e30dd27da";
+      sha512 = "42877a689c178b9ddd8711b2b15e51062411667ac4c978aebcb364ee9c71764c8dd64963966fd17f3bc929c9853bdd54c12ab312a4c1527f7adad277fc9adc32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/sv-SE/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sv-SE/firefox-61.0b4.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "6860fa25a9b2a1933784f0d4bf2cce6066049586a7968fcf3dcf1078f1964027fddd28c4c18842073befdfa34ef5b9a470d6ad06f014d86677e548e1b4b6de98";
+      sha512 = "48605bdcc841dca8a663b61d75d30e2bc7e0722be9e47833c42fc0b6ae275bf778b5ca534e66440db2cd85de70f8725f25a1f9a303b2fd8057fcbc1f4262e0d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ta/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ta/firefox-61.0b4.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "b060723474d8075a3b0dcc32387983a4fd159f7399de7a4dc606a11dadacf2b6b8af059238045fda70597c1530ba6007b7a07e065ce153a5b992965d1889a964";
+      sha512 = "7ede0ec9dc91cd2ca4226e5c361b2f14c592e77573bc64feaba4aefd24dce79d8139967f5c394bde440ecec5fc83e21d8d17e00923775fa33ed39b055ed50fba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/te/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/te/firefox-61.0b4.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "ddb772b303412b1275dbe563b991038fb5b860a7cafe3c79ca4a85070cfd1eec1394850c6478e3e2c89353c1d90e7d99ada1b2adeb35d5b55c7b190881c1a920";
+      sha512 = "b37dd0bbdc6a8227fa76902ddd049281bc4313bbd5cbdd90866036b400ecb0b07d2995015c48e37c69a6c68de3b8810787fdcf138c36075a47fbc43b0106811e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/th/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/th/firefox-61.0b4.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "91e4108240ee7e2573935c5db84ecc3a6d1ffce5f508f6a725e66d7d633c23f48d20797bb664a6e079e0ba6f4ad6a12abbf80a43cd51cfbc925a2b10e0ac0473";
+      sha512 = "29ce9cafcb24811fe6c9ef33d81d3f43634bf4acee7e3f1905d743a241bbeeb1d8d44d210389d28f6fb740f6ecf37648e808717780319f54f9c198a0a1b3f319";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/tr/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/tr/firefox-61.0b4.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e4ca27faf36e60fd8db2d338d6cd2bc57c27d0c446e7e434279c8c663235b69b16dc2a957ddd0f025ec71650647459152dcc289a72b90f8b94b9e50d69ef2989";
+      sha512 = "b1248f1e115a509554ee8cef5316ea85020fdc8c150bac0b363b25123ec17b40fd46d34f2a33a161fa66822fcbd4b111313986649931e0e6ed2c4afff3ea9279";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uk/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/uk/firefox-61.0b4.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "bfac00d8b23fe24da516c22e2e200f68ac8057b09fb3d93969622d4c703d2a74e64f86d6a0d942c32eee4cd6fb50f1324035a6d9be9e6f8d98781eba28d582e5";
+      sha512 = "6220697e54e30e70267c3d777763da05bfc6625fa9c239a5c761ab3b992d3fa5e1271332011fe7aa218a615917002351c2c5e9fe4cd278f99efaa635f6934237";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/ur/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ur/firefox-61.0b4.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "3548acbf07cd5012fb75f739f78d2b4c63f01253a06f094d0433f7b631f8e3ab33f887459afeae7f855193c5c9802ed96f862d41e937f517c6f84edead88a624";
+      sha512 = "bbbc09b0f0a88cf5540c4bcdddd226984bd91dd7aaee1256bd8142535b5e949d54dd8b92990f1d71e3695a8ff0054530dd64564edafb21bcf93e6764988c6568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/uz/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/uz/firefox-61.0b4.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "ff30ce6eae9d2e78aba595a5a8c3a6579243ec585f705f949402cbf930f7f375b2dbaa36df40e888151831d2a2feefcfd91eb698330df0c8ae67bf469e782ed2";
+      sha512 = "164c63d66666ee819a88169844859c8db95ec5281eeab77e30a63b1cca1fafd97bde09538665fc433ab9ecd62d05ac7fed68aa43bbb6e16476e34461ead4164e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/vi/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/vi/firefox-61.0b4.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "1d052d53ebae70c01c9aff7295d20323403a067275b59e6f66980718654a3858d55271d31fb0812a22a5dbd7cc8a1db8737aab1e696f4fcc99cd9bba42cbc812";
+      sha512 = "b12a47314960a28c9527cb2200286070294d4ebaf6260b9b4d4c483e4eb98cef349e4df7ed7c60c032a327aadf101994a49e2226a2a0cedf7793feec42e85cc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/xh/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/xh/firefox-61.0b4.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "fe0c271d4af2236ce8d2b489eedbeebe185da434d0b4080bae2ecd222bf95b4b3828860c3186cb79434ee60ffd379399b15045c8231ddd56aa5c210b8c52c856";
+      sha512 = "147b827716182a41fac6170656ab53bea4b658a0de537c57a0ca786d77ef4227c433c1ebc09d1dd00a4b92e07f03eacaba5928b61e055af67ac35b1aa9238890";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-CN/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/zh-CN/firefox-61.0b4.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "4ef2464fd35bb71ebe6d86d0e213e9e5d33a756ba139d38ccf903ae852dc025e5bc34727cf4a8c3a8a851634c975044b9c9f91ce64adec8cace79ae1d3e67093";
+      sha512 = "c47f74481322b2f480893be1ba9f795d951af2db7632b6a0fbed6e00155a4dcba12e7a8f4a7a3f44460540e499c03b2561eaea5a67d22f68d31cbad8fdde58e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0b8/linux-i686/zh-TW/firefox-60.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/zh-TW/firefox-61.0b4.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "da7d14a85785ec5ff6fc01bf6c18b7468aee74d5cae30f11515588ad403a3cd571890843f4a11beab08577eaf78ae3af6bfd757cdfa628c36aa95feaea6e5a5e";
+      sha512 = "41c5b6b561995a4a9a7b954ce0c6981889b89e046ca7420bc17ec4da7de90c11e7e54b1408587e7bb60d58b667e51816dd748f651bf7f3abea6e84bcf86659fb";
     }
     ];
 }

From 68ae161f5365bb863b382ded3eb6d7f20090bf56 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 13 May 2018 22:28:51 -0400
Subject: [PATCH 1796/3370] dbeaver: 5.0.4 -> 5.0.5

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index edc1497294fc..23b98200d142 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.0.4";
+  version = "5.0.5";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://dbeaver.jkiss.org/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "0dfs2xa490dypp4qz8v0wj6d2bjnfqhjmlskpzrf8ih416lz1bd3";
+    url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
+    sha256 = "1rcskrv8d3rjcfcn1sxzcaxnvmzgdsbjc9m11li8i4rln712ysza";
   };
 
   installPhase = ''
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = https://dbeaver.jkiss.org;
+    homepage = https://dbeaver.io/;
     description = "Universal SQL Client for developers, DBA and analysts. Supports MySQL, PostgreSQL, MariaDB, SQLite, and more";
     longDescription = ''
       Free multi-platform database tool for developers, SQL programmers, database

From 9346d1373bf0e8c83032934e7cf316ed3b0f6f9f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 13 May 2018 19:45:28 -0700
Subject: [PATCH 1797/3370] xonsh: 0.6.1 -> 0.6.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xonsh/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped -h’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped --help’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped help’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped -V’ and found version 0.6.3
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/.xonsh-wrapped --version’ and found version 0.6.3
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh -h’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh --help’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh help’ got 0 exit code
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh -V’ and found version 0.6.3
- ran ‘/nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3/bin/xonsh --version’ and found version 0.6.3
- found 0.6.3 with grep in /nix/store/prjh0vgnnn80ba9im4j9minjivsa8bj4-xonsh-0.6.3
- directory tree listing: https://gist.github.com/c4698aa16268961773b245a4b849a9f0
- du listing: https://gist.github.com/db7c65ccf5f4bf3c4457401c300d1862
---
 pkgs/shells/xonsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index a923602cdd76..8f117b788e7d 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.1";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "0lxjklwj267q0ikqab8p743sjvm44gq1w7mp80c7hgrn2ndvrypg";
+    sha256= "1893kkxvalx8ycjl27gixkh979kkp4ra00zb7m6a8cdllx6yhsgi";
   };
 
   LC_ALL = "en_US.UTF-8";

From d0d15f7ffc21e6c6c1ae3a3526ec08362260077f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 13 May 2018 23:03:52 -0700
Subject: [PATCH 1798/3370] osrm-backend: 5.17.2 -> 5.18.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/osrm-backend/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-extract -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-extract --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-extract -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-extract --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-partition -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-partition --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-partition -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-partition --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-customize -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-customize --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-customize -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-customize --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-contract -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-contract --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-contract -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-contract --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-datastore -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-datastore --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-datastore -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-datastore --version’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-routed -h’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-routed --help’ got 0 exit code
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-routed -v’ and found version 5.18.0
- ran ‘/nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0/bin/osrm-routed --version’ and found version 5.18.0
- found 5.18.0 with grep in /nix/store/9qxw8mgxq15czqp580vwxwkc70mc3l2g-osrm-backend-5.18.0
- directory tree listing: https://gist.github.com/dfbc55be9a7c8ad0f9dc070af96865e2
- du listing: https://gist.github.com/8791bb0044495bd4d8dbf95ab3f97175
---
 pkgs/servers/osrm-backend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 3b11f26d6ce2..04fd2e37b357 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "5.17.2";
+  version = "5.18.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "0ar94wpsc2vr6pn4x5wy7mkpjlilgnyw545wm0l78174q43460y9";
+    sha256 = "0ffdw02rgjb4z7xi8fk97c0hl1i7z04csjh3yd18zsb19bk1mkva";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 18ae1b6d314bf4fb30cf7a901e6ef357795a6323 Mon Sep 17 00:00:00 2001
From: Ben Creasy <ben@bencreasy.com>
Date: Sun, 13 May 2018 23:22:16 -0700
Subject: [PATCH 1799/3370] docs: fix broken link to staging policy

---
 doc/submitting-changes.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/submitting-changes.xml b/doc/submitting-changes.xml
index ffa3a90b5eb6..6c6f808f631e 100644
--- a/doc/submitting-changes.xml
+++ b/doc/submitting-changes.xml
@@ -476,7 +476,7 @@ Additional information.
      <para>
       It's only for non-breaking mass-rebuild commits. That means it's not to
       be used for testing, and changes must have been well tested already.
-      <link xlink:href="http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
+      <link xlink:href="https://web.archive.org/web/20160528180406/http://comments.gmane.org/gmane.linux.distributions.nixos/13447">Read
       policy here</link>.
      </para>
     </listitem>

From 79d39de93a1d2420cf9cd8cec933a7f4fdcc6320 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 00:12:44 -0700
Subject: [PATCH 1800/3370] ocamlPackages.ocurl: 0.8.0 -> 0.8.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ocurl/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.8.1 with grep in /nix/store/g76kv7vaw650ibv0rv7544biwpzrdisw-ocurl-0.8.1
- directory tree listing: https://gist.github.com/3093abaf0dd2e39a2eb0d107f14fe8db
- du listing: https://gist.github.com/6e66e0fd5554664ca460eaa3e19a44aa
---
 pkgs/development/ocaml-modules/ocurl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 73ffd7f41ea9..4b6bea31b40c 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -1,10 +1,10 @@
 { stdenv, pkgconfig, ocaml, findlib, fetchurl, curl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "ocurl-0.8.0";
+  name = "ocurl-0.8.1";
   src = fetchurl {
     url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz";
-    sha256 = "0292knvm9g038br0dc03lcsnbjqycyiqha256dp4bxkz3vmmz4wr";
+    sha256 = "08ldzbx1k3mbjc01fmzsn86ll4paf331bcjss6iig6y6hgc9q3ry";
   };
 
   buildInputs = [ pkgconfig ocaml findlib ncurses ];

From 0db951db83fba507899a2db163255f67a95d3440 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Mon, 14 May 2018 09:40:13 +0200
Subject: [PATCH 1801/3370] elan: 0.3.2 -> 0.5.0

---
 pkgs/applications/science/logic/elan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix
index a59528b86b0a..ff737de0cc4f 100644
--- a/pkgs/applications/science/logic/elan/default.nix
+++ b/pkgs/applications/science/logic/elan/default.nix
@@ -2,7 +2,7 @@
 
 rustPlatform.buildRustPackage rec {
   name = "elan-${version}";
-  version = "0.3.2";
+  version = "0.5.0";
 
   cargoSha256 = "01d3s47fjszxx8s5gr3haxq3kz3hswkrkr8x97wx8l4nfhm8ndd2";
 
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     owner = "kha";
     repo = "elan";
     rev = "v${version}";
-    sha256 = "13r110382dh7848lpn3mrhc5bgmj373sbpx1326ryx3wl5kfp8rs";
+    sha256 = "13zcqlyz0nwvd574llndrs7kvkznj6njljkq3v5j7kb3vndkj6i9";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6b93c2e7fffb9ce1eb4670d81d5119fbb94dccd4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 00:46:53 -0700
Subject: [PATCH 1802/3370] neomutt: 20180323 -> 20180512
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/neomutt/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512/bin/neomutt -h’ got 0 exit code
- ran ‘/nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512/bin/neomutt --help’ got 0 exit code
- ran ‘/nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512/bin/.neomutt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512/bin/.neomutt-wrapped --help’ got 0 exit code
- found 20180512 with grep in /nix/store/ww06xw1m1b0r4fy308kwa6vvj4cyy1yk-neomutt-20180512
- directory tree listing: https://gist.github.com/8d13b2cd77148163ee7c664ce4cdba07
- du listing: https://gist.github.com/9755eddec256452bf53913477fd2bebb
---
 .../applications/networking/mailreaders/neomutt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 7bd0ea70dc63..2ae58721188e 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -15,14 +15,14 @@ let
   '';
 
 in stdenv.mkDerivation rec {
-  version = "20180323";
+  version = "20180512";
   name = "neomutt-${version}";
 
   src = fetchFromGitHub {
     owner  = "neomutt";
     repo   = "neomutt";
     rev    = "neomutt-${version}";
-    sha256 = "0wxk1fqxk9pf2s43mw7diixv3hpwdry1cyr2xh119gqjc27lrc5w";
+    sha256 = "12779h2ich6w79bm2wgaaxd9hr6kpxavj4bdrnvm44a0r02kk2vl";
   };
 
   buildInputs = [
@@ -53,7 +53,7 @@ in stdenv.mkDerivation rec {
       --replace /etc/mime.types ${mime-types}/etc/mime.types
 
     # The string conversion tests all fail with the first version of neomutt
-    # that has tests (20180223) as well as 20180323 so we disable them for now.
+    # that has tests (20180223) as well as 20180512 so we disable them for now.
     # I don't know if that is related to the tests or our build environment.
     # Try again with a later release.
     sed -i '/rfc2047/d' test/Makefile.autosetup test/main.c

From b15375130fefc66e2cf8314515cb430c79c657db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Mon, 14 May 2018 09:51:59 +0200
Subject: [PATCH 1803/3370] clojure: 1.9.0.375 -> 1.9.0.381

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

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 4340b68d8f74..4843653e5dc2 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "clojure-${version}";
-  version = "1.9.0.375";
+  version = "1.9.0.381";
 
   src = fetchurl {
     url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz";
-    sha256 = "17a82dw5akhzlz4az9bh6s8rnz6nfgq50d8si0lwg212niq3c599";
+    sha256 = "18aqfjm6vbhlflxdnpcr9gib00zg2ys5hck4kfxr9rc4aylnn9pi";
   };
 
   buildInputs = [ makeWrapper ];

From d6974a11b2d0b4c5c92c40a2ef9f4ebe8abf86bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 00:58:38 -0700
Subject: [PATCH 1804/3370] mate.mate-panel: 1.20.1 -> 1.21.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mate-panel/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/mate-desktop-item-edit -h’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/mate-desktop-item-edit --help’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/mate-panel-test-applets -h’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/mate-panel-test-applets --help’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/.mate-desktop-item-edit-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/.mate-desktop-item-edit-wrapped --help’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/.mate-panel-test-applets-wrapped -h’ got 0 exit code
- ran ‘/nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0/bin/.mate-panel-test-applets-wrapped --help’ got 0 exit code
- found 1.21.0 with grep in /nix/store/2hb3j91z25jra21whapq7cpwsr7m4fj1-mate-panel-1.21.0
- directory tree listing: https://gist.github.com/ea7810820311098527d7248a349b1657
- du listing: https://gist.github.com/967206660f695b80197cc7440dee23d5
---
 pkgs/desktops/mate/mate-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index df1c15bddd37..c0c3cd48376e 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-panel-${version}";
-  version = "1.20.1";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1vmvn93apvq6r9m823zyrncbxgsjr4nmigw9k4s4n05z8zd8wy8k";
+    sha256 = "0vn523jscmxhyv80fmrnvk1wmyp4kdzr4g7yypqnsg4kg2gmr7x0";
   };
 
   nativeBuildInputs = [

From 32af5711895551fdf6804d2684f7e5e9ae503b60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 01:02:44 -0700
Subject: [PATCH 1805/3370] links: 2.15 -> 2.16

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/links2/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.16 with grep in /nix/store/bqfvaiwnj8bg69d0amarchz9yq7hsg8l-links2-2.16
- directory tree listing: https://gist.github.com/63794d9062d2bfacd2eb8e3d67b1e882
- du listing: https://gist.github.com/d1615a45d8130ac6fdfa50f96b788387
---
 pkgs/applications/networking/browsers/links2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 7c007e228f81..bb8eb83d6bf0 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.15";
+  version = "2.16";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "1jp3xyvp87a188b4kg5ycqahrazj7928zncgsznzn54w8d5iqahy";
+    sha256 = "0gsa2gpb1grhssl5jzpc5pa0zi21mxi8g25rh5bacl70slw31w42";
   };
 
   buildInputs = with stdenv.lib;

From c56dcb430d8c4c279699e0358bb09dc6e34278b4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 01:08:45 -0700
Subject: [PATCH 1806/3370] libsForQt5.mlt: 6.6.0 -> 6.8.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mlt/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/melt -h’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/melt --help’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/melt help’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/.melt-wrapped -h’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/.melt-wrapped --help’ got 0 exit code
- ran ‘/nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0/bin/.melt-wrapped help’ got 0 exit code
- found 6.8.0 with grep in /nix/store/xp3sq5n9xcqwibdcwlnw1kndc67ykpb9-mlt-6.8.0
- directory tree listing: https://gist.github.com/486acd53034e92704cc044a92c6e32ef
- du listing: https://gist.github.com/ff98100a51f78de609043361454df0b1
---
 pkgs/development/libraries/mlt/qt-5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix
index 27f7cf31cbf2..96b21601ccae 100644
--- a/pkgs/development/libraries/mlt/qt-5.nix
+++ b/pkgs/development/libraries/mlt/qt-5.nix
@@ -7,13 +7,13 @@ let inherit (stdenv.lib) getDev; in
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "6.6.0";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
+    sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8";
   };
 
   buildInputs = [

From 5d78859c15843cdbb1751806f5087c3cd5f887f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 01:53:22 -0700
Subject: [PATCH 1807/3370] libmediainfo: 18.03.1 -> 18.05

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libmediainfo/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 18.05 with grep in /nix/store/5qyyi56b38pqwkrz245xv8skn3bsflzg-libmediainfo-18.05
- directory tree listing: https://gist.github.com/74cf8ceacead58990e67775b627a172a
- du listing: https://gist.github.com/a515ce2cc6f6d9f886c1948aa1d3e561
---
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 8c204ba4006f..3ba513f90781 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.03.1";
+  version = "18.05";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "183gcb6h81blgvssfl5lxsv8h5izkgg6b86z0jy9g699adgkchq2";
+    sha256 = "08ajrmbvqn2cvfq3jjdh64lma77kx4di5vg632c6bmbir89rcxbn";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From fe501325560db749caab02e9987f8ea51d0d26a8 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 14 May 2018 17:32:10 +0800
Subject: [PATCH 1808/3370] kde-applications: 18.04.0 -> 18.04.1

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

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index a2feeac7cd9f..0646e258b40e 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/18.04.0/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/18.04.1/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 36c18a3f9979..5514345057d6 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1699 +3,1699 @@
 
 {
   akonadi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-18.04.0.tar.xz";
-      sha256 = "1scbc6k2w23qmw4qa147ji7r6p88b97yi9wr46xlshgcn2kj684d";
-      name = "akonadi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-18.04.1.tar.xz";
+      sha256 = "0dg0r49angzkp5b09zbxjygjaxn1d50db15rwm7v9xsnz6fmc6hv";
+      name = "akonadi-18.04.1.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-18.04.0.tar.xz";
-      sha256 = "09fk8n69f83ygwfsdjx4mv9hwqpifpv9nbdnl19pjgw2ffp99rna";
-      name = "akonadi-calendar-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-calendar-18.04.1.tar.xz";
+      sha256 = "0anmy67dc85afc0aq6y813c6xjr0jnkzsh56889zyz8z7k9xpg2q";
+      name = "akonadi-calendar-18.04.1.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-calendar-tools-18.04.0.tar.xz";
-      sha256 = "1b10kybjj803qwsz74dhism6q7q0lmslqvsb8b9ma8wqk9ajs33f";
-      name = "akonadi-calendar-tools-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-calendar-tools-18.04.1.tar.xz";
+      sha256 = "1935d5nwq2s8ijc9nzp7rdsmbyl2b42xwx0vj7cz1835y4w3k2vn";
+      name = "akonadi-calendar-tools-18.04.1.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadiconsole-18.04.0.tar.xz";
-      sha256 = "053w5ywm8wlv7ssbvyq0z36jsir9mk0ywlqb0ybnlbvr5dawxnnz";
-      name = "akonadiconsole-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadiconsole-18.04.1.tar.xz";
+      sha256 = "032r5r5ksifigx8bk82yygvhji1xjx3dd6i7z7mpx5qlc1zmqjpk";
+      name = "akonadiconsole-18.04.1.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-contacts-18.04.0.tar.xz";
-      sha256 = "01cfxia8vnwizzavk1vbrxbszsyg1sa3qbz79fab7iw8380zqdm2";
-      name = "akonadi-contacts-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-contacts-18.04.1.tar.xz";
+      sha256 = "1y1qcndsrdphii048cpwnfnd185mywcaw1h1szq71q2ww2aapcmp";
+      name = "akonadi-contacts-18.04.1.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-import-wizard-18.04.0.tar.xz";
-      sha256 = "123gaxs5zi5b8x1ripr8ldjipx6rpmr3f51mgv40ibx1h967in19";
-      name = "akonadi-import-wizard-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-import-wizard-18.04.1.tar.xz";
+      sha256 = "150i8m7ngb6kdyixvzfgnjwyrs2xpsd53gy2x28091kg2kqb0nl4";
+      name = "akonadi-import-wizard-18.04.1.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-mime-18.04.0.tar.xz";
-      sha256 = "14xgi5saylbp19gg0lnqpasz5x335wz6dnmpfsicz0j5452yfznw";
-      name = "akonadi-mime-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-mime-18.04.1.tar.xz";
+      sha256 = "0ypfbrr8h2nypdyg8xxs4d53qlbq4kd3ph2yhafp80577xwhqgmw";
+      name = "akonadi-mime-18.04.1.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-notes-18.04.0.tar.xz";
-      sha256 = "0ahr185jjyh68qf57vaja6c867rm0iy8jp78g4nmzf3dc6y7r01v";
-      name = "akonadi-notes-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-notes-18.04.1.tar.xz";
+      sha256 = "0f4q6ls7z5ikf46v7m0wazdczay8y3yvscw1lnmq5qwnvdfyqcpd";
+      name = "akonadi-notes-18.04.1.tar.xz";
     };
   };
   akonadi-search = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akonadi-search-18.04.0.tar.xz";
-      sha256 = "1jn23rr9yah2c4cccbkcvxn4rr6p0q4327b0kwjqzag4lkwd2fy0";
-      name = "akonadi-search-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akonadi-search-18.04.1.tar.xz";
+      sha256 = "01mfj7s3kx5kcjbvj4hljfrmsbpfmfiq0r87cgzg6734c4mzjqsl";
+      name = "akonadi-search-18.04.1.tar.xz";
     };
   };
   akregator = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/akregator-18.04.0.tar.xz";
-      sha256 = "10hid155gszwh7gxp4pqbcfch6hrf0bsikj8ah2fvdgii96dn9gc";
-      name = "akregator-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/akregator-18.04.1.tar.xz";
+      sha256 = "0h5pdbrwxa3n086yywqsm0m8x9p1s5jy2hgjivdilxgwnqcj6zpv";
+      name = "akregator-18.04.1.tar.xz";
     };
   };
   analitza = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/analitza-18.04.0.tar.xz";
-      sha256 = "1yx18mbxvkswpn120rhi092l5wz6s60194q076wdgimx71ngn2v2";
-      name = "analitza-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/analitza-18.04.1.tar.xz";
+      sha256 = "09y3zz6zn3cs5nn0i0dcx71jrm0lzz3g8af6nz118m6rz71wndnq";
+      name = "analitza-18.04.1.tar.xz";
     };
   };
   ark = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ark-18.04.0.tar.xz";
-      sha256 = "19bh71j5dvz80mz9xff4ygd0qdvjwsihyx5cb5ay6a2gdf1fhm12";
-      name = "ark-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ark-18.04.1.tar.xz";
+      sha256 = "10gpm90zsssygl65280z4p43ma75qjswiyv4drlrksydakxvvxk3";
+      name = "ark-18.04.1.tar.xz";
     };
   };
   artikulate = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/artikulate-18.04.0.tar.xz";
-      sha256 = "1fqv71przn3yfv4dk511bh5bd0cdmwkixwcg17r037nmj3z0xdhg";
-      name = "artikulate-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/artikulate-18.04.1.tar.xz";
+      sha256 = "0brpb7ijqib7qp5ypvz9gkai7mwdxf915a7makklgzg80mdqnxpv";
+      name = "artikulate-18.04.1.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/audiocd-kio-18.04.0.tar.xz";
-      sha256 = "0rf8gk8wymk6lff5g4ivx5lfl31rml1ag40fq78nrvnw0sxkm2b1";
-      name = "audiocd-kio-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/audiocd-kio-18.04.1.tar.xz";
+      sha256 = "1g3waj7xb14fgb75b0zzhbai93yqv5r1p0n0j3rwhfg9bvkgqgpa";
+      name = "audiocd-kio-18.04.1.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/baloo-widgets-18.04.0.tar.xz";
-      sha256 = "1y1wxgwyjdarw6sj7mrsqgljh2fib0vcwwd0nzbnn8ys1v8gqyxj";
-      name = "baloo-widgets-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/baloo-widgets-18.04.1.tar.xz";
+      sha256 = "1bq2n7lpldi2qiwdgx6l78m41whdjd41n1247985d1cr62bsn5cq";
+      name = "baloo-widgets-18.04.1.tar.xz";
     };
   };
   blinken = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/blinken-18.04.0.tar.xz";
-      sha256 = "19chf9d9d537a5daqca1i4a58gmxz98x4i5palqs3635w1655ln9";
-      name = "blinken-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/blinken-18.04.1.tar.xz";
+      sha256 = "0sgaipxfzwjfikyj2r47vp0192s8v0zll2x61i9z6p6lzq7glw0j";
+      name = "blinken-18.04.1.tar.xz";
     };
   };
   bomber = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/bomber-18.04.0.tar.xz";
-      sha256 = "1vzqmjkxlw2v63f49ix63p6ypjgg31j8r0rzmq8m41262m3pp0sn";
-      name = "bomber-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/bomber-18.04.1.tar.xz";
+      sha256 = "13ivb42jq2864vdpajds3cwjhhml7ikww66z1r6j4wp8mlmdlnal";
+      name = "bomber-18.04.1.tar.xz";
     };
   };
   bovo = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/bovo-18.04.0.tar.xz";
-      sha256 = "1p4s7kjrjndcqkrkk3y7dqvyfdrn1yy5id3z3wj06ciwpygvv500";
-      name = "bovo-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/bovo-18.04.1.tar.xz";
+      sha256 = "1lm465vcmf4glql9krxl36sr6msgayqkzinammw9ian1wmih9qbn";
+      name = "bovo-18.04.1.tar.xz";
     };
   };
   calendarsupport = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/calendarsupport-18.04.0.tar.xz";
-      sha256 = "0hd1pbqjd75d8fm86b358xd8dni019b2190ly2r3armanjcmdc4r";
-      name = "calendarsupport-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/calendarsupport-18.04.1.tar.xz";
+      sha256 = "02zw1hyqwy031bg0nyxjvayjfamm0z9iw9v9f71hfrsi9siyf77a";
+      name = "calendarsupport-18.04.1.tar.xz";
     };
   };
   cantor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/cantor-18.04.0.tar.xz";
-      sha256 = "1zkpa0ihkylzdf5wlywdvnf34dk21nj5cyczjyh9x5psbr6q0151";
-      name = "cantor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/cantor-18.04.1.tar.xz";
+      sha256 = "1hcdf755yzs8kz6qbxan47gn622pg137sqabfbvqjflnphzz7f08";
+      name = "cantor-18.04.1.tar.xz";
     };
   };
   cervisia = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/cervisia-18.04.0.tar.xz";
-      sha256 = "1ji8i0k6rzmgshpgpk613vkn6kvdwb0ns32cp19j0bd5ljr701wq";
-      name = "cervisia-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/cervisia-18.04.1.tar.xz";
+      sha256 = "03slkk30k747f73dk98q4b930m7w1cimim053hl9y50n1c63n021";
+      name = "cervisia-18.04.1.tar.xz";
     };
   };
   dolphin = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/dolphin-18.04.0.tar.xz";
-      sha256 = "0lvdpa3mq6mhfl97a4q1wwg22zccwjf7ja1mbz1dlbjfnck8l1mm";
-      name = "dolphin-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/dolphin-18.04.1.tar.xz";
+      sha256 = "11wm2wqmkni798xj6g8z7r6qyfy6db9k7xwnp90k2g1qb5n0xnsh";
+      name = "dolphin-18.04.1.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/dolphin-plugins-18.04.0.tar.xz";
-      sha256 = "10kdf2h8i1jnbsnx9j4c8zs6ryakinhxrggrid038xqgxm4fyxcq";
-      name = "dolphin-plugins-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/dolphin-plugins-18.04.1.tar.xz";
+      sha256 = "00azpyy8xh0d62vayj04l3cbwxgxax430wh35jbv828vng3d2pfc";
+      name = "dolphin-plugins-18.04.1.tar.xz";
     };
   };
   dragon = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/dragon-18.04.0.tar.xz";
-      sha256 = "0maxlhac9znqsm7qf3c9g7vlramivy63wd8c9aj64c78jqj6l54w";
-      name = "dragon-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/dragon-18.04.1.tar.xz";
+      sha256 = "1phrgssp3x11dmg07yvyi1hsmigfw8q6bblsizr9xm0pvmgrdjl0";
+      name = "dragon-18.04.1.tar.xz";
     };
   };
   eventviews = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/eventviews-18.04.0.tar.xz";
-      sha256 = "0ai0259ygriza057dn3l6kfapqc2zdp7prv7qrz0x2akssnvn5f3";
-      name = "eventviews-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/eventviews-18.04.1.tar.xz";
+      sha256 = "0jq1adi764a4w1kszhbdm49dylbwai4ipasjyrkqnf85xly48g40";
+      name = "eventviews-18.04.1.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ffmpegthumbs-18.04.0.tar.xz";
-      sha256 = "08hirsm7gbk51i76kkavv50z3289zvphmkfh26lh6rg123f003i6";
-      name = "ffmpegthumbs-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ffmpegthumbs-18.04.1.tar.xz";
+      sha256 = "06ls31wxgvnc4c7bc3ba14w4w64b9x37q3zmcnslyydghhnr0qnn";
+      name = "ffmpegthumbs-18.04.1.tar.xz";
     };
   };
   filelight = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/filelight-18.04.0.tar.xz";
-      sha256 = "1mk46a9x40yj7vfjgprhdhmx151lhkv8zb1i4rks01zjpq8bpa43";
-      name = "filelight-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/filelight-18.04.1.tar.xz";
+      sha256 = "1w169433m5823h1axn4ami9hk4rimi87ypiqagyyl13bncb7s6as";
+      name = "filelight-18.04.1.tar.xz";
     };
   };
   granatier = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/granatier-18.04.0.tar.xz";
-      sha256 = "1vfp4wqv13qxj5vaiqd6hn07hvmdkyrcdicxn693yprn32gqrn33";
-      name = "granatier-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/granatier-18.04.1.tar.xz";
+      sha256 = "0q5a2w2bz40qnk7jpcknsc4758k91cd1rh3rxa4v4wlq51id7lzz";
+      name = "granatier-18.04.1.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/grantlee-editor-18.04.0.tar.xz";
-      sha256 = "04mw1mskfaqp7klwc0bdwfm3j365pwkwi0yhp86dggxzyisqbx9h";
-      name = "grantlee-editor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/grantlee-editor-18.04.1.tar.xz";
+      sha256 = "0ysirk51y993jxvvk98h2r9awsc4zyijavfja6zl0gsnvwwrjnjs";
+      name = "grantlee-editor-18.04.1.tar.xz";
     };
   };
   grantleetheme = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/grantleetheme-18.04.0.tar.xz";
-      sha256 = "1i3axg318skx2ifg8fln5blpyj6qnzb0r7frqb9prm0rawk6cr03";
-      name = "grantleetheme-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/grantleetheme-18.04.1.tar.xz";
+      sha256 = "0gzsxxywaqs6lc111hsw736p6gz55xs77v9bpk48igk37r9a0rs8";
+      name = "grantleetheme-18.04.1.tar.xz";
     };
   };
   gwenview = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/gwenview-18.04.0.tar.xz";
-      sha256 = "0i87k3f1g9w36rzr60c2xw6r41k7zgnbda51mpd3i8q5mvi8r4z5";
-      name = "gwenview-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/gwenview-18.04.1.tar.xz";
+      sha256 = "0wyxwqsf2nynz4h87lgy1xla8nj7mi94b997pmp70jzy4936l8bi";
+      name = "gwenview-18.04.1.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/incidenceeditor-18.04.0.tar.xz";
-      sha256 = "1z76lz8h0f6h81xvk690h1pz6i1ca4k2kcdvxxj99xm3fxdw5gi4";
-      name = "incidenceeditor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/incidenceeditor-18.04.1.tar.xz";
+      sha256 = "0kc18pml59mhn9bn0g96mw46dmxq7crgn4033dxsfczak0kdr474";
+      name = "incidenceeditor-18.04.1.tar.xz";
     };
   };
   juk = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/juk-18.04.0.tar.xz";
-      sha256 = "0k0kiksqmnp14y3ymfiwg0amv4wyk2ls4cbdimbwg0mvpyvfnnqa";
-      name = "juk-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/juk-18.04.1.tar.xz";
+      sha256 = "01zgxxx00hxag29883xfgw4r0m4j66iwr83bap55ni018xgkf4c3";
+      name = "juk-18.04.1.tar.xz";
     };
   };
   k3b = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/k3b-18.04.0.tar.xz";
-      sha256 = "167x2mcxj4zq05brxzvhm157sis13xahkv79i9pzbgjb1zx17s3l";
-      name = "k3b-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/k3b-18.04.1.tar.xz";
+      sha256 = "0py84q63r40mh8pp0r70gzwidfxv9kj5firvr7pp59rk9fsxznl7";
+      name = "k3b-18.04.1.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kaccounts-integration-18.04.0.tar.xz";
-      sha256 = "09l1ycy4000mxx86hkqigbg803190r159d2yjsfrs7q5i2jrsl09";
-      name = "kaccounts-integration-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kaccounts-integration-18.04.1.tar.xz";
+      sha256 = "1abyhaa7gj2admk6kf555sbwzc7yha3ql41dhw4j3k6kpzkqk9zj";
+      name = "kaccounts-integration-18.04.1.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kaccounts-providers-18.04.0.tar.xz";
-      sha256 = "07ra8pjd89qklvb771wcczbxwll86caz07v43a7fhs3f70nwizia";
-      name = "kaccounts-providers-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kaccounts-providers-18.04.1.tar.xz";
+      sha256 = "15ygghq434qkj1z5iislm8fz0m8z6rkpiyrcjbmqs0cw4s0mqzp6";
+      name = "kaccounts-providers-18.04.1.tar.xz";
     };
   };
   kaddressbook = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kaddressbook-18.04.0.tar.xz";
-      sha256 = "0fi5nxhp93i1j4dym2yjsnvbxkqvqlanka3cnzbya4abdzrjd9ir";
-      name = "kaddressbook-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kaddressbook-18.04.1.tar.xz";
+      sha256 = "0w02gc9l8jhzf15ljig83ddbkzf430k1qbqp821b3rz5s20gg4m5";
+      name = "kaddressbook-18.04.1.tar.xz";
     };
   };
   kajongg = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kajongg-18.04.0.tar.xz";
-      sha256 = "0cbgy6zkjd5yd6ybm9v7gvp2hs99m7m8w2my36fqp1sczghjs7x5";
-      name = "kajongg-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kajongg-18.04.1.tar.xz";
+      sha256 = "1vpkj42ylzpakrqy84hkp0hvj4q4x7wnarwwqqj8xp4xi40na481";
+      name = "kajongg-18.04.1.tar.xz";
     };
   };
   kalarm = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kalarm-18.04.0.tar.xz";
-      sha256 = "0v4zfv48n116j68cfd34vlgk9jyr1zfc8i36i7gjkaq2x9m80g02";
-      name = "kalarm-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kalarm-18.04.1.tar.xz";
+      sha256 = "0v6maszs79959jkciy5j9xnqggr9ymjzvsibr1j5s30kynlzpxkm";
+      name = "kalarm-18.04.1.tar.xz";
     };
   };
   kalarmcal = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kalarmcal-18.04.0.tar.xz";
-      sha256 = "0npvwjzrxyf447xyq4kbx5wh94fv7clfjvikwnla9l0s8xwv9gf7";
-      name = "kalarmcal-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kalarmcal-18.04.1.tar.xz";
+      sha256 = "1j04wdb6vg2896hb8y28lm8sna0lil8021i2kw97crfhramldvjk";
+      name = "kalarmcal-18.04.1.tar.xz";
     };
   };
   kalgebra = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kalgebra-18.04.0.tar.xz";
-      sha256 = "0qk9dchqlklbxssmhfz38s792nidlfh1bkhrmxh5kvpkjziqg7k6";
-      name = "kalgebra-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kalgebra-18.04.1.tar.xz";
+      sha256 = "0gg1fb4cgnnrxyrm554847kpa1bs57zgi9ia8f9wmcivyd35vvyf";
+      name = "kalgebra-18.04.1.tar.xz";
     };
   };
   kalzium = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kalzium-18.04.0.tar.xz";
-      sha256 = "02c51r4pqj9iyy2wzrilpzd5z8b1lvbv2mian2qr1psi56l3magv";
-      name = "kalzium-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kalzium-18.04.1.tar.xz";
+      sha256 = "00x2jql639rmbvcfj72yjmfb98f9msfwi2g2mqyww43ja3c835ic";
+      name = "kalzium-18.04.1.tar.xz";
     };
   };
   kamera = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kamera-18.04.0.tar.xz";
-      sha256 = "07p51jjp0lj04gfs1mfbg6k6cdh6ms55yjcag7qhcz32ism0y1vc";
-      name = "kamera-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kamera-18.04.1.tar.xz";
+      sha256 = "1ra7hdvs6fnkbzqvm5sryk6ymlgj0ngsg98yhznda0qvrrkgfahg";
+      name = "kamera-18.04.1.tar.xz";
     };
   };
   kamoso = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kamoso-18.04.0.tar.xz";
-      sha256 = "1d7989jr3g02yh10hmnf8mlqypp35xll52v5q6jjqrzbfcmna7dk";
-      name = "kamoso-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kamoso-18.04.1.tar.xz";
+      sha256 = "1rd08647zx2k7xq8jclxsk0dgjgdaih6fxmnrd7awzjmj0qh89a7";
+      name = "kamoso-18.04.1.tar.xz";
     };
   };
   kanagram = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kanagram-18.04.0.tar.xz";
-      sha256 = "1drz8641ns1c1070a98w2wasyvf5nc6jrpn1pzfqmv9bljxrmyrc";
-      name = "kanagram-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kanagram-18.04.1.tar.xz";
+      sha256 = "0g4zmr10jq9vw92z9nbfvigz6pbjg1p1zc1aspwlh38ajk8sr3gb";
+      name = "kanagram-18.04.1.tar.xz";
     };
   };
   kapman = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kapman-18.04.0.tar.xz";
-      sha256 = "0cpsm35sah99rxy42v5isd90w0j839537jmjck4lg40dx38sdz7m";
-      name = "kapman-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kapman-18.04.1.tar.xz";
+      sha256 = "14s2kg50r9nlg53vsi1x59kc8z1rgnqcq028a6zwfnv0sdsa7pw5";
+      name = "kapman-18.04.1.tar.xz";
     };
   };
   kapptemplate = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kapptemplate-18.04.0.tar.xz";
-      sha256 = "1w61s7bj34vq3s9ca3d6kyv9k43qirnyj4mw73wfpxf6ldx19yzp";
-      name = "kapptemplate-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kapptemplate-18.04.1.tar.xz";
+      sha256 = "064pw1fkbm52pkcg9hyay8mkraw3fdlycgx306p9brahvxb9xjsb";
+      name = "kapptemplate-18.04.1.tar.xz";
     };
   };
   kate = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kate-18.04.0.tar.xz";
-      sha256 = "04kb8ynkq6xwmjbrgfg4zv652p3zgr2127f6sb8sq0j9qy55pvq5";
-      name = "kate-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kate-18.04.1.tar.xz";
+      sha256 = "1xbckjsp5imxcda8vrdb5flgb5sjmdylwy1yr5v01nilmqgpmwa8";
+      name = "kate-18.04.1.tar.xz";
     };
   };
   katomic = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/katomic-18.04.0.tar.xz";
-      sha256 = "119v88k2l1bpmf1gm9njkfv90pv595wwjlzkap06c6rx95scpi0q";
-      name = "katomic-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/katomic-18.04.1.tar.xz";
+      sha256 = "0g3kkibgnxkg5zxgja7rqad57fpw28qapf8rlbczkmxls581ifw6";
+      name = "katomic-18.04.1.tar.xz";
     };
   };
   kbackup = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kbackup-18.04.0.tar.xz";
-      sha256 = "0vayj48zgblsphwffs6b0xphzair6sywy0ksp6ab9x64n8f1mw5q";
-      name = "kbackup-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kbackup-18.04.1.tar.xz";
+      sha256 = "1gv5m4d6zcadamcicllfp8smm7k4846a2qy4pgm006lhk390bsyz";
+      name = "kbackup-18.04.1.tar.xz";
     };
   };
   kblackbox = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kblackbox-18.04.0.tar.xz";
-      sha256 = "1gpjnic6n4kyh7b6x0mb9162qv223fs6lm7iqh6qxwkixcp06qlx";
-      name = "kblackbox-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kblackbox-18.04.1.tar.xz";
+      sha256 = "0hv6ziw2dy88fbc1z0vlflagsrr7x97r9c5l4w9v4acr0ih7ms7h";
+      name = "kblackbox-18.04.1.tar.xz";
     };
   };
   kblocks = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kblocks-18.04.0.tar.xz";
-      sha256 = "1y2h1nwgr67b05ggl2v34jh097mzbljhz9ji332xv4vf2rffwqar";
-      name = "kblocks-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kblocks-18.04.1.tar.xz";
+      sha256 = "12339f1g73h3qg9a21kqmkqp6ywiw1gvnwdww45dzflf4w931lsw";
+      name = "kblocks-18.04.1.tar.xz";
     };
   };
   kblog = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kblog-18.04.0.tar.xz";
-      sha256 = "1jnsd6fw3pyip71a2cw65y9yrm4zwczh0770n15jcg5yn5whswgs";
-      name = "kblog-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kblog-18.04.1.tar.xz";
+      sha256 = "1gndfvny1zh2w1daxmpix5sn2wlbc2430m3a21lvgp3qmhb5rwkr";
+      name = "kblog-18.04.1.tar.xz";
     };
   };
   kbounce = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kbounce-18.04.0.tar.xz";
-      sha256 = "15926m75gysd6gl2vg7d08y4m0cnfazc9jlyx0cnb8a5nfzh5z21";
-      name = "kbounce-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kbounce-18.04.1.tar.xz";
+      sha256 = "0qjbzmjgcvxbpvbqxyyh02pk5hr6z871n13awsq770xwbr1pdnwc";
+      name = "kbounce-18.04.1.tar.xz";
     };
   };
   kbreakout = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kbreakout-18.04.0.tar.xz";
-      sha256 = "0i5pbiimrn2bkq94ggwlx7jhfw4wna5srgffa5531jpn28gq456n";
-      name = "kbreakout-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kbreakout-18.04.1.tar.xz";
+      sha256 = "0yr9hwlwdp1fi2parzniyq5rfv4fxbxxs63xfggaz7ndbm1h8bif";
+      name = "kbreakout-18.04.1.tar.xz";
     };
   };
   kbruch = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kbruch-18.04.0.tar.xz";
-      sha256 = "0s7r0hqy4nyrg0ndrb93pd8akldc5k8xx31m4jc8gi23aqvz5wwk";
-      name = "kbruch-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kbruch-18.04.1.tar.xz";
+      sha256 = "08wb7f2jhz3dkx22sj2k4sairl715nrk7c2swd88dcaskcy411nk";
+      name = "kbruch-18.04.1.tar.xz";
     };
   };
   kcachegrind = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcachegrind-18.04.0.tar.xz";
-      sha256 = "0f6f8wx0kffhhzjjcdn47m3428jbh95nzajm8vhbs789h69ax2a0";
-      name = "kcachegrind-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcachegrind-18.04.1.tar.xz";
+      sha256 = "1mig7xm67w3vwslymbfm51w8w9cnqzk41kqp998j6g7dfrh8476g";
+      name = "kcachegrind-18.04.1.tar.xz";
     };
   };
   kcalc = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcalc-18.04.0.tar.xz";
-      sha256 = "03q09q5whg1wfgm30p426hlljignjs0lvwfak2n4ka9ggyk3vc9d";
-      name = "kcalc-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcalc-18.04.1.tar.xz";
+      sha256 = "14j2w9w31cqmsls3zrgifywbz5bxkzkryggfd1jxiz9q526ylpxy";
+      name = "kcalc-18.04.1.tar.xz";
     };
   };
   kcalcore = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcalcore-18.04.0.tar.xz";
-      sha256 = "0g4gm47yniy4f11v6rhs3gp2lk8dcrnw8ajchz88s7spii0riv2m";
-      name = "kcalcore-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcalcore-18.04.1.tar.xz";
+      sha256 = "0q23pb9pkii6czk3angl3xzlzc90fck1pwc05695rz90iwbxq62x";
+      name = "kcalcore-18.04.1.tar.xz";
     };
   };
   kcalutils = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcalutils-18.04.0.tar.xz";
-      sha256 = "1hh3gd81bfkbyr7qvppk8iaywac77y55rwkpvbvin62snipw6ap1";
-      name = "kcalutils-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcalutils-18.04.1.tar.xz";
+      sha256 = "05ma56f0ly8nq62p6nlzkscdq5m93142kakhqrsl17c902bvkcmm";
+      name = "kcalutils-18.04.1.tar.xz";
     };
   };
   kcharselect = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcharselect-18.04.0.tar.xz";
-      sha256 = "08qgwfz23634wv0fw0rx162rcav5fivsp63srdf4c6my5151nxa9";
-      name = "kcharselect-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcharselect-18.04.1.tar.xz";
+      sha256 = "0pv22v1x3n73rxzpihsxz5xxy1c37lq72jcscwylwmwfyszmvdwx";
+      name = "kcharselect-18.04.1.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcolorchooser-18.04.0.tar.xz";
-      sha256 = "02lqg4ra2nrkfnlhirs148bsd3b5a1j81s9z84wg11z8havrabfn";
-      name = "kcolorchooser-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcolorchooser-18.04.1.tar.xz";
+      sha256 = "1wzy9a3pz0jwwmgbqxqlfii0faascrxnxq398wzrnx955shlksbm";
+      name = "kcolorchooser-18.04.1.tar.xz";
     };
   };
   kcontacts = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcontacts-18.04.0.tar.xz";
-      sha256 = "0ja9xbpvv6klwwg0rzppxhfj2nfb7dydadxw5f9471rzniywn1xb";
-      name = "kcontacts-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcontacts-18.04.1.tar.xz";
+      sha256 = "0725cad646qzpgpvxl0vyb1a4hpbk0b6zb3wbdim4al56y7x1rxh";
+      name = "kcontacts-18.04.1.tar.xz";
     };
   };
   kcron = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kcron-18.04.0.tar.xz";
-      sha256 = "0pm532pajm7kbzg7w7azi5qx5xnkc9k5crxbahpw8n32lq34lm18";
-      name = "kcron-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kcron-18.04.1.tar.xz";
+      sha256 = "1wlk36s6i53vk4crrvijbfmagh5d8sjbmcacdwdcf4vlb56kxphr";
+      name = "kcron-18.04.1.tar.xz";
     };
   };
   kdav = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdav-18.04.0.tar.xz";
-      sha256 = "159bll2b3anxj5i7i92cqsz7hqm66n5ihlzk1g7waqdc9b429hr2";
-      name = "kdav-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdav-18.04.1.tar.xz";
+      sha256 = "16abp767h4rs35yj0j8kgmhm4k09cidnsmh1ihx2b53ya1ivmv9b";
+      name = "kdav-18.04.1.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdebugsettings-18.04.0.tar.xz";
-      sha256 = "0fr5a0k9jv8zkzv7fl7r71c2gbd1jj3c0vwpyf5riskymznnrx9g";
-      name = "kdebugsettings-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdebugsettings-18.04.1.tar.xz";
+      sha256 = "1bz5wcap6kqjv6164zm7wcm31q634785lqlarsc5hqld5xjgr7ig";
+      name = "kdebugsettings-18.04.1.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kde-dev-scripts-18.04.0.tar.xz";
-      sha256 = "0nnrzpqgzmfg3msx6vqc8js7yzdpscm9599pr4xs4jl4cx5m8vp8";
-      name = "kde-dev-scripts-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kde-dev-scripts-18.04.1.tar.xz";
+      sha256 = "08wsj1h44lmvvv43k9l3mxvi2hr498hz3d22z0bwcdjaqgvy60r5";
+      name = "kde-dev-scripts-18.04.1.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kde-dev-utils-18.04.0.tar.xz";
-      sha256 = "020dyzf078l91rs7sl1dkdbd08viizinsmbvf1f0kfbkfysccfci";
-      name = "kde-dev-utils-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kde-dev-utils-18.04.1.tar.xz";
+      sha256 = "13wpa4xrkm3711vdwjkklibaf7as64klw4hpq9s9vx33ma73sf9a";
+      name = "kde-dev-utils-18.04.1.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdeedu-data-18.04.0.tar.xz";
-      sha256 = "0rx9ymyv6x29fwl6hvznvylq6gvw992rg3l8mk4qmmzjs4rbjb5q";
-      name = "kdeedu-data-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdeedu-data-18.04.1.tar.xz";
+      sha256 = "1ccf8bjd2fc2chgf63bwg91c0r4acxf40w81rssi83wjvnhg4d5j";
+      name = "kdeedu-data-18.04.1.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-mobipocket-18.04.0.tar.xz";
-      sha256 = "01g00k3yqsrahslshybd1azd9w0vgmacfs0yrz5ia93amw4azfhn";
-      name = "kdegraphics-mobipocket-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdegraphics-mobipocket-18.04.1.tar.xz";
+      sha256 = "1y9bjnpbpriyhs007wli7m0q5g9wv2d7izp0qxk4xzmrrw7k5v51";
+      name = "kdegraphics-mobipocket-18.04.1.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdegraphics-thumbnailers-18.04.0.tar.xz";
-      sha256 = "1j04bwp9hc9jc7si6jgg4y61jqic27zj094nv2xpwrxnnaz4y4nh";
-      name = "kdegraphics-thumbnailers-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdegraphics-thumbnailers-18.04.1.tar.xz";
+      sha256 = "06798hwxyd2xvf3aiigwzd53frzi0mqxsbxliznqxxjvk5lcp1ha";
+      name = "kdegraphics-thumbnailers-18.04.1.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdenetwork-filesharing-18.04.0.tar.xz";
-      sha256 = "1qfd7jr171bc4alm139hhdiv9q0x8y7mhrkyb7qspr7a8ki8j5cg";
-      name = "kdenetwork-filesharing-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdenetwork-filesharing-18.04.1.tar.xz";
+      sha256 = "18dilp18312v1zbrfq5rq223s6cy2lmdmgvp2hg5a25rmldw1yiw";
+      name = "kdenetwork-filesharing-18.04.1.tar.xz";
     };
   };
   kdenlive = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdenlive-18.04.0.tar.xz";
-      sha256 = "0v54cisilijdq0hyl38fhz0m7lpvphqjvx046ighcqxbrcg6pgah";
-      name = "kdenlive-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdenlive-18.04.1.tar.xz";
+      sha256 = "059xqybn3r1w432mbnxx5ds1whj5x23ym2lm90wg23b9hmmmhxl3";
+      name = "kdenlive-18.04.1.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdepim-addons-18.04.0.tar.xz";
-      sha256 = "0rcfx07cvpm22kskwry78wzhglpc0vzxavmjydi24lll9ac12mvc";
-      name = "kdepim-addons-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdepim-addons-18.04.1.tar.xz";
+      sha256 = "1qninnlhwmkw6nxxymjww1x7krm87nz5m6p66y3ghrgyl0q16k7b";
+      name = "kdepim-addons-18.04.1.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdepim-apps-libs-18.04.0.tar.xz";
-      sha256 = "1ax5y6cdw7klgxky121mk8ilpm257bc8h90pc89ziha888l39wgz";
-      name = "kdepim-apps-libs-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdepim-apps-libs-18.04.1.tar.xz";
+      sha256 = "1a41km8nhgrc24qlgh64560p8il6q9dlcmy25x92s1xmpn1zg1lc";
+      name = "kdepim-apps-libs-18.04.1.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdepim-runtime-18.04.0.tar.xz";
-      sha256 = "1pxbrr3rcm3yr7il5abz9r06xvd0j1hsphbskjyphylb3r0xv7mz";
-      name = "kdepim-runtime-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdepim-runtime-18.04.1.tar.xz";
+      sha256 = "0gl2wkkaxpz13rg6zyclcjkc0i7qwqwxcvamgb3cl6l6qkp869w1";
+      name = "kdepim-runtime-18.04.1.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdesdk-kioslaves-18.04.0.tar.xz";
-      sha256 = "18w55iism0b26m6v1j6qlpa4y8zdc12bbc8hi8rwz6nyra2a4r6h";
-      name = "kdesdk-kioslaves-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdesdk-kioslaves-18.04.1.tar.xz";
+      sha256 = "1mx3pg36mx0b6v2kq3a3spxm40rdk4bgkhzzjwphppqkxc57bgln";
+      name = "kdesdk-kioslaves-18.04.1.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdesdk-thumbnailers-18.04.0.tar.xz";
-      sha256 = "1gsfn3km6dggnwav17vrbv077dj6xsxixjqrypqf8v5n29vzl72g";
-      name = "kdesdk-thumbnailers-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdesdk-thumbnailers-18.04.1.tar.xz";
+      sha256 = "0s07h5kfl2h2w0qarz28362n92jdbbq7iw4cy93p949mp6jz1xij";
+      name = "kdesdk-thumbnailers-18.04.1.tar.xz";
     };
   };
   kdf = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdf-18.04.0.tar.xz";
-      sha256 = "1dxm9q25a9vjja3cx7zd9afx08i84l498sykbnvflf56qq6p9jdv";
-      name = "kdf-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdf-18.04.1.tar.xz";
+      sha256 = "1hmq92vglivs9q536g3qx0b7v3g7nlvkly81p8brqs55cw0npf8d";
+      name = "kdf-18.04.1.tar.xz";
     };
   };
   kdialog = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdialog-18.04.0.tar.xz";
-      sha256 = "0ni5imk1a153j4n923im3rs3g691cwlw3g180wcarrg7iads6icn";
-      name = "kdialog-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdialog-18.04.1.tar.xz";
+      sha256 = "0xmdzwawa43xfv9a2sm2rijiiik7b0cvpbcxvwf7s37gwrw5fk05";
+      name = "kdialog-18.04.1.tar.xz";
     };
   };
   kdiamond = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kdiamond-18.04.0.tar.xz";
-      sha256 = "0gzxpk3llgh45w3iwbqsshv4mc4whshv7zwaz8ik4wpp9kc72xj9";
-      name = "kdiamond-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kdiamond-18.04.1.tar.xz";
+      sha256 = "12z0v4w8adlzsnymn5dsc1fpgqx2w3hx38chwc7l2l5bvgx5ycc1";
+      name = "kdiamond-18.04.1.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/keditbookmarks-18.04.0.tar.xz";
-      sha256 = "18x6cgligwqqj20q69ins33fvkz3is8a11nkp4zx3kb9q50xsdv7";
-      name = "keditbookmarks-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/keditbookmarks-18.04.1.tar.xz";
+      sha256 = "1qi8y5j9s9d4i6vqvw5h29b55q73zfgj4v76dxdl1z85ghcv0my4";
+      name = "keditbookmarks-18.04.1.tar.xz";
     };
   };
   kfind = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kfind-18.04.0.tar.xz";
-      sha256 = "11wgdyparz26gqxlbnawwmhjr2lkqa1j0qqwmiihs0pxfq6q9arw";
-      name = "kfind-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kfind-18.04.1.tar.xz";
+      sha256 = "15fha4k00s88n0k7ad0bnw9iyyjyxlhjmnlcr84hfbh6wiwn4l4k";
+      name = "kfind-18.04.1.tar.xz";
     };
   };
   kfloppy = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kfloppy-18.04.0.tar.xz";
-      sha256 = "039lryi6nk69d054svm0yq5x4yd8pja6f8fx0q2wqpnffrsis5yj";
-      name = "kfloppy-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kfloppy-18.04.1.tar.xz";
+      sha256 = "0rw3r09zil7121ssms1mvccw435nmmgmz0zx0rmfvpk6bks0cim9";
+      name = "kfloppy-18.04.1.tar.xz";
     };
   };
   kfourinline = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kfourinline-18.04.0.tar.xz";
-      sha256 = "101h7y2vmg966h92k6360qc3rrgcwvnhg2lz09yffgwf8mqyp19q";
-      name = "kfourinline-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kfourinline-18.04.1.tar.xz";
+      sha256 = "0gm8s8gi9nnilcvmnz4gk26wrszjg7y8xfq4dyqw87axwaqcv2z6";
+      name = "kfourinline-18.04.1.tar.xz";
     };
   };
   kgeography = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kgeography-18.04.0.tar.xz";
-      sha256 = "1syky2a8crh5vrn3419a1rzv37ld0kh9llkmcszm9h8jaqdsiw5v";
-      name = "kgeography-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kgeography-18.04.1.tar.xz";
+      sha256 = "16c2gidj8jc4xr35ph392gh4r75vfiqw7n07lpv30d6v3h1mq2jy";
+      name = "kgeography-18.04.1.tar.xz";
     };
   };
   kget = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kget-18.04.0.tar.xz";
-      sha256 = "16dj0w8rkiybhdcgp9cf4r50nh790psx4b9xxqgfnab3b8lq35mx";
-      name = "kget-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kget-18.04.1.tar.xz";
+      sha256 = "1kzvalb1a27bn9ac4iqkgar7fydspd9bhva3n0v9gzz34p3lv1f7";
+      name = "kget-18.04.1.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kgoldrunner-18.04.0.tar.xz";
-      sha256 = "0ydhz0pm0adwjrbsiqkq6d1cs6l8nw2cj4mxf36144gs333nly1z";
-      name = "kgoldrunner-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kgoldrunner-18.04.1.tar.xz";
+      sha256 = "0w1vppp0r1prciz6gg5srlj0z05m5wcbpp3wwz6wxh2vnpbm2lc1";
+      name = "kgoldrunner-18.04.1.tar.xz";
     };
   };
   kgpg = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kgpg-18.04.0.tar.xz";
-      sha256 = "1ayyzc7vwdrhp2pc41yh01lkc9n0q4icy05z6yg14si0c7a62s78";
-      name = "kgpg-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kgpg-18.04.1.tar.xz";
+      sha256 = "0b2kngq4dqs3qxkvxny72sfm2xlbsmhb986zmpp0wsm09gd6lhyh";
+      name = "kgpg-18.04.1.tar.xz";
     };
   };
   khangman = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/khangman-18.04.0.tar.xz";
-      sha256 = "01xmvljp3z4x4aihbz4b22avh10hhnvv8y8jy0nd3pggln4mj15c";
-      name = "khangman-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/khangman-18.04.1.tar.xz";
+      sha256 = "1vcr5gp3gz0dygkn8dhkg3fpyqny8vc61nymwii4v247znhg7hw4";
+      name = "khangman-18.04.1.tar.xz";
     };
   };
   khelpcenter = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/khelpcenter-18.04.0.tar.xz";
-      sha256 = "1pc6dd4rn4c636sn8lbkdq2svijrpp4fcgf76infk7dsqrxrgnsr";
-      name = "khelpcenter-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/khelpcenter-18.04.1.tar.xz";
+      sha256 = "00p3s5zmql82dwr4lmfy3yqyyn7h2209lhf49cajh01hd2nasig1";
+      name = "khelpcenter-18.04.1.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kidentitymanagement-18.04.0.tar.xz";
-      sha256 = "129a38ajkpzgm2z921riyawlnx70c41ln3z7hvx159x3ghcsacyw";
-      name = "kidentitymanagement-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kidentitymanagement-18.04.1.tar.xz";
+      sha256 = "1lb1vl3r7avj45lfrlabbbkq0f7anpx04g20ajn2n8ajfgjpns9q";
+      name = "kidentitymanagement-18.04.1.tar.xz";
     };
   };
   kig = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kig-18.04.0.tar.xz";
-      sha256 = "1djy20lcs50ykb99akhfw873br9q0x72r3pma6mv69dpv5jpk3v3";
-      name = "kig-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kig-18.04.1.tar.xz";
+      sha256 = "1ry2rgmy7y4wyxwwz2f7qrj5aw5sjgv46vs4x5203v514p625nzw";
+      name = "kig-18.04.1.tar.xz";
     };
   };
   kigo = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kigo-18.04.0.tar.xz";
-      sha256 = "0jqkab57z0xhbxf2hcagg5b0pgn2z4dnzirp6ccfybl835nwr4rp";
-      name = "kigo-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kigo-18.04.1.tar.xz";
+      sha256 = "1l2bdxjv5kiz6f0gmqwd43jghps5l2cvw8228ay4l7r4r9wp0ihr";
+      name = "kigo-18.04.1.tar.xz";
     };
   };
   killbots = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/killbots-18.04.0.tar.xz";
-      sha256 = "10j82a9yv5v21pp9249nzm42ys104ickwavqys5j43230h0qlyl2";
-      name = "killbots-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/killbots-18.04.1.tar.xz";
+      sha256 = "06vqgahirw01zfbhr2dj5z7fd2jay3kizvl04wwwp1fr8jsw3plw";
+      name = "killbots-18.04.1.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kimagemapeditor-18.04.0.tar.xz";
-      sha256 = "01cy4nfi9gzgyfqb16vsy3b15bgag0g3dz2l9v0d4fijxpf157br";
-      name = "kimagemapeditor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kimagemapeditor-18.04.1.tar.xz";
+      sha256 = "1144z9zasc3x678q8xnk98nn5y0bzaal0lxc6xb51ib4q8q2lhn1";
+      name = "kimagemapeditor-18.04.1.tar.xz";
     };
   };
   kimap = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kimap-18.04.0.tar.xz";
-      sha256 = "1l22fzslf0zrr230hq17rfg88ifngfwcc1n0v3fzpxnia4cm68by";
-      name = "kimap-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kimap-18.04.1.tar.xz";
+      sha256 = "03y1n4rf7xdxb82716wijz196dk0rg8d50rs9kycymys9sgq5y0h";
+      name = "kimap-18.04.1.tar.xz";
     };
   };
   kio-extras = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kio-extras-18.04.0.tar.xz";
-      sha256 = "15icgvanjhvxi2k9hihadvxnx2jpjp2r3gy89brvdsh8lhj9kzil";
-      name = "kio-extras-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kio-extras-18.04.1.tar.xz";
+      sha256 = "0635iam41i5afjspw08x99irqfsj7pa1w8wz4nfbx9yv2iclq1rh";
+      name = "kio-extras-18.04.1.tar.xz";
     };
   };
   kiriki = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kiriki-18.04.0.tar.xz";
-      sha256 = "0m98fqnrk1vinkammf5fjkbvj5wwk45v8m4m951nvn0wpzrb0clf";
-      name = "kiriki-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kiriki-18.04.1.tar.xz";
+      sha256 = "0n258bvhd5cgb978zqqkig6is5fb9idvwa7n860q1r2nimsnch5y";
+      name = "kiriki-18.04.1.tar.xz";
     };
   };
   kiten = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kiten-18.04.0.tar.xz";
-      sha256 = "1xk58q89hdpy4fhk8ic2ybf60d0xgwfm6ay1gny4qb6klr5xx7ah";
-      name = "kiten-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kiten-18.04.1.tar.xz";
+      sha256 = "1f6z5assiz6gxvhcp08x71qk3hyc36ib2sr6bmq0q7cbb7xlhbac";
+      name = "kiten-18.04.1.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kjumpingcube-18.04.0.tar.xz";
-      sha256 = "1j9v6j3yams0azdc27g76x3baz6wcw173lam5r8z0q5f6xayv9zl";
-      name = "kjumpingcube-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kjumpingcube-18.04.1.tar.xz";
+      sha256 = "0p4manwh4pndhdnb45fczllpsvswwwgvz1wk8grx2axq0x6pjjln";
+      name = "kjumpingcube-18.04.1.tar.xz";
     };
   };
   kldap = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kldap-18.04.0.tar.xz";
-      sha256 = "1fjh6insnmnl4yk5n11bsp9xrhyzkb7cf3vsbx6yjn13gwg06xm9";
-      name = "kldap-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kldap-18.04.1.tar.xz";
+      sha256 = "0arriibg2flqr8rvd4fa8xd4rgr1rl3pwhxxskpfi4i3rl8w1a2i";
+      name = "kldap-18.04.1.tar.xz";
     };
   };
   kleopatra = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kleopatra-18.04.0.tar.xz";
-      sha256 = "1lqqhy0pyv8v9x20if6sjklbmfnjmip4nfm0adp5wh7r3n9c0908";
-      name = "kleopatra-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kleopatra-18.04.1.tar.xz";
+      sha256 = "0ayjxvm6sdg1waf44nw360nh740vi29c7m6frq2jyfbxn401x7p3";
+      name = "kleopatra-18.04.1.tar.xz";
     };
   };
   klettres = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/klettres-18.04.0.tar.xz";
-      sha256 = "0x2vj449dgzlyhyagdcs5f12rd3w025iq5q8qcsml7mnr5vy06n3";
-      name = "klettres-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/klettres-18.04.1.tar.xz";
+      sha256 = "1vzr8pf6m24ng3kg44ld5hiap7qqfp2w1q7npyr6sq28rrm8jilb";
+      name = "klettres-18.04.1.tar.xz";
     };
   };
   klickety = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/klickety-18.04.0.tar.xz";
-      sha256 = "1l81xk00bkbxm9fmqjyphf8wijgxp979kfsflvy7zyzga43k64fc";
-      name = "klickety-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/klickety-18.04.1.tar.xz";
+      sha256 = "1wk6g4a8gmd1z8qqgy30s3f2zgq651dv38gnbk3949j81k92084m";
+      name = "klickety-18.04.1.tar.xz";
     };
   };
   klines = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/klines-18.04.0.tar.xz";
-      sha256 = "1axp8mv1hxdddw86wsd6dkv7cbzk5b3lswqvwxdbbrpsq8j8vjz1";
-      name = "klines-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/klines-18.04.1.tar.xz";
+      sha256 = "0zslagiphj37i79896k71j40125nz74qknx75sp3iv2wafy0akgf";
+      name = "klines-18.04.1.tar.xz";
     };
   };
   kmag = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmag-18.04.0.tar.xz";
-      sha256 = "1yaryycwy5h3pafzsvn4xr96p96j3a3302x6y73i9xm94nz7a60f";
-      name = "kmag-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmag-18.04.1.tar.xz";
+      sha256 = "163i0axbnxkyqhbri6k48x9jsb5l5ll8hl0zvcsw0srh8bzswvgd";
+      name = "kmag-18.04.1.tar.xz";
     };
   };
   kmahjongg = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmahjongg-18.04.0.tar.xz";
-      sha256 = "191cl5cnq6q8b3fr22frfwrg0a2bqf9c2x454ab0ysc2qapblfkx";
-      name = "kmahjongg-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmahjongg-18.04.1.tar.xz";
+      sha256 = "1zl1mr8pg6sz2ydqilgdbh3758vw13af37s9g8pi7axva8adf0fp";
+      name = "kmahjongg-18.04.1.tar.xz";
     };
   };
   kmail = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmail-18.04.0.tar.xz";
-      sha256 = "1faw94imrr30bg155zs4hszfbv9fszywyk1v24d0l03vyh4w0x8r";
-      name = "kmail-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmail-18.04.1.tar.xz";
+      sha256 = "057727gsrdf0pkn5n17km5ryjiw5rimxixff0dax939d9403qwfg";
+      name = "kmail-18.04.1.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmail-account-wizard-18.04.0.tar.xz";
-      sha256 = "0sgasycw0ixh6c04kibyii6f5aygkhwanidnmidhgdnqhgcg31gp";
-      name = "kmail-account-wizard-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmail-account-wizard-18.04.1.tar.xz";
+      sha256 = "0qky1a0lrmy8mfiq0dqhrd8j7m1lc9p34ivx9vy4rr82r9g3y5jw";
+      name = "kmail-account-wizard-18.04.1.tar.xz";
     };
   };
   kmailtransport = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmailtransport-18.04.0.tar.xz";
-      sha256 = "122zcgz9vlqzmr2xy4msrzg9ajvyjlwcf7g4br7bja42f5nk704f";
-      name = "kmailtransport-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmailtransport-18.04.1.tar.xz";
+      sha256 = "09l79049dpkzc3iqdxv4jvglpynrq976gvr8n38k63mr5sajwg72";
+      name = "kmailtransport-18.04.1.tar.xz";
     };
   };
   kmbox = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmbox-18.04.0.tar.xz";
-      sha256 = "0qljbixj2jka8sngavi41jjcssy293acy1d6syjyagad7z5f0d0k";
-      name = "kmbox-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmbox-18.04.1.tar.xz";
+      sha256 = "05zcnykb7asamqf8iqs63bl7jk5myywdqydhxz56jr19fw32lyqq";
+      name = "kmbox-18.04.1.tar.xz";
     };
   };
   kmime = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmime-18.04.0.tar.xz";
-      sha256 = "03hwvwdkb1176d837hbwm8wqj0bl29fdfzirgrp1yri4vadmhrqx";
-      name = "kmime-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmime-18.04.1.tar.xz";
+      sha256 = "1jlhlxw31c9g7z6yhqjsp76xm85ywrr0in4qazidwb9k8lkqxa7g";
+      name = "kmime-18.04.1.tar.xz";
     };
   };
   kmines = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmines-18.04.0.tar.xz";
-      sha256 = "0jyrynqqzk5dwwfd05kdzx5lc6cjkbhhp5l8ijyfwdqs63wzj705";
-      name = "kmines-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmines-18.04.1.tar.xz";
+      sha256 = "0i88pc7j18xighw8ii6gh5gxq9k2zy372ggdyany91dcjgmwhgw7";
+      name = "kmines-18.04.1.tar.xz";
     };
   };
   kmix = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmix-18.04.0.tar.xz";
-      sha256 = "0xq5jd5nrjb95lhc38n0b6kmmdbr2hrnpq8kvdywv6xazhb0h9mg";
-      name = "kmix-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmix-18.04.1.tar.xz";
+      sha256 = "1jq71pgnlz95na5fbm504pkrrahiclqbb0cwsqpbpi10m2nzcrwd";
+      name = "kmix-18.04.1.tar.xz";
     };
   };
   kmousetool = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmousetool-18.04.0.tar.xz";
-      sha256 = "1n36myw2j43mnlawkymyv73l4xkpc5ynqalqka2jigdzqin87gr7";
-      name = "kmousetool-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmousetool-18.04.1.tar.xz";
+      sha256 = "08g5k9yfd5wrh47zp99hgq634vd9r23gjlr77xg86jqn8dj2lgqx";
+      name = "kmousetool-18.04.1.tar.xz";
     };
   };
   kmouth = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmouth-18.04.0.tar.xz";
-      sha256 = "03m4ia8s2qg6pnih6i8df3y2dxc8qcxwcnn7kyjd1ygw8i3gjkyk";
-      name = "kmouth-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmouth-18.04.1.tar.xz";
+      sha256 = "08m5r9vd0gb06izav2g21qkfmg1gjpj0kn0nh785bbhs0bbngrci";
+      name = "kmouth-18.04.1.tar.xz";
     };
   };
   kmplot = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kmplot-18.04.0.tar.xz";
-      sha256 = "1bl0sw58p4qnbka1kss2w3p0w7r91c29hg3h3ljxlarj8yg7z95v";
-      name = "kmplot-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kmplot-18.04.1.tar.xz";
+      sha256 = "01rxnc45jc6swsm2h8bw45n96lsalgbfzww18hlq1qpyjr20181h";
+      name = "kmplot-18.04.1.tar.xz";
     };
   };
   knavalbattle = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/knavalbattle-18.04.0.tar.xz";
-      sha256 = "0hw5syv8csnx1myjdfsd96bxvqcg2c21fpcgmb9dc8gj4nzqqabv";
-      name = "knavalbattle-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/knavalbattle-18.04.1.tar.xz";
+      sha256 = "1kr37qmb4577i12wghc0qcbbqpxr2wzww1cqv0wcd9jmjd3mq1xw";
+      name = "knavalbattle-18.04.1.tar.xz";
     };
   };
   knetwalk = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/knetwalk-18.04.0.tar.xz";
-      sha256 = "0r3a9pa9nwhfg5xbp062dsaq8n20mrykfbcp52m9wlln8rwjiz1x";
-      name = "knetwalk-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/knetwalk-18.04.1.tar.xz";
+      sha256 = "02zpndbbyffakdxxswpmb1hrszh78a3ip6mfr8bqwnwbvzh80cjy";
+      name = "knetwalk-18.04.1.tar.xz";
     };
   };
   knotes = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/knotes-18.04.0.tar.xz";
-      sha256 = "1gkz3vrsj9irzyhc1djvmkbikiqxn7bgv913ynax8akbbmlh9xlh";
-      name = "knotes-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/knotes-18.04.1.tar.xz";
+      sha256 = "0jc9mpnwgrbh8pra75gsiy9wm0aylm9a0ssw8bhfivb77dmqr44c";
+      name = "knotes-18.04.1.tar.xz";
     };
   };
   kolf = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kolf-18.04.0.tar.xz";
-      sha256 = "0cjvm5xg09wnx5n5hz9w3ckxfyhnwxn423f4hm5c8qwij4gnsfsn";
-      name = "kolf-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kolf-18.04.1.tar.xz";
+      sha256 = "1bahv98dskknyy8rxpnjxywpcw09x58bsdg0aqgh5xdm0ym992ik";
+      name = "kolf-18.04.1.tar.xz";
     };
   };
   kollision = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kollision-18.04.0.tar.xz";
-      sha256 = "03lkrdh11q4vmbc8a5hflsbk2w39ffr96r6rwazkas7svc2hky6i";
-      name = "kollision-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kollision-18.04.1.tar.xz";
+      sha256 = "0pr4f9inxp77d761byis30jski642bhcfvbpcpnj9fi3k1cgzcna";
+      name = "kollision-18.04.1.tar.xz";
     };
   };
   kolourpaint = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kolourpaint-18.04.0.tar.xz";
-      sha256 = "18b01w44bp7hyhxyj5cbfhlmhvcr1bbi1j6i0j62h67sm9fy65vr";
-      name = "kolourpaint-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kolourpaint-18.04.1.tar.xz";
+      sha256 = "1lfvmk9vhwa8j454pfh0x1klqb360zlsyydiiqm5a4dhc4wvcwzy";
+      name = "kolourpaint-18.04.1.tar.xz";
     };
   };
   kompare = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kompare-18.04.0.tar.xz";
-      sha256 = "019z54h9dlcxy7hfzxrh0nh3l2jzc993jhdw4s70h7mf2yddl6zi";
-      name = "kompare-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kompare-18.04.1.tar.xz";
+      sha256 = "0kmf245fbm32hdgmyiv51ham3py7jhc3zpwfcfxbjyi94ikx4n79";
+      name = "kompare-18.04.1.tar.xz";
     };
   };
   konqueror = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/konqueror-18.04.0.tar.xz";
-      sha256 = "0z7b8w47xs2wm13c82fkcf07qd7ikyi67dg8abfnxhvmri4bsxn2";
-      name = "konqueror-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/konqueror-18.04.1.tar.xz";
+      sha256 = "0798z1pm7sxi93xy4jibzhff8k37q88l59kyz524kl7m8wnw5scj";
+      name = "konqueror-18.04.1.tar.xz";
     };
   };
   konquest = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/konquest-18.04.0.tar.xz";
-      sha256 = "0344hjkhq5czxi3wl9vfavli79lh7mqhk8qby0hj53xp6mqh7xfx";
-      name = "konquest-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/konquest-18.04.1.tar.xz";
+      sha256 = "0h637lpmdsascp178fi5mpl9825n83r094ff8l5k4dnfks5imgv4";
+      name = "konquest-18.04.1.tar.xz";
     };
   };
   konsole = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/konsole-18.04.0.tar.xz";
-      sha256 = "0r2al3ja1fpkyyq7hrzis9pmkp54idivfmrj71rqk74jfjjjky2k";
-      name = "konsole-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/konsole-18.04.1.tar.xz";
+      sha256 = "0hnyi5361glmal69brqc9h6zcv8z4l8va6nv0hc2siafmj21yhw6";
+      name = "konsole-18.04.1.tar.xz";
     };
   };
   kontact = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kontact-18.04.0.tar.xz";
-      sha256 = "14kpnfa2bl92frz6vssfs1q3065vsgl5bfgrgyvbbpxfviy5ciaz";
-      name = "kontact-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kontact-18.04.1.tar.xz";
+      sha256 = "00xaizfnfvh39xnxq2jp9n9cl7f0a22hlndamjfhw126ji0mz052";
+      name = "kontact-18.04.1.tar.xz";
     };
   };
   kontactinterface = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kontactinterface-18.04.0.tar.xz";
-      sha256 = "12hmh1wxsxb1n1727qpmarhs83nziy93kb7a8xyahpkky82jn62x";
-      name = "kontactinterface-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kontactinterface-18.04.1.tar.xz";
+      sha256 = "1zywgcrwzgw56vx2x0f2f0235bs2aikvn2qfizv4m5ac7ydihnyd";
+      name = "kontactinterface-18.04.1.tar.xz";
     };
   };
   kopete = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kopete-18.04.0.tar.xz";
-      sha256 = "0p22yjpzrgqmdr74pw9pxasb25w9ikdgsrlbcq5yy95il1zppwfl";
-      name = "kopete-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kopete-18.04.1.tar.xz";
+      sha256 = "1isxabxxx48vjzihycv80fapx69qrvv5zlyfrdg42s9qxqkcgvi8";
+      name = "kopete-18.04.1.tar.xz";
     };
   };
   korganizer = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/korganizer-18.04.0.tar.xz";
-      sha256 = "02vyycpiqdfik2902pk97jz28s4nh2wax129y6n1mdxjjvw15gp2";
-      name = "korganizer-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/korganizer-18.04.1.tar.xz";
+      sha256 = "1x3n03200j79xrj4y7046l3sa3qqfys3z2d2b1nl22v8g3l8gyx2";
+      name = "korganizer-18.04.1.tar.xz";
     };
   };
   kpat = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kpat-18.04.0.tar.xz";
-      sha256 = "02s74cwyp3mpdc8xk6hky3p8s3svdwwkrdfbaxbkh6ysywbm7728";
-      name = "kpat-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kpat-18.04.1.tar.xz";
+      sha256 = "1fly7cd895v6k991hjvq4cv22dibzsvihzcj9cl9pzc7dk9vp70v";
+      name = "kpat-18.04.1.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kpimtextedit-18.04.0.tar.xz";
-      sha256 = "101jj454b4p52yxzcp837075fp3lh3wnkjw8spcfb6k1rjf0ss68";
-      name = "kpimtextedit-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kpimtextedit-18.04.1.tar.xz";
+      sha256 = "09513fv0kaa7x01lsnpm18vvxijcwb68hdglbw08n5f7135k79mn";
+      name = "kpimtextedit-18.04.1.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kqtquickcharts-18.04.0.tar.xz";
-      sha256 = "1ccfgbm1dbrf0nkkpg7qzrpa0sjdv46cvdn7qc86qqqmbb96zij8";
-      name = "kqtquickcharts-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kqtquickcharts-18.04.1.tar.xz";
+      sha256 = "08y0nc070pjmf07yifkfd6dm3frma752c42m3ms0ysz96l1x2gr1";
+      name = "kqtquickcharts-18.04.1.tar.xz";
     };
   };
   krdc = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/krdc-18.04.0.tar.xz";
-      sha256 = "11nk01vhpqlhgn7b928svvpdn5r9hbrc01248xzqkj16iwrdrqr9";
-      name = "krdc-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/krdc-18.04.1.tar.xz";
+      sha256 = "166990llgfkbysahrfralc6n2g7ix7h4w1fpzss0axfigz5ink1x";
+      name = "krdc-18.04.1.tar.xz";
     };
   };
   kreversi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kreversi-18.04.0.tar.xz";
-      sha256 = "1jbvsldl1g1ljl4mzn1l93gi5kb8jrzwqjzfga4dbribif8shmq8";
-      name = "kreversi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kreversi-18.04.1.tar.xz";
+      sha256 = "0g6jc7s54i4gzb5q9cg4qczwx9i4zir52zqnjl5akr1w9v8d2m34";
+      name = "kreversi-18.04.1.tar.xz";
     };
   };
   krfb = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/krfb-18.04.0.tar.xz";
-      sha256 = "1aq285jn4k0s9vwy99w2a1wm4nzwzjafz8a0gy47ydi0m29b1rkc";
-      name = "krfb-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/krfb-18.04.1.tar.xz";
+      sha256 = "1zd3rgp4265r1fi1kc2s09rrzpa22b9j56cq3l50mzkb80kyi6vl";
+      name = "krfb-18.04.1.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kross-interpreters-18.04.0.tar.xz";
-      sha256 = "15cbpq7cs0hnm42c03kyvyshfa10xdsajlbmsixzbmvks34c8b1y";
-      name = "kross-interpreters-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kross-interpreters-18.04.1.tar.xz";
+      sha256 = "1gybf7diq2amaqs7xaikfh1kp40iwfvxz4bms16b6flck8sja8va";
+      name = "kross-interpreters-18.04.1.tar.xz";
     };
   };
   kruler = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kruler-18.04.0.tar.xz";
-      sha256 = "0bm1d8n0v4qg8jaciws247bda7q5nab0i80qlg2xb20lygi2fwwr";
-      name = "kruler-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kruler-18.04.1.tar.xz";
+      sha256 = "0bkf1cm23582hwz4j3xygrwqwbfq27qycvnf2mqw921j08axa376";
+      name = "kruler-18.04.1.tar.xz";
     };
   };
   kshisen = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kshisen-18.04.0.tar.xz";
-      sha256 = "1m9wa59iz3p2x7zxngp2wqf99ab6p1gai3h0fb4zbqbib98jpmyf";
-      name = "kshisen-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kshisen-18.04.1.tar.xz";
+      sha256 = "098qqzii4wk0pv5388yighy381k5ffrb8wy4z461yxgxc75d77f7";
+      name = "kshisen-18.04.1.tar.xz";
     };
   };
   ksirk = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksirk-18.04.0.tar.xz";
-      sha256 = "0msw4lkrjj5ihbdg9ibjrk7ddcw933kqhbf6aap5jc4lz0r6y1d8";
-      name = "ksirk-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksirk-18.04.1.tar.xz";
+      sha256 = "0mxj4vp6da535ghnxisk6j7akhis0fh16kj6bycw8fxxl5jiy0sq";
+      name = "ksirk-18.04.1.tar.xz";
     };
   };
   ksmtp = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksmtp-18.04.0.tar.xz";
-      sha256 = "1r89wm8q4vxaqdd1j8qb84qr7zg1dfb731r7qypilvkcc8z1samn";
-      name = "ksmtp-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksmtp-18.04.1.tar.xz";
+      sha256 = "0imfcaisvh78s18x2w4iizr4vn6sndr1nk9585vs9dr8wcwbfrl3";
+      name = "ksmtp-18.04.1.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksnakeduel-18.04.0.tar.xz";
-      sha256 = "04lpcp7l4xwnwk073yji84kaw16gi0ybkzlvcg1plpqj6w1y1y8w";
-      name = "ksnakeduel-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksnakeduel-18.04.1.tar.xz";
+      sha256 = "07p9nil9x3cyzzxcr59h3rj9h6g1lfssrsi6iqwq0hpdc6h2zl73";
+      name = "ksnakeduel-18.04.1.tar.xz";
     };
   };
   kspaceduel = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kspaceduel-18.04.0.tar.xz";
-      sha256 = "04shgk89xfp3z26683mc9g612fmnqg01fp8qah7y8mbac3cv4f5i";
-      name = "kspaceduel-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kspaceduel-18.04.1.tar.xz";
+      sha256 = "0aar147l5bq1ij40ng5wbdixg91678r3d07lrnmdffb47wa1ly7n";
+      name = "kspaceduel-18.04.1.tar.xz";
     };
   };
   ksquares = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksquares-18.04.0.tar.xz";
-      sha256 = "17siqdj6l2g2rnaswdzipxlxxx8x4q5wb4z2rc12gf08fggxfmgn";
-      name = "ksquares-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksquares-18.04.1.tar.xz";
+      sha256 = "1vr9xdi0jfrjwvq5y04djmnax7q4d5amj8a7mzvvqq427zl6xc3c";
+      name = "ksquares-18.04.1.tar.xz";
     };
   };
   ksudoku = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksudoku-18.04.0.tar.xz";
-      sha256 = "1slmfps0861n8p4rqc1ng4981v1jdyppzr990abadqzf344d3ab3";
-      name = "ksudoku-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksudoku-18.04.1.tar.xz";
+      sha256 = "0habss3w7m3x8mhh70qq38nymynvihar9clpxmlp6pbyw8sl9v6n";
+      name = "ksudoku-18.04.1.tar.xz";
     };
   };
   ksystemlog = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ksystemlog-18.04.0.tar.xz";
-      sha256 = "164cfzfjya7yg5pzzpxzfr0r1yf6napvibpjs9y784fl4r2qb780";
-      name = "ksystemlog-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ksystemlog-18.04.1.tar.xz";
+      sha256 = "1yyrbdzjxrlf96l3bvj675fsbn6440lxr1nd5j4rs09d3fyvl6p1";
+      name = "ksystemlog-18.04.1.tar.xz";
     };
   };
   kteatime = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kteatime-18.04.0.tar.xz";
-      sha256 = "0sm4kcq618qp5ihnvcw2zp0frnj21mmjapksy7q63skh9ncjgmj3";
-      name = "kteatime-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kteatime-18.04.1.tar.xz";
+      sha256 = "02849i02h0zmsc3wifzgq9s0mgfdyzdrm61ngq944r260anizxhd";
+      name = "kteatime-18.04.1.tar.xz";
     };
   };
   ktimer = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktimer-18.04.0.tar.xz";
-      sha256 = "1mgjgs8j4wfkjq766w9lyc21h3l3cfv5qb5a3x1anc74y1vanksj";
-      name = "ktimer-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktimer-18.04.1.tar.xz";
+      sha256 = "13k0wmjh925sj7l8n4kc0adva1vfbgs6admh80ch0xwk8mmsdjvp";
+      name = "ktimer-18.04.1.tar.xz";
     };
   };
   ktnef = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktnef-18.04.0.tar.xz";
-      sha256 = "1rys8l7rmwzv79mwmm97yxfq8gsfz4sh6hf7bjq6zhc9q42n3r36";
-      name = "ktnef-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktnef-18.04.1.tar.xz";
+      sha256 = "1m6nbsnbh8apyqaw2kivkzhk7fp9y2xphmrblqdpf49qpbh6jqlq";
+      name = "ktnef-18.04.1.tar.xz";
     };
   };
   ktouch = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktouch-18.04.0.tar.xz";
-      sha256 = "10lwc2gz1gwghz95f1dgdv33n4rwly0f8maslv3hb47cr14c259v";
-      name = "ktouch-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktouch-18.04.1.tar.xz";
+      sha256 = "18piwwdq4hl8yaln7s7p4bw0lwkyjwnw8lknirj1352npycvq2n1";
+      name = "ktouch-18.04.1.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-accounts-kcm-18.04.0.tar.xz";
-      sha256 = "1arcg0wabjqla5mc773vrbwd2abl5zwhhchf88f1i4krcv2crn3s";
-      name = "ktp-accounts-kcm-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-accounts-kcm-18.04.1.tar.xz";
+      sha256 = "1ihxvngg6cp1vzhpf4hkf2zwxpa5gnlq11lc1ffnhy7fm7ig28nx";
+      name = "ktp-accounts-kcm-18.04.1.tar.xz";
     };
   };
   ktp-approver = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-approver-18.04.0.tar.xz";
-      sha256 = "0afgd08x857mi7s5br3m5q41k8rm77p6dnvb3idjsmv0m8324md4";
-      name = "ktp-approver-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-approver-18.04.1.tar.xz";
+      sha256 = "1749l1zklk1q7i3z4mbk24566vps74hj3as4ijybgymczr4rd3gz";
+      name = "ktp-approver-18.04.1.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-auth-handler-18.04.0.tar.xz";
-      sha256 = "1d7s1rqh231k57bygbyzxiz3cs9diqx4x2f7v66awm20la2p804y";
-      name = "ktp-auth-handler-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-auth-handler-18.04.1.tar.xz";
+      sha256 = "0llkw1yqi91s8iqdqz8pskccinmjsgbp1081pngpkqcg1iy7bara";
+      name = "ktp-auth-handler-18.04.1.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-call-ui-18.04.0.tar.xz";
-      sha256 = "1qffsq9nnhzlgmm42vg98g172361zra06wgpa7n8y3pvl9mwlrbm";
-      name = "ktp-call-ui-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-call-ui-18.04.1.tar.xz";
+      sha256 = "1pji4z8h7bk5npl279x5g9hx7zgdhnjdrv669nrd1gi9m20n6vi7";
+      name = "ktp-call-ui-18.04.1.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-common-internals-18.04.0.tar.xz";
-      sha256 = "0cvyw7rs8afi7c1dl58jmibzqy1jdnbkjqsxilnlkj5rmplg10av";
-      name = "ktp-common-internals-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-common-internals-18.04.1.tar.xz";
+      sha256 = "0jwkwznqcrk39k07srl7c0yznj9p9dp70lkfhjg3syscwm8drydv";
+      name = "ktp-common-internals-18.04.1.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-list-18.04.0.tar.xz";
-      sha256 = "1384rps2wp1qgqq0jj1p9rjkg3gdrsjid87jhdjv95kjxc1a7a1y";
-      name = "ktp-contact-list-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-contact-list-18.04.1.tar.xz";
+      sha256 = "1806fapr0pv15dmpqb0khdlgrmk9bsf45s1ab7x9pdnghnawn132";
+      name = "ktp-contact-list-18.04.1.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-contact-runner-18.04.0.tar.xz";
-      sha256 = "02hr0g619h30hr49rxs5yvwna6skzkvca03p9yy70ib22gzpfxli";
-      name = "ktp-contact-runner-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-contact-runner-18.04.1.tar.xz";
+      sha256 = "0b9xm5p9w5kd67sh13h9caxqj89jzia79hfk9fzxpjbf0kifj72s";
+      name = "ktp-contact-runner-18.04.1.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-desktop-applets-18.04.0.tar.xz";
-      sha256 = "09jfw3sn6yn4znir0rcgwwc5h1zp2vc39y4i7fi1rznhdagwy1ji";
-      name = "ktp-desktop-applets-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-desktop-applets-18.04.1.tar.xz";
+      sha256 = "0jrdz8ccgrbwpb6k73wvsix3h3h16dxzgqy19lykd5igckq1v2qh";
+      name = "ktp-desktop-applets-18.04.1.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-filetransfer-handler-18.04.0.tar.xz";
-      sha256 = "1wc72ghl2v6bjrw1pb8h8ajigqhyb53nlhya2cqhdf1banpjv0n5";
-      name = "ktp-filetransfer-handler-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-filetransfer-handler-18.04.1.tar.xz";
+      sha256 = "03v0wgac6knprqi7mfzc3w1rrdkf9lgi2gpscc3k910dyswh1802";
+      name = "ktp-filetransfer-handler-18.04.1.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-kded-module-18.04.0.tar.xz";
-      sha256 = "1845csv2ci5589iws49ma5qrkgs5q6hqb2hzrk6znr6w3d1smbbj";
-      name = "ktp-kded-module-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-kded-module-18.04.1.tar.xz";
+      sha256 = "0d3vv1ngsbh87wxijvyd2hzhdzwr0r5vx5h3jdl3znjh9ysifwm4";
+      name = "ktp-kded-module-18.04.1.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-send-file-18.04.0.tar.xz";
-      sha256 = "137l6b4dpd78x8z99cpz0sp8f5lbdlvzkd2w742jsiylxchrjr5l";
-      name = "ktp-send-file-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-send-file-18.04.1.tar.xz";
+      sha256 = "1p3vgbsmam687bzp1h6xxv2qr2f6jz6mjbpk5jxjvvz66aq4dj8y";
+      name = "ktp-send-file-18.04.1.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktp-text-ui-18.04.0.tar.xz";
-      sha256 = "12hhfkjglqbd4qxhl10xczk9ha0j494vjldkg05lhm0l233zr9km";
-      name = "ktp-text-ui-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktp-text-ui-18.04.1.tar.xz";
+      sha256 = "1zsxyizm9vdlrxicxvgmy5irqi914szxkd38xrgspp2vdi4bnvb6";
+      name = "ktp-text-ui-18.04.1.tar.xz";
     };
   };
   ktuberling = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/ktuberling-18.04.0.tar.xz";
-      sha256 = "12mrb0a5k5z02mjwdn8vlcwr8jxwp7x2f04wzac749csyn0sj86d";
-      name = "ktuberling-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/ktuberling-18.04.1.tar.xz";
+      sha256 = "1rpval4rl63dfy2p6aq5902ifvv14x1zg8mzzci26kqq8k38jasc";
+      name = "ktuberling-18.04.1.tar.xz";
     };
   };
   kturtle = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kturtle-18.04.0.tar.xz";
-      sha256 = "0vm28xngj52l6fs7sd54wg4fhss131kh6ihs1ibnzi9in0hvga62";
-      name = "kturtle-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kturtle-18.04.1.tar.xz";
+      sha256 = "1s2n46nlzc63108gc43h14yjrcd12h93bvbg08ynhfaq26pqz1jk";
+      name = "kturtle-18.04.1.tar.xz";
     };
   };
   kubrick = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kubrick-18.04.0.tar.xz";
-      sha256 = "0as99qx9vi6zcx61kai7y3ym4vzm8r7ma4p0a2z8rxymps1nk3dy";
-      name = "kubrick-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kubrick-18.04.1.tar.xz";
+      sha256 = "1gqnfc8gnl96gz5i3ak7swhm36c9dv7n0c4b5f70pnsi5n7klbxr";
+      name = "kubrick-18.04.1.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kwalletmanager-18.04.0.tar.xz";
-      sha256 = "1f4124bm86aqbv36v961jca647vvxrlssq5ydnvi1yfx0saza94q";
-      name = "kwalletmanager-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kwalletmanager-18.04.1.tar.xz";
+      sha256 = "0vj0ch1dk265v6x8xzvskpv5mc564p10pn8m9jjv79wk2xy1vsjz";
+      name = "kwalletmanager-18.04.1.tar.xz";
     };
   };
   kwave = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kwave-18.04.0.tar.xz";
-      sha256 = "1bw6lcl95aqcvzp2z31krdaiq0hfhndicynarai58rcg2ngbsm53";
-      name = "kwave-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kwave-18.04.1.tar.xz";
+      sha256 = "0avbyyrhvzfxdib0d80rk7m6gk6kq9rjvv640s08y237m68fncap";
+      name = "kwave-18.04.1.tar.xz";
     };
   };
   kwordquiz = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/kwordquiz-18.04.0.tar.xz";
-      sha256 = "1rfr1hc6xkciyx5wknzikf4ml1sgcqj8lflxpksdsg9m5nk7w73y";
-      name = "kwordquiz-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/kwordquiz-18.04.1.tar.xz";
+      sha256 = "1yqynfmlargfwk7nlfzhlxd1df462ssw7qj3pdhym8277jfch58r";
+      name = "kwordquiz-18.04.1.tar.xz";
     };
   };
   libgravatar = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libgravatar-18.04.0.tar.xz";
-      sha256 = "1wzfvp5acdkpj37bg1hphy0fszvbakzx0azg56zk0h9526h6qrq1";
-      name = "libgravatar-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libgravatar-18.04.1.tar.xz";
+      sha256 = "19xrc70yh6baxg5jlr3v3d3af46vms28jzvkpgda5ffacnn3xnrj";
+      name = "libgravatar-18.04.1.tar.xz";
     };
   };
   libkcddb = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkcddb-18.04.0.tar.xz";
-      sha256 = "1967in5041lyjapi3avlns1g7ps8sqvq547gw13snhkjn0dbs1aa";
-      name = "libkcddb-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkcddb-18.04.1.tar.xz";
+      sha256 = "1nn80sflfgzd3d2kc4d4zwa09ix498svrinn27b9h8x3w3gsbg8f";
+      name = "libkcddb-18.04.1.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkcompactdisc-18.04.0.tar.xz";
-      sha256 = "01c1pmb2v7bd03jdkwdw4l37736ad8igrrwa9cf5jwg6q5ps9xgb";
-      name = "libkcompactdisc-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkcompactdisc-18.04.1.tar.xz";
+      sha256 = "12zb39zwvl8y2b48vjn34dxj4f65laswd67w5f7m4g0nczq218v1";
+      name = "libkcompactdisc-18.04.1.tar.xz";
     };
   };
   libkdcraw = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkdcraw-18.04.0.tar.xz";
-      sha256 = "04gc0m4ndkx02yavqmc5xh488rmxw5ppicv902iby0m9ywrjinik";
-      name = "libkdcraw-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkdcraw-18.04.1.tar.xz";
+      sha256 = "011q982rx5m8609i1zd6q186xw3ps81fnvhjk69hxy5w8pp44m6i";
+      name = "libkdcraw-18.04.1.tar.xz";
     };
   };
   libkdegames = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkdegames-18.04.0.tar.xz";
-      sha256 = "09wxdvd2ahhh11ncylh5il5fbx1jx6jpwzp1r18cx5k71fw2idp6";
-      name = "libkdegames-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkdegames-18.04.1.tar.xz";
+      sha256 = "03afnypmn8bz1cgc4lgfmid2hszsq564hsf9m5s57a29vfswnp6m";
+      name = "libkdegames-18.04.1.tar.xz";
     };
   };
   libkdepim = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkdepim-18.04.0.tar.xz";
-      sha256 = "0m3rlwdy010v4s3157w8jlb6ahcmn4frqxp1ibachpmz6y77gkkq";
-      name = "libkdepim-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkdepim-18.04.1.tar.xz";
+      sha256 = "02wrkn1h662dqzp7kyrhhhiyahhkgqz75jcd59haxyj66amlgcx6";
+      name = "libkdepim-18.04.1.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkeduvocdocument-18.04.0.tar.xz";
-      sha256 = "1g10c955gy0530xypr62x9dp4736s6qwr5afb90nlj8rhnq2zmbw";
-      name = "libkeduvocdocument-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkeduvocdocument-18.04.1.tar.xz";
+      sha256 = "14i25wjfak39bz0y5rkg25mvjxnzpak76sf5w163dmwx2hd7spzr";
+      name = "libkeduvocdocument-18.04.1.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkexiv2-18.04.0.tar.xz";
-      sha256 = "11ydba6jdvyvp3j3zzy7gjcmz20zv6nwg07r00xgs34y9n50rhzy";
-      name = "libkexiv2-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkexiv2-18.04.1.tar.xz";
+      sha256 = "0q6hmghivdj0aq00pg3z5i6mfdj3xgpdd6yw0vr9i4jnk0rfb349";
+      name = "libkexiv2-18.04.1.tar.xz";
     };
   };
   libkgapi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkgapi-18.04.0.tar.xz";
-      sha256 = "0bp7y1wjajzzq6q3sygl2vxk685k5hmcvy1i42q5fph28q2b0dli";
-      name = "libkgapi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkgapi-18.04.1.tar.xz";
+      sha256 = "0wpxn7qyf56rckarx52ic3yyhv8r043dxjir4f2yf05vkddwkshv";
+      name = "libkgapi-18.04.1.tar.xz";
     };
   };
   libkgeomap = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkgeomap-18.04.0.tar.xz";
-      sha256 = "0814ql6xpj02sirmz9crn649rabqclhzjnrlk47isgjwsgk5kqmh";
-      name = "libkgeomap-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkgeomap-18.04.1.tar.xz";
+      sha256 = "16rzw8r1i7isfh86rg86a0h25zwa8h3hnxbzf3fjmdn6mmdkp2va";
+      name = "libkgeomap-18.04.1.tar.xz";
     };
   };
   libkipi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkipi-18.04.0.tar.xz";
-      sha256 = "10d7yb6psrj1xl34pkhw6fpmja7mk8bkq80id0snc5nxlr0v1jdb";
-      name = "libkipi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkipi-18.04.1.tar.xz";
+      sha256 = "09rx85phr259anznvxyfp4rb51jsid76jrbcgv52vy9cfd7rr8pk";
+      name = "libkipi-18.04.1.tar.xz";
     };
   };
   libkleo = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkleo-18.04.0.tar.xz";
-      sha256 = "179abszgi7nm763cvyqi2274x7107vb4irblsdfkqmlp924xssdd";
-      name = "libkleo-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkleo-18.04.1.tar.xz";
+      sha256 = "06kyiv9bshyf2q0k7g7pm1ja35sxddgrzb5ayxnx03na86dm67j9";
+      name = "libkleo-18.04.1.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkmahjongg-18.04.0.tar.xz";
-      sha256 = "1grsyjsghjk3ikj7lpib3k94qcsz6r1l3czcawwamf2m83jydk2k";
-      name = "libkmahjongg-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkmahjongg-18.04.1.tar.xz";
+      sha256 = "09sqi1xyd8hk3x6w5ix6sa191ihil3zjq1qd6j50fr2rpqzfnbm0";
+      name = "libkmahjongg-18.04.1.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libkomparediff2-18.04.0.tar.xz";
-      sha256 = "0vzq25q9hihv8np0l0jdyfipf3w86wm6y7n46dhhqkqw380wrxwy";
-      name = "libkomparediff2-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libkomparediff2-18.04.1.tar.xz";
+      sha256 = "0d00r0h1fbmhkdn791f3i87ckc4l8wd5rljlm4lfzcr95lbmpzyv";
+      name = "libkomparediff2-18.04.1.tar.xz";
     };
   };
   libksane = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libksane-18.04.0.tar.xz";
-      sha256 = "1vc7z3dzr0nk3rrfq96p6phbb3rfnkn6wpjnzmc66f4mvq96hn7i";
-      name = "libksane-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libksane-18.04.1.tar.xz";
+      sha256 = "1k1ffki9gcgah7xymyzbwza00gw3dvkfghcbyy4dpvbb0q4ayw7c";
+      name = "libksane-18.04.1.tar.xz";
     };
   };
   libksieve = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/libksieve-18.04.0.tar.xz";
-      sha256 = "16x419wzpyl9jj4q49rwmfm75x6minwrg0jvkad5kh541r52a5bn";
-      name = "libksieve-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/libksieve-18.04.1.tar.xz";
+      sha256 = "0dsb1lj155y32avlgw6clxpbv00z3nrc7a7nlfh29l0wjl09mr50";
+      name = "libksieve-18.04.1.tar.xz";
     };
   };
   lokalize = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/lokalize-18.04.0.tar.xz";
-      sha256 = "19j0jqn3xzawsyy4fzsy3c2hrjp9920bihzpbq8yalws6w0v8li4";
-      name = "lokalize-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/lokalize-18.04.1.tar.xz";
+      sha256 = "1svwl30abycdq2jc4a688lbb4yk28dqscchi1zshdii6w00bcys9";
+      name = "lokalize-18.04.1.tar.xz";
     };
   };
   lskat = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/lskat-18.04.0.tar.xz";
-      sha256 = "1dk73c6v5h5abx5244rnjjfxi2cn2sya1jav3020nif111c2c9f7";
-      name = "lskat-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/lskat-18.04.1.tar.xz";
+      sha256 = "0isy9ibk93i4b72cdv5210n8gfwiydrw4i0bax2pkyxqymyfr5lj";
+      name = "lskat-18.04.1.tar.xz";
     };
   };
   mailcommon = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/mailcommon-18.04.0.tar.xz";
-      sha256 = "10psdddw3wzyalh5662rvq68l8i9sxmcl5pavgn03np3g3fws8fd";
-      name = "mailcommon-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/mailcommon-18.04.1.tar.xz";
+      sha256 = "0s0c4swm1q331hzqg0fqb2r9dwx4aamwan3s5p71vjnibxzbmqck";
+      name = "mailcommon-18.04.1.tar.xz";
     };
   };
   mailimporter = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/mailimporter-18.04.0.tar.xz";
-      sha256 = "0wwclx24bfczqxvcf5jdfpqa9cx0dv9ygsj5blaqk9g5pgych5hi";
-      name = "mailimporter-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/mailimporter-18.04.1.tar.xz";
+      sha256 = "1qzc7yjjscbxkinby9carp02wqppx95hirq0m5ihly7avn5cn6dz";
+      name = "mailimporter-18.04.1.tar.xz";
     };
   };
   marble = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/marble-18.04.0.tar.xz";
-      sha256 = "0q1dr2p4qwcik86fcr0jqvplkwfnj14fysqcqk2pwwdkfnqlsppv";
-      name = "marble-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/marble-18.04.1.tar.xz";
+      sha256 = "04aa32qnr585lq3s3hmxqlwqranr3wr1zr1xm99pbsb32k2yyyjn";
+      name = "marble-18.04.1.tar.xz";
     };
   };
   mbox-importer = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/mbox-importer-18.04.0.tar.xz";
-      sha256 = "1kai38svb4bsj1kfhyv94sgxqavj4fgb4laxl2sxvwah3rk6avd5";
-      name = "mbox-importer-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/mbox-importer-18.04.1.tar.xz";
+      sha256 = "06735201365rpp3lr877pqdkz9206zfzhvbbr432fvg6lx3p5z4s";
+      name = "mbox-importer-18.04.1.tar.xz";
     };
   };
   messagelib = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/messagelib-18.04.0.tar.xz";
-      sha256 = "14nn6aw1831j0iwwb7d4swxh6i4855izglmifq2ijsbpbdqsq5p2";
-      name = "messagelib-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/messagelib-18.04.1.tar.xz";
+      sha256 = "1fznlxl1j1n5pbg3v7rmd4lhfjhr1r95b62gyqydlrrwgzzs92b2";
+      name = "messagelib-18.04.1.tar.xz";
     };
   };
   minuet = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/minuet-18.04.0.tar.xz";
-      sha256 = "0fdyv0qbj04pxsbyvrmbqs7bff7cld28iyw7n8lgv2gdm3n45vbh";
-      name = "minuet-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/minuet-18.04.1.tar.xz";
+      sha256 = "0fans0fpghdckmp6ww8api4d7kfna1w20yjgssvfqxgyxxni0vps";
+      name = "minuet-18.04.1.tar.xz";
     };
   };
   okular = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/okular-18.04.0.tar.xz";
-      sha256 = "1ywzpdahnfc0ydvpidphdyh61ql7zwk4m6cpfj2zg9njh276w1d8";
-      name = "okular-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/okular-18.04.1.tar.xz";
+      sha256 = "0fhfbjlwa4xzf2q2wnidprj7qqizs26i959k61k4j66y66d2za0g";
+      name = "okular-18.04.1.tar.xz";
     };
   };
   palapeli = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/palapeli-18.04.0.tar.xz";
-      sha256 = "0m4h5h15qcqdhlrsi73c8jxkb3zhz07m2jw3r37603w4g6jk9g8b";
-      name = "palapeli-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/palapeli-18.04.1.tar.xz";
+      sha256 = "01p1xipacb8w7lcd3n8387c7axjxswvv62rn7sphp736l23wri5c";
+      name = "palapeli-18.04.1.tar.xz";
     };
   };
   parley = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/parley-18.04.0.tar.xz";
-      sha256 = "0h87zfqssbbvwyvar9yf8hv53bdpv7arncs63l6hfr6ajspla9if";
-      name = "parley-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/parley-18.04.1.tar.xz";
+      sha256 = "1qh7bg38bvq8drnd7plkdxxqsl6rgd37g3iqnxwljxf723s6hcz5";
+      name = "parley-18.04.1.tar.xz";
     };
   };
   picmi = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/picmi-18.04.0.tar.xz";
-      sha256 = "1pxa4xql2c78n0jqswgll2hpfn33fgw6yz7g8ydgn5nnbcsfhs6r";
-      name = "picmi-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/picmi-18.04.1.tar.xz";
+      sha256 = "095xm4nkd0kg0pvbbp3vasll1lfpk491frspk2463q0zhd04hpmi";
+      name = "picmi-18.04.1.tar.xz";
     };
   };
   pimcommon = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/pimcommon-18.04.0.tar.xz";
-      sha256 = "0xnh0xys4sfqashimc1zsdxbssd3821bp9cx6hb0d8l3bq5x2vrp";
-      name = "pimcommon-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/pimcommon-18.04.1.tar.xz";
+      sha256 = "0zyd0ja6ir6nbkvf4hk6hi93qr19kns8hgww15y2xmdhdcyf52ja";
+      name = "pimcommon-18.04.1.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/pim-data-exporter-18.04.0.tar.xz";
-      sha256 = "0isr1hv74n9mbihirk4qr109d4shh42k8jgcy9v2hmkplq72vwc7";
-      name = "pim-data-exporter-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/pim-data-exporter-18.04.1.tar.xz";
+      sha256 = "0k69nmjp0n2mmg1nsghghk2ybnvyr01gnrhqwvknpbncb2cnkgcg";
+      name = "pim-data-exporter-18.04.1.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/pim-sieve-editor-18.04.0.tar.xz";
-      sha256 = "0q1f72mb925qzikqfpv74dcc5f9ipxszvm0z05lsp1dhrmz1pf9a";
-      name = "pim-sieve-editor-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/pim-sieve-editor-18.04.1.tar.xz";
+      sha256 = "076hzkia8l61nn3gwma88lsx02d1fb6d00jbibvghqp7raa9f0fx";
+      name = "pim-sieve-editor-18.04.1.tar.xz";
     };
   };
   poxml = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/poxml-18.04.0.tar.xz";
-      sha256 = "1rwr1ldrkwyfxm56i16mpq0vmqiq2397gcbzg4skqpc727s55nlv";
-      name = "poxml-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/poxml-18.04.1.tar.xz";
+      sha256 = "1ha1dy5j40269nv5ygb0idd9kkizni3zq4vz64i2y29lvbrqdgh1";
+      name = "poxml-18.04.1.tar.xz";
     };
   };
   print-manager = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/print-manager-18.04.0.tar.xz";
-      sha256 = "1x70xia2rph40flx4r3cpxcvxfzny83v87l4kgc1n0khavhp9lpx";
-      name = "print-manager-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/print-manager-18.04.1.tar.xz";
+      sha256 = "10l2w1fyym4nflmqnfsxdnnbllvliwyx7z7ylmi4i4rkcpaafyqx";
+      name = "print-manager-18.04.1.tar.xz";
     };
   };
   rocs = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/rocs-18.04.0.tar.xz";
-      sha256 = "0q0q9bnmsw23jdbrxrkmmjvyr5jv4s1z8v9h7nsaxqs1k2prflp4";
-      name = "rocs-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/rocs-18.04.1.tar.xz";
+      sha256 = "1bsm1kjkp9x2rh4n682kjyljisri7mniw5yap4ifksq5lk2vbn8z";
+      name = "rocs-18.04.1.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/signon-kwallet-extension-18.04.0.tar.xz";
-      sha256 = "04r92pc8l2vw1dc916n658484v14smqrgg4ngx6rccffm58jfvk0";
-      name = "signon-kwallet-extension-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/signon-kwallet-extension-18.04.1.tar.xz";
+      sha256 = "0xhvah1xq60wiz6pyjkc66sxsz1v3vdzjbjdr5kklpr98pg9xlib";
+      name = "signon-kwallet-extension-18.04.1.tar.xz";
     };
   };
   spectacle = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/spectacle-18.04.0.tar.xz";
-      sha256 = "1slqgp1rgzcw4nikh6zmxpp3yc04dfbjcqqx2j4wpa1p2xwfv0c2";
-      name = "spectacle-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/spectacle-18.04.1.tar.xz";
+      sha256 = "0k8vl79gwm4sj0f5pshz99l6cq323hk7a4r1jqzkdmbdv1mc0rgc";
+      name = "spectacle-18.04.1.tar.xz";
     };
   };
   step = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/step-18.04.0.tar.xz";
-      sha256 = "048f4n24819vj41a0hdabmqvw6k7wkwwicz0q0slvfqws5c3h1l4";
-      name = "step-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/step-18.04.1.tar.xz";
+      sha256 = "1zwxjsjv72wjvzwj7cdz3lclw92bp9306bcpm4bpfrlcnr3xny1z";
+      name = "step-18.04.1.tar.xz";
     };
   };
   svgpart = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/svgpart-18.04.0.tar.xz";
-      sha256 = "1yf535ry8xc7lqhcavn2kjmjs0ngkwinm369q0qp7hfddcpsyfbp";
-      name = "svgpart-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/svgpart-18.04.1.tar.xz";
+      sha256 = "14qf9xfgvgk8d49qz6vhfivzw8hsmj6q2scjk6vg3i16y62qlym9";
+      name = "svgpart-18.04.1.tar.xz";
     };
   };
   sweeper = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/sweeper-18.04.0.tar.xz";
-      sha256 = "1yf1xfbv516ia3aqj3l8qcdsbjac9pnm8qb23l26g6n3jnq4b331";
-      name = "sweeper-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/sweeper-18.04.1.tar.xz";
+      sha256 = "0f8nyxdw2arpa85vwl834jqbydvsx7dswjl8cdy66frx5jyqirim";
+      name = "sweeper-18.04.1.tar.xz";
     };
   };
   syndication = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/syndication-18.04.0.tar.xz";
-      sha256 = "11fx8f9sfc51w5dg6mylbvk0yaaxvc9y2dsg9xxasiw8v6rjjq3n";
-      name = "syndication-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/syndication-18.04.1.tar.xz";
+      sha256 = "1gcas0aqgzr6r571d66yn7hw86hdb4akd5vgk5jh3liww25y8qm5";
+      name = "syndication-18.04.1.tar.xz";
     };
   };
   umbrello = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/umbrello-18.04.0.tar.xz";
-      sha256 = "1lbf82j04j8qax7qnsqwsjrz1m4yq0ca6xc9fdhmvkpnzn5z9ydp";
-      name = "umbrello-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/umbrello-18.04.1.tar.xz";
+      sha256 = "1vw8py5nm7mpv3qa0lxi72cvbvslxppag6aqhbp2zsnz6b152qhy";
+      name = "umbrello-18.04.1.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "18.04.0";
+    version = "18.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/18.04.0/src/zeroconf-ioslave-18.04.0.tar.xz";
-      sha256 = "0lqh70bmlrj22d82vhm5a9ylm2yj9rz4zgncfwrh9952q1xkzl22";
-      name = "zeroconf-ioslave-18.04.0.tar.xz";
+      url = "${mirror}/stable/applications/18.04.1/src/zeroconf-ioslave-18.04.1.tar.xz";
+      sha256 = "09nvkcq924v3f8jl36618j0hx2b1dzkvbvspf98mnx9lsliyzsc3";
+      name = "zeroconf-ioslave-18.04.1.tar.xz";
     };
   };
 }

From 140680846826943ce2399b8543b80ba322562e6b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 14 May 2018 17:32:43 +0800
Subject: [PATCH 1809/3370] kde-frameworks: 5.45 -> 5.46

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/ki18n.nix        |   8 +-
 .../libraries/kde-frameworks/srcs.nix         | 624 +++++++++---------
 3 files changed, 314 insertions(+), 320 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index ede76323347e..70363e6d2e6a 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.45/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.46/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index ee7d13af5b1e..3b9ca74bbd07 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchpatch,
+  mkDerivation, lib,
   extra-cmake-modules, gettext, python,
   qtbase, qtdeclarative, qtscript,
 }:
@@ -13,10 +13,4 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedNativeBuildInputs = [ gettext python ];
   buildInputs = [ qtdeclarative qtscript ];
-  patches = [
-    (fetchpatch {
-      url = "https://phabricator.kde.org/D12216?download=true";
-      sha256 = "04gpyb11vlgivqjx3lqdwgqb4ss5bphy5zmh65k57bbv4rnlsm15";
-    })
-  ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 8e2187f29574..7f4c42a5d182 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,627 @@
 
 {
   attica = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/attica-5.45.0.tar.xz";
-      sha256 = "1vzbajj2ldhg26ssxh0vkahj7fw5v9nhrv000vbxlhsrcczq81n5";
-      name = "attica-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/attica-5.46.0.tar.xz";
+      sha256 = "0xj4wn7nd28hfvbcpx4gfgf00vdg3kyfvqy0vk4js49xq14q9j09";
+      name = "attica-5.46.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/baloo-5.45.0.tar.xz";
-      sha256 = "0zr2pg946q3wc6bhsbngpmca0ylhw8ckfdrs6ym36v7xz3h5fhds";
-      name = "baloo-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/baloo-5.46.0.tar.xz";
+      sha256 = "01ww9yqw9zi2r71i8gh87vs20k3kmvc1mq9a3di21zk5glb8hdy3";
+      name = "baloo-5.46.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/bluez-qt-5.45.0.tar.xz";
-      sha256 = "056xl29yf7bkqrn655c9b2wdx69021q7cz176rx4daid70i8nx49";
-      name = "bluez-qt-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/bluez-qt-5.46.0.tar.xz";
+      sha256 = "0hgqxpxx1b2vpr5fxhgk8s4m1njc9i080zqb62bh4vvsdayzib6l";
+      name = "bluez-qt-5.46.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/breeze-icons-5.45.0.tar.xz";
-      sha256 = "0nzi4wy0p7lkb76nynmwbgnrsrfbhfxn3269mkbqwakq6i4mxsj8";
-      name = "breeze-icons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/breeze-icons-5.46.0.tar.xz";
+      sha256 = "1sq7j0clqc1zm330p49ny76jasn0dvvf1lszclfldg540n376343";
+      name = "breeze-icons-5.46.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/extra-cmake-modules-5.45.0.tar.xz";
-      sha256 = "0g7njdz6bqjcswq100mb2jr4l1mdicqq24wdw3a8f63syg5rvm76";
-      name = "extra-cmake-modules-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/extra-cmake-modules-5.46.0.tar.xz";
+      sha256 = "0xf232d9znln6a7i8mcff4nr0kd5x6qpp1hxbf5pp7g1cwdkxnp5";
+      name = "extra-cmake-modules-5.46.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/frameworkintegration-5.45.0.tar.xz";
-      sha256 = "0s300vp674rq2dinhjjsp7v4gmv6ybxsk1r3asv3x789zwz1lr3i";
-      name = "frameworkintegration-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/frameworkintegration-5.46.0.tar.xz";
+      sha256 = "1nb5b81b5g1y8crn6mwkjhkf8dzamyfpcl49c3ml34i1d68jbil3";
+      name = "frameworkintegration-5.46.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kactivities-5.45.0.tar.xz";
-      sha256 = "0h3hym4am055f9kyhg98gabw00nb1h10b9dvbs3hs3178dyi5gjg";
-      name = "kactivities-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kactivities-5.46.0.tar.xz";
+      sha256 = "1a1339i0zag6zsp7mq2w86v7h2fz3bc5jd6w7kb5yphagnwdp9kk";
+      name = "kactivities-5.46.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kactivities-stats-5.45.0.tar.xz";
-      sha256 = "0jcvikr7yvjik8zdz46mkrxf2c3ydns194a07njw7hd15x1czqjl";
-      name = "kactivities-stats-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kactivities-stats-5.46.0.tar.xz";
+      sha256 = "18mdx8fxrq71rwz7zgx7j30k5ch0yjiyh86nwx9a4yrf6d2ykxwj";
+      name = "kactivities-stats-5.46.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kapidox-5.45.0.tar.xz";
-      sha256 = "1996akdnhrky1bk63xraj0qawx6ar1vk6ia4rmdgq0bqjk804g1p";
-      name = "kapidox-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kapidox-5.46.0.tar.xz";
+      sha256 = "16kn5mka2mzvqpdfa7w82zgj7vi0ig611qa16flgazzrcbl2m827";
+      name = "kapidox-5.46.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/karchive-5.45.0.tar.xz";
-      sha256 = "0gl86ybjkmjz6sl4s00j8mi43admj7xnjnmv92q5lngk75k1zbhq";
-      name = "karchive-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/karchive-5.46.0.tar.xz";
+      sha256 = "1xphgm8lxicws4bss5svq7r81n1j1zssgfq35vmlms22cpr7pr28";
+      name = "karchive-5.46.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kauth-5.45.0.tar.xz";
-      sha256 = "1j6pgbkqjw70lnpk84wqi9m81hc55f1z4cfxkd8hhdk578pry56i";
-      name = "kauth-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kauth-5.46.0.tar.xz";
+      sha256 = "0w0zvaxzv6bl76hr8wxhg6w0cfp3sdcqdpimspyc7dvddvq3vbr3";
+      name = "kauth-5.46.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kbookmarks-5.45.0.tar.xz";
-      sha256 = "0ii0gi4vlngp0qypyn2780dnqpkg24k0wb5jpngllrvrf37132md";
-      name = "kbookmarks-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kbookmarks-5.46.0.tar.xz";
+      sha256 = "1i7dsw5rskf7fb8bylwnnysppgmrzizw35wl8n5rw2lkk814a7xl";
+      name = "kbookmarks-5.46.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcmutils-5.45.0.tar.xz";
-      sha256 = "0w082wr9h2rpk9jyads9bwdimhqjl6f68l710miwjglzcmfy4dgq";
-      name = "kcmutils-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcmutils-5.46.0.tar.xz";
+      sha256 = "0bwvsn3fm53d3wqsapakkg0v791vx9kxla973576mlaqpk1zgn1v";
+      name = "kcmutils-5.46.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcodecs-5.45.0.tar.xz";
-      sha256 = "0si694a64dbb65m7gzcvz474gd61nyvj71wh77chsbsh6hvl1xzx";
-      name = "kcodecs-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcodecs-5.46.0.tar.xz";
+      sha256 = "0ywj61zmfr09nwd9v8x11jnlymkv2r3bvvkbar1p4wc8291n7cfd";
+      name = "kcodecs-5.46.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcompletion-5.45.0.tar.xz";
-      sha256 = "0lqp0m715hqh8ci1cq7r1y00828ajjzz5y04xpxw78gk9gprakf8";
-      name = "kcompletion-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcompletion-5.46.0.tar.xz";
+      sha256 = "01rj0z26ppv2m3a7h4gh5kz96q877afk79354bvmwqi5w99iqv5a";
+      name = "kcompletion-5.46.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kconfig-5.45.0.tar.xz";
-      sha256 = "00r7vh2myh518wfngfr1gmz6svmnvjfx9bxv8px5z1ap0yda181p";
-      name = "kconfig-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kconfig-5.46.0.tar.xz";
+      sha256 = "1yx2f81mik3c3hdr424j92drqs3zmsqcjryfyzczxsbllsmf6zma";
+      name = "kconfig-5.46.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kconfigwidgets-5.45.0.tar.xz";
-      sha256 = "0kj0a2x6f27hkzyl7pfz20b0mv4625nxr7iqdq130wdy5x0wv71l";
-      name = "kconfigwidgets-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kconfigwidgets-5.46.0.tar.xz";
+      sha256 = "0d4x323j6yrjjf191vf25g4fl9iad652y0kgqdqv4r2sszb7w3bp";
+      name = "kconfigwidgets-5.46.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcoreaddons-5.45.0.tar.xz";
-      sha256 = "15zgz8yhw7z31rljgj63hd949sp48syd1ggbay5nmnsb91ly0z92";
-      name = "kcoreaddons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcoreaddons-5.46.0.tar.xz";
+      sha256 = "13chb3xh9xyacf72kzvw6rkc9i54p1gifcnk7wx5g223bdym7h3z";
+      name = "kcoreaddons-5.46.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kcrash-5.45.0.tar.xz";
-      sha256 = "1ny3m1jqazf7b2qrh4dlprwyf60cddk2c88dxhmzr02a8040gckv";
-      name = "kcrash-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kcrash-5.46.0.tar.xz";
+      sha256 = "0d9k9i7lk5cj9j91av87x5gjahzs2lhkk6m1q27675sadp9hb6ih";
+      name = "kcrash-5.46.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdbusaddons-5.45.0.tar.xz";
-      sha256 = "071zr5d95j1cd1djqd5nkfz5n224dmzsbx2a446dsp9liklhqaz6";
-      name = "kdbusaddons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdbusaddons-5.46.0.tar.xz";
+      sha256 = "07h3n06ld1p3gspky3xsx89vpl46hq5apjqr4f2ccahscmyk1fn3";
+      name = "kdbusaddons-5.46.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdeclarative-5.45.0.tar.xz";
-      sha256 = "0h84nla5symfdyrv5dvgs8b1mz0czclipiki16xglzdsja9z9xpl";
-      name = "kdeclarative-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdeclarative-5.46.0.tar.xz";
+      sha256 = "10r20wx36q4kzr973kgwr7j2wq140xiarjawnqpmszcp1gm9qv8c";
+      name = "kdeclarative-5.46.0.tar.xz";
     };
   };
   kded = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kded-5.45.0.tar.xz";
-      sha256 = "0qr4ycqqz2g5k9pzllahc7aj1b6fyh0zidvaxvbw600wjr5v3acw";
-      name = "kded-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kded-5.46.0.tar.xz";
+      sha256 = "0is8x8r2dpam2m83pylyb3wfjdnn6nnrdaqkpglmbrq3r71n002r";
+      name = "kded-5.46.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kdelibs4support-5.45.0.tar.xz";
-      sha256 = "0kil35fj9p8g99jmmkvch326j32wfjqrhypzwg0sa0d74vc2pv5s";
-      name = "kdelibs4support-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kdelibs4support-5.46.0.tar.xz";
+      sha256 = "19jjn5dxgayi9m3kglalg473zslbxc0818fqckichxxn4a0wmylz";
+      name = "kdelibs4support-5.46.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdesignerplugin-5.45.0.tar.xz";
-      sha256 = "0gqvga5akilmqldhzmgjyngbz2dmxmkcjq2g5diq6pijiafsx8kj";
-      name = "kdesignerplugin-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdesignerplugin-5.46.0.tar.xz";
+      sha256 = "11xvl7vjmwv5s9bhkywcapc4h4g8sdrnkwgwzgjf528mfhysi76a";
+      name = "kdesignerplugin-5.46.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdesu-5.45.0.tar.xz";
-      sha256 = "0znncn74vmczcqffc0n6q39q3mk4vsfwj3zn5kglzzsg0x730aly";
-      name = "kdesu-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdesu-5.46.0.tar.xz";
+      sha256 = "0jm4cyy85afq69qaxxzvgfv59y80i76skvwrpa59w8sl173xh8di";
+      name = "kdesu-5.46.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdewebkit-5.45.0.tar.xz";
-      sha256 = "0jdxaaysgdgp15yn2fnxf6m22djyvnl4jcyyrjxz7mz0s0lc4pg9";
-      name = "kdewebkit-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdewebkit-5.46.0.tar.xz";
+      sha256 = "0vr4smvj34yycxrwzhaqd8kmh6jfjxf4a0y2c1j5k41m1w0wdppl";
+      name = "kdewebkit-5.46.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdnssd-5.45.0.tar.xz";
-      sha256 = "181slqgyp7xsg6xz92zris6yjmzysglvkbiyiii4245z1ms9pf0x";
-      name = "kdnssd-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdnssd-5.46.0.tar.xz";
+      sha256 = "1rpf9hjqcv3k8dcwdzdlbyx5shwmjkvck59cgfmzzh6jl81w9z6d";
+      name = "kdnssd-5.46.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kdoctools-5.45.0.tar.xz";
-      sha256 = "0b2bkn9a7nxyynn5cy53kb62khfklayj8fwgfdh3sr5a15yjycm5";
-      name = "kdoctools-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kdoctools-5.46.0.tar.xz";
+      sha256 = "1zkxnib2b08nb1mxc7sjij07nk0bbylfrrd7p1h8jrx0m4gip7ik";
+      name = "kdoctools-5.46.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kemoticons-5.45.0.tar.xz";
-      sha256 = "1981430xbypxswayrjf5c9bvk65dd2gsima8k0rvysbcqlnyqq7s";
-      name = "kemoticons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kemoticons-5.46.0.tar.xz";
+      sha256 = "0yxi72x1acjpmkpnkpy8m4y7il095bmmrgnkc9yrax4lmr9hksil";
+      name = "kemoticons-5.46.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kfilemetadata-5.45.0.tar.xz";
-      sha256 = "0wcgsbpkvi8pls9zh24z4c328dl7lq8km4r7dag9vw4200bncwa6";
-      name = "kfilemetadata-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kfilemetadata-5.46.0.tar.xz";
+      sha256 = "15panysvxn7di38dplslpii9xskich09j9x7s79p43pxyczmq0l3";
+      name = "kfilemetadata-5.46.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kglobalaccel-5.45.0.tar.xz";
-      sha256 = "1iwmwpdxrymsyryvp007n3kz2w9syhl4h9jk6x77hprnmwj62cym";
-      name = "kglobalaccel-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kglobalaccel-5.46.0.tar.xz";
+      sha256 = "0xnljxkp9rcl3y22mzlz7zlq923ngyvihg6s7mqpfh97ayfh3pvv";
+      name = "kglobalaccel-5.46.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kguiaddons-5.45.0.tar.xz";
-      sha256 = "16cgi9a9laiwzg2fbp5hl3qlxjmhq0l7dw5kjpkzm7xvlj0rm5cn";
-      name = "kguiaddons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kguiaddons-5.46.0.tar.xz";
+      sha256 = "02x9aqdvy3gl1y25g03cpk340xzhrmdi84v5xw8y7i2xbmgax244";
+      name = "kguiaddons-5.46.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kholidays-5.45.0.tar.xz";
-      sha256 = "02bcybzkzp26sz6rjnsh60jmwidmjg8wnixzxs5fk7h8qfygm4ra";
-      name = "kholidays-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kholidays-5.46.0.tar.xz";
+      sha256 = "10xb35zinriah3q214qhdwx3riqfj7w0dvn2ds5kcfa070q694yq";
+      name = "kholidays-5.46.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/khtml-5.45.0.tar.xz";
-      sha256 = "1ligyb5hpp53q13r9a2w1xi7b5dc1xqqi9bf3jri01n9pf5d4ynq";
-      name = "khtml-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/khtml-5.46.0.tar.xz";
+      sha256 = "0cdq8y09qbciwaxvkln03n9jy91li0yp2g440sd580hd3n4zvs09";
+      name = "khtml-5.46.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/ki18n-5.45.0.tar.xz";
-      sha256 = "1xjwwlr46x0wr26xn4z086rlzm2bgzyi1ck91cbcc0jv6p6n43mp";
-      name = "ki18n-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/ki18n-5.46.0.tar.xz";
+      sha256 = "0lwjmxkfqhxwjm0m86f0saa3irzv70psl5y8pv1qib82q3fv73ns";
+      name = "ki18n-5.46.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kiconthemes-5.45.0.tar.xz";
-      sha256 = "0wir8drhv5lx00f4n984yh5xavpi75vg1vpyrf68dd490klwzg45";
-      name = "kiconthemes-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kiconthemes-5.46.0.tar.xz";
+      sha256 = "1y8f2piy258n0k8jrlyhgflafxcqax18fi46719av29ls48cgcap";
+      name = "kiconthemes-5.46.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kidletime-5.45.0.tar.xz";
-      sha256 = "0057az4a9jvn120j94jsmf78lxw03c6s534mjn4r8ns9j46c060i";
-      name = "kidletime-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kidletime-5.46.0.tar.xz";
+      sha256 = "0hvgvmgfrnfmfgi19mjc1cg31yli7pzr9fq2ny9pk63is6zgq3vm";
+      name = "kidletime-5.46.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kimageformats-5.45.0.tar.xz";
-      sha256 = "0kdcrlpj56sw9gy9wf6dxlrsa11k3hv6ayvv6irry3iv1akfx7yp";
-      name = "kimageformats-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kimageformats-5.46.0.tar.xz";
+      sha256 = "0gkmd5ma0dh06vdr8kzw5v9hqw6xqiizzvq7aya2y9lk42p4hay3";
+      name = "kimageformats-5.46.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kinit-5.45.0.tar.xz";
-      sha256 = "0phqwp60368vynnkh0hl3kdz6p0kisa5ab6fvgvks5p9h1nb6l2h";
-      name = "kinit-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kinit-5.46.0.tar.xz";
+      sha256 = "0szpvni3ff50i5w4c2jdi8wsb2i4dfhdna7wcmrzc5qd2l62yi6m";
+      name = "kinit-5.46.0.tar.xz";
     };
   };
   kio = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kio-5.45.0.tar.xz";
-      sha256 = "05bb27jfinpfdh3vz76prkdvpp574sx1sr41b6qk267y37l14x9y";
-      name = "kio-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kio-5.46.0.tar.xz";
+      sha256 = "19fkijl7h1p92sngsqypsd2ni9qld9cxwh8c7diq0ybp8qzpjspb";
+      name = "kio-5.46.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kirigami2-5.45.0.tar.xz";
-      sha256 = "00miz1zwhq5ikwyqvvl6ha8w1dra7rxgw59wfg1ac74kjpb964ng";
-      name = "kirigami2-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kirigami2-5.46.0.tar.xz";
+      sha256 = "1d6w4kc6kf0jlgji83r8zn0r5rdggygi28938wyb3wz4pgaz8m8d";
+      name = "kirigami2-5.46.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kitemmodels-5.45.0.tar.xz";
-      sha256 = "08mbvs6lcfwbprk51fjswig0sprn5pcgrhy34qbbnim5ijf8gkw1";
-      name = "kitemmodels-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kitemmodels-5.46.0.tar.xz";
+      sha256 = "0xy8bqbaqnkxk34p7hfslm42dm98ka86fwi77pz04gw9r6048wq2";
+      name = "kitemmodels-5.46.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kitemviews-5.45.0.tar.xz";
-      sha256 = "19cm7vxkp7qiqhjj7ma2nx4lvp2hiffnakiic26jqzb9sb0vkq2n";
-      name = "kitemviews-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kitemviews-5.46.0.tar.xz";
+      sha256 = "1ni3c2ivqr5vczl7z5707nv469xbwys1vz625ypwfh8py2b9nnwz";
+      name = "kitemviews-5.46.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kjobwidgets-5.45.0.tar.xz";
-      sha256 = "1946wqa6dpi82771nw70nz123w1xa9znhn9kgb0q5ypzc89498gj";
-      name = "kjobwidgets-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kjobwidgets-5.46.0.tar.xz";
+      sha256 = "129mxv7c0fmqdmzg1j8r0cb8sr9masrmkjl4dp8i6yark49k61hf";
+      name = "kjobwidgets-5.46.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kjs-5.45.0.tar.xz";
-      sha256 = "1xmc57fv3692vk0pzmrs1wyzgd69dhp6by0i1kw4a76w8h0lh5sr";
-      name = "kjs-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kjs-5.46.0.tar.xz";
+      sha256 = "002k1jbcwxyv8dcmz3x4m7zv1ry2gdzg5gl466vf5hlc5cwgjac5";
+      name = "kjs-5.46.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kjsembed-5.45.0.tar.xz";
-      sha256 = "15jlbr5nw3c3p4cylr01c6w8isf78wnljsym8fsl9513k8cfabif";
-      name = "kjsembed-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kjsembed-5.46.0.tar.xz";
+      sha256 = "13l2i0i8qlzs993nfbcgaijkhy7w9npn5358d5hfkxjlay7imcq2";
+      name = "kjsembed-5.46.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kmediaplayer-5.45.0.tar.xz";
-      sha256 = "0p3fm448xdcw7qmpbadx9rb6q1zx8bbap0a3xm11ni27s7dpvwgf";
-      name = "kmediaplayer-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kmediaplayer-5.46.0.tar.xz";
+      sha256 = "0y4cn63fa5g35vrdx2hfhrw1fzwg5k3lxgx84r3c33cybxswcigi";
+      name = "kmediaplayer-5.46.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/knewstuff-5.45.0.tar.xz";
-      sha256 = "0jk2zsxkj558rf2ar120mljjv13f261js9p27272wr6ily55navn";
-      name = "knewstuff-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/knewstuff-5.46.0.tar.xz";
+      sha256 = "12r38m7p86b2dfhp8nybm335cvizma4p26gxrwn7jg1kcvbg3hf5";
+      name = "knewstuff-5.46.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/knotifications-5.45.0.tar.xz";
-      sha256 = "0rnqlfg7n86g7fdmx32l337xjr03g1ri88dg94wci3v9rpffy839";
-      name = "knotifications-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/knotifications-5.46.0.tar.xz";
+      sha256 = "0hyf3wv3iy3v7l134pmb623bfa9j578rdymhz4sm5fix4mv23g5z";
+      name = "knotifications-5.46.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/knotifyconfig-5.45.0.tar.xz";
-      sha256 = "0qxfzrw8pmnm6jrl98d50d12x9azgj3f9bin2irim2w6zcsfqs37";
-      name = "knotifyconfig-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/knotifyconfig-5.46.0.tar.xz";
+      sha256 = "0wr0kliagkbpv89h9qviib6b16s2cw5j9jq4gpk3j5ij9zli4lkj";
+      name = "knotifyconfig-5.46.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kpackage-5.45.0.tar.xz";
-      sha256 = "0ddmpn688dil3sdlr91iqczi52rz58nwifij00c0gvj5pgp6agvg";
-      name = "kpackage-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kpackage-5.46.0.tar.xz";
+      sha256 = "1q45zjh0a741f1w1g0vggbcygzzvkzpwj0iy13fwhgf4g7qrdp8c";
+      name = "kpackage-5.46.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kparts-5.45.0.tar.xz";
-      sha256 = "0mhmy6sq21c4rgl4lfz9sr3r4zhzn2wfapm3g7qzf8554rinzs5z";
-      name = "kparts-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kparts-5.46.0.tar.xz";
+      sha256 = "1hr0hy1jsi00rfnjy1wf59skricib6cc0c4bw0h0gw0rdy1vv80j";
+      name = "kparts-5.46.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kpeople-5.45.0.tar.xz";
-      sha256 = "1dm8nb9ckivww867541w6bfjvhg6hi64drzx61ak1ix3ha6n24g1";
-      name = "kpeople-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kpeople-5.46.0.tar.xz";
+      sha256 = "1gkm9ylwm4ajpw6lv78qy4zkmqirm4xnrf0nld3x7jrbpiadfrni";
+      name = "kpeople-5.46.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kplotting-5.45.0.tar.xz";
-      sha256 = "1fdvbd57f8aikgi6xa5qb16a32398zkn83xb6vq5rjd3jrzyk4bi";
-      name = "kplotting-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kplotting-5.46.0.tar.xz";
+      sha256 = "1vkwv2khww1v13r2ys06nfb6c0fwyn152wrfc9vqzcdcv6znq48n";
+      name = "kplotting-5.46.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kpty-5.45.0.tar.xz";
-      sha256 = "0g8daxvybiraax0395sb05468qfzdg0cjgq810kz78512carsg7f";
-      name = "kpty-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kpty-5.46.0.tar.xz";
+      sha256 = "1m1spwgrgjiazkxwddh5xcii482bvxf015x70wnkyyygilbn6871";
+      name = "kpty-5.46.0.tar.xz";
     };
   };
   kross = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/portingAids/kross-5.45.0.tar.xz";
-      sha256 = "1s8y36cn9nj5lqf8f667yyqdk0m4ankqb0fr3s9c7llb87ca8iqn";
-      name = "kross-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/portingAids/kross-5.46.0.tar.xz";
+      sha256 = "0wnj01ml3j3ij4f6plw8d1by8k9fkbslq0finiyxrn64zqfkr1sd";
+      name = "kross-5.46.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/krunner-5.45.0.tar.xz";
-      sha256 = "18rq5nzdxr8x55s3hqp5b3mibfa51sbybirhdp49igz9x2la2j9x";
-      name = "krunner-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/krunner-5.46.0.tar.xz";
+      sha256 = "1nvcprp1b5npzvcdbwzi1yn6953f8kjyfnavhjjp9vfafp4jgdca";
+      name = "krunner-5.46.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kservice-5.45.0.tar.xz";
-      sha256 = "0qrawj6hvy6q68k278nqkmdnjqk1cwr6iym9wmiq3lphsab08nl7";
-      name = "kservice-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kservice-5.46.0.tar.xz";
+      sha256 = "0q502wqvqb61gwy07byg35nk9ac12d02hhqa0qhil6qkv9f7dx57";
+      name = "kservice-5.46.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/ktexteditor-5.45.0.tar.xz";
-      sha256 = "1gp5f9v01f0824j96wmv7a48561wkcndnk75q1qdbkknxk4cmnnp";
-      name = "ktexteditor-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/ktexteditor-5.46.0.tar.xz";
+      sha256 = "1yjyni3f123i2yx20gj13yw0v6cqwwdvk6x8f3maqqdzrfnqmm8b";
+      name = "ktexteditor-5.46.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/ktextwidgets-5.45.0.tar.xz";
-      sha256 = "1r76qvn02m6b1rvzmp966xfxr6ifflzd7g7ln0sxccsd9c46lh2b";
-      name = "ktextwidgets-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/ktextwidgets-5.46.0.tar.xz";
+      sha256 = "1bniracp5q6p4k1ji0gn1a51sylbgxh0bqdlrfkd953mp35rh1wf";
+      name = "ktextwidgets-5.46.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kunitconversion-5.45.0.tar.xz";
-      sha256 = "0alm5s3c6g3w66gzii7jjsb0cn4naiimsnm5dag6idhix79wa1kr";
-      name = "kunitconversion-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kunitconversion-5.46.0.tar.xz";
+      sha256 = "14db0835zd375sn3d4v6d2pa5yp67gn9p8dxfs8111minmraqk43";
+      name = "kunitconversion-5.46.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kwallet-5.45.0.tar.xz";
-      sha256 = "1yis49k3wyk8vhmdhgjrn42jq5kah5z7dg8wgy09dhq61w50sdi9";
-      name = "kwallet-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kwallet-5.46.0.tar.xz";
+      sha256 = "15fvbyfdbmdq7zvsbj1c7xzyyhfd5mhv9zvgiss00ranhghsbbzh";
+      name = "kwallet-5.46.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kwayland-5.45.0.tar.xz";
-      sha256 = "0pk242h8ggd3szyw6jlk0zz8q4rw4ppbbidkilzv3lx340jr1qkq";
-      name = "kwayland-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kwayland-5.46.0.tar.xz";
+      sha256 = "1dwvxhpa93k9l2iqbpyf6s7hkmi91kc56hm0v5q6k2mgb43g32nj";
+      name = "kwayland-5.46.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kwidgetsaddons-5.45.0.tar.xz";
-      sha256 = "0ywya6fa0q7vdwj7almkvdi16m839c48ma7j9sd87rc0dhigv0p0";
-      name = "kwidgetsaddons-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kwidgetsaddons-5.46.0.tar.xz";
+      sha256 = "0h8n4hiyzynpg59bfrk3wgdc1w0b3pdbvimykgjvrrmn4wi6h8f9";
+      name = "kwidgetsaddons-5.46.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kwindowsystem-5.45.0.tar.xz";
-      sha256 = "0139413wk8ifyfwadln87ik55jrp5bccy3lbz6ya191fygglx16k";
-      name = "kwindowsystem-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kwindowsystem-5.46.0.tar.xz";
+      sha256 = "0rxhi8wjjxkqsspx0mqn5049f75s3jihkp73hdgxwwdp1qc66kx3";
+      name = "kwindowsystem-5.46.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kxmlgui-5.45.0.tar.xz";
-      sha256 = "1vb5izjp27qb9685haidagjg2p14a335fwzagzal20z3j2a7j3hv";
-      name = "kxmlgui-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kxmlgui-5.46.0.tar.xz";
+      sha256 = "0wwxry3kf2xsw40dhjpa8gh1qbh4wdnd1hp1g9mmh8l0wpfv289l";
+      name = "kxmlgui-5.46.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/kxmlrpcclient-5.45.0.tar.xz";
-      sha256 = "0kfkai1cc4xb7vcspbmf6zd951dfz2yxiyjdar4d21s5krvcfh5l";
-      name = "kxmlrpcclient-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/kxmlrpcclient-5.46.0.tar.xz";
+      sha256 = "05wf844ipikikhxcri0xpdwfxs8h3m677frsqkimf778g8vf7crh";
+      name = "kxmlrpcclient-5.46.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/modemmanager-qt-5.45.0.tar.xz";
-      sha256 = "16qdvy19q5pjk82amn3mncwgvk3g2qrbdzl9wpfxhqcny18xbwdd";
-      name = "modemmanager-qt-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/modemmanager-qt-5.46.0.tar.xz";
+      sha256 = "1h9hj1v4js02gyxbh1cizz69vh8pdwb93k9pi334a2s0lxbn5205";
+      name = "modemmanager-qt-5.46.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/networkmanager-qt-5.45.0.tar.xz";
-      sha256 = "00ipzc92v229bz9vv6kga37qhpcnqrxn2h47v9n5myfr1p6acgw0";
-      name = "networkmanager-qt-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/networkmanager-qt-5.46.0.tar.xz";
+      sha256 = "1pp5sgp76fjd62iqki3cc7b2drmfgq2fjhab9ai44r852ydgkzpn";
+      name = "networkmanager-qt-5.46.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/oxygen-icons5-5.45.0.tar.xz";
-      sha256 = "1va0296118x7apb7idjf0qjx5f0flamspmzicc03znbh4hx1fxyc";
-      name = "oxygen-icons5-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/oxygen-icons5-5.46.0.tar.xz";
+      sha256 = "141qhbk6rakvh2clxyfhinzka3ap99ac8y90qplgss31ww0wxbb5";
+      name = "oxygen-icons5-5.46.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/plasma-framework-5.45.0.tar.xz";
-      sha256 = "1db8pyq1bdkswi59aihaqgas3xzzlfsfd9yn34g4q00gzc17ird5";
-      name = "plasma-framework-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/plasma-framework-5.46.0.tar.xz";
+      sha256 = "0zpv6b128ll9yf23ys8hv35a95igmlbk3zid5k4385b6h0j4h367";
+      name = "plasma-framework-5.46.0.tar.xz";
     };
   };
   prison = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/prison-5.45.0.tar.xz";
-      sha256 = "1g6rnyx84sz28cf427y9yp0lcbdhrlgx4ns80jz34gyzcgi4bxi0";
-      name = "prison-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/prison-5.46.0.tar.xz";
+      sha256 = "1508pcqvyjfqg0yxk2jx32cqlvvz658z001n6iaf4c7hwclkyspg";
+      name = "prison-5.46.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/purpose-5.45.0.tar.xz";
-      sha256 = "0mfx2gl78w2wwkykl0zch88i7d10zq5cm2xqwxjfpkpdjwb7pflb";
-      name = "purpose-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/purpose-5.46.0.tar.xz";
+      sha256 = "1mrssw484hb3nk9hafys0ns1ixd8h3l6m8qnyry9ky964xqmbkg1";
+      name = "purpose-5.46.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/qqc2-desktop-style-5.45.0.tar.xz";
-      sha256 = "1dc20wkh2cfyhd7wkg1v1b5f6asz70m8ksml6r5hzs807sdqvrsa";
-      name = "qqc2-desktop-style-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/qqc2-desktop-style-5.46.0.tar.xz";
+      sha256 = "0hfl0qk4nadz2jykn0xaphppiqva0h83br4ym6zf2wc3c5sd6w91";
+      name = "qqc2-desktop-style-5.46.0.tar.xz";
     };
   };
   solid = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/solid-5.45.0.tar.xz";
-      sha256 = "175hsj2hdsdnz4wkg1l56275390nn1kjpwcyb7ryzzqabn7hdqmd";
-      name = "solid-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/solid-5.46.0.tar.xz";
+      sha256 = "0ywx5nbms6nk7dmcbbgjfm8w3lchhf90wlhv077yhmxlnqciv3im";
+      name = "solid-5.46.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/sonnet-5.45.0.tar.xz";
-      sha256 = "0msrwxfvc4vr4xqpwavnj0w4cwkflfjql8nhgm5bvk6cpcxs92ss";
-      name = "sonnet-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/sonnet-5.46.0.tar.xz";
+      sha256 = "13jmyiqfwcc7r5y2mb2hwwnn28bq1l0pjlfv8g963r0agzyap424";
+      name = "sonnet-5.46.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/syntax-highlighting-5.45.0.tar.xz";
-      sha256 = "1v73jzansk6z0kwq65gxvkcm7vcmgw2jvl7916aqzj8xjx8kp433";
-      name = "syntax-highlighting-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/syntax-highlighting-5.46.0.tar.xz";
+      sha256 = "18b7v6l3ckqkhp5mxpfvyzl89yl3w9hcqbvfvbzzr9pd0lg09xxx";
+      name = "syntax-highlighting-5.46.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.45.0";
+    version = "5.46.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.45/threadweaver-5.45.0.tar.xz";
-      sha256 = "16s1pgyxhs6v1w7pwg3rr97xkd24xmf23x24pcm15ybd9g38a5yp";
-      name = "threadweaver-5.45.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.46/threadweaver-5.46.0.tar.xz";
+      sha256 = "0zndyxj3kkxs4mlznykf3lm5bq3mmwanxd80pb7y0rymnzsd2n7q";
+      name = "threadweaver-5.46.0.tar.xz";
     };
   };
 }

From 9e1017de2269e1a43088832c1adfcf88ffcdb6f7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 03:21:24 -0700
Subject: [PATCH 1810/3370] feh: 2.26 -> 2.26.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/feh/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1/bin/feh -h’ got 0 exit code
- ran ‘/nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1/bin/feh --help’ got 0 exit code
- ran ‘/nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1/bin/.feh-wrapped -h’ got 0 exit code
- ran ‘/nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1/bin/.feh-wrapped --help’ got 0 exit code
- found 2.26.1 with grep in /nix/store/n3q1mfdip3l49wx7dh293pwrxqhlrqgd-feh-2.26.1
- directory tree listing: https://gist.github.com/1e8258220f00de69ea28c57fffe352aa
- du listing: https://gist.github.com/65e35fd7395eca9058de10721f96b7d3
---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 475c8de97b91..96d4a397c909 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.26";
+  version = "2.26.1";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "11kckzwk3b734l0n4j41k40liq1v2lbbj1gzir5qc386g7fvzmmi";
+    sha256 = "155clzkrzs7fh5nx924851di30hilcg16g192ldqqc12p5z5gikd";
   };
 
   outputs = [ "out" "man" "doc" ];

From 8e6e8953df2ab720551988d0a8adb74192207f62 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 03:05:26 -0700
Subject: [PATCH 1811/3370] keepass: 2.39 -> 2.39.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/keepass/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/.keepass-wrapped -h’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/.keepass-wrapped --help’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/.keepass-wrapped help’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/keepass -h’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/keepass --help’ got 0 exit code
- ran ‘/nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1/bin/keepass help’ got 0 exit code
- found 2.39.1 with grep in /nix/store/qgy0xnizyq301xhnqrklr75b59y6k7ni-keepass-2.39.1
- directory tree listing: https://gist.github.com/78c15efa16b6307a93c5f5336a99df32
- du listing: https://gist.github.com/c18c593ba095ab336bc0102838e529ca
---
 pkgs/applications/misc/keepass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 8676ba70858f..53b965a1bb70 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -3,11 +3,11 @@
 
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.39";
+  version = "2.39.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "05mrbzlkr2h42cls6xhas76dg8kyic4fijwckrh0b0qv5pp71c11";
+    sha256 = "0y69w9zzxqj7xrn632bw6bibrknjbx1k3qcvi9axn67sqmzaka00";
   };
 
   sourceRoot = ".";

From d71cde319855e43087f3026c2c2e6ffefa5fc72e Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Mon, 14 May 2018 10:46:00 +0000
Subject: [PATCH 1812/3370] taskwarrior: install zsh completion (#40454)

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

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 80e1b9b69efb..1018a53ce21d 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -4,10 +4,8 @@ stdenv.mkDerivation rec {
   name = "taskwarrior-${version}";
   version = "2.5.1";
 
-  enableParallelBuilding = true;
-
   src = fetchurl {
-    url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
+    url = "https://taskwarrior.org/download/task-${version}.tar.gz";
     sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq";
   };
 
@@ -20,11 +18,13 @@ stdenv.mkDerivation rec {
     ln -s "../../doc/task/scripts/bash/task.sh" "$out/share/bash-completion/completions/task.bash"
     mkdir -p "$out/share/fish/vendor_completions.d"
     ln -s "../../../share/doc/task/scripts/fish/task.fish" "$out/share/fish/vendor_completions.d/"
+    mkdir -p "$out/share/zsh/site-functions"
+    ln -s "../../../share/doc/task/scripts/zsh/_task" "$out/share/zsh/site-functions/"
   '';
 
   meta = with stdenv.lib; {
     description = "Highly flexible command-line tool to manage TODO lists";
-    homepage = http://taskwarrior.org;
+    homepage = https://taskwarrior.org;
     license = licenses.mit;
     maintainers = with maintainers; [ marcweber jgeerds ];
     platforms = platforms.linux ++ platforms.darwin;

From 053d1e033968c6c835246cf295e363431be4b06e Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <eisfreak7@gmail.com>
Date: Mon, 14 May 2018 12:47:45 +0200
Subject: [PATCH 1813/3370] giac: re-add lapack without atlas (#40 (#40458)

giac: re-add lapack without atlas
---
 pkgs/applications/science/math/giac/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index f6e1deb86068..d32beeef4f48 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, texlive, bison, flex
+{ stdenv, fetchurl, fetchpatch, texlive, bison, flex, liblapackWithoutAtlas
 , gmp, mpfr, pari, ntl, gsl, blas, mpfi
 , readline, gettext, libpng, libao, gfortran, perl
 , enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
@@ -42,6 +42,7 @@ stdenv.mkDerivation rec {
     # gfortran.cc default output contains static libraries compiled without -fPIC
     # we want libgfortran.so.3 instead
     (stdenv.lib.getLib gfortran.cc)
+    liblapackWithoutAtlas
   ] ++ stdenv.lib.optionals enableGUI [
     libGLU_combined fltk xorg.libX11
   ];

From 17ccab6b124183b90d4c5fd2c7252024ae10c978 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 03:58:18 -0700
Subject: [PATCH 1814/3370] gdal: 2.2.4 -> 2.3.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gdal/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdal2tiles.py-wrapped -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdal2tiles.py-wrapped --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal2tiles.py -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal2tiles.py --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.gdalident.py-wrapped help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalident.py help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/.mkgraticule.py-wrapped help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/mkgraticule.py help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdalsrsinfo help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/ogrinfo help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg -h’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg --help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/testepsg help’ got 0 exit code
- ran ‘/nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0/bin/gdal-config --version’ and found version 2.3.0
- found 2.3.0 with grep in /nix/store/6zxb4kpk3mk347ypcxdc2dymq9gl37w7-gdal-2.3.0
- directory tree listing: https://gist.github.com/b6bcad3891a98e65991899121540cc85
- du listing: https://gist.github.com/f89d55b943a68b1550b8eff3f204f27f
---
 pkgs/development/libraries/gdal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 562d79b00921..873d71d178bc 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -8,12 +8,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.2.4";
+  version = "2.3.0";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.xz";
-    sha256 = "0y1237m2wilxgrsd0cdjpbf1zj9z954sd8518g53hlmkmk8v27j4";
+    sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite

From d8c9aff5dcfc76e04fe7ff4bac5e83edbb96d1e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 05:21:53 -0700
Subject: [PATCH 1815/3370] chirp: 20180412 -> 20180512

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/chirp-daily/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 20180512 with grep in /nix/store/hwlmx1k0a81j7mlvbmrw9lh85a9fg0p1-chirp-daily-20180512
- directory tree listing: https://gist.github.com/6c874faee515e55192c80420f78625dc
- du listing: https://gist.github.com/a39fb2733ffbb945eb83d739a8314d38
---
 pkgs/applications/misc/chirp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index b8fc63c2c9ed..54f36663454e 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20180412";
+  version = "20180512";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "17wpxqzifz6grw9xzg9q9vr58vm2xd50fhd64c3ngdhxcnq2dpj9";
+    sha256 = "111pijr0v36n3yg0p58mgvfxvz088axnxvgfhs8cblssi931mimm";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 7d631f8978365d508dbe67d2156ecaa1b0d5e400 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 05:44:43 -0700
Subject: [PATCH 1816/3370] accountsservice: 0.6.47 -> 0.6.49

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/accountsservice/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.49 with grep in /nix/store/5n1xmzvhis54f8vahhwxv4pn2k82sqmc-accountsservice-0.6.49
- directory tree listing: https://gist.github.com/d4f52cc42677c263ff034c14fb7741e3
- du listing: https://gist.github.com/0a90eaba29c57c4f54c36a659416df96
---
 pkgs/development/libraries/accountsservice/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix
index 289bc45d2037..ddff61dbed09 100644
--- a/pkgs/development/libraries/accountsservice/default.nix
+++ b/pkgs/development/libraries/accountsservice/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "accountsservice-${version}";
-  version = "0.6.47";
+  version = "0.6.49";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz";
-    sha256 = "038k7p2fqqcycwbh1ik4rjlnzddkf9j9wf0risjabccqj33znkp3";
+    sha256 = "032ndvs18gla49dvc9vg35cwczg0wpv2wscp1m3yjfdqdpams7i5";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From eebd455dc0bcc9f0d4fc8372811611ba3af18bcd Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 6 May 2018 14:59:50 -0400
Subject: [PATCH 1817/3370] linux stdenv: Update gnu-config on all non-x86

Not just Aarch64. Other non-x86 platforms might be old enough, but I am
about to update gnu-config to handle things better across the board.
---
 pkgs/stdenv/linux/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 9e19d199a5da..63b4c8ecc244 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -255,7 +255,7 @@ in
     };
     extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
-      lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook;
+      lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
 
 
@@ -297,7 +297,7 @@ in
     };
     extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
-      lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook;
+      lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
 
   # Construct the final stdenv.  It uses the Glibc and GCC, and adds
@@ -327,7 +327,7 @@ in
 
       extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
         # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
-        lib.optional localSystem.isAarch64 prevStage.updateAutotoolsGnuConfigScriptsHook;
+        lib.optional (!localSystem.isx86) prevStage.updateAutotoolsGnuConfigScriptsHook;
 
       cc = prevStage.gcc;
 
@@ -361,7 +361,7 @@ in
             binutils gcc gcc.cc gcc.cc.lib gcc.expand-response-params
           ]
           ++ lib.optional (localSystem.libc == "musl") libiconv
-          ++ lib.optionals localSystem.isAarch64
+          ++ lib.optionals (!localSystem.isx86)
             [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];
 
       overrides = self: super: {

From 29db8170036d3e6a04ad6d77c62ec1050e50f6fb Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 6 May 2018 15:07:04 -0400
Subject: [PATCH 1818/3370] gnu-config: Update to support ARM and 4 quardruples

I recently upstreamed

 - https://git.savannah.gnu.org/cgit/config.git/commit/?id=50a0413a5ba9684aa9247444c60a5cea47c4435d
 - https://git.savannah.gnu.org/cgit/config.git/commit/?id=09df750b994963a47f7c450f74b7e3f8567a6355
---
 pkgs/development/libraries/gnu-config/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix
index b46523071c7c..a14d7486e96f 100644
--- a/pkgs/development/libraries/gnu-config/default.nix
+++ b/pkgs/development/libraries/gnu-config/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl }:
 
 let
-  rev = "6a82322dd05cdc57b4cd9f7effdf1e2fd6f7482b";
+  rev = "b75cdc942a6172f63b34faf642b8c797239f6776";
 
   # Don't use fetchgit as this is needed during Aarch64 bootstrapping
   configGuess = fetchurl {
     url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}";
-    sha256 = "1yj9yi94h7z4z6jzickddv64ksz1aq5kj0c7krgzjn8xf8p3avmh";
+    sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv";
   };
   configSub = fetchurl {
     url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}";
-    sha256 = "1qsqdpla6icbzskkk7v3zxrpzlpqlc94ny9hyy5wh5lm5rwwfvb7";
+    sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc";
   };
 in
 stdenv.mkDerivation rec {

From f472dd7652c22a848670b419b9d8d45ee174dd48 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 26 Apr 2018 20:20:37 -0400
Subject: [PATCH 1819/3370] Revert "Revert "gcc, binutils: Get rid of 32-bit
 ARM configure flag exception""

And there's more reverts too. The previous commmit
d838afbc9376bdadb8c690eb00b425f3eeccdf2d to gnu-config finally solves
it!

This reverts commit 3ed545ab31146e607c57649936c75869d6aa9ba2.
---
 pkgs/development/compilers/gcc/4.5/default.nix      | 6 +-----
 pkgs/development/compilers/gcc/4.8/default.nix      | 6 +-----
 pkgs/development/compilers/gcc/4.9/default.nix      | 6 +-----
 pkgs/development/compilers/gcc/5/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/6/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/7/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/snapshot/default.nix | 6 +-----
 pkgs/development/tools/misc/binutils/default.nix    | 6 +-----
 8 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 36b48b880211..0482ff772d6c 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -240,11 +240,7 @@ stdenv.mkDerivation ({
     ;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags =
     # Basic dependencies
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index dea8b912b272..060683860709 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -282,11 +282,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags =
     # Basic dependencies
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 343d820fa236..1fab985473ea 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -291,11 +291,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags =
     # Basic dependencies
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 0d9565de0a77..6e3e7d0b0993 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -311,11 +311,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags =
     # Basic dependencies
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 29f2bad7eac1..67b7cf61c5ae 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -315,11 +315,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags =
     # Basic dependencies
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e75e22efce1f..2a034954f73c 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -311,11 +311,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags =
     # Basic dependencies
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 609d418693d7..693474bfb5e1 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -283,11 +283,7 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags =
     # Basic dependencies
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 549eaf5253d3..31c86c785c2d 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -91,11 +91,7 @@ stdenv.mkDerivation rec {
     else "-static-libgcc";
 
   # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
-  configurePlatforms =
-    # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if buildPlatform == hostPlatform && hostPlatform == targetPlatform && targetPlatform.isAarch32
-    then []
-    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
   configureFlags = [
     "--enable-targets=all" "--enable-64-bit-bfd"

From b7a0f37c0df3b1519572fe4dc5af2024565cbd67 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 14 May 2018 08:03:17 -0700
Subject: [PATCH 1820/3370] byacc: 20170709 -> 20180510 (#40499)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/byacc/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 20180510 with grep in /nix/store/z8i5f145zpz750hvcbjlncy8kqak8zv2-byacc-20180510
- directory tree listing: https://gist.github.com/328d2b1900cfb911e7567cabf95d80c3
- du listing: https://gist.github.com/cc161fe31193017387ae25b64829aaf2
---
 pkgs/development/tools/parsing/byacc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 612196cba77a..2f8c97ff2711 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "byacc-${version}";
-  version = "20170709";
+  version = "20180510";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/byacc/${name}.tgz"
       "https://invisible-mirror.net/archives/byacc/${name}.tgz"
     ];
-    sha256 = "1syrg1nwh2qmlr5mh7c4vz9psdv4gf55h8i5ffw84q6whlcq1kr7";
+    sha256 = "14ynlrcsc2hwny3gxng19blfvglhqd4m7hl597fwksf7zfzhv56h";
   };
 
   doCheck = true;

From 1de744647f3d7acdc855236023340d02e9fbfa45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guillaume=20Mass=C3=A9?= <masgui@gmail.com>
Date: Mon, 14 May 2018 17:11:44 +0200
Subject: [PATCH 1821/3370] sublime3: 3170 -> 3176 (#40494)

---
 pkgs/applications/editors/sublime/3/packages.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix
index 98cfc03c3d26..8ab7c8144079 100644
--- a/pkgs/applications/editors/sublime/3/packages.nix
+++ b/pkgs/applications/editors/sublime/3/packages.nix
@@ -5,14 +5,14 @@ let
 in
   rec {
     sublime3-dev = common {
-      buildVersion = "3170";
-      x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
-      x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
+      buildVersion = "3176";
+      x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
+      x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
     } {};
 
     sublime3 = common {
-      buildVersion = "3170";
-      x32sha256 = "04ll92mqnpvvaa161il6l02gvd0g0x95sci0yrywr6jzk6am1fzg";
-      x64sha256 = "1snzjr000qrjyvzd876x5j66138glh0bff3c1b2cb2bfc88c3kzx";
+      buildVersion = "3176";
+      x32sha256 = "08asz13888d4ddsz81cfk7k3319dabzz1kgbnshw0756pvyrvr23";
+      x64sha256 = "0cppkh5jx2g8f6jyy1bs81fpb90l0kn5m7y3skackpjdxhd7rwbl";
     } {};
   }

From 2abd5916a7cf4ca49586472f35373a620c2ff485 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 14 May 2018 08:13:57 -0700
Subject: [PATCH 1822/3370] fstrm: 0.3.2 -> 0.4.0 (#40489)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fstrm/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/p9y2vcrsa056xibh0y1xaz750mdcc5yq-fstrm-0.4.0-bin/bin/fstrm_capture --version’ and found version 0.4.0
- found 0.4.0 with grep in /nix/store/p9y2vcrsa056xibh0y1xaz750mdcc5yq-fstrm-0.4.0-bin
- directory tree listing: https://gist.github.com/5cc213160a9ec091c9e767b95bfe2cdd
- du listing: https://gist.github.com/c4b1f58631938c0cad031ac2dc920011
---
 pkgs/development/libraries/fstrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix
index 9c4bf00347c4..372cb50d05cf 100644
--- a/pkgs/development/libraries/fstrm/default.nix
+++ b/pkgs/development/libraries/fstrm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fstrm-${version}";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "farsightsec";
     repo = "fstrm";
     rev = "v${version}";
-    sha256 = "135m0d4z1wbiaazs3bh6z53a35mgs33gvfki8pl4xfaw9cfcfpd2";
+    sha256 = "11i8b3wy6j3z3fcv816xccxxlrfkczdr8bm2gnan6yv4ppbji4ny";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 4edfc0e93d679a809a0db0c953096726fcb97a28 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 14 May 2018 08:21:22 -0700
Subject: [PATCH 1823/3370] ccnet: 6.1.7 -> 6.1.8 (#40495)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ccnet/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8/bin/ccnet -h’ got 0 exit code
- ran ‘/nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8/bin/ccnet --help’ got 0 exit code
- found 6.1.8 with grep in /nix/store/k21v52qac99ppn2ba80ywki05cv6m65r-ccnet-6.1.8
- directory tree listing: https://gist.github.com/275cfa6377f77e502dcc0309bb683687
- du listing: https://gist.github.com/f2f22837494355a9bf385b8432a4b210
---
 pkgs/tools/networking/ccnet/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix
index 408fd0f8c8fe..6fac4a282d01 100644
--- a/pkgs/tools/networking/ccnet/default.nix
+++ b/pkgs/tools/networking/ccnet/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, which, autoreconfHook, pkgconfig, vala, python, libsearpc, libzdb, libuuid, libevent, sqlite, openssl}:
 
 stdenv.mkDerivation rec {
-  version = "6.1.7";
-  seafileVersion = "6.1.7";
+  version = "6.1.8";
+  seafileVersion = "6.1.8";
   name = "ccnet-${version}";
 
   src = fetchurl {
     url = "https://github.com/haiwen/ccnet/archive/v${version}.tar.gz";
-    sha256 = "1kkzdxa9r7sw1niwniznfkvilgvb7q039wq07cfk73qs3231bj7r";
+    sha256 = "0qlpnrz30ldrqnvbj59d54qdghxpxc5lsq6kf3dw2b93jnzkcmmm";
   };
 
   nativeBuildInputs = [ pkgconfig which autoreconfHook vala python ];

From efde5fefb3a55d3aeebf69332d7d1223e4432413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?=
 <arcadio@users.noreply.github.com>
Date: Mon, 14 May 2018 17:37:53 +0100
Subject: [PATCH 1824/3370] nixos: stumpwm: switch from package marked as
 broken to working quicklisp package (#40501)

---
 nixos/modules/services/x11/window-managers/stumpwm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/stumpwm.nix b/nixos/modules/services/x11/window-managers/stumpwm.nix
index 3d3f2e0028c0..27a17178476a 100644
--- a/nixos/modules/services/x11/window-managers/stumpwm.nix
+++ b/nixos/modules/services/x11/window-managers/stumpwm.nix
@@ -15,10 +15,10 @@ in
     services.xserver.windowManager.session = singleton {
       name = "stumpwm";
       start = ''
-        ${pkgs.stumpwm}/bin/stumpwm &
+        ${pkgs.lispPackages.stumpwm}/bin/stumpwm &
         waitPID=$!
       '';
     };
-    environment.systemPackages = [ pkgs.stumpwm ];
+    environment.systemPackages = [ pkgs.lispPackages.stumpwm ];
   };
 }

From b14f809bb101b29964508857765e3638402e451a Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Mon, 14 May 2018 11:24:18 -0400
Subject: [PATCH 1825/3370] flent: init at 1.2.2

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

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
new file mode 100644
index 000000000000..9a0bb0104d4c
--- /dev/null
+++ b/pkgs/applications/networking/flent/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, netperf, procps, pyqt5 }:
+
+buildPythonApplication rec {
+  pname = "flent";
+  version = "1.2.2";
+  src = fetchFromGitHub {
+    owner = "tohojo";
+    repo = "flent";
+    rev = version;
+    sha256 = "0rl4ahynl6ymw7r04vpg9p90pplrxc41rjlzvm0swxsvpw40yvkm";
+  };
+
+  buildInputs = [ netperf ];
+  propagatedBuildInputs = [
+    matplotlib
+    procps
+    pyqt5
+  ];
+
+  meta = with stdenv.lib; {
+    description = "The FLExible Network Tester";
+    homepage = https://flent.org;
+    license = licenses.gpl3;
+
+    maintainers = [ maintainers.mmlb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d11c94e8684..3a4077267ebb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2332,6 +2332,8 @@ with pkgs;
 
   flashrom = callPackage ../tools/misc/flashrom { };
 
+  flent = python3Packages.callPackage ../applications/networking/flent { };
+
   flpsed = callPackage ../applications/editors/flpsed { };
 
   fluentd = callPackage ../tools/misc/fluentd { };

From 3a9654bfe29ebd987b7426faa25f00af1fab02c5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 13:13:11 -0400
Subject: [PATCH 1826/3370] gcc: Simplify this old Hurd condition

Steps towards getting rid of crossConfig.
---
 pkgs/development/compilers/gcc/4.5/default.nix      | 7 +------
 pkgs/development/compilers/gcc/4.8/default.nix      | 6 +-----
 pkgs/development/compilers/gcc/4.9/default.nix      | 6 +-----
 pkgs/development/compilers/gcc/5/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/6/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/7/default.nix        | 6 +-----
 pkgs/development/compilers/gcc/snapshot/default.nix | 6 +-----
 7 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 36b48b880211..70fbefb898e8 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -151,12 +151,7 @@ stdenv.mkDerivation ({
     ;
 
   postPatch =
-    if (stdenv.system == "i586-pc-gnu"
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu"
-            && libcCross != null))
+    if targetPlatform.isHurd
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index dea8b912b272..1fcad756eec1 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -193,11 +193,7 @@ stdenv.mkDerivation ({
   libc_dev = stdenv.cc.libc_dev;
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 343d820fa236..009f28dc66b1 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -188,11 +188,7 @@ stdenv.mkDerivation ({
   libc_dev = stdenv.cc.libc_dev;
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 0d9565de0a77..a695b6819a1a 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
   '';
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 29f2bad7eac1..c5ca1060894b 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
   '';
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e75e22efce1f..9a0da5dbf6eb 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -204,11 +204,7 @@ stdenv.mkDerivation ({
   '';
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 609d418693d7..fcfc8f15f132 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -183,11 +183,7 @@ stdenv.mkDerivation ({
   hardeningDisable = [ "format" ];
 
   postPatch =
-    if (hostPlatform.isHurd
-        || (libcCross != null                  # e.g., building `gcc.crossDrv'
-            && libcCross ? crossConfig
-            && libcCross.crossConfig == "i586-pc-gnu")
-        || (crossGNU && libcCross != null))
+    if targetPlatform.isHurd
     then
       # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not
       # in glibc, so add the right `-I' flags to the default spec string.

From 9d5b6b89f061cb416c19f4c49f04117d315328be Mon Sep 17 00:00:00 2001
From: Eric Bailey <e.bailey@sportradar.com>
Date: Mon, 14 May 2018 12:50:20 -0500
Subject: [PATCH 1827/3370] kubernetes: 1.9.1 -> 1.9.7

---
 .../networking/cluster/kubernetes/default.nix | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 1a7ba3cf93df..e1023afc7aba 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -16,13 +16,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.9.1";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1dmq2g138h7fsswmq4l47b44gsl9anmm3ywqyi7y48f1rkvc11mk";
+    sha256 = "1dykh48c6bvypg51mlxjdyrggpjq597mjj83xgj1pfadsy6pp9bh";
   };
 
   # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373
@@ -30,21 +30,6 @@ stdenv.mkDerivation rec {
 
   outputs = ["out" "man" "pause"];
 
-  patches = [
-    # patch is from https://github.com/kubernetes/kubernetes/pull/58207
-    (fetchpatch {
-      url = "https://github.com/kubernetes/kubernetes/commit/a990b04dc8a7d8408a71eee40db93621cf2b6d1b.patch";
-      sha256 = "0piqilc5c9frikl74hamkffawwg1mvdwfxqvjnmk6wdma43dbb7w";
-    })
-    (fetchpatch {
-      # https://github.com/kubernetes/kubernetes/pull/60978
-      # Fixes critical kube-proxy failure on iptables-restore >= 1.6.2 and
-      # non-critical failures on prior versions.
-      url = "https://github.com/kubernetes/kubernetes/commit/34ce573e9992ecdbc06dff1b4e3d0e9baa8353dd.patch";
-      sha256 = "1sd9qgc28zr6fkk0441f89bw8kq2kadys0qs7bgivy9cmcpw5x5p";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace "hack/lib/golang.sh" --replace "_cgo" ""
     substituteInPlace "hack/generate-docs.sh" --replace "make" "make SHELL=${stdenv.shell}"

From 106bba65a6840dd75c2545c93b51e8fcd148228b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= <arc@well.ox.ac.uk>
Date: Mon, 14 May 2018 20:44:54 +0100
Subject: [PATCH 1828/3370] parallel: 20180322 -> 20180422

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 093633e21142..9bb09d227c4c 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20180322";
+  name = "parallel-20180422";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "15v46pv4z98xm3fkwy7335faw4r7pilrxp4xis5a4zi4319sv2b3";
+    sha256 = "0xsfpbxwgd4197gra981iv0nmjfk58c0d88dxx6dh6yrqz523klx";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From e4a2b70f91dd19535cc08c966b9ec612a0216827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= <arc@well.ox.ac.uk>
Date: Mon, 14 May 2018 21:26:07 +0100
Subject: [PATCH 1829/3370] minimap2: init at 2.10

---
 .../science/biology/minimap2/default.nix      | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/science/biology/minimap2/default.nix

diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix
new file mode 100644
index 000000000000..ae278f76792b
--- /dev/null
+++ b/pkgs/applications/science/biology/minimap2/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "minimap2";
+  version = "2.10";
+
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = "lh3";
+    rev = "v${version}";
+    sha256 = "0b35w14j9h2q9qbh3sxc518mcx0ifsvwqr1nv70rv6mgy1cqqkw0";
+  };
+
+  buildInputs = [ zlib ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp minimap2 $out/bin
+    mkdir -p $out/share/man/man1
+    cp minimap2.1 $out/share/man/man1
+  '';
+  
+  meta = with stdenv.lib; {
+    description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences";
+    homepage = https://lh3.github.io/minimap2;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = [ maintainers.arcadio ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d11c94e8684..e269cbb956ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19927,6 +19927,8 @@ with pkgs;
     inherit (perlPackages) GetoptTabular MNI-Perllib;
   };
 
+  minimap2 = callPackage ../applications/science/biology/minimap2 { };
+
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
 
   paml = callPackage ../applications/science/biology/paml { };

From dd73ab00923a4b39fe7b3fbce31cadfd38d8177b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 15 May 2018 00:18:49 +0200
Subject: [PATCH 1830/3370] nixos/tests: prevent stateVersion warnings in eval

... introduced by 1f0b6922d3c
continuation of 88fa50c2f2bbc472fe7169eac8f2a1b2312ef03b
---
 nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 ++
 nixos/modules/installer/virtualbox-demo.nix             | 1 +
 nixos/release.nix                                       | 1 +
 nixos/tests/containers-imperative.nix                   | 4 +++-
 nixos/tests/containers-ipv4.nix                         | 1 +
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
index 756c8751d00e..1ed56386e6e7 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix
@@ -31,4 +31,6 @@ with lib;
 
   # Allow the user to log in as root without a password.
   users.extraUsers.root.initialHashedPassword = "";
+
+  system.nixos.stateVersion = mkDefault "18.03";
 }
diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix
index 13a0d7f4f6ee..c40e30354206 100644
--- a/nixos/modules/installer/virtualbox-demo.nix
+++ b/nixos/modules/installer/virtualbox-demo.nix
@@ -21,4 +21,5 @@ with lib;
   services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];
 
   powerManagement.enable = false;
+  system.nixos.stateVersion = mkDefault "18.03";
 }
diff --git a/nixos/release.nix b/nixos/release.nix
index 57fc245e57dd..7ec41af4fd4b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -198,6 +198,7 @@ in rec {
         modules = singleton ({ config, pkgs, ... }:
           { fileSystems."/".device  = mkDefault "/dev/sda1";
             boot.loader.grub.device = mkDefault "/dev/sda";
+            system.nixos.stateVersion = mkDefault "18.03";
           });
       }).config.system.build.toplevel;
       preferLocalBuild = true;
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 015b79b1cee6..a548b17b1ff1 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -17,7 +17,9 @@ import ./make-test.nix ({ pkgs, ...} : {
         emptyContainer = import ../lib/eval-config.nix {
           inherit (config.nixpkgs.localSystem) system;
           modules = lib.singleton {
-            containers.foo.config = {};
+            containers.foo.config = {
+              system.nixos.stateVersion = "18.03";
+            };
           };
         };
       in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ];
diff --git a/nixos/tests/containers-ipv4.nix b/nixos/tests/containers-ipv4.nix
index 31d05990a679..821ce1cd07d2 100644
--- a/nixos/tests/containers-ipv4.nix
+++ b/nixos/tests/containers-ipv4.nix
@@ -21,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
               services.httpd.adminAddr = "foo@example.org";
               networking.firewall.allowedTCPPorts = [ 80 ];
               networking.firewall.allowPing = true;
+              system.nixos.stateVersion = "18.03";
             };
         };
 

From e1960e7314a6070bdc17a8f0ed466df0e373553e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 14 May 2018 20:34:37 -0300
Subject: [PATCH 1831/3370] terminology: 1.2.0 -> 1.2.1 (#40524)

---
 pkgs/desktops/enlightenment/terminology.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix
index 1a15092c7e77..3b00ab55835f 100644
--- a/pkgs/desktops/enlightenment/terminology.nix
+++ b/pkgs/desktops/enlightenment/terminology.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
-    sha256 = "0kw34l5lahn1qaks3ah6x8k41d6hfywpqfak2p7qq1z87zj506mx";
+    sha256 = "1ii8332bl88l8md3gvz5dhi9bjpm6shyf14ck9kfyy7d56hp71mc";
   };
 
   nativeBuildInputs = [

From 9be118223b641f85233805deabbe1fd52e927bad Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 20:31:27 -0400
Subject: [PATCH 1832/3370] misc mingw: Get rid of crossConfig and clean up

Style of dual implementation and headers derivations is take from
bb7067f882bf3c53ea68780a8ec0a7117f563253.
---
 pkgs/os-specific/windows/mingwrt/common.nix  | 12 +++++++
 pkgs/os-specific/windows/mingwrt/default.nix | 32 +++---------------
 pkgs/os-specific/windows/mingwrt/headers.nix | 17 ++++++++++
 pkgs/os-specific/windows/w32api/common.nix   | 14 ++++++++
 pkgs/os-specific/windows/w32api/default.nix  | 34 +++-----------------
 pkgs/os-specific/windows/w32api/headers.nix  | 17 ++++++++++
 pkgs/top-level/all-packages.nix              | 18 +++--------
 7 files changed, 73 insertions(+), 71 deletions(-)
 create mode 100644 pkgs/os-specific/windows/mingwrt/common.nix
 create mode 100644 pkgs/os-specific/windows/mingwrt/headers.nix
 create mode 100644 pkgs/os-specific/windows/w32api/common.nix
 create mode 100644 pkgs/os-specific/windows/w32api/headers.nix

diff --git a/pkgs/os-specific/windows/mingwrt/common.nix b/pkgs/os-specific/windows/mingwrt/common.nix
new file mode 100644
index 000000000000..7dc2ae56aa84
--- /dev/null
+++ b/pkgs/os-specific/windows/mingwrt/common.nix
@@ -0,0 +1,12 @@
+{ lib, fetchurl }:
+
+rec {
+  name = "mingwrt-3.20";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz";
+    sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi";
+  };
+
+  meta.platforms = [ lib.systems.inspect.isMinGW ];
+}
diff --git a/pkgs/os-specific/windows/mingwrt/default.nix b/pkgs/os-specific/windows/mingwrt/default.nix
index 98461d690d92..3429f7564ade 100644
--- a/pkgs/os-specific/windows/mingwrt/default.nix
+++ b/pkgs/os-specific/windows/mingwrt/default.nix
@@ -1,29 +1,7 @@
-{stdenv, fetchurl, binutils ? null, gccCross ? null, onlyHeaders ? false}:
-
-let
-  name = "mingwrt-3.20";
-in
-stdenv.mkDerivation (rec {
-  inherit name;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mingw/MinGW/Base/mingw-rt/${name}-mingw32-src.tar.gz";
-    sha256 = "02pydg1m8y35nxb4k34nlb5c341y2waq76z42mgdzlcf661r91pi";
-  };
-
-} //
-(if onlyHeaders then {
-  name = name + "-headers";
-  phases = [ "unpackPhase" "installPhase" ];
-  installPhase = ''
-    mkdir -p $out
-    cp -R include $out
-  '';
-} else {
-  buildInputs = [ gccCross binutils ];
-
-  crossConfig = gccCross.crossConfig;
+{ stdenv, callPackage }:
 
+stdenv.mkDerivation {
+  inherit (callPackage ./common.nix {}) name src meta;
   dontStrip = true;
-})
-)
+  hardeningDisable = [ "stackprotector" "fortify" ];
+}
diff --git a/pkgs/os-specific/windows/mingwrt/headers.nix b/pkgs/os-specific/windows/mingwrt/headers.nix
new file mode 100644
index 000000000000..51180af0fc73
--- /dev/null
+++ b/pkgs/os-specific/windows/mingwrt/headers.nix
@@ -0,0 +1,17 @@
+{ stdenvNoCC, callPackage }:
+
+let
+  inherit (callPackage ./common.nix {}) name src meta;
+
+in stdenvNoCC.mkDerivation {
+  name = name + "-headers";
+
+  inherit src meta;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R include $out
+  '';
+}
diff --git a/pkgs/os-specific/windows/w32api/common.nix b/pkgs/os-specific/windows/w32api/common.nix
new file mode 100644
index 000000000000..273ae2c8df4b
--- /dev/null
+++ b/pkgs/os-specific/windows/w32api/common.nix
@@ -0,0 +1,14 @@
+{ fetchurl, xz }:
+
+rec {
+  name = "w32api-3.17-2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
+    sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
+  };
+
+  nativeBuildInputs = [ xz ];
+
+  meta.platforms = [ lib.systems.inspect.isMinGW ];
+}
diff --git a/pkgs/os-specific/windows/w32api/default.nix b/pkgs/os-specific/windows/w32api/default.nix
index 3443fff9668d..51b88201998c 100644
--- a/pkgs/os-specific/windows/w32api/default.nix
+++ b/pkgs/os-specific/windows/w32api/default.nix
@@ -1,32 +1,6 @@
-{ stdenv, fetchurl, xz, binutils ? null
-, gccCross ? null, onlyHeaders ? false }:
-
-let
-  name = "w32api-3.17-2";
-in
-stdenv.mkDerivation ({
-  inherit name;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/mingw/MinGW/Base/w32api/w32api-3.17/${name}-mingw32-src.tar.lzma";
-    sha256 = "09rhnl6zikmdyb960im55jck0rdy5z9nlg3akx68ixn7khf3j8wb";
-  };
-
-  nativeBuildInputs = [ xz ];
-
-} //
-(if onlyHeaders then {
-  name = name + "-headers";
-  phases = [ "unpackPhase" "installPhase" ];
-  installPhase = ''
-    mkdir -p $out
-    cp -R include $out
-  '';
-} else {
-  buildInputs = [ gccCross binutils ];
-
-  crossConfig = gccCross.crossConfig;
+{ stdenv, callPackage }:
 
+stdenv.mkDerivation {
+  inherit (callPackage ./common.nix {}) name src nativeBuildInputs meta;
   dontStrip = true;
-})
-)
+}
diff --git a/pkgs/os-specific/windows/w32api/headers.nix b/pkgs/os-specific/windows/w32api/headers.nix
new file mode 100644
index 000000000000..3083118bb366
--- /dev/null
+++ b/pkgs/os-specific/windows/w32api/headers.nix
@@ -0,0 +1,17 @@
+{ stdenvNoCC, callPackage }:
+
+let
+  inherit (callPackage ./common.nix {}) name src meta;
+
+in stdenvNoCC.mkDerivation {
+  name = name + "-headers";
+
+  inherit src nativeBuildInputs meta;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R include $out
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d18e51772cea..65d1dc9dbb01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13868,23 +13868,13 @@ with pkgs;
 
     jom = callPackage ../os-specific/windows/jom { };
 
-    w32api = callPackage ../os-specific/windows/w32api {
-      gccCross = gccCrossStageStatic;
-      binutils = binutils;
-    };
+    w32api = callPackage ../os-specific/windows/w32api { };
 
-    w32api_headers = w32api.override {
-      onlyHeaders = true;
-    };
+    w32api_headers = callPackage ../os-specific/windows/w32api/headers { };
 
-    mingw_runtime = callPackage ../os-specific/windows/mingwrt {
-      gccCross = gccCrossMingw2;
-      binutils = binutils;
-    };
+    mingw_runtime = callPackage ../os-specific/windows/mingwrt { };
 
-    mingw_runtime_headers = mingw_runtime.override {
-      onlyHeaders = true;
-    };
+    mingw_runtime_headers = callPackage ../os-specific/windows/mingwrt/headers.nix { };
 
     mingw_headers1 = buildEnv {
       name = "mingw-headers-1";

From 84868b8b06e54f0d1a9eb3140ed80b4d697f35d3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 20:33:54 -0400
Subject: [PATCH 1833/3370] misc hurd stuff: Get rid of crossConfig

This stuff is horribly bit-rotted anyways, but I'm getting rid of
crossConfig so it must be changed.
---
 pkgs/os-specific/gnu/hurd/default.nix       | 29 +++++++--------------
 pkgs/os-specific/gnu/libpthread/default.nix |  2 --
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index 5eccee62468d..ae1c504fd19e 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -75,25 +75,16 @@ stdenv.mkDerivation ({
 
 //
 
-(if !headersOnly && buildTarget != null
- then assert installTarget != null; {
-   # Use the default `buildPhase' and `installPhase' so that the usual hooks
-   # can still be used.
-   buildFlags = buildTarget;
-   installTargets = installTarget;
- }
- else {})
+stdenv.lib.optionalAttrs (!headersOnly && buildTarget != null) {
+  # Use the default `buildPhase' and `installPhase' so that the usual hooks
+  # can still be used.
+  buildFlags = buildTarget;
+  installTargets = assert installTarget != null; installTarget;
+}
 
 //
 
-(if headersOnly
- then { dontBuild = true; installPhase = "make install-headers"; }
- else (if (cross != null)
-       then {
-         crossConfig = cross.config;
-
-         # The `configure' script wants to build executables so tell it where
-         # to find `crt1.o' et al.
-         LDFLAGS = "-B${glibcCross}/lib";
-       }
-       else { })))
+stdenv.lib.optionalAttrs headersOnly {
+  dontBuild = true;
+  installPhase = "make install-headers";
+})
diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix
index 294a1548582b..a2e1081a1e8d 100644
--- a/pkgs/os-specific/gnu/libpthread/default.nix
+++ b/pkgs/os-specific/gnu/libpthread/default.nix
@@ -55,8 +55,6 @@ stdenv.mkDerivation ({
 
 (if cross != null
  then {
-   crossConfig = cross.config;
-
    # Tell gcc where to find `crt1.o' et al.  This is specified in two
    # different ways: one for gcc as run from `configure', and one for linking
    # libpthread.so (by default `libtool --mode=link' swallows `-B', hence

From 669f9453dc94c5ab24a425536b98c7f4d5cce359 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 15 May 2018 03:28:39 +0200
Subject: [PATCH 1834/3370] haskellPackages.hnix: jailbreak & fix tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Some of the new tests need the `nix` executable on `PATH`.
One also needs `hpack`, but we really don’t want to embiggen (heh) the closure
because of that.
---
 .../haskell-modules/configuration-common.nix      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c18c69f9a447..8278b4bdc5ea 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -208,6 +208,9 @@ self: super: {
   # https://github.com/jputcu/serialport/issues/25
   serialport = dontCheck super.serialport;
 
+  serialise = dontCheck super.serialise;
+  cryptohash-sha512 = dontCheck super.cryptohash-sha512;
+
   # https://github.com/kazu-yamamoto/simple-sendfile/issues/17
   simple-sendfile = dontCheck super.simple-sendfile;
 
@@ -247,7 +250,17 @@ self: super: {
   digit = doJailbreak super.digit;
 
   # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
-  hnix = doJailbreak super.hnix;
+  hnix = doJailbreak (overrideCabal super.hnix (old: {
+    patches = old.patches or [] ++ [
+      # should land in hnix-5.2
+      (pkgs.fetchpatch {
+        url = "https://github.com/haskell-nix/hnix/commit/9cfe060a9dbe9e7c64867956a0523eed9661803a.patch";
+        sha256 = "0ci4n7nw2pzqw0gkmkp4szzvxjyb143a4znjm39jmb0s397a68sh";
+        name = "disable-hpack-test-by-default.patch";
+       })
+    ];
+    testHaskellDepends = old.testHaskellDepends or [] ++ [ pkgs.nix ];
+  }));
 
   # Fails for non-obvious reasons while attempting to use doctest.
   search = dontCheck super.search;

From 29b62e07d66c6ee14c8b9a3428e413fc4dc1c223 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 22:28:37 -0400
Subject: [PATCH 1835/3370] pam: Remove crossAttrs

It turns out none of this stuff is needed. The docs aren't evenly built
properly anyways so the build trivially succeeds either way, due to what
looks like upstream misunderstanding automake. If I try to build the
docs manually in a cross shell (before and after this change), there's a
make rule error such that some HTML files aren't even attempted to be
built and then a copy fails.

Even if this was all fixed, these been a good number of cross fixes
upstream getting them to use CC_FOR_BUILD and other good stuff, so I
doubt such hacks would be needed.

Progress towards #40531 and #33302.
---
 pkgs/os-specific/linux/pam/default.nix | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 5f92dfcc8390..e2d34abb70cc 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -33,21 +33,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  crossAttrs = {
-    propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];
-    preConfigure = preConfigure + ''
-      $crossConfig-ar x ${flex.crossDrv}/lib/libfl.a
-      mv libyywrap.o libyywrap-target.o
-      ar x ${flex}/lib/libfl.a
-      mv libyywrap.o libyywrap-host.o
-      export LDFLAGS="$LDFLAGS $PWD/libyywrap-target.o"
-      sed -e 's/@CC@/gcc/' -i doc/specs/Makefile.in
-    '';
-    postConfigure = ''
-      sed -e "s@ $PWD/libyywrap-target.o@ $PWD/libyywrap-host.o@" -i doc/specs/Makefile
-    '';
-  };
-
   postInstall = ''
     mv -v $out/sbin/unix_chkpwd{,.orig}
     ln -sv /run/wrappers/bin/unix_chkpwd $out/sbin/unix_chkpwd

From 330ca731e88ec015181c43d92ae8f7c77cf0226a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 13 May 2018 11:31:24 -0400
Subject: [PATCH 1836/3370] treewide: Get rid of all uses of crossConfig

The hack of using `crossConfig` to enforce stricter handling of
dependencies is replaced with a dedicated `strictDeps` for that purpose.
(Experience has shown that my punning was a terrible idea that made more
difficult and embarrising to teach teach.)

Now that is is clear, a few packages now use `strictDeps`, to fix
various bugs:

 - bintools-wrapper and cc-wrapper
---
 .../bintools-wrapper/default.nix              |  1 +
 .../bintools-wrapper/setup-hook.sh            |  2 +-
 pkgs/build-support/cc-wrapper/default.nix     |  1 +
 pkgs/build-support/cc-wrapper/setup-hook.sh   |  2 +-
 pkgs/development/compilers/ghc/7.10.3.nix     |  6 ++--
 pkgs/development/compilers/ghc/8.0.2.nix      |  6 ++--
 pkgs/development/compilers/ghc/8.2.2.nix      |  6 ++--
 pkgs/development/compilers/ghc/8.4.1.nix      |  6 ++--
 pkgs/development/compilers/ghc/head.nix       |  6 ++--
 pkgs/development/interpreters/guile/1.8.nix   | 15 +++------
 .../development/libraries/fontconfig/2.10.nix | 13 ++------
 .../libraries/fontconfig/default.nix          | 13 ++------
 .../development/libraries/gettext/default.nix | 28 +++++++----------
 pkgs/development/libraries/glibc/2.27.nix     | 13 ++++----
 pkgs/development/libraries/glibc/default.nix  | 13 ++++----
 .../tools/build-managers/cmake/default.nix    | 30 ++++++++++--------
 .../tools/build-managers/cmake/setup-hook.sh  | 25 +++++++--------
 pkgs/misc/uboot/nanonote.nix                  | 21 +++++--------
 pkgs/servers/x11/xorg/overrides.nix           | 31 ++++++++++++-------
 pkgs/stdenv/generic/make-derivation.nix       |  5 ++-
 pkgs/stdenv/generic/setup.sh                  |  4 +--
 pkgs/tools/misc/bc/default.nix                |  2 +-
 22 files changed, 111 insertions(+), 138 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index a5084808c3bc..17ec2ec7ad75 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -186,6 +186,7 @@ stdenv.mkDerivation {
       else throw "unknown emulation for platform: " + targetPlatform.config;
     in targetPlatform.platform.bfdEmulation or (fmt + sep + arch);
 
+  strictDeps = true;
   depsTargetTargetPropagated = extraPackages;
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh
index 48a00b0b9b07..a093ef8f3b45 100644
--- a/pkgs/build-support/bintools-wrapper/setup-hook.sh
+++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh
@@ -8,7 +8,7 @@ set -u
 # native compile.
 #
 # TODO(@Ericson2314): No native exception
-[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0
+[[ -z ${strictDeps-} ]] || (( "$hostOffset" < 0 )) || return 0
 
 bintoolsWrapper_addLDVars () {
     case $depHostOffset in
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 8de2366ff5f5..7cd02c4b24c6 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -201,6 +201,7 @@ stdenv.mkDerivation {
       ln -s $ccPath/${targetPrefix}ghdl $out/bin/${targetPrefix}ghdl
     '';
 
+  strictDeps = true;
   propagatedBuildInputs = [ bintools ];
   depsTargetTargetPropagated = extraPackages;
 
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh
index 29a7306b9b7e..6e6354860780 100644
--- a/pkgs/build-support/cc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/cc-wrapper/setup-hook.sh
@@ -60,7 +60,7 @@ set -u
 # native compile.
 #
 # TODO(@Ericson2314): No native exception
-[[ -z ${crossConfig-} ]] || (( "$hostOffset" < 0 )) || return 0
+[[ -z ${strictDeps-} ]] || (( "$hostOffset" < 0 )) || return 0
 
 # It's fine that any other cc-wrapper will redefine this. Bash functions close
 # over no state, and there's no @-substitutions within, so any redefined
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index e4bf23c6e9e2..4c227f561155 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -129,10 +129,8 @@ stdenv.mkDerivation rec {
     "--disable-large-address-space"
   ];
 
-  # Hack to make sure we never to the relaxation `$PATH` and hooks support for
-  # compatability. This will be replaced with something clearer in a future
-  # masss-rebuild.
-  crossConfig = true;
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
 
   nativeBuildInputs = [
     ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 7d11ffb66c60..ca3b128df15b 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -128,10 +128,8 @@ stdenv.mkDerivation rec {
     "--disable-large-address-space"
   ];
 
-  # Hack to make sure we never to the relaxation `$PATH` and hooks support for
-  # compatability. This will be replaced with something clearer in a future
-  # masss-rebuild.
-  crossConfig = true;
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
 
   nativeBuildInputs = [ ghc perl hscolour sphinx ];
 
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index b2a1aafe6131..c8b8451ea600 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -145,10 +145,8 @@ stdenv.mkDerivation rec {
     "--disable-large-address-space"
   ];
 
-  # Hack to make sure we never to the relaxation `$PATH` and hooks support for
-  # compatability. This will be replaced with something clearer in a future
-  # masss-rebuild.
-  crossConfig = true;
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
 
   nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ];
 
diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix
index f232e0b47287..14c94887d62a 100644
--- a/pkgs/development/compilers/ghc/8.4.1.nix
+++ b/pkgs/development/compilers/ghc/8.4.1.nix
@@ -144,10 +144,8 @@ stdenv.mkDerivation rec {
     "--disable-large-address-space"
   ];
 
-  # Hack to make sure we never to the relaxation `$PATH` and hooks support for
-  # compatability. This will be replaced with something clearer in a future
-  # masss-rebuild.
-  crossConfig = true;
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
 
   nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 51497e0d9cee..da38230d4854 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -134,10 +134,8 @@ stdenv.mkDerivation rec {
     "--disable-large-address-space"
   ];
 
-  # Hack to make sure we never to the relaxation `$PATH` and hooks support for
-  # compatability. This will be replaced with something clearer in a future
-  # masss-rebuild.
-  crossConfig = true;
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
 
   nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix
index cf42c9a7b683..658b2cce77f9 100644
--- a/pkgs/development/interpreters/guile/1.8.nix
+++ b/pkgs/development/interpreters/guile/1.8.nix
@@ -16,7 +16,11 @@ stdenv.mkDerivation rec {
   setOutputFlags = false; # $dev gets into the library otherwise
 
   # GCC 4.6 raises a number of set-but-unused warnings.
-  configureFlags = [ "--disable-error-on-warning" ];
+  configureFlags = [ "--disable-error-on-warning" ]
+    # Guile needs patching to preset results for the configure tests about
+    # pthreads, which work only in native builds.
+    ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
+                          "--with-threads=no";
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]
     ++ stdenv.lib.optional (hostPlatform != buildPlatform)
@@ -34,17 +38,8 @@ stdenv.mkDerivation rec {
     libtool
   ];
 
-
   patches = [ ./cpp-4.5.patch ];
 
-  # Guile needs patching to preset results for the configure tests
-  # about pthreads, which work only in native builds.
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      configureFlags="--with-threads=no $configureFlags"
-    fi
-  '';
-
   preBuild = ''
     sed -e '/lt_dlinit/a  lt_dladdsearchdir("'$out/lib'");' -i libguile/dynl.c
   '';
diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix
index 5fb0ea4429e7..b02d9ccdcef8 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/pkgs/development/libraries/fontconfig/2.10.nix
@@ -21,19 +21,10 @@ stdenv.mkDerivation rec {
     "--with-cache-dir=/var/cache/fontconfig"
     "--disable-docs"
     "--with-default-fonts="
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--with-arch=${hostPlatform.parsed.cpu.name}"
   ];
 
-  # We should find a better way to access the arch reliably.
-  crossArch = if stdenv.hostPlatform != stdenv.buildPlatform
-    then hostPlatform.parsed.cpu.name
-    else null;
-
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      configureFlags="$configureFlags --with-arch=$crossArch";
-    fi
-  '';
-
   enableParallelBuilding = true;
 
   doCheck = true;
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index ce41f1ac7ebc..dafd4834a94b 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -53,19 +53,10 @@ stdenv.mkDerivation rec {
     "--disable-docs"
     # just <1MB; this is what you get when loading config fails for some reason
     "--with-default-fonts=${dejavu_fonts.minimal}"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    "--with-arch=${hostPlatform.parsed.cpu.name}"
   ];
 
-  # We should find a better way to access the arch reliably.
-  crossArch = if stdenv.hostPlatform != stdenv.buildPlatform
-    then hostPlatform.parsed.cpu.name
-    else null;
-
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      configureFlags="$configureFlags --with-arch=$crossArch";
-    fi
-  '';
-
   enableParallelBuilding = true;
 
   doCheck = true;
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 9c3024ce25fb..b6855a7e26d4 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -16,12 +16,19 @@ stdenv.mkDerivation rec {
 
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
 
-  configureFlags = [ "--disable-csharp" "--with-xz" ]
+  configureFlags = [
+     "--disable-csharp" "--with-xz"
      # avoid retaining reference to CF during stdenv bootstrap
-     ++ lib.optionals stdenv.isDarwin [
-            "gt_cv_func_CFPreferencesCopyAppValue=no"
-            "gt_cv_func_CFLocaleCopyCurrent=no"
-        ];
+  ] ++ lib.optionals stdenv.isDarwin [
+    "gt_cv_func_CFPreferencesCopyAppValue=no"
+    "gt_cv_func_CFLocaleCopyCurrent=no"
+  ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
+    # On cross building, gettext supposes that the wchar.h from libc
+    # does not fulfill gettext needs, so it tries to work with its
+    # own wchar.h file, which does not cope well with the system's
+    # wchar.h and stddef.h (gcc-4.3 - glibc-2.9)
+    "gl_cv_func_wcwidth_works=yes"
+  ];
 
   postPatch = ''
    substituteAllInPlace gettext-runtime/src/gettext.sh.in
@@ -33,17 +40,6 @@ stdenv.mkDerivation rec {
     sed -i -e "s/\(libgettextsrc_la_LDFLAGS = \)/\\1..\/gnulib-lib\/libxml_rpl.la /" gettext-tools/src/Makefile.in
   '';
 
-  # On cross building, gettext supposes that the wchar.h from libc
-  # does not fulfill gettext needs, so it tries to work with its
-  # own wchar.h file, which does not cope well with the system's
-  # wchar.h and stddef.h (gcc-4.3 - glibc-2.9)
-  preConfigure = ''
-    if test -n "$crossConfig"; then
-      echo gl_cv_func_wcwidth_works=yes > cachefile
-      configureFlags="$configureFlags --cache-file=`pwd`/cachefile"
-    fi
-  '';
-
   nativeBuildInputs = [ xz xz.bin ];
   # HACK, see #10874 (and 14664)
   buildInputs = stdenv.lib.optional (!stdenv.isLinux && !hostPlatform.isCygwin) libiconv;
diff --git a/pkgs/development/libraries/glibc/2.27.nix b/pkgs/development/libraries/glibc/2.27.nix
index bb057ae899e7..bf63b97635a0 100644
--- a/pkgs/development/libraries/glibc/2.27.nix
+++ b/pkgs/development/libraries/glibc/2.27.nix
@@ -71,14 +71,15 @@ callPackage ./common-2.27.nix { inherit stdenv; } {
 
       # Get rid of more unnecessary stuff.
       rm -rf $out/var $bin/bin/sln
-
+    ''
       # For some reason these aren't stripped otherwise and retain reference
       # to bootstrap-tools; on cross-arm this stripping would break objects.
-      if [ -z "$crossConfig" ]; then
-        for i in "$out"/lib/*.a; do
-            [ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
-        done
-      fi
+    + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+
+      for i in "$out"/lib/*.a; do
+          [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i"
+      done
+    '' + ''
 
       # Put libraries for static linking in a separate output.  Note
       # that libc_nonshared.a and libpthread_nonshared.a are required
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 976dbcde47ff..ea443ce9a246 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -71,14 +71,15 @@ callPackage ./common.nix { inherit stdenv; } {
 
       # Get rid of more unnecessary stuff.
       rm -rf $out/var $bin/bin/sln
-
+    ''
       # For some reason these aren't stripped otherwise and retain reference
       # to bootstrap-tools; on cross-arm this stripping would break objects.
-      if [ -z "$crossConfig" ]; then
-        for i in "$out"/lib/*.a; do
-            [ "$i" = "$out/lib/libm.a" ] || strip -S "$i"
-        done
-      fi
+    + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+
+      for i in "$out"/lib/*.a; do
+          [ "$i" = "$out/lib/libm.a" ] || $STRIP -S "$i"
+      done
+    '' + ''
 
       # Put libraries for static linking in a separate output.  Note
       # that libc_nonshared.a and libpthread_nonshared.a are required
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 97c02cd9cc12..b40b284b759e 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -80,19 +80,23 @@ stdenv.mkDerivation rec {
     configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags"
   '';
 
-  configureFlags = [ "--docdir=share/doc/${name}" ]
-    ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
-    ++ optional (useQt4 || withQt5) "--qt-gui"
-    ++ ["--"]
-    ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]
-    ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++"
-      "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc"
-      "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
-      "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
-      "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
-      # TODO: Why are ar and friends not provided by the bintools wrapper?
-    ];
+  configureFlags = [
+    "--docdir=share/doc/${name}"
+    # We should set the proper `CMAKE_SYSTEM_NAME`.
+    # http://www.cmake.org/Wiki/CMake_Cross_Compiling
+    #
+    # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and
+    # strip. Otherwise they are taken to be relative to the source root of the
+    # package being built.
+    "-DCMAKE_CXX_COMPILER=${stdenv.cc.targetPrefix}c++"
+    "-DCMAKE_C_COMPILER=${stdenv.cc.targetPrefix}cc"
+    "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
+    "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
+    "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
+   ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
+     ++ optional (useQt4 || withQt5) "--qt-gui"
+     ++ ["--"]
+     ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ];
 
   dontUseCmakeConfigure = true;
   enableParallelBuilding = true;
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index c796c31cb70a..003f900c9541 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -29,20 +29,17 @@ cmakeConfigurePhase() {
         cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix $cmakeFlags"
     fi
 
-    if [ -n "$crossConfig" ]; then
-        # By now it supports linux builds only. We should set the proper
-        # CMAKE_SYSTEM_NAME otherwise.
-        # http://www.cmake.org/Wiki/CMake_Cross_Compiling
-        #
-        # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and
-        # strip. Otherwise they are taken to be relative to the source root of
-        # the package being built.
-        cmakeFlags="-DCMAKE_CXX_COMPILER=$crossConfig-c++ $cmakeFlags"
-        cmakeFlags="-DCMAKE_C_COMPILER=$crossConfig-cc $cmakeFlags"
-        cmakeFlags="-DCMAKE_AR=$(command -v $crossConfig-ar) $cmakeFlags"
-        cmakeFlags="-DCMAKE_RANLIB=$(command -v $crossConfig-ranlib) $cmakeFlags"
-        cmakeFlags="-DCMAKE_STRIP=$(command -v $crossConfig-strip) $cmakeFlags"
-    fi
+    # We should set the proper `CMAKE_SYSTEM_NAME`.
+    # http://www.cmake.org/Wiki/CMake_Cross_Compiling
+    #
+    # Unfortunately cmake seems to expect absolute paths for ar, ranlib, and
+    # strip. Otherwise they are taken to be relative to the source root of the
+    # package being built.
+    cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags"
+    cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags"
+    cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags"
+    cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLAB) $cmakeFlags"
+    cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags"
 
     # This installs shared libraries with a fully-specified install
     # name. By default, cmake installs shared libraries with just the
diff --git a/pkgs/misc/uboot/nanonote.nix b/pkgs/misc/uboot/nanonote.nix
index 2783927ef57c..fb3b98f478e6 100644
--- a/pkgs/misc/uboot/nanonote.nix
+++ b/pkgs/misc/uboot/nanonote.nix
@@ -1,8 +1,5 @@
 {stdenv, fetchurl, fetchgit}:
 
-# We should enable this check once we have the cross target system information
-# assert stdenv.system == "armv5tel-linux" || crossConfig == "armv5tel-linux";
-
 # All this file is made for the Marvell Sheevaplug
    
 stdenv.mkDerivation {
@@ -30,21 +27,19 @@ stdenv.mkDerivation {
     sed -i -e 's/0x200000;bootm/0x400000;bootm/' include/configs/qi_lb60.h
   '';
 
-  # Remove the cross compiler prefix, and add reiserfs support
+  makeFlags = [
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+  ];
+
+  # Add reiserfs support
   configurePhase = ''
     make mrproper
     make qi_lb60_config
-    sed -i /CROSS_COMPILE/d include/config.mk
   '';
 
-  buildPhase = ''
+  preBuild= ''
     # A variable named 'src' used to affect the build in some uboot...
-    unset src
-    if test -z "$crossConfig"; then
-        make clean all
-    else
-        make clean all ARCH=mips CROSS_COMPILE=$crossConfig-
-    fi
+    unset -v src
   '';
 
   dontStrip = true;
@@ -59,6 +54,6 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    platforms = [ "mipsel-linux" ];
+    platforms = stdenv.lib.platforms.mips;
   };
 }
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 18189ba2e68d..42831dc40642 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -5,11 +5,9 @@ let
   inherit (stdenv) lib isDarwin;
   inherit (lib) overrideDerivation;
 
-  setMalloc0ReturnsNullCrossCompiling = ''
-    if test -n "$crossConfig"; then
-      configureFlags="$configureFlags --enable-malloc0returnsnull";
-    fi
-  '';
+  malloc0ReturnsNullCrossFlag = stdenv.lib.optional
+    (stdenv.hostPlatform != stdenv.buildPlatform)
+    "--enable-malloc0returnsnull";
 
   gitRelease = { libName, version, rev, sha256 } : attrs : attrs // {
     name = libName + "-" + version;
@@ -101,7 +99,9 @@ in
 
   libX11 = attrs: attrs // {
     outputs = [ "out" "dev" "man" ];
-    preConfigure = setMalloc0ReturnsNullCrossCompiling + ''
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
+    preConfigure = ''
       sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
     '';
     postInstall =
@@ -138,16 +138,19 @@ in
 
   libXxf86vm = attrs: attrs // {
     outputs = [ "out" "dev" ];
-    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
   };
 
   # Propagate some build inputs because of header file dependencies.
   # Note: most of these are in Requires.private, so maybe builder.sh
   # should propagate them automatically.
   libXt = attrs: attrs // {
-    preConfigure = setMalloc0ReturnsNullCrossCompiling + ''
+    preConfigure = ''
       sed 's,^as_dummy.*,as_dummy="\$PATH",' -i configure
     '';
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
     propagatedBuildInputs = [ xorg.libSM ];
     CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
     outputs = [ "out" "dev" "devdoc" ];
@@ -188,7 +191,8 @@ in
   libXft = attrs: attrs // {
     outputs = [ "out" "dev" ];
     propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
-    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
     # the include files need ft2build.h, and Requires.private isn't enough for us
     postInstall = ''
       sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
@@ -198,7 +202,8 @@ in
   libXext = attrs: attrs // {
     outputs = [ "out" "dev" "man" "doc" ];
     propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
-    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
   };
 
   libXfixes = attrs: attrs // {
@@ -221,7 +226,8 @@ in
 
   libXrandr = attrs: attrs // {
     outputs = [ "out" "dev" ];
-    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
     propagatedBuildInputs = [xorg.libXrender];
   };
 
@@ -232,8 +238,9 @@ in
 
   libXrender = attrs: attrs // {
     outputs = [ "out" "dev" "doc" ];
+    configureFlags = attrs.configureFlags or []
+      ++ malloc0ReturnsNullCrossFlag;
     propagatedBuildInputs = [ xorg.renderproto ];
-    preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
   libXres = attrs: attrs // {
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 46df958b8396..e108e3f156ac 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -52,7 +52,8 @@ rec {
     # InstallCheck phase
     , doInstallCheck ? false
 
-    , crossConfig ? null
+    , # TODO(@Ericson2314): Make always true and remove
+      strictDeps ? stdenv.hostPlatform != stdenv.buildPlatform
     , meta ? {}
     , passthru ? {}
     , pos ? # position used in error messages and for meta.position
@@ -156,6 +157,8 @@ rec {
           userHook = config.stdenv.userHook or null;
           __ignoreNulls = true;
 
+          inherit strictDeps;
+
           depsBuildBuild              = lib.elemAt (lib.elemAt dependencies 0) 0;
           nativeBuildInputs           = lib.elemAt (lib.elemAt dependencies 0) 1;
           depsBuildTarget             = lib.elemAt (lib.elemAt dependencies 0) 2;
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d7a4781448ae..bfab19dd9737 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -501,7 +501,7 @@ activatePackage() {
     # the transition, we do include everything in thatcase.
     #
     # TODO(@Ericson2314): Don't special-case native compilation
-    if [[ ( -z "${crossConfig-}" ||  "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then
+    if [[ ( -z "${strictDeps-}" ||  "$hostOffset" -le -1 ) && -d "$pkg/bin" ]]; then
         addToSearchPath _PATH "$pkg/bin"
     fi
 
@@ -551,7 +551,7 @@ _addToEnv() {
         for depTargetOffset in "${allPlatOffsets[@]}"; do
             (( "$depHostOffset" <= "$depTargetOffset" )) || continue
             local hookRef="${hookVar}[$depTargetOffset - $depHostOffset]"
-            if [[ -z "${crossConfig-}" ]]; then
+            if [[ -z "${strictDeps-}" ]]; then
                 # Apply environment hooks to all packages during native
                 # compilation to ease the transition.
                 #
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index fc60a000e36e..52bd28e9748d 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   # Hack to make sure we never to the relaxation `$PATH` and hooks support for
   # compatability. This will be replaced with something clearer in a future
   # masss-rebuild.
-  crossConfig = true;
+  strictDeps = true;
 
   meta = {
     description = "GNU software calculator";

From 5a860c20f3030df890084d00d7d487ded735326e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 14 May 2018 20:05:48 -0400
Subject: [PATCH 1837/3370] stdenv cross adapter: Don't define crossConfig

All its uses have been removed.
---
 pkgs/stdenv/adapters.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 734119491a0b..18a9c7f38098 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -87,8 +87,6 @@ rec {
                  (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
                  pkgs.updateAutotoolsGnuConfigScriptsHook
             ;
-
-          crossConfig = hostPlatform.config;
         } // args.crossAttrs or {});
   };
 

From dd7f08a1a6440a157f82db4d91f67aa657d29879 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sat, 12 May 2018 02:45:22 -0700
Subject: [PATCH 1838/3370] ffmpeg-full: 3.4.2 -> 4.0

init local package nv-codec-headers, which are external nvidia headers,
now used when nvenc is enabled
---
 .../libraries/ffmpeg-full/default.nix         | 20 ++++++++---------
 .../ffmpeg-full/nv-codec-headers.nix          | 22 +++++++++++++++++++
 pkgs/development/libraries/ffmpeg/4.0.nix     | 12 ++++++++++
 3 files changed, 44 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
 create mode 100644 pkgs/development/libraries/ffmpeg/4.0.nix

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index d2ef075beee1..6bf7d0f68f83 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -25,7 +25,6 @@
 , ffmpegProgram ? true # Build ffmpeg executable
 , ffplayProgram ? true # Build ffplay executable
 , ffprobeProgram ? true # Build ffprobe executable
-, ffserverProgram ? true # Build ffserver executable
 , qtFaststartProgram ? true # Build qt-faststart executable
 /*
  *  Library options
@@ -98,13 +97,14 @@
 , libXv ? null # Xlib support
 , lzma ? null # xz-utils
 , nvenc ? false, nvidia-video-sdk ? null # NVIDIA NVENC support
+, callPackage # needed for NVENC to access external ffmpeg nvidia headers
 , openal ? null # OpenAL 1.1 capture support
 #, opencl ? null # OpenCL code
 , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
 #, opencv ? null # Video filtering
 , openglExtlib ? false, libGLU_combined ? null # OpenGL rendering
 #, openh264 ? null # H.264/AVC encoder
-, openjpeg_1 ? null # JPEG 2000 de/encoder
+, openjpeg ? null # JPEG 2000 de/encoder
 , opensslExtlib ? false, openssl ? null
 , libpulseaudio ? null # Pulseaudio input support
 , rtmpdump ? null # RTMP[E] support
@@ -159,7 +159,7 @@
  *   utvideo vo-aacenc vo-amrwbenc xvmc zvbi blackmagic-design-desktop-video
  *
  * Need fixes to support Darwin:
- *   frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg_1,
+ *   frei0r, game-music-emu, gsm, libjack2, libssh, libvpx(stable 1.3.0), openal, openjpeg,
  *   pulseaudio, rtmpdump, samba, vid-stab, wavpack, x265. xavs
  *
  * Not supported:
@@ -176,6 +176,8 @@
 let
   inherit (stdenv) isCygwin isFreeBSD isLinux;
   inherit (stdenv.lib) optional optionals optionalString enableFeature;
+
+  nv-codec-headers = callPackage ./nv-codec-headers.nix { };
 in
 
 /*
@@ -201,7 +203,6 @@ assert ffplayProgram -> avcodecLibrary
                      && swresampleLibrary
                      && SDL2 != null;
 assert ffprobeProgram -> avcodecLibrary && avformatLibrary;
-assert ffserverProgram -> avformatLibrary;
 /*
  *  Library dependencies
  */
@@ -231,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "3.4.2";
+  version = "4.0";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
-    sha256 = "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib";
+    sha256 = "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d";
   };
 
   prePatch = ''
@@ -286,7 +287,6 @@ stdenv.mkDerivation rec {
     (enableFeature ffmpegProgram "ffmpeg")
     (enableFeature ffplayProgram "ffplay")
     (enableFeature ffprobeProgram "ffprobe")
-    (enableFeature ffserverProgram "ffserver")
     /*
      *  Library flags
      */
@@ -365,7 +365,7 @@ stdenv.mkDerivation rec {
     #(enableFeature (opencv != null) "libopencv")
     (enableFeature openglExtlib "opengl")
     #(enableFeature (openh264 != null) "openh264")
-    (enableFeature (openjpeg_1 != null) "libopenjpeg")
+    (enableFeature (openjpeg != null) "libopenjpeg")
     (enableFeature (opensslExtlib && gplLicensing) "openssl")
     (enableFeature (libpulseaudio != null) "libpulse")
     #(enableFeature quvi "libquvi")
@@ -404,14 +404,14 @@ stdenv.mkDerivation rec {
     bzip2 celt fontconfig freetype frei0r fribidi game-music-emu gnutls gsm
     libjack2 ladspaH lame libass libbluray libbs2b libcaca libdc1394 libmodplug
     libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
-    libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr
+    libxcb libXv lzma openal openjpeg libpulseaudio rtmpdump opencore-amr
     samba SDL2 soxr speex vid-stab vo-amrwbenc wavpack x264 x265 xavs xvidcore
     zeromq4 zlib
   ] ++ optional openglExtlib libGLU_combined
     ++ optionals nonfreeLicensing [ fdk_aac openssl ]
     ++ optional ((isLinux || isFreeBSD) && libva != null) libva
     ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
-    ++ optionals nvenc [ nvidia-video-sdk ]
+    ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]
     ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
                                    MediaToolbox VideoDecodeAcceleration
                                    libiconv ];
diff --git a/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix b/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
new file mode 100644
index 000000000000..03599c91bf04
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg-full/nv-codec-headers.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "nv-codec-headers-${version}";
+  version = "n8.1.24.2";
+
+  src = fetchgit {
+    url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
+    rev = "${version}";
+    sha256 = "122i3f6whiz5yp44dhk73ifr1973z8vvfbg4216vb782bl8b5bam";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    description = "ffmpeg nvidia headers for NVENC";
+    homepage = http://ffmpeg.org/;
+    license = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.MP2E ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/libraries/ffmpeg/4.0.nix b/pkgs/development/libraries/ffmpeg/4.0.nix
new file mode 100644
index 000000000000..a6e67052cd03
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/4.0.nix
@@ -0,0 +1,12 @@
+{ stdenv, callPackage, fetchpatch
+# Darwin frameworks
+, Cocoa, CoreMedia
+, ...
+}@args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}";
+  branch = "4.0";
+  sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii";
+  darwinFrameworks = [ Cocoa CoreMedia ];
+})

From 0e6fb50954bda292bc5108307ffe06c733815dca Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Mon, 14 May 2018 21:06:39 -0700
Subject: [PATCH 1839/3370] ffmpeg: remove redundant nix expr from last commit

accidentally brought in from old local changes
---
 pkgs/development/libraries/ffmpeg/4.0.nix | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/4.0.nix

diff --git a/pkgs/development/libraries/ffmpeg/4.0.nix b/pkgs/development/libraries/ffmpeg/4.0.nix
deleted file mode 100644
index a6e67052cd03..000000000000
--- a/pkgs/development/libraries/ffmpeg/4.0.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, callPackage, fetchpatch
-# Darwin frameworks
-, Cocoa, CoreMedia
-, ...
-}@args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}";
-  branch = "4.0";
-  sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii";
-  darwinFrameworks = [ Cocoa CoreMedia ];
-})

From 89a5e6db55e45994fa343ec91586065ce929b831 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Tue, 15 May 2018 14:30:37 +0900
Subject: [PATCH 1840/3370] rPackages.JuniperKernel: fix non-Darwin build

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 451fc1dc6fee..cbaea0f0d85e 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -757,7 +757,7 @@ let
     });
 
     JuniperKernel = old.JuniperKernel.overrideDerivation (attrs: {
-      postPatch = ''
+      postPatch = lib.optionalString stdenv.isDarwin ''
         for file in {R,src}/*.R; do
             sed -i 's#system("which \(otool\|install_name_tool\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
         done

From 08f0c4361c73d1a41049378c13cccaa6a94c4419 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Tue, 15 May 2018 10:19:29 +0200
Subject: [PATCH 1841/3370] cura: fix invisible sidebar

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

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index edb10a0f6671..ede69bbc116b 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols, curaengine }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, qtquickcontrols2, curaengine }:
 
 mkDerivation rec {
   name = "cura-${version}";
@@ -11,7 +11,7 @@ mkDerivation rec {
     sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp";
   };
 
-  buildInputs = [ qtbase qtquickcontrols ];
+  buildInputs = [ qtbase qtquickcontrols2 ];
   propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
   nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
 

From b9361e8da865450fdd31dd223fd44f74cac68dc2 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Tue, 15 May 2018 10:48:56 +0200
Subject: [PATCH 1842/3370] cura: install missing materials

---
 pkgs/applications/misc/cura/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index ede69bbc116b..10f6837761bb 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -11,6 +11,13 @@ mkDerivation rec {
     sha256 = "0yaya0ww92qjm7g31q85m5f95nwdapldjx1kdf1ar4yzwh4r15rp";
   };
 
+  materials = fetchFromGitHub {
+    owner = "Ultimaker";
+    repo = "fdm_materials";
+    rev = "3.2.1";
+    sha256 = "1kr9ga727x0kazw2ypac9bi6g6lddbsx80qw8fbn0514kg2mr9n3";
+  };
+
   buildInputs = [ qtbase qtquickcontrols2 ];
   propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial numpy-stl ];
   nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
@@ -22,6 +29,11 @@ mkDerivation rec {
     sed -i 's, executable_name = .*, executable_name = "${curaengine}/bin/CuraEngine",' plugins/CuraEngineBackend/CuraEngineBackend.py
   '';
 
+  postInstall = ''
+    mkdir -p $out/share/cura/resources/materials
+    cp ${materials}/*.fdm_material $out/share/cura/resources/materials/
+  '';
+
   postFixup = ''
     wrapPythonPrograms
   '';

From e0a42d991cd30d3ebbc592dda34de2260b843773 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 31 Dec 2017 05:10:15 +0100
Subject: [PATCH 1843/3370] nixos/flatpak: init

---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/desktops/flatpak.nix | 28 +++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/modules/services/desktops/flatpak.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6c4326046ef8..428e2e434f3a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -214,6 +214,7 @@
   ./services/desktops/accountsservice.nix
   ./services/desktops/dleyna-renderer.nix
   ./services/desktops/dleyna-server.nix
+  ./services/desktops/flatpak.nix
   ./services/desktops/geoclue2.nix
   ./services/desktops/pipewire.nix
   ./services/desktops/gnome3/at-spi2-core.nix
diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix
new file mode 100644
index 000000000000..d191eeff990f
--- /dev/null
+++ b/nixos/modules/services/desktops/flatpak.nix
@@ -0,0 +1,28 @@
+# flatpak service.
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  ###### interface
+  options = {
+    services.flatpak = {
+      enable = mkEnableOption "flatpak";
+    };
+  };
+
+
+  ###### implementation
+  config = mkIf config.services.flatpak.enable {
+    environment.systemPackages = [ pkgs.flatpak ];
+
+    services.dbus.packages = [ pkgs.flatpak ];
+
+    systemd.packages = [ pkgs.flatpak ];
+
+    environment.variables.PATH = [
+      "$HOME/.local/share/flatpak/exports/bin"
+      "/var/lib/flatpak/exports/bin"
+    ];
+  };
+}

From 17dd7bcd89d568596f52356624be82201ea84779 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 3 Jan 2018 11:57:29 +0100
Subject: [PATCH 1844/3370] nixos/systemd-lib: fix conflict with dbus.service.d
 directory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When a package contains a directory in one of the systemd directories
(like flatpak does), it is symlinked into the *-units derivation.
Then later, the derivation will try to create the directory, which
will fail:

mkdir: cannot create directory '/nix/store/…-user-units/dbus.service.d': File exists
builder for '/nix/store/…-user-units.drv' failed with exit code 1

Closes: #33233
---
 nixos/modules/system/boot/systemd-lib.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index 7c01f8ea9b7f..ae9ee8811f77 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -2,9 +2,10 @@
 
 with lib;
 
-let cfg = config.systemd; in
-
-rec {
+let
+  cfg = config.systemd;
+  lndir = "${pkgs.xorg.lndir}/bin/lndir";
+in rec {
 
   shellEscape = s: (replaceChars [ "\\" ] [ "\\\\" ] s);
 
@@ -136,7 +137,13 @@ rec {
       for i in ${toString cfg.packages}; do
         for fn in $i/etc/systemd/${type}/* $i/lib/systemd/${type}/*; do
           if ! [[ "$fn" =~ .wants$ ]]; then
-            ln -s $fn $out/
+            if [[ -d "$fn" ]]; then
+              targetDir="$out/$(basename "$fn")"
+              mkdir -p "$targetDir"
+              ${lndir} "$fn" "$targetDir"
+            else
+              ln -s $fn $out/
+            fi
           fi
         done
       done
@@ -151,7 +158,7 @@ rec {
           if [ "$(readlink -f $i/$fn)" = /dev/null ]; then
             ln -sfn /dev/null $out/$fn
           else
-            mkdir $out/$fn.d
+            mkdir -p $out/$fn.d
             ln -s $i/$fn $out/$fn.d/overrides.conf
           fi
        else

From 2fc8b832829b9df30846042dde7a8a24aa79d415 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 3 Jan 2018 12:57:37 +0100
Subject: [PATCH 1845/3370] gnome3.gnome-software: build with flatpak support

---
 pkgs/desktops/gnome-3/core/gnome-software/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 21a1e1a1c4c7..2d5080841a4a 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree
-, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection
+, glib, appstream-glib, libsoup, polkit, isocodes, gspell, libxslt, gobjectIntrospection, flatpak
 , json-glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk-doc, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -27,11 +27,10 @@ stdenv.mkDerivation rec {
     gnome3.gtk glib packagekit appstream-glib libsoup
     gnome3.gsettings-desktop-schemas gnome3.gnome-desktop
     gspell json-glib libsecret ostree
-    polkit
+    polkit flatpak
   ];
 
   mesonFlags = [
-    "-Denable-flatpak=false"
     "-Denable-rpm=false"
     "-Denable-fwupd=false"
     "-Denable-oauth=false"

From 843bc0f73a648426b2206cda88c5bf49563c3990 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Feb 2018 01:53:39 +0100
Subject: [PATCH 1846/3370] flatpak-builder: init add 0.10.10

---
 .../tools/flatpak-builder/default.nix         | 103 ++++++++++++++++
 .../tools/flatpak-builder/fix-paths.patch     | 116 ++++++++++++++++++
 .../respect-xml-catalog-files-var.patch       |  13 ++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 234 insertions(+)
 create mode 100644 pkgs/development/tools/flatpak-builder/default.nix
 create mode 100644 pkgs/development/tools/flatpak-builder/fix-paths.patch
 create mode 100644 pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch

diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix
new file mode 100644
index 000000000000..351ec2c77dba
--- /dev/null
+++ b/pkgs/development/tools/flatpak-builder/default.nix
@@ -0,0 +1,103 @@
+{ stdenv
+, fetchurl
+, substituteAll
+
+, autoreconfHook
+, docbook_xml_dtd_412
+, docbook_xml_dtd_42
+, docbook_xml_dtd_43
+, docbook_xsl
+, gettext
+, libxml2
+, libxslt
+, pkgconfig
+, xmlto
+
+, acl
+, bazaar
+, binutils
+, bzip2
+, coreutils
+, cpio
+, elfutils
+, flatpak
+, gitMinimal
+, glib
+, gnutar
+, json_glib
+, libcap
+, libdwarf
+, libsoup
+, ostree
+, patch
+, rpm
+, unzip
+}:
+
+let
+  version = "0.10.10";
+in stdenv.mkDerivation rec {
+  name = "flatpak-builder-${version}";
+
+  outputs = [ "out" "doc" "man" ];
+
+  src = fetchurl {
+    url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz";
+    sha256 = "0b0c2rmf2vj596600blbhsiv2dg7qwpr33lgdcn0bnqc4ddri6f2";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    docbook_xml_dtd_412
+    docbook_xml_dtd_42
+    docbook_xml_dtd_43
+    docbook_xsl
+    gettext
+    libxml2
+    libxslt
+    pkgconfig
+    xmlto
+  ];
+
+  buildInputs = [
+    acl
+    bzip2
+    elfutils
+    flatpak
+    glib
+    json_glib
+    libcap
+    libdwarf
+    libsoup
+    libxml2
+    ostree
+  ];
+
+  patches = [
+    # patch taken from gtk_doc
+    ./respect-xml-catalog-files-var.patch
+    (substituteAll {
+      src = ./fix-paths.patch;
+      bzr = "${bazaar}/bin/bzr";
+      cp = "${coreutils}/bin/cp";
+      patch = "${patch}/bin/patch";
+      tar = "${gnutar}/bin/tar";
+      unzip = "${unzip}/bin/unzip";
+      rpm2cpio = "${rpm}/bin/rpm2cpio";
+      cpio = "${cpio}/bin/cpio";
+      git = "${gitMinimal}/bin/git";
+      rofilesfuse = "${ostree}/bin/rofiles-fuse";
+      strip = "${binutils}/bin/strip";
+      eustrip = "${elfutils}/bin/eu-strip";
+      euelfcompress = "${elfutils}/bin/eu-elfcompress";
+    })
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Tool to build flatpaks from source";
+    homepage = https://flatpak.org/;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ jtojnar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch
new file mode 100644
index 000000000000..001ddd645683
--- /dev/null
+++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch
@@ -0,0 +1,116 @@
+--- a/src/builder-context.c
++++ b/src/builder-context.c
+@@ -711,7 +711,7 @@
+   g_autoptr(GFile) rofiles_base = NULL;
+   g_autoptr(GFile) rofiles_dir = NULL;
+   g_autofree char *tmpdir_name = NULL;
+-  char *argv[] = { "rofiles-fuse",
++  char *argv[] = { "@rofilesfuse@",
+                    "-o",
+                    "kernel_cache,entry_timeout=60,attr_timeout=60,splice_write,splice_move",
+                    (char *)flatpak_file_get_path_cached (self->app_dir),
+--- a/src/builder-git.c
++++ b/src/builder-git.c
+@@ -44,7 +44,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, output, flags, error, "git", ap);
++  res = flatpak_spawn (dir, output, flags, error, "@git@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -58,7 +58,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (NULL, NULL, 0, error, "cp", ap);
++  res = flatpak_spawn (NULL, NULL, 0, error, "@cp@", ap);
+   va_end (ap);
+ 
+   return res;
+--- a/src/builder-source-archive.c
++++ b/src/builder-source-archive.c
+@@ -401,7 +401,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, NULL, 0, error, "tar", ap);
++  res = flatpak_spawn (dir, NULL, 0, error, "@tar@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -416,7 +416,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, NULL, 0, error, "unzip", ap);
++  res = flatpak_spawn (dir, NULL, 0, error, "@unzip@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -428,7 +428,7 @@
+        GError **error)
+ {
+   gboolean res;
+-  const gchar *argv[] = { "sh", "-c", "rpm2cpio \"$1\" | cpio -i -d",
++  const gchar *argv[] = { "sh", "-c", "@rpm2cpio@ \"$1\" | @cpio@ -i -d",
+       "sh", /* shell's $0 */
+       rpm_path, /* shell's $1 */
+       NULL };
+--- a/src/builder-source-bzr.c
++++ b/src/builder-source-bzr.c
+@@ -124,7 +124,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (dir, output, 0, error, "bzr", ap);
++  res = flatpak_spawn (dir, output, 0, error, "@bzr@", ap);
+   va_end (ap);
+ 
+   return res;
+--- a/src/builder-source-patch.c
++++ b/src/builder-source-patch.c
+@@ -204,11 +204,11 @@
+ 
+   args = g_ptr_array_new ();
+   if (use_git) {
+-    g_ptr_array_add (args, "git");
++    g_ptr_array_add (args, "@git@");
+     g_ptr_array_add (args, "apply");
+     g_ptr_array_add (args, "-v");
+   } else {
+-    g_ptr_array_add (args, "patch");
++    g_ptr_array_add (args, "@patch@");
+   }
+   for (i = 0; extra_options != NULL && extra_options[i] != NULL; i++)
+     g_ptr_array_add (args, (gchar *) extra_options[i]);
+--- a/src/builder-utils.c
++++ b/src/builder-utils.c
+@@ -139,7 +139,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (NULL, NULL, 0, error, "strip", ap);
++  res = flatpak_spawn (NULL, NULL, 0, error, "@strip@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -153,7 +153,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (NULL, NULL, 0, error, "eu-strip", ap);
++  res = flatpak_spawn (NULL, NULL, 0, error, "@eustrip@", ap);
+   va_end (ap);
+ 
+   return res;
+@@ -167,7 +167,7 @@
+   va_list ap;
+ 
+   va_start (ap, error);
+-  res = flatpak_spawn (NULL, NULL, 0, error, "eu-elfcompress", ap);
++  res = flatpak_spawn (NULL, NULL, 0, error, "@euelfcompress@", ap);
+   va_end (ap);
+ 
+   return res;
diff --git a/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch b/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch
new file mode 100644
index 000000000000..0e259aebd8a5
--- /dev/null
+++ b/pkgs/development/tools/flatpak-builder/respect-xml-catalog-files-var.patch
@@ -0,0 +1,13 @@
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -40,8 +40,8 @@
+ [
+   AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl
+   AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog])
+-  if $jh_found_xmlcatalog && \
+-     AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then
++  # empty argument forces libxml to use XML_CATALOG_FILES variable
++  if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then
+     AC_MSG_RESULT([found])
+     ifelse([$3],,,[$3
+ ])dnl
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 51ac42970914..6bde66daf964 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2299,6 +2299,8 @@ with pkgs;
 
   flatpak = callPackage ../development/libraries/flatpak { };
 
+  flatpak-builder = callPackage ../development/tools/flatpak-builder { };
+
   figlet = callPackage ../tools/misc/figlet { };
 
   file = callPackage ../tools/misc/file { };

From ec80c5e4c48df8264e5e230bb81eb55e045382dc Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Feb 2018 02:09:51 +0100
Subject: [PATCH 1847/3370] nixos/flatpak: allow specifying extra portals

---
 nixos/modules/services/desktops/flatpak.nix   | 35 +++++++--
 .../services/x11/desktop-managers/gnome3.nix  |  1 +
 .../libraries/xdg-desktop-portal/default.nix  |  4 +
 .../respect-path-env-var.patch                | 76 +++++++++++++++++++
 4 files changed, 108 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch

diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix
index d191eeff990f..23480e652675 100644
--- a/nixos/modules/services/desktops/flatpak.nix
+++ b/nixos/modules/services/desktops/flatpak.nix
@@ -3,26 +3,45 @@
 
 with lib;
 
-{
+let
+  cfg = config.services.flatpak;
+in {
   ###### interface
   options = {
     services.flatpak = {
       enable = mkEnableOption "flatpak";
+
+      extraPortals = mkOption {
+        type = types.listOf types.package;
+        default = [];
+        description = ''
+          List of additional portals to add to path. Portals allow interaction
+          with system, like choosing files or taking screenshots. At minimum,
+          a desktop portal implementation should be listed. GNOME already
+          adds <package>xdg-desktop-portal-gtk</package>; for KDE, there
+          is <package>xdg-desktop-portal-kde</package>. Other desktop
+          environments will probably want to do the same.
+        '';
+      };
     };
   };
 
 
   ###### implementation
-  config = mkIf config.services.flatpak.enable {
+  config = mkIf cfg.enable {
     environment.systemPackages = [ pkgs.flatpak ];
 
-    services.dbus.packages = [ pkgs.flatpak ];
+    services.dbus.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
 
-    systemd.packages = [ pkgs.flatpak ];
+    systemd.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
 
-    environment.variables.PATH = [
-      "$HOME/.local/share/flatpak/exports/bin"
-      "/var/lib/flatpak/exports/bin"
-    ];
+    environment.variables = {
+      PATH = [
+        "$HOME/.local/share/flatpak/exports/bin"
+        "/var/lib/flatpak/exports/bin"
+      ];
+
+      XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;
+    };
   };
 }
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 10e8ef0ed381..27b62df7097c 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -120,6 +120,7 @@ in {
     services.xserver.libinput.enable = mkDefault true; # for controlling touchpad settings via gnome control center
     services.udev.packages = [ pkgs.gnome3.gnome-settings-daemon ];
     systemd.packages = [ pkgs.gnome3.vino ];
+    services.flatpak.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
 
     # If gnome3 is installed, build vim for gtk3 too.
     nixpkgs.config.vim.gui = "gtk3";
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 6721d5f00acb..98bd8ba23bb5 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -14,6 +14,10 @@ in stdenv.mkDerivation rec {
     sha256 = "06gipd51snvlp2jp68v2c8rwbsv36kjzg9xacm81n1w4b2dpz4g0";
   };
 
+  patches = [
+    ./respect-path-env-var.patch
+  ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];
   buildInputs = [ glib pipewire fuse ];
 
diff --git a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch
new file mode 100644
index 000000000000..f884899ecd19
--- /dev/null
+++ b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch
@@ -0,0 +1,76 @@
+--- a/src/xdg-desktop-portal.c
++++ b/src/xdg-desktop-portal.c
+@@ -177,38 +177,50 @@
+ static void
+ load_installed_portals (void)
+ {
+-  const char *portal_dir = PKGDATADIR "/portals";
+-  g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);
+-  g_autoptr(GFileEnumerator) enumerator = NULL;
+ 
+-  enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL);
++  g_auto(GStrv) portal_dir_list;
++  int i;
++  const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH");
++
++  if (portal_dir == NULL)
++    portal_dir = PKGDATADIR "/portals";
+ 
+-  if (enumerator == NULL)
+-    return;
++  portal_dir_list = g_strsplit (portal_dir, G_SEARCHPATH_SEPARATOR_S, 0);
+ 
+-  while (TRUE)
++  for (i = 0; portal_dir_list[i] != NULL; i++)
+     {
+-      g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);
+-      g_autoptr(GFile) child = NULL;
+-      g_autofree char *path = NULL;
+-      const char *name;
+-      g_autoptr(GError) error = NULL;
++      portal_dir = portal_dir_list[i];
++      g_autoptr(GFile) dir = g_file_new_for_path (portal_dir);
++      g_autoptr(GFileEnumerator) enumerator = NULL;
++      enumerator = g_file_enumerate_children (dir, "*", G_FILE_QUERY_INFO_NONE, NULL, NULL);
+ 
+-      if (info == NULL)
+-        break;
++      if (enumerator == NULL)
++        continue;
+ 
+-      name = g_file_info_get_name (info);
++      while (TRUE)
++        {
++          g_autoptr(GFileInfo) info = g_file_enumerator_next_file (enumerator, NULL, NULL);
++          g_autoptr(GFile) child = NULL;
++          g_autofree char *path = NULL;
++          const char *name;
++          g_autoptr(GError) error = NULL;
+ 
+-      if (!g_str_has_suffix (name, ".portal"))
+-        continue;
++          if (info == NULL)
++            break;
+ 
+-      child = g_file_enumerator_get_child (enumerator, info);
+-      path = g_file_get_path (child);
++          name = g_file_info_get_name (info);
+ 
+-      if (!register_portal (path, &error))
+-        {
+-          g_warning ("Error loading %s: %s", path, error->message);
+-          continue;
++          if (!g_str_has_suffix (name, ".portal"))
++            continue;
++
++          child = g_file_enumerator_get_child (enumerator, info);
++          path = g_file_get_path (child);
++
++          if (!register_portal (path, &error))
++            {
++              g_warning ("Error loading %s: %s", path, error->message);
++              continue;
++            }
+         }
+     }
+ 

From 91365cd23abc28395b78b53d67b280f5b159a906 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 15 May 2018 14:10:29 +0200
Subject: [PATCH 1848/3370] nexus: fix setup and nixos test (#40522)

The original `nexus` derivation required `/run/sonatype-work/nexus3`
which explicitly depended on the NixOS path structure.

This would break `nexus` for everyone using `nixpkgs` on a non-NixOS
system, additionally the module never created `/run/sonatype-work`, so
the systemd unit created in `services.nexus` fails as well. The issue
wasn't actively known as the `nixos/nexus` test wasn't registered in
Hydra (see #40257).

This patch contains the following changes:

* Adds `tests.nexus` to `release.nix` to run the test on Hydra.

* Makes JVM parameters configurable: by default all JVM options were located
  in `result/bin/nexus.vmoptions` which made it quite hard to patch
  these parameters. Now it's possible to override all parameters by
  running `VM_OPTS_FILE=custom-nexus.vmoptions ./result/bin/nexus run`
  (after patching the `nexus` shell script), additionally it's possible
  to override these parameters with `services.nexus.vmoptions`.

* Bumped Nexus from 3.5.1 to 3.11.0

* Run the `nexus` test on Hydra with `callTest` in `nixos/release.nix`,
  furthermore the test checks if the UI is available on the specified
  port.

* Added myself as maintainer for the NixOS test and the package to have
  some more people in case of further breakage.

* Added sufficient disk space to the `nexus` test, otherwise the service
  fails with the following errors:

  ```
  com.orientechnologies.orient.core.exception.ODatabaseException: Cannot create database 'accesslog'
  com.orientechnologies.orient.core.exception.OLowDiskSpaceException: Error occurred while executing
    a write operation to database 'accesslog' due to limited free space on the disk (242 MB). The database
    is now working in read-only mode. Please close the database (or stop OrientDB), make room on your hard
    drive and then reopen the database. The minimal required space is 256 MB. Required space is now set to
    256MB (you can change it by setting parameter storage.diskCache.diskFreeSpaceLimit) .
  ```

/cc @ironpinguin @xeji
---
 nixos/modules/services/web-apps/nexus.nix     | 40 ++++++++++++++++---
 nixos/release.nix                             |  1 +
 nixos/tests/nexus.nix                         | 16 ++++----
 .../repository-managers/nexus/default.nix     | 16 ++++----
 .../nexus/nexus-vm-opts.patch                 | 14 +++++++
 5 files changed, 63 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch

diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
index f6a5ce73a12b..d5bd0f12febb 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -42,6 +42,34 @@ in
         default = 8081;
         description = "Port to listen on.";
       };
+
+      jvmOpts = mkOption {
+        type = types.lines;
+        default = ''
+          -Xms1200M
+          -Xmx1200M
+          -XX:MaxDirectMemorySize=2G
+          -XX:+UnlockDiagnosticVMOptions
+          -XX:+UnsyncloadClass
+          -XX:+LogVMOutput
+          -XX:LogFile=${cfg.home}/nexus3/log/jvm.log
+          -XX:-OmitStackTraceInFastThrow
+          -Djava.net.preferIPv4Stack=true
+          -Dkaraf.home=${pkgs.nexus}
+          -Dkaraf.base=${pkgs.nexus}
+          -Dkaraf.etc=${pkgs.nexus}/etc/karaf
+          -Djava.util.logging.config.file=${pkgs.nexus}/etc/karaf/java.util.logging.properties
+          -Dkaraf.data=${cfg.home}/nexus3
+          -Djava.io.tmpdir=${cfg.home}/nexus3/tmp
+          -Dkaraf.startLocalConsole=false
+        '';
+
+        description = ''
+          Options for the JVM written to `nexus.jvmopts`.
+          Please refer to the docs (https://help.sonatype.com/repomanager3/installation/configuring-the-runtime-environment)
+          for further information.
+        '';
+      };
     };
   };
 
@@ -63,13 +91,13 @@ in
       environment = {
         NEXUS_USER = cfg.user;
         NEXUS_HOME = cfg.home;
+
+        VM_OPTS_FILE = pkgs.writeText "nexus.vmoptions" cfg.jvmOpts;
       };
 
       preStart = ''
         mkdir -p ${cfg.home}/nexus3/etc
 
-        ln -sf ${cfg.home} /run/sonatype-work
-
         chown -R ${cfg.user}:${cfg.group} ${cfg.home}
 
         if [ ! -f ${cfg.home}/nexus3/etc/nexus.properties ]; then
@@ -77,10 +105,10 @@ in
           echo "application-port=${toString cfg.listenPort}" >> ${cfg.home}/nexus3/etc/nexus.properties
           echo "application-host=${toString cfg.listenAddress}" >> ${cfg.home}/nexus3/etc/nexus.properties
         else
-          sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties 
-          sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties 
-          sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties 
-          sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties 
+          sed 's/^application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+          sed 's/^# application-port=.*/application-port=${toString cfg.listenPort}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+          sed 's/^application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties
+          sed 's/^# application-host=.*/application-host=${toString cfg.listenAddress}/' -i ${cfg.home}/nexus3/etc/nexus.properties
         fi
       '';
 
diff --git a/nixos/release.nix b/nixos/release.nix
index 7ec41af4fd4b..365f93b731e1 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -346,6 +346,7 @@ in rec {
   tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
   # TODO: put in networking.nix after the test becomes more complete
   tests.networkingProxy = callTest tests/networking-proxy.nix {};
+  tests.nexus = callTest tests/nexus.nix { };
   tests.nfs3 = callTest tests/nfs.nix { version = 3; };
   tests.nfs4 = callTest tests/nfs.nix { version = 4; };
   tests.nginx = callTest tests/nginx.nix { };
diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
index 1f19fc0867a4..d12d06c2c00f 100644
--- a/nixos/tests/nexus.nix
+++ b/nixos/tests/nexus.nix
@@ -1,12 +1,12 @@
 # verifies:
 #   1. nexus service starts on server
-#   2. nexus user can be extended on server
-#   3. nexus service not can startup on server (creating database and all other initial stuff)
+#   2. nexus service can startup on server (creating database and all other initial stuff)
+#   3. the web application is reachable via HTTP
 
 import ./make-test.nix ({ pkgs, ...} : {
   name = "nexus";
   meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ ironpinguin ];
+    maintainers = [ ironpinguin ma27 ];
   };
 
   nodes = {
@@ -14,21 +14,19 @@ import ./make-test.nix ({ pkgs, ...} : {
     server =
       { config, pkgs, ... }:
       { virtualisation.memorySize = 2048;
+        virtualisation.diskSize = 2048;
 
         services.nexus.enable = true;
-
-        users.extraUsers.nexus.extraGroups = [ "users" ];
       };
+
   };
 
   testScript = ''
     startAll;
 
     $server->waitForUnit("nexus");
-
-    print $server->execute("sudo -u nexus groups");
-    $server->mustSucceed("sudo -u nexus groups | grep nexus | grep users");
-
     $server->waitForOpenPort(8081);
+
+    $server->succeed("curl -f 127.0.0.1:8081");
   '';
 })
diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
index 25dba0ac02f1..fb7a60070744 100644
--- a/pkgs/development/tools/repository-managers/nexus/default.nix
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, makeWrapper, jre, gawk }:
+
 stdenv.mkDerivation rec {
   name = "nexus-${version}";
-  version = "3.5.1-02";
+  version = "3.11.0-01";
 
   src = fetchurl {
     url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-mac.tgz";
-    sha256 = "5ef3512c2bbdd45ef35921c1a0ba109b45bd9dad88311750196aa689262258b6";
+    sha256 = "1h5nfzb1sqhzb5j7w2dpmdi7vnnc9g6zx43a44f3zjvlxh1s0vim";
   };
 
   sourceRoot = name;
 
   nativeBuildInputs = [ makeWrapper ];
 
-  patches = [ ./nexus-bin.patch ];
+  patches = [ ./nexus-bin.patch ./nexus-vm-opts.patch ];
 
   postPatch = ''
     substituteInPlace bin/nexus.vmoptions \
-      --replace ../sonatype-work/nexus3 /run/sonatype-work/nexus3 \
       --replace etc/karaf $out/etc/karaf \
       --replace =. =$out
   '';
@@ -28,14 +28,12 @@ stdenv.mkDerivation rec {
     cp -rfv * .install4j $out
     rm -fv $out/bin/nexus.bat
 
-    runHook postInstall
-  '';
-
-  postInstall = ''
     wrapProgram $out/bin/nexus \
       --set JAVA_HOME ${jre} \
       --set ALTERNATIVE_NAME "nexus" \
       --prefix PATH "${stdenv.lib.makeBinPath [ gawk ]}"
+
+    runHook postInstall
   '';
 
   meta = with stdenv.lib; {
@@ -43,6 +41,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.sonatype.org/nexus;
     license = licenses.epl10;
     platforms = platforms.all;
-    maintainers = with maintainers; [ aespinosa ironpinguin ];
+    maintainers = with maintainers; [ aespinosa ironpinguin ma27 ];
   };
 }
diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch b/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch
new file mode 100644
index 000000000000..744b4b96a56b
--- /dev/null
+++ b/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch
@@ -0,0 +1,14 @@
+diff --git a/bin/nexus b/bin/nexus
+index e7ed3fb..8db766b 100755
+--- a/bin/nexus
++++ b/bin/nexus
+@@ -440,7 +440,8 @@ add_class_path "$app_home/lib/boot/org.apache.karaf.diagnostic.boot-4.0.9.jar"
+ add_class_path "$app_home/lib/boot/org.apache.karaf.jaas.boot-4.0.9.jar"
+ 
+ vmoptions_val=""
+-read_vmoptions "$prg_dir/$progname.vmoptions"
++VM_OPTS=${VM_OPTS_FILE:-"$prg_dir/$progname.vmoptions"}
++read_vmoptions "$VM_OPTS"
+ INSTALL4J_ADD_VM_PARAMS="$INSTALL4J_ADD_VM_PARAMS $vmoptions_val"
+ 
+ 

From 1c043637140514df1205830e2ac860e57ef7a23a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 13 Feb 2018 17:52:49 +0100
Subject: [PATCH 1849/3370] nixos/flatpak: add test

---
 nixos/release.nix                             |  1 +
 nixos/tests/flatpak.nix                       | 23 +++++
 .../libraries/flatpak/fix-test-paths.patch    | 86 +++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 nixos/tests/flatpak.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index ae70b535a5e2..8151d1bac5ed 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -284,6 +284,7 @@ in rec {
   tests.env = callTest tests/env.nix {};
   tests.ferm = callTest tests/ferm.nix {};
   tests.firefox = callTest tests/firefox.nix {};
+  tests.flatpak = callTest tests/flatpak.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fwupd = callTest tests/fwupd.nix {};
   #tests.gitlab = callTest tests/gitlab.nix {};
diff --git a/nixos/tests/flatpak.nix b/nixos/tests/flatpak.nix
new file mode 100644
index 000000000000..d1c7cf843147
--- /dev/null
+++ b/nixos/tests/flatpak.nix
@@ -0,0 +1,23 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+  name = "flatpak";
+  meta = {
+    maintainers = pkgs.flatpak.meta.maintainers;
+  };
+
+  machine = { config, pkgs, ... }: {
+    imports = [ ./common/x11.nix ];
+    services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work
+    services.flatpak.enable = true;
+    environment.systemPackages = with pkgs; [ gnupg gnome-desktop-testing ostree python2 ];
+    virtualisation.memorySize = 2047;
+    virtualisation.diskSize = 1024;
+  };
+
+  testScript = ''
+    $machine->waitForX();
+    $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.flatpak.installedTests}/share' --timeout 3600");
+  '';
+})
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
index e0734009420c..a548f3882864 100644
--- a/pkgs/development/libraries/flatpak/fix-test-paths.patch
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -33,6 +33,81 @@
      gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
      fusermount -u $XDG_RUNTIME_DIR/doc || :
      if test -n "${TEST_SKIP_CLEANUP:-}"; then
+--- a/tests/make-test-runtime.sh
++++ b/tests/make-test-runtime.sh
+@@ -21,6 +21,7 @@
+ cat ${DIR}/metadata
+ 
+ # Add bash and dependencies
++mkdir -p ${DIR}/nix/store
+ mkdir -p ${DIR}/usr/bin
+ mkdir -p ${DIR}/usr/lib
+ ln -s ../lib ${DIR}/usr/lib64
+@@ -30,47 +31,27 @@
+ else
+     cp `which ldconfig` ${DIR}/usr/bin
+ fi
+-T=`mktemp`
+-for i in $@; do
+-    I=`which $i`
+-    cp $I ${DIR}/usr/bin
+-    ldd $I | sed "s/.* => //"  | awk '{ print $1}' | grep ^/ | grep ^/ >> $T
+-    if test $i == python2; then
+-        mkdir -p ${DIR}/usr/lib/python2.7/lib-dynload
+-        # This is a hardcoded minimal set of modules we need in the current tests.
+-        # Pretty hacky stuff. Add modules as needed.
+-        PYDIR=/usr/lib/python2.7
+-        if test -d /usr/lib64/python2.7; then PYDIR=/usr/lib64/python2.7; fi
+-        for py in site os stat posixpath genericpath warnings \
+-                       linecache types UserDict abc _abcoll \
+-                       _weakrefset copy_reg traceback sysconfig \
+-                       re sre_compile sre_parse sre_constants \
+-                       _sysconfigdata ; do
+-            cp ${PYDIR}/$py.py ${DIR}/usr/lib/python2.7
+-        done
+-        # These might not exist, depending how Python was configured; and the
+-        # part after ${so} might be "module" or ".x86_64-linux-gnu" or
+-        # something else
+-        for so in _locale strop ; do
+-            cp ${PYDIR}/lib-dynload/${so}*.so ${DIR}/usr/lib/python2.7/lib-dynload || :
+-        done
+-        for plat in $( cd ${PYDIR} && echo plat-* ); do
+-            test -e ${PYDIR}/${plat} || continue
+-            mkdir -p ${DIR}/usr/lib/python2.7/${plat}
+-            cp ${PYDIR}/${plat}/*.py ${DIR}/usr/lib/python2.7/${plat}/
+-        done
+-    fi
+-done
+ ln -s bash ${DIR}/usr/bin/sh
+-for i in `sort -u $T`; do
+-    cp "$i" ${DIR}/usr/lib/
++for i in $@; do
++    I=$(readlink -f $(which $i))
++    requisites=$(nix-store --query --requisites "$I")
++    for r in $requisites; do
++        # a single store item can be needed by multiple paths, no need to copy it again
++        if [ ! -e ${DIR}/$r ]; then
++            cp -r $r ${DIR}/$r
++        fi
++    done
++    ln -s $I ${DIR}/usr/bin/$i
+ done
+ 
+-# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but
+-# the real en_US locale is often not available, because its in the
+-# local archive.
++mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store
++chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed
++find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths
++find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets
++
++# We copy the whole locale archive because we do not have C.UTF8 locale
+ mkdir -p ${DIR}/usr/lib/locale/
+-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
++cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive
+ 
+ if [ x$COLLECTION_ID != x ]; then
+     collection_args=--collection-id=${COLLECTION_ID}
 --- a/tests/testlibrary.c
 +++ b/tests/testlibrary.c
 @@ -378,7 +378,7 @@
@@ -44,3 +119,14 @@
        g_autofree char *argv_str = g_strjoinv (" ", argv);
        g_test_message ("Spawning %s", argv_str);
        g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error);
+--- a/triggers/gtk-icon-cache.trigger
++++ b/triggers/gtk-icon-cache.trigger
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ if test \( -x "$(which gtk-update-icon-cache 2>/dev/null)" \) -a \( -d $1/exports/share/icons/hicolor \); then
+-    cp /usr/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/
++    cp @hicolorIconTheme@/share/icons/hicolor/index.theme $1/exports/share/icons/hicolor/
+     for dir in $1/exports/share/icons/*; do
+         if test -f $dir/index.theme; then
+             if ! gtk-update-icon-cache --quiet $dir; then

From 21ff482f7d7fa233ebdf553ddc5edf459e7344eb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 22 Feb 2018 06:29:51 +0100
Subject: [PATCH 1850/3370] nixos/xdg-desktop-portal: add test

---
 nixos/release.nix                  |  1 +
 nixos/tests/xdg-desktop-portal.nix | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 nixos/tests/xdg-desktop-portal.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 8151d1bac5ed..f8f643f1a5ab 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -399,6 +399,7 @@ in rec {
   tests.virtualbox = callSubTestsOnMatchingSystems ["x86_64-linux"] tests/virtualbox.nix {};
   tests.wordpress = callTest tests/wordpress.nix {};
   tests.xautolock = callTest tests/xautolock.nix {};
+  tests.xdg-desktop-portal = callTest tests/xdg-desktop-portal.nix {};
   tests.xfce = callTest tests/xfce.nix {};
   tests.xmonad = callTest tests/xmonad.nix {};
   tests.xrdp = callTest tests/xrdp.nix {};
diff --git a/nixos/tests/xdg-desktop-portal.nix b/nixos/tests/xdg-desktop-portal.nix
new file mode 100644
index 000000000000..d954b07f73d6
--- /dev/null
+++ b/nixos/tests/xdg-desktop-portal.nix
@@ -0,0 +1,17 @@
+# run installed tests
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+  name = "xdg-desktop-portal";
+  meta = {
+    maintainers = pkgs.xdg-desktop-portal.meta.maintainers;
+  };
+
+  machine = { config, pkgs, ... }: {
+    environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+  };
+
+  testScript = ''
+    $machine->succeed("gnome-desktop-testing-runner -d '${pkgs.xdg-desktop-portal.installedTests}/share'");
+  '';
+})

From d614f32e7ac639fb2e562c1be66d1d84bb3c3ad5 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 11 May 2018 06:00:44 +0200
Subject: [PATCH 1851/3370] nixos/flatpak: add docs

---
 nixos/modules/services/desktops/flatpak.nix |  5 ++
 nixos/modules/services/desktops/flatpak.xml | 53 +++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 nixos/modules/services/desktops/flatpak.xml

diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix
index 23480e652675..024dc65629a8 100644
--- a/nixos/modules/services/desktops/flatpak.nix
+++ b/nixos/modules/services/desktops/flatpak.nix
@@ -6,6 +6,11 @@ with lib;
 let
   cfg = config.services.flatpak;
 in {
+  meta = {
+    doc = ./flatpak.xml;
+    maintainers = pkgs.flatpak.meta.maintainers;
+  };
+
   ###### interface
   options = {
     services.flatpak = {
diff --git a/nixos/modules/services/desktops/flatpak.xml b/nixos/modules/services/desktops/flatpak.xml
new file mode 100644
index 000000000000..d9c8b711c450
--- /dev/null
+++ b/nixos/modules/services/desktops/flatpak.xml
@@ -0,0 +1,53 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-services-flatpak">
+
+<title>Flatpak</title>
+
+<para><emphasis>Source:</emphasis> <filename>modules/services/desktop/flatpak.nix</filename></para>
+
+<para><emphasis>Upstream documentation:</emphasis> <link xlink:href="https://github.com/flatpak/flatpak/wiki"/></para>
+
+<para>Flatpak is a system for building, distributing, and running sandboxed desktop applications on Linux.</para>
+
+<para>
+  To enable Flatpak, add the following to your <filename>configuration.nix</filename>:
+
+  <programlisting>
+  <xref linkend="opt-services.flatpak.enable"/> = true;
+  </programlisting>
+</para>
+
+<para>
+  For the sandboxed apps to work correctly, desktop integration portals need to be installed. If you run GNOME, this will be handled automatically for you; in other cases, you will need to add something like the following to your <filename>configuration.nix</filename>:
+
+  <programlisting>
+  <xref linkend="opt-services.flatpak.extraPortals"/> = [ pkgs.xdg-desktop-portal-gtk ];
+  </programlisting>
+</para>
+
+<para>
+  Then, you will need to add a repository, for example, <link xlink:href="https://github.com/flatpak/flatpak/wiki">Flathub</link>, either using the following commands:
+
+  <programlisting>
+  flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+  flatpak update
+  </programlisting>
+
+  or by opening the <link xlink:href="https://flathub.org/repo/flathub.flatpakrepo">repository file</link> in GNOME Software.
+</para>
+
+<para>
+  Finally, you can search and install programs:
+
+  <programlisting>
+  flatpak search bustle
+  flatpak install flathub org.freedesktop.Bustle
+  flatpak run org.freedesktop.Bustle
+  </programlisting>
+
+  Again, GNOME Software offers graphical interface for these tasks.
+</para>
+</chapter>

From 9cd3c7a12ee6d131c9ea545c2c75b412b7506673 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 15 May 2018 08:21:25 -0400
Subject: [PATCH 1852/3370] linux-testing: 4.17-rc4 -> 4.17-rc5

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 922256703307..691c0d7a0a97 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc4";
-  modDirVersion = "4.17.0-rc4";
+  version = "4.17-rc5";
+  modDirVersion = "4.17.0-rc5";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1y34hpzgxblwqslhsfsmzmpv9f3s936r93wgn4kmhkcwsm0in292";
+    sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk";
   };
 
   # Should the testing kernels ever be built on Hydra?

From c7e8ddc066ea4d06b979c066fa983f3d1c00d232 Mon Sep 17 00:00:00 2001
From: Yorick <yorickvanpelt@gmail.com>
Date: Tue, 15 May 2018 14:33:29 +0200
Subject: [PATCH 1853/3370] linux: config: remove prefix on KEY_DH_OPERATIONS

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ebb569689b29..ec2b2f387950 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -639,7 +639,7 @@ with stdenv.lib;
   
   # needed for iwd WPS support (wpa_supplicant replacement)
   ${optionalString (versionAtLeast version "4.7") ''
-    CONFIG_KEY_DH_OPERATIONS y
+    KEY_DH_OPERATIONS y
   ''}
 
   # Disable the firmware helper fallback, udev doesn't implement it any more

From 101d1d118d28b368a2de4246bfce4bf3151c51f0 Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Fri, 20 Apr 2018 11:25:58 +0200
Subject: [PATCH 1854/3370] pythonPackages.effect: init -> 0.11.0

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

diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix
new file mode 100644
index 000000000000..d5fdf2d3f85d
--- /dev/null
+++ b/pkgs/development/python-modules/effect/default.nix
@@ -0,0 +1,29 @@
+{ buildPythonPackage
+, fetchPypi
+, lib
+, attrs
+, six
+}:
+let
+
+version = "0.11.0";
+pname = "effect";
+
+in
+buildPythonPackage {
+  inherit version pname;                      
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1q75w4magkqd8ggabhhzzxmxakpdnn0vdg7ygj89zdc9yl7561q6";
+  };
+  propagatedBuildInputs = [
+    six
+    attrs
+  ];
+  doCheck = false;
+  meta = with lib; {
+    description = "pure effects for Python";
+    homepage = https://github.com/python-effect/effect;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7868f7d7ff06..c086c14e303e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5180,6 +5180,7 @@ in {
     };
   };
 
+  effect = callPackage ../development/python-modules/effect {};
 
   elpy = buildPythonPackage rec {
     name = "elpy-${version}";

From a7f79620accdb40282fef1d50d86762a978a8ed7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 15 May 2018 14:47:51 +0200
Subject: [PATCH 1855/3370] nixos: Fix build of the manual

The manual still had a reference to an option that was already renamed
ages ago and a7ed44ccadfcf1bd54d0197fbc87b6c1b0bcef7b made it 'visible'.

With the visible attribute set to false for extraKernelModules, the
option no longer appears in the manual and thus breaks the link from the
manual to the options.

This is easily fixed by referring to boot.initrd.kernelModules instead
of the obsolete option boot.initrd.extraKernelModules.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @rycee, @matthewbauer
---
 nixos/doc/manual/configuration/linux-kernel.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index 0990e9d932ba..6502aaec83e5 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -50,9 +50,9 @@ nixpkgs.config.packageOverrides = pkgs:
 <xref linkend="opt-boot.kernelModules"/> = [ "fuse" "kvm-intel" "coretemp" ];
 </programlisting>
   If the module is required early during the boot (e.g. to mount the root file
-  system), you can use <xref linkend="opt-boot.initrd.extraKernelModules"/>:
+  system), you can use <xref linkend="opt-boot.initrd.kernelModules"/>:
 <programlisting>
-<xref linkend="opt-boot.initrd.extraKernelModules"/> = [ "cifs" ];
+<xref linkend="opt-boot.initrd.kernelModules"/> = [ "cifs" ];
 </programlisting>
   This causes the specified modules and their dependencies to be added to the
   initial ramdisk.

From 1e0975f4c05959cf11b5a905f335c269dcaae630 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Fri, 11 May 2018 17:42:37 +0900
Subject: [PATCH 1856/3370] iproute2: module to create rt_table file & co

When doing source routing/multihoming, it's practical to give names to routing
tables. The absence of the rt_table file in /etc make this impossible.
This patch recreates these files on rebuild so that they can be modified
by the user see NixOS#38638.

iproute2 is modified to look into config.networking.iproute2.confDir instead of
/etc/iproute2.
---
 nixos/modules/config/iproute2.nix          | 23 ++++++++++++++++++++++
 nixos/modules/module-list.nix              |  1 +
 pkgs/os-specific/linux/iproute/default.nix |  5 +++--
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/config/iproute2.nix

diff --git a/nixos/modules/config/iproute2.nix b/nixos/modules/config/iproute2.nix
new file mode 100644
index 000000000000..881ad671a627
--- /dev/null
+++ b/nixos/modules/config/iproute2.nix
@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.networking.iproute2;
+  confDir = "/run/iproute2";
+in
+{
+  options.networking.iproute2.enable = mkEnableOption "copy IP route configuration files";
+
+  config = mkMerge [
+    ({ nixpkgs.config.iproute2.confDir = confDir; })
+
+    (mkIf cfg.enable {
+      system.activationScripts.iproute2 = ''
+        cp -R ${pkgs.iproute}/etc/iproute2 ${confDir}
+        chmod -R 664 ${confDir}
+        chmod +x ${confDir}
+      '';
+    })
+  ];
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6c4326046ef8..5d390f606670 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -9,6 +9,7 @@
   ./config/fonts/ghostscript.nix
   ./config/gnu.nix
   ./config/i18n.nix
+  ./config/iproute2.nix
   ./config/krb5/default.nix
   ./config/ldap.nix
   ./config/networking.nix
diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 7d412d7e15d0..8ccb0c203803 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, lib, flex, bash, bison, db, iptables, pkgconfig }:
+{ fetchurl, stdenv, config, lib, flex, bash, bison, db, iptables, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
@@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
     "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers
   ];
 
+  # enable iproute2 module if you want this folder to be created
   buildFlags = [
-    "CONFDIR=/etc/iproute2"
+    "CONFDIR=${config.iproute2.confDir or "/run/iproute2"}"
   ];
 
   installFlags = [

From b75a9599b4e858244caa0979f8fa224b5ca36c54 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Tue, 15 May 2018 21:55:10 +0900
Subject: [PATCH 1857/3370] release notes: mention iproute2 module

---
 nixos/doc/manual/release-notes/rl-1809.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 01b5e9d77460..34b5435f9d4e 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -53,7 +53,10 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
 
   <itemizedlist>
    <listitem>
-    <para></para>
+     <para>When enabled the <literal>iproute2</literal> will copy the files
+       expected by ip route (e.g., <filename>rt_tables</filename>) in
+       <filename>/run/iproute2</filename>. This allows to write aliases for
+       routing tables for instance.</para>
    </listitem>
   </itemizedlist>
  </section>

From ac07f5acf601e4dd44e7f1f6b3f8a03a244d939b Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 15 May 2018 14:56:43 +0200
Subject: [PATCH 1858/3370] staruml: 2.6.0 -> 2.8.1

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

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index e1d6604970e5..ef3fd53c4ecb 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -8,16 +8,16 @@ let
     [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ];
 in
 stdenv.mkDerivation rec {
-  version = "2.6.0";
+  version = "2.8.1";
   name = "staruml-${version}";
 
   src =
     if stdenv.system == "i686-linux" then fetchurl {
       url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";
-      sha256 = "684d7ce7827a98af5bf17bf68d18f934fd970f13a2112a121b1f1f76d6387849";
+      sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n";
     } else fetchurl {
       url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb";
-      sha256 = "36e0bdc1bb57b7d808a007a3fafb1b38662d5b0793424d5ad4f51a3a6a9a636d";
+      sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0";
     };
 
   buildInputs = [ dpkg ];

From 2a21dbe0597ef3f8b5340cc028327378411f0814 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 15 May 2018 14:57:18 +0200
Subject: [PATCH 1859/3370] staruml: fix internal node binary

The internal node binary is at least used for exporting in various
picture formats and also PDF printing.
---
 pkgs/tools/misc/staruml/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index ef3fd53c4ecb..2a06400b411f 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, makeWrapper
 , dpkg, patchelf
-, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd }:
+, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
+, libXdamage }:
 
 let
   inherit (stdenv) lib;
   LD_LIBRARY_PATH = lib.makeLibraryPath
-    [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ];
+    [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage ];
 in
 stdenv.mkDerivation rec {
   version = "2.8.1";
@@ -34,17 +35,17 @@ stdenv.mkDerivation rec {
     mkdir $out
     mv opt/staruml $out/bin
 
-    ${patchelf}/bin/patchelf \
-      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      $out/bin/StarUML
-
     mkdir -p $out/lib
-
     ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/
     ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0
 
-    wrapProgram $out/bin/StarUML \
-      --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
+    for binary in StarUML Brackets-node; do
+      ${patchelf}/bin/patchelf \
+        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        $out/bin/$binary
+      wrapProgram $out/bin/$binary \
+        --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
+    done
   '';
 
   meta = with stdenv.lib; {

From 699fa7e953caf49d8941828ce2c8293a87ce3240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?=
 <arcadio@users.noreply.github.com>
Date: Tue, 15 May 2018 14:09:06 +0100
Subject: [PATCH 1860/3370] star: 2.5.3a -> 2.6.0c (#40518)

---
 pkgs/applications/science/biology/star/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/star/default.nix b/pkgs/applications/science/biology/star/default.nix
index 1642739140d6..f52df902db6a 100644
--- a/pkgs/applications/science/biology/star/default.nix
+++ b/pkgs/applications/science/biology/star/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "star-${version}";
-  version = "2.5.3a";
+  version = "2.6.0c";
 
   src = fetchFromGitHub {
     repo = "STAR";
     owner = "alexdobin";
     rev = version;
-    sha256 = "1fd9xl7i1zxgsxn2qf6gz8s42g2djm29qmp6qb35d8nnxh8ns54x";
+    sha256 = "04cj6jw8d9q6lk9c78wa4fky6jdlicf1d13plq7182h8vqiz8p59";
   };
 
   sourceRoot = "source/source";

From 56149c246df1b7e846e2ef940c8b236c48de6e77 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Tue, 15 May 2018 17:33:46 +0300
Subject: [PATCH 1861/3370] handbrake: rm dependency on cmake

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

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index 9f1dfb2d6b07..e18901ad88d7 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -3,11 +3,9 @@
 # Derivation patches HandBrake to use our closure.
 #
 
-# TODO: Release 1.2.0 would switch LibAV to FFmpeg.
-
 { stdenv, lib, fetchurl,
   python2, pkgconfig, yasm, harfbuzz, zlib,
-  autoconf, automake, cmake, libtool, m4, jansson,
+  autoconf, automake, libtool, m4, jansson,
   libass, libiconv, libsamplerate, fribidi, libxml2, bzip2,
   libogg, libopus, libtheora, libvorbis, libdvdcss, a52dec,
   lame, libdvdread, libdvdnav, libbluray,
@@ -21,6 +19,7 @@
 }:
 
 stdenv.mkDerivation rec {
+  # TODO: Release 1.2.0 would switch LibAV to FFmpeg.
   version = "1.1.0";
   name = "handbrake-${version}";
 
@@ -40,7 +39,7 @@ stdenv.mkDerivation rec {
   });
 
   nativeBuildInputs = [
-    cmake python2 pkgconfig yasm autoconf automake libtool m4
+    python2 pkgconfig yasm autoconf automake libtool m4
   ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ];
 
   buildInputs = [
@@ -55,8 +54,6 @@ stdenv.mkDerivation rec {
   ] ++ (if useFfmpeg then [ ffmpeg ] else [ patched_libav_12 ])
   ++ lib.optional useFdk fdk_aac;
 
-  dontUseCmakeConfigure = true;
-
   enableParallelBuilding = true;
 
   preConfigure = ''

From 1eea58eb8ff553588f9c1adee3fa98d54ab865b0 Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Tue, 15 May 2018 17:43:25 +0300
Subject: [PATCH 1862/3370] handbrake: platforms: linux -> unix

---
 pkgs/applications/video/handbrake/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix
index e18901ad88d7..0d0ac0a2e947 100644
--- a/pkgs/applications/video/handbrake/default.nix
+++ b/pkgs/applications/video/handbrake/default.nix
@@ -100,6 +100,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl2;
     maintainers = with maintainers; [ Anton-Latukha wmertens ];
-    platforms = platforms.linux;
+    platforms = with platforms; unix;
   };
 }

From 9f79ac6f3bbbdee1ea006c292a867184f3985c2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 15 May 2018 16:58:37 +0200
Subject: [PATCH 1863/3370] androidndk: Drop 32bit support

---
 pkgs/development/mobile/androidenv/androidndk.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 2fe4005532d4..a9908d67f1d2 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -6,16 +6,10 @@
 stdenv.mkDerivation rec {
   name = "android-ndk-r10e";
 
-  src = if stdenv.system == "i686-linux"
-    then fetchurl {
-      url = "http://dl.google.com/android/ndk/${name}-linux-x86.bin";
-      sha256 = "1xbxra5v3bm6cmxyx8yyya5r93jh5m064aibgwd396xdm8jpvc4j";
-    }
-    else if stdenv.system == "x86_64-linux" then fetchurl {
+  src = if stdenv.system == "x86_64-linux" then fetchurl {
       url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin";
       sha256 = "0nhxixd0mq4ib176ya0hclnlbmhm8f2lab6i611kiwbzyqinfb8h";
-    }
-    else throw "platform ${stdenv.system} not supported!";
+    } else throw "platform ${stdenv.system} not supported!";
 
   phases = "buildPhase";
 

From 13f44694dccd078d8071660a8b81ab4cdff5f1ea Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:13:58 +0000
Subject: [PATCH 1864/3370] uim: 1.8.6 -> 1.8.6-20180501-git, switch to
 fetchFromGitHub

Old version fails to build.
---
 pkgs/tools/inputmethods/uim/data-hook.patch | 41 ++++++------
 pkgs/tools/inputmethods/uim/default.nix     | 74 ++++++++++++++++-----
 2 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/pkgs/tools/inputmethods/uim/data-hook.patch b/pkgs/tools/inputmethods/uim/data-hook.patch
index 07fdf8733169..be80962527ba 100644
--- a/pkgs/tools/inputmethods/uim/data-hook.patch
+++ b/pkgs/tools/inputmethods/uim/data-hook.patch
@@ -1,6 +1,6 @@
 --- a/gtk2/immodule/Makefile.in	2015-11-24 16:21:08.967087208 +0900
 +++ b/gtk2/immodule/Makefile.in	2015-11-24 16:22:53.316095150 +0900
-@@ -806,7 +806,6 @@
+@@ -928,7 +928,6 @@
  
  install-data-am: install-moduleLTLIBRARIES
  	@$(NORMAL_INSTALL)
@@ -8,19 +8,18 @@
  install-dvi: install-dvi-am
  
  install-dvi-am:
-@@ -861,7 +860,7 @@
- 	ctags distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-hook install-dvi install-dvi-am \
-+	install-data-am install-dvi install-dvi-am \
- 	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-man \
- 	install-moduleLTLIBRARIES install-pdf install-pdf-am \
-
+@@ -993,7 +992,7 @@
+ 	distclean-compile distclean-generic distclean-libtool \
+ 	distclean-tags distdir dvi dvi-am html html-am info info-am \
+ 	install install-am install-data install-data-am \
+-	install-data-hook install-dvi install-dvi-am install-exec \
++	install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+ 	install-info-am install-man install-moduleLTLIBRARIES \
+ 	install-pdf install-pdf-am install-ps install-ps-am \
 --- a/gtk3/immodule/Makefile.in	2015-11-24 16:21:08.971087209 +0900
 +++ b/gtk3/immodule/Makefile.in	2015-11-24 16:23:28.251097832 +0900
-@@ -824,7 +824,6 @@
+@@ -896,7 +896,6 @@
  
  install-data-am: install-moduleLTLIBRARIES
  	@$(NORMAL_INSTALL)
@@ -28,12 +27,12 @@
  install-dvi: install-dvi-am
  
  install-dvi-am:
-@@ -879,7 +878,7 @@
- 	ctags distclean distclean-compile distclean-generic \
- 	distclean-libtool distclean-tags distdir dvi dvi-am html \
- 	html-am info info-am install install-am install-data \
--	install-data-am install-data-hook install-dvi install-dvi-am \
-+	install-data-am install-dvi install-dvi-am \
- 	install-exec install-exec-am install-html install-html-am \
- 	install-info install-info-am install-man \
- 	install-moduleLTLIBRARIES install-pdf install-pdf-am 
+@@ -959,7 +958,7 @@
+ 	cscopelist-am ctags ctags-am distclean distclean-compile \
+ 	distclean-generic distclean-libtool distclean-tags distdir dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-data install-data-am install-data-hook install-dvi \
++	install-data install-data-am install-dvi \
+ 	install-dvi-am install-exec install-exec-am install-html \
+ 	install-html-am install-info install-info-am install-man \
+ 	install-moduleLTLIBRARIES install-pdf install-pdf-am \
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 96b887141785..1bdbef2fde6c 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, intltool, pkgconfig, cmake
+{ stdenv, fetchFromGitHub
+, autoconf, automake, intltool, libtool, pkgconfig, cmake
+, ruby, librsvg
 , ncurses, m17n_lib, m17n_db, expat
 , withAnthy ? true, anthy ? null
 , withGtk ? true
@@ -6,6 +8,7 @@
 , withGtk3 ? withGtk, gtk3 ? null
 , withQt ? true
 , withQt4 ? withQt, qt4 ? null
+, withQt5 ? false, qt5 ? null
 , withLibnotify ? true, libnotify ? null
 , withSqlite ? true, sqlite ? null
 , withNetworking ? true, curl ? null, openssl ? null
@@ -17,10 +20,17 @@
 
 with stdenv.lib;
 
-assert withAnthy -> anthy != null;
 assert withGtk2 -> gtk2 != null;
 assert withGtk3 -> gtk3 != null;
-assert withQt4 -> qt4 != null;
+
+# TODO(@oxij): ./configure can't find both qmakes at the same time
+# this can be fixed by adding an alias qmake -> qmaka${version} in qmake derivation
+assert withQt4 -> !withQt5 && qt4 != null;
+assert withQt5 -> !withQt4 && qt5 != null;
+
+assert !withQt5; # fails to build with "Makefile.qmake: No such file or directory"
+
+assert withAnthy -> anthy != null;
 assert withLibnotify -> libnotify != null;
 assert withSqlite -> sqlite != null;
 assert withNetworking -> curl != null && openssl != null;
@@ -28,22 +38,32 @@ assert withFFI -> libffi != null;
 assert withMisc -> libeb != null;
 
 stdenv.mkDerivation rec {
-  version = "1.8.6";
+  version = "1.8.6-20180501-git";
   name = "uim-${version}";
 
+  src = fetchFromGitHub {
+    owner = "uim";
+    repo = "uim";
+    rev = "c79432cb5aba3a67fb7e7557f4817c749865cc8a";
+    fetchSubmodules = true;
+    sha256 = "12rznfwq1mh750i18bl1743c51akyyvy6la5rgrxmrnp0mha9ba5";
+  };
+
+  nativeBuildInputs = [
+    autoconf automake intltool libtool pkgconfig cmake
+
+    ruby # used by sigscheme build to generate function tables
+    librsvg # used by uim build to generate png pixmaps from svg
+  ];
+
   buildInputs = [
-    intltool
-    pkgconfig
-    ncurses
-    cmake
-    m17n_lib
-    m17n_db
-    expat
+    ncurses m17n_lib m17n_db expat
   ]
   ++ optional withAnthy anthy
   ++ optional withGtk2 gtk2
   ++ optional withGtk3 gtk3
   ++ optional withQt4 qt4
+  ++ optionals withQt5 [ qt5.qtbase.bin qt5.qtbase.dev ]
   ++ optional withLibnotify libnotify
   ++ optional withSqlite sqlite
   ++ optionals withNetworking [
@@ -52,9 +72,27 @@ stdenv.mkDerivation rec {
   ++ optional withFFI libffi
   ++ optional withMisc libeb;
 
+  prePatch = ''
+    patchShebangs *.sh */*.sh */*/*.sh
+
+    # configure sigscheme in maintainer mode or else some function tables won't get autogenerated
+    substituteInPlace configure.ac \
+      --replace "--with-master-pkg=uim --enable-conf=uim" \
+                "--enable-maintainer-mode --with-master-pkg=uim --enable-conf=uim"
+
+    # generate ./configure files
+    (cd sigscheme/libgcroots; ./autogen.sh)
+    (cd sigscheme; ./autogen.sh)
+    ./autogen.sh
+  '';
+
   patches = [ ./data-hook.patch ];
 
   configureFlags = [
+    # configure in maintainer mode or else some pixmaps won't get autogenerated
+    # this should imply the above `--enable-maintainer-mode`, but it does not
+    "--enable-maintainer-mode"
+
     "--enable-pref"
     "--with-skk"
     "--with-x"
@@ -68,6 +106,10 @@ stdenv.mkDerivation rec {
     "--with-qt4"
     "--with-qt4-immodule"
   ]
+  ++ optionals withQt5 [
+    "--with-qt5"
+    "--with-qt5-immodule"
+  ]
   ++ optional withLibnotify "--enable-notify=libnotify"
   ++ optional withSqlite "--with-sqlite3"
   ++ optionals withNetworking [
@@ -87,16 +129,12 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/uim/uim-${version}.tar.bz2";
-    sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777";
-  };
-
   meta = with stdenv.lib; {
-    homepage    = "https://github.com/uim/uim";
+    homepage    = src.meta.homepage;
     description = "A multilingual input method framework";
     license     = licenses.bsd3;
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
+    broken      = stdenv.hostPlatform.isAarch64; # fails to build libgcroots (not supported on aarch64)
     maintainers = with maintainers; [ ericsagnes oxij ];
   };
 }

From 261d993519842a655a5532093ea840cea3ce51b7 Mon Sep 17 00:00:00 2001
From: Yorick <yorick.vanpelt@serokell.io>
Date: Tue, 15 May 2018 17:34:31 +0200
Subject: [PATCH 1865/3370] module-list: add youtrack module to list

---
 nixos/modules/module-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index e6a041b90333..04881d6db369 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -650,6 +650,7 @@
   ./services/web-apps/tt-rss.nix
   ./services/web-apps/selfoss.nix
   ./services/web-apps/quassel-webserver.nix
+  ./services/web-apps/youtrack.nix
   ./services/web-servers/apache-httpd/default.nix
   ./services/web-servers/caddy.nix
   ./services/web-servers/fcgiwrap.nix

From 202f19b225b08919f331444c5f8f37704c0d4d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?=
 <theo.zimmermann@univ-paris-diderot.fr>
Date: Tue, 15 May 2018 15:31:28 +0200
Subject: [PATCH 1866/3370] ocamlPackages.conduit-lwt-unix: add SSL support

This makes it possible to run the example given at
https://github.com/mirage/ocaml-cohttp#client-tutorial
---
 pkgs/development/ocaml-modules/conduit/lwt-unix.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
index ce7a33a11eed..5f33bbc42c10 100644
--- a/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
+++ b/pkgs/development/ocaml-modules/conduit/lwt-unix.nix
@@ -1,5 +1,5 @@
 { stdenv, ocaml, findlib, jbuilder, conduit-lwt
-, logs, ppx_sexp_conv
+, logs, ppx_sexp_conv, lwt_ssl
 }:
 
 if !stdenv.lib.versionAtLeast conduit-lwt.version "1.0"
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
 	buildInputs = [ ocaml findlib jbuilder ppx_sexp_conv ];
 
-	propagatedBuildInputs = [ conduit-lwt logs ];
+	propagatedBuildInputs = [ conduit-lwt logs lwt_ssl ];
 
 	buildPhase = "jbuilder build -p conduit-lwt-unix";
 }

From 1d9d1fa780b28a61e9644c9ab07f636a7e720501 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 10:27:53 -0500
Subject: [PATCH 1867/3370] telnet: use inetutils

Inetutils provides a cross-platform version of telnet. Normally I
would try to contact the old maintainer, but none is listed.
---
 pkgs/tools/networking/telnet/default.nix | 22 ----------------------
 pkgs/top-level/aliases.nix               |  1 +
 pkgs/top-level/all-packages.nix          |  2 --
 3 files changed, 1 insertion(+), 24 deletions(-)
 delete mode 100644 pkgs/tools/networking/telnet/default.nix

diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix
deleted file mode 100644
index c38f3c46fa46..000000000000
--- a/pkgs/tools/networking/telnet/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, ncurses}:
-
-stdenv.mkDerivation {
-  name = "telnet-1.2";
-
-  src = fetchurl {
-    #url = ftp://ftp.suse.com/pub/people/kukuk/ipv6/telnet-bsd-1.2.tar.bz2; # broken
-    url = mirror://gentoo/distfiles/telnet-bsd-1.2.tar.bz2;
-    sha256 = "0cs7ks22dhcn5qfjv2vl6ikhw93x68gg33zdn5f5cxgg81kx5afn";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  buildInputs = [ncurses];
-
-  meta = {
-    description = "A client and daemon for the Telnet protocol";
-    homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/;
-    license = "BSD";
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8b0812f8305d..34906533a0aa 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -200,6 +200,7 @@ mapAliases (rec {
   sshfsFuse = sshfs-fuse; # added 2016-09
   surf-webkit2 = surf; # added 2017-04-02
   tahoelafs = tahoe-lafs; # added 2018-03-26
+  telnet = inetutils; # added 2018-05-15
   system_config_printer = system-config-printer;  # added 2016-01-03
   telepathy_farstream = telepathy-farstream; # added 2018-02-25
   telepathy_gabble = telepathy-gabble; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46683b394c46..4a85484ba2a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5156,8 +5156,6 @@ with pkgs;
 
   teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { };
 
-  telnet = callPackage ../tools/networking/telnet { };
-
   telegraf = callPackage ../servers/monitoring/telegraf { };
 
   teleport = callPackage ../servers/teleport {};

From f19845c763b9d35bc42080f1b4aba78bded6f4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 15 May 2018 13:14:23 -0300
Subject: [PATCH 1868/3370] vivaldi: 1.14.1077.45-1 -> 1.15.1147.42-1 (#40536)

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 6bd9614e08de..8eae85099fb7 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -13,11 +13,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi";
-  version = "1.14.1077.45-1";
+  version = "1.15.1147.42-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "0b4iviar927jx6xqyrzgzb3p4p617zm4an1np8jnldadq2a0p56d";
+    sha256 = "15cajvn2sv05qdp3y538n2xvyy3il49q8zi5928z1mfirjz3dlwh";
   };
 
   unpackPhase = ''

From d0210b0fdc5701eeaf5d2b546c90e69d3addafeb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 15 May 2018 09:15:30 -0700
Subject: [PATCH 1869/3370] mate.caja: 1.21.0 -> 1.21.1 (#40497)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/caja/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/caja -h’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/caja --help’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/caja-connect-server -h’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/caja-connect-server --help’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/.caja-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/.caja-wrapped --help’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/.caja-connect-server-wrapped -h’ got 0 exit code
- ran ‘/nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1/bin/.caja-connect-server-wrapped --help’ got 0 exit code
- found 1.21.1 with grep in /nix/store/vpa6y0jj5wa85md64941j0mmd5h8w269-caja-1.21.1
- directory tree listing: https://gist.github.com/46fb531ddeedf504b1610ffcaf01f09f
- du listing: https://gist.github.com/5396435fca3703ee457ac3c66b5c0121
---
 pkgs/desktops/mate/caja/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix
index 9643c9a34164..a04dbb27a88b 100644
--- a/pkgs/desktops/mate/caja/default.nix
+++ b/pkgs/desktops/mate/caja/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "caja-${version}";
-  version = "1.21.0";
+  version = "1.21.1";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0v8zx5rzqh1zkwizkpdckmwm6004cv9sbjghzgz3049xzcqm371g";
+    sha256 = "013lmngnm0i2746qrkkyhg62kyh4cjdd0i634cz5fm7ah65ylxg4";
   };
 
   nativeBuildInputs = [

From 44361ea4091ecfbde4b2262fe6c65d1932813808 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 00:23:43 +0800
Subject: [PATCH 1870/3370] check-{ups,nwc}-health: update to release versions
 (#40541)

---
 .../monitoring/plugins/labs_consol_de.nix     | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index 9f33835c8851..350728d509fb 100644
--- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -1,25 +1,24 @@
-{ stdenv, fetchFromGitHub, buildPerlPackage, autoreconfHook, makeWrapper
+{ stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper
 , perl, NetSNMP, coreutils, gnused, gnugrep }:
 
 let
-  owner = "lausser";
-
   glplugin = fetchFromGitHub {
+    owner = "lausser";
     repo   = "GLPlugin";
-    rev    = "b92a261ca4bf84e5b20d3025cc9a31ade03c474b";
-    sha256 = "0kflnmpjmklq8fy2vf2h8qyvaiznymdi09z2h5qscrfi51xc9gmh";
-    inherit owner;
+    rev    = "e8e1a2907a54435c932b3e6c584ba1d679754849";
+    sha256 = "0wb55a9pmgbilfffx0wkiikg9830qd66j635ypczqp4basslpq5b";
   };
 
-  generic = { pname, version, rev, sha256, description, ... } @ attrs:
+  generic = { pname, version, sha256, description, ... } @ attrs:
   let
     attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"];
+    name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}"}-${version}";
   in perl.stdenv.mkDerivation rec {
-    name = stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}-${version}";
+    name = "${pname}-${version}";
 
-    src = fetchFromGitHub {
-      repo   = pname;
-      inherit owner rev sha256;
+    src = fetchurl {
+      url = "https://labs.consol.de/assets/downloads/nagios/${name'}.tar.gz";
+      inherit sha256;
     };
 
     buildInputs = [ perl NetSNMP ];
@@ -27,7 +26,8 @@ let
     nativeBuildInputs = [ autoreconfHook makeWrapper ];
 
     prePatch = with stdenv.lib; ''
-      ln -s ${glplugin}/* GLPlugin
+      rm -rf GLPlugin
+      ln -s ${glplugin} GLPlugin
       substituteInPlace plugins-scripts/Makefile.am \
         --replace /bin/cat  ${getBin coreutils}/bin/cat \
         --replace /bin/echo ${getBin coreutils}/bin/echo \
@@ -56,17 +56,15 @@ let
 in {
   check-nwc-health = generic {
     pname       = "check_nwc_health";
-    version     = "20170804";
-    rev         = "e959b412b5cf027c82a446668e026214fdcf8df3";
-    sha256      = "11l74xw62g15rqrbf9ff2bfd5iw159gwhhgbkxwdqi8sp9j6navk";
+    version     = "7.0.1.3";
+    sha256      = "0rgd6zgd7kplx3z72n8zbzwkh8vnd83361sk9ibh6ng78sds1sl5";
     description = "Check plugin for network equipment.";
   };
 
   check-ups-health = generic {
     pname       = "check_ups_health";
-    version     = "20170804";
-    rev         = "32a8a359ea46ec0d6f3b7aea19ddedaad63b04b9";
-    sha256      = "05na48dxfxrg0i9185j1ck2795p0rw1zwcs8ra0f14cm0qw0lp4l";
+    version     = "2.8.2.2";
+    sha256      = "1gc2wjsymay2vk5ywc1jj9cvrbhs0fs851x8l4nc75df2g75v521";
     description = "Check plugin for UPSs.";
   };
 }

From fa0b60f59a459f2b79692ac41b056e5228140123 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Tue, 15 May 2018 18:19:19 +0200
Subject: [PATCH 1871/3370] nixos/tests/installer: Add lndir to extraDeps

In commit 17dd7bcd89d568596f52356624be82201ea84779 the systemd unit
generator now uses lndir instead of "ln -s", so we need to have lndir
available in the Nix store for the installer tests to be able to build
the units and thus the whole system.

This should fix the installer tests, although I have only tested it with
the "simple" subtest.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @jtojnar, @xeji, @edolstra
---
 nixos/tests/installer.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index acf248d0a5a6..7da02d9c204a 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -241,6 +241,7 @@ let
                 nixos-artwork.wallpapers.gnome-dark
                 perlPackages.XMLLibXML
                 perlPackages.ListCompare
+                xorg.lndir
 
                 # add curl so that rather than seeing the test attempt to download
                 # curl's tarball, we see what it's trying to download

From 9f20a5985d7fef4169afa427e0049627317c076a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 14 May 2018 23:38:40 +0200
Subject: [PATCH 1872/3370] eclipse-platform: 4.7.2 -> 4.7.3a

---
 pkgs/applications/editors/eclipse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 1688e606222d..d7bd917c5f03 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -114,16 +114,16 @@ rec {
   };
 
   eclipse-platform-47 = buildEclipse {
-    name = "eclipse-platform-4.7.2";
+    name = "eclipse-platform-4.7.3a";
     description = "Eclipse Platform Oxygen";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "1zl406brvhh25dkd2pi1kvz5386gzkybpwik03aadpzmjrbm9730";
+        url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk-x86_64.tar.gz;
+          sha512 = "caf86cd6efaf66258c75434f1adf552587a7395d57dba4cfd20f86196308cf942866d931f4b352f9d39a6fbf14444fcd2167e6bfd146a28c96c229bb9988156a";
         };
       "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-platform-4.7.2-linux-gtk.tar.gz;
-          sha256 = "0v0i13ah8d8zmcv0ip1ia5ifnfnl76aibiqpv4q4lih5d1qsa79d";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-platform-4.7.3a-linux-gtk.tar.gz;
+          sha512 = "c633da467774e4ab40f8d51d07b8e7d8403f26f23365c3c3ceeaeec1039b8c23c7508cee1f786bf52db64c7b84e0f91cb31a2848a74ac8271f8504934407bd5c";
         };
     };
   };

From 726268db7770ea041e9133005d301ef7ae562200 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 14 May 2018 23:39:07 +0200
Subject: [PATCH 1873/3370] eclipse-sdk: 4.7.2 -> 4.7.3a

---
 pkgs/applications/editors/eclipse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index d7bd917c5f03..3a09b5c6be47 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -168,16 +168,16 @@ rec {
   };
 
   eclipse-sdk-47 = buildEclipse {
-    name = "eclipse-sdk-4.7.2";
+    name = "eclipse-sdk-4.7.3a";
     description = "Eclipse Oxygen Classic";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk-x86_64.tar.gz;
-          sha256 = "1j5d72rkl3lq3rpnvq1spsa0zlzbmbkgadfhbz868sqqbavrwbzv";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk-x86_64.tar.gz;
+          sha512 = "d77e42aca16d26526cef32e363d038258bb8a4616d9dbe6e76dd3656dc2217369436390a82555bde4566bbbdb631813bbaca08602f7bb885cb30e8a26a14873f";
         };
       "i686-linux" = fetchurl {
-          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/eclipse-SDK-4.7.2-linux-gtk.tar.gz;
-          sha256 = "117436ni79v1kiync8b3wkfkb8a5rv3sbqp6qnwbmanwkvnyvfvc";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/eclipse-SDK-4.7.3a-linux-gtk.tar.gz;
+          sha512 = "b0b936fd4142ae86ec5c30535cd5e4caf6fe313d814ae5b16f300635e4163a79b748b1eee11792a135114f2265678a74821ec80c2bfd69872769b6d0ccbcde3a";
         };
     };
   };

From d5dae23007b5a20759609f2a37b38ff9acec7afc Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 14 May 2018 23:39:19 +0200
Subject: [PATCH 1874/3370] eclipse-plugin-jdt: 4.7.2 -> 4.7.3a

---
 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 adb763c12507..f381064c92cf 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -470,12 +470,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.7.2";
+    version = "4.7.3a";
 
     src = fetchzip {
       stripRoot = false;
-      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.2-201711300510/org.eclipse.jdt-4.7.2.zip;
-      sha256 = "1yzqnjs88cdyyqv8f1g8fbfyccci29f3pzxxvaz7szxicwzn59mz";
+      url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.7.3a-201803300640/org.eclipse.jdt-4.7.3a.zip;
+      sha256 = "10dndhqz894xf79zz07dlmkn7k33mn42nbmycr78xz6d2jy8cscx";
     };
 
     meta = with stdenv.lib; {

From 26abaa02571b408a6bfe706f553bd67c24182563 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 8 May 2018 15:18:46 -0500
Subject: [PATCH 1875/3370] thin-provisioning-tools: 0.7.5 -> 0.7.6

---
 pkgs/tools/misc/thin-provisioning-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 8b9fa4f2f3fc..26fca485fec2 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "thin-provisioning-tools-${version}";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
     rev = "v${version}";
-    sha256 = "1ibg5wxrbqg4pr3f6aacqm42fxpwn5q00j8ldy9mw4an3ck41cwa";
+    sha256 = "175mk3krfdmn43cjw378s32hs62gq8fmq549rjmyc651sz6jnj0g";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 42e4f90afb6476faf5245e175a0d68bd383e4ac6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 8 May 2018 14:51:52 -0500
Subject: [PATCH 1876/3370] thin-provisioning-tools: fix build w/musl
 re:PAGE_SIZE

---
 pkgs/tools/misc/thin-provisioning-tools/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 26fca485fec2..64b059bbfea0 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ expat libaio boost ];
 
+  postPatch = stdenv.lib.optional stdenv.hostPlatform.isMusl ''
+    sed -i -e '/PAGE_SIZE/d' -e '1i#include <limits.h>' \
+      block-cache/io_engine.h unit-tests/io_engine_t.cc
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/jthornber/thin-provisioning-tools/;
     description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target";

From de810b8180fb0926b82c76694a7e5a97f3ca3469 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 8 May 2018 15:23:32 -0500
Subject: [PATCH 1877/3370] thin-provisioning-tools: enable parallel building

---
 pkgs/tools/misc/thin-provisioning-tools/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 64b059bbfea0..163e783e9e13 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
       block-cache/io_engine.h unit-tests/io_engine_t.cc
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/jthornber/thin-provisioning-tools/;
     description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target";

From 437cc2c6403b98e65d613a95c6f6ab2f0c85d7f5 Mon Sep 17 00:00:00 2001
From: Eric Bailey <yurrriq@users.noreply.github.com>
Date: Tue, 15 May 2018 12:19:27 -0500
Subject: [PATCH 1878/3370] kops: 1.8.1 -> 1.9.0 (#40513)

---
 pkgs/applications/networking/cluster/kops/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix
index ddb8951740cb..a1e17f60810d 100644
--- a/pkgs/applications/networking/cluster/kops/default.nix
+++ b/pkgs/applications/networking/cluster/kops/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata  }:
+
+{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }:
 
 buildGoPackage rec {
   name = "kops-${version}";
-  version = "1.8.1";
+  version = "1.9.0";
 
   goPackagePath = "k8s.io/kops";
 
@@ -10,7 +11,7 @@ buildGoPackage rec {
     rev = version;
     owner = "kubernetes";
     repo = "kops";
-    sha256 = "12nyr0iw1xwp60apli3nlq2vyn4jk3qjrb404m2syx2mqbnn47my";
+    sha256 = "03avkm7gk2dqyvd7245qsca1sbhwk41j9yhc208gcmjgjhkx2vn7";
   };
 
   buildInputs = [go-bindata];
@@ -24,8 +25,7 @@ buildGoPackage rec {
 
   preBuild = ''
     (cd go/src/k8s.io/kops
-     go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...
-     go-bindata -o federation/model/bindata.go -pkg model -prefix federation/model federation/model/...)
+     go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...)
   '';
 
   postInstall = ''

From edbce18903742c412fce54aa8df76ab96b8bf61a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 15 May 2018 20:55:40 +0300
Subject: [PATCH 1879/3370] tracker-miners: switch to meson, some tweaks
 (#39534)

---
 .../gnome-3/core/tracker-miners/default.nix   | 121 ++++++++++++++----
 1 file changed, 95 insertions(+), 26 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
index b612db9ce38b..44b0de37d69c 100644
--- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
+++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix
@@ -1,47 +1,101 @@
-{ stdenv, intltool, fetchurl, libxml2, upower
-, substituteAll, pkgconfig, gtk3, glib, gexiv2
-, bash, wrapGAppsHook, itstool, vala, sqlite, libxslt
-, gnome3, librsvg, gdk_pixbuf, libnotify
-, evolution-data-server, gst_all_1, poppler
-, icu, taglib, libjpeg, libtiff, giflib, libcue
-, libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2
-, libsoup, json-glib, libseccomp
-, libiptcdata }:
+{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, makeWrapper
+, meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server
+, exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif
+, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid
+, libvorbis, libxml2, poppler, taglib, upower }:
 
-let
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
   pname = "tracker-miners";
   version = "2.0.4";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "0mp9m2waii583sjgr61m1ni6py6dry11r0rzidgvw1g4cxhn89j6";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler";
+  # https://github.com/NixOS/nixpkgs/issues/39547
+  LIBRARY_PATH = stdenv.lib.makeLibraryPath [ giflib ];
 
-  enableParallelBuilding = true;
-
-  nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ];
-  # TODO: add libgrss, libenca, libosinfo
-  buildInputs = [
-    bzip2 evolution-data-server exempi flac giflib glib gnome3.totem-pl-parser
-    gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu
-    json-glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup
-    libtiff libuuid libvorbis libxml2 poppler taglib upower gexiv2
+  nativeBuildInputs = [
+    intltool
+    itstool
+    libxslt
+    makeWrapper
+    meson
+    ninja
+    pkgconfig
+    vala
+    wrapGAppsHook
   ];
 
-  LANG = "en_US.UTF-8"; # for running tests
+  # TODO: add libgrss, libenca, libosinfo
+  buildInputs = [
+    bzip2
+    dbus
+    evolution-data-server
+    exempi
+    flac
+    giflib
+    glib
+    gnome3.gexiv2
+    gnome3.totem-pl-parser
+    gnome3.tracker
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    icu
+    json-glib
+    libcue
+    libexif
+    libgsf
+    libiptcdata
+    libjpeg
+    libpng
+    libseccomp
+    libsoup
+    libtiff
+    libuuid
+    libvorbis
+    libxml2
+    poppler
+    taglib
+    upower
+  ];
 
-  doCheck = true;
+  mesonFlags = [
+    "-Dminer_rss=false" # needs libgrss
+  ];
 
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
       inherit (gnome3) tracker;
     })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795573
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371422;
+      sha256 = "1rzwzrc7q73k42s1j1iw52chy10w6y3xksfrzg2l42nn9wk7n281";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795574
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371423;
+      sha256 = "0b2ck8z4b2yrgwg4v9jsac5n8h3a91qkp90vv17wxcvr4v50fg48";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795575
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371424;
+      sha256 = "03i29fabxrpraydh7712vdrc571qmiq0l4axj24gbi6h77xn7mxc";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795576
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371427;
+      sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf";
+    })
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795577
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371425;
+      sha256 = "05m629469jr2lm2cjs54n7xwyim2d5rwwvdjxzcwh5qpfjds5phm";
+    })
   ];
 
   passthru = {
@@ -51,11 +105,26 @@ in stdenv.mkDerivation rec {
     };
   };
 
+  # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131
+  # https://github.com/NixOS/nixpkgs/pull/37693
+  preConfigure = ''
+    mesonFlagsArray+=("-Ddbus_services=$out/share/dbus-1/services")
+  '';
+
+  postInstall = ''
+    ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
+  '';
+  
+  # https://bugzilla.gnome.org/show_bug.cgi?id=796145
+  postFixup = ''
+    rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Projects/Tracker;
     description = "Desktop-neutral user information store, search tool and indexer";
     maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
 }

From 2cab326047cc484df7438f85102b0d41b05b8200 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Mon, 14 May 2018 01:04:27 -0700
Subject: [PATCH 1880/3370] metabase: 0.29.0 -> 0.29.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/metabase/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/40a08752e83dd27b03a5e553c6f89582
- du listing: https://gist.github.com/fe6508f6abc39c37b41465ae8e9efd81
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index 4eae86b00b0f..f329b1088499 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.29.0";
+  version = "0.29.2";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "1dfq06cm8k36pkqpng4cd8ax8cdxbcssww4vapq2w9ccflpnlam2";
+    sha256 = "02cba755mfim8q403gj02ggc0gg4ckcyalxkw09k0jqi5irdi4h1";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0f30db4222491bfde951b9702818913ed86d0186 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 15 May 2018 13:25:31 -0500
Subject: [PATCH 1881/3370] nano: 2.9.6 -> 2.9.7

http://git.savannah.gnu.org/cgit/nano.git/tree/ChangeLog?h=v2.9.7
---
 pkgs/applications/editors/nano/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index f5598b3365bb..c29cbe52872e 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -20,11 +20,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nano-${version}";
-  version = "2.9.6";
+  version = "2.9.7";
 
   src = fetchurl {
     url = "mirror://gnu/nano/${name}.tar.xz";
-    sha256 = "1inl8ljkc711969ncwy7irf0464psasikg1g42l0g4sfpdz50wx3";
+    sha256 = "1ga4sdk3ikx1ilggc6c77vyfpbmq3nrhg6svgglpf5sv60bv0jmn";
   };
 
   nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext;

From 1af7302dd40e5f43b37414f1dd91ed4b11cf76b1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 15 May 2018 20:30:27 +0200
Subject: [PATCH 1882/3370] signal-desktop: 1.10.1 -> 1.11.0

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 80f219560e36..ca13a8811763 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.10.1";
+    version = "1.11.0";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "1ndk2in9mbsm5i2k7pgpbd6smbgpswxmjvr12zmbmw893ay015h3";
+          sha256 = "0s3qlzm7iy9qxca2hlh1hq0dnjr7y5wxad1ssqgmyhxsif0nqm96";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";

From 87b0afb0069950ee6573a911906b1cca7b2da9a3 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 15 May 2018 20:30:19 +0200
Subject: [PATCH 1883/3370] atom: 1.26.1 -> 1.27.0

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index f646fab86294..606f5db89f6a 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.26.1";
+  version = "1.27.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0g83qj9siq1vr2v46rzjf3dy2gns9krh6xlh7w3bhrgfk0vqkm11";
+    sha256 = "1r37s6ndxyib644v7nlgha1pkcnz7kxpmlkhh41l5jp4dpc6iik6";
     name = "${name}.deb";
   };
 

From 36a4e543729903bf3ad8e1ed25ab507538bc8a92 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 15 May 2018 20:33:41 +0200
Subject: [PATCH 1884/3370] atom: add myself as maintainer

---
 pkgs/applications/editors/atom/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 606f5db89f6a..225ec6a9456f 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "A hackable text editor for the 21st Century";
     homepage = https://atom.io/;
     license = licenses.mit;
-    maintainers = [ maintainers.offline maintainers.nequissimus maintainers.ysndr ];
+    maintainers = with maintainers; [ offline nequissimus synthetica ysndr ];
     platforms = [ "x86_64-linux" ];
   };
 }

From 30a788b71e4bb56cf89709d0b64c87ffcd6fa2dd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 15 May 2018 20:36:09 +0200
Subject: [PATCH 1885/3370] maim: 5.5 -> 5.5.1

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

diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix
index cac86e29c472..cd0cff0f3899 100644
--- a/pkgs/tools/graphics/maim/default.nix
+++ b/pkgs/tools/graphics/maim/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "maim-${version}";
-  version = "5.5";
+  version = "5.5.1";
 
   src = fetchFromGitHub {
     owner = "naelstrof";
     repo = "maim";
     rev = "v${version}";
-    sha256 = "0dr44lwqsvhwf9pncxq6k42zj9hj07b96qsk1q8vh4l42zcpqzla";
+    sha256 = "106qg85q0aiw4w08vjg9j60brrbln11b8vdycjqkv8fq00pq308i";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 4056b41f95fe172036f8c003afe70b83ecee0f1c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 15 May 2018 14:01:41 -0500
Subject: [PATCH 1886/3370] thin-provisioning-tools: use patch, comment

---
 .../misc/thin-provisioning-tools/default.nix  | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 163e783e9e13..b4683167f334 100644
--- a/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }:
 
 stdenv.mkDerivation rec {
   name = "thin-provisioning-tools-${version}";
@@ -15,10 +15,19 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ expat libaio boost ];
 
-  postPatch = stdenv.lib.optional stdenv.hostPlatform.isMusl ''
-    sed -i -e '/PAGE_SIZE/d' -e '1i#include <limits.h>' \
-      block-cache/io_engine.h unit-tests/io_engine_t.cc
-  '';
+  patches = [
+    (fetchpatch {
+      # a) Fix build if limits.h provides definition for PAGE_SIZE, as musl does w/musl per XSI[1] although it's apparently optional [2].
+      #    This value is only provided when it's known to be a constant, to avoid the need to discover the value dynamically.
+      # b) If not using system-provided (kernel headers, or libc headers, or something) use the POSIX approach of querying the value
+      #    dynamically using sysconf(_SC_PAGE_SIZE) instead of hardcoded value that hopefully is correct.
+      # [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html
+      # [2] http://www.openwall.com/lists/musl/2015/09/11/8
+      url = "https://raw.githubusercontent.com/voidlinux/void-packages/a0ece13ad7ab2aae760e09e41e0459bd999a3695/srcpkgs/thin-provisioning-tools/patches/musl.patch";
+      sha256 = "1m8r3vhrnsy8drgs0svs3fgpi3mmxzdcqsv6bmvc0j52cvfqvhvy";
+      extraPrefix = ""; # empty means add 'a/' and 'b/'
+    })
+  ];
 
   enableParallelBuilding = true;
 

From 0ff650a39206141adca544183a2541179e85c412 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 15 May 2018 15:24:22 -0400
Subject: [PATCH 1887/3370] cmake: Fix build and setup hook

I screwed this up in 330ca731e88ec015181c43d92ae8f7c77cf0226a. I'm
sorry.
---
 pkgs/development/tools/build-managers/cmake/default.nix  | 9 +++++----
 .../development/tools/build-managers/cmake/setup-hook.sh | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index b40b284b759e..c8a66b1a5fe2 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -82,6 +82,10 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--docdir=share/doc/${name}"
+  ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
+    ++ optional (useQt4 || withQt5) "--qt-gui"
+    ++ [
+    "--"
     # We should set the proper `CMAKE_SYSTEM_NAME`.
     # http://www.cmake.org/Wiki/CMake_Cross_Compiling
     #
@@ -93,10 +97,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
     "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
     "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
-   ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup
-     ++ optional (useQt4 || withQt5) "--qt-gui"
-     ++ ["--"]
-     ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ];
+  ] ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ];
 
   dontUseCmakeConfigure = true;
   enableParallelBuilding = true;
diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 003f900c9541..00b33e6d3652 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -38,7 +38,7 @@ cmakeConfigurePhase() {
     cmakeFlags="-DCMAKE_CXX_COMPILER=$CXX $cmakeFlags"
     cmakeFlags="-DCMAKE_C_COMPILER=$CC $cmakeFlags"
     cmakeFlags="-DCMAKE_AR=$(command -v $AR) $cmakeFlags"
-    cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLAB) $cmakeFlags"
+    cmakeFlags="-DCMAKE_RANLIB=$(command -v $RANLIB) $cmakeFlags"
     cmakeFlags="-DCMAKE_STRIP=$(command -v $STRIP) $cmakeFlags"
 
     # This installs shared libraries with a fully-specified install

From 1d1407a6f4708455a1e85854e4e473796bf1f1f7 Mon Sep 17 00:00:00 2001
From: dbohdan <dbohdan@dbohdan.com>
Date: Tue, 15 May 2018 22:50:45 +0300
Subject: [PATCH 1888/3370] tcl2048: 0.3.1 -> 0.4.0

---
 pkgs/games/tcl2048/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix
index d1517a2ec619..48fa0a3b5181 100644
--- a/pkgs/games/tcl2048/default.nix
+++ b/pkgs/games/tcl2048/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, tcl, tcllib }:
 
 stdenv.mkDerivation {
-  name = "tcl2048-0.3.1";
+  name = "tcl2048-0.4.0";
 
   src = fetchurl {
-    url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.3.1/2048.tcl;
-    sha256 = "44e325328784c4e91cecc0a9cc00e32d733da713adf2fad1c081542f38af3361";
+    url = https://raw.githubusercontent.com/dbohdan/2048.tcl/v0.4.0/2048.tcl;
+    sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e";
   };
 
   phases = "installPhase";
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = https://github.com/dbohdan/2048-tcl;
+    homepage = https://github.com/dbohdan/2048.tcl;
     description = "The game of 2048 implemented in Tcl";
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.all;

From 3efea84fa1991d027ae27cee0f0c622a65908772 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 15 May 2018 20:44:00 +0200
Subject: [PATCH 1889/3370] tdesktopPackages.preview: 1.2.19 -> 1.2.20

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 0e2c232e6d21..5d476f54304a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.19";
-    sha256Hash = "0val6lfcg3ghcksflm3jclqly0x8plpn3an8v9bix0s5yll1ka4h";
+    version = "1.2.20";
+    sha256Hash = "00ncpb1qs88jrrmmx7f7l8wy37wbwnrb958x3xls14p1h1xg63l6";
   });
 }

From 272987524abfd20666d9b4979509999419d638ed Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Tue, 15 May 2018 23:58:50 +0400
Subject: [PATCH 1890/3370] chromium: 66.0.3359.170 -> 66.0.3359.181

---
 .../networking/browsers/chromium/upstream-info.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 147e8d33a0e3..bb080a50bebd 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -11,8 +11,8 @@
     version = "68.0.3423.2";
   };
   stable = {
-    sha256 = "1pki90vnc8amzdwagcsnkwnqnw4k442234x8wfc7cf0rkmjackc6";
-    sha256bin64 = "0a68w4p0dqxal7xh7nlfzsj7yl9xxp1bq3khfnpa3r7r38zbxnpw";
-    version = "66.0.3359.170";
+    sha256 = "06g9m7lxm9g63dcci25dqiglyjxjfy7v05vjhdda4rdk84vngrip";
+    sha256bin64 = "105ds6r6awzhf5sq3nf43b6zb84lb4qbhjnfk3fnxfqvskq3b6r2";
+    version = "66.0.3359.181";
   };
 }

From 302ed5422d8132a33e88f4dbf032006f33cf908d Mon Sep 17 00:00:00 2001
From: dbohdan <dbohdan@dbohdan.com>
Date: Tue, 15 May 2018 23:10:39 +0300
Subject: [PATCH 1891/3370] maintainers: Update my contact info

---
 maintainers/maintainer-list.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a2db508d4d29..8b546d58ac66 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -989,9 +989,9 @@
     name = "Davor Babic";
   };
   dbohdan = {
-    email = "danyil.bohdan@gmail.com";
+    email = "dbohdan@dbohdan.com";
     github = "dbohdan";
-    name = "Danyil Bohdan";
+    name = "D. Bohdan";
   };
   dbrock = {
     email = "daniel@brockman.se";

From e0d6edddd7f3df2cecbe24c527f8dc5286564235 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 15:26:59 -0500
Subject: [PATCH 1892/3370] pspp: provide default icons & settings

psppire needs to be wrapped so that it will work outside of GNOME
desktop. We provide hicolor-icon-theme & gsettings-desktop-schemas.

Note that at runtime, I still get this error:

- Cannot create a converter for `IBM864' to `UTF-8': Invalid argument

Possibly a locale issue.

Fixes #40558
---
 pkgs/applications/science/math/pspp/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix
index 957a4cf64211..1afbc2b72e58 100644
--- a/pkgs/applications/science/math/pspp/default.nix
+++ b/pkgs/applications/science/math/pspp/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk3, gsl
 , pkgconfig, gtksourceview, pango, gettext
+, makeWrapper, gsettings-desktop-schemas, hicolor-icon-theme
+, gnome3
 }:
 
 stdenv.mkDerivation rec {
@@ -12,12 +14,21 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libxml2 readline zlib perl cairo gtk3 gsl
-    gtksourceview pango gettext ];
+    gtksourceview pango gettext
+    makeWrapper gsettings-desktop-schemas hicolor-icon-theme ];
 
   doCheck = false;
 
   enableParallelBuilding = true;
 
+  preFixup = ''
+    wrapProgram "$out/bin/psppire" \
+     --prefix XDG_DATA_DIRS : "$out/share" \
+     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" \
+     --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+     --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules"
+  '';
+
   meta = {
     homepage = http://www.gnu.org/software/pspp/;
     description = "A free replacement for SPSS, a program for statistical analysis of sampled data";

From e9868c39e38c72509da58e5952a1fec18c5e1293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Teo=20Klestrup=20R=C3=B6ijezon?= <teo@nullable.se>
Date: Tue, 15 May 2018 22:53:42 +0200
Subject: [PATCH 1893/3370] nixopsUnstable: 1.6pre2276_9203440 ->
 1.6.1pre2622_f10999a

---
 pkgs/tools/package-management/nixops/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 8eaf20dc7724..88493d33dd1d 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -5,9 +5,9 @@
 # Then copy the URL to the tarball.
 
 callPackage ./generic.nix (rec {
-  version = "1.6pre2276_9203440";
+  version = "1.6.1pre2622_f10999a";
   src = fetchurl {
-    url = "https://hydra.nixos.org/build/64518294/download/2/nixops-${version}.tar.bz2";
-    sha256 = "1cl0869nl67fr5xk0jl9cvqbmma7d4vz5xbg56jpl7casrr3i51x";
+    url = "https://hydra.nixos.org/build/73716350/download/2/nixops-${version}.tar.bz2";
+    sha256 = "08886b6vxhjc3cp0ikxp920zap7wp6r92763fp785rvxrmb00rbd";
   };
 })

From 42462d7b6696d39f1ec1ae7169f94fb90e1f436f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 15 May 2018 20:48:20 +0000
Subject: [PATCH 1894/3370] coqPackages.stdpp: init at 1.1

---
 .../development/coq-modules/stdpp/default.nix | 28 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/coq-modules/stdpp/default.nix

diff --git a/pkgs/development/coq-modules/stdpp/default.nix b/pkgs/development/coq-modules/stdpp/default.nix
new file mode 100644
index 000000000000..91801850ebfb
--- /dev/null
+++ b/pkgs/development/coq-modules/stdpp/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchzip, coq }:
+
+stdenv.mkDerivation {
+  name = "coq${coq.coq-version}-stdpp-1.1";
+  src = fetchzip {
+    url = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp/-/archive/coq-stdpp-1.1.0/coq-stdpp-coq-stdpp-1.1.0.tar.gz";
+    sha256 = "0z8zl288x9w32w06sjax01jcpy12wd5i3ygps58dl2hfy7r3lwg0";
+  };
+
+  buildInputs = [ coq ];
+
+  enableParallelBuilding = true;
+
+  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+
+  meta = {
+    homepage = "https://gitlab.mpi-sws.org/robbertkrebbers/coq-stdpp";
+    description = "An extended “Standard Library” for Coq";
+    inherit (coq.meta) platforms;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+  };
+
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index e21445b423d0..519d1cb9ed46 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -36,6 +36,7 @@ let
       paco = callPackage ../development/coq-modules/paco {};
       QuickChick = callPackage ../development/coq-modules/QuickChick {};
       ssreflect = callPackage ../development/coq-modules/ssreflect { };
+      stdpp = callPackage ../development/coq-modules/stdpp { };
       tlc = callPackage ../development/coq-modules/tlc {};
     };
 

From 977c207f2295b0b17cb6fbf97c9c6c7656977e11 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Tue, 15 May 2018 23:23:30 +0200
Subject: [PATCH 1895/3370] pythonPackages.podcats: Init at 0.5.0

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

diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix
new file mode 100644
index 000000000000..a1b8312b134f
--- /dev/null
+++ b/pkgs/development/python-modules/podcats/default.nix
@@ -0,0 +1,28 @@
+{ lib, buildPythonPackage, fetchFromGitHub, flask, mutagen }:
+
+buildPythonPackage rec {
+  pname = "podcats";
+  version = "v0.5.0";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jakubroztocil";
+    repo = "podcats";
+    rev = version;
+    sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc";
+  };
+
+  patchPhase = ''
+    substituteInPlace podcats.py \
+      --replace 'debug=True' 'debug=True, use_reloader=False'
+  '';
+
+  propagatedBuildInputs = [ flask mutagen ];
+
+  meta = {
+    description = "Application that generates RSS feeds for podcast episodes from local audio files";
+    homepage = https://github.com/jakubroztocil/podcats;
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ the-kenny ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a80eb58e3901..52d03ad1e29c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3845,6 +3845,8 @@ in {
 
   podcastparser = callPackage ../development/python-modules/podcastparser { };
 
+  podcats = callPackage ../development/python-modules/podcats { };
+
   pomegranate = callPackage ../development/python-modules/pomegranate { };
 
   poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 {

From 0edbc54b4f0429275b24e54cf51f01b0bf8bea25 Mon Sep 17 00:00:00 2001
From: Eric Bailey <yurrriq@users.noreply.github.com>
Date: Tue, 15 May 2018 17:25:29 -0500
Subject: [PATCH 1896/3370] kubernetes-helm: 2.8.2 -> 2.9.0 (#40514)

---
 pkgs/applications/networking/cluster/helm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index a49ff486d961..ae9dc3bbc34a 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -5,10 +5,10 @@ let
          then "linux-amd64"
          else "darwin-amd64";
   checksum = if isLinux
-             then "1lr2s66kln6rp3sb156br9nfx51bdy654vdjr4vnncz4kp3mljv1"
-             else "04y4ii0w4s00z831q1wzxz6qkc8qfrhwzdrq3wwvrcl0413cza50";
+             then "0bnjpiivhsxhl45ab32vzf6crv4z8nbq5kcjkvlbcbswdbgp0pq6"
+             else "0smwhj4pmd4k7csz82akbkrkb0j2jxnmb33ifhkqw7n33jhl3aqp";
   pname = "helm";
-  version = "2.8.2";
+  version = "2.9.0";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";

From 90cfd65b3b6a57ba3ef315ca8d07e4a7057e3c53 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 15 May 2018 23:19:46 +0200
Subject: [PATCH 1897/3370] python-ipython: 5.6.0 -> 5.7.0

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

diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix
index 083c1f3b08dd..a91988bd97d0 100644
--- a/pkgs/development/python-modules/ipython/5.nix
+++ b/pkgs/development/python-modules/ipython/5.nix
@@ -27,11 +27,11 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "5.6.0";
+  version = "5.7.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00g696r9rk1c4p3sycnv7by55cp9mm7r6zkkdqbiw9l0mk8k58wb";
+    sha256 = "0g1jm06qriq48m58311cs7askp83ipq3yq96hv4kg431nxzkmd4d";
   };
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''

From 780592ca6ef752f3f4886a66ed6181095e358db5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 15 May 2018 23:20:31 +0200
Subject: [PATCH 1898/3370] gcc7: Enable arm erratum 843419 on aarch64

This fix is required for the raspherry pi 3 with glibc 2.27,
otherwise the kernel panics in initrd with:
```
<<< NixOS Stage 1 >>>

loading module dm_mod...
running udev...
kbd_mode: KDSKBMODE: Inappropriate ioctl for device
Gstarting device mapper and LVM...
[    1.969164] Kernel panic - not syncing: Attempted to kill init!
exitcode=0x0000000b
[    1.969164]
[    1.978476] CPU: 0 PID: 1 Comm: init Not tainted 4.16.8 #1-NixOS
[    1.984580] Hardware name: Raspberry Pi 3 Model B (DT)
[    1.989801] Call trace:
[    1.992301]  dump_backtrace+0x0/0x1c8
[    1.996025]  show_stack+0x24/0x30
[    1.999396]  dump_stack+0x9c/0xc0
[    2.002766]  panic+0x124/0x294
[    2.005872]  complete_and_exit+0x0/0x30
[    2.009771]  do_group_exit+0x40/0xa8
[    2.013406]  get_signal+0x280/0x5b0
[    2.016954]  do_signal+0x88/0x240
[    2.020325]  do_notify_resume+0xd8/0x130
[    2.024311]  work_pending+0x8/0x10
[    2.027774] SMP: stopping secondary CPUs
[    2.031763] Kernel Offset: disabled
[    2.035308] CPU features: 0x0802004
[    2.038850] Memory Limit: none
[    2.041963] ---[ end Kernel panic - not syncing: Attempted to kill
init! exitcode=0x0000000b
[    2.041963]
[    2.865264] random: crng init done
```
Suse has done the same to circumvent crashes with hostname resolving in
glibc 2.27 on aarch64.
---
 pkgs/development/compilers/gcc/7/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 54ac2c45d892..559512743220 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -381,6 +381,7 @@ stdenv.mkDerivation ({
       "--with-gnu-as" "--without-gnu-ld"
     ]
     ++ optional (targetPlatform == hostPlatform && targetPlatform.libc == "musl") "--disable-libsanitizer"
+    ++ optional (targetPlatform.isAarch64) "--enable-fix-cortex-a53-843419"
   ;
 
   targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;

From a0f7ee0e60c27b2759ff64c43836f9ec09aac914 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 01:25:59 +0800
Subject: [PATCH 1899/3370] kdenlive: Fix build by removing already upstreamed
 patch

---
 .../kde/kdenlive-cmake-concurrent-module.patch       | 12 ------------
 pkgs/applications/kde/kdenlive.nix                   |  3 ---
 2 files changed, 15 deletions(-)
 delete mode 100644 pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch

diff --git a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch b/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
deleted file mode 100644
index ea2af2b09509..000000000000
--- a/pkgs/applications/kde/kdenlive-cmake-concurrent-module.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kdenlive-17.04.1-upstream/CMakeLists.txt kdenlive-17.04.1/CMakeLists.txt
---- kdenlive-17.04.1-upstream/CMakeLists.txt	2017-06-10 00:06:44.773146595 -0400
-+++ kdenlive-17.04.1/CMakeLists.txt	2017-06-10 00:07:35.766596566 -0400
-@@ -79,7 +79,7 @@
- check_include_files(malloc.h HAVE_MALLOC_H)
- check_include_files(pthread.h HAVE_PTHREAD_H)
- 
--find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick )
-+find_package(Qt5 REQUIRED COMPONENTS Core Concurrent DBus Widgets Script Svg Quick )
- find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
- 
- find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index b5eca47d6c0e..65080ba7f066 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -34,9 +34,6 @@
 
 mkDerivation {
   name = "kdenlive";
-  patches = [
-    ./kdenlive-cmake-concurrent-module.patch
-  ];
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools

From b368a1103b8e088d4a73c5953a610142afd65724 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 12:15:29 +0800
Subject: [PATCH 1900/3370] sddm: add support for hidpi mode

---
 .../services/x11/display-managers/sddm.nix        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 2d4cb8aa20a5..df782e82ed15 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -65,6 +65,10 @@ let
     XauthPath=${pkgs.xorg.xauth}/bin/xauth
     DisplayCommand=${Xsetup}
     DisplayStopCommand=${Xstop}
+    EnableHidpi=${if cfg.enableHidpi then "true" else "false"}
+
+    [Wayland]
+    EnableHidpi=${if cfg.enableHidpi then "true" else "false"}
 
     ${optionalString cfg.autoLogin.enable ''
     [Autologin]
@@ -95,6 +99,17 @@ in
         '';
       };
 
+      enableHidpi = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to enable automatic HiDPI mode.
+          </para>
+          <para>
+          Versions up to 0.17 are broken so this only works from 0.18 onwards.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";

From 389691a42c0b73764d1e3bfe25771dac7147d8ff Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 15 May 2018 12:39:51 +0800
Subject: [PATCH 1901/3370] i7z: do not build the GUI by default

---
 pkgs/os-specific/linux/i7z/default.nix | 44 ++++++++++++++++++--------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix
index 6d0c5ae82bcc..48d28036aa4f 100644
--- a/pkgs/os-specific/linux/i7z/default.nix
+++ b/pkgs/os-specific/linux/i7z/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, qt4, ncurses }:
+{ stdenv, lib, fetchurl, ncurses
+, withGui ? false, qt4 ? null }:
 
 stdenv.mkDerivation rec {
   name = "i7z-0.27.2";
@@ -8,29 +9,46 @@ stdenv.mkDerivation rec {
     sha256 = "1wa7ix6m75wl3k2n88sz0x8cckvlzqklja2gvzqfw5rcfdjjvxx7";
   };
 
-  buildInputs = [ qt4 ncurses ];
+  buildInputs = [ ncurses ] ++ lib.optional withGui qt4;
+
+  enableParallelBuilding = true;
 
   buildPhase = ''
+    runHook preBuild
+
     make
-    cd GUI
-    qmake
-    make clean
-    make
-    cd ..
+    ${lib.optionalString withGui ''
+      cd GUI
+      qmake
+      make clean
+      make
+      cd ..
+    ''}
+
+    runHook postBuild
   '';
 
   installPhase = ''
-    mkdir -p $out/sbin
+    runHook preInstall
+
+    mkdir -p $out/{bin,sbin}
     make install prefix=$out
-    install -Dm755 GUI/i7z_GUI $out/sbin/i7z-gui
+    ${lib.optionalString withGui ''
+      install -Dm755 GUI/i7z_GUI $out/bin/i7z-gui
+    ''}
+    mv $out/sbin/* $out/bin/
+    rmdir $out/sbin
+
+    runHook postInstall
   '';
 
-  meta = {
+  meta = with lib; {
     description = "A better i7 (and now i3, i5) reporting tool for Linux";
     homepage = https://github.com/ajaiantilal/i7z;
     repositories.git = https://github.com/ajaiantilal/i7z.git;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ bluescreen303 ];
+    # broken on ARM
+    platforms = [ "x86_64-linux" ];
   };
 }

From 205a9f2576646e65930d6c825df33da484d590b0 Mon Sep 17 00:00:00 2001
From: Walter Franzini <walter.franzini@gmail.com>
Date: Wed, 16 May 2018 07:23:00 +0200
Subject: [PATCH 1902/3370] minor improvement to nix installation instructions
 (#40521)

* improve nix installation instructions

in the command

	$ bash <(curl https://nixos.org/nix/install)

<(..) is a bashism.  The documentation now show a command that does
not require to be executed by bash.
---
 nixos/doc/manual/installation/installing-from-other-distro.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing-from-other-distro.xml b/nixos/doc/manual/installation/installing-from-other-distro.xml
index 8b0c350b064d..c55aa90267fb 100644
--- a/nixos/doc/manual/installation/installing-from-other-distro.xml
+++ b/nixos/doc/manual/installation/installing-from-other-distro.xml
@@ -47,7 +47,7 @@
     Short version:
    </para>
 <screen>
-$ bash &lt;(curl https://nixos.org/nix/install)
+$ curl https://nixos.org/nix/install | sh
 $ . $HOME/.nix-profile/etc/profile.d/nix.sh # …or open a fresh shell</screen>
    <para>
     More details in the

From 5efda047c6381dacce570661ff0654eabf81ab49 Mon Sep 17 00:00:00 2001
From: John Mercier <moaxcp@gmail.com>
Date: Wed, 16 May 2018 01:54:45 -0400
Subject: [PATCH 1903/3370] jbake: add check (#40421)

---
 pkgs/development/tools/jbake/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix
index f4fb1b5a9e9c..152cddc101d6 100644
--- a/pkgs/development/tools/jbake/default.nix
+++ b/pkgs/development/tools/jbake/default.nix
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/jbake --set JAVA_HOME "${jre}"
   '';
 
+  checkPhase = ''
+    export JAVA_HOME=${jre}
+    bin/jbake | grep -q "${version}" || (echo "jbake did not return correct version"; exit 1)
+  '';
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "JBake is a Java based, open source, static site/blog generator for developers & designers";
     homepage = "https://jbake.org/";

From 5a6d202a43d0c81e11a5bad6b70b4eee27319710 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Wed, 16 May 2018 05:56:12 +0000
Subject: [PATCH 1904/3370] Merge pull request #40419 from
 oxij/pkgs/fix-linux-debug

linuxPackages.kernel: config: fix DEBUG_INFO setting
---
 pkgs/os-specific/linux/kernel/common-config.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index ec2b2f387950..cee2197f3c7a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -37,7 +37,12 @@ with stdenv.lib;
   DEBUG_STACKOVERFLOW n
   SCHEDSTATS n
   DETECT_HUNG_TASK y
-  DEBUG_INFO n # Not until we implement a separate debug output
+
+  ${if (features.debug or false) then ''
+    DEBUG_INFO y
+  '' else ''
+    DEBUG_INFO n
+  ''}
 
   ${optionalString (versionOlder version "4.4") ''
     CPU_NOTIFIER_ERROR_INJECT? n
@@ -709,9 +714,5 @@ with stdenv.lib;
     DEBUG_MEMORY_INIT? y
   ''}
 
-  ${optionalString (features.debug or false)  ''
-    DEBUG_INFO y
-  ''}
-
   ${extraConfig}
 ''

From d6c9efa223a9bb39b38378b5ee5e7b5490a70071 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 23:16:15 -0500
Subject: [PATCH 1905/3370] watchman: add fsevents support

macOS needs apple sdks for fsevents support

Fixes #14309
---
 pkgs/development/tools/watchman/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix             | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 15f265e31e3f..b349ecf61e13 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -1,6 +1,7 @@
 { stdenv, lib, config, fetchFromGitHub, autoconf, automake, pcre,
   libtool, pkgconfig, openssl,
-  confFile ? config.watchman.confFile or null
+  confFile ? config.watchman.confFile or null,
+  withApple ? stdenv.isDarwin, CoreServices, CoreFoundation
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,8 @@ stdenv.mkDerivation rec {
     sha256 = "0fdaj5pmicm6j17d5q7px800m5rmam1a400x3hv1iiifnmhgnkal";
   };
 
-  buildInputs = [ pcre openssl ];
+  buildInputs = [ pcre openssl ]
+               ++ lib.optionals withApple [ CoreFoundation CoreServices ];
   nativeBuildInputs = [ autoconf automake pkgconfig libtool ];
 
   configureFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa6cbc7a4d31..c573bc6fabc1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5481,7 +5481,10 @@ with pkgs;
 
   watchexec = callPackage ../tools/misc/watchexec { };
 
-  watchman = callPackage ../development/tools/watchman { };
+  watchman = callPackage ../development/tools/watchman {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+    CoreFoundation = darwin.cf-private;
+  };
 
   wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {};
 

From bb831b7946bb504fbeaf05fca8698598505d3e76 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 23:43:30 -0500
Subject: [PATCH 1906/3370] redshift: support macosx

---
 pkgs/applications/misc/redshift/default.nix | 30 ++++++++++++++++-----
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index b7ab092bbc04..dc31da671e95 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,6 +1,12 @@
 { stdenv, fetchFromGitHub, fetchurl, autoconf, automake, gettext, intltool
-, libtool, pkgconfig, wrapGAppsHook, wrapPython, geoclue2, gobjectIntrospection
-, gtk3, python, pygobject3, pyxdg, libdrm, libxcb, hicolor-icon-theme }:
+, libtool, pkgconfig, wrapGAppsHook, wrapPython, gobjectIntrospection
+, gtk3, python, pygobject3, hicolor-icon-theme, pyxdg
+
+, withCoreLocation ? stdenv.isDarwin, CoreLocation, Foundation, Cocoa
+, withQuartz ? stdenv.isDarwin, ApplicationServices
+, withRandr ? stdenv.isLinux, libxcb
+, withDrm ? stdenv.isLinux, libdrm
+, withGeoclue ? stdenv.isLinux, geoclue }:
 
 stdenv.mkDerivation rec {
   name = "redshift-${version}";
@@ -29,15 +35,25 @@ stdenv.mkDerivation rec {
     wrapPython
   ];
 
+  configureFlags = [
+    "--enable-randr=${if withRandr then "yes" else "no"}"
+    "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
+    "--enable-drm=${if withDrm then "yes" else "no"}"
+    "--enable-quartz=${if withQuartz then "yes" else "no"}"
+    "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+  ];
+
   buildInputs = [
-    geoclue2
     gobjectIntrospection
     gtk3
-    libdrm
-    libxcb
     python
     hicolor-icon-theme
-  ];
+  ] ++ stdenv.lib.optional  withRandr        libxcb
+    ++ stdenv.lib.optional  withGeoclue      geoclue
+    ++ stdenv.lib.optional  withDrm          libdrm
+    ++ stdenv.lib.optional  withQuartz       ApplicationServices
+    ++ stdenv.lib.optionals withCoreLocation [ CoreLocation Foundation Cocoa ]
+    ;
 
   pythonPath = [ pygobject3 pyxdg ];
 
@@ -59,7 +75,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3Plus;
     homepage = http://jonls.dk/redshift;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ yegortimoshenko ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c573bc6fabc1..4a704f792634 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19765,6 +19765,8 @@ with pkgs;
 
   redshift = callPackage ../applications/misc/redshift {
     inherit (python3Packages) python pygobject3 pyxdg wrapPython;
+    inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa;
+    geoclue = geoclue2;
   };
 
   redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { };

From 8419c347ca303839ff97ea2750276da0b9977e0b Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Sun, 13 May 2018 22:36:53 -0500
Subject: [PATCH 1907/3370] qtchan: init at v0.100

---
 .../networking/browsers/qtchan/default.nix    | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/qtchan/default.nix

diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
new file mode 100644
index 000000000000..e2213d358778
--- /dev/null
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "qtchan-${version}";
+  version = "0.100";
+
+  src = fetchFromGitHub {
+    owner  = "siavash119";
+    repo   = "qtchan";
+    rev    = "v${version}";
+    sha256 = "0n94jd6b1y8v6x5lkinr9rzm4bjg9xh9m7zj3j73pgq829gpmj3a";
+  };
+
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ qt5.qmake ];
+  buildInputs = [ qt5.qtbase ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp qtchan $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "4chan browser in qt5";
+    homepage    = "https://github.com/siavash119/qtchan";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ chiiruno ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a704f792634..c281316e2b66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17554,6 +17554,8 @@ with pkgs;
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
 
+  qtchan = callPackage ../applications/networking/browsers/qtchan { };
+
   qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
 
   qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };

From c605d171bbb7259836aeb5f5b82b800e282b1fe5 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 15 May 2018 23:59:53 -0500
Subject: [PATCH 1908/3370] treewide: remove lintl references

libintl should be used directly, not through NIX_LDFLAGS.
---
 pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix  | 2 --
 .../gnome-3/misc/libgnome-games-support/default.nix      | 9 ++++-----
 pkgs/desktops/lxde/core/lxtask/default.nix               | 6 ++----
 pkgs/development/libraries/atk/default.nix               | 2 --
 pkgs/development/libraries/gtksourceview/3.x.nix         | 6 ++----
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 9efca75e8f87..05da06846418 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -38,6 +38,4 @@ stdenv.mkDerivation rec {
   preConfigure = optionalString stdenv.isDarwin ''
     intltoolize --force
   '';
-
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
index d777ec0baae5..3b580abed12c 100644
--- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
+++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool, gnome3
+, libintl }:
 
 let
   pname = "libgnome-games-support";
@@ -11,10 +12,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1";
   };
 
-  nativeBuildInputs = [ pkgconfig intltool ] ++ libintlOrEmpty;
-  buildInputs = [ glib gtk3 libgee ];
-
-  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ glib gtk3 libgee libintl ];
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index dbed065190e6..ad4b89165fa1 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3 }:
+{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }:
 
 stdenv.mkDerivation rec {
   name = "lxtask-${version}";
@@ -11,12 +11,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
-  buildInputs = [ gtk3 ];
+  buildInputs = [ gtk3 libintl ];
 
   configureFlags = [ "--enable-gtk3" ];
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
   meta = {
     description = "Lightweight and desktop independent task manager";
     longDescription = ''
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index 63fd7a4986f9..813f8c3c9640 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -34,8 +34,6 @@ stdenv.mkDerivation rec {
     glib
   ];
 
-  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
-
   doCheck = true;
 
   passthru = {
diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix
index 673eb1e52c44..fe81c97ab6eb 100644
--- a/pkgs/development/libraries/gtksourceview/3.x.nix
+++ b/pkgs/development/libraries/gtksourceview/3.x.nix
@@ -21,10 +21,10 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig intltool gettext perl gobjectIntrospection vala_0_40 ]
+  nativeBuildInputs = [ pkgconfig intltool perl gobjectIntrospection vala_0_40 ]
     ++ stdenv.lib.optionals doCheck checkInputs;
 
-  buildInputs = [ atk cairo glib pango libxml2 ];
+  buildInputs = [ atk cairo glib pango libxml2 gettext ];
 
   preBuild = ''
     substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
@@ -32,8 +32,6 @@ in stdenv.mkDerivation rec {
 
   patches = [ ./3.x-nix_share_path.patch ];
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
-
   enableParallelBuilding = true;
 
   doCheck = stdenv.isLinux;

From 4592ed6e439b7a5a54b1679cb2f00cf08e1c0d4a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 16 May 2018 00:48:15 -0500
Subject: [PATCH 1909/3370] qtchan: fix on macos

---
 .../networking/browsers/qtchan/default.nix        | 15 +++++++++++----
 pkgs/top-level/all-packages.nix                   |  4 +++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qtchan/default.nix b/pkgs/applications/networking/browsers/qtchan/default.nix
index e2213d358778..f6bc05371f30 100644
--- a/pkgs/applications/networking/browsers/qtchan/default.nix
+++ b/pkgs/applications/networking/browsers/qtchan/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt5 }:
+{ stdenv, fetchFromGitHub, qt, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qtchan-${version}";
@@ -12,19 +12,26 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ qt5.qmake ];
-  buildInputs = [ qt5.qtbase ];
+  nativeBuildInputs = [ qt.qmake makeWrapper ];
+  buildInputs = [ qt.qtbase ];
+
+  qmakeFlags = [ "CONFIG-=app_bundle" ];
 
   installPhase = ''
     mkdir -p $out/bin
     cp qtchan $out/bin
   '';
 
+  preFixup = ''
+    wrapProgram $out/bin/qtchan \
+      --suffix QT_PLUGIN_PATH : ${qt.qtbase.bin}/${qt.qtbase.qtPluginPrefix}
+  '';
+
   meta = with stdenv.lib; {
     description = "4chan browser in qt5";
     homepage    = "https://github.com/siavash119/qtchan";
     license     = licenses.mit;
     maintainers = with maintainers; [ chiiruno ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c281316e2b66..bac8f9dce949 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17554,7 +17554,9 @@ with pkgs;
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader { };
 
-  qtchan = callPackage ../applications/networking/browsers/qtchan { };
+  qtchan = callPackage ../applications/networking/browsers/qtchan {
+    qt = qt5;
+  };
 
   qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { };
 

From 3290800d6745e44fe42a6b518c45956c35302276 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 13:55:26 +0800
Subject: [PATCH 1910/3370] libvterm-neovim: init at 2017-11-05

---
 pkgs/applications/editors/neovim/default.nix  | 32 ++----------------
 .../libraries/libvterm-neovim/default.nix     | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 36 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/development/libraries/libvterm-neovim/default.nix

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 480b749d201c..b090b0c84f96 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey
 , libtool, libuv, luaPackages, ncurses, perl, pkgconfig
 , unibilium, vimUtils, xsel, gperf, callPackage
+, libvterm-neovim
 , withJemalloc ? true, jemalloc
 }:
 
@@ -8,35 +9,6 @@ with stdenv.lib;
 
 let
 
-  # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
-  neovimLibvterm = stdenv.mkDerivation rec {
-    name = "neovim-libvterm-${version}";
-    version = "2017-11-05";
-
-    src = fetchFromGitHub {
-      owner = "neovim";
-      repo = "libvterm";
-      rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8";
-      sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6";
-    };
-
-    buildInputs = [ perl ];
-    nativeBuildInputs = [ libtool ];
-
-    makeFlags = [ "PREFIX=$(out)" ]
-      ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
-
-    enableParallelBuilding = true;
-
-    meta = {
-      description = "VT220/xterm/ECMA-48 terminal emulator library";
-      homepage = http://www.leonerd.org.uk/code/libvterm/;
-      license = licenses.mit;
-      maintainers = with maintainers; [ garbas ];
-      platforms = platforms.unix;
-    };
-  };
-
   neovim = stdenv.mkDerivation rec {
     name = "neovim-unwrapped-${version}";
     version = "0.2.2";
@@ -55,7 +27,7 @@ let
       libuv
       libmsgpack
       ncurses
-      neovimLibvterm
+      libvterm-neovim
       unibilium
       luaPackages.lua
       gperf
diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix
new file mode 100644
index 000000000000..4e0e87c19a97
--- /dev/null
+++ b/pkgs/development/libraries/libvterm-neovim/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchFromGitHub
+, perl
+, libtool
+}:
+
+stdenv.mkDerivation rec {
+  name = "neovim-libvterm-${version}";
+  version = "2017-11-05";
+
+  src = fetchFromGitHub {
+    owner = "neovim";
+    repo = "libvterm";
+    rev = "4ca7ebf7d25856e90bc9d9cc49412e80be7c4ea8";
+    sha256 = "05kyvvz8af90mvig11ya5xd8f4mbvapwyclyrihm9lwas706lzf6";
+  };
+
+  buildInputs = [ perl ];
+  nativeBuildInputs = [ libtool ];
+
+  makeFlags = [ "PREFIX=$(out)" ]
+    ++ stdenv.lib.optional stdenv.isDarwin "LIBTOOL=${libtool}/bin/libtool";
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "VT220/xterm/ECMA-48 terminal emulator library";
+    homepage = http://www.leonerd.org.uk/code/libvterm/;
+    license = licenses.mit;
+    maintainers = with maintainers; [ garbas ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa6cbc7a4d31..33a47d15077a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10529,6 +10529,7 @@ with pkgs;
   libvpx-git = callPackage ../development/libraries/libvpx/git.nix { };
 
   libvterm = callPackage ../development/libraries/libvterm { };
+  libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { };
 
   libvorbis = callPackage ../development/libraries/libvorbis { };
 

From 149a0dc1ff7490cc1572d383a4a8b7d34d02fed8 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 13:56:13 +0800
Subject: [PATCH 1911/3370] emacsPackages.emacs-libvterm: init at
 unstable-2017-11-24

---
 .../emacs-modes/emacs-libvterm/default.nix    | 41 +++++++++++++++++++
 pkgs/top-level/emacs-packages.nix             |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix

diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
new file mode 100644
index 000000000000..9b7a0ceab5f6
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, emacs, neovim-libvterm }:
+
+let
+  emacsSources = stdenv.mkDerivation {
+    name = emacs.name + "-sources";
+    src = emacs.src;
+
+    configurePhase = ":";
+    dontBuild = true;
+    doCheck = false;
+    fixupPhase = ":";
+
+    installPhase = ''
+      mkdir -p $out
+      cp -a * $out
+    '';
+
+  };
+
+in stdenv.mkDerivation rec {
+  name = "emacs-libvterm-${version}";
+  version = "unstable-2017-11-24";
+
+  src = fetchFromGitHub {
+    owner = "akermu";
+    repo = "emacs-libvterm";
+    rev = "829ae86f60c3a54048804997edffa161c77a2f4b";
+    sha256 = "1xb24kpvypvskh4vr3b45nl2m2vsczcr9rnsr2sjzf32mnapyjnp";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ emacs neovim-libvterm ];
+
+  cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install ../*.el $out/share/emacs/site-lisp
+    install ../*.so $out/share/emacs/site-lisp
+  '';
+}
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index acc087108c98..f81a921938cc 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -178,6 +178,8 @@ let
     };
   };
 
+  emacs-libvterm = callPackage ../applications/editors/emacs-modes/emacs-libvterm { };
+
   evil-jumper = melpaBuild rec {
     pname   = "evil-jumper";
     version = "20151017";

From 2e3783ed9407459b029346974f7863aabb5bdeb2 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 14:24:22 +0800
Subject: [PATCH 1912/3370] firefox-devedition-bin: 61.0b4 -> 61.0b5

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index d0c87fd35b88..da5dae5f3f24 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b4";
+  version = "61.0b5";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ach/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "79f2d4d476d87e3a66b5985eb05b4c2c67da500c4f655fc917bea787b2745cf2275bc1a0a60f2a7d8edd29339f9db8bddac9c079687c212076e2c51811784ff6";
+      sha512 = "1170b5bd72dbeb60e71b6c7fc3b5865e10d32286a6f8be3e5befc46f45a978b00490731b59c4e54c7a53d2bc9efdc739a17e6605444cdc67eff13f2cacd84137";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/af/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "6bff0f1fbd1ac000a2d3eaa6b65e115a2d4ab3fb7d8c267f1aa13e0edc42f3f1a390eac87dc516b144969473106fc492ad471f696a885b8994db05c19e386a0b";
+      sha512 = "1cb816e86f02b0e2c0c1a4842b6d1b3cbf3da5b368dca6765555b3553c4b8f669801c93af407b51721216bb0c222da66b2653935246db24573950390672c8ce3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/an/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "26665a323860a567e6daf053324a895c5b639c720325612b923fc9c62365983c9d6af48274a068b51a22476c9c005e31ad6c95dd291bd8705f700111191cbad3";
+      sha512 = "5ed43051b49f887fda9fa8b684bbbfd3cc71112fd3c9c86dd4db476c2e4f667ebf92435ccf5ba8fd9b29591272b609056606df9c88897b3080a1d8e08fdb8ddf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ar/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "6b98ba510a4c5db95205ffb0a56ca3307093631bd905358ec8800a421506f7d880b599324f2a39150796d719c1d83c614e18db25933ff06980941319e648d8f8";
+      sha512 = "43e25d83401eab86c05da5e6cd9790c3c891c9e3eb584b07738b6cbd151e2552d745b600090f5b3d68812ea67fbeaa9aa64f56aaf97f3676ed68134656fb1bf2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/as/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "68650b9b92be7e65e9bdb833ef97320ad5475255e1b040487925a2172d16168bf0c36f70698379f194b7a41e1619152142ddc9e8ee46d4347b7d6b0de71946f4";
+      sha512 = "b149ac7f1a770a7d850ee2ea4e52b1a38eb540a36340c41eaf83325fe86ea501a5ec97de9e13e194699b41d7cebcf5bee136274bb078ac136d69043d116d58ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ast/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "11e775167faf1a9d6f1b1a14009ac8f45569156fec5c550cffc90abb0fccc601827cbba8b805d82df8cf2239caebad3dd35e3e54818af69dd98aef45d12bbf63";
+      sha512 = "7dbc6d9a3df0d735f679492fb278c010da450e7f313550d39622d2480a9a0692c7a4c776c3b36aeccec125cd1c6ea9d7fa3adcf48aaa284f0cf1fca1e2f1e6c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/az/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "7c5347d7997fbe7a540153fb931a1d6e143c6f9200bb3692fbbdd0b9b5e3b38ba9e55d7579d448bb63816d4007c8944f0bedb5ee446c4ed1ecfdb8e8957fc717";
+      sha512 = "62bc34bb261693ff94d5c000b3420dc34cb6cea35a7214789e402851b8ac1b5b8370326168ab54e4c09e2f96f9eee1d9d7971da3b926268676db32318386eb56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/be/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "78877031b48f257b7070d9ab9b261df1414b5e7447f0855811abdf47f35edc8f6ef8e59264a73a57ef5eeca0afa261557d18cf348cf38e48c7f0f24cc8b13305";
+      sha512 = "bbbdfd16eaa7bb97dc85495f830833dd9fe6d9411e710e0c9a08b8a7225901e7f9679894df83869d1b80654c6d30e6004c02a6fb7b7b7d2fd706b6b6a0dfb7db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bg/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "8c57bfc0361de65a0bc7a19ede9aba1af4808aa4f07e0dede04c262429489791c84c0e3f2a2ae6d0cb457b1cbf0a44a966f6f5a636bf897fa9475858b6922ab5";
+      sha512 = "f099adb83c881eb777c21d8c0ffc01cc8023438f3712836838f5daecc24eaefac791358172a5d532aaab3b436b2958ef194b34c3acba591e9403d34c2b5a6a16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bn-BD/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "19f197b25b3792e7660d062341ed047c2983c6a375947c9c09b7d0c39b5630f88b2f0ea70b6865199caec8bf19f0f927f05347b85ebdd176f26ae6a1997747f4";
+      sha512 = "8bab1ef46fa23cc81365c271503d22b09d227056dd318cb7b340c8a5cbe866d8aa241f261a95fffda6bd3cdfc80c5a3bed45435176a1a1b8d427e06e3d1b0e51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bn-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "09c01a7da3e77a4c07fefeb8fbb33317a90b14d5b4d33286152c494238da9436b0db54a410a57046a183786a006fe8e3328fd4a2192465fabcb0e5b2686a4536";
+      sha512 = "6e7113e561f37ffb33dac74a9511bf634c1bf8a912e3b13a0553a2977d29300b3404345667b995752a82ca785006b460cf9a1088c23e40ceb2516d67c098a615";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/br/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "2b8a1a9cb5127e678e783742876a94b8bdc25a0d392d90ccaa0747c3c7b50afef665bc950b20858194a2a2bc3617fe1421f7acd95968cdd67c7e7b88b7972675";
+      sha512 = "cfa60a1fda69464870382ded848f19b4915de27bfee14b34f429094381c7400069c3e6a5651cf8db133487957d0e4d9bf50c253a8a0884452285b5dafcd4cf0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/bs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "4a451248f826726a606b025b9acdf8b41fb3993906a7481aa60fe7110b8abe9b5206525fb188bb16159370ab9ecccbc199f0d1bed475db124c923461546167d0";
+      sha512 = "e78fd95675dd40877f1767b53e1f05820afc0695e0a30b0e5e344df1d8d5a38dfd3019eea1bbe4f37b09399cd47a5a134f7d984a0a65c35ca93b5ee40fb1058f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ca/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "02b9ad16ba37bda6a60f980293eb402657c612bb78a1911c8ae2b60657fbde2a1d41ff7849a653a8ff2f8c77bdb4d8a774d856ae90d3112b89846dcdec988533";
+      sha512 = "d11928a8807b2d1bf2b03ec7796d9950f5127186b4fdf38d38e6b129488f65b437625a3fe5654c45b134e9585458f72cd7d711c312f0e11acd67c941b3ede92f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cak/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2a87fd3ba1e96a7cf850c3795300e488f61cd29c17ef4f02b4957a9859f65b63e3a8a3479a56818e28dd08b2b7399eadf027b305fb10b5a4cb7fb7052c655646";
+      sha512 = "233afd0bb1788fa12b7659cfd99556721dea2914afe03d807e9756feff2c4e0749cd8fbdf1989add700b6afbe3c18402c9bfea6343ac7007a19914a2d8cb3c92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "128f7466d1bd1b2a091cbf64d9f521ce77dfc1ff27b4d1bd3bc5d9f297d6ea5b326eb822dd6f1f9a20220f1032afdf89f04296e1810c95e28029b1846fcb9c45";
+      sha512 = "3d4c79999c2aad3a4aa71aecc7f5f6f25879b76d0e19d1f6b94f3d5998b43c89a35dacf8c9d158e6273bee543facd1119d4129c31a8a4df82974b0d6819d94e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/cy/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "a99bb3ae930f47a8c7ea43ba50e6dd780b8aad4f3171530c8d8f730c395e4844fd6d4b37a1372ce5aca631b95a196cebafaeae1e4467f22240d5e0033ef505e3";
+      sha512 = "2c71544732e5bb89a9296ebcf2f6ac390c9ce438d4ced4f0668ce032e13f2e1fc96d26a8863c7f3979f509171014c600cb8efc9861be35a52084bc9d4463ff0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/da/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "ccdd547ae7a31e4edb5ea980f55b8e58753e47845ae1b33b45bc1c3def18ba3a716cc8e23061038480ea71c43d682fc48548adefdc480ca6499ac3842e7508db";
+      sha512 = "1dddf978db1709a4f6b1ea71808fad8ffe15efd33eb83865736c9e50bdc4b4f3ff0ef7277408c538babc107d1fdd075cf1563af6c5684f1b98a74a3e5c72a6df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/de/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "afb82ce313001463da8763615ec9f6a52f019ceb1ed52616e0771081472455df2d252bf2e06700aa8add39ec1a6db0e51ad1f46026a1367cdd7e02ef070e3f9c";
+      sha512 = "9ee5faa668ba132eb874f3f0c0e05b0f905027e6dc1acb92d3ed951072d4484424a697c2db4bbc1b44f8815ea1f7ff0b222dc955a837a69163fca0a0c0c192d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/dsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "8fa44ec6ea0726cada8491d2b47675a283ddd669a0bc6d7708b3807fad6007941325c430f5a01358977d6827cabbf79ba57e32b816adf6bc846c2f729f887273";
+      sha512 = "b36ad6e52f18ac6e28a646b296db2119306dfe64704a2e6a0ebc4480c743017909ce38da8ebe544298db4dc290949d51734bf1641208a84d84d4d4d88f68d2bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/el/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "73cdbe7ecc09520bb3efb10f74b3792e079589bef18bb9e78f3eeb3aa99ebfd598fde9fb4dc1b1f7cca8f168f5677cf7c96941d1ee08799a41335faba1b6ddf2";
+      sha512 = "e8cb2fcd5f3ad44db46235593e1557ddf3a73c1a3440c67e43b68fbf8666cd5673be4ac84ee580088fbab536e301f3e7b6348d20ce6ba216df4bb2c2634ae568";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-GB/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "53b28a49f42c2d5a18ea81070da3dfe08609b1e967068e3eb99d369b9e16c95683dcae080954a3d89231b2b136caab4632e9c79bdafdd1860c2d642ba46d66d9";
+      sha512 = "9028d5fc39cbfc454d12e24164f27e8781801c5ada6806b2c67adc0c9c5540d1930172cda78b25f3c1dcf96a6f53c8934c11ae0b4cd4048ee62f9c4d487e2475";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-US/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "1d68fb1e26f70e54e32dccda9ce56ba3d6ee4925c8a46ee04321fb88438df4cd9051772e3da23113f95d4ab684b154ac9c7732b1025bada5a7a71b03d683370e";
+      sha512 = "25ba55bc0025c531c1ed596355e5a0906cbd87959ec8b3a598827810cfcf5fb573dd572aae85e08db890ae6c514378fcce98eed1362a8532312f7f26ceb8bc3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/en-ZA/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "e694b56888823d91888c92eebd9778429f92a749453efc2188013c83dbb71c6b4f9aca31d0cf1036ff3e22cbe229bab266319fdaa0efe2b3cd1a6844f0dcf93b";
+      sha512 = "4ae8604917283517e0d7a94f13506c0ab68602674ad3378ff67a0cb78027a78f457225b54951dd11e471d0a4ca67a6beb378d0549f1436e2de59b4a352082c34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/eo/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "b8007be22bd2e84fcc99f76fc2ac6edbc48b8f529ed055aab31dd7212ec3aabe47d7870a6812eec554ace6a41f98654fdce32e15620b872e9898bff020c5e56e";
+      sha512 = "91eb963b0fd032e02227612d98ec6693bc665d783448163fb5671f4af23c05c5c22199ebefc361f671b880aa23967a48e07164316c97433fb52ad03534363d93";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-AR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "3b0998405d2a019b049b80f077eaae13ed7b562b5767a821cb73dcfe50d4c243267e5bb5490911c384a5f5e34f13e0338f768a0119098b1222671ae410efaa7a";
+      sha512 = "855bf9dfef4703d7bf4852206cc6103752d537370712db513e40ccc9fa708bd15689ee415da163914d3b5686d2ecc0ba696c9ebaa66ea0a7930401ebd2f373cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-CL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "a28fe0c2be869e0038da0156601714e33e4e5ead47b9546e9328e06fb7c690b633f28c7f029747cbd438d4854ebe665f58244a18c309358d1877ff769557f99b";
+      sha512 = "6a23105b44d81b403ed01d46ced348c5ed5704e517b098404546a5ba33dd68c4dc631146a9e16ee0a55cb7ffd8ff320074657db53641f914193d338eddcaae01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-ES/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "450b32e899da5077b3e633917324c93132682d9bab4da0f44e63eebc0e406c1ae7c5ea5adf2863363ba4cf8dc8b235b5f3d1ab0be790ea63f5f51feaf5c8723a";
+      sha512 = "34f7dfa2e7711a8520246efaa3629ffa783f8a3cc67cb19def9465ff4c3a3abcea4d1ce1df2ce9c65feeb050d2a27f21cde9d95a5681b61c006ef21c4d412f39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/es-MX/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "bebdc8924ae2d3a6d329a86c838bc54e99335e087dac0696fa833e13af17b81ac2a937f7327db970e55fce04cb3cf66f645f8a0e15c3a421c2487a30e29f6d0a";
+      sha512 = "269af8980bfaf7db00aec2d385ec0eb44ba5836de791f698540074565bbf1c9ded54cfbb870014fb418aa3b451ab6fe3636223dae4ccf437a4d68c9bfc8dfb15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/et/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "522acba62d532c6d96235862101f14cd0b7ff38bc52957d5e77783d3299820969c576713bd85c8c6bc63e7bbefaa09d0308110d3390594ac4612299ef8d751a7";
+      sha512 = "65a0740c37a2b09650bef4586306bd6139eadb43d4f3743c7ff0c47293e77b7fcf74f596b1982305b926a66277224fac3d1a190afd1bf2146503d3fafc8f3e4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/eu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "799508fd282cc99417f040481d1988d2eb45bc2b7537ff5ee984ba88560819fb20df4ef0de8ed5304e5920bb7e271d05f1faa5e2400428a59ae8e25f4c1c3b3f";
+      sha512 = "17886662bb27dc76002702ef99e3923a52f6c0559d8c2341e09105ae6ef55bd3143961964db46f0a5c8738d9625ecddbb3c65bc9ec14f9b669be327dfad5aaa7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fa/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "4068a191f7a66cbb11fc6938722b6a1a5cc902f024d63dd1f27187d35d1f2d28e1cb17c74e73ee4f4b2ef10925d858973ff51a779314a32ed22a91b78c2fed12";
+      sha512 = "82eabf1c23e28c5c9f628a4dc3b6ad73568228422b33665b7fa9b4666a4defb79cd118072e0276a314b4f5580317478e6f2df4a28d3ad8a7f82f87b0b688160f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ff/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "051d7945af28916ccfc39647617f81041f3fff0cc305027dce6408ba7575213c0cd1064d2d48986f4b2740533c7c770ee4b28802b9cde01681fad5baf2fdf27c";
+      sha512 = "e8563b0d1722fe1323ce27418fe0f3596da9fcfb9cad18fb3c09ab31ea86aceae7f91a64aa0511d98ff883e4bd27304f84570271bda13290b5716cc66761f50f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "371f8f0e5d14323a5274923d6745a3aa327b11a18b06b3ff4f4e1c9843985a83b675cff17fcf0c6927d34e771a56a1a605248b32cb04890e202a14251e0ff13c";
+      sha512 = "4c439ed929ee67acbc9c58428fce3a47beebbb6ef1e4ccd89609530758f113aaa88e8051503fcf93b665d702a4840ef5924640019443a1ccfa844eef8b2da83f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "0b5270611797881954b4c2ab8a506ad8104b895c33fe0ee32bc786e45b96f9fad47dfac84955fbae2091c63bf0f7a0c0e189d48366f623b2740aa8bf0115c0bd";
+      sha512 = "0184913e520efefea6eced2f54af3ddf0f0f19f419ddd788471c9bda3429d732af3dcc281c45a175fa904581f48c5f70ac0a9fb28d2a412aa4d81aac97255142";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/fy-NL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a48ac0ce28c4a689afc7196de17e4235709b239f4c1b6c1150ae706dedc858edc973291998e6f72e36a233c5c316848ae70234fc6c7fd80923894947f2897bd3";
+      sha512 = "a6546691dc61bd7023a61c45bdadc3158e6362185b0b3d4ffa20195d1e67d3b48856b557a714c813f1b389176d835683ac52dc1cccb8b08bb04fca014a2e380f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ga-IE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "d96b456a2e77dbc0ddb47702c94772b7f75d58ce9fb4473c7f9b4455461e6ea5e0507da2128810f194a74ad6f58d5c3b373a501a1d28ddf7111eb90f9d2e3851";
+      sha512 = "d4cd72a92c0826788b886135ebc17194ed265cef4cb9e1d288e27638f7467ef34f8f2be6722306472e8bf62e54c11524574f21a7d5ba97e2074daa7257d1b8d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gd/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "4c9d9adfb6236e011c0048810716a9d44e6251d2122443f7be1a2761fd12ef085c4b8aec06bbdad54d056962ada81f8034d3e87f9dc17551ca74ca9a0630d304";
+      sha512 = "a7fcc96ac456ca06ba65134fea19469c3e1b725b3bf9683c3d6bd2f9a3aebc5a6d306e5dd15a2e05e58e4b1e06621f20a2e446a3395cdf8f20f1a7a92d1abeb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "fe6a9944ce2e595c436aa3aa4556d3e24b2595e7aa3cfe54eacdb23d16d461b1e0e1f4ecb1185f776f19b9f7ceebc01177d624443827d21c5697755f92cb4fbd";
+      sha512 = "1556d99780c2c9b0f8b99fc37c4299322d518cb22486ed1af7a778a7f3979acfa47aa333a65daf337193691695fc7101503c81327d82a624bcdaeeecb6ae8b6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "5ed38fd1a5d0414c95c0ca1ded08f3f31e9a3bcc3860a3127a5568c3c8891a958071d1923a208174d27f479811a9053b0e217fe81d51d130b15b8c5ff8ad135d";
+      sha512 = "31e0e6c4bf116ff1a0c1b5d7c6548ca3d629cc07ffe83c2ac82b7c681321aa57227ca6c89a28b83f4ee96ed9739a47d83a02eb3782cdb14480b382dd46ed073b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/gu-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "b6f850d0a828b24d0c81be758aad2402b749701c09f40c19d47860aa6e9b8e595c223ad14b94560513044ab9e96113bd509aa049e8caa6ce502ac005fd59cf36";
+      sha512 = "f0fe6026339b49d59b8208e6e97d3645be34b90c37152d76645cfbf14a418a97d37bc3cf3fd733a41d085b315d5c975cf88521e7f85407b54ff83e8ecd0ebf8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/he/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "ff989985b24a8b4ea0ebc9dcaa73406b3031733d925477487b4ec53ac5dd39d879601bacd1a69a1190c0438df1403adf9fafa67419e098ff618c1cdf1abbb86b";
+      sha512 = "32288fd8ead53b0eb74621301d1d0f6ac9c66845b65ecc5258d2f1c7e913e83a25843268e6ded535c81a7b536a3112e58f0c9f70d39b186a6726c119dce6ba8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hi-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "ffae6c7f92f2c4dc83c65aa4caac0baaef54cce44e7da771a5523e57c15c2d1b2bf4685f8a9fbf0c0d83a234367ed4a30e037e8855fa909fcc3cef2e54c4e01c";
+      sha512 = "a398763f1d467b6d98b864afa84113ef59ccbaaaeeb7e730f65d8d898a534e910b775cfff1088ddac4cb7c0fc714be2f98c6b7df9e30a751fda1f3727228c51d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "d63f360161802fd7a680a412bd11ebd47ddc33e234ea97d9725b58ad35c7ec41b598497847077e991a3744024a384d5fd636d66c9f2a31a32d59040ee684700f";
+      sha512 = "2cc3e64cee65d4ba1d4a4e755430664959bb5726d575062d2147efab9eab7c67797c6236367456e105b227907171bb169952ed18a0f8513677490cf065981e16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "6c5cf6db753f03a108a13303c2a4ccd1be0a8a7dacc4c60de95beaa0395c41bf93921a81e56cb8f65ad7d2ed6e45177c80c8ac9a516e5b72b23942016b62f78a";
+      sha512 = "774f60494af13245f3642120b7401fa3a9a98dcf53b4482141963f7458e6a1be4097161938a3aa2bb67940f0dd22f4ea447098d907d1dcd55b11bb89a278108e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d98013b7aa341be6efce51e9d7d61668c232958066e8e3b9ea7a8ff886450946b30b9ce089b0bd4c12e43da85f922d58be37863eae552d76a953badccf135514";
+      sha512 = "dcd4955e1a61bd5e90e7b26dce4daa71545b337245a42b44ec5af9d7a9cd455b4892cf52f219b370a974d5d296f1d93ad7625fff45292fa7711bf36139327799";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/hy-AM/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "044962ffc10cb00cee9c7a4e7025d3bc08768f4b955a0df9ec8e183de27ac06366b9cdf4a07611cee23fafb27258e9ddf0b3aea4104193d9ebe58577406cd7f9";
+      sha512 = "105efbb4f846c61777b3717e377167e5e3dddd50804c52694f4641756baa2350f54ea01995deeb0a751b23619c55b1806cade1ba1c3cd7f7cbba23206fa19f7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ia/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "3a810b0a95babf1e51fc02f54d2be4cfe0a3596b216a85c1e676f7d90bd322abb63d9ad1dab135d268d996fa409a30d6a247d14f8780b9c5daf7dcb09e3c49e9";
+      sha512 = "2ef057899464c031f224b0997138dd1611aa0841f2ef2f611d8e2b9ab3849bf94e287b4ea8e08e905f42a92e15f9023c592a454d56f4ceeb7a8a87ff99c0b0fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/id/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "2faf68616257b9d4a81677676fa86c014fabcd0164d9b851c37176bf60b0495d493c5434d5f677b7d29c91e97a02aff92d3d3ec9449f5df4c85c261410492785";
+      sha512 = "9d6fbb4afa5255bb77daf9c99412b8bfe44a9d841eb1940e18611e2480da2f7f4fd18452c49b53880832ea671967699de9a467405cebb17fc268ae3a7aedce6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/is/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "aa312acb041a1d8f3aaa6f85c0bbd09703d1c5ae972bd80006b929c415dfaebacd849b5297aa2f6d047cb4f21df601a71b3143c451088532f3cd116199373fd5";
+      sha512 = "a10300126f8937686d03c4acdc5dccd9570d7de29a25021fdae22d03fb3a87baeec45f35bbb3317888a34f3282e03b2b6ae728743863691f4af691d8071ab567";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/it/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "edbb5f0922521d17ffe3e3481ce5ac440b48af65bca441166c26cd9b1b9a12053b6212d3caf29e4f2b32611ce846aed9e157a537eb20f5785ec8fb92990765fc";
+      sha512 = "8b948d7c34a13556246a2b4b70383ec847daa70f623e121449e9aa380a709e38ef40e9f864a3cf7613ce549876452c880dd2438d75315a3c8eecc3ee3230862d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ja/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "20d9c4e1cd8515432163daf732aea418fb0eef6f164c9f72bb8519c896a2e119a4774c00308d8fe49640838d166da673f5def9e99af2c88adb3191cf94ac545f";
+      sha512 = "dcc93cdce7d1d783478f85ccee378638c206221efb5ab5528ac2387d9afcea0a58370bd84668570902e03cb06aafd580cab2121d49167ddcbb6ac5e2803d6cb0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ka/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "291ab0b8da0b4ffb634967a298499b880e3fe8aac73fbf22cf90744aec1ee2d0eae38b32a970e4650243de5aa547986b78bde59e241668be3f363762922d56ed";
+      sha512 = "8de7b0c54d5d05da9598b449015d505813688f1c448a572513411acd9aab4720c03c15d6d342f84255cad7d2edc1891682e0398b9cc165e812704bfe9e07d8fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kab/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "edf8a27e6a745e2ab7db9cb3a5a270f50c12bf089846d9050176847b29698203c7a298bcce311001d69a22a3049e34506c77bfe08b6dca3b2f2a8a9fe9dab54b";
+      sha512 = "d8fcf05b0072b03336b67df81eeb16442498345e624cdc68fccecec07d89a39df95b832968c1ed0108c0821ec71a89757d62fa9657a451f11fef25b0da90f918";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "1b3972db8aa56fa61b7729029aec794c03b20378b7bbfea93dbbf4d14b9b9bff3be30b94fcc214531bd0067679c5dc5fc3bded774eaa9da1582706166331923b";
+      sha512 = "13e135e31e44bd08c784bbe5222f14e220579aeb1981d1d91f0baf67cb32157499c6de4be1ac7086d001ad6b36c6adc44f32f4a9d8f0aab727cea8fd60937e04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/km/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "210d65fbb16d3f63e5b94b7df2b33655fe29dc3bb1707f0cff4875f480b7b5731aab65306ccf8d19c78041284bdc6343b5bfa195a03503a27e1e687ab14dfeae";
+      sha512 = "c99b28303f9deb522c9e06e5c858316314638312607b64734ffa681aedba9427c0911810c87f286f1a785b77892e6e38a2a1eeab492458ff8b9a9f87de635577";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/kn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "081d883a7f9982418347463a1bab7a361ef915654314b254993c22e1cc6a37dab197950dfc742dbb76c2e520628c12ee190b33d12b89675de3b87adcac4fd389";
+      sha512 = "cef5bd55f8510f3ff865fe8e04bae593badabf59ab9251a336a886b5af9f91a83502bb612efa8b0b295f18ca1b42da75cc3d328bd1916a10478de847591792f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ko/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "f00a78552a06c759f353d39a6a3abead6d10d8f4d7276b4eee2d81b7572e96b14aeb7801f6382fab96b355264f391093726bd35b94ce4e4c97d221b0eb18fe0d";
+      sha512 = "0bc85a9bc5b4284db80cd18d414fbe49dafdefa58f62d7c0b83a06a1e0c6028721f7d2624a1a4d948df16bc316259fd27ac2766a55b1989f37f52f8fc9d8c517";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lij/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "2f681b55c324601f297f56b7f7fd83af21a4a176602275d00f75f919923d6006ec1c7a5178877aae406559f2d9acb27de89aeb9fc94e14e273b2729eb27e5fd0";
+      sha512 = "e35e81dc05f83f371846c9d31bf62b69ebf4ea28c6e2a53821ea6509b4da8d575ea7ed616d546d900c0559d2da7280e51bd7223e790b161787f9ee85e2fc11bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lt/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "2c7388340d8bf4dd7163e7515158d79da26428219f3b2c8a11dfd6d04f85966fde0013fa4209c297d28d8b6bf6ddaed6dcdb3209e1cf3ed6b359f35576d64d23";
+      sha512 = "9e8ff522b661912c1d6cdc440015dd23ee2768aa159c157f29be574baa8e74760311e623c6e9d3cf4e23363b5f05a5d3ea74743b6f95b256045418c21e904194";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/lv/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "c6f2d1c64793e63cd9c5f0a5e0346d6d20af95e8ee46e6a68c41a1af7c584137c2cfda7c9bdfcce22dc23a0f7f5b9dab93117d52133bf78b94a6dc78fa3d2261";
+      sha512 = "f6c1dccce1cfdf0b92dfe076e9cb131763ac72bad4d12610e7baa74ac690b25d567c796b8a3509ad7b80b2b44a87bc0ef41e52134d2699573772c851b3f04cfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mai/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "c1e0b25fe89e0d27c27942a3c93b2a5f1d861620e2b5e2a077952d806e66183319c5613b099afca667564a9d3f55109b5acb99a5b33da3e8362eae873099b83e";
+      sha512 = "65db4e9da91fa1033ae5efd14f60ffdaf6b1730e9f51f4bea7142bbe678118db19098d0e967b6ef08b1531056efa584cca6519aa0c5c490008ca740db6a8c50a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "b1da2340de04e9535461cd14e8bd203975b6d570d214288da2af3b1b9eeded470325b5a1048e277e173fa3159e7ead212efd4c10748444469ab90ae8ee36d49b";
+      sha512 = "0565dcf2e97431b5ab728f8c73e5b26e9a411f26d712c3bfbf9f61cc7a719b2a38578b13f2ab8ba5d1e054a59b9e1eecbb5a39cd188c772a7d5dc57678b9f334";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ml/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "41e686c0ae341a4f3b5c89c1c3f583b05d78fdb9b45f51b4791cb0b6e8d32b08fa4b1b98d76e9e41241e90ffd60a43d0a1d43a3a33a20d1f24c1a0efb4ad6f43";
+      sha512 = "6573ca6f2010c57e9a6aed6d6e14587097329e1ae144b4bdfff0b0e10d0cd7a0bcdeebd702460b9c4555480c81e5244f0eafb8592decc7d92ba8785bb1aa6107";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/mr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "3ceed12270a4d9f8c705d6cabc11e362ed56c7ae9d8ec550abeb3fc1df1a727dd836ab53a9301ccb10ac4f6c0552f614452c23c19c5371b00e5eae85ccd16e72";
+      sha512 = "c2b613252726a185af0acaa181c455d0e048f3895fc9b4c781f25ffd8496c43d32a3f5618df653f79bbcc403c9bf869df327fa31463515b5fafcdb7463f01e9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ms/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e4efd20a943b934c304b8a1a873dcf70a8f48e5d5c95314c7ddff0c5030afa0d80868b6f1bad6dc553c93d28c219183edcc474ae6a9905c26b2c4bb2a10cf9b9";
+      sha512 = "517370bf3ce8d0ac8fe765d93b47680c65698c4de87504d391b67b8605dac7f1e55db38facb8dfc4e35187828d41a63ad78b4d2c43cc6f2849c1d5f9fbc4e2ad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/my/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "7f9f8eba68930d62624321470066a25ddefa3c85df9791829633cbe7c23b928e1e00e7682d8d9d11added730be19087d68701ca428078fd3bbf21dcc69ef639a";
+      sha512 = "8c84e5c6e4106ff4118c124226ab0aff24cfcbbc925196b9c9a7b636ba975babd707a14abe2c5e0bb3afdd00d098d75dcb060a448c00f113e4a33c0cb884de66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nb-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "184fcfccde9ec2190ef34cdcdacb3781c7f4d003a79672b78729512be1b899138a10f45e4570b837d5b4e64a1db13c1fe3bb0f2ca16defb5315dd495b1dd18c3";
+      sha512 = "58c2d937db74b8eb0335b9e3dbcf11bf0a1bc8bfe9e5ee55e9e3ec6cd9a7f16b23e48d88824c2dda3d7f1f1175f0036757f0664aee8d60a9aacaa2e559cac616";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ne-NP/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "19cd13b90d7cc501d2198019d05d33ab8afda90cce2fb805648aa5be8100f0ff15f4a2898b33e3b2d2a39f847ab736b87a77d0f8edf64146a0a5efc18b38df9b";
+      sha512 = "ce54ff7f7a4ecacd7ac73e48fd35e0b39b96a7e85b184f77ff1ad66ee3f6d32407ee58ca882afb2cbf65673d9e868f8a58962602097a40f5b0ecd5ef0a038b04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "6f716a77ad36a1c73103cea5d0c3c7021bbf70e33cbdb4d7cbf4148036a2888ffa6fa64e7e386038ce247e53e3538538c3cede0e8f1d300b393343b32f59b5c7";
+      sha512 = "e3bad92c631d647fe634b468c27ca1e2c81a69d14ffcee3a32d41d2d21d95f7196b2f8c426e51e81ea4f920ee0983290597e0b1edf68e182ccb7d87528da49b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/nn-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "6c44f966dd099fdc355245bfd96edc6749dfdac74ac711ede0bd770b43f154927d78dd8b3413ea70b3992a8a2271cd6e67895fcb2e9fc5fe0b4488c6ffcd1c98";
+      sha512 = "470d3662816ee35e6af0237ea6b9105483abf538928ec4cf329e596fb7c7b6e73ac6b7508e53e33cbbeb43bae1b115562d7c8c03721fec6ef0e3036576810963";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/oc/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "dad6e6c63936b40e5a05dbe7b0a8dd9dcdf9ed8b80b50963067dea80dbe4c95e13ca890f0b7c4e3c134c1a4db8252fb03bbf32534ffa74d6de1a7213a43d2143";
+      sha512 = "35711515d5fc70e8c6c54d2e5f31b34cbe98f8ef21bd25135f64332edda1e5c336c24403f20b4443999354caacb3066b805d66ac7b7f6165bbf3bd748983702c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/or/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "5c1fcdea8c87acb46d74c3fead0da078316f8fc5edb97a379b613c2ec992c24296dd7e83468472f7f453794f6079f485724d154ca70c87483f803b17bd770c32";
+      sha512 = "21475be0c1992ee07b5a2cbfdcc0cdd25245c995270d93ee08c1f6bd01003809712af71edbe7be7254acc83cb930c0d26aeb49326aefe6041b3aa92169f2db65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pa-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "9c60479466d6dee01492a04250f77dc496438ec8f2cf3888f504df20a014f0e614a3651dea6eb4617a8eb7ccceb04415377edf04e87fb6bc01eede0ca41cd195";
+      sha512 = "18b75e3122bc57cd01a98f81d922e325a7d1ebd56b09963a071a14d05ba679d51e251f0d0e11a60c832c21e5022cf3a6e1a5292a525ab53e4c2c5b222a3442ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "cac19ecc04fe84e3056c77f6c7ab2e497671cbb5900be1d7f8d296599d0a8a892d557a13711a46b1a73fbb0e0d30dd51a70399dd08680e5e5b119a7bd6f9443c";
+      sha512 = "687465367d3498bab3cbfe31da5b0b4c31414d75d7af605c9873d8d2522d8502d3dfa271334e5045537b840e452f6dcf65a6f675c653cd07174b1bfdc6a95738";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pt-BR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "580fbe7a4ece0ebbf08a4642d83724735f2075bcdbfed5d9883e8a94fb5708bf2496bb72c5357c53d7db995e98db7636f4a72da8492607ad4df5c1699302e95b";
+      sha512 = "47e5866860fb3bef65399e7e3015d2486bbf427970107c449122b6c613a90af7d989c352937c39766e5839dd6c3fa31bec59e52fa013fa983a64125a03be228c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/pt-PT/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "6d64a54de0468261ad3ebdbd96b390dc26bd11167ce93450f651b20167fb3796fb4a30aa5fc5cbef2c48a48637a4bc4b5f79a40bddd2744c89038ba339814b61";
+      sha512 = "d33b77c954f66d0c575e7f2cf1c72e0a2da7ad9faca7c8934f96f8c42261f2e2c868378911eb7368ea05dd3a63207eba4cbfa89262943f2e551920608e0fad9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/rm/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "faf3cd4948bbbfef3ed8f78bec64ac2aecb27d9a6a2ca695cc0cf79d44eff57450aaa1aad25c65b6bf934df007674fb2e6e97979798990827e01c5e17bfd96a9";
+      sha512 = "439df5fc87e7400c428c9e3c221d28b23df23a380ad18f441b4ef97149e473fd63185617769217a0fb20dadc2cb8277a9163b95ce580e5c7ccd308acdad70c71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ro/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "563fb9c0b44eaf13a82d8e8ad6a4cf45e5fa5ace7797b774687a1ca779bd8c455719cfa1ff2ca567323d4b282135e9e30757be8d432386bd9875f4c32bfbe391";
+      sha512 = "035eb9a6dedbaf84d3ac03afb68884a1431c37f0faaff9c02679a3bad24f50e22ae7b8dda1d552c8f50ab267446c32435ba18c06afd8a561ee763aedc323c7fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ru/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "5598552aa4e7cc7e97f327343cd6e5b717b8aa5b1a80e8955f08c37cbd87c3baa6fbde9c1bdb8be41687fa89d0b93d2720fb106193ba50efbd9736ac47661845";
+      sha512 = "2de2fa51df5a6bb63124f83b976c9f330122b44b407716f3db83465dcf998c667af33ae86ce63989099e92bd8380cd216f82d1ebcb327a55053e31902d4e0923";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/si/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "0a5dfd926c217c84b5fb022eb9d60e12bd9869a5abe4c2d8a575f72c8b1bcd6bcfd91a40d2b41c9beed97e5611f400d99546db3bdfb2ab77267f0babf843b091";
+      sha512 = "12ef4e53dcdecafef1446cca82ce7446ad9aba0af9a4f8b83155d8f1a4447a3630eaa39900fb52896e12941d2d9d2a699a1b2c848d7a08ccb3c592a8c0eb5beb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "483faaf1444715cea3f576db1b90963da3fa5999545c16f66506f60659f803158c5080f513bcaa0d51de6c56dfcecc1cfdcc2d7675c26b1dccd31e6ac6fbb70a";
+      sha512 = "129d2f2b41066cb2a0c476d6f75293ce70cb026d525334ed1218defb0a7dd8c432bef7564b008885a6fee277c3d41ec4015940c740e5018b1ccfefb7ac1df50d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "25b17017b66ad20c1a895819fbbf4b5d33b536a14991131af6be536033376e53373b82aac17137bb6599672c179de9e039a71f468450ff9fa370a971dbee4162";
+      sha512 = "8d0d9a27b5426b4cb6908fbb02c26fac6af6564073d6ceb94fab9f4fda6786f41f0cc8f115be011bf208c3625ed165eedfb69935ac9fe190121f515241fa8a12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/son/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "4334e40cbfe4c531f04362bce012e03428138ddf9dc94abb75a94b76c1ae8881e8552b82b3e7e608bfd7a4b8684f9ad3105d65ed7fc378865b003e25cc389b3d";
+      sha512 = "50c6208d9254cf877644c0b409c699a9b7de393dff480c2b6c16fb342de978222c87e5766960e045d2b860c47058b5fa59a52a3902f55169723783ba0a19a57f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sq/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "355f71742b7f7de9523c388d3debc116b79cda128f0da877401f9a664fe0985edeba82c9a1f3819a8b0132b20b7f596830c94b4d49f57f6b924ce07c5995e410";
+      sha512 = "ebdf94a268c03eacdfcce2b5521d3e721c3487c1eddc80e2783bc210031a0cef484bee4d0d3622ff636f7524c0e9f294b0fbc0c9d7c6ca9ef9d793291f97e4d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "c095d671593b63b17bc48a0bfc1683b96e0a1590e15735194a2e8bd9180df7c6484165ffda4e2f328589f1afbc561d8ef3e79d1474c91734aa77ebe5d53c7a67";
+      sha512 = "579d7bcc6d85b375b9443df06813d908bbe30caf50897d22f958c564acba2aa54cc4b8671097c7d094ef0cebf32f46d88de7ed748590d70063445360b73441fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/sv-SE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "d9a80a6e41703831cab25e9ae7237d4122dfaa5bf992faf5fd5ad16d9dc9b5c6ee5d1919b25b545c4a2a9b8f52838e5ffc3af39f69266f9a4629925be1aee424";
+      sha512 = "c68d38b7f7e665a53c4d64d92bc88d7dd2254dbd8ad3d52e4dbe463a04186e54f813bb455c9cbc9e6451c8752bcd1fb5ef22cce5189fdf2c238a7713b2553f4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ta/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6da53d55c5ebc813b6c2ad8275745ee2d9b93374c1b6bbf4cfd28c490210a4828655ccffc9c37657892bad50c9b08c87ce43a587126ab58131a50217e626818a";
+      sha512 = "2159f5a1d5fe6e5adf10dc575fe0540a2036bd26a9c0bbee7f45a0b582bf0ba0515a474f87ac6a7d7f79d743bea37e51cbd2a5c057a3a934d8e480b38c5affc1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/te/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "75d23d05b365d2bd6e06a2c737c3febb7e45c0ee944e26da78f5bd247aeb5853e5abd1ae638f95bc124f3657b23d457c62b9a1595a11588cf13bbb8528ada3ed";
+      sha512 = "291546ed7e8bc5d540835f8d149765765f5f4dc77b9f199e630373c1302a03c0772dde530b9ef391ab801e921a1d1e5ff407a233269988076e49dea6cfd0cd8a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/th/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "f43d0c98bd1af2e19c6723bc4a4c28dcf594bbb37ebed416d0493883a4389c79d47f6d63a844a3d2f1c6ae9a84670f059faa3ef3d5ed01ff4eeaee6573da7a76";
+      sha512 = "1b1c562bc9c0474a2d2313fa02716d8582b92af343ac0061d83f5266125533cdb65406e93857bf36bd35c6154bc0ef96ba5d963644df039bdb75722c177b4249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/tr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a6ceb28b89763e46f19307cd6f384dff8c8d7b69a1c89b29a40653b88bf3ec13955247d565c72a0df47a7ab0e3bafabf45b59fc6a22fa3ac6dd3213d3629cd80";
+      sha512 = "a0a30765b877d6278d2e00becd63bc29778dc0898edb0f1cd67a6e5e8eab7a840755539ecd7b7c99c6abd0f92ad4ca56356be7b8201d2203e2973025350ab94d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/uk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "64332b903dec3002fdb99bc4c13821c830fa29db868c37d6eee4f26b46cbd5b6b2c2b6f9aa1b2cbf36e5a68b7a18ce068431f229182c8dd380847550845e54e5";
+      sha512 = "95edfd17cc60fc097451742cfbab507ff2456d2621132794b2c4c0997a2bc9dd94138e56bd1ca0f3a43964fa5ff29c2d21aeaee2666ddfc0adae798a84207bff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/ur/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "796361fbbb849c1ebfd5e44d97443c151be90275d101c1e124def82073cbc9ec22ae4e88b1767896f4ee0edb6b1ae20de508df1fce99a0846b4388b768ca5c3b";
+      sha512 = "58165e2444ae10252d8eb81e55d2845c627315b8b1889255e54d6251edc571cbe42a6616a6991fa9b5cd45383c48db7f83069eb423c6951732ff92aabb3c0033";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/uz/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "2bd641e76281fe1740890ebe91a4d87326179d5b45683d5667d523d2ef3300213342ce027578a6c510b46939cfb5d1d3b25b671b17095c9cd22cc7a8b7920a42";
+      sha512 = "06e32f99550442c2a42f59423585f9821284f930a252d36c189f857d874cf8d7ec24cc26717509add8402147ed2d7175c937ab48b22e1a6eb748efedbdd29d2b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/vi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d6f14d45db8551005cd37e386bab3ba1cef2b58bc3b5925dcd7fcb83627823edb9f49ccab2e8092158b7ea83ad263cf01635c9d639873581558234d1d1664a69";
+      sha512 = "d88507f09710c55280ba4df1226c1d941d35fe29774dc37474a0b5e61d0b296d9c7a357af21a83a4394aa1d86c5bd2bbb320f7628875d9c9e7181086ce301b06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/xh/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "0bcb49577f8063b2378e6434e41429205b6ecab7dbbddb071b5a32f40533c2c2c1eea65870cde99a760ed0be34b7ceee4ab2f1a2d5cbb8734dfe1fe176129991";
+      sha512 = "c81c4766894a5db74e5bb73525f4b3ad69ac19e25f877f4624197518a3e75396041dcdbf481507a880afe29469e0eda59dd4ae7a3be50cdfc0a3a77b8299c021";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/zh-CN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d0eb45a490fd8306113176ad3c42b7e8ab317db4f9b9004c70206e0fc51c4fb84274ca7410732f2003afa058b7f2c8ae2d1b8ec52f58d96ed79a2210db23c7d3";
+      sha512 = "d58e2348efdc70960ea475533c4dd9b25e581024ebe2810a7c103d2a842568ade2bd4a53e27dbac1f2ff2ef70481b330e59d7647234ccb34480bd812f6552398";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-x86_64/zh-TW/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "51f43754fe3840886a3e8ba195055bfc597eefab9f056ffef25974ebcbbb3b05ccef9b35c99af8b5021249cd076b10a5d40307fca31b18f1b7aa315f0a9e57f4";
+      sha512 = "573669040d33b07afec48131953a368fb9cd661358c06b6ce056514419e6fd51a8ddc4c546f0a40ea816338b6f250ae4841f7f9b7ddf8d3d57e73f34ec55796c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ach/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9787c6977c6d50b2c9b2f4a6bbb3ee43a5a8298858cafa24d4abe0bf6bbf1b78eabadfd5b27e69f9fe96269f7a530bc6d0ec0c7afcc6800d88841115c55e5fcc";
+      sha512 = "22c99c2e64ccab01af2723e6edec7a50d7b2b4f9f0f5272d502b6d6e866551e72c570ea140e9283b304d1af4cbc86300a0c7e54478076554df8bcc80c9e33415";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/af/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "61400c29445bd6d7c2b5040788dd6db236678c6fc4f9a7a23414f97757e70cb235ed6d8c39dd35dca66924f40e62c4c4460f3b11cb6da57e2b6928109c2a661a";
+      sha512 = "7cd232ab70caf61a9202f2598dd85be49e7039fa1138896a719fcde3f63cd8dc893ea4c0b9bd832cf506ce7b9c235d84fb353ee625ef0c70ca3e26c2c1c69315";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/an/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "cb9dc92f0c490accb006e0fc6d44c37c415e8df5b06e97f0d004e53e5662391b09e0def195c6f5ed41b2c5803f966fb3a151f140e048ae12b2f7aa1ff537fab6";
+      sha512 = "b73b7e75d08e8476b7bceb3f86a0ab7d632e2bbeb3916b13a2502bfc4964ec1f98c6ecc6941a92d19dcfc29987097d69ec27711ad011db5f8205f79120fe7904";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ar/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "fbb4af4bce19250e42e362c43ca68b00080020673691b3917ade54e35028908b8938b924a4a8d1b4823a24857c10324b171944caf21a16b0f1cdd6aef8478905";
+      sha512 = "6a8c4ee3f89bccd1fc69e8b896b3a66f9086272deacb0f112a36335a432dd3e0ad6d3017036b931fd7951503b8e00d8f11588fff118d1051702a0477cb360697";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/as/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "5fe55f0ff65e819ee7ed194a0d2c7a0cfba052e7efc6fb813a6faca7370031d8a679beceefcac33edcf221de5a5701badcf29276b1f835c39eb8665207147297";
+      sha512 = "6a84acf5496974709c2ef4220cb56d4714d5eb8b4e731de17e4cad9be9ffa2e95d82440e0e79e19dc8abe91e56d67f09c4505f57b62c4870accfe1d4685bd97c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ast/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "129218d8d08c39e118a47497e38c3cc30fefddc6a08ea363a08341da4da85b1cf2070a86b34ffa75038b27366222c8d03489d3a4eb4be35e31500fd32d606ec7";
+      sha512 = "274173672d91953fb715810f314bd8aa5c5b6660e8fdccb91e09d2e3b6ea20d50e2cccce45f201405bbb3b0dd41b1f7ef629c6caf5a59b9fa075e2a5c88f556e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/az/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "b30d0836f1ef35ad01c929dd43688976a2fd9917d56ec99be65298ff2ea88b4608ff0b5e398fc016718c62aabe6373cd85394b1a9da927c539fc1999dd49659b";
+      sha512 = "5d742221592d1183d4f66dffa5d6993eb81e9ae2bc24a664cd41006d07975f7d9bb5f040f7f7ab763059424ec835e6d0def4ac64a468a472ee23c74c883687fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/be/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "7a3dd71f5e22c03b76290d34eab1dddb83662d80977c99580bd7abb1bf80f448a6b4a3b866a1656c0b51018b323c28f921a7489d7e10fa3ed2b092fd77463fb0";
+      sha512 = "f2e9a764a65712a5bbde251050c39d6eea91742afb4eda9de14c9d0834d66ec4db56c801771068f0f67a2a38dd634914cfd83721dd78aa7330e8f6b7089a313d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bg/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "48b75a86c8cd4d288ef7b39d2a2998ee01082db7c32767c0188d6d930362e0ddc391062d69b2dd420ade553d13145b0f11233f85e68de27469f287ec1a788b73";
+      sha512 = "87e2b22d6c3d8050f65bd740c10d37f30905091f25c9a58f90f221afb2a3063ba0006fcc1f69ee05f168d6bb7c5222f022bfa5efe0827e7aad00568867797322";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bn-BD/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "065841bd9ce5877c7e7c9732eedc96a61c424ed7d1ad797ae8411f3ab8ed6d24f8490f067ad96d0ef77af3343a201e3cee8e31e6b9cb4589969afcea03fba6f8";
+      sha512 = "9687868e5f87282de362e1d2be7b54c150994f33ad92dd5cc4fa0cbec1d817b36777b8f0b95f50c691b20b83f8b5c4252ed40541b4fa6f42a6a10dc8dc1f8b45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bn-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "7c11742660e36861c6acb0d4022feaaae13ac4d3ea3c3a8dd0ed0c8634c39bd4f36f893ffcaa8bc7170a03b69fe98b8a426722ac9d394a3b0ce6c3b5ba00036b";
+      sha512 = "593c1191094b080a76c834f18c63f5f64193aa1d3b48fe5788288214ed98e90e4736f4b8ac413982bd9a793b39e63b515c293abf5822fb9e3b8a4a05515fa667";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/br/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e3b15b6c19340b8be15c72c926759bece00e26a1ff82c5fb0ee7f6a92e59c075af3cee82285af7ea9eb666c087193d6b19048043ee84cd6fdb8749395785f3a4";
+      sha512 = "74681ade8b802805525bf61c27a2b604afb584c0a9eefed283eda67b46b4a2ddc37df527f05d46bdf3b650a092eefb600ceaa683a477fbab80506ca4b1ba48a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/bs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "ad8ee06512e4f9a6354284548359c6f27915ab10d5ba171ca16ca2f928a4fd07a586d6db8923faeaba18c1c2e8f6d62a7db36bf124ec8d3e3e36879b131f2800";
+      sha512 = "fd43952d81b426cbe4151e091b3106b539211f9fecc390037e937388ee28ada5059442698ab93221635d1d1454fa00660b80507d10bb7d0bbbb775f3ccea2957";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ca/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "e34d1c3c85e41bb8d63df460390473ede1f5591b1c261edcdb15fc8e2b892b4899b82f5a7de77ebfdee54c1dec78108064c716d36c221cd856b98ae79f5f5e44";
+      sha512 = "03a312d7f7366d0b94fff50b72aab8a89f5d24e060ef14cc63933b08e0c9d8134bb2679d9d8435ddc18839383edda514dd9be5452742d340938f32267371a08f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cak/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "53ecf3572525dbfb1af987ebdacb2b2e2a6a1e88ada6974f5f831abb9756059006f63b7980cd30d18ff1b803db395731f4efb4de4d8f6fcaf2d52cef3d37ef29";
+      sha512 = "f25801ceab9845ee8879f793a0c217247556fc965bcd9961de22d19ad4d0054aa7a3aeba28b09be32d0cccea12b799227809fec91f4c9853c7ca63d32b7a7ff2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "58c6b6878e2d519527771ae44c1253625276382aaacae50bdde525ed3cba0c2fe92dfd38244e0e7eb12c60705388e1d8d1dbf69e7f5010113fb44d1a466d0089";
+      sha512 = "274d46dc058e017646bdde4cb5a09e703f390a75cb4a17454fe209e5165cd1ca8758c45857a1c7850e084d0e2110e4be3544667e8276ce153b710465a8a9f188";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/cy/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "e1d0316ccf08dd913131fe2c0c7286d8bd0f76e95103c2b112bae5a93f85f2860848a4e1fd48360be941f6ac0204b9e9a5d47371b6a8b0a3960eafdfa9a32d52";
+      sha512 = "3abf6cd33273e42ed501bb913fc6784dbae65e61dee4ce69808bf3f704dc3613f722a4b030a0f9b9cc6a09a673d269238d8c9eec18b23a2b4f8d9a34bf32eddf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/da/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "a8273ee29ed1614adcd45dbe5fc78959a8bc17629dd92b1019a4b017bb0cb49ad2e6a65fb361483ec88d0124880e8d8994c3cd502d6e2d2f8ba7aa67043a9c37";
+      sha512 = "00f0af1239b2de5d4f967d46dcd5dbbbf13dd06b59539a165255cfbd5b8adad19295a2affbcbfc23cd1d8418a4e05f0024bc3f6d5bc6628ed36168b5ebefe5e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/de/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6e81e858d7933940e6866142cea5ebf1c7009a018ca322ae35ca05c0813b82b19796ab445105c9b274431aded2713d25992fa91730e837335596a8f5ccc9e574";
+      sha512 = "e987419db7b28f82a404c80866367704a37580674d012e29c465856aead83cec4eb234d265167c70acffb5411b2766ad64a879c456abb31cd65fc867c339f583";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/dsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "fa4e6ee982554045afcbe798a3113a4a1a5baadd0bf20b79d08186d781a739c9ac01bbdcad7c1e473844c997bfdab03feb590d133be5aba465eb737938f8ef5d";
+      sha512 = "e4c268f4729108302c2d2dfdf338ca30f66bf369e2444b22fb0e5b3f6a4c383d0c2e5b2917d18d661980803e930495d943197cb47aeb729c3f1b6d82be14bfd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/el/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "3865e8d77801bebd4036a69e0d5a4e7f96e676808bf8379c3165142b42ed9e2f1eb4cdf9e3aa0c1a1688c2d882b72d49f2e8ba04c4ba31da3d31d2672ec897f0";
+      sha512 = "6d4d6bba03f2ff18da53c6f7f2ad9138388a7fed7a02e54bbc8d09be24aa955d5fa1c5890934c768b1a371abcea4772cc455545e9bfd03e63b3b98240f12ee12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-GB/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "5133291dd265109496669babd12fa97685e83e7ed08b98b8fe202d2d8baba0f3fce4fafeb71a09d16ded277bb809600af792f2e8dde8a2418fd7bf28f993119c";
+      sha512 = "4a1017f1f69486d56a637ab41c7c49f4f3f42cbbbf2a2da2a57f61f7d87c2ea43e7abbddb0fa21d56bd13d72e99881fae540626a8b7f069a661778edaafe3738";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-US/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "f2a9a678f3082f85848a87cf784e774f36e374a872103c0b324b1de755f02889e844a78c6faff30109b301e1729898826a779f1f690ff0757e02e9485f23aba6";
+      sha512 = "5eabb44a30500e5f8ee52e4f6ea8d82133c4ccaa5130696cd5af1f1e61efd47a0ce8fbd94e1e9ad87c2c8d3d73b0aee23f0f1cb933ac7c14596dd6b2b7baacb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/en-ZA/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "7f5560724d00f3dba6249e4c38d61701dcf3007d1e4a2521353be771eb50fa1937bdd346008c1b912723e17a6b13708b1d57d5b385cbb1eba4ed7438e2d64a50";
+      sha512 = "0018e56ca7e476d7aa8fccc55dfed365ff28592f387630fe4d72828be67da992c23d28206e6399b942987750756ad4ef98600463abfd86442eee3a6caca7a39b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/eo/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "6be242be300413c2e9e96f233f651c19472934c63b7a850957b32316b5a387ec81f25e84a885b0796317ef1d5f413be7793f7bb98629ea4550d31d33f7c540ad";
+      sha512 = "7ed4a945cc3947de2b31e3045adfa2387e5ac7bc9c6420cee1c8bccab27e05278707b7ef15728ca0e89cfa2ac62fea0a155a0007c8f61178b56e8ad99ac8771b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-AR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "59c78ef47c350d2afe16d2d135028a9831c5a8a458582e9909f5a9e3e13db8dc9bd102b46dec06c606ff1f74b3c1c410b1bd8df2c38cf3816817ca56c32d0ad2";
+      sha512 = "dd45ec9ae649d43f7bc14c564cad8a5cb0c688b18a78296f01e60ddce161e43ee7f9f1d422378e560bd9b8b10d2e061e9e50d3173dc671d775e5fd64d5b977fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-CL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "b969bb7762821084db87f0da0ca0898671dba0ee2deb7a134065ef607765cf40f9b4858edb198e044bc8520221511cb26a55254a4870f01bbc216704668c0deb";
+      sha512 = "017d2a07d554fea7dd140d7bf22998b3aa575086fe3145503a178369187c1f3afbd45009f08ba8bb0b0885b645ed0576600393315b02e356151c2c64e96055e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-ES/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "cea1b56365a4a6fffcbce53ad3540ec9dbc9faa01500f8924c67a25828ce14d03e3a9338900d1aa44bb1b17e913f58e5ae50d8027359f6070c947bd419cef075";
+      sha512 = "f24185e0ed7eb3f1982be22b74276aac1930af09f30184ab5c6ed3d3b2adae6c4ad05dd4d9ddc8a743c4482f503150f2624531ef1cfb58ae88b10a59773c314e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/es-MX/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "864580e8940a5d6cee69c14b3483ebc27abe06cd441f322aef3102c5b38d87502f514a3f315e7bae6ded19ce2f0c8d31f59d654ff3b067226923cee70987412b";
+      sha512 = "28ce5d1cc9aed67c5ae6735e9712e42bc30233237f0597e12f4ab96c6a8119bd6d710c646b84c830023b41aef8a5bb8694a652b644c7ace78bc55381102b237e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/et/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "cf7cb0590a7d2ecf6f2286c9b2c14935a44bfb546be69985c109948e610c5ba501a87c80c983e7646420f41be27e4d4bf329242e2557a3706a40d2254fceab34";
+      sha512 = "2d73a733ed3b6c64be8de608a00b11f1ed2e300fedc5111f9a92b1c0fe61b61eb043b6b9c71eb5fc497813d1e4dad4b940c472d119697c6dfbc6106751742834";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/eu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "968fe509ae134626a51d066b2f054f604ba35d0d4ae48ccf3d56a76aa5a73c9af43660b88f90c650234987fd9b8ded64779675e18ba7b67876e87e91e2b119c1";
+      sha512 = "f3621d39d396a32cea4d3fa41c83bddfe0c9d05e3fbd02805f1b87c9bb8ba517934602d06f7cd7c8c80f5ed4aab3df275227766aa939dcb5ab35305eebf1b3f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fa/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "bb72ed23df33434b4a1ea1d141e4e918200285d0ac1491376c520b16436e1a22ca04d391c8fe22780aca312962807c165dd2aebced2c1a2db6de95c51ef15c10";
+      sha512 = "5cf7ae648c8d6db5d896a76183b9f06275199db489dfea6aa2c28bdd9377b22a5ba4fee0931a2c18c22b94239cda8d972438a63f2f6aba867051f8cb0152965e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ff/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "5d68fbc01a5d55309af596520097b863dc670b51daa48f0fc03a3bc593871b68fe67252774d7a52c71932a08d84d8faa2c42aba1f48b4d26f765fa34561b0c34";
+      sha512 = "301de07712dc015e5b769aed8247461c8e15bd16955621a517206fde83c6c4599ccfb654e729b3a22ae6b51952060cb27db7b315f566b670d8c2bffb514959bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "eb669bc4c743e3b4ddc241ea101ce1ca7c0e68ea80046ba15c6001a90bbfe148561ebb8d32cc6d353ceae12772ac4ca600ef48f9ce3f4896b5a99842a0298829";
+      sha512 = "65b8949e7e0ca1ba596c7a40e75c3c463646dd72a044d989e68caa54b8aeab02403870040b7a27ec8811adb62046c3426e38038241293bc5e0308882d20d1077";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "bfad13dc2450ac4e486d3e2555d9056a8ca3442f2e215fcf27e86d3a70dc78b601c711f47a70e75f77098a2f4025d0c0b49a1a0e82d8635efd248ea8f2be2abc";
+      sha512 = "b49589dfa85defb758c71f221f309869239039b5c8d30d40a6857d4e92e3113741a8eaf6e55e073f5a9bd212030d6497c05185c220a3249ddc2a4a6c6880e3b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/fy-NL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "9e9e7532aaa30467a080cbb7fea380ad25a244fc17f89bd0be04f73508163580b7fae1b6151ce6e451904cdcf04b389605883a937150cfbdba5b20e9521b5207";
+      sha512 = "a17982cc3590d552f907a3f9a5af3e0c3f234b40a1ea285e6805cec57b793645cd79e2c37422a2f83d1e70617a1b5a4f87b5c315d9fbe98293e061b2f836bd06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ga-IE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "580f5e6d0ebbb7baa80084472c3b89817c83a674dfb73f00949648d42c8c9c327dace1fc0162d389e06c347f0a0fade4fee906b80931217662d59f1f1515535d";
+      sha512 = "a9938d962796c573099a721a3fb8a4321378ff532e265bc4ecc3b09fc41268e236e0726e808865f4c655aa7f88f1f04ab1e73930a1a9a4a9d634af1bf8bd55e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gd/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "2499205db938c19f749dfa303e859084d6801f86a384a5e88be0e9e0900863e1970bb7314929ab8441944b8cd4fd23f2b487167c7803ee58ff4a50da4af371de";
+      sha512 = "a0f4a34628d805ce67b858a7f96368637c90c126c52e7fa26e540483ca201ab02d734770006ea1cf2c960f9cf614b9f0a326ea74a77c9e0abe3a23f3d6acbb90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "cca1a6adb4096f91abffbcbb1969322d8c60a53c0fefd8cb98bfac1c1c324134a7cbcea53fa15217f41b2c54893f1dd26e4dea2a0fbfec9bcd0d7dd928c1673c";
+      sha512 = "c87b8d03a22ccca2d57339797182ec37adc12b40bf4b83d72120b76792cf28d373f0948fcf0a06c2e983255951a026f207be8153169d4d61f493dab8b25242e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "8484312cd5f4d38babbaf2757f1b0548fa0a291c1de76e751bf0235b67f1fdacc5f3c6e4d54729a91fe9f5451c527972346d36adc0d80bbd110ea1c0a0025b85";
+      sha512 = "20d20ed92b7fb5fa440b39c449000b391ba85bb3a4e98164c0529c150535cc992fdc7d3f6e8585d7404976e0a1204aa62e43fcad190c3999608dc6c5e9233497";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/gu-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "019deda9993a2d02cec8577f5542cfe247c04a4c0a7c7d6faf65cefb1a8338ed86e24e51c74e6ba30a4f5b6e644655de9df1c99584172ea51e07eafddad65f6c";
+      sha512 = "c97905b3a5e3ec660b75348c2f9406053be2536600ce25bb43bea507aeab7a3780c8d2d972de05c17f605ce3a728d6197e1f762773d8141576c1e3e367f44250";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/he/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7a5285965e37b112803f0b533c8ba501ca70a9fd09ffd1e83e630174c4966a21d53f6c6054e7b60b76818acd47813a2062fa9f986d11d78c714c127b0864de58";
+      sha512 = "4a89765b60bc1c82d06f503e62274b266520bd1ecd1d3599074351aa825a4280a43ee05b8cabda9c6ff44451b09e02006e717eb5791942ac9989d1be79041655";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hi-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "6bbc86f071ff51ef1cd4aea468ec2165a6ca991ecef2524bcedc0ed3d25c7b3e0729dbbfe5df3c236d14d996629824486f064d554a0eb5f89f46d69f3a8d61a4";
+      sha512 = "af73da40aedacc3aef9685f5916651564a6e329e4e1a97eb968373307d9f4a7d8ce81f72b770166395305e5dbe9043478d6164f89f40383b89e10dc3a2c5a107";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "924ff70afb07ee9379c202bb684e7ef85d0793fdaabedde7c8889c0eb798c64cb7fd5a309a03abd94cb56e4a194d9b7b9f7a212abef4ed314d1b79ef4c8f0433";
+      sha512 = "ea63038ec96426dccd9b8ebe13ff632794b3a320888b3f6f152a06a3c9e4fdabcf6f600351e5012b90ec924ff4dd9826dada493d0adbce4195ec9995a333a2e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "4e6fa9f275896bc32e426b91aa5b26867a27f52dd767e030872ca365ba56a57fc4a0df7ab877c282113333d94ac3a1ba0159fe8563f45d01650fa595568bad38";
+      sha512 = "797d27215aa0e77a40b582bb7f2f45a1411d8d4159bd61a55fa72023c27f514d916f2b1fd5a2b89c240c1ee0142f54cd2934e4cd641f616d2efb6ec5ae31b98b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "13593a85271fe064f0d201d14fcb830ae2f9ceb965b4b3ed1f3a7f7c9a7a6b889bedf551bbae07a385b9ff97a3d79e0f9081b1746d00c827af3c2c20092fe965";
+      sha512 = "d3295470724ae625f603db98d305dc67964154e86e7b28d80bcc688ce87525bfe33ce3d60f315f48f70c09c1d1301656a46ac2acc8b312a430f625af9e2417b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/hy-AM/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "a8357f7eb7ab322a1a5552a8852772ecc8bc36f8509d1f165aa226442c67d00649aac802ba405e1ae722c957b6c3f6fd7c2d546db2968f28bcc2c9a7e9fa7ec9";
+      sha512 = "d9d9094f4cbb2f5659b598e332256bf77ae64cc162bbb8e8998e2d723ea8f2d65e3632b60a358e9f2e753cbf877edc59fd21ec3d3d99608bfd9090d24957d641";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ia/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "b370703f8984192be45b07e30b0737ab296494aae0a9a5f3f31f276beb9548dcea441aa245cb1e12ed04fa9ae11d2f00a699483e02f8f47f35db625faecb1f2a";
+      sha512 = "c9c38f5bad724e4436519f01f0e25c715e7e107792ce9794fc9bcf7e9bbd687331efe004b10f18cc942f668504a43bf52ac2005d2bb663b28c99943dae8dcd01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/id/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "e8bf96e09bd1c919848fe86b87769fd7d60086919f71b1f92896c6d785206c9fda2e7cc57aa79234765fe55b29575135d05db4181155b8e7607c28d3ad92fa4b";
+      sha512 = "2b23f50006b2bbc66e79851b91dc62c948b75a00651d294afba17cf124f612c3bb2d39e9f8a56a74db7a8d22b8487ca7b600a453949973e1776be50152d5fd21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/is/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "9668851619bb97b32d043032931bb0a0f1df8f9cfc35a308594983a32de504a6a64830d265b46bdb30a23c58fbd4c7e6571a042e44382930d183849880c1ba3e";
+      sha512 = "237882a2ec8d52a77fe533866171578780f74edcf790fa4515fe98c804491f86f76b99c645854778868e9ea58ac3b2cf75d504479d0c24fe24911c795e6e5a71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/it/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "fccd8388e7466ed46aae6d157f3baef23d742ec797fa26a7cc861da97f19650e09f8ba5e94aa9f9ac779555a1c7873e0aaecdc9bb691af773767b55ee0b820b9";
+      sha512 = "d4e20f24409f05b541d5dd556b1270d609050b650ce708e2ed33e826ddea1c13103b2983bbec34ce51c52b7f2471e3c451775d6520da34d17b2274ef1db07fca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ja/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "6d8bb09d098b94be37d41d73a6587885240f15b83094714adfbac8ed595f3de4ecc78de82b5516270b57ca093439209a3093b2e737b2d773984cc3a28e8e27b2";
+      sha512 = "f3c4726995f3daecfa23ea19623e9cc9c9fd3d90049176f16f4d68a2a17e6890448432c827fd6c1b9dea09787983cfb3e9d89683a05923e6b4b23b3c67fb0693";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ka/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "902e6cec903dffa2e3227f8cf67b472857145bfca6e228a896f14fb347707b753beef3a2836be90e0a17161248adb7b916b2dc9dbf4f780989a09bfba757b5d9";
+      sha512 = "5e6941c9a3a2582010b95c45dd7b49b6dcaab47e54e5ca67e7b3956729c5ad5978dd3d4ba4cd28dedc9d89592ca95b895377803836214730e9f1f9e5b4da92d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kab/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "7ac062a6523a91dff3573a9f8b664ed85877ba1d192baa196cac1e3576ca285c2368d1d5582a439b5693cffcddbc08b35ad093d322eba7dd8181c4ab797c4ebb";
+      sha512 = "1a6126090610f906731f13dba405f167935a94e9583ffba4f08242b3882961ebb91de720a23b39ec3d84be5213893a9b82e2e9ca91c6cd70466ac7ef1bd600e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "83ba96c3675c4cdeb9a7c661c73314485430058280118ecaf2135318c238ec78ad88e6e09e2c7cb4c43f4e9dbada55cf010301b2b1b6d1b49355039e6bad9763";
+      sha512 = "bc638ded0b4b14c0b347cb5c24f0988ce697ab29ef08f59633123ca38b056c4f7bb0421a6045835ec0875e663b9730d17cc7f7ddd8bcdc98f5a60cda61461ed3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/km/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "71716deb9304033c46b72a277aadbdeea99fa936fe63830df79fad5e7a79f76eb9527cfd38da5ece4511fe19fdfc32eb301877a26d590b20d3c3c051bece2496";
+      sha512 = "fde6511fad810cb5d71fd1fd0864ac7a40dbf4535416ff127f7b12799ee9e220e3afc93fbabebaf8d6cbe939e54692ed3edc5a381fbb9a693c393dbc8f970e90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/kn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "2f296eead5f73a279309d68aa6d7fcd433bf133861f158cf6c24a766f28d902d00e3ecc25df07d51794706461bbf2bafb4228dd61cc3dfa3baecbbc4f967ee12";
+      sha512 = "0b93c21e1d0c99b89393f8fd155d62a4c72a8c1ae488fcc081fa0895fe91ff056e44e2405e45f4a7139e9cba79c5cd6ce855f614f40457bc9adc6d592dff6936";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ko/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "51f4b2409f822b1ae357f194fb308e35f6436dc0319629a436c03b789373887eb0cf6f8ec2d11c005f7d63a79dfb035e8661d7833cac083648def49d1fb1acf3";
+      sha512 = "cc33a59bd8b5e4d07204fe2dba1135c02cca9ba60ba6439879b5dd1d7b32a21e9d5809e57345a649ba5b964567c3d30648508c1292a84dc381e747ad475d0058";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lij/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "19a2b183bd086aa57e5dda573e422e3721fdead13b0ffe62beaa1ec437544e6138747a5ac22d990c772bc75b58cfd69cfb218f518a6fe01c3fd375ecf7ca6373";
+      sha512 = "6c9b8db39a70abc07296597818a60d4a576d2bd9c0231817e85fa17737d541434cdb838a97011608165c1da759d5b9d295eebc4a790564ba37b56c201996db3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lt/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "36ae93add3821233d16fb3f9baeffcbbb061f77824f5030043f1f9b3222e7612afa227022ff7ebf05ea5760dce1e727777f148c77d1eb2e4ba2e0bf35adb4911";
+      sha512 = "ac1017981cb75d361d1f8c7cc823fca38303c39afbefb3ff87d48d95baff2cf0a4dbc9863dbd55fadce85949e52e7e61889c05cad874686ddc073ed6e5acc228";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/lv/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "a3474036735619ef1ba34caff598f17572b32ec1138b2535983055dae6b4969428ce634930e2805b25d5b5a56a731831d681f12a6506429fbe1149e8cf57e8c2";
+      sha512 = "f5f1f97758f00c25f39f73b8e52a8c006fe653ceee232ca27a3e69d3b2abdf6316c237b1944d26dd39b51300aa72cc20c4b3d304aa6f1446a96b6165cf4f8757";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mai/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "185f3e1953c05a496dac5027e899054ed376a09ad0c08c88f183c4f91b7210b4244ebdbfa224ab88f7e695998faf50899551379b30e7ad04ceb2c9938099df4f";
+      sha512 = "9b1f37e9d97126cf3ab5500c6cf15bb161a286e0d878fe58014a7b5024942b944c9282b9b9e9c3587170a12d7ef69095e21d1db729c2b96db29c97b9dbfe9a42";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "4c04cd14c893461ff87ddf5a17955c5a80eb5e9ce929aa6a37204530f1fc10f359e9af451918f98d30fce80f595a4f14498e26c07b48ad0dee6b3720f72842f1";
+      sha512 = "14937d2fad302f93b0011037c12298c7319a1020f5e54a7c54f8ca2278c5a1d6517fe0732292fa0b84edbd1af089c67f41d6651ca918c677d814ab537bf52126";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ml/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "304abcd82e0bd2e0f0e2cb639558340f3424be9485ee9378aa8d59db49aea096013798132df26d14c0fe83529b211ab40c5b708ac62f117969a59d0516f2a3d7";
+      sha512 = "61db659af8241ae107265708a50683aabc1a920a35e6f32bdc5559de0e0aa5409f577b4ae5d49577ce37290ad5ff3f281f3b8bb5c775c834acbb364d499e5be6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/mr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "2f05f7cf18e4de46cbeca27910bff036ff34c4564f5ab66c4830f2e8c6a2d016fc87d700d2085141e01fac19a0226f27b0ab467f4a4146c1a6bb54fa549030e8";
+      sha512 = "2bdbdcba25483797d31778851b9e611ffa15c0f2744a56a8e3447607bb83be8fe179dfa7b3a7d24f017fe34f9f38dd8d8b3d41a1cd783c34b9ae1c4929571ef4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ms/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "767328afb8582def36c31911e5bb798acd19b2b47603decf6e21772626e0ba1fd139f9a79c2bd6a79f56b84480f2ec3564506db84841a6bbaeb95041d4b192e4";
+      sha512 = "19a4552318668d0e11892ac4b4fa371c82e72d0742ff26b63a9c6eef0949af261c352777feea41dd6c17e168f868652e75c4f56a9947dee11886d264a402ea06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/my/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "f68de98e766df5192a266dbfe9d9cd167d6ed4f3976ab58e768f8a6939d36f6903004e6bf0e09b8304a4a30cc0b36c084fb75eaaf9084804cae318727796c4ed";
+      sha512 = "51cdc0570513a3856c4e13f30dffbe7a55c30dd6a88d47528637c1159520180aa6516136c1f066f37bb06f79f8326ded3b3cad23b0f244bbae11476d68b3dddf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nb-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "fb1a96d11944441f8e7e74c8efd55d59d11ab3c38f446dd8ead4729346a0d8030c3e801debf517746fb78f338af0a178d45045e31d8178fbc1a1d9704c33f1c6";
+      sha512 = "afc8732c67674956ecf9e0678d9459ad7328611d3f60b222871444c7f0a55989757f6eb230157c2bddd5833bd99b7fac3200a8a233ffba392f1d028f3d52b5b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ne-NP/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "e4764fa38c66196bbd7034bdc7216ce43b9d4d0ad550fb1faf89a0b030f3781605766d0ee95b67255656b1eba40825def39a25cd059e74bac558af511cbc6e1c";
+      sha512 = "4b7acb27a1dbb9982c624f3bb5b9d97add88fda23155ce4a8d0f6436e68a9073ea3df571f61e186a473c3c6d90e0af1f43d23a2708d04192f206d3f9d9c726dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "8177521f43ad209734de5903746c366b08aed805067b0a195fa19c8d134527f8ef4226b79be8f603e96c451816511e2a38961e694e0a284ab54f272bd93b80ab";
+      sha512 = "4797e5748f46f9c8939e225011fc42a9ef800cb1b1e26a875d59212d7617aa83d9add3222f51736c3be8bf5cdfa2668c16a89997f07e135438bbee936cabc1c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/nn-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "a62c38672ff3ee43cafa8d3b8f03429414578f0a1bbe2cc39e3fc8dddd5edb430d6f12ea6fd40811e382694f925650224d7a59f27b3d5cb817e0e51f77c3c918";
+      sha512 = "dafcb551c537397bb2d9198e1f24bd5ea21e727c6e35467782ba9b1a4a7dda6adf8fe5cb1f7f42d7da701bf3f5999244de5d3dec2cd16331277ce0c0eb0d93d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/oc/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "8d406f76157a5b8890a7d6b1bc0bdb820acde82b29aa4798d7020e140b336796e0ba309186044de42ac6efd3bb66b9ad8b9f56104376d81e3b0277354cca6aba";
+      sha512 = "447e74560fa96521663fbfde6b4f7b398a1ea13a2c2432afcaadae3bb84256a38d09d4af43bb2666f80dafe3df0cdfc1d8470efd2de7f8d5d0928cc286f4c86a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/or/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "2c23189d5342608f39d05342d9070094e2485bb11067e436da5aab307bcfbc6e4c92ea9ae28f4cc707b6171e2f708c9f0e6aa8e0e32afbfab592f45766c5f642";
+      sha512 = "6aa674a480e6d742c3309649d464845d6bd5654115b7171bb0cc5f48da05b85e9176c6ad20f58cc263fdd29e9406e3090b3061f702421c2563f8addce47827b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pa-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "6c586e3c9e7c4b10505fd5ba37ff4188415e1566b456f6c929b060e44f09151b9ef9bbe9f3bbacc36533ff6789805b9e007c7a32148e9c9517053ab4e20f2225";
+      sha512 = "ebecec7d84d7ef6e84d2ad4377cd7d0a6b4ad12187655ac026df6691824b3ad1e5ae2d463939bc8c774b2d7d17eff00783083cca68436a3fa8cecd18920290a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d26f54ffafeeff89e91e826614b4f55c8a78cc8a149845c5700fb024e20defdae937a2a9dd75d0a156932a9b7a13f5b39666051cbe8b50827e057400b8eab244";
+      sha512 = "46a8745147751200c6b13e10c1f41db9391cf066ae3475e0bee0de11639f624322a087ee73ae6c19c2236c91034f1bcade605ec7628e24c6104e83465a97baab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pt-BR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "8ec8ad7a5bbcfb9c020511915c07fe891ebf3e7f88977bd8a03e3a9020f9293122f6d3a6d257fd2867a34ed257e74d85f87e65490e037d28d5eec37d97ba0cb2";
+      sha512 = "6b27353e212369d04c96d83f1b62118c08cf918060ba9d46809c1f3cd1141e7cb7e7e6662216fcc29f9917e6c24914462bb1406623a312d07fb48016fc705410";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/pt-PT/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "0ff4e05427926f408ed4310d63e01b46ce3b7ca618336faa289666924a203641102c02ddc3b171b9ce964bd7e7fb260a365ed1ba44c37e837a14df3c0bde7c25";
+      sha512 = "5c7d44900276a10edc396a9829cd5ae581b9705627a8962ee9597a3b3bf57efb15caf054d7ed3bf6953c0f064a9ab29d1787304523be1c4c1ca33a307ba4a1e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/rm/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "13465556af41b81d328b98a38361534dc4a4f9151b17fac0d20121cda3e4d5d2c21580ee7f1e966fda8e910dd26647806159bb7f556509a13dd456e22509e44b";
+      sha512 = "3d5e35caa8c65d8c6c9d88d0219d146d354089a5482f94c86a0a1a8a753010ddf1617df93d53a9eb476c285f7424b17b0cf8544fc6d969f3d7a26cefe858c8bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ro/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "1c54f88ed76c1c9f3863e67e4088e823dbd80c3e696d3b480a7bf15022b5abcde86b10953df18ba667d0cf9c5a264c4b8e59cb1d6031e937562c6fa207071013";
+      sha512 = "f0ef50ea1caed890483c5a3496f4ca6986ef4ac526620c110187ee40766f6e1cf59d718d0745fc35c392d37ff1928a22f243a4d5842e81a34b84a63c53da6d38";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ru/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "4583bc0174b8e7b98f882571bdf0d9502cbeb5c2e4a44473229653c383df30b78beeab446d299d465425c7c8106642b6ad0672a436a9f74c76a3d4e131bf645c";
+      sha512 = "e96f335f5142a708b55ffbe4327fad650560f66ca96c260bab97a02e5c6ec38dcd6bce61b37447a8d1029284024cc9a6798df35554474dc38ad59f29fa85224d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/si/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "66acf2ae9e2db8702085154883a6412ad1b15dd830b7297a1bf489a0b173884d54497ed5a91cdc1e11e179f8abaa0ce8cf2953a180febd3b6e5059468b2fb496";
+      sha512 = "80fe13bb2d037f3082ff02dfa764f565213c3b0d5a98617b6a290de54dc655ed8838522653bacbbf926e0daa34e5ccbd60198779996c771ced10030c46da1dc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "61837b2d91606c1d6c54e7e955843f1914bac69cdbd99558a25520c05a0a0c45b80a90cbee17d30f272cd969e352f6e6511cbfdb0734694eb7409f603a7c8114";
+      sha512 = "1612da9f841cebea951f1ae8b2f80c897eba920fd900748608495ab154e9443671df9969bad9923715e41c544e8ef63be3e998c4ee879fb58355234612ffbdfc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "2d8b99bae7442394760fc1100456d2bef3f65532217cc554e2c064622d7e1b56de1ee96114b7f31c7098afec3770a8ff4f7bc7b64c2cd4b72b2f41ff2a80ba89";
+      sha512 = "548058d77bc9d1076c1eb21f0a01be7fe028debc78ae083ff502c213bfe7776e4ac8480de6cf7338b80dbf38c475cd367564f1dfaa5fa8cddb5cdae0db2c7e22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/son/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "5850028adba338641444a2fd62bceda5f03048321f70b3ebc090d362541b23e4900a2a37d5fd4f22ffeed422a63b7fe640e7aec829610397f2635de1e75ec1fd";
+      sha512 = "7c0bf8c58d1c924245693cc02ddad3b886e94af1dabbdb3ae9344700de612018a75f233003dd2df698b2aca99b9ec4632e65d16c68980955540185842c9b8af2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sq/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "6028d2498f800e0179b2102fe90d8217f719b9c00aad1e03ce8f5e593fab2467c628b2f9a60e643348f567c242bd6e2b600d989dafb1a664ace0d0aee2fa8372";
+      sha512 = "c287e9cf132ec16e3e8427854941ee89ead1a29a8a68a92a7aa35b615fd2b526db825a3c66dc86f30dca5d149c2a5afc7c254af64225ae7145718602dddd631f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3cd1bdc2a7536b5416e81b8e20617de047907a7a7b80c9c3bf2fd1defb5440be72f2102d28159b1b8133f2b2669fbfa765afbe999936ab7ea4d1fb8188960037";
+      sha512 = "b06eccd2835a050c560f56dbf94d41f455b62a8407c5196cca44d7c9237cb451c42a4ef266e5e9348965b01768f314ec7bc2f437ed896e23100caba6f409ecf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/sv-SE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "d9be8928075973a22a15c2ea9fbb10968e5189fe34b13924ad6c33742e17c9b6c493d484024e3a1d3b1529826f129aa308e13549675560fee80244f98bafb04c";
+      sha512 = "5747c1a9a1476ee6f6febb645b5140b60e5190eaea606a1edd8421cc1b66f6c98b710a447c6a8ed1b6730b5ce8dec47b69bf28810e17ce8b080624848618add0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ta/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "86921b7228c6f2b2aedb68299ac21e22c82ad4fd5b55e428dae00e29f69721dff52060792b396a0f43b3ad6a571d977c87f7f3d420b52e665fff42e1daec95c5";
+      sha512 = "ec71cc4c702bd454ebab8028ed810fa51889d01f1b0d34729fbab44ce5489bea031f3c5f6ac5392954343ce050a96681d043406f29c10d317b976b5e3d0cd8c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/te/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "fc2847ae6864ad852791edeb2d2228a1d5484052c87966c9b29b3471218366d74f53dca4b0564f2206134ccfb5bbb39fddd6b44fb6b53ea7ef1acb7949668aef";
+      sha512 = "147654e7bb5df1f62c9bc117d2badf0e3a92612b79bb660ca09658146644baac275a7d3f6f643f751bb585bef867b9ed23ceef55d72e2d02f1ff4f44e076e0e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/th/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "61e412edeb4bba9c00cb853cf953c61c5e669b2655d08990aedc4388ce3a836405b0cc805a6c4b5e6041f6f1657c3586252803338f85e9f1c2902ef1187802e8";
+      sha512 = "baa454a5c4d8d7994a49c8cefd015052b0f3af6f55e15a721ac00e8e7108f83fa78e5e1e5c90576f0bc508574e2ccbf3c72524192a310b29e30a430e5928b8a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/tr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "c0e9cdb54766e2e05bd124a71d68b8023834ed8c701b721658bd43e27b17805c17a378f645a53710ea800752149d7930fff14050604ddcf6825147347a56ac6e";
+      sha512 = "fdb5eacc20856b0735ba8e9f2ff47eee70e6c203b53bbc38cf65a4949ad939cc70ab640392bed4c6964bc4acc25c0351b4d9e2ee2b2d72f6b2ff3247eaa8e2de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/uk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "b8fe37b1922275e2bb717dac3ab24f5872bd1b15d48120504b018b28319956ba6a4d4587a9d87b128d7420fcf19fa09c0821fbce21d0136b35882aa3e2586e3c";
+      sha512 = "7da1522c7af4e9db8f3fc7a7a2fa30ac12a06c8c20d7d53e0a0097ceaced9124d861d688b6ef26e8f808ba672bfe12b2ad3e4ee5921a0771d0348bf99a5bd1b0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/ur/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "fdf65d54545271e79b118787a28a903b130c17569cc763d495c62150949cda4dcc6c1697fde0d038229a7cdd8c99f2d43dc530844f2ae1b75f87512901c763d6";
+      sha512 = "a146f736849969e36b72f69661da5d50cc3ecc79542ddf84e09a12d9877b6d654734a22d28a2320b0e27c4443f05186bab2549f55e582eb6f2279bb1922f3979";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/uz/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "caa53302be25bef37d7a40e3853cb175eb68a828abfc1e1f8562cd69312f785b9e7e853dbe796c758e01fa92129937f0625c7eae3aed07690395a92ab845d3c2";
+      sha512 = "62bebbf542d9b2fc62cf0c9e4abca1a216c222ca97bf59d1c5639a04cdb13a230e80a1762af6f682e0bdc7042685b9104702810c2199bb4ff092e0a63b81535f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/vi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "cfad4746a9357219a29f9d55e455e11e7d3c49a8d231ed18b64e728edb44ea3f5200bccd8b2115bc1e00cefb73a5a74af4f9a23aae4ded7f29d8f04678ee9f28";
+      sha512 = "b3c4477e89ce0fffaa2f7f6d9d0b64d5ee6856e4a40183f07f87ec10393f73041d2c6d87a3460dd399f8bc96e11ca6264af0599e869b5d87da0e1415d5853b08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/xh/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "a17d844b4ad6498c7b7c937d674f2129ad365c59a7178b9ed51cbcab6695f08746949b485c02bfcc72916a0a37b138aa9fa651897a5719504050783901f78ba9";
+      sha512 = "0b0faf13210802a911f899a0b5df4ca67bda2eb98a8c37b43f0cf9f9ec5fe9c7798f375c6369c5507e23e45f772c7f610d048348ecb18e5519f5796342bdb46a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/zh-CN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "1a2ff744cac644e67aecaf838f5050324dfe4101842820fe847e86e55c3d711f661b59ceac1e7c3fe3d648576a93591951a74be5696c820956ba712418c3c52d";
+      sha512 = "53ad88363b5c884a7660cbe0aca223e2baf9f3fac49b6d4928d7744be2e70d4feb1dd4321283c76fb4375c9b74bd5ec73511b43c165f2a3d032185d25b92456c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b4/linux-i686/zh-TW/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "86e03ba89c9918542305d35d18aff083a8e618e741dead7f11d7a01a05ff5addabf8fad060112b6c2cd5ef0ef7b3389fdf02cda4c65370449b2f4049049407a4";
+      sha512 = "8c1551b2bbd07e046ebed7604c0e64d5764af28f94a628b6cba3c68d0258db3f26810d8eb9755013724530a5656e29e05f012fc3c0477977dea079e02a755cbb";
     }
     ];
 }

From 677f40dd10981df8c266ac68c8d1bfbafbad3036 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 14:24:34 +0800
Subject: [PATCH 1913/3370] firefox-beta-bin: 61.0b4 -> 61.0b5

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 2ac0e9c1b26c..60a7e77efc0a 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b4";
+  version = "61.0b5";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ach/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "1253b49fcb5705c5f35ba972ef6949cc9be52b0b509c15f1ad3197918cade88df3a69c6dcd1ba32fcaecf5485d0e614b008a1e05adb5c0675de50345cb2ef7bc";
+      sha512 = "720e57f7ce1dec861b50fa556f6d8569ccb8bd1752b9e25acd1001d772f13c8931e4e922736577af029ab774ccffc6accbda1eb4ff8cb16864808037cc6b4700";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/af/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "0668158d59973ebc1a6701066bd736304e8cb8d41095aef296b0a807eb0baf23edb1e399605c097dbfddbdbec191ad570d56a92e40edf4801cd2e857d03fc8e7";
+      sha512 = "a2302f2f3f604ea3f41f6a2819ea6277b10dbb4d81eaacb754506c8938fbf5de518d5e35004137cfe7cf00d36be3d7081bd7414041266555c06e7ea23f17cd6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/an/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "97f9ea677bd851dfe37d5d4f1fa54f0286f5245a7f13924bbd576a1c6ac19f14c96937e78c3c05e3f13cea146ab91d4e36c8501cda2026663f09536e12e5af80";
+      sha512 = "0b3fb243cbe4d1fd08eb293bc1abeb1ee87674f7e7a189514a988d8bd2d733e51b29537cbaf1bc48f3665d06004740a9f4eebc395e4ca3a4a60b3e464e2b9e93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ar/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "85dc5ce10e6aa418d5f035a53cc392230010a89a3994579d40b926d5e2d1ccd41ff14bf86f634212c49ed2c24a10558e449fd82836deee2002039330b1b5baf4";
+      sha512 = "47a80e63a76a15a689615c5fcdd9f4580854de0645dca2fb234f2f7737dcb8047e557ed64142aec6a8e153668f213f0fb28866b122aacc3e7376c6f1929797f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/as/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "58d67ff5acacc6458d3ea24d017185a44072d2552e664c9d5867fce16e77c679a3f886dd5e680a12f0a09e77af82d50e375f43fd724dba10e62c52c9611b300c";
+      sha512 = "22aae0b42b265b5be89b2d1557725f4b19c3be5f8cb5fd0d65c1325400073a7606bbbd4e3f57851d4c8d433af61ecca81bf19c25b9974b04e3422ed8187d7313";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ast/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "c1cad96695ceed2c9f8461d3a00c7f4c79064e79e808f0daf3f7b240c7af3fc076dde7a5c70b1ddba4b6291e51658f11937c9155c1c130bb9aad6a2bb83d8bef";
+      sha512 = "3d406553eb53c75a61bae3b62377c5d15b42b64a64e84068217a38785b39785927edd4f1363c5318a07dcded215494b1622e37ba96732c001258260733b2308e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/az/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "8340347da83edd0d74543b7ccf8add125cf1a3722d182753cfbc5270b350e0b5268925b17dfea35ca565d360fc9fe03e1ba42939df2ea342329639eec98803c9";
+      sha512 = "0764176093cc608f6e0b9c521e50a4b0fd8894ac642ce3d14df884c0460d6df2f8fb2a9d61cebda475b9d7000e22bba87a677abdffbf13d0ad0b89a4f004ff8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/be/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "be2f46fbd814e464d5db068ce0d5c3f1f5531b90c13c8b420813559f99f9c511f1505943dbdd94bce01dafa7e709ed6fddcde7ac13d9d6e7b28eed56062d799e";
+      sha512 = "a282df1a9cf4ad2fa061eacb2ca49d91d599c6d98b13f7fe066649d6060b92a8a15c5a823f6a1d945dfe4c4ab1a2facf19b4acddbe614a0bed5f704aa717bf84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bg/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "128835294278c381e4800cf5fc4b572e2ddae72f02f6f3c077f3b1c7557eb106858d3c40e254fd328a31d5520644bdc3263deadbfd2cbf31ae6092a5ed9d43a9";
+      sha512 = "7b3f4ed2c2c29c9e804291930c1af962edc842f567b2ff1c17aee04c9e209e3cedb2e462d8bd56f16bc2d9536e30495d74368f1c89a63235bf5db7c4bb44352f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bn-BD/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "205bfe4d02cc73560eb11ee79ff2f737ee96a3234e62589399adaa03ea48cc8d0abf81567536f7fb11dbe037c751ef317a841fde5a2b1a6d29fb9a0fdc71d05d";
+      sha512 = "92881d1c03a35dcbefaf5f66185225f30c83bbf95eabc5c6219dd957747abbdbc8bee28a65eadc474df54063f2a85bc1fc7f00db0de92fa2de38221ceb504562";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bn-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "5d4c5b3f7b025b77089246889209d3f7e3c0ca924da9a6d4886ed0c96d437c7c47452e8a2cf3d030ad4e4859565e3b0cb18ee1132852e1460bb1529058cd4198";
+      sha512 = "73565490419a39038efda09122f88b1de5f4aa3eb716ad7e984b8c0b86ae4c02901c4f9f10782bb8ce63af90dece08aabe3fe8a98b04367dbda46f5ab53311e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/br/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "3d6baadab9b20598e8d4fb604720dfab67eefb89e9e9d58f220a8b7165f8162506e19ada83d0085349a63ca31b861a3b6ff1df4b15436d2256f7591db58ff3d1";
+      sha512 = "6c4df94f9cc3b8997678c68ecd2b2ade8707ab6da388748604ad31bbe2af04a8b49f9a6d826036949252d50d7e188ffa30bec3d8a5d12f12dad992af1846fd09";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/bs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "29a8df8006287fd38a283cc499a799174a14359d7a540cf5ed1983da98d1efbbd504489eeb6b2b5d420c06f42a0a3f9b5e7afd1c1d5cc70f9eff8b354bf3cfb3";
+      sha512 = "fc4ba1fe9a8b439c40c99b68dd4bace3008ba13482f8ffe821942aeb513b2975e1c83fd267d980e93e1cee8b3662d13f444f46c1bc4c54088c45ce2fca9c3918";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ca/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "3daa8bdb22e64dc39a359ab15a55d001c95ecf53ade50c0779e0b744043b21d41f36cdc1d3fff53f59c71dd0205a089f7af21074e6ae34d1b03744ad7cd38631";
+      sha512 = "c74ee9c4de09a65d33b1e2e3d21e5901d884f981a0d90c81e4715214886d80ceb219bf96c4c9a9e19e6b278df89c31b3232846a5d0f5539b5c1234a312414469";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cak/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "031311b5ad4173778f879f5241cdeb559739875bb49330d20c37d5733b7e58a226480b6c456a297d509a9a379803bd5de38343249dca1fcccdc74b9ec1b97ac3";
+      sha512 = "59b5a2602bc0fad1b77578179d73acf00473dc1426cbede4b4b42973ea62399b3ae637c728443786fbc78ff3a15cdecf003764ee57f23642167825a3b4e38ab4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "979985e5a292bacd3031554288b92d8d90f9b05ce8f59ca2126a5f0d2b38436cf39fec21d830e16204982157d722e8fa9483062d3bd3c78cf2cb462a5c13d597";
+      sha512 = "b583fd92f83bc2320b69b1a8ffa880c289128c31475d69924e6690bf8bd3c4aa3833883a3e012eccab850125751681c1aabb9f3c574d9b49815757e6d0a29aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/cy/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "3572e150c1effc9d5b67cad7954a69ddd50f6aa5159adb6ac40f0e2c557cf03f6760e664be604edb27faeed8235b43793122223fadd61ba6923694ae689fb740";
+      sha512 = "df9487ecf368f8198910df6514ba4c2000a3ad2aebaef3c442621008c8a89a356d38e3afde11471c426cba24b422db1104214b58b92ea9cfc040f30e817f68b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/da/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "241dc58b57f683b3a568f456f1235a78af6b8089837b508c98c5e223eb1c9e98507df80aeb805752a9bfa15b0837f457e3b2cbab683982ab7ef29cbb1177b4c5";
+      sha512 = "117f836242eabd1a393b3b5cc0530d6c0f522fc16a4703b52d3e24f45796a0573baf05add71080e1b96481b253bab07aad3a41166653eb0e83d46447fa85d8df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/de/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "d86f8658348a006b8f0baa020f273cb40c46fe82b34a2de4a2193439777ff6d0874bd63cb143c976c6de9eac4170ed8081d446267d2dd1185fc8625268f11f1b";
+      sha512 = "fc77f7d86d72c58ee87a05d25e96268d6c582321bf9d11d85f2cc6a471c43e2a83f6f76a3c846b27d096d9dc0de661b0d2289972a39c6853b45a3d761bfc40e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/dsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "bf73cd3a94aae19e1e58fa492d766ce43be171f349c7f5cf3f889bbd1c3c0f8aca3378eda8583b9c9007b1b26f4d159b281f85b5a33279635acd22289badcc3b";
+      sha512 = "99a01ad4a11bfaa0972014a1a7541bed757229d8df052f91a6935f8b048fadf015ba0db0f1bf1e0bb7e8437eb5fee692990ed84362ff95513865134fcf12eb9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/el/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "fc7acf24643996c6f3c63f1ef392883b24875914111128ec5c3cd4aaa3fe45b3a8b86ffa0a32f288231d10229f1824526fe7130a96524b7abc4917f375f3d96f";
+      sha512 = "f0a9e8887a498e100ffedacc6bb5a988dfbec5fc06317e8c95462da20caa744c7ad120ad03637dc8392aae6c6e730879eddfa76dfc04107b15740cdeffa70677";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-GB/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "d79ebb446402325a043acf700c1aa05ed85793423a0795e6afd397a004ac4f01bef39ad7c31d3dafaed2ee665c86b4ea4293292773a3eb7442c995c73c47ae48";
+      sha512 = "8f7849f2b3500b54ee876a4ded2376ec665e036e705297a0b6eea43c70fb3db3ef0a89b112a80814e3eecd770b34fd119786ec0d34ea850003fadd38299a8560";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-US/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "13d1ff7486bc06daa37b1d9e98034fd463f663bae35d1163fbb4f033c327c5d85e8fcbecd2d9854456fe4e176748b921cc96d02b0889beab332a4a6987b2c457";
+      sha512 = "de807109ef44c58e43c74fdcbe22553fe1760b38b1107ca99261e21b43da526bb875871dcbc27f8b9811c8ef4f742523526f09a4649ca0d1c7f10f69048ff997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/en-ZA/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "843fc740b224b07307517a17fae1ea342dcb71564b511172da3f8d96f566908e485da5f0de81fb924625edd5b182e9855d4c39485b5d5e6b1f03d227a1582cdd";
+      sha512 = "46a14786b361f0d8250634c4267835aad3f7737b0451b336065674c00392b0208d31f6a0d6d62adcd2073002cf75d7caa286be3509f3f5f3100111c23673fd1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/eo/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "fd62f3c1b4295fd91c3b0e3606761da2f4dbf534ff9c29d63c150b3e0c08663c8639499643163868fc3a205159afaf1766127d68dfbbe91262109b4673d6e4d6";
+      sha512 = "ab59244973e42a3551de4e6dcc31122f9b03537d4202a4d7645a598166e2847a43b2e902a70876e19bf4a4a083658c86dd5903cd3bc10aa0c777e20f55d1c796";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-AR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "098bbb5b7e60d72561e99fbe55d5aa7fdad0ca78daa9085ef47814e525a284fc69d5dc2723974df97b4567dc050a7c23c77a92f16ac29f8f1f2c32feb0fed5a3";
+      sha512 = "ef48f5124704f10b03b442222765461c1cbda38422476c09787ab194e850576ebbdff741ac179f0c6ca8d0ff8e8d23a631eaef70ffdda09e9f8aab21aa557f78";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-CL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "1e518d4c0149e51452b7710791dde0e51c92a16183e36d2130beb1a9471bb213853cced03604cb81b209a550c8c19b27f69c2ec13774f63dd143abfd27187568";
+      sha512 = "f15d84b35ad9eabe6a5cfbf4dbe1cd3bb57f4f2662b455c9ca7b69dcc410cce688ffd040cd783b65d429118a56714e0e475f68c25ebb6963ae1f0edd5493e846";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-ES/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "cbec05d15f141e61612d9eb2e0001104500839d1cff156398d58fdab027d446a7f936d96e257d6ea8c35082f1a519f16155a6e45f6186989a09bc75fdcff4e7c";
+      sha512 = "0b518e998dc2f584ce1ad652737c3331495efb831c4fd336a6c374f36e5d06711bfa7dd476b674df3cb4a91e25759bba09def752d9dc97acb65adf2112f23910";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/es-MX/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "33670d131c9746823f205260829d789144079c71e089c399f4fc9ece9c19ea1e2f840f48ea8b629cc1101e3e776bfc12dff3e6ddb48c27547d458f7ae9a61744";
+      sha512 = "f72d7622734489ba3fae9b578ef0f9f3fe84a7ccb673f2d8e3177998978e6e1b28ec89fd18aaacd914865302c00c6ebe991cea72392fc23ccab7350e23234c7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/et/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "ceb2cbca7b75b2dc083d40ed6c9fedf0fcaf6e2b7a626cd93e3de0d92b6cf73b60374d8b90d6fa57ae2910c06af84f00e55a2769725be87b37e2291b15d1f0b8";
+      sha512 = "c57d5587879869e2f264e82753b9b53090ec530a98104024dd57fb3af06350121a547140e6ce4b06d397331e201329c2cf582b119dfcc56cf70acbcb47429673";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/eu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4e6a8878c8adfe5e8fd5ba0b6eaa6ba88ff4f76cc5f3a8178040ef72d838141360fa56b0f125490a1effcadaf964cddaabe3c769a69e67c94400bc07ece89cb9";
+      sha512 = "471089facb9eb7b0878dad4845d79b1e2d6c9fc918ebeba770320bedf443e40e7382bc876f1664609c4a9a9888c39ef9d7ce9f3dadbf50f9868cbf17b0d7ed64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fa/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "9aa36ed9b2e9770d56302d41a373ae19510caa8c5442928dbeb70bfdf46ce2746a68776713ae54b0b996c1f3b6e36a5efc45d5b2a4508d1b0bea0e49adc0f380";
+      sha512 = "3c0a7a84b1585e9a1e27e0db10826aa37258180733c0bc1316f6b37e997eeba5edf7d8a400cd86b2cd82c2c31dfa36d5e44e5214bbe0f40fc250c59bdbc0d7eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ff/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "53955ae8ddd8d46863cb960e2709d643869b882c15cb5b13f73c05a6442a38d3be5df47f3da670031bc99f22dfbb10ae80ac9799a71ef775fbe34649c803c82a";
+      sha512 = "6afd3a5d162dbf2fa21ac75792de481aad75a82f1f1c6b6cd82456ea8456c0eace20227e4f54133a5a96f8c1619d92113b2006f17f49f8ef9fbcb9564122df33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "78d9adc8c5b05cae1def5260aee2ca9419cf1e46ac2f4e5272f565ff73fa2cf57912120c7bf2160cf4df18722e63a4aebcd3574ec3c61c2f35c757ac677d5862";
+      sha512 = "f7288a081aebd8e79ebfd2a3baaacb237eb9fa0b4a9a6314f6758af1c557b09105be188bef7a40b27389d1dc2bf60ee984d991f9caa77292ae0c7c100887c448";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "1235a994606f43e3c9d8660adbd9d3049da19cf5e654d8deab2affa18835a65a3bb297dc99de7ac6949bdb4c1c47296e2dcadc859833740c235c4364c418b5f3";
+      sha512 = "591fcd8f2480ab578a530358241e0d9a624610199d315d7c215f7320980d29dd28ba4e8c35c40196ff284ad19269b5053133c9eb860cd2def922c277085d4f57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/fy-NL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "44d97d3842a2ac5f816e7c74301cd85a8e09884438e5130cee9d17f0b4a59015831169afa47bc2dc6f89d7934d356bec18bbfc20bc97c0a85b441214afc9de71";
+      sha512 = "1738b3175e9fb7fa67aaee3d1fde9525e85e2604777b82f0f35b48ddcf08f4dacc0f0698641c6ef05c4bf156c5d785223e5ed20b0b4ceff84860f46d4fc65a38";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ga-IE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "5f1e8aff2b70032c5907a73f99b1d62500a583ce7c5d5aab50faa5e40f4cfc01f1ae10936ecec9436ef4dfc8b5db1fbfc1603f0a5bbbec0a9c04eea32f9f9907";
+      sha512 = "ff6c3c96853229a582253c6bee51bd041bb0d5090b260902955b8a9db40cc22aebd930230cafa3633d2b7137e8601e107dc276b5bca03bf26b205534caee0118";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gd/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "1d971abafa1636d154f015d874e97db108b48a1f6e188145afb7f3f4da1c01f4b80fc152e917fe3baf419af767172b965657f75afc4cd694523d458498631b42";
+      sha512 = "52df8410c5c9d0b1bfb763610a7d5e3e8d3db41e16285ee5b02be9994f88deb30648c209d29a1c63eb9539220ddfa99023bb31475fad40fe8f347bf41c71f2ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "cf9cccd08695208227d0cbdc1531df4957817327c95f8aacb8314d0991f7c0226fb8e4cb565c18830cf5026d7e87e32b4e445a4580ed27c0fa0ce643c9f37657";
+      sha512 = "dbb9000ecb87fc7d56d639ae6d7b92d1f78d3143edba153f363bf49869696cbaa24b1aabe081b48a5d324d9e7c783deaafaf5ec7d58fa99e4d1c0c3fa530675e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "79dcd2747c22484002bacbc7266a793c984a0f51b34921256d351a0df5d5d0fe041f2cb6db0757ff48c9b32551c882fa60c0d052d8d59a94f0747f40728a5e85";
+      sha512 = "bef3b0648e7e2057fbcea9966e55353eedcc0f6e7de658fd5b472573a0014eeb387c4e625d95ec75ed289b809fbca8a47d79d464655eda8c0e9745f28be91daa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/gu-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "425f0864046581340110ea61a6a3abc87a5b12c2c24401b91273fc5c55014a0af9d1868e4e2918b30576394d97f16854252fe999d0a5b84ffc15c7b7765e20b5";
+      sha512 = "e3d966d378a2c66ccf223b9f12191f963c8b8d795d05d854c9739d4e4418b95125bd5d8d97d783bcef432c55b17bf500a5b3fc391758eaace12d186a89e09df7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/he/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7a2b5119651e391164f514e8deba75cbbc7fb2b89353d5386758e3f1442d0a9d61bfcc9fa5ac28c20a0b4eaa793c04d7c45c6dc43aeb4d0042aa07a1efb22d26";
+      sha512 = "3eac4e2e2153a3d1d2eb9aee9a0f7b8ddeb9bfa8dfaad3ba42a84f117d875a37cd9b67e7342f8894c35463f1b882ff24aed5e154cb7c8cde291632e6e66d02fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hi-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "b0bca544fda321aeb18e91c6c639434084ba508cd0bb3027271d61075fbe11c10c9114d5f3bacb3538bf5bf41dd83f37b9231ecba7c8586a19f64c367d7bc0a9";
+      sha512 = "eddee4cbb273883aba916588af0aa7205c27edccafa190532fcf6695f592eb824c92bbdcea22b9e0a2ef98fe4ec188b9a5afe8fc87212b3b10d638d6d435df71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "baf8526abbdac323b3976c0561a4f7152465db2f7acbafca467c06794ced55f851d30c1a02161945791097351ad5e07a4a77d89bb8e6084e682fd39813ab5af5";
+      sha512 = "606aa417c0dc7c4953f1c91b9e52c506f971c155491a766b12f3fd7780ac8df4da4a23759f2a203e0a8dbb25a99778def10edf4e3755dffa66bc489d55a413e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "21678434d8b8c90ccd8e6f04f29c0d5d99376a0ee8a0c34b4748982b48591cc5f6f361b3c8e50bc90fb45668e439db9b1e7e1e0bcd88bf65d42186463decd348";
+      sha512 = "b5f7668047c61d84a0d027e6750983be66889fa1da4dfa471ba79bf61e706341e877bf0333130332a6afada025c4d84d76500d2ef644847e6eb1984f10dd7a7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "7964a915f1bb67cbe69a62ea5d707e81cea6a1f1e221cb8b35754a90c074d70822357bf71562877aaae41d53d58a310a4db39d388f53a011fdbc195160038525";
+      sha512 = "1439004f92d61e0fcb9c8d4cb356b3c30c82375f17852bce49e63fc9d5b939ae69e9fe415b6323901460c77aaf98106d534c7d8fcda5dcd07b9d25512586e06f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/hy-AM/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "71f1f37b090e370ce5152290a6ba89cee3d29dea718247c5c472cc0d619e37c60910445f4cf57e0e0693a8af9d439820e2da57fb0b88e85f2c13db042252e8a5";
+      sha512 = "5df1b2406e7bc3b5ae971b69a67f95bbd76d81047678799648de1facae89bd83cbf00ff53217b1e9dddfa127351c440d6def5a509f39e58d9aa08b1d6c0c8234";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ia/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "92ce50a687a76bd51d852a65e5bd2495d572adbdcb250183c5a757d7c4ca09f2420c5b3e2abf968a956a5625bef4e28fd46f048bd79ea8be0a5a49e783986add";
+      sha512 = "35d537fc26a8e51125c52eeba7bf7ae15aa9cece05e35f60937851fde672746fc6c8440c50c554e6b6606b76b8262024da20e9b1909dd69d99518a71e7d505c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/id/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "668db99ee60ed9553076f8de71e228386d04bb337a3ef6efd25e9cc8a193ab98a472562bee667314cae745895089d34d08e8a11e0f21d6407b6f4d443be9f52d";
+      sha512 = "6ec504f45a0653d9e51019e7bb095ba1d8b8c677cde65a68ae9f09dd165a124073f243e86b89e90c674ba91c19851500653b044a00c6c1ef761fac4456dfe75a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/is/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "409d8b328287e504128f1e5a76793e8bfffc43453d3fde593c0a3048b4c3d5cfcba155269b629039acd6d29d53f862a00cb1e9f63fe2ea49c9c96793f440db16";
+      sha512 = "24ef8c4de57aab0638a1d8841cab8335bada9025e051d10ba2e5c4a9985d459848d1d1fa6265b5914b1c5081377ab52c7a49c291388674d184a54162bbe73e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/it/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "d6ebeec88e354b3fe1e21a259e85c67c1aeed0278eb82c8da5d4df1990a94cb3bc239ae0094146da31f53715722d225ec7ecdc13c62bc69ac6a0d99854cdffca";
+      sha512 = "016566868c55c5df99debd049540f72d51c7ae944cf70c597d166080452147869b586c872d694b370244941dc1b3668f7ecec164fca73d884d650b852b6f15e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ja/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "d81dc550cb3b8c07da81205268ca7411a81fbe481f289f7a35bc84cb8fcea978ce1c30d8d36b6b87349b5bf2c9bea45d98c6e0e96ee376e2fcdbf2f1fdddbdfd";
+      sha512 = "cd5e821c5f4bbdabb0f08e77eb5968e8ccb53dc720f4f66022f2ada325278fdc6e9f13d3b5bd830dd7867d3032c85ad869ecc25ba4eb8bdc027c8dd45713194e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ka/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "9005824d0555987b997366cf6bdc776f2df18e4e15b32a3953acda22ad669ea073233c91f8c2b12b5d1f783611bbd3acd9859778ec19d21d929595f206b55a73";
+      sha512 = "21b472b694fcb31284bdbd1d1b3e531761db82e8fd5f406ca62251f9cf53e5f64fef659d5eb0372bf545560d4671d814895a4e4befe4313580e1a52714101d1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kab/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "955c96dfb14225b9249323a4be404a4a2acc5523398c3456b22406f6aac4ba9a7e84607c7d9f3ef203feaaf66ab190b04d17ebb3562a0789143fe78b79fb6d26";
+      sha512 = "6a638a21a3c410811366070d32cfb4119bbf16d887383562736cf96be17bc08944dc062767ae56f7b6bcf7d4c96b97383defec4b5726879edb5be770c5053a42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "a6519912de9d60fe4eb11bd14b65c946b9d80ef21c001689363d2f34ea3dcb6cfd108068538a96e0c566db48ffd4322ba3ca7ef4d6c4f95e8c22e4a41ada9cd6";
+      sha512 = "5b4e620e01362d763d3d7a98eb5559ccdbdc78e11e0792b64f29dd0b0799aeb78b9404d008c1ed7489f56ad553e249ed1d6649588dce0d7b6161506a743b48d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/km/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "af3a016e28b9a2d0150298878188f798f781dcbe3553bb7231ce9d5a7bcd3b3c2c9ccc9a5a867efee4d0bfbdfe70355ada38e2e3531bfc63382bc2d2d9db7377";
+      sha512 = "7dda622c7a6fd69b43cb1895c6faed9a2fef75c0cde3680c445d5b86b8d97947770e4eebad44324d71384ba2b407a10db045d4d108e412ca92f6a223a433980c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/kn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "872a6d1dd69a540e253a15376a5ed0af35ccd65d400c110ac82046749c05a43b73c6f8980a0d1d8f4bc11cb8e01d412ec170b3d905461d8f896f37f3cbb6cdab";
+      sha512 = "93f68424ec2de8a7e6c319e1d243d09c4e313f59e5e102c68b06e21832a88bd32dc56f48119c1a6b92774fbf42b920f9245a12650826fbb9549c77409f9e3b5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ko/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "d8890110362ce85decec314f885cfba90c8ee7c0287a60b8b747176bf45426706f88f78642d2c92e4542913cf64a602cc36a706d3331330fd3d37579af1b12dc";
+      sha512 = "b4172a12cc3c785055f574463478e00d74aa3e0fb25389c8a4a67ff4966bfd74e4282e7d6c94c357895cf16265115651743302b28332fa8ef117bfd50778a3cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lij/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "73b79ee6702844e66ca565f10ec28d4640345303e1cf51e57a064eb01ce9be9c02332d8dc9700466e11ef38a03c99203ad7935fa6ca14cd751b8ee2096c2972c";
+      sha512 = "b7303e3bf959f9eaaa06f3742eba9e039b46a4d00480651519d54a3df1b919e576c301e193f016d84f5b53eb03e57f58cd22f3648f289d4628ef8c7f547d8ff3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lt/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "d463bfd3766e950e40309845ec88f1ae52a72f38dbc41ccdb1652882f5aabc94b9b204b0d3e1bf1a0e4959eb2a23694bb189bda14f9dac3c91401c2a646be8a4";
+      sha512 = "4e14b4b1617361769e1e8a8a621cba4bd7a7044f6a7e4c2ed28369b79cbc5473a438d68ffecbf42a6a62e33aff6cef0b8dafb135cca5d65d07d6f0028a362c8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/lv/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2616476c2280b7e1c21ab7f850342e8deaff2c97b1f0ef05496ed1b87c15578dca206eed0f853866c5d018be4a2d6281472033f490466b41132c5623abc7574b";
+      sha512 = "0f85c67e06eca79e14e9aa41fc25d6e8371289b97d39a1e2b3b6a0b9c73398503f70e5a0cac1b02d9fe12daf805e35c433c78962ee52ea03d151b1d1b7254dd2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mai/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "3628ddce5fe431663d46c4973059112b3384f907d3e76ea99266968a855cf88de932985e2912ea6513c0bba7b321bcb125024d9b52a1920cb6c02211a876bbcd";
+      sha512 = "9a36f85dab0ace56a361bcb0bc00241aa3087028f4ba8b91b64e76963e8979a9bf4c526d922449e39f4f0a574d0f9d7d29cf033bc2832c88be76ece443fda6da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "be145f4a7919433312a25c318b072e40160285542b9d9a9659aabc0a90f2d6641329745ca3950b4da2c0e58ee9c106b93cb93bd5e806cd35e0884217eec3a20f";
+      sha512 = "2523ae24ccceb2a884d71238b406aee20a359a881039e0e864b49358f2673f44663e105efea7ff094656e54e334c1d9b37d9834a841ca3b938ba4b2abf14bcc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ml/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "4cd05fa46a357eff1a1121abc72e07b992763e702b5c58a82fed7b4a8b731154b4d6e5578a6334e4ea5a58323ef0bb0761beb10ff971ca25482e973144f2f6ac";
+      sha512 = "bc07ff82e6e2521c40db7391cad7b1246bbc8b99b45653cca2e76d8ac44dd341f66cb0d28b93e0a454ae78177b0f85b56b5cba3bf43a2a147178706544435874";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/mr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "5aa015d9a68c5d840cb20cb86ad98b837a97ff08da1ddd7f2c4b003d7aceefe9f82574248a39e86b45f5567adcdea2efe7821ad0fc019042fc507a3c673e628a";
+      sha512 = "aec0eabf17162f0750ad54003bab89f5ca9d4d059b88d99c2c07877decc64256a411b561daccc0eab5fce16a642daf9a6f86cd1a2f50a0d68c140f44ca941404";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ms/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "e02b8441994cd826bc308f0a5955d0a646b60acee04a254e35b9b3ec4dbc36374bbc2405e917fae352b9f000b7e72d3242520f092f27b7fa171ea5f9808d240a";
+      sha512 = "ffd034a7fcf7ff9fdd03539f84792aa5f3ff23276f846498aeca15b55fa2d30791e4ee66eb0f0867db2cc3f869d306a36cbe8501957a224de4b17b9c4a0dbfa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/my/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "1a20e82aeea3151d66b673f774a6c284ba8155f3f724c1f1cf79195a41cffbcf56af3399a7b526ba9a43f294a7a6c155c5914035417b36616ebb88d9e9125dc2";
+      sha512 = "7916547a252d0e3e0161b6c0128003407718a2d88748ea33933edaed37de07baceba825cbe64aa9d78d13c5a303cb870a0d282e05b6fee3370ab209e27329354";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nb-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0bfba4dc5ad7f20a5660b1492e356c1ad2113a7e67e74cb86950600c0a209b47bc398e8c9f6fef8d27bde502b706c04965046316d952fbd8f2eb7d1f87af3e10";
+      sha512 = "bebc0324bb9134644dcecac3519dff56ae0f394bb36cd6030641d2482c18f08b825eb2c197f9a87748b8217c0b43323bec3056f7aeb1633aa46d0d049d3c8528";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ne-NP/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "f373d90059cb2b65f3eaf34af16dd5644c28f3bfad9fff8a02b855b5b3a0da3146b876e835add7e70e94d59a911c68ab61dcdae8739d2e2a39afda3cde6e813f";
+      sha512 = "842c6f1251e7478b285263e8d46f36dc6bb9d5216725cb1447b0272ac439c284a72b1316095f35bb10445617c15047c5fee84a3763ae03120658c613ed5b4ff0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "bd971832a63eb6d8a2df4ba1ee69db7390ac8da13894aaccea7bbb79d27d1c29dc541144202b1e44ae95dff5e0c1425ee17c2845acad9c55b9126fe20d53e85c";
+      sha512 = "672d5083ddca12a22a3fd639610312c13330b5cd6c09a99bab1442ddd58c86552064a4d555eb7331c658fcff9408bc62617f80e7797c4c502251791585b2035c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/nn-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "a5017881f6b2ba0453b3ef41d6a47763fabf7a87e18e47e9b97d8c7d3ed4dead67687fbe3b1ed18d23e6ca3a85db4ca4dc3632537f74432faa1ea5fb69deccad";
+      sha512 = "ccedbb3b1d4eace21851c3490c3779eb29162cfbfd2aec987497ea949dc564a6b516c16ad08c31fd5c05147939ac329f8853bfdcc6af17259a905a18af9f4867";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/oc/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "f0593858258ec794dccaa420dcc39fb3bc35dda0c5b9996c7069d53d2b68fb2e373fbbb40859099ab8d85044308da500cf931dfb6e2d6132c7be2ffa350d653f";
+      sha512 = "872532c28868e681fc230582828d6ff19beba70ff29b71aaad85ce19422d68c85560def8cbee5cdbea6b8360cef5827a84b1116e1fc309d94a16c6c2fe9872a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/or/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "33cbdcb3331097ab29581595579a2bff78c2af99dd20ccc9b0308cab6ae73335b990582d559cf8d9459c422f03f4dc0dfcba4b72c3e66bd286db001e0064a6c7";
+      sha512 = "12beee4eafe1c5f41c772bd2b8587f92bd2318af776bc09b935913006b0df2ee7bff7cbd8ad621737ee1c83792db96d51b7d7ee45fdab829c5cfaaf32632e82f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pa-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "b5af8ed8a500d8b7b8ccc7ac44be235c8182dad44a55e461365f7b9089190c40d7ab7d2ec0fef7189d19ee0d80f96bdcecdaadc563c7d281f61ede5d19ba227e";
+      sha512 = "97d3d44d1800b9fd8cedbd90cac6472a3f2f8c4840cb7aa93bb08acb067d47f80c98e2ba3c8d8554ad8987c0cf6d392f64ff0a08127481b30c23915e5f986ad5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "77a651fb2b5bcb33754adbaf09e1c5abaf9c07af78fe5907b8954a1d0439d2853186070124e926a4ea2dae6acdefc5487632110557e96fda274556e97fdf2061";
+      sha512 = "6dc388f02cd52c50bd158668bbd86f9ffdf80561e9b9da207fd1e57286d8bad40a4a54fffe02c7102e325ec7b7ff3c2ecc2bb4cada9a3dea544efdd73ef02a98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pt-BR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "0de1974b69f3d95381be1ac1366e9e7cf1057e26adeb655e20b088bd77035fc00bf94f0db24e676e5dffb320efc99481a9c9ccdeb5f6b0ca5c7050313daa3ba4";
+      sha512 = "496cfa11dae110e7d8484fbe43ad689f7d0f6c981c8dfc1634586c533db23b417c7856e63257432d377f4f1b354557733738a613118178eece59049d5790fd88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/pt-PT/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "dde0ba1bdee706596f0da206c9c30d959db7f1bd0ca7d98482bbff5c8554a7e9049b8b8f905a0cf0138c00e9cf136dd8a805db7653849215733268025720ce43";
+      sha512 = "294f8b13ced20c26151fa75fe5a3471de4e56a70749cdaa99cc0058b3b46f768321e24897e830297e4dbccf5dd1979f33f8902e1e287ec44894c0113f5d6e50d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/rm/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "c75a77ed854bc309bd20551a1dd99811043be9a1344b81831ef38dadcb31b0155bdffe7511e928b1fb877050b10a425c5f76520fedff88dd41388db7ff3085ed";
+      sha512 = "889517c9b6c5a01263dcc5af5badf44d9692bfd227bda75e376bc9f27c2fae6a8631e4b5673f105949b16594369511fa95812af9f46ad32eca4e101b344f7474";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ro/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "b9cf50d440e405114f055b597b85cdf8c78e67a42213d0a1c7c81346fbf8768408d0ea0defa173b41283a239d12b037f4a6b6ee6458e1aeb0e68822351b849be";
+      sha512 = "0c9df0c551d310e52a21f6537b883eebcd736e1292f8869a9fcad8d1f505a083ee29ec982cef2b46e487a9a9199ceb97db62a5b2282b7608569956f3cfb370b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ru/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "9075f179b98ada166c203d044b55aff03a66c2e8c3c1478f919acf34a02682a126a5fbe7076cfbc8b34f5c4c68243b324e71056dd92cbf316b3ff23c36d3228f";
+      sha512 = "96ce1780836d7a8275024484134a8b8803fb082f608f61d3f00d7f2d0e48d308ce23461ddccd45049adad8a0cc57fd3ea3cb9990ac7c554f6cfb2ccb53de2c62";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/si/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "2f8215d03ebdf28d74c4dd30f5a3db568e32e1a169a3902a71bbbbd546e4b9f9e2de2b25ee83a2fc512ba34888139ac2a1cad1625a8a70dc16233cde8babc28c";
+      sha512 = "75519c81200b371f7a95995d8f4f937f80339eaedfeea581f977f82d3f0883788a43d556f30f931d311a9613b7d13925cf76c2a8ee20eb0886ffb50dbdc2f539";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "12cf08203e22eff69adcbac620cafd5bae56ed137c257ace48930cb3f70d7877780dca32ed65afefe7015413581c9493a069d463c5285e9ededf8bf3b9045ba6";
+      sha512 = "b5ce91e583eef01a4c05799e68349f2d5271980862e4b675575d0dd191f1944e7b81c6d111c00b8c28af5bbb32b5e9fd8843a66389a04a2a3bde30ece4dc9033";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c4f20a2d20d89e9795cc8f67cfabe1563e69649015850e1e9e26c21a536325d760f4494d734b351b6e60e789e9d23b726a77b7ab8c970c820f6fe0a1e1de379e";
+      sha512 = "2ab9f922a208c5ae1ba1d1a00ce719836d16680588e7c7be7d27a8da1a285a0be22ab5854849014b05ff068b65c6f52252b756308a9b6ea329f1b8c0fb2499ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/son/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "d86ec2e9961d5802cd16d1e98e79dad8f758bc10f875c24048eab2b3114b55109e781c3dce3f8498436ab6f542671e9d4b883f0017be71d7321e2fa86bfd1dac";
+      sha512 = "c61d64dc05293a3c88d2d4d06959779c778149180ddb0932891b2b0ddb67914b93782e827efab0dae2e3709a979e7ff34666cf4daa499a16bb42bfda4fe2781d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sq/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "3ad5d9d572cb30aa8e373174e866701494548acb471f29b3477477606b6f856ed984b3fc84cb2302927363ee62009fbaa0a4a0a9e51ebabd431fa17b8d472445";
+      sha512 = "4d8aa23a3a17c2f8f587ec78f523bba59a4bdc1009bca4912e94a0f39bdbbfd375fd76cde61f074b8b3aea40ada4bd684255a0c4ac0d5f0291dfc8888e4e19f5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "0b684b2a726f849cc61d4b3dd4d8618280961a59f80e479689cab06d499aac6f1c0eee82705fa6d0295abbebb498d5652f9e745060323ccfdc2a7cb1b800ebe3";
+      sha512 = "6b6f227762879b44bd6bc71dbd5866181b63760d28a4fdcbde1fb50ba746d9e1f3bbde2c0ea2b0e16cce156341593bfedbf1c484f339dc0a27c8c7485d9d94c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/sv-SE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "50cc112c5aa0404dba0760b183f6849e74fa57aa28c7f4ec03ef3c68c8726ba212655fb5ac49df12f4492454a2fc8431550a9ae84b9e9f86eb6dc575617f77b0";
+      sha512 = "f036a3799723d74ca21f81f7051e65604d11ee898b2b7a2169f6ee27bc6745a16b72ca1719b68e7b76fcf6023e982ffa6a372f136ee7fee8fb1c11b90de90c3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ta/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "0821005fcb9010e14db315283d178438eab03f02e1dc7a524815cb1175509343265c2c972a8115d229f5346d5a5bcf99c6383fbd294f5862386665748112ab42";
+      sha512 = "8a8f4e1b22601b98a04b71dd85f3ae7356e22ff94c02e9f2ba1f522c30c7ec76e6caa3e3b9a71dadc3e4acbc9ca7c28e8bdaa2867482d2536179d9f6506f49c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/te/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0dfc09db03347201731214c987856f22c63a89272d9fba0fb130f12a56e5ef2b932850f13af117551fef949803b9622717df02c7b164e10035243181168fa0fb";
+      sha512 = "095629cb9b28eb3b48edc66c435c16dcdcc774b7478db0bda3e8aa3f028f600551cf4e190679aa9864658b265399aef27e9c64cb7544f7f06a8355d28f2c965d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/th/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "4a54abbc01a456433ac601823dce9f22f1f19ce1def11d4469a8f5aac4b529aed09828fc75aee1a47855a9283bd54477994ab0be06fc0b4996153a1d0df43ff5";
+      sha512 = "4918f725a9a1a05bdc2e3056db29dc5e9cca978071c55ad5c8c1a87f1a9119bec0f434bde5c274b5e9e892b49c9a259cc116d1974e3a840f98868721796eaed9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/tr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "c3b90f4197f7c99e3c24b6ac6aae31567f5f5fa6907a5eb9cf026904bc627bc8c0f4b3b889e30d63ca871499ced0a0349fb1fadfd84c8171eb0ff52a771fef18";
+      sha512 = "1a350ab2d69ffa1a97b155c7093b5e0c06c8f1061837e19cce52ccb3755bab6e189de77f75771063710ba386b4f1116f58f289c56ad370d8b742ce038528311c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/uk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "2067902285dbbfeb7f3c8dd946f2f2997a8ca6f7a731deda8fe53b3bec1a980793010beebdb5360d8c08ce643a2edc0c86676f50961b7e531b4b59610ad9e151";
+      sha512 = "1623e793507396aecd34cfa5cb1aea1f1ca5ec2007823dfaf73e929643fb630fddb4b81a745d9fafce1fa8b43662b8b09a522f2bdc2456b7e6f9512b4e7dfee7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/ur/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "f2d12deb0147d178e53444e6f047e3cd809ed53124f78dadf698cce75f8f9fed76cc94cbd32d606c0e7ac5d1c6cd07356a35739651650bd3e3f95a6b2f655ac8";
+      sha512 = "6dca6a4bf4608cdd3869d0bde6648a3881d334b3a4bda20bff41626581204e972eafaa272f56b39c051702dcd9219d2b104e2cde9b2f90d0744709bb6ffc0ccc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/uz/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "4b6c73553ab6f4f20bafbfc1c45e41bf342c76de27562514d2662047e78435d95ee0c20442b5328f13ea0ecc6451f18166fe10e6fb0b16975fda4000c713c80c";
+      sha512 = "1131151207ac3f9248dd03275174a3efba159445824a40bd7a008c2b07c28bc5641d315581e0d98a7982659aa2bf2180ce1e596645e0d780ac42247dde480863";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/vi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "172f81ad5505494ae3fb3a170e2c38507c89a2627896e8889b3d128f68099bba5b9a91af7d102b70fdf10e827a4b7fb6c0aed117cd1576910e44cc5e72372207";
+      sha512 = "cad7f937f930fe82dfe99ca44d7f2173efb607f8ebd9725372a670abedec5fd26a390dc899ba9b712c9a533f6bf39356c4f7593459bcdd99a740a46dcf2295d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/xh/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "3ee80235b5bb3b717930fd9366c43c3c30d519945673ba16b550fb8665b91ae929b52c7852281f5b275f2c0a140553bc348e2323960516d2ccbaeedf5999804e";
+      sha512 = "a84b9524c567ff16290053cdca4dd494395e4be57fef0282e735795e082ca914abb390f916919352adf4c5d17c163a2d9316bad2348b35ca78529def36d7f83d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/zh-CN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "735e577a352aeffeb8110d4385e35741f28a5f7471cf77dd7cf146a48d5fe9aaabdf80dc468807b15b74601532a5eeddb27d3fa158cffc32623d929111f67c47";
+      sha512 = "eb61ad55d93c1e2be656097148a333b78b07c023f60dd9e2f02e9e0c12c42908e96313a05a5cdebf1a51ef210d66081107aeef476a69cf53092b992229365046";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-x86_64/zh-TW/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "ebbadae639f4a3c9de64909b52a56ba192f832c0200fb983339b16fcf3dedb0b28589c73599990c572aadf85256701b579311a0d4e30b45a507e0c7186ec4d2a";
+      sha512 = "1c73f4c230ce3e518721fbf7f1f536d376533f6e56e3b1f562c64d21b575b91055537bc9114163bd8c533b641e68d78892217155f1c9bd4747e3ee48225a61f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ach/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "61779e2106c89aa37e7ff2b0e2bfdcc2fe5f6d3de0c96e913149dfac19d93d2f572298214bdc9ac32d26ef81f69710f55ab888d9b432928c6473b2c510c23d60";
+      sha512 = "253261fff1c5c7363a96e185a816ecc59c16212fec6424fac394d9ff6299d33e27928650d2ffffff76019f1c6df7a69c51c16292d987daaebdb745620f7d1970";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/af/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "39e88a0db67b553ae149626c34cc988a2164b64ab634fbd9d1f649ecdfcedfc5e2a62a017c3048df74aad8285be7d904dd6f4b8edd9ced2e0a8beb25ea5cdbcc";
+      sha512 = "47cea191e24310f3b756e5d146015097e2c0cca02769f47213a84ad63039148e7fadf2dd727202a3854f8768014bff18672a6b9afc29bcfb0af72f418efeee6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/an/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "addb893599cf0e376c37905a76cfc4e05d17816a0def36ae8b163c44f994a10533e0a55ff9a3ecd19bf8f8b6627ba68afb1dee11125554132a5509b095412eff";
+      sha512 = "96118b013fd5e77802f7bfe7870c9ae07f10687f5ba71985fd346f2cfecb8fedbe86b9d9ec8895fe237d390cf168d1a14ea2bc9ce187d468fcdbe6867c614611";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ar/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "a0598263fb3ad1aa67a75fb47a92633c31b0c769b05b1279f8c8a65989bee532a04480b47aa41cd6e03159ea407db910efa2cd15ce80b47faef18e15bebbabd8";
+      sha512 = "75b034299a822f78ea60c0c0253fe46863d4ba0cddbbf02e64d5bd551b2c5bdd4fc456545f1b5cdd553af47c03bad6afbdf1d1137d570b35414aad0afee4892b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/as/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "d3d7eea767b6ed9097585c91ca81bbb83567749c9998896287338dff19fcb78c9b641ff9f3abb28ade7624b110e2a129495ec4e3d7906779633c319e950bfa90";
+      sha512 = "2d04a057dbb74a7745d36c85f58604d4d50d7838b7498818a6e900c7839ddf6f28bedda074341f8da877909330123549a8b57078723f3c2c081bddf5f61ce9c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ast/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "4e12e39c1061c14db738372ad8fd0c9488a42490682ae0f0450a5d02d08d959ea33c87c3e4c1e66ae58fa446b8faa6643455bb21cbb03d2aeabad0207f8f4180";
+      sha512 = "3877139ea20a6de4fcf2217e0ab53e1ba1cf43cbd10222b265a728d7c782b0215fdbd4a51bf883f2a089439b9d8964d7ee9778a5e7680c1dfa719763094e34a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/az/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "8ec2ddefa9530e1135ad70a8ce5b2304a756efaa201414f657bf865699b02e26b19431fc86d2404b41c3d3557b81b9147a94033739c59b17690be4d3f250643e";
+      sha512 = "958a242fca0f27ade3f8c25bf9f12f24bcf1d7cfa51f103bf77e2e493fea7754f00577033a37db0130936ab84f0e03bae986895caaddddc705a439b0f1d4d4bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/be/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "55d15c013df53929560584d3586a946e1cd3b0fd481881d10f0ded8513257ab4fc4a77d0495708c203b15bb749eb92abc2a4231dc892987ae4b2955a5fbc93db";
+      sha512 = "375048d56637ddc81eb90088cae26de1ec4ee8f25ebf8ae9250032c25737917306cfd39a65e3302d85c1573886f7b829b0dd3ced7d4b7ba10ff4389f27227861";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bg/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "229c10bb56080d50a88657b7595fa4d0f33f79570a00bdc9207c4b583aff5ad27ce309d6dab77988789cf6fa2671c7fb21dcdc5d69b0a4a7b87a767c7a7ca98a";
+      sha512 = "0fec26ccc4393e904c31f40d78a784ec3d0191c75d3086cf9efb0b2b64af93af493e2ef8747769edbac70758435ef15d2d1890af1b44ecaaffe2e52ddd5bebaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bn-BD/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "81d57db09707f13efc8fba2a13a0bffbb40224e837a50f5fe3c59b1648d89c8f7965cb4eae60ba0b1616cc77316c00ea2189012c4d8b8677649c042907683ae1";
+      sha512 = "8536c434b423bf969c167b2f9b40391cca26904cd76f022d46a9dbe127e3647d1b1cc4dcebe08d5b243fe7ffd115c9e3cb1607e556719210e5cc0ad7b10c7aaf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bn-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "f674542115e8d9117f6255dbfc96507577791f7a29ffaf1de263ec6b75c0aa332beea348dc9be60c24ef6ffa822b100037030985157fa4e8540eddf2a9d6d769";
+      sha512 = "ae5a493de97a56a15b182eef69079c1f5d59432259b85525a32a396c4537c9359bd41eaaa870f74f680b345cf9c06c487e6b9ac2fb1b5230b404b3e7eb614029";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/br/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9adbfb3ee70096a03dc75235e2a0ad60a9d90f1b240d3ae35a36186c013aadd283470b0878a8514759f04952208210bd4f2ab63a987e055bdbc9652296333259";
+      sha512 = "e4a42d0e480313f3346f50de408ed02dba79eadbab368cde5a93542bf0c462c378d79f9e218526667d398795e3f1665f5b89f44d667a34b88560a2d8354dacd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/bs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "b9267ccda43e947096337b02a5c40bcdca497755aeac2df06930232b1b1bf1b7e245c32733990575719c6e998c2103d8d29f46c804024cb4cc15d1400d459ad7";
+      sha512 = "0a0d7471a266ced527d7abfd36eb0cfb768d5553efcad7a2e19477ebedfd4942af7d12c123babd9a1791d8ff4c5a5712c74f3595e1f89d9eb0413bdb81e7a624";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ca/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "59a5ac9116bfbfe296595cafb11c13cfe50a4483e3079a4112d04a10e1d6168b67183874f25047fa7c3e0e93a7932e5778bc78930e0cc48ff9a4a661fea202dc";
+      sha512 = "6390ce2250cf20e10defa3d8d75098d5f9c58919f57415bdf742730839958bea2923e9eeccb9bcced97a594c67b54941dc1e1c3589d7d255632b32b4c7192799";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cak/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "3ea669f0050922163e4450ce8a1e72432dfb9c64b9317796b0648e9079333a2204ad1691c9c8e293714aade59c57aff75ded358911f4bcf161ddd140126dc164";
+      sha512 = "c853583283645099dcde8849abd0b3b6ecd98e791ab230ead55cb945b4bca1d91842bbc0cc65fe98dbe16cd284d8f66ff053be643b11d0ff4da17f078b4cf749";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cs/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "39391f7b6b1ac13ec573040c5b7ada54c29fbe202cd5efb9bccf0ba5b38c962ba199afa845a5d7df0ecc58f3f205ce0b120acf70f5cf5c66fe8b465f324efdf8";
+      sha512 = "f7cb7accc1c44205fb893704cbac0b9c08a6a36bafe88098251a57ca80f69699ed04f27b43c0be43c513410a91e1ed391c57c566443e8d7746de5797619b6290";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/cy/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "2c44aa81963f6285bb8f5e689c18a9e5f15d449d1a1f7983c5e65c0049a8da72bf9e07c368b68da408839e4e4c58b35692cbb7dd3fd565c5d53c21514ca33628";
+      sha512 = "b6f324096a191c9ccf4e5afc8eb65fbd3bc6fcca4bebb1abe9ecdf7b766ad14ee4a598bf83e341e47a28e13ddb8ddee5204f2c9b906b691986ba3fb963819f27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/da/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "0d49ed761fc55d137c4337c43d0ac8e2ee36c15fdcba2ffdd6f536a2d51ee42227eb32f553ff15bcc1313476a12d7f51d59a112c2c23aa47f753a01adf121755";
+      sha512 = "d4a9d5cbba8d840cb493819af66a03bb612cb173c2d8b1462625adb8532e512d9daa0f6a49a8771b3c96afd508109c16a17a65228bca79befcd3bf565b707bb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/de/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "51cf51f85b68346dd0eeac98706e097e1a42b6da1e3d740459d58e7954367c3dfa4bbd423a07eda4b2f89e03de1c3c6ac169b0bf0657922c9c2f0ec865623a47";
+      sha512 = "6fb875991cba1c1edf066f9ef44244c1969ff5204f36ab1c643c606adf81b67d578cd861ea16cd2d2aaba1ae37f24ebcdf58248cee4af37d11cdd608e28a7d54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/dsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "06d58745022be40d690483d0f96b232df31de994efca42bdc43d57554ed38a6c4b36b466dd5b9a28b6f9ad8bad8c672a0cbd1bee5c7dcf0820da479ce4c03b55";
+      sha512 = "40b27493dbacbff086bbb26396a6a2cc717c4b617c021fc4c1fe488550c6a5f7587f7d30ac6e48dfba91dfb4351b02af4da78082a38da5b64fe843455866431a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/el/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "74fac2b70c3a5eda6859b7eecb4609569c56ae76b82f880ff9cf9d8bc1af2a3a6efd09ddb2bd32315205faaa6e5cc471cf41edaf139a3da486ce4e7a2788b635";
+      sha512 = "b6a2ae45054d1abaf8e6e0bb58664a5a1e8476bb62f8f3cd3005121eccf38eef68927d1a46de6a6fec48586aee5ee441767e4235c8d6e7029baefea07fb0ebdf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-GB/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "f842a7fab1eb6bb15a9782838bcda4b69188c2a36114316f984e5e2f21fbde9d8d07b7a680ce3516ee359f638c82524c1961dd67b1f05a430a045851aa6e41e4";
+      sha512 = "55d0e6a65c897da608f6c3ea0a6cb6299ceaff15d29e45b34c3a52ff03c85ab85fd2d39c56763f0d589a9ef5085feb3af355758058bb4c9bc12dbbbba5ac7b4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-US/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "68797571e5cb045872c78db9cf9ba06bbe2982f464199a2c89f35d1b42369f49ce3abff1d01bb6be612efea2a102c2cde5f00d4ae71f02ac0728abfb96bafb65";
+      sha512 = "22be622ed7c9b621a0782ce727416b78ffe81afcc92b5af840a895f54cedc843fed1fa256bb452d8b5ad721450e5b635845b92e621b5555b98a6a16ca59b29d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/en-ZA/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "22369e8b23cb8b30a8e1680f35acfefc3198e2cca558c58ddb0478da8ba11b08f1336cddf1fd9d3bbc7330f43f930ddc9c81b4b25bcbb6f2919aad8b60a30def";
+      sha512 = "0442719c3303a9c1f4de79777a266bb1b7544c8b570a69e49746c9455edfab9aada9330280d6c406c5e89054d15b1e89d0935fac7ad4ff80e2d34159706bbafb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/eo/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "44b5d9b3a4fd149942277700ab3ce73246eaa8ab2826843bbd4f4f5db5aca100e6aee1149389cb9d21335b1f928035f872afec1a62874942932614afa01482d4";
+      sha512 = "9addd422b92067287ba5cc0f5ac14b662d55be8ffb65377e13d5a314c8a486057007a6c8287b8e79dbe12fc59e05c5c09fd79419cc56f83ff0ecffa816048224";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-AR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "7ac6beeb77e49d5439825a6e909355f95dea535978b8639173c6903013cd1218461b1a8c3f4fc1baf291e9063e7f16c0ad0a985f02fc7c41f1f654ca872c9797";
+      sha512 = "2043201d4622ddfe333f755191a90290a533fc93b27e8ad2a10e75a8994e56e0de9ac08e391c49a48028252dec96bcfcfe14c1d6c362780ee25f02296969d592";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-CL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "7b6c6daacb63eb5435a908e9ea95eb205c57e0626059f80237083290af22b4b12feaefc0d47ca23345238fd1f665b08e1f97e6b26633b7fe231b9526137a29a8";
+      sha512 = "365c0f66382ee55f0cdb98770b9e1ed31ad757e1aaab389f2de83f00dc8222397f2ffbe25d2df720715f78e1af19cd3c4c27cc1d8d04e2505fb927474d9dd42d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-ES/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "37e8968ccac78447e07fe54965474dd6cfde6fee86be113bff29161af76a83b29806b3ea6c651e8e014f550832012032750daa72d7d1ddbcf99549bae1a6a345";
+      sha512 = "5dcd18d55864e767333026b73b1d931095c1d7845ccdf165e8a6244a0fce84319ff9e7ef212a4c69574160037d231c4b44edd243e15896b79c6e24f14307fe17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/es-MX/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "c61dd6fa039da4724cd5f058c838624f0e5fa8246b6c15fd28e5f501077ff0136dd9f45a3c249eec339b2ebb253a7563e06ec080bfa6bbee823bafddc36bee55";
+      sha512 = "f5e7683eb473e8c411379515836e669aa9755af26746ec5c56c2f6566658b93bd5b8da44e8ee40789d8a378d19e9b63b41ba9a3da95bc82b85f43d0ec34089a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/et/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "635bc450686fb89bb67573a313a8b06c4c7ac3f0a7ce2b8d9ae9cfb128e63f6cba4a4701c93016d9111d1ece4b5466bcef7497ef83c9b8c664f903f0ed79da10";
+      sha512 = "e33cf86b0d591e3a28030ec7c7288a0c97f6258bb7730e7edb850840132ea96dd499c8e2f7fb95e09acc344746ad83458b1d32615debd86d47cf2076c298ce46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/eu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "9fa8d908bb5b656afa68b67a3289e576a3c64b845a9688261e21de10908c123879bcb87eb1ee8e3f151295c97596a8a122ca57d61eac56badf48e0c1c3efd245";
+      sha512 = "c81cf96e7fcda3cddda4751afcbe0b7515469df72b2bb1fc165659a09796f71d29fc70d6c0bf14474eb81b95490dd160ea4dc7b2292696e1998140f3198932ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fa/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "f8e8a56dffd9c82289b7bb5c2c953292dfaec1c4737fffef17f8ed32a8abedee90c4d484fd9a8a27d24163bd3005e1931df5bb0b50efba5d42362517861997f7";
+      sha512 = "af7fc526c199b75fb8954897d785ebd7f3006b10e5c1306690fcc1161151197892b802bdb20c389be1d8a799a3298b71fcbbc4eadea7802ec4f163484440d4dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ff/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "91d0571155490d847b9bd5bdd8cec98e4edb7841a7c32da07b52fb7e3d67fd286ae5d770af47d66d7e80638c5e741f02a3e38e2cef28f08cbf332ae5f1cc50de";
+      sha512 = "906e84d4963bed5a2ebc1fa82a7e901f09ad1e329db89e52788d820cf7aedd8f98c5e4d9ce3ccf9b7171a8438ab91f29121a78e40685d8230ae5726928295d3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "8a363ade6138222a39520a7e3b02fad03ae846ad0b015f90259c5b6e09f4d309bd84a5b545f67288e3415f406e3efbf6c2dc9e1aba1aceba116318734de30f35";
+      sha512 = "4954b7b1d4ce1028be06d639ca9c68b0e01febab75b4412d6d1f1ccab323add8d95670944782183668a537c44739b09fd3a15eda2db9f0c4643460f21dc4bb22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "47f2830f33753931516be570f1984624b41009fb0e8402ac6f5bc769fc6791ea50ff7c33ed79deee913539461f1ccb2eb0a0b9b33b9da9d03c204cd0d77c1dae";
+      sha512 = "1693a9ac213487a801d018f7a9f6e8ef61baa8af2c41cf55fc40f320c2d0e6a0b73283725cde09fb9bc64c208a4b9a13825118f0ec7e50cc2c61dd5a8b38b3b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/fy-NL/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "df144500225be3ed718e4276062903b4e7cbd9b9d176cab88469ce5ba57960817be80a106bfd20da2e6cf14807dbece026167572e941b3c4d75cdd49e753e4ca";
+      sha512 = "963078489d625db3ac61d38593e5e2e8da801c7205b3622439721da3deec06fd8ac835c8e0ae9eba07ff050853b85f4d3c6afda7a50727244a3c73b9c2bbadc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ga-IE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b063d3701661a1d3298f268efceb4ace079a56b8017a0476df13677d1871fb36708984d0a0d03d56e90a02229e7c3b005501259884af0ff8b38c503deb581c68";
+      sha512 = "a437cd4e09c26a4ad86ee37715307bef9fef6f2ac1fdc117ee6793b89995c0e42d2e77bd3517ae2e047faa2ee3dd22a8c2604d5bd285b5283010cf30173eae49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gd/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "68f34cfd93b5e84017ee06cabef3945797c29668ad6c5574ec11d2bd3f4e6480d48c2161f5908a1782b9ef5b139fab855bfaad2db17646c94f33de2d2e84aca4";
+      sha512 = "6160d0412721f299dc119d5046052e99e2c64dd7f298cf1704d7f0eb6d25123f1fb2d5e6084fe1b347921e49f041798b49f696514ca04583ca885eefabdf15fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "3bdbcd0efe048104c09e44645bf11d3bc2daf61d3158d02d4407c8290fdd51c7c63d8ae7a111132b173a0fa86e73350617aed47fb33d9a97b911b20d552602c4";
+      sha512 = "8f995ae9b50c0eab7e8ae2a7206ad556e52122b0084b4f24b807f1fbdb4b124a5c539460610cbdbe4f90f1b312b653c9ee52607ade9a1082b270694284e9dbef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "1fded332e034a7ad70fa2a33d4033301291098b5deed26cce6e3007198f0ed998ad32fb019d0126c5fef7bbc546f5c483be56ff0d0ae299b42482b283c27d4bf";
+      sha512 = "81ef8a83df19437b37b0834a15077ff23e084021c438578fe3b38bb66d2c6b37957557e9e5989674799abfb9f530ebf6ade8f0e25897e6c82842f80a6c36ec50";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/gu-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "36b1c695fcd4db371c27d6560c1d39f8cb692a297423fed0e8bd11ec861b26ad0b94c97e7283828954d183ca69c4347b378725e04454fb4ea146836602ab3447";
+      sha512 = "66b0645cca9f77f13fd2c3fd4d38b71cf44567cd86d58e649cbebb1ab0b07d3ca96d14d2b34e33d8fc09e2ece2c4fa6c253f4d55b6c8414b78e95b9e8c4bfe80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/he/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "5c96152e5244b5da39b4c86a24282c289516c7555e23d0152796c7ae78ecc186cbe870affde2d25f5d30533d2f73970d28ef7595b9ff5f006f1b7eb17fe78fc1";
+      sha512 = "666642c10644bb2f2f3e31bd813a3a1c6d930a25c879130250a8484d82acb471b1a169181ce7a49a01c6ec78e4e8ce61f8ea5918b8f87715312ac07adb087120";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hi-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "ddcd5ad522fcc041028d82d212dfb0c05c8ffd6737af6ed044bd7d26d34317cad252cfea2002075dd855a52a86be84e54f02c2038bf1aafb1b10adee90415d31";
+      sha512 = "53a6e801c45691cac7e1946da9a018aff3dd1f0ccc89d1048f31940e0affb33f7fa34e258cb6bd0e7336369a1862a9ad42d0e2c782c459c9de245c99b4e58f70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "a4131caebecb7d340f8a006684118f801cc8a9987cb51d219d5463e4de5fb934a0a9856655224a3977657879bb45f823ebf41271aea26878efa52ebb1357cf34";
+      sha512 = "11b09786e4e2ab89c814560822067b60681eff0ef43ad5479df5239c729326db6cde52a535600c3b4ff8d9113327cea38224b3e2f54639df868357d08e0e7bbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hsb/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "ad25dd1d0e795150537860b60174ce0c475b341605328d68f4cd1e0bf0c5609e08b6d637ef4ea654f2683a15b8a5dfe2ddf6a9fbc609ae13a4add26d4ddab4c6";
+      sha512 = "da0dd10538f0cfee6f9da54dfb48886e7dc74268a4e800f8b5e4e91fff1adf4b1f0b55dfa30d534d82200d7dced710f2e19382b6eb7e48882b18c6856939413b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hu/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "15227814eb13d55b9a5274cd21da6127b4012292403b06fdd76306b1ca40fa32992ed735a43be6229cb0ada49424c23dd655fe9ecc8361c107352fc40357a804";
+      sha512 = "a03d4b60b08d8379c21010f39065c782dddf2c521043f10746dbbfa83d01a6e4fb7d9422cb637b8d16966616e06c2e631452da1a3da491bc7a18a8ad64d6991d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/hy-AM/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "10a88c32862badf5db544470dc0f3b08276e74f0571b6f4e3af80f6f29009288d9760d553776fd273e0bef41b039a318f09deef478fa63694096d4ed9fb7667a";
+      sha512 = "95c0c4ec529ebe05115f2e6fa31ea9c41e9c543a4da8e68ec911a436eadda7e7f7e3e6cc6f0422d99102e839cf8e19a300e0ec343d1c8f056a84e14e682b40b3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ia/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "4a44abb56c89dd65cc89be06fc17edc79bd6fcdbc600860bfddedaca277e03a5cc146bc89be4e3529bc320e1dad14d080efa6d388a56f0511fad8e69c5752ca4";
+      sha512 = "32adf28b54a7981aee100f9649e75d24ee0e620a62ab814a648caf901a504c483cac675e7c5320f777e2fb02e56ba38e6828efbd59c77d0425642289b99f3178";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/id/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "611036954d22acf9b82283e44e869a6cbe6e46f2111b30c410576af281e907f19abe4b885ed1ba68d67de7450ca22bd02c020a9aaf43dce6b64828c55aeac373";
+      sha512 = "3e9aafd39dc1ebda9ee0789c6ea58c25f755c73d70e1c5a16496c81d4f6b222051aa5b46ba3f98319bfcd767df1bef50ff90f81284441758e7b134c3dababc8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/is/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "051b1f604bae1d65d8001dc524b2edfe36e1a07e4f8625aa908bf912e7791840f6ee83581cecadec079eabc67961bbe8204f5992795b2cf4b29edc242d741837";
+      sha512 = "1e4f604e74be51e1f2f32e472c4d67183b46d85661c08acac4adf9de2a632e3d32637e92cb5bf2b9141babc136f15aefd74a61a3d7210dc8fe1bcd119d6cccd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/it/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "3939de7cb78afe4749d9981cc40bbd8157f028f6f19b247e09d25ce43af7341d2b8544be37a1052ffae17a0de796333c203fd89408fd9d390b16f41947bcb985";
+      sha512 = "7491c8c5f9ea457629de4f907049f5a67d0c412ec430eb29f38bd7d771df779d70733f839fdd1cca978b1b8b89f7b65dd9a3d3af3848dc1ddd5f8376af74efa0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ja/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "63ca3b592e0473a2cc24bbad734091d90e35464da526d6696b68bc2478d1fed2571f3ba6af51d5d19898d7640c6afc5cc3354593ef9d3d389410b7e50495b326";
+      sha512 = "b1bb46337e10209359b83466fa19d9751470b30434a1d58a030c2bb858d66bbd736ce8e3790292974b069a6dbcc32939d0fcdcc12b64e3db7fb58a9695c2685c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ka/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "75a3ea5b87058d3e793cffff69c6b13b0e65395241ed2bcb3f566adbfb6c9a7f6f419f211f1fe11c2d44008091f3b7132495961d145c155191d9fc7af29682f2";
+      sha512 = "179c0975bff295c8e052bac86224d7b36d4ae35b6788b0de88e36789d7d3027310515826cb96500c251915cfc936c4762438724552552f17502e913b4536d67f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kab/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "290ebd2df481ed5b4b3663e1746b5804d9d7fe6aaedd2e81f10f566fd7668dc27f869e992ef023fa921c77818d8e389676de5cb94459ece81aa3828e02f527b4";
+      sha512 = "bf708a69c2bd801b34ac349934609b5dfccd9104e90b5f2cea09c0d9eec3f5ca4229b64cc2226285af8091a556535c3fe5966c30ee97a6077e190732124f6dce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "372ec57b95d63469552683d709862d66cd5ef16c3b6c91c618193799eb9cc1b882666be8137bd1d037e656d7841e4a18cb1f5cd5c477e49e7f933bf7860d4116";
+      sha512 = "77aec4b603d51cab49d2b055bac3036ffa110d324335ea0259b9b8b290ccae717c20c531e64acf4ec287d166a11a888c1fa8da82ca35c75fb68fccffa3a55d27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/km/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "56202e87711e0f23e46f361d135f36ed4a2a55f8743db57cdd91d433e70a1d0d45f8b52f574c683f65980df220b194c93726e036624778385bbf1ad7f499a899";
+      sha512 = "53981a550e4e2756ceca86f8b6b23da5a7048f9244bb84fd090cdfd801a9bbff6ecdfbb8bc54146c97936e7d66256c3f9a3415749b79860ecbd8b1f2fb6bcdcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/kn/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "2c507240bf10fde9b7576b95a129e33a06f88d8c962c39a50366d4efa72d2520bb96cf756fcc911c92c04b008ca0199fb8f79f871df6153eab247d228ef5af64";
+      sha512 = "621ce46516f18505868304da207f12c4515a4fe8adc255fcdd86d61a475860093a8f6941902f71cb9b7772d2e0fcd8411f354477bf5b18841cc48cb318f6d1b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ko/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "925c3d9a67b697493de83c8fd1d59ba7cc309f37c42f7db60668c82790cb90ddde405cc90a0a88073419788dc040c5bcbd4efca38ad415cac73e3e21f6f64fe1";
+      sha512 = "c46f6435f7e50a498ee0bed0918941265aa160d8b932a2b668f324a6a67b82aa2e96cf1a2974ec66c69c1a6aab3afad98fb753cf7d26a62a8d78148ff1343e75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lij/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "bbfc7409fde63525642c12f82af5693f7e6857e3abe7ca21c298e45ede687797efe35dd4f874f94729f5eaf01392c49899ee62cc1a48c6565c606267ed59c825";
+      sha512 = "2e75b0e3e25b6c2de02590f922755824dd86cfa46672e0a628fc3a316892e83e08409d1ed7ecd523d878366e5309cdae5908b41bdca81b6e9e6a6079dac1b77a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lt/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "2770ac893a60bba546fc44c3e88deb098eea8c04874d363dbbb974f3bc0037fb600f681e95b7184a5e8d74aa61e4721fae21225b9e5506d18e6bcfb39ba24027";
+      sha512 = "8298ddf054f8e011e8fddc517dccd4ae0caf73bc13563b5725b5422e8d6fb1d3e59af216a501dabfd5a2b6fd824b62bd944776343170948edf4fccb414c1d607";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/lv/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "5a9e58ba15226a919d92efa893e3e8d05ad905eebe737cb7637259279403a545845cbe612389d5aace5cc1791640d9aa0d0e8e73dae032de48312ec55123c387";
+      sha512 = "99ccec4cf5ee280a14c680755b190e3a1d011b8837db405738a36b998816a805d664ad38113b5cf64696276a8d8acddd0daf248aaacfc52ed1178ea6caf32e2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mai/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "73ced087da65a903dd9233103dc955b8429cb07dcc262a15e02dd0782c2eed68eb239745d14598ac261e40f7abb5c8004724389956f05a3f607917fd1c68aaaa";
+      sha512 = "f79a4325a3aceb24fad97c191d94d9133719d176f00cb9ee43ca275d29cc582b0a27f6a06f02106bbccd85b53791b6f2e0a7f751d9d0eb68bfd5d34a332e1088";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "71c65bd3d47fcf2dc295f595618856f6d37d794655ed5b443c0d4a57667792eeed18a262df3a1c29661ccfe163d5628c1f5980f01fd7bf5781ddaae617118e56";
+      sha512 = "abe2b26198a4d94c2842017d28e3a23229d6c67dab99d436760ed2f7458bb613f31b9f9e56b453f4d7c1c398e681fbb6135f827a313eb5b1ba0a2964b042c198";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ml/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "f7b9fc140cf6f2632e5b62e1747d0c5e4fa8622f3b1a267d2f43143a4167f99c73a08b54a535ed3b4853a115dd11831143afe100d128aebb07ff46ee406552bd";
+      sha512 = "c197b8bb1f436ba151030f663e686ed41efe6d3dc162551fcf4bbea1d6de0f08354308323ecea722f2068b36503b6a896542fe35f0bb44d6e4e0227e033da3bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/mr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "7829daa88913ef2d0bdc07549030e6659825e7ec2a22b3431565080e0a18da24e29f057c51fcf1d6b8705b994720c203e04fb71c5dea7ec5780b27f2e6cd463d";
+      sha512 = "5052273c867fbbd433c83acbbe701679ac073dc468ce60516aa326dc798828a03d7bb8d52e14bd45d0a66d0da4f5c9c85a7877ab99565259c659734443e8383b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ms/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "576c4996091d788d2ef814dd150972abf909bdad4f351b1fc2de31b4b45910e5e565c873b386b88c44f2a4472386335a68a22fe36544b033a7963d80b3252ac1";
+      sha512 = "29bd77b97746166569ccb56ed32bbe4122957fc00738a9ca246fdb2d6dbf4bc1537f53bd07153c4e1605937795a7cc37257618a83676ffce7af1396a626d227a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/my/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "869ab9e2bf7494203d44917ef254ed0d74465abf93e93fe6feed03c60988a1e20d932c92290028fc3dfd4e9f53194cfeb229b7f9b254fd45d05451c776ebd077";
+      sha512 = "a8f0b2d6d29ab10053ff9a90fc44aa16c98862337237a5c45c6e4dba98c96545e8fa683814e1ea00d2269cd86f12841d7fede243ffbc3dbc1ee1d7e51cdbebb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nb-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "bd2b1e3707d233d248b54dce532b70455414d740993c5526834acaf0ac72f273500e5f601d1fe5c1d747780ce5300317d1e6d0e106726311ebd3e8f3568f721e";
+      sha512 = "40fc4b9a8e6c94199c407e43cefd14c9bab34c2faa4f80d0452519c2a286d77961421340d5bc4103df81e0de6036f058db06614b89d19d4c273a5f7c81d0aa4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ne-NP/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "ddaac816dacc0d07940dcbb034a6c117e557733b51706ad32aa974ccf76722961aff057e0bac299315a064000d65c92d8547a89cb8e522a8bc8b473e2d3e6425";
+      sha512 = "9c309cc9eb2fdd16a33e15da0bb67998b5d6a1a4768723898293dfdb0bb38138339b566324767b427326e7c89600da199f33a8c4ebadd15cd74dfede718b0e8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "56711c59af60b7082bf3f2c413ad94aaea489d3984e4afa55304022f0c57fe072efa597533dbec5ba8e3aefb2ced9d365a7564ebcaf93e77b4911cc28150cc80";
+      sha512 = "281cbcf67bf6a75525b84e6552db454a481cdf92f6382258f05a4081eebc2a4db0ecf0a127f9c99c0d7bfca7a8b33850f2dd412ebf23f3bd2dc794d51a312ca0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/nn-NO/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "a6939789ea572a5687d2d542d9a5fd57159e7d5c8384e82816fdf69417f5416d23883d571041dce6c285b66e6ab1b90190818f87105f7c06c0f6bb0eac45ab3b";
+      sha512 = "bf540d7ed9ad4e3290f33105bfc228ed096d30da7d99fc60da3c2fa386913cc98c3202666317fc8e52270ac14c5c778cbf8385f113c723062bbd61c18ffe128c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/oc/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "9b51e1b2dd125e12bf8de2517432fc9d60a6e807372ad375a949c0c6ed3d8ccd4095eeb30e275ede31aa89a9c831c7f9108173ea2d207e0ecc37593094f67020";
+      sha512 = "1838462fdedd67e5be3836eefb5e06d2607bb7b18459514c5a16c4e31d84910c44e3bad8a3c1a492a96ac60b68fc123214288dd3cf22e067de3cb19ce0e88faa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/or/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "6f3e10d95af809d98fee038039d048dd9da04d97465c6ce16a97d3a6bb1d77bc3481dc347b8e120ecd9e10daa47242ea11601e13236c4d7804d993b4ee455ed6";
+      sha512 = "323b67ad29b15e809e9b7d5601abcf107ed4d80452f27e47edae9baaabf664aaff08f662dfe049ceaa1588ddf9efc976c220eee5b1b1c623447c155fd4f56971";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pa-IN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e9d5a3618744e99604a476d39b04b35618b589e90d655ae7ceae942e0944a2395d01a6a05e386adbf3dbf13f6e3eaf8823a04d307d92fdab4086261736800e07";
+      sha512 = "d54705ad2391bc0c4015b0729f86f651e321ef15ac4af72e47f31087e3ba87bfddcbdefcaeb17dcf9dceb4bebee7665785e06eb2537b56f2a22cb55afc7091b5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "cc5cbf37e8af29d9a186ea5e91ea263a77db7ff7758e58877a9227bb1e3591b80bf112e0bd7535d8e30a519427724b52a557799d60acfef053f02b383b25940a";
+      sha512 = "d5db33a8ec5dae3141c6b61d23b0bf3c33c8b2ebd5e29aa71adaa5e03753e646fa45b56cfa4961609580585f9ecbc5b8b899f9bf3ccaeebe036be450740fefc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pt-BR/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "296054c1424fc160b8688d89700b37271d3d16fd29ffb85275e0488fc45a3465c2f060bf77d5b6c1e8d81c2d53ee5cae6853cf26704ae7fb5222351b09e652d9";
+      sha512 = "7507d710c231e8bda52d01d7ca757523790a61f9e8b3cd87d7b81ae341c62fbaaf7b731658d21bef2a66f7b9b65135fb5863f7043dd12f2444d72c3dd89a8d8e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/pt-PT/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "c32d68de0fb3a54b38db13f6416be06745e61767d3dd2dbcfa3d397ba54899318aff0ccede0f562b3cb8b5a2b4a126f5f0300c146e9d4d847148d1392bb1a2be";
+      sha512 = "98634081c0976e04794ce53f237ec7c9bcb7dafa106accc50c6cf13ec2e69c1c2e70e3f6c8e3b6f56a7287d60fac632ad027a8bc5d0fc92cc86296ba4440d160";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/rm/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "92bf05ae92adbb08e70e610d46e260c63158073598718fc64ba5e14f8f15c8ff712353586da0b2d693d070bdeb48824b0c68a36acb101b483b8af4bf37f74eef";
+      sha512 = "25c77c8ec3e4531522991568c0b380eeb51332afcf086fef9c1a6a583bf615cd4a7fbded7d4fcd292ffacf79ef0f15df92d30f394e58c20bf43888aa8bc155b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ro/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "3e5da35749bd3a5da3172b9d567e4baa121d268a0d13611becec3e497cec2bf652effd26310a4147204940499fcf837bf20138555c4c0bd7c034ec3d36d983b1";
+      sha512 = "8a70253983d92f187bf96037e4c319961040d8709fb4f71814dbb02b48d6b4565008895a5c0708878680963a2ec04e9ac90d207cea381ee6ea33cb95c6aa9727";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ru/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "a83c33ead97106e384a4d16f4436e639bc736db9811e162e889f159ed38d37a670c6256a0f3d5b5dd7e62e03dd140cb763c02d5d915b2fdc1de35650de0fa165";
+      sha512 = "0845c354ed3c31b31a9d9e7afe6f573ae1fdffb990aff5cf0a6d100da27cc218d6245024623d665146d7793b6cff209effa9587b6999cc0c5c7b427037616165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/si/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "272cb7022e819e930ada868f2260c991bf21fcbbd8f219ca9d3199e2152059d2956c490bd7ebd10441ccc261210f9b8fabce4a41cf4e01939aaa2054e4ab99b1";
+      sha512 = "6bf31f8262c584ec8c9b719736c516eb179c5f66d384f59761edabb606808928115a850f278894793b392a6d16f9008de5edc8efd1d8023a55041ffdce2d5a60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "dbe0b1c1e63836eb695a24ff2576190d4a0552c9a7b6b2373a3b55774fbd9891b0cf32f53e95923fc267e8fc052bceb79d3d900ef060b92cbe40d7f0dddbcb49";
+      sha512 = "cf2a01c6d0ce55c43a54afaa439cfb074260cfd4e03c70e2c3a6eac011ff4c77c7fa6f5c3fcdec0823066b7caec7230d46911173f73ed65ccfbfb37d30c9e156";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sl/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "7422cc10f57ebacd937a3153035cb8acf369639f117d71447e002fa151cd108f2a8609563fb9575c2c71271f3f4e50fa5211cdda88a1ae53847045aad8af9b9d";
+      sha512 = "3eb37b8878d2cc28cf385668dac9c6487f76d9c1dd834aa2d81b5712657e3a5a76b229e03bbf9f5f464df54d2df412ff2a4aa5d78900437bcc2c0129317c825f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/son/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "8eafe8f6e1fc8170f622f29e598c6a06ccc507dc97d180e0810ff971d7fc4a4a965a75f1eb878483b03069ec0484833bdd0c0c1aafc732982b8cc802249914c7";
+      sha512 = "8f66f2d505fb113cf48561380e350632696201e207cc4a39a6757dbeecd923172fb5ee6d58ff771f8cb578e95c1bf01223c90fa14d4a1253c199978a499a5880";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sq/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "32a5e3d158e8931cca10777a59765cd8aa823678cb339b013519b07045b8a6614082bd6ae81d7871cf22fda10570fb4934c05be5dd16b0610f9bf7a1f19d671c";
+      sha512 = "3828b306dfaf69b2d5b97ed2d026b40e7d1dd323321712bfd746e930e62c0b83b27a7ddc225c218dcc08ff314104e6287bb3e010985f3df30ecd630d22c8a0d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "42877a689c178b9ddd8711b2b15e51062411667ac4c978aebcb364ee9c71764c8dd64963966fd17f3bc929c9853bdd54c12ab312a4c1527f7adad277fc9adc32";
+      sha512 = "3eefba51599529796bfb02e5ef558077f0fa65db9cf856d9b189a323284274827f2d10d7f16759a28480167cce7c773d6c59ad7802c303ccc9d7ea8bbfc45fde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/sv-SE/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "48605bdcc841dca8a663b61d75d30e2bc7e0722be9e47833c42fc0b6ae275bf778b5ca534e66440db2cd85de70f8725f25a1f9a303b2fd8057fcbc1f4262e0d4";
+      sha512 = "1a15fb14c63c741c068bdbdb2965311ff367acdbaecfaf174a88b42470cc5e36ad190512aba8cda7e816d8d01449cdf9fd34203fc9bc868124381f5daf527e17";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ta/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "7ede0ec9dc91cd2ca4226e5c361b2f14c592e77573bc64feaba4aefd24dce79d8139967f5c394bde440ecec5fc83e21d8d17e00923775fa33ed39b055ed50fba";
+      sha512 = "ee860b0595d2e0a9341d03a49df3cb82db3e272dbd258c791c1c575e5aaff3e29c755054425d8dfec0beaf47af9d05e0266116fe00a3e5ef5e8c298a31fe492b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/te/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "b37dd0bbdc6a8227fa76902ddd049281bc4313bbd5cbdd90866036b400ecb0b07d2995015c48e37c69a6c68de3b8810787fdcf138c36075a47fbc43b0106811e";
+      sha512 = "c4782516677864b28e5ebc01cc5cbda67fe7ce2912adcda0cec00958f2bbcf6ee2107b622dcb1170d32735dfceed80a2670f05c6d879ff3f626b7626aadb1811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/th/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "29ce9cafcb24811fe6c9ef33d81d3f43634bf4acee7e3f1905d743a241bbeeb1d8d44d210389d28f6fb740f6ecf37648e808717780319f54f9c198a0a1b3f319";
+      sha512 = "409d4a385efb0b1ef61d7192873839e7b1d99aae50af62c8e7ed689230d2588b3d5b6d197c3c96f1e7ff6b41551880200ae2d32c936cbf4a5fb9e00a71251070";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/tr/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "b1248f1e115a509554ee8cef5316ea85020fdc8c150bac0b363b25123ec17b40fd46d34f2a33a161fa66822fcbd4b111313986649931e0e6ed2c4afff3ea9279";
+      sha512 = "ed3b6f18e54df3d342bcf7674fc48c84a4321db52af779aabf3d3150d96cca9a0e86314d4ce1476894343f5789e227db5aa8d8dc0abce0474d215eb7cdd3c084";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/uk/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6220697e54e30e70267c3d777763da05bfc6625fa9c239a5c761ab3b992d3fa5e1271332011fe7aa218a615917002351c2c5e9fe4cd278f99efaa635f6934237";
+      sha512 = "cce08b4cb1b820ca5bc9832e7ed19e753cc6db066e3bd007f58ce713d85976f060cae4b221833e085d39effc5a2dcb288b6fd89e4a3ec01577afe19585c6061e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/ur/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "bbbc09b0f0a88cf5540c4bcdddd226984bd91dd7aaee1256bd8142535b5e949d54dd8b92990f1d71e3695a8ff0054530dd64564edafb21bcf93e6764988c6568";
+      sha512 = "a9e137a01005de3dd60d05f7145134b3f2d5eb96ba84895effe434228fdebe995994682ba83c3368046732d8ceea7bd0289d4c852a0771feb6099fb29d524666";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/uz/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "164c63d66666ee819a88169844859c8db95ec5281eeab77e30a63b1cca1fafd97bde09538665fc433ab9ecd62d05ac7fed68aa43bbb6e16476e34461ead4164e";
+      sha512 = "3ef9a4d7e92d813c3ec236869452372ba1c87cd978ffe7dc230ef410174625fb3d64caaef6c378b7609043ed5f3482dd6e03a975e0574365deeb6b35a1523600";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/vi/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b12a47314960a28c9527cb2200286070294d4ebaf6260b9b4d4c483e4eb98cef349e4df7ed7c60c032a327aadf101994a49e2226a2a0cedf7793feec42e85cc4";
+      sha512 = "d8b49627c29430ee420e8c878da1fde7df4fa0b3aa5f145b0003f7fd9270d9a7d0e3d5f9941dee9cfc081a376cc922b7652667f559421e5e7ca8aeae8aa4ddfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/xh/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "147b827716182a41fac6170656ab53bea4b658a0de537c57a0ca786d77ef4227c433c1ebc09d1dd00a4b92e07f03eacaba5928b61e055af67ac35b1aa9238890";
+      sha512 = "de32d3f2b715eaba412484d1b3e67d9ccfd53afcaf9d0a829c9873f07edc88d3f8c984d0752ef7dc378888a92ef515f6ace3ad4e4c98ab40f7232ed385445d13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/zh-CN/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c47f74481322b2f480893be1ba9f795d951af2db7632b6a0fbed6e00155a4dcba12e7a8f4a7a3f44460540e499c03b2561eaea5a67d22f68d31cbad8fdde58e5";
+      sha512 = "109d325c32a754dcf004e3dab0716a93ec7a29718719128855b0024f75822662df48d6c609cc1c2fc652818f3925972d9d317b928349db9ce4b267cd10e867e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b4/linux-i686/zh-TW/firefox-61.0b4.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "41c5b6b561995a4a9a7b954ce0c6981889b89e046ca7420bc17ec4da7de90c11e7e54b1408587e7bb60d58b667e51816dd748f651bf7f3abea6e84bcf86659fb";
+      sha512 = "6c85e5e20da3495ce351ca04ecda4addff13ce8ef09b14194110b409f9aa89c76eb6d4b851667414645249012cfb544ebce1dd41ca05b5d18873d4ecf3bf4960";
     }
     ];
 }

From 4e891cf4d52d246b73f986fe034f4c81f76705c9 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 16 May 2018 14:30:45 +0800
Subject: [PATCH 1914/3370] emacsPackages.emacs-libvterm: Fix build (flipped
 over libvterm-neovim)

---
 .../editors/emacs-modes/emacs-libvterm/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
index 9b7a0ceab5f6..f37d2289342a 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-libvterm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, emacs, neovim-libvterm }:
+{ stdenv, fetchFromGitHub, cmake, emacs, libvterm-neovim }:
 
 let
   emacsSources = stdenv.mkDerivation {
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ emacs neovim-libvterm ];
+  buildInputs = [ emacs libvterm-neovim ];
 
   cmakeFlags = [ "-DEMACS_SOURCE=${emacsSources}" ];
 

From d273691f6da5490cc7d647261100a7c2fcef0670 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com>
Date: Wed, 16 May 2018 07:41:13 +0100
Subject: [PATCH 1915/3370] trivial-builders.nix: support directories in
 requireFile

Allow recursive hash for requireFile so it can support directories (#40568)
---
 pkgs/build-support/trivial-builders.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index d092efb556e5..2ec56c94763a 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -138,6 +138,7 @@ rec {
                 , sha1 ? null
                 , url ? null
                 , message ? null
+                , hashMode ? "flat"
                 } :
     assert (message != null) || (url != null);
     assert (sha256 != null) || (sha1 != null);
@@ -158,6 +159,7 @@ rec {
     in
     stdenv.mkDerivation {
       name = name_;
+      outputHashMode = hashMode;
       outputHashAlgo = hashAlgo;
       outputHash = hash;
       preferLocalBuild = true;

From 0910be832708100f20442cf0ec573161b83284bf Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 11 May 2018 00:49:18 +0900
Subject: [PATCH 1916/3370] btops: init at 0.1.0

---
 .../window-managers/btops/default.nix         |  25 ++++
 .../window-managers/btops/deps.nix            | 120 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 147 insertions(+)
 create mode 100644 pkgs/applications/window-managers/btops/default.nix
 create mode 100644 pkgs/applications/window-managers/btops/deps.nix

diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix
new file mode 100644
index 000000000000..f55c55110a29
--- /dev/null
+++ b/pkgs/applications/window-managers/btops/default.nix
@@ -0,0 +1,25 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "btops-${version}";
+  version = "0.1.0";
+
+  goPackagePath = "github.com/cmschuetz/btops";
+
+  src = fetchgit {
+    url = "https://github.com/cmschuetz/btops.git";
+    rev = version;
+    sha256 = "1ilidvpy7gz49zqp6rf0q7wjrc3r0brdrcp4r5f6i6p9cwybqkbq";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "bspwm desktop management that supports dymanic appending, removing, and renaming";
+    homepage = https://github.com/cmschuetz/btops;
+    maintainers = with maintainers; [ mnacamura ];
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/btops/deps.nix b/pkgs/applications/window-managers/btops/deps.nix
new file mode 100644
index 000000000000..a893d40e2107
--- /dev/null
+++ b/pkgs/applications/window-managers/btops/deps.nix
@@ -0,0 +1,120 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/fsnotify/fsnotify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/fsnotify/fsnotify";
+      rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9";
+      sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g";
+    };
+  }
+  {
+    goPackagePath = "github.com/hashicorp/hcl";
+    fetch = {
+      type = "git";
+      url = "https://github.com/hashicorp/hcl";
+      rev = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168";
+      sha256 = "1qalfsc31fra7hcw2lc3s20aj7al62fq3j5fn5kga3mg99b82nyr";
+    };
+  }
+  {
+    goPackagePath = "github.com/magiconair/properties";
+    fetch = {
+      type = "git";
+      url = "https://github.com/magiconair/properties";
+      rev = "c2353362d570a7bfa228149c62842019201cfb71";
+      sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn";
+    };
+  }
+  {
+    goPackagePath = "github.com/mitchellh/mapstructure";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mitchellh/mapstructure";
+      rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b";
+      sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7";
+    };
+  }
+  {
+    goPackagePath = "github.com/pelletier/go-toml";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pelletier/go-toml";
+      rev = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12";
+      sha256 = "1n8na0yg90gm0rpifmzrby5r385vvd62cdam3ls7ssy02bjvfw15";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/afero";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/afero";
+      rev = "63644898a8da0bc22138abf860edaf5277b6102e";
+      sha256 = "13piahaq4vw1y1sklq5scrsflqx0a8hzmdqfz1fy4871kf2gl8qw";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/cast";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/cast";
+      rev = "8965335b8c7107321228e3e3702cab9832751bac";
+      sha256 = "177bk7lq40jbgv9p9r80aydpaccfk8ja3a7jjhfwiwk9r1pa4rr2";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/jwalterweatherman";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/jwalterweatherman";
+      rev = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394";
+      sha256 = "132p84i20b9s5r6fs597lsa6648vd415ch7c0d018vm8smzqpd0h";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/pflag";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/pflag";
+      rev = "583c0c0531f06d5278b7d917446061adc344b5cd";
+      sha256 = "0nr4mdpfhhk94hq4ymn5b2sxc47b29p1akxd8b0hx4dvdybmipb5";
+    };
+  }
+  {
+    goPackagePath = "github.com/spf13/viper";
+    fetch = {
+      type = "git";
+      url = "https://github.com/spf13/viper";
+      rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4";
+      sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
+      sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
+    };
+  }
+  {
+    goPackagePath = "gopkg.in/yaml.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/yaml.v2";
+      rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183";
+      sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5260dbc016f6..5079a98bdb3e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15063,6 +15063,8 @@ with pkgs;
 
   bspwm-unstable = callPackage ../applications/window-managers/bspwm/unstable.nix { };
 
+  btops = callPackage ../applications/window-managers/btops { };
+
   bvi = callPackage ../applications/editors/bvi { };
 
   bviplus = callPackage ../applications/editors/bviplus { };

From d86edd5161c28f59291c23594de5e9002a1a03b6 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:09:22 -0400
Subject: [PATCH 1917/3370] Dont haddock ghcjs in either version

---
 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix | 6 ------
 pkgs/development/compilers/ghcjs-ng/common-overrides.nix  | 2 +-
 pkgs/top-level/haskell-packages.nix                       | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix

diff --git a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
deleted file mode 100644
index 72066ee17018..000000000000
--- a/pkgs/development/compilers/ghcjs-ng/8.2/dep-overrides.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ haskellLib }:
-
-let inherit (haskellLib) dontHaddock;
-in self: super: {
-  ghcjs = dontHaddock super.ghcjs;
-}
diff --git a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
index 172a48a5a654..a88e2c48d03e 100644
--- a/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
+++ b/pkgs/development/compilers/ghcjs-ng/common-overrides.nix
@@ -3,6 +3,6 @@
 let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
 in self: super: {
   ghc-api-ghcjs = addBuildTools super.ghc-api-ghcjs [alex happy];
-  ghcjs = appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install";
+  ghcjs = dontHaddock (appendConfigureFlag (doJailbreak super.ghcjs) "-fno-wrapper-install");
   haddock-library-ghcjs = dontHaddock super.haddock-library-ghcjs;
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index c00bce430c3c..2e6bd5ebb853 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -93,7 +93,6 @@ in rec {
       inherit (bootPkgs) alex happy;
       ghcjsSrcJson = ../development/compilers/ghcjs-ng/8.2/git.json;
       stage0 = ../development/compilers/ghcjs-ng/8.2/stage0.nix;
-      ghcjsDepOverrides = callPackage ../development/compilers/ghcjs-ng/8.2/dep-overrides.nix {};
     };
     ghcjs84 = callPackage ../development/compilers/ghcjs-ng rec {
       bootPkgs = packages.ghc842;

From 0f850499615ff2327bf5fd16b85b3c75d56edac7 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:09:40 -0400
Subject: [PATCH 1918/3370] bump ghcjs 8.4

---
 pkgs/development/compilers/ghcjs-ng/8.4/git.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
index 2d4a7a42667b..49ff19529c6e 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/ghcjs/ghcjs",
-  "rev": "c494a598d1e5b6d70ddcb97177dc4b6cc71f5bd0",
-  "sha256": "1gpn1y3m2gk2x4anfh11p4cp49blabj761wicawvkw0w9bfhcfhn",
+  "rev": "6770fa38621f55b7a947fc11c69f81b8ce8502cf",
+  "sha256": "0c0x0yylx14mrvzmbvkw6zbprriizk73hvz8iija8i8hwpff79vm",
   "fetchSubmodules": true
 }

From 9326126fdd73ef910441553a815fe300bbfe4d37 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:09:54 -0400
Subject: [PATCH 1919/3370] Add gcc to configured-ghcjs-src for macos

---
 pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
index b9435b311572..e8c24b21134c 100644
--- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
+++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
@@ -20,6 +20,7 @@ runCommand "configured-ghcjs-src" {
     autoconf
     automake
     python3
+    gcc
     ghc
     happy
     alex

From 2a32834ad9ff1d44efdf3a24a3182ddc8eeea2ed Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 16 May 2018 03:10:52 -0400
Subject: [PATCH 1920/3370] Factor out bootGhcjs for justStaticExecutables sake

---
 .../compilers/ghcjs-ng/default.nix            | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index c2fb6a03c6b1..71bab1a4e66a 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -35,7 +35,7 @@ let
     ]);
 
     targetPrefix = "";
-    inherit (passthru.bootPkgs.ghcjs) version;
+    inherit (bootGhcjs) version;
     isGhcjs = true;
 
     # Relics of the old GHCJS build system
@@ -43,15 +43,24 @@ let
     mkStage2 = _: {};
   };
 
+  bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;
   libexec =
-    if builtins.compareVersions passthru.bootPkgs.ghcjs.version "8.3" <= 0
-      then "${passthru.bootPkgs.ghcjs}/bin"
-      else "${passthru.bootPkgs.ghcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${passthru.bootPkgs.ghcjs.name}";
+    if builtins.compareVersions bootGhcjs.version "8.3" <= 0
+      then "${bootGhcjs}/bin"
+      else "${bootGhcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
 
 in stdenv.mkDerivation {
     name = "ghcjs";
     src = passthru.configuredSrc;
-    nativeBuildInputs = [passthru.bootPkgs.ghcjs passthru.bootPkgs.ghc cabal-install nodejs makeWrapper xorg.lndir gmp];
+    nativeBuildInputs = [
+      bootGhcjs
+      passthru.bootPkgs.ghc
+      cabal-install
+      nodejs
+      makeWrapper
+      xorg.lndir
+      gmp
+    ];
     phases = ["unpackPhase" "buildPhase"];
     buildPhase = ''
       export HOME=$TMP
@@ -61,7 +70,7 @@ in stdenv.mkDerivation {
       mkdir -p $out/libexec
       lndir ${libexec} $out/bin
 
-      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
+      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec -dcore-lint"
       wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
       wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
 

From 54cf5d935893a06c62ca7affd2ba95ea4c1f36e2 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <giulio.eulisse@cern.ch>
Date: Thu, 26 Apr 2018 09:59:20 +0200
Subject: [PATCH 1921/3370] pythonPackages.uproot: init at 2.8.23

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

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
new file mode 100644
index 000000000000..e58bbde1353f
--- /dev/null
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -0,0 +1,22 @@
+{lib, fetchPypi, buildPythonPackage, numpy}:
+
+buildPythonPackage rec {
+  pname = "uproot";
+  version = "2.8.23";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "121ggyl5s0q66yrbdfznvzrc793zq1w2xnr3baadlzfvqdlkhgj7";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+  ];
+
+  meta = with lib; {
+    homepage = https://github.com/scikit-hep/uproot;
+    description = "ROOT I/O in pure Python and Numpy";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ktf ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7748120cd49c..bef7cfc04800 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14744,6 +14744,8 @@ in {
 
   uritemplate = callPackage ../development/python-modules/uritemplate { };
 
+  uproot = callPackage ../development/python-modules/uproot {};
+
   uptime = buildPythonPackage rec {
     name = "uptime-${version}";
     version = "3.0.1";

From 84ae5f1ee34c10863d5470f527dbfa7ad281b93c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 16:12:50 +0800
Subject: [PATCH 1922/3370] vcal: init at 2.7

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

diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
new file mode 100644
index 000000000000..8e658381b2d3
--- /dev/null
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "vcal-${version}";
+  version = "2.7";
+
+  src = fetchurl {
+    url    = "http://waynemorrison.com/software/vcal";
+    sha256 = "0fknrlad7vb84ngh242xjaq96vkids85ksnxaflk2cr9wcwxfmix";
+  };
+
+  nativeBuildInputs = [ perl ]; # for pod2man
+
+  unpackPhase = ":";
+  dontBuild = true;
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,share/man/man1}
+    substitute ${src} $out/bin/vcal \
+      --replace /usr/bin/perl ${perl}/bin/perl
+    pod2man -n vcal ${src} > $out/share/man/man1/vcal.1
+
+    runHook postInstall
+  '';
+
+  # There are no tests
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Parser for VCalendar and ICalendar files, usable from the command line";
+    homepage = http://waynemorrison.com/software/;
+    license = licenses.unfree; # "These are made publicly available for personal use."
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5260dbc016f6..b371db1f6603 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15982,6 +15982,8 @@ with pkgs;
 
   gcalcli = callPackage ../applications/misc/gcalcli { };
 
+  vcal = callPackage ../applications/misc/vcal { };
+
   gcolor2 = callPackage ../applications/graphics/gcolor2 { };
 
   gcolor3 = callPackage ../applications/graphics/gcolor3 { };

From 9292bdba6c5bbe49d97b3737b4fbff42d28256ea Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 16:50:48 +0800
Subject: [PATCH 1923/3370] vcal: fix executable perms

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

diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
index 8e658381b2d3..0964be1f1ea1 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,share/man/man1}
     substitute ${src} $out/bin/vcal \
       --replace /usr/bin/perl ${perl}/bin/perl
+    chmod 0755 $out/bin/*
     pod2man -n vcal ${src} > $out/share/man/man1/vcal.1
 
     runHook postInstall

From 56beb9b9fd6a08223946296f3fb560bd8dedb949 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:23:33 -0400
Subject: [PATCH 1924/3370] linux: 4.4.131 -> 4.4.132

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 725f3385a80c..dd946c281316 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.131";
+  version = "4.4.132";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "02f7sx20l0ljkgffac0yqav1kk7x1gl6026icslcsnn46pfpl4k5";
+    sha256 = "0d06dv7maspgv33dlc6r8cb8pkpg4q2vxbpzz6285n0ah4fb05f4";
   };
 } // (args.argsOverride or {}))

From b8aa95185cf42303d12da224814cab5495508254 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:23:50 -0400
Subject: [PATCH 1925/3370] linux: 4.9.99 -> 4.9.100

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index c6a94b194b68..3a7dc9353f8b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.99";
+  version = "4.9.100";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pqk88h8wyqz2ijp0pav1b35m2hs9d9is1kcir649jlbj66fphrx";
+    sha256 = "0z572csacfwn3kl3yaz4wpd7wkzabm42p2z4ysx5rq0kf4x6zfy5";
   };
 } // (args.argsOverride or {}))

From 8d68eca6d2e1f7d6b0a79d5c3a4ec3d3a1bce7cd Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:24:06 -0400
Subject: [PATCH 1926/3370] linux: 4.14.40 -> 4.14.41

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index f1e0bf82cec7..f44adb6bc946 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.40";
+  version = "4.14.41";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "03nh71nqgifkamkb0gn12jny5h3lbn5kmpdy0ff886wyrl34sw6l";
+    sha256 = "0vffv1iqcvrzvhs534czdjhj7702gr01pyn9idr8dj85kdx19wfc";
   };
 } // (args.argsOverride or {}))

From f58c4d9a9d56555ffca10844569343361ee48822 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:24:22 -0400
Subject: [PATCH 1927/3370] linux: 4.16.8 -> 4.16.9

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 40d7d5d865fe..c1df425280e0 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.8";
+  version = "4.16.9";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1z4q7khag48wildvq4hf4vwaipkfbh9yywm2m9zfj43vk1ysvyp4";
+    sha256 = "12lvdnfz06r7pj5f15x39c4glhbp3sv7bdbwj4yimbp6iqwvndv0";
   };
 } // (args.argsOverride or {}))

From 44101ee9d67095af06a977eb7f64ba72a2faa66a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:27:35 -0400
Subject: [PATCH 1928/3370] curl: 7.59.0 -> 7.60.0

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 5980392267b0..3d8cdd2653b7 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
 assert gssSupport -> kerberos != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.59.0";
+  name = "curl-7.60.0";
 
   src = fetchurl {
     urls = [
       "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
       "https://curl.haxx.se/download/${name}.tar.bz2"
     ];
-    sha256 = "185mazhi4bc5mc6rvhrmnc67j8l3sg7f0w2hp5gmi5ccdbyhz4mm";
+    sha256 = "16qyhy9alq2wk6zgqhh5dchr45f6nxaqzy3rh8rbx6dx0hignzc9";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];

From 3ed41f8c73cf5fd375a416c9fc241baf3ebbc2b7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 07:34:24 -0400
Subject: [PATCH 1929/3370] vscode: 1.23.0 -> 1.23.1

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 41d4c114c75a..29de230d38c7 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.23.0";
+  version = "1.23.1";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "1nyrcgnf18752n3i7xaq6gpb2k4wsfzk671kxg6za4ycrriw1f5l";
-    "x86_64-linux" = "1mkxyavzav522sl3fjn2hdlbj0bkdl3hagqiw9i6h8wgkxcvsszy";
-    "x86_64-darwin" = "123ggzssd5qd80jxar2pf5g2n2473pd2j8pfjyir1c7xkaqji2w6";
+    "i686-linux" = "0vqaxyg6r6mfm1gz8j7wxgg426hjsmv2ybyi8rfjcm9s8d23y9n6";
+    "x86_64-linux" = "0zycl8zqf5yiqq6k6mr28a20yg37whb8iw527pavvm74knzx3lgk";
+    "x86_64-darwin" = "03r2cvim7swq1fjxh6m9f7rifww3hddnyzpzniqb5132nnq4mrmc";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From 82550c639ea8fa609bec82605a0c6f66e26566ea Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Tue, 8 May 2018 12:31:35 +0300
Subject: [PATCH 1930/3370] yrd: init at 0.5.3

---
 pkgs/tools/networking/yrd/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  3 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/networking/yrd/default.nix

diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix
new file mode 100644
index 000000000000..e5d260ef7d42
--- /dev/null
+++ b/pkgs/tools/networking/yrd/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+let
+  pname = "yrd";
+  version = "0.5.3";
+  sha256 = "1yx1hr8z4cvlb3yi24dwafs0nxq41k4q477jc9q24w61a0g662ps";
+
+in pythonPackages.buildPythonApplication {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "kpcyrd";
+    repo = "${pname}";
+    rev = "v${version}";
+    inherit sha256;
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ argh ];
+
+  meta = with stdenv.lib; {
+    description = "Cjdns swiss army knife";
+    maintainers = with maintainers; [ akru ];
+    platforms = platforms.linux;
+    license = licenses.gpl3;
+    homepage = https://github.com/kpcyrd/yrd;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b65b28bb0201..3984fbb2cd81 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21502,4 +21502,7 @@ with pkgs;
 
   inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
           netbsd;
+
+  yrd = callPackage ../tools/networking/yrd { };
+
 }

From 1edc7ae63917ee28de05a0ec43ae550652e2af93 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 16 May 2018 07:57:17 -0400
Subject: [PATCH 1931/3370] xbmcPlugins.osmc-skin: init at 17.0.4

---
 pkgs/applications/video/kodi/plugins.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 23 insertions(+)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 01e134afee6f..f263182c6fc1 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -338,4 +338,26 @@ rec {
 
     extraBuildInputs = [ zlib ];
   };
+
+  osmc-skin = mkKodiPlugin rec {
+
+    plugin = "osmc-skin";
+    namespace = "skin.osmc";
+    version = "17.0.4";
+
+    src = fetchFromGitHub {
+      owner = "osmc";
+      repo = namespace;
+      rev = "a9268937f49286bab9fb49de430b8aafd7a60a9e";
+      sha256 = "1b3fm02annsq58pcfc985glrmh21rmqksdj3q8wn6gyza06jdf3v";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/omsc/skin.osmc;
+      description = "The default skin for OSMC";
+      platforms = platforms.all;
+      maintainers = with maintainers; [ worldofpeace ];
+      license = licenses.cc-by-nc-sa-30;
+    };
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e269cbb956ac..ff810774b27b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18620,6 +18620,7 @@ with pkgs;
       ++ optionals (config.kodi.enableHyperLauncher or false)
            (with hyper-launcher; [ plugin service pdfreader ])
       ++ optional (config.kodi.enableJoystick or false) joystick
+      ++ optional (config.kodi.enableOSMCskin or false) osmc-skin
       ++ optional (config.kodi.enableSVTPlay or false) svtplay
       ++ optional (config.kodi.enableSteamController or false) steam-controller
       ++ optional (config.kodi.enableSteamLauncher or false) steam-launcher

From d596db5ea610f272672785f38903839ec85d5ebc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 16 May 2018 05:44:31 -0700
Subject: [PATCH 1932/3370] libite: 2.0.1 -> 2.0.2 (#40484)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libite/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.0.2 with grep in /nix/store/naarzbhrc25il5apxf2s1d6npnv5bdwj-libite-2.0.2
- directory tree listing: https://gist.github.com/5c0e5f0b94104a500555ba038e45c2bf
- du listing: https://gist.github.com/4fa4a3663027f65a44561a901994afc7
---
 pkgs/development/libraries/libite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 51a7ab4851c3..7580c1b092e2 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libite-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
     rev = "v${version}";
-    sha256 = "07zypi3f02ygl7h5yc9sy136iiwgdi3r3nkjai9bq4gzjmzsvyl9";
+    sha256 = "0qk7231c1xwvjhkc9w7hasvafvgns10cx9kdhfdbc4r1hsh6d1ca";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From e03acfe161f6c28518211df6a9d1611c84957b8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 16 May 2018 05:47:29 -0700
Subject: [PATCH 1933/3370] timescaledb: 0.9.1 -> 0.9.2 (#40468)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/timescaledb/versions.

These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.2 with grep in /nix/store/m28fll152hk6ik9fiz2jy66qccjxklq3-timescaledb-0.9.2
- directory tree listing: https://gist.github.com/a922008862652d9f3c6f2e2a678c4c71
- du listing: https://gist.github.com/8c5a0a1374fbb013168d4197d67ba214
---
 pkgs/servers/sql/postgresql/timescaledb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix
index e1a4aed3b7e4..ce298cb2745d 100644
--- a/pkgs/servers/sql/postgresql/timescaledb/default.nix
+++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   name = "timescaledb-${version}";
-  version = "0.9.1";
+  version = "0.9.2";
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ postgresql ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     owner  = "timescale";
     repo   = "timescaledb";
     rev    = "refs/tags/${version}";
-    sha256 = "00k8fk5a1xpv9nxlmafnngk31wh80h6m72vsl1hnyq7nhby7ylic";
+    sha256 = "1zgyd407skqbsw2zj3l9hixwlisnj82yb6hbq5khjg9k0ifvvgyp";
   };
 
   # Fix the install phase which tries to install into the pgsql extension dir,

From 7bec4337936025cdaa5d239f8005dd776b92a89a Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Wed, 16 May 2018 15:02:01 +0200
Subject: [PATCH 1934/3370] aircrack-ng: 1.2-rc4 -> 1.2 (#40590)

---
 pkgs/tools/networking/aircrack-ng/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 2e982d0f912d..e3a5a58671c9 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools
-, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper }:
+, iw, ethtool, pciutils, libnl, pkgconfig, makeWrapper
+, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "aircrack-ng-1.2-rc4";
+  name = "aircrack-ng-1.2";
 
   src = fetchurl {
     url = "http://download.aircrack-ng.org/${name}.tar.gz";
-    sha256 = "0dpzx9kddxpgzmgvdpl3rxn0jdaqhm5wxxndp1xd7d75mmmc2fnr";
+    sha256 = "0z7sl1ihgrnc98bpqa1mmkh51w26fnsanvj6ydwcnd8g83azwkvr";
   };
 
-  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  nativeBuildInputs = [ pkgconfig makeWrapper autoreconfHook ];
   buildInputs = [ libpcap openssl zlib libnl iw ethtool pciutils ];
 
   patchPhase = ''
-    sed -e 's@^prefix.*@prefix = '$out@ -i common.mak
     sed -e 's@/usr/local/bin@'${wirelesstools}@ -i src/osdep/linux.c
   '';
 

From 727216217962f7d14e83cccb32e4549486d9075d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 16 May 2018 06:08:23 -0700
Subject: [PATCH 1935/3370] stubby: 0.2.2 -> 0.2.3 (#40465)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/stubby/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/f1ycc05g0mc6vpz59wwsg8a2ikg67pjm-stubby-0.2.3/bin/stubby -h’ got 0 exit code
- ran ‘/nix/store/f1ycc05g0mc6vpz59wwsg8a2ikg67pjm-stubby-0.2.3/bin/stubby -V’ and found version 0.2.3
- found 0.2.3 with grep in /nix/store/f1ycc05g0mc6vpz59wwsg8a2ikg67pjm-stubby-0.2.3
- directory tree listing: https://gist.github.com/5e53c11fefe1a4b45ac73905083dcbd6

- du listing: https://gist.github.com/1f5e9d63405c461f5a846e92de6cf816
---
 pkgs/tools/networking/stubby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix
index bd611af24263..2882ba217398 100644
--- a/pkgs/tools/networking/stubby/default.nix
+++ b/pkgs/tools/networking/stubby/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   pname = "stubby";
   name = "${pname}-${version}";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "getdnsapi";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1zq7h3jx6v821phcbjp348ncdicx9s4gqkj7mcz8kd6ps902iag8";
+    sha256 = "1n02dj1hvh0aml54asxj42f0j9wfgiyavbh0gr0j9lm4f2xcd60w";
   };
 
   nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ];

From 99e61887844b20a1dae129322b1742796466b683 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 16 May 2018 21:16:04 +0800
Subject: [PATCH 1936/3370] mpack: fix up broken paths

---
 pkgs/tools/networking/mpack/default.nix | 29 +++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix
index 8c8b40bbd2e0..62cec7c41eef 100644
--- a/pkgs/tools/networking/mpack/default.nix
+++ b/pkgs/tools/networking/mpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "mpack-1.6";
@@ -10,10 +10,31 @@ stdenv.mkDerivation rec {
 
   patches = [ ./build-fix.patch ];
 
-  preConfigure = "configureFlags=--mandir=$out/share/man";
+  postPatch = ''
+    for f in *.{c,man,pl,unix} ; do
+      substituteInPlace $f --replace /usr/tmp /tmp
+    done
 
-  meta = {
+    for f in unixpk.c ; do
+      substituteInPlace $f \
+        --replace /usr/sbin /run/current-system/sw/bin
+    done
+
+    # this just shuts up some warnings
+    for f in {decode,encode,part,unixos,unixpk,unixunpk,xmalloc}.c ; do
+      sed -i 'i#include <stdlib.h>' $f
+    done
+  '';
+
+  postInstall = ''
+    install -Dm644 -t $out/share/doc/mpack INSTALL README.*
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
     description = "Utilities for encoding and decoding binary files in MIME";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.free;
+    platforms = platforms.linux;
   };
 }

From 380cdd8dd71398721909cd7560f8d0ded44abe21 Mon Sep 17 00:00:00 2001
From: baroncharlus <elliot@ellioteverettwright.com>
Date: Wed, 16 May 2018 08:16:30 -0500
Subject: [PATCH 1937/3370] Add stubby resolver daemon service module (#38667)

* networking/stubby.nix: implementing systemd service module for stubby

This change implements stubby, the DNS-over-TLS stub resolver daemon.
The motivation for this change was the desire to use stubby's
DNS-over-TLS funcitonality in tandem with unbound, which requires
passing certain configuration parameters. This module implements those
config parameters by exposing them for use in configuration.nix.

* networking/stubby.nix: merging back module list

re-merging the module list to remove unecessary changes.

* networking/stubby.nix: removing unecessary capabilities flag

This change removes the unecessary flag for toggling the capabilities
which allows the daemon to bind to low ports.

* networking/stubby.nix: adding debug level logging bool

Adding the option to turn on debug logging.

* networking/stubby.nix: clarifying idleTimeout and adding systemd target

Improving docs to note that idleTimeout is expressed in ms. Adding the
nss-lookup `before' target to the systemd service definition.

* networking/stubby.nix: Restrict options with types.enum

This change restricts fallbackProtocol and authenticationMode to accept
only valid options instead of any list or str types (respectively). This
change also fixes typo in the CapabilityBoundingSet systemd setting.

* networking/stubby.nix: cleaning up documentation

Cleaning up docs, adding literal tags to settings, and removing
whitespace.

* networking/stubby.nix: fixing missing linebreak in comments

* networking/stubby.nix: cleaning errant comments
---
 nixos/modules/module-list.nix                |   1 +
 nixos/modules/services/networking/stubby.nix | 214 +++++++++++++++++++
 2 files changed, 215 insertions(+)
 create mode 100644 nixos/modules/services/networking/stubby.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8ce29e52fb24..7bce8e44eccd 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -569,6 +569,7 @@
   ./services/networking/strongswan.nix
   ./services/networking/strongswan-swanctl/module.nix
   ./services/networking/stunnel.nix
+  ./services/networking/stubby.nix
   ./services/networking/supplicant.nix
   ./services/networking/supybot.nix
   ./services/networking/syncthing.nix
diff --git a/nixos/modules/services/networking/stubby.nix b/nixos/modules/services/networking/stubby.nix
new file mode 100644
index 000000000000..3fbf6eb60e9d
--- /dev/null
+++ b/nixos/modules/services/networking/stubby.nix
@@ -0,0 +1,214 @@
+{ config, lib, pkgs, ...}:
+
+with lib;
+
+let
+  cfg = config.services.stubby;
+
+  fallbacks = concatMapStringsSep "\n  " (x: "- ${x}") cfg.fallbackProtocols;
+  listeners = concatMapStringsSep "\n  " (x: "- ${x}") cfg.listenAddresses;
+
+  # By default, the recursive resolvers maintained by the getdns
+  # project itself are enabled. More information about both getdns's servers,
+  # as well as third party options for upstream resolvers, can be found here:
+  # https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers
+  #
+  # You can override these values by supplying a yaml-formatted array of your
+  # preferred upstream resolvers in the following format:
+  #
+  # 106 # - address_data: IPv4 or IPv6 address of the upstream
+  #   port: Port for UDP/TCP (default is 53)
+  #   tls_auth_name: Authentication domain name checked against the server
+  #                  certificate
+  #   tls_pubkey_pinset: An SPKI pinset verified against the keys in the server
+  #                      certificate
+  #     - digest: Only "sha256" is currently supported
+  #       value: Base64 encoded value of the sha256 fingerprint of the public
+  #              key
+  #   tls_port: Port for TLS (default is 853)
+
+  defaultUpstream = ''
+    - address_data: 145.100.185.15
+      tls_auth_name: "dnsovertls.sinodun.com"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
+    - address_data: 145.100.185.16
+      tls_auth_name: "dnsovertls1.sinodun.com"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
+    - address_data: 185.49.141.37
+      tls_auth_name: "getdnsapi.net"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
+    - address_data: 2001:610:1:40ba:145:100:185:15
+      tls_auth_name: "dnsovertls.sinodun.com"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: 62lKu9HsDVbyiPenApnc4sfmSYTHOVfFgL3pyB+cBL4=
+    - address_data: 2001:610:1:40ba:145:100:185:16
+      tls_auth_name: "dnsovertls1.sinodun.com"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: cE2ecALeE5B+urJhDrJlVFmf38cJLAvqekONvjvpqUA=
+    - address_data: 2a04:b900:0:100::38
+      tls_auth_name: "getdnsapi.net"
+      tls_pubkey_pinset:
+        - digest: "sha256"
+          value: foxZRnIh9gZpWnl+zEiKa0EJ2rdCGroMWm02gaxSc9Q=
+  '';
+
+  # Resolution type is not changeable here because it is required per the
+  # stubby documentation:
+  #
+  # "resolution_type: Work in stub mode only (not recursive mode) - required for Stubby
+  # operation."
+  #
+  # https://dnsprivacy.org/wiki/display/DP/Configuring+Stubby
+
+  confFile = pkgs.writeText "stubby.yml" ''
+    resolution_type: GETDNS_RESOLUTION_STUB
+    dns_transport_list:
+      ${fallbacks}
+    tls_authentication: ${cfg.authenticationMode}
+    tls_query_padding_blocksize: ${toString cfg.queryPaddingBlocksize}
+    edns_client_subnet_private: ${if cfg.subnetPrivate then "1" else "0"}
+    idle_timeout: ${toString cfg.idleTimeout}
+    listen_addresses:
+      ${listeners}
+    round_robin_upstreams: ${if cfg.roundRobinUpstreams then "1" else "0"}
+    ${cfg.extraConfig}
+    upstream_recursive_servers:
+    ${cfg.upstreamServers}
+  '';
+in
+
+{
+  options = {
+    services.stubby = {
+
+      enable = mkEnableOption "Stubby DNS resolver";
+
+      fallbackProtocols = mkOption {
+        default = [ "GETDNS_TRANSPORT_TLS" ];
+        type = with types; listOf (enum [
+          "GETDNS_TRANSPORT_TLS"
+          "GETDNS_TRANSPORT_TCP"
+          "GETDNS_TRANSPORT_UDP"
+        ]);
+        description = ''
+          Ordered list composed of one or more transport protocols.
+          Strict mode should only use <literal>GETDNS_TRANSPORT_TLS</literal>.
+          Other options are <literal>GETDNS_TRANSPORT_UDP</literal> and
+          <literal>GETDNS_TRANSPORT_TCP</literal>.
+        '';
+      };
+
+      authenticationMode = mkOption {
+        default = "GETDNS_AUTHENTICATION_REQUIRED";
+        type = types.enum [
+          "GETDNS_AUTHENTICATION_REQUIRED"
+          "GETDNS_AUTHENTICATION_NONE"
+        ];
+        description = ''
+          Selects the Strict or Opportunistic usage profile.
+          For strict, set to <literal>GETDNS_AUTHENTICATION_REQUIRED</literal>.
+          for opportunistic, use <literal>GETDNS_AUTHENTICATION_NONE</literal>.
+        '';
+      };
+
+      queryPaddingBlocksize = mkOption {
+        default = 128;
+        type = types.int;
+        description = ''
+          EDNS0 option to pad the size of the DNS query to the given blocksize.
+        '';
+      };
+
+      subnetPrivate = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          EDNS0 option for ECS client privacy. Default is
+          <literal>true</literal>. If set, this option prevents the client
+          subnet from being sent to authoritative nameservers.
+        '';
+      };
+
+      idleTimeout = mkOption {
+        default = 10000;
+        type = types.int;
+        description = "EDNS0 option for keepalive idle timeout expressed in
+        milliseconds.";
+      };
+
+      listenAddresses = mkOption {
+        default = [ "127.0.0.1" "0::1" ];
+        type = with types; listOf str;
+        description = ''
+          Sets the listen address for the stubby daemon.
+          Uses port 53 by default.
+          Ise IP@port to specify a different port.
+        '';
+      };
+
+      roundRobinUpstreams = mkOption {
+        default = true;
+        type = types.bool;
+        description = ''
+          Instructs stubby to distribute queries across all available name
+          servers. Default is <literal>true</literal>. Set to
+          <literal>false</literal> in order to use the first available.
+        '';
+      };
+
+      upstreamServers = mkOption {
+        default = defaultUpstream;
+        type = types.lines;
+        description = ''
+          Add additional upstreams. See <citerefentry><refentrytitle>stubby
+          </refentrytitle><manvolnum>1</manvolnum></citerefentry> for an
+          example of the entry formatting. In Strict mode, at least one of the
+          following settings must be supplied for each nameserver:
+          <literal>tls_auth_name</literal> or
+          <literal>tls_pubkey_pinset</literal>.
+        '';
+      };
+
+      debugLogging = mkOption {
+        default = false;
+        type = types.bool;
+        description = "Enable or disable debug level logging.";
+      };
+
+      extraConfig = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Add additional configuration options. see <citerefentry>
+          <refentrytitle>stubby</refentrytitle><manvolnum>1</manvolnum>
+          </citerefentry>for more options.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.stubby ];
+    systemd.services.stubby = {
+      description = "Stubby local DNS resolver";
+      after = [ "network.target" ];
+      before = [ "nss-lookup.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+        CapabilityBoundingSet = "CAP_NET_BIND_SERVICE";
+        ExecStart = "${pkgs.stubby}/bin/stubby -C ${confFile} ${optionalString cfg.debugLogging "-l"}";
+        DynamicUser = true;
+      };
+    };
+  };
+}

From b4b3892bd11d81d4bd17f21b9a5153f30a774f56 Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Wed, 16 May 2018 12:46:36 +0200
Subject: [PATCH 1938/3370] nixos/kubernetes: Update kube-dns and
 kube-dashbashboard docker image derivations to new pullImage function
 signature

---
 nixos/modules/services/cluster/kubernetes/dashboard.nix | 3 ++-
 nixos/modules/services/cluster/kubernetes/dns.nix       | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
index e331889b9dd5..41655895c00d 100644
--- a/nixos/modules/services/cluster/kubernetes/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -10,8 +10,9 @@ let
 
   image = pkgs.dockerTools.pullImage {
     imageName = name;
-    imageTag = version;
+    finalImageTag = version;
     sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad";
+    imageDigest = "sha256:e7984d10351601080bbc146635d51f0cfbea31ca6f0df323cf7a58cf2f6a68df";
   };
 in {
   options.services.kubernetes.addons.dashboard = {
diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix
index 226fdadffd1a..939f58fc41b7 100644
--- a/nixos/modules/services/cluster/kubernetes/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/dns.nix
@@ -7,20 +7,23 @@ let
 
   k8s-dns-kube-dns = pkgs.dockerTools.pullImage {
     imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64";
-    imageTag = version;
+    finalImageTag = version;
     sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp";
+    imageDigest = "sha256:40790881bbe9ef4ae4ff7fe8b892498eecb7fe6dcc22661402f271e03f7de344";
   };
 
   k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {
     imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64";
-    imageTag = version;
+    finalImageTag = version;
     sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c";
+    imageDigest = "sha256:aeeb994acbc505eabc7415187cd9edb38cbb5364dc1c2fc748154576464b3dc2";
   };
 
   k8s-dns-sidecar = pkgs.dockerTools.pullImage {
     imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64";
-    imageTag = version;
+    finalImageTag = version;
     sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm";
+    imageDigest = "sha256:97074c951046e37d3cbb98b82ae85ed15704a290cce66a8314e7f846404edde9";
   };
 
   cfg = config.services.kubernetes.addons.dns;

From 6f23e142cbaaf38a3f66104655785f212bcb6200 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 27 Apr 2018 18:53:21 +0200
Subject: [PATCH 1939/3370] gnome3.gdm: clean up

---
 pkgs/desktops/gnome-3/core/gdm/default.nix    | 64 ++++++++++---------
 .../desktops/gnome-3/core/gdm/fix-paths.patch | 49 ++++++++++++++
 2 files changed, 84 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/desktops/gnome-3/core/gdm/fix-paths.patch

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 6b6b23f21b54..88fed09de382 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
+{ stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
 , librsvg, coreutils }:
@@ -12,50 +12,56 @@ stdenv.mkDerivation rec {
     sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp";
   };
 
-  passthru = {
-    updateScript = gnome3.updateScript { packageName = "gdm"; attrPath = "gnome3.gdm"; };
-  };
-
   # Only needed to make it build
   preConfigure = ''
     substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
   '';
 
-  postPatch = ''
-    substituteInPlace daemon/gdm-manager.c --replace "/bin/plymouth" "${plymouth}/bin/plymouth"
-    substituteInPlace data/gdm.service.in  --replace "/bin/kill" "${coreutils}/bin/kill"
-  '';
-
-  configureFlags = [ "--sysconfdir=/etc"
-                     "--localstatedir=/var"
-                     "--with-plymouth=yes"
-                     "--with-initial-vt=7"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--with-plymouth=yes"
+    "--with-initial-vt=7"
+    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+  ];
 
   nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ];
-  buildInputs = [ glib accountsservice systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra-gtk3 pam plymouth librsvg ];
+  buildInputs = [
+    glib accountsservice systemd
+    gobjectIntrospection libX11 gtk
+    libcanberra-gtk3 pam plymouth librsvg
+  ];
 
   enableParallelBuilding = true;
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./sessions_dir.patch
-              ./gdm-x-session_extra_args.patch
-              ./gdm-session-worker_xserver-path.patch
-             ];
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      inherit coreutils plymouth;
+    })
+    ./sessions_dir.patch
+    ./gdm-x-session_extra_args.patch
+    ./gdm-session-worker_xserver-path.patch
+  ];
 
-  postInstall = ''
-    # Prevent “Could not parse desktop file orca-autostart.desktop or it references a not found TryExec binary”
-    rm $out/share/gdm/greeter/autostart/orca-autostart.desktop
-  '';
+  installFlags = [
+    "sysconfdir=$(out)/etc"
+    "dbusconfdir=$(out)/etc/dbus-1/system.d"
+  ];
 
-  installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = "gdm";
+      attrPath = "gnome3.gdm";
+    };
+  };
 
   meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
     description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
+    homepage = https://wiki.gnome.org/Projects/GDM;
+    license = licenses.gpl2Plus;
     maintainers = gnome3.maintainers;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
new file mode 100644
index 000000000000..d10283d40eae
--- /dev/null
+++ b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
@@ -0,0 +1,49 @@
+--- a/daemon/gdm-manager.c
++++ b/daemon/gdm-manager.c
+@@ -147,7 +147,7 @@
+         GError  *error;
+ 
+         error = NULL;
+-        res = g_spawn_command_line_sync ("/bin/plymouth --ping",
++        res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth --ping",
+                                          NULL, NULL, &status, &error);
+         if (! res) {
+                 g_debug ("Could not ping plymouth: %s", error->message);
+@@ -165,7 +165,7 @@
+         GError  *error;
+ 
+         error = NULL;
+-        res = g_spawn_command_line_sync ("/bin/plymouth deactivate",
++        res = g_spawn_command_line_sync ("@plymouth@/bin/plymouth deactivate",
+                                          NULL, NULL, NULL, &error);
+         if (! res) {
+                 g_warning ("Could not deactivate plymouth: %s", error->message);
+@@ -180,7 +180,7 @@
+         GError  *error;
+ 
+         error = NULL;
+-        res = g_spawn_command_line_async ("/bin/plymouth quit --retain-splash", &error);
++        res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit --retain-splash", &error);
+         if (! res) {
+                 g_warning ("Could not quit plymouth: %s", error->message);
+                 g_error_free (error);
+@@ -196,7 +196,7 @@
+         GError  *error;
+ 
+         error = NULL;
+-        res = g_spawn_command_line_async ("/bin/plymouth quit", &error);
++        res = g_spawn_command_line_async ("@plymouth@/bin/plymouth quit", &error);
+         if (! res) {
+                 g_warning ("Could not quit plymouth: %s", error->message);
+                 g_error_free (error);
+--- a/data/gdm.service.in
++++ b/data/gdm.service.in
+@@ -28,7 +28,7 @@
+ StandardOutput=syslog
+ StandardError=inherit
+ EnvironmentFile=-@LANG_CONFIG_FILE@
+-ExecReload=/bin/kill -SIGHUP $MAINPID
++ExecReload=@coreutils@/bin/kill -SIGHUP $MAINPID
+ 
+ [Install]
+ Alias=display-manager.service

From 3bfa8563d10e356f085f122d8982ccd13647ff02 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 27 Apr 2018 19:03:19 +0200
Subject: [PATCH 1940/3370] gnome3.gdm: fix wayland detection

Apparently, wayland session were not used at all until now.
---
 pkgs/desktops/gnome-3/core/gdm/default.nix     |  4 ++--
 pkgs/desktops/gnome-3/core/gdm/fix-paths.patch | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 88fed09de382..247d3566d6f3 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, substituteAll, pkgconfig, glib, itstool, libxml2, xorg, dbus
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
 , gtk, libcanberra-gtk3, pam, libtool, gobjectIntrospection, plymouth
-, librsvg, coreutils }:
+, librsvg, coreutils, xwayland }:
 
 stdenv.mkDerivation rec {
   name = "gdm-${version}";
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit coreutils plymouth;
+      inherit coreutils plymouth xwayland;
     })
     ./sessions_dir.patch
     ./gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
index d10283d40eae..adac2dc913cc 100644
--- a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
+++ b/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch
@@ -1,3 +1,14 @@
+--- a/daemon/gdm-local-display-factory.c
++++ b/daemon/gdm-local-display-factory.c
+@@ -450,7 +450,7 @@
+ #ifdef ENABLE_WAYLAND_SUPPORT
+                         gboolean wayland_enabled = FALSE;
+                         if (gdm_settings_direct_get_boolean (GDM_KEY_WAYLAND_ENABLE, &wayland_enabled)) {
+-                                if (wayland_enabled && g_file_test ("/usr/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) {
++                                if (wayland_enabled && g_file_test ("@xwayland@/bin/Xwayland", G_FILE_TEST_IS_EXECUTABLE) ) {
+                                         session_type = "wayland";
+                                 }
+                         }
 --- a/daemon/gdm-manager.c
 +++ b/daemon/gdm-manager.c
 @@ -147,7 +147,7 @@

From 54135fc73350e03787b2496d3e39f7a520d20e09 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 30 Apr 2018 18:15:28 +0200
Subject: [PATCH 1941/3370] gnome3.gdm: allow choosing user account without
 GNOME

Account chooser depends on AccountsService, which is normally enabled by
GNOME module but it was missing when using GDM without GNOME.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 70fc7388c2ac..a6a38a21b617 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -135,6 +135,9 @@ in
 
     systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ];
 
+    # Allow choosing an user account
+    services.accounts-daemon.enable = true;
+
     services.dbus.packages = [ gdm ];
 
     systemd.user.services.dbus.wantedBy = [ "default.target" ];

From 8a93595550fe72371b75c976d0cf8738ddd33d5a Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 31 Dec 2017 15:52:50 +0100
Subject: [PATCH 1942/3370] sysprof: 1.2.0 -> 3.28.1

---
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/misc/sysprof.nix       | 19 +++++++
 .../tools/profiling/sysprof/configure.patch   | 17 ------
 .../tools/profiling/sysprof/default.nix       | 55 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  4 +-
 5 files changed, 64 insertions(+), 32 deletions(-)
 create mode 100644 nixos/modules/services/misc/sysprof.nix
 delete mode 100644 pkgs/development/tools/profiling/sysprof/configure.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7bce8e44eccd..6fe29af3a00d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -383,6 +383,7 @@
   ./services/misc/sundtek.nix
   ./services/misc/svnserve.nix
   ./services/misc/synergy.nix
+  ./services/misc/sysprof.nix
   ./services/misc/taskserver
   ./services/misc/tzupdate.nix
   ./services/misc/uhub.nix
diff --git a/nixos/modules/services/misc/sysprof.nix b/nixos/modules/services/misc/sysprof.nix
new file mode 100644
index 000000000000..ab91a8b586a2
--- /dev/null
+++ b/nixos/modules/services/misc/sysprof.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+
+{
+  options = {
+    services.sysprof = {
+      enable = lib.mkEnableOption "sysprof profiling daemon";
+    };
+  };
+
+  config = lib.mkIf config.services.sysprof.enable {
+    environment.systemPackages = [ pkgs.sysprof ];
+
+    services.dbus.packages = [ pkgs.sysprof ];
+
+    systemd.packages = [ pkgs.sysprof ];
+  };
+
+  meta.maintainers = pkgs.sysprof.meta.maintainers;
+}
diff --git a/pkgs/development/tools/profiling/sysprof/configure.patch b/pkgs/development/tools/profiling/sysprof/configure.patch
deleted file mode 100644
index 212840ee4064..000000000000
--- a/pkgs/development/tools/profiling/sysprof/configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- sysprof-1.0.10/configure	2008-04-28 01:41:25.000000000 +0200
-+++ sysprof-1.0.10/configure	2008-06-07 15:40:07.000000000 +0200
-@@ -3342,14 +3342,6 @@ if test $kernel_module = "yes"; then
-      echo \*
-      exit 1
-   fi
--
--  if  ! test -f /lib/modules/`uname -r`/build/Makefile  ; then
--     echo \*
--     echo \* Sysprof requires the kernel source code to be installed.
--     echo \* On a Fedora Core system the relevant package is kernel-devel
--     echo \*
--     exit 1
--  fi
- fi
- 
- # Pkgconfig dependencies
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index a2ea3444db60..f28fe187e6cf 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -1,24 +1,53 @@
 { stdenv
-, fetchurl, pkgconfig
-, gtk2, glib, pango, libglade
+, desktop-file-utils
+, fetchurl
+, gettext
+, glib
+, gtk3
+, itstool
+, libxml2
+, meson, ninja
+, pango
+, pkgconfig
+, polkit
+, shared-mime-info
+, systemd
+, wrapGAppsHook
+, gnome3
 }:
+let
+  version = "3.28.1";
+  pname = "sysprof";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
-stdenv.mkDerivation rec {
-  name = "sysprof-1.2.0";
+  outputs = [ "out" "lib" "dev" ];
 
   src = fetchurl {
-    url = "http://www.sysprof.com/sysprof-1.2.0.tar.gz";
-    sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "05534dvwrzrmryb4y2m1sb2q0r8i6nr88pzjg7xs5nr9zq8a87p3";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 glib pango libglade ];
+  nativeBuildInputs = [ desktop-file-utils gettext itstool libxml2 meson ninja pkgconfig shared-mime-info wrapGAppsHook ];
+  buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib ];
 
-  meta = {
-    homepage = http://sysprof.com/;
+  mesonFlags = [
+    "-Dsystemdunitdir=lib/systemd/system"
+  ];
+
+  postInstall = ''
+    rm $out/share/applications/mimeinfo.cache
+  '';
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
     description = "System-wide profiler for Linux";
-    license = stdenv.lib.licenses.gpl2Plus;
-
+    homepage = https://wiki.gnome.org/Apps/Sysprof;
     longDescription = ''
       Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open
       system call to profile the entire system, not just a single
@@ -26,6 +55,8 @@ stdenv.mkDerivation rec {
       do not need to be recompiled.  In fact they don't even have to
       be restarted.
     '';
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ ];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d5df97c1ddbe..3193a56514fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14084,9 +14084,7 @@ with pkgs;
 
   sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
 
-  sysprof = callPackage ../development/tools/profiling/sysprof {
-    inherit (gnome2) libglade;
-  };
+  sysprof = callPackage ../development/tools/profiling/sysprof { };
 
   # Provided with sysfsutils.
   libsysfs = sysfsutils;

From 65eb3ec842d0a738e1fc64cfb9f7675243f4b1fb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 May 2018 08:35:59 -0500
Subject: [PATCH 1943/3370] dyncall: init at 1.0

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

diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
new file mode 100644
index 000000000000..b60f61299f32
--- /dev/null
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "dyncall-${version}";
+  version = "1.0";
+
+  src = fetchurl {
+    url = http://www.dyncall.org/r1.0/dyncall-1.0.tar.gz;
+    # http://www.dyncall.org/r1.0/SHA256
+    sha256 = "d1b6d9753d67dcd4d9ea0708ed4a3018fb5bfc1eca5f37537fba2bc4f90748f2";
+  };
+
+  doCheck = true;
+  checkTarget = "run-tests";
+
+  meta = with stdenv.lib; {
+    description = "Highly dynamic multi-platform foreign function call interface library";
+    homepage = http://dyncall.org;
+    license = licenses.isc;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4c9f146ca0f..211ea11d9a1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1165,6 +1165,8 @@ with pkgs;
 
   dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
 
+  dyncall = callPackage ../development/libraries/dyncall { };
+
   earlyoom = callPackage ../os-specific/linux/earlyoom { };
 
   EBTKS = callPackage ../development/libraries/science/biology/EBTKS { };

From 978845967858c9edb544484bc97d152bc2ffab44 Mon Sep 17 00:00:00 2001
From: Ryan Scheel <Ryan.havvy@gmail.com>
Date: Wed, 16 May 2018 09:00:32 -0700
Subject: [PATCH 1944/3370] mdbook 0.1.5 -> 0.1.7 (#40580)

---
 pkgs/tools/text/mdbook/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix
index 4ea36ddbd5e7..30f5b6ceaba5 100644
--- a/pkgs/tools/text/mdbook/default.nix
+++ b/pkgs/tools/text/mdbook/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "mdbook-${version}";
-  version = "0.1.5";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "mdBook";
-    rev = "v${version}";
-    sha256 = "0k86zjrqb5wdxvmzz9cxl9c0mpjnr46fh5r5sbs5q9fk2h4lp4ip";
+    rev = "ea0b835b38aba9566c1cc50ad119fbbf2c56f59d";
+    sha256 = "0jkyys8dg5mchbj8b73mmzsgv0k0zp7knima9s69s5ybplmd2n8s";
   };
 
-  cargoSha256 = "0gj1x996lvn9j87dfmng2fn3fgz8rgvrw3akcz641psj4hlfgm5w";
+  cargoSha256 = "0w3slfzm29pkyr6zhr7k9rx9mddh42asyb46bzy57j0a2qvan3k4";
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ];
 

From 70d64d129e9406c943b24f316689eafd400e3280 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 16 May 2018 18:03:55 +0200
Subject: [PATCH 1945/3370] nixos/statsd: refactor test (#40554)

`statsd` is a daemon written in `node` to gather statistics over UDP.
The current test ensures that a port is open, but the basic
functionality isn't sufficiently tested.

This patch contains the following changes:

* Simplified port scanning (`waitForOpenPort` rather than `netcat` magic).

* Issue a TCP command to check the health of the `statsd` server.

* Simple script to check if `statsd` receives data over UDP and confirms
  the basic functionality of the TCP interface on `8126` for admin
  purposes.
---
 nixos/tests/statsd.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/statsd.nix b/nixos/tests/statsd.nix
index c71949249a4b..666961249ced 100644
--- a/nixos/tests/statsd.nix
+++ b/nixos/tests/statsd.nix
@@ -8,7 +8,7 @@ with lib;
     maintainers = [ ma27 ];
   };
 
-  nodes.statsd1 = {
+  machine = {
     services.statsd.enable = true;
     services.statsd.backends = [ "statsd-influxdb-backend" "console" ];
     services.statsd.extraConfig = ''
@@ -33,8 +33,19 @@ with lib;
   };
 
   testScript = ''
-    $statsd1->start();
-    $statsd1->waitForUnit("statsd.service");
-    $statsd1->waitUntilSucceeds("nc -z 127.0.0.1 8126");
+    $machine->start();
+    $machine->waitForUnit("statsd.service");
+    $machine->waitForOpenPort(8126);
+
+    # check state of the `statsd` server
+    $machine->succeed('[ "health: up" = "$(echo health | nc 127.0.0.1 8126 -w 120 -N)" ];');
+
+    # confirm basic examples for metrics derived from docs:
+    # https://github.com/etsy/statsd/blob/v0.8.0/README.md#usage and
+    # https://github.com/etsy/statsd/blob/v0.8.0/docs/admin_interface.md
+    $machine->succeed("echo 'foo:1|c' | nc -u -w 0  127.0.0.1 8125");
+    $machine->succeed("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo");
+    $machine->succeed("echo 'delcounters foo' | nc -w 120 127.0.0.1 8126 -N");
+    $machine->fail("echo counters | nc -w 120 127.0.0.1 8126 -N | grep foo");
   '';
 })

From 4fbd5a6583343b42c7b301cc8b065e8f3d212fee Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 16 May 2018 11:07:43 -0500
Subject: [PATCH 1946/3370] fac: 1.0.4 -> 1.1.0 (#40597)

---
 pkgs/development/tools/fac/default.nix | 17 +++----
 pkgs/development/tools/fac/deps.nix    | 66 ++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/tools/fac/deps.nix

diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix
index c587505600c9..0fae9fad5d14 100644
--- a/pkgs/development/tools/fac/default.nix
+++ b/pkgs/development/tools/fac/default.nix
@@ -1,14 +1,8 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchurl, makeWrapper, git }:
 
-let
-  # TODO: Remove this on next update, should be included
-  fac_1 = fetchurl {
-    url = https://raw.githubusercontent.com/mkchoi212/fac/0a500c2a2dba9017fe7c2a45f15c328755f561a6/doc/fac.1;
-    sha256 = "1fsyx9i20ryhpihdpvs2z7vccl13b9bnh5hcdxn7bvqjz78mbqhw";
-  };
-in buildGoPackage rec {
+buildGoPackage rec {
   name = "fac-${version}";
-  version = "1.0.4";
+  version = "1.1.0";
 
   goPackagePath = "github.com/mkchoi212/fac";
 
@@ -16,16 +10,19 @@ in buildGoPackage rec {
     owner = "mkchoi212";
     repo = "fac";
     rev = "v${version}";
-    sha256 = "0jhx80jbkxfxj95hmdpb9wwwya064xpfkaa218l1lwm3qwfbpk95";
+    sha256 = "054j8yrblf1frcfn3dwrjbgf000i3ngbaz2c172nwbx75g309ihx";
   };
 
+  goDeps = ./deps.nix;
+
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
     wrapProgram $bin/bin/fac \
       --prefix PATH : ${git}/bin
 
-    install -D ${fac_1} $out/share/man/man1/fac.1
+    # Install man page, not installed by default
+    install -D go/src/${goPackagePath}/assets/doc/fac.1 $out/share/man/man1/fac.1
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/fac/deps.nix b/pkgs/development/tools/fac/deps.nix
new file mode 100644
index 000000000000..65ec5ded5ad5
--- /dev/null
+++ b/pkgs/development/tools/fac/deps.nix
@@ -0,0 +1,66 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
+[
+  {
+    goPackagePath  = "github.com/alecthomas/chroma";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/chroma";
+      rev =  "1b755a90bd109f170385cb3964f0abdfd3451145";
+      sha256 = "1ilmavg291qhb0xq881f5h172zw40aaynqfb0y4yjyq13jnrf8p8";
+    };
+  }
+  {
+    goPackagePath  = "github.com/danwakefield/fnmatch";
+    fetch = {
+      type = "git";
+      url = "https://github.com/danwakefield/fnmatch";
+      rev =  "cbb64ac3d964b81592e64f957ad53df015803288";
+      sha256 = "0cbf511ppsa6hf59mdl7nbyn2b2n71y0bpkzbmfkdqjhanqh1lqz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/dlclark/regexp2";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dlclark/regexp2";
+      rev =  "7632a260cbaf5e7594fc1544a503456ecd0827f1";
+      sha256 = "0vhp5r0ywv9p1c74fm8xzclnwx2mg9f0764b3id7a9nwh0plisx2";
+    };
+  }
+  {
+    goPackagePath  = "github.com/jroimartin/gocui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/jroimartin/gocui";
+      rev =  "c055c87ae801372cd74a0839b972db4f7697ae5f";
+      sha256 = "1b1cbjg925l1c5v3ls8amni9716190yzf847cqs9wjnj82z8qa47";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mattn/go-runewidth";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mattn/go-runewidth";
+      rev =  "ce7b0b5c7b45a81508558cd1dba6bb1e4ddb51bb";
+      sha256 = "0lc39b6xrxv7h3v3y1kgz49cgi5qxwlygs715aam6ba35m48yi7g";
+    };
+  }
+  {
+    goPackagePath  = "github.com/mkchoi212/fac";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mkchoi212/fac";
+      rev =  "642a3ad8d8b4b76c7eb201e6f69b3bddb210c502";
+      sha256 = "10rsmnixs3lybnj4xv09b2ya6x0hjjd03y148f78qfppyz2hsvaz";
+    };
+  }
+  {
+    goPackagePath  = "github.com/nsf/termbox-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nsf/termbox-go";
+      rev =  "21a4d435a86280a2927985fd6296de56cbce453e";
+      sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7";
+    };
+  }
+]
\ No newline at end of file

From 136f1c470665a9328bb4120f3a4d9af774dadb2d Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 16 May 2018 12:11:36 -0400
Subject: [PATCH 1947/3370] doc: Fixes documented default option for `<name>`
 for submodules. (#40464)

Fixes #40463

This is related to change 1d56d0c8a79334cd7149fd580512046558eaac78
---
 lib/types.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index 772716897725..5aa09d33e9b3 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -372,7 +372,13 @@ rec {
             # This is mandatory as some option declaration might use the
             # "name" attribute given as argument of the submodule and use it
             # as the default of option declarations.
-            args.name = "&lt;name&gt;";
+            #
+            # Using lookalike unicode single angle quotation marks because
+            # of the docbook transformation the options receive. In all uses
+            # &gt; and &lt; wouldn't be encoded correctly so the encoded values
+            # would be used, and use of `<` and `>` would break the XML document.
+            # It shouldn't cause an issue since this is cosmetic for the manual.
+            args.name = "‹name›";
           }).options;
         getSubModules = opts';
         substSubModules = m: submodule m;

From 4956767f534c99d44988c623ab1dcddd25124502 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 21 Sep 2017 11:42:09 -0400
Subject: [PATCH 1948/3370] Make libiconv build for iOS with prefixed tools

---
 .../darwin/apple-source-releases/libiconv/default.nix  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index d9b3dfb74049..3cee697366bb 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,14 +1,18 @@
 { stdenv, appleDerivation }:
 
 appleDerivation {
-  preConfigure = "cd libiconv";
+  preConfigure = "cd libiconv"
+    + stdenv.lib.optionalString stdenv.hostPlatform.isiOS ''
+
+      sed -i 's/darwin\*/ios\*/g' configure libcharset/configure
+    '';
 
   postInstall = ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
-    install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
+    ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 
     # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs
-    echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \
+    echo 'void dont_use_this(){}' | ${stdenv.cc.bintools.targetPrefix}clang -dynamiclib -x c - -current_version 2.4.0 \
       -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \
       -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib

From ceb8f6e38f39a90637c113116aa42e112b62e6be Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 25 Sep 2017 19:30:40 -0400
Subject: [PATCH 1949/3370] ios-rebuild: Unbreak build

Needs to link with a C compiler, not linker directly
---
 pkgs/development/node-packages/default-v6.nix | 1 +
 pkgs/development/node-packages/default-v8.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix
index 2be09eb16324..97f759ef0cbe 100644
--- a/pkgs/development/node-packages/default-v6.nix
+++ b/pkgs/development/node-packages/default-v6.nix
@@ -59,6 +59,7 @@ nodePackages // {
 
   ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
     preRebuild = ''
+      LD=$CC
       tmp=$(mktemp -d)
       ln -s /usr/bin/xcodebuild $tmp
       export PATH="$PATH:$tmp"
diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index ed0477a639a7..701648da2280 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -59,6 +59,7 @@ nodePackages // {
 
   ios-deploy = nodePackages.ios-deploy.override (oldAttrs: {
     preRebuild = ''
+      LD=$CC
       tmp=$(mktemp -d)
       ln -s /usr/bin/xcodebuild $tmp
       export PATH="$PATH:$tmp"

From 4f25cf5124d90fbf5aafb168b124104eda5068f3 Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Tue, 1 May 2018 21:43:04 -0400
Subject: [PATCH 1950/3370] ncurses: when cross-compiling for iOS, use built-in
 ncurses

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6d3a7a5b937..51a28dc215cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10790,7 +10790,7 @@ with pkgs;
   ncurses6 = callPackage ../development/libraries/ncurses {
     abiVersion = "6";
   };
-  ncurses = ncurses6;
+  ncurses = if hostPlatform.useiOSPrebuilt then null else ncurses6;
 
   neardal = callPackage ../development/libraries/neardal { };
 

From 7a16fd61119cccd5a8cbbe425eca50d6c9add6b5 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Wed, 16 May 2018 20:42:09 +0200
Subject: [PATCH 1951/3370] slimserver: 7.9.0 -> 7.9.1

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

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 18dbed4d1f30..0995ae041bbf 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -3,11 +3,11 @@
 
 buildPerlPackage rec {
   name = "slimserver-${version}";
-  version = "7.9.0";
+  version = "7.9.1";
 
   src = fetchurl {
     url = "https://github.com/Logitech/slimserver/archive/${version}.tar.gz";
-    sha256 = "07rhqipg7m28x0nqdd83nyzi88dp9cf8rr2pamdyrfcwyp1h1b44";
+    sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp";
   };
 
   buildInputs = [

From c1efa89126bef82206d4b8123b5373d1f48a5497 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Mon, 14 May 2018 19:18:19 +0200
Subject: [PATCH 1952/3370] gomuks: init at 2018-05-16

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

diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
new file mode 100644
index 000000000000..5246f8d3d1d6
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildGo110Package, fetchFromGitHub }:
+
+buildGo110Package rec {
+  name = "gomuks-${version}";
+  version = "2018-05-16";
+
+  goPackagePath = "maunium.net/go/gomuks";
+
+  src = fetchFromGitHub {
+    owner = "tulir";
+    repo = "gomuks";
+    rev = "512ca88804268bf58a754e8a02be556f953db317";
+    sha256 = "1bpgjkpvqqks3ljw9s0hm5pgscjs4rjy8rfpl2444m4rbpz1xvmr";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://maunium.net/go/gomuks/;
+    description = "A terminal based Matrix client written in Go";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ tilpner ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76203b760270..658a466815df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15773,6 +15773,8 @@ with pkgs;
 
   goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
 
+  gomuks = callPackage ../applications/networking/instant-messengers/gomuks { };
+
   inherit (ocamlPackages) google-drive-ocamlfuse;
 
   google-musicmanager = callPackage ../applications/audio/google-musicmanager { };

From e76711fe9d685553318939cfb25c3c23ea374eb6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 16 May 2018 10:09:19 -0700
Subject: [PATCH 1953/3370] mattermost: 4.8.0 -> 4.10.0

---
 pkgs/servers/mattermost/default.nix | 102 ++++++++++++++++------------
 1 file changed, 57 insertions(+), 45 deletions(-)

diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix
index 936e457eb336..9943c0b9ab03 100644
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@@ -1,49 +1,61 @@
-{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage }:
+{ stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:
 
 let
-  version = "4.8.0";
-  goPackagePath = "github.com/mattermost/mattermost-server";
-  buildFlags = "-ldflags \"-X '${goPackagePath}/model.BuildNumber=nixpkgs-${version}'\"";
+  version = "4.10.0";
+
+  mattermost-server = buildGoPackage rec {
+    name = "mattermost-server-${version}";
+
+    src = fetchFromGitHub {
+      owner = "mattermost";
+      repo = "mattermost-server";
+      rev = "v${version}";
+      sha256 = "02isw8qapp35pgriy4w1ar1ppvgc5a10j550hjbc1mylnhzkg1jf";
+    };
+
+    goPackagePath = "github.com/mattermost/mattermost-server";
+
+    buildFlagsArray = ''
+      -ldflags=
+        -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}
+    '';
+
+    postInstall = ''
+      ln -s $bin/bin/mattermost-server $bin/bin/platform
+      ln -s $bin/bin/mattermost-server $bin/bin/mattermost-platform
+    '';
+
+  };
+
+  mattermost-webapp = stdenv.mkDerivation {
+    name = "mattermost-webapp-${version}";
+
+    src = fetchurl {
+      url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
+      sha256 = "0pfj2dxl4qrv4w6yj0385nw0fa4flcg95kkahs0arwhan5bgifl5";
+    };
+
+    installPhase = ''
+      mkdir -p $out
+      tar --strip 1 --directory $out -xf $src \
+        mattermost/client \
+        mattermost/i18n \
+        mattermost/fonts \
+        mattermost/templates \
+        mattermost/config
+    '';
+  };
+
 in
+  buildEnv {
+    name = "mattermost-${version}";
+    paths = [ mattermost-server mattermost-webapp ];
 
-buildGoPackage rec {
-  name = "mattermost-${version}";
-
-  src = fetchFromGitHub {
-    owner = "mattermost";
-    repo = "mattermost-server";
-    rev = "v${version}";
-    sha256 = "16yf4p0n3klgh0zw2ikbahj9cy1wcxbwg86pld0yz63cfvfz5ns4";
-  };
-
-  webApp = fetchurl {
-    url = "https://releases.mattermost.com/${version}/mattermost-team-${version}-linux-amd64.tar.gz";
-    sha256 = "0ykp9apsv2514bircgay0xi0jigiai65cnb8q77v1qxjzdyx8s75";
-  };
-
-  inherit goPackagePath;
-
-  buildPhase = ''
-    runHook preBuild
-    cd go/src/${goPackagePath}/cmd/platform
-    go install ${buildFlags}
-    runHook postBuild
-  '';
-
-  preInstall = ''
-    mkdir -p $bin
-    tar --strip 1 -C $bin -xf $webApp
-  '';
-
-  postInstall = ''
-    ln -s $bin/bin/platform $bin/bin/mattermost-platform
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Open-source, self-hosted Slack-alternative";
-    homepage = https://www.mattermost.org;
-    license = with licenses; [ agpl3 asl20 ];
-    maintainers = with maintainers; [ fpletz ryantm ];
-    platforms = platforms.unix;
-  };
-}
+    meta = with stdenv.lib; {
+      description = "Open-source, self-hosted Slack-alternative";
+      homepage = https://www.mattermost.org;
+      license = with licenses; [ agpl3 asl20 ];
+      maintainers = with maintainers; [ fpletz ryantm ];
+      platforms = platforms.unix;
+    };
+  }

From 780d122d727423542213b202f5efe8d1cc3d3a2a Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 13 May 2018 19:19:55 +0200
Subject: [PATCH 1954/3370] firefox: fix build on aarch64 with version >= 60

The firefox build fails with an error referring to ssse2 which doesn't
exist on aarch64.
---
 .../networking/browsers/firefox/common.nix             |  4 +++-
 .../networking/browsers/firefox/packages.nix           | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix
index 5b88a61afce6..9a3da4307146 100644
--- a/pkgs/applications/networking/browsers/firefox/common.nix
+++ b/pkgs/applications/networking/browsers/firefox/common.nix
@@ -28,7 +28,9 @@
 # WARNING: NEVER set any of the options below to `true` by default.
 # Set to `privacySupport` or `false`.
 
-, webrtcSupport ? !privacySupport
+# webrtcSupport breaks the aarch64 build on version >= 60.
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1434589
+, webrtcSupport ? (if lib.versionAtLeast version "60" && stdenv.isAarch64 then false else !privacySupport)
 , geolocationSupport ? !privacySupport
 , googleAPISupport ? geolocationSupport
 , crashreporterSupport ? false
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 33bdb62929e6..35a818dd6c96 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -12,6 +12,12 @@ let
     ./fix-pa-context-connect-retval.patch
   ];
 
+  firefox60_aarch64_skia_patch = fetchpatch {
+      name = "aarch64-skia.patch";
+      url = https://src.fedoraproject.org/rpms/firefox/raw/8cff86d95da3190272d1beddd45b41de3148f8ef/f/build-aarch64-skia.patch;
+      sha256 = "11acb0ms4jrswp7268nm2p8g8l4lv8zc666a5bqjbb09x9k6b78k";
+  };
+
 in
 
 rec {
@@ -26,7 +32,7 @@ rec {
 
     patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
-    ];
+    ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch;
 
     meta = {
       description = "A web browser built from Firefox source tree";
@@ -68,7 +74,7 @@ rec {
 
     patches = nixpkgsPatches ++ [
       ./no-buildconfig.patch
-    ];
+    ] ++ lib.optional stdenv.isAarch64 firefox60_aarch64_skia_patch;
 
     meta = firefox.meta // {
       description = "A web browser built from Firefox Extended Support Release source tree";

From 00c4ba1ea0111f50e188cce7ddc3f5fc8dc58be3 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Wed, 16 May 2018 21:10:34 +0200
Subject: [PATCH 1955/3370] pacvim: init at 2018-05-16

---
 pkgs/games/pacvim/default.nix   | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/games/pacvim/default.nix

diff --git a/pkgs/games/pacvim/default.nix b/pkgs/games/pacvim/default.nix
new file mode 100644
index 000000000000..59e7c874d141
--- /dev/null
+++ b/pkgs/games/pacvim/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "pacvim-${version}";
+  version = "2018-05-16";
+  src = fetchFromGitHub {
+    owner = "jmoon018";
+    repo = "PacVim";
+    rev = "ca7c8833c22c5fe97974ba5247ef1fcc00cedb8e";
+    sha256 = "1kq6j7xmsl5qfl1246lyglkb2rs9mnb2rhsdrp18965dpbj2mhx2";
+  };
+
+  buildInputs = [ ncurses ];
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/jmoon018/PacVim";
+    description = "PacVim is a game that teaches you vim commands.";
+    maintainers = with maintainers; [ infinisil ];
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1129a984d271..0f8db2101a84 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19340,6 +19340,8 @@ with pkgs;
 
   orthorobot = callPackage ../games/orthorobot { love = love_0_7; };
 
+  pacvim = callPackage ../games/pacvim { };
+
   performous = callPackage ../games/performous { };
 
   pingus = callPackage ../games/pingus {};

From c8996506e136cc8cbe4131d2514b801ddca1a3b1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 May 2018 14:06:07 -0500
Subject: [PATCH 1956/3370] dyncall: install cmake modules, man pages, use
 upstream's preferred URL

---
 .../development/libraries/dyncall/default.nix | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix
index b60f61299f32..704f5c51c9c9 100644
--- a/pkgs/development/libraries/dyncall/default.nix
+++ b/pkgs/development/libraries/dyncall/default.nix
@@ -10,12 +10,26 @@ stdenv.mkDerivation rec {
     sha256 = "d1b6d9753d67dcd4d9ea0708ed4a3018fb5bfc1eca5f37537fba2bc4f90748f2";
   };
 
-  doCheck = true;
-  checkTarget = "run-tests";
+  # XXX: broken tests, failures masked, lets avoid crashing a bunch for now :)
+  doCheck = false;
+
+  # install bits not automatically installed
+  postInstall = ''
+    # install cmake modules to make using dyncall easier
+    # This is essentially what -DINSTALL_CMAKE_MODULES=ON if using cmake build
+    # We don't use the cmake-based build since it installs different set of headers
+    # (mostly fewer headers, but installs dyncall_alloc_wx.h "instead" dyncall_alloc.h)
+    # and we'd have to patch the cmake module installation to not use CMAKE_ROOT anyway :).
+    install -D -t $out/lib/cmake ./buildsys/cmake/Modules/Find*.cmake
+
+    # manpages are nice, install them
+    # doing this is in the project's "ToDo", so check this when updating!
+    install -D -t $out/share/man/man3 ./*/*.3
+  '';
 
   meta = with stdenv.lib; {
     description = "Highly dynamic multi-platform foreign function call interface library";
-    homepage = http://dyncall.org;
+    homepage = http://www.dyncall.org;
     license = licenses.isc;
     maintainers = with maintainers; [ dtzWill ];
   };

From 3518211d63eb9040483652c8ceed22b420f2d0b1 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 16 May 2018 23:10:58 +0200
Subject: [PATCH 1957/3370] minio: 2018-03-30T00-38-44Z -> 2018-05-11T00-29-24Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 786a188bbfd8..7f590461d9de 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-${version}";
 
-  version = "2018-03-30T00-38-44Z";
+  version = "2018-05-11T00-29-24Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    sha256 = "17vam9ifi632yfxakanxi2660wqgqrhrhhzywrgh2jmzljippf80";
+    sha256 = "01jw1djfs0jbhsx9pmx3kj31mfhrw45lr1i4lwkmh8k7fxn8w13x";
   };
 
   goPackagePath = "github.com/minio/minio";

From 277806e0d143abcfc18cd3a9543dd43cdd3d0e2b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Wed, 16 May 2018 23:11:26 +0200
Subject: [PATCH 1958/3370] minio-client: 2018-03-25T01-22-22Z ->
 2018-04-28T00-08-20Z

---
 pkgs/tools/networking/minio-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix
index bfe7dfc2dc0d..c1b2b18b3f48 100644
--- a/pkgs/tools/networking/minio-client/default.nix
+++ b/pkgs/tools/networking/minio-client/default.nix
@@ -3,13 +3,13 @@
 buildGoPackage rec {
   name = "minio-client-${version}";
 
-  version = "2018-03-25T01-22-22Z";
+  version = "2018-04-28T00-08-20Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "mc";
     rev = "RELEASE.${version}";
-    sha256 = "1x71va37jaqsi99d0i0mccybrs9kjgmpfsm0dchmc58mmhyagh3k";
+    sha256 = "03c9ahphkpsy6z9i9z50jcsgj5ba6gba2sw2nz22b1ynqiz3ds37";
   };
 
   goPackagePath = "github.com/minio/mc";

From 247a501eb06ef466e366f43fabb0627ece90a640 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Thu, 17 May 2018 00:43:59 +0300
Subject: [PATCH 1959/3370] avocode: 2.26.0 -> 2.26.1 (#40601)

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

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 7bcbc8f2e400..c1e2da20e548 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "avocode-${version}";
-  version = "2.26.0";
+  version = "2.26.1";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "11d3nlshyzh5aqf5vsvnjwhr9qn8a2kd848x0ylv91y9p9njgsl5";
+    sha256 = "0npwwz5m4klswc32fs82icpqqfx9v4786sksiwykj75dsznyv3x8";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [
@@ -81,9 +81,9 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode
     for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/avocode
-        patchelf --set-rpath ${libPath}:$out/ $file
+      patchelf --set-rpath ${libPath}:$out/ $file
     done
   '';
 

From 13ceaf66aaba8412eecd6e0e8c54ab1712729d24 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Thu, 17 May 2018 00:05:53 +0200
Subject: [PATCH 1960/3370] prometheus: correctly set version information
 (#40617)

The way prometheus expects the version to be set is not what was currently set.
---
 pkgs/servers/monitoring/prometheus/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 3287bc6f2583..b71d9b8e58b8 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -19,7 +19,7 @@ let
 
         doCheck = true;
 
-        buildFlagsArray = let t = "${goPackagePath}/version"; in ''
+        buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in ''
           -ldflags=
              -X ${t}.Version=${version}
              -X ${t}.Revision=unknown

From e3b3eac630b686dac89895eab6a4d9245362d5f4 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 17 May 2018 00:13:19 +0200
Subject: [PATCH 1961/3370] dunst: add wrapper to find librsvg (#40050)

---
 pkgs/applications/misc/dunst/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 75640b2c54ec..1a809307cc12 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub
+{ stdenv, fetchFromGitHub, makeWrapper
 , pkgconfig, which, perl, libXrandr
 , cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
 , libXinerama, libnotify, libxdg_basedir, pango, xproto, librsvg
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "1kqlshaflp306yrjjmc28pghi1y5p24vdx4bxf8i4n9khdawb514";
   };
 
-  nativeBuildInputs = [ perl pkgconfig which systemd ];
+  nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ];
 
   buildInputs = [
     cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
     "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user"
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/dunst \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
+
   meta = with stdenv.lib; {
     description = "Lightweight and customizable notification daemon";
     homepage = https://dunst-project.org/;

From 570b1e52c68cf7e3e70dd653c38648af1eeb353d Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 17 May 2018 02:04:42 +0300
Subject: [PATCH 1962/3370] top-level: build winePackages on Hydra

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb7059212f4b..76ef39d5c6eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21209,7 +21209,7 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  winePackages = rec {
+  winePackages = recurseIntoAttrs rec {
     minimal = callPackage ../misc/emulators/wine {
       wineRelease = config.wine.release or "stable";
       wineBuild = config.wine.build or "wine32";

From 1b2b126f82b5b8796ac90a22939cbe1449647a1b Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 17 May 2018 02:29:26 +0300
Subject: [PATCH 1963/3370] winePackages: move to
 pkgs/top-level/wine-packages.nix

---
 pkgs/top-level/all-packages.nix  | 49 +------------------------------
 pkgs/top-level/wine-packages.nix | 50 ++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/top-level/wine-packages.nix

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 76ef39d5c6eb..e7b3c1d39085 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21209,54 +21209,7 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  winePackages = recurseIntoAttrs rec {
-    minimal = callPackage ../misc/emulators/wine {
-      wineRelease = config.wine.release or "stable";
-      wineBuild = config.wine.build or "wine32";
-    };
-
-    base = minimal.override {
-      pngSupport = true;
-      jpegSupport = true;
-      tiffSupport = true;
-      gettextSupport = true;
-      fontconfigSupport = true;
-      alsaSupport = true;
-      openglSupport = true;
-      vulkanSupport = stdenv.isLinux;
-      tlsSupport = true;
-      cupsSupport = true;
-      dbusSupport = true;
-      cairoSupport = true;
-      cursesSupport = true;
-      saneSupport = true;
-      pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
-      udevSupport = true;
-      xineramaSupport = true;
-      xmlSupport = true;
-    };
-
-    full = base.override {
-      gtkSupport = true;
-      gstreamerSupport = true;
-      colorManagementSupport = true;
-      mpg123Support = true;
-      openalSupport = true;
-      openclSupport = true;
-      odbcSupport = true;
-      netapiSupport = true;
-      vaSupport = true;
-      pcapSupport = true;
-      v4lSupport = true;
-      gsmSupport = true;
-      gphoto2Support = true;
-      ldapSupport = true;
-    };
-
-    stable = base.override { wineRelease = "stable"; };
-    unstable = base.override { wineRelease = "unstable"; };
-    staging = base.override { wineRelease = "staging"; };
-  };
+  winePackages = recurseIntoAttrs (callPackage ./wine-packages.nix { });
 
   wine = winePackages.full;
 
diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix
new file mode 100644
index 000000000000..109f01362555
--- /dev/null
+++ b/pkgs/top-level/wine-packages.nix
@@ -0,0 +1,50 @@
+{ stdenv, config, callPackage }:
+
+rec {
+  minimal = callPackage ../misc/emulators/wine {
+    wineRelease = config.wine.release or "stable";
+    wineBuild = config.wine.build or "wine32";
+  };
+
+  base = minimal.override {
+    pngSupport = true;
+    jpegSupport = true;
+    tiffSupport = true;
+    gettextSupport = true;
+    fontconfigSupport = true;
+    alsaSupport = true;
+    openglSupport = true;
+    vulkanSupport = stdenv.isLinux;
+    tlsSupport = true;
+    cupsSupport = true;
+    dbusSupport = true;
+    cairoSupport = true;
+    cursesSupport = true;
+    saneSupport = true;
+    pulseaudioSupport = config.pulseaudio or stdenv.isLinux;
+    udevSupport = true;
+    xineramaSupport = true;
+    xmlSupport = true;
+  };
+
+  full = base.override {
+    gtkSupport = true;
+    gstreamerSupport = true;
+    colorManagementSupport = true;
+    mpg123Support = true;
+    openalSupport = true;
+    openclSupport = true;
+    odbcSupport = true;
+    netapiSupport = true;
+    vaSupport = true;
+    pcapSupport = true;
+    v4lSupport = true;
+    gsmSupport = true;
+    gphoto2Support = true;
+    ldapSupport = true;
+  };
+
+  stable = base.override { wineRelease = "stable"; };
+  unstable = base.override { wineRelease = "unstable"; };
+  staging = base.override { wineRelease = "staging"; };
+}

From b577dc3bd0d989408a6d71b74b5792722c92b6da Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 21:56:19 -0400
Subject: [PATCH 1964/3370] linux-copperhead: 4.14.39.a -> 4.14.41.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
index a1c93e565905..8054ba0be6ac 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.14.39";
+  version = "4.14.41";
   revision = "a";
-  sha256 = "19nx537a8kbbyp5d67anrqfw8i8hliw3yb1gyrf70isl3fqifjaa";
+  sha256 = "16jwv1drs6xlwghzn8ps7v8x5xja61b5y6747c86g17idfaac1k3";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 1006c8c8d29cc70f9ed0c168449a92e3dc5fe69b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 21:56:50 -0400
Subject: [PATCH 1965/3370] linux-copperhead: 4.16.7.a -> 4.16.9.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
index 9d4b729060ae..5c65f2064b42 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.16.7";
+  version = "4.16.9";
   revision = "a";
-  sha256 = "1kdy3sqrn161hm5avhk3nd75p07a21ja0rzar3ybibh1bl2mc6zq";
+  sha256 = "1g1924whb79cflh4wcqpyq9d7nfxdsvsjh2mv5ps85fsg2109kpl";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From c65686c7f9aa3a8540ae21215d9ee130e3c3b5df Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 22:13:43 -0400
Subject: [PATCH 1966/3370] kafka: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 152e60455746..10e9489833e7 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -19,9 +19,9 @@ let
       sha256 = "1wj639h95aq5n132fq1rbyzqh5rsa4mlhbg3c5mszqglnzdz4xn7";
     };
     "1.0" = {
-      kafkaVersion = "1.0.0";
+      kafkaVersion = "1.0.1";
       scalaVersion = "2.12";
-      sha256 = "1cs4nmp39m99gqjpy5klsffqksc0h9pz514jkq99qb95a83x1cfm";
+      sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m";
     };
   };
 in

From a6d8d54e7927bff4d478a27aa72f3b9ce1bc001a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 May 2018 21:19:33 -0500
Subject: [PATCH 1967/3370] sqlite: 3.22.0 -> 3.23.1

https://sqlite.org/releaselog/3_23_1.html

(also contains notes for 3.23.0)

Adds CLI support for SQLite archive files:
https://sqlite.org/sqlar.html
---
 pkgs/development/libraries/sqlite/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index b8b7d0c701dd..a3e61e3c0ac2 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -3,11 +3,11 @@
 assert interactive -> readline != null && ncurses != null;
 
 stdenv.mkDerivation {
-  name = "sqlite-3.22.0";
+  name = "sqlite-3.23.1";
 
   src = fetchurl {
-    url = "http://sqlite.org/2018/sqlite-autoconf-3220000.tar.gz";
-    sha256 = "04n6hnw2g818d7r92cp2608kd5mhzyysy83k29kbq1mp709an918";
+    url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz;
+    sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j";
   };
 
   outputs = [ "bin" "dev" "out" ];

From fe2deeb4584e7da1d7018d74ec659fa6a0357e45 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 16 May 2018 22:26:40 -0400
Subject: [PATCH 1968/3370] kafka: Add 1.1

---
 nixos/tests/kafka.nix                 | 1 +
 pkgs/servers/apache-kafka/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix       | 3 ++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 6209b4b8e2b7..e48b25d67df3 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -65,4 +65,5 @@ in with pkgs; {
   kafka_0_10 = makeKafkaTest "kafka_0_10" apacheKafka_0_10;
   kafka_0_11 = makeKafkaTest "kafka_0_11" apacheKafka_0_11;
   kafka_1_0  = makeKafkaTest "kafka_1_0"  apacheKafka_1_0;
+  kafka_1_1  = makeKafkaTest "kafka_1_1"  apacheKafka_1_1;
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 10e9489833e7..fe67bdd0282c 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -23,6 +23,11 @@ let
       scalaVersion = "2.12";
       sha256 = "1fxn6i0kanwksj1dhcnlni0cn542k50wdg8jkwhfmf4qq8yfl90m";
     };
+    "1.1" = {
+      kafkaVersion = "1.1.0";
+      scalaVersion = "2.12";
+      sha256 = "04idhsr6pbkb0xkx38faxv2pn5nkjcflz6wl4s3ka82h1fbq74j9";
+    };
   };
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb7059212f4b..681f490bf011 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7564,11 +7564,12 @@ with pkgs;
 
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
 
-  apacheKafka = apacheKafka_1_0;
+  apacheKafka = apacheKafka_1_1;
   apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; };
   apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; };
   apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; };
   apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; };
+  apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; };
 
   kt = callPackage ../tools/misc/kt {};
 

From 1d6a14e24a65d41e30c824d1e339a372060d171a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 May 2018 21:33:42 -0500
Subject: [PATCH 1969/3370] sqlite: Add zlib dep, needed for sqlar support.

(and seems generally useful anyway?)
---
 pkgs/development/libraries/sqlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index a3e61e3c0ac2..ff2de38f98bc 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, interactive ? false, readline ? null, ncurses ? null }:
+{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
 
 assert interactive -> readline != null && ncurses != null;
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   outputs = [ "bin" "dev" "out" ];
   separateDebugInfo = stdenv.isLinux;
 
-  buildInputs = lib.optionals interactive [ readline ncurses ];
+  buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ];
 
   configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline";
 

From b8966f5d87d0cd3623bd67a050c6e16c16fe1964 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 16 May 2018 22:45:17 -0700
Subject: [PATCH 1970/3370] xpra: 2.2.6 -> 2.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xpra/versions.

These checks were done:

- built on NixOS
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra passed the binary check.
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_Xdummy had a zero exit code or showed the expected version
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_udev_product_version passed the binary check.
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_browser-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_browser had a zero exit code or showed the expected version
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_launcher-wrapped passed the binary check.
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_launcher passed the binary check.
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra_signal_listener-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/xpra_signal_listener had a zero exit code or showed the expected version
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/..xpra-wrapped-wrapped passed the binary check.
- /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3/bin/.xpra-wrapped passed the binary check.
- 6 of 11 passed binary check by having a zero exit code.
- 0 of 11 passed binary check by having the new version present in output.
- found 2.3 with grep in /nix/store/qj6c3wgczrd94h9xc80nx6idcimyx77r-xpra-2.3
- directory tree listing: https://gist.github.com/9e03a45b8255a45b7df6fbcf24b6f408
- du listing: https://gist.github.com/a48b995e2d458e3b9da00ae42675dbe6
---
 pkgs/tools/X11/xpra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 9bc13b3260da..f8174a03cacf 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -12,11 +12,11 @@ let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.2.6";
+  version = "2.3";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "1zyynghhzjbgnmzcibm17wpj9f7jy31d7dr373li8cwg2yl2swyz";
+    sha256 = "0kq0ambpy8r7m3wxdp79cgxgnl9yfmr19lv88f617gnv0sp0aarp";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From deb8d43e297f14512f3f032cf1de4337c7ebc1b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 16 May 2018 22:46:12 -0700
Subject: [PATCH 1971/3370] you-get: 0.4.1060 -> 0.4.1077

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/you-get/versions.

These checks were done:

- built on NixOS
- /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077/bin/.you-get-wrapped passed the binary check.
- /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077/bin/you-get passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.4.1077 with grep in /nix/store/r1x8qsdcsnh28msjaxqwa4j07ri7s66p-you-get-0.4.1077
- directory tree listing: https://gist.github.com/7dc27079ec72816d18224787520a534c
- du listing: https://gist.github.com/ebb4a641370380db9496be5dadc3d499
---
 pkgs/tools/misc/you-get/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix
index f0a8eda00285..bfce454473ad 100644
--- a/pkgs/tools/misc/you-get/default.nix
+++ b/pkgs/tools/misc/you-get/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonApplication rec {
   pname = "you-get";
-  version = "0.4.1060";
+  version = "0.4.1077";
 
   # Tests aren't packaged, but they all hit the real network so
   # probably aren't suitable for a build environment anyway.
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1c4drn6khqrjvyzzsiaracnpcvahbiya6v5p18h2lyl7xia8gk51";
+    sha256 = "1qf4n1zgbr533a0qbxp8548f25jwqdwfl42gi5dyfhm4f1y1jk1a";
   };
 
   meta = with stdenv.lib; {

From dd51a4a19e823b9828d93e8fdcb4a48648f0508e Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Fri, 11 May 2018 17:32:18 +0100
Subject: [PATCH 1972/3370] add psyanticy as maintainer

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6b9d2a16c53e..c49561da51bf 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3021,6 +3021,11 @@
     email = "philipp@xndr.de";
     name = "Philipp Steinpaß";
   };
+  psyanticy = {
+    email = "iuns@outlook.fr";
+    github = "Assassinkin";
+    name = "Psyanticy";
+  };
   puffnfresh = {
     email = "brian@brianmckenna.org";
     github = "puffnfresh";

From 1ec3c94a21de18c28839ea3b25d8b8aaef0deb41 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 16 May 2018 23:31:23 -0700
Subject: [PATCH 1973/3370] python36Packages.uranium: 3.2.1 -> 3.3.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/uranium/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 3.3.0 with grep in /nix/store/s5bmfykrkc953i0qhfkmwj6fj1yv3i56-uranium-3.3.0
- directory tree listing: https://gist.github.com/0c76704986608d25a9223af819e0a259
- du listing: https://gist.github.com/242655ce87890bfe9b511e44306303de
---
 pkgs/development/python-modules/uranium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix
index 774799f3b4d8..0917c5ab6eef 100644
--- a/pkgs/development/python-modules/uranium/default.nix
+++ b/pkgs/development/python-modules/uranium/default.nix
@@ -5,7 +5,7 @@ then throw "Uranium not supported for interpreter ${python.executable}"
 else
 
 stdenv.mkDerivation rec {
-  version = "3.2.1";
+  version = "3.3.0";
   pname = "uranium";
   name = "${pname}-${version}";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "Ultimaker";
     repo = "Uranium";
     rev = version;
-    sha256 = "1p05iw1x3rvb51p6hj57yq6nsjawjba3pyyr4jx924iq96vcc3fz";
+    sha256 = "1rg0l2blndnbdfcgkjc2r29cnjdm009rz8lnc225ilh9d7w1srbb";
   };
 
   buildInputs = [ python gettext ];

From 8ea265279e65fb83149691e5cdeec70f1e81c706 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 17 May 2018 15:22:31 +0800
Subject: [PATCH 1974/3370] Allow YAML on other platforms as well.

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

diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index e441d1e6b615..20053190e3bc 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     homepage = http://pyyaml.org/;
     description = "A YAML 1.1 parser and emitter written in C";
     license = licenses.mit;
-    platforms = platforms.unix;
+    platforms = platforms.all;
     maintainers = with maintainers; [ wkennington ];
   };
 }

From 2329df494cf000cf9328b23fea138841a2de1832 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 01:18:07 -0700
Subject: [PATCH 1975/3370] spidermonkey_52: 52.7.4 -> 52.8.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/spidermonkey/versions.

These checks were done:

- built on NixOS
- /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0/bin/js52 passed the binary check.
- /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0/bin/js52-config passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 52.8.0 with grep in /nix/store/dd4kmbg04pklv4gs9y8cky5bv69id31v-spidermonkey-52.8.0
- directory tree listing: https://gist.github.com/1ec4dfe6196b463eb8174ab1aa82023d
- du listing: https://gist.github.com/a7355483d743c1a8d6fb1271ee57a5c0
---
 pkgs/development/interpreters/spidermonkey/52.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/52.nix b/pkgs/development/interpreters/spidermonkey/52.nix
index 35dcff95029d..4657a51e48f9 100644
--- a/pkgs/development/interpreters/spidermonkey/52.nix
+++ b/pkgs/development/interpreters/spidermonkey/52.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, which, readline, icu, zlib, nspr }:
 
 let
-  version = "52.7.4";
+  version = "52.8.0";
 in stdenv.mkDerivation rec {
   name = "spidermonkey-${version}";
 
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz";
-    sha256 = "0dn3hbc95qhvcgzbibhy17xwn5m0340f64bq5byvx22c2rf40xwz";
+    sha256 = "11v2wwgrb92z08dv9cvk5x2dj3xj25qxzbjqjgiq6mz91bzd9gms";
   };
 
   buildInputs = [ readline icu zlib nspr ];

From d38852ce2a0e71813956e30d9789df3dc698dc8c Mon Sep 17 00:00:00 2001
From: Andrea Bedini <andrea@andreabedini.com>
Date: Mon, 14 May 2018 20:15:08 +0800
Subject: [PATCH 1976/3370] pythonPackages.docker_pycreds: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix
index 9cc510bf9af3..dd20400ea4f4 100644
--- a/pkgs/development/python-modules/docker-pycreds/default.nix
+++ b/pkgs/development/python-modules/docker-pycreds/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "docker-pycreds";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299";
+    sha256 = "e3732a03610a00461a716997670c7010bf1c214a3edc440f7d6a2a3a830ecd9d";
   };
 
   # require docker-credential-helpers binaries

From fd95438c6123a36ad21f500cecfa84ba5e26cab0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 16 May 2018 22:36:53 -0700
Subject: [PATCH 1977/3370] xqilla: 2.3.3 -> 2.3.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xqilla/versions.

These checks were done:

- built on NixOS
- /nix/store/q0djr7z4ixv0mx02crj7ifqapgm54crr-xqilla-2.3.4/bin/xqilla passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.3.4 with grep in /nix/store/q0djr7z4ixv0mx02crj7ifqapgm54crr-xqilla-2.3.4
- directory tree listing: https://gist.github.com/70c99ca62187f093025b5404d2a4a6da
- du listing: https://gist.github.com/38a73f127b9835b2a8c187242de78a1d
---
 pkgs/development/tools/xqilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/xqilla/default.nix b/pkgs/development/tools/xqilla/default.nix
index 77bf313e83dc..c163c4cbcf69 100644
--- a/pkgs/development/tools/xqilla/default.nix
+++ b/pkgs/development/tools/xqilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "xqilla-${version}";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchurl {
     url    = "mirror://sourceforge/xqilla/XQilla-${version}.tar.gz";
-    sha256 = "1mjgcyar3qyizpnb0h9lxaj6p9yq4vj09qd8qan1bwv6z6sbjxlg";
+    sha256 = "0m9z7diw7pdyb4qycbqyr2x55s13v8310xsi7yz0inpw27q4vzdd";
   };
 
   configureFlags = [ "--with-xerces=${xercesc}" ];

From 2f6c9947fe5d5ac1d1832337267eb735a7832161 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:26:48 -0400
Subject: [PATCH 1978/3370] Add pkgconfig to ghcjs boot

---
 pkgs/development/compilers/ghcjs-ng/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 71bab1a4e66a..03bdf022ecdb 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -13,6 +13,7 @@
 , makeWrapper
 , xorg
 , gmp
+, pkgconfig
 , lib
 , ghcjsDepOverrides ? (_:_:{})
 }:
@@ -60,6 +61,7 @@ in stdenv.mkDerivation {
       makeWrapper
       xorg.lndir
       gmp
+      pkgconfig
     ];
     phases = ["unpackPhase" "buildPhase"];
     buildPhase = ''

From 9c6e63ffdac0579b118e3bef5b436fbefb0e0978 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:27:03 -0400
Subject: [PATCH 1979/3370] Expose bootGhcjs for convenience's sake

---
 pkgs/development/compilers/ghcjs-ng/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 03bdf022ecdb..a5d0c46e78ea 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -36,6 +36,7 @@ let
     ]);
 
     targetPrefix = "";
+    inherit bootGhcjs;
     inherit (bootGhcjs) version;
     isGhcjs = true;
 

From 7b405d35648ac198c1329063d6e3bc820356482c Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:27:19 -0400
Subject: [PATCH 1980/3370] Remove -dcore-lint from GHCJS wrapper

---
 pkgs/development/compilers/ghcjs-ng/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index a5d0c46e78ea..785f5b878f7f 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -73,7 +73,7 @@ in stdenv.mkDerivation {
       mkdir -p $out/libexec
       lndir ${libexec} $out/bin
 
-      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec -dcore-lint"
+      wrapProgram $out/bin/ghcjs --add-flags "-B$out/libexec"
       wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
       wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
 

From 4eb49533cbbab3994b0819de966501d994e8b688 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:27:38 -0400
Subject: [PATCH 1981/3370] Work around GHCJS bug with ghcjs-boot -j1

---
 pkgs/development/compilers/ghcjs-ng/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 785f5b878f7f..035687a64f3a 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -77,10 +77,12 @@ in stdenv.mkDerivation {
       wrapProgram $out/bin/haddock-ghcjs --add-flags "-B$out/libexec"
       wrapProgram $out/bin/ghcjs-pkg --add-flags "--global-package-db=$out/libexec/package.conf.d"
 
-      env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j $NIX_BUILD_CORES --with-ghcjs-bin $out/bin
+      env PATH=$out/bin:$PATH $out/bin/ghcjs-boot -j1 --with-ghcjs-bin $out/bin
     '';
 
-    enableParallelBuilding = true;
+    # We hard code -j1 as a temporary workaround for
+    # https://github.com/ghcjs/ghcjs/issues/654
+    # enableParallelBuilding = true;
 
     inherit passthru;
 

From 2dd3789d47da95988cea74ff213a7e990c9e3a79 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 05:35:00 -0400
Subject: [PATCH 1982/3370] Bump GHCJS 8.4

---
 pkgs/development/compilers/ghcjs-ng/8.4/git.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/8.4/git.json b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
index 49ff19529c6e..b27c75bfe713 100644
--- a/pkgs/development/compilers/ghcjs-ng/8.4/git.json
+++ b/pkgs/development/compilers/ghcjs-ng/8.4/git.json
@@ -1,6 +1,6 @@
 {
   "url": "https://github.com/ghcjs/ghcjs",
-  "rev": "6770fa38621f55b7a947fc11c69f81b8ce8502cf",
-  "sha256": "0c0x0yylx14mrvzmbvkw6zbprriizk73hvz8iija8i8hwpff79vm",
+  "rev": "d20da90a4819faad1c6309a06363b34edac0374c",
+  "sha256": "0jmxgfm1zwg6xscjcaycfam7zss8ik4ql4ii5lpryh4h6cdhvkbr",
   "fetchSubmodules": true
 }

From 3bec610cf33d6f754ea362cd982e66a788784f8f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 02:53:14 -0700
Subject: [PATCH 1983/3370] opensc: 0.17.0 -> 0.18.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/opensc/versions.

These checks were done:

- built on NixOS
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-tool passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-explorer had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-notify passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-tool had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-crypt had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs11-tool had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/cardos-tool had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/eidenv passed the binary check.
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/openpgp-tool passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/iasecc-tool had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/egk-tool passed the binary check.
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/opensc-asn1 passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/cryptoflex-tool had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/pkcs15-init had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/netkey-tool had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/piv-tool had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/westcos-tool passed the binary check.
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/sc-hsm-tool passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/dnie-tool had a zero exit code or showed the expected version
- /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/gids-tool passed the binary check.
- Warning: no invocation of /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0/bin/npa-tool had a zero exit code or showed the expected version
- 9 of 21 passed binary check by having a zero exit code.
- 3 of 21 passed binary check by having the new version present in output.
- found 0.18.0 with grep in /nix/store/4dhwvyjqklvgf9a1mgdw1grkg8vlswv5-opensc-0.18.0
- directory tree listing: https://gist.github.com/1276953ac55af68ec597ce6744192684
- du listing: https://gist.github.com/b02c245b9a13433013450fc258e41a01
---
 pkgs/tools/security/opensc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix
index e727180fa3f0..819c01a0893f 100644
--- a/pkgs/tools/security/opensc/default.nix
+++ b/pkgs/tools/security/opensc/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "opensc-${version}";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "OpenSC";
     rev = version;
-    sha256 = "1mgcf698zhpqzamd52547scdws7mhdva377kc3chpr455n0mw8g0";
+    sha256 = "1shwx1rkmnygk2dp0q8pbvnxcg96bn570vch9yq34gs42ryskihf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From fb7340d3e546c1272c69a6408d205dedce89e05b Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Fri, 11 May 2018 15:14:15 +0100
Subject: [PATCH 1984/3370] pythonPackages.mail-parser: init at 3.3.1

---
 .../python-modules/mail-parser/default.nix    | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/mail-parser/default.nix

diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix
new file mode 100644
index 000000000000..e05dc3f2861f
--- /dev/null
+++ b/pkgs/development/python-modules/mail-parser/default.nix
@@ -0,0 +1,41 @@
+{ lib, buildPythonPackage, python, pythonOlder, glibcLocales, fetchFromGitHub, ipaddress, six, simplejson }:
+
+buildPythonPackage rec {
+  pname = "mail-parser";
+  version = "3.3.1";
+
+  # no tests in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "SpamScope";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1b1v61zwgdx2xjzds3hp6bv53yq424hhlrhf445n4faj1l0c4lkg";
+  };
+
+  LC_ALL = "en_US.utf-8";
+
+  # ipaddress is part of the standard library of Python 3.3+
+  prePatch = lib.optionalString (!pythonOlder "3.3") ''
+    substituteInPlace requirements.txt \
+      --replace "ipaddress" ""
+  '';
+
+  nativeBuildInputs = [ glibcLocales ];
+  propagatedBuildInputs = [ simplejson six ] ++ lib.optional (pythonOlder "3.3") ipaddress;
+
+  # Taken from .travis.yml
+  checkPhase = ''
+    ${python.interpreter} tests/test_main.py
+    ${python.interpreter} -m mailparser -v
+    ${python.interpreter} -m mailparser -h
+    ${python.interpreter} -m mailparser -f tests/mails/mail_malformed_3 -j
+    cat tests/mails/mail_malformed_3 | ${python.interpreter} -m mailparser -k -j
+  '';
+
+  meta = with lib; {
+    description = "A mail parser for python 2 and 3";
+    homepage = https://github.com/SpamScope/mail-parser;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7868f7d7ff06..61c0eac4c6d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -277,6 +277,8 @@ in {
 
   logster = callPackage ../development/python-modules/logster { };
 
+  mail-parser = callPackage ../development/python-modules/mail-parser {  };
+
   mpi4py = callPackage ../development/python-modules/mpi4py {
     mpi = pkgs.openmpi;
   };

From de49ba6c3f17574104d11c817ca3a60649a57cfb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 03:57:50 -0700
Subject: [PATCH 1985/3370] nauty: 26r7 -> 26r10

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/nauty/versions.

These checks were done:

- built on NixOS
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dreadnaut passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/copyg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/listg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/labelg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dretog passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/amtog passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/geng passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/complg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/showg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/NRswitchg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/biplabg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/addedgeg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/deledgeg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/countg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/pickg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genrang passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/newedgeg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/catg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genbg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/directg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/gentreeg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genquarticg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/ranlabg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/multig passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/planarg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/gentourng passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/linegraphg passed the binary check.
- Warning: no invocation of /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/watercluster2 had a zero exit code or showed the expected version
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/dretodot passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/subdivideg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/vcolg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/delptg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/cubhamg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/twohamg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/hamheuristic passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/converseg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genspecialg passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/genbgL passed the binary check.
- /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/shortg passed the binary check.
- Warning: no invocation of /nix/store/f2icw60ljw5s4nkj8hlgwxz83szfi1m7-nauty-26r10/bin/configure had a zero exit code or showed the expected version
- 38 of 40 passed binary check by having a zero exit code.
- 0 of 40 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/3bca602211d416ba58097f4f8880b6d0
- du listing: https://gist.github.com/4ac19efe14e18aae8fece0ec1a500bf1
---
 pkgs/applications/science/math/nauty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix
index 36ac84ece25f..d7b4707420be 100644
--- a/pkgs/applications/science/math/nauty/default.nix
+++ b/pkgs/applications/science/math/nauty/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 stdenv.mkDerivation rec {
   name = "nauty-${version}";
-  version = "26r7";
+  version = "26r10";
   src = fetchurl {
     url = "http://pallini.di.uniroma1.it/nauty${version}.tar.gz";
-    sha256 = "1indcc1im7s5x89x0xn4699izw1wwars1aanpmf8jibnw66n9dcp";
+    sha256 = "16pdklh066z6mx424wkisr88fz9divn2caj7ggs03wy3y848spq6";
   };
   buildInputs = [];
   installPhase = ''

From ffd3f884bddc31fc0ee38d665672d8aaeeca5e16 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 04:04:45 -0700
Subject: [PATCH 1986/3370] nsd: 4.1.20 -> 4.1.21

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/nsd/versions.

These checks were done:

- built on NixOS
- /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd passed the binary check.
- Warning: no invocation of /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd-checkconf had a zero exit code or showed the expected version
- /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd-checkzone passed the binary check.
- Warning: no invocation of /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd-control had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21/bin/nsd-control-setup had a zero exit code or showed the expected version
- 2 of 5 passed binary check by having a zero exit code.
- 0 of 5 passed binary check by having the new version present in output.
- found 4.1.21 with grep in /nix/store/vwidqdayh0l8rf5sjq37hr6ygdxrmkbb-nsd-4.1.21
- directory tree listing: https://gist.github.com/57f572db82ca8e038bcf1c970d13f10e
- du listing: https://gist.github.com/11c687e733f7222872d6e3733c5f9d0b
---
 pkgs/servers/dns/nsd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index b4bd6175f3e7..c1c0d4e425c2 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.20";
+  name = "nsd-4.1.21";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "04zph9zli3a0zx1sfphwbxx6f8whdxcjai6w0k7a565vgcfzd5wa";
+    sha256 = "1gfjdgb5nc0nrbpdm36ngxml302khl2lnwkykl3q45byl0sbjn3q";
   };
 
   prePatch = ''

From c056694d74fe99c6a0657528fac73645680e0df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 15 May 2018 17:45:48 +0200
Subject: [PATCH 1987/3370] androidndk: Adds versions 17 and 16b

---
 .../mobile/androidenv/androidndk.nix          |  52 +++++---
 .../development/mobile/androidenv/default.nix |  26 +++-
 ...h => make-standalone-toolchain_r10e.patch} |   0
 .../make_standalone_toolchain.py_16b.patch    | 119 ++++++++++++++++++
 .../make_standalone_toolchain.py_17.patch     | 119 ++++++++++++++++++
 5 files changed, 296 insertions(+), 20 deletions(-)
 rename pkgs/development/mobile/androidenv/{make-standalone-toolchain.patch => make-standalone-toolchain_r10e.patch} (100%)
 create mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
 create mode 100644 pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index a9908d67f1d2..d0bfe6c8100c 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, zlib, ncurses, p7zip, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools
+, platformTools, python3, version, sha256
 }:
 
 stdenv.mkDerivation rec {
-  name = "android-ndk-r10e";
+  name = "android-ndk-r${version}";
 
   src = if stdenv.system == "x86_64-linux" then fetchurl {
-      url = "http://dl.google.com/android/ndk/${name}-linux-x86_64.bin";
-      sha256 = "0nhxixd0mq4ib176ya0hclnlbmhm8f2lab6i611kiwbzyqinfb8h";
+      url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip";
+      inherit sha256;
     } else throw "platform ${stdenv.system} not supported!";
 
   phases = "buildPhase";
@@ -27,8 +27,7 @@ stdenv.mkDerivation rec {
     runtime_paths = (lib.makeBinPath [
       coreutils file findutils
       gawk gnugrep gnused
-      jdk
-      which
+      jdk python3 which
     ]) + ":${platformTools}/platform-tools";
   in ''
     set -x
@@ -38,9 +37,22 @@ stdenv.mkDerivation rec {
 
     # so that it doesn't fail because of read-only permissions set
     cd -
-    patch -p1 \
-        --no-backup-if-mismatch \
-        -d $out/libexec/${name} < ${ ./make-standalone-toolchain.patch }
+    ${if (version == "10e") then
+        ''
+          patch -p1 \
+            --no-backup-if-mismatch \
+            -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r10e.patch }
+        ''
+      else
+        ''
+          patchShebangs ${pkg_path}/build/tools/make-standalone-toolchain.sh
+
+          patch -p1 \
+            --no-backup-if-mismatch \
+            -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") }
+          wrapProgram ${pkg_path}/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
+        ''
+    }
     cd ${pkg_path}
 
     find $out \( \
@@ -49,29 +61,31 @@ stdenv.mkDerivation rec {
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
                           --set-rpath ${stdenv.lib.makeLibraryPath [ zlib.out ncurses ]} {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
-    for i in ndk-build ndk-gdb ndk-gdb-py
+    for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
     do
         sed -i -e ${sed_script_1} $i
     done
-    sed -i -e ${sed_script_2} ndk-which
-    # a bash script
-    patchShebangs ndk-which
+    ${lib.optionalString (version == "10e") ''
+      sed -i -e ${sed_script_2} ndk-which
+      # a bash script
+      patchShebangs ndk-which
+    ''}
     # wrap
-    for i in ndk-build ndk-gdb ndk-gdb-py ndk-which
+    for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
     do
         wrapProgram "$(pwd)/$i" --prefix PATH : "${runtime_paths}"
     done
     # make some executables available in PATH
     mkdir -pv ${bin_path}
     for i in \
-        ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which
+        ndk-build ${lib.optionalString (version == "10e") "ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which"}
     do
         ln -sf ${pkg_path}/$i ${bin_path}/$i
     done
   '';
 
-    meta = {
-        platforms = stdenv.lib.platforms.linux;
-        hydraPlatforms = [];
-    };
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
+  };
 }
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index b77cc68fa0e8..d122ffe241ea 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -215,13 +215,37 @@ rec {
     useInstantApps = true;
   };
 
+  androidndk_10e = import ./androidndk.nix {
+    inherit (buildPackages)
+      p7zip makeWrapper;
+    inherit (pkgs)
+      stdenv fetchurl zlib ncurses lib python3
+      coreutils file findutils gawk gnugrep gnused jdk which;
+    inherit platformTools;
+    version = "10e";
+    sha256 = "032j3sgk93bjbkny84i17ph61dhjmsax9ddqng1zbi2p7dgl0pzf";
+  };
+
+  androidndk_16b = import ./androidndk.nix {
+    inherit (buildPackages)
+      p7zip makeWrapper;
+    inherit (pkgs)
+      stdenv fetchurl zlib ncurses lib python3
+      coreutils file findutils gawk gnugrep gnused jdk which;
+    inherit platformTools;
+    version = "16b";
+    sha256 = "00frcnvpcsngv00p6l2vxj4cwi2mwcm9lnjvm3zv4wrp6pss9pmw";
+  };
+
   androidndk = import ./androidndk.nix {
     inherit (buildPackages)
       p7zip makeWrapper;
     inherit (pkgs)
-      stdenv fetchurl zlib ncurses lib
+      stdenv fetchurl zlib ncurses lib python3
       coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
+    version = "17";
+    sha256 = "1jj3zy958zsidywqd5nwdyrnr72rf9zhippkl8rbqxfy8wxq2gds";
   };
 
   androidndk_r8e = import ./androidndk_r8e.nix {
diff --git a/pkgs/development/mobile/androidenv/make-standalone-toolchain.patch b/pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch
similarity index 100%
rename from pkgs/development/mobile/androidenv/make-standalone-toolchain.patch
rename to pkgs/development/mobile/androidenv/make-standalone-toolchain_r10e.patch
diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
new file mode 100644
index 000000000000..70b1f7e7f4a5
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_16b.patch
@@ -0,0 +1,119 @@
+diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
+index a6ae8448..2739912e 100755
+--- a/build/tools/make_standalone_toolchain.py
++++ b/build/tools/make_standalone_toolchain.py
+@@ -398,7 +398,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+                      sysroot_path, stl, host_tag):
+     """Create a standalone toolchain."""
+     copy_directory_contents(gcc_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     copy_directory_contents(clang_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     triple = get_triple(arch)
+     make_clang_scripts(
+         install_path, triple, api, host_tag.startswith('windows'))
+@@ -406,23 +408,28 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+     sysroot = os.path.join(NDK_DIR, 'sysroot')
+     install_sysroot = os.path.join(install_path, 'sysroot')
+     shutil.copytree(sysroot, install_sysroot)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     arch_headers = os.path.join(sysroot, 'usr/include', triple)
+     copy_directory_contents(
+         arch_headers, os.path.join(install_sysroot, 'usr/include'))
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     lib_path = os.path.join(sysroot_path, 'usr/lib')
+     lib_install = os.path.join(install_sysroot, 'usr/lib')
+     if os.path.exists(lib_path):
+         shutil.copytree(lib_path, lib_install)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     lib64_path = os.path.join(sysroot_path, 'usr/lib64')
+     lib64_install = os.path.join(install_sysroot, 'usr/lib64')
+     if os.path.exists(lib64_path):
+         shutil.copytree(lib64_path, lib64_install)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
+     copy_directory_contents(prebuilt_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
+     dirs = os.listdir(toolchain_lib_dir)
+@@ -444,29 +451,37 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+     if stl == 'gnustl':
+         gnustl_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gnu-libstdc++/4.9')
+         shutil.copytree(os.path.join(gnustl_dir, 'include'), cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         for abi in get_abis(arch):
+             copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple,
+                                     abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             copy_gnustl_libs(gnustl_dir, install_path, triple, abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver,
+                                         triple, abi, thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+                 copy_gnustl_libs(gnustl_dir, install_path, triple, abi,
+                                  thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     elif stl == 'libc++':
+         libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++')
+         libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
+         support_dir = os.path.join(NDK_DIR, 'sources/android/support')
+         copy_directory_contents(os.path.join(libcxx_dir, 'include'),
+                                 cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+         copy_directory_contents(os.path.join(support_dir, 'include'),
+                                 support_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         # I have no idea why we need this, but the old one does it too.
+         copy_directory_contents(
+             os.path.join(libcxxabi_dir, 'include'),
+             os.path.join(install_path, 'include/llvm-libc++abi/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         headers = [
+             'cxxabi.h',
+@@ -482,21 +497,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             dest_libdir = get_dest_libdir(install_path, triple, abi)
+             include_libunwind = arch == 'arm'
+             copy_libcxx_libs(src_libdir, dest_libdir, include_libunwind)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 thumb_libdir = os.path.join(dest_libdir, 'thumb')
+                 copy_libcxx_libs(src_libdir, thumb_libdir, include_libunwind)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     elif stl == 'stlport':
+         stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport')
+         gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++')
+ 
+         copy_directory_contents(
+             os.path.join(stlport_dir, 'stlport'), cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         # Same as for libc++. Not sure why we have this extra directory, but
+         # keep the cruft for diff.
+         copy_directory_contents(
+             os.path.join(gabixx_dir, 'include'),
+             os.path.join(install_path, 'include/gabi++/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         headers = [
+             'cxxabi.h',
+@@ -512,9 +531,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+ 
+         for abi in get_abis(arch):
+             copy_stlport_libs(stlport_dir, install_path, triple, abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 copy_stlport_libs(stlport_dir, install_path, triple, abi,
+                                   thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     else:
+         raise ValueError(stl)
+ 
diff --git a/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch
new file mode 100644
index 000000000000..88ce69be3e8c
--- /dev/null
+++ b/pkgs/development/mobile/androidenv/make_standalone_toolchain.py_17.patch
@@ -0,0 +1,119 @@
+diff --git a/build/tools/make_standalone_toolchain.py b/build/tools/make_standalone_toolchain.py
+index daba3351..424b7fef 100755
+--- a/build/tools/make_standalone_toolchain.py
++++ b/build/tools/make_standalone_toolchain.py
+@@ -421,7 +421,9 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+                      platforms_path, stl, host_tag):
+     """Create a standalone toolchain."""
+     copy_directory_contents(gcc_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     copy_directory_contents(clang_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+     triple = get_triple(arch)
+     make_clang_scripts(
+         install_path, triple, api, host_tag.startswith('windows'))
+@@ -432,9 +434,11 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+     install_headers = os.path.join(install_sysroot, 'usr/include')
+     os.makedirs(os.path.dirname(install_headers))
+     shutil.copytree(headers, install_headers)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     arch_headers = os.path.join(sysroot, 'usr/include', triple)
+     copy_directory_contents(arch_headers, os.path.join(install_headers))
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     for lib_suffix in ('', '64'):
+         lib_path = os.path.join(platforms_path, 'usr/lib{}'.format(lib_suffix))
+@@ -442,20 +446,24 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             install_sysroot, 'usr/lib{}'.format(lib_suffix))
+         if os.path.exists(lib_path):
+             shutil.copytree(lib_path, lib_install)
++            os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     static_lib_path = os.path.join(sysroot, 'usr/lib', triple)
+     static_lib_install = os.path.join(install_sysroot, 'usr/lib')
+     if arch == 'x86_64':
+         static_lib_install += '64'
+     copy_directory_contents(static_lib_path, static_lib_install)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     prebuilt_path = os.path.join(NDK_DIR, 'prebuilt', host_tag)
+     copy_directory_contents(prebuilt_path, install_path)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     gdbserver_path = os.path.join(
+         NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver')
+     gdbserver_install = os.path.join(install_path, 'share', 'gdbserver')
+     shutil.copytree(gdbserver_path, gdbserver_install)
++    os.system('chmod -R +w "{}"'.format(install_path))
+ 
+     toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple)
+     dirs = os.listdir(toolchain_lib_dir)
+@@ -481,26 +489,33 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+         for abi in get_abis(arch):
+             copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver, triple,
+                                     abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             copy_gnustl_libs(gnustl_dir, install_path, triple, abi)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 copy_gnustl_abi_headers(gnustl_dir, install_path, gcc_ver,
+                                         triple, abi, thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+                 copy_gnustl_libs(gnustl_dir, install_path, triple, abi,
+                                  thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     elif stl == 'libc++':
+         libcxx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++')
+         libcxxabi_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/llvm-libc++abi')
+         copy_directory_contents(os.path.join(libcxx_dir, 'include'),
+                                 cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+         if api < 21:
+             support_dir = os.path.join(NDK_DIR, 'sources/android/support')
+             copy_directory_contents(os.path.join(support_dir, 'include'),
+                                     support_headers)
++            os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         # I have no idea why we need this, but the old one does it too.
+         copy_directory_contents(
+             os.path.join(libcxxabi_dir, 'include'),
+             os.path.join(install_path, 'include/llvm-libc++abi/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         headers = [
+             'cxxabi.h',
+@@ -515,21 +530,25 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             src_libdir = get_src_libdir(libcxx_dir, abi)
+             dest_libdir = get_dest_libdir(install_path, triple, abi)
+             copy_libcxx_libs(src_libdir, dest_libdir, abi, api)
++            os.system('chmod -R +w "{}"'.format(install_path))
+             if arch == 'arm':
+                 thumb_libdir = os.path.join(dest_libdir, 'thumb')
+                 copy_libcxx_libs(src_libdir, thumb_libdir, abi, api)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     elif stl == 'stlport':
+         stlport_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/stlport')
+         gabixx_dir = os.path.join(NDK_DIR, 'sources/cxx-stl/gabi++')
+ 
+         copy_directory_contents(
+             os.path.join(stlport_dir, 'stlport'), cxx_headers)
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         # Same as for libc++. Not sure why we have this extra directory, but
+         # keep the cruft for diff.
+         copy_directory_contents(
+             os.path.join(gabixx_dir, 'include'),
+             os.path.join(install_path, 'include/gabi++/include'))
++        os.system('chmod -R +w "{}"'.format(install_path))
+ 
+         headers = [
+             'cxxabi.h',
+@@ -548,6 +567,7 @@ def create_toolchain(install_path, arch, api, gcc_path, clang_path,
+             if arch == 'arm':
+                 copy_stlport_libs(stlport_dir, install_path, triple, abi,
+                                   thumb=True)
++                os.system('chmod -R +w "{}"'.format(install_path))
+     else:
+         raise ValueError(stl)
+ 

From ec9bb1bb34f1743c0c533b76cd24ec5f69a15907 Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Thu, 17 May 2018 13:18:07 +0200
Subject: [PATCH 1988/3370] grafana: 5.1.2 -> 5.1.3 (#40621)

---
 pkgs/servers/monitoring/grafana/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index f9fb4efa04be..646401ce02f9 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -1,7 +1,7 @@
 { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
 
 buildGoPackage rec {
-  version = "5.1.2";
+  version = "5.1.3";
   name = "grafana-${version}";
   goPackagePath = "github.com/grafana/grafana";
 
@@ -9,12 +9,12 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    sha256 = "0iw0mr6m99z6vy9mz9fdhmn4fxi359n3ns71bm5a71np8lf4qs36";
+    sha256 = "09q4xrh4j02b8nrkskndahs039rhmcs8hrcgvnnpg36qqyvs1x0g";
   };
 
   srcStatic = fetchurl {
     url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
-    sha256 = "18bqmvyfjkvkrdbxa989aa6c7ri3b4wdb7ai543hiaz00s9mnpzm";
+    sha256 = "131dxpjnzhsjh6c0fp48jhxf5piy6wh287pfm2s7pm4ywq9m0q46";
   };
 
   preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";

From 1d424ba1699a0b955a974ec316f770004eb0f004 Mon Sep 17 00:00:00 2001
From: Manuel Mendez <mmendez534@gmail.com>
Date: Thu, 17 May 2018 07:33:27 -0400
Subject: [PATCH 1989/3370] hack-font: 3.002 -> 3.003 (#40627)

---
 pkgs/data/fonts/hack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index eb7943265397..e77fcc3c3a3e 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "3.002";
+  version = "3.003";
 in fetchzip rec {
   name = "hack-font-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttf -d $out/share/fonts/hack
   '';
 
-  sha256 = "11f3hl4nvxq6pvsmwr1c1r5wrxhrp7ixr5bshrz2dmqn7l8bxa63";
+  sha256 = "1l6ih6v7dqali5c7zh6z2xnbf9h2wz0ag6fdgszmqd5lnhw39v6s";
 
   meta = with stdenv.lib; {
     description = "A typeface designed for source code";

From 596645d5d265e9a20a041714ee19585a81e1d9c8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 04:46:07 -0700
Subject: [PATCH 1990/3370] libu2f-host: 1.1.5 -> 1.1.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libu2f-host/versions.

These checks were done:

- built on NixOS
- /nix/store/8jbzdkhk2krc8yc37c9bcxsbmam5csaa-libu2f-host-1.1.6/bin/u2f-host passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.1.6 with grep in /nix/store/8jbzdkhk2krc8yc37c9bcxsbmam5csaa-libu2f-host-1.1.6
- directory tree listing: https://gist.github.com/bc0958f894bcdad9565006be8be45096
- du listing: https://gist.github.com/e9a255d64be0442f7d14fca45cbcb6f0
---
 pkgs/development/libraries/libu2f-host/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix
index 2def14b1c10e..675ca1cd220b 100644
--- a/pkgs/development/libraries/libu2f-host/default.nix
+++ b/pkgs/development/libraries/libu2f-host/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, json_c, hidapi }:
 
 stdenv.mkDerivation rec {
-  name = "libu2f-host-1.1.5";
+  name = "libu2f-host-1.1.6";
 
   src = fetchurl {
     url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz";
-    sha256 = "159slvjfq4bqslx5amjkk90xnkiv3x0yzvbi54pl2vnzbr1p2azk";
+    sha256 = "19xxwwqfzg3njfpxvhlyxd05wjwsdw3m4lpn7gk31cna6agbp82d";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ea7404dcd743c06e815263ccc64d3fa9904bfe4e Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Wed, 16 May 2018 22:32:31 +0200
Subject: [PATCH 1991/3370] ries: init at 2018-04-11

---
 .../science/math/ries/default.nix             | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/applications/science/math/ries/default.nix

diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix
new file mode 100644
index 000000000000..4b237a01a3e5
--- /dev/null
+++ b/pkgs/applications/science/math/ries/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchzip }:
+stdenv.mkDerivation {
+  name = "ries-2018-04-11";
+
+  # upstream does not provide a stable link
+  src = fetchzip {
+    url = "https://salsa.debian.org/debian/ries/-/archive/debian/2018.04.11-1/ries-debian-2018.04.11-1.zip";
+    sha256 = "1h2wvd4k7f0l0i1vm9niz453xdbcs3nxccmri50qyrzzzc1b0842";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    homepage = https://mrob.com/pub/ries/;
+    description = "Tool to produce a list of equations that approximately solve to a given number";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ symphorien ];
+    license = licenses.gpl3Plus;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d827d7e16d9..29d348511d1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17244,6 +17244,8 @@ with pkgs;
 
   ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { };
 
+  ries = callPackage ../applications/science/math/ries { };
+
   ripser = callPackage ../applications/science/math/ripser { };
 
   rkt = callPackage ../applications/virtualization/rkt { };

From 9668a66948cf16dde38629e0f48770058f791f0b Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz.otlinghaus@stuvus.uni-stuttgart.de>
Date: Fri, 27 Apr 2018 15:26:08 +0200
Subject: [PATCH 1992/3370] gams: init at 25.02

---
 maintainers/maintainer-list.nix  |  5 ++++
 pkgs/tools/misc/gams/default.nix | 50 ++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  5 ++++
 3 files changed, 60 insertions(+)
 create mode 100644 pkgs/tools/misc/gams/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 30597373fc52..789bd457bd36 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -135,6 +135,11 @@
     github = "roosemberth";
     name = "Roosembert (Roosemberth) Palacios";
   };
+  Scriptkiddi = {
+    email = "nixos@scriptkiddi.de";
+    github = "scriptkiddi";
+    name = "Fritz Otlinghaus";
+  };
   SShrike = {
     email = "severen@shrike.me";
     github = "severen";
diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix
new file mode 100644
index 000000000000..613fdc0f4555
--- /dev/null
+++ b/pkgs/tools/misc/gams/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchurl, unzip, lib, file, licenseFile, optgamsFile}:
+
+assert licenseFile != null;
+
+stdenv.mkDerivation rec {
+  version = "25.0.2";
+  name = "gams-${version}";
+  src = fetchurl {
+    url = "https://d37drm4t2jghv5.cloudfront.net/distributions/${version}/linux/linux_x64_64_sfx.exe";
+    sha256 = "4f95389579f33ff7c2586838a2c19021aa0746279555cbb51aa6e0efd09bd297";
+  };
+  unpackCmd = "unzip $src";
+  buildInputs = [ unzip file ];
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p "$out/bin" "$out/share/gams"
+    cp -a * "$out/share/gams"
+
+    cp ${licenseFile} $out/share/gamslice.txt
+  '' + stdenv.lib.optionalString (optgamsFile != null) ''
+    cp ${optgamsFile} $out/share/optgams.def
+    ln -s $out/share/gams/optgams.def $out/bin/optgams.def
+  '';
+
+  postFixup = ''
+    for f in $out/share/gams/*; do
+      if [[ -x $f ]] && [[ -f $f ]] && [[ ! $f =~ .*\.so$ ]]; then
+        if patchelf \
+          --set-rpath "$out/share/gams" \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $f; then
+          ln -s $f $out/bin/$(basename $f)
+        fi
+      fi
+    done
+  '';
+
+  meta = with stdenv.lib;{
+    description = "General Algebraic Modeling System";
+    longDescription = ''
+      The General Algebraic Modeling System is a high-level modeling system for mathematical optimization.
+      GAMS is designed for modeling and solving linear, nonlinear, and mixed-integer optimization problems.
+    '';
+    homepage = https://www.gams.com/;
+    license = licenses.unfree;
+    maintainers = [ maintainers.Scriptkiddi ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4a88cbe5b2b..2a9835211c80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -637,6 +637,11 @@ with pkgs;
 
   genymotion = callPackage ../development/mobile/genymotion { };
 
+  gams = callPackage ../tools/misc/gams {
+    licenseFile = config.gams.licenseFile or null;
+    optgamsFile = config.gams.optgamsFile or null;
+  };
+
   git-fire = callPackage ../tools/misc/git-fire { };
 
   gitless = callPackage ../applications/version-management/gitless/default.nix { };

From dd2b5b9400f7181c4babc4e7366eee846b2f74ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 15:21:14 +0200
Subject: [PATCH 1993/3370] multi-ghc-travis: update to latest git version from
 May 16th

---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 454bb5d58817..2ba1d64675a6 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -8,8 +8,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "105005cde6bde903e477e5b9724d02bdea06bae4";
-    sha256 = "1l76782aa29mi88a2brvkyi6k0v33rpihxlskx99mak06bjrmnhh";
+    rev = "b65ea5b35c59d1e7d0f89ff4e21840dc0e2ec3a0";
+    sha256 = "0qgsll772x24nnkarj30mplmvvwzz5vn5aadn5xzkcn77g5jiqmg";
   };
   isLibrary = true;
   isExecutable = true;

From b1890946af8a2dbf1eb1f5f65fefb2b30c5d71bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 07:32:04 -0700
Subject: [PATCH 1994/3370] firejail: 0.9.52 -> 0.9.54

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/firejail/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/5zjr9idl48c08apan8gh45wh971i49i9-firejail-0.9.54/bin/firejail had a zero exit code or showed the expected version
- /nix/store/5zjr9idl48c08apan8gh45wh971i49i9-firejail-0.9.54/bin/firemon passed the binary check.
- /nix/store/5zjr9idl48c08apan8gh45wh971i49i9-firejail-0.9.54/bin/firecfg passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 2 of 3 passed binary check by having the new version present in output.
- found 0.9.54 with grep in /nix/store/5zjr9idl48c08apan8gh45wh971i49i9-firejail-0.9.54
- directory tree listing: https://gist.github.com/3fb76054296d9e45fea3c47ae6a9f03f
- du listing: https://gist.github.com/a732bad0be0159f527ca4e8c532400ed
---
 pkgs/os-specific/linux/firejail/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 1c7ebce9f877..9f2374e75a88 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.52";
+    version="0.9.54";
     name="${baseName}-${version}";
-    hash="0w8l8z4j7iph8fp7rchhnfsrik3f00f9v5xr191fp38fphzcj56s";
-    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.52.tar.xz";
-    sha256="0w8l8z4j7iph8fp7rchhnfsrik3f00f9v5xr191fp38fphzcj56s";
+    hash="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff";
+    url="https://vorboss.dl.sourceforge.net/project/firejail/firejail/firejail-0.9.54.tar.xz";
+    sha256="0mkpqlhi1vxiwd1pmlsk02vpydy1gj61k1gi3zlz6qw84xa6i6ff";
   };
   buildInputs = [
     which

From 24f61ca48e02620a6590d66e74ee07cf5cc0e9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 17 May 2018 17:06:33 +0200
Subject: [PATCH 1995/3370] knot-dns: 2.6.6 -> 2.6.7

https://lists.nic.cz/pipermail/knot-dns-users/2018-May/001356.html
Some of the fixed bugs could be exploited to crash knot-resolver
if running in --verbose mode.
---
 pkgs/servers/dns/knot-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 88fa07009f83..5fe7a8608c59 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in
 # Note: ATM only the libraries have been tested in nixpkgs.
 stdenv.mkDerivation rec {
   name = "knot-dns-${version}";
-  version = "2.6.6";
+  version = "2.6.7";
 
   src = fetchurl {
     url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci";
+    sha256 = "1c2a004b05c161f7b36d5eeccebd9d4cdf60aa09930a7cc766514e468ca92243";
   };
 
   outputs = [ "bin" "out" "dev" ];

From 0b4b3e648c263084bfa58cc144d1fca630bf067c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 17 May 2018 10:06:56 -0500
Subject: [PATCH 1996/3370] perlPackages.AppSt: 1.1.2 -> 1.1.4

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 9a23eff2e7ff..4d06204ad394 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -365,10 +365,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   AppSt = buildPerlPackage rec {
-    name = "App-St-1.1.2";
+    name = "App-St-1.1.4";
     src = fetchurl {
-      url = https://github.com/nferraz/st/archive/v1.1.2.tar.gz;
-      sha256 = "1j1iwcxl16m4x5kl1vcv0linb93r55ndh3jm0w6qf459jl4x38s6";
+      url = https://github.com/nferraz/st/archive/v1.1.4.tar.gz;
+      sha256 = "1f4bqm4jiazcxgzzja1i48671za96621k0s3ln87cdacgvv1can0";
     };
     postInstall =
       ''

From a5c9b87d78cc08354e5a3375a8acc4154d75f6b1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 17 May 2018 10:10:58 -0500
Subject: [PATCH 1997/3370] App::St: no need for fixup anymore

FWIW the fixup is the update 1.1.2 -> 1.1.4 is reverted.
---
 pkgs/top-level/perl-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4d06204ad394..8956f9806684 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -372,7 +372,6 @@ let self = _self // overrides; _self = with self; {
     };
     postInstall =
       ''
-        sed -e "1 s|\(.*\)|\1 -I $out/lib/perl5/site_perl|" -i $out/bin/st
         ($out/bin/st --help || true) | grep Usage
       '';
     meta = {

From 832a8ca087b748db7be7969581e0e10ae1eb486c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 17 May 2018 17:22:27 +0200
Subject: [PATCH 1998/3370] androidndk: Fix usage as crossSystem

---
 lib/systems/examples.nix                      |  2 +-
 .../mobile/androidenv/androidndk-pkgs.nix     | 21 +++++++++++++------
 .../mobile/androidenv/androidndk.nix          |  1 +
 .../development/mobile/androidenv/default.nix | 15 +++++++++++++
 pkgs/stdenv/cross/default.nix                 |  4 +++-
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 9c43d9b1bbc7..4c7dd9917919 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -45,7 +45,7 @@ rec {
 
   aarch64-android-prebuilt = rec {
     config = "aarch64-unknown-linux-android";
-    sdkVer = "21";
+    sdkVer = "24";
     platform = platforms.aarch64-multiplatform;
     useAndroidPrebuilt = true;
   };
diff --git a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
index 663a1f1ee8f4..1323466ea865 100644
--- a/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
+++ b/pkgs/development/mobile/androidenv/androidndk-pkgs.nix
@@ -98,10 +98,19 @@ rec {
   # We use androidndk from the previous stage, else we waste time or get cycles
   # cross-compiling packages to wrap incorrectly wrap binaries we don't include
   # anyways.
-  libraries = {
-    name = "bionic-prebuilt";
-    type = "derivation";
-    outPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/";
-    drvPath = throw "fake derivation, build ${buildAndroidndk} to use";
-  };
+  libraries =
+    let
+      includePath = if buildAndroidndk.version == "10e" then
+          "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/include/"
+        else
+          "${buildAndroidndk}/libexec/${buildAndroidndk.name}/sysroot/usr/include";
+      libPath = "${buildAndroidndk}/libexec/${buildAndroidndk.name}/platforms/android-${hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/lib/";
+    in
+    runCommand "bionic-prebuilt" {} ''
+      mkdir -p $out
+      cp -r ${includePath} $out/include
+      chmod +w $out/include
+      ${lib.optionalString (lib.versionOlder buildAndroidndk.version "10e") "ln -s $out/include/${targetInfo.triple}/asm $out/include/asm"}
+      ln -s ${libPath} $out/lib
+    '';
 }
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index d0bfe6c8100c..78e278be2376 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -5,6 +5,7 @@
 
 stdenv.mkDerivation rec {
   name = "android-ndk-r${version}";
+  inherit version;
 
   src = if stdenv.system == "x86_64-linux" then fetchurl {
       url = "https://dl.google.com/android/repository/${name}-linux-x86_64.zip";
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index d122ffe241ea..3978ae1aeb7b 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -281,4 +281,19 @@ rec {
     inherit androidndk;
     targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs;
   };
+
+  androidndkPkgs_10e = import ./androidndk-pkgs.nix {
+    inherit (buildPackages)
+      makeWrapper;
+    inherit (pkgs)
+      lib hostPlatform targetPlatform
+      runCommand wrapBintoolsWith wrapCCWith;
+    # buildPackages.foo rather than buildPackages.buildPackages.foo would work,
+    # but for splicing messing up on infinite recursion for the variants we
+    # *dont't* use. Using this workaround, but also making a test to ensure
+    # these two really are the same.
+    buildAndroidndk = buildPackages.buildPackages.androidenv.androidndk_10e;
+    androidndk = androidndk_10e;
+    targetAndroidndkPkgs = targetPackages.androidenv.androidndkPkgs_10e;
+  };
 }
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 973be9831861..41b5fd99504d 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -41,7 +41,9 @@ in lib.init bootStages ++ [
       targetPlatform = crossSystem;
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang
-           else if crossSystem.useAndroidPrebuilt
+           else if (crossSystem.useAndroidPrebuilt && crossSystem.is32bit)
+             then buildPackages.androidenv.androidndkPkgs_10e.gcc
+           else if (crossSystem.useAndroidPrebuilt && crossSystem.is64bit)
              then buildPackages.androidenv.androidndkPkgs.gcc
            else buildPackages.gcc;
     };

From e5861b8e0da8b13fceab9e841359f51da66664c2 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 17 May 2018 10:27:08 -0500
Subject: [PATCH 1999/3370] tigervnc: add makeWrapper to nativeBuildInputs

Fixes #40654
---
 pkgs/tools/admin/tigervnc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 3818f361cb53..69f6e056b734 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -5,7 +5,8 @@
 , cmake, gettext, libtool
 , glproto, libGLU
 , gnutls, pam, nettle
-, xterm, openssh }:
+, xterm, openssh
+, makeWrapper}:
 
 with stdenv.lib;
 
@@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
     glproto libGLU
   ] ++ xorgserver.buildInputs;
 
-  nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ]
+  nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil makeWrapper ]
     ++ xorg.xorgserver.nativeBuildInputs;
 
   propagatedBuildInputs = xorg.xorgserver.propagatedBuildInputs;

From 276f2897cb567593ae7f071d13bdeec5fad61240 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 17:35:01 +0200
Subject: [PATCH 2000/3370] oracle-instantclient: move rpmextract and patchelf
 to nativeBuildInputs

---
 pkgs/development/libraries/oracle-instantclient/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 1c629c137796..5affd14708b9 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -34,9 +34,11 @@ in stdenv.mkDerivation rec {
   srcSqlplus = (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552");
   srcOdbc = optionalString odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1");
 
-  buildInputs = [ glibc patchelf rpmextract ] ++
+  buildInputs = [ glibc ] ++
     optional odbcSupport unixODBC;
 
+  nativeBuildInputs = [ rpmextract patchelf ];
+
   buildCommand = ''
     mkdir -p "${name}"
     cd "${name}"

From 0f4269bf48458bcc9ec089364e9dd234585f7667 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 17:37:08 +0200
Subject: [PATCH 2001/3370] oracle-instantclient: remove unused arguments

---
 pkgs/development/libraries/oracle-instantclient/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 5affd14708b9..9abb3e5f9e05 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, requireFile, libelf, gcc, glibc, patchelf, unzip, rpmextract, libaio
-, odbcSupport ? false, unixODBC
-}:
+{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, odbcSupport ? false, unixODBC }:
 
 assert odbcSupport -> unixODBC != null;
 

From ccb4558a91f6466eb2aee4caeb8cb6dd42b8a082 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 17:38:06 +0200
Subject: [PATCH 2002/3370] oracle-instantclient: prefix LD_LIBRARY_PATH

---
 pkgs/development/libraries/oracle-instantclient/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 9abb3e5f9e05..edb07800d98b 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, odbcSupport ? false, unixODBC }:
+{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
 
 assert odbcSupport -> unixODBC != null;
 
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [ glibc ] ++
     optional odbcSupport unixODBC;
 
-  nativeBuildInputs = [ rpmextract patchelf ];
+  nativeBuildInputs = [ rpmextract patchelf makeWrapper ];
 
   buildCommand = ''
     mkdir -p "${name}"
@@ -70,6 +70,7 @@ in stdenv.mkDerivation rec {
       patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
                --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
                $exe
+      wrapProgram $exe --prefix LD_LIBRARY_PATH ":" $out/lib
     done
   '';
 

From 7824c60a439810bc068db5d67756161ac62527fa Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 17:38:32 +0200
Subject: [PATCH 2003/3370] oracle-instantclient: patchelf and wrap adrci and
 genezi, too

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

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index edb07800d98b..6ed3e584fa34 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -66,7 +66,7 @@ in stdenv.mkDerivation rec {
                $lib
     done
 
-    for exe in $out/bin/sqlplus; do
+    for exe in $out/bin/{adrci,genezi,sqlplus}; do
       patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
                --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
                $exe

From a88354d99f8298a45a2e5e3632fb793a83f2b940 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 18:40:48 +0200
Subject: [PATCH 2004/3370] pythonPackages.cx_oracle: 6.2.1 -> 6.3.1

---
 pkgs/development/python-modules/cx_oracle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index f2e10caad726..637518b1969b 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "cx_Oracle";
-  version = "6.2.1";
+  version = "6.3.1";
 
   buildInputs = [
     oracle-instantclient
@@ -10,10 +10,10 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01970bc843b3c699a7fd98af19e0401fe69abfbd2acdf464e0bf2ae06ea372b9";
+    sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
   };
 
-  # Check need an Oracle database to run  
+  # Check need an Oracle database to run
   doCheck = false;
 
   meta = with stdenv.lib; {

From d7ac3818d3addea49eceebe175222b8357e32138 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 06:22:02 -0700
Subject: [PATCH 2005/3370] gpsprune: 18.6 -> 19

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gpsprune/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/akzrr13fzbw4ympkxcjp4v434hbfw6nb-gpsprune-19/bin/gpsprune had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 19 with grep in /nix/store/akzrr13fzbw4ympkxcjp4v434hbfw6nb-gpsprune-19
- directory tree listing: https://gist.github.com/093deda67a3697cfb7ceb5e487494b74
- du listing: https://gist.github.com/c4d02de001bcd6a66916da90695ae515
---
 pkgs/applications/misc/gpsprune/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index a51ec8c1b044..3c40457062bf 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
-  version = "18.6";
+  version = "19";
 
   src = fetchurl {
     url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar";
-    sha256 = "1ii9pkj24jcwzs225nyi17ks07dfc5x3940hpqrsb5xzxy2vkw7q";
+    sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5";
   };
 
   phases = [ "installPhase" ];

From 838bfaa8edf2c1224715eda00f143a5dc363e65a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 17 May 2018 19:12:17 +0200
Subject: [PATCH 2006/3370] gpsbabel: remove use of phases

Also make use of `makeWrapper`.
---
 pkgs/applications/misc/gpsprune/default.nix | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index 3c40457062bf..b6391d06eb92 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0n08fg55zgpfg1f6lq0n3ngi0n8af1r0rhmbnpik5mjng4m9g3x5";
   };
 
-  phases = [ "installPhase" ];
-
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre8 ];
 
   desktopItem = makeDesktopItem {
@@ -23,15 +22,11 @@ stdenv.mkDerivation rec {
     categories = "Education;Geoscience;";
   };
 
-  installPhase = ''
+  buildCommand = ''
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/gpsprune.jar
-    cat > $out/bin/gpsprune <<EOF
-    #!${bash}/bin/bash
-    exec ${jre8}/bin/java -jar $out/share/java/gpsprune.jar "\$@"
-    EOF
-    chmod 755 $out/bin/gpsprune
-
+    makeWrapper ${jre8}/bin/java $out/bin/gpsprune \
+      --add-flags "-jar $out/share/java/gpsprune.jar"
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications"/"* $out/share/applications
     mkdir -p $out/share/pixmaps

From 639f7952be31f89d22512bf661d03a4fe2b075a2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 17 May 2018 18:43:25 +0200
Subject: [PATCH 2007/3370] pythonPackages.cx_oracle: fix dlopen

previously, $ORACLE_HOME had to be set for each python script using this
library.

We now patch odpi to load libclntsh.so from oracle-instantclient if
$ORACLE_HOME was not provided.
---
 ...-dpiOci.c-nixify-libclntsh.so-dlopen.patch | 27 +++++++++++++++++++
 .../python-modules/cx_oracle/default.nix      |  6 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch

diff --git a/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch
new file mode 100644
index 000000000000..a2de7b248531
--- /dev/null
+++ b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch
@@ -0,0 +1,27 @@
+From 355b9d812efdfbd041e14b365258b69c81689981 Mon Sep 17 00:00:00 2001
+From: Florian Klink <flokli@flokli.de>
+Date: Thu, 17 May 2018 18:37:40 +0200
+Subject: [PATCH] odpi/src/dpiOci.c: nixify libclntsh.so dlopen
+
+---
+ odpi/src/dpiOci.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/odpi/src/dpiOci.c b/odpi/src/dpiOci.c
+index 76b9867..22c2987 100644
+--- a/odpi/src/dpiOci.c
++++ b/odpi/src/dpiOci.c
+@@ -1575,6 +1575,10 @@ static int dpiOci__loadLib(dpiError *error)
+             }
+         }
+     }
++    if(!dpiOciLibHandle) {
++        dpiOciLibHandle = dlopen("@libclntsh@", RTLD_LAZY);
++    }
++
+ #endif
+ 
+     if (!dpiOciLibHandle) {
+-- 
+2.16.3
+
diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index 637518b1969b..c9925fad88d4 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -13,6 +13,12 @@ buildPythonPackage rec {
     sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
   };
 
+  patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ];
+
+  postPatch = ''
+    substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ ${oracle-instantclient}/lib/libclntsh.so";
+  '';
+
   # Check need an Oracle database to run
   doCheck = false;
 

From 8c755ad7b361952e4c7f2992eacae82959aa4fd5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 17 May 2018 13:03:12 -0500
Subject: [PATCH 2008/3370] sqlite3_analyzer: 3.22.0 -> 3.23.1 (to match
 sqlite3)

---
 pkgs/development/libraries/sqlite/sqlite3_analyzer.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
index 1feedb94c158..2c9e69ac741c 100644
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
@@ -1,11 +1,11 @@
 { lib, stdenv, fetchurl, unzip, tcl }:
 
 stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.22.0";
+  name = "sqlite3_analyzer-3.23.1";
 
   src = fetchurl {
-    url = "https://www.sqlite.org/2018/sqlite-src-3220000.zip";
-    sha256 = "04w97jj1659vl84rr73wg1mhj6by8r5075rzpn2xp42n537a7ibv";
+    url = https://sqlite.org/2018/sqlite-src-3230100.zip;
+    sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
   };
 
   nativeBuildInputs = [ unzip ];

From bd648f321c2c1e52a4b8d2a7d7183ba076937ac4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 17 May 2018 20:28:12 +0200
Subject: [PATCH 2009/3370] nixos/nginx: emphasize that useACMEHost does not
 create certs

It was not entirely clean that `services.nginx.virtualHosts.<name>.useACMEHost` does not create certificates, see https://github.com/NixOS/nixpkgs/issues/40593
---
 nixos/modules/services/web-servers/nginx/vhost-options.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index f014d817e80e..e4494dff37da 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -62,6 +62,7 @@ with lib;
         This is useful if you have many subdomains and want to avoid hitting the
         <link xlink:href="https://letsencrypt.org/docs/rate-limits/">rate limit</link>.
         Alternately, you can generate a certificate through <option>enableACME</option>.
+        <emphasis>Note that this option does not create any certificates, nor it does add subdomains to existing ones – you will need to create them manually using  <xref linkend="opt-security.acme.certs"/>.</emphasis>
       '';
     };
 

From d9266340e187b0d29f3ea898a9983cb0727a9b1a Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Mon, 23 Apr 2018 00:52:01 +0200
Subject: [PATCH 2010/3370] Adds gerschtli to maintainer-list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2add8fa2c4ff..790b72c039e3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1483,6 +1483,11 @@
     github = "georgewhewell";
     name = "George Whewell";
   };
+  gerschtli = {
+    email = "tobias.happ@gmx.de";
+    github = "Gerschtli";
+    name = "Tobias Happ";
+  };
   gilligan = {
     email = "tobias.pflug@gmail.com";
     github = "gilligan";

From 93fedb03fe4618c8a5bc51c2d7bf3502e0d80939 Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Mon, 23 Apr 2018 01:13:19 +0200
Subject: [PATCH 2011/3370] cargo-release: Init at 0.10.0

---
 .../cargo-release/default.nix                 | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/package-management/cargo-release/default.nix

diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix
new file mode 100644
index 000000000000..562f92121d66
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-release/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, rustPlatform, fetchFromGitHub }:
+
+rustPlatform.buildRustPackage rec {
+  name = "cargo-release-${version}";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "sunng87";
+    repo = "cargo-release";
+    rev = "${version}";
+    sha256 = "1wp7x6nmmhi019iyvyva26k14f4fsxrh424s2pgrr09nqlrfjbz0";
+  };
+
+  cargoSha256 = "0qxwkp6w7ir3hs0r587k3jmh69afc7j411bsy6k8hlm8g9clgby5";
+
+  meta = with stdenv.lib; {
+    description = ''Cargo subcommand "release": everything about releasing a rust crate'';
+    homepage = https://github.com/sunng87/cargo-release;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ gerschtli ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47719d7ab567..424c15ac7159 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6894,6 +6894,7 @@ with pkgs;
     });
 
   cargo-edit = callPackage ../tools/package-management/cargo-edit { };
+  cargo-release = callPackage ../tools/package-management/cargo-release { };
 
   cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
 

From e0fccdcc8d03da8ec306db3ac9710fbe5e135293 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 May 2018 11:09:33 -0500
Subject: [PATCH 2012/3370] rust: add more sys overrides

---
 pkgs/build-support/rust/default-crate-overrides.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 488fcb943721..c9d2913c4fd4 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -3,7 +3,7 @@
   libsodium, postgresql, ... }:
 
 let
-  inherit (darwin.apple_sdk.frameworks) CoreFoundation;
+  inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
 in
 {
   cargo = attrs: {
@@ -19,7 +19,8 @@ in
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
   curl-sys = attrs: {
-    buildInputs = [ pkgconfig curl ];
+    buildInputs = [ pkgconfig ];
+    propagatedBuiltInputs = [ curl ];
   };
   libgit2-sys = attrs: {
     LIBGIT2_SYS_USE_PKG_CONFIG = true;
@@ -69,4 +70,7 @@ in
   pq-sys = attr: {
     buildInputs = [ pkgconfig postgresql ];
   };
+  security-framework-sys = attr: {
+    propagatedBuildInputs = [ Security ];
+  };
 }

From 768bd58a4890f00a42d3e5578f37534350fba7a2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 17 May 2018 14:19:36 -0500
Subject: [PATCH 2013/3370] crate-overrides: curl-sys needs zlib

---
 pkgs/build-support/rust/default-crate-overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index c9d2913c4fd4..971c4d0f5e22 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -19,7 +19,7 @@ in
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
   curl-sys = attrs: {
-    buildInputs = [ pkgconfig ];
+    buildInputs = [ pkgconfig zlib ];
     propagatedBuiltInputs = [ curl ];
   };
   libgit2-sys = attrs: {

From 9bca8edce0bb70111d8971d558e745068c3f6041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 17 May 2018 20:21:11 +0100
Subject: [PATCH 2014/3370] python.pkgs.cx_oracle: add missing quote

---
 pkgs/development/python-modules/cx_oracle/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index c9925fad88d4..717faf1128f0 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ];
 
   postPatch = ''
-    substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ ${oracle-instantclient}/lib/libclntsh.so";
+    substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ "${oracle-instantclient}/lib/libclntsh.so";
   '';
 
   # Check need an Oracle database to run

From 99b4eb99872c46fd10aacdab4162be0f09f817f0 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 17 May 2018 21:38:00 +0200
Subject: [PATCH 2015/3370] disorderfs: 0.5.2 -> 0.5.3

---
 pkgs/tools/filesystems/disorderfs/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/disorderfs/default.nix b/pkgs/tools/filesystems/disorderfs/default.nix
index 0551198cded3..0bde9b0b26e1 100644
--- a/pkgs/tools/filesystems/disorderfs/default.nix
+++ b/pkgs/tools/filesystems/disorderfs/default.nix
@@ -2,17 +2,19 @@
 
 stdenv.mkDerivation rec {
   name = "disorderfs-${version}";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchurl {
-    url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.bz2";
-    sha256 = "0jdadb1ppd5qrnngpjv14az32gwslag2wwv1k8rs29iqlfy38cjf";
+    url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
+    sha256 = "1zx6248cwfcci5555sk9iwl9lz6x8kzc9qgiq4jv04zjiapivdnq";
   };
 
   nativeBuildInputs = [ pkgconfig asciidoc ];
 
   buildInputs = [ fuse attr ];
 
+  sourceRoot = ".";
+
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {

From 85cc1364adfed5c439c6dea6f1563af2220c276a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 12:40:38 -0700
Subject: [PATCH 2016/3370] babl: 0.1.46 -> 0.1.48

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/babl/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.1.48 with grep in /nix/store/1pffxdly3bs42aqxf9zzmh3kcn304r8i-babl-0.1.48
- directory tree listing: https://gist.github.com/42f46e6f60e3db18a7a54f4ec1c31b80
- du listing: https://gist.github.com/3382dcb9c594fd5e06a9432be1c8d80b
---
 pkgs/development/libraries/babl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 285f4dea802a..ac9056d1e033 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.46";
+  name = "babl-0.1.48";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "0nwyhvfca6m35wjcccvwca7fcihzgdfyc012qi703y5d3cxl1hmv";
+    sha256 = "0596flzqzdlq4y6lsg34szh1ffgyccghp8y1k9h4d3jwymfd16xy";
   };
 
   doCheck = true;

From 33a94b0448351215a8d0f5d259327625c53989b7 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 17 May 2018 22:43:51 +0300
Subject: [PATCH 2017/3370] franz: switch to autoPatchelfHook

---
 .../instant-messengers/franz/default.nix      | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 95e01e586ec2..75df17bd5b01 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
 , xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
@@ -8,17 +8,6 @@ let
 
   version = "4.0.4";
 
-  runtimeDeps = [
-    udev libnotify
-  ];
-  deps = (with xorg; [
-    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
-    libXrender libX11 libXtst libXScrnSaver
-  ]) ++ [
-    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
-    gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
-  ] ++ runtimeDeps;
-
   desktopItem = makeDesktopItem rec {
     name = "Franz";
     exec = name;
@@ -39,16 +28,21 @@ in stdenv.mkDerivation rec {
   # don't remove runtime deps
   dontPatchELF = true;
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
+  buildInputs = (with xorg; [
+    libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
+    libXrender libX11 libXtst libXScrnSaver
+  ]) ++ [
+    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
+  ];
+  runtimeDependencies = [ udev.lib libnotify ];
 
   unpackPhase = ''
     tar xzf $src
   '';
 
   installPhase = ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz
-    patchelf --set-rpath "$out/opt/franz:${stdenv.lib.makeLibraryPath deps}" Franz
-
     mkdir -p $out/bin $out/opt/franz
     cp -r * $out/opt/franz
     ln -s $out/opt/franz/Franz $out/bin

From 7e29dcf3ccc91a2bb0209dd76d02911a5284f240 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 12:49:56 -0700
Subject: [PATCH 2018/3370] babeld: 1.8.1 -> 1.8.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/babeld/versions.

These checks were done:

- built on NixOS
- /nix/store/7vd417z6awqq3wyqjg3wzyq3868qfh5f-babeld-1.8.2/bin/babeld passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.8.2 with grep in /nix/store/7vd417z6awqq3wyqjg3wzyq3868qfh5f-babeld-1.8.2
- directory tree listing: https://gist.github.com/560ddce597cdbadf44146673690eeba5
- du listing: https://gist.github.com/b9dcee589270b1bf6e38fcdac5771b9c
---
 pkgs/tools/networking/babeld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 801863fb95a1..9c8f8d31c0cc 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.8.1";
+  name = "babeld-1.8.2";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "1gq6q1zly40ngs9wl3qa3yjvyb6zbqck82fp3n6w2bi9ymrrq94w";
+    sha256 = "1p751zb7h75f8w7jz37432dj610f432jnj37lxhmav9q6aqyrv87";
   };
 
   preBuild = ''

From 636fce50fef349302e1e237c7cbb45231c635bd3 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Thu, 17 May 2018 22:54:57 +0300
Subject: [PATCH 2019/3370] maxx: switch to autoPatchelfHook

---
 pkgs/desktops/maxx/default.nix | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 69d16c9b20a1..10fa745d9787 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg
+{ stdenv, fetchurl, makeWrapper, autoPatchelfHook
+, libredirect, gcc-unwrapped, bash, gtk-engine-murrine, gtk_engines, librsvg
 
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
 , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2
@@ -9,11 +10,6 @@
 let
   version = "Indy-1.1.0";
 
-  deps = [
-    stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
-    libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
-    gdk_pixbuf libGL ncurses
-  ];
   runtime_deps = [
     xclock xsettingsd
   ];
@@ -31,7 +27,12 @@ in stdenv.mkDerivation {
     })
   ];
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper autoPatchelfHook ];
+  buildInputs = [
+    stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
+    libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
+    gdk_pixbuf libGL ncurses
+  ];
 
   buildPhase = ''
     while IFS= read -r -d ''$'\0' i; do
@@ -58,15 +59,11 @@ in stdenv.mkDerivation {
       --prefix PATH : ${stdenv.lib.makeBinPath runtime_deps}
 
     while IFS= read -r -d ''$'\0' i; do
-      if isELF "$i"; then
-        bin=`patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i"; echo $?`
-        patchelf --set-rpath "$maxx/lib64:$maxx/OpenMotif-2.1.32/lib64:$maxx/OpenMotif-2.3.1/lib64:${stdenv.lib.makeLibraryPath deps}" "$i"
-        if [ "$bin" -eq 0 ]; then
-          wrapProgram "$i" \
-            --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-            --set NIX_REDIRECTS /opt/MaXX=$maxx \
-            --prefix PATH : $maxx/sbin
-        fi
+      if isExecutable "$i"; then
+        wrapProgram "$i" \
+          --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+          --set NIX_REDIRECTS /opt/MaXX=$maxx \
+          --prefix PATH : $maxx/sbin
       fi
     done < <(find "$maxx" -type f -print0)
 

From 0f7eaddc5032b5b2276239dd1150f6a507626c98 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 16 May 2018 21:42:14 -0500
Subject: [PATCH 2020/3370] sqlar: init at 2018-01-07

---
 pkgs/development/libraries/sqlite/sqlar.nix | 26 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/sqlite/sqlar.nix

diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix
new file mode 100644
index 000000000000..734d68ca3d49
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/sqlar.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, fuse, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "sqlar-${version}";
+  version = "2018-01-07";
+
+  src = fetchurl {
+    url = "https://www.sqlite.org/sqlar/tarball/4824e73896/sqlar-src-4824e73896.tar.gz";
+    sha256 = "09pikkbp93gqypn3da9zi0dzc47jyypkwc9vnmfzhmw7kpyv8nm9";
+  };
+
+  buildInputs = [ fuse zlib ];
+
+  buildFlags = [ "sqlar" "sqlarfs" ];
+
+  installPhase = ''
+    install -D -t $out/bin sqlar sqlarfs
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://sqlite.org/sqlar;
+    description = "SQLite Archive utilities";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47719d7ab567..88a9ad7e14d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11650,6 +11650,8 @@ with pkgs;
 
   sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { });
 
+  sqlar = callPackage ../development/libraries/sqlite/sqlar.nix { };
+
   sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin;
 
   sqlite-jdbc = callPackage ../servers/sql/sqlite/jdbc { };

From f2849abd7e3ea9ed7d8baf0899331a876261cbfe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 13:08:26 -0700
Subject: [PATCH 2021/3370] openresty: 1.13.6.1 -> 1.13.6.2 (#40648)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/openresty/versions.

These checks were done:

- built on NixOS
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/opm passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/md2pod.pl passed the binary check.
- Warning: no invocation of /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/nginx-xml2pod had a zero exit code or showed the expected version
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/resty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/restydoc passed the binary check.
- Warning: no invocation of /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/restydoc-index had a zero exit code or showed the expected version
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/openresty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/luajit-openresty passed the binary check.
- /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2/bin/nginx passed the binary check.
- 7 of 9 passed binary check by having a zero exit code.
- 2 of 9 passed binary check by having the new version present in output.
- found 1.13.6.2 with grep in /nix/store/4z5yyi1f3mfn24g601mvk8d9z9wfxxyp-openresty-1.13.6.2
- directory tree listing: https://gist.github.com/3d4adc0eb55d63d7e2b269541039384b
- du listing: https://gist.github.com/f8dd4bb690e9b8615ede14c9f250f9f7
---
 pkgs/servers/http/openresty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 093f5f0e5027..252e1a97dfdb 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openresty-${version}";
-  version = "1.13.6.1";
+  version = "1.13.6.2";
 
   src = fetchurl {
     url = "http://openresty.org/download/openresty-${version}.tar.gz";
-    sha256 = "0sv93nw1j597mdpnibmgaa3nnghdk0z6k27vavm8w2c1z9n6w96i";
+    sha256 = "0hi9zw4344a4i636g3nbnnlm8qbnq37f50irhd1xncih4xc1jvll";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ];

From c521ad3528c00eefc004ab531fbb6fa2c5234a9d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 13:14:13 -0700
Subject: [PATCH 2022/3370] soapyhackrf: 0.3.2 -> 0.3.3 (#40643)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/soapyhackrf/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/2cb235b01daec8f6f3de0f0217e17bda
- du listing: https://gist.github.com/4ad265d40e6ea8558f6cccfbfb8d9d35
---
 pkgs/applications/misc/soapyhackrf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/soapyhackrf/default.nix b/pkgs/applications/misc/soapyhackrf/default.nix
index f5543af9c60b..2c5dd058ced3 100644
--- a/pkgs/applications/misc/soapyhackrf/default.nix
+++ b/pkgs/applications/misc/soapyhackrf/default.nix
@@ -3,7 +3,7 @@
 } :
 
 let
-  version = "0.3.2";
+  version = "0.3.3";
 
 in stdenv.mkDerivation {
   name = "soapyhackrf-${version}";
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     owner = "pothosware";
     repo = "SoapyHackRF";
     rev = "soapy-hackrf-${version}";
-    sha256 = "1sgx2nk8yrzfwisjfs9mw0xwc47bckzi17p42s2pbv7zcxzpb66p";
+    sha256 = "1awn89z462500gb3fjb7x61b1znkjri9n1d39bqfip1qk4s11pxc";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 43a28c2083dac448056567f908382f70394d2f6a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 13:26:35 -0700
Subject: [PATCH 2023/3370] prosody: 0.10.0 -> 0.10.1 (#40645)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/prosody/versions.

These checks were done:

- built on NixOS
- /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/prosody passed the binary check.
- Warning: no invocation of /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/prosodyctl had a zero exit code or showed the expected version
- /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/.prosody-wrapped passed the binary check.
- Warning: no invocation of /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1/bin/.prosodyctl-wrapped had a zero exit code or showed the expected version
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 0.10.1 with grep in /nix/store/9vcfnh0ghw9qmljbmpb52l5xwq8b8k4i-prosody-0.10.1
- directory tree listing: https://gist.github.com/e1e8caae1a498d8e07f1c35d990846d3
- du listing: https://gist.github.com/9b3a9c7a8711da781e548e894e848cdc
---
 pkgs/servers/xmpp/prosody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 2d0e1a529dac..6f092dd80cde 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -25,12 +25,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.10.0";
+  version = "0.10.1";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "1644jy5dk46vahmh6nna36s79k8k668sbi3qamjb4q3c4m3y853l";
+    sha256 = "1kmmpkkgymg1r8r0k8j83pgmiskg1phl8hmpzjrnvlvsfnrnjplr";
   };
 
   communityModules = fetchhg {

From 94cb35748e21ef60db030e259ae838bdada876bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 13:44:42 -0700
Subject: [PATCH 2024/3370] debootstrap: 1.0.97 -> 1.0.98 (#40682)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/debootstrap/versions.

These checks were done:

- built on NixOS
- /nix/store/m0h3f8pqvj25qgxc3z8qr9dz5id09ak7-debootstrap-1.0.98/bin/debootstrap passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.98 with grep in /nix/store/m0h3f8pqvj25qgxc3z8qr9dz5id09ak7-debootstrap-1.0.98
- directory tree listing: https://gist.github.com/f2964467bd7a4c6fb63e26c0c192fdc2
- du listing: https://gist.github.com/987ba3269a198a4eb67c50f8263d192d
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 7b143183bc0c..0ed883bf342b 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.97";
+  version = "1.0.98";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1w2wdiazfykjkwainxfk72rccqsh1l1i90h93phsvayv0gsbxrnk";
+    sha256 = "07wfvjhzc5schhpn1dkvhwbi115yn4f1q99g0g39m79bbyxm50d8";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

From 00ddd6a8ae9989ada2cb1a70b0c6cfb1022f6b1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 14:08:28 -0700
Subject: [PATCH 2025/3370] dash: 0.5.10 -> 0.5.10.1 (#40677)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dash/versions.

These checks were done:

- built on NixOS
- /nix/store/xdfhswm4pr989ad5582dphj02nlhd09g-dash-0.5.10.1/bin/dash passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/c7533f80b4151e29fb67f31acbea016b
- du listing: https://gist.github.com/455f25b553fefbc281441c80772198d1
---
 pkgs/shells/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index 5f26801ca6d3..c852e1feb33b 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dash-0.5.10";
+  name = "dash-0.5.10.1";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
-    sha256 = "1arimvc9zcghhb3nin9z3yr5706vxfri4a9r3j9j9d0n676f0w5d";
+    sha256 = "1bl4brz5vy07lrss54glp4vfca3q8d73hyc87sqdk99f76z95b6s";
   };
 
   hardeningDisable = [ "format" ];

From 157eb22351f9d0a9d8337b104ddb8bdb5ec4c01e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 14:09:01 -0700
Subject: [PATCH 2026/3370] debianutils: 4.8.4 -> 4.8.6 (#40678)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/debianutils/versions.

These checks were done:

- built on NixOS
- /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/run-parts passed the binary check.
- /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/tempfile passed the binary check.
- /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/ischroot passed the binary check.
- Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/which had a zero exit code or showed the expected version
- /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/savelog passed the binary check.
- Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/add-shell had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/installkernel had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6/bin/remove-shell had a zero exit code or showed the expected version
- 4 of 8 passed binary check by having a zero exit code.
- 1 of 8 passed binary check by having the new version present in output.
- found 4.8.6 with grep in /nix/store/lzdwpfz2xm977k12qpkvilaaw3sg6f4l-debianutils-4.8.6
- directory tree listing: https://gist.github.com/d23555dbc7c71f2c0b98dcd75d09c013
- du listing: https://gist.github.com/58757b8859445f56eba651aa845fe59f
---
 pkgs/tools/misc/debianutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix
index d93cc479a803..bec0cbbd2b9b 100644
--- a/pkgs/tools/misc/debianutils/default.nix
+++ b/pkgs/tools/misc/debianutils/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.8.4";
+  version = "4.8.6";
   name = "debianutils-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
-    sha256 = "1chypq3dbkgvl16lgzdvqvlr7cdm3814nqmp8ch8j7x6mscsnqf0";
+    sha256 = "0wrz8ak4896f5i8wirijr9hdvc43xzxpg2gjs0snmpys8iqh82fv";
   };
 
   meta = {

From 3432fa3fd5197f0cd2c723a1f14641e30ccb173d Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Thu, 17 May 2018 16:16:26 -0500
Subject: [PATCH 2027/3370] bashplotlib: init at 2017-10-11 (#40685)

---
 pkgs/tools/misc/bashplotlib/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/bashplotlib/default.nix

diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix
new file mode 100644
index 000000000000..2757f5f3e215
--- /dev/null
+++ b/pkgs/tools/misc/bashplotlib/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "bashplotlib-${version}";
+  version = "2017-10-11";
+
+  src = fetchFromGitHub {
+    owner = "glamp";
+    repo = "bashplotlib";
+    rev = "fdc52be2c1fed13753692eced328143ab1db6f3d";
+    sha256 = "1ycql6j65zywyav2n3c0x1i5cm9w6glzqc3v0cgdvv1bdg4wi0gf";
+  };
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/glamp/bashplotlib;
+    description = "Plotting in the terminal";
+    maintainers = with maintainers; [ dtzWill ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d51e6fbe857c..698a0c8ed30f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -784,6 +784,8 @@ with pkgs;
 
   basex = callPackage ../tools/text/xml/basex { };
 
+  bashplotlib = callPackage ../tools/misc/bashplotlib { };
+
   babeld = callPackage ../tools/networking/babeld { };
 
   badvpn = callPackage ../tools/networking/badvpn {};

From bb898dbc89cbca92850306f35ab8cfcc0f074e60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 14:56:24 -0700
Subject: [PATCH 2028/3370] pam_u2f: 1.0.6 -> 1.0.7 (#40649)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pam_u2f/versions.

These checks were done:

- built on NixOS
- /nix/store/ny1mv10yj3az2yjn25sla3aybl550rwi-pam_u2f-1.0.7/bin/pamu2fcfg passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.0.7 with grep in /nix/store/ny1mv10yj3az2yjn25sla3aybl550rwi-pam_u2f-1.0.7
- directory tree listing: https://gist.github.com/7da727fb06490bc549a719fda2ada9ab
- du listing: https://gist.github.com/a984153d959e953899879d365ffc7852
---
 pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index 5cc235c3104a..58e3f79d42b2 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "pam_u2f-${version}";
-  version = "1.0.6";
+  version = "1.0.7";
 
   src     = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
-    sha256 = "0fpdb49596zywnbx1cfcx1k83rbs1ylhi1cnn25pq9d3b92hj50h";
+    sha256 = "1kz7d3vr5dag1d5zq14kcp887p5d0q079dy1sqyl8ndi567asjh3";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f1323634c1083c3594e6a62a7c2ff065e3e9a36d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 15:32:15 -0700
Subject: [PATCH 2029/3370] armadillo: 8.500.0 -> 8.500.1 (#40700)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/armadillo/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 8.500.1 with grep in /nix/store/fgj0bi559rzmrmzm0y0fyfr75wljlwzz-armadillo-8.500.1
- directory tree listing: https://gist.github.com/6b042c178fafc84e571bb6d2ed67ae65
- du listing: https://gist.github.com/32fd420f41d621a7b6b540cabbcf3f53
---
 pkgs/development/libraries/armadillo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 4c98bbc182c8..abf251f97f97 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }:
 
 stdenv.mkDerivation rec {
-  version = "8.500.0";
+  version = "8.500.1";
   name = "armadillo-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "1wdvii5sncq3d8dh272s1n79mpcwzz437lyyfwy7gm7vbks6j77m";
+    sha256 = "0bm1g93yr79i74382pq1almakpyf42yipiqkqy742jyzwbxhxr5c";
   };
 
   nativeBuildInputs = [ cmake ];

From 4fe289860888668956b7e79e24efeb101c2f51d1 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 17 May 2018 18:53:13 -0400
Subject: [PATCH 2030/3370] nixpkgs module: Fix defaulting of `localSystem` and
 `system`

My c6f7d4367894047592cc412740f0c1f5b2ca2b59 made the mistake of not
having enough defaults. Now both variables are default as the *explicit*
value of the other, or a fallback. The fallback of `system` is the
default of `localSystem.system`. The fallback of `localSystem` is not
the other default (projected), as that would cause a cycle, but `{
system = builtins.currentTime; }` just as nixpkgs itself does it.
---
 nixos/modules/misc/nixpkgs.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 8fbe218b232a..29019ed3d552 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -1,9 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, options, lib, pkgs, ... }:
 
 with lib;
 
 let
   cfg = config.nixpkgs;
+  opts = options.nixpgs;
 
   isConfig = x:
     builtins.isAttrs x || lib.isFunction x;
@@ -62,12 +63,11 @@ in
     pkgs = mkOption {
       defaultText = literalExample
         ''import "''${nixos}/.." {
-            inherit (config.nixpkgs) config overlays localSystem crossSystem;
+            inherit (cfg) config overlays localSystem crossSystem;
           }
         '';
       default = import ../../.. {
-        localSystem = { inherit (cfg) system; } // cfg.localSystem;
-        inherit (cfg) config overlays crossSystem;
+        inherit (cfg) config overlays localSystem crossSystem;
       };
       type = pkgsType;
       example = literalExample ''import <nixpkgs> {}'';
@@ -140,7 +140,7 @@ in
 
     localSystem = mkOption {
       type = types.attrs; # TODO utilize lib.systems.parsedPlatform
-      default = { system = builtins.currentSystem; };
+      default = { system = cfg.system or builtins.currentSystem; };
       example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
       defaultText = literalExample
         ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
@@ -179,6 +179,8 @@ in
 
     system = mkOption {
       type = types.str;
+      default = cfg.localSystem.system
+        or opts.localSystem.default.system;
       example = "i686-linux";
       description = ''
         Specifies the Nix platform type on which NixOS should be built.
@@ -196,6 +198,7 @@ in
         </programlisting>
         See <code>nixpkgs.localSystem</code> for more information.
 
+        Ignored when <code>nixpkgs.localSystem</code> is set.
         Ignored when <code>nixpkgs.pkgs</code> is set.
       '';
     };

From 81a0a3b39c7812cd6c9d1734f276fe72d33e842a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 16:08:47 -0700
Subject: [PATCH 2031/3370] ntp: 4.2.8p10 -> 4.2.8p11 (#40661)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ntp/versions.

These checks were done:

- built on NixOS
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/calc_tickadj passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntp-wait passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntptrace passed the binary check.
- Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/update-leap had a zero exit code or showed the expected version
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/sntp passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpd passed the binary check.
- Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpdate had a zero exit code or showed the expected version
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpdc passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntpq passed the binary check.
- /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntp-keygen passed the binary check.
- Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/ntptime had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11/bin/tickadj had a zero exit code or showed the expected version
- 8 of 12 passed binary check by having a zero exit code.
- 0 of 12 passed binary check by having the new version present in output.
- found 4.2.8p11 with grep in /nix/store/ib7i3wijfdx2h24aswazaqivr6hfrbip-ntp-4.2.8p11
- directory tree listing: https://gist.github.com/643849ae077bac0514537c8aa923dd6d
- du listing: https://gist.github.com/1b2abf7cee80b022945ff72be1eb7070
---
 pkgs/tools/networking/ntp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 29f8e1ae2570..1178f5f0107e 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -8,11 +8,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p10";
+  name = "ntp-4.2.8p11";
 
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "17xrk7gxrl3hgg0i73n8qm53knyh01lf0f3l1zx9x6r1cip3dlnx";
+    sha256 = "13i7rp1va29ffjdk08fvsfl6n47zzwsp147zhgb550k8agvkjjpi";
   };
 
   # The hardcoded list of allowed system calls for seccomp is

From b1b49e114b249a385025ed7acec1766713d8bb68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 17 May 2018 16:23:42 -0700
Subject: [PATCH 2032/3370] usbutils: 009 -> 010 (#40635)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/usbutils/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/lsusb.py had a zero exit code or showed the expected version
- /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/usbhid-dump passed the binary check.
- /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/lsusb passed the binary check.
- /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010/bin/usb-devices passed the binary check.
- 3 of 4 passed binary check by having a zero exit code.
- 1 of 4 passed binary check by having the new version present in output.
- found 010 with grep in /nix/store/wgq4wwb9dxnhkbih9jscikf2lxhdvbkl-usbutils-010
- directory tree listing: https://gist.github.com/ea1dc2aa0de1416d4359481ce7edb85e
- du listing: https://gist.github.com/f46f6ac9b995df459105446dc2761e28
---
 pkgs/os-specific/linux/usbutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index 31e4a3dd26f6..adb2a0ee2fb1 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1, hwdata }:
 
 stdenv.mkDerivation rec {
-  name = "usbutils-009";
+  name = "usbutils-010";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/usb/usbutils/${name}.tar.xz";
-    sha256 = "0q3iavmak2bs9xw486w4xfbjl0hbzii93ssgpr95mxmm9kjz1gwb";
+    sha256 = "06aag4jfgsfjxk563xsp9ik9nadihmasrr37a1gb0vwqni5kdiv1";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 285a90b714bfee4004ffa84c83f15bebc36df0b9 Mon Sep 17 00:00:00 2001
From: Roland Koebler <rk@simple-is-better.org>
Date: Fri, 18 May 2018 01:35:31 +0200
Subject: [PATCH 2033/3370] lighttpd: add option to enable WebDAV (#40623)

---
 pkgs/servers/http/lighttpd/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 7bf1b1ffa646..31b3449d5f64 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -2,11 +2,14 @@
 , openssl, enableMagnet ? false, lua5_1 ? null
 , enableMysql ? false, mysql ? null
 , enableLdap ? false, openldap ? null
+, enableWebDAV ? true, sqlite ? null, libuuid ? null
 }:
 
 assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;
 assert enableLdap -> openldap != null;
+assert enableWebDAV -> sqlite != null;
+assert enableWebDAV -> libuuid != null;
 
 stdenv.mkDerivation rec {
   name = "lighttpd-1.4.49";
@@ -20,12 +23,16 @@ stdenv.mkDerivation rec {
   buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ]
              ++ stdenv.lib.optional enableMagnet lua5_1
              ++ stdenv.lib.optional enableMysql mysql.connector-c
-             ++ stdenv.lib.optional enableLdap openldap;
+             ++ stdenv.lib.optional enableLdap openldap
+             ++ stdenv.lib.optional enableWebDAV sqlite
+             ++ stdenv.lib.optional enableWebDAV libuuid;
 
   configureFlags = [ "--with-openssl" ]
                 ++ stdenv.lib.optional enableMagnet "--with-lua"
                 ++ stdenv.lib.optional enableMysql "--with-mysql"
-                ++ stdenv.lib.optional enableLdap "--with-ldap";
+                ++ stdenv.lib.optional enableLdap "--with-ldap"
+                ++ stdenv.lib.optional enableWebDAV "--with-webdav-props"
+                ++ stdenv.lib.optional enableWebDAV "--with-webdav-locks";
 
   preConfigure = ''
     sed -i "s:/usr/bin/file:${file}/bin/file:g" configure

From 3a5fcbbd911b0ee2a82903bacb06e4c508d7c1b3 Mon Sep 17 00:00:00 2001
From: Herdiansyah <herdiansyah@netc.eu>
Date: Fri, 18 May 2018 06:41:03 +0700
Subject: [PATCH 2034/3370] neofetch: 3.4.0 -> 4.0.0 (#40651)

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

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index 097eb2408f85..cece77b8d3e6 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
-  version = "3.4.0";
+  version = "4.0.0";
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "10h4f7n6bllbq459nm9wppvk65n81zzv556njfqplzw3mpdrbiyx";
+    sha256 = "1ijg6fmrqjgn87899q8cpbir93hqrq4070wzm62s9nmggdgzx6mn";
   };
 
   dontBuild = true;

From 5523ec8f3c78704c6e76b7675bfce41d24a3feb1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 17 May 2018 20:35:53 -0400
Subject: [PATCH 2035/3370] Make getHaskellBuildInputs / shellFor work with
 overrideCabal

---
 pkgs/development/haskell-modules/lib.nix              | 7 +++++--
 pkgs/development/haskell-modules/make-package-set.nix | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index ff86e06979c1..55e45bd6559d 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -297,8 +297,11 @@ rec {
   # This is useful to build environments for developing on that
   # package.
   getHaskellBuildInputs = p:
-    (p.override { mkDerivation = extractBuildInputs p.compiler;
-                }).haskellBuildInputs;
+    (overrideCabal p (args: {
+      passthru = (args.passthru or {}) // {
+        _getHaskellBuildInputs = extractBuildInputs p.compiler args;
+      };
+    }))._getHaskellBuildInputs;
 
   # Under normal evaluation, simply return the original package. Under
   # nix-shell evaluation, return a nix-shell optimized environment.
diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index bde4f85f6784..1ab37f080b1d 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -38,7 +38,7 @@ let
   inherit (stdenv) buildPlatform hostPlatform;
 
   inherit (stdenv.lib) fix' extends makeOverridable;
-  inherit (haskellLib) overrideCabal;
+  inherit (haskellLib) overrideCabal getHaskellBuildInputs;
 
   mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
     inherit stdenv;
@@ -229,7 +229,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     shellFor = { packages, withHoogle ? false, ... } @ args:
       let
         selected = packages self;
-        packageInputs = builtins.map (p: p.override { mkDerivation = haskellLib.extractBuildInputs p.compiler; }) selected;
+        packageInputs = builtins.map getHaskellBuildInputs selected;
         haskellInputs =
           builtins.filter
             (input: pkgs.lib.all (p: input.outPath != p.outPath) selected)

From 39696b6d56fbe93834a8997057b3507e8cd2a234 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 15 May 2018 19:09:29 -0500
Subject: [PATCH 2036/3370] qt-5.10: don't use features that require new-ish
 kernels, stay compat

Before this change:
$ readelf --notes /nix/store/zf5yja02g8n8dzgs25pqfd8w3myfzgzc-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7778 with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 3.17.0

After:
$ readelf --notes /nix/store/sg1s9hdw0b7p6h0dwg09g4lxy1acq7y6-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7dcc with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 2.6.28

-----------

The above paths were before rebasing the commit onto staging,
and it'd probably be good to have someone confirm the same happens
when built on a hydra builder or other non-dtzWill machine :).

[dezgeg: added comments]
---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 8887e05704d2..28b250437d08 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -327,6 +327,12 @@ stdenv.mkDerivation {
         ]
         ++ lib.optional withGtk3 "-gtk"
         ++ lib.optional (compareVersion "5.9.0" >= 0) "-inotify"
+        ++ lib.optionals (compareVersion "5.10.0" >= 0) [
+          # Without these, Qt stops working on kernels < 3.17. See:
+          # https://github.com/NixOS/nixpkgs/issues/38832
+          "-no-feature-renameat2"
+          "-no-feature-getentropy"
+        ]
     );
 
   enableParallelBuilding = true;

From 63f2c2f73f4436e5a334814c3bd0b4c88c29750e Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 14 Mar 2018 13:10:59 +0700
Subject: [PATCH 2037/3370] ape: init at 6.7-131003

---
 pkgs/applications/misc/ape/apeclex.nix |  8 +++++
 pkgs/applications/misc/ape/clex.nix    | 25 ++++++++++++++
 pkgs/applications/misc/ape/default.nix | 45 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 +++
 4 files changed, 82 insertions(+)
 create mode 100644 pkgs/applications/misc/ape/apeclex.nix
 create mode 100644 pkgs/applications/misc/ape/clex.nix
 create mode 100644 pkgs/applications/misc/ape/default.nix

diff --git a/pkgs/applications/misc/ape/apeclex.nix b/pkgs/applications/misc/ape/apeclex.nix
new file mode 100644
index 000000000000..710ddfec9942
--- /dev/null
+++ b/pkgs/applications/misc/ape/apeclex.nix
@@ -0,0 +1,8 @@
+{ stdenv, attemptoClex, callPackage }:
+
+callPackage ./. {
+  pname = "ape-clex";
+  lexicon = "${attemptoClex}/clex_lexicon.pl";
+  description = "Parser for Attempto Controlled English (ACE) with a large lexicon (~100,000 entries)";
+  license = with stdenv.lib; [ licenses.lgpl3 licenses.gpl3 ];
+}
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
new file mode 100644
index 000000000000..37d140e19ba3
--- /dev/null
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "attempto-clex-${version}";
+  version = "5133afe";
+
+  src = fetchFromGitHub {
+     owner = "Attempto";
+     repo = "Clex";
+     rev = version;
+     sha256 = "0p9s64g1jic213bwm6347jqckszgnni9szrrz31qjgaf32kf7nkp";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cp clex_lexicon.pl $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Large lexicon for APE (~100,000 entries)";
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ yrashk ];
+  };
+}
diff --git a/pkgs/applications/misc/ape/default.nix b/pkgs/applications/misc/ape/default.nix
new file mode 100644
index 000000000000..e78ba2df9993
--- /dev/null
+++ b/pkgs/applications/misc/ape/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, swiProlog, makeWrapper,
+  fetchFromGitHub,
+  lexicon ? "lexicon/clex_lexicon.pl",
+  pname ? "ape",
+  description ? "Parser for Attempto Controlled English (ACE)",
+  license ? with stdenv.lib; licenses.lgpl3
+  }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "6.7-131003";
+
+  buildInputs = [ swiProlog makeWrapper ];
+
+  src = fetchFromGitHub {
+     owner = "Attempto";
+     repo = "APE";
+     rev = version;
+     sha256 = "0cw47qjg4896kw3vps6rfs02asvscsqvcfdiwgfmqb3hvykb1sdx";
+  };
+
+  patchPhase = ''
+    # We move the file first to avoid "same file" error in the default case
+    cp ${lexicon} new_lexicon.pl
+    rm lexicon/clex_lexicon.pl
+    cp new_lexicon.pl lexicon/clex_lexicon.pl
+  '';
+
+  buildPhase = ''
+    make build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ape.exe $out
+    makeWrapper $out/ape.exe $out/bin/ape --add-flags ace
+  '';
+
+  meta = with stdenv.lib; {
+    description = description;
+    license = license;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ yrashk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 698a0c8ed30f..64cdad2282bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21457,6 +21457,10 @@ with pkgs;
 
   teseq = callPackage ../applications/misc/teseq {  };
 
+  ape = callPackage ../applications/misc/ape { };
+  attemptoClex = callPackage ../applications/misc/ape/clex.nix { };
+  apeClex = callPackage ../applications/misc/ape/apeclex.nix { };
+
   # Unix tools
   unixtools = recurseIntoAttrs (callPackages ./unix-tools.nix { });
   inherit (unixtools) hexdump ps logger eject umount

From e63bc58d7bb22b40e61a6af2ce9dff5e6dc5b5d9 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 18 May 2018 11:45:25 +0300
Subject: [PATCH 2038/3370] iosevka: 1.14.2 -> 1.14.3

---
 pkgs/data/fonts/iosevka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index 657eb80c5392..4fc47793661b 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -26,13 +26,13 @@ in
 let pname = if set != null then "iosevka-${set}" else "iosevka"; in
 
 let
-  version = "1.14.2";
+  version = "1.14.3";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "be5invis";
     repo ="Iosevka";
     rev = "v${version}";
-    sha256 = "18vh5rjffqgiliyfia40lh7cygz6fv3rwgq28fxl26i9sc95qsqd";
+    sha256 = "0ba8hwxi88bp2jb9xfhk95nnlv8ykl74cv62xr4ybzm3b8ahpwqf";
   };
 in
 

From e44659509f68e65078d3d57f4ac4fc305c5c420a Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 18 May 2018 11:46:25 +0300
Subject: [PATCH 2039/3370] iosevka-bin: 1.14.0 -> 1.14.3

---
 pkgs/data/fonts/iosevka/bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 1571f8e573de..95093f4eefc5 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "1.14.0";
+  version = "1.14.3";
 in fetchzip rec {
   name = "iosevka-bin-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "03zgh5dfx58sxrprhqi8cyc18sh05k84yc262bn81vavl6lm14ns";
+  sha256 = "0qc5i6ijr25d2jwi5r4bcvbaw74y1p05a5fvlwss3l9rhmmxsfpl";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;

From a270cbde1847742f3e63dc9cc863819bd6776110 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 01:59:19 -0700
Subject: [PATCH 2040/3370] lsscsi: 0.28 -> 0.29 (#40663)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/lsscsi/versions.

These checks were done:

- built on NixOS
- /nix/store/2z22y23xx308psxsxn605hsizfhll3jd-lsscsi-0.29/bin/lsscsi passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.29 with grep in /nix/store/2z22y23xx308psxsxn605hsizfhll3jd-lsscsi-0.29
- directory tree listing: https://gist.github.com/8a27d93aa9459ec96b068a78e73f6f1c
- du listing: https://gist.github.com/1c65dda6f5dc9d0ef0fa880d016dc260
---
 pkgs/os-specific/linux/lsscsi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix
index 084a7e7c9a3b..d250d658282f 100644
--- a/pkgs/os-specific/linux/lsscsi/default.nix
+++ b/pkgs/os-specific/linux/lsscsi/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "lsscsi-0.28";
+  name = "lsscsi-0.29";
 
   src = fetchurl {
-    url = "http://sg.danny.cz/scsi/lsscsi-0.28.tgz";
-    sha256 = "0l6xz8545lnfd9f4z974ar1pbzfdkr6c8r56zjrcaazl3ad00p82";
+    url = "http://sg.danny.cz/scsi/lsscsi-0.29.tgz";
+    sha256 = "0538fjgxky03yn7mzyslkyi2af3yy5llsnjjcgjx73x08wd6hv5n";
   };
 
   preConfigure = ''

From d5662440393578659cc2d668274b77af9c7fe04b Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Fri, 18 May 2018 11:04:13 +0200
Subject: [PATCH 2041/3370] typora: 0.9.47 -> 0.9.48 (#40714)

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

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index d687712fc08a..ed4aefd90bc5 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, atk, cairo
+{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gtk3, atk, cairo
 , freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }:
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
-  version = "0.9.47";
+  version = "0.9.48";
 
   src =
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_amd64.deb";
-        sha256 = "431741948f5a2faba04984c495bea56b4a800c6dbb7e21e24ad3124fb8ffcbc9";
+        sha256 = "36a7c5f855306bcbe3364d12aca94c2f6d013a013e59b46f89df81496ec11800";
       }
     else
       fetchurl {
         url = "https://www.typora.io/linux/typora_${version}_i386.deb";
-        sha256 = "a95c8c1e296d8587a4dc6182af3b24253c3c2abc991badb7c758cd6d1bf5b1b6";
+        sha256 = "7197c526918a791b15b701846f9f2f1747a5b8ceac77c4cba691ee6d74d07d1d";
       }
     ;
 
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
       gnome2.gdk_pixbuf
       gnome2.pango
       expat
+      gtk3
       atk
       nspr
       nss

From 73a12c0403831756977a3c326caa716633bafe14 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 02:18:12 -0700
Subject: [PATCH 2042/3370] duperemove: 0.10 -> 0.11 (#40684)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/duperemove/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11/bin/btrfs-extent-same had a zero exit code or showed the expected version
- /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11/bin/duperemove passed the binary check.
- /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11/bin/hashstats passed the binary check.
- /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11/bin/show-shared-extents passed the binary check.
- 2 of 4 passed binary check by having a zero exit code.
- 2 of 4 passed binary check by having the new version present in output.
- found 0.11 with grep in /nix/store/mcgis270lv4waah1f68insh0n8j7ja52-duperemove-0.11
- directory tree listing: https://gist.github.com/0df1e551a8c77ca4dd4bb8f2783f75c4
- du listing: https://gist.github.com/4dc88fc1b6adba1caf3a67e67383c3c9
---
 pkgs/tools/filesystems/duperemove/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix
index 613ab7bab1ee..4e71d910a5d6 100644
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "duperemove-${version}";
-  version = "0.10";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "markfasheh";
     repo = "duperemove";
     rev = "v${version}";
-    sha256 = "1fll0xjg1p3pabgjiddild4ragk9spbdmdzrkq0hv5pxb1qrv7lp";
+    sha256 = "09bwpsvnppl9bm2l5pym5673x04ah3hddb0xip61gdq8ws3ri5yj";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 05a6e94f3437af6c28fa8b794136e193553e98c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Fri, 18 May 2018 12:07:01 +0200
Subject: [PATCH 2043/3370] inkscape: disable parallelBuilding

Try to avoid non-deterministic build failure.
---
 pkgs/applications/graphics/inkscape/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 5978612fdf33..de4849e21620 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -51,7 +51,9 @@ stdenv.mkDerivation rec {
     libvisio libcdr libexif potrace python2Env icu
   ];
 
-  enableParallelBuilding = true;
+  # To avoid non-deterministic build failure using make.
+  # When switching back to cmake turn parallel back on, see #40046.
+  enableParallelBuilding = false;
 
   preConfigure = ''
     intltoolize -f

From 31712afa7b08a46c8e393a1b63c9fbae576762e6 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 18 May 2018 14:24:35 +0200
Subject: [PATCH 2044/3370] androidStudioPackages.{dev,canary}: 3.2.0.13 ->
 3.2.0.14

---
 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 328370c25016..ecc6e244a585 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
   };
   latestVersion = {
-    version = "3.2.0.13"; # "Android Studio 3.2 Canary 14"
-    build = "181.4763614";
-    sha256Hash = "1rx3bip5a7v349whg26kxvj05qlvm7zwacfqnfzfmvvhzbh7xnyh";
+    version = "3.2.0.14"; # "Android Studio 3.2 Canary 15"
+    build = "181.4773949";
+    sha256Hash = "10lhy6sdvvh4a8kj8jyk4z9nzh67v8f5zpkwparvk3pb2s5mf3mk";
   };
 in rec {
   # Old alias

From 60216b2f3961be9086c018b52f45f41d866df982 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 18 May 2018 13:45:20 +0100
Subject: [PATCH 2045/3370] libsForQt5.libkdegames: init at 18.04.1

---
 pkgs/applications/kde/default.nix     |  1 +
 pkgs/applications/kde/libkdegames.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/kde/libkdegames.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index f602e5c92d9f..14a4e5977601 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -140,6 +140,7 @@ let
       libgravatar = callPackage ./libgravatar.nix {};
       libkcddb = callPackage ./libkcddb.nix {};
       libkdcraw = callPackage ./libkdcraw.nix {};
+      libkdegames = callPackage ./libkdegames.nix {};
       libkdepim = callPackage ./libkdepim.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
       libkgapi = callPackage ./libkgapi.nix {};
diff --git a/pkgs/applications/kde/libkdegames.nix b/pkgs/applications/kde/libkdegames.nix
new file mode 100644
index 000000000000..494b193b8326
--- /dev/null
+++ b/pkgs/applications/kde/libkdegames.nix
@@ -0,0 +1,26 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kdelibs4support
+, qtdeclarative
+, kdeclarative
+, kdnssd
+, knewstuff
+, openal
+, libsndfile
+, qtquickcontrols
+}:
+
+mkDerivation {
+  name = "libkdegames";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kdelibs4support qtdeclarative kdeclarative kdnssd knewstuff openal libsndfile
+    qtquickcontrols
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ lheckemann ];
+  };
+}

From 9eb61e8408115a5ca6b82cf0bdd83c3988a6f48c Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Fri, 18 May 2018 13:46:12 +0100
Subject: [PATCH 2046/3370] kdeApplications.konquest: init at 2.4

---
 pkgs/applications/kde/default.nix  |  1 +
 pkgs/applications/kde/konquest.nix | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/applications/kde/konquest.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 14a4e5977601..8f64c8849311 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -127,6 +127,7 @@ let
       konsole = callPackage ./konsole.nix {};
       kontact = callPackage ./kontact.nix {};
       kontactinterface = callPackage ./kontactinterface.nix {};
+      konquest = callPackage ./konquest.nix {};
       korganizer = callPackage ./korganizer.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
       ksmtp = callPackage ./ksmtp {};
diff --git a/pkgs/applications/kde/konquest.nix b/pkgs/applications/kde/konquest.nix
new file mode 100644
index 000000000000..cfef018de6cc
--- /dev/null
+++ b/pkgs/applications/kde/konquest.nix
@@ -0,0 +1,18 @@
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kdelibs4support
+, libkdegames
+, qtquickcontrols
+}:
+
+mkDerivation {
+  name = "konquest";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kdelibs4support libkdegames qtquickcontrols ];
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ lheckemann ];
+  };
+}

From 536a41171b70dd3ef2c064d11705d11ee86f3269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philippe=20Gr=C3=A9goire?= <pg@pgregoire.xyz>
Date: Fri, 18 May 2018 09:53:04 -0400
Subject: [PATCH 2047/3370] Remove all references to absent nixos-prepare-root

Fixes the broken 0f5d5970b28c9d85e7166f85ecfa3f86064d3f25 commit.
---
 nixos/modules/installer/tools/tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index beac9e29d59c..42b00b2025d8 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -76,7 +76,7 @@ in
       ];
 
     system.build = {
-      inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild nixos-enter;
+      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;
     };
 
   };

From 82fbc339a5b8e6c74b259306d3a0bcf414fe869d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 06:43:34 -0700
Subject: [PATCH 2048/3370] jhiccup: 2.0.8 -> 2.0.9

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jhiccup/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9/bin/jHiccup had a zero exit code or showed the expected version
- /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9/bin/jHiccupLogProcessor passed the binary check.
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.0.9 with grep in /nix/store/di6qgm16dycmq6xg4jhwbmin207kykkr-jhiccup-2.0.9
- directory tree listing: https://gist.github.com/83abe7e20b3fd3db4dd38e3223479de0
- du listing: https://gist.github.com/196b47d4bb8d9ecf736bb2a7be08ce2c
---
 pkgs/development/tools/java/jhiccup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
index 03aa841dc7b2..39b573023376 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jhiccup-${version}";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchzip {
     url    = "https://www.azul.com/files/jHiccup-${version}-dist.zip";
-    sha256 = "1q4wd5ywisgh0f4ic7iglxai0gc8mnl1pkjw1hm1xdij8j5i488g";
+    sha256 = "1y089kzj191j3vclkma4vi1w66pw4jqrnm5z0qw264wqcn0hnq11";
   };
 
   configurePhase = ":";

From 364f922cbf9c30d30f8da30792825fa441ddde1e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 06:30:10 -0700
Subject: [PATCH 2049/3370] gtkwave: 3.3.89 -> 3.3.90

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gtkwave/versions.

These checks were done:

- built on NixOS
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/evcd2vcd passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/fst2vcd passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2fst passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/fstminer passed the binary check.
- Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/ghwdump had a zero exit code or showed the expected version
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/lxt2miner passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/lxt2vcd passed the binary check.
- Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/shmidcat had a zero exit code or showed the expected version
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2lxt passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2lxt2 passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vcd2vzt passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vzt2vcd passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vztminer passed the binary check.
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/gtkwave passed the binary check.
- Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/twinwave had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/rtlbrowse had a zero exit code or showed the expected version
- /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90/bin/vermin passed the binary check.
- 13 of 17 passed binary check by having a zero exit code.
- 0 of 17 passed binary check by having the new version present in output.
- found 3.3.90 with grep in /nix/store/hhpifj7x2j4nr80kiksdhqyfny1hlyvh-gtkwave-3.3.90
- directory tree listing: https://gist.github.com/cf30f5f6dd398a3083156aed84f02f36
- du listing: https://gist.github.com/6d77f0a1fdfe06cfe325c3873fdfd97c
---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 671c53365aba..4ca489c40b3f 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkwave-${version}";
-  version = "3.3.89";
+  version = "3.3.90";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1j7byy0kmapa66dp17gjvs4pa4gckjccljydixswdknpxs5ma45g";
+    sha256 = "1q1fi0nqja9d8xj24h7ykvnpms6zqgn24jmyj1mxn48qig301c6m";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 47aceb0a7b4771e428bc0fe9bc109aa2641be223 Mon Sep 17 00:00:00 2001
From: Eric Bailey <e.bailey@sportradar.com>
Date: Fri, 18 May 2018 09:11:12 -0500
Subject: [PATCH 2050/3370] autojump: rework

- fetchurl -> fetchFromGitHub
- Update URLs: joelthelion -> wting
- mkdir + cp -> install
- Use -z flag to set zshshare_dir
- Add me as a maintainer
- Use recursive version instead of let
- meta: with stdenv.lib; ...
---
 pkgs/tools/misc/autojump/default.nix | 99 +++++++++++++---------------
 1 file changed, 44 insertions(+), 55 deletions(-)

diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix
index 4d3376108b7e..5f86dbadfa36 100644
--- a/pkgs/tools/misc/autojump/default.nix
+++ b/pkgs/tools/misc/autojump/default.nix
@@ -1,64 +1,53 @@
-{ fetchurl, stdenv, python, bash }:
+{ stdenv, fetchFromGitHub, python, bash }:
 
-let
+stdenv.mkDerivation rec {
+  name = "autojump-${version}";
   version = "22.5.1";
-in
-  stdenv.mkDerivation rec {
-    name = "autojump-${version}";
 
-    src = fetchurl {
-      url = "http://github.com/joelthelion/autojump/archive/release-v${version}.tar.gz";
-      name = "autojump-${version}.tar.gz";
-      sha256 = "17z9j9936x0nizwrzf664bngh60x5qbvrrf1s5qdzd0f2gdanpvn";
-    };
+  src = fetchFromGitHub {
+    owner = "wting";
+    repo = "autojump";
+    rev = "release-v${version}";
+    sha256 = "1l1278g3k1qfrz41pkpjdhsabassb9si2d1bfbcmvbv5h3wmlqk9";
+  };
 
-    buildInputs = [ python bash ];
-    dontBuild = true;
+  buildInputs = [ python bash ];
+  dontBuild = true;
 
-    installPhase = ''
-      python ./install.py -d $out -p ""
-      chmod +x $out/etc/profile.d/*
+  installPhase = ''
+    python ./install.py -d "$out" -p "" -z "$out/share/zsh/site-functions/"
 
-      mkdir -p "$out/etc/bash_completion.d"
-      cp -v $out/share/autojump/autojump.bash "$out/etc/bash_completion.d"
+    chmod +x "$out/etc/profile.d/autojump.sh"
+    install -Dt "$out/share/bash-completion/completions/" -m444 "$out/share/autojump/autojump.bash"
+    install -Dt "$out/share/fish/vendor_conf.d/" -m444 "$out/share/autojump/autojump.fish"
+    install -Dt "$out/share/zsh/site-functions/" -m444 "$out/share/autojump/autojump.zsh"
+  '';
 
-      mkdir -p $out/share/fish/vendor_completions.d/
-      cp -v $out/share/autojump/autojump.fish "$out/share/fish/vendor_completions.d/autojump.fish"
+  meta = with stdenv.lib; {
+    description = "A `cd' command that learns";
+    longDescription = ''
+      One of the most used shell commands is “cd”.  A quick survey
+      among my friends revealed that between 10 and 20% of all
+      commands they type are actually cd commands! Unfortunately,
+      jumping from one part of your system to another with cd
+      requires to enter almost the full path, which isn’t very
+      practical and requires a lot of keystrokes.
 
-      cat <<SCRIPT > $out/bin/autojump-share
-      #!/bin/sh
-      # Run this script to find the autojump shared folder where all the shell
-      # integration scripts are living.
-      echo $out/share/autojump
-      SCRIPT
-      chmod +x $out/bin/autojump-share
+      Autojump is a faster way to navigate your filesystem.  It
+      works by maintaining a database of the directories you use the
+      most from the command line.  The jstat command shows you the
+      current contents of the database.  You need to work a little
+      bit before the database becomes usable.  Once your database
+      is reasonably complete, you can “jump” to a directory by
+      typing "j dirspec", where dirspec is a few characters of the
+      directory you want to jump to.  It will jump to the most used
+      directory whose name matches the pattern given in dirspec.
+
+      Autojump supports tab-completion.
     '';
-
-    meta = {
-      description = "A `cd' command that learns";
-      longDescription = ''
-        One of the most used shell commands is “cd”.  A quick survey
-        among my friends revealed that between 10 and 20% of all
-        commands they type are actually cd commands! Unfortunately,
-        jumping from one part of your system to another with cd
-        requires to enter almost the full path, which isn’t very
-        practical and requires a lot of keystrokes.
-
-        Autojump is a faster way to navigate your filesystem.  It
-        works by maintaining a database of the directories you use the
-        most from the command line.  The jstat command shows you the
-        current contents of the database.  You need to work a little
-        bit before the database becomes usable.  Once your database
-        is reasonably complete, you can “jump” to a directory by
-        typing "j dirspec", where dirspec is a few characters of the
-        directory you want to jump to.  It will jump to the most used
-        directory whose name matches the pattern given in dirspec.
-
-        Autojump supports tab-completion.
-      '';
-      homepage = http://wiki.github.com/joelthelion/autojump;
-      license = stdenv.lib.licenses.gpl3;
-      platforms = stdenv.lib.platforms.all;
-      maintainers = [ stdenv.lib.maintainers.domenkozar ];
-    };
-  }
+    homepage = http://wiki.github.com/wting/autojump;
+    license = licenses.gpl3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ domenkozar yurrriq ];
+  };
+}

From cab0bd00e185dbbbe6642e89d8db7fb9d7759399 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 18 May 2018 16:13:19 +0200
Subject: [PATCH 2051/3370] staging: fix eval error (undefined 'ncursesReal')

broken by an apparently faulty merge
in ddbe9191ef1549e7695e5e02e545b1b3db46edb4
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 805f42d67d94..f74f0a384cca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10766,10 +10766,10 @@ with pkgs;
 
   notify-sharp = callPackage ../development/libraries/notify-sharp { };
 
-  ncurses5 = ncursesReal.override {
+  ncurses5 = ncurses.override {
     abiVersion = "5";
   };
-  ncurses6 = ncursesReal.override {
+  ncurses6 = ncurses.override {
     abiVersion = "6";
   };
   ncurses =

From 1d2eeec16c8d5b7fc3c4a365776a767dd080c599 Mon Sep 17 00:00:00 2001
From: dbohdan <dbohdan@dbohdan.com>
Date: Fri, 18 May 2018 17:10:00 +0300
Subject: [PATCH 2052/3370] s2png: init at 0.7.2

---
 pkgs/tools/graphics/s2png/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/graphics/s2png/default.nix

diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix
new file mode 100644
index 000000000000..fd538eec573d
--- /dev/null
+++ b/pkgs/tools/graphics/s2png/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, diffutils, gd, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "s2png-${version}";
+  version = "0.7.2";
+
+  src = fetchFromGitHub {
+    owner = "dbohdan";
+    repo = "s2png";
+    rev = "v${version}";
+    sha256 = "0y3crfm0jqprgxamlly713cka2x1bp6z63p1lw9wh4wc37kpira6";
+  };
+
+  buildInputs = [ diffutils gd pkgconfig ];
+  installFlags = [ "prefix=" "DESTDIR=$(out)" ];
+
+  meta = {
+    homepage = https://github.com/dbohdan/s2png/;
+    description = "Store any data in PNG images";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.dbohdan ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64cdad2282bb..8b427206cfb4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1385,6 +1385,8 @@ with pkgs;
 
   parallel-rust = callPackage ../tools/misc/parallel-rust { };
 
+  s2png = callPackage ../tools/graphics/s2png { };
+
   socklog = callPackage ../tools/system/socklog { };
 
   staccato = callPackage ../tools/text/staccato { };

From f4152ea6edd43bb0325eb8b00270f785a3efafe4 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 18 May 2018 14:24:24 +0000
Subject: [PATCH 2053/3370] firefox-bin: 60.0 -> 60.0.1

---
 .../browsers/firefox-bin/release_sources.nix  | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 478728cf09e5..32adb56c931c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "60.0";
+  version = "60.0.1";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ach/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ach/firefox-60.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "1e7d2419e488a14eed5af7f2aec9a0092f830cea256f69cf654b2bbf783b192ead4512538fe3b2566dd55061cccaced91a7aa54732fc0987a4b24f676b9cabd9";
+      sha512 = "ca1638e32f121b1f366d89934e5516ee23cbe249596a7600f5ba1986fcb014d9125d24d3d7a38f251aa9fb527d368001ccc0af80063a7f3abb02a2a920bc7fd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/af/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/af/firefox-60.0.1.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "5714025668a2a9856571c743870f3401f0bfba66bb216936df7fbc977d9a935ae8b66fcb3042e45a934584a2571289fdac4f8fe8af2ec6a52c93d6fbf21484fd";
+      sha512 = "f693b42ee4380fa6c0505fb7971984dcb466ef2a1ce90c09e8088e758f1aef5d3ee790ac578737523ba93f2866dcc92722852579cf4cc5898e66adf28ce17495";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/an/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/an/firefox-60.0.1.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "678a060be20453e11fa2e8dc92db8a510789082d026a768dfb6cb3ac6a77924a1f6a9cce4e8c83e19a4aa6702b1e7e0b17846c52d2de2719dc5f8141a95d1c47";
+      sha512 = "4858341f974d45c982a9c3c8285de2932db81c8dbdd124272e7aaafc0e4712f613aec5e4929ad0182c1801850fc394ebeda38f08a40e71e29ce111c17abbfc7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ar/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ar/firefox-60.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "0c8e9cff9d7a349dfb18e3c5924efb068e1f9f145347b08feb158521b3ebf331ee01b035052ddb889d09b728745465fb6b7ba79c3608719c6f14a36e1da061c5";
+      sha512 = "dcbe81e9b0910c44530f9b8f33876c8e2df6ca314172f268c9b5cc53010f5f4024b37929a726d4c138033596d904596a6040b6770e796d20a9a8999ff3e84ecc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/as/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/as/firefox-60.0.1.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "0ec81546fa30b6ff5fd8b66df5b97eff25b359ea0ff258cd24aeab63cc87ecec3deb5f4173d9da46efbf82f70a3fd1579aff819de4e299a464abe289e7c77890";
+      sha512 = "4420f102bc6d665ddb568d3a27001cb91ddd76ac20ebe65c4c6fe58d92b2b9406a47c492c2f5ed4da42a48355e30a982c81da2b756826d239d443179bd6deec1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ast/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ast/firefox-60.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "ca9eceb89df3d618756618d961be5115846c1c6426f7f145379c2a127c807ba17c4796e9a16395e6f2d05b5638366b7f0a77ca19a75f89bbdf6a2a2f93269c74";
+      sha512 = "5294a33939e40bc868041952830593fafb27f7be2eb7fc163571a6d08c7ccf19443f177bd73e4a3bed96d73103d2fb696810982648abfe300973c7ca7c6677d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/az/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/az/firefox-60.0.1.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "e99295b469fb85cba099424700267f875e7d4ad9c3e8398c7ed8bd4427a3d173feec957edec2847ade3735df77a7313ca99a98b66b67c158b33bd17e39fe98df";
+      sha512 = "272fe5c3c276e9f3cc9554ebada40a90762af24cf6652a5fb9541f41aad964358471f2c19f94b3c1ad59eaf93a4ee507617f4ec299d4601c41d72a6620d0cd3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/be/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/be/firefox-60.0.1.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "ce80aa81c5b04da5f0f89d9e527b8e1d7ebc287ddb05d2ecc08994c0e31ea8860b68316af5e00f59e1ba85a4abb29e1e9403cedde40faa294af6b130be2a4ef1";
+      sha512 = "75689bbdb2f678ed36b265696d21d6f9becd7658001e15bbd8bd306e683b69d4762ac1cb27ddbb12638f7e626927e36fc0a16cc7b98479c5f2e21769dcd9cd06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bg/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bg/firefox-60.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "5a5f0fa8745c9c649dc26e8d235729bcdcbc397c4deb56bc0d8bff954ec64c2acd9f4d9fbeab9b0484d3fe91ed3717f8e37d5602f139fb5bc4fb22d0a372b926";
+      sha512 = "33b7aa767bb6c234dcb8406eb7eee3160424192dc1a76b9c1c7beee1de42d1c623ad009ab714e60c62e07bbb087cc1b08feec7628361739380a767bb7b43a020";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bn-BD/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bn-BD/firefox-60.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "62989d16accef0717ec9360d66cd169d89847701cab64f06fae6290b9be6d67acb0dd6c5d7f0e0c79107301512f57b44da04ce66096232291c5947a903e446e7";
+      sha512 = "3c6fdfe39d61fd681fa3d30a4ea1c1ef7988a1345912592a79b9622f18d1106ab96e099fe56b428568467c0c63b56e2cc09bc5fe2a9705478f458d5de0f36433";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bn-IN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bn-IN/firefox-60.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "fd75cfe4d3e9e7534d4b99452c05e4ee8bb45ddeb0b6cbac979b65db0a783f342b346204428c9b0787ab4e1bcccf4d4f056f4043a906dee41e7753ab8e53fc9a";
+      sha512 = "d9c67926f2df8faae64a6d9848a3823bd4968cafa1caaaf8b2713db2656c0a6c82dfc16eca9741c274994178ea46a7325b5f72a11ecafddacd8cf4df45683a89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/br/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/br/firefox-60.0.1.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "5c17a47e0fcc7231e6d1a9fb632f5f55c6dcb4dbfdf02ca6607ddcc54db3e198d563b0247fd4e95226ca29dfda25bf092e1b427d1b532b6544c2f2c5c498ee02";
+      sha512 = "a0ad58a34f85b254d5985a1bc6a2a0003a91773ba43408a45998098b98fe104b9f09e4d4e9bc9ab7ec9cd378692beb6e9f7aa4d2e55b49630c807bf0f9d158dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/bs/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/bs/firefox-60.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "290f57558d2d0b6abee4e6220047e0e6082f328bf3c1c7ba02474d7885ad3bbe77ead7875ec2726ae5ab4db25bf9659147c5abe9fea771a54acd4a9cefa18c8a";
+      sha512 = "3c24cba1629f4458832d09df121c897fa08c6c3a02ddb42d4e232207086525ff0dd01adc8e133c4ed2b6fc909907efd87f985cf0bc1d27fed18055ec566403f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ca/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ca/firefox-60.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "cfd5654a3ac3a50885621bc4be9918f5e71dd8150e4fe4e54acf35685a42ea82d6115e8a50593866e186860c7d5de5408c5a0e7325050b1bc39d6964e828a3e7";
+      sha512 = "75d63bd285257a1f8a6dd97981914fbe0886d77abebc237f08abb498a34bd1f129e38afd6fdbdce3da3d7dab5a7138e1da883ffad0ca31f954da68fc3d273ed4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cak/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cak/firefox-60.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "479d713253b99a19c6ec305e7986062b3a1ee476afb8968dfa2f57c52f22b734df82661bf487ad1fe7e706dfb581a99b247ea4128e89c9105b719b96f37e1cc2";
+      sha512 = "d79aaa1c8833f2fa9c9612efb8e5b7a02805c37f1fc45db6f7fc2f6288c48f75880ff46b9ddd96be7f05b674a8201f3c1bcbd36d0deafd9072aee5dce8f18ab1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cs/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cs/firefox-60.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "5139f4a2820ee921bd3c02acca7f57c5c2cc510c0e364129ecc07f17843cf92c565770fd0829515bfae94f96f6c9c68e8eb05c87fe5800da0be64f2400bf876a";
+      sha512 = "8b01b051a92320457c9364ab0f28761a7dc574b35777098bb773c9b0ec64d8947a76a2bf3c58b3b4a073e392f7d07b4f804994854c6f625a9e9dc51cad9bf914";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/cy/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/cy/firefox-60.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "d26fa97dae91eaaf0b09a580880ff0bb70f67c473cd8dd804d835823ac6cd97306b0bfab9b8fabd45b35330ddbef72e779dd09b47580b0347d4d857dd04182e5";
+      sha512 = "9f0e601b41e8f698de134d17d84f1b43d8f91d3319041482fe698fce34c8bcaa0da31e1e113fde72e1760bd93dc11dded02fbc917d69cf1ab008518e54c491dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/da/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/da/firefox-60.0.1.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "66a187b067f2e71f8ef43e3eed3eb12d02b407a230692e653111407c2dec82dce552eb5f9716733b0b3112d2d07ba6d917e4166e9bdac030dc0569a8630b566e";
+      sha512 = "dc4280c4e4f7e51befe4adc002d6875f9bdc7d4cb592335134d5b0df18462b6fe54817dbfa2815375e8947bf76d81ab9ccec31b7b36f07ca2b11ec04b3bbf728";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/de/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/de/firefox-60.0.1.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "aab4cfcf1c47d99c01cc93b0e26babecb4619b67df65a2400259249a870aa765152b7e4be625a9708e3e44b90f5a20b77f282b6939f2d092cc0bd180d8167c0d";
+      sha512 = "f9c7e6f1b83616883c74ba8fca5d21b793a811868e15e40611c93312f76ca8d8c37c4222454a8a71bce47d1d30e8596ed5907eb9300c3b5a957ae49249808c7c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/dsb/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/dsb/firefox-60.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "8726bd887b610e74b8b7073b8e797a98e009150594f2dd5e0f301f375b7bd6af02b5c8915c444145fadc6ae3e77f494a6c39632858d172b6324a2e4c84c0d6f0";
+      sha512 = "fc41281038372262d135de8004a1d7b03a3c8047fc20ab0e6856b696eee3260328a64b59212a809eb03cad7efd58fadda422e44153e7c8e33415d0efe5321c63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/el/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/el/firefox-60.0.1.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "f67a778f0aa15bac7450a210287f8e1e29cb9f4abc0f9e3c037d15a0f9341cdfff80b38a936724e5d18b5ceb373233fd8d038579e3a044c177887e05f5834310";
+      sha512 = "5a5f2d3f2f83e8c3a4bf358cc9611f1279fbf218f24c4e5aff69efcbe4b27ae08b955bafafe3a73ae1caa05914bd4ad739f1292344d9434f1f486f5e615645dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-GB/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-GB/firefox-60.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "fecd277c434cf3d4509371a5abf09fad81aba3fc7807470fcb91975939fef0d1384a97c4322411a787bb3fb27e3b043f9dd3ac182e41d35ea59824d109ff483e";
+      sha512 = "19b09722af085bdb016a12cc586ec9d32371d293f3c5be660efdb792e2d894d339600cef27325759f0489a0b3a4000123685c19db5b6d933d3f4f51244cd4f90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-US/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-US/firefox-60.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "263b6e827b8e6f8757c82a2ca24f78bd649ee07254cfde454e6d6ed879cfe816ed61c94aab3c10f3d63a38f83f391bf66bc578ae958343327298801fc30eaf3f";
+      sha512 = "2f7c14e1ef94ad4751c7382d7b012fcd36787ee1045918226cb3b0fdbb08508fa986181f54e304df12fdb8d49aadd62afc936f5855939437a7f9d8860976398c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/en-ZA/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/en-ZA/firefox-60.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "6ffa936e9f5e495309ff535fa9775200f8110bc0162d97f8d8bd00cbf3606c47b88b566114224f882a323c6e9538150ef79e1340e1e1eead8ddaf030b4ffb3fe";
+      sha512 = "04661ad52e94ad5e8967e21a460fe1e25cc08f9f0f108e9fe55633d4fdaaf23df133b1b73388146c496285d8562b57d38603100f45c4d81787ec02d4c4b6f0f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/eo/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/eo/firefox-60.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "f65bf2b40299c5260cb857c781445c9213dea8a49751d6701f43f6dd11fccec206b5850d54e96a4eba544d59b6a470f21b3e15b60116615c343d78726e7402f4";
+      sha512 = "bb1bd451569e1a4f116b458bb9d020d046b556c7335589dd6aa13f2a941b4ebbd197fa25728607f8bcfeacb610a94943d01d05b072f212346a5b74e96071f157";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-AR/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-AR/firefox-60.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "50a912c5d4cb1e73bbe5b4c6cd8a112cf88377ca78cb45a073bfe74b4b5618a39fe088c908e278eedaf50308e70e63d38c06343c4d60fdfc346684ce7042a5ef";
+      sha512 = "8b175a74a9688a50adc42a13b4ff4c137b34f09c571606d9a25080a8134640bfc8e0ef757ff88e90428153002d5c71f6dd339c54320520976669c264004a6743";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-CL/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-CL/firefox-60.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "b12f0fca0d307b280ec2a44f9dceed0073b0b9e898e05a55fdfd15623e022eac7b937e6b4ce470c7892e9ed429fd98a4d09141a5e1141fe05e3b21ab838a21d2";
+      sha512 = "7561ea580fa411d7c4a8c4cc6bed455f3287a55a843484d20431aa81f7d08b42386287e3cbf5fe7751f528945d9ed70b922cbaaa0f5cde74ff030101d897447a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-ES/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-ES/firefox-60.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "492aed6ef8fa3e51ad1604cf858dd1223ccc8a949b3cef4ec37be1596640421b057f50d3ad1827fe139230013ba4c040466682e61ebee59e7b6c168f35a14b1d";
+      sha512 = "3f7dea40f758a29ac6cdc8dc9e78ab4fde698c7f8d5369670ae31ef3a09819dd40e28296e2c05caa57e95bf4238f6c162fb81fff6d2bcb4a2ebf26eaad3a225a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/es-MX/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/es-MX/firefox-60.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "8f12520b74b0899c58f29217f9ecc6223635b627ddf525e3d36b7a0616ad2ea39e239bdb3cf3e0570ba4be03ebd93a2aa2739cb7cbfb851e84d2549970fd0bec";
+      sha512 = "2ef05c4095c02c22769098c837cabc435d2d84ec60b7ce09682c6625117c93e294bd00877379561728117e33d5991a0272cf48044a035964eb5d9df6167586d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/et/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/et/firefox-60.0.1.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "c24e822fbd147ae85a8f02dcbb070764c31b96056a07b2b344f85641517e1e8fa78fff860bc7e951675f9ba30616dcb567e279db93638f241a75632f7fd97b9f";
+      sha512 = "445158a41339640365d8101bf4473dc77df38f8c965a75f66ba8ef48172e6bd21d6813025192a7f98d451b50078faf5485f95b826af566c3e5215a10df2cbcce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/eu/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/eu/firefox-60.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "61ebe8e2e353419f7ed3ef8f944f4d8ae54d3c1c21ed7c1707212ac31e20c6f0607c00d0f3039e83c1aba832653f9c352b4976af4100b968045ad103862cee6c";
+      sha512 = "7760ad9243be37fbf1aa727afda348f8b4460eb4726d1402e2da82b3165f208eee21b786adde20e7c11aeb5567c6e379210874b0eba75a86f5c88486b4c48c2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fa/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fa/firefox-60.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "d47f63bedfc12a2e14eab57eeca7f946513b3067ea84b7931237a32841c40e477dfb4f3979fdd617b6b43787631f97fa4e28f996038f3eac7c2be7c82f8edfaf";
+      sha512 = "38fff9451b7fc7a027a5cf646ea6666a9519ae57f31ea77da8560777e485fcafa27e5203ce184916a725449384ce7531f41ba5f38d30a05004093c932c052ebb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ff/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ff/firefox-60.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "91fbab65d71da4416df7501ef392154844a6e5fafde529e9a9a42f01b44eb87ad248d83387b68fbda5b964b8d18b1b22b978dac8751cd73bf30c46d3cafda868";
+      sha512 = "efed066528af1466f750af19ac816f64031220618cd1c35e8c2041b6d94e0b3fe894780dda51c22e75eb49d4a0f3013c6de9557167de22b85ab4d72bb44d6729";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fi/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fi/firefox-60.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "483408626eaec192e753277b02de5c5bb68ca6056f35756fd7f80ff6c6ab3e6ff15f23d4cd5d1a28c8e662bc278ce7cb285513504663340451b912126e4d4fbe";
+      sha512 = "95d8c34ba47b0fbf2b112764c5f2dff684f9e207c839eef45a2443500de6f30b72ded618e116d784b6b315028df8cceb1efe11d3dc08b1af4a0466c016854c73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fr/firefox-60.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "adb7d295ba37c0cc7b51e312ffc3f60e8ee13106bacbb833086d160535504fa2f8f859ea3c1d30eb6a823ed9c2c6efc97bb691dde8cdcf991090e29e15d5c21b";
+      sha512 = "108fa3054bec0877f35594c6c5f22d5d5bce3eaf5e74e5a1843bcb7592ff84b67160065b32962497577cf59b5375f0bcf75d4676c4e7201712589050a018e00b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/fy-NL/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/fy-NL/firefox-60.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "ff44abaf4ec57162bdeb3197c3f75f312029934a8546018dab76aee8bab44cf2411c59d04a4dee9bebd618f26b466fd074f7533d839f1202e643d255e97e8015";
+      sha512 = "9dddf9cc3be7557e495e712f542f5f3f40ef205c893b5773217ff13e93cc83d35c7d7fa3611ebd1223a9cde4308cc8b4d0d0ba8879072e9dbc1d1433b972ae15";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ga-IE/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ga-IE/firefox-60.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "5d511a4dbc00b39199500b30c98ecd6bc009217644b82f58beed9fbb74699fdeca7cc31b59a046a7c56fa57c53c2aef7cc55232fedbca751b85347460c014d3b";
+      sha512 = "a2539cd2e7ec2f8898c98a27e7e70772d42a14a435279e33f2fe192189253e8c0d92814d25d3b2e5a5c66ac02ba6745b5feee1045c965398781fa86b19c68b0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gd/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gd/firefox-60.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "c7c893d0acb97541d9545a35c031aec967405113a4855d6833b5ade0418004fb8b6efab82abb551499c4b4f8a32010634b64a96e8c9b12f27b764dc50b33a23e";
+      sha512 = "dbfcbdd6bf0ddcf535821268d0c7fe59541387647124a7b95243babb1ba02e34dbfc3956808aea1bafe5f301a7c31382eb958e3da21a476c7961f44b4055bd4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gl/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gl/firefox-60.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "aadd92086094860936f1c0436bab9742170533a1b233022313439c9aa968269835b2f63bf33226c1fc52bafbcbe1e00677e8f1e04579193c474600e5dc3d94c0";
+      sha512 = "743c417dcb7bfb4027b0f56ff9c2561888bb7a66b0399e713bc65255f6283f9f33736abbfb449030cada641b085ed9d6a5a7010c60ada1002802f4cf6f3fedbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gn/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gn/firefox-60.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cf566c8adb01873712708f76bb976a92a3b729459639faabd22ab5515cf59951142af734c9eab7d67ec4eabf9590f1d7bab65787f70908dbc01aece73bf52277";
+      sha512 = "319eb86fac5e121e27a55386d3b9b79a07e4c766ac999ea387e03619f85e1c9a194dc4bc6cb56d66203ae647f6cede6bba81e65c4bace35baec986a18d79045f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/gu-IN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/gu-IN/firefox-60.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ecc4afe4acebf476fb0c4bd089679d8fdfb88c06769a75dc473ca3cefae09c01c8e71f88cf3c8130f4576eac17445032223f2713327ef6386fda6a2e3f588bbd";
+      sha512 = "37a5b54f94b5532d8bbaff537642bce1ca3822697821b84df523d9ecbeecd991aa2302c65a1f31883e7a0f9519347a3bb5995bc17208e1a56d8c98897fd1d2b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/he/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/he/firefox-60.0.1.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "604048649305e7abe426b831c8b3fd0eb3cb26cabc7b055f85b7fcad8d0f9cb8bb06a431a28013ae8fd24ab4b21d8f8e68053dd7397a88546305f241adab476a";
+      sha512 = "7a9cae5f7a7aebbf25908509efae41430f6f24d91d406964f83da585762cc078caf508750a562683e1f782bd805ba24b59327d1807badf63462a19955230aef2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hi-IN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hi-IN/firefox-60.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "1f1d56c762166cd8c099f636c610c361ca94d388bd4d627ddae6d94e4424074686b5fb6a3aae5562e9250dc82576bc52abac4e1b09386dc2f81799a1804bb7c9";
+      sha512 = "99ed2ea7f0aaaf214d3d4e60ff1fefefee09c42d5aaee85690d0c4e9832cab67f23b4d3f5eff8f46a936ab91922bb32ccc801db06c1cfaee4bdea3e60df3a2b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hr/firefox-60.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "f5968a481d92aa0b57ed6319e7bba0d11ff00e0ec8beab9c6b66e18f4a6d128979ce1efaaf6fa07d4202130698216e58b8580833c13e1420dcfadbcda925b908";
+      sha512 = "ea4814ad10720b0685713ea2d670c65713e453693b1d6ab95eb55e1ce418f398549ffdbbec172955d0141f275caa424c75bbcb326b736013dd8741511cba9488";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hsb/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hsb/firefox-60.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "6dee0423afa3ab5c173568aa91a2e92927cd6aae390033f34d8e63ad224d813b3f688a0287872cd8b08efad823b05804ddf54efcb57d1503bb70731391fafebf";
+      sha512 = "2e89edffaebcf69580fdb83c92830b091956d2ddd2d523885d0cbb858f3a958661c47e65e82a5f4f832751b215d568f985632a466e52cc23254ebf0b0276cdbb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hu/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hu/firefox-60.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "688103282fbc64a541bf6b914f757ef4cdf58ac6eaa942f45bb8b20b661136913b62735b7352c2118643118c48d94dd9a7cc18dcac184c3080e078d6bafbb278";
+      sha512 = "d00f603275a624ad6ded66f71b287e38afc8c4904b194fa0c71ab4f148ce2ddeda286eadc1b2395c316a4ace7aa7ea39e6f50ae8b8177bcafd60774661295e23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/hy-AM/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/hy-AM/firefox-60.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "f836cd764ddd7f9f48295c103b4ec0c091c8eaceb756825fbc9f4a03b9dab786fc94781903975167d93c8d9ee73940a6607403ae6d0ef97a7c83b89989ec628c";
+      sha512 = "da238fd6afbb3bbd7586f9f057ccb53d5dd8068fc12ce6ced6602384ede890b71e964c0c516b776154f5de358b1bf6b06daf91526dd8fd334bc6fb8fa650bc1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ia/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ia/firefox-60.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "61ed80fa61e7e8247ac1b59dd26582b063fd1313a02bf1ab73c696389cdf5f3d8bc0c3b58a15fd9ff08ca9514e3a3b53fb16aa532758586d412a8155131fa457";
+      sha512 = "dad9d2b95fa47fc1b34aa9bd47f785e7640eaf44ee51dc0cee8df6897939e3c77977c60b7a8fd3427b23dddb10bf4d0758b3ba08d305c61f7b42dab6b490a6fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/id/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/id/firefox-60.0.1.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "a87de8f34c82d35a5bfc77ba7a5be2c5afa6b5015d79f25280d162f9563cf8e48ff54386c03b67e4743a376c0d679f1d90b7f87924126028f2a4b990e7d28182";
+      sha512 = "17f8ceee4f31a8a37684d1319f9b84685c05f3f2aa0ba3a8801c4132c2f61755ef9427eeffdb38420829e92fbbd24dcbe54906de59d89ff149f055ede61b751d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/is/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/is/firefox-60.0.1.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "3b51c777930363c3085f11f3fd54a58a3ebf63a1a35384ec8d324acd670cb35e8bf8f9d1bd3b6ba735b63b5b2f0901d064e7802c5fea6edd5b36d7cc022cfd94";
+      sha512 = "9dc8a651bcf460e48a64661dea924d56d48e37424579b369ce4bce113d3a3405fd65f542096c8d199a2a3db42463dc28964fe92c42419c8aa5020084b82059a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/it/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/it/firefox-60.0.1.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "84ab4fc30b8753fd7586239b6f7313828862793581932aba00394ba59f6070a5ce69455a102f2ad05fe19e8cdfcd78de82d488bc31918b63f4d8aa810db2be76";
+      sha512 = "49a8881a2ae10544db31aba2a8f54bce5948ad25a47f8bd221d8982f12fa66cc7caa43e8c1963cc3ed156ded31bcc331ca0b2f784655c7ef0d8af89d7fd2c271";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ja/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ja/firefox-60.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "345b9ed332637d74064064894d34d32263725af9d288da3de3b2c05d2e38ee97355bba5a871698980d772a7b6847642c19716e00514d2965900f12b8a5d7a633";
+      sha512 = "9af0675507f54ec12924c29e051fa4727ea7b380ebcbb8fac1a91481c0405585b4e593324f72b4778538f0acc0efe8878f21f16a02272c5b02acc5ba7be7245c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ka/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ka/firefox-60.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "fa3baf6c474e883c94e5d862739e2124980e3d7cb7692dee8507d13bd1aaf389c849b218ec0cde02f60db479c1ecd32e8e444afe3e09c6ebb4e7afa0b273a2a4";
+      sha512 = "c5b52b448bdb19945baab604b820d383f48cf75a3fef2b8d734f0874d7aa8ba1e3ac6493e9892d8003371fde1bec8405cb1bb0991656b8d9d537e8c0b77a062d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kab/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kab/firefox-60.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a86ccc40c7a7460acf3242a8ab85fdae4146bf0efbae20ea44fb0251f18bbc803f55748348022ad5196c2347e3da7b79a03418ae281835af184d2245e4bb7635";
+      sha512 = "7f93bb78f7e57004fc22863d7dcd40f9407e32a606ff07bbc20a3e4e8d348720fff541d72d962d119eab70998925cdb81ab816086bb8d95c4724a9c02a723587";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kk/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kk/firefox-60.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "420956435202d7166c3d29c795974034b43c758fe19d0d55dfbd207e4e1862272a55a6770294ffa54a4cb9259985eac7f17a290e13a49006661b18beb7f27a23";
+      sha512 = "fc60ad4c8c2db9252e4975534a50b373bd5b223ea8ae6e6d2a7a07bbaa4834d078ef2756b40dcbab2cc4dc1bdb5feb1def890021c1d44620a179dbb10ec2ab28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/km/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/km/firefox-60.0.1.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "cfc262238316cd3dcab2e2a11647cdf3a7ba38004d4fa18f83286d6cf1320a78534cb88727635c330e6ca8c8608aae748786a83fb68484f6d2f6ee23cff603f1";
+      sha512 = "c6a544c825f3895ec390275e823da876113d74e16fe3c61838c55afae38b9ba7abdc05e28d1b66bdd3477be0e4b0b792fa2244eb6dfa7aa4a189da438badd823";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/kn/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/kn/firefox-60.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "27c445445080f6642d4f95022d8bd07824ea81549f80da041ad1273db6d4a0eccb9e1bdcacb89e269e69dc63a33af2c131f193545624771e25444e212592c45b";
+      sha512 = "c42366e72d38cbe3301d52ec5c6e34d5b623d5f1a06e8309cdacb5ed6b6a3a356034cbe95ccc5c6a8b320dd41e8a92564b66effddab4a03476dacf00acab3fc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ko/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ko/firefox-60.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "21f8dedddbcc5da3788abbc17ae07c422b2f1476fea3c45f173376b1ba38736f1a85b7d11bfc0e50ad610d605680b3333c39b18b89e9e4990086a782f8559881";
+      sha512 = "4e05c5d8956661956581acd8bbd93eebaa84b6d5972da34b976bb6f654a06d1d0286504350b89dc43988675a3a9c57890dcec81c4a39ad87e0fbd0593a0e1d63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lij/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lij/firefox-60.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "706bb394d90ac405773448cd4869c8880a649569d15af420e15851131194a014b0b9f72a9b60b2f621596d4215f606b3b81e0409ea4eff5da0c04a91691bd99f";
+      sha512 = "68120d34a56f65afe99930e32c0b35660c36b38d61e5f60f7ad5da131b1c95d02e241124379c11b6287d2f8794191d27ef1fff1f5c4eed5dd3a5df6f5a2183cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lt/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lt/firefox-60.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "6cf1735fb80b7fd945a2b993f1963ed14c903791dd720fb9821a728251b0c006cfda12f80f55e96bb821c7988f7e73144254e7e3a3c92a4a66680be9293771cc";
+      sha512 = "149ee7cedc772534427202309ec4060e8187a847b79dd686096d5ec2c44b1a0656e8c3099606e921942e8c426d0206551fa5952dc0e9abd1d510320fee26926a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/lv/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/lv/firefox-60.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "5feccbfe1088ed569e67e3a54f9cff0f7fcac91dccb8fa447febfd96ef2a4f25a2f51b8dce2f397b2b09fd8654bfcf292339cc5d25140a1892894425f2d86e3e";
+      sha512 = "0e630d9a09895fdb06c6893d7f9f3bfe3c3832d4a1682e2f12ee89611570b6bbca695bafd8dcfa583525645db86a156bfcf97afb575c44c19f801a43edd824cb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mai/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mai/firefox-60.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "0b75fa47591f6ed9cdab76ceda17636a7f666b6469e2fef948d29c77f559328320cb1108105590a240a0004976cc922439eaa800a5234f7064396e2d56e5a45c";
+      sha512 = "6c3dc9e2230a3f7d74390e00e661eca28306996cb8d5379ee7fde818dc09beb813ae5ccf09319510a1df84e3ebd45b7f1a8a08e776d046e39a69f724fbd79da9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mk/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mk/firefox-60.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "bcecbd3a82a66abc1918f03ff0c5da822526f3c1a8ad72ca9a021d5c036a382734251513dacef9ca6f290b130b67edeea5a79a37606ac34f34b27528ba7cffac";
+      sha512 = "60353c437af1ed116c5d16a4e5d57a1b99016a36eeca8f8e4e8379553a5374cea543dd8a9864e448028b2f188ae16180590da7e199ef96fad604e172fa1f6e55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ml/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ml/firefox-60.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "14d844aa0c430376d17224e0172234bf028f1bdc56b931aad2455c221affb93f1048866b8bb3418dd10fe12367178e7504842762fa9fff381a21ef8599bf9f37";
+      sha512 = "6065d13e781728dcf587a1389d3893ee69e7e49b601cccb293e2c13dd5e0b5b039ddcef5de3b8b61baf30aa0e994f44eed6f29b38c94b3b24df88f102b0721fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/mr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/mr/firefox-60.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "b25b3aad52c6670c27c977084cacaf526b4c64b24c679dd7f45f4ab583a80799912b6e6b9eac195ba19c94d70dc5a1fcdac46e2c1234fac777d706fa51008221";
+      sha512 = "ddaf770f926ffcb612bef6169cbf073ed4c624635d00db6edd3ac6c6051ebd9ab926ae48f2a9b92a5816c6aa2e6b5ed33ea90827f18c70b7364bc33d6ff9174d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ms/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ms/firefox-60.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "5df8c5ca3e8dec6b84066ce0c4e2db00d12cbf7c0c51d229a88072653166359652caf4c51e7470f06151d9ddda0075f8f53eebe2bd83e25bec9920db7654a97a";
+      sha512 = "4b9f1e63cfce7b99e05d54f99b7d42255f2e2875718e2ba0e173a7aa53113ed990f1547ecafd508a8547b696f036ec88826260545ab7a6b03d4acde8afbd1fc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/my/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/my/firefox-60.0.1.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "eb35f499f6d2ad6e71eb780767abef864b2611e8cf83669e1a8a08f6fdd098ea183234e157a5ea442773c45348b13c55b2811398a2440d5e579cf57ffd1620fe";
+      sha512 = "a82103f7dc6880e8e81ec3f0f9b07af4dc13de369eb87398dc977f2935387e489c6e61ff2f5a2c883d5d69ec24cd556bc44c722592d432a3a8f82420fadf11d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nb-NO/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nb-NO/firefox-60.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "bf8b5d719d507faed5f2f9c34d6a78471b16f0452286ab3f79d63d516bdd6af54186cb4cd896d09400da51ec4a923f711791e4040048ed546a0d30a065dac129";
+      sha512 = "4a68aabf3a6a085a8a7abfe705ee67b724243696e63bbd5a9324a1a39c2765db0c75d1fd8b652b78982702702fa1997831945e2eb56b059efe55d64d351723d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ne-NP/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ne-NP/firefox-60.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "e389da15177b36b9f480630e88491252b37ae1c4b9874804eda96a259fd8d0dd5c53975056246dbfb1ec8b5d47c90a9eddd2dc665c19dda64d35fb1af4d1a531";
+      sha512 = "760c819b44b1b2d694ddd5841a97f586c46fe2661c18a2d9f6831ae24a1f67a90beaf5592d8dccba35868a0e608f80b0a652f9c3af8e01601dbfe771d35c38d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nl/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nl/firefox-60.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "d4b4978889d9acd79e60c05f9e088c8850ef234e475bc05b27abe79596f74db47da748fa228b0b9706ff8f7e747b28edda36555dca8a3c8a70bb3a2ee147b8cf";
+      sha512 = "698c765c19647bbd6cf55e3812501131720ffdb485058e90e79446b5310d056ee09162253ee334535ff0eff2d544748385ea88d3bc1fb3bfa0044d4eefac8f07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/nn-NO/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/nn-NO/firefox-60.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "7f27fefba306c82b7227889f56059d271623ac40af272ecf810c53224cdfca8a79225bdc1dbf267be8b8a4db4a5c870f5f969f0e30cb3bc6488c8ce101c43bd5";
+      sha512 = "5cd75409e8f952a681cf7485860a0c45bcb77a9b6f3d645f27b34560802772917a8d29eb465b8eca2fafdaa5db1cfd5a37ef2219cd14444296c81b1c53008375";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/oc/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/oc/firefox-60.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "f5dd23837b4c6d60a3efece4f70fa4ad2c69a0d560d2dba884ca0bf004619c26aca11348e4eaecebb0a92c46a835ea766b09a9734f7ae34dab88c4849aae5151";
+      sha512 = "765bee0da88cdf168a37521e94249e14dfc80f72248e9d6805b098af8d99801ba38b96eadd6461bfa523fc2bb9999652ca2309ae9fa9202a5e5e00d4aecb506c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/or/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/or/firefox-60.0.1.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "f3224d03f3a264498167e62fa8df8b1d4ad0cd9de07f9bfe26eb85977214a00d64daa0d3ed8ae9d2d4ba30e606bb006a0399918dcda34d6eb5b9009eb3db6dcf";
+      sha512 = "06fdff27a007b45357d17f77fb22b589bd2f0d07866e0f64f00af46a1403f7375df82cda101997d008882232ba34043f26e0e8db0f796bfe30d442eb990ddfec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pa-IN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pa-IN/firefox-60.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "47b347b899f7300a9bc9fb15f00ea5b05ed26f422b4836d24da1a795b8f35fa8cdce292fcd92b8730e54078318794cf942b27425c367ed4090f3ea9237611cb1";
+      sha512 = "8a416b28b1f2d73865d151480ff329843e53ad45dea6a1e931fa6426d1d448d47b6ef2e8cf2125d7e03c69bbed90351bf6fe65036be490dbe7688598eb01a8ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pl/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pl/firefox-60.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "844eb1c7e46ef7bea66317220a6a57daa0cca6022457da4184550974cb9f616bc25ea01ccd8f158c3d195d39e74cab4d04f51d41406a9cbaffb423c87ea24b3c";
+      sha512 = "df635d41fc27ccab2eb30d6b73effe6ee33a44f543fa0f7cdfcb9e2ba8a70ba3a5608a914bb80bd4f450b623d3d6b05e0d9cb250a660560cbefdf98d501425b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pt-BR/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pt-BR/firefox-60.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "ba3418e27df6f0e037c37d1afde5e96c5415257fb0ad70f95bec98d50084f8f0aaf1a5d8752163bfaf00b390db6d0dfb88867d3afe48bb246664e7a9361b2d87";
+      sha512 = "b5e23c79428ab50ee97ceb79305331cb36b19f9f76b8473a53f83e669178eecbf06fcf79d067923147fda14863d56bdc157d1123b50cf64841ef3d8fd77f7cd8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/pt-PT/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/pt-PT/firefox-60.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "6f675e939407e19ddea4962e2f8cb0fcfc7f573ff76689d1f434416b02024bf8786ad78b03fcd4150301309fbfbb91be078340a47d9fa413d2312c6b8aebdb8c";
+      sha512 = "03e3dc135b4d0d8c74ed9cd087edebdf26b256768adbf42d3a8e6745b438a9e617d717d9fa68533d9aa5e7c07c64ed42540b5005cd1b36fa04e9912b4e046090";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/rm/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/rm/firefox-60.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "d6623710addc98457977ff62337a3aaccf1953874e6df5fb6d4ecfe2d7650920d5c1d4593793f37b5397e688ee3e745ac7007f3925e0982b7ce168f5a1fd90ae";
+      sha512 = "74884aa4baf61bef8707eb94c9cd523707426ee5c5e280a2f18ddc1cb5535d15a83c7125b4734e3472c9e0ffcf2a8aa7837b9c150ecfc2b1767ee42750cd2a3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ro/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ro/firefox-60.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "38c6a14a6ac375ce700cea3853b4fa208929ab6814bf2037c2b9d03b15d85ce81833c09e889ef5a8966c61658055fc11e4d1ece2a16370e7436adb52ab321bc5";
+      sha512 = "d245c0322e0a4d94b3a837c75c8b800505c82472363202520fdc99d0db04b2830bbf522bf1cc63285d103a0fab22083b8dba93c1117df78ec8ccb6c03cb36633";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ru/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ru/firefox-60.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "730d26ce8e54b9b4e8379c475e6db9bfc293cd6bd233f566ac54ef6512f3f3bcf687b18f8a31f3869821a9fa1d26cd8e6149e3721b5950ff7633a645df4df8fb";
+      sha512 = "1ff03c04e419498d3e2ea565c02f4716f41370fc97c24166e54d6a07d92ad6f0ffb6ba13f708e4079d00a4c98fc24e36c278414c7b638e29cc7e5f2891417348";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/si/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/si/firefox-60.0.1.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "37b72c9fd02ca03087458b58080da505fd334fd7059291a7d83557212af0e30273ef002a3fdd9a8797e76f1178fba731c127a28051b1bbf74f570f13d6d8064f";
+      sha512 = "4467d0a6a69d7ce89e1849d1cfaa81f2588cf8019e50a5fac6f292a2a50c55750130e885334659f834190969636ab74a3af97d6175be5f88e45b97cb772a55e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sk/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sk/firefox-60.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "5ad4c596575cf5ee63d7ee6c9df3f9b9dead8fe41fc66dd09c010755d069f2c6dc2a920ce4cd82f23df7a22d600aa502b3accbdb05976ad5f08f1ec19772fd51";
+      sha512 = "1060fbd4bf7f83c851d74773ce0277ebcb7f22769ef95b75775d7546b3fbad930e2a04deead17d37e5bee69f39aa978b65c41e20862235209528bb91a776550c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sl/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sl/firefox-60.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "5c7181d319b5bc4c9c731640360fec12a862975fb8d6b59f913a9a113b88a65ab3b9db9ff759f9faef6088f25c5f59462f0f82b62a8e5115836f498289478f6c";
+      sha512 = "75f0d0a4af65fc3f3992cd859c7f7f7a9292aa4f0e1906fd4e7bb4106edad80f3cf086cd843bb526cf2958cdfd94403fd110c83d232c533b105e7a79b6b01b06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/son/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/son/firefox-60.0.1.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "f1ff760bc5516ac6a5beb251d541e38cadf0652ff51f9f1798b9677e9d3e33c844d56e6397288c898ba38c6bfc80129c7318e1e9cba3ef9ab4b9f07405dd628a";
+      sha512 = "4f5a8dbd2c60874a4158a4f78b66377a193265751c1f7629836c789ce0abb83de85ff1bee97ab8708ef86bb123d0d2ea5bbb2bb21fcdc52950e1c1164fc13684";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sq/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sq/firefox-60.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "d57cd7cf4669cb537d96d6b9b4bc81446d7e54d6cc294776f2155b1280352289c1afc3d0b2744973280bc980c4f6200a0cf114e449c15c339535cb30ed153766";
+      sha512 = "5b226608e43a7fe4ae8f23eced67af9f512adda9f70c4f33b81f0a4e779e78e9301bb5e95a4b4362ee79a04ac5da81c36005c5b4e903d40f6f4af84b5503c113";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sr/firefox-60.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "2aaaa459fc730feb75428dc4af773d001bd18fd0afbe564d919925f159cd95abc22a21db9919a0c3f16f12ffdb30e8f0d91c0d3c113578804c35a1764b86af1b";
+      sha512 = "143de2c6f87385f71deb0faf6db20cfa5680c5e3f682e89456602f05494624d22db9c577b92934cda98e041f27682103d1755864b0dec5bc3b2b6d9121133532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/sv-SE/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/sv-SE/firefox-60.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "223f00e509c53a88f102c2f9da9b75640bea329307251b59aaf2ccc759fa0246701b1877c400f3fef2337099f2c070f33ffb92c8313612a384e7f5ec7cf66ffd";
+      sha512 = "09e52958d73ec2b32331109a1f1d9798493cecae739fde6542dc4d6ba026b4d2e1d1f3816b4d2b16d71faa3a3840417329b97eb7a8c0fac2cd168b159a61eb7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ta/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ta/firefox-60.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "910ff3e81fda8c94989b3d6cefc5ade22ff0dce21a81907e84f1573d631253ca3b3f45383552193fb46875e09b770ff8e28fe945558fd897bf0b64bfb4e01004";
+      sha512 = "72b0e1a7b94eccade119f7e4b251b803f4f0c54783faeb506649b9048d663698e084e15664baccfa79ad2f6c6238a19c1bc61bcf840fbf003df94cd62ef38deb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/te/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/te/firefox-60.0.1.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "3fb89f3620d5a39a44cef228a9fdd11362bb3bff59fc64815468376221bc151e3538f929023fe634a163e0c7ec47c45c54388d4f5dc911b53a3f2565caaa6edf";
+      sha512 = "0478768a0e6b228ad924dcda9dca83fbe2d51646503db931ae4600bd107fa15c8f1bcfd4034b6201a72debf561a815c28c54396a45100dacb68d9f04c2c0a45f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/th/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/th/firefox-60.0.1.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "78a66d69b6225ee29c5c1084c9059a9f1bb867c22886ad42e628fd7e0316bc2eb8eb02522972817508557f1be5369e00ba489260b7b6882a4f12448808b9af16";
+      sha512 = "499aa56d62d5293e050bc67a50feefaf5019385291e4d3a602f35c1e8b58937acaea893a36d4d77e0e4eacacc3c406054b9e81bfe8cdb27c687b4cc6efcf1b2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/tr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/tr/firefox-60.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "afb9c372e5b1f0f69c53b4c0ea9dcd8ba73672c163bd63cf88b7d8c9bf24af3656a924b29c6b3e28f826ea710c452cde789ee68e0a80bf269b034428ca2de577";
+      sha512 = "8c3f26b9d37e47e3445fb14ca547f143961f19eab66c93ee4a560828a4bed3c773fe09d2e77c350effd76e0a0c447a0121c9ed29774a5ed93de3d707891a024e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/uk/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/uk/firefox-60.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "ff3cd139b34652446807063c4d68f4a5ff8b5643bfe786527114a11a4cfe2838f64ff151d5d77ffc9c51e4b057d3f1058dee1dde521ea95bc9f17392a641c5ae";
+      sha512 = "ef7a776d6aadd6d9c70594260679810325a4cbd11002bedf5e7d58d36bfc82f72c3c2c352f0d693292992ad6bf9fc323e5947183f6c713f85c353ebe72203b7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/ur/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/ur/firefox-60.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "f075ecd1d15e9737ea6079c2dad94f7e3bda9503ae8a17f017fba27c166f1721ff9e5956c3a7a3704594d8f4154f9e11dd2df19630aa735aa7d3e533283af43f";
+      sha512 = "9096d21d134c2e55d694ea9a6e06a669e636b15fc4532bcda12b9944d38eef325e256106004e6f9fa503f5590e5077da5f72a535b8887501a53d4a8c9c0c4c55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/uz/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/uz/firefox-60.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "8c885715f9df669d79fa4c0b0bc054c4e760916ddef288deda943ce372dfc85693a2297ed591b4f540f618e4044321fd3812c9fb037561969a11a7b472dba2ca";
+      sha512 = "d856195097a7923d42a7efb257a9758ce4bb5ec3d93de798bfcea1ff20dbbe1664d71fcd8bc72dc9592bb4c4e8e45a041164fb9b9174c2c75e2c04ade968e532";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/vi/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/vi/firefox-60.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "19b398ae13e9cb74f61fbfeefe68fa8fcdf8785fdba2dece9e2674900cd9ab71b401029e1f1fb91174c9996e65522eabea975d3bf9d46de0f76c29d0ff6d3812";
+      sha512 = "7ce9b59b89c77e289b56ee8b358409aa6bca3c47b6be004a38037f7c156834213dc5704e1ffabe3fa86f1ba89243abb6efa2fba31eb5bd1f4d95e0f225d0253d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/xh/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/xh/firefox-60.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "e236beb0e0d5a7fda5c6bde0141884a0d5e09628e579ad0e31280db64d2f373946bba15fa1fc40a7c5ac7d468896d9e7af41b587378a999dd7fc1d9b89d7a11d";
+      sha512 = "7dfc5627038c97188e4875af30cb88baea359463d5bd47d11440c9f33f84ad4168d860e947e90c104ac647a09f3134892a394b8a8435639f71f7bb9edd92bcae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/zh-CN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/zh-CN/firefox-60.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d4865b13e94ed4ecaddee1458700ad6ac3850aed5c5298761fc1dee3b483a302a60256ceae15fb0b8d2b212420aedf1e66345b951dc90e5d8368242bcdd0cebb";
+      sha512 = "75d8a96eac39c0c60814718929997e9d4a60a2fd273ceab744bead7164d6bbdbd8057a94a3310709da7b6287549cd44f6d7dabc4bba1bfe1f48f3345193cd142";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-x86_64/zh-TW/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-x86_64/zh-TW/firefox-60.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "2165c1971c390be50a8af0e7a17766952a28c62355ac6c017c0871696b4073dd164795b3a347c3db99fd6b625f02c7e1ab8dfedb48943bcd50a1fcd46aca797d";
+      sha512 = "d0465db2b3aa8a52d8e60c480605c069c31f0fcf80cc757980022bb538c0509b99563ce7fd06f2660dc8169dcd3fb6a8681859218365a3ef2ea822eebeb29e12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ach/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ach/firefox-60.0.1.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "ae783339b7f51f9e7fdddd36086fee47545b0624d42498627b65233bdc157cd30b2efd2272e27699e495b617b888c6c0a179d9026b7e22b5f96112f9cb520837";
+      sha512 = "7770772e90d57f9bfe30a5f965cd89fe367ded55c4fc146da547d150c85d0fbe906fa092c2a62ae8df3cccd5702e6a7b1b1680e0522e3164d1df20d2538993e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/af/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/af/firefox-60.0.1.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "8591da90fb08f30445457e84464219f47e685b973b118829878e5c9bda41a58296190f34959549bec9cfda400cf4dd29b2bff99b8411a3f255b04da4f67789b4";
+      sha512 = "c615df0582484ce23cb16556cda202cdd81056d197a78be02b31d3f71059644378c2e24cd42b4afcbb0b610a3f25d87aa1178671ba04437a0885cd90b0954f97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/an/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/an/firefox-60.0.1.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "f60502441cc1d58194329d9853cc5d893ef1255dbf0d07a9344d9d49ebf328473bc978a5cd8ec43de5b57751b698774e090c2ee471ce65423f5a33750262c280";
+      sha512 = "ab0fd2292c5aac5ec5e1669c49f0aa6568f0c8d0bbea8c20c18ead6a52e88ddf08e3ca44e24386a9a0102f0bd7eec12b9e2b9e6713a3958cf13bd978106f7009";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ar/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ar/firefox-60.0.1.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c0174c009dce15fc2836d28cf80063e04ce34d12c04ce2230c5a9e01bbdcdc8073856601db45158bee68b410c4b9d9c53c78bfbe24c8293536c866b2cd13c3cf";
+      sha512 = "dac0df9a18f1a7d01c1caf05e17edbffa6029733c6d439c26fed0b12d1fa8ad325fa10ccca51cde25ada1f76e338c0e6a8792e400f0ae44771231a3a49a33a8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/as/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/as/firefox-60.0.1.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "19f81fb36908e5959818c74c0534d4189025b061222bcd01745033891321a2931ffcfec76a893249a8e7026489ced55497c00ef0dab156416a644a9b88c72a05";
+      sha512 = "d57627a4cfad823602cf5e243c5a1c1d8e5e7fd5cbbd345cac1db7ca23947fbe0dfc8a4dad223c6af8b5059f3544a34afde8502ea29f9ed6e41623ce4d856f98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ast/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ast/firefox-60.0.1.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a9bcf4be3e09509d34f70ea2cbffd4ecbf3aeb15f535080851c63aa2cc8e473fcc9453ef76d25fd525ae79f74eb76a6269919261aff5e8637cac139587b92c95";
+      sha512 = "32bd3dcfa0a8c63605aefe54a3c96f2dea826d41edce8c71bdc4da5eaffc2b303c8f1c057ce0a4c6ce5d853d4ef55484b5dacb51f27dad5e50b96cdeaa2298c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/az/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/az/firefox-60.0.1.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "14dc7149a69e6dce184e4526cc31f1a8d2f5a833c49ffd1c0ec51d67e8746d27334fa49abf9d487b7656b9f1e71ee0f24e7ef69b9888e6da640ffeab1da12ef0";
+      sha512 = "e94f419ec6a34100242babf4afbbf23b98106748b7c2f02b83ff4b0a396bf5e003ec1bb3ed36feeeff82c79fb17c18918ee6e9ddc038ffccc0e121dcaf0eb1f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/be/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/be/firefox-60.0.1.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "38dc8e028feb9a523190346b01b9342e865af18db67eda7dd65189087ec1302085a141c708da5834339f5abb36e5eb91cf727eab1dd4feca3b4fda8035f8b423";
+      sha512 = "b23cc179f2c4c5b3d79f6009d87f4772dedba67150e014b792a5d892fd1e09a413ed405d86f82e9f74a1c2e36ab76b2a9e41bd49dc7d16483749d195b56791de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bg/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bg/firefox-60.0.1.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "d8f0df46d689c512996623657d3b2e893d2a465bf22be0679c1ff9204e8e773172f6a857d392fe2278c59c44e91eb588ba4b035b1dca1540ed59645a9d8708b7";
+      sha512 = "0d8abaa490719185579d4c24b02ce38971191ec13bdd1798966364c2f9fc118bf46dfa4ae0621d1c6427beeb03f487a1ebccb0a4e49d6ec93372397de56c4851";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bn-BD/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bn-BD/firefox-60.0.1.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "98902ccb5f3b34e3dfcf101c6f1333428a6a1579d5c5c390cfc134fcf64ae0b4fdb493094bd654c39e9e6708bcdb1ffab377003544432a73e4d80c150a17e871";
+      sha512 = "db9e15472c21880a07e1337e92fde44ec19a8f6297992b589f20bc05ec37140c41d65097f1759734b9ac13b75c806996e17c70bd5fd0bbe65e3acd6a0bb0a854";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bn-IN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bn-IN/firefox-60.0.1.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "d2582614773a08192d0ef87eba9392dc4023c15affbfd14227b642ff93bffa8339fcafad0ef0ee8428c8d5f84a4e84f67af376cbd2e14f187c37a294e710dd12";
+      sha512 = "2017273b405a8ff2b9bb1d1c1120c74679a1583ddee9f32e4643f62ef22fd3174e4e01f22e374af92b9821a550b8711d2b65987c71b44215236c161827f679b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/br/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/br/firefox-60.0.1.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "62457d015c193a77d12bfe58dff76a23c8b71e184965130699d7d97ba9dcdac47cdbbe9858e5a571185e4c56621f5aa4d8ec01a8c081f6157a98c6ef68ee90d9";
+      sha512 = "9e7648e312d78397bdc06b0a6921f76acf1916c28c8ae05aa9dc7c70c83d522898ef7e2e847cc3c0cbb19553a572ada7914b60424a46d57c0d7fc207941af3dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/bs/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/bs/firefox-60.0.1.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "5fe3bdeabe8804b4604440541565fd45854c82f421714a182b93f5b455935743ccb8f29d7b177316513a3f86bf31f549bfbda296c68f5808071dd3f74744fd4b";
+      sha512 = "6e93cd48d03f87e027e913199e0e7b99f5d66d2d81a4d7da52b8f6a38b9b1e43d5ac5ffa56a6eb46c921a695f1826c6f5b936d4622aab3501e6132da26395888";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ca/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ca/firefox-60.0.1.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "05240abcb093d8a643e636f05fc24f58cd79aebdfd9050dbea00cbec8f25bd61f521f4f85492df0bb4b7db1a69b0d73a322604a0d3741ebd88a3c961495924e8";
+      sha512 = "0e49140d11167e2b6c7d15f75f2b121ab44afffaf1af9135012314c9234af25555a5e18a7ae866d3219e6c0c6752f7ae313f66c7312959fc101c32e417feaed1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cak/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cak/firefox-60.0.1.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "9bd35d87ee4b3e0d867088c5c788c3871ed6c1bdfb5443d7cc4c88501a59a2cd16d58ebe38343d7e9789292ef9ba1392d7a26d86dc56ca916330cf91e7e859d2";
+      sha512 = "75c5532e9ee936aa24c5fad77c96fb8aa9e84d3531ac6d36330fd3c324c8bdf13f2e7f815d844e639fd06096c6203e4253c9d97e0c7a564b0b393543a892e56d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cs/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cs/firefox-60.0.1.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "643daf0dabf25827872158e746355b2cce1df12b696e03e2e1e1ee9beb70339eae1175c3eacb31bef8af45d82772310bbcda00fa4d19219421c636a79b85fd0f";
+      sha512 = "32835014bb3b7acb93d566710bf52ebb3bde52f9c17f4b4de64ec598e4a40b9ee8644a2c1866a48aa6598ace07969912eeb09a47811d67d6cb317078e8e99e99";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/cy/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/cy/firefox-60.0.1.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "3742cf47692ef0a6cc3597678601c260bbbcedf1828286ecef73c55b51113b63954d8f1577050f7db647fc5c520c080fd476e2b714c1c7fc4d2a2eb7bb5ef450";
+      sha512 = "7b29c7e69a18e817828fd7cfc05faee51a9f9bd1b229a1943443cc3676b4a3e8daf4b52232633c713f0cc3ec4d9ef43a6dae0ec1dcec66caf0ab9d67b1be9467";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/da/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/da/firefox-60.0.1.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "500ac0b682d60e92a695da8b63c87414f2d86f48fea269946b978fe2e1adb79583c813764d039e2201736d367c86dd91a2ca62a555d3355d25b7c4dc96f9fea7";
+      sha512 = "41aa2e220651b92b8aef3e868d1b9080d1872841d5b82cafa7c1f2d1b0db063c487198949643d89fa0121bfa4287b7dcda99c245f8095b1f3dd86bfe960ab257";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/de/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/de/firefox-60.0.1.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "4d0e210832d9a3290271b804bcf3a64c125764c6236bb84af88988c8ffd0aa57ba7e1060985005100476f36a4a93da93469717634665a634d726a1eda372cf73";
+      sha512 = "7d25282bb59a627dcf09b39ca15777253593c4b91e61e6f9d4d2138426cf8ee16f6d8e509398824d8697e42eb301db29e6843eebfad5eaee1fdaaba5fbe7f76c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/dsb/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/dsb/firefox-60.0.1.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "39b5f2aaf2617a021d15a9da5a3bdb9ce5e56b28e8d61d7d422d5e95918fe10b5608aeb255595f9f92879fc48686337dcb93fc5b8e4a04610523156c8097f579";
+      sha512 = "1f1245297135c1c1550db1ceb110546bc0b436ceaf364bbcd531f6df4770ab694c1602de9f39bf0d9083dccdefa1d5fea21cf9f4e46925cf1357bcc5043f8926";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/el/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/el/firefox-60.0.1.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "bc8d884f1b850d0b76625d4abf1a919481d23a0632e89396ade24841d7bbc9e23eeabed768b7d937bd7d69adeb2146551e25065251d65021240459f197a6d533";
+      sha512 = "58763f729f19722446e87dc7f0e8044993f9cff5b7f707c3d1256628d00011c48973f4408a8cbca67551b621f67256a9596d91f353ecd82482e3b9278fe8b687";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-GB/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-GB/firefox-60.0.1.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "905394e0add0e530b4a0202237ce6c77bbc124543f2fada77ff6d578b52deeb90861ce4b7df907b9be0c12863b4aea9f545ad55729b83e713cdb556c7d1c4404";
+      sha512 = "d51d6942aaed323fd82eb833a84ee13e4ce8b2d7c461a5bd1f2f48b2b1ae8c9d900280bd21a2891455bf17711f01cbbe70e793f18e3a0c2e9b15cec274c3da1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-US/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-US/firefox-60.0.1.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "75d3f38d13033717486a7b9cd686cdda1dc15d2064f47311b1bc4c7cbd4c1fd783fb1b8298751360f1513e74dcd1f9eefd73967fb248dc52e26bbc92f5914b3e";
+      sha512 = "6c849a9fe358e06c9db01fcc1f811c9cce59cfc150423dcbf8f83eb1407113378b25641de67a8ce8bfeea4930937fd0ff4e919648ef80b219f84eebc3ebee546";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/en-ZA/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/en-ZA/firefox-60.0.1.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "9ce1abed9f7bc0debbd34e70c036ae48afe36d87b1cd4df108fd5ff698b3d8e8b32cdf5c8d9ba8b9bba2c7113eddaf9f7a5d015e1b908b47c98f066bff644b40";
+      sha512 = "42280dcb3627c457097887b51a2530eaf32850c4b01e25c62fde1c89e3cc8392ad29ee72ed8cdec11d78f776e4d720235e4f33b21883cef0c4c99823f26c7c10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/eo/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/eo/firefox-60.0.1.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "bf671aa74bd9f22d56864b46d12ac131255c43b2820cda77264f08c48223627e4dff88872240b39d6404a7cec2135788ce5b08506eeeee571c14e2d933d8eb35";
+      sha512 = "0ada2ad4b8ef63b0881d1249b29a39aca65bf2714614e5c074d80d8901124a54d63ec5af4301ffe1483f4e70c6cfcb62db398042b8d12005aca7d95079588065";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-AR/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-AR/firefox-60.0.1.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "b282c35954eed46ddf46ed1f0e0ad52440811f6bb0b351337716eed5bd595c519792853003a6f7a742f83beb5231abe8f11deaaa176febe2dcbf84a43eda4077";
+      sha512 = "5c548ab1b0ddbf832d0ae42ff5bc6457ff7aee08b8ac3e94ef65a0e3ab326bfdf6f85be8745fca64e66efd2b45ee992499ccfff963ae21308519fca1bc72cfb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-CL/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-CL/firefox-60.0.1.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "278245defd36da337383e6970b8afc59c37b207248638db8947a8fa970ca025620dfa8c8045ac2c0f53b4f3e8167425c2f6dc2071574931b43190560ca511ad5";
+      sha512 = "509acc1e54e03aadf6c2b1b21d0366d52fa02a51f1983107ef88a7a175226021a574bbdeccc5715bd63ad596f934fa69e1c10bc0122359409632d06bde63f14a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-ES/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-ES/firefox-60.0.1.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "f0fb467bbace051bc229fbe07f21f29db492d35f3901cfa9b488c72f303a5dcc85a7969517165980ea7182a85c45a3758a7ceedea3c51bb8a31b9e81ae197214";
+      sha512 = "e23028c9a8234744001b267ba43899b2740b63e5655ff289d1e45b1132f3fa97e28d7d800bdeaf2d016ede782432db8f7cae1dd8598eaffba3899c9f7a99ff37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/es-MX/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/es-MX/firefox-60.0.1.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "9a0bfa7ec953da8564b34d0e17efb6935bac51399f604ede83f4c0497494a93ce087ea35daa8ba0c52839e8722ce3bdbceb2e1ed17810f5816c5dbc9778bcd72";
+      sha512 = "a5974914bf0e664ee4dfc0ca2697be5971563e24249adb6b7a7528be67329ec43005fa77acf9bd51970776e9da110019d8bc353a4d6cbce3a27c122399c88cb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/et/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/et/firefox-60.0.1.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "12209ad383627aaafdc4a89b462494f23eb239c736d5f3a1f2541b0ebd5487d6348ac63ccfd4da40df9c8bb929c02a9a54563bd6c53ec5dd87edfdeaece0bb5a";
+      sha512 = "9701a3d97558c3a6946294aa3196d816ada9c721d72993a2b10be24640d48ec37c5675abe3a42df9ca986e8b92f3fffabe0649d3be335e2e557f39f63d454997";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/eu/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/eu/firefox-60.0.1.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "afc9e8e0fed835420c385f0c19e81d1711a8c99a7b02f1a8e09218ac2a30aac6380ed88040e96a36edd39a057b98581cdc3a043d6222aaf30bab92ca81669729";
+      sha512 = "119c5b59dd5520017334db3ff95511ca8ab2d674dfbc85f0cd6f77fac919bbc0e99af18c59f05fb6cdf75f6015cb83ac24d15d0cf4ae3a2b5ed7564c8bc7bf9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fa/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fa/firefox-60.0.1.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "6e8821bc7678a1d486693b2043031064618ff06309cd5b0dcaad0c9b712a312e43cb948bfa0e5e5af1eb54ac8e258bb6a5464b1369c9759ac72803709f5d86b3";
+      sha512 = "c45fa6ace31733812411d597362bc56f4672fb7a8bd9b127eb288d7ddd2de3e129721c2ec44a08d8adbc8c15672328ef62384e0139a1e37c6a12ba9ae35ceb7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ff/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ff/firefox-60.0.1.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "ecf9565c6d6e8442836dfb50f1ad833cf88ea9eab884dd3d2fe6f1296d6230658093f27e30e953a51c2bd6ba5d69823f1f4e3f5457cc40a4e516b14baa17d884";
+      sha512 = "cf96e6cdc941ec347036b5d737d0060a892220ebe6f72a71354a21099a7c82a0fd337bfeb6e6eba53d95af88754687888abc4dfa307348d5073315692a4f3496";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fi/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fi/firefox-60.0.1.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "ca10ece92ea7114a4c91bdebadbab97933232f8610719b5130e2658600b9ff7667834708a992500f31628249bca5c585f08fbced1e98ff31e318a20b68d3e27c";
+      sha512 = "0b4bc6fc0559c05b92e42bcd11513ae20d2101384189ffcff337cb017bfbc5a90151e5c4b8bfe29442ffddfb48eba552a06b3a1db24f7dbb78ff45bfc6a4b5f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fr/firefox-60.0.1.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "2458452a4c239cdc36e744e4116791a310f2a300b913b61dee64e20349dbce8c0290e544027f0b9eca6d50dcc57561e63f4c618ef5ece9cc05815337ce639498";
+      sha512 = "0ce803471b565c8ca715b1700a54be80894205434060751c31d8696d1716f3d3b8fc19c5a0baa82e78f7ffe0df462780e479597c975d2c476b10540de1e98656";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/fy-NL/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/fy-NL/firefox-60.0.1.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "51cf096cd74d98bb081f9d397ff7eebc4624bfc4b90de8000bdf07dd739a441543d631dc783af1bb8aa3c639492aa1e402541ea979fd7837535874d8a4adb771";
+      sha512 = "3dae49cc320f46622ec92d7ad948455a1861f8986cfe9b98bc73035fa41ae44c9b150b9223c037c87c42c5d93c62bdff40784010d2e7f8ee6ee8fb7725c3ee55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ga-IE/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ga-IE/firefox-60.0.1.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "680c47e14f7c6a1abd94ac73bba738a44c0bab8745176639283efea617974c40efecf5b43538940c43599bcdb21ff6c4cb380c3c53c0c9915fc542cc647240d2";
+      sha512 = "9bc562d1e432e6e45e56de1238b61f27303fe5b475f0ab0528e44f7c15424911b6b699b08e0386dec8cc7c15df9345b7690361b24b9d467841df63d5677392f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gd/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gd/firefox-60.0.1.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "3702012b6a32bb9878747d85a0a66c69ee68fe2eac25be428b9e07081a90c867cafd70d2cae32b48229fb333c3f3dddc339f43212aaca29508db33f5807ee6a3";
+      sha512 = "fd343b25a8f07fd3d5f276372bdeea05bd9692b761051c9fa968beafb6518619ccc40e2d69ef00737ed4da23f092363ba575099137aec85dfb7f6a813384ca7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gl/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gl/firefox-60.0.1.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "bbc4986b7d03bd11041e969ef8341023a95e2f4a524c6cbd2290555ced2669edaf89971bd58b30b8193dd880a068d9bc8b2c0a3b16310a678b19e3f5e60c3c65";
+      sha512 = "2be7fd719d946a96325e684a14247ea344e9c5e096378f02629f87bcc1180d01010cf46f3baa4edc2cebeb4fb99aa5e1d79c24e7b2d1c4d5da1c747ae884be3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gn/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gn/firefox-60.0.1.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "a27c80bd7041fc80939716b55c631796e2421a5bdd05843d411d6f0dda84a636fbd366cffa214fba133635332318af2d2e67f5e03c719b12368437dcb4341142";
+      sha512 = "d19176ca380d778ed407db04712d51098b57090487564ffefbe0d2e25c4a35596e3ba2b10b9d179e886f38a4d3a4fbdfa7454116a49ec82b6701678c3af7d8dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/gu-IN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/gu-IN/firefox-60.0.1.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "14edc663057b200f32f9a4437c0141d079fa5b77eeeee357d3a09342299643aa0ee5146c6dc2fe0a178285d39f530c58c456f8bf6533e7f901cba551ad84f1fd";
+      sha512 = "d219e58d9699ff8b3d87822421f032fbcb4f8c3dd7c13b928e7e8a1661d0672cc1582ea55fb348fb168641307d430d66aaa7912e32a9ac1c78091e3f46867723";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/he/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/he/firefox-60.0.1.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "ce57395416083abb353c45050b6f6fcc8c7b9affe81d6e8504b8c6264b806ce33a44bc018918df92cfcdef047d31c67640074c63447a76c65f5928fbf6b0f50a";
+      sha512 = "cf2e5f7f7da94e75f26be5fb6c9e90d089dbab94779fa026ab61f87bbbb0e6ae75e16160c65f19de809bf6527b9d8a92bb0cec97ad18657b07ebb107b88edd6c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hi-IN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hi-IN/firefox-60.0.1.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "a3621b49b47f835381df92712044a1d9d4655bb0d4a8502841761a60c8d00f0fd0288b8a6574aa2baba88ab8cfbe714c866bbb493aaa1bb382f75ca069f1a97f";
+      sha512 = "08626ae0313f7227eb144bd264a6f9c7d2e041b88fce8f1ea182bfdf438496ecc1899d9caf76bf00b6ea25604fa6032807766a93de088764e17a2c8449bd548c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hr/firefox-60.0.1.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "49cb57fc321b67e1b5c9e516b72d36025d22abfdc49bda180cca0194cdc0465be5c0e7edd9b98714eb3b1a7c0a1946bd28d8b9ae59e2ac4e9f45d48916cbfeb2";
+      sha512 = "1c9e3ae0e271ed1ed332fe1c6f820cd0ebf0cb01e86ec713b9523a7247efb8ddd4c6d5f0dd93d5522adab2e18e1bcf9ed44ed2a86be03643f1836e260b498524";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hsb/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hsb/firefox-60.0.1.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "c8488108906636a4a93447ca28176013e161c56e86d16b535cd73bd27dc568ce22fccff1d26a520a76578c31d870637afcf04ae9e104fc6b347701d4021eb98c";
+      sha512 = "669c3c36fc77359edabced7532e558d0f4e24fef66766b49ca71b4f32d19cc3a1856fc92b716de8507d742905fcb82d6d23f62d542f5adf151a95b99068c7195";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hu/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hu/firefox-60.0.1.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "69bc30e00e39f2c3ae4da333fbd48a595dcc84f7e9e2cc0691e04658ab02e48d2ac6a1e9194faba7a0c28df3637ff9d213708812436200213721136775243d91";
+      sha512 = "c84788b5f7c670e0a0afda91f47d91f51a40e4441522e049b850bed89908363c74dfea7c9023bf3d54068c1fcdb7752f327f57b6f8812e880363881434f893f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/hy-AM/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/hy-AM/firefox-60.0.1.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "155c1a34a252cb1789c85ce4d757f483cc51b62d1f8bbe6179adfe5642a9693f1d202240a1765c5966602c03f95dba5c8ae58cd9a0c98edd65da101e61593cfd";
+      sha512 = "ca81e92cc2ddf30c55dbf7124c4f11f0c2dc00466d17e8f518d2969ae57e04e2a543118756bae3e55bc72e668bc9e78ea1e11d952fb233e43941560720cfa90c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ia/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ia/firefox-60.0.1.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "7e603f5d72c0b060404d6639858051951a4aef9d61f3e1e813e8c0167896e15a4b837d6f0eae5da8b26acd8b5899c7a557e5e259a797b096a6e6d8eca2cc7177";
+      sha512 = "8914b9e45e37602eec6aa20a77ed5c9cf618b0c5d789fbe1821d13ea909148606923d1acbb79006c3fc3e38a4657e926eab02d91a1f47717a9b6f527c935c629";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/id/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/id/firefox-60.0.1.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "82179d401af39f949057153062190214bf294445964a6d1c63102da1a7f94ce3327351e6257e82bd66c4586791a73c11e2394207514cab6b8ac76fc7f4a2f147";
+      sha512 = "ccdc3eceb51e7ee33f3a49bbb752055bd000152dfe3af1bf9bd7d8a617e217c8615bea4c3ce1d8bb51ab60477956867f5ce93bad472da47fbf47404ab0db9524";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/is/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/is/firefox-60.0.1.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "20237dc74245241a289a4a51964d19ec0ae60732c2a528de412d5ae70aebc1b58c4d4ad514109c01bfb1bbd83d4be22bfcf18b89361eeff0e9024bd07acfec35";
+      sha512 = "802c8d9b77678bdf051633b19a452544028a4be76fde686240a78fad9d25dc7ed38de0c58b54fbe214bcdc46e0cd1b6f2cad5ec646a8fabe3e8c7072b84b627a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/it/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/it/firefox-60.0.1.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "d15b7b6a4e56676a45d2a0c55612de6b57a5d90558bd826d3c9047db831551893cc288771826b95a0ceb587b9bd82e5b30c914f9dc7070bb09a93073222e2bea";
+      sha512 = "44cc35fb9e6375739c5e88bc8e7489c15a80faa9d0327ffb2793916d2674cf71a4b237a41073f05477fcb142bdac8d4ada684ce2101027f551a7241eb46bb7b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ja/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ja/firefox-60.0.1.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "e47706e58a216f0f468bd6972d0373c3795a33318f811064b1c7dbf78a955bc65a62f8f27d66c656b002a4301043485abeaef8c5ef28622e65bc355cb1fa05db";
+      sha512 = "8daac42dcb02ad640a56196ce500b9528c4fbc2a562549f08d76bfd990e51dc2c938a99becd26860c659e4bdaf90465d6c9c909f6cea95030c61839adc79a4a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ka/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ka/firefox-60.0.1.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "84c141262f4c2a7ece6ae6effb47ac2ce277da9db4bf1683dfc62e78dea5a0daac52647279da7ef19e439c8622678e235fc90763a0e19dcbf156aa0e2b30d8d0";
+      sha512 = "2cd50870e0ebad8d385b5e1feffa546dbdee31c2916277c36afa9835d01f9e9dc1d7d4c0f386d4baca38eef11a6c0b1cf1657bc7588a1cd5512e894b12acb9d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kab/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kab/firefox-60.0.1.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "d5ca56b0d58f9acf8577cc1a69f1e0213a2d9e6c6ad70f6ef2b234d6ca87ae4b37489f69f7d8003a71a7992c6443700c8aa2739c58bafb34d3f99ecbe2b9aca3";
+      sha512 = "8c292f95480d21ad521df9e4fbbd580306c2615705a37a75ceaffc8f6ca5a24648fa1e0bc97006c34a38b6e58a523a487953c414395c1bef8f58c11b68bdf5e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kk/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kk/firefox-60.0.1.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "8b892727929298025c9f7c212da27c6941afbea15a07b5212bae363b358c05ca5373a1fcaf487e2f4f2aa5a491ac0a244e74240b22d80125140ea563432bb7b8";
+      sha512 = "285e6bb268d6b9968d9a0d2cda10c82a790be9d0dde686ba3c0230d84029eae28943e1edf70188fb32c96a7712f13ed9087eac57d690bae222736593515e80e3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/km/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/km/firefox-60.0.1.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "11326282020f7b673b78490452fd47bfd932c99ed523b87ef4d99b55a189069665d1e8cb7d39d0f45a673e1e36e0bb689b9454c9047c1f701dc1c9b18055f043";
+      sha512 = "a939d51066e185a68170bd7c3d21523c4e3c5d69189822496ddbde0bda46ffba3728211efcebb89808ca6d70d76ba12547bfdea8c8fb3420000dbe39fecb8232";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/kn/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/kn/firefox-60.0.1.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "842005f68c58fbfc6c831a7515e0ad5078697e6eabf40294fb1c0b8bf45497549f0636b6a9d53973f64d0d522d601cc0d872ce6f515c4a488c2aaa563b70da60";
+      sha512 = "2207b6883e5dc506d556f8f79bc773f304168029b3282835282296c8b2104ebee6a12e5b1f3887645d366339bc026e53021a004bbab893e3e0362ca28921c78d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ko/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ko/firefox-60.0.1.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "aa8bf2c373fe549a59f3412e3b155164c3f4953257f7adb6535c3e4cec494e1191f25dfff9475fa610cd3ab765c10c4a303c895c78b35720483677a87613923a";
+      sha512 = "02b13260a74edecb18543679e8d0f969d95b40f87dc237f39465399ddfb5cdd66293408ffda594a53a6514a83ee120c464f3827064b6a286187916109eb0cb03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lij/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lij/firefox-60.0.1.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "fbcfad4fae4dcd132ccbc2fdbf7cb6f0deb49357c987c52edcf87b25d55684732b5e6a834d0263996620c2b4149e06b5e82a097807d8673a8b7df6c0cb9a0561";
+      sha512 = "2386a05577d90599c48c04083ef1305d84b7a88b6cf22eb331fcda80ef5678755f7d60f418c053dda9aa992aab5ac6ada99bc5e76afca9cec1dd0d250313d277";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lt/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lt/firefox-60.0.1.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "f388751a01ed0214c284ec1ef1045a7c66c7a201901ad48370d7fa3c0e06e2b66c3ecc42357c781b58f6308efcf74e6b0c3902a8db46b11d0b39435294eb5e42";
+      sha512 = "6eac885d100539167429293655033e86387d50fddc6d6702f5b9e8ee6f21758e3bf01e340c4dee702958851cdf89c3159ed940545b2d439f8d32a90bc3c272a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/lv/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/lv/firefox-60.0.1.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "f932a06b7667762f41c410e394b4ec5cd91116cf82a774899b48045143c6fe88840ba472d91c71f7088f420563857b185c99cbaee884acb2ad760ce7f83abcc4";
+      sha512 = "984840eff4cf03915d04ca12ed78ce06db9c765db069d2cb647d3b795f8fbe6927f6abfa5d8ccc1c2806f10ab45fa7d612a08f4a0aee1b129c9aa4ad31bf4613";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mai/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mai/firefox-60.0.1.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "34da4ab327eba8076fd9944ad1c86b6e0e300df870b5a7ce906c7666df8c8ba7c76c792da7d8776150710bf2e8098a0ee9de86c273b19f6fdeadb5978258357a";
+      sha512 = "b063a79532ec9345751d69a41a1e3542256c2b623532a524724eda4f04aba6f5174c568cb45f60e332b1224f3cc0f9a0e641e455e3668cbbb52048571715a559";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mk/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mk/firefox-60.0.1.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "8b92fd90754604535c641286e465b720400505e86d778d554364ba6e3fea9db038607bc0638e426123760de59a4a920d21fc4522d8e3e155f47d834ef7db4cd8";
+      sha512 = "944882edf6c53dc02682733d50dd09c1df3b06c8bb32e05ee1307504936ced2d408623b7ec6588aac3a26e5c82861cf5bb4db44cd4462c9fd8d9fe62dec19743";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ml/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ml/firefox-60.0.1.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "4ce610e4b8979027e12dc07cca350f467d9f48c9c8cff1f52d08452616cab30dc8c49ce967ee49afca1c4905121d93ec00be9892b7b613736f1daced144f4347";
+      sha512 = "b206d4ceffcf460c73b31326ce2a7cc5d8fefd851a3d824a0012793d0bb0cd773b6abfda81cfcb721f11b3f6b4f38de727a04ab2a32a56f3f7ab7abde6632d3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/mr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/mr/firefox-60.0.1.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "1c1092ee47d62addc304dc81ddef6fa2987afd778ed8deb2796c862496bba584812a9acad11deb045c050fe80aec523de3b007488bbd23fc039767254b8f5918";
+      sha512 = "965c85edf69d05c96f3f23b987376c3747dfe9694af92f925c405a42544ac8a2992782c7aea60bce3fab4072db153b37e0f2873a4f42e564e821731eefd05400";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ms/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ms/firefox-60.0.1.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d0e4257f953e907c2ebdeafb7c60e3407906f908a9724ce6674842a2c87692963d0d932ba16e92ab0506cb91461ad07712178914f38feeb0662cde7b0fe035c8";
+      sha512 = "ae5938803a9acc6871577d6629579c0bd5ac4d7404e87cfe373876b94204d5af1110425400f9a7642b13bf2a68f32f2c485c8b9e3565f4d3c49ffd967a8e6df0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/my/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/my/firefox-60.0.1.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "d77bce209f0b333abf132f9d8220b5d808e7aa45930f509278b9666c4f0bf03d09cd9a38752af7924a66f3c1171260a92ffee2ed550c75c304065e413d9d25ac";
+      sha512 = "4fb3ac47fcd3b7b36bb66fa24ac82bf9ade26fbadf8eea125b78fced6222ae0f2c3c45638b3511b630b50e27fce70739733fbb357744ba89febd16544703b356";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nb-NO/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nb-NO/firefox-60.0.1.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "a1d86b6859599df2680e68e166e411590eda852923117051e28c14832c061a975dd535b11439639e44b1ea85bc4b409aada94e01bbda8847d4ca5239268306f3";
+      sha512 = "c469e49346a29b8b2bb87b6d3be37f72be7db18977a9085240184a66cced8da5c8a62d09c84424985418e106d8cc1a2359ce8778e515430188ff6921d403b42f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ne-NP/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ne-NP/firefox-60.0.1.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "5cd668f8c4295bffd14d769557f0be86b643ade50990497d72f15f5da15e1b4e82cb9b671045f445e87987f13fc97d05d04970d9fb559db1edc0122bf08871e1";
+      sha512 = "5374a889f9ae7934c4138b4742dfe50c360858e460b7e348be5ba7196f001453466c84b8bb55e8c1178a194e9500831684f50866c13ccfdd6228a8fb4d17e607";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nl/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nl/firefox-60.0.1.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "a0aac7fda38ac8f85ba341a11b1e90bb21dd5827e5201c782adc854a5b159a5555eaacc8df78bd6ccfe6945fa4502711b655688e61bf1d24748872da7830f522";
+      sha512 = "f937a25191c60c973b0676cc9ad993c07c221dbdc3c3f794c8cfbb2981ebe4d85b0450702b5c7270f47f6daa7b55bb4fb617e113686bc7b496811f5304ae8053";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/nn-NO/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/nn-NO/firefox-60.0.1.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "e40c0bab77e5437c77a2db272444d0fe6874b9e153f84033f0bbc21a3d987562d77b5e37da82accc1e996682b8cdfc8eb67c104134191414e6a86f755130aac0";
+      sha512 = "d95de4ef017c0fb951fcf8c90488acc63f5fa82ec7c72bc87f02aa4f2f4f75c2f4cf1a805958fadacd65759e68fef1be21181ad8511c6d1158bbf331c72b97d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/oc/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/oc/firefox-60.0.1.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "86a2193d5d442dad54fa55d83f0788d3e30b278370ef6b5836ad06e36307b599155ce2bef6760e6c73c56f4badfb1ad63073d3348395c598e13be73b2fef762d";
+      sha512 = "d4757d7a79b953a9aa92363c7fc40a7545fd7dcfa5ed03ee45af2b48b71b74a0fcbb841fd580244e6ddcc392c6fd105fbaaa03e42256522e2b51e6b18f433fb3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/or/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/or/firefox-60.0.1.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "b10a8f799764a2933d6a3843848028bbd8f6cc7fbe2566550426c2f066699158f654bb6913e57585fd695bd775efa29c054c5b7992efd1110d3e7135723ce206";
+      sha512 = "e5d6ec46f23bb31fd32ec5bf58049d7d948fb7632a198fdac34c004c23b58d2bb08c163e4b53e789529d1f6232fd050142a0c84d7d43d1d334ad3b66857a747e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pa-IN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pa-IN/firefox-60.0.1.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "5b0e9b50dd17472919cbcbc04dd8edcdde706d08421723e7afeb978fb31422e49751a4377a414b330ee81a6ad0e6ecb508db28d9a6a9fddd6e915819c1895fe5";
+      sha512 = "bc2d7ef61b866fae30e6b2fe6c542e206e879d4d0edeff4764a635c9927430cd763e6e907d8676914a5dc95d7a670958f332a62d09517446cfa1a32ebbc858df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pl/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pl/firefox-60.0.1.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "49f9ff7f27dd04ff0c05b82b82d9f3864b3fa10cc27fe86099773e4984f6ae8d6ab8be964d345801a4bbf84b5fd28e794eb850d67f5e82d8a1a693ad77e8f396";
+      sha512 = "c8ee365012576e66468c848d232af3d28796fc7bb8a2971e953ae0f4783b3eee06bd4c1da5725732ee5bd964c2447d1d3cd11041f5d56d88877fc36a6a568dab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pt-BR/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pt-BR/firefox-60.0.1.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "e4e6a6b5017297faff42ea399519c414530b2a281a9e8d20858c10b464e06d989f145b78b955e653fa5f11895a2b375d549bf8bad01b10fb4b8c88e7b5aab2e1";
+      sha512 = "e708e25ba08c0ba92981c0abd27b170086fd7e54be5604ba5b6c4be47012d4cc467f5ee81e5a50ee1ccf413d5e4e3fa29fafca0ce84d4b35001e59e46afa796b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/pt-PT/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/pt-PT/firefox-60.0.1.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "6acb042f4e22f67afb66a2a34f7c3865b77fa59dee2e163594f87c0aff0e409d3f252ffdb1986a4f7d776ece974ccb8701c90e72ee4782ea774298f801782271";
+      sha512 = "5a227d1954a93f35d83b7f89b48d6fef10f1ce09c239eb84a3fbf76b2c93f03ecb0890a9c18bc2d2edb01fece405aeafe16ced0420ef8b8ff90efb232d13569b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/rm/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/rm/firefox-60.0.1.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "822ca52c4be4a5ac19fd1c0436603d587816b3771f39ba1c6bb9e2e047b8e5fce8d8b4ae5109a07c79cbe35ece397cbd9644a45b4a8dd3d79d0e5162bdc6f68d";
+      sha512 = "9f2caae925cebb42c49c4c2b139dcfd961174aa8a4dd4d323b65d84b6acbef5beb1e5c844f09454d6fa3af882758137d452ba1cbad5cf017a8b54766f4967ba1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ro/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ro/firefox-60.0.1.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "0c85d51248e95ba3a6a871b99e97dad557af06686949616990aca8ff939fdc1e4fa3414f91c03f7c9f6b8b1a90d13d8b080bc1a04af40daf57b01681efb8ff46";
+      sha512 = "a24ffa5fb4f05bb700025df13384ca5f57183eb94d9826fa82560dc45d50a05c3f96c7c58fb1f609e1efdf3b9d3b86bd720a044d5c5c0ae8886e1d4218189635";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ru/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ru/firefox-60.0.1.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "cf2b8f766237534342c31f6227e653fbe171222caeb4ba8a234dd23389ac5fd4e1ff7a75cb9fa66d25a3022e73c148cce9872f976cc9e0f8b275c828cb30fd5a";
+      sha512 = "e256695c13cdce7fbd0650561c2e68ca7b3c6eafef5c451b54db67ebd6dc0c14f1c84622cc2550a573932b4ef1ffe20d1608a2d36d3fe0033ec18399ca80448d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/si/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/si/firefox-60.0.1.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "4b480cec371499a48f01455a908b1acc90525b8f92a7cc0e0a4dbb7f81daac6ee60b96ef2c8439dd3e8b38d721317b07928afd59ac329ec80575e10d16579f67";
+      sha512 = "b42ffbb1c3948555320d89e7732c145061b91453ed6f70a7d334754264ede63759201ff36bf94b1e33814c0d171541e450f8eb53ef95e8c5320d0e408475ba5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sk/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sk/firefox-60.0.1.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "415a8231ef4303fabe66b9e4f3e34ec8fbabd1d56feb5a2f7e9c63dd30907786255992f56ce340609fdfccec6eb88583c00473fdc52245456aa16078cfe6a834";
+      sha512 = "d224b3ae2edeea852e2d26314b3f8d22d7c048eebd540107281b2863c23dd7c7caeab9ec814c90434da515e912acfea35d5331beede5b9e6bc74ec77ca8e8781";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sl/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sl/firefox-60.0.1.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "e3f4374669d2ef1cb029695ac2945147f7a47d6b97a711f99a0e622aa6919dc30505f19879018f6df4c1f3086937c5317ad85945770ff3cfd7d86e89bbd22886";
+      sha512 = "c3c1ae0ce8858d1dfeba2e56d9b92769ab06585c86519f754f3ac97a527816bbf7c56df6e8055c04e7b06370c1b9c397ca522991c5f23371ef4e76fb3811cd23";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/son/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/son/firefox-60.0.1.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "0ca8209e1ca51d4529b6dc20b7c7d15f8e5307a4b4b292a6c6eaabf4919d91c35a6d35694031eac5889ea17ef691f34683210de3590c9bc768bcc5f444b6a0c4";
+      sha512 = "7622a3c211e34c48185e5756168378d60bbfb52784cb9b4e1b37d9e985d92d3d88ba6b29b750578136db9beb5f2123cb1b7c9f47d4b8139b0441b92884620c4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sq/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sq/firefox-60.0.1.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "27613a71060a22665d6332b2f8e5e3c91c98a8cd3207b94a67ebfd08b8604c7bad834e4cc2bfab10f9f0897696925e19addee42eb45eaca9b358fe15136c09a9";
+      sha512 = "8f4f30bd858bba7c2e90655821395522f6a96e38ff169334b034f182162294af8ca2d00da375e03c3e18e1c96c113333ec4f7d41ac01d385a12a7acb3e188653";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sr/firefox-60.0.1.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "6234e96196069614a25ddf751f820f5787e77f75d0adf91c9a479749471c75cef114d4a3816b4d63227344c4ae9915756c81e862aca3282d467f86fd42faee99";
+      sha512 = "00b4b3ef5d8217d7acfb2504c86338ca729f9ca3b69f2a0616def97ca88bcf61f2669f1a4e4acf4ccf5473db08de53c4308a342cc3ce944634743fdc1b8e5a11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/sv-SE/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/sv-SE/firefox-60.0.1.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3b5f8c85ffd4037aea0f8de95c77ac29f227e6ea02cbd8fdebbfc50ef6a03c6b7d31f695c7e0eb54dbd4d1d5471edf0c4793bf39e78b846c287f35ffc5a01aab";
+      sha512 = "287ae1efdc8ec6a34165bd4588b51c0f81203685d47ed59c01922e87d7d9aae9ab23b1351a7297a493d45645635c2da7458b245ef56991e7ec928fe264576e57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ta/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ta/firefox-60.0.1.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "e965954447ea2b47b949b74c06857c75b31edf724987559fc13ec25c4eb2766811da9929f0430297d4c7354ffe8bc9ee2b8ef7274bc47d1a07af3ed3f0ceaf61";
+      sha512 = "fde55160176bf7f5c016d7d780e8a78e556ba6d04e1703e6fd6e90ffa278b23822855e8e26a7b86ff38cf006dad3042ea9cd7d4f75b810efa5f543ac28126f6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/te/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/te/firefox-60.0.1.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "05b795c817f46fdbb1b15055203f4622fc231d5344993d96db81c98466724b72e99f8293cab8d560e9c297f7b4197e3cc0449e037096455c480020817aa24a0f";
+      sha512 = "5cd75ab1ed134ceae22c0020d753cae351caabf513a025dfe30ab3b146f5c693cdf202f5cb4f48a00fafdfe6584ff693d383a5a3f973e307e9ef056e61bcc43e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/th/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/th/firefox-60.0.1.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "6e10c20163819045bafd07216f7d29ef4d737bf60c9f38e4981871fda4c19112b19aa628ede00f45b71c7b549b2611c2cf74044a1d153fb9fab9b9014184bf84";
+      sha512 = "037b7e200bb6246e3d95983f5cd9451a10c54be0fcbbf30ec35ddc115395cf8fda3274a212285bbb1dcadd69f3efaab60606345765ed3f69471c5ea2d47c467e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/tr/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/tr/firefox-60.0.1.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "1ed74dc5b302c70c9d980f6c19dcda00b399879034f6d49368b0a859434d5ba3097360e15de8d47b136dccd3567d60dbef1f0ac20cdcea3ca8757b2dc189a19c";
+      sha512 = "d2cd7b818c64a6529387d5bf540174aee44b5e863479978b15aac20fe62d102f231d2f1367454c5ddf9f3009776e6176fca8d96eeb221730a477c4fced4b45d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/uk/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/uk/firefox-60.0.1.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "be15de40cc87999b145178e5009e144aa1a68d6c7c422dd3f7c1669bdf8c200787ffe650670d29b2ab8230dd25a3ece9bdf9dc5b93331da96df6f28bb2388b1a";
+      sha512 = "4f8ed8dbd4f7bc8184ee4c128382a5ccc5dd6b93840199657a6a2ce5e6ffa5b192d7e17d50ea4a4631f2ef0a5fa225506de953a03e92b4f51e731c436d4d2b11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/ur/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/ur/firefox-60.0.1.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "c4d853ce32374513df113fc95e28c26c2dfdd4e7d2f4771cd23fbad78f29068cd003fd2aad657ea582a5229ee217d3c05c2acc0ee248c10b1630c0bd8b521625";
+      sha512 = "4c8db3bf7affc403705bcb5c4da7685a43cc6119e02f3efe8fa499bc22da18a6f43f7d720fe07c32d226d97e6f92ea1611f153d85f7ebd25c038e938acaa3da8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/uz/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/uz/firefox-60.0.1.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "9912cef59e3f2457126a6623f0e3913248335b29d5c5412b6ddd451aa32e455cf3d4a752f975c6b06a9a4dcbb2511cff6cb918b0bf3564c8e8c37a06f79e862d";
+      sha512 = "933c279629ce254da1f7886825a934413a129e2371eb72a8999dc846e0cee12648e68ea9f3b01264aea4c1b5fb2f9081e039b02bc7f5c808307135e8675e05f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/vi/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/vi/firefox-60.0.1.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "5ae557d429613cc9bb3fb4220d3242fad8b7b5a625b01bbe662283b78153b9d96f4d27907e63488500a766606196d8292b61614d007c6c5a4391dc8f88332e5d";
+      sha512 = "c2bd138c1edd4425ee7f9cf341cb01d2ef04c1924185c8632a7b2e8ce3c87b4847611827dedfd826ad12028d486a27536c2053b9a677edcf74232183f36a49d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/xh/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/xh/firefox-60.0.1.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "4fac1b8bce8770812566dd05460d7d580f2fca9b4b006c5aefe50ecb8e24d104f725c0fe952e59492d438e5c98e683bf4b55df12a18748eb3daffa59aa4de35e";
+      sha512 = "2ee93f40b882c52b80297075864a079b9a91ad30f9fbb64d64d4eeddf9cee31b717d4fbf59d25c8fd40944a2df2f0b67e95d1a57cb1031277429a7fe97be0d05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/zh-CN/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/zh-CN/firefox-60.0.1.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "0f1adcc43685a0da2e855ad8b679270be7131343f92c4f3f19048049696ce75b03e5a8b508a0d025b1348a66f18e65ccbb7def6382d3bb51152d7b9389f53656";
+      sha512 = "1ab340e9827d84d757f7b88c165ff07ab2d6202cdf939b6a50d40e23d09c002a49daaf9d4e7b90fdf20cfe36160e2d6518fcedf455de5a9f49c05badd6f0cb69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0/linux-i686/zh-TW/firefox-60.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/60.0.1/linux-i686/zh-TW/firefox-60.0.1.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "9a53a37523125ae165f2fd71957f748841302918812b0dea1b1b088eb56906524ddb0a3dc27bbfe7e0b9e7adec2823d5656561eed662c9239473fa21feaf8184";
+      sha512 = "3886ef200481d8f0dcb4add628144dfda705edeea37f1560fdeee7a45e797b75b885a2e590193d59f84d13b2c848c42d0e0f94986d3f4c514a9410e6924a71f4";
     }
     ];
 }

From f2b3cdd9502e535e203fcd8adbe9a817453d21c6 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 18 May 2018 14:24:44 +0000
Subject: [PATCH 2054/3370] firefox: 60.0 -> 60.0.1

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

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 35a818dd6c96..87034085c816 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -24,10 +24,10 @@ rec {
 
   firefox = common rec {
     pname = "firefox";
-    version = "60.0";
+    version = "60.0.1";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "3ya0rq50cwryza7d56mm3g2h7kayh17vry565qvaq7wsi9gcd4cbjk4z7a1s4bdka0xsxg2l7v0zkaj666nbllky2462svbi8imdhb3";
+      sha512 = "083bhfh32dy1cz4c4wn92i2lnl9mqikkd9dlkwd5i6clyjb9pc6d5g87kvb8si0n6jll4alyhw792j56a7gmzny3d93068hr4zyh3qn";
     };
 
     patches = nixpkgsPatches ++ [

From 2f076b403adceb7133ad312b23bdcd3438fbfbcf Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 18 May 2018 14:31:32 +0000
Subject: [PATCH 2055/3370] firefox-esr: 60.0esr -> 60.0.1esr

---
 .../applications/networking/browsers/firefox/packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 87034085c816..f5c20a2de32b 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -59,17 +59,17 @@ rec {
       description = "A web browser built from Firefox Extended Support Release source tree";
     };
     updateScript = callPackage ./update.nix {
-      attrPath = "firefox-esr-unwrapped";
+      attrPath = "firefox-esr-52-unwrapped";
       versionSuffix = "esr";
     };
   } {};
 
   firefox-esr-60 = common rec {
     pname = "firefox-esr";
-    version = "60.0esr";
+    version = "60.0.1esr";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "20whvk4spdi4yb3alb492c1jca60p4p70mgj2bypa7r8fgjqn57pyh9rcvnci61asar0zvmlihq46ywzrijm1804iw8c4wmlv7qy8dv";
+      sha512 = "2kswaf2d8qbhx1ry4ai7y2hr8cprpm00wwdr9qwpdr31m7w0jzndh0fn7jn1f57s42j6jk0jg78d34x10p2rvdii8hrbbr9q9sw8v4b";
     };
 
     patches = nixpkgsPatches ++ [
@@ -80,7 +80,7 @@ rec {
       description = "A web browser built from Firefox Extended Support Release source tree";
     };
     updateScript = callPackage ./update.nix {
-      attrPath = "firefox-esr-unwrapped";
+      attrPath = "firefox-esr-60-unwrapped";
       versionSuffix = "esr";
     };
   } {};

From e80957d5163932c9cc46bfd8b20878a3a0e9a136 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 08:21:25 -0700
Subject: [PATCH 2056/3370] imagemagick7: 7.0.7-29 -> 7.0.7-32 (#40669)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/imagemagick/versions.

These checks were done:

- built on NixOS
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/animate passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/compare passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/composite passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/conjure passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/convert passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/display passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/identify passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/import passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/magick-script passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/mogrify passed the binary check.
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/montage passed the binary check.
- Warning: no invocation of /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/stream had a zero exit code or showed the expected version
- /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32/bin/magick passed the binary check.
- 12 of 13 passed binary check by having a zero exit code.
- 0 of 13 passed binary check by having the new version present in output.
- found 7.0.7-32 with grep in /nix/store/s71ipahy5v22lscx13qq054ki72z094y-imagemagick-7.0.7-32
- directory tree listing: https://gist.github.com/f22a02931178895b4d9ac8401f7d6eb8
- du listing: https://gist.github.com/d5150ae0b886668b2b42f583409a14a4
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 65a3238ef571..1a9bb44cabb6 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-29";
-    sha256 = "0jfpfydz50zxs776knz6w2f5g0l4nhivp9g1fz4cf5clgjcpa3z6";
+    version = "7.0.7-32";
+    sha256 = "1i3rvq0f4lq1las4g12ipfs6h5vyngwh5fllvynpci2lh32gd48j";
     patches = [];
   };
 in

From e8b8ba148e6966b367e293d85b0b2bb15a02e472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 18 May 2018 12:28:16 -0300
Subject: [PATCH 2057/3370] enlightenment: add xkeyboard-config dependency
 (#40690)

- Add runtime dependence on xkeyboard-config

- Add base.lst from xkeyboard-config to the list of keyboard layout
files. Something similar to this has been removed in a previous patch
by mistake.

- Fix location of binary edge_cc. This has been removed in a previous
patch by mastake.

- Make the explanation for the wrapping of some binaries more clear.
---
 pkgs/desktops/enlightenment/enlightenment.nix | 41 ++++++++++++++++---
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix
index b0fd5f3db2b2..dc538625bf09 100644
--- a/pkgs/desktops/enlightenment/enlightenment.nix
+++ b/pkgs/desktops/enlightenment/enlightenment.nix
@@ -35,15 +35,44 @@ stdenv.mkDerivation rec {
     gdbm
     pcre
     mesa_noglu
+    xkeyboard_config
   ] ++
     stdenv.lib.optionals stdenv.isLinux [ libcap ];
 
-  # Instead of setting owner to root and permissions to setuid/setgid
-  # (which is not allowed for files in /nix/store) of some
-  # enlightenment programs, the file $out/e-wrappers.nix is created,
-  # containing the needed configuration for that purpose. It can be
-  # used in the enlightenment module.
-  patches = [ ./enlightenment.suid-exes.patch ];
+  patches = [
+    # Some programs installed by enlightenment (to set the cpu frequency,
+    # for instance) need root ownership and setuid/setgid permissions, which
+    # are not allowed for files in /nix/store. Instead of allowing the
+    # installer to try to do this, the file $out/e-wrappers.nix is created,
+    # containing the needed configuration for wrapping those programs. It
+    # can be used in the enlightenment module. The idea is:
+    # 
+    #  1) rename the original binary adding the extension .orig
+    #  2) wrap the renamed binary at /run/wrappers/bin/
+    #  3) create a new symbolic link using the original binary name (in the
+    #     original directory where enlightenment wants it) pointing to the
+    #     wrapper
+
+    ./enlightenment.suid-exes.patch
+  ];
+
+  postPatch = ''
+    # In order to get the available keyboard layouts Enlightenment looks for
+    # the file xorg.lst, that should be provided by xkeyboard-config (when
+    # configured with option --with-xkb-rules-symlink=xorg). Currently
+    # xkeyboard-config is not configured with this option in
+    # NixOS. Therefore it is needed to add base.lst (which xorg.lst would be
+    # a symbolic link to) explicitly as an alternative.
+
+    sed "/#ifdef XKB_BASE/a XKB_BASE \"\/rules\/base.lst\"," \
+      -i src/modules/wizard/page_011.c src/modules/xkbswitch/e_mod_parse.c
+
+    # edge_cc is a binary provided by efl and cannot be found at the directory
+    # given by e_prefix_bin_get(), which is $out/bin
+
+    substituteInPlace src/bin/e_import_config_dialog.c \
+      --replace "e_prefix_bin_get()" "\"${efl}/bin\""
+  '';
 
   mesonFlags = [ "-Dsystemdunitdir=lib/systemd/user" ];
 

From 218b60b85d807092cec43d1a3de8d71ccb24ed81 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 08:34:52 -0700
Subject: [PATCH 2058/3370] ace: 6.4.7 -> 6.4.8 (#40696)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ace/versions.

These checks were done:

- built on NixOS
- /nix/store/2bjwljxg8xr8f44h622mqc3xacy9419y-ace-6.4.8/bin/ace_gperf passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 6.4.8 with grep in /nix/store/2bjwljxg8xr8f44h622mqc3xacy9419y-ace-6.4.8
- directory tree listing: https://gist.github.com/246159b0e45b5fe1369de042fd0534cf
- du listing: https://gist.github.com/dc07102e153c9c3a7f97e1fe743aed1b
---
 pkgs/development/libraries/ace/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
index d61315f7db85..e428b9a8c785 100644
--- a/pkgs/development/libraries/ace/default.nix
+++ b/pkgs/development/libraries/ace/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ace-${version}";
-  version = "6.4.7";
+  version = "6.4.8";
 
   src = fetchurl {
     url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2";
-    sha256 = "1zbncdxkkwnx4aphy0apnp7xn4aspxvq2h9bbjh33dpsy0j81afd";
+    sha256 = "190cyfs2najph2yycyj8abzddwa8s4wx8lx38iv237plwfl2308g";
   };
 
   enableParallelBuilding = true;

From 2921c447d4fdd7d0aabdf0572099c311bfa6c8e5 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <tk@drwx.org>
Date: Fri, 18 May 2018 18:09:48 +0200
Subject: [PATCH 2059/3370] astroid: 0.10.2 -> 0.11.1 (#40720)

---
 .../networking/mailreaders/astroid/default.nix   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 610b16dab5bc..9a348fc03f7a 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, fetchFromGitHub, scons, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3
-, libsass, notmuch, boost, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, gnome3, gmime3, webkitgtk24x-gtk3
+, libsass, notmuch, boost, wrapGAppsHook, glib-networking }:
 
 stdenv.mkDerivation rec {
   name = "astroid-${version}";
-  version = "0.10.2";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "astroidmail";
     repo = "astroid";
     rev = "v${version}";
-    sha256 = "0y1i40xbjjvnylqpdkvj0m9fl6f5k9zk1z4pqg3vhj8x1ys8am1c";
+    sha256 = "1z48rvlzwi7bq7j55rnb0gg1a4k486yj910z2cxz1p46lxk332j1";
   };
 
-  nativeBuildInputs = [ scons pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook ];
 
   buildInputs = [ gnome3.gtkmm gmime3 webkitgtk24x-gtk3 libsass gnome3.libpeas
-                  notmuch boost gnome3.gsettings-desktop-schemas ];
-
-  buildPhase = "scons --propagate-environment --prefix=$out build";
-  installPhase = "scons --propagate-environment --prefix=$out install";
+                  notmuch boost gnome3.gsettings-desktop-schemas
+                  glib-networking ];
 
   meta = with stdenv.lib; {
     homepage = https://astroidmail.github.io/;

From 641a62305305692c294ab3f67c597bc90067a667 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 18 May 2018 18:24:53 +0200
Subject: [PATCH 2060/3370] nixos/xss-lock: add module (#40619)

`xsslock` (which was originally packaged in 6cb1d1aaaf02a72329bedf9c6960e54fea6f5c6e)
is a simple screensaver which connects a given screen locker (e.g.
`i3lock`) with `logind`. Whenever `loginctl lock-sessions` is invoked
the locker will be used to lock the screen. This works with its power
management features (e.g. `lid switch`) as well, so the PC can be locked
automatically when the lid is closed.

The module can be used like this:

```
{
  services.xserver.enable = true;

  programs.xss-lock.enable = true;
  programs.xss-lock.lockerCommand = "i3lock";
}
```
---
 nixos/modules/module-list.nix       |  1 +
 nixos/modules/programs/xss-lock.nix | 26 ++++++++++++++++++++++++++
 nixos/release.nix                   |  1 +
 nixos/tests/xss-lock.nix            | 25 +++++++++++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 nixos/modules/programs/xss-lock.nix
 create mode 100644 nixos/tests/xss-lock.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 6fe29af3a00d..d5cfd87520c5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -122,6 +122,7 @@
   ./programs/wireshark.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
+  ./programs/xss-lock.nix
   ./programs/yabar.nix
   ./programs/zsh/oh-my-zsh.nix
   ./programs/zsh/zsh.nix
diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix
new file mode 100644
index 000000000000..49d522c604f5
--- /dev/null
+++ b/nixos/modules/programs/xss-lock.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.programs.xss-lock;
+in
+{
+  options.programs.xss-lock = {
+    enable = mkEnableOption "xss-lock";
+    lockerCommand = mkOption {
+      example = "xlock";
+      type = types.string;
+      description = "Locker to be used with xsslock";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.xss-lock = {
+      description = "XSS Lock Daemon";
+      wantedBy = [ "graphical-session.target" ];
+      partOf = [ "graphical-session.target" ];
+      serviceConfig.ExecStart = "${pkgs.xss-lock}/bin/xss-lock ${cfg.lockerCommand}";
+    };
+  };
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index 4c0bb7bfb756..f7c2943b96fa 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -402,6 +402,7 @@ in rec {
   tests.xfce = callTest tests/xfce.nix {};
   tests.xmonad = callTest tests/xmonad.nix {};
   tests.xrdp = callTest tests/xrdp.nix {};
+  tests.xss-lock = callTest tests/xss-lock.nix {};
   tests.yabar = callTest tests/yabar.nix {};
   tests.zookeeper = callTest tests/zookeeper.nix {};
 
diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
new file mode 100644
index 000000000000..3e3864cab770
--- /dev/null
+++ b/nixos/tests/xss-lock.nix
@@ -0,0 +1,25 @@
+import ./make-test.nix ({ pkgs, lib, ... }:
+
+with lib;
+
+{
+  name = "xss-lock";
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ma27 ];
+
+  machine = {
+    imports = [ ./common/x11.nix ./common/user-account.nix ];
+    programs.xss-lock.enable = true;
+    programs.xss-lock.lockerCommand = "${pkgs.xlockmore}/bin/xlock";
+    services.xserver.displayManager.auto.user = "alice";
+  };
+
+  testScript = ''
+    $machine->start;
+    $machine->waitForX;
+    $machine->waitForUnit("xss-lock.service", "alice");
+
+    $machine->fail("pgrep xlock");
+    $machine->succeed("su -l alice -c 'xset dpms force standby'");
+    $machine->succeed("pgrep xlock");
+  '';
+})

From 0f8749b092d8b28c91255546892d7af6643ff617 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Fri, 18 May 2018 07:16:34 +0000
Subject: [PATCH 2061/3370] udono: Add myself to maintainer list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 790b72c039e3..9fa89838d164 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3895,6 +3895,11 @@
     github = "typetetris";
     name = "Eric Wolf";
   };
+  udono = {
+    email = "udono@virtual-things.biz";
+    github = "udono";
+    name = "Udo Spallek";
+  };
   unode = {
     email = "alves.rjc@gmail.com";
     github = "unode";

From 31ebb53b1205260fb1bc875831ab50f650355787 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Fri, 18 May 2018 09:34:12 +0000
Subject: [PATCH 2062/3370] pythonPackages goocalendar: init at 0.3

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

diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix
new file mode 100644
index 000000000000..f6e67ad43923
--- /dev/null
+++ b/pkgs/development/python-modules/goocalendar/default.nix
@@ -0,0 +1,44 @@
+{ stdenv
+, fetchPypi
+, buildPythonPackage
+, pkgconfig
+, gtk3
+, gobjectIntrospection
+, pygtk
+, pygobject3
+, goocanvas2
+, isPy3k
+ }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  pname = "GooCalendar";
+  version = "0.3";
+
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1p7qbcv06xipg48sgpdlqf72ajl3n1qlypcc0giyi1a72zpyf823";
+  };
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  propagatedBuildInputs = [
+    pygtk
+    pygobject3
+  ];
+  buildInputs = [
+    gtk3
+    goocanvas2
+  ];
+
+  # No upstream tests available
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "A calendar widget for GTK using PyGoocanvas.";
+    homepage    = https://goocalendar.tryton.org/;
+    license     = licenses.gpl2;
+    maintainers = [ maintainers.udono ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ca5cfb677a2e..4e30f2057f58 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -253,6 +253,8 @@ in {
 
   globus-sdk = callPackage ../development/python-modules/globus-sdk { };
 
+  goocalendar = callPackage ../development/python-modules/goocalendar { };
+
   gssapi = callPackage ../development/python-modules/gssapi { };
 
   h5py = callPackage ../development/python-modules/h5py {

From 5a3ccf19c4cc5503bc1196dfdee42b32362dd2a9 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Fri, 18 May 2018 17:07:59 +0000
Subject: [PATCH 2063/3370] pythonPackages cdecimal: init at 2.3

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

diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix
new file mode 100644
index 000000000000..2c0b0e623ca9
--- /dev/null
+++ b/pkgs/development/python-modules/cdecimal/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, wget, buildPythonPackage, isPy3k }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  pname = "cdecimal";
+  version = "2.3";
+
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url="http://www.bytereef.org/software/mpdecimal/releases/${pname}-${version}.tar.gz";
+    sha256 = "d737cbe43ed1f6ad9874fb86c3db1e9bbe20c0c750868fde5be3f379ade83d8b";
+  };
+
+  # Upstream tests are not included s. a. http://www.bytereef.org/mpdecimal/testing.html
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Fast drop-in replacement for decimal.py";
+    homepage    = http://www.bytereef.org/mpdecimal/;
+    license     = licenses.bsd2;
+    maintainers = [ maintainers.udono ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e30f2057f58..998aac285c42 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -223,6 +223,8 @@ in {
 
   bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
 
+  cdecimal = callPackage ../development/python-modules/cdecimal { };
+
   dendropy = callPackage ../development/python-modules/dendropy { };
 
   dbf = callPackage ../development/python-modules/dbf { };

From 2a1c4bf07a8119e0208b067be48d5772ae767abf Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Mon, 14 May 2018 18:16:09 +0000
Subject: [PATCH 2064/3370] tryton: 4.6 -> 4.8

Major upstream release.
Use GTK-3.
Use extras-depends: cdecimal, goocalendar
---
 pkgs/applications/office/tryton/default.nix | 37 +++++++++++++++++----
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
index 51d5b083e6bd..0df9fd899dc5 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/pkgs/applications/office/tryton/default.nix
@@ -1,22 +1,45 @@
-{ stdenv, fetchurl, python2Packages, librsvg }:
+{ stdenv
+, python2Packages
+, pkgconfig
+, librsvg
+, gobjectIntrospection
+, atk
+, gtk3
+, gtkspell3
+, gnome3
+, goocanvas2
+}:
 
 with stdenv.lib;
 
 python2Packages.buildPythonApplication rec {
-  name = "tryton-${version}";
-  version = "4.6.2";
-  src = fetchurl {
-    url = "mirror://pypi/t/tryton/${name}.tar.gz";
-    sha256 = "0bamr040np02gfjk8c734rw3mbgg75irfgpdcl2npgkdzyw1ksf9";
+  pname = "tryton";
+  version = "4.8.0";
+  src = python2Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1ywgna4hhmji8pfrwhdfj1ns49vs9nwppqb7iy7jr27wrxk4bm6b";
   };
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
   propagatedBuildInputs = with python2Packages; [
     chardet
     dateutil
     pygtk
     librsvg
+    pygobject3
+    goocalendar
+    cdecimal
+  ];
+  buildInputs = [
+    atk
+    gtk3
+    gnome3.defaultIconTheme
+    gtkspell3
+    goocanvas2
   ];
   makeWrapperArgs = [
     ''--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"''
+    ''--set GI_TYPELIB_PATH "$GI_TYPELIB_PATH"''
+    ''--suffix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"''
   ];
   meta = {
     description = "The client of the Tryton application platform";
@@ -30,6 +53,6 @@ python2Packages.buildPythonApplication rec {
     '';
     homepage = http://www.tryton.org/;
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.johbo ];
+    maintainers = with maintainers; [ johbo udono ];
   };
 }

From e708c8f120cbcfa7144b89bd3cb2c868cbbb0675 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Fri, 18 May 2018 15:03:23 +0000
Subject: [PATCH 2065/3370] trytond: 4.6 -> 4.8

Major upstream release.
Use extras-depends: cdecimal html2text ipaddress
---
 pkgs/applications/office/trytond/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix
index efa7f2a410d7..31c6a7059fc0 100644
--- a/pkgs/applications/office/trytond/default.nix
+++ b/pkgs/applications/office/trytond/default.nix
@@ -4,11 +4,11 @@
 with stdenv.lib;
 
 python2Packages.buildPythonApplication rec {
-  name = "trytond-${version}";
-  version = "4.6.2";
-  src = fetchurl {
-    url = "mirror://pypi/t/trytond/${name}.tar.gz";
-    sha256 = "0asc3pd37h8ky8j66iqxr0fv0k6mpjcwxwm0xgm5hrdi32l5cdda";
+  pname = "trytond";
+  version = "4.8.0";
+  src = python2Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "114c0ea15b8395117bf8c669b7da8af4961001297fbd034c780a42a40e079e3a";
   };
 
   # Tells the tests which database to use
@@ -25,12 +25,15 @@ python2Packages.buildPythonApplication rec {
     relatorio
     werkzeug
     wrapt
+    ipaddress
 
     # extra dependencies
     bcrypt
     pydot
     python-Levenshtein
     simplejson
+    cdecimal
+    html2text
   ] ++ stdenv.lib.optional withPostgresql psycopg2);
   meta = {
     description = "The server of the Tryton application platform";
@@ -44,6 +47,6 @@ python2Packages.buildPythonApplication rec {
     '';
     homepage = http://www.tryton.org/;
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.johbo ];
+    maintainers = with maintainers; [ udono johbo ];
   };
 }

From e1a538c0da9107c67dabb5b649b21d575fa1d812 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 10:39:29 -0700
Subject: [PATCH 2066/3370] e2fsprogs: 1.44.1 -> 1.44.2 (#40681)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/e2fsprogs/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/chattr had a zero exit code or showed the expected version
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/lsattr passed the binary check.
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/compile_et had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mk_cmds had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/badblocks had a zero exit code or showed the expected version
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/debugfs passed the binary check.
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/dumpe2fs passed the binary check.
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2freefrag had a zero exit code or showed the expected version
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2fsck passed the binary check.
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2image had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2label had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e2undo had a zero exit code or showed the expected version
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e4crypt passed the binary check.
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/e4defrag had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/filefrag had a zero exit code or showed the expected version
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/fsck.ext2 passed the binary check.
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/fsck.ext3 passed the binary check.
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/fsck.ext4 passed the binary check.
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/logsave had a zero exit code or showed the expected version
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mke2fs passed the binary check.
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mkfs.ext2 passed the binary check.
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mkfs.ext3 passed the binary check.
- /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mkfs.ext4 passed the binary check.
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/mklost+found had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/resize2fs had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin/bin/tune2fs had a zero exit code or showed the expected version
- 12 of 26 passed binary check by having a zero exit code.
- 0 of 26 passed binary check by having the new version present in output.
- found 1.44.2 with grep in /nix/store/3c5r4b2a5cb6cpwr73ahrr03v965hhbg-e2fsprogs-1.44.2-bin
- directory tree listing: https://gist.github.com/78b13b077d5f9da29fc2b256af44e638
- du listing: https://gist.github.com/356acc8c1a54a78ab93172cac717d3d5
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 1c8835a2ed4c..8497dcc0a399 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, pkgconfig, libuuid, gettext, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.44.1";
+  name = "e2fsprogs-1.44.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "1rn1nvp8kcvjmbh2bxrjfbrz7zz519d52rrxqvc50l0hzs6hda55";
+    sha256 = "0s3znfy26as63gdbskm6pxh3i1106bpxf2jh9dppd8d9lidmmh75";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];

From 0c30d6597ef1d01d150ce556e1df4717ae45b089 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 18 May 2018 09:05:44 -0500
Subject: [PATCH 2067/3370] xbps: init at 0.52

---
 .../package-management/xbps/cert-paths.patch  | 25 ++++++++++++
 .../tools/package-management/xbps/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 65 insertions(+)
 create mode 100644 pkgs/tools/package-management/xbps/cert-paths.patch
 create mode 100644 pkgs/tools/package-management/xbps/default.nix

diff --git a/pkgs/tools/package-management/xbps/cert-paths.patch b/pkgs/tools/package-management/xbps/cert-paths.patch
new file mode 100644
index 000000000000..569161d9f2e4
--- /dev/null
+++ b/pkgs/tools/package-management/xbps/cert-paths.patch
@@ -0,0 +1,25 @@
+From d13a550dbc8876c35b912fe3e0eadd45b278be27 Mon Sep 17 00:00:00 2001
+From: Will Dietz <w@wdtz.org>
+Date: Fri, 18 May 2018 09:51:48 -0500
+Subject: [PATCH] add certificate path fallbacks
+
+---
+ lib/fetch/common.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/fetch/common.c b/lib/fetch/common.c
+index 94fb2651..79b50115 100644
+--- a/lib/fetch/common.c
++++ b/lib/fetch/common.c
+@@ -1012,6 +1012,8 @@ fetch_ssl_setup_peer_verification(SSL_CTX *ctx, int verbose)
+ 
+ 	if (getenv("SSL_NO_VERIFY_PEER") == NULL) {
+ 		ca_cert_file = getenv("SSL_CA_CERT_FILE");
++		ca_cert_file = ca_cert_file ? ca_cert_file : getenv("NIX_SSL_CERT_FILE");
++		ca_cert_file = ca_cert_file ? ca_cert_file : "/etc/ssl/certs/ca-certificates.crt";
+ 		ca_cert_path = getenv("SSL_CA_CERT_PATH") != NULL ?
+ 		    getenv("SSL_CA_CERT_PATH") : X509_get_default_cert_dir();
+ 		if (verbose) {
+-- 
+2.17.0
+
diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix
new file mode 100644
index 000000000000..b78b0ae110e1
--- /dev/null
+++ b/pkgs/tools/package-management/xbps/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pkgconfig, which, zlib, openssl, libarchive }:
+
+stdenv.mkDerivation rec {
+  name = "xbps-${version}";
+  version = "0.52";
+
+  src = fetchFromGitHub {
+    owner = "voidlinux";
+    repo = "xbps";
+    rev = version;
+    sha256 = "1sf6iy9l3dijsczsngzbhksshfm1374g2rrdasc04l6gz35l2cdp";
+  };
+
+  nativeBuildInputs = [ pkgconfig which ];
+
+  buildInputs = [ zlib openssl libarchive ];
+
+  patches = [ ./cert-paths.patch ];
+
+  postPatch = ''
+    # fix unprefixed ranlib (needed on cross)
+    substituteInPlace lib/Makefile \
+      --replace 'SILENT}ranlib ' 'SILENT}$(RANLIB) '
+
+    # Don't try to install keys to /var/db/xbps, put in $out/share for now
+    substituteInPlace data/Makefile \
+      --replace '$(DESTDIR)/$(DBDIR)' '$(DESTDIR)/$(SHAREDIR)'
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/voidlinux/xbps;
+    description = "The X Binary Package System";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64cdad2282bb..7290f39927d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21257,6 +21257,8 @@ with pkgs;
 
   xboxdrv = callPackage ../misc/drivers/xboxdrv { };
 
+  xbps = callPackage ../tools/package-management/xbps { };
+
   xcftools = callPackage ../tools/graphics/xcftools { };
 
   xhyve = callPackage ../applications/virtualization/xhyve {

From 208abdba78a4f8fe7d0bf9a02dd9462122382e82 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 18 May 2018 12:54:47 -0500
Subject: [PATCH 2068/3370] gllvm: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index 470ba291825a..6cf36e44dd1c 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gllvm-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   goPackagePath = "github.com/SRI-CSL/gllvm";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "SRI-CSL";
     repo = "gllvm";
     rev = "v${version}";
-    sha256 = "0779828kzw9ihdnw5r3h2fzzd8ml8cskyf5hmaqqksinjb7bm3is";
+    sha256 = "1rbvn7qhzb7xxqv0wrkwxq4sm657vsl6q7nwrfq2zwb21573811z";
   };
 
   meta = with stdenv.lib; {

From 41ede7f4c48b8973047aaa954e18ffd86a247d95 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 18 May 2018 12:55:04 -0500
Subject: [PATCH 2069/3370] wllvm: 1.2.0 -> 1.2.1

Also add myself as another maintainer.
---
 pkgs/development/tools/wllvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index 399a8e66860b..8fa7574f3110 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,20 +1,20 @@
 { stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.2.0";
+  version = "1.2.1";
   pname = "wllvm";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1hriyv5gfkcxjqk71l3030qfy3scsjr3mp12hkxfknh65inlqs5z";
+    sha256 = "1yr0gijhgbxx1sl5a8dygr3a8g5wfkh9rk4v789r2aplvcbanv5a";
   };
 
   meta = with stdenv.lib; {
     homepage = https://github.com/travitch/whole-program-llvm;
     description = "A wrapper script to build whole-program LLVM bitcode files";
     license = licenses.mit;
-    maintainers = with maintainers; [ mic92 ];
+    maintainers = with maintainers; [ mic92 dtzWill ];
     platforms = platforms.all;
   };
 }

From a9d3d4dc6dad3e1c95cedd8ddc407b2fe9b6c57c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 18 May 2018 12:42:00 -0500
Subject: [PATCH 2070/3370] xbps: limit to platforms.linux

Darwin is a no-go at least:
https://github.com/NixOS/nixpkgs/pull/40730#issuecomment-390284212
---
 pkgs/tools/package-management/xbps/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/package-management/xbps/default.nix b/pkgs/tools/package-management/xbps/default.nix
index b78b0ae110e1..dbcd9dafbef6 100644
--- a/pkgs/tools/package-management/xbps/default.nix
+++ b/pkgs/tools/package-management/xbps/default.nix
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/voidlinux/xbps;
     description = "The X Binary Package System";
+    platforms = platforms.linux; # known to not work on Darwin, at least
     license = licenses.bsd2;
     maintainers = with maintainers; [ dtzWill ];
   };

From 5e49920d410b27e9430bfa97f94d40ba67d26666 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Fri, 18 May 2018 20:35:26 +0200
Subject: [PATCH 2071/3370] iasl: 20180313 -> 20180508 (#40613)

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

diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 22f80ae559f7..6cf4c85fb200 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iasl-${version}";
-  version = "20180313";
+  version = "20180508";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
+    sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From d33322d449502a5e200f876478ae44dcd049eedd Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Tue, 15 May 2018 22:02:00 -0700
Subject: [PATCH 2072/3370] haskellPackages.developPackage: Add a defaulted
 provideDrv argument

The purpose of this argument is to allow you to get at the derivation (rather
than it's env) even when in the evaluation context of a nix-shell invocation.
---
 .../haskell-modules/make-package-set.nix      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index bde4f85f6784..bbc3d856ff2d 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -176,6 +176,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     #   , source-overrides : Defaulted (Either Path VersionNumber)
     #   , overrides : Defaulted (HaskellPackageOverrideSet)
     #   , modifier : Defaulted
+    #   , returnShellEnv : Defaulted
     #   } -> NixShellAwareDerivation
     # Given a path to a haskell package directory whose cabal file is
     # named the same as the directory name, an optional set of
@@ -183,11 +184,19 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
     # function, an optional set of arbitrary overrides, and an optional
     # haskell package modifier,  return a derivation appropriate
     # for nix-build or nix-shell to build that package.
-    developPackage = { root, source-overrides ? {}, overrides ? self: super: {}, modifier ? drv: drv }:
-      let name = builtins.baseNameOf root;
-          drv =
-            (extensible-self.extend (pkgs.lib.composeExtensions (self.packageSourceOverrides source-overrides) overrides)).callCabal2nix name root {};
-      in if pkgs.lib.inNixShell then (modifier drv).env else modifier drv;
+    developPackage =
+      { root
+      , source-overrides ? {}
+      , overrides ? self: super: {}
+      , modifier ? drv: drv
+      , returnShellEnv ? pkgs.lib.inNixShell }:
+      let drv =
+        (extensible-self.extend
+           (pkgs.lib.composeExtensions
+              (self.packageSourceOverrides source-overrides)
+              overrides))
+        .callCabal2nix (builtins.baseNameOf root) root {};
+      in if returnShellEnv then (modifier drv).env else modifier drv;
 
     ghcWithPackages = selectFrom: withPackages (selectFrom self);
 

From 986bc559684da28d1ed1883f123b3b98f54b2c5a Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Wed, 16 May 2018 20:46:16 +0200
Subject: [PATCH 2073/3370] slimserver: Relax Audio::Scan dependency bounds

---
 pkgs/servers/slimserver/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index 0995ae041bbf..f79e53b64cf4 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPerlPackage, fetchurl
-, perl, perlPackages }:
+, perl, perlPackages, fetchpatch }:
 
 buildPerlPackage rec {
   name = "slimserver-${version}";
@@ -10,6 +10,11 @@ buildPerlPackage rec {
     sha256 = "0szp5zkmx2b5lncsijf97asjnl73fyijkbgbwkl1i7p8qnqrb4mp";
   };
 
+  patches = [ (fetchpatch {
+    url = "https://github.com/Logitech/slimserver/pull/204.patch";
+    sha256 = "0n1c8nsbvqkmwj5ivkcxh1wkqqm1lwymmfz9i47ih6ifj06hkpxk";
+  } ) ];
+
   buildInputs = [
     perl
     perlPackages.AnyEvent

From 2355a7f0e401043bcc83b4baf6c7142adcc2b0fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 18 May 2018 13:57:13 -0700
Subject: [PATCH 2074/3370] linuxPackages.wireguard: 0.0.20180420 ->
 0.0.20180514 (#40631)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireguard/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/ed69b3dfb89cc9d82136b356d54d21bb
- du listing: https://gist.github.com/0f8c8caf71b9d18efa2341ce03a212f1
---
 pkgs/os-specific/linux/wireguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index 6e3e444240ac..c5daaabd5be8 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -6,11 +6,11 @@ assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
 let
   name = "wireguard-${version}";
 
-  version = "0.0.20180420";
+  version = "0.0.20180514";
 
   src = fetchurl {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "05nsn5pkzvkfsc8z0mm4fdb1znklpmb00v608j8gxlz8z6nd535m";
+    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
   };
 
   meta = with stdenv.lib; {

From d44e68c856b1c21c355d79d4016510581de9fe6c Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 18 May 2018 23:01:05 +0200
Subject: [PATCH 2075/3370] prometheus_1: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index b71d9b8e58b8..37d82326cc29 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -45,8 +45,8 @@ let
     } // attrs');
 in rec {
   prometheus_1 = generic {
-    version = "1.8.1";
-    sha256 = "07xvpjhhxc0r73qfmkvf94zhv19zv76privw6blg35k5nxcnj7j4";
+    version = "1.8.2";
+    sha256 = "088flpg3qgnj9afl9vbaa19v2s1d21yxy38nrlv5m7cxwy2pi5pv";
   };
 
   prometheus_2 = generic {

From e3a7d55d3e6bf6243fafcd102ccb886bdb495a1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Fri, 18 May 2018 23:06:25 +0200
Subject: [PATCH 2076/3370] nixos/tests/home-assistant: ignore "Timer got out
 of sync" error (#40735)

---
 nixos/tests/home-assistant.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/home-assistant.nix b/nixos/tests/home-assistant.nix
index 3d920dccc166..797706a062ca 100644
--- a/nixos/tests/home-assistant.nix
+++ b/nixos/tests/home-assistant.nix
@@ -71,6 +71,7 @@ in {
     print "$log\n";
 
     # Check that no errors were logged
-    $hass->fail("cat ${configDir}/home-assistant.log | grep -qF ERROR");
+    # The timer can get out of sync due to Hydra's load, so this error is ignored
+    $hass->fail("cat ${configDir}/home-assistant.log | grep -vF 'Timer got out of sync' | grep -qF ERROR");
   '';
 })

From 0828bc5b1fc94abcaf5b9443774909c91d9f1e49 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 17 May 2018 15:21:23 +0800
Subject: [PATCH 2077/3370] wine: Enable on macOS

---
 pkgs/misc/emulators/wine/base.nix     | 16 ++++++++++------
 pkgs/misc/emulators/wine/packages.nix |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index e06460994150..0ff6f3f041e2 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -6,8 +6,6 @@
   buildScript ? null, configureFlags ? ""
 }:
 
-assert stdenv.cc.cc.isGNU or false;
-
 with import ./util.nix { inherit lib; };
 
 stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
@@ -54,9 +52,14 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optionals xmlSupport    [ pkgs.libxml2 pkgs.libxslt ]
   ++ lib.optionals tlsSupport    [ pkgs.openssl pkgs.gnutls ]
   ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.mesa_noglu.osmesa pkgs.libdrm ]
-  ++ (with pkgs.xorg; [
-    libX11  libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
-  ])));
+  ++ lib.optionals stdenv.isDarwin (with pkgs.buildPackages.darwin.apple_sdk.frameworks; [
+     CoreServices Foundation ForceFeedback AppKit OpenGL IOKit DiskArbitration Security
+     ApplicationServices AudioToolbox CoreAudio AudioUnit CoreMIDI OpenAL OpenCL Cocoa Carbon
+  ])
+  ++ lib.optionals stdenv.isLinux  (with pkgs.xorg; [
+     libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
+  ])
+  ++ [ pkgs.xorg.libX11 ]));
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
   # them to the RPATH so that the user doesn't have to set them in
@@ -105,7 +108,8 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
 
   # https://bugs.winehq.org/show_bug.cgi?id=43530
   # https://github.com/NixOS/nixpkgs/issues/31989
-  hardeningDisable = [ "bindnow" ];
+  hardeningDisable = [ "bindnow" ]
+    ++ lib.optional (stdenv.hostPlatform.isDarwin) "fortify";
 
   passthru = { inherit pkgArches; };
   meta = {
diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index a786babc79de..d2305aa37ba6 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -20,7 +20,7 @@ in with src; {
     geckos = [ gecko64 ];
     monos =  [ mono ];
     configureFlags = [ "--enable-win64" ];
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
   wineWow = callPackage ./base.nix {
     name = "wine-wow-${version}";

From c6f742b770924dd1af775714c588f79110e68b30 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 13 May 2018 10:53:09 -0400
Subject: [PATCH 2078/3370] haskell-generic-builder: Add extra framework dirs

Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
---
 pkgs/development/haskell-modules/generic-builder.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3ab77c42cbba..53974ada8009 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -248,6 +248,9 @@ stdenv.mkDerivation ({
       if [ -d "$p/lib" ]; then
         configureFlags+=" --extra-lib-dirs=$p/lib"
       fi
+      if [[ -d "$p/Library/Frameworks" ]]; then
+        configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
+      fi
     done
   ''
   # only use the links hack if we're actually building dylibs. otherwise, the

From bd078c1a313a0eadb8232f3732e9700cc52253b1 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 18 May 2018 17:03:35 -0500
Subject: [PATCH 2079/3370] gcc5: remove patch

The patch fails to apply & may not be necessary any more. Trying to remove it for now just to see.

Hydra log: https://hydra.nixos.org/build/72726891/nixlog/1

Also see #33722

/cc @copumpkin
---
 pkgs/development/compilers/gcc/5/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 443f3a7cf0b2..8c1170213f82 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -62,10 +62,6 @@ let version = "5.5.0";
       ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch
       ++ optional noSysDirs ../no-sys-dirs.patch
       ++ optional langFortran ../gfortran-driving.patch
-
-      # This could be applied unconditionally but I don't want to cause a full
-      # Linux rebuild.
-      ++ optional stdenv.cc.isClang ./libcxx38-and-above.patch
       ++ optional stdenv.hostPlatform.isMusl (fetchpatch {
         url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff;
         sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm";

From 865abfa6091515da3c776283500e45d489ed488f Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 00:52:41 +0300
Subject: [PATCH 2080/3370] wireguard: Enable tools on other platforms

Wireguard is now split into two pretty much independent packages:
`wireguard` (Linux-specific kernel module) and `wireguard-tools`,
which is cross-platform.
---
 .../modules/services/networking/wireguard.nix |  4 +-
 pkgs/os-specific/linux/wireguard/default.nix  | 76 +++++--------------
 .../networking/wireguard-tools/default.nix    | 46 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 71 insertions(+), 57 deletions(-)
 create mode 100644 pkgs/tools/networking/wireguard-tools/default.nix

diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 0591917c7423..acb4778d8485 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -193,7 +193,7 @@ let
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         environment.DEVICE = name;
-        path = with pkgs; [ kmod iproute wireguard ];
+        path = with pkgs; [ kmod iproute wireguard-tools ];
 
         serviceConfig = {
           Type = "oneshot";
@@ -279,7 +279,7 @@ in
   config = mkIf (cfg.interfaces != {}) {
 
     boot.extraModulePackages = [ kernel.wireguard ];
-    environment.systemPackages = [ pkgs.wireguard ];
+    environment.systemPackages = [ pkgs.wireguard-tools ];
 
     systemd.services = mapAttrs' generateUnit cfg.interfaces;
 
diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index c5daaabd5be8..c82831782e97 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, libmnl, kernel ? null }:
+{ stdenv, fetchurl, kernel }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
-assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "3.10";
+assert stdenv.lib.versionAtLeast kernel.version "3.10";
 
-let
+stdenv.mkDerivation rec {
   name = "wireguard-${version}";
-
   version = "0.0.20180514";
 
   src = fetchurl {
@@ -13,61 +12,28 @@ let
     sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
   };
 
+  preConfigure = ''
+    cd src
+    sed -i '/depmod/,+1d' Makefile
+  '';
+
+  hardeningDisable = [ "pic" ];
+
+  KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+  INSTALL_MOD_PATH = "\${out}";
+
+  NIX_CFLAGS = ["-Wno-error=cpp"];
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  buildPhase = "make module";
+
   meta = with stdenv.lib; {
     homepage     = https://www.wireguard.com/;
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
-    description  = "A prerelease of an experimental VPN tunnel which is not to be depended upon for security";
+    description  = " Tools for the WireGuard secure network tunnel";
     maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
     license      = licenses.gpl2;
     platforms    = platforms.linux;
   };
-
-  module = stdenv.mkDerivation {
-    inherit src meta name;
-
-    preConfigure = ''
-      cd src
-      sed -i '/depmod/,+1d' Makefile
-    '';
-
-    hardeningDisable = [ "pic" ];
-
-    KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
-    INSTALL_MOD_PATH = "\${out}";
-
-    NIX_CFLAGS = ["-Wno-error=cpp"];
-
-    nativeBuildInputs = kernel.moduleBuildDependencies;
-
-    buildPhase = "make module";
-  };
-
-  tools = stdenv.mkDerivation {
-    inherit src meta name;
-
-    preConfigure = "cd src";
-
-    buildInputs = [ libmnl ];
-
-    enableParallelBuilding = true;
-
-    makeFlags = [
-      "WITH_BASHCOMPLETION=yes"
-      "WITH_WGQUICK=yes"
-      "WITH_SYSTEMDUNITS=yes"
-      "DESTDIR=$(out)"
-      "PREFIX=/"
-      "-C" "tools"
-    ];
-
-    buildPhase = "make tools";
-
-    postInstall = ''
-      substituteInPlace $out/lib/systemd/system/wg-quick@.service \
-        --replace /usr/bin $out/bin
-    '';
-  };
-
-in if kernel == null
-   then tools
-   else module
+}
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
new file mode 100644
index 000000000000..8f983082a800
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, lib, fetchurl, libmnl, useSystemd ? stdenv.isLinux }:
+
+let
+  inherit (lib) optional optionalString;
+in
+
+stdenv.mkDerivation rec {
+  name = "wireguard-tools-${version}";
+  version = "0.0.20180514";
+
+  src = fetchurl {
+    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
+    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
+  };
+
+  preConfigure = "cd src";
+
+  buildInputs = optional stdenv.isLinux libmnl;
+
+  enableParallelBuilding = true;
+
+  makeFlags = [
+    "WITH_BASHCOMPLETION=yes"
+    "WITH_WGQUICK=yes"
+    "WITH_SYSTEMDUNITS=${if useSystemd then "yes" else "no"}"
+    "DESTDIR=$(out)"
+    "PREFIX=/"
+    "-C" "tools"
+  ];
+
+  buildPhase = "make tools";
+
+  postInstall = optionalString useSystemd ''
+    substituteInPlace $out/lib/systemd/system/wg-quick@.service \
+      --replace /usr/bin $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage     = https://www.wireguard.com/;
+    downloadPage = https://git.zx2c4.com/WireGuard/refs/;
+    description  = " Tools for the WireGuard secure network tunnel";
+    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
+    license      = licenses.gpl2;
+    platforms    = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7290f39927d5..3faf3c346e77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5500,6 +5500,8 @@ with pkgs;
 
   whois = callPackage ../tools/networking/whois { };
 
+  wireguard-tools = callPackage ../tools/networking/wireguard-tools { };
+
   woff2 = callPackage ../development/web/woff2 { };
 
   woof = callPackage ../tools/misc/woof { };

From f07c44bb7c8e71123cab80134eace62bc7ecc6dc Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Fri, 18 May 2018 23:41:42 +0100
Subject: [PATCH 2081/3370] houdini: Fix libGL (#40736)

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

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 7477e5c0af2a..b92012a29ddb 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,11 +1,11 @@
-{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }:
+{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }:
 
 let
   ld_library_path = builtins.concatStringsSep ":" [
     "${stdenv.cc.cc.lib}/lib64"
-    "/run/opengl-driver/lib"
     (stdenv.lib.makeLibraryPath [
       libGLU
+      libGL
       xorg.libXmu
       xorg.libXi
       xorg.libXext

From fc716e64a7d0ff8c1f94f16c1524242ffb0e18b6 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 19 May 2018 00:55:41 +0200
Subject: [PATCH 2082/3370] Revert "houdini: Fix libGL (#40736)"

This reverts commit f07c44bb7c8e71123cab80134eace62bc7ecc6dc.
PR was incorrectly based on staging instead of master.
---
 pkgs/applications/misc/houdini/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index b92012a29ddb..7477e5c0af2a 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,11 +1,11 @@
-{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }:
+{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }:
 
 let
   ld_library_path = builtins.concatStringsSep ":" [
     "${stdenv.cc.cc.lib}/lib64"
+    "/run/opengl-driver/lib"
     (stdenv.lib.makeLibraryPath [
       libGLU
-      libGL
       xorg.libXmu
       xorg.libXi
       xorg.libXext

From 13d55dd65afcd4c30b59ef7f07cf79c7db8734cf Mon Sep 17 00:00:00 2001
From: Kai Wohlfahrt <kai.wohlfahrt@gmail.com>
Date: Fri, 18 May 2018 23:41:42 +0100
Subject: [PATCH 2083/3370] houdini: Fix libGL (#40736)

(cherry picked from commit f07c44bb7c8e71123cab80134eace62bc7ecc6dc)
PR was incorrectly based on staging instead of master.
---
 pkgs/applications/misc/houdini/runtime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix
index 7477e5c0af2a..b92012a29ddb 100644
--- a/pkgs/applications/misc/houdini/runtime.nix
+++ b/pkgs/applications/misc/houdini/runtime.nix
@@ -1,11 +1,11 @@
-{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }:
+{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, libGL, alsaLib, dbus, xkeyboardconfig, bc }:
 
 let
   ld_library_path = builtins.concatStringsSep ":" [
     "${stdenv.cc.cc.lib}/lib64"
-    "/run/opengl-driver/lib"
     (stdenv.lib.makeLibraryPath [
       libGLU
+      libGL
       xorg.libXmu
       xorg.libXi
       xorg.libXext

From 0544c38ba4ac479d56abbb9dc9842c8fa093087f Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 19 May 2018 09:12:15 +0900
Subject: [PATCH 2084/3370] thunderbird-bin: 52.7.0 -> 52.8.0

---
 .../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 24b16744ff65..56b9e5cfb04b 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.7.0";
+  version = "52.8.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ar/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ar/thunderbird-52.8.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "af887818b7859b8bfc87e0ac7ff26c1fbb98a50968d18d174bce37c2132a5957a8c5153f0364aa3ec0f636831313dd3bac6512dd6e7f932ed5cc99ed2016e9b5";
+      sha512 = "7ba3e6d4a64ce91b16d79607c3530deba2d68b09c81f7509991c62a11736ee51278b3cd60ca8063ce94748bf0b483cd9d9ea3be4ba84b24bef56194053502550";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ast/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ast/thunderbird-52.8.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "dcf8ab98558b7d2b8e5d2a97406eb13cc93900fcd60502ea4d8469179d08c55d91e66c7b99a024fbc6705e339750b41d9537d4d81f53f8d1f83461b986a6487a";
+      sha512 = "192442636ec56f7751d752572122c8b435fb28d6801a398dc6d02896d1f99d51feebbdb906f3911da08bb9da2851d3ea29eb064949d53436a6764292a6aeee7e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/be/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/be/thunderbird-52.8.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "021f531995db9a0993e830fa8f1da6089d0703424dd8993c23e59939091f58c4baae5ecb6cf51770ff73743c227129ac3215ec46d7181d88cd52a39b2e0e41ee";
+      sha512 = "facdfa7f6ec8eacc6a9294958c879a32cd5dadd31364d64894f8ad1a38ff883a9f2471d49d1358fa79b2b585a33ba7d710b195ec6101760289b8429d073004a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bg/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bg/thunderbird-52.8.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "a60f13e7b2760e19592e99eef1bc52593cabcf1b70b7803dd4262b2743e3c755cb4381ccaf1e75f41d4360897dcac3edd7e79648a6f4e81da4a1e83d67bb3ffe";
+      sha512 = "5dae827d4111bf6f07f1f794ab71cfabd4763d9f344b9666143a0c559c93479da532056d43f25b8d130284b9affeddd4d08c8e7042c86b681a1566a7b8822c87";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/bn-BD/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/bn-BD/thunderbird-52.8.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "a73074fa5dfaf121b8f12e86dfc29189e9700a71a868f68a70ccd17c47df3a8512700893f981e065c5c20f9432ca764f3c59d4726a2c6abf3fd25530eca0d9a5";
+      sha512 = "fc5816d829c836b8c0995405c9e33ead778ffdff7d1ec11c57113b87954ca1be6e58281244fe5985f7eb84572e56202a700d7bf382c0abe0e4f11598929cccea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/br/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/br/thunderbird-52.8.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "28f4bff69059dbd1077641e888b234b0db95feb11bcb1db1ed047f3ab12282b9f95138835cca5f7eeb87a15ec1057b60587cadcb5fd658fbbe4c556d7eeed47a";
+      sha512 = "4b2ad9013cfe07708ec6cbab5fa79556d20d0146e5d853951c11c2d7629d795a7a9a16a6d7faf3c2dac535f5d368d98d98ca631c367c8b9cc6e3cd13763f6146";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ca/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ca/thunderbird-52.8.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "a9e45eda2b36bb12321140854e685fe4e203c7f56c1c8184a776c38d984f8381c6553cb5f601677f8e0e74ad497a040a18f5f392b99bdbe9535e19aa9afdcb7c";
+      sha512 = "2ef0f547dfea3d1ab97fba96673ff10d6bc0bdb24ea20c457b4baaf6cb987166219eb8d7c4e9c7a8f89b5933f65654f3cf8da8be7145c1378f1d5f51b8751825";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cs/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cs/thunderbird-52.8.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "2c0f60ccc5c9a9fd66526af3aedbe2749f35a5fa7509c93b7b60d9babb1b4968eac6bff48d042ac8112793fe2825467de4d0efc42afda19547e8c6803b723119";
+      sha512 = "57f55ea5c102274b42154433a9df9663f8594d62a5b25aa18fcdaedeeb52d6556cdbce8542f2f301f5c7ea08354d90ed769c9e6b95664d6aecdd3f58e7e7aaeb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/cy/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/cy/thunderbird-52.8.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "611ffc3d156ce4cedec0679bd9af3e8376dca5b20af2457a75d83dac7c71640a23a6cd544c190551480d6b37bcb9a9ec91342c2bca95cf10acb642d067056a04";
+      sha512 = "241729c3a385ca1fba281b5985513486a3fc9b768a41c4d8d1c0249bd9d3b4de032a76c6b2df383041840ec2913eadc854f2f8b85bc7de782a4f09001f0f5ab8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/da/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/da/thunderbird-52.8.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "0b858b5be09e038983a21715f58a215ea70fd811f7c8acd4ddb89611dd5590599339ab26913865b2ba75f4538cc95bd3e38e28646c281c041b0b08002aef033a";
+      sha512 = "4368a9301d40becf9675379c217040023faac8862482c5521a47f06e6c2a7466ec0b251475db111ed7f37c72cab0742e20b58463d2519a1fd6f77bc8e360330a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/de/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/de/thunderbird-52.8.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "cfcdbaec0a026ab246d45e00232f5d5f3f240f4957bbe41d70cfb421be438cbf8986920784d4d0350a274284b39ec42c20d33883f3f7fabf3b51df3a062fac15";
+      sha512 = "08c2fa848f3dc5fdccc498c935a03ac4e12d3bc3707beaafa5b9bff1c2aa51d6eb2a6e8373a0185f123a1ba77bb720e40ec9f8b364ef5b7a2f7810260ca9c372";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/dsb/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/dsb/thunderbird-52.8.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "52ef4b0dda8fe163675d46e7233b935b38a5899763012b0b9befb1ddd015f0a8d265de2adb4924856a4bc7753b3eaac2dc7861c5b75d8b231e667d29a583d673";
+      sha512 = "83ccb82aad5d63952674707c2c2317b4296f4b8ac56cd3ff9e294023036c1354f8f373d3b977f5f1cc5f9a9fb4876cb68b8dca786d5e2a07e28443e85e531e63";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/el/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/el/thunderbird-52.8.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ab92343651598eea5f8010829bde589eb88a795ad0a3d0dbd1a5889d162b966e0e9bdf7bd32f49c59eb49b29261a075da1f4e75de49f87aa3fbf95796281062a";
+      sha512 = "4e6f9982e661d6935bbf6b4490a0f66ab2c082ecaf3e6bfc67e32a878b3cb60c7e98d2b5ae07439e43aa4f0f5f7b64616dd22fe1e3db9a5e28e42285a2c1ac6f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-GB/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-GB/thunderbird-52.8.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "1b0e11a1f8daba6a57ac619d764a60e9af6874cf7468c9487e55cc4be7c981d9dd375931b8956ee307754eb846900d4831c313fbdd3eba4658eaf77940e4436e";
+      sha512 = "3ffb11f6ad966980eefa882933b2ac791d73eb338907b8c3915905420318f0e52e16037fb6e04c2add9641e4d89424a48d769cc472234c4b25ddcaa51913d1c5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/en-US/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/en-US/thunderbird-52.8.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "a8f4cb2238c3bf0ea6e4f8b444991bf0d6a4fe42cf7c0e38ae3738167900ac52debc0daf8bf4d7fb1e63326626072fc498db6b227337eab82ea48f2fcd561334";
+      sha512 = "d5c2ab406d1820745bf425ba7bf6b947166747d0037f1519c0e4a76a6036be9eed1e00e563c7f663f7472ef77a6a85b646f9ed706f26666dc1d4dd39dba3f917";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-AR/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-AR/thunderbird-52.8.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "adddbaee6899434a0eb1fb955cd99c33786dc9c7376f1e84bb8036ed41d5731c48917ddd5d677a9dcefe3e7f382bcbbd51921afe1e6e119a4d32fe2cf9ae23cf";
+      sha512 = "c5971b74a717f24047cf43c4a20ee5c3d0c952a1f3c28ca2692887426746afaa1e8fdf4abbb601193cdf594912013b20ecabdcf8dcd301db221a8a632056e0ff";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/es-ES/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/es-ES/thunderbird-52.8.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "aaafff39c8f5566056f5339310c8f633e48f78c57d2b4730a13377aa5c09e9698295e59e7b137def2706a3dbff9b48710e25a0db24e60dec75c06f9d0713cead";
+      sha512 = "7b58ae76bd7026088c5d3a6e00b64e8445c29a898aaba8363524d436dba650ae1438feabe28e599e116ea7d995c864ff84688a09606476109bdd6aad48304973";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/et/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/et/thunderbird-52.8.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "8eab1f67c3f56a39e21734cfefd11e84fea60fdbd3e470c1e777b607535923c451d7318c2bd7958435ae137928e14f97559781458d8bd6cb2e1e88d47dabfc2d";
+      sha512 = "a71f40dadab629369f8ece09613c8d7ad78314da38489705a880b436afb7649523f50c189501279c1c0269953c7561b81d1de29ff9c1fe1bd22fab734772e8bb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/eu/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/eu/thunderbird-52.8.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "be2dd281a0a219e031cc485c21341d259aeeb56d34f79a9db82033d1e17647cf8c8617a2fcbc6a46b2025842a46f1117e43ca769a449a64577df691bdfa18801";
+      sha512 = "2e9e6f58505c4873e5f3f263b75ea56bf50fd82320b78b2bb5ea0876773fe87ce5b76cd4e48c0781565690a28e86cc611ff17e7223db4134e2978e0729e2630a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fi/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fi/thunderbird-52.8.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "21535608a1197744f9385b3eca5c7dbef8f3a05f9639b5011f8abf0bbc0143db17954ca4ce1bfc9ba1f5c4659a4a0a74351e30e5f57c1d416d7bf11273211f61";
+      sha512 = "5b22836043bddda0abefd5a9613f17ee147988de819d221f184482161d1667c4a9555763376e5d0e28b3f0fe0ec4482994368ca26745ccabd1826db0bd847af9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fr/thunderbird-52.8.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "ddda6457d4bd737778105d0bc7086e64ba58d9fb23a083977b456873fafd3170df495a2d81fa19c6b12a06d32e448a2cd224263f4773c0d165226c6f56cfbcec";
+      sha512 = "c465c33cf95bced2fddd7d4e3c624c3f98ffe02c2aeb21ab8946c1b1c37a31211bf79fb80a5fe767872dbe9cb1cfeabcbebea7bfc8e8dee1404b8c75c9aa6a4e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/fy-NL/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/fy-NL/thunderbird-52.8.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "aa3844d3d17a8fdc201e55352f52fa7805328e9f0b105b729cc8cbcde117885a6a6671d343469e7fad61fd9a5ebd8d87faec8f4a214744771ec4d2b43015c975";
+      sha512 = "51d262f87d2766e1c44370ba8f9d22df7e2b0876059bcfdef4b9b7809056468fab1cc6ee7abb892ce293d392548ebbaeccc55bf58c251aa774a8d936a7a50ef3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ga-IE/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ga-IE/thunderbird-52.8.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "30e88160a0c19fa58d6d86f916a86d95362bb8b8d073b1ac0e17608c0c5bd9ac040402dc950579602f5124e40a814e582ad98cf0853ecd8c7b11a7418bf0441d";
+      sha512 = "f9354bb331f6ef82cccde57eaaaf73887d904b76ed2157ab4ffcf37109928160127714cf51586032049a78e7215c43211719f2be1c860828585a344742c1ec91";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gd/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gd/thunderbird-52.8.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "7458c820056c89b15988424325785ef4e525c2fb970b6c7c04d8c3e8b09cf7a3592e16b5c15862c84bcf95e2b399e37874f2c099c61bbc76293e4d5d8ed5980d";
+      sha512 = "926060b60e5fef2020c27e64a93c246ea9f477d82d8138c1a1e6439098e8e1809aa74747d45ee9b069dd32ac07624b24b022d318efaa3c1b5b02e8c8d599a54f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/gl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/gl/thunderbird-52.8.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "6be48b4ac248cff0842a5b78023dcb9787588c74ce1db89bb03a9a99ac0a2ac24a6949ae125219e99caf93260574d1c84355ca8f0f9c76ed15731d8a4950c98c";
+      sha512 = "d07e61440f1e938b0af4b5db38187a7cf7c6ca8584eec093c292b5f6b7096b529fc20db06766b11001f8d13e1c7dae7a5d3c798e82f3eac9dadcf8a8a50107bf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/he/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/he/thunderbird-52.8.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "3dca324d7b3b00a2cc98f8949165d178be7bd68b118ae66383a0d3705925e3f6bda14aa25475886c1f9810cd15a48a79e81924b8ebccfb528ad4bd21e36ebf8e";
+      sha512 = "7661135b35207b781bdc9a402128eaaace6f67c8558e6cdff271d946c88cf023de8307ca1a7c0ece4e0424e37d38b2b5e2f24fa966f7e13078dd56dc6a1972d3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hr/thunderbird-52.8.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "23d5b2b0cb48fd274856a60dd9f916d294c8ec133771ff624e88cbdec214182c443ed5fd2d424475ed748113f84b74c732092f51061571104b1a62c301affabe";
+      sha512 = "d5db8e96bdf2061d8f24b9b332b9ca4e7fe64316385e32f01023520f80605bba50b2de8263d7aa67fbd5b3a9b39fd20a050bef4742804da4ae03b4d866ed8012";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hsb/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hsb/thunderbird-52.8.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "7360e964d5322e433014eb10f369f27a6e4ff688ed441671ddaaa3526b70d212509c16624ca854e988ca581d0f60ccf31db1bb49b5c93521a5d07e697be84a4c";
+      sha512 = "9cff35b2b5a4dab919e38180cfa88d7c3c249c9e119f6de850bd6e72018e6a62b1078ddafaef6c73c210b8c1dea3caa7987d88c75513f76033186bb7926f5e81";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hu/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hu/thunderbird-52.8.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "5aaaf22f17015026a32c3648323fbca16b3845c0f52ebfd3414c11e1d7cd1a0e72a8319e924b9eea67bd9c1448b87585709d3b99a8783ed580e11020a762eb31";
+      sha512 = "56057845898226d58981107d1ab14c3ca02547c0767e768f45c48f30097e14a7745c43b3b2b0bbdae81bc6ecdcd323194d30006ad20ab2b0de2cb3b29c15dba0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/hy-AM/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/hy-AM/thunderbird-52.8.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "7159dcfddf5981e1ddec5ac11613a7b30c513e0319249f08196ec88fe3e2256b52f3e1e418e46e276c1f35195f15d778b83d27e3186b2b8571e0b374844f6248";
+      sha512 = "6595e53a1b790cc2ee47f071d395dce94b44aafee80d2efc1613ee44d3698736db972f45806848dd9b35de699dec53b8b5e64e596b0b49b1e829326e57880904";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/id/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/id/thunderbird-52.8.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9cf647ea244bcd046f73cfcca97c5b5f2dc3f5b0991d6edb100b4c4263ab75d8b5d07a418b906b66b50d9c4f29360637ff4ce605dbed7bd85c9b624d33331ae6";
+      sha512 = "878b475a2073c97e6af40bac24c2cfb88a73c8bdcba58b5d8cb2958f5114093fabaa6309f32096347c4ebb4baa828bbdf0077995284f1d2ae32eb234a7ca1d78";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/is/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/is/thunderbird-52.8.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "d567dd894926e7a5288da3f7a2837ded333772c799acf6f27489327b3e50236561dd0a9d04e3623d23a6d00e7b35c7b8572c611bf1e767b4f43f7d5164ea3787";
+      sha512 = "a8ed951689420281cbfd660bf23a4e5e3764da4894b31eb723b18c2923ca7f5f1b13d6a279f93d3cdf524f0a9387bb706c3d187ee4b84c74490fdba7867ffe25";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/it/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/it/thunderbird-52.8.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "e3511d7fed2617cb6cd59b1b56189a5f70db7f98cf889ce0be31d6931d0500a61b7d6a7f9907009bdaf37ad968b50aebae0930467cd5b0b70a6d2caaf89bc5ea";
+      sha512 = "24942a2fb5dc9a41641232f728077c8bfe5e99c5766ef4327a11e7e60858520a267ef12e0bebed7d9ff2664ba45d672fa1aa24c9ebdba9048bba10f6e73f6d85";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ja/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ja/thunderbird-52.8.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "0a4cac4b246542a42534e2b028a84cfef470c884143a08c489b56906a1d167ef66de82d326874e49d22a64c259aeac21b76f4cc2b20acf2885040db35decbc41";
+      sha512 = "291e715308f4bfb605fe987ce774d3f5cac211f920f62ea5e8abf12b51458f2da19c36329eca8fbbf185ec2eac9793dccc3d7483b320c0341ecc17bb477af263";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/kab/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/kab/thunderbird-52.8.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "9b6939d454dd5f0635d6fa3cd78d57d4c3461df67108a9c20a85cded552bffb68ca9f8e9af037150a0cb31588fcc663a0f1a8b91183fd257eec5e144516b5ca6";
+      sha512 = "de78483cd0b0a35687e091c52bd57d9de400a97ddeafd3b7708565501ff20da7ca1025940198aba6d410646d72be39bfca780d36df6b323ceef63cb085b214ec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ko/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ko/thunderbird-52.8.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "c965abf90339a3b8dbaffacd61b33729a0312052ced29cd8300cd5dbb577b7b663a314a5d27528f9e03ca55753ee96b392ae745558e59eeebec80857dcf34b3c";
+      sha512 = "b87fcc1baee680496b5bc13b1c87a3440c50f46be6e22b175cc8aff51bfc18bdeaad662d3cc10ebb255cfdf6d35ff2e59e9082f9d36dc5ddb079c49cda4d9d70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/lt/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/lt/thunderbird-52.8.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "f8724c9f29d2965e23a90156586ea85721b5c5693c56fbc5932ee367c87a4531fdd318968cb38046f748dd60f4ef0ebb4636a2034f061e3e5926826aaccff410";
+      sha512 = "093519e8b927f2d716f76925fe40dc0b63835e51c446bf6759992419396f922a38f24d6f8e3fa2c0c252f391a2ff812084d26d36d414d77ba5d961a091b12756";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nb-NO/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nb-NO/thunderbird-52.8.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "87bd58ae4dcd766c0b3403e578c41ddc46b5801bd743747a23802770099ce37f55daed7beca134835f0f16939784d7d082b8d6903fdcc993cec56846b1d55c5c";
+      sha512 = "970a4d41c779e224504524ab8aa2b3bf83c71facc5f666c887b2eff27a8ee39e15404c0812376280dffa0c0642216e6e966004b577572ddb8d9e7cfae0544059";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nl/thunderbird-52.8.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "3f332437788bd314e8a19fe3263631c2000cdaf30505129b37693fbf499fac3d15736b51d2838e49daad8e9225094a92bf3638fee6a6e33f2cfff6357f1a1597";
+      sha512 = "7248b9d9a51f5f0b5b628b744e935c1d9c21a0a41cb5d77ab66b2e470bf6788774f1b769435f4526afb8d7c28d8fb240a3b3a918b6f20db617b599285e11b5fc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/nn-NO/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/nn-NO/thunderbird-52.8.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "4bd2918e59a87ad0afcba3e82640a0c729fdf672c1d977cce62f3bb7d92e14e008c83fc362a5c162090a3d4c0a5608262f5859ced2327274231ff534b6768694";
+      sha512 = "6f8e73df3122bc6985f7c37b5eed90c64914e83a800caabeb27a5b155085b5def8685c6af237e8f0cd605db28681a5df0cf4cfed32fa97b6d594666041bbca16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pa-IN/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pa-IN/thunderbird-52.8.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "f0c448cf25471b1aa4387208a8d0bd7e41531fca86dc7118f4467d2db101835af3be9ba79713bcbd8d8556895efe4a2af68606df18fbd506734359950e00ebe9";
+      sha512 = "56f1e10c22acb54a5e6dea22be888525f24e9afc7ec2dfbe8cefee45196737bc68f0a39e7b25e0ab1376b3d7301f753958a11e66f60392f340a3f3f5896c9d5e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pl/thunderbird-52.8.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "5f9bbd0a1be4d0ac5c50c281ae75025f4b12d8781a73463876f26861c9289c51165cb68ab4438401ded5ea484477c1fe862f5d57430624bc11871f0b36e2c50c";
+      sha512 = "3dc5ae6f3e6451fa942fada6e2b7d7643975782cd9c43f0df9473f40117a5b8f91784462c444683aa180ff6decb677bbb1765bdbbd5ba69080fac806b4c7b97a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-BR/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-BR/thunderbird-52.8.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "afb4ed9a2739e0d590ace16f4dc8c4b1d19d05537fcdbd1f23e404218387d2c016715a074b630885a903588b8bd4a8329190d6ddb9231805a8538b4199513a6d";
+      sha512 = "ea4e6eae43d379e92adb54cf8a0e7cc1baf23bfb427e752f41d95bf9411dbf092ac94794aefbf2983dd7031db0961585c7bef31be63633035f907afb5a8f1a9d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/pt-PT/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/pt-PT/thunderbird-52.8.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d907bee397dcfac8763c7dfd18d5bdb5bd99afbef554a98f625c36aedde922fa03c5f79e46acca4ecb07f9adf6eb59c869b1694c68e88ed759e04abab13a210d";
+      sha512 = "0de5ad70739e456fdbceef8ba89445f37ca4be23a9b213ad5b52b92656b702dc7ab39d6b27f2d9012ee27c46a4749444a210070ced586963577ee386726ee72a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/rm/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/rm/thunderbird-52.8.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "61c70149b717b193e541e49614027a5cc5c4f5a0a4642bb5445843b2c53165ae29088773498245de3e8d3324c26d6d96cd225d9e3e2e491f06d0b60586f23d2e";
+      sha512 = "dd947ad65fa23c42f2a1d118343b54deb2e7c9ef374118e2bfcbbec0d5ccfe5217ad0d636e9b4eee56f1e373beca52d8ff9f12593ce77b9f5aa94a1f62f2dcc6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ro/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ro/thunderbird-52.8.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "d9d604216c4805fbaa0444c5f61c7e1f8dc5609adde7bd8fc301e4ff0577b73a255cc95aa07f13543ce82b5487212b9b0e4284be47b2eb897a5c1880ed9fcaa5";
+      sha512 = "41b74b034f00a7ec26aabe5b5cca0b4a332b161be06f15a41e0c850ef53760ce1b284bcc8b71e1657a20b46c436c4ab6ef0bedb8f4a00c46b59bff825c5d5583";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ru/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ru/thunderbird-52.8.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "e385a46635372660a304d4cceb86be56d2a07b767a4eb17b131d67eb33494c878ed4e4cf3da3a1a198a9f3cab7c541161e325cbd9d5957c8af56d2a62118ffec";
+      sha512 = "4bc1aee9cb629f59aba733a08d4c2f5951006e30ad38584688fce6772d19e2a01dc6ddb43b6c0d7375638c8e0714703e6e4cf47fc639c449a1ba02dabe7dc44f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/si/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/si/thunderbird-52.8.0.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "952e89769e201e9320929f0562f27ca2de25a7bf4f0098964df6974831ef342f228de0278dd2de55a0d11c36804d04f42b9c9714f2c1ad44f5d68da1ae184d54";
+      sha512 = "663ab05d2e5f90f1be7fa9b2b61734f2c5c7d314ab86196629447c05d220f8de0a405d7ecb67e333d0c31006c0f0c384fa891fa087335f585a757b397d29769b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sk/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sk/thunderbird-52.8.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "827243b12ae2eafbb0da9673f914e26755dd3a54931e41a85ce89ab236b56bdf4ac4c256769865928509be4b998dac4a4924895ba583192d95b7271788185822";
+      sha512 = "4e925c2ec5d218b82722d6141b4e7b9f3216ba35b5e8260cf15c58f647b60e93161e9bdc8501865567e693ccbe3b40458b69e85e7b7a0884a522a68cce2df123";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sl/thunderbird-52.8.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "d4063aa855abd1701feb078471e628728e3bb61e8799ac186c75b325b4db14a81734befe4782d75cd07170cceaa37b83de90d1d1ba73f950f7f76e24265cf49f";
+      sha512 = "9c0e33622d3cc6e735978b35643ae6c4028456964255b04aeee28486177e1711354cf1de02db84c6af928ba176578abf5b6a2a12a248389790fc6ade6fa96e2c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sq/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sq/thunderbird-52.8.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a90f3446a0a759fd9cdac2ea0251c676539f5dea56099d0e515fdcac72e881f54a95506f257da91b87d4be547b4377cfe8a7345e5087ff63d24e8bd2fc6742bb";
+      sha512 = "a6642a2c55db02058ce8bb9111afa3a9433372494e1e613fd8f1d575c64ce95e0c0e61a8b9cd60c662266f3347cabfebfbc606bfa333a121396caf3c0f89737d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sr/thunderbird-52.8.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "f313d71b58efbe34f96ecdccb0ed14977899b6038d2a5d0d7c3138881a7668e8282e4c927f106fdfd1d74774404734e57d97d0004086997ace4ca53921321adb";
+      sha512 = "e472a07bf64547b912b80a32212fa9a0c25023044aff165cf92cad8af1796fbda9d36ef32f6c11bf9b87b75babb4c6fc6d9d5463b7b88f31649298adc6947b50";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/sv-SE/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/sv-SE/thunderbird-52.8.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "0889f3c2917b01211dbb5d28262726a3dd077dfd5327fe1f3dd4742cd45aab9ab8d7bfeb141a5a2c120239c522182e46a263ad0d6cb8c2d71d4c9c004d734a68";
+      sha512 = "18cc4af474e717dbec7ff88fffc6635b7fec7d8936f0c7d903c42a1b9482186d5d0a2ca661491f76b477c57de45e03c995c562e295e5fca574534d81d6e6d30b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/ta-LK/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/ta-LK/thunderbird-52.8.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-x86_64";
-      sha512 = "49bd7127f1412a48aa7e66bbd2957cbdb4f02d4f43cf856b8b796562e945a1016852d695773351b30b65ee0d2d4b65c9aff4c347e9a5c2b64bc3818cce65ae54";
+      sha512 = "22f8d3345de9de5eae1cb05bbeaead160779b9f8c1187ace426d7ff026ec0ee0762a56b909f22c2bcdc186088b333d6fcf52a0ebf87ff56959b31b1f6dd7777a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/tr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/tr/thunderbird-52.8.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "6b50781107d219c7a86bce30b51c5e791627fd6305d1573d4fda98321e8476c3978a3b8d388005bb6d05ceb0ed0c6c119f9baf1d057b1f6d533d0e42baa90a51";
+      sha512 = "fc9365d3c869c1c3c1c9435f00b5f8eeee6fb231230a5fb0ff48cc59a8184f57bc558ab7f7386ebaee74b9c61c34bf5f7c6e882cd0e431749247b4a58d068c50";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/uk/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/uk/thunderbird-52.8.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "58e7e921d7d2ad46237ff66bf0f2cb0de448f68668968b56779ee874d0a9eb29ffc46876b6aab4a0c30e4aba597039c73939e6d454c8feb56cbb6b4215791016";
+      sha512 = "60ed7415eb87d9f1eedc2c92078823dc49db80652f6ad26de0ceeef34b7c499ec940ac3bf083a7731bac9c144b6bc04546209aabd1ddc0b399ac174fb88be6e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/vi/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/vi/thunderbird-52.8.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "5a2bee3035e76deb55d24d5043967e51dbb9d79dbc7cdb5dd9f59cfa2311391fc25017f08c709e7d33a5fa7ca0d8ae375ba074ae382a67f46b04e36eed504f53";
+      sha512 = "ea5892eb57fbdc0169f5dc39b2edb5eff2d06cddeae506e979d7556164fe55a65a402c7d791c873e6d0a3b48b97722d8dc90aae1b7389aaef3db836e803b9825";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-CN/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-CN/thunderbird-52.8.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "73983afdd0e07a394029f64f1fba5f24ae0bce80ef7f9fa3f5374af3b5e6a094bb41d7428a252396b433ca59a092e5d19b20eeefc5867d68bef00a1894437159";
+      sha512 = "22ab8baa3a41beda58f02612bcd5e0a9848c3cb93bc68037ea504cdd0b2a0b5ea5bf78e5bf735dcbad4079ebcb3c5434c34d6a5e2a9f09a513f91018084ce960";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-x86_64/zh-TW/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-x86_64/zh-TW/thunderbird-52.8.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "71ba36ffb59a94191ffd6bd24a00d3e35422601310b70a6f411b8ad0175d7f67efe9ccb8d0a2a7c1d47263d5d1cbd0a4f790ef54cd174875d0c0bafa86481457";
+      sha512 = "6c089225c57a0e010b0d413046004b53570afbf2d3b673dbca9a6e8cc102b6edf0e3a4f4858add4f5c1a4bb1fadc2641bd1c1dbc8659f970c84f61869b3634ea";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ar/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ar/thunderbird-52.8.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "fc69ea6bc9393f55e247a78eb747c4ae6ae0c30efad8188d50eb52f4bc3f2e47e328788cf329966e8184b468a58bb923fdfdc736ff7b7b37cbbfa31bc619e065";
+      sha512 = "d48822233fa44e48b762e6aa2da302dafb38c32827b112197563952b35ee453a361a45eee35c6ee88317d6cc5215d0276e74862b167b01adf62f9c275f89a38b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ast/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ast/thunderbird-52.8.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "74a6ed4829522c0ac7a4411ab4d269f557391c53d1313eb1b70bb6e3fbba30217343945e60d46bb7c5fcfb20a40b2e6bc0c40cb66bb72259be4f9ad78796bedd";
+      sha512 = "3894ea6a01b335b92fa0d9f175aacefdf4fdcbfaeab3f3f5faa37f0bea090ebc7bfc130fb42ffff2293ecc95e3bdc8bf6142a5896dd4165fc3fa9f8e09fc3b5a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/be/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/be/thunderbird-52.8.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "ba645d2eaf0eaf90a0c1f2f24aa87c6783405fab00b2608aa1e3f88f1f81877c4927e93e2090509b9e06c8e2655a4aa731bed47ecf8992bf12b9c5dcb189c0eb";
+      sha512 = "ad93e61d4d1437681bdd772ad815efcb30716e716a08a442b9df2351b27118a590426d0ac054c6f41c29f4abd14f6e8fe7a54206eed810bddf1a70d6afa6776e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bg/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bg/thunderbird-52.8.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "62dabdc80e0e3d46b42c69462d18964e584b54fee80bd632c0a3be19fceabf6bbcb80ee6b200472e52998f90252a7e62355cfa9d7d8ba3b3bd0f7bf247557c59";
+      sha512 = "de09ff65e4c24aad1faded64897f9cf7bbdcc21d4ed609fa1bb0d9ad5d5a9d1d4e780fc2d8a386890e6cf59641697fd1542701689ba82e22c844ac29012633b8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/bn-BD/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/bn-BD/thunderbird-52.8.0.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "11acf4d6546aa3b3b1ee3159fb54e0769617664155d1dde4ec7d5af28335e90b428559b80e570d2b1829153f2edf8472e37e8e2cbf1d72567258e0c76aab4704";
+      sha512 = "a5f3737e2cdfa540adb3682542163a5f9c34605e975fd66bbb579c1508f485ff891f997a8c90d576fbc09d5c4cd183f123f020df7a3cd1f23401e7d92e930724";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/br/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/br/thunderbird-52.8.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1056f78922c277ba64e3dad8e41ebed516495d41c07be4026271a2ca97d314218ce5a46c8b29be38645507a9f2070663cc6bb5deb194ee2d57df01809cb2d3ac";
+      sha512 = "37222d22ed65271e08fbfd32d5e6fa7cfe65d5d002116bdfbde8fec9c3877bafff6b6ef38680cd4373a1c86ed92402aa5afd5bf04f369029669af5451c9d884c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ca/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ca/thunderbird-52.8.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "f50bdc6d1bdfbe4bbfd8aa8ce3938e2ca6963d0fbc0fd47d23505158bccfe328195e45c0215dfcd354847e5e3a0897941790a7cc1f1db31ec29cbfaa1cae7a33";
+      sha512 = "87adf55bc6b50881b8d7ce30170f6e2f346db2c7f9801abbe37a17ef274417a3fb7dccab8d2eecb25d6c61a888ffede95c2ed40b6fe097fff2cf49a0e9490a00";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cs/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cs/thunderbird-52.8.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "7d8c6d9be08bff6fcea06a994c637ea83576377975476edc01dbb152c8cc8768b00bab4295d5f13ca01451344aa64af6ad227e359f3d11bcc0228b31fd13c1f8";
+      sha512 = "055df8c29546975bfca186dfccfc9fde5ba418f3f2be1e15c77ac00c3b759527609427aa6590e3bb06e417211be6642bc37db4d19be6c3b866358d65c3aa3bbc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/cy/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/cy/thunderbird-52.8.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "8bc583a05e872f36df9512ffd5c06cafcee81c632358b5bb13d8a920689b030e8ed4996bfc265c074d5d7959a1e75c7180900b51adb30ff3181de496cd34a4eb";
+      sha512 = "c60e61146c3fc195c482106d40a2eac47d0b621a13bcaeee5fd95a40ffaa5ae810f58a5ba85b2676a4277ad3fc6d7caa3907b1d4962fd42887e762236e7e9366";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/da/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/da/thunderbird-52.8.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ccef5bffe4a807d55924ebc8b36f0065891f03520fbb015547da1264997e95cb9e919aa5af838686af070715ffb314ddf6abda0e99e1e06657a2ea6fbc956441";
+      sha512 = "1f8634f680512bf4ed0a44b41f3be55c118a114dcc262ee41010e58abc29f8bc3032a4c5264b948b9e4e13684d42761d97bf612050b891b4f52c78e91aa5a0c0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/de/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/de/thunderbird-52.8.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "02061b7572ad3b784a28926da15abea9fd9c93b4df9c40a5435190e6d872d356b6001cf0666e4cef0696da32c76e64cadfbeca28f6f894b1b230033d451fe105";
+      sha512 = "9422296b970e77217581c0a10efb928923e55272baa485ccd1a7446d6e9a84da23e6f2b93623922ac85db84861ab4813282e328315bedf9e3b8cf344d869108e";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/dsb/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/dsb/thunderbird-52.8.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "458785317a61ff0fba04524b13cd72e22d4cdeee69bb99c849f4b12385a19f3236b586ab6a12cf9c8042a444553d1a3f82bef1f51fa9cd11639ec3911eff0013";
+      sha512 = "281736767a8d59830b1452eff5e5058c4090661030068bdc33d2ceb960f10c38284c32ff94345685fa7a7781da502f67c34fc83314728161d75c5fb3fd0ad0b5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/el/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/el/thunderbird-52.8.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "5b8fdd6a65b4057eff462c5ae8cee366ced8ee482892c0457a6fbc52303b8dad96437230f18f560a3bef3f392eec43194b89715071b559623ada47fd031680a5";
+      sha512 = "baa144336339a3a271f5a852b3130d20054baab3633d453015a5862e630dd73f3a99f50b979da7910810e84e99120a2afa96f8dca8c8ce0017824851deb9d702";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-GB/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-GB/thunderbird-52.8.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "0c32a412f9c7ad9195e113ab994ed8e0d80a14bcfdd70b3fc51399eca7e34241a265a7d81d5cdeb8a7217a0c694ebceed45c3b038de0656ee3a03bfde1887b3b";
+      sha512 = "b9573d177ff237ad833e8064ac72f7560940c5accbb7b7f663f53f6942e0326ed451e2290b09003ef6b320b860cd388020b00cb340d39af34b38678556704390";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/en-US/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/en-US/thunderbird-52.8.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "f7f8bf3f74052310987b546bba0f986abcfd65e53125c2cbde4bc4744e27de054f21eba8080313c28c9c3b44de1d773e4471facc9b71f520b6085c32cfe721c2";
+      sha512 = "5f0d43831c256e00eb3cbe5953cae5b6e84f54bbbde8b71c83f841c38b3704620e1163bcc5cc903a0b716685371912401f90bd00f5500fd42cc6debe97b28470";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-AR/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-AR/thunderbird-52.8.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "0187b3cb9b91d43d6faf217dca8566429103f2bb3c04bfb59e842da9c464cfba3f542be3789bf0fd46e6ca4c355d632f50b16b01667671e41231b8ca8d5b75d4";
+      sha512 = "ad640b2048f064d3e0914a0e79311e66c169258dd259a6873983147c37778616eecdc6e22aa64db272b534813a11fd1a0e5c555ca158d565513f3f201197a9a0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/es-ES/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/es-ES/thunderbird-52.8.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "876de2da5068acdb546d5091c64bf3edc4269a3e6dde2c2d928cd05439570773db4272819fcf8e12c63f94cdc41f0721412e108f078d1cd11501dc31966ee3d2";
+      sha512 = "12c3f601473909f38f737a353dbda2bea515cec0e6934c389daeeb470a489104d8aa7f920b0d81f6da930f886ea74b0c82dc6a49a2142c1e843c458f597c1a5f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/et/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/et/thunderbird-52.8.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "2ff7a791390e955cb2489c685504b5a118396d99d225e616e9bbc09b4f7be70d7a2f1a925d5cdc38b944e2476904604356d9e3e0dbc497258a133ec80ab499cb";
+      sha512 = "840cee14b983e20a0aa6847e15aba2babdbba947b6df38c14d3d5f3b50dcdf6cddafec13191c75718634a15ec757ebeb664172d09f841fa2ee55db02bdc67cee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/eu/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/eu/thunderbird-52.8.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "bef88a12c122f2d275e1fa24a92f5cc6fbc11534414ebd151e7d53d95d1c5ab06045270221ceb46629160eafd60bc1fd8a8928c13915493c83db231785507c21";
+      sha512 = "d6b4c9edcc54f22f39991c206e7316ea172e4450fca39202a81cb522040abea08eb9b48e296baaa19aca12d34de0b8af8379c1faf30a1111648a1c0cee84ac70";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fi/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fi/thunderbird-52.8.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d2c1be7209706fa96dc20af9c30be61557e0bf82da575c7b95fa8b5d2fc7ac6b7b2101bdf0db169694fde66cd1da60edcd4b505b849b1949ee72f12d7dbef200";
+      sha512 = "23b25a0ab4879ddada9026991fb9955df9d32d635c4d0f746d329dcdfbce4593cbf7a3217845b8ef5f5a1b8e39a8a6bb1447557a5098f19acb82027e5993d549";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fr/thunderbird-52.8.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "194711b687ec4ededcb9140c7c1c3e1a0ccb47759cd00ba56819a3a7d9be66f9a7a29e2a91db0b1d573d584953871a37781877f43e734a8e39599dc6e8027622";
+      sha512 = "4033f784c31e8e13cfe408782e8b4e528f4d099abd02480090a28c6d0079a5bdd29ee0cd0953d5b94434c60d11c6b9867b355a8d8b6296ffee51d78337df3931";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/fy-NL/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/fy-NL/thunderbird-52.8.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "7b9ef6651166e66c6abb88b79628a0c51f576f2ccf2dc5eaefd1c01100a492ca9fe1657aa2d6745079e0f422e0f2692d24389577b47248ec6713817e51543c6e";
+      sha512 = "64959a9a0d45564ff2ff344e1494c7f3d80792ecd8fd7df8f2ce3f35676533b033183f24ce44416f3cbd281dde20a7c7f2c3c488e8476d606d0416bdc341c02a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ga-IE/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ga-IE/thunderbird-52.8.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "801af21d297c95505afb3bb6cc79edf72057ffbb9ee9da56c1f283043e6df921239a4ac8eb3d7442286b27265d3462569f79e29adc88b7674f7e9d8396ff3109";
+      sha512 = "255215853d3eccc809b71b653d6e830d1cc3e5857409f8d8f91b9f7a2d6e4cfb1033ba927e79a407f482ef8b56c1175d2b0162eb04a153cda8c2e156b0da8c16";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gd/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gd/thunderbird-52.8.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "f778ff74408d3d9c7ba9c62cfa2c9447932b15446801df1c5363cf7c2059e1aa89539c1270fadbfc482c42b5c1845376e2fe037741fc267461d0b22f8edaf859";
+      sha512 = "483550a103337dd7807b85ff87ce0fead21851ebba75a470be88796017bf412979be6020eb3daacb7bbc15044236093277b6b2dac1ac66fa2c3b2fc2e403911f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/gl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/gl/thunderbird-52.8.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "ce541ef081ee8f8946f71b07a820ec31c4241730e565a8bf781a844a79fbfb0258d2f0d371ae3f4690067b6c520a103f4df996e8085d2a8afb997a4f1fefd288";
+      sha512 = "bbd79bf49e94720ffed29c07555488164de1188212fe4ae0e6076ede587997b3def662f880176e267d11c4ba1b1d4cdc6ed6721ee771a7cd9acabc3a231f76e9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/he/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/he/thunderbird-52.8.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "ec3cef4bd411f6604e1ec3486272208aaa41b1154dad1473c6fbb483ec2d3960aaadc11cb592777f49571bba35a0812f4f0a14c0edf9eb8a7b1fc70d56fcd4a1";
+      sha512 = "99b135b3f4aed9909daf8c2711ac10ad9ee85beecbc127e112fd61fb51a7d3d8f8575722cef0e7da6d4f79aa38de72ea4807c9503af5974c1ba9787180ec014f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hr/thunderbird-52.8.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f27bd94723f65c4972ee41cf6a9397098cfbf9097e3eeb06b7b41d50b4f0143711fcd0ad59a04f23ab9acb42d3f9515900c067f9532366ae3333ecae2a54f965";
+      sha512 = "a11ff16f2993d07d748630e94ec7bd6cd7634506535f3b7e7cfa5d16439fb6d2118ec195752cdedb87bfbee20feb629b72d6ce2f84b72a1da87b876e8e9786dd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hsb/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hsb/thunderbird-52.8.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "7caad57604b9d83e64e8e30e03e89c4661e8d81d2ce833a6908e2d662d4d6c7ffbbb8b071e8657fabb0ebc0c0f84b07617ac878c9bbcfb400b711654e36f66d7";
+      sha512 = "9090e5766ca42f0a633a2e639a520cf6f89a0a08f9d81d7e35fdec64b9effaab8759fb7241ab77c4b31b217e5fd72d52fc953544dd55c3b141a9a6d2e631ca5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hu/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hu/thunderbird-52.8.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "382d79b8513ad28f06233af3473c2fef995d72c9913f64adce5a86528ae0ead883e94f91b4d394cf30541e690da5aad77dc48b8c2a4a84ea6c5fef86c22a4159";
+      sha512 = "f5158c0d4ba87f2472fb07f850a709e174577293e431b482f0d67e3ecb16d818544a02e221d3b68dcbd1d8e750795d51254ad87eac98350f4919979651261e5f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/hy-AM/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/hy-AM/thunderbird-52.8.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "3a4e5878e4fcc9c493cf1de1393da8efe85ff86d96702f57f085da42cac990290b054a3998e96cce69dca17ada849301a6724fd6ae245bf4aa396db5ce76aac4";
+      sha512 = "c902f41fa9353e57c666876715da6175ee9bad96ed45e0e858b436fb5c10164038a56bea670fb73a8b0eb2a60ceed33a7c08e790718efe2e22e6883768b21529";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/id/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/id/thunderbird-52.8.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "dca16b2c0b5034e1be2831a1992ca47f6a7c614382e781e86095df11f34193f13868bdd7f972f54e72d7f844cb24172057155d5457fc6ec98ee476ed01d8899c";
+      sha512 = "2366a3c32145012e073c84527f7e0f8cb1b311728b414084ee7b99727df5ea2ba6b6323def0c7fff2df20066f65ee530ed635a981e42bd1b7fe21874b893a680";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/is/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/is/thunderbird-52.8.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "181868826a0da43deeb2ef68a307ba195fa7a470651d4a08e904bde994320e832a04c44fa355cdaa94bd4c8258471e6849cf06dae8284d43f43defc7a3976816";
+      sha512 = "ae858675cac66dec80de439a2d9a1290ef2d6644a896b183692a10924eb55184b18866227787bae30cc01482453e65040618158a05c2f8d6d9dc2b7b60dca09b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/it/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/it/thunderbird-52.8.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "88c906753878c7b8b0a3d60de21813017ae6ba63b6be9c5d24b6072f1a4aa3a1cc01e56433f960c02f33317cb113266200fbeedc397cd3a5587aa592fdaaacfb";
+      sha512 = "ace77d1b7385f9aa825d5f67f640a77187891d5a257a00a4a9c565f46f742d931093a26f1d234f65f5e372d9598cb26c98766913e5b10a1c593fc6faab32edf3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ja/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ja/thunderbird-52.8.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0e53d3f877793afa9c3ecb48f73640ff3974633bd28ce036b96c7ed29f3b9a4af47e1fca89da9d594c879f534e7c4dc27ca05ece8ec33909fe2dfd57800b3a11";
+      sha512 = "cb61fdcf68f4d02340a25c5b01b7037a7d102423bbd7068a9e7766f823a88ce461d52d6aca4211c1d871d31b8503477bd606c1f814c725f65240c260284e63f1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/kab/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/kab/thunderbird-52.8.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "feeef278ab269f6e33b479b38f32004a5ece2a37ed2aad97c87e68dd0a8195ffe3428ac9dce0a3e72349d3c136b6b5bfdc25916bc57f4fa043eecffc64bafc3c";
+      sha512 = "a52705049e4baef0e8f884f97fd3dc15097c855987e540adcca6b9d27d9d1a38538e326bf1f6bb2893055f72f3fdefe0563b6e048c02031af4e7e4bb77140698";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ko/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ko/thunderbird-52.8.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c138dcbb692780cc1598906a630e90c8102d6a562f922ee28bc88e25624eb88aea20bf3d6fa6b87719f2a9fda0962bc413ce7e6d07147efb47dee7fd670a5c76";
+      sha512 = "a4bbe35e6a5fbf4db08982b0538390e3ec5e54d4e8b627a0e9267ae9137822710add418e5042ace3be8da3d5d56ea41ee4d5bbc5bfb95afe1587a5f81d5b32d4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/lt/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/lt/thunderbird-52.8.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "96e5cbd33b57fe02134aac190347f0ac37fdb9f847ad74a44f59004cb739579b9309442605e3c9c2693bbc484372505aeff9378bb7bccfe8e1432da7a5508ff4";
+      sha512 = "0ef3fdb51246274198221cdbe07ebe6083c36759edd73243ed3568650b2d6570e90fc25b414d61d6a4bc0755b44eea21818cac09900c6eeef9dfcf24b403d3a1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nb-NO/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nb-NO/thunderbird-52.8.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "913a731cf2c063be645cca94ea4beab6601e2536baad9369f9804af663e7b1a024024ff2b5befda1ac8169db0e8cf9ce5c9ca5d0ce650fe629e606c221776e8a";
+      sha512 = "4a08c425fc32dccd29901e7211b2e35dc151d954c1a6ec607ece3ffeedff1a913bef8910b46e4285edb785111643d6b1eeb19284af953e8446d92c055c62621a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nl/thunderbird-52.8.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "79ceea0143319e4b883d2c59949fe3ddc62af70e9fe6653b745fedd2e683aaaf4c6f10d55688b83085abcd36672242f21ea0c592930cdcc7cfef7e32dcc72230";
+      sha512 = "8f54f5b2131bdd6579dcf7dce3afea57ac069206258ba52649d4f587aeed6e9aac9a08c4dc3920fd9be37074c2e619071bf502490b43d40a164d3f8d283de5f7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/nn-NO/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/nn-NO/thunderbird-52.8.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "c524517c417b977e9e8c3b0d3b9a8f1b256c68360f70e61ba4d1b2f887fe550222843de1f9c42081db935e27b3ec63ed8b1a1b5658f48f9534eb787d4fc28d54";
+      sha512 = "2d93dc0829669babf3ae3c3d6f16a7c9d2c9491c6127b1d7adc9b071cc6343e6383f0eed78bde342ce52d9570cc56b74595970e48430f08215143ed9642ad6cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pa-IN/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pa-IN/thunderbird-52.8.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "10e8c6a1faf395371421387ec1cc6891d8e0bc9f69f37f2e4fc414dd9a5e4c10246f279e15804280a550ab7acc265b8a3691ef1d089459cb58cbf06896f88806";
+      sha512 = "98a844a40538224f750934132deac0270fa401afac00cc19352798ba813249408f976809b261419d0b8613a4ebbaf7e8ed2b8669f0d3ffed63916b9e71f1b28d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pl/thunderbird-52.8.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "13afd039d50bc7c6ead72e9d69f5dd6dafa0fc2b5d1f18a207a15192cda4473ca8706386eba98b522667cd036ded38bfcb67fb3dd8c2e50629c3db9a1243c3e6";
+      sha512 = "8c7465446cd1cae4d1bbaae69541516765d9388c79e73bb64996fa0154802f5a20f86cd6c1d0f835f7f7b631455d0b5d1ccc1d0d6119705bc5a9f6f06ecce8de";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-BR/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-BR/thunderbird-52.8.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "9c024bfa1733d144ff4fa58e7ce8a2127528d7fe05e64142a3b1d8a0fdaeda1b1c02998089fd219804571cae4072db984a74a40c4a22bcc18dfb68c849aa37cc";
+      sha512 = "718b4af9ae8b205f1cdf666b68b851b7c0fd5f0152237f8933dc1ccc843265fe8a869c2656d044ce7b5ef857981c827fc6dee85ff1008921108313bbfe1266a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/pt-PT/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/pt-PT/thunderbird-52.8.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ed4d7117bc87cb2ec6df65667f554a83f2fcddbf4eafd6a587082ad42cab69fab5c1d9fc36e132660911840fe85dcc18ab4b23e83b9b57317b900db820483b40";
+      sha512 = "3bf4ae15abfc39505f7f846e468baaa70b01e370a05258f31150e778ff67517098e27a9be135ead2f8f53ef96291d8d04a201d6aeb7d56a9e45e211f44246b21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/rm/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/rm/thunderbird-52.8.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "d1e1e48c47866b89e05c975cc6d4d70120173066457a4c05de1ab9222dee87b0d562959c63afbe024681b0a3f9f8cb3c836f2f0a0e910507e5211a430b1f9bab";
+      sha512 = "9214ecc41dd65de573cb21bb9ad56bc53baf8b86261ab41fdddca57173d157cb055f46aa2a087151c0a9b0dca4960914e7afc1095d118754f847dbc952a4a998";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ro/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ro/thunderbird-52.8.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "c1929be134d8127433eb4b26468379a631456681a6dc3d98bf9ec313576a4c951d5fa7f08ae2d3bc5e8563eecda0a71c412c62a970a0cec618e06d5cdcbc46fa";
+      sha512 = "aa46ef621604b95cb97b0e9cd4400a5f57aac58f82b3a5225a7828a757a24fa3e03d80839e1c6c03f914632fa6652386fc1787b8879343b06b6a59f9fe08b87c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ru/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ru/thunderbird-52.8.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "aa7893b8ea0f44f625afca61adc5942dfaf2eadc6cc7ead569a3536ad827a9b4f88f225dd01a9c5e375eb24a9940de6f65413ab6d93ec2bd736f0bca711739a3";
+      sha512 = "f07d8fe2b6f81ebd151804d1c0f0a39851bf3ee1e468092a2b0eee5f69438a94872b467840da11aaa7fa5f5604dd86f28ee61c85fe62ae283f844f8aac4ced7d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/si/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/si/thunderbird-52.8.0.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "ed425325419e0598e3cc5abd0d2b2898ef781c4be847aa8d9c93596f6dca0b718cb7035479d4013d3213b97a440dea2560549619c3ca330df9bda7b287cea673";
+      sha512 = "8f1b53473fb3e995c499e1583156114557548c1dc8a283a2e8f8c32a90cf2f765b3827455b1abb11272eae3dcd02d39e10b4eb4c2d6cd138f1905cf47bb8c696";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sk/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sk/thunderbird-52.8.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "bd576b29abe39634c864a27f5ab8d59ada34bfd069a7eb9fbe6af1cd79f2e0fdd61ab4fe06cc3944a92b06634bde9faa68ad6d56399085999df5e7827dd121bd";
+      sha512 = "9d40559c28a79375bd70b382b959227be036b00115b8c331d1383eadcc4599099247d76a67880e284e8cf9137bed0271c8edc2b61059ae4d91a540de5f50bec8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sl/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sl/thunderbird-52.8.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "98abc990d644a991abd9f513e205556974905c82c93e0fe8171608ec4d1aac7883ecdab5bf86ed287f43e6c5e45661b79ad012a4dda7b1e5cf6c3411dce7ea2c";
+      sha512 = "9426449a10bcc6ed3f24123fd5452cfcc87bead7014877a05be59d54db77af0833c15614c8c6e42f57005c9b773b1ebb2e59bcd9afd17177160b4010c0d5423a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sq/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sq/thunderbird-52.8.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "d45920069f8c0808b4965118be5ba6e4cf36b99bac9add6d1ac2e20051e95ebf09eaaa9ac559515803b655a61608bb4afab0d69d720ca74f57ec5a643b151f24";
+      sha512 = "a6d914e1df0b240afba8aa5467f5c1e62b48a263e86d32ab5b8e2cf07b8ad747ceeb733e9431f018779f4e1e9f6a9291f29f3e05681727a9b4981ad09a8cba45";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sr/thunderbird-52.8.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "7d77124de3cdd684f13fb824a0bcf7a9440ec7c626ba34deeb04478950bfc908494bc97de5f2d8d8dc0b0abfaa3f7c88b3948a10b7fd31de092702c755cacf25";
+      sha512 = "f333626201a1445aebeef71926fe3d57f08fb0fbbeb2adf50b30fa75d3c28c4828489675e74a76fe07b0684e2ab949bc13b87ead003b54119efd11b1c7c11cc8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/sv-SE/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/sv-SE/thunderbird-52.8.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "e16fdb819ca8ae5c8392eae50115d6b6853678c002de3a18fff25ae0e7e7fa2af06dab17a6a2dff31440608373a5268197efedeaf36f0012c2763080f4b51cc5";
+      sha512 = "5fcc5b4210320f5d571938fddd312493615e829bd6415aeaca2c37ec63db46a1e2d8942e9ce58164c4b8d1d40e88eff0de43861f0e20d796129d9088e624a4ec";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/ta-LK/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/ta-LK/thunderbird-52.8.0.tar.bz2";
       locale = "ta-LK";
       arch = "linux-i686";
-      sha512 = "3c8429d8a31771452e108c0a7b16070138ea1e82aa16536bad4d7570117f0790045e9a34fb9f7546eb3d749e0d94b2a1a7a65b93198909189cbd2f1bf872af94";
+      sha512 = "6f48b7b74a11e42fab58436112f8216942dc288e57594e4bd99d951efd8a4f4e2fee668425342635ce1fece60f0fb21027932b4e678a119f38ac45a6f7a89365";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/tr/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/tr/thunderbird-52.8.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "effe30bec8c4b0fc1428681888ea1e0a79eefa1f60fc3964e08142d00c6db065ff9a2acf989765497520f27504b4ea3c8104a084f63abe4358d165c5bfecc680";
+      sha512 = "c6a5c01c21e9b07fe1555c9f9148f888c793d4290d9b582cfd2741b895166a6b2407f0ff94de098f136758a816d59a1e6064f38c927574bc175afff168be72a6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/uk/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/uk/thunderbird-52.8.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "92cca4a0b9ac66bd4c0e14d0c04a162dbe2a3aac3a9fa95e26e6eef8ef1716fc21832967323ca5b46df19b28843de6e4781ea323120bac37a9821745f7ca9af7";
+      sha512 = "6492260323d1e50a2bc129ba22008d3681283b2931bd6df0d5e5d9087a45294cffc74e711a40994d86d98c1d430f4349ffc4b97d0a1b539c35653c6ed6ea877b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/vi/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/vi/thunderbird-52.8.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b470364cac631fe944e7c06a27299e8ddf65605aaa1550d0736ab6088e38cf008d224b920111a17f6d87aceda3b95ad0ebb01351ed2339680530629a70fca1b9";
+      sha512 = "d43c675312a30a3e6c02f70e9af921025a6798bb5143864ef7d1bc44e11ad654be66a79590698faa44fd404a4090d6dde37088a26339f3c244e0f1cc4d9042f2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-CN/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-CN/thunderbird-52.8.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "1840d47835805c0ab854dde0a08fed90c785377d14b8f53b303fbd65bc5dc8e967146ae5d26ef4a0693df89679cff27ccbad0cabde27356dff97701fd3c91579";
+      sha512 = "fe81ec132fbfd17a15f76299853c45306be9f801d2c03a10fa9e4b25ac48e6e14efe4bc4ff2e5f01a94e46b0c1752add48e5277b11dee7d52325bebf5126616f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.7.0/linux-i686/zh-TW/thunderbird-52.7.0.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.8.0/linux-i686/zh-TW/thunderbird-52.8.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "aaaef2821bb128218a6c9bbf07b1f017574f39a20664e0e82a396ddebeb4b2ac754fa1ece956ab70b1f55ef5e2a750d612cd6ebbd2a747d28f9c24a5b994c730";
+      sha512 = "96b53b5287e3625b4045588118427fe696827aa25b790665aeacb9096ca9ee8bca8a67bd28f733d128d08541069a1e684819f4ce8a1fd29cf683bce546a04fd5";
     }
     ];
 }

From 6099ad33161e63a6fd30ec7e076719497273fa4e Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 19 May 2018 09:12:19 +0900
Subject: [PATCH 2085/3370] thunderbird: 52.7.0 -> 52.8.0

---
 .../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 1bf37edf1af9..15d2c58e816c 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.7.0";
+  version = "52.8.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21";
+    sha512 = "ce44f32f44244560499c44dbe963a8296cf58cf33e3f26d07be455746ed7f77791084e41bc66b2c90fe46e97fa15ae2041b1f5fcfa94d15b45c4f90172230d03";
   };
 
   # New sed no longer tolerates this mistake.

From c2ed843f38a95ec2ca8fd4f0a71de9e4503676d2 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 19 May 2018 00:29:50 -0400
Subject: [PATCH 2086/3370] vim: 8.0.1655 -> 8.1.0001

---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 5b4f631987f2..a93054a9aeb8 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.0.1655";
+  version = "8.1.0001";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "1c6raqjaxgsjazn4l7wqg2cscd5i4bz9m2g2xhn9ba1injs7mps1";
+    sha256 = "056h9cyysyh6hqsr1s9xg94la554f56lwnpk87g013xmqf37bna6";
   };
 
   enableParallelBuilding = true;

From 301072dc271edc84f722e1bac508f4ed0d4700d3 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 19 May 2018 08:42:15 +0200
Subject: [PATCH 2087/3370] nixos/tests/hardened: fix test (#40745)

failed because `pgrep -u` segfaults when accesss to proc info
is denied on a hardened system.
---
 nixos/tests/hardened.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix
index cb33b69e7199..0a0639d62796 100644
--- a/nixos/tests/hardened.nix
+++ b/nixos/tests/hardened.nix
@@ -25,16 +25,18 @@ import ./make-test.nix ({ pkgs, ...} : {
 
   testScript =
     ''
+      $machine->waitForUnit("multi-user.target");
+
       # Test hidepid
       subtest "hidepid", sub {
           $machine->succeed("grep -Fq hidepid=2 /proc/mounts");
-          $machine->succeed("[ `su - sybil -c 'pgrep -c -u root'` = 0 ]");
-          $machine->succeed("[ `su - alice -c 'pgrep -c -u root'` != 0 ]");
+          # cannot use pgrep -u here, it segfaults when access to process info is denied
+          $machine->succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]");
+          $machine->succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]");
       };
 
       # Test kernel module hardening
       subtest "lock-modules", sub {
-          $machine->waitForUnit("multi-user.target");
           # note: this better a be module we normally wouldn't load ...
           $machine->fail("modprobe dccp");
       };

From b739397ae4f69118386e470adb77527fbc450efc Mon Sep 17 00:00:00 2001
From: Travis Whitaker <pi.boy.travis@gmail.com>
Date: Fri, 18 May 2018 23:53:23 -0700
Subject: [PATCH 2088/3370] alacritty: Fix darwin.

---
 pkgs/applications/misc/alacritty/default.nix | 45 ++++++++++++++++++--
 pkgs/top-level/all-packages.nix              |  1 +
 2 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index 4a10d68ee4dc..e3215e61a85f 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -1,4 +1,5 @@
 { stdenv,
+  lib,
   fetchgit,
   rustPlatform,
   cmake,
@@ -14,7 +15,15 @@
   libXi,
   libXrandr,
   libGL,
-  xclip }:
+  xclip,
+  # Darwin Frameworks
+  AppKit,
+  CoreFoundation,
+  CoreGraphics,
+  CoreServices,
+  CoreText,
+  Foundation,
+  OpenGL }:
 
 with rustPlatform;
 
@@ -30,6 +39,15 @@ let
     libGL
     libXi
   ];
+  darwinFrameworks = [
+    AppKit
+    CoreFoundation
+    CoreGraphics
+    CoreServices
+    CoreText
+    Foundation
+    OpenGL
+  ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
   version = "2018-04-16";
@@ -51,21 +69,41 @@ in buildRustPackage rec {
     pkgconfig
   ];
 
-  buildInputs = rpathLibs;
+  buildInputs = rpathLibs
+             ++ lib.optionals stdenv.isDarwin darwinFrameworks;
 
   postPatch = ''
     substituteInPlace copypasta/src/x11.rs \
       --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
   '';
 
+  postBuild = if stdenv.isDarwin
+    then ''
+      make app
+    ''
+    else "";
+
+  patchRPathLibs = if stdenv.isDarwin then "" else ''
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+  '';
+
+  copyDarwinApp = if stdenv.isDarwin
+    then ''
+      mkdir $out/Applications
+      cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
+    ''
+    else "";
+
   installPhase = ''
     runHook preInstall
 
     install -D target/release/alacritty $out/bin/alacritty
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+    ${patchRPathLibs}
 
     install -D Alacritty.desktop $out/share/applications/alacritty.desktop
 
+    ${copyDarwinApp}
+
     runHook postInstall
   '';
 
@@ -76,6 +114,5 @@ in buildRustPackage rec {
     homepage = https://github.com/jwilm/alacritty;
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ mic92 ];
-    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1129a984d271..3edf567bfd78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -484,6 +484,7 @@ with pkgs;
 
   alacritty = callPackage ../applications/misc/alacritty {
     inherit (xorg) libXcursor libXxf86vm libXi;
+    inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL;
   };
 
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };

From effb02131cd9f028c77f8c96ffccfbbaa05e020b Mon Sep 17 00:00:00 2001
From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
Date: Sat, 19 May 2018 10:14:45 +0200
Subject: [PATCH 2089/3370] Revert "zsh: move setEnvironment stuff to zprofile"

This reverts commit 77a6cbb1c1feeb6b6424d35319ac6226c780b34a.
---
 nixos/modules/programs/zsh/zsh.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index b88f54678ee1..f689250dc61f 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -108,6 +108,8 @@ in
         if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi
         export __ETC_ZSHENV_SOURCED=1
 
+        ${config.system.build.setEnvironment.text}
+
         ${cfge.shellInit}
 
         ${cfg.shellInit}
@@ -127,8 +129,6 @@ in
         if [ -n "$__ETC_ZPROFILE_SOURCED" ]; then return; fi
         __ETC_ZPROFILE_SOURCED=1
 
-        ${config.system.build.setEnvironment.text}
-
         ${cfge.loginShellInit}
 
         ${cfg.loginShellInit}

From b599f672e44270d2c6154b7855ddec11e4d43a93 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 11:15:26 +0300
Subject: [PATCH 2090/3370] wireguard-go: init at 0.0.20180514

---
 .../tools/networking/wireguard-go/default.nix | 27 +++++++++++++++++
 pkgs/tools/networking/wireguard-go/deps.nix   | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 59 insertions(+)
 create mode 100644 pkgs/tools/networking/wireguard-go/default.nix
 create mode 100644 pkgs/tools/networking/wireguard-go/deps.nix

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
new file mode 100644
index 000000000000..28acdefd7b53
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildGoPackage, fetchurl }:
+
+buildGoPackage rec {
+  name = "wireguard-go-${version}";
+  version = "0.0.20180514";
+
+  goPackagePath = "wireguard-go";
+
+  src = fetchurl {
+    url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
+    sha256 = "1bn49a67m2ab0l9lq3zh2mfbbppmyg34klqi3069sjn6lg2hlajs";
+  };
+
+  goDeps = ./deps.nix;
+
+  patchPhase = ''
+    # Replace local imports so that go tools do not trip on them
+    find . -name '*.go' -exec sed -i '/import (/,/)/s@"./@"${goPackagePath}/@' {} \;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Userspace Go implementation of WireGuard";
+    homepage = https://git.zx2c4.com/wireguard-go/about/;
+    license = licenses.gpl2;
+    platforms = with platforms; linux ++ darwin ++ windows;
+  };
+}
diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix
new file mode 100644
index 000000000000..e480896f6646
--- /dev/null
+++ b/pkgs/tools/networking/wireguard-go/deps.nix
@@ -0,0 +1,30 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63e9be24226f..2129477e4b6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5718,6 +5718,8 @@ with pkgs;
 
   wipe = callPackage ../tools/security/wipe { };
 
+  wireguard-go = callPackage ../tools/networking/wireguard-go { };
+
   wkhtmltopdf = callPackage ../tools/graphics/wkhtmltopdf {
     overrideDerivation = lib.overrideDerivation;
   };

From 6f20bc3ef6a15778fa7bbd429be6aa9e69229986 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Sat, 19 May 2018 10:33:33 +0200
Subject: [PATCH 2091/3370] openshift: add {bash,zsh}-completion

---
 pkgs/applications/networking/cluster/openshift/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 07c9e9ba6784..c4a2e93e139a 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -69,6 +69,12 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p "$out/bin"
     cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
+    mkdir -p "$out/etc/bash_completion.d"
+    cp -a contrib/completions/bash/oc "$out/etc/bash_completion.d"
+    cp -a contrib/completions/bash/openshift "$out/etc/bash_completion.d"
+    mkdir -p "$out/share/zsh/site-functions"
+    cp -a contrib/completions/zsh/oc "$out/share/zsh/site-functions"
+    cp -a contrib/completions/zsh/openshift "$out/share/zsh/site-functions"
   '';
 
   preFixup = ''

From bd6a3b2160e9d7a0b1f2764df04b44db8e97922b Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sat, 19 May 2018 10:39:32 +0200
Subject: [PATCH 2092/3370] Revert "iasl: 20180313 -> 20180508 (#40613)"

Broke xen and virtualbox.
This reverts commit 5e49920d410b27e9430bfa97f94d40ba67d26666.
---
 pkgs/development/compilers/iasl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix
index 6cf4c85fb200..22f80ae559f7 100644
--- a/pkgs/development/compilers/iasl/default.nix
+++ b/pkgs/development/compilers/iasl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "iasl-${version}";
-  version = "20180508";
+  version = "20180313";
 
   src = fetchurl {
     url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
-    sha256 = "1n7lqmv77kg28drahvxzybwl9v4hzwi8i7xkpgliclfcp5ff909b";
+    sha256 = "05ab2xfv9wqwbzjaa9xqgrvvan87rxv29hw48h1gcckpc5smp2wm";
   };
 
   NIX_CFLAGS_COMPILE = "-O3";

From ad11b960e9bdcfcb41a0bce2bf3d84c4d9d56696 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Thu, 17 May 2018 20:33:09 +0300
Subject: [PATCH 2093/3370] sshd: add custom options

---
 .../modules/services/networking/ssh/sshd.nix  | 36 +++++++++++++++++--
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index aab1203086ce..902e759f3a3a 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -272,6 +272,31 @@ in
         '';
       };
 
+      logLevel = mkOption {
+        type = types.enum [ "QUIET" "FATAL" "ERROR" "INFO" "VERBOSE" "DEBUG" "DEBUG1" "DEBUG2" "DEBUG3" ];
+        default = "VERBOSE";
+        description = ''
+          Gives the verbosity level that is used when logging messages from sshd(8). The possible values are:
+          QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. The default is VERBOSE. DEBUG and DEBUG1
+          are equivalent. DEBUG2 and DEBUG3 each specify higher levels of debugging output. Logging with a DEBUG level
+          violates the privacy of users and is not recommended.
+
+          LogLevel VERBOSE logs user's key fingerprint on login.
+          Needed to have a clear audit track of which key was used to log in.
+        '';
+      };
+
+      useDns = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Specifies whether sshd(8) should look up the remote host name, and to check that the resolved host name for
+          the remote IP address maps back to the very same IP address.
+          If this option is set to no (the default) then only addresses and not host names may be used in
+          ~/.ssh/authorized_keys from and sshd_config Match Host directives.
+        '';
+      };
+
       extraConfig = mkOption {
         type = types.lines;
         default = "";
@@ -426,9 +451,14 @@ in
         Ciphers ${concatStringsSep "," cfg.ciphers}
         MACs ${concatStringsSep "," cfg.macs}
 
-        # LogLevel VERBOSE logs user's key fingerprint on login.
-        # Needed to have a clear audit track of which key was used to log in.
-        LogLevel VERBOSE
+        LogLevel ${cfg.logLevel}
+
+        ${if cfg.useDns then ''
+          UseDNS yes
+        '' else ''
+          UseDNS no
+        ''}
+
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;

From a0feedca8f042a7886a706cd9b58df06fa7272d8 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 19 May 2018 11:09:07 +0200
Subject: [PATCH 2094/3370] nixos/tests/nexus: fix for i686 (#40743)

test failed because qemu-system-i386 can only simulate 2047M RAM
(not 2048)
---
 nixos/tests/nexus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/nexus.nix b/nixos/tests/nexus.nix
index d12d06c2c00f..be8862018777 100644
--- a/nixos/tests/nexus.nix
+++ b/nixos/tests/nexus.nix
@@ -13,7 +13,7 @@ import ./make-test.nix ({ pkgs, ...} : {
 
     server =
       { config, pkgs, ... }:
-      { virtualisation.memorySize = 2048;
+      { virtualisation.memorySize = 2047; # qemu-system-i386 has a 2047M limit
         virtualisation.diskSize = 2048;
 
         services.nexus.enable = true;

From a9defaefabd20cf92ee6844972b9068e18f002ac Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 19 May 2018 12:27:21 +0300
Subject: [PATCH 2095/3370] top-level: remove wireguard attr

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3faf3c346e77..17bed3061662 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18544,8 +18544,6 @@ with pkgs;
     erlang = erlangR18;
   };
 
-  wireguard = callPackage ../os-specific/linux/wireguard { };
-
   alsamixer.app = callPackage ../applications/window-managers/windowmaker/dockapps/alsamixer.app.nix { };
 
   wllvm = callPackage  ../development/tools/wllvm { };

From 60d96d7786b852b3406a51bec8da4546e704a157 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 19 May 2018 12:28:38 +0300
Subject: [PATCH 2096/3370] top-level/aliases: add wireguard -> wireguard-tools
 alias

---
 pkgs/top-level/aliases.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 34906533a0aa..101f4989b319 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -228,6 +228,7 @@ mapAliases (rec {
   vorbisTools = vorbis-tools; # added 2016-01-26
   wineStaging = wine-staging; # added 2018-01-08
   winusb = woeusb; # added 2017-12-22
+  wireguard = wireguard-tools; # added 2018-05-19
   x11 = xlibsWrapper; # added 2015-09
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09

From 3b44015e1a32cca88a3feca1a282733c2d4e79ff Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 12:42:13 +0300
Subject: [PATCH 2097/3370] wireguard-go: use postPatch instead of patchPhase

---
 pkgs/tools/networking/wireguard-go/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 28acdefd7b53..ac6e95f3f0a9 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -13,7 +13,7 @@ buildGoPackage rec {
 
   goDeps = ./deps.nix;
 
-  patchPhase = ''
+  postPatch = ''
     # Replace local imports so that go tools do not trip on them
     find . -name '*.go' -exec sed -i '/import (/,/)/s@"./@"${goPackagePath}/@' {} \;
   '';

From 5f3480e04da97ad368b47b41c7a9bae10cd437c5 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 12:59:10 +0300
Subject: [PATCH 2098/3370] wireguard-go: use deps2nix for dependencies

---
 pkgs/tools/networking/wireguard-go/deps.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix
index e480896f6646..88381d5f207a 100644
--- a/pkgs/tools/networking/wireguard-go/deps.nix
+++ b/pkgs/tools/networking/wireguard-go/deps.nix
@@ -1,30 +1,30 @@
-# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
 [
   {
-    goPackagePath = "golang.org/x/crypto";
+    goPackagePath  = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      rev =  "1a580b3eff7814fc9b40602fd35256c63b50f491";
       sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
     };
   }
   {
-    goPackagePath = "golang.org/x/net";
+    goPackagePath  = "golang.org/x/net";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      rev =  "2491c5de3490fced2f6cff376127c667efeed857";
       sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
     };
   }
   {
-    goPackagePath = "golang.org/x/sys";
+    goPackagePath  = "golang.org/x/sys";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      rev =  "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
       sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
     };
   }
-]
+]
\ No newline at end of file

From ab1dd9c5857af7b25fb2e0c9c896c8f448195a59 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 13:01:59 +0300
Subject: [PATCH 2099/3370] wireguard-go: use fetchzip instead of fetchurl

---
 pkgs/tools/networking/wireguard-go/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index ac6e95f3f0a9..61ca16b0f642 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildGoPackage, fetchurl }:
+{ stdenv, buildGoPackage, fetchzip }:
 
 buildGoPackage rec {
   name = "wireguard-go-${version}";
@@ -6,9 +6,9 @@ buildGoPackage rec {
 
   goPackagePath = "wireguard-go";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "1bn49a67m2ab0l9lq3zh2mfbbppmyg34klqi3069sjn6lg2hlajs";
+    sha256 = "1i1w4vj8w353b92nfhs92k0f7fifrwi067qfmgckdk0kk76nv2id";
   };
 
   goDeps = ./deps.nix;

From 95cf07fc95d869c433ad96aaaca5a09f1065c97e Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 13:08:04 +0300
Subject: [PATCH 2100/3370] wireguard: use fetchzip instead of fetchurl

Because cgit snapshots are not deterministic.
---
 pkgs/os-specific/linux/wireguard/default.nix      | 6 +++---
 pkgs/tools/networking/wireguard-tools/default.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index c82831782e97..a62fce5cd616 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchzip, kernel }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
   name = "wireguard-${version}";
   version = "0.0.20180514";
 
-  src = fetchurl {
+  src = fetchzip {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
+    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
   };
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 8f983082a800..f34119893c48 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, libmnl, useSystemd ? stdenv.isLinux }:
+{ stdenv, lib, fetchzip, libmnl, useSystemd ? stdenv.isLinux }:
 
 let
   inherit (lib) optional optionalString;
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
   version = "0.0.20180514";
 
-  src = fetchurl {
+  src = fetchzip {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "1nk6yj1gdmpar99zzw39n1v795m6fxsrilg37d02jm780rgbd5g8";
+    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
   };
 
   preConfigure = "cd src";

From 2db356feb5f9fb1705cb123cc97d2e7b78b388d1 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Sat, 19 May 2018 10:43:54 +0200
Subject: [PATCH 2101/3370] pythonPackages.geojson: init at 2.3.0

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

diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix
new file mode 100644
index 000000000000..902d1b266534
--- /dev/null
+++ b/pkgs/development/python-modules/geojson/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, glibcLocales }:
+
+buildPythonPackage rec {
+  pname = "geojson";
+  version = "2.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06ihcb8839zzgk5jcv18kc6nqld4hhj3nk4f3drzcr8n8893v1y8";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+  checkInputs = [ glibcLocales ];
+
+  meta = {
+    homepage = https://github.com/frewsxcv/python-geojson;
+    description = "Python bindings and utilities for GeoJSON";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ geistesk ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 998aac285c42..3be39ded656e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5981,6 +5981,8 @@ in {
 
   geopandas = callPackage ../development/python-modules/geopandas { };
 
+  geojson = callPackage ../development/python-modules/geojson { };
+
   gevent-websocket = buildPythonPackage rec {
     name = "gevent-websocket-0.9.3";
 

From fccf7f1181cefef80d3c1a62a25511cce36e4ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 19 May 2018 11:47:39 +0100
Subject: [PATCH 2102/3370] openshift: simplify shell completion installation

---
 .../applications/networking/cluster/openshift/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index c4a2e93e139a..79eb8bb233c9 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -69,12 +69,8 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p "$out/bin"
     cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/"
-    mkdir -p "$out/etc/bash_completion.d"
-    cp -a contrib/completions/bash/oc "$out/etc/bash_completion.d"
-    cp -a contrib/completions/bash/openshift "$out/etc/bash_completion.d"
-    mkdir -p "$out/share/zsh/site-functions"
-    cp -a contrib/completions/zsh/oc "$out/share/zsh/site-functions"
-    cp -a contrib/completions/zsh/openshift "$out/share/zsh/site-functions"
+    install -D -t "$out/etc/bash_completion.d" contrib/completions/bash/*
+    install -D -t "$out/share/zsh/site-functions" contrib/completions/zsh/*
   '';
 
   preFixup = ''

From a5b47bb3867380537bdbcb69b076679f457d6bb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 19 May 2018 12:23:47 +0100
Subject: [PATCH 2103/3370] alacritty: 2018-04-16 -> 2018-05-09

---
 pkgs/applications/misc/alacritty/default.nix | 32 ++++++--------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index e3215e61a85f..e565b51cf509 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -50,18 +50,18 @@ let
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2018-04-16";
+  version = "2018-05-09";
 
   # At the moment we cannot handle git dependencies in buildRustPackage.
   # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
   src = fetchgit {
     url = https://github.com/Mic92/alacritty.git;
     rev = "rev-${version}";
-    sha256 = "14qsfaij631pk0gxrhmp594f72v0z7kzymf4hnqv4k5w9xlxciwx";
+    sha256 = "0mgi4niy40zz80k2ammbzdw9d8flvfkwlxkjnbpwrrldd0sj8dlz";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "0gg28fbx0kisv7hqxgzqhv4z4ikk074djfjlj90nmmi4nddp017p";
+  cargoSha256 = "0d6bqfnwqfxqllrf00p1djlxdvnhrahgnyqv842qjn94j3wf0fym";
 
   nativeBuildInputs = [
     cmake
@@ -77,32 +77,20 @@ in buildRustPackage rec {
       --replace Command::new\(\"xclip\"\) Command::new\(\"${xclip}/bin/xclip\"\)
   '';
 
-  postBuild = if stdenv.isDarwin
-    then ''
-      make app
-    ''
-    else "";
-
-  patchRPathLibs = if stdenv.isDarwin then "" else ''
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
-  '';
-
-  copyDarwinApp = if stdenv.isDarwin
-    then ''
-      mkdir $out/Applications
-      cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
-    ''
-    else "";
+  postBuild = lib.optionalString stdenv.isDarwin "make app";
 
   installPhase = ''
     runHook preInstall
 
     install -D target/release/alacritty $out/bin/alacritty
-    ${patchRPathLibs}
 
+  '' + (if stdenv.isDarwin then ''
+    mkdir $out/Applications
+    cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app
+  '' else ''
     install -D Alacritty.desktop $out/share/applications/alacritty.desktop
-
-    ${copyDarwinApp}
+    patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty
+  '') + ''
 
     runHook postInstall
   '';

From 388b21436a5617a0932a2edf5b2bd3f19165e051 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 19 May 2018 14:25:57 +0300
Subject: [PATCH 2104/3370] wireguard-go: add myself as a maintainer

---
 maintainers/maintainer-list.nix                | 5 +++++
 pkgs/tools/networking/wireguard-go/default.nix | 1 +
 2 files changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9fa89838d164..6fd5c335ad1d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1997,6 +1997,11 @@
     github = "kini";
     name = "Keshav Kini";
   };
+  kirelagin = {
+    email = "kirelagin@gmail.com";
+    github = "kirelagin";
+    name = "Kirill Elagin";
+  };
   kkallio = {
     email = "tierpluspluslists@gmail.com";
     name = "Karn Kallio";
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 61ca16b0f642..e27b241e755d 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -22,6 +22,7 @@ buildGoPackage rec {
     description = "Userspace Go implementation of WireGuard";
     homepage = https://git.zx2c4.com/wireguard-go/about/;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ kirelagin ];
     platforms = with platforms; linux ++ darwin ++ windows;
   };
 }

From 70c60a2fdca8b8acfe77e7ceffe56fe98c9370a4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 19 May 2018 14:28:39 +0200
Subject: [PATCH 2105/3370] tdesktopPackages.preview: 1.2.20 -> 1.2.21

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 5d476f54304a..2799f50e584c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.20";
-    sha256Hash = "00ncpb1qs88jrrmmx7f7l8wy37wbwnrb958x3xls14p1h1xg63l6";
+    version = "1.2.21";
+    sha256Hash = "0s7dywyz8p626741m32l4a90l1x01564xg2g10gvdb25s2phdfdl";
   });
 }

From ce87e7083be2874a91e284c22f1a6d714a4f6af3 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Sat, 19 May 2018 21:16:32 +0900
Subject: [PATCH 2106/3370] slib: 3b2 -> 3b5

---
 pkgs/development/libraries/slib/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix
index 5ab681b21b28..233ba91d299a 100644
--- a/pkgs/development/libraries/slib/default.nix
+++ b/pkgs/development/libraries/slib/default.nix
@@ -1,28 +1,18 @@
 { fetchurl, stdenv, unzip, scheme, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "slib-3b2";
+  name = "slib-3b5";
 
   src = fetchurl {
     url = "http://groups.csail.mit.edu/mac/ftpdir/scm/${name}.zip";
-    sha256 = "1s6a7f3ha2bhwj4nkg34n0j511ww1nlgrn5xis8k53l8ghdrrjxi";
+    sha256 = "0q0p2d53p8qw2592yknzgy2y1p5a9k7ppjx0cfrbvk6242c4mdpq";
   };
 
   patches = [ ./catalog-in-library-vicinity.patch ];
 
   buildInputs = [ unzip scheme texinfo ];
 
-  configurePhase = ''
-    mkdir -p "$out"
-    sed -i "Makefile" \
-        -e "s|^[[:blank:]]*prefix[[:blank:]]*=.*$|prefix = $out/|g"
-  '';
-
-  buildPhase = "make infoz";
-
-  installPhase = ''
-    make install
-
+  postInstall = ''
     ln -s mklibcat{.scm,}
     SCHEME_LIBRARY_PATH="$out/lib/slib" make catalogs
 

From ae89ef24aac04cfe533ceec65aa7220ca94a6102 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Fri, 18 May 2018 18:45:46 +0900
Subject: [PATCH 2107/3370] gauche: init at 0.9.5

---
 .../interpreters/gauche/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/interpreters/gauche/default.nix

diff --git a/pkgs/development/interpreters/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix
new file mode 100644
index 000000000000..c13a26204e26
--- /dev/null
+++ b/pkgs/development/interpreters/gauche/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, pkgconfig, texinfo, libiconv, gdbm, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "gauche-${version}";
+  version = "0.9.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/gauche/Gauche-${version}.tgz";
+    sha256 = "0g77nik15whm5frxb7l0pwzd95qlq949dym5pn5p04p17lhm72jc";
+  };
+
+  nativeBuildInputs = [ pkgconfig texinfo ];
+
+  buildInputs = [ libiconv gdbm openssl zlib ];
+
+  configureFlags = [
+    "--enable-multibyte=utf-8"
+    "--with-iconv=${libiconv}"
+    "--with-dbm=gdbm"
+    "--with-zlib=${zlib}"
+    # TODO: Enable slib
+    #       Current slib in nixpkgs is specialized to Guile
+    # "--with-slib=${slibGuile}/lib/slib"
+  ];
+
+  enableParallelBuilding = true;
+
+  # TODO: Fix tests that fail in sandbox build
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "R7RS Scheme scripting engine";
+    homepage = https://practical-scheme.net/gauche/;
+    maintainers = with maintainers; [ mnacamura ];
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2129477e4b6f..6d4876da2914 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15748,6 +15748,8 @@ with pkgs;
 
   ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { };
 
+  gauche = callPackage ../development/interpreters/gauche { };
+
   gcal = callPackage ../applications/misc/gcal { };
 
   geany = callPackage ../applications/editors/geany { };

From 52ad7f739095b18fc2da051c09fd1cb0b7d344a5 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 19 May 2018 10:38:03 +0000
Subject: [PATCH 2108/3370] linuxPackages.dpdk: 17.05.1 -> 17.11.2

---
 pkgs/os-specific/linux/dpdk/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 4bd50fdae40f..fd45e83c26b5 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, lib, kernel, fetchurl, pkgconfig, libvirt }:
-
-assert lib.versionAtLeast kernel.version "3.18";
+{ stdenv, kernel, fetchurl, pkgconfig, numactl }:
 
 stdenv.mkDerivation rec {
   name = "dpdk-${version}-${kernel.version}";
-  version = "17.05.1";
+  version = "17.11.2";
 
   src = fetchurl {
     url = "http://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
-    sha256 = "1w3nx5cqf8z600bdlbwz7brmdb5yn233qrqvv24kbmmxhbwp7qld";
+    sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";
   };
 
   nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
-  buildInputs = [ libvirt ];
+  buildInputs = [ numactl ];
 
   RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   # we need sse3 instructions to build
-  NIX_CFLAGS_COMPILE = [ "-march=core2" ];
+  NIX_CFLAGS_COMPILE = [ "-msse3" ];
 
   enableParallelBuilding = true;
   outputs = [ "out" "kmod" ];

From d3071137085a3440970a1659e15cc8fc9a675f4c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 19 May 2018 12:36:22 +0000
Subject: [PATCH 2109/3370] linuxPackages.pktgen: 3.4.0 -> 3.5.0

---
 pkgs/os-specific/linux/pktgen/Makefile.patch | 34 -----------------
 pkgs/os-specific/linux/pktgen/default.nix    | 40 ++++++++++++++------
 2 files changed, 28 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/pktgen/Makefile.patch

diff --git a/pkgs/os-specific/linux/pktgen/Makefile.patch b/pkgs/os-specific/linux/pktgen/Makefile.patch
deleted file mode 100644
index da948bcc5a08..000000000000
--- a/pkgs/os-specific/linux/pktgen/Makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/app/Makefile b/app/Makefile
-index 5078b9a..99b208a 100644
---- a/app/Makefile
-+++ b/app/Makefile
-@@ -46,29 +46,10 @@ APP = pktgen
- CFLAGS += -O3 -g $(WERROR_FLAGS) -fno-stack-protector
- CFLAGS += -I$(RTE_SRCDIR) -I$(RTE_SRCDIR)/../lib/common
- 
--dpdk_ver := $(RTE_SDK)/xusertools/dpdk-version.sh
--pktgen_ver := $(RTE_SRCDIR)/../tools/dpdk-version.sh
--ver_cmd := $(if $(wildcard $(dpdk_ver)),$(dpdk_ver),$(pktgen_ver))
--# $(info ver_cmd=$(ver_cmd))
--
--yy := $(shell $(ver_cmd) -yy)
--# mm := $(shell $(ver_cmd) -mm)
--
--# $(info yy=$(yy))
--
--ifeq ($(yy),17)
- COMMON_PRE := $(RTE_SRCDIR)/../lib/common
- LUA_PRE := $(RTE_SRCDIR)/../lib/lua/src
- CLI_PRE := $(RTE_SRCDIR)/../lib/cli
- GUI_PRE := $(RTE_SRCDIR)/../gui/gui
--else
--ifeq ($(yy),16)
--COMMON_PRE := $(RTE_SRCDIR)/../lib/common/lib/common
--LUA_PRE := $(RTE_SRCDIR)/../lib/lua/src/lib/lua/src
--CLI_PRE := $(RTE_SRCDIR)/../lib/cli/lib/cli
--GUI_PRE := $(RTE_SRCDIR)/../gui
--endif
--endif
- 
- COMMON_LIB := $(COMMON_PRE)/$(RTE_TARGET)
- LUA_LIB    := $(LUA_PRE)/$(RTE_TARGET)
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index 9bc8967453b4..c443da7df3b4 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -1,34 +1,48 @@
-{ stdenv, fetchurl, dpdk, libpcap, utillinux
-, pkgconfig
+{ stdenv, lib, fetchurl, pkgconfig
+, dpdk, libpcap, numactl, utillinux
 , gtk2, withGtk ? false
 }:
 
-stdenv.mkDerivation rec {
+let
+
+  # pktgen needs a specific version of lua to apply its patch (see lib/lua/Makefile).
+  lua = rec {
+    name = "lua-5.3.4";
+    basename = name + ".tar.gz";
+    src = fetchurl {
+      url = "https://www.lua.org/ftp/${basename}";
+      sha256 = "0320a8dg3aci4hxla380dx1ifkw8gj4gbw5c4dz41g1kh98sm0gn";
+    };
+  };
+
+in stdenv.mkDerivation rec {
   name = "pktgen-${version}";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchurl {
-    url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.gz";
-    sha256 = "0fcyb56d4mkvchi5i8s3m210f5c3xa8zbjb08ranpa1a2k1kzfg5";
+    url = "http://dpdk.org/browse/apps/pktgen-dpdk/snapshot/pktgen-${version}.tar.xz";
+    sha256 = "1gy99jr9dbwzi9pd3w5k673h3pfnbkz6rbzmrkwcyis72pnphy5z";
   };
 
   nativeBuildInputs = stdenv.lib.optionals withGtk [ pkgconfig ];
 
   buildInputs =
-    [ dpdk libpcap ]
+    [ dpdk libpcap numactl ]
     ++ stdenv.lib.optionals withGtk [gtk2];
 
   RTE_SDK = "${dpdk}";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
   GUI = stdenv.lib.optionalString withGtk "true";
 
-  NIX_CFLAGS_COMPILE = [ "-march=core2" ];
+  NIX_CFLAGS_COMPILE = [ "-msse3" ];
 
-  patches = [ ./Makefile.patch ];
-
-  postPatch = ''
-    substituteInPlace lib/lua/src/luaconf.h --replace /usr/local $out
+  postPatch = let dpdkMajor = lib.versions.major dpdk.version; in ''
+    substituteInPlace app/Makefile --replace 'yy :=' 'yy := ${dpdkMajor} #'
     substituteInPlace lib/common/lscpu.h --replace /usr/bin/lscpu ${utillinux}/bin/lscpu
+
+    ln -s ${lua.src} lib/lua/${lua.basename}
+    make -C lib/lua get_tarball # unpack and patch
+    substituteInPlace lib/lua/${lua.name}/src/luaconf.h --replace /usr/local $out
   '';
 
   installPhase = ''
@@ -38,6 +52,8 @@ stdenv.mkDerivation rec {
     install -m 0644 Pktgen.lua $out/lib/lua/5.3
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Traffic generator powered by DPDK";
     homepage = http://dpdk.org/;

From 142b65f088e32fc11fcd0f0a13dacdd0d89dcb5d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 19 May 2018 16:10:32 +0200
Subject: [PATCH 2110/3370] html-proofer: init at 3.8.0 (#40772)

---
 pkgs/tools/misc/html-proofer/Gemfile      |   2 +
 pkgs/tools/misc/html-proofer/Gemfile.lock |  48 +++++++
 pkgs/tools/misc/html-proofer/default.nix  |  18 +++
 pkgs/tools/misc/html-proofer/gemset.nix   | 154 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |   2 +
 5 files changed, 224 insertions(+)
 create mode 100644 pkgs/tools/misc/html-proofer/Gemfile
 create mode 100644 pkgs/tools/misc/html-proofer/Gemfile.lock
 create mode 100644 pkgs/tools/misc/html-proofer/default.nix
 create mode 100644 pkgs/tools/misc/html-proofer/gemset.nix

diff --git a/pkgs/tools/misc/html-proofer/Gemfile b/pkgs/tools/misc/html-proofer/Gemfile
new file mode 100644
index 000000000000..a7c369cc6804
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'html-proofer'
diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock
new file mode 100644
index 000000000000..c7ae194e426b
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/Gemfile.lock
@@ -0,0 +1,48 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    colorize (0.8.1)
+    concurrent-ruby (1.0.5)
+    ethon (0.11.0)
+      ffi (>= 1.3.0)
+    ffi (1.9.23)
+    html-proofer (3.8.0)
+      activesupport (>= 4.2, < 6.0)
+      addressable (~> 2.3)
+      colorize (~> 0.8)
+      mercenary (~> 0.3.2)
+      nokogiri (~> 1.8.1)
+      parallel (~> 1.3)
+      typhoeus (~> 1.3)
+      yell (~> 2.0)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    mercenary (0.3.6)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    public_suffix (3.0.2)
+    thread_safe (0.3.6)
+    typhoeus (1.3.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    yell (2.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  html-proofer
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/tools/misc/html-proofer/default.nix
new file mode 100644
index 000000000000..49881f1b0b49
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/default.nix
@@ -0,0 +1,18 @@
+{ bundlerEnv, ruby, lib }:
+
+bundlerEnv rec {
+  name = "${pname}-${version}";
+  pname = "html-proofer";
+  version = (import ./gemset.nix).html-proofer.version;
+
+  inherit ruby;
+  gemdir = ./.;
+
+  meta = with lib; {
+    description = "A tool to validate HTML files";
+    homepage    = https://github.com/gjtorikian/html-proofer;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ primeos ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix
new file mode 100644
index 000000000000..7043c9e355b0
--- /dev/null
+++ b/pkgs/tools/misc/html-proofer/gemset.nix
@@ -0,0 +1,154 @@
+{
+  activesupport = {
+    dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkzg31x501l8d1hbygyh1lr4c3vnw88a3c1rxz5ifvvzb10i6zm";
+      type = "gem";
+    };
+    version = "5.2.0";
+  };
+  addressable = {
+    dependencies = ["public_suffix"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0viqszpkggqi8hq87pqp0xykhvz60g99nwmkwsb0v45kc2liwxvk";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  colorize = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "133rqj85n400qk6g3dhf2bmfws34mak1wqihvh3bgy9jhajw580b";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  ethon = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0y70szwm2p0b9qfvpqrzjrgm3jz0ig65vlbfr6ppc3z0m1h7kv48";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+      type = "gem";
+    };
+    version = "1.9.23";
+  };
+  html-proofer = {
+    dependencies = ["activesupport" "addressable" "colorize" "mercenary" "nokogiri" "parallel" "typhoeus" "yell"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06ggsx2fhsis1iw0sw12a709h99ksbs9kbmv0j05kvbak7b9m51a";
+      type = "gem";
+    };
+    version = "3.8.0";
+  };
+  i18n = {
+    dependencies = ["concurrent-ruby"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1milplpsdpxlvn23q6pvir4jgxsphq2ps2jgdb3i29kzpc55gm7y";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  mercenary = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  mini_portile2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq";
+      type = "gem";
+    };
+    version = "5.11.3";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      type = "gem";
+    };
+    version = "1.8.2";
+  };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  public_suffix = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x5h1dh1i3gwc01jbg01rly2g6a1qwhynb1s8a30ic507z1nh09s";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  typhoeus = {
+    dependencies = ["ethon"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01pd16n6bvknyip42r1r7js0j8x8ly37gmr72z3695zcczh1blyq";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z";
+      type = "gem";
+    };
+    version = "1.2.5";
+  };
+  yell = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m3q1l33sznrl86myjhd2l7chma1wdcdrdmnf2fi7aydapwd4vib";
+      type = "gem";
+    };
+    version = "2.0.7";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01a0d0059212..71a7c18144da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2974,6 +2974,8 @@ with pkgs;
 
   hping = callPackage ../tools/networking/hping { };
 
+  html-proofer = callPackage ../tools/misc/html-proofer { };
+
   htpdate = callPackage ../tools/networking/htpdate { };
 
   http-prompt = callPackage ../tools/networking/http-prompt { };

From f8ed43e600228ab415866d4938703fa5eaa7b121 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 19 May 2018 17:20:33 +0300
Subject: [PATCH 2111/3370] wireguard: use src from wireguard-tools

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

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index a62fce5cd616..ae31edcaaede 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, kernel }:
+{ stdenv, fetchzip, kernel, wireguard-tools }:
 
 # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements
 assert stdenv.lib.versionAtLeast kernel.version "3.10";
@@ -7,10 +7,7 @@ stdenv.mkDerivation rec {
   name = "wireguard-${version}";
   version = "0.0.20180514";
 
-  src = fetchzip {
-    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
-  };
+  inherit (wireguard-tools) src;
 
   preConfigure = ''
     cd src

From 6ff3291aa43a60e5f0412077b7af41a59cd02277 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 19 May 2018 10:38:16 -0400
Subject: [PATCH 2112/3370] minikube: 0.26.0 -> 0.27.0

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 53b24552d373..2ba7bebc0c61 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -23,7 +23,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.26.0";
+  version = "0.27.0";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -31,7 +31,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "1wc2gvmgb59yh0ldm2plvh6s8mvxvysrxp6w75z16ii86jmi3wr6";
+    sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
   };
 
   patches = [

From fc10e188e2f51fa59504ad6441c750cbd03e03aa Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 19 May 2018 13:44:15 +0000
Subject: [PATCH 2113/3370] linuxPackages.odp-dpdk: 1.15.0.0 ->
 1.19.0.0_DPDK_17.11

---
 .../linux/odp-dpdk/configure.patch            | 32 -------------------
 pkgs/os-specific/linux/odp-dpdk/default.nix   | 26 +++++++--------
 .../linux/odp-dpdk/odp_crypto.patch           | 18 -----------
 3 files changed, 11 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/odp-dpdk/configure.patch
 delete mode 100644 pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch

diff --git a/pkgs/os-specific/linux/odp-dpdk/configure.patch b/pkgs/os-specific/linux/odp-dpdk/configure.patch
deleted file mode 100644
index 3dadc98e8342..000000000000
--- a/pkgs/os-specific/linux/odp-dpdk/configure.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 001ebfc2893b..7d19ebcd213f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -215,7 +215,7 @@ AC_SUBST([testdir])
- ##########################################################################
- AM_CONDITIONAL([netmap_support], [test x$netmap_support = xyes ])
- AM_CONDITIONAL([PKTIO_DPDK], [test x$pktio_dpdk_support = xyes ])
--AM_CONDITIONAL([HAVE_PCAP], [test $have_pcap = yes])
-+AM_CONDITIONAL([HAVE_PCAP], [test x$have_pcap = xyes])
- AM_CONDITIONAL([DPDK_DEFAULT_DIR], [test "x${DPDK_DEFAULT_DIR}" = "x1"])
- AM_CONDITIONAL([test_installdir], [test "$testdir" != ""])
- AM_CONDITIONAL([cunit_support], [test x$cunit_support = xyes ])
-@@ -320,18 +320,6 @@ ODP_CFLAGS="$ODP_CFLAGS -Wcast-align -Wnested-externs -Wcast-qual -Wformat-nonli
- ODP_CFLAGS="$ODP_CFLAGS -Wformat-security -Wundef -Wwrite-strings"
- ODP_CFLAGS="$ODP_CFLAGS -std=gnu99"
- 
--dnl Use -Werror in the checks below since Clang emits a warning instead of
--dnl an error when it encounters an unknown warning option.
--AX_CHECK_COMPILE_FLAG([-Wimplicit-fallthrough=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wimplicit-fallthrough=0"],
--                      [], [-Werror])
--AX_CHECK_COMPILE_FLAG([-Wformat-truncation=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wformat-truncation=0"],
--                      [], [-Werror])
--AX_CHECK_COMPILE_FLAG([-Wformat-overflow=0],
--                      [ODP_CFLAGS="$ODP_CFLAGS -Wformat-overflow=0"],
--                      [], [-Werror])
--
- # Extra flags for example to suppress certain warning types
- ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA"
- 
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index a444243e802e..cf4f9df26777 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -1,31 +1,27 @@
-{ stdenv, fetchgit, autoreconfHook, openssl, libpcap, dpdk }:
+{ stdenv, fetchurl, autoreconfHook, pkgconfig
+, dpdk, libconfig, libpcap, numactl, openssl
+}:
 
 stdenv.mkDerivation rec {
   name = "odp-dpdk-${version}";
-  version = "1.15.0.0";
+  version = "1.19.0.0_DPDK_17.11";
 
-  src = fetchgit {
-    url = "https://git.linaro.org/lng/odp-dpdk.git";
-    rev = "d8533b4e575d62c9f6f2caedd38d98a1a56fb8d3";
-    sha256 = "1p09rw7dxxqcxxrdb8wbwp2imapyjvdbvap7s9km2i9hbd8ipdif";
+  src = fetchurl {
+    url = "https://git.linaro.org/lng/odp-dpdk.git/snapshot/${name}.tar.gz";
+    sha256 = "05bwjaxl9hqc6fbkp95nniq11g3kvzmlxw0bq55i7p2v35nv38px";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [ openssl dpdk libpcap ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ dpdk libconfig libpcap numactl openssl ];
 
-  RTE_SDK = "${dpdk}";
+  RTE_SDK = dpdk;
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   dontDisableStatic = true;
 
   configureFlags = [
     "--disable-shared"
-    "--with-sdk-install-path=${dpdk}/${RTE_TARGET}"
-  ];
-
-  patches = [
-    ./configure.patch
-    ./odp_crypto.patch
+    "--with-dpdk-path=${dpdk}"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch b/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch
deleted file mode 100644
index 44ef155d69fb..000000000000
--- a/pkgs/os-specific/linux/odp-dpdk/odp_crypto.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c
-index d95b157805dc..d13ad5bbde95 100644
---- a/platform/linux-dpdk/odp_crypto.c
-+++ b/platform/linux-dpdk/odp_crypto.c
-@@ -900,11 +900,12 @@ int odp_crypto_session_create(odp_crypto_session_param_t *param,
- 	/* Setup session */
- 	session = rte_cryptodev_sym_session_create(cdev_id, first_xform);
- 
--	if (session == NULL)
-+	if (session == NULL) {
- 		/* remove the crypto_session_entry_t */
- 		memset(entry, 0, sizeof(*entry));
- 		free_session(entry);
- 		return -1;
-+	}
- 
- 	entry->rte_session  = (intptr_t)session;
- 	entry->cipher_xform = cipher_xform;

From 2af45d94dd5303a4cd672481124b171d55181134 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 07:59:54 -0700
Subject: [PATCH 2114/3370] pgroonga: 2.0.5 -> 2.0.6 (#40646)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pgroonga/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2.0.6 with grep in /nix/store/nh4mqn37kx82q7l5fm6anycaw8iz7b8n-pgroonga-2.0.6
- directory tree listing: https://gist.github.com/14e8971d0a27517ef320553ce1e8d33c
- du listing: https://gist.github.com/c1f25e2851a59216d5fa9f88b6477927
---
 pkgs/servers/sql/postgresql/pgroonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index eb6f5f94810e..6dcd19d8d680 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgroonga-${version}";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchurl {
     url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz";
-    sha256 = "1c4m1rg3122y8rndgz7sj9a49l3v9nm0qbpa04pls20pxzx21g5a";
+    sha256 = "1hfmz3d0xwhsa4vw8i08s15i7pfd0h0smi2rv663x3cjjjn40i68";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3d7ab2f5235374450582d495def09ed15199e098 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 08:02:09 -0700
Subject: [PATCH 2115/3370] obs-studio: 21.1.1 -> 21.1.2 (#40660)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/obs-studio/versions.

These checks were done:

- built on NixOS
- /nix/store/7ajk0j59wzn7pcynqchqkvlrdwnrgkdq-obs-studio-21.1.2/bin/obs passed the binary check.
- /nix/store/7ajk0j59wzn7pcynqchqkvlrdwnrgkdq-obs-studio-21.1.2/bin/.obs-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 21.1.2 with grep in /nix/store/7ajk0j59wzn7pcynqchqkvlrdwnrgkdq-obs-studio-21.1.2
- directory tree listing: https://gist.github.com/f501ac763d6c76528c24a40ab59ae620
- du listing: https://gist.github.com/ed4e17e15dd316ad1aafa8e7e89394a6
---
 pkgs/applications/video/obs-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index f3e2072d6dac..a07a15177d04 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -29,13 +29,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "21.1.1";
+  version = "21.1.2";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "11gr4szjypihp0562r23pvkmaln6vjz1z4y4ls34bmc8n9ixrdcv";
+    sha256 = "1gl6qibvckczk3yl44h3yshml6sn3izwn58qpxils5837rpkwlc5";
   };
 
   patches = [ ./find-xcb.patch ];

From 9534f999a4707c22a663cf1184bb83f6e05d1c03 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 08:03:21 -0700
Subject: [PATCH 2116/3370] librelp: 1.2.15 -> 1.2.16 (#40664)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/librelp/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.2.16 with grep in /nix/store/a6787dmhj4xpxwmqk8876gkyg00gr48h-librelp-1.2.16
- directory tree listing: https://gist.github.com/1f742ba05336ce792bdc905f5cd9dd4d
- du listing: https://gist.github.com/3677c4e01ab864cae128476ab579a776
---
 pkgs/development/libraries/librelp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix
index 55bb22e660b0..083ea88301a6 100644
--- a/pkgs/development/libraries/librelp/default.nix
+++ b/pkgs/development/libraries/librelp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gnutls, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "librelp-1.2.15";
+  name = "librelp-1.2.16";
 
   src = fetchurl {
     url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
-    sha256 = "16d9km99isa4mwk6psf8brny1sfl45dijlkdwzp0yrjnj0nq6cd9";
+    sha256 = "0lzxc2ydjbbs50dalqp2s107ckp63arpk223cigasq0hl395s8qc";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 8743e575be75f46c02b22389897846754c40b34f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 08:07:11 -0700
Subject: [PATCH 2117/3370] git-ftp: 1.4.0 -> 1.5.1 (#40673)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-ftp/versions.

These checks were done:

- built on NixOS
- /nix/store/99qm5jxal3n5kpyk7jb6byf68zir13hq-git-ftp-1.5.1/bin/git-ftp passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.5.1 with grep in /nix/store/99qm5jxal3n5kpyk7jb6byf68zir13hq-git-ftp-1.5.1
- directory tree listing: https://gist.github.com/db2f3eebbf94391961fe177450df28d8
- du listing: https://gist.github.com/8e1f6afd03639aaba4c09de2d38fbf54
---
 pkgs/development/tools/git-ftp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix
index b4bc680a19aa..3d4d542d2f92 100644
--- a/pkgs/development/tools/git-ftp/default.nix
+++ b/pkgs/development/tools/git-ftp/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchFromGitHub, pandoc, man }:
 stdenv.mkDerivation rec {
   name = "git-ftp-${version}";
-  version = "1.4.0";
+  version = "1.5.1";
   src = fetchFromGitHub {
     owner = "git-ftp";
     repo = "git-ftp";
     rev = version;
-    sha256 = "0n8q1azamf10qql8f8c4ppbd3iisy460gwxx09v5d9hji5md27s3";
+    sha256 = "0nh2f58rwwfzmglm75fmmm10470a80q0vsihc2msa8xswngihg22";
   };
 
   dontBuild = true;

From 28c1c0ab26b2b18f838b5275146210938b0b1643 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 19 May 2018 08:17:18 -0700
Subject: [PATCH 2118/3370] mlt: 6.6.0 -> 6.8.0 (#40653)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mlt/versions.

These checks were done:

- built on NixOS
- /nix/store/xsmh09whsj39h5hc7g0ljj344i5i70zk-mlt-6.8.0/bin/melt passed the binary check.
- /nix/store/xsmh09whsj39h5hc7g0ljj344i5i70zk-mlt-6.8.0/bin/.melt-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 6.8.0 with grep in /nix/store/xsmh09whsj39h5hc7g0ljj344i5i70zk-mlt-6.8.0
- directory tree listing: https://gist.github.com/3a7f7c995e0d2d7232ab28093ddd4613
- du listing: https://gist.github.com/c8e940fb79b09b1aeee2243a1fff57ca
---
 pkgs/development/libraries/mlt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 59700669ba7c..57b810c0b448 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "mlt-${version}";
-  version = "6.6.0";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     rev = "v${version}";
-    sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q";
+    sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8";
   };
 
   buildInputs = [

From 17f50018c0ca87e196882c0ba4aee68703e3fcf0 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 19 May 2018 11:30:04 -0400
Subject: [PATCH 2119/3370] lua5.1: fix broken source fetch (#40748)

The upstream src URL for the patch appears to no longer exist. Per discussion in
https://github.com/NixOS/nixpkgs/issues/39927, the upstream URL is not stable,
so this commit inlines the patch in the nixpkgs src tree.
---
 ...x-stack-overflow-in-vararg-functions.patch | 21 +++++++++++++++++++
 pkgs/development/interpreters/lua-5/5.1.nix   |  7 +------
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch

diff --git a/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch b/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
new file mode 100644
index 000000000000..31d3b8bdee76
--- /dev/null
+++ b/pkgs/development/interpreters/lua-5/5.1.0004-Fix-stack-overflow-in-vararg-functions.patch
@@ -0,0 +1,21 @@
+From: Enrico Tassi <gareuselesinge@debian.org>
+Date: Tue, 26 Aug 2014 16:20:55 +0200
+Subject: Fix stack overflow in vararg functions
+
+---
+ src/ldo.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ldo.c b/src/ldo.c
+index d1bf786..30333bf 100644
+--- a/src/ldo.c
++++ b/src/ldo.c
+@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
+     CallInfo *ci;
+     StkId st, base;
+     Proto *p = cl->p;
+-    luaD_checkstack(L, p->maxstacksize);
++    luaD_checkstack(L, p->maxstacksize + p->numparams);
+     func = restorestack(L, funcr);
+     if (!p->is_vararg) {  /* no varargs? */
+       base = func + 1;
diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix
index 1c4fcd2811d1..15077578f27f 100644
--- a/pkgs/development/interpreters/lua-5/5.1.nix
+++ b/pkgs/development/interpreters/lua-5/5.1.nix
@@ -20,12 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
 
   patches = (if stdenv.isDarwin then [ ./5.1.darwin.patch ] else [ dsoPatch ])
-    ++ [(fetchpatch {
-      name = "CVE-2014-5461.patch";
-      url = "http://anonscm.debian.org/cgit/pkg-lua/lua5.1.git/plain/debian/patches/"
-        + "0004-Fix-stack-overflow-in-vararg-functions.patch?id=b75a2014db2ad65683521f7bb295bfa37b48b389";
-      sha256 = "05i5vh53d9i6dy11ibg9i9qpwz5hdm0s8bkx1d9cfcvy80cm4c7f";
-    })];
+    ++ [ ./5.1.0004-Fix-stack-overflow-in-vararg-functions.patch ];
 
   configurePhase =
     if stdenv.isDarwin

From 9daf6379267fddc58f44107d8ed445b4ceb12630 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 18 May 2018 00:52:33 +0200
Subject: [PATCH 2120/3370] =?UTF-8?q?gnome-desktop-testing:=202016.1=20?=
 =?UTF-8?q?=E2=86=92=202018.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix
index ff03897edb29..788310d5fe97 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, glib, autoreconfHook, pkgconfig, libgsystem, fetchgit }:
+{ stdenv, glib, autoreconfHook, pkgconfig, systemd, fetchgit }:
 
 stdenv.mkDerivation rec {
-  version = "2016.1";
+  version = "2018.1";
   name = "gnome-desktop-testing-${version}";
 
   src = fetchgit {
     url = https://git.gnome.org/browse/gnome-desktop-testing;
     rev = "v${version}";
-    sha256 = "18qhmsab6jc01qrfzjx8m4799gbs72c4jg830mp0p865rcbl68dc";
+    sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
-  buildInputs = [ glib libgsystem ];
+  buildInputs = [ glib systemd ];
 
   enableParallelBuilding = true;
 

From 2ffff13c8d78601adf0ecaf58eb3efc63a8f6fb0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 14:33:02 +0200
Subject: [PATCH 2121/3370] =?UTF-8?q?gegl=5F0=5F4:=200.4.0=20=E2=86=92=200?=
 =?UTF-8?q?.4.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix
index a8e50945c3fd..e9230b218be9 100644
--- a/pkgs/development/libraries/gegl/4.0.nix
+++ b/pkgs/development/libraries/gegl/4.0.nix
@@ -3,13 +3,13 @@
 , libwebp, gnome3, libintl }:
 
 let
-  version = "0.4.0";
+  version = "0.4.2";
 in stdenv.mkDerivation rec {
   name = "gegl-${version}";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
-    sha256 = "1ighk4z8nlqrzyj8w97s140hzj59564l3xv6fpzbr97m1zx2nkfh";
+    sha256 = "13bzl0k5l12pk8bkcq4ar7wscbnw7jswhp34mwfsrf10kp0qndba";
   };
 
   # needs fonts otherwise, don't know how to pass them

From 683d397dd88effa480c263e7d2f70b817a2ed2fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:53:59 +0200
Subject: [PATCH 2122/3370] =?UTF-8?q?gnome3.gnome-boxes:=203.28.3=20?=
 =?UTF-8?q?=E2=86=92=203.28.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
index 0ba4199630ab..1978c906bab4 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
@@ -9,13 +9,13 @@
 # TODO: ovirt (optional)
 
 let
-  version = "3.28.3";
+  version = "3.28.4";
 in stdenv.mkDerivation rec {
   name = "gnome-boxes-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "05x9c7w60cafcd3bdkr68ra8pbh7m8pciw67871hckaqafw76q1d";
+    sha256 = "1378zzqdwv0hnirg8k91s5vgkcl1brfild3hgach5jhg78nxdb4j";
   };
 
   doCheck = true;

From 3929be8495fc83ba3021bfff3f33df052f07f6e2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:54:18 +0200
Subject: [PATCH 2123/3370] =?UTF-8?q?gnome3.gnome-getting-started-docs:=20?=
 =?UTF-8?q?3.28.1=20=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gnome-3/apps/gnome-getting-started-docs/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
index b3ede7028902..c8a8f8e7e322 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-getting-started-docs-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0x60aava6ba4xliy4p4i6jm5d2nq8hx9aqgnaw4d34fvmcpcy5w0";
+    sha256 = "0vg0b4nr7azj6p5cpd7h7ya5hw6q89gnzig8hvp6swwrwg2p5nif";
   };
 
   passthru = {

From 8d9496cb73ecad293a398ab0c7b1151f93183630 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:54:34 +0200
Subject: [PATCH 2124/3370] =?UTF-8?q?gnome3.gnome-music:=203.28.2=20?=
 =?UTF-8?q?=E2=86=92=203.28.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 9aa8eee0bca8..560d8446f088 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "3.28.2";
+  version = "3.28.2.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz";
-    sha256 = "0xkbw9cp002vwwq6vlsbkahz9xbwpkyydd9cvh7az379sdlz4rid";
+    sha256 = "09lvpiqhijiq0kddnfi9rmmw806qh9a03czfhssqczd9fxmmbx5v";
   };
 
   nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobjectIntrospection ];

From eda0044379e33ffafdf4b8a34eaf4270e608b33d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:54:45 +0200
Subject: [PATCH 2125/3370] =?UTF-8?q?gnome3.gnome-desktop:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
index ed1e59da62c2..13f4b1ef6389 100644
--- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-desktop-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "16nbgrp0hihvrsa6kmqk0z8y7ajravyagmkmq1nnwn27psi9g8vq";
+    sha256 = "0c439hhpfd9axmv4af6fzhibksh69pnn2nnbghbbqqbwy6zqfl30";
   };
 
   passthru = {

From 347c1c82bb94b85e13310b04cfcfe4b3a316cff8 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:54:58 +0200
Subject: [PATCH 2126/3370] =?UTF-8?q?gnome3.gnome-disk-utility:=203.28.1?=
 =?UTF-8?q?=20=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 4f9e2dda5402..38f105bfcb0f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-disk-utility-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "09dmknfas8iifv6k5jb4a9ag57s8awrn0f26fd1qlg0mbfjlnfd6";
+    sha256 = "1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6";
   };
 
   passthru = {

From 0cc8b413daa0914da59bd8472fbd0db8e517ad22 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:55:06 +0200
Subject: [PATCH 2127/3370] =?UTF-8?q?gnome3.gnome-software:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-software/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
index 2d5080841a4a..81d401f8da2e 100644
--- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-software-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0j27zygb3g08q9i8ygwpxqf6g0lrivq2vhj7p7g9x0zh9r0vzlbs";
+    sha256 = "1s19p50nrkvxg4sb7bkn9ccajgaj251y9iz20bkn31ysq19ih03w";
   };
 
   patches = [

From e7923b9e26650b190540ba6169afa452df0a5156 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:57:43 +0200
Subject: [PATCH 2128/3370] =?UTF-8?q?gnome3.gnome-system-monitor:=203.28.1?=
 =?UTF-8?q?=20=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 46a91dda70e0..c402a2edd8fb 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-system-monitor-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0wdpd5mfrm0gwmwjvcj556c3mpxf3pcfnvh7x698i8if53ci0gw7";
+    sha256 = "164in885dyfvna5yjzgdyrbrsskvh5wzxdmkjgb4mbh54lzqd1zb";
   };
 
   doCheck = true;

From e96ec37c008aeb6dfe593cc51ed7acba7d79c4a4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 19 May 2018 16:57:56 +0200
Subject: [PATCH 2129/3370] =?UTF-8?q?gnome3.gnome-user-docs:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
index a8efa2384470..6cb827bc504f 100644
--- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-user-docs-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "189j78d23c6jr5x5j9nxkbdqxg31xvmwvyblz7f9xi9ncy0qdvfh";
+    sha256 = "0gg1rgg15lbgjdwpwlqazfjv8sm524ys024qsd4n09jlgx21jscd";
   };
 
   passthru = {

From c44e5653156fe301c5d8fc868aa6e5dfba5222de Mon Sep 17 00:00:00 2001
From: Eli Flanagan <efx@users.noreply.github.com>
Date: Sat, 19 May 2018 12:21:46 -0400
Subject: [PATCH 2130/3370] lastpass-cli: 1.3.0 -> 1.3.1 (#40734)

---
 pkgs/tools/security/lastpass-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix
index e9dffa5dbfa9..4db350684bef 100644
--- a/pkgs/tools/security/lastpass-cli/default.nix
+++ b/pkgs/tools/security/lastpass-cli/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "lastpass-cli-${version}";
 
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "lastpass";
     repo = "lastpass-cli";
     rev = "v${version}";
-    sha256 = "0k3vnlibv05wnn6qn3qjlcyj2s07di7zkmdnijd6cp1hfk76z2r5";
+    sha256 = "11drzmfdvb8ydw1dxaz9zz8rk0jjqmfv076vydz05qqvgx59s38h";
   };
 
   nativeBuildInputs = [ asciidoc cmake docbook_xsl pkgconfig ];

From 3a6fd647e55affd8ba02699455fe56da99606802 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Sat, 19 May 2018 19:49:18 +0300
Subject: [PATCH 2131/3370] connman: 1.35 -> 1.36 (#40775)

---
 pkgs/tools/networking/connman/default.nix | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 45fabeee1393..f6e0608ca7f8 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "connman-${version}";
-  version = "1.35";
+  version = "1.36";
   src = fetchurl {
     url = "mirror://kernel/linux/network/connman/${name}.tar.xz";
-    sha256 = "1apj5j25kj7v1bsfv3nh54aiq873nfrsjfbj85p5qm3ihfwxxmv6";
+    sha256 = "0x00dq5c2frz06md3g5y0jh5kbcj2hrfl5qjcqga8gs4ri0xp2f7";
   };
 
   buildInputs = [ openconnect polkit
@@ -16,14 +16,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig file gawk ];
 
-  patches = [
-    (fetchpatch {
-      name = "header-include.patch";
-      url = "https://git.kernel.org/pub/scm/network/connman/connman.git/patch/?id=bdfb3526466f8fb8f13d9259037d8f42c782ce24";
-      sha256 = "0q6ysy2xvvcmkcbw1y29x90g7g7kih7v95k1xbxdcxkras5yl8nf";
-    })
-  ];
-
   preConfigure = ''
     export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant
     export PPPD=${ppp}/sbin/pppd
@@ -61,7 +53,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A daemon for managing internet connections";
-    homepage = https://connman.net/;
+    homepage = https://01.org/connman;
     maintainers = [ maintainers.matejc ];
     platforms = platforms.linux;
     license = licenses.gpl2;

From fac358731d6b9d46dd4ff4f3ddfcaeb5f2c7d1ad Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Sat, 19 May 2018 18:59:04 +0200
Subject: [PATCH 2132/3370] Unbreak gv (fixes #34841) (#40658)

It appears that without pkgconfig, the build process misdetects some features, resulting in gv to segfault immediately on startup.

The fix was adopted from https://github.com/Homebrew/legacy-homebrew/issues/18555#issuecomment-15074618.
---
 pkgs/applications/misc/gv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix
index b13e7ae5232c..036cb104b480 100644
--- a/pkgs/applications/misc/gv/default.nix
+++ b/pkgs/applications/misc/gv/default.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation {
     Xaw3d
     ghostscriptX
     perl
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
     pkgconfig
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
     libiconv
   ];
 

From 2c7c9cbbac3670f2a118b777012559ce4550d17a Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sat, 19 May 2018 12:06:16 -0500
Subject: [PATCH 2133/3370] gcc5: delete unused patch

---
 .../compilers/gcc/5/libcxx38-and-above.patch  | 46 -------------------
 1 file changed, 46 deletions(-)
 delete mode 100644 pkgs/development/compilers/gcc/5/libcxx38-and-above.patch

diff --git a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch b/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
deleted file mode 100644
index ee48901a6d0c..000000000000
--- a/pkgs/development/compilers/gcc/5/libcxx38-and-above.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-This is a slightly modified version of https://svnweb.freebsd.org/ports/head/lang/gcc5/files/patch-libc%2B%2B?revision=432958&view=co&pathrev=432958,
-which doesn't apply cleanly due to them using a slightly different format of patch from us. I just replaced the .orig file references with a/b paths.
-
---- a/gcc/auto-profile.c 2015-01-18 02:25:42 UTC
-+++ b/gcc/auto-profile.c
-@@ -19,11 +19,9 @@ along with GCC; see the file COPYING3.  
- <http://www.gnu.org/licenses/>.  */
- 
- #include "config.h"
--#include "system.h"
--
--#include <string.h>
- #include <map>
- #include <set>
-+#include "system.h"
- 
- #include "coretypes.h"
- #include "hash-set.h"
---- a/gcc/graphite-isl-ast-to-gimple.c 2017-01-19 21:02:12 UTC
-+++ b/gcc/graphite-isl-ast-to-gimple.c
-@@ -38,6 +38,7 @@ extern "C" {
- #endif
- #endif
- 
-+#include <map>
- #include "system.h"
- #include "coretypes.h"
- #include "hash-set.h"
-@@ -75,7 +76,6 @@ extern "C" {
- #include "tree-scalar-evolution.h"
- #include "gimple-ssa.h"
- #include "tree-into-ssa.h"
--#include <map>
- 
- #ifdef HAVE_isl
- #include "graphite-poly.h"
---- a/gcc/system.h 2015-01-05 12:33:28 UTC
-+++ b/gcc/system.h
-@@ -217,6 +217,7 @@ extern int errno;
- #ifdef __cplusplus
- # include <algorithm>
- # include <cstring>
-+# include <new>
- # include <utility>
- #endif
- 

From f434c71def988861308ce1aeb922d0d773e76d11 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 18 May 2018 16:59:36 -0400
Subject: [PATCH 2134/3370] antibody: init at 3.4.6

---
 pkgs/shells/zsh/antibody/default.nix | 25 +++++++++
 pkgs/shells/zsh/antibody/deps.nix    | 83 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 3 files changed, 110 insertions(+)
 create mode 100644 pkgs/shells/zsh/antibody/default.nix
 create mode 100644 pkgs/shells/zsh/antibody/deps.nix

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
new file mode 100644
index 000000000000..b95ba35045d0
--- /dev/null
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "antibody-${version}";
+  version = "3.4.6";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/getantibody/antibody";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner  = "getantibody";
+    repo   = "antibody";
+    sha256 = "0pvsngvlxv5iw7yj18snslag8c61ji4w3j3rw543ckl6k3f9zq6c";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description = "The fastest shell plugin manager";
+    homepage    = https://github.com/getantibody/antibody;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ worldofpeace ];
+  };
+}
diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix
new file mode 100644
index 000000000000..6e97ff319029
--- /dev/null
+++ b/pkgs/shells/zsh/antibody/deps.nix
@@ -0,0 +1,83 @@
+[
+  {
+    goPackagePath = "github.com/alecthomas/kingpin";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/kingpin";
+      rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
+      sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/template";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/template";
+      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
+    };
+  }
+  {
+    goPackagePath = "github.com/alecthomas/units";
+    fetch = {
+      type = "git";
+      url = "https://github.com/alecthomas/units";
+      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
+    };
+  }
+  {
+    goPackagePath = "github.com/caarlos0/gohome";
+    fetch = {
+      type = "git";
+      url = "https://github.com/caarlos0/gohome";
+      rev = "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
+      sha256 = "1wpg7dpi44kic4y20bk6fjwpanm65h1hj4762dsp41kbdfzc8322";
+    };
+  }
+  {
+    goPackagePath = "github.com/getantibody/folder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getantibody/folder";
+      rev = "e65aa38ebeb03e6d6e91b90a637f3b7c17e1b6d6";
+      sha256 = "0h8al3sl4gxg1p33s8jrz91i7vrqahk12p0b3srlhnz1sn4ahn8n";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sync";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sync";
+      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e269cbb956ac..f84ac2b5c6c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1453,6 +1453,8 @@ with pkgs;
     utillinux = utillinuxMinimal;
   };
 
+  antibody = callPackage ../shells/zsh/antibody { };
+  
   antigen = callPackage ../shells/zsh/antigen { };
 
   apparix = callPackage ../tools/misc/apparix { };

From 84919cd3ef14363d15958227f860b3a31401490a Mon Sep 17 00:00:00 2001
From: Eric Bailey <e.bailey@sportradar.com>
Date: Fri, 18 May 2018 09:04:41 -0500
Subject: [PATCH 2135/3370] m-cli: init at 0.2.5

---
 pkgs/os-specific/darwin/m-cli/default.nix | 45 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 +-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/m-cli/default.nix

diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix
new file mode 100644
index 000000000000..75f1113e9f08
--- /dev/null
+++ b/pkgs/os-specific/darwin/m-cli/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "m-cli-${version}";
+  version = "0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "rgcr";
+    repo = "m-cli";
+    rev = "v${version}";
+    sha512 = "0mkcx7jq91pbfs8327qc8434gj73fvjgdfdsrza0lyd9wns6jhsqsf0585klzl68aqscvksgzi2asdnim4va35cdkp2fdzl0g3sm4kd";
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    local MPATH="$out/share/m"
+
+    gawk -i inplace '{
+      gsub(/^\[ -L.*|^\s+\|\| pushd.*|^popd.*/, "");
+      gsub(/MPATH=.*/, "MPATH='$MPATH'");
+      gsub(/(update|uninstall)_mcli \&\&.*/, "echo NOOP \\&\\& exit 0");
+      print
+    }' m
+
+    install -Dt "$MPATH/plugins" -m755 plugins/*
+
+    install -Dm755 m $out/bin/m
+
+    install -Dt "$out/share/bash-completion/completions/" -m444 completion/bash/m
+    install -Dt "$out/share/fish/vendor_completions.d/" -m444 completion/fish/m.fish
+    install -Dt "$out/share/zsh/site-functions/" -m444 completion/zsh/_m
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Swiss Army Knife for macOS";
+    inherit (src.meta) homepage;
+    repositories.git = git://github.com/rgcr/m-cli.git;
+
+    license = licenses.mit;
+
+    platforms = platforms.darwin;
+    maintainers = with maintainers; [ yurrriq ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64cdad2282bb..e8e92684096f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -683,6 +683,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };
 
+  m-cli = callPackage ../os-specific/darwin/m-cli { };
+
   reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {};
 
   skhd = callPackage ../os-specific/darwin/skhd {
@@ -3163,7 +3165,7 @@ with pkgs;
   jing-trang = callPackage ../tools/text/xml/jing-trang { };
 
   jira-cli = callPackage ../development/tools/jira_cli { };
- 
+
   jl = haskellPackages.callPackage ../development/tools/jl { };
 
   jmespath = callPackage ../development/tools/jmespath { };

From 05e93475f39bca01d186811f9dd11785710fc25c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 19 May 2018 21:45:40 +0200
Subject: [PATCH 2136/3370] jekyll: 3.8.1 -> 3.8.2

---
 .../misc/jekyll/basic/Gemfile.lock            |  6 ++---
 .../applications/misc/jekyll/basic/gemset.nix | 12 +++++-----
 .../misc/jekyll/full/Gemfile.lock             | 12 +++++-----
 pkgs/applications/misc/jekyll/full/gemset.nix | 24 +++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index a0b1916fb181..3cead5d24ad2 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -13,17 +13,17 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.6)
+    eventmachine (1.2.7)
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.7.2)
+    html-pipeline (2.8.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.1)
+    jekyll (3.8.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index c93f93f457db..e96438eefe3a 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -45,10 +45,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
-    version = "1.2.6";
+    version = "1.2.7";
   };
   ffi = {
     source = {
@@ -78,10 +78,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
+      sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.8.0";
   };
   "http_parser.rb" = {
     source = {
@@ -104,10 +104,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
+      sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
       type = "gem";
     };
-    version = "3.8.1";
+    version = "3.8.2";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index bbcdad669da1..323a0c2f3601 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -20,21 +20,21 @@ GEM
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    eventmachine (1.2.6)
+    eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.0)
+    faraday (0.15.1)
       multipart-post (>= 1.2, < 3)
     fast-stemmer (1.0.2)
     ffi (1.9.23)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
-    html-pipeline (2.7.2)
+    html-pipeline (2.8.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.1)
+    jekyll (3.8.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -92,7 +92,7 @@ GEM
     multipart-post (2.0.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
-    octokit (4.8.0)
+    octokit (4.9.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pathutil (0.16.1)
       forwardable-extended (~> 2.6)
@@ -103,7 +103,7 @@ GEM
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     rdiscount (2.2.0.1)
-    rdoc (6.0.3)
+    rdoc (6.0.4)
     redcarpet (3.4.0)
     rouge (3.1.1)
     ruby_dep (1.5.0)
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 8473cee0be53..7fc93589236f 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -79,10 +79,10 @@
   eventmachine = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08477hl609rmmngwfy8dmsqz5zvsg8xrsrrk6xi70jf48majwli0";
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
       type = "gem";
     };
-    version = "1.2.6";
+    version = "1.2.7";
   };
   execjs = {
     source = {
@@ -96,10 +96,10 @@
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dv1vcxxyw4vy0r2diiml0r8zqk1csrksfxv8nkrw61xlf2daaaa";
+      sha256 = "0q3z6mm6ym11jrzi1hqcwi0mkydb5m980g8is6ggkcxrinmx2nxx";
       type = "gem";
     };
-    version = "0.15.0";
+    version = "0.15.1";
   };
   fast-stemmer = {
     source = {
@@ -137,10 +137,10 @@
     dependencies = ["activesupport" "nokogiri"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1fdnxi9lh88vjndk4g94pwa45awbzklqc9b38nhqqb3sxg6my6zp";
+      sha256 = "07m365sbabwxf4ad29ykgxrln68ma7va0hqqspv26s7yg8pdgixf";
       type = "gem";
     };
-    version = "2.7.2";
+    version = "2.8.0";
   };
   "http_parser.rb" = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "01s1r5pjfdvk5r1pz3j4smz42jsfv5vvp4q7fg0mrzxn9xk2nvi6";
+      sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
       type = "gem";
     };
-    version = "3.8.1";
+    version = "3.8.2";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -379,10 +379,10 @@
     dependencies = ["sawyer"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1hp77svmpxcwnfajb324i1g2b7jazg23fn4ccjr5y3lww0rnj1dg";
+      sha256 = "1ssn5iyax07a22mvmj0y45bfy8ali129bl1qmasp6bcg03bvk298";
       type = "gem";
     };
-    version = "4.8.0";
+    version = "4.9.0";
   };
   pathutil = {
     dependencies = ["forwardable-extended"];
@@ -438,10 +438,10 @@
   rdoc = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0ia6gq4fnwkm29j34yncg74w0nq5iyyrcjjhmkwzmzw9dbs0zy8a";
+      sha256 = "0anv42cqcdc6g4n386mrva7mgav5i0c2ry3yzvzzc6z6hymkmcr7";
       type = "gem";
     };
-    version = "6.0.3";
+    version = "6.0.4";
   };
   redcarpet = {
     source = {

From 2b7fe3bf5ae5de32318bf79839d4b57175e51c6e Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 19 May 2018 17:21:40 -0300
Subject: [PATCH 2137/3370] xorg: replace edits to generated script

- update versions in .list files to match
- move cf-files postInstall to overrides.nix
---
 pkgs/servers/x11/xorg/default.nix       | 3 ---
 pkgs/servers/x11/xorg/old.list          | 2 +-
 pkgs/servers/x11/xorg/overrides.nix     | 6 ++++++
 pkgs/servers/x11/xorg/tarballs-7.7.list | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 07faa8d3cc7e..f5d7f54eb5ca 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -2570,9 +2570,6 @@ let
       url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2;
       sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd";
     };
-    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
-      substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
-    '';
     nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/old.list b/pkgs/servers/x11/xorg/old.list
index 801f6e0b7971..fd6eae916392 100644
--- a/pkgs/servers/x11/xorg/old.list
+++ b/pkgs/servers/x11/xorg/old.list
@@ -3,7 +3,7 @@ mirror://xorg/individual/app/xclock-1.0.7.tar.bz2
 mirror://xorg/individual/app/xdm-1.1.11.tar.bz2
 mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2
 mirror://xorg/individual/app/xfs-1.1.4.tar.bz2
-mirror://xorg/individual/app/xinit-1.3.4.tar.bz2
+mirror://xorg/individual/app/xinit-1.4.0.tar.bz2
 mirror://xorg/individual/app/xmessage-1.0.4.tar.bz2
 mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2
 mirror://xorg/individual/lib/libXxf86misc-1.0.3.tar.bz2
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0da75f941f09..01e990b55743 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -650,6 +650,12 @@ in
     ];
   };
 
+  xorgcffiles = attrs: attrs // {
+    postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+      substituteInPlace $out/lib/X11/config/darwin.cf --replace "/usr/bin/" ""
+    '';
+  };
+
   xwd = attrs: attrs // {
     buildInputs = with xorg; attrs.buildInputs ++ [libXt libxkbfile];
   };
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index dd48748dceb3..70f3a35505e0 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -68,7 +68,7 @@ mirror://xorg/individual/lib/libXcursor-1.1.15.tar.bz2
 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
-mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2
+mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.3.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
@@ -101,7 +101,7 @@ mirror://xorg/individual/app/sessreg-1.1.1.tar.bz2
 mirror://xorg/individual/app/setxkbmap-1.3.1.tar.bz2
 mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2
 mirror://xorg/individual/app/twm-1.0.9.tar.bz2
-mirror://xorg/individual/util/util-macros-1.19.1.tar.bz2
+mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2
 mirror://xorg/individual/proto/videoproto-2.3.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/windowswmproto-1.0.4.tar.bz2
 mirror://xorg/individual/app/x11perf-1.6.0.tar.bz2
@@ -131,7 +131,7 @@ mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-amdgpu-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-7.9.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-18.0.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2
 mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2
@@ -164,7 +164,7 @@ mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2
 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2
 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2
+mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-wsfb-0.4.0.tar.bz2

From 9cd1702502630eb3fc76d7b0e6a4548afdd37ede Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 15:28:43 +0200
Subject: [PATCH 2138/3370] LTS Haskell 11.9

---
 .../configuration-hackage2nix.yaml            | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index b3f8efa3963e..418310581812 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.8
+  # LTS Haskell 11.9
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -94,7 +94,7 @@ default-package-overrides:
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
   - ansigraph ==0.3.0.5
-  - ansi-terminal ==0.8.0.3
+  - ansi-terminal ==0.8.0.4
   - ansi-wl-pprint ==0.6.8.2
   - ANum ==0.2.0.2
   - apecs ==0.2.4.7
@@ -291,7 +291,7 @@ default-package-overrides:
   - Chart-cairo ==1.8.3
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.4
-  - chatwork ==0.1.3.2
+  - chatwork ==0.1.3.3
   - cheapskate ==0.1.1
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -526,7 +526,7 @@ default-package-overrides:
   - doctest-driver-gen ==0.2.0.2
   - do-list ==1.0.1
   - dom-parser ==3.0.0
-  - dotenv ==0.5.2.4
+  - dotenv ==0.5.2.5
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
@@ -906,7 +906,7 @@ default-package-overrides:
   - hmpfr ==0.4.4
   - hocilib ==0.2.0
   - Hoed ==0.5.1
-  - hOpenPGP ==2.6.1
+  - hOpenPGP ==2.6.2
   - hopfli ==0.2.2.1
   - hosc ==0.16
   - hostname ==1.0
@@ -937,9 +937,9 @@ default-package-overrides:
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
   - hsinstall ==1.6
-  - HSlippyMap ==3.0
+  - HSlippyMap ==3.0.1
   - hslogger ==1.2.10
-  - hslua ==0.9.5.1
+  - hslua ==0.9.5.2
   - hslua-aeson ==0.3.0.1
   - hslua-module-text ==0.1.2.1
   - hsndfile ==0.8.0
@@ -1051,7 +1051,7 @@ default-package-overrides:
   - indentation-parsec ==0.0.0.1
   - indents ==0.4.0.1
   - indexed-list-literals ==0.1.0.1
-  - inflections ==0.4.0.1
+  - inflections ==0.4.0.3
   - influxdb ==1.3.0.1
   - ini ==0.3.6
   - inline-c ==0.6.0.6
@@ -1087,7 +1087,7 @@ default-package-overrides:
   - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
-  - irc-client ==1.1.0.2
+  - irc-client ==1.1.0.3
   - irc-conduit ==0.3.0.1
   - irc-ctcp ==0.1.3.0
   - irc-dcc ==2.0.1
@@ -1101,7 +1101,7 @@ default-package-overrides:
   - ix-shapable ==0.1.0
   - jack ==0.7.1.3
   - javascript-extras ==0.3.2.0
-  - jmacro ==0.6.14
+  - jmacro ==0.6.15
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
@@ -1287,7 +1287,7 @@ default-package-overrides:
   - minimorph ==0.1.6.1
   - minio-hs ==1.0.0
   - miniutter ==0.4.7.0
-  - mintty ==0.1.1
+  - mintty ==0.1.2
   - misfortune ==0.1.1.2
   - miso ==0.14.0.0
   - missing-foreign ==0.1.1
@@ -1315,7 +1315,7 @@ default-package-overrides:
   - monadloc ==0.7.1
   - monad-logger ==0.3.28.5
   - monad-logger-json ==0.1.0.0
-  - monad-logger-prefix ==0.1.9
+  - monad-logger-prefix ==0.1.10
   - monad-logger-syslog ==0.1.4.0
   - monad-loops ==0.4.3
   - monad-memo ==0.4.1
@@ -1358,7 +1358,7 @@ default-package-overrides:
   - murmur-hash ==0.1.0.9
   - mustache ==2.3.0
   - mutable-containers ==0.3.4
-  - mwc-probability ==2.0.2
+  - mwc-probability ==2.0.3
   - mwc-random ==0.13.6.0
   - mwc-random-accelerate ==0.1.0.0
   - mysql ==0.1.5
@@ -1653,7 +1653,7 @@ default-package-overrides:
   - raaz ==0.2.0
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
-  - rakuten ==0.1.1.1
+  - rakuten ==0.1.1.2
   - ramus ==0.1.2
   - random ==1.1
   - random-fu ==0.2.7.0
@@ -1731,6 +1731,7 @@ default-package-overrides:
   - rfc5051 ==0.1.0.3
   - riak ==1.1.2.4
   - riak-protobuf ==0.23.0.0
+  - rio ==0.1.2.0
   - rng-utils ==0.3.0
   - roles ==0.2.0.0
   - rollbar-hs ==0.2.0.0
@@ -1754,13 +1755,13 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
   - schematic ==0.4.2.0
-  - scientific ==0.3.6.0
+  - scientific ==0.3.6.2
   - scotty ==0.11.1
   - scrypt ==0.5.0
   - sdl2 ==2.4.0.1
@@ -1798,7 +1799,7 @@ default-package-overrides:
   - servant-github-webhook ==0.4.1.0
   - servant-js ==0.9.3.2
   - servant-JuicyPixels ==0.3.0.3
-  - servant-kotlin ==0.1.1.0
+  - servant-kotlin ==0.1.1.1
   - servant-lucid ==0.8
   - servant-mock ==0.8.4
   - servant-pandoc ==0.5.0.0
@@ -1951,7 +1952,7 @@ default-package-overrides:
   - sum-type-boilerplate ==0.1.1
   - sundown ==0.6
   - superbuffer ==0.3.1.1
-  - svg-builder ==0.1.0.2
+  - svg-builder ==0.1.1
   - svg-tree ==0.6.2.2
   - swagger ==0.3.0
   - swagger2 ==2.2.1
@@ -2128,7 +2129,7 @@ default-package-overrides:
   - ua-parser ==0.7.4.1
   - uglymemo ==0.1.0.1
   - unbounded-delays ==0.1.1.0
-  - unbound-generics ==0.3.2
+  - unbound-generics ==0.3.3
   - unboxed-ref ==0.4.0.0
   - uncertain ==0.3.1.0
   - unexceptionalio ==0.3.0
@@ -2258,7 +2259,7 @@ default-package-overrides:
   - web-routes-th ==0.22.6.3
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.4.0
+  - websockets ==0.12.4.1
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.2.5
@@ -2305,7 +2306,7 @@ default-package-overrides:
   - x509-validation ==1.6.10
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xeno ==0.3.3
+  - xeno ==0.3.4
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
   - xls ==0.1.1
@@ -2333,7 +2334,7 @@ default-package-overrides:
   - xturtle ==0.2.0.0
   - xxhash ==0.0.2
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.29
+  - yaml ==0.8.30
   - Yampa ==0.10.7
   - YampaSynth ==0.2
   - yeshql ==3.0.1.3
@@ -2343,7 +2344,7 @@ default-package-overrides:
   - yesod-auth-fb ==1.9.0
   - yesod-auth-hashdb ==1.7
   - yesod-bin ==1.6.0.2
-  - yesod-core ==1.6.4
+  - yesod-core ==1.6.5
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0
   - yesod-fb ==0.5.0

From 02834ba458e29e438a679fcb7a557b06a151aa1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 10 May 2018 02:31:15 +0200
Subject: [PATCH 2139/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/a6208828bf7986612c16ac0de6bebd9a3dc32d2e.
---
 .../haskell-modules/hackage-packages.nix      | 4460 +++++++++++++----
 1 file changed, 3413 insertions(+), 1047 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index bad45c3a27e7..b6f5c57c73c7 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4924,6 +4924,17 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "Enum" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "Enum";
+       version = "0.1.0.0";
+       sha256 = "1zl5w5w3rqbh4awp4b4rbamkqcvnrzn944rjc84sq3rqad3wlww2";
+       libraryHaskellDepends = [ base ];
+       description = "Non-crashing `Enum` operations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "EnumContainers" = callPackage
     ({ mkDerivation, base, containers, deepseq }:
      mkDerivation {
@@ -5554,12 +5565,12 @@ self: {
      }) {};
 
   "Fin" = callPackage
-    ({ mkDerivation, base, clist, natural-induction, peano }:
+    ({ mkDerivation, base, natural-induction, peano }:
      mkDerivation {
        pname = "Fin";
-       version = "0.2.0.0";
-       sha256 = "0w4gmfhpav73rkia3q7g6m4lncz1smhfa0rl2sr0602sc0694spr";
-       libraryHaskellDepends = [ base clist natural-induction peano ];
+       version = "0.2.3.0";
+       sha256 = "1cjsp6i1ak2icjmg0xrprn2xminz35mxb4dj1nsvjvs2qqgjvl1g";
+       libraryHaskellDepends = [ base natural-induction peano ];
        description = "Finite totally-ordered sets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6084,8 +6095,8 @@ self: {
     ({ mkDerivation, array, base, process }:
      mkDerivation {
        pname = "GHood";
-       version = "0.0.6";
-       sha256 = "0n9vp4y5d1fx45x6s5a84ylyvnjyaq44x9r46zyh0dkyrms3jsqi";
+       version = "0.0.7";
+       sha256 = "056kil71f488xf87xlyx9p5jpah2azhbnb2r7hwdyxbz7izns2ks";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process ];
        homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
@@ -8652,8 +8663,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "HSlippyMap";
-       version = "3.0";
-       sha256 = "1kqyahisqzilndargvyh0gqln3471ll1jkpnayirfi9am1by4f93";
+       version = "3.0.1";
+       sha256 = "03gb5dd59mirwb11b98vbg60w2zwfsbr8akk7qbq01z7n7rkgsr7";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/apeyroux/HSlippyMap";
        description = "OpenStreetMap Slippy Map";
@@ -9161,6 +9172,8 @@ self: {
        pname = "HaXml";
        version = "1.25.4";
        sha256 = "1d8xq37h627im5harybhsn08qjdaf6vskldm03cqbfjmr2w6fx6p";
+       revision = "1";
+       editedCabalFile = "1vnil3xdyhr48f0nxcaljbl1k5ibg5g5gghvrhykg447b0jvp922";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -9568,17 +9581,17 @@ self: {
 
   "Hastodon" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
-     , exceptions, http-client, http-conduit, http-types, mime-types
-     , MissingH, resourcet, text, transformers
+     , containers, exceptions, http-client, http-conduit, http-types
+     , mime-types, MissingH, resourcet, text, transformers
      }:
      mkDerivation {
        pname = "Hastodon";
-       version = "0.4.1";
-       sha256 = "08skn3qvqfzll1hhzayqm46kwdl45kbckgwvzjm4bqa5w5jvh708";
+       version = "0.5.0";
+       sha256 = "1yr72vkj4ir7q6w1fnffra9lr0jvz2pfskd2g1zwg3a778cbyx9h";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit exceptions http-client
-         http-conduit http-types mime-types MissingH resourcet text
-         transformers
+         aeson attoparsec base bytestring conduit containers exceptions
+         http-client http-conduit http-types mime-types MissingH resourcet
+         text transformers
        ];
        homepage = "https://github.com/syucream/hastodon";
        description = "mastodon client module for Haskell";
@@ -12268,6 +12281,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Map" = callPackage
+    ({ mkDerivation, base, containers, either-both, filtrable, map
+     , smallcheck, tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "Map";
+       version = "0.0.0.0";
+       sha256 = "1w79zzlzh3ivrqznvcrg5kgaizzs838y7hd52nvxn5v7lax5y3wz";
+       libraryHaskellDepends = [
+         base containers either-both filtrable util
+       ];
+       testHaskellDepends = [
+         base map smallcheck tasty tasty-smallcheck
+       ];
+       description = "Class of key-value maps";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {map = null;};
+
   "Mapping" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -13914,6 +13947,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "OneTuple_0_2_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "OneTuple";
+       version = "0.2.2";
+       sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq";
+       libraryHaskellDepends = [ base ];
+       description = "Singleton Tuple";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Only" = callPackage
     ({ mkDerivation, base, deepseq }:
      mkDerivation {
@@ -14749,6 +14794,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Persistence" = callPackage
+    ({ mkDerivation, base, containers, maximal-cliques, parallel
+     , vector
+     }:
+     mkDerivation {
+       pname = "Persistence";
+       version = "1.0";
+       sha256 = "12n0d5r03cp88svw0mfhimsr4a585qsq90cpszmcr3l5gsai3h9d";
+       libraryHaskellDepends = [
+         base containers maximal-cliques parallel vector
+       ];
+       description = "Quickly detect clusters and holes in data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Phsu" = callPackage
     ({ mkDerivation, acid-state, aeson, base, blaze-html, blaze-markup
      , containers, curl, filepath, friendly-time, happstack-server
@@ -16667,8 +16727,8 @@ self: {
      }:
      mkDerivation {
        pname = "SciFlow";
-       version = "0.6.1";
-       sha256 = "0axwf7rdwhl3ppq6qlxrffzbzbwvb8q0ygpnlzc2yvksiqzp9h2g";
+       version = "0.6.2";
+       sha256 = "1d5qw79809v7q2dvyz7h857lhdbahcj8915pz0bz95nmknbjc50f";
        libraryHaskellDepends = [
          aeson base bytestring cereal cereal-text containers
          data-default-class directory exceptions executable-path fgl
@@ -21796,6 +21856,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "acquire" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "acquire";
+       version = "0.2.0.1";
+       sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/metrix-ai/acquire";
+       description = "Abstraction over management of resources";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "action-permutations" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -21815,8 +21887,8 @@ self: {
        pname = "active";
        version = "0.2.0.13";
        sha256 = "1yw029rh0gb63bhwwjynbv173mny14is4cyjkrlvzvxwb0fi96jx";
-       revision = "4";
-       editedCabalFile = "1p2gaazj7r98v45d57hshgv6nxam5l47dl6y9iq65z5zqylmz7q2";
+       revision = "5";
+       editedCabalFile = "0hwla9xz275qzgn9n07311ksl3j40izidki1nbhmrmmmfjin57cv";
        libraryHaskellDepends = [
          base lens linear semigroupoids semigroups vector
        ];
@@ -22246,20 +22318,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson_1_3_1_0" = callPackage
+  "aeson_1_3_1_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, base-orphans
      , base16-bytestring, bytestring, containers, deepseq, directory
      , dlist, filepath, generic-deriving, ghc-prim, hashable
      , hashable-time, HUnit, integer-logarithms, QuickCheck
-     , quickcheck-instances, scientific, tagged, template-haskell
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, th-abstraction, time, time-locale-compat
-     , unordered-containers, uuid-types, vector
+     , quickcheck-instances, scientific, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, th-abstraction, time
+     , time-locale-compat, unordered-containers, uuid-types, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "1.3.1.0";
-       sha256 = "0ljndkgibz3qbddz2451v1r9w8i440kpslg3al3m7gc82mxz2xrr";
+       version = "1.3.1.1";
+       sha256 = "1i1ig840fvsb1lnklcv32zsc0zscirc301lw1mpfxhc6h4pk0gw4";
        libraryHaskellDepends = [
          attoparsec base base-compat bytestring containers deepseq dlist
          ghc-prim hashable scientific tagged template-haskell text
@@ -22270,9 +22341,9 @@ self: {
          attoparsec base base-compat base-orphans base16-bytestring
          bytestring containers directory dlist filepath generic-deriving
          ghc-prim hashable hashable-time HUnit integer-logarithms QuickCheck
-         quickcheck-instances scientific tagged template-haskell
-         test-framework test-framework-hunit test-framework-quickcheck2 text
-         time time-locale-compat unordered-containers uuid-types vector
+         quickcheck-instances scientific tagged tasty tasty-hunit
+         tasty-quickcheck template-haskell text time time-locale-compat
+         unordered-containers uuid-types vector
        ];
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
@@ -22398,6 +22469,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aeson-decode" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, containers, data-default
+     , hedgehog, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-decode";
+       version = "0.1.0.0";
+       sha256 = "0x5gjp86554p09r8r73wpmv840d6dkc7vmqyq60nj6v6spq5v7bx";
+       libraryHaskellDepends = [
+         aeson base containers data-default text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson-qq base containers hedgehog text time
+       ];
+       homepage = "https://github.com/typeclasses/aeson-decode";
+       description = "Easy functions for converting from Aeson.Value";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "aeson-diff" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
@@ -22427,6 +22517,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-diff_1_1_0_5" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest
+     , edit-distance-vector, filepath, Glob, hashable, mtl
+     , optparse-applicative, QuickCheck, quickcheck-instances
+     , scientific, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-diff";
+       version = "1.1.0.5";
+       sha256 = "1kzvqzbl6pp5g49dp4qqc7cbisnkpqz0i18b6nmdb7f1nrhdvnb1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring edit-distance-vector hashable mtl scientific
+         text unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring optparse-applicative text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory doctest filepath Glob QuickCheck
+         quickcheck-instances text unordered-containers vector
+       ];
+       homepage = "https://github.com/thsutton/aeson-diff";
+       description = "Extract and apply patches to JSON documents";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-diff-generic" = callPackage
     ({ mkDerivation, aeson, aeson-diff, base, base-compat, bytestring
      , containers, dlist, hashable, lens, scientific, tagged
@@ -23048,6 +23167,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "affine" = callPackage
+    ({ mkDerivation, alg, base }:
+     mkDerivation {
+       pname = "affine";
+       version = "0.1.1.0";
+       sha256 = "094h5b5l755sm79mr47dm5brp2jvfd2g0mdz23mcw1pz57lm0c8i";
+       libraryHaskellDepends = [ alg base ];
+       description = "Affine spaces (generalized)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "affine-invariant-ensemble-mcmc" = callPackage
     ({ mkDerivation, base, containers, mwc-random, primitive, split
      , vector
@@ -23784,8 +23914,8 @@ self: {
     ({ mkDerivation, base, util }:
      mkDerivation {
        pname = "alg";
-       version = "0.2.4.1";
-       sha256 = "0fx3q5ivd942yly212k0qdrhwbjpx0y4sj1r2r9lbhxb2941rg4n";
+       version = "0.2.5.0";
+       sha256 = "014wrh4f58lq50n5ybdksr2k5lygs5qxsyxg48zpbzzz3p3494yx";
        libraryHaskellDepends = [ base util ];
        description = "Algebraic structures";
        license = stdenv.lib.licenses.bsd3;
@@ -24486,20 +24616,20 @@ self: {
 
   "amazonka" = callPackage
     ({ mkDerivation, amazonka-core, base, bytestring, conduit
-     , conduit-extra, directory, exceptions, http-conduit, ini, mmorph
-     , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text
-     , time, transformers, transformers-base, transformers-compat
+     , conduit-extra, directory, exceptions, http-client, http-conduit
+     , http-types, ini, mmorph, monad-control, mtl, resourcet, retry
+     , tasty, tasty-hunit, text, time, transformers, transformers-base
+     , transformers-compat, void
      }:
      mkDerivation {
        pname = "amazonka";
-       version = "1.5.0";
-       sha256 = "0g5fb1kwydhhi4pvp4skc0l26gy0kdpbrl3pixmnml5d2fxa86pw";
-       revision = "1";
-       editedCabalFile = "0v4wfwrm0zjzm1g2gw9qi521hlvzg26dm79x03zy8i2aqg8rqgri";
+       version = "1.6.0";
+       sha256 = "07647x7lq9kaq6bqh38rvdiajji4ks6s7nvxv2xi4v4lhwn8j89p";
        libraryHaskellDepends = [
          amazonka-core base bytestring conduit conduit-extra directory
-         exceptions http-conduit ini mmorph monad-control mtl resourcet
-         retry text time transformers transformers-base transformers-compat
+         exceptions http-client http-conduit http-types ini mmorph
+         monad-control mtl resourcet retry text time transformers
+         transformers-base transformers-compat void
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "https://github.com/brendanhay/amazonka";
@@ -24508,14 +24638,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-alexa-business" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-alexa-business";
+       version = "1.6.0";
+       sha256 = "0r8qdcc4fxgpx7pgfkcah6pxq8dixaw167ph30a087rr74rfk0k1";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Alexa For Business SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-apigateway" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-apigateway";
-       version = "1.5.0";
-       sha256 = "1yamp1wlhji496sd0c6gkilx6n3m59wwvxpfh3vpy4wv93xh5494";
+       version = "1.6.0";
+       sha256 = "1s2snyx9s23435wsan8hbi1vnql3n3rgh23ffv9d0n43pp7kxrjn";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24533,8 +24681,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-application-autoscaling";
-       version = "1.5.0";
-       sha256 = "0iwrzk9wfnf46as45lv31qxghlbq823yphkw0dzh39vmqyc2zmfn";
+       version = "1.6.0";
+       sha256 = "1xqxlrw02r4w5h348ab04lrwp4cxk3sksx5xhmxr1macqb8sfdjm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24552,8 +24700,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-appstream";
-       version = "1.5.0";
-       sha256 = "05g5xz68v3azvh8f5hcqijvif6g4jm0bmb3y9fgcn21f4lzl6ibc";
+       version = "1.6.0";
+       sha256 = "1ps76yri9bnfkr4ya1yc9myrzpf44a01nrkd03kw8qidjcmnk47b";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24565,14 +24713,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-appsync" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-appsync";
+       version = "1.6.0";
+       sha256 = "0yvi3gjzpb1i7ria8asc054p9jnxqilkb4gzd4pj40mjls28bxj5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon AppSync SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-athena" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-athena";
-       version = "1.5.0";
-       sha256 = "0chg6wgp20qlpz9w5sryy9i2cxbnb9zdh2a6sg94vrivl3q19d5d";
+       version = "1.6.0";
+       sha256 = "1nvprlnbr6wp96cykgnkbchp2n6vz6ngw2sxsvapds2n2swfxm4r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24590,8 +24756,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-autoscaling";
-       version = "1.5.0";
-       sha256 = "1jmpz15r5sdc3rmvbhs4jla3qnafyqaq1vyngn9276a6ks338ivk";
+       version = "1.6.0";
+       sha256 = "1lzqsn7bmq2yrdmn2hnic5cghmw7kxfmkvqcs8vrk2gg4cmi6lhv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24603,14 +24769,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-autoscaling-plans" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-autoscaling-plans";
+       version = "1.6.0";
+       sha256 = "068c1z74gm94gb34y5lvnn03q4l5bm7w7j2a81zyfacijvzzpbgn";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Auto Scaling Plans SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-batch" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-batch";
-       version = "1.5.0";
-       sha256 = "0dchh04181kabhx1nl5cqw3kcsznggyrkzyrx028nfslww3as3mq";
+       version = "1.6.0";
+       sha256 = "0xh6fqaxgdsn4d7wb1j944npywn28p6srrsm3rpf7vbrc44gbc0y";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24628,8 +24812,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-budgets";
-       version = "1.5.0";
-       sha256 = "1kyi34iwg4l85a9ipkbjdac5wb2ij5rb1a49zww0izd09x3yx68a";
+       version = "1.6.0";
+       sha256 = "1dz4gi6qkkmfhz3yqj0pcjgsac4a2036bpiwayxdyzbzda2r5inc";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24647,8 +24831,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-certificatemanager";
-       version = "1.5.0";
-       sha256 = "0hnw9s9kzkrq9iv940g6zkaljw91xk9d6pya62g2y6dzp8ych5kq";
+       version = "1.6.0";
+       sha256 = "0sma4rbylmj7dl0irab5vh32na52l1qb34xpa6l4icx1hp397pqz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24660,14 +24844,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-certificatemanager-pca" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-certificatemanager-pca";
+       version = "1.6.0";
+       sha256 = "1ixczihy7f9hyhw0dxqzs5m3bgnkakzn4w0h792625738bhwv0ag";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Certificate Manager Private Certificate Authority SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-cloud9" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cloud9";
+       version = "1.6.0";
+       sha256 = "1i6npad6zszpx6bb47w1kppgds08z3mw5yx5jlbsl1a7y6ryv29v";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cloud9 SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-clouddirectory" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-clouddirectory";
-       version = "1.5.0";
-       sha256 = "157myilbdk79nfyxvyljpajf3mlgqqhnypbp7psd41ypg87ndycd";
+       version = "1.6.0";
+       sha256 = "0vbmqpn6f4723cq9cqv5hdxyiw6s12yr1xk6wfjpg5j3rqa930kx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24685,8 +24905,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudformation";
-       version = "1.5.0";
-       sha256 = "1s43xpwf26i9w2q6c2m3jcg8xr3wpza799krszr1cmhaivi1xmvi";
+       version = "1.6.0";
+       sha256 = "0dc3zb50vq3kkw65kkmrgz1vyjrzm1bmm3znj39i6slhfhjwiqhm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24704,8 +24924,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudfront";
-       version = "1.5.0";
-       sha256 = "05ai52ljar9j8jwlp5bp38zpfdjybsfdm6y3yp7if86md99sq9b0";
+       version = "1.6.0";
+       sha256 = "18ilsfm3918x3lzwr0v470n7pkc2r1iknlmz8bqbxfgkiyc60slm";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24723,8 +24943,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsm";
-       version = "1.5.0";
-       sha256 = "1644ldnp11wwn17xilkinm3bq8g9w4zfvyi6d95737xm1gr8gmx5";
+       version = "1.6.0";
+       sha256 = "0pqvliw77nk9c4ac3zhmbszlxcd13ibrg28rj31yi1lllcw708p4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24742,8 +24962,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudhsmv2";
-       version = "1.5.0";
-       sha256 = "0ix51kbs1ijwlzdy1drinmmyk6bcwrih2azrkqkd27fr6krnhs67";
+       version = "1.6.0";
+       sha256 = "0zpnzf062cmxaxvi36xfjk6q055xg6nh6ikralmnl6winnjjam6s";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24761,8 +24981,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch";
-       version = "1.5.0";
-       sha256 = "1pyxz2k7r25wq3pmxgknasxjimszy0f1sf6rwlm7sp412rvfm09c";
+       version = "1.6.0";
+       sha256 = "1533ii94iyi7z0nsnldxmf0hgkpx01xz10mgsd7z9n5cfrak85yx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24780,8 +25000,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudsearch-domains";
-       version = "1.5.0";
-       sha256 = "0kzl1pjzlijvc1m9yv8rf0zj6lwhk7qjgpmdvh8kbzdfpm8ynsrh";
+       version = "1.6.0";
+       sha256 = "19vwiyrcc591cpaflv0ji8fg7xjx1vba1f4kv0gh9mgfk9px7w14";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24799,8 +25019,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudtrail";
-       version = "1.5.0";
-       sha256 = "1m04h5n6hb2vg8hp2ikbdijv3a2mykzpafa1skg4gvy4qrbm5008";
+       version = "1.6.0";
+       sha256 = "090w96krmwd2h4l6s4hz04rfwwi4y6bifzfsw0hn7r62dbwrvnfr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24818,8 +25038,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch";
-       version = "1.5.0";
-       sha256 = "0n3v9li9fafhmwjfdydj8s495ni28qqf4xx13w7hflv10l6g2c25";
+       version = "1.6.0";
+       sha256 = "0lgfvca9gsqd38ly7f6dvvivi34qbpbqqng3hb89cbdjcjri5j15";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24837,8 +25057,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-events";
-       version = "1.5.0";
-       sha256 = "0q40yvj7bz5pkkr2w7g9nxspb2xbjdjr6nwnshpgkdjz61pcqb0p";
+       version = "1.6.0";
+       sha256 = "0kgcsbsxi6z84avfzmx9z1111h49yliyyiqww3b39if4dx1mxyqk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24856,8 +25076,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cloudwatch-logs";
-       version = "1.5.0";
-       sha256 = "05hh0lbxwj0cfwv38j4bnp5chjdvsgxgsh8whpza90k45v8kvjnr";
+       version = "1.6.0";
+       sha256 = "0zgfhz5646s6hkzw2n686rwhz5g9l1mrakagq3ngaagvy15fgr40";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24875,8 +25095,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codebuild";
-       version = "1.5.0";
-       sha256 = "1k85rrcfic92bpg2x20h4apad9f2pgqq6gggv7xs6dga8j596r21";
+       version = "1.6.0";
+       sha256 = "1ax0am75zy8xddzkn36sc9dpda1j5d28pbrdddhlr98airbl7gzx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24894,8 +25114,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codecommit";
-       version = "1.5.0";
-       sha256 = "0yr4h2ai1v0a2w26ms7v6vpzbn1k4wvchgfip6pqfsfbswq8vpy2";
+       version = "1.6.0";
+       sha256 = "0594d3frpxc2d9sw265dhph8q1gvzsx9n6l1vcgwglxbpwq2cbwa";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24913,8 +25133,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codedeploy";
-       version = "1.5.0";
-       sha256 = "08q5jgxs3aff5b8bxv1y01rjwrm7j8s8z05kwj84gzpfjw98i8s8";
+       version = "1.6.0";
+       sha256 = "1py2sfnwgavqhb8z2ngxx6b3gh0f9r3l84r5w5dcn6l5p2dbj59k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24932,8 +25152,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codepipeline";
-       version = "1.5.0";
-       sha256 = "0j99cgv1p5p7hxn0zc5s0d51l54bdkq4sd54q9p2a64fj6wa39ap";
+       version = "1.6.0";
+       sha256 = "0hy05s7wl410319z2svppg6aqc00zsix6m4l8gniqq1i34iflvn4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24951,8 +25171,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-codestar";
-       version = "1.5.0";
-       sha256 = "085m8bwvhws3svalmrxjk737ml2f5rr4fajzg7c3n3f7n3jz4qjd";
+       version = "1.6.0";
+       sha256 = "1c0w48y9azn8im82lh8j98vh6zbkam7vkplf2wxw8azqc5a6746l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24970,8 +25190,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-identity";
-       version = "1.5.0";
-       sha256 = "08l3nzggjhjb2gr1ny0i3as5gb1rw6wkggr4i8hjvg2w68qydrm7";
+       version = "1.6.0";
+       sha256 = "1mdnr66nq86ndh80ymgvh12crdqyqv212qkb2r2hzz6k23i31b1s";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -24989,8 +25209,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-idp";
-       version = "1.5.0";
-       sha256 = "18slhckyfq0mkwd2mv6g5dpas21q267sbqrlq2hn8cfglxcbjz3w";
+       version = "1.6.0";
+       sha256 = "1zqzx0l3g7kb22synk0hsy48zz320j906y7jnj7r7fqhrb48k2d9";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25008,8 +25228,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-cognito-sync";
-       version = "1.5.0";
-       sha256 = "0y3n8k9nfc7pnx5dbxnv9mcwcgmg7lf51sf2629zlbp4gf3pabga";
+       version = "1.6.0";
+       sha256 = "0dgldjisp3sxq3csnn7ffsh0bn1r2w32vlyz6dj6f7pkw7c11pjz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25021,14 +25241,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-comprehend" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-comprehend";
+       version = "1.6.0";
+       sha256 = "0gr4mz6n0cq8xiaq07bk9k8bg6di9kv17fnbgfvlvcrdjvvipw1g";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Comprehend SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-config" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-config";
-       version = "1.5.0";
-       sha256 = "1lniwdf3fr33skld9916vqsm03q0lghcna8ywsv76rz68hnb6nb3";
+       version = "1.6.0";
+       sha256 = "1kf98bz7jikj3xh2k49lpf04i0p9y046x4mb93xwrywy0jy3xc2w";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25040,27 +25278,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-connect" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-connect";
+       version = "1.6.0";
+       sha256 = "0jkds33hh039mgqns9zssjk9fzg35fnmkdm32zf180088kxbkdi9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Connect Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-core" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring
      , case-insensitive, conduit, conduit-extra, cryptonite
-     , data-ordlist, deepseq, exceptions, hashable, http-conduit
-     , http-types, lens, memory, mtl, QuickCheck, quickcheck-unicode
-     , resourcet, scientific, semigroups, tagged, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, time, transformers
-     , transformers-compat, unordered-containers, xml-conduit, xml-types
+     , data-ordlist, deepseq, exceptions, hashable, http-client
+     , http-conduit, http-types, lens, memory, mtl, QuickCheck
+     , quickcheck-unicode, resourcet, scientific, semigroups, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
+     , time, transformers, transformers-compat, unordered-containers
+     , xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "amazonka-core";
-       version = "1.5.0";
-       sha256 = "173mdmk3p9jqnskjf5g9r1kr568plrmshb6p17cq11n1wnngkxnk";
-       revision = "2";
-       editedCabalFile = "1y1ian4wimsbng4c3ix8jd3pn3b0xhydzwv87blck4sgl41w83vl";
+       version = "1.6.0";
+       sha256 = "1j9x17zhyxrg4ds5pdxfjdb4z7hpzn42cydx34j25h5d9avwbqdg";
        libraryHaskellDepends = [
          aeson attoparsec base bifunctors bytestring case-insensitive
          conduit conduit-extra cryptonite deepseq exceptions hashable
-         http-conduit http-types lens memory mtl resourcet scientific
-         semigroups tagged text time transformers transformers-compat
-         unordered-containers xml-conduit xml-types
+         http-client http-conduit http-types lens memory mtl resourcet
+         scientific semigroups tagged text time transformers
+         transformers-compat unordered-containers xml-conduit xml-types
        ];
        testHaskellDepends = [
          aeson base bytestring case-insensitive conduit data-ordlist
@@ -25073,14 +25328,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-cost-explorer" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-cost-explorer";
+       version = "1.6.0";
+       sha256 = "0fvdz1x6wizad8xcssh3lyzyp9pk92k5hlajrwfp2gp2lb8a8p32";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Cost Explorer Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-cur" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-cur";
-       version = "1.5.0";
-       sha256 = "1ndj6iyi6j9f1py791gcp5mi76h80vzvsclrwvyvz52nnfri6cmc";
+       version = "1.6.0";
+       sha256 = "0mzxyacabf6q237jdxlj5nwvbv9k7xn6kyk531p15839250j3m3y";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25098,8 +25371,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-datapipeline";
-       version = "1.5.0";
-       sha256 = "0fhnff3w8rsng0rzr6l7a3z98spfbn8zq348p23ci0m5v2qi6jk1";
+       version = "1.6.0";
+       sha256 = "1r9sbzc6z5md9z1yzb3sr41ih3kfjg5dx9z38p61rvv413bjs88v";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25117,8 +25390,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-devicefarm";
-       version = "1.5.0";
-       sha256 = "1c8vh1aalh48fl810ymk80k8g22dhzvcx9a2q360fm3m11wg1qqf";
+       version = "1.6.0";
+       sha256 = "0sf56mzd6kbyhq927wys8ayp9mvr0rpisjs6rs3s8m62n2w786yq";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25136,8 +25409,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-directconnect";
-       version = "1.5.0";
-       sha256 = "14kbx10g3izyqaqyrd8gjr6hpljv7v6wafp0dsrgn54275mvjq10";
+       version = "1.6.0";
+       sha256 = "0ciqadw5kam6b51irx45kc3g03qh50pdp8d321v83b2yhv7bk1cd";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25155,8 +25428,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-discovery";
-       version = "1.5.0";
-       sha256 = "0m4kry9vx9jl62adaa9pgxcmaw9c2kxs48krdv5n5vx3ynqf4856";
+       version = "1.6.0";
+       sha256 = "04wj34lm7amxjcg9bm77nsfjgx76n9b4scj8pspc44qldgbpmikv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25174,8 +25447,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dms";
-       version = "1.5.0";
-       sha256 = "1d9llyykrd4n6iqhs15f6jvzv8l61w8kalljx7skcxy8q98ydlh2";
+       version = "1.6.0";
+       sha256 = "1ww0l7xi9ia6danlm4mdh5d3y38jv56g4dd1jw588hkn5bf1jpx7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25193,8 +25466,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ds";
-       version = "1.5.0";
-       sha256 = "0mr9njmqwrlljwr78i3g4cdrjdyy3a516vvxj7754h5cmg0vbicj";
+       version = "1.6.0";
+       sha256 = "12fkcqhckmrkmh5prfrjdc6dq5cm0g3wsm9pz60jzrmf724k7yh6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25212,8 +25485,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb";
-       version = "1.5.0";
-       sha256 = "1j11qc018z6pgcwm80v0jknfrasp4cx6l0f8kv804crasbf2y0n8";
+       version = "1.6.0";
+       sha256 = "0gwsgyjvqzyhzkfn73854s6hr55va6l6a3m074ajz5wqz3j4xx9k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25231,8 +25504,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-dax";
-       version = "1.5.0";
-       sha256 = "036ipy0n16vxqy8agzvias7v4jq1gkcyqh0ppc5dcznsc4mklr0d";
+       version = "1.6.0";
+       sha256 = "0z9k6vvicmsjbd09sf5jym87zsc8dwbzpkiinwx4gz4zwfwqkrw3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25250,8 +25523,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-dynamodb-streams";
-       version = "1.5.0";
-       sha256 = "0j80jm7xmfsjxnfa6zj0hfvzjv89clccdqalxn76mzc646qvgki1";
+       version = "1.6.0";
+       sha256 = "0zz590xdpjabic8m7if6a4pcfrdafqr66wcxnwn2758fyzfk5y5k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25269,8 +25542,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ec2";
-       version = "1.5.0";
-       sha256 = "0h8zw8jrdh6a4jf92pg5j9lcx242y88iz8spfs9djripv13hs3dh";
+       version = "1.6.0";
+       sha256 = "1k2mm5ypkwr07iwc76b15q823sv5rq5jxfz4r7qckal8w72c4892";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25288,8 +25561,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecr";
-       version = "1.5.0";
-       sha256 = "0n6a9zbc8a83l5dnma61gl57zk0sjn1276ds1378ymnj9l5pkgb8";
+       version = "1.6.0";
+       sha256 = "0l44xxify9k87imc09wvn56xnmvgf3n2ydvs4s3iph6lnka8l222";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25307,8 +25580,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ecs";
-       version = "1.5.0";
-       sha256 = "08m2nds8d7pnvjk5s3f0kmrk0ml2ryzichyc4m0q69pc4yyakvj5";
+       version = "1.6.0";
+       sha256 = "0gyy9iglv8744p3h249j0mdd5n4f756ci2048frpb51mx2mkb59h";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25326,8 +25599,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-efs";
-       version = "1.5.0";
-       sha256 = "0b9ghl8i02gai4i0dhqv6ys8cblw6nr5338sg1zrkhlsdpkln1j5";
+       version = "1.6.0";
+       sha256 = "1fxg86zzjyv5lvlmn2f2iph5rwcfmwk740i2jjs3xmh68hlmd116";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25345,8 +25618,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticache";
-       version = "1.5.0";
-       sha256 = "05h1i0kbni000wwk4d80iajzqsa7s7qwxy4yybqn82r9gqgc9r75";
+       version = "1.6.0";
+       sha256 = "0s9rfrv128dsir497g9r6pp68xgfl34rshlcfgyk95fqw8n4m9z4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25364,8 +25637,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticbeanstalk";
-       version = "1.5.0";
-       sha256 = "1cv0sf7x7a4b6fky28454kszzplcbmm1fk7c9b6pm4sxipv2qrbl";
+       version = "1.6.0";
+       sha256 = "0siqna1fcxwpbdvjicyv09l2wcfddda8c47nmdd70ns7cdbhdp61";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25383,8 +25656,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elasticsearch";
-       version = "1.5.0";
-       sha256 = "1mylfs06jx6ziajnm55z0851zwmfc7nzwcimp4c62wk95s9ydwhp";
+       version = "1.6.0";
+       sha256 = "10rhbwic050ncinjklllygg3jnv169smkwdcr2xmxv3g3jpgqa9l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25402,8 +25675,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elastictranscoder";
-       version = "1.5.0";
-       sha256 = "12zkvqmygab6c5j4sf52hzn2fkvmsasmbfw0wq6g7laxdhj6c151";
+       version = "1.6.0";
+       sha256 = "02n1yg4vks5sc8mqm5prz2clgf7pyn9yf98mx1h1mk89gv4sf4mb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25421,8 +25694,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elb";
-       version = "1.5.0";
-       sha256 = "1zjlvsijp4j7kvbbdwwshr92sh173b8z0k42jwh6zcdk086k8v0c";
+       version = "1.6.0";
+       sha256 = "0kbyz4czsfjfgfw49wqrkkk2ma4k333kd5xfcz9gf9ick8079jar";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25440,8 +25713,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-elbv2";
-       version = "1.5.0";
-       sha256 = "0n6q0dzwmdbkhjn8ik2p156w4kj0lwr78xy3f9sh5g9c3v3wfqxh";
+       version = "1.6.0";
+       sha256 = "1j92qr8sfsidax606pyzv1zn08c2rcij0853c5raq4xn55gd6lra";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25459,8 +25732,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-emr";
-       version = "1.5.0";
-       sha256 = "0q5vc4mk8709sfcqgrwilp0vp3n7awnwcanqk46wbml6a0jr4nsw";
+       version = "1.6.0";
+       sha256 = "0kvpv655dk619lq2ahkljxdhscj22lyci3z9ybpsvzk1xrc79879";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25472,14 +25745,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-fms" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-fms";
+       version = "1.6.0";
+       sha256 = "1cgp5vd1ifrh16pziyi1yv6bwipd5njy9d0mvfq0l53zwv0f4cs0";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Firewall Management Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-gamelift" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-gamelift";
-       version = "1.5.0";
-       sha256 = "1nklqnrgkkq7465c3gz0ljb1gyi75d634yb5s39a1nynhpdiqyxq";
+       version = "1.6.0";
+       sha256 = "1z2zfzpag9v8mb6wa479hfkhdqf84x5jyc6pl302vl688d5bvkgb";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25497,8 +25788,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glacier";
-       version = "1.5.0";
-       sha256 = "1yrhjyn0596r3k59a42pma2v2fhdgwibasw10zd6gpfrcp496iq2";
+       version = "1.6.0";
+       sha256 = "04zrw3rqly4qm5hkwddr0p73xyjx5vm5xsvcnmabmpxx3x6l61sk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25516,8 +25807,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-glue";
-       version = "1.5.0";
-       sha256 = "0hxs5rnri2f5l8vhkn65in2jmyjdd5ckxywdvzwkdbdh3byp9vyc";
+       version = "1.6.0";
+       sha256 = "1g01ql9kvlwy6qm2gblz7bdf8b76ifpwgk5c9r1xp5jcsi3dmwpj";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25535,8 +25826,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-greengrass";
-       version = "1.5.0";
-       sha256 = "1l6nc2cp2vszb1hd4s2fmz0lbrjln3kscqk2wpfjp774hcjvl2zx";
+       version = "1.6.0";
+       sha256 = "0kzd5s8mz3sfdf20g64nkl7mnpbzr019y61gxr5z2jwc1yh9nj5k";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25548,14 +25839,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-guardduty" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-guardduty";
+       version = "1.6.0";
+       sha256 = "058mxwk8gjgnl8yjvxwgy033qknfnw1ib8qkz0649167x8wfibzx";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon GuardDuty SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-health" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-health";
-       version = "1.5.0";
-       sha256 = "07qla81a60k0dgx6iyy617ri6afx0ip68b0b36n7ww3i81jl6qhk";
+       version = "1.6.0";
+       sha256 = "0yx6bdhkgf6fgrc8i6abbpwnxlzqdnmw6pqan02gz679jf7b25n2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25573,8 +25882,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iam";
-       version = "1.5.0";
-       sha256 = "1vmwh4k2bhhf5d7lrk095xhc65pclqig3sk8j7vgxl9nil26cpcs";
+       version = "1.6.0";
+       sha256 = "0pchhnrfvry7v6gwn1rxx0hyd8xd2hdlzfcm1d02hgawg4x82dd3";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25613,8 +25922,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-importexport";
-       version = "1.5.0";
-       sha256 = "0sfm6k600vakjx0jrvqwm3mx2hc16nn24f1v1k1fixm2h0kb6s9l";
+       version = "1.6.0";
+       sha256 = "016dgp4s2669jd3db1f8ngynhjrkr77l981rmf3wc92fsyyg4l89";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25632,8 +25941,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-inspector";
-       version = "1.5.0";
-       sha256 = "0ips5f6y58dglx4igxak3ixsyny383s8nxw4dcwky12b5qm8pn36";
+       version = "1.6.0";
+       sha256 = "0gp1rkrm2xv13cdn3shr5824g942yn2dwqvw3ln78fz671g01vxw";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25651,8 +25960,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-iot";
-       version = "1.5.0";
-       sha256 = "0m6dvvxvffb136znnn32jnzc1jvv57sqwb5br7jx2j0nhjvc2dlx";
+       version = "1.6.0";
+       sha256 = "1l16ib9p6qzs4079a02hg852f0g79yv75k0ky3jj3l3vr5lj22qq";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25664,14 +25973,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-iot-analytics" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot-analytics";
+       version = "1.6.0";
+       sha256 = "1n88xzq5m3g3xcxx6s5rkrp8cbxi8sbj2rri3c3ibyv5gcr75lhs";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT Analytics SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-iot-dataplane" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-iot-dataplane";
-       version = "1.5.0";
-       sha256 = "0423d6fpkdby9jq6sya5bmq77ws1mrn7pfaajajixi5mqmsihw25";
+       version = "1.6.0";
+       sha256 = "0hl7m3s6ck01k5h00q414sc3yzpr41gamj7pfr7wr97cwv03prmf";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25683,14 +26010,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-iot-jobs-dataplane" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-iot-jobs-dataplane";
+       version = "1.6.0";
+       sha256 = "08glywxj06bzybvdrbgy1laazfsqzxbsa8558ds76jph99nkmvvl";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon IoT Jobs Data Plane SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-kinesis" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kinesis";
-       version = "1.5.0";
-       sha256 = "07dxdbhwgr33649b6lgr3zz6q4cdzspapb0bjg1rxqz3vnbxdmbc";
+       version = "1.6.0";
+       sha256 = "0f1gwa92pcdrb1ijxinhq8vjspgigk5kcr37hnj6mzs6kv9437jl";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25708,8 +26053,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis-analytics";
-       version = "1.5.0";
-       sha256 = "06pbzbrmysj9a61d5kc4a8n5wfpd1lhxm04cqpnrf86lqn89grlr";
+       version = "1.6.0";
+       sha256 = "1vl5yski9fqpwv9f4aq3i2zqkjgkmn3lnpm3phg59x3fb4w59yvy";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25727,8 +26072,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-kinesis-firehose";
-       version = "1.5.0";
-       sha256 = "1him47imazymn50820qhdis3z2ini55xryga0ywy9j26qnwzx03z";
+       version = "1.6.0";
+       sha256 = "172ljz8ihcb8cx800xy0wpicdsqip52ng2ig1clk3h48r36la18j";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25740,14 +26085,68 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-kinesis-video" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video";
+       version = "1.6.0";
+       sha256 = "0d9nbkm76ccy1bglny6xqa6bd41g7vjl80jnxrv5aqr87h0b814n";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-kinesis-video-archived-media" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video-archived-media";
+       version = "1.6.0";
+       sha256 = "01g269c2gnfkz5rzznl8l5m7fwb9zxxlxrbj2j7084nv1imj30vh";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams Archived Media SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-kinesis-video-media" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-kinesis-video-media";
+       version = "1.6.0";
+       sha256 = "1glmwl51d945ba8dxwyi9nflavx824nl7arm6f3j90z8cii7na41";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Kinesis Video Streams Media SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-kms" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-kms";
-       version = "1.5.0";
-       sha256 = "0ljpq0z5nw30lmyhwlbmzcccm2h6p45k3lr8k07akwa4p9rw8km4";
+       version = "1.6.0";
+       sha256 = "16cfkvl7n7drx0z6fr5j88lyg9rkg3bfly2zb2jx155lhcsk79bs";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25765,8 +26164,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lambda";
-       version = "1.5.0";
-       sha256 = "04lw538kpkzs9wmil8h6sjqzw55pjywnvrysdlac83nv0jdm3rmx";
+       version = "1.6.0";
+       sha256 = "01lvr775kakpbr2p7126nw3022dyp5p41s98asf9fwkmda4jd5k4";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25784,8 +26183,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lex-models";
-       version = "1.5.0";
-       sha256 = "15k6r8vc6ijlnmj7dqlip1nqixmf1ns3pjd99p7x4kqdq8p4qzj9";
+       version = "1.6.0";
+       sha256 = "0hknmvp0cnvg2y8i7fdwmx76pwbw6v6pvmyw7w93qakfq7615l8z";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25803,8 +26202,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lex-runtime";
-       version = "1.5.0";
-       sha256 = "07xx971q204hkk6gd9bgs2025czk6zzk5s702g82pd6j5r5i1slb";
+       version = "1.6.0";
+       sha256 = "0bixnlb1gz2wn0ggcpxfglxj9w38lnm2xfahs07brsy099qivlka";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25822,8 +26221,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-lightsail";
-       version = "1.5.0";
-       sha256 = "1ncby9zgmknmpfk1ncsydhb7l4r9kf46r466kg3cwjnb9w9wznkv";
+       version = "1.6.0";
+       sha256 = "1sxcc0hbvngxxjg0mg2rb3wkdax8123qbak8k3z0h3igzxm4q6vl";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25841,8 +26240,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-analytics";
-       version = "1.5.0";
-       sha256 = "0fil2jcs12g0lfkbzw0jjzms6nh90dd91b7s6c6y3ch1yy7a44w0";
+       version = "1.6.0";
+       sha256 = "0sjxrnzcrzgd75kd841r9hadpg9zqmxx4g5hqqqm2yy1x6q0sv2d";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25860,8 +26259,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-entitlement";
-       version = "1.5.0";
-       sha256 = "0g8diq63yywxrq7i6j8bcchjczdxxayqymc7lzdrvywrlvy52vyb";
+       version = "1.6.0";
+       sha256 = "0npwzr4yc4ns989mi9jgdhxj7g2brhn9wyislp0r7wx6arsmhk17";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25879,8 +26278,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-marketplace-metering";
-       version = "1.5.0";
-       sha256 = "1a9prdrmchnwqz7h8rffmg1df944s0y8cggzxjxvpmydsr8pfrnk";
+       version = "1.6.0";
+       sha256 = "0xszzcmaz2d5h8cbdqaar1f3am35h31k5w1wihy6fyf5r95f2bb7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25898,8 +26297,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-mechanicalturk";
-       version = "1.5.0";
-       sha256 = "1qgznzbfxijz8rvara688pa1hvkfjvz14m4x9m639x7aqdrrllh0";
+       version = "1.6.0";
+       sha256 = "07z9w2i8dmq420wgsip0zm1x6asz446284skcywqbfmv7n73gmkv";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25911,14 +26310,104 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-mediaconvert" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediaconvert";
+       version = "1.6.0";
+       sha256 = "04zml2hp8plb4ylspqi3y169daqc1fwx4lfb20wkifl54prbr7mk";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaConvert SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-medialive" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-medialive";
+       version = "1.6.0";
+       sha256 = "1plhi1nadmj5kl89z9l5wly524zy013p89xy9cbkda4l0axi1i0l";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaLive SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediapackage" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediapackage";
+       version = "1.6.0";
+       sha256 = "0faji7pk4i26kp2f3xsn3jglgdr1dxjljwzap3ydy0xg30fjk9ai";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaPackage SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediastore" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediastore";
+       version = "1.6.0";
+       sha256 = "19rvrh4l015pv869i8sj4fs9ygcnc0ziyx7vf1mpamkjqkx760xp";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaStore SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-mediastore-dataplane" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mediastore-dataplane";
+       version = "1.6.0";
+       sha256 = "1ldk1j4xs3m5igzzpsyrqqximdqm64wfa5dlhbiljjc4yhwkrh0m";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Elemental MediaStore Data Plane SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-migrationhub" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-migrationhub";
-       version = "1.5.0";
-       sha256 = "1v5sl8xywzr8sf4fbhkgqpq7bm4kcii38ijlfickcds7hv6fa5s1";
+       version = "1.6.0";
+       sha256 = "0iwbk5iwg28a7jlz1bhspdky0ipf5gixp3dwavac0wl9nbffyw8i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25936,8 +26425,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ml";
-       version = "1.5.0";
-       sha256 = "0lbp5nji9w2w1dw230z04cyxmqg502jznwy02y8pk1x0i2masjwq";
+       version = "1.6.0";
+       sha256 = "1zkdal599npbylic9sgvzpfss15ri9k61pp9xwhafbm7f5xjvhcx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25955,8 +26444,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-mobile";
-       version = "1.5.0";
-       sha256 = "0x0qxm4aj9c34zv3i5x4yw8ci86sx69ma9kf88ajxqw4nv1azp53";
+       version = "1.6.0";
+       sha256 = "0p9gyrn2hpk128g3nh7dmi2jm01lf6ydv407rwyj4zpkyl1k9vhh";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25968,14 +26457,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-mq" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-mq";
+       version = "1.6.0";
+       sha256 = "1m4mybwfhhs4nm6q6h8zkay9ivdifncsa1j6zfqcl54zc763swp9";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon MQ SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-opsworks" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-opsworks";
-       version = "1.5.0";
-       sha256 = "1hcsz6yxav11xq10vrifspfx06v3gd40y8m2lkc8dwwqa6bpzbq6";
+       version = "1.6.0";
+       sha256 = "066rfarz6cbdcal6l5qn11pi3n2byzxbb6013crmdicfkcrp4hws";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -25993,8 +26500,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-opsworks-cm";
-       version = "1.5.0";
-       sha256 = "1wf98wd1phavm022a0xznn20h9qfy8ld0d621dnm5cdb3l6wi4w5";
+       version = "1.6.0";
+       sha256 = "1x28lxvjz6sdkzlghw94h97yw8ywypz0v3d0rqazvzvhbxsrp7jg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26012,8 +26519,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-organizations";
-       version = "1.5.0";
-       sha256 = "1n04xzs80nkrcx4742pay5pnzg240240ii0z02baqnkyqpxx55hj";
+       version = "1.6.0";
+       sha256 = "1v7sdjd58aka7yp9y7d8ap5izf4hpm4wf7qa10fy4h4ay180y61r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26031,8 +26538,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-pinpoint";
-       version = "1.5.0";
-       sha256 = "0lj556yfwrgkbdspgyvwzf3df4rqz3idwyhzs2nn25f4spba8gwn";
+       version = "1.6.0";
+       sha256 = "01dh2vwigisbx4jrpaq76l1463v7qy1wx6brd1d7sdczpnmcvy5h";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26050,8 +26557,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-polly";
-       version = "1.5.0";
-       sha256 = "11dm2bbr75zl617m9s2zn26zs8d96d4xgl41shdjfhsm6vgc0c7k";
+       version = "1.6.0";
+       sha256 = "1l4ajm7ca0s4xwzs9brdhbjz1mhw8smmy7wzddhrxjr84vxdqgkp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26069,8 +26576,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-pricing";
-       version = "1.5.0";
-       sha256 = "0k4fv6m5m0b6fgs4clry4kg27y7znsvxziphgvpqrjkmjbfsbaxh";
+       version = "1.6.0";
+       sha256 = "10xlxld5b45yvy30midf0i1drr3zimpl0fwvvz4z946mfpbdn7na";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26088,8 +26595,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rds";
-       version = "1.5.0";
-       sha256 = "0ir608fdj19wb7g4bam8x1givws4d54pd96mkjj9zm0865z19dxn";
+       version = "1.6.0";
+       sha256 = "0kf23dgv1zirxp35g1czlfnzq9ccwr1a67yvqnl3nfvpacy634y7";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26107,8 +26614,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-redshift";
-       version = "1.5.0";
-       sha256 = "1ll4mx404vw403mx8r6k2i9d9yq7nrmj6kqhnf37cnff4k3h0kqy";
+       version = "1.6.0";
+       sha256 = "0adkj055f7kb1klxnvl9n1p8l504jgcpdw1ibgc2xm786rlvjsj2";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26126,8 +26633,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-rekognition";
-       version = "1.5.0";
-       sha256 = "1sizf0ha3n0712w7g3cmhjy93xscq3kg5mq81shxgdwajab8v49a";
+       version = "1.6.0";
+       sha256 = "1a1jynpr7bkzd5rs5p4781wrvnf1wivlzfjmn53jfdp545q44bj6";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26139,14 +26646,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-resourcegroups" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-resourcegroups";
+       version = "1.6.0";
+       sha256 = "0q0j22992r11i47ix7njjkhx5rrd0b1wkc2q4wrhs62dgsb86zzj";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Resource Groups SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-resourcegroupstagging" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-resourcegroupstagging";
-       version = "1.5.0";
-       sha256 = "0jsri9l7q3hlrb924104fhzg87zsmqcw1fg7afpczf6p6r2kfrpf";
+       version = "1.6.0";
+       sha256 = "1306254b8rb8q7631jyccbayj3a7iv2lvg33l23qw184g5k3gs6j";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26164,8 +26689,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-route53";
-       version = "1.5.0";
-       sha256 = "0saln45sais8cmwpzilwscr88g1mig4whrszwyx805lrhdhb48d4";
+       version = "1.6.0";
+       sha256 = "05v3m8fcpxbhhsh8nm0m35c357cx94z6xn36c75jhjy4v4xpgvv8";
        libraryHaskellDepends = [ amazonka-core base text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26177,14 +26702,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-route53-autonaming" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-route53-autonaming";
+       version = "1.6.0";
+       sha256 = "15j5l2x0x5qb24r7mcj3qdlzfggk542libcq3sw6d5iwr2vm7l5a";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Route 53 Auto Naming SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-route53-domains" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-route53-domains";
-       version = "1.5.0";
-       sha256 = "0fq62hdn1x4p2d0dbkc6m1myjgi9f6z3icd519crdy5sdmczbhl3";
+       version = "1.6.0";
+       sha256 = "1sm5w4r6kb8fl3wikp9n2hda3bxwr83397s729s3dispbwpzwnzp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26202,8 +26745,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-s3";
-       version = "1.5.0";
-       sha256 = "03v5fdn81g2k1pb1kn9c2r0yf52mnv3a8flxl9cms123n4lzhsrg";
+       version = "1.6.0";
+       sha256 = "0irz8vyklapjy3w3qasidpvq4hk2qwkmhrnrd23sf4yzs2xqx8gc";
        libraryHaskellDepends = [ amazonka-core base lens text ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26237,14 +26780,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-sagemaker" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sagemaker";
+       version = "1.6.0";
+       sha256 = "1cgfwc7f9krln680zn42nwmhxwfz945dd8mafpwk0qwdqi1i12cx";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon SageMaker Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-sagemaker-runtime" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-sagemaker-runtime";
+       version = "1.6.0";
+       sha256 = "1l4v7qw378qq8h4h61nag6al3dck2pz398kfahmk41y208fn04mc";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon SageMaker Runtime SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-sdb" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-sdb";
-       version = "1.5.0";
-       sha256 = "1rgg9w4ry28bx9xcdldw14hp8738bwvlxjnymknhz63d43chgya3";
+       version = "1.6.0";
+       sha256 = "1zdxbwzkvj1fi9lay3zyqxbb2vzviwc6h2gfmjh7invg68hqphmr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26256,14 +26835,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-secretsmanager" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-secretsmanager";
+       version = "1.6.0";
+       sha256 = "12imwyz239iv6yw658iyvxc7rfkmc1jgyc722ykz6kagkjr03110";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Secrets Manager SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-serverlessrepo" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-serverlessrepo";
+       version = "1.6.0";
+       sha256 = "1vlbn7jislc33wp2kacc54z95xhgk7ap9zapwzjij847hwn4ib88";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon ServerlessApplicationRepository SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-servicecatalog" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-servicecatalog";
-       version = "1.5.0";
-       sha256 = "09kp0af9dh93b7psmyl64l0zhqjna6ksp1d02m05lcv8hf35zy9c";
+       version = "1.6.0";
+       sha256 = "0r7j8v5mn048hqlp2h2mv7lyld457k22i95mdriyqhrb3cxxzy0i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26281,8 +26896,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ses";
-       version = "1.5.0";
-       sha256 = "1bb948h51qhz2lsry254bydqzqc0zjfwvm1wzqvv512cl3bx596f";
+       version = "1.6.0";
+       sha256 = "00mxab03vhmmb0d5xfa00x4c0qz0vkfnfap1lz8kzbps73kk53bp";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26300,8 +26915,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-shield";
-       version = "1.5.0";
-       sha256 = "1yw51bqxl92rygg412fbxa8clli2vsn8mf3q45x90f14nk0qpknq";
+       version = "1.6.0";
+       sha256 = "1x7b8wvv50iqvdxydpnmvncz3yx3026vq4f9rg1pnqas5ddsi0xr";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26319,8 +26934,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sms";
-       version = "1.5.0";
-       sha256 = "0z8bw4dh9wkr1fpp6kb0vif93c39jjajk9yxkdsb11nnwa4gyrh9";
+       version = "1.6.0";
+       sha256 = "0zx4rpq5k18lqv5x55hf30s30g8x6yrsbv55h13n1mw856fkakgw";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26338,8 +26953,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-snowball";
-       version = "1.5.0";
-       sha256 = "13wzq3i9ijj627p1sagqpih4094rj6963a2z6552fn95cdnm6l94";
+       version = "1.6.0";
+       sha256 = "09gf0balrk7hzmg9ynasz4jf3jywj57lyp0wiggixfh5jbz30jsk";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26357,8 +26972,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sns";
-       version = "1.5.0";
-       sha256 = "0dbka3s5cd1sy7msik0dy9wfp9krl8c60z0dca69pw8r6nncxd41";
+       version = "1.6.0";
+       sha256 = "0wvmwca48rqls0szbvdvfr796iq8i3kp5l8l7dcysn8k0d4ba5hx";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26376,8 +26991,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sqs";
-       version = "1.5.0";
-       sha256 = "1imdr5a71n6pkn2fa8irqgnadxhqfqhlszxs0njqf3kfqkc93z06";
+       version = "1.6.0";
+       sha256 = "0cq4j16f12z4lzsi9clh3pzcad7zfpcg5z8af2ap0w18gmq3hf3l";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26395,8 +27010,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-ssm";
-       version = "1.5.0";
-       sha256 = "1x7zdv01jc3x4663vxs7c3al4x4phfrcq71slcfjk56g9qp7wrjq";
+       version = "1.6.0";
+       sha256 = "06kh3id8l24rq5wvjakfz1w62fr3cyzl2axdsp7hcb8afr4q488i";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26414,8 +27029,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-stepfunctions";
-       version = "1.5.0";
-       sha256 = "0xviq8ml3sr1r2kwrc42kriizankzagh3wv5x8fij622p70q62z2";
+       version = "1.6.0";
+       sha256 = "1gxci7x94jc7187wv8mrd8g8vy0ns9r6b8l0w5jxgmr8bma8xb4r";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26433,8 +27048,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-storagegateway";
-       version = "1.5.0";
-       sha256 = "0ab4ycaibhm08qbq4adn0mn64dlly1liqx6albdqz3ypd519y9hg";
+       version = "1.6.0";
+       sha256 = "0gdl905h9d5g20npx4ihc0fajgcqn5vjnqiss7mhfcgha1k3f1kg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26452,8 +27067,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-sts";
-       version = "1.5.0";
-       sha256 = "0c4g0i9088py961f3wxc02ipgl8sh9wm0zl7mfvrb93dps2xmrqy";
+       version = "1.6.0";
+       sha256 = "04lsm5wpzrykkq94fcrkj4cwc5slzcwmzqvsgw9mnyprsrknn19n";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26471,8 +27086,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-support";
-       version = "1.5.0";
-       sha256 = "1nd1s76w6j2plrbpgc78f9bcanmpmkajsz6xq7lriznvjwgaip84";
+       version = "1.6.0";
+       sha256 = "1sakd3r8g9r0ms7mrnvzh679i26pamh1ranpp7a1fa2zjzpllhvz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26490,8 +27105,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-swf";
-       version = "1.5.0";
-       sha256 = "09fiddb9nvl1n5bzh6dzh8fq1lfvw0a5bbnyg51l3z35zyqr64a4";
+       version = "1.6.0";
+       sha256 = "145aali4pqzra7r34g6ykbizwrqnapj6mwadqr31ylf1m5xl63hz";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26512,8 +27127,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-test";
-       version = "1.5.0";
-       sha256 = "020qm4za63w69hcbqzbky1r269nv05ajf4zxgvp8jvnz33nj3rs7";
+       version = "1.6.0";
+       sha256 = "0a6xfp97hijhqmhj9nv4aqax08ry8y809jpjhyj2819p01wvga26";
        libraryHaskellDepends = [
          aeson amazonka-core base bifunctors bytestring case-insensitive
          conduit conduit-extra groom http-client http-types process
@@ -26526,14 +27141,50 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-transcribe" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-transcribe";
+       version = "1.6.0";
+       sha256 = "02z344bwkn3g37fh190qsk6aa3ihrnkkv8zmxlgpw3sjzcxpx8p5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Transcribe Service SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
+  "amazonka-translate" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-translate";
+       version = "1.6.0";
+       sha256 = "08k0ilxfrbqbfhlwi1im515bc017njm6faj4wznqbqxdvdw6lv3v";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon Translate SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-waf" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-waf";
-       version = "1.5.0";
-       sha256 = "0vv2602f3nhnkfwwj5r7qbkcsd1vflvaakyllnp6a29wrswr29ca";
+       version = "1.6.0";
+       sha256 = "105rpfal53qyjavknpkpiglndr8cgcsybl8iaw7zpn725g2rw2w8";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26551,8 +27202,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-waf-regional";
-       version = "1.5.0";
-       sha256 = "1rn090nrz2kk50r8fiyhlwyfcz2byzy8i71a5dghx545rsn7jc9x";
+       version = "1.6.0";
+       sha256 = "01aff4b6gp0zbhmjfnmdciw6a20a6jb5bs94i59cppzm216vfmji";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26570,8 +27221,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-workdocs";
-       version = "1.5.0";
-       sha256 = "0wypcv4w8m0qylk1ixb3s9zwh9mzz7682xw31w6cq62hxwy3w3gz";
+       version = "1.6.0";
+       sha256 = "0sjb55fj2hq0pndw5b81d3bgw5619px5mv8inni63cbhvlahyf3m";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26583,14 +27234,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "amazonka-workmail" = callPackage
+    ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
+     , tasty, tasty-hunit, text, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "amazonka-workmail";
+       version = "1.6.0";
+       sha256 = "0ac7awszhihl73zqrpg8srw58dwxjral7rpwamx30m5s65qhnkq5";
+       libraryHaskellDepends = [ amazonka-core base ];
+       testHaskellDepends = [
+         amazonka-core amazonka-test base bytestring tasty tasty-hunit text
+         time unordered-containers
+       ];
+       homepage = "https://github.com/brendanhay/amazonka";
+       description = "Amazon WorkMail SDK";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "amazonka-workspaces" = callPackage
     ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring
      , tasty, tasty-hunit, text, time, unordered-containers
      }:
      mkDerivation {
        pname = "amazonka-workspaces";
-       version = "1.5.0";
-       sha256 = "1kjyxmbwkj0p50bl0x3snk5680qc00g1486xhl4b600jrc2p2gkk";
+       version = "1.6.0";
+       sha256 = "110wr4ah80lz9yjxsx3yng2mx5r2z361rs4k6sr4v6jiij6k9ksn";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -26608,8 +27277,8 @@ self: {
      }:
      mkDerivation {
        pname = "amazonka-xray";
-       version = "1.5.0";
-       sha256 = "1i9s8l0l98lffc7hvhndrjj8rv4r0j958qhfqic503d7pzq9m0gk";
+       version = "1.6.0";
+       sha256 = "1w4ham3rzkyz8ns5xrnclyw0gvaswm6kyxjrfz6h19hs6rsh0lcg";
        libraryHaskellDepends = [ amazonka-core base ];
        testHaskellDepends = [
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
@@ -27060,14 +27729,14 @@ self: {
 
   "animate" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec, text
-     , vector
+     , vector, yaml
      }:
      mkDerivation {
        pname = "animate";
-       version = "0.6.0";
-       sha256 = "14fbxn3v4l5z6krqsycpg9ylx91y1xwzwqcxpqy5ihjba2g2r23a";
+       version = "0.6.1";
+       sha256 = "1mjjng8mr8r6gly822nah3ps4phgydfnyggyz43n5bhdr17f37f9";
        libraryHaskellDepends = [
-         aeson base bytestring containers text vector
+         aeson base bytestring containers text vector yaml
        ];
        testHaskellDepends = [ aeson base containers hspec vector ];
        homepage = "https://github.com/jxv/animate#readme";
@@ -27096,6 +27765,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "animate-preview" = callPackage
+    ({ mkDerivation, aeson, animate, base, bytestring, containers
+     , filepath, fsnotify, key-state, lens, linear, mtl
+     , optparse-applicative, optparse-generic, random, safe
+     , safe-exceptions, sdl2, sdl2-fps, sdl2-gfx, sdl2-image, sdl2-ttf
+     , StateVar, text, text-conversions, vector
+     }:
+     mkDerivation {
+       pname = "animate-preview";
+       version = "0.1.2.3";
+       sha256 = "0y8j3cmm579wkmswhflkgzlqv05dm5vrdiqxnhsvf4kr6hnaj8im";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson animate base bytestring containers filepath fsnotify
+         key-state lens linear mtl optparse-applicative optparse-generic
+         random safe safe-exceptions sdl2 sdl2-fps sdl2-gfx sdl2-image
+         sdl2-ttf StateVar text text-conversions vector
+       ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/jxv/animate-preview#readme";
+       description = "Preview tool for sprite animation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "animate-sdl2" = callPackage
+    ({ mkDerivation, aeson, animate, base, sdl2, sdl2-image }:
+     mkDerivation {
+       pname = "animate-sdl2";
+       version = "0.1.0";
+       sha256 = "1wzwhhv6x098y3pkpssxx7y1cb69z1bb2gsa2r8prg729y664648";
+       libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
+       homepage = "https://github.com/jxv/animate-sdl2#readme";
+       description = "sdl2 + animate auxiliary library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "anki-tools" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, directory
      , exceptions, filepath, mtl, scientific, sqlite-simple, text, time
@@ -27226,20 +27933,6 @@ self: {
      }) {};
 
   "ansi-terminal" = callPackage
-    ({ mkDerivation, base, colour }:
-     mkDerivation {
-       pname = "ansi-terminal";
-       version = "0.8.0.3";
-       sha256 = "18466bjgsmn2f96i3q6sp5f72paa2flqh40n9h137z29kvr53sva";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base colour ];
-       homepage = "https://github.com/feuerbach/ansi-terminal";
-       description = "Simple ANSI terminal support, with Windows compatibility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ansi-terminal_0_8_0_4" = callPackage
     ({ mkDerivation, base, colour }:
      mkDerivation {
        pname = "ansi-terminal";
@@ -27251,7 +27944,6 @@ self: {
        homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-terminal-game" = callPackage
@@ -27617,8 +28309,8 @@ self: {
      }:
      mkDerivation {
        pname = "api-builder";
-       version = "0.14.0.0";
-       sha256 = "12pr670c4zw8dhmj5vgsqr44mw2jz5kqdqn3alfqhmkmb13kzc4v";
+       version = "0.15.0.0";
+       sha256 = "1bjqg484z9si3pyfwpvcakm0y71gca80bh6j1njc0qnjf2ddd3ad";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring HTTP http-client http-client-tls
          http-types text tls transformers
@@ -28931,6 +29623,8 @@ self: {
        pname = "arithmoi";
        version = "0.7.0.0";
        sha256 = "0303bqlbf8abixcq3x3px2ijj01c9hlqadkv8rhls6f64a8h8cwb";
+       revision = "1";
+       editedCabalFile = "10z6m57dnzyqbzmdx64ya6gx5485iwwa4j8afyn8bmvxjvn474a6";
        configureFlags = [ "-f-llvm" ];
        libraryHaskellDepends = [
          array base containers exact-pi ghc-prim integer-gmp
@@ -29468,8 +30162,8 @@ self: {
      }:
      mkDerivation {
        pname = "asn1-codec";
-       version = "0.1.0";
-       sha256 = "1l3ka458aggj04zn2sn3p1mzkrjsgy8p7rg45031cxr401msks5b";
+       version = "0.2.0";
+       sha256 = "03c5dknklv8zj69fyhkdfvb7abcp68byhv2h8mmlnfwd9nz8fsrg";
        libraryHaskellDepends = [
          base bytestring containers contravariant cryptonite hashable
          integer-gmp memory network pretty stm text vector
@@ -31395,8 +32089,8 @@ self: {
        pname = "avers";
        version = "0.0.17.1";
        sha256 = "1x96fvx0z7z75c39qcggw70qvqnw7kzjf0qqxb3jwg3b0fmdhi8v";
-       revision = "16";
-       editedCabalFile = "0dv8lrnnb643fh1rsi10rq99nnb5a98akdl26lfxxjmmdmy238vd";
+       revision = "22";
+       editedCabalFile = "040kvq16wknnjq0kr5j6y17xvjfh87y22hska3whs3ci6zw1fr30";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock containers cryptonite
          filepath inflections memory MonadRandom mtl network network-uri
@@ -31547,8 +32241,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.0.2";
-       sha256 = "0kfw8srq675hinf1gajkngbpx15xc5w74vvf76yarmaal1vaavm4";
+       version = "0.3.0.4";
+       sha256 = "1f7wq5c7x99gbibwx9mdmq6d8gyz9szrj7k747gavvf5is8z9h6f";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -31682,32 +32376,33 @@ self: {
   "aws" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , base64-bytestring, blaze-builder, byteable, bytestring
-     , case-insensitive, cereal, conduit, conduit-combinators
-     , conduit-extra, containers, cryptonite, data-default, directory
-     , errors, filepath, http-client, http-client-tls, http-conduit
-     , http-types, lifted-base, memory, monad-control, mtl, network
-     , old-locale, QuickCheck, quickcheck-instances, resourcet, safe
-     , scientific, tagged, tasty, tasty-hunit, tasty-quickcheck, text
-     , time, transformers, transformers-base, unordered-containers
+     , case-insensitive, cereal, conduit, conduit-extra, containers
+     , cryptonite, data-default, directory, errors, exceptions, filepath
+     , http-client, http-client-tls, http-conduit, http-types
+     , lifted-base, memory, monad-control, mtl, network, old-locale
+     , QuickCheck, quickcheck-instances, resourcet, safe, scientific
+     , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , transformers, transformers-base, unordered-containers
      , utf8-string, vector, xml-conduit
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.19";
-       sha256 = "0ykpnm2kyhjf1rf5ldhv0c7zy3zq7jgqmb6xwywk8b2s80ai4fxl";
+       version = "0.20";
+       sha256 = "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
-         conduit-extra containers cryptonite data-default directory filepath
-         http-conduit http-types lifted-base memory monad-control mtl
-         network old-locale resourcet safe scientific tagged text time
-         transformers unordered-containers utf8-string vector xml-conduit
+         conduit-extra containers cryptonite data-default directory
+         exceptions filepath http-conduit http-types lifted-base memory
+         monad-control mtl network old-locale resourcet safe scientific
+         tagged text time transformers unordered-containers utf8-string
+         vector xml-conduit
        ];
        testHaskellDepends = [
-         aeson base bytestring conduit-combinators errors http-client
-         http-client-tls http-types lifted-base monad-control mtl QuickCheck
+         aeson base bytestring conduit errors http-client http-client-tls
+         http-types lifted-base monad-control mtl QuickCheck
          quickcheck-instances resourcet tagged tasty tasty-hunit
          tasty-quickcheck text time transformers transformers-base
        ];
@@ -32572,7 +33267,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_2_1_0" = callPackage
+  "backprop_0_2_2_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, criterion, deepseq
      , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
      , primitive, reflection, time, transformers, type-combinators
@@ -32580,8 +33275,8 @@ self: {
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.1.0";
-       sha256 = "0qm352klwjv1fy2gpsr8xhd9byaydps6fwhwrr9fldmj2bn1220m";
+       version = "0.2.2.0";
+       sha256 = "029lc57dhvq3hy38vdf6bgfbmkh93xc64gzi7k34y4rm6d1m2y89";
        libraryHaskellDepends = [
          base containers deepseq microlens primitive reflection transformers
          type-combinators vector
@@ -33200,6 +33895,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-prelude_1_2_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-prelude";
+       version = "1.2.1";
+       sha256 = "1f4s2f454zpcfrb5qi7pdlmljsfyw8zpk0kzs3dngki0ysh0rwq7";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/base-prelude";
+       description = "The most complete prelude formed solely from the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-unicode-symbols" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -33628,8 +34336,8 @@ self: {
      }:
      mkDerivation {
        pname = "battleplace";
-       version = "0.1.0.4";
-       sha256 = "0n3fw4z48hz188i4f02ya2wcaicl0l5nhb2w1r8hsvvgf0cixsxl";
+       version = "0.1.0.5";
+       sha256 = "0n0ry8gssd6rnhgsj0q24bbf8ad8wqjqmkxdrn0lxmd6bgj52bv9";
        libraryHaskellDepends = [
          aeson base bytestring cereal data-default hashable memory servant
          text vector
@@ -33773,25 +34481,24 @@ self: {
      }) {};
 
   "bdcs" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal
-     , codec-rpm, cond, conduit, conduit-combinators, conduit-extra
-     , containers, content-store, cpio-conduit, cryptonite, directory
-     , esqueleto, exceptions, filepath, gi-gio, gi-glib, gi-ostree
-     , gitrev, hspec, http-conduit, HUnit, lifted-base, listsafe, memory
-     , monad-control, monad-logger, monad-loops, mtl, network-uri
-     , ostree, parsec, parsec-numbers, persistent, persistent-sqlite
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, codec-rpm
+     , cond, conduit, conduit-combinators, conduit-extra, containers
+     , content-store, cpio-conduit, cryptonite, directory, esqueleto
+     , exceptions, filepath, gi-gio, gi-glib, gi-ostree, gitrev, hspec
+     , http-conduit, HUnit, lifted-base, listsafe, memory, monad-control
+     , monad-logger, monad-loops, mtl, network-uri, ostree, parsec
+     , parsec-numbers, persistent, persistent-sqlite
      , persistent-template, regex-pcre, resourcet, split
      , string-conversions, tar, tar-conduit, temporary, text, time
      , typed-process, unix, unordered-containers, xml-conduit
      }:
      mkDerivation {
        pname = "bdcs";
-       version = "0.6.0";
-       sha256 = "0irxrabxrdf20mc7b0kknnch0fhxgafh2mdrrksj78jx2dbmn85h";
+       version = "0.6.1";
+       sha256 = "1q81ic3jpcjjnbvbww7qabfy6byvlhwsvs0pf7y8a0sm4i0sqj8g";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
          aeson base bytestring codec-rpm cond conduit conduit-combinators
          conduit-extra containers content-store cpio-conduit cryptonite
@@ -37000,9 +37707,9 @@ self: {
      }:
      mkDerivation {
        pname = "bits-extra";
-       version = "0.0.0.2";
-       sha256 = "067k2kczi56454mgv86x9r0fpzdc0v3m8z4rc0jb93bqd33knq7r";
-       libraryHaskellDepends = [ base ghc-prim ];
+       version = "0.0.1.0";
+       sha256 = "0slxzlc81nbzzd7513i9crwqlpxxvpfz9haq5hr9qp533pr4cyz4";
+       libraryHaskellDepends = [ base ghc-prim vector ];
        testHaskellDepends = [
          base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
        ];
@@ -39502,6 +40209,8 @@ self: {
        pname = "brittany";
        version = "0.11.0.0";
        sha256 = "1fgcim4q5y7csk8c038rm97w6b8bgynmi6h1dwyr2hsmzw9hxa26";
+       revision = "1";
+       editedCabalFile = "1v5k1gsy9d1xrw1qw1mdhm00ryalnd3dp531sc44lx8brgxypywf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39668,6 +40377,29 @@ self: {
        license = "unknown";
      }) {};
 
+  "bson_0_3_2_6" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptohash
+     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
+     , test-framework-quickcheck2, text, time
+     }:
+     mkDerivation {
+       pname = "bson";
+       version = "0.3.2.6";
+       sha256 = "106fdxzwpkp5vrnfsrjjwy8dn9rgmxrp79ji7xaxv8dgb9hw73bk";
+       libraryHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         text time
+       ];
+       testHaskellDepends = [
+         base binary bytestring cryptohash data-binary-ieee754 mtl network
+         QuickCheck test-framework test-framework-quickcheck2 text time
+       ];
+       homepage = "http://github.com/mongodb-haskell/bson";
+       description = "BSON documents are JSON-like objects with a standard binary encoding";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bson-generic" = callPackage
     ({ mkDerivation, base, bson, ghc-prim, text }:
      mkDerivation {
@@ -39751,26 +40483,22 @@ self: {
      }) {};
 
   "btree" = callPackage
-    ({ mkDerivation, base, clock, compact-mutable, containers, ghc-prim
-     , hashable, prim-array, primitive, smallcheck, tasty, tasty-hunit
+    ({ mkDerivation, base, clock, containers, ghc-prim, hashable
+     , MonadRandom, primitive, smallcheck, tasty, tasty-hunit
      , tasty-smallcheck, transformers
      }:
      mkDerivation {
        pname = "btree";
-       version = "0.2";
-       sha256 = "02qypsanm4pnc7jiwjwak9xi7mfz4dlmfirdwvbxnjz48nqch7x2";
-       libraryHaskellDepends = [
-         base compact-mutable ghc-prim prim-array primitive
-       ];
+       version = "0.3";
+       sha256 = "058pry7g9sbmd0crd1gdpsj9ynvyfcyyvlna1wb49my9m5qmxp79";
+       libraryHaskellDepends = [ base ghc-prim primitive ];
        testHaskellDepends = [
-         base compact-mutable containers hashable prim-array primitive
-         smallcheck tasty tasty-hunit tasty-smallcheck transformers
+         base containers hashable MonadRandom primitive smallcheck tasty
+         tasty-hunit tasty-smallcheck transformers
        ];
-       benchmarkHaskellDepends = [
-         base clock compact-mutable ghc-prim hashable
-       ];
-       homepage = "https://github.com/andrewthad/b-plus-tree#readme";
-       description = "B-Tree on the compact heap";
+       benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
+       homepage = "https://github.com/andrewthad/btree";
+       description = "B-Tree on Unmanaged Heap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -41885,6 +42613,26 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "cabal-rpm_0_12_3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , http-client, http-client-tls, http-conduit, process, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "0.12.3";
+       sha256 = "0nid91q38k4b3hgjrhv6sy68y5h74f85j08991hmfbwzd727dzfg";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath http-client
+         http-client-tls http-conduit process time unix
+       ];
+       homepage = "https://github.com/juhp/cabal-rpm";
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -41937,8 +42685,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-sort";
-       version = "0.0.5.3";
-       sha256 = "1312kj7jhb5z3hidlgqvj6rlgiiribwfj3458i4axv8r345xcyqc";
+       version = "0.0.5.4";
+       sha256 = "1pssbb9i5h3q97i3qrybz9iyd1nsh9y27ykxvda6vk820jxjvb9b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42791,34 +43539,39 @@ self: {
 
   "camfort" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim
-     , happy, hmatrix, hspec, lattices, matrix, mtl
-     , optparse-applicative, partial-order, QuickCheck, sbv, syb, syz
-     , text, transformers, uniplate, vector
+     , directory, fgl, filepath, flint, fortran-src, GenericPretty
+     , ghc-prim, happy, hmatrix, hspec, lattices, lens, matrix, mmorph
+     , mtl, optparse-applicative, partial-order, QuickCheck, sbv
+     , silently, singletons, syb, syz, template-haskell, temporary, text
+     , time, transformers, uniplate, vector, verifiable-expressions
+     , vinyl
      }:
      mkDerivation {
        pname = "camfort";
-       version = "0.904";
-       sha256 = "0j1m9vc4fs7151s2bm1nl480c87mqfann6xv7bzcx6p76iqxvii8";
+       version = "0.905";
+       sha256 = "14wp9xkssingashbys07i536xnmrgh891260drc0f88d0mwjc935";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base binary bytestring containers directory fgl filepath
-         fortran-src GenericPretty ghc-prim hmatrix lattices matrix mtl
-         partial-order sbv syb syz text transformers uniplate vector
+         fortran-src GenericPretty ghc-prim hmatrix lattices lens matrix
+         mmorph mtl partial-order sbv singletons syb syz template-haskell
+         text transformers uniplate vector verifiable-expressions vinyl
        ];
+       librarySystemDepends = [ flint ];
        libraryToolDepends = [ alex happy ];
-       executableHaskellDepends = [ base optparse-applicative ];
+       executableHaskellDepends = [ base directory optparse-applicative ];
        testHaskellDepends = [
-         array base binary bytestring containers directory filepath
-         fortran-src hmatrix hspec lattices mtl partial-order QuickCheck sbv
-         text uniplate
+         array base binary bytestring containers directory fgl filepath
+         fortran-src hmatrix hspec lattices lens mtl partial-order
+         QuickCheck sbv silently temporary text time uniplate
+         verifiable-expressions
        ];
        homepage = "https://camfort.github.io";
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) flint;};
 
   "camh" = callPackage
     ({ mkDerivation, base, bytestring, Imlib, terminfo }:
@@ -44177,6 +44930,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_4_6" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.4.6";
+       sha256 = "1wyf6bz87b83lxcdbm84db7ziv3ggb3zbj4qd2cvfc7m4wr9a0v6";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -44326,8 +45100,8 @@ self: {
      }:
      mkDerivation {
        pname = "cdeps";
-       version = "0.1.1.0";
-       sha256 = "1pgarp84p757jyx71qma64g84fcyg6rrhrmrh4c1sszykqjnw7g0";
+       version = "0.1.1.2";
+       sha256 = "0fvl3pzz73mjc0y8pqkfbqkipma9km26qp0n1jfrnh0nqh9104l1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45255,8 +46029,8 @@ self: {
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.3.2";
-       sha256 = "17wvmn2immigdbc5kbckwbl8hsali8w0mdii9mib9lfxykawyh54";
+       version = "0.1.3.3";
+       sha256 = "15al7z2b73bb0ibd1pf3jljay6jc55sxpkr41hm6r97qri7fkd1m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46226,6 +47000,8 @@ self: {
        pname = "circle-packing";
        version = "0.1.0.6";
        sha256 = "06z8irwrjxxgk5xqlpy6a9mjl44kp9pgx2xpslhgxrd31nll9vk4";
+       revision = "1";
+       editedCabalFile = "10dh8jgjah1h54f83s9289abfqzc4ifykb01p5jljfac63yn42zs";
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
@@ -46628,8 +47404,10 @@ self: {
      }:
      mkDerivation {
        pname = "clash-ghc";
-       version = "0.99";
-       sha256 = "19s6h0ly0pz1wi1zs5ln9wai6kp9f49xdcjyc3z6mskcabv5b8q2";
+       version = "0.99.1";
+       sha256 = "0ybkjqza4wl6v4wghrbm87j7ns3qgsg4lb8g6i8rj9nb8yn43jsm";
+       revision = "1";
+       editedCabalFile = "1j11iplvng6m882c013fr0jzni1sqmvcw28k5p9icl3dgad990kf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -46657,8 +47435,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-lib";
-       version = "0.99";
-       sha256 = "1dl9pwv9fc5byimdxsl4xa4401nz74bgzrxmgk6hcbyvh7i4b17i";
+       version = "0.99.1";
+       sha256 = "1jrfvi3jxwmzc32nnf2kjyciws649ldixc38g7acsbapkpjhcfy5";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint attoparsec base bytestring clash-prelude
@@ -46698,8 +47476,8 @@ self: {
      }:
      mkDerivation {
        pname = "clash-prelude";
-       version = "0.99";
-       sha256 = "13qclvisklwy4syc5hgr5dvcz7wm4nwasgky3xvjhnhjg05wjd6l";
+       version = "0.99.1";
+       sha256 = "03yys72aq9zhl6g9lw1mvx7ds90ch6jx90n7pv9995lg1nhc83fd";
        libraryHaskellDepends = [
          array base bifunctors constraints data-binary-ieee754 data-default
          deepseq ghc-prim ghc-typelits-extra ghc-typelits-knownnat
@@ -46932,6 +47710,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "classyplate_0_3_1_0" = callPackage
+    ({ mkDerivation, base, criterion, parallel, template-haskell
+     , uniplate
+     }:
+     mkDerivation {
+       pname = "classyplate";
+       version = "0.3.1.0";
+       sha256 = "0ayiyxslvnhzngf8afqb82jz20i83par8piqf81s0yldk4lg4j4m";
+       libraryHaskellDepends = [ base template-haskell ];
+       benchmarkHaskellDepends = [ base criterion parallel uniplate ];
+       description = "Fuseable type-class based generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clay" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
      mkDerivation {
@@ -50078,6 +50871,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "componentm" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions
+     , prettyprinter, rio, tasty, tasty-hunit, teardown
+     }:
+     mkDerivation {
+       pname = "componentm";
+       version = "0.0.0.1";
+       sha256 = "1r2z9jbb0ka2i0lxbrb30p1x0zbwdcxid5k53mkzg82d5v2f08k9";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions prettyprinter rio teardown
+       ];
+       testHaskellDepends = [
+         base containers prettyprinter rio tasty tasty-hunit teardown
+       ];
+       homepage = "https://github.com/roman/Haskell-componentm#readme";
+       description = "Monad for allocation and cleanup of application resources";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "composable-associations" = callPackage
     ({ mkDerivation, base, lens, tasty, tasty-hunit }:
      mkDerivation {
@@ -52530,8 +53342,8 @@ self: {
     ({ mkDerivation, base, criterion, hspec, recursion-schemes }:
      mkDerivation {
        pname = "continued-fraction";
-       version = "0.1.0.9";
-       sha256 = "1831a093wnbf7kvplsp59xkdhj0g8wva08ixf9w12x6vl0yyj6sb";
+       version = "0.1.0.10";
+       sha256 = "1c9lp30q94ddgrmvy93psas5lbyczkhwhr5nijg02sxjkmvrj47v";
        libraryHaskellDepends = [ base recursion-schemes ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -53908,15 +54720,15 @@ self: {
        license = "unknown";
      }) {};
 
-  "cql_4_0_0" = callPackage
+  "cql_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, Decimal
      , iproute, network, QuickCheck, tasty, tasty-quickcheck
      , template-haskell, text, time, transformers, uuid, vector
      }:
      mkDerivation {
        pname = "cql";
-       version = "4.0.0";
-       sha256 = "09sm9wxjfmiv62brrj6hcfsjz3s8xwc4ihrwxdq8fqsv9cf82fj7";
+       version = "4.0.1";
+       sha256 = "021qaz6qvbdp76gdyfcs07wnnq6k6r1cmqky0g3giinjdrm4qac9";
        libraryHaskellDepends = [
          base bytestring cereal containers Decimal iproute network
          template-haskell text time transformers uuid vector
@@ -54901,6 +55713,8 @@ self: {
        pname = "crypt-sha512";
        version = "0";
        sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2";
+       revision = "1";
+       editedCabalFile = "0wi8d12i2v76irrv0f16y4sfcn2a9sg92l11499djidmdq50vji9";
        libraryHaskellDepends = [
          attoparsec base bytestring cryptohash-sha512
        ];
@@ -55687,14 +56501,14 @@ self: {
 
   "csg" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
-     , criterion, doctest, doctest-discover, gloss, gloss-raster
+     , criterion, doctest, doctest-driver-gen, gloss, gloss-raster
      , QuickCheck, simple-vec3, strict, system-filepath, tasty
      , tasty-hunit, tasty-quickcheck, transformers, turtle, vector
      }:
      mkDerivation {
        pname = "csg";
-       version = "0.1";
-       sha256 = "06fc7j1izwwalngjvgvkg90xvp3cjr53c4laqp5giwl2vdqrj2zs";
+       version = "0.1.0.2";
+       sha256 = "19lqlc8li2cx2kc2y3p4n6s2jz94h490zqnm0fywj7vgp4f11rcm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55706,7 +56520,7 @@ self: {
          system-filepath turtle
        ];
        testHaskellDepends = [
-         base bytestring doctest doctest-discover simple-vec3 tasty
+         base bytestring doctest doctest-driver-gen simple-vec3 tasty
          tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [
@@ -55898,8 +56712,8 @@ self: {
        pname = "css-syntax";
        version = "0.0.5";
        sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r";
-       revision = "1";
-       editedCabalFile = "15s7q21kahh1gmm7i3jd937d5pq5khn9a6sq8kdhs6bx11cfa5ap";
+       revision = "3";
+       editedCabalFile = "0p32287dxngmz6bk2xpvj8vh0kawjcrdxxdnczmay6pa1bzyhrik";
        libraryHaskellDepends = [
          attoparsec base bytestring scientific text
        ];
@@ -55910,6 +56724,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "css-syntax_0_0_7" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
+     , scientific, text
+     }:
+     mkDerivation {
+       pname = "css-syntax";
+       version = "0.0.7";
+       sha256 = "0r30rnwpmzvwbhj9di5rvbsigfn1w325c700hvjyw826x53ivz13";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scientific text
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring directory hspec scientific text
+       ];
+       description = "This package implments a parser for the CSS syntax";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "css-text" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
      mkDerivation {
@@ -58148,6 +58981,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-filter" = callPackage
+    ({ mkDerivation, base, data-default }:
+     mkDerivation {
+       pname = "data-filter";
+       version = "0.1.0.0";
+       sha256 = "1yz22b42rqsf4i9p4lnl06l8id3f1a84dng96q2nk1mmih9v3pbm";
+       libraryHaskellDepends = [ base data-default ];
+       homepage = "https://github.com/LadyBoonami/data-filter";
+       description = "Utilities for filtering";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "data-fin" = callPackage
     ({ mkDerivation, base, lazysmallcheck, prelude-safeenum, QuickCheck
      , reflection, smallcheck, tagged
@@ -58317,6 +59162,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-index" = callPackage
+    ({ mkDerivation, base, containers, doctest }:
+     mkDerivation {
+       pname = "data-index";
+       version = "0.1.0.0";
+       sha256 = "0rfb688h0q6prsiyf1rfax1xv20m2r69m2389qar1z85izk2hfjf";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "https://github.com/Toucandy/data-index#readme";
+       description = "Extending the concept of indices for lists and other containers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-interval" = callPackage
     ({ mkDerivation, base, ChasingBottoms, containers, deepseq
      , extended-reals, hashable, HUnit, lattices, QuickCheck, syb, tasty
@@ -59200,8 +60058,8 @@ self: {
      }:
      mkDerivation {
        pname = "datafix";
-       version = "0.0.0.1";
-       sha256 = "0pdpqwdbc8hmwwq460yisbj4072x3jyh7gcrf1flm2545acgahvq";
+       version = "0.0.0.2";
+       sha256 = "0z13m81cl3dnkzrl9fym9mf269lhyw4039fkqpijs024pwbvp0ni";
        setupHaskellDepends = [ base Cabal cabal-toolkit ];
        libraryHaskellDepends = [
          base containers lattices pomaps primitive transformers vector
@@ -60884,14 +61742,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_5_1_0" = callPackage
+  "dejafu_1_6_0_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.5.1.0";
-       sha256 = "0whxbn6h5k7n38w0wzm5iwqc20yyvzri88zsp3hhp8pdfj34df7d";
+       version = "1.6.0.0";
+       sha256 = "101lbnan5cgyl6v6j4hbys8j8br814m14clxgc366yyd2rkf8saf";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
@@ -61480,6 +62338,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "deriving-compat_0_4_2" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, containers
+     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
+     , template-haskell, th-abstraction, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "deriving-compat";
+       version = "0.4.2";
+       sha256 = "0vwpir5sd0x0r5ml83qg9hrwyq1s2psalpl8m007mh3hr8d4wgvz";
+       libraryHaskellDepends = [
+         base containers ghc-boot-th ghc-prim template-haskell
+         th-abstraction transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans hspec QuickCheck tagged
+         template-haskell transformers transformers-compat
+       ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/haskell-compat/deriving-compat";
+       description = "Backports of GHC deriving extensions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "derp" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -62217,10 +63100,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-cairo";
-       version = "1.4";
-       sha256 = "10gabibjg1hb83pm7qbqxmskrvrb52m5wdb8fcqwy9d3vfzwhkm9";
-       revision = "2";
-       editedCabalFile = "1h21l3wa4vbl7p6n7sk949jpxvxikkhf81y2qjqgn904564w73r6";
+       version = "1.4.1";
+       sha256 = "0n368gv7jjnynp7gfbnaywnd4x65956qqifcxpi3gsy8yi0zsr6z";
        libraryHaskellDepends = [
          array base bytestring cairo colour containers data-default-class
          diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl
@@ -62240,10 +63121,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-canvas";
-       version = "1.4";
-       sha256 = "1sbnnmj85vm6kjgzvrd3jyg40crz0i16ik6q3prwm4c38zr2yqih";
-       revision = "1";
-       editedCabalFile = "174nkb6ki100zh0hbrj8p4n52031jny6683n80i602544iikvbn9";
+       version = "1.4.1";
+       sha256 = "1ihmv42412d8dk3s894zd70xd386wrk9ycxkid19barry1vz5plj";
        libraryHaskellDepends = [
          base blank-canvas cmdargs containers data-default-class
          diagrams-core diagrams-lib lens mtl NumInstances
@@ -62265,8 +63144,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-contrib";
-       version = "1.4.2.1";
-       sha256 = "1l7xz360chrqj9by6l5v0vwpvy81lniif600r3b6vf9ckyj747yz";
+       version = "1.4.3";
+       sha256 = "01r081rvxkb9i56iqi28zw4054nm62pf9f1szd9i0avmnxxsiyv5";
        libraryHaskellDepends = [
          base circle-packing colour containers cubicbezier data-default
          data-default-class diagrams-core diagrams-lib diagrams-solve
@@ -62292,6 +63171,8 @@ self: {
        pname = "diagrams-core";
        version = "1.4.1";
        sha256 = "0zirk4v8qbyv0zbalh28ms9njafnj4z579dvrjvxbg6gqqcx3mcl";
+       revision = "1";
+       editedCabalFile = "0qv5jq4l0adks83zj2n4cgfazmg39flfb4k2i39l1w0bcmrzqjsc";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
@@ -62422,6 +63303,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.2.2";
        sha256 = "1rfn1fk251n84bxfn6p82p62gdjiq4yp4dwqmspp7ha2x6abn2s7";
+       revision = "2";
+       editedCabalFile = "1iwcrwfsga9kxp1h9cf3358dn64fzw3rbzrx1z24nd3ayy937vjk";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -62553,16 +63436,15 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-rasterific";
-       version = "1.4";
-       sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns";
-       revision = "1";
-       editedCabalFile = "0y4hf13l9y4179vhdsak8zq69wyn3rgmwnz9wp0x4rj32gdjjp3j";
+       version = "1.4.1";
+       sha256 = "0zlpmmgn79jgckzzib758c82brci391r181hg43267s1lx463iih";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class diagrams-core
          diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
          lens mtl optparse-applicative Rasterific
        ];
+       testHaskellDepends = [ base diagrams-core diagrams-lib ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
@@ -62632,8 +63514,10 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-svg";
-       version = "1.4.1.1";
-       sha256 = "1ans2lliaxqbx2q2459kiv59ff307vz6plqnh082pxhvmk36h1n8";
+       version = "1.4.2";
+       sha256 = "1lnyxx45yawqas7hmvvannwaa3ycf1l9g40lsl2m8sl2ja6vcmal";
+       revision = "1";
+       editedCabalFile = "1mb2fdfvy0c1v7nahspq2cisfqrn37xjh4a6xhqr3b36pfz8rwnd";
        libraryHaskellDepends = [
          base base64-bytestring bytestring colour containers diagrams-core
          diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
@@ -62851,6 +63735,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diff" = callPackage
+    ({ mkDerivation, base, Enum, util }:
+     mkDerivation {
+       pname = "diff";
+       version = "0.1.0.0";
+       sha256 = "19sn53b4sb0sa7ibcz9wvpn3vhja0yx62p8f9ibawrycm4cpbpzl";
+       libraryHaskellDepends = [ base Enum util ];
+       description = "Diff and patch";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diff-gestalt" = callPackage
     ({ mkDerivation, base, Diff, KMP, QuickCheck, string-similarity }:
      mkDerivation {
@@ -63317,12 +64212,12 @@ self: {
      }) {};
 
   "dimensions" = callPackage
-    ({ mkDerivation, base, Cabal, ghc-prim, QuickCheck }:
+    ({ mkDerivation, base, Cabal, QuickCheck }:
      mkDerivation {
        pname = "dimensions";
-       version = "0.3.2.0";
-       sha256 = "1ps9yy363xfpvq6dl5mjp02h0cj1vdib2vggvsykvgqwwrnra83p";
-       libraryHaskellDepends = [ base ghc-prim ];
+       version = "1.0.0.0";
+       sha256 = "13y87wakhkw7fzfhqjif96y8z57h6pa0c7wirb0rvhfzdknyc1x0";
+       libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal QuickCheck ];
        homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Safe type-level dimensionality for multidimensional data";
@@ -64803,6 +65698,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "djinn-lib_0_0_1_3" = callPackage
+    ({ mkDerivation, base, containers, mtl, pretty }:
+     mkDerivation {
+       pname = "djinn-lib";
+       version = "0.0.1.3";
+       sha256 = "0r1kby67flpyizj117r5q0q3sj61csqxd44za5r9292hj3cacd9v";
+       libraryHaskellDepends = [ base containers mtl pretty ];
+       homepage = "http://www.augustsson.net/Darcs/Djinn/";
+       description = "Generate Haskell code from a type. Library extracted from djinn package.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "djinn-th" = callPackage
     ({ mkDerivation, base, containers, logict, template-haskell }:
      mkDerivation {
@@ -64883,6 +65791,35 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "dmcc" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive
+     , classy-prelude, configurator, containers, HsOpenSSL, http-client
+     , io-streams, lens, monad-control, monad-logger, network
+     , openssl-streams, random, safe-exceptions, stm, text, time
+     , transformers-base, unix, unliftio, websockets, xml-conduit
+     , xml-hamlet
+     }:
+     mkDerivation {
+       pname = "dmcc";
+       version = "1.0.0.1";
+       sha256 = "1qlw3jx9nn2by757kqask1ib2wi32zgdj53kinj2lnjn5f9qs466";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring case-insensitive classy-prelude
+         containers HsOpenSSL http-client io-streams lens monad-control
+         monad-logger network openssl-streams safe-exceptions stm text time
+         transformers-base unliftio xml-conduit xml-hamlet
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring classy-prelude configurator containers
+         monad-control monad-logger random stm text unix unliftio websockets
+       ];
+       homepage = "https://github.com/f-me/dmcc#readme";
+       description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dmenu" = callPackage
     ({ mkDerivation, base, containers, directory, lens, mtl, process
      , transformers
@@ -64980,6 +65917,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dns_3_0_3" = callPackage
+    ({ mkDerivation, async, attoparsec, auto-update, base
+     , base64-bytestring, binary, bytestring, containers, cryptonite
+     , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe
+     , time, word8
+     }:
+     mkDerivation {
+       pname = "dns";
+       version = "3.0.3";
+       sha256 = "0m7xgf5vgh3xj5yrv8hyvhx3lligx1xrnq22a9b6s2prbywyllfv";
+       libraryHaskellDepends = [
+         async attoparsec auto-update base base64-bytestring binary
+         bytestring containers cryptonite iproute mtl network psqueues safe
+         time
+       ];
+       testHaskellDepends = [
+         base bytestring doctest hspec iproute network QuickCheck word8
+       ];
+       testTarget = "spec";
+       description = "DNS library in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dnscache" = callPackage
     ({ mkDerivation, base, bytestring, containers, contstuff, dns
      , iproute, time
@@ -65703,8 +66664,8 @@ self: {
      }:
      mkDerivation {
        pname = "dotenv";
-       version = "0.5.2.4";
-       sha256 = "13c6b01gkkykg1sl1dk1374nbayg523w4fiy2bg494bj5ia516di";
+       version = "0.5.2.5";
+       sha256 = "1qglnss7jpns585l1k2m3pwqv7mq3jvh66ypmjjxxi1zcihbz5x1";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -66624,8 +67585,8 @@ self: {
      }:
      mkDerivation {
        pname = "dual-tree";
-       version = "0.2.1.1";
-       sha256 = "1wzv6rrhz2kz0v1wirgs28fdlr0r4nwxlix9xda4fphzpp922gzr";
+       version = "0.2.2";
+       sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl";
        libraryHaskellDepends = [
          base monoid-extras newtype-generics semigroups
        ];
@@ -66670,8 +67631,8 @@ self: {
      }:
      mkDerivation {
        pname = "duckling";
-       version = "0.1.4.0";
-       sha256 = "0m5f71z9rqfvvqxpsvbpr258rgirphgdyfvzb1wv20zdhfi67lzh";
+       version = "0.1.6.0";
+       sha256 = "0hk7nnqq20wl6sc3jlaykgsn9b4crgw6hl91xml2dh5d83sknvvq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -66680,9 +67641,9 @@ self: {
          time timezone-series unordered-containers
        ];
        executableHaskellDepends = [
-         aeson base bytestring dependent-sum directory extra filepath
-         haskell-src-exts snap-core snap-server text text-show time
-         timezone-olson timezone-series unordered-containers
+         aeson base bytestring deepseq dependent-sum directory extra
+         filepath hashable haskell-src-exts snap-core snap-server text
+         text-show time timezone-olson timezone-series unordered-containers
        ];
        testHaskellDepends = [
          aeson base tasty tasty-hunit text time unordered-containers
@@ -67404,6 +68365,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "easy-file_0_2_2" = callPackage
+    ({ mkDerivation, base, directory, filepath, time, unix }:
+     mkDerivation {
+       pname = "easy-file";
+       version = "0.2.2";
+       sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
+       libraryHaskellDepends = [ base directory filepath time unix ];
+       homepage = "http://github.com/kazu-yamamoto/easy-file";
+       description = "Cross-platform File handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "easyjson" = callPackage
     ({ mkDerivation, base, mtl, parsec, text, unordered-containers
      , vector
@@ -67451,14 +68425,12 @@ self: {
      }) {};
 
   "easytensor" = callPackage
-    ({ mkDerivation, base, Cabal, dimensions, ghc-prim, QuickCheck
-     , time
-     }:
+    ({ mkDerivation, base, Cabal, dimensions, QuickCheck, time }:
      mkDerivation {
        pname = "easytensor";
-       version = "0.4.0.0";
-       sha256 = "13wgg67gjg07r1n91kqikbhz8nnzfbgmi0v8a1596a6z7al4kvpr";
-       libraryHaskellDepends = [ base dimensions ghc-prim ];
+       version = "1.0.0.0";
+       sha256 = "0qi7p82s5av0x9xqll4sjwh82x4r6bijypqh29f7xmk4y6dzs19c";
+       libraryHaskellDepends = [ base dimensions ];
        testHaskellDepends = [ base Cabal dimensions QuickCheck ];
        benchmarkHaskellDepends = [ base dimensions time ];
        homepage = "https://github.com/achirkin/easytensor#readme";
@@ -67466,6 +68438,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "easytensor-vulkan" = callPackage
+    ({ mkDerivation, base, dimensions, easytensor, vulkan-api }:
+     mkDerivation {
+       pname = "easytensor-vulkan";
+       version = "1.0.0.0";
+       sha256 = "1d3jxqhv0c6pd08av31mdxshban2g0msdpljhl3wi5flrj93s8m3";
+       libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
+       homepage = "https://github.com/achirkin/easytensor#readme";
+       description = "Use easytensor with vulkan-api";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "easytest" = callPackage
     ({ mkDerivation, async, base, call-stack, containers, mtl, random
      , stm, text, transformers
@@ -67625,12 +68609,16 @@ self: {
      }) {};
 
   "ecstasy" = callPackage
-    ({ mkDerivation, base, containers, mtl, transformers }:
+    ({ mkDerivation, base, containers, kan-extensions, mtl
+     , transformers
+     }:
      mkDerivation {
        pname = "ecstasy";
-       version = "0.1.1.0";
-       sha256 = "06j5fpgrcf8nwwvs52gwdd55g7pxxv3ygsz5g08g8ap7wl2i9mby";
-       libraryHaskellDepends = [ base containers mtl transformers ];
+       version = "0.2.1.0";
+       sha256 = "1hyb1xnc45mmghvjvnxc2wnkrks8glw2bs5jwnc1pmn3p39l4nci";
+       libraryHaskellDepends = [
+         base containers kan-extensions mtl transformers
+       ];
        homepage = "http://github.com/isovector/ecstasy/";
        description = "A GHC.Generics based entity component system.";
        license = stdenv.lib.licenses.bsd3;
@@ -67715,8 +68703,8 @@ self: {
      }:
      mkDerivation {
        pname = "ede";
-       version = "0.2.8.7";
-       sha256 = "02jy6v9w7vpzs3fikfvgd09p0dvfq9isxcag281naazgn1my8swb";
+       version = "0.2.9";
+       sha256 = "0gvs9kyq4xyz11x5cqmr7vnh4d1vany36rfpmm4dg23w3yj36fab";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson ansi-wl-pprint base bifunctors bytestring comonad directory
@@ -68223,6 +69211,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "either-both" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "either-both";
+       version = "0.1.0.0";
+       sha256 = "1lbvahbbmhz6cazl5s4wkf66h1l20cg7380g027h53v5pjpvpdpl";
+       libraryHaskellDepends = [ base ];
+       description = "Either or both";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "either-list-functions" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -68529,6 +69528,8 @@ self: {
        pname = "ekg-wai";
        version = "0.1.0.3";
        sha256 = "1sd2fz4l4slizm179x9cskqdvrpf6w4d779kah9hrnk3nqbmklxz";
+       revision = "1";
+       editedCabalFile = "0crcpwrnh1pi5n4dlp9cwminj1gls9ywm4fgvisafh480097b100";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring ekg-core ekg-json filepath http-types network
@@ -70440,6 +71441,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "errors_2_3_0" = callPackage
+    ({ mkDerivation, base, exceptions, safe, text, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.3.0";
+       sha256 = "0x8znwn31qcx6kqx99wp7bc86kckfb39ncz3zxvj1s07kxlfawk7";
+       libraryHaskellDepends = [
+         base exceptions safe text transformers transformers-compat
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "errors-ext" = callPackage
     ({ mkDerivation, base, errors, exceptions, HUnit, monad-control
      , mtl, transformers
@@ -70720,8 +71737,8 @@ self: {
      }:
      mkDerivation {
        pname = "etc";
-       version = "0.3.2.0";
-       sha256 = "1j4qjw1hqw5q9i47ixiwcr3zpcs1x39l46mh5yii5xkqmwlw9gk0";
+       version = "0.4.0.0";
+       sha256 = "0zyyayk9b6jzksxd14k08594ms5szgcpa63nlw3vnni1q1c2x1v4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base hashable rio text typed-process unliftio
@@ -71565,6 +72582,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "eventstore_1_1_3" = callPackage
+    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+     , cereal, clock, connection, containers, dns, dotnet-timespan
+     , ekg-core, exceptions, fast-logger, hashable, http-client
+     , interpolate, lifted-async, lifted-base, machines, monad-control
+     , monad-logger, mono-traversable, mtl, protobuf, random
+     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
+     , tasty-hunit, text, time, transformers-base, unordered-containers
+     , uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "1.1.3";
+       sha256 = "076pxyaslvw4kiqqbhapvqi0nr501l2z8nvajkqw1d9iasgwcfxz";
+       libraryHaskellDepends = [
+         aeson array base bifunctors bytestring cereal clock connection
+         containers dns dotnet-timespan ekg-core exceptions fast-logger
+         hashable http-client interpolate lifted-async lifted-base machines
+         monad-control monad-logger mono-traversable mtl protobuf random
+         safe-exceptions semigroups stm stm-chans text time
+         transformers-base unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring cereal connection containers
+         dotnet-timespan exceptions fast-logger hashable lifted-async
+         lifted-base monad-control mono-traversable protobuf safe-exceptions
+         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
+         transformers-base unordered-containers uuid
+       ];
+       homepage = "https://github.com/YoEight/eventstore#readme";
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "every" = callPackage
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
@@ -72447,15 +73500,16 @@ self: {
      }) {};
 
   "expressions" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, lattices, singletons
-     , text, transformers
+    ({ mkDerivation, attoparsec, base, containers, free, lattices
+     , singletons, text, transformers
      }:
      mkDerivation {
        pname = "expressions";
-       version = "0.1.5";
-       sha256 = "1iw6i922wjvs844gqqvmvhvfaq8c06lxlca806s6rbk0sxq40nmz";
+       version = "0.1.6";
+       sha256 = "081yglpbk0297s7qyq845x9pfkl0dcbz4i2dv1rppslvkhpwa270";
        libraryHaskellDepends = [
-         attoparsec base containers lattices singletons text transformers
+         attoparsec base containers free lattices singletons text
+         transformers
        ];
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
@@ -72463,15 +73517,15 @@ self: {
      }) {};
 
   "expressions-z3" = callPackage
-    ({ mkDerivation, base, containers, expressions, singletons
+    ({ mkDerivation, base, containers, expressions, list-t, singletons
      , transformers, z3
      }:
      mkDerivation {
        pname = "expressions-z3";
-       version = "0.1.3";
-       sha256 = "1hb44k4558lwsx3z02lgmf1i24ajjlbyqbc88lzgjh3vswfahsj8";
+       version = "0.1.5";
+       sha256 = "07ah8bb7pv1jzj4aa783s8axh909hnysfy21x9slwgc8nwlx6rcr";
        libraryHaskellDepends = [
-         base containers expressions singletons transformers z3
+         base containers expressions list-t singletons transformers z3
        ];
        testHaskellDepends = [
          base containers expressions singletons transformers z3
@@ -72577,6 +73631,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extensible_0_4_9" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, comonad
+     , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
+     , mtl, prettyprinter, primitive, profunctors, QuickCheck
+     , semigroups, StateVar, tagged, template-haskell, text, th-lift
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "extensible";
+       version = "0.4.9";
+       sha256 = "11iyz4lgs2bf6wg1iiancwj58ywpj8f93bqj9scy4mzz8mpyllmp";
+       libraryHaskellDepends = [
+         aeson base bytestring cassava comonad constraints deepseq ghc-prim
+         hashable monad-skeleton mtl prettyprinter primitive profunctors
+         QuickCheck semigroups StateVar tagged template-haskell text th-lift
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [ base lens QuickCheck template-haskell ];
+       homepage = "https://github.com/fumieval/extensible";
+       description = "Extensible, efficient, optics-friendly data types and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extensible-data" = callPackage
     ({ mkDerivation, base, data-lens, hashable, template-haskell
      , unordered-containers
@@ -72641,6 +73719,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "extensible-effects-concurrent" = callPackage
+    ({ mkDerivation, base, containers, directory, extensible-effects
+     , filepath, lens, mtl, parallel, process, QuickCheck, random, stm
+     , tagged, time, transformers
+     }:
+     mkDerivation {
+       pname = "extensible-effects-concurrent";
+       version = "0.1.1.0";
+       sha256 = "1zf67f7400n4nvwvvb0znr3aigkhawqnlz911rl79bybcibx85nc";
+       libraryHaskellDepends = [
+         base containers directory extensible-effects filepath lens mtl
+         parallel process QuickCheck random stm tagged time transformers
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/sheyll/extensible-effects-concurrent#readme";
+       description = "Message passing concurrency as extensible-effect";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "extensible-exceptions" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -72804,6 +73901,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ez3" = callPackage
+    ({ mkDerivation, base, transformers, z3 }:
+     mkDerivation {
+       pname = "ez3";
+       version = "0.1.0.0";
+       sha256 = "0p2i8ingh27qn61rizh79ink63ydf3wcm86q57f4kd4arbnp7gs4";
+       revision = "1";
+       editedCabalFile = "13pr43yrrkxp0fmdw1s4wavz8zak5pw1aq2wf1zc8fskysyfx67w";
+       libraryHaskellDepends = [ base transformers z3 ];
+       description = "Z3 bonds with pure interface";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "faceted" = callPackage
     ({ mkDerivation, base, free }:
      mkDerivation {
@@ -73131,8 +74241,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.0.3";
-       sha256 = "1q9fdx61wpznpw551id09xg1yw8vyh77cvcwswmi0grld4hqn17g";
+       version = "0.6.0.5";
+       sha256 = "138qdgwqc3qnafi0kf5nkva3nvcfn71b1ch2xrwgxkna5kniqjrh";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
        benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
@@ -74977,8 +76087,8 @@ self: {
      }:
      mkDerivation {
        pname = "filestore";
-       version = "0.6.3.2";
-       sha256 = "0nx16b6nvzvzwrwrbyzjm7dh2ilk3vbrwr6r9m2c62ll1k99100v";
+       version = "0.6.3.3";
+       sha256 = "04qvp5hmnnassw13lw7g1l785lgdlfzl9msy4k1ja8p6gksy7r1c";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers Diff directory filepath old-locale
@@ -75094,10 +76204,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "filtrable";
-       version = "0.1.0.5";
-       sha256 = "0znfhi3sxfnrhqnmll7dx9pyw5wcyvlj62b8ir9hz3cznvb7aakd";
-       revision = "1";
-       editedCabalFile = "0wa848jypc7vvr4y6h7rvfd6m8n1747889rqzybrl3cvm138572v";
+       version = "0.1.1.0";
+       sha256 = "0g1ngsbxrydbwa637sk8zvpvygppr6abj9hh87maf56ily4ki9fn";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
@@ -77014,8 +78122,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.5.2.0";
-       sha256 = "1dx9b7ivypa1avwb8ip7lqixm0lba15piiq3mh6wclxb93nf1n63";
+       version = "0.6.0.0";
+       sha256 = "177ar0c66lzp5rnnpbia0v3ri9aspc97qnj9yjwh3bz2drn01q0y";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses profunctors semigroupoids semigroups split text
@@ -77659,13 +78767,13 @@ self: {
 
   "fortran-src" = callPackage
     ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, fgl, filepath, GenericPretty, happy, hspec, mtl
-     , pretty, text, uniplate
+     , deepseq, directory, fgl, filepath, GenericPretty, happy, hspec
+     , mtl, pretty, text, uniplate
      }:
      mkDerivation {
        pname = "fortran-src";
-       version = "0.2.0.0";
-       sha256 = "0mmzr58rbanmml2mfawgg58s7v9v7gkw9maxpy96vyfkk4wjvnwc";
+       version = "0.2.1.1";
+       sha256 = "000i0395k6wpmzymiqc4x4xi06y6a8q4yianqplfl7zn2ghyxcsz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77678,10 +78786,10 @@ self: {
          GenericPretty mtl pretty text uniplate
        ];
        testHaskellDepends = [
-         array base binary bytestring containers directory fgl filepath
-         GenericPretty hspec mtl pretty text uniplate
+         array base binary bytestring containers deepseq directory fgl
+         filepath GenericPretty hspec mtl pretty text uniplate
        ];
-       description = "Parser and anlyses for Fortran standards 66, 77, 90";
+       description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -79000,6 +80108,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fsnotify-conduit_0_1_1_0" = callPackage
+    ({ mkDerivation, base, conduit, directory, filepath, fsnotify
+     , hspec, resourcet, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "fsnotify-conduit";
+       version = "0.1.1.0";
+       sha256 = "03mlb8yhdajf00dzddvbmb7jm3p05zw1y33f2acaa52pk45zh063";
+       libraryHaskellDepends = [
+         base conduit directory filepath fsnotify resourcet transformers
+       ];
+       testHaskellDepends = [
+         base conduit directory filepath fsnotify hspec resourcet temporary
+         transformers
+       ];
+       homepage = "https://github.com/fpco/fsnotify-conduit#readme";
+       description = "Get filesystem notifications as a stream of events";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fst" = callPackage
     ({ mkDerivation, array, base, haskeline, mtl, QuickCheck
      , transformers
@@ -81151,8 +82280,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.5";
        sha256 = "1brnlgnbys811qy64aps2j03ks2p0rkihaqzaszfwl80cpsn05ym";
-       revision = "7";
-       editedCabalFile = "0v4sqm0m8vr2i6hinx0mpax3mz73mvf21bdbga0vdgx7dac2nvkb";
+       revision = "8";
+       editedCabalFile = "1hpcglml4b5yv192syxazminr5v7qjrgqwb2wk0cf7f0sjpm5d0q";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -81480,12 +82609,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity_0_5_0_2" = callPackage
+  "genvalidity_0_5_0_3" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, validity }:
      mkDerivation {
        pname = "genvalidity";
-       version = "0.5.0.2";
-       sha256 = "1l1lv8k8gl7i5zd54636ihbwddgq49088lgb2gragm05cki823c1";
+       version = "0.5.0.3";
+       sha256 = "0xf1sd5g87gvdg1n3g7in7x8x4cf1jnsbaxmq64qmjlns4qr0fnk";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/NorfairKing/validity#readme";
@@ -81518,7 +82647,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-aeson_0_2_0_0" = callPackage
+  "genvalidity-aeson_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
      , genvalidity-scientific, genvalidity-text
      , genvalidity-unordered-containers, genvalidity-vector, hspec
@@ -81526,8 +82655,8 @@ self: {
      }:
      mkDerivation {
        pname = "genvalidity-aeson";
-       version = "0.2.0.0";
-       sha256 = "0lwy2r7gb5s26hilgxs2hf8zcn4dhdwqhr8r05zrvjcry4inn5mm";
+       version = "0.2.0.1";
+       sha256 = "0cfp5smj5ap5ppsk95yf0qmpbysqypsiccbcdckqkiky73nnvax8";
        libraryHaskellDepends = [
          aeson base genvalidity genvalidity-scientific genvalidity-text
          genvalidity-unordered-containers genvalidity-vector QuickCheck
@@ -81562,14 +82691,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-bytestring_0_2_0_0" = callPackage
+  "genvalidity-bytestring_0_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-bytestring
      }:
      mkDerivation {
        pname = "genvalidity-bytestring";
-       version = "0.2.0.0";
-       sha256 = "0ai3pmybs2xky8b596s0xs6511ab1h28ywbaishn5s0217q225zf";
+       version = "0.2.0.1";
+       sha256 = "0lyxaisy2wjsqh0igx74wkjginnza3mmjasi8gdvkzk8kd85jvcl";
        libraryHaskellDepends = [
          base bytestring genvalidity QuickCheck validity validity-bytestring
        ];
@@ -81602,14 +82731,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-containers_0_4_0_0" = callPackage
+  "genvalidity-containers_0_4_0_1" = callPackage
     ({ mkDerivation, base, containers, genvalidity, genvalidity-hspec
      , hspec, QuickCheck, validity, validity-containers
      }:
      mkDerivation {
        pname = "genvalidity-containers";
-       version = "0.4.0.0";
-       sha256 = "0q7dzmp8ik3v8ckv8i9cnc687306i4i80mx7sbh956hw5kr6bqnb";
+       version = "0.4.0.1";
+       sha256 = "1b8q17s22wimh4dgm2igaw6icdc2bqfr7ih28ba6chmnhsjiw9wf";
        libraryHaskellDepends = [
          base containers genvalidity QuickCheck validity validity-containers
        ];
@@ -81643,14 +82772,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec_0_6_0_2" = callPackage
+  "genvalidity-hspec_0_6_0_3" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-property
      , hspec, hspec-core, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec";
-       version = "0.6.0.2";
-       sha256 = "0l14vn5hddkvyzhch8l9abwh3naya27p9f6lz918zd8i5l5pd32n";
+       version = "0.6.0.3";
+       sha256 = "195r2yw1ivss2w7criarmw5bpwjfpa19myvxfpkwk769wz9vih63";
        libraryHaskellDepends = [
          base genvalidity genvalidity-property hspec hspec-core QuickCheck
          validity
@@ -81687,15 +82816,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-aeson_0_2_0_0" = callPackage
+  "genvalidity-hspec-aeson_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
      , genvalidity, genvalidity-aeson, genvalidity-hspec
      , genvalidity-text, hspec, QuickCheck, text
      }:
      mkDerivation {
        pname = "genvalidity-hspec-aeson";
-       version = "0.2.0.0";
-       sha256 = "0xkignwkq1hdyvachslwf5clzvnw0bmyi00mv3nkigxn8q1vbf7h";
+       version = "0.2.0.1";
+       sha256 = "0q681wj05vpxrplklvdxcr8l67gm71hvs7b991m7rfslpkx24smh";
        libraryHaskellDepends = [
          aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
          QuickCheck
@@ -81728,14 +82857,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-binary_0_2_0_0" = callPackage
+  "genvalidity-hspec-binary_0_2_0_1" = callPackage
     ({ mkDerivation, base, binary, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "genvalidity-hspec-binary";
-       version = "0.2.0.0";
-       sha256 = "0qmmhbka2ba9x9ypafij5q9gmmm7x4v1frf9mrfi4ffw91fnfnpv";
+       version = "0.2.0.1";
+       sha256 = "1ch48h0z7njxkv8ig8hk3d2s5a1w0ssxy2br05qn43snbdh33vx0";
        libraryHaskellDepends = [
          base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -81764,14 +82893,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-cereal_0_2_0_0" = callPackage
+  "genvalidity-hspec-cereal_0_2_0_1" = callPackage
     ({ mkDerivation, base, cereal, deepseq, doctest, genvalidity
      , genvalidity-hspec, hspec, QuickCheck
      }:
      mkDerivation {
        pname = "genvalidity-hspec-cereal";
-       version = "0.2.0.0";
-       sha256 = "18fz57lwn6ljrm9fszb1n2jzn93kqvqi7x9fyp6a0kh733lyzrnn";
+       version = "0.2.0.1";
+       sha256 = "18md81dfwgf6cq6aq4yz0qm0j5myfq8md9zpbb87yrdmrqsvyapn";
        libraryHaskellDepends = [
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
@@ -81805,15 +82934,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-hspec-hashable_0_2_0_0" = callPackage
+  "genvalidity-hspec-hashable_0_2_0_1" = callPackage
     ({ mkDerivation, base, doctest, genvalidity, genvalidity-hspec
      , genvalidity-property, hashable, hspec, hspec-core, QuickCheck
      , validity
      }:
      mkDerivation {
        pname = "genvalidity-hspec-hashable";
-       version = "0.2.0.0";
-       sha256 = "1mw3lg792hssbfasb0av9x9n7ksqcjwxpgab0n9ia1jspxacrxr4";
+       version = "0.2.0.1";
+       sha256 = "1llgq9181n24cjd7blan1fc2lgv9039nfwl3sj95z2z9wvy63cgm";
        libraryHaskellDepends = [
          base genvalidity genvalidity-hspec genvalidity-property hashable
          hspec QuickCheck validity
@@ -81844,14 +82973,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-path_0_3_0_0" = callPackage
+  "genvalidity-path_0_3_0_1" = callPackage
     ({ mkDerivation, base, criterion, genvalidity, genvalidity-hspec
      , hspec, path, QuickCheck, validity-path
      }:
      mkDerivation {
        pname = "genvalidity-path";
-       version = "0.3.0.0";
-       sha256 = "00rbizzxy9ccd85gr0bf4kw6b5bz15pzhg05qzsifpjj6vfy4izf";
+       version = "0.3.0.1";
+       sha256 = "13avz2nlksvp6yam0mjny4fcj77i40vp8an5585n1mzrikadhr8x";
        libraryHaskellDepends = [
          base genvalidity path QuickCheck validity-path
        ];
@@ -81882,14 +83011,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "genvalidity-property_0_2_0_1" = callPackage
+  "genvalidity-property_0_2_0_2" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, genvalidity
      , hspec, QuickCheck, validity
      }:
      mkDerivation {
        pname = "genvalidity-property";
-       version = "0.2.0.1";
-       sha256 = "02ypm53llfdrqasji79bng3ybkjs8ak7klcrhkg15k6jgk0ca877";
+       version = "0.2.0.2";
+       sha256 = "1rsxi6d5a4bz2dcxcrsa3xpav2nkxss8hindyncfqgn2af0vk5rp";
        libraryHaskellDepends = [
          base genvalidity hspec QuickCheck validity
        ];
@@ -81920,14 +83049,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-scientific_0_2_0_0" = callPackage
+  "genvalidity-scientific_0_2_0_1" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, scientific, validity, validity-scientific
      }:
      mkDerivation {
        pname = "genvalidity-scientific";
-       version = "0.2.0.0";
-       sha256 = "0zf0akzbggyy79h48m78cfsp82nmdgk0py8crfp81sh0pd3cydpi";
+       version = "0.2.0.1";
+       sha256 = "1wxrcpmhcbiklzqf5zjn0q7hpgkds5jjmdhl9kq68vbm96lm8zgn";
        libraryHaskellDepends = [
          base genvalidity QuickCheck scientific validity validity-scientific
        ];
@@ -81960,14 +83089,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-text_0_5_0_0" = callPackage
+  "genvalidity-text_0_5_0_1" = callPackage
     ({ mkDerivation, array, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, text, validity, validity-text
      }:
      mkDerivation {
        pname = "genvalidity-text";
-       version = "0.5.0.0";
-       sha256 = "0vyw27l0b9snndl1nixidg8ghk6i95qv2xk59fbj1r1ybg27b837";
+       version = "0.5.0.1";
+       sha256 = "05dgf67zm9gbk985mz89jm4vdwd1s9rnazmjzwxn9gqkd6niqxyw";
        libraryHaskellDepends = [
          array base genvalidity QuickCheck text validity validity-text
        ];
@@ -81998,14 +83127,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-time_0_2_0_1" = callPackage
+  "genvalidity-time_0_2_0_2" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec
      , QuickCheck, time, validity-time
      }:
      mkDerivation {
        pname = "genvalidity-time";
-       version = "0.2.0.1";
-       sha256 = "0kd2rxmz197yzfhxya4pbvl77iv7knl0zc1v56089ls4vk4by2gg";
+       version = "0.2.0.2";
+       sha256 = "0b0cyssqirpafla3dxkg6klq0nv6xnbaj10szb714lwiyvcx8dj1";
        libraryHaskellDepends = [
          base genvalidity QuickCheck time validity-time
        ];
@@ -82038,15 +83167,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "genvalidity-unordered-containers_0_2_0_2" = callPackage
+  "genvalidity-unordered-containers_0_2_0_3" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable
      , hspec, QuickCheck, unordered-containers, validity
      , validity-unordered-containers
      }:
      mkDerivation {
        pname = "genvalidity-unordered-containers";
-       version = "0.2.0.2";
-       sha256 = "0sjs06qf0pk6xvgc38qayzfqk6wm1qgpx3yzglpkhdy809gl5pfa";
+       version = "0.2.0.3";
+       sha256 = "0r89pisv6a7m0vf6dif7lx7w7gc4jsx33d4hzskwz3x6si07xadd";
        libraryHaskellDepends = [
          base genvalidity hashable QuickCheck unordered-containers validity
          validity-unordered-containers
@@ -83177,6 +84306,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_1_2" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.1.2";
+       sha256 = "0rippzp76g2zn8vhxfkvpf9r2l62lid6525ym6zz1pyq4xzsbqrf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
      mkDerivation {
@@ -83323,6 +84475,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-syntax-highlighter" = callPackage
+    ({ mkDerivation, base, ghc, hspec, hspec-discover, text }:
+     mkDerivation {
+       pname = "ghc-syntax-highlighter";
+       version = "0.0.2.0";
+       sha256 = "1gcdhsbjpj1mwwgc4l2ibdcvicw9xx6bmva8r7ddd7bqbhnmqcyg";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ base ghc text ];
+       testHaskellDepends = [ base hspec text ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/mrkkrp/ghc-syntax-highlighter";
+       description = "Syntax highlighter for Haskell using lexer of GHC itself";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-tcplugins-extra" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -83390,6 +84557,8 @@ self: {
        pname = "ghc-typelits-extra";
        version = "0.2.4";
        sha256 = "0inj776401846brd945p00qkjylniwlvycn1c300p90kyighkpdg";
+       revision = "1";
+       editedCabalFile = "1ysf5mr85877a995951wjdg633ylrbpqhpqnn27yb6ayimky5z7a";
        libraryHaskellDepends = [
          base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-knownnat
          ghc-typelits-natnormalise integer-gmp transformers
@@ -83435,6 +84604,8 @@ self: {
        pname = "ghc-typelits-knownnat";
        version = "0.4.2";
        sha256 = "1h0l5hks2pdaibq4w46b9064idshan615iiyjjbzkc2zg04xsbbr";
+       revision = "1";
+       editedCabalFile = "16x3i6js5z0qr1yw9pfpc7hwhb28djijas2pkx4idwp997mryjaj";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
          template-haskell transformers
@@ -83477,6 +84648,8 @@ self: {
        pname = "ghc-typelits-natnormalise";
        version = "0.5.10";
        sha256 = "15xn69jdv77pgyd4mgm35zbrc1h0phyvw733j6s5iy01fhrhrdny";
+       revision = "1";
+       editedCabalFile = "1d4j47glcw0xvdr6sgr221rfpjs48bijx5c5hyqqz6jfp0164grr";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp
        ];
@@ -84080,6 +85253,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
+  "gi-cairo_1_0_17" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
+     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-cairo";
+       version = "1.0.17";
+       sha256 = "1ax7aly9ahvb18m3zjmy0dk47qfdx5yl15q52c3wp4wa0c5aggax";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ cairo ];
+       doHaddock = false;
+       preCompileBuildDriver = ''
+         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
+         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
+       '';
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Cairo bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) cairo;};
+
   "gi-dbusmenu" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib
      , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading
@@ -84134,8 +85333,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "3.0.15";
-       sha256 = "17cjg6m69xlmlnwlwa6s23f1j28bfrwkg08v3n5xmz56zvzsgykg";
+       version = "3.0.16";
+       sha256 = "0jp3d3zfm20b4ax1g5k1wzh8fxxzsw4ssw7zqx0d13167m4smc3y";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
@@ -84446,8 +85645,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "3.0.22";
-       sha256 = "017nnypxsrxsqar7pmbf0kwvbkpdnp3y7dvn8s82b09qiymxa0rz";
+       version = "3.0.23";
+       sha256 = "0lii8k87adhrdhpwqcfdcnclh7wf9hi6rkn819c2xmpbchaj3s4k";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
@@ -84627,8 +85826,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pangocairo";
-       version = "1.0.16";
-       sha256 = "0hp90rx33xbi3w2y3iacf19p9mhkz6s4q8q6hcsrh5jnbavbpjwy";
+       version = "1.0.17";
+       sha256 = "1ysf9an7cmacyz7hzw0p7zshrn466v51d0dpqbkn2j1p2akr2v1a";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-glib gi-gobject gi-pango
@@ -85074,8 +86273,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180427";
-       sha256 = "0pjdb0mk5hmjl0sra37ap3cr5xp9pa7fyikqmz4156hzk925rrds";
+       version = "6.20180509";
+       sha256 = "09rl41c7fsz9jzf9234qcqfix61afxyc2vjx6sld2zyqiky7rhvh";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -85399,28 +86598,25 @@ self: {
      }) {};
 
   "git-vogue" = callPackage
-    ({ mkDerivation, base, bifunctors, Cabal, containers, cpphs, Diff
-     , directory, extra, filepath, formatting, ghc-mod, git
-     , haskell-src-exts, hlint, hscolour, hspec, optparse-applicative
-     , process, split, strict, stylish-haskell, temporary, text
-     , transformers, unix
+    ({ mkDerivation, base, bifunctors, containers, cpphs, Diff
+     , directory, filepath, formatting, git, haskell-src-exts, hlint
+     , hscolour, hspec, optparse-applicative, process, split, strict
+     , stylish-haskell, temporary, text, transformers, unix
      }:
      mkDerivation {
        pname = "git-vogue";
-       version = "0.2.2.2";
-       sha256 = "13i5kb3bqkjhgla98ywl5rhjyi8dnxzi4srsjw3x3hwy0srmh7l8";
+       version = "0.3.0.2";
+       sha256 = "0p3h4107pfcxap83xbqffb30zymi2ipzjqgcdg2qzpbnczw6j5ml";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal filepath ];
        libraryHaskellDepends = [
-         base containers directory extra filepath formatting
-         optparse-applicative process split text transformers unix
+         base containers directory filepath formatting optparse-applicative
+         process split temporary text transformers unix
        ];
        executableHaskellDepends = [
-         base bifunctors Cabal cpphs Diff directory ghc-mod haskell-src-exts
-         hlint hscolour optparse-applicative process strict stylish-haskell
-         text
+         base bifunctors cpphs Diff directory haskell-src-exts hlint
+         hscolour optparse-applicative process strict stylish-haskell text
        ];
        testHaskellDepends = [
          base containers directory filepath hspec process temporary
@@ -87084,8 +88280,8 @@ self: {
     ({ mkDerivation, base, gmp, recursion-schemes }:
      mkDerivation {
        pname = "gmpint";
-       version = "0.1.0.12";
-       sha256 = "0l3qd8hps55am4ddj4x83f0vyi1rwhh7gj36k465n4m1pz7ndxrx";
+       version = "0.1.0.13";
+       sha256 = "0n4syarw91367kkvsbn9ag3caiksbplx4grm8q4z96wh39dvb24y";
        libraryHaskellDepends = [ base recursion-schemes ];
        librarySystemDepends = [ gmp ];
        description = "GMP integer conversions";
@@ -91319,8 +92515,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk";
-       version = "0.14.9";
-       sha256 = "1khz6ymwga07h7s1k9gadf212m242l9qq09qn2fvx8v67p4wvxxz";
+       version = "0.14.10";
+       sha256 = "0cq6cpr42mjansnbk3p38xkqslqcb8lbl4smc73kaqr1xcg6gq98";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [
@@ -91426,28 +92622,28 @@ self: {
      }) {};
 
   "gtk-sni-tray" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dbus, directory
-     , enclosed-exceptions, filepath, gi-dbusmenugtk3, gi-gdk
-     , gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut, gtk3, haskell-gi
-     , haskell-gi-base, hslogger, optparse-applicative
-     , status-notifier-item, text, transformers, unix
+    ({ mkDerivation, base, bytestring, cairo, containers, dbus
+     , dbus-hslogger, directory, enclosed-exceptions, filepath, gi-cairo
+     , gi-dbusmenugtk3, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gtk, gtk-strut
+     , gtk3, haskell-gi, haskell-gi-base, hslogger, optparse-applicative
+     , status-notifier-item, text, transformers, transformers-base, unix
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.2.0";
-       sha256 = "1imgna34fdsg2fwlxk5xb0dvw8sbqjk7qgvh1p3wc8q9yx8zl0qm";
+       version = "0.1.3.0";
+       sha256 = "197a0wfbg6xzyka2ydbmbs6g6mghlp1ncchbmrb6gzn3b85iggq6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dbus directory enclosed-exceptions
-         filepath gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib gi-gtk
-         gtk-strut haskell-gi haskell-gi-base hslogger status-notifier-item
-         text transformers unix
+         base bytestring cairo containers dbus directory enclosed-exceptions
+         filepath gi-cairo gi-dbusmenugtk3 gi-gdk gi-gdkpixbuf gi-glib
+         gi-gtk gtk-strut haskell-gi haskell-gi-base hslogger
+         status-notifier-item text transformers transformers-base unix
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [
-         base dbus gi-gdk gi-gtk gtk-strut hslogger optparse-applicative
-         status-notifier-item text unix
+         base dbus dbus-hslogger gi-gdk gi-gtk gtk-strut hslogger
+         optparse-applicative status-notifier-item text unix
        ];
        homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme";
        description = "A standalone StatusNotifierItem/AppIndicator tray";
@@ -92215,35 +93411,33 @@ self: {
     ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-conduit, bytestring, bzlib, conduit, conduit-extra
-     , containers, criterion, crypto-cipher-types, cryptonite
-     , data-default-class, errors, hashable, incremental-parser
-     , ixset-typed, lens, memory, monad-loops, nettle, network
-     , network-uri, newtype, openpgp-asciiarmor, QuickCheck
-     , quickcheck-instances, resourcet, semigroups, split, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
-     , transformers, unliftio-core, unordered-containers
-     , wl-pprint-extras, zlib
+     , containers, criterion, crypto-cipher-types, cryptonite, errors
+     , hashable, incremental-parser, ixset-typed, lens, memory
+     , monad-loops, nettle, network, network-uri, newtype
+     , openpgp-asciiarmor, QuickCheck, quickcheck-instances, resourcet
+     , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, time-locale-compat, transformers, unliftio-core
+     , unordered-containers, wl-pprint-extras, zlib
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.6.1";
-       sha256 = "1al531lrsgfsqjc21117l420pcd7ymv4vdzywka189lkd8p5yzj7";
+       version = "2.6.2";
+       sha256 = "1jlhhil5ilsw4nzjwsmfppcsfg59w5hw7nxjba92dgm3bsicf1ln";
        libraryHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring
          base64-bytestring bifunctors binary binary-conduit bytestring bzlib
          conduit conduit-extra containers crypto-cipher-types cryptonite
-         data-default-class errors hashable incremental-parser ixset-typed
-         lens memory monad-loops nettle network-uri newtype
-         openpgp-asciiarmor resourcet semigroups split text time
-         time-locale-compat transformers unliftio-core unordered-containers
-         wl-pprint-extras zlib
+         errors hashable incremental-parser ixset-typed lens memory
+         monad-loops nettle network-uri newtype openpgp-asciiarmor resourcet
+         semigroups split text time time-locale-compat transformers
+         unliftio-core unordered-containers wl-pprint-extras zlib
        ];
        testHaskellDepends = [
          aeson asn1-encoding attoparsec base base16-bytestring bifunctors
          binary binary-conduit bytestring bzlib conduit conduit-extra
-         containers crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype QuickCheck quickcheck-instances
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype QuickCheck quickcheck-instances
          resourcet semigroups split tasty tasty-hunit tasty-quickcheck text
          time time-locale-compat transformers unliftio-core
          unordered-containers wl-pprint-extras zlib
@@ -92251,11 +93445,62 @@ self: {
        benchmarkHaskellDepends = [
          aeson base base16-bytestring base64-bytestring bifunctors binary
          binary-conduit bytestring bzlib conduit conduit-extra containers
-         criterion crypto-cipher-types cryptonite data-default-class errors
-         hashable incremental-parser ixset-typed lens memory monad-loops
-         nettle network network-uri newtype openpgp-asciiarmor resourcet
-         semigroups split text time time-locale-compat transformers
-         unliftio-core unordered-containers wl-pprint-extras zlib
+         criterion crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype openpgp-asciiarmor resourcet semigroups
+         split text time time-locale-compat transformers unliftio-core
+         unordered-containers wl-pprint-extras zlib
+       ];
+       homepage = "https://salsa.debian.org/clint/hOpenPGP";
+       description = "native Haskell implementation of OpenPGP (RFC4880)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hOpenPGP_2_7" = callPackage
+    ({ mkDerivation, aeson, asn1-encoding, attoparsec, base
+     , base16-bytestring, base64-bytestring, bifunctors, binary
+     , binary-conduit, bytestring, bzlib, conduit, conduit-extra
+     , containers, criterion, crypto-cipher-types, cryptonite, errors
+     , hashable, incremental-parser, ixset-typed, lens, memory
+     , monad-loops, nettle, network, network-uri, newtype
+     , openpgp-asciiarmor, prettyprinter, QuickCheck
+     , quickcheck-instances, resourcet, semigroups, split, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+     , transformers, unliftio-core, unordered-containers, zlib
+     }:
+     mkDerivation {
+       pname = "hOpenPGP";
+       version = "2.7";
+       sha256 = "0s4afs5s6sz2j9vkgz6xhx426dva72i6gk8804avjphjrfvvgdzg";
+       libraryHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring
+         base64-bytestring bifunctors binary binary-conduit bytestring bzlib
+         conduit conduit-extra containers crypto-cipher-types cryptonite
+         errors hashable incremental-parser ixset-typed lens memory
+         monad-loops nettle network-uri newtype openpgp-asciiarmor
+         prettyprinter resourcet semigroups split text time
+         time-locale-compat transformers unliftio-core unordered-containers
+         zlib
+       ];
+       testHaskellDepends = [
+         aeson asn1-encoding attoparsec base base16-bytestring bifunctors
+         binary binary-conduit bytestring bzlib conduit conduit-extra
+         containers crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype prettyprinter QuickCheck
+         quickcheck-instances resourcet semigroups split tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat transformers
+         unliftio-core unordered-containers zlib
+       ];
+       benchmarkHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring bifunctors binary
+         binary-conduit bytestring bzlib conduit conduit-extra containers
+         criterion crypto-cipher-types cryptonite errors hashable
+         incremental-parser ixset-typed lens memory monad-loops nettle
+         network network-uri newtype openpgp-asciiarmor prettyprinter
+         resourcet semigroups split text time time-locale-compat
+         transformers unliftio-core unordered-containers zlib
        ];
        homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
@@ -93587,6 +94832,8 @@ self: {
        pname = "haddock-api";
        version = "2.19.0.1";
        sha256 = "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3";
+       revision = "1";
+       editedCabalFile = "0lfvhpiy8zr117wn9s9nc5va83rb0jz1h14ggm88565xr6qbwmjx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
@@ -94002,6 +95249,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hailgun_0_4_1_8" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, email-validate
+     , exceptions, filepath, http-client, http-client-tls, http-types
+     , tagsoup, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "hailgun";
+       version = "0.4.1.8";
+       sha256 = "1hyww94b0ndfypk47iffvfxm96m24ygrbm26a820arpcmxkp7k4x";
+       libraryHaskellDepends = [
+         aeson base bytestring email-validate exceptions filepath
+         http-client http-client-tls http-types tagsoup text time
+         transformers
+       ];
+       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
+       description = "Mailgun REST api interface for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hailgun-send" = callPackage
     ({ mkDerivation, base, bytestring, configurator, hailgun, text }:
      mkDerivation {
@@ -96324,16 +97591,16 @@ self: {
      }) {};
 
   "hasbolt-extras" = callPackage
-    ({ mkDerivation, base, containers, hasbolt, lens
+    ({ mkDerivation, base, containers, free, hasbolt, lens, mtl
      , neat-interpolation, template-haskell, text, th-lift-instances
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.7";
-       sha256 = "0bbyrbs1rm83sd5nsd65yxxfyz4day20hs3vz7rlkh2hjxhpvxjv";
+       version = "0.0.0.9";
+       sha256 = "08crjy05k2jryfl3cqz4xdmmrj546pyjd4474di67rya8bn3zjwl";
        libraryHaskellDepends = [
-         base containers hasbolt lens neat-interpolation template-haskell
-         text th-lift-instances
+         base containers free hasbolt lens mtl neat-interpolation
+         template-haskell text th-lift-instances
        ];
        homepage = "https://github.com/biocad/hasbolt-extras#readme";
        description = "Extras for hasbolt library";
@@ -97598,17 +98865,17 @@ self: {
 
   "haskell-igraph" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, cereal
-     , cereal-conduit, colour, conduit, data-default-class, data-ordlist
-     , hashable, hxt, igraph, matrices, primitive, random, split, tasty
-     , tasty-golden, tasty-hunit, unordered-containers
+     , colour, conduit, data-ordlist, hashable, hxt, igraph, matrices
+     , primitive, random, singletons, split, tasty, tasty-golden
+     , tasty-hunit, unordered-containers
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.5.0";
-       sha256 = "1hil0zl4pnvkh0ingp0bgi0m7mhmvf1pqr7qskjxm6pa9kqybrw9";
+       version = "0.6.0";
+       sha256 = "15mq27zxgnnd0z0xcv8ncg7spw3hwmr7w65cr4y1wqixgxjzqsm0";
        libraryHaskellDepends = [
-         base bytestring bytestring-lexing cereal cereal-conduit colour
-         conduit data-default-class hashable hxt primitive split
+         base bytestring bytestring-lexing cereal colour conduit
+         data-ordlist hashable hxt primitive singletons split
          unordered-containers
        ];
        librarySystemDepends = [ igraph ];
@@ -99364,8 +100631,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskey";
-       version = "0.3.0.1";
-       sha256 = "1v5af0pd015d7ccdi0f2wc3gb60xy4j59kzngx6wh6dljkxrcga7";
+       version = "0.3.0.2";
+       sha256 = "1s24k6mwb1231j3ryd4iizday4l966vs9rcghr53k3jx2nl0h74h";
        libraryHaskellDepends = [
          base binary bytestring containers directory exceptions filepath
          focus haskey-btree list-t lz4 mtl semigroups stm stm-containers
@@ -99413,8 +100680,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskey-mtl";
-       version = "0.3.0.0";
-       sha256 = "0jc2wa41gmx01ccb7svv91llncm47adb2g6winm513k23bvk8028";
+       version = "0.3.0.1";
+       sha256 = "0n0wrk9sh62x87ms3fxnaj68jm91qdjd4265wk8x3lm66xw6vigw";
        libraryHaskellDepends = [
          base exceptions haskey haskey-btree mtl transformers
        ];
@@ -99899,20 +101166,22 @@ self: {
 
   "hasktags" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HUnit, json
-     , utf8-string
+     , microlens-platform, utf8-string
      }:
      mkDerivation {
        pname = "hasktags";
-       version = "0.69.5";
-       sha256 = "0jln0r3dzd7g17avxqgnyxzv4nmqlmqaw41vrysb838yql6g6ns8";
+       version = "0.70.1";
+       sha256 = "01ngdfaiwlzwai34wmhi7wysk6raxb465v0imyn7j3ibk374af5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring directory filepath json utf8-string
+         base bytestring directory filepath json microlens-platform
+         utf8-string
        ];
        executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
-         base bytestring directory filepath HUnit json utf8-string
+         base bytestring directory filepath HUnit json microlens-platform
+         utf8-string
        ];
        homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
@@ -100279,6 +101548,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql-optparse-applicative_0_3_0_1" = callPackage
+    ({ mkDerivation, base-prelude, hasql, hasql-pool
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "hasql-optparse-applicative";
+       version = "0.3.0.1";
+       sha256 = "19a31qg4fj74qcjrf6ng11za7zbywg08hnls4pri816fwkjdjs9k";
+       libraryHaskellDepends = [
+         base-prelude hasql hasql-pool optparse-applicative
+       ];
+       homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
+       description = "\"optparse-applicative\" parsers for \"hasql\"";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-pool" = callPackage
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
@@ -100871,6 +102157,34 @@ self: {
        license = "unknown";
      }) {};
 
+  "haxl_2_0_0_0" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , deepseq, exceptions, filepath, ghc-prim, hashable, HUnit, pretty
+     , stm, test-framework, test-framework-hunit, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "haxl";
+       version = "2.0.0.0";
+       sha256 = "12ba1hylv181101s6lyjkf6kn8r42qkh60xd9xinzsm2mcfbbbmy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base binary bytestring containers deepseq exceptions filepath
+         ghc-prim hashable pretty stm text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base binary bytestring containers deepseq filepath hashable
+         HUnit test-framework test-framework-hunit text time
+         unordered-containers
+       ];
+       homepage = "https://github.com/facebook/Haxl";
+       description = "A Haskell library for efficient, concurrent, and concise data access";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haxl-amazonka" = callPackage
     ({ mkDerivation, amazonka, amazonka-core, async, base, conduit
      , hashable, haxl, transformers
@@ -102166,6 +103480,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedgehog_0_6" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions
+     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
+     , random, resourcet, semigroups, stm, template-haskell, text
+     , th-lift, time, transformers, transformers-base, unix
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "hedgehog";
+       version = "0.6";
+       sha256 = "0c3y4gvl1i2r54ayha2kw5i2gdpd8nfzfzjly5vhxm13ylygwvxq";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions lifted-async mmorph monad-control mtl
+         pretty-show primitive random resourcet semigroups stm
+         template-haskell text th-lift time transformers transformers-base
+         unix wl-pprint-annotated
+       ];
+       testHaskellDepends = [
+         base containers pretty-show semigroups text transformers
+       ];
+       homepage = "https://hedgehog.qa";
+       description = "Hedgehog will eat all your bugs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedgehog-checkers" = callPackage
     ({ mkDerivation, base, containers, either, hedgehog, semigroupoids
      , semigroups
@@ -102240,6 +103582,8 @@ self: {
        pname = "hedgehog-quickcheck";
        version = "0.1";
        sha256 = "04l4dyk662wf6a0p6bnv9n2x2qi5sqm65ni5bdznakfvzk6mq2k1";
+       revision = "1";
+       editedCabalFile = "1l6gpzhi56mj4a4nqmqhndhly3pdffkpbxinypk5ra77nxqns6n5";
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
        homepage = "https://hedgehog.qa";
        description = "Use QuickCheck generators in Hedgehog and vice versa";
@@ -103089,19 +104433,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "herms_1_8_2_2" = callPackage
+  "herms_1_9_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, brick, directory, microlens
-     , microlens-th, optparse-applicative, semigroups, split, vty
+     , microlens-th, mtl, optparse-applicative, semigroups, split, vty
      }:
      mkDerivation {
        pname = "herms";
-       version = "1.8.2.2";
-       sha256 = "0x6h1l9kikjqzyyxa23y9df6bdw529cr07g74qc2qbdbg39713zq";
+       version = "1.9.0.0";
+       sha256 = "0k3fn5rq294qly8zzfbjdp3sc2zvxslkhyfhh8na9azrkgz2szia";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         ansi-terminal base brick directory microlens microlens-th
+         ansi-terminal base brick directory microlens microlens-th mtl
          optparse-applicative semigroups split vty
        ];
        homepage = "https://github.com/JackKiefer/herms";
@@ -103469,6 +104813,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hexmino" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, gloss
+     , optparse-applicative, random
+     }:
+     mkDerivation {
+       pname = "hexmino";
+       version = "0.1.0.0";
+       sha256 = "0s8sqpqirnnm9jp1lmifywy7ad6vxpj8k85nfyh4zjqybrs2m2p9";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers directory filepath gloss optparse-applicative
+         random
+       ];
+       homepage = "https://github.com/pasqu4le/hexmino";
+       description = "A small game based on domino-like hexagonal tiles";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hexml" = callPackage
     ({ mkDerivation, base, bytestring, extra }:
      mkDerivation {
@@ -103854,6 +105217,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hformat_0_3_2_0" = callPackage
+    ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec
+     , text
+     }:
+     mkDerivation {
+       pname = "hformat";
+       version = "0.3.2.0";
+       sha256 = "1761gw0g7ar4ls4pzm8vq3k48nckd4lliq7f9s7br961215sjgx9";
+       libraryHaskellDepends = [
+         ansi-terminal base base-unicode-symbols text
+       ];
+       testHaskellDepends = [ base base-unicode-symbols hspec text ];
+       homepage = "http://github.com/mvoidex/hformat";
+       description = "Simple Haskell formatting";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hfov" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -104481,8 +105862,8 @@ self: {
      }:
      mkDerivation {
        pname = "hierarchy";
-       version = "1.0.1";
-       sha256 = "11xnqf5s0vda2wjgdazkgkmjp46jyl9zcaia5r01szfwjihj5ldg";
+       version = "1.0.2";
+       sha256 = "060kgg8gfp2155fibksi65xy5psbwabh4wymg7i6cqh3k3zhxy95";
        libraryHaskellDepends = [
          base exceptions free mmorph monad-control mtl transformers
          transformers-base transformers-compat
@@ -105814,6 +107195,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hkt" = callPackage
+    ({ mkDerivation, base, hspec, inspection-testing, protolude, text
+     }:
+     mkDerivation {
+       pname = "hkt";
+       version = "0.0.1";
+       sha256 = "14w3r5i0gqsh1c6xjrr4xz3ym94gp206sji9gkyy4ahdp2ymyvj6";
+       libraryHaskellDepends = [ base protolude ];
+       testHaskellDepends = [
+         base hspec inspection-testing protolude text
+       ];
+       homepage = "https://github.com/eliaslfox/hkt#readme";
+       description = "A library for higher kinded types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hlatex" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, containers, derive
      , directory, filepath, mtl, process, template-haskell, transformers
@@ -105999,8 +107396,8 @@ self: {
     ({ mkDerivation, base, hledger-lib, text, time }:
      mkDerivation {
        pname = "hledger-diff";
-       version = "0.2.0.13";
-       sha256 = "0kngmnpn5qk76hbf1ynfz9zfzwvsslq7klih78k103zl76ggdvsv";
+       version = "0.2.0.14";
+       sha256 = "16njnl51kxmk2ika1ily5snl761559k0pbiql42pbn7zry93l1zn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
@@ -106401,8 +107798,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb-core";
-       version = "0.1.1.0";
-       sha256 = "0jxpzbwlcf8ix08sbxppcbvlvq2hhs8ya0mkk9b262zb2bfv3m4i";
+       version = "0.1.1.1";
+       sha256 = "1c74v3fq1cw6fq33rmmmm6hb595a8f6iyv934w8kww74g79qli7d";
        libraryHaskellDepends = [
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
@@ -107213,6 +108610,8 @@ self: {
        pname = "hnix";
        version = "0.5.1";
        sha256 = "1rhbx7ixzg4147j3pcqvfzn1k2b1xcn8428z98cq6ghnrmgss9al";
+       revision = "1";
+       editedCabalFile = "1l8h9zc9mrqvp8hvkfz1g2inq2b95x42gscyfn6qv0jcxwn4sbpr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107249,7 +108648,7 @@ self: {
          optparse-applicative serialise template-haskell text time
          transformers unordered-containers
        ];
-       homepage = "https://github.com/jwiegley/hnix#readme";
+       homepage = "https://github.com/haskell-nix/hnix#readme";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108270,8 +109669,8 @@ self: {
        pname = "hookup";
        version = "0.2";
        sha256 = "17sj62b78a22alq9hpsrjcri5yxz7yzxdar521yd6x7jv3xxpix2";
-       revision = "1";
-       editedCabalFile = "1g4zijk8f4rff0g2y0m0308zmnwsbx0a3swbx8i8gvfd6v1g4cf6";
+       revision = "2";
+       editedCabalFile = "06iw66x7hjjf5fl5d4glz8lnpagjkbdl3hf44vh6ycgflyh1p434";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL HsOpenSSL-x509-system network socks
        ];
@@ -108372,14 +109771,14 @@ self: {
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
      , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
      , http-client-tls, http-types, ixset-typed, lens, monad-loops
-     , openpgp-asciiarmor, optparse-applicative, resourcet, text, time
-     , time-locale-compat, transformers, unordered-containers
-     , wl-pprint-extras, wl-pprint-terminfo, yaml
+     , openpgp-asciiarmor, optparse-applicative, prettyprinter
+     , prettyprinter-ansi-terminal, resourcet, text, time
+     , time-locale-compat, transformers, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.20.1";
-       sha256 = "1nidlipz0isj65vg6zhi79ln14i9kxvnn164s0haf086vm81kw32";
+       version = "0.21";
+       sha256 = "0ks84gnr3wgca7h0nh8igiigp2y2vv9vrjng49fyrak8k8fw2ln3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -108387,14 +109786,14 @@ self: {
          binary-conduit bytestring conduit conduit-extra containers
          crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
          http-client http-client-tls http-types ixset-typed lens monad-loops
-         openpgp-asciiarmor optparse-applicative resourcet text time
-         time-locale-compat transformers unordered-containers
-         wl-pprint-extras wl-pprint-terminfo yaml
+         openpgp-asciiarmor optparse-applicative prettyprinter
+         prettyprinter-ansi-terminal resourcet text time time-locale-compat
+         transformers unordered-containers yaml
        ];
        executableToolDepends = [ alex happy ];
        homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "hOpenPGP-based command-line tools";
-       license = "unknown";
+       license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110579,17 +111978,17 @@ self: {
   "hs2ats" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, casing, composition-prelude
      , cpphs, criterion, deepseq, haskell-src-exts, hspec
-     , hspec-dirstream, language-ats, lens, system-filepath
+     , hspec-dirstream, language-ats, microlens, system-filepath
      }:
      mkDerivation {
        pname = "hs2ats";
-       version = "0.3.0.1";
-       sha256 = "1z8afx8bc9igd0iv6anw635zfj6vwqq10kp4j95p3fs58wyjg21v";
+       version = "0.3.0.2";
+       sha256 = "0yimapbxy0il6yv12r1xx03vjjgc8hl3iyyi21y41bqdzzl4f37p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base casing composition-prelude cpphs deepseq
-         haskell-src-exts language-ats lens
+         haskell-src-exts language-ats microlens
        ];
        testHaskellDepends = [
          base hspec hspec-dirstream system-filepath
@@ -112079,8 +113478,8 @@ self: {
      }:
      mkDerivation {
        pname = "hslua";
-       version = "0.9.5.1";
-       sha256 = "1l3lkmzcal3106acw2bvky5dlblz4n331gnl1ly18j79flbzn7v8";
+       version = "0.9.5.2";
+       sha256 = "1rdvv01p214zfjh6fcqjjgqwi8y42wad6cqzhlcv5gvclzw2ck8f";
        configureFlags = [ "-fsystem-lua" ];
        libraryHaskellDepends = [
          base bytestring containers exceptions fail mtl text
@@ -112515,15 +113914,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec_2_5_0" = callPackage
+  "hspec_2_5_1" = callPackage
     ({ mkDerivation, base, call-stack, directory, hspec-core
      , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck
      , stringbuilder, transformers
      }:
      mkDerivation {
        pname = "hspec";
-       version = "2.5.0";
-       sha256 = "16vp3k8bdqvsdhv12srahda3anf1pia7blczh201snib52is9vdb";
+       version = "2.5.1";
+       sha256 = "1hip8937prrvkdp63jwicg80b9fpj1yb4rfwl68jd76x2j15hyyl";
        libraryHaskellDepends = [
          base call-stack hspec-core hspec-discover hspec-expectations HUnit
          QuickCheck transformers
@@ -112626,7 +114025,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-core_2_5_0" = callPackage
+  "hspec-core_2_5_1" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
      , deepseq, directory, filepath, hspec-expectations, hspec-meta
      , HUnit, process, QuickCheck, quickcheck-io, random, setenv
@@ -112634,8 +114033,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-core";
-       version = "2.5.0";
-       sha256 = "1p88sxarrpfzic4h37n9crpvmklisv514cm0v6fxmk1f2jvf3rgj";
+       version = "2.5.1";
+       sha256 = "0yfw5rxyh830sb4l0zmsvjyanlg4q20y9hd90d3np5qwhpz4b3p8";
        libraryHaskellDepends = [
          ansi-terminal array base call-stack clock deepseq directory
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
@@ -112692,13 +114091,13 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-discover_2_5_0" = callPackage
+  "hspec-discover_2_5_1" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
      }:
      mkDerivation {
        pname = "hspec-discover";
-       version = "2.5.0";
-       sha256 = "1r91g9hqdn815i86hsrv5bagv76rhq4n0avkmhkh670kkryc0iry";
+       version = "2.5.1";
+       sha256 = "0a3j58jxfv9i15shifhmm7i6i0xd9p4pd3grm4my5c80nhsps61w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
@@ -114609,8 +116008,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "1.1.0.4";
-       sha256 = "03ffmff09k6aqpd9rv41bfi566pr6hk4vdjm0my2wfypbn2mrgb0";
+       version = "1.2.0.2";
+       sha256 = "0kqy3vfiira8bm0ipynwk2dny99llsw2gnvyh0rsdc0bphiwjh62";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -114807,6 +116206,8 @@ self: {
        pname = "http-client";
        version = "0.5.12.1";
        sha256 = "0gnnkcy2d2v1k44ip59s7l86jgigllsp3lsqsac08zr19lr1clab";
+       revision = "1";
+       editedCabalFile = "03x2ms2nl3jjm2sfk8dwy02v920czhmdlkyfy3kqc1sg4nw2134y";
        libraryHaskellDepends = [
          array base blaze-builder bytestring case-insensitive containers
          cookie deepseq exceptions filepath ghc-prim http-types memory
@@ -116105,12 +117506,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_2_0_0" = callPackage
+  "hunit-dejafu_1_2_0_1" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.2.0.0";
-       sha256 = "0djn982mlz4m58hxsghxxj34vsw78i57scxx9a1i3zk7qznmingv";
+       version = "1.2.0.1";
+       sha256 = "1shkfbn14qfk9bjnrmdn3zz88718jb1m942idg2vl53yfj16ahy9";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
@@ -116892,6 +118293,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.6.0.0";
+       sha256 = "1x1ypc098zkgc0gcsyszfqgf2jw7b239d0qrwqzg5iwvzwlwapwk";
+       libraryHaskellDepends = [ base bytestring mmap vector ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-prim#readme";
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -116946,7 +118369,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect_0_12_0_1" = callPackage
+  "hw-rankselect_0_12_0_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, criterion, deepseq
      , directory, hedgehog, hspec, hw-balancedparens, hw-bits
      , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens
@@ -116954,8 +118377,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-rankselect";
-       version = "0.12.0.1";
-       sha256 = "0jg27cpdw341gr1mjnqm5rq66q84q1rzwa5bp8czzws71m5kpfpy";
+       version = "0.12.0.2";
+       sha256 = "02fr2p1sl7ynpc1280l1nakf24ifp4fkpjpy2lac8rk4iab48syk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117002,15 +118425,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-rankselect-base_0_3_0_0" = callPackage
+  "hw-rankselect-base_0_3_2_0" = callPackage
     ({ mkDerivation, base, bits-extra, criterion, hedgehog, hspec
      , hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim
      , hw-string-parse, QuickCheck, safe, vector
      }:
      mkDerivation {
        pname = "hw-rankselect-base";
-       version = "0.3.0.0";
-       sha256 = "19gclmljps2nplfqch26grzagvsraafr4540s6x19x2m58aa3m7g";
+       version = "0.3.2.0";
+       sha256 = "0kb5iqv56fg482w59nlwhfz7fi8vkdg840dsa4lb3bqgy5w0mn3s";
        libraryHaskellDepends = [
          base bits-extra hw-bits hw-int hw-prim hw-string-parse safe vector
        ];
@@ -120232,14 +121655,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "incremental-parser_0_3_1" = callPackage
+  "incremental-parser_0_3_1_1" = callPackage
     ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
      , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
      }:
      mkDerivation {
        pname = "incremental-parser";
-       version = "0.3.1";
-       sha256 = "1nygr5hs547innw9f5wx8ifpkiq01ckbhx34266ds6rmnjsqxzby";
+       version = "0.3.1.1";
+       sha256 = "1p7m897bavh45h755ra97jk06jprls7vrnpzv1kjklgj19vbz1vz";
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [
          base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
@@ -120450,14 +121873,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "indexed-list-literals_0_2_0_0" = callPackage
-    ({ mkDerivation, base, Only }:
+  "indexed-list-literals_0_2_1_1" = callPackage
+    ({ mkDerivation, base, hspec, Only }:
      mkDerivation {
        pname = "indexed-list-literals";
-       version = "0.2.0.0";
-       sha256 = "0n0j5x4v099000fm2ar0lmn06f21gnq39srmimy9bm3zisx8zmzd";
+       version = "0.2.1.1";
+       sha256 = "1b4g2196pi7v347gzl1x68qriwwfgr2iddjqfs49h5swh7qqqpfg";
        libraryHaskellDepends = [ base Only ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/davidm-d/indexed-list-literals";
        description = "Type safe indexed list literals";
        license = stdenv.lib.licenses.bsd3;
@@ -120633,8 +122056,8 @@ self: {
      }:
      mkDerivation {
        pname = "inflections";
-       version = "0.4.0.1";
-       sha256 = "1vc04afp5lvh5drs4pf6djmkn80513h4phkw5gs4g4d37h3d3jg2";
+       version = "0.4.0.3";
+       sha256 = "028dj9pgs5g6qb9x1hc8r4rn0rznr1ynn79vln48k2llyf2r38dx";
        libraryHaskellDepends = [
          base exceptions megaparsec text unordered-containers
        ];
@@ -120934,14 +122357,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "inline-c-cpp_0_2_2_0" = callPackage
+  "inline-c-cpp_0_2_2_1" = callPackage
     ({ mkDerivation, base, hspec, inline-c, safe-exceptions
      , template-haskell
      }:
      mkDerivation {
        pname = "inline-c-cpp";
-       version = "0.2.2.0";
-       sha256 = "1sglwjg8agzi3gspv97g999vb0zzsf5c41znqnnnvqx605jpsd5g";
+       version = "0.2.2.1";
+       sha256 = "1rk7fmpkmxw9hhwr8df29kadnf0ybnwj64ggdbnsdrpfyhnkisci";
        libraryHaskellDepends = [
          base inline-c safe-exceptions template-haskell
        ];
@@ -121323,8 +122746,8 @@ self: {
      }:
      mkDerivation {
        pname = "int-multimap";
-       version = "0.2.1";
-       sha256 = "080ypcd99pvw0wsrydz6hzd9hrr18v4kcb3wihz6v8ylfn08d6ci";
+       version = "0.3";
+       sha256 = "1hsd55hg52mb6vimk5813l0s72spvy9njrhzz6dc6jddh65v58lv";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -121404,6 +122827,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "integreat" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, cassava
+     , containers, fgl, foldl, hmatrix, lens, mtl, mwc-random
+     , optparse-generic, parallel, random-fu, rank-product, sequence
+     , statistics, stringsearch, text, text-show, vector
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "integreat";
+       version = "0.2.2.1";
+       sha256 = "1kyahjbvl6y53ymlnzmjgpi32wdnnq0pwamb7fbzcf3mh94l57lz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bytestring cassava containers fgl foldl hmatrix
+         lens mtl mwc-random parallel random-fu rank-product sequence
+         statistics stringsearch text text-show vector vector-th-unbox
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava containers lens mtl optparse-generic text
+         vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/integreat#readme";
+       description = "Integrate different assays";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "intel-aes" = callPackage
     ({ mkDerivation, base, bytestring, cereal, crypto-api, DRBG
      , intel_aes, largeword, process, random, rdtsc, split, tagged, time
@@ -121493,8 +122943,8 @@ self: {
      }:
      mkDerivation {
        pname = "interlude-l";
-       version = "0.3.0.0";
-       sha256 = "0aa26cgap70ji6qjy555039i8zrynibmfsxpdpkww6pqj3hwrc93";
+       version = "0.4.0.0";
+       sha256 = "0dh3n0kx1i46k7v7y7i4i39raacjc6kf5yb8p410hlsk4wwijw1n";
        libraryHaskellDepends = [
          aeson base exceptions lens monad-control MonadRandom mtl protolude
          string-conv text transformers witherable
@@ -122284,7 +123734,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ip_1_2_0" = callPackage
+  "ip_1_2_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
      , doctest, hashable, hspec, HUnit, primitive, QuickCheck
      , quickcheck-classes, semigroups, test-framework
@@ -122292,10 +123742,8 @@ self: {
      }:
      mkDerivation {
        pname = "ip";
-       version = "1.2.0";
-       sha256 = "09d1y0x5cri08kx5c52jblnj1679z0yw0byigjvwics6pwkgrx0f";
-       revision = "1";
-       editedCabalFile = "09g6nhh6r52dnk6adnxv6qiin6fxif567dl1nca49z5njphcvyl3";
+       version = "1.2.1";
+       sha256 = "024cl4dx0580wch2z9m45siak2n9dpbj3853gc4p9r257zp5xalr";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring hashable primitive semigroups text
          vector
@@ -122393,13 +123841,16 @@ self: {
      }) {};
 
   "ipcvar" = callPackage
-    ({ mkDerivation, base, binary, bytestring, directory, hspec, unix
+    ({ mkDerivation, base, binary, bytestring, directory, hspec, text
+     , unix, uuid
      }:
      mkDerivation {
        pname = "ipcvar";
-       version = "0.0.1";
-       sha256 = "085p03xk29wk03yfshpjvzkf2z79byhp9yy81vra1aci9nkgjr3n";
-       libraryHaskellDepends = [ base binary bytestring directory unix ];
+       version = "0.1.1";
+       sha256 = "169gbfd6pgj6v87rvn8pmr1sx3aj58c4fvn1gdxdgzm70910hkmk";
+       libraryHaskellDepends = [
+         base binary bytestring directory text unix uuid
+       ];
        testHaskellDepends = [ base hspec unix ];
        description = "Simple inter-process communication through IPCVars";
        license = stdenv.lib.licenses.mit;
@@ -122458,6 +123909,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "iproute_1_7_5" = callPackage
+    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
+     , network, QuickCheck, safe
+     }:
+     mkDerivation {
+       pname = "iproute";
+       version = "1.7.5";
+       sha256 = "1vw1nm3s8vz1hqnjnqd3wh5rr4q3m2r4izn5ynhf93h9185qwqzd";
+       libraryHaskellDepends = [
+         appar base byteorder containers network
+       ];
+       testHaskellDepends = [
+         appar base byteorder containers doctest hspec network QuickCheck
+         safe
+       ];
+       homepage = "http://www.mew.org/~kazu/proj/iproute/";
+       description = "IP Routing Table";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "iptables-helpers" = callPackage
     ({ mkDerivation, base, containers, mtl, parsec, QuickCheck, safe
      , syb, utf8-string
@@ -122562,8 +124034,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-client";
-       version = "1.1.0.2";
-       sha256 = "1y9camx7vwpgr2qvqnkzk7rz9k0wkxrb35wflar4g9k0q6xqp2mi";
+       version = "1.1.0.3";
+       sha256 = "1lw271lkl7ps0lxd2as95hi7hbkhmmy21i178h4hrp8v28lsmqxy";
        libraryHaskellDepends = [
          base bytestring conduit connection containers contravariant
          exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale
@@ -124324,8 +125796,8 @@ self: {
      }:
      mkDerivation {
        pname = "jmacro";
-       version = "0.6.14";
-       sha256 = "084rvwav0j33nffiklsrgafg3kmsmd2wnrydw152l6cznwd43fdc";
+       version = "0.6.15";
+       sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124361,6 +125833,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "jmacro-rpc_0_3_3" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
+     , containers, contravariant, jmacro, mtl, scientific, split, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "jmacro-rpc";
+       version = "0.3.3";
+       sha256 = "0gqyv8y4hjk2fwvzar173hvhgw860as0wijfhxqnxbkhd7f2r4gf";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-html bytestring containers
+         contravariant jmacro mtl scientific split text unordered-containers
+         vector
+       ];
+       homepage = "http://hub.darcs.net/gershomb/jmacro";
+       description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "jmacro-rpc-happstack" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, bytestring, containers
      , happstack-server, jmacro, jmacro-rpc, mtl
@@ -125400,6 +126892,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-rpc-generic_0_2_1_4" = callPackage
+    ({ mkDerivation, aeson, aeson-generic-compat, base, containers
+     , dlist, QuickCheck, quickcheck-simple, scientific, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-rpc-generic";
+       version = "0.2.1.4";
+       sha256 = "0zibbxc5fqm9mazfdjbi6angyh5rlcccfd260k667w8lcxc6h7kl";
+       libraryHaskellDepends = [
+         aeson aeson-generic-compat base containers dlist scientific text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base QuickCheck quickcheck-simple text
+       ];
+       homepage = "http://github.com/khibino/haskell-json-rpc-generic";
+       description = "Generic encoder and decode for JSON-RPC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-rpc-server" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, HUnit, mtl
      , test-framework, test-framework-hunit, text, unordered-containers
@@ -125435,8 +126949,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "15kwgpkryd865nls9zm6ya6jzmiygsb537ij7ps39dzasqbnl3an";
-       revision = "13";
-       editedCabalFile = "07r9sdkhhp7wp7zyrw8mnr9dk1z83drm3jfcayv9gz28jnr3gpv1";
+       revision = "14";
+       editedCabalFile = "0pf2j8v62mfh6dk0v4a93l75by6i6jsfangbsabksdbzhh64hyrr";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -125550,8 +127064,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-tracer";
-       version = "0.0.2.0";
-       sha256 = "0fgyx2m0xnkwkqlvmbqmwjklfdif8gprz1bcwbcmmvyznsc6wngq";
+       version = "0.0.3.0";
+       sha256 = "164plgxsaz2nyjl59zip8zj6rxn6gzq91vfqp11fdmafxn3cjv61";
        libraryHaskellDepends = [
          aeson base containers ghc-prim hashable microlens microlens-ghc mtl
          template-haskell text transformers unordered-containers
@@ -125926,8 +127440,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.3.5";
-       sha256 = "1ibx0pr0ddnzx5jbgkjzidkmja65gan7ji7s42v2iwn05fm125ki";
+       version = "0.3.7";
+       sha256 = "1m9za59bgvgzjd7fn11l322aq8j0xb6zsn94ycm0j5z3dwxv0l46";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126450,15 +127964,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "kanji_3_3_0" = callPackage
+  "kanji_3_4_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion
      , deepseq, hashable, HUnit-approx, microlens, microlens-aeson
      , optparse-applicative, tasty, tasty-hunit, text, transformers
      }:
      mkDerivation {
        pname = "kanji";
-       version = "3.3.0";
-       sha256 = "0wapqdrh18344j0dz3y3g08vcfharc43xlcgkk8ksj5r30zq1vff";
+       version = "3.4.0";
+       sha256 = "1wc17b5515vb19ah7wm1zwmpf7b3jgjzrhk21hk8ysr14pcxwifr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126651,8 +128165,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.5.4.0";
-       sha256 = "1144krzz4wvwhdh1b2673302xn7svz2b6kjfvq9728f1bzkkspad";
+       version = "0.5.5.0";
+       sha256 = "10s2bv79shvnpkz1zbcn220mxv05xxq5gny332vhrhflnlcsq9jr";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -126822,21 +128336,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "katydid_0_3_0_1" = callPackage
+  "katydid_0_3_1_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , directory, either, extra, filepath, HUnit, hxt, ilist, json, mtl
      , parsec, primes, regex-tdfa, tasty, tasty-hunit, text
-     , transformers-either
+     , transformers
      }:
      mkDerivation {
        pname = "katydid";
-       version = "0.3.0.1";
-       sha256 = "08q8qmvxc47y8rxs8vam31xwjgwyjga4bdd65m1n4plpndi0zhyg";
+       version = "0.3.1.0";
+       sha256 = "0h7w54z9318m85qdd9whlmg3vnkv69gbl8nxc8iz35pw2cbw51r2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers deepseq either extra hxt ilist json mtl
-         parsec regex-tdfa text transformers-either
+         parsec regex-tdfa text transformers
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [
@@ -127037,6 +128551,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "keccak" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, HUnit
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "keccak";
+       version = "0.1.0";
+       sha256 = "1z3daxxpqj0pwv6ln7kils7aqqmcp8m438x9z3xay5szr8l1i8sz";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/aupiff/keccak#readme";
+       description = "haskell keccak functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "keenser" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , fast-logger, hedis, hostname, lifted-base, monad-control
@@ -128037,6 +129570,8 @@ self: {
        pname = "kraken";
        version = "0.1.0";
        sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k";
+       revision = "1";
+       editedCabalFile = "0ycdikk0mwy1ys9v29ybiws4fr59arwkpibdx62p9vpdv9f0p9k6";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls mtl
        ];
@@ -129213,17 +130748,17 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, lens, recursion-schemes, system-filepath
-     , transformers
+     , hspec, hspec-dirstream, micro-recursion-schemes, microlens
+     , microlens-th, system-filepath, transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.9";
-       sha256 = "0narp1zhvyannd627bafh6yhk8y5lfw6f5nqr9wi1qvbynmlmhmg";
+       version = "1.2.0.10";
+       sha256 = "1998i63gn8f5pn4jlkv30869679jab0vz0gvjzr4yqlyq4npsvpy";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         lens recursion-schemes transformers
+         micro-recursion-schemes microlens microlens-th transformers
        ];
        libraryToolDepends = [ alex cpphs happy ];
        testHaskellDepends = [
@@ -130718,8 +132253,8 @@ self: {
      }:
      mkDerivation {
        pname = "layered-state";
-       version = "1.1.2";
-       sha256 = "1z9xz9nvzlqvzrp4dva9skci70g70lzzf5d5d38ilxvfk7kh56h6";
+       version = "1.1.3";
+       sha256 = "01pi8bslw7pmd3cm7jxxs500i35ny2lbaqi0hnl2a7kzjjxfrs6s";
        libraryHaskellDepends = [
          base constraints data-default exceptions lens lens-utils
          monad-branch monoid mtl primitive profunctors prologue transformers
@@ -133075,21 +134610,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lifted-async_0_10_0_1" = callPackage
+  "lifted-async_0_10_0_2" = callPackage
     ({ mkDerivation, async, base, constraints, criterion, deepseq
-     , HUnit, lifted-base, monad-control, mtl, tasty, tasty-hunit
-     , tasty-th, transformers-base
+     , HUnit, lifted-base, monad-control, mtl, tasty
+     , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.10.0.1";
-       sha256 = "1cf44j2jr2svp8g03hzf3xfmjlh7xcd40ra1k7dv6vzyzwb5p4hd";
+       version = "0.10.0.2";
+       sha256 = "1073r512c1x2m1v0jar9bwqg656slg7jd1jhsyj6m8awgx1l1mwf";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
        testHaskellDepends = [
-         async base HUnit lifted-base monad-control mtl tasty tasty-hunit
-         tasty-th
+         async base HUnit lifted-base monad-control mtl tasty
+         tasty-expected-failure tasty-hunit tasty-th
        ];
        benchmarkHaskellDepends = [ async base criterion deepseq ];
        homepage = "https://github.com/maoe/lifted-async";
@@ -133139,6 +134674,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lifted-stm" = callPackage
+    ({ mkDerivation, array, base, monad-finally, stm, transformers
+     , transformers-abort, transformers-base, transformers-compat
+     }:
+     mkDerivation {
+       pname = "lifted-stm";
+       version = "0.1";
+       sha256 = "1rjz8mkj17w9b7b10qx1ijj4x45abkgzp4khyl3gjmzb654zzym0";
+       libraryHaskellDepends = [
+         array base monad-finally stm transformers transformers-abort
+         transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/mvv/lifted-stm";
+       description = "STM operations lifted through monad transformer stacks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lifted-threads" = callPackage
     ({ mkDerivation, base, monad-control, threads, transformers-base }:
      mkDerivation {
@@ -135048,8 +136600,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs-pretty";
-       version = "0.2.1.0";
-       sha256 = "1v8nz7c7wvvh29c48li10m12lj8y3yn5b8rs1b86y351s11vsag6";
+       version = "0.3.0.0";
+       sha256 = "1q67rsjnw8wsfvmz4a54nr7b9il59fdjbbra2wwnnyjldi29ykdq";
        libraryHaskellDepends = [
          array base bytestring llvm-hs-pure text wl-pprint-text
        ];
@@ -135698,8 +137250,8 @@ self: {
      }:
      mkDerivation {
        pname = "log-effect";
-       version = "1.0.0";
-       sha256 = "0xj0g5g054ayycdajryischj2yy9rb75cm782sgsj67p04943c5y";
+       version = "1.0.1";
+       sha256 = "0679irh73lqd8jl3mzndijrdjq8z02lqbi4pbmj8qs6m4q9a6akn";
        libraryHaskellDepends = [
          base bytestring extensible-effects monad-control text
          transformers-base
@@ -135710,6 +137262,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "log-effect-syslog" = callPackage
+    ({ mkDerivation, base, bytestring, extensible-effects, hsyslog
+     , log-effect, monad-control, transformers-base
+     }:
+     mkDerivation {
+       pname = "log-effect-syslog";
+       version = "0.1.0";
+       sha256 = "0db4pgl0np1yyl9arq5cvdp3njdlw62dnbldggjc9p0q6dh3hspc";
+       libraryHaskellDepends = [
+         base bytestring extensible-effects hsyslog log-effect monad-control
+         transformers-base
+       ];
+       homepage = "https://github.com/greydot/log-effect-syslog";
+       description = "Syslog functions for log-effect";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "log-elasticsearch" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , bloodhound, bytestring, deepseq, http-client, http-client-tls
@@ -135963,6 +137532,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logging-effect_1_3_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, criterion, exceptions
+     , fast-logger, free, lifted-async, monad-control, monad-logger, mtl
+     , prettyprinter, semigroups, stm, stm-delay, text, time
+     , transformers, transformers-base, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.3.0";
+       sha256 = "02acs3f4zx0xwivzfpw5i4mnig63m330n1a2ni0brck3kbj9qsrn";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl prettyprinter
+         semigroups stm stm-delay text time transformers transformers-base
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion fast-logger lifted-async monad-logger
+         text time wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "logging-effect-extra" = callPackage
     ({ mkDerivation, base, logging-effect, logging-effect-extra-file
      , logging-effect-extra-handler, wl-pprint-text
@@ -138973,8 +140566,8 @@ self: {
      }:
      mkDerivation {
        pname = "mapalgebra";
-       version = "0.1.0";
-       sha256 = "1d4cdwkrbvkh53h3vkzghikmbnba3x1j84r0wgsc90cnr2im5san";
+       version = "0.1.1";
+       sha256 = "1zcba17nj804lbhnlr02bcg8qfaxv3nq8ddiqxpq2qp4mv8n8g4f";
        libraryHaskellDepends = [
          base bytestring containers data-default deepseq hmatrix massiv
          massiv-io vector
@@ -141553,8 +143146,8 @@ self: {
      }:
      mkDerivation {
        pname = "micro-recursion-schemes";
-       version = "5.0.2.1";
-       sha256 = "1n1sza3a87vh74hx1da4mcfwarbjkz2cfvnkldnqwfnqvngq1gaq";
+       version = "5.0.2.2";
+       sha256 = "17jybjra4s1hapjz6i8bwlv8y6rm70g72vl7cd2y7xrq4vrd3p9v";
        libraryHaskellDepends = [ base template-haskell th-abstraction ];
        libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base HUnit template-haskell ];
@@ -142753,18 +144346,6 @@ self: {
      }) {};
 
   "mintty" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "mintty";
-       version = "0.1.1";
-       sha256 = "10wz5q85h366g22jijai5g6hpxa22zy2hr33bzidxs4r36gk8zy8";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/RyanGlScott/mintty";
-       description = "A reliable way to detect the presence of a MinTTY console on Windows";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mintty_0_1_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "mintty";
@@ -142774,7 +144355,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/mintty";
        description = "A reliable way to detect the presence of a MinTTY console on Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mios" = callPackage
@@ -143151,6 +144731,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmark-ext_0_2_1_0" = callPackage
+    ({ mkDerivation, base, foldl, hspec, hspec-discover, lucid
+     , microlens, mmark, modern-uri, skylighting, text
+     }:
+     mkDerivation {
+       pname = "mmark-ext";
+       version = "0.2.1.0";
+       sha256 = "1k9zw9fbfhlp5irbykycpw5qkjyhlcb8qrnbmsrn133hh1m3j0hs";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base foldl lucid microlens mmark modern-uri skylighting text
+       ];
+       testHaskellDepends = [ base hspec lucid mmark text ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/mmark-md/mmark-ext";
+       description = "Commonly useful extensions for the MMark markdown processor";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmorph" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
@@ -144088,8 +145688,8 @@ self: {
      }:
      mkDerivation {
        pname = "monad-logger-prefix";
-       version = "0.1.9";
-       sha256 = "1xvw1nd9arn2v2x4a8r0nljfv0a4z9kqa5pbrhmskgr70l9py4jm";
+       version = "0.1.10";
+       sha256 = "0xfrl084b45nq7598239ax3v0qck56d75p4jcqlykn8k7822vb53";
        libraryHaskellDepends = [
          base exceptions monad-control monad-logger mtl resourcet text
          transformers transformers-base
@@ -145315,6 +146915,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoid-extras_0_5" = callPackage
+    ({ mkDerivation, base, criterion, groups, semigroupoids, semigroups
+     }:
+     mkDerivation {
+       pname = "monoid-extras";
+       version = "0.5";
+       sha256 = "172d1mfns7agd619rlbb1i9kw2y26kjvivkva06k1r14bar1lmy6";
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       benchmarkHaskellDepends = [ base criterion semigroups ];
+       description = "Various extra monoid-related definitions and utilities";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-owns" = callPackage
     ({ mkDerivation, base, bytestring, containers }:
      mkDerivation {
@@ -145703,6 +147317,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_19" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, formatting, http-client
+     , http-client-tls, microlens, microlens-mtl, mtl
+     , optparse-applicative, pipes, QuickCheck, system-fileio
+     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.19";
+       sha256 = "1mqkjdn3hr3ihjai9qpcfrbn318pkddnlkck96v8byfmil6d4dph";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley formatting http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page formatting optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -146861,6 +148509,8 @@ self: {
        pname = "multiplate";
        version = "0.0.3";
        sha256 = "1gsfmw7dzsxycixqqrh5wr1g3izn7rm2a4a20nh8pp6fgn21c01c";
+       revision = "1";
+       editedCabalFile = "0cka6nwvbiddlv2j4f7jqq4cxz5mfw7vga5p020h0m9ws98gqbsx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://haskell.org/haskellwiki/Multiplate";
@@ -147702,8 +149352,8 @@ self: {
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
-       version = "2.0.2";
-       sha256 = "1v2k0vpz33xmf58dhidwnjjvhkczfqizlcgwalf1vk19sw1ls3x5";
+       version = "2.0.3";
+       sha256 = "18gnr5bjmz2bl717dhvg6hwj6z06y5sw2nmsw7d3vl37qd9rp6by";
        libraryHaskellDepends = [ base mwc-random primitive transformers ];
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
@@ -148356,39 +150006,40 @@ self: {
      }) {};
 
   "nakadi-client" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, async, base, bytestring
-     , classy-prelude, conduit, conduit-combinators, conduit-extra
-     , containers, exceptions, fast-logger, hashable, http-client
-     , http-client-tls, http-conduit, http-types, iso8601-time, lens
-     , lens-aeson, lifted-async, monad-control, monad-logger, mtl
-     , random, resourcet, retry, safe-exceptions, say, scientific, split
-     , stm, stm-chans, stm-conduit, tasty, tasty-hunit, template-haskell
-     , text, time, transformers, transformers-base, unliftio
-     , unliftio-core, unordered-containers, uuid, vector, wai, warp
+    ({ mkDerivation, aeson, aeson-casing, async, async-timer, base
+     , bytestring, classy-prelude, conduit, conduit-extra, containers
+     , exceptions, fast-logger, hashable, http-client, http-client-tls
+     , http-conduit, http-types, iso8601-time, lens, lens-aeson
+     , lifted-async, monad-control, monad-logger, mtl, random, resourcet
+     , retry, safe-exceptions, say, scientific, split, stm, stm-chans
+     , stm-conduit, tasty, tasty-hunit, template-haskell, text, time
+     , transformers, transformers-base, unliftio, unliftio-core
+     , unordered-containers, uuid, vector, wai, warp
      }:
      mkDerivation {
        pname = "nakadi-client";
-       version = "0.5.0.3";
-       sha256 = "0c0jrvvlk3mxwka6b1996gylgkhqqh023wc4vxg98qaaxpy851x4";
+       version = "0.5.1.0";
+       sha256 = "1g8jddskklbcirgb35b71lbgkm492rfhbx50kipi5wrnh0r4zh67";
        libraryHaskellDepends = [
-         aeson aeson-casing base bytestring conduit conduit-combinators
+         aeson aeson-casing async-timer base bytestring conduit
          conduit-extra containers exceptions hashable http-client
          http-client-tls http-conduit http-types iso8601-time lens
          monad-control monad-logger mtl resourcet retry safe-exceptions
-         scientific split template-haskell text time transformers
-         transformers-base unliftio-core unordered-containers uuid vector
+         scientific split stm template-haskell text time transformers
+         transformers-base unliftio unliftio-core unordered-containers uuid
+         vector
        ];
        testHaskellDepends = [
-         aeson aeson-casing async base bytestring classy-prelude conduit
-         conduit-combinators conduit-extra containers exceptions fast-logger
-         hashable http-client http-client-tls http-conduit http-types
-         iso8601-time lens lens-aeson lifted-async monad-control
-         monad-logger mtl random resourcet retry safe-exceptions say
-         scientific split stm stm-chans stm-conduit tasty tasty-hunit
-         template-haskell text time transformers transformers-base unliftio
-         unliftio-core unordered-containers uuid vector wai warp
+         aeson aeson-casing async async-timer base bytestring classy-prelude
+         conduit conduit-extra containers exceptions fast-logger hashable
+         http-client http-client-tls http-conduit http-types iso8601-time
+         lens lens-aeson lifted-async monad-control monad-logger mtl random
+         resourcet retry safe-exceptions say scientific split stm stm-chans
+         stm-conduit tasty tasty-hunit template-haskell text time
+         transformers transformers-base unliftio unliftio-core
+         unordered-containers uuid vector wai warp
        ];
-       homepage = "https://github.com/mtesseract/nakadi-haskell#readme";
+       homepage = "http://nakadi-client.haskell.silverratio.net";
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148932,8 +150583,8 @@ self: {
        pname = "natural-transformation";
        version = "0.4";
        sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma";
-       revision = "4";
-       editedCabalFile = "1zppa1fcc7pl7ak0hs3w3pkx34398nrfiiwa3w689ib08kqkdpby";
+       revision = "5";
+       editedCabalFile = "1wlmkq9k9aym4wig9rn5w6sygq2fg9kd02d18pfzgxw70icqjlq3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -150533,6 +152184,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-simple_0_4_1" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, network
+     , transformers
+     }:
+     mkDerivation {
+       pname = "network-simple";
+       version = "0.4.1";
+       sha256 = "07cvvgbp8cbwh1x7ii326d97hfmqwiyiqhkg8dqypzwzfwb3mgkj";
+       libraryHaskellDepends = [
+         base bytestring exceptions network transformers
+       ];
+       homepage = "https://github.com/k0001/network-simple";
+       description = "Simple network sockets usage patterns";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-simple-sockaddr" = callPackage
     ({ mkDerivation, base, bytestring, directory, exceptions, network
      , transformers
@@ -150551,16 +152219,17 @@ self: {
      }) {};
 
   "network-simple-tls" = callPackage
-    ({ mkDerivation, base, bytestring, certificate, cprng-aes
-     , exceptions, network, network-simple, tls, tls-extra, transformers
+    ({ mkDerivation, base, bytestring, data-default, exceptions
+     , network, network-simple, tls, transformers, x509, x509-store
+     , x509-system, x509-validation
      }:
      mkDerivation {
        pname = "network-simple-tls";
-       version = "0.2.1";
-       sha256 = "0hbpxbs357bxifksbqrlrdkwkkfaydxcf9wdla6kafaymhrxhc0k";
+       version = "0.3";
+       sha256 = "11s5r7vibba7pmmbnglx1w2v5wxykxrzwkrwy4hifxzpbb2gybdw";
        libraryHaskellDepends = [
-         base bytestring certificate cprng-aes exceptions network
-         network-simple tls tls-extra transformers
+         base bytestring data-default exceptions network network-simple tls
+         transformers x509 x509-store x509-system x509-validation
        ];
        homepage = "https://github.com/k0001/network-simple-tls";
        description = "Simple interface to TLS secured network sockets";
@@ -152154,6 +153823,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "normalize" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers, lens
+     , optparse-generic, statistics, text, vector
+     }:
+     mkDerivation {
+       pname = "normalize";
+       version = "0.3.0.1";
+       sha256 = "1wx7jfbc5s1zpksyq1vhb3460gll1fl6lkdbp3349rxifz0l27dq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cassava containers lens statistics text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring cassava containers optparse-generic text vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/normalize#readme";
+       description = "Normalize data using a variety of methods";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "normalize-imports" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
@@ -152620,6 +154310,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "numbers_3000_2_0_2" = callPackage
+    ({ mkDerivation, base, QuickCheck, test-framework
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "numbers";
+       version = "3000.2.0.2";
+       sha256 = "0xssrf7lbyplkgnbfw1jqkib3w9wgn1d6n85pk86nx63j05y9kph";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base QuickCheck test-framework test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/jwiegley/numbers#readme";
+       description = "Various number types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "numerals" = callPackage
     ({ mkDerivation, base, containers, criterion, fingertree, HUnit
      , integer-gmp, QuickCheck, test-framework, test-framework-hunit
@@ -152872,8 +154580,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-histogram";
-       version = "0.1.1.0";
-       sha256 = "18xnkwmf7bwnj2ldj20afg38ykpzdnpg773pgj9af9yzk40vpd28";
+       version = "0.1.2.0";
+       sha256 = "03zq5qg9m5yndllc1gs5f7848j37dysb94zkh6pc465ascskl7d9";
        libraryHaskellDepends = [
          base containers foldl numhask-prelude numhask-range tdigest
        ];
@@ -152921,14 +154629,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_2_1_0" = callPackage
+  "numhask-range_0_2_2_0" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
      , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.2.1.0";
-       sha256 = "1i6kpx0jdr0q2lp19m0aqfd73wsi1dm6qhl1w9x8wp4px12j4caz";
+       version = "0.2.2.0";
+       sha256 = "1wrh8s6nknw6jkbl91iym7cvy1g1qmccikfbr1qhc4gzylkf5m4v";
        libraryHaskellDepends = [
          adjunctions base distributive numhask-prelude protolude QuickCheck
          semigroupoids
@@ -153014,8 +154722,8 @@ self: {
      }:
      mkDerivation {
        pname = "nuxeo";
-       version = "0.2.0.1";
-       sha256 = "046vwj0p53pzrdmni08gqyzrr0mhz8qrf5zn09plgzjadq3yp2p2";
+       version = "0.2.0.3";
+       sha256 = "1assz03rv0vdbgl2ihcr7sbx7ifsv7m2mp6lg2jgy5h0ghnlwzcd";
        libraryHaskellDepends = [
          attoparsec base bytestring conduit conduit-extra text time
        ];
@@ -154296,6 +156004,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opaleye_0_6_7000_0" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , case-insensitive, containers, contravariant, dotenv, hspec
+     , hspec-discover, multiset, postgresql-simple, pretty
+     , product-profunctors, profunctors, QuickCheck, scientific
+     , semigroups, text, time, time-locale-compat, transformers, uuid
+     , void
+     }:
+     mkDerivation {
+       pname = "opaleye";
+       version = "0.6.7000.0";
+       sha256 = "11wj57k7fswln9is47r09yj7h60hbqa6x0lnh6cg2bmg9ynnvmxk";
+       revision = "1";
+       editedCabalFile = "1g2asrmd4aaw61dcprs9mih1j065q9xipnrhkxablqwcpr8pzz21";
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring case-insensitive
+         contravariant postgresql-simple pretty product-profunctors
+         profunctors scientific semigroups text time time-locale-compat
+         transformers uuid void
+       ];
+       testHaskellDepends = [
+         aeson base containers contravariant dotenv hspec hspec-discover
+         multiset postgresql-simple product-profunctors profunctors
+         QuickCheck semigroups text time transformers
+       ];
+       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
+       description = "An SQL-generating DSL targeting PostgreSQL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opaleye-classy" = callPackage
     ({ mkDerivation, base, bytestring, lens, mtl, opaleye
      , postgresql-simple, product-profunctors, transformers
@@ -156099,8 +157838,8 @@ self: {
        pname = "ottparse-pretty";
        version = "0.1.2.6";
        sha256 = "1q52zc214bjiksrrrr5pcr30yimjzgga4ciw943za169kw3xpas5";
-       revision = "1";
-       editedCabalFile = "0c6m005ddrdmh8yrnhar5ams2clcbgdmhfrnlvvyppgqprvb3z9z";
+       revision = "2";
+       editedCabalFile = "05fxdr12vwf486609f8ld6d3cgpr632402n404gi8hgxj5ijc6yx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -156763,7 +158502,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
-  "pandoc_2_2" = callPackage
+  "pandoc_2_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base-compat
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , Cabal, case-insensitive, cmark-gfm, containers, criterion
@@ -156778,8 +158517,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "2.2";
-       sha256 = "0sc51sw7g9jni9jamj7rcdn9fqf5476gzp7cahhkjj29xak88a8g";
+       version = "2.2.1";
+       sha256 = "1dqin92w513l7whg5wdgrngnxsj5mb8gppfvn7kjgyv2pdgpy0zy";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -160315,6 +162054,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "permutations" = callPackage
+    ({ mkDerivation, alg, base, base-unicode-symbols, Fin
+     , natural-induction, peano, smallcheck, tasty, tasty-smallcheck
+     , universe-base, util
+     }:
+     mkDerivation {
+       pname = "permutations";
+       version = "0.1.0.0";
+       sha256 = "0dx4xx4g35r2qq4al431l5s1664psf95pf0nf6y59c1i1km5qpq4";
+       libraryHaskellDepends = [
+         alg base base-unicode-symbols Fin natural-induction peano
+         universe-base util
+       ];
+       testHaskellDepends = [
+         alg base Fin natural-induction peano smallcheck tasty
+         tasty-smallcheck universe-base
+       ];
+       description = "Permutations of finite sets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "permute" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -161973,6 +163733,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pinboard_0_9_12_10" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , http-client, http-client-tls, http-types, monad-logger, mtl
+     , network, profunctors, QuickCheck, random, safe-exceptions
+     , semigroups, text, time, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "pinboard";
+       version = "0.9.12.10";
+       sha256 = "0jdhckdlpmgqrp8xy7m285w7kclg8dpl02szl6fd6iwzs8l8vjds";
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-client http-client-tls
+         http-types monad-logger mtl network profunctors random
+         safe-exceptions text time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers hspec mtl QuickCheck
+         safe-exceptions semigroups text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/jonschoning/pinboard";
+       description = "Access to the Pinboard API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pinch" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text
@@ -162605,6 +164392,8 @@ self: {
        pname = "pipes-files";
        version = "0.1.2";
        sha256 = "0ca53bgb15i6bjyp2dxnb1lbkzcbjdkrznnh2bwj0l4jk04pcxkw";
+       revision = "1";
+       editedCabalFile = "0bg0ji5w17kx8qnba0aisvyf6md5qf5846gy9kdh8k3vh410sc2r";
        libraryHaskellDepends = [
          attoparsec base bytestring directory exceptions filepath free
          hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths
@@ -162857,6 +164646,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-network_0_6_5" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, network
+     , network-simple, pipes, pipes-safe, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-network";
+       version = "0.6.5";
+       sha256 = "15f7kn9vpzsm8s108cly80pi6yqpv6v04w032ng0wr9g78an393l";
+       libraryHaskellDepends = [
+         base bytestring exceptions network network-simple pipes pipes-safe
+         transformers
+       ];
+       homepage = "https://github.com/k0001/pipes-network";
+       description = "Use network sockets together with the pipes library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-network-tls" = callPackage
     ({ mkDerivation, base, bytestring, network, network-simple
      , network-simple-tls, pipes, pipes-network, pipes-safe, tls
@@ -162864,8 +164671,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-network-tls";
-       version = "0.2.1";
-       sha256 = "0k3w13s3vasd85mapa594xhi31mhdwqycxqnadidqy24q5s6zdhc";
+       version = "0.3";
+       sha256 = "1cmsnvgr3ffjxqn7bwj0ghqsxqd4hnhfdn4di6p8q6np2mmllsd2";
        libraryHaskellDepends = [
          base bytestring network network-simple network-simple-tls pipes
          pipes-network pipes-safe tls transformers
@@ -163102,8 +164909,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.4.3.2";
-       sha256 = "0q4xc2r0yzyj6gpg16z9scdxm0a3fjzsm1r6qihkr2zks9sac36x";
+       version = "0.4.4.0";
+       sha256 = "181zzyyzy7p13zgiprfacvzn8b00xw36bv3l4ishwbac8yxg15cl";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit foldl free microlens pipes
          pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -163275,22 +165082,24 @@ self: {
      }) {};
 
   "pivotal-tracker" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, either, servant
-     , servant-client, text, time, transformers
+    ({ mkDerivation, aeson, aeson-casing, base, either, hspec
+     , http-client, http-client-tls, mtl, servant, servant-client, text
+     , time, transformers
      }:
      mkDerivation {
        pname = "pivotal-tracker";
-       version = "0.1.0.1";
-       sha256 = "0ipzlzrzvwgzg1k3wkgy0bgf0k1kalf4swln24zfbjrp6lnnss79";
+       version = "0.2.0.0";
+       sha256 = "1sc95mbf3cxjy9kxaqr3xgrgvmr6wghh69i4qqkil2grghvw90am";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson aeson-casing base servant servant-client text time
-         transformers
+         aeson aeson-casing base http-client http-client-tls mtl servant
+         servant-client text time transformers
        ];
        executableHaskellDepends = [
          base either servant text transformers
        ];
+       testHaskellDepends = [ base hspec ];
        description = "A library and a CLI tool for accessing Pivotal Tracker API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163484,8 +165293,8 @@ self: {
      }:
      mkDerivation {
        pname = "planb-token-introspection";
-       version = "0.1.2.0";
-       sha256 = "09b54m2m90g8ci6sxsgayvfxd9gmkwp2xw16gk1afxnha39lzwlq";
+       version = "0.1.3.0";
+       sha256 = "1n7ck623ik3rss5vhby9wz8q5r1kfww678d3yiqkx7pg5fn4rwmk";
        libraryHaskellDepends = [
          aeson aeson-casing base bytestring containers http-client
          http-client-tls http-types mtl safe-exceptions text transformers
@@ -163789,18 +165598,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "plot-light_0_3_3_2" = callPackage
-    ({ mkDerivation, base, blaze-svg, colour, containers
-     , data-default-class, hspec, mtl, QuickCheck, scientific, text
-     , time
+  "plot-light_0_4_3" = callPackage
+    ({ mkDerivation, base, blaze-markup, blaze-svg, colour, containers
+     , exceptions, histogram-fill, hspec, mtl, QuickCheck, scientific
+     , text, time, vector
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.3.3.2";
-       sha256 = "0im5rw52aim1zspisdar87gyn1ar4dkk52ipcq0s41pcycbwib12";
+       version = "0.4.3";
+       sha256 = "1fwz74a2fh7rgxv7i9kz6izxl1zrpa8bml2dxph7w7hdz1pi3g5b";
        libraryHaskellDepends = [
-         base blaze-svg colour containers data-default-class mtl scientific
-         text time
+         base blaze-markup blaze-svg colour containers exceptions
+         histogram-fill mtl scientific text time vector
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/ocramz/plot-light";
@@ -163815,8 +165624,8 @@ self: {
      }:
      mkDerivation {
        pname = "plot-light-examples";
-       version = "0.2.0.0";
-       sha256 = "0sw7hxp96s8sbaghs3lzl856q72y0gxn58px0wd4568fdbvgd6vl";
+       version = "0.3.0.0";
+       sha256 = "0jw4ysfkshvw8r2xfy76997rz5072b5bhm9rca8pcc77fqifhavv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -165402,6 +167211,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-binary_0_12_1_1" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, bytestring-strict-builder, containers, conversion
+     , conversion-bytestring, conversion-text, criterion, json-ast
+     , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck
+     , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, transformers, unordered-containers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.12.1.1";
+       sha256 = "181npyfnz9xbmwjfzcrmbwlzw2xchy2fsibiw6d3c01y45xv607v";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring
+         bytestring-strict-builder containers loch-th network-ip
+         placeholders scientific text time transformers unordered-containers
+         uuid vector
+       ];
+       testHaskellDepends = [
+         aeson conversion conversion-bytestring conversion-text json-ast
+         loch-th network-ip placeholders postgresql-libpq QuickCheck
+         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -168671,6 +170511,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pronounce" = callPackage
+    ({ mkDerivation, base, binary, containers, filepath, mtl, text }:
+     mkDerivation {
+       pname = "pronounce";
+       version = "1.1.0.2";
+       sha256 = "0nhns8pnp9n88w5514dgb9kwfkd1fqx042z4p8ai1yf5q1igygw5";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary containers filepath mtl text
+       ];
+       homepage = "https://github.com/buonuomo/Text.Pronounce";
+       description = "A library for interfacing with the CMU Pronouncing Dictionary";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proof-combinators" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -168707,8 +170562,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "5.3.5";
-       sha256 = "0x6whnn53grfkjqybn91kfsr69w3r9mk9r39yzwx35skwkqj3vb9";
+       version = "5.4.0";
+       sha256 = "1ykzagmw2an1aglkglkpkqv65mxaqqfj7zia27f6npnihb6hwi5v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169257,6 +171112,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proxy" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "proxy";
+       version = "0.1.0.0";
+       sha256 = "1465mvkdq9cv202sj2hiwa8a2a07906dww2msan235fvkrnhj9jz";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/chessai/proxy.git";
+       description = "proxy helpers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "proxy-kindness" = callPackage
     ({ mkDerivation, base, tagged }:
      mkDerivation {
@@ -169497,14 +171364,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "publicsuffix_0_20180426" = callPackage
+  "publicsuffix_0_20180513" = callPackage
     ({ mkDerivation, base, criterion, filepath, hspec, random
      , template-haskell
      }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20180426";
-       sha256 = "0pfxsh2ds3dwm6mq6g85vhq8rdgc93bn84pq1b4lk3sf71sqs2ii";
+       version = "0.20180513";
+       sha256 = "0wq9hz1z924a5pk17zyaf9nyz5z5fyrlf806rypdxnpvi4q1j7xm";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
@@ -169901,8 +171768,8 @@ self: {
      }:
      mkDerivation {
        pname = "pure-zlib";
-       version = "0.6.2";
-       sha256 = "022ciqcsw39wi4r577q92s9awjwkc2da61ljqi8n5qsal83vhayh";
+       version = "0.6.3";
+       sha256 = "1bsbpzywbh33kp2l7p80g8pnh66fd76sii4900f80x1yjig03gb8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -170741,8 +172608,8 @@ self: {
      }:
      mkDerivation {
        pname = "qnap-decrypt";
-       version = "0.3.1";
-       sha256 = "1ns5wz427ilw7xn886sw7ip9d1nbfqbs1qcgjm9cvdi5v5v89pi6";
+       version = "0.3.2";
+       sha256 = "1qq1cpnn7bg3nb3ig86wcc6xvjyljckjd1bgivh1sfhxh8p0p4ys";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -171818,18 +173685,17 @@ self: {
 
   "quickspec" = callPackage
     ({ mkDerivation, base, constraints, containers, data-lens-light
-     , dlist, QuickCheck, random, reflection, template-haskell
-     , transformers, twee-lib, uglymemo
+     , dlist, QuickCheck, quickcheck-instances, random, spoon
+     , template-haskell, transformers, twee-lib, uglymemo
      }:
      mkDerivation {
        pname = "quickspec";
-       version = "2";
-       sha256 = "0hdyw114f5skc66v0n0mghcx1ax8gfgilm42h4wqkwzyj6rkiy6r";
-       revision = "1";
-       editedCabalFile = "1nic3b13khhnykpvynzw7xjsw7ldvc4jfxdbjfj6xxsyig7lk4qb";
+       version = "2.1";
+       sha256 = "0xzb442pjm26khdp46vjkzza1gyb01jzhghv3hxff2pwjs3jjsyy";
        libraryHaskellDepends = [
-         base constraints containers data-lens-light dlist QuickCheck random
-         reflection template-haskell transformers twee-lib uglymemo
+         base constraints containers data-lens-light dlist QuickCheck
+         quickcheck-instances random spoon template-haskell transformers
+         twee-lib uglymemo
        ];
        homepage = "https://github.com/nick8325/quickspec";
        description = "Equational laws for free!";
@@ -172537,8 +174403,8 @@ self: {
      }:
      mkDerivation {
        pname = "rakuten";
-       version = "0.1.1.1";
-       sha256 = "01p6f8vapygcw6viwq7kkg6b5fifqzbkski0763x9by49h5gpbsi";
+       version = "0.1.1.2";
+       sha256 = "153801dij5i5byf151xf39anz005i3w7xmmkk434xr6zxc8jm604";
        libraryHaskellDepends = [
          aeson base bytestring connection constraints data-default-class
          extensible http-api-data http-client http-client-tls http-types
@@ -172554,6 +174420,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rakuten_0_1_1_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, connection, constraints
+     , data-default-class, extensible, hspec, http-api-data, http-client
+     , http-client-tls, http-types, lens, req, servant-server, text
+     , warp
+     }:
+     mkDerivation {
+       pname = "rakuten";
+       version = "0.1.1.3";
+       sha256 = "1c578rmjrb8x26c9b0fraz2l6a7d01wky8arzwa1kigfgw9ihqxh";
+       libraryHaskellDepends = [
+         aeson base bytestring connection constraints data-default-class
+         extensible http-api-data http-client http-client-tls http-types
+         lens req text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring connection constraints data-default-class
+         extensible hspec http-api-data http-client http-client-tls
+         http-types lens req servant-server text warp
+       ];
+       homepage = "https://github.com/matsubara0507/rakuten#readme";
+       description = "The Rakuten API in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ralist" = callPackage
     ({ mkDerivation, base, criterion, deepseq, hspec }:
      mkDerivation {
@@ -173026,6 +174918,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "range-set-list_0_1_2_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, tasty
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "range-set-list";
+       version = "0.1.2.1";
+       sha256 = "06f8z9rmk2phmds9wv95y2xvjhfx8dr9jbqlv4ybv8m21283x0kw";
+       libraryHaskellDepends = [ base containers deepseq hashable ];
+       testHaskellDepends = [
+         base containers deepseq hashable tasty tasty-quickcheck
+       ];
+       homepage = "https://github.com/phadej/range-set-list#readme";
+       description = "Memory efficient sets with ranges of elements";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "range-space" = callPackage
     ({ mkDerivation, base, QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2, time, vector-space
@@ -174581,8 +176491,8 @@ self: {
     ({ mkDerivation, base, HTTP, network, network-uri, xhtml }:
      mkDerivation {
        pname = "recaptcha";
-       version = "0.1.0.3";
-       sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19";
+       version = "0.1.0.4";
+       sha256 = "03a3f34lcd387112pfa931wwna58av5yv4jvx4nl0zkryp1p4qd2";
        libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
        homepage = "http://github.com/jgm/recaptcha/tree/master";
        description = "Functions for using the reCAPTCHA service in web applications";
@@ -174628,8 +176538,8 @@ self: {
     ({ mkDerivation, base, extra, filepath }:
      mkDerivation {
        pname = "record-dot-preprocessor";
-       version = "0.1";
-       sha256 = "1py5bkwxwwq1jjsa16rmjm92hxnil0clim5579h5mizzq47fczrd";
+       version = "0.1.1";
+       sha256 = "1lb60mggn6f350l3v54cavvwnyx5hrm6hlyrfhsjb5gq5qmids9m";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base extra filepath ];
@@ -174865,12 +176775,12 @@ self: {
     ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal
      , data-default-class, free, hspec, http-client, http-client-tls
      , http-types, network, text, time, transformers
-     , unordered-containers, vector
+     , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "reddit";
-       version = "0.2.2.2";
-       sha256 = "0k94rsnrnanjc7bwqfjzlk8l005gc3141mm8iqq680d8pdcgf8m8";
+       version = "0.2.3.0";
+       sha256 = "1hm1ax5h3p0avk4v3w08gac8mfiav8k9vd1vbkn77xlhxamp8jfi";
        libraryHaskellDepends = [
          aeson api-builder base bytestring data-default-class free
          http-client http-client-tls http-types network text time
@@ -174878,9 +176788,9 @@ self: {
        ];
        testHaskellDepends = [
          aeson api-builder base bytestring Cabal data-default-class hspec
-         http-client http-client-tls text time transformers
+         http-client http-client-tls text time transformers yaml
        ];
-       homepage = "https://github.com/intolerable/reddit";
+       homepage = "https://github.com/intolerable/reddit#readme";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178394,6 +180304,8 @@ self: {
        pname = "rethinkdb-client-driver";
        version = "0.0.25";
        sha256 = "15l9z7ki81cv97lajxcbddavbd254c5adcdi8yw6df31rmbc378g";
+       revision = "1";
+       editedCabalFile = "1hblwarlxjxq2lp52bjlqwdjsqlwm8ffqi2pj1n8zpidjv6m8330";
        libraryHaskellDepends = [
          aeson base binary bytestring containers hashable mtl network
          old-locale scientific stm template-haskell text time
@@ -181986,7 +183898,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
-  "sbv_7_7" = callPackage
+  "sbv_7_8" = callPackage
     ({ mkDerivation, array, async, base, bytestring, containers
      , crackNum, data-binary-ieee754, deepseq, directory, doctest
      , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
@@ -181995,8 +183907,8 @@ self: {
      }:
      mkDerivation {
        pname = "sbv";
-       version = "7.7";
-       sha256 = "0yf68qyp29kxgpdx5xdyx64vkn0dvfrizn5hq2xgrik0v9vb1ja0";
+       version = "7.8";
+       sha256 = "12k47j4xv08dl61qfz2g3dla8rwsx6s7yy5mfnv21c5d2x2bxk6i";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array async base containers crackNum data-binary-ieee754 deepseq
@@ -182609,30 +184521,6 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.6.0";
-       sha256 = "1rdwqw2xi1c6305vbxa0sfyl18rjgir7flbdz2pbdvaj3nw44lr4";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq hashable integer-gmp
-         integer-logarithms primitive text
-       ];
-       testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/basvandijk/scientific";
-       description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scientific_0_3_6_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, hashable, integer-gmp, integer-logarithms, primitive
      , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
@@ -182654,7 +184542,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -183357,6 +185244,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sdl2-fps" = callPackage
+    ({ mkDerivation, base, sdl2 }:
+     mkDerivation {
+       pname = "sdl2-fps";
+       version = "0.0.1";
+       sha256 = "0ci8p6qgs9nmpbypvk75ybz5kh36iiqaz4xl4lr2dbaq0y2d6iri";
+       libraryHaskellDepends = [ base sdl2 ];
+       homepage = "https://github.com/jxv/sdl2-fps#readme";
+       description = "Run of the mill, frames per second timer implementation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sdl2-gfx" = callPackage
     ({ mkDerivation, base, bytestring, lifted-base, linear
      , monad-control, SDL2, sdl2, SDL2_gfx, template-haskell, text
@@ -183419,6 +185318,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2_mixer;};
 
+  "sdl2-sprite" = callPackage
+    ({ mkDerivation, base, optparse-simple, sdl2, sdl2-image, split
+     , text
+     }:
+     mkDerivation {
+       pname = "sdl2-sprite";
+       version = "0.0.1";
+       sha256 = "12xlq32sjvz064fll14ymbxbk52akcp24dm5vfa1x0s41z0x6fnq";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base sdl2 sdl2-image ];
+       executableHaskellDepends = [
+         base optparse-simple sdl2 sdl2-image split text
+       ];
+       homepage = "https://github.com/chrisdone/sdl2-sprite#readme";
+       description = "Sprite previewer/animator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sdl2-ttf" = callPackage
     ({ mkDerivation, base, bytestring, SDL2, sdl2, SDL2_ttf
      , template-haskell, text, transformers
@@ -183983,6 +185901,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "self-extract" = callPackage
+    ({ mkDerivation, base, binary, bytestring, Cabal, extra, file-embed
+     , path, path-io, process, unix-compat
+     }:
+     mkDerivation {
+       pname = "self-extract";
+       version = "0.2.0.0";
+       sha256 = "1p1z4zy7s7j4sxx45lcspxvxf10v6vx80vgrw52acgbqnfairg7c";
+       libraryHaskellDepends = [
+         base binary bytestring Cabal extra file-embed path path-io process
+         unix-compat
+       ];
+       description = "A Haskell library to make self-extracting executables";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "selfrestart" = callPackage
     ({ mkDerivation, base, directory, executable-path, unix }:
      mkDerivation {
@@ -184961,8 +186895,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-aeson-specs";
-       version = "0.6.1.0";
-       sha256 = "0246bdrcy0rq0jyba2c945hlz8csaff9zakv0g5qpzylsc5dnwmd";
+       version = "0.6.2.0";
+       sha256 = "0q8xihvhzjycvwm8da69zg20fa6jynid0milgdbbsnicwh59cn86";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath hspec
          hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random
@@ -185791,8 +187725,8 @@ self: {
        pname = "servant-iCalendar";
        version = "0.1.0.1";
        sha256 = "15gqlb60r8msn3k1j8wjxq89qg6d790lnb751wabg2lsxybmdzas";
-       revision = "1";
-       editedCabalFile = "07jib9s2kg6srr1dj3l1bz0sp3fyikkvv7z0v2a62zl1c9z9xapx";
+       revision = "2";
+       editedCabalFile = "0c4d69rm08hpzlagl22qnnq9y85bp3zwix5h2hazr1m4na09hj1l";
        libraryHaskellDepends = [
          base data-default http-media iCalendar servant
        ];
@@ -185855,8 +187789,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-kotlin";
-       version = "0.1.1.0";
-       sha256 = "14z1vf4mj041ydps7nyfs0bmdpq0vb18xfscsq3i1f5hfr9swj50";
+       version = "0.1.1.1";
+       sha256 = "1spd6phk4n5llgbmydbdqyhlyx6bxr5rhx0rp2z4pnn1kn2qa3ry";
        libraryHaskellDepends = [
          base containers directory formatting lens servant servant-foreign
          text time wl-pprint-text
@@ -186180,27 +188114,27 @@ self: {
      }) {};
 
   "servant-quickcheck" = callPackage
-    ({ mkDerivation, aeson, base, base-compat, blaze-html, bytestring
-     , case-insensitive, clock, data-default-class, hspec, hspec-core
-     , hspec-discover, http-client, http-media, http-types, mtl, pretty
-     , process, QuickCheck, quickcheck-io, servant, servant-blaze
-     , servant-client, servant-server, split, string-conversions
-     , temporary, text, time, transformers, warp
+    ({ mkDerivation, aeson, base, base-compat-batteries, blaze-html
+     , bytestring, case-insensitive, clock, data-default-class, hspec
+     , hspec-core, hspec-discover, http-client, http-media, http-types
+     , mtl, pretty, process, QuickCheck, quickcheck-io, servant
+     , servant-blaze, servant-client, servant-server, split
+     , string-conversions, temporary, text, time, transformers, warp
      }:
      mkDerivation {
        pname = "servant-quickcheck";
-       version = "0.0.7.0";
-       sha256 = "1a0ipg1zds393ywjb1f5yphb23ccb39gv8rc6qv5b7y523cgwri2";
+       version = "0.0.7.2";
+       sha256 = "0zsf68c44yijmgkcd2qmcwz9p0kiix6dzhk3g4ifz60s6kv3jfbh";
        libraryHaskellDepends = [
-         aeson base base-compat bytestring case-insensitive clock
+         aeson base base-compat-batteries bytestring case-insensitive clock
          data-default-class hspec http-client http-media http-types mtl
          pretty process QuickCheck servant servant-client servant-server
          split string-conversions temporary text time warp
        ];
        testHaskellDepends = [
-         aeson base base-compat blaze-html bytestring hspec hspec-core
-         http-client QuickCheck quickcheck-io servant servant-blaze
-         servant-client servant-server text transformers warp
+         aeson base base-compat-batteries blaze-html bytestring hspec
+         hspec-core http-client QuickCheck quickcheck-io servant
+         servant-blaze servant-client servant-server text transformers warp
        ];
        testToolDepends = [ hspec-discover ];
        description = "QuickCheck entire APIs";
@@ -186546,6 +188480,8 @@ self: {
        pname = "servant-swagger-ui-core";
        version = "0.3";
        sha256 = "1ji54q9x787dr5l81qn0shw2n3b8k9aglli03gxfbvs0l7ga5xrd";
+       revision = "1";
+       editedCabalFile = "1dh2ra39x2syzg4lw1cklr7hgr52gp72f4iy5zw4zwgy27hbq48v";
        libraryHaskellDepends = [
          base blaze-markup bytestring http-media servant servant-blaze
          servant-server swagger2 text transformers transformers-compat
@@ -186669,8 +188605,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "011jxvr2i65bf0kmdn0sxkqgfz628a0sfhzphr1rqsmh8sqdj5y9";
-       revision = "18";
-       editedCabalFile = "038paj9z77rx6jc06vg5f4f9gvwaq73ggw7ppgrw6vwhsl4nd84q";
+       revision = "19";
+       editedCabalFile = "1hlfly2j0c3c4sbzbkbzvwgvfnngkmx0r67ddv4ccg2if6pc5nqv";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -187702,15 +189638,16 @@ self: {
 
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hashable
-     , hs2ats, language-ats, lens, shake, shake-ext, text
+     , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext
+     , text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.8.0.4";
-       sha256 = "036clj4q6rwgzjc3abirir5yqrn78vnj7c5w8p9b82jkrlka8w6g";
+       version = "1.8.0.5";
+       sha256 = "0hznrllvlw3ypd3ljlx6wlr3d7hkm8g2mrwpfscgvf4hk0lyj1hd";
        libraryHaskellDepends = [
-         base binary dependency directory hashable hs2ats language-ats lens
-         shake shake-ext text
+         base binary dependency directory hashable hs2ats language-ats
+         microlens microlens-th shake shake-ext text
        ];
        homepage = "https://github.com/vmchale/shake-ats#readme";
        description = "Utilities for building ATS projects with shake";
@@ -188074,6 +190011,78 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shapes" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , either, ghc-prim, hspec, lens, linear, mtl, QuickCheck
+     , shapes-math, transformers, vector, vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "shapes";
+       version = "0.1.0.0";
+       sha256 = "0kfhw97y5a0vs75w0as6jwm0zxlkwkxar2a0afqrxlcplgwxvnpi";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers deepseq either ghc-prim lens linear mtl
+         shapes-math transformers vector vector-th-unbox
+       ];
+       executableHaskellDepends = [
+         array base containers criterion deepseq either ghc-prim lens linear
+         mtl shapes-math transformers vector vector-th-unbox
+       ];
+       testHaskellDepends = [
+         array base containers deepseq either ghc-prim hspec lens linear mtl
+         QuickCheck shapes-math transformers vector vector-th-unbox
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "physics engine and other tools for 2D shapes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shapes-demo" = callPackage
+    ({ mkDerivation, array, base, containers, either, ghc-prim, lens
+     , linear, monad-extras, mtl, sdl2, shapes, StateVar, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "shapes-demo";
+       version = "0.1.0.0";
+       sha256 = "0ks0wnp2g1fdqwka03rw71dkpxvb89fvilx2avrxsh2cg1g1lari";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base containers either ghc-prim lens linear monad-extras mtl
+         sdl2 shapes StateVar text transformers vector
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "demos for the 'shapes' package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shapes-math" = callPackage
+    ({ mkDerivation, base, criterion, ghc-prim, hspec, linear
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "shapes-math";
+       version = "0.1.0.0";
+       sha256 = "13i5njr93kcwgra8wcj0hvj50ksqrcs2d4y7xb2hhj06c7r3w0xz";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ghc-prim QuickCheck template-haskell
+       ];
+       executableHaskellDepends = [
+         base criterion ghc-prim linear QuickCheck template-haskell
+       ];
+       testHaskellDepends = [
+         base ghc-prim hspec linear QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/ublubu/shapes#readme";
+       description = "faster vector/matrix math using unboxed numbers and Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sharc-timbre" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -188394,6 +190403,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_8_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
+     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
+     , system-fileio, system-filepath, text, time, transformers
+     , transformers-base, unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.8.0";
+       sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions lifted-async lifted-base monad-control mtl process
+         system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath hspec hspec-contrib HUnit lifted-async
+         lifted-base monad-control mtl process system-fileio system-filepath
+         text time transformers transformers-base unix-compat
+       ];
+       homepage = "https://github.com/yesodweb/Shelly.hs";
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -189409,6 +191449,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "simple-log_0_9_4" = callPackage
+    ({ mkDerivation, async, base, base-unicode-symbols, containers
+     , data-default, deepseq, directory, exceptions, filepath, hformat
+     , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
+     , text, time, transformers
+     }:
+     mkDerivation {
+       pname = "simple-log";
+       version = "0.9.4";
+       sha256 = "0chp90h9112sxa7ds0ldzdp59i6b1vy7chkqcb6d5mb9faq6vjqi";
+       libraryHaskellDepends = [
+         async base base-unicode-symbols containers data-default deepseq
+         directory exceptions filepath hformat microlens microlens-platform
+         mmorph mtl SafeSemaphore text time transformers
+       ];
+       testHaskellDepends = [ base hspec microlens-platform text ];
+       homepage = "http://github.com/mvoidex/simple-log";
+       description = "Simple log for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "simple-log-syslog" = callPackage
     ({ mkDerivation, base, hsyslog, simple-log, text }:
      mkDerivation {
@@ -189819,8 +191881,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.4.0.2";
-       sha256 = "0zqy3ffndyvz97wfs0ha0d5j6045gfdh0p6rmz6dv87j9mqmfpl0";
+       version = "0.4.0.6";
+       sha256 = "1ijwh5xsqiaykm8y39jz4vnzvcbdq2za77ahkb6l7nqfc5ryv5z1";
        libraryHaskellDepends = [ base QuickCheck vector ];
        testHaskellDepends = [
          base doctest doctest-driver-gen tasty tasty-quickcheck
@@ -190368,10 +192430,8 @@ self: {
      }:
      mkDerivation {
        pname = "size-based";
-       version = "0.1.0.0";
-       sha256 = "1h791s39nr057w5f2fr4v7p1czw9jm0dk5qrhr26qyw97j4ysngx";
-       revision = "2";
-       editedCabalFile = "1p4iglrrl5s47cxn520saiszw5wwr4x1kn9xbgn7awz29mv7pmd2";
+       version = "0.1.1.0";
+       sha256 = "1z6w3qdx34c6y4gbs0b9zshn5al55lxzc7mfyywm91vcwi361xki";
        libraryHaskellDepends = [
          base dictionary-sharing template-haskell testing-type-modifiers
        ];
@@ -190406,8 +192466,8 @@ self: {
      }:
      mkDerivation {
        pname = "sized-grid";
-       version = "0.1.0.0";
-       sha256 = "1dj5sgmr8114i5ldpdmybwbwg5gkbm30kbk2196pq65jjcvjinxx";
+       version = "0.1.1.0";
+       sha256 = "0qbn160pq5yz1916iir1s9hy1h4pkar8z50gh7i8v7j4nwhgiisk";
        libraryHaskellDepends = [
          adjunctions aeson base comonad constraints distributive
          generics-sop lens mtl random vector vector-space
@@ -190889,8 +192949,8 @@ self: {
      }:
      mkDerivation {
        pname = "slate";
-       version = "0.10.0.0";
-       sha256 = "0f21bmv0dckdim27mm5m7vphci45h6fjbxyzpahai2nlydilhnc6";
+       version = "0.11.0.0";
+       sha256 = "0y6l3cjlh0hkc3nch7fwvxpv2i5r9qv6r1kdi3savi0vp0dvgdy8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -191140,6 +193200,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "smallcheck_1_1_4" = callPackage
+    ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
+     mkDerivation {
+       pname = "smallcheck";
+       version = "1.1.4";
+       sha256 = "0x2p9rfsx0hvcmsq7v1m5qdgs9mvf4zrcpz4wywn4q8mr8hb416y";
+       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
+       homepage = "https://github.com/feuerbach/smallcheck";
+       description = "A property-based testing library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallcheck-laws" = callPackage
     ({ mkDerivation, base, smallcheck, smallcheck-series }:
      mkDerivation {
@@ -194102,8 +196175,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.1.6";
-       sha256 = "10kj0ir2i72q20jbp39n5v700pivbapkyvarql9hg5sci9s73g4s";
+       version = "0.0.2.0";
+       sha256 = "061bjgrvvvv2n6bhn0lz6sd5c7mc63nb2b83rbpgdx3am68mk9gf";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
@@ -194822,6 +196895,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "splitmix_0_0_1" = callPackage
+    ({ mkDerivation, async, base, base-compat-batteries, bytestring
+     , containers, criterion, deepseq, process, random, tf-random, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "splitmix";
+       version = "0.0.1";
+       sha256 = "0bvpx3hnyhz449s2c2mi5h78024yysnqldfwp7m0qr21m41q0v1a";
+       libraryHaskellDepends = [ base deepseq random time ];
+       testHaskellDepends = [
+         async base base-compat-batteries bytestring deepseq process random
+         tf-random vector
+       ];
+       benchmarkHaskellDepends = [
+         base containers criterion random tf-random
+       ];
+       description = "Fast Splittable PRNG";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "splitter" = callPackage
     ({ mkDerivation, base, directory, filepath, parsec, range }:
      mkDerivation {
@@ -195871,8 +197966,8 @@ self: {
        pname = "stack";
        version = "1.7.1";
        sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
-       revision = "1";
-       editedCabalFile = "12ym80mwlvg3zwbjhmby4k467hxa0yip0314w658ivn0sq6vgycw";
+       revision = "3";
+       editedCabalFile = "0ni953da0qiscnvbx70pd89myy2qq3chgkghmw6wg9xhzcz7nwgp";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -197135,14 +199230,14 @@ self: {
      }) {};
 
   "status-notifier-item" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dbus, filepath
-     , hslogger, lens, mtl, network, optparse-applicative, spool
-     , template-haskell, transformers, vector
+    ({ mkDerivation, base, bytestring, containers, dbus, dbus-hslogger
+     , filepath, hslogger, lens, mtl, network, optparse-applicative
+     , spool, template-haskell, transformers, vector
      }:
      mkDerivation {
        pname = "status-notifier-item";
-       version = "0.2.1.0";
-       sha256 = "1w81n87x70bqpskcp0nai9l8ry6hk518myn1cymi695x94vv9m6d";
+       version = "0.2.2.0";
+       sha256 = "19v7n1hv9ldrcv8h5wcv7lvshwzry0zm9qhvzspb5zvdawgy32zh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197150,7 +199245,7 @@ self: {
          spool template-haskell transformers vector
        ];
        executableHaskellDepends = [
-         base dbus hslogger optparse-applicative
+         base dbus dbus-hslogger hslogger optparse-applicative
        ];
        homepage = "https://github.com/IvanMalison/status-notifier-item#readme";
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
@@ -198095,15 +200190,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_21_0" = callPackage
+  "stratosphere_0_22_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.21.0";
-       sha256 = "14bahvq1yz51dwa6ljyj4l3aw3sv2njin00k01bvbizsqnbl8j8k";
+       version = "0.22.3";
+       sha256 = "1s6zc9d1kmgqicjk2d0mqqysg3jcva0d2fcygb2zxpdbiifrfz26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198333,6 +200428,8 @@ self: {
        pname = "streaming-attoparsec";
        version = "1.0.0";
        sha256 = "00k1vwqr7ns7s4r6xvq59kpwimqd0f02jj0ay4zg167dd5994a7z";
+       revision = "1";
+       editedCabalFile = "0ssikp3ckvlgh9px4v6ppjlyi7ch319j0l3s9a5z07j6fg3j4wkp";
        libraryHaskellDepends = [
          attoparsec base bytestring streaming streaming-bytestring
        ];
@@ -198549,10 +200646,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-eversion";
-       version = "0.3.1.1";
-       sha256 = "13fsl7mckinymkvysmzcnc4vpyapdiwb2k57yhq15x5y6b6scxs2";
-       revision = "1";
-       editedCabalFile = "0abjya3b9fgnk9njyrf4hpar0ldji43m1d3mdh2ax5v54k81ishs";
+       version = "0.4.0.0";
+       sha256 = "19zaf8z13sdp0ri9y3p7izd29lik2x279kgj9v4sfzsslwr2wllc";
        libraryHaskellDepends = [
          base foldl pipes streaming transformers
        ];
@@ -198768,6 +200863,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streamly_0_2_0" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, deepseq
+     , exceptions, gauge, hspec, lifted-base, lockfree-queue
+     , monad-control, mtl, QuickCheck, random, stm, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "streamly";
+       version = "0.2.0";
+       sha256 = "1vbzyvmdzhjxpjd4pq4lkn6y0s2yxiziypp4vf9pvwmy1bq5dk0f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers exceptions lifted-base
+         lockfree-queue monad-control mtl stm transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck random transformers
+       ];
+       benchmarkHaskellDepends = [ base deepseq gauge random ];
+       homepage = "https://github.com/composewell/streamly";
+       description = "Beautiful Streaming, Concurrent and Reactive Composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streamproc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -199919,6 +202040,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "subsample" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers
+     , optparse-generic, random-fu, text, vector
+     }:
+     mkDerivation {
+       pname = "subsample";
+       version = "0.1.0.0";
+       sha256 = "1ahl7vjsg0by3q9zfkfqslvpq3p9v5754iippi2f5z8rax1s7di0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers random-fu text vector ];
+       executableHaskellDepends = [
+         base bytestring cassava containers optparse-generic text vector
+       ];
+       homepage = "http://github.com/GregorySchwartz/subsample#readme";
+       description = "Subsample data";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "substring-parser" = callPackage
     ({ mkDerivation, attoparsec, base, dlist, hspec, NoTrace
      , QuickCheck, text
@@ -200560,14 +202700,12 @@ self: {
      }:
      mkDerivation {
        pname = "svg-builder";
-       version = "0.1.0.2";
-       sha256 = "0m7fpxh2viafcfm04xzy64jakx5c0p5wcam3bdwxgmj3r3q0qjc1";
-       revision = "1";
-       editedCabalFile = "1h3bzkimiydj5j2rh7cyp5bhphvy6hglpkidhlfwy520sqsw3zvx";
+       version = "0.1.1";
+       sha256 = "1k420f497lzkymmxin88ql6ib8dziic43avykv31yq65rgrf7l2g";
        libraryHaskellDepends = [
          base blaze-builder bytestring hashable text unordered-containers
        ];
-       homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git";
+       homepage = "https://github.com/diagrams/svg-builder.git";
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200748,8 +202886,8 @@ self: {
      }:
      mkDerivation {
        pname = "swagger-petstore";
-       version = "0.0.1.8";
-       sha256 = "1rslv21lg7jfc6vb8yyb6kkg3cma2300h4hld3m8zwfxgzcq79h7";
+       version = "0.0.2.0";
+       sha256 = "10sd2agpmj4iiza850w6klqh5jv873kfmvp5qimsqcfaxdwszc5i";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring case-insensitive containers
          deepseq exceptions http-api-data http-client http-client-tls
@@ -200761,8 +202899,8 @@ self: {
          aeson base bytestring containers hspec iso8601-time mtl QuickCheck
          semigroups text time transformers unordered-containers vector
        ];
-       homepage = "https://github.com/swagger-api/swagger-codegen#readme";
-       description = "Auto-generated swagger-petstore API Client";
+       homepage = "https://openapi-generator.tech";
+       description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -203426,6 +205564,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty_1_1_0_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl
+     , optparse-applicative, stm, tagged, unbounded-delays, unix
+     }:
+     mkDerivation {
+       pname = "tasty";
+       version = "1.1.0.1";
+       sha256 = "09mbqjak66wynacddn399hh9dqcmgxg4gdn2492g538dj55lmjdw";
+       libraryHaskellDepends = [
+         ansi-terminal async base clock containers mtl optparse-applicative
+         stm tagged unbounded-delays unix
+       ];
+       homepage = "https://github.com/feuerbach/tasty";
+       description = "Modern and extensible testing framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-ant-xml" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
@@ -203444,6 +205600,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-ant-xml_1_1_4" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
+     , xml
+     }:
+     mkDerivation {
+       pname = "tasty-ant-xml";
+       version = "1.1.4";
+       sha256 = "0v0gsb90kh6hwlgxbclzawsskywc6yf7n8xhiifia97l4y0yx2m8";
+       libraryHaskellDepends = [
+         base containers directory filepath generic-deriving ghc-prim mtl
+         stm tagged tasty transformers xml
+       ];
+       homepage = "http://github.com/ocharles/tasty-ant-xml";
+       description = "Render tasty output to XML for Jenkins";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-auto" = callPackage
     ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec
      , tasty-hunit, tasty-quickcheck, tasty-smallcheck
@@ -203478,12 +205653,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_1_2_0_0" = callPackage
+  "tasty-dejafu_1_2_0_2" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.2.0.0";
-       sha256 = "0dhrcra1vzrw7xxnph28iz3c9pkmkhza0m9xjb9qxc75p2f684p3";
+       version = "1.2.0.2";
+       sha256 = "145w018mv8928g9bbp5pjwzciyfspxxqdg5grzq0mlpydkpmmgr5";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
@@ -203615,8 +205790,8 @@ self: {
        pname = "tasty-hedgehog";
        version = "0.2.0.0";
        sha256 = "10m1akbiblnjq9ljk469725k30b254d36d267rk51z2f171py42s";
-       revision = "3";
-       editedCabalFile = "1r1sbcz12j9kmbdfr7mjc6z22c3737jc7mf0kdk1v6a3zr6n1js9";
+       revision = "4";
+       editedCabalFile = "04d7lhn0dlqna0pqz7wxmz2y6vq7qar2m2g432z38cvm5na9w4y0";
        libraryHaskellDepends = [ base hedgehog tagged tasty ];
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
@@ -203859,6 +206034,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-rerun_1_1_12" = callPackage
+    ({ mkDerivation, base, containers, mtl, optparse-applicative
+     , reducers, split, stm, tagged, tasty, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-rerun";
+       version = "1.1.12";
+       sha256 = "05lp4zy6lwd916snq6hs43848n62j9vdfl3s8sfivqydrax0vvd8";
+       libraryHaskellDepends = [
+         base containers mtl optparse-applicative reducers split stm tagged
+         tasty transformers
+       ];
+       homepage = "http://github.com/ocharles/tasty-rerun";
+       description = "Run tests by filtering the test tree depending on the result of previous test runs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-silver" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
@@ -203913,6 +206106,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-stats_0_2_0_4" = callPackage
+    ({ mkDerivation, base, containers, directory, process, stm, tagged
+     , tasty, time
+     }:
+     mkDerivation {
+       pname = "tasty-stats";
+       version = "0.2.0.4";
+       sha256 = "0z244l1yl1m77i4nvs9db2v6a2ydgcpgyc78hzgfyin7as002kd6";
+       libraryHaskellDepends = [
+         base containers directory process stm tagged tasty time
+       ];
+       homepage = "https://github.com/minad/tasty-stats#readme";
+       description = "Collect statistics of your Tasty testsuite";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-tap" = callPackage
     ({ mkDerivation, base, containers, directory, stm, tasty
      , tasty-golden, tasty-hunit
@@ -205770,6 +207980,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "testing-feat_1_0_1_0" = callPackage
+    ({ mkDerivation, base, QuickCheck, size-based
+     , testing-type-modifiers
+     }:
+     mkDerivation {
+       pname = "testing-feat";
+       version = "1.0.1.0";
+       sha256 = "0f3b4q97nwgk6gdcg0475r7g15hbghdp8vh7iiw6lrp87v7w00b3";
+       libraryHaskellDepends = [
+         base QuickCheck size-based testing-type-modifiers
+       ];
+       homepage = "https://github.com/JonasDuregard/testing-feat";
+       description = "Functional Enumeration of Algebraic Types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "testing-type-modifiers" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -205926,6 +208153,30 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "texmath_0_11" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, pandoc-types, parsec, process, split, syb, temporary, text
+     , utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.11";
+       sha256 = "1sssa9ld13bhs4b6cpv5mwf18bjajr8fgw32g4wp2smgv9p2jv9f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -206776,6 +209027,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-utf8" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq
+     , directory, ghc-prim, HUnit, integer-gmp, QuickCheck
+     , quickcheck-unicode, random, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "text-utf8";
+       version = "1.2.3.0";
+       sha256 = "17xgi57wnjq06k0zllyj0k7jqfxridhczc1dzrg65vdrmzf8x31a";
+       libraryHaskellDepends = [
+         array base binary bytestring deepseq ghc-prim integer-gmp
+       ];
+       testHaskellDepends = [
+         array base binary bytestring deepseq directory ghc-prim HUnit
+         integer-gmp QuickCheck quickcheck-unicode random test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/text-utf8";
+       description = "An efficient packed UTF-8 backed Unicode text type";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "text-utils" = callPackage
     ({ mkDerivation, base, HTF, text }:
      mkDerivation {
@@ -207358,6 +209632,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "th-lift_0_7_10" = callPackage
+    ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
+     }:
+     mkDerivation {
+       pname = "th-lift";
+       version = "0.7.10";
+       sha256 = "13c89mr9g4jwrmqxx882ygr1lkvj1chw29p80qv2f3g5wnhlgkmr";
+       libraryHaskellDepends = [
+         base ghc-prim template-haskell th-abstraction
+       ];
+       testHaskellDepends = [ base ghc-prim template-haskell ];
+       homepage = "http://github.com/mboes/th-lift";
+       description = "Derive Template Haskell's Lift class for datatypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-lift-instances" = callPackage
     ({ mkDerivation, base, bytestring, containers, QuickCheck
      , template-haskell, text, th-lift, vector
@@ -210129,14 +212420,39 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "tomland" = callPackage
+    ({ mkDerivation, base, hashable, hedgehog, megaparsec, mtl
+     , parser-combinators, tasty, tasty-hedgehog, tasty-hspec, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "tomland";
+       version = "0.0.0";
+       sha256 = "1z6xlaw7fvl95h5nhd1r87bn8y3xv5gmfwfvryaj7hn06ghw13z2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base hashable megaparsec mtl parser-combinators text time
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base text time unordered-containers ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-hedgehog tasty-hspec text
+         unordered-containers
+       ];
+       homepage = "https://github.com/kowainik/tomland";
+       description = "TOML parser";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "tomlcheck" = callPackage
     ({ mkDerivation, base, htoml-megaparsec, megaparsec
      , optparse-generic, text
      }:
      mkDerivation {
        pname = "tomlcheck";
-       version = "0.1.0.23";
-       sha256 = "0m58rrjrrd2n1w313806s9gyj840nzsm7vwdz40639mr3a6vaifg";
+       version = "0.1.0.29";
+       sha256 = "1blq3yjzd39fjpavjl5k3567algdl424l0al0rvr25xd239kvwzg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -210901,12 +213217,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "transformers-compat_0_6_1_6" = callPackage
+  "transformers-compat_0_6_2" = callPackage
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "transformers-compat";
-       version = "0.6.1.6";
-       sha256 = "0db1l90pp4f1b829b3gv6xxklc8cnhkqq383rzd7r9b4hyjdvpmx";
+       version = "0.6.2";
+       sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim for the transformers library";
@@ -210993,14 +213309,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "transformers-either_0_1_0" = callPackage
+  "transformers-either_0_1_1" = callPackage
     ({ mkDerivation, base, exceptions, text, transformers }:
      mkDerivation {
        pname = "transformers-either";
-       version = "0.1.0";
-       sha256 = "18a99isv93yf65b6j4863j23ss9j1mp1f815sblhgs2xaywswhvm";
-       revision = "1";
-       editedCabalFile = "1bhkkh73irjql1jhxdcrv1igmf0hqpnw2p0w1s6fwhiidx64kvy9";
+       version = "0.1.1";
+       sha256 = "1hjkiz3dhk4dp8a4lgpyns4nd867lg7ydq4r4zf57w4i6ys7j4l7";
        libraryHaskellDepends = [ base exceptions text transformers ];
        homepage = "http://github.com/tmcgilchrist/transformers-either/";
        description = "An Either monad transformer";
@@ -212871,8 +215185,8 @@ self: {
      }:
      mkDerivation {
        pname = "twilio";
-       version = "0.2.0.0";
-       sha256 = "0shjhdb3iabbs7hy89hv3fawzxilc7djgpacgydnzl2290dm17yl";
+       version = "0.2.0.1";
+       sha256 = "0qj2v4m30ik0qk2m9wghkgbhklql4jnyb0cnyfpip4yn1lczp34s";
        libraryHaskellDepends = [
          aeson base binary bytestring containers deepseq errors exceptions
          free hashable http-client http-client-tls http-types mtl
@@ -214850,8 +217164,8 @@ self: {
      }:
      mkDerivation {
        pname = "unbound-generics";
-       version = "0.3.2";
-       sha256 = "1g691ijcn7yxmn7w0zmd4h9w8nr578jifg3yhlyckka2jm97f20g";
+       version = "0.3.3";
+       sha256 = "06md35jmm8xas8dywxxc62nq4d6gi66m7bm4h3920jpvknqwbvbz";
        libraryHaskellDepends = [
          ansi-wl-pprint base containers contravariant deepseq exceptions mtl
          profunctors template-haskell transformers transformers-compat
@@ -217280,8 +219594,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "util";
-       version = "0.1.10.0";
-       sha256 = "1cp7vxhg6m02j7zj7z6zss38rsykrk596qakzczsxjx7yraxwdxb";
+       version = "0.1.10.1";
+       sha256 = "1z3k6x6ap1hjp53w9dnqx8d7pwpbgsabj3dlxcdg5pvr6m3ns184";
        libraryHaskellDepends = [ base ];
        description = "Utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -217528,8 +219842,8 @@ self: {
        pname = "uuid";
        version = "1.3.13";
        sha256 = "09xhk42yhxvqmka0iqrv3338asncz8cap3j0ic0ps896f2581b6z";
-       revision = "1";
-       editedCabalFile = "0yp01hzsw07d9ismqqkkzwqllfnyyhzhjmwhbhgmkb6v7y7iqrbm";
+       revision = "2";
+       editedCabalFile = "0m185q62jkfb5jsv358nxbnrkv8y8hd0qqvgvh22wvc5g9ipz0r9";
        libraryHaskellDepends = [
          base binary bytestring cryptohash-md5 cryptohash-sha1 entropy
          network-info random text time uuid-types
@@ -218037,12 +220351,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-bytestring_0_3_0_0" = callPackage
+  "validity-bytestring_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, validity }:
      mkDerivation {
        pname = "validity-bytestring";
-       version = "0.3.0.0";
-       sha256 = "1yxrpwxqn0262262j27sf1nb6iw6fnirypivnmpw0ghml28w7aym";
+       version = "0.3.0.1";
+       sha256 = "1jp1d72qr9axngzgq18k0kvvmc2x8yndpnh9g52zcmm66nkhn2d9";
        libraryHaskellDepends = [ base bytestring validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for bytestring";
@@ -218062,12 +220376,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-containers_0_3_0_0" = callPackage
+  "validity-containers_0_3_0_1" = callPackage
     ({ mkDerivation, base, containers, validity }:
      mkDerivation {
        pname = "validity-containers";
-       version = "0.3.0.0";
-       sha256 = "1jh2f46x5gwhb5i5bmqn1vdn27way0nk7q2gphyjb62zrg3d3zq5";
+       version = "0.3.0.1";
+       sha256 = "0ksqyr335f0d686j0slpzyph7663xiyv86rblgiaqjjwbj9y1jqf";
        libraryHaskellDepends = [ base containers validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
@@ -218087,14 +220401,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-path_0_3_0_0" = callPackage
+  "validity-path_0_3_0_1" = callPackage
     ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path
      , validity
      }:
      mkDerivation {
        pname = "validity-path";
-       version = "0.3.0.0";
-       sha256 = "1ijrzfk9jhlxxcdjqdq4cqz7ir7k7z9zrbamb18zai99hb6gg066";
+       version = "0.3.0.1";
+       sha256 = "1mfd062p9wh63qnz4a06rj7179lyllfc97g60cmpnjspmcdgy1ky";
        libraryHaskellDepends = [ base filepath path validity ];
        testHaskellDepends = [
          base filepath genvalidity-hspec hspec path validity
@@ -218117,12 +220431,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-scientific_0_2_0_0" = callPackage
+  "validity-scientific_0_2_0_1" = callPackage
     ({ mkDerivation, base, scientific, validity }:
      mkDerivation {
        pname = "validity-scientific";
-       version = "0.2.0.0";
-       sha256 = "0l4mzrhn6yhqd6kz7rwfvrqxk0dhwvfkh40pfjyzbkg5mvd1drhh";
+       version = "0.2.0.1";
+       sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw";
        libraryHaskellDepends = [ base scientific validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for scientific";
@@ -218142,12 +220456,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-text_0_3_0_0" = callPackage
+  "validity-text_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, text, validity }:
      mkDerivation {
        pname = "validity-text";
-       version = "0.3.0.0";
-       sha256 = "190gkwa3b4rnhmah9idivvrv0val4crv8y3qy9s0aa44kpcj2b8m";
+       version = "0.3.0.1";
+       sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf";
        libraryHaskellDepends = [ base bytestring text validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
@@ -218167,12 +220481,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-time_0_2_0_0" = callPackage
+  "validity-time_0_2_0_1" = callPackage
     ({ mkDerivation, base, time, validity }:
      mkDerivation {
        pname = "validity-time";
-       version = "0.2.0.0";
-       sha256 = "0rp1y2xq3h18ji3vaiv3w76kkdyql5y8xxxz730za6mrf1ffbnk4";
+       version = "0.2.0.1";
+       sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf";
        libraryHaskellDepends = [ base time validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for time";
@@ -218194,12 +220508,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-unordered-containers_0_2_0_0" = callPackage
+  "validity-unordered-containers_0_2_0_1" = callPackage
     ({ mkDerivation, base, hashable, unordered-containers, validity }:
      mkDerivation {
        pname = "validity-unordered-containers";
-       version = "0.2.0.0";
-       sha256 = "08jw6acvi016lxkw6rzxfxfcx56nwfi6ka52flkq2ks8038y3syy";
+       version = "0.2.0.1";
+       sha256 = "11pwrd1jbxdffw1lqq6zxgpgzvxrg4y01wnrn5bzwksiqzach742";
        libraryHaskellDepends = [
          base hashable unordered-containers validity
        ];
@@ -218221,12 +220535,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-uuid_0_1_0_0" = callPackage
+  "validity-uuid_0_1_0_1" = callPackage
     ({ mkDerivation, base, uuid, validity }:
      mkDerivation {
        pname = "validity-uuid";
-       version = "0.1.0.0";
-       sha256 = "129h7cjgixq6l29n3y66zcx5ynfnxz3prqkgf2028f6w4mhd0154";
+       version = "0.1.0.1";
+       sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n";
        libraryHaskellDepends = [ base uuid validity ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for uuid";
@@ -218246,12 +220560,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "validity-vector_0_2_0_0" = callPackage
+  "validity-vector_0_2_0_1" = callPackage
     ({ mkDerivation, base, hashable, validity, vector }:
      mkDerivation {
        pname = "validity-vector";
-       version = "0.2.0.0";
-       sha256 = "0kyyrcwxial9csyx40vrl0frz5yrmzqhjpy1cz8afsc7r4ph12yi";
+       version = "0.2.0.1";
+       sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
        libraryHaskellDepends = [ base hashable validity vector ];
        homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for vector";
@@ -219063,14 +221377,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-sized_1_0_1_0" = callPackage
+  "vector-sized_1_0_2_0" = callPackage
     ({ mkDerivation, adjunctions, base, deepseq, distributive
      , finite-typelits, indexed-list-literals, primitive, vector
      }:
      mkDerivation {
        pname = "vector-sized";
-       version = "1.0.1.0";
-       sha256 = "0p3bwqdz3k1a3ya7bj80d6crpbsk62wcvl6rkpkr0snqh4zq87zl";
+       version = "1.0.2.0";
+       sha256 = "0ac9bx5pcf9hbm1i9ibw3x52j0a92j8y7svm4b3d65p85mxqhc69";
        libraryHaskellDepends = [
          adjunctions base deepseq distributive finite-typelits
          indexed-list-literals primitive vector
@@ -219334,6 +221648,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "verifiable-expressions" = callPackage
+    ({ mkDerivation, base, containers, lens, mtl, sbv, transformers
+     , union, vinyl
+     }:
+     mkDerivation {
+       pname = "verifiable-expressions";
+       version = "0.4.0";
+       sha256 = "0s0wqhss8155xy2gkdwylvp61cn0ra5245fa5l2k9rvqr8xxrfkd";
+       libraryHaskellDepends = [
+         base containers lens mtl sbv transformers union vinyl
+       ];
+       description = "An intermediate language for Hoare logic style verification";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "verify" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, containers, either
      , hspec, jwt, QuickCheck, text, text-conversions, time
@@ -221692,8 +224021,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.10.1";
-       sha256 = "1ahlvyplg1mh3w2yxag0nk67w13k70rff77b96grgr48a8b9b82g";
+       version = "0.10.2";
+       sha256 = "0nhimzkws5v7qpfv305lp41qm61q0xxny5vvs0d26jarnmar9crq";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive containers
          cookie data-default-class filepath http-types mime-types
@@ -221773,6 +224102,25 @@ self: {
        license = "unknown";
      }) {};
 
+  "wai-session_0_3_3" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , bytestring-builder, containers, cookie, entropy, http-types
+     , StateVar, time, transformers, vault, wai
+     }:
+     mkDerivation {
+       pname = "wai-session";
+       version = "0.3.3";
+       sha256 = "0lq0gqndb9simd1zkz355m604dwrpcdwxcl3bgagi6kb8h12fffj";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder containers cookie
+         entropy http-types StateVar time transformers vault wai
+       ];
+       homepage = "https://github.com/singpolyma/wai-session";
+       description = "Flexible session middleware for WAI";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-session-alt" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, cookie
      , http-types, time, vault, wai-transformers
@@ -222854,8 +225202,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.7.1.0";
-       sha256 = "0ckxnnp5aqcd13p5gnk1nx7ysws6x7nmfklxqllilpzdh5ibyj59";
+       version = "0.7.2.0";
+       sha256 = "15d0l5cvrncwmy27qk7y7f54snw1fjcsll52sdlmk3v2mpf6nppn";
        libraryHaskellDepends = [
          aeson async base basement bytestring cereal cryptonite data-default
          exceptions generics-sop http-client machines memory mtl parsec
@@ -223292,8 +225640,8 @@ self: {
      }:
      mkDerivation {
        pname = "websockets";
-       version = "0.12.4.0";
-       sha256 = "1sq488nm8bjrg1q9vypag9pd8vljfibx3kacgkcfi1zqmr14x8x3";
+       version = "0.12.4.1";
+       sha256 = "1qr9sjjnllf6y2k5knyrck9nnh3s7z6nid8a0z5vsvmmvr37fa4j";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -223434,6 +225782,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets-snap_0_10_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
+     , mtl, snap-core, snap-server, websockets
+     }:
+     mkDerivation {
+       pname = "websockets-snap";
+       version = "0.10.3.0";
+       sha256 = "1r1v6ypnaap99vy2gh3lmghqv2y3zaaq0wiv4d2bn49179c40jmk";
+       libraryHaskellDepends = [
+         base bytestring bytestring-builder io-streams mtl snap-core
+         snap-server websockets
+       ];
+       description = "Snap integration for the websockets library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "webwire" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , bytestring, case-insensitive, containers, cookie, cprng-aes
@@ -223524,6 +225889,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weigh_0_0_12" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
+     mkDerivation {
+       pname = "weigh";
+       version = "0.0.12";
+       sha256 = "0zw2a997gxgdzqmd7j730kxgynzmjvvlkw84dajmfzf1v9pbij7x";
+       libraryHaskellDepends = [
+         base deepseq mtl process split temporary
+       ];
+       testHaskellDepends = [ base deepseq ];
+       homepage = "https://github.com/fpco/weigh#readme";
+       description = "Measure allocations of a Haskell functions/values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weighted" = callPackage
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
@@ -224201,6 +226582,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wizard" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "wizard";
+       version = "0.1.0.0";
+       sha256 = "0j485hbk42ipmc14ydickfm268b7z183rs37ih3j99lbzrdm1s8l";
+       libraryHaskellDepends = [ base transformers ];
+       homepage = "https://github.com/chessai/wizard.git";
+       description = "the fantastical wizard monoid";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wizards" = callPackage
     ({ mkDerivation, base, containers, control-monad-free, haskeline
      , mtl, transformers
@@ -224456,8 +226849,8 @@ self: {
      }:
      mkDerivation {
        pname = "wolf";
-       version = "0.3.44";
-       sha256 = "096j1f0xzjrnk8z7niyx19w05nx5222rgfbhgx8df8jwhfz0ymw7";
+       version = "0.3.45";
+       sha256 = "0l3jp2qqscy2fq5fvaq83hsh68f1d5xg97k2dhyc01zc6fd5jqi8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -224485,6 +226878,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "word" = callPackage
+    ({ mkDerivation, base, Fin, natural-induction, peano, smallcheck
+     , tasty, tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "word";
+       version = "0.1.0.1";
+       sha256 = "1k7hz3w8isbdmj0f2klyj4drrk31lbs3fzdnin7pas7l0ai286qf";
+       libraryHaskellDepends = [
+         base Fin natural-induction peano transformers
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       description = "Words of arbitrary size";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "word-trie" = callPackage
     ({ mkDerivation, base, binary, containers, hspec, QuickCheck }:
      mkDerivation {
@@ -224595,10 +227004,8 @@ self: {
      }:
      mkDerivation {
        pname = "wordchoice";
-       version = "0.1.2.6";
-       sha256 = "16x595vv9fbq6j634a8wqnd1agmzbv09372sc99lq1a997crmq2w";
-       revision = "1";
-       editedCabalFile = "1igc5fc91ilva7yqhcmdsd6yq6q974ybb2hwk856cpqpmas0402j";
+       version = "0.1.2.7";
+       sha256 = "06xz5xk14fiy1z4j6q7lbjwj13m4hy22pzrcdwk6c078w85rp4yd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -226013,10 +228420,10 @@ self: {
      }:
      mkDerivation {
        pname = "xeno";
-       version = "0.3.3";
-       sha256 = "034d38kcgpil1xf32cl131jh7b0x8awhxwv1nnc790x5wn876c0x";
+       version = "0.3.4";
+       sha256 = "1srlyg0wc2mwsa84isv0brcbwsrw6i7jbi0b2mjhnhd6d7cmcajs";
        libraryHaskellDepends = [
-         array base bytestring deepseq mtl mutable-containers vector
+         array base bytestring deepseq hspec mtl mutable-containers vector
        ];
        testHaskellDepends = [ base bytestring hexml hspec ];
        benchmarkHaskellDepends = [
@@ -228121,37 +230528,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
-     , conduit, containers, directory, filepath, hspec, HUnit, libyaml
-     , mockery, resourcet, scientific, semigroups, template-haskell
-     , temporary, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.29";
-       sha256 = "0x0gs80cq83i65b7g1xg6dvggkxlxhn1qs3py63c4wsjsplmyphs";
-       revision = "1";
-       editedCabalFile = "0hxmf36ydqr0gdwiagp57df7fxwhfy99r6s7mj861m8rflha0dks";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         filepath resourcet scientific semigroups template-haskell text
-         transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       testHaskellDepends = [
-         aeson base base-compat bytestring conduit directory hspec HUnit
-         mockery resourcet temporary text transformers unordered-containers
-         vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_30" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
      , mockery, resourcet, scientific, semigroups, template-haskell
@@ -228178,7 +230554,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-combinators" = callPackage
@@ -228505,19 +230880,20 @@ self: {
 
   "yarn-lock" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, containers, either
-     , megaparsec, neat-interpolation, protolude, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-th, text
+     , megaparsec, neat-interpolation, protolude, quickcheck-instances
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-th, text
      }:
      mkDerivation {
        pname = "yarn-lock";
-       version = "0.4.0";
-       sha256 = "1s95xdwshsvplv1406a4bn1v8xjhppfmhzf4302s9h41ai7b6wni";
+       version = "0.4.1";
+       sha256 = "1jhw8ss2psap2shl8spwqbdvxchmvfxb354asvdjjgld608xz8wk";
        libraryHaskellDepends = [
          base containers either megaparsec protolude text
        ];
        testHaskellDepends = [
          ansi-wl-pprint base containers either megaparsec neat-interpolation
-         protolude tasty tasty-hunit tasty-quickcheck tasty-th text
+         protolude quickcheck-instances tasty tasty-hunit tasty-quickcheck
+         tasty-th text
        ];
        homepage = "https://github.com/Profpatsch/yarn-lock#readme";
        description = "Represent and parse yarn.lock files";
@@ -229297,6 +231673,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-bin_1_6_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
+     , bytestring, Cabal, conduit, conduit-extra, containers
+     , data-default-class, directory, file-embed, filepath, fsnotify
+     , http-client, http-client-tls, http-reverse-proxy, http-types
+     , network, optparse-applicative, parsec, process, project-template
+     , resourcet, say, shakespeare, split, stm, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp
+     , warp-tls, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.6.0.3";
+       sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         attoparsec base base64-bytestring blaze-builder bytestring Cabal
+         conduit conduit-extra containers data-default-class directory
+         file-embed filepath fsnotify http-client http-client-tls
+         http-reverse-proxy http-types network optparse-applicative parsec
+         process project-template resourcet say shakespeare split stm
+         streaming-commons tar template-haskell text time transformers
+         transformers-compat unix-compat unliftio unordered-containers wai
+         wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-bootstrap" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types
      , shakespeare, text, transformers, yesod-core, yesod-elements
@@ -229440,46 +231849,6 @@ self: {
      }) {};
 
   "yesod-core" = callPackage
-    ({ mkDerivation, aeson, async, auto-update, base, blaze-html
-     , blaze-markup, byteable, bytestring, case-insensitive, cereal
-     , clientsession, conduit, conduit-extra, containers, cookie
-     , deepseq, deepseq-generics, directory, fast-logger, gauge, hspec
-     , hspec-expectations, http-types, HUnit, monad-logger, mtl, network
-     , old-locale, parsec, path-pieces, primitive, QuickCheck, random
-     , resourcet, safe, semigroups, shakespeare, streaming-commons
-     , template-haskell, text, time, transformers, unix-compat, unliftio
-     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
-     , word8
-     }:
-     mkDerivation {
-       pname = "yesod-core";
-       version = "1.6.4";
-       sha256 = "09r714ibpml8mqbqhnckync5a0kb7fyz079m9lapmvhq1yvl4zld";
-       libraryHaskellDepends = [
-         aeson auto-update base blaze-html blaze-markup byteable bytestring
-         case-insensitive cereal clientsession conduit conduit-extra
-         containers cookie deepseq deepseq-generics directory fast-logger
-         http-types monad-logger mtl old-locale parsec path-pieces primitive
-         random resourcet safe semigroups shakespeare template-haskell text
-         time transformers unix-compat unliftio unordered-containers vector
-         wai wai-extra wai-logger warp word8
-       ];
-       testHaskellDepends = [
-         async base bytestring clientsession conduit conduit-extra
-         containers cookie hspec hspec-expectations http-types HUnit network
-         path-pieces QuickCheck random resourcet shakespeare
-         streaming-commons template-haskell text transformers unliftio wai
-         wai-extra
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring gauge shakespeare text transformers
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "Creation of type-safe, RESTful web applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-core_1_6_5" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-html
      , blaze-markup, byteable, bytestring, case-insensitive, cereal
      , clientsession, conduit, conduit-extra, containers, cookie
@@ -229517,7 +231886,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-crud" = callPackage
@@ -231804,10 +234172,8 @@ self: {
      }:
      mkDerivation {
        pname = "z3";
-       version = "4.3";
-       sha256 = "1c29zzc6y7l169hdj9278z95530h6hc161fxgfn4zlxs3k5611d1";
-       revision = "1";
-       editedCabalFile = "0spg0sqqra4h5k5zagmmhh0sh10p3bzrhgrfspcd3i5c7yymwagb";
+       version = "4.3.1";
+       sha256 = "0fsddp5267bpmccg2hhra4z8isqmrdgcp0i0amrxsacgyqa4iqbv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
@@ -232178,8 +234544,8 @@ self: {
      }:
      mkDerivation {
        pname = "zifter";
-       version = "0.0.1.7";
-       sha256 = "1gdrnxa23lk885ldbn72n136acjfv8l0bnpf5v0lnypzl1hwp4rk";
+       version = "0.0.1.8";
+       sha256 = "1vzl6gl2lism0nv5n9hs5mmprfkxp0ajr0ysrn21xwajbbnakcw2";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions filepath
          optparse-applicative path path-io process safe stm validity

From d83d20c11b426297784b7bc19c2b13254c67ebf6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 15:27:40 +0200
Subject: [PATCH 2140/3370] haskell-pandoc: update override for ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 12fd59748307..25ac8b2269fc 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -451,7 +451,7 @@ self: super: {
   hpack = self.hpack_0_28_2;
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
-  pandoc = self.pandoc_2_2;
+  pandoc = self.pandoc_2_2_1;
   pandoc-types = self.pandoc-types_1_17_4_2;
   wl-pprint-text = self.wl-pprint-text_1_2_0_0;
   base-compat = self.base-compat_0_10_1;

From 5b2490d53eb0d2b7b4182bf8153a35ca5cba6922 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 15:29:18 +0200
Subject: [PATCH 2141/3370] all-cabal-hashes: update to latest version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 1ef00de5b83b..46ce08fe8cf2 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a2febcad5a83b15dea74462890e3c48c13f55f1.tar.gz";
-  sha256 = "1z6mfk49hsxvcpv183wayirspx78xd1l0w42wf8mfyf0jh8grfff";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7988bc2977184737900cc54b2dda27af6921f5ee.tar.gz";
+  sha256 = "1zagnnab5z3zymniw5rrdahlxrfpnyf30iysa1lylgwlscnzfv0l";
 }

From b558e437533a7177f0fce894fc9f66b738a12d0f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 19:22:19 +0200
Subject: [PATCH 2142/3370] haskell-hspec: use version 2.5.1 for ghc-8.4.x

---
 .../configuration-ghc-8.4.x.nix               | 40 ++-----------------
 1 file changed, 4 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 25ac8b2269fc..011f307e8a81 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -73,41 +73,6 @@ self: super: {
     doHaddock       = false;
   });
 
-  ## Needs bump to a versioned attribute
-  hspec = overrideCabal super.hspec_2_5_0 (drv: {
-    ## Setup: Encountered missing dependencies:
-    ## hspec-core ==2.4.4, hspec-discover ==2.4.4
-    ##
-    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘stringbuilder-0.5.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## infinite recursion encountered, at undefined position
-    ## test suite causes an infinite loop
-    doCheck         = false;
-  });
-
-  ## Needs bump to a versioned attribute
-  hspec-core = overrideCabal super.hspec-core_2_5_0 (drv: {
-    ##     • No instance for (Semigroup Summary)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Summary’
-    ##
-    ## error: while evaluating the attribute ‘buildInputs’ of the derivation ‘hspec-core-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘silently-1.2.5’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘temporary-1.2.1.1’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘buildInputs’ of the derivation ‘base-compat-0.9.3’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## while evaluating the attribute ‘propagatedBuildInputs’ of the derivation ‘hspec-2.4.8’ at nixpkgs://pkgs/stdenv/generic/make-derivation.nix:148:11:
-    ## infinite recursion encountered, at undefined position
-    doCheck         = false;
-  });
-
-  ## Needs bump to a versioned attribute
-  ## Setup: Encountered missing dependencies:
-  ## hspec-discover ==2.4.8
-  hspec-discover = super.hspec-discover_2_5_0;
-
-  # https://github.com/jcristovao/enclosed-exceptions/issues/12
-  enclosed-exceptions = dontCheck super.enclosed-exceptions;
-
   ## On Hackage:
 
   ## Upstreamed, awaiting a Hackage release
@@ -444,17 +409,20 @@ self: super: {
   });
 
   # Older versions don't compile.
+  base-compat = self.base-compat_0_10_1;
   brick = self.brick_0_37;
   dhall = self.dhall_1_13_0;
   dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;
   hpack = self.hpack_0_28_2;
+  hspec = dontCheck super.hspec_2_5_1;
+  hspec-core = dontCheck super.hspec-core_2_5_1;
+  hspec-discover = self.hspec-discover_2_5_1;
   hspec-smallcheck = self.hspec-smallcheck_0_5_2;
   matrix = self.matrix_0_3_6_1;
   pandoc = self.pandoc_2_2_1;
   pandoc-types = self.pandoc-types_1_17_4_2;
   wl-pprint-text = self.wl-pprint-text_1_2_0_0;
-  base-compat = self.base-compat_0_10_1;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

From c2dd77c440b565dc2a5b4bdd4fdb2280fc2f4b45 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 19:25:34 +0200
Subject: [PATCH 2143/3370] haskell-vector-sized: update override for the
 latest version

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8278b4bdc5ea..f37983082047 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1036,8 +1036,8 @@ self: super: {
   vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; };
 
   # Builds only with the latest version of indexed-list-literals.
-  vector-sized_1_0_1_0 = super.vector-sized_1_0_1_0.override {
-    indexed-list-literals = self.indexed-list-literals_0_2_0_0;
+  vector-sized_1_0_2_0 = super.vector-sized_1_0_2_0.override {
+    indexed-list-literals = self.indexed-list-literals_0_2_1_1;
   };
 
   # https://github.com/dmwit/encoding/pull/3

From 49fc5f004495a89e6b089fd6fa4dc566c7051530 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 17 May 2018 19:27:59 +0200
Subject: [PATCH 2144/3370] git-annex: update sha256 hash for the new version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f37983082047..2fc5c20c3374 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -82,7 +82,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "05rygb8jm4nh7ggzihz6664hcgwkbqspi8gbpkpf7l7wwvzdm1rd";
+      sha256 = "1w0gzqk70ymlpvh9zqkg1cd3ipaw4n85k4zsf49xl6kjp4vbcmwj";
     };
   })).overrideScope (self: super: {
     aws = dontCheck (self.aws_0_18);

From 2fe842a20001aa2b02325b0f78a2be5f6bd88d90 Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Thu, 17 May 2018 10:36:56 -0700
Subject: [PATCH 2145/3370] fix ghc bootstrap on non-nixos nonstd-storepath

Something goes amiss in the configurePhase and binaries start picking up
system binaries and everything falls apart. Patch the configure script
to use a bourne shell out of the store, and things are happier.

Closes https://github.com/NixOS/nixpkgs/pull/40691.
---
 pkgs/development/compilers/ghc/7.10.3-binary.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/ghc/7.10.3-binary.nix b/pkgs/development/compilers/ghc/7.10.3-binary.nix
index cb9f78aa0813..48e2ca0a585c 100644
--- a/pkgs/development/compilers/ghc/7.10.3-binary.nix
+++ b/pkgs/development/compilers/ghc/7.10.3-binary.nix
@@ -65,6 +65,7 @@ stdenv.mkDerivation rec {
     # Some scripts used during the build need to have their shebangs patched
     ''
       patchShebangs ghc-${version}/utils/
+      patchShebangs ghc-${version}/configure
     '' +
 
     # Strip is harmful, see also below. It's important that this happens

From 456d0e280e0cbc517a89a396420fb024f48ed425 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sat, 19 May 2018 17:40:04 -0300
Subject: [PATCH 2146/3370] xorg: fix missing gbm dependency for amdgpu driver

---
 pkgs/servers/x11/xorg/default.nix                    | 4 ++--
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f5d7f54eb5ca..adb5da606df4 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1839,9 +1839,9 @@ let
       sha256 = "0z56ifw3xiq9dychv8chg1cny0hq4v3c1r9pqcybk5fp7nzw9jpq";
     };
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
+    buildInputs = [ fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
-  }) // {inherit fontsproto libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  }) // {inherit fontsproto mesa_noglu libGL libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videoark = (mkDerivation "xf86videoark" {
     name = "xf86-video-ark-0.7.5";
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9f21d3c2024b..dfde730fbea8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -35,6 +35,7 @@ $pcMap{"dbus-1"} = "dbus";
 $pcMap{"uuid"} = "libuuid";
 $pcMap{"libudev"} = "udev";
 $pcMap{"gl"} = "libGL";
+$pcMap{"gbm"} = "mesa_noglu";
 $pcMap{"\$PIXMAN"} = "pixman";
 $pcMap{"\$RENDERPROTO"} = "renderproto";
 $pcMap{"\$DRI3PROTO"} = "dri3proto";

From 0d319657efdbefa967df77a10057bbd346ea0bdd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Sat, 19 May 2018 23:01:40 +0200
Subject: [PATCH 2147/3370] ocamlPackages.earley: init at 1.0.2 (#40755)

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

diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix
new file mode 100644
index 000000000000..576d9b2528f5
--- /dev/null
+++ b/pkgs/development/ocaml-modules/earley/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.03"
+then throw "earley is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "ocaml${ocaml.version}-earley-${version}";
+  src = fetchFromGitHub {
+    owner = "rlepigre";
+    repo = "ocaml-earley";
+    rev = "ocaml-earley_${version}";
+    sha256 = "110njakmx1hyq42hyr6gx6qhaxly860whfhd6r0vks4yfp68qvcx";
+  };
+
+  buildInputs = [ which ocaml findlib ocamlbuild ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Parser combinators based on Earley Algorithm";
+    license = stdenv.lib.licenses.cecill-b;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index bce2662abfd1..e46888992f77 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -215,6 +215,8 @@ let
 
     dtoa = callPackage ../development/ocaml-modules/dtoa { };
 
+    earley = callPackage ../development/ocaml-modules/earley { };
+
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
     eliom = callPackage ../development/ocaml-modules/eliom { };

From 893ba5d1b8442cca66f8109834261ac687c41938 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Sat, 12 May 2018 12:22:14 +0200
Subject: [PATCH 2148/3370] ldc: wrap ldc2 binary with C compiler because it's
 needed for linking

---
 pkgs/development/compilers/ldc/default.nix | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index 1fd839180c56..48301a8f2874 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, fetchurl, cmake, llvm, curl, tzdata
 , python, libconfig, lit, gdb, unzip, darwin, bash
-, callPackage
+, callPackage, makeWrapper, targetPackages
 , bootstrapVersion ? false
 , version ? "1.8.0"
 , ldcSha256 ? "0zswjlibj8zcdj06nn09jjhbd99chsa5f4kps8xifzgrpgsa28g4"
@@ -124,7 +124,7 @@ let
             --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\""
     '';
 
-    nativeBuildInputs = [ cmake llvm bootstrapLdc python lit gdb unzip ]
+    nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ]
 
     ++ stdenv.lib.optional (bootstrapVersion) [
       libconfig
@@ -135,7 +135,7 @@ let
     ]);
 
 
-    buildInputs = [ curl tzdata stdenv.cc ];
+    buildInputs = [ curl tzdata ];
 
     preConfigure = ''
       cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
@@ -158,14 +158,20 @@ let
     doCheck = true;
 
     checkPhase = ''
-	# Build and run LDC D unittests.
-	ctest --output-on-failure -R "ldc2-unittest"
-	# Run LIT testsuite.
-	ctest -V -R "lit-tests"
-	# Run DMD testsuite.
-	DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite"
+      # Build and run LDC D unittests.
+      ctest --output-on-failure -R "ldc2-unittest"
+      # Run LIT testsuite.
+      ctest -V -R "lit-tests"
+      # Run DMD testsuite.
+      DMD_TESTSUITE_MAKE_ARGS=-j$NIX_BUILD_CORES ctest -V -R "dmd-testsuite"
     '';
 
+    postInstall = ''
+      wrapProgram $out/bin/ldc2 \
+          --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
+          --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
+     '';
+
     meta = with stdenv.lib; {
       description = "The LLVM-based D compiler";
       homepage = https://github.com/ldc-developers/ldc;

From e762dca831078a71b18b8c79fefe630dd6e1e949 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Sat, 14 Apr 2018 12:56:34 +0200
Subject: [PATCH 2149/3370] dmd,dtools,dub: 2.079.0 -> 2.079.1

---
 pkgs/development/compilers/dmd/default.nix    | 21 ++++++++++++-------
 .../tools/build-managers/dub/default.nix      |  5 +++--
 pkgs/development/tools/dtools/default.nix     |  4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 6522b12b1310..b391b6eb8455 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, overrideCC, gcc5
 , makeWrapper, unzip, which
 , curl, tzdata, gdb, darwin
-, callPackage
+, callPackage, targetPackages
 , bootstrapVersion ? false
-, version ? "2.079.0"
-, dmdSha256 ? "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y"
-, druntimeSha256 ? "183pqygj5w4105czs5kswyjn9mrcybx3wmkynz3in0m3ylzzjmvl"
-, phobosSha256 ? "0y9i86ggmf41ww2xk2bsrlsv9b1blj5dbyan6q6r6xp8dmgrd79w"
+, version ? "2.079.1"
+, dmdSha256 ? "0mlk095aw94d940qkymfp85daggiz3f0xv598nlc7acgp6408kyj"
+, druntimeSha256 ? "18r8gwvb54ar80j5155wx0qbqq4w56hqmbf6wap20xwijg2rw90g"
+, phobosSha256 ? "1x5v1ln51nr8x2vyki864160bakdyq0acmvbfv7jcipaj2w3m9bb"
 }:
 
 let
@@ -143,6 +143,9 @@ let
     + stdenv.lib.optionalString (stdenv.hostPlatform.isLinux && bootstrapVersion) ''
       substituteInPlace ${dmdPath}/root/port.c \
         --replace "#include <bits/mathdef.h>" "#include <complex.h>"
+
+      substituteInPlace ${dmdPath}/root/port.c \
+        --replace "#include <bits/nan.h>" "#include <math.h>"
     ''
 
     + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -198,6 +201,8 @@ let
     
     extension = if stdenv.hostPlatform.isDarwin then "a" else "{a,so}";
 
+    dontStrip = true;
+
     installPhase = ''
         cd dmd
         mkdir $out
@@ -222,13 +227,13 @@ let
         cp -r etc $out/include/d2
 
         wrapProgram $out/bin/dmd \
-            --prefix PATH ":" "${stdenv.cc}/bin" \
-            --set-default CC "$CC"
+            --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \
+            --set-default CC "${targetPackages.stdenv.cc}/bin/cc"
 
         cd $out/bin
         tee dmd.conf << EOF
         [Environment]
-        DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
+        DFLAGS=-I$out/include/d2 -L-L$out/lib ${stdenv.lib.optionalString (!targetPackages.stdenv.cc.isClang) "-L--export-dynamic"} -fPIC
         EOF
     '';
 
diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 28894850bbd9..52e29acc9d81 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -4,7 +4,7 @@ let
 
   dubBuild = stdenv.mkDerivation rec {
     name = "dubBuild-${version}";
-    version = "1.8.0";
+    version = "1.8.1";
 
     enableParallelBuilding = true;
 
@@ -12,7 +12,7 @@ let
       owner = "dlang";
       repo = "dub";
       rev = "v${version}";
-      sha256 = "0788d375sc6xdak9x6xclkkz243lb7di68yxfvl4v0n178mi22bk";
+      sha256 = "16r7x4jsfv5fjssvs6mwj8ymr6fjpvbkjhpr4f4368sjr5iyfad6";
     };
 
     postUnpack = ''
@@ -75,6 +75,7 @@ let
       # file under ../etc relative to the dub location.
       cp ${dubBuild}/bin/dub bin/
       export DUB=$NIX_BUILD_TOP/source/bin/dub
+      export PATH=$PATH:$NIX_BUILD_TOP/source/bin/
       export DC=${dmd.out}/bin/dmd
       export HOME=$TMP
       ./test/run-unittest.sh
diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index d5f691b0cac5..bc29fe2cbcf9 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "dtools-${version}";
-  version = "2.079.0";
+  version = "2.079.1";
 
   srcs = [
     (fetchFromGitHub {
       owner = "dlang";
       repo = "dmd";
       rev = "v${version}";
-      sha256 = "1k6cky71pqnss6h6391p1ich2mjs598f5fda018aygnxg87qgh4y";
+      sha256 = "0mlk095aw94d940qkymfp85daggiz3f0xv598nlc7acgp6408kyj";
       name = "dmd";
     })
     (fetchFromGitHub {

From bf049151a753956610be837b9c24215204b7ab92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 19 May 2018 18:19:22 -0300
Subject: [PATCH 2150/3370] materia-theme: 20180321 -> 20180519 (#40790)

- Update to version 20180519

- Do not unset the environment variable 'name' anymore before running
install.sh. It has been renamed to '_name' in upstream.
---
 pkgs/misc/themes/materia-theme/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/themes/materia-theme/default.nix b/pkgs/misc/themes/materia-theme/default.nix
index 4b6d364a8569..8f2cdb0fcff7 100644
--- a/pkgs/misc/themes/materia-theme/default.nix
+++ b/pkgs/misc/themes/materia-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "materia-theme-${version}";
-  version = "20180321";
+  version = "20180519";
 
   src = fetchFromGitHub {
     owner = "nana-4";
     repo = "materia-theme";
     rev = "v${version}";
-    sha256 = "1nj9ylg9g74smd2kdyzlamdw9cg0f3jz77vn5898drjyscw5qpp6";
+    sha256 = "0javva2a3kmwb7xss2zmbpc988gagrkjgxncy7i1jifyvbnamf70";
   };
 
   nativeBuildInputs = [ gnome3.glib libxml2 bc ];
@@ -25,8 +25,7 @@ stdenv.mkDerivation rec {
       -e "s|if .*which gnome-shell.*;|if true;|" \
       -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${gnome3.version}|"
     mkdir -p $out/share/themes
-    # name is used internally by the package installation script
-    name= ./install.sh --dest $out/share/themes
+    ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
   '';
 

From bf629981a6ed0b69091df0dc40f9bb994c24b73a Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 19 May 2018 23:26:06 +0200
Subject: [PATCH 2151/3370] nms: init at 0.3.3 (#40707)

---
 pkgs/tools/misc/nms/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/misc/nms/default.nix

diff --git a/pkgs/tools/misc/nms/default.nix b/pkgs/tools/misc/nms/default.nix
new file mode 100644
index 000000000000..3037262322f2
--- /dev/null
+++ b/pkgs/tools/misc/nms/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "nms-${version}";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "bartobri";
+    repo = "no-more-secrets";
+    rev = "v${version}";
+    sha256 = "1zfv4qabikf8w9winsr4brxrdvs3f0d7xvydksyx8bydadsm2v2h";
+  };
+
+  buildFlags = [ "nms" "sneakers" ];
+  installFlags = [ "prefix=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bartobri/no-more-secrets";
+    description = ''
+      A command line tool that recreates the famous data decryption
+      effect seen in the 1992 movie Sneakers.
+    '';
+    license = licenses.gpl3;
+    maintainers = [ maintainers.infinisil ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd2bf75a309f..8ac26897741d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4019,6 +4019,8 @@ with pkgs;
 
   nitrogen = callPackage ../tools/X11/nitrogen {};
 
+  nms = callPackage ../tools/misc/nms { };
+
   notify-desktop = callPackage ../tools/misc/notify-desktop {};
 
   nkf = callPackage ../tools/text/nkf {};

From 548417c209d1e1531b1811d813c243c8cc8af259 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Sat, 19 May 2018 23:26:54 +0200
Subject: [PATCH 2152/3370] riot-web: 0.14.2 -> 0.15.3 (#40792)

---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 4946c065492f..512c31e3d041 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.14.2";
+  version = "0.15.3";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "1qma49a6lvr9anrry3vbhjhvy06bgapknnvbdljnbb3l9c99nmxi";
+    sha256 = "0vh2zjg0vaczh5mfyykb2kk9d8mi07dkr8zy60bpqf0y1lfamv0a";
   };
 
   installPhase = ''

From c8a8ecb5b38865ca3d703993e953ea50e36ede6d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <infinisil@icloud.com>
Date: Sat, 19 May 2018 23:33:09 +0200
Subject: [PATCH 2153/3370] blockhash: init at 0.3 (#40737)

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

diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix
new file mode 100644
index 000000000000..c48b85cedb26
--- /dev/null
+++ b/pkgs/tools/graphics/blockhash/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, python, pkgconfig, imagemagick }:
+
+stdenv.mkDerivation rec {
+  name = "blockhash-${version}";
+  version = "0.3";
+
+  src = fetchFromGitHub {
+    owner = "commonsmachinery";
+    repo = "blockhash";
+    rev = "v${version}";
+    sha256 = "15iwljpkykn2711jhls7cwkb23gk6iawlvvk4prl972wic2wlxcj";
+  };
+
+  nativeBuildInputs = [ python pkgconfig ];
+  buildInputs = [ imagemagick ];
+
+  configurePhase = "python waf configure --prefix=$out";
+  buildPhase = "python waf";
+  installPhase = "python waf install";
+
+  meta = with stdenv.lib; {
+    homepage = "http://blockhash.io/";
+    description = ''
+      This is a perceptual image hash calculation tool based on algorithm
+      descibed in Block Mean Value Based Image Perceptual Hashing by Bian Yang,
+      Fan Gu and Xiamu Niu.
+    '';
+    license = licenses.mit;
+    maintainers = [ maintainers.infinisil ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ac26897741d..1f8357ea9b80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -844,6 +844,8 @@ with pkgs;
 
   blink = callPackage ../applications/networking/instant-messengers/blink { };
 
+  blockhash = callPackage ../tools/graphics/blockhash { };
+
   bluemix-cli = callPackage ../tools/admin/bluemix-cli { };
 
   libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { };

From b998139b85a7db6f35b2ccdf4d091d889649ebc8 Mon Sep 17 00:00:00 2001
From: averelld <averelld@users.noreply.github.com>
Date: Sat, 19 May 2018 23:46:26 +0200
Subject: [PATCH 2154/3370] x2goclient: 4.1.0.0 -> 4.1.1.1 (#40793)

---
 pkgs/applications/networking/remote/x2goclient/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 904a6812c489..b470c6b39d3b 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
-  version = "4.1.0.0";
+  version = "4.1.1.1";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
-    sha256 = "0sibrj4qppww7mirdixrqrknkyq3g97s64186h88j8k66sy1anab";
+    sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
   };
 
   buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
      substituteInPlace Makefile \
+       --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
        --replace "lrelease-qt4" "${qt4}/bin/lrelease" \
        --replace "qmake-qt4" "${qt4}/bin/qmake" \
        --replace "-o root -g root" ""

From e385ca7ede12dcf6b115920aa7d7c41d3af5e24c Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 19 May 2018 17:44:17 -0400
Subject: [PATCH 2155/3370] pciutils: build with dns query support

This enables `lspci -q` to look up unknown PCI IDs via DNS queries
without needing the `update-pciids` script that the derivation doesn't
include.
---
 pkgs/tools/system/pciutils/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 3cd00b3394cf..c4b5699ffc29 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -11,7 +11,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ zlib kmod which ];
 
-  makeFlags = [ "SHARED=yes" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ];
+  makeFlags = [
+    "SHARED=yes"
+    "PREFIX=\${out}"
+    "STRIP="
+    "HOST=${stdenv.hostPlatform.system}"
+    "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
+    "DNS=yes"
+  ];
 
   installTargets = "install install-lib";
 
@@ -26,4 +33,3 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.vcunat ]; # not really, but someone should watch it
   };
 }
-

From 6e222ef4967616ea1f8ef5048a36b51cb242cbea Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Sat, 19 May 2018 18:25:57 -0400
Subject: [PATCH 2156/3370] tmon: fix missing libgcc_s.so required by pthreads

---
 pkgs/os-specific/linux/tmon/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix
index 01c84a1d1faa..690eb8b2eabb 100644
--- a/pkgs/os-specific/linux/tmon/default.nix
+++ b/pkgs/os-specific/linux/tmon/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation {
   '';
 
   makeFlags = kernel.makeFlags ++ [ "INSTALL_ROOT=\"$(out)\"" "BINDIR=bin" ];
+  NIX_CFLAGS_LINK = "-lgcc_s";
 
   enableParallelBuilding = true;
 

From f4ec18aaaca9e46b4f304d2a7f5f06bd6222c0e5 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sun, 20 May 2018 01:01:42 +0200
Subject: [PATCH 2157/3370] nixos/cjdns: fix service for i686 (#40740)

service failed to start because of MemoryDenyWriteExecute = true,
which seems not to work on i686
---
 nixos/modules/services/networking/cjdns.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix
index 12c2677c3368..39b62bdc7094 100644
--- a/nixos/modules/services/networking/cjdns.nix
+++ b/nixos/modules/services/networking/cjdns.nix
@@ -260,7 +260,8 @@ in
         RestartSec = 1;
         CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_RAW CAP_SETUID";
         ProtectSystem = true;
-        MemoryDenyWriteExecute = true;
+        # Doesn't work on i686, causing service to fail
+        MemoryDenyWriteExecute = !pkgs.stdenv.isi686;
         ProtectHome = true;
         PrivateTmp = true;
       };

From 75e78eda1fd85ac7306acfe597eb5f55b7f60a55 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 19 May 2018 18:27:38 -0500
Subject: [PATCH 2158/3370] cmake: 3.10.2 -> 3.11.2

Fixes #40751.
---
 pkgs/development/tools/build-managers/cmake/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 3871600f4463..4675014880ba 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash
-, majorVersion ? "3.10"
+, majorVersion ? "3.11"
 # darwin attributes
 , ps
 , isBootstrap ? false
@@ -17,6 +17,10 @@ with stdenv.lib;
 
 with (
   {
+    "3.11" = {
+      minorVersion = "2";
+      sha256 = "0j2jpx94lnqx5w59i9xihl56hf6ghk04438rqhh7lk1bryxj5g2y";
+    };
     "3.10" = {
       minorVersion = "2";
       sha256 = "80d0faad4ab56de07aa21a7fc692c88c4ce6156d42b0579c6962004a70a3218b";

From 8dbd8f4d69fc8ed993f6e7798616df4c4dd96765 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Sun, 20 May 2018 02:24:12 +0200
Subject: [PATCH 2159/3370] nixos/dnscrypt-proxy: fix apparmor profile and test

Test failed because of an incomplete apparmor profile.
- fix apparmor profile
- improve test timing, prevent non-deterministic failure
---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 4 ++++
 nixos/tests/dnscrypt-proxy.nix                       | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 857657eea4db..6f5e7d8d456e 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -192,6 +192,7 @@ in
     security.apparmor.profiles = singleton (pkgs.writeText "apparmor-dnscrypt-proxy" ''
       ${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy {
         /dev/null rw,
+        /dev/random r,
         /dev/urandom r,
 
         /etc/passwd r,
@@ -211,6 +212,9 @@ in
         ${getLib pkgs.gcc.cc}/lib/libssp.so.* mr,
         ${getLib pkgs.libsodium}/lib/libsodium.so.* mr,
         ${getLib pkgs.systemd}/lib/libsystemd.so.* mr,
+        ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so.* mr,
+        ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so.* mr,
+        ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so.* mr,
         ${getLib pkgs.xz}/lib/liblzma.so.* mr,
         ${getLib pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
         ${getLib pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix
index 845623368250..1fcf3903b13e 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixos/tests/dnscrypt-proxy.nix
@@ -26,7 +26,8 @@ import ./make-test.nix ({ pkgs, ... }: {
     $client->waitForUnit("dnsmasq");
 
     # The daemon is socket activated; sending a single ping should activate it.
+    $client->fail("systemctl is-active dnscrypt-proxy");
     $client->execute("${pkgs.iputils}/bin/ping -c1 example.com");
-    $client->succeed("systemctl is-active dnscrypt-proxy");
+    $client->waitUntilSucceeds("systemctl is-active dnscrypt-proxy");
   '';
 })

From 3575b82e679c0e1f466c2f721c00432a7e694dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Sun, 20 May 2018 04:03:09 +0200
Subject: [PATCH 2160/3370] gitAndTools.git-dit: Fix darwin build

---
 .../version-management/git-and-tools/default.nix         | 4 +++-
 .../version-management/git-and-tools/git-dit/default.nix | 9 +++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 13b861d0a9ed..99b6b5313709 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -67,7 +67,9 @@ rec {
 
   git-crypt = callPackage ./git-crypt { };
 
-  git-dit = callPackage ./git-dit { };
+  git-dit = callPackage ./git-dit {
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
+  };
 
   git-extras = callPackage ./git-extras { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
index 41096441b8e7..654576a29e80 100644
--- a/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-dit/default.nix
@@ -8,6 +8,10 @@
 , perl
 , pkgconfig
 , rustPlatform
+, curl
+, libiconv
+, CoreFoundation
+, Security
 }:
 
 with rustPlatform;
@@ -35,6 +39,11 @@ buildRustPackage rec {
     openssl
     libssh
     zlib
+  ] ++ stdenv.lib.optionals (stdenv.isDarwin) [
+    curl
+    libiconv
+    CoreFoundation
+    Security
   ];
 
   meta = with stdenv.lib; {

From e166aee826f7f58b53a583837e2399811ff61eaa Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 15 May 2018 20:55:59 +0200
Subject: [PATCH 2161/3370] nixos/gitea: Allow customizing derivation to use

---
 nixos/modules/services/misc/gitea.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 63e976ae566c..9f7e1ea8c49d 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -4,6 +4,7 @@ with lib;
 
 let
   cfg = config.services.gitea;
+  gitea = cfg.package;
   pg = config.services.postgresql;
   usePostgresql = cfg.database.type == "postgres";
   configFile = pkgs.writeText "app.ini" ''
@@ -57,6 +58,13 @@ in
         description = "Enable Gitea Service.";
       };
 
+      package = mkOption {
+        default = pkgs.gitea;
+        type = types.package;
+        defaultText = "pkgs.gitea";
+        description = "gitea derivation to use";
+      };
+
       useWizard = mkOption {
         default = false;
         type = types.bool;
@@ -203,7 +211,7 @@ in
 
       staticRootPath = mkOption {
         type = types.str;
-        default = "${pkgs.gitea.data}";
+        default = "${gitea.data}";
         example = "/var/lib/gitea/data";
         description = "Upper level of template and static files path.";
       };
@@ -223,7 +231,7 @@ in
       description = "gitea";
       after = [ "network.target" "postgresql.service" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.gitea.bin ];
+      path = [ gitea.bin ];
 
       preStart = let
         runConfig = "${cfg.stateDir}/custom/conf/app.ini";
@@ -253,7 +261,7 @@ in
         HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
         if [ "$HOOKS" ]
         then
-          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${pkgs.gitea.bin}/bin/gitea,g' $HOOKS
+          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS
@@ -261,7 +269,7 @@ in
         if [ ! -d ${cfg.stateDir}/conf/locale ]
         then
           mkdir -p ${cfg.stateDir}/conf
-          cp -r ${pkgs.gitea.out}/locale ${cfg.stateDir}/conf/locale
+          cp -r ${gitea.out}/locale ${cfg.stateDir}/conf/locale
         fi
       '' + optionalString (usePostgresql && cfg.database.createDatabase) ''
         if ! test -e "${cfg.stateDir}/db-created"; then
@@ -288,7 +296,7 @@ in
         User = cfg.user;
         WorkingDirectory = cfg.stateDir;
         PermissionsStartOnly = true;
-        ExecStart = "${pkgs.gitea.bin}/bin/gitea web";
+        ExecStart = "${gitea.bin}/bin/gitea web";
         Restart = "always";
       };
 

From ce42182d13db1721d49709779ea6b3f8a93280fd Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Tue, 15 May 2018 21:17:51 +0200
Subject: [PATCH 2162/3370] nixos/gitea: Add options to enable a timer with
 optional interval

This will run gitea dump and create a backup file for gitea every so
often as the interval is defined to do.
---
 nixos/modules/services/misc/gitea.nix | 51 +++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 9f7e1ea8c49d..2d0f66de037d 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -164,6 +164,30 @@ in
         };
       };
 
+      dump = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Enable a timer that runs gitea dump to generate backup-files of the
+            current gitea database and repositories.
+          '';
+        };
+
+        interval = mkOption {
+          type = types.str;
+          default = "04:31";
+          example = "hourly";
+          description = ''
+            Run a gitea dump at this interval. Runs by default at 04:31 every day.
+
+            The format is described in
+            <citerefentry><refentrytitle>systemd.time</refentrytitle>
+            <manvolnum>7</manvolnum></citerefentry>.
+          '';
+        };
+      };
+
       appName = mkOption {
         type = types.str;
         default = "gitea: Gitea Service";
@@ -326,5 +350,32 @@ in
         name = "gitea-database-password";
         text = cfg.database.password;
       })));
+
+    systemd.services.gitea-dump = {
+       description = "gitea dump";
+       after = [ "gitea.service" ];
+       wantedBy = [ "default.target" ];
+       path = [ gitea.bin ];
+
+       environment = {
+         USER = cfg.user;
+         HOME = cfg.stateDir;
+         GITEA_WORK_DIR = cfg.stateDir;
+       };
+
+       serviceConfig = {
+         Type = "oneshot";
+         User = cfg.user;
+         ExecStart = "${gitea.bin}/bin/gitea dump";
+         WorkingDirectory = cfg.stateDir;
+       };
+    };
+
+    systemd.timers.gitea-dump = {
+      description = "Update timer for gitea-dump";
+      partOf = [ "gitea-dump.service" ];
+      wantedBy = [ "timers.target" ];
+      timerConfig.OnCalendar = cfg.dump.interval;
+    };
   };
 }

From 8c3503d6f6dd6972f4d8566a14532f0dcb446851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 20 May 2018 10:52:03 +0100
Subject: [PATCH 2163/3370] nixos/ids: information when to use static uids/gids

---
 nixos/modules/misc/ids.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index cc7d86849824..bb97c707bf65 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -1,6 +1,14 @@
 # This module defines the global list of uids and gids.  We keep a
 # central list to prevent id collisions.
 
+# IMPORTANT!
+# We only add static uids and gids for services where it is not feasible
+# to change uids/gids on service start, in example a service with a lot of
+# files. Please also check if the service is applicable for systemd's
+# DynamicUser option and does not need a uid/gid allocation at all.
+# Systemd can also change ownership of service directories using the
+# RuntimeDirectory/StateDirectory options.
+
 { config, pkgs, lib, ... }:
 
 {

From c0e2f7bbbe8344ce6abb19b74f69336426c024e6 Mon Sep 17 00:00:00 2001
From: P-E-Meunier <pe@pijul.org>
Date: Sun, 20 May 2018 11:28:19 +0100
Subject: [PATCH 2164/3370] buildRustCrate: add extraLinkFlags parameter

This is useful when build scripts do not apply linking flags
---
 pkgs/build-support/rust/build-rust-crate.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-crate.nix b/pkgs/build-support/rust/build-rust-crate.nix
index e0aec6e0e18b..5c738dd7f0b3 100644
--- a/pkgs/build-support/rust/build-rust-crate.nix
+++ b/pkgs/build-support/rust/build-rust-crate.nix
@@ -47,7 +47,7 @@ let makeDeps = dependencies:
     '';
 
     configureCrate =
-      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member }:
+      { crateName, crateVersion, crateAuthors, build, libName, crateFeatures, colors, libPath, release, buildDependencies, completeDeps, completeBuildDeps, verbose, dependencies, workspace_member, extraLinkFlags }:
       let version_ = lib.splitString "-" crateVersion;
           versionPre = if lib.tail version_ == [] then "" else builtins.elemAt version_ 1;
           version = lib.splitString "." (lib.head version_);
@@ -79,6 +79,8 @@ let makeDeps = dependencies:
 
       mkdir -p target/{deps,lib,build,buildDeps}
       chmod uga+w target -R
+      echo ${extraLinkFlags} > target/link
+      echo ${extraLinkFlags} > target/link.final
       for i in ${completeDepsDir}; do
         symlink_dependency $i target/deps
       done
@@ -421,9 +423,11 @@ stdenv.mkDerivation (rec {
       if lib.attrByPath ["plugin"] false crate then "dylib" else
       (crate.type or "lib");
     colors = lib.attrByPath [ "colors" ] "always" crate;
+    extraLinkFlags = builtins.concatStringsSep " " (crate.extraLinkFlags or []);
     configurePhase = configureCrate {
       inherit crateName dependencies buildDependencies completeDeps completeBuildDeps
               crateFeatures libName build workspace_member release libPath crateVersion
+              extraLinkFlags
               crateAuthors verbose colors;
     };
     extraRustcOpts = if crate ? extraRustcOpts then crate.extraRustcOpts else [];

From aa1d7961e74ee5b1743b1973c7e52128adf50fbe Mon Sep 17 00:00:00 2001
From: P-E-Meunier <pe@pijul.org>
Date: Sun, 20 May 2018 11:28:35 +0100
Subject: [PATCH 2165/3370] curl-sys: fix linking against zlib

---
 pkgs/build-support/rust/default-crate-overrides.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index 971c4d0f5e22..d82a92042307 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -19,8 +19,9 @@ in
     crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ];
   };
   curl-sys = attrs: {
-    buildInputs = [ pkgconfig zlib ];
-    propagatedBuiltInputs = [ curl ];
+    buildInputs = [ pkgconfig zlib curl ];
+    propagatedBuildInputs = [ curl zlib ];
+    extraLinkFlags = ["-L${zlib.out}/lib"];
   };
   libgit2-sys = attrs: {
     LIBGIT2_SYS_USE_PKG_CONFIG = true;

From 15449600541f9a2d07ba3bcd78662737a0a56afd Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 20 May 2018 19:17:01 +0800
Subject: [PATCH 2166/3370] firefox-devedition-bin: 61.0b5 -> 61.0b6

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index da5dae5f3f24..968b65e72476 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b5";
+  version = "61.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "1170b5bd72dbeb60e71b6c7fc3b5865e10d32286a6f8be3e5befc46f45a978b00490731b59c4e54c7a53d2bc9efdc739a17e6605444cdc67eff13f2cacd84137";
+      sha512 = "704a4bb25d1cc2386a63c4883fd43c7a1720387f85f73b9cd4ad32cb41238d4289685ed6d62777b5748f7e18960dca73d7d204d73a335c542ad6363fc2b0f6a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "1cb816e86f02b0e2c0c1a4842b6d1b3cbf3da5b368dca6765555b3553c4b8f669801c93af407b51721216bb0c222da66b2653935246db24573950390672c8ce3";
+      sha512 = "e295c3792c8e179e67e75b0999caffefa4b1abf93f87ef2005299f31188eaf48d75cf2775f39af547ee06b0bb3cc6b472a5bc3dc33e1d2e1b683ac26edaf5a25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "5ed43051b49f887fda9fa8b684bbbfd3cc71112fd3c9c86dd4db476c2e4f667ebf92435ccf5ba8fd9b29591272b609056606df9c88897b3080a1d8e08fdb8ddf";
+      sha512 = "0d358267b73441f5ade02d4e336a08ff5196e353c5c2b4ef0833455d768f3210f7f05a98ba57e279a8fd40cf11183a1f9ab92453ae624aac42242b9cd27c261d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "43e25d83401eab86c05da5e6cd9790c3c891c9e3eb584b07738b6cbd151e2552d745b600090f5b3d68812ea67fbeaa9aa64f56aaf97f3676ed68134656fb1bf2";
+      sha512 = "c442173d1a591293dc9716b948b0183bcb935c7a3abc61d4a1f8da2a114e4c9d5e8bf26ed5559e5bab70fc62f5c12d36fd2ee973c0556641788c339c836219e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "b149ac7f1a770a7d850ee2ea4e52b1a38eb540a36340c41eaf83325fe86ea501a5ec97de9e13e194699b41d7cebcf5bee136274bb078ac136d69043d116d58ef";
+      sha512 = "6f1628a9195ab30a6a87275c70a3390d29808242c3916682a9b83fb932687a311a434b67c8c333e1285fed1337ea0c7bdccb047e39cc4c1ae454572ba32ecbf6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "7dbc6d9a3df0d735f679492fb278c010da450e7f313550d39622d2480a9a0692c7a4c776c3b36aeccec125cd1c6ea9d7fa3adcf48aaa284f0cf1fca1e2f1e6c6";
+      sha512 = "41c0e5a30ba84746963e2e48c7092cc389617fdef861408d081c6fe75200d14674d7e7ecf1312158f723cb8b860b9e39c9b3fad802eb9692ec00cd8aa818b2f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "62bc34bb261693ff94d5c000b3420dc34cb6cea35a7214789e402851b8ac1b5b8370326168ab54e4c09e2f96f9eee1d9d7971da3b926268676db32318386eb56";
+      sha512 = "2c282319205e9a8d5ad7b74480732680f2addef20840d39bb368be0d47a839fda1d039ad4e7cbdb940b26b1fe2ccb19dbcf9d17527802c8c9e41fcf82dd67943";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "bbbdfd16eaa7bb97dc85495f830833dd9fe6d9411e710e0c9a08b8a7225901e7f9679894df83869d1b80654c6d30e6004c02a6fb7b7b7d2fd706b6b6a0dfb7db";
+      sha512 = "e1c573e1cffd888b2005d667c8423a8cb67ed487bb445b0333e9af9dabd2d8bcbc492d642fd893285464ebf83be6bee2fd4b9260a4cc1e826847d545bef2471a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "f099adb83c881eb777c21d8c0ffc01cc8023438f3712836838f5daecc24eaefac791358172a5d532aaab3b436b2958ef194b34c3acba591e9403d34c2b5a6a16";
+      sha512 = "08a3453611833ce773b4cd3a31aec2ec7120eec1e1a87459f165863fcf7ac709e3c0a69a0cb76997650a67a04cae09b2fe7ab2820a338ba040944f81c9417554";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "8bab1ef46fa23cc81365c271503d22b09d227056dd318cb7b340c8a5cbe866d8aa241f261a95fffda6bd3cdfc80c5a3bed45435176a1a1b8d427e06e3d1b0e51";
+      sha512 = "3ee61d526e2c76028f808797df0a2fd4e42d856b76e36538abddbbcb7c41949d2146d5c7dba2f5802d143c209ae943ca8d87123ce7bfe7490dd17058c1c32488";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "6e7113e561f37ffb33dac74a9511bf634c1bf8a912e3b13a0553a2977d29300b3404345667b995752a82ca785006b460cf9a1088c23e40ceb2516d67c098a615";
+      sha512 = "f5178ef8bd83658f2b097fb0d9b5623ebeae4d715156e355879f70ed13b91e8d20f9ce2bd4fab56455c9e45d18c0f6081b798ce3e31b9a473c40da1366538720";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "cfa60a1fda69464870382ded848f19b4915de27bfee14b34f429094381c7400069c3e6a5651cf8db133487957d0e4d9bf50c253a8a0884452285b5dafcd4cf0b";
+      sha512 = "89c2f4a5b8b18fe7d49333f6367696cf7e937b3e62726753d9339e498d9929969f5c0268fff21738ee20326c89e691c40e95b6d20c4c7b1acfc535d58e681b14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "e78fd95675dd40877f1767b53e1f05820afc0695e0a30b0e5e344df1d8d5a38dfd3019eea1bbe4f37b09399cd47a5a134f7d984a0a65c35ca93b5ee40fb1058f";
+      sha512 = "213136c869e9a4a475e5af94582190a3e6c25d49fe260a210221571bbd604ada4b60c254dfd673a9aeeb9d048d4ffc5123577f6f7da0b440ba9668282f3d74bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "d11928a8807b2d1bf2b03ec7796d9950f5127186b4fdf38d38e6b129488f65b437625a3fe5654c45b134e9585458f72cd7d711c312f0e11acd67c941b3ede92f";
+      sha512 = "981c5d319f67de4c9093c57623d1b5c1e5cbd8f640530c03192fa11db3051ac724e014f139d7bbf96d76440a594ed33e4384b591a882c7da7974105ceef8ba8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "233afd0bb1788fa12b7659cfd99556721dea2914afe03d807e9756feff2c4e0749cd8fbdf1989add700b6afbe3c18402c9bfea6343ac7007a19914a2d8cb3c92";
+      sha512 = "96a431cf96e77cb714a31b3b549dc1f7f26416ed0cc32c804f1a139fabce217d904cfb713e7dbf298ff6c42f47c317be943fab26840f9db6a58d675f95466dbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "3d4c79999c2aad3a4aa71aecc7f5f6f25879b76d0e19d1f6b94f3d5998b43c89a35dacf8c9d158e6273bee543facd1119d4129c31a8a4df82974b0d6819d94e8";
+      sha512 = "a190976d1e10338ac056a452f132ef042b997ab38e1c9d3c3e36d7ef1de843ea13d59ce28fce89ef25d6a98b3d4c7840fbacd619001e455eb4e3b3812178cc98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "2c71544732e5bb89a9296ebcf2f6ac390c9ce438d4ced4f0668ce032e13f2e1fc96d26a8863c7f3979f509171014c600cb8efc9861be35a52084bc9d4463ff0e";
+      sha512 = "2ed8460c1e972535dd0432f25ca83df290d5c9562911df111ecba32e481de72cf30564f653a00b00f8877c6cc5c2c30e6ab874aa5b3dbe6065e4488ed7ba88a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "1dddf978db1709a4f6b1ea71808fad8ffe15efd33eb83865736c9e50bdc4b4f3ff0ef7277408c538babc107d1fdd075cf1563af6c5684f1b98a74a3e5c72a6df";
+      sha512 = "b7c1ccc3a45fd41481af46d6a00ffa7b2cbc2855138d958e65cd95712800d43a5fcf7092de4c79cfa98bec3c64504ea521aebd12b712d0ec71a8d987aab871b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "9ee5faa668ba132eb874f3f0c0e05b0f905027e6dc1acb92d3ed951072d4484424a697c2db4bbc1b44f8815ea1f7ff0b222dc955a837a69163fca0a0c0c192d6";
+      sha512 = "37df705938723ab60166634ca6c781e1b46336e8d076655c2c3fc58d7c1d142ca74b8500bc19ef8b7a2fe84d59f3600371c7e1ea6a445429aebc274177afe601";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "b36ad6e52f18ac6e28a646b296db2119306dfe64704a2e6a0ebc4480c743017909ce38da8ebe544298db4dc290949d51734bf1641208a84d84d4d4d88f68d2bb";
+      sha512 = "9b1efa7dfce319ddeac50c6dd732203ca5e1dec1cecfb1c2fe817d1711ed4821d8afb84b7ed4d7056a625fa08909884a08740b955cbcca696459b4c5753eaf03";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "e8cb2fcd5f3ad44db46235593e1557ddf3a73c1a3440c67e43b68fbf8666cd5673be4ac84ee580088fbab536e301f3e7b6348d20ce6ba216df4bb2c2634ae568";
+      sha512 = "5cc23cefe43ec331472d25b276e2b23043c36ea27b53f574a6d159c896976c8f188933b5dc830fb172b499e9f0d371023c588eb3be72ae4d52cdf6683664101f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "9028d5fc39cbfc454d12e24164f27e8781801c5ada6806b2c67adc0c9c5540d1930172cda78b25f3c1dcf96a6f53c8934c11ae0b4cd4048ee62f9c4d487e2475";
+      sha512 = "a8df584f07439b1d0e76e9cef7f7017a32531039a9ca57c35a444b06ab67aa6aa7727b42a16b8ab1567dcfc60a75cabcaf96a3dfbfbc2d7f2d338bbf2037b80a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "25ba55bc0025c531c1ed596355e5a0906cbd87959ec8b3a598827810cfcf5fb573dd572aae85e08db890ae6c514378fcce98eed1362a8532312f7f26ceb8bc3e";
+      sha512 = "3738b5a31f81615c013bd0b917ab9d31348338e371303794f133297dc17a32fa5be5d1d61a57f3a6b6103fcf8c34614eee3a2bca45114271a7bab7f03ae7665c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4ae8604917283517e0d7a94f13506c0ab68602674ad3378ff67a0cb78027a78f457225b54951dd11e471d0a4ca67a6beb378d0549f1436e2de59b4a352082c34";
+      sha512 = "e9efda879e66d1ed364075db1ffa11ddc1db4860de17d4c90c5586e33b716541af3e7c4716c98becd01809bab85444e933de877aef7714edf3b4fcad4fa61ed4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "91eb963b0fd032e02227612d98ec6693bc665d783448163fb5671f4af23c05c5c22199ebefc361f671b880aa23967a48e07164316c97433fb52ad03534363d93";
+      sha512 = "c46aacefe49d734ffb9dd885053c45102b4d8ac89b0babb45ca3bdf555ef854ea41580e59c3a2a3947300d15f273fe3f71aaaf6b05b74c0a67f3a8c1ab820c4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "855bf9dfef4703d7bf4852206cc6103752d537370712db513e40ccc9fa708bd15689ee415da163914d3b5686d2ecc0ba696c9ebaa66ea0a7930401ebd2f373cd";
+      sha512 = "b17c0aff399b62ea56cf5e546ea07637156ca631dde0da47a0a52e55ed8d097d1611c4f1571c232ff256e1092496f601e224ef20e9aa0b03f42643fabb5b7a39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "6a23105b44d81b403ed01d46ced348c5ed5704e517b098404546a5ba33dd68c4dc631146a9e16ee0a55cb7ffd8ff320074657db53641f914193d338eddcaae01";
+      sha512 = "dab6654be6f4f6bbdd199151375b92428f2720ea69a861198d233af27ee1bdb822a5890d0cbb5841456a1db3a8691e85cfad86272b61439dd7c2cdbfb32531ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "34f7dfa2e7711a8520246efaa3629ffa783f8a3cc67cb19def9465ff4c3a3abcea4d1ce1df2ce9c65feeb050d2a27f21cde9d95a5681b61c006ef21c4d412f39";
+      sha512 = "76bdd88222fa792374cea43ccd8454042937c99738b0ebe79aca175256df29a7a8c235c290a1bb408d603ca57ff2efe13d3571a526d5e5b542ca6f9b7560097b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "269af8980bfaf7db00aec2d385ec0eb44ba5836de791f698540074565bbf1c9ded54cfbb870014fb418aa3b451ab6fe3636223dae4ccf437a4d68c9bfc8dfb15";
+      sha512 = "0cca4ce5f283ebee0d5c0632cf9c951c1f29eadc84f1cfb91ece7edc47da56412e9918d3636d21c5d78993d8a9382c8691710bf03a68482e792bcebd10713bb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "65a0740c37a2b09650bef4586306bd6139eadb43d4f3743c7ff0c47293e77b7fcf74f596b1982305b926a66277224fac3d1a190afd1bf2146503d3fafc8f3e4e";
+      sha512 = "4c80a265ab9869fc20dd5abb07e301de954f24acb870c994e100db0f27ebf32b0f55ba10e954269cfc67e39fe1bef73575410331a941b4e0cb465e082954fabf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "17886662bb27dc76002702ef99e3923a52f6c0559d8c2341e09105ae6ef55bd3143961964db46f0a5c8738d9625ecddbb3c65bc9ec14f9b669be327dfad5aaa7";
+      sha512 = "4cf191a8511cc954077698ba057f29390cea82fa3bc0a774db8a767a8d9139bd481bb8c37ea8083d1d5da2492c2404de3f837f5508238bf3325c7aadc63815bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "82eabf1c23e28c5c9f628a4dc3b6ad73568228422b33665b7fa9b4666a4defb79cd118072e0276a314b4f5580317478e6f2df4a28d3ad8a7f82f87b0b688160f";
+      sha512 = "c86ad85cbff328e4f213e25217348acd4fa45ae531da88d9282f611778d9effea05c25648cdfcd0ce3381d5124ce9f3d7b61c815a4074fddf89c713f9c8a25c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "e8563b0d1722fe1323ce27418fe0f3596da9fcfb9cad18fb3c09ab31ea86aceae7f91a64aa0511d98ff883e4bd27304f84570271bda13290b5716cc66761f50f";
+      sha512 = "4b05b4e17c851558c38ddb474021d5f94677c44fdc9c0040e2a575bc44af4952ef5a47af57a00f02026d54e24443c903dc5015d0aceb112e496b77df596b3e66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "4c439ed929ee67acbc9c58428fce3a47beebbb6ef1e4ccd89609530758f113aaa88e8051503fcf93b665d702a4840ef5924640019443a1ccfa844eef8b2da83f";
+      sha512 = "4c11b960a01d68c7d9c21dc7c76a495e24ef22e1f8e41df8dced33cd02456c8d564b1bddf9b06888f149c882fec1ca1533f9bad3fff0517b4bf6dcfd34fb6f0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "0184913e520efefea6eced2f54af3ddf0f0f19f419ddd788471c9bda3429d732af3dcc281c45a175fa904581f48c5f70ac0a9fb28d2a412aa4d81aac97255142";
+      sha512 = "88ea1cf62e9c1ca08e63820517ef8ba17c977df901e63a5c8476d0ed178d93d7ba06df55ea405262f117a8814c096897c637728401142a0964756b44ebca981a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "a6546691dc61bd7023a61c45bdadc3158e6362185b0b3d4ffa20195d1e67d3b48856b557a714c813f1b389176d835683ac52dc1cccb8b08bb04fca014a2e380f";
+      sha512 = "dde3e01be8ad1e3453360771dcfbadbba5d8e171308c217da456cd3e217792089a7f25e7a320d80ea2f81c658191d623bc6bb52ea4c2e177335d478210f168c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "d4cd72a92c0826788b886135ebc17194ed265cef4cb9e1d288e27638f7467ef34f8f2be6722306472e8bf62e54c11524574f21a7d5ba97e2074daa7257d1b8d6";
+      sha512 = "409fd20d41998df4e86e2a42f2054eea525fcdd47256e97958b8fce4d483ee2e35317c36f91aeaf9f597df0d62cb84204ee1822a099f1ffaa3995dc02d9606c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "a7fcc96ac456ca06ba65134fea19469c3e1b725b3bf9683c3d6bd2f9a3aebc5a6d306e5dd15a2e05e58e4b1e06621f20a2e446a3395cdf8f20f1a7a92d1abeb3";
+      sha512 = "1adb25e8e9bb44ec79f030c789bbdadb2c2711c9cf89de6341cc0b7590da0327d865c90fb9633651246431ee8f2b80e90f58f67692595f26cb53c56c6a7a2d50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "1556d99780c2c9b0f8b99fc37c4299322d518cb22486ed1af7a778a7f3979acfa47aa333a65daf337193691695fc7101503c81327d82a624bcdaeeecb6ae8b6f";
+      sha512 = "cfa3be244a4853dcabe6e34f0fe8dbc2d940ccb89ce92174f6d382574445e1debaf66bda9760752a15f4db74d017c9d277f6a865d32f459c9c9caa9ed908813c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "31e0e6c4bf116ff1a0c1b5d7c6548ca3d629cc07ffe83c2ac82b7c681321aa57227ca6c89a28b83f4ee96ed9739a47d83a02eb3782cdb14480b382dd46ed073b";
+      sha512 = "09683ea1dba929c74372c15b943c5609015c88a77b578d7f3e68bd9cf94252cc9289280fe8c5d93315551cf662460653d475d64ab7d3c188e4c89b47ffd23c21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "f0fe6026339b49d59b8208e6e97d3645be34b90c37152d76645cfbf14a418a97d37bc3cf3fd733a41d085b315d5c975cf88521e7f85407b54ff83e8ecd0ebf8d";
+      sha512 = "ccc6bbb0513f4dd8df91bf09f58bcb2f75de28f0a33da70bc6bc688f409651ab1a34d88f0752eb30afa450cb412e34e015cba8aec7cfbdb62dcb46ed2bcfed10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "32288fd8ead53b0eb74621301d1d0f6ac9c66845b65ecc5258d2f1c7e913e83a25843268e6ded535c81a7b536a3112e58f0c9f70d39b186a6726c119dce6ba8a";
+      sha512 = "d5ae8e88f143ada1ba42a90c0ee2d20655204a6521fcd8e5e286d666e5e7203ccf7c5dde52df5e18ae8fd55def74a4a2a8bdcbe681a7addcdda3bc026117e2ab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a398763f1d467b6d98b864afa84113ef59ccbaaaeeb7e730f65d8d898a534e910b775cfff1088ddac4cb7c0fc714be2f98c6b7df9e30a751fda1f3727228c51d";
+      sha512 = "8e7d166d15f00b71be942987f964ff03499efd677fafd58d6c607b53fabd866c7666228604c461252a6d30b417d31494625fa829e3947d67069769eb2bff5c1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "2cc3e64cee65d4ba1d4a4e755430664959bb5726d575062d2147efab9eab7c67797c6236367456e105b227907171bb169952ed18a0f8513677490cf065981e16";
+      sha512 = "2cdc4caa3377dca66e72cb925ceb201c2726e814aa12873d74aa2daba8c5546a649c5c2fa5e953bcf6265d642bd0b7fd5df3e7ad181190bbec0b5a626eb8ff89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "774f60494af13245f3642120b7401fa3a9a98dcf53b4482141963f7458e6a1be4097161938a3aa2bb67940f0dd22f4ea447098d907d1dcd55b11bb89a278108e";
+      sha512 = "d7ec91a65762419d7ce8e7d3fdbd19675b19e8441fb36f2927d89eb1e7143a3797846fbca1ebb0a5c78a7fa8401f09a0be445eba159e1ccd722e0a4523201675";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "dcd4955e1a61bd5e90e7b26dce4daa71545b337245a42b44ec5af9d7a9cd455b4892cf52f219b370a974d5d296f1d93ad7625fff45292fa7711bf36139327799";
+      sha512 = "0cc5216e10d54635b13686bcacb59693150e94b9d2aca544ab077860a1d51554d86dffe38b6430bbc722b66335cbfbef878068e56b2464b5e3f76d96454eda21";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "105efbb4f846c61777b3717e377167e5e3dddd50804c52694f4641756baa2350f54ea01995deeb0a751b23619c55b1806cade1ba1c3cd7f7cbba23206fa19f7b";
+      sha512 = "05f4b6419eedd96b327d2d50da249a699ca5bbfeb42fc5dc58c20a87e30280f99dbca8aa4eb803306abc7eb02f42a2bdbd2dd96e5553f21e289ce5e9cf83c58b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "2ef057899464c031f224b0997138dd1611aa0841f2ef2f611d8e2b9ab3849bf94e287b4ea8e08e905f42a92e15f9023c592a454d56f4ceeb7a8a87ff99c0b0fc";
+      sha512 = "59a093c20ef9afb1a25d0b7453c532558209abcbbdf10dfd20c4dde8a642ca4d7c4cbad912756b44565ab9d85b5bb33750e5d8c4636feea7b8a64576edeb5220";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "9d6fbb4afa5255bb77daf9c99412b8bfe44a9d841eb1940e18611e2480da2f7f4fd18452c49b53880832ea671967699de9a467405cebb17fc268ae3a7aedce6e";
+      sha512 = "676e9384493d7c93a3b87031fee59282c51d0325374e989c7a505f4fff7e8830fd47b972008005566c8bab81b3b1cebc24540b4e886d2d9e23e7999edd8fb373";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "a10300126f8937686d03c4acdc5dccd9570d7de29a25021fdae22d03fb3a87baeec45f35bbb3317888a34f3282e03b2b6ae728743863691f4af691d8071ab567";
+      sha512 = "28bb39d6a8d6dd5748488f950a768e7993758860a6f1ca9e4faac044b3bec6e243fb24bdbeb650139f55105690e50c4415122408e5d3fdf5a491229356c0d726";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "8b948d7c34a13556246a2b4b70383ec847daa70f623e121449e9aa380a709e38ef40e9f864a3cf7613ce549876452c880dd2438d75315a3c8eecc3ee3230862d";
+      sha512 = "24ff512326db7e876b3c809163495414861ccce2498a61c4408e5712b21fb6be140230c2ee3c2c66925dcc2d6a9a554361df298e682c650758e116a6a8cf55db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "dcc93cdce7d1d783478f85ccee378638c206221efb5ab5528ac2387d9afcea0a58370bd84668570902e03cb06aafd580cab2121d49167ddcbb6ac5e2803d6cb0";
+      sha512 = "2c8fcdd6232a0b143e353a243df3d204209456f26a36e137801ce6b47b18c71b9b189416f7b6d42b9b728b573c390912b9e4b02a39f97bf48d73aa930035f01e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "8de7b0c54d5d05da9598b449015d505813688f1c448a572513411acd9aab4720c03c15d6d342f84255cad7d2edc1891682e0398b9cc165e812704bfe9e07d8fd";
+      sha512 = "72879c15689e0af10799c91bdaea23393830edef94cc6d7c339080a519fce2bcae61d5ca213e3dc1d7d3692f17fa86e009fc7b090af6bfb7b2a91e00853347bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "d8fcf05b0072b03336b67df81eeb16442498345e624cdc68fccecec07d89a39df95b832968c1ed0108c0821ec71a89757d62fa9657a451f11fef25b0da90f918";
+      sha512 = "d117382ac21895542da8a3f5cd713715a8ac1f4b24e7ca96c24a79301a9af0be683c7d95f761cc4534a7ce71bb9fab94a766dd0e1f135789e0fd834910a65f06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "13e135e31e44bd08c784bbe5222f14e220579aeb1981d1d91f0baf67cb32157499c6de4be1ac7086d001ad6b36c6adc44f32f4a9d8f0aab727cea8fd60937e04";
+      sha512 = "32375c57103208e9f62d91c17799692ff5cfa675c338517a18f04aca6fe9846e768f334560591996ec225ede29fe74a8293eb2a61f7ed4ee3bfdb0238cdb354e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "c99b28303f9deb522c9e06e5c858316314638312607b64734ffa681aedba9427c0911810c87f286f1a785b77892e6e38a2a1eeab492458ff8b9a9f87de635577";
+      sha512 = "4ebc73c69b461bd5aeea6016f73cf7be4277e0bf15b21f950e219fd83ceb9deb2d950aec0bbe8dc95799756e892ffc97149116ecf78e6e28aeefbf090a894ee6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "cef5bd55f8510f3ff865fe8e04bae593badabf59ab9251a336a886b5af9f91a83502bb612efa8b0b295f18ca1b42da75cc3d328bd1916a10478de847591792f1";
+      sha512 = "095187047fb6336cfb2be22d65b65ae6675661a6a806eb24124025af62df741e004c93406e2dd2a130cea1fd9f97168b296329d5803b13e0d9f7a8c1fe032fab";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "0bc85a9bc5b4284db80cd18d414fbe49dafdefa58f62d7c0b83a06a1e0c6028721f7d2624a1a4d948df16bc316259fd27ac2766a55b1989f37f52f8fc9d8c517";
+      sha512 = "bfaed831a5d4f68318cfef05ef0b19611409c4712fc41d62176684b322811055802103b0c0062e88218d3aff5beeb395b3e0531dd086934bb19aaa662e0360dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e35e81dc05f83f371846c9d31bf62b69ebf4ea28c6e2a53821ea6509b4da8d575ea7ed616d546d900c0559d2da7280e51bd7223e790b161787f9ee85e2fc11bd";
+      sha512 = "2cf29ac5eb6923092a42cecdef22d399101eac90bdf0e587d608ad03ad10a840068efd71e93e1b940960c83c901cf21ef8adcc43616a59adca94aa507cf5dff2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "9e8ff522b661912c1d6cdc440015dd23ee2768aa159c157f29be574baa8e74760311e623c6e9d3cf4e23363b5f05a5d3ea74743b6f95b256045418c21e904194";
+      sha512 = "3359db005fe95e03b91c313867823dace52fcd3919370cff910802f64083a22faa0e17d68c64432985b5acb086cad50fb7f92f176529d8ed213d5e7290638f23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "f6c1dccce1cfdf0b92dfe076e9cb131763ac72bad4d12610e7baa74ac690b25d567c796b8a3509ad7b80b2b44a87bc0ef41e52134d2699573772c851b3f04cfc";
+      sha512 = "2a50c3cd3b0a56c22e07395835dd2d3e89e0adbc43f6db42dc3c837d08c5c5dbad6b3f66a3942c215a7b889046aea7d2143b0afbb2b5ecab62dfb4e9511ddc48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "65db4e9da91fa1033ae5efd14f60ffdaf6b1730e9f51f4bea7142bbe678118db19098d0e967b6ef08b1531056efa584cca6519aa0c5c490008ca740db6a8c50a";
+      sha512 = "57e11ba5a7815dceb0d14fae9b89fe4525e2574fbc7595a3d211b7f85c6dbb5c2cace919a58229168540c68301bcb3778e53699457d81ab5b2be1a920d0b4150";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "0565dcf2e97431b5ab728f8c73e5b26e9a411f26d712c3bfbf9f61cc7a719b2a38578b13f2ab8ba5d1e054a59b9e1eecbb5a39cd188c772a7d5dc57678b9f334";
+      sha512 = "d61260e8310e4dacc0db02b09dd3e5259120ef6087b718daebe949edd0ca19dc58a2a7fb80d0918026723d07d6ed61fce4f76de2c5b2b6fabff6c0997d3aeaf3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "6573ca6f2010c57e9a6aed6d6e14587097329e1ae144b4bdfff0b0e10d0cd7a0bcdeebd702460b9c4555480c81e5244f0eafb8592decc7d92ba8785bb1aa6107";
+      sha512 = "56b89b7da88988d8786b41ed8ca92a88b27f3ef6f1bd11930704b6a1c4b1a385d7ea89c647e9419e18be6e7f312e8141f8a91680f3c318cc3262a24c1564112d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "c2b613252726a185af0acaa181c455d0e048f3895fc9b4c781f25ffd8496c43d32a3f5618df653f79bbcc403c9bf869df327fa31463515b5fafcdb7463f01e9e";
+      sha512 = "9437e094beb55548663a12ffa9185f6a221b3d181aec779818da786ecb6a2127530b28443e0d27f92512417fe6bb775376291261706932baf4b098d4b2af4a40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "517370bf3ce8d0ac8fe765d93b47680c65698c4de87504d391b67b8605dac7f1e55db38facb8dfc4e35187828d41a63ad78b4d2c43cc6f2849c1d5f9fbc4e2ad";
+      sha512 = "6f489ca999a25af54759eeb46cfc47984cf824257256148abb058b442c50c32fa1d2395ca6222ae20ca12f49363f7c99693edbf01247dfafea3be034e19855d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "8c84e5c6e4106ff4118c124226ab0aff24cfcbbc925196b9c9a7b636ba975babd707a14abe2c5e0bb3afdd00d098d75dcb060a448c00f113e4a33c0cb884de66";
+      sha512 = "a367ae72ffb53e3cbd3bcbe648c5eacae9b360bf2f53070343ef72a18af28b858a1f0a65dd0004f71e9daa05705f5d915d9d3ef1ed863470be4d7074ca078ced";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "58c2d937db74b8eb0335b9e3dbcf11bf0a1bc8bfe9e5ee55e9e3ec6cd9a7f16b23e48d88824c2dda3d7f1f1175f0036757f0664aee8d60a9aacaa2e559cac616";
+      sha512 = "d18e1ea82f688a95b0c52b88e5cef69d49c0ff57b60a44aa8e2244591bd6e7663a7642246c6f21f53a5a4620e4d01ff86af4ae155b6312aac05e612d5fbe54cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "ce54ff7f7a4ecacd7ac73e48fd35e0b39b96a7e85b184f77ff1ad66ee3f6d32407ee58ca882afb2cbf65673d9e868f8a58962602097a40f5b0ecd5ef0a038b04";
+      sha512 = "f27e68805b72906d39016588d4296b6a59089a2f69531efac383219f53fc1e9c8a45e875d9939fb9aefc971ca6f9cacc85b477d9b8e21c5fc9e6a58bdb086088";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "e3bad92c631d647fe634b468c27ca1e2c81a69d14ffcee3a32d41d2d21d95f7196b2f8c426e51e81ea4f920ee0983290597e0b1edf68e182ccb7d87528da49b5";
+      sha512 = "2f211b812c5325a7a59518fec88f6c497977068600d9492263cb5e0427d2aa58a3eb5423b42747bdc88566df30b8ae68fbbb5accb799893b5f9a939dd8f55047";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "470d3662816ee35e6af0237ea6b9105483abf538928ec4cf329e596fb7c7b6e73ac6b7508e53e33cbbeb43bae1b115562d7c8c03721fec6ef0e3036576810963";
+      sha512 = "ca396a60641ef8694ab59753279b5770c264eb2cb25712b939cacb0f1ae6631e36ccb33f714e69dcf18cd935e1e02c6da0b064359461f8c7aa1fb322010cf31c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "35711515d5fc70e8c6c54d2e5f31b34cbe98f8ef21bd25135f64332edda1e5c336c24403f20b4443999354caacb3066b805d66ac7b7f6165bbf3bd748983702c";
+      sha512 = "0ca1a0febeda1e04ec3384dedffa72f731b18a6fb4b2345169d90f746c3560feaa59808da8ae7afc1ed0f08b3db6c38940df63574e1aa662ad493792bb71ce46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "21475be0c1992ee07b5a2cbfdcc0cdd25245c995270d93ee08c1f6bd01003809712af71edbe7be7254acc83cb930c0d26aeb49326aefe6041b3aa92169f2db65";
+      sha512 = "b4c640bc03720e2c8147b3ccabd2e0c7b493cf9f06d6a11d2f45812b33c7d066d4788aa90e6b3e2d84b7a7618db5584c97e8097541c45f74e76f9e7a01d1d516";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "18b75e3122bc57cd01a98f81d922e325a7d1ebd56b09963a071a14d05ba679d51e251f0d0e11a60c832c21e5022cf3a6e1a5292a525ab53e4c2c5b222a3442ea";
+      sha512 = "f13fc2bd42de9cbaab6a2ada2bcf8c27e277682ac57bead92a69e5c5824525832dd1e2f73aba3b1534110243dd11f9d95e3dead358211bc25e008dd09485f10e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "687465367d3498bab3cbfe31da5b0b4c31414d75d7af605c9873d8d2522d8502d3dfa271334e5045537b840e452f6dcf65a6f675c653cd07174b1bfdc6a95738";
+      sha512 = "5687c96c22796a75da37efc565a0652a0f1e2f470cc55898c5aba6bd399f4dc8a9097682fea2e2a1037bd6e100f3ad7d869b061a24c78fbd4e5db7eb6d938b4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "47e5866860fb3bef65399e7e3015d2486bbf427970107c449122b6c613a90af7d989c352937c39766e5839dd6c3fa31bec59e52fa013fa983a64125a03be228c";
+      sha512 = "a5a75325e98a510c506e056f6e1096ad8d0a7f4788ccae27092f407058a17aa15a34eb600820a723b4266cbb0874c90d6c9dae9cdbc414611673c79f65b443cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d33b77c954f66d0c575e7f2cf1c72e0a2da7ad9faca7c8934f96f8c42261f2e2c868378911eb7368ea05dd3a63207eba4cbfa89262943f2e551920608e0fad9f";
+      sha512 = "a79f703d41ca518ecb31d6dfafd776106ec7d3423f9041507770f41018cedfa71fd6315b2144e2bea4c49d83c0bcbe9cd5c57e4afcf30e04884eda252eb067eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "439df5fc87e7400c428c9e3c221d28b23df23a380ad18f441b4ef97149e473fd63185617769217a0fb20dadc2cb8277a9163b95ce580e5c7ccd308acdad70c71";
+      sha512 = "fe1a0700221b22afc1cbcdf7d726941b80be80d96ded4342cba4c9d54a0c6c8b155a879215e5f83d19471bc306cb2311bb731337ba260d0c7d537f9406ed0da0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "035eb9a6dedbaf84d3ac03afb68884a1431c37f0faaff9c02679a3bad24f50e22ae7b8dda1d552c8f50ab267446c32435ba18c06afd8a561ee763aedc323c7fe";
+      sha512 = "6cc3966907c92b9e0fcde5adc6e107782e5857958514206b4c25859491f1d864cc2a1ae747d0fe8ebb7813a929ce73b3e66f18cc139b661eaec2456086aa98d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2de2fa51df5a6bb63124f83b976c9f330122b44b407716f3db83465dcf998c667af33ae86ce63989099e92bd8380cd216f82d1ebcb327a55053e31902d4e0923";
+      sha512 = "18fd6dd3d3af822e71499a6517517b5a0e3a71b92883e37f668c2311e5a4b56bde0ceb2685e947ae2edcd8c481a3c3308cf5d3b5d8f0da92107e074614943a05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "12ef4e53dcdecafef1446cca82ce7446ad9aba0af9a4f8b83155d8f1a4447a3630eaa39900fb52896e12941d2d9d2a699a1b2c848d7a08ccb3c592a8c0eb5beb";
+      sha512 = "8e7ff27ba8b2205691c280e0e61e20dc67a00f37b7c5a40b1619179f1747aa76d37551b4d3d10323d521c815b01082685395dc8d93fcb8fe39de8dc2a12df917";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "129d2f2b41066cb2a0c476d6f75293ce70cb026d525334ed1218defb0a7dd8c432bef7564b008885a6fee277c3d41ec4015940c740e5018b1ccfefb7ac1df50d";
+      sha512 = "6470e39996855fbc7415b637965ddd954d7e8fe38230c5c9d5c7838f9a945d52f03aafce1015c30ce03b8eb49b6dea2f974068518fdb818213b91100cb98eac8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "8d0d9a27b5426b4cb6908fbb02c26fac6af6564073d6ceb94fab9f4fda6786f41f0cc8f115be011bf208c3625ed165eedfb69935ac9fe190121f515241fa8a12";
+      sha512 = "b900a63c29c0d8251419eb87b700392ac3504fa49ccc732d181a63cc7b5a3c26f0480b64348823f0e6dec6beab126c3c610351abfcc3af5bed85cd655057cf5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "50c6208d9254cf877644c0b409c699a9b7de393dff480c2b6c16fb342de978222c87e5766960e045d2b860c47058b5fa59a52a3902f55169723783ba0a19a57f";
+      sha512 = "867a9ee9ad08b33936cda12edac4de00e1c5b27534ba65a0f16ceb72b2713b1efcaf31c058abe1a64f296e3af2554a9f4c38337214a4f503552dd3174d6d6513";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "ebdf94a268c03eacdfcce2b5521d3e721c3487c1eddc80e2783bc210031a0cef484bee4d0d3622ff636f7524c0e9f294b0fbc0c9d7c6ca9ef9d793291f97e4d9";
+      sha512 = "0d65e598adde1f32a52250701f511993789c5ac9e68448fa5c7041a58714d2684617cdce37f578a5d2a498ea09a35af814d5b06871b0ae9bec8a71bec8bbbb7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "579d7bcc6d85b375b9443df06813d908bbe30caf50897d22f958c564acba2aa54cc4b8671097c7d094ef0cebf32f46d88de7ed748590d70063445360b73441fd";
+      sha512 = "a6495f122a2b6f07eefd8e29807155f381d1f89f3506193551fcc5d8e0f9d1943dfb5ca18debb24df965f1d1db856d6aa0dadbe98c2bc02671567573743f66d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c68d38b7f7e665a53c4d64d92bc88d7dd2254dbd8ad3d52e4dbe463a04186e54f813bb455c9cbc9e6451c8752bcd1fb5ef22cce5189fdf2c238a7713b2553f4a";
+      sha512 = "25a81d4749c1d95e36675ce329f7ff0222a1dc324e69d01681d39e1bc751355e6928b131bc345b50517a45c2dc3a1ed03cc7e9c82d8dc3a169796b31d4470ecc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2159f5a1d5fe6e5adf10dc575fe0540a2036bd26a9c0bbee7f45a0b582bf0ba0515a474f87ac6a7d7f79d743bea37e51cbd2a5c057a3a934d8e480b38c5affc1";
+      sha512 = "ee156726a54ae37f81a1da32e2d67988b4a0afdec52505982d183d6ded497a4257b81388728e733a480726076b7d61fc020bb741d4b640b19b7d24f7b75e86e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "291546ed7e8bc5d540835f8d149765765f5f4dc77b9f199e630373c1302a03c0772dde530b9ef391ab801e921a1d1e5ff407a233269988076e49dea6cfd0cd8a";
+      sha512 = "213541ef2037daa9a851fd7acd846da7b1a3ea8c162362f770406b653916116dab59bf939e8831a10f76ba6928a1e830258e2091811f66a7c6b9a1e4a360880f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "1b1c562bc9c0474a2d2313fa02716d8582b92af343ac0061d83f5266125533cdb65406e93857bf36bd35c6154bc0ef96ba5d963644df039bdb75722c177b4249";
+      sha512 = "32d550663ea09aef0f40efb1215f1388ecdcb3f7b00e4975cfb8c85912ce3c0b31fdd657672405a95c4dbf75952f14f377e6ce7cff96c5e663d7a1b27323324a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a0a30765b877d6278d2e00becd63bc29778dc0898edb0f1cd67a6e5e8eab7a840755539ecd7b7c99c6abd0f92ad4ca56356be7b8201d2203e2973025350ab94d";
+      sha512 = "023ddd41d19b74fc03731783ee2af94338576abdc9d5b64ef0a56cf473307241a8f6f89f2a053eb8d8ac003d5d7d70d97edacb47cd22039e9ce5b8472dfa6230";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "95edfd17cc60fc097451742cfbab507ff2456d2621132794b2c4c0997a2bc9dd94138e56bd1ca0f3a43964fa5ff29c2d21aeaee2666ddfc0adae798a84207bff";
+      sha512 = "4e5cdd14e31d280ee1d7b19e0b21571e2ce509f367daa34b83ec903d978ad460b0aab82da748eaaa8e1a01b6a2c5bbdd5c53eef30bf486bf6b5f3228cc4cf5a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "58165e2444ae10252d8eb81e55d2845c627315b8b1889255e54d6251edc571cbe42a6616a6991fa9b5cd45383c48db7f83069eb423c6951732ff92aabb3c0033";
+      sha512 = "5800be044bab8e785288f26124b03fcca04b9583c4ac98add9679a57d427a92f3b7d77da045e845da581d9ed03c46217baee12cb9d336634881a5cff2aee169e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "06e32f99550442c2a42f59423585f9821284f930a252d36c189f857d874cf8d7ec24cc26717509add8402147ed2d7175c937ab48b22e1a6eb748efedbdd29d2b";
+      sha512 = "e62b9ea730f9972b7dbd32351a3b04f42f28cc22fac3021678880e206a0d1e7f0a2300cede9d7f1caf3d36539e40aa6c9f7b801dc89c79860d8253a12e22fc70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "d88507f09710c55280ba4df1226c1d941d35fe29774dc37474a0b5e61d0b296d9c7a357af21a83a4394aa1d86c5bd2bbb320f7628875d9c9e7181086ce301b06";
+      sha512 = "8d629e2507fced857b5845ee1d9a191e2e9a4931d5eaeec4bbf2aa61d242db053753491e9bf196b7a2ac6a9ed85feddbff3044ffa33487109ec7ef4356c4c184";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c81c4766894a5db74e5bb73525f4b3ad69ac19e25f877f4624197518a3e75396041dcdbf481507a880afe29469e0eda59dd4ae7a3be50cdfc0a3a77b8299c021";
+      sha512 = "5f544dff7a5c450ca05518d41d4da8aad54425118422b59899111018b8e0f74e51b4aaf1b98d0bc7cac433be7b4a45bb6ac60cde1b32bfeb68119b87d929b33f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "d58e2348efdc70960ea475533c4dd9b25e581024ebe2810a7c103d2a842568ade2bd4a53e27dbac1f2ff2ef70481b330e59d7647234ccb34480bd812f6552398";
+      sha512 = "fa604356e44f2ebbc2192accd634f4ca17f602ddb5b9581d023c69988752d2f9a1b33173bf84a101f797bf99c8bcf6a7e34c6f53982fad2d419956539cf56363";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "573669040d33b07afec48131953a368fb9cd661358c06b6ce056514419e6fd51a8ddc4c546f0a40ea816338b6f250ae4841f7f9b7ddf8d3d57e73f34ec55796c";
+      sha512 = "b9c60aa1bd66d9f0f56a260aed3fbeedf2216aaba539246c631f46c5fb3a23a8129360100b37387cc312acfb118d59a4e3bfa17555a57b00f1f233ef97f3bd5b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "22c99c2e64ccab01af2723e6edec7a50d7b2b4f9f0f5272d502b6d6e866551e72c570ea140e9283b304d1af4cbc86300a0c7e54478076554df8bcc80c9e33415";
+      sha512 = "e4f149c83e67432aa31d9ab91c50208828069e49df69ea83ee4b3c281bcbfa05dbca71f678725bc41ae044098b9e4d61ca2a13188b06412ea58845739f76403a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "7cd232ab70caf61a9202f2598dd85be49e7039fa1138896a719fcde3f63cd8dc893ea4c0b9bd832cf506ce7b9c235d84fb353ee625ef0c70ca3e26c2c1c69315";
+      sha512 = "6c4fb2984588621effe18a159ec17e1c04a95bda869be2d8498afe07c29e461d0f95c84f2959169b10d728cf3bb62d2c6ea05f794292953ae8c07c831051d1ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "b73b7e75d08e8476b7bceb3f86a0ab7d632e2bbeb3916b13a2502bfc4964ec1f98c6ecc6941a92d19dcfc29987097d69ec27711ad011db5f8205f79120fe7904";
+      sha512 = "18ba0661a6d63004ad92df206aafe3215f50e26e91aebc3b68fea238aef4c0b8756cbef9a6b2078aeb5ca0b38de8a1988ff548f7e3c5d8ac41b85eeaad88a911";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "6a8c4ee3f89bccd1fc69e8b896b3a66f9086272deacb0f112a36335a432dd3e0ad6d3017036b931fd7951503b8e00d8f11588fff118d1051702a0477cb360697";
+      sha512 = "53859553180c85021ad156ba21a7a24d4907d4766646689f7f1835e4c3f4f5235cf0148363b0c2478028c3443510ef34fd09b03ec70c21b7328ee5a61f0e1c99";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "6a84acf5496974709c2ef4220cb56d4714d5eb8b4e731de17e4cad9be9ffa2e95d82440e0e79e19dc8abe91e56d67f09c4505f57b62c4870accfe1d4685bd97c";
+      sha512 = "e76e4fa8a48dda9e2305a9e5e774559e46199b2849ddda8e14bfd07af7c5a1281615bdb743e2492ff7efdea66d9b8f2ed2ebfb28920cef7262fff16178f596fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "274173672d91953fb715810f314bd8aa5c5b6660e8fdccb91e09d2e3b6ea20d50e2cccce45f201405bbb3b0dd41b1f7ef629c6caf5a59b9fa075e2a5c88f556e";
+      sha512 = "509c28c1cec65d471255c79175a9b79c9967beb0b2b772bf0b3417bbd39b2d4fb8cefac5e06d7658395c2770bd6384ffc85c73e5939901b51c9aa049e7b4c506";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "5d742221592d1183d4f66dffa5d6993eb81e9ae2bc24a664cd41006d07975f7d9bb5f040f7f7ab763059424ec835e6d0def4ac64a468a472ee23c74c883687fe";
+      sha512 = "a481453b0f458fcca2fb622ddcaade281f12c6e89f66f7b6e444c1a63c79265c49b020a67f24d28319d3a46606b49dc6ce8789b638604afdf618e28ad6bfac4c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "f2e9a764a65712a5bbde251050c39d6eea91742afb4eda9de14c9d0834d66ec4db56c801771068f0f67a2a38dd634914cfd83721dd78aa7330e8f6b7089a313d";
+      sha512 = "11aba32937132635c0334f7760c3232181d20f6bf972d665ba59baa5a3d72572693a36067e5513fa89ca2a911f81882e23a854d088369ed4ff6a146c6d743b79";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "87e2b22d6c3d8050f65bd740c10d37f30905091f25c9a58f90f221afb2a3063ba0006fcc1f69ee05f168d6bb7c5222f022bfa5efe0827e7aad00568867797322";
+      sha512 = "06cc5f9bf807340548e63fe3b32ea142dff202daeb843d6cd1677c6f61459a9225d8736f0e071b598760e366de50dfea2659ef875fa5ecf4071f92a01587ea29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "9687868e5f87282de362e1d2be7b54c150994f33ad92dd5cc4fa0cbec1d817b36777b8f0b95f50c691b20b83f8b5c4252ed40541b4fa6f42a6a10dc8dc1f8b45";
+      sha512 = "8f8973f321231fc8f2a4a1e5dafd7960fb34c3fe3b66d9bccf449a182ac108b29bf1bb2d04fabea44bcb8a9c4ce4ff0b870df2f40a3282e8384e3371ce56f496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "593c1191094b080a76c834f18c63f5f64193aa1d3b48fe5788288214ed98e90e4736f4b8ac413982bd9a793b39e63b515c293abf5822fb9e3b8a4a05515fa667";
+      sha512 = "87bcd40a4093a822346f2d2241eda1877764246171766be07b32be4bcf5b7640e438b19f9b1e2243c2658c7e4f176c28c9ef115d813b5149d384f0e5c966accd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "74681ade8b802805525bf61c27a2b604afb584c0a9eefed283eda67b46b4a2ddc37df527f05d46bdf3b650a092eefb600ceaa683a477fbab80506ca4b1ba48a8";
+      sha512 = "002fa901689602a3adb01070a5ea8f30e306aceb3f3177e52190959d72e2afdc5181fac58254dcab7d77860e46ed0e8d9f56eb74407467d147e29281dcd7ae39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "fd43952d81b426cbe4151e091b3106b539211f9fecc390037e937388ee28ada5059442698ab93221635d1d1454fa00660b80507d10bb7d0bbbb775f3ccea2957";
+      sha512 = "2a32074a47bf7cb67b1f35b0d20bc253a9f128c6ab6d69329cc64299476a94b20d45c878b48a571b4d37ebc667c7eda5ef91d2a0fcff104f7f08f1a1627d02bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "03a312d7f7366d0b94fff50b72aab8a89f5d24e060ef14cc63933b08e0c9d8134bb2679d9d8435ddc18839383edda514dd9be5452742d340938f32267371a08f";
+      sha512 = "7f8e5cf1872945950173d294f49911255d8bee514c5d839841503f0ce38e973ae301d69724831a4841a17c40229885e41471ed7fd0efc89704c197ccfdd7c3de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "f25801ceab9845ee8879f793a0c217247556fc965bcd9961de22d19ad4d0054aa7a3aeba28b09be32d0cccea12b799227809fec91f4c9853c7ca63d32b7a7ff2";
+      sha512 = "4284741c8a3505de74cdc7cfe903e696fb4e7ec832b08b9af89a32345d10658030bdb0219252fedb0f04f7939fcef351af9e3816584974e3e26430665767802a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "274d46dc058e017646bdde4cb5a09e703f390a75cb4a17454fe209e5165cd1ca8758c45857a1c7850e084d0e2110e4be3544667e8276ce153b710465a8a9f188";
+      sha512 = "19eb961a94b11a6cd49072ef0fbd0fbf243a6e66ff2115ca601ebf8b9c09e98c0a3c27086c923bada407509bb7a6e08e1163120a121c88c0ef63c4460d04f547";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "3abf6cd33273e42ed501bb913fc6784dbae65e61dee4ce69808bf3f704dc3613f722a4b030a0f9b9cc6a09a673d269238d8c9eec18b23a2b4f8d9a34bf32eddf";
+      sha512 = "537a30a7fb0207c120d42b2f77ab043df3a6ef9454cd93584ff95ddfc084bf69266a9cc2efedd00b69f198eb0832daa30b805a5007d6b64eaa5fa248b4e4435a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "00f0af1239b2de5d4f967d46dcd5dbbbf13dd06b59539a165255cfbd5b8adad19295a2affbcbfc23cd1d8418a4e05f0024bc3f6d5bc6628ed36168b5ebefe5e6";
+      sha512 = "fdfcf95cbcf4f987d1c83e63189c68c856fb9b22c158693fff17038a4883e1080d41af864057c96635b1ce5c7e7260f8e40546b78be420e60a098a79252319d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "e987419db7b28f82a404c80866367704a37580674d012e29c465856aead83cec4eb234d265167c70acffb5411b2766ad64a879c456abb31cd65fc867c339f583";
+      sha512 = "4c0b5adf6e043ad1f1db1fc6dae2dc4bd9b081f890bb560436d16e8766582c44c2eeef2662b7ca4042f082eb7c6ff73d816ac9cc505a2b4e6dd2b960bee65fd9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e4c268f4729108302c2d2dfdf338ca30f66bf369e2444b22fb0e5b3f6a4c383d0c2e5b2917d18d661980803e930495d943197cb47aeb729c3f1b6d82be14bfd8";
+      sha512 = "c84be688e42579df606c86ddddca874c5c795dd23897f26a6755f0bd70247f9706acb204fec72529a94a32027307a4f587c8746c8765994179d99db3ef11ff3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "6d4d6bba03f2ff18da53c6f7f2ad9138388a7fed7a02e54bbc8d09be24aa955d5fa1c5890934c768b1a371abcea4772cc455545e9bfd03e63b3b98240f12ee12";
+      sha512 = "39dcd7bc909dad0b661f2e0fb9bf34d24ec96b10e3ffa645ff59cfb431e303223ed0de999184de3ec731a500aabeb869d2c1e12b67868ac1ac71f2451f192cd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4a1017f1f69486d56a637ab41c7c49f4f3f42cbbbf2a2da2a57f61f7d87c2ea43e7abbddb0fa21d56bd13d72e99881fae540626a8b7f069a661778edaafe3738";
+      sha512 = "20dd0f2acd16ce48cbbb54944b44e389ab6a3d0d3f37b4cb01ecebb7e6833b5006135c4a20b7f55ca4d8d4d2dddb124b06534aacccf4f2630874d46b3c5fe36c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "5eabb44a30500e5f8ee52e4f6ea8d82133c4ccaa5130696cd5af1f1e61efd47a0ce8fbd94e1e9ad87c2c8d3d73b0aee23f0f1cb933ac7c14596dd6b2b7baacb4";
+      sha512 = "c31adc5dbd09f282470d16680f5f80e37ed020d1b77d394e157bdb4a29fece2edfd7dd585e4fa3231a0b2e58247702da270f728875fe9bf886a68d5eb8a48a7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0018e56ca7e476d7aa8fccc55dfed365ff28592f387630fe4d72828be67da992c23d28206e6399b942987750756ad4ef98600463abfd86442eee3a6caca7a39b";
+      sha512 = "1007c55b9481d35b9611ae42a71ca0135ae65fbd9a13e61cb5a90c4698ed1854fbd4129d14e394cc605362da3b2c22fdaba5229831353831ac21f3390af06376";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "7ed4a945cc3947de2b31e3045adfa2387e5ac7bc9c6420cee1c8bccab27e05278707b7ef15728ca0e89cfa2ac62fea0a155a0007c8f61178b56e8ad99ac8771b";
+      sha512 = "3cce46878580911ac18633095cdba6b180da1dd34ebd3ea0070be8e1ba3c1200c3cf46a8e00c246c95b4efbc32182f36be12685dd5873f57227e07e6a826af92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "dd45ec9ae649d43f7bc14c564cad8a5cb0c688b18a78296f01e60ddce161e43ee7f9f1d422378e560bd9b8b10d2e061e9e50d3173dc671d775e5fd64d5b977fd";
+      sha512 = "9f973ab872f47ce77130482cb4e9482b16edcc0445ca7f05d6b264eac288263e97326938904b09a43081766efad4c226ef5b5150ce9e4c640ad369f416a8325b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "017d2a07d554fea7dd140d7bf22998b3aa575086fe3145503a178369187c1f3afbd45009f08ba8bb0b0885b645ed0576600393315b02e356151c2c64e96055e1";
+      sha512 = "d681c9d2b0a345f144c4af91b3eca2cf0e23c0fb9eacf942ba459bf1b73e4c70122b20131714a3b92d6404f455877963a80bba3e01d2d674e56fcec8f76d4346";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "f24185e0ed7eb3f1982be22b74276aac1930af09f30184ab5c6ed3d3b2adae6c4ad05dd4d9ddc8a743c4482f503150f2624531ef1cfb58ae88b10a59773c314e";
+      sha512 = "1d32114be5bd45bd434cbec1a7cca2877aa324d57c02e1541f0eb37d79dd786f7b55fd42b1909e3ea3d6b4a3ea849f671922b8d95bab258b6f948480fe6205b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "28ce5d1cc9aed67c5ae6735e9712e42bc30233237f0597e12f4ab96c6a8119bd6d710c646b84c830023b41aef8a5bb8694a652b644c7ace78bc55381102b237e";
+      sha512 = "6ded88d5bc40b5878462fbc17a9af5e26a6b3cb05e53ef25050e24f98992e226d33a7855cd34eb1b73770e57cb9ad53bb17b9d711cdab969338c6cbb38837500";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "2d73a733ed3b6c64be8de608a00b11f1ed2e300fedc5111f9a92b1c0fe61b61eb043b6b9c71eb5fc497813d1e4dad4b940c472d119697c6dfbc6106751742834";
+      sha512 = "543eb909ae6fa971023cdbffd2a312f269ceb9fa20868d83a9e63bffc9936705a85919826577ed9a286e89df4a279d8a1b123ce48247443c7fbee96457ee3c7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "f3621d39d396a32cea4d3fa41c83bddfe0c9d05e3fbd02805f1b87c9bb8ba517934602d06f7cd7c8c80f5ed4aab3df275227766aa939dcb5ab35305eebf1b3f9";
+      sha512 = "84262bbb055a96332f34c6aa26b9bbad69ff9e066cbc60829ccfe5a59f64d6c11838d45ed56aa3a9129c2786abae5e9f5fdc496759d87ba3f98a7e1e7db548d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "5cf7ae648c8d6db5d896a76183b9f06275199db489dfea6aa2c28bdd9377b22a5ba4fee0931a2c18c22b94239cda8d972438a63f2f6aba867051f8cb0152965e";
+      sha512 = "71a95fce457d0e7f07159241df7739b5cce62fa29a53729fbf1157bdf3eef85fcb9d277b9cc66cf67d767102e7aa16c6ef1bd371787fed4af29ce620b6b5ece5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "301de07712dc015e5b769aed8247461c8e15bd16955621a517206fde83c6c4599ccfb654e729b3a22ae6b51952060cb27db7b315f566b670d8c2bffb514959bb";
+      sha512 = "f12e626f88ed3e726be24322d21f126f3f30cf0acfa5842386f51d5b7cfd222b96978910804f631bb3f5cb4eb27040b01c9326e65f61b6167e49e60d6a40afcc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "65b8949e7e0ca1ba596c7a40e75c3c463646dd72a044d989e68caa54b8aeab02403870040b7a27ec8811adb62046c3426e38038241293bc5e0308882d20d1077";
+      sha512 = "f5d0a876dd4f6644af01fc53080b6126ff9f128d6ca990d0e125c4ecf04a47c770a87e1fbe6975b3262449f0d066224cf9de1964cde57d0c3d7d50b709131675";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b49589dfa85defb758c71f221f309869239039b5c8d30d40a6857d4e92e3113741a8eaf6e55e073f5a9bd212030d6497c05185c220a3249ddc2a4a6c6880e3b2";
+      sha512 = "af9e5e2fc9bb7e84aebe8cc12098a4a3a8cc405172a7ff73cfa3c8772d8a5515dd3c5647d7d51066a0a7612553313c5a05044740f66358452ac0a8c3d6dea227";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "a17982cc3590d552f907a3f9a5af3e0c3f234b40a1ea285e6805cec57b793645cd79e2c37422a2f83d1e70617a1b5a4f87b5c315d9fbe98293e061b2f836bd06";
+      sha512 = "0851f85849651463b8a841de88e69820f101b468a706e5bb0986debee21f0d7f0abb9f52f7e89c097361a21f6fcddb4d57f17015d41b1350dfb36b00b246888f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a9938d962796c573099a721a3fb8a4321378ff532e265bc4ecc3b09fc41268e236e0726e808865f4c655aa7f88f1f04ab1e73930a1a9a4a9d634af1bf8bd55e2";
+      sha512 = "b16ef7812f4f5f0cb4655ebd792ba38ba4858dd93713819a26ee9ad794d8754fe55bf6dae0bb6c371424776f9dad8c13e2449a43a1f14876ed309b2a0f9312fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "a0f4a34628d805ce67b858a7f96368637c90c126c52e7fa26e540483ca201ab02d734770006ea1cf2c960f9cf614b9f0a326ea74a77c9e0abe3a23f3d6acbb90";
+      sha512 = "e337b418317b2e7a36d265755564fd6ac6fc227d59b31410b305502d1002b4d8fac06339f2c750bd9b26cc42094c89fc4d92d89c6dcb7992545489777bbc1f29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "c87b8d03a22ccca2d57339797182ec37adc12b40bf4b83d72120b76792cf28d373f0948fcf0a06c2e983255951a026f207be8153169d4d61f493dab8b25242e9";
+      sha512 = "b83ef927a63ea25990f0a6690eba195360369e751ae0db446ec093e51a5a7c187c3ff902e3deddaee9b395359db4a7edec431565af167fddfd931d97e8078752";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "20d20ed92b7fb5fa440b39c449000b391ba85bb3a4e98164c0529c150535cc992fdc7d3f6e8585d7404976e0a1204aa62e43fcad190c3999608dc6c5e9233497";
+      sha512 = "af8447042c0500fa5fb6f16f10a0550bc70fae412b5f4eb8e39fe8eceff10b22cc0b11357612ac1c06cc81fde74d9ebd2b6335c7c84c0c88e82bc6671257e8bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "c97905b3a5e3ec660b75348c2f9406053be2536600ce25bb43bea507aeab7a3780c8d2d972de05c17f605ce3a728d6197e1f762773d8141576c1e3e367f44250";
+      sha512 = "e59c323f6e4336b198f4785c1bd3d8a48577eb2c202a63c264b604ff16c2017ce43a9b05f7c0698995e9dd83278e817a056a14a5f6242065c2d50e545dd99c10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "4a89765b60bc1c82d06f503e62274b266520bd1ecd1d3599074351aa825a4280a43ee05b8cabda9c6ff44451b09e02006e717eb5791942ac9989d1be79041655";
+      sha512 = "691faefa9a8f7ede8be09126174d8170c62c7cb670ac9373575726ea4eaaf64cfafc04312ca21e334f095b226d5d1f1dec860f6cf2e4a482adbfc22970c033ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "af73da40aedacc3aef9685f5916651564a6e329e4e1a97eb968373307d9f4a7d8ce81f72b770166395305e5dbe9043478d6164f89f40383b89e10dc3a2c5a107";
+      sha512 = "b65f1b2ddadeab279afe964da9097211b4cc5956ceab77cc48cea5ecf6815de03ba8e89f39b5c3ba4f7915c7150b8d1951c7fccdbd7f7db71a53b732aeff7182";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "ea63038ec96426dccd9b8ebe13ff632794b3a320888b3f6f152a06a3c9e4fdabcf6f600351e5012b90ec924ff4dd9826dada493d0adbce4195ec9995a333a2e4";
+      sha512 = "4eb20efa50dd34e23b08f1bd25335cb296c8d5c4ed176e7882da4e466563e31a4cc1a0c0ad0950a7a892b28000811c70c7158a7e3da26c02d05129ef13fa0566";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "797d27215aa0e77a40b582bb7f2f45a1411d8d4159bd61a55fa72023c27f514d916f2b1fd5a2b89c240c1ee0142f54cd2934e4cd641f616d2efb6ec5ae31b98b";
+      sha512 = "4dab2d22e41590494366c582ffe8e80a2a635dd1b7d57416e51cf0c723cbc1d40c6964a30572283aa7c6d6312c54cb97a6610877eea1b4bc989ec871316cb93b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d3295470724ae625f603db98d305dc67964154e86e7b28d80bcc688ce87525bfe33ce3d60f315f48f70c09c1d1301656a46ac2acc8b312a430f625af9e2417b7";
+      sha512 = "f321afa413c878e4ed9b80c1e7b356a70125ae3799b2b47df32a011e60908f86a27572639df10d4826922b73b6515f463a1e5e0b3d60f8c20afb8d23c18ccf88";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d9d9094f4cbb2f5659b598e332256bf77ae64cc162bbb8e8998e2d723ea8f2d65e3632b60a358e9f2e753cbf877edc59fd21ec3d3d99608bfd9090d24957d641";
+      sha512 = "d177a9a730911104761d6a7968aeb1cab62347438c5ed30099fb1fa9c9701b87562f081128062b3051ea6cc0495a58e4a8fd9b8c82d4ed7108d0bfd73da2fec1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "c9c38f5bad724e4436519f01f0e25c715e7e107792ce9794fc9bcf7e9bbd687331efe004b10f18cc942f668504a43bf52ac2005d2bb663b28c99943dae8dcd01";
+      sha512 = "15e665808dfbf076932d17196e93f7db271d8f948ecb060a5f41934d59d75d6e7beae2b5abbc4cd5ba86e59e493c8f41f6a316f4be6603c0ab009714fe073391";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "2b23f50006b2bbc66e79851b91dc62c948b75a00651d294afba17cf124f612c3bb2d39e9f8a56a74db7a8d22b8487ca7b600a453949973e1776be50152d5fd21";
+      sha512 = "ddc63cd63501e93c12fb687804a2d8ff7b5a4e996456e33a2d9b3531e72d9c85cd7db328ba3f7195ae5ce2b565d40fb4a6f2778ea7f6161596c3e21f5491eb13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "237882a2ec8d52a77fe533866171578780f74edcf790fa4515fe98c804491f86f76b99c645854778868e9ea58ac3b2cf75d504479d0c24fe24911c795e6e5a71";
+      sha512 = "1dcebfad1e5d987626e2941eed30b5ac84dc304231b76963c062561b1784dbd6f42bc7d01c2008b32cee7868158b786cf30dae7c5c8da1a6d8a176e9a16af591";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "d4e20f24409f05b541d5dd556b1270d609050b650ce708e2ed33e826ddea1c13103b2983bbec34ce51c52b7f2471e3c451775d6520da34d17b2274ef1db07fca";
+      sha512 = "aef13bc353d294944df1bae358572c9a7922e8ed41a8225d987ec6b4997aa317351a7684cbba482ff1928b63d3238ee85d07198bb8cc6dbc1a2e3b0fb9c29a57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f3c4726995f3daecfa23ea19623e9cc9c9fd3d90049176f16f4d68a2a17e6890448432c827fd6c1b9dea09787983cfb3e9d89683a05923e6b4b23b3c67fb0693";
+      sha512 = "5f84a47f2a22cfe759fe42b832bdec237b7cbbbcf26024a1508dc1a893172246a52e4f165d57bd082ff6780f00ff2a82fe574e4d521b29d98f0dfcc47ac152a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "5e6941c9a3a2582010b95c45dd7b49b6dcaab47e54e5ca67e7b3956729c5ad5978dd3d4ba4cd28dedc9d89592ca95b895377803836214730e9f1f9e5b4da92d4";
+      sha512 = "303b4320405c301245095f0308e9b3757a502161bd43f3f6c5ea9255656dc1f394322718535887f5b3038dc0d6390483e74a6c5ff45fc28296dee3d83afc9425";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "1a6126090610f906731f13dba405f167935a94e9583ffba4f08242b3882961ebb91de720a23b39ec3d84be5213893a9b82e2e9ca91c6cd70466ac7ef1bd600e3";
+      sha512 = "0e9eacf033d76e672f460b7b133ce5025fda39aa4102e55199f67691bc9acf121c78c5251b9ed1e7ab49d93b83e4bdbab6bad671f39c22a490103266d09b667a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "bc638ded0b4b14c0b347cb5c24f0988ce697ab29ef08f59633123ca38b056c4f7bb0421a6045835ec0875e663b9730d17cc7f7ddd8bcdc98f5a60cda61461ed3";
+      sha512 = "9b2ced81ea8deb62c0fb2a6fd3e660362ab64ae2ee706c06b6af0eb33f25df4bbe6386019cfd94f240ca4fba6e30d5ed51ad4c5b319afd76a2e5a62d6f0f023d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "fde6511fad810cb5d71fd1fd0864ac7a40dbf4535416ff127f7b12799ee9e220e3afc93fbabebaf8d6cbe939e54692ed3edc5a381fbb9a693c393dbc8f970e90";
+      sha512 = "1c4d3718362aff114193e92284c981a9bae5acbf956aeaf96d0ec23a3d469ddd064f5d7ee4bbe8c661bd644875f08159656e7d44949c59f91ce1a88e9404ffa5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "0b93c21e1d0c99b89393f8fd155d62a4c72a8c1ae488fcc081fa0895fe91ff056e44e2405e45f4a7139e9cba79c5cd6ce855f614f40457bc9adc6d592dff6936";
+      sha512 = "bcdfd59b76db31c01ee7a69551dc5c025858daf3f71a593f1e8959c8af20227ce3240234aa94f7bd53e753bfea796a29b7f82c924396a130cd895c134ec0dd31";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "cc33a59bd8b5e4d07204fe2dba1135c02cca9ba60ba6439879b5dd1d7b32a21e9d5809e57345a649ba5b964567c3d30648508c1292a84dc381e747ad475d0058";
+      sha512 = "207d4701dd75d5b88bf06567b13934f59de38b631683275ad7fb2bacc4c0aac62ee5acdb1520c7c4e2671b33b06fad119ebbc02d04e583bcfa732969839455c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "6c9b8db39a70abc07296597818a60d4a576d2bd9c0231817e85fa17737d541434cdb838a97011608165c1da759d5b9d295eebc4a790564ba37b56c201996db3c";
+      sha512 = "01a29678e43e8dc04c0a0340c6fd7c723584a398e797472932792b24911d2009e0a952f4031a3f11ce7c803b4c59b8d8b934d60ef3373204019c4bccd4d44639";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ac1017981cb75d361d1f8c7cc823fca38303c39afbefb3ff87d48d95baff2cf0a4dbc9863dbd55fadce85949e52e7e61889c05cad874686ddc073ed6e5acc228";
+      sha512 = "8037052b3fc838001f3159dd64254cf36426f9d11417dbe032926c263648dc9b53f451d9add606e6ceca0ae4599ee1949d92ba8f908fe16cbfad1e1a72b60279";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "f5f1f97758f00c25f39f73b8e52a8c006fe653ceee232ca27a3e69d3b2abdf6316c237b1944d26dd39b51300aa72cc20c4b3d304aa6f1446a96b6165cf4f8757";
+      sha512 = "c5b2f583b8fd0cb8fad8057107663e875ccf84d53e81b2cdc32492924feb33cee1cef726e7455f316144e6cad8341e4b8b74b49ebab26de22b88a4833ea25724";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "9b1f37e9d97126cf3ab5500c6cf15bb161a286e0d878fe58014a7b5024942b944c9282b9b9e9c3587170a12d7ef69095e21d1db729c2b96db29c97b9dbfe9a42";
+      sha512 = "f2adaab166d20ee7b88fad7a3b9f1fbff7dbec6da77d48a44dbd4e1c74413db847cdf9b234f73fbf8cfb50426f0cb67cd7d9ea26c36566154428ec5b28770435";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "14937d2fad302f93b0011037c12298c7319a1020f5e54a7c54f8ca2278c5a1d6517fe0732292fa0b84edbd1af089c67f41d6651ca918c677d814ab537bf52126";
+      sha512 = "25f088cfc5d1fd4e52db26fc530e239765f6c25329b34fb61c54a4b7966ada5b83e476edc5d57edb9167584709d32dfb6c5f04a45262d4003f6ac3f6f5e5d345";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "61db659af8241ae107265708a50683aabc1a920a35e6f32bdc5559de0e0aa5409f577b4ae5d49577ce37290ad5ff3f281f3b8bb5c775c834acbb364d499e5be6";
+      sha512 = "202e9eb99e73e0eb78bb04f3b4ef677533e78f9b0713a7697b8b0e98c3da5401b3dbb240b5165df35ce31e4c809b45ddf99ad986b953a590dfe77a8e103e6da9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "2bdbdcba25483797d31778851b9e611ffa15c0f2744a56a8e3447607bb83be8fe179dfa7b3a7d24f017fe34f9f38dd8d8b3d41a1cd783c34b9ae1c4929571ef4";
+      sha512 = "bb3a223835f8a5c0248d0b2372361763dce8cd2980ce32d7f9f89c48ad45708ba7687ed7a525778e39fc139a39558269101bdcce6cef6a3476ab7470b38d52a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "19a4552318668d0e11892ac4b4fa371c82e72d0742ff26b63a9c6eef0949af261c352777feea41dd6c17e168f868652e75c4f56a9947dee11886d264a402ea06";
+      sha512 = "0d804e8567ea16f8935d4c2eb0b9c72d7d701b10b2ade4a08559ed300799d2cc904a40e38b4d4200d4392b646c319cb2421981e1f238b7ec1d44e161239f3e8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "51cdc0570513a3856c4e13f30dffbe7a55c30dd6a88d47528637c1159520180aa6516136c1f066f37bb06f79f8326ded3b3cad23b0f244bbae11476d68b3dddf";
+      sha512 = "7d764f40f4695ab30fe8fc8d8fa6d90a4db123994d2599ea81a771962832e03976361c06c6013f65f858f323605ea812d3aee1946ba02b6be11148a0f7fd3761";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "afc8732c67674956ecf9e0678d9459ad7328611d3f60b222871444c7f0a55989757f6eb230157c2bddd5833bd99b7fac3200a8a233ffba392f1d028f3d52b5b0";
+      sha512 = "1eedc5f92c9d776306e33f5faf984256a9a7b6f00c88d5e844a1acef9ac340bcf48c8016b1b398e85f40a7c6e211aac3cc31ce00a6f583a0b07a1cd1f3c9a9a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "4b7acb27a1dbb9982c624f3bb5b9d97add88fda23155ce4a8d0f6436e68a9073ea3df571f61e186a473c3c6d90e0af1f43d23a2708d04192f206d3f9d9c726dc";
+      sha512 = "90107ec2d734c3bead2ac24e0033e2f26ad11dca5f43c59bfe75ca44a33943f76346ac0497659891ca4aaaa10052bb157068a23f2e50fb7680c7f42fd258abaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "4797e5748f46f9c8939e225011fc42a9ef800cb1b1e26a875d59212d7617aa83d9add3222f51736c3be8bf5cdfa2668c16a89997f07e135438bbee936cabc1c5";
+      sha512 = "472877591d3f8ab1d1dbfa6132e8a6e909a62cdf5def3cc196870f0614aa0c02df9fed0138fff0b8eee05e594c887bc02a24880b11bd57c23dea5b0b0983b29b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "dafcb551c537397bb2d9198e1f24bd5ea21e727c6e35467782ba9b1a4a7dda6adf8fe5cb1f7f42d7da701bf3f5999244de5d3dec2cd16331277ce0c0eb0d93d5";
+      sha512 = "8abd3ab256491fa5033d5935fc0591dfaa2e9d49e6e988cc5a574533950c2f2f46739346766c2121b89755c073d9bb555832af47f177c43f39fd527ea559a66a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "447e74560fa96521663fbfde6b4f7b398a1ea13a2c2432afcaadae3bb84256a38d09d4af43bb2666f80dafe3df0cdfc1d8470efd2de7f8d5d0928cc286f4c86a";
+      sha512 = "266267334b93f63a5c70298700f0b7ba65dba2c32694a5dcce0a330d5eb6e8c023c25beb0ed20eb883da71e4488bf5e7ddfedeede9d69c4135f5ad9462a1aa45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "6aa674a480e6d742c3309649d464845d6bd5654115b7171bb0cc5f48da05b85e9176c6ad20f58cc263fdd29e9406e3090b3061f702421c2563f8addce47827b6";
+      sha512 = "f8f23c2d0377b837c4f4ba35bb10ef8c4cd27a298d9a5ab3c9f1d05ec5bfa1aa05a1417a1e887d79e9dc7f51e6efc535784cef78021e8985d8e52f04d32e0493";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "ebecec7d84d7ef6e84d2ad4377cd7d0a6b4ad12187655ac026df6691824b3ad1e5ae2d463939bc8c774b2d7d17eff00783083cca68436a3fa8cecd18920290a8";
+      sha512 = "228602ac0dfdd72dbb896390bb825611c81c91e004b82b97bff767b7b2915b44a379392cb4ae7fe3b5b2e1213b4a6ba4dac1877f1fd059358fe8c96d483e3218";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "46a8745147751200c6b13e10c1f41db9391cf066ae3475e0bee0de11639f624322a087ee73ae6c19c2236c91034f1bcade605ec7628e24c6104e83465a97baab";
+      sha512 = "ca99753782f7d750bcc657fbcf36a4d7897a33554e93ad10192a7381b490d420b23dd2c7d0faef8e85e9cf305dbe58e6d1c777ee37a40b998549d348260fe5d8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "6b27353e212369d04c96d83f1b62118c08cf918060ba9d46809c1f3cd1141e7cb7e7e6662216fcc29f9917e6c24914462bb1406623a312d07fb48016fc705410";
+      sha512 = "86d35e76f7d67c0a89feef879b470443eb86b7199189066850d71a47785cfe5783a0b65684f811c9750e1f1cca894a3e6fc0abfc9fe3c68849695a8b2329d22c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "5c7d44900276a10edc396a9829cd5ae581b9705627a8962ee9597a3b3bf57efb15caf054d7ed3bf6953c0f064a9ab29d1787304523be1c4c1ca33a307ba4a1e4";
+      sha512 = "5f8449b99cd446a75c2a2615fb9cec10fec2da30b72daf321baa50a177bcac90eef050798f0b1f99cd55967b2e7c350aa63cd9ce807d111816dfed1479296349";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "3d5e35caa8c65d8c6c9d88d0219d146d354089a5482f94c86a0a1a8a753010ddf1617df93d53a9eb476c285f7424b17b0cf8544fc6d969f3d7a26cefe858c8bf";
+      sha512 = "e3b40576f6cf2de97ba0051c8d9f215ce054dd07dcd5b8987543036ad002e01f3da3179fb54708de0999308604877feeae5bfb2298686629ccc7069e024e85cc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "f0ef50ea1caed890483c5a3496f4ca6986ef4ac526620c110187ee40766f6e1cf59d718d0745fc35c392d37ff1928a22f243a4d5842e81a34b84a63c53da6d38";
+      sha512 = "d4b92a8e92b4a0a731c22a01ee9b544a66393011cbc424bb9b46b935e80c82bcb3cd402a747a369673e97771a5c005ae0df300d358c531d2cc7cc9a8dda77bb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "e96f335f5142a708b55ffbe4327fad650560f66ca96c260bab97a02e5c6ec38dcd6bce61b37447a8d1029284024cc9a6798df35554474dc38ad59f29fa85224d";
+      sha512 = "b683ef089694cd799c47b7d5f2380ca866d7d6f52e58d9eaf6fe317e83bc4b1e7a0399f3031d6cffa138c5f3aa9bf5eb295ec656d2bf6f0cf106acf8fb5f5e77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "80fe13bb2d037f3082ff02dfa764f565213c3b0d5a98617b6a290de54dc655ed8838522653bacbbf926e0daa34e5ccbd60198779996c771ced10030c46da1dc9";
+      sha512 = "91f436012f1acd2745a30be41dd7e8515f4205dcb51d8e02f7b54a9cd54998e1934787b1734abe3bb111c8d5ee6c7f732e3dd7d8090655d37152f5d2704fedd1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "1612da9f841cebea951f1ae8b2f80c897eba920fd900748608495ab154e9443671df9969bad9923715e41c544e8ef63be3e998c4ee879fb58355234612ffbdfc";
+      sha512 = "f98dc5fd438ffa539bacb7aa277e9e0f1cf6945b9dc93b5e077c59f65ccee21f90eca04cec9e6ea784a9197c2891fac681ecd0b361e110422405b04b9d76bb34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "548058d77bc9d1076c1eb21f0a01be7fe028debc78ae083ff502c213bfe7776e4ac8480de6cf7338b80dbf38c475cd367564f1dfaa5fa8cddb5cdae0db2c7e22";
+      sha512 = "632d543561f33ccc79ce762ee5c93c4371d39867d2941d596d5025c0e307a676edf9ad65b3d1370d5689c7a1d54d36c1c470764d38b948e84137ea1f37ee2910";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7c0bf8c58d1c924245693cc02ddad3b886e94af1dabbdb3ae9344700de612018a75f233003dd2df698b2aca99b9ec4632e65d16c68980955540185842c9b8af2";
+      sha512 = "737b83ead2f9654c7afa632e534254816e7c00bd8b9220097eb63eb7b21472824670efe26e2e3a4a365d3720c0a74f96f16c38b6543c68165ed46ff479a22cd5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c287e9cf132ec16e3e8427854941ee89ead1a29a8a68a92a7aa35b615fd2b526db825a3c66dc86f30dca5d149c2a5afc7c254af64225ae7145718602dddd631f";
+      sha512 = "f71ca5f154f30252d682b32eaba396fe7419a374737f6ab8c64cf9ab9c65dd8582068cd8ac1abb6aa2b687528b5e95019ebb0e18c60550dea519ab104d3e3c69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b06eccd2835a050c560f56dbf94d41f455b62a8407c5196cca44d7c9237cb451c42a4ef266e5e9348965b01768f314ec7bc2f437ed896e23100caba6f409ecf7";
+      sha512 = "7761d0b4e39a402cd48797bef220450438c4a0bee9987526ed8fb1e68c2dbbc05a3668ef76a7c5f20accc8079e8154f7e3ecdb824d8db6a299b032256f0826f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "5747c1a9a1476ee6f6febb645b5140b60e5190eaea606a1edd8421cc1b66f6c98b710a447c6a8ed1b6730b5ce8dec47b69bf28810e17ce8b080624848618add0";
+      sha512 = "ca621f2849ac5c83a4de77b037b34f00a60b2dc1155dfad571296b56ff130c6a003a4c28c7749b3476cee04e1635892766abe7577901ebd7b1ca1a9089398634";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ec71cc4c702bd454ebab8028ed810fa51889d01f1b0d34729fbab44ce5489bea031f3c5f6ac5392954343ce050a96681d043406f29c10d317b976b5e3d0cd8c4";
+      sha512 = "4ea40fa5510ad66bdeda6120dae1af500e79d05ac970f5d67de6c94af5f9250e6f86dda427eb1e43b6fa544e33c33564fd970488836eb4d715f1af717f28302a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "147654e7bb5df1f62c9bc117d2badf0e3a92612b79bb660ca09658146644baac275a7d3f6f643f751bb585bef867b9ed23ceef55d72e2d02f1ff4f44e076e0e5";
+      sha512 = "cd9f467df91afb7fc193b97dfdc845ff958d0db05cf483ab48876316df6f024e49cdcb136e5731ec0171234bfaeac7e4facf50dd949e59996e45a442fa1bcd51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "baa454a5c4d8d7994a49c8cefd015052b0f3af6f55e15a721ac00e8e7108f83fa78e5e1e5c90576f0bc508574e2ccbf3c72524192a310b29e30a430e5928b8a3";
+      sha512 = "07cbd77ab9c33057d06340a056ecd34197f9e037527005f046a9b6cfdbd8347f04d6b4ec7b81774f0402ea642be955a2800ae65c7eb8c542a1313136ef44564c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "fdb5eacc20856b0735ba8e9f2ff47eee70e6c203b53bbc38cf65a4949ad939cc70ab640392bed4c6964bc4acc25c0351b4d9e2ee2b2d72f6b2ff3247eaa8e2de";
+      sha512 = "602fd5c1cd41c9f27eb8a0371b882fe3061125b80173f681640acf07678f00971c4000f8ab4aee3fc62313e4ff5a4ee4ba19fd44043d4fa2cad99f8998033b9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "7da1522c7af4e9db8f3fc7a7a2fa30ac12a06c8c20d7d53e0a0097ceaced9124d861d688b6ef26e8f808ba672bfe12b2ad3e4ee5921a0771d0348bf99a5bd1b0";
+      sha512 = "91891ab6d431f3eaeacd2e33d8efb9069f3671196e613e2ea0bf35838f256e3d9e333b25842090b708e09d531e13e2a234577af6c566af815ed8c5d6e7133c25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "a146f736849969e36b72f69661da5d50cc3ecc79542ddf84e09a12d9877b6d654734a22d28a2320b0e27c4443f05186bab2549f55e582eb6f2279bb1922f3979";
+      sha512 = "3f1a0fb3a98f6382415b24d9812dfa6a1d716716d1f5bd9094cd9b0fcc794cee2a14d19dc117e7acbab1c9743205a4e2d21964c79aa42649f27c65a08d47df37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "62bebbf542d9b2fc62cf0c9e4abca1a216c222ca97bf59d1c5639a04cdb13a230e80a1762af6f682e0bdc7042685b9104702810c2199bb4ff092e0a63b81535f";
+      sha512 = "868d98dc2aca742ad59e0d1510e39f6dfb571f5a5155ba2d515731bb067eb0f41730be49556d93ab957e71d3a1d1694a7da20f30f208b4125be1fc3491becff1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b3c4477e89ce0fffaa2f7f6d9d0b64d5ee6856e4a40183f07f87ec10393f73041d2c6d87a3460dd399f8bc96e11ca6264af0599e869b5d87da0e1415d5853b08";
+      sha512 = "db4e378e90c86828f080283ca009e8ed9d3376ad95955847b4aac5defa0f02552d80e78c368d56582c42c1c067027d9f1e9a817ab633a0dea426b84523844d58";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "0b0faf13210802a911f899a0b5df4ca67bda2eb98a8c37b43f0cf9f9ec5fe9c7798f375c6369c5507e23e45f772c7f610d048348ecb18e5519f5796342bdb46a";
+      sha512 = "1e1935d239adabc17e1a0d57c614615aa78154d2fd68a876787f5f3f0ca02ea090ffe1b1803d9528fe8579de988cdd78812b3251f48aa1fff8cc69bb1ed46cbe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "53ad88363b5c884a7660cbe0aca223e2baf9f3fac49b6d4928d7744be2e70d4feb1dd4321283c76fb4375c9b74bd5ec73511b43c165f2a3d032185d25b92456c";
+      sha512 = "6ab2ecf874d56fbc6ef6d1a4be74615c39e22da1836f4b20f65132c92789e14d221b589702aeedfe9f0274bbf86350b33b69a6af0dfd53505104e9b95f17c746";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "8c1551b2bbd07e046ebed7604c0e64d5764af28f94a628b6cba3c68d0258db3f26810d8eb9755013724530a5656e29e05f012fc3c0477977dea079e02a755cbb";
+      sha512 = "e7b7479f4be29ba7517da68cd88aa3e9f35031c84b0aa5cbdfdb025682ced06d16f7af5dfc402d5bd4f23230e6f211b98720fb5c7b99a8edcf04b43fac3f4214";
     }
     ];
 }

From 68cdc9c09e38e704a3bed720fc182f1907035375 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sun, 20 May 2018 19:17:09 +0800
Subject: [PATCH 2167/3370] firefox-beta-bin: 61.0b5 -> 61.0b6

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 60a7e77efc0a..47f3ac7446d0 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b5";
+  version = "61.0b6";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "720e57f7ce1dec861b50fa556f6d8569ccb8bd1752b9e25acd1001d772f13c8931e4e922736577af029ab774ccffc6accbda1eb4ff8cb16864808037cc6b4700";
+      sha512 = "0b1df338f80f20b8d42b9bb541ba877e783c4a23589a68f9f1817d26201b84f3387eb01980add5d4efd8ba984e3e742e7b2dd049a45a7555f01fc81ab2cd429f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "a2302f2f3f604ea3f41f6a2819ea6277b10dbb4d81eaacb754506c8938fbf5de518d5e35004137cfe7cf00d36be3d7081bd7414041266555c06e7ea23f17cd6e";
+      sha512 = "7c5cf4743a057ed08d5e998311f8c5995eff36e23a047ac580a16dbdc09f92c503e7751580d2c28dd80629c3430f227992ccd8144901addbd6c1fe42264f04b6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "0b3fb243cbe4d1fd08eb293bc1abeb1ee87674f7e7a189514a988d8bd2d733e51b29537cbaf1bc48f3665d06004740a9f4eebc395e4ca3a4a60b3e464e2b9e93";
+      sha512 = "2e8783230b827a9c5e1c10ceec0f4a7c0cb5089814482f7700c700b18825a42df23433b6dd0c21608e4ca273d2dd0d1987722e470ae3915857338bedf252eab3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "47a80e63a76a15a689615c5fcdd9f4580854de0645dca2fb234f2f7737dcb8047e557ed64142aec6a8e153668f213f0fb28866b122aacc3e7376c6f1929797f5";
+      sha512 = "95b2c08a8f8656348328c539df04bc048aabf2148a10bde67c2672d837d5983b2f370fcb47f865fb744a7e2e592d60acce159e280321c065fa224fb0d4ba2583";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "22aae0b42b265b5be89b2d1557725f4b19c3be5f8cb5fd0d65c1325400073a7606bbbd4e3f57851d4c8d433af61ecca81bf19c25b9974b04e3422ed8187d7313";
+      sha512 = "4b1d0917208a0c7ff11535054a6aed42766a8daf92a044d061e370b127c86d4f65ccb88f371b6529762906af5174e0852663b4070e95842e238090b52e42e693";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "3d406553eb53c75a61bae3b62377c5d15b42b64a64e84068217a38785b39785927edd4f1363c5318a07dcded215494b1622e37ba96732c001258260733b2308e";
+      sha512 = "f74c8fea0b1d35fce816db8a4735feddffedcf428b712da2c3044dc060c0b474d909a230350f1277f03adf836d04fc18b32f173e0970d30638890b5d59db5170";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "0764176093cc608f6e0b9c521e50a4b0fd8894ac642ce3d14df884c0460d6df2f8fb2a9d61cebda475b9d7000e22bba87a677abdffbf13d0ad0b89a4f004ff8c";
+      sha512 = "59b418da3bde6836bcf69cf7efdd8f11752faffee2e37fceba16016864e476220e98215eae485d9624bef07b40cdfd242efa42dba97ec3f4536c5f9305c9e4ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "a282df1a9cf4ad2fa061eacb2ca49d91d599c6d98b13f7fe066649d6060b92a8a15c5a823f6a1d945dfe4c4ab1a2facf19b4acddbe614a0bed5f704aa717bf84";
+      sha512 = "115928b1c7281c8e3924053cdef5137398ad75903121ff5158827a1c133573bd2ead4095d9f5a1ca13a20b2423493d76e2ae24c10ec4ed35944f678f0a282f43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "7b3f4ed2c2c29c9e804291930c1af962edc842f567b2ff1c17aee04c9e209e3cedb2e462d8bd56f16bc2d9536e30495d74368f1c89a63235bf5db7c4bb44352f";
+      sha512 = "31b5a82661e47dc2aec8991ac34a0d265be74a9598fa3405d90b96b1b642819796de21cccaef44c11256d1c84b1bdbe83b35d820eaa9107ba53a7b55534e5d37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "92881d1c03a35dcbefaf5f66185225f30c83bbf95eabc5c6219dd957747abbdbc8bee28a65eadc474df54063f2a85bc1fc7f00db0de92fa2de38221ceb504562";
+      sha512 = "95edc99dc2466159ec195f1669ff161200b2ab95a6f3aac748990b9ed03b08b51dbfc65381359ba8b4d82a73bd5de73dd29e3e096e92e20c401ec2e698d8c46d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "73565490419a39038efda09122f88b1de5f4aa3eb716ad7e984b8c0b86ae4c02901c4f9f10782bb8ce63af90dece08aabe3fe8a98b04367dbda46f5ab53311e0";
+      sha512 = "22ab9a5c9c7e207e5944bae42448e5fcab9c0266b4007af487671e52b6151a6e256449f59bcb43428f536fe520447cbf8e23e3ab998ce6f1bc9deab88bb4fd98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "6c4df94f9cc3b8997678c68ecd2b2ade8707ab6da388748604ad31bbe2af04a8b49f9a6d826036949252d50d7e188ffa30bec3d8a5d12f12dad992af1846fd09";
+      sha512 = "ae5462ef188b7e9cdc79b879a84dd1993961ca14d88e6b06732725098ee97e0855636638ed1df9e4cb02844372aebab85c42d86ce89149ba629f2b2f8b1b99ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "fc4ba1fe9a8b439c40c99b68dd4bace3008ba13482f8ffe821942aeb513b2975e1c83fd267d980e93e1cee8b3662d13f444f46c1bc4c54088c45ce2fca9c3918";
+      sha512 = "f99a2d3fd40182745c8e1c50ccb104084be8c567717c5b66bcbfb2fe1b8b4447f5467b4e60c87af58c82d49655cb79a05ad78ac86701a4ecf18beb39ce666598";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "c74ee9c4de09a65d33b1e2e3d21e5901d884f981a0d90c81e4715214886d80ceb219bf96c4c9a9e19e6b278df89c31b3232846a5d0f5539b5c1234a312414469";
+      sha512 = "497ee03f14cf80e9e34f54d64acc1889ab4bf510019c47b1508fc3ab72cd284c009d8d0739b2d3bba7d7cecf41ed67925641d81a34de867e8cb9262e3e12944d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "59b5a2602bc0fad1b77578179d73acf00473dc1426cbede4b4b42973ea62399b3ae637c728443786fbc78ff3a15cdecf003764ee57f23642167825a3b4e38ab4";
+      sha512 = "41ba583d7dc03a87123b0246f1d3ae2698af85969f362e73e3530b1704795a6566bc688e8387a5427a9d6321d30c06fba45f560c19ab05277755c802d4a12174";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "b583fd92f83bc2320b69b1a8ffa880c289128c31475d69924e6690bf8bd3c4aa3833883a3e012eccab850125751681c1aabb9f3c574d9b49815757e6d0a29aab";
+      sha512 = "88fdd62fc0ce35959f23fcdd9c1daaf25860e91618946d222a94cd1586c833761871014973d0a9320c9612455d007cfd4f0e01e2a0cad11401e0738e101c61cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "df9487ecf368f8198910df6514ba4c2000a3ad2aebaef3c442621008c8a89a356d38e3afde11471c426cba24b422db1104214b58b92ea9cfc040f30e817f68b5";
+      sha512 = "c5eb2ce849ef8058a068c34936f35cfde321b53d416d255df2d0f1813f26a6c57abdb718d4162325b869a9155b360d0c5fc32abc391bde3cede2c0ec8173abe4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "117f836242eabd1a393b3b5cc0530d6c0f522fc16a4703b52d3e24f45796a0573baf05add71080e1b96481b253bab07aad3a41166653eb0e83d46447fa85d8df";
+      sha512 = "6aa5790414c918b6f97b1b99d6d5cfa59ff4d619d0d8fc38d95de201f82897fa5d02bca3be86fd535ee2eaace5cc5f458a6289d416dbc2266c61ff2eebc84004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "fc77f7d86d72c58ee87a05d25e96268d6c582321bf9d11d85f2cc6a471c43e2a83f6f76a3c846b27d096d9dc0de661b0d2289972a39c6853b45a3d761bfc40e7";
+      sha512 = "62e54d82a20c33e551d7fef97ae615833937515f362c5c74a2ac9f88e254f8f217f38717cdbb9fd827f882b2e2a75ece61c2217b62d593fb9e93e8fdf05786c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "99a01ad4a11bfaa0972014a1a7541bed757229d8df052f91a6935f8b048fadf015ba0db0f1bf1e0bb7e8437eb5fee692990ed84362ff95513865134fcf12eb9c";
+      sha512 = "0d8d7a77589be0eb1c14d9434acf5700aa1f4fb9349d1b20899774f5a65b8a7a32ff393ddc4caa42d6cb6ea8c063d8eb4650024dc7c2858feeb6b01f613bca60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "f0a9e8887a498e100ffedacc6bb5a988dfbec5fc06317e8c95462da20caa744c7ad120ad03637dc8392aae6c6e730879eddfa76dfc04107b15740cdeffa70677";
+      sha512 = "c1aada0c4ef3484285c233d5210097e26fd549f40addfdc2d953111b2c4d0e2f320ea3347d391a1a582d78fb798ab1809111c13e4187eec9741e49a034e5172d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "8f7849f2b3500b54ee876a4ded2376ec665e036e705297a0b6eea43c70fb3db3ef0a89b112a80814e3eecd770b34fd119786ec0d34ea850003fadd38299a8560";
+      sha512 = "f38b473313bd012cf4ed3b8ff327a59d10127816623ddcdf63083cc4132996300810a2c760eb2a8c2cb5d8519648a17b74790062ecd266e8e3e74619c781cf3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "de807109ef44c58e43c74fdcbe22553fe1760b38b1107ca99261e21b43da526bb875871dcbc27f8b9811c8ef4f742523526f09a4649ca0d1c7f10f69048ff997";
+      sha512 = "abf8f44cb3c2713e1fb0e9abe41a45e67c270e653f5cf34e07f9692862f87d51140bc56ad757c6f4a440b0f03ed09f0b6105a13cc3b5fa97dda6f0302dd37889";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "46a14786b361f0d8250634c4267835aad3f7737b0451b336065674c00392b0208d31f6a0d6d62adcd2073002cf75d7caa286be3509f3f5f3100111c23673fd1e";
+      sha512 = "4c953abd9000e7165ba5402ac52319862c228a2d58ce422295166a8e10100731a9a8887d989c2eacac416cfc655e18ec8c6ff49d6f34345fcae32eac7347e9ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "ab59244973e42a3551de4e6dcc31122f9b03537d4202a4d7645a598166e2847a43b2e902a70876e19bf4a4a083658c86dd5903cd3bc10aa0c777e20f55d1c796";
+      sha512 = "a104015a1517025a186d25aeb62aada054d53fc4a84836a0292be13f158bec83adb33cd52576e4562a871330c8d42d12a451d6472d77edcc46b074f336480180";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "ef48f5124704f10b03b442222765461c1cbda38422476c09787ab194e850576ebbdff741ac179f0c6ca8d0ff8e8d23a631eaef70ffdda09e9f8aab21aa557f78";
+      sha512 = "aa8955c97e9cf58d1e39798da746616e33d7dc9c1447c1c1fa222d0906d891fc6b44ce0cc8d29408a12b24f0829ccb39d01a4a8895b1c0117b86adb8411cabbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "f15d84b35ad9eabe6a5cfbf4dbe1cd3bb57f4f2662b455c9ca7b69dcc410cce688ffd040cd783b65d429118a56714e0e475f68c25ebb6963ae1f0edd5493e846";
+      sha512 = "e3ef1125278d00395357d1b15c081938c618ef8f281021d26dfa973ea6b9ad0cd2b170416739a501b9e07ae51e8b33b5ff501f62573bef3471cc34fe5419cf8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "0b518e998dc2f584ce1ad652737c3331495efb831c4fd336a6c374f36e5d06711bfa7dd476b674df3cb4a91e25759bba09def752d9dc97acb65adf2112f23910";
+      sha512 = "c8ab8eab63c349e8849039307b86e7ae745319bf06c9c1553864eea078be2f4bf9f241872224e2aca2077c7d279daedc70d75da2214adf6503515accf4f091cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "f72d7622734489ba3fae9b578ef0f9f3fe84a7ccb673f2d8e3177998978e6e1b28ec89fd18aaacd914865302c00c6ebe991cea72392fc23ccab7350e23234c7f";
+      sha512 = "3fc3ae2234cd2059a7a2b33069e3e0e15d8ccaf8fb64ce504a74c414c4054904ead632d5b9fbdc20768eb9d73082da0db8234c7216b788fc704d8a8e7bb6d621";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "c57d5587879869e2f264e82753b9b53090ec530a98104024dd57fb3af06350121a547140e6ce4b06d397331e201329c2cf582b119dfcc56cf70acbcb47429673";
+      sha512 = "7dea5c3f7f66f549e3365bd1f2b63f12dc8e36e5272b184c49f5ba38dc93d838a361c84e25cd03faa50ae08233b49ee3389ba961ca2352a74fc879a4e39320bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "471089facb9eb7b0878dad4845d79b1e2d6c9fc918ebeba770320bedf443e40e7382bc876f1664609c4a9a9888c39ef9d7ce9f3dadbf50f9868cbf17b0d7ed64";
+      sha512 = "de4775a4ee4269bcf1b1c8efc4fdf9fa3f987b84d899dbac36c25ada1813a35ed4f1a7e20bf11f7933156711405847bc5ae333770eff8a02623b1ee5457632a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "3c0a7a84b1585e9a1e27e0db10826aa37258180733c0bc1316f6b37e997eeba5edf7d8a400cd86b2cd82c2c31dfa36d5e44e5214bbe0f40fc250c59bdbc0d7eb";
+      sha512 = "00242ae07a7ca996157abdbc859539441d2067b90c1854a316e4d6b81f4245aa3a93078bad667073e5d1164e690bddecb03074b4ee9b9fd6f2366d141cc6c4fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "6afd3a5d162dbf2fa21ac75792de481aad75a82f1f1c6b6cd82456ea8456c0eace20227e4f54133a5a96f8c1619d92113b2006f17f49f8ef9fbcb9564122df33";
+      sha512 = "4e4de19fcd2a13a84820f8a69d591a3453ed8ec3ad27709528ee1ad0ad9961ea7a1f13a4633cf3ece10b927e0307b1916cd5a05d756f6b01d45bb1e9dc6cac1f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "f7288a081aebd8e79ebfd2a3baaacb237eb9fa0b4a9a6314f6758af1c557b09105be188bef7a40b27389d1dc2bf60ee984d991f9caa77292ae0c7c100887c448";
+      sha512 = "19af4c8cc8b453f883585ade2216b2c875085b7ccc0dde80e4014fa5fac5d9e4cc712b48d82b5124359f0fb2c8b0dcd23cdff29855ee2669da76aceff0464c77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "591fcd8f2480ab578a530358241e0d9a624610199d315d7c215f7320980d29dd28ba4e8c35c40196ff284ad19269b5053133c9eb860cd2def922c277085d4f57";
+      sha512 = "fe5690978749cc755657baa6d0a729802ca16f0a0e2c3ac31e78f34bbb256ed081d18054fcd94b3aa5286e91098e5386fd96317f2ff70e7cc3b63984dcc97993";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "1738b3175e9fb7fa67aaee3d1fde9525e85e2604777b82f0f35b48ddcf08f4dacc0f0698641c6ef05c4bf156c5d785223e5ed20b0b4ceff84860f46d4fc65a38";
+      sha512 = "67e7af73ac99ac2b895d46976b5f94f0f8c6d0b89eadc284b995013a44f93baf7cf132fa0f66db7e6248c04538469d55f32220964931e1dc50ab480120e75f1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ff6c3c96853229a582253c6bee51bd041bb0d5090b260902955b8a9db40cc22aebd930230cafa3633d2b7137e8601e107dc276b5bca03bf26b205534caee0118";
+      sha512 = "8b6b5fdd5d662f7794ae84847addd576ea74dbfe2ffad011df0b73ed1a58186138818e8d05833b01f58e408928b53140a8127b0fb35c7b35847f93e4b610b26f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "52df8410c5c9d0b1bfb763610a7d5e3e8d3db41e16285ee5b02be9994f88deb30648c209d29a1c63eb9539220ddfa99023bb31475fad40fe8f347bf41c71f2ad";
+      sha512 = "4c481d6b0dd51b391820ea937394c1527abc82107bfda98ef67952880702d317372d1369ce6f767f54dfcc4e3249bc190d23d8214148174370293125ae031cb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "dbb9000ecb87fc7d56d639ae6d7b92d1f78d3143edba153f363bf49869696cbaa24b1aabe081b48a5d324d9e7c783deaafaf5ec7d58fa99e4d1c0c3fa530675e";
+      sha512 = "aca1e148b4a4d5a7266d7d5eedb4a761b1e0c047eac2738a7bc28e45a083f59331c7d743bc97d92765140d41b06d3bed820bda668aaf7f8f8393a8c074269a3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "bef3b0648e7e2057fbcea9966e55353eedcc0f6e7de658fd5b472573a0014eeb387c4e625d95ec75ed289b809fbca8a47d79d464655eda8c0e9745f28be91daa";
+      sha512 = "2043c6cd6d0de32bfc3fae90c5e311fcafe665c7c8036fba9d2265c6de54c0ea9c9238f61a03649c542f534782c12da475d8e3b32cb66c910ecce0ee9ede3762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "e3d966d378a2c66ccf223b9f12191f963c8b8d795d05d854c9739d4e4418b95125bd5d8d97d783bcef432c55b17bf500a5b3fc391758eaace12d186a89e09df7";
+      sha512 = "5237ecf68ff48ec33302459801d5fe1163980b525cc3fedb634831dfbf915b86df075e69cc86bf7c8f75d23c75e6b6c6b11cc7967494e99283714b421202cec5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "3eac4e2e2153a3d1d2eb9aee9a0f7b8ddeb9bfa8dfaad3ba42a84f117d875a37cd9b67e7342f8894c35463f1b882ff24aed5e154cb7c8cde291632e6e66d02fe";
+      sha512 = "278d86a5e44e74adef879f291427a5027ec8b4f90b55a108347b56ed340dd0bc12905acf903430bdee40ac1d0d75685c98efa2d6c26fe976f20548c6ca3ec8ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "eddee4cbb273883aba916588af0aa7205c27edccafa190532fcf6695f592eb824c92bbdcea22b9e0a2ef98fe4ec188b9a5afe8fc87212b3b10d638d6d435df71";
+      sha512 = "e94e4c9afaace5231fb0817887c9fda25ea08547f262337ef7b335a58ea16478f213e737a1379b1d8be5411f9036f787b8e3cdfde67fadd6623edc7444832c68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "606aa417c0dc7c4953f1c91b9e52c506f971c155491a766b12f3fd7780ac8df4da4a23759f2a203e0a8dbb25a99778def10edf4e3755dffa66bc489d55a413e6";
+      sha512 = "1cda9bf9a20e69a988519fa06e6bab8384f33389ee1e725b561335f9544d3d107ab43789700d88f606c3f92747857ec46510cb1942b644cf3daf40201381c275";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "b5f7668047c61d84a0d027e6750983be66889fa1da4dfa471ba79bf61e706341e877bf0333130332a6afada025c4d84d76500d2ef644847e6eb1984f10dd7a7e";
+      sha512 = "a92604b7cb484d425d4bb40feab69b75034002c4a38d4191768d025d07ab91ed6fce1b2c4edcf0db3ce0a8c3c5bca378def024f8f960d14c08662d16176895af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1439004f92d61e0fcb9c8d4cb356b3c30c82375f17852bce49e63fc9d5b939ae69e9fe415b6323901460c77aaf98106d534c7d8fcda5dcd07b9d25512586e06f";
+      sha512 = "ad8e9acddc4b9ded3464f6b25391094a31036fb1133f9a1c31380d6f2f45ed222cd640f15f07a0159bd508208e58c70d493f73541575361482e91e243bd405a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "5df1b2406e7bc3b5ae971b69a67f95bbd76d81047678799648de1facae89bd83cbf00ff53217b1e9dddfa127351c440d6def5a509f39e58d9aa08b1d6c0c8234";
+      sha512 = "8871693fa031d1616dd036566c89d8ef8f0e6f14982b915697596159212f111cb285c45e9d0a27ea85cdd68c202e258e03da8d1e7d7d5d299fce5639202e6b91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "35d537fc26a8e51125c52eeba7bf7ae15aa9cece05e35f60937851fde672746fc6c8440c50c554e6b6606b76b8262024da20e9b1909dd69d99518a71e7d505c0";
+      sha512 = "d2186919c346e057cf1df9a0068799200e849f9435f710c78ee396cbb5190e7993a2975d011840ab3ab4405bb9ab367184d896417abe217227acd8dfe8f21dc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "6ec504f45a0653d9e51019e7bb095ba1d8b8c677cde65a68ae9f09dd165a124073f243e86b89e90c674ba91c19851500653b044a00c6c1ef761fac4456dfe75a";
+      sha512 = "fb9a961533da35e0a06ecedbda83e62aa1ec1aaa743ae683f7bde43f83b0631b15498c0e5fdb900f6fa8cd840d0a688317fe6577a435f0a4d445954f3be93d3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "24ef8c4de57aab0638a1d8841cab8335bada9025e051d10ba2e5c4a9985d459848d1d1fa6265b5914b1c5081377ab52c7a49c291388674d184a54162bbe73e5b";
+      sha512 = "95adff7893359d470c0ef92773419f66692b89c883dd244c014049e6869472b2711ffd40f1967588d17f763a2148463883357c084a72b9a52410068e9a4e2ef2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "016566868c55c5df99debd049540f72d51c7ae944cf70c597d166080452147869b586c872d694b370244941dc1b3668f7ecec164fca73d884d650b852b6f15e9";
+      sha512 = "fb73b5466b8a09dbc17e5b8bd4bb204fe449e5d49e5be2979eab0ced8f65d37db52a1c5acde742063322e214724f37ae36d236967fcce41d58037bf3fc9aeb33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "cd5e821c5f4bbdabb0f08e77eb5968e8ccb53dc720f4f66022f2ada325278fdc6e9f13d3b5bd830dd7867d3032c85ad869ecc25ba4eb8bdc027c8dd45713194e";
+      sha512 = "1578a5e7738cc2d85195e2474272ed68b6930020dd34e6ddb6ac00db682f138f8163a1fe0c5b2d179f3b5ae1781edab94dee4f6eae660c7b7a44123fa0a18202";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "21b472b694fcb31284bdbd1d1b3e531761db82e8fd5f406ca62251f9cf53e5f64fef659d5eb0372bf545560d4671d814895a4e4befe4313580e1a52714101d1c";
+      sha512 = "c2548b1f0636928f594c228af277cae652f8436c22ac7cbb53da103ccf03b074f55427c366b4e6ee5799dd3b19e057694658051861cd5d29b2162e3101fcbb3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "6a638a21a3c410811366070d32cfb4119bbf16d887383562736cf96be17bc08944dc062767ae56f7b6bcf7d4c96b97383defec4b5726879edb5be770c5053a42";
+      sha512 = "04c08d0d88ff6b43bf5ba0825f68d1563dd3ca05f8ea7c4143d9a6a9b78a9d53f65cbd15330dc755587b4511f998a86bfa97b6903f6a5b2215f882ecee1a8969";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "5b4e620e01362d763d3d7a98eb5559ccdbdc78e11e0792b64f29dd0b0799aeb78b9404d008c1ed7489f56ad553e249ed1d6649588dce0d7b6161506a743b48d6";
+      sha512 = "1eff82dfa45d685882364e10b4ddb869dbe6b3316ffb89961ed458e0e64023d546f2a6ae22a10480d27f941e059151592f3e1af79c946d639b68edc62b506ac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "7dda622c7a6fd69b43cb1895c6faed9a2fef75c0cde3680c445d5b86b8d97947770e4eebad44324d71384ba2b407a10db045d4d108e412ca92f6a223a433980c";
+      sha512 = "18623bd96501846a497f56813ae415f5858150b85a3a95c5c7d4cf3e645444aca6de32eb4a6624833a0f3677f11c0b3d4219114c8ce90a4087bc1da41eb9c59a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "93f68424ec2de8a7e6c319e1d243d09c4e313f59e5e102c68b06e21832a88bd32dc56f48119c1a6b92774fbf42b920f9245a12650826fbb9549c77409f9e3b5a";
+      sha512 = "a859aa4c4c6b57ff2717104ad3add8ca04c7183db7ec94791c832ebf78f20fcebfe176a4d9a4cbc53e67a3f153350d91bb18d10299d3af0a590aa43766e37889";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "b4172a12cc3c785055f574463478e00d74aa3e0fb25389c8a4a67ff4966bfd74e4282e7d6c94c357895cf16265115651743302b28332fa8ef117bfd50778a3cd";
+      sha512 = "11c9ab7ad6e433e6e699a0aab1071cbc7b8f4e9a86452737b79a438c6440ce24e6f46b741c3c9785afa36ba85ba157c61d0a8377dc4de5be2e7b5872f4752fd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "b7303e3bf959f9eaaa06f3742eba9e039b46a4d00480651519d54a3df1b919e576c301e193f016d84f5b53eb03e57f58cd22f3648f289d4628ef8c7f547d8ff3";
+      sha512 = "1eb96774418cedd2200bdab29b2496059e3a99390a4ebd9a6ab0cc862748a7c5d53a895e999adada1be40631a083ec96181397401cf38a642686f5eafaad240c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "4e14b4b1617361769e1e8a8a621cba4bd7a7044f6a7e4c2ed28369b79cbc5473a438d68ffecbf42a6a62e33aff6cef0b8dafb135cca5d65d07d6f0028a362c8a";
+      sha512 = "fbbbbb31452bed65635e3b76aa2a83338cee8a84eb372ce26b36824c207a02f646a8f7ff3b8efe83916857c579c65ba66a4bf8bb63e1df2a7d248af4788f8649";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "0f85c67e06eca79e14e9aa41fc25d6e8371289b97d39a1e2b3b6a0b9c73398503f70e5a0cac1b02d9fe12daf805e35c433c78962ee52ea03d151b1d1b7254dd2";
+      sha512 = "1f9bcb234b11fd5bc4558cd18f263964379c50459e2667894f797a488fdd474b2b86db9e332c8121a78ea7fca97f0b6aac9e0cd71756df4197291439ba8beb5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "9a36f85dab0ace56a361bcb0bc00241aa3087028f4ba8b91b64e76963e8979a9bf4c526d922449e39f4f0a574d0f9d7d29cf033bc2832c88be76ece443fda6da";
+      sha512 = "babad97e5f7430701b38d8b592b11e3e31c6cd5877531a612d41e8b33221c9747a0b462fe938e0a724d460a60ffd4ae42107a78cbd184aa5b22a3b1fc86fb449";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "2523ae24ccceb2a884d71238b406aee20a359a881039e0e864b49358f2673f44663e105efea7ff094656e54e334c1d9b37d9834a841ca3b938ba4b2abf14bcc4";
+      sha512 = "9a3e12e9c3e871204de6ec6470c7daf9460a0a412799f5451a78001ee8af0bed3f1ac96b52dadbdb5ef63fd1355baae0adb06115bcf826d0720dd816f755f01d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "bc07ff82e6e2521c40db7391cad7b1246bbc8b99b45653cca2e76d8ac44dd341f66cb0d28b93e0a454ae78177b0f85b56b5cba3bf43a2a147178706544435874";
+      sha512 = "3f83993c15aefc974c246e00f750bd94d286f50393d2b3bfd6f3fb3a5f6c98f09265386d419cc1fc9c2ec62542fc1410eb8fb0ec66fa53cc9087ace482288389";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "aec0eabf17162f0750ad54003bab89f5ca9d4d059b88d99c2c07877decc64256a411b561daccc0eab5fce16a642daf9a6f86cd1a2f50a0d68c140f44ca941404";
+      sha512 = "e730a4555cb72bf9e7fcbfdc7f8732f9f62ba0339c53f7c5efb4752a1d344ebc535dd4fb36147ad724a4dbc8dd7ec5aea63de72102c28d3e5f3741428884be53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "ffd034a7fcf7ff9fdd03539f84792aa5f3ff23276f846498aeca15b55fa2d30791e4ee66eb0f0867db2cc3f869d306a36cbe8501957a224de4b17b9c4a0dbfa4";
+      sha512 = "93b41b7e5dfb769a61bc9051d4a86c94101d44ff905d16c6a4764b67813c047e57ce21d33c3e39732c9ce904f3fb1c3cb9d0e167c7531c99bfd525f3a2af65e6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "7916547a252d0e3e0161b6c0128003407718a2d88748ea33933edaed37de07baceba825cbe64aa9d78d13c5a303cb870a0d282e05b6fee3370ab209e27329354";
+      sha512 = "6cd4725b388550bc37b661e900dff1535db40f264884666e497ba480d88e1cf28ae1b2ee67b806d95c4fbad53dd3978f468688e6dc86b2de7a52cd1fbc9c0682";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "bebc0324bb9134644dcecac3519dff56ae0f394bb36cd6030641d2482c18f08b825eb2c197f9a87748b8217c0b43323bec3056f7aeb1633aa46d0d049d3c8528";
+      sha512 = "2caea694cc0c5b2405c8e135895a13daa454008f1731ffbe88051c738a9529c627f4ada3b4ada588a0ebc7f10b2bdebe8d021a32aed646e233a050d36ab0c016";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "842c6f1251e7478b285263e8d46f36dc6bb9d5216725cb1447b0272ac439c284a72b1316095f35bb10445617c15047c5fee84a3763ae03120658c613ed5b4ff0";
+      sha512 = "9dc52ab05a4845b2f8cec4761fbfbab0e6872c233058ee2950d96e3b88e2f21cd155477e0bdea127c0c07cc2506f2b90015a2605f10d6dd38ccc6a3ea3f0e5c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "672d5083ddca12a22a3fd639610312c13330b5cd6c09a99bab1442ddd58c86552064a4d555eb7331c658fcff9408bc62617f80e7797c4c502251791585b2035c";
+      sha512 = "88bfa07f5275f7985fc42cd42802c6c1b077c0dafa445a29f0a5346185a39aee380781b6112da52d79fde13eea4116763a2ba0d54a957b6d7b7e7363330de68b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ccedbb3b1d4eace21851c3490c3779eb29162cfbfd2aec987497ea949dc564a6b516c16ad08c31fd5c05147939ac329f8853bfdcc6af17259a905a18af9f4867";
+      sha512 = "70ffe5242dd0173a384f59395151cbebf1113088d0880d4c4b9107317fe4135dd36a49884d986c44ee4f52536eddd35646e956afcff871a8250260ebde75c852";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "872532c28868e681fc230582828d6ff19beba70ff29b71aaad85ce19422d68c85560def8cbee5cdbea6b8360cef5827a84b1116e1fc309d94a16c6c2fe9872a8";
+      sha512 = "9215eba4cc0dcfd27c4bdc2c8f89f71504d50a9636c240e275ca87c08238d09dae6a012bd055242d3785f04aa8a6d08a7acbede48af0d016ba5135ce901ac5ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "12beee4eafe1c5f41c772bd2b8587f92bd2318af776bc09b935913006b0df2ee7bff7cbd8ad621737ee1c83792db96d51b7d7ee45fdab829c5cfaaf32632e82f";
+      sha512 = "12f15f3fbfec5ac0cb0336a1c1085ce820906e75e58572f7dbbd9df7a5335caa59da4b61c7afbad875b73049521c0a5a478ae5584828f512eb0dcadb591755c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "97d3d44d1800b9fd8cedbd90cac6472a3f2f8c4840cb7aa93bb08acb067d47f80c98e2ba3c8d8554ad8987c0cf6d392f64ff0a08127481b30c23915e5f986ad5";
+      sha512 = "b8110cd53fcdb4f5bc4fb2c80aeac28790e8a7666ce644c6a911b7e33842ae2ad12bf4ffdb5de68eb24ff7f66f2d54d2c2c363050465b1ecbcf59c669e991d91";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "6dc388f02cd52c50bd158668bbd86f9ffdf80561e9b9da207fd1e57286d8bad40a4a54fffe02c7102e325ec7b7ff3c2ecc2bb4cada9a3dea544efdd73ef02a98";
+      sha512 = "969d4200aedb22282febdbe652e9a36e197b43c9e038271ec5fff6ec1c3597a2c90979c66d3fea3a4dd705ebe5072cc3382aadc6a82fad7a82c62a138430cf5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "496cfa11dae110e7d8484fbe43ad689f7d0f6c981c8dfc1634586c533db23b417c7856e63257432d377f4f1b354557733738a613118178eece59049d5790fd88";
+      sha512 = "d336b27d4ec459d4b9e101b74a267d78245cf18a47e9d79f118a5ea8b04553734ed51aca526e16c8e208726240112ba7b8a112aa6dccb5431260690af7c43676";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "294f8b13ced20c26151fa75fe5a3471de4e56a70749cdaa99cc0058b3b46f768321e24897e830297e4dbccf5dd1979f33f8902e1e287ec44894c0113f5d6e50d";
+      sha512 = "6b06591468a5fd3f961be6e42d7df2bb302bed493c6c68816fcdba59ee090117529e2201e686b1c06a83273b29e807002c7b27e957f9d37af21a2fdf7ec56a98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "889517c9b6c5a01263dcc5af5badf44d9692bfd227bda75e376bc9f27c2fae6a8631e4b5673f105949b16594369511fa95812af9f46ad32eca4e101b344f7474";
+      sha512 = "43ee24772c6122341f1f88cdf84b23d53aba46af9fe0384a2518bf6e4c673522c57c52d211da306c7ea7b672ed1048f93a06861af39d024a8fc025b359af6a83";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "0c9df0c551d310e52a21f6537b883eebcd736e1292f8869a9fcad8d1f505a083ee29ec982cef2b46e487a9a9199ceb97db62a5b2282b7608569956f3cfb370b4";
+      sha512 = "dfbc1ec09705accca52ff20fe7b89ff724da4096f3c2b835cbaa3eb7e16917b808a8ffd2d37ffdecfcb905f0bc06f0bd620ee200c01a653cce9ebded6e475811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "96ce1780836d7a8275024484134a8b8803fb082f608f61d3f00d7f2d0e48d308ce23461ddccd45049adad8a0cc57fd3ea3cb9990ac7c554f6cfb2ccb53de2c62";
+      sha512 = "4849669929700d2d68ced2f63c7fecd1a8788f071ab7d9719e69a63a8418a644e3c74ccc4028a27de160b796c0a08b33822890c355c8eef9512c72490d3d5429";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "75519c81200b371f7a95995d8f4f937f80339eaedfeea581f977f82d3f0883788a43d556f30f931d311a9613b7d13925cf76c2a8ee20eb0886ffb50dbdc2f539";
+      sha512 = "95fec85b73f616c5fe5a3a7da0f6b76efbe6b886c85cc7fdc66960ba6bcfd8348b0b77f599798794c0600c914274b50e878948ef317483598dbc4909bcec0be2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "b5ce91e583eef01a4c05799e68349f2d5271980862e4b675575d0dd191f1944e7b81c6d111c00b8c28af5bbb32b5e9fd8843a66389a04a2a3bde30ece4dc9033";
+      sha512 = "fa60e6bd7cdfe23448ab026c4f7b65f9b850f009cc7a3b1496e1e883316c01ddd67b36540e90d266d31c9698ec9b7db25e11e9324143eae7d3fdcbbfd80c2de8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "2ab9f922a208c5ae1ba1d1a00ce719836d16680588e7c7be7d27a8da1a285a0be22ab5854849014b05ff068b65c6f52252b756308a9b6ea329f1b8c0fb2499ba";
+      sha512 = "c25b83329323f236d76783b17c192e4e5433b0a24d816bd81042ad082b0f7bd9905119277e2806645b0c3618eed880590c746c1516797a6ee0c633fe0baed102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "c61d64dc05293a3c88d2d4d06959779c778149180ddb0932891b2b0ddb67914b93782e827efab0dae2e3709a979e7ff34666cf4daa499a16bb42bfda4fe2781d";
+      sha512 = "26fe3799acc8e52768b3800bf06ec6ae62b030dbd39a6149f9a6623be55c031219125edc57505762c0f2ec4002d1c5bd1cc45f11baf36eb5eec921559c1fb0c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4d8aa23a3a17c2f8f587ec78f523bba59a4bdc1009bca4912e94a0f39bdbbfd375fd76cde61f074b8b3aea40ada4bd684255a0c4ac0d5f0291dfc8888e4e19f5";
+      sha512 = "d3c950fa9d518337e57b53e02daf4539decfdd12ed09768123fbc2d064006d99ab6a02856787c204e080a7ab7e222fdd94081f79982cdb1d7c9d2a04432f9e89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "6b6f227762879b44bd6bc71dbd5866181b63760d28a4fdcbde1fb50ba746d9e1f3bbde2c0ea2b0e16cce156341593bfedbf1c484f339dc0a27c8c7485d9d94c8";
+      sha512 = "74ae91718c024a69c8135a6ea31936c877be690447686cd6e70c36aeaca23bf9899f691b65d705a4608202832cde9c4fc24b60c2f28e97363690a1160df9580c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "f036a3799723d74ca21f81f7051e65604d11ee898b2b7a2169f6ee27bc6745a16b72ca1719b68e7b76fcf6023e982ffa6a372f136ee7fee8fb1c11b90de90c3e";
+      sha512 = "5a48173317d01e1d3d3b55972c22994cb6f90e70a4790006b2d077976f4e8c2776455b30c0ae7caa4c378a1ce88a7d33357e451e991a577d5aacc34e9796a8be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "8a8f4e1b22601b98a04b71dd85f3ae7356e22ff94c02e9f2ba1f522c30c7ec76e6caa3e3b9a71dadc3e4acbc9ca7c28e8bdaa2867482d2536179d9f6506f49c7";
+      sha512 = "2f24d7d6c8800943d066ecd962d4ac1047424e13020770c8585cc005fa22ee11e4050ca9b093d55534fb5dd60a76b79665067ab1b65d7321cf7f5bb014894248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "095629cb9b28eb3b48edc66c435c16dcdcc774b7478db0bda3e8aa3f028f600551cf4e190679aa9864658b265399aef27e9c64cb7544f7f06a8355d28f2c965d";
+      sha512 = "9ad81ece7338318f854acac4728eb81389327669cc5ed825f0fdcc2c330e6d871a1df5033bf52f8fa3ee5cf92fc94674b44a7f9e26d0d02f5000eb0d5c990362";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "4918f725a9a1a05bdc2e3056db29dc5e9cca978071c55ad5c8c1a87f1a9119bec0f434bde5c274b5e9e892b49c9a259cc116d1974e3a840f98868721796eaed9";
+      sha512 = "c031247ef411d89abc0d219ce83418b3bea2e261bec19e2c454e8206d80e78e1bc712922d9fa64091e3cf881fcfb09dade12ec163c628ffe17c8472f64ca8956";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1a350ab2d69ffa1a97b155c7093b5e0c06c8f1061837e19cce52ccb3755bab6e189de77f75771063710ba386b4f1116f58f289c56ad370d8b742ce038528311c";
+      sha512 = "2e3641e6c6d33d13bf35a0996775480eaabf4f80556f8a06dd895e4f90a01a7596e45a90e3e85b76cf271fff88f15b61c0f9e14cb91560556d159a067f199abd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "1623e793507396aecd34cfa5cb1aea1f1ca5ec2007823dfaf73e929643fb630fddb4b81a745d9fafce1fa8b43662b8b09a522f2bdc2456b7e6f9512b4e7dfee7";
+      sha512 = "7ae337395201e2f269d09f8669838fba19eb222673e763a29f3b9324c939f9bfc365a80ad87d4a3ab15b20ccd55c25c92392e4d26aa47355d7649de61aa25541";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "6dca6a4bf4608cdd3869d0bde6648a3881d334b3a4bda20bff41626581204e972eafaa272f56b39c051702dcd9219d2b104e2cde9b2f90d0744709bb6ffc0ccc";
+      sha512 = "df727c8439b09423d11ef5ce8c7c38a767bf1b537e6612e3d0d7deaf94a70430ec9a2aa22de5f47b94dbbddf8907d1310f87f0794e251275826e5ae8496e48f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "1131151207ac3f9248dd03275174a3efba159445824a40bd7a008c2b07c28bc5641d315581e0d98a7982659aa2bf2180ce1e596645e0d780ac42247dde480863";
+      sha512 = "1ccb4a242d9bf02781cf81df7b62a21052a257bc98d64ff827528ed3f1f025ac86a8a87c6fb77ea8ec93f31ffdb6baf9f499dd3e190fe501e8823aedec84018b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "cad7f937f930fe82dfe99ca44d7f2173efb607f8ebd9725372a670abedec5fd26a390dc899ba9b712c9a533f6bf39356c4f7593459bcdd99a740a46dcf2295d6";
+      sha512 = "538d1f17a9914171c919027e3ffad15bc6f7ad4b649a037b168639fb1144db76dd78cb588c105f67f1d7d907b9e6fe2f17d56ee3193490b9be548ad384a56882";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "a84b9524c567ff16290053cdca4dd494395e4be57fef0282e735795e082ca914abb390f916919352adf4c5d17c163a2d9316bad2348b35ca78529def36d7f83d";
+      sha512 = "fffc1997ba99b1407fcf2242c88c0a48db8a43ac3d07f28557fda510729eb52e542aadd514a83dc54e0b4c5912f84117aae05fe230080c9bab8279baf3818e3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "eb61ad55d93c1e2be656097148a333b78b07c023f60dd9e2f02e9e0c12c42908e96313a05a5cdebf1a51ef210d66081107aeef476a69cf53092b992229365046";
+      sha512 = "28c88ff542004d78d07a19f0b3eae3ec6943911a755ea2874df3bd37f3a214154b7a023bc3519ee8cc8cc4736f67a01c7638a2cca558e905e7923c6337c8e8ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-x86_64/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "1c73f4c230ce3e518721fbf7f1f536d376533f6e56e3b1f562c64d21b575b91055537bc9114163bd8c533b641e68d78892217155f1c9bd4747e3ee48225a61f7";
+      sha512 = "0a3676724d24ab7a625b768146e94a09332ff06502c7b1a72f82777875898a2f70717206d1798581d91d4d2991d872987fd4029df1d738f58b42b8a6d3fd4329";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ach/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "253261fff1c5c7363a96e185a816ecc59c16212fec6424fac394d9ff6299d33e27928650d2ffffff76019f1c6df7a69c51c16292d987daaebdb745620f7d1970";
+      sha512 = "9a1b12fc9a0a4f97fa40f3ef51cedbcad60f44b9d77a7108eb6d8c33a403d333b58f9641b9a85eb61df9bee7d2a72054c2684548d0a5ddfcb8e87696814f6704";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/af/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "47cea191e24310f3b756e5d146015097e2c0cca02769f47213a84ad63039148e7fadf2dd727202a3854f8768014bff18672a6b9afc29bcfb0af72f418efeee6a";
+      sha512 = "020de326d0856914a43f1cbe4de14a95f0a051f99185cf9ff9ff122ce9c1edd9ec32f28101fdee484eb5c3380cb758108e309168051f048a4642598a2e4510a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/an/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "96118b013fd5e77802f7bfe7870c9ae07f10687f5ba71985fd346f2cfecb8fedbe86b9d9ec8895fe237d390cf168d1a14ea2bc9ce187d468fcdbe6867c614611";
+      sha512 = "22b4e8d23e466c67bcc13b47973fea7f027a4c41d4c9950bad65a119f94d32935b33d4ed93979fbd8145d844aa12a38895a5ba932e00319c67af0f5a76cdda5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ar/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "75b034299a822f78ea60c0c0253fe46863d4ba0cddbbf02e64d5bd551b2c5bdd4fc456545f1b5cdd553af47c03bad6afbdf1d1137d570b35414aad0afee4892b";
+      sha512 = "5c6c05dcd81a988065ff94ed8ec93d6bfe18e58e877b03f5610ad2269ae46b5f8e3dc3c3501ce95c5301b1221297e815276dba2753f8dd75dfd8e56b8df5e2a0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/as/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "2d04a057dbb74a7745d36c85f58604d4d50d7838b7498818a6e900c7839ddf6f28bedda074341f8da877909330123549a8b57078723f3c2c081bddf5f61ce9c8";
+      sha512 = "244e0a6a34a6498871c599866391ecd7220339540cf3d0c3ca5047e1a9cfd2c79dd4709c2286565fa294744be405a7afe01ee5a7c6876bf51388b87d0e42877a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ast/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "3877139ea20a6de4fcf2217e0ab53e1ba1cf43cbd10222b265a728d7c782b0215fdbd4a51bf883f2a089439b9d8964d7ee9778a5e7680c1dfa719763094e34a6";
+      sha512 = "a2516fe624f20babe6d5cc122298127d91d822237b7b7d86cd6a54ad85579b1cf2d63d133b17eab4f54e128cb71d2c4fb6a6c09bf55e317af26e2033f1f598f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/az/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "958a242fca0f27ade3f8c25bf9f12f24bcf1d7cfa51f103bf77e2e493fea7754f00577033a37db0130936ab84f0e03bae986895caaddddc705a439b0f1d4d4bf";
+      sha512 = "cc8dd067bdbe62fcff881dd4661138809486700145eb54f2a6c375523f98d8a8da92672049f745cf7ab6e67cfee669fb8a35f572aa6525404fbc18120bf7a709";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/be/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "375048d56637ddc81eb90088cae26de1ec4ee8f25ebf8ae9250032c25737917306cfd39a65e3302d85c1573886f7b829b0dd3ced7d4b7ba10ff4389f27227861";
+      sha512 = "540a41b4de26732c30ed8fcdacc596373e3d91b4555c6d622ad169b44d1f54051d6a459ea7f1ab36711d354ae2c8e65b9db3f3f318cdfb49ae6a412aa9f54d2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bg/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "0fec26ccc4393e904c31f40d78a784ec3d0191c75d3086cf9efb0b2b64af93af493e2ef8747769edbac70758435ef15d2d1890af1b44ecaaffe2e52ddd5bebaf";
+      sha512 = "d86c89ef09d63b596769d96c98e05ccff275c435d5299877023d59283b26506d1a1ee9a4d22faa66b2e4f9e8ee92984bcc506aeae807e40bc0a856d3fb2c3fb6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-BD/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "8536c434b423bf969c167b2f9b40391cca26904cd76f022d46a9dbe127e3647d1b1cc4dcebe08d5b243fe7ffd115c9e3cb1607e556719210e5cc0ad7b10c7aaf";
+      sha512 = "a2b087b07764847347474b5181b161def7e2551a206cc85c2348fd36e490ea4994fe6e14b25d3963993c81be86b808dd353c0bfa768ce7406a7b79b46d04c67e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bn-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "ae5a493de97a56a15b182eef69079c1f5d59432259b85525a32a396c4537c9359bd41eaaa870f74f680b345cf9c06c487e6b9ac2fb1b5230b404b3e7eb614029";
+      sha512 = "68928c99f7b18bea8c9451e77d0aa125187547f9f2aa6e8b42025ddbccd104e14352ecafe9a242d59d3ecd0fdaceb59f7522ce90dbf462bdc443a40756785262";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/br/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "e4a42d0e480313f3346f50de408ed02dba79eadbab368cde5a93542bf0c462c378d79f9e218526667d398795e3f1665f5b89f44d667a34b88560a2d8354dacd7";
+      sha512 = "12225c779abbe923419bb9824f1e55f37a68f70cfa4e847ee6a44da9cc6c1fde6a97720a2a366b8ed8b3ded9e58447ab6705bad30cfc09a3b51729853c47db71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/bs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "0a0d7471a266ced527d7abfd36eb0cfb768d5553efcad7a2e19477ebedfd4942af7d12c123babd9a1791d8ff4c5a5712c74f3595e1f89d9eb0413bdb81e7a624";
+      sha512 = "dc0ee7c8ff43d1e595ebc5adf3cdf7d95a55824294af4542c94127a21a5ec0ea7f8ceb6d3f5268669720d928df2cf9c307899141e3e0c540db4779db2c9d09d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ca/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "6390ce2250cf20e10defa3d8d75098d5f9c58919f57415bdf742730839958bea2923e9eeccb9bcced97a594c67b54941dc1e1c3589d7d255632b32b4c7192799";
+      sha512 = "2c631c16f8a79ca9fdbf15b5c0c70eb6728bc116030b180c921c1573cc470eb7273b5602d058c88e49be1320da62be5d493050574711cff7b6f40e6ea013ed82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cak/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c853583283645099dcde8849abd0b3b6ecd98e791ab230ead55cb945b4bca1d91842bbc0cc65fe98dbe16cd284d8f66ff053be643b11d0ff4da17f078b4cf749";
+      sha512 = "2a94ac3e7ef69bcc5949c1e920f55dab9e8e18c1a245763aa215b89b4bbfe1ce08bc00ef463e1edf66ad55b141335f4b4bfc0b09562639c80e9ef48181099643";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cs/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f7cb7accc1c44205fb893704cbac0b9c08a6a36bafe88098251a57ca80f69699ed04f27b43c0be43c513410a91e1ed391c57c566443e8d7746de5797619b6290";
+      sha512 = "fcf60a56ef5d9bb195368f8883c5fd5b7a361e68377b1bea6a3647c392d3b818c01f17277f834e99bb55f69d9b0c64910df918504c09f3e2904c600217f2d262";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/cy/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b6f324096a191c9ccf4e5afc8eb65fbd3bc6fcca4bebb1abe9ecdf7b766ad14ee4a598bf83e341e47a28e13ddb8ddee5204f2c9b906b691986ba3fb963819f27";
+      sha512 = "83e34b538d183bd1c0edbae19280537523bbf1388b30b91a5220430255e824c6d8bad2aeb1e15424857a6a826be1eff5be9af0b29a57d637c061e2cd6bcf4fb8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/da/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d4a9d5cbba8d840cb493819af66a03bb612cb173c2d8b1462625adb8532e512d9daa0f6a49a8771b3c96afd508109c16a17a65228bca79befcd3bf565b707bb4";
+      sha512 = "f1710159346685fa87656b8cb95855e97397e0b82d551b7321ef709cc0ab9e58afd5ccf3613b45667fe092f4fc14411b9071127b1f597fa97d5ec43457b91eeb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/de/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6fb875991cba1c1edf066f9ef44244c1969ff5204f36ab1c643c606adf81b67d578cd861ea16cd2d2aaba1ae37f24ebcdf58248cee4af37d11cdd608e28a7d54";
+      sha512 = "0b2c26defab26023295668bcb5332258b855f1b2477cbbd284cd36c46f355921b072069e523db621de08a73bbd5d2f773a7fa4aa1d0c980cdb0c102cf7a99c74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/dsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "40b27493dbacbff086bbb26396a6a2cc717c4b617c021fc4c1fe488550c6a5f7587f7d30ac6e48dfba91dfb4351b02af4da78082a38da5b64fe843455866431a";
+      sha512 = "e7ec02c1a2a5246bd2411c5f277fef6f72c0f21e5bc1bc3bf0b4fc10e384fd0442c092604e46546bff9a8e33f803a6353293949f4f3310b9dd67ce79e68c5335";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/el/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "b6a2ae45054d1abaf8e6e0bb58664a5a1e8476bb62f8f3cd3005121eccf38eef68927d1a46de6a6fec48586aee5ee441767e4235c8d6e7029baefea07fb0ebdf";
+      sha512 = "8639b3c8e63f8955b46440f9d5b1b440c90fe0be9ec730d05312bbab26e15d96e8f1695afa65ece123615bb3e03d8e808e18483fa815b575c893840075cafdcb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-GB/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "55d0e6a65c897da608f6c3ea0a6cb6299ceaff15d29e45b34c3a52ff03c85ab85fd2d39c56763f0d589a9ef5085feb3af355758058bb4c9bc12dbbbba5ac7b4c";
+      sha512 = "933be5812db81948566e2ab6216c98cbbf6f1fad32bfd9a5516f14cb2e6bd59fd1d34f1f608d94d3a832bf616d75317e03ef2fe797372cf0bbf86240cd47a414";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-US/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "22be622ed7c9b621a0782ce727416b78ffe81afcc92b5af840a895f54cedc843fed1fa256bb452d8b5ad721450e5b635845b92e621b5555b98a6a16ca59b29d5";
+      sha512 = "3d1b26b26fac99cd8de9177d56aac1f94785dd22cd32f94f5aa091a4411b6c1e3fade83863ae3badd786cf568f966f469122fce332d433682b818ea43f7ece6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/en-ZA/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "0442719c3303a9c1f4de79777a266bb1b7544c8b570a69e49746c9455edfab9aada9330280d6c406c5e89054d15b1e89d0935fac7ad4ff80e2d34159706bbafb";
+      sha512 = "795bd13c4ddaf19f4038658a333e8721d334c263ca57e887b944358d43bb3a682883fd3aa7b2e8abfaee1cad5bda3cdb3828f6f9f516c62a06f5899cba660af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eo/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "9addd422b92067287ba5cc0f5ac14b662d55be8ffb65377e13d5a314c8a486057007a6c8287b8e79dbe12fc59e05c5c09fd79419cc56f83ff0ecffa816048224";
+      sha512 = "bab45a77e2ce6d3dd2099fe84cd29a38154209339c271d35219b36f47d5028e87af0cf848e8938b8078bd94be04ad43c6f854de929d9bea78a6c029929e6ef44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-AR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "2043201d4622ddfe333f755191a90290a533fc93b27e8ad2a10e75a8994e56e0de9ac08e391c49a48028252dec96bcfcfe14c1d6c362780ee25f02296969d592";
+      sha512 = "7b3f2df484031f9273b1efe6f178c48d2adea19edafd7dd97cf7d7056153730452a1711eac8b6303e069b0db063192c4678dfe6a177c046574984e47934f170c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-CL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "365c0f66382ee55f0cdb98770b9e1ed31ad757e1aaab389f2de83f00dc8222397f2ffbe25d2df720715f78e1af19cd3c4c27cc1d8d04e2505fb927474d9dd42d";
+      sha512 = "05155d10057257f05baeb3803613f98665a43bab3a0b24c3f6a0900d23bc397e30fa28cc63e94cf704e3c505f1f0e2dd73b08e2f96471cdcfdc626e7c5c702cc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-ES/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "5dcd18d55864e767333026b73b1d931095c1d7845ccdf165e8a6244a0fce84319ff9e7ef212a4c69574160037d231c4b44edd243e15896b79c6e24f14307fe17";
+      sha512 = "c041d8f22ad8aa0f4ceda16931ab1fe6121e826280112dd9d2e991cf24e77c6d333175ec449fbf26c44eda79fe80380d7b17f02cf08d0bc23c4528ad37a6a5ed";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/es-MX/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "f5e7683eb473e8c411379515836e669aa9755af26746ec5c56c2f6566658b93bd5b8da44e8ee40789d8a378d19e9b63b41ba9a3da95bc82b85f43d0ec34089a1";
+      sha512 = "3a9d92db8de44c70eb4b5088e05f957ee1dcf4323bfbca4cfd1fd9e62332bd62c21e1df11792cdac4abbec39360a3297730a794464f6178fab7346a3175e1d28";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/et/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "e33cf86b0d591e3a28030ec7c7288a0c97f6258bb7730e7edb850840132ea96dd499c8e2f7fb95e09acc344746ad83458b1d32615debd86d47cf2076c298ce46";
+      sha512 = "12ba06007590a385453d1de574156bbe896a092db5e25009ea5f2327969c6affff9d0960aa42edb4bc087d9477fc4160f3ff579b032de4e395410530154bc737";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/eu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "c81cf96e7fcda3cddda4751afcbe0b7515469df72b2bb1fc165659a09796f71d29fc70d6c0bf14474eb81b95490dd160ea4dc7b2292696e1998140f3198932ad";
+      sha512 = "8e7c4e62be76d105ccc2748bf4b017f7bdd0f646ba17ad11e7c1cb14ac2aa7d612bd2f9cd39988624ff42fff57f93d27b9e44a31f8798aab54c1ec55ec027236";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fa/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "af7fc526c199b75fb8954897d785ebd7f3006b10e5c1306690fcc1161151197892b802bdb20c389be1d8a799a3298b71fcbbc4eadea7802ec4f163484440d4dd";
+      sha512 = "fbb18fb347ac5319fa54366c86de16c615be994a7d3c179dbdb84c0cf349d53b5a9f850779a5c0d2fb4f58e14d2e18089d7856aecbd62c1cfb57382623a67612";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ff/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "906e84d4963bed5a2ebc1fa82a7e901f09ad1e329db89e52788d820cf7aedd8f98c5e4d9ce3ccf9b7171a8438ab91f29121a78e40685d8230ae5726928295d3c";
+      sha512 = "246b9a718ddd70ba11fad500a0613f2b4feb62c7d6b483fef0715a0830ec09c2fc2063b16f2c1413b74dd0f57a1a870d9766e3740aad06bb131f1d610adf6269";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "4954b7b1d4ce1028be06d639ca9c68b0e01febab75b4412d6d1f1ccab323add8d95670944782183668a537c44739b09fd3a15eda2db9f0c4643460f21dc4bb22";
+      sha512 = "d0d694f4ba0562bf0ac990ef204c3d517a0e7edc9d3f119040e64c48fa6cf54a0ca945e681b8d5e4d89c1d3d2b9b895a324e85f0368e1bcee4d66a85d22c3913";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "1693a9ac213487a801d018f7a9f6e8ef61baa8af2c41cf55fc40f320c2d0e6a0b73283725cde09fb9bc64c208a4b9a13825118f0ec7e50cc2c61dd5a8b38b3b5";
+      sha512 = "7dcd9e91b7227361df55a6e29f16af72dca0118e50c563c7ad2ef829aa016e1bdc7b89ec65917f572d8e226a0e7036d9642d0dcce86d5c15d2cecfd19fc0ad8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/fy-NL/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "963078489d625db3ac61d38593e5e2e8da801c7205b3622439721da3deec06fd8ac835c8e0ae9eba07ff050853b85f4d3c6afda7a50727244a3c73b9c2bbadc9";
+      sha512 = "c157abe8b5d69ae2777cf39fde9dee27eb244df6db00c5c56afe7d65ec1d3c78a7b4df0f6e6b681be5d741d61c05a9d9c56717716a87d914543bc0b8498cca0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ga-IE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "a437cd4e09c26a4ad86ee37715307bef9fef6f2ac1fdc117ee6793b89995c0e42d2e77bd3517ae2e047faa2ee3dd22a8c2604d5bd285b5283010cf30173eae49";
+      sha512 = "70465733dbed4ec8977fac3ecf37c96e8a4c775537dc413559b1e9a1f2038ae5788b3d9b3bc7ab57b39ac1c1aa30f13f5e90b877228cf02c1670bb378b4014b1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gd/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "6160d0412721f299dc119d5046052e99e2c64dd7f298cf1704d7f0eb6d25123f1fb2d5e6084fe1b347921e49f041798b49f696514ca04583ca885eefabdf15fd";
+      sha512 = "6a537b71d0758d25e97403363d0fdc3e7d311cd2a4ea818bbeaffb49a302e788f1727999c49ac39c6a242c31f5ab8ecdbe4111d28ff62954bd17e991a285281d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "8f995ae9b50c0eab7e8ae2a7206ad556e52122b0084b4f24b807f1fbdb4b124a5c539460610cbdbe4f90f1b312b653c9ee52607ade9a1082b270694284e9dbef";
+      sha512 = "0f427ba0afe9b1a09b8947f0ee0de89c675dab2e5132f37ede9159f41d474d386127a1f1967d77f8032d1b48222a8cc5bf9782fcd1bdb3f635154d614a3a69e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "81ef8a83df19437b37b0834a15077ff23e084021c438578fe3b38bb66d2c6b37957557e9e5989674799abfb9f530ebf6ade8f0e25897e6c82842f80a6c36ec50";
+      sha512 = "8fac0c28a7470ee83d559feebccf025f1a4f4802c92baf7fcaa87d4341bb7241727dadd8d715d23c4896e7161a9f6ba708a8c72296cd86281b8c0ed47628230b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/gu-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "66b0645cca9f77f13fd2c3fd4d38b71cf44567cd86d58e649cbebb1ab0b07d3ca96d14d2b34e33d8fc09e2ece2c4fa6c253f4d55b6c8414b78e95b9e8c4bfe80";
+      sha512 = "5cde88175b0cfc5d1332b7b185257d9558c3ff01d8e9d91180119116d14992be94bc29ad5a4f907dab0f8027720b917a01e0e924018c74d29ff9d25c3e9f3ecc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/he/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "666642c10644bb2f2f3e31bd813a3a1c6d930a25c879130250a8484d82acb471b1a169181ce7a49a01c6ec78e4e8ce61f8ea5918b8f87715312ac07adb087120";
+      sha512 = "f418fe4e55c89e75d243c85471b3f49fcac3f910c5d4eaa6b9828b201e886d931a18018906a37df9ab23e61af3f90cb333098fddcad0da3b0473c14d716fab18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hi-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "53a6e801c45691cac7e1946da9a018aff3dd1f0ccc89d1048f31940e0affb33f7fa34e258cb6bd0e7336369a1862a9ad42d0e2c782c459c9de245c99b4e58f70";
+      sha512 = "2f3aceb53c5bded3e826cfcd9fde465e420366fb0cfa6f49c8f8e614823d3ed008b69544873ff86e3b6eca4be961b0e1c7299d02d39df0ceb51eee3f7803e93f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "11b09786e4e2ab89c814560822067b60681eff0ef43ad5479df5239c729326db6cde52a535600c3b4ff8d9113327cea38224b3e2f54639df868357d08e0e7bbb";
+      sha512 = "f6b36def280b0541be3920e05649b488cbf3d4f55541a160373fb3a4d5b6a7f3f05fbd1d5730c479c690fbb44f0ea5bbc1ac3948f16d0e8e3f54352a12fd3e1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hsb/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "da0dd10538f0cfee6f9da54dfb48886e7dc74268a4e800f8b5e4e91fff1adf4b1f0b55dfa30d534d82200d7dced710f2e19382b6eb7e48882b18c6856939413b";
+      sha512 = "ffbf547964ac4abb1bfaf563a42f5828227b37fd46686318a7ed73079af30454aa3a3972ced2e887cb1d95ff048b0473ca2a210084179bf44c47a3b394c4adc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hu/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "a03d4b60b08d8379c21010f39065c782dddf2c521043f10746dbbfa83d01a6e4fb7d9422cb637b8d16966616e06c2e631452da1a3da491bc7a18a8ad64d6991d";
+      sha512 = "d3c26b9a91cab7dc1a0b4caaf87deac657e05b8164feb5b167b2af7b0591db99a5310bf3d4ad90687d5761ae36ef00ccba8da6dc3e2e6f5be867da69bcd9d0e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/hy-AM/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "95c0c4ec529ebe05115f2e6fa31ea9c41e9c543a4da8e68ec911a436eadda7e7f7e3e6cc6f0422d99102e839cf8e19a300e0ec343d1c8f056a84e14e682b40b3";
+      sha512 = "c7a8aa830cb8a4f2eb69cac3c18534c03e2162f16b999d21b6b17c7b815391c26c7561ef4f8509a0cefb6fc22647669897c30e0289b1f91c73927b80a0d5ed73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ia/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "32adf28b54a7981aee100f9649e75d24ee0e620a62ab814a648caf901a504c483cac675e7c5320f777e2fb02e56ba38e6828efbd59c77d0425642289b99f3178";
+      sha512 = "8aff68cff9d430b0c7d25040ad8059e6c80f058867e04eef5390481758c4fc6a840e194edc4bb57b54dd8e9d07b26c17fba016a773b48f7f771c24a1bbb3b593";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/id/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "3e9aafd39dc1ebda9ee0789c6ea58c25f755c73d70e1c5a16496c81d4f6b222051aa5b46ba3f98319bfcd767df1bef50ff90f81284441758e7b134c3dababc8a";
+      sha512 = "586adc6942c53997f6c6bb44263a8aa6089c4e9fbd9b887e4694ffcb91c478d44c3972f357d014a8f10b7cf23a85831f75224be6696bf7cd4dc9bb66ec01fd48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/is/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "1e4f604e74be51e1f2f32e472c4d67183b46d85661c08acac4adf9de2a632e3d32637e92cb5bf2b9141babc136f15aefd74a61a3d7210dc8fe1bcd119d6cccd4";
+      sha512 = "ab93b73c7cfdee88d4d6d72d0c2d34d88705c50d41a29ceef32360d00e4a0a6de97fe33ee2406733ec233db22d4be5502987c8b80c67e588e1b9a3780b707d3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/it/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "7491c8c5f9ea457629de4f907049f5a67d0c412ec430eb29f38bd7d771df779d70733f839fdd1cca978b1b8b89f7b65dd9a3d3af3848dc1ddd5f8376af74efa0";
+      sha512 = "9e981a209491738f86c33f6a7dc8b4f9efd31fee9e89f2b7126c9c160a5304c48e2be026946dcf684db68c1728e3715994d665fe5078e7638c8a93a30ef86165";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ja/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "b1bb46337e10209359b83466fa19d9751470b30434a1d58a030c2bb858d66bbd736ce8e3790292974b069a6dbcc32939d0fcdcc12b64e3db7fb58a9695c2685c";
+      sha512 = "f3fd18886957c4d8836cf45ddeb7d23626bcdc28992a1b9cbee941de7ed6aa8489187e98a2b7a2e675b8f40e5d3ad6508f8bcc8b910cfc8b41f9cf74a6921857";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ka/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "179c0975bff295c8e052bac86224d7b36d4ae35b6788b0de88e36789d7d3027310515826cb96500c251915cfc936c4762438724552552f17502e913b4536d67f";
+      sha512 = "6b03ab97981e13a6bc222f88e5a3b53051b4549d6ab0c36a39689a8448eeb20cfd5b9d401e6bfb6a99b1f85f0e91f98d19ec672c1ef2965ba5a35711f9280266";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kab/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "bf708a69c2bd801b34ac349934609b5dfccd9104e90b5f2cea09c0d9eec3f5ca4229b64cc2226285af8091a556535c3fe5966c30ee97a6077e190732124f6dce";
+      sha512 = "03611d923646638cf4109fea5080a8c874e4b884bf124a0da4b6739bd863b40dd32b18b2845f8fe61cbeb280ab2e82f68d1f7532af4c92b8dacea5e92d62f525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "77aec4b603d51cab49d2b055bac3036ffa110d324335ea0259b9b8b290ccae717c20c531e64acf4ec287d166a11a888c1fa8da82ca35c75fb68fccffa3a55d27";
+      sha512 = "f7428e4d06a76b7b3e134acde8e9caaff2db336e7093776fa2692d923d427e667c78df3a09222835248b029b05d13956b61170bff310e7444f0c3572440a1d6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/km/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "53981a550e4e2756ceca86f8b6b23da5a7048f9244bb84fd090cdfd801a9bbff6ecdfbb8bc54146c97936e7d66256c3f9a3415749b79860ecbd8b1f2fb6bcdcc";
+      sha512 = "e828d170628f1573c6d4029a9c8708aadd1846aaa76fc5afc50c44792235c060ff1984800de78ab7875a0cd821f53adbca419864871160d489e64f77d2ca513f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/kn/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "621ce46516f18505868304da207f12c4515a4fe8adc255fcdd86d61a475860093a8f6941902f71cb9b7772d2e0fcd8411f354477bf5b18841cc48cb318f6d1b2";
+      sha512 = "94c00340adc8d85c52db3dceb604f5ac4e686b274f6bd130350d6c1c2d48fde792dac6feff1ae19f46f5a757280f0f86a352434e7f8066fcbacfd9077a831cf5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ko/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "c46f6435f7e50a498ee0bed0918941265aa160d8b932a2b668f324a6a67b82aa2e96cf1a2974ec66c69c1a6aab3afad98fb753cf7d26a62a8d78148ff1343e75";
+      sha512 = "508e1a7aa0dd250c1f50ca8c1a05c02c488916e6288d5d45345c4309a96bff4696f1f365bb88cace1465e8fc97073e58c3a5be69beb7e03b47a178abdb416de9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lij/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "2e75b0e3e25b6c2de02590f922755824dd86cfa46672e0a628fc3a316892e83e08409d1ed7ecd523d878366e5309cdae5908b41bdca81b6e9e6a6079dac1b77a";
+      sha512 = "6929a0a72b082a47e20dc0ce41a6b982df03f60469f3f31499921c0b293c755869b978e224e90e4f3a75c41e88a635bd231236d72fda2fe50cf0f6b314178c82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lt/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "8298ddf054f8e011e8fddc517dccd4ae0caf73bc13563b5725b5422e8d6fb1d3e59af216a501dabfd5a2b6fd824b62bd944776343170948edf4fccb414c1d607";
+      sha512 = "c1363abd40a5e76ff383c32f9dd58931b692c1c7582cd1a4d21fddf95203c0a34588075e4d420fa39759844b9c0bfb9916af06ce260cceeaa2f0f1efff37b2d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/lv/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "99ccec4cf5ee280a14c680755b190e3a1d011b8837db405738a36b998816a805d664ad38113b5cf64696276a8d8acddd0daf248aaacfc52ed1178ea6caf32e2d";
+      sha512 = "95d2e14a1b77f5a3ca6d113ea5cad2a7fc4a0a8e21c7c40162198614637c0844547261a2f14242fda2cd9053391a78f3e587f21874b798e8fa522bc71d62816a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mai/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "f79a4325a3aceb24fad97c191d94d9133719d176f00cb9ee43ca275d29cc582b0a27f6a06f02106bbccd85b53791b6f2e0a7f751d9d0eb68bfd5d34a332e1088";
+      sha512 = "75e8cacd919ea8721102f6301e3b855d398e9ea01c516fca6eb7e94e24cd2ceaa289b3a6ca4afdc658c70dc46e2ec9b0bcf3086b70ce857adf7f0fec31996d36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "abe2b26198a4d94c2842017d28e3a23229d6c67dab99d436760ed2f7458bb613f31b9f9e56b453f4d7c1c398e681fbb6135f827a313eb5b1ba0a2964b042c198";
+      sha512 = "aa48016df099652eef14abf8cc774cd83c3c839d9fb47a6556ac86a4bef55d80855ff2aab810841e9c2ef86c47b968f57a27e0cd7369ec30b21bf29b423a6a02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ml/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "c197b8bb1f436ba151030f663e686ed41efe6d3dc162551fcf4bbea1d6de0f08354308323ecea722f2068b36503b6a896542fe35f0bb44d6e4e0227e033da3bc";
+      sha512 = "f40e4e169272764a55332f868e9a6b19ef54d04ff312827a0cf0c3792a2e5c0264f62b9cfb5939f0c43775811e350a4913387e1c4899293b7311a2b1c505dee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/mr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "5052273c867fbbd433c83acbbe701679ac073dc468ce60516aa326dc798828a03d7bb8d52e14bd45d0a66d0da4f5c9c85a7877ab99565259c659734443e8383b";
+      sha512 = "4a8ba1adbfbf88332adb40336b986a42f89e4789a8e2da2ae485041788bbbcbca56d971de43ae640022647a3d30760b4b5e072afafa74df0ca90449aa03d93e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ms/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "29bd77b97746166569ccb56ed32bbe4122957fc00738a9ca246fdb2d6dbf4bc1537f53bd07153c4e1605937795a7cc37257618a83676ffce7af1396a626d227a";
+      sha512 = "2ebf6eba002a877ec2d3a5928a46d6b39d5acf10fcf4c0238695e821bb0e0ca2ffa7230ba3bd910ad50f429712f4bb7ddf8bfa365d23034919d3a8e4c19188fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/my/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "a8f0b2d6d29ab10053ff9a90fc44aa16c98862337237a5c45c6e4dba98c96545e8fa683814e1ea00d2269cd86f12841d7fede243ffbc3dbc1ee1d7e51cdbebb8";
+      sha512 = "073224f374af0b25249f30112edf86b32fd2612b571b064ae4668f2739cbc02a33df0b5a459048ae0ba2d784035b2309671b61a5a894857edd2ef6fb5181b120";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nb-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "40fc4b9a8e6c94199c407e43cefd14c9bab34c2faa4f80d0452519c2a286d77961421340d5bc4103df81e0de6036f058db06614b89d19d4c273a5f7c81d0aa4c";
+      sha512 = "b654a0ebe06c63d9324d3821bdbcb8517a50274c3adf6e5f24ffc334649eaf6583774af15bb485f115c129c0ab5c66b31a17cbef97bc9b4a65c1ad09a333df58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ne-NP/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "9c309cc9eb2fdd16a33e15da0bb67998b5d6a1a4768723898293dfdb0bb38138339b566324767b427326e7c89600da199f33a8c4ebadd15cd74dfede718b0e8e";
+      sha512 = "43f18c506cb0964f860c12b16722f2c53a0312d007f00c4d248ba3babaa9bc1363758bea6b6a7207ffe477cb23e7f7c151a1578a49779634b2f8d208bcb97e6a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "281cbcf67bf6a75525b84e6552db454a481cdf92f6382258f05a4081eebc2a4db0ecf0a127f9c99c0d7bfca7a8b33850f2dd412ebf23f3bd2dc794d51a312ca0";
+      sha512 = "f40697b407b06402abb256d17322337b3ceaed07967d88f65a4e560090a0077a02fd96fc06c5937b8404a0d96353cf447ac5cc3a73c655224f65ea9b21364915";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/nn-NO/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "bf540d7ed9ad4e3290f33105bfc228ed096d30da7d99fc60da3c2fa386913cc98c3202666317fc8e52270ac14c5c778cbf8385f113c723062bbd61c18ffe128c";
+      sha512 = "00930c704aa3ed6910e6f0b03034706fceb7ceb6ef5c46b8eb2c8af4acf1bca331b0432f3b18419f715b4ba862691543e5d539ac08772090b8d1d15868854087";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/oc/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "1838462fdedd67e5be3836eefb5e06d2607bb7b18459514c5a16c4e31d84910c44e3bad8a3c1a492a96ac60b68fc123214288dd3cf22e067de3cb19ce0e88faa";
+      sha512 = "baacd03d232c645a06773dfcaeea6597672bc619eaccf5bb2276ab66737264c26c050a7d8f8f6fd8a69b3ee9460d0fa3d8308967af22cd1a4ae648a9f07a886e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/or/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "323b67ad29b15e809e9b7d5601abcf107ed4d80452f27e47edae9baaabf664aaff08f662dfe049ceaa1588ddf9efc976c220eee5b1b1c623447c155fd4f56971";
+      sha512 = "b27205d604a460dd45bc4c134f76f396fa9a9cae04da1cef936aa0a75fe3ecb683b75c88735c468660d8584a2cd0b00f867a8411e20465d03e0ce3a57b2d9ed3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pa-IN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "d54705ad2391bc0c4015b0729f86f651e321ef15ac4af72e47f31087e3ba87bfddcbdefcaeb17dcf9dceb4bebee7665785e06eb2537b56f2a22cb55afc7091b5";
+      sha512 = "aef11773f1498d65f5a4d81f8d411bb73a89a134239826589842979528e44898a4ac8005cbbb42fc1eb56c4eb0f920e3a89aec9f27ebcf1b922b1af1b037ce92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "d5db33a8ec5dae3141c6b61d23b0bf3c33c8b2ebd5e29aa71adaa5e03753e646fa45b56cfa4961609580585f9ecbc5b8b899f9bf3ccaeebe036be450740fefc3";
+      sha512 = "a50410b04c8ecf83734ae318d1da075844b50d6bd9147bd92a7ef1e59effdfbcc6ae2c9bb6d01a03ef3a0364623c36e7ce7e78a6caec5d75a561ac1770285282";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-BR/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "7507d710c231e8bda52d01d7ca757523790a61f9e8b3cd87d7b81ae341c62fbaaf7b731658d21bef2a66f7b9b65135fb5863f7043dd12f2444d72c3dd89a8d8e";
+      sha512 = "ca09e94cd945c182e43b4e661a50f0bf462956c438c83fb180a6dec8542dafa9a46bbb531e38cae30ac5facd6e2d318eb5c74dea86c8b4002228da5124c6c38c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/pt-PT/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "98634081c0976e04794ce53f237ec7c9bcb7dafa106accc50c6cf13ec2e69c1c2e70e3f6c8e3b6f56a7287d60fac632ad027a8bc5d0fc92cc86296ba4440d160";
+      sha512 = "03af81ef5b4472877ab0f5977876d4713f7a75759bf8012853429c57ac11d7d3c71390d3c899d653438df5ded9751e5a9ad15c7c7550adcaa04920d473b6bbbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/rm/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "25c77c8ec3e4531522991568c0b380eeb51332afcf086fef9c1a6a583bf615cd4a7fbded7d4fcd292ffacf79ef0f15df92d30f394e58c20bf43888aa8bc155b4";
+      sha512 = "d6d2ce2c896cc415b84a06a9abb8727bf5e1c71469f2e1d43ef98f4ad5f854ea05b5b90505074dfcd3176663bfd50dd64b435d5aea061f5be9e6c9fdc4f8ddd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ro/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "8a70253983d92f187bf96037e4c319961040d8709fb4f71814dbb02b48d6b4565008895a5c0708878680963a2ec04e9ac90d207cea381ee6ea33cb95c6aa9727";
+      sha512 = "9593b5d051b3059b98916ad8fa2d49fd436d76270d2f3542e33d58fd9f9a53fe7706679224cd34e9ceb519c5f31593c390f8aecf055302d1edfaceb4ac8673a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ru/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "0845c354ed3c31b31a9d9e7afe6f573ae1fdffb990aff5cf0a6d100da27cc218d6245024623d665146d7793b6cff209effa9587b6999cc0c5c7b427037616165";
+      sha512 = "db8eb5f0203eae6d21717d52d879c229edb5ada4cddfbe60909914dde9f3e8060e85a04ff865e8f1fdcf77035299d8003abc8e380cf02f41d4c45013c0652dd9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/si/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "6bf31f8262c584ec8c9b719736c516eb179c5f66d384f59761edabb606808928115a850f278894793b392a6d16f9008de5edc8efd1d8023a55041ffdce2d5a60";
+      sha512 = "59fbd221d80e9ecac9021806ff977d988ff5487e7e0f51bf89e91d0ca20d55c2ab492dab0f68c47d8502a0323004a35ed027fb5bdf7f781ee72b64f4b796c473";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "cf2a01c6d0ce55c43a54afaa439cfb074260cfd4e03c70e2c3a6eac011ff4c77c7fa6f5c3fcdec0823066b7caec7230d46911173f73ed65ccfbfb37d30c9e156";
+      sha512 = "ec20f49c5f208938ba94aa0a03fcf6b85b7d987fd05882f4a473a7a7f776254d5264841bd718515e1e35fc20e69e46964f637d559e39a38567749f9b3d4db3d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sl/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3eb37b8878d2cc28cf385668dac9c6487f76d9c1dd834aa2d81b5712657e3a5a76b229e03bbf9f5f464df54d2df412ff2a4aa5d78900437bcc2c0129317c825f";
+      sha512 = "6aa15d62fb495464518761add56f9f373059ff0029a7bd18115148dd23c9e88c1e9c1b3a23be2df2bd33380856888f58a7c39943453cb7d060fc5cd5619258be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/son/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "8f66f2d505fb113cf48561380e350632696201e207cc4a39a6757dbeecd923172fb5ee6d58ff771f8cb578e95c1bf01223c90fa14d4a1253c199978a499a5880";
+      sha512 = "e0c11fadff083ce242ced4d76da9e6187c621956ac77524733394820ffe720e3f9470fd4f3485dace497acc1ba04a07eacf9f0c115d081f8a9b107f4ce1f4568";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sq/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3828b306dfaf69b2d5b97ed2d026b40e7d1dd323321712bfd746e930e62c0b83b27a7ddc225c218dcc08ff314104e6287bb3e010985f3df30ecd630d22c8a0d1";
+      sha512 = "9bbe79a5d89912a4326af31b7c66ddff443e203835ed306b8cf2f409d08f9199e1f588892f349d1578810a618fa8692323d5ecdb2c987bfd263f3f4b18237f01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3eefba51599529796bfb02e5ef558077f0fa65db9cf856d9b189a323284274827f2d10d7f16759a28480167cce7c773d6c59ad7802c303ccc9d7ea8bbfc45fde";
+      sha512 = "6ce14b5c4f7d9c82ae6b62e08508cfd4f619800c59c59290943e1c66369bcf87e05029441f6f4141311aedf9d13da000763258da67e54e5748efc0b07a76deaa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/sv-SE/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "1a15fb14c63c741c068bdbdb2965311ff367acdbaecfaf174a88b42470cc5e36ad190512aba8cda7e816d8d01449cdf9fd34203fc9bc868124381f5daf527e17";
+      sha512 = "4c457ddf3cb1d1fcf35fc27f405ea5bc9154447e24ad95d16f768768ebdc800f6e7b164b0366a05d2d9c2810a8ada43eae58c5e5e9fea033fa67ad3a306aa9f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ta/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ee860b0595d2e0a9341d03a49df3cb82db3e272dbd258c791c1c575e5aaff3e29c755054425d8dfec0beaf47af9d05e0266116fe00a3e5ef5e8c298a31fe492b";
+      sha512 = "ba010386a6bfad89da7bde1cad05b88e26abe485e664a13c92bd97d247fc481188d44da1d20053a157df1024d658edb2952d7d8b1fbc6821e0e8e4d0a91388d4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/te/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "c4782516677864b28e5ebc01cc5cbda67fe7ce2912adcda0cec00958f2bbcf6ee2107b622dcb1170d32735dfceed80a2670f05c6d879ff3f626b7626aadb1811";
+      sha512 = "0bf97c198c26cfe13d95f8e7b5f6faa7dacff5045c1b030b5ddf3916936965ec47d99e2743e0e3c7dfa83fff1a03f588fe30632c13d25ed7a3d417982634403a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/th/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "409d4a385efb0b1ef61d7192873839e7b1d99aae50af62c8e7ed689230d2588b3d5b6d197c3c96f1e7ff6b41551880200ae2d32c936cbf4a5fb9e00a71251070";
+      sha512 = "c6a229f46eeb3623dc94394b2110b1e8f2cc854f82e87316aeaa01dd409267fece25de74202df41e50ed34a89a75284b5a32e9322ccf771bbc38cda4fd7b8f66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/tr/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "ed3b6f18e54df3d342bcf7674fc48c84a4321db52af779aabf3d3150d96cca9a0e86314d4ce1476894343f5789e227db5aa8d8dc0abce0474d215eb7cdd3c084";
+      sha512 = "72559e85a3be28e3f39daf4a2464c9ecc48f8a6c911b0db4183b6b5e897c25a639a30c11b71446799c4eea50a09f3f02031144a930b37b7ea9655e0235b2981e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uk/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "cce08b4cb1b820ca5bc9832e7ed19e753cc6db066e3bd007f58ce713d85976f060cae4b221833e085d39effc5a2dcb288b6fd89e4a3ec01577afe19585c6061e";
+      sha512 = "6f9482aab13ffc83e6efc9834369629c21ce60aebaca5a8e8935538ced4270ecafb3b88f46dee3a5be3f13b556702d58092e73063349534dbf2279a91a096aab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/ur/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "a9e137a01005de3dd60d05f7145134b3f2d5eb96ba84895effe434228fdebe995994682ba83c3368046732d8ceea7bd0289d4c852a0771feb6099fb29d524666";
+      sha512 = "541eb087462b501256886853f194c1078942bdf31339b453f9d8ae058902882c7aeba6c67157161cd6ffefeeb3791a4a63b15ebcbf813ba5c00f4f4311ccf008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/uz/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "3ef9a4d7e92d813c3ec236869452372ba1c87cd978ffe7dc230ef410174625fb3d64caaef6c378b7609043ed5f3482dd6e03a975e0574365deeb6b35a1523600";
+      sha512 = "6a9112d88bc51818c06dde6643aaf606831abd00812da9e372415784eb3fbb0ed77914f60ddf1e2cb0f95b2379378911abdccc4f229ad5fafac98c81be60dd13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/vi/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "d8b49627c29430ee420e8c878da1fde7df4fa0b3aa5f145b0003f7fd9270d9a7d0e3d5f9941dee9cfc081a376cc922b7652667f559421e5e7ca8aeae8aa4ddfe";
+      sha512 = "ff1742130854a5d61ddb6a22c8b61eb1bb71995f8f9d0f2ddbf032edf0e7a70cf4e64690e7d4ca05b1fe42121ca8b389244d492234428b517771afb1a79ac803";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/xh/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "de32d3f2b715eaba412484d1b3e67d9ccfd53afcaf9d0a829c9873f07edc88d3f8c984d0752ef7dc378888a92ef515f6ace3ad4e4c98ab40f7232ed385445d13";
+      sha512 = "07d1c523173fc4eaa47bc6a22de40e73849960b9f8f92139c1ca95e3e35a1b852b69eb698912e0e2e4ff4e265801779a027336ef788e3bd93a7bc49fc831c577";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-CN/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "109d325c32a754dcf004e3dab0716a93ec7a29718719128855b0024f75822662df48d6c609cc1c2fc652818f3925972d9d317b928349db9ce4b267cd10e867e5";
+      sha512 = "bbfd0b2a751f02993fc82f1be83ed6ed1a1cc054774128423787341faa059ee1f7d402741f78d8076eb5012bef656037bbebeea0775284cd4691b2fc3053e476";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b5/linux-i686/zh-TW/firefox-61.0b5.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "6c85e5e20da3495ce351ca04ecda4addff13ce8ef09b14194110b409f9aa89c76eb6d4b851667414645249012cfb544ebce1dd41ca05b5d18873d4ecf3bf4960";
+      sha512 = "925de39349b7a4bec721bf494fa8af8252fd923b0976bc1a99869c5bc5b083ef09b8a3116d79aaa2ff3bace9b0df26ed455ea385c6853e0ac1f4a03ce257d51e";
     }
     ];
 }

From 430bfa5ae58fb462ca9142e622375baf4940ca5c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 20 May 2018 14:30:24 +0300
Subject: [PATCH 2168/3370] kmscube: Fix src

Someone sedded a bit too eagerly.
---
 pkgs/os-specific/linux/kmscube/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix
index 27ffaca61e71..99ef7d4a5508 100644
--- a/pkgs/os-specific/linux/kmscube/default.nix
+++ b/pkgs/os-specific/linux/kmscube/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "kmscube-2017-03-19";
 
   src = fetchgit {
-    url = git://anongit.freedesktop.org/libGLU_combined/kmscube;
+    url = git://anongit.freedesktop.org/mesa/kmscube;
     rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea";
     sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca";
   };

From 5188ef371f3d5d96e8775cd39fdf18714f58f774 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 19 Apr 2018 19:10:51 +0000
Subject: [PATCH 2169/3370] libnatpmp: init at 20150609

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

diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix
new file mode 100644
index 000000000000..17626bb23e13
--- /dev/null
+++ b/pkgs/development/libraries/libnatpmp/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libnatpmp-${version}";
+  version = "20150609";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
+    sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1";
+  };
+
+  makeFlags = [ "INSTALLPREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://miniupnp.free.fr/libnatpmp.html;
+    description = "NAT-PMP client";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1634bf343cad..f2b880ad6964 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10119,6 +10119,8 @@ with pkgs;
     mysql = mysql57;
   };
 
+  libnatpmp = callPackage ../development/libraries/libnatpmp { };
+
   libnatspec = callPackage ../development/libraries/libnatspec { };
 
   libndp = callPackage ../development/libraries/libndp { };

From 75e66b558102492631ceef1600c836a91b27e64a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 19 Apr 2018 19:11:16 +0000
Subject: [PATCH 2170/3370] swift-im: init at 4.0.2

(cherry picked from commit d7117945f5a3edf44b3c71432a8a6a4f94e1d75b)
---
 .../instant-messengers/swift-im/default.nix   | 48 +++++++++++++++++
 .../instant-messengers/swift-im/scons.patch   | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 3 files changed, 105 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/swift-im/default.nix
 create mode 100644 pkgs/applications/networking/instant-messengers/swift-im/scons.patch

diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
new file mode 100644
index 000000000000..e3b3d7191892
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, pkgconfig, qttools, scons
+, GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2
+, lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib
+}:
+
+let
+  _scons = "scons -j$NIX_BUILD_CORES";
+in stdenv.mkDerivation rec {
+  name = "swift-im-${version}";
+  version = "4.0.2";
+
+  src = fetchurl {
+    url = "https://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
+    sha256 = "0w0aiszjd58ynxpacwcgf052zpmbpcym4dhci64vbfgch6wryz0w";
+  };
+
+  patches = [ ./scons.patch ];
+
+  nativeBuildInputs = [ pkgconfig qttools scons ];
+
+  buildInputs = [
+    GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2
+    lua miniupnpc openssl qtbase qtmultimedia qtsvg qtwebkit qtx11extras zlib
+  ];
+
+  propagatedUserEnvPkgs = [ GConf ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${libxml2.dev}/include/libxml2"
+    "-I${miniupnpc}/include/miniupnpc"
+  ];
+
+  buildPhase = ''
+    ${_scons} Swift
+  '';
+
+  installPhase = ''
+    ${_scons} SWIFT_INSTALLDIR=$out $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://swift.im/;
+    description = "Qt XMPP client";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ orivej ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/swift-im/scons.patch b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch
new file mode 100644
index 000000000000..c63b05d7acb1
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/swift-im/scons.patch
@@ -0,0 +1,53 @@
+diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
+index 40f242513..53e1ff26a 100644
+--- a/BuildTools/SCons/SConscript.boot
++++ b/BuildTools/SCons/SConscript.boot
+@@ -508,6 +508,7 @@ if env.get("distcc", False) :
+         if var.startswith("DISTCC_") :
+             env["ENV"][var] = os.environ[var]
+ 
++env["ENV"] = os.environ
+ conf_env = env.Clone()
+ 
+ Export("env")
+diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
+index 70bffbcfe..fef281899 100644
+--- a/BuildTools/SCons/SConstruct
++++ b/BuildTools/SCons/SConstruct
+@@ -272,7 +272,7 @@ if env.get("try_gconf", True) and env["PLATFORM"] != "win32" and env["PLATFORM"]
+     gconf_env = conf_env.Clone()
+     conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
+     if conf.CheckPKG("gconf-2.0") :
+-        gconf_bare_env = Environment()
++        gconf_bare_env = Environment(ENV = os.environ)
+         gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
+         if os.path.basename(env["CXX"]).startswith(("g++", "clang++")) :
+             gconf_bare_env["CCFLAGS"] = [("-isystem" + ccflag) for ccflag in gconf_bare_env["CPPPATH"]]
+@@ -634,9 +634,9 @@ hunspell_env.MergeFlags(hunspell_flags)
+ env["HAVE_HUNSPELL"] = 0;
+ if env.get("hunspell_enable", False) :
+     hunspell_conf = Configure(hunspell_env)
+-    if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell") :
++    if hunspell_conf.CheckCXXHeader("hunspell/hunspell.hxx") and hunspell_conf.CheckLib("hunspell-1.6") :
+         env["HAVE_HUNSPELL"] = 1
+-        hunspell_flags["LIBS"] = ["hunspell"]
++        hunspell_flags["LIBS"] = ["hunspell-1.6"]
+         env["HUNSPELL_FLAGS"] = hunspell_flags
+     hunspell_conf.Finish()
+ 
+diff --git a/BuildTools/SCons/Tools/textfile.py b/BuildTools/SCons/Tools/textfile.py
+index 89f8963dc..b8559f7a6 100644
+--- a/BuildTools/SCons/Tools/textfile.py
++++ b/BuildTools/SCons/Tools/textfile.py
+@@ -113,7 +113,10 @@ def _action(target, source, env):
+     lsep = None
+     for s in source:
+         if lsep: fd.write(lsep)
+-        fd.write(_do_subst(s, subs))
++        b = _do_subst(s, subs)
++        if isinstance(b, unicode):
++            b = b.encode('UTF-8')
++        fd.write(b)
+         lsep = linesep
+     fd.close()
+ 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2b880ad6964..182bc498df05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18072,6 +18072,10 @@ with pkgs;
 
   swh_lv2 = callPackage ../applications/audio/swh-lv2 { };
 
+  swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im {
+    inherit (gnome2) GConf;
+  };
+
   sylpheed = callPackage ../applications/networking/mailreaders/sylpheed { };
 
   symlinks = callPackage ../tools/system/symlinks { };

From 61604ff9a6d6690de313202426b21e12a2e77ef6 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 20 May 2018 15:08:17 +0200
Subject: [PATCH 2171/3370] jetbrains.datagrip: 2018.1.2 -> 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 2de973d41f66..9697fb851cf0 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -250,12 +250,12 @@ in
 
   datagrip = buildDataGrip rec {
     name = "datagrip-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     description = "Your Swiss Army Knife for Databases and SQL";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/datagrip/${name}.tar.gz";
-      sha256 = "12rihb1ppl4i1i0j3yj4ih4qx3xf30kfx022pbvng1rjy0bpikp7"; /* updated by script */
+      sha256 = "0y959p9jsfqlf6cnj2k5m4bxc85yn5lv549rbacwicx4f0g6zp6r"; /* updated by script */
     };
     wmClass = "jetbrains-datagrip";
     update-channel = "datagrip_2018_1";

From c0dec69ee00dee891bc8e80b45c0c29acf98241a Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 20 May 2018 15:08:49 +0200
Subject: [PATCH 2172/3370] jetbrains.goland: 2018.1.2 -> 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 9697fb851cf0..ae921be69b09 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -263,12 +263,12 @@ in
 
   goland = buildGoland rec {
     name = "goland-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     description = "Up and Coming Go IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/go/${name}.tar.gz";
-      sha256 = "1qhhxarvw6mzavyzackzkbq52yfr5437gljxdvlbr6rpi99hgfzb"; /* updated by script */
+      sha256 = "02nl6dssf2r4lk0fy40cvgm1m0nnfvaz2k6yygwzr35qmbsw2xjq"; /* updated by script */
     };
     wmClass = "jetbrains-goland";
     update-channel = "goland_release";

From 4310d7f11b67c22d23623571f24ca5015575755d Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 20 May 2018 15:09:14 +0200
Subject: [PATCH 2173/3370] jetbrains.phpstorm: 2018.1.2 -> 2018.1.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index ae921be69b09..27911751be21 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -302,12 +302,12 @@ in
 
   phpstorm = buildPhpStorm rec {
     name = "phpstorm-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "Professional IDE for Web and PHP developers";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz";
-      sha256 = "13si8g7n1qvjm5ivbrazsbqlvwwlg65nia78k74nkaqp704z92cs"; /* updated by script */
+      sha256 = "0rrcsn44va942nrznldjkxymir45q8gq1lf3f8vg1w3k87cfk1zp"; /* updated by script */
     };
     wmClass = "jetbrains-phpstorm";
     update-channel = "PS2018.1";

From e4ed6ca8417b62e6fca79ff6ad5acc03970016eb Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 20 May 2018 15:09:41 +0200
Subject: [PATCH 2174/3370] jetbrains.pycharm-community: 2018.1.2 -> 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 27911751be21..c8fe639cc8ed 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -315,12 +315,12 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1phxzsz2qnyk0b0kkccsgjkxx4ak7rbm68k1lpgr59rwyxqnazy3"; /* updated by script */
+      sha256 = "1cwrqdcp6hwr8wd234g120bblc4bjmhwxwsgj9mmxblj31c7c6an"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm-ce";
     update-channel = "PyCharm_Release";

From ce5e076329243a215e0f9f48710d0f441cc075b3 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 20 May 2018 15:10:09 +0200
Subject: [PATCH 2175/3370] jetbrains.pycharm-professional: 2018.1.2 ->
 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index c8fe639cc8ed..e69d54942afd 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -328,12 +328,12 @@ in
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "08cfmrrmxs67dc61cvjc0ynzng0hnr2i78fv3m888k4x63cy6mv5"; /* updated by script */
+      sha256 = "1chri4cknfvvqhxy973dyf7dl5linqdxc97zshrzdqhmwq6y7580"; /* updated by script */
     };
     wmClass = "jetbrains-pycharm";
     update-channel = "PyCharm_Release";

From a3d40ac0ee3231abb3641b9cc5db56eda1c8e1e6 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 20 May 2018 15:10:39 +0200
Subject: [PATCH 2176/3370] jetbrains.rider: 2017.3.1 -> 2018.1

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index e69d54942afd..316bb7a7d960 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -341,15 +341,15 @@ in
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2017.3.1"; /* updated by script */
+    version = "2018.1"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
-      url = "https://download.jetbrains.com/resharper/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "0k9yc00lmk826pylfs9jyxqnlczk9vhq7bs61b8nyfam1dqbgikv"; /* updated by script */
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
+      sha256 = "0jhzfi9r18hy6mig8rrrr2n55lrfn5ysa7h347w5yv2dm7kx09ib"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
-    update-channel = "rider_2017_3";
+    update-channel = "rider_2018_1";
   };
 
   ruby-mine = buildRubyMine rec {

From 68fa5505d80bb7970cf49643a5069dd251182a03 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 20 May 2018 15:11:01 +0200
Subject: [PATCH 2177/3370] jetbrains.ruby-mine: 2018.1.2 -> 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 316bb7a7d960..5c882738a0bc 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -354,12 +354,12 @@ in
 
   ruby-mine = buildRubyMine rec {
     name = "ruby-mine-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3"; /* updated by script */
     description = "The Most Intelligent Ruby and Rails IDE";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz";
-      sha256 = "0bnzn811rmgn0kig3mzbwgx85490dqg4sg3pmmmk20n8hcph8zca"; /* updated by script */
+      sha256 = "033rjsx6zjrfbl89i513ms14iw53ip56h4bkilrij32hshb7c2c5"; /* updated by script */
     };
     wmClass = "jetbrains-rubymine";
     update-channel = "rm2018.1";

From 95b1827682dc30ff1ccffb4f46c197289cea3e1c Mon Sep 17 00:00:00 2001
From: Euan T <euantorano@users.noreply.github.com>
Date: Sun, 20 May 2018 14:33:22 +0100
Subject: [PATCH 2178/3370] nim: 0.17.2 -> 0.18.0 (#40556)

* Nim 0.17.2 -> 0.18.0

* Add missing dependencies for Nim 0.18.0

Solved GC and SFML-related test failures.
Attempting to download nimble packages.

* Fix tzdata test

* Fix tworkingdir test

* Replace outdated nodejs

* Disable non-runnable tests
---
 pkgs/development/compilers/nim/default.nix | 47 ++++++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index a49b1b824394..de383410b9c6 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, lib, fetchurl, makeWrapper, nodejs, openssl, pcre, readline, sqlite }:
+# based on https://github.com/nim-lang/Nim/blob/v0.18.0/.travis.yml
+
+{ stdenv, lib, fetchurl, makeWrapper, nodejs-slim-8_x, openssl, pcre, readline, sqlite, boehmgc, sfml, tzdata, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "nim-${version}";
-  version = "0.17.2";
+  version = "0.18.0";
 
   src = fetchurl {
     url = "https://nim-lang.org/download/${name}.tar.xz";
-    sha256 = "1gc2xk3ygmz9y4pm75pligssgw995a7gvnfpy445fjpw4d81pzxa";
+    sha256 = "45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0";
   };
 
   doCheck = true;
@@ -18,6 +20,7 @@ stdenv.mkDerivation rec {
     "-lpcre"
     "-lreadline"
     "-lsqlite3"
+    "-lgc"
   ];
 
   # 1. nodejs is only needed for tests
@@ -25,12 +28,12 @@ stdenv.mkDerivation rec {
   #    used for bootstrapping, but koch insists on moving the nim compiler around
   #    as part of building it, so it cannot be read-only
 
-  buildInputs  = [
-    makeWrapper nodejs
-    openssl pcre readline sqlite
+  buildInputs = [
+    makeWrapper nodejs-slim-8_x tzdata coreutils
+    openssl pcre readline sqlite boehmgc sfml
   ];
 
-  buildPhase   = ''
+  buildPhase = ''
     sh build.sh
     ./bin/nim c koch
     ./koch boot  -d:release \
@@ -48,7 +51,35 @@ stdenv.mkDerivation rec {
       --suffix PATH : ${lib.makeBinPath [ stdenv.cc ]}
   '';
 
-  checkPhase = "./koch tests";
+  postPatch =
+    let disableTest = ''sed -i '1i discard \"\"\"\n  disabled: true\n\"\"\"\n\n' '';
+        disableCompile = ''sed -i -e 's/^/#/' '';
+    in ''
+      substituteInPlace ./tests/async/tioselectors.nim --replace "/bin/sleep" "sleep"
+      substituteInPlace ./tests/osproc/tworkingdir.nim --replace "/usr/bin" "${coreutils}/bin"
+      substituteInPlace ./tests/stdlib/ttimes.nim --replace "/usr/share/zoneinfo" "${tzdata}/share/zoneinfo"
+
+      # disable supposedly broken tests
+      ${disableTest} ./tests/errmsgs/tproper_stacktrace2.nim
+      ${disableTest} ./tests/vm/trgba.nim
+
+      # disable tests requiring network access (not available in the build container)
+      ${disableTest} ./tests/stdlib/thttpclient.nim
+      ${disableTest} ./tests/cpp/tasync_cpp.nim
+      ${disableTest} ./tests/niminaction/Chapter7/Tweeter/src/tweeter.nim
+
+      # disable tests requiring un-downloadable dependencies (using nimble, which isn't available in the fetch phase)
+      ${disableCompile} ./tests/manyloc/keineschweine/keineschweine.nim
+      ${disableTest} ./tests/manyloc/keineschweine/keineschweine.nim
+      ${disableCompile} ./tests/manyloc/nake/nakefile.nim
+      ${disableTest} ./tests/manyloc/nake/nakefile.nim
+      ${disableCompile} ./tests/manyloc/named_argument_bug/main.nim
+      ${disableTest} ./tests/manyloc/named_argument_bug/main.nim
+    '';
+
+  checkPhase = ''
+    ./koch tests
+  '';
 
   meta = with stdenv.lib; {
     description = "Statically typed, imperative programming language";

From 65df48a6dedf35668233bf8eb3862fe9004ed14d Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sat, 19 May 2018 13:41:26 -0400
Subject: [PATCH 2179/3370] pidgin: 2.12.0 -> 2.13.0

closes #40798
---
 .../networking/instant-messengers/pidgin/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 3ec45702b175..430357cc666a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -15,11 +15,11 @@
 let unwrapped = stdenv.mkDerivation rec {
   name = "pidgin-${version}";
   majorVersion = "2";
-  version = "${majorVersion}.12.0";
+  version = "${majorVersion}.13.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
-    sha256 = "1y5p2mq3bfw35b66jsafmbva0w5gg1k99y9z8fyp3jfksqv3agcc";
+    sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7";
   };
 
   inherit nss ncurses;

From c919d62faae7ac186326bd761927f01c1099b9b4 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Sun, 20 May 2018 18:13:59 +0200
Subject: [PATCH 2180/3370] terraform_0_11: 0.11.6 -> 0.11.7

This is a small fix for hashicorp/terraform#17793. There is no need to
rebuild the providers.
---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 5879c0e83974..38b7e485259a 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -104,8 +104,8 @@ in rec {
   terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues;
 
   terraform_0_11 = pluggable (generic {
-    version = "0.11.6";
-    sha256 = "17kd3ln1i40qb8fll5918rvgackzf1ibmr7li1p9vky4ki3iwr0l";
+    version = "0.11.7";
+    sha256 = "0q5gl8yn1f8fas1v68lz081k88gbmlk7f2xqlwqmh01qpqjxd42q";
     patches = [ ./provider-path.patch ];
     passthru = { inherit plugins; };
   });

From 410be1aa1da9f081e622369bbf1abc73705b959a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 10:13:23 -0700
Subject: [PATCH 2181/3370] wireguard: 0.0.20180514 -> 0.0.20180519

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireguard-tools/versions.

These checks were done:

- built on NixOS
- /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519/bin/wg passed the binary check.
- /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519/bin/wg-quick passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.0.20180519 with grep in /nix/store/c48vhaf6wqmra1g6sv4hv3i6vqlw7ll1-wireguard-tools-0.0.20180519
- directory tree listing: https://gist.github.com/64bccf9c57ca84c49486890ccbf17239
- du listing: https://gist.github.com/f28d6cfd8bcbf6ab1a6c39ad40ce1606
---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index f34119893c48..c9e48d61c359 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -6,11 +6,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180514";
+  version = "0.0.20180519";
 
   src = fetchzip {
     url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "15z0s1i8qyq1fpw8j6rky53ffrpp3f49zn1022jwdslk4g0ncaaj";
+    sha256 = "0pd04ia0wcm0f6di4gx5kflccc5j35d72j38l8jqpj8vinl6l070";
   };
 
   preConfigure = "cd src";

From 69038bf7b1ed7af0e3f4a52dca245a5a7578622a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 10:20:10 -0700
Subject: [PATCH 2182/3370] python27Packages.youtube-dl: 2018.05.09 ->
 2018.05.18

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/youtube-dl/versions.

These checks were done:

- built on NixOS
- /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18/bin/.youtube-dl-wrapped passed the binary check.
- /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18/bin/youtube-dl passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 2018.05.18 with grep in /nix/store/xdrcf96p90hk4cdpwjcafvqz9dhpab0p-youtube-dl-2018.05.18
- directory tree listing: https://gist.github.com/d85bbc7695f5c7236d2de010c6381975
- du listing: https://gist.github.com/c5ad848ac823c72e329d20063defbc67
---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index f76b439b9206..b639397388b4 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   pname = "youtube-dl";
-  version = "2018.05.09";
+  version = "2018.05.18";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0sl4bi2jls3417rd62awbqdq1b6wskkjbfwpnyw4a61qarfxid1d";
+    sha256 = "11r0hv6885w8k4m307kvf9545vr5a3ym9bf7szghvbcgmgc8lm5w";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 1f348e41a4960e00bc2b511411c3f7884d6e00d1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 20 May 2018 13:24:28 -0400
Subject: [PATCH 2183/3370] Dont test enclosed exceptions

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 011f307e8a81..83d97c64b48b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -408,6 +408,9 @@ self: super: {
     jailbreak       = true;
   });
 
+  # https://github.com/jcristovao/enclosed-exceptions/issues/12
+  enclosed-exceptions = dontCheck super.enclosed-exceptions;
+
   # Older versions don't compile.
   base-compat = self.base-compat_0_10_1;
   brick = self.brick_0_37;

From 27777ed2759623f77e6b3c2ff300e453ef6c70b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 11:27:40 -0700
Subject: [PATCH 2184/3370] python27Packages.udiskie: 1.7.3 -> 1.7.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/udiskie/versions.

These checks were done:

- built on NixOS
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/udiskie passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/udiskie-info passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/udiskie-mount passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/udiskie-umount passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/..udiskie-wrapped-wrapped passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/.udiskie-wrapped passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/..udiskie-info-wrapped-wrapped passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/.udiskie-info-wrapped passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/..udiskie-mount-wrapped-wrapped passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/.udiskie-mount-wrapped passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/..udiskie-umount-wrapped-wrapped passed the binary check.
- /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4/bin/.udiskie-umount-wrapped passed the binary check.
- 12 of 12 passed binary check by having a zero exit code.
- 12 of 12 passed binary check by having the new version present in output.
- found 1.7.4 with grep in /nix/store/y1i5v63y71myq5wcb6dyzb9g2snryf69-udiskie-1.7.4
- directory tree listing: https://gist.github.com/b8c058b519fdc73cbd6a8b7062bb7dea
- du listing: https://gist.github.com/befb311e40dbd18617e2b11abb41bf1e
---
 pkgs/applications/misc/udiskie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index ea79e29ff020..8c6dfe247724 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonApplication rec {
   name = "udiskie-${version}";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "coldfix";
     repo = "udiskie";
     rev = version;
-    sha256 = "1yv1faq81n3vspf3jprcs5v21l2fchy3m3pc7lk8jb0xqlnh60x4";
+    sha256 = "0r3m8y6ppkl8p1lhr89sfk9v2la1zn0rbmr6hy860j7b22yvnkrn";
   };
 
   buildInputs = [

From 4db2d4d1fda550d480faa72e32b0e4e07c7862b5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 20 May 2018 20:59:53 +0200
Subject: [PATCH 2185/3370] nixos/xsslock: wait until `pgrep xlock` succeeds
 (#40810)

Please refer to the conversation in the original PR (#40619) for further
reference: https://github.com/NixOS/nixpkgs/pull/40619#issuecomment-390437845

It takes some time after the standby to trigger the locker which might
break the test on Hydra.
---
 nixos/tests/xss-lock.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
index 3e3864cab770..045667bdcdec 100644
--- a/nixos/tests/xss-lock.nix
+++ b/nixos/tests/xss-lock.nix
@@ -20,6 +20,6 @@ with lib;
 
     $machine->fail("pgrep xlock");
     $machine->succeed("su -l alice -c 'xset dpms force standby'");
-    $machine->succeed("pgrep xlock");
+    $machine->waitUntilSucceeds("pgrep xlock");
   '';
 })

From d0f3fc1be408d3b3c42330d0c007542569faf192 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 May 2018 12:04:36 -0700
Subject: [PATCH 2186/3370] trackballs: 1.3.0 -> 1.3.1 (#40829)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/trackballs/versions.

These checks were done:

- built on NixOS
- /nix/store/0admi2vxfnbyx4ivgfcgvm8nb5lsrqi6-trackballs-1.3.1/bin/trackballs passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.3.1 with grep in /nix/store/0admi2vxfnbyx4ivgfcgvm8nb5lsrqi6-trackballs-1.3.1
- directory tree listing: https://gist.github.com/adba0c7480e5b6838c65b78eea5a190e
- du listing: https://gist.github.com/280989936dc7851623de29d3fb610355
---
 pkgs/games/trackballs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 29bf399087b0..06bd2a8bc4d0 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "trackballs-${version}";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "trackballs";
     repo = "trackballs";
     rev = "v${version}";
-    sha256 = "1rahqsydpbh8nmh41fxggzj5f6s3ldf7p5krik5fnhpy0civfsxd";
+    sha256 = "1yjzz50r57aahy7wcbsmhrd40abzyriq40j49225ya7m9g28vmgl";
   };
 
   buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ];

From d7679fb2b5a1c22b9e8a9b3c82e1119737ba1dbe Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 21 May 2018 03:32:03 +0800
Subject: [PATCH 2187/3370] 0ad: 0.0.22 -> 0.0.23 (#40807)

---
 pkgs/games/0ad/data.nix         |  6 +++---
 pkgs/games/0ad/default.nix      |  4 ++--
 pkgs/games/0ad/game.nix         | 21 +++++++++------------
 pkgs/top-level/all-packages.nix |  4 +++-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/0ad/data.nix b/pkgs/games/0ad/data.nix
index 2c6abd7972f9..20921a61b8c1 100644
--- a/pkgs/games/0ad/data.nix
+++ b/pkgs/games/0ad/data.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, zeroad-unwrapped }:
 
 stdenv.mkDerivation rec {
   name = "0ad-data-${version}";
-  version = "0.0.22";
+  inherit (zeroad-unwrapped) version;
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-data.tar.xz";
-    sha256 = "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc";
+    sha256 = "1b6qcvd8yyyxavgdwpcs7asmln3xgnvjkglz6ggvwb956x37ggzx";
   };
 
   installPhase = ''
diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index 983e8accc206..d53942766bb2 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -1,10 +1,10 @@
-{ newScope }:
+{ wxGTK, newScope }:
 
 let
   callPackage = newScope self;
 
   self = {
-    zeroad-unwrapped = callPackage ./game.nix { };
+    zeroad-unwrapped = callPackage ./game.nix { inherit wxGTK; };
 
     zeroad-data = callPackage ./data.nix { };
 
diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix
index 4d5a4fe8379c..0cf1b6f5e671 100644
--- a/pkgs/games/0ad/game.nix
+++ b/pkgs/games/0ad/game.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, callPackage, perl, fetchurl, python2
-, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng
+, pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng, libsodium
 , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc
-, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL, SDL2
+, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL2
 , gloox, nvidia-texture-tools
 , withEditor ? true, wxGTK ? null
 }:
@@ -10,11 +10,11 @@ assert withEditor -> wxGTK != null;
 
 stdenv.mkDerivation rec {
   name = "0ad-${version}";
-  version = "0.0.22";
+  version = "0.0.23";
 
   src = fetchurl {
     url = "http://releases.wildfiregames.com/0ad-${version}-alpha-unix-build.tar.xz";
-    sha256 = "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx";
+    sha256 = "0qz1sg4n5y766qwgi63drrrx6k17kk0rcnn9a4a9crllk2vf78fg";
   };
 
   nativeBuildInputs = [ python2 perl pkgconfig ];
@@ -23,14 +23,13 @@ stdenv.mkDerivation rec {
     spidermonkey_38 boost icu libxml2 libpng libjpeg
     zlib curl libogg libvorbis enet miniupnpc openal
     libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox
-    nvidia-texture-tools
+    nvidia-texture-tools libsodium
   ] ++ lib.optional withEditor wxGTK;
 
   NIX_CFLAGS_COMPILE = [
     "-I${xproto}/include/X11"
     "-I${libX11.dev}/include/X11"
     "-I${libXcursor.dev}/include/X11"
-    "-I${SDL.dev}/include/SDL"
     "-I${SDL2}/include/SDL2"
   ];
 
@@ -77,16 +76,14 @@ stdenv.mkDerivation rec {
     ''}
 
     # Copy l10n data.
-    mkdir -p "$out"/share/0ad/data
-    cp -r binaries/data/l10n "$out"/share/0ad/data
+    install -Dm755 -t $out/share/0ad/data/l10n binaries/data/l10n/*
 
     # Copy libraries.
-    mkdir -p "$out"/lib/0ad
-    cp binaries/system/*.so "$out"/lib/0ad/
+    install -Dm644 -t $out/lib/0ad        binaries/system/*.so
 
     # Copy icon.
-    install -D build/resources/0ad.png "$out"/share/icons/hicolor/128x128/0ad.png
-    install -D build/resources/0ad.desktop "$out"/share/applications/0ad.desktop
+    install -D build/resources/0ad.png     $out/share/icons/hicolor/128x128/0ad.png
+    install -D build/resources/0ad.desktop $out/share/applications/0ad.desktop
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 182bc498df05..9052b09c3727 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19736,7 +19736,9 @@ with pkgs;
 
   keen4 = callPackage ../games/keen4 { };
 
-  zeroadPackages = callPackage ../games/0ad { };
+  zeroadPackages = callPackage ../games/0ad {
+    wxGTK = wxGTK30;
+  };
 
   zeroad = zeroadPackages.zeroad;
 

From 74a0ff512c98c64ada1d95193784e77b7406cdaf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 May 2018 12:42:01 -0700
Subject: [PATCH 2188/3370] worker: 3.15.0 -> 3.15.1 (#40820)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/worker/versions.

These checks were done:

- built on NixOS
- /nix/store/m3af3zhrxravdkwq8fcsgqrqyywfbl20-worker-3.15.1/bin/worker passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.15.1 with grep in /nix/store/m3af3zhrxravdkwq8fcsgqrqyywfbl20-worker-3.15.1
- directory tree listing: https://gist.github.com/25a3c6e8ffd32fd4b88511e305669c51
- du listing: https://gist.github.com/6f5f0c3dfcb21b2d414fafa466d13283
---
 pkgs/applications/misc/worker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix
index 968539336a9c..bfb43d3e49d1 100644
--- a/pkgs/applications/misc/worker/default.nix
+++ b/pkgs/applications/misc/worker/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "worker-${version}";
-  version = "3.15.0";
+  version = "3.15.1";
 
   src = fetchurl {
     url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}.tar.gz";
-    sha256 = "0baaxa10jnf4nralhjdi7525wd1wj0161z2ixz1j5pb0rl38brl8";
+    sha256 = "05h25dxqff4xhmrk7j9j11yxpqa4qm7m3xprv7yldryc1mbvnpwi";
   };
 
   buildInputs = [ libX11 ];

From e92d68e3ab44e818876bdc1431c4d5d66b03e104 Mon Sep 17 00:00:00 2001
From: averelld <averelld@users.noreply.github.com>
Date: Sun, 20 May 2018 21:53:45 +0200
Subject: [PATCH 2189/3370] x2goclient: qt4 -> qt5 (#40811)

---
 .../networking/remote/x2goclient/default.nix         | 12 +++++++-----
 pkgs/top-level/all-packages.nix                      |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index b470c6b39d3b..a4d2e85a9119 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, makeWrapper, qt4 }:
+{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh,
+makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }:
 
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
@@ -9,18 +10,19 @@ stdenv.mkDerivation rec {
     sha256 = "0jzlwn0v8b123h5l7hrhs35x2z6mb98zg1s0shqb4yfp2g641yp3";
   };
 
-  buildInputs = [ cups libssh libXpm nxproxy openldap openssh qt4 ];
+  buildInputs = [ cups libssh libXpm nxproxy openldap openssh
+                  qtbase qtsvg qtx11extras qttools phonon ];
   nativeBuildInputs = [ makeWrapper ];
 
   patchPhase = ''
      substituteInPlace Makefile \
        --replace "SHELL=/bin/bash" "SHELL=$SHELL" \
-       --replace "lrelease-qt4" "${qt4}/bin/lrelease" \
-       --replace "qmake-qt4" "${qt4}/bin/qmake" \
+       --replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \
+       --replace "qmake-qt4" "${qtbase.dev}/bin/qmake" \
        --replace "-o root -g root" ""
   '';
 
-  makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" ];
+  makeFlags = [ "PREFIX=$(out)" "ETCDIR=$(out)/etc" "build_client" "build_man" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9052b09c3727..49ed30dc8a44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18692,7 +18692,7 @@ with pkgs;
 
   x11vnc = callPackage ../tools/X11/x11vnc { };
 
-  x2goclient = callPackage ../applications/networking/remote/x2goclient { };
+  x2goclient = libsForQt5.callPackage ../applications/networking/remote/x2goclient { };
 
   x2vnc = callPackage ../tools/X11/x2vnc { };
 

From 65f58cfaf8fd9ec2b15bb0d08f8b7c6e39938336 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 20 May 2018 16:11:43 -0400
Subject: [PATCH 2190/3370] vim_configurable: unpin from old lua 5.1 (#40749)

This pin was added in 2014 during a lua upgrade, but it appears vim today builds
fine with lua 5.2, so we can have it just depend on the `lua` package.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49ed30dc8a44..2d7d8e93b340 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18345,9 +18345,9 @@ with pkgs;
   vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Cocoa Foundation CoreData;
     inherit (darwin) libobjc cf-private;
+    inherit lua;
 
     features = "huge"; # one of  tiny, small, normal, big or huge
-    lua = pkgs.lua5_1;
     gui = config.vim.gui or "auto";
 
     # optional features by flags

From b6539403d737eca2c6c956dd658fc18ac8169e6d Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 20 May 2018 22:16:01 +0200
Subject: [PATCH 2191/3370] lf: 3 -> 4

---
 pkgs/tools/misc/lf/default.nix | 4 ++--
 pkgs/tools/misc/lf/deps.nix    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index b78bb977dbcb..79f70da9e26c 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "lf-${version}";
-  version = "3";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
     rev = "r${version}";
-    sha256 = "1w4nly8g1p28ixq1vjg7qv07mb1vryys7cf6b7jdb523swra6a97";
+    sha256 = "0wvx5hhkj3l68xjcr0i5lk623zi3si79hhvwi6mw9s52i43irr31";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index 35becb002636..e22a31a8fe2f 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "7cbfaac9e282b3ea0cefeddc67b2c3ed3aaf97bc"; # master
-      sha256 = "0pb5p8q2x31aqs307lla75mm1a01mr2qyqxsfqix1pgwg16xbad8";
+      rev = "21a4d435a86280a2927985fd6296de56cbce453e"; # master
+      sha256 = "0afbb0nr9rqzlpg5n7dg070w5scdvckyzyy525mhndp8phhzwpg7";
     };
   }
   {

From 10b4de1a8db1897dcebf9c2bf36418f15e10b321 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 May 2018 13:35:09 -0700
Subject: [PATCH 2192/3370] xonsh: 0.6.3 -> 0.6.4 (#40821)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xonsh/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/xon.sh had a zero exit code or showed the expected version
- /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/.xonsh-wrapped passed the binary check.
- /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4/bin/xonsh passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 2 of 3 passed binary check by having the new version present in output.
- found 0.6.4 with grep in /nix/store/zdkhffpw9yfjkxi877mildima9kp7skm-xonsh-0.6.4
- directory tree listing: https://gist.github.com/f4e56948f12666dc9fa8965e32e1844e
- du listing: https://gist.github.com/de490af4f1967c7d07e86d7068da2c32
---
 pkgs/shells/xonsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 8f117b788e7d..93add8a69138 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "1893kkxvalx8ycjl27gixkh979kkp4ra00zb7m6a8cdllx6yhsgi";
+    sha256= "16nfvfa9cklm5qb2lrr12z7k4wjb6pbb0y0ma15riqcda56ygmj7";
   };
 
   LC_ALL = "en_US.UTF-8";

From 1a611d4f4e25b513387ec3d09f942035a52102cc Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 8 May 2018 11:35:28 +0200
Subject: [PATCH 2193/3370] kcgi: init -> 0.10.5

---
 pkgs/development/web/kcgi/default.nix | 33 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/web/kcgi/default.nix

diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix
new file mode 100644
index 000000000000..6d91007e4860
--- /dev/null
+++ b/pkgs/development/web/kcgi/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, pkgconfig, fetchFromGitHub, libbsd }:
+
+stdenv.mkDerivation rec {
+  pname = "kcgi";
+  version = "0.10.5";
+  underscoreVersion = stdenv.lib.replaceChars ["."] ["_"] version;
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "kristapsdz";
+    repo = pname;
+    rev = "VERSION_${underscoreVersion}";
+    sha256 = "0ksdjqibkj7h1a99i84i6y0949c0vwx789q0sslzdkkgqvjnw3xw";
+  };
+  patchPhase = ''substituteInPlace configure \
+    --replace /usr/local /
+  '';
+  
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ ] ++ stdenv.lib.optionals stdenv.isLinux [ libbsd ] ;
+
+  dontAddPrefix = true;
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://kristaps.bsd.lv/kcgi;
+    description = "Minimal CGI and FastCGI library for C/C++";
+    license = licenses.isc;
+    platforms = platforms.all;
+    maintainers = [ maintainers.leenaars ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 519403cb73f8..a32af50429f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8030,6 +8030,8 @@ with pkgs;
     gperf = gperf_3_0;
   };
 
+  kcgi = callPackage ../development/web/kcgi { };
+
   kcov = callPackage ../development/tools/analysis/kcov { };
 
   kube-aws = callPackage ../development/tools/kube-aws { };

From bc309f5c57ebfff399d0488aa19ef1b6ec1d7088 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Sun, 20 May 2018 23:27:34 +0200
Subject: [PATCH 2194/3370] webmetro: init => unstable-20180426 (#39673)

---
 pkgs/servers/webmetro/default.nix | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/servers/webmetro/default.nix

diff --git a/pkgs/servers/webmetro/default.nix b/pkgs/servers/webmetro/default.nix
new file mode 100644
index 000000000000..45369f5f5a06
--- /dev/null
+++ b/pkgs/servers/webmetro/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  pname = "webmetro";
+  name = "${pname}-${version}";
+  version = "unstable-20180426";
+
+  src = fetchFromGitHub {
+    owner = "Tangent128";
+    repo = pname;
+    rev = "4f6cc00fe647bd311d00a8a4cb53ab08f20a04f9";
+    sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651";
+  };
+
+  cargoSha256 = "0drf331qic1gf58j7izwp0q2l4w0dyrhr19rd2y5k43cw4m1nq59";
+
+  meta = with stdenv.lib; {
+    description = "Simple relay server for broadcasting a WebM stream";
+    longDescription = ''
+    Webmetro is a simple relay server for broadcasting a WebM stream
+    from one uploader to many downloaders, via HTTP.
+    The initialization segment is remembered, so that viewers can join
+    mid-stream.  Cluster timestamps are rewritten to be monotonic, so multiple
+    (compatibly-encoded) webm files can be chained together without
+    clients needing to reconnect.
+    '';
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40c67171503f..17613fbc67da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13073,6 +13073,8 @@ with pkgs;
 
   wallabag = callPackage ../servers/web-apps/wallabag { };
 
+  webmetro = callPackage ../servers/webmetro { };
+
   winstone = callPackage ../servers/http/winstone { };
 
   xinetd = callPackage ../servers/xinetd { };

From a14ffe567b4fed5d10d9e28c6bb864308ab44234 Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sat, 19 May 2018 16:47:04 -0400
Subject: [PATCH 2195/3370] add emmanuelrosa as maintainer

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6fd5c335ad1d..0c3175823b07 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1236,6 +1236,11 @@
     github = "ElvishJerricco";
     name = "Will Fancher";
   };
+  emmanuelrosa = {
+      email = "emmanuel_rosa@aol.com";
+      github = "emmanuelrosa";
+      name = "Emmanuel Rosa";
+  };
   endgame = {
     email = "jack@jackkelly.name";
     github = "endgame";

From 50cc81b83de52d60c983dcd577260c48c2351bf8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 20 May 2018 16:53:03 -0500
Subject: [PATCH 2196/3370] 1password: Fix darwin build

---
 pkgs/applications/misc/1password/default.nix | 49 +++++++++++++-------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index b0b6111b334a..4cf46fb408bb 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -3,32 +3,45 @@
 stdenv.mkDerivation rec {
   name = "1password-${version}";
   version = "0.4";
-  src = if stdenv.system == "i686-linux" then fetchzip {
-    url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
-    sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41";
-    stripRoot = false;
-  } else fetchzip {
-    url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
-    sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf";
-    stripRoot = false;
-  };
+  src =
+    if stdenv.system == "i686-linux" then
+      fetchzip {
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
+        sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41";
+        stripRoot = false;
+      }
+    else if stdenv.system == "x86_64-linux" then
+      fetchzip {
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
+        sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf";
+        stripRoot = false;
+      }
+    else if stdenv.system == "x86_64-darwin" then
+      fetchzip {
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4/op_darwin_amd64_v${version}.zip";
+        sha256 = "0yzr9m91k3lhl8am3dfzh4ql2zxsa66nw43h17ny61wraiz315cr";
+        stripRoot = false;
+      }
+    else throw "Architecture not supported";
 
   nativeBuildInputs = [ makeWrapper ];
   installPhase = ''
-    mkdir -p $out/bin
-    install -D op $out/share/1password/op
-
-    # https://github.com/NixOS/patchelf/issues/66#issuecomment-267743051
-    makeWrapper $(cat $NIX_CC/nix-support/dynamic-linker) $out/bin/op \
-      --argv0 op \
-      --add-flags $out/share/1password/op
+    install -D op $out/bin/op
+  '';
+  postFixup = stdenv.lib.optionalString stdenv.isLinux ''
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      $out/bin/op
   '';
 
   meta = with stdenv.lib; {
     description = "1Password command-line tool";
-    homepage    = "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/";
+    homepage    = [
+      "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/"
+      "https://app-updates.agilebits.com/product_history/CLI"
+    ];
     maintainers = with maintainers; [ joelburget ];
     license     = licenses.unfree;
-    platforms   = [ "i686-linux" "x86_64-linux" ];
+    platforms   = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
   };
 }

From 6abc2bf40631655526ca71ec40d430cae27a47bb Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 20 May 2018 17:00:18 -0500
Subject: [PATCH 2197/3370] 1password: 0.4 -> 0.4.1

---
 pkgs/applications/misc/1password/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix
index 4cf46fb408bb..60391eee6927 100644
--- a/pkgs/applications/misc/1password/default.nix
+++ b/pkgs/applications/misc/1password/default.nix
@@ -2,24 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "1password-${version}";
-  version = "0.4";
+  version = "0.4.1";
   src =
     if stdenv.system == "i686-linux" then
       fetchzip {
-        url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip";
-        sha256 = "0mhlqvd3az50gnfil0xlq10855v3bg7yb05j6ndg4h2c551jrq41";
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_386_v${version}.zip";
+        sha256 = "0mv2m6rm6bdpca8vhyx213bg4kh06jl2sx8q7mnrp22c3f0yzh7f";
         stripRoot = false;
       }
     else if stdenv.system == "x86_64-linux" then
       fetchzip {
-        url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip";
-        sha256 = "15cv8xi4slid9jicdmc5xx2r9ag63wcx1mn7hcgzxbxbhyrvwhyf";
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_linux_amd64_v${version}.zip";
+        sha256 = "016h5jcy6jic8j3mvlnpcig9jxs22vj71gh6rrap2q950bzi6fi1";
         stripRoot = false;
       }
     else if stdenv.system == "x86_64-darwin" then
       fetchzip {
-        url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4/op_darwin_amd64_v${version}.zip";
-        sha256 = "0yzr9m91k3lhl8am3dfzh4ql2zxsa66nw43h17ny61wraiz315cr";
+        url = "https://cache.agilebits.com/dist/1P/op/pkg/v0.4.1/op_darwin_amd64_v${version}.zip";
+        sha256 = "1l0bi0f6gd4q19wn3v409gj64wp51mr0xpb09da1fl33rl5fpszb";
         stripRoot = false;
       }
     else throw "Architecture not supported";

From 3dadae4cd241961eb457543be1c01878a0dc75ae Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sat, 19 May 2018 16:48:05 -0400
Subject: [PATCH 2198/3370] purple-lurch: init at 0.6.7

Adds XEP-0384: OMEMO Encryption for libpurple
---
 .../pidgin-plugins/purple-lurch/default.nix   | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
new file mode 100644
index 000000000000..bcfcbee85568
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, cmake, pidgin, minixml, libxml2, sqlite, libgcrypt }:
+
+stdenv.mkDerivation rec {
+  name = "purple-lurch-${version}";
+  version = "0.6.7";
+
+  src = fetchFromGitHub {
+    owner = "gkdr";
+    repo = "lurch";
+    rev = "v${version}";
+    sha256 = "029jjqinsfhpv0zgji3sv1cyk54fn9qp176fwy97d1clf0vflxrz";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ pidgin minixml libxml2 sqlite libgcrypt ];
+
+  dontUseCmakeConfigure = true;
+
+  installPhase = ''
+    install -Dm755 -t $out/lib/purple-2 build/lurch.so
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/gkdr/lurch;
+    description = "XEP-0384: OMEMO Encryption for libpurple";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ emmanuelrosa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17613fbc67da..1ebedcec4fe8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1451,7 +1451,7 @@ with pkgs;
   mcrypt = callPackage ../tools/misc/mcrypt { };
 
   mongodb-compass = callPackage ../tools/misc/mongodb-compass { };
-  
+
   mongodb-tools = callPackage ../tools/misc/mongodb-tools { };
 
   mozlz4a = callPackage ../tools/compression/mozlz4a {
@@ -1467,7 +1467,7 @@ with pkgs;
   };
 
   antibody = callPackage ../shells/zsh/antibody { };
-  
+
   antigen = callPackage ../shells/zsh/antigen { };
 
   apparix = callPackage ../tools/misc/apparix { };
@@ -17446,6 +17446,8 @@ with pkgs;
 
   purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { };
 
+  purple-lurch = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-lurch { };
+
   purple-matrix = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-matrix { };
 
   purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { };

From 1ba24058af6b7911f9b824798c62c434ff863c4a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 May 2018 15:48:26 -0700
Subject: [PATCH 2199/3370] praat: 6.0.38 -> 6.0.40 (#40836)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/praat/versions.

These checks were done:

- built on NixOS
- /nix/store/51k239kq3pb732lar9y4j996p8inmmzq-praat-6.0.40/bin/praat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 6.0.40 with grep in /nix/store/51k239kq3pb732lar9y4j996p8inmmzq-praat-6.0.40
- directory tree listing: https://gist.github.com/48461f433362d4c7c4143942011a22d6
- du listing: https://gist.github.com/621b0b6d55906c1ba560361af3d25bcb
---
 pkgs/applications/audio/praat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix
index ada12eefaf7e..8d49c49f0c6c 100644
--- a/pkgs/applications/audio/praat/default.nix
+++ b/pkgs/applications/audio/praat/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "praat-${version}";
-  version = "6.0.38";
+  version = "6.0.40";
 
   src = fetchurl {
     url = "https://github.com/praat/praat/archive/v${version}.tar.gz";
-    sha256 = "1l01mdhd0kf6mnyrg8maydr56cpw4312gryk303kr0a4w0gwzhhc";
+    sha256 = "168qrrr59qxii265vba7pj6f61lzq5lk9c43zcda0wmmjp87bq1x";
   };
 
   configurePhase = ''

From 641fa3d1c2539b1ac27688ed4d619ae6d1799d02 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 20 May 2018 23:14:29 +0200
Subject: [PATCH 2200/3370] =?UTF-8?q?babl:=200.1.48=20=E2=86=92=200.1.50?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index ac9056d1e033..f3e7fc7f1621 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.48";
+  name = "babl-0.1.50";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "0596flzqzdlq4y6lsg34szh1ffgyccghp8y1k9h4d3jwymfd16xy";
+    sha256 = "0bavr2y4v88pip7vlca4kwmnksk2qxcvkkdp9jyfi6pzh701sb5m";
   };
 
   doCheck = true;

From d6a68d4b2da826b90e925813828ff4729ee7c5ea Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Mon, 21 May 2018 00:16:19 +0200
Subject: [PATCH 2201/3370] =?UTF-8?q?gimp:=202.10.0=20=E2=86=92=202.10.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/graphics/gimp/default.nix | 32 ++++-----------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 80bc2d49efce..f92594f08e16 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
 , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, poppler_data, libtiff
 , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info
 , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
@@ -9,37 +9,13 @@ let
   inherit (python2Packages) pygtk wrapPython python;
 in stdenv.mkDerivation rec {
   name = "gimp-${version}";
-  version = "2.10.0";
+  version = "2.10.2";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v${stdenv.lib.versions.majorMinor version}/${name}.tar.bz2";
-    sha256 = "1qkxaigbfkx26xym5nzrgfrmn97cbnhn63v1saaha2nbi3xrdk3z";
+    sha256 = "1srkqd9cx1xmny7cyk3b6f14dknb3fd77whm38vlvr7grnpbmc0w";
   };
 
-  patches = [
-    # fix rpath of python library https://bugzilla.gnome.org/show_bug.cgi?id=795620
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371482;
-      sha256 = "18bysndh61pvlv255xapdrfpsl5ivm51wp1w7xgk9vky9z2y3llc";
-    })
-
-    # fix absolute paths stored in configuration
-    (fetchpatch {
-      url = https://git.gnome.org/browse/gimp/patch/?id=0fce8fdb3c056acead8322c976a96fb6fba793b6;
-      sha256 = "09845i3bdpdbf13razr04ksvwydxcvzhjwlb4dfgdv5q203g2ris";
-    })
-    (fetchpatch {
-      url = https://git.gnome.org/browse/gimp/patch/?id=f6b586237cb8c912c1503f8e6086edd17f07d4df;
-      sha256 = "0s68885ip2wgjvsl5vqi2f1xhxdjpzqprifzgdl1vnv6gqmfy3bh";
-    })
-
-    # fix pc file (needed e.g. for building plug-ins)
-    (fetchpatch {
-      url = https://git.gnome.org/browse/gimp/patch/?id=7e19906827d301eb70275dba089849a632a0eabe;
-      sha256 = "0cbjfbwvzg2hqihg3rpsga405v7z2qahj22dfqn2jrb2gbhrjcp1";
-    })
-  ];
-
   nativeBuildInputs = [ autoreconfHook pkgconfig intltool gettext wrapPython ];
   propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
   buildInputs = [
@@ -80,6 +56,8 @@ in stdenv.mkDerivation rec {
 
   configureFlags = [
     "--without-webkit" # old version is required
+    "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new"
+    "--with-icc-directory=/var/run/current-system/sw/share/color/icc"
   ];
 
   doCheck = true;

From f5ca57b6d909b8224acdacfcc587537e169e6683 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 20 May 2018 17:55:21 -0500
Subject: [PATCH 2202/3370] powerline-rs: Fix darwin build (#40840)

---
 pkgs/tools/misc/powerline-rs/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index e48816db935a..138145683cb8 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, cmake, openssl_1_1_0, libssh2, libgit2, libzip }:
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, file, perl, curl, cmake, openssl_1_1_0, libssh2, libgit2, libzip, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "powerline-rs";
   name = "${pname}-${version}";
@@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";
 
-  nativeBuildInputs = [ pkgconfig file perl cmake ];
-  buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ];
+  nativeBuildInputs = [ pkgconfig file perl cmake curl ];
+  buildInputs = [ openssl_1_1_0 libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
 
   postInstall = ''
     install -Dm 755 "${pname}.bash" "$out/etc/bash_completion.d/${pname}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ebedcec4fe8..d2b566ab5f62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14632,7 +14632,9 @@ with pkgs;
 
   powerline-go = callPackage ../tools/misc/powerline-go { };
 
-  powerline-rs = callPackage ../tools/misc/powerline-rs { };
+  powerline-rs = callPackage ../tools/misc/powerline-rs {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   profont = callPackage ../data/fonts/profont { };
 

From de18e296da59b9b3e0ba3df1f2999a729b6d4bcb Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Sun, 20 May 2018 20:05:24 -0400
Subject: [PATCH 2203/3370] purple-facebook: 0.9.3 -> 0.9.5

---
 .../pidgin-plugins/purple-facebook/default.nix         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
index 37b490304c4f..8eb086a98070 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix
@@ -5,18 +5,18 @@ let
   pidginHg = fetchhg {
     url = "https://bitbucket.org/pidgin/main";
     # take from VERSION file
-    rev = "c9b74a765767";
-    sha256 = "07bjz87jpslsb4gdqvcwp79mkahls2mfhlmpaa5w6n4xqhahw4j3";
+    rev = "9ff9acf9fa14";
+    sha256 = "06imlhsps4wrjgjb92zpaxprxfxl2pjb2x9pl859c8cryssrz2jv";
   };
 
 in stdenv.mkDerivation rec {
-  name = "purple-facebook-0.9.3";
+  name = "purple-facebook-0.9.5";
 
   src = fetchFromGitHub {
     owner = "dequis";
     repo = "purple-facebook";
-    rev = "v0.9.3-c9b74a765767";
-    sha256 = "10ncvg0arcxnd3cpb0nxry1plbws0mw9vhzjrhb40sv2i563dywb";
+    rev = "v0.9.5-9ff9acf9fa14";
+    sha256 = "0a1860bkzrmyxahm9rlxi80z335w491wzdaqaw6j9ccavbymhwhs";
   };
 
   postPatch = ''

From 2287c5f6a55c3c4edf1d244c7dbf7b331aa94783 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 20 May 2018 22:43:35 +0000
Subject: [PATCH 2204/3370] dpdk: extract from linuxPackages.dpdk

DPDK kernel modules are optional and its libraries do not reference them.

This allows to move the packages that depend on DPDK out of linuxPackages,
since they do not depend on kernel version.
---
 pkgs/os-specific/linux/dpdk/default.nix | 50 ++++++++++++++++---------
 pkgs/top-level/all-packages.nix         |  4 ++
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index fd45e83c26b5..808feaff02cf 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -1,7 +1,13 @@
-{ stdenv, kernel, fetchurl, pkgconfig, numactl }:
+{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl }:
 
-stdenv.mkDerivation rec {
-  name = "dpdk-${version}-${kernel.version}";
+let
+
+  kver = kernel.modDirVersion or null;
+
+  mod = kernel != null;
+
+in stdenv.mkDerivation rec {
+  name = "dpdk-${version}" + lib.optionalString mod "-${kernel.version}";
   version = "17.11.2";
 
   src = fetchurl {
@@ -9,35 +15,45 @@ stdenv.mkDerivation rec {
     sha256 = "19m5l3jkrns8r1zbjb6ry18w50ff36kbl5b5g6pfcp9p57sfisd2";
   };
 
-  nativeBuildInputs = [ pkgconfig ] ++ kernel.moduleBuildDependencies;
-  buildInputs = [ numactl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ numactl ] ++ lib.optional mod kernel.moduleBuildDependencies;
 
-  RTE_KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build";
+  RTE_KERNELDIR = if mod then "${kernel.dev}/lib/modules/${kver}/build" else "/var/empty";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   # we need sse3 instructions to build
   NIX_CFLAGS_COMPILE = [ "-msse3" ];
-
-  enableParallelBuilding = true;
-  outputs = [ "out" "kmod" ];
-
   hardeningDisable = [ "pic" ];
 
+  postPatch = lib.optionalString (!mod) ''
+    # Do not build kernel modules.
+    cat >>config/defconfig_$RTE_TARGET <<EOF
+CONFIG_RTE_EAL_IGB_UIO=n
+CONFIG_RTE_KNI_KMOD=n
+EOF
+  '';
+
   configurePhase = ''
     make T=${RTE_TARGET} config
   '';
 
-  installPhase = ''
-    make install-runtime DESTDIR=$out prefix= includedir=/include datadir=/
-    make install-sdk DESTDIR=$out prefix= includedir=/include datadir=/
-    make install-kmod DESTDIR=$kmod
-  '';
+  installTargets = [ "install-runtime" "install-sdk" "install-kmod" ]; # skip install-doc
 
-  meta = with stdenv.lib; {
+  installFlags = [
+    "prefix=$(out)" "datadir=$(out)" "includedir=$(out)/include"
+  ] ++ lib.optionals mod [
+    "kerneldir=$(kmod)/lib/modules/${kver}"
+  ];
+
+  outputs = [ "out" ] ++ lib.optional mod "kmod";
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
     description = "Set of libraries and drivers for fast packet processing";
     homepage = http://dpdk.org/;
     license = with licenses; [ lgpl21 gpl2 bsd2 ];
     platforms =  [ "x86_64-linux" ];
-    maintainers = [ maintainers.domenkozar ];
+    maintainers = with maintainers; [ domenkozar orivej ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2b566ab5f62..1fe6e71d83df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13814,6 +13814,10 @@ with pkgs;
 
   buildLinux = attrs: callPackage ../os-specific/linux/kernel/generic.nix attrs;
 
+  dpdk = callPackage ../os-specific/linux/dpdk {
+    kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod
+  };
+
   keyutils = callPackage ../os-specific/linux/keyutils { };
 
   libselinux = callPackage ../os-specific/linux/libselinux { };

From 345f4639d66a0c7f4163bf4f5123d00889a5e3eb Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 00:50:08 +0000
Subject: [PATCH 2205/3370] odp-dpdk, ofp, pktgen: move from linuxPackages

These packages do not depend on the kernel.

ofp is not aliased because it is marked as broken.
---
 pkgs/top-level/all-packages.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fe6e71d83df..5e5e294064c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13585,6 +13585,9 @@ with pkgs;
     inherit kernel;
     inherit (kernel) stdenv; # in particular, use the same compiler by default
 
+    # Obsolete aliases (these packages do not depend on the kernel).
+    inherit (pkgs) odp-dpdk pktgen; # added 2018-05
+
     acpi_call = callPackage ../os-specific/linux/acpi-call {};
 
     amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { };
@@ -13611,14 +13614,8 @@ with pkgs;
 
     evdi = callPackage ../os-specific/linux/evdi { };
 
-    pktgen = callPackage ../os-specific/linux/pktgen { };
-
     hyperv-daemons = callPackage ../os-specific/linux/hyperv-daemons { };
 
-    odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
-
-    ofp = callPackage ../os-specific/linux/ofp { };
-
     e1000e = callPackage ../os-specific/linux/e1000e {};
 
     ixgbevf = callPackage ../os-specific/linux/ixgbevf {};
@@ -13966,8 +13963,12 @@ with pkgs;
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
 
+  odp-dpdk = callPackage ../os-specific/linux/odp-dpdk { };
+
   odroid-xu3-bootloader = callPackage ../tools/misc/odroid-xu3-bootloader { };
 
+  ofp = callPackage ../os-specific/linux/ofp { };
+
   openpam = callPackage ../development/libraries/openpam { };
 
   openbsm = callPackage ../development/libraries/openbsm { };
@@ -14013,6 +14014,8 @@ with pkgs;
 
   pipework = callPackage ../os-specific/linux/pipework { };
 
+  pktgen = callPackage ../os-specific/linux/pktgen { };
+
   plymouth = callPackage ../os-specific/linux/plymouth { };
 
   pmount = callPackage ../os-specific/linux/pmount { };

From ed465dc7de883d7e6fcaa26b426b2db5f1e43f3d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 01:04:31 +0000
Subject: [PATCH 2206/3370] dpdk: install files in the standard layout

---
 pkgs/os-specific/linux/dpdk/default.nix     | 2 +-
 pkgs/os-specific/linux/odp-dpdk/default.nix | 2 +-
 pkgs/os-specific/linux/pktgen/default.nix   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 808feaff02cf..78b11c7b18f1 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -40,7 +40,7 @@ EOF
   installTargets = [ "install-runtime" "install-sdk" "install-kmod" ]; # skip install-doc
 
   installFlags = [
-    "prefix=$(out)" "datadir=$(out)" "includedir=$(out)/include"
+    "prefix=$(out)"
   ] ++ lib.optionals mod [
     "kerneldir=$(kmod)/lib/modules/${kver}"
   ];
diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix
index cf4f9df26777..ff408b6a6248 100644
--- a/pkgs/os-specific/linux/odp-dpdk/default.nix
+++ b/pkgs/os-specific/linux/odp-dpdk/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ dpdk libconfig libpcap numactl openssl ];
 
-  RTE_SDK = dpdk;
+  RTE_SDK = "${dpdk}/share/dpdk";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
 
   dontDisableStatic = true;
diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix
index c443da7df3b4..a7bb4a81510d 100644
--- a/pkgs/os-specific/linux/pktgen/default.nix
+++ b/pkgs/os-specific/linux/pktgen/default.nix
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
     [ dpdk libpcap numactl ]
     ++ stdenv.lib.optionals withGtk [gtk2];
 
-  RTE_SDK = "${dpdk}";
+  RTE_SDK = "${dpdk}/share/dpdk";
   RTE_TARGET = "x86_64-native-linuxapp-gcc";
   GUI = stdenv.lib.optionalString withGtk "true";
 

From 66002a0e07ac9a05bd2ae518310797819bba29fd Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 01:59:30 +0000
Subject: [PATCH 2207/3370] spdk: init at 18.04

Closes #39138.
---
 pkgs/development/libraries/spdk/default.nix | 31 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/libraries/spdk/default.nix

diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
new file mode 100644
index 000000000000..b712d426304a
--- /dev/null
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python, cunit, dpdk, libaio, libuuid, numactl, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "spdk-${version}";
+  version = "18.04";
+
+  src = fetchFromGitHub {
+    owner = "spdk";
+    repo = "spdk";
+    rev = "v${version}";
+    sha256 = "07i13jkf63h5ld9djksxl445v1mj6m5cbq4xydix9y5qcxwlss3n";
+  };
+
+  nativeBuildInputs = [ python ];
+
+  buildInputs = [ cunit dpdk libaio libuuid numactl openssl ];
+
+  configureFlags = [ "--with-dpdk=${dpdk}" ];
+
+  NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile.
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Set of libraries for fast user-mode storage";
+    homepage = http://www.spdk.io;
+    license = licenses.bsd3;
+    platforms =  [ "x86_64-linux" ];
+    maintainers = with maintainers; [ orivej ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e5e294064c1..3acb4e4f7294 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11632,6 +11632,8 @@ with pkgs;
 
   spatialite_tools = callPackage ../development/libraries/spatialite-tools { };
 
+  spdk = callPackage ../development/libraries/spdk { };
+
   speechd = callPackage ../development/libraries/speechd { };
 
   speech-tools = callPackage ../development/libraries/speech-tools {};

From f1a202396195009461bb59552bc90a03055c3ff0 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 02:32:18 +0000
Subject: [PATCH 2208/3370] dpdk: support static/shared build mode switch

The default is false because upstream default is false (for performance).
---
 pkgs/os-specific/linux/dpdk/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix
index 78b11c7b18f1..b4c4af8c2e21 100644
--- a/pkgs/os-specific/linux/dpdk/default.nix
+++ b/pkgs/os-specific/linux/dpdk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl }:
+{ stdenv, lib, kernel, fetchurl, pkgconfig, numactl, shared ? false }:
 
 let
 
@@ -25,9 +25,14 @@ in stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-msse3" ];
   hardeningDisable = [ "pic" ];
 
-  postPatch = lib.optionalString (!mod) ''
-    # Do not build kernel modules.
+  postPatch = ''
     cat >>config/defconfig_$RTE_TARGET <<EOF
+# Build static or shared libraries.
+CONFIG_RTE_BUILD_SHARED_LIB=${if shared then "y" else "n"}
+EOF
+  '' + lib.optionalString (!mod) ''
+    cat >>config/defconfig_$RTE_TARGET <<EOF
+# Do not build kernel modules.
 CONFIG_RTE_EAL_IGB_UIO=n
 CONFIG_RTE_KNI_KMOD=n
 EOF

From b61f83eda64d9941656177e4bfdd2cbe215ad19b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 May 2018 22:44:54 -0400
Subject: [PATCH 2209/3370] linux: 4.9.100 -> 4.9.101

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 3a7dc9353f8b..15a8d63651d5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.100";
+  version = "4.9.101";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0z572csacfwn3kl3yaz4wpd7wkzabm42p2z4ysx5rq0kf4x6zfy5";
+    sha256 = "005awyjylyp7di8cy269923j7wsvv74s42k7955fq0790wmx15dg";
   };
 } // (args.argsOverride or {}))

From a91a0ce16c39bcdf9eb0a73fc4413c12fabcff7a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 May 2018 22:45:08 -0400
Subject: [PATCH 2210/3370] linux: 4.14.41 -> 4.14.42

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index f44adb6bc946..16d597e1640d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.41";
+  version = "4.14.42";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0vffv1iqcvrzvhs534czdjhj7702gr01pyn9idr8dj85kdx19wfc";
+    sha256 = "00wh8ydawy6j18as28albzid88cm2aanzr8vz367jjp2k5pi00rb";
   };
 } // (args.argsOverride or {}))

From 950e17fdd94cb7c4e2a064adac00da8aeb085844 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 May 2018 22:45:20 -0400
Subject: [PATCH 2211/3370] linux: 4.16.9 -> 4.16.10

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index c1df425280e0..7039c460c5c4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.9";
+  version = "4.16.10";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "12lvdnfz06r7pj5f15x39c4glhbp3sv7bdbwj4yimbp6iqwvndv0";
+    sha256 = "1gnf16p4rmibcn3wn5zp4pl2zmhgk4dg6718gvdr8vcffd87ksc0";
   };
 } // (args.argsOverride or {}))

From 3995b586a5c1b9122212bdc3837f6da54a8b5667 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 20 May 2018 22:45:32 -0400
Subject: [PATCH 2212/3370] linux: 4.17-rc5 -> 4.17-rc6

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 691c0d7a0a97..e61e9a354dec 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc5";
-  modDirVersion = "4.17.0-rc5";
+  version = "4.17-rc6";
+  modDirVersion = "4.17.0-rc6";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "1khx3s8nb604h23hasamshcvcwll0j4vi5v6v274ls01ja9mg1xk";
+    sha256 = "16x8bwhaj35fqhl773qxwabs1rhl3ayapizjsqyzn92pggsgy6p8";
   };
 
   # Should the testing kernels ever be built on Hydra?

From 691e8e64c449925b59c577379f879943495ff287 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 19:52:28 -0700
Subject: [PATCH 2213/3370] csound: 6.10.0 -> 6.11.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/csound/versions.

These checks were done:

- built on NixOS
- /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csound passed the binary check.
- /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csbeats passed the binary check.
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csdebugger had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/atsa had a zero exit code or showed the expected version
- /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csanalyze passed the binary check.
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/cvanal had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/dnoise had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/envext had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/extractor had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/het_export had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/het_import had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/hetro had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpanal had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpc_export had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/lpc_import had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/mixer had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pvanal had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pvlook had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pv_export had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/pv_import had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scale had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/sndinfo had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/srconv had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/src_conv had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/sdif2ad had a zero exit code or showed the expected version
- /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scsort passed the binary check.
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/extract had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/cs had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/csb64enc had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/makecsd had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0/bin/scot had a zero exit code or showed the expected version
- 4 of 31 passed binary check by having a zero exit code.
- 0 of 31 passed binary check by having the new version present in output.
- found 6.11.0 with grep in /nix/store/a8lvlqn930nsjmak9km1nj3xa51iclfy-csound-6.11.0
- directory tree listing: https://gist.github.com/a9a7303309eb2e6e6ce70fc3f368e8af
- du listing: https://gist.github.com/c8d61a997a4e56d47eab852cdae66f01
---
 pkgs/applications/audio/csound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 191074eba27a..c8ac0a938efa 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   name = "csound-${version}";
-  version = "6.10.0";
+  version = "6.11.0";
 
   enableParallelBuilding = true;
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "csound";
     repo = "csound";
     rev = version;
-    sha256 = "1mak183y8bn097z9q3k7f1kwvawkngkc4ch9hv6gqhgfy1cjln8n";
+    sha256 = "1nnfl8dqvc5b3f94zbvdg6bxr2wlp7as78hb31awxmvfwwihpv18";
   };
 
   cmakeFlags = [ "-DBUILD_CSOUND_AC=0" ] # fails to find Score.hpp

From 4558ba5b794ca2c6897c1a845e3de208f2f9e8fb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 19:56:07 -0700
Subject: [PATCH 2214/3370] feh: 2.26.1 -> 2.26.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/feh/versions.

These checks were done:

- built on NixOS
- /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3/bin/feh passed the binary check.
- /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3/bin/.feh-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.26.3 with grep in /nix/store/s9li7cqcph7bvkplpnq8b32gqvn7hm41-feh-2.26.3
- directory tree listing: https://gist.github.com/8a7c95c1c856e51ed0f4fab74284bffe
- du listing: https://gist.github.com/6e5a4734d20a27553f39cb1b99cb0ac9
---
 pkgs/applications/graphics/feh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 96d4a397c909..eb7daf2797bf 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "feh-${version}";
-  version = "2.26.1";
+  version = "2.26.3";
 
   src = fetchurl {
     url = "https://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "155clzkrzs7fh5nx924851di30hilcg16g192ldqqc12p5z5gikd";
+    sha256 = "08aagymgajcvciagwy2zdxhicvdfnjmd2xyx9bqjy7l1n16ydwrz";
   };
 
   outputs = [ "out" "man" "doc" ];

From 03c61b71f9f578db76b667a699732dfc46b6b229 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 21 May 2018 03:39:54 +0000
Subject: [PATCH 2215/3370] spdk: fix sandboxed build

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

diff --git a/pkgs/development/libraries/spdk/default.nix b/pkgs/development/libraries/spdk/default.nix
index b712d426304a..14672c78d21c 100644
--- a/pkgs/development/libraries/spdk/default.nix
+++ b/pkgs/development/libraries/spdk/default.nix
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cunit dpdk libaio libuuid numactl openssl ];
 
+  postPatch = ''
+    patchShebangs .
+  '';
+
   configureFlags = [ "--with-dpdk=${dpdk}" ];
 
   NIX_CFLAGS_COMPILE = [ "-mssse3" ]; # Necessary to compile.

From d2329184a9204a61d9505e27790bf65b5eb773a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 20:57:32 -0700
Subject: [PATCH 2216/3370] bind: 9.12.1 -> 9.12.1-P2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bind/versions.

These checks were done:

- built on NixOS
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/delv passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/arpaname had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-rrchecker passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/mdig passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/ddns-confgen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-cds passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-dsfromkey passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-importkey passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-keyfromlabel passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-keygen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-revoke passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-settime passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-signzone passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/dnssec-verify passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/genrandom had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-checkconf passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-checkzone passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-compilezone passed the binary check.
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/named-journalprint had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/nsec3hash had a zero exit code or showed the expected version
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/rndc passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/rndc-confgen passed the binary check.
- /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2/bin/tsig-keygen passed the binary check.
- 20 of 24 passed binary check by having a zero exit code.
- 14 of 24 passed binary check by having the new version present in output.
- found 9.12.1-P2 with grep in /nix/store/zxylanld5x7l9n2n24g70qj91n4kmj5x-bind-9.12.1-P2
- directory tree listing: https://gist.github.com/d95b236ef147c4c8ad6a99ca42db1acd
- du listing: https://gist.github.com/f6bcea6b6bdce7df3f66bbf02768bd20
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 4002c6b3542f..d266f534d669 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -6,14 +6,14 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.12.1"; in
+let version = "9.12.1-P2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "043mjcw405qa0ghm5dkhfsq35gsy279724fz3mjqpr1mbi14dr0n";
+    sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From 5aa53cc9df9c5c169ba78db4cd93e7c1a84262fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 21:17:25 -0700
Subject: [PATCH 2217/3370] maven: 3.5.2 -> 3.5.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/apache-maven/versions.

These checks were done:

- built on NixOS
- /nix/store/zvhkfnxmklx0bas9zmykbmzqphvi6c9p-apache-maven-3.5.3/bin/mvn passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.5.3 with grep in /nix/store/zvhkfnxmklx0bas9zmykbmzqphvi6c9p-apache-maven-3.5.3
- directory tree listing: https://gist.github.com/9a7bcffed5e910bc831d8fa971bbcec6
- du listing: https://gist.github.com/1285616d86145877047eff13f5c9dc6d
---
 .../development/tools/build-managers/apache-maven/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix
index 79648c16f5e7..19ca5b9c0788 100644
--- a/pkgs/development/tools/build-managers/apache-maven/default.nix
+++ b/pkgs/development/tools/build-managers/apache-maven/default.nix
@@ -2,7 +2,7 @@
 
 assert jdk != null;
 
-let version = "3.5.2"; in
+let version = "3.5.3"; in
 stdenv.mkDerivation rec {
   name = "apache-maven-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz";
-    sha256 = "1zza5kjf69hnx41gy3yhvsk1kz259nig5njcmzjbsr8a75p1yyvh";
+    sha256 = "0244mpziz4rw35x2cahsqlxpnygvi6qpll16g4kx87db7wvmcadm";
   };
 
   buildInputs = [ makeWrapper ];

From 80bfd2f371d64d0d81c0820166f98f49a5501988 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 21 May 2018 15:44:50 +0800
Subject: [PATCH 2218/3370] musescore: 2.1.0 -> 2.2.1

Fixes #29519
---
 pkgs/applications/audio/musescore/default.nix | 46 +++++--------------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 13 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index f56ca009f1e0..7ed9021e3e09 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,59 +1,37 @@
-{ stdenv, fetchzip, cmake, pkgconfig
+{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig
 , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
-, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools
+, portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
 , qtwebkit, qtxmlpatterns
 }:
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.1.0";
+  version = "2.2.1";
 
-  src = fetchzip {
-    url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
-    sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls";
+  src = fetchFromGitHub {
+    owner  = "musescore";
+    repo   = "MuseScore";
+    rev    = "v${version}";
+    sha256 = "00lwcsnpyiq9l9x11nm24mzf67xmhzjhwi4c3iqry6ayi9c4p4qs";
   };
 
-  hardeningDisable = [ "relro" "bindnow" ];
-
-  makeFlags = [
-    "PREFIX=$(out)"
-  ];
-
   cmakeFlags = [
-    "-DAEOLUS=OFF"
-    "-DZERBERUS=ON"
-    "-DOSC=ON=ON"
-    "-DOMR=OFF" # TODO: add OMR support, CLEF_G not declared error
-    "-DOCR=OFF" # Not necessary without OMR
-    "-DSOUNDFONT3=ON"
-    "-DHAS_AUDIOFILE=ON"
-    "-DBUILD_JACK=ON"
-  ];
-
-  preBuild = ''
-    make lrelease
-  '';
-
-  postBuild = ''
-    make manpages
-  '';
+  ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  enableParallelBuilding = true;
-
   buildInputs = [
     alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
-    portaudio qtbase qtdeclarative qtscript qtsvg qttools
-    qtwebkit qtxmlpatterns #tesseract
+    portaudio portmidi # tesseract
+    qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns
   ];
 
   meta = with stdenv.lib; {
     description = "Music notation and composition software";
     homepage = https://musescore.org/;
     license = licenses.gpl2;
+    maintainers = with maintainers; [ vandenoever ];
     platforms = platforms.linux;
-    maintainers = [ maintainers.vandenoever ];
     repositories.git = https://github.com/musescore/MuseScore;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3acb4e4f7294..cdc4ed881e00 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17096,6 +17096,7 @@ with pkgs;
       else null;
   };
 
+  # TODO: we should probably merge these 2
   musescore =
     if stdenv.isDarwin then
       callPackage ../applications/audio/musescore/darwin.nix { }

From ad399afd6f3af6e21924919f136e776ae1b42d3a Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Thu, 8 Mar 2018 10:38:26 +0100
Subject: [PATCH 2219/3370] pythonPackages.pysdl2: init at 0.9.6

---
 .../python-modules/pysdl2/PySDL2-dll.patch    | 119 ++++++++++++++++++
 .../python-modules/pysdl2/default.nix         |  41 ++++++
 pkgs/top-level/python-packages.nix            |   2 +
 3 files changed, 162 insertions(+)
 create mode 100644 pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
 create mode 100644 pkgs/development/python-modules/pysdl2/default.nix

diff --git a/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
new file mode 100644
index 000000000000..ca723a0e5739
--- /dev/null
+++ b/pkgs/development/python-modules/pysdl2/PySDL2-dll.patch
@@ -0,0 +1,119 @@
+diff -ru PySDL2-0.9.6-old/sdl2/dll.py PySDL2-0.9.6/sdl2/dll.py
+--- PySDL2-0.9.6-old/sdl2/dll.py	2018-03-08 10:18:37.583471745 +0100
++++ PySDL2-0.9.6/sdl2/dll.py	2018-03-08 10:20:06.705517520 +0100
+@@ -45,29 +45,31 @@
+     """Function wrapper around the different DLL functions. Do not use or
+     instantiate this one directly from your user code.
+     """
+-    def __init__(self, libinfo, libnames, path=None):
+-        self._dll = None
+-        foundlibs = _findlib(libnames, path)
+-        dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
+-        if len(foundlibs) == 0:
+-            raise RuntimeError("could not find any library for %s (%s)" %
+-                               (libinfo, dllmsg))
+-        for libfile in foundlibs:
+-            try:
+-                self._dll = CDLL(libfile)
+-                self._libfile = libfile
+-                break
+-            except Exception as exc:
+-                # Could not load the DLL, move to the next, but inform the user
+-                # about something weird going on - this may become noisy, but
+-                # is better than confusing the users with the RuntimeError below
+-                warnings.warn(repr(exc), DLLWarning)
+-        if self._dll is None:
+-            raise RuntimeError("found %s, but it's not usable for the library %s" %
+-                               (foundlibs, libinfo))
+-        if path is not None and sys.platform in ("win32",) and \
+-            path in self._libfile:
+-            os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
++    def __init__(self, libfile):
++        self._dll = CDLL(libfile)
++        self._libfile = libfile
++        # self._dll = None
++        # foundlibs = _findlib(libnames, path)
++        # dllmsg = "PYSDL2_DLL_PATH: %s" % (os.getenv("PYSDL2_DLL_PATH") or "unset")
++        # if len(foundlibs) == 0:
++        #     raise RuntimeError("could not find any library for %s (%s)" %
++        #                        (libinfo, dllmsg))
++        # for libfile in foundlibs:
++        #     try:
++        #         self._dll = CDLL(libfile)
++        #         self._libfile = libfile
++        #         break
++        #     except Exception as exc:
++        #         # Could not load the DLL, move to the next, but inform the user
++        #         # about something weird going on - this may become noisy, but
++        #         # is better than confusing the users with the RuntimeError below
++        #         warnings.warn(repr(exc), DLLWarning)
++        # if self._dll is None:
++        #     raise RuntimeError("found %s, but it's not usable for the library %s" %
++        #                        (foundlibs, libinfo))
++        # if path is not None and sys.platform in ("win32",) and \
++        #     path in self._libfile:
++        #     os.environ["PATH"] = "%s;%s" % (path, os.environ["PATH"])
+ 
+     def bind_function(self, funcname, args=None, returns=None, optfunc=None):
+         """Binds the passed argument and return value types to the specified
+@@ -110,7 +112,7 @@
+     return
+ 
+ try:
+-    dll = DLL("SDL2", ["SDL2", "SDL2-2.0"], os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
+diff -ru PySDL2-0.9.6-old/sdl2/sdlgfx.py PySDL2-0.9.6/sdl2/sdlgfx.py
+--- PySDL2-0.9.6-old/sdl2/sdlgfx.py	2018-03-08 10:18:37.585471769 +0100
++++ PySDL2-0.9.6/sdl2/sdlgfx.py	2018-03-08 10:20:06.705517520 +0100
+@@ -34,8 +34,7 @@
+            ]
+ 
+ try:
+-    dll = DLL("SDL2_gfx", ["SDL2_gfx", "SDL2_gfx-1.0"],
+-              os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2_gfx")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
+diff -ru PySDL2-0.9.6-old/sdl2/sdlimage.py PySDL2-0.9.6/sdl2/sdlimage.py
+--- PySDL2-0.9.6-old/sdl2/sdlimage.py	2018-03-08 10:18:37.585471769 +0100
++++ PySDL2-0.9.6/sdl2/sdlimage.py	2018-03-08 10:20:06.705517520 +0100
+@@ -26,8 +26,7 @@
+            ]
+ 
+ try:
+-    dll = DLL("SDL2_image", ["SDL2_image", "SDL2_image-2.0"],
+-              os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2_image")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
+diff -ru PySDL2-0.9.6-old/sdl2/sdlmixer.py PySDL2-0.9.6/sdl2/sdlmixer.py
+--- PySDL2-0.9.6-old/sdl2/sdlmixer.py	2018-03-08 10:18:37.585471769 +0100
++++ PySDL2-0.9.6/sdl2/sdlmixer.py	2018-03-08 10:20:27.415758478 +0100
+@@ -50,8 +50,7 @@
+           ]
+ 
+ try:
+-    dll = DLL("SDL2_mixer", ["SDL2_mixer", "SDL2_mixer-2.0"],
+-              os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2_mixer")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
+diff -ru PySDL2-0.9.6-old/sdl2/sdlttf.py PySDL2-0.9.6/sdl2/sdlttf.py
+--- PySDL2-0.9.6-old/sdl2/sdlttf.py	2018-03-08 10:18:37.585471769 +0100
++++ PySDL2-0.9.6/sdl2/sdlttf.py	2018-03-08 10:20:06.705517520 +0100
+@@ -38,8 +38,7 @@
+           ]
+ 
+ try:
+-    dll = DLL("SDL2_ttf", ["SDL2_ttf", "SDL2_ttf-2.0"],
+-              os.getenv("PYSDL2_DLL_PATH"))
++    dll = DLL("SDL2_ttf")
+ except RuntimeError as exc:
+     raise ImportError(exc)
+ 
diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix
new file mode 100644
index 000000000000..6681b1b199ad
--- /dev/null
+++ b/pkgs/development/python-modules/pysdl2/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, SDL2, SDL2_ttf, SDL2_image, SDL2_gfx, SDL2_mixer, pyopengl }:
+
+buildPythonPackage rec {
+  pname = "PySDL2";
+  version = "0.9.6";
+  # The tests use OpenGL using find_library, which would have to be
+  # patched; also they seem to actually open X windows and test stuff
+  # like "screensaver disabling", which would have to be cleverly
+  # sandboxed. Disable for now.
+  doCheck = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "08r1v9wdq8pzds4g3sng2xgh1hlzfs2z7qgy5a6b0xrs96swlamm";
+  };
+
+  # Deliberately not in propagated build inputs; users can decide
+  # which library they want to include.
+  buildInputs = [ SDL2_ttf SDL2_image SDL2_gfx SDL2_mixer ];
+  propagatedBuildInputs = [ SDL2 ];
+  patches = [ ./PySDL2-dll.patch ];
+  postPatch = ''
+    substituteInPlace sdl2/dll.py --replace \
+      "DLL(\"SDL2\")" "DLL('${SDL2}/lib/libSDL2${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    substituteInPlace sdl2/sdlttf.py --replace \
+      "DLL(\"SDL2_ttf\")" "DLL('${SDL2_ttf}/lib/libSDL2_ttf${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    substituteInPlace sdl2/sdlimage.py --replace \
+      "DLL(\"SDL2_image\")" "DLL('${SDL2_image}/lib/libSDL2_image${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    substituteInPlace sdl2/sdlgfx.py --replace \
+     "DLL(\"SDL2_gfx\")" "DLL('${SDL2_gfx}/lib/libSDL2_gfx${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    substituteInPlace sdl2/sdlmixer.py --replace \
+     "DLL(\"SDL2_mixer\")" "DLL('${SDL2_mixer}/lib/libSDL2_mixer${stdenv.hostPlatform.extensions.sharedLibrary}')"
+  '';
+
+  meta = {
+    description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project";
+    homepage = https://github.com/marcusva/py-sdl2;
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [ pmiddend ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3be39ded656e..204a49e63b48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18194,6 +18194,8 @@ EOF
   pyowm = callPackage ../development/python-modules/pyowm { };
 
   prometheus_client = callPackage ../development/python-modules/prometheus_client { };
+
+  pysdl2 = callPackage ../development/python-modules/pysdl2 { };
 });
 
 in fix' (extends overrides packages)

From b34f0a11dc451efea8d4aa877803b46c7609be01 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 14:57:21 -0700
Subject: [PATCH 2220/3370] pari: 2.9.4 -> 2.9.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pari/versions.

These checks were done:

- built on NixOS
- /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gp passed the binary check.
- /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/tex2mail passed the binary check.
- /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gphelp passed the binary check.
- /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5/bin/gp-2.9 passed the binary check.
- 4 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 2.9.5 with grep in /nix/store/18hjz56shfnp00r1pgslfy3zci2wk6m9-pari-2.9.5
- directory tree listing: https://gist.github.com/63c5da24ace1d863b434a462fc0d0123
- du listing: https://gist.github.com/d275cd2f3b274f52576dbab1bf9ebc9c
---
 pkgs/applications/science/math/pari/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 8c24881f2152..07c6af0926d6 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -8,11 +8,11 @@ assert withThread -> libpthreadstubs != null;
 stdenv.mkDerivation rec {
 
   name = "pari-${version}";
-  version = "2.9.4";
+  version = "2.9.5";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "0ir6m3a8r46md5x6zk4xf159qra7aqparby9zk03k81hjrrxr72g";
+    sha256 = "05z6y5iwdzcdggbrkic9cy9vy9wmk5qxc21cb4lqnbqxnhjihibb";
   };
 
   buildInputs = [

From 249c043d8d42eaf122ef3a2df9ac2a931e2c22f4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 17 May 2018 06:02:39 -0700
Subject: [PATCH 2221/3370] krusader: 2.6.0 -> 2.7.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/krusader/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0/bin/krusader had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0/bin/.krusader-wrapped had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.7.0 with grep in /nix/store/qk46il6aq1pyr1fbjfykklcpihj61cng-krusader-2.7.0
- directory tree listing: https://gist.github.com/d2f674d471fc7a978cf2d1c9e4920a4e
- du listing: https://gist.github.com/00387b725fabb991524a07962b9bf2fb
---
 pkgs/applications/misc/krusader/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index bcf351ff46ae..6dc448c6bf48 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "krusader";
-  version = "2.6.0";
+  version = "2.7.0";
 in mkDerivation rec {
   name = "krusader-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
-    sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
+    sha256 = "09ws3samxnjk0qi9pcfm2rmw0nr5mzn9pzpljgrdb5qj7cmm4hcb";
   };
 
   meta = with lib; {

From a58e93bd78d4b0d12d71ecbea9e105a0bc70d444 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 13:07:07 -0700
Subject: [PATCH 2222/3370] simpleitk: 1.0.0 -> 1.1.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/simpleitk/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.1.0 with grep in /nix/store/926vcv62wgj9nyj4z4yw6hxi64yaqha8-simpleitk-1.1.0
- directory tree listing: https://gist.github.com/fc471fd5a722b3d1303143f4ca87457d
- du listing: https://gist.github.com/6f050e82917acd9dc266df3c2c3cb81b
---
 pkgs/development/libraries/simpleitk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index 4802683079d1..c807325b155c 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname    = "simpleitk";
-  version = "1.0.0";
+  version = "1.1.0";
   name  = "${pname}-${version}";
 
   src = fetchurl {
     url    = "https://sourceforge.net/projects/${pname}/files/SimpleITK/${version}/Source/SimpleITK-${version}.tar.gz";
-    sha256 = "0554j0zp314zhs8isfg31fi6gvsl7xq3xjyyxkx1b1mjkn5qx673";
+    sha256 = "01y8s73mw4yabqir2f8qp5zc1c0y6szi18rr4zwgsxz62g4drzgm";
   };
 
   nativeBuildInputs = [ cmake git swig ];

From 415f5ee000e173cf4b037418f24efa9540e8b741 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 14:21:03 -0700
Subject: [PATCH 2223/3370] powerstat: 0.02.15 -> 0.02.16

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/powerstat/versions.

These checks were done:

- built on NixOS
- /nix/store/r8r2fb581gxng6pkwyvbssyl3w21f2pg-powerstat-0.02.16/bin/powerstat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.02.16 with grep in /nix/store/r8r2fb581gxng6pkwyvbssyl3w21f2pg-powerstat-0.02.16
- directory tree listing: https://gist.github.com/07ed4981848777e18cca2c072d0fb30c
- du listing: https://gist.github.com/5766491662635d4a960a7cd3a4911db0
---
 pkgs/os-specific/linux/powerstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 88151fca2f54..2d4d8f8266f7 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "powerstat-${version}";
-  version = "0.02.15";
+  version = "0.02.16";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz";
-    sha256 = "0m8662qv77nzbwkdpydiz87kd75cjjajgp30j6mc5padyw65bxxx";
+    sha256 = "14sx37l40038sjygsnp95542fkbhhc911vd9k5rf85czmvndz29m";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From c57afb8ca2cee72174b63418781e4706189cec96 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 16:08:02 -0700
Subject: [PATCH 2224/3370] neofetch: 4.0.0 -> 4.0.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/neofetch/versions.

These checks were done:

- built on NixOS
- /nix/store/3ys3zndn1cz0s05p84hn6djrzbb9pmlg-neofetch-4.0.2/bin/neofetch passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.0.2 with grep in /nix/store/3ys3zndn1cz0s05p84hn6djrzbb9pmlg-neofetch-4.0.2
- directory tree listing: https://gist.github.com/33741fc29ddd44c6fb85d08f2f1a04d5
- du listing: https://gist.github.com/ebad77e50a02ef38e4df2b5db0a93c4f
---
 pkgs/tools/misc/neofetch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix
index cece77b8d3e6..af6c17433f11 100644
--- a/pkgs/tools/misc/neofetch/default.nix
+++ b/pkgs/tools/misc/neofetch/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "neofetch-${version}";
-  version = "4.0.0";
+  version = "4.0.2";
   src = fetchFromGitHub {
     owner = "dylanaraps";
     repo = "neofetch";
     rev = version;
-    sha256 = "1ijg6fmrqjgn87899q8cpbir93hqrq4070wzm62s9nmggdgzx6mn";
+    sha256 = "0c0x05ca8lp74928nix4pvd243l95lav35r21mpkbagf72z284d2";
   };
 
   dontBuild = true;

From fca8ce870c9fe8c8cac5e0dee6774ac3dc2ba24e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 15:26:12 -0700
Subject: [PATCH 2225/3370] osinfo-db: 20180502 -> 20180514

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/osinfo-db/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 20180514 with grep in /nix/store/4lgxl3vd6h691mx9hn2znln8idhv5bnn-osinfo-db-20180514
- directory tree listing: https://gist.github.com/557cda4c5d9742fc2f03e3eb6c73b7ee
- du listing: https://gist.github.com/17de36b5bae99c6d771de2b293c347b5
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 82122335f695..7f0fbd71021b 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180502";
+  name = "osinfo-db-20180514";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "05036mpc5hapx616lfzc67xj157hw3mgyk0arv3brjcx0qmzaram";
+    sha256 = "1pyz89gwn3s9ha4chgfcfddi6dixm2dp4zsypfd38fwhqa9v0ij2";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From 932c1f7650241a2dd8330de420a9112b521e3de8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 16:29:58 -0700
Subject: [PATCH 2226/3370] metabase: 0.29.2 -> 0.29.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/metabase/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/b7bpmc5h45cq2afcmrrsw2w60im3420w-metabase-0.29.3/bin/metabase had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/986f43a4bd9effc51da98989246f0267
- du listing: https://gist.github.com/cec3ac2b5a9a0226fbb8653fbe98ce5e
---
 pkgs/servers/metabase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix
index f329b1088499..588f1dda50cc 100644
--- a/pkgs/servers/metabase/default.nix
+++ b/pkgs/servers/metabase/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metabase-${version}";
-  version = "0.29.2";
+  version = "0.29.3";
 
   src = fetchurl {
     url = "http://downloads.metabase.com/v${version}/metabase.jar";
-    sha256 = "02cba755mfim8q403gj02ggc0gg4ckcyalxkw09k0jqi5irdi4h1";
+    sha256 = "18yvjxlgdbg7h7ipj1wlic5m0gv5s2943c72shs44jvic6g42pzv";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 910ac0ff47a33052ffdca80ed1f0c96217245cfc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 18:18:15 -0700
Subject: [PATCH 2227/3370] krita: 4.0.2 -> 4.0.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/krita/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/603q26b9pswma12ypz68l39jqyrxbvvy-krita-4.0.3/bin/krita had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.0.3 with grep in /nix/store/603q26b9pswma12ypz68l39jqyrxbvvy-krita-4.0.3
- directory tree listing: https://gist.github.com/23ba1bbd1767e4a61fafcd9646d63898
- du listing: https://gist.github.com/4eed85b1634be0fb42b59cdc55799267
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index f86694ebc6cb..690253947a18 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "4.0.2";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "136nia6z8l9czk3ls2c9dpk617cvfilfhx0s838g5nrqxh4kn0cf";
+    sha256 = "0zmn29dzqncc80pvy9ymgyzqw8x1ryq8b4x5mr4sz15iyj7xgspr";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From 1fd9740efbabc5cb5f90296e47a641f440eab822 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 20:18:46 -0700
Subject: [PATCH 2228/3370] debootstrap: 1.0.98 -> 1.0.99

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/debootstrap/versions.

These checks were done:

- built on NixOS
- /nix/store/nnih8xgijkbs82f7xig7q615m9nm8vbd-debootstrap-1.0.99/bin/debootstrap passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.99 with grep in /nix/store/nnih8xgijkbs82f7xig7q615m9nm8vbd-debootstrap-1.0.99
- directory tree listing: https://gist.github.com/1c31f499b4a365254573c6c37df9e41c
- du listing: https://gist.github.com/bb42785bdce49536fc4aec7913c57bdf
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 0ed883bf342b..22bf8340156c 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.98";
+  version = "1.0.99";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "07wfvjhzc5schhpn1dkvhwbi115yn4f1q99g0g39m79bbyxm50d8";
+    sha256 = "1plw53zghiykddj77s5jk10ncx82cgrkk798p909yydhcghnvcsb";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

From b5204da735c9485e0eb747528bea2115209e0822 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 11:22:32 -0700
Subject: [PATCH 2229/3370] urlwatch: 2.9 -> 2.11

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/urlwatch/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11/bin/.urlwatch-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11/bin/urlwatch had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.11 with grep in /nix/store/gpf4j5mmd5zbz0rqj39d57d38f6311pn-urlwatch-2.11
- directory tree listing: https://gist.github.com/f36eb5277839d9ca3d15995cec7cc592
- du listing: https://gist.github.com/47f738cad88e3941c1c0f149f8aa4fc7
---
 pkgs/tools/networking/urlwatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 3e77117e55f0..3efc9e6be232 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urlwatch-${version}";
-  version = "2.9";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner  = "thp";
     repo   = "urlwatch";
     rev    = version;
-    sha256 = "0biy02vyhdwghy9qjmjwlfd8hzaz9gfsssd53ng6zpww4wkkiydz";
+    sha256 = "0vp85d62zhca7d841vg82mwlqb8yihshyc8q2cvwm3rpn5vwf0pi";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 7d0f84b9091d17425eaa6db2077330575e17b924 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 20:32:07 -0700
Subject: [PATCH 2230/3370] ddcutil: 0.8.6 -> 0.9.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ddcutil/versions.

These checks were done:

- built on NixOS
- /nix/store/xlxjnfwwcwkhzkpg2qwxz5j5gbh4csnk-ddcutil-0.9.0/bin/ddcutil passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.9.0 with grep in /nix/store/xlxjnfwwcwkhzkpg2qwxz5j5gbh4csnk-ddcutil-0.9.0
- directory tree listing: https://gist.github.com/39ac3ce627e1198f84287e5a42257663
- du listing: https://gist.github.com/b896a17a17dd52041097af423a55aea6
---
 pkgs/tools/misc/ddcutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index 052f52e2ebd4..e5af0c8d7263 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ddcutil-${version}";
-  version = "0.8.6";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "1c4cl9cac90xf9rap6ss2d4yshcmhdq8pdfjz3g4cns789fs1vcf";
+    sha256 = "1lcn3jbhpcm6ixp24vsfnk1v0qi0fjkkf57f4grs1wg148s3jpvc";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 48b9d00c6b62faefa001eec168cb0a4fbaa70815 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 21:08:16 -0700
Subject: [PATCH 2231/3370] adapta-gtk-theme: 3.93.1.14 -> 3.93.1.16

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/1f7d6359cc7a8a9633e6baffccd4c6e7
- du listing: https://gist.github.com/976b4a761384960b8a30216a39131cee
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index c8e7d860bcfc..d696a43b3bcc 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.1.14";
+  version = "3.93.1.16";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "11iviw9gj4jwp6v32a3y1n6hq8m9pf14drfqxhp3dnygylvxxdr2";
+    sha256 = "11jjzhqvx74iq12682ymsnms99izwl5hys1anb9l0fl6jy0dh2xx";
   };
 
   preferLocalBuild = true;

From 7f7b1daf944aed1619a48486599db3bb8e6dd1b9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 19:25:12 -0700
Subject: [PATCH 2232/3370] gqrx: 2.11.4 -> 2.11.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gqrx/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/cbn1yxw95q3ypja7bxzlm07z0zbfp9nc-gqrx-2.11.5/bin/gqrx had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.11.5 with grep in /nix/store/cbn1yxw95q3ypja7bxzlm07z0zbfp9nc-gqrx-2.11.5
- directory tree listing: https://gist.github.com/45186a693bdf1b1c7ae2be1c9457ddf8
- du listing: https://gist.github.com/fe434d6ba0c5f72ef74629f65efea48f
---
 pkgs/applications/misc/gqrx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix
index 5c449451e704..f7c7ca5472e0 100644
--- a/pkgs/applications/misc/gqrx/default.nix
+++ b/pkgs/applications/misc/gqrx/default.nix
@@ -8,13 +8,13 @@ assert pulseaudioSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
   name = "gqrx-${version}";
-  version = "2.11.4";
+  version = "2.11.5";
 
   src = fetchFromGitHub {
     owner = "csete";
     repo = "gqrx";
     rev = "v${version}";
-    sha256 = "0a5w9b3fi4f95j34cqsbzxks0d9hmrz4cznc8pi9b0pwvx13hqhm";
+    sha256 = "0q9i0dhd6blagxzk84pzqjq8n4ym3jc1mkkhygg8yncr4vq2saaf";
   };
 
   nativeBuildInputs = [ cmake ];

From 80fe329faf037b8dc7bb0d5a743e807a7f52ea0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 17:11:39 -0700
Subject: [PATCH 2233/3370] jackett: 0.8.953 -> 0.8.997

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jackett/versions.

These checks were done:

- built on NixOS
- /nix/store/1rbrbn9h8ll5srwpv073578fcb0y930j-jackett-0.8.997/bin/Jackett passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.8.997 with grep in /nix/store/1rbrbn9h8ll5srwpv073578fcb0y930j-jackett-0.8.997
- directory tree listing: https://gist.github.com/725e5ff70be355ede10316c73e49da01
- du listing: https://gist.github.com/46fe05a40289b5eb82e68af6ef0dd0d0
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index 2bbb46744405..ef4b82396937 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.953";
+  version = "0.8.997";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0jc7c0z315wh73b75fxz1ad2qy1z5nsvpr7iml4998k15sl7w7mi";
+    sha256 = "0a0viv3aw33kvj9z2fmqacvk2prv8dbdnk85b3xa4knp8cvsva6w";
   };
 
   buildInputs = [ makeWrapper ];

From 96ad842c473c385db9386a38ab95c18695781536 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 16:54:22 -0700
Subject: [PATCH 2234/3370] librealsense: 2.11.0 -> 2.11.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/librealsense/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2.11.1 with grep in /nix/store/qyy6s8nbpifg33h0hvnpf3fizwdycpvz-librealsense-2.11.1
- directory tree listing: https://gist.github.com/020e7e6cfc0e9cc89911d68349e47bc7
- du listing: https://gist.github.com/dfc212b0151822573970980eb31f8289
---
 pkgs/development/libraries/librealsense/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index c61000066f4d..796954b356d1 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "librealsense-${version}";
-  version = "2.11.0";
+  version = "2.11.1";
 
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = "librealsense";
     rev = "v${version}";
-    sha256 = "11vzs2m6jh9v1xbffr2k541pymmih6g4w641mp8rll8qzqfh89i0";
+    sha256 = "1r27pdisg4hl4x23lrmykqfdc5agrc4pi161mhvzd1vjfkjrxbid";
   };
 
   buildInputs = [

From 8870e3a510cd3b39e99bfa82972ff024417be747 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 18:25:49 -0700
Subject: [PATCH 2235/3370] irqbalance: 1.3.0 -> 1.4.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/irqbalance/versions.

These checks were done:

- built on NixOS
- /nix/store/fkv19sqbw1kxda43q1jqm1zlc8pakzx3-irqbalance-1.4.0/bin/irqbalance passed the binary check.
- Warning: no invocation of /nix/store/fkv19sqbw1kxda43q1jqm1zlc8pakzx3-irqbalance-1.4.0/bin/irqbalance-ui had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/786f267f8a2d5f1ed39214c1c32e4ffa
- du listing: https://gist.github.com/0fd6680f29f78791a2d23a08bc831456
---
 pkgs/os-specific/linux/irqbalance/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix
index 76c10f0a06e8..439b2aff6afc 100644
--- a/pkgs/os-specific/linux/irqbalance/default.nix
+++ b/pkgs/os-specific/linux/irqbalance/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "irqbalance-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "irqbalance";
     repo = "irqbalance";
     rev = "v${version}";
-    sha256 = "009777p5v72x4r58skqgaf03qv3app9b8lkxkpxq0226l0x3j4qh";
+    sha256 = "05q3cdz2a5zp5s2bdz5a80y9vq7awqw9lbvyvh6vjs9a8vg80hwm";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From cdd0d9944ad0ad2d3fbd1e793300a7959a22284f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 19:54:21 -0700
Subject: [PATCH 2236/3370] dash: 0.5.10.1 -> 0.5.10.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dash/versions.

These checks were done:

- built on NixOS
- /nix/store/shdckmx580jc9c283dxlnl47gfj5lykc-dash-0.5.10.2/bin/dash passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/f099316518721d966018e207da80b59f
- du listing: https://gist.github.com/943c0fa7050582ee37c58883869edf64
---
 pkgs/shells/dash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix
index c852e1feb33b..2db8edd5e0ca 100644
--- a/pkgs/shells/dash/default.nix
+++ b/pkgs/shells/dash/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dash-0.5.10.1";
+  name = "dash-0.5.10.2";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/${name}.tar.gz";
-    sha256 = "1bl4brz5vy07lrss54glp4vfca3q8d73hyc87sqdk99f76z95b6s";
+    sha256 = "0wb0bwmqc661hylqcfdp7l7x12myw3vpqk513ncyqrjwvhckjriw";
   };
 
   hardeningDisable = [ "format" ];

From bd0dbed3ff6c9e1c415ce669d1152761a9c64f97 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 10:42:20 -0700
Subject: [PATCH 2237/3370] uncrustify: 0.66.1 -> 0.67

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/uncrustify/versions.

These checks were done:

- built on NixOS
- /nix/store/k96qsfrnrv7wdps9i46pbfzwm4n0ml0x-uncrustify-0.67/bin/uncrustify passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.67 with grep in /nix/store/k96qsfrnrv7wdps9i46pbfzwm4n0ml0x-uncrustify-0.67
- directory tree listing: https://gist.github.com/71da32610fd0c4196f8b0f19061ca051
- du listing: https://gist.github.com/6af9737f25aad6d34b2ee37f3d3a056e
---
 pkgs/development/tools/misc/uncrustify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix
index 3cf707c6bebb..d85cd1a82164 100644
--- a/pkgs/development/tools/misc/uncrustify/default.nix
+++ b/pkgs/development/tools/misc/uncrustify/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "uncrustify";
-  version = "0.66.1";
+  version = "0.67";
 
   src = fetchFromGitHub {
     owner = product;
     repo = product;
     rev = name;
-    sha256 = "1y69b0g07ksynf1fwfh5qqwmscxfbvs1yi3n3lbdd4vplb9zakyx";
+    sha256 = "0hf8c93aj1hjg6cc77x6p7nf7ddp8mn4b6a9gpcrvmx8w81afpd3";
   };
 
   nativeBuildInputs = [ cmake ];

From fbf82900c49afb8ea4ab688b82fdaf6157fa142c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sun, 20 May 2018 20:54:59 -0700
Subject: [PATCH 2238/3370] chirp: 20180512 -> 20180519

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/chirp-daily/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519/bin/.chirpw-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519/bin/chirpw had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 20180519 with grep in /nix/store/s2g23ds5fsnl0bg7dyn9j5y3drvxs3ar-chirp-daily-20180519
- directory tree listing: https://gist.github.com/a05ef55580a6032a5b40aabb92e6dfd7
- du listing: https://gist.github.com/13517a738616514609c44b95f30fc5a1
---
 pkgs/applications/misc/chirp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 54f36663454e..90d7ecd082c8 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "chirp-daily-${version}";
-  version = "20180512";
+  version = "20180519";
 
   src = fetchurl {
     url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "111pijr0v36n3yg0p58mgvfxvz088axnxvgfhs8cblssi931mimm";
+    sha256 = "1sb4cw95lcj2cdfzzgnwjgmnpk2nqjys4am5qvj4pnh0x447sznv";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d9bdd77eb59079f1ebefb522325cf117ae575982 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 21 May 2018 11:46:44 +0200
Subject: [PATCH 2239/3370] vimNox: pin to lua 5.1

vimNox is currently built from a patched vim 7.3 source from 2012
that requires lua 5.1. Temporary fix, see discussion in #40749.
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdc4ed881e00..c19e956e7a76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18374,7 +18374,10 @@ with pkgs;
 
   xxd = callPackage ../tools/misc/xxd { };
 
-  vimNox = lowPrio (vim_configurable.override { source = "vim-nox"; });
+  vimNox = lowPrio (vim_configurable.override {
+    source = "vim-nox";
+    lua = pkgs.lua5_1; # vimNox source is from 2012, requires older lua
+  });
 
   qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {};
 

From d9dadce7589a77f9cc2d3ca763b6bf4ec082a004 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 17 May 2018 20:57:32 +0900
Subject: [PATCH 2240/3370] libnl: 3.3.0 -> 3.4.0

---
 pkgs/os-specific/linux/libnl/default.nix | 6 +++---
 pkgs/top-level/python-packages.nix       | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index c79a4314d6f1..52b5b272fb60 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }:
 
-let version = "3.3.0"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libnl-${version}";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     repo = "libnl";
     owner = "thom311";
     rev = "libnl${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "1796kyq2lkhz2802v9kp32vlxf8ynlyqgyw9nhmry3qh5d0ahcsv";
+    sha256 = "1bqf1f5glwf285sa98k5pkj9gg79lliixk1jk85j63v5510fbagp";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be41d5eef493..64f9178cd871 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6951,6 +6951,9 @@ in {
 
   pylru = callPackage ../development/python-modules/pylru { };
 
+  libnl-python = disabledIf isPy3k
+    (toPythonModule (pkgs.libnl.override{pythonSupport=true; inherit python; })).py;
+
   lark-parser = callPackage ../development/python-modules/lark-parser { };
 
   lazy-object-proxy = buildPythonPackage rec {

From 0d17a57afab1d33874d03e2fe397116cec2dcbda Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 17 May 2018 21:02:27 +0900
Subject: [PATCH 2241/3370] pythonPackages.libnl-python: init at 3.4.0

Netlink is the userspace <-> kernelspace communication protocol.
---
 pkgs/os-specific/linux/libnl/default.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index 52b5b272fb60..1caf91b0bb69 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig }:
+{ stdenv, file, lib, fetchFromGitHub, fetchpatch, autoreconfHook, bison, flex, pkgconfig
+, pythonSupport ? true, swig ? null, python}:
 
 stdenv.mkDerivation rec {
   name = "libnl-${version}";
@@ -11,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1bqf1f5glwf285sa98k5pkj9gg79lliixk1jk85j63v5510fbagp";
   };
 
-  outputs = [ "bin" "dev" "out" "man" ];
+  outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional pythonSupport "py";
 
   patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
     (fetchpatch {
@@ -21,7 +22,22 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook bison flex pkgconfig file ]
+    ++ lib.optional pythonSupport swig;
+
+  postBuild = lib.optionalString (pythonSupport) ''
+      cd python
+      ${python}/bin/python setup.py install --prefix=../pythonlib
+      cd -
+  '';
+
+  postFixup = lib.optionalString pythonSupport ''
+    mv "pythonlib/" "$py"
+  '';
+
+  passthru = {
+    inherit pythonSupport;
+  };
 
   meta = with lib; {
     inherit version;

From 1bf798b8cb1da83ebedf408115590d3d002e3609 Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Mon, 21 May 2018 14:15:58 +0200
Subject: [PATCH 2242/3370] nixos/ipfs: Add option to disable local port
 scanning for ipfs daemon

---
 nixos/modules/services/network-filesystems/ipfs.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index e2122ddb8ede..b5903d113c57 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -186,6 +186,16 @@ in {
         default = [];
       };
 
+      localDiscovery = mkOption {
+        type = types.bool;
+        description = ''Whether to enable local discovery for the ipfs daemon.
+          This will prevent ipfs to scan ports on your local network. Some hosting services will ban you if you do.
+
+          This option only has an effect before you initialized ipfs your machine.
+        '';
+        default = true;
+      };
+
       serviceFdlimit = mkOption {
         type = types.nullOr types.int;
         default = null;
@@ -232,7 +242,8 @@ in {
       '';
       script = ''
         if [[ ! -f ${cfg.dataDir}/config ]]; then
-          ipfs init ${optionalString cfg.emptyRepo "-e"}
+          ipfs init ${optionalString cfg.emptyRepo "-e"} \
+            ${optionalString (! cfg.localDiscovery) "--profile=server"}
         fi
       '';
 

From d239113bb0a2b471ea72d8a8af2331ec87d72a93 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 21 May 2018 08:42:51 -0700
Subject: [PATCH 2243/3370] palemoon: 27.9.1 -> 27.9.2 (#40838)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/palemoon/versions.

These checks were done:

- built on NixOS
- /nix/store/5kg07d9qryxy21ikixc0273ngbm3zl3v-palemoon-27.9.2/bin/palemoon passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 27.9.2 with grep in /nix/store/5kg07d9qryxy21ikixc0273ngbm3zl3v-palemoon-27.9.2
- directory tree listing: https://gist.github.com/97521481792d6df556c4536742a77bb4
- du listing: https://gist.github.com/7f246d760956bb748d5e09cfd1193a6b
---
 pkgs/applications/networking/browsers/palemoon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 3f44d1576602..e6b5ee641ee4 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   name = "palemoon-${version}";
-  version = "27.9.1";
+  version = "27.9.2";
 
   src = fetchFromGitHub {
     name   = "palemoon-src";
     owner  = "MoonchildProductions";
     repo   = "Pale-Moon";
     rev    = version + "_Release";
-    sha256 = "1cjd0liy3x7iqx8g8mbwdrr0f2aiqjiaifzzkngcvx3vfmphj97k";
+    sha256 = "0v6vgkxac2s1hw1namvrjysj2k1kbkabwdxrpq6kyd8svr7n974r";
   };
 
   desktopItem = makeDesktopItem {

From 19f768a97808da4c8700ae24513ab557801be12c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 21 May 2018 16:10:03 +0000
Subject: [PATCH 2244/3370] ocamlPackages.earley_ocaml: init at 1.0.2

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

diff --git a/pkgs/development/ocaml-modules/earley_ocaml/default.nix b/pkgs/development/ocaml-modules/earley_ocaml/default.nix
new file mode 100644
index 000000000000..92a1eb1e5c8e
--- /dev/null
+++ b/pkgs/development/ocaml-modules/earley_ocaml/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, earley }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "ocaml${ocaml.version}-earley_ocaml-${version}";
+  src = fetchFromGitHub {
+    owner = "rlepigre";
+    repo = "ocaml-earley-ocaml";
+    rev = "ocaml-earley-ocaml_${version}";
+    sha256 = "0f8kr49r2xfs7cbzps4r9i92ckhwssaiydam846jrky3z5djn2jc";
+  };
+
+  buildInputs = [ which ocaml findlib ocamlbuild ];
+
+  propagatedBuildInputs = [ earley ];
+
+  preBuild = "make";
+
+  createFindlibDestdir = true;
+
+  installFlags = [ "BINDIR=$(out)/bin" ];
+
+  meta = {
+    description = "Extensible OCaml parser to be used with Earley";
+    license = stdenv.lib.licenses.cecill-b;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index e46888992f77..01a5b224d1e5 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -217,6 +217,8 @@ let
 
     earley = callPackage ../development/ocaml-modules/earley { };
 
+    earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { };
+
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
     eliom = callPackage ../development/ocaml-modules/eliom { };

From e8ef471df4fb1f9e7712fc9498437790c440201f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 May 2018 14:41:14 -0400
Subject: [PATCH 2245/3370] linux-copperhead: 4.16.9.a -> 4.16.10.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
index 5c65f2064b42..fea27b649f51 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.16.9";
+  version = "4.16.10";
   revision = "a";
-  sha256 = "1g1924whb79cflh4wcqpyq9d7nfxdsvsjh2mv5ps85fsg2109kpl";
+  sha256 = "1dd9zislrlv24mnvzm2j9rfxnfp93lgf0pi48zpdglw5xpfwqm49";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From d775dc916080ed52eac84cdd6b68ab8feaeb0cb2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 May 2018 14:41:34 -0400
Subject: [PATCH 2246/3370] linux-copperhead: 4.14.41 -> 4.14.42

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
index 8054ba0be6ac..f9af5e5f6026 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.14.41";
+  version = "4.14.42";
   revision = "a";
-  sha256 = "16jwv1drs6xlwghzn8ps7v8x5xja61b5y6747c86g17idfaac1k3";
+  sha256 = "09j36qhxs1z2qcxlpscg8yrif4qvm5ipbh7n6gxg58150yg9sl05";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 900862ea3bda4ef87dc8b4a8aa78a242d1ae7b04 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 May 2018 14:44:46 -0400
Subject: [PATCH 2247/3370] haskell generic builder: `setupHaskellDepends`
 should be `nativeBuildInputs

This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.

This was previous implemented in 8a8f0408cd9b7fdda1095718107c800057658c44, but
reverted in e69c7f56419589c0d3296e81f47032fa813cca4b because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
---
 pkgs/development/haskell-modules/generic-builder.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 53974ada8009..42f0facef419 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -169,18 +169,22 @@ let
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
   nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
+                      setupHaskellDepends ++
                       buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
-  otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
+  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) allPkgconfigDepends ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
+
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
   systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
 
-  ghcEnv = ghc.withPackages (p: haskellBuildInputs);
+  # When not cross compiling, also include Setup.hs dependencies.
+  ghcEnv = ghc.withPackages (p:
+    haskellBuildInputs ++ stdenv.lib.optional (!isCross) setupHaskellDepends);
 
   setupCommand = "./Setup";
 

From 15759df6607204d960f70420a092178cf65306b7 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 1 Mar 2018 13:35:48 +0800
Subject: [PATCH 2248/3370] haskell generic builder: Use setup package database
 for setup-depends

Adapted from https://github.com/obsidiansystems/nixpkgs/commit/b69f420121120433220c568e4b35ade539ef60f2 by @Ericson2314
---
 .../haskell-modules/generic-builder.nix       | 54 +++++++++++++------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 42f0facef419..3e191cd23451 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -194,6 +194,22 @@ let
 
   nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
 
+  buildPkgDb = ghcName: ''
+    if [ -d "$p/lib/${ghcName}/package.conf.d" ]; then
+      cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf $packageConfDir/
+      continue
+    fi
+    if [ -d "$p/include" ]; then
+      configureFlags+=" --extra-include-dirs=$p/include"
+    fi
+    if [ -d "$p/lib" ]; then
+      configureFlags+=" --extra-lib-dirs=$p/lib"
+    fi
+    if [[ -d "$p/Library/Frameworks" ]]; then
+      configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
+    fi
+  '';
+
 in
 
 assert allPkgconfigDepends != [] -> pkgconfig != null;
@@ -234,27 +250,31 @@ stdenv.mkDerivation ({
     echo "Build with ${ghc}."
     ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
+  '' + (optionalString (setupHaskellDepends != []) ''
+    setupPackageConfDir="$TMPDIR/setup-package.conf.d"
+    mkdir -p $setupPackageConfDir
+  '') + ''
     packageConfDir="$TMPDIR/package.conf.d"
     mkdir -p $packageConfDir
 
     setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
     configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
+  ''
+  # We build the Setup.hs on the *build* machine, and as such should only add
+  # dependencies for the build machine.
+  #
+  # pkgs* arrays defined in stdenv/setup.hs
+  + (optionalString (setupHaskellDepends != []) ''
+    for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
+      ${buildPkgDb nativeGhc.name}
+    done
+    ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache
+  '')
 
-    # host.*Pkgs defined in stdenv/setup.hs
+    # For normal components
+  + ''
     for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
-      if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
-        cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
-        continue
-      fi
-      if [ -d "$p/include" ]; then
-        configureFlags+=" --extra-include-dirs=$p/include"
-      fi
-      if [ -d "$p/lib" ]; then
-        configureFlags+=" --extra-lib-dirs=$p/lib"
-      fi
-      if [[ -d "$p/Library/Frameworks" ]]; then
-        configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
-      fi
+      ${buildPkgDb ghc.name}
     done
   ''
   # only use the links hack if we're actually building dylibs. otherwise, the
@@ -289,7 +309,11 @@ stdenv.mkDerivation ({
     done
 
     echo setupCompileFlags: $setupCompileFlags
-    ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
+    ${optionalString (setupHaskellDepends != [])
+       ''
+       echo GHC_PACKAGE_PATH="$setupPackageConfDir:"
+       GHC_PACKAGE_PATH="$setupPackageConfDir:" ''
+    }${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
 
     runHook postCompileBuildDriver
   '';

From 4ea33def46709e90b9f41ccd6fb6a84342ecd926 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Sun, 11 Mar 2018 17:13:25 +0800
Subject: [PATCH 2249/3370] haskell generic builder: Disable static libs on
 Windows because no -staticlib

The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
---
 pkgs/development/haskell-modules/generic-builder.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3e191cd23451..1b9372c28df5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -31,7 +31,7 @@ in
 , enableSharedExecutables ? false
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
-, enableStaticLibraries ? true
+, enableStaticLibraries ? !hostPlatform.isWindows
 , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
@@ -68,6 +68,10 @@ in
 
 assert editedCabalFile != null -> revision != null;
 
+# --enable-static does not work on windows. This is a bug in GHC.
+# --enable-static will pass -staticlib to ghc, which only works for mach-o and elf.
+assert hostPlatform.isWindows -> enableStaticLibraries == false;
+
 let
 
   inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast

From 5e589a40497eaf15108f503f41dd62b925ad9e5f Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Sat, 17 Mar 2018 14:42:28 +0800
Subject: [PATCH 2250/3370] haskell generic builder: Do the `links` dance only
 if shared is enabled.

---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1b9372c28df5..a94f20710041 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -284,7 +284,7 @@ stdenv.mkDerivation ({
   # only use the links hack if we're actually building dylibs. otherwise, the
   # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes
   # "ln -s $out/lib/links", which tries to recreate the links dir and fails
-  + (optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+  + (optionalString (stdenv.isDarwin && (enableSharedLibraries || enableSharedExecutables)) ''
     # Work around a limit in the macOS Sierra linker on the number of paths
     # referenced by any one dynamic library:
     #

From 82a847a04b5ed2f041d8c94895011e13b0735f6e Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Sat, 17 Mar 2018 16:55:39 +0800
Subject: [PATCH 2251/3370] haskell infra: Adds buildFlags logic

---
 pkgs/development/haskell-modules/generic-builder.nix | 5 ++++-
 pkgs/development/haskell-modules/lib.nix             | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a94f20710041..99c85ac688a5 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -19,6 +19,7 @@ in
 , buildTarget ? ""
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
 , configureFlags ? []
+, buildFlags ? []
 , description ? ""
 , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
 , doBenchmark ? false
@@ -130,6 +131,8 @@ let
   crossCabalFlagsString =
     stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
 
+  buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
+
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
     (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
@@ -345,7 +348,7 @@ stdenv.mkDerivation ({
 
   buildPhase = ''
     runHook preBuild
-    ${setupCommand} build ${buildTarget}${crossCabalFlagsString}
+    ${setupCommand} build ${buildTarget}${crossCabalFlagsString}${buildFlagsString}
     runHook postBuild
   '';
 
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index ff86e06979c1..fedb0fa8de83 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -131,6 +131,8 @@ rec {
    */
   appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; });
 
+  appendBuildFlag = drv: x: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ [x]; });
+  appendBuildFlags = drv: xs: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ xs; });
   /* removeConfigureFlag drv x is a Haskell package like drv, but with
      all cabal configure arguments that are equal to x removed.
 

From f914fdd960688e5afeddc7f50235000f1c9418d6 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Mon, 26 Mar 2018 14:57:56 +0800
Subject: [PATCH 2252/3370] used stdenv.targetPlatform.isDarwin and not
 stdenv.isDarwin.

---
 pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 469b249010fa..2f1eb1ad97a8 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -128,7 +128,7 @@ self: super: builtins.intersectAttrs super {
 
   # Prevents needing to add security_tool as a build tool to all of x509-system's
   # dependencies.
-  x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
+  x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
     then let inherit (pkgs.darwin) security_tool;
       in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
         postPatch = (drv.postPatch or "") + ''

From 6f2f081b90a14f274274f6ce0bce5860057495d1 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 May 2018 19:33:05 -0400
Subject: [PATCH 2253/3370] ghc: Normalize derivations

---
 pkgs/development/compilers/ghc/7.10.3.nix |  7 +++++--
 pkgs/development/compilers/ghc/8.0.2.nix  |  8 +++++++-
 pkgs/development/compilers/ghc/8.2.2.nix  | 11 ++++++-----
 pkgs/development/compilers/ghc/8.4.2.nix  | 12 +++++++-----
 pkgs/development/compilers/ghc/head.nix   |  7 +++++--
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index e4bf23c6e9e2..150d14e1db46 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -68,7 +68,6 @@ let
   targetCC = builtins.head toolsForTarget;
 
 in
-
 stdenv.mkDerivation rec {
   version = "7.10.3";
   name = "${targetPrefix}ghc-${version}";
@@ -87,6 +86,8 @@ stdenv.mkDerivation rec {
     ./relocation.patch
   ];
 
+  postPatch = "patchShebangs .";
+
   # GHC is a bit confused on its cross terminology.
   preConfigure = ''
     for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
@@ -103,6 +104,7 @@ stdenv.mkDerivation rec {
     export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
     export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
     export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
@@ -135,7 +137,8 @@ stdenv.mkDerivation rec {
   crossConfig = true;
 
   nativeBuildInputs = [
-    ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour
+    perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
+    ghc hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 7d11ffb66c60..60707c0288d6 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -86,6 +86,8 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch;
 
+  postPatch = "patchShebangs .";
+
   # GHC is a bit confused on its cross terminology.
   preConfigure = ''
     for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
@@ -102,6 +104,7 @@ stdenv.mkDerivation rec {
     export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
     export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
     export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
@@ -133,7 +136,10 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ ghc perl hscolour sphinx ];
+  nativeBuildInputs = [
+    perl sphinx
+    ghc hscolour
+  ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 192ff1ba207d..c0fadbb61750 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -23,10 +23,8 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ?
-    !(targetPlatform.isDarwin
-      # On iOS, dynamic linking is not supported
-      && (targetPlatform.isAarch64 || targetPlatform.isAarch32))
+  enableShared ? true
+
 , # Whether to backport https://phabricator.haskell.org/D4388 for
   # deterministic profiling symbol names, at the cost of a slightly
   # non-standard GHC API
@@ -152,7 +150,10 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ];
+  nativeBuildInputs = [
+    autoconf autoreconfHook automake perl python3 sphinx
+    ghc alex happy hscolour
+  ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 94555482d28b..bebc386f2243 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -3,7 +3,7 @@
 
 # build-tools
 , bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
 
 , libffi, libiconv ? null, ncurses
 
@@ -15,7 +15,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null, m4
+  enableIntegerSimple ? false, gmp ? null
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@@ -24,7 +24,6 @@
   # platform). Static libs are always built.
   enableShared ? !targetPlatform.useAndroidPrebuilt
 
-, version ? "8.4.2"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -69,7 +68,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  inherit version;
+  version = "8.4.2";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
@@ -143,7 +142,10 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ];
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3
+    ghc alex happy
+  ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 7e1c73d166a2..e0de4e7e60e6 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -3,7 +3,7 @@
 
 # build-tools
 , bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchgit, perl, python3
+, autoconf, automake, coreutils, fetchgit, perl, python3, m4
 
 , libffi, libiconv ? null, ncurses
 
@@ -141,7 +141,10 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3
+    ghc alex happy
+  ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;

From 8d2ce113d571046382c9490b1e47e14454c6469f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 20 May 2018 02:16:07 -0400
Subject: [PATCH 2254/3370] ghc: Handle flavors better

---
 pkgs/development/compilers/ghc/7.10.3.nix | 9 ++++++++-
 pkgs/development/compilers/ghc/8.0.2.nix  | 9 ++++++++-
 pkgs/development/compilers/ghc/8.2.2.nix  | 8 +++++++-
 pkgs/development/compilers/ghc/8.4.2.nix  | 8 +++++++-
 pkgs/development/compilers/ghc/head.nix   | 8 +++++++-
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 150d14e1db46..7d2f37916323 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -24,6 +24,10 @@
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
   enableShared ? true
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -42,11 +46,14 @@ let
   };
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 60707c0288d6..b5cd111f1e51 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -23,6 +23,10 @@
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
   enableShared ? true
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -36,11 +40,14 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index c0fadbb61750..4bd6889d1df8 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -25,6 +25,9 @@
   # platform). Static libs are always built.
   enableShared ? true
 
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 , # Whether to backport https://phabricator.haskell.org/D4388 for
   # deterministic profiling symbol names, at the cost of a slightly
   # non-standard GHC API
@@ -42,11 +45,14 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index bebc386f2243..b432682802e5 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -24,6 +24,9 @@
   # platform). Static libs are always built.
   enableShared ? !targetPlatform.useAndroidPrebuilt
 
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -37,11 +40,14 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index e0de4e7e60e6..f5a7be5156d7 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -25,6 +25,9 @@
   enableShared ? !targetPlatform.useAndroidPrebuilt
 
 , version ? "8.5.20180118"
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -38,11 +41,14 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO

From 6af0c192d15b3e87f1cf757250f7c8f8b84bd2d3 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Mon, 5 Mar 2018 21:34:31 +0800
Subject: [PATCH 2255/3370] ghc: paxmark all unwraped executables across the
 board

Shell glob works even as the exact set of executable (filenames) varries
beween configuations.
---
 pkgs/development/compilers/ghc/8.0.2.nix | 2 +-
 pkgs/development/compilers/ghc/8.2.2.nix | 2 +-
 pkgs/development/compilers/ghc/8.4.2.nix | 2 +-
 pkgs/development/compilers/ghc/head.nix  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index b5cd111f1e51..02cf40e2c664 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -166,7 +166,7 @@ stdenv.mkDerivation rec {
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
+    paxmark m $out/lib/${name}/bin/*
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 4bd6889d1df8..f6608305fb0d 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation rec {
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
+    paxmark m $out/lib/${name}/bin/*
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index b432682802e5..e498a67976f2 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
+    paxmark m $out/lib/${name}/bin/*
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index f5a7be5156d7..a1ba5af4c792 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -172,7 +172,7 @@ stdenv.mkDerivation rec {
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
+    paxmark m $out/lib/${name}/bin/*
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc

From 03602f8162d96a4c510b935134337070812e1bbf Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 20 May 2018 02:21:37 -0400
Subject: [PATCH 2256/3370] ghc 8.4.2, head: Adjust enableShared enableTerminfo
 for windows

---
 pkgs/development/compilers/ghc/8.4.2.nix | 7 +++++--
 pkgs/development/compilers/ghc/head.nix  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index e498a67976f2..70dfaa2dcc57 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -22,7 +22,10 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !targetPlatform.useAndroidPrebuilt
+  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !targetPlatform.isWindows
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
@@ -60,7 +63,7 @@ let
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: [ ncurses ]
+  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
     ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
 
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index a1ba5af4c792..29993e8096d5 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -22,7 +22,10 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !targetPlatform.useAndroidPrebuilt
+  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !targetPlatform.isWindows
 
 , version ? "8.5.20180118"
 , # What flavour to build. An empty string indicates no
@@ -61,7 +64,7 @@ let
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: [ ncurses ]
+  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
     ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
 

From 4b480942851d72bc6f292539b1e9a0c100323fae Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 3 May 2018 13:54:00 +0800
Subject: [PATCH 2257/3370] ghc 8.4.2, head: Drop `libiconv` on windows.

nixpkgs#37012 and  nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
---
 pkgs/development/compilers/ghc/8.4.2.nix | 4 ++--
 pkgs/development/compilers/ghc/head.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 70dfaa2dcc57..6615c0282e65 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -65,7 +65,7 @@ let
   # Splicer will pull out correct variations
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget =
     if hostPlatform == buildPlatform then
@@ -133,7 +133,7 @@ stdenv.mkDerivation rec {
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 29993e8096d5..ede25c7679a6 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -66,7 +66,7 @@ let
   # Splicer will pull out correct variations
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget =
     if hostPlatform == buildPlatform then
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"

From e4ed1d343eb569087d44857c70d1a13213390746 Mon Sep 17 00:00:00 2001
From: Grigoriy Dmitriev <gregorioslion@gmail.com>
Date: Mon, 21 May 2018 22:41:00 +0300
Subject: [PATCH 2258/3370] Kakoune version updated 2018-03-22 -> 2018-05-21,
 debug mode disabled

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

diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix
index 868dfaf3d12a..8ef1e549906e 100644
--- a/pkgs/applications/editors/kakoune/default.nix
+++ b/pkgs/applications/editors/kakoune/default.nix
@@ -4,15 +4,16 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "kakoune-unstable-${version}";
-  version = "2018-03-22";
+  version = "2018-05-21";
   src = fetchFromGitHub {
     repo = "kakoune";
     owner = "mawww";
-    rev = "f8e297acef1be0657b779fea5256f606a6c6a3a3";
-    sha256 = "14xmw3lkwzppm9bns55nmyb1lfihzhdyisf6xjqlszdj4mcf94jl";
+    rev = "878d2a4bdb674a5e7703a66e530520f48efba641";
+    sha256 = "0pwy6ilsb62s1792gjyvhvq8shj60l8lx26b58zvpfb54an4s6rk";
   };
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses asciidoc docbook_xsl libxslt ];
+  makeFlags = [ "debug=no" ];
 
   postPatch = ''
     export PREFIX=$out

From 2a5b2550f38afc92dfe33acb0e9d3c20a139f941 Mon Sep 17 00:00:00 2001
From: Alvar <geistesk@users.noreply.github.com>
Date: Mon, 21 May 2018 21:53:50 +0200
Subject: [PATCH 2259/3370] pythonPackages.pypcap: 1.2.0 -> 1.2.2 (#40882)

---
 .../python-modules/pypcap/default.nix         | 31 +++++++++----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix
index e2d4e1efe285..dc916213fcd0 100644
--- a/pkgs/development/python-modules/pypcap/default.nix
+++ b/pkgs/development/python-modules/pypcap/default.nix
@@ -1,13 +1,12 @@
-{ stdenv, lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }:
+{ lib, writeText, buildPythonPackage, fetchPypi, libpcap, dpkt }:
 
 buildPythonPackage rec {
   pname = "pypcap";
-  version = "1.2.0";
-  name = "${pname}-${version}";
+  version = "1.2.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0n01xjgg8n5mf1cs9yg9ljsx1kvir8cm6wwrd2069fawjxdbk0b9";
+    sha256 = "07ww25z4xydp11hb38halh1940gmp5lca11hwfb63zv3bps248x3";
   };
 
   patches = [
@@ -17,26 +16,24 @@ buildPythonPackage rec {
       ''
       --- a/setup.py
       +++ b/setup.py
-      @@ -27,7 +27,8 @@ def recursive_search(path, target_files):
+      @@ -28,6 +28,7 @@ def recursive_search(path, target_files):
 
-       def get_extension():
-           # A list of all the possible search directories
-      -    dirs = ['/usr', sys.prefix] + glob.glob('/opt/libpcap*') + \
-      +    dirs = ['${libpcap}', '/usr', sys.prefix] + \
-      +        glob.glob('/opt/libpcap*') + \
-               glob.glob('../libpcap*') + glob.glob('../wpdpack*') + \
-               glob.glob('/Applications/Xcode.app/Contents/Developer/Platforms/' +
-                         'MacOSX.platform/Developer/SDKs/*')
+       def find_prefix_and_pcap_h():
+           prefixes = chain.from_iterable((
+      +        '${libpcap}',
+               ('/usr', sys.prefix),
+               glob.glob('/opt/libpcap*'),
+               glob.glob('../libpcap*'),
       '')
   ];
 
   buildInputs = [ libpcap ];
-  nativeBuildInputs = [ dpkt ];
+  checkInputs = [ dpkt ];
 
-  meta = {
+  meta = with lib; {
     homepage = https://github.com/pynetwork/pypcap;
     description = "Simplified object-oriented Python wrapper for libpcap";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ geistesk ];
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ geistesk ];
   };
 }

From 2a09ee7a4aacbc005026869f34ae5a39c94a93ce Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <goaway1000@gmail.com>
Date: Mon, 21 May 2018 16:08:55 -0400
Subject: [PATCH 2260/3370] purple-xmpp-http-upload: init at 178096c

---
 .../purple-xmpp-http-upload/default.nix       | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
new file mode 100644
index 000000000000..a3743e235b39
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit, pidgin, glib, libxml2 }:
+
+stdenv.mkDerivation rec {
+  name = "purple-xmpp-upload-${version}";
+  version = "178096cbfc9df165c2dc1677666439969d212b37";
+
+  src = fetchgit {
+    url = "https://github.com/Junker/purple-xmpp-http-upload";
+    rev = version;
+    sha256 = "12l9rqlgb4i50xxrfnvwz9sqfk0d3c0m6l09mnvfixqi8illyvlp";
+  };
+
+  buildInputs = [ pidgin glib libxml2 ];
+
+  installPhase = ''
+    install -Dm644 -t $out/lib/purple-2 jabber_http_file_upload.so
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Junker/purple-xmpp-http-upload;
+    description = "HTTP File Upload plugin for libpurple (XMPP Protocol XEP-0363)";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ emmanuelrosa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19e956e7a76..4c76f77f0c46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17466,6 +17466,8 @@ with pkgs;
 
   purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { };
 
+  purple-xmpp-http-upload = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload { };
+
   telegram-purple = callPackage ../applications/networking/instant-messengers/pidgin-plugins/telegram-purple { };
 
   toxprpl = callPackage ../applications/networking/instant-messengers/pidgin-plugins/tox-prpl {

From 3709e30d067675956bce99a70bb4c55c10b3711a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 21 May 2018 22:15:33 +0200
Subject: [PATCH 2261/3370] restic: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix
index 158d7f1d2cf1..9f9714e6d99a 100644
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "restic-${version}";
-  version = "0.8.3";
+  version = "0.9.0";
 
   goPackagePath = "github.com/restic/restic";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "restic";
     repo = "restic";
     rev = "v${version}";
-    sha256 = "0vbwbxly3p1wj25ai1xak1bmhibh2ilxl55gsbnaaq7pcznc3ad9";
+    sha256 = "09520ggr98w7nn6kl3yx0nrx4f79q4vhg4q1hiv2nlwxd0jz1p6y";
   };
 
   buildPhase = ''
@@ -31,7 +31,7 @@ buildGoPackage rec {
       --man $bin/share/man/man1
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://restic.net;
     description = "A backup program that is fast, efficient and secure";
     platforms = platforms.linux ++ platforms.darwin;

From 5f9b2597105876afb4388e122a9545c1c0000571 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 21 May 2018 15:36:25 -0500
Subject: [PATCH 2262/3370] heaptrack: 2018-01-28 -> 1.1.0

use new stable release!
---
 pkgs/development/tools/profiling/heaptrack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix
index f5f9a15dd00a..5ff0d2ca2b1e 100644
--- a/pkgs/development/tools/profiling/heaptrack/default.nix
+++ b/pkgs/development/tools/profiling/heaptrack/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "heaptrack-${version}";
-  version = "2018-01-28";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "KDE";
     repo = "heaptrack";
-    rev = "a4534d52788ab9814efca1232d402b2eb319342c";
-    sha256 = "00xfv51kavvcmwgfmcixx0k5vhd06gkj5q0mm8rwxiw6215xp41a";
+    rev = "v${version}";
+    sha256 = "0vgwldl5n41r4y3pv8w29gmyln0k2w6m59zrfw9psm4hkxvivzlx";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From 0598652303a72739e6798a2eb4c06ac5bc31a46f Mon Sep 17 00:00:00 2001
From: Daniel Peebles <copumpkin@users.noreply.github.com>
Date: Mon, 21 May 2018 16:41:03 -0400
Subject: [PATCH 2263/3370] Stop requiring the nixpkgs symlink in NixOS channel
 tarballs

Ideally I'd like the whole `nixos`/`nixpkgs` channel distinction to disappear, but this is a step along that path. After a while being in this state, we can stop creating the magic `nixpkgs -> .` symlink inside our `nixos` channel tarballs and simplify that whole mess a bit.
---
 nixos/modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 277ae9e292ce..8b940d71ebee 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -340,7 +340,7 @@ in
         default =
           [
             "$HOME/.nix-defexpr/channels"
-            "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs"
+            "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixos-config=/etc/nixos/configuration.nix"
             "/nix/var/nix/profiles/per-user/root/channels"
           ];

From 07723f14bb132f6d65c74b953bef39cd80457273 Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Tue, 22 May 2018 00:10:32 +0200
Subject: [PATCH 2264/3370] shotcut: 18.03.06 -> 18.05.08 (#40887)

---
 pkgs/applications/video/shotcut/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 0a786312214a..6572164c797e 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -3,15 +3,18 @@
 , qtgraphicaleffects, libmlt
 , qmake, makeWrapper }:
 
+assert stdenv.lib.versionAtLeast libmlt.version "6.8.0";
+assert stdenv.lib.versionAtLeast mlt.version "6.8.0";
+
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
-  version = "18.03.06";
+  version = "18.05.08";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     rev = "v${version}";
-    sha256 = "1b8hfym89i1nmrx80y16z06zsff5qba7gpga8jydnw1lmcscdash";
+    sha256 = "1qm1ycsx93qpw2vga25m3cr82vzqla1qqardjiln3iqfa0m93qsk";
   };
 
   enableParallelBuilding = true;

From 050d07d6726ca650599af9108fb7ed0977caa152 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 21 May 2018 17:43:22 -0500
Subject: [PATCH 2265/3370] gn: fix patch url

Fixes #40891
---
 pkgs/development/tools/build-managers/gn/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index 35f54369abd9..f49456a86ea6 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
 
   patches = [
     (fetchpatch {
-      url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/master/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
+      url = "https://raw.githubusercontent.com/Eloston/ungoogled-chromium/3375fbc7b865dafe1230431a1e3f9bffd27ec184/resources/patches/ungoogled-chromium/macos/fix-gn-bootstrap.patch";
       sha256 = "1h8jgxznm7zrxlzb4wcfx4zx4lyvfrmpd0r7cd7h0s23wn8ibb3a";
     })
   ];

From fe79fc0be4f3e27d634fbcb27c43eed948d285ce Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Tue, 22 May 2018 01:22:12 +0200
Subject: [PATCH 2266/3370] nixos/tests/mysql-replication: fix test (#40850)

Failed non-deterministically on hydra because replcation
sometimes was not finished yet when checking the results.
---
 nixos/tests/mysql-replication.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix
index 75c6d793febc..ed09ac10b75d 100644
--- a/nixos/tests/mysql-replication.nix
+++ b/nixos/tests/mysql-replication.nix
@@ -57,18 +57,25 @@ in
     $master->start;
     $master->waitForUnit("mysql");
     $master->waitForOpenPort(3306);
+    # Wait for testdb to be fully populated (5 rows).
+    $master->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+
     $slave1->start;
     $slave2->start;
     $slave1->waitForUnit("mysql");
     $slave1->waitForOpenPort(3306);
     $slave2->waitForUnit("mysql");
     $slave2->waitForOpenPort(3306);
-    $slave2->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
+
+    # wait for replications to finish
+    $slave1->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+    $slave2->waitUntilSucceeds("mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5");
+
     $slave2->succeed("systemctl stop mysql");
     $master->succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N");
     $slave2->succeed("systemctl start mysql");
     $slave2->waitForUnit("mysql");
     $slave2->waitForOpenPort(3306);
-    $slave2->succeed("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
+    $slave2->waitUntilSucceeds("echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456");
   '';
 })

From 9ec53a397ff52ec8a94a5bc6b603bff357c1fdd0 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 May 2018 19:19:29 -0400
Subject: [PATCH 2267/3370] requireFile: Use stdenvNoCC

There's no need for a C compiler
---
 pkgs/build-support/trivial-builders.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 2ec56c94763a..73da775f7f56 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -157,14 +157,14 @@ rec {
       hash = if sha256 != null then sha256 else sha1;
       name_ = if name == null then baseNameOf (toString url) else name;
     in
-    stdenv.mkDerivation {
+    stdenvNoCC.mkDerivation {
       name = name_;
       outputHashMode = hashMode;
       outputHashAlgo = hashAlgo;
       outputHash = hash;
       preferLocalBuild = true;
       builder = writeScript "restrict-message" ''
-        source ${stdenv}/setup
+        source ${stdenvNoCC}/setup
         cat <<_EOF_
 
         ***

From 82eaa5ba375f98fe582db080392b2f8288528660 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 22 May 2018 01:29:00 +0200
Subject: [PATCH 2268/3370] oracle-instantclient: add flokli as maintainer

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

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 6ed3e584fa34..a4a31260c219 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -86,6 +86,6 @@ in stdenv.mkDerivation rec {
     '';
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ pesterhazy ];
+    maintainers = with maintainers; [ pesterhazy flokli ];
   };
 }

From 60a666507c1511ce48cf933ce6d4e8d727899d91 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 21 May 2018 17:01:49 -0700
Subject: [PATCH 2269/3370] srtp: 2.1.0 -> 2.2.0 (#40849)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libsrtp/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2.2.0 with grep in /nix/store/6zbhr84zjcsvn8rjngwyqlhy1592pbcm-libsrtp-2.2.0
- directory tree listing: https://gist.github.com/87b0811e10da29e42c97917be0858d86
- du listing: https://gist.github.com/2e969bdfee6739383f70f7509c074b3b
---
 pkgs/development/libraries/srtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index 29ad55eb9d92..c9073fc0b7e7 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libsrtp-${version}";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "libsrtp";
     rev = "v${version}";
-    sha256 = "1q2rf1d2bsypdnw9k8ag6hrh9vbinfa504d1f42fdgdqw31d6lib";
+    sha256 = "1ac7xs1djb03j131f1gmqyfmrplblid9qqyxahs0shdy707r5ll6";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 9cf701f856df2cdb7ec18cf7bc3829bf40c0cdcc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 21 May 2018 17:03:26 -0700
Subject: [PATCH 2270/3370] mutt: 1.9.5 -> 1.10.0 (#40846)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mutt/versions.

These checks were done:

- built on NixOS
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/mutt passed the binary check.
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/pgpring passed the binary check.
- Warning: no invocation of /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/pgpewrap had a zero exit code or showed the expected version
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/muttbug passed the binary check.
- /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/flea passed the binary check.
- Warning: no invocation of /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0/bin/smime_keys had a zero exit code or showed the expected version
- 4 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 1.10.0 with grep in /nix/store/ydny2lhs0idsg1hxzkgi198n9jn17rcw-mutt-1.10.0
- directory tree listing: https://gist.github.com/2b53d5dc44b600872e77911ba7099e1c
- du listing: https://gist.github.com/4caca5d9043a5281a6b192ebaf30065f
---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index bbd56b188dfd..81cf4541222f 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -27,11 +27,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "mutt-${version}";
-  version = "1.9.5";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz";
-    sha256 = "0lsp72lm3cw490x7lhzia7h8f591bab2mr7qpscaj22fmrj7wqdz";
+    sha256 = "0nskymwr2cdapxlfv0ysz3bjwhb4kcvl5a3c39237k7r1vwva582";
   };
 
   patches = optional smimeSupport (fetchpatch {

From 0106dfcbeb56742503a89309c60a95433514226e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 21 May 2018 17:07:27 -0700
Subject: [PATCH 2271/3370] rust-bindgen: 0.36.1 -> 0.37.0 (#40833)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/rust-bindgen/versions.

These checks were done:

- built on NixOS
- /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0/bin/bindgen passed the binary check.
- Warning: no invocation of /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0/bin/.bindgen-wrapped had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.37.0 with grep in /nix/store/y7lbrcpy05c1br43257fj056p6vf269l-rust-bindgen-0.37.0
- directory tree listing: https://gist.github.com/dab90e1565932370211bc1cb47b526d9
- du listing: https://gist.github.com/1ea884a58cb25990e712703124f8a6da
---
 pkgs/development/tools/rust/bindgen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/default.nix b/pkgs/development/tools/rust/bindgen/default.nix
index 36fa1019705f..aeeae494e586 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.36.1";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rust-bindgen";
     rev = "v${version}";
-    sha256 = "0y99dvkbkd4vhac26dmc3bwf6z2m85p2il7mndvv8liam012pkbz";
+    sha256 = "0cqjr7qspjrfgqcp4nqxljmhhbqyijb2jpw3lajgjj48y6wrnw93";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0f2de9334edb9e6235e51d7a06a1095ef83a1786 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 22 May 2018 02:16:33 +0200
Subject: [PATCH 2272/3370] wireguard: bump version and limit platforms

---
 pkgs/tools/networking/wireguard-go/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index e27b241e755d..c4aaea4de240 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "wireguard-go-${version}";
-  version = "0.0.20180514";
+  version = "0.0.20180519";
 
   goPackagePath = "wireguard-go";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "1i1w4vj8w353b92nfhs92k0f7fifrwi067qfmgckdk0kk76nv2id";
+    sha256 = "d2b0f43679b3559952cf8d244d537903d03699ed7c8a2c1e7fc37ee424e30439";
   };
 
   goDeps = ./deps.nix;
@@ -23,6 +23,6 @@ buildGoPackage rec {
     homepage = https://git.zx2c4.com/wireguard-go/about/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ kirelagin ];
-    platforms = with platforms; linux ++ darwin ++ windows;
+    platforms = with platforms; darwin;
   };
 }

From 17e0e67930e794e72330b9ce86f6e3a034b1f31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com>
Date: Mon, 21 May 2018 13:42:51 +0200
Subject: [PATCH 2273/3370] nixos/flatpak: add flatpak's XDG_DATA_DIRS to the
 environment

We use environment.profiles to add both the PATH and XDG_DATA_DIRS.
---
 nixos/modules/services/desktops/flatpak.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix
index 024dc65629a8..cfca1893bd82 100644
--- a/nixos/modules/services/desktops/flatpak.nix
+++ b/nixos/modules/services/desktops/flatpak.nix
@@ -40,12 +40,12 @@ in {
 
     systemd.packages = [ pkgs.flatpak pkgs.xdg-desktop-portal ] ++ cfg.extraPortals;
 
-    environment.variables = {
-      PATH = [
-        "$HOME/.local/share/flatpak/exports/bin"
-        "/var/lib/flatpak/exports/bin"
-      ];
+    environment.profiles = [
+      "$HOME/.local/share/flatpak/exports"
+      "/var/lib/flatpak/exports"
+    ];
 
+    environment.variables = {
       XDG_DESKTOP_PORTAL_PATH = map (p: "${p}/share/xdg-desktop-portal/portals") cfg.extraPortals;
     };
   };

From afc439d57b3866cb499fe68b94f969079aba7963 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 May 2018 20:26:37 -0400
Subject: [PATCH 2274/3370] binutils: Always apply Aarch64 patch

Otherwise various things which depend on `--enable-targets=all`
lib{bfd,opcodes}...like LLVM.
---
 pkgs/development/tools/misc/binutils/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ac055171658b..fb780734bd7a 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -64,13 +64,12 @@ stdenv.mkDerivation rec {
 
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22868
     ./gold-symbol-visibility.patch
-  ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch
-    ++ stdenv.lib.optionals targetPlatform.isAarch64 [
+
     # Version 2.30 introduced strict requirements on ELF relocations which cannot
     # be satisfied on aarch64 platform. Add backported fix from bugzilla.
     # https://sourceware.org/bugzilla/show_bug.cgi?id=22764
     ./relax-R_AARCH64_ABS32-R_AARCH64_ABS16-absolute.patch
-  ];
+  ] ++ stdenv.lib.optional targetPlatform.isiOS ./support-ios.patch;
 
   outputs = [ "out" "info" "man" ];
 

From 4f979105af5a4a840f6558998c023dcf7410a037 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 22 May 2018 03:40:14 +0300
Subject: [PATCH 2275/3370] wireguard-go: fix hash

---
 pkgs/tools/networking/wireguard-go/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index c4aaea4de240..4dc6e52b2e94 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -8,7 +8,7 @@ buildGoPackage rec {
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "d2b0f43679b3559952cf8d244d537903d03699ed7c8a2c1e7fc37ee424e30439";
+    sha256 = "0b3wpc0ccf24567fjafv1sjs3yqq1xjam3gpfp37avxqy9789nb7";
   };
 
   goDeps = ./deps.nix;

From 3dc8328b1f62dc8ecf3ea83de1cec91775112388 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 20 May 2018 14:45:50 -0500
Subject: [PATCH 2276/3370] sfml: support darwin

---
 pkgs/development/libraries/sfml/default.nix | 13 +++++++++----
 pkgs/top-level/all-packages.nix             |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index f52b7905c6ec..03a801a32405 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
 , glew, libXrandr, libXrender, udev, xcbutilimage
+, IOKit, Foundation, AppKit, OpenAL
 }:
 
 let
@@ -13,9 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "1x3yvhdrln5b6h4g5r4mds76gq8zsxw6icxqpwqkmxsqcq5yviab";
   };
   buildInputs = [ cmake libX11 freetype libjpeg openal flac libvorbis glew
-                  libXrandr libXrender udev xcbutilimage
-                ];
-  cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes" ];
+                  libXrandr libXrender xcbutilimage
+                ] ++ stdenv.lib.optional stdenv.isLinux udev
+                  ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
+  cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
+                 "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
+                 "-DSFML_BUILD_FRAMEWORKS=no"
+                 "-DSFML_USE_SYSTEM_DEPS=yes" ];
   meta = with stdenv.lib; {
     homepage = http://www.sfml-dev.org/;
     description = "Simple and fast multimedia library";
@@ -26,6 +31,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.zlib;
     maintainers = [ maintainers.astsmtl ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19e956e7a76..f2649357e1b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11564,7 +11564,9 @@ with pkgs;
 
   simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; };
 
-  sfml = callPackage ../development/libraries/sfml { };
+  sfml = callPackage ../development/libraries/sfml {
+    inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
+  };
   csfml = callPackage ../development/libraries/csfml { };
 
   shapelib = callPackage ../development/libraries/shapelib { };

From 50c158dee86916ca5f4f2d553469f7583d7fd04b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 20 May 2018 18:54:41 -0500
Subject: [PATCH 2277/3370] enet: supports darwin

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

diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix
index 4c3d67b8f314..292fba1ace02 100644
--- a/pkgs/development/libraries/enet/default.nix
+++ b/pkgs/development/libraries/enet/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
     description = "Simple and robust network communication layer on top of UDP";
     license = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From f2dc19703a2c5e4d66442bfa9e720f3c9d811c38 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 20 May 2018 23:06:51 -0500
Subject: [PATCH 2278/3370] spidermonkey_38: add darwin support

---
 pkgs/development/interpreters/spidermonkey/38.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                   | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix
index f8fefd204e56..133679495a59 100644
--- a/pkgs/development/interpreters/spidermonkey/38.nix
+++ b/pkgs/development/interpreters/spidermonkey/38.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr }:
+{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr
+, libobjc }:
 
 stdenv.mkDerivation rec {
   version = "38.2.1.rc0";
@@ -13,7 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "0p4bmbpgkfsj54xschcny0a118jdrdgg0q29rwxigg3lh5slr681";
   };
 
-  buildInputs = [ libffi readline icu zlib nspr ];
+  buildInputs = [ libffi readline icu zlib nspr ]
+               ++ stdenv.lib.optional stdenv.isDarwin libobjc;
   nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
@@ -57,6 +59,6 @@ stdenv.mkDerivation rec {
     # TODO: MPL/GPL/LGPL tri-license.
 
     maintainers = [ maintainers.abbradar ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2649357e1b7..b4a530a5f453 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7445,7 +7445,9 @@ with pkgs;
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
   spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
-  spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { };
+  spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix {
+    inherit (darwin) libobjc;
+  };
   spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
   spidermonkey = spidermonkey_31;
 

From dadb35fdb3ac1e368e8728728b269851752f1fbc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 20 May 2018 23:07:32 -0500
Subject: [PATCH 2279/3370] nvidia-texture-tools: support darwin

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

diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix
index 034fbf34385f..77167361ff20 100644
--- a/pkgs/development/libraries/nvidia-texture-tools/default.nix
+++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     description = "A set of cuda-enabled texture tools and compressors";
     homepage = https://github.com/castano/nvidia-texture-tools;
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 04bc0bd2b77283859e18897b5e0d9ffa179cfaa6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 20 May 2018 23:49:04 -0500
Subject: [PATCH 2280/3370] freeciv: cleanup overrides

This is how we do overrides elsewhere. The "name" suffix makes things
a little bit complicated IMO. Other input welcome.
---
 pkgs/games/freeciv/default.nix  | 5 +----
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index b0bead7bbf9e..a1c1aa9b671d 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -8,14 +8,11 @@
 let
   inherit (stdenv.lib) optional optionals;
 
-  sdlName = if sdlClient then "-sdl" else "";
-  gtkName = if gtkClient then "-gtk" else "";
-
   name = "freeciv";
   version = "2.5.11";
 in
 stdenv.mkDerivation {
-  name = "${name}${sdlName}${gtkName}-${version}";
+  name = "${name}-${version}";
   inherit version;
 
   src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4a530a5f453..2866c7cb4347 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19218,7 +19218,7 @@ with pkgs;
 
   freeciv = callPackage ../games/freeciv { };
 
-  freeciv_gtk = callPackage ../games/freeciv {
+  freeciv_gtk = freeciv.override {
     gtkClient = true;
     sdlClient = false;
   };

From f22a63d533893b88e4b9d61e66291286ffa6ae92 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 21 May 2018 17:11:44 -0500
Subject: [PATCH 2281/3370] libretro: build cores on darwin

---
 pkgs/misc/emulators/retroarch/cores.nix   | 10 +++++-----
 pkgs/misc/emulators/retroarch/wrapper.nix |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index d6b3b6a98706..8c965e471e5a 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -22,9 +22,9 @@ let
       COREDIR="$out/lib/retroarch/cores"
       mkdir -p $out/bin
       mkdir -p $COREDIR
-      mv ${d2u core}_libretro.so $COREDIR/.
+      mv ${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $COREDIR/.
       makeWrapper ${retroarch}/bin/retroarch $out/bin/retroarch-${core} \
-        --add-flags "-L $COREDIR/${d2u core}_libretro.so $@"
+        --add-flags "-L $COREDIR/${d2u core}_libretro${stdenv.hostPlatform.extensions.sharedLibrary} $@"
     '';
 
     enableParallelBuilding = true;
@@ -39,7 +39,7 @@ let
       homepage = https://www.libretro.com/;
       inherit license;
       maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
-      platforms = platforms.linux;
+      platforms = platforms.unix;
     };
   } // a);
 
@@ -178,7 +178,7 @@ in with stdenv.lib.licenses;
     buildPhase = ''
       cd svn-current/trunk \
       && make -f makefile.libretro \
-      && mv fbalpha2012_libretro.so fba_libretro.so
+      && mv fbalpha2012_libretro${stdenv.hostPlatform.extensions.sharedLibrary} fba_libretro${stdenv.hostPlatform.extensions.sharedLibrary}
     '';
   };
 
@@ -412,7 +412,7 @@ in with stdenv.lib.licenses;
   }).override {
     buildPhase = ''
       make -f Makefile.libretro
-      mv snes9x2010_libretro.so snes9x_next_libretro.so
+      mv snes9x2010_libretro${stdenv.hostPlatform.extensions.sharedLibrary} snes9x_next_libretro${stdenv.hostPlatform.extensions.sharedLibrary}
     '';
   };
 
diff --git a/pkgs/misc/emulators/retroarch/wrapper.nix b/pkgs/misc/emulators/retroarch/wrapper.nix
index 71b26b4af6ff..f85d85f86217 100644
--- a/pkgs/misc/emulators/retroarch/wrapper.nix
+++ b/pkgs/misc/emulators/retroarch/wrapper.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     mkdir -p $out/lib
     $(for coreDir in $cores
     do
-      $(ln -s $coreDir/*.so $out/lib/.)
+      $(ln -s $coreDir/* $out/lib/.)
     done)
 
     ln -s -t $out ${retroarch}/share

From 9eb0301eb24883e49e3264b7bf6c574c165b033b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 21 May 2018 17:08:43 -0500
Subject: [PATCH 2282/3370] freeciv: enable on darwin

---
 pkgs/games/freeciv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix
index a1c1aa9b671d..ee93d162396d 100644
--- a/pkgs/games/freeciv/default.nix
+++ b/pkgs/games/freeciv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext
+{ stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext, libiconv
 , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth
 , gtkClient ? false, gtk2
 , server ? true, readline
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ zlib bzip2 curl lzma gettext ]
+  buildInputs = [ zlib bzip2 curl lzma gettext libiconv ]
     ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ]
     ++ optionals gtkClient [ gtk2 ]
     ++ optional server readline
@@ -50,6 +50,6 @@ stdenv.mkDerivation {
     license = licenses.gpl2;
 
     maintainers = with maintainers; [ pierron ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 9b8b29f17518ff64c128d04d3fda37da99301877 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 20 May 2018 23:45:56 -0500
Subject: [PATCH 2283/3370] gtk2: fix GNOME bug #557780

URL: https://gitlab.gnome.org/GNOME/gtk/issues/303

This patch will fix the assertion generated at startup for freeciv on
macOS. Conditionally applied on Darwin.

Gdk:ERROR:gdkimage-quartz.c:250:_gdk_image_new_for_depth: assertion failed: (depth == 24 || depth == 32)
---
 pkgs/development/libraries/gtk+/2.x.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index d35e47f312f9..d87cf25e690c 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -4,6 +4,7 @@
 , cupsSupport ? true, cups ? null
 , gdktarget ? "x11"
 , AppKit, Cocoa
+, fetchpatch
 }:
 
 assert xineramaSupport -> xorg.libXinerama != null;
@@ -28,7 +29,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ setupHook perl pkgconfig gettext gobjectIntrospection ];
 
-  patches = [ ./2.0-immodules.cache.patch ./gtk2-theme-paths.patch ];
+  patches = [
+    ./2.0-immodules.cache.patch
+    ./gtk2-theme-paths.patch
+  ] ++ optional stdenv.isDarwin (fetchpatch {
+    url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776;
+    sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r";
+  });
 
   propagatedBuildInputs = with xorg;
     [ glib cairo pango gdk_pixbuf atk ]

From 8d575415ad6c19d23406ca62f9fccac33b880313 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 22 May 2018 02:52:47 +0200
Subject: [PATCH 2284/3370] wireguard: fix up text, maintainer, and version

---
 pkgs/os-specific/linux/wireguard/default.nix      | 6 ++----
 pkgs/tools/networking/wireguard-go/default.nix    | 4 ++--
 pkgs/tools/networking/wireguard-tools/default.nix | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix
index ae31edcaaede..acb159a4acc9 100644
--- a/pkgs/os-specific/linux/wireguard/default.nix
+++ b/pkgs/os-specific/linux/wireguard/default.nix
@@ -5,9 +5,7 @@ assert stdenv.lib.versionAtLeast kernel.version "3.10";
 
 stdenv.mkDerivation rec {
   name = "wireguard-${version}";
-  version = "0.0.20180514";
-
-  inherit (wireguard-tools) src;
+  inherit (wireguard-tools) src version;
 
   preConfigure = ''
     cd src
@@ -28,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage     = https://www.wireguard.com/;
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
-    description  = " Tools for the WireGuard secure network tunnel";
+    description  = "Kernel module for the WireGuard secure network tunnel";
     maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
     license      = licenses.gpl2;
     platforms    = platforms.linux;
diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 4dc6e52b2e94..37220acf8cf8 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -22,7 +22,7 @@ buildGoPackage rec {
     description = "Userspace Go implementation of WireGuard";
     homepage = https://git.zx2c4.com/wireguard-go/about/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ kirelagin ];
-    platforms = with platforms; darwin;
+    maintainers = with maintainers; [ kirelagin zx2c4 ];
+    platforms = platforms.darwin;
   };
 }
diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index c9e48d61c359..8ebe18906f64 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage     = https://www.wireguard.com/;
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
-    description  = " Tools for the WireGuard secure network tunnel";
+    description  = "Tools for the WireGuard secure network tunnel";
     maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
     license      = licenses.gpl2;
     platforms    = platforms.unix;

From b6f2e75d75a0bd53bb207b7b1b210881c73c9e59 Mon Sep 17 00:00:00 2001
From: Kevin Liu <kevin@potatofrom.space>
Date: Mon, 21 May 2018 21:07:24 -0400
Subject: [PATCH 2285/3370] kubernetes-dashboard: raise memory limit to 250MB

On my cluster, I often get OOM errors that cause the dashboard to crash just by going over 50MB.
---
 nixos/modules/services/cluster/kubernetes/dashboard.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
index e331889b9dd5..d27389b6a1c7 100644
--- a/nixos/modules/services/cluster/kubernetes/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -70,7 +70,7 @@ in {
                 resources = {
                   limits = {
                     cpu = "100m";
-                    memory = "50Mi";
+                    memory = "250Mi";
                   };
                   requests = {
                     cpu = "100m";

From e9e044abbb96012a0d4761272132f3d20ceb5577 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 22 May 2018 04:17:09 +0300
Subject: [PATCH 2286/3370] wireguard-tools: clean up, wrap w/ wireguard-go on
 Darwin

---
 .../networking/wireguard-tools/default.nix    | 40 +++++++++----------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 8ebe18906f64..c43e7548364e 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -1,46 +1,44 @@
-{ stdenv, lib, fetchzip, libmnl, useSystemd ? stdenv.isLinux }:
+{ stdenv, fetchzip, libmnl ? null, makeWrapper ? null, wireguard-go ? null }:
 
-let
-  inherit (lib) optional optionalString;
-in
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
   version = "0.0.20180519";
 
   src = fetchzip {
-    url    = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
+    url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
     sha256 = "0pd04ia0wcm0f6di4gx5kflccc5j35d72j38l8jqpj8vinl6l070";
   };
 
-  preConfigure = "cd src";
+  sourceRoot = "source/src/tools";
 
-  buildInputs = optional stdenv.isLinux libmnl;
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ (optional stdenv.isDarwin makeWrapper) ];
+  buildInputs = [ (optional stdenv.isLinux libmnl) ];
 
   makeFlags = [
-    "WITH_BASHCOMPLETION=yes"
-    "WITH_WGQUICK=yes"
-    "WITH_SYSTEMDUNITS=${if useSystemd then "yes" else "no"}"
     "DESTDIR=$(out)"
     "PREFIX=/"
-    "-C" "tools"
+    "WITH_BASHCOMPLETION=yes"
+    "WITH_SYSTEMDUNITS=yes"
+    "WITH_WGQUICK=yes"
   ];
 
-  buildPhase = "make tools";
-
-  postInstall = optionalString useSystemd ''
+  postFixup = ''
     substituteInPlace $out/lib/systemd/system/wg-quick@.service \
       --replace /usr/bin $out/bin
+  '' + optionalString stdenv.isDarwin ''
+    for f in $out/bin/*; do
+      wrapProgram $f --prefix PATH : ${wireguard-go}/bin
+    done
   '';
 
   meta = with stdenv.lib; {
-    homepage     = https://www.wireguard.com/;
+    description = "Tools for the WireGuard secure network tunnel";
     downloadPage = https://git.zx2c4.com/WireGuard/refs/;
-    description  = "Tools for the WireGuard secure network tunnel";
-    maintainers  = with maintainers; [ ericsagnes mic92 zx2c4 ];
-    license      = licenses.gpl2;
-    platforms    = platforms.unix;
+    homepage = https://www.wireguard.com/;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ ericsagnes mic92 zx2c4 ];
+    platforms = platforms.unix;
   };
 }

From 320e504d4d91cb28a33bf2b22257da3866f50e82 Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Thu, 17 May 2018 23:38:44 -0400
Subject: [PATCH 2287/3370] hadoop: 2.2.0 -> 2.7.6, 2.8.6, 2.9.1, 3.0.2, 3.1.0

---
 .../networking/cluster/hadoop/default.nix     | 105 +++++++++++-------
 pkgs/top-level/all-packages.nix               |   8 +-
 2 files changed, 72 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index 9af4cf3f0ed6..a9e7325d181f 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -1,51 +1,76 @@
 { stdenv, fetchurl, makeWrapper, which, jre, bash }:
 
-stdenv.mkDerivation rec {
+let 
+  hadoopDerivation = { version, sha256 }: stdenv.mkDerivation rec {
 
-  name = "hadoop-2.2.0";
+    name = "hadoop-${version}";
 
-  src = fetchurl {
-    url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz";
-    sha256 = "0r0kx8arsrvmcfy0693hpv4cz3i0razvk1xa3yhlf3ybb80a8106";
-  };
+    src = fetchurl {
+      url = "mirror://apache/hadoop/common/${name}/${name}.tar.gz";
+      sha256 = "${sha256}";
+    };
 
-  buildInputs = [ makeWrapper ];
+    buildInputs = [ makeWrapper ];
 
-  buildPhase = ''
-    for n in "bin/"* "sbin/"*; do
+    buildPhase = ''
+      for n in bin/{hadoop,hdfs,mapred,yarn} sbin/*.sh; do
       sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|"
-    done
-  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor;
-  '';
-
-  installPhase = ''
-    mkdir -p $out
-    mv *.txt share/doc/hadoop/
-    mv * $out
-
-    for n in $out/{bin,sbin}"/"*; do
-      wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_PREFIX "$out"
-    done
-  '';
-
-  meta = {
-    homepage = http://hadoop.apache.org/;
-    description = "Framework for distributed processing of large data sets across clusters of computers";
-    license = stdenv.lib.licenses.asl20;
-
-    longDescription = ''
-      The Apache Hadoop software library is a framework that allows for
-      the distributed processing of large data sets across clusters of
-      computers using a simple programming model. It is designed to
-      scale up from single servers to thousands of machines, each
-      offering local computation and storage. Rather than rely on
-      hardware to deliver high-avaiability, the library itself is
-      designed to detect and handle failures at the application layer,
-      so delivering a highly-availabile service on top of a cluster of
-      computers, each of which may be prone to failures.
+      done
+    '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor;
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/test-container-executor;
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    installPhase = ''
+      mkdir -p $out
+      mv *.txt share/doc/hadoop/
+      mv * $out
+
+      for n in $out/bin/{hadoop,hdfs,mapred,yarn} $out/sbin/*.sh; do
+      wrapProgram $n --prefix PATH : "${stdenv.lib.makeBinPath [ which jre bash ]}" --set JAVA_HOME "${jre}" --set HADOOP_HOME "$out"
+      done
+    '';
+
+    meta = {
+      homepage = http://hadoop.apache.org/;
+      description = "Framework for distributed processing of large data sets across clusters of computers";
+      license = stdenv.lib.licenses.asl20;
+
+      longDescription = ''
+        The Apache Hadoop software library is a framework that allows for
+        the distributed processing of large data sets across clusters of
+        computers using a simple programming model. It is designed to
+        scale up from single servers to thousands of machines, each
+        offering local computation and storage. Rather than rely on
+        hardware to deliver high-avaiability, the library itself is
+        designed to detect and handle failures at the application layer,
+        so delivering a highly-availabile service on top of a cluster of
+        computers, each of which may be prone to failures.
+      '';
+
+      platforms = stdenv.lib.platforms.linux;
+    };
+  };
+in
+{
+  hadoop_2_7 = hadoopDerivation {
+    version = "2.7.6";
+    sha256 = "0sanwam0k2m40pfsf9l5zxvklv8rvq78xvhd2pbsbiab7ylpwcpj";
+  };
+  hadoop_2_8 = hadoopDerivation {
+    version = "2.8.4";
+    sha256 = "05dik4qnazhf5aldwkljf610cwncsg5y3hyvgj476cfpzmr5jm3b";
+  };
+  hadoop_2_9 = hadoopDerivation {
+    version = "2.9.1";
+    sha256 = "1z22v46mmq9hfjc229x61ws332sa1rvmib3v4jsd6i1n29d03mpf";
+  };
+  hadoop_3_0 = hadoopDerivation {
+    version = "3.0.2";
+    sha256 = "10ig3rrcaizvs5bnni15fvm942mr5hfc2hr355g6ich722kpll0d";
+  };
+  hadoop_3_1 = hadoopDerivation { 
+    version = "3.1.0";
+    sha256 = "1rs3a752is1y2vgxjlqmmln00iwzncwlwg59l6gjv92zb7njq3b7";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 698a0c8ed30f..f30235f86778 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7100,7 +7100,13 @@ with pkgs;
 
   guile = guile_2_2;
 
-  hadoop = callPackage ../applications/networking/cluster/hadoop { };
+  inherit (callPackage ../applications/networking/cluster/hadoop { })
+    hadoop_2_7
+    hadoop_2_8
+    hadoop_2_9
+    hadoop_3_0
+    hadoop_3_1;
+  hadoop = hadoop_2_7;
 
   io = callPackage ../development/interpreters/io { };
 

From fe56ad70f0d6b38811fc2a8e2eeeb98047cac2bd Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 22 May 2018 01:29:28 +0200
Subject: [PATCH 2288/3370] oracle-instantclient: simplify, use
 autoPatchelfHook

Split `buildCommand`, provide `unpackCmd` and add `installPhase`.

Use autoPatchelfHook, we can get rid of all the manual hacking around
with patchelf.

Use install to install to $out
---
 .../oracle-instantclient/default.nix          | 61 +++++--------------
 1 file changed, 15 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index a4a31260c219..16a9d6af5ba6 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,9 +1,7 @@
-{ stdenv, requireFile, glibc, patchelf, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
+{ stdenv, requireFile, autoPatchelfHook, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
 
 assert odbcSupport -> unixODBC != null;
 
-with stdenv.lib;
-
 let
     baseVersion = "12.2";
     requireSource = version: rel: part: hash: (requireFile rec {
@@ -27,56 +25,27 @@ in stdenv.mkDerivation rec {
   version = "${baseVersion}.0.1.0";
   name = "oracle-instantclient-${version}";
 
-  srcBase = (requireSource version "1" "basic" "43c4bfa938af741ae0f9964a656f36a0700849f5780a2887c8e9f1be14fe8b66");
-  srcDevel = (requireSource version "1" "devel" "4c7ad8d977f9f908e47c5e71ce56c2a40c7dc83cec8a5c106b9ff06d45bb3442");
-  srcSqlplus = (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552");
-  srcOdbc = optionalString odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1");
+  buildInputs = [ libaio stdenv.cc.cc.lib ] ++ stdenv.lib.optional odbcSupport unixODBC;
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper rpmextract ];
 
-  buildInputs = [ glibc ] ++
-    optional odbcSupport unixODBC;
+  srcs = [
+    (requireSource version "1" "basic" "43c4bfa938af741ae0f9964a656f36a0700849f5780a2887c8e9f1be14fe8b66")
+    (requireSource version "1" "devel" "4c7ad8d977f9f908e47c5e71ce56c2a40c7dc83cec8a5c106b9ff06d45bb3442")
+    (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552")
+  ] ++ stdenv.lib.optional odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1");
 
-  nativeBuildInputs = [ rpmextract patchelf makeWrapper ];
+  unpackCmd = "rpmextract $curSrc";
 
-  buildCommand = ''
-    mkdir -p "${name}"
-    cd "${name}"
-    ${rpmextract}/bin/rpmextract "${srcBase}"
-    ${rpmextract}/bin/rpmextract "${srcDevel}"
-    ${rpmextract}/bin/rpmextract "${srcSqlplus}"
-    '' + optionalString odbcSupport ''${rpmextract}/bin/rpmextract ${srcOdbc}
-    '' + ''
+  installPhase = ''
     mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"}
-    mv "usr/share/oracle/${baseVersion}/client64/demo/"* "$out/share/${name}/demo/"
-    mv "usr/include/oracle/${baseVersion}/client64/"* "$out/include/"
-    mv "usr/lib/oracle/${baseVersion}/client64/lib/"* "$out/lib/"
-    mv "usr/lib/oracle/${baseVersion}/client64/bin/"* "$out/bin/"
-    ln -s "$out/bin/sqlplus" "$out/bin/sqlplus64"
 
-    for lib in $out/lib/lib*.so; do
-      test -f $lib || continue
-      chmod +x $lib
-      patchelf --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
-               $lib
-    done
-
-    for lib in $out/lib/libsqora*; do
-      test -f $lib || continue
-      chmod +x $lib
-      patchelf --force-rpath --set-rpath "$out/lib:${unixODBC}/lib" \
-               $lib
-    done
-
-    for exe in $out/bin/{adrci,genezi,sqlplus}; do
-      patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-               --force-rpath --set-rpath "$out/lib:${libaio}/lib" \
-               $exe
-      wrapProgram $exe --prefix LD_LIBRARY_PATH ":" $out/lib
-    done
+    install -Dm755 lib/oracle/${baseVersion}/client64/bin/* $out/bin
+    ln -s $out/bin/sqlplus $out/bin/sqlplus64
+    install -Dm644 lib/oracle/${baseVersion}/client64/lib/* $out/lib
+    install -Dm644 include/oracle/${baseVersion}/client64/* $out/include
+    install -Dm644 share/oracle/${baseVersion}/client64/demo/* $out/share/${name}/demo
   '';
 
-  dontStrip = true;
-  dontPatchELF = true;
-
   meta = with stdenv.lib; {
     description = "Oracle instant client libraries and sqlplus CLI";
     longDescription = ''

From 9770699ebd11bb5235a59d1f247faea3f9e601b1 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 22 May 2018 02:00:46 +0200
Subject: [PATCH 2289/3370] oracle-instantclient: disable building on hydra

we requireFile, so hydra can't build it anyways.
---
 pkgs/development/libraries/oracle-instantclient/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 16a9d6af5ba6..7e0f2e1cf903 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -56,5 +56,6 @@ in stdenv.mkDerivation rec {
     license = licenses.unfree;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ pesterhazy flokli ];
+    hydraPlatforms = [];
   };
 }

From 888e22cbd94fe27fa10500d58fe4c3c73e16ee3d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 May 2018 21:36:52 -0400
Subject: [PATCH 2290/3370] ammonite: 1.1.0 -> 1.1.2

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

diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix
index beebd8ada9bb..f139e296d35e 100644
--- a/pkgs/development/tools/ammonite/default.nix
+++ b/pkgs/development/tools/ammonite/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, lib, fetchurl, makeWrapper, jre
+{ stdenv, lib, fetchurl, makeWrapper, jre, gnused
 , disableRemoteLogging ? true
 }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ammonite-${version}";
-  version = "1.1.0";
+  version = "1.1.2";
   scalaVersion = "2.12";
 
   src = fetchurl {
     url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}";
-    sha256 = "0dx5w1ffnqazsyp6zxrmfcn7yhkkd81h7njwbqqv1pbchj5znj6l";
+    sha256 = "1balr7ya7xlyq32jwb0w9c4klnw13mdn2c5azkwngq5cp29yrfrc";
   };
 
   propagatedBuildInputs = [ jre ] ;
-  buildInputs = [ makeWrapper ] ;
+  buildInputs = [ makeWrapper gnused ] ;
 
   phases = "installPhase";
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp ${src} $out/bin/amm
     chmod +x $out/bin/amm
-    wrapProgram $out/bin/amm \
-      ${optionalString disableRemoteLogging "--add-flags --no-remote-logging"} \
-      --prefix PATH ":" ${jre}/bin ;
+    ${gnused}/bin/sed -i '0,/java/{s|java|${jre}/bin/java|}' $out/bin/amm
+  '' + optionalString (disableRemoteLogging) ''
+    ${gnused}/bin/sed -i '0,/ammonite.Main/{s|ammonite.Main|ammonite.Main --no-remote-logging|}' $out/bin/amm
   '';
 
   meta = {

From 9689754805873dc7ebb5b36c618b654f0d8ea8f9 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 21 May 2018 17:13:14 +0800
Subject: [PATCH 2291/3370] vala: 0.36, 0.38 and 0.40 point upgrades

---
 pkgs/development/compilers/vala/default.nix | 33 ++++++++++++---------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index f36bea42e2a8..569574147f1b 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -1,10 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz
+{ stdenv, lib, fetchurl, pkgconfig, flex, bison, libxslt, autoconf, graphviz
 , glib, libiconv, libintl, libtool, expat
 }:
 
 let
   generic = { major, minor, sha256, extraNativeBuildInputs ? [], extraBuildInputs ? [] }:
-  stdenv.mkDerivation rec {
+  let
+    atLeast = lib.versionAtLeast "${major}.${minor}";
+  in stdenv.mkDerivation rec {
     name = "vala-${major}.${minor}";
 
     src = fetchurl {
@@ -14,9 +16,15 @@ let
 
     outputs = [ "out" "devdoc" ];
 
-    nativeBuildInputs = [ pkgconfig flex bison libxslt ] ++ extraNativeBuildInputs;
+    nativeBuildInputs = [
+      pkgconfig flex bison libxslt
+    ] ++ lib.optional (stdenv.isDarwin && (atLeast "0.38")) expat
+      ++ extraNativeBuildInputs;
 
-    buildInputs = [ glib libiconv libintl ] ++ extraBuildInputs;
+    buildInputs = [
+      glib libiconv libintl
+    ] ++ lib.optional (atLeast "0.38") graphviz
+      ++ extraBuildInputs;
 
     meta = with stdenv.lib; {
       description = "Compiler for GObject type system";
@@ -61,24 +69,21 @@ in rec {
 
   vala_0_36 = generic {
     major   = "0.36";
-    minor   = "12";
-    sha256  = "1nvw721piwdh15bipg0sdll9kvgpz0y9i5fpszlc7y9w64yis25l";
+    minor   = "13";
+    sha256  = "0gxz7yisd9vh5d2889p60knaifz5zndgj98zkdfkkaykdfdq4m9k";
   };
 
   vala_0_38 = generic {
     major   = "0.38";
-    minor   = "4";
-    sha256  = "1sg5gaq3jhgr9vzh2ypiw475167k150wmyglymr7wwqppmikmcrc";
-    extraNativeBuildInputs = [ autoconf ] ++ stdenv.lib.optionals stdenv.isDarwin [ libtool expat ];
-    extraBuildInputs = [ graphviz ];
+    minor   = "9";
+    sha256  = "1dh1qacfsc1nr6hxwhn9lqmhnq39rv8gxbapdmj1v65zs96j3fn3";
+    extraNativeBuildInputs = [ autoconf ] ++ lib.optional stdenv.isDarwin libtool;
   };
 
   vala_0_40 = generic {
     major   = "0.40";
-    minor   = "0";
-    sha256  = "0wcfljl55a9qvslfcc4sf76wdpwgn83n96b7fgb7r49ib35qz20m";
-    extraNativeBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ expat ];
-    extraBuildInputs = [ graphviz ];
+    minor   = "6";
+    sha256  = "1qjbwhifwwqbdg5zilvnwm4n76g8p7jwqs3fa0biw3rylzqm193d";
   };
 
   vala = vala_0_38;

From 015052f484e3f47bc2039aaacbbea3ec57aeac93 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 22 May 2018 08:39:25 +0800
Subject: [PATCH 2292/3370] vala: drop 0.23

---
 pkgs/development/compilers/vala/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index 569574147f1b..f3dc24870272 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -37,12 +37,6 @@ let
 
 in rec {
 
-  vala_0_23 = generic {
-    major   = "0.23";
-    minor   = "3";
-    sha256  = "101xjbc818g4849n9a80c2aai13zakj7mpnd7470xnkvz5jwqq96";
-  };
-
   vala_0_26 = generic {
     major   = "0.26";
     minor   = "2";

From ae23bb2bccb23816525c98f1392b56cda6bd3918 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 22 May 2018 05:49:20 +0000
Subject: [PATCH 2293/3370] proverif: 1.97pl1 -> 2.00

---
 pkgs/applications/science/logic/proverif/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/proverif/default.nix b/pkgs/applications/science/logic/proverif/default.nix
index 6fe45e653dc5..c70ee610199f 100644
--- a/pkgs/applications/science/logic/proverif/default.nix
+++ b/pkgs/applications/science/logic/proverif/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, ocaml }:
+{ stdenv, fetchurl, ocamlPackages }:
 
 stdenv.mkDerivation rec {
   name = "proverif-${version}";
-  version = "1.97pl1";
+  version = "2.00";
 
   src = fetchurl {
     url    = "http://prosecco.gforge.inria.fr/personal/bblanche/proverif/proverif${version}.tar.gz";
-    sha256 = "1b0ji68crdli40a4z62gdq6fnygj3z2j63iaq4jki7wfc3nn3vgq";
+    sha256 = "0vjphj85ch9q39vc7sd6n4vxy5bplp017vlshk989yhfwb00r37y";
   };
 
-  buildInputs = [ ocaml ];
+  buildInputs = with ocamlPackages; [ ocaml findlib lablgtk ];
 
   buildPhase = "./build";
   installPhase = ''

From 090b7cc8f1bae880fc5542987ede2bcb444d20bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 22 May 2018 08:14:19 +0100
Subject: [PATCH 2294/3370] purple-xmpp-http-upload: use date of commit as
 version

---
 .../pidgin-plugins/purple-xmpp-http-upload/default.nix       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
index a3743e235b39..8990aeee8ec0 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchgit, pidgin, glib, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "purple-xmpp-upload-${version}";
-  version = "178096cbfc9df165c2dc1677666439969d212b37";
+  name = "purple-xmpp-upload-2017-12-31";
 
   src = fetchgit {
     url = "https://github.com/Junker/purple-xmpp-http-upload";
-    rev = version;
+    rev = "178096cbfc9df165c2dc1677666439969d212b37";
     sha256 = "12l9rqlgb4i50xxrfnvwz9sqfk0d3c0m6l09mnvfixqi8illyvlp";
   };
 

From 131228c29d4647e0a43ee856f5600ed4f8a8b0a4 Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <middendorf@plapadoo.de>
Date: Mon, 21 May 2018 19:28:22 +0200
Subject: [PATCH 2295/3370] pyogg: init at 0.6.2a1

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

diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix
new file mode 100644
index 000000000000..08fc87127959
--- /dev/null
+++ b/pkgs/development/python-modules/pyogg/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchPypi, buildPythonPackage, fetchurl, libvorbis, flac, libogg, libopus, opusfile }:
+
+buildPythonPackage rec {
+    pname = "PyOgg";
+    version = "0.6.2a1";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1mjh5zx7mfy246lya1qc42j4q4pz6v5zbd8blnfib9ncswcb1v6l";
+    };
+
+    buildInputs = [ libvorbis flac libogg libopus ];
+    propagatedBuidInputs = [ libvorbis flac libogg libopus opusfile ];
+    # There are no tests in this package.
+    doCheck = false;
+    postPatch = ''
+      substituteInPlace pyogg/vorbis.py --replace \
+        'libvorbisfile = ExternalLibrary.load("vorbisfile")' "libvorbisfile = ctypes.CDLL('${libvorbis}/lib/libvorbisfile${stdenv.hostPlatform.extensions.sharedLibrary}')"
+      substituteInPlace pyogg/vorbis.py --replace \
+        'libvorbisenc = ExternalLibrary.load("vorbisenc")' "libvorbisenc = ctypes.CDLL('${libvorbis}/lib/libvorbisenc${stdenv.hostPlatform.extensions.sharedLibrary}')"
+      substituteInPlace pyogg/vorbis.py --replace \
+        'libvorbis = ExternalLibrary.load("vorbis")' "libvorbis = ctypes.CDLL('${libvorbis}/lib/libvorbis${stdenv.hostPlatform.extensions.sharedLibrary}')"
+      substituteInPlace pyogg/flac.py --replace \
+        'libflac = ExternalLibrary.load("flac")' "libflac = ctypes.CDLL('${flac.out}/lib/libFLAC${stdenv.hostPlatform.extensions.sharedLibrary}')"
+      substituteInPlace pyogg/ogg.py --replace \
+        'libogg = ExternalLibrary.load("ogg")' "libogg = ctypes.CDLL('${libogg}/lib/libogg${stdenv.hostPlatform.extensions.sharedLibrary}')"
+      substituteInPlace pyogg/opus.py --replace \
+        'libopus = ExternalLibrary.load("opus")' "libopus = ctypes.CDLL('${libopus}/lib/libopus${stdenv.hostPlatform.extensions.sharedLibrary}')"
+      substituteInPlace pyogg/opus.py --replace \
+        'libopusfile = ExternalLibrary.load("opusfile")' "libopusfile = ctypes.CDLL('${opusfile}/lib/libopusfile${stdenv.hostPlatform.extensions.sharedLibrary}')"
+    '';
+
+  meta = {
+    description = "Xiph.org's Ogg Vorbis, Opus and FLAC for Python";
+    homepage = https://github.com/Zuzu-Typ/PyOgg;
+    license = lib.licenses.publicDomain;
+    maintainers = with lib.maintainers; [ pmiddend ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 204a49e63b48..1e7acc656352 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18196,6 +18196,8 @@ EOF
   prometheus_client = callPackage ../development/python-modules/prometheus_client { };
 
   pysdl2 = callPackage ../development/python-modules/pysdl2 { };
+
+  pyogg = callPackage ../development/python-modules/pyogg { };
 });
 
 in fix' (extends overrides packages)

From 2ad8e9a9782f8b208b4dc666b7e773e951f8d5e7 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 22 May 2018 09:40:00 +0200
Subject: [PATCH 2296/3370] atom, atom-beta: 1.27.0 -> 1.27.1, 1.24.0-beta3 ->
 1.28.0-beta1

Also rewrote the derivation for easier maintencence.

(And added @ysndr as maintainer for atom-beta, kind of an implicit
result of joining the two. If you're not okay with that, I'll patch
you out, but I'll presume consent.)
---
 pkgs/applications/editors/atom/beta.nix    |  52 ----------
 pkgs/applications/editors/atom/default.nix | 108 ++++++++++++---------
 pkgs/top-level/all-packages.nix            |   5 +-
 3 files changed, 65 insertions(+), 100 deletions(-)
 delete mode 100644 pkgs/applications/editors/atom/beta.nix

diff --git a/pkgs/applications/editors/atom/beta.nix b/pkgs/applications/editors/atom/beta.nix
deleted file mode 100644
index 0734da173e5f..000000000000
--- a/pkgs/applications/editors/atom/beta.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
-
-stdenv.mkDerivation rec {
-  name = "atom-beta-${version}";
-  version = "1.24.0-beta3";
-
-  src = fetchurl {
-    url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "02nnjjwlkxafi2fbi4gz276nqkmi92kf3q414vw1k3kc8q5zvxrs";
-    name = "${name}.deb";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    mkdir -p $out/usr/
-    ar p $src data.tar.xz | tar -C $out -xJ ./usr
-    substituteInPlace $out/usr/share/applications/atom-beta.desktop \
-      --replace /usr/share/atom-beta $out/bin
-    mv $out/usr/* $out/
-    rm -r $out/share/lintian
-    rm -r $out/usr/
-    sed -i "s/'atom-beta'/'.atom-beta-wrapped'/" $out/bin/atom-beta
-    wrapProgram $out/bin/atom-beta \
-      --prefix "PATH" : "${gvfs}/bin"
-
-    fixupPhase
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" \
-      $out/share/atom-beta/atom
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${atomEnv.libPath}" \
-      $out/share/atom-beta/resources/app/apm/bin/node
-
-    #rm -f $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git
-    #ln -s ${pkgs.git}/bin/git $out/share/atom-beta/resources/app/node_modules/dugite/git/bin/git
-
-    find $out/share/atom-beta -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom-beta" {} \;
-
-    paxmark m $out/share/atom-beta/atom
-    paxmark m $out/share/atom-beta/resources/app/apm/bin/node
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A hackable text editor for the 21st Century";
-    homepage = https://atom.io/;
-    license = licenses.mit;
-    maintainers = [ maintainers.offline maintainers.nequissimus ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 225ec6a9456f..7a88d761a345 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,53 +1,69 @@
 { stdenv, pkgs, fetchurl, lib, makeWrapper, gvfs, atomEnv}:
 
-stdenv.mkDerivation rec {
-  name = "atom-${version}";
-  version = "1.27.0";
+let
+  common = pname: {version, sha256}: stdenv.mkDerivation rec {
+    name = "${pname}-${version}";
+    inherit version;
 
-  src = fetchurl {
-    url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1r37s6ndxyib644v7nlgha1pkcnz7kxpmlkhh41l5jp4dpc6iik6";
-    name = "${name}.deb";
+    src = fetchurl {
+      url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
+      name = "${name}.deb";
+      inherit sha256;
+    };
+
+    nativeBuildInputs = [ makeWrapper ];
+
+    buildCommand = ''
+      mkdir -p $out/usr/
+      ar p $src data.tar.xz | tar -C $out -xJ ./usr
+      substituteInPlace $out/usr/share/applications/${pname}.desktop \
+        --replace /usr/share/${pname} $out/bin
+      mv $out/usr/* $out/
+      rm -r $out/share/lintian
+      rm -r $out/usr/
+      # sed -i "s/'${pname}'/'.${pname}-wrapped'/" $out/bin/${pname}
+      wrapProgram $out/bin/${pname} \
+        --prefix "PATH" : "${gvfs}/bin"
+
+      fixupPhase
+
+      share=$out/share/${pname}
+
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "${atomEnv.libPath}:$share" \
+        $share/atom
+      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+        --set-rpath "${atomEnv.libPath}" \
+        $share/resources/app/apm/bin/node
+
+      dugite=$share/resources/app.asar.unpacked/node_modules/dugite
+      rm -f $dugite/git/bin/git
+      ln -s ${pkgs.git}/bin/git $dugite/git/bin/git
+      rm -f $dugite/git/libexec/git-core/git
+      ln -s ${pkgs.git}/bin/git $dugite/git/libexec/git-core/git
+
+      find $share -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$share" {} \;
+
+      paxmark m $share/atom
+      paxmark m $share/resources/app/apm/bin/node
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A hackable text editor for the 21st Century";
+      homepage = https://atom.io/;
+      license = licenses.mit;
+      maintainers = with maintainers; [ offline nequissimus synthetica ysndr ];
+      platforms = [ "x86_64-linux" ];
+    };
+  };
+in stdenv.lib.mapAttrs common {
+  atom = {
+    version = "1.27.1";
+    sha256 = "08slv8s90wz2jcdrcqh2d815wfbrkwcdx9c3qbx8cml04hz8p2gx";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    mkdir -p $out/usr/
-    ar p $src data.tar.xz | tar -C $out -xJ ./usr
-    substituteInPlace $out/usr/share/applications/atom.desktop \
-      --replace /usr/share/atom $out/bin
-    mv $out/usr/* $out/
-    rm -r $out/share/lintian
-    rm -r $out/usr/
-    wrapProgram $out/bin/atom \
-      --prefix "PATH" : "${gvfs}/bin"
-
-    fixupPhase
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${atomEnv.libPath}:$out/share/atom" \
-      $out/share/atom/atom
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${atomEnv.libPath}" \
-      $out/share/atom/resources/app/apm/bin/node
-
-    rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
-    ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/bin/git
-    rm -f $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git
-    ln -s ${pkgs.git}/bin/git $out/share/atom/resources/app.asar.unpacked/node_modules/dugite/git/libexec/git-core/git
-
-    find $out/share/atom -name "*.node" -exec patchelf --set-rpath "${atomEnv.libPath}:$out/share/atom" {} \;
-
-    paxmark m $out/share/atom/atom
-    paxmark m $out/share/atom/resources/app/apm/bin/node
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A hackable text editor for the 21st Century";
-    homepage = https://atom.io/;
-    license = licenses.mit;
-    maintainers = with maintainers; [ offline nequissimus synthetica ysndr ];
-    platforms = [ "x86_64-linux" ];
+  atom-beta = {
+    version = "1.28.0-beta1";
+    sha256 = "1mkxq2a7sylj9jx1bs2v1pmgrwc10cgh810qic1lncq9jzpaik0n";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1129a984d271..5ff8b5120063 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14856,8 +14856,9 @@ with pkgs;
     gconf = gnome2.GConf;
   };
 
-  atom = callPackage ../applications/editors/atom { };
-  atom-beta = callPackage ../applications/editors/atom/beta.nix { };
+  atomPackages = callPackage ../applications/editors/atom { };
+
+  inherit (atomPackages) atom atom-beta;
 
   aseprite = callPackage ../applications/editors/aseprite { };
   aseprite-unfree = aseprite.override { unfree = true; };

From 3e2a3b4f12f1b079a990a95761f1546c8b9856cf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 21 May 2018 13:17:08 +0200
Subject: [PATCH 2297/3370] hackage2nix: keep haddock-library 1.5.x around

---
 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 418310581812..8b2b98b1729b 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2418,6 +2418,7 @@ extra-packages:
   - haddock-library == 1.2.*            # required for haddock-api-2.16.x
   - haddock-library == 1.4.3            # required for haddock-api-2.17.x
   - haddock-library == 1.4.4            # required for haddock-api-2.18.x
+  - haddock-library == 1.5.*            # required for stylish-cabal-0.4.0.1
   - 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 e9d991a938a9a100ac29aee216f8987df495b7c3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 21 May 2018 13:19:08 +0200
Subject: [PATCH 2298/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/a5d0811a160ed979c4fa287ba0d552574caa9a4e.
---
 .../haskell-modules/hackage-packages.nix      | 856 +++++++++++++-----
 1 file changed, 623 insertions(+), 233 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index b6f5c57c73c7..8820a54d08ff 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -9359,6 +9359,19 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "HasBigDecimal" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "HasBigDecimal";
+       version = "0.1.1";
+       sha256 = "0ddyngd1mrx9s11nm7sh0nh76zi1zi7yjzmqk7xbpv6ijqka050a";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/thma/HasBigDecimal#readme";
+       description = "A library for arbitrary precision decimal numbers";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "HasCacBDD" = callPackage
     ({ mkDerivation, base, Cabal, CacBDD, directory, process
      , QuickCheck
@@ -11033,6 +11046,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels-scale-dct_0_1_2" = callPackage
+    ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels, time
+     }:
+     mkDerivation {
+       pname = "JuicyPixels-scale-dct";
+       version = "0.1.2";
+       sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p";
+       libraryHaskellDepends = [
+         base base-compat carray fft JuicyPixels
+       ];
+       testHaskellDepends = [
+         base base-compat carray fft JuicyPixels time
+       ];
+       homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme";
+       description = "Scale JuicyPixels images with DCT";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-stbir" = callPackage
     ({ mkDerivation, base, c2hs, data-default-class, JuicyPixels
      , vector
@@ -27733,8 +27765,8 @@ self: {
      }:
      mkDerivation {
        pname = "animate";
-       version = "0.6.1";
-       sha256 = "1mjjng8mr8r6gly822nah3ps4phgydfnyggyz43n5bhdr17f37f9";
+       version = "0.7.0";
+       sha256 = "1xkp7zpbls02didfks9980989riixpklm31m7by3gsxq7mmyd6gn";
        libraryHaskellDepends = [
          aeson base bytestring containers text vector yaml
        ];
@@ -27795,8 +27827,8 @@ self: {
     ({ mkDerivation, aeson, animate, base, sdl2, sdl2-image }:
      mkDerivation {
        pname = "animate-sdl2";
-       version = "0.1.0";
-       sha256 = "1wzwhhv6x098y3pkpssxx7y1cb69z1bb2gsa2r8prg729y664648";
+       version = "0.1.1";
+       sha256 = "0wpx0jv2zyphhxi84bw4h1bw6apbazcadfxzzj90ddc3cb5lhv9n";
        libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
        homepage = "https://github.com/jxv/animate-sdl2#readme";
        description = "sdl2 + animate auxiliary library";
@@ -31164,8 +31196,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.2.0.26";
-       sha256 = "14s8bic1kvsigmi5nmjdca6pkh223axygr74nmygjbvwmryfxcxn";
+       version = "0.2.0.27";
+       sha256 = "11ln9nkdn5f8fklpddhypf02nkp8ya47kpfg4dbw86wk3h37862z";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -31180,30 +31212,31 @@ self: {
 
   "ats-pkg" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
-     , Cabal, cli-setup, composition-prelude, containers, dependency
-     , dhall, directory, file-embed, filemanip, hashable, http-client
-     , http-client-tls, lens, lzma, mtl, optparse-applicative
-     , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary
-     , text, unix, zip-archive, zlib
+     , Cabal, cli-setup, composition-prelude, containers, cpphs
+     , dependency, dhall, directory, file-embed, filemanip, hashable
+     , http-client, http-client-tls, lzma, microlens, microlens-th, mtl
+     , optparse-applicative, parallel-io, process, shake, shake-ats
+     , shake-ext, tar, temporary, text, unix, zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.10.1.5";
-       sha256 = "14y4mpk6hkqvw8jh49idj9gx2wxcy2ppz00abny6fsbw6iff4xrs";
+       version = "2.10.1.8";
+       sha256 = "1i6dm3w5qw5xbhlzlazbp6klr31j4qajyqdwdq5r38scascdhjbq";
        revision = "1";
-       editedCabalFile = "0ff0nslsi5b4g8gp63x6js3c026ajgfamd8pg2k1aygwx8x3zqk9";
+       editedCabalFile = "1j2dyw224gspfi7s1c316ip196c8kxx1vzpxxkkbx18bw9s72fa6";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring bzlib Cabal
          composition-prelude containers dependency dhall directory
-         file-embed filemanip hashable http-client http-client-tls lens lzma
-         mtl parallel-io process shake shake-ats shake-ext tar text unix
-         zip-archive zlib
+         file-embed filemanip hashable http-client http-client-tls lzma
+         microlens microlens-th mtl parallel-io process shake shake-ats
+         shake-ext tar text unix zip-archive zlib
        ];
+       libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
-         base composition-prelude directory lens optparse-applicative
+         base composition-prelude directory microlens optparse-applicative
          parallel-io shake shake-ats temporary text
        ];
        homepage = "https://github.com/vmchale/atspkg#readme";
@@ -35981,6 +36014,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "binary-tagged_0_1_5" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , binary, binary-orphans, bytestring, containers, criterion
+     , deepseq, generics-sop, hashable, nats, quickcheck-instances
+     , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck
+     , text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "binary-tagged";
+       version = "0.1.5";
+       sha256 = "1s05hrak9mg8klid5jsdqh1i7d1zyzkpdbdc969g2s9h06lk7dyl";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring binary bytestring containers
+         generics-sop hashable scientific SHA tagged text time
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary binary-orphans
+         bytestring containers generics-sop hashable quickcheck-instances
+         scientific SHA tagged tasty tasty-quickcheck text time
+         unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson array base base16-bytestring binary binary-orphans bytestring
+         containers criterion deepseq generics-sop hashable nats scientific
+         semigroups SHA tagged text time unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/binary-tagged#readme";
+       description = "Tagged binary serialisation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-tree" = callPackage
     ({ mkDerivation, base, ChasingBottoms, checkers, criterion, deepseq
      , doctest, ghc-prim, HUnit, QuickCheck, random, test-framework
@@ -36123,6 +36189,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bindings-DSL_1_0_25" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "bindings-DSL";
+       version = "1.0.25";
+       sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
+       description = "FFI domain specific language, on top of hsc2hs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bindings-EsounD" = callPackage
     ({ mkDerivation, base, bindings-audiofile, bindings-DSL, esound }:
      mkDerivation {
@@ -36731,10 +36810,10 @@ self: {
     ({ mkDerivation, base, bindings-DSL }:
      mkDerivation {
        pname = "bindings-posix";
-       version = "1.2.6";
-       sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
+       version = "1.2.7";
+       sha256 = "02bcb40jpwylcl48g48r2yd3j7pmij94975r3dcnmyk76kyp3fc3";
        libraryHaskellDepends = [ base bindings-DSL ];
-       description = "Low level bindings to posix";
+       description = "Project bindings-* raw interface to Posix";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -37707,8 +37786,8 @@ self: {
      }:
      mkDerivation {
        pname = "bits-extra";
-       version = "0.0.1.0";
-       sha256 = "0slxzlc81nbzzd7513i9crwqlpxxvpfz9haq5hr9qp533pr4cyz4";
+       version = "0.0.1.1";
+       sha256 = "0fsih4vrlq9l7851341n5qj1bp014f8rn7fhqf28803l6m3nrn1l";
        libraryHaskellDepends = [ base ghc-prim vector ];
        testHaskellDepends = [
          base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
@@ -41394,8 +41473,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-encodings";
-       version = "0.1.0.1";
-       sha256 = "09lx8d92dhd4gicz8pbpj19k2iaig1yl4lksqpxiqgxzybwqn0rc";
+       version = "0.2.0.1";
+       sha256 = "0qjqbffp4fa7a95mfsgzhibqblxrxl4qa8kb0yhyb8c1r47r5nn7";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [ base bytestring hedgehog ];
        benchmarkHaskellDepends = [ base bytestring gauge text ];
@@ -44877,13 +44956,16 @@ self: {
      }) {};
 
   "cautious-file" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, unix }:
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , process, unix
+     }:
      mkDerivation {
        pname = "cautious-file";
        version = "1.0.2";
        sha256 = "1sw5ngwrarq1lsd4c6v2wdmgbhkkq6kpybb62r8ccm11ddgn3yiq";
-       revision = "1";
-       editedCabalFile = "14yqf1wljrham5k4i4189h2pdlwgj3v59ff4p346fivdzh234666";
+       revision = "2";
+       editedCabalFile = "02ysmm577c4z0s3mqrpdpmzvs18y834ic90iwi5czcnj02zvg22s";
+       setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [
          base bytestring directory filepath unix
        ];
@@ -49419,6 +49501,8 @@ self: {
        pname = "codeworld-api";
        version = "0.2.2.1";
        sha256 = "0vb3v8d4jdzk14zs1jv4m5f2wa32bpxsfa0zr4f3w6z77as136sx";
+       revision = "2";
+       editedCabalFile = "0glp45kr9v8c9pxbaaq6cwm6i5rhglw2npk16kab80dgsfdb1pj9";
        libraryHaskellDepends = [
          base blank-canvas cereal cereal-text containers hashable mtl random
          random-shuffle text time
@@ -50872,24 +50956,40 @@ self: {
      }) {};
 
   "componentm" = callPackage
-    ({ mkDerivation, base, containers, deepseq, exceptions
+    ({ mkDerivation, base, containers, deepseq, exceptions, pretty-show
      , prettyprinter, rio, tasty, tasty-hunit, teardown
      }:
      mkDerivation {
        pname = "componentm";
-       version = "0.0.0.1";
-       sha256 = "1r2z9jbb0ka2i0lxbrb30p1x0zbwdcxid5k53mkzg82d5v2f08k9";
+       version = "0.0.0.2";
+       sha256 = "19xnav3xiw5v8sdmw6a90wdhxxkjlkvpkwrf0pjsxlisgn93vqpg";
        libraryHaskellDepends = [
-         base containers deepseq exceptions prettyprinter rio teardown
+         base containers deepseq exceptions pretty-show prettyprinter rio
+         teardown
        ];
        testHaskellDepends = [
-         base containers prettyprinter rio tasty tasty-hunit teardown
+         base containers pretty-show prettyprinter rio tasty tasty-hunit
+         teardown
        ];
        homepage = "https://github.com/roman/Haskell-componentm#readme";
        description = "Monad for allocation and cleanup of application resources";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "componentm-devel" = callPackage
+    ({ mkDerivation, base, componentm, foreign-store, rio, teardown }:
+     mkDerivation {
+       pname = "componentm-devel";
+       version = "0.0.0.2";
+       sha256 = "02jvv2f5akl47jg66xwcgj0s5wif0wckp2d0y6x4imr6kcy31mrd";
+       libraryHaskellDepends = [
+         base componentm foreign-store rio teardown
+       ];
+       homepage = "https://github.com/roman/Haskell-componentm#readme";
+       description = "Easy REPL driven development using ComponentM";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "composable-associations" = callPackage
     ({ mkDerivation, base, lens, tasty, tasty-hunit }:
      mkDerivation {
@@ -56400,6 +56500,8 @@ self: {
        pname = "cryptonite-conduit";
        version = "0.2.2";
        sha256 = "1bldcmda4xh52mw1wfrjljv8crhw3al7v7kv1j0vidvr7ymnjpbh";
+       revision = "1";
+       editedCabalFile = "1hh2nzfz4qpxgivfilgk4ll416lph8b2fdkzpzrmqfjglivydfmz";
        libraryHaskellDepends = [
          base bytestring conduit conduit-extra cryptonite exceptions memory
          resourcet transformers
@@ -61991,15 +62093,15 @@ self: {
 
   "dependency" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, containers, cpphs
-     , criterion, deepseq, hspec, lens, recursion-schemes, transformers
+     , criterion, deepseq, hspec, micro-recursion-schemes, microlens
      }:
      mkDerivation {
        pname = "dependency";
-       version = "1.0.0.0";
-       sha256 = "08n38sqcnljja235cv4xlvfmir7cbcmb53rayc81nl3km292hr8i";
+       version = "1.1.0.0";
+       sha256 = "1874zvkv5vkx9s6864kmpihq7514hywzb2a1zhqn3f6qf27bnj9c";
        libraryHaskellDepends = [
-         ansi-wl-pprint base binary containers deepseq lens
-         recursion-schemes transformers
+         ansi-wl-pprint base binary containers deepseq
+         micro-recursion-schemes microlens
        ];
        libraryToolDepends = [ cpphs ];
        testHaskellDepends = [ base containers hspec ];
@@ -62414,6 +62516,41 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "descript-lang" = callPackage
+    ({ mkDerivation, aeson, array, autoexporter, base, bifunctors
+     , bytestring, containers, data-default, directory, exceptions
+     , filepath, fsnotify, hashtables, haskell-lsp, hslogger, hspec
+     , HUnit, lens, megaparsec, mtl, network-uri, optparse-applicative
+     , QuickCheck, rainbow, stm, text, transformers
+     , unordered-containers, vector, yaml, yi-rope
+     }:
+     mkDerivation {
+       pname = "descript-lang";
+       version = "0.2.0.0";
+       sha256 = "0gar05gz7xvz74c9573h6zgv8rflwclzr3aw21cnyy1wpkqlbsnl";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array autoexporter base bifunctors bytestring containers filepath
+         hashtables megaparsec stm text transformers
+       ];
+       executableHaskellDepends = [
+         aeson array autoexporter base bifunctors bytestring containers
+         data-default exceptions filepath fsnotify hashtables haskell-lsp
+         hslogger lens megaparsec mtl network-uri optparse-applicative
+         rainbow stm text transformers unordered-containers vector yi-rope
+       ];
+       testHaskellDepends = [
+         array autoexporter base bifunctors bytestring containers directory
+         filepath hashtables hspec HUnit megaparsec QuickCheck stm text
+         transformers yaml
+       ];
+       homepage = "https://bitbucket.org/jakobeha/descript-lang/src/master/README.md";
+       description = "Library, interpreter, and CLI for Descript programming language";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "descriptive" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, hspec, HUnit
      , mtl, scientific, text, transformers, vector
@@ -62661,10 +62798,10 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall_1_13_1" = callPackage
+  "dhall_1_14_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, case-insensitive
      , containers, contravariant, cryptonite, deepseq, directory
-     , exceptions, filepath, formatting, haskeline, http-client
+     , doctest, exceptions, filepath, formatting, haskeline, http-client
      , http-client-tls, insert-ordered-containers, lens-family-core
      , megaparsec, memory, mtl, optparse-applicative, parsers
      , prettyprinter, prettyprinter-ansi-terminal, repline, scientific
@@ -62673,8 +62810,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.13.1";
-       sha256 = "1mjhxkdpw7blcdci6cmm3x2c9ascp7djc8c77dblfpzyqa3sqxf0";
+       version = "1.14.0";
+       sha256 = "0dm823rr4gkx1m7f0v9wvqlkhn1mmmml854p4zsi2j6ai4l885gl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62690,7 +62827,7 @@ self: {
          prettyprinter prettyprinter-ansi-terminal repline text
        ];
        testHaskellDepends = [
-         base deepseq insert-ordered-containers prettyprinter tasty
+         base deepseq doctest insert-ordered-containers prettyprinter tasty
          tasty-hunit text vector
        ];
        description = "A configuration language guaranteed to terminate";
@@ -62705,10 +62842,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.12";
-       sha256 = "1q9bwcdxyn2f7zp6r67k3kxqydj54shf0v0liyps7g7c9fixzrij";
-       revision = "1";
-       editedCabalFile = "12qklhw4jk2i1qiq9wyv23d6bl3yyqyjwf8dda649clby2my0hrc";
+       version = "1.0.13";
+       sha256 = "04f9ksw36kqb1g41211hcfcgg21pxkdszsznpa1vh09dcmlv6i7i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62762,23 +62897,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dhall-json_1_1_0" = callPackage
+  "dhall-json_1_2_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, dhall
-     , optparse-generic, text, unordered-containers, yaml
+     , insert-ordered-containers, optparse-applicative, text
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.1.0";
-       sha256 = "13fan1zdgj8zdv1br5vj57iqbfb5grllk8a2xkz6yyfk8kylmrc7";
-       revision = "1";
-       editedCabalFile = "0k8q44hfhd95k7i92g1zvsw9ys1ak6vl663r2v7pf6k1zl70cyhs";
+       version = "1.2.0";
+       sha256 = "0ks8ycgysimj1jqabzdrrsdcqkp3bi5f0zhwgmilsprx88dxrddz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base dhall text unordered-containers
+         aeson base dhall insert-ordered-containers optparse-applicative
+         text unordered-containers
        ];
        executableHaskellDepends = [
-         aeson aeson-pretty base bytestring dhall optparse-generic text yaml
+         aeson aeson-pretty base bytestring dhall optparse-applicative text
+         yaml
        ];
        description = "Compile Dhall to JSON or YAML";
        license = stdenv.lib.licenses.bsd3;
@@ -62811,8 +62947,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.1.3";
-       sha256 = "0dpkg84qzviasadgif30ivbg6k7azqq9ki8grd3g93zbrdxgv4fj";
+       version = "1.1.4";
+       sha256 = "1yhnpmvisizl5vm37sns8sn0ff496aqr2i76v3c2034cjd9v0mdb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62831,8 +62967,8 @@ self: {
     ({ mkDerivation, base, dhall, optparse-generic, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.9";
-       sha256 = "0jh2nm26i5gdicsxzvx54rmx7x1g5mpjiwd7c5wfj6pmrpcp606r";
+       version = "1.0.10";
+       sha256 = "07cxc3m2pqg5lk0d03i20ch6bsq779sg3ci4yy1fkai8vs513yjq";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base dhall optparse-generic text ];
@@ -63208,8 +63344,8 @@ self: {
        pname = "diagrams-gtk";
        version = "1.4";
        sha256 = "1sga2wwkircjgryd4pn9i0wvvcnh3qnhpxas32crpdq939idwsxn";
-       revision = "1";
-       editedCabalFile = "0afpcbgkc897gp0hpqi5frwbzln1qapf36p93v9zxl05my6nj04i";
+       revision = "2";
+       editedCabalFile = "0hblrqvwk1pbssaci97v36r71kpm7kkcghh5ijmq52lmjfq72jqm";
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib gtk
        ];
@@ -63840,6 +63976,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "difference-monoid" = callPackage
+    ({ mkDerivation, adjunctions, base, comonad, containers, deepseq
+     , distributive, doctest, groups, hedgehog, hedgehog-checkers
+     , QuickCheck, semigroupoids
+     }:
+     mkDerivation {
+       pname = "difference-monoid";
+       version = "0.1.0.0";
+       sha256 = "1i99hcxb07142227x4f0p2giayvzpr49ynx6apys178bgi99ih3k";
+       libraryHaskellDepends = [
+         adjunctions base comonad deepseq distributive groups semigroupoids
+       ];
+       testHaskellDepends = [
+         adjunctions base comonad containers deepseq distributive doctest
+         groups hedgehog hedgehog-checkers QuickCheck semigroupoids
+       ];
+       homepage = "https://github.com/oisdk/difference-monoid#readme";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "difftodo" = callPackage
     ({ mkDerivation, base, bytestring, diff-parse, highlighter2
      , optparse-applicative, pretty-show, process, protolude, tasty
@@ -65917,7 +66073,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "dns_3_0_3" = callPackage
+  "dns_3_0_4" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base
      , base64-bytestring, binary, bytestring, containers, cryptonite
      , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe
@@ -65925,8 +66081,8 @@ self: {
      }:
      mkDerivation {
        pname = "dns";
-       version = "3.0.3";
-       sha256 = "0m7xgf5vgh3xj5yrv8hyvhx3lligx1xrnq22a9b6s2prbywyllfv";
+       version = "3.0.4";
+       sha256 = "1aa4zb9zkk244rndimrq8maxj9qrmz3rb13v9n8jblmp6ssk6d3v";
        libraryHaskellDepends = [
          async attoparsec auto-update base base64-bytestring binary
          bytestring containers cryptonite iproute mtl network psqueues safe
@@ -67587,6 +67743,8 @@ self: {
        pname = "dual-tree";
        version = "0.2.2";
        sha256 = "1sx9p9yr06z7bi7pshjpswizs6bkmfzcpw8xlasriniry86df4kl";
+       revision = "1";
+       editedCabalFile = "1hkjhij3s2a82b0sd898511lr6iphk3myk1l0hpl42ai32sf606q";
        libraryHaskellDepends = [
          base monoid-extras newtype-generics semigroups
        ];
@@ -71737,8 +71895,8 @@ self: {
      }:
      mkDerivation {
        pname = "etc";
-       version = "0.4.0.0";
-       sha256 = "0zyyayk9b6jzksxd14k08594ms5szgcpa63nlw3vnni1q1c2x1v4";
+       version = "0.4.0.1";
+       sha256 = "0vpc3816vsxs985h076wxyr3z9q759399xapnhiv1m428sksw6zs";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base hashable rio text typed-process unliftio
@@ -74241,8 +74399,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.0.5";
-       sha256 = "138qdgwqc3qnafi0kf5nkva3nvcfn71b1ch2xrwgxkna5kniqjrh";
+       version = "0.6.0.6";
+       sha256 = "1vw652sps7dx11anqrrjw2fz039m7bkcfmk61px9g3yn0wvjlm02";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
        benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
@@ -78547,6 +78705,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "forma_1_0_0" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, mtl, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "forma";
+       version = "1.0.0";
+       sha256 = "11rqwlqsjw5r674zqv9lmafqhlb339afifa2376a6cgbxm7j2msd";
+       libraryHaskellDepends = [
+         aeson base containers mtl text unordered-containers
+       ];
+       testHaskellDepends = [ aeson base containers hspec mtl text ];
+       homepage = "https://github.com/mrkkrp/forma";
+       description = "Parse and validate forms in JSON format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "formal" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers
      , directory, file-embed, HTTP, indents, interpolatedstring-perl6
@@ -84548,6 +84724,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-trace-events" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, text }:
+     mkDerivation {
+       pname = "ghc-trace-events";
+       version = "0.0.0";
+       sha256 = "00lq6bcl78drqlzj39avf9k2x2q4d2fdac3rrxrxicsdwry6brkk";
+       libraryHaskellDepends = [ base bytestring text ];
+       benchmarkHaskellDepends = [ base bytestring criterion ];
+       homepage = "https://github.com/maoe/ghc-trace-events";
+       description = "Faster replacements for traceEvent and traceEventMarker";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ghc-typelits-extra" = callPackage
     ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp
@@ -90896,8 +91085,8 @@ self: {
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.3";
-       sha256 = "1dqmjg40h4gm6921yq84sx8x5sdbzhnv8xl7m2ylb872ddbzfwg3";
+       version = "0.3.1";
+       sha256 = "12lrzzpv48j34y6lwyiq7hg3mahynwj934rsfjmyamy5m5ya0170";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90915,7 +91104,7 @@ self: {
          text
        ];
        homepage = "https://github.com/blamario/grampa/tree/master/grammatical-parsers";
-       description = "parsers that can combine into grammars";
+       description = "parsers that combine into grammars";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -92630,8 +92819,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtk-sni-tray";
-       version = "0.1.3.0";
-       sha256 = "197a0wfbg6xzyka2ydbmbs6g6mghlp1ncchbmrb6gzn3b85iggq6";
+       version = "0.1.3.1";
+       sha256 = "1wsq7d47px11c64k38nqxms408yd4il35ai8r53p76qnd04s8saw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92655,8 +92844,8 @@ self: {
     ({ mkDerivation, base, gi-gdk, gi-gtk, text, transformers }:
      mkDerivation {
        pname = "gtk-strut";
-       version = "0.1.2.0";
-       sha256 = "1v73qca2qdkpvfal2ndmwrxyj1qwgxgmammkbf88azs7wcxcf7y6";
+       version = "0.1.2.1";
+       sha256 = "1m5vvyiyn4v6a8jhizcm8dyi20q2nag9ycm0c2hdxfhsl7fxbx31";
        libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
        homepage = "https://github.com/IvanMalison/gtk-strut#readme";
        description = "Libary for creating strut windows with gi-gtk";
@@ -92899,8 +93088,8 @@ self: {
      }:
      mkDerivation {
        pname = "gtkglext";
-       version = "0.13.1.1";
-       sha256 = "15v40f21xlg5r2zidh77cfiq6ink1dxljbl59mf5sqyq5pjbdw3h";
+       version = "0.13.2.0";
+       sha256 = "14rid23m5qa5g0fkc07cac5j8arkbz3cc23wkva7b46xnyfs10ra";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
@@ -94745,8 +94934,8 @@ self: {
     ({ mkDerivation, base, filepath, haddock-api, hspec }:
      mkDerivation {
        pname = "haddock";
-       version = "2.19.0.1";
-       sha256 = "1g1j9j0hf2yhyyh0gwz6bzbvfvliqz9x8a8hnkmwghm7w3xa6sb7";
+       version = "2.20.0";
+       sha256 = "0jfgd9n0gcbg9i2ifra5cnj0xh2nc5j65ns3b280482r65vnph9w";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haddock-api ];
@@ -94830,10 +95019,8 @@ self: {
      }:
      mkDerivation {
        pname = "haddock-api";
-       version = "2.19.0.1";
-       sha256 = "0c6i7sljp7myz25d90gyw68a90i5jcrkajkxcciikp2hjirfaas3";
-       revision = "1";
-       editedCabalFile = "0lfvhpiy8zr117wn9s9nc5va83rb0jz1h14ggm88565xr6qbwmjx";
+       version = "2.20.0";
+       sha256 = "02f6038djjbx2vshd5digk4rm16fl33m080s7v01nn5bzfak9g7j";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring Cabal containers deepseq directory filepath
@@ -94970,6 +95157,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haddock-library_1_6_0" = callPackage
+    ({ mkDerivation, base, base-compat, bytestring, containers, deepseq
+     , directory, filepath, hspec, hspec-discover, optparse-applicative
+     , QuickCheck, transformers, tree-diff
+     }:
+     mkDerivation {
+       pname = "haddock-library";
+       version = "1.6.0";
+       sha256 = "0h7721zw6kbm1vcr0kp69avfy3qfd9zsgmh24gy909kxgdp0k7v0";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq transformers
+       ];
+       testHaskellDepends = [
+         base base-compat bytestring containers deepseq directory filepath
+         hspec optparse-applicative QuickCheck transformers tree-diff
+       ];
+       testToolDepends = [ hspec-discover ];
+       doHaddock = false;
+       homepage = "http://www.haskell.org/haddock/";
+       description = "Library exposing some functionality of Haddock";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "haddock-test" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , process, syb, xhtml, xml
@@ -97873,6 +98084,8 @@ self: {
        pname = "hashable-time";
        version = "0.2.0.1";
        sha256 = "0k932nyd08l3xxbh2g3n76py2f4kd9yw4s5a065vjz0xp6wjnxdm";
+       revision = "1";
+       editedCabalFile = "0rv40xkg3gj8jnqsry1gq3f5s5la6d5arg8fzkirnwdpcgha1as6";
        libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -103158,8 +103371,8 @@ self: {
      }:
      mkDerivation {
        pname = "hdocs";
-       version = "0.5.2.1";
-       sha256 = "1b8qrkfryyj8fg07vzl4cq4rwsbhlaqm5l477ld4mmgcgk4infi8";
+       version = "0.5.3.0";
+       sha256 = "0gkv4xy7jr2ic22gn5fpj3vd6avgd1xqblv96gg1m0fhfsj92y5h";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103615,6 +103828,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_10_2" = callPackage
+    ({ mkDerivation, async, base, bytestring, bytestring-lexing
+     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
+     , resource-pool, scanner, slave-thread, stm, test-framework
+     , test-framework-hunit, text, time, tls, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.10.2";
+       sha256 = "05bnma4ssdg4zx39xrwx14xys47zdxxkk9iyi8d29p1vb90vv68w";
+       libraryHaskellDepends = [
+         async base bytestring bytestring-lexing deepseq errors HTTP mtl
+         network network-uri resource-pool scanner stm text time tls
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         async base bytestring doctest HUnit mtl slave-thread stm
+         test-framework test-framework-hunit text time
+       ];
+       benchmarkHaskellDepends = [ base mtl time ];
+       homepage = "https://github.com/informatikr/hedis";
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
      , time
@@ -110940,8 +111180,8 @@ self: {
      }:
      mkDerivation {
        pname = "hprotoc";
-       version = "2.4.9";
-       sha256 = "1bfar7biksa9ha6vzrh4z2lz048mf1zz261ih6mbl9q6kvyr27w4";
+       version = "2.4.10";
+       sha256 = "14zihg4gb42kr68y73mzb7a9ryc2yi4h50n3a4v8idw17f3fdhlz";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114238,15 +114478,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hspec-golden-aeson_0_6_0_0" = callPackage
+  "hspec-golden-aeson_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
      , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt
      , random, silently, transformers
      }:
      mkDerivation {
        pname = "hspec-golden-aeson";
-       version = "0.6.0.0";
-       sha256 = "0918b4y0lkz66hyhydqkd0yxna37vqqqc0pgjg4vn1h860xj0rv0";
+       version = "0.7.0.0";
+       sha256 = "18jc992dhln1v5sfg8yjfsm2i5c7c38ph3bxrjxgc9bl7fzcsk0i";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring directory filepath hspec
          QuickCheck quickcheck-arbitrary-adt random transformers
@@ -119806,8 +120046,8 @@ self: {
      }:
      mkDerivation {
        pname = "iCalendar";
-       version = "0.4.0.3";
-       sha256 = "0dbs9s68fpx67ngjnd1p8c9n421bzn6a034dr6i3bhg2cn0s01mw";
+       version = "0.4.0.4";
+       sha256 = "1hgji4riaqjpsqi2c7i1md9p8ig4sfigmldllnpkwbbhwhzmnsq5";
        libraryHaskellDepends = [
          base base64-bytestring bytestring case-insensitive containers
          data-default mime mtl network network-uri old-locale parsec text
@@ -121293,23 +121533,24 @@ self: {
 
   "implicit" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-markup, blaze-svg
-     , bytestring, containers, criterion, deepseq, directory, download
-     , filepath, hspec, JuicyPixels, monads-tf, mtl, NumInstances
-     , optparse-applicative, parallel, parsec, random, silently
-     , snap-core, snap-server, storable-endian, text, transformers
-     , unordered-containers, vector-space
+     , bytestring, bytestring-builder, containers, criterion, deepseq
+     , directory, filepath, hspec, JuicyPixels, monads-tf, mtl
+     , NumInstances, optparse-applicative, parallel, parsec, random
+     , silently, snap-core, snap-server, storable-endian, text
+     , transformers, unordered-containers, vector-space
      }:
      mkDerivation {
        pname = "implicit";
-       version = "0.1.0";
-       sha256 = "16yhclgph95a698qbs6l9c16k950bh1zzy8spwgfjh7ilpn0s4pk";
+       version = "0.2.0";
+       sha256 = "1lj206x2s7sdjg6yllhp809d7k84xa6ky70859jyw4m6bry4xyaw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base blaze-builder blaze-markup blaze-svg bytestring containers
-         criterion deepseq directory download filepath JuicyPixels monads-tf
-         NumInstances parallel parsec silently snap-core snap-server
-         storable-endian text transformers unordered-containers vector-space
+         base blaze-builder blaze-markup blaze-svg bytestring
+         bytestring-builder containers criterion deepseq directory filepath
+         hspec JuicyPixels monads-tf NumInstances parallel parsec silently
+         snap-core snap-server storable-endian text transformers
+         unordered-containers vector-space
        ];
        executableHaskellDepends = [
          base blaze-builder blaze-markup blaze-svg bytestring containers
@@ -122746,8 +122987,8 @@ self: {
      }:
      mkDerivation {
        pname = "int-multimap";
-       version = "0.3";
-       sha256 = "1hsd55hg52mb6vimk5813l0s72spvy9njrhzz6dc6jddh65v58lv";
+       version = "0.3.1";
+       sha256 = "0sl3xzlw0mzyq1h28mqklm41q9pknsf1qmd74a5syn24m01dknnv";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -129325,6 +129566,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kleene" = callPackage
+    ({ mkDerivation, base, base-compat-batteries, containers, lattices
+     , MemoTrie, QuickCheck, range-set-list, regex-applicative
+     , step-function, text, transformers
+     }:
+     mkDerivation {
+       pname = "kleene";
+       version = "0";
+       sha256 = "00hbrmsm19azxxql14y6k7h7z8k4azlmy4y0gimyqbx4nb7swln6";
+       libraryHaskellDepends = [
+         base base-compat-batteries containers lattices MemoTrie QuickCheck
+         range-set-list regex-applicative step-function text transformers
+       ];
+       homepage = "https://github.com/phadej/kleene";
+       description = "Kleene algebra";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "kmeans" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -138666,15 +138925,15 @@ self: {
      }) {};
 
   "lucid-extras" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, directory, lucid
-     , text
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, directory
+     , lucid, text
      }:
      mkDerivation {
        pname = "lucid-extras";
-       version = "0.1.0.0";
-       sha256 = "0akpsh79lpdx7in1ffzz2l36i4gnvfn290cjz0pdr0y8bs0bv9dr";
+       version = "0.1.0.1";
+       sha256 = "0wyb5pqhphfckmzpnl0xp6fy8fmnwqjqim3h3f3sdjqkqdly5iaw";
        libraryHaskellDepends = [
-         base blaze-builder bytestring lucid text
+         aeson base blaze-builder bytestring lucid text
        ];
        testHaskellDepends = [ base directory lucid ];
        homepage = "https://github.com/diffusionkinetics/open/lucid-extras";
@@ -142339,9 +142598,11 @@ self: {
        pname = "meldable-heap";
        version = "2.0.3";
        sha256 = "1p75zjlls38sd1lma7w95mpmb9kdff19s2as6pz1ki1g20nnxdk3";
+       revision = "1";
+       editedCabalFile = "1igir17mnzrmvbcp5n93x1zqjbc44dv0gl4z7szvi7nqh47h72k7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.google.com/p/priority-queues/";
+       homepage = "https://github.com/jbapple/priority-queues";
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146326,8 +146587,8 @@ self: {
     ({ mkDerivation, base, mtl, stm }:
      mkDerivation {
        pname = "monadIO";
-       version = "0.10.1.4";
-       sha256 = "08158j978h69knbnzxkzv856sjhhw24h5lh7d8hx2lyhzbpnfarl";
+       version = "0.11.0.0";
+       sha256 = "11pbg83fw5vdlny5w9afmzdhn3ryg1av429gbsk8w6wl8zqhd4n9";
        libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
        license = stdenv.lib.licenses.bsd3;
@@ -147384,17 +147645,22 @@ self: {
      }) {};
 
   "motor" = callPackage
-    ({ mkDerivation, base, CTRex, indexed, indexed-extras, reflection
-     , template-haskell
+    ({ mkDerivation, base, indexed, indexed-extras, reflection
+     , row-types, template-haskell
      }:
      mkDerivation {
        pname = "motor";
-       version = "0.2.0.0";
-       sha256 = "0py79plg65d1h49zm8jz6hbzg57lq0psv8k5m5w23dwrgn9jr4x1";
+       version = "0.3.0";
+       sha256 = "0yx0gwdqny8p5nggigk5w57cyf2qjdjb5ypppwd84qjm663na9bh";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base CTRex indexed indexed-extras reflection template-haskell
+         base indexed indexed-extras reflection row-types template-haskell
        ];
-       testHaskellDepends = [ base CTRex indexed indexed-extras ];
+       executableHaskellDepends = [
+         base indexed indexed-extras row-types
+       ];
+       testHaskellDepends = [ base indexed indexed-extras row-types ];
        description = "Type-safe effectful state machines in Haskell";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147406,8 +147672,8 @@ self: {
      }:
      mkDerivation {
        pname = "motor-diagrams";
-       version = "0.2.0.0";
-       sha256 = "094in9l2sngxg4p2ijfi97dqs6v7rk1a4h7fcbi269qmh9sfck43";
+       version = "0.3.0";
+       sha256 = "1rvlb3gvnzdqzwrg3nm21vw6j33c4aqp6npsz8cdbh24ijc46jbr";
        libraryHaskellDepends = [
          base motor motor-reflection template-haskell text
        ];
@@ -147420,16 +147686,16 @@ self: {
      }) {};
 
   "motor-reflection" = callPackage
-    ({ mkDerivation, base, CTRex, hspec, hspec-discover, indexed, motor
-     , template-haskell, text
+    ({ mkDerivation, base, hspec, hspec-discover, indexed, motor
+     , row-types, template-haskell, text
      }:
      mkDerivation {
        pname = "motor-reflection";
-       version = "0.2.0.0";
-       sha256 = "0qycmskhvh3n3pa4xib72irzka8hn93bqv4ayrykhnp4k0fbbndd";
+       version = "0.3.0";
+       sha256 = "1mac2ywknribmzs79dpjigk45nzrwsx7as0zi1zaqrq2vy45xl8y";
        libraryHaskellDepends = [ base motor template-haskell text ];
        testHaskellDepends = [
-         base CTRex hspec hspec-discover indexed motor
+         base hspec hspec-discover indexed motor row-types
        ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
@@ -150315,26 +150581,26 @@ self: {
      }) {};
 
   "nanovg" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, containers, GLEW, hspec
-     , inline-c, libGL, libGLU, QuickCheck, text, vector
+    ({ mkDerivation, base, bytestring, c2hs, containers, GLEW, glew
+     , hspec, inline-c, libGL, libGLU, QuickCheck, text, vector
      }:
      mkDerivation {
        pname = "nanovg";
-       version = "0.5.2.0";
-       sha256 = "0p8g3235srd23vpy2yvw68sxdx4mb31m09yvm8im3rbhfwi1vqr2";
-       revision = "1";
-       editedCabalFile = "0ls8wyr1gk1qcd3vzyi0a1i8jxy9b6x3973fy0h1icda7f62r0mb";
+       version = "0.6.0.0";
+       sha256 = "15nljmlcgj1pw9ydy3a9nmk6zpgfp3p71arw04b1krx2y9r2fnp3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers text vector ];
        librarySystemDepends = [ GLEW libGL libGLU ];
+       libraryPkgconfigDepends = [ glew ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
        homepage = "https://github.com/cocreature/nanovg-hs";
        description = "Haskell bindings for nanovg";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {GLEW = null; inherit (pkgs) libGL; inherit (pkgs) libGLU;};
+     }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; 
+         inherit (pkgs) libGLU;};
 
   "nanq" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
@@ -154598,8 +154864,8 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-prelude";
-       version = "0.0.4.0";
-       sha256 = "11kwszs98c00bcjr318rm7yfc0h304s6vnrmh97mp4xp4bk7fqq1";
+       version = "0.0.4.1";
+       sha256 = "1sj7l62cgk68b1d2lfxd944yxw43l6a3qr335x21jjhgdaffwg3x";
        libraryHaskellDepends = [
          base numhask protolude QuickCheck tasty tasty-quickcheck
        ];
@@ -155037,8 +155303,8 @@ self: {
      }:
      mkDerivation {
        pname = "obdd";
-       version = "0.8.1";
-       sha256 = "04cfbqsy65kvs9iyx8crpz54l0jmndvz2smn83k0ybpj3ahs4kj2";
+       version = "0.8.2";
+       sha256 = "17cs06cxxmjknb1mc691n5k70yqplasqc97dpr6vx71aj1wzwzhw";
        libraryHaskellDepends = [
          array base containers ersatz mtl process-extras random text
        ];
@@ -156510,8 +156776,8 @@ self: {
      }:
      mkDerivation {
        pname = "openpgp-Crypto";
-       version = "0.5";
-       sha256 = "0gsdzfg378j7s2kpryg43ajxcdk8s5szk0yq48qfvnlsbgrxz07r";
+       version = "0.6";
+       sha256 = "0143ln5pr3d0kg28838ipir3j6x6r6j9rc4f5dmvsb2ffl464zxm";
        libraryHaskellDepends = [
          base binary bytestring Crypto openpgp utf8-string
        ];
@@ -167915,8 +168181,8 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-hasql";
-       version = "1.3";
-       sha256 = "0n8ysdcg8p40idbbnyrmhjyh1hxhg7nrv5yf03fb0cvx5mwdgh11";
+       version = "1.4";
+       sha256 = "1ahdmc98pkfvbj8z1ds6xfzrj77wqbagfkn9jfzsz14z2m2rw8b2";
        libraryHaskellDepends = [
          base bytestring hasql potoki potoki-core profunctors text vector
        ];
@@ -170929,6 +171195,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers_2_4_10" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, filepath, mtl, parsec, syb, utf8-string
+     }:
+     mkDerivation {
+       pname = "protocol-buffers";
+       version = "2.4.10";
+       sha256 = "0rr7yla1gl199hk2zn7jr1p0nq166mi4dm43ild27y6bvrdc2kvk";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath mtl
+         parsec syb utf8-string
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Parse Google Protocol Buffer specifications";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
@@ -170944,6 +171228,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protocol-buffers-descriptor_2_4_10" = callPackage
+    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
+     mkDerivation {
+       pname = "protocol-buffers-descriptor";
+       version = "2.4.10";
+       sha256 = "1w4n0yqf5xhbs5yi0xj8ak268chngklc7sif2s3bjr0dwk7fi5d0";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers protocol-buffers
+       ];
+       homepage = "https://github.com/k-bx/protocol-buffers";
+       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protocol-buffers-descriptor-fork" = callPackage
     ({ mkDerivation, base, bytestring, containers
      , protocol-buffers-fork
@@ -171813,57 +172113,54 @@ self: {
      , ansi-wl-pprint, base, base-compat, blaze-html, bower-json, boxes
      , bytestring, cheapskate, clock, containers, data-ordlist, deepseq
      , directory, dlist, edit-distance, file-embed, filepath, fsnotify
-     , gitrev, Glob, haskeline, hspec, hspec-discover, http-client
-     , http-types, HUnit, language-javascript, lens, lifted-base
-     , monad-control, monad-logger, mtl, network, optparse-applicative
-     , parallel, parsec, pattern-arrows, pipes, pipes-http, process
-     , protolude, regex-tdfa, safe, scientific, semigroups, silently
-     , sourcemap, spdx, split, stm, stringsearch, syb, text, time
-     , transformers, transformers-base, transformers-compat
-     , unordered-containers, utf8-string, vector, wai, wai-websockets
-     , warp, websockets
+     , gitrev, Glob, haskeline, hspec, hspec-discover, http-types, HUnit
+     , language-javascript, lens, lifted-base, monad-control
+     , monad-logger, mtl, network, optparse-applicative, parallel
+     , parsec, pattern-arrows, process, protolude, regex-tdfa, safe
+     , scientific, semigroups, sourcemap, spdx, split, stm, stringsearch
+     , syb, tasty, tasty-hspec, text, time, transformers
+     , transformers-base, transformers-compat, unordered-containers
+     , utf8-string, vector, wai, wai-websockets, warp, websockets
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.11.7";
-       sha256 = "1q6nzxchmwdqrx3bxx0k1h8a62iihz9kcfwybzhb9x13p9nbx9np";
+       version = "0.12.0";
+       sha256 = "0lkrlry4rr1l1c5ncy7wlbv1ll6n0dkw7j1gjpxn3706gan921rb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-better-errors ansi-terminal base base-compat blaze-html
          bower-json boxes bytestring cheapskate clock containers
          data-ordlist deepseq directory dlist edit-distance file-embed
-         filepath fsnotify Glob haskeline http-client http-types
-         language-javascript lens lifted-base monad-control monad-logger mtl
-         parallel parsec pattern-arrows pipes pipes-http process protolude
-         regex-tdfa safe scientific semigroups sourcemap spdx split stm
-         stringsearch syb text time transformers transformers-base
-         transformers-compat unordered-containers utf8-string vector
+         filepath fsnotify Glob haskeline language-javascript lens
+         lifted-base monad-control monad-logger mtl parallel parsec
+         pattern-arrows process protolude regex-tdfa safe scientific
+         semigroups sourcemap spdx split stm stringsearch syb text time
+         transformers transformers-base transformers-compat
+         unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson aeson-better-errors ansi-terminal ansi-wl-pprint base
          base-compat blaze-html bower-json boxes bytestring cheapskate clock
          containers data-ordlist deepseq directory dlist edit-distance
-         file-embed filepath fsnotify gitrev Glob haskeline http-client
-         http-types language-javascript lens lifted-base monad-control
-         monad-logger mtl network optparse-applicative parallel parsec
-         pattern-arrows pipes pipes-http process protolude regex-tdfa safe
-         scientific semigroups sourcemap spdx split stm stringsearch syb
-         text time transformers transformers-base transformers-compat
-         unordered-containers utf8-string vector wai wai-websockets warp
-         websockets
+         file-embed filepath fsnotify gitrev Glob haskeline http-types
+         language-javascript lens lifted-base monad-control monad-logger mtl
+         network optparse-applicative parallel parsec pattern-arrows process
+         protolude regex-tdfa safe scientific semigroups sourcemap spdx
+         split stm stringsearch syb text time transformers transformers-base
+         transformers-compat unordered-containers utf8-string vector wai
+         wai-websockets warp websockets
        ];
        testHaskellDepends = [
          aeson aeson-better-errors ansi-terminal base base-compat blaze-html
          bower-json boxes bytestring cheapskate clock containers
          data-ordlist deepseq directory dlist edit-distance file-embed
-         filepath fsnotify Glob haskeline hspec hspec-discover http-client
-         http-types HUnit language-javascript lens lifted-base monad-control
-         monad-logger mtl parallel parsec pattern-arrows pipes pipes-http
-         process protolude regex-tdfa safe scientific semigroups silently
-         sourcemap spdx split stm stringsearch syb text time transformers
-         transformers-base transformers-compat unordered-containers
-         utf8-string vector
+         filepath fsnotify Glob haskeline hspec hspec-discover HUnit
+         language-javascript lens lifted-base monad-control monad-logger mtl
+         parallel parsec pattern-arrows process protolude regex-tdfa safe
+         scientific semigroups sourcemap spdx split stm stringsearch syb
+         tasty tasty-hspec text time transformers transformers-base
+         transformers-compat unordered-containers utf8-string vector
        ];
        doCheck = false;
        homepage = "http://www.purescript.org/";
@@ -174295,6 +174592,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rainbow_0_30_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, lens-simple, process, QuickCheck
+     , text
+     }:
+     mkDerivation {
+       pname = "rainbow";
+       version = "0.30.0.2";
+       sha256 = "1isy1xfgsp25x0254gmqkakc185g87wil3n19w5s1rn3bfq1w0my";
+       libraryHaskellDepends = [
+         base bytestring lens-simple process text
+       ];
+       testHaskellDepends = [
+         base bytestring lens-simple process QuickCheck text
+       ];
+       homepage = "https://www.github.com/massysett/rainbow";
+       description = "Print text to terminal with colors and effects";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rainbow-tests" = callPackage
     ({ mkDerivation, barecheck, base, QuickCheck, rainbow, terminfo
      , text
@@ -174918,14 +175235,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "range-set-list_0_1_2_1" = callPackage
+  "range-set-list_0_1_3" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, tasty
      , tasty-quickcheck
      }:
      mkDerivation {
        pname = "range-set-list";
-       version = "0.1.2.1";
-       sha256 = "06f8z9rmk2phmds9wv95y2xvjhfx8dr9jbqlv4ybv8m21283x0kw";
+       version = "0.1.3";
+       sha256 = "1pwnriv5r093qvqzzg9s868613nf92d3h8qmqaqc5qq95hykj6z5";
        libraryHaskellDepends = [ base containers deepseq hashable ];
        testHaskellDepends = [
          base containers deepseq hashable tasty tasty-quickcheck
@@ -175717,8 +176034,8 @@ self: {
      }:
      mkDerivation {
        pname = "rdf4h";
-       version = "3.0.3";
-       sha256 = "0lidqww0d8ckm4iipjx4gq32jspxidz0g009m5xrf8x6qsl26sx0";
+       version = "3.0.4";
+       sha256 = "0jci2d6n157y22ypsjb7kf4pknd53jjh2xj0i6qjsdh13qpwb7xq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185248,8 +185565,8 @@ self: {
     ({ mkDerivation, base, sdl2 }:
      mkDerivation {
        pname = "sdl2-fps";
-       version = "0.0.1";
-       sha256 = "0ci8p6qgs9nmpbypvk75ybz5kh36iiqaz4xl4lr2dbaq0y2d6iri";
+       version = "0.0.2";
+       sha256 = "0lid8c2fdy43i9qjjn60mzn6mrcfnn1jflmbwfl93gc6ab5fwz63";
        libraryHaskellDepends = [ base sdl2 ];
        homepage = "https://github.com/jxv/sdl2-fps#readme";
        description = "Run of the mill, frames per second timer implementation";
@@ -190714,8 +191031,8 @@ self: {
      }:
      mkDerivation {
        pname = "show-please";
-       version = "0.5.4";
-       sha256 = "0rb6mpbr1qz80zgs4r92ckp28afzlcz9l988y20xhfrvq3bikzkx";
+       version = "0.5.5";
+       sha256 = "00l2bm9507bcyafzyl6dh4ppvz34h4w7vglyd1gxr9piz2z708hx";
        libraryHaskellDepends = [
          base mtl parsec template-haskell th-orphans time
        ];
@@ -191449,7 +191766,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "simple-log_0_9_4" = callPackage
+  "simple-log_0_9_5" = callPackage
     ({ mkDerivation, async, base, base-unicode-symbols, containers
      , data-default, deepseq, directory, exceptions, filepath, hformat
      , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
@@ -191457,8 +191774,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.9.4";
-       sha256 = "0chp90h9112sxa7ds0ldzdp59i6b1vy7chkqcb6d5mb9faq6vjqi";
+       version = "0.9.5";
+       sha256 = "042mnsc2mfxdsf49knszk732mj5ryd9309h9ysyzb6z0y9wnp736";
        libraryHaskellDepends = [
          async base base-unicode-symbols containers data-default deepseq
          directory exceptions filepath hformat microlens microlens-platform
@@ -191923,14 +192240,16 @@ self: {
      }) {};
 
   "simpleconfig" = callPackage
-    ({ mkDerivation, base, containers, generic-deriving, lens, text }:
+    ({ mkDerivation, base, containers, either, generic-deriving, hspec
+     , lens, text
+     }:
      mkDerivation {
        pname = "simpleconfig";
-       version = "0.0.9";
-       sha256 = "1xk8kxdnw118gzwh3i58iy0bdqi80f8li3bjydaqfn073106nf87";
-       libraryHaskellDepends = [ base containers lens ];
+       version = "0.0.10";
+       sha256 = "0yrhgzwc138svs8p8pmlb1nbglhij3zi7228y32j9axzwmsszpg6";
+       libraryHaskellDepends = [ base containers either lens ];
        testHaskellDepends = [
-         base containers generic-deriving lens text
+         base containers either generic-deriving hspec lens text
        ];
        homepage = "https://github.com/koterpillar/simpleconfig#readme";
        description = "Short description of your package";
@@ -199452,17 +199771,19 @@ self: {
      }) {};
 
   "step-function" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-test-quickcheck, QuickCheck }:
+    ({ mkDerivation, base, base-compat-batteries, containers, deepseq
+     , QuickCheck
+     }:
      mkDerivation {
        pname = "step-function";
-       version = "0.1.1.2";
-       sha256 = "1lsa84mc752lghpjszhwhky9hnpihy7wivdm0r6yl70k721s3ifk";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base Cabal cabal-test-quickcheck QuickCheck
+       version = "0.2";
+       sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j";
+       libraryHaskellDepends = [
+         base base-compat-batteries containers deepseq QuickCheck
        ];
+       testHaskellDepends = [ base QuickCheck ];
        homepage = "https://github.com/jonpetterbergman/step-function";
-       description = "Step functions, staircase functions or piecewise constant functions";
+       description = "Staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -204617,32 +204938,30 @@ self: {
     ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers
      , dbus, dbus-hslogger, directory, dyre, either, enclosed-exceptions
      , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib
-     , gi-gtk, glib, gtk-sni-tray, gtk-strut, gtk-traymanager, gtk3
-     , haskell-gi, haskell-gi-base, hslogger, HStringTemplate, HTTP, mtl
-     , multimap, network, network-uri, old-locale, optparse-applicative
-     , parsec, process, rate-limit, regex-compat, safe, split
-     , status-notifier-item, stm, text, time, time-locale-compat
-     , time-units, transformers, transformers-base, tuple, unix
-     , utf8-string, X11, xdg-basedir, xml, xml-helpers, xmonad
-     , xmonad-contrib
+     , gi-gtk, gi-gtk-hs, glib, gtk-sni-tray, gtk-strut, gtk-traymanager
+     , gtk3, haskell-gi, haskell-gi-base, hslogger, HStringTemplate
+     , HTTP, multimap, network, network-uri, old-locale
+     , optparse-applicative, parsec, process, rate-limit, regex-compat
+     , safe, split, status-notifier-item, stm, template-haskell, text
+     , time, time-locale-compat, time-units, transformers
+     , transformers-base, tuple, unix, utf8-string, X11, xdg-basedir
+     , xml, xml-helpers, xmonad, xmonad-contrib
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "2.0.0";
-       sha256 = "1s3nqvsivi4wgi6hi7b3f83r75sl5qp0hsqr0cdwd7s8fqai3wia";
-       revision = "1";
-       editedCabalFile = "1sqgzjv0nhp5nmzn4qh80ghq38p5q7c8nvm1v1wh1dx2j7lkjnzc";
+       version = "2.1.0";
+       sha256 = "1a32wpxjyimn08pmbwwx7crn97hg9wmlva5f0blkw4cwv090jhh8";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          alsa-mixer base cairo ConfigFile containers dbus dbus-hslogger
          directory dyre either enclosed-exceptions filepath gi-cairo gi-gdk
-         gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk glib gtk-sni-tray gtk-strut
-         gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger
-         HStringTemplate HTTP mtl multimap network network-uri old-locale
-         parsec process rate-limit regex-compat safe split
-         status-notifier-item stm text time time-locale-compat time-units
+         gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs glib gtk-sni-tray
+         gtk-strut gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger
+         HStringTemplate HTTP multimap network network-uri old-locale parsec
+         process rate-limit regex-compat safe split status-notifier-item stm
+         template-haskell text time time-locale-compat time-units
          transformers transformers-base tuple unix utf8-string X11
          xdg-basedir xml xml-helpers xmonad xmonad-contrib
        ];
@@ -205810,6 +206129,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.4";
        sha256 = "17f4rcga0qnynf1h047chwm5nicmik79lw04kiwpw48ahwc0zkp3";
+       revision = "2";
+       editedCabalFile = "1ijz75l5jhyxjk6hjrhbsw4470dxfdnwdwn9q3akxbmk095hpzjl";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
@@ -208153,15 +208474,15 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
-  "texmath_0_11" = callPackage
+  "texmath_0_11_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, pandoc-types, parsec, process, split, syb, temporary, text
      , utf8-string, xml
      }:
      mkDerivation {
        pname = "texmath";
-       version = "0.11";
-       sha256 = "1sssa9ld13bhs4b6cpv5mwf18bjajr8fgw32g4wp2smgv9p2jv9f";
+       version = "0.11.0.1";
+       sha256 = "11dc09hfnyfsz20ch2c867w0zdgjkzq41506lm61i3dk87ngdisf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -208758,6 +209079,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-region_0_3_1_0" = callPackage
+    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
+     , groups, hspec, lens, text
+     }:
+     mkDerivation {
+       pname = "text-region";
+       version = "0.3.1.0";
+       sha256 = "1zy5zb7xg1343hlkwawnbca7f6gal9028ps1kp83fg2vmq1aqk57";
+       libraryHaskellDepends = [
+         aeson base base-unicode-symbols bytestring groups lens text
+       ];
+       testHaskellDepends = [ base base-unicode-symbols hspec lens text ];
+       homepage = "https://github.com/mvoidex/text-region";
+       description = "Marking text regions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-register-machine" = callPackage
     ({ mkDerivation, base, containers, mtl, vector }:
      mkDerivation {
@@ -218947,6 +219286,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "uri-bytestring_0_3_2_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-compat, blaze-builder
+     , bytestring, containers, criterion, deepseq, deepseq-generics
+     , generics-sop, HUnit, network-uri, QuickCheck
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, th-lift-instances
+     , transformers
+     }:
+     mkDerivation {
+       pname = "uri-bytestring";
+       version = "0.3.2.0";
+       sha256 = "1q04j5ybvk37zk2m0bkjwyhblz0ymdj0cn4rvsvdca1ikn5xdv5c";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring containers
+         template-haskell th-lift-instances
+       ];
+       testHaskellDepends = [
+         attoparsec base base-compat blaze-builder bytestring containers
+         generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty
+         tasty-hunit tasty-quickcheck transformers
+       ];
+       benchmarkHaskellDepends = [
+         base blaze-builder bytestring criterion deepseq deepseq-generics
+         network-uri
+       ];
+       homepage = "https://github.com/Soostone/uri-bytestring";
+       description = "Haskell URI parsing as ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "uri-bytestring-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
@@ -223904,6 +224274,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wai-middleware-travisci" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , cryptonite, http-types, text, transformers, vault, wai
+     }:
+     mkDerivation {
+       pname = "wai-middleware-travisci";
+       version = "0.1.0";
+       sha256 = "0a58mlgimr6137aiwcdxjk15zy3y58dds4zxffd3vvn0lkzg5jdv";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cryptonite http-types text
+         transformers vault wai
+       ];
+       homepage = "https://github.com/mitchellwrosen/wai-middleware-travisci";
+       description = "WAI middleware for authenticating webhook payloads from Travis CI";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wai-middleware-verbs" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, hashable, http-types
      , mmorph, monad-control, monad-control-aligned, monad-logger, mtl
@@ -229519,8 +229906,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmlbf";
-       version = "0.4";
-       sha256 = "1f63ibvv7ywly7paam238y4bjhvg7jmn87368dnv5lsz28mq432m";
+       version = "0.4.1";
+       sha256 = "0xfw9z1l3ja4qq0lj9i2n81fdh43ggprsy8rm71pcdacnpl056hq";
        libraryHaskellDepends = [
          base bytestring containers text transformers unordered-containers
        ];
@@ -229902,8 +230289,8 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "0.1.1.8";
-       sha256 = "17w7hj4bgz1xkirj9dwgkbif4vpqvjnp5g2dvjna7qg5rw2hk3zj";
+       version = "0.2.0.1";
+       sha256 = "1rha8aw6pq9pdxznmr1i3q6jh1a7i88kr6arcnihhd21qp6vxz17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -230438,17 +230825,19 @@ self: {
      , data-default, directory, exceptions, fast-logger, monad-control
      , monad-logger, mtl, persistent, persistent-sqlite, random
      , resource-pool, resourcet, string-conversions, text, time
-     , transformers, unordered-containers, wai-logger, yaml
+     , transformers, unliftio-core, unordered-containers, wai-logger
+     , yaml
      }:
      mkDerivation {
        pname = "yam-app";
-       version = "0.1.11";
-       sha256 = "0qbc7s5l030yilq8zlq5hszk6hgqjxp6yablap1ykm2211wipbq3";
+       version = "0.2.0";
+       sha256 = "1fr3q4dih2vzby3jmb13zmi6cmmlp26gymx45pqb2g5fsg2nmp94";
        libraryHaskellDepends = [
          aeson base conduit containers ctrie data-default directory
          exceptions fast-logger monad-control monad-logger mtl persistent
          persistent-sqlite random resource-pool resourcet string-conversions
-         text time transformers unordered-containers wai-logger yaml
+         text time transformers unliftio-core unordered-containers
+         wai-logger yaml
        ];
        homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme";
        description = "Yam App";
@@ -230460,8 +230849,8 @@ self: {
     ({ mkDerivation, base, cron, yam-app }:
      mkDerivation {
        pname = "yam-job";
-       version = "0.1.11";
-       sha256 = "0hs46q1xwwx44f4zxhs4245cdnr9g4r2a67cm191n1wd86sfhrpc";
+       version = "0.2.0";
+       sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895";
        libraryHaskellDepends = [ base cron yam-app ];
        homepage = "https://github.com/leptonyu/yam/tree/master/yam-job#readme";
        license = stdenv.lib.licenses.bsd3;
@@ -230475,8 +230864,8 @@ self: {
      }:
      mkDerivation {
        pname = "yam-servant";
-       version = "0.1.11";
-       sha256 = "0z1my2jgcbvdx4v5zh66yw99vnck5rbi54s6adbp26v4szc8j40s";
+       version = "0.2.0";
+       sha256 = "0y1isi6c0pv87hygbbb2xfh4373bij1cig2hrpcq4ivyab0273xb";
        libraryHaskellDepends = [
          aeson base http-types lens servant servant-server servant-swagger
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
@@ -230501,14 +230890,15 @@ self: {
      }) {};
 
   "yam-transaction-postgresql" = callPackage
-    ({ mkDerivation, base, containers, persistent-postgresql, yam-app
+    ({ mkDerivation, base, containers, persistent-postgresql
+     , unliftio-core, yam-app
      }:
      mkDerivation {
        pname = "yam-transaction-postgresql";
-       version = "0.1.11";
-       sha256 = "1li9vmnnj9xw1j60gmjym9rxlljjic9w7bkxip22yhb6qnmidpc9";
+       version = "0.2.0";
+       sha256 = "1nm2bs285ldxv3zqsihha1wl1p46i8gd7w5nk2nnk60qilzhsc9s";
        libraryHaskellDepends = [
-         base containers persistent-postgresql yam-app
+         base containers persistent-postgresql unliftio-core yam-app
        ];
        homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-postgresql#readme";
        license = stdenv.lib.licenses.bsd3;

From 4b2eceaa3530e8cc1490d771d64492c4599e51f3 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Mon, 21 May 2018 19:26:25 +0800
Subject: [PATCH 2299/3370] ghc: fix dylib load command limits in compiler
 version 8.x

See https://phabricator.haskell.org/D4714 for the full details.
This will be part of ghc 8.6.

Closes https://github.com/NixOS/nixpkgs/pull/40877.
---
 pkgs/development/compilers/ghc/8.0.2.nix      |  3 ++-
 pkgs/development/compilers/ghc/8.2.2.nix      |  3 ++-
 pkgs/development/compilers/ghc/8.4.2.nix      |  3 ++-
 .../backport-dylib-command-size-limit.patch   | 24 +++++++++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 7d11ffb66c60..4017a01e7027 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -84,7 +84,8 @@ stdenv.mkDerivation rec {
       extraPrefix = "libraries/Cabal/";
     })
   ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch
-    ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch;
+    ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch
+    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
 
   # GHC is a bit confused on its cross terminology.
   preConfigure = ''
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 192ff1ba207d..dcc2852a3413 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -95,7 +95,8 @@ stdenv.mkDerivation rec {
     (fetchpatch { # Backport of https://phabricator.haskell.org/D4388 for more determinism
       url = "https://github.com/shlevy/ghc/commit/fec1b8d3555c447c0d8da0e96b659be67c8bb4bc.patch";
       sha256 = "1lyysz6hfd1njcigpm8xppbnkadqfs0kvrp7s8vqgb38pjswj5hg";
-    });
+    })
+    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
 
   postPatch = "patchShebangs .";
 
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 94555482d28b..5d8adafa9a7f 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -86,7 +86,8 @@ stdenv.mkDerivation rec {
     sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
     extraPrefix = "utils/hsc2hs/";
     stripLen = 1;
-  })];
+  })]
+    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
 
   postPatch = "patchShebangs .";
 
diff --git a/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch b/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch
new file mode 100644
index 000000000000..d0d94717d9c4
--- /dev/null
+++ b/pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch
@@ -0,0 +1,24 @@
+diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
+index acd0d61..3e83c15 100644
+--- a/compiler/main/DriverPipeline.hs
++++ b/compiler/main/DriverPipeline.hs
+@@ -1916,6 +1916,7 @@ linkBinary' staticLink dflags o_files dep_packages = do
+                       ++ pkg_framework_opts
+                       ++ debug_opts
+                       ++ thread_opts
++                      ++ (if (platformOS platform `elem` [OSDarwin]) then [ "-Wl,-dead_strip_dylibs" ] else [])
+                     ))
+ 
+ exeFileName :: Bool -> DynFlags -> FilePath
+diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
+index 1ab5b13..2ebbf51 100644
+--- a/compiler/main/SysTools.hs
++++ b/compiler/main/SysTools.hs
+@@ -1737,6 +1737,7 @@ linkDynLib dflags0 o_files dep_packages
+                  ++ map Option pkg_lib_path_opts
+                  ++ map Option pkg_link_opts
+                  ++ map Option pkg_framework_opts
++                 ++ [ Option "-Wl,-dead_strip_dylibs" ]
+               )
+         OSiOS -> throwGhcExceptionIO (ProgramError "dynamic libraries are not supported on iOS target")
+         _ -> do

From bd60d9a6bbb0bb5ba009f9f7dea9215ac8c3b4ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 22 May 2018 10:34:21 +0200
Subject: [PATCH 2300/3370] all-cabal-hashes: update Hackage snapshot to latest
 version

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 46ce08fe8cf2..e2f14a059c24 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/7988bc2977184737900cc54b2dda27af6921f5ee.tar.gz";
-  sha256 = "1zagnnab5z3zymniw5rrdahlxrfpnyf30iysa1lylgwlscnzfv0l";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/810aa8e3848857c1158ded74a52159220119d188.tar.gz";
+  sha256 = "1s4x3ipn2san4rvfagmczdn70rhygpwwdmz0pqvy7q4rmgxy9x1i";
 }

From 561a1f177abf1c14eb0f41938ab26e99d761378d Mon Sep 17 00:00:00 2001
From: Andrea Bedini <andreabedini@users.noreply.github.com>
Date: Tue, 22 May 2018 17:00:37 +0800
Subject: [PATCH 2301/3370] pythonPackages.docker: 3.2.1 -> 3.3.0 (#40857)

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

diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix
index c290c6bd177b..2ae56b7dc5a7 100644
--- a/pkgs/development/python-modules/docker/default.nix
+++ b/pkgs/development/python-modules/docker/default.nix
@@ -3,12 +3,12 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "3.2.1";
+  version = "3.3.0";
   pname = "docker";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0d698c3dc4df66c988de5df21a62cdc3450de2fa8523772779e5e23799c41f43";
+    sha256 = "dc5cc0971a0d36fe94c5ce89bd4adb6c892713500af7b0818708229c3199911a";
   };
 
   propagatedBuildInputs = [

From 57d591ec7f386453444f0b2e9765b336cea5f95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Tue, 22 May 2018 11:01:55 +0200
Subject: [PATCH 2302/3370] youtube-dl: use toPythonApplication (#40831)

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index b639397388b4..7e503f326fd5 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, targetPlatform, fetchurl, buildPythonApplication
+{ stdenv, targetPlatform, fetchurl, buildPythonPackage
 , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc
 # Pandoc is required to build the package's man page. Release tarballs contain a
 # formatted man page already, though, it will still be installed. We keep the
@@ -13,7 +13,7 @@
 , makeWrapper }:
 
 with stdenv.lib;
-buildPythonApplication rec {
+buildPythonPackage rec {
 
   pname = "youtube-dl";
   version = "2018.05.18";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 548ac948c9e6..c7d4ece62567 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15089,7 +15089,6 @@ with pkgs;
   bombono = callPackage ../applications/video/bombono {};
 
   bomi = libsForQt5.callPackage ../applications/video/bomi {
-    youtube-dl = pythonPackages.youtube-dl;
     pulseSupport = config.pulseaudio or true;
     ffmpeg = ffmpeg_2;
   };
@@ -17045,7 +17044,6 @@ with pkgs;
 
   mpv = callPackage ../applications/video/mpv rec {
     inherit (luaPackages) luasocket;
-    youtube-dl = pythonPackages.youtube-dl;
     waylandSupport     = stdenv.isLinux;
     alsaSupport        = !stdenv.isDarwin;
     pulseSupport       = !stdenv.isDarwin;
@@ -18970,7 +18968,9 @@ with pkgs;
 
   yoshimi = callPackage ../applications/audio/yoshimi { };
 
-  inherit (pythonPackages) youtube-dl;
+  youtube-dl = with pythonPackages; toPythonApplication youtube-dl;
+
+  youtube-dl-light = with pythonPackages; toPythonApplication youtube-dl-light;
 
   youtube-viewer = perlPackages.WWWYoutubeViewer;
 

From 05db1a11a9e58d699b32855ce04ebb0f8c26538d Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Tue, 22 May 2018 11:40:26 +0200
Subject: [PATCH 2303/3370] pythonPackages.timeout-decorator: 0.3.2 -> 0.4.0
 (#40914)

---
 .../python-modules/timeout-decorator/default.nix | 16 ++++++++++++++++
 pkgs/top-level/python-packages.nix               | 10 +---------
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/timeout-decorator/default.nix

diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix
new file mode 100644
index 000000000000..342531ab9764
--- /dev/null
+++ b/pkgs/development/python-modules/timeout-decorator/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "timeout-decorator";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1bckwbi5078z3x9lyf8vl9dhx10nymwwnp46c98wm5m02x5j37g4";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Timeout decorator";
+    license = licenses.mit;
+    homepage = https://github.com/pnpnpn/timeout-decorator;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1e7acc656352..3e5d663b88ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13034,15 +13034,7 @@ in {
     };
   };
 
-  timeout-decorator = buildPythonPackage rec {
-    name    = "timeout-decorator-${version}";
-    version = "0.3.2";
-
-    src = pkgs.fetchurl {
-      url    = "http://pypi.python.org/packages/source/t/timeout-decorator/${name}.tar.gz";
-      sha256 = "1x9l8bwdk72if2d5h5mi4lcaidbsmyh0iz114cfyyj1rzz5rxqaf";
-    };
-  };
+  timeout-decorator = callPackage ../development/python-modules/timeout-decorator { };
 
   pid = buildPythonPackage rec {
     name = "pid-${version}";

From bb28b3e80fe6e394a809bf7393c4d551c30247b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 22 May 2018 12:08:38 +0200
Subject: [PATCH 2304/3370] pythonPackages.pyhomematic: 0.1.42 -> 0.1.43

---
 .../python-modules/pyhomematic/default.nix         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 0967659a641f..ea364c09b807 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub }:
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.42";
+  version = "0.1.43";
 
   disabled = !isPy3k;
 
-  # PyPI tarball does not include tests/ directory
-  src = fetchFromGitHub {
-    owner = "danielperna84";
-    repo = pname;
-    rev = version;
-    sha256 = "0h7bq66q22kzj1xwhxmr7knibsmb4csjwq3jr19fyl9sxxmgqwqy";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0b6f4f5c8ddca15e0a1df367bafdffb2f08f1e42f17c78b9470573287e5b20bc";
   };
 
+  # PyPI tarball does not include tests/ directory
   # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126
   doCheck = false;
 

From a8a6d26f8f047a37170c3ce59b39f30be4da6aee Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 22 May 2018 12:10:51 +0200
Subject: [PATCH 2305/3370] partition-manager: 3.0.1 -> 3.3.1 (#40895)

The `3.0.1` build was broken (see the Hydra build from
https://hydra.nixos.org/build/74368257 for further reference).

Because of the missing `utillinux` build input the package fails fairly
early:

```
-- Checking for module 'blkid'
--   No package 'blkid' found
CMake Error at /nix/store/9hmhxgj4jk6jmxihgavj6gm0p759misc-cmake-3.10.2/share/cmake-3.10/Modules/FindPkgConfig.cmake:415 (message):
  A required package was not found
```

Additionally `partition-manager` was broken on non-KDE desktops (none+i3
in my case) as the plugins from `libsForQt5.kpmcore` couldn't be found
in `QT_PLUGIN_PATH` unless it's installed in
`environment.systemPackages` or with `nix-env -iA libsForQt5.kpmcore`.
This has been fixed by adding a wrapper in the `postInstall` hook which
prefixes the `QT_PLUGIN_PATH` with the plugin path from `kpmcore` used
for the build.
---
 pkgs/tools/misc/partition-manager/default.nix | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index a1c1eccdd88a..4599309b2384 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,26 +1,36 @@
 { mkDerivation, fetchurl, lib
 , extra-cmake-modules, kdoctools, wrapGAppsHook
 , kconfig, kcrash, kinit, kpmcore
-, eject, libatasmart }:
+, eject, libatasmart , utillinux, makeWrapper, qtbase
+}:
 
 let
   pname = "partitionmanager";
 in mkDerivation rec {
   name = "${pname}-${version}";
-  version = "3.0.1";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
+    sha256 = "0jhggb4xksb0k0mj752n6pz0xmccnbzlp984xydqbz3hkigra1si";
   };
 
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook makeWrapper ];
+
+  # refer to kpmcore for the use of eject
+  buildInputs = [ eject libatasmart utillinux ];
+  propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/partitionmanager" --prefix QT_PLUGIN_PATH : "${kpmcore}/lib/qt-5.${lib.versions.minor qtbase.version}/plugins"
+  '';
+
   meta = with lib; {
     description = "KDE Partition Manager";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ peterhoeg ];
+    homepage = https://www.kde.org/applications/system/kdepartitionmanager/;
+    maintainers = with maintainers; [ peterhoeg ma27 ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  # refer to kpmcore for the use of eject
-  buildInputs = [ eject libatasmart ];
-  propagatedBuildInputs = [ kconfig kcrash kinit kpmcore ];
 }

From e99a4c43d107f857f73cbabdbc9cf0a6f8315281 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 22 May 2018 03:34:03 -0700
Subject: [PATCH 2306/3370] eventstore: 4.1.0 -> 4.1.1 (#40112)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/EventStore/versions.

These checks were done:

- built on NixOS
- ran ‘/nix/store/sv7b0cs1a4vhh5zs4a0ync4rhs0az7gi-EventStore-4.1.1/bin/clusternode -h’ got 0 exit code
- ran ‘/nix/store/sv7b0cs1a4vhh5zs4a0ync4rhs0az7gi-EventStore-4.1.1/bin/clusternode --help’ got 0 exit code
- found 4.1.1 with grep in /nix/store/sv7b0cs1a4vhh5zs4a0ync4rhs0az7gi-EventStore-4.1.1
- directory tree listing: https://gist.github.com/952ce30807022dab867694094dd49497
---
 pkgs/servers/nosql/eventstore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index 3ec00dfa16e7..f97a3a5c1842 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -5,12 +5,12 @@
 
 stdenv.mkDerivation rec {
   name = "EventStore-${version}";
-  version = "4.1.0";
+  version = "4.1.1";
   src = fetchFromGitHub {
     owner  = "EventStore";
     repo   = "EventStore";
     rev    = "oss-v${version}";
-    sha256 = "0mvjz327kfg157fwvy8xkkf5h0g3v373pfwr70cslsy96n45jp10";
+    sha256 = "1069ncb9ps1wi71yw1fzkfd9rfsavccw8xj3a3miwd9x72w8636f";
   };
 
   buildPhase = ''

From 214292b507a062c3908452cfc3e1c7119f2d5997 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 22 May 2018 03:35:56 -0700
Subject: [PATCH 2307/3370] altcoins.parity-ui: 0.1.1 -> 0.2.1 (#40647)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/parity-ui/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/11bn5brs3infc88fhfcxq5zhy8p1fsg3-parity-ui-0.2.1/bin/parity-ui had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.2.1 with grep in /nix/store/11bn5brs3infc88fhfcxq5zhy8p1fsg3-parity-ui-0.2.1
- directory tree listing: https://gist.github.com/1087da639a875b39e9704339efd4a70c
- du listing: https://gist.github.com/d17a3cbf1828838b4d0115d801e376c0
---
 pkgs/applications/altcoins/parity-ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
index 56a95b6d5968..316c1fa3701d 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -6,11 +6,11 @@ uiEnv = pkgs.callPackage ./env.nix { };
 
 in stdenv.mkDerivation rec {
   name = "parity-ui-${version}";
-  version = "0.1.1";
+  version = "0.2.1";
 
   src = fetchurl {
     url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
-    sha256 = "1jym6q63m5f4xm06dxiiabhbqnr0hysf2d3swysncs5hg6w00lh3";
+    sha256 = "08gh438mqxj2h8i9hv826bx040wmkmdgsda5grj0k81459vds31l";
     name = "${name}.deb";
   };
 

From 72f293aa50a4e7425b6b054cc7bea7ec0c4027ad Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 22 May 2018 03:11:58 +0200
Subject: [PATCH 2308/3370] python3Packages.pyairvisual: init at 1.0.0

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

diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix
new file mode 100644
index 000000000000..010c2805d2b6
--- /dev/null
+++ b/pkgs/development/python-modules/pyairvisual/default.nix
@@ -0,0 +1,30 @@
+{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, requests
+, requests-mock, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pyairvisual";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "bachya";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ng6k07n91k5l68zk3hl4fywb33admp84wqdm20qmmw9yc9c64fd";
+  };
+
+  checkInputs = [ pytest requests-mock ];
+  propagatedBuildInputs = [ requests ];
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  disabled = !isPy3k;
+
+  meta = with lib; {
+    description = "A thin Python wrapper for the AirVisual API";
+    license = licenses.mit;
+    homepage = https://github.com/bachya/pyairvisual;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e5d663b88ce..42f5f6c17112 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -319,6 +319,8 @@ in {
 
   pyaes = callPackage ../development/python-modules/pyaes { };
 
+  pyairvisual = callPackage ../development/python-modules/pyairvisual { };
+
   pyamf = callPackage ../development/python-modules/pyamf { };
 
   pyarrow = callPackage ../development/python-modules/pyarrow {

From 852fa6b86fbe9e2ac6434b6b8c0111d4bd9dfad3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 22 May 2018 03:14:04 +0200
Subject: [PATCH 2309/3370] home-assistant module: add openFirewall option

---
 nixos/modules/services/misc/home-assistant.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix
index 1dc7b44ee37b..05555353f207 100644
--- a/nixos/modules/services/misc/home-assistant.nix
+++ b/nixos/modules/services/misc/home-assistant.nix
@@ -128,9 +128,17 @@ in {
         you might need to specify it in <literal>extraPackages</literal>.
       '';
     };
+
+    openFirewall = mkOption {
+      default = false;
+      type = types.bool;
+      description = "Whether to open the firewall for the specified port.";
+    };
   };
 
   config = mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
+
     systemd.services.home-assistant = {
       description = "Home Assistant";
       after = [ "network.target" ];

From a32b6d5c9a5c6aaa6bf05939043f2a771b43e763 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 22 May 2018 03:15:22 +0200
Subject: [PATCH 2310/3370] networking.routes: static routes are proto static

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index e754a1e8718d..c4a2bd1f75fd 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -209,7 +209,7 @@ let
                   ''
                      echo "${cidr}" >> $state
                      echo -n "adding route ${cidr}... "
-                     if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" 2>&1); then
+                     if out=$(ip route add "${cidr}" ${options} ${via} dev "${i.name}" proto static 2>&1); then
                        echo "done"
                      elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then
                        echo "'ip route add "${cidr}" ${options} ${via} dev "${i.name}"' failed: $out"

From 04a2885dbf910ade6fee9e600e66fab8750b4eb4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 22 May 2018 11:01:01 +0200
Subject: [PATCH 2311/3370] hostapd: install man pages

---
 pkgs/os-specific/linux/hostapd/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index fa4d604b4001..8ae082ba9d4a 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -62,6 +62,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libnl openssl sqlite ];
 
+  outputs = [ "out" "man" ];
+
   extraConfig = ''
     CONFIG_DRIVER_WIRED=y
     CONFIG_LIBNL32=y
@@ -103,6 +105,10 @@ stdenv.mkDerivation rec {
   '';
 
   preInstall = "mkdir -p $out/bin";
+  postInstall = ''
+    install -vD hostapd.8 -t $man/share/man/man8
+    install -vD hostapd_cli.1 -t $man/share/man/man1
+  '';
 
   meta = {
     homepage = http://hostap.epitest.fi;

From 3807a0d526498482eae7ea8ea805327c29c5edf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 22 May 2018 14:48:55 +0200
Subject: [PATCH 2312/3370] home-assistant: deal with multiple packages
 matching requirement

---
 .../home-assistant/component-packages.nix     |  4 +--
 .../home-assistant/parse-requirements.py      | 35 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 8d6c6cfaeaf9..54983a1d9f7c 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -167,7 +167,7 @@
     "lutron_caseta" = ps: with ps; [  ];
     "matrix" = ps: with ps; [ matrix-client ];
     "maxcube" = ps: with ps; [  ];
-    "media_extractor" = ps: with ps; [  ];
+    "media_extractor" = ps: with ps; [ youtube-dl-light ];
     "media_player.anthemav" = ps: with ps; [  ];
     "media_player.aquostv" = ps: with ps; [  ];
     "media_player.blackbird" = ps: with ps; [  ];
@@ -276,7 +276,7 @@
     "satel_integra" = ps: with ps; [  ];
     "scene.hunterdouglas_powerview" = ps: with ps; [  ];
     "scsgate" = ps: with ps; [  ];
-    "sensor.airvisual" = ps: with ps; [  ];
+    "sensor.airvisual" = ps: with ps; [ pyairvisual ];
     "sensor.alpha_vantage" = ps: with ps; [  ];
     "sensor.bbox" = ps: with ps; [  ];
     "sensor.bh1750" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 46e7acee1782..5beeaccf0881 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -25,6 +25,13 @@ GENERAL_PREFIX = '# homeassistant.'
 COMPONENT_PREFIX = GENERAL_PREFIX + 'components.'
 PKG_SET = 'python3Packages'
 
+# If some requirements are matched by multiple python packages,
+# the following can be used to choose one of them
+PKG_PREFERENCES = {
+    # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl
+    'youtube-dl': 'youtube-dl-light'
+}
+
 def get_version():
     with open(os.path.dirname(sys.argv[0]) + '/default.nix') as f:
         m = re.search('hassVersion = "([\\d\\.]+)";', f.read())
@@ -59,7 +66,7 @@ output = subprocess.check_output(['nix-env', '-f', os.path.dirname(sys.argv[0])
 packages = json.loads(output)
 
 def name_to_attr_path(req):
-    attr_paths = []
+    attr_paths = set()
     names = [req]
     # E.g. python-mpd2 is actually called python3.6-mpd2
     # instead of python-3.6-python-mpd2 inside Nixpkgs
@@ -71,11 +78,18 @@ def name_to_attr_path(req):
         pattern = re.compile('^python\\d\\.\\d-{}-\\d'.format(name), re.I)
         for attr_path, package in packages.items():
             if pattern.match(package['name']):
-                attr_paths.append(attr_path)
+                attr_paths.add(attr_path)
+    if len(attr_paths) > 1:
+        for to_replace, replacement in PKG_PREFERENCES.items():
+            try:
+                attr_paths.remove(PKG_SET + '.' + to_replace)
+                attr_paths.add(PKG_SET + '.' + replacement)
+            except KeyError:
+                pass
     # Let's hope there's only one derivation with a matching name
     assert(len(attr_paths) <= 1)
-    if attr_paths:
-        return attr_paths[0]
+    if len(attr_paths) == 1:
+        return attr_paths.pop()
     else:
         return None
 
@@ -86,14 +100,11 @@ build_inputs = {}
 for component, reqs in OrderedDict(sorted(requirements.items())).items():
     attr_paths = []
     for req in reqs:
-        try:
-            name = req.split('==')[0]
-            attr_path = name_to_attr_path(name)
-            if attr_path is not None:
-                # Add attribute path without "python3Packages." prefix
-                attr_paths.append(attr_path[len(PKG_SET + '.'):])
-        except RequirementParseError:
-            continue
+        name = req.split('==')[0]
+        attr_path = name_to_attr_path(name)
+        if attr_path is not None:
+            # Add attribute path without "python3Packages." prefix
+            attr_paths.append(attr_path[len(PKG_SET + '.'):])
     else:
         build_inputs[component] = attr_paths
 

From 87125d6d085aa5810e31f3bc6a35626818861f36 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Mon, 21 May 2018 22:42:35 +0200
Subject: [PATCH 2313/3370] nix-du: init at 0.1.1

---
 .../package-management/nix-du/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/package-management/nix-du/default.nix

diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
new file mode 100644
index 000000000000..2e68666b7fa3
--- /dev/null
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz }:
+rustPlatform.buildRustPackage rec {
+  name = "nix-du-${version}";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "symphorien";
+    repo = "nix-du";
+    rev = "v${version}";
+    sha256 = "0kxacn5qw21pp4zl6wr9wyb2mm2nlnp6mla3m5p9dm7vrm1fd1x9";
+  };
+  cargoSha256 = "04c48lzi7hny3nq4ffdpvsr4dxbi32faka163fp1yc9953zdw9az";
+
+  doCheck = !stdenv.isDarwin;
+  checkInputs = [ graphviz ];
+  nativeBuildInputs = [] ++ stdenv.lib.optionals doCheck checkInputs;
+
+  buildInputs = [
+    boost
+    nix
+  ];
+
+  meta = with stdenv.lib; {
+    description = "A tool to determine which gc-roots take space in your nix store";
+    homepage = https://github.com/symphorien/nix-du;
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.symphorien ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b20cf36a05fb..f8b704d03913 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20729,6 +20729,8 @@ with pkgs;
   nix-deploy = haskell.lib.justStaticExecutables haskellPackages.nix-deploy;
   nix-diff = haskell.lib.justStaticExecutables haskellPackages.nix-diff;
 
+  nix-du = callPackage ../tools/package-management/nix-du { };
+
   nix-info = callPackage ../tools/nix/info { };
   nix-info-tested = callPackage ../tools/nix/info { doCheck = true; };
 

From 0fd461d5b5da30462dfbcec3d3a2bd426700800c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 22 May 2018 16:47:28 +0300
Subject: [PATCH 2314/3370] db: Use more conventional outputs, also split bin

---
 pkgs/development/libraries/db/generic.nix         | 2 +-
 pkgs/development/perl-modules/DB_File/default.nix | 4 ++--
 pkgs/servers/ldap/389/default.nix                 | 4 +++-
 pkgs/tools/filesystems/netatalk/default.nix       | 2 +-
 pkgs/tools/package-management/apt/default.nix     | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix
index d4398692a4e6..06dde2ad4078 100644
--- a/pkgs/development/libraries/db/generic.nix
+++ b/pkgs/development/libraries/db/generic.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (rec {
 
   patches = extraPatches;
 
-  outputs = [ "out" "lib" ];
+  outputs = [ "bin" "out" "dev" ];
 
   configureFlags =
     [
diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index b6158a61da5f..9d189de77c4e 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -12,8 +12,8 @@ buildPerlPackage rec {
     cat > config.in <<EOF
     PREFIX = size_t
     HASH = u_int32_t
-    LIB = ${db.lib}/lib
-    INCLUDE = ${db}/include
+    LIB = ${db.out}/lib
+    INCLUDE = ${db.dev}/include
     EOF
   '';
 }
diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix
index 5ef909a6d09c..6826df5f6e86 100644
--- a/pkgs/servers/ldap/389/default.nix
+++ b/pkgs/servers/ldap/389/default.nix
@@ -36,7 +36,9 @@ stdenv.mkDerivation rec {
     "--sysconfdir=/etc"
     "--localstatedir=/var"
     "--with-openldap"
-    "--with-db=${db}"
+    "--with-db"
+    "--with-db-inc=${db.dev}/include"
+    "--with-db-lib=${db.out}/lib"
     "--with-sasl=${cyrus_sasl.dev}"
     "--with-netsnmp=${net_snmp}"
   ];
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 33b473df5a22..797ce40a561f 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec{
   buildInputs = [ db libgcrypt avahi libiconv pam openssl acl ];
 
   configureFlags = [
-    "--with-bdb=${db}"
+    "--with-bdb=${db.dev}"
     "--with-ssl-dir=${openssl.dev}"
     "--with-lockfile=/run/lock/netatalk"
     "--localstatedir=/var/lib"
diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix
index 8077fb1d93d0..b2d5e96f391c 100644
--- a/pkgs/tools/package-management/apt/default.nix
+++ b/pkgs/tools/package-management/apt/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${Po4a}/lib/perl5";
 
     cmakeFlagsArray+=(
-      -DBERKELEY_DB_INCLUDE_DIRS="${db}"/include
+      -DBERKELEY_DB_INCLUDE_DIRS=${db.dev}/include
       -DDOCBOOK_XSL="${docbook_xsl}"/share/xml/docbook-xsl
       -DROOT_GROUP=root
       -DWITH_DOC=${if withDocs then "ON" else "OFF"}

From a28c4a5396b5435bf79ed4e1e5961102f940b7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 22 May 2018 01:26:56 +0200
Subject: [PATCH 2315/3370] perlPackages.BerkeleyDB: fix db dependency

This fixes a regression introduced in 4b06383.

[dezgeg squashed in to fit the changes introduced in "db: Use more
conventional outputs, also split bin"]
---
 doc/languages-frameworks/perl.xml                    | 4 ++--
 pkgs/development/perl-modules/BerkeleyDB/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/languages-frameworks/perl.xml b/doc/languages-frameworks/perl.xml
index 2fe64999e139..a675e6665863 100644
--- a/doc/languages-frameworks/perl.xml
+++ b/doc/languages-frameworks/perl.xml
@@ -109,8 +109,8 @@ buildPerlPackage rec {
   };
 
   preConfigure = ''
-    echo "LIB = ${db}/lib" > config.in
-    echo "INCLUDE = ${db}/include" >> config.in
+    echo "LIB = ${db.out}/lib" > config.in
+    echo "INCLUDE = ${db.dev}/include" >> config.in
   '';
 }
 </programlisting>
diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index a6af84a6581d..72e27ab9a0dd 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -9,7 +9,7 @@ buildPerlPackage rec {
   };
 
   preConfigure = ''
-    echo "LIB = ${db}/lib" > config.in
-    echo "INCLUDE = ${db}/include" >> config.in
+    echo "LIB = ${db.out}/lib" > config.in
+    echo "INCLUDE = ${db.dev}/include" >> config.in
   '';
 }

From 7c8705256c3daeeeb062a2c965b77d841ef99a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 22 May 2018 01:51:49 +0200
Subject: [PATCH 2316/3370] aprutil: fix db dependency

This fixes a regression introduced in 4b06383.

[dezgeg squashed in to fit the changes introduced in "db: Use more
conventional outputs, also split bin", also patch .la file]
---
 pkgs/development/libraries/apr-util/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 7e7864cef52c..3c2ff777608d 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-apr=${apr.dev}" "--with-expat=${expat.dev}" ]
     ++ optional (!stdenv.isCygwin) "--with-crypto"
     ++ optional sslSupport "--with-openssl=${openssl.dev}"
-    ++ optional bdbSupport "--with-berkeley-db=${db}"
+    ++ optional bdbSupport "--with-berkeley-db=${db.dev}"
     ++ optional ldapSupport "--with-ldap=ldap"
     ++ optionals stdenv.isCygwin
       [ "--without-pgsql" "--without-sqlite2" "--without-sqlite3"
@@ -47,6 +47,7 @@ stdenv.mkDerivation rec {
     for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do
       substituteInPlace $f \
         --replace "${expat.dev}/lib" "${expat.out}/lib" \
+        --replace "${db.dev}/lib" "${db.out}/lib" \
         --replace "${openssl.dev}/lib" "${openssl.out}/lib"
     done
 

From 9a100e3e31a0dd0c7d462787b0aabaaf3fc23a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 22 May 2018 02:28:54 +0200
Subject: [PATCH 2317/3370] heimdal: Fix db include

[dezgeg squashed in to fit the changes introduced in "db: Use more
conventional outputs, also split bin"]
---
 pkgs/development/libraries/kerberos/heimdal.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index b72a00d242e9..36ee3fe2d3ae 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation rec {
     "--with-libedit=${libedit}"
     "--with-openssl=${openssl.dev}"
     "--without-x"
-    "--with-berkeley-db=${db}"
+    "--with-berkeley-db"
+    "--with-berkeley-db-include=${db.dev}/include"
   ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap.dev}"
   ] ++ optionals (!stdenv.isFreeBSD) [

From 020957716e2544db90628762f7561580b2b40d3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 22 May 2018 02:29:14 +0200
Subject: [PATCH 2318/3370] heimdal: Fix darwin build

---
 pkgs/development/libraries/kerberos/heimdal.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix                 |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 36ee3fe2d3ae..24adb2a141e8 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, python2, perl, yacc, flex
 , texinfo, perlPackages
 , openldap, libcap_ng, sqlite, openssl, db, libedit, pam
-
+, CoreFoundation, Security, SystemConfiguration
 # Extra Args
 , type ? ""
 }:
@@ -26,8 +26,9 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
     ++ (with perlPackages; [ JSON ])
     ++ optional (!libOnly) texinfo;
-  buildInputs = optionals (!stdenv.isFreeBSD) [ libcap_ng db ]
-    ++ [ sqlite openssl libedit ]
+  buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
+    ++ [ db sqlite openssl libedit ]
+    ++ optionals (stdenv.isDarwin) [ CoreFoundation Security SystemConfiguration ]
     ++ optionals (!libOnly) [ openldap pam ];
 
   ## ugly, X should be made an option
@@ -43,7 +44,7 @@ stdenv.mkDerivation rec {
     "--with-berkeley-db-include=${db.dev}/include"
   ] ++ optionals (!libOnly) [
     "--with-openldap=${openldap.dev}"
-  ] ++ optionals (!stdenv.isFreeBSD) [
+  ] ++ optionals (stdenv.isLinux) [
     "--with-capng"
   ];
 
@@ -93,7 +94,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "An implementation of Kerberos 5 (and some more stuff)";
     license = licenses.bsd3;
-    platforms = platforms.linux ++ platforms.freebsd;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3efdf7de0ef4..e3074cbf80af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9411,7 +9411,9 @@ with pkgs;
 
   hamlib = callPackage ../development/libraries/hamlib { };
 
-  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { };
+  heimdal = callPackage ../development/libraries/kerberos/heimdal.nix {
+    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
+  };
   libheimdal = heimdal.override { type = "lib"; };
 
   harfbuzz = callPackage ../development/libraries/harfbuzz { };

From 3d4ef86766d7d00ba1b6a48293edc8363f9d9620 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 22 May 2018 02:52:43 +0200
Subject: [PATCH 2319/3370] librdf_raptor2: Enable darwin build

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

diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix
index 46a94e52595c..b7a78cb3daf6 100644
--- a/pkgs/development/libraries/librdf/raptor2.nix
+++ b/pkgs/development/libraries/librdf/raptor2.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://librdf.org/raptor;
     license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
     maintainers = with stdenv.lib.maintainers; [ marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 1bf30c9223a864bd2c039bf21b83735abf06f609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 22 May 2018 02:53:08 +0200
Subject: [PATCH 2320/3370] librdf_rasqal: Enable darwin build

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

diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix
index ceff244670f3..07f560fe2724 100644
--- a/pkgs/development/libraries/librdf/rasqal.nix
+++ b/pkgs/development/libraries/librdf/rasqal.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://librdf.org/rasqal;
     license = with stdenv.lib.licenses; [ lgpl21 asl20 ];
     maintainers = with stdenv.lib.maintainers; [ marcweber ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 79476b58830b6edd1a0cfc801b279767255f471a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 22 May 2018 02:54:21 +0200
Subject: [PATCH 2321/3370] librdf_redland: Fix db dependency

This fixes a regression introduced in 4b06383.

[dezgeg squashed in to fit the changes introduced in "db: Use more
conventional outputs, also split bin"]
---
 pkgs/development/libraries/librdf/redland.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 402af5d6f583..766b4aa341f0 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -28,7 +28,10 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--with-threads" ]
-    ++ stdenv.lib.optional withBdb "--with-bdb=${db}";
+    ++ stdenv.lib.optionals withBdb [
+      "--with-bdb-include=${db.dev}/include"
+      "--with-bdb-lib=${db.out}/lib"
+    ];
 
   # Fix broken DT_NEEDED in lib/redland/librdf_storage_sqlite.so.
   NIX_CFLAGS_LINK = "-lraptor2";

From 23a83fbf863b687d44e8cf030cc537fed049455d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Tue, 22 May 2018 02:55:26 +0200
Subject: [PATCH 2322/3370] librdf_redland: Enable darwin build

---
 pkgs/development/libraries/librdf/redland.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix
index 766b4aa341f0..633611273a30 100644
--- a/pkgs/development/libraries/librdf/redland.nix
+++ b/pkgs/development/libraries/librdf/redland.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, openssl, libxslt, perl
-, curl, pcre, libxml2, librdf_rasqal
+, curl, pcre, libxml2, librdf_rasqal, gmp
 , mysql, withMysql ? false
 , postgresql, withPostgresql ? false
 , sqlite, withSqlite ? true
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl pkgconfig ];
 
-  buildInputs = [ openssl libxslt curl pcre libxml2 ]
+  buildInputs = [ openssl libxslt curl pcre libxml2 gmp ]
     ++ stdenv.lib.optional withMysql mysql.connector-c
     ++ stdenv.lib.optional withSqlite sqlite
     ++ stdenv.lib.optional withPostgresql postgresql
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://librdf.org/;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 61a7b056fea8b25c0e5e72931060a5835cf63549 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 22 May 2018 09:20:53 -0700
Subject: [PATCH 2323/3370] libidn2: 2.0.4 -> 2.0.5 (#40852)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libidn2/versions.

These checks were done:

- built on NixOS
- /nix/store/lqhvipkml1hdjrc7x44a9qx6ib3h7fk4-libidn2-2.0.5-bin/bin/idn2 passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.0.5 with grep in /nix/store/lqhvipkml1hdjrc7x44a9qx6ib3h7fk4-libidn2-2.0.5-bin
- directory tree listing: https://gist.github.com/e275c93b988cd78a7716800d30d6d315
- du listing: https://gist.github.com/d80481a1635867ebfce278bd1e58d900
---
 pkgs/development/libraries/libidn2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix
index 46cb579c56c4..a100b0cc5932 100644
--- a/pkgs/development/libraries/libidn2/default.nix
+++ b/pkgs/development/libraries/libidn2/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "libidn2-${version}";
-  version = "2.0.4";
+  version = "2.0.5";
 
   src = fetchurl {
     url = "mirror://gnu/gnu/libidn/${name}.tar.gz";
-    sha256 = "1w6jycr5bbawimhb72wxf9ic92yrhfadahfj0b70myw5n81nnjv4";
+    sha256 = "1f529jxmhj12q7i1gvw2d9i24zbslz3kj91kbgxac7vgi1q93xjk";
   };
 
   outputs = [ "bin" "dev" "out" "info" "devdoc" ];

From 98f89e5f5c68ae0469fb825e90f69dbc3bd960e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 22 May 2018 09:21:47 -0700
Subject: [PATCH 2324/3370] calamares: 3.1.12 -> 3.2.0 (#40870)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/calamares/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/zj062x5cqa9q77mddh01r14ia5ydfy4r-calamares-3.2.0/bin/calamares had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.2.0 with grep in /nix/store/zj062x5cqa9q77mddh01r14ia5ydfy4r-calamares-3.2.0
- directory tree listing: https://gist.github.com/10cd4415ded3afaf27cce14adc67e5e7
- du listing: https://gist.github.com/003ee89d5edc0dd858081d1bfefec1a4
---
 pkgs/tools/misc/calamares/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index f66cc60c9267..5dba7744d7b3 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -7,12 +7,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "calamares";
-  version = "3.1.12";
+  version = "3.2.0";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0k59wnch2gmbsr5dh5swbjp4rkf5c1ml0n4sxf196wdasraismc6";
+    sha256 = "1i5q3hffjqi1id9kv8sixhddxd90d5qqmbc7gf5vf9m3c54pln64";
   };
 
   buildInputs = [

From a7ab884128e2b95a3532b3a361dd6b6077d58c03 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Tue, 22 May 2018 12:22:42 -0400
Subject: [PATCH 2325/3370] poppler: 0.64.0 -> 0.65.0 (#40786)

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

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index a96de20ccfeb..960a792822d3 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let # beware: updates often break cups-filters build
-  version = "0.64.0";
+  version = "0.65.0";
   mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
 in
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/poppler-${version}.tar.xz";
-    sha256 = "1cb4gz3h7cfqyphhx71qc9mp417bdphchbfghmvhcy4zm4ngj7dj";
+    sha256 = "01wgvpi1l7nqkvixnmhmlpld0fjryhl7rlwvba6agz9yz1rwzj49";
   };
 
   outputs = [ "out" "dev" ];

From b77277fcdcd93f2188a1faa7ddd9ebe72484e2e5 Mon Sep 17 00:00:00 2001
From: Kevin Liu <kevin@potatofrom.space>
Date: Tue, 22 May 2018 12:38:05 -0400
Subject: [PATCH 2326/3370] helmfile: init at 0.16.0 (#40814)

---
 .../networking/cluster/helmfile/default.nix   | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/helmfile/default.nix

diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix
new file mode 100644
index 000000000000..b1dcfb809b5d
--- /dev/null
+++ b/pkgs/applications/networking/cluster/helmfile/default.nix
@@ -0,0 +1,24 @@
+{ lib, buildGoPackage, fetchFromGitHub, ... }:
+
+let version = "0.16.0"; in
+
+buildGoPackage {
+  name = "helmfile-${version}";
+
+  src = fetchFromGitHub {
+    owner = "roboll";
+    repo = "helmfile";
+    rev = "v${version}";
+    sha256 = "12gxlan89h0r83aaacshh58nd1pi26gx5gkna0ksll9wsfvraj4d";
+  };
+
+  goPackagePath = "github.com/roboll/helmfile";
+
+  meta = {
+    description = "Deploy Kubernetes Helm charts";
+    homepage = https://github.com/roboll/helmfile;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pneumaticat ];
+    platforms = lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdd26b5ee67b..6899d9079375 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20829,6 +20829,8 @@ with pkgs;
 
   helm = callPackage ../applications/audio/helm { };
 
+  helmfile = callPackage ../applications/networking/cluster/helmfile { };
+
   heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { };
 
   hplip = callPackage ../misc/drivers/hplip { };

From 11b343534578626d1354af507fcfb3572e3aaabe Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Tue, 22 May 2018 12:42:41 -0400
Subject: [PATCH 2327/3370] perlPackages.ParsePlainConfig: init at 3.05
 (#40624)

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8956f9806684..6f4b0649a126 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12060,6 +12060,20 @@ let self = _self // overrides; _self = with self; {
      };
   };
 
+  ParsePlainConfig = buildPerlPackage rec {
+    name = "Parse-PlainConfig-3.05";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/${name}.tar.gz";
+      sha256 = "6b78a8552398b0d2d7063505c93b3cfed0432c5b2cf6e00b8e51febf411c1efa";
+    };
+    propagatedBuildInputs = [ ClassEHierarchy Paranoid ];
+    meta = {
+      description = "Parser/Generator of human-readable conf files";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.limeytexan ];
+    };
+  };
+
   ParsePMFile = buildPerlPackage rec {
      name = "Parse-PMFile-0.41";
      src = fetchurl {

From 3dd635042023fb3dfbd88cdf1a915deb42ccac6f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 22 May 2018 13:25:09 -0400
Subject: [PATCH 2328/3370] doc: use "with stdenv.lib" in meta

---
 doc/meta.xml                             | 8 ++++----
 pkgs/applications/misc/hello/default.nix | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index ad16e7683f58..ab6befd4381c 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -8,16 +8,16 @@
   and so on. For instance, the GNU Hello package has a <varname>meta</varname>
   declaration like this:
 <programlisting>
-meta = {
+meta = with stdenv.lib; {
   description = "A program that produces a familiar, friendly greeting";
   longDescription = ''
     GNU Hello is a program that prints "Hello, world!" when you run it.
     It is fully customizable.
   '';
   homepage = http://www.gnu.org/software/hello/manual/;
-  license = stdenv.lib.licenses.gpl3Plus;
-  maintainers = [ stdenv.lib.maintainers.eelco ];
-  platforms = stdenv.lib.platforms.all;
+  license = licenses.gpl3Plus;
+  maintainers = [ maintainers.eelco ];
+  platforms = platforms.all;
 };
 </programlisting>
  </para>
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index 8a31c591b29b..c94f78317f4e 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -10,15 +10,15 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A program that produces a familiar, friendly greeting";
     longDescription = ''
       GNU Hello is a program that prints "Hello, world!" when you run it.
       It is fully customizable.
     '';
     homepage = http://www.gnu.org/software/hello/manual/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.all;
   };
 }

From 571a1e19e929d72bad5e99f3992728e4a16ca17b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Tue, 22 May 2018 19:26:32 +0200
Subject: [PATCH 2329/3370] coqPackages.iris: init at 3.1.0 (#40909)

---
 pkgs/development/coq-modules/iris/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/coq-modules/iris/default.nix

diff --git a/pkgs/development/coq-modules/iris/default.nix b/pkgs/development/coq-modules/iris/default.nix
new file mode 100644
index 000000000000..134ea45493df
--- /dev/null
+++ b/pkgs/development/coq-modules/iris/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchzip, coq, ssreflect, stdpp }:
+
+stdenv.mkDerivation rec {
+  version = "3.1.0";
+  name = "coq${coq.coq-version}-iris-${version}";
+  src = fetchzip {
+    url = "https://gitlab.mpi-sws.org/FP/iris-coq/-/archive/iris-${version}/iris-coq-iris-${version}.tar.gz";
+    sha256 = "0ipdb061jj205avxifshxkpyxxqykigmlxk2n5nvxj62gs3rl5j1";
+  };
+
+  buildInputs = [ coq ];
+  propagatedBuildInputs = [ ssreflect stdpp ];
+
+  enableParallelBuilding = true;
+
+  installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ];
+
+  meta = {
+    homepage = "https://gitlab.mpi-sws.org/FP/iris-coq";
+    description = "The Coq development of the Iris Project";
+    inherit (coq.meta) platforms;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+  };
+
+  passthru = {
+    compatibleCoqVersions = v: stdenv.lib.versionAtLeast v "8.6";
+  };
+
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 519d1cb9ed46..2bc5671e9874 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -29,6 +29,7 @@ let
       heq = callPackage ../development/coq-modules/heq {};
       HoTT = callPackage ../development/coq-modules/HoTT {};
       interval = callPackage ../development/coq-modules/interval {};
+      iris = callPackage ../development/coq-modules/iris {};
       math-classes = callPackage ../development/coq-modules/math-classes { };
       mathcomp = callPackage ../development/coq-modules/mathcomp { };
       metalib = callPackage ../development/coq-modules/metalib { };

From b7c73603745216a64bebdad627cfe4b4df364fcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <rschuetz17@gmail.com>
Date: Tue, 22 May 2018 19:47:57 +0200
Subject: [PATCH 2330/3370] postfix: 3.3.0 -> 3.3.1 (#40912)

Release notes: http://www.postfix.org/announcements/postfix-3.3.1.html
---
 pkgs/servers/mail/postfix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix
index a5168ebd4dfa..41dfebab7907 100644
--- a/pkgs/servers/mail/postfix/default.nix
+++ b/pkgs/servers/mail/postfix/default.nix
@@ -25,11 +25,11 @@ in stdenv.mkDerivation rec {
 
   name = "postfix-${version}";
 
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "ftp://ftp.cs.uu.nl/mirror/postfix/postfix-release/official/${name}.tar.gz";
-    sha256 = "0fggpbsc9jkrbaw9hy0zw9h32plmfvcv0x860pbih0g346byhhkr";
+    sha256 = "0fvymsklp32njsv0ngc1f45j01kcy61r5in99g5palibwkd19xal";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 65c327325086fc6ffce0c72af3d09b1474b0a41f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 22 May 2018 14:17:32 -0400
Subject: [PATCH 2331/3370] form: init at 4.2.0 (#40693)

---
 .../science/math/form/default.nix             | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/applications/science/math/form/default.nix

diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix
new file mode 100644
index 000000000000..88f2367e3340
--- /dev/null
+++ b/pkgs/applications/science/math/form/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, gmp, zlib }:
+
+stdenv.mkDerivation rec {
+  version = "4.2.0";
+  name = "form-${version}";
+
+  # This tarball is released by author, it is not downloaded from tag, so can't use fetchFromGitHub
+  src = fetchurl {
+    url = "https://github.com/vermaseren/form/releases/download/v4.2.0/form-4.2.0.tar.gz";
+    sha256 = "19528aphn4hvm151lyyhd7wz0bp2s3rla8jv6s7d8jwfp5ljzysm";
+  };
+
+  buildInputs = [ gmp zlib ];
+
+  meta = with stdenv.lib; {
+    description = "The FORM project for symbolic manipulation of very big expressions";
+    homepage = https://www.nikhef.nl/~form/;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.veprbl ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6899d9079375..bd8cb3404256 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20461,6 +20461,8 @@ with pkgs;
     texinfo = texinfo4;
   };
 
+  form = callPackage ../applications/science/math/form { };
+
   fricas = callPackage ../applications/science/math/fricas { };
 
   gap = callPackage ../applications/science/math/gap { };

From 405cb8603724defce74975e4e2ad4a2c797c417d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 22 May 2018 20:29:39 +0200
Subject: [PATCH 2332/3370] =?UTF-8?q?meson:=200.45.1=20=E2=86=92=200.46.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/build-managers/meson/default.nix           |  8 ++------
 .../meson/overly-strict-size-check.patch             | 12 ------------
 2 files changed, 2 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch

diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix
index 298c669e690b..6022b645172c 100644
--- a/pkgs/development/tools/build-managers/meson/default.nix
+++ b/pkgs/development/tools/build-managers/meson/default.nix
@@ -2,13 +2,13 @@
   targetPrefix = lib.optionalString stdenv.isCross
                    (targetPlatform.config + "-");
 in python3Packages.buildPythonApplication rec {
-  version = "0.45.1";
+  version = "0.46.1";
   pname = "meson";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "154kxx49dbw7p30qfg1carb3mgqxx9hyy1r0yzfsg07hz1n2sq14";
+    sha256 = "1jdxs2mkniy1hpdjc4b4jb95axsjp6j5fzphmm6d4gqmqyykjvqc";
   };
 
   postFixup = ''
@@ -43,10 +43,6 @@ in python3Packages.buildPythonApplication rec {
       src = ./fix-rpath.patch;
       inherit (builtins) storeDir;
     })
-
-    # No one will ever need more than 128 bytes of data structure
-    # https://github.com/mesonbuild/meson/issues/3113
-    ./overly-strict-size-check.patch
   ];
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch b/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch
deleted file mode 100644
index ea0e9bcd7eac..000000000000
--- a/pkgs/development/tools/build-managers/meson/overly-strict-size-check.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
---- a/mesonbuild/compilers/c.py	2017-12-10 08:37:19.000000000 -0500
-+++ b/mesonbuild/compilers/c.py	2018-03-24 07:46:04.739929307 -0400
-@@ -406,7 +406,7 @@
-         }}'''
-         if not self.compiles(t.format(**fargs), env, extra_args, dependencies):
-             return -1
--        return self.cross_compute_int('sizeof(%s)' % typename, 1, 128, None, prefix, env, extra_args, dependencies)
-+        return self.cross_compute_int('sizeof(%s)' % typename, 1, 1024, None, prefix, env, extra_args, dependencies)
- 
-     def sizeof(self, typename, prefix, env, extra_args=None, dependencies=None):
-         if extra_args is None:

From d5e785d96719921d321fb2a28ad71d56abf3f624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 22 May 2018 19:44:19 +0100
Subject: [PATCH 2333/3370] tmux: 2.6 -> 2.7

changelog: https://raw.githubusercontent.com/tmux/tmux/2.7/CHANGES
---
 pkgs/tools/misc/tmux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 61370ff890bc..fcec511b7ef5 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -13,7 +13,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "tmux-${version}";
-  version = "2.6";
+  version = "2.7";
 
   outputs = [ "out" "man" ];
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "tmux";
     repo = "tmux";
     rev = version;
-    sha256 = "0605y0nwfmf0mnq075vk80897c2cvhxxvxinqq7hvrpjf2ph5mww";
+    sha256 = "1yr4l8ckd67c3id4vrbpha91xxpdfpw0cpbr3v81lam0m7k4rgba";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From aca3198c70084beec4fcd5d49bd3f8ead0a0e10a Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Fri, 20 Apr 2018 11:32:29 +0200
Subject: [PATCH 2334/3370] nix-prefetch-github: init -> 1.3

---
 .../nix-prefetch-github/default.nix           | 30 +++++++++++++++++++
 .../python-modules/effect/default.nix         | 24 ++++++++-------
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/build-support/nix-prefetch-github/default.nix

diff --git a/pkgs/build-support/nix-prefetch-github/default.nix b/pkgs/build-support/nix-prefetch-github/default.nix
new file mode 100644
index 000000000000..48297e583afe
--- /dev/null
+++ b/pkgs/build-support/nix-prefetch-github/default.nix
@@ -0,0 +1,30 @@
+{ python3
+, fetchFromGitHub
+, stdenv
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "nix-prefetch-github";
+  version = "1.3";
+
+  src = fetchFromGitHub {
+    owner = "seppeljordan";
+    repo = "nix-prefetch-github";
+    rev = "${version}";
+    sha256 = "1rinbv1q4q8m27ih6l81w1lsmwn6cz7q3iyjiycklywpi8684dh6";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    attrs
+    click
+    effect
+    jinja2
+    requests
+  ];
+  meta = with stdenv.lib; {
+    description = "Prefetch sources from github";
+    homepage = https://github.com/seppeljordan/nix-prefetch-github;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.seppeljordan ];
+  };
+}
diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix
index d5fdf2d3f85d..2738d2283395 100644
--- a/pkgs/development/python-modules/effect/default.nix
+++ b/pkgs/development/python-modules/effect/default.nix
@@ -1,28 +1,32 @@
 { buildPythonPackage
 , fetchPypi
 , lib
-, attrs
 , six
+, attrs
+, pytest
+, testtools
 }:
-let
+buildPythonPackage rec {
+  version = "0.11.0";
+  pname = "effect";
 
-version = "0.11.0";
-pname = "effect";
-
-in
-buildPythonPackage {
-  inherit version pname;                      
   src = fetchPypi {
     inherit pname version;
     sha256 = "1q75w4magkqd8ggabhhzzxmxakpdnn0vdg7ygj89zdc9yl7561q6";
   };
+  checkInputs = [
+    pytest
+    testtools
+  ];
   propagatedBuildInputs = [
     six
     attrs
   ];
-  doCheck = false;
+  checkPhase = ''
+    pytest .
+  '';
   meta = with lib; {
-    description = "pure effects for Python";
+    description = "Pure effects for Python";
     homepage = https://github.com/python-effect/effect;
     license = licenses.mit;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d6759098dfaa..7e2c9fc7e1ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20838,6 +20838,8 @@ with pkgs;
 
   nix-pin = callPackage ../tools/package-management/nix-pin { };
 
+  nix-prefetch-github = callPackage ../build-support/nix-prefetch-github {};
+
   inherit (callPackages ../tools/package-management/nix-prefetch-scripts { })
     nix-prefetch-bzr
     nix-prefetch-cvs

From 042790832e7b998886fc46804b716bb8bbbfea90 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Tue, 22 May 2018 20:55:57 +0200
Subject: [PATCH 2335/3370] coqPackages.tlc: 20171206 -> 20180316 (#40927)

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

diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix
index 4748a0dd2385..5a236f59129d 100644
--- a/pkgs/development/coq-modules/tlc/default.nix
+++ b/pkgs/development/coq-modules/tlc/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, coq }:
 
 stdenv.mkDerivation rec {
-  version = "20171206";
+  version = "20180316";
   name = "coq${coq.coq-version}-tlc-${version}";
 
   src = fetchurl {
     url = "http://tlc.gforge.inria.fr/releases/tlc-${version}.tar.gz";
-    sha256 = "1wc44qb5zmarafp56gdrbka8gllipqna9cj0a6d99jzb361xg4mf";
+    sha256 = "0y8h0x9dfn9dm60j1jkxr9i8lbfqd3ff626wrc9v49qxhi50szqq";
   };
 
   buildInputs = [ coq ];

From cd1fb3babf420a8f85f07beb61a9769f38adfa24 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 22 May 2018 20:59:04 +0200
Subject: [PATCH 2336/3370] systemd: fix build

meson 0.46 no longer likes receiving both -Dmandir and --mandir. I removed the flags from the expression in favour of those in the meson setup hook. This also fixes manpages which were previously
installed to $man/lib for some reason.
---
 pkgs/os-specific/linux/systemd/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 89bd123d9382..307ba9f43fa1 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -101,20 +101,10 @@ in stdenv.mkDerivation rec {
     mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services)
     mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d)
     mesonFlagsArray+=(-Drootprefix=$out)
-    mesonFlagsArray+=(-Dlibdir=$lib/lib)
     mesonFlagsArray+=(-Drootlibdir=$lib/lib)
-    mesonFlagsArray+=(-Dmandir=$man/lib)
-    mesonFlagsArray+=(-Dincludedir=$dev/include)
     mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig)
     mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig)
 
-    # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are?
-    substituteInPlace meson.build \
-      --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \
-                "includedir = '$dev/include'" \
-      --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \
-                "libdir = '$lib/lib'"
-
     export LC_ALL="en_US.UTF-8";
     # FIXME: patch this in systemd properly (and send upstream).
     # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount

From 180eff1c4a9ed5e2b29ff8a3341836d27c493d1f Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Tue, 22 May 2018 22:01:26 +0200
Subject: [PATCH 2337/3370] thefuck: 3.26 -> 3.27

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

diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix
index 7befd344a4d8..1ccfc528e8f6 100644
--- a/pkgs/tools/misc/thefuck/default.nix
+++ b/pkgs/tools/misc/thefuck/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonApplication rec {
   pname = "thefuck";
-  version = "3.26";
+  version = "3.27";
 
   src = fetchFromGitHub {
     owner = "nvbn";
     repo = "${pname}";
     rev = version;
-    sha256 = "0iyihbp94z38xajy8yfbn3ky7irnam1zwyswg34cw4kkfgggrwhz";
+    sha256 = "1lsg0g9lnpj2nidggm16b7jm4xzhg0dgy81crfzny62hah1zk0pj";
   };
 
   propagatedBuildInputs = [ colorama decorator psutil pyte six ];

From 71da438f21f1e07dd0523bfeb7d81d6aa3a4f14e Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Tue, 22 May 2018 22:04:50 +0200
Subject: [PATCH 2338/3370] cargo-tree: init at 0.18.0 (#40924)

---
 .../package-management/cargo-tree/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/package-management/cargo-tree/default.nix

diff --git a/pkgs/tools/package-management/cargo-tree/default.nix b/pkgs/tools/package-management/cargo-tree/default.nix
new file mode 100644
index 000000000000..a9c1a1a33b3c
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-tree/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, lib, rustPlatform, fetchFromGitHub, pkgconfig, cmake, curl, libiconv, darwin }:
+rustPlatform.buildRustPackage rec {
+  name = "cargo-tree-${version}";
+  version = "0.18.0";
+
+  src = fetchFromGitHub {
+    owner = "sfackler";
+    repo = "cargo-tree";
+    rev = "v${version}";
+
+    sha256 = "0lq14w11a4zl0rvv7rsd79k51dwk3w78fbsi6klkqknad02qmx3r";
+  };
+
+  cargoSha256 = "0zi4qbadlx4l6zhb0f892ic3mdmyjjjzrirks18pl6qrn3dgny1x";
+
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ curl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ];
+
+  meta = with lib; {
+    description = "A cargo subcommand that visualizes a crate's dependency graph in a tree-like format";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ jD91mZM2 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bd8cb3404256..a3199c5c2972 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6916,6 +6916,7 @@ with pkgs;
 
   cargo-edit = callPackage ../tools/package-management/cargo-edit { };
   cargo-release = callPackage ../tools/package-management/cargo-release { };
+  cargo-tree = callPackage ../tools/package-management/cargo-tree { };
 
   cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { };
 

From 57200f58f476b2c7e8b1cce69f0ef069754e9231 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 22 May 2018 23:43:04 +0300
Subject: [PATCH 2339/3370] sqlite3_analyzer: assert, rename to
 sqlite-analyzer, clean up

---
 .../development/libraries/sqlite/analyzer.nix | 26 ++++++++++++++++++
 .../libraries/sqlite/sqlite3_analyzer.nix     | 27 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/libraries/sqlite/analyzer.nix
 delete mode 100644 pkgs/development/libraries/sqlite/sqlite3_analyzer.nix

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
new file mode 100644
index 000000000000..4b35c457f126
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, unzip, sqlite, tcl }:
+
+stdenv.mkDerivation rec {
+  name = "sqlite-analyzer-${version}";
+  version = "3.23.1";
+
+  src = assert version == sqlite.version; fetchurl {
+    url = https://sqlite.org/2018/sqlite-src-3230100.zip;
+    sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
+  };
+
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ tcl ];
+
+  makeFlags = [ "sqlite3_analyzer" ];
+
+  installPhase = "install -Dt $out/bin sqlite3_analyzer";
+
+  meta = with stdenv.lib; {
+    description = "A tool that shows statistics about SQLite databases";
+    downloadPage = http://sqlite.org/download.html;
+    homepage = http://www.sqlite.org;
+    maintainers = with maintainers; [ pesterhazy ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix b/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
deleted file mode 100644
index 2c9e69ac741c..000000000000
--- a/pkgs/development/libraries/sqlite/sqlite3_analyzer.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchurl, unzip, tcl }:
-
-stdenv.mkDerivation {
-  name = "sqlite3_analyzer-3.23.1";
-
-  src = fetchurl {
-    url = https://sqlite.org/2018/sqlite-src-3230100.zip;
-    sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
-  };
-
-  nativeBuildInputs = [ unzip ];
-  buildInputs = [ tcl ];
-
-  makeFlags = [ "sqlite3_analyzer" ];
-
-  installPhase = ''
-    install -Dm755 sqlite3_analyzer \
-      "$out/bin/sqlite3_analyzer"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.sqlite.org/;
-    description = "A tool that shows statistics about sqlite databases";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ pesterhazy ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6591968ed55b..53c774c5c603 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -257,6 +257,7 @@ mapAliases (rec {
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   spice_gtk = spice-gtk; # added 2018-02-25
   spice_protocol = spice-protocol; # added 2018-02-25
+  sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   sshfs = sshfs-fuse; # added 2017-08-14
   sshfsFuse = sshfs-fuse; # added 2016-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38af4e3a31ad..36d0fd8bc169 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11588,7 +11588,7 @@ with pkgs;
 
   sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
 
-  sqlite3_analyzer = lowPrio (callPackage ../development/libraries/sqlite/sqlite3_analyzer.nix { });
+  sqlite-analyzer = lowPrio (callPackage ../development/libraries/sqlite/analyzer.nix { });
 
   sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin;
 

From 25ec13a4f0f2a05000635c1d36dae99fe220a40b Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 22 May 2018 23:44:05 +0300
Subject: [PATCH 2340/3370] sqlite: with stdenv.lib, add downloadPage, add
 version attribute

---
 pkgs/development/libraries/sqlite/default.nix | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index ff2de38f98bc..ce666dc9c93f 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,10 +1,14 @@
-{ lib, stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
+{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
 
 assert interactive -> readline != null && ncurses != null;
 
-stdenv.mkDerivation {
-  name = "sqlite-3.23.1";
+with stdenv.lib;
 
+stdenv.mkDerivation rec {
+  name = "sqlite-${version}";
+  version = "3.23.1";
+
+  # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
     url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz;
     sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j";
@@ -13,9 +17,9 @@ stdenv.mkDerivation {
   outputs = [ "bin" "dev" "out" ];
   separateDebugInfo = stdenv.isLinux;
 
-  buildInputs = [ zlib ] ++ lib.optionals interactive [ readline ncurses ];
+  buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ];
 
-  configureFlags = [ "--enable-threadsafe" ] ++ lib.optional interactive "--enable-readline";
+  configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";
 
   NIX_CFLAGS_COMPILE = [
     "-DSQLITE_ENABLE_COLUMN_METADATA"
@@ -59,9 +63,10 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.sqlite.org/;
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ eelco np ];
+    downloadPage = http://sqlite.org/download.html;
+    homepage = http://www.sqlite.org/;
+    maintainers = with maintainers; [ eelco np ];
+    platforms = platforms.unix;
   };
 }

From 0928b2a033b596a05ecaa02d339b82f95e408799 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 22 May 2018 23:48:35 +0300
Subject: [PATCH 2341/3370] nodejs: update to nodejs-8_x

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3199c5c2972..670729bb7e65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3438,7 +3438,7 @@ with pkgs;
 
   nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };
 
-  nodejs = hiPrio nodejs-6_x;
+  nodejs = hiPrio nodejs-8_x;
 
   nodejs-slim = nodejs-slim-6_x;
 

From b7fe62d532307fbe9282b76fa5cc5cbd8cb0eafe Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 22 May 2018 16:04:56 -0500
Subject: [PATCH 2342/3370] bloaty: 2017-10-05 -> 2018-05-22

* add zlib dep (cmake tries to find it, provide it JIC)
* no need to populate with path to c++filt, handled internally now
* continue to copy ourselves, new install target isn't ready yet
---
 pkgs/development/tools/bloaty/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix
index 0dbe1aa78c50..9b18bcb25616 100644
--- a/pkgs/development/tools/bloaty/default.nix
+++ b/pkgs/development/tools/bloaty/default.nix
@@ -1,26 +1,22 @@
-{ stdenv, binutils, cmake, fetchFromGitHub }:
+{ stdenv, binutils, cmake, zlib, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "2017-10-05";
+  version = "2018-05-22";
   name = "bloaty-${version}";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "bloaty";
-    rev = "e47b21b01ceecf001e1965e9da249d48d86a1749";
-    sha256 = "1il3z49hi0b07agjwr5fg1wzysfxsamfv1snvlp33vrlyl1m7cbm";
+    rev = "054788b091ccfd43b05b9817062139145096d440";
+    sha256 = "0pmv66137ipzsjjdz004n61pz3aipjhh3b0w0y1406clqpwkvpjm";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];
 
-  enableParallelBuilding = true;
+  buildInputs = [ zlib ];
 
-  preConfigure = ''
-    substituteInPlace src/bloaty.cc \
-      --replace "c++filt" \
-                "${binutils.bintools}/bin/c++filt"
-  '';
+  enableParallelBuilding = true;
 
   doCheck = true;
 

From 55807651582419dc94aa5a2a2600b88bbdea1776 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Wed, 23 May 2018 00:47:18 +0300
Subject: [PATCH 2343/3370] sqlite{,-analyzer}: add archiveVersion function

---
 pkgs/development/libraries/sqlite/analyzer.nix        |  6 +++++-
 pkgs/development/libraries/sqlite/archive-version.nix | 11 +++++++++++
 pkgs/development/libraries/sqlite/default.nix         |  6 +++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/sqlite/archive-version.nix

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index 4b35c457f126..a0b1220b217d 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -1,11 +1,15 @@
 { stdenv, fetchurl, unzip, sqlite, tcl }:
 
+let
+  archiveVersion = import ./archive-version.nix stdenv.lib;
+in
+
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
   version = "3.23.1";
 
   src = assert version == sqlite.version; fetchurl {
-    url = https://sqlite.org/2018/sqlite-src-3230100.zip;
+    url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
     sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
   };
 
diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix
new file mode 100644
index 000000000000..1f312ecef23a
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/archive-version.nix
@@ -0,0 +1,11 @@
+lib: version:
+
+with lib;
+  
+let
+  fragments = splitString "." version;
+  major = head fragments;
+  minor = concatMapStrings (fixedWidthNumber 2) (tail fragments);
+in
+
+major + minor + "00"
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index ce666dc9c93f..eaeafa741297 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -4,13 +4,17 @@ assert interactive -> readline != null && ncurses != null;
 
 with stdenv.lib;
 
+let
+  archiveVersion = import ./archive-version.nix stdenv.lib;
+in
+
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
   version = "3.23.1";
 
   # NB! Make sure to update analyzer.nix src (in the same directory).
   src = fetchurl {
-    url = https://sqlite.org/2018/sqlite-autoconf-3230100.tar.gz;
+    url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
     sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j";
   };
 

From b9bdd7d4a3ecf73065feedc79d5d7e00c1b52b3c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 22 May 2018 22:09:33 +0000
Subject: [PATCH 2344/3370] pythonPackages.asyncssh: init at 1.13.0 (#40527)

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

diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix
new file mode 100644
index 000000000000..d5ab50dc9046
--- /dev/null
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+, cryptography
+, bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl }:
+
+buildPythonPackage rec {
+  pname = "asyncssh";
+  version = "1.13.0";
+  disabled = pythonOlder "3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1n75z4dvhzymd4n610dpwlq7wl8cyz1gxx9m7iq92pzhss5vgpfd";
+  };
+
+  propagatedBuildInputs = [ 
+    bcrypt
+    cryptography
+    gssapi
+    libnacl
+    libsodium
+    nettle
+    pyopenssl
+  ];
+
+  # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
+  postPatch = ''
+    rm ./tests/sspi_stub.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";
+    homepage = https://pypi.python.org/pypi/asyncssh;
+    license = licenses.epl10;
+    maintainers = with maintainers; [ worldofpeace ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42f5f6c17112..00daeacf7edf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -547,6 +547,8 @@ in {
 
   asyncio = callPackage ../development/python-modules/asyncio {};
 
+  asyncssh = callPackage ../development/python-modules/asyncssh { };
+
   python-fontconfig = callPackage ../development/python-modules/python-fontconfig { };
 
   funcsigs = callPackage ../development/python-modules/funcsigs { };

From 20c2fd73caa4a5438736aa8e649bc842ef99f5f2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 23 May 2018 00:50:40 +0300
Subject: [PATCH 2345/3370] apr-util: Fixup apu-1-config

apu-1-config --ldflags is giving broken output on the fixed-output
dependencies. This broke serf build since db was split to multiple
outputs.

https://nix-cache.s3.amazonaws.com/log/q35s5jba6p6dpdqlfn9qgy5w0hpa506v-serf-1.3.9.drv
---
 pkgs/development/libraries/apr-util/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 3c2ff777608d..4e2de01e9adb 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isFreeBSD cyrus_sasl;
 
   postInstall = ''
-    for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do
+    for f in $out/lib/*.la $out/lib/apr-util-1/*.la $dev/bin/apu-1-config; do
       substituteInPlace $f \
         --replace "${expat.dev}/lib" "${expat.out}/lib" \
         --replace "${db.dev}/lib" "${db.out}/lib" \

From aedc169d7fbdc50131f6b6a4c3ccec4376f489fa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 23 May 2018 00:55:43 +0300
Subject: [PATCH 2346/3370] serf: Simplify

---
 pkgs/development/libraries/serf/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 81dff49571da..62d8bcccfe36 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -17,17 +17,13 @@ stdenv.mkDerivation rec {
     sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' \
         -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' \
         -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' \
-        -e 's,$OPENSSL/lib,${openssl.out}/lib,' \
-        -e 's,$OPENSSL/include,${openssl.dev}/include,' \
       -i SConstruct
   '';
 
   buildPhase = ''
     scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \
-      LINKFLAGS="-L${zlib.out}/lib -L${expat}/lib -L${openldap}/lib -L${libiconv}/lib" \
-        APU="$(echo "${aprutil.dev}"/bin/*-config)" CC="${
-          if stdenv.cc.isClang then "clang" else "${stdenv.cc}/bin/gcc"
-        }" ${
+      LINKFLAGS="-L${zlib.out}/lib -L${openldap}/lib -L${libiconv}/lib" \
+        APU="$(echo "${aprutil.dev}"/bin/*-config)" CC=$CC ${
           if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos.dev}\""
         }
   '';

From d8b96d57300769569ee9a61edd46cf482a2e05de Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 22 May 2018 17:25:17 -0500
Subject: [PATCH 2347/3370] nghttp2: 1.31.0 -> 1.32.0

1.31.1 has security fix for CVE-2018-1000168:

https://nghttp2.org/blog/2018/04/12/nghttp2-v1-31-1/
---
 pkgs/development/libraries/nghttp2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 703e4d08bd34..68bffd4032d2 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -17,11 +17,11 @@ let inherit (stdenv.lib) optional; in
 
 stdenv.mkDerivation rec {
   name = "nghttp2-${version}";
-  version = "1.31.0";
+  version = "1.32.0";
 
   src = fetchurl {
     url = "https://github.com/nghttp2/nghttp2/releases/download/v${version}/nghttp2-${version}.tar.bz2";
-    sha256 = "0d7ivd7agsrbpz8745d0c0hxjzx9pdj602p1bpnrsd7p393ydrln";
+    sha256 = "0jlndbp4bnyvdg8b59pznrzz0bvwb9nmag7zgcflg51lm1pq2q06";
   };
 
   outputs = [ "bin" "out" "dev" "lib" ];

From 437ee38c18b44b87020443f97fe2b6e8ff7e54d5 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Wed, 23 May 2018 01:28:15 +0300
Subject: [PATCH 2348/3370] pythonPackages.udiskie: replace alias with abort

---
 pkgs/top-level/python-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00daeacf7edf..fb6ab5f386da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16352,8 +16352,7 @@ EOF
     };
   };
 
-  # For backwards compatibility. Please use nixpkgs.udiskie instead.
-  udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; });
+  udiskie = abort "pythonPackages.udiskie has been replaced by udiskie";
 
   # Should be bumped along with EFL!
   pythonefl = buildPythonPackage rec {

From d4890642b40b297f654c4cf9adfad742aa507a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 23 May 2018 00:36:41 +0200
Subject: [PATCH 2349/3370] Revert "pythonPackages.udiskie: replace alias with
 abort"

This reverts commit 437ee38c18b44b87020443f97fe2b6e8ff7e54d5.
---
 pkgs/top-level/python-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fb6ab5f386da..00daeacf7edf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16352,7 +16352,8 @@ EOF
     };
   };
 
-  udiskie = abort "pythonPackages.udiskie has been replaced by udiskie";
+  # For backwards compatibility. Please use nixpkgs.udiskie instead.
+  udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; });
 
   # Should be bumped along with EFL!
   pythonefl = buildPythonPackage rec {

From 9e5c5d95a83f7c990552de32a4d77a167f4d30f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 23 May 2018 00:52:17 +0200
Subject: [PATCH 2350/3370] pythonPackages.udiskie: replace alias by throw

closes #40941
---
 pkgs/applications/misc/udiskie/default.nix | 1 -
 pkgs/top-level/python-packages.nix         | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index 8c6dfe247724..f3dc92605f37 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -5,7 +5,6 @@
 , docopt
 , pygobject3
 , pyyaml
-, ...
 }:
 
 buildPythonApplication rec {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 00daeacf7edf..b695372fe96a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16352,8 +16352,8 @@ EOF
     };
   };
 
-  # For backwards compatibility. Please use nixpkgs.udiskie instead.
-  udiskie = toPythonModule (pkgs.udiskie.override { pythonPackages = self; });
+  # added 2018-05-23, can be removed once 18.09 is branched off
+  udiskie = throw "pythonPackages.udiskie has been replaced by udiskie";
 
   # Should be bumped along with EFL!
   pythonefl = buildPythonPackage rec {

From 5d88b73cef172c2ea5879b84740d9f2f4881185c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 25 May 2017 17:33:19 +0200
Subject: [PATCH 2351/3370] feedreader: init at 2.2

---
 .../feedreaders/feedreader/default.nix        | 50 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/applications/networking/feedreaders/feedreader/default.nix

diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix
new file mode 100644
index 000000000000..505afd25d04f
--- /dev/null
+++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala_0_40, gettext
+, appstream-glib, desktop-file-utils, glibcLocales, wrapGAppsHook
+, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite
+}:
+
+let
+  pname = "FeedReader";
+  version = "2.2";
+in stdenv.mkDerivation {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jangernert";
+    repo = pname;
+    rev = "v" + version;
+    sha256 = "17588hsa7xv92ba55kmbyvnijypp373yrly48kbc391wadp1z939";
+  };
+
+  nativeBuildInputs = [
+    meson ninja pkgconfig vala_0_40 gettext appstream-glib desktop-file-utils
+    glibcLocales wrapGAppsHook
+  ];
+
+  buildInputs = [
+    curl glib json-glib libnotify libsecret sqlite
+  ] ++ (with gnome3; [
+    gtk libgee libpeas libsoup rest webkitgtk gnome_online_accounts
+    gsettings_desktop_schemas
+  ]) ++ (with gst_all_1; [
+    gstreamer gst-plugins-base gst-plugins-good
+  ]);
+
+  # TODO: fix https://github.com/NixOS/nixpkgs/issues/39547
+  LIBRARY_PATH = stdenv.lib.makeLibraryPath [ curl ];
+
+  # vcs_tag function fails with UnicodeDecodeError
+  LC_ALL = "en_US.UTF-8";
+
+  postPatch = ''
+    patchShebangs meson_post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A modern desktop application designed to complement existing web-based RSS accounts.";
+    homepage = https://jangernert.github.io/FeedReader/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ edwtjo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2b566ab5f62..5b854870d298 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2311,6 +2311,8 @@ with pkgs;
 
   fdm = callPackage ../tools/networking/fdm {};
 
+  feedreader = callPackage ../applications/networking/feedreaders/feedreader {};
+
   ferm = callPackage ../tools/networking/ferm { };
 
   fgallery = callPackage ../tools/graphics/fgallery {

From c2361d632dffc7dc33bf25ff9e3d9615db27b338 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 22 May 2018 15:20:53 +0200
Subject: [PATCH 2352/3370] rust-cbindgen: init at 0.6.0

---
 .../tools/rust/cbindgen/default.nix           | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/rust/cbindgen/default.nix

diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix
new file mode 100644
index 000000000000..ef74842da1c0
--- /dev/null
+++ b/pkgs/development/tools/rust/cbindgen/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+  name = "rust-cbindgen-${version}";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "eqrion";
+    repo = "cbindgen";
+    rev = "v${version}";
+    sha256 = "0yzjbmdhhwbg551bm06xwwdjdm5kdqw37pgd7hals8qxb0dzmmh8";
+  };
+
+  cargoSha256 = "1ml4a7xp40l3bhfhpwdrwj3k99zhan9dzpkw71fa689xmv6pdj62";
+
+  meta = with stdenv.lib; {
+    description = "A project for generating C bindings from Rust code";
+    homepage = https://github.com/eqrion/cbindgen;
+    license = licenses.mpl20;
+    maintainers = with maintainers; [ jtojnar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2b566ab5f62..d0191ec5c59f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6922,6 +6922,7 @@ with pkgs;
   rustracer = callPackage ../development/tools/rust/racer { };
   rustracerd = callPackage ../development/tools/rust/racerd { };
   rust-bindgen = callPackage ../development/tools/rust/bindgen { };
+  rust-cbindgen = callPackage ../development/tools/rust/cbindgen { };
   rustup = callPackage ../development/tools/rust/rustup {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 3f0a7b8aed31b62214c979d797fc475d9284adff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 22 May 2018 18:47:05 -0700
Subject: [PATCH 2353/3370] stunnel: 5.44 -> 5.45

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/stunnel/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/7s4vc01h5glyylky8hsjfbmyxdfr44wl-stunnel-5.45/bin/stunnel3 had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/7s4vc01h5glyylky8hsjfbmyxdfr44wl-stunnel-5.45/bin/stunnel had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 5.45 with grep in /nix/store/7s4vc01h5glyylky8hsjfbmyxdfr44wl-stunnel-5.45
- directory tree listing: https://gist.github.com/4c607748a7a424c16abcadab39e0a7f7
- du listing: https://gist.github.com/d4b428776b9214e913cb8a97f7698d65
---
 pkgs/tools/networking/stunnel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 0d328c02d371..4ae7f87c54d2 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.44";
+  version = "5.45";
 
   src = fetchurl {
     url    = "https://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299";
+    sha256 = "1qrfb418skdcm7b3v30ixng1ng907f4rfv54zvgz8jwakf1l90jl";
     # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
     # not the output of `nix-prefetch-url`
   };

From dfd12da9d0818a9fad96000b0e6f9fca36ca496a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 22 May 2018 18:56:33 -0700
Subject: [PATCH 2354/3370] simplescreenrecorder: 0.3.10 -> 0.3.11

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/simplescreenrecorder/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/a8fww8kyx1kxkbr94mx0k3aml8p1iv9y-simplescreenrecorder-0.3.11/bin/simplescreenrecorder had a zero exit code or showed the expected version
- /nix/store/a8fww8kyx1kxkbr94mx0k3aml8p1iv9y-simplescreenrecorder-0.3.11/bin/ssr-glinject passed the binary check.
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.3.11 with grep in /nix/store/a8fww8kyx1kxkbr94mx0k3aml8p1iv9y-simplescreenrecorder-0.3.11
- directory tree listing: https://gist.github.com/37e7c1c2b6ea1075aec16c5886d64421
- du listing: https://gist.github.com/e083fc723fa4e92eac89902a7ae3fd56
---
 pkgs/applications/video/simplescreenrecorder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index d1f6f8b6ad1b..b456d8ee9a66 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "simplescreenrecorder-${version}";
-  version = "0.3.10";
+  version = "0.3.11";
 
   src = fetchurl {
     url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
-    sha256 = "02rl9yyx3hlz9fqvgzv7ipmvx2qahj7ws5wx2m7zs3lssq3qag3g";
+    sha256 = "0l6irdadqpajvv0dj3ngs1231n559l0y1pykhs2h7526qm4w7xal";
   };
 
   cmakeFlags = [ "-DWITH_QT5=TRUE" ];

From bbbd9e251b61084e19ed43b94372aec5d7feb64c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 22 May 2018 19:41:41 -0700
Subject: [PATCH 2355/3370] qsynth: 0.5.0 -> 0.5.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qsynth/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/v9m2gbw7l68qb4m5milqc8d2wfrafx97-qsynth-0.5.1/bin/qsynth had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.5.1 with grep in /nix/store/v9m2gbw7l68qb4m5milqc8d2wfrafx97-qsynth-0.5.1
- directory tree listing: https://gist.github.com/f7434d80382444c8ae9ba52dd07e27a7
- du listing: https://gist.github.com/1c209e5c3a841d8d8e1d3257c2dad992
---
 pkgs/applications/audio/qsynth/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix
index 71f41f87009e..f98547ed46f2 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/applications/audio/qsynth/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation  rec {
   name = "qsynth-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/qsynth/${name}.tar.gz";
-    sha256 = "1sr6vrz8z9r99j9xcix86lgcqldragb2ajmq1bnhr58d99sda584";
+    sha256 = "0kpk1rnhbifbvm4xvw8i0d4ksk78pf505qvg08k89kqkg32494ap";
   };
 
   # cmake is looking for qsynth.desktop.in and fails if it doesn't find it
-  # seems like a bug and can presumable go in the next version after 0.5.0
+  # seems like a bug and can presumable go in the next version after 0.5.1
   postPatch = ''
     mv src/qsynth.desktop src/qsynth.desktop.in
   '';

From 5c76ea68b84bf8d97ec15e5d8d717143d7ec183f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 22 May 2018 19:44:57 -0700
Subject: [PATCH 2356/3370] redshift: 1.11 -> 1.12

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/redshift/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/redshift-gtk had a zero exit code or showed the expected version
- /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/redshift passed the binary check.
- /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/.redshift-wrapped passed the binary check.
- Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/..redshift-gtk-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12/bin/.redshift-gtk-wrapped had a zero exit code or showed the expected version
- 2 of 5 passed binary check by having a zero exit code.
- 2 of 5 passed binary check by having the new version present in output.
- found 1.12 with grep in /nix/store/vqswdrqvi3xal1glhvr6v9zsr5sr4jlx-redshift-1.12
- directory tree listing: https://gist.github.com/c74af938c0883f174e37490cc75bdd47
- du listing: https://gist.github.com/e9328410b87b5cff576fd12cc6120fb6
---
 pkgs/applications/misc/redshift/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index dc31da671e95..dcc8300550f4 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   name = "redshift-${version}";
-  version = "1.11";
+  version = "1.12";
 
   src = fetchFromGitHub {
     owner = "jonls";
     repo = "redshift";
     rev = "v${version}";
-    sha256 = "0jfi4wqklqw2rm0r2xwalyzir88zkdvqj0z5id0l5v20vsrfiiyj";
+    sha256 = "12cb4gaqkybp4bkkns8pam378izr2mwhr2iy04wkprs2v92j7bz6";
   };
 
   patches = [

From 6b5dc5cda09d00a33acf4f4abf5e0fbfb711d0e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 22 May 2018 20:01:49 -0700
Subject: [PATCH 2357/3370] qjackctl: 0.5.0 -> 0.5.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qjackctl/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/8v1gipr8vnyf6kx68xlxrfkdk226r65q-qjackctl-0.5.1/bin/qjackctl had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.5.1 with grep in /nix/store/8v1gipr8vnyf6kx68xlxrfkdk226r65q-qjackctl-0.5.1
- directory tree listing: https://gist.github.com/b33811366209a2de394b82f4c7cec003
- du listing: https://gist.github.com/5cef67561cc5293a1f1a78504bda18c1
---
 pkgs/applications/audio/qjackctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index 925078fb3a15..aabd73430100 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.5.1";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "0lx81dfwanc10vrny1vzi0wx73ph82dlz99ffjzsigj3cqzz6x4s";
+    sha256 = "0jw1s4qh4qjxnysddjv3j2lchwlslj9p4iisv9i89d3m7pf1svs4";
   };
 
   buildInputs = [

From 62f0d64640868591873054a257129d89446b123a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 22 May 2018 21:06:52 -0700
Subject: [PATCH 2358/3370] pg_repack: 1.4.2 -> 1.4.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pg_repack/versions.

These checks were done:

- built on NixOS
- /nix/store/08l7mgizcwhz3iiq7q53529mnj0z9apl-pg_repack-1.4.3/bin/pg_repack passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.4.3 with grep in /nix/store/08l7mgizcwhz3iiq7q53529mnj0z9apl-pg_repack-1.4.3
- directory tree listing: https://gist.github.com/98848a9a560aa1d4de3e164197944d32
- du listing: https://gist.github.com/cfef5141050a394c88b04b839ec17fdf
---
 pkgs/servers/sql/postgresql/pg_repack/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix
index 50c9c68bb5f7..1b7cd08b082b 100644
--- a/pkgs/servers/sql/postgresql/pg_repack/default.nix
+++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
     name = "pg_repack-${version}";
-    version = "1.4.2";
+    version = "1.4.3";
 
     buildInputs = [ postgresql openssl zlib readline ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       owner  = "reorg";
       repo   = "pg_repack";
       rev    = "refs/tags/ver_${version}";
-      sha256 = "1yv5x7dgiv1miazbngkrkdbc2zpwklj6nlligghjvv83bcl8969q";
+      sha256 = "1mmd22nfaxjwnbl3i95f3ivmjvfqwdflgaczlg3129dbpwg265xr";
     };
 
     installPhase = ''

From 07d73c4ab065ad0a06551b39cc6d1c7a874a6913 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 22 May 2018 18:06:02 -0400
Subject: [PATCH 2359/3370] clangSelf, clangWrapSelf, llvmPackagesSelf: Remove
 this unused thing

It's old old LLVM built with new LLVM. How useless.
---
 pkgs/development/compilers/ispc/default.nix |  2 +-
 pkgs/top-level/all-packages.nix             | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix
index 62fa578cef68..0fe9c8d3765f 100644
--- a/pkgs/development/compilers/ispc/default.nix
+++ b/pkgs/development/compilers/ispc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf,
+{stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages,
 testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents
 }:
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 670729bb7e65..6c0d48780d32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6056,18 +6056,6 @@ with pkgs;
 
   clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { };
 
-  clangSelf = clangWrapSelf llvmPackagesSelf.clang;
-
-  clangWrapSelf = build: ccWrapperFun {
-    cc = build;
-    isClang = true;
-    inherit stdenvNoCC;
-    inherit (targetPackages.stdenv.cc) bintools libc;
-    extraPackages = [ libcxx libcxxabi ];
-    nativeTools = false;
-    nativeLibc = false;
-  };
-
   #Use this instead of stdenv to build with clang
   clangStdenv = if stdenv.cc.isClang then stdenv else lowPrio llvmPackages.stdenv;
   clang-sierraHack-stdenv = overrideCC stdenv clang-sierraHack;
@@ -6704,10 +6692,6 @@ with pkgs;
 
   llvmPackages = recurseIntoAttrs llvmPackages_5;
 
-  llvmPackagesSelf = llvmPackages_34.override {
-    stdenv = libcxxStdenv;
-  };
-
   llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({
     isl = isl_0_12;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {

From 25e866a7fe36045470e27a9b320703a35266d889 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 22 May 2018 19:21:35 -0400
Subject: [PATCH 2360/3370] treewide: Less {cc,bintools}-wrapper eta expansion

Also makes the LLVM ones more correct
---
 .../compilers/llvm/3.7/default.nix            | 10 ++---
 .../compilers/llvm/3.8/default.nix            | 10 ++---
 .../compilers/llvm/3.9/default.nix            | 10 ++---
 pkgs/development/compilers/llvm/4/default.nix | 10 ++---
 pkgs/development/compilers/llvm/5/default.nix | 10 ++---
 pkgs/development/compilers/llvm/6/default.nix | 10 ++---
 pkgs/top-level/all-packages.nix               | 44 ++++++++++---------
 7 files changed, 41 insertions(+), 63 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index 5cac04c044de..3003a773cc60 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -1,5 +1,5 @@
 { newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl
-, overrideCC, wrapCC, ccWrapperFun, darwin
+, overrideCC, wrapCCWith, darwin
 }:
 
 let
@@ -27,17 +27,13 @@ let
 
     clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
-    libstdcxxClang = ccWrapperFun {
+    libstdcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ libstdcxxHook ];
     };
 
-    libcxxClang = ccWrapperFun {
+    libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ self.libcxx self.libcxxabi ];
     };
 
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index 9e37f93dbddc..6cb2c5676d05 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }:
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }:
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
@@ -26,17 +26,13 @@ let
 
     clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
-    libstdcxxClang = ccWrapperFun {
+    libstdcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ libstdcxxHook ];
     };
 
-    libcxxClang = ccWrapperFun {
+    libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ self.libcxx self.libcxxabi ];
     };
 
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index a675bcceb1c9..7d2ecd1a1563 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,4 +1,4 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }:
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }:
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
@@ -26,17 +26,13 @@ let
 
     clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
-    libstdcxxClang = ccWrapperFun {
+    libstdcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ libstdcxxHook ];
     };
 
-    libcxxClang = ccWrapperFun {
+    libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ self.libcxx self.libcxxabi ];
     };
 
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 562f9e3457dd..c92a1d84c0c5 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,5 +1,5 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun
+, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
 }:
 
@@ -40,17 +40,13 @@ let
 
     clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
-    libstdcxxClang = ccWrapperFun {
+    libstdcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ libstdcxxHook ];
     };
 
-    libcxxClang = ccWrapperFun {
+    libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ self.libcxx self.libcxxabi ];
     };
 
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 13e1d2308f8c..63fb98316513 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,5 +1,5 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun
+, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
 }:
 
@@ -40,17 +40,13 @@ let
 
     clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
-    libstdcxxClang = ccWrapperFun {
+    libstdcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ libstdcxxHook ];
     };
 
-    libcxxClang = ccWrapperFun {
+    libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ self.libcxx self.libcxxabi ];
     };
 
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index cfa9e9e15fcf..61fee1542e77 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,5 +1,5 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
-, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun
+, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
 }:
 
@@ -40,17 +40,13 @@ let
 
     clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
 
-    libstdcxxClang = ccWrapperFun {
+    libstdcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ libstdcxxHook ];
     };
 
-    libcxxClang = ccWrapperFun {
+    libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      /* FIXME is this right? */
-      inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
       extraPackages = [ self.libcxx self.libcxxabi ];
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c0d48780d32..c6d02b487f45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6996,42 +6996,46 @@ with pkgs;
 
   wla-dx = callPackage ../development/compilers/wla-dx { };
 
-  wrapCCWith = { name ? "", cc, bintools, libc, extraBuildCommands ? "" }:
-      ccWrapperFun rec {
+  wrapCCWith =
+    { cc
+    , # This should be the only bintools runtime dep with this sort of logic. The
+      # Others should instead delegate to the next stage's choice with
+      # `targetPackages.stdenv.cc.bintools`. This one is different just to
+      # provide the default choice, avoiding infinite recursion.
+      bintools ? if targetPlatform.isDarwin then darwin.binutils else binutils
+    , libc ? bintools.libc
+    , ...
+    } @ extraArgs:
+      callPackage ../build-support/cc-wrapper (let self = {
     nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false;
     nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
-    noLibc = !nativeLibc && (libc == null);
+    noLibc = !self.nativeLibc && (self.libc == null);
 
     isGNU = cc.isGNU or false;
     isClang = cc.isClang or false;
 
-    inherit name cc bintools libc extraBuildCommands;
-  };
-
-  ccWrapperFun = callPackage ../build-support/cc-wrapper;
-  bintoolsWrapperFun = callPackage ../build-support/bintools-wrapper;
+    inherit cc bintools libc;
+  } // extraArgs; in self);
 
   wrapCC = cc: wrapCCWith {
-    name = lib.optionalString (targetPlatform != hostPlatform) "gcc-cross-wrapper";
     inherit cc;
-    # This should be the only bintools runtime dep with this sort of logic. The
-    # Others should instead delegate to the next stage's choice with
-    # `targetPackages.stdenv.cc.bintools`. This one is different just to
-    # provide the default choice, avoiding infinite recursion.
-    bintools = if targetPlatform.isDarwin then darwin.binutils else binutils;
-    libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;
   };
 
-  wrapBintoolsWith = { bintools, libc, extraBuildCommands ? "" }: bintoolsWrapperFun {
+  wrapBintoolsWith =
+    { bintools
+    , libc ? if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc
+    , ...
+    } @ extraArgs:
+      callPackage ../build-support/bintools-wrapper (let self = {
     nativeTools = targetPlatform == hostPlatform && stdenv.cc.nativeTools or false;
     nativeLibc = targetPlatform == hostPlatform && stdenv.cc.nativeLibc or false;
     nativePrefix = stdenv.cc.nativePrefix or "";
 
-    noLibc = (libc == null);
+    noLibc = (self.libc == null);
 
-    inherit bintools libc extraBuildCommands;
-  };
+    inherit bintools libc;
+  } // extraArgs; in self);
 
   # prolog
   yap = callPackage ../development/compilers/yap { };
@@ -7637,11 +7641,9 @@ with pkgs;
     noSysDirs = (targetPlatform != buildPlatform) || noSysDirs;
   };
   binutils = wrapBintoolsWith {
-    libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;
     bintools = binutils-unwrapped;
   };
   binutils_nogold = lowPrio (wrapBintoolsWith {
-    libc = if targetPlatform != hostPlatform then libcCross else stdenv.cc.libc;
     bintools = binutils-unwrapped.override {
       gold = false;
     };

From acc9843691c936bb807fb6c5c88e0b41782d6c29 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 22 May 2018 19:25:34 -0400
Subject: [PATCH 2361/3370] llvm: Starting to fix Clang wrapping and stdenv
 building for cross

---
 pkgs/development/compilers/llvm/3.7/default.nix |  6 ++++--
 pkgs/development/compilers/llvm/3.8/default.nix | 10 +++++++---
 pkgs/development/compilers/llvm/3.9/default.nix | 10 +++++++---
 pkgs/development/compilers/llvm/4/default.nix   |  6 ++++--
 pkgs/development/compilers/llvm/5/default.nix   |  6 ++++--
 pkgs/development/compilers/llvm/6/default.nix   |  6 ++++--
 pkgs/top-level/all-packages.nix                 | 12 ++++++++++++
 7 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index 3003a773cc60..8f73645afc06 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -1,5 +1,7 @@
 { newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl
 , overrideCC, wrapCCWith, darwin
+, buildLlvmPackages # ourself, but from the previous stage, for cross
+, targetLlvmPackages # ourself, but from the next stage, for cross
 }:
 
 let
@@ -34,7 +36,7 @@ let
 
     libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      extraPackages = [ self.libcxx self.libcxxabi ];
+      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
     };
 
     stdenv = stdenv.override (drv: {
@@ -44,7 +46,7 @@ let
 
     libcxxStdenv = stdenv.override (drv: {
       allowedRequisites = null;
-      cc = self.libcxxClang;
+      cc = buildLlvmPackages.libcxxClang;
     });
 
     lldb = callPackage ./lldb.nix {};
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index 6cb2c5676d05..a5f3b7759517 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -1,4 +1,8 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }:
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
+, buildLlvmPackages # ourself, but from the previous stage, for cross
+, targetLlvmPackages # ourself, but from the next stage, for cross
+}:
+
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
@@ -33,7 +37,7 @@ let
 
     libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      extraPackages = [ self.libcxx self.libcxxabi ];
+      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
     };
 
     stdenv = stdenv.override (drv: {
@@ -43,7 +47,7 @@ let
 
     libcxxStdenv = stdenv.override (drv: {
       allowedRequisites = null;
-      cc = self.libcxxClang;
+      cc = buildLlvmPackages.libcxxClang;
     });
 
     lldb = callPackage ./lldb.nix {};
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index 7d2ecd1a1563..4b69996473d4 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,4 +1,8 @@
-{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }:
+{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
+, buildLlvmPackages # ourself, but from the previous stage, for cross
+, targetLlvmPackages # ourself, but from the next stage, for cross
+}:
+
 let
   callPackage = newScope (self // { inherit stdenv isl version fetch; });
 
@@ -33,7 +37,7 @@ let
 
     libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      extraPackages = [ self.libcxx self.libcxxabi ];
+      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
     };
 
     stdenv = stdenv.override (drv: {
@@ -43,7 +47,7 @@ let
 
     libcxxStdenv = stdenv.override (drv: {
       allowedRequisites = null;
-      cc = self.libcxxClang;
+      cc = buildLlvmPackages.libcxxClang;
     });
 
     lldb = callPackage ./lldb.nix {};
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index c92a1d84c0c5..594397bdbbc0 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,6 +1,8 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
+, buildLlvmPackages # ourself, but from the previous stage, for cross
+, targetLlvmPackages # ourself, but from the next stage, for cross
 }:
 
 let
@@ -47,7 +49,7 @@ let
 
     libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      extraPackages = [ self.libcxx self.libcxxabi ];
+      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
     };
 
     stdenv = stdenv.override (drv: {
@@ -57,7 +59,7 @@ let
 
     libcxxStdenv = stdenv.override (drv: {
       allowedRequisites = null;
-      cc = self.libcxxClang;
+      cc = buildLlvmPackages.libcxxClang;
     });
 
     lld = callPackage ./lld.nix {};
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 63fb98316513..1f7619f7a371 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,6 +1,8 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
+, buildLlvmPackages # ourself, but from the previous stage, for cross
+, targetLlvmPackages # ourself, but from the next stage, for cross
 }:
 
 let
@@ -47,7 +49,7 @@ let
 
     libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      extraPackages = [ self.libcxx self.libcxxabi ];
+      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
     };
 
     stdenv = stdenv.override (drv: {
@@ -57,7 +59,7 @@ let
 
     libcxxStdenv = stdenv.override (drv: {
       allowedRequisites = null;
-      cc = self.libcxxClang;
+      cc = buildLlvmPackages.libcxxClang;
     });
 
     lld = callPackage ./lld.nix {};
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 61fee1542e77..be26a38e32ec 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,6 +1,8 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
+, buildLlvmPackages # ourself, but from the previous stage, for cross
+, targetLlvmPackages # ourself, but from the next stage, for cross
 }:
 
 let
@@ -47,7 +49,7 @@ let
 
     libcxxClang = wrapCCWith {
       cc = self.clang-unwrapped;
-      extraPackages = [ self.libcxx self.libcxxabi ];
+      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
     };
 
     stdenv = stdenv.override (drv: {
@@ -57,7 +59,7 @@ let
 
     libcxxStdenv = stdenv.override (drv: {
       allowedRequisites = null;
-      cc = self.libcxxClang;
+      cc = buildLlvmPackages.libcxxClang;
     });
 
     lld = callPackage ./lld.nix {};
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6d02b487f45..fb3d0942e473 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6706,30 +6706,40 @@ with pkgs;
 
   llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
     inherit (stdenvAdapters) overrideCC;
+    buildLlvmPackages = buildPackages.llvmPackages_37;
+    targetLlvmPackages = targetPackages.llvmPackages_37;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
     stdenv = overrideCC stdenv gcc6;
   });
 
   llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
     inherit (stdenvAdapters) overrideCC;
+    buildLlvmPackages = buildPackages.llvmPackages_38;
+    targetLlvmPackages = targetPackages.llvmPackages_38;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
     stdenv = overrideCC stdenv gcc6;
   });
 
   llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
     inherit (stdenvAdapters) overrideCC;
+    buildLlvmPackages = buildPackages.llvmPackages_39;
+    targetLlvmPackages = targetPackages.llvmPackages_39;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
     stdenv = overrideCC stdenv gcc6;
   });
 
   llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
     inherit (stdenvAdapters) overrideCC;
+    buildLlvmPackages = buildPackages.llvmPackages_4;
+    targetLlvmPackages = targetPackages.llvmPackages_4;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
     stdenv = overrideCC stdenv gcc6;
   });
 
   llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
     inherit (stdenvAdapters) overrideCC;
+    buildLlvmPackages = buildPackages.llvmPackages_5;
+    targetLlvmPackages = targetPackages.llvmPackages_5;
   } // stdenv.lib.optionalAttrs stdenv.isDarwin {
     cmake = cmake.override {
       isBootstrap = true;
@@ -6743,6 +6753,8 @@ with pkgs;
 
   llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({
     inherit (stdenvAdapters) overrideCC;
+    buildLlvmPackages = buildPackages.llvmPackages_6;
+    targetLlvmPackages = targetPackages.llvmPackages_6;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
     stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });

From 23dce527d82c83436f7ed8a6ac987d1dd097de4f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 22 May 2018 23:59:15 -0700
Subject: [PATCH 2362/3370] folly: 2018.04.23.00 -> 2018.05.21.00

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/folly/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2018.05.21.00 with grep in /nix/store/n4qdpjqixmlcly3al00c5a2ivp6lh74f-folly-2018.05.21.00
- directory tree listing: https://gist.github.com/80adf61ca8bb6b1020e7b48cae590a9c
- du listing: https://gist.github.com/dc5d5cb97ea76a087a50b733c659ebe5
---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 17c6f75a59db..36da31e8908a 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2018.04.23.00";
+  version = "2018.05.21.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "0wfp4pxi71bi3bz3h5jxsvdd5wa8q6wqdgsx0jvyvaiiy7v884sv";
+    sha256 = "0x8qa0g0rj4bmy5cra7f0ch0srq34d8d04f1c59q93xd6ggkr52w";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];

From cde4ea79f80b9ba065d6f8d1fb44e87d2e18cc53 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Wed, 23 May 2018 00:14:18 -0700
Subject: [PATCH 2363/3370] vagrant: 2.0.2 -> 2.1.1

---
 pkgs/development/tools/vagrant/Gemfile.lock | 24 ++++++++--
 pkgs/development/tools/vagrant/default.nix  |  4 +-
 pkgs/development/tools/vagrant/gemset.nix   | 52 +++++++++++++++++----
 3 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/tools/vagrant/Gemfile.lock b/pkgs/development/tools/vagrant/Gemfile.lock
index 2c63b57443ad..8991bd9eb54f 100644
--- a/pkgs/development/tools/vagrant/Gemfile.lock
+++ b/pkgs/development/tools/vagrant/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
-  remote: https://github.com/mitchellh/vagrant-spec.git
-  revision: 7ac8b4191de578e345b29acaf62ecc72c8e73be1
+  remote: https://github.com/hashicorp/vagrant-spec.git
+  revision: 9413ab298407114528766efefd1fb1ff24589636
   specs:
     vagrant-spec (0.0.1)
       childprocess (~> 0.6.0)
@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant (2.0.2)
+    vagrant (2.1.1)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
@@ -25,6 +25,8 @@ PATH
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
       wdm (~> 0.1.0)
+      win32-file (~> 0.8.1)
+      win32-file-security (~> 1.0.10)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
       winrm-fs (~> 1.0)
@@ -40,11 +42,13 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     fake_ftp (0.1.1)
-    ffi (1.9.18)
+    ffi (1.9.23)
+    ffi-win32-extensions (1.0.3)
+      ffi
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -115,6 +119,16 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    win32-file (0.8.1)
+      ffi
+      ffi-win32-extensions
+      win32-file-stat (>= 1.4.0)
+    win32-file-security (1.0.10)
+      ffi
+      ffi-win32-extensions
+    win32-file-stat (1.5.5)
+      ffi
+      ffi-win32-extensions
     winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 3b055d38d03f..42ff463e1cc6 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -1,9 +1,9 @@
 { lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }:
 
 let
-  version = "2.0.2";
+  version = "2.1.1";
   url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
-  sha256 = "1sjfwgy2y6q5s1drd8h8xgz2a0sv1l3kx9jilgc02hlcdz070iir";
+  sha256 = "0kgsb33f3wh6x4450x74wri6z78ky92sfrv7ba7h7zmxsadb6m4b";
 
   deps = bundlerEnv rec {
     name = "${pname}-${version}";
diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix
index 5d3d2693d013..867927cdc248 100644
--- a/pkgs/development/tools/vagrant/gemset.nix
+++ b/pkgs/development/tools/vagrant/gemset.nix
@@ -46,10 +46,10 @@
     dependencies = ["unf"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "12hs8yijhak7p2hf1xkh98g0mnp5phq3mrrhywzaxpwz1gw5r3kf";
+      sha256 = "0abdlwb64ns7ssmiqhdwgl27ly40x2l27l8hs8hn0z4kb3zd2x3v";
       type = "gem";
     };
-    version = "0.5.20170404";
+    version = "0.5.20180417";
   };
   erubis = {
     source = {
@@ -70,10 +70,19 @@
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0";
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
       type = "gem";
     };
-    version = "1.9.18";
+    version = "1.9.23";
+  };
+  ffi-win32-extensions = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ywkkbr3bpi2ais2jr8yrsqwwrm48jg262anmdkcb9if95vajx7l";
+      type = "gem";
+    };
+    version = "1.0.3";
   };
   gssapi = {
     dependencies = ["ffi"];
@@ -397,16 +406,16 @@
     version = "0.0.7.5";
   };
   vagrant = {
-    dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"];
+    dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "win32-file" "win32-file-security" "winrm" "winrm-elevated" "winrm-fs"];
   };
   vagrant-spec = {
     dependencies = ["childprocess" "log4r" "rspec" "thor"];
     source = {
       fetchSubmodules = false;
-      rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1";
-      sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h";
+      rev = "9413ab298407114528766efefd1fb1ff24589636";
+      sha256 = "1z77m3p6x82hipa7y4i71zafy0rdfajw2vhqdxczjmrlwp0pvisl";
       type = "git";
-      url = "https://github.com/mitchellh/vagrant-spec.git";
+      url = "https://github.com/hashicorp/vagrant-spec.git";
     };
     version = "0.0.1";
   };
@@ -427,6 +436,33 @@
     };
     version = "2.3.2";
   };
+  win32-file = {
+    dependencies = ["ffi" "ffi-win32-extensions" "win32-file-stat"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mjylzv4bbnxyjqf7hnd9ghcs5xr2sv8chnmkqdi2cc6pya2xax0";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  win32-file-security = {
+    dependencies = ["ffi" "ffi-win32-extensions"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lpq821a1hrxmm0ki5c34wijzhn77g4ny76v698ixwg853y2ir9r";
+      type = "gem";
+    };
+    version = "1.0.10";
+  };
+  win32-file-stat = {
+    dependencies = ["ffi" "ffi-win32-extensions"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lc3yajcb8xxabvj9qian938k60ixydvs3ixl5fldi0nlvnvk468";
+      type = "gem";
+    };
+    version = "1.5.5";
+  };
   winrm = {
     dependencies = ["builder" "erubis" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
     source = {

From 5db3a9df5e82a0af45bc20bb2eda15dc7fa290bb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 May 2018 09:36:16 +0200
Subject: [PATCH 2364/3370] Revert "ghc, haskell infra: #40642 direct to
 master"

---
 pkgs/development/compilers/ghc/7.10.3.nix     | 16 +----
 pkgs/development/compilers/ghc/8.0.2.nix      | 19 +----
 pkgs/development/compilers/ghc/8.2.2.nix      | 21 ++----
 pkgs/development/compilers/ghc/8.4.2.nix      | 33 +++------
 pkgs/development/compilers/ghc/head.nix       | 28 +++-----
 .../haskell-modules/configuration-nix.nix     |  2 +-
 .../haskell-modules/generic-builder.nix       | 72 +++++--------------
 pkgs/development/haskell-modules/lib.nix      |  2 -
 8 files changed, 50 insertions(+), 143 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 7d2f37916323..e4bf23c6e9e2 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -24,10 +24,6 @@
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
   enableShared ? true
-
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -46,14 +42,11 @@ let
   };
 
   buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
@@ -75,6 +68,7 @@ let
   targetCC = builtins.head toolsForTarget;
 
 in
+
 stdenv.mkDerivation rec {
   version = "7.10.3";
   name = "${targetPrefix}ghc-${version}";
@@ -93,8 +87,6 @@ stdenv.mkDerivation rec {
     ./relocation.patch
   ];
 
-  postPatch = "patchShebangs .";
-
   # GHC is a bit confused on its cross terminology.
   preConfigure = ''
     for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
@@ -111,7 +103,6 @@ stdenv.mkDerivation rec {
     export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
     export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
     export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
@@ -144,8 +135,7 @@ stdenv.mkDerivation rec {
   crossConfig = true;
 
   nativeBuildInputs = [
-    perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
-    ghc hscolour
+    ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 3ab44ea7f5e7..4017a01e7027 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -23,10 +23,6 @@
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
   enableShared ? true
-
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -40,14 +36,11 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
@@ -94,8 +87,6 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
 
-  postPatch = "patchShebangs .";
-
   # GHC is a bit confused on its cross terminology.
   preConfigure = ''
     for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
@@ -112,7 +103,6 @@ stdenv.mkDerivation rec {
     export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
     export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
     export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
-
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
@@ -144,10 +134,7 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [
-    perl sphinx
-    ghc hscolour
-  ];
+  nativeBuildInputs = [ ghc perl hscolour sphinx ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
@@ -167,7 +154,7 @@ stdenv.mkDerivation rec {
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/*
+    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 592d5d3603fe..dcc2852a3413 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -23,11 +23,10 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? true
-
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
+  enableShared ?
+    !(targetPlatform.isDarwin
+      # On iOS, dynamic linking is not supported
+      && (targetPlatform.isAarch64 || targetPlatform.isAarch32))
 , # Whether to backport https://phabricator.haskell.org/D4388 for
   # deterministic profiling symbol names, at the cost of a slightly
   # non-standard GHC API
@@ -45,14 +44,11 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
@@ -157,10 +153,7 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [
-    autoconf autoreconfHook automake perl python3 sphinx
-    ghc alex happy hscolour
-  ];
+  nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
@@ -182,7 +175,7 @@ stdenv.mkDerivation rec {
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/*
+    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 79244e46d1b6..5d8adafa9a7f 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -3,7 +3,7 @@
 
 # build-tools
 , bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3
 
 , libffi, libiconv ? null, ncurses
 
@@ -15,21 +15,16 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null
+  enableIntegerSimple ? false, gmp ? null, m4
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
+  enableShared ? !targetPlatform.useAndroidPrebuilt
 
-, # Whetherto build terminfo.
-  enableTerminfo ? !targetPlatform.isWindows
-
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
+, version ? "8.4.2"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -43,14 +38,11 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
@@ -63,9 +55,9 @@ let
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+  libDeps = platform: [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
 
   toolsForTarget =
     if hostPlatform == buildPlatform then
@@ -77,7 +69,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  version = "8.4.2";
+  inherit version;
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
@@ -134,7 +126,7 @@ stdenv.mkDerivation rec {
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
@@ -152,10 +144,7 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [
-    perl autoconf automake m4 python3
-    ghc alex happy
-  ];
+  nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
@@ -177,7 +166,7 @@ stdenv.mkDerivation rec {
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/*
+    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index ede25c7679a6..7e1c73d166a2 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -3,7 +3,7 @@
 
 # build-tools
 , bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchgit, perl, python3, m4
+, autoconf, automake, coreutils, fetchgit, perl, python3
 
 , libffi, libiconv ? null, ncurses
 
@@ -22,15 +22,9 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
-
-, # Whetherto build terminfo.
-  enableTerminfo ? !targetPlatform.isWindows
+  enableShared ? !targetPlatform.useAndroidPrebuilt
 
 , version ? "8.5.20180118"
-, # What flavour to build. An empty string indicates no
-  # specific flavour and falls back to ghc default values.
-  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -44,14 +38,11 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
-    BuildFlavour = ${ghcFlavour}
-    ifneq \"\$(BuildFlavour)\" \"\"
-    include mk/flavours/\$(BuildFlavour).mk
-    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
@@ -64,9 +55,9 @@ let
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+  libDeps = platform: [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
 
   toolsForTarget =
     if hostPlatform == buildPlatform then
@@ -132,7 +123,7 @@ stdenv.mkDerivation rec {
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
@@ -150,10 +141,7 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [
-    perl autoconf automake m4 python3
-    ghc alex happy
-  ];
+  nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
@@ -175,7 +163,7 @@ stdenv.mkDerivation rec {
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/*
+    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 2f1eb1ad97a8..469b249010fa 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -128,7 +128,7 @@ self: super: builtins.intersectAttrs super {
 
   # Prevents needing to add security_tool as a build tool to all of x509-system's
   # dependencies.
-  x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
+  x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
     then let inherit (pkgs.darwin) security_tool;
       in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
         postPatch = (drv.postPatch or "") + ''
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 99c85ac688a5..3ab77c42cbba 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -19,7 +19,6 @@ in
 , buildTarget ? ""
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
 , configureFlags ? []
-, buildFlags ? []
 , description ? ""
 , doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
 , doBenchmark ? false
@@ -32,7 +31,7 @@ in
 , enableSharedExecutables ? false
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
-, enableStaticLibraries ? !hostPlatform.isWindows
+, enableStaticLibraries ? true
 , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
@@ -69,10 +68,6 @@ in
 
 assert editedCabalFile != null -> revision != null;
 
-# --enable-static does not work on windows. This is a bug in GHC.
-# --enable-static will pass -staticlib to ghc, which only works for mach-o and elf.
-assert hostPlatform.isWindows -> enableStaticLibraries == false;
-
 let
 
   inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast
@@ -131,8 +126,6 @@ let
   crossCabalFlagsString =
     stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
 
-  buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
-
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
     (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
@@ -176,22 +169,18 @@ let
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
   nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
-                      setupHaskellDepends ++
                       buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
-  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
+  otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      optionals (allPkgconfigDepends != []) allPkgconfigDepends ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
-
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
   systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
 
-  # When not cross compiling, also include Setup.hs dependencies.
-  ghcEnv = ghc.withPackages (p:
-    haskellBuildInputs ++ stdenv.lib.optional (!isCross) setupHaskellDepends);
+  ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
   setupCommand = "./Setup";
 
@@ -201,22 +190,6 @@ let
 
   nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
 
-  buildPkgDb = ghcName: ''
-    if [ -d "$p/lib/${ghcName}/package.conf.d" ]; then
-      cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf $packageConfDir/
-      continue
-    fi
-    if [ -d "$p/include" ]; then
-      configureFlags+=" --extra-include-dirs=$p/include"
-    fi
-    if [ -d "$p/lib" ]; then
-      configureFlags+=" --extra-lib-dirs=$p/lib"
-    fi
-    if [[ -d "$p/Library/Frameworks" ]]; then
-      configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
-    fi
-  '';
-
 in
 
 assert allPkgconfigDepends != [] -> pkgconfig != null;
@@ -257,37 +230,30 @@ stdenv.mkDerivation ({
     echo "Build with ${ghc}."
     ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
-  '' + (optionalString (setupHaskellDepends != []) ''
-    setupPackageConfDir="$TMPDIR/setup-package.conf.d"
-    mkdir -p $setupPackageConfDir
-  '') + ''
     packageConfDir="$TMPDIR/package.conf.d"
     mkdir -p $packageConfDir
 
     setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
     configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
-  ''
-  # We build the Setup.hs on the *build* machine, and as such should only add
-  # dependencies for the build machine.
-  #
-  # pkgs* arrays defined in stdenv/setup.hs
-  + (optionalString (setupHaskellDepends != []) ''
-    for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
-      ${buildPkgDb nativeGhc.name}
-    done
-    ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache
-  '')
 
-    # For normal components
-  + ''
+    # host.*Pkgs defined in stdenv/setup.hs
     for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
-      ${buildPkgDb ghc.name}
+      if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
+        cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
+        continue
+      fi
+      if [ -d "$p/include" ]; then
+        configureFlags+=" --extra-include-dirs=$p/include"
+      fi
+      if [ -d "$p/lib" ]; then
+        configureFlags+=" --extra-lib-dirs=$p/lib"
+      fi
     done
   ''
   # only use the links hack if we're actually building dylibs. otherwise, the
   # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes
   # "ln -s $out/lib/links", which tries to recreate the links dir and fails
-  + (optionalString (stdenv.isDarwin && (enableSharedLibraries || enableSharedExecutables)) ''
+  + (optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     # Work around a limit in the macOS Sierra linker on the number of paths
     # referenced by any one dynamic library:
     #
@@ -316,11 +282,7 @@ stdenv.mkDerivation ({
     done
 
     echo setupCompileFlags: $setupCompileFlags
-    ${optionalString (setupHaskellDepends != [])
-       ''
-       echo GHC_PACKAGE_PATH="$setupPackageConfDir:"
-       GHC_PACKAGE_PATH="$setupPackageConfDir:" ''
-    }${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
+    ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
 
     runHook postCompileBuildDriver
   '';
@@ -348,7 +310,7 @@ stdenv.mkDerivation ({
 
   buildPhase = ''
     runHook preBuild
-    ${setupCommand} build ${buildTarget}${crossCabalFlagsString}${buildFlagsString}
+    ${setupCommand} build ${buildTarget}${crossCabalFlagsString}
     runHook postBuild
   '';
 
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index fb1302f60ea5..55e45bd6559d 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -131,8 +131,6 @@ rec {
    */
   appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; });
 
-  appendBuildFlag = drv: x: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ [x]; });
-  appendBuildFlags = drv: xs: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ xs; });
   /* removeConfigureFlag drv x is a Haskell package like drv, but with
      all cabal configure arguments that are equal to x removed.
 

From 742a5e040f4a0b362ff3391caf863f42577a89ed Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 23 May 2018 00:48:22 -0700
Subject: [PATCH 2365/3370] debootstrap: 1.0.99 -> 1.0.100

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/debootstrap/versions.

These checks were done:

- built on NixOS
- /nix/store/g8j2xv68jlpcggliz2as8814pnlls6x5-debootstrap-1.0.100/bin/debootstrap passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.100 with grep in /nix/store/g8j2xv68jlpcggliz2as8814pnlls6x5-debootstrap-1.0.100
- directory tree listing: https://gist.github.com/70fb3fb65a686979e6e2524ca19aabeb
- du listing: https://gist.github.com/e292e6056ab90b1742bed2ca6569a506
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 22bf8340156c..d12038a707d2 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.99";
+  version = "1.0.100";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1plw53zghiykddj77s5jk10ncx82cgrkk798p909yydhcghnvcsb";
+    sha256 = "0jmwf26sq4bkdz6wi0dcjsrfkg8c8k3xdhi11xp6cdrw6qpw82ws";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

From ca556c4def105e9e818546ccbce280dbb8131962 Mon Sep 17 00:00:00 2001
From: Guthrie McAfee Armstrong <guthrie.armstrong@gmail.com>
Date: Wed, 23 May 2018 04:27:08 -0400
Subject: [PATCH 2366/3370] Remove "free and secure" from Discord description
 (#40968)

* Remove "free and secure" from Discord description

Changed Discord package description to remove "free and secure". We can't vouch for its security, but it's definitely not "free" in the sense that most users would read this description. ;)

* Add "cross-platform" to Discord description
---
 .../networking/instant-messengers/discord/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 6801edb9767c..09ead9b3de65 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     };
 
     meta = with stdenv.lib; {
-        description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone";
+        description = "All-in-one cross-platform voice and text chat for gamers";
         homepage = https://discordapp.com/;
         downloadPage = "https://github.com/crmarsh/discord-linux-bugs";
         license = licenses.unfree;

From cc2ac8a39ebad753d8da6adf4c0d3dd18ec7fa65 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Wed, 23 May 2018 10:33:26 +0200
Subject: [PATCH 2367/3370] ocamlPackages.imagelib: init at 20171028 (#40910)

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

diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix
new file mode 100644
index 000000000000..77b18f0ce3a9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/imagelib/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, decompress }:
+
+stdenv.mkDerivation rec {
+  version = "20171028";
+  name = "ocaml${ocaml.version}-imagelib-${version}";
+  src = fetchFromGitHub {
+    owner = "rlepigre";
+    repo = "ocaml-imagelib";
+    rev = "ocaml-imagelib_${version}";
+    sha256 = "1frkrgcrv4ybdmqcfxpfsywx0hm1arxgxp32n8kzky6qip1g0zxf";
+  };
+
+  buildInputs = [ which ocaml findlib ocamlbuild ];
+
+  propagatedBuildInputs = [ decompress ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    description = "Image formats such as PNG and PPM in OCaml";
+    license = stdenv.lib.licenses.lgpl3;
+    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 e46888992f77..7bbb56c7b646 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -269,6 +269,8 @@ let
 
     higlo = callPackage ../development/ocaml-modules/higlo { };
 
+    imagelib = callPackage ../development/ocaml-modules/imagelib { };
+
     inotify = callPackage ../development/ocaml-modules/inotify { };
 
     integers = callPackage ../development/ocaml-modules/integers { };

From 2e2cbda2908716e263d42f13b8643893319b3827 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 22 May 2018 22:49:42 -0700
Subject: [PATCH 2368/3370] openssh: 7.6p1 -> 7.7p1

Release notes at https://www.openssh.com/txt/release-7.7;
primarily bugfixes.

Update ssh-hpn as well.

Switch to salsa.debian.org (from anonscm.debian.org).
---
 pkgs/tools/networking/openssh/default.nix      | 15 ++++++++-------
 .../openssh/dont_create_privsep_path.patch     | 17 +++++++++--------
 .../networking/openssh/locale_archive.patch    | 18 +++++++++---------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 42fcc842ad55..46c0ee0f2768 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -12,26 +12,27 @@ let
   # **please** update this patch when you update to a new openssh release.
   gssapiPatch = fetchpatch {
     name = "openssh-gssapi.patch";
-    url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian"
-        + "/patches/gssapi.patch?id=1e0d55f9163793742d20eaadd4784db16fd3459d";
-    sha256 = "130phj87q87p9crigd6852nnaqsqkfg09h45a32lk4524h9kkxgb";
+    url = "https://salsa.debian.org/ssh-team/openssh/raw/"
+      + "e395eed38096fcda74398424ea94de3ec44effd5"
+      + "/debian/patches/gssapi.patch";
+    sha256 = "0x7xysgdahb4jaq0f28g2d7yzp0d3mh59i4xnffszvjndhvbk27x";
   };
 
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "openssh-${version}";
-  version = if hpnSupport then "7.6p1" else "7.6p1";
+  version = if hpnSupport then "7.7p1" else "7.7p1";
 
   src = if hpnSupport then
       fetchurl {
-        url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_6_P1.tar.gz";
-        sha256 = "15b1zjk9f3jlxji1vpqfla40cnzy8hv2clk925cvpgz7lqgv4a1d";
+        url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-7_7_P1.tar.gz";
+        sha256 = "1l4k8mg3gnzxbz53cma8s6ak56waz03ijsr08p8vgpi0c2rc5ri5";
       }
     else
       fetchurl {
         url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-        sha256 = "08qpsb8mrzcx8wgvz9insiyvq7sbg26yj5nvl2m5n57yvppcl8x3";
+        sha256 = "13vbbrvj3mmfhj83qyrg5c0ipr6bzw5s65dy4k8gr7p9hkkfffyp";
       };
 
   patches =
diff --git a/pkgs/tools/networking/openssh/dont_create_privsep_path.patch b/pkgs/tools/networking/openssh/dont_create_privsep_path.patch
index b6d432d5c5de..23f3ab67a087 100644
--- a/pkgs/tools/networking/openssh/dont_create_privsep_path.patch
+++ b/pkgs/tools/networking/openssh/dont_create_privsep_path.patch
@@ -1,11 +1,12 @@
-diff -ur openssh-7.2p2_orig/Makefile.in openssh-7.2p2/Makefile.in
---- openssh-7.2p2_orig/Makefile.in	2016-03-09 19:04:48.000000000 +0100
-+++ openssh-7.2p2/Makefile.in	2016-07-16 09:56:05.643903293 +0200
-@@ -301,7 +301,6 @@
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)5
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
- 	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
--	(umask 022 ; $(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH))
+diff --git i/Makefile.in w/Makefile.in
+index 04e1c8e5..9bd5d01b 100644
+--- i/Makefile.in
++++ w/Makefile.in
+@@ -329,7 +329,6 @@ install-files:
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)5
+ 	$(MKDIR_P) $(DESTDIR)$(mandir)/$(mansubdir)8
+ 	$(MKDIR_P) $(DESTDIR)$(libexecdir)
+-	$(MKDIR_P) -m 0755 $(DESTDIR)$(PRIVSEP_PATH)
  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh$(EXEEXT) $(DESTDIR)$(bindir)/ssh$(EXEEXT)
  	$(INSTALL) -m 0755 $(STRIP_OPT) scp$(EXEEXT) $(DESTDIR)$(bindir)/scp$(EXEEXT)
  	$(INSTALL) -m 0755 $(STRIP_OPT) ssh-add$(EXEEXT) $(DESTDIR)$(bindir)/ssh-add$(EXEEXT)
diff --git a/pkgs/tools/networking/openssh/locale_archive.patch b/pkgs/tools/networking/openssh/locale_archive.patch
index a7f946d693a2..3fe4a21ea47e 100644
--- a/pkgs/tools/networking/openssh/locale_archive.patch
+++ b/pkgs/tools/networking/openssh/locale_archive.patch
@@ -1,15 +1,15 @@
-diff --git a/session.c b/session.c
-index e032de6..44db2bb 100644
---- a/session.c
-+++ b/session.c
-@@ -1196,6 +1196,10 @@ do_setup_env(Session *s, const char *shell)
+diff --git i/session.c w/session.c
+index 58826db1..658dd911 100644
+--- i/session.c
++++ w/session.c
+@@ -1053,6 +1053,10 @@ do_setup_env(struct ssh *ssh, Session *s, const char *shell)
  	if (getenv("TZ"))
  		child_set_env(&env, &envsize, "TZ", getenv("TZ"));
  
-+  /* NixOS path to the glibc locale archive, to be set in the upstart job */
++	/* NixOS path to the glibc locale archive, to be set in the systemd job */
 +	if (getenv("LOCALE_ARCHIVE"))
 +		child_set_env(&env, &envsize, "LOCALE_ARCHIVE", getenv("LOCALE_ARCHIVE"));
 +
- 	/* Set custom environment options from RSA authentication. */
- 	if (!options.use_login) {
- 		while (custom_environment) {
+ 	/* Set custom environment options from pubkey authentication. */
+ 	if (options.permit_user_env) {
+ 		for (n = 0 ; n < auth_opts->nenv; n++) {

From fe2b50badba45c1bdc25f378996547402736e5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 23 May 2018 10:22:49 +0100
Subject: [PATCH 2369/3370] radare2: add myself as maintainer

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

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 5f7b389cc2b1..5ddb03d318f9 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     description = "unix-like reverse engineering framework and commandline tools";
     homepage = http://radare.org/;
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [raskin makefu];
+    maintainers = with stdenv.lib.maintainers; [raskin makefu mic92];
     platforms = with stdenv.lib.platforms; linux;
     inherit version;
   };

From 454edcd6c0296987e22662904cc9b1f9cb6a36dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 23 May 2018 10:22:49 +0100
Subject: [PATCH 2370/3370] radare2: add myself as maintainer

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

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 5f7b389cc2b1..5ddb03d318f9 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     description = "unix-like reverse engineering framework and commandline tools";
     homepage = http://radare.org/;
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [raskin makefu];
+    maintainers = with stdenv.lib.maintainers; [raskin makefu mic92];
     platforms = with stdenv.lib.platforms; linux;
     inherit version;
   };

From 31f76cde3e86c8cc2d67e3991988876b7535b0d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 23 May 2018 02:54:14 -0700
Subject: [PATCH 2371/3370] zsh-autosuggestions: 0.4.2 -> 0.4.3 (#40949)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/zsh-autosuggestions/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.4.3 with grep in /nix/store/dvwkp03wvr20n7yf3738hxsl9h1ab02i-zsh-autosuggestions-0.4.3
- directory tree listing: https://gist.github.com/dd361ac28a6f251b013a1fafa71c394e
- du listing: https://gist.github.com/cb334bbb9559eb43e36794d276a97db9
---
 pkgs/shells/zsh/zsh-autosuggestions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
index 906301110e96..02e25cfdde62 100644
--- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix
+++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "zsh-autosuggestions-${version}";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "zsh-users";
     repo = "zsh-autosuggestions";
     rev = "v${version}";
-    sha256 = "1yvbhfaaqzhmjmwjh75i1p4mrqp3ksw74bp8lrll81c6zf8bmvig";
+    sha256 = "117m4jk3lgh98k699v00pg554qblpr4pbfvgs0qrgygfx1n1bpl4";
   };
 
   buildInputs = [ zsh ];

From 8f96324584095764d769210a722c6b0defc5ec0e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 May 2018 12:23:16 +0200
Subject: [PATCH 2372/3370] haskell-lambdabot-core: apply patch from @int-e to
 fix GHC 8.4.x build

---
 .../haskell-modules/configuration-ghc-8.4.x.nix   |  2 ++
 .../patches/lambdabot-core-ghc-8.4.x-fix.patch    | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 83d97c64b48b..0adaa5f274c3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -448,4 +448,6 @@ self: super: {
     sha256 = "1bpsqq80h6nxm04wddgcgyzn0fjfsmhccmqb211jqswv5209znx8";
   });
 
+  lambdabot-core = appendPatch super.lambdabot-core ./patches/lambdabot-core-ghc-8.4.x-fix.patch;
+
 }
diff --git a/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch
new file mode 100644
index 000000000000..9b7b7cfb8f96
--- /dev/null
+++ b/pkgs/development/haskell-modules/patches/lambdabot-core-ghc-8.4.x-fix.patch
@@ -0,0 +1,15 @@
+index 60e134c..246d8ca 100644
+--- lambdabot-core/src/Lambdabot/Config.hs
++++ lambdabot-core/src/Lambdabot/Config.hs
+@@ -29,9 +29,9 @@ import Data.Typeable
+ import Data.Generics (everywhere, mkT)
+ import Language.Haskell.TH
+ 
+-data Config t where Config :: (Typeable1 k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t
++data Config t where Config :: (Typeable k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t
+ 
+-cast1 :: (Typeable1 f, Typeable1 g) => f a -> Maybe (g a)
++cast1 :: (Typeable f, Typeable g) => f a -> Maybe (g a)
+ cast1 = fmap runIdentity . gcast1 . Identity
+ 
+ instance GEq Config where

From 32bad1b6361116f7bb0e866fc2aaa08a9eaa920c Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Sat, 19 May 2018 09:47:14 +0200
Subject: [PATCH 2373/3370] nixos/slimserver: Disable broken image/video
 support (#40589)

---
 nixos/modules/services/audio/slimserver.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/audio/slimserver.nix b/nixos/modules/services/audio/slimserver.nix
index 7d661dd60408..640403d2c97d 100644
--- a/nixos/modules/services/audio/slimserver.nix
+++ b/nixos/modules/services/audio/slimserver.nix
@@ -51,7 +51,8 @@ in {
       serviceConfig = {
         User = "slimserver";
         PermissionsStartOnly = true;
-        ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache";
+        # Issue 40589: Disable broken image/video support (audio still works!)
+        ExecStart = "${cfg.package}/slimserver.pl --logdir ${cfg.dataDir}/logs --prefsdir ${cfg.dataDir}/prefs --cachedir ${cfg.dataDir}/cache --noimage --novideo";
       };
     };
 

From 308638c0ca1b1ccf64501aa25b8854d212488d3f Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Sat, 19 May 2018 10:20:00 +0200
Subject: [PATCH 2374/3370] nixos/slimserver: Fix transcoding

---
 pkgs/servers/slimserver/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix
index f79e53b64cf4..c9bf8393afc7 100644
--- a/pkgs/servers/slimserver/default.nix
+++ b/pkgs/servers/slimserver/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPerlPackage, fetchurl
-, perl, perlPackages, fetchpatch }:
+{ stdenv, buildPerlPackage, fetchurl, fetchpatch, makeWrapper
+, perl, perlPackages, flac, faad2, sox, lame, monkeysAudio, wavpack }:
 
 buildPerlPackage rec {
   name = "slimserver-${version}";
@@ -16,6 +16,7 @@ buildPerlPackage rec {
   } ) ];
 
   buildInputs = [
+    makeWrapper
     perl
     perlPackages.AnyEvent
     perlPackages.AudioScan
@@ -75,17 +76,19 @@ buildPerlPackage rec {
 
   preConfigurePhase = "";
 
-  buildPhase = "
+  buildPhase = ''
     mv lib tmp
     mkdir -p lib/perl5/site_perl
     mv CPAN_used/* lib/perl5/site_perl
     cp -rf tmp/* lib/perl5/site_perl
-  ";
+  '';
 
   doCheck = false;
 
   installPhase = ''
     cp -r . $out
+    wrapProgram $out/slimserver.pl \
+      --prefix PATH : "${stdenv.lib.makeBinPath [ lame flac faad2 sox monkeysAudio wavpack ]}"
   '';
 
   outputs = [ "out" ];

From 22d03ba02c8f315e9a488266448f637788b88dc4 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <pascal.wittmann@red6-es.de>
Date: Wed, 23 May 2018 12:31:59 +0200
Subject: [PATCH 2375/3370] vimpc: use git tag instead of commit hash

---
 pkgs/applications/audio/vimpc/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix
index 37ccbb1425ff..96a6081c4d8f 100644
--- a/pkgs/applications/audio/vimpc/default.nix
+++ b/pkgs/applications/audio/vimpc/default.nix
@@ -8,9 +8,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "boysetsfrog";
     repo = "vimpc";
-    # Using commit-hash as there is not tag available
-    # https://github.com/boysetsfrog/vimpc/issues/70
-    rev = "63556da6b94ab27d7e3f542399f5e0975a5812ba";
+    rev = "v${version}";
     sha256 = "1495a702df4nja8mlxq98mkbic2zv88sjiinimf9qddrfb38jxk6";
   };
 

From 266adab32d55f1272e95e9aae8c6ee2bab3f0570 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 May 2018 19:50:12 -0400
Subject: [PATCH 2376/3370] cctools: Remove a bunch of stuff no longer needed
 for Linux

---
 pkgs/os-specific/darwin/cctools/port.nix | 34 +++++++-----------------
 pkgs/top-level/darwin-packages.nix       |  1 -
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index d8abdc2c6f84..dbe8bda5e1e0 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool_2, autoreconfHook
-, llvm, libcxx, libcxxabi, clang, libuuid
-, libobjc ? null, maloader ? null, xctoolchain ? null
+, libcxx, libcxxabi, libuuid
+, libobjc ? null, maloader ? null
 , hostPlatform, targetPlatform
 , enableDumpNormalizedLibArgs ? false
 }:
@@ -22,7 +22,7 @@ let
 in
 
 # Non-Darwin alternatives
-assert (!hostPlatform.isDarwin) -> (maloader != null && xctoolchain != null);
+assert (!hostPlatform.isDarwin) -> maloader != null;
 
 assert enableDumpNormalizedLibArgs -> (!useOld);
 
@@ -57,8 +57,6 @@ let
       autoreconfHook
     ];
     buildInputs = [ libuuid ] ++
-      # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
-      stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
       stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];
 
     patches = [
@@ -80,9 +78,6 @@ let
 
     # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
     configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
-    configureFlags = stdenv.lib.optionals (!stdenv.isDarwin) [
-      "CXXFLAGS=-I${libcxx}/include/c++/v1"
-    ];
 
     postPatch = ''
       sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
@@ -108,8 +103,6 @@ let
       #  include_next "unistd.h"
       #endif
       EOF
-    '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
-      sed -i -e 's|clang++|& -I${libcxx}/include/c++/v1|' cctools/autogen.sh
     '' + stdenv.lib.optionalString useOld ''
       cd cctools
     '';
@@ -128,21 +121,12 @@ let
       popd
     '';
 
-    postInstall =
-      if hostPlatform.isDarwin
-      then ''
-        cat >$out/bin/dsymutil << EOF
-        #!${stdenv.shell}
-        EOF
-        chmod +x $out/bin/dsymutil
-      ''
-      else ''
-        for tool in dyldinfo dwarfdump dsymutil; do
-          ${makeWrapper}/bin/makeWrapper "${maloader}/bin/ld-mac" "$out/bin/${targetPlatform.config}-$tool" \
-            --add-flags "${xctoolchain}/bin/$tool"
-          ln -s "$out/bin/${targetPlatform.config}-$tool" "$out/bin/$tool"
-        done
-      '';
+    postInstall = ''
+      cat >$out/bin/dsymutil << EOF
+      #!${stdenv.shell}
+      EOF
+      chmod +x $out/bin/dsymutil
+    '';
 
     passthru = {
       inherit targetPrefix;
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index d2d41792c461..907ec0c75924 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -29,7 +29,6 @@ in
     inherit (darwin) libobjc maloader;
     stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
     libcxxabi = pkgs.libcxxabi;
-    xctoolchain = darwin.xcode.toolchain;
   };
 
   cf-private = callPackage ../os-specific/darwin/cf-private {

From 8733a3b9323348a84d6ab2f04a769dc774ea3edc Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 23 May 2018 15:24:32 +0200
Subject: [PATCH 2377/3370] pythonPackages.django: 1.11.12 -> 1.11.13

See https://docs.djangoproject.com/en/1.11/releases/1.11.13/ for release
information
---
 pkgs/development/python-modules/django/1_11.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix
index 8dead5644858..ada73a7e8180 100644
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "Django";
-  version = "1.11.12";
+  version = "1.11.13";
 
   disabled = pythonOlder "2.7";
 
   src = fetchurl {
     url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
-    sha256 = "1szjha338grhf9dq0wpbrqwvak597shsx474pm5j67kn09xqqfad";
+    sha256 = "19d4c1rlbhmbvbxvskvqjb2aw4dnf2cqi1hhdh11ykdy1a7gxba6";
   };
 
   patches = stdenv.lib.optionals withGdal [

From 64c90e53e742a4edc65afa059639c9853696c2c3 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 May 2018 01:24:16 -0400
Subject: [PATCH 2378/3370] darwin stdenv: Persist `darwin.binutils-unwrapped`

binutils-unwrapped was added in ef3db7d14c90e1876d38ebc25428b4f65962ffbc
and needs a corresponding `persisted` attr in the Darwin stdenv.
---
 pkgs/stdenv/darwin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 9563f52ea263..24dc30692fa5 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -321,7 +321,7 @@ in rec {
       darwin = super.darwin // {
         inherit (darwin) dyld ICU Libsystem libiconv;
       } // lib.optionalAttrs (super.targetPlatform == localSystem) {
-        inherit (darwin) binutils cctools;
+        inherit (darwin) binutils binutils-unwrapped cctools;
       };
     } // lib.optionalAttrs (super.targetPlatform == localSystem) {
       # Need to get rid of these when cross-compiling.

From f567a851a15d31be2ce95856b93a9f71adfae601 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 May 2018 02:06:18 -0400
Subject: [PATCH 2379/3370] darwin stdenv: Properly compose overrides

`super` usage was very suspect.
---
 pkgs/stdenv/darwin/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 24dc30692fa5..951c96877f96 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -294,7 +294,7 @@ in rec {
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
-    overrides = self: super: (persistent self super) // {
+    overrides = lib.composeExtensions persistent (self: super: {
       # Hack to make sure we don't link ncurses in bootstrap tools. The proper
       # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
       # quite a sledgehammer just to get the C runtime.
@@ -303,7 +303,7 @@ in rec {
            "--disable-curses"
          ];
       });
-    };
+    });
   };
 
   stdenvDarwin = prevStage: let
@@ -386,16 +386,15 @@ in rec {
       dyld Libsystem CF cctools ICU libiconv locale
     ]);
 
-    overrides = self: super:
-      let persistent' = persistent self super; in persistent' // {
-        clang = cc;
-        llvmPackages = persistent'.llvmPackages // { clang = cc; };
-        inherit cc;
+    overrides = lib.composeExtensions persistent (self: super: {
+      clang = cc;
+      llvmPackages = super.llvmPackages // { clang = cc; };
+      inherit cc;
 
-        darwin = super.darwin // {
-          xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; };
-        };
+      darwin = super.darwin // {
+        xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; };
       };
+    });
   };
 
   stagesDarwin = [

From 983e74ae4e9092a302ba281357e33ae9f32a2024 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 22 May 2018 13:25:35 -0400
Subject: [PATCH 2380/3370] stdenv: Avoid targetPlatform.isDarwin causing a
 mass rebuild

We want `buildPackages` to be almost the same as
`buildPackages.buildPackges`, but that is only true if most packages
don't care about the target platform. The commented code however made
them all care about whether the target platform was Darwin.
---
 pkgs/stdenv/generic/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index e9ae54811a21..2eac9e58daa6 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -90,9 +90,14 @@ let
       '' + lib.optionalString hostPlatform.isDarwin ''
         export NIX_DONT_SET_RPATH=1
         export NIX_NO_SELF_RPATH=1
-      '' + lib.optionalString targetPlatform.isDarwin ''
-        export NIX_TARGET_DONT_SET_RPATH=1
-      '';
+      ''
+      # TODO this should be uncommented, but it causes stupid mass rebuilds. I
+      # think the best solution would just be to fixup linux RPATHs so we don't
+      # need to set `-rpath` anywhere.
+      # + lib.optionalString targetPlatform.isDarwin ''
+      #   export NIX_TARGET_DONT_SET_RPATH=1
+      # ''
+      ;
 
       inherit initialPath shell
         defaultNativeBuildInputs defaultBuildInputs;

From 4ffa8b6125c83d6e49fbe3574edc053db7ea2ec1 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Tue, 22 May 2018 17:37:29 -0400
Subject: [PATCH 2381/3370] binutils: Do not needless redownload sources
 cascading more rebuilds

Unfortunately this is a crude hack that we use the same binutils source
everywhere in the bootstrap chain.
---
 pkgs/development/tools/misc/binutils/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index fb780734bd7a..db0908952dc5 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -19,10 +19,11 @@ in
 stdenv.mkDerivation rec {
   name = targetPrefix + basename;
 
-  src = fetchurl {
+  # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM
+  src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl {
     url = "mirror://gnu/binutils/${basename}.tar.bz2";
     sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg";
-  };
+  });
 
   patches = [
     # Turn on --enable-new-dtags by default to make the linker set

From 446cb32ea192a650c90e5e0e20e4862bae2761be Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 May 2018 10:11:03 -0400
Subject: [PATCH 2382/3370] haskell generic-builder: Remove merge conflict

I forgot this in 17316643fd1a0bca5cafddaef227327542c2e832
---
 pkgs/development/haskell-modules/generic-builder.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 32e7734dd0bd..b6dcf3558eac 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -173,10 +173,6 @@ let
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      allPkgconfigDepends ++
-=======
-  otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
-                     optionals (allPkgconfigDepends != []) allPkgconfigDepends ++
->>>>>>> upstream/master
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;

From 3394c96655822c36437a31bda3c006009b5ffc84 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 May 2018 10:20:26 -0400
Subject: [PATCH 2383/3370] haskell generic-builder: Tiny changes that preserve
 hases

These bring us closer to staging at no cost
---
 pkgs/development/haskell-modules/generic-builder.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3ab77c42cbba..f08130a3157a 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -20,7 +20,7 @@ in
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
 , configureFlags ? []
 , description ? ""
-, doCheck ? !isCross && (stdenv.lib.versionOlder "7.4" ghc.version)
+, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
 , doBenchmark ? false
 , doHoogle ? true
 , editedCabalFile ? null
@@ -172,7 +172,7 @@ let
                       buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
   otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
-                     optionals (allPkgconfigDepends != []) allPkgconfigDepends ++
+                     allPkgconfigDepends ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;

From 513cd3de0e05fa25b08b4bf52e6389e406916190 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 13 May 2018 10:53:09 -0400
Subject: [PATCH 2384/3370] haskell-generic-builder: Add extra framework dirs

Just like with the other `--extra-*` flags, cc/ld-wrapper already handles
this, but we need to make Cabal aware so that the haskell builds have
the correct metadata.
---
 pkgs/development/haskell-modules/generic-builder.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index f08130a3157a..80d3bec38e7d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -248,6 +248,9 @@ stdenv.mkDerivation ({
       if [ -d "$p/lib" ]; then
         configureFlags+=" --extra-lib-dirs=$p/lib"
       fi
+      if [[ -d "$p/Library/Frameworks" ]]; then
+        configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
+      fi
     done
   ''
   # only use the links hack if we're actually building dylibs. otherwise, the

From e1b9419dec7fa09a4d08482ed8156b4bba90bd51 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 21 May 2018 14:44:46 -0400
Subject: [PATCH 2385/3370] haskell generic builder: `setupHaskellDepends`
 should be `nativeBuildInputs

This is because they are just for Setup.hs, so they are just used at build time
and completely isolated from the normal components' dependencies.

This was previous implemented in 8a8f0408cd9b7fdda1095718107c800057658c44, but
reverted in e69c7f56419589c0d3296e81f47032fa813cca4b because it broken
setup-depends non-cross in haskell shell environments (custom Setup.hs in cross
shell environments has never worked). This version adds a special native
exception to avoid that breakage.
---
 pkgs/development/haskell-modules/generic-builder.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 80d3bec38e7d..0a668fd38ca7 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -169,18 +169,22 @@ let
                         optionals doCheck testPkgconfigDepends ++ optionals doBenchmark benchmarkPkgconfigDepends;
 
   nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
+                      setupHaskellDepends ++
                       buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
-  otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
+  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
                      allPkgconfigDepends ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
                      optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
+
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 
   haskellBuildInputs = stdenv.lib.filter isHaskellPkg allBuildInputs;
   systemBuildInputs = stdenv.lib.filter isSystemPkg allBuildInputs;
 
-  ghcEnv = ghc.withPackages (p: haskellBuildInputs);
+  # When not cross compiling, also include Setup.hs dependencies.
+  ghcEnv = ghc.withPackages (p:
+    haskellBuildInputs ++ stdenv.lib.optional (!isCross) setupHaskellDepends);
 
   setupCommand = "./Setup";
 

From 38fbdcc7267d84aa224a8711038caa2b8ef8a418 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 1 Mar 2018 13:35:48 +0800
Subject: [PATCH 2386/3370] haskell generic builder: Use setup package database
 for setup-depends

Adapted from https://github.com/obsidiansystems/nixpkgs/commit/b69f420121120433220c568e4b35ade539ef60f2 by @Ericson2314
---
 .../haskell-modules/generic-builder.nix       | 54 +++++++++++++------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 0a668fd38ca7..b0cf228f8c76 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -194,6 +194,22 @@ let
 
   nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
 
+  buildPkgDb = ghcName: ''
+    if [ -d "$p/lib/${ghcName}/package.conf.d" ]; then
+      cp -f "$p/lib/${ghcName}/package.conf.d/"*.conf $packageConfDir/
+      continue
+    fi
+    if [ -d "$p/include" ]; then
+      configureFlags+=" --extra-include-dirs=$p/include"
+    fi
+    if [ -d "$p/lib" ]; then
+      configureFlags+=" --extra-lib-dirs=$p/lib"
+    fi
+    if [[ -d "$p/Library/Frameworks" ]]; then
+      configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
+    fi
+  '';
+
 in
 
 assert allPkgconfigDepends != [] -> pkgconfig != null;
@@ -234,27 +250,31 @@ stdenv.mkDerivation ({
     echo "Build with ${ghc}."
     ${optionalString (hasActiveLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
 
+  '' + (optionalString (setupHaskellDepends != []) ''
+    setupPackageConfDir="$TMPDIR/setup-package.conf.d"
+    mkdir -p $setupPackageConfDir
+  '') + ''
     packageConfDir="$TMPDIR/package.conf.d"
     mkdir -p $packageConfDir
 
     setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
     configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags"
+  ''
+  # We build the Setup.hs on the *build* machine, and as such should only add
+  # dependencies for the build machine.
+  #
+  # pkgs* arrays defined in stdenv/setup.hs
+  + (optionalString (setupHaskellDepends != []) ''
+    for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
+      ${buildPkgDb nativeGhc.name}
+    done
+    ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache
+  '')
 
-    # host.*Pkgs defined in stdenv/setup.hs
+    # For normal components
+  + ''
     for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
-      if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then
-        cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/
-        continue
-      fi
-      if [ -d "$p/include" ]; then
-        configureFlags+=" --extra-include-dirs=$p/include"
-      fi
-      if [ -d "$p/lib" ]; then
-        configureFlags+=" --extra-lib-dirs=$p/lib"
-      fi
-      if [[ -d "$p/Library/Frameworks" ]]; then
-        configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
-      fi
+      ${buildPkgDb ghc.name}
     done
   ''
   # only use the links hack if we're actually building dylibs. otherwise, the
@@ -289,7 +309,11 @@ stdenv.mkDerivation ({
     done
 
     echo setupCompileFlags: $setupCompileFlags
-    ${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
+    ${optionalString (setupHaskellDepends != [])
+       ''
+       echo GHC_PACKAGE_PATH="$setupPackageConfDir:"
+       GHC_PACKAGE_PATH="$setupPackageConfDir:" ''
+    }${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
 
     runHook postCompileBuildDriver
   '';

From a4d5dbd45dfe35ca93b32daedba1c25167701cb0 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Sun, 11 Mar 2018 17:13:25 +0800
Subject: [PATCH 2387/3370] haskell generic builder: Disable static libs on
 Windows because no -staticlib

The reason why this does not work is not that we can't built static
objects, we can, but we can't use `-staticlib` on GHC on windows.
`-staticlib` rolls all dependencies into a combined archive. While this
would work on windows if we used gnu ar and MRI script, GHC can't rely
on GNU ar, and as such has a quick archive concatenation module for GNU
and BSD archives only.
---
 pkgs/development/haskell-modules/generic-builder.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index b0cf228f8c76..66c8c1fd3753 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -31,7 +31,7 @@ in
 , enableSharedExecutables ? false
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
-, enableStaticLibraries ? true
+, enableStaticLibraries ? !hostPlatform.isWindows
 , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
@@ -68,6 +68,10 @@ in
 
 assert editedCabalFile != null -> revision != null;
 
+# --enable-static does not work on windows. This is a bug in GHC.
+# --enable-static will pass -staticlib to ghc, which only works for mach-o and elf.
+assert hostPlatform.isWindows -> enableStaticLibraries == false;
+
 let
 
   inherit (stdenv.lib) optional optionals optionalString versionOlder versionAtLeast

From affeb0cb805f82bcc51e192a4c3bfe00f5f63fc9 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Sat, 17 Mar 2018 14:42:28 +0800
Subject: [PATCH 2388/3370] haskell generic builder: Do the `links` dance only
 if shared is enabled.

---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 66c8c1fd3753..ef4cccdd820e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -284,7 +284,7 @@ stdenv.mkDerivation ({
   # only use the links hack if we're actually building dylibs. otherwise, the
   # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes
   # "ln -s $out/lib/links", which tries to recreate the links dir and fails
-  + (optionalString (stdenv.isDarwin && enableSharedLibraries) ''
+  + (optionalString (stdenv.isDarwin && (enableSharedLibraries || enableSharedExecutables)) ''
     # Work around a limit in the macOS Sierra linker on the number of paths
     # referenced by any one dynamic library:
     #

From 87afa66a63eff046b5da7605909bae956b26e585 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Sat, 17 Mar 2018 16:55:39 +0800
Subject: [PATCH 2389/3370] haskell infra: Adds buildFlags logic

---
 pkgs/development/haskell-modules/generic-builder.nix | 5 ++++-
 pkgs/development/haskell-modules/lib.nix             | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index ef4cccdd820e..8d9b596276c3 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -19,6 +19,7 @@ in
 , buildTarget ? ""
 , buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
 , configureFlags ? []
+, buildFlags ? []
 , description ? ""
 , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
 , doBenchmark ? false
@@ -130,6 +131,8 @@ let
   crossCabalFlagsString =
     stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
 
+  buildFlagsString = optionalString (buildFlags != []) (" " + concatStringsSep " " buildFlags);
+
   defaultConfigureFlags = [
     "--verbose" "--prefix=$out" "--libdir=\\$prefix/lib/\\$compiler" "--libsubdir=\\$pkgid"
     (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
@@ -345,7 +348,7 @@ stdenv.mkDerivation ({
 
   buildPhase = ''
     runHook preBuild
-    ${setupCommand} build ${buildTarget}${crossCabalFlagsString}
+    ${setupCommand} build ${buildTarget}${crossCabalFlagsString}${buildFlagsString}
     runHook postBuild
   '';
 
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 55e45bd6559d..fb1302f60ea5 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -131,6 +131,8 @@ rec {
    */
   appendConfigureFlag = drv: x: overrideCabal drv (drv: { configureFlags = (drv.configureFlags or []) ++ [x]; });
 
+  appendBuildFlag = drv: x: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ [x]; });
+  appendBuildFlags = drv: xs: overrideCabal drv (drv: { buildFlags = (drv.buildFlags or []) ++ xs; });
   /* removeConfigureFlag drv x is a Haskell package like drv, but with
      all cabal configure arguments that are equal to x removed.
 

From 63e5b3ce716c9d10f024cc4aafca82146d76258e Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Mon, 26 Mar 2018 14:57:56 +0800
Subject: [PATCH 2390/3370] used stdenv.targetPlatform.isDarwin and not
 stdenv.isDarwin.

---
 pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 469b249010fa..2f1eb1ad97a8 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -128,7 +128,7 @@ self: super: builtins.intersectAttrs super {
 
   # Prevents needing to add security_tool as a build tool to all of x509-system's
   # dependencies.
-  x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc
+  x509-system = if pkgs.stdenv.targetPlatform.isDarwin && !pkgs.stdenv.cc.nativeLibc
     then let inherit (pkgs.darwin) security_tool;
       in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: {
         postPatch = (drv.postPatch or "") + ''

From 9ce15ea60c8a93753d20a06d7f3dae6c867f7d10 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 May 2018 19:33:05 -0400
Subject: [PATCH 2391/3370] ghc: Normalize derivations

---
 pkgs/development/compilers/ghc/7.10.3.nix |  7 +++++--
 pkgs/development/compilers/ghc/8.0.2.nix  |  8 +++++++-
 pkgs/development/compilers/ghc/8.2.2.nix  | 11 ++++++-----
 pkgs/development/compilers/ghc/8.4.2.nix  | 12 +++++++-----
 pkgs/development/compilers/ghc/head.nix   |  7 +++++--
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index e4bf23c6e9e2..150d14e1db46 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -68,7 +68,6 @@ let
   targetCC = builtins.head toolsForTarget;
 
 in
-
 stdenv.mkDerivation rec {
   version = "7.10.3";
   name = "${targetPrefix}ghc-${version}";
@@ -87,6 +86,8 @@ stdenv.mkDerivation rec {
     ./relocation.patch
   ];
 
+  postPatch = "patchShebangs .";
+
   # GHC is a bit confused on its cross terminology.
   preConfigure = ''
     for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
@@ -103,6 +104,7 @@ stdenv.mkDerivation rec {
     export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
     export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
     export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
@@ -135,7 +137,8 @@ stdenv.mkDerivation rec {
   crossConfig = true;
 
   nativeBuildInputs = [
-    ghc perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 hscolour
+    perl libxml2 libxslt docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42
+    ghc hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 4017a01e7027..c3c7690b09f9 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -87,6 +87,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin ./ghc-8.0.2-no-cpp-warnings.patch
     ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
 
+  postPatch = "patchShebangs .";
+
   # GHC is a bit confused on its cross terminology.
   preConfigure = ''
     for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
@@ -103,6 +105,7 @@ stdenv.mkDerivation rec {
     export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
     export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
     export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
     echo -n "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
@@ -134,7 +137,10 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ ghc perl hscolour sphinx ];
+  nativeBuildInputs = [
+    perl sphinx
+    ghc hscolour
+  ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index dcc2852a3413..2b876552a014 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -23,10 +23,8 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ?
-    !(targetPlatform.isDarwin
-      # On iOS, dynamic linking is not supported
-      && (targetPlatform.isAarch64 || targetPlatform.isAarch32))
+  enableShared ? true
+
 , # Whether to backport https://phabricator.haskell.org/D4388 for
   # deterministic profiling symbol names, at the cost of a slightly
   # non-standard GHC API
@@ -153,7 +151,10 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ alex autoconf autoreconfHook automake ghc happy hscolour perl python3 sphinx ];
+  nativeBuildInputs = [
+    autoconf autoreconfHook automake perl python3 sphinx
+    ghc alex happy hscolour
+  ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 5d8adafa9a7f..6cb6930f3aa5 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -3,7 +3,7 @@
 
 # build-tools
 , bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
 
 , libffi, libiconv ? null, ncurses
 
@@ -15,7 +15,7 @@
 
 , # If enabled, GHC will be built with the GPL-free but slower integer-simple
   # library instead of the faster but GPLed integer-gmp library.
-  enableIntegerSimple ? false, gmp ? null, m4
+  enableIntegerSimple ? false, gmp ? null
 
 , # If enabled, use -fPIC when compiling static libs.
   enableRelocatedStaticLibs ? targetPlatform != hostPlatform
@@ -24,7 +24,6 @@
   # platform). Static libs are always built.
   enableShared ? !targetPlatform.useAndroidPrebuilt
 
-, version ? "8.4.2"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -69,7 +68,7 @@ let
 
 in
 stdenv.mkDerivation rec {
-  inherit version;
+  version = "8.4.2";
   name = "${targetPrefix}ghc-${version}";
 
   src = fetchurl {
@@ -144,7 +143,10 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ ghc perl autoconf automake m4 happy alex python3 ];
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3
+    ghc alex happy
+  ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 7e1c73d166a2..e0de4e7e60e6 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -3,7 +3,7 @@
 
 # build-tools
 , bootPkgs, alex, happy
-, autoconf, automake, coreutils, fetchgit, perl, python3
+, autoconf, automake, coreutils, fetchgit, perl, python3, m4
 
 , libffi, libiconv ? null, ncurses
 
@@ -141,7 +141,10 @@ stdenv.mkDerivation rec {
   # masss-rebuild.
   crossConfig = true;
 
-  nativeBuildInputs = [ ghc perl autoconf automake happy alex python3 ];
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3
+    ghc alex happy
+  ];
 
   # For building runtime libs
   depsBuildTarget = toolsForTarget;

From 1978115c3b2dfcb33f78673677a0ef3ffa6a0565 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 20 May 2018 02:16:07 -0400
Subject: [PATCH 2392/3370] ghc: Handle flavors better

---
 pkgs/development/compilers/ghc/7.10.3.nix | 9 ++++++++-
 pkgs/development/compilers/ghc/8.0.2.nix  | 9 ++++++++-
 pkgs/development/compilers/ghc/8.2.2.nix  | 8 +++++++-
 pkgs/development/compilers/ghc/8.4.2.nix  | 8 +++++++-
 pkgs/development/compilers/ghc/head.nix   | 8 +++++++-
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 150d14e1db46..7d2f37916323 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -24,6 +24,10 @@
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
   enableShared ? true
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -42,11 +46,14 @@ let
   };
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index c3c7690b09f9..2e627473fc21 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -23,6 +23,10 @@
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
   enableShared ? true
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -36,11 +40,14 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
   '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index 2b876552a014..beaf761bd426 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -25,6 +25,9 @@
   # platform). Static libs are always built.
   enableShared ? true
 
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 , # Whether to backport https://phabricator.haskell.org/D4388 for
   # deterministic profiling symbol names, at the cost of a slightly
   # non-standard GHC API
@@ -42,11 +45,14 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 6cb6930f3aa5..449edef662d9 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -24,6 +24,9 @@
   # platform). Static libs are always built.
   enableShared ? !targetPlatform.useAndroidPrebuilt
 
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -37,11 +40,14 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index e0de4e7e60e6..f5a7be5156d7 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -25,6 +25,9 @@
   enableShared ? !targetPlatform.useAndroidPrebuilt
 
 , version ? "8.5.20180118"
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -38,11 +41,14 @@ let
     "${targetPlatform.config}-";
 
   buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
     DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
   '' + stdenv.lib.optionalString enableIntegerSimple ''
     INTEGER_LIBRARY = integer-simple
   '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
-    BuildFlavour = perf-cross
     Stage1Only = YES
     HADDOCK_DOCS = NO
     BUILD_SPHINX_HTML = NO

From 10b76a4caba015a5252cc88172d3b7d23b14d8f6 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Mon, 5 Mar 2018 21:34:31 +0800
Subject: [PATCH 2393/3370] ghc: paxmark all unwraped executables across the
 board

Shell glob works even as the exact set of executable (filenames) varries
beween configuations. Need to skip non ELFs (e.g. shell scripts),
however.
---
 pkgs/development/compilers/ghc/8.0.2.nix | 7 ++++---
 pkgs/development/compilers/ghc/8.2.2.nix | 7 ++++---
 pkgs/development/compilers/ghc/8.4.2.nix | 7 ++++---
 pkgs/development/compilers/ghc/head.nix  | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 2e627473fc21..2957846cd59d 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -164,10 +164,11 @@ stdenv.mkDerivation rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
-  # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
-  # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
+    for bin in "$out"/lib/${name}/bin/*; do
+      isELF "$bin" || continue
+      paxmark m "$bin"
+    done
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index beaf761bd426..c21fd3353c74 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -179,10 +179,11 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
-  # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
-  # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
+    for bin in "$out"/lib/${name}/bin/*; do
+      isELF "$bin" || continue
+      paxmark m "$bin"
+    done
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 449edef662d9..7cdf746c5820 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -171,10 +171,11 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
-  # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
-  # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
+    for bin in "$out"/lib/${name}/bin/*; do
+      isELF "$bin" || continue
+      paxmark m "$bin"
+    done
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index f5a7be5156d7..1fe6271033f4 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -169,10 +169,11 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
-  # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
-  # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''
-    paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"}
+    for bin in "$out"/lib/${name}/bin/*; do
+      isELF "$bin" || continue
+      paxmark m "$bin"
+    done
 
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc

From c7458ded5c34161a33773f872ab10f0dd0af4b2c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 20 May 2018 02:21:37 -0400
Subject: [PATCH 2394/3370] ghc 8.4.2, head: Adjust enableShared enableTerminfo
 for windows

---
 pkgs/development/compilers/ghc/8.4.2.nix | 7 +++++--
 pkgs/development/compilers/ghc/head.nix  | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 7cdf746c5820..18b229f95cc4 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -22,7 +22,10 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !targetPlatform.useAndroidPrebuilt
+  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !targetPlatform.isWindows
 
 , # What flavour to build. An empty string indicates no
   # specific flavour and falls back to ghc default values.
@@ -60,7 +63,7 @@ let
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: [ ncurses ]
+  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
     ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
 
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 1fe6271033f4..7e4b26cda25e 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -22,7 +22,10 @@
 
 , # Whether to build dynamic libs for the standard library (on the target
   # platform). Static libs are always built.
-  enableShared ? !targetPlatform.useAndroidPrebuilt
+  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !targetPlatform.isWindows
 
 , version ? "8.5.20180118"
 , # What flavour to build. An empty string indicates no
@@ -61,7 +64,7 @@ let
   '';
 
   # Splicer will pull out correct variations
-  libDeps = platform: [ ncurses ]
+  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
     ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
 

From fe1eec9e24ba24f468649c14529be9d7a7c720d4 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Thu, 3 May 2018 13:54:00 +0800
Subject: [PATCH 2395/3370] ghc 8.4.2, head: Drop `libiconv` on windows.

nixpkgs#37012 and  nixpkgs#37707 introduces the setup-hooks for libiconv, which inject `-liconv` into the `NIX_LDFLAGS`. This breaks horribly on windows where the linker end up having no idea how to linke `-liconv`. The configure.ac file specifically ignores libiconv on windows.
---
 pkgs/development/compilers/ghc/8.4.2.nix | 4 ++--
 pkgs/development/compilers/ghc/head.nix  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index 18b229f95cc4..0eaf64cad812 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -65,7 +65,7 @@ let
   # Splicer will pull out correct variations
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget =
     if hostPlatform == buildPlatform then
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 7e4b26cda25e..88cfcf725792 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -66,7 +66,7 @@ let
   # Splicer will pull out correct variations
   libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
     ++ stdenv.lib.optional (!enableIntegerSimple) gmp
-    ++ stdenv.lib.optional (platform.libc != "glibc") libiconv;
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
 
   toolsForTarget =
     if hostPlatform == buildPlatform then
@@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
     "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc") [
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
     "--enable-bootstrap-with-devel-snapshot"

From 2009c76a665435f706a27768d8dba69736ae1282 Mon Sep 17 00:00:00 2001
From: Sebastian Jordan <sebastian.jordan.mail@googlemail.com>
Date: Wed, 23 May 2018 16:44:31 +0200
Subject: [PATCH 2396/3370] nixos/ipfs: Improve behavior of localDiscovery
 option

It is no longer required to change the config your ipfs repo manually if you change
localDiscovery option in nixos configuration after ipfs repository initialization.
---
 nixos/modules/services/network-filesystems/ipfs.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix
index b5903d113c57..ab6d3a3d2fa4 100644
--- a/nixos/modules/services/network-filesystems/ipfs.nix
+++ b/nixos/modules/services/network-filesystems/ipfs.nix
@@ -189,9 +189,7 @@ in {
       localDiscovery = mkOption {
         type = types.bool;
         description = ''Whether to enable local discovery for the ipfs daemon.
-          This will prevent ipfs to scan ports on your local network. Some hosting services will ban you if you do.
-
-          This option only has an effect before you initialized ipfs your machine.
+          This will allow ipfs to scan ports on your local network. Some hosting services will ban you if you do this.
         '';
         default = true;
       };
@@ -244,6 +242,11 @@ in {
         if [[ ! -f ${cfg.dataDir}/config ]]; then
           ipfs init ${optionalString cfg.emptyRepo "-e"} \
             ${optionalString (! cfg.localDiscovery) "--profile=server"}
+        else
+          ${if cfg.localDiscovery
+            then "ipfs config profile apply local-discovery"
+            else "ipfs config profile apply server"
+          }
         fi
       '';
 

From e87bfe08b65fc150f8c9b617c72104d0aca45ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 23 May 2018 10:31:44 +0100
Subject: [PATCH 2397/3370] radare2: 2.5.0 -> 2.6.0

---
 .../tools/analysis/radare2/default.nix        | 41 ++++++++---
 .../tools/analysis/radare2/update.py          | 72 +++++++++++++++++++
 2 files changed, 102 insertions(+), 11 deletions(-)
 create mode 100755 pkgs/development/tools/analysis/radare2/update.py

diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix
index 5ddb03d318f9..bc5f41bf86ec 100644
--- a/pkgs/development/tools/analysis/radare2/default.nix
+++ b/pkgs/development/tools/analysis/radare2/default.nix
@@ -1,4 +1,6 @@
-{stdenv, fetchFromGitHub, pkgconfig, libusb, readline, libewf, perl, zlib, openssl
+{stdenv, fetchFromGitHub
+, ninja, meson , pkgconfig
+, libusb, readline, libewf, perl, zlib, openssl
 , gtk2 ? null, vte ? null, gtkdialog ? null
 , python ? null
 , ruby ? null
@@ -10,40 +12,57 @@ assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null);
 assert rubyBindings -> ruby != null;
 assert pythonBindings -> python != null;
 
+
 let
   inherit (stdenv.lib) optional;
+  #<generated>
+  # DO NOT EDIT! Automatically generated by ./update.py
+  version_commit = "18177";
+  gittap = "2.6.0";
+  gittip = "83ef480221ec29d82c16003c61d0dc86b8851d38";
+  version = "2.6.0";
+  sha256 = "18jhb9w8c1m09383d2xm2qp0rc240psjygbbs222hzpx32hald5s";
+  cs_tip = "37569a6874c8547b349a80823adda9284499fe80";
+  cs_sha256 = "0v31367g4jn4baswl62y0rvvm2nf57y91n3731xqblvi6qxj8qkv";
+  #</generated>
 in
 stdenv.mkDerivation rec {
-  version = "2.5.0";
   name = "radare2-${version}";
 
   src = fetchFromGitHub {
     owner = "radare";
     repo = "radare2";
     rev = version;
-    sha256 = "07x94chkhpn3wgw4pypn35psxq370j6xwmhf1mh5z27cqkq7c2yd";
+    inherit sha256;
   };
 
-  # do not try to update capstone
-  WITHOUT_PULL=1;
-
   postPatch = let
-    cs_tip = "4a1b580d069c82d60070d0869a87000db7cdabe2"; # version from $sourceRoot/shlr/Makefile
     capstone = fetchFromGitHub {
       owner = "aquynh";
       repo = "capstone";
+      # version from $sourceRoot/shlr/Makefile
       rev = cs_tip;
-      sha256 = "0v6rxfpxjq0hf40qn1n5m5wsv1dv6p1j8vm94a708lhvcbk9nkv8";
+      sha256 = cs_sha256;
     };
   in ''
     if ! grep -F "CS_TIP=${cs_tip}" shlr/Makefile; then echo "CS_TIP mismatch"; exit 1; fi
-    cp -r ${capstone} shlr/capstone
-    chmod -R u+rw shlr/capstone
+    ln -s ${capstone} shlr/capstone
   '';
 
+  postInstall = ''
+    ln -s $out/bin/radare2 $out/bin/r2
+    install -D -m755 $src/binr/r2pm/r2pm $out/bin/r2pm
+  '';
+
+  mesonFlags = [
+    "-Dr2_version_commit=${version_commit}"
+    "-Dr2_gittap=${gittap}"
+    "-Dr2_gittip=${gittip}"
+  ];
+
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ninja meson ];
   buildInputs = [ readline libusb libewf perl zlib openssl]
     ++ optional useX11 [gtkdialog vte gtk2]
     ++ optional rubyBindings [ruby]
diff --git a/pkgs/development/tools/analysis/radare2/update.py b/pkgs/development/tools/analysis/radare2/update.py
new file mode 100755
index 000000000000..1f16a00905c1
--- /dev/null
+++ b/pkgs/development/tools/analysis/radare2/update.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -p nix -p python3 -p git -i python
+# USAGE - just run the script: ./update.py
+# When editing this file, make also sure it passes the mypy typecheck
+# and is formatted with yapf.
+import urllib.request
+import json
+import tempfile
+import subprocess
+import fileinput
+import re
+from pathlib import Path
+
+
+def sh(*args: str) -> str:
+    out = subprocess.check_output(list(args))
+    return out.strip().decode("utf-8")
+
+
+def prefetch_github(owner: str, repo: str, ref: str) -> str:
+    return sh("nix-prefetch-url", "--unpack",
+              f"https://github.com/{owner}/{repo}/archive/{ref}.tar.gz")
+
+
+def main() -> None:
+    url = "https://api.github.com/repos/radare/radare2/releases/latest"
+    with urllib.request.urlopen(url) as response:
+        release = json.load(response)  # type: ignore
+    version = release["tag_name"]
+    with tempfile.TemporaryDirectory() as dirname:
+
+        def git(*args: str) -> str:
+            return sh("git", "-C", dirname, *args)
+
+        git("clone", "--branch", version, "https://github.com/radare/radare2",
+            ".")
+        sha256 = prefetch_github("radare", "radare2", version)
+        nix_file = str(Path(__file__).parent.joinpath("default.nix"))
+
+        cs_tip = None
+        with open(Path(dirname).joinpath("shlr", "Makefile")) as makefile:
+            for l in makefile:
+                match = re.match("CS_TIP=(\S+)", l)
+                if match:
+                    cs_tip = match.group(1)
+        assert cs_tip is not None
+
+        cs_sha256 = prefetch_github("aquynh", "capstone", cs_tip)
+
+        in_block = False
+        with fileinput.FileInput(nix_file, inplace=True) as f:
+            for l in f:
+                if "#<generated>" in l:
+                    in_block = True
+                    print(f"""  #<generated>
+  # DO NOT EDIT! Automatically generated by ./update.py
+  version_commit = "{git("rev-list", "--all", "--count")}";
+  gittap = "{git("describe", "--tags", "--match", "[0-9]*")}";
+  gittip = "{git("rev-parse", "HEAD")}";
+  version = "{version}";
+  sha256 = "{sha256}";
+  cs_tip = "{cs_tip}";
+  cs_sha256 = "{cs_sha256}";
+  #</generated>""")
+                elif "#</generated>" in l:
+                    in_block = False
+                elif not in_block:
+                    print(l, end="")
+
+
+if __name__ == "__main__":
+    main()

From d417ada9a6b13e4a070dd4eb7309adeb708db432 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 17 Apr 2018 09:50:21 -0500
Subject: [PATCH 2398/3370] clang: only link if LLVMgold exists

buildEnv now errors with broken symlinks. Lots of things like this
still exist.

Discussion in #39038.

(cherry picked from commit 7b73c7f49a0a4673987b661b9d679ec595704d89)
---
 pkgs/development/compilers/llvm/3.4/clang.nix         | 5 ++++-
 pkgs/development/compilers/llvm/3.5/clang.nix         | 5 ++++-
 pkgs/development/compilers/llvm/3.7/clang/default.nix | 5 ++++-
 pkgs/development/compilers/llvm/3.8/clang/default.nix | 5 ++++-
 pkgs/development/compilers/llvm/3.9/clang/default.nix | 5 ++++-
 pkgs/development/compilers/llvm/4/clang/default.nix   | 5 ++++-
 pkgs/development/compilers/llvm/6/clang/default.nix   | 5 ++++-
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 10510c750354..863e7eb22474 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -29,7 +29,10 @@ stdenv.mkDerivation {
   # Clang expects to find LLVMgold in its own prefix
   # Clang expects to find sanitizer libraries in its own prefix
   postInstall = ''
-    ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    if [ -e ${llvm}/lib/LLVMgold.so ]; then
+      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    fi
+
     ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
   '';
 
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index f15c989ef510..b61118439ee7 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -31,7 +31,10 @@ in stdenv.mkDerivation {
   # Clang expects to find LLVMgold in its own prefix
   # Clang expects to find sanitizer libraries in its own prefix
   postInstall = ''
-    ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    if [ -e ${llvm}/lib/LLVMgold.so ]; then
+      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+    fi
+
     ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
     ln -sv $out/bin/clang $out/bin/cpp
   '';
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index f27e3f0089e2..a63706e95cfb 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -32,7 +32,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
       ln -sv $out/bin/clang $out/bin/cpp
     '';
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index 0147485dd58d..c8b2fec5e51d 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -34,7 +34,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
       ln -sv $out/bin/clang $out/bin/cpp
 
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index aafe30e4c9b3..fabc6a39d9f4 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -36,7 +36,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/
       ln -sv $out/bin/clang $out/bin/cpp
 
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index 5531fd2ab77e..e8f025c24ede 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -52,7 +52,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
       ln -sv $out/bin/clang $out/bin/cpp
 
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 919efdc8ef97..c540a8267e97 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -53,7 +53,10 @@ let
     # Clang expects to find LLVMgold in its own prefix
     # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
-      ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      if [ -e ${llvm}/lib/LLVMgold.so ]; then
+        ln -sv ${llvm}/lib/LLVMgold.so $out/lib
+      fi
+
       ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
       ln -sv $out/bin/clang $out/bin/cpp
 

From 9416f2980001fafbf6bd635fc7825830ec68c22d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 16 Apr 2018 20:04:54 -0500
Subject: [PATCH 2399/3370] llvm: remove libedit from clang

clang should never need libedit. From what I understand this is only
needed by LLDB.

https://github.com/llvm-mirror/clang/search?q=libedit
(cherry picked from commit 9ee69c27c9b300154f1b26c1c21737cf000656cf)
---
 pkgs/development/compilers/llvm/3.4/clang.nix         | 4 ++--
 pkgs/development/compilers/llvm/3.5/clang.nix         | 4 ++--
 pkgs/development/compilers/llvm/3.7/clang/default.nix | 4 ++--
 pkgs/development/compilers/llvm/3.8/clang/default.nix | 4 ++--
 pkgs/development/compilers/llvm/3.9/clang/default.nix | 4 ++--
 pkgs/development/compilers/llvm/4/clang/default.nix   | 4 ++--
 pkgs/development/compilers/llvm/5/clang/default.nix   | 4 ++--
 pkgs/development/compilers/llvm/6/clang/default.nix   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 863e7eb22474..2c5d3524911d 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }:
 
 stdenv.mkDerivation {
   name = "clang-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
 
-  buildInputs = [ cmake libedit libxml2 zlib ];
+  buildInputs = [ cmake libxml2 zlib ];
 
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix
index b61118439ee7..7e0163577baf 100644
--- a/pkgs/development/compilers/llvm/3.5/clang.nix
+++ b/pkgs/development/compilers/llvm/3.5/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation {
@@ -12,7 +12,7 @@ in stdenv.mkDerivation {
     mv clang-tools-extra-* $sourceRoot/tools/extra
   '';
 
-  buildInputs = [ cmake libedit libxml2 llvm ];
+  buildInputs = [ cmake libxml2 llvm ];
 
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix
index a63706e95cfb..4ccd00af6846 100644
--- a/pkgs/development/compilers/llvm/3.7/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src }:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -13,7 +13,7 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    buildInputs = [ cmake libedit libxml2 llvm ];
+    buildInputs = [ cmake libxml2 llvm ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix
index c8b2fec5e51d..05893704d872 100644
--- a/pkgs/development/compilers/llvm/3.8/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -13,7 +13,7 @@ let
       mv clang-tools-extra-* $sourceRoot/tools/extra
     '';
 
-    buildInputs = [ cmake libedit libxml2 llvm python ];
+    buildInputs = [ cmake libxml2 llvm python ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix
index fabc6a39d9f4..1f6d80ab3be9 100644
--- a/pkgs/development/compilers/llvm/3.9/clang/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src, python }:
+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python }:
 
 let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
@@ -15,7 +15,7 @@ let
 
     nativeBuildInputs = [ cmake ];
 
-    buildInputs = [ libedit libxml2 llvm python ];
+    buildInputs = [ libxml2 llvm python ];
 
     cmakeFlags = [
       "-DCMAKE_CXX_FLAGS=-std=c++11"
diff --git a/pkgs/development/compilers/llvm/4/clang/default.nix b/pkgs/development/compilers/llvm/4/clang/default.nix
index e8f025c24ede..c6538282f23e 100644
--- a/pkgs/development/compilers/llvm/4/clang/default.nix
+++ b/pkgs/development/compilers/llvm/4/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,7 +19,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libedit libxml2 llvm ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix
index b5aea54b5771..539e29ac5e42 100644
--- a/pkgs/development/compilers/llvm/5/clang/default.nix
+++ b/pkgs/development/compilers/llvm/5/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,7 +19,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libedit libxml2 llvm ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [
diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index c540a8267e97..3d02062a4a32 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, libedit, llvm, version, release_version, clang-tools-extra_src, python
+{ stdenv, fetch, cmake, libxml2, llvm, version, release_version, clang-tools-extra_src, python
 , fixDarwinDylibNames
 , enableManpages ? false
 }:
@@ -19,7 +19,7 @@ let
     nativeBuildInputs = [ cmake python ]
       ++ stdenv.lib.optional enableManpages python.pkgs.sphinx;
 
-    buildInputs = [ libedit libxml2 llvm ]
+    buildInputs = [ libxml2 llvm ]
       ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
     cmakeFlags = [

From 4bf6889876d9f5583065764680fb60583672e69b Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 23 May 2018 10:15:05 -0500
Subject: [PATCH 2400/3370] strace: fix libunwind detection by fixing use of
 lib.optional (#40994)

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

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index fce2fa4fa4b4..a059f5658b07 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ perl ];
 
-  buildInputs = stdenv.lib.optional libunwind.supportsHost [ libunwind ]; # support -k
+  buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k
 
   configureFlags = stdenv.lib.optional (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) "--enable-mpers=check";
 

From 96c81d2fdd69e5e43861c87b837a783f21ca8837 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Wed, 23 May 2018 17:23:58 +0200
Subject: [PATCH 2401/3370] beegfs/module: Fix a typo in meta.conf generation
 (#40979)

This typo places mgtmd.extraConf in meta.conf
leading to meta.extraConf being ignored.
---
 nixos/modules/services/network-filesystems/beegfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/beegfs.nix b/nixos/modules/services/network-filesystems/beegfs.nix
index a6a2ec6cbc36..182fabf6405f 100644
--- a/nixos/modules/services/network-filesystems/beegfs.nix
+++ b/nixos/modules/services/network-filesystems/beegfs.nix
@@ -31,7 +31,7 @@ let
     connPortShift = ${toString cfg.connPortShift}
     storeAllowFirstRunInit = false
 
-    ${cfg.mgmtd.extraConfig}
+    ${cfg.meta.extraConfig}
   '';
 
   configStorage = name: cfg: pkgs.writeText "storage-${name}.conf" ''

From b86aa55408e25f22c8b7f0f53ee5ae726d28afe7 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Wed, 23 May 2018 17:25:44 +0200
Subject: [PATCH 2402/3370] pythonPackages.pylibconfig2: 0.2.4 -> 0.2.5
 (#40985)

---
 .../python-modules/pylibconfig2/default.nix   | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +-----------------
 2 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylibconfig2/default.nix

diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix
new file mode 100644
index 000000000000..6cea70c57089
--- /dev/null
+++ b/pkgs/development/python-modules/pylibconfig2/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi, pyparsing }:
+buildPythonPackage rec {
+  pname = "pylibconfig2";
+  version = "0.2.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1iwm11v0ghv2pq2cyvly7gdwrhxsx6iwi581fz46l0snhgcd4sqq";
+  };
+
+  # tests not included in the distribution
+  doCheck = false;
+
+  propagatedBuildInputs = [ pyparsing ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/heinzK1X/pylibconfig2;
+    description = "Pure python library for libconfig syntax";
+    license = licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b695372fe96a..bf2906be53f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9887,25 +9887,7 @@ in {
 
   pybase64 = callPackage ../development/python-modules/pybase64 { };
 
-  pylibconfig2 = buildPythonPackage rec {
-    name = "pylibconfig2-${version}";
-    version = "0.2.4";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pylibconfig2/${name}.tar.gz";
-      sha256 = "0kyg6gldj6hi2jhc5xhi834bb2mcaiy24dvfik963shnldqr7kqg";
-    };
-
-    doCheck = false;
-
-    propagatedBuildInputs = with self ; [ pyparsing ];
-
-    meta = {
-      homepage = https://github.com/heinzK1X/pylibconfig2;
-      description = "Pure python library for libconfig syntax";
-      license = licenses.gpl3;
-    };
-  };
+  pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };
 
   pylibmc = callPackage ../development/python-modules/pylibmc {};
 

From be7b42f49f8f8c4843b85f0205048c8427468ae3 Mon Sep 17 00:00:00 2001
From: Justin Wood <justin.k.wood@protonmail.com>
Date: Wed, 23 May 2018 11:27:41 -0400
Subject: [PATCH 2403/3370] elixir: 1.6.4 -> 1.6.5

---
 pkgs/development/interpreters/elixir/1.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix
index 816bd92d5eed..fa631ebb3876 100644
--- a/pkgs/development/interpreters/elixir/1.6.nix
+++ b/pkgs/development/interpreters/elixir/1.6.nix
@@ -1,7 +1,7 @@
 { mkDerivation }:
 
 mkDerivation rec {
-  version = "1.6.4";
-  sha256 = "0li2zb5ha7fdkjnzjbj3dxb9xls8xn6xr23fqwl7gp2697vcw3ws";
+  version = "1.6.5";
+  sha256 = "0il1fraz6c8qbqv4wrp16jqrkf3xglfa9f3sdm6q4vv8kjf3lxxb";
   minimumOTPVersion = "18";
 }

From 6ea941d3fd9e3988dfe6c12f6efe0d994c8664a6 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Wed, 23 May 2018 17:32:43 +0200
Subject: [PATCH 2404/3370] gmsh: gfortran -> nativeBuildInputs (fix #40976)
 (#40984)

---
 pkgs/applications/science/math/gmsh/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix
index 33b458ba30a3..956bfe1d811b 100644
--- a/pkgs/applications/science/math/gmsh/default.nix
+++ b/pkgs/applications/science/math/gmsh/default.nix
@@ -15,11 +15,13 @@ stdenv.mkDerivation {
   # that is supposed to work without Fortran but didn't for me.
   patches = [ ./CMakeLists.txt.patch ];
 
-  buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined
+  buildInputs = [ cmake blas liblapack gmm fltk libjpeg zlib libGLU_combined
     libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
     xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
   ];
 
+  nativeBuildInputs = [ gfortran ];
+
   enableParallelBuilding = true;
 
   meta = {

From 895fef2b19db36e841175b934ffed1297a961ffd Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 18 Apr 2018 13:13:03 -0500
Subject: [PATCH 2405/3370] clang3.4: still needs libedit

https://hydra.nixos.org/build/72965931/nixlog/1
(cherry picked from commit 2d90138b3b90fb36db50a0954629b2f306795d5a)
---
 pkgs/development/compilers/llvm/3.4/clang.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 2c5d3524911d..863e7eb22474 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetch, cmake, libxml2, llvm, zlib, version, clang-tools-extra_src }:
+{ stdenv, fetch, cmake, libxml2, libedit, llvm, zlib, version, clang-tools-extra_src }:
 
 stdenv.mkDerivation {
   name = "clang-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   patches = [ ./clang-separate-build.patch ./clang-purity.patch ];
 
-  buildInputs = [ cmake libxml2 zlib ];
+  buildInputs = [ cmake libedit libxml2 zlib ];
 
   cmakeFlags = [
     "-DCMAKE_CXX_FLAGS=-std=c++11"

From 5efdf73832a628fb8d7f24028aa13c5ffb403e65 Mon Sep 17 00:00:00 2001
From: Mitsuhiro Nakamura <m.nacamura@gmail.com>
Date: Thu, 24 May 2018 00:49:02 +0900
Subject: [PATCH 2406/3370] sc-im: available on the other Unix-like platforms
 (#40986)

---
 pkgs/applications/misc/sc-im/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index acd79859901a..280a42fde14c 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
     license = licenses.bsdOriginal;
     maintainers = [ ];
-    platforms = platforms.linux; # Cannot test others
+    platforms = platforms.unix;
   };
 
 }

From e28a586f94e77f22d943288ad84f88be23c587f8 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Wed, 23 May 2018 19:06:46 +0300
Subject: [PATCH 2407/3370] sqlite{,-analyzer}: use the same src (#40945)

---
 .../development/libraries/sqlite/analyzer.nix | 18 ++---------
 .../libraries/sqlite/archive-version.nix      | 11 -------
 pkgs/development/libraries/sqlite/default.nix | 31 +++++++++++++------
 3 files changed, 24 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/development/libraries/sqlite/archive-version.nix

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index a0b1220b217d..2325a9c8d0db 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -1,23 +1,11 @@
-{ stdenv, fetchurl, unzip, sqlite, tcl }:
-
-let
-  archiveVersion = import ./archive-version.nix stdenv.lib;
-in
+{ stdenv, tcl, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
-  version = "3.23.1";
-
-  src = assert version == sqlite.version; fetchurl {
-    url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
-  };
-
-  nativeBuildInputs = [ unzip ];
-  buildInputs = [ tcl ];
+  inherit (sqlite) src version;
 
+  nativeBuildInputs = [ tcl ];
   makeFlags = [ "sqlite3_analyzer" ];
-
   installPhase = "install -Dt $out/bin sqlite3_analyzer";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix
deleted file mode 100644
index 1f312ecef23a..000000000000
--- a/pkgs/development/libraries/sqlite/archive-version.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-lib: version:
-
-with lib;
-  
-let
-  fragments = splitString "." version;
-  major = head fragments;
-  minor = concatMapStrings (fixedWidthNumber 2) (tail fragments);
-in
-
-major + minor + "00"
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index eaeafa741297..341474326480 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,29 +1,40 @@
-{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
+{ stdenv, fetchzip, tcl, zlib, interactive ? false, readline ? null, ncurses ? null }:
 
 assert interactive -> readline != null && ncurses != null;
 
 with stdenv.lib;
 
 let
-  archiveVersion = import ./archive-version.nix stdenv.lib;
+  archiveVersion = version:
+    let
+      segments = splitString "." version;
+      major = head segments;
+      minor = concatMapStrings (fixedWidthNumber 2) (tail segments);
+    in
+    major + minor + "00";
 in
 
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
   version = "3.23.1";
 
-  # NB! Make sure to update analyzer.nix src (in the same directory).
-  src = fetchurl {
-    url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j";
+  src = fetchzip {
+    url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
+    sha256 = "1dshxmiqdiympg1i2jsz3x543zmcgzhn78lpsjc0546rir0s0zk0";
   };
 
   outputs = [ "bin" "dev" "out" ];
   separateDebugInfo = stdenv.isLinux;
 
-  buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ];
+  nativeBuildInputs = [ tcl ];
+  buildInputs = [ zlib ]
+    ++ optionals interactive [ readline ncurses ];
 
-  configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";
+  configureFlags = [
+    # Disables libtclsqlite.so, tcl is still required for the build itself:
+    "--disable-tcl"
+    "--enable-threadsafe"
+  ] ++ optional interactive "--enable-readline";
 
   NIX_CFLAGS_COMPILE = [
     "-DSQLITE_ENABLE_COLUMN_METADATA"
@@ -61,9 +72,9 @@ stdenv.mkDerivation rec {
     # Necessary for FTS5 on Linux
     export NIX_LDFLAGS="$NIX_LDFLAGS -lm"
 
-    echo ""
+    echo
     echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"
-    echo ""
+    echo
   '';
 
   meta = {

From e7abee19394638c6d9f13697be8aa356eb2df916 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 May 2018 09:10:09 +0200
Subject: [PATCH 2408/3370] hackage2nix: disable failing builds on Hydra

---
 .../configuration-hackage2nix.yaml            | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 8b2b98b1729b..602b5e6b9bc0 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2718,6 +2718,7 @@ dont-distribute-packages:
   AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affine-invariant-ensemble-mcmc:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  affine:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agda-executable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2894,6 +2895,8 @@ dont-distribute-packages:
   Animas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   animascii:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate-example:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  animate-preview:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  animate-sdl2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   annah:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   anonymous-sums-tests:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3102,6 +3105,7 @@ dont-distribute-packages:
   battlenet-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   battleplace-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  battleplace:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3319,6 +3323,7 @@ dont-distribute-packages:
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-encodings:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-strict-builder:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3641,6 +3646,8 @@ dont-distribute-packages:
   competition:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compilation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   complexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  componentm-devel:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  componentm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   compose-trans:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-aeson-refined:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3699,6 +3706,7 @@ dont-distribute-packages:
   constrained-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint-manip:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constraint-reflection:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3986,6 +3994,7 @@ dont-distribute-packages:
   derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  descript-lang:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   deterministic-game-engine:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   deunicode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dewdrop:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3996,8 +4005,13 @@ dont-distribute-packages:
   dhall-bash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-check:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhall-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-to-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  di-df1:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  di-handle:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  di-monad:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  di:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-braille:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-builder:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4027,6 +4041,7 @@ dont-distribute-packages:
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   diffcabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  difference-monoid:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferentialEvolution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   difftodo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4207,6 +4222,7 @@ dont-distribute-packages:
   ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eight-Ball-Pool-Hack-Cheats:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  either-both:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-cloudwatch:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-elastic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4337,6 +4353,7 @@ dont-distribute-packages:
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   expressions-z3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4558,6 +4575,7 @@ dont-distribute-packages:
   friday-scale-dct:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   frown:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   frp-arduino:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow-gtk3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-vty:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsh-csv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4585,6 +4603,7 @@ dont-distribute-packages:
   functor-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   functor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   functorm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  funflow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fungi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   funion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   funpat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4708,6 +4727,7 @@ dont-distribute-packages:
   ghc-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-syntax-highlighter:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-time-alloc-prof:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4990,6 +5010,7 @@ dont-distribute-packages:
   grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   grammatical-parsers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  grapefruit-ui-gtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-matchings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-gl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5246,6 +5267,7 @@ dont-distribute-packages:
   haskarrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskbot-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskdeep:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskdogs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskeem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskeline-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskelisp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5352,6 +5374,7 @@ dont-distribute-packages:
   haskore-synthesizer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskRel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasktags:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-system-build:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5497,6 +5520,7 @@ dont-distribute-packages:
   hevolisa:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexchat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexif:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexmino:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexml-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-lens:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5573,6 +5597,7 @@ dont-distribute-packages:
   hinquire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinstaller:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hint-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinterface:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5727,6 +5752,7 @@ dont-distribute-packages:
   hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hPDB-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hPDB:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HPDF:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpdft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPhone:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6108,6 +6134,7 @@ dont-distribute-packages:
   instapaper-sender:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   int-multimap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   integer-pure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  integreat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6316,6 +6343,7 @@ dont-distribute-packages:
   KiCS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kif-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kleene:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-par:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmp-dfa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   knead-arithmetic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6495,6 +6523,7 @@ dont-distribute-packages:
   libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-protolude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lifted-stm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lightning-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6577,6 +6606,7 @@ dont-distribute-packages:
   lock-file:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lockpool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-effect-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7387,6 +7417,7 @@ dont-distribute-packages:
   PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   periodic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  permutations:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   persist2er:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8281,6 +8312,7 @@ dont-distribute-packages:
   shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   shikensu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shivers-cfg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shoap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   shopify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   shorten-strings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8592,6 +8624,7 @@ dont-distribute-packages:
   stego-uuid:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stemmer-german:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stemmer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  step-function:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stgi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stitch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8648,6 +8681,7 @@ dont-distribute-packages:
   subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   submark:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  subsample:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffix-array:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffixarray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SuffixStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8732,6 +8766,7 @@ dont-distribute-packages:
   Tablify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tablize:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  taffybar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tag-bits:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-exception-core:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8843,6 +8878,7 @@ dont-distribute-packages:
   text-containers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-icu-translit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-markup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8881,6 +8917,7 @@ dont-distribute-packages:
   thimk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thingie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threadscope:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9016,6 +9053,7 @@ dont-distribute-packages:
   tsuntsun:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ttask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tttool:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tup-functor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9108,6 +9146,7 @@ dont-distribute-packages:
   unbounded-delays-units:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   unboxed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   unbreak:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unexceptionalio-trans:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   uni-events:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uni-graphs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   uni-htk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9220,6 +9259,7 @@ dont-distribute-packages:
   verbalexpressions:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  verifiable-expressions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   verify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vicinity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9372,6 +9412,7 @@ dont-distribute-packages:
   woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   word2vec-model:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  word:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordchoice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9455,6 +9496,7 @@ dont-distribute-packages:
   xml-tydom-conduit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XML:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmlbf-xeno:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmlbf-xmlhtml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]

From ba47d40db98316b7b8dc2a3b72dd74224a26a4f4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 May 2018 02:30:43 +0200
Subject: [PATCH 2409/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/4e1741ad6f3adad741fd1c4b342c3c3687178cc6.
---
 .../haskell-modules/hackage-packages.nix      | 356 ++++++++++++++----
 1 file changed, 289 insertions(+), 67 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8820a54d08ff..9eca79c74e34 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6427,8 +6427,8 @@ self: {
      }:
      mkDerivation {
        pname = "Gamgine";
-       version = "0.5.2";
-       sha256 = "0kry2ni9ba3sf2dpsjz0dq4dwnbgjicr1lwl7q4r8w6my94gkas0";
+       version = "0.5.3";
+       sha256 = "08awl1f1310ifx9gzjrinsv37n7k2yaxvmjaymjh01pawlp3w4gc";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base bytestring composition cpphs data-lens directory
@@ -8337,6 +8337,7 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPath" = callPackage
@@ -12841,6 +12842,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "MonadRandom_0_5_1_1" = callPackage
+    ({ mkDerivation, base, mtl, primitive, random, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "MonadRandom";
+       version = "0.5.1.1";
+       sha256 = "0w44jl1n3kqvqaflh82l1wj3xxbhzfs3kf4m8rk7w6fgg8llmnmb";
+       libraryHaskellDepends = [
+         base mtl primitive random transformers transformers-compat
+       ];
+       description = "Random-number generation monad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "MonadRandomLazy" = callPackage
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
@@ -19859,6 +19876,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Extensible Markup Language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "XMLParser" = callPackage
@@ -22056,8 +22074,8 @@ self: {
      }:
      mkDerivation {
        pname = "adb";
-       version = "0.1.0.0";
-       sha256 = "17dxvdzmg3i8n0gbgbj0jyhm90w0dq7j27id8n24frild2w4c0d0";
+       version = "0.1.0.1";
+       sha256 = "19v7v308z6db5f61lalhwnn8z38s9v50f6hqd39i7krjd26f0n9a";
        libraryHaskellDepends = [
          base bytestring cereal containers mtl network
        ];
@@ -23208,6 +23226,7 @@ self: {
        libraryHaskellDepends = [ alg base ];
        description = "Affine spaces (generalized)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "affine-invariant-ensemble-mcmc" = callPackage
@@ -27821,6 +27840,7 @@ self: {
        homepage = "https://github.com/jxv/animate-preview#readme";
        description = "Preview tool for sprite animation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "animate-sdl2" = callPackage
@@ -27833,6 +27853,7 @@ self: {
        homepage = "https://github.com/jxv/animate-sdl2#readme";
        description = "sdl2 + animate auxiliary library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anki-tools" = callPackage
@@ -34197,6 +34218,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "basic" = callPackage
+    ({ mkDerivation, base, stm, template-haskell, transformers, util }:
+     mkDerivation {
+       pname = "basic";
+       version = "0.1.0.0";
+       sha256 = "13ikd2pkg2qspkdq0h21wa3clyaj47cm41239024g0sdv8m03bpb";
+       libraryHaskellDepends = [
+         base stm template-haskell transformers util
+       ];
+       description = "Lifting values from base types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "basic-cpuid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -34377,6 +34411,7 @@ self: {
        ];
        description = "Core definitions for BattlePlace.io service";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "battleplace-api" = callPackage
@@ -34905,6 +34940,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bench-graph" = callPackage
+    ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, csv
+     , directory, filepath, split, text, transformers, Unique
+     }:
+     mkDerivation {
+       pname = "bench-graph";
+       version = "0.1.0";
+       sha256 = "0cmb15q4yrgi8f78ijgn8h51g2f183maslffh4l4dxmi2aqn7z8q";
+       libraryHaskellDepends = [
+         base bytestring Chart Chart-diagrams csv directory filepath
+         transformers Unique
+       ];
+       testHaskellDepends = [ base split text ];
+       homepage = "https://github.com/composewell/bench-graph";
+       description = "Plot and compare benchmarks";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "benchmark-function" = callPackage
     ({ mkDerivation, base, process, random, time }:
      mkDerivation {
@@ -37330,8 +37383,8 @@ self: {
      }:
      mkDerivation {
        pname = "bishbosh";
-       version = "0.0.0.2";
-       sha256 = "18smrav39awp25j43c7k9r1laxwf7iix61qb2yi5h2b6djbgxq9h";
+       version = "0.0.0.3";
+       sha256 = "0kwscgfwpyn5ppwg8kfvxbmm6gmg1cvf9d7dhmbi6qydxaj0n11v";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -41480,6 +41533,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring gauge text ];
        description = "checks to see if a given bytestring adheres to a certain encoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-from" = callPackage
@@ -42135,18 +42189,18 @@ self: {
      }) {};
 
   "cabal-cargs" = callPackage
-    ({ mkDerivation, base, Cabal, cabal-lenses, cmdargs, directory
-     , either, filepath, lens, strict, system-fileio, system-filepath
+    ({ mkDerivation, base, bytestring, Cabal, cabal-lenses, cmdargs
+     , directory, either, filepath, lens, system-fileio, system-filepath
      , tasty, tasty-golden, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.9.0";
-       sha256 = "0w371991841m4d9r73nr86j4jnr0jilj9jnvkmgh9a055vyi573s";
+       version = "0.9.1";
+       sha256 = "13qbp6416k684chd0f1mk0dw9xkjh85cj6yrgxb9cbhq2944zydi";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal cabal-lenses cmdargs directory either lens strict
+         base bytestring Cabal cabal-lenses cmdargs directory either lens
          system-fileio system-filepath text transformers
          unordered-containers
        ];
@@ -42515,8 +42569,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.7.0";
-       sha256 = "07xyn4sy2snj8a5983p6g6w9pwklzmd3w9wzj02ig4pdnz7682ls";
+       version = "0.7.1";
+       sha256 = "1y6s99slblishngi2hw0brf6byd5w72kqz10x30vhxw2zdmprvl0";
        libraryHaskellDepends = [
          base Cabal either lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -45078,6 +45132,8 @@ self: {
        pname = "cbor-tool";
        version = "0.2.0.0";
        sha256 = "0m8ic53vbzk06xw8rxs9vndnmbdjmcslc8zqa7lafhnl3lgqaybp";
+       revision = "1";
+       editedCabalFile = "08yd8qv9kalgr6hn2kwwzmqzaq4i05fp7d7pfmnkfm7jg6zm8kwy";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45113,6 +45169,8 @@ self: {
        pname = "cborg-json";
        version = "0.2.0.0";
        sha256 = "09ps2lyvxg0qpki9f0lydag9hyys20q5ywgxim0jcaa0jky0j92x";
+       revision = "1";
+       editedCabalFile = "1v0brbq9ri5fx19kb2ijhd3h3ibqadfprgcisja0mx6amzkbqnrz";
        libraryHaskellDepends = [
          aeson aeson-pretty base cborg scientific text unordered-containers
          vector
@@ -50974,6 +51032,7 @@ self: {
        homepage = "https://github.com/roman/Haskell-componentm#readme";
        description = "Monad for allocation and cleanup of application resources";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "componentm-devel" = callPackage
@@ -50988,6 +51047,7 @@ self: {
        homepage = "https://github.com/roman/Haskell-componentm#readme";
        description = "Easy REPL driven development using ComponentM";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composable-associations" = callPackage
@@ -52883,17 +52943,15 @@ self: {
      }) {};
 
   "connection-string" = callPackage
-    ({ mkDerivation, base, containers, doctest, megaparsec
-     , parser-combinators, text
+    ({ mkDerivation, base, case-insensitive, containers, doctest
+     , megaparsec, parser-combinators, text
      }:
      mkDerivation {
        pname = "connection-string";
-       version = "0.1.0.0";
-       sha256 = "0hkszhms7n6vp9w8agik0qndz2a3f8l56yxidw9l9mjn3sx769g2";
-       revision = "1";
-       editedCabalFile = "0zirgds0ha3245cagx3fhssz58bpyzci7zv4mw9rfnc1k48v69b2";
+       version = "0.2.0.0";
+       sha256 = "0gj9czggj7nrp0jjwbi0v1fzl0qvyw3yvi1q5kvjnx3l6ikk3z1j";
        libraryHaskellDepends = [
-         base containers megaparsec parser-combinators
+         base case-insensitive containers megaparsec parser-combinators
        ];
        testHaskellDepends = [ base doctest text ];
        homepage = "https://github.com/Porges/connection-string-hs";
@@ -53096,6 +53154,7 @@ self: {
        libraryHaskellDepends = [ base category constraint reflection ];
        description = "Constraint reflection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constraints" = callPackage
@@ -58862,14 +58921,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse_3_1_0_0" = callPackage
+  "data-diverse_4_0_0_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
      , hspec, tagged
      }:
      mkDerivation {
        pname = "data-diverse";
-       version = "3.1.0.0";
-       sha256 = "0jg8g8zp8s14qalrmqa3faspg9kfifzdv0mi8a25xmqgi6rz64aq";
+       version = "4.0.0.0";
+       sha256 = "0kxhfxqb97hcp2pynsmpa9a5akg49x754ivqlm7dr0jy5kay0fa3";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim tagged
        ];
@@ -58900,14 +58959,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse-lens_3_1_1_0" = callPackage
+  "data-diverse-lens_4_0_0_0" = callPackage
     ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec
      , lens, profunctors, tagged
      }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "3.1.1.0";
-       sha256 = "1ynw9j8a92ny8327i0r037swsc3rj3723dnlar77x640849nif0p";
+       version = "4.0.0.0";
+       sha256 = "06k8s7dfql4gdwws6nsajhj2g7fl1bs3nvgv76x6kxqwr42l675a";
        libraryHaskellDepends = [
          base data-diverse data-has generic-lens lens profunctors tagged
        ];
@@ -62549,6 +62608,7 @@ self: {
        homepage = "https://bitbucket.org/jakobeha/descript-lang/src/master/README.md";
        description = "Library, interpreter, and CLI for Descript programming language";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "descriptive" = callPackage
@@ -62974,6 +63034,7 @@ self: {
        executableHaskellDepends = [ base dhall optparse-generic text ];
        description = "Template text using Dhall";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-to-cabal" = callPackage
@@ -63039,6 +63100,7 @@ self: {
        homepage = "https://github.com/k0001/di";
        description = "Typeful hierarchical structured logging using di, mtl and df1";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "di-core" = callPackage
@@ -63077,6 +63139,7 @@ self: {
        homepage = "https://github.com/k0001/di";
        description = "Write logs in the df1 format using the di logging framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "di-handle" = callPackage
@@ -63091,6 +63154,7 @@ self: {
        homepage = "https://github.com/k0001/di";
        description = "IO support for file handles in di-core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "di-monad" = callPackage
@@ -63107,6 +63171,7 @@ self: {
        homepage = "https://github.com/k0001/di";
        description = "mtl flavoured typeful hierarchical structured logging for di-core";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dia-base" = callPackage
@@ -63994,6 +64059,7 @@ self: {
        ];
        homepage = "https://github.com/oisdk/difference-monoid#readme";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "difftodo" = callPackage
@@ -69378,6 +69444,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Either or both";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "either-list-functions" = callPackage
@@ -73379,6 +73446,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "exp-cache" = callPackage
+    ({ mkDerivation, array, base, containers, criterion, deepseq
+     , hashable, HUnit, psqueues, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "exp-cache";
+       version = "0.1.0.0";
+       sha256 = "01y5kxskbai7a34xkr1b0clsawj3583m3m7l86zziyjfsbn048nm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers deepseq hashable psqueues random time
+         unordered-containers
+       ];
+       executableHaskellDepends = [ base criterion random ];
+       testHaskellDepends = [
+         base HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck
+       ];
+       homepage = "https://github.com/ChrisCoffey/exp-cache#readme";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "exp-extended" = callPackage
     ({ mkDerivation, base, compensated, log-domain }:
      mkDerivation {
@@ -73472,8 +73562,8 @@ self: {
      }:
      mkDerivation {
        pname = "expiring-containers";
-       version = "0.1.2";
-       sha256 = "10j5hqlp7bmiywa79xcgp1a87x6a9kxvzdg061innyh08344k0sv";
+       version = "0.2";
+       sha256 = "1bqcxq42x4s8kj7wpa9iqgaxww6m7vqzkd2dakry1ssy9dv8wp28";
        libraryHaskellDepends = [
          base containers hashable int-multimap time timestamp
          unordered-containers
@@ -73672,6 +73762,7 @@ self: {
        testHaskellDepends = [ base singletons text ];
        description = "Expressions and Formulae a la carte";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expressions-z3" = callPackage
@@ -74091,8 +74182,8 @@ self: {
      }:
      mkDerivation {
        pname = "factory";
-       version = "0.3.1.4";
-       sha256 = "0k5bb0imp001f1sj785qqy9k67wvb91mr4fpdcg5riykiv8j9l1x";
+       version = "0.3.2.0";
+       sha256 = "1ihyqs8b2rgxny69iqaxh55a2pkamp4mb4i3gcy9c6pphjrbmyz3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -74106,7 +74197,7 @@ self: {
          array base containers data-default deepseq primes QuickCheck random
          toolshed
        ];
-       homepage = "http://functionalley.eu/Factory/factory.html";
+       homepage = "https://functionalley.eu/Factory/factory.html";
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
      }) {};
@@ -80132,6 +80223,7 @@ self: {
        homepage = "https://github.com/george-steel/frpnow-gtk3";
        description = "Program GUIs with GTK3 and frpnow!";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frpnow-vty" = callPackage
@@ -80947,6 +81039,7 @@ self: {
        homepage = "https://github.com/tweag/funflow";
        description = "Workflows with arrows";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funion" = callPackage
@@ -84664,6 +84757,7 @@ self: {
        homepage = "https://github.com/mrkkrp/ghc-syntax-highlighter";
        description = "Syntax highlighter for Haskell using lexer of GHC itself";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
@@ -91187,6 +91281,7 @@ self: {
        homepage = "https://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-core" = callPackage
@@ -91721,22 +91816,23 @@ self: {
 
   "graphviz" = callPackage
     ({ mkDerivation, base, bytestring, colour, containers, criterion
-     , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath
-     , polyparse, process, QuickCheck, temporary, text, transformers
-     , wl-pprint-text
+     , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, hspec
+     , hspec-discover, mtl, polyparse, process, QuickCheck, temporary
+     , text, wl-pprint-text
      }:
      mkDerivation {
        pname = "graphviz";
-       version = "2999.19.0.0";
-       sha256 = "1sh4zqirblgnkmi4pl6fhd084p3mdx242db5wqikzpn9jzqpy2mg";
+       version = "2999.20.0.1";
+       sha256 = "147pwfswjkpmby55j5dwwhrvxpy63gzybrrq6zs4r22mrkcpjx94";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring colour containers directory dlist fgl filepath
-         polyparse process temporary text transformers wl-pprint-text
+         base bytestring colour containers directory dlist fgl filepath mtl
+         polyparse process temporary text wl-pprint-text
        ];
        testHaskellDepends = [
-         base containers fgl fgl-arbitrary filepath QuickCheck text
+         base containers fgl fgl-arbitrary filepath hspec hspec-discover
+         QuickCheck text
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
        homepage = "http://projects.haskell.org/graphviz/";
@@ -96719,6 +96815,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hapistrano_0_3_5_6" = callPackage
+    ({ mkDerivation, aeson, async, base, directory, filepath
+     , formatting, gitrev, hspec, mtl, optparse-applicative, path
+     , path-io, process, stm, temporary, time, transformers, yaml
+     }:
+     mkDerivation {
+       pname = "hapistrano";
+       version = "0.3.5.6";
+       sha256 = "0viv359hv3wzdhnfzmq4ynbxyr3a347q7ixarwff85nn9zx7kw2c";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base filepath formatting gitrev mtl path process time transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base formatting gitrev optparse-applicative path
+         path-io stm yaml
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec mtl path path-io process temporary
+       ];
+       homepage = "https://github.com/stackbuilders/hapistrano";
+       description = "A deployment library for Haskell applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "happindicator" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, glib, gtk
      , gtk2hs-buildtools, libappindicator-gtk2, mtl
@@ -98482,6 +98606,7 @@ self: {
        homepage = "http://github.com/grwlf/haskdogs";
        description = "Generate tags file for Haskell project and its nearest deps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskeem" = callPackage
@@ -100889,14 +101014,15 @@ self: {
 
   "haskey-mtl" = callPackage
     ({ mkDerivation, base, binary, exceptions, haskey, haskey-btree
-     , lens, mtl, text, transformers
+     , lens, monad-control, mtl, text, transformers, transformers-base
      }:
      mkDerivation {
        pname = "haskey-mtl";
-       version = "0.3.0.1";
-       sha256 = "0n0wrk9sh62x87ms3fxnaj68jm91qdjd4265wk8x3lm66xw6vigw";
+       version = "0.3.1.0";
+       sha256 = "154jny8frg61amsyh15w4n6clj9alp8rsa8qxgg9xh8xj2i01yqz";
        libraryHaskellDepends = [
-         base exceptions haskey haskey-btree mtl transformers
+         base exceptions haskey haskey-btree monad-control mtl transformers
+         transformers-base
        ];
        testHaskellDepends = [
          base binary exceptions haskey haskey-btree lens mtl text
@@ -101399,6 +101525,7 @@ self: {
        homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskus-binary" = callPackage
@@ -105054,22 +105181,23 @@ self: {
      }) {};
 
   "hexmino" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath, gloss
+    ({ mkDerivation, base, containers, directory, filepath, gloss, grid
      , optparse-applicative, random
      }:
      mkDerivation {
        pname = "hexmino";
-       version = "0.1.0.0";
-       sha256 = "0s8sqpqirnnm9jp1lmifywy7ad6vxpj8k85nfyh4zjqybrs2m2p9";
+       version = "0.1.1.0";
+       sha256 = "0l6gjjbzz2sa17b8glyiknf1ndwkp3089af52pj8fw6cg9ckvspx";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers directory filepath gloss optparse-applicative
+         base containers directory filepath gloss grid optparse-applicative
          random
        ];
        homepage = "https://github.com/pasqu4le/hexmino";
        description = "A small game based on domino-like hexagonal tiles";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexml" = callPackage
@@ -105398,8 +105526,8 @@ self: {
      }:
      mkDerivation {
        pname = "hfmt";
-       version = "0.2.1";
-       sha256 = "06g3l0qbj1bdrxis9ryl3cgmhs129l1lfiah5kpn0xbv1h3p3id5";
+       version = "0.2.2";
+       sha256 = "0xjh952djxb490nig2aj9y5461ka33d3qdlrfkxb7iz7pqmmr6fs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106757,6 +106885,7 @@ self: {
        homepage = "https://github.com/strake/hint.hs";
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinterface" = callPackage
@@ -113514,8 +113643,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsimport";
-       version = "0.8.5";
-       sha256 = "05gdzl4h67rjpw2nhk6dvd9l8lmx1kdg4cy9hmk5l36vrk8s9ic6";
+       version = "0.8.6";
+       sha256 = "0ylbg5bcylc0gql0qvmih66dj1qj8imn31b6bl70mynwkqh96g1d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123093,6 +123222,7 @@ self: {
        homepage = "http://github.com/GregorySchwartz/integreat#readme";
        description = "Integrate different assays";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intel-aes" = callPackage
@@ -129582,6 +129712,7 @@ self: {
        homepage = "https://github.com/phadej/kleene";
        description = "Kleene algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans" = callPackage
@@ -132547,8 +132678,8 @@ self: {
      }:
      mkDerivation {
        pname = "layers-game";
-       version = "0.5.2";
-       sha256 = "1k39264jwysaiyq9f40n332y2xckhwsbh8fpsz4l14qwlvj68vzx";
+       version = "0.5.3";
+       sha256 = "050l8fd77xhl4fqhl8s1c22gdww3if69mzflgrai9gwq31kiasp3";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -134948,6 +135079,7 @@ self: {
        homepage = "https://github.com/mvv/lifted-stm";
        description = "STM operations lifted through monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-threads" = callPackage
@@ -137536,6 +137668,7 @@ self: {
        homepage = "https://github.com/greydot/log-effect-syslog";
        description = "Syslog functions for log-effect";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-elasticsearch" = callPackage
@@ -159293,6 +159426,17 @@ self: {
        broken = true;
      }) {lazysmallcheck2012 = null;};
 
+  "panic" = callPackage
+    ({ mkDerivation, base, gitrev, template-haskell }:
+     mkDerivation {
+       pname = "panic";
+       version = "0.4.0.0";
+       sha256 = "12m18s4d8xvwwf4vhv4p544h03abgkjx7bfwl22gxr1y8f7gb8wl";
+       libraryHaskellDepends = [ base gitrev template-haskell ];
+       description = "A convenient way to panic";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
   "panpipe" = callPackage
     ({ mkDerivation, base, pandoc, pandoc-types, process, QuickCheck
      , tasty, tasty-quickcheck, temporary, unix
@@ -162339,6 +162483,7 @@ self: {
        ];
        description = "Permutations of finite sets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "permute" = callPackage
@@ -164305,8 +164450,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-binary";
-       version = "0.4.1";
-       sha256 = "0dyng5pvyjw7bjflzfbrkwq99qzyc4a2rh0nlidjhy95ixs7jvhv";
+       version = "0.4.2";
+       sha256 = "1s3462i85zd6byr18mfabfmiapb0yy3fnrsaw6mnasw19kyxjngn";
        libraryHaskellDepends = [
          base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse
          transformers
@@ -164879,6 +165024,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-misc_0_5_0_0" = callPackage
+    ({ mkDerivation, base, clock, Decimal, hspec, lens, mmorph, mtl
+     , pipes, pipes-category, pipes-concurrency, semigroups, stm
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pipes-misc";
+       version = "0.5.0.0";
+       sha256 = "09ldpgza3yanpbsd6g2nlm352fwynq38sf226yp5kip0dqwpwbjf";
+       libraryHaskellDepends = [
+         base clock Decimal lens mmorph mtl pipes pipes-category
+         pipes-concurrency semigroups stm transformers
+       ];
+       testHaskellDepends = [
+         base hspec lens mmorph pipes pipes-concurrency stm transformers
+       ];
+       homepage = "https://github.com/louispan/pipes-misc#readme";
+       description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-mongodb" = callPackage
     ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
      mkDerivation {
@@ -171127,6 +171294,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "protobuf_0_2_1_2" = callPackage
+    ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
+     , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "protobuf";
+       version = "0.2.1.2";
+       sha256 = "1php9pydbh2jyr5x6h1i218w8kqwys5aniz2zm1hapv6ia8p3j5k";
+       libraryHaskellDepends = [
+         base base-orphans bytestring cereal data-binary-ieee754 deepseq mtl
+         text unordered-containers
+       ];
+       testHaskellDepends = [
+         base bytestring cereal containers hex HUnit mtl QuickCheck tagged
+         tasty tasty-hunit tasty-quickcheck text unordered-containers
+       ];
+       homepage = "https://github.com/alphaHeavy/protobuf";
+       description = "Google Protocol Buffers via GHC.Generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "protobuf-native" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cplusplus-th, criterion
      , hprotoc-fork, protobuf, protocol-buffers-fork, QuickCheck
@@ -176287,8 +176477,8 @@ self: {
      }:
      mkDerivation {
        pname = "reactive-banana-automation";
-       version = "0.4.0";
-       sha256 = "1zc24p1jqild85k049ixbfcdhxdy66l4m5ddr1g3bkxq8apilnrr";
+       version = "0.5.0";
+       sha256 = "10lg4s6c29xb1j9icda1aywh64ybnk7d3hw3wl69rcwlqp52635a";
        libraryHaskellDepends = [
          base reactive-banana stm time transformers
        ];
@@ -189387,8 +189577,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, syb }:
      mkDerivation {
        pname = "set-extra";
-       version = "1.4";
-       sha256 = "0cwppi2kyqcyn338nmpmkyvwhn7xcp7yfgkgpsmmkwhin0hyxnr9";
+       version = "1.4.1";
+       sha256 = "10kbvd09hp12rlfkc15xqiglrbxzi7gchb0aazqyg77ah66wjn10";
        libraryHaskellDepends = [ base containers mtl syb ];
        homepage = "https://github.com/ddssff/set-extra";
        description = "Functions that could be added to Data.Set.";
@@ -190897,6 +191087,7 @@ self: {
        ];
        description = "Implementation of Shivers' Control-Flow Analysis";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shoap" = callPackage
@@ -199785,6 +199976,7 @@ self: {
        homepage = "https://github.com/jonpetterbergman/step-function";
        description = "Staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stepwise" = callPackage
@@ -201153,8 +201345,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-with";
-       version = "0.2.1.1";
-       sha256 = "0wyq183z10sr0sdx28n316x22f4h8v67cg164qir3fb7q09pmqbg";
+       version = "0.2.2.1";
+       sha256 = "005krn43z92x1v8w8pgfx489h3livkklgrr7s2i2wijgsz55xp09";
        libraryHaskellDepends = [
          base exceptions managed streaming-bytestring temporary transformers
        ];
@@ -202378,6 +202570,7 @@ self: {
        homepage = "http://github.com/GregorySchwartz/subsample#readme";
        description = "Subsample data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "substring-parser" = callPackage
@@ -204969,6 +205162,7 @@ self: {
        homepage = "http://github.com/taffybar/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tag-bits" = callPackage
@@ -208797,6 +208991,7 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -210588,6 +210783,7 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threefish" = callPackage
@@ -212009,6 +212205,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tintin" = callPackage
+    ({ mkDerivation, base, clay, data-has, directory, frontmatter
+     , inliterate, lucid, optparse-generic, process, temporary, text
+     , universum, yaml
+     }:
+     mkDerivation {
+       pname = "tintin";
+       version = "1.2.4";
+       sha256 = "1jfnw911jfa9wn1inldz3qry238hrl276yb9f690c59yb3zcnvjh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base clay data-has directory frontmatter inliterate lucid process
+         temporary text universum yaml
+       ];
+       executableHaskellDepends = [ base optparse-generic universum ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/theam/tintin#readme";
+       description = "A softer alternative to Haddock";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "tiny-scheduler" = callPackage
     ({ mkDerivation, async, base, time }:
      mkDerivation {
@@ -212766,8 +212984,8 @@ self: {
      }:
      mkDerivation {
        pname = "tomland";
-       version = "0.0.0";
-       sha256 = "1z6xlaw7fvl95h5nhd1r87bn8y3xv5gmfwfvryaj7hn06ghw13z2";
+       version = "0.1.0";
+       sha256 = "1f31awp7qy1npm4nnyk25lf4cng942mbfm7mmvglr0h7c1y11wpc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214855,6 +215073,7 @@ self: {
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tubes" = callPackage
@@ -217653,6 +217872,7 @@ self: {
        homepage = "https://github.com/singpolyma/unexceptionalio-trans";
        description = "A wrapper around UnexceptionalIO using monad transformers";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unfoldable" = callPackage
@@ -221533,8 +221753,8 @@ self: {
     ({ mkDerivation, base, bytes, tasty, tasty-quickcheck, vector }:
      mkDerivation {
        pname = "vector-bytes-instances";
-       version = "0.1";
-       sha256 = "1bmss8s8cp123s77dppma7k3p0b8cnhk16li5hnm369264h0zfga";
+       version = "0.1.1";
+       sha256 = "0i4cxgm984qs5ldp1x7m9blxh8wd5y8acy2ic8kpgaak8pzycrkn";
        libraryHaskellDepends = [ base bytes vector ];
        testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ];
        homepage = "https://github.com/k0001/vector-bytes-instances";
@@ -222031,6 +222251,7 @@ self: {
        ];
        description = "An intermediate language for Hoare logic style verification";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verify" = callPackage
@@ -225589,8 +225810,8 @@ self: {
      }:
      mkDerivation {
        pname = "web3";
-       version = "0.7.2.0";
-       sha256 = "15d0l5cvrncwmy27qk7y7f54snw1fjcsll52sdlmk3v2mpf6nppn";
+       version = "0.7.3.0";
+       sha256 = "1ff52krn6vylz8fjbj6224q48lg6cz4glg6xl9sgrz36ayliv0mg";
        libraryHaskellDepends = [
          aeson async base basement bytestring cereal cryptonite data-default
          exceptions generics-sop http-client machines memory mtl parsec
@@ -227279,6 +227500,7 @@ self: {
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Words of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "word-trie" = callPackage

From f9524a48f314bc74b4bba5ad706dd52cc8942717 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 May 2018 14:04:59 +0200
Subject: [PATCH 2410/3370] LTS Haskell 11.10

---
 .../configuration-hackage2nix.yaml            | 94 +++++++++----------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 602b5e6b9bc0..64f0056a7ff9 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.9
+  # LTS Haskell 11.10
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -67,7 +67,7 @@ default-package-overrides:
   - aeson-better-errors ==0.9.1.0
   - aeson-casing ==0.1.0.5
   - aeson-compat ==0.3.7.1
-  - aeson-diff ==1.1.0.4
+  - aeson-diff ==1.1.0.5
   - aeson-extra ==0.4.1.0
   - aeson-generic-compat ==0.0.1.2
   - aeson-injector ==1.1.0.0
@@ -152,7 +152,7 @@ default-package-overrides:
   - base-compat ==0.9.3
   - basement ==0.0.7
   - base-orphans ==0.7
-  - base-prelude ==1.2.0.1
+  - base-prelude ==1.2.1
   - base-unicode-symbols ==0.2.2.4
   - basic-prelude ==0.7.0
   - bbdb ==0.8
@@ -180,7 +180,7 @@ default-package-overrides:
   - binary-search ==1.0.0.3
   - binary-shared ==0.8.3
   - binary-tagged ==0.1.4.2
-  - bindings-DSL ==1.0.24
+  - bindings-DSL ==1.0.25
   - bindings-GLFW ==3.1.2.4
   - bindings-libzip ==1.0.1
   - bindings-uname ==0.1
@@ -234,7 +234,7 @@ default-package-overrides:
   - brittany ==0.9.0.1
   - broadcast-chan ==0.1.1
   - bsb-http-chunked ==0.0.0.2
-  - bson ==0.3.2.3
+  - bson ==0.3.2.6
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
   - buchhaltung ==0.0.7
@@ -260,7 +260,7 @@ default-package-overrides:
   - Cabal ==2.0.1.1
   - cabal-doctest ==1.0.6
   - cabal-file-th ==0.2.4
-  - cabal-rpm ==0.12.2
+  - cabal-rpm ==0.12.3
   - cabal-toolkit ==0.0.5
   - cache ==0.1.1.0
   - cairo ==0.13.5.0
@@ -278,7 +278,7 @@ default-package-overrides:
   - cassava-records ==0.1.0.4
   - cassette ==0.1.0
   - cast ==0.1.0.2
-  - cayley-client ==0.4.5
+  - cayley-client ==0.4.6
   - cereal ==0.5.5.0
   - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
@@ -308,7 +308,7 @@ default-package-overrides:
   - circle-packing ==0.1.0.6
   - cisco-spark-api ==0.1.0.3
   - clang-compilation-database ==0.1.0.1
-  - classyplate ==0.3.0.2
+  - classyplate ==0.3.1.0
   - classy-prelude ==1.4.0
   - classy-prelude-conduit ==1.4.0
   - classy-prelude-yesod ==1.4.0
@@ -415,7 +415,7 @@ default-package-overrides:
   - crypto-random-api ==0.2.0
   - crypt-sha512 ==0
   - csp ==1.3.1
-  - css-syntax ==0.0.5
+  - css-syntax ==0.0.7
   - css-text ==0.1.3.0
   - csv ==0.1.2
   - csv-conduit ==0.6.8.1
@@ -481,7 +481,7 @@ default-package-overrides:
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2.1
-  - deriving-compat ==0.4.1
+  - deriving-compat ==0.4.2
   - descriptive ==0.9.4
   - dhall ==1.11.1
   - dhall-json ==1.0.13
@@ -511,11 +511,11 @@ default-package-overrides:
   - distributive ==0.5.3
   - diversity ==0.8.1.0
   - djinn-ghc ==0.0.2.3
-  - djinn-lib ==0.0.1.2
+  - djinn-lib ==0.0.1.3
   - dlist ==0.8.0.4
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
-  - dns ==3.0.2
+  - dns ==3.0.3
   - docker ==0.5.1.1
   - docker-build-cacher ==1.9.2
   - dockerfile ==0.1.0.1
@@ -540,7 +540,7 @@ default-package-overrides:
   - dynamic-state ==0.3
   - dyre ==0.8.12
   - Earley ==0.12.1.0
-  - easy-file ==0.2.1
+  - easy-file ==0.2.2
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
   - ed25519 ==0.0.5.0
@@ -593,7 +593,7 @@ default-package-overrides:
   - eventsource-geteventstore-store ==1.1.0
   - eventsource-store-specs ==1.1.1
   - eventsource-stub-store ==1.0.3
-  - eventstore ==1.1.2
+  - eventstore ==1.1.3
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.3
@@ -607,7 +607,7 @@ default-package-overrides:
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9.2
   - exp-pairs ==0.1.6.0
-  - extensible ==0.4.8
+  - extensible ==0.4.9
   - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
   - extra ==1.6.6
@@ -682,7 +682,7 @@ default-package-overrides:
   - from-sum ==0.2.1.0
   - frontmatter ==0.1.0.2
   - fsnotify ==0.2.1.1
-  - fsnotify-conduit ==0.1.0.0
+  - fsnotify-conduit ==0.1.1.0
   - funcmp ==1.9
   - functor-classes-compat ==1
   - fuzzcheck ==0.1.1
@@ -732,7 +732,7 @@ default-package-overrides:
   - ghcjs-perch ==0.3.3.2
   - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
-  - ghc-prof ==1.4.1.1
+  - ghc-prof ==1.4.1.2
   - ghc-syb-utils ==0.2.3.3
   - ghc-tcplugins-extra ==0.2.5
   - ghc-typelits-extra ==0.2.4
@@ -740,7 +740,7 @@ default-package-overrides:
   - ghc-typelits-natnormalise ==0.5.10
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
-  - gi-cairo ==1.0.15
+  - gi-cairo ==1.0.17
   - gi-glib ==2.0.16
   - gi-gobject ==2.0.16
   - gi-javascriptcore ==4.0.15
@@ -798,7 +798,7 @@ default-package-overrides:
   - hackage-db ==2.0
   - hackage-security ==0.5.3.0
   - haddock-library ==1.4.5
-  - hailgun ==0.4.1.7
+  - hailgun ==0.4.1.8
   - hailgun-simple ==0.1.0.0
   - hakyll ==4.12.2.0
   - half ==0.2.2.3
@@ -841,7 +841,7 @@ default-package-overrides:
   - hasmin ==1.0.2
   - hasql ==1.1.1
   - hasql-migration ==0.1.3
-  - hasql-optparse-applicative ==0.3
+  - hasql-optparse-applicative ==0.3.0.1
   - hasql-pool ==0.4.3
   - hasql-transaction ==0.6
   - hastache ==0.6.1
@@ -875,7 +875,7 @@ default-package-overrides:
   - hexml-lens ==0.2.1
   - hexpat ==0.20.13
   - hexstring ==0.11.1
-  - hformat ==0.3.1.0
+  - hformat ==0.3.2.0
   - hfsevents ==0.1.6
   - hid ==0.2.2
   - hidapi ==0.1.4
@@ -931,8 +931,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - hset ==2.2.0
   - HSet ==0.0.1
+  - hset ==2.2.0
   - hsexif ==0.6.1.5
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
@@ -1013,7 +1013,7 @@ default-package-overrides:
   - hw-mquery ==0.1.0.1
   - hworker ==0.1.0.1
   - hw-parser ==0.0.0.3
-  - hw-prim ==0.5.0.3
+  - hw-prim ==0.5.0.5
   - hw-rankselect ==0.10.0.3
   - hw-rankselect-base ==0.2.0.2
   - hw-string-parse ==0.0.0.4
@@ -1082,7 +1082,7 @@ default-package-overrides:
   - io-streams-haproxy ==1.0.0.2
   - ip ==1.1.2
   - ip6addr ==0.5.3
-  - iproute ==1.7.4
+  - iproute ==1.7.5
   - IPv6Addr ==1.0.3
   - IPv6DB ==0.2.6
   - ipython-kernel ==0.9.0.2
@@ -1113,12 +1113,12 @@ default-package-overrides:
   - json ==0.9.2
   - json-autotype ==1.0.18
   - json-builder ==0.3
-  - json-rpc-generic ==0.2.1.3
+  - json-rpc-generic ==0.2.1.4
   - json-schema ==0.7.4.1
   - json-stream ==0.4.2.3
   - JuicyPixels ==3.2.9.5
   - JuicyPixels-extra ==0.3.0
-  - JuicyPixels-scale-dct ==0.1.1.2
+  - JuicyPixels-scale-dct ==0.1.2
   - justified-containers ==0.3.0.0
   - jvm ==0.4.2
   - jvm-batching ==0.1.1
@@ -1297,7 +1297,7 @@ default-package-overrides:
   - mmap ==0.5.9
   - mmark ==0.0.5.6
   - mmark-cli ==0.0.3.0
-  - mmark-ext ==0.2.0.0
+  - mmark-ext ==0.2.1.0
   - mmorph ==1.1.2
   - mnist-idx ==0.1.2.8
   - mockery ==0.3.5
@@ -1344,7 +1344,7 @@ default-package-overrides:
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.8.1
   - mono-traversable-instances ==0.1.0.0
-  - morte ==1.6.18
+  - morte ==1.6.19
   - mountpoints ==1.0.2
   - mstate ==0.2.7
   - mtl ==2.2.2
@@ -1394,7 +1394,7 @@ default-package-overrides:
   - network-ip ==0.3.0.2
   - network-multicast ==0.2.0
   - Network-NineP ==0.4.3
-  - network-simple ==0.4.0.5
+  - network-simple ==0.4.1
   - network-transport ==0.5.2
   - network-transport-composed ==0.2.1
   - network-transport-inmemory ==0.5.2
@@ -1418,7 +1418,7 @@ default-package-overrides:
   - NoTrace ==0.3.0.2
   - nsis ==0.3.2
   - n-tuple ==0.0.2.0
-  - numbers ==3000.2.0.1
+  - numbers ==3000.2.0.2
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.3
   - numhask ==0.1.4.0
@@ -1438,11 +1438,11 @@ default-package-overrides:
   - once ==0.2
   - one-liner ==0.9.2
   - one-liner-instances ==0.1.2.1
-  - OneTuple ==0.2.1
+  - OneTuple ==0.2.2
   - online ==0.2.1.0
   - Only ==0.1
   - oo-prototypes ==0.1.0.0
-  - opaleye ==0.6.1.0
+  - opaleye ==0.6.7000.0
   - OpenAL ==1.7.0.4
   - open-browser ==0.2.1.0
   - openexr-write ==0.1.0.1
@@ -1525,7 +1525,7 @@ default-package-overrides:
   - picoparsec ==0.1.2.3
   - picosat ==0.1.4
   - pid1 ==0.1.2.0
-  - pinboard ==0.9.12.9
+  - pinboard ==0.9.12.10
   - pinch ==0.3.2.0
   - pipes ==4.3.9
   - pipes-aeson ==0.4.1.8
@@ -1540,7 +1540,7 @@ default-package-overrides:
   - pipes-group ==1.0.10
   - pipes-misc ==0.4.0.1
   - pipes-mongodb ==0.1.0.0
-  - pipes-network ==0.6.4.1
+  - pipes-network ==0.6.5
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.4
   - pipes-safe ==2.2.9
@@ -1562,7 +1562,7 @@ default-package-overrides:
   - pooled-io ==0.0.2.1
   - PortMidi ==0.1.6.1
   - posix-paths ==0.2.1.5
-  - postgresql-binary ==0.12.1
+  - postgresql-binary ==0.12.1.1
   - postgresql-libpq ==0.9.4.1
   - postgresql-schema ==0.1.14
   - postgresql-simple ==0.5.3.0
@@ -1653,14 +1653,14 @@ default-package-overrides:
   - raaz ==0.2.0
   - rainbow ==0.28.0.4
   - rainbox ==0.18.0.10
-  - rakuten ==0.1.1.2
+  - rakuten ==0.1.1.3
   - ramus ==0.1.2
   - random ==1.1
   - random-fu ==0.2.7.0
   - random-shuffle ==0.0.4
   - random-source ==0.3.0.6
   - random-tree ==0.6.0.5
-  - range-set-list ==0.1.2.0
+  - range-set-list ==0.1.2.1
   - rank1dynamic ==0.4.0
   - rank2classes ==1.0.2
   - rank-product ==0.2.0.1
@@ -1837,7 +1837,7 @@ default-package-overrides:
   - signal ==0.1.0.4
   - silently ==1.2.5
   - simple ==0.11.2
-  - simple-log ==0.9.3
+  - simple-log ==0.9.4
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.27
   - simple-session ==0.10.1.1
@@ -1852,7 +1852,7 @@ default-package-overrides:
   - slack-web ==0.2.0.4
   - slave-thread ==1.0.2
   - slug ==0.1.7
-  - smallcheck ==1.1.3.1
+  - smallcheck ==1.1.4
   - smoothie ==0.4.2.8
   - smtp-mail ==0.1.4.6
   - snap ==1.1.0.0
@@ -1977,7 +1977,7 @@ default-package-overrides:
   - tar-conduit ==0.2.3
   - tardis ==0.4.1.0
   - tasty ==1.0.1.1
-  - tasty-ant-xml ==1.1.3
+  - tasty-ant-xml ==1.1.4
   - tasty-auto ==0.2.0.0
   - tasty-dejafu ==1.1.0.2
   - tasty-discover ==4.2.0
@@ -1990,10 +1990,10 @@ default-package-overrides:
   - tasty-kat ==0.0.3
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.9.2
-  - tasty-rerun ==1.1.11
+  - tasty-rerun ==1.1.12
   - tasty-silver ==3.1.11
   - tasty-smallcheck ==0.8.1
-  - tasty-stats ==0.2.0.3
+  - tasty-stats ==0.2.0.4
   - tasty-th ==0.1.7
   - TCache ==0.12.1
   - tce-conf ==1.3
@@ -2042,7 +2042,7 @@ default-package-overrides:
   - these ==0.7.4
   - th-expand-syns ==0.4.4.0
   - th-extras ==0.0.0.4
-  - th-lift ==0.7.8
+  - th-lift ==0.7.10
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.5
   - thread-hierarchy ==0.3.0.0
@@ -2239,7 +2239,7 @@ default-package-overrides:
   - wai-predicates ==0.10.0
   - wai-route ==0.3.1.2
   - wai-routing ==0.13.0
-  - wai-session ==0.3.2
+  - wai-session ==0.3.3
   - wai-session-postgresql ==0.2.1.2
   - wai-slack-middleware ==0.2.0
   - wai-transformers ==0.0.7
@@ -2262,8 +2262,8 @@ default-package-overrides:
   - websockets ==0.12.4.1
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
-  - websockets-snap ==0.10.2.5
-  - weigh ==0.0.11
+  - websockets-snap ==0.10.3.0
+  - weigh ==0.0.12
   - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
   - wild-bind ==0.1.2.0
@@ -2343,7 +2343,7 @@ default-package-overrides:
   - yesod-auth ==1.6.3
   - yesod-auth-fb ==1.9.0
   - yesod-auth-hashdb ==1.7
-  - yesod-bin ==1.6.0.2
+  - yesod-bin ==1.6.0.3
   - yesod-core ==1.6.5
   - yesod-csp ==0.2.4.0
   - yesod-eventsource ==1.6.0

From 9c2b4e53fa3f19d4b70b1065b3de73e350b8c5d0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 May 2018 14:06:03 +0200
Subject: [PATCH 2411/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-13-gd8bc043 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/9866f7be165885e36b31c8d3d49225865f45cd41.
---
 .../haskell-modules/hackage-packages.nix      | 971 ++----------------
 1 file changed, 76 insertions(+), 895 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9eca79c74e34..574b5e49c2fb 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -11028,26 +11028,6 @@ self: {
      }) {};
 
   "JuicyPixels-scale-dct" = callPackage
-    ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels, time
-     }:
-     mkDerivation {
-       pname = "JuicyPixels-scale-dct";
-       version = "0.1.1.2";
-       sha256 = "15py0slh1jij8wrd68q0fqs9yarnabr470xm04i92904a809vgcs";
-       revision = "3";
-       editedCabalFile = "0z1ks049q9jsc5ysh12idkqf3rz0bnvv74rhlaw24r5q2xj8lv8i";
-       libraryHaskellDepends = [
-         base base-compat carray fft JuicyPixels
-       ];
-       testHaskellDepends = [
-         base base-compat carray fft JuicyPixels time
-       ];
-       homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme";
-       description = "Scale JuicyPixels images with DCT";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels-scale-dct_0_1_2" = callPackage
     ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels, time
      }:
      mkDerivation {
@@ -11063,7 +11043,6 @@ self: {
        homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme";
        description = "Scale JuicyPixels images with DCT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-stbir" = callPackage
@@ -13984,19 +13963,6 @@ self: {
      }) {};
 
   "OneTuple" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "OneTuple";
-       version = "0.2.1";
-       sha256 = "1x52b68zh3k9lnps5s87kzan7dzvqp6mrwgayjq15w9dv6v78vsb";
-       revision = "1";
-       editedCabalFile = "1kb7f21n9vwwrk4kipqdwdqs94k34zai6yy0kgdn22zi442yicjh";
-       libraryHaskellDepends = [ base ];
-       description = "Singleton Tuple";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "OneTuple_0_2_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "OneTuple";
@@ -14005,7 +13971,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singleton Tuple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Only" = callPackage
@@ -22539,35 +22504,6 @@ self: {
      }) {};
 
   "aeson-diff" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, doctest
-     , edit-distance-vector, filepath, Glob, hashable, hlint, mtl
-     , optparse-applicative, QuickCheck, quickcheck-instances
-     , scientific, text, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "aeson-diff";
-       version = "1.1.0.4";
-       sha256 = "03lbghmivvmgj326ha3rxqldd73nyq88hyjigkb09nrd8vwy9wc7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring edit-distance-vector hashable mtl scientific
-         text unordered-containers vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring optparse-applicative text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring directory doctest filepath Glob hlint
-         QuickCheck quickcheck-instances text unordered-containers vector
-       ];
-       homepage = "https://github.com/thsutton/aeson-diff";
-       description = "Extract and apply patches to JSON documents";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "aeson-diff_1_1_0_5" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , edit-distance-vector, filepath, Glob, hashable, mtl
      , optparse-applicative, QuickCheck, quickcheck-instances
@@ -33938,18 +33874,6 @@ self: {
      }) {};
 
   "base-prelude" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "base-prelude";
-       version = "1.2.0.1";
-       sha256 = "17hivs7lmsglagdlzxd9q9zsddmgqin2788mpq911zwnb57lj6l1";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/base-prelude";
-       description = "The most complete prelude formed solely from the \"base\" package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "base-prelude_1_2_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
@@ -33959,7 +33883,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed solely from the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-unicode-symbols" = callPackage
@@ -36231,18 +36154,6 @@ self: {
      }) {};
 
   "bindings-DSL" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "bindings-DSL";
-       version = "1.0.24";
-       sha256 = "03n8z5qxrrq4l6h2f3xyav45f5v2gr112g4l4r4jw8yfvr8qyk93";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
-       description = "FFI domain specific language, on top of hsc2hs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bindings-DSL_1_0_25" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "bindings-DSL";
@@ -36252,7 +36163,6 @@ self: {
        homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
        description = "FFI domain specific language, on top of hsc2hs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-EsounD" = callPackage
@@ -40488,28 +40398,6 @@ self: {
      }) {};
 
   "bson" = callPackage
-    ({ mkDerivation, base, binary, bytestring, cryptohash
-     , data-binary-ieee754, mtl, network, QuickCheck, test-framework
-     , test-framework-quickcheck2, text, time
-     }:
-     mkDerivation {
-       pname = "bson";
-       version = "0.3.2.3";
-       sha256 = "10j96x6014g3w7i6szx5klr5c7cn1r0b7k581fyzpkb5ad1vlflv";
-       libraryHaskellDepends = [
-         base binary bytestring cryptohash data-binary-ieee754 mtl network
-         text time
-       ];
-       testHaskellDepends = [
-         base binary bytestring cryptohash data-binary-ieee754 mtl network
-         QuickCheck test-framework test-framework-quickcheck2 text time
-       ];
-       homepage = "http://github.com/mongodb-haskell/bson";
-       description = "BSON documents are JSON-like objects with a standard binary encoding";
-       license = "unknown";
-     }) {};
-
-  "bson_0_3_2_6" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptohash
      , data-binary-ieee754, mtl, network, QuickCheck, test-framework
      , test-framework-quickcheck2, text, time
@@ -40529,7 +40417,6 @@ self: {
        homepage = "http://github.com/mongodb-haskell/bson";
        description = "BSON documents are JSON-like objects with a standard binary encoding";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bson-generic" = callPackage
@@ -42728,25 +42615,6 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , http-client, http-client-tls, http-conduit, process, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "0.12.2";
-       sha256 = "00i3v62ys6fhq2rnw9q2hhc2h54v8my14ll746vpma2gfdy90y1c";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring Cabal directory filepath http-client
-         http-client-tls http-conduit process time unix
-       ];
-       homepage = "https://github.com/juhp/cabal-rpm";
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cabal-rpm_0_12_3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , http-client, http-client-tls, http-conduit, process, time, unix
      }:
@@ -42763,7 +42631,6 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -45046,27 +44913,6 @@ self: {
      }) {};
 
   "cayley-client" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
-     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
-     , mtl, text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "cayley-client";
-       version = "0.4.5";
-       sha256 = "12gmav4bwf3i44wbwc68vgrnal7j6q3428d6wl5zq078pv2c3x7w";
-       libraryHaskellDepends = [
-         aeson attoparsec base binary bytestring exceptions http-client
-         http-conduit lens lens-aeson mtl text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec unordered-containers ];
-       homepage = "https://github.com/MichelBoucey/cayley-client";
-       description = "A Haskell client for the Cayley graph database";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cayley-client_0_4_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
      , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
      , mtl, text, transformers, unordered-containers, vector
@@ -47837,20 +47683,6 @@ self: {
      }) {};
 
   "classyplate" = callPackage
-    ({ mkDerivation, base, criterion, parallel, template-haskell
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "classyplate";
-       version = "0.3.0.2";
-       sha256 = "0dpllaahq81bn7h0vb0h8s1lf6w0knd2dgqyycimrxfc0aqh1md8";
-       libraryHaskellDepends = [ base template-haskell ];
-       benchmarkHaskellDepends = [ base criterion parallel uniplate ];
-       description = "Fuseable type-class based generics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "classyplate_0_3_1_0" = callPackage
     ({ mkDerivation, base, criterion, parallel, template-haskell
      , uniplate
      }:
@@ -47862,7 +47694,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion parallel uniplate ];
        description = "Fuseable type-class based generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clay" = callPackage
@@ -56866,26 +56697,6 @@ self: {
      }) {};
 
   "css-syntax" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
-     , scientific, text
-     }:
-     mkDerivation {
-       pname = "css-syntax";
-       version = "0.0.5";
-       sha256 = "17hbwnhwz9c6xdw508chygq684h7hrrv16yyrmqdj7f8hfzy0s9r";
-       revision = "3";
-       editedCabalFile = "0p32287dxngmz6bk2xpvj8vh0kawjcrdxxdnczmay6pa1bzyhrik";
-       libraryHaskellDepends = [
-         attoparsec base bytestring scientific text
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring directory hspec scientific text
-       ];
-       description = "This package implments a parser for the CSS syntax";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "css-syntax_0_0_7" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
      , scientific, text
      }:
@@ -56901,7 +56712,6 @@ self: {
        ];
        description = "This package implments a parser for the CSS syntax";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css-text" = callPackage
@@ -62474,32 +62284,6 @@ self: {
      }) {};
 
   "deriving-compat" = callPackage
-    ({ mkDerivation, base, base-compat, base-orphans, containers
-     , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
-     , template-haskell, th-abstraction, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "deriving-compat";
-       version = "0.4.1";
-       sha256 = "0lzcbnvzcnrrvr61mrqdx4i8fylknf4jwrpncxr9lhpxgp4fqqk4";
-       revision = "1";
-       editedCabalFile = "12pzj7ng66xyyj6aixd0mds8vf0p9syivngrjz9xcsi63d76dsbn";
-       libraryHaskellDepends = [
-         base containers ghc-boot-th ghc-prim template-haskell
-         th-abstraction transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base base-compat base-orphans hspec QuickCheck tagged
-         template-haskell transformers transformers-compat
-       ];
-       testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/haskell-compat/deriving-compat";
-       description = "Backports of GHC deriving extensions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "deriving-compat_0_4_2" = callPackage
     ({ mkDerivation, base, base-compat, base-orphans, containers
      , ghc-boot-th, ghc-prim, hspec, hspec-discover, QuickCheck, tagged
      , template-haskell, th-abstraction, transformers
@@ -62521,7 +62305,6 @@ self: {
        homepage = "https://github.com/haskell-compat/deriving-compat";
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derp" = callPackage
@@ -63593,19 +63376,16 @@ self: {
 
   "diagrams-postscript" = callPackage
     ({ mkDerivation, base, containers, data-default-class
-     , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
-     , monoid-extras, mtl, semigroups, split, statestack
+     , diagrams-core, diagrams-lib, dlist, hashable, lens, monoid-extras
+     , mtl, semigroups, split, statestack
      }:
      mkDerivation {
        pname = "diagrams-postscript";
-       version = "1.4";
-       sha256 = "1d4dbwd4qgrlwm0m9spwqklpg3plf0ghrnrah1k6yw900l0z0n7y";
-       revision = "1";
-       editedCabalFile = "0vmiv3b74nml0ahb7dicq0m0vz2lahzfapln9aby0jb2saa0sf58";
+       version = "1.4.1";
+       sha256 = "171c53msr2x8da87fghl7jikbmrwy7gdxwhdviixc2y3k4fijn57";
        libraryHaskellDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
-         filepath hashable lens monoid-extras mtl semigroups split
-         statestack
+         hashable lens monoid-extras mtl semigroups split statestack
        ];
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
@@ -65909,18 +65689,6 @@ self: {
      }) {};
 
   "djinn-lib" = callPackage
-    ({ mkDerivation, base, containers, mtl, pretty }:
-     mkDerivation {
-       pname = "djinn-lib";
-       version = "0.0.1.2";
-       sha256 = "048hs27awl4j9lg04qbnpf8c51mzbgy2afckis19zcswmavi1zn0";
-       libraryHaskellDepends = [ base containers mtl pretty ];
-       homepage = "http://www.augustsson.net/Darcs/Djinn/";
-       description = "Generate Haskell code from a type. Library extracted from djinn package.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "djinn-lib_0_0_1_3" = callPackage
     ({ mkDerivation, base, containers, mtl, pretty }:
      mkDerivation {
        pname = "djinn-lib";
@@ -65930,7 +65698,6 @@ self: {
        homepage = "http://www.augustsson.net/Darcs/Djinn/";
        description = "Generate Haskell code from a type. Library extracted from djinn package.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "djinn-th" = callPackage
@@ -66118,21 +65885,21 @@ self: {
 
   "dns" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base
-     , base64-bytestring, binary, bytestring, conduit, conduit-extra
-     , containers, cryptonite, doctest, hspec, iproute, mtl, network
-     , psqueues, QuickCheck, safe, time, word8
+     , base64-bytestring, binary, bytestring, containers, cryptonite
+     , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe
+     , time, word8
      }:
      mkDerivation {
        pname = "dns";
-       version = "3.0.2";
-       sha256 = "193j67jnhxkih3gbfzdx9cpzvqryk4kzc3yhl1yagdg16shrba7i";
+       version = "3.0.3";
+       sha256 = "0m7xgf5vgh3xj5yrv8hyvhx3lligx1xrnq22a9b6s2prbywyllfv";
        libraryHaskellDepends = [
          async attoparsec auto-update base base64-bytestring binary
-         bytestring conduit conduit-extra containers cryptonite iproute mtl
-         network psqueues safe time
+         bytestring containers cryptonite iproute mtl network psqueues safe
+         time
        ];
        testHaskellDepends = [
-         base bytestring doctest hspec iproute QuickCheck word8
+         base bytestring doctest hspec iproute network QuickCheck word8
        ];
        testTarget = "spec";
        description = "DNS library in Haskell";
@@ -68578,18 +68345,6 @@ self: {
      }) {};
 
   "easy-file" = callPackage
-    ({ mkDerivation, base, directory, filepath, time, unix }:
-     mkDerivation {
-       pname = "easy-file";
-       version = "0.2.1";
-       sha256 = "0v75081bx4qzlqy29hh639nzlr7dncwza3qxbzm9njc4jarf31pz";
-       libraryHaskellDepends = [ base directory filepath time unix ];
-       homepage = "http://github.com/kazu-yamamoto/easy-file";
-       description = "Cross-platform File handling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "easy-file_0_2_2" = callPackage
     ({ mkDerivation, base, directory, filepath, time, unix }:
      mkDerivation {
        pname = "easy-file";
@@ -68599,7 +68354,6 @@ self: {
        homepage = "http://github.com/kazu-yamamoto/easy-file";
        description = "Cross-platform File handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easyjson" = callPackage
@@ -72772,42 +72526,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
-     , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, hashable, http-client
-     , interpolate, lifted-async, lifted-base, machines, monad-control
-     , monad-logger, mono-traversable, mtl, protobuf, random
-     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
-     , tasty-hunit, text, text-format, time, transformers-base
-     , unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "1.1.2";
-       sha256 = "1f2pqmsppln3p0zfw35hck5784np9hhs3f5f6h6j12k43gyj3847";
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base machines
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe-exceptions semigroups stm stm-chans text text-format time
-         transformers-base unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring cereal connection containers
-         dotnet-timespan exceptions fast-logger hashable lifted-async
-         lifted-base monad-control mono-traversable protobuf safe-exceptions
-         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
-         transformers-base unordered-containers uuid
-       ];
-       homepage = "https://github.com/YoEight/eventstore#readme";
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_1_1_3" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -73858,29 +73576,6 @@ self: {
      }) {};
 
   "extensible" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cassava, comonad
-     , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
-     , mtl, primitive, profunctors, QuickCheck, semigroups, StateVar
-     , tagged, template-haskell, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "extensible";
-       version = "0.4.8";
-       sha256 = "1bm7yqshaknnd50yf6bgb6qxl2lv21pqxhb674v3ifpwx1swrkm2";
-       libraryHaskellDepends = [
-         aeson base bytestring cassava comonad constraints deepseq ghc-prim
-         hashable monad-skeleton mtl primitive profunctors QuickCheck
-         semigroups StateVar tagged template-haskell text transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [ base lens QuickCheck template-haskell ];
-       homepage = "https://github.com/fumieval/extensible";
-       description = "Extensible, efficient, optics-friendly data types and effects";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extensible_0_4_9" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, comonad
      , constraints, deepseq, ghc-prim, hashable, lens, monad-skeleton
      , mtl, prettyprinter, primitive, profunctors, QuickCheck
@@ -73901,7 +73596,6 @@ self: {
        homepage = "https://github.com/fumieval/extensible";
        description = "Extensible, efficient, optics-friendly data types and effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extensible-data" = callPackage
@@ -80356,27 +80050,6 @@ self: {
      }) {};
 
   "fsnotify-conduit" = callPackage
-    ({ mkDerivation, async, base, conduit, directory, filepath
-     , fsnotify, hspec, resourcet, temporary, transformers
-     }:
-     mkDerivation {
-       pname = "fsnotify-conduit";
-       version = "0.1.0.0";
-       sha256 = "17qf175bsn1sw0n4sz3mjd3bcmxy6qmy7df8c6275jfxvr9djnwj";
-       libraryHaskellDepends = [
-         base conduit directory filepath fsnotify resourcet transformers
-       ];
-       testHaskellDepends = [
-         async base conduit directory filepath hspec resourcet temporary
-         transformers
-       ];
-       homepage = "https://github.com/fpco/fsnotify-conduit#readme";
-       description = "Get filesystem notifications as a stream of events";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "fsnotify-conduit_0_1_1_0" = callPackage
     ({ mkDerivation, base, conduit, directory, filepath, fsnotify
      , hspec, resourcet, temporary, transformers
      }:
@@ -84554,28 +84227,6 @@ self: {
      }) {};
 
   "ghc-prof" = callPackage
-    ({ mkDerivation, attoparsec, base, containers, directory, filepath
-     , process, scientific, tasty, tasty-hunit, temporary, text, time
-     }:
-     mkDerivation {
-       pname = "ghc-prof";
-       version = "1.4.1.1";
-       sha256 = "1zxk2fs0zykpqklyfwssbi5hfmzm7hc1yx8l8x1fy29qxim3y2z5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base containers scientific text time
-       ];
-       testHaskellDepends = [
-         attoparsec base containers directory filepath process tasty
-         tasty-hunit temporary text
-       ];
-       homepage = "https://github.com/maoe/ghc-prof";
-       description = "Library for parsing GHC time and allocation profiling reports";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-prof_1_4_1_2" = callPackage
     ({ mkDerivation, attoparsec, base, containers, directory, filepath
      , process, scientific, tasty, tasty-hunit, temporary, text, time
      }:
@@ -84595,7 +84246,6 @@ self: {
        homepage = "https://github.com/maoe/ghc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-prof-aeson" = callPackage
@@ -85511,32 +85161,6 @@ self: {
      }) {inherit (pkgs) atk;};
 
   "gi-cairo" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, cairo, containers
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "gi-cairo";
-       version = "1.0.15";
-       sha256 = "1hm8bcd6j11dimb3ksfjkcqf9wqa9frq1jyjpbr2j5s8srrf7031";
-       setupHaskellDepends = [ base Cabal haskell-gi ];
-       libraryHaskellDepends = [
-         base bytestring containers haskell-gi haskell-gi-base
-         haskell-gi-overloading text transformers
-       ];
-       libraryPkgconfigDepends = [ cairo ];
-       doHaddock = false;
-       preCompileBuildDriver = ''
-         PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
-         setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
-       '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
-       description = "Cairo bindings";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) cairo;};
-
-  "gi-cairo_1_0_17" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cairo, containers
      , haskell-gi, haskell-gi-base, haskell-gi-overloading, text
      , transformers
@@ -95538,25 +95162,6 @@ self: {
      }) {};
 
   "hailgun" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, email-validate
-     , exceptions, filepath, http-client, http-client-tls, http-types
-     , tagsoup, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "hailgun";
-       version = "0.4.1.7";
-       sha256 = "1ldh6q96xz2a8frvgq29j3gr8jc2m0rx652215bm8w99mbq4pcri";
-       libraryHaskellDepends = [
-         aeson base bytestring email-validate exceptions filepath
-         http-client http-client-tls http-types tagsoup text time
-         transformers
-       ];
-       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
-       description = "Mailgun REST api interface for Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hailgun_0_4_1_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, email-validate
      , exceptions, filepath, http-client, http-client-tls, http-types
      , tagsoup, text, time, transformers
@@ -95573,7 +95178,6 @@ self: {
        homepage = "https://bitbucket.org/robertmassaioli/hailgun";
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun-send" = callPackage
@@ -101742,6 +101346,37 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql_1_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
+     , bytestring-strict-builder, contravariant, contravariant-extras
+     , criterion, data-default-class, dlist, hashable, hashtables
+     , loch-th, mtl, placeholders, postgresql-binary, postgresql-libpq
+     , profunctors, QuickCheck, quickcheck-instances, rebase, rerebase
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+     , text-builder, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "1.3";
+       sha256 = "1xqw967jzn8jsyzhfnfyvqgaqr0sb9qppv3knxxvsji15hj5zrid";
+       libraryHaskellDepends = [
+         attoparsec base base-prelude bytestring bytestring-strict-builder
+         contravariant contravariant-extras data-default-class dlist
+         hashable hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors semigroups text text-builder
+         transformers vector
+       ];
+       testHaskellDepends = [
+         bug data-default-class QuickCheck quickcheck-instances rebase
+         rerebase tasty tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ bug criterion rerebase ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "An efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, either, free
      , list-t, text, transformers, vector
@@ -101792,8 +101427,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-cursor-query";
-       version = "0.4.4";
-       sha256 = "0xbnhgix1g4sf2cpimz77ljiwm79l4lnx1ys7q31rak1fyw7fgs0";
+       version = "0.4.4.1";
+       sha256 = "1lc3x3pwfahm81pfncky6mqsz6fjyj0szwi4qhf1k1drx36wr3db";
        libraryHaskellDepends = [
          base base-prelude bytestring contravariant foldl hasql
          hasql-cursor-transaction hasql-transaction profunctors
@@ -101872,23 +101507,6 @@ self: {
      }) {};
 
   "hasql-optparse-applicative" = callPackage
-    ({ mkDerivation, base-prelude, hasql, hasql-pool
-     , optparse-applicative
-     }:
-     mkDerivation {
-       pname = "hasql-optparse-applicative";
-       version = "0.3";
-       sha256 = "05i9hij1z67l1sc53swwcmd88544dypc3qkzkh8f4n6nlmv82190";
-       libraryHaskellDepends = [
-         base-prelude hasql hasql-pool optparse-applicative
-       ];
-       homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
-       description = "\"optparse-applicative\" parsers for \"hasql\"";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "hasql-optparse-applicative_0_3_0_1" = callPackage
     ({ mkDerivation, base-prelude, hasql, hasql-pool
      , optparse-applicative
      }:
@@ -102024,6 +101642,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql-transaction_0_7" = callPackage
+    ({ mkDerivation, async, base, base-prelude, bytestring
+     , bytestring-tree-builder, contravariant, contravariant-extras
+     , hasql, mtl, rebase, transformers
+     }:
+     mkDerivation {
+       pname = "hasql-transaction";
+       version = "0.7";
+       sha256 = "1kvzj16mw471z2vgm27k0nfwfgf5cq3w6qaqwqz4247p11dkrjyy";
+       libraryHaskellDepends = [
+         base base-prelude bytestring bytestring-tree-builder contravariant
+         contravariant-extras hasql mtl transformers
+       ];
+       testHaskellDepends = [ async hasql rebase ];
+       homepage = "https://github.com/nikita-volkov/hasql-transaction";
+       description = "A composable abstraction over the retryable transactions for Hasql";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hastache" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, containers
      , directory, filepath, HUnit, ieee754, mtl, process, syb, text
@@ -105569,23 +105207,6 @@ self: {
      }) {};
 
   "hformat" = callPackage
-    ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec
-     , text
-     }:
-     mkDerivation {
-       pname = "hformat";
-       version = "0.3.1.0";
-       sha256 = "1lf6x8y81jxvynid1k3588kbc7xk331bp6c4hnd8x19l0jvp4shd";
-       libraryHaskellDepends = [
-         ansi-terminal base base-unicode-symbols text
-       ];
-       testHaskellDepends = [ base base-unicode-symbols hspec text ];
-       homepage = "http://github.com/mvoidex/hformat";
-       description = "Simple Haskell formatting";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hformat_0_3_2_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-unicode-symbols, hspec
      , text
      }:
@@ -105600,7 +105221,6 @@ self: {
        homepage = "http://github.com/mvoidex/hformat";
        description = "Simple Haskell formatting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfov" = callPackage
@@ -118647,8 +118267,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.5.0.3";
-       sha256 = "1cnh8qm4kz4fxh34wn9039dxbb54mwhkls21m5s73q773q9fx4rz";
+       version = "0.5.0.5";
+       sha256 = "1bl1jfdcp8vpl83qcnq168rnvmpl4kxz7mv94vzal8mi2sw7iilk";
        libraryHaskellDepends = [ base bytestring mmap vector ];
        testHaskellDepends = [
          base bytestring directory exceptions hedgehog hspec
@@ -124261,26 +123881,6 @@ self: {
      }) {};
 
   "iproute" = callPackage
-    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
-     , network, QuickCheck, safe
-     }:
-     mkDerivation {
-       pname = "iproute";
-       version = "1.7.4";
-       sha256 = "17gcmw9m8c30cm3j5hdcqhpkvbir9js1k6s3ad141yszxymmnq8q";
-       libraryHaskellDepends = [
-         appar base byteorder containers network
-       ];
-       testHaskellDepends = [
-         appar base byteorder containers doctest hspec network QuickCheck
-         safe
-       ];
-       homepage = "http://www.mew.org/~kazu/proj/iproute/";
-       description = "IP Routing Table";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "iproute_1_7_5" = callPackage
     ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
      , network, QuickCheck, safe
      }:
@@ -124298,7 +123898,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/iproute/";
        description = "IP Routing Table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -127243,27 +126842,6 @@ self: {
      }) {};
 
   "json-rpc-generic" = callPackage
-    ({ mkDerivation, aeson, aeson-generic-compat, base, bytestring
-     , containers, dlist, QuickCheck, quickcheck-simple, scientific
-     , text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "json-rpc-generic";
-       version = "0.2.1.3";
-       sha256 = "105v0x610hb8vnbbmfm7myn15vblxkcvcryhgx363wgg0qqyakna";
-       libraryHaskellDepends = [
-         aeson aeson-generic-compat base bytestring containers dlist
-         scientific text transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base QuickCheck quickcheck-simple text
-       ];
-       homepage = "http://github.com/khibino/haskell-json-rpc-generic";
-       description = "Generic encoder and decode for JSON-RPC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json-rpc-generic_0_2_1_4" = callPackage
     ({ mkDerivation, aeson, aeson-generic-compat, base, containers
      , dlist, QuickCheck, quickcheck-simple, scientific, text
      , transformers, unordered-containers, vector
@@ -127282,7 +126860,6 @@ self: {
        homepage = "http://github.com/khibino/haskell-json-rpc-generic";
        description = "Generic encoder and decode for JSON-RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc-server" = callPackage
@@ -145106,26 +144683,6 @@ self: {
      }) {};
 
   "mmark-ext" = callPackage
-    ({ mkDerivation, base, foldl, hspec, lucid, microlens, mmark
-     , modern-uri, skylighting, text
-     }:
-     mkDerivation {
-       pname = "mmark-ext";
-       version = "0.2.0.0";
-       sha256 = "1ccfdjsn8z80x2m5p9q17r2hf14zj63nkxkrg9s7knwr1j08gj1k";
-       revision = "2";
-       editedCabalFile = "0h47hy97mdan3cnxppf0yarmis81irc0c92nm1xv9f6w35li7rkq";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base foldl lucid microlens mmark modern-uri skylighting text
-       ];
-       testHaskellDepends = [ base hspec lucid mmark text ];
-       homepage = "https://github.com/mmark-md/mmark-ext";
-       description = "Commonly useful extensions for MMark markdown processor";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "mmark-ext_0_2_1_0" = callPackage
     ({ mkDerivation, base, foldl, hspec, hspec-discover, lucid
      , microlens, mmark, modern-uri, skylighting, text
      }:
@@ -145142,7 +144699,6 @@ self: {
        homepage = "https://github.com/mmark-md/mmark-ext";
        description = "Commonly useful extensions for the MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmorph" = callPackage
@@ -147679,39 +147235,6 @@ self: {
      }) {};
 
   "morte" = callPackage
-    ({ mkDerivation, alex, array, base, binary, code-page, containers
-     , criterion, deepseq, Earley, formatting, http-client
-     , http-client-tls, microlens, microlens-mtl, mtl
-     , optparse-applicative, pipes, QuickCheck, system-fileio
-     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "morte";
-       version = "1.6.18";
-       sha256 = "1cnwk2rihbywwkpxw7bd22zh33hkffpaza7d4crr5x2p7rdvhmjp";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         array base binary containers deepseq Earley formatting http-client
-         http-client-tls microlens microlens-mtl pipes system-fileio
-         system-filepath text transformers
-       ];
-       libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         base code-page formatting optparse-applicative text
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck system-filepath tasty tasty-hunit
-         tasty-quickcheck text transformers
-       ];
-       benchmarkHaskellDepends = [ base criterion system-filepath text ];
-       description = "A bare-bones calculus of constructions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "morte_1_6_19" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, formatting, http-client
      , http-client-tls, microlens, microlens-mtl, mtl
@@ -147742,7 +147265,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -152568,22 +152090,6 @@ self: {
      }) {};
 
   "network-simple" = callPackage
-    ({ mkDerivation, base, bytestring, exceptions, network
-     , transformers
-     }:
-     mkDerivation {
-       pname = "network-simple";
-       version = "0.4.0.5";
-       sha256 = "1akarns88nhrkm47nl20mg2s2r8in339j2jcv6h0z3gnxc4v8iq9";
-       libraryHaskellDepends = [
-         base bytestring exceptions network transformers
-       ];
-       homepage = "https://github.com/k0001/network-simple";
-       description = "Simple network sockets usage patterns";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "network-simple_0_4_1" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, network
      , transformers
      }:
@@ -152597,7 +152103,6 @@ self: {
        homepage = "https://github.com/k0001/network-simple";
        description = "Simple network sockets usage patterns";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-simple-sockaddr" = callPackage
@@ -154693,23 +154198,6 @@ self: {
      }) {};
 
   "numbers" = callPackage
-    ({ mkDerivation, base, QuickCheck, test-framework
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "numbers";
-       version = "3000.2.0.1";
-       sha256 = "10z1bi5qbc81z5xx2v1ylwcpmcfl1ci7lxrswkgi0dd1wi8havbk";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base QuickCheck test-framework test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/jwiegley/numbers#readme";
-       description = "Various number types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "numbers_3000_2_0_2" = callPackage
     ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-quickcheck2
      }:
@@ -154724,7 +154212,6 @@ self: {
        homepage = "https://github.com/jwiegley/numbers#readme";
        description = "Various number types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numerals" = callPackage
@@ -156375,35 +155862,6 @@ self: {
      }) {};
 
   "opaleye" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , case-insensitive, containers, contravariant, dotenv, hspec
-     , hspec-discover, multiset, postgresql-simple, pretty
-     , product-profunctors, profunctors, QuickCheck, semigroups, text
-     , time, time-locale-compat, transformers, uuid, void
-     }:
-     mkDerivation {
-       pname = "opaleye";
-       version = "0.6.1.0";
-       sha256 = "0vjiwpdrff4nrs5ww8q3j77ysrq0if20yfk4gy182lr7nzhhwz0l";
-       revision = "1";
-       editedCabalFile = "07sz4a506hlx8da2ppiglja6hm9ipb2myh6s702ac6xx700cnl7f";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring case-insensitive
-         contravariant postgresql-simple pretty product-profunctors
-         profunctors semigroups text time time-locale-compat transformers
-         uuid void
-       ];
-       testHaskellDepends = [
-         aeson base containers contravariant dotenv hspec hspec-discover
-         multiset postgresql-simple product-profunctors profunctors
-         QuickCheck semigroups text time transformers
-       ];
-       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
-       description = "An SQL-generating DSL targeting PostgreSQL";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "opaleye_0_6_7000_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , case-insensitive, containers, contravariant, dotenv, hspec
      , hspec-discover, multiset, postgresql-simple, pretty
@@ -156431,7 +155889,6 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -164119,32 +163576,6 @@ self: {
      }) {};
 
   "pinboard" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, hspec
-     , http-client, http-client-tls, http-types, monad-logger, mtl
-     , network, profunctors, QuickCheck, random, safe-exceptions
-     , semigroups, text, time, transformers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "pinboard";
-       version = "0.9.12.9";
-       sha256 = "0h2w2ah7cqv0blb2pcdlzd4ww1f92x5ixr5ksqdqdcyzij2pbmbn";
-       libraryHaskellDepends = [
-         aeson base bytestring containers http-client http-client-tls
-         http-types monad-logger mtl network profunctors random
-         safe-exceptions text time transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers hspec mtl QuickCheck
-         safe-exceptions semigroups text time transformers
-         unordered-containers
-       ];
-       homepage = "https://github.com/jonschoning/pinboard";
-       description = "Access to the Pinboard API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pinboard_0_9_12_10" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, hspec
      , http-client, http-client-tls, http-types, monad-logger, mtl
      , network, profunctors, QuickCheck, random, safe-exceptions
@@ -164168,7 +163599,6 @@ self: {
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinch" = callPackage
@@ -165061,25 +164491,6 @@ self: {
      }) {};
 
   "pipes-network" = callPackage
-    ({ mkDerivation, base, bytestring, network, network-simple, pipes
-     , pipes-safe, transformers
-     }:
-     mkDerivation {
-       pname = "pipes-network";
-       version = "0.6.4.1";
-       sha256 = "1bx0a7whir2g83q80m145nl13271sfl5jrvdjlaailp2g3n4lqm8";
-       revision = "1";
-       editedCabalFile = "0i7iyzsj6hax7k66rcrkqgkd7z5z65ak77jmg9mdlm13q12r6kih";
-       libraryHaskellDepends = [
-         base bytestring network network-simple pipes pipes-safe
-         transformers
-       ];
-       homepage = "https://github.com/k0001/pipes-network";
-       description = "Use network sockets together with the pipes library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-network_0_6_5" = callPackage
     ({ mkDerivation, base, bytestring, exceptions, network
      , network-simple, pipes, pipes-safe, transformers
      }:
@@ -165094,7 +164505,6 @@ self: {
        homepage = "https://github.com/k0001/pipes-network";
        description = "Use network sockets together with the pipes library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-network-tls" = callPackage
@@ -167613,38 +167023,6 @@ self: {
      }) {};
 
   "postgresql-binary" = callPackage
-    ({ mkDerivation, aeson, base, base-prelude, binary-parser
-     , bytestring, bytestring-strict-builder, containers, conversion
-     , conversion-bytestring, conversion-text, criterion, json-ast
-     , loch-th, network-ip, placeholders, postgresql-libpq, QuickCheck
-     , quickcheck-instances, rerebase, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , unordered-containers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-binary";
-       version = "0.12.1";
-       sha256 = "1kb52676dz76z7blvzrfsbwaa1harnrmg0zhwlhg429d21n9y2m2";
-       libraryHaskellDepends = [
-         aeson base base-prelude binary-parser bytestring
-         bytestring-strict-builder containers loch-th network-ip
-         placeholders scientific text time transformers unordered-containers
-         uuid vector
-       ];
-       testHaskellDepends = [
-         aeson conversion conversion-bytestring conversion-text json-ast
-         loch-th network-ip placeholders postgresql-libpq QuickCheck
-         quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck
-       ];
-       benchmarkHaskellDepends = [ criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/postgresql-binary";
-       description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "postgresql-binary_0_12_1_1" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, bytestring-strict-builder, containers, conversion
      , conversion-bytestring, conversion-text, criterion, json-ast
@@ -174903,31 +174281,6 @@ self: {
      }) {};
 
   "rakuten" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, connection, constraints
-     , data-default-class, extensible, hspec, http-api-data, http-client
-     , http-client-tls, http-types, lens, req, servant-server, text
-     , warp
-     }:
-     mkDerivation {
-       pname = "rakuten";
-       version = "0.1.1.2";
-       sha256 = "153801dij5i5byf151xf39anz005i3w7xmmkk434xr6zxc8jm604";
-       libraryHaskellDepends = [
-         aeson base bytestring connection constraints data-default-class
-         extensible http-api-data http-client http-client-tls http-types
-         lens req text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring connection constraints data-default-class
-         extensible hspec http-api-data http-client http-client-tls
-         http-types lens req servant-server text warp
-       ];
-       homepage = "https://github.com/matsubara0507/rakuten#readme";
-       description = "The Rakuten API in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rakuten_0_1_1_3" = callPackage
     ({ mkDerivation, aeson, base, bytestring, connection, constraints
      , data-default-class, extensible, hspec, http-api-data, http-client
      , http-client-tls, http-types, lens, req, servant-server, text
@@ -174950,7 +174303,6 @@ self: {
        homepage = "https://github.com/matsubara0507/rakuten#readme";
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ralist" = callPackage
@@ -175404,20 +174756,16 @@ self: {
      }) {};
 
   "range-set-list" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, semigroups
-     , tasty, tasty-quickcheck
+    ({ mkDerivation, base, containers, deepseq, hashable, tasty
+     , tasty-quickcheck
      }:
      mkDerivation {
        pname = "range-set-list";
-       version = "0.1.2.0";
-       sha256 = "0rxb5dq228xypnilqvjyn97knlzfc7fl771w4qgziwfw8zs9qx1v";
-       revision = "1";
-       editedCabalFile = "061xbyarcjr4bcb08a5xyzqiyvagn9729p6hk5kzayzlkscx16j2";
-       libraryHaskellDepends = [
-         base containers deepseq hashable semigroups
-       ];
+       version = "0.1.2.1";
+       sha256 = "06f8z9rmk2phmds9wv95y2xvjhfx8dr9jbqlv4ybv8m21283x0kw";
+       libraryHaskellDepends = [ base containers deepseq hashable ];
        testHaskellDepends = [
-         base containers deepseq hashable semigroups tasty tasty-quickcheck
+         base containers deepseq hashable tasty tasty-quickcheck
        ];
        homepage = "https://github.com/phadej/range-set-list#readme";
        description = "Memory efficient sets with ranges of elements";
@@ -191944,8 +191292,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.9.3";
-       sha256 = "0i58x3gasg1gda7yx9r155ap6w7mamafcqi5jpq4adm9wx4gy4ph";
+       version = "0.9.4";
+       sha256 = "0chp90h9112sxa7ds0ldzdp59i6b1vy7chkqcb6d5mb9faq6vjqi";
        libraryHaskellDepends = [
          async base base-unicode-symbols containers data-default deepseq
          directory exceptions filepath hformat microlens microlens-platform
@@ -193699,18 +193047,6 @@ self: {
      }) {};
 
   "smallcheck" = callPackage
-    ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
-     mkDerivation {
-       pname = "smallcheck";
-       version = "1.1.3.1";
-       sha256 = "1lmx0sxkhryra7laln8m7z0518jshahsvz121xybajjcz9pz3xcz";
-       libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
-       homepage = "https://github.com/feuerbach/smallcheck";
-       description = "A property-based testing library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "smallcheck_1_1_4" = callPackage
     ({ mkDerivation, base, ghc-prim, logict, mtl, pretty }:
      mkDerivation {
        pname = "smallcheck";
@@ -193720,7 +193056,6 @@ self: {
        homepage = "https://github.com/feuerbach/smallcheck";
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallcheck-laws" = callPackage
@@ -206096,24 +205431,6 @@ self: {
      }) {};
 
   "tasty-ant-xml" = callPackage
-    ({ mkDerivation, base, containers, directory, filepath
-     , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
-     , xml
-     }:
-     mkDerivation {
-       pname = "tasty-ant-xml";
-       version = "1.1.3";
-       sha256 = "0nxrvxk83mv29yhywswg21q156zdzs02xrwqambnz78pldsrbk4n";
-       libraryHaskellDepends = [
-         base containers directory filepath generic-deriving ghc-prim mtl
-         stm tagged tasty transformers xml
-       ];
-       homepage = "http://github.com/ocharles/tasty-ant-xml";
-       description = "Render tasty output to XML for Jenkins";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-ant-xml_1_1_4" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers
      , xml
@@ -206129,7 +205446,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-ant-xml";
        description = "Render tasty output to XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-auto" = callPackage
@@ -206533,23 +205849,6 @@ self: {
      }) {};
 
   "tasty-rerun" = callPackage
-    ({ mkDerivation, base, containers, mtl, optparse-applicative
-     , reducers, split, stm, tagged, tasty, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-rerun";
-       version = "1.1.11";
-       sha256 = "0nk2qfdhdl71xcr0rwixmwwsyr74dy4hjwalhs4p4am2bhpfva5s";
-       libraryHaskellDepends = [
-         base containers mtl optparse-applicative reducers split stm tagged
-         tasty transformers
-       ];
-       homepage = "http://github.com/ocharles/tasty-rerun";
-       description = "Run tests by filtering the test tree depending on the result of previous test runs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tasty-rerun_1_1_12" = callPackage
     ({ mkDerivation, base, containers, mtl, optparse-applicative
      , reducers, split, stm, tagged, tasty, transformers
      }:
@@ -206564,7 +205863,6 @@ self: {
        homepage = "http://github.com/ocharles/tasty-rerun";
        description = "Run tests by filtering the test tree depending on the result of previous test runs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-silver" = callPackage
@@ -206604,24 +205902,6 @@ self: {
      }) {};
 
   "tasty-stats" = callPackage
-    ({ mkDerivation, base, containers, directory, process, stm, tagged
-     , tasty, time
-     }:
-     mkDerivation {
-       pname = "tasty-stats";
-       version = "0.2.0.3";
-       sha256 = "1jyywffrs270rvf8k9zc82b7fqqv6x1czk6qlbi6sq9z1wgs5w1b";
-       revision = "2";
-       editedCabalFile = "1gkan66glb235kakvwkidmxd0cn7s9405w3njiwa5k6cvkpkny4x";
-       libraryHaskellDepends = [
-         base containers directory process stm tagged tasty time
-       ];
-       homepage = "https://github.com/minad/tasty-stats#readme";
-       description = "Collect statistics of your Tasty testsuite in a CSV file";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-stats_0_2_0_4" = callPackage
     ({ mkDerivation, base, containers, directory, process, stm, tagged
      , tasty, time
      }:
@@ -206635,7 +205915,6 @@ self: {
        homepage = "https://github.com/minad/tasty-stats#readme";
        description = "Collect statistics of your Tasty testsuite";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-tap" = callPackage
@@ -210154,19 +209433,6 @@ self: {
      }) {};
 
   "th-lift" = callPackage
-    ({ mkDerivation, base, ghc-prim, template-haskell }:
-     mkDerivation {
-       pname = "th-lift";
-       version = "0.7.8";
-       sha256 = "0ay10b78x3969rpqqrgzy8srkl6iby2cljbf3mm17na8x22k7y1c";
-       libraryHaskellDepends = [ base ghc-prim template-haskell ];
-       testHaskellDepends = [ base ghc-prim template-haskell ];
-       homepage = "http://github.com/mboes/th-lift";
-       description = "Derive Template Haskell's Lift class for datatypes";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-lift_0_7_10" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell, th-abstraction
      }:
      mkDerivation {
@@ -210180,7 +209446,6 @@ self: {
        homepage = "http://github.com/mboes/th-lift";
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-lift-instances" = callPackage
@@ -224694,23 +223959,6 @@ self: {
      }) {};
 
   "wai-session" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, containers
-     , cookie, http-types, StateVar, time, transformers, vault, wai
-     }:
-     mkDerivation {
-       pname = "wai-session";
-       version = "0.3.2";
-       sha256 = "09l3gj8l127iybr8h4xcjxxcgz5b1mcy5iyyaidixnzi7jlrqww3";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers cookie http-types StateVar
-         time transformers vault wai
-       ];
-       homepage = "https://github.com/singpolyma/wai-session";
-       description = "Flexible session middleware for WAI";
-       license = "unknown";
-     }) {};
-
-  "wai-session_0_3_3" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring
      , bytestring-builder, containers, cookie, entropy, http-types
      , StateVar, time, transformers, vault, wai
@@ -224726,7 +223974,6 @@ self: {
        homepage = "https://github.com/singpolyma/wai-session";
        description = "Flexible session middleware for WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-session-alt" = callPackage
@@ -226375,22 +225622,6 @@ self: {
      }) {};
 
   "websockets-snap" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
-     , mtl, snap-core, snap-server, websockets
-     }:
-     mkDerivation {
-       pname = "websockets-snap";
-       version = "0.10.2.5";
-       sha256 = "14kxk6x5pygxlyn6421lkmc3lld5r545zq5qx6098mgn6bg2yknj";
-       libraryHaskellDepends = [
-         base bytestring bytestring-builder io-streams mtl snap-core
-         snap-server websockets
-       ];
-       description = "Snap integration for the websockets library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets-snap_0_10_3_0" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-builder, io-streams
      , mtl, snap-core, snap-server, websockets
      }:
@@ -226404,7 +225635,6 @@ self: {
        ];
        description = "Snap integration for the websockets library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webwire" = callPackage
@@ -226483,21 +225713,6 @@ self: {
      }) {};
 
   "weigh" = callPackage
-    ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
-     mkDerivation {
-       pname = "weigh";
-       version = "0.0.11";
-       sha256 = "0q4l2npli78w3p74rsh56q1azwh07856ckip9v3vmw53xzx0n42l";
-       libraryHaskellDepends = [
-         base deepseq mtl process split temporary
-       ];
-       testHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/fpco/weigh#readme";
-       description = "Measure allocations of a Haskell functions/values";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "weigh_0_0_12" = callPackage
     ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
      mkDerivation {
        pname = "weigh";
@@ -226510,7 +225725,6 @@ self: {
        homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted" = callPackage
@@ -232253,39 +231467,6 @@ self: {
      }) {};
 
   "yesod-bin" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
-     , bytestring, Cabal, conduit, conduit-extra, containers
-     , data-default-class, directory, file-embed, filepath, fsnotify
-     , http-client, http-client-tls, http-reverse-proxy, http-types
-     , network, optparse-applicative, parsec, process, project-template
-     , resourcet, say, shakespeare, split, stm, streaming-commons, tar
-     , template-haskell, text, time, transformers, transformers-compat
-     , unix-compat, unliftio, unordered-containers, wai, wai-extra, warp
-     , warp-tls, yaml, zlib
-     }:
-     mkDerivation {
-       pname = "yesod-bin";
-       version = "1.6.0.2";
-       sha256 = "0x1lr6xm4h3x1ld42xs946aq4sn0g5x147bxqjxr5bfswj7vjk5k";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         attoparsec base base64-bytestring blaze-builder bytestring Cabal
-         conduit conduit-extra containers data-default-class directory
-         file-embed filepath fsnotify http-client http-client-tls
-         http-reverse-proxy http-types network optparse-applicative parsec
-         process project-template resourcet say shakespeare split stm
-         streaming-commons tar template-haskell text time transformers
-         transformers-compat unix-compat unliftio unordered-containers wai
-         wai-extra warp warp-tls yaml zlib
-       ];
-       homepage = "http://www.yesodweb.com/";
-       description = "The yesod helper executable";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "yesod-bin_1_6_0_3" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
      , bytestring, Cabal, conduit, conduit-extra, containers
      , data-default-class, directory, file-embed, filepath, fsnotify

From b6b8cdd43f9f671a4498367ec51e77171f536de0 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 22 Feb 2018 14:34:45 +0100
Subject: [PATCH 2412/3370] libgudev: add gobjectIntrospection to
 nativeBuildInputs

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

diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix
index 1e1f3eeb4c73..54760549a164 100644
--- a/pkgs/development/libraries/libgudev/default.nix
+++ b/pkgs/development/libraries/libgudev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, glib, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, udev, glib, gobjectIntrospection, gnome3 }:
 
 let
   pname = "libgudev";
@@ -6,12 +6,14 @@ in stdenv.mkDerivation rec {
   name = "libgudev-${version}";
   version = "232";
 
+  outputs = [ "out" "dev" ];
+
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
     sha256 = "ee4cb2b9c573cdf354f6ed744f01b111d4b5bed3503ffa956cefff50489c7860";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
   buildInputs = [ udev glib ];
 
   # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.

From 89e196d971e167867318c8fc2e08cb0782c75bec Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 23 May 2018 13:09:45 -0500
Subject: [PATCH 2413/3370] libiconv: fix setup hook

Fixes issue from PR #40139.
---
 .../darwin/apple-source-releases/libiconv/default.nix        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index 984e70955162..7ea9d51b4bf6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -18,7 +18,10 @@ appleDerivation {
       -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib
   '';
 
-  setupHook = ../../../../development/libraries/libiconv/setup-hook.sh;
+  setupHooks = [
+    ../../../../build-support/setup-hooks/role.bash
+    ../../../../development/libraries/libiconv/setup-hook.sh
+  ];
 
   meta = {
     platforms = stdenv.lib.platforms.darwin;

From 58fd684c7661b578821e1caa9dbf8211fe8cf4f5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 May 2018 12:39:07 -0400
Subject: [PATCH 2414/3370] llvm: Separate tools and libraries for clarity

Especially provides clarity with respect to cross.
---
 .../compilers/llvm/3.7/default.nix            | 45 +++++++-------
 .../compilers/llvm/3.8/default.nix            | 47 +++++++-------
 .../compilers/llvm/3.9/default.nix            | 47 +++++++-------
 pkgs/development/compilers/llvm/4/default.nix | 61 +++++++++----------
 pkgs/development/compilers/llvm/5/default.nix | 61 +++++++++----------
 pkgs/development/compilers/llvm/6/default.nix | 61 +++++++++----------
 pkgs/top-level/all-packages.nix               | 40 ++++++------
 7 files changed, 178 insertions(+), 184 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.7/default.nix b/pkgs/development/compilers/llvm/3.7/default.nix
index 8f73645afc06..4e1a0ef6409a 100644
--- a/pkgs/development/compilers/llvm/3.7/default.nix
+++ b/pkgs/development/compilers/llvm/3.7/default.nix
@@ -1,12 +1,10 @@
 { newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl
 , overrideCC, wrapCCWith, darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl version fetch; });
-
   version = "3.7.1";
 
   fetch = fetch_v version;
@@ -18,41 +16,44 @@ let
   compiler-rt_src = fetch "compiler-rt" "10c1mz2q4bdq9bqfgr3dirc6hz1h3sq8573srd5q5lr7m7j6jiwx";
   clang-tools-extra_src = fetch "clang-tools-extra" "0sxw2l3q5msbrwxv1ck72arggdw6n5ysi929gi69ikniranfv4aa";
 
-  self = {
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv isl version fetch; });
+  in {
     llvm = callPackage ./llvm.nix {
-      inherit compiler-rt_src stdenv;
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
-      inherit clang-tools-extra_src stdenv;
+      inherit clang-tools-extra_src;
     };
 
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      cc = tools.clang-unwrapped;
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
   };
-in self
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix
index a5f3b7759517..6fa1a0cf2e26 100644
--- a/pkgs/development/compilers/llvm/3.8/default.nix
+++ b/pkgs/development/compilers/llvm/3.8/default.nix
@@ -1,11 +1,9 @@
 { newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv isl version fetch; });
-
   version = "3.8.1";
 
   fetch = fetch_v version;
@@ -17,43 +15,46 @@ let
   compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d";
   clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6";
 
-  self = {
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv isl version fetch; });
+ in {
     llvm = callPackage ./llvm.nix {
-      inherit compiler-rt_src stdenv;
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
-      inherit clang-tools-extra_src stdenv;
+      inherit clang-tools-extra_src;
     };
 
-    libclang = self.clang-unwrapped.lib;
+    libclang = tools.clang-unwrapped.lib;
 
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      cc = tools.clang-unwrapped;
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
   };
-in self
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix
index 4b69996473d4..c3bf0b48d649 100644
--- a/pkgs/development/compilers/llvm/3.9/default.nix
+++ b/pkgs/development/compilers/llvm/3.9/default.nix
@@ -1,11 +1,9 @@
 { newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv isl version fetch; });
-
   version = "3.9.1";
 
   fetch = fetch_v version;
@@ -17,43 +15,46 @@ let
   compiler-rt_src = fetch "compiler-rt" "16gc2gdmp5c800qvydrdhsp0bzb97s8wrakl6i8a4lgslnqnf2fk";
   clang-tools-extra_src = fetch "clang-tools-extra" "0d9nh7j7brbh9avigcn69dlaihsl9p3cf9s45mw6fxzzvrdvd999";
 
-  self = {
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv isl version fetch; });
+  in {
     llvm = callPackage ./llvm.nix {
-      inherit compiler-rt_src stdenv;
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
     };
 
     clang-unwrapped = callPackage ./clang {
-      inherit clang-tools-extra_src stdenv;
+      inherit clang-tools-extra_src;
     };
 
-    libclang = self.clang-unwrapped.lib;
+    libclang = tools.clang-unwrapped.lib;
 
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      cc = tools.clang-unwrapped;
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv isl version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
     libcxxabi = callPackage ./libc++abi.nix {};
   };
-in self
+
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/4/default.nix b/pkgs/development/compilers/llvm/4/default.nix
index 594397bdbbc0..fecf65136bcd 100644
--- a/pkgs/development/compilers/llvm/4/default.nix
+++ b/pkgs/development/compilers/llvm/4/default.nix
@@ -1,13 +1,11 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-
   release_version = "4.0.1";
   version = release_version; # differentiating these is important for rc's
 
@@ -24,47 +22,46 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  llvm = callPackage ./llvm.nix {
-    inherit compiler-rt_src stdenv;
-  };
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
 
-  clang-unwrapped = callPackage ./clang {
-    inherit clang-tools-extra_src stdenv;
-  };
+    llvm = overrideManOutput (callPackage ./llvm.nix {
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
+    });
+    clang-unwrapped = overrideManOutput (callPackage ./clang {
+      inherit clang-tools-extra_src;
+    });
 
-  self = {
-    llvm = overrideManOutput llvm;
-    clang-unwrapped = overrideManOutput clang-unwrapped;
+    libclang = tools.clang-unwrapped.lib;
+    llvm-manpages = lowPrio tools.llvm.man;
+    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
-    libclang = self.clang-unwrapped.lib;
-    llvm-manpages = lowPrio self.llvm.man;
-    clang-manpages = lowPrio self.clang-unwrapped.man;
-
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      cc = tools.clang-unwrapped;
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
@@ -73,4 +70,4 @@ let
     openmp = callPackage ./openmp.nix {};
   };
 
-in self
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix
index 1f7619f7a371..21f0f3e8cf30 100644
--- a/pkgs/development/compilers/llvm/5/default.nix
+++ b/pkgs/development/compilers/llvm/5/default.nix
@@ -1,13 +1,11 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-
   release_version = "5.0.1";
   version = release_version; # differentiating these is important for rc's
 
@@ -24,47 +22,46 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  llvm = callPackage ./llvm.nix {
-    inherit compiler-rt_src stdenv;
-  };
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
 
-  clang-unwrapped = callPackage ./clang {
-    inherit clang-tools-extra_src stdenv;
-  };
+    llvm = overrideManOutput (callPackage ./llvm.nix {
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
+    });
+    clang-unwrapped = overrideManOutput (callPackage ./clang {
+      inherit clang-tools-extra_src;
+    });
 
-  self = {
-    llvm = overrideManOutput llvm;
-    clang-unwrapped = overrideManOutput clang-unwrapped;
+    libclang = tools.clang-unwrapped.lib;
+    llvm-manpages = lowPrio tools.llvm.man;
+    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
-    libclang = self.clang-unwrapped.lib;
-    llvm-manpages = lowPrio self.llvm.man;
-    clang-manpages = lowPrio self.clang-unwrapped.man;
-
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      cc = tools.clang-unwrapped;
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
@@ -73,4 +70,4 @@ let
     openmp = callPackage ./openmp.nix {};
   };
 
-in self
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index be26a38e32ec..3a7b66f1ed0e 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -1,13 +1,11 @@
 { lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
 , libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
 , darwin
-, buildLlvmPackages # ourself, but from the previous stage, for cross
-, targetLlvmPackages # ourself, but from the next stage, for cross
+, buildLlvmTools # tools, but from the previous stage, for cross
+, targetLlvmLibraries # libraries, but from the next stage, for cross
 }:
 
 let
-  callPackage = newScope (self // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
-
   release_version = "6.0.0";
   version = release_version; # differentiating these is important for rc's
 
@@ -24,47 +22,46 @@ let
     let drv-manpages = drv.override { enableManpages = true; }; in
     drv // { man = drv-manpages.out; /*outputs = drv.outputs ++ ["man"];*/ };
 
-  llvm = callPackage ./llvm.nix {
-    inherit compiler-rt_src stdenv;
-  };
+  tools = let
+    callPackage = newScope (tools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
 
-  clang-unwrapped = callPackage ./clang {
-    inherit clang-tools-extra_src stdenv;
-  };
+    llvm = overrideManOutput (callPackage ./llvm.nix {
+      inherit compiler-rt_src;
+      inherit (targetLlvmLibraries) libcxxabi;
+    });
+    clang-unwrapped = overrideManOutput (callPackage ./clang {
+      inherit clang-tools-extra_src;
+    });
 
-  self = {
-    llvm = overrideManOutput llvm;
-    clang-unwrapped = overrideManOutput clang-unwrapped;
+    libclang = tools.clang-unwrapped.lib;
+    llvm-manpages = lowPrio tools.llvm.man;
+    clang-manpages = lowPrio tools.clang-unwrapped.man;
 
-    libclang = self.clang-unwrapped.lib;
-    llvm-manpages = lowPrio self.llvm.man;
-    clang-manpages = lowPrio self.clang-unwrapped.man;
-
-    clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
+    clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
     libstdcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
+      cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
     };
 
     libcxxClang = wrapCCWith {
-      cc = self.clang-unwrapped;
-      extraPackages = [ targetLlvmPackages.libcxx targetLlvmPackages.libcxxabi ];
+      cc = tools.clang-unwrapped;
+      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
     };
 
-    stdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = self.clang;
-    });
-
-    libcxxStdenv = stdenv.override (drv: {
-      allowedRequisites = null;
-      cc = buildLlvmPackages.libcxxClang;
-    });
-
     lld = callPackage ./lld.nix {};
 
     lldb = callPackage ./lldb.nix {};
+  };
+
+  libraries = let
+    callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
+  in {
+
+    stdenv = overrideCC stdenv buildLlvmTools.clang;
+
+    libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
 
     libcxx = callPackage ./libc++ {};
 
@@ -73,4 +70,4 @@ let
     openmp = callPackage ./openmp.nix {};
   };
 
-in self
+in { inherit tools libraries; } // libraries // tools
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 889d2040dc09..22f34c2bf06c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6700,51 +6700,51 @@ with pkgs;
   llvmPackages_34 = callPackage ../development/compilers/llvm/3.4 ({
     isl = isl_0_12;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
     isl = isl_0_14;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_37 = callPackage ../development/compilers/llvm/3.7 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_37;
-    targetLlvmPackages = targetPackages.llvmPackages_37;
+    buildLlvmTools = buildPackages.llvmPackages_37.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_37.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_38 = callPackage ../development/compilers/llvm/3.8 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_38;
-    targetLlvmPackages = targetPackages.llvmPackages_38;
+    buildLlvmTools = buildPackages.llvmPackages_38.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_38.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_39 = callPackage ../development/compilers/llvm/3.9 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_39;
-    targetLlvmPackages = targetPackages.llvmPackages_39;
+    buildLlvmTools = buildPackages.llvmPackages_39.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_39.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_4 = callPackage ../development/compilers/llvm/4 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_4;
-    targetLlvmPackages = targetPackages.llvmPackages_4;
+    buildLlvmTools = buildPackages.llvmPackages_4.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_4.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6;
+    stdenv = overrideCC stdenv buildPackages.gcc6;
   });
 
   llvmPackages_5 = callPackage ../development/compilers/llvm/5 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_5;
-    targetLlvmPackages = targetPackages.llvmPackages_5;
+    buildLlvmTools = buildPackages.llvmPackages_5.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_5.libraries;
   } // stdenv.lib.optionalAttrs stdenv.isDarwin {
     cmake = cmake.override {
       isBootstrap = true;
@@ -6753,15 +6753,15 @@ with pkgs;
     libxml2 = libxml2.override { pythonSupport = false; };
     python2 = callPackage ../development/interpreters/python/cpython/2.7/boot.nix { inherit (darwin) CF configd; };
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+    stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
   llvmPackages_6 = callPackage ../development/compilers/llvm/6 ({
     inherit (stdenvAdapters) overrideCC;
-    buildLlvmPackages = buildPackages.llvmPackages_6;
-    targetLlvmPackages = targetPackages.llvmPackages_6;
+    buildLlvmTools = buildPackages.llvmPackages_6.tools;
+    targetLlvmLibraries = targetPackages.llvmPackages_6.libraries;
   } // stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
-    stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+    stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
   manticore = callPackage ../development/compilers/manticore { };

From 3ab9caa3faf7655fe1c4a861799de4da21d20de5 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Wed, 23 May 2018 20:32:15 +0100
Subject: [PATCH 2415/3370] Use requireFile for impure Xcode dependency

---
 .../darwin/ios-sdk-pkgs/default.nix           |  4 +-
 pkgs/os-specific/darwin/xcode/default.nix     | 90 +++++++++----------
 pkgs/top-level/darwin-packages.nix            |  3 +-
 3 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
index f336b14ee37b..ebca738431c3 100644
--- a/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
+++ b/pkgs/os-specific/darwin/ios-sdk-pkgs/default.nix
@@ -6,6 +6,7 @@
 , wrapBintoolsWith
 , wrapCCWith
 , buildIosSdk, targetIosSdkPkgs
+, xcode
 }:
 
 let
@@ -21,11 +22,10 @@ iosPlatformArch = { parsed, ... }: {
 in
 
 rec {
-  # TODO(kmicklas): Make a pure version of this for each supported SDK version.
   sdk = rec {
     name = "ios-sdk";
     type = "derivation";
-    outPath = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk";
+    outPath = xcode + "/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}${version}.sdk";
 
     sdkType = if targetPlatform.isiPhoneSimulator then "Simulator" else "OS";
     version = targetPlatform.sdkVer;
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index d3a9ec012ebf..bed4cd6490d1 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -1,52 +1,48 @@
-{ stdenv, requireFile, xpwn }:
+{ stdenv, requireFile }:
 
-with stdenv.lib;
+let requireXcode = version: sha256:
+  let
+    xip = "Xcode_" + version +  ".xip";
+    # TODO(alexfmpe): Find out how to validate the .xip signature in Linux
+    unxip = if stdenv.isDarwin
+            then ''
+              open -W ${xip}
+              rm -rf ${xip}
+            ''
+            else ''
+              xar -xf ${xip}
+              rm -rf ${xip}
+              pbzx -n Content | cpio -i
+              rm Content Metadata
+            '';
+    app = requireFile rec {
+      name     = "Xcode.app";
+      url      = "https://download.developer.apple.com/Developer_Tools/Xcode_" + version + "/" + xip;
+      hashMode = "recursive";
+      inherit sha256;
+      message  = ''
+        Unfortunately, we cannot download ${name} automatically.
+        Please go to ${url}
+        to download it yourself, and add it to the Nix store by running the following commands."
+        Note: download (~ 5GB), extraction and storing of Xcode will take a while
 
-let
-  osxVersion = "10.9";
-in stdenv.mkDerivation rec {
-  name = "xcode-${version}";
-  version = "5.1";
+        ${unxip}
+        nix-store --add-fixed --recursive sha256 Xcode.app
+        rm -rf Xcode.app
+      '';
+    };
+    meta = with stdenv.lib; {
+      homepage = https://developer.apple.com/downloads/;
+      description = "Apple's XCode SDK";
+      license = licenses.unfree;
+      platforms = platforms.darwin ++ platforms.linux;
+    };
 
-  src = requireFile {
-    name = "xcode_${version}.dmg";
-    url = meta.homepage;
-    sha256 = "70bb550cc14eca80b9825f4ae9bfbf7f076bb75777311be428bc30a7eb7a6f7e";
-  };
+  in app.overrideAttrs ( oldAttrs: oldAttrs // { inherit meta; });
 
-  phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
-  outputs = [ "out" "toolchain" ];
-
-
-  unpackCmd = let
-    basePath = "Xcode.app/Contents/Developer/Platforms/MacOSX.platform";
-    sdkPath = "${basePath}/Developer/SDKs";
-  in ''
-    ${xpwn}/bin/dmg extract "$curSrc" main.hfs > /dev/null
-    ${xpwn}/bin/hfsplus main.hfs extractall "${sdkPath}" > /dev/null
-  '';
-
-  setSourceRoot = "sourceRoot=MacOSX${osxVersion}.sdk";
-
-  patches = optional (osxVersion == "10.9") ./gcc-fix-enum-attributes.patch;
-
-  installPhase = ''
-    mkdir -p "$out/share/sysroot"
-    cp -a * "$out/share/sysroot/"
-    ln -s "$out/share/sysroot/usr/lib" "$out/lib"
-    ln -s "$out/share/sysroot/usr/include" "$out/include"
-
-    mkdir -p "$toolchain"
-    pushd "$toolchain"
-    ${xpwn}/bin/hfsplus "$(dirs +1)/../main.hfs" extractall \
-      Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr \
-      > /dev/null
-    popd
-  '';
-
-  meta = {
-    homepage = https://developer.apple.com/downloads/;
-    description = "Apple's XCode SDK";
-    license = stdenv.lib.licenses.unfree;
-  };
+in {
+  xcode_8_1 = requireXcode "8.1" "18xjvfipwzia66gm3r9p770xdd4r375vak7chw5vgqnv9yyjiq2n";
+  xcode_8_2 = requireXcode "8.2" "13nd1zsfqcp9hwp15hndr0rsbb8rgprrz7zr2ablj4697qca06m2";
+  xcode_9_1 = requireXcode "9.1" "0ab1403wy84ys3yn26fj78cazhpnslmh3nzzp1wxib3mr1afjvic";
+  xcode_9_2 = requireXcode "9.2" "1bgfgdp266cbbqf2axcflz92frzvhi0qw0jdkcw6r85kdpc8dj4c";
 }
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 907ec0c75924..a53b16919ee3 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -47,6 +47,7 @@ in
   iosSdkPkgs = darwin.callPackage ../os-specific/darwin/ios-sdk-pkgs {
     buildIosSdk = buildPackages.darwin.iosSdkPkgs.sdk;
     targetIosSdkPkgs = targetPackages.darwin.iosSdkPkgs;
+    xcode = darwin.xcode_8_2;
     inherit (pkgs.llvmPackages) clang-unwrapped;
   };
 
@@ -68,7 +69,7 @@ in
 
   usr-include = callPackage ../os-specific/darwin/usr-include { };
 
-  xcode = callPackage ../os-specific/darwin/xcode { };
+  inherit (callPackages ../os-specific/darwin/xcode { } ) xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2;
 
   CoreSymbolication = callPackage ../os-specific/darwin/CoreSymbolication { };
 

From 1c14927d692a40ed5dc62ad8b0fe4851026d5ed8 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Wed, 23 May 2018 21:47:19 +0200
Subject: [PATCH 2416/3370] tor: 0.3.2.10 -> 0.3.3.6

First stable release in the 0.3.3.x series
---
 pkgs/tools/security/tor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 44c11d2814af..795925a221c2 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -15,11 +15,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.3.2.10";
+  name = "tor-0.3.3.6";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${name}.tar.gz";
-    sha256 = "1vnb2wkcmm8rnz0fqi3k7arl60mpycs8rjn8hvbgv56g3p1pgpv0";
+    sha256 = "1drk2h8zd05xrfpx7xn77pcxz0hs4nrq6figw56qk5gkvgv5kg4r";
   };
 
   outputs = [ "out" "geoip" ];

From 6f65b7a93642953fe7c545395cc824f0b00b1812 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 23 May 2018 21:51:58 +0200
Subject: [PATCH 2417/3370] pythonPackages.raven: 6.7.0 -> 6.8.0

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

diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index 2052d4421e5e..9ec3f7c156ed 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "raven";
-  version = "6.7.0";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "raven-python";
     rev = version;
-    sha256 = "0vb6zczfgrrh0qw5wlbvk703r11y091k6r53fbbhpbwh4hva30nx";
+    sha256 = "0d052nns0pf1bsazapnnrylvair37vhnjaifsdldddqv05ccfc57";
   };
 
   # way too many dependencies to run tests

From ca2f49d1f0ce38a6d167160628a021635cc5f566 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 23 May 2018 22:01:45 +0200
Subject: [PATCH 2418/3370] gns3Packages.{server,gui}{Stable,Preview}: 2.1.5 ->
 2.1.6

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

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 74287dc6af4e..91bcfc73f2c7 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
 { callPackage, stdenv }:
 
 let
-  stableVersion = "2.1.5";
+  stableVersion = "2.1.6";
   # Currently there is no preview version.
   previewVersion = stableVersion;
   addVersion = args:
@@ -10,8 +10,8 @@ let
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "1d7pwm36bqjm0d021z5qnx49v8zf4yi9jn5hn6zlbiqbz53l1x7l";
-  serverSrcHash = "002pqm4jcm5qbbw1vnhjdrgysh7d6xmdl66605wz1vbp7xn5s961";
+  guiSrcHash = "0wrh0x5ig2x2pxyyf99z4bfiyxn19akyjic5kgf0pv2snifw2481";
+  serverSrcHash = "0jy5700bshz54mdsh5qpcb2qrczg9isxhr4y0bmglrl23pywvisc";
 in {
   guiStable = mkGui {
     stable = true;

From 7d40f48c867339aa95ef89c8718250e20c3c6715 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 23 May 2018 16:20:24 -0500
Subject: [PATCH 2419/3370] kodi.plugins: fix homepage typo

---
 pkgs/applications/video/kodi/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index f263182c6fc1..4d6b18854549 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -353,7 +353,7 @@ rec {
     };
 
     meta = with stdenv.lib; {
-      homepage = https://github.com/omsc/skin.osmc;
+      homepage = https://github.com/osmc/skin.osmc;
       description = "The default skin for OSMC";
       platforms = platforms.all;
       maintainers = with maintainers; [ worldofpeace ];

From 6d31c68e1995c62c1c4ea46214ca45e8361c423d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 23 May 2018 17:45:21 -0400
Subject: [PATCH 2420/3370] linux: 4.9.101 -> 4.9.102

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 15a8d63651d5..e550f4d44f8f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.101";
+  version = "4.9.102";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "005awyjylyp7di8cy269923j7wsvv74s42k7955fq0790wmx15dg";
+    sha256 = "1icx253l8s158d1ccn594ddkqdxch8jr0w6kbj00jn1dlmms6mfi";
   };
 } // (args.argsOverride or {}))

From 8758c001602b564aa5118868a3dc7e162b752832 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 23 May 2018 17:45:38 -0400
Subject: [PATCH 2421/3370] linux: 4.14.42 -> 4.14.43

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index 16d597e1640d..a9e2cd7c5c1e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.42";
+  version = "4.14.43";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "00wh8ydawy6j18as28albzid88cm2aanzr8vz367jjp2k5pi00rb";
+    sha256 = "0jkikvjsrz7wk1zx57brzhhs15gbx022f1as4mn0017az7wc0gqk";
   };
 } // (args.argsOverride or {}))

From 69dad57049ff4cabdd2cf283b81c08a1e0eb149d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 23 May 2018 17:45:58 -0400
Subject: [PATCH 2422/3370] linux: 4.16.10 -> 4.16.11

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 7039c460c5c4..5aebbd6c1e1b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.10";
+  version = "4.16.11";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1gnf16p4rmibcn3wn5zp4pl2zmhgk4dg6718gvdr8vcffd87ksc0";
+    sha256 = "088931hgi5acm8nz19nd09skmamr3hhfb958374j30br6f94pfkd";
   };
 } // (args.argsOverride or {}))

From b656e03aae96dc135296a2336ea3bc056e212762 Mon Sep 17 00:00:00 2001
From: Alvar <geistesk@users.noreply.github.com>
Date: Thu, 24 May 2018 01:08:37 +0200
Subject: [PATCH 2423/3370] pythonPackages.pynmea2: init at 1.12.0 (#40757)

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

diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix
new file mode 100644
index 000000000000..c217e8406e12
--- /dev/null
+++ b/pkgs/development/python-modules/pynmea2/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, pytest }:
+
+buildPythonPackage rec {
+  pname = "pynmea2";
+  version = "1.12.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "185wxn8gag9whxmysspbh8s7wn3sh1glgf508w2zzwi4lklryl7i";
+  };
+
+  checkInputs = [ pytest ];
+  checkPhase = "pytest";
+
+  meta = {
+    homepage = https://github.com/Knio/pynmea2;
+    description = "Python library for the NMEA 0183 protcol";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ geistesk ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9349cc3711ae..6f595f27bffd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11262,6 +11262,8 @@ in {
     inherit (pkgs) fetchurl systemd;
   };
 
+  pynmea2 = callPackage ../development/python-modules/pynmea2 {};
+
   pynzb = buildPythonPackage (rec {
     name = "pynzb-0.1.0";
 

From 16728fa4ee8ded39da1ae2d2437396e406f0cd0e Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 24 May 2018 01:32:20 +0200
Subject: [PATCH 2424/3370] zziplib: gdraheim/zziplib#27 is not an issue
 anymore

fix included in 0.13.69, which was bumped in
3f36f6095fef0b83b9e8f5fc9d0b8ad42dfccaa6.
---
 pkgs/development/libraries/zziplib/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix
index b59cb47eae57..6aede4e9653f 100644
--- a/pkgs/development/libraries/zziplib/default.nix
+++ b/pkgs/development/libraries/zziplib/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
     sed -i -e s,--export-dynamic,, configure
   '';
 
-  # TODO: still an issue: https://github.com/gdraheim/zziplib/issues/27
-
   buildInputs = [ docbook_xml_dtd_412 perl python2 zip xmlto zlib ];
 
   # tests are broken (https://github.com/gdraheim/zziplib/issues/20),

From 6980edf2ba7135a855d12479b25fa4686b5adc25 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 23 May 2018 04:05:39 -0500
Subject: [PATCH 2425/3370] pythonPackages.torchvision: 0.1.9 -> 0.2.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/torchvision/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index ebda3a92fc45..5dace76c9b2c 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -4,10 +4,11 @@
 , numpy
 , pillow
 , pytorch
-, lib }:
+, lib
+}:
 
 buildPythonPackage rec {
-  version = "0.1.9";
+  version = "0.2.1";
   pname   = "torchvision";
   name    = "${pname}-${version}";
 
@@ -16,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     format = "wheel";
-    sha256 = "016rjfh9w1x4xpw15ryxsvq3j2li17nd3a7qslnf3241hc6vdcwf";
+    sha256 = "18gvdabkmzfjg47ns0lw38mf85ry28nq1mas5rzlwvb4l5zmw2ms";
   };
 
   propagatedBuildInputs = [ six numpy pillow pytorch ];

From 094aa7bd9d6fe59df532b9ac12ac97d8791a5705 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 23 May 2018 21:09:54 -0300
Subject: [PATCH 2426/3370] openbox: fix wrapping of openbox-xdg-autostart

---
 .../window-managers/openbox/default.nix       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix
index ead78bf4efd9..8c6926dd2c69 100644
--- a/pkgs/applications/window-managers/openbox/default.nix
+++ b/pkgs/applications/window-managers/openbox/default.nix
@@ -6,22 +6,26 @@ stdenv.mkDerivation rec {
   name = "openbox-${version}";
   version = "3.6.1";
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    libxml2
-    libXinerama libXcursor libXau libXrandr libICE libSM
-    libstartup_notification makeWrapper
+  nativeBuildInputs = [
+    pkgconfig
+    makeWrapper
     python2.pkgs.wrapPython
   ];
 
-  pythonPath = with python2.pkgs; [
-    pyxdg
+  buildInputs = [
+    libxml2
+    libXinerama libXcursor libXau libXrandr libICE libSM
+    libstartup_notification
   ];
 
   propagatedBuildInputs = [
     pango imlib2
   ];
 
+  pythonPath = with python2.pkgs; [
+    pyxdg
+  ];
+
   src = fetchurl {
     url = "http://openbox.org/dist/openbox/${name}.tar.gz";
     sha256 = "1xvyvqxlhy08n61rjkckmrzah2si1i7nmc7s8h07riqq01vc0jlb";
@@ -41,7 +45,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/openbox-session" --prefix XDG_DATA_DIRS : "$out/share"
     wrapProgram "$out/bin/openbox-gnome-session" --prefix XDG_DATA_DIRS : "$out/share"
     wrapProgram "$out/bin/openbox-kde-session" --prefix XDG_DATA_DIRS : "$out/share"
-    wrapPythonPrograms
+    wrapPythonProgramsIn "$out/libexec" "$out $pythonPath"
   '';
 
   meta = {

From 33b8830a85242ad09898a0c90a6f0494c34132ca Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 May 2018 03:42:43 +0200
Subject: [PATCH 2427/3370]  ghc: disable format hardening

---
 pkgs/development/compilers/ghc/8.2.2.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix
index b1bf249149da..6acf3f10ff49 100644
--- a/pkgs/development/compilers/ghc/8.2.2.nix
+++ b/pkgs/development/compilers/ghc/8.2.2.nix
@@ -171,6 +171,8 @@ stdenv.mkDerivation rec {
   checkTarget = "test";
   doCheck = false; # fails with "testsuite/tests: No such file or directory.  Stop."
 
+  hardeningDisable = [ "format" ];
+
   # zsh and other shells are smart about `{ghc}` but bash isn't, and doesn't
   # treat that as a unary `{x,y,z,..}` repetition.
   postInstall = ''

From 7adae10a8632213428d5b6e49d5829974b6a0102 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 20 May 2018 16:46:11 +0300
Subject: [PATCH 2428/3370] nixos/programs/shell.nix: Quote variables

In practice $HOME doesn't contain spaces, but let's stick to best
shell scripting practices anyway.
---
 nixos/modules/programs/shell.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 3504a8a924b0..d2928a0e6b17 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -23,39 +23,39 @@ in
     environment.shellInit =
       ''
         # Set up the per-user profile.
-        mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
-        if test "$(stat --printf '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
+        mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
+        if test "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)"; then
             echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
         fi
 
-        if test -w $HOME; then
-          if ! test -L $HOME/.nix-profile; then
+        if test -w "$HOME"; then
+          if ! test -L "$HOME/.nix-profile"; then
               if test "$USER" != root; then
-                  ln -s $NIX_USER_PROFILE_DIR/profile $HOME/.nix-profile
+                  ln -s "$NIX_USER_PROFILE_DIR/profile" "$HOME/.nix-profile"
               else
                   # Root installs in the system-wide profile by default.
-                  ln -s /nix/var/nix/profiles/default $HOME/.nix-profile
+                  ln -s /nix/var/nix/profiles/default "$HOME/.nix-profile"
               fi
           fi
 
           # Subscribe the root user to the NixOS channel by default.
-          if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
-              echo "${config.system.nixos.defaultChannel} nixos" > $HOME/.nix-channels
+          if [ "$USER" = root -a ! -e "$HOME/.nix-channels" ]; then
+              echo "${config.system.nixos.defaultChannel} nixos" > "$HOME/.nix-channels"
           fi
 
           # Create the per-user garbage collector roots directory.
-          NIX_USER_GCROOTS_DIR=/nix/var/nix/gcroots/per-user/$USER
-          mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
-          if test "$(stat --printf '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
+          NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
+          mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
+          if test "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)"; then
               echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
           fi
 
           # Set up a default Nix expression from which to install stuff.
-          if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
-              rm -f $HOME/.nix-defexpr
-              mkdir -p $HOME/.nix-defexpr
+          if [ ! -e "$HOME/.nix-defexpr" -o -L "$HOME/.nix-defexpr" ]; then
+              rm -f "$HOME/.nix-defexpr"
+              mkdir -p "$HOME/.nix-defexpr"
               if [ "$USER" != root ]; then
-                  ln -s /nix/var/nix/profiles/per-user/root/channels $HOME/.nix-defexpr/channels_root
+                  ln -s /nix/var/nix/profiles/per-user/root/channels "$HOME/.nix-defexpr/channels_root"
               fi
           fi
         fi

From 3cfb492c630ef51967f9c5066a806f318cc2b06b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 20 May 2018 16:48:13 +0300
Subject: [PATCH 2429/3370] nixos/programs/shell.nix: Use [ ] instead of test

Half of the script is using 'test' and other half '[ ]'. Let's stick to
'[ ]' everywhere as it seems more conventional in nixpkgs.
---
 nixos/modules/programs/shell.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index d2928a0e6b17..579631c425cd 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -24,13 +24,13 @@ in
       ''
         # Set up the per-user profile.
         mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
-        if test "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)"; then
+        if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then
             echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
         fi
 
-        if test -w "$HOME"; then
-          if ! test -L "$HOME/.nix-profile"; then
-              if test "$USER" != root; then
+        if [ -w "$HOME" ]; then
+          if ! [ -L "$HOME/.nix-profile" ]; then
+              if [ "$USER" != root ]; then
                   ln -s "$NIX_USER_PROFILE_DIR/profile" "$HOME/.nix-profile"
               else
                   # Root installs in the system-wide profile by default.
@@ -46,7 +46,7 @@ in
           # Create the per-user garbage collector roots directory.
           NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
           mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
-          if test "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)"; then
+          if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then
               echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
           fi
 

From 6f1f11af4c382c73667e522b47045beab939812b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 20 May 2018 16:48:32 +0300
Subject: [PATCH 2430/3370] nixos/programs/shell.nix: Enhance bad ownership
 error message

Steal this from scripts/nix-profile.sh.in in Nix to keep things more
consistent.
---
 nixos/modules/programs/shell.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/shell.nix b/nixos/modules/programs/shell.nix
index 579631c425cd..56fe347528bd 100644
--- a/nixos/modules/programs/shell.nix
+++ b/nixos/modules/programs/shell.nix
@@ -25,7 +25,7 @@ in
         # Set up the per-user profile.
         mkdir -m 0755 -p "$NIX_USER_PROFILE_DIR"
         if [ "$(stat --printf '%u' "$NIX_USER_PROFILE_DIR")" != "$(id -u)" ]; then
-            echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
+            echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR, should be $(id -u)" >&2
         fi
 
         if [ -w "$HOME" ]; then
@@ -47,7 +47,7 @@ in
           NIX_USER_GCROOTS_DIR="/nix/var/nix/gcroots/per-user/$USER"
           mkdir -m 0755 -p "$NIX_USER_GCROOTS_DIR"
           if [ "$(stat --printf '%u' "$NIX_USER_GCROOTS_DIR")" != "$(id -u)" ]; then
-              echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
+              echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR, should be $(id -u)" >&2
           fi
 
           # Set up a default Nix expression from which to install stuff.

From e91d3c91798b8e2e5746185650418bc328536dd3 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 19 Apr 2018 12:23:00 +0200
Subject: [PATCH 2431/3370] nixos/oxidized: add module

---
 nixos/modules/module-list.nix             |   1 +
 nixos/modules/services/admin/oxidized.nix | 116 ++++++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 nixos/modules/services/admin/oxidized.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d5cfd87520c5..65b4cfd7e0b5 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -150,6 +150,7 @@
   ./security/rtkit.nix
   ./security/wrappers/default.nix
   ./security/sudo.nix
+  ./services/admin/oxidized.nix
   ./services/admin/salt/master.nix
   ./services/admin/salt/minion.nix
   ./services/amqp/activemq/default.nix
diff --git a/nixos/modules/services/admin/oxidized.nix b/nixos/modules/services/admin/oxidized.nix
new file mode 100644
index 000000000000..891ca6323c3c
--- /dev/null
+++ b/nixos/modules/services/admin/oxidized.nix
@@ -0,0 +1,116 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.oxidized;
+in
+{
+  options.services.oxidized = {
+    enable = mkEnableOption "the oxidized configuation backup service.";
+
+    user = mkOption {
+      type = types.str;
+      default = "oxidized";
+      description = ''
+        User under which the oxidized service runs.
+      '';
+    };
+
+    group = mkOption {
+      type = types.str;
+      default = "oxidized";
+      description = ''
+        Group under which the oxidized service runs.
+      '';
+    };
+
+    dataDir = mkOption {
+      type = types.path;
+      default = "/var/lib/oxidized";
+      description = "State directory for the oxidized service.";
+    };
+
+    configFile = mkOption {
+      type = types.path;
+      example = literalExample ''
+        pkgs.writeText "oxidized-config.yml" '''
+          ---
+          debug: true
+          use_syslog: true
+          input:
+            default: ssh
+            ssh:
+              secure: true
+          interval: 3600
+          model_map:
+            dell: powerconnect
+            hp: procurve
+          source:
+            default: csv
+            csv:
+              delimiter: !ruby/regexp /:/
+              file: "/var/lib/oxidized/.config/oxidized/router.db"
+              map:
+                name: 0
+                model: 1
+                username: 2
+                password: 3
+          pid: "/var/lib/oxidized/.config/oxidized/pid"
+          rest: 127.0.0.1:8888
+          retries: 3
+          # ... additional config
+        ''';
+      '';
+      description = ''
+        Path to the oxidized configuration file.
+      '';
+    };
+
+    routerDB = mkOption {
+      type = types.path;
+      example = literalExample ''
+        pkgs.writeText "oxidized-router.db" '''
+          hostname-sw1:powerconnect:username1:password2
+          hostname-sw2:procurve:username2:password2
+          # ... additional hosts
+        '''
+      '';
+      description = ''
+        Path to the file/database which contains the targets for oxidized.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraGroups.${cfg.group} = { };
+    users.extraUsers.${cfg.user} = {
+      description = "Oxidized service user";
+      group = cfg.group;
+      home = cfg.dataDir;
+      createHome = true;
+    };
+
+    systemd.services.oxidized = {
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      preStart = ''
+        mkdir -p ${cfg.dataDir}/.config/oxidized
+        cp -v ${cfg.routerDB} ${cfg.dataDir}/.config/oxidized/router.db
+        cp -v ${cfg.configFile} ${cfg.dataDir}/.config/oxidized/config
+      '';
+
+      serviceConfig = {
+        ExecStart = "${pkgs.oxidized}/bin/oxidized";
+        User = cfg.user;
+        Group = cfg.group;
+        UMask = "0077";
+        NoNewPrivileges = true;
+        Restart  = "always";
+        WorkingDirectory = cfg.dataDir;
+        KillSignal = "SIGKILL";
+      };
+    };
+  };
+}

From dc433b476eb72db89c990676e8f64e21b91c1807 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 19 Apr 2018 12:18:49 +0200
Subject: [PATCH 2432/3370] oxidized: init at 0.21.0

---
 .../ruby-modules/gem-config/default.nix       |   7 +
 pkgs/tools/admin/oxidized/Gemfile             |   5 +
 pkgs/tools/admin/oxidized/Gemfile.lock        |  69 ++++++
 pkgs/tools/admin/oxidized/default.nix         |  18 ++
 pkgs/tools/admin/oxidized/gemset.nix          | 206 ++++++++++++++++++
 .../admin/oxidized/temporary-x-series.patch   |  13 ++
 pkgs/top-level/all-packages.nix               |   2 +
 7 files changed, 320 insertions(+)
 create mode 100644 pkgs/tools/admin/oxidized/Gemfile
 create mode 100644 pkgs/tools/admin/oxidized/Gemfile.lock
 create mode 100644 pkgs/tools/admin/oxidized/default.nix
 create mode 100644 pkgs/tools/admin/oxidized/gemset.nix
 create mode 100644 pkgs/tools/admin/oxidized/temporary-x-series.patch

diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 83ab5e0d86ff..60697e72d724 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -208,6 +208,13 @@ in
     ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
   };
 
+  oxidized = attrs: {
+    postInstall = ''
+      cd "$(cat "$out/nix-support/gem-meta/install-path")"
+      patch -p1 < ${../../../tools/admin/oxidized/temporary-x-series.patch}
+    '';
+  };
+
   pango = attrs: {
   nativeBuildInputs = [ pkgconfig ];
     buildInputs = [ gtk2 xorg.libXdmcp pcre xorg.libpthreadstubs ];
diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile
new file mode 100644
index 000000000000..6a9a4254b11b
--- /dev/null
+++ b/pkgs/tools/admin/oxidized/Gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'oxidized'
+gem 'oxidized-web'
+gem 'oxidized-script'
diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock
new file mode 100644
index 000000000000..1570adbcf089
--- /dev/null
+++ b/pkgs/tools/admin/oxidized/Gemfile.lock
@@ -0,0 +1,69 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    asetus (0.3.0)
+    backports (3.11.2)
+    emk-sinatra-url-for (0.2.1)
+      sinatra (>= 0.9.1.1)
+    ffi (1.9.23)
+    haml (4.0.7)
+      tilt
+    htmlentities (4.3.4)
+    multi_json (1.13.1)
+    net-ssh (4.1.0)
+    oxidized (0.21.0)
+      asetus (~> 0.1)
+      net-ssh (~> 4.1.0)
+      rugged (~> 0.21, >= 0.21.4)
+      slop (~> 3.5)
+    oxidized-script (0.5.0)
+      oxidized (~> 0.21.0)
+      slop (~> 3.5)
+    oxidized-web (0.9.3)
+      emk-sinatra-url-for (~> 0.2)
+      haml (~> 4.0)
+      htmlentities (~> 4.3)
+      oxidized (~> 0.21.0)
+      puma (~> 3)
+      sass (~> 3.3)
+      sinatra (~> 1.4, >= 1.4.6)
+      sinatra-contrib (~> 1.4, >= 1.4.6)
+    puma (3.11.3)
+    rack (1.6.9)
+    rack-protection (1.5.5)
+      rack
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rugged (0.27.0)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sinatra-contrib (1.4.7)
+      backports (>= 2.0)
+      multi_json
+      rack-protection
+      rack-test
+      sinatra (~> 1.4.0)
+      tilt (>= 1.3, < 3)
+    slop (3.6.0)
+    tilt (2.0.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  oxidized
+  oxidized-script
+  oxidized-web
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix
new file mode 100644
index 000000000000..590f6ea55ca7
--- /dev/null
+++ b/pkgs/tools/admin/oxidized/default.nix
@@ -0,0 +1,18 @@
+{ lib, fetchFromGitHub, ruby, git, bundlerApp }:
+
+bundlerApp rec {
+  pname = "oxidized";
+  gemdir = ./.;
+
+  inherit ruby;
+
+  exes = [ "oxidized" "oxidized-web" "oxidized-script" ];
+
+  meta = with lib; {
+    description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!";
+    homepage    = https://github.com/ytti/oxidized;
+    license     = licenses.asl20;
+    maintainers = [ maintainers.willibutz ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix
new file mode 100644
index 000000000000..f472b14e7967
--- /dev/null
+++ b/pkgs/tools/admin/oxidized/gemset.nix
@@ -0,0 +1,206 @@
+{
+  asetus = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  backports = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sw58rsz1hl821ia1jj3nnl3jr7xwfkcljgs56kpq3fakzcljcdz";
+      type = "gem";
+    };
+    version = "3.11.2";
+  };
+  emk-sinatra-url-for = {
+    dependencies = ["sinatra"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+      type = "gem";
+    };
+    version = "1.9.23";
+  };
+  haml = {
+    dependencies = ["tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
+      type = "gem";
+    };
+    version = "4.0.7";
+  };
+  htmlentities = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
+      type = "gem";
+    };
+    version = "4.3.4";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
+      type = "gem";
+    };
+    version = "1.13.1";
+  };
+  net-ssh = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  oxidized = {
+    dependencies = ["asetus" "net-ssh" "rugged" "slop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xqx0iawj2cm6083a61y43d6a76xaypiw0nkyirx02lhynq07yz0";
+      type = "gem";
+    };
+    version = "0.21.0";
+  };
+  oxidized-script = {
+    dependencies = ["oxidized" "slop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12c15gksrrar9kradcv6mx2d4a8ixa4lykszb4pcapiw5mi35mxp";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  oxidized-web = {
+    dependencies = ["emk-sinatra-url-for" "haml" "htmlentities" "oxidized" "puma" "sass" "sinatra" "sinatra-contrib"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14s10pr8qaq6g19zi753igngp02li46k3nm5ap537r3743v1l4f9";
+      type = "gem";
+    };
+    version = "0.9.3";
+  };
+  puma = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03313mnx8n6g9qs9l5zafqq90grrhq2nqrmjs8lsffi28mgd3cfd";
+      type = "gem";
+    };
+    version = "3.11.3";
+  };
+  rack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03w1ri5l91q800f1bdcdl5rbagy7s4kml136b42s2lmxmznxhr07";
+      type = "gem";
+    };
+    version = "1.6.9";
+  };
+  rack-protection = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss";
+      type = "gem";
+    };
+    version = "1.5.5";
+  };
+  rack-test = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1l799s5qr2qrshvrggq5ch3v235y491zfww07b39w4pj4vpa65l1";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  rb-fsevent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
+      type = "gem";
+    };
+    version = "0.10.3";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
+      type = "gem";
+    };
+    version = "0.9.10";
+  };
+  rugged = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3";
+      type = "gem";
+    };
+    version = "0.27.0";
+  };
+  sass = {
+    dependencies = ["sass-listen"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
+      type = "gem";
+    };
+    version = "3.5.6";
+  };
+  sass-listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  sinatra = {
+    dependencies = ["rack" "rack-protection" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq";
+      type = "gem";
+    };
+    version = "1.4.8";
+  };
+  sinatra-contrib = {
+    dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr";
+      type = "gem";
+    };
+    version = "1.4.7";
+  };
+  slop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  tilt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
+      type = "gem";
+    };
+    version = "2.0.8";
+  };
+}
diff --git a/pkgs/tools/admin/oxidized/temporary-x-series.patch b/pkgs/tools/admin/oxidized/temporary-x-series.patch
new file mode 100644
index 000000000000..ef6234dc40b9
--- /dev/null
+++ b/pkgs/tools/admin/oxidized/temporary-x-series.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
+index f602a36..3f3a0f9 100644
+--- a/lib/oxidized/model/powerconnect.rb
++++ b/lib/oxidized/model/powerconnect.rb
+@@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model
+ 
+   comment  '! '
+ 
+-  expect /^\s*--More--\s+.*$/ do |data, re|
++  expect /^([[:cntrl:]]...More:|\s*--More--\s+).*$/ do |data, re|
+      send ' '
+      data.sub re, ''
+   end
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0778f73d4eef..84311e2559e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4231,6 +4231,8 @@ with pkgs;
 
   owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { };
 
+  oxidized = callPackage ../tools/admin/oxidized { };
+
   oxipng = callPackage ../tools/graphics/oxipng { };
 
   p2pvc = callPackage ../applications/video/p2pvc {};

From 400484008c4e95eac3244d7fb8fb24f25be14df9 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Thu, 26 Apr 2018 19:13:35 +0200
Subject: [PATCH 2433/3370] oxidized: temperature patch for x-series

---
 pkgs/tools/admin/oxidized/temporary-x-series.patch | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/oxidized/temporary-x-series.patch b/pkgs/tools/admin/oxidized/temporary-x-series.patch
index ef6234dc40b9..bf7ee992db18 100644
--- a/pkgs/tools/admin/oxidized/temporary-x-series.patch
+++ b/pkgs/tools/admin/oxidized/temporary-x-series.patch
@@ -1,5 +1,5 @@
 diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
-index f602a36..3f3a0f9 100644
+index f602a36..3bac2d1 100644
 --- a/lib/oxidized/model/powerconnect.rb
 +++ b/lib/oxidized/model/powerconnect.rb
 @@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model
@@ -11,3 +11,12 @@ index f602a36..3f3a0f9 100644
       send ' '
       data.sub re, ''
    end
+@@ -60,7 +60,7 @@ class PowerConnect < Oxidized::Model
+     skip_blocks = 0
+     cfg.each_line do |line|
+       # If this is a stackable switch we should skip this block of information
+-      if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true)
++      if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i)
+         skip_blocks = 1
+         # Some switches have another empty line. This is identified by this line having a colon
+         skip_blocks = 2 if line.match /:/

From 1433ec60afd44fa4daa0805e0d9f689997392848 Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Thu, 3 May 2018 16:18:56 +0200
Subject: [PATCH 2434/3370] nixos/borgbackup: let borg write to disk and see
 /tmp, add extraArgs

---
 nixos/modules/services/backup/borgbackup.nix | 48 +++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 1b730e0c2b76..1e019827dfea 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -35,25 +35,26 @@ let
     ${cfg.preHook}
   '' + optionalString cfg.doInit ''
     # Run borg init if the repo doesn't exist yet
-    if ! borg list > /dev/null; then
-      borg init \
+    if ! borg list ${cfg.extraArgs} > /dev/null; then
+      borg init ${cfg.extraArgs} \
         --encryption ${cfg.encryption.mode} \
         $extraInitArgs
       ${cfg.postInit}
     fi
   '' + ''
-    borg create \
+    borg create ${cfg.extraArgs} \
       --compression ${cfg.compression} \
       --exclude-from ${mkExcludeFile cfg} \
       $extraCreateArgs \
       "::$archiveName$archiveSuffix" \
       ${escapeShellArgs cfg.paths}
   '' + optionalString cfg.appendFailedSuffix ''
-    borg rename "::$archiveName$archiveSuffix" "$archiveName"
+    borg rename ${cfg.extraArgs} \
+      "::$archiveName$archiveSuffix" "$archiveName"
   '' + ''
     ${cfg.postCreate}
   '' + optionalString (cfg.prune.keep != { }) ''
-    borg prune \
+    borg prune ${cfg.extraArgs} \
       ${mkKeepArgs cfg} \
       --prefix ${escapeShellArg cfg.prune.prefix} \
       $extraPruneArgs
@@ -85,9 +86,10 @@ let
         ProtectSystem = "strict";
         ReadWritePaths =
           [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ]
+          ++ cfg.readWritePaths
           # Borg needs write access to repo if it is not remote
           ++ optional (isLocalPath cfg.repo) cfg.repo;
-        PrivateTmp = true;
+        PrivateTmp = cfg.privateTmp;
       };
       environment = {
         BORG_REPO = cfg.repo;
@@ -318,6 +320,30 @@ in {
             ];
           };
 
+          readWritePaths = mkOption {
+            type = with types; listOf path;
+            description = ''
+              By default, borg cannot write anywhere on the system but
+              <literal>$HOME/.config/borg</literal> and <literal>$HOME/.cache/borg</literal>.
+              If, for example, your preHook script needs to dump files
+              somewhere, put those directories here.
+            '';
+            default = [ ];
+            example = [
+              "/var/backup/mysqldump"
+            ];
+          };
+
+          privateTmp = mkOption {
+            type = types.bool;
+            description = ''
+              Set the <literal>PrivateTmp</literal> option for
+              the systemd-service. Set to false if you need sockets
+              or other files from global /tmp.
+            '';
+            default = true;
+          };
+
           doInit = mkOption {
             type = types.bool;
             description = ''
@@ -430,6 +456,16 @@ in {
             default = "";
           };
 
+          extraArgs = mkOption {
+            type = types.str;
+            description = ''
+              Additional arguments for all <command>borg</command> calls the
+              service has. Handle with care.
+            '';
+            default = "";
+            example = "--remote-path=borg1";
+          };
+
           extraInitArgs = mkOption {
             type = types.str;
             description = ''

From abf36cfaed57111ff9b5fe997c468c90e8fb31f7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 23 May 2018 19:49:42 +0200
Subject: [PATCH 2435/3370] atlassian-jira: 7.9.0 -> 7.9.2

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

diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix
index fd34c1f43859..01eb808c1082 100644
--- a/pkgs/servers/atlassian/jira.nix
+++ b/pkgs/servers/atlassian/jira.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-jira-${version}";
-  version = "7.9.0";
+  version = "7.9.2";
 
   src = fetchurl {
     url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
-    sha256 = "1xj04a78dhjzb2ms875lfg5s3qc8rw31fws92yhmbs0k1866g33b";
+    sha256 = "05976h6033v2w7d05qnigxmsrm33bg7gmgyzpvis8910fkxrhvhh";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From 6d941dfd85dc35e44547e0d59a5c7420eb8fdae7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 23 May 2018 22:22:32 +0200
Subject: [PATCH 2436/3370] gitaly: 0.95.0 -> 0.100.0

---
 .../version-management/gitaly/Gemfile         |  8 +--
 .../version-management/gitaly/Gemfile.lock    | 40 ++++++-------
 .../version-management/gitaly/default.nix     |  4 +-
 .../version-management/gitaly/gemset.nix      | 56 +++++++++----------
 4 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitaly/Gemfile
index b300f27918c5..fd8e6b40225b 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile
+++ b/pkgs/applications/version-management/gitaly/Gemfile
@@ -3,17 +3,17 @@ source 'https://rubygems.org'
 gem 'rugged', '~> 0.27.0'
 gem 'github-linguist', '~> 5.3.3', require: 'linguist'
 gem 'gitlab-markup', '~> 1.6.2'
-gem 'gitaly-proto', '~> 0.95.0', require: 'gitaly'
+gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly'
 gem 'activesupport', '~> 5.0.2'
 gem 'rdoc', '~> 4.2'
-gem 'gollum-lib', '~> 4.2', require: false
-gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
+gem 'gitlab-gollum-lib', '~> 4.2', require: false
+gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
 gem 'grpc', '~> 1.10.0'
 gem 'sentry-raven', '~> 2.7.2', require: false
 
 # Detects the open source license the repository includes
 # This version needs to be in sync with GitLab CE/EE
-gem 'licensee', '~> 8.7.0'
+gem 'licensee', '~> 8.9.0'
 
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
 gem 'google-protobuf', '= 3.5.1'
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitaly/Gemfile.lock
index 2687952c805b..fb63553221dc 100644
--- a/pkgs/applications/version-management/gitaly/Gemfile.lock
+++ b/pkgs/applications/version-management/gitaly/Gemfile.lock
@@ -17,7 +17,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     gemojione (3.3.0)
       json
-    gitaly-proto (0.95.0)
+    gitaly-proto (0.99.0)
       google-protobuf (~> 3.1)
       grpc (~> 1.10)
     github-linguist (5.3.3)
@@ -25,7 +25,18 @@ GEM
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
       rugged (>= 0.25.1)
-    github-markup (1.6.1)
+    github-markup (1.7.0)
+    gitlab-gollum-lib (4.2.7.1)
+      gemojione (~> 3.2)
+      github-markup (~> 1.6)
+      gollum-grit_adapter (~> 1.0)
+      nokogiri (>= 1.6.1, < 2.0)
+      rouge (~> 2.1)
+      sanitize (~> 2.1)
+      stringex (~> 2.6)
+    gitlab-gollum-rugged_adapter (0.4.4)
+      mime-types (>= 1.15)
+      rugged (~> 0.25)
     gitlab-grit (2.8.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
@@ -38,17 +49,6 @@ GEM
       rubocop-rspec (~> 1.15)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.2.7)
-      gemojione (~> 3.2)
-      github-markup (~> 1.6)
-      gollum-grit_adapter (~> 1.0)
-      nokogiri (>= 1.6.1, < 2.0)
-      rouge (~> 2.1)
-      sanitize (~> 2.1)
-      stringex (~> 2.6)
-    gollum-rugged_adapter (0.4.4)
-      mime-types (>= 1.15)
-      rugged (~> 0.25)
     google-protobuf (3.5.1)
     googleapis-common-protos-types (1.0.1)
       google-protobuf (~> 3.0)
@@ -67,7 +67,7 @@ GEM
     i18n (0.8.1)
     json (2.1.0)
     jwt (2.1.0)
-    licensee (8.7.0)
+    licensee (8.9.2)
       rugged (~> 0.24)
     little-plugger (1.1.4)
     logging (2.2.2)
@@ -81,7 +81,7 @@ GEM
     minitest (5.9.1)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.8.1)
+    nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     os (0.9.6)
     parallel (1.12.0)
@@ -130,7 +130,7 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    stringex (2.7.1)
+    stringex (2.8.4)
     thread_safe (0.3.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -141,15 +141,15 @@ PLATFORMS
 
 DEPENDENCIES
   activesupport (~> 5.0.2)
-  gitaly-proto (~> 0.95.0)
+  gitaly-proto (~> 0.99.0)
   github-linguist (~> 5.3.3)
+  gitlab-gollum-lib (~> 4.2)
+  gitlab-gollum-rugged_adapter (~> 0.4.4)
   gitlab-markup (~> 1.6.2)
   gitlab-styles (~> 2.0.0)
-  gollum-lib (~> 4.2)
-  gollum-rugged_adapter (~> 0.4.4)
   google-protobuf (= 3.5.1)
   grpc (~> 1.10.0)
-  licensee (~> 8.7.0)
+  licensee (~> 8.9.0)
   rdoc (~> 4.2)
   rspec
   rugged (~> 0.27.0)
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitaly/default.nix
index 32884d0a1cc5..375e7ad001d1 100644
--- a/pkgs/applications/version-management/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitaly/default.nix
@@ -7,14 +7,14 @@ let
     gemdir = ./.;
   };
 in buildGoPackage rec {
-  version = "0.95.0";
+  version = "0.100.0";
   name = "gitaly-${version}";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "0kadld8372vj0nm692mcn8j4ngph5gzzrzp8dmb4g26h10nq9k6a";
+    sha256 = "0lnyk3abk1jxhii4cx009w11fm082c3va0nnnnycghrmfkv2r1rs";
   };
 
   goPackagePath = "gitlab.com/gitlab-org/gitaly";
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitaly/gemset.nix
index 9e6f01e3679d..bd192d0b2e43 100644
--- a/pkgs/applications/version-management/gitaly/gemset.nix
+++ b/pkgs/applications/version-management/gitaly/gemset.nix
@@ -79,10 +79,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0xwgi3902c89kx0fa176wz289nh67qm9bmx0yykrg5xx1lwk8a2j";
+      sha256 = "1y5sn60h71ssxmc8br32fqhgmfqxgrmdlg4vya8dyy37ai20f85z";
       type = "gem";
     };
-    version = "0.95.0";
+    version = "0.99.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -96,10 +96,28 @@
   github-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
+      sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.7.0";
+  };
+  gitlab-gollum-lib = {
+    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lk5ly17a40xjz8b7l05b4hkrlnq8vawjy4szxl5w0hkaa24m97s";
+      type = "gem";
+    };
+    version = "4.2.7.1";
+  };
+  gitlab-gollum-rugged_adapter = {
+    dependencies = ["mime-types" "rugged"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zk89c2ljv9skcxzwnr84rqxv3iam30n5liv5r8hgl0l67qbg1mg";
+      type = "gem";
+    };
+    version = "0.4.4";
   };
   gitlab-grit = {
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
@@ -136,24 +154,6 @@
     };
     version = "1.0.1";
   };
-  gollum-lib = {
-    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
-      type = "gem";
-    };
-    version = "4.2.7";
-  };
-  gollum-rugged_adapter = {
-    dependencies = ["mime-types" "rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0khfmakp65frlaj7ajs6ihqg4xi7yc9z96kpsf1b7giqi3fqhhv4";
-      type = "gem";
-    };
-    version = "0.4.4";
-  };
   google-protobuf = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -217,10 +217,10 @@
     dependencies = ["rugged"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nhj0vx30llqyb7q52bwmrgy9xpjk3q48k98h0dvq83ym4v216a2";
+      sha256 = "0w6d2smhg3kzcx4m2ii06akakypwhiglansk51bpx290hhc8h3pc";
       type = "gem";
     };
-    version = "8.7.0";
+    version = "8.9.2";
   };
   little-plugger = {
     source = {
@@ -300,10 +300,10 @@
     dependencies = ["mini_portile2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "105xh2zkr8nsyfaj2izaisarpnkrrl9000y3nyflg9cbzrfxv021";
+      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
       type = "gem";
     };
-    version = "1.8.1";
+    version = "1.8.2";
   };
   os = {
     source = {
@@ -504,10 +504,10 @@
   stringex = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
+      sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.8.4";
   };
   thread_safe = {
     source = {

From 9a54f2a9b3743df1a184a6f0f518fb23e7a01505 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 23 May 2018 22:23:10 +0200
Subject: [PATCH 2437/3370] gitlab-workhorse: 4.1.0 -> 4.2.0

---
 .../version-management/gitlab-workhorse/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
index 05cf33d408a5..723d2faeb267 100644
--- a/pkgs/applications/version-management/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitLab, git, go }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.0";
+  version = "4.2.0";
   name = "gitlab-workhorse-${version}";
 
   srcs = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-workhorse";
     rev = "v${version}";
-    sha256 = "1yqmkpszcan5cawkl9cxjngcyqlqg061ihk31isar9ifbhpv9yfv";
+    sha256 = "11n43mfp7a59iq8k7sh9bnww3bq56ml2p6752csclg77xii6dzyy";
   };
 
   buildInputs = [ git go ];

From f21ac1bf693ebbd5d630407cbcb398a72c1c132a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 23 May 2018 22:23:48 +0200
Subject: [PATCH 2438/3370] gitlab: 10.7.0 -> 10.8.0

---
 .../version-management/gitlab/Gemfile         |  31 ++--
 .../version-management/gitlab/Gemfile.lock    | 105 +++++++------
 .../version-management/gitlab/default.nix     |   6 +-
 .../version-management/gitlab/gemset.nix      | 138 ++++++++----------
 4 files changed, 131 insertions(+), 149 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index d85ee9886443..89febc9bc0c2 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -33,7 +33,7 @@ gem 'grape-route-helpers', '~> 2.1.0'
 gem 'faraday', '~> 0.12'
 
 # Authentication libraries
-gem 'devise', '~> 4.2'
+gem 'devise', '~> 4.4'
 gem 'doorkeeper', '~> 4.3'
 gem 'doorkeeper-openid_connect', '~> 1.3'
 gem 'omniauth', '~> 1.8'
@@ -41,7 +41,7 @@ gem 'omniauth-auth0', '~> 2.0.0'
 gem 'omniauth-azure-oauth2', '~> 0.0.9'
 gem 'omniauth-cas3', '~> 1.1.4'
 gem 'omniauth-facebook', '~> 4.0.0'
-gem 'omniauth-github', '~> 1.1.1'
+gem 'omniauth-github', '~> 1.3'
 gem 'omniauth-gitlab', '~> 1.0.2'
 gem 'omniauth-google-oauth2', '~> 0.5.3'
 gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
@@ -51,7 +51,6 @@ gem 'omniauth-shibboleth', '~> 1.2.0'
 gem 'omniauth-twitter', '~> 1.4'
 gem 'omniauth_crowd', '~> 2.2.0'
 gem 'omniauth-authentiq', '~> 0.3.1'
-gem 'omniauth-jwt', '~> 0.0.2'
 gem 'rack-oauth2', '~> 1.2.1'
 gem 'jwt', '~> 1.5.6'
 
@@ -62,7 +61,7 @@ gem 'akismet', '~> 2.0'
 # Two-factor authentication
 gem 'devise-two-factor', '~> 3.0.0'
 gem 'rqrcode-rails3', '~> 0.1.7'
-gem 'attr_encrypted', '~> 3.0.0'
+gem 'attr_encrypted', '~> 3.1.0'
 gem 'u2f', '~> 0.2.1'
 
 # GitLab Pages
@@ -82,23 +81,16 @@ gem 'net-ldap'
 
 # Git Wiki
 # Required manually in config/initializers/gollum.rb to control load order
-# Before updating this gem, check if
-# https://github.com/gollum/gollum-lib/pull/292 has been merged.
-# If it has, then remove the monkey patch for update_page, rename_page and raw_data_in_committer
-# in config/initializers/gollum.rb
-gem 'gollum-lib', '~> 4.2', require: false
+gem 'gitlab-gollum-lib', '~> 4.2', require: false
 
-# Before updating this gem, check if
-# https://github.com/gollum/rugged_adapter/pull/28 has been merged.
-# If it has, then remove the monkey patch for tree_entry in config/initializers/gollum.rb
-gem 'gollum-rugged_adapter', '~> 0.4.4', require: false
+gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4', require: false
 
 # Language detection
 gem 'github-linguist', '~> 5.3.3', require: 'linguist'
 
 # API
 gem 'grape', '~> 1.0'
-gem 'grape-entity', '~> 0.6.0'
+gem 'grape-entity', '~> 0.7.1'
 gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
 
 # Disable strong_params so that Mash does not respond to :permitted?
@@ -147,7 +139,7 @@ gem 'creole', '~> 0.5.0'
 gem 'wikicloth', '0.8.1'
 gem 'asciidoctor', '~> 1.5.6'
 gem 'asciidoctor-plantuml', '0.0.8'
-gem 'rouge', '~> 2.0'
+gem 'rouge', '~> 3.1'
 gem 'truncato', '~> 0.7.9'
 gem 'bootstrap_form', '~> 2.7.0'
 gem 'nokogiri', '~> 1.8.2'
@@ -192,6 +184,9 @@ gem 're2', '~> 1.1.1'
 
 gem 'version_sorter', '~> 2.1.0'
 
+# User agent parsing
+gem 'device_detector'
+
 # Cache
 gem 'redis-rails', '~> 5.0.2'
 
@@ -290,7 +285,6 @@ gem 'batch-loader', '~> 1.2.1'
 gem 'peek', '~> 1.0.1'
 gem 'peek-gc', '~> 0.0.2'
 gem 'peek-mysql2', '~> 1.1.0', group: :mysql
-gem 'peek-performance_bar', '~> 1.3.0'
 gem 'peek-pg', '~> 1.3.0', group: :postgres
 gem 'peek-rblineprof', '~> 0.2.0'
 gem 'peek-redis', '~> 1.2.0'
@@ -384,6 +378,7 @@ group :test do
   gem 'email_spec', '~> 1.6.0'
   gem 'json-schema', '~> 2.8.0'
   gem 'webmock', '~> 2.3.2'
+  gem 'rails-controller-testing' if rails5? # Rails5 only gem.
   gem 'test_after_commit', '~> 1.1' unless rails5? # Remove this gem when migrated to rails 5.0. It's been integrated to rails 5.0.
   gem 'sham_rack', '~> 1.3.6'
   gem 'concurrent-ruby', '~> 1.0.5'
@@ -421,8 +416,8 @@ group :ed25519 do
 end
 
 # Gitaly GRPC client
-gem 'gitaly-proto', '~> 0.94.0', require: 'gitaly'
-gem 'grpc', '~> 1.10.0'
+gem 'gitaly-proto', '~> 0.99.0', require: 'gitaly'
+gem 'grpc', '~> 1.11.0'
 
 # Locked until https://github.com/google/protobuf/issues/4210 is closed
 gem 'google-protobuf', '= 3.5.1'
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index a1150dfccdd2..2a63ee6a5328 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -66,7 +66,7 @@ GEM
       unf
     ast (2.4.0)
     atomic (1.1.99)
-    attr_encrypted (3.0.3)
+    attr_encrypted (3.1.0)
       encryptor (~> 3.0.0)
     attr_required (1.0.0)
     autoprefixer-rails (6.2.3)
@@ -143,7 +143,7 @@ GEM
     connection_pool (2.2.1)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
+    crass (1.0.4)
     creole (0.5.0)
     css_parser (1.5.0)
       addressable
@@ -161,10 +161,11 @@ GEM
       activerecord (>= 3.2.0, < 5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.2.0)
+    device_detector (1.0.0)
+    devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.1)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     devise-two-factor (3.0.0)
@@ -178,7 +179,7 @@ GEM
     docile (1.1.5)
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (4.3.1)
+    doorkeeper (4.3.2)
       railties (>= 4.2)
     doorkeeper-openid_connect (1.3.0)
       doorkeeper (~> 4.3)
@@ -206,7 +207,7 @@ GEM
       railties (>= 3.0.0)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.11.0.1)
+    faraday_middleware (0.12.2)
       faraday (>= 0.7.4, < 1.0)
     faraday_middleware-multi_json (0.0.6)
       faraday_middleware
@@ -290,19 +291,30 @@ GEM
       po_to_json (>= 1.0.0)
       rails (>= 3.2.0)
     gherkin-ruby (0.3.2)
-    gitaly-proto (0.94.0)
+    gitaly-proto (0.99.0)
       google-protobuf (~> 3.1)
-      grpc (~> 1.0)
+      grpc (~> 1.10)
     github-linguist (5.3.3)
       charlock_holmes (~> 0.7.5)
       escape_utils (~> 1.1.0)
       mime-types (>= 1.19)
       rugged (>= 0.25.1)
-    github-markup (1.6.1)
+    github-markup (1.7.0)
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
       gitlab-grit (>= 2.4.1)
       multi_json
+    gitlab-gollum-lib (4.2.7.2)
+      gemojione (~> 3.2)
+      github-markup (~> 1.6)
+      gollum-grit_adapter (~> 1.0)
+      nokogiri (>= 1.6.1, < 2.0)
+      rouge (~> 3.1)
+      sanitize (~> 2.1)
+      stringex (~> 2.6)
+    gitlab-gollum-rugged_adapter (0.4.4)
+      mime-types (>= 1.15)
+      rugged (~> 0.25)
     gitlab-grit (2.8.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
@@ -322,17 +334,6 @@ GEM
       activesupport (>= 4.2.0)
     gollum-grit_adapter (1.0.1)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.2.7)
-      gemojione (~> 3.2)
-      github-markup (~> 1.6)
-      gollum-grit_adapter (~> 1.0)
-      nokogiri (>= 1.6.1, < 2.0)
-      rouge (~> 2.1)
-      sanitize (~> 2.1)
-      stringex (~> 2.6)
-    gollum-rugged_adapter (0.4.4)
-      mime-types (>= 1.15)
-      rugged (~> 0.25)
     gon (6.1.0)
       actionpack (>= 3.0)
       json
@@ -365,8 +366,8 @@ GEM
       rack (>= 1.3.0)
       rack-accept
       virtus (>= 1.0.0)
-    grape-entity (0.6.0)
-      activesupport
+    grape-entity (0.7.1)
+      activesupport (>= 4.0)
       multi_json (>= 1.3.2)
     grape-route-helpers (2.1.0)
       activesupport
@@ -374,7 +375,7 @@ GEM
       rake
     grape_logging (1.7.0)
       grape
-    grpc (1.10.0)
+    grpc (1.11.0)
       google-protobuf (~> 3.1)
       googleapis-common-protos-types (~> 1.0.0)
       googleauth (>= 0.5.1, < 0.7)
@@ -483,10 +484,11 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    lograge (0.5.1)
-      actionpack (>= 4, < 5.2)
-      activesupport (>= 4, < 5.2)
-      railties (>= 4, < 5.2)
+    lograge (0.10.0)
+      actionpack (>= 4)
+      activesupport (>= 4)
+      railties (>= 4)
+      request_store (~> 1.0)
     loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -544,9 +546,9 @@ GEM
       omniauth (~> 1.2)
     omniauth-facebook (4.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-github (1.1.2)
-      omniauth (~> 1.0)
-      omniauth-oauth2 (~> 1.1)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-gitlab (1.0.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
@@ -554,9 +556,6 @@ GEM
       jwt (>= 1.5)
       omniauth (>= 1.1.1)
       omniauth-oauth2 (>= 1.5)
-    omniauth-jwt (0.0.2)
-      jwt
-      omniauth (~> 1.1)
     omniauth-kerberos (0.3.0)
       omniauth-multipassword
       timfel-krb5-auth (~> 0.8)
@@ -587,7 +586,7 @@ GEM
     orm_adapter (0.5.0)
     os (0.9.6)
     parallel (1.12.1)
-    parser (2.5.0.5)
+    parser (2.5.1.0)
       ast (~> 2.4.0)
     parslet (1.5.0)
       blankslate (~> 2.0)
@@ -602,8 +601,6 @@ GEM
       atomic (>= 1.0.0)
       mysql2
       peek
-    peek-performance_bar (1.3.1)
-      peek (>= 0.1.0)
     peek-pg (1.3.0)
       concurrent-ruby
       concurrent-ruby-ext
@@ -649,7 +646,7 @@ GEM
       pry (>= 0.9.10)
     public_suffix (3.0.2)
     pyu-ruby-sasl (0.0.3.3)
-    rack (1.6.9)
+    rack (1.6.10)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (4.4.1)
@@ -697,7 +694,7 @@ GEM
     rainbow (2.2.2)
       rake
     raindrops (0.18.0)
-    rake (12.3.0)
+    rake (12.3.1)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
@@ -738,8 +735,9 @@ GEM
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     request_store (1.3.1)
-    responders (2.3.0)
-      railties (>= 4.2.0, < 5.1)
+    responders (2.4.0)
+      actionpack (>= 4.2.0, < 5.3)
+      railties (>= 4.2.0, < 5.3)
     rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
@@ -747,7 +745,7 @@ GEM
     retriable (3.1.1)
     rinku (2.0.0)
     rotp (2.1.2)
-    rouge (2.2.1)
+    rouge (3.1.1)
     rqrcode (0.7.0)
       chunky_png
     rqrcode-rails3 (0.1.7)
@@ -907,7 +905,7 @@ GEM
     state_machines-activerecord (0.5.1)
       activerecord (>= 4.1, < 6.0)
       state_machines-activemodel (>= 0.5.0)
-    stringex (2.7.1)
+    stringex (2.8.4)
     sys-filesystem (1.1.6)
       ffi
     sysexits (1.2.0)
@@ -969,7 +967,7 @@ GEM
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
     vmstat (2.3.0)
-    warden (1.2.6)
+    warden (1.2.7)
       rack (>= 1.0)
     webmock (2.3.2)
       addressable (>= 2.3.6)
@@ -1001,7 +999,7 @@ DEPENDENCIES
   asciidoctor (~> 1.5.6)
   asciidoctor-plantuml (= 0.0.8)
   asset_sync (~> 2.2.0)
-  attr_encrypted (~> 3.0.0)
+  attr_encrypted (~> 3.1.0)
   awesome_print (~> 1.2.0)
   babosa (~> 1.0.2)
   base32 (~> 0.3.0)
@@ -1030,7 +1028,8 @@ DEPENDENCIES
   database_cleaner (~> 1.5.0)
   deckar01-task_list (= 2.0.0)
   default_value_for (~> 3.0.0)
-  devise (~> 4.2)
+  device_detector
+  devise (~> 4.4)
   devise-two-factor (~> 3.0.0)
   diffy (~> 3.1.0)
   doorkeeper (~> 4.3)
@@ -1061,23 +1060,23 @@ DEPENDENCIES
   gettext (~> 3.2.2)
   gettext_i18n_rails (~> 1.8.0)
   gettext_i18n_rails_js (~> 1.3)
-  gitaly-proto (~> 0.94.0)
+  gitaly-proto (~> 0.99.0)
   github-linguist (~> 5.3.3)
   gitlab-flowdock-git-hook (~> 1.0.1)
+  gitlab-gollum-lib (~> 4.2)
+  gitlab-gollum-rugged_adapter (~> 0.4.4)
   gitlab-markup (~> 1.6.2)
   gitlab-styles (~> 2.3)
   gitlab_omniauth-ldap (~> 2.0.4)
-  gollum-lib (~> 4.2)
-  gollum-rugged_adapter (~> 0.4.4)
   gon (~> 6.1.0)
   google-api-client (~> 0.19.8)
   google-protobuf (= 3.5.1)
   gpgme
   grape (~> 1.0)
-  grape-entity (~> 0.6.0)
+  grape-entity (~> 0.7.1)
   grape-route-helpers (~> 2.1.0)
   grape_logging (~> 1.7)
-  grpc (~> 1.10.0)
+  grpc (~> 1.11.0)
   haml_lint (~> 0.26.0)
   hamlit (~> 2.6.1)
   hashie-forbidden_attributes
@@ -1115,10 +1114,9 @@ DEPENDENCIES
   omniauth-azure-oauth2 (~> 0.0.9)
   omniauth-cas3 (~> 1.1.4)
   omniauth-facebook (~> 4.0.0)
-  omniauth-github (~> 1.1.1)
+  omniauth-github (~> 1.3)
   omniauth-gitlab (~> 1.0.2)
   omniauth-google-oauth2 (~> 0.5.3)
-  omniauth-jwt (~> 0.0.2)
   omniauth-kerberos (~> 0.3.0)
   omniauth-oauth2-generic (~> 0.2.2)
   omniauth-saml (~> 1.10)
@@ -1129,7 +1127,6 @@ DEPENDENCIES
   peek (~> 1.0.1)
   peek-gc (~> 0.0.2)
   peek-mysql2 (~> 1.1.0)
-  peek-performance_bar (~> 1.3.0)
   peek-pg (~> 1.3.0)
   peek-rblineprof (~> 0.2.0)
   peek-redis (~> 1.2.0)
@@ -1160,7 +1157,7 @@ DEPENDENCIES
   redis-rails (~> 5.0.2)
   request_store (~> 1.3)
   responders (~> 2.0)
-  rouge (~> 2.0)
+  rouge (~> 3.1)
   rqrcode-rails3 (~> 0.1.7)
   rspec-parameterized
   rspec-rails (~> 3.6.0)
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 8564e4af91b1..87e4aff28c37 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -16,11 +16,11 @@ let
     };
   };
 
-  version = "10.7.0";
+  version = "10.8.0";
 
   gitlabDeb = fetchurl {
     url = "https://packages.gitlab.com/gitlab/gitlab-ce/packages/debian/jessie/gitlab-ce_${version}-ce.0_amd64.deb/download";
-    sha256 = "0dngh6gj8kkfcxn6ki9i96jg4x1x0vq3zzdimxz31g3j2zpd0ryz";
+    sha256 = "0j5jrlwfpgwfirjnqb9w4snl9w213kdxb1ajyrla211q603d4j34";
   };
 
 in
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "010xhzrp6svp2a4xzmzwl4x3hk9wc1frqr66lp8x58nfmvr8hdrg";
+    sha256 = "1idvi27xpghvvb3sv62afhcnnswvjlrbg5lld79a761kd4187cym";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index d14a963a8c07..57c274566166 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -201,10 +201,10 @@
     dependencies = ["encryptor"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1dikbf55wjqyzfb9p4xjkkkajwan569pmzljdf9c1fy4a94cd13d";
+      sha256 = "0ncv2az1zlj33bsllr6q1qdvbw42gv91lxq0ryclbv8l8xh841jg";
       type = "gem";
     };
-    version = "3.0.3";
+    version = "3.1.0";
   };
   attr_required = {
     source = {
@@ -554,10 +554,10 @@
   crass = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1czijxlagzpzwchr2ldrgfi7kywg08idjpq37ndcmwh4fmz72c4l";
+      sha256 = "0bpxzy6gjw9ggjynlxschbfsgmx8lv3zw1azkjvnb8b9i895dqfi";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.0.4";
   };
   creole = {
     source = {
@@ -660,14 +660,22 @@
     };
     version = "0.0.4";
   };
+  device_detector = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zbsjj1bgwmsiqiw6x5fzbzp25xc10c02s37ggl2635ha0qzn05q";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   devise = {
     dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "warden"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "045qw3186gkcm38wjbjhb7w2zycbqj85wfb1cdwvkqk8hf1a7dp0";
+      sha256 = "1xmxfhym0yxwb0zwmmzhdiykbpyqqm3id02g7rf3vcgbc1lqvdnj";
       type = "gem";
     };
-    version = "4.2.0";
+    version = "4.4.3";
   };
   devise-two-factor = {
     dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
@@ -715,10 +723,10 @@
     dependencies = ["railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1yjbmkhpj25h6n5hi382gxna1303crr4v57w1ic23n0w8ll6jh0z";
+      sha256 = "022r03i830b2lvmr0xzlj6ivlvc1zr64hy4a4bsy3flv94da77rz";
       type = "gem";
     };
-    version = "4.3.1";
+    version = "4.3.2";
   };
   doorkeeper-openid_connect = {
     dependencies = ["doorkeeper" "json-jwt"];
@@ -859,10 +867,10 @@
     dependencies = ["faraday"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0bcarc90brm1y68bl957w483bddsy9idj2gghqnysk6bbxpsvm00";
+      sha256 = "1p7icfl28nvl8qqdsngryz1snqic9l8x6bk0dxd7ygn230y0k41d";
       type = "gem";
     };
-    version = "0.11.0.1";
+    version = "0.12.2";
   };
   faraday_middleware-multi_json = {
     dependencies = ["faraday_middleware" "multi_json"];
@@ -1130,10 +1138,10 @@
     dependencies = ["google-protobuf" "grpc"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1rnfswh0jpsiyzvsac7kwk9rpbpf4fcz9p2i8pamqamm3skgd4i6";
+      sha256 = "1y5sn60h71ssxmc8br32fqhgmfqxgrmdlg4vya8dyy37ai20f85z";
       type = "gem";
     };
-    version = "0.94.0";
+    version = "0.99.0";
   };
   github-linguist = {
     dependencies = ["charlock_holmes" "escape_utils" "mime-types" "rugged"];
@@ -1147,10 +1155,10 @@
   github-markup = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1nyb9ck2c9z5qi86n7r52w0m126qpnvc93yh35cn8bwsnkjqx0iq";
+      sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp";
       type = "gem";
     };
-    version = "1.6.1";
+    version = "1.7.0";
   };
   gitlab-flowdock-git-hook = {
     dependencies = ["flowdock" "gitlab-grit" "multi_json"];
@@ -1161,6 +1169,24 @@
     };
     version = "1.0.1";
   };
+  gitlab-gollum-lib = {
+    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a1dv8n33pj2il07c8z7gz5542iby0z2qwymv8yj1kcn4avs4dxv";
+      type = "gem";
+    };
+    version = "4.2.7.2";
+  };
+  gitlab-gollum-rugged_adapter = {
+    dependencies = ["mime-types" "rugged"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zk89c2ljv9skcxzwnr84rqxv3iam30n5liv5r8hgl0l67qbg1mg";
+      type = "gem";
+    };
+    version = "0.4.4";
+  };
   gitlab-grit = {
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
     source = {
@@ -1214,24 +1240,6 @@
     };
     version = "1.0.1";
   };
-  gollum-lib = {
-    dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1filwvjfj5q2m6w4q274ai36d6f0mrsv2l2khhk4bv1q6pqby2fq";
-      type = "gem";
-    };
-    version = "4.2.7";
-  };
-  gollum-rugged_adapter = {
-    dependencies = ["mime-types" "rugged"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0khfmakp65frlaj7ajs6ihqg4xi7yc9z96kpsf1b7giqi3fqhhv4";
-      type = "gem";
-    };
-    version = "0.4.4";
-  };
   gon = {
     dependencies = ["actionpack" "json" "multi_json" "request_store"];
     source = {
@@ -1298,10 +1306,10 @@
     dependencies = ["activesupport" "multi_json"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18jhjn1164z68xrjz23wf3qha3x9az086dr7p6405jv6rszyxihq";
+      sha256 = "1w78wylkhdkc0s6n6d20hggbb3pl3ladzzd5lx6ack2iswybx7b9";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.7.1";
   };
   grape-route-helpers = {
     dependencies = ["activesupport" "grape" "rake"];
@@ -1325,10 +1333,10 @@
     dependencies = ["google-protobuf" "googleapis-common-protos-types" "googleauth"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "17wvqhjmldxph4li402rvfbyzi5455lzmfr2y19kq9ghrzjyad82";
+      sha256 = "1is4czi3i7y6zyxzyrpsma1z91axmc0jz2ngr6ckixqd3629npkz";
       type = "gem";
     };
-    version = "1.10.0";
+    version = "1.11.0";
   };
   haml = {
     dependencies = ["tilt"];
@@ -1694,13 +1702,13 @@
     version = "2.2.2";
   };
   lograge = {
-    dependencies = ["actionpack" "activesupport" "railties"];
+    dependencies = ["actionpack" "activesupport" "railties" "request_store"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1n08i1m4bn28vrc6gd642wzbyk2cdwahgcysd7pc2c7zd1ipqh0p";
+      sha256 = "00lcn7s3slfn32di4qwlx2yj5f9r2pcnd0naxrvqqwypcg1z2sdd";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.10.0";
   };
   loofah = {
     dependencies = ["crass" "nokogiri"];
@@ -1984,10 +1992,10 @@
     dependencies = ["omniauth" "omniauth-oauth2"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1mbx3c8m1llhdxrqdciq8jh428bxj1nvf4yhziv2xqmqpjcqz617";
+      sha256 = "0yg7k4p95ybcsii17spqarl8rpfzkq0kb19ab6wl4lc922zgfbqc";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.3.0";
   };
   omniauth-gitlab = {
     dependencies = ["omniauth" "omniauth-oauth2"];
@@ -2007,15 +2015,6 @@
     };
     version = "0.5.3";
   };
-  omniauth-jwt = {
-    dependencies = ["jwt" "omniauth"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qxr95z5p7fs13mg04zp76ldplgk6n8fkwbn17mlzlry1ihcrgxr";
-      type = "gem";
-    };
-    version = "0.0.2";
-  };
   omniauth-kerberos = {
     dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
     source = {
@@ -2134,10 +2133,10 @@
     dependencies = ["ast"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1sj8dlqs5l2pa5y2412r4d5fi7qvf26n8vpciz7k9fy0ch327gdc";
+      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
       type = "gem";
     };
-    version = "2.5.0.5";
+    version = "2.5.1.0";
   };
   parslet = {
     dependencies = ["blankslate"];
@@ -2183,15 +2182,6 @@
     };
     version = "1.1.0";
   };
-  peek-performance_bar = {
-    dependencies = ["peek"];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1a0ly4p8xnrb3pnf273qq2d5bm2w19p829n4n2730rijd42pa2n4";
-      type = "gem";
-    };
-    version = "1.3.1";
-  };
   peek-pg = {
     dependencies = ["concurrent-ruby" "concurrent-ruby-ext" "peek" "pg"];
     source = {
@@ -2350,10 +2340,10 @@
   rack = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "03w1ri5l91q800f1bdcdl5rbagy7s4kml136b42s2lmxmznxhr07";
+      sha256 = "0in0amn0kwvzmi8h5zg6ijrx5wpsf8h96zrfmnk1kwh2ql4sxs2q";
       type = "gem";
     };
-    version = "1.6.9";
+    version = "1.6.10";
   };
   rack-accept = {
     dependencies = ["rack"];
@@ -2491,10 +2481,10 @@
   rake = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "190p7cs8zdn07mjj6xwwsdna3g0r98zs4crz7jh2j2q5b0nbxgjf";
+      sha256 = "1idi53jay34ba9j68c3mfr9wwkg3cd9qh0fn9cg42hv72c6q8dyg";
       type = "gem";
     };
-    version = "12.3.0";
+    version = "12.3.1";
   };
   rb-fsevent = {
     source = {
@@ -2670,13 +2660,13 @@
     version = "1.3.1";
   };
   responders = {
-    dependencies = ["railties"];
+    dependencies = ["actionpack" "railties"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "16h343srb6msivc2mpm1dbihsmniwvyc9jk3g4ip08g9fpmxfc2i";
+      sha256 = "1rhdyyvvm26f2l3fgwdp6xasfl2y0whwgy766bhdwz697mf78zfn";
       type = "gem";
     };
-    version = "2.3.0";
+    version = "2.4.0";
   };
   rest-client = {
     dependencies = ["http-cookie" "mime-types" "netrc"];
@@ -2714,10 +2704,10 @@
   rouge = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs";
+      sha256 = "1sfhy0xxqjnzqa7qxmpz1bmy0mzcr55qyvi410gsb6d6i4ialbw3";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "3.1.1";
   };
   rqrcode = {
     dependencies = ["chunky_png"];
@@ -3287,10 +3277,10 @@
   stringex = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1zc93v00av643lc6njl09wwki7h5yqayhh1din8zqfylw814l1dv";
+      sha256 = "0c5dfrjzkskzfsdvwsviq4111rwwpbk9022nxwdidz014mky5vi1";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.8.4";
   };
   sys-filesystem = {
     dependencies = ["ffi"];
@@ -3558,10 +3548,10 @@
     dependencies = ["rack"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04gpmnvkp312wxmsvvbq834iyab58vjmh6w4x4qpgh4p1lzkiq1l";
+      sha256 = "0va966lhpylcwbqb9n151kkihx30agh0a57mwjwdxyanll4s1q12";
       type = "gem";
     };
-    version = "1.2.6";
+    version = "1.2.7";
   };
   webmock = {
     dependencies = ["addressable" "crack" "hashdiff"];

From 53475653a50db721f7b131320eca52f94b5fd543 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 23 May 2018 22:24:24 +0200
Subject: [PATCH 2439/3370] gitlab module: update for 10.8

---
 nixos/modules/services/misc/gitlab.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index be13fed860bd..e80abf96da48 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -129,6 +129,7 @@ let
         };
       };
       extra = {};
+      uploads.storage_path = cfg.statePath;
     };
   };
 
@@ -565,13 +566,9 @@ in {
 
         ${pkgs.openssl}/bin/openssl rand -hex 32 > ${cfg.statePath}/config/gitlab_shell_secret
 
-        # The uploads directory is hardcoded somewhere deep in rails. It is
-        # symlinked in the gitlab package to /run/gitlab/uploads to make it
-        # configurable
         mkdir -p /run/gitlab
-        mkdir -p ${cfg.statePath}/{log,uploads}
+        mkdir -p ${cfg.statePath}/log
         ln -sf ${cfg.statePath}/log /run/gitlab/log
-        ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
         ln -sf ${cfg.statePath}/tmp /run/gitlab/tmp
         ln -sf $GITLAB_SHELL_CONFIG_PATH /run/gitlab/shell-config.yml
         chown -R ${cfg.user}:${cfg.group} /run/gitlab
@@ -587,6 +584,8 @@ in {
           ln -sf ${smtpSettings} ${cfg.statePath}/config/initializers/smtp_settings.rb
         ''}
         ln -sf ${cfg.statePath}/config /run/gitlab/config
+        rm ${cfg.statePath}/lib
+        ln -sf ${pkgs.gitlab}/share/gitlab/lib ${cfg.statePath}/lib
         cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
 
         # JSON is a subset of YAML
@@ -638,10 +637,6 @@ in {
         chmod -R ug+rwX,o-rwx ${cfg.statePath}/repositories
         chmod -R ug-s ${cfg.statePath}/repositories
         find ${cfg.statePath}/repositories -type d -print0 | xargs -0 chmod g+s
-        chmod 770 ${cfg.statePath}/uploads
-        chown -R ${cfg.user} ${cfg.statePath}/uploads
-        find ${cfg.statePath}/uploads -type f -exec chmod 0644 {} \;
-        find ${cfg.statePath}/uploads -type d -not -path ${cfg.statePath}/uploads -exec chmod 0770 {} \;
       '';
 
       serviceConfig = {

From de5205ae2dd7688a5a80c289bd5fac5f831ad585 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Tue, 20 Mar 2018 19:42:00 +0100
Subject: [PATCH 2440/3370] nixos/prometheus-node-exporter: fix file collector

---
 nixos/modules/services/monitoring/prometheus/exporters/node.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index c85f5f9cfb2d..ee7bf39f199a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -27,6 +27,7 @@ in
   };
   serviceOpts = {
     serviceConfig = {
+      RuntimeDirectory = "prometheus-node-exporter";
       ExecStart = ''
         ${pkgs.prometheus-node-exporter}/bin/node_exporter \
           ${concatMapStringsSep " " (x: "--collector." + x) cfg.enabledCollectors} \

From 120e93928f1071a5589e520a7542577a70dc736f Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 21 Mar 2018 20:02:07 +0100
Subject: [PATCH 2441/3370] crowd: 3.0.1 -> 3.1.2

---
 nixos/modules/services/web-apps/atlassian/crowd.nix | 5 +++--
 pkgs/servers/atlassian/crowd.nix                    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
index 0ac941b6ec99..778e4afa1e0b 100644
--- a/nixos/modules/services/web-apps/atlassian/crowd.nix
+++ b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -126,12 +126,13 @@ in
       };
 
       preStart = ''
-        mkdir -p ${cfg.home}/{logs,work,database}
+        rm -rf ${cfg.home}/work
+        mkdir -p ${cfg.home}/{logs,database,work}
 
         mkdir -p /run/atlassian-crowd
         ln -sf ${cfg.home}/{database,work,server.xml} /run/atlassian-crowd
 
-        chown -R ${cfg.user} ${cfg.home}
+        chown -R ${cfg.user}:${cfg.group} ${cfg.home}
 
         sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \
         '' + (lib.optionalString cfg.proxy.enable ''
diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix
index 6d7b332da135..4989c3a417a2 100644
--- a/pkgs/servers/atlassian/crowd.nix
+++ b/pkgs/servers/atlassian/crowd.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-crowd-${version}";
-  version = "3.0.1";
+  version = "3.1.2";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz";
-    sha256 = "17pz0rgzdv40sbvzb9w6xmdg598m6gs7gsznfnxcy1j011cgg1wr";
+    sha256 = "0pnl0zl38827ckgxh4y1mnq3lr7bvd7v3ysdxxv3nfr5zya4xgki";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

From 03e9d75a8dd457b1d6c5947307507df4b47519aa Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 23 May 2018 22:05:53 -0500
Subject: [PATCH 2442/3370] 9pfs: add version

---
 pkgs/tools/filesystems/9pfs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix
index 5ad54adc08ad..37ec4105472b 100644
--- a/pkgs/tools/filesystems/9pfs/default.nix
+++ b/pkgs/tools/filesystems/9pfs/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, fuse }:
 
 stdenv.mkDerivation rec {
-  name = "9pfs";
+  name = "9pfs-20150918";
 
   src = fetchFromGitHub {
     owner = "mischief";

From 828d932fefbbe89850948ba54fb14b903eb0b32e Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 23 May 2018 22:08:31 -0500
Subject: [PATCH 2443/3370] zookeeper_mt: add version

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

diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix
index 0ec24c828a6f..58e1940a3ef4 100644
--- a/pkgs/development/libraries/zookeeper_mt/default.nix
+++ b/pkgs/development/libraries/zookeeper_mt/default.nix
@@ -1,7 +1,7 @@
 { stdenv, zookeeper, bash }:
 
 stdenv.mkDerivation rec {
-   name = "zookeeper_mt";
+   name = "zookeeper_mt-${stdenv.lib.getVersion zookeeper}";
    
    src = zookeeper.src;
    

From 06e750ccc9477376d400fb5209192526360afed0 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Thu, 24 May 2018 09:25:05 +0300
Subject: [PATCH 2444/3370] yarn: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/tools/yarn/default.nix b/pkgs/development/tools/yarn/default.nix
index eefe7dcfa74a..535ab7b45fa3 100644
--- a/pkgs/development/tools/yarn/default.nix
+++ b/pkgs/development/tools/yarn/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "yarn-${version}";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchzip {
     url = "https://github.com/yarnpkg/yarn/releases/download/v${version}/yarn-v${version}.tar.gz";
-    sha256 = "0bblp1jy4s9y5rpcqn40w61qwsmxr342xkcn7ykk88i7sng2cgfw";
+    sha256 = "00fxihv9ih40k6f21a7hb6vkx4h4m6ks0fbai5h9ssi0p4m5j3by";
   };
 
   buildInputs = [makeWrapper nodejs];

From 16da44b5c115fe58048d7ba8aa597ed1598ea090 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sun, 29 Apr 2018 15:06:35 -0700
Subject: [PATCH 2445/3370] llvm and clang 6: factor out compiler-rt, fix
 libstdcxxStdenv sanitizer headers

Build compiler-rt separate from llvm and clang, and just add as an extra
library in the wrapper.
---
 .../compilers/llvm/6/clang/default.nix        |  9 ++----
 .../compilers/llvm/6/compiler-rt.nix          | 31 +++++++++++++++++++
 pkgs/development/compilers/llvm/6/default.nix | 24 +++++++++++---
 pkgs/development/compilers/llvm/6/llvm.nix    | 16 ----------
 4 files changed, 53 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/6/compiler-rt.nix

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 3d02062a4a32..d7842bdea992 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -30,10 +30,7 @@ let
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ]
-    # Maybe with compiler-rt this won't be needed?
-    ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}"
-    ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
+    ];
 
     patches = [ ./purity.patch ];
 
@@ -51,13 +48,11 @@ let
     outputs = [ "out" "lib" "python" ];
 
     # Clang expects to find LLVMgold in its own prefix
-    # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
       if [ -e ${llvm}/lib/LLVMgold.so ]; then
         ln -sv ${llvm}/lib/LLVMgold.so $out/lib
       fi
 
-      ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
       ln -sv $out/bin/clang $out/bin/cpp
 
       # Move libclang to 'lib' output
@@ -79,7 +74,7 @@ let
     passthru = {
       isClang = true;
       inherit llvm;
-    } // stdenv.lib.optionalAttrs stdenv.isLinux {
+    } // stdenv.lib.optionalAttrs stdenv.targetPlatform.isLinux {
       inherit gcc;
     };
 
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
new file mode 100644
index 000000000000..333818f7dbde
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -0,0 +1,31 @@
+{ stdenv, version, fetch, cmake, python, llvm }:
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "compiler-rt-${version}";
+  inherit version;
+  src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h";
+
+  nativeBuildInputs = [ cmake python llvm ];
+
+  configureFlags = [
+    "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+  ];
+
+  outputs = [ "dev" "out" ];
+
+  patches = [
+    ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+  ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
+
+  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+  # a flag and turn the flag off during the stdenv build.
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/config-ix.cmake \
+      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+  '';
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 3a7b66f1ed0e..81d41673b251 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -14,7 +14,6 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h";
   clang-tools-extra_src = fetch "clang-tools-extra" "1ll9v6r29xfdiywbn9iss49ad39ah3fk91wiv0sr6k6k9i544fq5";
 
   # Add man output without introducing extra dependencies.
@@ -27,7 +26,6 @@ let
   in {
 
     llvm = overrideManOutput (callPackage ./llvm.nix {
-      inherit compiler-rt_src;
       inherit (targetLlvmLibraries) libcxxabi;
     });
     clang-unwrapped = overrideManOutput (callPackage ./clang {
@@ -43,11 +41,27 @@ let
     libstdcxxClang = wrapCCWith {
       cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
+      extraBuildCommands = stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+        echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+      '';
     };
 
-    libcxxClang = wrapCCWith {
+    libcxxClang = wrapCCWith rec {
       cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
+      extraPackages = [
+        targetLlvmLibraries.libcxx
+        targetLlvmLibraries.libcxxabi
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = ''
+        rsrc="$out/resource-root"
+        mkdir "$rsrc"
+        ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+        ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+      '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+        echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+      '';
     };
 
     lld = callPackage ./lld.nix {};
@@ -59,6 +73,8 @@ let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
+    compiler-rt = callPackage ./compiler-rt.nix {};
+
     stdenv = overrideCC stdenv buildLlvmTools.clang;
 
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 7cb3e88c2f85..8877ccd11621 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -11,7 +11,6 @@
 , version
 , release_version
 , zlib
-, compiler-rt_src
 , libcxxabi
 , debugVersion ? false
 , enableManpages ? false
@@ -33,8 +32,6 @@ in stdenv.mkDerivation (rec {
     unpackFile ${src}
     mv llvm-${version}* llvm
     sourceRoot=$PWD/llvm
-    unpackFile ${compiler-rt_src}
-    mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
   outputs = [ "out" "python" ]
@@ -48,15 +45,7 @@ in stdenv.mkDerivation (rec {
 
   propagatedBuildInputs = [ ncurses zlib ];
 
-  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
-  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
-  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
-  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
-  # a flag and turn the flag off during the stdenv build.
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \
-      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-
     substituteInPlace cmake/modules/AddLLVM.cmake \
       --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \
       --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
@@ -70,15 +59,11 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "Path.cpp" ""
     rm unittests/Support/Path.cpp
-
-    # Revert compiler-rt commit that makes codesign mandatory
-    patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -i ${../TLI-musl.patch}
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
-    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -93,7 +78,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
-    "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
   ]
   ++ stdenv.lib.optional enableSharedLibraries
     "-DLLVM_LINK_LLVM_DYLIB=ON"

From 46eeef1898ffbf57330ec31b96a6c2d89f8fcb36 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <benjamin.saunders@here.com>
Date: Mon, 7 May 2018 13:22:50 -0700
Subject: [PATCH 2446/3370] tests.cc-wrapper: verify building with sanitizers

---
 pkgs/build-support/cc-wrapper/default.nix     | 4 ++--
 pkgs/development/compilers/llvm/6/default.nix | 1 +
 pkgs/test/cc-wrapper/default.nix              | 5 +++++
 pkgs/test/cc-wrapper/sanitizers.c             | 8 ++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/test/cc-wrapper/sanitizers.c

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 43cd87fb4597..8f99da805ec1 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -9,7 +9,7 @@
 , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
 , extraPackages ? [], extraBuildCommands ? ""
-, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
+, isGNU ? false, isClang ? cc.isClang or false, isCompilerRT ? false, gnugrep ? null
 , buildPackages ? {}
 }:
 
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
     # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
     # unused middle-ground name that evokes both.
     inherit bintools;
-    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile;
+    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang isCompilerRT default_cxx_stdlib_compile;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 81d41673b251..da5a97a9bbaa 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -53,6 +53,7 @@ let
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
       ];
+      isCompilerRT = true;
       extraBuildCommands = ''
         rsrc="$out/resource-root"
         mkdir "$rsrc"
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 41a7685ed2e0..06113e40561b 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation {
 
     NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
     ./ldflags-check
+  '' + stdenv.lib.optionalString (stdenv.cc.isCompilerRT or false) ''
+
+    $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
+    ./sanitizers
+  '' + ''
 
     touch $out
   '';
diff --git a/pkgs/test/cc-wrapper/sanitizers.c b/pkgs/test/cc-wrapper/sanitizers.c
new file mode 100644
index 000000000000..93dd78a903ce
--- /dev/null
+++ b/pkgs/test/cc-wrapper/sanitizers.c
@@ -0,0 +1,8 @@
+#include <sanitizer/asan_interface.h>
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+  fprintf(stderr, "ok\n");
+  return 0;
+}

From ab500439cd7d305fbb9e2011ff5073accaf2673f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Thu, 24 May 2018 10:56:33 +0200
Subject: [PATCH 2447/3370] gohai: init at 2018-05-23

This project does not have a default versioning scheme. go2nix
suggests using the date of the most recent change.
---
 pkgs/tools/system/gohai/default.nix | 32 +++++++++++++++++++++++++++++
 pkgs/tools/system/gohai/deps.nix    | 30 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 3 files changed, 64 insertions(+)
 create mode 100644 pkgs/tools/system/gohai/default.nix
 create mode 100644 pkgs/tools/system/gohai/deps.nix

diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix
new file mode 100644
index 000000000000..77f65de9a8d0
--- /dev/null
+++ b/pkgs/tools/system/gohai/default.nix
@@ -0,0 +1,32 @@
+{ lib, stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "gohai-${version}";
+  version = "2018-05-23";
+  rev = "60e13eaed98afa238ad6dfc98224c04fbb7b19b1";
+
+  goPackagePath = "github.com/DataDog/gohai";
+
+  src = fetchgit {
+    inherit rev;
+    url    = "https://github.com/DataDog/gohai";
+    sha256 = "15hdw195f6ayrmj1nbyfpfswdai1r1z3qjw927mbma7rwql24dkr";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with lib; {
+    description      = "System information collector";
+    homepage         = "https://github.com/DataDog/gohai";
+    license          = licenses.mit;
+    maintainers      = [ maintainers.tazjin ];
+    platforms        = platforms.unix;
+    repositories.git = git://github.com/DataDog/gohai.git;
+
+    longDescription = ''
+      Gohai is a tool which collects an inventory of system
+      information. It is used by the Datadog agent to provide detailed
+      system metrics.
+    '';
+  };
+}
diff --git a/pkgs/tools/system/gohai/deps.nix b/pkgs/tools/system/gohai/deps.nix
new file mode 100644
index 000000000000..f6d63e460246
--- /dev/null
+++ b/pkgs/tools/system/gohai/deps.nix
@@ -0,0 +1,30 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/cihub/seelog";
+    fetch = {
+      type = "git";
+      url = "https://github.com/cihub/seelog";
+      rev = "f561c5e57575bb1e0a2167028b7339b3a8d16fb4";
+      sha256 = "0r3228hvgljgpaggj6b9mvxfsizfw25q2c1761wsvcif8gz49cvl";
+    };
+  }
+  {
+    goPackagePath = "github.com/shirou/gopsutil";
+    fetch = {
+      type = "git";
+      url = "https://github.com/shirou/gopsutil";
+      rev = "eeb1d38d69593f121e060d24d17f7b1f0936b203";
+      sha256 = "01qsznk599225gf4pld7p2m30p61y77mvzhrs6raxpk6wf7icp4w";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "77b0e4315053a57ed2962443614bdb28db152054";
+      sha256 = "1024gcv1b40i2rgvpgyw2hgy1k5g7473pn29yavwysj37m1rrplp";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84311e2559e1..9c8acb7cff0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1289,6 +1289,8 @@ with pkgs;
 
   goa = callPackage ../development/tools/goa { };
 
+  gohai = callPackage ../tools/system/gohai { };
+
   gorilla-bin = callPackage ../tools/security/gorilla-bin { };
 
   gosu = callPackage ../tools/misc/gosu { };

From f4c87183df72a71d3d12c20bb2d99f68207dce8f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Thu, 24 May 2018 10:58:28 +0200
Subject: [PATCH 2448/3370] nixos/dd-agent: fix runtime errors by adding gohai
 to $PATH

The Datadog agent requires `gohai` to be available on its `$PATH` in
order to collect certain metrics.

It would previously start up and collect certain types of metrics, but
log errors related to the missing gohai binary.

This commit configures the systemd-unit to make gohai available at
runtime.

This fixes #39810.
---
 .../services/monitoring/dd-agent/dd-agent.nix        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
index beaa2c01b298..6367c8245f71 100644
--- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix
@@ -57,7 +57,7 @@ let
     instances:
       - use_mount: no
   '';
-  
+
   networkConfig = pkgs.writeText "network.yaml" ''
     init_config:
 
@@ -68,13 +68,13 @@ let
           - lo
           - lo0
   '';
-  
+
   postgresqlConfig = pkgs.writeText "postgres.yaml" cfg.postgresqlConfig;
   nginxConfig = pkgs.writeText "nginx.yaml" cfg.nginxConfig;
   mongoConfig = pkgs.writeText "mongo.yaml" cfg.mongoConfig;
   jmxConfig = pkgs.writeText "jmx.yaml" cfg.jmxConfig;
   processConfig = pkgs.writeText "process.yaml" cfg.processConfig;
-  
+
   etcfiles =
     let
       defaultConfd = import ./dd-agent-defaults.nix;
@@ -150,7 +150,7 @@ in {
       default = null;
       type = types.uniq (types.nullOr types.string);
     };
-    
+
     mongoConfig = mkOption {
       description = "MongoDB integration configuration";
       default = null;
@@ -166,7 +166,7 @@ in {
     processConfig = mkOption {
       description = ''
         Process integration configuration
- 
+
         See http://docs.datadoghq.com/integrations/process/
       '';
       default = null;
@@ -190,7 +190,7 @@ in {
 
     systemd.services.dd-agent = {
       description = "Datadog agent monitor";
-      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps ];
+      path = [ pkgs."dd-agent" pkgs.python pkgs.sysstat pkgs.procps pkgs.gohai ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = "${pkgs.dd-agent}/bin/dd-agent foreground";

From 2a14e898bcf5ed9e6647f3b60c0444adba18a9ce Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 22 May 2018 13:55:13 +0200
Subject: [PATCH 2449/3370] slurm/module: add ProcTrackType option to unbreak
 default setup

---
 nixos/modules/services/computing/slurm/slurm.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 45d34f5b76f5..314cc3f61ecc 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -13,6 +13,7 @@ let
       ${optionalString (cfg.nodeName != null) ''nodeName=${cfg.nodeName}''}
       ${optionalString (cfg.partitionName != null) ''partitionName=${cfg.partitionName}''}
       PlugStackConfig=${plugStackConfig}
+      ProctrackType=${cfg.procTrackType}
       ${cfg.extraConfig}
     '';
 
@@ -103,6 +104,16 @@ in
         '';
       };
 
+      procTrackType = mkOption {
+        type = types.string;
+        default = "proctrack/linuxproc";
+        description = ''
+          Plugin to be used for process tracking on a job step basis.
+          The slurmd daemon uses this mechanism to identify all processes
+          which are children of processes it spawns for a user job step.
+        '';
+      };
+
       extraConfig = mkOption {
         default = "";
         type = types.lines;

From 60737bd31985116b7cce47f221e8568e66ab73e0 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 22 May 2018 19:53:28 -0400
Subject: [PATCH 2450/3370] dockerTools: fixes extraCommands for mkRootLayer.

The extraCommands was, previously, simply put in the body of the script
using nix expansion `${extraCommands}` (which looks exactly like bash
expansion!).

This causes issues like in #34779 where scripts will eventually create
invalid bash.

The solution is to use a script like `run-as-root`.

 * * *

Fixes #34779
---
 pkgs/build-support/docker/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 374b71d42a39..34af6ad65b9f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -360,7 +360,9 @@ rec {
     extraCommands ? ""
   }:
     # Generate an executable script from the `runAsRoot` text.
-    let runAsRootScript = shellScript "run-as-root.sh" runAsRoot;
+    let
+      runAsRootScript = shellScript "run-as-root.sh" runAsRoot;
+      extraCommandsScript = shellScript "extra-commands.sh" extraCommands;
     in runWithOverlay {
       name = "docker-layer-${name}";
 
@@ -398,7 +400,7 @@ rec {
       '';
 
       postUmount = ''
-        (cd layer; eval "${extraCommands}")
+        (cd layer; ${extraCommandsScript})
 
         echo "Packing layer..."
         mkdir $out

From d32e2e30639eb23c027ccf9e6b0caaf33d58d00d Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Thu, 24 May 2018 11:27:06 +0000
Subject: [PATCH 2451/3370] nix-du: 0.1.1 -> 0.1.2 (#41002)

---
 pkgs/tools/package-management/nix-du/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix
index 2e68666b7fa3..212b61f62f06 100644
--- a/pkgs/tools/package-management/nix-du/default.nix
+++ b/pkgs/tools/package-management/nix-du/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub, rustPlatform, nix, boost, graphviz }:
 rustPlatform.buildRustPackage rec {
   name = "nix-du-${version}";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nix-du";
     rev = "v${version}";
-    sha256 = "0kxacn5qw21pp4zl6wr9wyb2mm2nlnp6mla3m5p9dm7vrm1fd1x9";
+    sha256 = "1y7ifr4c3v1494swh6akvna0d0rxjy9jw3mw2wdd6vj1xphvmimq";
   };
-  cargoSha256 = "04c48lzi7hny3nq4ffdpvsr4dxbi32faka163fp1yc9953zdw9az";
+  cargoSha256 = "0qq7a6ncxnbjvnmly99awqrk9f3z9b55ifil7b0bn5yhk4h9sa6y";
 
-  doCheck = !stdenv.isDarwin;
+  doCheck = true;
   checkInputs = [ graphviz ];
   nativeBuildInputs = [] ++ stdenv.lib.optionals doCheck checkInputs;
 

From 3c0daa19e2d61d167325cbf558c15931bfd531b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 24 May 2018 10:25:52 +0200
Subject: [PATCH 2452/3370] nixos/borgbackup: make extraArgs a shell variable

in line with the other extra*Args variables
---
 nixos/modules/services/backup/borgbackup.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix
index 1e019827dfea..0c3fc9af6f88 100644
--- a/nixos/modules/services/backup/borgbackup.nix
+++ b/nixos/modules/services/backup/borgbackup.nix
@@ -35,26 +35,26 @@ let
     ${cfg.preHook}
   '' + optionalString cfg.doInit ''
     # Run borg init if the repo doesn't exist yet
-    if ! borg list ${cfg.extraArgs} > /dev/null; then
-      borg init ${cfg.extraArgs} \
+    if ! borg list $extraArgs > /dev/null; then
+      borg init $extraArgs \
         --encryption ${cfg.encryption.mode} \
         $extraInitArgs
       ${cfg.postInit}
     fi
   '' + ''
-    borg create ${cfg.extraArgs} \
+    borg create $extraArgs \
       --compression ${cfg.compression} \
       --exclude-from ${mkExcludeFile cfg} \
       $extraCreateArgs \
       "::$archiveName$archiveSuffix" \
       ${escapeShellArgs cfg.paths}
   '' + optionalString cfg.appendFailedSuffix ''
-    borg rename ${cfg.extraArgs} \
+    borg rename $extraArgs \
       "::$archiveName$archiveSuffix" "$archiveName"
   '' + ''
     ${cfg.postCreate}
   '' + optionalString (cfg.prune.keep != { }) ''
-    borg prune ${cfg.extraArgs} \
+    borg prune $extraArgs \
       ${mkKeepArgs cfg} \
       --prefix ${escapeShellArg cfg.prune.prefix} \
       $extraPruneArgs
@@ -93,7 +93,7 @@ let
       };
       environment = {
         BORG_REPO = cfg.repo;
-        inherit (cfg) extraInitArgs extraCreateArgs extraPruneArgs;
+        inherit (cfg) extraArgs extraInitArgs extraCreateArgs extraPruneArgs;
       } // (mkPassEnv cfg) // cfg.environment;
       inherit (cfg) startAt;
     };
@@ -463,7 +463,7 @@ in {
               service has. Handle with care.
             '';
             default = "";
-            example = "--remote-path=borg1";
+            example = "--remote-path=/path/to/borg";
           };
 
           extraInitArgs = mkOption {

From e22d072c641bdd4f615932b8afb06aed518867d5 Mon Sep 17 00:00:00 2001
From: Geoffrey Huntley <ghuntley@ghuntley.com>
Date: Thu, 24 May 2018 22:16:08 +1000
Subject: [PATCH 2453/3370] kubernetes: fix 404 links to documentation

---
 nixos/modules/services/cluster/kubernetes/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index aeb0a0d2432d..d0309ebd5b8a 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -279,7 +279,7 @@ in {
       tokenAuthFile = mkOption {
         description = ''
           Kubernetes apiserver token authentication file. See
-          <link xlink:href="https://kubernetes.io/docs/admin/authentication.html"/>
+          <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/authentication"/>
         '';
         default = null;
         type = types.nullOr types.path;
@@ -288,7 +288,7 @@ in {
       basicAuthFile = mkOption {
         description = ''
           Kubernetes apiserver basic authentication file. See
-          <link xlink:href="https://kubernetes.io/docs/admin/authentication.html"/>
+          <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/authentication"/>
         '';
         default = pkgs.writeText "users" ''
           kubernetes,admin,0
@@ -299,7 +299,7 @@ in {
       authorizationMode = mkOption {
         description = ''
           Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/RBAC). See
-          <link xlink:href="https://kubernetes.io/docs/admin/authorization.html"/>
+          <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/authorization/"/>
         '';
         default = ["RBAC" "Node"];
         type = types.listOf (types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "RBAC" "Node"]);
@@ -308,7 +308,7 @@ in {
       authorizationPolicy = mkOption {
         description = ''
           Kubernetes apiserver authorization policy file. See
-          <link xlink:href="https://kubernetes.io/docs/admin/authorization.html"/>
+          <link xlink:href="https://kubernetes.io/docs/reference/access-authn-authz/authorization/"/>
         '';
         default = [];
         type = types.listOf types.attrs;
@@ -332,7 +332,7 @@ in {
       runtimeConfig = mkOption {
         description = ''
           Api runtime configuration. See
-          <link xlink:href="https://kubernetes.io/docs/admin/cluster-management.html"/>
+          <link xlink:href="https://kubernetes.io/docs/tasks/administer-cluster/cluster-management/"/>
         '';
         default = "authentication.k8s.io/v1beta1=true";
         example = "api/all=false,api/v1=true";

From 8f71ce7e80caad32bfd4e85fb67c4e9fbca5a82d Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 24 May 2018 10:33:18 +0200
Subject: [PATCH 2454/3370] skopeo: 0.1.29 -> 0.1.30

Skopeo used by our docker tools was patched to work in the build
sandbox (it used /var/tmp which is not available in the sandbox).
Since this temporary directory can now be set at build time, we remove
the patch from our docker tools.
---
 pkgs/build-support/docker/default.nix     | 10 +---------
 pkgs/development/tools/skopeo/default.nix | 10 +++++++---
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 374b71d42a39..0aded149dd2d 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -52,15 +52,7 @@ rec {
       outputHashAlgo = "sha256";
       outputHash = sha256;
 
-      # One of the dependencies of Skopeo uses a hardcoded /var/tmp for storing
-      # big image files, which is not available in sandboxed builds.
-      nativeBuildInputs = lib.singleton (pkgs.skopeo.overrideAttrs (drv: {
-        postPatch = (drv.postPatch or "") + ''
-          sed -i -e 's!/var/tmp!/tmp!g' \
-            vendor/github.com/containers/image/storage/storage_image.go \
-            vendor/github.com/containers/image/internal/tmpdir/tmpdir.go
-        '';
-      }));
+      nativeBuildInputs = lib.singleton (pkgs.skopeo);
       SSL_CERT_FILE = "${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt";
 
       sourceURL = "docker://${imageName}@${imageDigest}";
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index bb99e887ac6f..0535a11e0ceb 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 
 let
-  version = "0.1.29";
+  version = "0.1.30";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "projectatomic";
     repo = "skopeo";
-    sha256 = "1lhzbyj2mm25x12s7g2jx4v8w19izjwlgx4lml13r5yy1spn65k2";
+    sha256 = "10lpiiki7mlhrp4bid40wys3lch7fars1whxsa5gy0frfgp89ghn";
   };
 
   defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out";
@@ -30,7 +30,11 @@ buildGoPackage rec {
   nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ];
   buildInputs = [ gpgme libgpgerror devicemapper btrfs-progs ostree libselinux ];
 
-  buildFlagsArray = "-ldflags= -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}";
+  buildFlagsArray = ''
+    -ldflags=
+    -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/signature.systemDefaultPolicyPath=${defaultPolicyFile}
+    -X github.com/projectatomic/skopeo/vendor/github.com/containers/image/internal/tmpdir.unixTempDirForBigFiles=/tmp
+  '';
 
   preBuild = ''
     export CGO_CFLAGS="-I${getDev gpgme}/include -I${getDev libgpgerror}/include -I${getDev devicemapper}/include -I${getDev btrfs-progs}/include"

From 00349e27e5449e3243ba7525446900a16e1f4c2b Mon Sep 17 00:00:00 2001
From: Luka Blaskovic <lblasc@tvbeat.com>
Date: Thu, 24 May 2018 13:43:15 +0000
Subject: [PATCH 2455/3370] lua packages: add init.lua to modules search path

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

diff --git a/pkgs/development/lua-modules/generic/default.nix b/pkgs/development/lua-modules/generic/default.nix
index 091ae06ab910..5669eae96c5e 100644
--- a/pkgs/development/lua-modules/generic/default.nix
+++ b/pkgs/development/lua-modules/generic/default.nix
@@ -29,9 +29,9 @@ else
           if [[ $LUA_PATH = *"$package_path"* ]]; then return; fi
 
           if [[ -z $LUA_PATH ]]; then
-            export LUA_PATH="$package_path/?.lua"
+            export LUA_PATH="$package_path/?.lua;$package_path/?/init.lua"
           else
-            export LUA_PATH="$LUA_PATH;$package_path/?.lua"
+            export LUA_PATH="$LUA_PATH;$package_path/?.lua;$package_path/?/init.lua"
           fi
         }
 

From c0e0c7046d1d1fdbb70f49376b7fb98f8a787920 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 23 May 2018 00:52:52 -0700
Subject: [PATCH 2456/3370] criu: 3.8.1 -> 3.9

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/criu/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/31grlhm7igrgi29fhmndki41a8f87cvs-criu-3.9/bin/crit had a zero exit code or showed the expected version
- /nix/store/31grlhm7igrgi29fhmndki41a8f87cvs-criu-3.9/bin/compel passed the binary check.
- /nix/store/31grlhm7igrgi29fhmndki41a8f87cvs-criu-3.9/bin/criu passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 0 of 3 passed binary check by having the new version present in output.
- found 3.9 with grep in /nix/store/31grlhm7igrgi29fhmndki41a8f87cvs-criu-3.9
- directory tree listing: https://gist.github.com/5db13cedfd351a5d1fd8ed3d70ccbac3
- du listing: https://gist.github.com/3a064c8b51705c90c1093a81ab9495ee
---
 pkgs/os-specific/linux/criu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index fc7a66dcf1b6..dba495d0dee5 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
-  version = "3.8.1";
+  version = "3.9";
 
   src = fetchurl {
     url    = "http://download.openvz.org/criu/${name}.tar.bz2";
-    sha256 = "0csyhsc5d6wkcjyvsp6h9x8zxn3zk574s84gfmy3gjagv3nwqd51";
+    sha256 = "0l71lmklr42pc2bj37pkp7y8va8bx42n9f6i4q4idsx4wrdd75fx";
   };
 
   enableParallelBuilding = true;

From c8987a72e4f346917f197443512c3810ecb9a8a2 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <eisfreak7@gmail.com>
Date: Thu, 24 May 2018 16:36:18 +0200
Subject: [PATCH 2457/3370] fplll: 5.2.0 -> 5.2.1, pythonPackages.fpylll:
 0.3.0dev -> 0.4.0dev (#40995)

---
 pkgs/development/libraries/fplll/default.nix       |  4 ++--
 pkgs/development/python-modules/fpylll/default.nix | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/fplll/default.nix b/pkgs/development/libraries/fplll/default.nix
index 2dd757bf8216..063217a45047 100644
--- a/pkgs/development/libraries/fplll/default.nix
+++ b/pkgs/development/libraries/fplll/default.nix
@@ -4,12 +4,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "fplll";
-  version = "5.2.0";
+  version = "5.2.1";
   src = fetchFromGitHub {
     owner = "${pname}";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "0931i4q49lzlifsg9zd8a2yzj626i1s2bqhkfxvcxv94c38s0nh1";
+    sha256 = "015qmrd7nfaysbv1hbwiprz9g6hnww1y1z1xw8f43ysb7k1b5nbg";
   };
   nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook];
   buildInputs = [gmp mpfr];
diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix
index 6ce069b31910..a27e9494911c 100644
--- a/pkgs/development/python-modules/fpylll/default.nix
+++ b/pkgs/development/python-modules/fpylll/default.nix
@@ -1,5 +1,5 @@
 { lib
-, fetchPypi
+, fetchFromGitHub
 , buildPythonPackage
 , pkgconfig
 , gmp
@@ -14,11 +14,13 @@
 
 buildPythonPackage rec {
   pname = "fpylll";
-  version = "0.3.0dev";
+  version = "0.4.1dev";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0bjkh02fnxsrxwjzai8ij12zl2wq319z8y25sn9pvvzla5izgnp9";
+  src = fetchFromGitHub {
+    owner = "fplll";
+    repo = "fpylll";
+    rev = version;
+    sha256 = "01x2sqdv0sbjj4g4waj0hj4rcn4bq7h17442xaqwbznym9azmn9w";
   };
 
   buildInputs = [

From 2e41891e6d595b9acf484d7d349b17a7b35b6923 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 May 2018 16:02:08 +0200
Subject: [PATCH 2458/3370] python.pkgs.openid: init at 2.2.5/3.1.0

---
 .../python-modules/python-openid/default.nix  | 20 +++++++++++++++++
 .../python-modules/python3-openid/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-openid/default.nix
 create mode 100644 pkgs/development/python-modules/python3-openid/default.nix

diff --git a/pkgs/development/python-modules/python-openid/default.nix b/pkgs/development/python-modules/python-openid/default.nix
new file mode 100644
index 000000000000..f25a89c65d44
--- /dev/null
+++ b/pkgs/development/python-modules/python-openid/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "python-openid";
+  name = "${pname}-${version}";
+  version = "2.2.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj";
+  };
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "OpenID support for modern servers and consumers";
+    homepage = http://github.com/openid/python-openid;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix
new file mode 100644
index 000000000000..2365918c7e48
--- /dev/null
+++ b/pkgs/development/python-modules/python3-openid/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi, defusedxml }:
+
+buildPythonPackage rec {
+  pname = "python3-openid";
+  name = "${pname}-${version}";
+  version = "3.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "00l5hrjh19740w00b3fnsqldnla41wbr2rics09dl4kyd1fkd3b2";
+  };
+
+  propagatedBuildInputs = [ defusedxml ];
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "OpenID support for modern servers and consumers";
+    homepage = http://github.com/necaris/python3-openid;
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6f595f27bffd..955831627a1f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -408,6 +408,10 @@ in {
 
   pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };
 
+  python-openid = callPackage (if isPy3k
+    then ../development/python-modules/python3-openid
+    else ../development/python-modules/python-openid) { };
+
   python-sql = callPackage ../development/python-modules/python-sql { };
 
   python-stdnum = callPackage ../development/python-modules/python-stdnum { };

From 6b29b2c3aa7408129147aee7040daf74435476e2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 May 2018 16:03:03 +0200
Subject: [PATCH 2459/3370] python.pkgs.django-allauth: init at 0.36.0

---
 .../python-modules/django-allauth/default.nix | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-allauth/default.nix

diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix
new file mode 100644
index 000000000000..a1968550afcc
--- /dev/null
+++ b/pkgs/development/python-modules/django-allauth/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
+, django, python-openid, mock, coverage }:
+
+buildPythonPackage rec {
+  pname = "django-allauth";
+  name = "${pname}-${version}";
+  version = "0.36.0";
+
+  # no tests on PyPI
+  src = fetchFromGitHub {
+    owner = "pennersr";
+    repo = pname;
+    rev = version;
+    sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan";
+  };
+
+  propagatedBuildInputs = [ requests requests_oauthlib django python-openid ];
+
+  checkInputs = [ coverage mock ];
+
+  doCheck = false;
+  checkPhase = ''
+    cd $NIX_BUILD_TOP/$sourceRoot
+    coverage run manage.py test allauth
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication";
+    homepage = https://www.intenct.nl/projects/django-allauth;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 955831627a1f..9fbb6a85ce7c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4713,6 +4713,8 @@ in {
     };
   };
 
+  django-allauth = callPackage ../development/python-modules/django-allauth { };
+
   django_appconf = callPackage ../development/python-modules/django_appconf { };
 
   django_colorful = buildPythonPackage rec {

From e24399325535c0b0b7c19ea8e73ff61409d79ff4 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 24 May 2018 16:37:35 +0200
Subject: [PATCH 2460/3370] python.pkgs.django-gravatar2: init at 1.4.2

---
 .../django-gravatar2/default.nix              | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-gravatar2/default.nix

diff --git a/pkgs/development/python-modules/django-gravatar2/default.nix b/pkgs/development/python-modules/django-gravatar2/default.nix
new file mode 100644
index 000000000000..5712ed4193fe
--- /dev/null
+++ b/pkgs/development/python-modules/django-gravatar2/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "django-gravatar2";
+  name = "${pname}-${version}";
+  version = "1.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qsv40xywbqsf4mkrmsswrpzqd7nfljxpfiim9an2z3dykn5rka6";
+  };
+
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Essential Gravatar support for Django";
+    homepage = https://github.com/twaddington/django-gravatar;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9fbb6a85ce7c..739c40b2d630 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4782,6 +4782,8 @@ in {
 
   django_extensions = callPackage ../development/python-modules/django-extensions { };
 
+  django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { };
+
   django_guardian = callPackage ../development/python-modules/django_guardian { };
 
   django-ipware = callPackage ../development/python-modules/django-ipware { };

From 5b468ea6b1d8d243847a05bdf5603e8abdfd7b4e Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 24 May 2018 22:42:16 +0800
Subject: [PATCH 2461/3370] nixos mysql: make start-up more robust (#41010)

1) Change start-type to ```notify``` when running MariaDB so that we don't have to busy-wait for the
socket to appear.

2) Do not manually create the directory under /run as we can get systemd to do
that for us. This opens up the possibility later for not having to launch as root.
---
 nixos/modules/services/databases/mysql.nix | 22 ++++++++++++----------
 nixos/tests/mysql.nix                      |  1 -
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix
index 66c9330c3550..15b9c788e872 100644
--- a/nixos/modules/services/databases/mysql.nix
+++ b/nixos/modules/services/databases/mysql.nix
@@ -231,8 +231,10 @@ in
 
     environment.systemPackages = [mysql];
 
-    systemd.services.mysql =
-      { description = "MySQL Server";
+    systemd.services.mysql = let
+      hasNotify = (cfg.package == pkgs.mariadb);
+    in {
+        description = "MySQL Server";
 
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
@@ -256,17 +258,16 @@ in
 
             mkdir -m 0755 -p ${cfg.pidDir}
             chown -R ${cfg.user} ${cfg.pidDir}
-
-            # Make the socket directory
-            mkdir -p /run/mysqld
-            chmod 0755 /run/mysqld
-            chown -R ${cfg.user} /run/mysqld
           '';
 
-        serviceConfig.ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
+        serviceConfig = {
+          Type = if hasNotify then "notify" else "simple";
+          RuntimeDirectory = "mysqld";
+          ExecStart = "${mysql}/bin/mysqld --defaults-extra-file=${myCnf} ${mysqldOptions}";
+        };
 
-        postStart =
-          ''
+        postStart = ''
+          ${lib.optionalString (!hasNotify) ''
             # Wait until the MySQL server is available for use
             count=0
             while [ ! -e /run/mysqld/mysqld.sock ]
@@ -281,6 +282,7 @@ in
                 count=$((count++))
                 sleep 1
             done
+          ''}
 
             if [ -f /tmp/mysql_init ]
             then
diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix
index baaebf9f10db..c18fee6c7495 100644
--- a/nixos/tests/mysql.nix
+++ b/nixos/tests/mysql.nix
@@ -19,7 +19,6 @@ import ./make-test.nix ({ pkgs, ...} : {
     startAll;
 
     $master->waitForUnit("mysql");
-    $master->sleep(10); # Hopefully this is long enough!!
     $master->succeed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
   '';
 })

From d437f2c365a12fb3894eb87f52decf53c745f475 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 24 May 2018 10:43:14 -0400
Subject: [PATCH 2462/3370] lib: Fix `nix-env -qaP -f . --xml --meta`

The function value cannot be serialized so nix-env was mad. Turns out we can
just remove it like we do in `lib/systems/inspect.nix`.
---
 lib/systems/for-meta.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 9e85cea3ad11..88cb0101410b 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -3,6 +3,8 @@ let
   inherit (lib.systems) parse;
   inherit (lib.systems.inspect) patterns;
 
+  abis = lib.mapAttrs (_: abi: builtins.removeAttrs abi [ "assertions" ]) parse.abis;
+
 in rec {
   all     = [ {} ]; # `{}` matches anything
   none    = [];
@@ -19,7 +21,7 @@ in rec {
   darwin  = [ patterns.isDarwin ];
   freebsd = [ patterns.isFreeBSD ];
   # Should be better, but MinGW is unclear, and HURD is bit-rotted.
-  gnu     = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ];
+  gnu     = [ { kernel = parse.kernels.linux; abi = abis.gnu; } ];
   illumos = [ patterns.isSunOS ];
   linux   = [ patterns.isLinux ];
   netbsd  = [ patterns.isNetBSD ];

From fb7428c50613a0f9e0d8ebc714abebee4e5d5cd2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 24 May 2018 11:10:20 +0200
Subject: [PATCH 2463/3370] nixos/slurm: enable munge by default, added note to
 slurm description

---
 nixos/modules/services/computing/slurm/slurm.nix | 16 +++++++++++++---
 nixos/tests/slurm.nix                            |  2 --
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 314cc3f61ecc..25df5030162c 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -32,12 +32,20 @@ in
     services.slurm = {
 
       server = {
-        enable = mkEnableOption "slurm control daemon";
-
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = ''
+            Wether to enable the slurm control daemon.
+            Note that the standard authentication method is "munge".
+            The "munge" service needs to be provided with a password file in order for
+            slurm to work properly (see <literal>services.munge.password<literal>).
+          '';
+        };
       };
 
       client = {
-        enable = mkEnableOption "slurm rlient daemon";
+        enable = mkEnableOption "slurm client daemon";
 
       };
 
@@ -161,6 +169,8 @@ in
 
     environment.systemPackages = [ wrappedSlurm ];
 
+    services.munge.enable = mkDefault true;
+
     systemd.services.slurmd = mkIf (cfg.client.enable) {
       path = with pkgs; [ wrappedSlurm coreutils ]
         ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index 0dd00dfb04c2..dc4f62af5640 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -20,7 +20,6 @@ in {
         # TODO slrumd port and slurmctld port should be configurations and
         # automatically allowed by the  firewall.
         networking.firewall.enable = false;
-        services.munge.enable = true;
         services.slurm = slurmconfig;
       };
     in {
@@ -28,7 +27,6 @@ in {
       { config, pkgs, ...}:
       {
         networking.firewall.enable = false;
-        services.munge.enable = true;
         services.slurm = {
           server.enable = true;
         } // slurmconfig;

From 96e5a8bce27c87d9a9e7999368d5c843d7a19049 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Thu, 24 May 2018 14:46:56 +0200
Subject: [PATCH 2464/3370] nixos/slurm: add slurm test to release.nix

---
 nixos/release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index f7c2943b96fa..8d9202e87b08 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -383,6 +383,7 @@ in rec {
   tests.sddm = callSubTests tests/sddm.nix {};
   tests.simple = callTest tests/simple.nix {};
   tests.slim = callTest tests/slim.nix {};
+  tests.slurm = callTest tests/slurm.nix {};
   tests.smokeping = callTest tests/smokeping.nix {};
   tests.snapper = callTest tests/snapper.nix {};
   tests.statsd = callTest tests/statsd.nix {};

From 291808359b354ee6931e7cf8cb1eaa295458e0d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Thu, 24 May 2018 17:09:15 +0200
Subject: [PATCH 2465/3370] nheko: 0.4.0 -> 0.4.1

---
 .../networking/instant-messengers/nheko/default.nix       | 8 ++++----
 .../instant-messengers/nheko/external-deps.patch          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 688ac6d10d6f..4d002a4a7531 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -17,8 +17,8 @@ let
     src = fetchFromGitHub {
       owner = "mujx";
       repo = "matrix-structs";
-      rev = "690080daa3bc1984297c4d7103cde9ea07e2e0b7";
-      sha256 = "0l6mncpdbjmrzp5a3q1jv0sxf7bwl5ljslrcjca1j2bjjbqb61bz";
+      rev = "5e57c2385a79b6629d1998fec4a7c0baee23555e";
+      sha256 = "112b7gnvr04g1ak7fnc7ch7w2n825j4qkw0jb49xx06ag93nb6m6";
     };
 
     postUnpack = ''
@@ -47,13 +47,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "1yg6bk193mqj99x3sy0f20x3ggpl0ahrp36w6hhx7pyw5qm17342";
+    sha256 = "14667a3d4y63wxcs2y49kly48k9nis365zzdk8yp6dn8fn5frqdx";
   };
 
   # This patch is likely not strictly speaking needed, but will help detect when
diff --git a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
index a3425a780454..fa388edfb75a 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
+++ b/pkgs/applications/networking/instant-messengers/nheko/external-deps.patch
@@ -54,7 +54,7 @@ index cef00f6..e69de29 100644
 -  MatrixStructs
 -
 -  GIT_REPOSITORY https://github.com/mujx/matrix-structs
--  GIT_TAG 690080daa3bc1984297c4d7103cde9ea07e2e0b7
+-  GIT_TAG 5e57c2385a79b6629d1998fec4a7c0baee23555e
 -
 -  BUILD_IN_SOURCE 1
 -  SOURCE_DIR ${MATRIX_STRUCTS_ROOT}

From ede496284176927269abd3ee7b6eb7093a8ce6ad Mon Sep 17 00:00:00 2001
From: Simon Lackerbauer <simon@lackerbauer.com>
Date: Wed, 21 Mar 2018 20:57:10 +0100
Subject: [PATCH 2466/3370] confluence: 6.6.1 -> 6.8.0

(cherry picked from commit a43d47121d33240e124f02cfe6b3124b28bfcf62)
---
 pkgs/servers/atlassian/confluence.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix
index a5d89b493e82..c3427b8029e5 100644
--- a/pkgs/servers/atlassian/confluence.nix
+++ b/pkgs/servers/atlassian/confluence.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "atlassian-confluence-${version}";
-  version = "6.6.1";
+  version = "6.8.0";
 
   src = fetchurl {
     url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
-    sha256 = "0nb8rjzfd0fqd9k1yxa3dj7kxgh84dgbg9l8jyj59g74ym77qmw0";
+    sha256 = "07awdbkjxkk4rbnpbb5xfjp4125c33bwxncmydlgzgk5fzy6dg2w";
   };
 
   phases = [ "unpackPhase" "buildPhase" "installPhase" ];

From bd3489e04ab67104c5f9b13d4b2aa64bcdff520d Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 24 May 2018 17:23:47 +0200
Subject: [PATCH 2467/3370] qtile: 0.10.7 -> 0.11.1

---
 .../0001-Substitution-vars-for-absolute-paths.patch  |  4 ++--
 .../qtile/0002-Restore-PATH-and-PYTHONPATH.patch     | 10 +++++-----
 .../qtile/0003-Restart-executable.patch              | 12 ++++++------
 pkgs/applications/window-managers/qtile/default.nix  |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
index 71d3d9cafaa3..219d6dcbe207 100644
--- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
+++ b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
@@ -23,8 +23,8 @@ index f1133555..3e61204a 100644
  
      def _setup_xcursor_binding(self):
          try:
--            xcursor = ffi.dlopen('libxcb-cursor.so')
-+            xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so')
+-            xcursor = ffi.dlopen('libxcb-cursor.so.0')
++            xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so.0')
          except OSError:
              logger.warning("xcb-cursor not found, fallback to font pointer")
              return False
diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
index 7d184838fbaa..a01f14062f1d 100644
--- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
+++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
@@ -43,13 +43,13 @@ index 5316e0e7..272c6430 100755
      from libqtile.scripts import qtile_top
      qtile_top.main()
 diff --git a/libqtile/utils.py b/libqtile/utils.py
-index 36ed0a58..bca9eab3 100644
+index 550ed02677e..1358a66f3df 100644
 --- a/libqtile/utils.py
 +++ b/libqtile/utils.py
-@@ -240,3 +240,11 @@ def describe_attributes(obj, attrs, func=None):
-             pairs.append('%s=%s' % (attr, value))
- 
-     return ', '.join(pairs)
+@@ -272,3 +272,11 @@ def safe_import(module_names, class_name, globals_, fallback=None):
+         logger.debug("%s", traceback.format_exc())
+         if fallback:
+             globals_[class_name] = fallback(module_path, class_name, error)
 +
 +
 +def restore_os_environment():
diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
index c9ae57c8615c..87fd19773794 100644
--- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
+++ b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
@@ -1,13 +1,13 @@
 diff --git a/libqtile/manager.py b/libqtile/manager.py
-index 36518a74..9b6bdd02 100644
+index fc198e9bae7..860b97d8db1 100644
 --- a/libqtile/manager.py
 +++ b/libqtile/manager.py
-@@ -1386,7 +1386,7 @@ class Qtile(command.CommandObject):
+@@ -1402,7 +1402,7 @@ class Qtile(command.CommandObject):
+             logger.error("Unable to pickle qtile state")
          argv = [s for s in argv if not s.startswith('--with-state')]
          argv.append('--with-state=' + buf.getvalue().decode())
- 
--        self.cmd_execute(sys.executable, argv)
-+        self.cmd_execute(os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:])
+-        self._restart = (sys.executable, argv)
++        self._restart = (os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:])
+         self.stop()
  
      def cmd_spawn(self, cmd):
-         """Run cmd in a shell.
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index f889bf29f71a..ba304ad0c817 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -7,13 +7,13 @@ in
 
 python27Packages.buildPythonApplication rec {
   name = "qtile-${version}";
-  version = "0.10.7";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "qtile";
     repo = "qtile";
     rev = "v${version}";
-    sha256 = "18szgplyym0b65vnaa8nqzadq6q0mhsiky9g5hqhn7xzf4kykmj8";
+    sha256 = "1jw6mh9m5yrijhm218lc51sc89lc2ihvyx30jhrkxy2mzllhjgrs";
   };
 
   patches = [

From 429d81db2b10dc641ec1a79e260ecc1effdc3842 Mon Sep 17 00:00:00 2001
From: Florian Jacob <projects+git@florianjacob.de>
Date: Thu, 24 May 2018 00:06:51 +0200
Subject: [PATCH 2468/3370] matrix-synapse: 0.28.1 -> 0.30.0

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

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 77bcc98da04e..423fbf027fb5 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.28.1";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "1xgiprnhp893zc0g3i7wpwzgjy6q5nb858p0s6kcsca60vr9j6h0";
+    sha256 = "10ggv7669ngxs8py82k8z24874ga0ldcxvpp7xhjpbr1s0gw8zv8";
   };
 
   patches = [

From 42af0d6ef9972b53c432eafec136fba431addfdc Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 24 May 2018 18:19:45 +0200
Subject: [PATCH 2469/3370] libqalculate: 2.3.0 -> 2.5.0

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

diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 1b15769465e1..a74095bce297 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "libqalculate-${version}";
-  version = "2.3.0";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz";
-    sha256 = "1wrd9ajf00h1ja56r25vljjsgklg0qlzmziax7x26wjqkigc28iq";
+    sha256 = "0xs2qjr93k43p6j126xj20fgb1n2jv56rhgc211yv1l46crbqxfv";
   };
 
   outputs = [ "out" "dev" "doc" ];

From d96cc05a6008b5cd7e6cf97f347def7ca9cce0db Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 24 May 2018 18:19:55 +0200
Subject: [PATCH 2470/3370] qalculate-gtk: 2.3.0 -> 2.5.0

---
 pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix
index ce3f975b85b8..11ae3852f067 100644
--- a/pkgs/applications/science/math/qalculate-gtk/default.nix
+++ b/pkgs/applications/science/math/qalculate-gtk/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qalculate-gtk-${version}";
-  version = "2.3.0";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "https://github.com/Qalculate/qalculate-gtk/archive/v${version}.tar.gz";
-    sha256 = "0j5wp6bmnwkyxlvqci6ddg478a0ms93gicvycw0c6bkvs2gd77az";
+    sha256 = "1hwwsdk3mlzvg9fsnv0hpj0s1lfkhycwv3sx2yrjwffzphhmxs7a";
   };
 
   patchPhase = ''

From 902b0593be857e4f19b9875638af6e854aa99a9b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 22 May 2018 20:25:04 -0400
Subject: [PATCH 2471/3370] tests/docker-tools: Adds regression test for #34779

---
 nixos/tests/docker-tools.nix           |  6 ++++++
 pkgs/build-support/docker/examples.nix | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 4466081d01e9..e2bcfbbd1f96 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -45,5 +45,11 @@ import ./make-test.nix ({ pkgs, ... }: {
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.onTopOfPulledImage}'");
       $docker->succeed("docker run --rm ontopofpulledimage hello");
       $docker->succeed("docker rmi ontopofpulledimage");
+
+      # Regression test for issue #34779
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.runAsRootExtraCommands}'");
+      $docker->succeed("docker run --rm runasrootextracommands cat extraCommands");
+      $docker->succeed("docker run --rm runasrootextracommands cat runAsRoot");
+      $docker->succeed("docker rmi '${pkgs.dockerTools.examples.runAsRootExtraCommands.imageName}'");
     '';
 })
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index eb5b9fe36e41..ca7f78093794 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -124,4 +124,16 @@ rec {
     fromImage = nixFromDockerHub;
     contents = [ pkgs.hello ];
   };
+
+  # 8. regression test for erroneous use of eval and string expansion.
+  # See issue #34779 and PR #40947 for details.
+  runAsRootExtraCommands = pkgs.dockerTools.buildImage {
+    name = "runAsRootExtraCommands";
+    contents = [ pkgs.coreutils ];
+    # The parens here are to create problematic bash to embed and eval. In case
+    # this is *embedded* into the script (with nix expansion) the initial quotes
+    # will close the string and the following parens are unexpected
+    runAsRoot = ''echo "(runAsRoot)" > runAsRoot'';
+    extraCommands = ''echo "(extraCommand)" > extraCommands'';
+  };
 }

From 0e84af17727a8355920057e81cb12bf3f6ee7a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Thu, 24 May 2018 19:00:40 +0200
Subject: [PATCH 2472/3370] nheko: make darwin build fail later

---
 .../instant-messengers/nheko/default.nix      | 23 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 4d002a4a7531..d3c0a6f8eca2 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchFromGitHub, fetchurl, cmake, doxygen, lmdb, qt5 }:
+{
+  lib, stdenv, fetchFromGitHub, fetchurl,
+  cmake, doxygen, lmdb, qt5, qtmacextras
+}:
 
 let
   json_hpp = fetchurl {
@@ -60,6 +63,22 @@ stdenv.mkDerivation rec {
   # a dependency is updated, so that the fetches up there can be updated too
   patches = [ ./external-deps.patch ];
 
+  # If, on Darwin, you encounter the error
+  #   error: must specify at least one argument for '...' parameter of variadic
+  #   macro [-Werror,-Wgnu-zero-variadic-macro-arguments]
+  # Then adding this parameter is likely the fix you want.
+  #
+  # However, it looks like either cmake doesn't honor this CFLAGS variable, or
+  # darwin's compiler doesn't have the same syntax as gcc for turning off
+  # -Werror selectively.
+  #
+  # Anyway, this is something that will have to be debugged with access to a
+  # darwin-based OS. Sorry about that!
+  #
+  #preConfigure = lib.optionalString stdenv.isDarwin ''
+  #  export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments
+  #'';
+
   cmakeFlags = [
     "-DMATRIX_STRUCTS_LIBRARY=${matrix-structs}/lib/static/libmatrix_structs.a"
     "-DMATRIX_STRUCTS_INCLUDE_DIR=${matrix-structs}/include/matrix_structs"
@@ -71,7 +90,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     lmdb lmdbxx matrix-structs qt5.qtbase qt5.qtmultimedia qt5.qttools tweeny
-  ];
+  ] ++ lib.optional stdenv.isDarwin qtmacextras;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19e956e7a76..4287bf5afeef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17247,7 +17247,7 @@ with pkgs;
 
   nedit = callPackage ../applications/editors/nedit { };
 
-  nheko = callPackage ../applications/networking/instant-messengers/nheko { };
+  nheko = libsForQt5.callPackage ../applications/networking/instant-messengers/nheko { };
 
   nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { };
 

From 736d6e3b790de795bb24546b6a4423b7cb9eaf67 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 24 May 2018 12:47:48 -0700
Subject: [PATCH 2473/3370] smplayer: 18.4.0 -> 18.5.0 (#41040)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/smplayer/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/mll3p02g4sfglbg8d7z54y748z16rhwr-smplayer-18.5.0/bin/smplayer had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mll3p02g4sfglbg8d7z54y748z16rhwr-smplayer-18.5.0/bin/simple_web_server had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 18.5.0 with grep in /nix/store/mll3p02g4sfglbg8d7z54y748z16rhwr-smplayer-18.5.0
- directory tree listing: https://gist.github.com/68e3b40c30899a9dbba0225f52760bda
- du listing: https://gist.github.com/e7152199c8f96f4ba4fdcc614d54f3d8
---
 pkgs/applications/video/smplayer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 49444e350de4..75dbb06235b9 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-18.4.0";
+  name = "smplayer-18.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "0q2fbg41djyxsy6jinlnidpcqxvs9bi91ga3fwlgnfh6kxsw2ldd";
+    sha256 = "0fxd8zmp5dyk7y9yymjhj2i5218nfvfqb4830pgzzjqz1zdax8rn";
   };
 
   buildInputs = [ qtscript ];

From 99e0fb044fd5c49bad4dc746a4bc666d2c7e2b68 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 24 May 2018 22:10:58 +0200
Subject: [PATCH 2474/3370] colm: 0.13.0.5 -> 0.13.0.6

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

diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index 06c4b62e2946..ffbe3c5a62f4 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "colm-${version}";
-  version = "0.13.0.5";
+  version = "0.13.0.6";
 
   src = fetchurl {
     url = "http://www.colm.net/files/colm/${name}.tar.gz";
-    sha256 = "1320bx96ycd1xwww137cixrb983838wnrgkfsym8x5bnf5kj9rik";
+    sha256 = "0jd3qmqdm8yszy0yysbp3syk7pcbxvwzv9mibdwz7v9bv1nrai26";
   };
 
   nativeBuildInputs = [ makeWrapper asciidoc ];

From 9dc009926fa5b5b245f4672931e84ede966aaa55 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 24 May 2018 22:16:00 +0200
Subject: [PATCH 2475/3370] ragel: 7.0.0.10 -> 7.0.0.11

---
 pkgs/development/tools/parsing/ragel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 6b497e456300..cd1cb0efd123 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -43,8 +43,8 @@ in
   };
 
   ragelDev = generic {
-    version = "7.0.0.10";
-    sha256 = "1v4ddzxal4gf8l8nkn32qabba6nbpd2mg8sphgmdn8kaqv52nmj0";
+    version = "7.0.0.11";
+    sha256 = "0h2k9bfz9i7x9mvr9rbsrzz8fk17756zwwrkf3fppvm9ivzwdfh8";
     license = stdenv.lib.licenses.mit;
   };
 }

From 3b336d0c180f8d6615c92695d446de59804baf47 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 24 May 2018 22:28:57 +0200
Subject: [PATCH 2476/3370] perlPackages.DateManip: disable tests on i686

Build froze and timed out during tests on i686.
---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6f4b0649a126..4a0f258bb2da 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3632,6 +3632,7 @@ let self = _self // overrides; _self = with self; {
     patchPhase = ''
       sed -i "s#/bin/date#${pkgs.coreutils}/bin/date#" lib/Date/Manip/TZ.pm
     '';
+    doCheck = !stdenv.isi686; # build freezes during tests on i686
     meta = {
       description = "Date manipulation routines";
     };

From 7ba417aecae9c193f698995909df8a89c901320d Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 24 May 2018 22:56:57 +0200
Subject: [PATCH 2477/3370] nixos/slurm: fix xml tag mismatch in manual

build of nixos manual broke because of mismatched xml tags
in an option description introduced in #41016.
---
 nixos/modules/services/computing/slurm/slurm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 25df5030162c..3e513ab15717 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -39,7 +39,7 @@ in
             Wether to enable the slurm control daemon.
             Note that the standard authentication method is "munge".
             The "munge" service needs to be provided with a password file in order for
-            slurm to work properly (see <literal>services.munge.password<literal>).
+            slurm to work properly (see <literal>services.munge.password</literal>).
           '';
         };
       };

From 10c973ef80b182d2ebc1e64cc6bf55ec9c8020f0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 24 May 2018 14:41:19 -0700
Subject: [PATCH 2478/3370] nanomsg: 1.1.2 -> 1.1.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/nanomsg/versions.

These checks were done:

- built on NixOS
- /nix/store/ixs53g4hgmjsapmv98rhp13dxnia80v7-nanomsg-1.1.3/bin/nanocat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.1.3 with grep in /nix/store/ixs53g4hgmjsapmv98rhp13dxnia80v7-nanomsg-1.1.3
- directory tree listing: https://gist.github.com/cdb8b58cd0b2200dc629e5ed3c05af8b
- du listing: https://gist.github.com/76b99cc11ac487811d0eeff14406bfce
---
 pkgs/development/libraries/nanomsg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 99c9c5f16001..4950624a0b66 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -1,14 +1,14 @@
 { stdenv, cmake, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.2";
+  version = "1.1.3";
   name = "nanomsg-${version}";
 
   src = fetchFromGitHub {
     owner = "nanomsg";
     repo = "nanomsg";
     rev = version;
-    sha256 = "1zvs91afsg61azfv5fldv84gnhf76w3yndkdvpvaprlacxbxdvf5";
+    sha256 = "0mckz63rm0hpnln7mkg79bwiybydzbxyzyb39y2m1bjj8xwxkp2m";
   };
 
   buildInputs = [ cmake ];

From b0d0b1adfe917f2fadd49fc4931fbfb61f762c60 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Thu, 24 May 2018 14:43:31 -0700
Subject: [PATCH 2479/3370] clang_6: fix sanitizers under libstdc++

---
 pkgs/build-support/cc-wrapper/default.nix     |  4 ++--
 pkgs/development/compilers/llvm/6/default.nix | 13 +++++++++----
 pkgs/test/cc-wrapper/default.nix              |  2 --
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index a0955088eb7b..7a18993d607f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -9,7 +9,7 @@
 , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
 , extraPackages ? [], extraBuildCommands ? ""
-, isGNU ? false, isClang ? cc.isClang or false, isCompilerRT ? false, gnugrep ? null
+, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 , buildPackages ? {}
 }:
 
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
     # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
     # unused middle-ground name that evokes both.
     inherit bintools;
-    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang isCompilerRT default_cxx_stdlib_compile;
+    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index da5a97a9bbaa..17c743c04082 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -38,10 +38,16 @@ let
 
     clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang;
 
-    libstdcxxClang = wrapCCWith {
+    libstdcxxClang = wrapCCWith rec {
       cc = tools.clang-unwrapped;
-      extraPackages = [ libstdcxxHook ];
-      extraBuildCommands = stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+      extraPackages = [ libstdcxxHook targetLlvmLibraries.compiler-rt ];
+      extraBuildCommands = ''
+        rsrc="$out/resource-root"
+        mkdir "$rsrc"
+        ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+        ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+      '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
         echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
       '';
     };
@@ -53,7 +59,6 @@ let
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
       ];
-      isCompilerRT = true;
       extraBuildCommands = ''
         rsrc="$out/resource-root"
         mkdir "$rsrc"
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 06113e40561b..87d070f56162 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -38,11 +38,9 @@ stdenv.mkDerivation {
 
     NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
     ./ldflags-check
-  '' + stdenv.lib.optionalString (stdenv.cc.isCompilerRT or false) ''
 
     $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
     ./sanitizers
-  '' + ''
 
     touch $out
   '';

From c42cb40291f6d9a004b073741cd730a363f600e9 Mon Sep 17 00:00:00 2001
From: Daniel Frank <github-523@danielfrank.net>
Date: Fri, 25 May 2018 00:44:04 +0200
Subject: [PATCH 2480/3370] nixos/systemd-timesyncd: use the correct server
 list (#40919)

---
 nixos/modules/system/boot/timesyncd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/timesyncd.nix b/nixos/modules/system/boot/timesyncd.nix
index f643723ab141..57853c5698d0 100644
--- a/nixos/modules/system/boot/timesyncd.nix
+++ b/nixos/modules/system/boot/timesyncd.nix
@@ -34,7 +34,7 @@ with lib;
 
     environment.etc."systemd/timesyncd.conf".text = ''
       [Time]
-      NTP=${concatStringsSep " " config.services.ntp.servers}
+      NTP=${concatStringsSep " " config.services.timesyncd.servers}
     '';
 
     users.extraUsers.systemd-timesync.uid = config.ids.uids.systemd-timesync;

From 0527b325a4ba1f28d00abbf89b15cc1a208b452f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 24 May 2018 15:49:32 -0700
Subject: [PATCH 2481/3370] pdfgrep: 2.1.0 -> 2.1.1 (#41048)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pdfgrep/versions.

These checks were done:

- built on NixOS
- /nix/store/x24n7dayjdzkr7spig1qvhq9vadgswyh-pdfgrep-2.1.1/bin/pdfgrep passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.1.1 with grep in /nix/store/x24n7dayjdzkr7spig1qvhq9vadgswyh-pdfgrep-2.1.1
- directory tree listing: https://gist.github.com/f441dd82cfb9701f3e9ae1fc9653b4f0
- du listing: https://gist.github.com/23df51a35a4e7e35c11787490219aea1
---
 pkgs/tools/typesetting/pdfgrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index 3509eb569b1c..59da3c1ccda2 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pdfgrep-${version}";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "https://pdfgrep.org/download/${name}.tar.gz";
-    sha256 = "13al23c2wlpsha6c1z1h6gh5lxzphsnzpd7b78qj16rq2r46phf9";
+    sha256 = "02qcl5kmr5qzjfc99qpbpfb1890bxlrq3r208gnding51zrmb09c";
   };
 
   postPatch = ''

From 0541762f069a994befed6df06958326135f9af3b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 23 May 2018 19:28:14 +0300
Subject: [PATCH 2482/3370] efivar: Split into multiple outputs

---
 pkgs/tools/system/efivar/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/system/efivar/default.nix b/pkgs/tools/system/efivar/default.nix
index 458820440947..6c0bcb406218 100644
--- a/pkgs/tools/system/efivar/default.nix
+++ b/pkgs/tools/system/efivar/default.nix
@@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
   name = "efivar-${version}";
   version = "35";
 
+  outputs = [ "bin" "out" "dev" "man" ];
+
   src = fetchFromGitHub {
     owner = "rhinstaller";
     repo = "efivar";
@@ -17,6 +19,10 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "prefix=$(out)"
     "libdir=$(out)/lib"
+    "bindir=$(bin)/bin"
+    "mandir=$(man)/share/man"
+    "includedir=$(dev)/include"
+    "PCDIR=$(dev)/lib/pkgconfig"
   ];
 
   meta = with stdenv.lib; {

From 402ab2134f732ee25b2cd747cbe824ca8f38c20d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 23 May 2018 19:33:22 +0300
Subject: [PATCH 2483/3370] ntfs-3g: Split into multiple outputs

---
 pkgs/tools/filesystems/ntfs-3g/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix
index 4bcef5a83f04..7ee54a63fbb8 100644
--- a/pkgs/tools/filesystems/ntfs-3g/default.nix
+++ b/pkgs/tools/filesystems/ntfs-3g/default.nix
@@ -6,6 +6,8 @@ stdenv.mkDerivation rec {
   version = "2017.3.23";
   name = "${pname}-${version}";
 
+  outputs = [ "out" "dev" "man" "doc" ];
+
   buildInputs = [ libuuid ] ++ stdenv.lib.optionals crypto [ gnutls libgcrypt ];
   nativeBuildInputs = stdenv.lib.optional crypto pkgconfig;
 

From 91117f0d1d335d850da2450adee06a5ff4c6ea4c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 23 May 2018 19:38:26 +0300
Subject: [PATCH 2484/3370] nixos/installer: Drop dmraid

This seems some obsolete software RAID configuration program that hasn't
been updated since 2010.
---
 nixos/modules/profiles/base.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 52481d90eab9..406a69722de6 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -29,7 +29,6 @@
     # Hardware-related tools.
     pkgs.sdparm
     pkgs.hdparm
-    pkgs.dmraid
     pkgs.smartmontools # for diagnosing hard disks
     pkgs.pciutils
     pkgs.usbutils

From 26432f3e535a8e11727f58f02c9161723bf326ec Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 23 May 2018 20:59:42 +0300
Subject: [PATCH 2485/3370] syslinux: Slim down closure size

---
 pkgs/os-specific/linux/syslinux/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index f1e5cc6e2625..8a87d3fce580 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram $out/bin/syslinux \
       --prefix PATH : "${mtools}/bin"
+
+    # Delete com32 headers to save space, nobody seems to be using them
+    rm -rf $out/share/syslinux/com32
   '';
 
   meta = with stdenv.lib; {

From f8dc087c71be3ffe1d9d5dd19b65b10f9963af14 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 23 May 2018 21:05:42 +0300
Subject: [PATCH 2486/3370] parted: Split into multiple outputs

---
 pkgs/tools/misc/parted/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix
index 3a05a1927dbc..0a0cece4fce6 100644
--- a/pkgs/tools/misc/parted/default.nix
+++ b/pkgs/tools/misc/parted/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1r3qpg3bhz37mgvp9chsaa3k0csby3vayfvz8ggsqz194af5i2w5";
   };
 
+  outputs = [ "out" "dev" "man" "info" ];
+
   patches = stdenv.lib.optional doCheck ./gpt-unicode-test-fix.patch
     ++ stdenv.lib.optional stdenv.hostPlatform.isMusl
     (fetchpatch {

From 696c6bed4e8e2d9fd9b956dea7e5d49531e9d13f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 24 May 2018 00:55:05 +0300
Subject: [PATCH 2487/3370] w3m: Add a variant without graphics support and use
 for NixOS manual

This gets rid of various graphics libraries from the minimal installer.
---
 nixos/modules/services/misc/nixos-manual.nix | 2 +-
 pkgs/top-level/all-packages.nix              | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 4bd1c20edf71..3916c3052e8b 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -99,7 +99,7 @@ in
 
     services.nixosManual.browser = mkOption {
       type = types.path;
-      default = "${pkgs.w3m-nox}/bin/w3m";
+      default = "${pkgs.w3m-nographics}/bin/w3m";
       description = ''
         Browser used to show the manual.
       '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 712fe6f6386a..ae5da9a8a622 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18552,6 +18552,12 @@ with pkgs;
     imlib2 = imlib2-nox;
   };
 
+  # Version without X11 or graphics
+  w3m-nographics = w3m.override {
+    x11Support = false;
+    graphicsSupport = false;
+  };
+
   # Version for batch text processing, not a good browser
   w3m-batch = w3m.override {
     graphicsSupport = false;

From 7f04fd825d465de0e41c761482e4846b06a4cce5 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 25 May 2018 10:38:09 +0300
Subject: [PATCH 2488/3370] zathura: 0.3.9 -> 0.4.0

---
 pkgs/applications/misc/zathura/core/default.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index 84dc14451532..415995a828d6 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, meson, ninja, makeWrapper, pkgconfig
+{ stdenv, fetchurl, meson, ninja, makeWrapper, pkgconfig
 , appstream-glib, desktop-file-utils, python3
 , gtk, girara, ncurses, gettext, libxml2
 , file, sqlite, glib, texlive, libintl, libseccomp
@@ -11,20 +11,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "zathura-core-${version}";
-  version = "0.3.9";
+  version = "0.4.0";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz";
-    sha256 = "0z09kz92a2n8qqv3cy8bx5j5k612g2f9mmh4szqlc7yvi39aax1g";
+    sha256 = "1j0yah09adv3bsjhhbqra5lambal32svk8fxmf89wwmcqrcr4qma";
   };
 
-  patches = [
-    (fetchpatch {
-      url = https://git.pwmt.org/pwmt/zathura/commit/4223464db68529f9a2064ed760fb7746b3c0df6b.patch;
-      sha256 = "004j68b7c8alxzyx0d80lr5i43cgh7lbqm5fx3d77ihci7hdmxnw";
-    })
-  ];
-
   nativeBuildInputs = [
     meson ninja pkgconfig appstream-glib desktop-file-utils python3.pkgs.sphinx
     gettext makeWrapper libxml2

From 8033f52a12980518a416dd5e240cac980d0ddeb9 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 25 May 2018 10:27:02 +0200
Subject: [PATCH 2489/3370] fstar: 0.9.5.0 -> 0.9.6.0

---
 pkgs/development/compilers/fstar/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
index 6df09b402f7c..94836e84fd68 100644
--- a/pkgs/development/compilers/fstar/default.nix
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "fstar-${version}";
-  version = "0.9.5.0";
+  version = "0.9.6.0";
 
   src = fetchFromGitHub {
     owner = "FStarLang";
     repo = "FStar";
     rev = "v${version}";
-    sha256 = "1pi2ny3kpmvm85x8w98anhjf0hp0wccc51m7v697qypn5cl4ydqk";
+    sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = with ocamlPackages; [
     z3 ocaml findlib batteries menhir stdint
     zarith camlp4 yojson pprint
+    ulex ocaml-migrate-parsetree process ppx_deriving ppx_deriving_yojson ocamlbuild
   ];
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -26,8 +27,10 @@ stdenv.mkDerivation rec {
   '';
   buildFlags = "-C src/ocaml-output";
 
+  preInstall = ''
+    mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib
+  '';
   installFlags = "-C src/ocaml-output";
-
   postInstall = ''
     wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin"
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae5da9a8a622..8954f091594d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6469,7 +6469,7 @@ with pkgs;
   };
 
   fstar = callPackage ../development/compilers/fstar {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_02;
+    ocamlPackages = ocaml-ng.ocamlPackages_4_06;
   };
 
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});

From 996849ab8644c637ba7b22ebcca1852f5a113fdf Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Fri, 30 Mar 2018 19:16:32 -0400
Subject: [PATCH 2490/3370] kubernetes: update to 1.10

---
 nixos/modules/rename.nix                      |  1 +
 .../services/cluster/kubernetes/default.nix   | 52 ++++++++++++++++---
 .../networking/cluster/kubernetes/default.nix |  8 +--
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 8820a6da8c0b..b15dd84999a9 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -31,6 +31,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "i2pd" "extIp" ] [ "services" "i2pd" "address" ])
     (mkRenamedOptionModule [ "services" "kibana" "host" ] [ "services" "kibana" "listenAddress" ])
+    (mkRenamedOptionModule [ "services" "kubernetes" "apiserver" "admissionControl" ] [ "services" "kubernetes" "apiserver" "enableAdmissionPlugins" ])
     (mkRenamedOptionModule [ "services" "logstash" "address" ] [ "services" "logstash" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "mpd" "network" "host" ] [ "services" "mpd" "network" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "neo4j" "host" ] [ "services" "neo4j" "listenAddress" ])
diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index d0309ebd5b8a..8216e686facd 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -5,6 +5,37 @@ with lib;
 let
   cfg = config.services.kubernetes;
 
+  # YAML config; see:
+  #   https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/
+  #   https://github.com/kubernetes/kubernetes/blob/release-1.10/pkg/kubelet/apis/kubeletconfig/v1beta1/types.go
+  #
+  # TODO: migrate the following flags to this config file
+  #
+  #   --pod-manifest-path
+  #   --address
+  #   --port
+  #   --tls-cert-file
+  #   --tls-private-key-file
+  #   --client-ca-file
+  #   --authentication-token-webhook
+  #   --authentication-token-webhook-cache-ttl
+  #   --authorization-mode
+  #   --healthz-bind-address
+  #   --healthz-port
+  #   --allow-privileged
+  #   --cluster-dns
+  #   --cluster-domain
+  #   --hairpin-mode
+  #   --feature-gates
+  kubeletConfig = pkgs.runCommand "kubelet-config.yaml" { } ''
+    echo > $out ${pkgs.lib.escapeShellArg (builtins.toJSON {
+      kind = "KubeletConfiguration";
+      apiVersion = "kubelet.config.k8s.io/v1beta1";
+      ${if cfg.kubelet.applyManifests then "staticPodPath" else null} =
+        manifests;
+    })}
+  '';
+
   skipAttrs = attrs: map (filterAttrs (k: v: k != "enable"))
     (filter (v: !(hasAttr "enable" v) || v.enable) attrs);
 
@@ -339,9 +370,9 @@ in {
         type = types.str;
       };
 
-      admissionControl = mkOption {
+      enableAdmissionPlugins = mkOption {
         description = ''
-          Kubernetes admission control plugins to use. See
+          Kubernetes admission control plugins to enable. See
           <link xlink:href="https://kubernetes.io/docs/admin/admission-controllers/"/>
         '';
         default = ["NamespaceLifecycle" "LimitRanger" "ServiceAccount" "ResourceQuota" "DefaultStorageClass" "DefaultTolerationSeconds" "NodeRestriction"];
@@ -353,6 +384,15 @@ in {
         type = types.listOf types.str;
       };
 
+      disableAdmissionPlugins = mkOption {
+        description = ''
+          Kubernetes admission control plugins to disable. See
+          <link xlink:href="https://kubernetes.io/docs/admin/admission-controllers/"/>
+        '';
+        default = [];
+        type = types.listOf types.str;
+      };
+
       serviceAccountKeyFile = mkOption {
         description = ''
           Kubernetes apiserver PEM-encoded x509 RSA private or public key file,
@@ -573,6 +613,7 @@ in {
         type = types.bool;
       };
 
+      # TODO: remove this deprecated flag
       cadvisorPort = mkOption {
         description = "Kubernetes kubelet local cadvisor port.";
         default = 4194;
@@ -783,12 +824,10 @@ in {
         serviceConfig = {
           Slice = "kubernetes.slice";
           ExecStart = ''${cfg.package}/bin/kubelet \
-            ${optionalString cfg.kubelet.applyManifests
-              "--pod-manifest-path=${manifests}"} \
             ${optionalString (taints != "")
               "--register-with-taints=${taints}"} \
             --kubeconfig=${mkKubeConfig "kubelet" cfg.kubelet.kubeconfig} \
-            --require-kubeconfig \
+            --config=${kubeletConfig} \
             --address=${cfg.kubelet.address} \
             --port=${toString cfg.kubelet.port} \
             --register-node=${boolToString cfg.kubelet.registerNode} \
@@ -899,7 +938,8 @@ in {
             --service-cluster-ip-range=${cfg.apiserver.serviceClusterIpRange} \
             ${optionalString (cfg.apiserver.runtimeConfig != "")
               "--runtime-config=${cfg.apiserver.runtimeConfig}"} \
-            --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \
+            --enable-admission-plugins=${concatStringsSep "," cfg.apiserver.enableAdmissionPlugins} \
+            --disable-admission-plugins=${concatStringsSep "," cfg.apiserver.disableAdmissionPlugins} \
             ${optionalString (cfg.apiserver.serviceAccountKeyFile!=null)
               "--service-account-key-file=${cfg.apiserver.serviceAccountKeyFile}"} \
             ${optionalString cfg.verbose "--v=6"} \
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index e1023afc7aba..c2d0fa3e7063 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -7,7 +7,7 @@
     "cmd/kube-apiserver"
     "cmd/kube-controller-manager"
     "cmd/kube-proxy"
-    "plugin/cmd/kube-scheduler"
+    "cmd/kube-scheduler"
     "test/e2e/e2e.test"
   ]
 }:
@@ -16,16 +16,16 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.9.7";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "1dykh48c6bvypg51mlxjdyrggpjq597mjj83xgj1pfadsy6pp9bh";
+    sha256 = "0k6m55p0q8qscg8l7y1ymmp5vc3i07znqk61g4hs1gx0dj3id6mc";
   };
 
-  # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60373
+  # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60597
   buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
 
   outputs = ["out" "man" "pause"];

From 3e3917bb9ef74fe1f63854337d28bd9f01d8461f Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Wed, 23 May 2018 12:24:31 +0200
Subject: [PATCH 2491/3370] kubernetes: 1.10.0 -> 1.10.3

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

diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index c2d0fa3e7063..68f281bf0047 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -16,13 +16,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "kubernetes-${version}";
-  version = "1.10.0";
+  version = "1.10.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "kubernetes";
     rev = "v${version}";
-    sha256 = "0k6m55p0q8qscg8l7y1ymmp5vc3i07znqk61g4hs1gx0dj3id6mc";
+    sha256 = "1la9cdf5a67kg72xn4bn5mib1caiv5vxsjmnxqsmx0m7vhbv5i4n";
   };
 
   # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60597

From 0ea8a4b6680ff1089fa72629c06eea36b5860a55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 25 May 2018 01:57:01 -0700
Subject: [PATCH 2492/3370] abcm2ps: 8.13.21 -> 8.13.22 (#41066)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/abcm2ps/versions.

These checks were done:

- built on NixOS
- /nix/store/p5sx9sz4nxcijlz57dmys7gxhwqglmhg-abcm2ps-8.13.22/bin/abcm2ps passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 8.13.22 with grep in /nix/store/p5sx9sz4nxcijlz57dmys7gxhwqglmhg-abcm2ps-8.13.22
- directory tree listing: https://gist.github.com/5a223ca34ee0df856ba6919ac9a3f929
- du listing: https://gist.github.com/8a98226e349bfc9d005c36768be801c8
---
 pkgs/tools/audio/abcm2ps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix
index 6d782fdba35c..e9eec597384c 100644
--- a/pkgs/tools/audio/abcm2ps/default.nix
+++ b/pkgs/tools/audio/abcm2ps/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "abcm2ps-${version}";
-  version = "8.13.21";
+  version = "8.13.22";
 
   src = fetchFromGitHub {
     owner = "leesavide";
     repo = "abcm2ps";
     rev = "v${version}";
-    sha256 = "03r98xdw2vdwsi726i0zb7p0ljp3fpzjl1nhzfwz57m3zmqvz6r1";
+    sha256 = "0csfg7aj9zg369q3c3bg18f24lk1j0356a90zlbrz7y5p668g3pv";
   };
 
   prePatch = ''

From 55fa98dd76658309d0f9045f4a901637e5e7bf5d Mon Sep 17 00:00:00 2001
From: Alberto Berti <alberto@metapensiero.it>
Date: Wed, 23 May 2018 16:26:05 +0200
Subject: [PATCH 2493/3370] Kuberbetes DNS addon 1.14.4 -> 1.14.10

As shipped with k8s 1.10.3.

Also:
- updated the definition jsons as they are distributed in k8s.
- updated the image uris as they are renamed in k8s
- added imageDigest param as per 736848723e5aefa5d24396c58dc6de603399efde
---
 .../services/cluster/kubernetes/dns.nix       | 123 +++++++++---------
 1 file changed, 62 insertions(+), 61 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/dns.nix b/nixos/modules/services/cluster/kubernetes/dns.nix
index 939f58fc41b7..9751e5f7cf0a 100644
--- a/nixos/modules/services/cluster/kubernetes/dns.nix
+++ b/nixos/modules/services/cluster/kubernetes/dns.nix
@@ -3,27 +3,27 @@
 with lib;
 
 let
-  version = "1.14.4";
+  version = "1.14.10";
 
   k8s-dns-kube-dns = pkgs.dockerTools.pullImage {
-    imageName = "gcr.io/google_containers/k8s-dns-kube-dns-amd64";
+    imageName = "k8s.gcr.io/k8s-dns-kube-dns-amd64";
+    imageDigest = "sha256:b99fc3eee2a9f052f7eb4cc00f15eb12fc405fa41019baa2d6b79847ae7284a8";
     finalImageTag = version;
-    sha256 = "0q97xfqrigrfjl2a9cxl5in619py0zv44gch09jm8gqjkxl80imp";
-    imageDigest = "sha256:40790881bbe9ef4ae4ff7fe8b892498eecb7fe6dcc22661402f271e03f7de344";
+    sha256 = "0x583znk9smqn0fix7ld8sm5jgaxhqhx3fq97b1wkqm7iwhvl3pj";
   };
 
   k8s-dns-dnsmasq-nanny = pkgs.dockerTools.pullImage {
-    imageName = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64";
+    imageName = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64";
+    imageDigest = "sha256:bbb2a290a568125b3b996028958eb773f33b5b87a6b37bf38a28f8b62dddb3c8";
     finalImageTag = version;
-    sha256 = "051w5ca4qb88mwva4hbnh9xzlsvv7k1mbk3wz50lmig2mqrqqx6c";
-    imageDigest = "sha256:aeeb994acbc505eabc7415187cd9edb38cbb5364dc1c2fc748154576464b3dc2";
+    sha256 = "1fihml7s2mfwgac51cbqpylkwbivc8nyhgi4vb820s83zvl8a6y1";
   };
 
   k8s-dns-sidecar = pkgs.dockerTools.pullImage {
-    imageName = "gcr.io/google_containers/k8s-dns-sidecar-amd64";
+    imageName = "k8s.gcr.io/k8s-dns-sidecar-amd64";
+    imageDigest = "sha256:4f1ab957f87b94a5ec1edc26fae50da2175461f00afecf68940c4aa079bd08a4";
     finalImageTag = version;
-    sha256 = "1z0d129bcm8i2cqq36x5jhnrv9hirj8c6kjrmdav8vgf7py78vsm";
-    imageDigest = "sha256:97074c951046e37d3cbb98b82ae85ed15704a290cce66a8314e7f846404edde9";
+    sha256 = "08l1bv5jgrhvjzpqpbinrkgvv52snc4fzyd8ya9v18ns2klyz7m0";
   };
 
   cfg = config.services.kubernetes.addons.dns;
@@ -59,7 +59,7 @@ in {
 
     services.kubernetes.addonManager.addons = {
       kubedns-deployment = {
-        apiVersion = "apps/v1beta1";
+        apiVersion = "extensions/v1beta1";
         kind = "Deployment";
         metadata = {
           labels = {
@@ -84,9 +84,38 @@ in {
               labels.k8s-app = "kube-dns";
             };
             spec = {
+              priorityClassName = "system-cluster-critical";
               containers = [
                 {
                   name = "kubedns";
+                  image = "k8s.gcr.io/k8s-dns-kube-dns-amd64:${version}";
+                  resources = {
+                    limits.memory = "170Mi";
+                    requests = {
+                      cpu = "100m";
+                      memory = "70Mi";
+                    };
+                  };
+                  livenessProbe = {
+                    failureThreshold = 5;
+                    httpGet = {
+                      path = "/healthcheck/kubedns";
+                      port = 10054;
+                      scheme = "HTTP";
+                    };
+                    initialDelaySeconds = 60;
+                    successThreshold = 1;
+                    timeoutSeconds = 5;
+                  };
+                  readinessProbe = {
+                    httpGet = {
+                      path = "/readiness";
+                      port = 8081;
+                      scheme = "HTTP";
+                    };
+                    initialDelaySeconds = 3;
+                    timeoutSeconds = 5;
+                  };
                   args = [
                     "--domain=${cfg.clusterDomain}"
                     "--dns-port=10053"
@@ -99,18 +128,6 @@ in {
                       value = "10055";
                     }
                   ];
-                  image = "gcr.io/google_containers/k8s-dns-kube-dns-amd64:${version}";
-                  livenessProbe = {
-                    failureThreshold = 5;
-                    httpGet = {
-                      path = "/healthcheck/kubedns";
-                      port = 10054;
-                      scheme = "HTTP";
-                    };
-                    initialDelaySeconds = 60;
-                    successThreshold = 1;
-                    timeoutSeconds = 5;
-                  };
                   ports = [
                     {
                       containerPort = 10053;
@@ -128,22 +145,6 @@ in {
                       protocol = "TCP";
                     }
                   ];
-                  readinessProbe = {
-                    httpGet = {
-                      path = "/readiness";
-                      port = 8081;
-                      scheme = "HTTP";
-                    };
-                    initialDelaySeconds = 3;
-                    timeoutSeconds = 5;
-                  };
-                  resources = {
-                    limits.memory = "170Mi";
-                    requests = {
-                      cpu = "100m";
-                      memory = "70Mi";
-                    };
-                  };
                   volumeMounts = [
                     {
                       mountPath = "/kube-dns-config";
@@ -152,6 +153,19 @@ in {
                   ];
                 }
                 {
+                  name = "dnsmasq";
+                  image = "k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64:${version}";
+                  livenessProbe = {
+                    httpGet = {
+                      path = "/healthcheck/dnsmasq";
+                      port = 10054;
+                      scheme = "HTTP";
+                    };
+                    initialDelaySeconds = 60;
+                    timeoutSeconds = 5;
+                    successThreshold = 1;
+                    failureThreshold = 5;
+                  };
                   args = [
                     "-v=2"
                     "-logtostderr"
@@ -165,19 +179,6 @@ in {
                     "--server=/in-addr.arpa/127.0.0.1#10053"
                     "--server=/ip6.arpa/127.0.0.1#10053"
                   ];
-                  image = "gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:${version}";
-                  livenessProbe = {
-                    failureThreshold = 5;
-                    httpGet = {
-                      path = "/healthcheck/dnsmasq";
-                      port = 10054;
-                      scheme = "HTTP";
-                    };
-                    initialDelaySeconds = 60;
-                    successThreshold = 1;
-                    timeoutSeconds = 5;
-                  };
-                  name = "dnsmasq";
                   ports = [
                     {
                       containerPort = 53;
@@ -205,24 +206,24 @@ in {
                 }
                 {
                   name = "sidecar";
-                  image = "gcr.io/google_containers/k8s-dns-sidecar-amd64:${version}";
-                  args = [
-                    "--v=2"
-                    "--logtostderr"
-                    "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A"
-                    "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A"
-                  ];
+                  image = "k8s.gcr.io/k8s-dns-sidecar-amd64:${version}";
                   livenessProbe = {
-                    failureThreshold = 5;
                     httpGet = {
                       path = "/metrics";
                       port = 10054;
                       scheme = "HTTP";
                     };
                     initialDelaySeconds = 60;
-                    successThreshold = 1;
                     timeoutSeconds = 5;
+                    successThreshold = 1;
+                    failureThreshold = 5;
                   };
+                  args = [
+                    "--v=2"
+                    "--logtostderr"
+                    "--probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.${cfg.clusterDomain},5,A"
+                    "--probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.${cfg.clusterDomain},5,A"
+                  ];
                   ports = [
                     {
                       containerPort = 10054;

From 29fd05f3f5beabfd65550c43bda1f797bcb3b9dc Mon Sep 17 00:00:00 2001
From: Alberto Berti <alberto@metapensiero.it>
Date: Wed, 23 May 2018 16:33:14 +0200
Subject: [PATCH 2494/3370] Kuberetes Dashboard addon 1.8.2 -> 1.8.3

As shipped with k8s 1.10.3.

Also:
- updated the definition jsons as they are distributed in k8s.
- updated the image uris as they are renamed in k8s
- added imageDigest param as per 736848723e5aefa5d24396c58dc6de603399efde
---
 .../services/cluster/kubernetes/dashboard.nix | 90 ++++++++++++++++---
 1 file changed, 76 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/dashboard.nix b/nixos/modules/services/cluster/kubernetes/dashboard.nix
index 3aa1dcceae31..8c1f35ec651b 100644
--- a/nixos/modules/services/cluster/kubernetes/dashboard.nix
+++ b/nixos/modules/services/cluster/kubernetes/dashboard.nix
@@ -5,14 +5,14 @@ with lib;
 let
   cfg = config.services.kubernetes.addons.dashboard;
 
-  name = "gcr.io/google_containers/kubernetes-dashboard-amd64";
-	version = "v1.8.2";
+  name = "k8s.gcr.io/kubernetes-dashboard-amd64";
+  version = "v1.8.3";
 
   image = pkgs.dockerTools.pullImage {
     imageName = name;
+    imageDigest = "sha256:dc4026c1b595435ef5527ca598e1e9c4343076926d7d62b365c44831395adbd0";
     finalImageTag = version;
-    sha256 = "11h0fz3wxp0f10fsyqaxjm7l2qg7xws50dv5iwlck5gb1fjmajad";
-    imageDigest = "sha256:e7984d10351601080bbc146635d51f0cfbea31ca6f0df323cf7a58cf2f6a68df";
+    sha256 = "18ajcg0q1vignfjk2sm4xj4wzphfz8wah69ps8dklqfvv0164mc8";
   };
 in {
   options.services.kubernetes.addons.dashboard = {
@@ -31,7 +31,7 @@ in {
     services.kubernetes.addonManager.addons = {
       kubernetes-dashboard-deployment = {
         kind = "Deployment";
-        apiVersion = "apps/v1beta1";
+        apiVersion = "apps/v1";
         metadata = {
           labels = {
             k8s-addon = "kubernetes-dashboard.addons.k8s.io";
@@ -57,40 +57,61 @@ in {
               };
               annotations = {
                 "scheduler.alpha.kubernetes.io/critical-pod" = "";
-                #"scheduler.alpha.kubernetes.io/tolerations" = ''[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'';
               };
             };
             spec = {
+              priorityClassName = "system-cluster-critical";
               containers = [{
                 name = "kubernetes-dashboard";
                 image = "${name}:${version}";
                 ports = [{
-                  containerPort = 9090;
+                  containerPort = 8443;
                   protocol = "TCP";
                 }];
                 resources = {
                   limits = {
                     cpu = "100m";
-                    memory = "250Mi";
+                    memory = "300Mi";
                   };
                   requests = {
                     cpu = "100m";
-                    memory = "50Mi";
+                    memory = "100Mi";
                   };
                 };
+                args = ["--auto-generate-certificates"];
+                volumeMounts = [{
+                  name = "tmp-volume";
+                  mountPath = "/tmp";
+                } {
+                  name = "kubernetes-dashboard-certs";
+                  mountPath = "/certs";
+                }];
                 livenessProbe = {
                   httpGet = {
+                    scheme = "HTTPS";
                     path = "/";
-                    port = 9090;
+                    port = 8443;
                   };
                   initialDelaySeconds = 30;
                   timeoutSeconds = 30;
                 };
               }];
+              volumes = [{
+                name = "kubernetes-dashboard-certs";
+                secret = {
+                  secretName = "kubernetes-dashboard-certs";
+                };
+              } {
+                name = "tmp-volume";
+                emptyDir = {};
+              }];
               serviceAccountName = "kubernetes-dashboard";
               tolerations = [{
                 key = "node-role.kubernetes.io/master";
                 effect = "NoSchedule";
+              } {
+                key = "CriticalAddonsOnly";
+                operator = "Exists";
               }];
             };
           };
@@ -113,8 +134,8 @@ in {
         };
         spec = {
           ports = [{
-            port = 80;
-            targetPort = 9090;
+            port = 443;
+            targetPort = 8443;
           }];
           selector.k8s-app = "kubernetes-dashboard";
         };
@@ -127,15 +148,56 @@ in {
           labels = {
             k8s-app = "kubernetes-dashboard";
             k8s-addon = "kubernetes-dashboard.addons.k8s.io";
-						"addonmanager.kubernetes.io/mode" = "Reconcile";
+            "addonmanager.kubernetes.io/mode" = "Reconcile";
           };
           name = "kubernetes-dashboard";
           namespace = "kube-system";
         };
       };
+      kubernetes-dashboard-sec-certs = {
+        apiVersion = "v1";
+        kind = "Secret";
+        metadata = {
+          labels = {
+            k8s-app = "kubernetes-dashboard";
+            # Allows editing resource and makes sure it is created first.
+            "addonmanager.kubernetes.io/mode" = "EnsureExists";
+          };
+          name = "kubernetes-dashboard-certs";
+          namespace = "kube-system";
+        };
+        type = "Opaque";
+      };
+      kubernetes-dashboard-sec-kholder = {
+        apiVersion = "v1";
+        kind = "Secret";
+        metadata = {
+          labels = {
+            k8s-app = "kubernetes-dashboard";
+            # Allows editing resource and makes sure it is created first.
+            "addonmanager.kubernetes.io/mode" = "EnsureExists";
+          };
+          name = "kubernetes-dashboard-key-holder";
+          namespace = "kube-system";
+        };
+        type = "Opaque";
+      };
+      kubernetes-dashboard-cm = {
+        apiVersion = "v1";
+        kind = "ConfigMap";
+        metadata = {
+          labels = {
+            k8s-app = "kubernetes-dashboard";
+            # Allows editing resource and makes sure it is created first.
+            "addonmanager.kubernetes.io/mode" = "EnsureExists";
+          };
+          name = "kubernetes-dashboard-settings";
+          namespace = "kube-system";
+        };
+      };
     } // (optionalAttrs cfg.enableRBAC {
       kubernetes-dashboard-crb = {
-        apiVersion = "rbac.authorization.k8s.io/v1beta1";
+        apiVersion = "rbac.authorization.k8s.io/v1";
         kind = "ClusterRoleBinding";
         metadata = {
           name = "kubernetes-dashboard";

From 0c841f98d09c8b4fa40a1517b9c71ad70aef7794 Mon Sep 17 00:00:00 2001
From: Alberto Berti <alberto@metapensiero.it>
Date: Wed, 23 May 2018 16:37:09 +0200
Subject: [PATCH 2495/3370] Kubernetes tests: increase the size of the VM from
 700MB to 1.5GB

VMs were starving, many of the daemons were unable to complete their
tasks resulting in tests failures.

Turned off verbose output from k8s components as it consumes even more resources, and useful error messages actually drown in debug-clutter
---
 nixos/tests/kubernetes/base.nix              | 2 +-
 nixos/tests/kubernetes/kubernetes-common.nix | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index 27b99aacab7d..e4bc5b326d34 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -24,7 +24,7 @@ let
         { config, pkgs, lib, nodes, ... }:
           mkMerge [
             {
-              virtualisation.memorySize = mkDefault 768;
+              virtualisation.memorySize = mkDefault 1536;
               virtualisation.diskSize = mkDefault 4096;
               networking = {
                 inherit domain extraHosts;
diff --git a/nixos/tests/kubernetes/kubernetes-common.nix b/nixos/tests/kubernetes/kubernetes-common.nix
index ddf427e1b01a..125c176f1132 100644
--- a/nixos/tests/kubernetes/kubernetes-common.nix
+++ b/nixos/tests/kubernetes/kubernetes-common.nix
@@ -6,7 +6,6 @@ let
     featureGates = ["AllAlpha"];
     flannel.enable = true;
     addons.dashboard.enable = true;
-    verbose = true;
 
     caFile = "${certs.master}/ca.pem";
     apiserver = {

From 468f8209837802f0052b76a06108d3d3e554ff12 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 17 May 2018 14:30:23 +0200
Subject: [PATCH 2496/3370] m32edit and x32edit: init at 3.2

---
 pkgs/applications/audio/midas/generic.nix | 43 +++++++++++++++++++++++
 pkgs/applications/audio/midas/m32edit.nix |  9 +++++
 pkgs/applications/audio/midas/x32edit.nix |  9 +++++
 pkgs/top-level/all-packages.nix           |  4 +++
 4 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/audio/midas/generic.nix
 create mode 100644 pkgs/applications/audio/midas/m32edit.nix
 create mode 100644 pkgs/applications/audio/midas/x32edit.nix

diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix
new file mode 100644
index 000000000000..f82961e6e010
--- /dev/null
+++ b/pkgs/applications/audio/midas/generic.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, lib, libX11, libXext, alsaLib, freetype, brand, type, version, homepage, sha256, ... }:
+stdenv.mkDerivation rec {
+  inherit type;
+  baseName = "${type}-Edit";
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.music-group.com/software/behringer/${type}/${type}-Edit_LINUX_64bit_${version}.tar.gz";
+    inherit sha256;
+  };
+
+  sourceRoot = ".";
+  dontBuild = true;
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${baseName} $out/bin
+  '';
+  preFixup = let
+    # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation
+    libPath = lib.makeLibraryPath [
+      libX11           # libX11.so.6
+      libXext          # libXext.so.6
+      alsaLib          # libasound.so.2
+      freetype         # libfreetype.so.6
+      stdenv.cc.cc.lib # libstdc++.so.6
+    ];
+  in ''
+    patchelf \
+      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      --set-rpath "${libPath}" \
+      $out/bin/${baseName}
+  '';
+
+  meta = with stdenv.lib; {
+    inherit homepage;
+    description = "Editor for the ${brand} ${type} digital mixer";
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.magnetophon ];
+  };
+}
diff --git a/pkgs/applications/audio/midas/m32edit.nix b/pkgs/applications/audio/midas/m32edit.nix
new file mode 100644
index 000000000000..c8a751c235b1
--- /dev/null
+++ b/pkgs/applications/audio/midas/m32edit.nix
@@ -0,0 +1,9 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  brand = "Midas";
+  type = "M32";
+  version = "3.2";
+  sha256 = "1cds6qinz37086l6pmmgrzrxadygjr2z96sjjyznnai2wz4z2nrd";
+  homepage = http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads;
+})
diff --git a/pkgs/applications/audio/midas/x32edit.nix b/pkgs/applications/audio/midas/x32edit.nix
new file mode 100644
index 000000000000..4aacfcc89a36
--- /dev/null
+++ b/pkgs/applications/audio/midas/x32edit.nix
@@ -0,0 +1,9 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // {
+  brand = "Behringer";
+  type = "X32";
+  version = "3.2";
+  sha256 = "1lzmhd0sqnlzc0khpwm82sfi48qhv7rg153a57qjih7hhhy41mzk";
+  homepage = http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads;
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8954f091594d..696f00d04e47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16144,6 +16144,8 @@ with pkgs;
 
   linssid = libsForQt5.callPackage ../applications/networking/linssid { };
 
+  m32edit = callPackage ../applications/audio/midas/m32edit.nix {};
+
   manuskript = callPackage ../applications/editors/manuskript { };
 
   manul = callPackage ../development/tools/manul { };
@@ -18742,6 +18744,8 @@ with pkgs;
 
   x2vnc = callPackage ../tools/X11/x2vnc { };
 
+  x32edit = callPackage ../applications/audio/midas/x32edit.nix {};
+
   x42-plugins = callPackage ../applications/audio/x42-plugins { };
 
   xannotate = callPackage ../tools/X11/xannotate {};

From 53d7fe773aeedd4e4ba03ae6d124459fe9e22ba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 24 May 2018 11:19:19 +0100
Subject: [PATCH 2497/3370] python.pkgs.parso: 0.1.1 -> 0.2.0

---
 pkgs/development/python-modules/parso/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix
index 17e3f9fcf3e5..f47a2acf200c 100644
--- a/pkgs/development/python-modules/parso/default.nix
+++ b/pkgs/development/python-modules/parso/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "parso";
-  version = "0.1.1";
+  version = "0.2.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5815f3fe254e5665f3c5d6f54f086c2502035cb631a91341591b5a564203cffb";
+    sha256 = "0lamywk6dm5xshlkdvxxf5j6fa2k2zpi7xagf0bwidaay3vnpgb2";
   };
 
   checkInputs = [ pytest ];
@@ -22,4 +22,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
   };
 
-}
\ No newline at end of file
+}

From 1a1799b6f45b58067d4806dbe65f21814f8a9461 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 24 May 2018 11:19:56 +0100
Subject: [PATCH 2498/3370] python.pkgs.jedi: 0.11.1 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix
index df8a287ea093..7d652b2943a9 100644
--- a/pkgs/development/python-modules/jedi/default.nix
+++ b/pkgs/development/python-modules/jedi/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "jedi";
-  version = "0.11.1";
+  version = "0.12.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d6e799d04d1ade9459ed0f20de47c32f2285438956a677d083d3c98def59fa97";
+    sha256 = "1bcr7csx4xil1iwmk03d79jis0bkmgi9k0kir3xa4rmwqsagcwhr";
   };
 
   postPatch = ''

From b76177a625e589bd44df28a5fef4cc5a58f10326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 May 2018 10:42:34 +0100
Subject: [PATCH 2499/3370] mypy: make it usuable as a library

---
 pkgs/development/{tools => python-modules}/mypy/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                             | 2 +-
 pkgs/top-level/python-packages.nix                          | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename pkgs/development/{tools => python-modules}/mypy/default.nix (80%)

diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
similarity index 80%
rename from pkgs/development/tools/mypy/default.nix
rename to pkgs/development/python-modules/mypy/default.nix
index d021f994e491..5ce05b7938f5 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchPypi, buildPythonApplication, lxml, typed-ast, psutil }:
+{ stdenv, fetchPypi, buildPythonPackage, lxml, typed-ast, psutil, isPy3k }:
 
-buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "mypy";
   version = "0.600";
 
@@ -12,6 +12,8 @@ buildPythonApplication rec {
     sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw";
   };
 
+  disabled = !isPy3k;
+
   propagatedBuildInputs = [ lxml typed-ast psutil ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f729c0942fb..2791e379e8a8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8492,7 +8492,7 @@ with pkgs;
 
   grabserial = callPackage ../development/tools/grabserial { };
 
-  mypy = python3Packages.callPackage ../development/tools/mypy { };
+  mypy = python3Packages.mypy;
 
   ### DEVELOPMENT / LIBRARIES
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 739c40b2d630..27195dc68696 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8088,6 +8088,8 @@ in {
 
   mysqlclient = callPackage ../development/python-modules/mysqlclient { };
 
+  mypy = callPackage ../development/python-modules/mypy { };
+
   mwclient = buildPythonPackage rec {
     version = "0.8.3";
     pname = "mwclient";

From d4153a6fb8d6c02322fb25526346b53f99688691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 24 May 2018 12:41:42 +0100
Subject: [PATCH 2500/3370] python.pkgs.pyls-mypy: init at 0.1.2

---
 .../python-modules/pyls-mypy/default.nix      | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyls-mypy/default.nix

diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix
new file mode 100644
index 000000000000..985d1937d3fb
--- /dev/null
+++ b/pkgs/development/python-modules/pyls-mypy/default.nix
@@ -0,0 +1,43 @@
+{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch
+, future, python-language-server, mypy, configparser
+, pytest, mock, isPy3k, pytestcov, coverage
+}:
+
+buildPythonPackage rec {
+  pname = "pyls-mypy";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "tomv564";
+    repo = "pyls-mypy";
+    rev = version;
+    sha256 = "0wa038a8a8yj3wmrc7q909nj4b5d3lq70ysbw7rpsnyb0x06m826";
+  };
+
+  disabled = !isPy3k;
+
+  patches = [
+    # also part of https://github.com/tomv564/pyls-mypy/pull/10
+    (fetchpatch {
+      url = "https://github.com/Mic92/pyls-mypy/commit/4c727120d2cbd8bf2825e1491cd55175f03266d2.patch";
+      sha256 = "1dgn5z742swpxwknmgvm65jpxq9zwzhggw4nl6ys7yw8r49kqgrl";
+    })
+  ];
+
+  checkPhase = ''
+    HOME=$TEMPDIR pytest
+  '';
+
+  checkInputs = [ pytest mock pytestcov coverage ];
+
+  propagatedBuildInputs = [
+    mypy python-language-server future configparser
+  ];
+
+  meta = with lib; {
+    homepage = https://github.com/palantir/python-language-server;
+    description = "An implementation of the Language Server Protocol for Python";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 27195dc68696..99438cfca6ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11268,6 +11268,10 @@ in {
     buildInputs = with self; [ pyasn1 pycrypto ];
   };
 
+  python-language-server = callPackage ../development/python-modules/python-language-server {};
+
+  pyls-mypy = callPackage ../development/python-modules/pyls-mypy {};
+
   pyudev = callPackage ../development/python-modules/pyudev {
     inherit (pkgs) fetchurl systemd;
   };

From 5432e4d0ad247f30df60f06ae8177229b6b0d92b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 24 May 2018 12:52:59 +0100
Subject: [PATCH 2501/3370] python.pkgs.pyls-isort: init at 0.1.2

---
 .../python-modules/pyls-isort/default.nix     | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyls-isort/default.nix

diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix
new file mode 100644
index 000000000000..fce7999a7569
--- /dev/null
+++ b/pkgs/development/python-modules/pyls-isort/default.nix
@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub
+, python-language-server, isort
+}:
+
+buildPythonPackage rec {
+  pname = "pyls-isort";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "paradoxxxzero";
+    repo = "pyls-isort";
+    rev = version;
+    sha256 = "0mf8c6dw5lsj9np20p0vrhr1yfycq2awjk2pil28l579xj9nr0dc";
+  };
+
+  # no tests
+  doCheck = false;
+
+  propagatedBuildInputs = [
+    isort python-language-server
+  ];
+
+  meta = with lib; {
+    homepage = https://github.com/palantir/python-language-server;
+    description = "An implementation of the Language Server Protocol for Python";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99438cfca6ce..8ea969f142b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11272,6 +11272,8 @@ in {
 
   pyls-mypy = callPackage ../development/python-modules/pyls-mypy {};
 
+  pyls-isort = callPackage ../development/python-modules/pyls-isort {};
+
   pyudev = callPackage ../development/python-modules/pyudev {
     inherit (pkgs) fetchurl systemd;
   };

From f7650ebd5fb1085a6e4ad13d2c0b7782e2dfe9c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 25 May 2018 01:02:05 +0100
Subject: [PATCH 2502/3370] python.pkgs.spyder: fix setup.py patch

---
 pkgs/applications/science/spyder/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 4b3ef167d532..4411d78cec21 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -19,7 +19,7 @@ buildPythonApplication rec {
 
   # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
   postPatch = ''
-    substituteInPlace setup.py --replace 'pyqt5;python_version>="3"' ' '
+    sed -i -e '/pyqt5/d' setup.py
   '';
 
   propagatedBuildInputs = [

From 88b94b78829322e1a1393c17f2e68d037bd81219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 24 May 2018 11:22:09 +0100
Subject: [PATCH 2503/3370] python.pkgs.python-language-server: init at 0.18.0

---
 .../python-language-server/default.nix        | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-language-server/default.nix

diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix
new file mode 100644
index 000000000000..c2df1f85325c
--- /dev/null
+++ b/pkgs/development/python-modules/python-language-server/default.nix
@@ -0,0 +1,48 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27
+, configparser, futures, future, jedi, pluggy
+, pytest, mock, pytestcov, coverage
+# The following packages are optional and
+# can be overwritten with null as your liking.
+# This also requires to disable tests.
+, rope ? null
+, mccabe ? null
+, pyflakes ? null
+, pycodestyle ? null
+, autopep8 ? null
+, yapf ? null
+, pydocstyle ? null
+}:
+
+buildPythonPackage rec {
+  pname = "python-language-server";
+  version = "0.18.0";
+
+  src = fetchFromGitHub {
+    owner = "palantir";
+    repo = "python-language-server";
+    rev = version;
+    sha256 = "0ig34bc0qm6gdj8xakmm3877lmf8ms7qg0xj8hay9gpgf8cz894s";
+  };
+
+  checkInputs = [
+    pytest mock pytestcov coverage
+    # rope is technically a dependency, but we don't add it by default since we
+    # already have jedi, which is the preferred option
+    rope
+  ];
+  checkPhase = ''
+    HOME=$TEMPDIR pytest
+  '';
+
+  propagatedBuildInputs = [
+    jedi pluggy mccabe pyflakes pycodestyle yapf pydocstyle future autopep8
+  ] ++ lib.optional (isPy27) [ configparser ]
+    ++ lib.optional (pythonOlder "3.2") [ futures ];
+
+  meta = with lib; {
+    homepage = https://github.com/palantir/python-language-server;
+    description = "An implementation of the Language Server Protocol for Python";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+  };
+}

From 6040ceb92e1650c82e4dd10039ad39d43c66c5fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= <jl@lafuente.me>
Date: Fri, 25 May 2018 12:30:31 +0200
Subject: [PATCH 2504/3370] kitty: 0.9.1 -> 0.10.1

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

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index e9c860f0b901..99c8b87bf4f5 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -5,7 +5,7 @@
 
 with python3Packages;
 buildPythonApplication rec {
-  version = "0.9.1";
+  version = "0.10.1";
   name = "kitty-${version}";
   format = "other";
 
@@ -13,7 +13,7 @@ buildPythonApplication rec {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "08j2k3852c64z4mgh1j0dgdj6c2alkckpav67lzg1lxsz3w2izh2";
+    sha256 = "1xwrrj0g70hh8zsjbd05x0js776xlf7c6mdsmrqlw4y7jfnlgl45";
   };
 
   buildInputs = [

From 8b6ddc89dd280fa1324627f29c5623706aadc9ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <github@leo.gaspard.ninja>
Date: Fri, 25 May 2018 13:47:18 +0200
Subject: [PATCH 2505/3370] nheko: 0.4.1 -> 0.4.2 (#41077)

---
 .../networking/instant-messengers/nheko/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index d3c0a6f8eca2..707e78459efe 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "14667a3d4y63wxcs2y49kly48k9nis365zzdk8yp6dn8fn5frqdx";
+    sha256 = "1z9dbvcgwafxr131a8447qkx97x8l93k32xa8xvajgvjlimqphqk";
   };
 
   # This patch is likely not strictly speaking needed, but will help detect when

From 6f193b4f903d00e05815504c9590fa2f6897b615 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Fri, 25 May 2018 14:22:23 +0200
Subject: [PATCH 2506/3370] memo: 0.2 -> 0.4 (#40697)

---
 pkgs/applications/misc/memo/default.nix | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix
index fc1c08dc2b2c..56cbb338a403 100644
--- a/pkgs/applications/misc/memo/default.nix
+++ b/pkgs/applications/misc/memo/default.nix
@@ -1,23 +1,34 @@
-{ fetchFromGitHub, ag, tree, stdenv, ... }:
+{ fetchFromGitHub, ag, tree, man, stdenv, 
+  pandocSupport ? true, pandoc ? null
+  , ... }:
+
+assert pandocSupport -> pandoc != null;
 
 stdenv.mkDerivation rec {
 
   name = "memo-${version}";
 
-  version = "0.2";
+  version = "0.4";
 
   src = fetchFromGitHub {
     owner  = "mrVanDalo";
     repo   = "memo";
     rev    = "${version}";
-    sha256 = "0mww4w5m6jv4s0krm74cccrz0vlr8rrwiv122jk67l1v9r80pchs";
+    sha256 = "06999nps46dxrjakvpin1d2zvfpjil69hb3bxagq29icalag3y2z";
   };
 
-  installPhase = ''
+  installPhase = let
+    pandocReplacement = if pandocSupport then
+      "pandoc_cmd=${pandoc}/bin/pandoc"
+    else
+      "#pandoc_cmd=pandoc";
+  in ''
     mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions}
     substituteInPlace memo \
-      --replace "ack "  "${ag}/bin/ag " \
-      --replace "tree " "${tree}/bin/tree "
+      --replace "ack_cmd=ack"       "ack_cmd=${ag}/bin/ag" \
+      --replace "tree_cmd=tree"     "tree_cmd=${tree}/bin/tree" \
+      --replace "man_cmd=man"       "man_cmd=${man}/bin/man" \
+      --replace "pandoc_cmd=pandoc" "${pandocReplacement}"
     mv memo $out/bin/
     mv doc/memo.1 $out/share/man/man1/memo.1
     mv completion/memo.bash $out/share/bash-completion/completions/memo.sh

From a0c480ab1ff65aee2b817ed5c480553bb6ef95c1 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Fri, 25 May 2018 16:43:41 +0300
Subject: [PATCH 2507/3370] gopass: 1.6.11 -> 1.7.1 (#41078)

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

diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 1bbd4169f2eb..fe7d50602628 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, makeWrapper }:
 
 buildGoPackage rec {
-  version = "1.6.11";
+  version = "1.7.1";
   name = "gopass-${version}";
 
   goPackagePath = "github.com/justwatchcom/gopass";
@@ -12,7 +12,7 @@ buildGoPackage rec {
     owner = "justwatchcom";
     repo = "gopass";
     rev = "v${version}";
-    sha256 = "12pih414232bsdj1qqc04vck2p9254wjy044n5kbbdqbmfgap7sj";
+    sha256 = "01cif6a2xa3c8nki0pas9mywdxs8d9niv8z13mii5hcfqvm0s7aw";
   };
 
   wrapperPath = with stdenv.lib; makeBinPath ([
@@ -38,7 +38,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description     = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go.";
-    homepage        = https://github.com/justwatchcom/gopass;
+    homepage        = https://www.justwatch.com/gopass/;
     license         = licenses.mit;
     maintainers     = with maintainers; [ andir ];
     platforms       = platforms.unix;

From b1aa2b78902c087a20fc557ff699e233928f9f5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 25 May 2018 17:14:30 +0200
Subject: [PATCH 2508/3370] home-assistant: include requirements of
 dependencies

---
 .../home-assistant/component-packages.nix     | 748 +++++++++++++++++-
 .../home-assistant/parse-requirements.py      |  69 +-
 2 files changed, 761 insertions(+), 56 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 54983a1d9f7c..98e046eb5470 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1,4 +1,4 @@
-# Generated from parse-requirements.py
+# Generated by parse-requirements.py
 # Do not edit!
 
 {
@@ -6,125 +6,432 @@
   components = {
     "abode" = ps: with ps; [  ];
     "ads" = ps: with ps; [  ];
+    "alarm_control_panel" = ps: with ps; [  ];
+    "alarm_control_panel.abode" = ps: with ps; [  ];
+    "alarm_control_panel.alarmdecoder" = ps: with ps; [  ];
     "alarm_control_panel.alarmdotcom" = ps: with ps; [  ];
+    "alarm_control_panel.arlo" = ps: with ps; [  ];
+    "alarm_control_panel.canary" = ps: with ps; [  ];
     "alarm_control_panel.concord232" = ps: with ps; [  ];
+    "alarm_control_panel.demo" = ps: with ps; [  ];
+    "alarm_control_panel.egardia" = ps: with ps; [  ];
+    "alarm_control_panel.envisalink" = ps: with ps; [  ];
     "alarm_control_panel.ialarm" = ps: with ps; [  ];
+    "alarm_control_panel.ifttt" = ps: with ps; [  ];
+    "alarm_control_panel.manual" = ps: with ps; [  ];
+    "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ];
+    "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ];
     "alarm_control_panel.nx584" = ps: with ps; [  ];
+    "alarm_control_panel.satel_integra" = ps: with ps; [  ];
     "alarm_control_panel.simplisafe" = ps: with ps; [  ];
+    "alarm_control_panel.spc" = ps: with ps; [  ];
     "alarm_control_panel.totalconnect" = ps: with ps; [  ];
+    "alarm_control_panel.verisure" = ps: with ps; [  ];
+    "alarm_control_panel.wink" = ps: with ps; [  ];
     "alarmdecoder" = ps: with ps; [  ];
-    "amcrest" = ps: with ps; [  ];
+    "alert" = ps: with ps; [  ];
+    "alexa" = ps: with ps; [ aiohttp-cors ];
+    "alexa.const" = ps: with ps; [  ];
+    "alexa.flash_briefings" = ps: with ps; [  ];
+    "alexa.intent" = ps: with ps; [  ];
+    "alexa.smart_home" = ps: with ps; [  ];
+    "amcrest" = ps: with ps; [ ha-ffmpeg ];
     "android_ip_webcam" = ps: with ps; [  ];
     "apcupsd" = ps: with ps; [  ];
+    "api" = ps: with ps; [ aiohttp-cors ];
     "apple_tv" = ps: with ps; [  ];
     "arduino" = ps: with ps; [  ];
     "arlo" = ps: with ps; [  ];
     "asterisk_mbox" = ps: with ps; [  ];
     "august" = ps: with ps; [  ];
+    "auth" = ps: with ps; [ aiohttp-cors ];
+    "auth.client" = ps: with ps; [  ];
+    "automation" = ps: with ps; [  ];
+    "automation.event" = ps: with ps; [  ];
+    "automation.homeassistant" = ps: with ps; [  ];
+    "automation.litejet" = ps: with ps; [  ];
+    "automation.mqtt" = ps: with ps; [ paho-mqtt ];
+    "automation.numeric_state" = ps: with ps; [  ];
+    "automation.state" = ps: with ps; [  ];
+    "automation.sun" = ps: with ps; [  ];
+    "automation.template" = ps: with ps; [  ];
+    "automation.time" = ps: with ps; [  ];
+    "automation.zone" = ps: with ps; [  ];
     "axis" = ps: with ps; [  ];
     "bbb_gpio" = ps: with ps; [  ];
+    "binary_sensor" = ps: with ps; [  ];
+    "binary_sensor.abode" = ps: with ps; [  ];
+    "binary_sensor.ads" = ps: with ps; [  ];
+    "binary_sensor.alarmdecoder" = ps: with ps; [  ];
+    "binary_sensor.android_ip_webcam" = ps: with ps; [  ];
+    "binary_sensor.apcupsd" = ps: with ps; [  ];
+    "binary_sensor.arest" = ps: with ps; [  ];
+    "binary_sensor.august" = ps: with ps; [  ];
+    "binary_sensor.aurora" = ps: with ps; [  ];
+    "binary_sensor.axis" = ps: with ps; [  ];
+    "binary_sensor.bayesian" = ps: with ps; [  ];
+    "binary_sensor.bbb_gpio" = ps: with ps; [  ];
+    "binary_sensor.blink" = ps: with ps; [  ];
+    "binary_sensor.bloomsky" = ps: with ps; [  ];
+    "binary_sensor.bmw_connected_drive" = ps: with ps; [  ];
+    "binary_sensor.command_line" = ps: with ps; [  ];
     "binary_sensor.concord232" = ps: with ps; [  ];
+    "binary_sensor.deconz" = ps: with ps; [  ];
+    "binary_sensor.demo" = ps: with ps; [  ];
+    "binary_sensor.digital_ocean" = ps: with ps; [ digital-ocean ];
+    "binary_sensor.ecobee" = ps: with ps; [  ];
+    "binary_sensor.egardia" = ps: with ps; [  ];
+    "binary_sensor.eight_sleep" = ps: with ps; [  ];
+    "binary_sensor.enocean" = ps: with ps; [  ];
+    "binary_sensor.envisalink" = ps: with ps; [  ];
+    "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ];
+    "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ];
     "binary_sensor.flic" = ps: with ps; [  ];
+    "binary_sensor.gc100" = ps: with ps; [  ];
     "binary_sensor.hikvision" = ps: with ps; [  ];
+    "binary_sensor.hive" = ps: with ps; [  ];
+    "binary_sensor.homematic" = ps: with ps; [ pyhomematic ];
+    "binary_sensor.ihc" = ps: with ps; [  ];
+    "binary_sensor.insteon_plm" = ps: with ps; [  ];
     "binary_sensor.iss" = ps: with ps; [  ];
+    "binary_sensor.isy994" = ps: with ps; [  ];
+    "binary_sensor.knx" = ps: with ps; [  ];
+    "binary_sensor.linode" = ps: with ps; [ linode-api ];
+    "binary_sensor.maxcube" = ps: with ps; [  ];
+    "binary_sensor.modbus" = ps: with ps; [  ];
+    "binary_sensor.mqtt" = ps: with ps; [ paho-mqtt ];
+    "binary_sensor.mychevy" = ps: with ps; [  ];
+    "binary_sensor.mysensors" = ps: with ps; [  ];
+    "binary_sensor.mystrom" = ps: with ps; [ aiohttp-cors ];
+    "binary_sensor.nest" = ps: with ps; [  ];
+    "binary_sensor.netatmo" = ps: with ps; [  ];
     "binary_sensor.nx584" = ps: with ps; [  ];
+    "binary_sensor.octoprint" = ps: with ps; [  ];
+    "binary_sensor.pilight" = ps: with ps; [  ];
+    "binary_sensor.ping" = ps: with ps; [  ];
+    "binary_sensor.qwikswitch" = ps: with ps; [  ];
+    "binary_sensor.raincloud" = ps: with ps; [  ];
+    "binary_sensor.random" = ps: with ps; [  ];
+    "binary_sensor.raspihats" = ps: with ps; [  ];
+    "binary_sensor.rest" = ps: with ps; [  ];
+    "binary_sensor.rfxtrx" = ps: with ps; [  ];
+    "binary_sensor.ring" = ps: with ps; [  ];
+    "binary_sensor.rpi_gpio" = ps: with ps; [  ];
+    "binary_sensor.rpi_pfio" = ps: with ps; [  ];
+    "binary_sensor.satel_integra" = ps: with ps; [  ];
+    "binary_sensor.skybell" = ps: with ps; [  ];
+    "binary_sensor.sleepiq" = ps: with ps; [  ];
+    "binary_sensor.spc" = ps: with ps; [  ];
     "binary_sensor.tapsaff" = ps: with ps; [  ];
+    "binary_sensor.tcp" = ps: with ps; [  ];
+    "binary_sensor.tellduslive" = ps: with ps; [  ];
+    "binary_sensor.template" = ps: with ps; [  ];
+    "binary_sensor.tesla" = ps: with ps; [  ];
+    "binary_sensor.threshold" = ps: with ps; [  ];
     "binary_sensor.trend" = ps: with ps; [ numpy ];
+    "binary_sensor.upcloud" = ps: with ps; [  ];
+    "binary_sensor.velbus" = ps: with ps; [  ];
+    "binary_sensor.vera" = ps: with ps; [  ];
+    "binary_sensor.verisure" = ps: with ps; [  ];
+    "binary_sensor.volvooncall" = ps: with ps; [  ];
+    "binary_sensor.vultr" = ps: with ps; [ vultr ];
+    "binary_sensor.wemo" = ps: with ps; [  ];
+    "binary_sensor.wink" = ps: with ps; [  ];
     "binary_sensor.workday" = ps: with ps; [  ];
+    "binary_sensor.xiaomi_aqara" = ps: with ps; [  ];
+    "binary_sensor.zha" = ps: with ps; [  ];
+    "binary_sensor.zigbee" = ps: with ps; [  ];
+    "binary_sensor.zwave" = ps: with ps; [  ];
     "blink" = ps: with ps; [  ];
+    "bloomsky" = ps: with ps; [  ];
     "bmw_connected_drive" = ps: with ps; [  ];
+    "browser" = ps: with ps; [  ];
+    "calendar" = ps: with ps; [  ];
     "calendar.caldav" = ps: with ps; [  ];
+    "calendar.demo" = ps: with ps; [  ];
+    "calendar.google" = ps: with ps; [  ];
     "calendar.todoist" = ps: with ps; [ todoist ];
+    "camera" = ps: with ps; [ aiohttp-cors ];
+    "camera.abode" = ps: with ps; [  ];
+    "camera.amcrest" = ps: with ps; [ ha-ffmpeg ];
+    "camera.arlo" = ps: with ps; [ ha-ffmpeg ];
+    "camera.august" = ps: with ps; [  ];
+    "camera.axis" = ps: with ps; [  ];
+    "camera.blink" = ps: with ps; [  ];
+    "camera.bloomsky" = ps: with ps; [  ];
+    "camera.canary" = ps: with ps; [ ha-ffmpeg ];
+    "camera.demo" = ps: with ps; [  ];
+    "camera.doorbird" = ps: with ps; [  ];
+    "camera.ffmpeg" = ps: with ps; [ ha-ffmpeg ];
     "camera.foscam" = ps: with ps; [  ];
-    "camera.onvif" = ps: with ps; [  ];
+    "camera.generic" = ps: with ps; [  ];
+    "camera.local_file" = ps: with ps; [  ];
+    "camera.mjpeg" = ps: with ps; [  ];
+    "camera.mqtt" = ps: with ps; [ paho-mqtt ];
+    "camera.neato" = ps: with ps; [  ];
+    "camera.nest" = ps: with ps; [  ];
+    "camera.netatmo" = ps: with ps; [  ];
+    "camera.onvif" = ps: with ps; [ ha-ffmpeg ];
     "camera.proxy" = ps: with ps; [ pillow ];
+    "camera.ring" = ps: with ps; [ ha-ffmpeg ];
+    "camera.rpi_camera" = ps: with ps; [  ];
+    "camera.skybell" = ps: with ps; [  ];
     "camera.synology" = ps: with ps; [  ];
+    "camera.usps" = ps: with ps; [  ];
     "camera.uvc" = ps: with ps; [  ];
+    "camera.verisure" = ps: with ps; [  ];
     "camera.xeoma" = ps: with ps; [  ];
+    "camera.yi" = ps: with ps; [ ha-ffmpeg ];
+    "camera.zoneminder" = ps: with ps; [  ];
     "canary" = ps: with ps; [  ];
+    "climate" = ps: with ps; [  ];
     "climate.daikin" = ps: with ps; [  ];
+    "climate.demo" = ps: with ps; [  ];
+    "climate.ecobee" = ps: with ps; [  ];
     "climate.econet" = ps: with ps; [  ];
     "climate.ephember" = ps: with ps; [  ];
     "climate.eq3btsmart" = ps: with ps; [ construct ];
     "climate.flexit" = ps: with ps; [  ];
+    "climate.fritzbox" = ps: with ps; [  ];
+    "climate.generic_thermostat" = ps: with ps; [  ];
     "climate.heatmiser" = ps: with ps; [  ];
+    "climate.hive" = ps: with ps; [  ];
+    "climate.homematic" = ps: with ps; [ pyhomematic ];
     "climate.honeywell" = ps: with ps; [  ];
+    "climate.knx" = ps: with ps; [  ];
+    "climate.maxcube" = ps: with ps; [  ];
+    "climate.melissa" = ps: with ps; [  ];
+    "climate.modbus" = ps: with ps; [  ];
+    "climate.mqtt" = ps: with ps; [ paho-mqtt ];
+    "climate.mysensors" = ps: with ps; [  ];
+    "climate.nest" = ps: with ps; [  ];
+    "climate.netatmo" = ps: with ps; [  ];
+    "climate.nuheat" = ps: with ps; [  ];
     "climate.oem" = ps: with ps; [  ];
     "climate.proliphix" = ps: with ps; [  ];
     "climate.radiotherm" = ps: with ps; [  ];
     "climate.sensibo" = ps: with ps; [  ];
+    "climate.tado" = ps: with ps; [  ];
+    "climate.tesla" = ps: with ps; [  ];
+    "climate.toon" = ps: with ps; [  ];
     "climate.touchline" = ps: with ps; [  ];
     "climate.venstar" = ps: with ps; [  ];
-    "cloud" = ps: with ps; [ warrant ];
+    "climate.vera" = ps: with ps; [  ];
+    "climate.wink" = ps: with ps; [  ];
+    "climate.zwave" = ps: with ps; [  ];
+    "cloud" = ps: with ps; [ warrant aiohttp-cors ];
+    "cloud.auth_api" = ps: with ps; [  ];
+    "cloud.const" = ps: with ps; [  ];
+    "cloud.http_api" = ps: with ps; [  ];
+    "cloud.iot" = ps: with ps; [  ];
     "coinbase" = ps: with ps; [  ];
     "comfoconnect" = ps: with ps; [  ];
+    "config" = ps: with ps; [ aiohttp-cors ];
+    "config.automation" = ps: with ps; [  ];
     "config.config_entries" = ps: with ps; [  ];
+    "config.core" = ps: with ps; [  ];
+    "config.customize" = ps: with ps; [  ];
+    "config.entity_registry" = ps: with ps; [  ];
+    "config.group" = ps: with ps; [  ];
+    "config.hassbian" = ps: with ps; [  ];
+    "config.script" = ps: with ps; [  ];
+    "config.zwave" = ps: with ps; [  ];
+    "configurator" = ps: with ps; [  ];
+    "conversation" = ps: with ps; [ aiohttp-cors ];
+    "counter" = ps: with ps; [  ];
+    "cover" = ps: with ps; [  ];
+    "cover.abode" = ps: with ps; [  ];
+    "cover.command_line" = ps: with ps; [  ];
+    "cover.demo" = ps: with ps; [  ];
+    "cover.garadget" = ps: with ps; [  ];
     "cover.gogogate2" = ps: with ps; [  ];
+    "cover.group" = ps: with ps; [  ];
+    "cover.homematic" = ps: with ps; [ pyhomematic ];
+    "cover.isy994" = ps: with ps; [  ];
+    "cover.knx" = ps: with ps; [  ];
+    "cover.lutron" = ps: with ps; [  ];
+    "cover.lutron_caseta" = ps: with ps; [  ];
+    "cover.mqtt" = ps: with ps; [ paho-mqtt ];
     "cover.myq" = ps: with ps; [  ];
+    "cover.mysensors" = ps: with ps; [  ];
+    "cover.opengarage" = ps: with ps; [  ];
+    "cover.rflink" = ps: with ps; [  ];
+    "cover.rfxtrx" = ps: with ps; [  ];
+    "cover.rpi_gpio" = ps: with ps; [  ];
+    "cover.scsgate" = ps: with ps; [  ];
+    "cover.tahoma" = ps: with ps; [  ];
+    "cover.tellduslive" = ps: with ps; [  ];
+    "cover.tellstick" = ps: with ps; [  ];
+    "cover.template" = ps: with ps; [  ];
+    "cover.velbus" = ps: with ps; [  ];
+    "cover.vera" = ps: with ps; [  ];
+    "cover.wink" = ps: with ps; [  ];
+    "cover.xiaomi_aqara" = ps: with ps; [  ];
+    "cover.zwave" = ps: with ps; [  ];
     "daikin" = ps: with ps; [  ];
     "datadog" = ps: with ps; [ datadog ];
     "deconz" = ps: with ps; [  ];
+    "deconz.config_flow" = ps: with ps; [  ];
+    "deconz.const" = ps: with ps; [  ];
+    "demo" = ps: with ps; [ aiohttp-cors ];
+    "device_sun_light_trigger" = ps: with ps; [  ];
+    "device_tracker" = ps: with ps; [  ];
+    "device_tracker.actiontec" = ps: with ps; [  ];
     "device_tracker.aruba" = ps: with ps; [ pexpect ];
     "device_tracker.asuswrt" = ps: with ps; [ pexpect ];
-    "device_tracker.automatic" = ps: with ps; [  ];
+    "device_tracker.automatic" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.bbox" = ps: with ps; [  ];
     "device_tracker.bluetooth_le_tracker" = ps: with ps; [  ];
     "device_tracker.bluetooth_tracker" = ps: with ps; [  ];
+    "device_tracker.bmw_connected_drive" = ps: with ps; [  ];
+    "device_tracker.bt_home_hub_5" = ps: with ps; [  ];
     "device_tracker.cisco_ios" = ps: with ps; [ pexpect ];
+    "device_tracker.ddwrt" = ps: with ps; [  ];
+    "device_tracker.demo" = ps: with ps; [  ];
     "device_tracker.fritz" = ps: with ps; [ fritzconnection ];
+    "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.google_maps" = ps: with ps; [  ];
+    "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ];
+    "device_tracker.hitron_coda" = ps: with ps; [  ];
+    "device_tracker.huawei_router" = ps: with ps; [  ];
     "device_tracker.icloud" = ps: with ps; [  ];
+    "device_tracker.keenetic_ndms2" = ps: with ps; [  ];
     "device_tracker.linksys_ap" = ps: with ps; [ beautifulsoup4 ];
+    "device_tracker.linksys_smart" = ps: with ps; [  ];
+    "device_tracker.locative" = ps: with ps; [ aiohttp-cors ];
+    "device_tracker.luci" = ps: with ps; [  ];
+    "device_tracker.meraki" = ps: with ps; [ aiohttp-cors ];
     "device_tracker.mikrotik" = ps: with ps; [  ];
+    "device_tracker.mqtt" = ps: with ps; [ paho-mqtt ];
+    "device_tracker.mqtt_json" = ps: with ps; [ paho-mqtt ];
+    "device_tracker.mysensors" = ps: with ps; [  ];
     "device_tracker.netgear" = ps: with ps; [  ];
     "device_tracker.nmap_tracker" = ps: with ps; [  ];
-    "device_tracker.owntracks" = ps: with ps; [ libnacl ];
-    "device_tracker.owntracks_http" = ps: with ps; [ libnacl ];
+    "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ];
+    "device_tracker.owntracks_http" = ps: with ps; [ libnacl aiohttp-cors ];
+    "device_tracker.ping" = ps: with ps; [  ];
+    "device_tracker.sky_hub" = ps: with ps; [  ];
     "device_tracker.snmp" = ps: with ps; [ pysnmp ];
+    "device_tracker.swisscom" = ps: with ps; [  ];
+    "device_tracker.tado" = ps: with ps; [  ];
+    "device_tracker.tesla" = ps: with ps; [  ];
+    "device_tracker.thomson" = ps: with ps; [  ];
     "device_tracker.tile" = ps: with ps; [  ];
+    "device_tracker.tomato" = ps: with ps; [  ];
+    "device_tracker.tplink" = ps: with ps; [  ];
     "device_tracker.trackr" = ps: with ps; [  ];
+    "device_tracker.ubus" = ps: with ps; [  ];
     "device_tracker.unifi" = ps: with ps; [ pyunifi ];
     "device_tracker.unifi_direct" = ps: with ps; [ pexpect ];
     "device_tracker.upc_connect" = ps: with ps; [ defusedxml ];
+    "device_tracker.volvooncall" = ps: with ps; [  ];
+    "device_tracker.xiaomi" = ps: with ps; [  ];
     "device_tracker.xiaomi_miio" = ps: with ps; [ construct ];
+    "dialogflow" = ps: with ps; [ aiohttp-cors ];
     "digital_ocean" = ps: with ps; [ digital-ocean ];
     "discovery" = ps: with ps; [ netdisco ];
-    "dominos" = ps: with ps; [  ];
+    "dominos" = ps: with ps; [ aiohttp-cors ];
     "doorbird" = ps: with ps; [  ];
+    "downloader" = ps: with ps; [  ];
+    "duckdns" = ps: with ps; [  ];
     "dweet" = ps: with ps; [  ];
     "dyson" = ps: with ps; [  ];
     "ecobee" = ps: with ps; [  ];
     "egardia" = ps: with ps; [  ];
     "eight_sleep" = ps: with ps; [  ];
+    "emoncms_history" = ps: with ps; [  ];
     "emulated_hue" = ps: with ps; [ aiohttp-cors ];
+    "emulated_hue.hue_api" = ps: with ps; [  ];
+    "emulated_hue.upnp" = ps: with ps; [  ];
     "enocean" = ps: with ps; [  ];
     "envisalink" = ps: with ps; [  ];
     "eufy" = ps: with ps; [  ];
+    "fan" = ps: with ps; [  ];
+    "fan.comfoconnect" = ps: with ps; [  ];
+    "fan.demo" = ps: with ps; [  ];
+    "fan.dyson" = ps: with ps; [  ];
+    "fan.insteon_local" = ps: with ps; [  ];
+    "fan.insteon_plm" = ps: with ps; [  ];
+    "fan.isy994" = ps: with ps; [  ];
+    "fan.mqtt" = ps: with ps; [ paho-mqtt ];
+    "fan.template" = ps: with ps; [  ];
+    "fan.velbus" = ps: with ps; [  ];
+    "fan.wink" = ps: with ps; [  ];
     "fan.xiaomi_miio" = ps: with ps; [ construct ];
+    "fan.zha" = ps: with ps; [  ];
+    "fan.zwave" = ps: with ps; [  ];
     "feedreader" = ps: with ps; [ feedparser ];
     "ffmpeg" = ps: with ps; [ ha-ffmpeg ];
     "folder_watcher" = ps: with ps; [ watchdog ];
+    "foursquare" = ps: with ps; [ aiohttp-cors ];
+    "freedns" = ps: with ps; [  ];
     "fritzbox" = ps: with ps; [  ];
-    "frontend" = ps: with ps; [  ];
+    "frontend" = ps: with ps; [ aiohttp-cors ];
     "gc100" = ps: with ps; [  ];
     "goalfeed" = ps: with ps; [  ];
     "google" = ps: with ps; [ google_api_python_client oauth2client ];
+    "google_assistant" = ps: with ps; [ aiohttp-cors ];
+    "google_assistant.auth" = ps: with ps; [  ];
+    "google_assistant.const" = ps: with ps; [  ];
+    "google_assistant.helpers" = ps: with ps; [  ];
+    "google_assistant.http" = ps: with ps; [  ];
+    "google_assistant.smart_home" = ps: with ps; [  ];
+    "google_assistant.trait" = ps: with ps; [  ];
+    "google_domains" = ps: with ps; [  ];
+    "graphite" = ps: with ps; [  ];
+    "group" = ps: with ps; [  ];
+    "hassio" = ps: with ps; [ aiohttp-cors ];
+    "hassio.handler" = ps: with ps; [  ];
+    "hassio.http" = ps: with ps; [  ];
     "hdmi_cec" = ps: with ps; [  ];
+    "history" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+    "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy ];
     "hive" = ps: with ps; [  ];
     "homekit" = ps: with ps; [  ];
+    "homekit.const" = ps: with ps; [  ];
+    "homekit.util" = ps: with ps; [  ];
     "homekit_controller" = ps: with ps; [  ];
     "homematic" = ps: with ps; [ pyhomematic ];
     "homematicip_cloud" = ps: with ps; [  ];
     "http" = ps: with ps; [ aiohttp-cors ];
+    "http.auth" = ps: with ps; [  ];
+    "http.ban" = ps: with ps; [  ];
+    "http.const" = ps: with ps; [  ];
+    "http.cors" = ps: with ps; [  ];
+    "http.data_validator" = ps: with ps; [  ];
+    "http.real_ip" = ps: with ps; [  ];
+    "http.static" = ps: with ps; [  ];
+    "http.view" = ps: with ps; [  ];
     "hue" = ps: with ps; [ aiohue ];
+    "hue.bridge" = ps: with ps; [  ];
+    "hue.config_flow" = ps: with ps; [  ];
+    "hue.const" = ps: with ps; [  ];
+    "hue.errors" = ps: with ps; [  ];
     "ifttt" = ps: with ps; [  ];
     "ihc" = ps: with ps; [  ];
+    "ihc.const" = ps: with ps; [  ];
+    "ihc.ihcdevice" = ps: with ps; [  ];
+    "image_processing" = ps: with ps; [ aiohttp-cors ];
+    "image_processing.demo" = ps: with ps; [  ];
     "image_processing.dlib_face_detect" = ps: with ps; [ face_recognition ];
     "image_processing.dlib_face_identify" = ps: with ps; [ face_recognition ];
+    "image_processing.microsoft_face_detect" = ps: with ps; [ aiohttp-cors ];
+    "image_processing.microsoft_face_identify" = ps: with ps; [ aiohttp-cors ];
+    "image_processing.openalpr_cloud" = ps: with ps; [  ];
+    "image_processing.openalpr_local" = ps: with ps; [  ];
     "image_processing.opencv" = ps: with ps; [ numpy ];
+    "image_processing.seven_segments" = ps: with ps; [  ];
     "influxdb" = ps: with ps; [ influxdb ];
+    "input_boolean" = ps: with ps; [  ];
+    "input_datetime" = ps: with ps; [  ];
+    "input_number" = ps: with ps; [  ];
+    "input_select" = ps: with ps; [  ];
+    "input_text" = ps: with ps; [  ];
     "insteon_local" = ps: with ps; [  ];
     "insteon_plm" = ps: with ps; [  ];
+    "intent_script" = ps: with ps; [  ];
+    "introduction" = ps: with ps; [  ];
+    "ios" = ps: with ps; [ aiohttp-cors zeroconf ];
     "iota" = ps: with ps; [  ];
     "isy994" = ps: with ps; [  ];
     "joaoapps_join" = ps: with ps; [  ];
@@ -134,41 +441,110 @@
     "kira" = ps: with ps; [  ];
     "knx" = ps: with ps; [  ];
     "lametric" = ps: with ps; [  ];
+    "light" = ps: with ps; [  ];
+    "light.abode" = ps: with ps; [  ];
+    "light.ads" = ps: with ps; [  ];
     "light.avion" = ps: with ps; [  ];
     "light.blinksticklight" = ps: with ps; [ BlinkStick ];
     "light.blinkt" = ps: with ps; [  ];
+    "light.deconz" = ps: with ps; [  ];
     "light.decora" = ps: with ps; [  ];
     "light.decora_wifi" = ps: with ps; [  ];
+    "light.demo" = ps: with ps; [  ];
+    "light.enocean" = ps: with ps; [  ];
+    "light.eufy" = ps: with ps; [  ];
     "light.flux_led" = ps: with ps; [  ];
     "light.greenwave" = ps: with ps; [  ];
+    "light.group" = ps: with ps; [  ];
+    "light.hive" = ps: with ps; [  ];
+    "light.homekit_controller" = ps: with ps; [  ];
+    "light.homematic" = ps: with ps; [ pyhomematic ];
+    "light.hue" = ps: with ps; [ aiohue ];
+    "light.hyperion" = ps: with ps; [  ];
     "light.iglo" = ps: with ps; [  ];
+    "light.ihc" = ps: with ps; [  ];
+    "light.insteon_local" = ps: with ps; [  ];
+    "light.insteon_plm" = ps: with ps; [  ];
+    "light.isy994" = ps: with ps; [  ];
+    "light.knx" = ps: with ps; [  ];
     "light.lifx" = ps: with ps; [  ];
     "light.lifx_legacy" = ps: with ps; [  ];
     "light.limitlessled" = ps: with ps; [  ];
+    "light.litejet" = ps: with ps; [  ];
+    "light.lutron" = ps: with ps; [  ];
+    "light.lutron_caseta" = ps: with ps; [  ];
+    "light.mochad" = ps: with ps; [  ];
+    "light.mqtt" = ps: with ps; [ paho-mqtt ];
+    "light.mqtt_json" = ps: with ps; [ paho-mqtt ];
+    "light.mqtt_template" = ps: with ps; [ paho-mqtt ];
+    "light.mysensors" = ps: with ps; [  ];
     "light.mystrom" = ps: with ps; [  ];
     "light.nanoleaf_aurora" = ps: with ps; [  ];
     "light.osramlightify" = ps: with ps; [  ];
     "light.piglow" = ps: with ps; [  ];
+    "light.qwikswitch" = ps: with ps; [  ];
+    "light.rflink" = ps: with ps; [  ];
+    "light.rfxtrx" = ps: with ps; [  ];
     "light.rpi_gpio_pwm" = ps: with ps; [  ];
+    "light.scsgate" = ps: with ps; [  ];
     "light.sensehat" = ps: with ps; [  ];
+    "light.skybell" = ps: with ps; [  ];
+    "light.tellduslive" = ps: with ps; [  ];
+    "light.tellstick" = ps: with ps; [  ];
+    "light.template" = ps: with ps; [  ];
     "light.tikteck" = ps: with ps; [  ];
     "light.tplink" = ps: with ps; [  ];
+    "light.tradfri" = ps: with ps; [  ];
+    "light.velbus" = ps: with ps; [  ];
+    "light.vera" = ps: with ps; [  ];
+    "light.wemo" = ps: with ps; [  ];
+    "light.wink" = ps: with ps; [  ];
+    "light.x10" = ps: with ps; [  ];
+    "light.xiaomi_aqara" = ps: with ps; [  ];
     "light.xiaomi_miio" = ps: with ps; [ construct ];
     "light.yeelight" = ps: with ps; [  ];
     "light.yeelightsunflower" = ps: with ps; [  ];
     "light.zengge" = ps: with ps; [  ];
+    "light.zha" = ps: with ps; [  ];
+    "light.zigbee" = ps: with ps; [  ];
+    "light.zwave" = ps: with ps; [  ];
     "linode" = ps: with ps; [ linode-api ];
     "lirc" = ps: with ps; [  ];
     "litejet" = ps: with ps; [  ];
+    "lock" = ps: with ps; [  ];
+    "lock.abode" = ps: with ps; [  ];
+    "lock.august" = ps: with ps; [  ];
+    "lock.bmw_connected_drive" = ps: with ps; [  ];
+    "lock.demo" = ps: with ps; [  ];
+    "lock.homematic" = ps: with ps; [ pyhomematic ];
+    "lock.isy994" = ps: with ps; [  ];
+    "lock.lockitron" = ps: with ps; [  ];
+    "lock.mqtt" = ps: with ps; [ paho-mqtt ];
     "lock.nello" = ps: with ps; [  ];
     "lock.nuki" = ps: with ps; [  ];
     "lock.sesame" = ps: with ps; [  ];
+    "lock.tesla" = ps: with ps; [  ];
+    "lock.vera" = ps: with ps; [  ];
+    "lock.verisure" = ps: with ps; [  ];
+    "lock.volvooncall" = ps: with ps; [  ];
+    "lock.wink" = ps: with ps; [  ];
+    "lock.zwave" = ps: with ps; [  ];
+    "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+    "logentries" = ps: with ps; [  ];
+    "logger" = ps: with ps; [  ];
     "lutron" = ps: with ps; [  ];
     "lutron_caseta" = ps: with ps; [  ];
+    "mailbox" = ps: with ps; [ aiohttp-cors ];
+    "mailbox.asterisk_mbox" = ps: with ps; [  ];
+    "mailbox.demo" = ps: with ps; [  ];
+    "mailgun" = ps: with ps; [ aiohttp-cors ];
+    "map" = ps: with ps; [  ];
     "matrix" = ps: with ps; [ matrix-client ];
     "maxcube" = ps: with ps; [  ];
-    "media_extractor" = ps: with ps; [ youtube-dl-light ];
+    "media_extractor" = ps: with ps; [ youtube-dl-light aiohttp-cors ];
+    "media_player" = ps: with ps; [ aiohttp-cors ];
     "media_player.anthemav" = ps: with ps; [  ];
+    "media_player.apple_tv" = ps: with ps; [  ];
     "media_player.aquostv" = ps: with ps; [  ];
     "media_player.blackbird" = ps: with ps; [  ];
     "media_player.bluesound" = ps: with ps; [ xmltodict ];
@@ -177,18 +553,24 @@
     "media_player.channels" = ps: with ps; [  ];
     "media_player.clementine" = ps: with ps; [  ];
     "media_player.cmus" = ps: with ps; [  ];
+    "media_player.demo" = ps: with ps; [  ];
+    "media_player.denon" = ps: with ps; [  ];
     "media_player.denonavr" = ps: with ps; [  ];
     "media_player.directv" = ps: with ps; [  ];
     "media_player.dunehd" = ps: with ps; [  ];
     "media_player.emby" = ps: with ps; [  ];
+    "media_player.firetv" = ps: with ps; [  ];
     "media_player.frontier_silicon" = ps: with ps; [  ];
     "media_player.gpmdp" = ps: with ps; [ websocket_client ];
     "media_player.gstreamer" = ps: with ps; [  ];
-    "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
+    "media_player.hdmi_cec" = ps: with ps; [  ];
+    "media_player.itunes" = ps: with ps; [  ];
+    "media_player.kodi" = ps: with ps; [ jsonrpc-websocket jsonrpc-async ];
     "media_player.lg_netcast" = ps: with ps; [  ];
     "media_player.liveboxplaytv" = ps: with ps; [  ];
     "media_player.mediaroom" = ps: with ps; [  ];
     "media_player.monoprice" = ps: with ps; [  ];
+    "media_player.mpchc" = ps: with ps; [  ];
     "media_player.mpd" = ps: with ps; [ mpd2 ];
     "media_player.nad" = ps: with ps; [  ];
     "media_player.nadtcp" = ps: with ps; [  ];
@@ -197,6 +579,7 @@
     "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ];
     "media_player.pandora" = ps: with ps; [ pexpect ];
     "media_player.philips_js" = ps: with ps; [  ];
+    "media_player.pioneer" = ps: with ps; [  ];
     "media_player.plex" = ps: with ps; [  ];
     "media_player.roku" = ps: with ps; [  ];
     "media_player.russound_rio" = ps: with ps; [  ];
@@ -206,57 +589,103 @@
     "media_player.songpal" = ps: with ps; [  ];
     "media_player.sonos" = ps: with ps; [  ];
     "media_player.soundtouch" = ps: with ps; [ libsoundtouch ];
-    "media_player.spotify" = ps: with ps; [ spotipy ];
+    "media_player.spotify" = ps: with ps; [ aiohttp-cors ];
+    "media_player.squeezebox" = ps: with ps; [  ];
+    "media_player.ue_smart_radio" = ps: with ps; [  ];
+    "media_player.universal" = ps: with ps; [  ];
     "media_player.vizio" = ps: with ps; [  ];
     "media_player.vlc" = ps: with ps; [  ];
+    "media_player.volumio" = ps: with ps; [  ];
     "media_player.webostv" = ps: with ps; [ websockets ];
     "media_player.xiaomi_tv" = ps: with ps; [  ];
     "media_player.yamaha" = ps: with ps; [  ];
     "media_player.yamaha_musiccast" = ps: with ps; [  ];
     "media_player.ziggo_mediabox_xl" = ps: with ps; [  ];
     "melissa" = ps: with ps; [  ];
+    "microsoft_face" = ps: with ps; [ aiohttp-cors ];
     "mochad" = ps: with ps; [  ];
     "modbus" = ps: with ps; [  ];
     "mqtt" = ps: with ps; [ paho-mqtt ];
-    "mqtt.server" = ps: with ps; [ hbmqtt ];
+    "mqtt.discovery" = ps: with ps; [  ];
+    "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ];
+    "mqtt_eventstream" = ps: with ps; [ paho-mqtt ];
+    "mqtt_statestream" = ps: with ps; [ paho-mqtt ];
     "mychevy" = ps: with ps; [  ];
     "mycroft" = ps: with ps; [  ];
     "mysensors" = ps: with ps; [  ];
+    "namecheapdns" = ps: with ps; [  ];
     "neato" = ps: with ps; [  ];
     "nest" = ps: with ps; [  ];
     "netatmo" = ps: with ps; [  ];
+    "no_ip" = ps: with ps; [  ];
+    "notify" = ps: with ps; [  ];
     "notify.apns" = ps: with ps; [  ];
     "notify.aws_lambda" = ps: with ps; [ boto3 ];
     "notify.aws_sns" = ps: with ps; [ boto3 ];
     "notify.aws_sqs" = ps: with ps; [ boto3 ];
     "notify.ciscospark" = ps: with ps; [  ];
+    "notify.clickatell" = ps: with ps; [  ];
+    "notify.clicksend" = ps: with ps; [  ];
+    "notify.clicksend_tts" = ps: with ps; [  ];
+    "notify.command_line" = ps: with ps; [  ];
+    "notify.demo" = ps: with ps; [  ];
     "notify.discord" = ps: with ps; [  ];
+    "notify.ecobee" = ps: with ps; [  ];
+    "notify.facebook" = ps: with ps; [  ];
+    "notify.file" = ps: with ps; [  ];
     "notify.free_mobile" = ps: with ps; [  ];
     "notify.gntp" = ps: with ps; [  ];
+    "notify.group" = ps: with ps; [  ];
     "notify.hipchat" = ps: with ps; [  ];
-    "notify.html5" = ps: with ps; [ pyjwt ];
+    "notify.html5" = ps: with ps; [ pyjwt aiohttp-cors ];
+    "notify.instapush" = ps: with ps; [  ];
+    "notify.ios" = ps: with ps; [ aiohttp-cors zeroconf ];
     "notify.joaoapps_join" = ps: with ps; [  ];
+    "notify.knx" = ps: with ps; [  ];
     "notify.kodi" = ps: with ps; [ jsonrpc-async ];
     "notify.lametric" = ps: with ps; [  ];
-    "notify.mailgun" = ps: with ps; [  ];
+    "notify.lannouncer" = ps: with ps; [  ];
+    "notify.llamalab_automate" = ps: with ps; [  ];
+    "notify.mailgun" = ps: with ps; [ aiohttp-cors ];
     "notify.mastodon" = ps: with ps; [  ];
+    "notify.matrix" = ps: with ps; [ matrix-client ];
     "notify.message_bird" = ps: with ps; [  ];
+    "notify.mycroft" = ps: with ps; [  ];
+    "notify.mysensors" = ps: with ps; [  ];
+    "notify.nfandroidtv" = ps: with ps; [  ];
+    "notify.nma" = ps: with ps; [  ];
+    "notify.prowl" = ps: with ps; [  ];
     "notify.pushbullet" = ps: with ps; [ pushbullet ];
     "notify.pushetta" = ps: with ps; [  ];
     "notify.pushover" = ps: with ps; [ python-pushover ];
+    "notify.pushsafer" = ps: with ps; [  ];
+    "notify.rest" = ps: with ps; [  ];
     "notify.rocketchat" = ps: with ps; [  ];
     "notify.sendgrid" = ps: with ps; [  ];
     "notify.simplepush" = ps: with ps; [  ];
     "notify.slack" = ps: with ps; [  ];
+    "notify.smtp" = ps: with ps; [  ];
     "notify.stride" = ps: with ps; [  ];
+    "notify.synology_chat" = ps: with ps; [  ];
+    "notify.syslog" = ps: with ps; [  ];
+    "notify.telegram" = ps: with ps; [ python-telegram-bot ];
+    "notify.telstra" = ps: with ps; [  ];
+    "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ];
+    "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ];
     "notify.twitter" = ps: with ps; [  ];
     "notify.webostv" = ps: with ps; [  ];
     "notify.xmpp" = ps: with ps; [ pyasn1-modules pyasn1 sleekxmpp ];
     "notify.yessssms" = ps: with ps; [  ];
     "nuheat" = ps: with ps; [  ];
     "nuimo_controller" = ps: with ps; [  ];
+    "octoprint" = ps: with ps; [  ];
+    "panel_custom" = ps: with ps; [ aiohttp-cors ];
+    "panel_iframe" = ps: with ps; [ aiohttp-cors ];
+    "persistent_notification" = ps: with ps; [  ];
     "pilight" = ps: with ps; [  ];
-    "prometheus" = ps: with ps; [ prometheus_client ];
+    "plant" = ps: with ps; [  ];
+    "prometheus" = ps: with ps; [ prometheus_client aiohttp-cors ];
+    "proximity" = ps: with ps; [  ];
     "python_script" = ps: with ps; [  ];
     "qwikswitch" = ps: with ps; [  ];
     "rainbird" = ps: with ps; [  ];
@@ -264,50 +693,115 @@
     "rainmachine" = ps: with ps; [  ];
     "raspihats" = ps: with ps; [  ];
     "recorder" = ps: with ps; [ sqlalchemy ];
+    "recorder.const" = ps: with ps; [  ];
+    "recorder.migration" = ps: with ps; [  ];
+    "recorder.purge" = ps: with ps; [  ];
+    "recorder.util" = ps: with ps; [  ];
     "remember_the_milk" = ps: with ps; [ httplib2 ];
+    "remote" = ps: with ps; [  ];
+    "remote.apple_tv" = ps: with ps; [  ];
+    "remote.demo" = ps: with ps; [  ];
     "remote.harmony" = ps: with ps; [  ];
     "remote.itach" = ps: with ps; [  ];
+    "remote.kira" = ps: with ps; [  ];
     "remote.xiaomi_miio" = ps: with ps; [ construct ];
+    "rest_command" = ps: with ps; [  ];
     "rflink" = ps: with ps; [  ];
     "rfxtrx" = ps: with ps; [  ];
     "ring" = ps: with ps; [  ];
     "rpi_gpio" = ps: with ps; [  ];
     "rpi_pfio" = ps: with ps; [  ];
+    "rss_feed_template" = ps: with ps; [ aiohttp-cors ];
     "satel_integra" = ps: with ps; [  ];
+    "scene" = ps: with ps; [  ];
+    "scene.deconz" = ps: with ps; [  ];
+    "scene.homeassistant" = ps: with ps; [  ];
     "scene.hunterdouglas_powerview" = ps: with ps; [  ];
+    "scene.knx" = ps: with ps; [  ];
+    "scene.lifx_cloud" = ps: with ps; [  ];
+    "scene.litejet" = ps: with ps; [  ];
+    "scene.lutron_caseta" = ps: with ps; [  ];
+    "scene.tahoma" = ps: with ps; [  ];
+    "scene.velux" = ps: with ps; [  ];
+    "scene.vera" = ps: with ps; [  ];
+    "scene.wink" = ps: with ps; [  ];
+    "script" = ps: with ps; [  ];
     "scsgate" = ps: with ps; [  ];
+    "sensor" = ps: with ps; [  ];
+    "sensor.abode" = ps: with ps; [  ];
+    "sensor.ads" = ps: with ps; [  ];
     "sensor.airvisual" = ps: with ps; [ pyairvisual ];
+    "sensor.alarmdecoder" = ps: with ps; [  ];
     "sensor.alpha_vantage" = ps: with ps; [  ];
+    "sensor.amcrest" = ps: with ps; [ ha-ffmpeg ];
+    "sensor.android_ip_webcam" = ps: with ps; [  ];
+    "sensor.apcupsd" = ps: with ps; [  ];
+    "sensor.api_streams" = ps: with ps; [  ];
+    "sensor.arduino" = ps: with ps; [  ];
+    "sensor.arest" = ps: with ps; [  ];
+    "sensor.arlo" = ps: with ps; [  ];
+    "sensor.arwn" = ps: with ps; [ paho-mqtt ];
     "sensor.bbox" = ps: with ps; [  ];
     "sensor.bh1750" = ps: with ps; [  ];
     "sensor.bitcoin" = ps: with ps; [  ];
+    "sensor.blink" = ps: with ps; [  ];
     "sensor.blockchain" = ps: with ps; [  ];
+    "sensor.bloomsky" = ps: with ps; [  ];
     "sensor.bme280" = ps: with ps; [  ];
     "sensor.bme680" = ps: with ps; [  ];
+    "sensor.bmw_connected_drive" = ps: with ps; [  ];
+    "sensor.bom" = ps: with ps; [  ];
     "sensor.broadlink" = ps: with ps; [  ];
     "sensor.buienradar" = ps: with ps; [  ];
+    "sensor.canary" = ps: with ps; [  ];
+    "sensor.cert_expiry" = ps: with ps; [  ];
+    "sensor.citybikes" = ps: with ps; [  ];
+    "sensor.coinbase" = ps: with ps; [  ];
     "sensor.coinmarketcap" = ps: with ps; [ coinmarketcap ];
+    "sensor.comed_hourly_pricing" = ps: with ps; [  ];
+    "sensor.comfoconnect" = ps: with ps; [  ];
+    "sensor.command_line" = ps: with ps; [  ];
     "sensor.cpuspeed" = ps: with ps; [  ];
     "sensor.crimereports" = ps: with ps; [  ];
     "sensor.cups" = ps: with ps; [ pycups ];
+    "sensor.currencylayer" = ps: with ps; [  ];
+    "sensor.daikin" = ps: with ps; [  ];
     "sensor.darksky" = ps: with ps; [  ];
+    "sensor.deconz" = ps: with ps; [  ];
     "sensor.deluge" = ps: with ps; [ deluge-client ];
+    "sensor.demo" = ps: with ps; [  ];
     "sensor.deutsche_bahn" = ps: with ps; [  ];
     "sensor.dht" = ps: with ps; [  ];
     "sensor.discogs" = ps: with ps; [ discogs_client ];
     "sensor.dnsip" = ps: with ps; [ aiodns ];
     "sensor.dovado" = ps: with ps; [  ];
     "sensor.dsmr" = ps: with ps; [  ];
+    "sensor.dte_energy_bridge" = ps: with ps; [  ];
+    "sensor.dublin_bus_transport" = ps: with ps; [  ];
+    "sensor.dwd_weather_warnings" = ps: with ps; [  ];
     "sensor.dweet" = ps: with ps; [  ];
+    "sensor.dyson" = ps: with ps; [  ];
+    "sensor.ebox" = ps: with ps; [  ];
+    "sensor.ecobee" = ps: with ps; [  ];
     "sensor.eddystone_temperature" = ps: with ps; [ construct ];
+    "sensor.efergy" = ps: with ps; [  ];
+    "sensor.eight_sleep" = ps: with ps; [  ];
     "sensor.eliqonline" = ps: with ps; [  ];
+    "sensor.emoncms" = ps: with ps; [  ];
+    "sensor.enocean" = ps: with ps; [  ];
     "sensor.envirophat" = ps: with ps; [  ];
+    "sensor.envisalink" = ps: with ps; [  ];
     "sensor.etherscan" = ps: with ps; [  ];
+    "sensor.fail2ban" = ps: with ps; [  ];
     "sensor.fastdotcom" = ps: with ps; [  ];
     "sensor.fedex" = ps: with ps; [  ];
     "sensor.fido" = ps: with ps; [  ];
-    "sensor.fitbit" = ps: with ps; [  ];
+    "sensor.file" = ps: with ps; [  ];
+    "sensor.filesize" = ps: with ps; [  ];
+    "sensor.filter" = ps: with ps; [  ];
+    "sensor.fitbit" = ps: with ps; [ aiohttp-cors ];
     "sensor.fixer" = ps: with ps; [  ];
+    "sensor.folder" = ps: with ps; [  ];
     "sensor.foobot" = ps: with ps; [  ];
     "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ];
     "sensor.fritzbox_netmonitor" = ps: with ps; [ fritzconnection ];
@@ -315,42 +809,93 @@
     "sensor.geizhals" = ps: with ps; [ beautifulsoup4 ];
     "sensor.geo_rss_events" = ps: with ps; [ feedparser ];
     "sensor.gitter" = ps: with ps; [  ];
+    "sensor.glances" = ps: with ps; [  ];
     "sensor.google_travel_time" = ps: with ps; [  ];
+    "sensor.google_wifi" = ps: with ps; [  ];
     "sensor.gpsd" = ps: with ps; [  ];
     "sensor.gtfs" = ps: with ps; [  ];
+    "sensor.haveibeenpwned" = ps: with ps; [  ];
+    "sensor.hddtemp" = ps: with ps; [  ];
+    "sensor.history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ];
+    "sensor.hive" = ps: with ps; [  ];
+    "sensor.homematic" = ps: with ps; [ pyhomematic ];
+    "sensor.homematicip_cloud" = ps: with ps; [  ];
     "sensor.hp_ilo" = ps: with ps; [  ];
     "sensor.htu21d" = ps: with ps; [  ];
     "sensor.hydroquebec" = ps: with ps; [  ];
+    "sensor.ihc" = ps: with ps; [  ];
     "sensor.imap" = ps: with ps; [ aioimaplib ];
+    "sensor.imap_email_content" = ps: with ps; [  ];
     "sensor.influxdb" = ps: with ps; [ influxdb ];
+    "sensor.insteon_plm" = ps: with ps; [  ];
+    "sensor.ios" = ps: with ps; [ aiohttp-cors zeroconf ];
+    "sensor.iota" = ps: with ps; [  ];
     "sensor.irish_rail_transport" = ps: with ps; [  ];
+    "sensor.isy994" = ps: with ps; [  ];
+    "sensor.juicenet" = ps: with ps; [  ];
+    "sensor.kira" = ps: with ps; [  ];
+    "sensor.knx" = ps: with ps; [  ];
     "sensor.kwb" = ps: with ps; [  ];
     "sensor.lacrosse" = ps: with ps; [  ];
     "sensor.lastfm" = ps: with ps; [ pylast ];
     "sensor.linux_battery" = ps: with ps; [ batinfo ];
+    "sensor.london_air" = ps: with ps; [  ];
+    "sensor.london_underground" = ps: with ps; [  ];
     "sensor.loopenergy" = ps: with ps; [  ];
     "sensor.luftdaten" = ps: with ps; [ luftdaten ];
     "sensor.lyft" = ps: with ps; [  ];
+    "sensor.melissa" = ps: with ps; [  ];
     "sensor.metoffice" = ps: with ps; [  ];
     "sensor.mfi" = ps: with ps; [  ];
     "sensor.mhz19" = ps: with ps; [  ];
     "sensor.miflora" = ps: with ps; [  ];
+    "sensor.min_max" = ps: with ps; [  ];
     "sensor.mitemp_bt" = ps: with ps; [  ];
+    "sensor.modbus" = ps: with ps; [  ];
     "sensor.modem_callerid" = ps: with ps; [  ];
+    "sensor.mold_indicator" = ps: with ps; [  ];
+    "sensor.moon" = ps: with ps; [  ];
     "sensor.mopar" = ps: with ps; [  ];
+    "sensor.mqtt" = ps: with ps; [ paho-mqtt ];
+    "sensor.mqtt_room" = ps: with ps; [ paho-mqtt ];
     "sensor.mvglive" = ps: with ps; [ PyMVGLive ];
+    "sensor.mychevy" = ps: with ps; [  ];
+    "sensor.mysensors" = ps: with ps; [  ];
     "sensor.nederlandse_spoorwegen" = ps: with ps; [  ];
+    "sensor.nest" = ps: with ps; [  ];
+    "sensor.netatmo" = ps: with ps; [  ];
+    "sensor.netdata" = ps: with ps; [  ];
     "sensor.neurio_energy" = ps: with ps; [  ];
     "sensor.nut" = ps: with ps; [  ];
+    "sensor.nzbget" = ps: with ps; [  ];
+    "sensor.octoprint" = ps: with ps; [  ];
+    "sensor.ohmconnect" = ps: with ps; [  ];
+    "sensor.onewire" = ps: with ps; [  ];
     "sensor.openevse" = ps: with ps; [  ];
+    "sensor.openexchangerates" = ps: with ps; [  ];
+    "sensor.openhardwaremonitor" = ps: with ps; [  ];
+    "sensor.opensky" = ps: with ps; [  ];
     "sensor.openweathermap" = ps: with ps; [ pyowm ];
     "sensor.otp" = ps: with ps; [  ];
+    "sensor.pi_hole" = ps: with ps; [  ];
+    "sensor.pilight" = ps: with ps; [  ];
     "sensor.plex" = ps: with ps; [  ];
     "sensor.pocketcasts" = ps: with ps; [  ];
     "sensor.pollen" = ps: with ps; [  ];
     "sensor.postnl" = ps: with ps; [  ];
     "sensor.pushbullet" = ps: with ps; [ pushbullet ];
+    "sensor.pvoutput" = ps: with ps; [  ];
+    "sensor.pyload" = ps: with ps; [  ];
     "sensor.qnap" = ps: with ps; [  ];
+    "sensor.qwikswitch" = ps: with ps; [  ];
+    "sensor.radarr" = ps: with ps; [  ];
+    "sensor.rainbird" = ps: with ps; [  ];
+    "sensor.raincloud" = ps: with ps; [  ];
+    "sensor.random" = ps: with ps; [  ];
+    "sensor.rest" = ps: with ps; [  ];
+    "sensor.rflink" = ps: with ps; [  ];
+    "sensor.rfxtrx" = ps: with ps; [  ];
+    "sensor.ring" = ps: with ps; [  ];
     "sensor.ripple" = ps: with ps; [  ];
     "sensor.sabnzbd" = ps: with ps; [  ];
     "sensor.scrape" = ps: with ps; [ beautifulsoup4 ];
@@ -361,89 +906,228 @@
     "sensor.serial_pm" = ps: with ps; [  ];
     "sensor.shodan" = ps: with ps; [  ];
     "sensor.sht31" = ps: with ps; [  ];
+    "sensor.sigfox" = ps: with ps; [  ];
+    "sensor.simulated" = ps: with ps; [  ];
+    "sensor.skybeacon" = ps: with ps; [  ];
+    "sensor.skybell" = ps: with ps; [  ];
+    "sensor.sleepiq" = ps: with ps; [  ];
     "sensor.sma" = ps: with ps; [  ];
+    "sensor.smappee" = ps: with ps; [  ];
     "sensor.snmp" = ps: with ps; [ pysnmp ];
     "sensor.sochain" = ps: with ps; [  ];
     "sensor.socialblade" = ps: with ps; [  ];
+    "sensor.sonarr" = ps: with ps; [  ];
     "sensor.speedtest" = ps: with ps; [  ];
     "sensor.spotcrime" = ps: with ps; [  ];
     "sensor.sql" = ps: with ps; [ sqlalchemy ];
     "sensor.startca" = ps: with ps; [ xmltodict ];
+    "sensor.statistics" = ps: with ps; [  ];
     "sensor.steam_online" = ps: with ps; [  ];
+    "sensor.supervisord" = ps: with ps; [  ];
     "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ];
     "sensor.swiss_public_transport" = ps: with ps; [  ];
     "sensor.syncthru" = ps: with ps; [  ];
     "sensor.synologydsm" = ps: with ps; [  ];
     "sensor.systemmonitor" = ps: with ps; [ psutil ];
     "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ];
+    "sensor.tado" = ps: with ps; [  ];
+    "sensor.tahoma" = ps: with ps; [  ];
     "sensor.tank_utility" = ps: with ps; [  ];
+    "sensor.tcp" = ps: with ps; [  ];
     "sensor.ted5000" = ps: with ps; [ xmltodict ];
+    "sensor.teksavvy" = ps: with ps; [  ];
+    "sensor.tellduslive" = ps: with ps; [  ];
+    "sensor.tellstick" = ps: with ps; [  ];
     "sensor.temper" = ps: with ps; [  ];
+    "sensor.template" = ps: with ps; [  ];
+    "sensor.tesla" = ps: with ps; [  ];
+    "sensor.thethingsnetwork" = ps: with ps; [  ];
     "sensor.thinkingcleaner" = ps: with ps; [  ];
     "sensor.tibber" = ps: with ps; [  ];
+    "sensor.time_date" = ps: with ps; [  ];
+    "sensor.toon" = ps: with ps; [  ];
+    "sensor.torque" = ps: with ps; [ aiohttp-cors ];
+    "sensor.tradfri" = ps: with ps; [  ];
+    "sensor.trafikverket_weatherstation" = ps: with ps; [  ];
     "sensor.transmission" = ps: with ps; [ transmissionrpc ];
     "sensor.travisci" = ps: with ps; [  ];
     "sensor.twitch" = ps: with ps; [  ];
     "sensor.uber" = ps: with ps; [  ];
+    "sensor.uk_transport" = ps: with ps; [  ];
+    "sensor.upnp" = ps: with ps; [ aiohttp-cors ];
     "sensor.ups" = ps: with ps; [  ];
+    "sensor.uptime" = ps: with ps; [  ];
     "sensor.uscis" = ps: with ps; [  ];
+    "sensor.usps" = ps: with ps; [  ];
     "sensor.vasttrafik" = ps: with ps; [  ];
+    "sensor.vera" = ps: with ps; [  ];
+    "sensor.verisure" = ps: with ps; [  ];
+    "sensor.version" = ps: with ps; [  ];
+    "sensor.viaggiatreno" = ps: with ps; [  ];
+    "sensor.volvooncall" = ps: with ps; [  ];
+    "sensor.vultr" = ps: with ps; [ vultr ];
     "sensor.waqi" = ps: with ps; [  ];
+    "sensor.waterfurnace" = ps: with ps; [  ];
     "sensor.waze_travel_time" = ps: with ps; [  ];
     "sensor.whois" = ps: with ps; [  ];
+    "sensor.wink" = ps: with ps; [  ];
+    "sensor.worldclock" = ps: with ps; [  ];
+    "sensor.worldtidesinfo" = ps: with ps; [  ];
+    "sensor.worxlandroid" = ps: with ps; [  ];
+    "sensor.wsdot" = ps: with ps; [  ];
+    "sensor.wunderground" = ps: with ps; [  ];
     "sensor.xbox_live" = ps: with ps; [  ];
+    "sensor.xiaomi_aqara" = ps: with ps; [  ];
     "sensor.xiaomi_miio" = ps: with ps; [ construct ];
     "sensor.yahoo_finance" = ps: with ps; [  ];
     "sensor.yr" = ps: with ps; [ xmltodict ];
     "sensor.yweather" = ps: with ps; [ yahooweather ];
+    "sensor.zabbix" = ps: with ps; [  ];
+    "sensor.zamg" = ps: with ps; [  ];
     "sensor.zestimate" = ps: with ps; [ xmltodict ];
+    "sensor.zha" = ps: with ps; [  ];
+    "sensor.zigbee" = ps: with ps; [  ];
+    "sensor.zoneminder" = ps: with ps; [  ];
+    "sensor.zwave" = ps: with ps; [  ];
+    "shell_command" = ps: with ps; [  ];
     "shiftr" = ps: with ps; [ paho-mqtt ];
+    "shopping_list" = ps: with ps; [ aiohttp-cors ];
     "skybell" = ps: with ps; [  ];
     "sleepiq" = ps: with ps; [  ];
     "smappee" = ps: with ps; [  ];
+    "snips" = ps: with ps; [ paho-mqtt ];
     "spc" = ps: with ps; [ websockets ];
+    "splunk" = ps: with ps; [  ];
     "statsd" = ps: with ps; [ statsd ];
+    "sun" = ps: with ps; [  ];
+    "switch" = ps: with ps; [  ];
+    "switch.abode" = ps: with ps; [  ];
     "switch.acer_projector" = ps: with ps; [ pyserial ];
+    "switch.ads" = ps: with ps; [  ];
+    "switch.amcrest" = ps: with ps; [ ha-ffmpeg ];
+    "switch.android_ip_webcam" = ps: with ps; [  ];
     "switch.anel_pwrctrl" = ps: with ps; [  ];
+    "switch.arduino" = ps: with ps; [  ];
+    "switch.arest" = ps: with ps; [  ];
+    "switch.bbb_gpio" = ps: with ps; [  ];
     "switch.broadlink" = ps: with ps; [  ];
+    "switch.command_line" = ps: with ps; [  ];
     "switch.deluge" = ps: with ps; [ deluge-client ];
+    "switch.demo" = ps: with ps; [  ];
+    "switch.digital_ocean" = ps: with ps; [ digital-ocean ];
     "switch.digitalloggers" = ps: with ps; [  ];
     "switch.dlink" = ps: with ps; [  ];
+    "switch.doorbird" = ps: with ps; [  ];
     "switch.edimax" = ps: with ps; [  ];
+    "switch.enocean" = ps: with ps; [  ];
+    "switch.eufy" = ps: with ps; [  ];
+    "switch.flux" = ps: with ps; [  ];
+    "switch.fritzbox" = ps: with ps; [  ];
     "switch.fritzdect" = ps: with ps; [  ];
+    "switch.gc100" = ps: with ps; [  ];
+    "switch.hdmi_cec" = ps: with ps; [  ];
     "switch.hikvisioncam" = ps: with ps; [  ];
+    "switch.hive" = ps: with ps; [  ];
+    "switch.homekit_controller" = ps: with ps; [  ];
+    "switch.homematic" = ps: with ps; [ pyhomematic ];
+    "switch.hook" = ps: with ps; [  ];
+    "switch.ihc" = ps: with ps; [  ];
+    "switch.insteon_local" = ps: with ps; [  ];
+    "switch.insteon_plm" = ps: with ps; [  ];
+    "switch.isy994" = ps: with ps; [  ];
+    "switch.kankun" = ps: with ps; [  ];
+    "switch.knx" = ps: with ps; [  ];
+    "switch.linode" = ps: with ps; [ linode-api ];
+    "switch.litejet" = ps: with ps; [  ];
+    "switch.lutron_caseta" = ps: with ps; [  ];
     "switch.mfi" = ps: with ps; [  ];
+    "switch.mochad" = ps: with ps; [  ];
+    "switch.modbus" = ps: with ps; [  ];
+    "switch.mqtt" = ps: with ps; [ paho-mqtt ];
+    "switch.mysensors" = ps: with ps; [  ];
     "switch.mystrom" = ps: with ps; [  ];
-    "switch.netio" = ps: with ps; [  ];
+    "switch.neato" = ps: with ps; [  ];
+    "switch.netio" = ps: with ps; [ aiohttp-cors ];
     "switch.orvibo" = ps: with ps; [  ];
+    "switch.pilight" = ps: with ps; [  ];
+    "switch.pulseaudio_loopback" = ps: with ps; [  ];
+    "switch.qwikswitch" = ps: with ps; [  ];
     "switch.rachio" = ps: with ps; [  ];
+    "switch.rainbird" = ps: with ps; [  ];
+    "switch.raincloud" = ps: with ps; [  ];
+    "switch.rainmachine" = ps: with ps; [  ];
+    "switch.raspihats" = ps: with ps; [  ];
+    "switch.rest" = ps: with ps; [  ];
+    "switch.rflink" = ps: with ps; [  ];
+    "switch.rfxtrx" = ps: with ps; [  ];
+    "switch.rpi_gpio" = ps: with ps; [  ];
+    "switch.rpi_pfio" = ps: with ps; [  ];
     "switch.rpi_rf" = ps: with ps; [  ];
+    "switch.scsgate" = ps: with ps; [  ];
+    "switch.skybell" = ps: with ps; [  ];
+    "switch.smappee" = ps: with ps; [  ];
     "switch.snmp" = ps: with ps; [ pysnmp ];
+    "switch.tahoma" = ps: with ps; [  ];
+    "switch.tellduslive" = ps: with ps; [  ];
+    "switch.tellstick" = ps: with ps; [  ];
+    "switch.telnet" = ps: with ps; [  ];
+    "switch.template" = ps: with ps; [  ];
+    "switch.tesla" = ps: with ps; [  ];
     "switch.thinkingcleaner" = ps: with ps; [  ];
+    "switch.toon" = ps: with ps; [  ];
     "switch.tplink" = ps: with ps; [  ];
     "switch.transmission" = ps: with ps; [ transmissionrpc ];
+    "switch.upcloud" = ps: with ps; [  ];
+    "switch.velbus" = ps: with ps; [  ];
+    "switch.vera" = ps: with ps; [  ];
+    "switch.verisure" = ps: with ps; [  ];
     "switch.vesync" = ps: with ps; [  ];
+    "switch.volvooncall" = ps: with ps; [  ];
+    "switch.vultr" = ps: with ps; [ vultr ];
     "switch.wake_on_lan" = ps: with ps; [ wakeonlan ];
+    "switch.wemo" = ps: with ps; [  ];
+    "switch.wink" = ps: with ps; [  ];
+    "switch.xiaomi_aqara" = ps: with ps; [  ];
     "switch.xiaomi_miio" = ps: with ps; [ construct ];
+    "switch.zha" = ps: with ps; [  ];
+    "switch.zigbee" = ps: with ps; [  ];
+    "switch.zoneminder" = ps: with ps; [  ];
+    "switch.zwave" = ps: with ps; [  ];
+    "system_log" = ps: with ps; [ aiohttp-cors ];
     "tado" = ps: with ps; [  ];
     "tahoma" = ps: with ps; [  ];
     "telegram_bot" = ps: with ps; [ python-telegram-bot ];
+    "telegram_bot.broadcast" = ps: with ps; [  ];
+    "telegram_bot.polling" = ps: with ps; [  ];
+    "telegram_bot.webhooks" = ps: with ps; [ aiohttp-cors ];
     "tellduslive" = ps: with ps; [  ];
     "tellstick" = ps: with ps; [  ];
     "tesla" = ps: with ps; [  ];
+    "thethingsnetwork" = ps: with ps; [  ];
     "thingspeak" = ps: with ps; [  ];
+    "timer" = ps: with ps; [  ];
     "toon" = ps: with ps; [  ];
     "tradfri" = ps: with ps; [  ];
-    "tts" = ps: with ps; [ mutagen ];
+    "tts" = ps: with ps; [ mutagen aiohttp-cors ];
     "tts.amazon_polly" = ps: with ps; [ boto3 ];
     "tts.baidu" = ps: with ps; [  ];
+    "tts.demo" = ps: with ps; [  ];
     "tts.google" = ps: with ps; [  ];
+    "tts.marytts" = ps: with ps; [  ];
     "tts.microsoft" = ps: with ps; [  ];
-    "twilio" = ps: with ps; [ twilio ];
+    "tts.picotts" = ps: with ps; [  ];
+    "tts.voicerss" = ps: with ps; [  ];
+    "tts.yandextts" = ps: with ps; [  ];
+    "twilio" = ps: with ps; [ aiohttp-cors twilio ];
     "upcloud" = ps: with ps; [  ];
     "updater" = ps: with ps; [ distro ];
-    "upnp" = ps: with ps; [  ];
+    "upnp" = ps: with ps; [ aiohttp-cors ];
     "usps" = ps: with ps; [  ];
+    "vacuum" = ps: with ps; [  ];
+    "vacuum.demo" = ps: with ps; [  ];
+    "vacuum.dyson" = ps: with ps; [  ];
+    "vacuum.mqtt" = ps: with ps; [ paho-mqtt ];
+    "vacuum.neato" = ps: with ps; [  ];
     "vacuum.roomba" = ps: with ps; [  ];
     "vacuum.xiaomi_miio" = ps: with ps; [ construct ];
     "velbus" = ps: with ps; [  ];
@@ -454,18 +1138,36 @@
     "vultr" = ps: with ps; [ vultr ];
     "wake_on_lan" = ps: with ps; [ wakeonlan ];
     "waterfurnace" = ps: with ps; [  ];
+    "weather" = ps: with ps; [  ];
+    "weather.bom" = ps: with ps; [  ];
     "weather.buienradar" = ps: with ps; [  ];
     "weather.darksky" = ps: with ps; [  ];
+    "weather.demo" = ps: with ps; [  ];
+    "weather.ecobee" = ps: with ps; [  ];
     "weather.metoffice" = ps: with ps; [  ];
     "weather.openweathermap" = ps: with ps; [ pyowm ];
     "weather.yweather" = ps: with ps; [ yahooweather ];
+    "weather.zamg" = ps: with ps; [  ];
+    "weblink" = ps: with ps; [  ];
+    "websocket_api" = ps: with ps; [ aiohttp-cors ];
     "wemo" = ps: with ps; [  ];
     "wink" = ps: with ps; [  ];
     "xiaomi_aqara" = ps: with ps; [  ];
     "zabbix" = ps: with ps; [  ];
-    "zeroconf" = ps: with ps; [ zeroconf ];
+    "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ];
     "zha" = ps: with ps; [  ];
+    "zha.const" = ps: with ps; [  ];
     "zigbee" = ps: with ps; [  ];
-    "zwave" = ps: with ps; [ pydispatcher python_openzwave ];
+    "zone" = ps: with ps; [  ];
+    "zone.config_flow" = ps: with ps; [  ];
+    "zone.const" = ps: with ps; [  ];
+    "zone.zone" = ps: with ps; [  ];
+    "zoneminder" = ps: with ps; [  ];
+    "zwave" = ps: with ps; [ python_openzwave pydispatcher ];
+    "zwave.const" = ps: with ps; [  ];
+    "zwave.discovery_schemas" = ps: with ps; [  ];
+    "zwave.node_entity" = ps: with ps; [  ];
+    "zwave.util" = ps: with ps; [  ];
+    "zwave.workaround" = ps: with ps; [  ];
   };
 }
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 5beeaccf0881..4518d4dd406a 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ ])"
+#! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs ])"
 #
 # This script downloads https://github.com/home-assistant/home-assistant/blob/master/requirements_all.txt.
 # This file contains lines of the form
@@ -14,15 +14,17 @@
 # Then, a Nix attribute set mapping component name to dependencies is created.
 
 from urllib.request import urlopen
-from collections import OrderedDict
+import tempfile
+from io import BytesIO
+import tarfile
+import importlib
 import subprocess
 import os
 import sys
 import json
 import re
 
-GENERAL_PREFIX = '# homeassistant.'
-COMPONENT_PREFIX = GENERAL_PREFIX + 'components.'
+COMPONENT_PREFIX = 'homeassistant.components'
 PKG_SET = 'python3Packages'
 
 # If some requirements are matched by multiple python packages,
@@ -37,28 +39,32 @@ def get_version():
         m = re.search('hassVersion = "([\\d\\.]+)";', f.read())
         return m.group(1)
 
-def fetch_reqs(version='master'):
-    requirements = {}
-    with urlopen('https://github.com/home-assistant/home-assistant/raw/{}/requirements_all.txt'.format(version)) as response:
-        components = []
-        for line in response.read().decode().splitlines():
-            if line == '':
-                components = []
-            elif line[:len(COMPONENT_PREFIX)] == COMPONENT_PREFIX:
-                component = line[len(COMPONENT_PREFIX):]
-                components.append(component)
-                if component not in requirements:
-                    requirements[component] = []
-            elif line[:len(GENERAL_PREFIX)] != GENERAL_PREFIX: # skip lines like "# homeassistant.scripts.xyz"
-                # Some dependencies are commented out because they don't build on all platforms
-                # Since they are still required for running the component, don't skip them
-                if line[:2] == '# ':
-                    line = line[2:]
-                # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0
-                # Therefore, if there's a "#" in the line, only take the part after it
-                line = line[line.find('#') + 1:]
-                for component in components:
-                    requirements[component].append(line)
+def parse_components(version='master'):
+    components = {}
+    with tempfile.TemporaryDirectory() as tmp:
+        with urlopen('https://github.com/home-assistant/home-assistant/archive/{}.tar.gz'.format(version)) as response:
+            tarfile.open(fileobj=BytesIO(response.read())).extractall(tmp)
+        # Use part of a script from the Home Assistant codebase
+        sys.path.append(tmp + '/home-assistant-{}'.format(version))
+        from script.gen_requirements_all import explore_module
+        for package in explore_module(COMPONENT_PREFIX, True):
+            # Remove 'homeassistant.components.' prefix
+            component = package[len(COMPONENT_PREFIX + '.'):]
+            try:
+                module = importlib.import_module(package)
+                components[component] = {}
+                components[component]['requirements'] = getattr(module, 'REQUIREMENTS', [])
+                components[component]['dependencies'] = getattr(module, 'DEPENDENCIES', [])
+            # If there is an ImportError, the imported file is not the main file of the component
+            except ImportError:
+                continue
+    return components
+
+# Recursively get the requirements of a component and its dependencies
+def get_reqs(components, component):
+    requirements = set(components[component]['requirements'])
+    for dependency in components[component]['dependencies']:
+        requirements.update(get_reqs(components, dependency))
     return requirements
 
 # Store a JSON dump of Nixpkgs' python3Packages
@@ -95,11 +101,11 @@ def name_to_attr_path(req):
 
 version = get_version()
 print('Generating component-packages.nix for version {}'.format(version))
-requirements = fetch_reqs(version=version)
+components = parse_components(version=version)
 build_inputs = {}
-for component, reqs in OrderedDict(sorted(requirements.items())).items():
+for component in sorted(components.keys()):
     attr_paths = []
-    for req in reqs:
+    for req in get_reqs(components, component):
         name = req.split('==')[0]
         attr_path = name_to_attr_path(name)
         if attr_path is not None:
@@ -108,11 +114,8 @@ for component, reqs in OrderedDict(sorted(requirements.items())).items():
     else:
         build_inputs[component] = attr_paths
 
-# Only select components which have any dependency
-#build_inputs = {k: v for k, v in build_inputs.items() if len(v) > 0}
-
 with open(os.path.dirname(sys.argv[0]) + '/component-packages.nix', 'w') as f:
-    f.write('# Generated from parse-requirements.py\n')
+    f.write('# Generated by parse-requirements.py\n')
     f.write('# Do not edit!\n\n')
     f.write('{\n')
     f.write('  version = "{}";\n'.format(version))

From 495c5a22910420a4abd562477579380b41108bb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 24 May 2018 14:38:27 +0200
Subject: [PATCH 2509/3370] androidndk: Fixes missing libraries for prebuilt
 clang

---
 .../mobile/androidenv/androidndk.nix          | 21 +++++++++----------
 .../development/mobile/androidenv/default.nix |  6 +++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 78e278be2376..a0a15bf184dc 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, zlib, ncurses, p7zip, lib, makeWrapper
+{ stdenv, fetchurl, zlib, ncurses5, p7zip, lib, makeWrapper
 , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
-, platformTools, python3, version, sha256
+, platformTools, python3, libcxx, version, sha256
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   phases = "buildPhase";
 
-  nativeBuildInputs = [ p7zip makeWrapper ];
+  nativeBuildInputs = [ p7zip makeWrapper file ];
 
   buildCommand = let
     bin_path = "$out/bin";
@@ -33,9 +33,14 @@ stdenv.mkDerivation rec {
   in ''
     set -x
     mkdir -pv $out/libexec
+    mkdir -pv $out/lib64
+    ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5
+    ln -s ${ncurses5.out}/lib/libncurses.so.5 $out/lib64/libncurses.so.5
     cd $out/libexec
     7z x $src
 
+    patchShebangs ${pkg_path}
+
     # so that it doesn't fail because of read-only permissions set
     cd -
     ${if (version == "10e") then
@@ -46,8 +51,6 @@ stdenv.mkDerivation rec {
         ''
       else
         ''
-          patchShebangs ${pkg_path}/build/tools/make-standalone-toolchain.sh
-
           patch -p1 \
             --no-backup-if-mismatch \
             -d $out/libexec/${name} < ${ ./. + builtins.toPath ("/make_standalone_toolchain.py_" + "${version}" + ".patch") }
@@ -60,17 +63,13 @@ stdenv.mkDerivation rec {
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath ${stdenv.lib.makeLibraryPath [ zlib.out ncurses ]} {} \;
+                          --set-rpath $out/lib64:${stdenv.lib.makeLibraryPath [ libcxx.out zlib.out ncurses5 ]} {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
     do
         sed -i -e ${sed_script_1} $i
     done
-    ${lib.optionalString (version == "10e") ''
-      sed -i -e ${sed_script_2} ndk-which
-      # a bash script
-      patchShebangs ndk-which
-    ''}
+
     # wrap
     for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py ndk-which"}
     do
diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix
index 3978ae1aeb7b..5846e4fb6de0 100644
--- a/pkgs/development/mobile/androidenv/default.nix
+++ b/pkgs/development/mobile/androidenv/default.nix
@@ -219,7 +219,7 @@ rec {
     inherit (buildPackages)
       p7zip makeWrapper;
     inherit (pkgs)
-      stdenv fetchurl zlib ncurses lib python3
+      stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
     version = "10e";
@@ -230,7 +230,7 @@ rec {
     inherit (buildPackages)
       p7zip makeWrapper;
     inherit (pkgs)
-      stdenv fetchurl zlib ncurses lib python3
+      stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
     version = "16b";
@@ -241,7 +241,7 @@ rec {
     inherit (buildPackages)
       p7zip makeWrapper;
     inherit (pkgs)
-      stdenv fetchurl zlib ncurses lib python3
+      stdenv fetchurl zlib ncurses5 lib python3 libcxx
       coreutils file findutils gawk gnugrep gnused jdk which;
     inherit platformTools;
     version = "17";

From 158e550762ee84ca2ce64218cc19af2b87bcebe5 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sun, 29 Apr 2018 15:06:35 -0700
Subject: [PATCH 2510/3370] llvm and clang 6: factor out compiler-rt, fix
 libstdcxxStdenv sanitizer headers

Build compiler-rt separate from llvm and clang, and just add as an extra
library in the wrapper.

(cherry picked from commit 16da44b5c115fe58048d7ba8aa597ed1598ea090)
---
 .../compilers/llvm/6/clang/default.nix        | 10 ++----
 .../compilers/llvm/6/compiler-rt.nix          | 31 +++++++++++++++++++
 pkgs/development/compilers/llvm/6/default.nix | 24 +++++++++++---
 pkgs/development/compilers/llvm/6/llvm.nix    | 16 ----------
 4 files changed, 54 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/compilers/llvm/6/compiler-rt.nix

diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix
index 919efdc8ef97..eefac7d6e693 100644
--- a/pkgs/development/compilers/llvm/6/clang/default.nix
+++ b/pkgs/development/compilers/llvm/6/clang/default.nix
@@ -30,10 +30,7 @@ let
       "-DSPHINX_OUTPUT_MAN=ON"
       "-DSPHINX_OUTPUT_HTML=OFF"
       "-DSPHINX_WARNINGS_AS_ERRORS=OFF"
-    ]
-    # Maybe with compiler-rt this won't be needed?
-    ++ stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}"
-    ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include";
+    ];
 
     patches = [ ./purity.patch ];
 
@@ -51,10 +48,9 @@ let
     outputs = [ "out" "lib" "python" ];
 
     # Clang expects to find LLVMgold in its own prefix
-    # Clang expects to find sanitizer libraries in its own prefix
     postInstall = ''
       ln -sv ${llvm}/lib/LLVMgold.so $out/lib
-      ln -sv ${llvm}/lib/clang/${release_version}/lib $out/lib/clang/${release_version}/
+
       ln -sv $out/bin/clang $out/bin/cpp
 
       # Move libclang to 'lib' output
@@ -76,7 +72,7 @@ let
     passthru = {
       isClang = true;
       inherit llvm;
-    } // stdenv.lib.optionalAttrs stdenv.isLinux {
+    } // stdenv.lib.optionalAttrs stdenv.targetPlatform.isLinux {
       inherit gcc;
     };
 
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix
new file mode 100644
index 000000000000..333818f7dbde
--- /dev/null
+++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix
@@ -0,0 +1,31 @@
+{ stdenv, version, fetch, cmake, python, llvm }:
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "compiler-rt-${version}";
+  inherit version;
+  src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h";
+
+  nativeBuildInputs = [ cmake python llvm ];
+
+  configureFlags = [
+    "-DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON"
+  ];
+
+  outputs = [ "dev" "out" ];
+
+  patches = [
+    ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory
+  ] ++ optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch;
+
+  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
+  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
+  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
+  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
+  # a flag and turn the flag off during the stdenv build.
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace cmake/config-ix.cmake \
+      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
+  '';
+
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 3a7b66f1ed0e..81d41673b251 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -14,7 +14,6 @@ let
     inherit sha256;
   };
 
-  compiler-rt_src = fetch "compiler-rt" "16m7rvh3w6vq10iwkjrr1nn293djld3xm62l5zasisaprx117k6h";
   clang-tools-extra_src = fetch "clang-tools-extra" "1ll9v6r29xfdiywbn9iss49ad39ah3fk91wiv0sr6k6k9i544fq5";
 
   # Add man output without introducing extra dependencies.
@@ -27,7 +26,6 @@ let
   in {
 
     llvm = overrideManOutput (callPackage ./llvm.nix {
-      inherit compiler-rt_src;
       inherit (targetLlvmLibraries) libcxxabi;
     });
     clang-unwrapped = overrideManOutput (callPackage ./clang {
@@ -43,11 +41,27 @@ let
     libstdcxxClang = wrapCCWith {
       cc = tools.clang-unwrapped;
       extraPackages = [ libstdcxxHook ];
+      extraBuildCommands = stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+        echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+      '';
     };
 
-    libcxxClang = wrapCCWith {
+    libcxxClang = wrapCCWith rec {
       cc = tools.clang-unwrapped;
-      extraPackages = [ targetLlvmLibraries.libcxx targetLlvmLibraries.libcxxabi ];
+      extraPackages = [
+        targetLlvmLibraries.libcxx
+        targetLlvmLibraries.libcxxabi
+        targetLlvmLibraries.compiler-rt
+      ];
+      extraBuildCommands = ''
+        rsrc="$out/resource-root"
+        mkdir "$rsrc"
+        ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc"
+        ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
+        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+      '' + stdenv.lib.optionalString stdenv.targetPlatform.isLinux ''
+        echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags
+      '';
     };
 
     lld = callPackage ./lld.nix {};
@@ -59,6 +73,8 @@ let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python2 isl release_version version fetch; });
   in {
 
+    compiler-rt = callPackage ./compiler-rt.nix {};
+
     stdenv = overrideCC stdenv buildLlvmTools.clang;
 
     libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix
index 7cb3e88c2f85..8877ccd11621 100644
--- a/pkgs/development/compilers/llvm/6/llvm.nix
+++ b/pkgs/development/compilers/llvm/6/llvm.nix
@@ -11,7 +11,6 @@
 , version
 , release_version
 , zlib
-, compiler-rt_src
 , libcxxabi
 , debugVersion ? false
 , enableManpages ? false
@@ -33,8 +32,6 @@ in stdenv.mkDerivation (rec {
     unpackFile ${src}
     mv llvm-${version}* llvm
     sourceRoot=$PWD/llvm
-    unpackFile ${compiler-rt_src}
-    mv compiler-rt-* $sourceRoot/projects/compiler-rt
   '';
 
   outputs = [ "out" "python" ]
@@ -48,15 +45,7 @@ in stdenv.mkDerivation (rec {
 
   propagatedBuildInputs = [ ncurses zlib ];
 
-  # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks
-  # to get it, but they're unfree. Since LLVM is rather central to the stdenv, we patch out TSAN support so that Hydra
-  # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd
-  # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by
-  # a flag and turn the flag off during the stdenv build.
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace ./projects/compiler-rt/cmake/config-ix.cmake \
-      --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)'
-
     substituteInPlace cmake/modules/AddLLVM.cmake \
       --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir INSTALL_NAME_DIR "$lib/lib")" \
       --replace 'set(_install_rpath "@loader_path/../lib" ''${extra_libdir})' ""
@@ -70,15 +59,11 @@ in stdenv.mkDerivation (rec {
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "Path.cpp" ""
     rm unittests/Support/Path.cpp
-
-    # Revert compiler-rt commit that makes codesign mandatory
-    patch -p1 -i ${./compiler-rt-codesign.patch} -d projects/compiler-rt
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     patch -p1 -i ${../TLI-musl.patch}
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
-    patch -p1 -i ${./sanitizers-nongnu.patch} -d projects/compiler-rt
   '';
 
   # hacky fix: created binaries need to be run before installation
@@ -93,7 +78,6 @@ in stdenv.mkDerivation (rec {
     "-DLLVM_BUILD_TESTS=ON"
     "-DLLVM_ENABLE_FFI=ON"
     "-DLLVM_ENABLE_RTTI=ON"
-    "-DCOMPILER_RT_INCLUDE_TESTS=OFF" # FIXME: requires clang source code
   ]
   ++ stdenv.lib.optional enableSharedLibraries
     "-DLLVM_LINK_LLVM_DYLIB=ON"

From ee06f735a889e64960dd16514da704a9c9c746bb Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <benjamin.saunders@here.com>
Date: Mon, 7 May 2018 13:22:50 -0700
Subject: [PATCH 2511/3370] tests.cc-wrapper: verify building with sanitizers

(cherry picked from commit 46eeef1898ffbf57330ec31b96a6c2d89f8fcb36)
---
 pkgs/build-support/cc-wrapper/default.nix     | 4 ++--
 pkgs/development/compilers/llvm/6/default.nix | 1 +
 pkgs/test/cc-wrapper/default.nix              | 5 +++++
 pkgs/test/cc-wrapper/sanitizers.c             | 8 ++++++++
 4 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/test/cc-wrapper/sanitizers.c

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 43cd87fb4597..8f99da805ec1 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -9,7 +9,7 @@
 , stdenvNoCC, nativeTools, propagateDoc ? !nativeTools, noLibc ? false, nativeLibc, nativePrefix ? ""
 , cc ? null, libc ? null, bintools, coreutils ? null, shell ? stdenvNoCC.shell
 , extraPackages ? [], extraBuildCommands ? ""
-, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
+, isGNU ? false, isClang ? cc.isClang or false, isCompilerRT ? false, gnugrep ? null
 , buildPackages ? {}
 }:
 
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
     # Binutils, and Apple's "cctools"; "bintools" as an attempt to find an
     # unused middle-ground name that evokes both.
     inherit bintools;
-    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang default_cxx_stdlib_compile;
+    inherit libc nativeTools nativeLibc nativePrefix isGNU isClang isCompilerRT default_cxx_stdlib_compile;
 
     emacsBufferSetup = pkgs: ''
       ; We should handle propagation here too
diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix
index 81d41673b251..da5a97a9bbaa 100644
--- a/pkgs/development/compilers/llvm/6/default.nix
+++ b/pkgs/development/compilers/llvm/6/default.nix
@@ -53,6 +53,7 @@ let
         targetLlvmLibraries.libcxxabi
         targetLlvmLibraries.compiler-rt
       ];
+      isCompilerRT = true;
       extraBuildCommands = ''
         rsrc="$out/resource-root"
         mkdir "$rsrc"
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 41a7685ed2e0..06113e40561b 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation {
 
     NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
     ./ldflags-check
+  '' + stdenv.lib.optionalString (stdenv.cc.isCompilerRT or false) ''
+
+    $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
+    ./sanitizers
+  '' + ''
 
     touch $out
   '';
diff --git a/pkgs/test/cc-wrapper/sanitizers.c b/pkgs/test/cc-wrapper/sanitizers.c
new file mode 100644
index 000000000000..93dd78a903ce
--- /dev/null
+++ b/pkgs/test/cc-wrapper/sanitizers.c
@@ -0,0 +1,8 @@
+#include <sanitizer/asan_interface.h>
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+  fprintf(stderr, "ok\n");
+  return 0;
+}

From 2be9833d6a270f56375db0c2fcaa262d011e56a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 25 May 2018 19:37:12 +0200
Subject: [PATCH 2512/3370] home-assistant: sort packages alphabetically

---
 pkgs/servers/home-assistant/component-packages.nix | 14 +++++++-------
 pkgs/servers/home-assistant/parse-requirements.py  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 98e046eb5470..282db5eb8bee 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -219,7 +219,7 @@
     "climate.vera" = ps: with ps; [  ];
     "climate.wink" = ps: with ps; [  ];
     "climate.zwave" = ps: with ps; [  ];
-    "cloud" = ps: with ps; [ warrant aiohttp-cors ];
+    "cloud" = ps: with ps; [ aiohttp-cors warrant ];
     "cloud.auth_api" = ps: with ps; [  ];
     "cloud.const" = ps: with ps; [  ];
     "cloud.http_api" = ps: with ps; [  ];
@@ -308,7 +308,7 @@
     "device_tracker.netgear" = ps: with ps; [  ];
     "device_tracker.nmap_tracker" = ps: with ps; [  ];
     "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ];
-    "device_tracker.owntracks_http" = ps: with ps; [ libnacl aiohttp-cors ];
+    "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ];
     "device_tracker.ping" = ps: with ps; [  ];
     "device_tracker.sky_hub" = ps: with ps; [  ];
     "device_tracker.snmp" = ps: with ps; [ pysnmp ];
@@ -541,7 +541,7 @@
     "map" = ps: with ps; [  ];
     "matrix" = ps: with ps; [ matrix-client ];
     "maxcube" = ps: with ps; [  ];
-    "media_extractor" = ps: with ps; [ youtube-dl-light aiohttp-cors ];
+    "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ];
     "media_player" = ps: with ps; [ aiohttp-cors ];
     "media_player.anthemav" = ps: with ps; [  ];
     "media_player.apple_tv" = ps: with ps; [  ];
@@ -565,7 +565,7 @@
     "media_player.gstreamer" = ps: with ps; [  ];
     "media_player.hdmi_cec" = ps: with ps; [  ];
     "media_player.itunes" = ps: with ps; [  ];
-    "media_player.kodi" = ps: with ps; [ jsonrpc-websocket jsonrpc-async ];
+    "media_player.kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ];
     "media_player.lg_netcast" = ps: with ps; [  ];
     "media_player.liveboxplaytv" = ps: with ps; [  ];
     "media_player.mediaroom" = ps: with ps; [  ];
@@ -684,7 +684,7 @@
     "persistent_notification" = ps: with ps; [  ];
     "pilight" = ps: with ps; [  ];
     "plant" = ps: with ps; [  ];
-    "prometheus" = ps: with ps; [ prometheus_client aiohttp-cors ];
+    "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ];
     "proximity" = ps: with ps; [  ];
     "python_script" = ps: with ps; [  ];
     "qwikswitch" = ps: with ps; [  ];
@@ -1108,7 +1108,7 @@
     "timer" = ps: with ps; [  ];
     "toon" = ps: with ps; [  ];
     "tradfri" = ps: with ps; [  ];
-    "tts" = ps: with ps; [ mutagen aiohttp-cors ];
+    "tts" = ps: with ps; [ aiohttp-cors mutagen ];
     "tts.amazon_polly" = ps: with ps; [ boto3 ];
     "tts.baidu" = ps: with ps; [  ];
     "tts.demo" = ps: with ps; [  ];
@@ -1163,7 +1163,7 @@
     "zone.const" = ps: with ps; [  ];
     "zone.zone" = ps: with ps; [  ];
     "zoneminder" = ps: with ps; [  ];
-    "zwave" = ps: with ps; [ python_openzwave pydispatcher ];
+    "zwave" = ps: with ps; [ pydispatcher python_openzwave ];
     "zwave.const" = ps: with ps; [  ];
     "zwave.discovery_schemas" = ps: with ps; [  ];
     "zwave.node_entity" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 4518d4dd406a..8415fd17e85a 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -105,7 +105,7 @@ components = parse_components(version=version)
 build_inputs = {}
 for component in sorted(components.keys()):
     attr_paths = []
-    for req in get_reqs(components, component):
+    for req in sorted(get_reqs(components, component)):
         name = req.split('==')[0]
         attr_path = name_to_attr_path(name)
         if attr_path is not None:

From a29518707d829761a8f3b3c33e6cea10eb9d5a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Fri, 25 May 2018 19:41:55 +0200
Subject: [PATCH 2513/3370] home-assistant: support requirements specified by
 URL

---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/parse-requirements.py  | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 282db5eb8bee..4d970a7e0d5d 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -589,7 +589,7 @@
     "media_player.songpal" = ps: with ps; [  ];
     "media_player.sonos" = ps: with ps; [  ];
     "media_player.soundtouch" = ps: with ps; [ libsoundtouch ];
-    "media_player.spotify" = ps: with ps; [ aiohttp-cors ];
+    "media_player.spotify" = ps: with ps; [ aiohttp-cors spotipy ];
     "media_player.squeezebox" = ps: with ps; [  ];
     "media_player.ue_smart_radio" = ps: with ps; [  ];
     "media_player.universal" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 8415fd17e85a..3b6dccb27bc1 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -106,6 +106,9 @@ build_inputs = {}
 for component in sorted(components.keys()):
     attr_paths = []
     for req in sorted(get_reqs(components, component)):
+        # Some requirements are specified by url, e.g. https://example.org/foobar#xyz==1.0.0
+        # Therefore, if there's a "#" in the line, only take the part after it
+        req = req[req.find('#') + 1:]
         name = req.split('==')[0]
         attr_path = name_to_attr_path(name)
         if attr_path is not None:

From 2e70a75b12eb6a092557852a22ab3cb05cfa4006 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 25 May 2018 14:21:52 -0400
Subject: [PATCH 2514/3370] haskell generic-builder: Limit usage of
 --extra-framework-dirs for compat

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

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8d9b596276c3..1a39fa6b2338 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -212,6 +212,9 @@ let
     if [ -d "$p/lib" ]; then
       configureFlags+=" --extra-lib-dirs=$p/lib"
     fi
+  ''
+  # It is not clear why --extra-framework-dirs does work fine on Linux
+  + optionalString (!buildPlatform.isDarwin || versionAtLeast nativeGhc.version "8.0") ''
     if [[ -d "$p/Library/Frameworks" ]]; then
       configureFlags+=" --extra-framework-dirs=$p/Library/Frameworks"
     fi

From 0fd98c689759866e27019cfc544fbb74483deb4b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 25 May 2018 20:41:17 +0200
Subject: [PATCH 2515/3370] tdesktopPackages.preview: 1.2.21 -> 1.2.22

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 2799f50e584c..0eef45973ff9 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.21";
-    sha256Hash = "0s7dywyz8p626741m32l4a90l1x01564xg2g10gvdb25s2phdfdl";
+    version = "1.2.22";
+    sha256Hash = "0kni4gb6z1c22bhx8z27q4934bg3dngk69xcwykbidm32ijmmsc5";
   });
 }

From 1cd792cf79762e958327c8373ad811bdc2c292c4 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 25 May 2018 21:35:25 +0100
Subject: [PATCH 2516/3370] python2Packages.supervisor: 3.1.4 -> 3.3.4

---
 .../python-modules/supervisor/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 22 +---------------
 2 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/development/python-modules/supervisor/default.nix

diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
new file mode 100644
index 000000000000..5ed7427af87c
--- /dev/null
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, isPy3k, fetchPypi
+, mock
+, meld3
+}:
+buildPythonPackage rec {
+  pname = "supervisor";
+  version = "3.3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
+  };
+
+  buildInputs = [ mock ];
+
+  propagatedBuildInputs = [ meld3 ];
+
+  # Supervisor requires Python 2.4 or later but does not work on any version of Python 3.  You are using version 3.6.5 (default, Mar 28 2018, 10:24:30)
+  disabled = isPy3k;
+
+  meta = {
+    description = "A system for controlling process state under UNIX";
+    homepage = http://supervisord.org/;
+    maintainers = with lib.maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ea969f142b8..80e6bf35039c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13418,27 +13418,7 @@ in {
     };
   };
 
-  supervisor = buildPythonPackage rec {
-    name = "supervisor-3.1.4";
-
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/supervisor/${name}.tar.gz";
-      sha256 = "0kk0sv7780m4dzmrcb2m284krz907jh8jp7khz5a79qryy4m1xw2";
-    };
-
-    buildInputs = with self; [ mock ];
-    propagatedBuildInputs = with self; [ meld3 ];
-
-    # failing tests when building under chroot as root user doesn't exist
-    doCheck = false;
-
-    meta = {
-      description = "A system for controlling process state under UNIX";
-      homepage = http://supervisord.org/;
-    };
-  };
+  supervisor = callPackage ../development/python-modules/supervisor {};
 
   subprocess32 = callPackage ../development/python-modules/subprocess32 { };
 

From 02297beade7813c6a716e53a5f1373f1123d8753 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 23 May 2018 23:37:33 -0500
Subject: [PATCH 2517/3370] treewide: add version to packages

Lots of packages are missing versions in their name. This adds them
where appropriate. These were found with this command:

 $ nix-env -qa -f. | grep -v '\-[0-9A-Za-z.-_+]*$' | grep -v '^hook$'

See issue #41007.
---
 pkgs/applications/altcoins/dapp.nix                        | 2 +-
 pkgs/applications/altcoins/mist.nix                        | 6 +++---
 pkgs/applications/audio/renoise/default.nix                | 2 +-
 pkgs/applications/editors/neovim/wrapper.nix               | 2 +-
 pkgs/applications/editors/okteta/default.nix               | 4 ++--
 pkgs/applications/networking/gmailieer/default.nix         | 2 +-
 pkgs/applications/office/atlassian-cli/default.nix         | 6 +++---
 .../science/machine-learning/torch/torch-distro.nix        | 2 ++
 pkgs/applications/science/misc/simgrid/default.nix         | 7 +++----
 .../git-and-tools/bfg-repo-cleaner/default.nix             | 2 +-
 .../version-management/git-and-tools/gitweb/default.nix    | 2 +-
 pkgs/applications/video/lightworks/default.nix             | 2 +-
 pkgs/data/fonts/meslo-lg/default.nix                       | 2 +-
 pkgs/development/compilers/adobe-flex-sdk/default.nix      | 2 +-
 pkgs/development/compilers/emscripten/fastcomp/default.nix | 2 +-
 pkgs/development/libraries/c-blosc/default.nix             | 2 +-
 pkgs/development/libraries/languagemachines/frog.nix       | 2 +-
 pkgs/development/libraries/languagemachines/frogdata.nix   | 2 +-
 pkgs/development/libraries/languagemachines/libfolia.nix   | 2 +-
 pkgs/development/libraries/languagemachines/mbt.nix        | 2 +-
 pkgs/development/libraries/languagemachines/ticcutils.nix  | 2 +-
 pkgs/development/libraries/languagemachines/timbl.nix      | 2 +-
 .../development/libraries/languagemachines/timblserver.nix | 2 +-
 pkgs/development/libraries/languagemachines/ucto.nix       | 2 +-
 pkgs/development/libraries/languagemachines/uctodata.nix   | 2 +-
 pkgs/development/libraries/libblocksruntime/default.nix    | 2 +-
 pkgs/development/libraries/physics/nlojet/default.nix      | 2 +-
 pkgs/development/libraries/qtinstaller/default.nix         | 2 +-
 pkgs/development/libraries/re2/default.nix                 | 4 ++--
 pkgs/development/tools/build-managers/gn/default.nix       | 4 ++--
 pkgs/development/tools/erlang/cuter/default.nix            | 2 +-
 pkgs/development/tools/imatix_gsl/default.nix              | 2 +-
 pkgs/development/tools/yuicompressor/default.nix           | 6 +++---
 pkgs/misc/cups/drivers/brlaser/default.nix                 | 7 ++++---
 pkgs/misc/cups/drivers/estudio/default.nix                 | 4 ++--
 pkgs/misc/themes/gnome-breeze/default.nix                  | 2 +-
 pkgs/servers/x11/xquartz/default.nix                       | 2 +-
 pkgs/tools/audio/mpdris2/default.nix                       | 5 +++--
 pkgs/tools/misc/buildtorrent/default.nix                   | 6 +++---
 pkgs/tools/misc/notify-desktop/default.nix                 | 2 +-
 pkgs/tools/networking/dnstracer/default.nix                | 4 ++--
 pkgs/tools/networking/zerotierone/default.nix              | 2 +-
 pkgs/tools/text/jumanpp/default.nix                        | 4 ++--
 43 files changed, 65 insertions(+), 62 deletions(-)

diff --git a/pkgs/applications/altcoins/dapp.nix b/pkgs/applications/altcoins/dapp.nix
index 6ad66a24397f..a89725f6e30f 100644
--- a/pkgs/applications/altcoins/dapp.nix
+++ b/pkgs/applications/altcoins/dapp.nix
@@ -2,7 +2,7 @@
 , seth, git, solc, shellcheck, nodejs, hevm }:
 
 stdenv.mkDerivation rec {
-  name = "dapp";
+  name = "dapp-${version}";
   version = "0.5.7";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index c112384f3d84..d80e8b521822 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -25,7 +25,7 @@ let
     categories = "Network;";
   };
 
-  mist = stdenv.mkDerivation {
+  mist = stdenv.lib.appendToName "unwrapped" (stdenv.mkDerivation {
     inherit name version;
 
     src = {
@@ -53,10 +53,10 @@ let
         --set-rpath "${atomEnv.libPath}:$out/lib/mist" \
         $out/lib/mist/mist
     '';
-  };
+  });
 in
 buildFHSUserEnv {
-  name = "mist";
+  name = "mist-${stdenv.lib.getVersion mist}";
 
   targetPkgs = pkgs: with pkgs; [
      mist
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index d02c551be8af..fd2c0993e756 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -9,7 +9,7 @@
 let fileversion = "3_1_0";
 in
 stdenv.mkDerivation rec {
-  name = "renoise";
+  name = "renoise-${lib.replaceStrings ["_"] ["."] fileversion}";
   buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
 
   src =
diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix
index a27b5a41ac70..f1ec03cb42ee 100644
--- a/pkgs/applications/editors/neovim/wrapper.nix
+++ b/pkgs/applications/editors/neovim/wrapper.nix
@@ -51,7 +51,7 @@ let
 
   in
   stdenv.mkDerivation {
-      inherit name;
+      name = "neovim-${stdenv.lib.getVersion neovim}";
       buildCommand = let bin="${neovim}/bin/nvim"; in ''
         if [ ! -x "${bin}" ]
         then
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 770eb63dc69e..9bec148c7f29 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -9,9 +9,9 @@
 let
   version = "17.12.3";
 in mkDerivation rec {
-  name = "okteta";
+  name = "okteta-${version}";
   src = fetchurl {
-    url    = "mirror://kde/stable/applications/${version}/src/${name}-${version}.tar.xz";
+    url    = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz";
     sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
   };
   meta = {
diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix
index c3085519ec4c..9b738fe3863f 100644
--- a/pkgs/applications/networking/gmailieer/default.nix
+++ b/pkgs/applications/networking/gmailieer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  name = "gmailieer";
+  name = "gmailieer-${version}";
   version = "0.6";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index a56c15bffb2a..15e3d120f20b 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchzip, jre }:
-stdenv.mkDerivation {
-  name = "atlassian-cli";
+stdenv.mkDerivation rec {
+  name = "atlassian-cli-${version}";
   version = "7.8.0";
   src = fetchzip {
-    url            = https://bobswift.atlassian.net/wiki/download/attachments/16285777/atlassian-cli-7.8.0-distribution.zip;
+    url            = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
     sha256         = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
     extraPostFetch = "chmod go-w $out";
   };
diff --git a/pkgs/applications/science/machine-learning/torch/torch-distro.nix b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
index d8ce1d2c6280..85a4aa02e441 100644
--- a/pkgs/applications/science/machine-learning/torch/torch-distro.nix
+++ b/pkgs/applications/science/machine-learning/torch/torch-distro.nix
@@ -57,6 +57,8 @@ let
       in
       stdenv.mkDerivation (args // {
 
+        name = "${args.name}-${lua.luaversion}";
+
         inherit preBuild postInstall;
 
         inherit luadeps runtimeDeps;
diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 34ff510e1d8b..2b25d99de2a7 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -19,14 +19,13 @@ in
 stdenv.mkDerivation rec {
   major_version = "3";
   minor_version = "17";
-  version = "v${major_version}.${minor_version}";
-  tagged_version = "${major_version}_${minor_version}";
-  name = "simgrid";
+  version = "${major_version}.${minor_version}";
+  name = "simgrid-${version}";
 
   src = fetchFromGitHub {
     owner = "simgrid";
     repo = "simgrid";
-    rev = "v3_17";
+    rev = "v${major_version}_${minor_version}";
     sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
     #rev = "master";
     #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm";
diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
index 7bf83b5621b5..0d7729684163 100644
--- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
@@ -8,7 +8,7 @@ in
   stdenv.mkDerivation {
     inherit version jarName;
 
-    name = "bfg-repo-cleaner";
+    name = "bfg-repo-cleaner-${version}";
 
     src = fetchurl {
       url = mavenUrl;
diff --git a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
index 0358f850c9ab..ce251e11d328 100644
--- a/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitweb/default.nix
@@ -10,7 +10,7 @@ let
     sha256 = "0wksqma41z36dbv6w6iplkjfdm0ha3njp222fakyh4lismajr71p";
   };
 in stdenv.mkDerivation {
-  name = "gitweb";
+  name = "gitweb-${stdenv.lib.getVersion git}";
 
   src = git.gitweb;
 
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index d0376ca7e3de..4d34e08529f7 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -77,7 +77,7 @@ let
 
 # Lightworks expects some files in /usr/share/lightworks
 in buildFHSUserEnv rec {
-  name = "lightworks";
+  name = "lightworks-${stdenv.lib.getVersion lightworks}";
 
   targetPkgs = pkgs: [
       lightworks
diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix
index d95aea26c8d4..f990575def0f 100644
--- a/pkgs/data/fonts/meslo-lg/default.nix
+++ b/pkgs/data/fonts/meslo-lg/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   version = "1.2.1";
 
-  name = "meslo-lg";
+  name = "meslo-lg-${version}";
 
   meslo-lg = fetchurl {
     url="https://github.com/andreberg/Meslo-Font/blob/master/dist/v${version}/Meslo%20LG%20v${version}.zip?raw=true";
diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
index 63dd315e8e4e..1512ef396558 100644
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ b/pkgs/development/compilers/adobe-flex-sdk/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "adobe-flex-sdk-4.0.0.14159-mpl";
+  name = "adobe-flex-sdk-4.0.0.14159";
 
   src = fetchurl {
     # This is the open source distribution
diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix
index 10c1107da026..57496d288605 100644
--- a/pkgs/development/compilers/emscripten/fastcomp/default.nix
+++ b/pkgs/development/compilers/emscripten/fastcomp/default.nix
@@ -15,7 +15,7 @@ let
       '';
     };
     emscriptenfastcomp = symlinkJoin {
-      name = "emscriptenfastcomp";
+      name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}";
       paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ];
       preferLocalBuild = false;
       allowSubstitutes = true;
diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix
index 5066b0a3250b..2f60fb7391fb 100644
--- a/pkgs/development/libraries/c-blosc/default.nix
+++ b/pkgs/development/libraries/c-blosc/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "c-blosc";
+  name = "c-blosc-${version}";
   version = "1.11.3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix
index 1a73a46d2872..853d23c97458 100644
--- a/pkgs/development/libraries/languagemachines/frog.nix
+++ b/pkgs/development/libraries/languagemachines/frog.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "frog";
+  name = "frog-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "frog-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix
index 42d14d083354..61b4559ebab0 100644
--- a/pkgs/development/libraries/languagemachines/frogdata.nix
+++ b/pkgs/development/libraries/languagemachines/frogdata.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "frogdata";
+  name = "frogdata-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "frogdata-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix
index a6f5adb95595..395591be55be 100644
--- a/pkgs/development/libraries/languagemachines/libfolia.nix
+++ b/pkgs/development/libraries/languagemachines/libfolia.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "libfolia";
+  name = "libfolia-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "libfolia-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix
index 3bc78a96a063..b99cb4f595a4 100644
--- a/pkgs/development/libraries/languagemachines/mbt.nix
+++ b/pkgs/development/libraries/languagemachines/mbt.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "mbt";
+  name = "mbt-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "mbt-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix
index 738e53556ba6..779ec664996a 100644
--- a/pkgs/development/libraries/languagemachines/ticcutils.nix
+++ b/pkgs/development/libraries/languagemachines/ticcutils.nix
@@ -7,7 +7,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ticcutils";
+  name = "ticcutils-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "ticcutils-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix
index 3ab38a9e84ac..c6c216f5abf3 100644
--- a/pkgs/development/libraries/languagemachines/timbl.nix
+++ b/pkgs/development/libraries/languagemachines/timbl.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "timbl";
+  name = "timbl-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "timbl-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix
index ee1579540c33..aeadb0759530 100644
--- a/pkgs/development/libraries/languagemachines/timblserver.nix
+++ b/pkgs/development/libraries/languagemachines/timblserver.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "timblserver";
+  name = "timblserver-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "timblserver-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix
index 8f917c2265d2..ab047d0516eb 100644
--- a/pkgs/development/libraries/languagemachines/ucto.nix
+++ b/pkgs/development/libraries/languagemachines/ucto.nix
@@ -9,7 +9,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ucto";
+  name = "ucto-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "ucto-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix
index 56b6448d2533..7defa71fc0ee 100644
--- a/pkgs/development/libraries/languagemachines/uctodata.nix
+++ b/pkgs/development/libraries/languagemachines/uctodata.nix
@@ -8,7 +8,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "uctodata";
+  name = "uctodata-${release.version}";
   version = release.version;
   src = fetchurl { inherit (release) url sha256;
                    name = "uctodata-${release.version}.tar.gz"; };
diff --git a/pkgs/development/libraries/libblocksruntime/default.nix b/pkgs/development/libraries/libblocksruntime/default.nix
index 34ab70e0adcd..7863e596e1b8 100644
--- a/pkgs/development/libraries/libblocksruntime/default.nix
+++ b/pkgs/development/libraries/libblocksruntime/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, clang }:
 
 stdenv.mkDerivation {
-  name = "blocksruntime";
+  name = "blocksruntime-20140624";
 
   src = fetchFromGitHub {
     owner = "mackyle";
diff --git a/pkgs/development/libraries/physics/nlojet/default.nix b/pkgs/development/libraries/physics/nlojet/default.nix
index 974563c90372..88fafaf3ae6e 100644
--- a/pkgs/development/libraries/physics/nlojet/default.nix
+++ b/pkgs/development/libraries/physics/nlojet/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  name = "nlojet++";
+  name = "nlojet++-${version}";
   version = "4.1.3";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index a03ddb9b78a1..1578593b8aea 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/pkgs/development/libraries/qtinstaller/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
-  name = "qtinstaller";
+  name = "qtinstaller-${version}";
 
   propagatedBuildInputs = [ qtdeclarative qttools ];
   nativeBuildInputs = [ qmake ];
diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix
index 08c95b422776..aeab7b2a040c 100644
--- a/pkgs/development/libraries/re2/default.nix
+++ b/pkgs/development/libraries/re2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "re2";
+  name = "re2-${version}";
   version = "20140304";
 
   src = fetchurl {
-    url = "https://re2.googlecode.com/files/${name}-${version}.tgz";
+    url = "https://re2.googlecode.com/files/${name}.tgz";
     sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb";
   };
 
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index f49456a86ea6..399486c4d902 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -45,8 +45,8 @@ let
     };
   };
 
-in stdenv.mkDerivation {
-  name = "gn";
+in stdenv.mkDerivation rec {
+  name = "gn-${version}";
   version = "20180423";
   sourceRoot = ".";
 
diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix
index fb84bbbf1df3..3dc0d3fca88c 100644
--- a/pkgs/development/tools/erlang/cuter/default.nix
+++ b/pkgs/development/tools/erlang/cuter/default.nix
@@ -2,7 +2,7 @@
 , beamPackages, z3, python27 }:
 
 stdenv.mkDerivation rec {
-  name = "cuter";
+  name = "cuter-${version}";
   version = "0.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix
index 1d7b22ac5ee0..62f33a2d2517 100644
--- a/pkgs/development/tools/imatix_gsl/default.nix
+++ b/pkgs/development/tools/imatix_gsl/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pcre } :
 
 stdenv.mkDerivation rec {
-  name = "imatix_gsl";
+  name = "imatix_gsl-${version}";
   version = "4.1";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
index da9b9df3cd4e..1cf381beb617 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yuicompressor";
+  name = "yuicompressor-${version}";
   version = "2.4.8";
   src = fetchurl {
-    url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}-${version}.jar";
+    url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
   };
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   buildCommand = ''
     mkdir -p $out/{bin,lib}
     ln -s $src $out/lib/yuicompressor.jar
-    makeWrapper ${jre}/bin/java $out/bin/${name} --add-flags \
+    makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \
      "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
   '';
 }
diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix
index 7a6d6c3861df..0f5ee05349de 100644
--- a/pkgs/misc/cups/drivers/brlaser/default.nix
+++ b/pkgs/misc/cups/drivers/brlaser/default.nix
@@ -2,13 +2,14 @@
 
 stdenv.mkDerivation rec {
 
-  name = "brlaser";
+  name = "brlaser-${version}";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "pdewacht";
     repo = "brlaser";
-    rev = "a52149823373e11f918d9e6a56eda7242935c99b";
-    sha256 = "12d8g0aispdj2virf6vrvb0vx6d6ardjg3qyav75shsm1f94ids6";
+    rev = "v${version}";
+    sha256 = "1yy4mpf68c82h245srh2sd1yip29w6kx14gxk4hxkv496gf55lw5";
   };
 
   buildInputs = [ cmake zlib cups ];
diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix
index 6f9e4579a147..a80852bb027d 100644
--- a/pkgs/misc/cups/drivers/estudio/default.nix
+++ b/pkgs/misc/cups/drivers/estudio/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl }:
 
-stdenv.mkDerivation {
-  name = "cups-toshiba-estudio";
+stdenv.mkDerivation rec {
+  name = "cups-toshiba-estudio-${version}";
   version = "7.51";
 
   src = fetchurl {
diff --git a/pkgs/misc/themes/gnome-breeze/default.nix b/pkgs/misc/themes/gnome-breeze/default.nix
index cc1769b48df2..200cc4bae051 100644
--- a/pkgs/misc/themes/gnome-breeze/default.nix
+++ b/pkgs/misc/themes/gnome-breeze/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit }:
 
 stdenv.mkDerivation {
-  name = "gnome-breeze";
+  name = "gnome-breeze-20160526";
   src = fetchgit {
     url = "https://github.com/dirruk1/gnome-breeze";
     sha256 = "0hkk0gqlnrs1m4rb5r84f5y96qfamrbiwm09z89yc32124x1a1lm";
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 585144f74ed4..9c133f9d5d99 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -95,7 +95,7 @@ let
     ];
   };
 in stdenv.mkDerivation {
-  name = "xquartz";
+  name = "xquartz-${stdenv.lib.getVersion xorg.xorgserver}";
 
   buildInputs = [ ruby makeWrapper ];
 
diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix
index 6596f1c34ff5..93e7afdce417 100644
--- a/pkgs/tools/audio/mpdris2/default.nix
+++ b/pkgs/tools/audio/mpdris2/default.nix
@@ -3,11 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpDris2";
+  pname = "mpDris2";
+  name = "${pname}-${version}";
   version = "0.7";
 
   src = fetchurl {
-    url = "https://github.com/eonpatapon/${name}/archive/${version}.tar.gz";
+    url = "https://github.com/eonpatapon/${pname}/archive/${version}.tar.gz";
     sha256 = "095swrjw59lh8qiwmjjjdbxl9587axilkj4mh2sx5m0kiq929z21";
   };
 
diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix
index 064c836f843e..793e5c56e1f1 100644
--- a/pkgs/tools/misc/buildtorrent/default.nix
+++ b/pkgs/tools/misc/buildtorrent/default.nix
@@ -3,10 +3,10 @@
 let version = "0.8"; in
 
 stdenv.mkDerivation rec {
-	name = "buildtorrent";
+	name = "buildtorrent-${version}";
 
 	src = fetchurl {
-		url = "http://mathr.co.uk/blog/code/${name}-${version}.tar.gz";
+		url = "http://mathr.co.uk/blog/code/${name}.tar.gz";
 		sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
 	};
 
@@ -16,4 +16,4 @@ stdenv.mkDerivation rec {
 		license = stdenv.lib.licenses.gpl3Plus;
 		platforms = stdenv.lib.platforms.all;
 	};
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/misc/notify-desktop/default.nix b/pkgs/tools/misc/notify-desktop/default.nix
index 661f4f4f435e..93c0f5e346bf 100644
--- a/pkgs/tools/misc/notify-desktop/default.nix
+++ b/pkgs/tools/misc/notify-desktop/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, dbus, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "notify-desktop";
+  name = "notify-desktop-${version}";
   version = "0.2.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix
index 6d5e826c7d75..65e5c9cd126b 100644
--- a/pkgs/tools/networking/dnstracer/default.nix
+++ b/pkgs/tools/networking/dnstracer/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "1.9";
-  name = "dnstracer";
+  name = "dnstracer-${version}";
 
   src = fetchurl {
-    url = "http://www.mavetju.org/download/dnstracer-${version}.tar.gz";
+    url = "http://www.mavetju.org/download/${name}.tar.gz";
     sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f";
   };
 
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index ec6c9c196788..43aa44809ed8 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.2.8";
-  name = "zerotierone";
+  name = "zerotierone-${version}";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix
index c4cb12cb6938..c4af67b3b481 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/pkgs/tools/text/jumanpp/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, cmake, protobuf }:
 stdenv.mkDerivation rec {
-  name = "jumanpp";
+  name = "jumanpp-${version}";
   version = "2.0.0-rc2";
 
   src = fetchurl {
-    url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}-${version}.tar.xz";
+    url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}.tar.xz";
     sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp";
   };
   buildInputs = [ cmake protobuf ];

From 02de1dc70722f5bbd969d1df12cf48703f4d307f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 23 May 2018 23:38:35 -0500
Subject: [PATCH 2518/3370] unix-tools: add version

Uses the POSIX standard 1003.1-2008 as version number. It can be
accessed for free at http://pubs.opengroup.org/onlinepubs/9699919799/.
---
 pkgs/top-level/unix-tools.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index 36fba3fbd479..f49e89d30914 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -11,9 +11,11 @@
 # input, not "procps" which requires Linux.
 
 let
+  version = "1003.1-2008";
+
   singleBinary = cmd: providers: let
       provider = "${lib.getBin providers.${hostPlatform.parsed.kernel.name}}/bin/${cmd}";
-    in runCommand cmd {
+    in runCommand "${cmd}-${version}" {
       meta.platforms = map (n: { kernel.name = n; }) (pkgs.lib.attrNames providers);
     } ''
       mkdir -p $out/bin
@@ -28,7 +30,7 @@ let
 
   # more is unavailable in darwin
   # just use less
-  more_compat = runCommand "more" {} ''
+  more_compat = runCommand "more-${version}" {} ''
     mkdir -p $out/bin
     ln -s ${pkgs.less}/bin/less $out/bin/more
   '';
@@ -131,7 +133,7 @@ let
   };
 
   makeCompat = name': value: buildEnv {
-    name = name' + "-compat";
+    name = name' + "-compat-${version}";
     paths = value;
   };
 

From 04e5cf666511d6d84d20814557a04f2392fa4a83 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 24 May 2018 10:38:06 +0300
Subject: [PATCH 2519/3370] renoise: add platforms, derive src version from
 proper version string

---
 pkgs/applications/audio/renoise/default.nix | 24 +++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index fd2c0993e756..7cd695eb11da 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -6,31 +6,35 @@
 # 2) Override the releasePath attribute to point to the location of the newly downloaded bundle.
 # Note: Renoise creates an individual build for each license which screws somewhat with the
 # use of functions like requireFile as the hash will be different for every user.
-let fileversion = "3_1_0";
+let
+  srcVersion = version: lib.replaceStrings ["."] ["_"] version;
 in
+
 stdenv.mkDerivation rec {
-  name = "renoise-${lib.replaceStrings ["_"] ["."] fileversion}";
-  buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
+  name = "renoise-${version}";
+  version = "3.1.0";
 
   src =
     if stdenv.system == "x86_64-linux" then
         if builtins.isNull releasePath then
         fetchurl {
-            url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86_64.tar.bz2";
-            sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
+           url = "http://files.renoise.com/demo/Renoise_${srcVersion version}_Demo_x86_64.tar.bz2";
+           sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
         }
         else
         releasePath
     else if stdenv.system == "i686-linux" then
         if builtins.isNull releasePath then
         fetchurl {
-            url = "http://files.renoise.com/demo/Renoise_${fileversion}_Demo_x86.tar.bz2";
-            sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
+          url = "http://files.renoise.com/demo/Renoise_${srcVersion version}_Demo_x86.tar.bz2";
+          sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
         }
         else
         releasePath
     else throw "Platform is not supported by Renoise";
 
+  buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
+
   installPhase = ''
     cp -r Resources $out
 
@@ -52,9 +56,11 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Modern tracker-based DAW";
     homepage = http://www.renoise.com/;
-    license = stdenv.lib.licenses.unfree;
+    license = licenses.unfree;
+    maintainers = [];
+    platforms = [ "i686-linux" "x86_64-linux" ];
   };
 }

From 5da73fc3ffff3ae8519a9af906fbc84ef926bb35 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 24 May 2018 10:47:38 +0300
Subject: [PATCH 2520/3370] okteta: add version attr, clean up

---
 pkgs/applications/editors/okteta/default.nix | 41 ++++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 9bec148c7f29..abbffeb91807 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -1,27 +1,34 @@
-{
-  mkDerivation, lib, fetchurl,
-  extra-cmake-modules, kdoctools,
-  qtscript, kconfig, kinit, karchive, kcrash,
-  kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5,
-  shared-mime-info
-}:
+{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig
+, kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts
+, qca-qt5, shared-mime-info }:
 
-let
-  version = "17.12.3";
-in mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "okteta-${version}";
+  version = "17.12.3";
+
   src = fetchurl {
-    url    = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/applications/${version}/src/${name}.tar.xz";
     sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
   };
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ peterhoeg bkchr ];
-  };
+  
   nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];
   buildInputs = [ shared-mime-info ];
+  
   propagatedBuildInputs = [
-    kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
-    karchive kcrash
+    kconfig
+    kinit
+    kcmutils
+    kconfigwidgets
+    knewstuff
+    kparts
+    qca-qt5
+    karchive
+    kcrash
   ];
+  
+  meta = with stdenv.lib; {
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg bkchr ];
+    platforms = platforms.linux;
+  };
 }

From 543c8c4eb08f35b70a3c787b69832f0a2535d3f9 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 24 May 2018 10:52:10 +0300
Subject: [PATCH 2521/3370] atlassian-cli: add some spaces, inherit
 meta.platforms from jre

---
 .../office/atlassian-cli/default.nix          | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix
index 15e3d120f20b..be31f5fd102f 100644
--- a/pkgs/applications/office/atlassian-cli/default.nix
+++ b/pkgs/applications/office/atlassian-cli/default.nix
@@ -1,14 +1,30 @@
 { stdenv, fetchzip, jre }:
+
 stdenv.mkDerivation rec {
   name = "atlassian-cli-${version}";
   version = "7.8.0";
+  
   src = fetchzip {
-    url            = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
-    sha256         = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
+    url  = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${name}-distribution.zip";
+    sha256  = "111s4d9m6vxq8jwh1d6ar1f4n5zmyjg7gi2vl3aq63kxbfld9vw7";
     extraPostFetch = "chmod go-w $out";
   };
-  tools = [ "agile" "bamboo" "bitbucket" "confluence" "csv"
-    "hipchat" "jira" "servicedesk" "structure" "tempo" "trello" "upm" ];
+  
+  tools = [
+    "agile"
+    "bamboo"
+    "bitbucket"
+    "confluence"
+    "csv"
+    "hipchat"
+    "jira"
+    "servicedesk"
+    "structure"
+    "tempo"
+    "trello"
+    "upm"
+  ];
+  
   installPhase = ''
     mkdir -p $out/{bin,share/doc/atlassian-cli}
     cp -r lib $out/share/java
@@ -22,10 +38,12 @@ stdenv.mkDerivation rec {
       chmod +x $out/bin/$tool
     done
   '';
+  
   meta = with stdenv.lib; {
     description = "An integrated family of CLI’s for various Atlassian applications";
-    homepage    = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview;
-    maintainers = [ maintainers.twey ];
-    license     = [ licenses.unfreeRedistributable ];
+    homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview;
+    license = licenses.unfreeRedistributable;
+    maintainers = with maintainers; [ twey ];
+    inherit (jre.meta) platforms;
   };
 }

From 4e049b2fd477015778817e809c0bf5544f8a1c77 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 24 May 2018 11:02:12 +0300
Subject: [PATCH 2522/3370] simgrid: cleanup

---
 .../science/misc/simgrid/default.nix          | 111 +++++++++---------
 1 file changed, 53 insertions(+), 58 deletions(-)

diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 2b25d99de2a7..522c708bf902 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -10,41 +10,37 @@
 , moreTests ? false
 }:
 
-# helpers for options
-let optionals       = stdenv.lib.optionals;
-    optionalString = stdenv.lib.optionalString;
-    optionOnOff = option: "${if option then "on" else "off"}";
+with stdenv.lib;
+
+let
+  optionOnOff = option: "${if option then "on" else "off"}";
+  urlVersion = replaceStrings ["."] ["_"];
 in
 
 stdenv.mkDerivation rec {
-  major_version = "3";
-  minor_version = "17";
-  version = "${major_version}.${minor_version}";
   name = "simgrid-${version}";
+  version = "3.17";
 
   src = fetchFromGitHub {
     owner = "simgrid";
     repo = "simgrid";
-    rev = "v${major_version}_${minor_version}";
+    rev = "v${urlVersion version}";
     sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
-    #rev = "master";
-    #sha256 = "0qvh1jzc2lpnp8234kjx1x4g1a5kfdn6kb15vhk160qgvj98nyqm";
   };
 
-  nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind]
-      ++ optionals fortranSupport [gfortran]
-      ++ optionals buildJavaBindings [openjdk]
-      ++ optionals buildDocumentation [transfig ghostscript doxygen]
-      ++ optionals modelCheckingSupport [libunwind libevent];
+  nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ]
+      ++ optionals fortranSupport [ gfortran ]
+      ++ optionals buildJavaBindings [ openjdk ]
+      ++ optionals buildDocumentation [ transfig ghostscript doxygen ]
+      ++ optionals modelCheckingSupport [ libunwind libevent ];
 
   #buildInputs = optional luaSupport lua5;
 
-  preConfigure =
-    # Make it so that libsimgrid.so will be found when running programs from
-    # the build dir.
-    ''
+  # Make it so that libsimgrid.so will be found when running programs from
+  # the build dir.
+  preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/build/lib"
-    '';
+  '';
 
   # Release mode is not supported in SimGrid
   cmakeBuildType = "Debug";
@@ -59,58 +55,57 @@ stdenv.mkDerivation rec {
   # For more information see:
   # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list
   cmakeFlags= ''
-       -Denable_documentation=${optionOnOff buildDocumentation}
-       -Denable_java=${optionOnOff buildJavaBindings}
-       -Denable_fortran=${optionOnOff fortranSupport}
-       -Denable_model-checking=${optionOnOff modelCheckingSupport}
-       -Denable_ns3=off
-       -Denable_lua=off
-       -Denable_lib_in_jar=off
-       -Denable_maintainer_mode=off
-       -Denable_mallocators=on
-       -Denable_debug=on
-       -Denable_smpi=on
-       -Denable_smpi_ISP_testsuite=${optionOnOff moreTests}
-       -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}
-       -Denable_compile_warnings=${optionOnOff debug}
-       -Denable_compile_optimizations=${optionOnOff (!debug)}
-       -Denable_lto=${optionOnOff (!debug)}
-       '';
-       #-Denable_lua=${optionOnOff luaSupport}
-       #-Denable_smpi_papi=${optionOnOff moreTests}
+    -Denable_documentation=${optionOnOff buildDocumentation}
+    -Denable_java=${optionOnOff buildJavaBindings}
+    -Denable_fortran=${optionOnOff fortranSupport}
+    -Denable_model-checking=${optionOnOff modelCheckingSupport}
+    -Denable_ns3=off
+    -Denable_lua=off
+    -Denable_lib_in_jar=off
+    -Denable_maintainer_mode=off
+    -Denable_mallocators=on
+    -Denable_debug=on
+    -Denable_smpi=on
+    -Denable_smpi_ISP_testsuite=${optionOnOff moreTests}
+    -Denable_smpi_MPICH3_testsuite=${optionOnOff moreTests}
+    -Denable_compile_warnings=${optionOnOff debug}
+    -Denable_compile_optimizations=${optionOnOff (!debug)}
+    -Denable_lto=${optionOnOff (!debug)}
+  '';
+  # -Denable_lua=${optionOnOff luaSupport}
+  # -Denable_smpi_papi=${optionOnOff moreTests}
 
   makeFlags = optionalString debug "VERBOSE=1";
 
-  preBuild =
-    ''
-       # Some perl scripts are called to generate test during build which
-       # is before the fixupPhase of nix, so do this manualy here:
-       patchShebangs ..
-    '';
+  # Some Perl scripts are called to generate test during build which
+  # is before the fixupPhase, so do this manualy here:
+  preBuild = ''
+    patchShebangs ..
+  '';
 
   doCheck = true;
+  
   checkPhase = ''
     runHook preCheck
-
     ctest --output-on-failure -E smpi-replay-multiple
-
     runHook postCheck
-    '';
+  '';
+    
   enableParallelBuilding = true;
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Framework for the simulation of distributed applications";
-    longDescription =
-      '' SimGrid is a toolkit that provides core functionalities for the
-         simulation of distributed applications in heterogeneous distributed
-         environments.  The specific goal of the project is to facilitate
-         research in the area of distributed and parallel application
-         scheduling on distributed computing platforms ranging from simple
-         network of workstations to Computational Grids.
-      '';
+    longDescription = ''
+      SimGrid is a toolkit that provides core functionalities for the
+      simulation of distributed applications in heterogeneous distributed
+      environments.  The specific goal of the project is to facilitate
+      research in the area of distributed and parallel application
+      scheduling on distributed computing platforms ranging from simple
+      network of workstations to Computational Grids.
+    '';
     homepage = http://simgrid.gforge.inria.fr/;
+    license = licenses.lgpl2Plus;
     maintainers = with maintainers; [ mickours ];
     platforms = platforms.x86_64;
-    license = licenses.lgpl2Plus;
   };
 }

From f2daf23137d1def839882691b7daf6738cfa9e58 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 24 May 2018 11:04:17 +0300
Subject: [PATCH 2523/3370] renoise: srcVersion -> urlVersion

---
 pkgs/applications/audio/renoise/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 7cd695eb11da..5ec7375056ec 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }:
+{ stdenv, fetchurl, libX11, libXext, libXcursor, libXrandr, libjack2, alsaLib, releasePath ? null }:
+
+with stdenv.lib;
 
 # To use the full release version:
 # 1) Sign into https://backstage.renoise.com and download the appropriate (x86 or x86_64) version
@@ -7,7 +9,7 @@
 # Note: Renoise creates an individual build for each license which screws somewhat with the
 # use of functions like requireFile as the hash will be different for every user.
 let
-  srcVersion = version: lib.replaceStrings ["."] ["_"] version;
+  urlVersion = replaceStrings [ "." ] [ "_" ];
 in
 
 stdenv.mkDerivation rec {
@@ -18,15 +20,15 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
         if builtins.isNull releasePath then
         fetchurl {
-           url = "http://files.renoise.com/demo/Renoise_${srcVersion version}_Demo_x86_64.tar.bz2";
-           sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
+          url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86_64.tar.bz2";
+          sha256 = "0pan68fr22xbj7a930y29527vpry3f07q3i9ya4fp6g7aawffsga";
         }
         else
         releasePath
     else if stdenv.system == "i686-linux" then
         if builtins.isNull releasePath then
         fetchurl {
-          url = "http://files.renoise.com/demo/Renoise_${srcVersion version}_Demo_x86.tar.bz2";
+          url = "http://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_x86.tar.bz2";
           sha256 = "1lccjj4k8hpqqxxham5v01v2rdwmx3c5kgy1p9lqvzqma88k4769";
         }
         else
@@ -56,7 +58,7 @@ stdenv.mkDerivation rec {
     patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $out/lib $out/renoise
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     description = "Modern tracker-based DAW";
     homepage = http://www.renoise.com/;
     license = licenses.unfree;

From d886a1e630d7e14c971b758a4b0472802aea5441 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Thu, 24 May 2018 11:10:06 +0300
Subject: [PATCH 2524/3370] yuicompressor: normalize

---
 .../tools/yuicompressor/default.nix           | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix
index 1cf381beb617..44edf443c110 100644
--- a/pkgs/development/tools/yuicompressor/default.nix
+++ b/pkgs/development/tools/yuicompressor/default.nix
@@ -3,20 +3,14 @@
 stdenv.mkDerivation rec {
   name = "yuicompressor-${version}";
   version = "2.4.8";
+  
   src = fetchurl {
     url = "http://github.com/yui/yuicompressor/releases/download/v${version}/${name}.jar";
     sha256 = "1qjxlak9hbl9zd3dl5ks0w4zx5z64wjsbk7ic73r1r45fasisdrh";
   };
 
-  buildInputs = [makeWrapper jre];
-
-  meta = {
-    description = "A JavaScript and CSS minifier";
-    maintainers = [ stdenv.lib.maintainers.jwiegley ];
-    platforms = stdenv.lib.platforms.all;
-    homepage = http://yui.github.io/yuicompressor/;
-    license = stdenv.lib.licenses.bsd3;
-  };
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ jre ];
 
   buildCommand = ''
     mkdir -p $out/{bin,lib}
@@ -24,4 +18,12 @@ stdenv.mkDerivation rec {
     makeWrapper ${jre}/bin/java $out/bin/yuicompressor --add-flags \
      "-cp $out/lib/yuicompressor.jar com.yahoo.platform.yui.compressor.YUICompressor"
   '';
+  
+  meta = with stdenv.lib; {
+    description = "A JavaScript and CSS minifier";
+    homepage = http://yui.github.io/yuicompressor/;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jwiegley ];
+    platforms = platforms.all;
+  };
 }

From 73b11060fc0725fbafac8a8393bc0098f284ef33 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 25 May 2018 04:21:07 -0500
Subject: [PATCH 2525/3370] treewide: add more versions to package names

---
 pkgs/data/fonts/liberationsansnarrow/default.nix        | 2 +-
 pkgs/data/fonts/mph-2b-damase/default.nix               | 2 +-
 pkgs/games/quake2/yquake2/wrapper.nix                   | 2 +-
 pkgs/os-specific/linux/systemd/cryptsetup-generator.nix | 2 +-
 pkgs/tools/security/nitrokey-app/default.nix            | 2 +-
 pkgs/tools/security/nitrokey-app/udev-rules.nix         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/fonts/liberationsansnarrow/default.nix b/pkgs/data/fonts/liberationsansnarrow/default.nix
index 6a5e81cd3c75..0027d44d9db5 100644
--- a/pkgs/data/fonts/liberationsansnarrow/default.nix
+++ b/pkgs/data/fonts/liberationsansnarrow/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   pname = "liberationsansnarrow";
   version = "1.07.3";
-  name = "${pname}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-${version}.tar.gz";
diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix
index 5729561c5809..692ad63574f4 100644
--- a/pkgs/data/fonts/mph-2b-damase/default.nix
+++ b/pkgs/data/fonts/mph-2b-damase/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchzip}:
 
 fetchzip {
-  name = "MPH-2B-Damase";
+  name = "MPH-2B-Damase-2";
 
   url = http://www.wazu.jp/downloads/damase_v.2.zip;
 
diff --git a/pkgs/games/quake2/yquake2/wrapper.nix b/pkgs/games/quake2/yquake2/wrapper.nix
index 8cd1044456ac..9ab086f96a21 100644
--- a/pkgs/games/quake2/yquake2/wrapper.nix
+++ b/pkgs/games/quake2/yquake2/wrapper.nix
@@ -12,7 +12,7 @@ let
   };
 
 in stdenv.mkDerivation {
-  inherit name;
+  name = "${name}-${stdenv.lib.getVersion yquake2}";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
index c89a8ff91479..720e3fbbc9fb 100644
--- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
+++ b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix
@@ -2,7 +2,7 @@
 
 stdenv.lib.overrideDerivation systemd (p: {
   version = p.version;
-  name = "systemd-cryptsetup-generator";
+  name = "systemd-cryptsetup-generator-${p.version}";
 
   nativeBuildInputs = p.nativeBuildInputs ++ [ cryptsetup ];
   outputs = [ "out" ];
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 1aced2cd427d..1396e9b94c9a 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -1,7 +1,7 @@
 { stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }:
 
 stdenv.mkDerivation rec {
-  name = "nitrokey-app";
+  name = "nitrokey-app-${version}";
   version = "1.2";
 
   # We use fetchgit instead of fetchFromGitHub because of necessary git submodules
diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix
index 99947a0eefef..33d2dd1c8fa7 100644
--- a/pkgs/tools/security/nitrokey-app/udev-rules.nix
+++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix
@@ -3,7 +3,7 @@
 }:
 
 stdenv.mkDerivation {
-  name = "nitrokey-udev-rules";
+  name = "nitrokey-udev-rules-${stdenv.lib.getVersion nitrokey-app}";
 
   inherit (nitrokey-app) src;
 

From a0f4d19925705945b2beb393239f1a9f72b5035d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 25 May 2018 04:21:47 -0500
Subject: [PATCH 2526/3370] treewide: use appendToName where appropriate

Using appendToName preserves the version at the end of the name.
---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++---
 pkgs/development/idris-modules/with-packages.nix           | 6 +++---
 pkgs/misc/lilypond/with-fonts.nix                          | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 5879c0e83974..ad8bae014542 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -60,8 +60,8 @@ let
           # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform.
           if actualPlugins == []
             then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; })
-            else stdenv.mkDerivation {
-              name = "${terraform.name}-with-plugins";
+            else lib.appendToName "with-plugins "(stdenv.mkDerivation {
+              inherit (terraform) name;
               buildInputs = [ makeWrapper ];
 
               buildCommand = ''
@@ -72,7 +72,7 @@ let
               '';
 
               inherit passthru;
-            };
+            });
     in withPlugins (_: []);
 
   plugins = import ./providers { inherit stdenv lib buildGoPackage fetchFromGitHub; };
diff --git a/pkgs/development/idris-modules/with-packages.nix b/pkgs/development/idris-modules/with-packages.nix
index 1631555eee4a..8b390d4bf5be 100644
--- a/pkgs/development/idris-modules/with-packages.nix
+++ b/pkgs/development/idris-modules/with-packages.nix
@@ -4,9 +4,9 @@
 
 let paths = stdenv.lib.closePropagation packages;
 in
-symlinkJoin {
+stdenv.lib.appendToName "with-packages" (symlinkJoin {
 
-  name = idris.name + "-with-packages";
+  inherit (idris) name;
 
   paths = paths ++ [idris] ;
 
@@ -17,4 +17,4 @@ symlinkJoin {
       --set IDRIS_LIBRARY_PATH $out/libs
       '';
 
-}
+})
diff --git a/pkgs/misc/lilypond/with-fonts.nix b/pkgs/misc/lilypond/with-fonts.nix
index 2218b75a2e0f..5bc74cb65ddf 100644
--- a/pkgs/misc/lilypond/with-fonts.nix
+++ b/pkgs/misc/lilypond/with-fonts.nix
@@ -5,8 +5,8 @@
 , fonts ? openlilylib-fonts.all
 }:
 
-stdenv.mkDerivation {
-  name = "${lilypond.name}-with-fonts";
+stdenv.lib.appendToName "with-fonts" (stdenv.mkDerivation {
+  inherit (lilypond) name;
   phases = "installPhase";
   buildInputs = fonts;
   nativeBuildInputs = [ lndir ];
@@ -32,4 +32,4 @@ stdenv.mkDerivation {
         substituteInPlace $p --replace "exec -a \"${lilypond}" "exec -a \"$out"
       done
   '';
-}
+})

From ee8fa757f36b80a34fa97f8ee686f92abe742cf1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 25 May 2018 04:22:19 -0500
Subject: [PATCH 2527/3370] gimp: cleanup plugin name

All gimp plugins are now prefixed with "gimp-plugin-" to make them
more clear.
---
 pkgs/applications/graphics/gimp/plugins/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 5b21b349764b..0c753498af34 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -22,9 +22,8 @@ let
     '';
   }
   // a
-    # don't call this gimp-* unless you want nix replace gimp by a plugin :-)
   // {
-      name = "${a.name}-${gimp.name}-plugin";
+      name = "gimp-plugin-${a.name}";
       buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []);
       nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []);
     }

From e264c341242583afc18236cae1f050a7a8e152eb Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 25 May 2018 22:34:12 +0100
Subject: [PATCH 2528/3370] squashme: fixes

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

diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index 5ed7427af87c..2d2a03d37aea 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
   };
 
-  buildInputs = [ mock ];
+  checkInputs = [ mock ];
 
   propagatedBuildInputs = [ meld3 ];
 
@@ -21,6 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "A system for controlling process state under UNIX";
     homepage = http://supervisord.org/;
+    license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt
     maintainers = with lib.maintainers; [ zimbatm ];
   };
 }

From d3b0cb379f741b66860e9067a51099a6c7cae99a Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Tue, 15 May 2018 00:00:00 +0000
Subject: [PATCH 2529/3370] tor-browser: 52.7.3esr-7.5-1 -> 52.8.0esr-7.5-1,
 52.7.0esr-8.0-1 -> 52.8.0esr-8.0-1

---
 .../networking/browsers/firefox/packages.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 07495e7d4707..1e533f093f62 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -129,16 +129,16 @@ in rec {
 
   tor-browser-7-5 = common (rec {
     pname = "tor-browser";
-    version = "7.5.2";
+    version = "7.5.4";
     isTorBrowserLike = true;
 
     # FIXME: fetchFromGitHub is not ideal, unpacked source is >900Mb
     src = fetchFromGitHub {
       owner = "SLNOS";
       repo  = "tor-browser";
-      # branch "tor-browser-52.7.3esr-7.5-1-slnos";
-      rev   = "62e77aa47d90c10cfc9c6f3b7358a6bdc3167182";
-      sha256 = "09pyqicv6z0h4lmjdybx56gj3l28gkl0bbpk0pnmlzcyr9vng7zj";
+      # branch "tor-browser-52.8.0esr-7.5-1-slnos"
+      rev   = "dbaabe129d2982bee00a753146fbe610fec0ca50";
+      sha256 = "0j60vz18bwabqbzv0r1id3vcyh3832mzx6cg5r7x5c03s5hn40a4";
     };
 
     patches = nixpkgsPatches;
@@ -153,9 +153,9 @@ in rec {
     src = fetchFromGitHub {
       owner = "SLNOS";
       repo  = "tor-browser";
-      # branch "tor-browser-52.7.0esr-8.0-1-slnos";
-      rev   = "58314ccb043882e830ee9a21c37a92d6e0d34e94";
-      sha256 = "09gb7chw2kly53b599xwpi75azj00957rnxly9fqv8zi3n5k2pdb";
+      # branch "tor-browser-52.8.0esr-8.0-1-slnos";
+      rev   = "5d7e9e1cacbf70840f8f1a9aafe99f354f9ad0ca";
+      sha256 = "0cwxwwc4m7331bbp3id694ffwxar0j5kfpgpn9l1z36rmgv92n21";
     };
 
     patches = nixpkgsPatches;

From db215a62b7a071ca54e42a497959a13d3ddee912 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 25 May 2018 15:22:47 -0500
Subject: [PATCH 2530/3370] qtwebengine: fix build failure due to
 -Wformat-security

ninja builds some components with -Wno-format, which is not compatible with the
default hardening setting of -Wformat-security in Nixpkgs.
---
 pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
index e798d529ce1b..dc5f2ae96b3e 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix
@@ -31,6 +31,10 @@ qtModule {
 
   enableParallelBuilding = true;
 
+  # ninja builds some components with -Wno-format,
+  # which cannot be set at the same time as -Wformat-security
+  hardeningDisable = [ "format" ];
+
   postPatch =
     # Patch Chromium build tools
     ''

From 30c3487e0451defff5b438b425b16e33d46d98e3 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sat, 26 May 2018 11:11:48 +0800
Subject: [PATCH 2531/3370] ids: assing openvpn

---
 nixos/modules/misc/ids.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index bb97c707bf65..a34e9c50c4c5 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -315,6 +315,7 @@
       duplicati = 289;
       monetdb = 290;
       restic = 291;
+      openvpn = 292;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -590,6 +591,7 @@
       duplicati = 289;
       monetdb = 290;
       restic = 291;
+      openvpn = 292;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal

From e0997ff781e81cec1d26e08df657ad3e64c34df9 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 26 May 2018 13:04:52 +0800
Subject: [PATCH 2532/3370] firefox-devedition-bin: 61.0b6 -> 61.0b8

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 968b65e72476..1fc1e618931f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b6";
+  version = "61.0b8";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ach/firefox-61.0b8.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "704a4bb25d1cc2386a63c4883fd43c7a1720387f85f73b9cd4ad32cb41238d4289685ed6d62777b5748f7e18960dca73d7d204d73a335c542ad6363fc2b0f6a6";
+      sha512 = "98e72aedd104c408be5f040459959ee5f1c6a7f0716db2f5e8b3f19db0a56d541f7f1cfdd9528a863bd6431461ee66fb6bc37837a805bddfe7733aa9b03267a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/af/firefox-61.0b8.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "e295c3792c8e179e67e75b0999caffefa4b1abf93f87ef2005299f31188eaf48d75cf2775f39af547ee06b0bb3cc6b472a5bc3dc33e1d2e1b683ac26edaf5a25";
+      sha512 = "9d96f72a7bf9be3984999f59a0ab2c5eb0a569553c9075cd6c9e594e0d160f2a53a570a723f230cf8ea270c4c22cb3de040a09002acdeb3f3f8b7596c7cf181b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/an/firefox-61.0b8.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "0d358267b73441f5ade02d4e336a08ff5196e353c5c2b4ef0833455d768f3210f7f05a98ba57e279a8fd40cf11183a1f9ab92453ae624aac42242b9cd27c261d";
+      sha512 = "45d46621e837ae4f1540d26d9ea048717ddb5aef75bef7f1130bd846d3482c09dfc723df81e0666e25aa09d2c50684f8b95252c3097d5b87615e5acfe1020627";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ar/firefox-61.0b8.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "c442173d1a591293dc9716b948b0183bcb935c7a3abc61d4a1f8da2a114e4c9d5e8bf26ed5559e5bab70fc62f5c12d36fd2ee973c0556641788c339c836219e8";
+      sha512 = "9b82ec22834d6460861bad085e5c7f1eb30e35c4deff367ac33e6ff69b4aaae4a0cb63e24b686888003c02b126d103c0055eca853ea0512a3d63a3ce84d65ce5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/as/firefox-61.0b8.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "6f1628a9195ab30a6a87275c70a3390d29808242c3916682a9b83fb932687a311a434b67c8c333e1285fed1337ea0c7bdccb047e39cc4c1ae454572ba32ecbf6";
+      sha512 = "25fd9af7699cc51e514e68524ed7f3b60f7a4506d88120b9458cbf7727a7d7a8249f57209e8f95c7a3cdba3f27d5e3a5ad7f363d89e7fbeadfccfcba150cf696";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ast/firefox-61.0b8.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "41c0e5a30ba84746963e2e48c7092cc389617fdef861408d081c6fe75200d14674d7e7ecf1312158f723cb8b860b9e39c9b3fad802eb9692ec00cd8aa818b2f5";
+      sha512 = "0574a2caa146049b52c21fe632bf47e8880524624af063266c219be25845af6e24f0e315635d00a90dd663199bde25f9250e97f4481845e02ad87b957f4a7506";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/az/firefox-61.0b8.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "2c282319205e9a8d5ad7b74480732680f2addef20840d39bb368be0d47a839fda1d039ad4e7cbdb940b26b1fe2ccb19dbcf9d17527802c8c9e41fcf82dd67943";
+      sha512 = "49a86939dee753453cffebb909edf0c592089c24a0d9fdeab6271a306ca8b235e4965b687027e68617b745a7ec4bd055775789af9490225c372831641e164001";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/be/firefox-61.0b8.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "e1c573e1cffd888b2005d667c8423a8cb67ed487bb445b0333e9af9dabd2d8bcbc492d642fd893285464ebf83be6bee2fd4b9260a4cc1e826847d545bef2471a";
+      sha512 = "32bbdd608037f5134683231bb1157c64099b79c36170381db7ef5e4e23aeaa52d6331d7be31eec6b8518b370a7000e16616545650326b3968de8802c4f011c41";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bg/firefox-61.0b8.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "08a3453611833ce773b4cd3a31aec2ec7120eec1e1a87459f165863fcf7ac709e3c0a69a0cb76997650a67a04cae09b2fe7ab2820a338ba040944f81c9417554";
+      sha512 = "c7ad8b857a67c2306e26009023cf4d9b55c5f7c3e42ece2703540d90f97b192d611f40b0fec8b9181472f749d70f20df550dc1c83c954c4286f3c0b3b738208b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bn-BD/firefox-61.0b8.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "3ee61d526e2c76028f808797df0a2fd4e42d856b76e36538abddbbcb7c41949d2146d5c7dba2f5802d143c209ae943ca8d87123ce7bfe7490dd17058c1c32488";
+      sha512 = "b9ed13ad1161cdfeff5f19ec022ba1ccf24f3720680f7c6c67cf46d997787f9e8f7c1aeb78b7a4871ffafdb68a198f1d049e1cbd855c02cfc11c5a130a32066d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bn-IN/firefox-61.0b8.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "f5178ef8bd83658f2b097fb0d9b5623ebeae4d715156e355879f70ed13b91e8d20f9ce2bd4fab56455c9e45d18c0f6081b798ce3e31b9a473c40da1366538720";
+      sha512 = "66bcea77afca3b39b5bf66fc8861b25d6556142642d8452fa29bfe6a7519f4d0e1f102ff4b8a251e0ff719eda1bb98c06c591e38248d024c88f5ea9dc7c49856";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/br/firefox-61.0b8.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "89c2f4a5b8b18fe7d49333f6367696cf7e937b3e62726753d9339e498d9929969f5c0268fff21738ee20326c89e691c40e95b6d20c4c7b1acfc535d58e681b14";
+      sha512 = "b6517c8845a70a275a854a48df1aa5f4d21912b2e2ca08cff88919381d848ab9f472b60c9e83e99d27ad3f1a0a1786fb0dfcba99bfd82766f9335afde98f0ab0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bs/firefox-61.0b8.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "213136c869e9a4a475e5af94582190a3e6c25d49fe260a210221571bbd604ada4b60c254dfd673a9aeeb9d048d4ffc5123577f6f7da0b440ba9668282f3d74bd";
+      sha512 = "e6482d66e6f59d07b652179310d07c2d0bd2b189ead907962615c01cbc365859af69ad92494fea98d5b5ee7609acc4d30e5c0c90bfe052ffaebcc11835bcba9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ca/firefox-61.0b8.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "981c5d319f67de4c9093c57623d1b5c1e5cbd8f640530c03192fa11db3051ac724e014f139d7bbf96d76440a594ed33e4384b591a882c7da7974105ceef8ba8b";
+      sha512 = "2d11907753ff1d79f79a5883477251380b29d83eb0bdd528e707f584242e6a24da658fbed1b37e2a38394b612ebdee9b525c8984ea1f91dff31f97f2b957445e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cak/firefox-61.0b8.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "96a431cf96e77cb714a31b3b549dc1f7f26416ed0cc32c804f1a139fabce217d904cfb713e7dbf298ff6c42f47c317be943fab26840f9db6a58d675f95466dbc";
+      sha512 = "5004eb99b5880f43b14eb4f74332887d526cd3c969c6c2643f76246b22a5a40f0c2e7333e1c8f8a83b30cb399cd659c63224c581d215fc41f49b6143864eca7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cs/firefox-61.0b8.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "a190976d1e10338ac056a452f132ef042b997ab38e1c9d3c3e36d7ef1de843ea13d59ce28fce89ef25d6a98b3d4c7840fbacd619001e455eb4e3b3812178cc98";
+      sha512 = "3b7552ed106101befefd6d5299178cff0f8faaa838408cbdf79c1460e68220133fc25e34cc9a203f04edcca1bc6dc002b78226bd79bdea9876cfe05d8201c6b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cy/firefox-61.0b8.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "2ed8460c1e972535dd0432f25ca83df290d5c9562911df111ecba32e481de72cf30564f653a00b00f8877c6cc5c2c30e6ab874aa5b3dbe6065e4488ed7ba88a4";
+      sha512 = "7d5e4361acc5cb94bf7178d8160a6c146a1c8056eea98cd752d0fc6620b994d956932dca5cf1c8f3f67e279fd1f4debeefe061e58e1e255ed8abe90a8e13d4e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/da/firefox-61.0b8.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b7c1ccc3a45fd41481af46d6a00ffa7b2cbc2855138d958e65cd95712800d43a5fcf7092de4c79cfa98bec3c64504ea521aebd12b712d0ec71a8d987aab871b5";
+      sha512 = "8800b03eff899760729d905512eee77e9f4590c896f819e9303533512cdd47a2b49346d46616768a5fb1fe195cb3ed3a6deb31097ebfd428d79e80d6bc1250ee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/de/firefox-61.0b8.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "37df705938723ab60166634ca6c781e1b46336e8d076655c2c3fc58d7c1d142ca74b8500bc19ef8b7a2fe84d59f3600371c7e1ea6a445429aebc274177afe601";
+      sha512 = "64a845fdaec33499cb2863813b5b3ebfe8f5200bb615ed6ef2961106afef677c620d117c59f42fdb4206caf0a875bce8bd932ed84b4ce8a3e0d5129abd2c699c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/dsb/firefox-61.0b8.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "9b1efa7dfce319ddeac50c6dd732203ca5e1dec1cecfb1c2fe817d1711ed4821d8afb84b7ed4d7056a625fa08909884a08740b955cbcca696459b4c5753eaf03";
+      sha512 = "2a5fab91bcd025ea6f0b327bca397dda31c51c5a6fe2070bb7f955379056795443bef4275daf362396d6dda6a0ed2c3b10efb0d3ab21e840efaa368e51501f01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/el/firefox-61.0b8.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5cc23cefe43ec331472d25b276e2b23043c36ea27b53f574a6d159c896976c8f188933b5dc830fb172b499e9f0d371023c588eb3be72ae4d52cdf6683664101f";
+      sha512 = "72fb83eee5cfa80355a1aae15b627589a1d1d559c6073da7a5d4ca36fdc19b4fdc4addbedb921d2ae24ef2b760ce5e2414a3158f817c0944f566fc7b1dee693c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-GB/firefox-61.0b8.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "a8df584f07439b1d0e76e9cef7f7017a32531039a9ca57c35a444b06ab67aa6aa7727b42a16b8ab1567dcfc60a75cabcaf96a3dfbfbc2d7f2d338bbf2037b80a";
+      sha512 = "92ff8d0491b9910a01c2794869cdc008f469378d00ed706cd02051676a3a9b969fa134057df59857ed2941933671dd58bdb1656ad6eddfa8521dcd3e76c58710";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-US/firefox-61.0b8.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "3738b5a31f81615c013bd0b917ab9d31348338e371303794f133297dc17a32fa5be5d1d61a57f3a6b6103fcf8c34614eee3a2bca45114271a7bab7f03ae7665c";
+      sha512 = "be34950a70280a979e861581e0109bf8308e81d097be9fd479b6bc1c679b016280d4a52c0cf0d3dc2c33f6b143f68626c15dace6c1f7041508d5f76b975a1d6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-ZA/firefox-61.0b8.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "e9efda879e66d1ed364075db1ffa11ddc1db4860de17d4c90c5586e33b716541af3e7c4716c98becd01809bab85444e933de877aef7714edf3b4fcad4fa61ed4";
+      sha512 = "d23165f4635549c687c240b1421f6d8c6982e5ca8bc4933b9081a2a21bd583e1faca4ff94d669df153d51824fdbc15d1861b059ca9002f8156529f9753190cf9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/eo/firefox-61.0b8.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "c46aacefe49d734ffb9dd885053c45102b4d8ac89b0babb45ca3bdf555ef854ea41580e59c3a2a3947300d15f273fe3f71aaaf6b05b74c0a67f3a8c1ab820c4b";
+      sha512 = "d1b17e03020b9def7667ff9704ddc27f994e1889d20d7e6ed876327f8c271d3e66f27329c29c7b3c26cea0f38449a9c7587d86dc08dfca2e415a777812d7b6c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-AR/firefox-61.0b8.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b17c0aff399b62ea56cf5e546ea07637156ca631dde0da47a0a52e55ed8d097d1611c4f1571c232ff256e1092496f601e224ef20e9aa0b03f42643fabb5b7a39";
+      sha512 = "7879a6ad84f93d6cc9221aa336fe7015abfeb62ef5e207691d2e2e6f9c96b2898297a093aa470a149cd16dcbf61868a79a3f1db32620cc9339d545b082ede6de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-CL/firefox-61.0b8.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "dab6654be6f4f6bbdd199151375b92428f2720ea69a861198d233af27ee1bdb822a5890d0cbb5841456a1db3a8691e85cfad86272b61439dd7c2cdbfb32531ac";
+      sha512 = "20fd2189a0bb691031deae1842e078d2c25522b0650b2c3cb8c3fcdd4d8051a9670f37281705ec1b2488ee7c0179ab7625c936682b38caed774e64529c749ed4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-ES/firefox-61.0b8.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "76bdd88222fa792374cea43ccd8454042937c99738b0ebe79aca175256df29a7a8c235c290a1bb408d603ca57ff2efe13d3571a526d5e5b542ca6f9b7560097b";
+      sha512 = "ecb61862b93bc6dc79ea1b01815f2e42a3b9c7548c724167dbf9545e59e5275f21229ae9ef5f45458cd81fa734a14a3b3c1260492abe83d7d4af3e3c4a7c4e94";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-MX/firefox-61.0b8.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "0cca4ce5f283ebee0d5c0632cf9c951c1f29eadc84f1cfb91ece7edc47da56412e9918d3636d21c5d78993d8a9382c8691710bf03a68482e792bcebd10713bb5";
+      sha512 = "0943c44b9fcf4d3f9f28c39c34e0f94ade4485140d66fb34400e63e00389b9775f78496e4216b2a33ed8afda3e5bdafef592b8f43456a4b4266fc0101b42ca3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/et/firefox-61.0b8.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "4c80a265ab9869fc20dd5abb07e301de954f24acb870c994e100db0f27ebf32b0f55ba10e954269cfc67e39fe1bef73575410331a941b4e0cb465e082954fabf";
+      sha512 = "0d8e29424b06bdac469424a7d87a0c6b621b57e5ee00265ea7b5a8735d03cf81c281c9938bf87d462cc0ed74e8016ee9c09bd70182ea64e5ad94345736eaa87e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/eu/firefox-61.0b8.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4cf191a8511cc954077698ba057f29390cea82fa3bc0a774db8a767a8d9139bd481bb8c37ea8083d1d5da2492c2404de3f837f5508238bf3325c7aadc63815bb";
+      sha512 = "81dc587390ad74706a3f963cefdffe2bfc96690ec3cc64e1fd6613b45f977b5f452ac8c42c24518d8649b8d4e87e52a8b0c6b1a228f149aff42385bcfddc8a6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fa/firefox-61.0b8.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "c86ad85cbff328e4f213e25217348acd4fa45ae531da88d9282f611778d9effea05c25648cdfcd0ce3381d5124ce9f3d7b61c815a4074fddf89c713f9c8a25c2";
+      sha512 = "79dc75a9957786f671378ab76a633f347121128e0aab9d1b9c728867fd1c1e8107f0ef48611e9b858bf5f89c265a02d7d2a50968a62285dac3fa533ca84e9c2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ff/firefox-61.0b8.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "4b05b4e17c851558c38ddb474021d5f94677c44fdc9c0040e2a575bc44af4952ef5a47af57a00f02026d54e24443c903dc5015d0aceb112e496b77df596b3e66";
+      sha512 = "73355261b7aedaf8011019e29b34fca17edf64e74a37e01bf9b72d71d972320422ac5bdb2affdbf54b018a91c492824b06a25ab6e1415905d10a22181678d61c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fi/firefox-61.0b8.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "4c11b960a01d68c7d9c21dc7c76a495e24ef22e1f8e41df8dced33cd02456c8d564b1bddf9b06888f149c882fec1ca1533f9bad3fff0517b4bf6dcfd34fb6f0c";
+      sha512 = "8669ae701785bc9499b05d2bc966e283d0a457bbad9f583132abf4467bd6bd527d114a76d6c275c921c32a7b5717db56a9b4b79fc1c88c939cb0e3efb85d3ff8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fr/firefox-61.0b8.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "88ea1cf62e9c1ca08e63820517ef8ba17c977df901e63a5c8476d0ed178d93d7ba06df55ea405262f117a8814c096897c637728401142a0964756b44ebca981a";
+      sha512 = "3afa54b25ab285049f96c60d6c07f2b5019acd84834edc1b712b9c89695e9addd8486613750776e3791d67805aaf4d2d5b0313095f651d0deba823b0f291199e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fy-NL/firefox-61.0b8.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "dde3e01be8ad1e3453360771dcfbadbba5d8e171308c217da456cd3e217792089a7f25e7a320d80ea2f81c658191d623bc6bb52ea4c2e177335d478210f168c9";
+      sha512 = "7300b60ede717098c91628f1827d26bf3aa2281919f577921a5e9c9dbdb91f7c53d39e7a831490d55486583f66b60fc12d954f3bb91c2a3f30cbcbf90e2b0315";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ga-IE/firefox-61.0b8.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "409fd20d41998df4e86e2a42f2054eea525fcdd47256e97958b8fce4d483ee2e35317c36f91aeaf9f597df0d62cb84204ee1822a099f1ffaa3995dc02d9606c2";
+      sha512 = "369af882b8e9e4469cb9c83fcc70504f97b505fbb964fbcf7457fcaded1917d19c97374fd37dd9d7ee0bce2143fa7543d25cac09b591fd6d68ec9bc44c532865";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gd/firefox-61.0b8.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "1adb25e8e9bb44ec79f030c789bbdadb2c2711c9cf89de6341cc0b7590da0327d865c90fb9633651246431ee8f2b80e90f58f67692595f26cb53c56c6a7a2d50";
+      sha512 = "e34cb61423079cf772bc572e26243ab87a89e6f91024dd6e79df80ecf05895f943e8eaceb1d7918c26d192fcf65832e9032bb44f8cdcfd420572c06401863a1c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gl/firefox-61.0b8.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "cfa3be244a4853dcabe6e34f0fe8dbc2d940ccb89ce92174f6d382574445e1debaf66bda9760752a15f4db74d017c9d277f6a865d32f459c9c9caa9ed908813c";
+      sha512 = "feb1a015b46aeef21a93a2afd7528860e9a712058e51cc863650314dc48b262acfaeeec1575a50be0ee20af8522c99a92a9b09b077a22f575842f950a80d78db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gn/firefox-61.0b8.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "09683ea1dba929c74372c15b943c5609015c88a77b578d7f3e68bd9cf94252cc9289280fe8c5d93315551cf662460653d475d64ab7d3c188e4c89b47ffd23c21";
+      sha512 = "73e012d684b384ef95c780e3db9763ef68c86e94d84be4848d2c660acda981b8757aa8a51e90e606506e0908fa4af78d7d440cd51c9e492c2edb1bba85e75058";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gu-IN/firefox-61.0b8.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "ccc6bbb0513f4dd8df91bf09f58bcb2f75de28f0a33da70bc6bc688f409651ab1a34d88f0752eb30afa450cb412e34e015cba8aec7cfbdb62dcb46ed2bcfed10";
+      sha512 = "f9b734a8a2c836e579409f53125aaaf901f3018b22eb11b7c8848d726fbd6a69ad1388e8492ba347d02c87c5638851aea1ac7750273d0c660d5c2a839e095da2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/he/firefox-61.0b8.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "d5ae8e88f143ada1ba42a90c0ee2d20655204a6521fcd8e5e286d666e5e7203ccf7c5dde52df5e18ae8fd55def74a4a2a8bdcbe681a7addcdda3bc026117e2ab";
+      sha512 = "5d1e16cb0152af48e89f1e517c886a57467c789c04bf0055b92ff347f7bc2d6ecd9bbd20f86be736f0e4e6679c780eaf14a49a5d909139e3055ce9329058f911";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hi-IN/firefox-61.0b8.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "8e7d166d15f00b71be942987f964ff03499efd677fafd58d6c607b53fabd866c7666228604c461252a6d30b417d31494625fa829e3947d67069769eb2bff5c1d";
+      sha512 = "581c0d55fcefc848bb5e2fc851119eff2ba3126afd3865733be71302fd3ab691f14b5bd549ab244ba1f00eceeb881e5ac9f9403c7b3009556db21aa2fbb97726";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hr/firefox-61.0b8.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "2cdc4caa3377dca66e72cb925ceb201c2726e814aa12873d74aa2daba8c5546a649c5c2fa5e953bcf6265d642bd0b7fd5df3e7ad181190bbec0b5a626eb8ff89";
+      sha512 = "87a8ccaa35a96bbcfaa219716ab5d9a3a686e6c0a613efa7b7e27cbafabab8dad57315599f32c56c1455be2be70355b595d15a66828febcf36f30b561a09c9e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hsb/firefox-61.0b8.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "d7ec91a65762419d7ce8e7d3fdbd19675b19e8441fb36f2927d89eb1e7143a3797846fbca1ebb0a5c78a7fa8401f09a0be445eba159e1ccd722e0a4523201675";
+      sha512 = "33233fd5261a3af284e077ec9a11cacc62a946fdaf70939b9c7201e12105eb98b8dd3d965ed6fe95a4617144a881693a6588e5869ebeed72c0730a582a36ba10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hu/firefox-61.0b8.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "0cc5216e10d54635b13686bcacb59693150e94b9d2aca544ab077860a1d51554d86dffe38b6430bbc722b66335cbfbef878068e56b2464b5e3f76d96454eda21";
+      sha512 = "dbc3222c66ac95ca23e7c41068c7746a97d86d2155294006b8e74aaa4d377f80d115c49637e7c13e389dc27e1b7baa24398d54d4f03fa11e6f6444e968c69d71";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hy-AM/firefox-61.0b8.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "05f4b6419eedd96b327d2d50da249a699ca5bbfeb42fc5dc58c20a87e30280f99dbca8aa4eb803306abc7eb02f42a2bdbd2dd96e5553f21e289ce5e9cf83c58b";
+      sha512 = "2a6f98415bef2cb434b271dc6bff04a7b9090af9a0f834d8220e535acbb3bd0341b53916d7b29cdd55bd41462555aabf6f284dd1c10555d451e53ce59990937e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ia/firefox-61.0b8.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "59a093c20ef9afb1a25d0b7453c532558209abcbbdf10dfd20c4dde8a642ca4d7c4cbad912756b44565ab9d85b5bb33750e5d8c4636feea7b8a64576edeb5220";
+      sha512 = "ee75efb7c8699e314edb2abe63c98fbc1c45298ffe7c92490749716e3fd3d3321d6b91bf38f041f8134877ab9db2223a9cf92fecd27d20549577568290ecc8b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/id/firefox-61.0b8.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "676e9384493d7c93a3b87031fee59282c51d0325374e989c7a505f4fff7e8830fd47b972008005566c8bab81b3b1cebc24540b4e886d2d9e23e7999edd8fb373";
+      sha512 = "e1021f1a1492da01bbb4e758fd909c1aac7c21767232e9678919e7031109ac1356f23ea02dc8af6894dd917706347ba635666181c82c7f7558b97cfc61c9cb8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/is/firefox-61.0b8.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "28bb39d6a8d6dd5748488f950a768e7993758860a6f1ca9e4faac044b3bec6e243fb24bdbeb650139f55105690e50c4415122408e5d3fdf5a491229356c0d726";
+      sha512 = "206afd8684eef6bbcfe9c28055a227a74855bb7e36885a60343536e1aa4af8509fe7346e9ca040c0915975585f4b8a663bcc881bb327b98a0e5d5996dfea90d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/it/firefox-61.0b8.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "24ff512326db7e876b3c809163495414861ccce2498a61c4408e5712b21fb6be140230c2ee3c2c66925dcc2d6a9a554361df298e682c650758e116a6a8cf55db";
+      sha512 = "477e034544bfae4897bd244e4de13f4c94cb39b4dac926594c6f216f03990fb2d4595ff32cd72bd1f90ca51f850b6b3cc8e1a26fa6c8d2599adc02dc13373721";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ja/firefox-61.0b8.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "2c8fcdd6232a0b143e353a243df3d204209456f26a36e137801ce6b47b18c71b9b189416f7b6d42b9b728b573c390912b9e4b02a39f97bf48d73aa930035f01e";
+      sha512 = "3caef46394dcdec0c2669c864080bef4fb8dfd22f61d4c7c2073d94d8c3b820bb85742791a5edc07df91cf53524bf3fea18d820938a96ebcfe259419af2ab4eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ka/firefox-61.0b8.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "72879c15689e0af10799c91bdaea23393830edef94cc6d7c339080a519fce2bcae61d5ca213e3dc1d7d3692f17fa86e009fc7b090af6bfb7b2a91e00853347bf";
+      sha512 = "b08aa17eb8cf8109f7505acd6d1661b42bc0f5606c051ede14c73b2d0298d927f6b803bc02eb1a93e0acc133a6ac9b2515e6c8ccd2a00719e9a91ff5a16e75b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kab/firefox-61.0b8.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "d117382ac21895542da8a3f5cd713715a8ac1f4b24e7ca96c24a79301a9af0be683c7d95f761cc4534a7ce71bb9fab94a766dd0e1f135789e0fd834910a65f06";
+      sha512 = "4b1e8e198feeb9d15f3943e5dc857eb72445312dfb1e5b93344645daad406b8335a00acfd7aa93e4203e10484c73f6d3c1bb04c3e08597d05b11af0bcb26cb56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kk/firefox-61.0b8.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "32375c57103208e9f62d91c17799692ff5cfa675c338517a18f04aca6fe9846e768f334560591996ec225ede29fe74a8293eb2a61f7ed4ee3bfdb0238cdb354e";
+      sha512 = "0d7f7e0bb954cb84ad168b12c908db5f8449e7f4f1ebcfb902a40e20ece33dd2ac1b3f01bfc716a87d99ec1cdc1607a877c76fa0ce952896fae14d8b47813f0c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/km/firefox-61.0b8.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "4ebc73c69b461bd5aeea6016f73cf7be4277e0bf15b21f950e219fd83ceb9deb2d950aec0bbe8dc95799756e892ffc97149116ecf78e6e28aeefbf090a894ee6";
+      sha512 = "b85a45daaf2f0bcfe8e5be8b8c7906804c55402232601845b05e5501db7f3657ef4e8faa336512c9593eea0bbb9dc408ab8a2f5483792dd1210f477cafb5f872";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kn/firefox-61.0b8.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "095187047fb6336cfb2be22d65b65ae6675661a6a806eb24124025af62df741e004c93406e2dd2a130cea1fd9f97168b296329d5803b13e0d9f7a8c1fe032fab";
+      sha512 = "8d41ff39bae0fd5a6e9d479fc07dcd3c76db3fcb4a4d041456df2943c77b90989f6668fc8ba8d9043835502d3ec711c7a75eac6d7dcfcb8c7537aa264d2161e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ko/firefox-61.0b8.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "bfaed831a5d4f68318cfef05ef0b19611409c4712fc41d62176684b322811055802103b0c0062e88218d3aff5beeb395b3e0531dd086934bb19aaa662e0360dd";
+      sha512 = "5ae2e6f2819ae6e9a06dcee582b2bf7c532b796808dc47bd19e81c77b53b07dd69ed80e2ff789315800680114c793bd15c6ee89f48c632874f806a4d251f3963";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lij/firefox-61.0b8.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "2cf29ac5eb6923092a42cecdef22d399101eac90bdf0e587d608ad03ad10a840068efd71e93e1b940960c83c901cf21ef8adcc43616a59adca94aa507cf5dff2";
+      sha512 = "4fadb6ce04a85acb9bd6e21ede16b68643c8259e27aa92fc194ded784185c4d46bbbbe1a56c2ac26b169a6e58439f13f9073534dd14f249d85ba8fab1219f232";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lt/firefox-61.0b8.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "3359db005fe95e03b91c313867823dace52fcd3919370cff910802f64083a22faa0e17d68c64432985b5acb086cad50fb7f92f176529d8ed213d5e7290638f23";
+      sha512 = "1108a9179a746f00cd01014bacc9bf5d430d1cf36fd5ebb5eb28a85783e5f8257c0d115cee88bbaa92fcec38603be08ca9b22cb9d302cdd72fbb06d2b94db04b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lv/firefox-61.0b8.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2a50c3cd3b0a56c22e07395835dd2d3e89e0adbc43f6db42dc3c837d08c5c5dbad6b3f66a3942c215a7b889046aea7d2143b0afbb2b5ecab62dfb4e9511ddc48";
+      sha512 = "50ad3ca480e137f93950d701c82a6faad9a1839aae26075bf7133dff828e7341f93275b73ad1eb4fefec8cddf1405c39cf5cc486d0d327181c520787824b3dc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mai/firefox-61.0b8.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "57e11ba5a7815dceb0d14fae9b89fe4525e2574fbc7595a3d211b7f85c6dbb5c2cace919a58229168540c68301bcb3778e53699457d81ab5b2be1a920d0b4150";
+      sha512 = "7cb94252144566feb841d728b08aa88ee50d769521f48ec62b45ec7aabeddfa36ff6b2ebb5f8a0d1e30e2b122e13b4b0600aca3ce1e7bbf6df7e7cb588f97138";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mk/firefox-61.0b8.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "d61260e8310e4dacc0db02b09dd3e5259120ef6087b718daebe949edd0ca19dc58a2a7fb80d0918026723d07d6ed61fce4f76de2c5b2b6fabff6c0997d3aeaf3";
+      sha512 = "7f9c3b04c5926f34a97706352f6c919b146c1fedb4db242a6dac3f16da4422d5a9ee124516197c483d31b8a9ba8da2533d2c75c1d11221c713b80b93557da913";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ml/firefox-61.0b8.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "56b89b7da88988d8786b41ed8ca92a88b27f3ef6f1bd11930704b6a1c4b1a385d7ea89c647e9419e18be6e7f312e8141f8a91680f3c318cc3262a24c1564112d";
+      sha512 = "a05652b8fa3c794792ab554bd255b640729a148ea0c8378b2b812879824c58040cc19a41208201a0f891840be709a191209f1aac08efbaac30409ee3e61d30b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mr/firefox-61.0b8.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "9437e094beb55548663a12ffa9185f6a221b3d181aec779818da786ecb6a2127530b28443e0d27f92512417fe6bb775376291261706932baf4b098d4b2af4a40";
+      sha512 = "8b9f0714a0355ef0120e7c2c0afb13925e039097e5402a68565da40f5b2ce538c4dbf95595a8f557f5133ba20373f3dde192ac1af1a8f5f9b1bcd7967b227864";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ms/firefox-61.0b8.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "6f489ca999a25af54759eeb46cfc47984cf824257256148abb058b442c50c32fa1d2395ca6222ae20ca12f49363f7c99693edbf01247dfafea3be034e19855d3";
+      sha512 = "9f9db7cce63679e5d123afda03467db973539e9a91aae0c1f844f7a036fbfb6556afdc0abf3435d961279a51dd95b95b5a18464ad066e2afdde0abcbf553d194";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/my/firefox-61.0b8.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "a367ae72ffb53e3cbd3bcbe648c5eacae9b360bf2f53070343ef72a18af28b858a1f0a65dd0004f71e9daa05705f5d915d9d3ef1ed863470be4d7074ca078ced";
+      sha512 = "5b3a515b6f4f277baec0f96c6c53a97a7b50cdf2d76c07967b406111cd0f926b6c6dc09d1563b15b1dccdd46f3740901fd000665e0c72a4bd53a5181734823fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nb-NO/firefox-61.0b8.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "d18e1ea82f688a95b0c52b88e5cef69d49c0ff57b60a44aa8e2244591bd6e7663a7642246c6f21f53a5a4620e4d01ff86af4ae155b6312aac05e612d5fbe54cc";
+      sha512 = "96c3379ec8cf52b5501a5b12567df1b8e84dfec2a93a79ba7599d75aaad04875ef2dd4639b185ebf54bb7acfd0a9f779745abd82f696e84a4c865bce7ec001b8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ne-NP/firefox-61.0b8.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "f27e68805b72906d39016588d4296b6a59089a2f69531efac383219f53fc1e9c8a45e875d9939fb9aefc971ca6f9cacc85b477d9b8e21c5fc9e6a58bdb086088";
+      sha512 = "6015582d14edead06910be4a088844a8bd931b13f4800dd884806153e5afec1b9df39424ffe2f88943c05ab195cc983667360831157ea7f41cfc2bcbdc6be6a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nl/firefox-61.0b8.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "2f211b812c5325a7a59518fec88f6c497977068600d9492263cb5e0427d2aa58a3eb5423b42747bdc88566df30b8ae68fbbb5accb799893b5f9a939dd8f55047";
+      sha512 = "32ca0aad1f398ae854fddc4d82783c761457c68333a7217e62fff9e4b74a2c6525e70756da365669d2b4994851996423a6a9022bb899746c84e0df730c4323f0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nn-NO/firefox-61.0b8.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "ca396a60641ef8694ab59753279b5770c264eb2cb25712b939cacb0f1ae6631e36ccb33f714e69dcf18cd935e1e02c6da0b064359461f8c7aa1fb322010cf31c";
+      sha512 = "633179d1c842e5ce83ef436e1e0a6b31ff0a7edb2d14da08184a7edca5cb2895ef90f2eb907470c71974daed865af53e40ca92fdf57922ebf13c187b8f3cc683";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/oc/firefox-61.0b8.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "0ca1a0febeda1e04ec3384dedffa72f731b18a6fb4b2345169d90f746c3560feaa59808da8ae7afc1ed0f08b3db6c38940df63574e1aa662ad493792bb71ce46";
+      sha512 = "0d8000ff088ac948d10bea9d5999366f2208a952fe9a89158ef925a5bb2e1bed8c50f8b70f2a9f8727931cc020b571b0f959cc04626b843c1dcd46c8e70a3798";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/or/firefox-61.0b8.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "b4c640bc03720e2c8147b3ccabd2e0c7b493cf9f06d6a11d2f45812b33c7d066d4788aa90e6b3e2d84b7a7618db5584c97e8097541c45f74e76f9e7a01d1d516";
+      sha512 = "09fa13ad879cf8c1ff685eedf0a74a4e23dd26512320ad1e5c14f9cc8209d74a21bf2d3425a45c29d5c8ca6e2091a5c41d60bab75a75bc73b519cd1cc8b78b9a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pa-IN/firefox-61.0b8.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "f13fc2bd42de9cbaab6a2ada2bcf8c27e277682ac57bead92a69e5c5824525832dd1e2f73aba3b1534110243dd11f9d95e3dead358211bc25e008dd09485f10e";
+      sha512 = "a79af673fac2c32ff43de9334059e2b98011f68f3e2aa0f7d0442a7297f918d60776d57336a832c33a182e9c582767e2fa126001e75f99a68a1d1fb43c357d07";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pl/firefox-61.0b8.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "5687c96c22796a75da37efc565a0652a0f1e2f470cc55898c5aba6bd399f4dc8a9097682fea2e2a1037bd6e100f3ad7d869b061a24c78fbd4e5db7eb6d938b4e";
+      sha512 = "ed976499ba60ad964aabe2001922a6c223449a289094e585b5c0272a6ea712ab8cfc193fbd3ec89ff096e467d4731a97cb6a0156c91a9620bd9a4cc04e033cf4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pt-BR/firefox-61.0b8.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "a5a75325e98a510c506e056f6e1096ad8d0a7f4788ccae27092f407058a17aa15a34eb600820a723b4266cbb0874c90d6c9dae9cdbc414611673c79f65b443cb";
+      sha512 = "856d611e360871751148d6bc4767f8509137dec22816268b5e77d2f28b00716e2d73f470e4be741661da90fc1c795e2568260f17edae5208fa42d033a2e6da86";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pt-PT/firefox-61.0b8.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "a79f703d41ca518ecb31d6dfafd776106ec7d3423f9041507770f41018cedfa71fd6315b2144e2bea4c49d83c0bcbe9cd5c57e4afcf30e04884eda252eb067eb";
+      sha512 = "e8a8fcd1afcd0a6d685ac583a171c1f6d3d9b0cd311e4156621d279d58af1e1502cabfcd39083843642d2f79d374f435984334610797937292ddcbbeddf7726f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/rm/firefox-61.0b8.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "fe1a0700221b22afc1cbcdf7d726941b80be80d96ded4342cba4c9d54a0c6c8b155a879215e5f83d19471bc306cb2311bb731337ba260d0c7d537f9406ed0da0";
+      sha512 = "7f5c56d0520685fdca1c82745d1c9e2a34086a07e739d9fb1728afc543ab9b171c311c7be1fc1d19d39f8c2d5afcb36ae91737895c3abc3ca53103b1c1b52f62";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ro/firefox-61.0b8.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "6cc3966907c92b9e0fcde5adc6e107782e5857958514206b4c25859491f1d864cc2a1ae747d0fe8ebb7813a929ce73b3e66f18cc139b661eaec2456086aa98d1";
+      sha512 = "a24a11f791889a6b0845c7ad0850b2d5391548cd7e904682d6d463728fc77b1e864acaee8f9881df6cbb981d307372199c52285e14f787a8ea25285d37441d23";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ru/firefox-61.0b8.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "18fd6dd3d3af822e71499a6517517b5a0e3a71b92883e37f668c2311e5a4b56bde0ceb2685e947ae2edcd8c481a3c3308cf5d3b5d8f0da92107e074614943a05";
+      sha512 = "eaeb3d5e36358e9a17da28ea0d87b1632bcae4a0eb7c36a842276e12642f1cc2fd250b01098e24586dd20be220a31413be0549ea7d284c40a7cc25ea1792847b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/si/firefox-61.0b8.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "8e7ff27ba8b2205691c280e0e61e20dc67a00f37b7c5a40b1619179f1747aa76d37551b4d3d10323d521c815b01082685395dc8d93fcb8fe39de8dc2a12df917";
+      sha512 = "4663a84c9c7f4b111e49368218512e75b8a819fe6fe00b2b299d6f3666e598852eae4c6411c2f7efa1bb9d0219ae78433e94ecb62f124b9bfa27cbf55612f715";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sk/firefox-61.0b8.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6470e39996855fbc7415b637965ddd954d7e8fe38230c5c9d5c7838f9a945d52f03aafce1015c30ce03b8eb49b6dea2f974068518fdb818213b91100cb98eac8";
+      sha512 = "d85c8870bdc303302c4c670d07743dcc01ab8dcd0d90ffbaeb5b5a0a79c9ff6a73afed09b299501fa2a874cf566b2a755b032e243a0fdcd2921f0d52d41c46fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sl/firefox-61.0b8.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "b900a63c29c0d8251419eb87b700392ac3504fa49ccc732d181a63cc7b5a3c26f0480b64348823f0e6dec6beab126c3c610351abfcc3af5bed85cd655057cf5d";
+      sha512 = "e81fedf3f452f2fe3ce969b797b41be181fc1d859b93a750c721d0dec4d69a236a8be9b668a2f63c22a5e11fd5f5df750bba02f813f7403e6661b78bffb453b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/son/firefox-61.0b8.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "867a9ee9ad08b33936cda12edac4de00e1c5b27534ba65a0f16ceb72b2713b1efcaf31c058abe1a64f296e3af2554a9f4c38337214a4f503552dd3174d6d6513";
+      sha512 = "6d57838a18e7bc250ae55638740e32110bcb253f8505f7a11bb8f042910a400667735a882d213856a136e0dc05e8cd7cc0f92458a9f046ee92561844978e461b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sq/firefox-61.0b8.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "0d65e598adde1f32a52250701f511993789c5ac9e68448fa5c7041a58714d2684617cdce37f578a5d2a498ea09a35af814d5b06871b0ae9bec8a71bec8bbbb7b";
+      sha512 = "a89d88ea6628ce8e57923137faa962a5c06cae186e4f2bbe865bc3323d998903a39abf93bab5a2a9ac644e0806e3fbd3ea11a8d8569c13cb7477aae06119aca0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sr/firefox-61.0b8.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "a6495f122a2b6f07eefd8e29807155f381d1f89f3506193551fcc5d8e0f9d1943dfb5ca18debb24df965f1d1db856d6aa0dadbe98c2bc02671567573743f66d7";
+      sha512 = "889b56bb35a5b163c0ff7aedd5857b0e3dea222faa33fbd39002e5617493d143ef64d3b801530fa2d2efa6c1484cd853b70bf9a3e23b5edebec8eb13bdc241e2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sv-SE/firefox-61.0b8.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "25a81d4749c1d95e36675ce329f7ff0222a1dc324e69d01681d39e1bc751355e6928b131bc345b50517a45c2dc3a1ed03cc7e9c82d8dc3a169796b31d4470ecc";
+      sha512 = "ce23933ea889292f9022f14288f6a141a95896a6991ec29f5c69f3c07b8b912f02434158e7b36051e2bef254d977923b248f74863b7d5a8d28e4f0c1be5fe832";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ta/firefox-61.0b8.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "ee156726a54ae37f81a1da32e2d67988b4a0afdec52505982d183d6ded497a4257b81388728e733a480726076b7d61fc020bb741d4b640b19b7d24f7b75e86e0";
+      sha512 = "786fca42571716dd0031708f09ddfeffb688b1ea39679752e923107d266652f2d49f2cd67c084dc98a7bbe47e82162d0d12ea9ed73dead6784167257268b7591";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/te/firefox-61.0b8.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "213541ef2037daa9a851fd7acd846da7b1a3ea8c162362f770406b653916116dab59bf939e8831a10f76ba6928a1e830258e2091811f66a7c6b9a1e4a360880f";
+      sha512 = "763b525dc7f6e5d2dec6d5f1b7fc3472fcba6d7e31714ff1a4d8bf29f6595b76d1c496ac4824a9f7bcad737f305654b21c8ec2d87a25f7fb0690832df5ef7793";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/th/firefox-61.0b8.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "32d550663ea09aef0f40efb1215f1388ecdcb3f7b00e4975cfb8c85912ce3c0b31fdd657672405a95c4dbf75952f14f377e6ce7cff96c5e663d7a1b27323324a";
+      sha512 = "8c8acca6527a5061608d3019adf708884750e31bdbd856035e96db77ed6493f8e9786d813654ac0603b9608476c4a9bcb958d8ccfac23bb6314c4ad83a1a8ff5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/tr/firefox-61.0b8.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "023ddd41d19b74fc03731783ee2af94338576abdc9d5b64ef0a56cf473307241a8f6f89f2a053eb8d8ac003d5d7d70d97edacb47cd22039e9ce5b8472dfa6230";
+      sha512 = "1494c4408dcd99f54dd0534ded3c6d69b293e4f79b0435c60fb3c5298ded9224a08a75b8850bbf2e94add391d37b14b82a447194aeec706784fd9ed020909df4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/uk/firefox-61.0b8.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4e5cdd14e31d280ee1d7b19e0b21571e2ce509f367daa34b83ec903d978ad460b0aab82da748eaaa8e1a01b6a2c5bbdd5c53eef30bf486bf6b5f3228cc4cf5a6";
+      sha512 = "a86f128d1b09263a854c3f9119b44bf69946b382d9e5cda98d279bf2864fa37f453c6f6778c765b23a5714a1645bb663713faf08eb418565115e263c0ef6ed43";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ur/firefox-61.0b8.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "5800be044bab8e785288f26124b03fcca04b9583c4ac98add9679a57d427a92f3b7d77da045e845da581d9ed03c46217baee12cb9d336634881a5cff2aee169e";
+      sha512 = "4e318cc474c011b145eac452b7348db3722ce914ce669aad7c44678b807dd91aee17d1e82554f21ff497e5efba3e0e1277ea47de77b21abffbc85b098034b6dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/uz/firefox-61.0b8.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "e62b9ea730f9972b7dbd32351a3b04f42f28cc22fac3021678880e206a0d1e7f0a2300cede9d7f1caf3d36539e40aa6c9f7b801dc89c79860d8253a12e22fc70";
+      sha512 = "bc5bd87e47602647f188f5a9af294c87a71387114dcd9f3e42bf5e0abcf91ddcd45d53419281e656f07ff5b815b06bacc9edaceda804c85af3c8aa4193b8ede0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/vi/firefox-61.0b8.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "8d629e2507fced857b5845ee1d9a191e2e9a4931d5eaeec4bbf2aa61d242db053753491e9bf196b7a2ac6a9ed85feddbff3044ffa33487109ec7ef4356c4c184";
+      sha512 = "a16b86c625ca7565d4ee4d888e3d1d2eb2b46e96d4a2146feb3b02224e6dd73f0206ed09bbea17fedfd4b315c7b022d81971713f2522d7c2bbdc6b6528bb34b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/xh/firefox-61.0b8.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "5f544dff7a5c450ca05518d41d4da8aad54425118422b59899111018b8e0f74e51b4aaf1b98d0bc7cac433be7b4a45bb6ac60cde1b32bfeb68119b87d929b33f";
+      sha512 = "772cb46f695162c0b59abd121b1f0321da4139c4f7f8c4bb706454872d7e215edf1d43d5c179dae736cdcef05615df8fdac2493abcd63624a16afca0ee8d2c87";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/zh-CN/firefox-61.0b8.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "fa604356e44f2ebbc2192accd634f4ca17f602ddb5b9581d023c69988752d2f9a1b33173bf84a101f797bf99c8bcf6a7e34c6f53982fad2d419956539cf56363";
+      sha512 = "8fe1d61c2a7bc981f8abb1e654a3b095a5cc9623bb73b6e4ce9b4bb628f17a4fe253e9f38ea8159ed137ff275993421b3724e0eca53fbb824532aed1c523dc90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/zh-TW/firefox-61.0b8.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "b9c60aa1bd66d9f0f56a260aed3fbeedf2216aaba539246c631f46c5fb3a23a8129360100b37387cc312acfb118d59a4e3bfa17555a57b00f1f233ef97f3bd5b";
+      sha512 = "c4408e6c0b29971fe67539ed88def054b67ae9db52324667b5bdea895996c30a81771027b1bccea15f4aadd9e2eb5a3302de2d597d43798b70a6f57bd6a63aba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ach/firefox-61.0b8.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "e4f149c83e67432aa31d9ab91c50208828069e49df69ea83ee4b3c281bcbfa05dbca71f678725bc41ae044098b9e4d61ca2a13188b06412ea58845739f76403a";
+      sha512 = "9cf2faf55c7b862743c32e11f8ed591874df1fd89315df82f211898d70bb0c8c3f961ba91ce4dbf380929ca642952ec351cc38f28c45098fb6b069ed7c538c24";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/af/firefox-61.0b8.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "6c4fb2984588621effe18a159ec17e1c04a95bda869be2d8498afe07c29e461d0f95c84f2959169b10d728cf3bb62d2c6ea05f794292953ae8c07c831051d1ee";
+      sha512 = "8b9b28428fc35002a2a965cd023e1f837f154a3b207ddf7e0faef7f7cb33cda726a37e0bf1ae549a2236d7bd29cca2a667cebf8aedd508795d11875435ebe2ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/an/firefox-61.0b8.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "18ba0661a6d63004ad92df206aafe3215f50e26e91aebc3b68fea238aef4c0b8756cbef9a6b2078aeb5ca0b38de8a1988ff548f7e3c5d8ac41b85eeaad88a911";
+      sha512 = "b9ba2465ebe938f3c211c6e7f38e6b8005b27c460d08f462f8494ff0a88e6575348e2ecb0f0433d4b80d883f1495e2d239b1c4d6f00d5db7e3d55d6497dc87de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ar/firefox-61.0b8.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "53859553180c85021ad156ba21a7a24d4907d4766646689f7f1835e4c3f4f5235cf0148363b0c2478028c3443510ef34fd09b03ec70c21b7328ee5a61f0e1c99";
+      sha512 = "76ac262633330c4bff1dbaf37311e699ef717adf8431e5dfce56ab204ec4745d51dbde20fd29f79d30cdb19055058320c7affb801a0df27af0a6239273d3d92e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/as/firefox-61.0b8.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "e76e4fa8a48dda9e2305a9e5e774559e46199b2849ddda8e14bfd07af7c5a1281615bdb743e2492ff7efdea66d9b8f2ed2ebfb28920cef7262fff16178f596fe";
+      sha512 = "985775b42b9053f703901ddf85af7a78540bb2c7f9e2317d76b93a030d888d0211c4434876b01c1f62c977457b54313c91f72bfa9134b47189a702e39261c4bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ast/firefox-61.0b8.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "509c28c1cec65d471255c79175a9b79c9967beb0b2b772bf0b3417bbd39b2d4fb8cefac5e06d7658395c2770bd6384ffc85c73e5939901b51c9aa049e7b4c506";
+      sha512 = "b2ca211293fa09fb70f1df21419ddc6ab7a03182db765a2618b00af9b227db20f8da8a2b8cf9ca4b4a4a8cfab9366981a38d2b22193fe0b3c82918afaa834fda";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/az/firefox-61.0b8.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "a481453b0f458fcca2fb622ddcaade281f12c6e89f66f7b6e444c1a63c79265c49b020a67f24d28319d3a46606b49dc6ce8789b638604afdf618e28ad6bfac4c";
+      sha512 = "c6887b108f311d693ca2ca68c4ba9d5b178479d0d5a4f2473f1bcd851fc4fb41b84f905c2e3b67ef95d8c3bb8f97c8a94d5d7a047b74b1da464c679bbe849e4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/be/firefox-61.0b8.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "11aba32937132635c0334f7760c3232181d20f6bf972d665ba59baa5a3d72572693a36067e5513fa89ca2a911f81882e23a854d088369ed4ff6a146c6d743b79";
+      sha512 = "a8ff0a459d5ba3b43d6a7dd807908f303b940a0d49878bcff04bad0c8f69d43efd58466588e0d7a8b96f670c9ee3c4cbd8058f4c8f881804c128d76052f062ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bg/firefox-61.0b8.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "06cc5f9bf807340548e63fe3b32ea142dff202daeb843d6cd1677c6f61459a9225d8736f0e071b598760e366de50dfea2659ef875fa5ecf4071f92a01587ea29";
+      sha512 = "4a170243cf396ae186dd481e07574b8f2b8a0074f51e752885b1de14ba2c78a37262c66330c8c76371dbfa0397712a7915700f817e5d2229c950571b86a821f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bn-BD/firefox-61.0b8.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "8f8973f321231fc8f2a4a1e5dafd7960fb34c3fe3b66d9bccf449a182ac108b29bf1bb2d04fabea44bcb8a9c4ce4ff0b870df2f40a3282e8384e3371ce56f496";
+      sha512 = "167c0b54145c5e04d3555d7322c643d28239f087f89f352bcf52be6bb472e78dd48773352d56717fc9472ed88e10ea582fea61d758c5f9f744bde591e70cb0f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bn-IN/firefox-61.0b8.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "87bcd40a4093a822346f2d2241eda1877764246171766be07b32be4bcf5b7640e438b19f9b1e2243c2658c7e4f176c28c9ef115d813b5149d384f0e5c966accd";
+      sha512 = "f238dbec621fa7263502c1e99d6fd845ab94936884c117e2c3731fcb9410f66050467223a445e0855456c65f511721a714225f1bae0229887253dc474d7d3388";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/br/firefox-61.0b8.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "002fa901689602a3adb01070a5ea8f30e306aceb3f3177e52190959d72e2afdc5181fac58254dcab7d77860e46ed0e8d9f56eb74407467d147e29281dcd7ae39";
+      sha512 = "53d5855ad975a5d6002b2720234f7b55cc8d34f1fd4c927ba7845d245caf9291daf333e77d9eb73b560e7a8eaf2d9a37f329e6bdb69a48aaa73f6948c28f535a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bs/firefox-61.0b8.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "2a32074a47bf7cb67b1f35b0d20bc253a9f128c6ab6d69329cc64299476a94b20d45c878b48a571b4d37ebc667c7eda5ef91d2a0fcff104f7f08f1a1627d02bf";
+      sha512 = "07d0286615ce670991b868fcffca0589376052c7693f62150bcf93485829cc19198ee7835928cf87d5c3dd25faefbe4b45752625919bc46f4f1f35de4274ec08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ca/firefox-61.0b8.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "7f8e5cf1872945950173d294f49911255d8bee514c5d839841503f0ce38e973ae301d69724831a4841a17c40229885e41471ed7fd0efc89704c197ccfdd7c3de";
+      sha512 = "b8a1c24297021a148c60f9a8ee1baa614541db34bc280e4ed5366f3b9a07d4aaac1535cd9ffef555cc8c16840c3a8f352c2769a1445932560535cf1df2ccaee0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cak/firefox-61.0b8.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "4284741c8a3505de74cdc7cfe903e696fb4e7ec832b08b9af89a32345d10658030bdb0219252fedb0f04f7939fcef351af9e3816584974e3e26430665767802a";
+      sha512 = "f9533c950198d7c49977c9b42a8349d241be1a4a2dd490f6459780056906153ca9cd4ef290efbc8b3699d300158fc90cdbc2697e2f5d65962f1831b714b7f49a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cs/firefox-61.0b8.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "19eb961a94b11a6cd49072ef0fbd0fbf243a6e66ff2115ca601ebf8b9c09e98c0a3c27086c923bada407509bb7a6e08e1163120a121c88c0ef63c4460d04f547";
+      sha512 = "f7b46fbcaed63f1d2a90b70ddbe39f973ca6474559ae3cc998c0f6082203037f6363c34744f2de0ee766e066fe80a88983ce88923a28f73b7fc4f56b7ec7b7c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cy/firefox-61.0b8.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "537a30a7fb0207c120d42b2f77ab043df3a6ef9454cd93584ff95ddfc084bf69266a9cc2efedd00b69f198eb0832daa30b805a5007d6b64eaa5fa248b4e4435a";
+      sha512 = "759395373de80f58af74c94be676a9e4212fb1c11423ef3f942f367a723a60535e71f81134598d93cedceacced3507b364bdc0f98d5c14e566dc73a1b2368a3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/da/firefox-61.0b8.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "fdfcf95cbcf4f987d1c83e63189c68c856fb9b22c158693fff17038a4883e1080d41af864057c96635b1ce5c7e7260f8e40546b78be420e60a098a79252319d9";
+      sha512 = "d4a873976c3f044fdf59e05b929107000c9c9a4b5ed837d2e7732d83d598c6d6a6f722855052e9049c0c058e868d595fdca01012343a70404ebadcbac7f83dc9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/de/firefox-61.0b8.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "4c0b5adf6e043ad1f1db1fc6dae2dc4bd9b081f890bb560436d16e8766582c44c2eeef2662b7ca4042f082eb7c6ff73d816ac9cc505a2b4e6dd2b960bee65fd9";
+      sha512 = "6ab0a58ab3bcb4d36ce29f0e7118b2f5bde3dbb0eb516bb0c57036292b17fb69b45b79b2fc312ab0f849f4b68b75479f49648d123b7fcc036e5bf1dd2ed81951";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/dsb/firefox-61.0b8.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "c84be688e42579df606c86ddddca874c5c795dd23897f26a6755f0bd70247f9706acb204fec72529a94a32027307a4f587c8746c8765994179d99db3ef11ff3a";
+      sha512 = "41e2f8fa5df88934bdde248227ee599620f6378d1cfa708e84cf9b5236d3a1a6a1d268543ce20ad5daf5b9a5b1cf6526cf8624a7cf24544b3853ad1601ac2da5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/el/firefox-61.0b8.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "39dcd7bc909dad0b661f2e0fb9bf34d24ec96b10e3ffa645ff59cfb431e303223ed0de999184de3ec731a500aabeb869d2c1e12b67868ac1ac71f2451f192cd5";
+      sha512 = "151942fafc47528207ed6464d5164304d67f743b3b72a5b52f995dc2ae3d08c57c87639db78dd0b0f70b8709b5d718eb46c18af34e616cde10d3841f9269cf50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-GB/firefox-61.0b8.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "20dd0f2acd16ce48cbbb54944b44e389ab6a3d0d3f37b4cb01ecebb7e6833b5006135c4a20b7f55ca4d8d4d2dddb124b06534aacccf4f2630874d46b3c5fe36c";
+      sha512 = "4e4700f99dcebb5bc2989729fc6454e655b77cf504f6485c2e432656604bc241af284c664fd929fff41a5a4c96128feecf93ac88c1524da102e865f8a280c143";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-US/firefox-61.0b8.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "c31adc5dbd09f282470d16680f5f80e37ed020d1b77d394e157bdb4a29fece2edfd7dd585e4fa3231a0b2e58247702da270f728875fe9bf886a68d5eb8a48a7a";
+      sha512 = "0b5f5bc92bb56fb5db437a62c330e28ac9eb1e7dd89b3a9f678f7d3ca1d575ab0f9e65a1d1463cd878878913675fa06abaa815a5fe4312847f08f95b660d34cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-ZA/firefox-61.0b8.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "1007c55b9481d35b9611ae42a71ca0135ae65fbd9a13e61cb5a90c4698ed1854fbd4129d14e394cc605362da3b2c22fdaba5229831353831ac21f3390af06376";
+      sha512 = "049fcb7505ef21ae0c77dbb89b5761e202daf9dc63bb2c1ad249277a67e2ddf3e7a9d2c0a66881fb9b9f6522bf767514087b038df984aa2aa1ba96ae2de7b627";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/eo/firefox-61.0b8.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "3cce46878580911ac18633095cdba6b180da1dd34ebd3ea0070be8e1ba3c1200c3cf46a8e00c246c95b4efbc32182f36be12685dd5873f57227e07e6a826af92";
+      sha512 = "e77e7b214149815f6286a595172c5720951cdd58e1165e23b486854e83b406a8060f23a1c75e4e7f29fd53ec361596fb1f92e82ae57a41acd73ec25d8d4b8b1a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-AR/firefox-61.0b8.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "9f973ab872f47ce77130482cb4e9482b16edcc0445ca7f05d6b264eac288263e97326938904b09a43081766efad4c226ef5b5150ce9e4c640ad369f416a8325b";
+      sha512 = "df3eb78a2e535b2eded7a2c9ce71654a7c4f937bc8b0c24cd3d8e0a11377fc8827de129f1a7a65962e2d2bf001c4c3dd82fcade612353a6e3e72fafc267deb01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-CL/firefox-61.0b8.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "d681c9d2b0a345f144c4af91b3eca2cf0e23c0fb9eacf942ba459bf1b73e4c70122b20131714a3b92d6404f455877963a80bba3e01d2d674e56fcec8f76d4346";
+      sha512 = "461d452e2644539aa57e7568fde8e3d870039468ea2c235c1ebc88205f9f53e3d1d8313749907e12eb8561620319e8160402ecf9baf0806dd23bdb697b41b565";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-ES/firefox-61.0b8.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "1d32114be5bd45bd434cbec1a7cca2877aa324d57c02e1541f0eb37d79dd786f7b55fd42b1909e3ea3d6b4a3ea849f671922b8d95bab258b6f948480fe6205b8";
+      sha512 = "0c296a2b71a8fb828a2284d73fd5fdf3f8d71fbc46d0c13ae4bce534e686dd008ad44ceb0e2fe1ab3f4f1efd8153fea9e704bdff72eb7fab0abd8849b625f7cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-MX/firefox-61.0b8.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "6ded88d5bc40b5878462fbc17a9af5e26a6b3cb05e53ef25050e24f98992e226d33a7855cd34eb1b73770e57cb9ad53bb17b9d711cdab969338c6cbb38837500";
+      sha512 = "44989dd727ed54dca4ea4ba035b74f0129262289e0888b2f04502fdd1d675bfb2860cdba0a9093c985ad40eea131b859caff73f53ec9616ece3d9871e1dd8925";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/et/firefox-61.0b8.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "543eb909ae6fa971023cdbffd2a312f269ceb9fa20868d83a9e63bffc9936705a85919826577ed9a286e89df4a279d8a1b123ce48247443c7fbee96457ee3c7d";
+      sha512 = "f6faa25750832a2ad378babe29558dbb76e39759403af59aa445b2f5042af5776e14f2b1e99dcf9df949bd4826ce057e7cd27f64309efff2eee3345b00246934";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/eu/firefox-61.0b8.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "84262bbb055a96332f34c6aa26b9bbad69ff9e066cbc60829ccfe5a59f64d6c11838d45ed56aa3a9129c2786abae5e9f5fdc496759d87ba3f98a7e1e7db548d8";
+      sha512 = "0a6b4476622ea6c1064070b9bf7c80efafd8c55a2ea231733ed9cd2d16c68e49d0f20017d00c419c6e9603583866e321b1b441ca486cdc558812901c46049fb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fa/firefox-61.0b8.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "71a95fce457d0e7f07159241df7739b5cce62fa29a53729fbf1157bdf3eef85fcb9d277b9cc66cf67d767102e7aa16c6ef1bd371787fed4af29ce620b6b5ece5";
+      sha512 = "f9e3390601d0340d7202c7bf99896f8439e69645ca704aa0943ee30c55956a6a806f1d56ef856e8eacef2fac84080934f3186cbb21e9527a0b5f878fcc5b7c52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ff/firefox-61.0b8.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "f12e626f88ed3e726be24322d21f126f3f30cf0acfa5842386f51d5b7cfd222b96978910804f631bb3f5cb4eb27040b01c9326e65f61b6167e49e60d6a40afcc";
+      sha512 = "c79bdbbbb8e458f72d0cf0c80c197f55d88d4c8e4adef062dd752e160aea9c8944b0aebdfe2428d45b93fb6b902caff306e21dd3c3dcff7181a9a4bbb7ed09ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fi/firefox-61.0b8.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "f5d0a876dd4f6644af01fc53080b6126ff9f128d6ca990d0e125c4ecf04a47c770a87e1fbe6975b3262449f0d066224cf9de1964cde57d0c3d7d50b709131675";
+      sha512 = "b1a1118ab0cfc073eddddb6a12362b84438ee44919949ea1d4d331126c67d3afb762b6fce9f34b44b04fc4d64cf6ea6cc0865c2067d69d2bf5da35922165fd18";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fr/firefox-61.0b8.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "af9e5e2fc9bb7e84aebe8cc12098a4a3a8cc405172a7ff73cfa3c8772d8a5515dd3c5647d7d51066a0a7612553313c5a05044740f66358452ac0a8c3d6dea227";
+      sha512 = "3193d4f7be6e44a642d14c2c4338eea9998554d022ff524cc9f91b9395dfa80ef9b74337e246b190a3b6f87ac63d6974231b4b68de799745569d44904d08d50e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fy-NL/firefox-61.0b8.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "0851f85849651463b8a841de88e69820f101b468a706e5bb0986debee21f0d7f0abb9f52f7e89c097361a21f6fcddb4d57f17015d41b1350dfb36b00b246888f";
+      sha512 = "eac747092b65ecbd2e92d833df338ac3637bef7bf083d6502c0d03d5993e92701b643b728f561fa6b431dea39e75cfe8df28c194c1a7abd02a8362075887deff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ga-IE/firefox-61.0b8.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "b16ef7812f4f5f0cb4655ebd792ba38ba4858dd93713819a26ee9ad794d8754fe55bf6dae0bb6c371424776f9dad8c13e2449a43a1f14876ed309b2a0f9312fa";
+      sha512 = "9e3bf811f8733019d3e5a0b1da147232fdea907d6f493bd311440c1711bdfcfa610fda6bfec6b77b91cd48b6c0bd9835da2edab4e950e5cc289cd00db8ace3a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gd/firefox-61.0b8.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "e337b418317b2e7a36d265755564fd6ac6fc227d59b31410b305502d1002b4d8fac06339f2c750bd9b26cc42094c89fc4d92d89c6dcb7992545489777bbc1f29";
+      sha512 = "774b5f66df1608ee613f28989ff38a64eb017c8671f6fcc8d923f802dc4700b25b71c239b2c6c39f89cf217a40833a5a81559bbec98476acac5f71279675f357";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gl/firefox-61.0b8.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "b83ef927a63ea25990f0a6690eba195360369e751ae0db446ec093e51a5a7c187c3ff902e3deddaee9b395359db4a7edec431565af167fddfd931d97e8078752";
+      sha512 = "e42af15a9713eb85676fd20fb1243f1444eca871e724fedf00653b204156ff57478e56d84e8e22fce801852a3c5cec91fca201a3000f7c3aa0dc54b019b6f387";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gn/firefox-61.0b8.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "af8447042c0500fa5fb6f16f10a0550bc70fae412b5f4eb8e39fe8eceff10b22cc0b11357612ac1c06cc81fde74d9ebd2b6335c7c84c0c88e82bc6671257e8bf";
+      sha512 = "5e4cf51eba5fe02c95179af802ba0a395f03d59cbfdd8dcd670b4710fa11f4c329d4a5099a8799a04c249105472521149d26c65c28520fedcb851713889cb4ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gu-IN/firefox-61.0b8.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "e59c323f6e4336b198f4785c1bd3d8a48577eb2c202a63c264b604ff16c2017ce43a9b05f7c0698995e9dd83278e817a056a14a5f6242065c2d50e545dd99c10";
+      sha512 = "a7dd519e7b79a1f7473a6ed30ccbf465ac6132ee3d329fb7d823bca7917b54110e8979d0c4606977789f30ff50b87fd27a230bf18b5397c12d057f0877d28aed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/he/firefox-61.0b8.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "691faefa9a8f7ede8be09126174d8170c62c7cb670ac9373575726ea4eaaf64cfafc04312ca21e334f095b226d5d1f1dec860f6cf2e4a482adbfc22970c033ea";
+      sha512 = "a98e5c9a195b0b90d0e352e6d52d26c2c3b48874567a23700f8acb26d551a1d8947bdb7838bcd7f9fbc8532a55afbaa9e948e563ca421088ecec2480bd6640bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hi-IN/firefox-61.0b8.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "b65f1b2ddadeab279afe964da9097211b4cc5956ceab77cc48cea5ecf6815de03ba8e89f39b5c3ba4f7915c7150b8d1951c7fccdbd7f7db71a53b732aeff7182";
+      sha512 = "01810ec36be0842c6fa4b2c766da20f2b6e551ede85864bf1533eafc17779282591c09d5f7cf24fd634cd0db34aa814018cbb2f78ca07be93b465061c90de7a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hr/firefox-61.0b8.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "4eb20efa50dd34e23b08f1bd25335cb296c8d5c4ed176e7882da4e466563e31a4cc1a0c0ad0950a7a892b28000811c70c7158a7e3da26c02d05129ef13fa0566";
+      sha512 = "729d675aae14368a3a665d1fc4150d70f8081cb997d56d0bfe1c1599152c17508fc59263d5dede6c4ab0ebe20967d6414eb35a95ef438889f611a73917dbf304";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hsb/firefox-61.0b8.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "4dab2d22e41590494366c582ffe8e80a2a635dd1b7d57416e51cf0c723cbc1d40c6964a30572283aa7c6d6312c54cb97a6610877eea1b4bc989ec871316cb93b";
+      sha512 = "18ce4e11b7ef42537023792d98370b304ec39198f1f93affdf17ce9cb81806eb634ee2238cbad3b5e31145f0c99ed83d52b138263b3e726c72ab05ac2c8f3f3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hu/firefox-61.0b8.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "f321afa413c878e4ed9b80c1e7b356a70125ae3799b2b47df32a011e60908f86a27572639df10d4826922b73b6515f463a1e5e0b3d60f8c20afb8d23c18ccf88";
+      sha512 = "635b2436580b409417c92c90bc79fa1d292c6afaabf2e9a8801ccccf8380225953b85fc626f3f94f0860d2af043afe319beac0b2bc5426f08e44f58cbeef1120";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hy-AM/firefox-61.0b8.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "d177a9a730911104761d6a7968aeb1cab62347438c5ed30099fb1fa9c9701b87562f081128062b3051ea6cc0495a58e4a8fd9b8c82d4ed7108d0bfd73da2fec1";
+      sha512 = "8f6dbb4d245255fe06bc5e738063e59bccd9a5f951ba27ee0867ee356c7f3fe90915a75048a7a7f5a851ffffe3442905962bce6cd06fad81422540005317f87a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ia/firefox-61.0b8.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "15e665808dfbf076932d17196e93f7db271d8f948ecb060a5f41934d59d75d6e7beae2b5abbc4cd5ba86e59e493c8f41f6a316f4be6603c0ab009714fe073391";
+      sha512 = "e4184d8ac4f186de4f6667f4e52b9655ef37a778bbb8dc1bbcaa1c1b82d5d4522ece4b7780142b508addccb7a1ee1f85255032d913915986bce17336c7707a75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/id/firefox-61.0b8.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "ddc63cd63501e93c12fb687804a2d8ff7b5a4e996456e33a2d9b3531e72d9c85cd7db328ba3f7195ae5ce2b565d40fb4a6f2778ea7f6161596c3e21f5491eb13";
+      sha512 = "117c57d6b42526933f9426ac18aa840321be246eac04f15e39400846031e249eff35b0fc39328427a22e68a392bc5f7907808b326a696e6138542e956f41f0f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/is/firefox-61.0b8.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "1dcebfad1e5d987626e2941eed30b5ac84dc304231b76963c062561b1784dbd6f42bc7d01c2008b32cee7868158b786cf30dae7c5c8da1a6d8a176e9a16af591";
+      sha512 = "0fda8360ee74c5a79a9625c90cdd0956438945de61a0fe3eb0a1414c6d004274e90444bc01f0ea65145e897faca345e35a4902d2ba3a5c89fc52d19643525d0a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/it/firefox-61.0b8.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "aef13bc353d294944df1bae358572c9a7922e8ed41a8225d987ec6b4997aa317351a7684cbba482ff1928b63d3238ee85d07198bb8cc6dbc1a2e3b0fb9c29a57";
+      sha512 = "a6567c4cd90f814c0f0abea87ed7991ede97713b1f7f9b01432b0ca53e0731d0598840688b8265bb0a019d7e65b42f89e9f43bce466732c90332e1ae28226848";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ja/firefox-61.0b8.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "5f84a47f2a22cfe759fe42b832bdec237b7cbbbcf26024a1508dc1a893172246a52e4f165d57bd082ff6780f00ff2a82fe574e4d521b29d98f0dfcc47ac152a0";
+      sha512 = "16cbc3adab6d19dafc7c52cf6149b2c544b998c37afa5edaccee1b0b5f5ba8cf9c94628be4927af777628bc6d22b58c10c29aa4125b9799891c0e381e9959f6c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ka/firefox-61.0b8.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "303b4320405c301245095f0308e9b3757a502161bd43f3f6c5ea9255656dc1f394322718535887f5b3038dc0d6390483e74a6c5ff45fc28296dee3d83afc9425";
+      sha512 = "b7d5716343ca3df107c103e1827805569b6d68ae4af6b9cba07069215dc77965344e0a280bdd969b108acd1e61a965aee04bdcf9a667bb8f1a2d60a216a8a883";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kab/firefox-61.0b8.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "0e9eacf033d76e672f460b7b133ce5025fda39aa4102e55199f67691bc9acf121c78c5251b9ed1e7ab49d93b83e4bdbab6bad671f39c22a490103266d09b667a";
+      sha512 = "d7d92cc89a125ba51ff0971b5e1e4f3f75bf4a0f057a475889e1ebd32c698a189122f062af207b62d24d9bc88f2da92aee7e070b4fc1824fe48502ae3178c9f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kk/firefox-61.0b8.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "9b2ced81ea8deb62c0fb2a6fd3e660362ab64ae2ee706c06b6af0eb33f25df4bbe6386019cfd94f240ca4fba6e30d5ed51ad4c5b319afd76a2e5a62d6f0f023d";
+      sha512 = "10fe26d49f964163c4cf151cb1da1003a2babfd54607078bfae08a10c261ea6eebf58d7922a28b31e774aab5ff8dad9d3af7ebc6ac43a9a1c8bde89ea2b9c2f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/km/firefox-61.0b8.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "1c4d3718362aff114193e92284c981a9bae5acbf956aeaf96d0ec23a3d469ddd064f5d7ee4bbe8c661bd644875f08159656e7d44949c59f91ce1a88e9404ffa5";
+      sha512 = "8e803bdc592ce0706e6bb074ac92853b5976823aa6d64e20f0bdf45b966c467ee2eaf658b3495310b03e1a5fdc2ea8cf68447dc367c0070ac804b1f2c8ce7aea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kn/firefox-61.0b8.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "bcdfd59b76db31c01ee7a69551dc5c025858daf3f71a593f1e8959c8af20227ce3240234aa94f7bd53e753bfea796a29b7f82c924396a130cd895c134ec0dd31";
+      sha512 = "7f835175b2575958ed9c9a72de322c89f8ae8964a39a454f18a106435b9a1c5873ce2eb411ff979736bd0cef36caa03f048bf7ab404613a7cbd58b4756794386";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ko/firefox-61.0b8.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "207d4701dd75d5b88bf06567b13934f59de38b631683275ad7fb2bacc4c0aac62ee5acdb1520c7c4e2671b33b06fad119ebbc02d04e583bcfa732969839455c3";
+      sha512 = "822382bfb8f7efcb16252c19993b9b7b4527073fa0de80da80731876ffdabf76b2fff53bedf3ceac0b7970f74f5ced506f446f915967b6a39963a863f22d88b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lij/firefox-61.0b8.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "01a29678e43e8dc04c0a0340c6fd7c723584a398e797472932792b24911d2009e0a952f4031a3f11ce7c803b4c59b8d8b934d60ef3373204019c4bccd4d44639";
+      sha512 = "42a5cddf78de17154dd5fe34f7ea6f9f840c4f26afb7787689aa49b1269758603a9b23e0382085e1ea8fa87b60cb4655037d1e5be8b9b4c314ac423bbf0f3f40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lt/firefox-61.0b8.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "8037052b3fc838001f3159dd64254cf36426f9d11417dbe032926c263648dc9b53f451d9add606e6ceca0ae4599ee1949d92ba8f908fe16cbfad1e1a72b60279";
+      sha512 = "f56c1144b7c5c45393278a20b7b59700e1e2a93ee3a998b4014733cbee9b2b9f46531a7400ee1da615e59027d7ab2da0767c53725f2dd95d6c9d1d59c7945466";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lv/firefox-61.0b8.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "c5b2f583b8fd0cb8fad8057107663e875ccf84d53e81b2cdc32492924feb33cee1cef726e7455f316144e6cad8341e4b8b74b49ebab26de22b88a4833ea25724";
+      sha512 = "8498765c639c1a6fd01b8f76e35887cf139125bab3608cfcc88b6be7bc731e10b2908def1e6a63c7b7d6ae9f23006047abdbc0cd593e739de0a689a369881ada";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mai/firefox-61.0b8.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "f2adaab166d20ee7b88fad7a3b9f1fbff7dbec6da77d48a44dbd4e1c74413db847cdf9b234f73fbf8cfb50426f0cb67cd7d9ea26c36566154428ec5b28770435";
+      sha512 = "59ad5f1705e39992108656d1e5522bfb7b2a61336cddbfbcf3120c95703901b5bf613a213d9694523b196fd436995b1be13affd431f2a3b5df4bb6a001d09496";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mk/firefox-61.0b8.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "25f088cfc5d1fd4e52db26fc530e239765f6c25329b34fb61c54a4b7966ada5b83e476edc5d57edb9167584709d32dfb6c5f04a45262d4003f6ac3f6f5e5d345";
+      sha512 = "72bcaea40129d248218f944591242e08f74cc714d8686cf668ff2e96028a3ce0e462f73fa8fd48c35fbc7aaeef74df201b4e134e6d8b8fde3f46abdc8f10870b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ml/firefox-61.0b8.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "202e9eb99e73e0eb78bb04f3b4ef677533e78f9b0713a7697b8b0e98c3da5401b3dbb240b5165df35ce31e4c809b45ddf99ad986b953a590dfe77a8e103e6da9";
+      sha512 = "2bb457ce772fc6a6dae8cb6b6f41ab0fc19a495e9e253ae1ddc55eb00485020242462f1155d5c250a3d73451081ce55fc84c0c625cd1b2d8a71d3d0555940ebf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mr/firefox-61.0b8.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "bb3a223835f8a5c0248d0b2372361763dce8cd2980ce32d7f9f89c48ad45708ba7687ed7a525778e39fc139a39558269101bdcce6cef6a3476ab7470b38d52a8";
+      sha512 = "bdc9163085983105a712580df72ec7340afe410a49e4087f73483b5d8d78abe41a92c5be3e776e743405806dfbcdc1c023ad096102df566c73dc345c5ddb8252";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ms/firefox-61.0b8.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "0d804e8567ea16f8935d4c2eb0b9c72d7d701b10b2ade4a08559ed300799d2cc904a40e38b4d4200d4392b646c319cb2421981e1f238b7ec1d44e161239f3e8d";
+      sha512 = "f2d178abe8845ec27d3a36e963abf9a3f9206ae20fb29c8538851025f4bd7aa45790e3752b319fd8aa35a5c37174bbfd86212fd37297172c86b3d92434d2f3a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/my/firefox-61.0b8.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "7d764f40f4695ab30fe8fc8d8fa6d90a4db123994d2599ea81a771962832e03976361c06c6013f65f858f323605ea812d3aee1946ba02b6be11148a0f7fd3761";
+      sha512 = "127b8855d8b1609cfac6ed3591a211bbc0eca6020b019b97eab3ec643caa7e120e052537c5395beeeba0250e5b3e390487bce3537d3f85367b5be80d49478618";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nb-NO/firefox-61.0b8.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "1eedc5f92c9d776306e33f5faf984256a9a7b6f00c88d5e844a1acef9ac340bcf48c8016b1b398e85f40a7c6e211aac3cc31ce00a6f583a0b07a1cd1f3c9a9a2";
+      sha512 = "2d34166f962aed767f45734a86fd976390fba2bdc389c72911011ef73abd5ad74e2f83a50bcba9b4f80bd39e28012d67668112c4bc18d861fa9c2ee00181458a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ne-NP/firefox-61.0b8.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "90107ec2d734c3bead2ac24e0033e2f26ad11dca5f43c59bfe75ca44a33943f76346ac0497659891ca4aaaa10052bb157068a23f2e50fb7680c7f42fd258abaf";
+      sha512 = "55126af093594fcecdfe5354cff608837685f9297b8c33e3de712cccbc33553bce2d91218c93e4e4d3ee21d0d3cfb5ea9272191d0227a8350afbf8a18b6bc53f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nl/firefox-61.0b8.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "472877591d3f8ab1d1dbfa6132e8a6e909a62cdf5def3cc196870f0614aa0c02df9fed0138fff0b8eee05e594c887bc02a24880b11bd57c23dea5b0b0983b29b";
+      sha512 = "c582ba4fda0f40129ef0f793259c5f871e8b3d6317c688c2ef867161cfff4ebb1e276a7cf135282382152711bc7c9c8cf9acae07ccff50789830d5469a08309f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nn-NO/firefox-61.0b8.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "8abd3ab256491fa5033d5935fc0591dfaa2e9d49e6e988cc5a574533950c2f2f46739346766c2121b89755c073d9bb555832af47f177c43f39fd527ea559a66a";
+      sha512 = "9eb9f55d905507d555f2e3cb753fbcd0583d93789c07bfee538ae52512799b0aa18f5b284fe8a4f7d84c882ee43fa2a6e5d447b5b102ea0f3772ef09b8573655";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/oc/firefox-61.0b8.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "266267334b93f63a5c70298700f0b7ba65dba2c32694a5dcce0a330d5eb6e8c023c25beb0ed20eb883da71e4488bf5e7ddfedeede9d69c4135f5ad9462a1aa45";
+      sha512 = "b1c00a0ba38f3d26c165867dabd8723b97ddb73be5f53729aede0566d6bfe4a48ecc213746bdbf5fb724477f2f901763dc62943f2511324951c863e0bb4e1c8e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/or/firefox-61.0b8.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "f8f23c2d0377b837c4f4ba35bb10ef8c4cd27a298d9a5ab3c9f1d05ec5bfa1aa05a1417a1e887d79e9dc7f51e6efc535784cef78021e8985d8e52f04d32e0493";
+      sha512 = "d55738efb93450f609e9e82fe742972680cc553e02d1407eab00641fdc9f5d06f32c7d540d3da5a2d6c6fafd5fff09b4e67bd90f2d3a9a1db3662f5c8ec0ec9f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pa-IN/firefox-61.0b8.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "228602ac0dfdd72dbb896390bb825611c81c91e004b82b97bff767b7b2915b44a379392cb4ae7fe3b5b2e1213b4a6ba4dac1877f1fd059358fe8c96d483e3218";
+      sha512 = "18bfa2d588633337778020444bd1fc64b3ec2ee062377b6090bbce3346c85d3ea3b5b254f8597e700fa34a1ac5461ea13fc37c186704dc1e0ef4451d69aa016b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pl/firefox-61.0b8.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "ca99753782f7d750bcc657fbcf36a4d7897a33554e93ad10192a7381b490d420b23dd2c7d0faef8e85e9cf305dbe58e6d1c777ee37a40b998549d348260fe5d8";
+      sha512 = "29d48be03fc6221af7a75e83b8faccbf4e19afd38d67b046cccf9ada6044196ca54ec24a6d43f71e8bda505c1b618340c403906d4d44a39af109e8169e597b7a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pt-BR/firefox-61.0b8.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "86d35e76f7d67c0a89feef879b470443eb86b7199189066850d71a47785cfe5783a0b65684f811c9750e1f1cca894a3e6fc0abfc9fe3c68849695a8b2329d22c";
+      sha512 = "7c1576e9c74f576261795fbf6c3e0269f99aad933f8341344b4c2d964a1e031a399c106052669d2b7e06ccbccbd0e5949e793811a99cff719b43033270671dae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pt-PT/firefox-61.0b8.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "5f8449b99cd446a75c2a2615fb9cec10fec2da30b72daf321baa50a177bcac90eef050798f0b1f99cd55967b2e7c350aa63cd9ce807d111816dfed1479296349";
+      sha512 = "2e33669d871d4f8e1414788a616ad640858305c8b44c51719cb31f625572adc04b749ac9e1a783366bae9e89b0411ae10648cd63c552f18037fa9f69229b6861";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/rm/firefox-61.0b8.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "e3b40576f6cf2de97ba0051c8d9f215ce054dd07dcd5b8987543036ad002e01f3da3179fb54708de0999308604877feeae5bfb2298686629ccc7069e024e85cc";
+      sha512 = "0d68ba0fbcbd3785afe30796a2b616e4205e9890b5df601153043ce985ee09a38a6d7de25e2d8fda2862f5ce4cff38c035c1ffb559c0867810813116c6483a56";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ro/firefox-61.0b8.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "d4b92a8e92b4a0a731c22a01ee9b544a66393011cbc424bb9b46b935e80c82bcb3cd402a747a369673e97771a5c005ae0df300d358c531d2cc7cc9a8dda77bb8";
+      sha512 = "9d97a5d100e67356e978f88e1a2f3a2c6e7172d7152505a34dc45a0fb270d1a3b63952ee5a434fffb4a5fc3dae524316a749a3a89222b8bc368fa95231c2e13c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ru/firefox-61.0b8.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "b683ef089694cd799c47b7d5f2380ca866d7d6f52e58d9eaf6fe317e83bc4b1e7a0399f3031d6cffa138c5f3aa9bf5eb295ec656d2bf6f0cf106acf8fb5f5e77";
+      sha512 = "6305d3fa7dc7b04e812eea49e29f4a3a740727439d3deaf6c10dd5b43a1e68a60b10a5386217d2f9b0f79554901fbfc047aa5c10a940f94c1939d9da6479dea7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/si/firefox-61.0b8.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "91f436012f1acd2745a30be41dd7e8515f4205dcb51d8e02f7b54a9cd54998e1934787b1734abe3bb111c8d5ee6c7f732e3dd7d8090655d37152f5d2704fedd1";
+      sha512 = "fd1201e1b8fc35c3785186739802f4336d808b00ec96cc31286b9842cc8337dd1066496efb4a053ca2f26fdb1af5386d294eb3ad0b90156b26f79b81eebc8077";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sk/firefox-61.0b8.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "f98dc5fd438ffa539bacb7aa277e9e0f1cf6945b9dc93b5e077c59f65ccee21f90eca04cec9e6ea784a9197c2891fac681ecd0b361e110422405b04b9d76bb34";
+      sha512 = "c11733ce21827136ff9fa16ef616230bad5774184059d4c451113a552c4106a55de1b8abc7befd918033015f6b6721fc689710fc3d35c525cd4b8617ffb79b57";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sl/firefox-61.0b8.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "632d543561f33ccc79ce762ee5c93c4371d39867d2941d596d5025c0e307a676edf9ad65b3d1370d5689c7a1d54d36c1c470764d38b948e84137ea1f37ee2910";
+      sha512 = "28a15c0d983644f8c550830bc0db26441150194a2a7466fc1967a61cf92034572c9ac6160937ce900b6086be72695903aa74b15e8191ae755d0d7bfb8b1d4aad";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/son/firefox-61.0b8.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "737b83ead2f9654c7afa632e534254816e7c00bd8b9220097eb63eb7b21472824670efe26e2e3a4a365d3720c0a74f96f16c38b6543c68165ed46ff479a22cd5";
+      sha512 = "7ceafb0b351ded8298213b7ae6de0c2bc5a82115976c4560db3da334c9d4c4c8409d44cd75a1fa2fc1c0c9af6cacd2e2fdf0b918564b1bbecbea4363b825a6e9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sq/firefox-61.0b8.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "f71ca5f154f30252d682b32eaba396fe7419a374737f6ab8c64cf9ab9c65dd8582068cd8ac1abb6aa2b687528b5e95019ebb0e18c60550dea519ab104d3e3c69";
+      sha512 = "3094667fefc2953514a7ffc4e5940dfaf9894071fde927be177017586a07c12e1e3e697c031e51ec0b72850991ed44522cbff8a24f753dcad956cf2fc827f32e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sr/firefox-61.0b8.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "7761d0b4e39a402cd48797bef220450438c4a0bee9987526ed8fb1e68c2dbbc05a3668ef76a7c5f20accc8079e8154f7e3ecdb824d8db6a299b032256f0826f9";
+      sha512 = "b579ffd5c27ecbaef7b313c504a6f127bdf9febb1f28caad00afd16898f4deacae63436226bedb79268d58232f1e16fd0c080e5983cf2005d4ed47888b325609";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sv-SE/firefox-61.0b8.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "ca621f2849ac5c83a4de77b037b34f00a60b2dc1155dfad571296b56ff130c6a003a4c28c7749b3476cee04e1635892766abe7577901ebd7b1ca1a9089398634";
+      sha512 = "3febff89e22c35ce8e96f11922a0dcb75dc1407ad84f9526aef3ba5608416ccff02f9df98adec1bccdc94741384fdc9f05af3fb3a53cf4ccfafd0a0b3052f945";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ta/firefox-61.0b8.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "4ea40fa5510ad66bdeda6120dae1af500e79d05ac970f5d67de6c94af5f9250e6f86dda427eb1e43b6fa544e33c33564fd970488836eb4d715f1af717f28302a";
+      sha512 = "d932580b6670bff7de09fe19ccb89092fd621507c557beabae28491bf1d0e6ed6fcee98746822be97c5d5887a75dc0e9a5d02777e5caa46009ffb8007e8dc93d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/te/firefox-61.0b8.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "cd9f467df91afb7fc193b97dfdc845ff958d0db05cf483ab48876316df6f024e49cdcb136e5731ec0171234bfaeac7e4facf50dd949e59996e45a442fa1bcd51";
+      sha512 = "cf722fcb15a6509f82c20b9bd3439b5e923e66f5b75da559079a0058f6cb985852cbfed8e390de098cffd39affc7ccb04f40071757e395c2ed648f89a77af504";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/th/firefox-61.0b8.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "07cbd77ab9c33057d06340a056ecd34197f9e037527005f046a9b6cfdbd8347f04d6b4ec7b81774f0402ea642be955a2800ae65c7eb8c542a1313136ef44564c";
+      sha512 = "37be96d449f35b77c82e1d62b959613882e853dbcb38798b42edb85d19e4f59cd3cad04e0caffaa9c72651f2a92de32478eced2caeff23fab6ec891583f08ba4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/tr/firefox-61.0b8.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "602fd5c1cd41c9f27eb8a0371b882fe3061125b80173f681640acf07678f00971c4000f8ab4aee3fc62313e4ff5a4ee4ba19fd44043d4fa2cad99f8998033b9b";
+      sha512 = "e9a9dd3313b18c0945fd55744463d6649e694572106bc0514535c8c7cd06a68aaac1752bd9ad4ca6e98b717e0bd756bc16c4bc538d8522649d312b8165b4022e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/uk/firefox-61.0b8.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "91891ab6d431f3eaeacd2e33d8efb9069f3671196e613e2ea0bf35838f256e3d9e333b25842090b708e09d531e13e2a234577af6c566af815ed8c5d6e7133c25";
+      sha512 = "f8c1c7339183daaae66d11c48e60d951c1fce800839926b3a4d9a7b4ab05b7731c0899a9fc1837ec806bd5e281a8d38f9d8757d12e746b330385a19542a13a11";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ur/firefox-61.0b8.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "3f1a0fb3a98f6382415b24d9812dfa6a1d716716d1f5bd9094cd9b0fcc794cee2a14d19dc117e7acbab1c9743205a4e2d21964c79aa42649f27c65a08d47df37";
+      sha512 = "847ab1bd49690cf0969fbaf24a8cc17f1b67c3d80b47beaaa0dfa6e658e910f8c511f41cd28bab58dbd966ab0b291a1a7d3635337f6be822bda33bf1a3af1ea8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/uz/firefox-61.0b8.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "868d98dc2aca742ad59e0d1510e39f6dfb571f5a5155ba2d515731bb067eb0f41730be49556d93ab957e71d3a1d1694a7da20f30f208b4125be1fc3491becff1";
+      sha512 = "8457e61ed1b18e1c6b0bfec1d7c8196c6d9c5e1984b50c0d94f9c6d7c03f16d70449e7c5110de9be82e9fd7995306c04a1aa9d0c58e55fff4145020bd1810520";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/vi/firefox-61.0b8.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "db4e378e90c86828f080283ca009e8ed9d3376ad95955847b4aac5defa0f02552d80e78c368d56582c42c1c067027d9f1e9a817ab633a0dea426b84523844d58";
+      sha512 = "9d3a2636000b053a962e612fe426bea88a20321b77be867a2747b5522f10ca8f4ab602c73525e22313f1d4bfbde269b8f6a11affe0bd4b7699b0ce8298621613";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/xh/firefox-61.0b8.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "1e1935d239adabc17e1a0d57c614615aa78154d2fd68a876787f5f3f0ca02ea090ffe1b1803d9528fe8579de988cdd78812b3251f48aa1fff8cc69bb1ed46cbe";
+      sha512 = "f03514abfd9792785a7a1c75668ce61a6acf0ef500d837d84620c403668f5290d02c3ad5801d31f1868401e75a23c5ab795d2fc7ef54b94128dbfb83dc82dc7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/zh-CN/firefox-61.0b8.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "6ab2ecf874d56fbc6ef6d1a4be74615c39e22da1836f4b20f65132c92789e14d221b589702aeedfe9f0274bbf86350b33b69a6af0dfd53505104e9b95f17c746";
+      sha512 = "57e15b084dc80f4ff292b92a6aa96d7989e1b41401a02ca6c38330ff85740773a5155549766bebe16fd16f631c956d6ff2fa380d823cd56aa7b7dc11cc59159d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/zh-TW/firefox-61.0b8.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "e7b7479f4be29ba7517da68cd88aa3e9f35031c84b0aa5cbdfdb025682ced06d16f7af5dfc402d5bd4f23230e6f211b98720fb5c7b99a8edcf04b43fac3f4214";
+      sha512 = "26dea2954edcdf98ae2c4607dd3504ee6e277e6aafb2d2e1026ebfce7730f19e1c3e620dd23078000414a68175c24ac456b4000cced258eb887f7f6c23e26874";
     }
     ];
 }

From b44eec37f78c4015f72c14271fafa9231d3270d1 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 26 May 2018 13:05:01 +0800
Subject: [PATCH 2533/3370] firefox-beta-bin: 61.0b6 -> 61.0b8

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 47f3ac7446d0..274724973615 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b6";
+  version = "61.0b8";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ach/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ach/firefox-61.0b8.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "0b1df338f80f20b8d42b9bb541ba877e783c4a23589a68f9f1817d26201b84f3387eb01980add5d4efd8ba984e3e742e7b2dd049a45a7555f01fc81ab2cd429f";
+      sha512 = "0c085d106276da11585c79f9d7e0b550e6b123cd9f032168c8606c6f370ffbc7d62b83981e39fd04b5a781467a762e8d720fec8fdfb3c64036444ee42b4fb3da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/af/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/af/firefox-61.0b8.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "7c5cf4743a057ed08d5e998311f8c5995eff36e23a047ac580a16dbdc09f92c503e7751580d2c28dd80629c3430f227992ccd8144901addbd6c1fe42264f04b6";
+      sha512 = "5456f1267e1df0f0b3f21ef9d1bce16c0618d2acf50154f432dc52bb99e2d0c0d678406586bfc1ac0c4d7a2a3e3ee976da593ef7fdaa199470119d1d0f6822e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/an/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/an/firefox-61.0b8.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "2e8783230b827a9c5e1c10ceec0f4a7c0cb5089814482f7700c700b18825a42df23433b6dd0c21608e4ca273d2dd0d1987722e470ae3915857338bedf252eab3";
+      sha512 = "27959567c69e8575194dd9d2a251b3dcbc019c8bbd2bfc79ee801621bfe5054fcdcfeb36ca7b6c5a0daa3bbd532f67638822f359ad59ac3e567a82907243ae05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ar/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ar/firefox-61.0b8.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "95b2c08a8f8656348328c539df04bc048aabf2148a10bde67c2672d837d5983b2f370fcb47f865fb744a7e2e592d60acce159e280321c065fa224fb0d4ba2583";
+      sha512 = "35a941605d8bfe0c840a75da4edfa5e7e66ab857a2247cedee672e84ad16bb1b6ae77a8c5dbc3f29807069d6961d65c04f36b2190974777451870b8cdcefce7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/as/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/as/firefox-61.0b8.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "4b1d0917208a0c7ff11535054a6aed42766a8daf92a044d061e370b127c86d4f65ccb88f371b6529762906af5174e0852663b4070e95842e238090b52e42e693";
+      sha512 = "c976f354a47fe41bdc99c9eff708e1af0f0a5398287e3140bc6e88e2d2c8ad52010323cd0ab0dd154820ab40af586895d1347fbbd23f1e3cb448fed496797979";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ast/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ast/firefox-61.0b8.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "f74c8fea0b1d35fce816db8a4735feddffedcf428b712da2c3044dc060c0b474d909a230350f1277f03adf836d04fc18b32f173e0970d30638890b5d59db5170";
+      sha512 = "4499cdfb34c177aec59e8e83bdea9f013b300c123109ad944bfb0a26c5f207e57fa76e90c8effb18ef9876dd87d7ce13df049b7bb6a8d56ed48e2fa47123a202";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/az/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/az/firefox-61.0b8.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "59b418da3bde6836bcf69cf7efdd8f11752faffee2e37fceba16016864e476220e98215eae485d9624bef07b40cdfd242efa42dba97ec3f4536c5f9305c9e4ec";
+      sha512 = "aeedf355f8e7d5676e424ffe444fc74ec92e51c2e8e331f16ae6dcbf62d1d91238f34ffce5ea8507fa5c888a688f13b2f3d1309a5790059909f370ad09f1d510";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/be/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/be/firefox-61.0b8.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "115928b1c7281c8e3924053cdef5137398ad75903121ff5158827a1c133573bd2ead4095d9f5a1ca13a20b2423493d76e2ae24c10ec4ed35944f678f0a282f43";
+      sha512 = "880f422cdf9873298ec8d580b51d3346a67f2940b3b5f93155a32742028f0d6954b2c8437e20e7fb96ec60361f2ec7693015790dae1b203f21658b6f95a00090";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bg/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bg/firefox-61.0b8.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "31b5a82661e47dc2aec8991ac34a0d265be74a9598fa3405d90b96b1b642819796de21cccaef44c11256d1c84b1bdbe83b35d820eaa9107ba53a7b55534e5d37";
+      sha512 = "84054bd55f558557f8b945d8b01098bbd33778c89d48617683bc27aeadc5068136607ea238272edac6c130b524faa9f920823c31136b979a05d2c46e0053df45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-BD/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bn-BD/firefox-61.0b8.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "95edc99dc2466159ec195f1669ff161200b2ab95a6f3aac748990b9ed03b08b51dbfc65381359ba8b4d82a73bd5de73dd29e3e096e92e20c401ec2e698d8c46d";
+      sha512 = "f7a7dc51878b451438854a512ca2fbefc21f637c0ded711d6dd5cefc92958eb4d7ea558fc67281ab04f79aae86d749442467059b2c7537672601eb2e4f6233b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bn-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bn-IN/firefox-61.0b8.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "22ab9a5c9c7e207e5944bae42448e5fcab9c0266b4007af487671e52b6151a6e256449f59bcb43428f536fe520447cbf8e23e3ab998ce6f1bc9deab88bb4fd98";
+      sha512 = "734702d1c790f08bbb5f60175649be24f180d58514f1f2872d8ebb47143cf9f5318232d5badce3025fcacbbde98ce28dd20581b0f69dbc1fd0e8cab61ccb9e25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/br/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/br/firefox-61.0b8.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "ae5462ef188b7e9cdc79b879a84dd1993961ca14d88e6b06732725098ee97e0855636638ed1df9e4cb02844372aebab85c42d86ce89149ba629f2b2f8b1b99ec";
+      sha512 = "ac1739f1c762257a7912d87e62c9115736a4c5cac9ed1abe7ebf9615f961f757e34a6cb750cb0cd902e7fccf115db669c9d3cbb59ba51c9d2f4662abb587aa36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/bs/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bs/firefox-61.0b8.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "f99a2d3fd40182745c8e1c50ccb104084be8c567717c5b66bcbfb2fe1b8b4447f5467b4e60c87af58c82d49655cb79a05ad78ac86701a4ecf18beb39ce666598";
+      sha512 = "aff34d6b9706d1a6fb836263d45438afef1213d82444e349aab9c2b19af869c0752a9ad4082b34ccf3d34d682837e49c2629a7c350fe2a4c896ff9640aa53330";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ca/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ca/firefox-61.0b8.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "497ee03f14cf80e9e34f54d64acc1889ab4bf510019c47b1508fc3ab72cd284c009d8d0739b2d3bba7d7cecf41ed67925641d81a34de867e8cb9262e3e12944d";
+      sha512 = "2ca6337337c1d6fa12fbbca58a2e544f1287f23dc31dd8c5797b0438df8eba7a8d6f7a3decb88655d0959bb928222996ea13243680e985924452524b64eb390e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cak/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cak/firefox-61.0b8.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "41ba583d7dc03a87123b0246f1d3ae2698af85969f362e73e3530b1704795a6566bc688e8387a5427a9d6321d30c06fba45f560c19ab05277755c802d4a12174";
+      sha512 = "1ad83c3d20214c2b2bd59765c42404dd62b56b85b1ecd527ca524ec54bd2f9a65de5fdebe1c664bf1f19df01fe231d337fc0c74d3494add5cbdc3f3718ac2bef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cs/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cs/firefox-61.0b8.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "88fdd62fc0ce35959f23fcdd9c1daaf25860e91618946d222a94cd1586c833761871014973d0a9320c9612455d007cfd4f0e01e2a0cad11401e0738e101c61cf";
+      sha512 = "9ab80378bc5560daed5716fecdd8e10c0678b162cbddde2e4dcfc4989ede99268ce1398ec180f1643d6602e1fb89f9c15d3f8e48544b24fdebabfb5c517a5089";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/cy/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cy/firefox-61.0b8.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "c5eb2ce849ef8058a068c34936f35cfde321b53d416d255df2d0f1813f26a6c57abdb718d4162325b869a9155b360d0c5fc32abc391bde3cede2c0ec8173abe4";
+      sha512 = "d653267e7513e3703da0d884e0e91e8412dddb7d0d45f6c1f3e4113b394148b61dc3ec6f58b41f94af72fc17929d0138cfba3c3e57530b5fb68eac1177ca3b8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/da/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/da/firefox-61.0b8.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "6aa5790414c918b6f97b1b99d6d5cfa59ff4d619d0d8fc38d95de201f82897fa5d02bca3be86fd535ee2eaace5cc5f458a6289d416dbc2266c61ff2eebc84004";
+      sha512 = "b4731869c79652472112d61933a47c4323957bc4da77088c1ebe27cebf6b0470e5827244f4142598fed1d81d3b9ff8421c7ef2b76652172da4630c8548972b2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/de/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/de/firefox-61.0b8.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "62e54d82a20c33e551d7fef97ae615833937515f362c5c74a2ac9f88e254f8f217f38717cdbb9fd827f882b2e2a75ece61c2217b62d593fb9e93e8fdf05786c3";
+      sha512 = "9f5129c3475790d658eddfa0e5d3369823a6c47226903aac365fea3bb8578381ef883404e7db4615bcf655c2adda99c8dde6a64254448b4592e18ba41cf9ecfc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/dsb/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/dsb/firefox-61.0b8.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "0d8d7a77589be0eb1c14d9434acf5700aa1f4fb9349d1b20899774f5a65b8a7a32ff393ddc4caa42d6cb6ea8c063d8eb4650024dc7c2858feeb6b01f613bca60";
+      sha512 = "78cdc95f22cf2a52a2e81012d067a74fcd252dadfb8c9f3859e7a392ced75b8dedbdb649bce9c67c5e7751bb663c1e1bc2d857d0eb481c73855e8f54beb7ae9f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/el/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/el/firefox-61.0b8.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "c1aada0c4ef3484285c233d5210097e26fd549f40addfdc2d953111b2c4d0e2f320ea3347d391a1a582d78fb798ab1809111c13e4187eec9741e49a034e5172d";
+      sha512 = "18828e03a5fb079b45c9fe5890924577f33c2557805dc362986528556f4c0480a52d0c7f455b61ba9b5ccc486b6174936cdf230fdc78c7d22cddb5b56cc22d45";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-GB/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-GB/firefox-61.0b8.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "f38b473313bd012cf4ed3b8ff327a59d10127816623ddcdf63083cc4132996300810a2c760eb2a8c2cb5d8519648a17b74790062ecd266e8e3e74619c781cf3c";
+      sha512 = "59b1ba40e32ee20d28ee2a2beccefc766d3b75f422ef991b9e9a0039b54ae15ab3280ae14dca42411096f994adcdc2c782a2615e97f78fd21802d9788bd5d8a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-US/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-US/firefox-61.0b8.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "abf8f44cb3c2713e1fb0e9abe41a45e67c270e653f5cf34e07f9692862f87d51140bc56ad757c6f4a440b0f03ed09f0b6105a13cc3b5fa97dda6f0302dd37889";
+      sha512 = "7261958538ea05d603270279a21c3685f0defe98e8308b9dd7dceb9780b5ec5720e3c7e5d492e309aeca3fded09c802d79ab1c043a052196b77e91453e95c2d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/en-ZA/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-ZA/firefox-61.0b8.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4c953abd9000e7165ba5402ac52319862c228a2d58ce422295166a8e10100731a9a8887d989c2eacac416cfc655e18ec8c6ff49d6f34345fcae32eac7347e9ca";
+      sha512 = "2e9604186cd227532ccc9b10fa12632c59f9f5607227ef56768495c350a169ebef34dcc4606c2fa602a0f403a556c56bd0bafdb9b0af1bdfd8c63ba190a6c094";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eo/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/eo/firefox-61.0b8.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "a104015a1517025a186d25aeb62aada054d53fc4a84836a0292be13f158bec83adb33cd52576e4562a871330c8d42d12a451d6472d77edcc46b074f336480180";
+      sha512 = "47fb5fc1325d30d4715fa0d9b238740bd47d2ba8e325ca481de3085c0e7952fb64bf95d1b2f0aecf774331bcb7e3f254d42daa80fca6271aa5a077e7434494bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-AR/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-AR/firefox-61.0b8.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "aa8955c97e9cf58d1e39798da746616e33d7dc9c1447c1c1fa222d0906d891fc6b44ce0cc8d29408a12b24f0829ccb39d01a4a8895b1c0117b86adb8411cabbf";
+      sha512 = "8c66bf866c0be623310ff56f3fdab94427567a02144d961e306b263948592924b245ffebfce7784887bc54052eb3c36bc0653f9897e1bd01c028b6f23fa4275e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-CL/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-CL/firefox-61.0b8.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "e3ef1125278d00395357d1b15c081938c618ef8f281021d26dfa973ea6b9ad0cd2b170416739a501b9e07ae51e8b33b5ff501f62573bef3471cc34fe5419cf8f";
+      sha512 = "9bc881ceb00d1cbabdc3507a8efafa8a8d74a1b5bfe09c77541ada456453b7c9aad73b91ef8df2fb74b8cf353905ab6f8f63d2cd448edc68be701c4c2530c620";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-ES/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-ES/firefox-61.0b8.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "c8ab8eab63c349e8849039307b86e7ae745319bf06c9c1553864eea078be2f4bf9f241872224e2aca2077c7d279daedc70d75da2214adf6503515accf4f091cc";
+      sha512 = "48c268f3cf16a483231072636eca7937d4cbb48d5bf0abace574bd933bbbde218af48a4fc76892f696c222075e2754971ba8ddfcfebd1920cef5f1b0343b7d19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/es-MX/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-MX/firefox-61.0b8.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "3fc3ae2234cd2059a7a2b33069e3e0e15d8ccaf8fb64ce504a74c414c4054904ead632d5b9fbdc20768eb9d73082da0db8234c7216b788fc704d8a8e7bb6d621";
+      sha512 = "4cf2729e02c988dc34a467ca1db2a845845fba7ea9d8c37f0807259de9640b373926caf9870730f083b836b06b9a11615ada7764a2b9a1d52723e05dd8750423";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/et/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/et/firefox-61.0b8.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "7dea5c3f7f66f549e3365bd1f2b63f12dc8e36e5272b184c49f5ba38dc93d838a361c84e25cd03faa50ae08233b49ee3389ba961ca2352a74fc879a4e39320bc";
+      sha512 = "8eb43956bd466c408ddd844d8ad2f11a57f1bfc2f2bf1a5564a390fa424a8836d32ba35826244ee51be8e01d9570729add972d7bfeaa65ce20c8956e075c7376";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/eu/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/eu/firefox-61.0b8.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "de4775a4ee4269bcf1b1c8efc4fdf9fa3f987b84d899dbac36c25ada1813a35ed4f1a7e20bf11f7933156711405847bc5ae333770eff8a02623b1ee5457632a1";
+      sha512 = "488decff8a3bf071b0cb4f398fe233f9401c69c256012d37a89f9496a867de54879c6ee56980af2a35fb478c94a708ced09dcd789218f01d37cb4312f5c16bf9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fa/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fa/firefox-61.0b8.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "00242ae07a7ca996157abdbc859539441d2067b90c1854a316e4d6b81f4245aa3a93078bad667073e5d1164e690bddecb03074b4ee9b9fd6f2366d141cc6c4fe";
+      sha512 = "6eedcfa103949184b95c84aca5692d094691a7f6f78047a49db59e71ccec070b8f04fa7276cfe36dbe6ab98db6ba5fa7efb6b3b6b9dc8629a31b4ae67f0eed10";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ff/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ff/firefox-61.0b8.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "4e4de19fcd2a13a84820f8a69d591a3453ed8ec3ad27709528ee1ad0ad9961ea7a1f13a4633cf3ece10b927e0307b1916cd5a05d756f6b01d45bb1e9dc6cac1f";
+      sha512 = "8813bad6fc28a12fc5ec4d95af682654638015f166d8beb22eb276ce1457a80df65ed222224174cebd03c7aef1004b989c58969ed8065a979f16d307ff38be9d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fi/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fi/firefox-61.0b8.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "19af4c8cc8b453f883585ade2216b2c875085b7ccc0dde80e4014fa5fac5d9e4cc712b48d82b5124359f0fb2c8b0dcd23cdff29855ee2669da76aceff0464c77";
+      sha512 = "094f738031e1a2aa0fd0bffbbc19387a02a5c2ff317cf2229015255ddce05650919c877c1d249a8d35d2c1c9d4944c11c12015161442ff90dbe86d298a0db0b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fr/firefox-61.0b8.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "fe5690978749cc755657baa6d0a729802ca16f0a0e2c3ac31e78f34bbb256ed081d18054fcd94b3aa5286e91098e5386fd96317f2ff70e7cc3b63984dcc97993";
+      sha512 = "b52ad471a82f69d2d08f952664d95207f362beb6dff3d910d52b30d287cf14a5599e80604a8fc3f12fedef5af2ab1afb6d0bc3e2a673eac2764674b6e5f17d71";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/fy-NL/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fy-NL/firefox-61.0b8.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "67e7af73ac99ac2b895d46976b5f94f0f8c6d0b89eadc284b995013a44f93baf7cf132fa0f66db7e6248c04538469d55f32220964931e1dc50ab480120e75f1b";
+      sha512 = "3b951c0a7b39e6125b272a0fb87e5ff8b4368cd80f32b4eedb9e084fe9b7390559418d7d1954d64bf47c04e3ab5736479f93c75187b59f17105e295074992968";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ga-IE/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ga-IE/firefox-61.0b8.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "8b6b5fdd5d662f7794ae84847addd576ea74dbfe2ffad011df0b73ed1a58186138818e8d05833b01f58e408928b53140a8127b0fb35c7b35847f93e4b610b26f";
+      sha512 = "1cd31e0129789c77346c7543b54315dfbae370c8f7e3fe1e7e6a02cdc5ad9331d00b4023d724ea884ea03a8476c0821615ae8dc107e083cd6a779ea2598bac21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gd/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gd/firefox-61.0b8.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "4c481d6b0dd51b391820ea937394c1527abc82107bfda98ef67952880702d317372d1369ce6f767f54dfcc4e3249bc190d23d8214148174370293125ae031cb9";
+      sha512 = "e008618f2dfdb82cac31f4ec81a18ffb0596de383dc3173c0741f3e9c47ca36a8c14682d66b18421ee0b3e5672f96d23b829f5caa0ad82722915cbf4e47812ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gl/firefox-61.0b8.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "aca1e148b4a4d5a7266d7d5eedb4a761b1e0c047eac2738a7bc28e45a083f59331c7d743bc97d92765140d41b06d3bed820bda668aaf7f8f8393a8c074269a3c";
+      sha512 = "95aa7da68db55d59fb30052efa9bf97dad57f30ce4898d643e24235bb30c86cb73895554c445e59d54d4071ca3c2dad1f1082c3609fe9971e3f417c4f7d8865b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gn/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gn/firefox-61.0b8.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "2043c6cd6d0de32bfc3fae90c5e311fcafe665c7c8036fba9d2265c6de54c0ea9c9238f61a03649c542f534782c12da475d8e3b32cb66c910ecce0ee9ede3762";
+      sha512 = "dbec91471737e08dbba93010a8779963e4cc2d14061d3a571042e88527c0b05933404267ccd7fcf05bd3a3916401013ee2458e2c6daf133578dff5f9184843fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/gu-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gu-IN/firefox-61.0b8.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "5237ecf68ff48ec33302459801d5fe1163980b525cc3fedb634831dfbf915b86df075e69cc86bf7c8f75d23c75e6b6c6b11cc7967494e99283714b421202cec5";
+      sha512 = "6a883a7edb63ae866f09ec6b40297c3c688b5f3df42ca7f30064cbacde4a427fb981bd2e17f7b82c34221daecf782eaa231dfb11c731dbae08f0b343457bd6d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/he/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/he/firefox-61.0b8.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "278d86a5e44e74adef879f291427a5027ec8b4f90b55a108347b56ed340dd0bc12905acf903430bdee40ac1d0d75685c98efa2d6c26fe976f20548c6ca3ec8ff";
+      sha512 = "3d7fe4f97970f91dc723d9d8086fd5d402b8776d6d0e45d8f6c5f3feec868491bac64573c678ecbc35d2b0f367a1fc62c0a6a2ebe264abafcca8919e545d7d1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hi-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hi-IN/firefox-61.0b8.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "e94e4c9afaace5231fb0817887c9fda25ea08547f262337ef7b335a58ea16478f213e737a1379b1d8be5411f9036f787b8e3cdfde67fadd6623edc7444832c68";
+      sha512 = "dcb2465cc2524a309e1afba7e55ac78effe814b1fd1dc927b7c6518f2806b1fa9686abf2a5b98843bdf1716ae7bd399f04cf4527cd2c8fb2aacd06e7744dfa2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hr/firefox-61.0b8.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "1cda9bf9a20e69a988519fa06e6bab8384f33389ee1e725b561335f9544d3d107ab43789700d88f606c3f92747857ec46510cb1942b644cf3daf40201381c275";
+      sha512 = "dccd06533eda2513033ffac6f53f0469b1c23950270018f27fb15cf57ddc02804947ad74dec3e60dd1a59e81340fbe1318de70fe2ba8f15299a5905e361d7bc7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hsb/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hsb/firefox-61.0b8.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "a92604b7cb484d425d4bb40feab69b75034002c4a38d4191768d025d07ab91ed6fce1b2c4edcf0db3ce0a8c3c5bca378def024f8f960d14c08662d16176895af";
+      sha512 = "1f46d42600c46c5f38dcacc2915f475d9183911355ccd0074068cc1d5ea4b1c1c588f6852f0ab5af67d71d4f539c1a5eafd949b6675761e972566cddb16bb712";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hu/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hu/firefox-61.0b8.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "ad8e9acddc4b9ded3464f6b25391094a31036fb1133f9a1c31380d6f2f45ed222cd640f15f07a0159bd508208e58c70d493f73541575361482e91e243bd405a9";
+      sha512 = "73ebb472d1517b4eaad59108fa0762b887fe8a4771c58f906979673e4c942d57b8ba3fc7cdcd9e9cc5175d015fe48e57223120d99c581e51351a5abf97f34201";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/hy-AM/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hy-AM/firefox-61.0b8.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "8871693fa031d1616dd036566c89d8ef8f0e6f14982b915697596159212f111cb285c45e9d0a27ea85cdd68c202e258e03da8d1e7d7d5d299fce5639202e6b91";
+      sha512 = "d0ddd9665a72c2fa481de49806880bf5bb17ae468febaa849b7a578175da5014c96eb30b7db5e04d99b52e04d28381ab88aa38cd76d4260fbaf2ac447a84e9af";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ia/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ia/firefox-61.0b8.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "d2186919c346e057cf1df9a0068799200e849f9435f710c78ee396cbb5190e7993a2975d011840ab3ab4405bb9ab367184d896417abe217227acd8dfe8f21dc9";
+      sha512 = "2a0be3c049418b0b4925a5bcfe885c97c59c3e6868e1ce92b0e4183fd2c23265e78645dc07e6defe34b7082b65cf2a57c3bbe176a0297fe5c8d6b5de7554d38d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/id/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/id/firefox-61.0b8.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "fb9a961533da35e0a06ecedbda83e62aa1ec1aaa743ae683f7bde43f83b0631b15498c0e5fdb900f6fa8cd840d0a688317fe6577a435f0a4d445954f3be93d3c";
+      sha512 = "fc7906c47e04f23e8e6591cfadafbd031564ef2538abe021092668caa1b61f02c0769e983e18ef4ea6afcd7ab5943b12010120807eaa625a9b73c27800ffe9d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/is/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/is/firefox-61.0b8.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "95adff7893359d470c0ef92773419f66692b89c883dd244c014049e6869472b2711ffd40f1967588d17f763a2148463883357c084a72b9a52410068e9a4e2ef2";
+      sha512 = "09f62453b0ad6895bf79444d0963185a88c8e0a2374ca4800875bb78b44e45046542fe68e117a7ff8ef013577635613cd7f2d0b414b9dc6fc2cd98e1d27eeac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/it/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/it/firefox-61.0b8.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "fb73b5466b8a09dbc17e5b8bd4bb204fe449e5d49e5be2979eab0ced8f65d37db52a1c5acde742063322e214724f37ae36d236967fcce41d58037bf3fc9aeb33";
+      sha512 = "2fe90fa1b29724e1a0b36688d4ba705cbff7cdadeb6073c07804555c0c5269a6990312723c66d0f6a54ad343fcb1d672bd2215217d28ee485f20370d199a5a6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ja/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ja/firefox-61.0b8.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "1578a5e7738cc2d85195e2474272ed68b6930020dd34e6ddb6ac00db682f138f8163a1fe0c5b2d179f3b5ae1781edab94dee4f6eae660c7b7a44123fa0a18202";
+      sha512 = "8e0cca6ea3877030ac8a1de847e3a5fa4a0a53e9e8f75d6b9b3594864e7268b30331af23a06810da9de871499e3402e254685f6d36dc6b0d7e132b8760e112fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ka/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ka/firefox-61.0b8.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "c2548b1f0636928f594c228af277cae652f8436c22ac7cbb53da103ccf03b074f55427c366b4e6ee5799dd3b19e057694658051861cd5d29b2162e3101fcbb3f";
+      sha512 = "a901959e1097bb154febfbd29376e6fc1084b309bd32b189ddc257dd57cde4b8398746b8de63e6863f8bf93e0d3f1681269c34feab458fbc51394c8accde1d92";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kab/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kab/firefox-61.0b8.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "04c08d0d88ff6b43bf5ba0825f68d1563dd3ca05f8ea7c4143d9a6a9b78a9d53f65cbd15330dc755587b4511f998a86bfa97b6903f6a5b2215f882ecee1a8969";
+      sha512 = "47212bd4e81e30e2df047317a678980ebb186c7e50f7159fbe354fe87fa62c182c390dfe87f8a5090201c685b72146fc249648652f9a0dceb073cd2b5a192ff6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kk/firefox-61.0b8.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "1eff82dfa45d685882364e10b4ddb869dbe6b3316ffb89961ed458e0e64023d546f2a6ae22a10480d27f941e059151592f3e1af79c946d639b68edc62b506ac5";
+      sha512 = "63b06a097bb243585752e24f3ce02f41f6bf09c379d1b6f2bc9198058f636a66f62090ffbccab82ddc0a8939bf4f59f92f212119945ad65cfac0bb12a0c670b4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/km/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/km/firefox-61.0b8.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "18623bd96501846a497f56813ae415f5858150b85a3a95c5c7d4cf3e645444aca6de32eb4a6624833a0f3677f11c0b3d4219114c8ce90a4087bc1da41eb9c59a";
+      sha512 = "f8033a972e9771f30d5dfc1cc175d76982abffe5fb1e16641853053f1955b0a4f1cea15fbd0125e1481eba89a51699d6b416d36b633d78479d7ccba9e7b28991";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/kn/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kn/firefox-61.0b8.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "a859aa4c4c6b57ff2717104ad3add8ca04c7183db7ec94791c832ebf78f20fcebfe176a4d9a4cbc53e67a3f153350d91bb18d10299d3af0a590aa43766e37889";
+      sha512 = "b541f15fb8727ae25af2fb920c0f364e2fa90a0da093d3551b1953c54db9044af77639fb9ae9c395751bf9ae0ae0162e73a7b263e59e11b2e2208ee2926d7cde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ko/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ko/firefox-61.0b8.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "11c9ab7ad6e433e6e699a0aab1071cbc7b8f4e9a86452737b79a438c6440ce24e6f46b741c3c9785afa36ba85ba157c61d0a8377dc4de5be2e7b5872f4752fd6";
+      sha512 = "84e16300f91ec5c5f8ef6e15e51efa3a014e2df1c7e41b20bc90ed614677dd0b6a81d4547878a596de192cb7171d063c939ba0e282b00a4b2c6e107da844c242";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lij/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lij/firefox-61.0b8.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "1eb96774418cedd2200bdab29b2496059e3a99390a4ebd9a6ab0cc862748a7c5d53a895e999adada1be40631a083ec96181397401cf38a642686f5eafaad240c";
+      sha512 = "889203c5c99c25a48e967d3837aea42a0cb37197fe4877643064f8a8a0cb2ba0a96e15778c8f451e3385f8d10a8cac01b7c14ba40fa7cf504f8edb0d2d66c97c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lt/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lt/firefox-61.0b8.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "fbbbbb31452bed65635e3b76aa2a83338cee8a84eb372ce26b36824c207a02f646a8f7ff3b8efe83916857c579c65ba66a4bf8bb63e1df2a7d248af4788f8649";
+      sha512 = "987363db23dcb9649e825fc4c9193580da77f9464df45736a01e2cb45caf062da88366efa7d7cc907383d405db1ea92472406346d430e0bf587c82284c188d18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/lv/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lv/firefox-61.0b8.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "1f9bcb234b11fd5bc4558cd18f263964379c50459e2667894f797a488fdd474b2b86db9e332c8121a78ea7fca97f0b6aac9e0cd71756df4197291439ba8beb5b";
+      sha512 = "9ab22f8d232e7eef9a6499139537e7047a71d1e8dfa801fff5d602be5b73a8463cf2bb5320ae557ad7163b2c69782070cd20222b18ded554861315ae247d90da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mai/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mai/firefox-61.0b8.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "babad97e5f7430701b38d8b592b11e3e31c6cd5877531a612d41e8b33221c9747a0b462fe938e0a724d460a60ffd4ae42107a78cbd184aa5b22a3b1fc86fb449";
+      sha512 = "f5712112048d0dd7dac8ed33e66b340cccae3343055bacc44e6c8c8da878db00703bd18ce672090bf1b1efb79c730fd7b452230682b8d828229c82f9e7ca8ea9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mk/firefox-61.0b8.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "9a3e12e9c3e871204de6ec6470c7daf9460a0a412799f5451a78001ee8af0bed3f1ac96b52dadbdb5ef63fd1355baae0adb06115bcf826d0720dd816f755f01d";
+      sha512 = "95715fb3347917429bb6016a3ff2f4b985e05ec8e04293511dbd839360c1e61435b6f548321c63586bca7eaeea541a9ce6f1b78665c38306f4c3781b08813e64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ml/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ml/firefox-61.0b8.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "3f83993c15aefc974c246e00f750bd94d286f50393d2b3bfd6f3fb3a5f6c98f09265386d419cc1fc9c2ec62542fc1410eb8fb0ec66fa53cc9087ace482288389";
+      sha512 = "2c7d1e1627755f556695bced2ea3a125473e644824f3566e390804347dd70e17afbbd8246c7e94adef5d2e4bfb9892d5f696e7f27083d21721fc400332017b5d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/mr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mr/firefox-61.0b8.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "e730a4555cb72bf9e7fcbfdc7f8732f9f62ba0339c53f7c5efb4752a1d344ebc535dd4fb36147ad724a4dbc8dd7ec5aea63de72102c28d3e5f3741428884be53";
+      sha512 = "93fcd79b8bf2715ea0441f87191876df4d53da0aee03c237c7c29b9eb926fc7e8094bfe20a77434951bab85df25ed3eb578c482f4d53c210e1bcd2514c990e2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ms/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ms/firefox-61.0b8.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "93b41b7e5dfb769a61bc9051d4a86c94101d44ff905d16c6a4764b67813c047e57ce21d33c3e39732c9ce904f3fb1c3cb9d0e167c7531c99bfd525f3a2af65e6";
+      sha512 = "2eded92de24f67f981d88d14f5300d8352ef2385e365b9886023b7f4d529909e6875e42b44679da9cd869b3678a48b1b252b212f45390373b64419412bcea012";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/my/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/my/firefox-61.0b8.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "6cd4725b388550bc37b661e900dff1535db40f264884666e497ba480d88e1cf28ae1b2ee67b806d95c4fbad53dd3978f468688e6dc86b2de7a52cd1fbc9c0682";
+      sha512 = "24d5f52017ec7921535b036a562f0451cbea7f3eafb4af7dc7c9befa87713044ae3511a549852163ebe473dd31257a2a4ba48b286df12b9f0b515538bc2d46d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nb-NO/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nb-NO/firefox-61.0b8.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "2caea694cc0c5b2405c8e135895a13daa454008f1731ffbe88051c738a9529c627f4ada3b4ada588a0ebc7f10b2bdebe8d021a32aed646e233a050d36ab0c016";
+      sha512 = "9ce23f7e2573fff390a9cc12160090767b5a5b50884aeb6e8150c09a0628af4d628de63042ef1939820450ae1186627fbebe745215062df25ac6025acbe548c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ne-NP/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ne-NP/firefox-61.0b8.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "9dc52ab05a4845b2f8cec4761fbfbab0e6872c233058ee2950d96e3b88e2f21cd155477e0bdea127c0c07cc2506f2b90015a2605f10d6dd38ccc6a3ea3f0e5c0";
+      sha512 = "dd3150888232e127264c66fc478ad91bc621d4e49c792a327f311d1f66f743ba99d844db6092d32b13e57f43f7146bb6d831b834ae7d797a65350653e63b8d25";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nl/firefox-61.0b8.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "88bfa07f5275f7985fc42cd42802c6c1b077c0dafa445a29f0a5346185a39aee380781b6112da52d79fde13eea4116763a2ba0d54a957b6d7b7e7363330de68b";
+      sha512 = "ea717463bc22e468d429a4a9145ac70a73330e3e18050d6af2d04939f586b2a536faea44e193d5d9861cc76b89c41795583d29c723501ad2e72a1581021fb59f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/nn-NO/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nn-NO/firefox-61.0b8.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "70ffe5242dd0173a384f59395151cbebf1113088d0880d4c4b9107317fe4135dd36a49884d986c44ee4f52536eddd35646e956afcff871a8250260ebde75c852";
+      sha512 = "075f8310f1ccdd76d8c88943261d4f6c37091b5a527f7dbb57f77a6e1b0f23ab889ec6ecf36c7a99bf59eb52d3443c6c0dd9815b9444bc7c20137feedf289c46";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/oc/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/oc/firefox-61.0b8.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "9215eba4cc0dcfd27c4bdc2c8f89f71504d50a9636c240e275ca87c08238d09dae6a012bd055242d3785f04aa8a6d08a7acbede48af0d016ba5135ce901ac5ea";
+      sha512 = "03623b979bec538828122d27784682630624971913857c416c055aa614eae8f0ceb692409cfc79782b64ac9b9946d51f943216787686a2c09bfdfc8214f81a64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/or/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/or/firefox-61.0b8.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "12f15f3fbfec5ac0cb0336a1c1085ce820906e75e58572f7dbbd9df7a5335caa59da4b61c7afbad875b73049521c0a5a478ae5584828f512eb0dcadb591755c0";
+      sha512 = "4049b878dcd6bb5c61a98dca756ca69c1197c0da1c5712c7b16120be9fdc6292b93144d0b72962453c585cf9eb3b624e8283666112293365631c3cb6e07046ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pa-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pa-IN/firefox-61.0b8.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "b8110cd53fcdb4f5bc4fb2c80aeac28790e8a7666ce644c6a911b7e33842ae2ad12bf4ffdb5de68eb24ff7f66f2d54d2c2c363050465b1ecbcf59c669e991d91";
+      sha512 = "c6723079225149c5be4f786fd8aa7120b5a8b7f3c71abd629607e23d3b5910da54f1a20bd98b70a3f30dd98c34d10b84d1bc16b89229aa64cd081bc6e00a0b56";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pl/firefox-61.0b8.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "969d4200aedb22282febdbe652e9a36e197b43c9e038271ec5fff6ec1c3597a2c90979c66d3fea3a4dd705ebe5072cc3382aadc6a82fad7a82c62a138430cf5f";
+      sha512 = "1768cdcf6180d26126e8414c8abf530adef1fd3037bc43f931bee15b0eea04a54ca626c093565e1fbe09a980a9c56054fbace43a137477aeba62f4f4b23f9c96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-BR/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pt-BR/firefox-61.0b8.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "d336b27d4ec459d4b9e101b74a267d78245cf18a47e9d79f118a5ea8b04553734ed51aca526e16c8e208726240112ba7b8a112aa6dccb5431260690af7c43676";
+      sha512 = "10286961a02c19d2b51c9a470853169e55a09573e941fee077232e3b507ef9b7f1f5514c82da114d219552c51f01259262da3ab9ac58d3e0d5fdf312e2e10df0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/pt-PT/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pt-PT/firefox-61.0b8.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "6b06591468a5fd3f961be6e42d7df2bb302bed493c6c68816fcdba59ee090117529e2201e686b1c06a83273b29e807002c7b27e957f9d37af21a2fdf7ec56a98";
+      sha512 = "f24654c601fa6d62e8aaf5096ce8a55d86614d0e73aa40d14be5f921e5ef40f4615c9b485673eaab0c58af700a8673864915a3353a9a165f9590d7906dc8c174";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/rm/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/rm/firefox-61.0b8.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "43ee24772c6122341f1f88cdf84b23d53aba46af9fe0384a2518bf6e4c673522c57c52d211da306c7ea7b672ed1048f93a06861af39d024a8fc025b359af6a83";
+      sha512 = "ac607e4087103257517201ebc05b9b7a7c337c2d876d32c4ba9eb0524218bd947b6271bfa948a70b02930501c8d6b2c6e89d908979539a0542e1246a0bb4aa60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ro/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ro/firefox-61.0b8.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "dfbc1ec09705accca52ff20fe7b89ff724da4096f3c2b835cbaa3eb7e16917b808a8ffd2d37ffdecfcb905f0bc06f0bd620ee200c01a653cce9ebded6e475811";
+      sha512 = "ef7376c092b8a7ff8dd7dd48e97c199c87ddcee5e543166a9850cc0128966c865cb67f8e61ddfc1edbca1f3dbd8efbd9419ae72435c5a5bd9c2b2fe58418903f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ru/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ru/firefox-61.0b8.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "4849669929700d2d68ced2f63c7fecd1a8788f071ab7d9719e69a63a8418a644e3c74ccc4028a27de160b796c0a08b33822890c355c8eef9512c72490d3d5429";
+      sha512 = "504832ed8414ab0d75256489855c763f4628abc4702a9ddaf1a823603a7d4710bf6c1e421a7bc6d07fe494b4f93c87c1ddc26184610806f20755a888969b13c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/si/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/si/firefox-61.0b8.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "95fec85b73f616c5fe5a3a7da0f6b76efbe6b886c85cc7fdc66960ba6bcfd8348b0b77f599798794c0600c914274b50e878948ef317483598dbc4909bcec0be2";
+      sha512 = "270a5ade916b439199cb6fe539b593d747b67fcdc0857a4fadcee328244909d28186bdf50701f863d4f817afb15c38e5f4380278d495b1d627111b53d567c186";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sk/firefox-61.0b8.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "fa60e6bd7cdfe23448ab026c4f7b65f9b850f009cc7a3b1496e1e883316c01ddd67b36540e90d266d31c9698ec9b7db25e11e9324143eae7d3fdcbbfd80c2de8";
+      sha512 = "b88074c7fd37e45486b40f4c665a1ccb19112daa4c8c344e0a4b2b3cb4d41390824e5d7f6446adb0256cf25e0fe71c969b51b4ae08f521d0f619387d56ebb72d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sl/firefox-61.0b8.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "c25b83329323f236d76783b17c192e4e5433b0a24d816bd81042ad082b0f7bd9905119277e2806645b0c3618eed880590c746c1516797a6ee0c633fe0baed102";
+      sha512 = "fc871d74fbc8a59b97197bab790b543fe5b7478174dc4120b04eeca90c79275ef7867dbddf7e31f3e58fa5b738ce9af00d42525667482727a7abbd0979c3d969";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/son/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/son/firefox-61.0b8.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "26fe3799acc8e52768b3800bf06ec6ae62b030dbd39a6149f9a6623be55c031219125edc57505762c0f2ec4002d1c5bd1cc45f11baf36eb5eec921559c1fb0c0";
+      sha512 = "26a9f8fd86e7f733dcdf822335fbbd780a69d3789162b8f536336fb9ab45802c9b67ab7f5681b96236530f040e489ce99da005dcf8bd529d4f8e5201ad424cab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sq/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sq/firefox-61.0b8.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "d3c950fa9d518337e57b53e02daf4539decfdd12ed09768123fbc2d064006d99ab6a02856787c204e080a7ab7e222fdd94081f79982cdb1d7c9d2a04432f9e89";
+      sha512 = "94ce101af7225da4f8309824d0511344be52f52c6f9a14a21863eaeb79db755d0bed72927f707467b862ca9083f5270ebdc9faee13817097b0f73f6820e4d6d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sr/firefox-61.0b8.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "74ae91718c024a69c8135a6ea31936c877be690447686cd6e70c36aeaca23bf9899f691b65d705a4608202832cde9c4fc24b60c2f28e97363690a1160df9580c";
+      sha512 = "b5e734d2e1b8563cf47bc6a0a5dd59d8f7f4be1f95f9992426be690363450439cc09bc89b506df189dabe7588292da25aecfdd5796829630f095931ab2aec19b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/sv-SE/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sv-SE/firefox-61.0b8.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "5a48173317d01e1d3d3b55972c22994cb6f90e70a4790006b2d077976f4e8c2776455b30c0ae7caa4c378a1ce88a7d33357e451e991a577d5aacc34e9796a8be";
+      sha512 = "32abc54a25fcc979911916d83c101be8d5ba08331ca8ff8673cb9c4677c55263a661e780fd344642714cac5a5b9af6c831c01ca0651f67a7dc872ef701f25a98";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ta/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ta/firefox-61.0b8.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2f24d7d6c8800943d066ecd962d4ac1047424e13020770c8585cc005fa22ee11e4050ca9b093d55534fb5dd60a76b79665067ab1b65d7321cf7f5bb014894248";
+      sha512 = "6ad4405ba59143765b3cb82ace718b1f8075813636f9109ed69bb2674e035bfcd5174b49d2de2f73cf9ea616b2de5b31c2bcadb071e49e3ad0177087ebeb0b19";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/te/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/te/firefox-61.0b8.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "9ad81ece7338318f854acac4728eb81389327669cc5ed825f0fdcc2c330e6d871a1df5033bf52f8fa3ee5cf92fc94674b44a7f9e26d0d02f5000eb0d5c990362";
+      sha512 = "ccc213e1266219ee8f5a230d7f8a96e503897ce70f66dc7b2576b24db7927bb9032124856c46a85c345ff5adff42a3d08963920f41d99e095af95c170a72794e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/th/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/th/firefox-61.0b8.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "c031247ef411d89abc0d219ce83418b3bea2e261bec19e2c454e8206d80e78e1bc712922d9fa64091e3cf881fcfb09dade12ec163c628ffe17c8472f64ca8956";
+      sha512 = "d470b8bc1fd69fe021e9871f98262e17a157ae758d6ec8e90747627491f6ea57e01457ffe670df582f0c3f5ce11f37147a4e71596e79a46f52e6c53beb67a95d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/tr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/tr/firefox-61.0b8.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "2e3641e6c6d33d13bf35a0996775480eaabf4f80556f8a06dd895e4f90a01a7596e45a90e3e85b76cf271fff88f15b61c0f9e14cb91560556d159a067f199abd";
+      sha512 = "3e5057597af10891a3c65c0f2ca32316dd627b7fd9895edbb89a559f07053bd03dd6a545d82899c922f9055f9f975b944d4e7b3a4c746c4f6148bd50f655975f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/uk/firefox-61.0b8.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "7ae337395201e2f269d09f8669838fba19eb222673e763a29f3b9324c939f9bfc365a80ad87d4a3ab15b20ccd55c25c92392e4d26aa47355d7649de61aa25541";
+      sha512 = "4d8117e6bc56d85018a900f6f97d2f82a0b76f23f2807ac9a6821e8842b9c7b8fd20840c4c784ab27ecd869fa6012511e4b4cbaa2c5f3fe11d79c35500d7ca67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/ur/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ur/firefox-61.0b8.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "df727c8439b09423d11ef5ce8c7c38a767bf1b537e6612e3d0d7deaf94a70430ec9a2aa22de5f47b94dbbddf8907d1310f87f0794e251275826e5ae8496e48f1";
+      sha512 = "f4ddc2a57e920c9272a23c5fc794e7f6fb855ea98a1dd12ed03cbf21bb5a2b85789b526dc5e49d6a27c31165eb98716da4995673856b48891d0e21c66a977238";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/uz/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/uz/firefox-61.0b8.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "1ccb4a242d9bf02781cf81df7b62a21052a257bc98d64ff827528ed3f1f025ac86a8a87c6fb77ea8ec93f31ffdb6baf9f499dd3e190fe501e8823aedec84018b";
+      sha512 = "02c30764a9368c883215ed418bf32a4a39c4c2db6a7f0646c6e4998d51e3965f87306ff6b7276e8a375506821aba02734b360a307cea785dcec543da993cae88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/vi/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/vi/firefox-61.0b8.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "538d1f17a9914171c919027e3ffad15bc6f7ad4b649a037b168639fb1144db76dd78cb588c105f67f1d7d907b9e6fe2f17d56ee3193490b9be548ad384a56882";
+      sha512 = "a42e9c7da499451903800f57ec44df070dbdda2eecffc3c2f0a9729e4993570ad791ea3299fae085b0dab0a2ccd5b95bb14b4bdfc15b223666630ecb785f9009";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/xh/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/xh/firefox-61.0b8.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "fffc1997ba99b1407fcf2242c88c0a48db8a43ac3d07f28557fda510729eb52e542aadd514a83dc54e0b4c5912f84117aae05fe230080c9bab8279baf3818e3c";
+      sha512 = "8631b3b6384d8650e98fa9590973e2c603e6a557b17c3369e573ed5902243cdb023cb9bb15468418775b845d25cd054a2e6ade8b81410cbde1d9634d6681f7d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-CN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/zh-CN/firefox-61.0b8.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "28c88ff542004d78d07a19f0b3eae3ec6943911a755ea2874df3bd37f3a214154b7a023bc3519ee8cc8cc4736f67a01c7638a2cca558e905e7923c6337c8e8ab";
+      sha512 = "498088f972504dd63e7a3cd1a97463d17bf62e186d8e5f5bc83d28ac7dcaebcabadf76f16f57fd5bef59726cdc75dadc19113f73fe4e2736042472ac33f0ad2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-x86_64/zh-TW/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/zh-TW/firefox-61.0b8.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "0a3676724d24ab7a625b768146e94a09332ff06502c7b1a72f82777875898a2f70717206d1798581d91d4d2991d872987fd4029df1d738f58b42b8a6d3fd4329";
+      sha512 = "40b463f4d6a5b808e1c7e992639cbce315b7a6994f9401e0e92929f0288e7976df42eb1f923d4b620f265ca44b3eb07b2058ff6ccb8c8581b06df49836b060d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ach/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ach/firefox-61.0b8.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9a1b12fc9a0a4f97fa40f3ef51cedbcad60f44b9d77a7108eb6d8c33a403d333b58f9641b9a85eb61df9bee7d2a72054c2684548d0a5ddfcb8e87696814f6704";
+      sha512 = "972839d2b5c2b0af5363e0d0f85c6b39e2c641fb29375911afb90eefff0508b9fcb4728a016eb071b55e2ac5474700f078c0abe5c83a7fec004afd6ba635fd6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/af/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/af/firefox-61.0b8.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "020de326d0856914a43f1cbe4de14a95f0a051f99185cf9ff9ff122ce9c1edd9ec32f28101fdee484eb5c3380cb758108e309168051f048a4642598a2e4510a5";
+      sha512 = "87c01acd04b6a11d9fad202cce7d912629d4537b1eae6305a21fe35567d57a1fedf5b2502efe603ff1d75461f5096858ec53c7db1c5f7cbf5f4b9833d0bc6559";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/an/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/an/firefox-61.0b8.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "22b4e8d23e466c67bcc13b47973fea7f027a4c41d4c9950bad65a119f94d32935b33d4ed93979fbd8145d844aa12a38895a5ba932e00319c67af0f5a76cdda5a";
+      sha512 = "4d1953385fa190a9d965d5e40b878e59e92a5f973b3e7190030346c383056f85e049172a723127a45b242cbecb17a7e44126d9aaf9405f56b9458c0f4e87d81e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ar/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ar/firefox-61.0b8.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "5c6c05dcd81a988065ff94ed8ec93d6bfe18e58e877b03f5610ad2269ae46b5f8e3dc3c3501ce95c5301b1221297e815276dba2753f8dd75dfd8e56b8df5e2a0";
+      sha512 = "c52dab7ba3645c44b60e052490d66327ee5571ed151b05d5b084d31d7948e7b4913b9dc0fe25a14f5553363f900d91b20dd0ac830b65b3acf4b49438e7d53e76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/as/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/as/firefox-61.0b8.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "244e0a6a34a6498871c599866391ecd7220339540cf3d0c3ca5047e1a9cfd2c79dd4709c2286565fa294744be405a7afe01ee5a7c6876bf51388b87d0e42877a";
+      sha512 = "45145403143f9b0c6dcf4abb287400a1978eed93c3f2e1358906cad3cc441f6471818a6fe2656a7417aa8714ae4117731baa1afa118d756726f87cc54ddd6f67";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ast/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ast/firefox-61.0b8.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "a2516fe624f20babe6d5cc122298127d91d822237b7b7d86cd6a54ad85579b1cf2d63d133b17eab4f54e128cb71d2c4fb6a6c09bf55e317af26e2033f1f598f1";
+      sha512 = "83bad32114ed3e5dc856e3be813da148388c6070098aa0c275df38459680dfed4f0e13795f59cda8faffd074a7ff14945c4d279109a427e1241bbf07070d9b18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/az/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/az/firefox-61.0b8.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "cc8dd067bdbe62fcff881dd4661138809486700145eb54f2a6c375523f98d8a8da92672049f745cf7ab6e67cfee669fb8a35f572aa6525404fbc18120bf7a709";
+      sha512 = "548b421eb5c5675be324b3eff3dd315bf2357434d59f3df216a9f9c276cde6896bfc8fd2b5e35b3a5cefca886cee712d9cbe91766c73794f7e3eed18d93da8e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/be/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/be/firefox-61.0b8.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "540a41b4de26732c30ed8fcdacc596373e3d91b4555c6d622ad169b44d1f54051d6a459ea7f1ab36711d354ae2c8e65b9db3f3f318cdfb49ae6a412aa9f54d2d";
+      sha512 = "00edfdfdeb842952a12b11935dc159f07e5c5016448d36fa6835467139322195ffe9f34ddffb20a593e7c0621eeca7bfd1fef697550a8ed4beca4a2ab3752a0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bg/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bg/firefox-61.0b8.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "d86c89ef09d63b596769d96c98e05ccff275c435d5299877023d59283b26506d1a1ee9a4d22faa66b2e4f9e8ee92984bcc506aeae807e40bc0a856d3fb2c3fb6";
+      sha512 = "9634dd7837d870a350bc92472ee97b06f01e3c67ef9035fbef388ddafa649fedb12ed12df304a1e68e9dcda089e8079e8de8eefa1473100b28a0c340a45baa3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-BD/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bn-BD/firefox-61.0b8.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "a2b087b07764847347474b5181b161def7e2551a206cc85c2348fd36e490ea4994fe6e14b25d3963993c81be86b808dd353c0bfa768ce7406a7b79b46d04c67e";
+      sha512 = "39d58f13051e40ebb1e5348ae1a76bb952f1e16ed16d7b953c0b92775a4c728ebcb1b0283e5494aecf4a6ab38caffb9b522b7ad6cdd1a4cca10c838d2239f21b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bn-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bn-IN/firefox-61.0b8.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "68928c99f7b18bea8c9451e77d0aa125187547f9f2aa6e8b42025ddbccd104e14352ecafe9a242d59d3ecd0fdaceb59f7522ce90dbf462bdc443a40756785262";
+      sha512 = "af6537ce6b6658b702761e5aeb9c5dc673f9bad23a512c7210f16b3a68f991dc06d9fed2fbf8ee20d6f338923284ab8afda68d6c6aad844ab0419adfc0955a9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/br/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/br/firefox-61.0b8.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "12225c779abbe923419bb9824f1e55f37a68f70cfa4e847ee6a44da9cc6c1fde6a97720a2a366b8ed8b3ded9e58447ab6705bad30cfc09a3b51729853c47db71";
+      sha512 = "68e7806d5c682d9b8c9781283d373a99ac2915c3770c4d96a6284ffcac149c70b8cbbc3ed7b4c5dccf32ebc5e9f5d7b76c84df76ac7d57a68a0f86d26fd3097a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/bs/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bs/firefox-61.0b8.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "dc0ee7c8ff43d1e595ebc5adf3cdf7d95a55824294af4542c94127a21a5ec0ea7f8ceb6d3f5268669720d928df2cf9c307899141e3e0c540db4779db2c9d09d9";
+      sha512 = "9d1138732df0f3d68460732bfaa508c27293078c244f575b4651b32b23deec8dd9c7afe2fb38caf7769e993ca03646c49d34e5d2c8c402d0f2491646ab15f799";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ca/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ca/firefox-61.0b8.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "2c631c16f8a79ca9fdbf15b5c0c70eb6728bc116030b180c921c1573cc470eb7273b5602d058c88e49be1320da62be5d493050574711cff7b6f40e6ea013ed82";
+      sha512 = "53ce04660ce3c84a154ff4c7d0635719337ad705941106e8a744802b284ce6dffa3060844da74b6fa0d68550329682f3f997457154accef1037013637b5f9c41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cak/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cak/firefox-61.0b8.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "2a94ac3e7ef69bcc5949c1e920f55dab9e8e18c1a245763aa215b89b4bbfe1ce08bc00ef463e1edf66ad55b141335f4b4bfc0b09562639c80e9ef48181099643";
+      sha512 = "bcd41ebf0cea329de9519c8c3ff7c35dda9546e51e1b9eabfa632d12e87da98c27ad9c327a15baa0fd2761f93a2de22cd724c6c84fb75ea4c68dcdcfe9e3edc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cs/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cs/firefox-61.0b8.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "fcf60a56ef5d9bb195368f8883c5fd5b7a361e68377b1bea6a3647c392d3b818c01f17277f834e99bb55f69d9b0c64910df918504c09f3e2904c600217f2d262";
+      sha512 = "beeba005504c2675051bb87cc870ad54845665e88bd52594fe822c47a65a6949024b16877f0454af2c5027446a612f0a5b9cbbb48cbe8990157997a8f63c8006";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/cy/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cy/firefox-61.0b8.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "83e34b538d183bd1c0edbae19280537523bbf1388b30b91a5220430255e824c6d8bad2aeb1e15424857a6a826be1eff5be9af0b29a57d637c061e2cd6bcf4fb8";
+      sha512 = "168651dee334e3de02739ebda89b12d3cff0b50eae7723905843c93e5e6272c52b2e621b59044a9b909495ac8c193257b2506878eeb053ce87e02d01c81ba3e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/da/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/da/firefox-61.0b8.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "f1710159346685fa87656b8cb95855e97397e0b82d551b7321ef709cc0ab9e58afd5ccf3613b45667fe092f4fc14411b9071127b1f597fa97d5ec43457b91eeb";
+      sha512 = "2d3a5cf9d480c95e1241b3d2d2ffda70ef08767adf9c1408833aa181b74c6812a0c82bf4da529ac1e654ab1c25e18658ef412d3a3a0b51fc8a0a67f0a1eee0dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/de/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/de/firefox-61.0b8.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "0b2c26defab26023295668bcb5332258b855f1b2477cbbd284cd36c46f355921b072069e523db621de08a73bbd5d2f773a7fa4aa1d0c980cdb0c102cf7a99c74";
+      sha512 = "020aaaefa75f5a271b60b0dc3eff47448629093388bf7496f4e2a50d1a71866d3fae358bd83588a79c2ab1309a86593aa2e5f39baa29eb8ecfcba69ea8440bfd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/dsb/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/dsb/firefox-61.0b8.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "e7ec02c1a2a5246bd2411c5f277fef6f72c0f21e5bc1bc3bf0b4fc10e384fd0442c092604e46546bff9a8e33f803a6353293949f4f3310b9dd67ce79e68c5335";
+      sha512 = "fb76b0faeea87283ed087c4dbcbe740b8fa8c7c764f9768f649e10698e7dcd8bc7419c22ddfa27297c69d192c2b5c60a74ed1d60f36ea484a48e4727b4a65570";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/el/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/el/firefox-61.0b8.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "8639b3c8e63f8955b46440f9d5b1b440c90fe0be9ec730d05312bbab26e15d96e8f1695afa65ece123615bb3e03d8e808e18483fa815b575c893840075cafdcb";
+      sha512 = "33ad079eede28e786cbd7976ce46aa735ed2c41af2c629d14fbde4221291ca2ec00e8009d2941abe7c72d659776fc586bcbecf9694f0a44ef3f2f502884102bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-GB/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-GB/firefox-61.0b8.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "933be5812db81948566e2ab6216c98cbbf6f1fad32bfd9a5516f14cb2e6bd59fd1d34f1f608d94d3a832bf616d75317e03ef2fe797372cf0bbf86240cd47a414";
+      sha512 = "37bf02b68bf50ac6f77d82648b1e6b1182a154e2b315af1a746b4668783d772ba15bccadd679144bb924925b648a272ef07a9a891f7015ea15d51712b84f4c80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-US/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-US/firefox-61.0b8.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "3d1b26b26fac99cd8de9177d56aac1f94785dd22cd32f94f5aa091a4411b6c1e3fade83863ae3badd786cf568f966f469122fce332d433682b818ea43f7ece6d";
+      sha512 = "d6b245f0cfec5ac80af2a5094afed988b7b15acb04e6303dcf8d597c5f3fe5ba4abd1b047ae68c47a7cc58efbcd978a05edf760b71f8563ede83aaff4db2bbac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/en-ZA/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-ZA/firefox-61.0b8.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "795bd13c4ddaf19f4038658a333e8721d334c263ca57e887b944358d43bb3a682883fd3aa7b2e8abfaee1cad5bda3cdb3828f6f9f516c62a06f5899cba660af6";
+      sha512 = "f6e8cdf680f390ba6f60d34d4eaa2a68ac4741e6935f1f5edb0ee89b29f3f152dc23b3a0e52a80bec1815aa89ffd816d30579bfd04927c48cd3f5e242bd07c2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eo/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/eo/firefox-61.0b8.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "bab45a77e2ce6d3dd2099fe84cd29a38154209339c271d35219b36f47d5028e87af0cf848e8938b8078bd94be04ad43c6f854de929d9bea78a6c029929e6ef44";
+      sha512 = "86d37914c8d107b15840f61eae925507ed8b780afaaced5af20d8fe88bffa0213dbb897a4157830125d31d7f35b6ffafe33047043818e11a013cd0519a12b5b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-AR/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-AR/firefox-61.0b8.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "7b3f2df484031f9273b1efe6f178c48d2adea19edafd7dd97cf7d7056153730452a1711eac8b6303e069b0db063192c4678dfe6a177c046574984e47934f170c";
+      sha512 = "f63ea85239718d852d49720306cd85a4ab13be5796b9b05eba7890196703506873db271b823debe860c64e7f40c9c8fb8bb912de01c22b0745f4c1682b95c190";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-CL/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-CL/firefox-61.0b8.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "05155d10057257f05baeb3803613f98665a43bab3a0b24c3f6a0900d23bc397e30fa28cc63e94cf704e3c505f1f0e2dd73b08e2f96471cdcfdc626e7c5c702cc";
+      sha512 = "a435633c1bf0395964e6a2bcc10a2ed4ea1da3d1a4637ad62756e669d0b50374a5bcc3623bc8618bd9dc3c949f6cbbd26a09d3b6408b5eddd889e0b96efe3680";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-ES/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-ES/firefox-61.0b8.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "c041d8f22ad8aa0f4ceda16931ab1fe6121e826280112dd9d2e991cf24e77c6d333175ec449fbf26c44eda79fe80380d7b17f02cf08d0bc23c4528ad37a6a5ed";
+      sha512 = "ffed1897a097f740be3bdf504b9b9a9eb8648a833af33963d25cac859ca21eb352ad88ea2f498086c603d375f10493d1d85cba7cd390bad1e5a5900e7750c18a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/es-MX/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-MX/firefox-61.0b8.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "3a9d92db8de44c70eb4b5088e05f957ee1dcf4323bfbca4cfd1fd9e62332bd62c21e1df11792cdac4abbec39360a3297730a794464f6178fab7346a3175e1d28";
+      sha512 = "44a650253f24cc63cc07b7cc5d9e2a8d20fe51b60d983a1b4e230a2d2d3014a4d79e1615d2658c51d749a65c753ac9affdd6aef0643fee89d7ef05e469afd973";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/et/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/et/firefox-61.0b8.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "12ba06007590a385453d1de574156bbe896a092db5e25009ea5f2327969c6affff9d0960aa42edb4bc087d9477fc4160f3ff579b032de4e395410530154bc737";
+      sha512 = "b01e85e1f84058a54ce828f5d4075e7c44f128e70f72afd5f505031d7b5ca5c7b7fee0bb31f1a40206b45fc28afb4ffde4fbdc003b226639d92103b656d94e43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/eu/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/eu/firefox-61.0b8.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "8e7c4e62be76d105ccc2748bf4b017f7bdd0f646ba17ad11e7c1cb14ac2aa7d612bd2f9cd39988624ff42fff57f93d27b9e44a31f8798aab54c1ec55ec027236";
+      sha512 = "57361375d288954a7a63f6ea3410213576f1f7038b0f2b8d25061497240103cf7cfc9eeb2ff9c1b32aee693b2841fae5d66f52ad74065416e51985c9a83cb7cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fa/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fa/firefox-61.0b8.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "fbb18fb347ac5319fa54366c86de16c615be994a7d3c179dbdb84c0cf349d53b5a9f850779a5c0d2fb4f58e14d2e18089d7856aecbd62c1cfb57382623a67612";
+      sha512 = "a3a1ea34d0c0c26345cf23ca1c1c6937f78691d29fc583a7daadd93c84820aa2f34fd8f888b7f20aa7b8def5d48bcdd0fb81ddaca29be37cb351b9f2756e1465";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ff/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ff/firefox-61.0b8.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "246b9a718ddd70ba11fad500a0613f2b4feb62c7d6b483fef0715a0830ec09c2fc2063b16f2c1413b74dd0f57a1a870d9766e3740aad06bb131f1d610adf6269";
+      sha512 = "f661999fec94fa4c7290adfdc82ae7ac8b955fe006e38806bd5d7681372831dc6e5190fb41c37517799ce284c403c61218f54875bc035c098caf4a92e2d5627c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fi/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fi/firefox-61.0b8.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "d0d694f4ba0562bf0ac990ef204c3d517a0e7edc9d3f119040e64c48fa6cf54a0ca945e681b8d5e4d89c1d3d2b9b895a324e85f0368e1bcee4d66a85d22c3913";
+      sha512 = "3bb9799c8351f00d3dc9ba258dd5f13eb7ffb71552e17c5244c50a3e2d363e742572f676ed538d16d7d12b2a477382d666c428b3f1be5d450be7033e0a926751";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fr/firefox-61.0b8.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "7dcd9e91b7227361df55a6e29f16af72dca0118e50c563c7ad2ef829aa016e1bdc7b89ec65917f572d8e226a0e7036d9642d0dcce86d5c15d2cecfd19fc0ad8c";
+      sha512 = "38e2c97830eb161a894664e6480434994afdc9c9e8517477ef1e9feceed88e991a3786426deb03674ce30beb183956b66a8152a046b1ca94a9df153e17f73c4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/fy-NL/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fy-NL/firefox-61.0b8.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "c157abe8b5d69ae2777cf39fde9dee27eb244df6db00c5c56afe7d65ec1d3c78a7b4df0f6e6b681be5d741d61c05a9d9c56717716a87d914543bc0b8498cca0e";
+      sha512 = "b67993ce30d5eb41443aec2101ba5f88be0bcd8f55a44049e8f264f895219a8d4af18644a30855b59f5c6a436b57b5159d2fbfbd4b8c0969a78fb392a202bd84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ga-IE/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ga-IE/firefox-61.0b8.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "70465733dbed4ec8977fac3ecf37c96e8a4c775537dc413559b1e9a1f2038ae5788b3d9b3bc7ab57b39ac1c1aa30f13f5e90b877228cf02c1670bb378b4014b1";
+      sha512 = "8783fd8cc23af2721cbf72572ed77c0e4916d5942819c003836c27a226a393c585b992fd53e7fce2c52ff89f002f6da16d501b33ff1537a7189aaa91645972cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gd/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gd/firefox-61.0b8.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "6a537b71d0758d25e97403363d0fdc3e7d311cd2a4ea818bbeaffb49a302e788f1727999c49ac39c6a242c31f5ab8ecdbe4111d28ff62954bd17e991a285281d";
+      sha512 = "2c7f9cb7f246ba38cc8c2da608d82d674296d8d5f2e168668466c85ba89e42322c213df381afd9bc2181d120de03fcd8118510d77cff7a54f4009c8fc3a10545";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gl/firefox-61.0b8.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "0f427ba0afe9b1a09b8947f0ee0de89c675dab2e5132f37ede9159f41d474d386127a1f1967d77f8032d1b48222a8cc5bf9782fcd1bdb3f635154d614a3a69e0";
+      sha512 = "e2af1b4a6cdb8c03fa228a6311c51a12af0d419cb044393d1494183d850675357343d68b09dfe6382c782bc2c5aeda234607563c74b9175fa6240ea030a1a71a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gn/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gn/firefox-61.0b8.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "8fac0c28a7470ee83d559feebccf025f1a4f4802c92baf7fcaa87d4341bb7241727dadd8d715d23c4896e7161a9f6ba708a8c72296cd86281b8c0ed47628230b";
+      sha512 = "da338d0df7bdffdf1fee30f5b1aa240c4fa88c5f41451c7120cefcefbc20f616089c52b05423e7dc4c0f67288163c07617b21980f10e4d0b45d7a96fef87ee2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/gu-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gu-IN/firefox-61.0b8.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "5cde88175b0cfc5d1332b7b185257d9558c3ff01d8e9d91180119116d14992be94bc29ad5a4f907dab0f8027720b917a01e0e924018c74d29ff9d25c3e9f3ecc";
+      sha512 = "894ca0443b5a67970ffa7ccbb44012cdabe3580b917f81027018648d0b9f3faeeb165975333724434e195b2f606e4f24c9f5fdbf7034f07aa123e5abb76682a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/he/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/he/firefox-61.0b8.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "f418fe4e55c89e75d243c85471b3f49fcac3f910c5d4eaa6b9828b201e886d931a18018906a37df9ab23e61af3f90cb333098fddcad0da3b0473c14d716fab18";
+      sha512 = "eca00e09083766056fa725f74687b5b823432d71498e57bd221ab650fa1b3c0609dc4e141e6ec9a0346f904c9f731c706cfdae12fb1d5d742ca1b65514dcd1e7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hi-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hi-IN/firefox-61.0b8.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "2f3aceb53c5bded3e826cfcd9fde465e420366fb0cfa6f49c8f8e614823d3ed008b69544873ff86e3b6eca4be961b0e1c7299d02d39df0ceb51eee3f7803e93f";
+      sha512 = "0cc000001c85e3a84e05cf90c92008fb9da850d74c7f421ff37ec1f7d0bd78669a6db7b6f593f0b376e953229f35bc0c588b8027c79b6bd973ee4523cc9bcd5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hr/firefox-61.0b8.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "f6b36def280b0541be3920e05649b488cbf3d4f55541a160373fb3a4d5b6a7f3f05fbd1d5730c479c690fbb44f0ea5bbc1ac3948f16d0e8e3f54352a12fd3e1a";
+      sha512 = "a7a1aec5d8f7d92ce95d7ef12d16633905a68312d45e5e2a755e481b7ed4894e8778a82bc2b91daf700cdd36b574fdc275b3c7b1e49096f173d0ee7ef24175bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hsb/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hsb/firefox-61.0b8.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "ffbf547964ac4abb1bfaf563a42f5828227b37fd46686318a7ed73079af30454aa3a3972ced2e887cb1d95ff048b0473ca2a210084179bf44c47a3b394c4adc9";
+      sha512 = "e28384a0bda3a053f639fce02dd0dd54ad00be0f313f28b6d87f01092d626e06a18dd1ada1a8203cae9877acb04a5e855127f47132cd32c17a043cb1c009930a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hu/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hu/firefox-61.0b8.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "d3c26b9a91cab7dc1a0b4caaf87deac657e05b8164feb5b167b2af7b0591db99a5310bf3d4ad90687d5761ae36ef00ccba8da6dc3e2e6f5be867da69bcd9d0e4";
+      sha512 = "7170b290b408a31ef30303c2cc628a3ddd33a16165eb40bc776fc7c9d235f00edc47f2ed3c3241a03e45b532c57969036c40ca4c4d8983638f30721c3b69b1c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/hy-AM/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hy-AM/firefox-61.0b8.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "c7a8aa830cb8a4f2eb69cac3c18534c03e2162f16b999d21b6b17c7b815391c26c7561ef4f8509a0cefb6fc22647669897c30e0289b1f91c73927b80a0d5ed73";
+      sha512 = "43212bf7aa32ab9b1a54d09c501ea1a93e5bcd8e2947c77130e55195d93fb299bee8ca675aff17baa6fb5fa0ce0223eec9ac8416e2123d658ecd672bd95158ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ia/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ia/firefox-61.0b8.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "8aff68cff9d430b0c7d25040ad8059e6c80f058867e04eef5390481758c4fc6a840e194edc4bb57b54dd8e9d07b26c17fba016a773b48f7f771c24a1bbb3b593";
+      sha512 = "7fa2dc007c14de2079fb79ce1d290eb36ce101857724e85570f54c47c23073bfa6dd27ab6ec72bf22d9369ee0c73706bec5bc92b67c5d5de179867d6c6530ff6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/id/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/id/firefox-61.0b8.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "586adc6942c53997f6c6bb44263a8aa6089c4e9fbd9b887e4694ffcb91c478d44c3972f357d014a8f10b7cf23a85831f75224be6696bf7cd4dc9bb66ec01fd48";
+      sha512 = "cef93689dac12efdf6e6098ba942a9b345bd273ea1ecfea5132c4d654d7a170afb833c7cef7ef4d52a7643dc9dba15a72fa1a51d69ded365e8b7a0f71e21ced7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/is/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/is/firefox-61.0b8.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "ab93b73c7cfdee88d4d6d72d0c2d34d88705c50d41a29ceef32360d00e4a0a6de97fe33ee2406733ec233db22d4be5502987c8b80c67e588e1b9a3780b707d3a";
+      sha512 = "2ff1a81d452af6b038c3170b70fb66d7aabf8440a8ad66136afc84d6b20edda63202de57e69d13b5f60d21860f11da757a74733e921641d8b87cfdc7275c478c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/it/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/it/firefox-61.0b8.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "9e981a209491738f86c33f6a7dc8b4f9efd31fee9e89f2b7126c9c160a5304c48e2be026946dcf684db68c1728e3715994d665fe5078e7638c8a93a30ef86165";
+      sha512 = "28a74e3d6b3f75c6ea60a71251adcfcadb1ff53f68b984290d5e207463f01ef00069242de2df9c85f459527fd5d2fca1d6d371c9371fff2c4f34a209bef5605b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ja/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ja/firefox-61.0b8.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "f3fd18886957c4d8836cf45ddeb7d23626bcdc28992a1b9cbee941de7ed6aa8489187e98a2b7a2e675b8f40e5d3ad6508f8bcc8b910cfc8b41f9cf74a6921857";
+      sha512 = "8aa2eb75b8475273f9ec7e0ff3d3f69c79a85c24c87cf391af38c1d2a433ffdd7c905e84de1a2832cb7f69ff106ab85219b63193aab470dcc0e60c53bb359c70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ka/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ka/firefox-61.0b8.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "6b03ab97981e13a6bc222f88e5a3b53051b4549d6ab0c36a39689a8448eeb20cfd5b9d401e6bfb6a99b1f85f0e91f98d19ec672c1ef2965ba5a35711f9280266";
+      sha512 = "1ad33a7718b842b3a5a47ddc3c24012ced28d4c5d585c2811bc0fc5178205e710f3bd7ed64e00072a22bb17c01281e2bb0d58c16ae0e643990d62b9804a03905";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kab/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kab/firefox-61.0b8.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "03611d923646638cf4109fea5080a8c874e4b884bf124a0da4b6739bd863b40dd32b18b2845f8fe61cbeb280ab2e82f68d1f7532af4c92b8dacea5e92d62f525";
+      sha512 = "17447df47d98cdda66be6e337524e0ea2c8cf1c5de032fa1017c812ed2fee5c38f0a65431f5c957d334ca00ec840028a725abb2935c31bf769fc8ae05095fd01";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kk/firefox-61.0b8.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f7428e4d06a76b7b3e134acde8e9caaff2db336e7093776fa2692d923d427e667c78df3a09222835248b029b05d13956b61170bff310e7444f0c3572440a1d6d";
+      sha512 = "7722a64125fdd13dd2bd7de7fd0b31a6bc2ae021f5b5d147adac90773f4c1b7c44548c402af6283a2ab12bc53796980a435fefb688a9cea90dc119fb2d61e543";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/km/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/km/firefox-61.0b8.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "e828d170628f1573c6d4029a9c8708aadd1846aaa76fc5afc50c44792235c060ff1984800de78ab7875a0cd821f53adbca419864871160d489e64f77d2ca513f";
+      sha512 = "d30c5bc08420a80f199ab2dee4644f7a7e5cccef4a7c0521b4b254544ef9f1f3edc9c3a2783d37d370e03b7c1b9b6e2af9a17f0fbf75592b2e8cb82adaeeb773";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/kn/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kn/firefox-61.0b8.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "94c00340adc8d85c52db3dceb604f5ac4e686b274f6bd130350d6c1c2d48fde792dac6feff1ae19f46f5a757280f0f86a352434e7f8066fcbacfd9077a831cf5";
+      sha512 = "389d1b3ea9e7ee0941a8842cb93d2bd69580b6aa3203f14e8ec92cb93f2b44b33e2aa00c5bd6adb359bd2cac91a38c6d7e4e91b2179b91d77c71c3dde4f1fb2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ko/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ko/firefox-61.0b8.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "508e1a7aa0dd250c1f50ca8c1a05c02c488916e6288d5d45345c4309a96bff4696f1f365bb88cace1465e8fc97073e58c3a5be69beb7e03b47a178abdb416de9";
+      sha512 = "9214c37f7d13a6fd84329e25a8e19f5324c224ee4fc65b20a12bb14f37c9cd6f421fa7a78cdfc22bc491f0eeeaf3f215e5399098b3ee22b83330e3424d750512";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lij/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lij/firefox-61.0b8.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "6929a0a72b082a47e20dc0ce41a6b982df03f60469f3f31499921c0b293c755869b978e224e90e4f3a75c41e88a635bd231236d72fda2fe50cf0f6b314178c82";
+      sha512 = "12b419b54ca65bee3f61193c7add6cbfe0b19a037834f4bcdb432be8969383572503bb8043b41771e9c33aa25dc843d58cc22aea45b8d695115d9212749cbb4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lt/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lt/firefox-61.0b8.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "c1363abd40a5e76ff383c32f9dd58931b692c1c7582cd1a4d21fddf95203c0a34588075e4d420fa39759844b9c0bfb9916af06ce260cceeaa2f0f1efff37b2d7";
+      sha512 = "e5d73cf833fb612a269a843b10da78bd8cfc62e92bfafe2572c8f30b5e167b5a5c36a6edb79c28ccaa13bf00f520e193f1e953e61e18ed96f4dab43e8261900f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/lv/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lv/firefox-61.0b8.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "95d2e14a1b77f5a3ca6d113ea5cad2a7fc4a0a8e21c7c40162198614637c0844547261a2f14242fda2cd9053391a78f3e587f21874b798e8fa522bc71d62816a";
+      sha512 = "96279db6cc91c8b150aff4f5ef15e70fcb41c0412ae63e33b3456fe19e8080ddeb7af03314feac27b444c9d06329370b171ee3001b9616f0a96ce735e2369871";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mai/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mai/firefox-61.0b8.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "75e8cacd919ea8721102f6301e3b855d398e9ea01c516fca6eb7e94e24cd2ceaa289b3a6ca4afdc658c70dc46e2ec9b0bcf3086b70ce857adf7f0fec31996d36";
+      sha512 = "d1887e22742ab27ab5d023a7f1812b96bc3f505e7f6b9d7fb21f9ef57be105912f1c4cbe5688c16824c37876f391a77d22cf4439ef81988fd74e67fdcc5cbeff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mk/firefox-61.0b8.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "aa48016df099652eef14abf8cc774cd83c3c839d9fb47a6556ac86a4bef55d80855ff2aab810841e9c2ef86c47b968f57a27e0cd7369ec30b21bf29b423a6a02";
+      sha512 = "010a71764b2afa5cf9d0f1d9108733505ab585800f13d7c10bec4f9f3578922fbf1a26741e376904c1febf03dbcffc17658619c8bf22c77d9476777bd71dde53";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ml/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ml/firefox-61.0b8.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "f40e4e169272764a55332f868e9a6b19ef54d04ff312827a0cf0c3792a2e5c0264f62b9cfb5939f0c43775811e350a4913387e1c4899293b7311a2b1c505dee3";
+      sha512 = "6622a6fb8e86669cd5cced64bef601f49f75cfd45f107371df03eba124288184712e9f609d549ae34734bd61b2b10376f3b1a7524b7baf60e3223634ff3c53a6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/mr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mr/firefox-61.0b8.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "4a8ba1adbfbf88332adb40336b986a42f89e4789a8e2da2ae485041788bbbcbca56d971de43ae640022647a3d30760b4b5e072afafa74df0ca90449aa03d93e5";
+      sha512 = "a0251d67deae2bf3ea1382bbe6e08442152dc66687925f04e5c548d04eaf6258a954b349dd394ac10d4bc945de98c09937cb2434b328e07b7d55da51a2434d4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ms/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ms/firefox-61.0b8.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "2ebf6eba002a877ec2d3a5928a46d6b39d5acf10fcf4c0238695e821bb0e0ca2ffa7230ba3bd910ad50f429712f4bb7ddf8bfa365d23034919d3a8e4c19188fc";
+      sha512 = "327cb543c9a065e874984968955f542cc834b569a7b5c1aa34a71ece9307aaed4c7b4b71fbafd4aea6de19265b61c0b5ac9a688981c21087414b9c2b26631f76";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/my/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/my/firefox-61.0b8.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "073224f374af0b25249f30112edf86b32fd2612b571b064ae4668f2739cbc02a33df0b5a459048ae0ba2d784035b2309671b61a5a894857edd2ef6fb5181b120";
+      sha512 = "bbd0eff3ba746da8e547b1b8eca26ab6f75f7371ba532d265eeddab90ae5386b1fcec7e28bbd51e30ce10b372ee0f045eb018809d9c06de070bdcd1a104d77bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nb-NO/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nb-NO/firefox-61.0b8.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "b654a0ebe06c63d9324d3821bdbcb8517a50274c3adf6e5f24ffc334649eaf6583774af15bb485f115c129c0ab5c66b31a17cbef97bc9b4a65c1ad09a333df58";
+      sha512 = "cd19b1a379423a8f980ce8b8c2d7512a6f2ef513df264d8412c03a779a87e81be253a93ac536bba2284ed9491e03354d77499e13d25f26b3fc1e264aad3b2fe4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ne-NP/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ne-NP/firefox-61.0b8.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "43f18c506cb0964f860c12b16722f2c53a0312d007f00c4d248ba3babaa9bc1363758bea6b6a7207ffe477cb23e7f7c151a1578a49779634b2f8d208bcb97e6a";
+      sha512 = "95837d9c588782ab23244bacaf84867dee0a0dffe977e650d231697410f4fda5d17bf15c1d104b0ffde85cda6cbe500c02ef06d6dc8a313ff9b4078c02b40913";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nl/firefox-61.0b8.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "f40697b407b06402abb256d17322337b3ceaed07967d88f65a4e560090a0077a02fd96fc06c5937b8404a0d96353cf447ac5cc3a73c655224f65ea9b21364915";
+      sha512 = "812350aa3fce5908314b850858117a6744118ebe4a7acb30f6bb0b433cf6597020dc1011e3b0e0c0ae36e307d18c32401bf2391f7aba027eac189f545876b9c6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/nn-NO/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nn-NO/firefox-61.0b8.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "00930c704aa3ed6910e6f0b03034706fceb7ceb6ef5c46b8eb2c8af4acf1bca331b0432f3b18419f715b4ba862691543e5d539ac08772090b8d1d15868854087";
+      sha512 = "34c5af7ae0f4658dc61e32e1a1119e5274930e2d14d8444354c69f30ad9ed418f785c18f8c29d36a736d84df8206536bcc66f4e0de71dadf5eda45c1d8804900";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/oc/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/oc/firefox-61.0b8.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "baacd03d232c645a06773dfcaeea6597672bc619eaccf5bb2276ab66737264c26c050a7d8f8f6fd8a69b3ee9460d0fa3d8308967af22cd1a4ae648a9f07a886e";
+      sha512 = "f94347638aed6dc1a922f5d317123ecd43f3fd2ea90733e306b3294020d6d342cf405c2bcf36e3fdde029008eff2d89362d3391984494c4b46c6e22d1167e5f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/or/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/or/firefox-61.0b8.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "b27205d604a460dd45bc4c134f76f396fa9a9cae04da1cef936aa0a75fe3ecb683b75c88735c468660d8584a2cd0b00f867a8411e20465d03e0ce3a57b2d9ed3";
+      sha512 = "9ac83ee0f4ae3575735b352565e77f1679b42beb0180fd130e1e9ff9a08f5dc16bf22cdea964c7b301943f98246a04bb9e6ee701bbd13ac39a9918e23243ebb5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pa-IN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pa-IN/firefox-61.0b8.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "aef11773f1498d65f5a4d81f8d411bb73a89a134239826589842979528e44898a4ac8005cbbb42fc1eb56c4eb0f920e3a89aec9f27ebcf1b922b1af1b037ce92";
+      sha512 = "e790a8b0e681c0ca2e1050f10469de7d40285d1b6320de5c746d247152301f7840b0d97722217ec1c91e8b60d776469312b50b404b00060be1c12ddce66a1bd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pl/firefox-61.0b8.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a50410b04c8ecf83734ae318d1da075844b50d6bd9147bd92a7ef1e59effdfbcc6ae2c9bb6d01a03ef3a0364623c36e7ce7e78a6caec5d75a561ac1770285282";
+      sha512 = "743098c536707cbef541dc3a5ee7cefd1a6bf57ebe19bc059e459c028f95860714b5b37c086a3501ae61e7750d04da55f9f711f92b8619d8726e5b6f3c1a9112";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-BR/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pt-BR/firefox-61.0b8.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "ca09e94cd945c182e43b4e661a50f0bf462956c438c83fb180a6dec8542dafa9a46bbb531e38cae30ac5facd6e2d318eb5c74dea86c8b4002228da5124c6c38c";
+      sha512 = "a667d28a6ddf5d0d8d12435d0b9187f25a89c4432a74d75b71455b3ddad39ffaf6466028b41fbbf3b27c2eaf8fee8cc33eeb7f9d1d8d302a07ab0d17f2c55a24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/pt-PT/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pt-PT/firefox-61.0b8.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "03af81ef5b4472877ab0f5977876d4713f7a75759bf8012853429c57ac11d7d3c71390d3c899d653438df5ded9751e5a9ad15c7c7550adcaa04920d473b6bbbd";
+      sha512 = "f94fec90086a3bcafeb27b751c83cb387ebe7d3c4d526a4989995df37096605476fccdc936b98d60ef3aa213df908cc9bc63878888354b54cd591ac3f9aed11a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/rm/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/rm/firefox-61.0b8.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "d6d2ce2c896cc415b84a06a9abb8727bf5e1c71469f2e1d43ef98f4ad5f854ea05b5b90505074dfcd3176663bfd50dd64b435d5aea061f5be9e6c9fdc4f8ddd9";
+      sha512 = "a18afe847507286caac299c2ed943e0c98159a6492c1c76e157bd82565831b2ae0611548f441a2ca6fcf56aad77db2c6147c4fe115d4a64fed6bb580c5f4fdf1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ro/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ro/firefox-61.0b8.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9593b5d051b3059b98916ad8fa2d49fd436d76270d2f3542e33d58fd9f9a53fe7706679224cd34e9ceb519c5f31593c390f8aecf055302d1edfaceb4ac8673a8";
+      sha512 = "71de8c374087f5bcb2a39e4ff602369996e7cd7f57eb6c0ed10889a69f3fdab87205876680c3511947a4e4a4b3cff8f85f75bef10f646360cb739bd3ea9d2e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ru/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ru/firefox-61.0b8.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "db8eb5f0203eae6d21717d52d879c229edb5ada4cddfbe60909914dde9f3e8060e85a04ff865e8f1fdcf77035299d8003abc8e380cf02f41d4c45013c0652dd9";
+      sha512 = "269bf1871a8b70771901dfc21dcdb073af5a11f7df9b512995bfea91be6d8a27660b1c6e18a7b952f3b6358e7ed2e054e7111eadfdda074cc103bb7f05fcccfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/si/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/si/firefox-61.0b8.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "59fbd221d80e9ecac9021806ff977d988ff5487e7e0f51bf89e91d0ca20d55c2ab492dab0f68c47d8502a0323004a35ed027fb5bdf7f781ee72b64f4b796c473";
+      sha512 = "01fc1c359088029645a2e37ccb40c5638d7a11be97618184ef1ac1b0f67249af24dd84fe4b8c00e19fa2436dcd9defcb1ef26f003b44a0bc039078f26447cc5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sk/firefox-61.0b8.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "ec20f49c5f208938ba94aa0a03fcf6b85b7d987fd05882f4a473a7a7f776254d5264841bd718515e1e35fc20e69e46964f637d559e39a38567749f9b3d4db3d4";
+      sha512 = "c4cecec4ef1d90bcfdf2c1da97b02864f21c52c23a7dbdc1ad5f10ea8010a8540c98847a1b7155c88c22200bbac51d1802e7fedb21f379ce16b34548c7b063a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sl/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sl/firefox-61.0b8.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "6aa15d62fb495464518761add56f9f373059ff0029a7bd18115148dd23c9e88c1e9c1b3a23be2df2bd33380856888f58a7c39943453cb7d060fc5cd5619258be";
+      sha512 = "a3ab6bd25bdc33bcd062b0ae3bc50808e1a2dd1728c3f9872b071cbf0d352746718e743a2488503a6981a3c3ff48d2bdf0fe0001bd56cb6b90e675067fd555e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/son/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/son/firefox-61.0b8.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "e0c11fadff083ce242ced4d76da9e6187c621956ac77524733394820ffe720e3f9470fd4f3485dace497acc1ba04a07eacf9f0c115d081f8a9b107f4ce1f4568";
+      sha512 = "a67a2d0260e3f83750d00d9fdbc787a12663bb4c574e263cef065b590fee14fabe4e0ee51012f3c434f1ce27f094c6752a5811f71026bd1f1c3dc3c02adfab7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sq/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sq/firefox-61.0b8.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "9bbe79a5d89912a4326af31b7c66ddff443e203835ed306b8cf2f409d08f9199e1f588892f349d1578810a618fa8692323d5ecdb2c987bfd263f3f4b18237f01";
+      sha512 = "ab847007a0b3f4d2a7f6455970a12bb1c613f3b9fc1904094e45531de97a559b7e3dafa99319acd2953eb9bd7779b2e6b3a3371d5bb2275fbd58c7545c5ddcb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sr/firefox-61.0b8.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "6ce14b5c4f7d9c82ae6b62e08508cfd4f619800c59c59290943e1c66369bcf87e05029441f6f4141311aedf9d13da000763258da67e54e5748efc0b07a76deaa";
+      sha512 = "65c574255e33141c39b0b17600a7dd957b0d35075d167dc659cce449b0b2c72cf3afb116ddb71ffb20404dd80e2af0db3a5722706f22a62d5cabb5f7e48a1ccf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/sv-SE/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sv-SE/firefox-61.0b8.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "4c457ddf3cb1d1fcf35fc27f405ea5bc9154447e24ad95d16f768768ebdc800f6e7b164b0366a05d2d9c2810a8ada43eae58c5e5e9fea033fa67ad3a306aa9f0";
+      sha512 = "8277dffec3048999fc588c56490306c9da2891d91fe30c49c21a3cf958bc6528243067d02eee9aeb05800cdd0fb98739754bcc6811c8d67f2175f5cb2b3d47ec";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ta/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ta/firefox-61.0b8.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "ba010386a6bfad89da7bde1cad05b88e26abe485e664a13c92bd97d247fc481188d44da1d20053a157df1024d658edb2952d7d8b1fbc6821e0e8e4d0a91388d4";
+      sha512 = "13656b88fe3f49c11fb7ed8815b8b0e9782bb8ee0d55ea18ba43e3a4254d5a8b5dbff358f2560df38af6b2d05a6c9738296c38ade5d871c47f02fdeca24f7a8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/te/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/te/firefox-61.0b8.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "0bf97c198c26cfe13d95f8e7b5f6faa7dacff5045c1b030b5ddf3916936965ec47d99e2743e0e3c7dfa83fff1a03f588fe30632c13d25ed7a3d417982634403a";
+      sha512 = "55f6793a2f885a7a23235e7b8e9f3ffdfb84318f1e4d19e3532f23530b90c199b0595e2085ff6012c36658aabbf05f0a0cccbe8fdf3f7a4503b781a19eea80fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/th/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/th/firefox-61.0b8.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "c6a229f46eeb3623dc94394b2110b1e8f2cc854f82e87316aeaa01dd409267fece25de74202df41e50ed34a89a75284b5a32e9322ccf771bbc38cda4fd7b8f66";
+      sha512 = "236de626cf8c423b2fb6fc357956822426621effa6cc5cc2910c59d63d7e2a3812b40dbc1d198a4fefcef6bf9d48086c1407ddbc4689d905d07b16aac5ad8811";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/tr/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/tr/firefox-61.0b8.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "72559e85a3be28e3f39daf4a2464c9ecc48f8a6c911b0db4183b6b5e897c25a639a30c11b71446799c4eea50a09f3f02031144a930b37b7ea9655e0235b2981e";
+      sha512 = "82362cbbc0be52b2e35253637b3fdce21ecc0736770a04e9b19f1d99c18e185fd6e84820c2d086eb7f53bd6852c4355451da4fc8d08b559bd4630bdfa87847ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uk/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/uk/firefox-61.0b8.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "6f9482aab13ffc83e6efc9834369629c21ce60aebaca5a8e8935538ced4270ecafb3b88f46dee3a5be3f13b556702d58092e73063349534dbf2279a91a096aab";
+      sha512 = "dd8a9b74437371f7bf32a71056956d9f38d103c53f727b2c8ef8939d778d32e7b2e6f5e74f76b69db0bb41a7853aedcdd3402dc93f0e6d5a69671abef248ef16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/ur/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ur/firefox-61.0b8.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "541eb087462b501256886853f194c1078942bdf31339b453f9d8ae058902882c7aeba6c67157161cd6ffefeeb3791a4a63b15ebcbf813ba5c00f4f4311ccf008";
+      sha512 = "ccd0ce9840db659afd1364c0284e426cfd3844de28ab06da474688423aed0159e07c831e620b3743b82f868b1d273ca561e906680b90683076f9279adc292659";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/uz/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/uz/firefox-61.0b8.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "6a9112d88bc51818c06dde6643aaf606831abd00812da9e372415784eb3fbb0ed77914f60ddf1e2cb0f95b2379378911abdccc4f229ad5fafac98c81be60dd13";
+      sha512 = "6128afe781edc53e4407f3039b84947774e08d72f9734e209a7ad27200aeb01696d6453df9f6044f6af701f84ca479a17f8d43f955102d431c069f409045320c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/vi/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/vi/firefox-61.0b8.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "ff1742130854a5d61ddb6a22c8b61eb1bb71995f8f9d0f2ddbf032edf0e7a70cf4e64690e7d4ca05b1fe42121ca8b389244d492234428b517771afb1a79ac803";
+      sha512 = "fc7b6e37518e0c7350f3871a0980f2ad4b8fcc89164f425b2f8666f73290330fb2e98fba64e410b2f0e8c14207b621db08a62dac6817e7288374f46a29d5eb9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/xh/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/xh/firefox-61.0b8.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "07d1c523173fc4eaa47bc6a22de40e73849960b9f8f92139c1ca95e3e35a1b852b69eb698912e0e2e4ff4e265801779a027336ef788e3bd93a7bc49fc831c577";
+      sha512 = "28b6d0ad1335a39d7a742d4592c7ece02412ebe094180d80e7644f9a7c00013dc0e436227e2c58288e2a2d78a4ec092e450e44c21f9465eca0aa5210a0863423";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-CN/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/zh-CN/firefox-61.0b8.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "bbfd0b2a751f02993fc82f1be83ed6ed1a1cc054774128423787341faa059ee1f7d402741f78d8076eb5012bef656037bbebeea0775284cd4691b2fc3053e476";
+      sha512 = "31970227a01282d9a5381d988cf276ea1ddefba5fdf97e065e371fe4394eaaa0f092697fbdfd9bd6d8a83e538c66bfbc0b6b8e2733d5efc881ade74ee5b4526d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b6/linux-i686/zh-TW/firefox-61.0b6.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/zh-TW/firefox-61.0b8.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "925de39349b7a4bec721bf494fa8af8252fd923b0976bc1a99869c5bc5b083ef09b8a3116d79aaa2ff3bace9b0df26ed455ea385c6853e0ac1f4a03ce257d51e";
+      sha512 = "4fd5524002e224c6a2601af7f7989647b4cdb7c9bb99680675f5af45508b2555d3317d4d933cc1917d54572fa4571405490c6af1649bf696bacdd4188ead7bff";
     }
     ];
 }

From 480b9524d82015a5e7f376a0494ab52aa28d2778 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 26 May 2018 13:13:21 +0800
Subject: [PATCH 2534/3370] nodejs-6_x: 6.14.1 -> 6.14.2

---
 pkgs/development/web/nodejs/v6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v6.nix b/pkgs/development/web/nodejs/v6.nix
index 6dd9dd6f8e1a..d648cf957d18 100644
--- a/pkgs/development/web/nodejs/v6.nix
+++ b/pkgs/development/web/nodejs/v6.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "6.14.1";
-    sha256 = "1hxyasy42ih9brgp37n9j85s5vwir3g32k5i3j0vx2kizy4xlphi";
+    version = "6.14.2";
+    sha256 = "1lb2dpzamrag645l47gb33qqx8ppjimkb8gkczzwd5jymnr399dk";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./no-xcodebuild.patch ];
   }

From 092554e718ee8c5e96a5646692ce8efc6e25800b Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 26 May 2018 13:13:47 +0800
Subject: [PATCH 2535/3370] nodejs-8_x: 8.11.1 -> 8.11.2

---
 pkgs/development/web/nodejs/v8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix
index 942c6cc3fd83..5f81842ca232 100644
--- a/pkgs/development/web/nodejs/v8.nix
+++ b/pkgs/development/web/nodejs/v8.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "8.11.1";
-    sha256 = "12kmsh5cl72dq5hzik1cczn2n5crbfqqd1xmrzqgryipx98yp9j0";
+    version = "8.11.2";
+    sha256 = "0ya9iz47d7ld4zb0aqym9cpxah0pzhsllhh7xmmmf28q7304d6ak";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
   }

From df54c25f5a90420a007d1b668fc657595b859bd7 Mon Sep 17 00:00:00 2001
From: Johan Thomsen <jth@dbc.dk>
Date: Sat, 26 May 2018 11:19:12 +0200
Subject: [PATCH 2536/3370] Kubernetes: - Added information regarding breaking
 changes to release note for 18.09 - Changed golang version comment in
 kubernetes package - Added @johanot to maintainers list

---
 maintainers/maintainer-list.nix                      |  5 +++++
 nixos/doc/manual/release-notes/rl-1809.xml           | 12 ++++++++++++
 .../networking/cluster/kubernetes/default.nix        |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f001ba6be8df..92a4a6e8b412 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1864,6 +1864,11 @@
     email = "me@joelt.io";
     name = "Joel Taylor";
   };
+  johanot = {
+    email = "write@ownrisk.dk";
+    github = "johanot";
+    name = "Johan Thomsen";
+  };
   johbo = {
     email = "johannes@bornhold.name";
     github = "johbo";
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 0ae630945db2..35dc69515ffd 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -241,6 +241,18 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      <literal>networking.networkmanager.dns</literal> instead.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The option <varname>services.kubernetes.apiserver.admissionControl</varname>
+     was renamed to <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     Recommented way to access the Kubernetes Dashboard is with HTTPS (TLS)
+     Therefore; public service port for the dashboard has changed to 443 (container port 8443) and scheme to https.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix
index 68f281bf0047..65fd22cdf47a 100644
--- a/pkgs/applications/networking/cluster/kubernetes/default.nix
+++ b/pkgs/applications/networking/cluster/kubernetes/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     sha256 = "1la9cdf5a67kg72xn4bn5mib1caiv5vxsjmnxqsmx0m7vhbv5i4n";
   };
 
-  # go > 1.10 should be fixed by https://github.com/kubernetes/kubernetes/pull/60597
+  # Build using golang v1.9 in accordance with https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.10.md#external-dependencies
   buildInputs = [ removeReferencesTo makeWrapper which go_1_9 rsync go-bindata ];
 
   outputs = ["out" "man" "pause"];
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     description = "Production-Grade Container Scheduling and Management";
     license = licenses.asl20;
     homepage = https://kubernetes.io;
-    maintainers = with maintainers; [offline];
+    maintainers = with maintainers; [johanot offline];
     platforms = platforms.unix;
   };
 }

From 10ee395e0f304d7240fb9b7e2037eabe00ce1310 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 26 May 2018 11:28:53 +0200
Subject: [PATCH 2537/3370] python-osc: 0.159.0-4 -> 0.162.0-55

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ea969f142b8..fdd0b3564669 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9102,13 +9102,13 @@ in {
   });
 
   osc = buildPythonPackage {
-    name = "osc-0.159.0-4-g2d44589";
+    name = "osc-0.162.0-55-gb730f88";
     disabled = isPy3k;
     src = pkgs.fetchFromGitHub {
       owner = "openSUSE";
       repo = "osc";
-      rev = "2d44589886845af7da911aaec9403344e396cd91";
-      sha256 = "0s8p7gkp64w6r5rnxpbvl2dgb5p85kq2skcqm6qxn5ddadhw2sfz";
+      rev = "b730f880cfe85a8547f569355a21706f27ebfa78";
+      sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh";
     };
     buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
     propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];

From 66aed8fd3825fa3176d29e62d7d1bb7d4429858f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sat, 26 May 2018 11:14:17 +0200
Subject: [PATCH 2538/3370] tdesktopPackages.preview: 1.2.22 -> 1.2.23

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 0eef45973ff9..a8cfcfab5f9f 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.22";
-    sha256Hash = "0kni4gb6z1c22bhx8z27q4934bg3dngk69xcwykbidm32ijmmsc5";
+    version = "1.2.23";
+    sha256Hash = "1ky2qg2ayqrf4r9v1sm70gssk39f3xwrq92s050g9hpr9bkvjkg8";
   });
 }

From 6ed5195ba9fd40d98cff75f1f2204405448a13e0 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Thu, 17 May 2018 18:51:11 -0500
Subject: [PATCH 2539/3370] easyjson: init at git-2018-03-23

---
 pkgs/development/tools/easyjson/default.nix | 26 +++++++++++++++++++++
 pkgs/development/tools/easyjson/deps.nix    |  3 +++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/tools/easyjson/default.nix
 create mode 100644 pkgs/development/tools/easyjson/deps.nix

diff --git a/pkgs/development/tools/easyjson/default.nix b/pkgs/development/tools/easyjson/default.nix
new file mode 100644
index 000000000000..9277ebe363fb
--- /dev/null
+++ b/pkgs/development/tools/easyjson/default.nix
@@ -0,0 +1,26 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "easyjson-unstable-${version}";
+  version = "2018-03-23";
+  rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578";
+
+  goPackagePath = "github.com/mailru/easyjson";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mailru/easyjson";
+    sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mailru/easyjson";
+    description = "Fast JSON serializer for golang";
+    license = licenses.mit;
+    maintainers = with maintainers; [ chiiruno ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/easyjson/deps.nix b/pkgs/development/tools/easyjson/deps.nix
new file mode 100644
index 000000000000..3ba1d12a8048
--- /dev/null
+++ b/pkgs/development/tools/easyjson/deps.nix
@@ -0,0 +1,3 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 807f7b03ce6c..1201dc6016e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13937,6 +13937,8 @@ with pkgs;
 
   dep = callPackage ../development/tools/dep { };
 
+  easyjson = callPackage ../development/tools/easyjson { };
+
   go-bindata = callPackage ../development/tools/go-bindata { };
 
   go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { };

From c989dd512e92238dc14405d85b5d6fd2dd0b9c65 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Thu, 17 May 2018 18:52:24 -0500
Subject: [PATCH 2540/3370] quicktemplate: init at git-2018-04-30

---
 .../tools/quicktemplate/default.nix           | 26 +++++++++++++++++++
 pkgs/development/tools/quicktemplate/deps.nix | 12 +++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/tools/quicktemplate/default.nix
 create mode 100644 pkgs/development/tools/quicktemplate/deps.nix

diff --git a/pkgs/development/tools/quicktemplate/default.nix b/pkgs/development/tools/quicktemplate/default.nix
new file mode 100644
index 000000000000..614ffe5e218d
--- /dev/null
+++ b/pkgs/development/tools/quicktemplate/default.nix
@@ -0,0 +1,26 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+buildGoPackage rec {
+  name = "quicktemplate-unstable-${version}";
+  version = "2018-04-30";
+  rev = "a91e0946457b6583004fbfc159339b8171423aed";
+
+  goPackagePath = "github.com/valyala/quicktemplate";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/valyala/quicktemplate";
+    sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/valyala/quicktemplate";
+    description = "Fast, powerful, yet easy to use template engine for Go";
+    license = licenses.mit;
+    maintainers = with maintainers; [ chiiruno ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/quicktemplate/deps.nix b/pkgs/development/tools/quicktemplate/deps.nix
new file mode 100644
index 000000000000..11a65c415c69
--- /dev/null
+++ b/pkgs/development/tools/quicktemplate/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/valyala/bytebufferpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/bytebufferpool";
+      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
+      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1201dc6016e7..a8a0e0f1d233 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13978,6 +13978,8 @@ with pkgs;
 
   gotests = callPackage ../development/tools/gotests { };
 
+  quicktemplate = callPackage ../development/tools/quicktemplate { };
+
   gogoclient = callPackage ../os-specific/linux/gogoclient { };
 
   linux-pam = callPackage ../os-specific/linux/pam { };

From 934db656b1821d4c6a1598bfec76e8ca0a3b7f27 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Thu, 17 May 2018 18:53:56 -0500
Subject: [PATCH 2541/3370] nodePackages: meguca: init at git-2018-05-17

---
 .../node-packages/node-packages-v6.json       |    1 +
 .../node-packages/node-packages-v6.nix        | 3728 +++++++++++++----
 .../node-packages/node-packages-v8.nix        |  224 +-
 3 files changed, 2981 insertions(+), 972 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json
index 5f18a286ad77..33dbc22123a6 100644
--- a/pkgs/development/node-packages/node-packages-v6.json
+++ b/pkgs/development/node-packages/node-packages-v6.json
@@ -61,6 +61,7 @@
 , "livedown"
 , "live-server"
 , "meat"
+, "meguca"
 , "mocha"
 , "multi-file-swagger"
 , "nijs"
diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix
index 66a016ceb510..c49638910a4e 100644
--- a/pkgs/development/node-packages/node-packages-v6.nix
+++ b/pkgs/development/node-packages/node-packages-v6.nix
@@ -22,6 +22,24 @@ let
         sha512 = "2f8l9alm034f4mrp2shf3pgcvm1m9lvbw2n5jpjnnmk6mn36qmwz4hjnrky279z4wnphgr2wv1vksn57w6ncl3cfr13nzv93s435wiv";
       };
     };
+    "@gulp-sourcemaps/identity-map-1.0.1" = {
+      name = "_at_gulp-sourcemaps_slash_identity-map";
+      packageName = "@gulp-sourcemaps/identity-map";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.1.tgz";
+        sha1 = "cfa23bc5840f9104ce32a65e74db7e7a974bbee1";
+      };
+    };
+    "@gulp-sourcemaps/map-sources-1.0.0" = {
+      name = "_at_gulp-sourcemaps_slash_map-sources";
+      packageName = "@gulp-sourcemaps/map-sources";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz";
+        sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda";
+      };
+    };
     "@ionic/cli-framework-0.1.3" = {
       name = "_at_ionic_slash_cli-framework";
       packageName = "@ionic/cli-framework";
@@ -49,6 +67,24 @@ let
         sha512 = "0x6yxaj489n9lbq0kfvdnpj1pacgv3r0vk5cnlla7w1jkvxzwaf0vbcnwd9gdaj6zkq69wm1g4zjvj37pyn1lajjkzl1f50l7cnr2ad";
       };
     };
+    "@mrmlnc/readdir-enhanced-2.2.1" = {
+      name = "_at_mrmlnc_slash_readdir-enhanced";
+      packageName = "@mrmlnc/readdir-enhanced";
+      version = "2.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz";
+        sha512 = "3g9wzm6hszqh30x6hmwc9l4vw51c6a224cp2y9qzlj98vzbwbc4s7lfafi67v8401qagjsdxrndnnannzz6i71krmn8svxwk3lfkwbc";
+      };
+    };
+    "@nodelib/fs.stat-1.0.2" = {
+      name = "_at_nodelib_slash_fs.stat";
+      packageName = "@nodelib/fs.stat";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz";
+        sha512 = "37szl49qa9zv4jp9axp95i84m3iiqlip6lnkjc30rd7m8yzvcnlxkl7n1hqkwaq2nx8w560ldb01xhdz8cys7gmbqkdlwa3jbpmyamw";
+      };
+    };
     "@sindresorhus/is-0.7.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
@@ -58,13 +94,13 @@ let
         sha512 = "2ilygr40l2yqbk6lix4xnnnqsq6fxa6sysdxg49bg1ax5gzhwy3bcjbdlk7lndgh9055slpx6fybs3p8mhvbsnnjkmkqzrfy8l5mn1q";
       };
     };
-    "@types/babel-types-7.0.1" = {
+    "@types/babel-types-7.0.2" = {
       name = "_at_types_slash_babel-types";
       packageName = "@types/babel-types";
-      version = "7.0.1";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.1.tgz";
-        sha512 = "3bsk1lhqbj6zdrzkmzf9yjr2v77nlaqq1rzsjq8n56k8n0fl3fyxpcanxm3h5yqm6zzfi8qdmdxf5hrvrmg3kwbdspii3kb9y9hwiqj";
+        url = "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.2.tgz";
+        sha512 = "0g0dnxwqc9x4x2y8230sdb056c0af5z3rx9ynfkw2cqsygx2kg2jk7nfn14m32fkcc62dccymw805d2bs15dqsdkbx19hzhq2xj0n6a";
       };
     };
     "@types/babylon-6.16.2" = {
@@ -94,31 +130,31 @@ let
         sha512 = "2fv2qaz90rp6ib2s45ix0p3a4bd6yl6k94k1kkhw7w4s2aa5mqc6chppkf6pfvsz1l6phh7y0xswyfyzjgny7qzascch8c7ws20a0r4";
       };
     };
-    "@types/node-10.0.4" = {
+    "@types/node-10.1.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.0.4";
+      version = "10.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz";
-        sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.1.1.tgz";
+        sha512 = "35nbbgd4qp35g3nfbrsc9ndmigc9gl31xdjhx0fakfms35c6jqxpdx7m9c3pi0h3b062p31al5vas36facjhs1nmxf3bdpnrb5k3g4z";
       };
     };
-    "@types/node-8.10.12" = {
+    "@types/node-8.10.16" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "8.10.12";
+      version = "8.10.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-8.10.12.tgz";
-        sha512 = "199k4d6vmwxd4bkmxmpszdvz6nxby7px5w2cw0yrhrp5clmxvsfc1xnwirjlpidfc4a76i6pzprmdkrpli8i454s909bx6z7wd584b9";
+        url = "https://registry.npmjs.org/@types/node/-/node-8.10.16.tgz";
+        sha512 = "2plzhji5iq482aa7kscxvsxrwscvrlrg9mxkx02nbslq31q178qki4ghi27z2lagmmzcvgm9r7ligx20bky617zx828yjap4ribnlia";
       };
     };
-    "@types/node-9.6.12" = {
+    "@types/node-9.6.17" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "9.6.12";
+      version = "9.6.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-9.6.12.tgz";
-        sha512 = "2515a59dsfswy2l4i7hid0krh69mzz42byi55a12a0cz21masdmd3j0zc8aq7qyh2sm6lmhzbxy1n8vhb563ybjhiygavn9d24k77yr";
+        url = "https://registry.npmjs.org/@types/node/-/node-9.6.17.tgz";
+        sha512 = "3czvpaxsivpv403rqgf4865q4nv81x0y1030r3xj697ik1hp65xdrqqpxvaafbwbf29gszsi2zxag68pblgi22mc1cmbg6yjm14xyib";
       };
     };
     "@types/request-2.47.0" = {
@@ -130,13 +166,13 @@ let
         sha512 = "3jk7nawc1yb26ykdlv3mk1bmdpq2an6krskfj4x46kc9ka9r11ixrivg5zwcm451wlarry8dk36mick3d68w0c85i177ymghzkcr9gw";
       };
     };
-    "@types/tough-cookie-2.3.2" = {
+    "@types/tough-cookie-2.3.3" = {
       name = "_at_types_slash_tough-cookie";
       packageName = "@types/tough-cookie";
-      version = "2.3.2";
+      version = "2.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.2.tgz";
-        sha512 = "1nbw2qb74417hfamhd2a4yxf6ls3rjy92lv847mnhj7dxfla54kiwwdi64bnvcn7ysn5spkfakq4ssknb78qgz5nhd926whpdm6drdw";
+        url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.3.tgz";
+        sha512 = "1hpxnn86rnm17kxbwp8r3ymx3qqmvq6vhswndr12cahvbarmm27mj2jj2r0pm0w9wvq9ixm55whl8q029ir29c59cmanbais720nd1h";
       };
     };
     "@types/uuid-3.4.3" = {
@@ -148,6 +184,141 @@ let
         sha512 = "1psrs8sjpmhz8sz2zjkkd7743vzdi7q7vcj8p219q1pkfawr619rl1m5pczp69hbm1769kn8zwlbayjylhl7an5hkvkdd2bi04lpx75";
       };
     };
+    "@webassemblyjs/ast-1.4.3" = {
+      name = "_at_webassemblyjs_slash_ast";
+      packageName = "@webassemblyjs/ast";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.4.3.tgz";
+        sha512 = "3spjwi3cp2y297lils8dyh4277ijwg40ak6033w18yb8rffrhwm81h1ikcq407pl83kymmwb348298bpnkb1rfrggc70k6w2difkaab";
+      };
+    };
+    "@webassemblyjs/floating-point-hex-parser-1.4.3" = {
+      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
+      packageName = "@webassemblyjs/floating-point-hex-parser";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz";
+        sha512 = "13vsay3gcir9hbx3kznsymnw558as2mrvy8gfymy5wq4k76qwzrkfclxgk5wim8p4f56acyjj61pbin9vzr1wvr6j7r7h9hbd4f8d6z";
+      };
+    };
+    "@webassemblyjs/helper-buffer-1.4.3" = {
+      name = "_at_webassemblyjs_slash_helper-buffer";
+      packageName = "@webassemblyjs/helper-buffer";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz";
+        sha512 = "29i4iwxw7bdqp5jpdvq7x2yvsiihzvhxngq7dcx8h29n3qxbpx5gb7bnpkfrf1wdipnyn3786r5ghfnjgdlc4psa865yibyg1j8mkvv";
+      };
+    };
+    "@webassemblyjs/helper-code-frame-1.4.3" = {
+      name = "_at_webassemblyjs_slash_helper-code-frame";
+      packageName = "@webassemblyjs/helper-code-frame";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz";
+        sha512 = "3rlq4pj6pnf5j1xhdpd2i6b8ajsgdv5hkmlzahr45yv4p6f6rlsi04ns0kcq3qprlmsim99qkisa660xk4bd0mi58d0crbcsc90fn7l";
+      };
+    };
+    "@webassemblyjs/helper-fsm-1.4.3" = {
+      name = "_at_webassemblyjs_slash_helper-fsm";
+      packageName = "@webassemblyjs/helper-fsm";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz";
+        sha512 = "04nq8mpmb966xss2qhg9rzp046awfhx20kp8p6qp27fnhv65krbay68sfs5j7gp3r4ry7xd153znkdp1vlkxppy8n44vvrylppmi0r4";
+      };
+    };
+    "@webassemblyjs/helper-wasm-bytecode-1.4.3" = {
+      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
+      packageName = "@webassemblyjs/helper-wasm-bytecode";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz";
+        sha512 = "1wm9mkc0qy5srk9q78842pl0vkn9nvwlh6bci2615vbyw625dnrry390i60w4h53fkbdfp9jj550ggvdw9algcg48xsvl4ffvwd5di3";
+      };
+    };
+    "@webassemblyjs/helper-wasm-section-1.4.3" = {
+      name = "_at_webassemblyjs_slash_helper-wasm-section";
+      packageName = "@webassemblyjs/helper-wasm-section";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz";
+        sha512 = "34nmg0qsq0wn6m9r9zjh3jpb0qwr4g7a234x0ws78q4n9dvv1q5ynp2c3ygqnmc1gixy99g6w87l92xf5zjbrr87zsbvnp1xxw9wk57";
+      };
+    };
+    "@webassemblyjs/leb128-1.4.3" = {
+      name = "_at_webassemblyjs_slash_leb128";
+      packageName = "@webassemblyjs/leb128";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.4.3.tgz";
+        sha512 = "0lzzzxr5rk3qqg3ik3hm7yw0lgcvx334g75aphf2l3rsf8pxwycak36v5xsqkavvb4acmh5lddgx2c5sg5al7bwb11y9klgnhj0pvg2";
+      };
+    };
+    "@webassemblyjs/validation-1.4.3" = {
+      name = "_at_webassemblyjs_slash_validation";
+      packageName = "@webassemblyjs/validation";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.4.3.tgz";
+        sha512 = "02y4zsfg7y963d4i63g51xackih6zvs8szy2qlki5xmkfq2ywl97dwbds4wycw6pjwhwivzd4ilmlq37larmxmqsamdjxz1lwqd3sj7";
+      };
+    };
+    "@webassemblyjs/wasm-edit-1.4.3" = {
+      name = "_at_webassemblyjs_slash_wasm-edit";
+      packageName = "@webassemblyjs/wasm-edit";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.4.3.tgz";
+        sha512 = "2knsyvscajz7vi6pm96i1azjxc3d574hwbninxgr5w6lyw3pslnxv41piv565kjdn5g6qqyh0jk6jjbvi2sm9dqzixgbm7vgr9b0fxb";
+      };
+    };
+    "@webassemblyjs/wasm-gen-1.4.3" = {
+      name = "_at_webassemblyjs_slash_wasm-gen";
+      packageName = "@webassemblyjs/wasm-gen";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz";
+        sha512 = "1lxp49ldr0dwh3ksan4vadvdrsx9sx92wz63h8qpg096x7k3hp777kk33cbzsg6258rgp7saabz2aqmd6ggvm4y5klrf78x7zhzs7br";
+      };
+    };
+    "@webassemblyjs/wasm-opt-1.4.3" = {
+      name = "_at_webassemblyjs_slash_wasm-opt";
+      packageName = "@webassemblyjs/wasm-opt";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz";
+        sha512 = "0mpd5ig3h708hb5ixdnjlwikbr71va6awfp1gfmff33g7a1g35avv6b4s0ibhl9qdbq32pi8s02ngazg1mcdx82p21sif11qyg7wspc";
+      };
+    };
+    "@webassemblyjs/wasm-parser-1.4.3" = {
+      name = "_at_webassemblyjs_slash_wasm-parser";
+      packageName = "@webassemblyjs/wasm-parser";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz";
+        sha512 = "130bg13n9f63ihivbad61yw96k908g12ykw7mr8dhxswsck6rp1rbk9rr2dmgarxqd3v0jw605r4pqqpmq5iwhzj5p1bp00bjv66w19";
+      };
+    };
+    "@webassemblyjs/wast-parser-1.4.3" = {
+      name = "_at_webassemblyjs_slash_wast-parser";
+      packageName = "@webassemblyjs/wast-parser";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz";
+        sha512 = "3an2lfdbzn0y8c87qzdfwny0q5di5sr36pkxisp6jq3qdb9bbcbd91nqyqyadz8gxv3zrky8qsl4a8fs0ycjn2429n2ml4m791sq422";
+      };
+    };
+    "@webassemblyjs/wast-printer-1.4.3" = {
+      name = "_at_webassemblyjs_slash_wast-printer";
+      packageName = "@webassemblyjs/wast-printer";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz";
+        sha512 = "2v460znblyp8svk9nm0k52kvhmgsk2cr6yw0cjgh9r22db3id8dd0inn2xgkbxvcrpi0hn4zbcz75nb58zshv4jp6k35wnzm7hy818j";
+      };
+    };
     "CSSselect-0.4.1" = {
       name = "CSSselect";
       packageName = "CSSselect";
@@ -283,6 +454,15 @@ let
         sha1 = "eb777df6011723a3b14e8a72c0805c8e86746bd2";
       };
     };
+    "accord-0.28.0" = {
+      name = "accord";
+      packageName = "accord";
+      version = "0.28.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/accord/-/accord-0.28.0.tgz";
+        sha512 = "22hbsgv0xpwylgn199fwqlwk5fffavi922x37zj1kbl1psx2ysyf67kqcgb0q9gk33rjkaxml813k170yf7z2mw9a10cyl71bi7gwdh";
+      };
+    };
     "acorn-1.2.2" = {
       name = "acorn";
       packageName = "acorn";
@@ -481,6 +661,15 @@ let
         sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
       };
     };
+    "adm-zip-0.4.11" = {
+      name = "adm-zip";
+      packageName = "adm-zip";
+      version = "0.4.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz";
+        sha512 = "26ddl3nnf87iz307rnz4ssnyb16imncpc8drvn2s9ykxhjckr6bigffcg821jpyfimn5yqkpx4jrc1p2i8rlvq1xxj84f626j6drjrg";
+      };
+    };
     "adm-zip-0.4.7" = {
       name = "adm-zip";
       packageName = "adm-zip";
@@ -490,15 +679,6 @@ let
         sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
       };
     };
-    "adm-zip-0.4.9" = {
-      name = "adm-zip";
-      packageName = "adm-zip";
-      version = "0.4.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.9.tgz";
-        sha512 = "03k8g7lxi05n57v16vv32x32lkikh9qvv4pmkycrw52j3r031fkvns49z8wvfbj3rjj6vh712ahyfz5k3m5b9v832n9dz18f8kxljbs";
-      };
-    };
     "after-0.8.1" = {
       name = "after";
       packageName = "after";
@@ -607,13 +787,13 @@ let
         sha1 = "1650a41114ef00574cac10b8032d8f4c14812da7";
       };
     };
-    "ajv-6.4.0" = {
+    "ajv-6.5.0" = {
       name = "ajv";
       packageName = "ajv";
-      version = "6.4.0";
+      version = "6.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-6.4.0.tgz";
-        sha1 = "d3aff78e9277549771daf0164cff48482b754fc6";
+        url = "https://registry.npmjs.org/ajv/-/ajv-6.5.0.tgz";
+        sha512 = "203gkx4d984vdbipzb5mz2x4ilymhrzg6vz5xarpfcixb8gl65xx34h0ppk8zjilxxxhgrlv2fwal1gzm0ci19ckbjsd3cshkb1fdal";
       };
     };
     "ajv-keywords-1.5.1" = {
@@ -670,6 +850,15 @@ let
         sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
       };
     };
+    "almond-0.3.3" = {
+      name = "almond";
+      packageName = "almond";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz";
+        sha1 = "a0e7c95ac7624d6417b4494b1e68bff693168a20";
+      };
+    };
     "amdefine-1.0.1" = {
       name = "amdefine";
       packageName = "amdefine";
@@ -724,6 +913,24 @@ let
         sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a";
       };
     };
+    "ansi-colors-1.1.0" = {
+      name = "ansi-colors";
+      packageName = "ansi-colors";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz";
+        sha512 = "2cb3237y1374lwc0f3xxpc79bv59r2m18cw868dpdhvwmrxyh06pj5sdzafc7xrc69v5j8v9lwf7hxylyzxq3bz8waxlj5fnvmrflj8";
+      };
+    };
+    "ansi-cyan-0.1.1" = {
+      name = "ansi-cyan";
+      packageName = "ansi-cyan";
+      version = "0.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz";
+        sha1 = "538ae528af8982f28ae30d86f2f17456d2609873";
+      };
+    };
     "ansi-diff-stream-1.2.1" = {
       name = "ansi-diff-stream";
       packageName = "ansi-diff-stream";
@@ -922,6 +1129,15 @@ let
         sha1 = "7e5dd327747078d877286fbb624b1e8f4d2b396b";
       };
     };
+    "append-buffer-1.0.2" = {
+      name = "append-buffer";
+      packageName = "append-buffer";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz";
+        sha1 = "d8220cf466081525efea50614f3de6514dfa58f1";
+      };
+    };
     "append-field-0.1.0" = {
       name = "append-field";
       packageName = "append-field";
@@ -1057,6 +1273,15 @@ let
         sha512 = "2xd628jhziygi9jr16ckq557189nw5lracgzcpv8ddvymc3mjxvqzffgp68wmgknw6ps7nliwwyismriv6z4snvn0xmm7kwbrafbgp1";
       };
     };
+    "arr-diff-1.1.0" = {
+      name = "arr-diff";
+      packageName = "arr-diff";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz";
+        sha1 = "687c32758163588fef7de7b36fabe495eb1a399a";
+      };
+    };
     "arr-diff-2.0.0" = {
       name = "arr-diff";
       packageName = "arr-diff";
@@ -1084,6 +1309,15 @@ let
         sha512 = "2vdly17xk5kw7bfzajrjdnw4ml3wrfblx8064n0i4fxlchcscx2mvnwkq2bnnqvbqvdy4vs9ad462lz0rid7khysly9m9vzjiblly1g";
       };
     };
+    "arr-union-2.1.0" = {
+      name = "arr-union";
+      packageName = "arr-union";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz";
+        sha1 = "20f9eab5ec70f5c7d215b1077b1c39161d292c7d";
+      };
+    };
     "arr-union-3.1.0" = {
       name = "arr-union";
       packageName = "arr-union";
@@ -1633,13 +1867,13 @@ let
         sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
       };
     };
-    "aws-sdk-2.233.1" = {
+    "aws-sdk-2.241.1" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.233.1";
+      version = "2.241.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.233.1.tgz";
-        sha1 = "b4f541069a9f2781e9f73e1336ce81a9fc08bcf1";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.241.1.tgz";
+        sha1 = "ae4e1ba772cc17284df00c03b58dcf914d5c72f9";
       };
     };
     "aws-sign-0.2.0" = {
@@ -2074,6 +2308,15 @@ let
         sha512 = "2jfjq7ggb0ygyzxg3vw248iq0iw2v00janjva1bf3l322k4zjcx9hvq9qqy67gxxyl2igw1asxfgp769hd5229pc70kwri9l1iz09qz";
       };
     };
+    "babel-helper-builder-binary-assignment-operator-visitor-6.24.1" = {
+      name = "babel-helper-builder-binary-assignment-operator-visitor";
+      packageName = "babel-helper-builder-binary-assignment-operator-visitor";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz";
+        sha1 = "cce4517ada356f4220bcae8a02c2b346f9a56664";
+      };
+    };
     "babel-helper-builder-react-jsx-6.26.0" = {
       name = "babel-helper-builder-react-jsx";
       packageName = "babel-helper-builder-react-jsx";
@@ -2083,6 +2326,96 @@ let
         sha1 = "39ff8313b75c8b65dceff1f31d383e0ff2a408a0";
       };
     };
+    "babel-helper-call-delegate-6.24.1" = {
+      name = "babel-helper-call-delegate";
+      packageName = "babel-helper-call-delegate";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz";
+        sha1 = "ece6aacddc76e41c3461f88bfc575bd0daa2df8d";
+      };
+    };
+    "babel-helper-define-map-6.26.0" = {
+      name = "babel-helper-define-map";
+      packageName = "babel-helper-define-map";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz";
+        sha1 = "a5f56dab41a25f97ecb498c7ebaca9819f95be5f";
+      };
+    };
+    "babel-helper-explode-assignable-expression-6.24.1" = {
+      name = "babel-helper-explode-assignable-expression";
+      packageName = "babel-helper-explode-assignable-expression";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz";
+        sha1 = "f25b82cf7dc10433c55f70592d5746400ac22caa";
+      };
+    };
+    "babel-helper-function-name-6.24.1" = {
+      name = "babel-helper-function-name";
+      packageName = "babel-helper-function-name";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz";
+        sha1 = "d3475b8c03ed98242a25b48351ab18399d3580a9";
+      };
+    };
+    "babel-helper-get-function-arity-6.24.1" = {
+      name = "babel-helper-get-function-arity";
+      packageName = "babel-helper-get-function-arity";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz";
+        sha1 = "8f7782aa93407c41d3aa50908f89b031b1b6853d";
+      };
+    };
+    "babel-helper-hoist-variables-6.24.1" = {
+      name = "babel-helper-hoist-variables";
+      packageName = "babel-helper-hoist-variables";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz";
+        sha1 = "1ecb27689c9d25513eadbc9914a73f5408be7a76";
+      };
+    };
+    "babel-helper-optimise-call-expression-6.24.1" = {
+      name = "babel-helper-optimise-call-expression";
+      packageName = "babel-helper-optimise-call-expression";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz";
+        sha1 = "f7a13427ba9f73f8f4fa993c54a97882d1244257";
+      };
+    };
+    "babel-helper-regex-6.26.0" = {
+      name = "babel-helper-regex";
+      packageName = "babel-helper-regex";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz";
+        sha1 = "325c59f902f82f24b74faceed0363954f6495e72";
+      };
+    };
+    "babel-helper-remap-async-to-generator-6.24.1" = {
+      name = "babel-helper-remap-async-to-generator";
+      packageName = "babel-helper-remap-async-to-generator";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz";
+        sha1 = "5ec581827ad723fecdd381f1c928390676e4551b";
+      };
+    };
+    "babel-helper-replace-supers-6.24.1" = {
+      name = "babel-helper-replace-supers";
+      packageName = "babel-helper-replace-supers";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz";
+        sha1 = "bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a";
+      };
+    };
     "babel-helpers-6.24.1" = {
       name = "babel-helpers";
       packageName = "babel-helpers";
@@ -2101,6 +2434,33 @@ let
         sha1 = "f3cdf4703858035b2a2951c6ec5edf6c62f2630e";
       };
     };
+    "babel-plugin-check-es2015-constants-6.22.0" = {
+      name = "babel-plugin-check-es2015-constants";
+      packageName = "babel-plugin-check-es2015-constants";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz";
+        sha1 = "35157b101426fd2ffd3da3f75c7d1e91835bbf8a";
+      };
+    };
+    "babel-plugin-syntax-async-functions-6.13.0" = {
+      name = "babel-plugin-syntax-async-functions";
+      packageName = "babel-plugin-syntax-async-functions";
+      version = "6.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz";
+        sha1 = "cad9cad1191b5ad634bf30ae0872391e0647be95";
+      };
+    };
+    "babel-plugin-syntax-exponentiation-operator-6.13.0" = {
+      name = "babel-plugin-syntax-exponentiation-operator";
+      packageName = "babel-plugin-syntax-exponentiation-operator";
+      version = "6.13.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz";
+        sha1 = "9ee7e8337290da95288201a6a57f4170317830de";
+      };
+    };
     "babel-plugin-syntax-jsx-6.18.0" = {
       name = "babel-plugin-syntax-jsx";
       packageName = "babel-plugin-syntax-jsx";
@@ -2119,6 +2479,69 @@ let
         sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5";
       };
     };
+    "babel-plugin-syntax-trailing-function-commas-6.22.0" = {
+      name = "babel-plugin-syntax-trailing-function-commas";
+      packageName = "babel-plugin-syntax-trailing-function-commas";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz";
+        sha1 = "ba0360937f8d06e40180a43fe0d5616fff532cf3";
+      };
+    };
+    "babel-plugin-transform-async-to-generator-6.24.1" = {
+      name = "babel-plugin-transform-async-to-generator";
+      packageName = "babel-plugin-transform-async-to-generator";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz";
+        sha1 = "6536e378aff6cb1d5517ac0e40eb3e9fc8d08761";
+      };
+    };
+    "babel-plugin-transform-es2015-arrow-functions-6.22.0" = {
+      name = "babel-plugin-transform-es2015-arrow-functions";
+      packageName = "babel-plugin-transform-es2015-arrow-functions";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz";
+        sha1 = "452692cb711d5f79dc7f85e440ce41b9f244d221";
+      };
+    };
+    "babel-plugin-transform-es2015-block-scoped-functions-6.22.0" = {
+      name = "babel-plugin-transform-es2015-block-scoped-functions";
+      packageName = "babel-plugin-transform-es2015-block-scoped-functions";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz";
+        sha1 = "bbc51b49f964d70cb8d8e0b94e820246ce3a6141";
+      };
+    };
+    "babel-plugin-transform-es2015-block-scoping-6.26.0" = {
+      name = "babel-plugin-transform-es2015-block-scoping";
+      packageName = "babel-plugin-transform-es2015-block-scoping";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz";
+        sha1 = "d70f5299c1308d05c12f463813b0a09e73b1895f";
+      };
+    };
+    "babel-plugin-transform-es2015-classes-6.24.1" = {
+      name = "babel-plugin-transform-es2015-classes";
+      packageName = "babel-plugin-transform-es2015-classes";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz";
+        sha1 = "5a4c58a50c9c9461e564b4b2a3bfabc97a2584db";
+      };
+    };
+    "babel-plugin-transform-es2015-computed-properties-6.24.1" = {
+      name = "babel-plugin-transform-es2015-computed-properties";
+      packageName = "babel-plugin-transform-es2015-computed-properties";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz";
+        sha1 = "6fe2a8d16895d5634f4cd999b6d3480a308159b3";
+      };
+    };
     "babel-plugin-transform-es2015-destructuring-6.23.0" = {
       name = "babel-plugin-transform-es2015-destructuring";
       packageName = "babel-plugin-transform-es2015-destructuring";
@@ -2128,6 +2551,159 @@ let
         sha1 = "997bb1f1ab967f682d2b0876fe358d60e765c56d";
       };
     };
+    "babel-plugin-transform-es2015-duplicate-keys-6.24.1" = {
+      name = "babel-plugin-transform-es2015-duplicate-keys";
+      packageName = "babel-plugin-transform-es2015-duplicate-keys";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz";
+        sha1 = "73eb3d310ca969e3ef9ec91c53741a6f1576423e";
+      };
+    };
+    "babel-plugin-transform-es2015-for-of-6.23.0" = {
+      name = "babel-plugin-transform-es2015-for-of";
+      packageName = "babel-plugin-transform-es2015-for-of";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz";
+        sha1 = "f47c95b2b613df1d3ecc2fdb7573623c75248691";
+      };
+    };
+    "babel-plugin-transform-es2015-function-name-6.24.1" = {
+      name = "babel-plugin-transform-es2015-function-name";
+      packageName = "babel-plugin-transform-es2015-function-name";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz";
+        sha1 = "834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b";
+      };
+    };
+    "babel-plugin-transform-es2015-literals-6.22.0" = {
+      name = "babel-plugin-transform-es2015-literals";
+      packageName = "babel-plugin-transform-es2015-literals";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz";
+        sha1 = "4f54a02d6cd66cf915280019a31d31925377ca2e";
+      };
+    };
+    "babel-plugin-transform-es2015-modules-amd-6.24.1" = {
+      name = "babel-plugin-transform-es2015-modules-amd";
+      packageName = "babel-plugin-transform-es2015-modules-amd";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz";
+        sha1 = "3b3e54017239842d6d19c3011c4bd2f00a00d154";
+      };
+    };
+    "babel-plugin-transform-es2015-modules-commonjs-6.26.2" = {
+      name = "babel-plugin-transform-es2015-modules-commonjs";
+      packageName = "babel-plugin-transform-es2015-modules-commonjs";
+      version = "6.26.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz";
+        sha512 = "3sy41x9jlzyzy6wzsj60asahzm6hg9gmr6r1cckdqhzmvckl7jbfb5zwr0nslndnhqgjwdmvxsah41h8v8286hjqbfbhxn4w4w52pq9";
+      };
+    };
+    "babel-plugin-transform-es2015-modules-systemjs-6.24.1" = {
+      name = "babel-plugin-transform-es2015-modules-systemjs";
+      packageName = "babel-plugin-transform-es2015-modules-systemjs";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz";
+        sha1 = "ff89a142b9119a906195f5f106ecf305d9407d23";
+      };
+    };
+    "babel-plugin-transform-es2015-modules-umd-6.24.1" = {
+      name = "babel-plugin-transform-es2015-modules-umd";
+      packageName = "babel-plugin-transform-es2015-modules-umd";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz";
+        sha1 = "ac997e6285cd18ed6176adb607d602344ad38468";
+      };
+    };
+    "babel-plugin-transform-es2015-object-super-6.24.1" = {
+      name = "babel-plugin-transform-es2015-object-super";
+      packageName = "babel-plugin-transform-es2015-object-super";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz";
+        sha1 = "24cef69ae21cb83a7f8603dad021f572eb278f8d";
+      };
+    };
+    "babel-plugin-transform-es2015-parameters-6.24.1" = {
+      name = "babel-plugin-transform-es2015-parameters";
+      packageName = "babel-plugin-transform-es2015-parameters";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz";
+        sha1 = "57ac351ab49caf14a97cd13b09f66fdf0a625f2b";
+      };
+    };
+    "babel-plugin-transform-es2015-shorthand-properties-6.24.1" = {
+      name = "babel-plugin-transform-es2015-shorthand-properties";
+      packageName = "babel-plugin-transform-es2015-shorthand-properties";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz";
+        sha1 = "24f875d6721c87661bbd99a4622e51f14de38aa0";
+      };
+    };
+    "babel-plugin-transform-es2015-spread-6.22.0" = {
+      name = "babel-plugin-transform-es2015-spread";
+      packageName = "babel-plugin-transform-es2015-spread";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz";
+        sha1 = "d6d68a99f89aedc4536c81a542e8dd9f1746f8d1";
+      };
+    };
+    "babel-plugin-transform-es2015-sticky-regex-6.24.1" = {
+      name = "babel-plugin-transform-es2015-sticky-regex";
+      packageName = "babel-plugin-transform-es2015-sticky-regex";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz";
+        sha1 = "00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc";
+      };
+    };
+    "babel-plugin-transform-es2015-template-literals-6.22.0" = {
+      name = "babel-plugin-transform-es2015-template-literals";
+      packageName = "babel-plugin-transform-es2015-template-literals";
+      version = "6.22.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz";
+        sha1 = "a84b3450f7e9f8f1f6839d6d687da84bb1236d8d";
+      };
+    };
+    "babel-plugin-transform-es2015-typeof-symbol-6.23.0" = {
+      name = "babel-plugin-transform-es2015-typeof-symbol";
+      packageName = "babel-plugin-transform-es2015-typeof-symbol";
+      version = "6.23.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz";
+        sha1 = "dec09f1cddff94b52ac73d505c84df59dcceb372";
+      };
+    };
+    "babel-plugin-transform-es2015-unicode-regex-6.24.1" = {
+      name = "babel-plugin-transform-es2015-unicode-regex";
+      packageName = "babel-plugin-transform-es2015-unicode-regex";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz";
+        sha1 = "d38b12f42ea7323f729387f18a7c5ae1faeb35e9";
+      };
+    };
+    "babel-plugin-transform-exponentiation-operator-6.24.1" = {
+      name = "babel-plugin-transform-exponentiation-operator";
+      packageName = "babel-plugin-transform-exponentiation-operator";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz";
+        sha1 = "2ab0c9c7f3098fa48907772bb813fe41e8de3a0e";
+      };
+    };
     "babel-plugin-transform-object-rest-spread-6.26.0" = {
       name = "babel-plugin-transform-object-rest-spread";
       packageName = "babel-plugin-transform-object-rest-spread";
@@ -2146,6 +2722,24 @@ let
         sha1 = "840a028e7df460dfc3a2d29f0c0d91f6376e66a3";
       };
     };
+    "babel-plugin-transform-regenerator-6.26.0" = {
+      name = "babel-plugin-transform-regenerator";
+      packageName = "babel-plugin-transform-regenerator";
+      version = "6.26.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz";
+        sha1 = "e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f";
+      };
+    };
+    "babel-plugin-transform-strict-mode-6.24.1" = {
+      name = "babel-plugin-transform-strict-mode";
+      packageName = "babel-plugin-transform-strict-mode";
+      version = "6.24.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz";
+        sha1 = "d5faf7aa578a65bbe591cf5edae04a0c67020758";
+      };
+    };
     "babel-polyfill-6.16.0" = {
       name = "babel-polyfill";
       packageName = "babel-polyfill";
@@ -2164,6 +2758,15 @@ let
         sha1 = "379937abc67d7895970adc621f284cd966cf2153";
       };
     };
+    "babel-preset-env-1.7.0" = {
+      name = "babel-preset-env";
+      packageName = "babel-preset-env";
+      version = "1.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz";
+        sha512 = "0g45grnsjds9va8zwb68gpm4ngzmnb351bbvphnmis7bifsh2ny2c00bwah57fn1yv87fs69hriimbysbm15dpsvfbpf3lazdlpdr7l";
+      };
+    };
     "babel-register-6.26.0" = {
       name = "babel-register";
       packageName = "babel-register";
@@ -2380,15 +2983,6 @@ let
         sha1 = "47688cb99bb6804f0e06d3e763b1c32e57d8e6b6";
       };
     };
-    "base64url-2.0.0" = {
-      name = "base64url";
-      packageName = "base64url";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64url/-/base64url-2.0.0.tgz";
-        sha1 = "eac16e03ea1438eff9423d69baa36262ed1f70bb";
-      };
-    };
     "basic-auth-1.0.4" = {
       name = "basic-auth";
       packageName = "basic-auth";
@@ -2947,6 +3541,15 @@ let
         sha1 = "87678a19d84b47d859b83199bd59bce222b10454";
       };
     };
+    "body-parser-1.18.3" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.18.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz";
+        sha1 = "5b292198ffdd553b3a0f20ded0592b956955c8b4";
+      };
+    };
     "bonjour-3.5.0" = {
       name = "bonjour";
       packageName = "bonjour";
@@ -3316,6 +3919,15 @@ let
         sha512 = "24488d4s6d901hj9d9jdddapmcvmibbdpjq6nv3bpyjx72546fcqa0vripy0ydsrw1jk6bakfzvynh5i9cz0g59hrmn4ph75d3kdpk7";
       };
     };
+    "browserslist-3.2.7" = {
+      name = "browserslist";
+      packageName = "browserslist";
+      version = "3.2.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-3.2.7.tgz";
+        sha512 = "0qzgn4n32d6hjm129k06ry17ppzywr77kwpxh2rj1i26j9x43rwx6lpjqf6nlrkf9b9mwcqidgq5gv4xl94120k69p7z9baap24p1d1";
+      };
+    };
     "bson-0.1.8" = {
       name = "bson";
       packageName = "bson";
@@ -3415,6 +4027,15 @@ let
         sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
       };
     };
+    "buffer-equal-1.0.0" = {
+      name = "buffer-equal";
+      packageName = "buffer-equal";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz";
+        sha1 = "59616b498304d556abd466966b22eeda3eca5fbe";
+      };
+    };
     "buffer-equal-constant-time-1.0.1" = {
       name = "buffer-equal-constant-time";
       packageName = "buffer-equal-constant-time";
@@ -3928,6 +4549,15 @@ let
         sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77";
       };
     };
+    "caniuse-lite-1.0.30000842" = {
+      name = "caniuse-lite";
+      packageName = "caniuse-lite";
+      version = "1.0.30000842";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000842.tgz";
+        sha512 = "16dhvprw63c1dcvcn58bgf667cqldqkmmzda661xrwi0yadfmlpab913a980h6kwfk1yl0r13z4qap9g9rxqd23nhlihhghf902kswf";
+      };
+    };
     "capture-stack-trace-1.0.0" = {
       name = "capture-stack-trace";
       packageName = "capture-stack-trace";
@@ -4369,13 +4999,13 @@ let
         sha512 = "3hadrrn41znfv3gbqjxf0ckzjmns7w7zgsqw73sdz8nclaff9b0cg1mqhz3zxw3ndnmqqvrdcfykkfpv2v1pv4jdyzcccbn3hsbg4ji";
       };
     };
-    "circular-json-0.5.3" = {
+    "circular-json-0.5.4" = {
       name = "circular-json";
       packageName = "circular-json";
-      version = "0.5.3";
+      version = "0.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.3.tgz";
-        sha512 = "0gpz4w5khkmnx6wpsh9ccxkwc2cp9i4s9dgf2fi9dgq78ik42cld3sgil5lc3rkjvdp5fgv33c1b8pjvx3dw7kk3q3888ly54x4np32";
+        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.5.4.tgz";
+        sha512 = "25fjig8rxf865x3cbsz0hdv839lbpw6awq4ybl5qw65x5d5ha9whz5krnshqcqqdypyhvj5dnmydja51d4i2678hsig61dllkq40wmy";
       };
     };
     "clarinet-0.11.0" = {
@@ -4765,15 +5395,6 @@ let
         sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45";
       };
     };
-    "co-3.0.6" = {
-      name = "co";
-      packageName = "co";
-      version = "3.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/co/-/co-3.0.6.tgz";
-        sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda";
-      };
-    };
     "co-3.1.0" = {
       name = "co";
       packageName = "co";
@@ -4972,13 +5593,13 @@ let
         sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
       };
     };
-    "colors-1.2.4" = {
+    "colors-1.2.5" = {
       name = "colors";
       packageName = "colors";
-      version = "1.2.4";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz";
-        sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9";
+        url = "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz";
+        sha512 = "2k2a7k096qcm5fghgcmybg96y3x5bpqb62j0zdlnxq7za4asb6vsy9i69nkg9wqfhkcbh6qzm8zzvq7q516p54awxpp2qrzm8nm3cvs";
       };
     };
     "colour-0.7.1" = {
@@ -6071,13 +6692,13 @@ let
         sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636";
       };
     };
-    "core-js-2.5.5" = {
+    "core-js-2.5.6" = {
       name = "core-js";
       packageName = "core-js";
-      version = "2.5.5";
+      version = "2.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.5.tgz";
-        sha1 = "b14dde936c640c0579a6b50cabcc132dd6127e3b";
+        url = "https://registry.npmjs.org/core-js/-/core-js-2.5.6.tgz";
+        sha512 = "14myrl8hdl6z51ziv7l8326pyxfr51pil9s2glynqcj9vfpr37b9jkz9pshpb1jk7qg2wwg59hfxxqjr6x8wwhsvfqvhs5l11yia1cm";
       };
     };
     "core-util-is-1.0.2" = {
@@ -6170,13 +6791,13 @@ let
         sha1 = "e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4";
       };
     };
-    "create-ecdh-4.0.1" = {
+    "create-ecdh-4.0.3" = {
       name = "create-ecdh";
       packageName = "create-ecdh";
-      version = "4.0.1";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.1.tgz";
-        sha512 = "2whpg1253714sq60ayvsap6n3qdwa9l0zhdlxv2gz8frppds69w1q079pmf55qlygnc7ad499511xsbswy0a39asqcp9a0p1w5c56w9";
+        url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz";
+        sha512 = "1mhn55gf43qsdrp2klyyyxqjsd5mw9l6s51vsfj7wl44pq7ymfw68r8wkd4yd8dd6adg3k6q18sddxfjljr0gbk56lh3cqfyd00gc8r";
       };
     };
     "create-error-class-3.0.2" = {
@@ -6251,6 +6872,15 @@ let
         sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449";
       };
     };
+    "cross-spawn-6.0.5" = {
+      name = "cross-spawn";
+      packageName = "cross-spawn";
+      version = "6.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz";
+        sha512 = "1csj16gwq9riz0pm73dlxhbnsl1r3ldc5v0aincwj71ambi6xf3kc1kgsbwaakd8rj16k4mrli2syrjd57g6cr81zdzivdd2jn4ndbr";
+      };
+    };
     "cross-spawn-async-2.2.5" = {
       name = "cross-spawn-async";
       packageName = "cross-spawn-async";
@@ -6368,6 +6998,15 @@ let
         sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
       };
     };
+    "css-2.2.3" = {
+      name = "css";
+      packageName = "css";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/css/-/css-2.2.3.tgz";
+        sha512 = "06kcn1y3dxxxi5xrc62aal04r56rrghjy3ipy54srxrqr9pg3q020i6yf2pfbcgzk758ln76g9yayfs4q78g2rj343380hwczapnvfi";
+      };
+    };
     "css-parse-1.0.4" = {
       name = "css-parse";
       packageName = "css-parse";
@@ -6710,13 +7349,13 @@ let
         sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi";
       };
     };
-    "dat-link-resolve-2.1.0" = {
+    "dat-link-resolve-2.1.1" = {
       name = "dat-link-resolve";
       packageName = "dat-link-resolve";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.0.tgz";
-        sha512 = "0dzpf71lpzr1z3g6m3v29xvcs9r12sgjpzzmg2viy3azkgpscl7p2v8im2ibsa22q64abifkibb4nc3nshs19wvai67m3gdqx15qzvn";
+        url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.1.tgz";
+        sha512 = "3rchn6ap0ma8ij6qcvf74csbhn41nn5xpyzkf9cabr8fmzbj406iz4vvf0hqq473nfpyrvs1ffw2k3bqp4lv1nb98n39m2f5g3f14zp";
       };
     };
     "dat-log-1.1.1" = {
@@ -6935,6 +7574,15 @@ let
         sha512 = "3g1hqsahr1ks2kpvdxrwzr57fj90nnr0hvwwrw8yyyzcv3i11sym8zwibxx67bl1mln0acddrzpkkdjjxnc6n2cm9fazmgzzsl1fzrr";
       };
     };
+    "debug-fabulous-1.1.0" = {
+      name = "debug-fabulous";
+      packageName = "debug-fabulous";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz";
+        sha512 = "0pf8q2xxbqj1a6pjkwfwsd9xz8aqihmmkdykdqb02zkh0ldshbhkfl3yvi0vjhw8150cxmpi0r4i4aiczm8bl233lkmadhai0caz6hr";
+      };
+    };
     "decamelize-1.2.0" = {
       name = "decamelize";
       packageName = "decamelize";
@@ -7403,6 +8051,15 @@ let
         sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b";
       };
     };
+    "detect-newline-2.1.0" = {
+      name = "detect-newline";
+      packageName = "detect-newline";
+      version = "2.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz";
+        sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2";
+      };
+    };
     "detect-port-1.2.2" = {
       name = "detect-port";
       packageName = "detect-port";
@@ -7511,6 +8168,15 @@ let
         sha1 = "b5e30361a6db023176d562892db85940a718f47e";
       };
     };
+    "dir-glob-2.0.0" = {
+      name = "dir-glob";
+      packageName = "dir-glob";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz";
+        sha512 = "1m705yfirf97v4w87gfvylhhq9jlwjsgfp5x0p0cp33mc180ldmvgbs06zmr7by48d7r01n3awx4xz3m3vzba99gqww1wgka2na5fnz";
+      };
+    };
     "director-1.2.7" = {
       name = "director";
       packageName = "director";
@@ -7754,6 +8420,15 @@ let
         sha1 = "672226dc74c8f799ad35307df936aba11acd6018";
       };
     };
+    "dom4-2.0.1" = {
+      name = "dom4";
+      packageName = "dom4";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dom4/-/dom4-2.0.1.tgz";
+        sha512 = "2kb9x9kskncvbrz6gnz7fyh0kg6x6vicly1x209c2lsrpfa5ghfzfwqzn06fqshmbjcglbv6g97anw8jmc5firj094ikk8wc6ib9wx5";
+      };
+    };
     "domain-browser-1.1.7" = {
       name = "domain-browser";
       packageName = "domain-browser";
@@ -7808,13 +8483,13 @@ let
         sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
       };
     };
-    "domhandler-2.4.1" = {
+    "domhandler-2.4.2" = {
       name = "domhandler";
       packageName = "domhandler";
-      version = "2.4.1";
+      version = "2.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz";
-        sha1 = "892e47000a99be55bbf3774ffea0561d8879c259";
+        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz";
+        sha512 = "307i53zii3hv9zr3skxhp9pxa09ki0xwx9q1k7mxnq3hanjanlpr1mmavfzz68r2h6cl1bnv2836plrhk02rpa7yfzrpdq73pib88i6";
       };
     };
     "domino-1.0.30" = {
@@ -8015,13 +8690,13 @@ let
         sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
       };
     };
-    "ecdsa-sig-formatter-1.0.9" = {
+    "ecdsa-sig-formatter-1.0.10" = {
       name = "ecdsa-sig-formatter";
       packageName = "ecdsa-sig-formatter";
-      version = "1.0.9";
+      version = "1.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.9.tgz";
-        sha1 = "4bc926274ec3b5abb5016e7e1d60921ac262b2a1";
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.10.tgz";
+        sha1 = "1c595000f04a8897dfb85000892a0f4c33af86c3";
       };
     };
     "ecstatic-3.2.0" = {
@@ -8096,6 +8771,15 @@ let
         sha1 = "cc872c168880ae3c7189762fd5ffc00896c9518a";
       };
     };
+    "electron-to-chromium-1.3.47" = {
+      name = "electron-to-chromium";
+      packageName = "electron-to-chromium";
+      version = "1.3.47";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.47.tgz";
+        sha1 = "764e887ca9104d01a0ac8eabee7dfc0e2ce14104";
+      };
+    };
     "elegant-spinner-1.0.1" = {
       name = "elegant-spinner";
       packageName = "elegant-spinner";
@@ -9159,13 +9843,13 @@ let
         sha1 = "a299effd335fe2721ebae8e257ec79644fc85337";
       };
     };
-    "expand-template-1.1.0" = {
+    "expand-template-1.1.1" = {
       name = "expand-template";
       packageName = "expand-template";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.0.tgz";
-        sha512 = "34i2f4clwy5bpzgl137zwplybp5hn6ncxq0p794cx9m0crhgk31nfy0s8wp1v6hvw90h20c268r040g892dixy6zqq1xlm3ra8g0j4j";
+        url = "https://registry.npmjs.org/expand-template/-/expand-template-1.1.1.tgz";
+        sha512 = "119ih63dfbnmhn97ymf3h1b9lch1byl13mr8m05hap0zqf0vqabalm7ya3iyypwabr3pmj23k7mq6sv0lqz2225qdgyca3wslpfmrki";
       };
     };
     "expand-tilde-2.0.2" = {
@@ -9222,15 +9906,6 @@ let
         sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148";
       };
     };
-    "express-4.16.2" = {
-      name = "express";
-      packageName = "express";
-      version = "4.16.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-4.16.2.tgz";
-        sha1 = "e35c6dfe2d64b7dca0a5cd4f21781be3299e076c";
-      };
-    };
     "express-4.16.3" = {
       name = "express";
       packageName = "express";
@@ -9339,6 +10014,15 @@ let
         sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
       };
     };
+    "extend-shallow-1.1.4" = {
+      name = "extend-shallow";
+      packageName = "extend-shallow";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz";
+        sha1 = "19d6bf94dfc09d76ba711f39b872d21ff4dd9071";
+      };
+    };
     "extend-shallow-2.0.1" = {
       name = "extend-shallow";
       packageName = "extend-shallow";
@@ -9492,6 +10176,15 @@ let
         sha1 = "c053477817c86b51daa853c81e059b733d023614";
       };
     };
+    "fast-deep-equal-2.0.1" = {
+      name = "fast-deep-equal";
+      packageName = "fast-deep-equal";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
+        sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
+      };
+    };
     "fast-diff-1.1.2" = {
       name = "fast-diff";
       packageName = "fast-diff";
@@ -9501,6 +10194,15 @@ let
         sha512 = "2550z1qvyfv9js9vg2aaj57ji5d9hhg4f6zl4rf483d6xswv23ac6ipj8gbapv4sjx14dpcslqmnx1z78vvx4np4ad5mdrxwfvm98i9";
       };
     };
+    "fast-glob-2.2.2" = {
+      name = "fast-glob";
+      packageName = "fast-glob";
+      version = "2.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.2.tgz";
+        sha512 = "3d1g989yj1zkkpdpkfkapaix394mrc1ix2pwfqc48s94c4amykykjxcg6s0crqavh01zaqvz2mh663ljsq95vq3a0kk9d4z4b2b67jd";
+      };
+    };
     "fast-json-parse-1.0.3" = {
       name = "fast-json-parse";
       packageName = "fast-json-parse";
@@ -9753,13 +10455,13 @@ let
         sha1 = "948fcaade8221f715f5ecaddc54862faaacc9325";
       };
     };
-    "fill-range-2.2.3" = {
+    "fill-range-2.2.4" = {
       name = "fill-range";
       packageName = "fill-range";
-      version = "2.2.3";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz";
-        sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723";
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz";
+        sha512 = "3jpxxzv8ji9xqk6xwbr20nsl31jjqr5asnv0ayixyc3r393yv4r44b7lifpk1pqaw8clzs0cy7dnw9yb5axpg9ih7vfimzlp04xqykj";
       };
     };
     "fill-range-4.0.0" = {
@@ -10095,15 +10797,6 @@ let
         sha1 = "8e34298cbd2e176f254effec75a1c78cc849fd37";
       };
     };
-    "follow-redirects-1.3.0" = {
-      name = "follow-redirects";
-      packageName = "follow-redirects";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.3.0.tgz";
-        sha1 = "f684871fc116d2e329fda55ef67687f4fabc905c";
-      };
-    };
     "follow-redirects-1.4.1" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -10500,6 +11193,15 @@ let
         sha512 = "2hpc9wbzrndi5bswg9q9hwxmg4yd99zbvssxnz6g04clj68qhd8c83zn282v3q7f9h1xi7c4lmnn341nlgfpwby2k14738pr796a416";
       };
     };
+    "fs-mkdirp-stream-1.0.0" = {
+      name = "fs-mkdirp-stream";
+      packageName = "fs-mkdirp-stream";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz";
+        sha1 = "0b7815fc3201c6a69e14db98ce098c16935259eb";
+      };
+    };
     "fs-write-stream-atomic-1.0.10" = {
       name = "fs-write-stream-atomic";
       packageName = "fs-write-stream-atomic";
@@ -10545,13 +11247,13 @@ let
         sha512 = "25k3z64r4fhzjs1crh981lkkvkrhn2xv67k7y00zpnpsl571y5apg0r0kanddirms8kxf2xgf4yx9n2hzs9ml3v3p9qcnqhkh9khzja";
       };
     };
-    "fsevents-1.2.3" = {
+    "fsevents-1.2.4" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.3";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz";
-        sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz";
+        sha512 = "0vfzl6byj55zmi8xiqb9bqd5q0awlpgz4hsph9xzhzrd46did859d6fp5vydh7n4d0n1ph5q36smq6k3pjq6w5fxs0vx4xjv3yzrhfg";
       };
     };
     "fstream-0.1.31" = {
@@ -10806,13 +11508,13 @@ let
         sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14";
       };
     };
-    "get-uri-2.0.1" = {
+    "get-uri-2.0.2" = {
       name = "get-uri";
       packageName = "get-uri";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz";
-        sha512 = "10bm7v59d4pv7pk0smv9qwl8rp1iq60d20jdybycdpjqv85gdirf00kci8m5fz16gja9i5l60yxgiqzafj1195disavn21anrbab9zd";
+        url = "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz";
+        sha512 = "05kycjr66hr3sj0q6y8qxsmav30vfr267m8n7dvj791n5r92svqykd1zzjly21lpsnavjqs60cqaz35mxgaqzx13amhffhrsgjzcgb4";
       };
     };
     "get-value-2.0.6" = {
@@ -10950,15 +11652,6 @@ let
         sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
       };
     };
-    "glob-4.0.6" = {
-      name = "glob";
-      packageName = "glob";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
-        sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
-      };
-    };
     "glob-4.5.3" = {
       name = "glob";
       packageName = "glob";
@@ -11067,6 +11760,15 @@ let
         sha1 = "7045c99413b3eb94888d83ab46d0b404cc7bdde4";
       };
     };
+    "glob-to-regexp-0.3.0" = {
+      name = "glob-to-regexp";
+      packageName = "glob-to-regexp";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz";
+        sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab";
+      };
+    };
     "glob-watcher-0.0.6" = {
       name = "glob-watcher";
       packageName = "glob-watcher";
@@ -11203,6 +11905,15 @@ let
         sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c";
       };
     };
+    "globby-8.0.1" = {
+      name = "globby";
+      packageName = "globby";
+      version = "8.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/globby/-/globby-8.0.1.tgz";
+        sha512 = "2kvb22azhxv632w6jbgssa2k29c3vwann1f7g3ra974lg41hcw4s7cbc8260y0kycv93nfvkxsc9wyycsl4xmfjbi5s170ij6ndijm0";
+      };
+    };
     "globule-0.1.0" = {
       name = "globule";
       packageName = "globule";
@@ -11365,6 +12076,51 @@ let
         sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
       };
     };
+    "gulp-3.9.1" = {
+      name = "gulp";
+      packageName = "gulp";
+      version = "3.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
+        sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
+      };
+    };
+    "gulp-babel-6.1.3" = {
+      name = "gulp-babel";
+      packageName = "gulp-babel";
+      version = "6.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-babel/-/gulp-babel-6.1.3.tgz";
+        sha512 = "30pwc80sr470dxrjrikj17r3knnl8n4hdv8i07i8jwrq3siqvwnf5pbha23v3cxs2z9082mrwj1g13zy2mbmhk5ynwh7qpdg93pjvdn";
+      };
+    };
+    "gulp-clean-css-3.9.4" = {
+      name = "gulp-clean-css";
+      packageName = "gulp-clean-css";
+      version = "3.9.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.9.4.tgz";
+        sha512 = "1v2mrpipy2dh3fp6xc54dvzqyh7g0srsdi4fdj2icm309sg3lwpj8mdb7h7jlsiv39f3v5402a4w3dw92m3i19hsq3lycsnms7w1ilf";
+      };
+    };
+    "gulp-less-3.5.0" = {
+      name = "gulp-less";
+      packageName = "gulp-less";
+      version = "3.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz";
+        sha512 = "25zfq868z118rq2a1357zfzky1a4v4b5dp9ixny224v35vrbhylhbrn2a67viqf8hcw8k7byfh1c1q5bq69f8vdbk7d87fsx7pdh0hm";
+      };
+    };
+    "gulp-rename-1.2.3" = {
+      name = "gulp-rename";
+      packageName = "gulp-rename";
+      version = "1.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.3.tgz";
+        sha512 = "01v6g5dvnsxvzcwrw2m6kx3ghrpxmbwz4gwljm7qv9rhxhssssvy54llpib7b5i3iyjkb7mvy4a3lgcld7pxx9580wms9v380rlyrqa";
+      };
+    };
     "gulp-sourcemaps-1.6.0" = {
       name = "gulp-sourcemaps";
       packageName = "gulp-sourcemaps";
@@ -11374,6 +12130,33 @@ let
         sha1 = "b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c";
       };
     };
+    "gulp-sourcemaps-2.6.4" = {
+      name = "gulp-sourcemaps";
+      packageName = "gulp-sourcemaps";
+      version = "2.6.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.4.tgz";
+        sha1 = "cbb2008450b1bcce6cd23bf98337be751bf6e30a";
+      };
+    };
+    "gulp-typescript-4.0.2" = {
+      name = "gulp-typescript";
+      packageName = "gulp-typescript";
+      version = "4.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz";
+        sha512 = "1a8d5paj4shqz5h8nirrkg61r3s33qh1577a78cw2fx70xfkbr0mq059ld9rxijr7dvvch4qsclj5790smjmx3rnvz795xn0vjff5hy";
+      };
+    };
+    "gulp-uglify-3.0.0" = {
+      name = "gulp-uglify";
+      packageName = "gulp-uglify";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.0.tgz";
+        sha1 = "0df0331d72a0d302e3e37e109485dddf33c6d1ca";
+      };
+    };
     "gulp-util-3.0.8" = {
       name = "gulp-util";
       packageName = "gulp-util";
@@ -11518,13 +12301,13 @@ let
         sha1 = "e10749fb87828a52df96f4086587eb4a03966439";
       };
     };
-    "has-binary2-1.0.2" = {
+    "has-binary2-1.0.3" = {
       name = "has-binary2";
       packageName = "has-binary2";
-      version = "1.0.2";
+      version = "1.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.2.tgz";
-        sha1 = "e83dba49f0b9be4d026d27365350d9f03f54be98";
+        url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz";
+        sha512 = "2gww5b6yd5yg2vl5wzdba3azfrfg5llbfppzw99j8jnx3yqz9zyjxr8ra8dm9cjnl9h0xq9dc3hxmx84ma3s9hg06g13gnj20mdclhv";
       };
     };
     "has-color-0.1.7" = {
@@ -12355,13 +13138,13 @@ let
         sha512 = "0jj1pdq3j9ak8cixn2kjp7ip8hf3xgnb85j4jr32yf9rry620v9072c0kk577mllfk1zl9wzs5ypwzbp7vbhf7j31d5rrqgwb0nldm1";
       };
     };
-    "iconv-lite-0.4.22" = {
+    "iconv-lite-0.4.23" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.22";
+      version = "0.4.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz";
-        sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
+        sha512 = "062yxlrx4glr90bxn6jdv83qf03c9appkxdjjz5bhbphsx2yrn0y1i6yn9pfr3hfv2xiwq18hxvrvzfzfa7axv0sbgihskda58r7v4x";
       };
     };
     "iconv-lite-0.4.8" = {
@@ -12508,6 +13291,15 @@ let
         sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
       };
     };
+    "indx-0.2.3" = {
+      name = "indx";
+      packageName = "indx";
+      version = "0.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/indx/-/indx-0.2.3.tgz";
+        sha1 = "15dcf56ee9cf65c0234c513c27fbd580e70fbc50";
+      };
+    };
     "infinity-agent-2.0.3" = {
       name = "infinity-agent";
       packageName = "infinity-agent";
@@ -12517,13 +13309,13 @@ let
         sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216";
       };
     };
-    "inflection-1.10.0" = {
+    "inflection-1.12.0" = {
       name = "inflection";
       packageName = "inflection";
-      version = "1.10.0";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inflection/-/inflection-1.10.0.tgz";
-        sha1 = "5bffcb1197ad3e81050f8e17e21668087ee9eb2f";
+        url = "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz";
+        sha1 = "a200935656d6f5f6bc4dc7502e1aecb703228416";
       };
     };
     "inflection-1.3.8" = {
@@ -12679,13 +13471,22 @@ let
         sha512 = "1wsmzzva3rfjb4bfks7ba2nvha9ziwgq2kag6xxibc5cc6mz19xbgj4fm3a7ghvfbfx4am0x13ibc8j2s5m3sv12nph44rq56gnvv47";
       };
     };
-    "insert-module-globals-7.0.6" = {
+    "inquirer-5.2.0" = {
+      name = "inquirer";
+      packageName = "inquirer";
+      version = "5.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz";
+        sha512 = "18q95zmyca97iylvzibh193n81dp71yawcb56ib17inhq7g0nixmbx62j56bdv3d7lxsgwj8zw9zcmmhzjivx3wlb3b6a60jsf6dl0k";
+      };
+    };
+    "insert-module-globals-7.1.0" = {
       name = "insert-module-globals";
       packageName = "insert-module-globals";
-      version = "7.0.6";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.6.tgz";
-        sha512 = "3vjhls34i9vc0mm5cxlw6zbp1an494z9kbrrmj4hbv32fw0hx22nfpaj7j8i7lwkqa1sdqidxcfkga1630ya454h8h2ppbbl9s24ys7";
+        url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.1.0.tgz";
+        sha512 = "0b8s5vi57m46v468fw6gjdz1qhjlzid3kahhqnxsw3i8czv4xjn1bgcb6i56z1q8vs25lhzry0w4vfz85wx7sd2f3dkcapg4rvikdid";
       };
     };
     "insight-0.8.4" = {
@@ -12760,15 +13561,6 @@ let
         sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
       };
     };
-    "ip-1.0.1" = {
-      name = "ip";
-      packageName = "ip";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ip/-/ip-1.0.1.tgz";
-        sha1 = "c7e356cdea225ae71b36d70f2e71a92ba4e42590";
-      };
-    };
     "ip-1.1.5" = {
       name = "ip";
       packageName = "ip";
@@ -13606,6 +14398,15 @@ let
         sha1 = "d4b55c69f51886f9b65c70d6c2622d37e29f48fe";
       };
     };
+    "is-valid-glob-1.0.0" = {
+      name = "is-valid-glob";
+      packageName = "is-valid-glob";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz";
+        sha1 = "29bf3eff701be2d4d315dbacc39bc39fe8f601aa";
+      };
+    };
     "is-windows-0.2.0" = {
       name = "is-windows";
       packageName = "is-windows";
@@ -13957,6 +14758,15 @@ let
         sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513";
       };
     };
+    "jsesc-0.5.0" = {
+      name = "jsesc";
+      packageName = "jsesc";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz";
+        sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
+      };
+    };
     "jsesc-1.3.0" = {
       name = "jsesc";
       packageName = "jsesc";
@@ -14146,13 +14956,13 @@ let
         sha1 = "1eade7acc012034ad84e2396767ead9fa5495821";
       };
     };
-    "jsonata-1.5.0" = {
+    "jsonata-1.5.3" = {
       name = "jsonata";
       packageName = "jsonata";
-      version = "1.5.0";
+      version = "1.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.0.tgz";
-        sha512 = "3qb6rsslbqqrl7gna4xl2gsjqf8z5q4imysdp2plnqyr2q43hplwga22di8qv2q9dr1jgd4pgcbsdn23qcg9adsj0ml0b99dg8r7kq5";
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.5.3.tgz";
+        sha512 = "0lgmcfyrax8g07h2lhdlzw3i5dp28mdhg3azf2h7c1ig3nf3xv0dkrpdfsr155zhmbx2cyjr3w90hvkxc0vv2s4nj0zxdw15j6ywibn";
       };
     };
     "jsonfile-1.0.1" = {
@@ -14353,22 +15163,22 @@ let
         sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c";
       };
     };
-    "jwa-1.1.5" = {
+    "jwa-1.1.6" = {
       name = "jwa";
       packageName = "jwa";
-      version = "1.1.5";
+      version = "1.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.5.tgz";
-        sha1 = "a0552ce0220742cd52e153774a32905c30e756e5";
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.1.6.tgz";
+        sha512 = "1zwkw27arwkl75r6blgn935b2nrj3k7q9na65my3vw2w10caivrihdc4q8qq8qh509jh4nn04x0mfi6bd0gx9caj44ln1dyzxqvy4xl";
       };
     };
-    "jws-3.1.4" = {
+    "jws-3.1.5" = {
       name = "jws";
       packageName = "jws";
-      version = "3.1.4";
+      version = "3.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jws/-/jws-3.1.4.tgz";
-        sha1 = "f9e8b9338e8a847277d6444b1464f61880e050a2";
+        url = "https://registry.npmjs.org/jws/-/jws-3.1.5.tgz";
+        sha512 = "2wvh8snqyvylbqq0f7i6gcr7v4cl42mr46d80k7076c6g1b2xr50rp1b9zc40dlni7j58qzyayf693bdzr1ryf4mwad832025xr5h0s";
       };
     };
     "jwt-decode-2.2.0" = {
@@ -14407,13 +15217,13 @@ let
         sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j";
       };
     };
-    "k-bucket-4.0.0" = {
+    "k-bucket-4.0.1" = {
       name = "k-bucket";
       packageName = "k-bucket";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.0.tgz";
-        sha512 = "04i173zw3l2aagsnywafmgs87wzhhkakvnhcfvxbnbmn7rz37rkqkryc8d6x8dccqlmvgawb2vhd49ms8s2wkbg3dh3qlffamzcpshk";
+        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.1.tgz";
+        sha512 = "1qyasv93yhjmmvsrxq5srbi1y6wj2vqpnnb1wafjxg1ffj01pyhx9jgqw0byrjm097ywrz0k9yki7dcnn2ncwqxyryqys7hincykw32";
       };
     };
     "k-rpc-3.7.0" = {
@@ -14489,13 +15299,13 @@ let
         sha1 = "83cb748496ac491c7135104cbe56b88ca7392477";
       };
     };
-    "keen.io-0.1.3" = {
+    "keen.io-0.1.5" = {
       name = "keen.io";
       packageName = "keen.io";
-      version = "0.1.3";
+      version = "0.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz";
-        sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
+        url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.5.tgz";
+        sha512 = "07k7qknfjqnlpkx0ib04dxrvaafxfr1pcl691zp4zfvkmyz52ssx9a35w3na2fllvl7h8b95cl2xzmi3b4yraiwndia9cibd2l8nysc";
       };
     };
     "keep-alive-agent-0.0.1" = {
@@ -14561,6 +15371,15 @@ let
         sha512 = "32ga97c763vprf4sjbb2f7gbngfppq9n1hy4cpq2h4yb1msrhh2zjimxib7p09mzgynm6askbigxlsqsm11p644avp4sf5nmng8f2vs";
       };
     };
+    "kind-of-1.1.0" = {
+      name = "kind-of";
+      packageName = "kind-of";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz";
+        sha1 = "140a3d2d41a36d2efcfa9377b62c24f8495a5c44";
+      };
+    };
     "kind-of-2.0.1" = {
       name = "kind-of";
       packageName = "kind-of";
@@ -14723,6 +15542,24 @@ let
         sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
       };
     };
+    "lead-1.0.0" = {
+      name = "lead";
+      packageName = "lead";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz";
+        sha1 = "6f14f99a37be3a9dd784f5495690e5903466ee42";
+      };
+    };
+    "leb-0.3.0" = {
+      name = "leb";
+      packageName = "leb";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/leb/-/leb-0.3.0.tgz";
+        sha1 = "32bee9fad168328d6aea8522d833f4180eed1da3";
+      };
+    };
     "leek-0.0.24" = {
       name = "leek";
       packageName = "leek";
@@ -14786,13 +15623,13 @@ let
         sha512 = "1xwlwdkqryzw8bd0ywmjnlrcd85c88hrcf8r245377p52cwvgcrjsajg5w8zpx1d236v6043v4c3a29lcbyqmxqmh7apl9lhhdjlrix";
       };
     };
-    "level-sublevel-6.6.1" = {
+    "level-sublevel-6.6.2" = {
       name = "level-sublevel";
       packageName = "level-sublevel";
-      version = "6.6.1";
+      version = "6.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.1.tgz";
-        sha1 = "f9a77f7521ab70a8f8e92ed56f21a3c7886a4485";
+        url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.2.tgz";
+        sha512 = "1fy1czzr4d4w51bigbmwicz2maa7rm5ih8j5b0jcm6sa9y35n4f6zs6yc9zm8lbhnk2kb91g5jpgz3jmigf01nlpdis2g2qc6m6s6ps";
       };
     };
     "leveldown-0.10.6" = {
@@ -15317,6 +16154,15 @@ let
         sha1 = "e56b176b6823a7dde38f7f2bf58de7d5971200e9";
       };
     };
+    "lodash.clone-4.5.0" = {
+      name = "lodash.clone";
+      packageName = "lodash.clone";
+      version = "4.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz";
+        sha1 = "195870450f5a13192478df4bc3d23d2dea1907b6";
+      };
+    };
     "lodash.clonedeep-4.5.0" = {
       name = "lodash.clonedeep";
       packageName = "lodash.clonedeep";
@@ -15560,6 +16406,15 @@ let
         sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b";
       };
     };
+    "lodash.partialright-4.2.1" = {
+      name = "lodash.partialright";
+      packageName = "lodash.partialright";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.partialright/-/lodash.partialright-4.2.1.tgz";
+        sha1 = "0130d80e83363264d40074f329b8a3e7a8a1cc4b";
+      };
+    };
     "lodash.pick-4.4.0" = {
       name = "lodash.pick";
       packageName = "lodash.pick";
@@ -15713,13 +16568,13 @@ let
         sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708";
       };
     };
-    "log4js-2.5.3" = {
+    "log4js-2.6.1" = {
       name = "log4js";
       packageName = "log4js";
-      version = "2.5.3";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/log4js/-/log4js-2.5.3.tgz";
-        sha512 = "29zsw029b55hq8a7c5hrqwf4ka97sai18wn4vpxhzgg61jisclhcxlfm4m219iz3j3kqfkyb3k76dmwvqm2ivk6b4iavd2q7jjymgv0";
+        url = "https://registry.npmjs.org/log4js/-/log4js-2.6.1.tgz";
+        sha512 = "254l8in0izc772xvl9krch7nll86c1a3b1i9j1yb3sl1rialgynw6q2slza1vmmh49b375a3qfj4ir9pkzgsas48rbrzi10px71dsh4";
       };
     };
     "loggly-1.1.1" = {
@@ -15749,6 +16604,15 @@ let
         sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f";
       };
     };
+    "long-3.2.0" = {
+      name = "long";
+      packageName = "long";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/long/-/long-3.2.0.tgz";
+        sha1 = "d821b7138ca1cb581c172990ef14db200b5c474b";
+      };
+    };
     "longest-1.0.1" = {
       name = "longest";
       packageName = "longest";
@@ -15902,15 +16766,6 @@ let
         sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c";
       };
     };
-    "lru-cache-2.6.5" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "2.6.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.6.5.tgz";
-        sha1 = "e56d6354148ede8d7707b58d143220fd08df0fd5";
-      };
-    };
     "lru-cache-2.7.3" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -15929,13 +16784,22 @@ let
         sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee";
       };
     };
-    "lru-cache-4.1.2" = {
+    "lru-cache-4.1.3" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.1.2";
+      version = "4.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz";
-        sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz";
+        sha512 = "0j2ny2y61f70dbzarfa1xazv68dw7nb2r4p5sy46fw6dwr9y0yg003lb1yv7sdl77hcrpzn22mih799z657sz21al4qmf1kr2yj2lbw";
+      };
+    };
+    "lru-queue-0.1.0" = {
+      name = "lru-queue";
+      packageName = "lru-queue";
+      version = "0.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
+        sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
       };
     };
     "ltgt-1.0.2" = {
@@ -16001,13 +16865,13 @@ let
         sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8";
       };
     };
-    "magnet-uri-5.1.7" = {
+    "magnet-uri-5.1.8" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
-      version = "5.1.7";
+      version = "5.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.7.tgz";
-        sha1 = "8f8016ab74c415f274f4fb1943faaf7e92030eff";
+        url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.8.tgz";
+        sha512 = "3qgdbgmbzxiq3df1vnr1d3r4gvlbrgzn1ga7hhpnqwk85kl01w7gd5l860xacnn5250g1jrnh4js55j99r77y4n5qp66nxpa3rqjw5c";
       };
     };
     "mailcomposer-2.1.0" = {
@@ -16037,13 +16901,13 @@ let
         sha1 = "b635402cc7f2eedb10130d3d09ad88b1c2d7e101";
       };
     };
-    "mailgun-js-0.7.15" = {
+    "mailgun-js-0.18.0" = {
       name = "mailgun-js";
       packageName = "mailgun-js";
-      version = "0.7.15";
+      version = "0.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.7.15.tgz";
-        sha1 = "ee366a20dac64c3c15c03d6c1b3e0ed795252abb";
+        url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.0.tgz";
+        sha512 = "3b2vvr69hb5ka91bcgv18fvaiwswkqpj9034xqbx687ihl1ab6sh6gbvknxg3zyxdhyxlsdlm727f2d0dcbvbaxiy891iv56s7glhx3";
       };
     };
     "mailparser-0.6.2" = {
@@ -16055,13 +16919,13 @@ let
         sha1 = "03c486039bdf4df6cd3b6adcaaac4107dfdbc068";
       };
     };
-    "make-dir-1.2.0" = {
+    "make-dir-1.3.0" = {
       name = "make-dir";
       packageName = "make-dir";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz";
-        sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8";
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz";
+        sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv";
       };
     };
     "make-error-1.3.4" = {
@@ -16217,6 +17081,15 @@ let
         sha512 = "1hfvbsx85xqrw6g0k7rkqwngl8b2nwj92ax10ilx3b4lma2mcp8q6zpvam1sffgqsssa9d13cj7prrzg5c00mf0c8q92w59m36ach4x";
       };
     };
+    "math-random-1.0.1" = {
+      name = "math-random";
+      packageName = "math-random";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz";
+        sha1 = "8b3aac588b8a66e4975e3cdea67f7bb329601fac";
+      };
+    };
     "md5-2.2.1" = {
       name = "md5";
       packageName = "md5";
@@ -16235,13 +17108,13 @@ let
         sha1 = "e9bdbde94a20a5ac18b04340fc5764d5b09d901d";
       };
     };
-    "mdn-data-1.1.2" = {
+    "mdn-data-1.1.3" = {
       name = "mdn-data";
       packageName = "mdn-data";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.2.tgz";
-        sha512 = "3x1bk7zqpzy2m8cc3qv575crg71dgj4mb0vl7nq4g3y8bjl2hw0qv2c6ss1iss6gpdrslaif4yp7ggrf0ldiplmk2ld4p9yhmzsljhx";
+        url = "https://registry.npmjs.org/mdn-data/-/mdn-data-1.1.3.tgz";
+        sha512 = "0ly3w028pxhm83a538dms6xm5rw84xy7pq16354kfpbd72ng0rykvbnfcs1c3ijdcr7xfxzva4pp10wqf6nxysj375vinqbki1zmgl7";
       };
     };
     "mdns-js-0.5.0" = {
@@ -16289,13 +17162,13 @@ let
         sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
       };
     };
-    "mediasource-2.2.0" = {
+    "mediasource-2.2.1" = {
       name = "mediasource";
       packageName = "mediasource";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.0.tgz";
-        sha512 = "2y4j45xwbrb5cd7b66ndvk5hqy18slbkcvji5krlcg07vpszsrvz732y2ih9li0wn9qh56rx5fz6qb3kdnx877b0snjxhgyj74jlicg";
+        url = "https://registry.npmjs.org/mediasource/-/mediasource-2.2.1.tgz";
+        sha512 = "2bzbkjhjcmg6cbq75b1glxr1q3csvsgp3yl2vr5dawp9r72q6xvb0ih56g64swq30mmxm199drpjyskk6qq5bw31zp5dv2nysh646sr";
       };
     };
     "mediawiki-title-0.6.5" = {
@@ -16334,6 +17207,15 @@ let
         sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608";
       };
     };
+    "memoizee-0.4.12" = {
+      name = "memoizee";
+      packageName = "memoizee";
+      version = "0.4.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/memoizee/-/memoizee-0.4.12.tgz";
+        sha512 = "1z1dvgwbqjls9whb2692xq9rdnwsf7jwlhkbx3gnsq8kvkmh3qw9ngis5xnzvnjv5mnqbz5ca4amhbjlgyyd88kpj0ibi7hm6xw36mj";
+      };
+    };
     "memory-chunk-store-1.3.0" = {
       name = "memory-chunk-store";
       packageName = "memory-chunk-store";
@@ -16442,6 +17324,15 @@ let
         sha1 = "4041202d508a342ba00174008df0c251b8c135e1";
       };
     };
+    "merge2-1.2.2" = {
+      name = "merge2";
+      packageName = "merge2";
+      version = "1.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merge2/-/merge2-1.2.2.tgz";
+        sha512 = "0d0aqj17hg50jnnnq6173f0znw873jyslm9y01wq1ip8bfxrh1db6ca90pml1kvbffsmhi62cqi08sqp8l8cvbdifkvbspw06vkq0vf";
+      };
+    };
     "merkle-tree-stream-3.0.3" = {
       name = "merkle-tree-stream";
       packageName = "merkle-tree-stream";
@@ -16973,13 +17864,13 @@ let
         sha1 = "23215833f1da13fd606ccb8087b44852dcb821fd";
       };
     };
-    "module-deps-6.0.2" = {
+    "module-deps-6.1.0" = {
       name = "module-deps";
       packageName = "module-deps";
-      version = "6.0.2";
+      version = "6.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.0.2.tgz";
-        sha512 = "2zf8ycbhqnh9hc6zd3h5s1ii6bjg41z721ffg760j8i045vjjzpzzg542c02ylkic68p0skw1ss97lwphblcw8rip3ik29x9pglhq19";
+        url = "https://registry.npmjs.org/module-deps/-/module-deps-6.1.0.tgz";
+        sha512 = "2wqrwpfiyxwawrz1wisdh8njmshb9y8glv1xxwjkp38cfz7k03bp335dvfmphxc0kc0492v2i583f7w50mqaqjjmmmksm3mklvkkyrl";
       };
     };
     "mold-source-map-0.4.0" = {
@@ -17054,13 +17945,13 @@ let
         sha1 = "359a19ec634cda3c706c8709adda54c0329aaec4";
       };
     };
-    "moment-timezone-0.5.16" = {
+    "moment-timezone-0.5.17" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
-      version = "0.5.16";
+      version = "0.5.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.16.tgz";
-        sha512 = "0vnhrg02rgwwa4zzdm7g9j3sd17j8vn30cjiflg86lac0k2fvfaixl7fwd1yx990yr6abq6zhk5gmaqx2vgz22a6akxld35dbvnbpg1";
+        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.17.tgz";
+        sha512 = "1ffjwjpgny3zjccmx9gdakpjg0v120yckblsqy0m2zwl2xagf1wlm37djn53r5slslpr2w754abaxaf9ig3nbwfhr30yf488ma6kwk3";
       };
     };
     "mongodb-1.2.14" = {
@@ -17153,22 +18044,22 @@ let
         sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
       };
     };
-    "mqtt-2.15.1" = {
+    "mqtt-2.17.0" = {
       name = "mqtt";
       packageName = "mqtt";
-      version = "2.15.1";
+      version = "2.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.15.1.tgz";
-        sha512 = "13ycishr81p39yimwf97c4p9pwhg8a0k2hfmfhkcrpy4yshilfb9rr197fr0r27kniqnbzcfsa19pyvgnkrq24zb4kdiafgrw8kbif1";
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-2.17.0.tgz";
+        sha512 = "1mqfnz7s0gnga7gdh29qj4lfybm3fzsc6w3x610sr50h9dhbi3m5isfri63d87rdlyp5dspy11gpdah2h1ikaq3zi7wfhf6dzj8m1vr";
       };
     };
-    "mqtt-packet-5.5.0" = {
+    "mqtt-packet-5.6.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
-      version = "5.5.0";
+      version = "5.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.5.0.tgz";
-        sha512 = "3wbymw2jfhqw0z4zcasxy5njy5ynwrbfq1vkrb2pwwx28mkrywlj2mq4bykrgjgq09v6a5carizhcl6h1kbcvmn902kbbpxxb1r87wi";
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-5.6.0.tgz";
+        sha512 = "1gvb90a13pd8xx7mkx6nxfs8cc2ysf58vwccvm1jh5myhwjyvsamj5f9fi398vgk9haxmg25l00lwbs4cdnvs638r5iswga5gd9wh20";
       };
     };
     "mri-1.1.0" = {
@@ -17396,13 +18287,13 @@ let
         sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
       };
     };
-    "multiparty-4.1.3" = {
+    "multiparty-4.1.4" = {
       name = "multiparty";
       packageName = "multiparty";
-      version = "4.1.3";
+      version = "4.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz";
-        sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94";
+        url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.4.tgz";
+        sha1 = "4c96dcbdc11e3f7917e1615e640b4b5022be64fd";
       };
     };
     "multipipe-0.1.2" = {
@@ -17968,6 +18859,15 @@ let
         sha1 = "ca86d1fe8828169b0120208e3dc8424b9db8342c";
       };
     };
+    "nice-try-1.0.4" = {
+      name = "nice-try";
+      packageName = "nice-try";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nice-try/-/nice-try-1.0.4.tgz";
+        sha512 = "1q1ilnr4a3k89z4v5lipni43drh0nxzzmf51nr50rx6g0xlkx3w4647dic11xcilxzqicn1fqpmg45jnkqd27jrrjzvrww2g8a65nnq";
+      };
+    };
     "nijs-0.0.25" = {
       name = "nijs";
       packageName = "nijs";
@@ -18463,6 +19363,15 @@ let
         sha512 = "0rykwifg14xfgm9m6md48rkqqxa2cya4xdsv7jjciacis2nz6dzaccpzyldlpvy14rvihpxbdiysfn49a8x8x5jw84klmxzh9di98qg";
       };
     };
+    "now-and-later-2.0.0" = {
+      name = "now-and-later";
+      packageName = "now-and-later";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.0.tgz";
+        sha1 = "bc61cbb456d79cb32207ce47ca05136ff2e7d6ee";
+      };
+    };
     "npm-3.10.10" = {
       name = "npm";
       packageName = "npm";
@@ -18472,13 +19381,13 @@ let
         sha1 = "5b1d577e4c8869d6c8603bc89e9cd1637303e46e";
       };
     };
-    "npm-6.0.0" = {
+    "npm-6.0.1" = {
       name = "npm";
       packageName = "npm";
-      version = "6.0.0";
+      version = "6.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
-        sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
+        url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz";
+        sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp";
       };
     };
     "npm-bundled-1.0.3" = {
@@ -18580,13 +19489,13 @@ let
         sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
       };
     };
-    "npmconf-2.1.2" = {
+    "npmconf-2.1.3" = {
       name = "npmconf";
       packageName = "npmconf";
-      version = "2.1.2";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
-        sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
+        url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.3.tgz";
+        sha512 = "22f6r0rdspn2cra19jdxblr3qrqk786z3c50h0q4581i49pgzfi9hnprzih7g11hff2zvf86y43aagyi44031v3l21cf6dwiqfbwcl9";
       };
     };
     "npmi-2.0.1" = {
@@ -19391,15 +20300,6 @@ let
         sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3";
       };
     };
-    "pac-proxy-agent-1.1.0" = {
-      name = "pac-proxy-agent";
-      packageName = "pac-proxy-agent";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz";
-        sha512 = "30jd44ckpmfj9prfhzc8bjvn5b5adxk93g9saif813id8mrvl3g1asrhz9l0bc2rp0i779wnhg1rjw80h2y7zk8v02ghq4bdh4hn4a0";
-      };
-    };
     "pac-proxy-agent-2.0.2" = {
       name = "pac-proxy-agent";
       packageName = "pac-proxy-agent";
@@ -19409,15 +20309,6 @@ let
         sha512 = "3222l2ayjn9gj3q7br4vxqz1a5bq5h53fcqvrns3zdlqfinarbi0kgkrlf7vyc7arr7ljks5988y4a6lyd663br23wvg391a4vl0cvh";
       };
     };
-    "pac-resolver-2.0.0" = {
-      name = "pac-resolver";
-      packageName = "pac-resolver";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-2.0.0.tgz";
-        sha1 = "99b88d2f193fbdeefc1c9a529c1f3260ab5277cd";
-      };
-    };
     "pac-resolver-3.0.0" = {
       name = "pac-resolver";
       packageName = "pac-resolver";
@@ -19841,6 +20732,15 @@ let
         sha1 = "fad9db6ae252f8b088e0c5decd20a7da0c5d9f1e";
       };
     };
+    "path-0.12.7" = {
+      name = "path";
+      packageName = "path";
+      version = "0.12.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path/-/path-0.12.7.tgz";
+        sha1 = "d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f";
+      };
+    };
     "path-browserify-0.0.0" = {
       name = "path-browserify";
       packageName = "path-browserify";
@@ -20319,6 +21219,24 @@ let
         sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d";
       };
     };
+    "plugin-error-0.1.2" = {
+      name = "plugin-error";
+      packageName = "plugin-error";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz";
+        sha1 = "3b9bb3335ccf00f425e07437e19276967da47ace";
+      };
+    };
+    "plugin-error-1.0.1" = {
+      name = "plugin-error";
+      packageName = "plugin-error";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz";
+        sha512 = "32d7a6iycndvgqcm7crxl59cfqlsz01iz6q7f4a4jgzwmp68myw0sl8315c0lyx2wvj4xmblhvd8jva3vhqndn1chg6rg1vv78wyp1g";
+      };
+    };
     "pluralize-1.2.1" = {
       name = "pluralize";
       packageName = "pluralize";
@@ -20706,6 +21624,15 @@ let
         sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931";
       };
     };
+    "promise-timeout-1.3.0" = {
+      name = "promise-timeout";
+      packageName = "promise-timeout";
+      version = "1.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-timeout/-/promise-timeout-1.3.0.tgz";
+        sha512 = "2m6ixvg01qqcrywfm8jv1phv3irv63qbk901nq6wg3vhvs4wg5c8qz45fs8rzw8yr1h0p6f7dyb0ndll2irpcpkz1z2x6id9m60s877";
+      };
+    };
     "promised-temp-0.1.0" = {
       name = "promised-temp";
       packageName = "promised-temp";
@@ -20715,6 +21642,15 @@ let
         sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb";
       };
     };
+    "promisify-call-2.0.4" = {
+      name = "promisify-call";
+      packageName = "promisify-call";
+      version = "2.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promisify-call/-/promisify-call-2.0.4.tgz";
+        sha1 = "d48c2d45652ccccd52801ddecbd533a6d4bd5fba";
+      };
+    };
     "prompt-0.2.14" = {
       name = "prompt";
       packageName = "prompt";
@@ -20832,15 +21768,6 @@ let
         sha512 = "1fjf093wrxz3nm9njw491r9rvqwrcv8d8h0mnmyakpijnbff7lllysr7aq9h9w7jdvxjvaf9r055ywd7sghcqxwa2nfpdc9423c414d";
       };
     };
-    "proxy-agent-2.0.0" = {
-      name = "proxy-agent";
-      packageName = "proxy-agent";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.0.0.tgz";
-        sha1 = "57eb5347aa805d74ec681cb25649dba39c933499";
-      };
-    };
     "proxy-agent-3.0.0" = {
       name = "proxy-agent";
       packageName = "proxy-agent";
@@ -20868,6 +21795,15 @@ let
         sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56";
       };
     };
+    "proxy-polyfill-0.2.0" = {
+      name = "proxy-polyfill";
+      packageName = "proxy-polyfill";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-polyfill/-/proxy-polyfill-0.2.0.tgz";
+        sha512 = "2a3g6pp92js3qwb034f8bh8ngc9da11d281brljvs7n59q7xj6hsk0d83s3n9k84z9dhq2f7fpnp8kwg8yh7d8qr7kw78l7r5ndxv4y";
+      };
+    };
     "prr-0.0.0" = {
       name = "prr";
       packageName = "prr";
@@ -21048,6 +21984,15 @@ let
         sha1 = "b642dd1255da376a706b6db4fa962f5fdb74c31b";
       };
     };
+    "pull-defer-0.2.2" = {
+      name = "pull-defer";
+      packageName = "pull-defer";
+      version = "0.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/pull-defer/-/pull-defer-0.2.2.tgz";
+        sha1 = "0887b0ffb30af32a56dbecfa72c1672271f07b13";
+      };
+    };
     "pull-level-2.0.4" = {
       name = "pull-level";
       packageName = "pull-level";
@@ -21075,13 +22020,13 @@ let
         sha1 = "5f2f3aed47ad86919f01b12a2e99d6f1bd776581";
       };
     };
-    "pull-stream-3.6.7" = {
+    "pull-stream-3.6.8" = {
       name = "pull-stream";
       packageName = "pull-stream";
-      version = "3.6.7";
+      version = "3.6.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.7.tgz";
-        sha512 = "0cq5h32fsfnhxa9wbgk55jhr0z4mx6zmm42nx9r6n3j4bpl6sw2a6vh41raicq2q11bxh1vg7jxv2cdqw7nq6zb0fxm5nj8ipz3dlax";
+        url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.8.tgz";
+        sha512 = "3w8xs22qp9cqpvgy1zgnajk9jw25g4x2x5xlak657g3rb59whqf4gp1kk747kddav3d83ppgr9fyg9r560nc8f52qmwsw01sjk0h1f1";
       };
     };
     "pull-window-2.1.4" = {
@@ -21129,13 +22074,13 @@ let
         sha512 = "31n24fqakqmhzk2ch644gziskmysmrgiwclsdsr0rwk9spgikqpwickbnayap0rynfjlq72s7iny2p35n3qszypr97ws5njkpx741ig";
       };
     };
-    "pumpify-1.5.0" = {
+    "pumpify-1.5.1" = {
       name = "pumpify";
       packageName = "pumpify";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.0.tgz";
-        sha512 = "0kf28xyrgm26kblaainzcxi4dqyxv0q1a03b55a9sma3b37sf9nkk2ysk7df2r4864ic4yr4j47plap1l0lck1raxnwraz8a29b8s2i";
+        url = "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz";
+        sha512 = "1sxm2mh7jmxhjqdrpdqrhc61ipk2cjyyyvsn9hmxlxnlpsasyzjdicl98pm63zv30012qhrxl57vdpdnnq2m2hl4w4ybgn7gqimjad0";
       };
     };
     "punycode-1.3.2" = {
@@ -21480,13 +22425,13 @@ let
         sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99";
       };
     };
-    "randomatic-1.1.7" = {
+    "randomatic-3.0.0" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.7";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
-        sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz";
+        sha512 = "142g2k8ipzpkp1sv5zsbk8qy39r5isc1s9q2x910dh6zqwdksd6mkq16apdrfw6ssv14hpg64j4zy3v4m4lclpvwi767phqh4w4bp2m";
       };
     };
     "randombytes-2.0.6" = {
@@ -21597,6 +22542,15 @@ let
         sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89";
       };
     };
+    "raw-body-2.3.3" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz";
+        sha512 = "27ygzjzpajjmz2bl1f7y1bla7wdw65w912r4i29x9p1r0pa5jivip658vwlkqq77n1nc619w1p52818mvihxhks4dlbc1pmbc925szm";
+      };
+    };
     "raw-socket-1.6.0" = {
       name = "raw-socket";
       packageName = "raw-socket";
@@ -21957,6 +22911,15 @@ let
         sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
       };
     };
+    "regenerate-1.4.0" = {
+      name = "regenerate";
+      packageName = "regenerate";
+      version = "1.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz";
+        sha512 = "0m5jil0f2yz4js80jxvwilkhq6im5h6h0pa4disk3fsv9lm23lz8ly5219518j47v4fn0h248s9jf5pqhxhcr6z5cmxvbnna0js6vnl";
+      };
+    };
     "regenerator-runtime-0.10.5" = {
       name = "regenerator-runtime";
       packageName = "regenerator-runtime";
@@ -21984,6 +22947,15 @@ let
         sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029";
       };
     };
+    "regenerator-transform-0.10.1" = {
+      name = "regenerator-transform";
+      packageName = "regenerator-transform";
+      version = "0.10.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz";
+        sha512 = "3lxj64s9v2jksipiz0pphfy6m12cf7j96w64bqlzjwnasbpqhc5ws5bjzv3x9ld625v1z4f15l30izpv3p6l9w8h1qsvf6vy1pak5rw";
+      };
+    };
     "regex-cache-0.4.4" = {
       name = "regex-cache";
       packageName = "regex-cache";
@@ -22011,6 +22983,15 @@ let
         sha512 = "21xg69jgy5r7mffh5gjaqsv6izqvqh466q3fanmnzsgk33xhxp68nnszw4jcxk2w8lnc92phy26sr7xqq3ni36mg9yh2xb0bbqg1qrc";
       };
     };
+    "regexpu-core-2.0.0" = {
+      name = "regexpu-core";
+      packageName = "regexpu-core";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz";
+        sha1 = "49d038837b8dcf8bfa5b9a42139938e6ea2ae240";
+      };
+    };
     "registry-auth-token-3.3.2" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
@@ -22029,6 +23010,24 @@ let
         sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
       };
     };
+    "regjsgen-0.2.0" = {
+      name = "regjsgen";
+      packageName = "regjsgen";
+      version = "0.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz";
+        sha1 = "6c016adeac554f75823fe37ac05b92d5a4edb1f7";
+      };
+    };
+    "regjsparser-0.1.5" = {
+      name = "regjsparser";
+      packageName = "regjsparser";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz";
+        sha1 = "7ee8f84dc6fa792d3fd0ae228d24bd949ead205c";
+      };
+    };
     "reinterval-1.1.0" = {
       name = "reinterval";
       packageName = "reinterval";
@@ -22092,6 +23091,24 @@ let
         sha1 = "a7105e25b9ee2bf9a49b75d2c423f11b06ae2092";
       };
     };
+    "remove-bom-buffer-3.0.0" = {
+      name = "remove-bom-buffer";
+      packageName = "remove-bom-buffer";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz";
+        sha512 = "1frr714kg9xk84fp4r74zg044g4lhf996lw9gzd19mlij47jkbnb44xmmas7wqv5604r77n68qx77wrnrc7mkfbm5ygv4ls2rdapzgj";
+      };
+    };
+    "remove-bom-stream-1.2.0" = {
+      name = "remove-bom-stream";
+      packageName = "remove-bom-stream";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz";
+        sha1 = "05f1a593f16e42e1fb90ebf59de8e569525f9523";
+      };
+    };
     "remove-trailing-separator-1.1.0" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
@@ -22101,13 +23118,13 @@ let
         sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef";
       };
     };
-    "render-media-3.0.0" = {
+    "render-media-3.1.0" = {
       name = "render-media";
       packageName = "render-media";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/render-media/-/render-media-3.0.0.tgz";
-        sha512 = "27zqxwa89zq3m0h5qykra6yx9jbc5cljfpx80nrm3y3rhl7ngm17fyb42xhw2sa584x2ld6ll1lnyrhvs3cihfm1ivd9g1hlvjvjaai";
+        url = "https://registry.npmjs.org/render-media/-/render-media-3.1.0.tgz";
+        sha512 = "1bn4ydc33jwgczi5xicf07v4vn067m4jaz85iqssigdzhq09p1cdqjfqy9xm2dvs5qs64iv1za5iw4my0s6synzdv8cmz69q605qcxd";
       };
     };
     "render-readme-1.3.1" = {
@@ -22245,6 +23262,15 @@ let
         sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph";
       };
     };
+    "request-2.86.0" = {
+      name = "request";
+      packageName = "request";
+      version = "2.86.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/request/-/request-2.86.0.tgz";
+        sha512 = "37xa5i4dk3fkcl9gxrzxkjjy6vcqn6bcc61bwq6kjpqrg5i01yc6xn0iq3zy68vqqav93k1kgr2xdabp22p0bfynfcbzxp8ms3n41h5";
+      };
+    };
     "request-2.9.203" = {
       name = "request";
       packageName = "request";
@@ -22389,6 +23415,15 @@ let
         sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748";
       };
     };
+    "resolve-options-1.1.0" = {
+      name = "resolve-options";
+      packageName = "resolve-options";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz";
+        sha1 = "32bb9e39c06d67338dc9378c0d6d6074566ad131";
+      };
+    };
     "resolve-url-0.2.1" = {
       name = "resolve-url";
       packageName = "resolve-url";
@@ -22974,15 +24009,6 @@ let
         sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
       };
     };
-    "semver-5.4.1" = {
-      name = "semver";
-      packageName = "semver";
-      version = "5.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz";
-        sha512 = "2r13vwvb5ick34k6flr7vgbjfsdka8zbj5a74rd0ba4bp0nqmhppbaw3qlwn7f4smpifpa4iy4hxj137y598rbvsmy3h0d8vxgvzwar";
-      };
-    };
     "semver-5.5.0" = {
       name = "semver";
       packageName = "semver";
@@ -23100,15 +24126,6 @@ let
         sha1 = "20f23a9c925b762ab82705fe2f9db252ace47e34";
       };
     };
-    "send-0.16.1" = {
-      name = "send";
-      packageName = "send";
-      version = "0.16.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/send/-/send-0.16.1.tgz";
-        sha512 = "3c9rfxzsayrnka50s3hdbln9sjzad94ll4z2nx83i3rqciy4dxj05x34sjmm64k46zmk99pj8g4bcwk476a3iqzpcxgja28s8jqnl0j";
-      };
-    };
     "send-0.16.2" = {
       name = "send";
       packageName = "send";
@@ -23208,15 +24225,6 @@ let
         sha1 = "b973773f63449934da54e5beba5e31d9f4211577";
       };
     };
-    "serve-static-1.13.1" = {
-      name = "serve-static";
-      packageName = "serve-static";
-      version = "1.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.13.1.tgz";
-        sha512 = "2ahchxbzy0wr61gjy85p35cx4rkfb5347fmglk5rb2wawla3nhx6xx8hsgvmvjcsp5vfdilvf84kcnvp832f1anylsg4sqgpdk188w5";
-      };
-    };
     "serve-static-1.13.2" = {
       name = "serve-static";
       packageName = "serve-static";
@@ -23559,13 +24567,13 @@ let
         sha1 = "71766db352326928cf3a807242ba762322636723";
       };
     };
-    "simple-sha1-2.1.0" = {
+    "simple-sha1-2.1.1" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz";
-        sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3";
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.1.tgz";
+        sha512 = "2l45afqnby96gdihg3hi51006502yc33wly8cgmgrww00aiq37jdvp22l9qhbxljra5j6s8lwigjh5hpzj521ccgwlhk59zw9vhylx4";
       };
     };
     "simple-swizzle-0.2.2" = {
@@ -23847,13 +24855,13 @@ let
         sha512 = "0k2smmr24w5hb1cpql6vcgh58vzp4pmh9anf0bgz3arlsgq1mapnlq9fjqr6xs10aq1cmxaw987fwknqi62frax0fvs9bj3q3kmpg8l";
       };
     };
-    "snyk-1.78.1" = {
+    "snyk-1.80.1" = {
       name = "snyk";
       packageName = "snyk";
-      version = "1.78.1";
+      version = "1.80.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk/-/snyk-1.78.1.tgz";
-        sha1 = "a9eefbc97c6f0179f3cc318a4232aacd57e347fe";
+        url = "https://registry.npmjs.org/snyk/-/snyk-1.80.1.tgz";
+        sha1 = "f92d1fea82833a39a607598f847e2699f033be5c";
       };
     };
     "snyk-config-2.1.0" = {
@@ -23901,22 +24909,22 @@ let
         sha512 = "3pq0wqa8isczv7pcwfm9jfh5qkwjd482hw45m40c5vnnzbxxbji4m1zvxybpzb08azfp6rigblr0hkrhb8m59qf24hcy1scgn3ddr49";
       };
     };
-    "snyk-nuget-plugin-1.4.0" = {
+    "snyk-nuget-plugin-1.6.2" = {
       name = "snyk-nuget-plugin";
       packageName = "snyk-nuget-plugin";
-      version = "1.4.0";
+      version = "1.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.4.0.tgz";
-        sha512 = "1frla7fsnn7ijg088bjqqy7iq5q0if7sz337rb1g6h5kg760z7968yjgi3nprp218vbpqjrf75xpi6m8dj8k04gpfdkb2am9klnymh4";
+        url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.6.2.tgz";
+        sha512 = "1najpr4zi3zkmnwps7dsdlw3bk4gxqs7y4ynziz9n3dyg8y8fjj9i5231n5yhgpwl3agn1q7ghzsr4wf1bm0q1ig6q7rcayrr5j2pzj";
       };
     };
-    "snyk-php-plugin-1.5.0" = {
+    "snyk-php-plugin-1.5.1" = {
       name = "snyk-php-plugin";
       packageName = "snyk-php-plugin";
-      version = "1.5.0";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.0.tgz";
-        sha512 = "10p6nq7sxfdfzaqh87s2hnw00vr904bklcscp26yvimdsa5p5n0x4m8ynbiiqa0b35rgp2lpq5qxmybgnshwv8b97fh89vq2i5lsbhx";
+        url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.5.1.tgz";
+        sha512 = "0bwffvgwcqgmw4m8zpnm3y6p651fg6nbv1kwacjd6k5cwvbnraggxc4wa6rl1h8x7cbwhx04iid02avwn60njnwf2w669qi3cf15543";
       };
     };
     "snyk-policy-1.12.0" = {
@@ -24162,15 +25170,6 @@ let
         sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691";
       };
     };
-    "socks-proxy-agent-2.1.1" = {
-      name = "socks-proxy-agent";
-      packageName = "socks-proxy-agent";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz";
-        sha512 = "33yfj0m61wn7g9s59m7mxhm6w91nkdrd7hcnnbacrj58zqgykpyr7f6lsggvc9xzysrf951ncxh4malqi11yf8z6909fasllxi6cnxh";
-      };
-    };
     "socks-proxy-agent-3.0.1" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
@@ -24351,13 +25350,13 @@ let
         sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j";
       };
     };
-    "source-map-resolve-0.5.1" = {
+    "source-map-resolve-0.5.2" = {
       name = "source-map-resolve";
       packageName = "source-map-resolve";
-      version = "0.5.1";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz";
-        sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh";
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
+        sha512 = "14dmrwi7wa13wr1mrygjmb49mzsycpj8h5r41y7qvdf98lz9qzaww7vis6cvgqgfx0ly1sx4vsmw45xzlzs6indjcs5pkrjvjyaqfij";
       };
     };
     "source-map-support-0.3.2" = {
@@ -24423,13 +25422,13 @@ let
         sha512 = "3645hn4agfzixljvwx4l0fwxqvcr6f0j7pvgcdcy34788n1qaabrs1nawn8c10qk8pw4b21mb0f0chgfhl10rzir7y5i2kf2cs5wzc5";
       };
     };
-    "sparkles-1.0.0" = {
+    "sparkles-1.0.1" = {
       name = "sparkles";
       packageName = "sparkles";
-      version = "1.0.0";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz";
-        sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3";
+        url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz";
+        sha512 = "1vr1iicrmldp4avsqz22x493dh0hzvck1scwd29kphm4gbp1qs9wpk0l5lwmma1cyfmp3l967jjclnx5kr0zsagzwniashl6q6b88vm";
       };
     };
     "sparse-bitfield-3.0.3" = {
@@ -24846,13 +25845,13 @@ let
         sha512 = "2h4ymczmf5aqldga4sj8acqlzc3almazi2vwiv7kx63k28sz1wwkqgzzv1hn47jf49k1x94w25fmmi001h5mj3n6g9in1s6b1n5vkcr";
       };
     };
-    "stream-http-2.8.1" = {
+    "stream-http-2.8.2" = {
       name = "stream-http";
       packageName = "stream-http";
-      version = "2.8.1";
+      version = "2.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.1.tgz";
-        sha512 = "3fbvnv92iyjjnbpggg15blfwzyk4q0f5rsdz2wyyd20j05vw8qgmr185r1r36i3m6qqb82il99qn0b09bb4b7s1myvccbf1bsij63bi";
+        url = "https://registry.npmjs.org/stream-http/-/stream-http-2.8.2.tgz";
+        sha512 = "2acp8k8lfjmh87zlzmx7ah9wwxsbjdff6mmms6c24kkrjqvgh0iv6mzbaakmspnx8kc9ysw3ba378xkjc95nfiyfg7m05va32n5yna2";
       };
     };
     "stream-parser-0.3.1" = {
@@ -25107,13 +26106,13 @@ let
         sha512 = "1r18lbap331hx5hfic2irpd3rai1ymp5s93p5xfzfr0khw9krkx51glwhmdjxbrk07kryqqdc2fly59avw3pq3q2apq7q487q55bh6r";
       };
     };
-    "string2compact-1.2.3" = {
+    "string2compact-1.2.5" = {
       name = "string2compact";
       packageName = "string2compact";
-      version = "1.2.3";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.3.tgz";
-        sha512 = "2v32r74gw45hwccyyv9br6r685nps3c7z95ik5c9sip5nva4flx1scz0mg3h47hw0xrnfj0wh89binqz26ld86zvqxhai2067g3bi7d";
+        url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.5.tgz";
+        sha512 = "1dl2j8192c98amhirw5xspz35vzhmhnrjj5migyp29b9s1hvjrgrpgb3axd889z23k5hvw2a3z35mqaghs5w57xfxlhhnf0gnbcbs2s";
       };
     };
     "string_decoder-0.10.31" = {
@@ -25152,13 +26151,13 @@ let
         sha512 = "3f4kckmssz5nm8qwm7plgq1vl73jwzc9k7cf80gwjqvzdysa558x5gfhjws59hhni39yncaly8dm0rwa590k1pblxvg602955041c4y";
       };
     };
-    "stringstream-0.0.5" = {
+    "stringstream-0.0.6" = {
       name = "stringstream";
       packageName = "stringstream";
-      version = "0.0.5";
+      version = "0.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
+        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz";
+        sha512 = "22fa8nryyacyx538az1iir54hqsfb46m6jycmqvfpylmg025xdn1wng94ay1rg69m4s3lv0cf2qnxvzffvm5s74q5fb108y14289cgk";
       };
     };
     "strip-ansi-0.1.1" = {
@@ -25269,6 +26268,15 @@ let
         sha1 = "956bcc5d84430f69256a90ed823765cd858e159c";
       };
     };
+    "strip-bom-string-1.0.0" = {
+      name = "strip-bom-string";
+      packageName = "strip-bom-string";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz";
+        sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92";
+      };
+    };
     "strip-dirs-2.1.0" = {
       name = "strip-dirs";
       packageName = "strip-dirs";
@@ -25639,13 +26647,13 @@ let
         sha512 = "0mgk8jd55vr7i3i29r1skhxwwbqkqfz6mbr32r5nn8h6v5xns8d2rc7835y7wj0zmppckxai7nm8r4s65kkg6yhirnwx33yixn75x1w";
       };
     };
-    "tar-stream-1.6.0" = {
+    "tar-stream-1.6.1" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz";
-        sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz";
+        sha512 = "2j2zhpi3nkxdny3qh1rm3xzx5kvdc4f83cqnqbq8yasqyxj6bpvbvff20rbqp6wl8zicx4dndkcjwm3xnprnkq11m7b4hkp1bkwqli0";
       };
     };
     "temp-0.6.0" = {
@@ -25972,6 +26980,15 @@ let
         sha512 = "37aksk3ydmwy2n7ffsnbvyrwb5kmz5bhvi5fhyg593qs61x7vi9drblwnri5z4x9mzaz91xxqdgg15f0qmf8cd85wdfax2pbm4vbw32";
       };
     };
+    "timers-ext-0.1.5" = {
+      name = "timers-ext";
+      packageName = "timers-ext";
+      version = "0.1.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz";
+        sha512 = "33arzdhdl95l79kirfayh8w3dvzxfc35zw7v8qammshps4shfib40qx7cyn86sl6ir9qrc6zzrmzhkgn7v50v6q223h1674vssi5hdn";
+      };
+    };
     "timespan-2.3.0" = {
       name = "timespan";
       packageName = "timespan";
@@ -26134,6 +27151,15 @@ let
         sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38";
       };
     };
+    "to-through-2.0.0" = {
+      name = "to-through";
+      packageName = "to-through";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz";
+        sha1 = "fc92adaba072647bc0b67d6b03664aa195093af6";
+      };
+    };
     "to-utf8-0.0.1" = {
       name = "to-utf8";
       packageName = "to-utf8";
@@ -26413,13 +27439,13 @@ let
         sha1 = "dd1a6d15630515663d8475f6f24edf2f800ebb1b";
       };
     };
-    "tslib-1.9.0" = {
+    "tslib-1.9.1" = {
       name = "tslib";
       packageName = "tslib";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz";
-        sha512 = "2nlmx4clxs0pqc810crp8j98gpvlvbbc5bw8mx4sjx9ywh89s5kq87n5zhc5xc1scgk49p9x7dw37d158qi46al0q9b54jldcdqdykz";
+        url = "https://registry.npmjs.org/tslib/-/tslib-1.9.1.tgz";
+        sha512 = "115mr4g9y5y6k797nyyxwca0rhx5ax7bqdf3i3kw14dh5n64h27f3v3pnc0asccwllfdyq7azc2lhnq3ibplf3afg5n5607dx5wzxva";
       };
     };
     "tsscmp-1.0.5" = {
@@ -26728,22 +27754,22 @@ let
         sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd";
       };
     };
-    "uglify-js-3.3.23" = {
+    "uglify-js-3.3.24" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.3.23";
+      version = "3.3.24";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz";
-        sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.24.tgz";
+        sha512 = "05g7wl6mnfcv2f8qhfh82m743qd8p5hvd99ky9gifcx5zblrbiqcp0qp1jlcayijzr8l9rkf4rfc309kcf2k76097ban8ma716gwbl5";
       };
     };
-    "uglify-js-3.3.6" = {
+    "uglify-js-3.3.25" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.3.6";
+      version = "3.3.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.6.tgz";
-        sha512 = "0q2bfk5m49af6f84q1iyrmw0p6ra1gnaf1npffadjqxd9qsz324r144bwgrnchngvlcdj1zqbmyh1r6gva65zxbrxm89ibdgcs7nykl";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz";
+        sha512 = "1qcjjk817lmd65xc8h3axwdnx4h7xkn3k9lf7dy65bm564jhrqvq5v11va9jiamdva9q0nk589i3vm2pn7dvjmjavx5s3d3pj1fi1l6";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -27250,22 +28276,22 @@ let
         sha512 = "0xw24ba88hfvwwgniyn17n26av45g1pxqf095231065l4n9dp5w3hyc7azjd8sqyix7pnfx1pmr44fzmwwazkz0ly83cp214g4qk13p";
       };
     };
-    "upath-1.0.5" = {
+    "upath-1.1.0" = {
       name = "upath";
       packageName = "upath";
-      version = "1.0.5";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz";
-        sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9";
+        url = "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz";
+        sha512 = "2pyjsmaajf6k6ql5qj270l0p3xkjvn25wky2qd1vndvl54ljbv8p8sbr44zsfh33mmrnj93ys4499c3h956wbgn4g82z8b1h3z4ffkg";
       };
     };
-    "update-check-1.3.2" = {
+    "update-check-1.5.0" = {
       name = "update-check";
       packageName = "update-check";
-      version = "1.3.2";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-check/-/update-check-1.3.2.tgz";
-        sha512 = "16lfi8gzdrmk0sq5fbqrq8vy3gmpssr05xac487hmsph1hk0i82n1bp8dklmvnkqk28w74bl8gphkanjn0v8f1walwcbbhpg3mss8fj";
+        url = "https://registry.npmjs.org/update-check/-/update-check-1.5.0.tgz";
+        sha512 = "3prydk2hhjbg29waf3dvx4097qs7vx5xfp4ibl8ic8nwr01vkd2nwz5lzj1ga02hfyz6cpzcwv3h1q18fxdz6w6z542hwnkjrky2b3d";
       };
     };
     "update-notifier-0.5.0" = {
@@ -27340,6 +28366,15 @@ let
         sha1 = "f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa";
       };
     };
+    "uri-js-4.2.1" = {
+      name = "uri-js";
+      packageName = "uri-js";
+      version = "4.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.1.tgz";
+        sha512 = "3s1r9yqdqw9bwiyvkq7gd4ylivchfabhk59s1w1wxq6q8gpysw82340fx3hmsmkwzm2cgf2fz48s065q08ca8711k91gc73f41q54lf";
+      };
+    };
     "urix-0.1.0" = {
       name = "urix";
       packageName = "urix";
@@ -27448,13 +28483,13 @@ let
         sha512 = "0d0wdjn4cdn5jqsdma0624pvsxv2zakshxlcx2hm9vrxnr1pvm5al0lzwchkpri3nmsdimf3liv6rr7g5c9z79gphdijzrz19lg7ydn";
       };
     };
-    "ut_pex-1.2.0" = {
+    "ut_pex-1.2.1" = {
       name = "ut_pex";
       packageName = "ut_pex";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.0.tgz";
-        sha512 = "3b2f0jrvzj2rij8wi7jwy4r7ijqsfv8a9qjqf67gxmlfmyglz8hr51d8f10hdyx1di88a0f3kba1jp583a643mxjfxlaq1dsxy96a10";
+        url = "https://registry.npmjs.org/ut_pex/-/ut_pex-1.2.1.tgz";
+        sha512 = "0w6sqvl80drmc6x9hkhshhh29vkcbrq9dw2cfbh2vyjvzbxfpfbxa7m2yja4ir97xwpfgkd3w4bcwh5ckgi1ldb1r8dqqnznw4lrg36";
       };
     };
     "utf7-1.0.2" = {
@@ -27718,6 +28753,15 @@ let
         sha1 = "e66fb3ec352348c1f7232512328738d8d66a9689";
       };
     };
+    "value-or-function-3.0.0" = {
+      name = "value-or-function";
+      packageName = "value-or-function";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz";
+        sha1 = "1c243a50b595c1be54a754bfece8563b9ff8d813";
+      };
+    };
     "varint-3.0.1" = {
       name = "varint";
       packageName = "varint";
@@ -27925,6 +28969,33 @@ let
         sha1 = "be6ff3270cb55dfd7d3063640de81f25d7532239";
       };
     };
+    "vinyl-fs-3.0.3" = {
+      name = "vinyl-fs";
+      packageName = "vinyl-fs";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz";
+        sha512 = "2g60av6jpj5jf9rx5v3gzvvvki2ni25jdinhkppzxng91k55z1cxykqsxbsjrm4kyp1lnnm3s1b452qfg1v28zxk1qj4drj97hbg2xw";
+      };
+    };
+    "vinyl-sourcemap-1.1.0" = {
+      name = "vinyl-sourcemap";
+      packageName = "vinyl-sourcemap";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz";
+        sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16";
+      };
+    };
+    "vinyl-sourcemaps-apply-0.2.1" = {
+      name = "vinyl-sourcemaps-apply";
+      packageName = "vinyl-sourcemaps-apply";
+      version = "0.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz";
+        sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705";
+      };
+    };
     "vlc-command-1.1.1" = {
       name = "vlc-command";
       packageName = "vlc-command";
@@ -27970,13 +29041,13 @@ let
         sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
       };
     };
-    "vows-0.8.1" = {
+    "vows-0.8.2" = {
       name = "vows";
       packageName = "vows";
-      version = "0.8.1";
+      version = "0.8.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vows/-/vows-0.8.1.tgz";
-        sha1 = "e09e988ce594ca05a08d72abcca34e88db559131";
+        url = "https://registry.npmjs.org/vows/-/vows-0.8.2.tgz";
+        sha1 = "691f79ab26ccde80ba726dde9fec8e73d6bcf2eb";
       };
     };
     "vscode-jsonrpc-3.5.0" = {
@@ -27997,13 +29068,13 @@ let
         sha512 = "1ikdzcmqhhk38d5kz8izbydm4bwh0hik4n6nwnklb0ygyynqasajzaycxg4cwzy72xag5izw12qknvm4irbz6gws8n7kkz5wj7cg89y";
       };
     };
-    "vscode-jsonrpc-3.6.1" = {
+    "vscode-jsonrpc-3.6.2" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
-      version = "3.6.1";
+      version = "3.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.1.tgz";
-        sha512 = "1npkazmy51c215nfgg2jiidabqh8kxd87my3xw19jq413h8lbchxc40wacl5g6gxyijvlc40b2fail6nlgb6rmzsfhjv47n2w7zwipq";
+        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.6.2.tgz";
+        sha512 = "202w8rihrk7lri0y5akai44xbx1nj7rvvh33x594miycr5vrbxk7khg46dni2h7kfi06ppbsqigszk74xrm2ql9h4ayxwbqjmphjvjg";
       };
     };
     "vscode-languageclient-4.0.1" = {
@@ -28060,13 +29131,13 @@ let
         sha1 = "e48d79962f0b8e02de955e3f524908e2b19c0374";
       };
     };
-    "vscode-languageserver-types-3.7.1" = {
+    "vscode-languageserver-types-3.7.2" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
-      version = "3.7.1";
+      version = "3.7.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.1.tgz";
-        sha512 = "3msj9sf465hb8j4x9diw4qadgf4h8vks2avw2p42pp5d70v9m1f515mblbwmxh17h1321ivsa63pph8q96fx1kh70vp57j0px9rzlby";
+        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.7.2.tgz";
+        sha512 = "3n581a9795k5a0qvbz28rfqjp0dmyjm1rq0djpjvbqrairl7p30d24qpaj3wgfbdc3wx3gjym3b5sdcb6742jr8if12s3cg1x2gdl1g";
       };
     };
     "vscode-uri-1.0.3" = {
@@ -28141,6 +29212,15 @@ let
         sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
       };
     };
+    "webassemblyjs-1.4.3" = {
+      name = "webassemblyjs";
+      packageName = "webassemblyjs";
+      version = "1.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.4.3.tgz";
+        sha512 = "2786k2y7kvcmjs50g35vaxik7kjr475fdhynq35yi7vayfjd7zkpn6gydh8vqhmx3g8xmr7j2ddwqgk540ij0wr7ks5r8pspga9alz2";
+      };
+    };
     "webidl-conversions-4.0.2" = {
       name = "webidl-conversions";
       packageName = "webidl-conversions";
@@ -28474,6 +29554,15 @@ let
         sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe";
       };
     };
+    "with-callback-1.0.2" = {
+      name = "with-callback";
+      packageName = "with-callback";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/with-callback/-/with-callback-1.0.2.tgz";
+        sha1 = "a09629b9a920028d721404fb435bdcff5c91bc21";
+      };
+    };
     "wordwrap-0.0.2" = {
       name = "wordwrap";
       packageName = "wordwrap";
@@ -29231,13 +30320,13 @@ let
         sha1 = "94ab784896a64f53a9fac452d5e9133e2750a236";
       };
     };
-    "yeoman-environment-2.0.6" = {
+    "yeoman-environment-2.1.1" = {
       name = "yeoman-environment";
       packageName = "yeoman-environment";
-      version = "2.0.6";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.0.6.tgz";
-        sha512 = "0z4544lfc7gzyp98fihqwi42p0j2dqwgrcl99i1d0b04qkslfv3im5r0xvp8rvapiqlwjg48b63kr5p1japcz3548wg445w7i6w2ccg";
+        url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.1.1.tgz";
+        sha512 = "0sy09nlr3nq9mmxlglxwf3crzy5krv9hn9pbd6xfpnglg23mz3kmd9s237fnlmisb8rabkn4kycwpdqf1nn47gcc90krb69984z04i0";
       };
     };
     "yosay-2.0.2" = {
@@ -29352,11 +30441,11 @@ in
       sources."brace-expansion-1.1.11"
       sources."chalk-1.1.3"
       sources."chmodr-1.0.2"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."commander-2.15.1"
       sources."concat-map-0.0.1"
       sources."convert-source-map-1.5.1"
-      sources."core-js-2.5.5"
+      sources."core-js-2.5.6"
       sources."debug-2.6.9"
       sources."detect-indent-4.0.0"
       sources."ejs-2.5.7"
@@ -29529,13 +30618,12 @@ in
       sources."q-1.5.1"
       sources."qs-6.5.2"
       sources."readable-stream-1.1.14"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
       sources."sntp-2.1.0"
       sources."sshpk-1.14.1"
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.5"
       sources."tmp-0.0.28"
       (sources."touch-0.0.3" // {
         dependencies = [
@@ -29570,9 +30658,9 @@ in
     dependencies = [
       sources."@types/caseless-0.12.1"
       sources."@types/form-data-2.2.1"
-      sources."@types/node-8.10.12"
+      sources."@types/node-8.10.16"
       sources."@types/request-2.47.0"
-      sources."@types/tough-cookie-2.3.2"
+      sources."@types/tough-cookie-2.3.3"
       sources."@types/uuid-3.4.3"
       sources."JSV-4.0.2"
       sources."adal-node-0.1.21"
@@ -29737,7 +30825,6 @@ in
         ];
       })
       sources."balanced-match-1.0.0"
-      sources."base64url-2.0.0"
       sources."bcrypt-pbkdf-1.0.1"
       sources."bl-1.1.2"
       sources."boom-4.3.1"
@@ -29773,7 +30860,7 @@ in
       sources."duplexer-0.1.1"
       sources."easy-table-1.1.0"
       sources."ecc-jsbn-0.1.1"
-      sources."ecdsa-sig-formatter-1.0.9"
+      sources."ecdsa-sig-formatter-1.0.10"
       sources."envconf-0.0.4"
       sources."escape-string-regexp-1.0.5"
       sources."event-stream-3.1.5"
@@ -29831,8 +30918,8 @@ in
       sources."jsonpointer-4.0.1"
       sources."jsprim-1.4.1"
       sources."jsrsasign-4.8.2"
-      sources."jwa-1.1.5"
-      sources."jws-3.1.4"
+      sources."jwa-1.1.6"
+      sources."jws-3.1.5"
       sources."jwt-decode-2.2.0"
       sources."keypress-0.1.0"
       (sources."kuduscript-1.0.16" // {
@@ -29853,17 +30940,17 @@ in
       (sources."ms-rest-2.3.3" // {
         dependencies = [
           sources."extend-3.0.1"
-          sources."request-2.85.0"
+          sources."request-2.86.0"
           sources."through-2.3.8"
           sources."tunnel-0.0.5"
         ];
       })
       (sources."ms-rest-azure-2.5.5" // {
         dependencies = [
-          sources."@types/node-9.6.12"
+          sources."@types/node-9.6.17"
           (sources."adal-node-0.1.28" // {
             dependencies = [
-              sources."@types/node-8.10.12"
+              sources."@types/node-8.10.16"
             ];
           })
           sources."async-2.6.0"
@@ -29951,7 +31038,7 @@ in
       sources."streamline-0.10.17"
       sources."streamline-streams-0.1.5"
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-0.1.1"
       sources."supports-color-2.0.0"
       (sources."sync-request-3.0.0" // {
@@ -30140,10 +31227,10 @@ in
   browserify = nodeEnv.buildNodePackage {
     name = "browserify";
     packageName = "browserify";
-    version = "16.2.0";
+    version = "16.2.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/browserify/-/browserify-16.2.0.tgz";
-      sha512 = "02kwwi6cvxwcyhv9n13j05y67xdkb4b09p5z7n2sl97sif012i5cibmbz6wqqy89ybqh7s3sbdxqf7g6y2hbl61g81vhrbz9815v2ya";
+      url = "https://registry.npmjs.org/browserify/-/browserify-16.2.2.tgz";
+      sha512 = "3ycb2arffvn5xg0dgk03zyvpg6pizz17wix457vg1cx166h59lz0vhyr2sw3224ny8brs3lg8f1acyr2ijv196fnsjfpm1akk9i5hbw";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -30185,7 +31272,7 @@ in
       sources."constants-browserify-1.0.0"
       sources."convert-source-map-1.1.3"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.1"
+      sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
@@ -30213,7 +31300,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
-      sources."insert-module-globals-7.0.6"
+      sources."insert-module-globals-7.1.0"
       sources."is-buffer-1.1.6"
       sources."isarray-2.0.4"
       sources."json-stable-stringify-0.0.1"
@@ -30229,7 +31316,7 @@ in
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
-      (sources."module-deps-6.0.2" // {
+      (sources."module-deps-6.1.0" // {
         dependencies = [
           sources."acorn-5.5.3"
           sources."minimist-1.2.0"
@@ -30268,7 +31355,7 @@ in
       sources."source-map-0.5.7"
       sources."stream-browserify-2.0.1"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.1"
+      sources."stream-http-2.8.2"
       sources."stream-splicer-2.0.0"
       sources."string_decoder-1.1.1"
       (sources."subarg-1.0.0" // {
@@ -30447,7 +31534,7 @@ in
       sources."long-2.4.0"
       sources."loud-rejection-1.6.0"
       sources."lru-2.0.1"
-      sources."magnet-uri-5.1.7"
+      sources."magnet-uri-5.1.8"
       sources."map-obj-1.0.1"
       sources."mdns-js-1.0.1"
       sources."meow-3.7.0"
@@ -30564,7 +31651,7 @@ in
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
-      sources."simple-sha1-2.1.0"
+      sources."simple-sha1-2.1.1"
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
           sources."ws-2.3.1"
@@ -30585,7 +31672,7 @@ in
         ];
       })
       sources."stream-transcoder-0.0.5"
-      sources."string2compact-1.2.3"
+      sources."string2compact-1.2.5"
       sources."string_decoder-0.10.31"
       sources."strip-ansi-2.0.1"
       sources."strip-bom-2.0.0"
@@ -30699,7 +31786,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."commander-2.15.1"
       sources."debug-3.1.0"
       sources."escape-string-regexp-1.0.5"
@@ -30909,7 +31996,7 @@ in
         ];
       })
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.1"
+      sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."cryptiles-2.0.5"
@@ -30998,7 +32085,7 @@ in
       sources."init-package-json-1.10.3"
       sources."inline-source-map-0.6.2"
       sources."inquirer-0.10.1"
-      (sources."insert-module-globals-7.0.6" // {
+      (sources."insert-module-globals-7.1.0" // {
         dependencies = [
           sources."concat-stream-1.6.2"
         ];
@@ -31176,13 +32263,13 @@ in
       sources."stream-browserify-2.0.1"
       sources."stream-buffers-2.2.0"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.1"
+      sources."stream-http-2.8.2"
       sources."stream-shift-1.0.0"
       sources."stream-splicer-2.0.0"
       sources."string-length-1.0.1"
       sources."string.prototype.codepointat-0.2.1"
       sources."string_decoder-1.0.3"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."subarg-1.0.0"
@@ -31295,7 +32382,7 @@ in
       sources."isexe-2.0.0"
       sources."jsonfile-2.4.0"
       sources."klaw-1.3.1"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."macos-release-1.1.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
@@ -31357,7 +32444,7 @@ in
       sources."chalk-2.4.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."core-js-2.5.5"
+      sources."core-js-2.5.6"
       sources."cross-spawn-5.1.0"
       sources."escape-string-regexp-1.0.5"
       sources."fs-extra-4.0.3"
@@ -31365,7 +32452,7 @@ in
       sources."has-flag-3.0.0"
       sources."isexe-2.0.0"
       sources."jsonfile-4.0.0"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."minimist-1.2.0"
       sources."path-exists-3.0.0"
       sources."pseudomap-1.0.2"
@@ -31454,7 +32541,7 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."buffer-alloc-1.1.0"
@@ -31475,7 +32562,7 @@ in
       sources."codecs-1.2.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -31509,7 +32596,7 @@ in
           sources."debug-2.6.9"
         ];
       })
-      (sources."dat-link-resolve-2.1.0" // {
+      (sources."dat-link-resolve-2.1.1" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -31571,7 +32658,7 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."fd-read-stream-1.1.0"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       sources."flat-tree-1.6.0"
       sources."for-each-0.3.2"
       sources."for-in-1.0.2"
@@ -31636,7 +32723,7 @@ in
       (sources."k-rpc-4.3.1" // {
         dependencies = [
           sources."bencode-2.0.0"
-          sources."k-bucket-4.0.0"
+          sources."k-bucket-4.0.1"
         ];
       })
       sources."k-rpc-socket-1.8.0"
@@ -31646,6 +32733,7 @@ in
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.throttle-4.1.1"
       sources."lru-3.1.0"
+      sources."math-random-1.0.1"
       sources."memory-pager-1.1.0"
       sources."merkle-tree-stream-3.0.3"
       sources."micromatch-2.3.11"
@@ -31705,13 +32793,9 @@ in
       sources."random-access-file-2.0.1"
       sources."random-access-memory-2.4.0"
       sources."random-access-storage-1.2.0"
-      (sources."randomatic-1.1.7" // {
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."randombytes-2.0.6"
@@ -31723,13 +32807,13 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.1.2"
       sources."signed-varint-2.0.1"
-      sources."simple-sha1-2.1.0"
+      sources."simple-sha1-2.1.1"
       sources."siphash24-1.1.0"
       sources."slice-ansi-1.0.0"
       sources."sntp-2.1.0"
@@ -31749,7 +32833,6 @@ in
       sources."stream-shift-1.0.0"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-4.0.0"
       (sources."subcommand-2.1.0" // {
         dependencies = [
@@ -31808,10 +32891,10 @@ in
   dhcp = nodeEnv.buildNodePackage {
     name = "dhcp";
     packageName = "dhcp";
-    version = "0.2.12";
+    version = "0.2.13";
     src = fetchurl {
-      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.12.tgz";
-      sha512 = "1ks1wdfgj703sxp1ys7hjfkw0sm6sm9z7iviqxicvmy9r3mj7irq3vjyk4nvxgyq29j3qz8bi8lvm38r4w8j1j2xbkx85fk0l3vpa7r";
+      url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.13.tgz";
+      sha512 = "38j71wr4hhxw452rkkgjd0l438gaal55jnags32lfssq74w3z341whfdhjlmssxrnaczr3li4h4qr8scbd4xvqb860bchjg12i8pnjj";
     };
     dependencies = [
       sources."minimist-1.2.0"
@@ -32014,7 +33097,7 @@ in
       sources."level-0.18.0"
       sources."level-packager-0.18.0"
       sources."level-post-1.0.7"
-      (sources."level-sublevel-6.6.1" // {
+      (sources."level-sublevel-6.6.2" // {
         dependencies = [
           (sources."levelup-0.19.1" // {
             dependencies = [
@@ -32067,13 +33150,14 @@ in
       sources."protein-0.5.0"
       sources."prr-0.0.0"
       sources."pull-cat-1.1.11"
+      sources."pull-defer-0.2.2"
       sources."pull-level-2.0.4"
       sources."pull-live-1.0.1"
       sources."pull-pushable-2.2.0"
-      sources."pull-stream-3.6.7"
+      sources."pull-stream-3.6.8"
       sources."pull-window-2.1.4"
       sources."pump-1.0.3"
-      (sources."pumpify-1.5.0" // {
+      (sources."pumpify-1.5.1" // {
         dependencies = [
           sources."pump-2.0.1"
         ];
@@ -32089,7 +33173,7 @@ in
       sources."stream-shift-1.0.0"
       sources."stream-to-pull-stream-1.7.2"
       sources."string_decoder-0.10.31"
-      (sources."tar-stream-1.6.0" // {
+      (sources."tar-stream-1.6.1" // {
         dependencies = [
           sources."bl-1.2.2"
           sources."isarray-1.0.0"
@@ -32125,10 +33209,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "3.3.12";
+    version = "3.3.14";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.12.tgz";
-      sha512 = "3jj2vxmyham5bhfxvbilsd60sgkdabzl0mbid2i4hfjjgqjs76f4av2qifnvphn4a0ds727wjcp4kjz2963pjqrq53ik0k87706arn1";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-3.3.14.tgz";
+      sha512 = "1bvfy3zh4ir1griyp1af3c2vc11wrkxyi4h8bfsdlgwwgq9azp1l8l1v03b88x69fqr3llr6kgacjr1cykd64p10dr5438zjlw1vcr4";
     };
     dependencies = [
       sources."JSONStream-1.3.2"
@@ -32137,7 +33221,7 @@ in
       sources."assert-plus-1.0.0"
       sources."async-2.6.0"
       sources."asynckit-0.4.0"
-      sources."aws-sdk-2.233.1"
+      sources."aws-sdk-2.241.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."base64-js-1.3.0"
@@ -32193,7 +33277,7 @@ in
       sources."punycode-1.3.2"
       sources."qs-6.5.2"
       sources."querystring-0.2.0"
-      (sources."request-2.85.0" // {
+      (sources."request-2.86.0" // {
         dependencies = [
           sources."punycode-1.4.1"
         ];
@@ -32202,7 +33286,6 @@ in
       sources."sax-1.2.1"
       sources."sntp-2.1.0"
       sources."sshpk-1.14.1"
-      sources."stringstream-0.0.5"
       sources."through-2.3.8"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
@@ -32276,7 +33359,7 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."caseless-0.11.0"
@@ -32304,7 +33387,7 @@ in
       sources."extglob-0.3.2"
       sources."extsprintf-1.3.0"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       sources."find-elm-dependencies-1.0.2"
       sources."find-parent-dir-0.3.0"
       sources."firstline-1.2.1"
@@ -32362,7 +33445,8 @@ in
       sources."kind-of-3.2.2"
       sources."klaw-1.3.1"
       sources."lodash-4.13.1"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
+      sources."math-random-1.0.1"
       sources."micromatch-2.3.11"
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
@@ -32392,13 +33476,9 @@ in
       sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
       sources."qs-6.3.2"
-      (sources."randomatic-1.1.7" // {
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."readable-stream-2.3.6"
@@ -32419,7 +33499,7 @@ in
         ];
       })
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."supports-color-4.2.0"
       sources."tar-2.2.1"
@@ -32496,7 +33576,7 @@ in
       sources."concat-map-0.0.1"
       sources."conf-1.4.0"
       sources."convert-source-map-1.5.1"
-      sources."core-js-2.5.5"
+      sources."core-js-2.5.6"
       sources."cross-spawn-5.1.0"
       sources."currently-unhandled-0.4.1"
       sources."debug-2.6.9"
@@ -32524,7 +33604,7 @@ in
       sources."has-to-string-tag-x-1.4.1"
       sources."home-or-tmp-2.0.0"
       sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       (sources."import-jsx-1.3.0" // {
         dependencies = [
           sources."ansi-regex-2.1.1"
@@ -32570,8 +33650,8 @@ in
       sources."loose-envify-1.3.1"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.2"
-      sources."make-dir-1.2.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
       (sources."meow-3.7.0" // {
@@ -32750,7 +33830,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -32770,7 +33850,7 @@ in
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.10"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -32844,10 +33924,10 @@ in
   eslint_d = nodeEnv.buildNodePackage {
     name = "eslint_d";
     packageName = "eslint_d";
-    version = "5.3.0";
+    version = "5.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.3.0.tgz";
-      sha512 = "3ljw58bs13867i67mmw78w0a2ckn0cp5kffd878czkkpg7ahbgpxxq2jcqgjvqrrm2pava47a8fli1srxgzghwfqjq400shkakpqa71";
+      url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.3.1.tgz";
+      sha512 = "0xcqrxpj24cns2rq91k2k2khr96129p7ncyjx4bda77dy0nkwn53lv6dhjbr0nq1bm6f13p0as4jkqcf3j4lygd7z1l2mbi829xyglw";
     };
     dependencies = [
       sources."acorn-5.5.3"
@@ -32933,7 +34013,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."ignore-3.3.8"
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
@@ -32953,7 +34033,7 @@ in
       sources."json-stable-stringify-without-jsonify-1.0.1"
       sources."levn-0.3.0"
       sources."lodash-4.17.10"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."mimic-fn-1.2.0"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
@@ -33186,7 +34266,7 @@ in
       sources."readable-stream-2.3.6"
       sources."redent-1.0.0"
       sources."repeating-2.0.1"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."request-progress-2.0.1"
       sources."restore-cursor-1.0.1"
       sources."safe-buffer-5.1.2"
@@ -33199,7 +34279,6 @@ in
       sources."spdx-license-ids-3.0.0"
       sources."sshpk-1.14.1"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
       sources."strip-indent-1.0.1"
@@ -33274,7 +34353,7 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."broadway-0.3.6"
@@ -33300,7 +34379,7 @@ in
       sources."extglob-0.3.2"
       sources."eyes-0.1.8"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       (sources."flatiron-0.4.3" // {
         dependencies = [
           sources."cliff-0.1.9"
@@ -33316,7 +34395,7 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       sources."glob-7.1.2"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
@@ -33341,6 +34420,7 @@ in
       sources."jsonify-0.0.0"
       sources."kind-of-3.2.2"
       sources."lazy-1.0.11"
+      sources."math-random-1.0.1"
       sources."micromatch-2.3.11"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
@@ -33366,20 +34446,16 @@ in
       sources."preserve-0.2.0"
       (sources."prettyjson-1.2.1" // {
         dependencies = [
-          sources."colors-1.2.4"
+          sources."colors-1.2.5"
           sources."minimist-1.2.0"
         ];
       })
       sources."process-nextick-args-2.0.0"
       sources."prompt-0.2.14"
       sources."ps-tree-0.0.3"
-      (sources."randomatic-1.1.7" // {
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."read-1.0.7"
@@ -33873,9 +34949,9 @@ in
         ];
       })
       sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.1"
+      sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
-      sources."sparkles-1.0.0"
+      sources."sparkles-1.0.1"
       (sources."split-string-3.1.0" // {
         dependencies = [
           sources."extend-shallow-3.0.2"
@@ -34068,7 +35144,7 @@ in
       sources."param-case-2.1.1"
       sources."relateurl-0.2.7"
       sources."source-map-0.5.7"
-      (sources."uglify-js-3.3.23" // {
+      (sources."uglify-js-3.3.25" // {
         dependencies = [
           sources."source-map-0.6.1"
         ];
@@ -34098,13 +35174,18 @@ in
         dependencies = [
           sources."bytes-1.0.0"
           sources."debug-2.6.9"
+          sources."iconv-lite-0.4.19"
           sources."is-extglob-2.1.1"
           sources."is-glob-3.1.0"
           sources."mime-1.4.1"
           sources."qs-6.5.1"
-          sources."raw-body-1.1.7"
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+            ];
+          })
           sources."safe-buffer-5.1.1"
-          sources."setprototypeof-1.0.3"
           sources."statuses-1.4.0"
           sources."string_decoder-0.10.31"
           sources."yallist-3.0.2"
@@ -34131,11 +35212,11 @@ in
       sources."binary-extensions-1.11.0"
       sources."bl-1.2.2"
       sources."body-5.1.0"
-      sources."body-parser-1.18.2"
+      sources."body-parser-1.18.3"
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."buffer-alloc-1.1.0"
@@ -34185,7 +35266,11 @@ in
       sources."expand-range-1.8.2"
       (sources."express-4.16.3" // {
         dependencies = [
-          sources."setprototypeof-1.1.0"
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."setprototypeof-1.0.3"
+            ];
+          })
         ];
       })
       sources."extend-3.0.1"
@@ -34194,7 +35279,7 @@ in
       sources."faye-websocket-0.10.0"
       sources."figures-2.0.0"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       sources."finalhandler-1.1.1"
       sources."follow-redirects-1.4.1"
       sources."for-in-1.0.2"
@@ -34206,7 +35291,7 @@ in
       sources."fs-constants-1.0.0"
       sources."fs-minipass-1.2.5"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       sources."glob-7.1.2"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
@@ -34220,7 +35305,7 @@ in
           sources."debug-3.1.0"
         ];
       })
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inquirer-3.3.0"
@@ -34257,8 +35342,9 @@ in
       sources."lodash.isarray-3.0.4"
       sources."lodash.keys-3.1.2"
       sources."lodash.restparam-3.6.1"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."macos-release-1.1.0"
+      sources."math-random-1.0.1"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
@@ -34296,22 +35382,13 @@ in
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
       sources."qs-6.5.2"
-      (sources."randomatic-1.1.7" // {
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."regex-cache-0.4.4"
@@ -34327,6 +35404,7 @@ in
       sources."rx-lite-aggregates-4.0.8"
       sources."safe-buffer-5.1.2"
       sources."safe-json-parse-1.0.1"
+      sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
       sources."semver-5.5.0"
       sources."send-0.16.2"
@@ -34351,16 +35429,17 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."tar-stream-1.6.0"
+      sources."tar-stream-1.6.1"
       sources."through-2.3.8"
       (sources."tiny-lr-1.1.1" // {
         dependencies = [
           sources."debug-3.1.0"
+          sources."raw-body-1.1.7"
         ];
       })
       sources."tmp-0.0.33"
       sources."to-buffer-1.1.1"
-      sources."tslib-1.9.0"
+      sources."tslib-1.9.1"
       sources."type-is-1.6.16"
       sources."ultron-1.1.1"
       sources."unpipe-1.0.0"
@@ -34561,10 +35640,10 @@ in
   javascript-typescript-langserver = nodeEnv.buildNodePackage {
     name = "javascript-typescript-langserver";
     packageName = "javascript-typescript-langserver";
-    version = "2.8.0";
+    version = "2.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.8.0.tgz";
-      sha512 = "23rbqwsks302r65kckp12dy9pid4lpl9cn51bz9xg54j90ig3cxxd9ygs7vq5b72k2x75w960hfd4ww2zgqpypdqmb510vqfhx442s1";
+      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.9.0.tgz";
+      sha512 = "2j3dppwmpx29w1xxj6pmi1ddyc0v9y6dlw42nr1in2c7qddalh3axqx7b6p21qy5j0gf43wdaxfknk7klr5zyr0flcx552g5asxx7dk";
     };
     dependencies = [
       sources."ansi-color-0.2.1"
@@ -34620,8 +35699,8 @@ in
       sources."thenify-all-1.6.0"
       sources."thriftrw-3.11.2"
       sources."type-detect-4.0.8"
-      sources."typescript-2.7.2"
-      sources."vscode-jsonrpc-3.6.1"
+      sources."typescript-2.8.3"
+      sources."vscode-jsonrpc-3.6.2"
       (sources."vscode-languageserver-3.5.1" // {
         dependencies = [
           sources."vscode-jsonrpc-3.5.0"
@@ -34629,7 +35708,7 @@ in
         ];
       })
       sources."vscode-languageserver-protocol-3.5.1"
-      sources."vscode-languageserver-types-3.7.1"
+      sources."vscode-languageserver-types-3.7.2"
       sources."vscode-uri-1.0.3"
       sources."wrappy-1.0.2"
       sources."xorshift-0.2.1"
@@ -34953,11 +36032,7 @@ in
       sources."aws4-1.7.0"
       sources."basic-auth-2.0.0"
       sources."bcrypt-pbkdf-1.0.1"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."body-parser-1.18.3"
       sources."boom-4.3.1"
       sources."boxen-1.3.0"
       sources."bytes-3.0.0"
@@ -35010,6 +36085,19 @@ in
       sources."execa-0.7.0"
       (sources."express-4.16.3" // {
         dependencies = [
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."setprototypeof-1.0.3"
+            ];
+          })
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+            ];
+          })
           sources."statuses-1.4.0"
         ];
       })
@@ -35041,7 +36129,7 @@ in
       sources."hoek-4.2.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."inherits-2.0.3"
@@ -35076,8 +36164,8 @@ in
       sources."lodash-id-0.14.0"
       sources."lowdb-0.15.5"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.2"
-      sources."make-dir-1.2.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
       sources."media-typer-0.3.0"
       sources."mem-1.1.0"
       sources."merge-descriptors-1.0.1"
@@ -35117,21 +36205,17 @@ in
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."rc-1.2.7"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."safe-buffer-5.1.1"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."semver-compare-1.0.0"
       sources."semver-diff-2.1.0"
@@ -35148,7 +36232,6 @@ in
       sources."statuses-1.5.0"
       sources."steno-0.4.4"
       sources."string-width-2.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-4.0.0"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
@@ -35232,7 +36315,7 @@ in
       sources."accepts-1.3.5"
       sources."addressparser-1.0.1"
       sources."after-0.8.2"
-      sources."agent-base-2.1.1"
+      sources."agent-base-4.2.0"
       sources."ajv-5.5.2"
       (sources."amqplib-0.5.2" // {
         dependencies = [
@@ -35250,7 +36333,7 @@ in
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
       sources."ast-types-0.11.3"
-      sources."async-2.1.5"
+      sources."async-2.6.0"
       sources."async-each-1.0.1"
       sources."async-limiter-1.0.0"
       sources."asynckit-0.4.0"
@@ -35259,7 +36342,6 @@ in
       (sources."axios-0.15.3" // {
         dependencies = [
           sources."debug-2.6.9"
-          sources."ms-2.0.0"
         ];
       })
       sources."backo2-1.0.2"
@@ -35273,16 +36355,12 @@ in
       sources."bl-1.1.2"
       sources."blob-0.0.4"
       sources."bluebird-3.5.1"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."body-parser-1.18.3"
       sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."buffer-more-ints-0.0.2"
@@ -35292,9 +36370,9 @@ in
       sources."caseless-0.12.0"
       sources."chalk-1.1.3"
       sources."chokidar-1.7.0"
-      sources."circular-json-0.5.3"
+      sources."circular-json-0.5.4"
       sources."co-4.6.0"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."combine-lists-1.0.1"
       sources."combined-stream-1.0.6"
       sources."commander-2.15.1"
@@ -35309,7 +36387,7 @@ in
       })
       sources."content-type-1.0.4"
       sources."cookie-0.3.1"
-      sources."core-js-2.5.5"
+      sources."core-js-2.5.6"
       sources."core-util-is-1.0.2"
       (sources."cryptiles-3.1.2" // {
         dependencies = [
@@ -35343,6 +36421,8 @@ in
       })
       sources."engine.io-parser-2.1.2"
       sources."ent-2.2.0"
+      sources."es6-promise-4.2.4"
+      sources."es6-promisify-5.0.0"
       sources."escape-html-1.0.3"
       sources."escape-string-regexp-1.0.5"
       sources."escodegen-1.9.1"
@@ -35368,7 +36448,7 @@ in
       sources."fast-levenshtein-2.0.6"
       sources."file-uri-to-path-1.0.0"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       sources."finalhandler-1.1.0"
       sources."follow-redirects-1.4.1"
       sources."for-in-1.0.2"
@@ -35376,7 +36456,7 @@ in
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       (sources."ftp-0.3.10" // {
         dependencies = [
           sources."readable-stream-1.1.14"
@@ -35384,7 +36464,11 @@ in
       })
       sources."generate-function-2.0.0"
       sources."generate-object-property-1.2.0"
-      sources."get-uri-2.0.1"
+      (sources."get-uri-2.0.2" // {
+        dependencies = [
+          sources."debug-2.6.9"
+        ];
+      })
       sources."getpass-0.1.7"
       sources."glob-7.1.2"
       sources."glob-base-0.3.0"
@@ -35393,7 +36477,7 @@ in
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
       sources."has-ansi-2.0.0"
-      sources."has-binary2-1.0.2"
+      sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."hawk-6.0.2"
       sources."hipchat-notifier-1.1.0"
@@ -35404,17 +36488,17 @@ in
           sources."debug-3.1.0"
         ];
       })
-      sources."http-proxy-agent-1.0.0"
+      sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
       sources."httpntlm-1.6.1"
       sources."httpreq-0.4.24"
-      sources."https-proxy-agent-1.0.0"
-      sources."iconv-lite-0.4.19"
+      sources."https-proxy-agent-2.2.1"
+      sources."iconv-lite-0.4.23"
       sources."indexof-0.0.1"
-      sources."inflection-1.10.0"
+      sources."inflection-1.12.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
-      sources."ip-1.0.1"
+      sources."ip-1.1.5"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
       sources."is-dotfile-1.0.3"
@@ -35446,13 +36530,12 @@ in
       sources."libmime-3.0.0"
       sources."libqp-1.1.0"
       sources."lodash-4.17.10"
-      (sources."log4js-2.5.3" // {
+      (sources."log4js-2.6.1" // {
         dependencies = [
           sources."assert-plus-0.2.0"
           sources."aws-sign2-0.6.0"
           sources."boom-2.10.1"
           sources."caseless-0.11.0"
-          sources."co-3.0.6"
           sources."cryptiles-2.0.5"
           sources."debug-3.1.0"
           sources."follow-redirects-1.0.0"
@@ -35462,9 +36545,7 @@ in
           sources."hoek-2.16.3"
           sources."http-signature-1.1.1"
           sources."iconv-lite-0.4.15"
-          sources."ip-1.1.5"
           sources."isarray-0.0.1"
-          sources."ms-0.7.1"
           sources."process-nextick-args-1.0.7"
           sources."qs-6.2.3"
           sources."readable-stream-2.0.6"
@@ -35476,15 +36557,14 @@ in
         ];
       })
       sources."loggly-1.1.1"
-      sources."lru-cache-2.6.5"
+      sources."lru-cache-4.1.3"
       sources."mailcomposer-4.0.1"
-      (sources."mailgun-js-0.7.15" // {
+      (sources."mailgun-js-0.18.0" // {
         dependencies = [
-          sources."debug-2.2.0"
-          sources."form-data-2.1.4"
-          sources."semver-5.0.3"
+          sources."form-data-2.3.2"
         ];
       })
+      sources."math-random-1.0.1"
       sources."media-typer-0.3.0"
       sources."micromatch-2.3.11"
       sources."mime-1.6.0"
@@ -35518,8 +36598,8 @@ in
       })
       sources."optionator-0.8.2"
       sources."os-tmpdir-1.0.2"
-      sources."pac-proxy-agent-1.1.0"
-      sources."pac-resolver-2.0.0"
+      sources."pac-proxy-agent-2.0.2"
+      sources."pac-resolver-3.0.0"
       sources."parse-glob-3.0.4"
       sources."parseqs-0.0.5"
       sources."parseuri-0.0.5"
@@ -35536,27 +36616,20 @@ in
       sources."prelude-ls-1.1.2"
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.0"
-      sources."proxy-agent-2.0.0"
+      sources."promisify-call-2.0.4"
+      sources."proxy-agent-3.0.0"
+      sources."proxy-from-env-1.0.0"
+      sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
-      sources."q-1.4.1"
       sources."qjobs-1.2.0"
-      sources."qs-6.5.1"
-      (sources."randomatic-1.1.7" // {
+      sources."qs-6.5.2"
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."redis-2.8.0"
@@ -35566,11 +36639,12 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."requestretry-1.13.0"
       sources."requires-port-1.0.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."set-immediate-shim-1.0.1"
       sources."setprototypeof-1.1.0"
@@ -35591,13 +36665,13 @@ in
         ];
       })
       sources."socks-1.1.10"
-      sources."socks-proxy-agent-2.1.1"
+      sources."socks-proxy-agent-3.0.1"
       sources."source-map-0.6.1"
       sources."sshpk-1.14.1"
       sources."statuses-1.5.0"
       sources."streamroller-0.7.0"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."thunkify-2.1.2"
@@ -35625,12 +36699,14 @@ in
       sources."verror-1.10.0"
       sources."void-elements-2.0.1"
       sources."when-3.7.8"
+      sources."with-callback-1.0.2"
       sources."wordwrap-1.0.0"
       sources."wrappy-1.0.2"
       sources."ws-3.3.3"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."xregexp-2.0.0"
       sources."xtend-4.0.1"
+      sources."yallist-2.1.2"
       sources."yeast-0.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -35959,7 +37035,7 @@ in
       sources."has-flag-3.0.0"
       sources."has-unicode-2.0.1"
       sources."hosted-git-info-2.6.0"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."imurmurhash-0.1.4"
       sources."indent-string-2.1.0"
       sources."inflight-1.0.6"
@@ -36012,8 +37088,8 @@ in
       sources."longest-1.0.1"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.2"
-      sources."make-dir-1.2.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
       sources."map-obj-1.0.1"
       sources."mem-1.1.0"
       (sources."meow-4.0.1" // {
@@ -36253,12 +37329,11 @@ in
       sources."prr-1.0.1"
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."safe-buffer-5.1.2"
       sources."sntp-2.1.0"
       sources."source-map-0.6.1"
       sources."sshpk-1.14.1"
-      sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -36313,7 +37388,7 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."clone-2.1.2"
@@ -36331,7 +37406,7 @@ in
       sources."extend-shallow-2.0.1"
       sources."extglob-0.3.2"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       sources."first-chunk-stream-1.0.0"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
@@ -36367,6 +37442,7 @@ in
       sources."kind-of-3.2.2"
       sources."lazystream-1.0.0"
       sources."lodash.isequal-4.5.0"
+      sources."math-random-1.0.1"
       sources."merge-stream-1.0.1"
       (sources."micromatch-2.3.11" // {
         dependencies = [
@@ -36386,13 +37462,9 @@ in
       sources."path-is-absolute-1.0.1"
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.0"
-      (sources."randomatic-1.1.7" // {
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."readable-stream-2.3.6"
@@ -36471,16 +37543,12 @@ in
       sources."better-assert-1.0.2"
       sources."binary-extensions-1.11.0"
       sources."blob-0.0.4"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."body-parser-1.18.3"
       sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."bytes-3.0.0"
@@ -36522,6 +37590,19 @@ in
       sources."expand-range-1.8.2"
       (sources."express-4.16.3" // {
         dependencies = [
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."setprototypeof-1.0.3"
+            ];
+          })
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+            ];
+          })
           sources."safe-buffer-5.1.1"
           sources."statuses-1.4.0"
         ];
@@ -36532,7 +37613,7 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       sources."finalhandler-1.1.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
@@ -36540,7 +37621,7 @@ in
       sources."form-data-2.3.2"
       sources."forwarded-0.1.2"
       sources."fresh-0.5.2"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       sources."getpass-0.1.7"
       sources."github-slugger-1.2.0"
       sources."glob-base-0.3.0"
@@ -36548,14 +37629,14 @@ in
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-binary2-1.0.2"
+      sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."html-entities-1.2.1"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."indexof-0.0.1"
       sources."inherits-2.0.3"
       sources."innertext-1.0.3"
@@ -36586,6 +37667,7 @@ in
       sources."markdown-it-emoji-1.4.0"
       sources."markdown-it-github-headings-1.1.1"
       sources."markdown-it-task-checkbox-1.0.6"
+      sources."math-random-1.0.1"
       sources."mdurl-1.0.1"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
@@ -36616,31 +37698,23 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-2.0.3"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
-      (sources."randomatic-1.1.7" // {
+      sources."qs-6.5.2"
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."readable-stream-2.3.6"
       sources."readdirp-2.1.0"
       sources."regex-cache-0.4.4"
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
       sources."set-immediate-shim-1.0.1"
@@ -36659,7 +37733,6 @@ in
       sources."sshpk-1.14.1"
       sources."statuses-1.5.0"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."to-array-0.1.4"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
@@ -36711,11 +37784,11 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."chokidar-1.7.0"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."concat-map-0.0.1"
       sources."connect-3.5.1"
       sources."core-util-is-1.0.2"
@@ -36734,13 +37807,13 @@ in
       sources."extglob-0.3.2"
       sources."faye-websocket-0.11.1"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       sources."finalhandler-0.5.1"
       sources."for-in-1.0.2"
       sources."for-own-0.1.5"
       sources."fresh-0.5.2"
       sources."from-0.1.7"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       sources."glob-base-0.3.0"
       sources."glob-parent-2.0.0"
       sources."graceful-fs-4.1.11"
@@ -36763,6 +37836,7 @@ in
       sources."isobject-2.1.0"
       sources."kind-of-3.2.2"
       sources."map-stream-0.1.0"
+      sources."math-random-1.0.1"
       sources."micromatch-2.3.11"
       sources."mime-1.4.1"
       sources."mime-db-1.33.0"
@@ -36791,13 +37865,9 @@ in
       sources."preserve-0.2.0"
       sources."process-nextick-args-2.0.0"
       sources."proxy-middleware-0.15.0"
-      (sources."randomatic-1.1.7" // {
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."range-parser-1.2.0"
@@ -36882,6 +37952,706 @@ in
     production = true;
     bypassCache = false;
   };
+  meguca = nodeEnv.buildNodePackage {
+    name = "meguca";
+    packageName = "meguca";
+    version = "1.0.4";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/meguca/-/meguca-1.0.4.tgz";
+      sha1 = "c2d9c78dbf53f7d0de585a87765dd9391846e9a2";
+    };
+    dependencies = [
+      (sources."@gulp-sourcemaps/identity-map-1.0.1" // {
+        dependencies = [
+          sources."source-map-0.5.7"
+        ];
+      })
+      sources."@gulp-sourcemaps/map-sources-1.0.0"
+      sources."accord-0.28.0"
+      sources."acorn-5.5.3"
+      sources."ajv-4.11.8"
+      sources."align-text-0.1.4"
+      sources."almond-0.3.3"
+      sources."amdefine-1.0.1"
+      sources."ansi-colors-1.1.0"
+      sources."ansi-cyan-0.1.1"
+      sources."ansi-gray-0.1.1"
+      sources."ansi-red-0.1.1"
+      sources."ansi-regex-2.1.1"
+      sources."ansi-styles-2.2.1"
+      sources."ansi-wrap-0.1.0"
+      sources."append-buffer-1.0.2"
+      sources."archy-1.0.0"
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
+      sources."array-differ-1.0.0"
+      sources."array-each-1.0.1"
+      sources."array-slice-1.1.0"
+      sources."array-uniq-1.0.3"
+      sources."array-unique-0.3.2"
+      sources."asap-2.0.6"
+      sources."asn1-0.2.3"
+      sources."assert-plus-0.2.0"
+      sources."assign-symbols-1.0.0"
+      sources."asynckit-0.4.0"
+      sources."atob-2.1.1"
+      sources."aws-sign2-0.6.0"
+      sources."aws4-1.7.0"
+      sources."babel-code-frame-6.26.0"
+      sources."babel-core-6.26.3"
+      sources."babel-generator-6.26.1"
+      sources."babel-helper-builder-binary-assignment-operator-visitor-6.24.1"
+      sources."babel-helper-call-delegate-6.24.1"
+      sources."babel-helper-define-map-6.26.0"
+      sources."babel-helper-explode-assignable-expression-6.24.1"
+      sources."babel-helper-function-name-6.24.1"
+      sources."babel-helper-get-function-arity-6.24.1"
+      sources."babel-helper-hoist-variables-6.24.1"
+      sources."babel-helper-optimise-call-expression-6.24.1"
+      sources."babel-helper-regex-6.26.0"
+      sources."babel-helper-remap-async-to-generator-6.24.1"
+      sources."babel-helper-replace-supers-6.24.1"
+      sources."babel-helpers-6.24.1"
+      sources."babel-messages-6.23.0"
+      sources."babel-plugin-check-es2015-constants-6.22.0"
+      sources."babel-plugin-syntax-async-functions-6.13.0"
+      sources."babel-plugin-syntax-exponentiation-operator-6.13.0"
+      sources."babel-plugin-syntax-trailing-function-commas-6.22.0"
+      sources."babel-plugin-transform-async-to-generator-6.24.1"
+      sources."babel-plugin-transform-es2015-arrow-functions-6.22.0"
+      sources."babel-plugin-transform-es2015-block-scoped-functions-6.22.0"
+      sources."babel-plugin-transform-es2015-block-scoping-6.26.0"
+      sources."babel-plugin-transform-es2015-classes-6.24.1"
+      sources."babel-plugin-transform-es2015-computed-properties-6.24.1"
+      sources."babel-plugin-transform-es2015-destructuring-6.23.0"
+      sources."babel-plugin-transform-es2015-duplicate-keys-6.24.1"
+      sources."babel-plugin-transform-es2015-for-of-6.23.0"
+      sources."babel-plugin-transform-es2015-function-name-6.24.1"
+      sources."babel-plugin-transform-es2015-literals-6.22.0"
+      sources."babel-plugin-transform-es2015-modules-amd-6.24.1"
+      sources."babel-plugin-transform-es2015-modules-commonjs-6.26.2"
+      sources."babel-plugin-transform-es2015-modules-systemjs-6.24.1"
+      sources."babel-plugin-transform-es2015-modules-umd-6.24.1"
+      sources."babel-plugin-transform-es2015-object-super-6.24.1"
+      sources."babel-plugin-transform-es2015-parameters-6.24.1"
+      sources."babel-plugin-transform-es2015-shorthand-properties-6.24.1"
+      sources."babel-plugin-transform-es2015-spread-6.22.0"
+      sources."babel-plugin-transform-es2015-sticky-regex-6.24.1"
+      sources."babel-plugin-transform-es2015-template-literals-6.22.0"
+      sources."babel-plugin-transform-es2015-typeof-symbol-6.23.0"
+      sources."babel-plugin-transform-es2015-unicode-regex-6.24.1"
+      sources."babel-plugin-transform-exponentiation-operator-6.24.1"
+      sources."babel-plugin-transform-regenerator-6.26.0"
+      sources."babel-plugin-transform-strict-mode-6.24.1"
+      sources."babel-polyfill-6.26.0"
+      sources."babel-preset-env-1.7.0"
+      sources."babel-register-6.26.0"
+      (sources."babel-runtime-6.26.0" // {
+        dependencies = [
+          sources."regenerator-runtime-0.11.1"
+        ];
+      })
+      sources."babel-template-6.26.0"
+      sources."babel-traverse-6.26.0"
+      sources."babel-types-6.26.0"
+      sources."babylon-6.18.0"
+      sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          (sources."define-property-1.0.0" // {
+            dependencies = [
+              sources."kind-of-6.0.2"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."bcrypt-pbkdf-1.0.1"
+      sources."beeper-1.1.1"
+      sources."boom-2.10.1"
+      sources."brace-expansion-1.1.11"
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."browserslist-3.2.7"
+      sources."buffer-equal-1.0.0"
+      sources."cache-base-1.0.1"
+      sources."camelcase-1.2.1"
+      sources."caniuse-lite-1.0.30000842"
+      sources."caseless-0.12.0"
+      sources."center-align-0.1.3"
+      sources."chalk-1.1.3"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
+      sources."clean-css-4.1.11"
+      sources."cliui-2.1.0"
+      sources."clone-1.0.4"
+      sources."clone-buffer-1.0.0"
+      sources."clone-stats-0.0.1"
+      sources."cloneable-readable-1.1.2"
+      sources."co-4.6.0"
+      sources."collection-visit-1.0.0"
+      sources."color-support-1.1.3"
+      sources."combined-stream-1.0.6"
+      sources."commander-2.15.1"
+      sources."component-emitter-1.2.1"
+      sources."concat-map-0.0.1"
+      sources."convert-source-map-1.5.1"
+      sources."copy-descriptor-0.1.1"
+      sources."core-js-2.5.6"
+      sources."core-util-is-1.0.2"
+      sources."cryptiles-2.0.5"
+      (sources."css-2.2.3" // {
+        dependencies = [
+          sources."source-map-0.1.43"
+        ];
+      })
+      sources."d-1.0.0"
+      sources."dashdash-1.14.1"
+      sources."dateformat-2.2.0"
+      sources."debug-2.6.9"
+      sources."debug-fabulous-1.1.0"
+      sources."decamelize-1.2.0"
+      sources."decode-uri-component-0.2.0"
+      sources."defaults-1.0.3"
+      sources."define-properties-1.1.2"
+      sources."define-property-2.0.2"
+      sources."delayed-stream-1.0.0"
+      sources."deprecated-0.0.1"
+      sources."detect-file-1.0.0"
+      sources."detect-indent-4.0.0"
+      sources."detect-newline-2.1.0"
+      sources."dom4-2.0.1"
+      sources."duplexer2-0.0.2"
+      sources."duplexify-3.6.0"
+      sources."ecc-jsbn-0.1.1"
+      sources."electron-to-chromium-1.3.47"
+      sources."end-of-stream-0.1.5"
+      sources."errno-0.1.7"
+      sources."es5-ext-0.10.42"
+      sources."es6-iterator-2.0.3"
+      sources."es6-symbol-3.1.1"
+      sources."es6-weak-map-2.0.2"
+      sources."escape-string-regexp-1.0.5"
+      sources."esutils-2.0.2"
+      sources."event-emitter-0.3.5"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
+      sources."expand-tilde-2.0.2"
+      sources."extend-3.0.1"
+      sources."extend-shallow-3.0.2"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
+      sources."extsprintf-1.3.0"
+      sources."fancy-log-1.3.2"
+      sources."fill-range-4.0.0"
+      sources."find-index-0.1.1"
+      (sources."findup-sync-2.0.0" // {
+        dependencies = [
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-1.0.1"
+        ];
+      })
+      sources."fined-1.1.0"
+      sources."first-chunk-stream-1.0.0"
+      sources."flagged-respawn-1.0.0"
+      sources."flush-write-stream-1.0.3"
+      sources."for-in-1.0.2"
+      sources."for-own-1.0.0"
+      sources."foreach-2.0.5"
+      sources."forever-agent-0.6.1"
+      sources."form-data-2.1.4"
+      sources."fragment-cache-0.2.1"
+      sources."fs-mkdirp-stream-1.0.0"
+      sources."fs.realpath-1.0.0"
+      sources."function-bind-1.1.1"
+      sources."gaze-0.5.2"
+      sources."get-value-2.0.6"
+      sources."getpass-0.1.7"
+      sources."glob-4.5.3"
+      sources."glob-parent-3.1.0"
+      sources."glob-stream-3.1.18"
+      (sources."glob-watcher-0.0.6" // {
+        dependencies = [
+          sources."graceful-fs-1.2.3"
+        ];
+      })
+      sources."glob2base-0.0.12"
+      sources."global-modules-1.0.0"
+      sources."global-prefix-1.0.2"
+      sources."globals-9.18.0"
+      sources."globule-0.1.0"
+      sources."glogg-1.0.1"
+      sources."graceful-fs-3.0.11"
+      (sources."gulp-3.9.1" // {
+        dependencies = [
+          sources."clone-0.2.0"
+          sources."glob-3.1.21"
+          sources."has-values-0.1.4"
+          sources."inherits-1.0.2"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-1.0.1"
+          sources."is-number-4.0.0"
+          sources."isarray-0.0.1"
+          sources."lodash-1.0.2"
+          sources."minimatch-0.2.14"
+          sources."semver-4.3.6"
+        ];
+      })
+      (sources."gulp-babel-6.1.3" // {
+        dependencies = [
+          sources."jsesc-1.3.0"
+          sources."minimatch-3.0.4"
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
+      (sources."gulp-clean-css-3.9.4" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
+      (sources."gulp-less-3.5.0" // {
+        dependencies = [
+          sources."arr-diff-1.1.0"
+          sources."arr-union-2.1.0"
+          sources."array-slice-0.2.3"
+          sources."extend-shallow-1.1.4"
+          sources."glob-7.1.2"
+          sources."graceful-fs-4.1.11"
+          sources."kind-of-3.2.2"
+          sources."minimatch-3.0.4"
+          (sources."plugin-error-0.1.2" // {
+            dependencies = [
+              sources."kind-of-1.1.0"
+            ];
+          })
+          sources."readable-stream-2.3.6"
+          sources."replace-ext-1.0.0"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
+      sources."gulp-rename-1.2.3"
+      (sources."gulp-sourcemaps-2.6.4" // {
+        dependencies = [
+          sources."debug-3.1.0"
+          sources."graceful-fs-4.1.11"
+          sources."readable-stream-2.3.6"
+          sources."source-map-0.6.1"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+        ];
+      })
+      (sources."gulp-typescript-4.0.2" // {
+        dependencies = [
+          sources."arr-diff-1.1.0"
+          sources."arr-union-2.1.0"
+          sources."array-slice-0.2.3"
+          sources."clone-2.1.2"
+          sources."clone-stats-1.0.0"
+          sources."end-of-stream-1.4.1"
+          sources."extend-shallow-1.1.4"
+          sources."glob-7.1.2"
+          sources."glob-stream-6.1.0"
+          sources."graceful-fs-4.1.11"
+          sources."kind-of-1.1.0"
+          sources."minimatch-3.0.4"
+          sources."once-1.4.0"
+          sources."ordered-read-streams-1.0.1"
+          sources."plugin-error-0.1.2"
+          sources."readable-stream-2.3.6"
+          sources."replace-ext-1.0.0"
+          sources."source-map-0.6.1"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+          sources."unique-stream-2.2.1"
+          sources."vinyl-2.1.0"
+          sources."vinyl-fs-3.0.3"
+        ];
+      })
+      (sources."gulp-uglify-3.0.0" // {
+        dependencies = [
+          sources."readable-stream-2.3.6"
+          sources."source-map-0.6.1"
+          sources."string_decoder-1.1.1"
+          sources."through2-2.0.3"
+          sources."uglify-js-3.3.25"
+        ];
+      })
+      (sources."gulp-util-3.0.8" // {
+        dependencies = [
+          sources."isarray-0.0.1"
+          sources."object-assign-3.0.0"
+          sources."readable-stream-1.1.14"
+          sources."string_decoder-1.1.1"
+          (sources."through2-2.0.3" // {
+            dependencies = [
+              sources."isarray-1.0.0"
+              sources."readable-stream-2.3.6"
+            ];
+          })
+          sources."vinyl-0.5.3"
+        ];
+      })
+      sources."gulplog-1.0.0"
+      sources."har-schema-1.0.5"
+      sources."har-validator-4.2.1"
+      sources."has-ansi-2.0.0"
+      sources."has-gulplog-0.1.0"
+      sources."has-symbols-1.0.0"
+      sources."has-value-1.0.0"
+      sources."has-values-1.0.0"
+      sources."hawk-3.1.3"
+      sources."hoek-2.16.3"
+      sources."home-or-tmp-2.0.0"
+      sources."homedir-polyfill-1.0.1"
+      sources."http-signature-1.1.1"
+      sources."image-size-0.5.5"
+      sources."indx-0.2.3"
+      sources."inflight-1.0.6"
+      sources."inherits-2.0.3"
+      sources."ini-1.3.5"
+      sources."interpret-1.1.0"
+      sources."invariant-2.2.4"
+      sources."is-absolute-1.0.0"
+      sources."is-accessor-descriptor-1.0.0"
+      sources."is-buffer-1.1.6"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-2.1.1"
+      sources."is-finite-1.0.2"
+      sources."is-glob-3.1.0"
+      sources."is-negated-glob-1.0.0"
+      sources."is-number-3.0.0"
+      sources."is-odd-2.0.0"
+      sources."is-plain-object-2.0.4"
+      sources."is-promise-2.1.0"
+      sources."is-relative-1.0.0"
+      sources."is-typedarray-1.0.0"
+      sources."is-unc-path-1.0.0"
+      sources."is-utf8-0.2.1"
+      sources."is-valid-glob-1.0.0"
+      sources."is-windows-1.0.2"
+      sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
+      sources."isstream-0.1.2"
+      sources."js-tokens-3.0.2"
+      sources."jsbn-0.1.1"
+      sources."jsesc-0.5.0"
+      sources."json-schema-0.2.3"
+      sources."json-stable-stringify-1.0.1"
+      sources."json-stringify-safe-5.0.1"
+      sources."json5-0.5.1"
+      sources."jsonify-0.0.0"
+      (sources."jsprim-1.4.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."kind-of-6.0.2"
+      sources."lazy-cache-1.0.4"
+      sources."lazystream-1.0.0"
+      sources."lead-1.0.0"
+      sources."less-2.7.3"
+      (sources."liftoff-2.5.0" // {
+        dependencies = [
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."is-extendable-0.1.1"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+        ];
+      })
+      sources."lodash-4.17.10"
+      sources."lodash._basecopy-3.0.1"
+      sources."lodash._basetostring-3.0.1"
+      sources."lodash._basevalues-3.0.0"
+      sources."lodash._getnative-3.9.1"
+      sources."lodash._isiterateecall-3.0.9"
+      sources."lodash._reescape-3.0.0"
+      sources."lodash._reevaluate-3.0.0"
+      sources."lodash._reinterpolate-3.0.0"
+      sources."lodash._root-3.0.1"
+      sources."lodash.clone-4.5.0"
+      sources."lodash.defaults-4.2.0"
+      sources."lodash.escape-3.2.0"
+      sources."lodash.flatten-4.4.0"
+      sources."lodash.isarguments-3.1.0"
+      sources."lodash.isarray-3.0.4"
+      sources."lodash.keys-3.1.2"
+      sources."lodash.merge-4.6.1"
+      sources."lodash.partialright-4.2.1"
+      sources."lodash.pick-4.4.0"
+      sources."lodash.restparam-3.6.1"
+      sources."lodash.template-3.6.2"
+      sources."lodash.templatesettings-3.1.1"
+      sources."lodash.uniq-4.5.0"
+      sources."longest-1.0.1"
+      sources."loose-envify-1.3.1"
+      sources."lru-cache-2.7.3"
+      sources."lru-queue-0.1.0"
+      sources."make-error-1.3.4"
+      sources."make-error-cause-1.2.2"
+      sources."make-iterator-1.0.1"
+      sources."map-cache-0.2.2"
+      sources."map-visit-1.0.0"
+      sources."memoizee-0.4.12"
+      (sources."micromatch-3.1.10" // {
+        dependencies = [
+          sources."is-extendable-0.1.1"
+        ];
+      })
+      sources."mime-1.6.0"
+      sources."mime-db-1.33.0"
+      sources."mime-types-2.1.18"
+      sources."minimatch-2.0.10"
+      sources."minimist-1.2.0"
+      sources."mixin-deep-1.3.1"
+      sources."mkdirp-0.5.1"
+      sources."ms-2.0.0"
+      sources."multipipe-0.1.2"
+      sources."nanomatch-1.2.9"
+      sources."natives-1.1.3"
+      sources."next-tick-1.0.0"
+      sources."normalize-path-2.1.1"
+      sources."now-and-later-2.0.0"
+      sources."number-is-nan-1.0.1"
+      sources."oauth-sign-0.8.2"
+      sources."object-assign-4.1.1"
+      sources."object-copy-0.1.0"
+      sources."object-keys-1.0.11"
+      sources."object-visit-1.0.1"
+      sources."object.assign-4.1.0"
+      sources."object.defaults-1.1.0"
+      sources."object.map-1.0.1"
+      sources."object.pick-1.3.0"
+      sources."once-1.3.3"
+      sources."orchestrator-0.3.8"
+      sources."ordered-read-streams-0.1.0"
+      sources."os-homedir-1.0.2"
+      sources."os-tmpdir-1.0.2"
+      sources."parse-filepath-1.0.2"
+      sources."parse-passwd-1.0.0"
+      sources."pascalcase-0.1.1"
+      sources."path-dirname-1.0.2"
+      sources."path-is-absolute-1.0.1"
+      sources."path-parse-1.0.5"
+      sources."path-root-0.1.1"
+      sources."path-root-regex-0.1.2"
+      sources."performance-now-0.2.0"
+      sources."plugin-error-1.0.1"
+      sources."posix-character-classes-0.1.1"
+      sources."pretty-hrtime-1.0.3"
+      sources."private-0.1.8"
+      sources."process-nextick-args-2.0.0"
+      sources."promise-7.3.1"
+      sources."proxy-polyfill-0.2.0"
+      sources."prr-1.0.1"
+      sources."pump-2.0.1"
+      sources."pumpify-1.5.1"
+      sources."punycode-1.4.1"
+      sources."qs-6.4.0"
+      sources."readable-stream-1.0.34"
+      sources."rechoir-0.6.2"
+      sources."regenerate-1.4.0"
+      sources."regenerator-runtime-0.10.5"
+      sources."regenerator-transform-0.10.1"
+      sources."regex-not-1.0.2"
+      sources."regexpu-core-2.0.0"
+      sources."regjsgen-0.2.0"
+      sources."regjsparser-0.1.5"
+      sources."remove-bom-buffer-3.0.0"
+      sources."remove-bom-stream-1.2.0"
+      sources."remove-trailing-separator-1.1.0"
+      sources."repeat-element-1.1.2"
+      sources."repeat-string-1.6.1"
+      sources."repeating-2.0.1"
+      sources."replace-ext-0.0.1"
+      sources."request-2.81.0"
+      sources."resolve-1.7.1"
+      sources."resolve-dir-1.0.1"
+      sources."resolve-options-1.1.0"
+      sources."resolve-url-0.2.1"
+      sources."ret-0.1.15"
+      sources."right-align-0.1.3"
+      sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
+      sources."semver-5.5.0"
+      sources."sequencify-0.0.7"
+      sources."set-value-2.0.0"
+      sources."sigmund-1.0.1"
+      sources."slash-1.0.0"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          (sources."define-property-0.2.5" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-4.0.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
+      sources."sntp-1.0.9"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-support-0.4.18"
+      sources."source-map-url-0.4.0"
+      sources."sparkles-1.0.1"
+      (sources."split-string-3.1.0" // {
+        dependencies = [
+          sources."extend-shallow-3.0.2"
+        ];
+      })
+      (sources."sshpk-1.14.1" // {
+        dependencies = [
+          sources."assert-plus-1.0.0"
+        ];
+      })
+      sources."static-extend-0.1.2"
+      sources."stream-consume-0.1.1"
+      sources."stream-shift-1.0.0"
+      sources."string_decoder-0.10.31"
+      sources."stringstream-0.0.6"
+      sources."strip-ansi-3.0.1"
+      sources."strip-bom-1.0.0"
+      sources."strip-bom-string-1.0.0"
+      sources."supports-color-2.0.0"
+      sources."through2-0.6.5"
+      sources."through2-filter-2.0.0"
+      sources."tildify-1.2.0"
+      sources."time-stamp-1.1.0"
+      sources."timers-ext-0.1.5"
+      sources."to-absolute-glob-2.0.2"
+      sources."to-fast-properties-1.0.3"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
+      sources."to-through-2.0.0"
+      sources."tough-cookie-2.3.4"
+      sources."trim-right-1.0.1"
+      sources."tunnel-agent-0.6.0"
+      sources."tweetnacl-0.14.5"
+      sources."typescript-2.7.2"
+      (sources."uglify-es-3.3.10" // {
+        dependencies = [
+          sources."commander-2.14.1"
+          sources."source-map-0.6.1"
+        ];
+      })
+      sources."uglify-js-2.8.29"
+      sources."uglify-to-browserify-1.0.2"
+      sources."unc-path-regex-0.1.2"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."set-value-0.4.3"
+        ];
+      })
+      sources."unique-stream-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+        ];
+      })
+      sources."urix-0.1.0"
+      (sources."use-3.1.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      sources."user-home-1.1.1"
+      sources."util-deprecate-1.0.2"
+      sources."uuid-3.2.1"
+      sources."v8flags-2.1.1"
+      sources."value-or-function-3.0.0"
+      sources."verror-1.10.0"
+      sources."vinyl-0.4.6"
+      (sources."vinyl-fs-0.3.14" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+          sources."minimist-0.0.8"
+        ];
+      })
+      sources."vinyl-sourcemap-1.1.0"
+      sources."vinyl-sourcemaps-apply-0.2.1"
+      sources."whatwg-fetch-2.0.4"
+      sources."when-3.7.8"
+      sources."which-1.3.0"
+      sources."window-size-0.1.0"
+      sources."wordwrap-0.0.2"
+      sources."wrappy-1.0.2"
+      sources."xtend-4.0.1"
+      sources."yargs-3.10.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "[![GoDoc](https://godoc.org/github.com/bakape/meguca?status.svg)](https://godoc.org/github.com/bakape/meguca) [![Build Status](https://travis-ci.org/bakape/meguca.svg)](https://travis-ci.org/bakape/meguca)";
+      homepage = "https://github.com/bakape/meguca#readme";
+      license = "AGPL-3.0";
+    };
+    production = true;
+    bypassCache = false;
+  };
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
@@ -37091,7 +38861,7 @@ in
       sources."normalize-package-data-2.4.0"
       sources."npm-package-arg-6.1.0"
       sources."npm-registry-client-8.5.1"
-      (sources."npmconf-2.1.2" // {
+      (sources."npmconf-2.1.3" // {
         dependencies = [
           sources."once-1.3.3"
           sources."semver-4.3.6"
@@ -37112,7 +38882,7 @@ in
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."retry-0.10.1"
       sources."rimraf-2.2.8"
       sources."safe-buffer-5.1.2"
@@ -37130,7 +38900,6 @@ in
       sources."ssri-5.3.0"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."tar-3.1.15"
       sources."temp-0.8.3"
@@ -37248,7 +39017,7 @@ in
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
       sources."semver-5.3.0"
@@ -37258,7 +39027,6 @@ in
       sources."sshpk-1.14.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."tough-cookie-2.3.4"
@@ -37521,7 +39289,7 @@ in
       sources."statuses-1.4.0"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
       sources."strip-indent-1.0.1"
@@ -37606,7 +39374,7 @@ in
       sources."gauge-2.7.4"
       sources."glob-7.1.2"
       sources."has-unicode-2.0.1"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -37788,7 +39556,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."from-0.1.7"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       (sources."glob-parent-3.1.0" // {
@@ -37834,8 +39602,8 @@ in
       sources."kind-of-6.0.2"
       sources."latest-version-3.1.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.2"
-      sources."make-dir-1.2.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-stream-0.1.0"
       sources."map-visit-1.0.0"
@@ -37916,7 +39684,7 @@ in
       sources."snapdragon-node-2.1.1"
       sources."snapdragon-util-3.0.1"
       sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.1"
+      sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."split-0.3.3"
       (sources."split-string-3.1.0" // {
@@ -37961,7 +39729,7 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.0.5"
+      sources."upath-1.1.0"
       sources."update-notifier-2.5.0"
       sources."urix-0.1.0"
       sources."url-parse-lax-1.0.0"
@@ -37989,10 +39757,10 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "0.18.4";
+    version = "0.18.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-0.18.4.tgz";
-      sha512 = "0d25q2hxpf5snrg8f3gplrjd73hqzyzxna0g2q6l0bm04fm8xgby8ydixaf8mgyz9dly2k5mw79jvs653m6vk9cl0r61fv8qr75khjz";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.18.5.tgz";
+      sha512 = "39pg9g9hqnalz1dl4zhs3g53lz92syqxbdxpfa89psxxdiz9xg6sa4arf35gw0fi46r3bn5vgwrf9w4ks6s822mq42n1bq85jfq1jqs";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -38020,7 +39788,17 @@ in
       sources."bcryptjs-2.4.3"
       sources."bl-1.2.2"
       sources."block-stream-0.0.9"
-      sources."body-parser-1.18.2"
+      (sources."body-parser-1.18.2" // {
+        dependencies = [
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+            ];
+          })
+          sources."setprototypeof-1.0.3"
+        ];
+      })
       sources."boolbase-1.0.0"
       sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
@@ -38039,7 +39817,7 @@ in
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
       sources."combined-stream-1.0.6"
-      sources."commander-2.13.0"
+      sources."commander-2.15.1"
       sources."commist-1.0.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -38071,7 +39849,7 @@ in
       sources."dicer-0.2.5"
       sources."dom-serializer-0.1.0"
       sources."domelementtype-1.3.0"
-      sources."domhandler-2.4.1"
+      sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
       sources."duplexify-3.6.0"
       sources."ecc-jsbn-0.1.1"
@@ -38084,9 +39862,9 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.0"
       sources."etag-1.8.1"
-      (sources."express-4.16.2" // {
+      (sources."express-4.16.3" // {
         dependencies = [
-          sources."statuses-1.3.1"
+          sources."statuses-1.4.0"
         ];
       })
       sources."express-session-1.15.6"
@@ -38095,8 +39873,8 @@ in
       sources."fast-deep-equal-1.1.0"
       sources."fast-json-stable-stringify-2.0.0"
       sources."feedparser-2.2.9"
-      sources."finalhandler-1.1.0"
-      (sources."follow-redirects-1.3.0" // {
+      sources."finalhandler-1.1.1"
+      (sources."follow-redirects-1.4.1" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -38121,7 +39899,11 @@ in
       sources."has-unicode-2.0.1"
       sources."hash-sum-1.0.2"
       sources."hawk-6.0.2"
-      sources."help-me-1.1.0"
+      (sources."help-me-1.1.0" // {
+        dependencies = [
+          sources."pump-2.0.1"
+        ];
+      })
       sources."hoek-4.2.1"
       (sources."htmlparser2-3.9.2" // {
         dependencies = [
@@ -38150,14 +39932,14 @@ in
       sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isstream-0.1.2"
-      sources."js-yaml-3.10.0"
+      sources."js-yaml-3.11.0"
       sources."jsbn-0.1.1"
       sources."json-schema-0.2.3"
       sources."json-schema-traverse-0.3.1"
       sources."json-stable-stringify-1.0.1"
       sources."json-stringify-safe-5.0.1"
       sources."json5-0.2.0"
-      sources."jsonata-1.5.0"
+      sources."jsonata-1.5.3"
       sources."jsonfile-4.0.0"
       sources."jsonify-0.0.0"
       sources."jsprim-1.4.1"
@@ -38182,7 +39964,7 @@ in
       sources."lodash.reject-4.6.0"
       sources."lodash.some-4.6.0"
       sources."lodash.uniq-4.5.0"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       (sources."mailcomposer-2.1.0" // {
         dependencies = [
           sources."needle-0.10.0"
@@ -38205,13 +39987,13 @@ in
       sources."minimist-1.2.0"
       sources."mkdirp-0.5.1"
       sources."moment-2.22.1"
-      sources."moment-timezone-0.5.16"
-      (sources."mqtt-2.15.1" // {
+      sources."moment-timezone-0.5.17"
+      (sources."mqtt-2.17.0" // {
         dependencies = [
           sources."ws-3.3.3"
         ];
       })
-      sources."mqtt-packet-5.5.0"
+      sources."mqtt-packet-5.6.0"
       sources."mri-1.1.1"
       sources."ms-2.0.0"
       (sources."multer-1.3.0" // {
@@ -38281,32 +40063,31 @@ in
       sources."process-nextick-args-2.0.0"
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
-      sources."pump-2.0.1"
-      sources."pumpify-1.5.0"
+      sources."pump-3.0.0"
+      sources."pumpify-1.5.1"
       sources."punycode-1.4.1"
       sources."qs-6.5.1"
       sources."random-bytes-1.0.0"
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
+      (sources."raw-body-2.3.3" // {
         dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-          sources."setprototypeof-1.0.3"
+          sources."iconv-lite-0.4.23"
         ];
       })
       sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."reinterval-1.1.0"
       sources."remove-trailing-separator-1.1.0"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."retry-0.6.1"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
+      sources."safer-buffer-2.1.2"
       sources."sax-1.2.4"
-      sources."semver-5.4.1"
-      sources."send-0.16.1"
+      sources."semver-5.5.0"
+      sources."send-0.16.2"
       sources."sentiment-2.1.0"
-      sources."serve-static-1.13.1"
+      sources."serve-static-1.13.2"
       sources."set-blocking-2.0.0"
       sources."setprototypeof-1.1.0"
       sources."signal-exit-3.0.2"
@@ -38321,7 +40102,6 @@ in
       sources."streamsearch-0.1.2"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."tar-2.2.1"
@@ -38335,7 +40115,7 @@ in
       sources."twitter-ng-0.6.2"
       sources."type-is-1.6.16"
       sources."typedarray-0.0.6"
-      sources."uglify-js-3.3.6"
+      sources."uglify-js-3.3.24"
       sources."uid-number-0.0.6"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.3"
@@ -38389,13 +40169,16 @@ in
       sources."addressparser-1.0.1"
       sources."argparse-0.1.16"
       sources."async-0.1.22"
+      sources."balanced-match-1.0.0"
       sources."base64id-0.1.0"
+      sources."brace-expansion-1.1.11"
       sources."bson-0.1.8"
       sources."buffer-crc32-0.2.13"
       sources."buildmail-4.0.1"
       sources."bytes-0.2.0"
       sources."coffee-script-1.12.7"
       sources."commander-0.6.1"
+      sources."concat-map-0.0.1"
       (sources."config-0.4.15" // {
         dependencies = [
           sources."js-yaml-0.3.7"
@@ -38422,20 +40205,20 @@ in
       sources."eyes-0.1.8"
       sources."formidable-1.0.11"
       sources."fresh-0.1.0"
-      sources."glob-4.0.6"
-      sources."graceful-fs-3.0.11"
+      sources."fs.realpath-1.0.0"
+      sources."glob-7.1.2"
       sources."hooks-0.2.1"
       sources."iconv-lite-0.4.15"
+      sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."js-yaml-2.1.0"
       sources."libbase64-0.1.0"
       sources."libmime-3.0.0"
       sources."libqp-1.1.0"
-      sources."lru-cache-2.7.3"
       sources."mailcomposer-4.0.2"
       sources."methods-0.0.1"
       sources."mime-1.2.6"
-      sources."minimatch-1.0.0"
+      sources."minimatch-3.0.4"
       sources."minimist-0.0.10"
       sources."mkdirp-0.3.5"
       sources."moment-2.1.0"
@@ -38451,7 +40234,6 @@ in
       sources."ms-0.1.0"
       sources."muri-0.3.1"
       sources."nan-1.0.0"
-      sources."natives-1.1.3"
       (sources."net-ping-1.1.7" // {
         dependencies = [
           sources."nan-2.10.0"
@@ -38463,6 +40245,7 @@ in
       sources."once-1.4.0"
       sources."optimist-0.6.1"
       sources."options-0.0.6"
+      sources."path-is-absolute-1.0.1"
       sources."pause-0.0.1"
       sources."policyfile-0.0.4"
       sources."punycode-1.4.1"
@@ -38473,7 +40256,6 @@ in
       sources."redis-0.7.3"
       sources."semver-1.1.0"
       sources."send-0.1.0"
-      sources."sigmund-1.0.1"
       sources."simplesmtp-0.3.35"
       sources."sliced-0.0.3"
       (sources."socket.io-0.9.14" // {
@@ -38486,7 +40268,7 @@ in
       sources."uglify-js-1.2.5"
       sources."underscore-1.7.0"
       sources."underscore.string-2.4.0"
-      sources."vows-0.8.1"
+      sources."vows-0.8.2"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
       sources."ws-0.4.32"
@@ -38505,10 +40287,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.0.0";
+    version = "6.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
-      sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
+      url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz";
+      sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -38649,7 +40431,7 @@ in
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."retry-0.6.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
@@ -38661,7 +40443,6 @@ in
       sources."sshpk-1.14.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       (sources."tar-0.1.17" // {
         dependencies = [
@@ -38762,8 +40543,8 @@ in
       sources."latest-version-3.1.0"
       sources."lodash-4.17.10"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.2"
-      sources."make-dir-1.2.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
       sources."minimist-1.2.0"
       sources."ms-2.0.0"
       sources."node-alias-1.0.4"
@@ -38863,7 +40644,7 @@ in
       sources."code-point-at-1.1.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."cross-spawn-5.1.0"
       sources."cvss-1.0.2"
       sources."debug-3.1.0"
@@ -38883,7 +40664,7 @@ in
       sources."hoek-4.2.1"
       sources."hosted-git-info-2.6.0"
       sources."https-proxy-agent-2.2.1"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       (sources."inquirer-3.3.0" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -38904,7 +40685,7 @@ in
       sources."load-json-file-2.0.0"
       sources."locate-path-2.0.0"
       sources."lodash-3.10.1"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."mem-1.1.0"
       sources."mimic-fn-1.2.0"
       sources."ms-2.0.0"
@@ -39005,7 +40786,7 @@ in
       sources."vscode-languageclient-4.0.1"
       sources."vscode-languageserver-4.0.0"
       sources."vscode-languageserver-protocol-3.6.0"
-      sources."vscode-languageserver-types-3.7.1"
+      sources."vscode-languageserver-types-3.7.2"
       sources."vscode-uri-1.0.3"
       sources."wrappy-1.0.2"
     ];
@@ -39047,10 +40828,9 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."bl-1.2.2"
       sources."bluebird-3.5.1"
-      (sources."body-parser-1.18.2" // {
+      (sources."body-parser-1.18.3" // {
         dependencies = [
           sources."content-type-1.0.4"
-          sources."setprototypeof-1.0.3"
         ];
       })
       sources."boom-4.3.1"
@@ -39067,7 +40847,7 @@ in
       sources."cliui-2.1.0"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."combined-stream-1.0.6"
       sources."compressible-2.0.13"
       sources."compression-1.7.2"
@@ -39077,7 +40857,7 @@ in
       sources."content-type-git+https://github.com/wikimedia/content-type#master"
       sources."cookie-0.3.1"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.5.5"
+      sources."core-js-2.5.6"
       sources."core-util-is-1.0.2"
       (sources."cryptiles-3.1.2" // {
         dependencies = [
@@ -39107,7 +40887,20 @@ in
       sources."etag-1.8.1"
       (sources."express-4.16.3" // {
         dependencies = [
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."setprototypeof-1.0.3"
+            ];
+          })
           sources."content-type-1.0.4"
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+            ];
+          })
           sources."statuses-1.4.0"
         ];
       })
@@ -39151,7 +40944,7 @@ in
       sources."hot-shots-4.8.0"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."invert-kv-1.0.0"
@@ -39228,25 +41021,21 @@ in
       sources."promise-7.3.1"
       sources."proxy-addr-2.0.3"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
       sources."readable-stream-1.1.14"
       sources."repeat-string-1.6.1"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."right-align-0.1.3"
       sources."rimraf-2.4.5"
       sources."safe-buffer-5.1.1"
       sources."safe-json-stringify-1.1.0"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."send-0.16.2"
       (sources."serve-favicon-2.5.0" // {
@@ -39279,7 +41068,6 @@ in
       sources."streamsearch-0.1.2"
       sources."string-width-1.0.2"
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
       sources."tough-cookie-2.3.4"
@@ -39442,7 +41230,7 @@ in
       sources."lodash-3.10.1"
       sources."loud-rejection-1.6.0"
       sources."lru-2.0.1"
-      sources."magnet-uri-5.1.7"
+      sources."magnet-uri-5.1.8"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
       sources."mime-1.6.0"
@@ -39520,7 +41308,7 @@ in
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
-      sources."simple-sha1-2.1.0"
+      sources."simple-sha1-2.1.1"
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
           sources."ws-2.3.1"
@@ -39535,7 +41323,7 @@ in
       sources."speedometer-0.1.4"
       sources."stream-buffers-2.2.0"
       sources."string-width-1.0.2"
-      sources."string2compact-1.2.3"
+      sources."string2compact-1.2.5"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
@@ -39769,7 +41557,7 @@ in
       sources."mkdirp-0.5.1"
       sources."morgan-1.6.1"
       sources."ms-0.7.1"
-      sources."multiparty-4.1.3"
+      sources."multiparty-4.1.4"
       sources."negotiator-0.5.3"
       sources."node-uuid-1.4.8"
       sources."oauth-sign-0.2.0"
@@ -39850,7 +41638,7 @@ in
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
       sources."simple-peer-6.4.4"
-      sources."simple-sha1-2.1.0"
+      sources."simple-sha1-2.1.1"
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
           sources."ws-2.3.1"
@@ -39878,7 +41666,7 @@ in
       sources."speedometer-0.1.4"
       sources."statuses-1.5.0"
       sources."stream-counter-0.2.0"
-      sources."string2compact-1.2.3"
+      sources."string2compact-1.2.5"
       sources."string_decoder-0.10.31"
       sources."thirty-two-0.0.2"
       sources."thunky-1.0.2"
@@ -40029,7 +41817,7 @@ in
         ];
       })
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."throttleit-1.0.0"
@@ -40186,7 +41974,7 @@ in
         ];
       })
       sources."collection-visit-1.0.0"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."combine-source-map-0.8.0"
       sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
@@ -40196,7 +41984,7 @@ in
       sources."convert-source-map-1.1.3"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.1"
+      sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
@@ -40232,7 +42020,7 @@ in
       sources."for-in-1.0.2"
       sources."fragment-cache-0.2.1"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       sources."function-bind-1.1.1"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
@@ -40255,7 +42043,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       sources."inline-source-map-0.6.2"
-      (sources."insert-module-globals-7.0.6" // {
+      (sources."insert-module-globals-7.1.0" // {
         dependencies = [
           sources."concat-stream-1.6.2"
         ];
@@ -40383,7 +42171,7 @@ in
       sources."snapdragon-util-3.0.1"
       sources."sorcery-0.10.0"
       sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.1"
+      sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."sourcemap-codec-1.4.1"
       (sources."split-string-3.1.0" // {
@@ -40395,7 +42183,7 @@ in
       sources."static-extend-0.1.2"
       sources."stream-browserify-2.0.1"
       sources."stream-combiner2-1.1.1"
-      sources."stream-http-2.8.1"
+      sources."stream-http-2.8.2"
       sources."stream-splicer-2.0.0"
       sources."string-stream-0.0.7"
       sources."string_decoder-0.10.31"
@@ -40431,7 +42219,7 @@ in
           })
         ];
       })
-      sources."upath-1.0.5"
+      sources."upath-1.1.0"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -40498,7 +42286,7 @@ in
       sha1 = "195a2a5b6dd76e4a244a807002678b037d70eeaa";
     };
     dependencies = [
-      sources."@types/babel-types-7.0.1"
+      sources."@types/babel-types-7.0.2"
       sources."@types/babylon-6.16.2"
       sources."accepts-1.3.5"
       sources."acorn-3.3.0"
@@ -40526,11 +42314,7 @@ in
       sources."bcrypt-pbkdf-1.0.1"
       sources."bindings-1.2.1"
       sources."bl-1.2.2"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."body-parser-1.18.3"
       sources."boom-2.10.1"
       sources."buffer-alloc-1.1.0"
       sources."buffer-alloc-unsafe-0.1.1"
@@ -40555,7 +42339,7 @@ in
       sources."cookie-0.3.1"
       sources."cookie-parser-1.4.3"
       sources."cookie-signature-1.0.6"
-      sources."core-js-2.5.5"
+      sources."core-js-2.5.6"
       sources."core-util-is-1.0.2"
       sources."cryptiles-2.0.5"
       sources."dashdash-1.14.1"
@@ -40576,9 +42360,22 @@ in
       sources."esutils-2.0.2"
       sources."etag-1.8.1"
       sources."eventemitter2-3.0.2"
-      sources."expand-template-1.1.0"
+      sources."expand-template-1.1.1"
       (sources."express-4.16.3" // {
         dependencies = [
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."setprototypeof-1.0.3"
+            ];
+          })
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+            ];
+          })
           sources."statuses-1.4.0"
         ];
       })
@@ -40604,7 +42401,7 @@ in
       sources."http-errors-1.6.3"
       sources."http-signature-1.1.1"
       sources."httpolyglot-0.1.2"
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."image-size-0.5.5"
       sources."inherits-2.0.3"
       sources."ini-1.3.5"
@@ -40699,15 +42496,10 @@ in
       sources."pug-walk-1.1.7"
       sources."pump-1.0.3"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."qtdatastream-0.7.1"
       sources."range-parser-1.2.0"
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-        ];
-      })
+      sources."raw-body-2.3.3"
       sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."regenerator-runtime-0.11.1"
@@ -40716,6 +42508,7 @@ in
       sources."resolve-1.7.1"
       sources."right-align-0.1.3"
       sources."safe-buffer-5.1.1"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."send-0.16.2"
       (sources."serve-favicon-2.3.2" // {
@@ -40740,11 +42533,11 @@ in
       sources."statuses-1.5.0"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."tar-fs-1.16.2"
-      sources."tar-stream-1.6.0"
+      sources."tar-stream-1.6.1"
       sources."to-buffer-1.1.1"
       sources."to-fast-properties-1.0.3"
       sources."token-stream-0.0.1"
@@ -40805,7 +42598,7 @@ in
       sources."esprima-fb-13001.1001.0-dev-harmony-fb"
       sources."glob-5.0.15"
       sources."graceful-fs-4.1.11"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
       (sources."jstransform-10.1.0" // {
@@ -41002,7 +42795,7 @@ in
       (sources."openid-2.0.6" // {
         dependencies = [
           sources."qs-6.5.2"
-          sources."request-2.85.0"
+          sources."request-2.86.0"
         ];
       })
       sources."pause-0.0.1"
@@ -41021,7 +42814,6 @@ in
       sources."stream-counter-0.2.0"
       sources."string-1.6.1"
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.5"
       sources."tough-cookie-2.3.4"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -41058,10 +42850,10 @@ in
   serve = nodeEnv.buildNodePackage {
     name = "serve";
     packageName = "serve";
-    version = "6.5.6";
+    version = "6.5.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serve/-/serve-6.5.6.tgz";
-      sha512 = "1gfw9s3jh8ymzv26733pp33xkvhihlb25w8aznc3yqcx7wg82k7fzz6f3w3aw758dy7cshb89ijliaqcf1p4bgrchfqbxv1613wgmmd";
+      url = "https://registry.npmjs.org/serve/-/serve-6.5.7.tgz";
+      sha512 = "1kn5wi04mvlkl4p56wihpgkh9va0vxy2a6rsfpy62ra53iri5w0dq8aipp62m8a23hl1s4g2bcfxyxlxmlyzkv9mvqi0455afbpn2nw";
     };
     dependencies = [
       sources."accepts-1.3.5"
@@ -41142,7 +42934,7 @@ in
       sources."lazy-cache-1.0.4"
       sources."leven-2.1.0"
       sources."longest-1.0.1"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."micro-9.1.4"
       sources."micro-compress-1.0.0"
       sources."mime-1.4.1"
@@ -41164,6 +42956,7 @@ in
       sources."path-key-2.0.1"
       sources."path-type-3.0.0"
       sources."pify-3.0.0"
+      sources."promise-timeout-1.3.0"
       sources."pseudomap-1.0.2"
       sources."range-parser-1.2.0"
       sources."raw-body-2.3.2"
@@ -41199,7 +42992,7 @@ in
       sources."uglify-to-browserify-1.0.2"
       sources."universalify-0.1.1"
       sources."unpipe-1.0.0"
-      (sources."update-check-1.3.2" // {
+      (sources."update-check-1.5.0" // {
         dependencies = [
           sources."minimist-1.2.0"
         ];
@@ -41383,7 +43176,7 @@ in
       })
       sources."read-1.0.7"
       sources."readable-stream-1.1.14"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."safe-buffer-5.1.1"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
@@ -41414,7 +43207,6 @@ in
       sources."statuses-1.4.0"
       sources."stream-combiner-0.0.4"
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.5"
       sources."through-2.3.8"
       sources."tinycolor-0.0.1"
       sources."to-array-0.1.3"
@@ -41465,17 +43257,12 @@ in
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
       sources."bcrypt-pbkdf-1.0.1"
-      (sources."body-parser-1.18.2" // {
+      (sources."body-parser-1.18.3" // {
         dependencies = [
           sources."bytes-3.0.0"
-          sources."iconv-lite-0.4.19"
-          sources."qs-6.5.1"
-          (sources."raw-body-2.3.2" // {
-            dependencies = [
-              sources."depd-1.1.1"
-              sources."http-errors-1.6.2"
-            ];
-          })
+          sources."iconv-lite-0.4.23"
+          sources."qs-6.5.2"
+          sources."raw-body-2.3.3"
         ];
       })
       sources."boom-4.3.1"
@@ -41523,7 +43310,7 @@ in
         ];
       })
       sources."domelementtype-1.3.0"
-      sources."domhandler-2.4.1"
+      sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
       sources."dtrace-provider-0.8.6"
       sources."ecc-jsbn-0.1.1"
@@ -41638,7 +43425,7 @@ in
           sources."source-map-0.6.1"
         ];
       })
-      (sources."request-2.85.0" // {
+      (sources."request-2.86.0" // {
         dependencies = [
           sources."qs-6.5.2"
         ];
@@ -41652,6 +43439,7 @@ in
       })
       sources."safe-buffer-5.1.1"
       sources."safe-json-stringify-1.1.0"
+      sources."safer-buffer-2.1.2"
       sources."sanitize-html-1.18.2"
       sources."semver-4.3.6"
       sources."send-0.15.6"
@@ -41666,7 +43454,6 @@ in
       sources."sshpk-1.14.1"
       sources."statuses-1.3.1"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."supports-color-5.4.0"
       sources."through-2.3.8"
       sources."tough-cookie-2.3.4"
@@ -41900,7 +43687,7 @@ in
       sources."engine.io-3.2.0"
       sources."engine.io-client-3.2.1"
       sources."engine.io-parser-2.1.2"
-      sources."has-binary2-1.0.2"
+      sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."indexof-0.0.1"
       sources."isarray-2.0.1"
@@ -42094,7 +43881,7 @@ in
       sources."is-regex-1.0.4"
       sources."is-symbol-1.0.1"
       sources."js-yaml-3.10.0"
-      sources."mdn-data-1.1.2"
+      sources."mdn-data-1.1.3"
       sources."minimist-0.0.8"
       sources."mkdirp-0.5.1"
       sources."nth-check-1.0.1"
@@ -42296,7 +44083,7 @@ in
         ];
       })
       sources."stack-trace-0.0.10"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."temp-0.8.3"
@@ -42452,8 +44239,8 @@ in
       sources."log-update-1.0.2"
       sources."loose-envify-1.3.1"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.2"
-      sources."make-dir-1.2.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
       sources."make-error-1.3.4"
       sources."make-error-cause-1.2.2"
       sources."mime-db-1.33.0"
@@ -42559,10 +44346,10 @@ in
   uglify-js = nodeEnv.buildNodePackage {
     name = "uglify-js";
     packageName = "uglify-js";
-    version = "3.3.23";
+    version = "3.3.25";
     src = fetchurl {
-      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.23.tgz";
-      sha512 = "2zylyzplicczqknizbm1mp7grxz6bi6vg03rsld8l18b2rahl9y7b1rj2c3sp75afmmyqlgg57v8c0b1adyqm7arzw8kcc3n6l8mkra";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.25.tgz";
+      sha512 = "1qcjjk817lmd65xc8h3axwdnx4h7xkn3k9lf7dy65bm564jhrqvq5v11va9jiamdva9q0nk589i3vm2pn7dvjmjavx5s3d3pj1fi1l6";
     };
     dependencies = [
       sources."commander-2.15.1"
@@ -42611,11 +44398,7 @@ in
       sources."blob-0.0.4"
       sources."bluebird-3.5.1"
       sources."blueimp-md5-2.10.0"
-      (sources."body-parser-1.18.2" // {
-        dependencies = [
-          sources."setprototypeof-1.0.3"
-        ];
-      })
+      sources."body-parser-1.18.3"
       sources."boom-4.3.1"
       sources."brace-expansion-1.1.11"
       sources."buffer-from-1.0.0"
@@ -42692,6 +44475,19 @@ in
       sources."execa-0.7.0"
       (sources."express-4.16.3" // {
         dependencies = [
+          (sources."body-parser-1.18.2" // {
+            dependencies = [
+              sources."setprototypeof-1.0.3"
+            ];
+          })
+          sources."iconv-lite-0.4.19"
+          sources."qs-6.5.1"
+          (sources."raw-body-2.3.2" // {
+            dependencies = [
+              sources."depd-1.1.1"
+              sources."http-errors-1.6.2"
+            ];
+          })
           sources."statuses-1.4.0"
         ];
       })
@@ -42719,7 +44515,7 @@ in
       sources."graceful-fs-4.1.11"
       sources."har-schema-2.0.0"
       sources."har-validator-5.0.3"
-      sources."has-binary2-1.0.2"
+      sources."has-binary2-1.0.3"
       sources."has-cors-1.1.0"
       sources."has-unicode-2.0.1"
       sources."hasher-1.2.0"
@@ -42729,7 +44525,7 @@ in
       sources."hosted-git-info-2.6.0"
       sources."http-errors-1.6.3"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.19"
+      sources."iconv-lite-0.4.23"
       sources."ignore-3.3.8"
       sources."indexof-0.0.1"
       sources."inflight-1.0.6"
@@ -42754,7 +44550,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
       sources."just-detect-adblock-1.0.0"
-      (sources."keen.io-0.1.3" // {
+      (sources."keen.io-0.1.5" // {
         dependencies = [
           sources."methods-1.0.1"
           sources."mime-1.2.11"
@@ -42767,7 +44563,7 @@ in
       sources."locate-path-2.0.0"
       sources."locks-0.2.2"
       sources."lodash-4.17.10"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."md5-2.2.1"
       sources."media-typer-0.3.0"
       sources."mem-1.1.0"
@@ -42791,7 +44587,7 @@ in
       sources."node-cache-4.2.0"
       sources."nopt-1.0.10"
       sources."normalize-package-data-2.4.0"
-      sources."npm-6.0.0"
+      sources."npm-6.0.1"
       sources."npm-package-arg-6.1.0"
       (sources."npm-registry-client-8.5.1" // {
         dependencies = [
@@ -42840,7 +44636,7 @@ in
       sources."proxy-addr-2.0.3"
       sources."pseudomap-1.0.2"
       sources."punycode-1.4.1"
-      sources."qs-6.5.1"
+      sources."qs-6.5.2"
       sources."random-bytes-1.0.0"
       sources."range-parser-1.2.0"
       (sources."raven-2.4.2" // {
@@ -42848,12 +44644,7 @@ in
           sources."uuid-3.0.0"
         ];
       })
-      (sources."raw-body-2.3.2" // {
-        dependencies = [
-          sources."depd-1.1.1"
-          sources."http-errors-1.6.2"
-        ];
-      })
+      sources."raw-body-2.3.3"
       (sources."rc-1.2.7" // {
         dependencies = [
           sources."minimist-1.2.0"
@@ -42861,12 +44652,13 @@ in
       })
       sources."readable-stream-1.0.27-1"
       sources."reduce-component-1.0.1"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."require-directory-2.1.1"
       sources."require-main-filename-1.0.1"
       sources."retry-0.10.1"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.1"
+      sources."safer-buffer-2.1.2"
       sources."semver-5.5.0"
       sources."send-0.16.2"
       sources."serve-static-1.13.2"
@@ -42900,7 +44692,6 @@ in
       sources."statuses-1.5.0"
       sources."string-width-1.0.2"
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
@@ -43131,7 +44922,7 @@ in
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."ieee754-1.1.11"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -43166,7 +44957,7 @@ in
       sources."log-symbols-2.2.0"
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
-      (sources."make-dir-1.2.0" // {
+      (sources."make-dir-1.3.0" // {
         dependencies = [
           sources."pify-3.0.0"
         ];
@@ -43212,7 +45003,7 @@ in
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
       sources."repeat-string-1.6.1"
-      (sources."request-2.85.0" // {
+      (sources."request-2.86.0" // {
         dependencies = [
           sources."co-4.6.0"
         ];
@@ -43235,12 +45026,11 @@ in
       sources."stat-mode-0.2.2"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-4.0.0"
       sources."strip-dirs-2.1.0"
       sources."strip-outer-1.0.1"
       sources."supports-color-5.4.0"
-      sources."tar-stream-1.6.0"
+      sources."tar-stream-1.6.1"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
       sources."thunkify-wrap-1.0.4"
@@ -43300,7 +45090,7 @@ in
     };
     dependencies = [
       sources."abbrev-1.1.1"
-      sources."adm-zip-0.4.9"
+      sources."adm-zip-0.4.11"
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."asn1-0.2.3"
@@ -43412,7 +45202,7 @@ in
         ];
       })
       sources."string_decoder-0.10.31"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."supports-color-2.0.0"
       sources."throttleit-1.0.0"
@@ -43441,15 +45231,30 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "4.7.0";
+    version = "4.8.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-4.7.0.tgz";
-      sha512 = "3qmpyw1gbcmwgc42iss0vqam6vgi5kqvzv5s4xba1ww50824vq5yb3p7zbh0is33q76axrkhj4d7p1cigp5w0jnhhd2v3v6ky580wrr";
+      url = "https://registry.npmjs.org/webpack/-/webpack-4.8.3.tgz";
+      sha512 = "2rkj1v8fvs1hqpgiikpfnbv29yf1fmyqxfsmgkk3rwhbxbg35ca932ysiamxdq0cgn56lw8sknmfh98cgiw9rfywx5cgj8j2a6c05zy";
     };
     dependencies = [
+      sources."@webassemblyjs/ast-1.4.3"
+      sources."@webassemblyjs/floating-point-hex-parser-1.4.3"
+      sources."@webassemblyjs/helper-buffer-1.4.3"
+      sources."@webassemblyjs/helper-code-frame-1.4.3"
+      sources."@webassemblyjs/helper-fsm-1.4.3"
+      sources."@webassemblyjs/helper-wasm-bytecode-1.4.3"
+      sources."@webassemblyjs/helper-wasm-section-1.4.3"
+      sources."@webassemblyjs/leb128-1.4.3"
+      sources."@webassemblyjs/validation-1.4.3"
+      sources."@webassemblyjs/wasm-edit-1.4.3"
+      sources."@webassemblyjs/wasm-gen-1.4.3"
+      sources."@webassemblyjs/wasm-opt-1.4.3"
+      sources."@webassemblyjs/wasm-parser-1.4.3"
+      sources."@webassemblyjs/wast-parser-1.4.3"
+      sources."@webassemblyjs/wast-printer-1.4.3"
       sources."acorn-5.5.3"
       sources."acorn-dynamic-import-3.0.0"
-      sources."ajv-6.4.0"
+      sources."ajv-6.5.0"
       sources."ajv-keywords-3.2.0"
       sources."anymatch-2.0.0"
       sources."aproba-1.2.0"
@@ -43520,13 +45325,13 @@ in
       sources."copy-concurrently-1.0.5"
       sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
-      sources."create-ecdh-4.0.1"
+      sources."create-ecdh-4.0.3"
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."cyclist-0.2.2"
       sources."date-now-0.1.4"
-      sources."debug-2.6.9"
+      sources."debug-3.1.0"
       sources."decode-uri-component-0.2.0"
       sources."define-property-2.0.2"
       sources."des.js-1.0.0"
@@ -43557,7 +45362,7 @@ in
           sources."kind-of-5.1.0"
         ];
       })
-      sources."fast-deep-equal-1.1.0"
+      sources."fast-deep-equal-2.0.1"
       sources."fast-json-stable-stringify-2.0.0"
       sources."fill-range-4.0.0"
       sources."find-cache-dir-1.0.0"
@@ -43568,7 +45373,7 @@ in
       sources."from2-2.3.0"
       sources."fs-write-stream-atomic-1.0.10"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
       (sources."glob-parent-3.1.0" // {
@@ -43606,17 +45411,20 @@ in
       sources."json-schema-traverse-0.3.1"
       sources."json5-0.5.1"
       sources."kind-of-6.0.2"
+      sources."leb-0.3.0"
       sources."loader-runner-2.3.0"
       sources."loader-utils-1.1.0"
       sources."locate-path-2.0.0"
-      sources."lru-cache-4.1.2"
-      sources."make-dir-1.2.0"
+      sources."long-3.2.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."md5.js-1.3.4"
       sources."memory-fs-0.4.1"
       (sources."micromatch-3.1.10" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."has-values-0.1.4"
           (sources."is-accessor-descriptor-0.1.6" // {
             dependencies = [
@@ -43680,7 +45488,7 @@ in
       sources."pseudomap-1.0.2"
       sources."public-encrypt-4.0.2"
       sources."pump-2.0.1"
-      sources."pumpify-1.5.0"
+      sources."pumpify-1.5.1"
       sources."punycode-2.1.0"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
@@ -43748,7 +45556,7 @@ in
       })
       sources."source-list-map-2.0.0"
       sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.1"
+      sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       (sources."split-string-3.1.0" // {
         dependencies = [
@@ -43759,7 +45567,7 @@ in
       sources."static-extend-0.1.2"
       sources."stream-browserify-2.0.1"
       sources."stream-each-1.2.2"
-      sources."stream-http-2.8.1"
+      sources."stream-http-2.8.2"
       sources."stream-shift-1.0.0"
       sources."string_decoder-1.1.1"
       sources."tapable-1.0.0"
@@ -43793,8 +45601,8 @@ in
           })
         ];
       })
-      sources."upath-1.0.5"
-      sources."uri-js-3.0.2"
+      sources."upath-1.1.0"
+      sources."uri-js-4.2.1"
       sources."urix-0.1.0"
       (sources."url-0.11.0" // {
         dependencies = [
@@ -43810,6 +45618,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-0.0.4"
       sources."watchpack-1.6.0"
+      sources."webassemblyjs-1.4.3"
       (sources."webpack-sources-1.1.0" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -43833,10 +45642,10 @@ in
   webtorrent-cli = nodeEnv.buildNodePackage {
     name = "webtorrent-cli";
     packageName = "webtorrent-cli";
-    version = "1.12.1";
+    version = "1.12.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.1.tgz";
-      sha512 = "2hnm4r244as9zcld8hf884vwp4iwqvrnjc01c5037bpwa0zzc8y5zss9xc75ffbhw8dp54kbfzvlfwfn6q49hymbnsfj44ckqfalavr";
+      url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-1.12.2.tgz";
+      sha512 = "2d26sgvj167729px1gv5n5yjbvkv05x858i5r9vxprglh6gvl29s5gaipxh9fnz0ql6i1mxvxs2pjmk8l9hdj9bhn9cxq7gsmvw2cw0";
     };
     dependencies = [
       sources."addr-to-ip-port-1.4.3"
@@ -43919,7 +45728,7 @@ in
       sources."elementtree-0.1.7"
       sources."end-of-stream-1.4.1"
       sources."executable-4.1.1"
-      sources."expand-template-1.1.0"
+      sources."expand-template-1.1.1"
       sources."filestream-4.1.3"
       sources."flatten-1.0.2"
       sources."fs-chunk-store-1.7.0"
@@ -43945,7 +45754,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
       sources."junk-2.1.0"
-      sources."k-bucket-4.0.0"
+      sources."k-bucket-4.0.1"
       sources."k-rpc-5.0.0"
       sources."k-rpc-socket-1.8.0"
       sources."last-one-wins-1.0.4"
@@ -43956,10 +45765,10 @@ in
       })
       sources."long-2.4.0"
       sources."lru-3.1.0"
-      sources."magnet-uri-5.1.7"
+      sources."magnet-uri-5.1.8"
       sources."mdns-js-0.5.0"
       sources."mdns-js-packet-0.2.0"
-      sources."mediasource-2.2.0"
+      sources."mediasource-2.2.1"
       sources."memory-chunk-store-1.3.0"
       sources."mime-2.3.1"
       sources."mimic-response-1.0.0"
@@ -44016,7 +45825,7 @@ in
       sources."rc-1.2.7"
       sources."readable-stream-2.3.6"
       sources."record-cache-1.0.2"
-      (sources."render-media-3.0.0" // {
+      (sources."render-media-3.1.0" // {
         dependencies = [
           sources."pump-1.0.3"
         ];
@@ -44034,7 +45843,7 @@ in
       sources."simple-concat-1.0.0"
       sources."simple-get-2.8.1"
       sources."simple-peer-9.1.1"
-      sources."simple-sha1-2.1.0"
+      sources."simple-sha1-2.1.1"
       (sources."simple-websocket-7.0.2" // {
         dependencies = [
           sources."ws-4.1.0"
@@ -44046,7 +45855,7 @@ in
       sources."stream-to-blob-url-2.1.0"
       sources."stream-with-known-length-to-buffer-1.0.1"
       sources."string-width-1.0.2"
-      sources."string2compact-1.2.3"
+      sources."string2compact-1.2.5"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
@@ -44055,7 +45864,7 @@ in
           sources."pump-1.0.3"
         ];
       })
-      sources."tar-stream-1.6.0"
+      sources."tar-stream-1.6.1"
       sources."thirty-two-1.0.2"
       sources."through-2.3.8"
       sources."thunky-0.1.0"
@@ -44078,7 +45887,7 @@ in
       sources."upnp-mediarenderer-client-1.2.4"
       sources."url-join-2.0.5"
       sources."ut_metadata-3.2.1"
-      sources."ut_pex-1.2.0"
+      sources."ut_pex-1.2.1"
       sources."util-deprecate-1.0.2"
       sources."videostream-2.4.2"
       sources."vlc-command-1.1.1"
@@ -44121,7 +45930,7 @@ in
     dependencies = [
       sources."@cliqz-oss/firefox-client-0.3.1"
       sources."@cliqz-oss/node-firefox-connect-1.2.1"
-      sources."@types/node-10.0.4"
+      sources."@types/node-10.1.1"
       sources."JSONSelect-0.2.1"
       sources."abbrev-1.1.1"
       sources."acorn-5.5.3"
@@ -44150,7 +45959,7 @@ in
           sources."figures-1.7.0"
           sources."for-in-0.1.8"
           sources."globals-11.5.0"
-          sources."iconv-lite-0.4.19"
+          sources."inherits-2.0.1"
           sources."inquirer-0.12.0"
           sources."is-fullwidth-code-point-1.0.0"
           sources."isarray-0.0.1"
@@ -44182,7 +45991,7 @@ in
           })
         ];
       })
-      sources."adm-zip-0.4.9"
+      sources."adm-zip-0.4.11"
       sources."agent-base-4.2.0"
       sources."ajv-6.3.0"
       sources."ajv-keywords-2.1.1"
@@ -44270,7 +46079,6 @@ in
         ];
       })
       sources."base64-js-0.0.2"
-      sources."base64url-2.0.0"
       sources."bcrypt-pbkdf-1.0.1"
       sources."binary-extensions-1.11.0"
       sources."bl-1.2.2"
@@ -44353,7 +46161,7 @@ in
       sources."configstore-3.1.2"
       sources."convert-source-map-1.5.1"
       sources."copy-descriptor-0.1.1"
-      sources."core-js-2.5.5"
+      sources."core-js-2.5.6"
       sources."core-util-is-1.0.2"
       sources."crc-3.5.0"
       sources."crc32-stream-2.0.0"
@@ -44389,7 +46197,7 @@ in
       sources."degenerator-1.0.4"
       sources."del-2.2.2"
       sources."delayed-stream-1.0.0"
-      sources."depd-1.1.1"
+      sources."depd-1.1.2"
       sources."detect-indent-4.0.0"
       (sources."dispensary-0.16.0" // {
         dependencies = [
@@ -44400,13 +46208,13 @@ in
       sources."doctrine-2.1.0"
       sources."dom-serializer-0.1.0"
       sources."domelementtype-1.3.0"
-      sources."domhandler-2.4.1"
+      sources."domhandler-2.4.2"
       sources."domutils-1.5.1"
       sources."dot-prop-4.2.0"
       sources."dtrace-provider-0.8.6"
       sources."duplexer3-0.1.4"
       sources."ecc-jsbn-0.1.1"
-      sources."ecdsa-sig-formatter-1.0.9"
+      sources."ecdsa-sig-formatter-1.0.10"
       sources."email-validator-2.0.3"
       sources."emoji-regex-6.1.3"
       sources."encoding-0.1.12"
@@ -44513,7 +46321,7 @@ in
       sources."fs-constants-1.0.0"
       sources."fs-extra-4.0.3"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       (sources."ftp-0.3.10" // {
         dependencies = [
           sources."readable-stream-1.1.14"
@@ -44533,7 +46341,7 @@ in
       sources."generate-object-property-1.2.0"
       sources."get-caller-file-1.0.2"
       sources."get-stream-3.0.0"
-      (sources."get-uri-2.0.1" // {
+      (sources."get-uri-2.0.2" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -44574,11 +46382,11 @@ in
       sources."home-or-tmp-2.0.0"
       sources."hosted-git-info-2.6.0"
       sources."htmlparser2-3.9.2"
-      sources."http-errors-1.6.2"
+      sources."http-errors-1.6.3"
       sources."http-proxy-agent-2.1.0"
       sources."http-signature-1.2.0"
       sources."https-proxy-agent-2.2.1"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."ignore-3.3.8"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
@@ -44657,8 +46465,8 @@ in
       sources."jsonwebtoken-7.1.9"
       sources."jsprim-1.4.1"
       sources."jszip-2.6.1"
-      sources."jwa-1.1.5"
-      sources."jws-3.1.4"
+      sources."jwa-1.1.6"
+      sources."jws-3.1.5"
       sources."kind-of-3.2.2"
       sources."latest-version-3.1.0"
       sources."lazy-cache-0.2.7"
@@ -44679,9 +46487,9 @@ in
       sources."longest-streak-1.0.0"
       sources."loose-envify-1.3.1"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."macos-release-1.1.0"
-      sources."make-dir-1.2.0"
+      sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."markdown-table-0.4.0"
@@ -44758,6 +46566,7 @@ in
       sources."parse-json-4.0.0"
       sources."parse5-3.0.3"
       sources."pascalcase-0.1.1"
+      sources."path-0.12.7"
       sources."path-dirname-1.0.2"
       sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
@@ -44790,6 +46599,7 @@ in
           sources."debug-2.6.9"
         ];
       })
+      sources."process-0.11.10"
       sources."process-nextick-args-2.0.0"
       sources."progress-2.0.0"
       sources."promise-7.3.1"
@@ -44800,7 +46610,7 @@ in
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."quick-format-unescaped-1.1.2"
-      sources."raw-body-2.3.2"
+      sources."raw-body-2.3.3"
       sources."rc-1.2.7"
       sources."read-pkg-1.1.0"
       sources."read-pkg-up-1.0.1"
@@ -44854,7 +46664,7 @@ in
       sources."set-blocking-2.0.0"
       sources."set-immediate-shim-1.0.1"
       sources."set-value-2.0.0"
-      sources."setprototypeof-1.0.3"
+      sources."setprototypeof-1.1.0"
       sources."sha.js-2.4.11"
       (sources."shallow-clone-0.1.2" // {
         dependencies = [
@@ -44909,7 +46719,7 @@ in
       sources."snapdragon-node-2.1.1"
       sources."snapdragon-util-3.0.1"
       sources."sntp-2.1.0"
-      (sources."snyk-1.78.1" // {
+      (sources."snyk-1.80.1" // {
         dependencies = [
           sources."ansi-escapes-3.1.0"
           sources."ansi-regex-2.1.1"
@@ -44940,8 +46750,8 @@ in
       sources."snyk-gradle-plugin-1.3.0"
       sources."snyk-module-1.8.2"
       sources."snyk-mvn-plugin-1.2.0"
-      sources."snyk-nuget-plugin-1.4.0"
-      sources."snyk-php-plugin-1.5.0"
+      sources."snyk-nuget-plugin-1.6.2"
+      sources."snyk-php-plugin-1.5.1"
       sources."snyk-policy-1.12.0"
       sources."snyk-python-plugin-1.6.0"
       sources."snyk-resolve-1.0.1"
@@ -44956,7 +46766,7 @@ in
       sources."socks-1.1.10"
       sources."socks-proxy-agent-3.0.1"
       sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.1"
+      sources."source-map-resolve-0.5.2"
       (sources."source-map-support-0.5.3" // {
         dependencies = [
           sources."source-map-0.6.1"
@@ -44991,7 +46801,7 @@ in
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
       sources."stringify-entities-1.3.2"
-      sources."stringstream-0.0.5"
+      sources."stringstream-0.0.6"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-3.0.0"
       sources."strip-bom-buf-1.0.0"
@@ -45001,7 +46811,7 @@ in
       sources."structured-source-3.0.2"
       sources."supports-color-2.0.0"
       sources."table-4.0.2"
-      sources."tar-stream-1.6.0"
+      sources."tar-stream-1.6.1"
       sources."temp-dir-1.0.0"
       sources."tempfile-2.0.0"
       sources."term-size-1.2.0"
@@ -45074,6 +46884,7 @@ in
         ];
       })
       sources."user-home-2.0.0"
+      sources."util-0.10.3"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.2.1"
       sources."validate-npm-package-license-3.0.3"
@@ -45205,6 +47016,8 @@ in
       sha512 = "13z42dkmgbs67a3i6wfzf1h3lp54r6xj9p063kyx2nq0v132lqnkss2srl2kayfljcdprr7pw7dfm6h08kqnkhzrlzi1ls7h7cz2qgy";
     };
     dependencies = [
+      sources."@mrmlnc/readdir-enhanced-2.2.1"
+      sources."@nodelib/fs.stat-1.0.2"
       sources."@sindresorhus/is-0.7.0"
       sources."aggregate-error-1.0.0"
       sources."ajv-5.5.2"
@@ -45214,17 +47027,33 @@ in
       sources."ansi-regex-2.1.1"
       sources."ansi-styles-2.2.1"
       sources."are-we-there-yet-1.1.4"
+      sources."arr-diff-4.0.0"
+      sources."arr-flatten-1.1.0"
+      sources."arr-union-3.1.0"
       sources."array-find-index-1.0.2"
       sources."array-union-1.0.2"
       sources."array-uniq-1.0.3"
+      sources."array-unique-0.3.2"
       sources."arrify-1.0.1"
       sources."asn1-0.2.3"
       sources."assert-plus-1.0.0"
+      sources."assign-symbols-1.0.0"
       sources."async-2.6.0"
       sources."asynckit-0.4.0"
+      sources."atob-2.1.1"
       sources."aws-sign2-0.7.0"
       sources."aws4-1.7.0"
       sources."balanced-match-1.0.0"
+      (sources."base-0.11.2" // {
+        dependencies = [
+          (sources."define-property-1.0.0" // {
+            dependencies = [
+              sources."kind-of-6.0.2"
+            ];
+          })
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."bcrypt-pbkdf-1.0.1"
       sources."bin-version-1.0.4"
       (sources."bin-version-check-2.1.0" // {
@@ -45235,13 +47064,22 @@ in
       sources."boom-4.3.1"
       sources."boxen-1.3.0"
       sources."brace-expansion-1.1.11"
+      (sources."braces-2.3.2" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."buffer-from-1.0.0"
       sources."builtin-modules-1.1.1"
+      sources."cache-base-1.0.1"
       (sources."cacheable-request-2.1.4" // {
         dependencies = [
           sources."lowercase-keys-1.0.0"
         ];
       })
+      sources."call-me-maybe-1.0.1"
       sources."camelcase-2.1.1"
       sources."camelcase-keys-2.1.0"
       sources."capture-stack-trace-1.0.0"
@@ -45249,6 +47087,11 @@ in
       sources."chalk-1.1.3"
       sources."chardet-0.4.2"
       sources."ci-info-1.1.3"
+      (sources."class-utils-0.3.6" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
       sources."clean-stack-1.3.0"
       sources."cli-boxes-1.0.0"
       sources."cli-cursor-2.1.0"
@@ -45260,12 +47103,15 @@ in
       sources."clone-stats-0.0.1"
       sources."co-4.6.0"
       sources."code-point-at-1.1.0"
+      sources."collection-visit-1.0.0"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
       sources."combined-stream-1.0.6"
+      sources."component-emitter-1.2.1"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       sources."configstore-3.1.2"
+      sources."copy-descriptor-0.1.1"
       sources."core-util-is-1.0.2"
       sources."create-error-class-3.0.2"
       sources."cross-spawn-5.1.0"
@@ -45284,9 +47130,11 @@ in
       sources."decompress-response-3.3.0"
       sources."deep-extend-0.5.1"
       sources."default-uid-1.0.0"
+      sources."define-property-2.0.2"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."diff-3.5.0"
+      sources."dir-glob-2.0.0"
       sources."dot-prop-4.2.0"
       sources."downgrade-root-1.2.2"
       sources."duplexer3-0.1.4"
@@ -45297,19 +47145,51 @@ in
       sources."execa-0.6.3"
       sources."execall-1.0.0"
       sources."exit-hook-1.1.1"
+      (sources."expand-brackets-2.1.4" // {
+        dependencies = [
+          sources."define-property-0.2.5"
+        ];
+      })
       sources."extend-3.0.1"
+      sources."extend-shallow-3.0.2"
       sources."external-editor-2.2.0"
+      (sources."extglob-2.0.4" // {
+        dependencies = [
+          sources."define-property-1.0.0"
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-5.1.0"
+        ];
+      })
       sources."extsprintf-1.3.0"
       sources."fast-deep-equal-1.1.0"
+      (sources."fast-glob-2.2.2" // {
+        dependencies = [
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-1.0.1"
+        ];
+      })
       sources."fast-json-stable-stringify-2.0.0"
       sources."figures-2.0.0"
+      sources."fill-range-4.0.0"
       sources."filter-obj-1.1.0"
       sources."find-up-1.1.2"
       sources."find-versions-1.2.1"
       sources."first-chunk-stream-2.0.0"
+      sources."for-in-1.0.2"
       sources."foreachasync-3.0.0"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.2"
+      sources."fragment-cache-0.2.1"
       sources."from2-2.3.0"
       sources."fs.realpath-1.0.0"
       (sources."fullname-3.3.0" // {
@@ -45322,11 +47202,31 @@ in
       sources."gauge-1.2.7"
       sources."get-stdin-4.0.1"
       sources."get-stream-3.0.0"
+      sources."get-value-2.0.6"
       sources."getpass-0.1.7"
       sources."glob-7.1.2"
+      (sources."glob-parent-3.1.0" // {
+        dependencies = [
+          sources."is-glob-3.1.0"
+        ];
+      })
+      sources."glob-to-regexp-0.3.0"
       sources."global-dirs-0.1.1"
       sources."global-tunnel-ng-2.1.1"
-      sources."globby-6.1.0"
+      (sources."globby-8.0.1" // {
+        dependencies = [
+          sources."debug-2.6.9"
+          sources."is-accessor-descriptor-1.0.0"
+          sources."is-data-descriptor-1.0.0"
+          sources."is-descriptor-1.0.2"
+          sources."is-extendable-0.1.1"
+          (sources."is-number-3.0.0" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+        ];
+      })
       sources."got-8.3.1"
       sources."graceful-fs-4.1.11"
       sources."grouped-queue-0.3.3"
@@ -45337,13 +47237,16 @@ in
       sources."has-symbol-support-x-1.4.2"
       sources."has-to-string-tag-x-1.4.1"
       sources."has-unicode-2.0.1"
+      sources."has-value-1.0.0"
+      sources."has-values-1.0.0"
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."hosted-git-info-2.6.0"
       sources."http-cache-semantics-3.8.1"
       sources."http-signature-1.2.0"
       sources."humanize-string-1.0.2"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
+      sources."ignore-3.3.8"
       sources."import-lazy-2.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-3.2.0"
@@ -45385,18 +47288,28 @@ in
         ];
       })
       sources."into-stream-3.1.0"
+      sources."is-accessor-descriptor-1.0.0"
       sources."is-arrayish-0.2.1"
+      sources."is-buffer-1.1.6"
       sources."is-builtin-module-1.0.0"
       sources."is-ci-1.1.0"
+      sources."is-data-descriptor-1.0.0"
+      sources."is-descriptor-1.0.2"
       sources."is-docker-1.1.0"
+      sources."is-extendable-0.1.1"
+      sources."is-extglob-2.1.1"
       sources."is-finite-1.0.2"
       sources."is-fullwidth-code-point-2.0.0"
+      sources."is-glob-4.0.0"
       sources."is-installed-globally-0.1.0"
       sources."is-npm-1.0.0"
+      sources."is-number-3.0.0"
       sources."is-obj-1.0.1"
       sources."is-object-1.0.1"
+      sources."is-odd-2.0.0"
       sources."is-path-inside-1.0.1"
       sources."is-plain-obj-1.1.0"
+      sources."is-plain-object-2.0.4"
       sources."is-promise-2.1.0"
       sources."is-redirect-1.0.0"
       sources."is-regexp-1.0.0"
@@ -45407,8 +47320,10 @@ in
       sources."is-supported-regexp-flag-1.0.1"
       sources."is-typedarray-1.0.0"
       sources."is-utf8-0.2.1"
+      sources."is-windows-1.0.2"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
+      sources."isobject-3.0.1"
       sources."isstream-0.1.2"
       sources."isurl-1.0.0"
       sources."jsbn-0.1.1"
@@ -45418,6 +47333,7 @@ in
       sources."json-stringify-safe-5.0.1"
       sources."jsprim-1.4.1"
       sources."keyv-3.0.0"
+      sources."kind-of-6.0.2"
       sources."latest-version-3.1.0"
       sources."load-json-file-1.1.0"
       sources."locate-path-2.0.0"
@@ -45430,9 +47346,11 @@ in
       sources."log-symbols-1.0.2"
       sources."loud-rejection-1.6.0"
       sources."lowercase-keys-1.0.1"
-      sources."lru-cache-4.1.2"
-      sources."make-dir-1.2.0"
+      sources."lru-cache-4.1.3"
+      sources."make-dir-1.3.0"
+      sources."map-cache-0.2.2"
       sources."map-obj-1.0.1"
+      sources."map-visit-1.0.0"
       sources."mem-1.1.0"
       sources."mem-fs-1.1.3"
       (sources."meow-3.7.0" // {
@@ -45442,15 +47360,24 @@ in
           sources."read-pkg-up-1.0.1"
         ];
       })
+      sources."merge2-1.2.2"
+      (sources."micromatch-3.1.10" // {
+        dependencies = [
+          sources."is-extendable-0.1.1"
+        ];
+      })
       sources."mime-db-1.33.0"
       sources."mime-types-2.1.18"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.0"
       sources."minimatch-3.0.4"
       sources."minimist-1.2.0"
+      sources."mixin-deep-1.3.1"
       sources."mkdirp-0.5.1"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.7"
+      sources."nanomatch-1.2.9"
+      sources."nice-try-1.0.4"
       sources."normalize-package-data-2.4.0"
       sources."normalize-url-2.0.1"
       (sources."npm-keyword-5.0.0" // {
@@ -45467,7 +47394,10 @@ in
       sources."number-is-nan-1.0.1"
       sources."oauth-sign-0.8.2"
       sources."object-assign-4.1.1"
+      sources."object-copy-0.1.0"
       sources."object-values-1.0.0"
+      sources."object-visit-1.0.1"
+      sources."object.pick-1.3.0"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."opn-4.0.2"
@@ -45500,11 +47430,13 @@ in
       sources."pad-component-0.0.1"
       sources."parse-help-0.1.1"
       sources."parse-json-2.2.0"
+      sources."pascalcase-0.1.1"
       (sources."passwd-user-2.1.0" // {
         dependencies = [
           sources."execa-0.4.0"
         ];
       })
+      sources."path-dirname-1.0.2"
       sources."path-exists-2.1.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
@@ -45514,6 +47446,7 @@ in
       sources."pify-3.0.0"
       sources."pinkie-2.0.4"
       sources."pinkie-promise-2.0.1"
+      sources."posix-character-classes-0.1.1"
       sources."prepend-http-2.0.0"
       sources."process-nextick-args-2.0.0"
       sources."pseudomap-1.0.2"
@@ -45536,19 +47469,26 @@ in
       sources."readable-stream-2.3.6"
       sources."readline2-1.0.1"
       sources."redent-1.0.0"
+      sources."regex-not-1.0.2"
       sources."registry-auth-token-3.3.2"
       sources."registry-url-3.1.0"
+      sources."repeat-element-1.1.2"
+      sources."repeat-string-1.6.1"
       sources."repeating-2.0.1"
       sources."replace-ext-0.0.1"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
+      sources."resolve-url-0.2.1"
       sources."responselike-1.0.2"
       sources."restore-cursor-2.0.0"
+      sources."ret-0.1.15"
       sources."root-check-1.0.0"
       sources."run-async-2.3.0"
       sources."rx-4.1.0"
       sources."rx-lite-4.0.8"
       sources."rx-lite-aggregates-4.0.8"
+      sources."rxjs-5.5.10"
       sources."safe-buffer-5.1.2"
+      sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
       sources."scoped-regex-1.0.0"
       sources."semver-5.5.0"
@@ -45560,24 +47500,55 @@ in
         ];
       })
       sources."set-immediate-shim-1.0.1"
+      sources."set-value-2.0.0"
       sources."shebang-command-1.2.0"
       sources."shebang-regex-1.0.0"
       sources."signal-exit-3.0.2"
+      sources."slash-1.0.0"
       sources."slide-1.1.6"
+      (sources."snapdragon-0.8.2" // {
+        dependencies = [
+          (sources."define-property-0.2.5" // {
+            dependencies = [
+              sources."kind-of-5.1.0"
+            ];
+          })
+          sources."extend-shallow-2.0.1"
+          sources."kind-of-4.0.0"
+        ];
+      })
+      (sources."snapdragon-node-2.1.1" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
+      (sources."snapdragon-util-3.0.1" // {
+        dependencies = [
+          sources."kind-of-3.2.2"
+        ];
+      })
       sources."sntp-2.1.0"
       sources."sort-keys-2.0.0"
       sources."sort-on-2.0.0"
+      sources."source-map-0.5.7"
+      sources."source-map-resolve-0.5.2"
+      sources."source-map-url-0.4.0"
       sources."spawn-sync-1.0.15"
       sources."spdx-correct-3.0.0"
       sources."spdx-exceptions-2.1.0"
       sources."spdx-expression-parse-3.0.0"
       sources."spdx-license-ids-3.0.0"
+      (sources."split-string-3.1.0" // {
+        dependencies = [
+          sources."extend-shallow-3.0.2"
+        ];
+      })
       sources."sshpk-1.14.1"
+      sources."static-extend-0.1.2"
       sources."strict-uri-encode-1.1.0"
       sources."string-length-1.0.1"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."strip-bom-2.0.0"
       sources."strip-bom-stream-2.0.0"
@@ -45586,6 +47557,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."sudo-block-1.2.0"
       sources."supports-color-2.0.0"
+      sources."symbol-observable-1.0.1"
       (sources."tabtab-1.3.2" // {
         dependencies = [
           sources."ansi-escapes-1.4.0"
@@ -45609,6 +47581,9 @@ in
       sources."timed-out-4.0.1"
       sources."titleize-1.0.1"
       sources."tmp-0.0.33"
+      sources."to-object-path-0.3.0"
+      sources."to-regex-3.0.2"
+      sources."to-regex-range-2.1.1"
       sources."tough-cookie-2.3.4"
       sources."trim-newlines-1.0.0"
       sources."tunnel-0.0.4"
@@ -45616,7 +47591,21 @@ in
       sources."tweetnacl-0.14.5"
       sources."twig-0.8.9"
       sources."typedarray-0.0.6"
+      (sources."union-value-1.0.0" // {
+        dependencies = [
+          sources."set-value-0.4.3"
+        ];
+      })
       sources."unique-string-1.0.0"
+      (sources."unset-value-1.0.0" // {
+        dependencies = [
+          (sources."has-value-0.3.1" // {
+            dependencies = [
+              sources."isobject-2.1.0"
+            ];
+          })
+        ];
+      })
       sources."untildify-3.0.2"
       sources."unzip-response-2.0.1"
       (sources."update-notifier-2.5.0" // {
@@ -45628,8 +47617,14 @@ in
           sources."supports-color-5.4.0"
         ];
       })
+      sources."urix-0.1.0"
       sources."url-parse-lax-3.0.0"
       sources."url-to-options-1.0.1"
+      (sources."use-3.1.0" // {
+        dependencies = [
+          sources."kind-of-6.0.2"
+        ];
+      })
       sources."user-home-2.0.0"
       sources."util-deprecate-1.0.2"
       sources."uuid-3.2.1"
@@ -45662,13 +47657,32 @@ in
           sources."onetime-1.1.0"
         ];
       })
-      (sources."yeoman-environment-2.0.6" // {
+      (sources."yeoman-environment-2.1.1" // {
         dependencies = [
+          sources."ansi-regex-3.0.0"
           sources."ansi-styles-3.2.1"
           sources."chalk-2.4.1"
+          sources."cross-spawn-6.0.5"
           sources."debug-3.1.0"
+          sources."has-values-0.1.4"
+          sources."inquirer-5.2.0"
+          (sources."is-accessor-descriptor-0.1.6" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          (sources."is-data-descriptor-0.1.4" // {
+            dependencies = [
+              sources."kind-of-3.2.2"
+            ];
+          })
+          sources."is-descriptor-0.1.6"
+          sources."is-extendable-1.0.1"
+          sources."is-number-4.0.0"
           sources."log-symbols-2.2.0"
+          sources."path-type-3.0.0"
           sources."pify-2.3.0"
+          sources."strip-ansi-4.0.0"
           sources."supports-color-5.4.0"
         ];
       })
diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix
index cfaa4f0634f4..40eabbd6e662 100644
--- a/pkgs/development/node-packages/node-packages-v8.nix
+++ b/pkgs/development/node-packages/node-packages-v8.nix
@@ -49,13 +49,13 @@ let
         sha1 = "cbc4b9a68981bf0b501ccd06a9058acd65309bf7";
       };
     };
-    "@types/node-10.0.4" = {
+    "@types/node-10.1.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "10.0.4";
+      version = "10.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-10.0.4.tgz";
-        sha512 = "2zwjjfa4s706r0w45siwgzax5c8g5j3z79dkckwzgrzqxglj070ijv0m9g1ipc1y4kr7l0r9qia9yfxc9syw64hib8vh216cxk1las6";
+        url = "https://registry.npmjs.org/@types/node/-/node-10.1.1.tgz";
+        sha512 = "35nbbgd4qp35g3nfbrsc9ndmigc9gl31xdjhx0fakfms35c6jqxpdx7m9c3pi0h3b062p31al5vas36facjhs1nmxf3bdpnrb5k3g4z";
       };
     };
     "@types/superagent-3.5.6" = {
@@ -1228,13 +1228,13 @@ let
         sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
       };
     };
-    "colors-1.2.4" = {
+    "colors-1.2.5" = {
       name = "colors";
       packageName = "colors";
-      version = "1.2.4";
+      version = "1.2.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/colors/-/colors-1.2.4.tgz";
-        sha512 = "1ch53w9md043zff52vsmh89qirws3x7n4zw88xxw0h98fjg71dsll3gh1b598a48xq98d15qpjb07g9ddjsfknrba0byp56fl3a53z9";
+        url = "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz";
+        sha512 = "2k2a7k096qcm5fghgcmybg96y3x5bpqb62j0zdlnxq7za4asb6vsy9i69nkg9wqfhkcbh6qzm8zzvq7q516p54awxpp2qrzm8nm3cvs";
       };
     };
     "combine-errors-3.0.3" = {
@@ -1615,13 +1615,13 @@ let
         sha512 = "0i32dn4p0dmjbljm9csnrfibnrgljbqcqkiy5n2wn0mdqpklnv6k9imrv93c0j6p5hsrpnnpjdibhw6fyf5a3183g2wxd1zw5avx6hi";
       };
     };
-    "dat-link-resolve-2.1.0" = {
+    "dat-link-resolve-2.1.1" = {
       name = "dat-link-resolve";
       packageName = "dat-link-resolve";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.0.tgz";
-        sha512 = "0dzpf71lpzr1z3g6m3v29xvcs9r12sgjpzzmg2viy3azkgpscl7p2v8im2ibsa22q64abifkibb4nc3nshs19wvai67m3gdqx15qzvn";
+        url = "https://registry.npmjs.org/dat-link-resolve/-/dat-link-resolve-2.1.1.tgz";
+        sha512 = "3rchn6ap0ma8ij6qcvf74csbhn41nn5xpyzkf9cabr8fmzbj406iz4vvf0hqq473nfpyrvs1ffw2k3bqp4lv1nb98n39m2f5g3f14zp";
       };
     };
     "dat-log-1.1.1" = {
@@ -2443,13 +2443,13 @@ let
         sha1 = "bd162262c0b6e94bfbcdcf19a3bbb3764f785695";
       };
     };
-    "fill-range-2.2.3" = {
+    "fill-range-2.2.4" = {
       name = "fill-range";
       packageName = "fill-range";
-      version = "2.2.3";
+      version = "2.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz";
-        sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723";
+        url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz";
+        sha512 = "3jpxxzv8ji9xqk6xwbr20nsl31jjqr5asnv0ayixyc3r393yv4r44b7lifpk1pqaw8clzs0cy7dnw9yb5axpg9ih7vfimzlp04xqykj";
       };
     };
     "fill-range-4.0.0" = {
@@ -2641,13 +2641,13 @@ let
         sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f";
       };
     };
-    "fsevents-1.2.3" = {
+    "fsevents-1.2.4" = {
       name = "fsevents";
       packageName = "fsevents";
-      version = "1.2.3";
+      version = "1.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz";
-        sha512 = "3nsv4z5qk2hhcrp6bng9bzpj4nsk0b41i363phlqfp69dq1p2x6a1g3y86z2j7aj4mfj88y1i1agkb1y0pg5c388223h394jqxppvjz";
+        url = "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz";
+        sha512 = "0vfzl6byj55zmi8xiqb9bqd5q0awlpgz4hsph9xzhzrd46did859d6fp5vydh7n4d0n1ph5q36smq6k3pjq6w5fxs0vx4xjv3yzrhfg";
       };
     };
     "fstream-1.0.11" = {
@@ -3100,13 +3100,13 @@ let
         sha1 = "d96c92732076f072711b6b10fd7d4f65ad8ee23d";
       };
     };
-    "iconv-lite-0.4.22" = {
+    "iconv-lite-0.4.23" = {
       name = "iconv-lite";
       packageName = "iconv-lite";
-      version = "0.4.22";
+      version = "0.4.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz";
-        sha512 = "1fdqcacbfr3yxs5i2kj9kn06lgx2a9yfrdps0hsmw96p1slawiqp3qyfnqczp570wbbi5sr8valqyll05a5gzj3ahppnkl32waaf26l";
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";
+        sha512 = "062yxlrx4glr90bxn6jdv83qf03c9appkxdjjz5bhbphsx2yrn0y1i6yn9pfr3hfv2xiwq18hxvrvzfzfa7axv0sbgihskda58r7v4x";
       };
     };
     "iconv-lite-0.4.8" = {
@@ -3793,13 +3793,13 @@ let
         sha512 = "2dkl580azs1f5pj72mpygwdcc2mh4p355sxi84ki1w9c6k226nmjfglq5b7zgk5gmpfjammx5xliirzaf2nh9kyhqdb1xpvhjlic34j";
       };
     };
-    "k-bucket-4.0.0" = {
+    "k-bucket-4.0.1" = {
       name = "k-bucket";
       packageName = "k-bucket";
-      version = "4.0.0";
+      version = "4.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.0.tgz";
-        sha512 = "04i173zw3l2aagsnywafmgs87wzhhkakvnhcfvxbnbmn7rz37rkqkryc8d6x8dccqlmvgawb2vhd49ms8s2wkbg3dh3qlffamzcpshk";
+        url = "https://registry.npmjs.org/k-bucket/-/k-bucket-4.0.1.tgz";
+        sha512 = "1qyasv93yhjmmvsrxq5srbi1y6wj2vqpnnb1wafjxg1ffj01pyhx9jgqw0byrjm097ywrz0k9yki7dcnn2ncwqxyryqys7hincykw32";
       };
     };
     "k-rpc-4.3.1" = {
@@ -4324,22 +4324,22 @@ let
         sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
       };
     };
-    "lru-cache-4.1.2" = {
+    "lru-cache-4.1.3" = {
       name = "lru-cache";
       packageName = "lru-cache";
-      version = "4.1.2";
+      version = "4.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz";
-        sha512 = "1whynbvy3pbwcpkxk6rqhsymj2h3bh7p13nfhs9ch6hfx96vrh86j7vd4lqcaqjy5dhsfjps6sh2wqndh269wjz42khbh6339g9a1y2";
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz";
+        sha512 = "0j2ny2y61f70dbzarfa1xazv68dw7nb2r4p5sy46fw6dwr9y0yg003lb1yv7sdl77hcrpzn22mih799z657sz21al4qmf1kr2yj2lbw";
       };
     };
-    "make-dir-1.2.0" = {
+    "make-dir-1.3.0" = {
       name = "make-dir";
       packageName = "make-dir";
-      version = "1.2.0";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz";
-        sha512 = "0ivb7kryzyklvicp8a0lsq56pzjmvycb6bs4d0239q9ygcrs8ylx94q57fgxq3vqvzzs9v3ldl5m1jkxfvfaxh5p8lgb0qchmmh1mb8";
+        url = "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz";
+        sha512 = "2qkk2yzlzrfwnmw8l80cn4l91rfin7fmqn81j39s32i8gzijilbmc798wy51bs3m5gqa6dgrns95gals771jbbl4s4jgdl9ni3za3fv";
       };
     };
     "map-cache-0.2.2" = {
@@ -4369,6 +4369,15 @@ let
         sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f";
       };
     };
+    "math-random-1.0.1" = {
+      name = "math-random";
+      packageName = "math-random";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz";
+        sha1 = "8b3aac588b8a66e4975e3cdea67f7bb329601fac";
+      };
+    };
     "md5-2.2.1" = {
       name = "md5";
       packageName = "md5";
@@ -5548,13 +5557,13 @@ let
         sha512 = "3jz9jky55s8w0pd5q2v58fxdgca5ymbhlif0zn6jv55jr7bvp1xvn60bz4b2k6m399zzxzdk196385wl3gw6xasxzi3mq8xkp9al118";
       };
     };
-    "randomatic-1.1.7" = {
+    "randomatic-3.0.0" = {
       name = "randomatic";
       packageName = "randomatic";
-      version = "1.1.7";
+      version = "3.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz";
-        sha512 = "2is2kipfnz3hl4yxgqk07rll6956cq3zzf9cddai3f0lij5acq76v98qv14qkpljh1pqfsyb8p69xa9cyaww6p0j91s4vc9zj6594hg";
+        url = "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz";
+        sha512 = "142g2k8ipzpkp1sv5zsbk8qy39r5isc1s9q2x910dh6zqwdksd6mkq16apdrfw6ssv14hpg64j4zy3v4m4lclpvwi767phqh4w4bp2m";
       };
     };
     "randombytes-2.0.6" = {
@@ -5746,13 +5755,13 @@ let
         sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637";
       };
     };
-    "request-2.85.0" = {
+    "request-2.86.0" = {
       name = "request";
       packageName = "request";
-      version = "2.85.0";
+      version = "2.86.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.85.0.tgz";
-        sha512 = "2d3hg10zs5ycnr8prmiwdhacf88fl0x0bi6szs0z2r07zcbk419laixwpjp8sqapbc2ifyyih7p3r60wgr58bmcncz3pqnx523c8zph";
+        url = "https://registry.npmjs.org/request/-/request-2.86.0.tgz";
+        sha512 = "37xa5i4dk3fkcl9gxrzxkjjy6vcqn6bcc61bwq6kjpqrg5i01yc6xn0iq3zy68vqqav93k1kgr2xdabp22p0bfynfcbzxp8ms3n41h5";
       };
     };
     "resolve-1.1.7" = {
@@ -6079,13 +6088,13 @@ let
         sha1 = "50a9989da7c98c2c61dad119bc97470ef8528129";
       };
     };
-    "simple-sha1-2.1.0" = {
+    "simple-sha1-2.1.1" = {
       name = "simple-sha1";
       packageName = "simple-sha1";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.0.tgz";
-        sha1 = "9427bb96ff1263cc10a8414cedd51a18b919e8b3";
+        url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.1.1.tgz";
+        sha512 = "2l45afqnby96gdihg3hi51006502yc33wly8cgmgrww00aiq37jdvp22l9qhbxljra5j6s8lwigjh5hpzj521ccgwlhk59zw9vhylx4";
       };
     };
     "siphash24-1.1.0" = {
@@ -6250,13 +6259,13 @@ let
         sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc";
       };
     };
-    "source-map-resolve-0.5.1" = {
+    "source-map-resolve-0.5.2" = {
       name = "source-map-resolve";
       packageName = "source-map-resolve";
-      version = "0.5.1";
+      version = "0.5.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.1.tgz";
-        sha512 = "3ccyfzn4imm9m891wy0bqh85lxrsf82snlh7dlgvjc28rpd2m6n95x8kjmm2crcpqv6234xc2lqzp1h1cyx7xrn146nzinzzk1bd9fh";
+        url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz";
+        sha512 = "14dmrwi7wa13wr1mrygjmb49mzsycpj8h5r41y7qvdf98lz9qzaww7vis6cvgqgfx0ly1sx4vsmw45xzlzs6indjcs5pkrjvjyaqfij";
       };
     };
     "source-map-url-0.4.0" = {
@@ -6484,15 +6493,6 @@ let
         sha512 = "315yd4vzwrwk3vwj1klf46y1cj2jbvf88066y2rnwhksb98phj46jkxixbwsp3h607w7czy7cby522s7sx8mvspdpdm3s72y2ga3x4z";
       };
     };
-    "stringstream-0.0.5" = {
-      name = "stringstream";
-      packageName = "stringstream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-        sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
-      };
-    };
     "strip-ansi-3.0.1" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
@@ -6691,13 +6691,13 @@ let
         sha512 = "25ypdsz6l4xmg1f89pjy8s773j3lzx855iiakbdknz115vxyg4p4z1j0i84iyjpzwgfjfs2l2njpd0y2hlr5sh4n01nh6124zs09y85";
       };
     };
-    "tar-stream-1.6.0" = {
+    "tar-stream-1.6.1" = {
       name = "tar-stream";
       packageName = "tar-stream";
-      version = "1.6.0";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.0.tgz";
-        sha512 = "2kw4php0986jgdzqvrih64plc8md1f1v3wfc8mz3y0lz95dmmvba1lpjmwp1v4crgfky63r8an3syfavn3gb0d56xk7615zy40a47cn";
+        url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz";
+        sha512 = "2j2zhpi3nkxdny3qh1rm3xzx5kvdc4f83cqnqbq8yasqyxj6bpvbvff20rbqp6wl8zicx4dndkcjwm3xnprnkq11m7b4hkp1bkwqli0";
       };
     };
     "term-size-1.2.0" = {
@@ -7123,13 +7123,13 @@ let
         sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97";
       };
     };
-    "upath-1.0.5" = {
+    "upath-1.1.0" = {
       name = "upath";
       packageName = "upath";
-      version = "1.0.5";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/upath/-/upath-1.0.5.tgz";
-        sha512 = "31m1lljcfngdnpyz67gpkwvb66gx6750si3jzmf1vg6kq420fq5lcd34cfgp6wz3manjpqbp9i98ax2yjl2xs7mq824chw38vvsgcm9";
+        url = "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz";
+        sha512 = "2pyjsmaajf6k6ql5qj270l0p3xkjvn25wky2qd1vndvl54ljbv8p8sbr44zsfh33mmrnj93ys4499c3h956wbgn4g82z8b1h3z4ffkg";
       };
     };
     "update-notifier-2.5.0" = {
@@ -7267,13 +7267,13 @@ let
         sha1 = "5fa912d81eb7d0c74afc140de7317f0ca7df437e";
       };
     };
-    "validator-9.4.1" = {
+    "validator-10.2.0" = {
       name = "validator";
       packageName = "validator";
-      version = "9.4.1";
+      version = "10.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-9.4.1.tgz";
-        sha512 = "2f2x8zxh7czpkf33h5x8fvj48rfszyhkar554x5c2hw7qlsbdqjqvv6nczzsfkw6z5rj6gqabxhcg8haip0xgz7sn4jr6fi7f7llpk1";
+        url = "https://registry.npmjs.org/validator/-/validator-10.2.0.tgz";
+        sha512 = "2v8ipjc5jdlwdhj1bcggxm98q2cigj2016rjqyzj0wq4kvjqghi3k66d6j17bpvqix0dqy01s4sh4qg0wv56jshix9zcdddfn9fwgw3";
       };
     };
     "variable-diff-1.1.0" = {
@@ -7528,13 +7528,13 @@ let
         sha1 = "a81981ea70a57946133883f029c5821a89359a7f";
       };
     };
-    "z-schema-3.20.0" = {
+    "z-schema-3.22.0" = {
       name = "z-schema";
       packageName = "z-schema";
-      version = "3.20.0";
+      version = "3.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.20.0.tgz";
-        sha512 = "2fmqk4rayvsp7kjhfmr7ldrwvfvg1aif9dwpsqbqvmsz8j18q5lxs1vm4frg7pla8fwj2xacjzy0fsm2xfqvwmsxa5yxvsb21y5v2pn";
+        url = "https://registry.npmjs.org/z-schema/-/z-schema-3.22.0.tgz";
+        sha512 = "24ad8ip4l1k4kvga0yxhx08b3yvzhp1abk94031ar9vcsb1xqr7hafivsxbadf4dm1cw1ndjc9wgh4jki8q1xad4zfg9n2pgjx3dbrs";
       };
     };
   };
@@ -7592,7 +7592,7 @@ in
           sources."chalk-1.1.3"
         ];
       })
-      sources."@types/node-10.0.4"
+      sources."@types/node-10.1.1"
       sources."@types/superagent-3.5.6"
       sources."ansi-escapes-3.1.0"
       sources."ansi-regex-2.1.1"
@@ -7635,7 +7635,7 @@ in
       sources."formidable-1.2.1"
       sources."has-ansi-2.0.0"
       sources."has-flag-3.0.0"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."inherits-2.0.3"
       (sources."inquirer-3.3.0" // {
         dependencies = [
@@ -7655,7 +7655,7 @@ in
       sources."lodash._root-3.0.1"
       sources."lodash._stringtopath-4.8.0"
       sources."lodash.uniqby-4.5.0"
-      sources."lru-cache-4.1.2"
+      sources."lru-cache-4.1.3"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.33.0"
@@ -7754,7 +7754,7 @@ in
       sources."brace-expansion-1.1.11"
       (sources."braces-1.8.5" // {
         dependencies = [
-          sources."kind-of-4.0.0"
+          sources."kind-of-6.0.2"
         ];
       })
       sources."buffer-alloc-1.1.0"
@@ -7775,7 +7775,7 @@ in
       sources."codecs-1.2.1"
       sources."color-convert-1.9.1"
       sources."color-name-1.1.3"
-      sources."colors-1.2.4"
+      sources."colors-1.2.5"
       sources."combined-stream-1.0.6"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
@@ -7809,7 +7809,7 @@ in
           sources."debug-2.6.9"
         ];
       })
-      (sources."dat-link-resolve-2.1.0" // {
+      (sources."dat-link-resolve-2.1.1" // {
         dependencies = [
           sources."debug-2.6.9"
         ];
@@ -7871,7 +7871,7 @@ in
       sources."fast-json-stable-stringify-2.0.0"
       sources."fd-read-stream-1.1.0"
       sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.3"
+      sources."fill-range-2.2.4"
       sources."flat-tree-1.6.0"
       sources."for-each-0.3.2"
       sources."for-in-1.0.2"
@@ -7936,7 +7936,7 @@ in
       (sources."k-rpc-4.3.1" // {
         dependencies = [
           sources."bencode-2.0.0"
-          sources."k-bucket-4.0.0"
+          sources."k-bucket-4.0.1"
         ];
       })
       sources."k-rpc-socket-1.8.0"
@@ -7946,6 +7946,7 @@ in
       sources."lodash.flattendeep-4.4.0"
       sources."lodash.throttle-4.1.1"
       sources."lru-3.1.0"
+      sources."math-random-1.0.1"
       sources."memory-pager-1.1.0"
       sources."merkle-tree-stream-3.0.3"
       sources."micromatch-2.3.11"
@@ -8005,13 +8006,9 @@ in
       sources."random-access-file-2.0.1"
       sources."random-access-memory-2.4.0"
       sources."random-access-storage-1.2.0"
-      (sources."randomatic-1.1.7" // {
+      (sources."randomatic-3.0.0" // {
         dependencies = [
-          (sources."is-number-3.0.0" // {
-            dependencies = [
-              sources."kind-of-3.2.2"
-            ];
-          })
+          sources."is-number-4.0.0"
         ];
       })
       sources."randombytes-2.0.6"
@@ -8023,13 +8020,13 @@ in
       sources."remove-trailing-separator-1.1.0"
       sources."repeat-element-1.1.2"
       sources."repeat-string-1.6.1"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."revalidator-0.1.8"
       sources."rimraf-2.6.2"
       sources."rusha-0.8.13"
       sources."safe-buffer-5.1.2"
       sources."signed-varint-2.0.1"
-      sources."simple-sha1-2.1.0"
+      sources."simple-sha1-2.1.1"
       sources."siphash24-1.1.0"
       sources."slice-ansi-1.0.0"
       sources."sntp-2.1.0"
@@ -8049,7 +8046,6 @@ in
       sources."stream-shift-1.0.0"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-4.0.0"
       (sources."subcommand-2.1.0" // {
         dependencies = [
@@ -8292,7 +8288,7 @@ in
       sources."punycode-1.4.1"
       sources."qs-6.5.2"
       sources."readable-stream-2.3.6"
-      sources."request-2.85.0"
+      sources."request-2.86.0"
       sources."rimraf-2.6.2"
       sources."safe-buffer-5.1.2"
       sources."semver-5.3.0"
@@ -8302,7 +8298,6 @@ in
       sources."sshpk-1.14.1"
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-3.0.1"
       sources."tar-2.2.1"
       sources."tough-cookie-2.3.4"
@@ -8370,7 +8365,7 @@ in
       sources."gauge-2.7.4"
       sources."glob-7.1.2"
       sources."has-unicode-2.0.1"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."ignore-walk-3.0.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -8431,10 +8426,10 @@ in
   pnpm = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
-    version = "1.41.3";
+    version = "1.43.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.41.3.tgz";
-      sha1 = "66b38792c8447702c47553a87dddc5748a3aefca";
+      url = "https://registry.npmjs.org/pnpm/-/pnpm-1.43.1.tgz";
+      sha1 = "0766354192aa2d843bcf1ddb277627e5cbc9c1e9";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -8650,7 +8645,7 @@ in
       sources."hawk-6.0.2"
       sources."hoek-4.2.1"
       sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.22"
+      sources."iconv-lite-0.4.23"
       sources."ieee754-1.1.11"
       sources."inflight-1.0.6"
       sources."inherits-2.0.3"
@@ -8685,7 +8680,7 @@ in
       sources."log-symbols-2.2.0"
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
-      (sources."make-dir-1.2.0" // {
+      (sources."make-dir-1.3.0" // {
         dependencies = [
           sources."pify-3.0.0"
         ];
@@ -8731,7 +8726,7 @@ in
       sources."readable-stream-2.3.6"
       sources."recursive-readdir-2.2.2"
       sources."repeat-string-1.6.1"
-      (sources."request-2.85.0" // {
+      (sources."request-2.86.0" // {
         dependencies = [
           sources."co-4.6.0"
         ];
@@ -8754,12 +8749,11 @@ in
       sources."stat-mode-0.2.2"
       sources."string-width-2.1.1"
       sources."string_decoder-1.1.1"
-      sources."stringstream-0.0.5"
       sources."strip-ansi-4.0.0"
       sources."strip-dirs-2.1.0"
       sources."strip-outer-1.0.1"
       sources."supports-color-5.4.0"
-      sources."tar-stream-1.6.0"
+      sources."tar-stream-1.6.1"
       sources."through-2.3.8"
       sources."thunkify-2.1.2"
       sources."thunkify-wrap-1.0.4"
@@ -8974,7 +8968,7 @@ in
       sources."from-0.1.7"
       sources."fs-extra-0.24.0"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-1.2.3"
+      sources."fsevents-1.2.4"
       sources."get-stream-3.0.0"
       sources."get-value-2.0.6"
       sources."glob-7.1.2"
@@ -9086,7 +9080,7 @@ in
       sources."longest-1.0.1"
       sources."lowercase-keys-1.0.1"
       sources."lru-cache-2.7.3"
-      sources."make-dir-1.2.0"
+      sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-stream-0.1.0"
       sources."map-visit-1.0.0"
@@ -9156,7 +9150,7 @@ in
             ];
           })
           sources."kind-of-3.2.2"
-          sources."lru-cache-4.1.2"
+          sources."lru-cache-4.1.3"
           sources."minimist-1.2.0"
           sources."strip-ansi-4.0.0"
           sources."supports-color-5.4.0"
@@ -9251,7 +9245,7 @@ in
       sources."snapdragon-node-2.1.1"
       sources."snapdragon-util-3.0.1"
       sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.1"
+      sources."source-map-resolve-0.5.2"
       sources."source-map-url-0.4.0"
       sources."spark-md5-1.0.1"
       sources."split-0.3.3"
@@ -9350,7 +9344,7 @@ in
         ];
       })
       sources."unzip-response-2.0.1"
-      sources."upath-1.0.5"
+      sources."upath-1.1.0"
       sources."update-notifier-2.5.0"
       sources."uri-js-3.0.2"
       sources."urix-0.1.0"
@@ -9364,7 +9358,7 @@ in
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."valid-url-1.0.9"
-      sources."validator-9.4.1"
+      sources."validator-10.2.0"
       sources."which-1.3.0"
       sources."widest-line-2.0.0"
       sources."window-size-0.1.0"
@@ -9375,7 +9369,7 @@ in
       sources."xtend-4.0.1"
       sources."yallist-2.1.2"
       sources."yargs-3.10.0"
-      sources."z-schema-3.20.0"
+      sources."z-schema-3.22.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -9389,10 +9383,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "6.0.0";
+    version = "6.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-6.0.0.tgz";
-      sha512 = "1s1pq7rdh5xxd4phq7bf1fikbfwc9iiglgayiy0bf14skvivj96j7f5mzyh3631gzhm7vmpak0k523axik5n4hza8gd8c90s203plqj";
+      url = "https://registry.npmjs.org/npm/-/npm-6.0.1.tgz";
+      sha512 = "03x8626d7ngp160j0lx7vmzpjglvlqbz4gf9kmdndaxna9h81zr8rjhad3jcdkr9j1nnlc1rsr7acsdny5ykl3dwilq0p486zr9cyrp";
     };
     buildInputs = globalBuildInputs;
     meta = {

From 14a26f0153c4284ccb8ac9abf01ea57421156be1 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Thu, 17 May 2018 18:56:58 -0500
Subject: [PATCH 2542/3370] meguca: init at git-2018-05-17

---
 nixos/modules/misc/ids.nix                    |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/web-servers/meguca.nix | 123 ++++++++++
 pkgs/servers/meguca/default.nix               |  47 ++++
 pkgs/servers/meguca/server_deps.nix           | 219 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 6 files changed, 394 insertions(+)
 create mode 100644 nixos/modules/services/web-servers/meguca.nix
 create mode 100644 pkgs/servers/meguca/default.nix
 create mode 100644 pkgs/servers/meguca/server_deps.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index a34e9c50c4c5..73231edf077b 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -316,6 +316,7 @@
       monetdb = 290;
       restic = 291;
       openvpn = 292;
+      meguca = 293;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -592,6 +593,7 @@
       monetdb = 290;
       restic = 291;
       openvpn = 292;
+      meguca = 293;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 65b4cfd7e0b5..12d9e1adf23d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -667,6 +667,7 @@
   ./services/web-servers/lighttpd/default.nix
   ./services/web-servers/lighttpd/gitweb.nix
   ./services/web-servers/lighttpd/inginious.nix
+  ./services/web-servers/meguca.nix
   ./services/web-servers/mighttpd2.nix
   ./services/web-servers/minio.nix
   ./services/web-servers/nginx/default.nix
diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix
new file mode 100644
index 000000000000..6f3f5329dafc
--- /dev/null
+++ b/nixos/modules/services/web-servers/meguca.nix
@@ -0,0 +1,123 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.services.meguca;
+  postgres = config.services.postgresql;
+in
+{
+  options.services.meguca = {
+    enable = mkEnableOption "meguca";
+
+    baseDir = mkOption {
+      type = types.path;
+      default = "/var/lib/meguca";
+      description = "Location where meguca stores it's database and links.";
+    };
+
+    password = mkOption {
+      type = types.str;
+      default = "meguca";
+      description = "Password for the meguca database.";
+    };
+
+    reverseProxy = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Reverse proxy IP.";
+    };
+
+    sslCertificate = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Path to the SSL certificate.";
+    };
+
+    listenAddress = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Listen on a specific IP address and port.";
+    };
+
+    cacheSize = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Cache size in MB.";
+    };
+
+    postgresArgs = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Postgresql connection arguments.";
+    };
+
+    compressTraffic = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Compress all traffic with gzip.";
+    };
+
+    assumeReverseProxy = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Assume the server is behind a reverse proxy, when resolving client IPs.";
+    };
+
+    httpsOnly = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Serve and listen only through HTTPS.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    security.sudo.enable = cfg.enable == true;
+    services.postgresql.enable = cfg.enable == true;
+
+    systemd.services.meguca = {
+      description = "meguca";
+      after = [ "network.target" "postgresql.service" ];
+      wantedBy = [ "multi-user.target" ];
+
+      preStart = ''
+        # Ensure folder exists and links are correct or create them
+        mkdir -p ${cfg.baseDir}
+        ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir}
+        chown -R meguca:meguca ${cfg.baseDir}
+
+        # Ensure the database is correct or create it
+        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser -SDR meguca || true
+        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/psql -c "ALTER ROLE meguca WITH PASSWORD '${cfg.password}';" || true
+        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb -T template0 -E UTF8 -O meguca meguca || true
+      '';
+
+      serviceConfig = {
+        PermissionsStartOnly = true;
+        Type = "forking";
+        User = "meguca";
+        Group = "meguca";
+        WorkingDirectory = "${cfg.baseDir}";
+        ExecStart = ''${pkgs.meguca}/bin/meguca${if cfg.reverseProxy != null then " -R ${cfg.reverseProxy}" else ""}${if cfg.sslCertificate != null then " -S ${cfg.sslCertificate}" else ""}${if cfg.listenAddress != null then " -a ${cfg.listenAddress}" else ""}${if cfg.cacheSize != null then " -c ${cfg.cacheSize}" else ""}${if cfg.postgresArgs != null then " -d  ${cfg.postgresArgs}" else ""}${if cfg.compressTraffic then " -g" else ""}${if cfg.assumeReverseProxy then " -r" else ""}${if cfg.httpsOnly then " -s" else ""} start'';
+        ExecStop = "${pkgs.meguca}/bin/meguca stop";
+        ExecRestart = "${pkgs.meguca}/bin/meguca restart";
+      };
+    };
+
+    users = {
+      extraUsers.meguca = {
+        description = "meguca server service user";
+        home = "${cfg.baseDir}";
+        createHome = true;
+        group = "meguca";
+        uid = config.ids.uids.meguca;
+      };
+
+      extraGroups.meguca = {
+        gid = config.ids.gids.meguca;
+        members = [ "meguca" ];
+      };
+    };
+  };
+
+  meta.maintainers = [ maintainers.chiiruno ];
+}
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
new file mode 100644
index 000000000000..421a6b456a9a
--- /dev/null
+++ b/pkgs/servers/meguca/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, go-bindata, easyjson, nodePackages, cmake, emscripten }:
+
+buildGoPackage rec {
+  name = "meguca-unstable-${version}";
+  version = "2018-05-17";
+  rev = "3107c78d95de3b64556f761d3b6dcfd5c590e0ec";
+  goPackagePath = "github.com/bakape/meguca";
+  goDeps = ./server_deps.nix;
+  enableParallelBuilding = true;
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ ffmpeg-full graphicsmagick ghostscript quicktemplate go-bindata easyjson emscripten ];
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/bakape/meguca";
+    sha256 = "1rvkr5af5d4rlyxylynnpn76hvxq9xd7j8q6mffn6qj6j5p4qg4p";
+    fetchSubmodules = true;
+  };
+
+  configurePhase = ''
+    export HOME=$PWD
+    export GOPATH=$GOPATH:$HOME/go
+    ln -sf ${nodePackages.meguca}/lib/node_modules/meguca/node_modules
+    sed -i "/npm install --progress false --depth 0/d" Makefile
+    make generate_clean
+    go generate meguca/...
+  '';
+
+  buildPhase = ''
+    go build -p $NIX_BUILD_CORES meguca
+    make -j $NIX_BUILD_CORES client wasm
+  '';
+
+  installPhase = ''
+    mkdir -p $bin/bin $bin/share/meguca
+    cp meguca $bin/bin
+    cp -r www $bin/share/meguca
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/bakape/meguca";
+    description = "Anonymous realtime imageboard focused on high performance, free speech and transparent moderation";
+    license = licenses.agpl3Plus;
+    maintainers = with maintainers; [ chiiruno ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix
new file mode 100644
index 000000000000..6501b7cabb4f
--- /dev/null
+++ b/pkgs/servers/meguca/server_deps.nix
@@ -0,0 +1,219 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/Masterminds/squirrel";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Masterminds/squirrel";
+      rev = "40ef4f86bf59a996c348a9f56ddb4c4d3d49a6df";
+      sha256 = "1zdv8hds2skqz9xrybf1pw5hfxzd27c35fsrfq11ryif1wxwbkyp";
+    };
+  }
+  {
+    goPackagePath = "github.com/Soreil/apngdetector";
+    fetch = {
+      type = "git";
+      url = "https://github.com/Soreil/apngdetector";
+      rev = "e412c29dbc998dfcffe266b12587b29096ac4d46";
+      sha256 = "0ci71nk6jijspzbgcfrgi4in9lmd2c39f6xzcf9k3z9ixwv8c79j";
+    };
+  }
+  {
+    goPackagePath = "github.com/aquilax/tripcode";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aquilax/tripcode";
+      rev = "db58da84bb12e26032493b73eb3b58ba884590ef";
+      sha256 = "0maqk0rwp39kcc64w4mfkgcvn2q76hqwziwc3g7ckc1qpwxql5z3";
+    };
+  }
+  {
+    goPackagePath = "github.com/bakape/mnemonics";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bakape/mnemonics";
+      rev = "056d8d3259923b93bb0449a45b0c56ac20c77f1b";
+      sha256 = "137dl4bkpszj7pm4dyj222xdvy9lmwsgmm0l6bxni0msc3jdrqkl";
+    };
+  }
+  {
+    goPackagePath = "github.com/bakape/thumbnailer";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bakape/thumbnailer";
+      rev = "5b92eb4c4500fd8e004e4cc9eeb2038961e2004f";
+      sha256 = "0z9myzp6rjyylh91ibd1nfpz7za1gxg4n3pnn7sw54i9zyws1l4x";
+    };
+  }
+  {
+    goPackagePath = "github.com/boltdb/bolt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/boltdb/bolt";
+      rev = "fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5";
+      sha256 = "12f5swiwzcamk87r9j73nn7rmyyday7jkgzfh7x5wdg9blzhrir2";
+    };
+  }
+  {
+    goPackagePath = "github.com/dchest/captcha";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dchest/captcha";
+      rev = "6a29415a8364ec2971fdc62d9e415ed53fc20410";
+      sha256 = "0j0yspx5rlyx7fdfcx74viqc8jlq3nwyd62bdx4gvbd56cppldcm";
+    };
+  }
+  {
+    goPackagePath = "github.com/dimfeld/httptreemux";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dimfeld/httptreemux";
+      rev = "7f532489e7739b3d49df5c602bf63549881fe753";
+      sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/handlers";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/handlers";
+      rev = "13a38d26174b16d5b4bf6f1094c1389ec9879572";
+      sha256 = "0zg43blpyyy667y0kpiifk5a2w35jh8qkk4zwlabb365c0lzrv6v";
+    };
+  }
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "21ab95fa12b9bdd8fecf5fa3586aad941cc98785";
+      sha256 = "1ygg6cr84461d6k3nzbja0dxhcgf5zvry2w10f6i7291ghrcwhyy";
+    };
+  }
+  {
+    goPackagePath = "github.com/kardianos/osext";
+    fetch = {
+      type = "git";
+      url = "https://github.com/kardianos/osext";
+      rev = "ae77be60afb1dcacde03767a8c37337fad28ac14";
+      sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz";
+    };
+  }
+  {
+    goPackagePath = "github.com/lann/builder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lann/builder";
+      rev = "1b87b36280d04fe7882d1512bf038ea2967ad534";
+      sha256 = "015q46awbyp47vld07yi7d27i0lkd82r7qn5230bb9qxl4mcfiqc";
+    };
+  }
+  {
+    goPackagePath = "github.com/lann/ps";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lann/ps";
+      rev = "62de8c46ede02a7675c4c79c84883eb164cb71e3";
+      sha256 = "10yhcyymypvdiiipchsp80jbglk8c4r7lq7h54v9f4mxmvz6xgf7";
+    };
+  }
+  {
+    goPackagePath = "github.com/lib/pq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/lib/pq";
+      rev = "d34b9ff171c21ad295489235aec8b6626023cd04";
+      sha256 = "1gmdpp7wxlkk0szgq96rf06dj2ifjl0zbvbmg2g4bgxandh552jv";
+    };
+  }
+  {
+    goPackagePath = "github.com/mailru/easyjson";
+    fetch = {
+      type = "git";
+      url = "https://github.com/mailru/easyjson";
+      rev = "8b799c424f57fa123fc63a99d6383bc6e4c02578";
+      sha256 = "15ba6drfmw98lzw5qjh3ijcxh9iz9rcp3hid169yfd08l06z05w0";
+    };
+  }
+  {
+    goPackagePath = "github.com/nyarlabo/go-crypt";
+    fetch = {
+      type = "git";
+      url = "https://github.com/nyarlabo/go-crypt";
+      rev = "d9a5dc2b789bc330075d4b805d9b7c971f2865a1";
+      sha256 = "0249hbwvhy0xywi9b5k8964km27pvfkr3jvliy3azri6vnyvkkx1";
+    };
+  }
+  {
+    goPackagePath = "github.com/oschwald/maxminddb-golang";
+    fetch = {
+      type = "git";
+      url = "https://github.com/oschwald/maxminddb-golang";
+      rev = "c5bec84d1963260297932a1b7a1753c8420717a7";
+      sha256 = "0n8vhinm2x0prbn0vhxw38c24iiaizwk1b76s4srg30gk3dfdd39";
+    };
+  }
+  {
+    goPackagePath = "github.com/sevlyar/go-daemon";
+    fetch = {
+      type = "git";
+      url = "https://github.com/sevlyar/go-daemon";
+      rev = "45a2ba1b7c6710a044163fa109bf08d060bc3afa";
+      sha256 = "1fd8cwljgbxsm3w38pii0n02zg8s53x7j08w784csj3sfzq7rbv4";
+    };
+  }
+  {
+    goPackagePath = "github.com/ulikunitz/xz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/ulikunitz/xz";
+      rev = "0c6b41e72360850ca4f98dc341fd999726ea007f";
+      sha256 = "0a6l7sp67ipxim093qh6fvw8knbxj24l7bj5lykcddi5gwfi78n3";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/bytebufferpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/bytebufferpool";
+      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
+      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/quicktemplate";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/quicktemplate";
+      rev = "a91e0946457b6583004fbfc159339b8171423aed";
+      sha256 = "1z89ang5pkq5qs5b2nwhzyrw0zjlsas539l9kix374fhka49n8yc";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "21052ae46654ecf18dfdba0f7c12701a1e2b3164";
+      sha256 = "0wzi1knv181h6y8k3k7wlr7sw492pgxir4gyg2riavrk8c23y2s2";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/sys";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/sys";
+      rev = "7db1c3b1a98089d0071c84f646ff5c96aad43682";
+      sha256 = "0z20mhdy3wiy53xch0fp49gv574qrs77fps5wxi12n57840s2jfr";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
+      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8a0e0f1d233..289b0a6617bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12607,6 +12607,8 @@ with pkgs;
 
   mediatomb = callPackage ../servers/mediatomb { };
 
+  meguca = callPackage ../servers/meguca/default.nix { };
+
   memcached = callPackage ../servers/memcached {};
 
   meteor = callPackage ../servers/meteor/default.nix { };

From e2f1a05756864e345673c068f81bfaf69d184c6f Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Sun, 20 May 2018 19:15:23 -0500
Subject: [PATCH 2543/3370] meguca: git-2018-05-17 -> git-2018-05-20

---
 nixos/modules/services/web-servers/meguca.nix | 61 +++++++++++++++----
 pkgs/servers/meguca/default.nix               |  9 +--
 pkgs/servers/meguca/server_deps.nix           | 12 ++--
 3 files changed, 59 insertions(+), 23 deletions(-)

diff --git a/nixos/modules/services/web-servers/meguca.nix b/nixos/modules/services/web-servers/meguca.nix
index 6f3f5329dafc..8ae86c67a29f 100644
--- a/nixos/modules/services/web-servers/meguca.nix
+++ b/nixos/modules/services/web-servers/meguca.nix
@@ -11,7 +11,7 @@ in
 
     baseDir = mkOption {
       type = types.path;
-      default = "/var/lib/meguca";
+      default = "/run/meguca";
       description = "Location where meguca stores it's database and links.";
     };
 
@@ -21,6 +21,12 @@ in
       description = "Password for the meguca database.";
     };
 
+    passwordFile = mkOption {
+      type = types.path;
+      default = "/run/keys/meguca-password-file";
+      description = "Password file for the meguca database.";
+    };
+
     reverseProxy = mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -40,17 +46,23 @@ in
     };
 
     cacheSize = mkOption {
-      type = types.nullOr types.str;
+      type = types.nullOr types.int;
       default = null;
       description = "Cache size in MB.";
     };
 
     postgresArgs = mkOption {
-      type = types.nullOr types.str;
-      default = null;
+      type = types.str;
+      default = "user=meguca password=" + cfg.password + " dbname=meguca sslmode=disable";
       description = "Postgresql connection arguments.";
     };
 
+    postgresArgsFile = mkOption {
+      type = types.path;
+      default = "/run/keys/meguca-postgres-args";
+      description = "Postgresql connection arguments file.";
+    };
+
     compressTraffic = mkOption {
       type = types.bool;
       default = false;
@@ -74,6 +86,16 @@ in
     security.sudo.enable = cfg.enable == true;
     services.postgresql.enable = cfg.enable == true;
 
+    services.meguca.passwordFile = mkDefault (toString (pkgs.writeTextFile {
+      name = "meguca-password-file";
+      text = cfg.password;
+    }));
+
+    services.meguca.postgresArgsFile = mkDefault (toString (pkgs.writeTextFile {
+      name = "meguca-postgres-args";
+      text = cfg.postgresArgs;
+    }));
+
     systemd.services.meguca = {
       description = "meguca";
       after = [ "network.target" "postgresql.service" ];
@@ -83,30 +105,43 @@ in
         # Ensure folder exists and links are correct or create them
         mkdir -p ${cfg.baseDir}
         ln -sf ${pkgs.meguca}/share/meguca/www ${cfg.baseDir}
-        chown -R meguca:meguca ${cfg.baseDir}
 
         # Ensure the database is correct or create it
-        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser -SDR meguca || true
-        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/psql -c "ALTER ROLE meguca WITH PASSWORD '${cfg.password}';" || true
-        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb -T template0 -E UTF8 -O meguca meguca || true
+        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createuser \
+          -SDR meguca || true
+        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/psql \
+          -c "ALTER ROLE meguca WITH PASSWORD '$(cat ${cfg.passwordFile})';" || true
+        ${pkgs.sudo}/bin/sudo -u ${postgres.superUser} ${postgres.package}/bin/createdb \
+          -T template0 -E UTF8 -O meguca meguca || true
       '';
 
+    script = ''
+      cd ${cfg.baseDir}
+
+      ${pkgs.meguca}/bin/meguca -d "$(cat ${cfg.postgresArgsFile})"\
+        ${optionalString (cfg.reverseProxy != null) " -R ${cfg.reverseProxy}"}\
+        ${optionalString (cfg.sslCertificate != null) " -S ${cfg.sslCertificate}"}\
+        ${optionalString (cfg.listenAddress != null) " -a ${cfg.listenAddress}"}\
+        ${optionalString (cfg.cacheSize != null) " -c ${toString cfg.cacheSize}"}\
+        ${optionalString (cfg.compressTraffic) " -g"}\
+        ${optionalString (cfg.assumeReverseProxy) " -r"}\
+        ${optionalString (cfg.httpsOnly) " -s"} start
+    '';
+
       serviceConfig = {
         PermissionsStartOnly = true;
         Type = "forking";
         User = "meguca";
         Group = "meguca";
-        WorkingDirectory = "${cfg.baseDir}";
-        ExecStart = ''${pkgs.meguca}/bin/meguca${if cfg.reverseProxy != null then " -R ${cfg.reverseProxy}" else ""}${if cfg.sslCertificate != null then " -S ${cfg.sslCertificate}" else ""}${if cfg.listenAddress != null then " -a ${cfg.listenAddress}" else ""}${if cfg.cacheSize != null then " -c ${cfg.cacheSize}" else ""}${if cfg.postgresArgs != null then " -d  ${cfg.postgresArgs}" else ""}${if cfg.compressTraffic then " -g" else ""}${if cfg.assumeReverseProxy then " -r" else ""}${if cfg.httpsOnly then " -s" else ""} start'';
+        RuntimeDirectory = "meguca";
         ExecStop = "${pkgs.meguca}/bin/meguca stop";
-        ExecRestart = "${pkgs.meguca}/bin/meguca restart";
       };
     };
 
     users = {
       extraUsers.meguca = {
         description = "meguca server service user";
-        home = "${cfg.baseDir}";
+        home = cfg.baseDir;
         createHome = true;
         group = "meguca";
         uid = config.ids.uids.meguca;
@@ -119,5 +154,5 @@ in
     };
   };
 
-  meta.maintainers = [ maintainers.chiiruno ];
+  meta.maintainers = with maintainers; [ chiiruno ];
 }
diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index 421a6b456a9a..a3f2d0f116a8 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate, go-bindata, easyjson, nodePackages, cmake, emscripten }:
+{ stdenv, buildGoPackage, fetchgit, pkgconfig, ffmpeg-full, graphicsmagick, ghostscript, quicktemplate,
+  go-bindata, easyjson, nodePackages, cmake, emscripten }:
 
 buildGoPackage rec {
   name = "meguca-unstable-${version}";
-  version = "2018-05-17";
-  rev = "3107c78d95de3b64556f761d3b6dcfd5c590e0ec";
+  version = "2018-05-20";
+  rev = "0432df41f30795cad5dc9d135ab620d5da7c7b04";
   goPackagePath = "github.com/bakape/meguca";
   goDeps = ./server_deps.nix;
   enableParallelBuilding = true;
@@ -13,7 +14,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://github.com/bakape/meguca";
-    sha256 = "1rvkr5af5d4rlyxylynnpn76hvxq9xd7j8q6mffn6qj6j5p4qg4p";
+    sha256 = "0fahk5ykpah14pwgmgiajps2y3pn96wa4z34rcphkwy549ycxxd0";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix
index 6501b7cabb4f..645b0dddb8a3 100644
--- a/pkgs/servers/meguca/server_deps.nix
+++ b/pkgs/servers/meguca/server_deps.nix
@@ -194,8 +194,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "21052ae46654ecf18dfdba0f7c12701a1e2b3164";
-      sha256 = "0wzi1knv181h6y8k3k7wlr7sw492pgxir4gyg2riavrk8c23y2s2";
+      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
     };
   }
   {
@@ -203,8 +203,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "7db1c3b1a98089d0071c84f646ff5c96aad43682";
-      sha256 = "0z20mhdy3wiy53xch0fp49gv574qrs77fps5wxi12n57840s2jfr";
+      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
     };
   }
   {
@@ -212,8 +212,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/text";
-      rev = "7922cc490dd5a7dbaa7fd5d6196b49db59ac042f";
-      sha256 = "06sicjc24hv7v9p1l6psaq87w4lycx3mjixd6gsd1wnd4jhqvlnr";
+      rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877";
+      sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
     };
   }
 ]

From 79beebeb0477b2c9a921f222f831652ab23cb667 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Fri, 25 May 2018 15:25:58 -0500
Subject: [PATCH 2544/3370] meguca: 2018-05-20 -> 2018-05-25

---
 pkgs/servers/meguca/default.nix     |  6 ++--
 pkgs/servers/meguca/server_deps.nix | 48 +++++++++++++++++++++++++----
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index a3f2d0f116a8..30e0433ae865 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -3,8 +3,8 @@
 
 buildGoPackage rec {
   name = "meguca-unstable-${version}";
-  version = "2018-05-20";
-  rev = "0432df41f30795cad5dc9d135ab620d5da7c7b04";
+  version = "2018-05-25";
+  rev = "a97b2e9c875ecc9752a53b0ea8c8122c3966073e";
   goPackagePath = "github.com/bakape/meguca";
   goDeps = ./server_deps.nix;
   enableParallelBuilding = true;
@@ -14,7 +14,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://github.com/bakape/meguca";
-    sha256 = "0fahk5ykpah14pwgmgiajps2y3pn96wa4z34rcphkwy549ycxxd0";
+    sha256 = "01y9cm1pcihq1ghf0fvqnkg75dbybrn5hjyi3x4ccqmyzsvylbsg";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/servers/meguca/server_deps.nix b/pkgs/servers/meguca/server_deps.nix
index 645b0dddb8a3..493297b9757f 100644
--- a/pkgs/servers/meguca/server_deps.nix
+++ b/pkgs/servers/meguca/server_deps.nix
@@ -72,6 +72,33 @@
       sha256 = "0hkw04rsvljvx8ynqjgz9cb743x09fd2xiiycrgz5vbsa8q9iyyk";
     };
   }
+  {
+    goPackagePath = "github.com/go-playground/ansi";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-playground/ansi";
+      rev = "777788a9be1a7296979a999c86b251fc777077a9";
+      sha256 = "1y2pqx04lc7cqg50scfivzw0n8f0dliflnih14f5jf4svff8s561";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-playground/errors";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-playground/errors";
+      rev = "14d2d30656a95a5fa5a17d2e33540269eda5f158";
+      sha256 = "0w13vgxwc1x780x716kqzzwp9ld3w3jpkclabh2qwpcwx821nhpy";
+    };
+  }
+  {
+    goPackagePath = "github.com/go-playground/log";
+    fetch = {
+      type = "git";
+      url = "https://github.com/go-playground/log";
+      rev = "91a5908e654f9fc444a71ea3c51c72cb5c6c2442";
+      sha256 = "0p67j453pi7ffv3axl5g97qadx8lj22vsi5xrzqrr3v6mj8b0lbm";
+    };
+  }
   {
     goPackagePath = "github.com/gorilla/handlers";
     fetch = {
@@ -122,8 +149,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/lib/pq";
-      rev = "d34b9ff171c21ad295489235aec8b6626023cd04";
-      sha256 = "1gmdpp7wxlkk0szgq96rf06dj2ifjl0zbvbmg2g4bgxandh552jv";
+      rev = "90697d60dd844d5ef6ff15135d0203f65d2f53b8";
+      sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r";
     };
   }
   {
@@ -194,8 +221,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
-      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+      rev = "a3beeb748656e13e54256fd2cde19e058f41f60f";
+      sha256 = "0h0a1v2g3hf0dlfjfiv76vfvvy7r9sdhjyqc2snvh9dczm2k5zki";
     };
   }
   {
@@ -203,8 +230,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
-      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+      rev = "c11f84a56e43e20a78cee75a7c034031ecf57d1f";
+      sha256 = "1fn1wwr94v6ca1zcbsrs5v79s95pajdjqzz9rm9lxkgcvv1rl189";
     };
   }
   {
@@ -216,4 +243,13 @@
       sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs";
     };
   }
+  {
+    goPackagePath = "gopkg.in/gomail.v2";
+    fetch = {
+      type = "git";
+      url = "https://gopkg.in/gomail.v2";
+      rev = "81ebce5c23dfd25c6c67194b37d3dd3f338c98b1";
+      sha256 = "0zdykrv5s19lnq0g49p6njldy4cpk4g161vyjafiw7f84h8r28mc";
+    };
+  }
 ]

From 6ba3b2f962defb1aaad419b590069aea2be855c7 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Sat, 26 May 2018 07:24:35 -0500
Subject: [PATCH 2545/3370] meguca: 2018-05-25 -> 2018-05-26

---
 pkgs/servers/meguca/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix
index 30e0433ae865..bfe21543555d 100644
--- a/pkgs/servers/meguca/default.nix
+++ b/pkgs/servers/meguca/default.nix
@@ -3,8 +3,8 @@
 
 buildGoPackage rec {
   name = "meguca-unstable-${version}";
-  version = "2018-05-25";
-  rev = "a97b2e9c875ecc9752a53b0ea8c8122c3966073e";
+  version = "2018-05-26";
+  rev = "9f3d902fb899dbc874c1a91298d86fda7da59b1e";
   goPackagePath = "github.com/bakape/meguca";
   goDeps = ./server_deps.nix;
   enableParallelBuilding = true;
@@ -14,7 +14,7 @@ buildGoPackage rec {
   src = fetchgit {
     inherit rev;
     url = "https://github.com/bakape/meguca";
-    sha256 = "01y9cm1pcihq1ghf0fvqnkg75dbybrn5hjyi3x4ccqmyzsvylbsg";
+    sha256 = "0qblllf23pxcwi5fhaq8xc77iawll7v7xpk2mf9ngks3h8p7gddq";
     fetchSubmodules = true;
   };
 

From dfa11da7d6ee3e21f39af883c95d20b4af12b7ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sat, 26 May 2018 10:18:18 -0300
Subject: [PATCH 2546/3370] tint2: 16.2 -> 16.4 (#41097)

---
 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 838e26463cd0..31ccdb3c7f53 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 = "16.2";
+  version = "16.4";
 
   src = fetchFromGitLab {
     owner = "o9000";
     repo = "tint2";
     rev = version;
-    sha256 = "1fp9kamb09qbply8jn0gqwgnv9xdds81jzpl0lkziz8dydyis4wm";
+    sha256 = "1h9l45zimai2hqfcf2y98g4i03imhmvm3mlsld9x99i650kxr5jm";
   };
 
   enableParallelBuilding = true;

From 6db1fccdd37bffa3282ef3d4e01ae3f793965ae7 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 26 May 2018 15:36:23 +0200
Subject: [PATCH 2547/3370] =?UTF-8?q?tex-gyre:=20~2.003=20=E2=86=92=202.50?=
 =?UTF-8?q?1=20(#41037)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/data/fonts/tex-gyre/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix
index 4bd77d894e4b..1cbf7168ea96 100644
--- a/pkgs/data/fonts/tex-gyre/default.nix
+++ b/pkgs/data/fonts/tex-gyre/default.nix
@@ -13,6 +13,8 @@ let
 
     installPhase = ''
       mkdir -p $out/share/fonts/opentype/
+      # Pagella & Adventor are not flat archives
+      test -d "${abbreviation}${version}otf" && cd "${abbreviation}${version}otf"
       cp -v *.otf $out/share/fonts/opentype/
     '';
 
@@ -33,9 +35,9 @@ let
 in stdenv.lib.mapAttrs mkVariant {
   adventor = {
     displayName = "Adventor";
-    version = "2.003";
-    sha256 = "13wnb04z9f766ij30x8bpkn4xzv7n466g07dlbimx7qvglxl605g";
-    outputHash = "1cz0lkk2a5fg8r8175h454va499hzln3s99dadxhh147nx1914pm";
+    version = "2_501";
+    sha256 = "0qjg3x0adfppyx3x33cm07ww9i9sl88xaq07m7wfip8rmyp567fn";
+    outputHash = "117h6f02m1r54b4f1a98q5kkjchl5pv9ibm1jla6xrzhk2pchb27";
     abbreviation = "qag";
   };
   bonum = {
@@ -68,9 +70,9 @@ in stdenv.lib.mapAttrs mkVariant {
   };
   pagella = {
     displayName = "Pagella";
-    version ="2.004";
-    sha256 = "0b2pjhw1ihnl951slln6d6vafjd3i6p4i947lwybvg8081qfvd9z";
-    outputHash = "0c6s0r14qax3b4amvm9nffwzby8mm4p7r2hfb8yv9jzhjwa5z8rd";
+    version ="2_501";
+    sha256 = "1kccaxs3vk93la2pz4nv05hx1x3diyla49cz4l33zifdcp2zgg9d";
+    outputHash = "1nnjsgplimh29502pkd19rvfg93x31svxxmx4x7h51njrx1j8qa8";
     abbreviation = "qpl";
   };
   schola = {

From b45fde2da593751c567c22386aa9391a453aa9db Mon Sep 17 00:00:00 2001
From: Pascal Bach <pasci.bach@gmail.com>
Date: Sat, 26 May 2018 15:38:55 +0200
Subject: [PATCH 2548/3370] gitlab-runner: 10.7.0 -> 10.8.0 (#41096)

---
 .../continuous-integration/gitlab-runner/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index c834e6aacde1..7fc0ecd1b2b4 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
@@ -1,16 +1,16 @@
 { lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }:
 
 let
-  version = "10.7.1";
+  version = "10.8.0";
   # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
   docker_x86_64 = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-x86_64.tar.xz";
-    sha256 = "0vvi9czvl9ina3hrfd5qb557wyyspndagbzrjzmv0bbjspxgb4c5";
+    sha256 = "1cdc0p3gq6q324p087qv335y224bv61fbr8xar4kza7lcqblb41d";
   };
 
   docker_arm = fetchurl {
     url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz";
-    sha256 = "1vb85asz5y9x7zzambvdfcy05nyr4kryx5zsfz7nbna7hidi2s86";
+    sha256 = "0xj0ym6mprrknxqrxqj3ydgabqgfdxrw3h1r0q8sggfxqrrs8y08";
   };
 in
 buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "0v4c2631yzizhbiym3qzl8p4vjy5a081ry66qpl21ma9ib2cm9r5";
+    sha256 = "0j8xkwfxvmg1bqrmalqvl6k45yn54m16r3af5ckgr717xylywqb6";
   };
 
   patches = [ ./fix-shell-path.patch ];

From e386e190420c7d70ce69bb2ca70bd67aed1eda9c Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Sat, 26 May 2018 09:40:55 -0400
Subject: [PATCH 2549/3370] slack: 3.1.0 -> 3.2.0-beta2 (#41051)

I know this says it's a beta verison, but
  - This is the version they're distributing on slack.com/download for
    linux
  - The previous releases were "beta" too, they just didn't mention
    it in the version string
---
 .../instant-messengers/slack/default.nix      | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index b1339f6a6948..c39e3ce1a459 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, dpkg
+{ stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
-, gnome2, libnotify, libxcb, nspr, nss, systemd, xorg }:
+, gnome3, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
+, systemd, wget, xorg }:
 
 let
 
-  version = "3.1.0";
+  version = "3.2.0-beta25a7a50e";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -17,10 +18,10 @@ let
     fontconfig
     freetype
     glib
-    gnome2.GConf
-    gnome2.gdk_pixbuf
-    gnome2.gtk
-    gnome2.pango
+    gnome3.gconf
+    gdk_pixbuf
+    gtk3
+    pango
     libnotify
     libxcb
     nspr
@@ -46,7 +47,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb";
-        sha256 = "1y8xxfpqvz4q6y1zkna4cp3rqi7p03w5xgr8h1cmym8z66bj7dq3";
+        sha256 = "0497794a7f0e5ac00a9421e6b1875dcc576ed93efc4a7d8c6465db641c234064";
       }
     else
       throw "Slack is not supported on ${stdenv.system}";
@@ -56,7 +57,13 @@ in stdenv.mkDerivation {
 
   inherit src;
 
-  buildInputs = [ dpkg ];
+  buildInputs = [
+    dpkg
+    gtk3  # needed for GSETTINGS_SCHEMAS_PATH
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
   unpackPhase = "true";
   buildCommand = ''
     mkdir -p $out
@@ -72,9 +79,10 @@ in stdenv.mkDerivation {
       patchelf --set-rpath ${rpath}:$out/lib/slack $file || true
     done
 
-    # Fix the symlink
+    # Replace the broken bin/slack symlink with a startup wrapper
     rm $out/bin/slack
-    ln -s $out/lib/slack/slack $out/bin/slack
+    makeWrapper $out/lib/slack/slack $out/bin/slack \
+      --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH
 
     # Fix the desktop link
     substituteInPlace $out/share/applications/slack.desktop \

From 3d7be025bee5bb3da0d7d3b27fd368f0cf02f627 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 26 May 2018 07:00:28 -0700
Subject: [PATCH 2550/3370] jgmenu: 0.8.2 -> 0.9 (#40965)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jgmenu/versions.

These checks were done:

- built on NixOS
- /nix/store/ka2zxzryv20bs8rxfwk8g8jdji6iq5vx-jgmenu-0.9/bin/jgmenu passed the binary check.
- /nix/store/ka2zxzryv20bs8rxfwk8g8jdji6iq5vx-jgmenu-0.9/bin/jgmenu_run passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.9 with grep in /nix/store/ka2zxzryv20bs8rxfwk8g8jdji6iq5vx-jgmenu-0.9
- directory tree listing: https://gist.github.com/16eca43055545a3b99c07f19da8575e9
- du listing: https://gist.github.com/3840e7d84d3f33c8feeb0235bfdcdd9b
---
 pkgs/applications/misc/jgmenu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/jgmenu/default.nix b/pkgs/applications/misc/jgmenu/default.nix
index ffb898b265c2..78f90a4ffa6b 100644
--- a/pkgs/applications/misc/jgmenu/default.nix
+++ b/pkgs/applications/misc/jgmenu/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jgmenu-${version}";
-  version = "0.8.2";
+  version = "0.9";
 
   src = fetchFromGitHub {
     owner = "johanmalm";
     repo = "jgmenu";
     rev = "v${version}";
-    sha256 = "0nflj4fcpz7rcd1s0zlyi5ikxjykkmz3p5w4gzica1fdbyn2l7x3";
+    sha256 = "17xxz5qyz92sjppsvzjl2v012yb3s5p519cv8xf2hd41j7sh9ym1";
   };
 
   nativeBuildInputs = [

From ebd1881925d9547a242ea9dba24b4ecd6748a2bc Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 26 May 2018 07:13:10 -0700
Subject: [PATCH 2551/3370] pan: 0.144 -> 0.145 (#40963)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pan/versions.

These checks were done:

- built on NixOS
- /nix/store/myvdzpw4h622lqfbssrqq8iv0jlgmr3x-pan-0.145/bin/pan passed the binary check.
- /nix/store/myvdzpw4h622lqfbssrqq8iv0jlgmr3x-pan-0.145/bin/.pan-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 0.145 with grep in /nix/store/myvdzpw4h622lqfbssrqq8iv0jlgmr3x-pan-0.145
- directory tree listing: https://gist.github.com/71c7135618028b366312a29248169c8f
- du listing: https://gist.github.com/ab2cc751a6e4bb701fc4e8d6836d398e
---
 pkgs/applications/networking/newsreaders/pan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 1d913118433e..916bd36ba54c 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -7,14 +7,14 @@
 
 assert spellChecking -> gtkspell3 != null;
 
-let version = "0.144"; in
+let version = "0.145"; in
 
 stdenv.mkDerivation {
   name = "pan-${version}";
 
   src = fetchurl {
     url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
-    sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli";
+    sha256 = "1b4wamv33hprghcjk903bpvnd233yxyrm18qnh13alc8h1553nk8";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From 0dd8ab714f6e87b260210a124d4f3eb462c8891c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sat, 26 May 2018 16:37:37 +0200
Subject: [PATCH 2552/3370] home-assistant: update description of
 parse-requirements.py

---
 .../servers/home-assistant/parse-requirements.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py
index 3b6dccb27bc1..068b89d9a9fe 100755
--- a/pkgs/servers/home-assistant/parse-requirements.py
+++ b/pkgs/servers/home-assistant/parse-requirements.py
@@ -1,16 +1,16 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i python3 -p "python3.withPackages (ps: with ps; [ requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs ])"
 #
-# This script downloads https://github.com/home-assistant/home-assistant/blob/master/requirements_all.txt.
-# This file contains lines of the form
+# This script downloads Home Assistant's source tarball.
+# Inside the homeassistant/components directory, each component has an associated .py file,
+# specifying required packages and other components it depends on:
 #
-#     # homeassistant.components.foo
-#     # homeassistant.components.bar
-#     foobar==1.2.3
+# REQUIREMENTS = [ 'package==1.2.3' ]
+# DEPENDENCIES = [ 'component' ]
 #
-# i.e. it lists dependencies and the components that require them.
-# By parsing the file, a dictionary mapping component to dependencies is created.
-# For all of these dependencies, Nixpkgs' python3Packages are searched for appropriate names.
+# By parsing the files, a dictionary mapping component to requirements and dependencies is created.
+# For all of these requirements and the dependencies' requirements,
+# Nixpkgs' python3Packages are searched for appropriate names.
 # Then, a Nix attribute set mapping component name to dependencies is created.
 
 from urllib.request import urlopen

From 164601faa2607aaa45c8a1a16195fe3f09feec97 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 26 May 2018 18:03:44 +0300
Subject: [PATCH 2553/3370] mesa: Enable virgl driver

This gets NixOS tests requiring X11 to work on aarch64:

https://nix-cache.s3.amazonaws.com/log/nj4dwi3wkxx0cxv230ii4a99yz71b4km-vm-test-run-keymap-neo.drv
---
 pkgs/development/libraries/mesa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 4fd3b38a3be1..f8152bea2cc1 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -34,10 +34,10 @@ else
 let
   defaultGalliumDrivers =
     if stdenv.isAarch32
-    then ["nouveau" "freedreno" "vc4" "etnaviv" "imx"]
+    then ["virgl" "nouveau" "freedreno" "vc4" "etnaviv" "imx"]
     else if stdenv.isAarch64
-    then ["nouveau" "vc4" ]
-    else ["svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
+    then ["virgl" "nouveau" "vc4" ]
+    else ["virgl" "svga" "i915" "r300" "r600" "radeonsi" "nouveau"];
   defaultDriDrivers =
     if (stdenv.isAarch32 || stdenv.isAarch64)
     then ["nouveau"]

From 59c09a52f2793bc31a68742082d8a89ca4795a8f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 26 May 2018 15:30:17 +0000
Subject: [PATCH 2554/3370] solargraph: init at 0.21.1 (#41089)

---
 .../ruby-modules/solargraph/Gemfile           |   3 +
 .../ruby-modules/solargraph/Gemfile.lock      |  50 ++++++
 .../ruby-modules/solargraph/default.nix       |  15 ++
 .../ruby-modules/solargraph/gemset.nix        | 159 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 229 insertions(+)
 create mode 100644 pkgs/development/ruby-modules/solargraph/Gemfile
 create mode 100644 pkgs/development/ruby-modules/solargraph/Gemfile.lock
 create mode 100644 pkgs/development/ruby-modules/solargraph/default.nix
 create mode 100644 pkgs/development/ruby-modules/solargraph/gemset.nix

diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile b/pkgs/development/ruby-modules/solargraph/Gemfile
new file mode 100644
index 000000000000..fa41b7c1d216
--- /dev/null
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org' do
+  gem 'solargraph'
+end
diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
new file mode 100644
index 000000000000..e87f65d02ad5
--- /dev/null
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -0,0 +1,50 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.0)
+    coderay (1.1.2)
+    eventmachine (1.2.7)
+    htmlentities (4.3.4)
+    kramdown (1.16.2)
+    mini_portile2 (2.3.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    parallel (1.12.1)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
+    powerpack (0.1.1)
+    rainbow (3.0.0)
+    reverse_markdown (1.1.0)
+      nokogiri
+    rubocop (0.56.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
+      powerpack (~> 0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.9.0)
+    solargraph (0.21.1)
+      coderay (~> 1.1)
+      eventmachine (~> 1.2, >= 1.2.5)
+      htmlentities (~> 4.3, >= 4.3.4)
+      kramdown
+      parser (~> 2.4)
+      reverse_markdown (~> 1.0, >= 1.0.5)
+      rubocop (~> 0.52)
+      thor (~> 0.19, >= 0.19.4)
+      tilt (~> 2.0)
+      yard (~> 0.9)
+    thor (0.20.0)
+    tilt (2.0.8)
+    unicode-display_width (1.3.2)
+    yard (0.9.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  solargraph!
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix
new file mode 100644
index 000000000000..83f1dddeeb60
--- /dev/null
+++ b/pkgs/development/ruby-modules/solargraph/default.nix
@@ -0,0 +1,15 @@
+{ lib, bundlerApp, ruby }:
+
+bundlerApp rec {
+  pname = "solargraph";
+  exes = ["solargraph"  "solargraph-runtime"];
+  gemdir = ./.;
+
+  meta = with lib; {
+    description = "IDE tools for the Ruby language";
+    homepage    = http://www.github.com/castwide/solargraph;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
new file mode 100644
index 000000000000..0dbdd17d4d4d
--- /dev/null
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -0,0 +1,159 @@
+{
+  ast = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  coderay = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15vav4bhcc2x3jmi3izb11l4d9f3xv8hp2fszb7iqmpsccv1pz4y";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  eventmachine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wh9aqb0skz80fhfn66lbpr4f86ya2z5rx6gm5xlfhd05bj1ch4r";
+      type = "gem";
+    };
+    version = "1.2.7";
+  };
+  htmlentities = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj";
+      type = "gem";
+    };
+    version = "4.3.4";
+  };
+  kramdown = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za";
+      type = "gem";
+    };
+    version = "1.16.2";
+  };
+  mini_portile2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  nokogiri = {
+    dependencies = ["mini_portile2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05fm3xh462glvs0rwnfmc1spmgl4ljg2giifynbmwwqvl42zaaiq";
+      type = "gem";
+    };
+    version = "1.8.2";
+  };
+  parallel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01hj8v1qnyl5ndrs33g8ld8ibk0rbcqdpkpznr04gkbxd11pqn67";
+      type = "gem";
+    };
+    version = "1.12.1";
+  };
+  parser = {
+    dependencies = ["ast"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1af7aa1c2npi8dkshgm3f8qyacabm94ckrdz7b8vd3f8zzswqzp9";
+      type = "gem";
+    };
+    version = "2.5.1.0";
+  };
+  powerpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  rainbow = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  reverse_markdown = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0w7y5n74daajvl9gixr91nh8670d7mkgspkk3ql71m8azq3nffbg";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  rubocop = {
+    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04j2n2zilvfw46v94mpymwnfzni0jq05fz6gs3yi2na7l4c98zv8";
+      type = "gem";
+    };
+    version = "0.56.0";
+  };
+  ruby-progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1igh1xivf5h5g3y5m9b4i4j2mhz2r43kngh4ww3q1r80ch21nbfk";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  solargraph = {
+    dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18wkmbhymhwpdy4638bmdslniy2mjwldms5p61r6jnxzc7qnnalf";
+      type = "gem";
+    };
+    version = "0.21.1";
+  };
+  thor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nmqpyj642sk4g16nkbq6pj856adpv91lp4krwhqkh2iw63aszdl";
+      type = "gem";
+    };
+    version = "0.20.0";
+  };
+  tilt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra";
+      type = "gem";
+    };
+    version = "2.0.8";
+  };
+  unicode-display_width = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  yard = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11x58w0ccayvgy0lmhfyrzxd33ya1v41prh5zzhvaajhw8vr74lh";
+      type = "gem";
+    };
+    version = "0.9.12";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 807f7b03ce6c..34fd1a7672be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7438,6 +7438,8 @@ with pkgs;
   bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
   bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
 
+  solargraph = callPackage ../development/ruby-modules/solargraph { };
+
   inherit (callPackage ../development/interpreters/ruby {
     inherit (darwin) libiconv libobjc libunwind;
     inherit (darwin.apple_sdk.frameworks) Foundation;

From a31a736b96090a926e71df725707375b214013a1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 09:13:28 -0700
Subject: [PATCH 2555/3370] riot-web: 0.15.3 -> 0.15.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/riot-web/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.15.4 with grep in /nix/store/svsdm27wq2iipppfk9nz8k1n4q6ir9i3-riot-web-0.15.4
- directory tree listing: https://gist.github.com/62108c4884b3db3cad6d53a752a6c775
- du listing: https://gist.github.com/36270da19f3c0390457a50f0c6ecb518
---
 .../networking/instant-messengers/riot/riot-web.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
index 512c31e3d041..822080df10b9 100644
--- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
+++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix
@@ -3,11 +3,11 @@
 let configFile = writeText "riot-config.json" conf; in
 stdenv.mkDerivation rec {
   name= "riot-web-${version}";
-  version = "0.15.3";
+  version = "0.15.4";
 
   src = fetchurl {
     url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
-    sha256 = "0vh2zjg0vaczh5mfyykb2kk9d8mi07dkr8zy60bpqf0y1lfamv0a";
+    sha256 = "1c0b9717xmzvzzxj006hqxafvcpvnnrsifxjnbxxla58jmnwr9v5";
   };
 
   installPhase = ''

From 430f22296fdfa927ec67f7b172cfff2b0032a9d7 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Sat, 26 May 2018 18:27:50 +0200
Subject: [PATCH 2556/3370] Crystal: 0.24.1 -> 0.24.2

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

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 3c3124cea174..7b83e0e68b73 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -2,25 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "crystal-${version}";
-  version = "0.24.1";
+  version = "0.24.2";
 
   src = fetchurl {
     url = "https://github.com/crystal-lang/crystal/archive/${version}.tar.gz";
-    sha256 = "1n375cwzb9rfqbjiimfbj4h5q4rsgh2rf6rmm2zbzizzm79a96a9";
+    sha256 = "1l7nrrfgz1yxxjphypwzlxj6dbari20p71zb4l0gix09lmas8l6y";
   };
 
-  prebuiltName = "crystal-0.24.1-2";
+  prebuiltName = "crystal-0.24.2-1";
   prebuiltSrc = let arch = {
     "x86_64-linux" = "linux-x86_64";
     "i686-linux" = "linux-i686";
     "x86_64-darwin" = "darwin-x86_64";
   }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
   in fetchurl {
-    url = "https://github.com/crystal-lang/crystal/releases/download/v0.24.1/${prebuiltName}-${arch}.tar.gz";
+    url = "https://github.com/crystal-lang/crystal/releases/download/0.24.2/${prebuiltName}-${arch}.tar.gz";
     sha256 = {
-      "x86_64-linux" = "19xchfzsyxh0gqi89y6d73iqc06bl097idz6905jf0i35x9ghpdp";
-      "i686-linux" = "15zaxgc1yc9ixbsgy2d8g8d7x2w4vbnndi1ms3wf0ss8azmghiag";
-      "x86_64-darwin" = "1818ahalahcbh974ai09hyfsns6njkpph4sbn4xwv2235x35dqib";
+      "x86_64-linux" = "1xf6riwd5k5f95988m1hsppsfii5v96svgmy12ncy7mgmm7k4dh3";
+      "i686-linux" = "0ar05kj89pm3zxfnxwhf0mz9vrd9q5p47y4969sh0r6knccri0kp";
+      "x86_64-darwin" = "1vz8bi5rfgggiic4ayxbcf6pfmdjvqcg4lsivnk2fyshr1m8l0h5";
     }."${stdenv.system}";
   };
 

From e49af777352168b2fe9ddb80705aecabf850d87d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 May 2018 12:45:08 -0400
Subject: [PATCH 2557/3370] linux: 4.4.132 -> 4.4.133

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index dd946c281316..409bc590ac06 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.132";
+  version = "4.4.133";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0d06dv7maspgv33dlc6r8cb8pkpg4q2vxbpzz6285n0ah4fb05f4";
+    sha256 = "0vhg23i49s4k8lbsrs8y6rvqjld84qgifmim5qcrndr6yj68fmk0";
   };
 } // (args.argsOverride or {}))

From 64c4ea02418b803b8308e5a6a5720f3b93eb8213 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 May 2018 12:45:18 -0400
Subject: [PATCH 2558/3370] linux: 4.9.102 -> 4.9.103

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index e550f4d44f8f..bf74d91a7d7b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.102";
+  version = "4.9.103";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1icx253l8s158d1ccn594ddkqdxch8jr0w6kbj00jn1dlmms6mfi";
+    sha256 = "1n4kqa0yf5svg8jk647h4awz3ygq696yi0agnmbz0alxnynffsij";
   };
 } // (args.argsOverride or {}))

From b4e2fb578e2e1583d4079c60ab085a2d4326c38f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 May 2018 12:45:30 -0400
Subject: [PATCH 2559/3370] linux: 4.14.43 -> 4.14.44

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index a9e2cd7c5c1e..c1246e56dea1 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.43";
+  version = "4.14.44";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0jkikvjsrz7wk1zx57brzhhs15gbx022f1as4mn0017az7wc0gqk";
+    sha256 = "1r68dvcyidnmr4d49rq58lidy32fijz08xzymxjwmxi5mzk5dcrf";
   };
 } // (args.argsOverride or {}))

From ae995625d8eeb43848c32063f65aed542f7e839f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 May 2018 12:45:37 -0400
Subject: [PATCH 2560/3370] linux: 4.16.11 -> 4.16.12

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 5aebbd6c1e1b..c2bebb361342 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.11";
+  version = "4.16.12";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "088931hgi5acm8nz19nd09skmamr3hhfb958374j30br6f94pfkd";
+    sha256 = "078if7mmlq4csv0d7x7rpsc8zs7m6rpz75h6878r0d2silsphw2n";
   };
 } // (args.argsOverride or {}))

From a6a38c7118a30659ededd0fef4adae1d5403464c Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 25 May 2018 16:33:37 -0400
Subject: [PATCH 2561/3370] python2Packages.pyezminc: init at 1.2.01

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

diff --git a/pkgs/development/python-modules/pyezminc/default.nix b/pkgs/development/python-modules/pyezminc/default.nix
new file mode 100644
index 000000000000..614a1555cbef
--- /dev/null
+++ b/pkgs/development/python-modules/pyezminc/default.nix
@@ -0,0 +1,33 @@
+{ buildPythonPackage, isPy3k, fetchFromGitHub, stdenv,
+  netcdf, hdf5, libminc, ezminc,
+  cython, numpy, scipy
+}:
+
+buildPythonPackage rec {
+  pname = "pyezminc";
+  version = "1.2.01";
+ 
+  disabled = isPy3k;
+
+  src = fetchFromGitHub {
+    owner  = "BIC-MNI";
+    repo   = "pyezminc";
+    rev    = "release-${version}";
+    sha256 = "13smvramacisbwj8qsl160dnvv6ynngn1jmqwhvy146nmadphyv1";
+  };
+
+  nativeBuildInputs = [ cython ];
+  buildInputs = [ netcdf hdf5 libminc ezminc ];
+  propagatedBuildInputs = [ numpy scipy ];
+
+  NIX_CFLAGS_COMPILE = "-fpermissive";
+
+  doCheck = false;  # e.g., expects test data in /opt
+
+  meta = {
+    homepage = https://github.com/BIC-MNI/pyezminc;
+    description = "Python API for libminc using EZMINC";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ bcdarwin ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b695372fe96a..fa1f9c15480c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1240,6 +1240,8 @@ in {
 
   pyechonest = callPackage ../development/python-modules/pyechonest { };
 
+  pyezminc = callPackage ../development/python-modules/pyezminc { };
+
   billiard = callPackage ../development/python-modules/billiard { };
 
   binaryornot = callPackage ../development/python-modules/binaryornot { };

From e33eacbc1db8d864b70d8b4b5e9d6463999285d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 10:42:37 -0700
Subject: [PATCH 2562/3370] picard-tools: 2.18.4 -> 2.18.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/picard-tools/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/y7q0bsph0zldfjkz4ci3f41ba5va810w-picard-tools-2.18.5/bin/picard had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.18.5 with grep in /nix/store/y7q0bsph0zldfjkz4ci3f41ba5va810w-picard-tools-2.18.5
- directory tree listing: https://gist.github.com/1938ad634fa882d94e8d28fd1625547c
- du listing: https://gist.github.com/4b51e89646327900f6ef6f2242f5d0bd
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index e215b6f3862e..555542b76318 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.4";
+  version = "2.18.5";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0qwalb49g8s6dswhhk12ny33xzzj38xa2rj6p6ar0hrwh7aijlqc";
+    sha256 = "1lk1qnwc2gwjh8js3rx4qayan5157an6yzxnhija6kqgrxv58f11";
   };
 
   buildInputs = [ jre makeWrapper ];

From 381bf4d61059dbd83af0957fd11634ce5752ebe5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 10:55:25 -0700
Subject: [PATCH 2563/3370] php: 7.2.5 -> 7.2.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phar.phar passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phar passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phpdbg passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php-cgi passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/pear passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/peardev passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/pecl passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php-fpm passed the binary check.
- 9 of 9 passed binary check by having a zero exit code.
- 0 of 9 passed binary check by having the new version present in output.
- found 7.2.6 with grep in /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6
- directory tree listing: https://gist.github.com/409d2cfaa7e805714825281fbaba0d0f
- du listing: https://gist.github.com/7fbd8e3d56524f70b3dfb94c045fccd2
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 94e1e5f1b692..0e161b0e3f71 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -353,7 +353,7 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.5";
-    sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk";
+    version = "7.2.6";
+    sha256 = "1hzj1z6v1ij4f4zjl1giix9qinf20wyn9gf8s29x5fc0va53wpdf";
   };
 }

From 3e09239882d84a26b4d9d9597b54682412992263 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 26 May 2018 20:44:38 +0200
Subject: [PATCH 2564/3370] grub2: compile grub-mount as well

It is a dependency of os-prober >= 1.75
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=860833#23
---
 pkgs/tools/misc/grub/2.0x.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 96ce38ea9e85..84c06a49f843 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, fetchFromSavannah, autogen, flex, bison, python, autoconf, automake
 , gettext, ncurses, libusb, freetype, qemu, devicemapper, unifont, pkgconfig
+, fuse # only needed for grub-mount
 , zfs ? null
 , efiSupport ? false
 , zfsSupport ? true
@@ -47,7 +48,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ bison flex python pkgconfig ];
-  buildInputs = [ ncurses libusb freetype gettext devicemapper ]
+  buildInputs = [ ncurses libusb freetype gettext devicemapper fuse ]
     ++ optional doCheck qemu
     ++ optional zfsSupport zfs;
 
@@ -83,7 +84,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./fix-bash-completion.patch ];
 
-  configureFlags = optional zfsSupport "--enable-libzfs"
+  configureFlags = [ "--enable-grub-mount" ] # dep of os-prober
+    ++ optional zfsSupport "--enable-libzfs"
     ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystemsBuild.${stdenv.system}.target}" "--program-prefix=" ]
     ++ optionals xenSupport [ "--with-platform=xen" "--target=${efiSystemsBuild.${stdenv.system}.target}"];
 

From b04f9b7d28956c39042367373085d52898197d42 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 26 May 2018 20:46:30 +0200
Subject: [PATCH 2565/3370] os-prober: switch to a non-transient url

pool urls get removed after some time
---
 pkgs/tools/misc/os-prober/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index b879f621e142..b3f4d63c8c6e 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   version = "1.76";
   name = "os-prober-${version}";
   src = fetchurl {
-    url = "mirror://debian/pool/main/o/os-prober/os-prober_${version}.tar.xz";
-    sha256 = "1vb45i76bqivlghrq7m3n07qfmmq4wxrkplqx8gywj011rhq19fk";
+    url = "https://salsa.debian.org/philh/os-prober/-/archive/${version}/os-prober-${version}.tar.bz2";
+    sha256 = "07rw3092pckh21vx6y4hzqcn3wn4cqmwxaaiq100lncnhmszg11g";
   };
 
   buildInputs = [ makeWrapper ];

From f8d08ec818554293c22ca1cf1c500411a13c4560 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 26 May 2018 20:47:52 +0200
Subject: [PATCH 2566/3370] os-prober: fix dependencies

busybox seems to have never been needed
systemd was meant to provide udevadm; use libudev instead
devicemapper is now uneeded, replaced by grub-mount and grub-info
dmraid does not appear in the current code
---
 pkgs/tools/misc/os-prober/default.nix | 37 +++++++++------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index b3f4d63c8c6e..f10ecbe2a5ed 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, makeWrapper,
-systemd, # udevadm
-busybox,
-coreutils, # os-prober desn't seem to work with pure busybox
-devicemapper, # lvs
-# optional dependencies
-cryptsetup ? null,
-libuuid ? null, # blkid and blockdev
-dmraid ? null,
-ntfs3g ? null
+# optional dependencies, the command(s) they provide
+coreutils,  # mktemp
+grub2,      # grub-mount and grub-probe
+cryptsetup, # cryptsetup
+libuuid,    # blkid and blockdev
+libudev,    # udevadm udevinfo
+ntfs3g      # ntfs3g
 }:
 
 stdenv.mkDerivation rec {
@@ -21,12 +19,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ makeWrapper ];
   installPhase = ''
     # executables
-    mkdir -p $out/bin
-    mkdir -p $out/lib
-    mkdir -p $out/share
-    cp os-prober linux-boot-prober $out/bin
-    cp newns $out/lib
-    cp common.sh $out/share
+    install -Dt $out/bin os-prober linux-boot-prober
+    install -Dt $out/lib newns
+    install -Dt $out/share common.sh
 
     # probes
     case "${stdenv.system}" in
@@ -36,8 +31,7 @@ stdenv.mkDerivation rec {
         *) ARCH=other;;
     esac;
     for probes in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
-      mkdir -p $out/lib/$probes;
-      cp $probes/common/* $out/lib/$probes;
+      install -Dt $out/lib/$probes $probes/common/*;
       if [ -e "$probes/$ARCH" ]; then
         mkdir -p $out/lib/$probes
         cp -r $probes/$ARCH/* $out/lib/$probes;
@@ -57,14 +51,7 @@ stdenv.mkDerivation rec {
     done;
     for file in $out/bin/*; do
       wrapProgram $file \
-        --set LVM_SYSTEM_DIR ${devicemapper} \
-        --suffix PATH : "$out/bin${builtins.foldl' (x: y: x + ":" + y) "" (
-          map (x: (toString x) + "/bin") (
-            builtins.filter (x: x!=null)
-              [ devicemapper systemd coreutils cryptsetup libuuid dmraid ntfs3g busybox ]
-            )
-          )
-        }" \
+        --suffix PATH : ${stdenv.lib.makeBinPath [ grub2 libudev coreutils cryptsetup libuuid ntfs3g ]} \
         --run "[ -d /var/lib/os-prober ] || mkdir /var/lib/os-prober"
     done;
   '';

From b8ea160bf374a8208278aaf627d539ff1de1ce76 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sat, 26 May 2018 20:49:47 +0200
Subject: [PATCH 2567/3370] os-prober: add symphorien as maintainer

---
 pkgs/tools/misc/os-prober/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix
index f10ecbe2a5ed..c4a304e0d284 100644
--- a/pkgs/tools/misc/os-prober/default.nix
+++ b/pkgs/tools/misc/os-prober/default.nix
@@ -56,9 +56,10 @@ stdenv.mkDerivation rec {
     done;
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Utility to detect other OSs on a set of drives";
     homepage = http://packages.debian.org/source/sid/os-prober;
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ symphorien ];
   };
 }

From 9275896d7d3ac4f4c4ae189cae6a2bd10cdacae2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 14:06:59 -0700
Subject: [PATCH 2568/3370] lazarus: 1.8.2 -> 1.8.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/lazarus/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/4z8g46k0hjnys0cpbx5r41z55fb77495-lazarus-1.8.4/bin/lazarus-ide had a zero exit code or showed the expected version
- /nix/store/4z8g46k0hjnys0cpbx5r41z55fb77495-lazarus-1.8.4/bin/lazbuild passed the binary check.
- /nix/store/4z8g46k0hjnys0cpbx5r41z55fb77495-lazarus-1.8.4/bin/lazres passed the binary check.
- Warning: no invocation of /nix/store/4z8g46k0hjnys0cpbx5r41z55fb77495-lazarus-1.8.4/bin/lrstolfm had a zero exit code or showed the expected version
- /nix/store/4z8g46k0hjnys0cpbx5r41z55fb77495-lazarus-1.8.4/bin/updatepofiles passed the binary check.
- Warning: no invocation of /nix/store/4z8g46k0hjnys0cpbx5r41z55fb77495-lazarus-1.8.4/bin/.startlazarus-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/4z8g46k0hjnys0cpbx5r41z55fb77495-lazarus-1.8.4/bin/startlazarus had a zero exit code or showed the expected version
- 3 of 7 passed binary check by having a zero exit code.
- 1 of 7 passed binary check by having the new version present in output.
- found 1.8.4 with grep in /nix/store/4z8g46k0hjnys0cpbx5r41z55fb77495-lazarus-1.8.4
- directory tree listing: https://gist.github.com/5e07a7e98c27e3576c3b8ca055b8df48
- du listing: https://gist.github.com/001bda09b55e3f3c8178f9ffd4b3ee95
---
 pkgs/development/compilers/fpc/lazarus.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 0793a9d7ed0b..b8d93d944f11 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -8,10 +8,10 @@ stdenv, fetchurl
 let
   s =
   rec {
-    version = "1.8.2";
+    version = "1.8.4";
     versionSuffix = "";
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
-    sha256 = "06ajdnyba3v3d37mjq1yim96hsmbx1w5n695m5zlhjbydgw62a15";
+    sha256 = "1s8hdip973fc1lynklddl0mvg2jd2lzkfk8hzb8jlchs6jn0362s";
     name = "lazarus-${version}";
   };
   buildInputs = [

From 8cd4015b69a13dacd9cab21ee5d6f20fe4032078 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 14:26:23 -0700
Subject: [PATCH 2569/3370] imagemagick7: 7.0.7-32 -> 7.0.7-35

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/imagemagick/versions.

These checks were done:

- built on NixOS
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/animate passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/compare passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/composite passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/conjure passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/convert passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/display passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/identify passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/import passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/magick-script passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/mogrify passed the binary check.
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/montage passed the binary check.
- Warning: no invocation of /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/stream had a zero exit code or showed the expected version
- /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35/bin/magick passed the binary check.
- 12 of 13 passed binary check by having a zero exit code.
- 0 of 13 passed binary check by having the new version present in output.
- found 7.0.7-35 with grep in /nix/store/7wx9r73c0r0d9cccqjn5rfy1i9fkazx7-imagemagick-7.0.7-35
- directory tree listing: https://gist.github.com/416a1bac07dc41a682c21f3ef7014908
- du listing: https://gist.github.com/e9a89e0789ef0f799410b18f783e01fc
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 1a9bb44cabb6..9e97a1d755aa 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -14,8 +14,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.7-32";
-    sha256 = "1i3rvq0f4lq1las4g12ipfs6h5vyngwh5fllvynpci2lh32gd48j";
+    version = "7.0.7-35";
+    sha256 = "1gn4frzxa1v712pcwwkmi0m2a6gbrg2564dbxxr7130zc66licpz";
     patches = [];
   };
 in

From 03872eb10782e187141c5404ed835787c311634b Mon Sep 17 00:00:00 2001
From: Ben Creasy <ben@bencreasy.com>
Date: Sat, 26 May 2018 10:49:13 -0700
Subject: [PATCH 2570/3370] aescrypt: fix darwin build

---
 pkgs/tools/misc/aescrypt/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix
index d1125d572ee9..fea924d0fb05 100644
--- a/pkgs/tools/misc/aescrypt/default.nix
+++ b/pkgs/tools/misc/aescrypt/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1a1rs7xmbxh355qg3v02rln3gshvy3j6wkx4g9ir72l22mp6zkc7";
   };
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-liconv";
+
   preBuild = ''
+    substituteInPlace src/Makefile --replace "CC=gcc" "CC?=gcc"
     cd src
   '';
 
@@ -27,6 +30,6 @@ stdenv.mkDerivation rec {
     license     = licenses.gpl2;
     maintainers = with maintainers; [ lovek323 qknight ];
     platforms   = stdenv.lib.platforms.all;
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = with platforms; unix;
   };
 }

From 5ba34b84e5b5fcb7ae0023341e1d1df8b6f3e07f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 14:44:07 -0700
Subject: [PATCH 2571/3370] insomnia: 5.16.2 -> 5.16.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/insomnia/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/98c4q9sy1qvxivk5f5svimhm4q6il3d9-insomnia-5.16.6/bin/.insomnia-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/98c4q9sy1qvxivk5f5svimhm4q6il3d9-insomnia-5.16.6/bin/insomnia had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 5.16.6 with grep in /nix/store/98c4q9sy1qvxivk5f5svimhm4q6il3d9-insomnia-5.16.6
- directory tree listing: https://gist.github.com/b7175aec2a35af15cb56818c93443ad6
- du listing: https://gist.github.com/f6cf98c261dda8a0b0415186ee6963a9
---
 pkgs/development/web/insomnia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 6d1eb0dbe3eb..fbf76842c20e 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -15,11 +15,11 @@ let
   runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl openssl nghttp2 ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "5.16.2";
+  version = "5.16.6";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1sjcbi45n10lf69a48447lfbxxjib7v2isshaykz43qqasqqrd18";
+    sha256 = "1acad6gjrldd87nnv2hw558lzwy4c4ijh9jwjxnhz61jmdqvbmxw";
   };
 
   nativeBuildInputs = [ makeWrapper dpkg ];

From 388469e59ac627004346c4f6e5b2d30061823f9d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 May 2018 18:31:51 -0400
Subject: [PATCH 2572/3370] linux-copperhead: 4.14.42 -> 4.14.44

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
index f9af5e5f6026..85ad00efcd67 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-lts.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.14.42";
+  version = "4.14.44";
   revision = "a";
-  sha256 = "09j36qhxs1z2qcxlpscg8yrif4qvm5ipbh7n6gxg58150yg9sl05";
+  sha256 = "1alvhpwy9xzppwsag7qh1lkk3l4piyh2fv27w37il6gclja4dxkf";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From 4605fef14b712f5e0eac53a6fbadbca7cad6671e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 26 May 2018 18:32:07 -0400
Subject: [PATCH 2573/3370] linux-copperhead: 4.16.10.a -> 4.16.12.a

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

diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
index fea27b649f51..571b49245661 100644
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
+++ b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
@@ -3,9 +3,9 @@
 with stdenv.lib;
 
 let
-  version = "4.16.10";
+  version = "4.16.12";
   revision = "a";
-  sha256 = "1dd9zislrlv24mnvzm2j9rfxnfp93lgf0pi48zpdglw5xpfwqm49";
+  sha256 = "0gkgvhh2v5lca67xjmq512mqnfbln6lkk6hgigby2406b9w1b0sd";
 
   # modVersion needs to be x.y.z, will automatically add .0 if needed
   modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));

From b2aef187a9126b08a7412def833cbadb61d2f565 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 16:21:50 -0700
Subject: [PATCH 2574/3370] errbot: 5.1.3 -> 5.2.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/errbot/versions.

These checks were done:

- built on NixOS
- /nix/store/gfvsdshvr4135r231wzcl2n5if66r0ws-errbot-5.2.0/bin/.errbot-wrapped passed the binary check.
- /nix/store/gfvsdshvr4135r231wzcl2n5if66r0ws-errbot-5.2.0/bin/errbot passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 5.2.0 with grep in /nix/store/gfvsdshvr4135r231wzcl2n5if66r0ws-errbot-5.2.0
- directory tree listing: https://gist.github.com/92be0fef2042d15212f373d23ed09bcf
- du listing: https://gist.github.com/5ca847bd9354551d6e66ba1abc16d23f
---
 pkgs/applications/networking/errbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix
index feb6a0ab1265..f89b8206dbe6 100644
--- a/pkgs/applications/networking/errbot/default.nix
+++ b/pkgs/applications/networking/errbot/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "errbot-${version}";
-  version = "5.1.3";
+  version = "5.2.0";
 
   src = fetchurl {
     url = "mirror://pypi/e/errbot/${name}.tar.gz";
-    sha256 = "0nkfq6fx87g7kvxrb5lp8gkb75658cmyffnacpy8jq3a16py3jrr";
+    sha256 = "0q5fg113s3gnym38d4y5mlnxw6vrm388zw5mlapf7b2zgx34r053";
   };
 
   disabled = !pythonPackages.isPy3k;

From 681826c07b5efb6fa9ad71f64a22f291cdaffa92 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 17:24:58 -0700
Subject: [PATCH 2575/3370] calibre: 3.23.0 -> 3.24.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/calibre/versions.

These checks were done:

- built on NixOS
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibre passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-complete-wrapped_ had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibre-complete had a zero exit code or showed the expected version
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-customize-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibre-customize passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-debug-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibre-debug passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-parallel-wrapped_ had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibre-parallel had a zero exit code or showed the expected version
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-server-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibre-server passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-smtp-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibre-smtp passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-uninstall-wrapped_ had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibre-uninstall had a zero exit code or showed the expected version
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibredb-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/calibredb passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-convert-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/ebook-convert passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-device-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/ebook-device passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-edit-wrapped_ had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/ebook-edit had a zero exit code or showed the expected version
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-meta-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/ebook-meta passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-polish-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/ebook-polish passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-viewer-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/ebook-viewer passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.fetch-ebook-metadata-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/fetch-ebook-metadata passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.lrf2lrs-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/lrf2lrs passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.lrfviewer-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/lrfviewer passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.lrs2lrf-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/lrs2lrf passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.markdown-calibre-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/markdown-calibre passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.web2disk-wrapped_ passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/web2disk passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibre-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibre-complete-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-complete-wrapped had a zero exit code or showed the expected version
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibre-customize-wrapped-wrapped passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-customize-wrapped passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibre-debug-wrapped-wrapped passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-debug-wrapped passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibre-parallel-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-parallel-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibre-server-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-server-wrapped had a zero exit code or showed the expected version
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibre-smtp-wrapped-wrapped passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-smtp-wrapped passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibre-uninstall-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibre-uninstall-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..calibredb-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.calibredb-wrapped had a zero exit code or showed the expected version
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..ebook-convert-wrapped-wrapped passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-convert-wrapped passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..ebook-device-wrapped-wrapped passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-device-wrapped passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..ebook-edit-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-edit-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..ebook-meta-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-meta-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..ebook-polish-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-polish-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..ebook-viewer-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.ebook-viewer-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..fetch-ebook-metadata-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.fetch-ebook-metadata-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..lrf2lrs-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.lrf2lrs-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..lrfviewer-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.lrfviewer-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..lrs2lrf-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.lrs2lrf-wrapped had a zero exit code or showed the expected version
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..markdown-calibre-wrapped-wrapped passed the binary check.
- /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.markdown-calibre-wrapped passed the binary check.
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/..web2disk-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1/bin/.web2disk-wrapped had a zero exit code or showed the expected version
- 46 of 84 passed binary check by having a zero exit code.
- 0 of 84 passed binary check by having the new version present in output.
- found 3.24.1 with grep in /nix/store/3683in7idrj8nn6fpnhg0jppp9s0w1x7-calibre-3.24.1
- directory tree listing: https://gist.github.com/a9dce8c8de61ed296eb9518301e3f630
- du listing: https://gist.github.com/7cd13b5c8a3bb9ebd6e52f9628f6646a
---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 3c1f426fb1b6..68f95195b6e7 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.23.0";
+  version = "3.24.1";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0ds3i3dhkgpwa3c1lcq4zjmiaza8k9and0lbqqw4i6jrnpk691f9";
+    sha256 = "1hgjnw8ynvpcfry4vanz5f54sjq55pqidvyy47lz59cz0s8lx50b";
   };
 
   patches = [

From 7625a63be1be9df0edf09a5477b81042ac12ccad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 17:31:56 -0700
Subject: [PATCH 2576/3370] bind: 9.12.1-P2 -> 9.13.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bind/versions.

These checks were done:

- built on NixOS
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/delv passed the binary check.
- Warning: no invocation of /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/arpaname had a zero exit code or showed the expected version
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/named-rrchecker passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/mdig passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/ddns-confgen passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-cds passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-dsfromkey passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-importkey passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-keyfromlabel passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-keygen passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-revoke passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-settime passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-signzone passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/dnssec-verify passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/named passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/named-checkconf passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/named-checkzone passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/named-compilezone passed the binary check.
- Warning: no invocation of /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/named-journalprint had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/nsec3hash had a zero exit code or showed the expected version
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/rndc passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/rndc-confgen passed the binary check.
- /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0/bin/tsig-keygen passed the binary check.
- 20 of 23 passed binary check by having a zero exit code.
- 14 of 23 passed binary check by having the new version present in output.
- found 9.13.0 with grep in /nix/store/r1cixvndwyqb19jgmb29aa419m50k3gw-bind-9.13.0
- directory tree listing: https://gist.github.com/cce8ccd35ba6a74194713faac99c7162
- du listing: https://gist.github.com/4b634498f39d00b79aa3eef40c70008a
---
 pkgs/servers/dns/bind/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index d266f534d669..e384be1ef44b 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -6,14 +6,14 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.12.1-P2"; in
+let version = "9.13.0"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd";
+    sha256 = "1z2gyfps30skhhby1vlyxa7cbpla10b89z51dd4djdbiih49ki6a";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From 232bc96376842da70425cb166363856e8823ce48 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 27 May 2018 00:43:26 -0500
Subject: [PATCH 2577/3370] Revert "sqlite{,-analyzer}: use the same src
 (#40945)"

This reverts commit e28a586f94e77f22d943288ad84f88be23c587f8.
---
 .../development/libraries/sqlite/analyzer.nix | 18 +++++++++--
 .../libraries/sqlite/archive-version.nix      | 11 +++++++
 pkgs/development/libraries/sqlite/default.nix | 31 ++++++-------------
 3 files changed, 36 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/development/libraries/sqlite/archive-version.nix

diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix
index 2325a9c8d0db..a0b1220b217d 100644
--- a/pkgs/development/libraries/sqlite/analyzer.nix
+++ b/pkgs/development/libraries/sqlite/analyzer.nix
@@ -1,11 +1,23 @@
-{ stdenv, tcl, sqlite }:
+{ stdenv, fetchurl, unzip, sqlite, tcl }:
+
+let
+  archiveVersion = import ./archive-version.nix stdenv.lib;
+in
 
 stdenv.mkDerivation rec {
   name = "sqlite-analyzer-${version}";
-  inherit (sqlite) src version;
+  version = "3.23.1";
+
+  src = assert version == sqlite.version; fetchurl {
+    url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
+    sha256 = "1z3xr8d8ds4l8ndkg34cii13d0w790nlxdkrw6virinqi7wmmd1d";
+  };
+
+  nativeBuildInputs = [ unzip ];
+  buildInputs = [ tcl ];
 
-  nativeBuildInputs = [ tcl ];
   makeFlags = [ "sqlite3_analyzer" ];
+
   installPhase = "install -Dt $out/bin sqlite3_analyzer";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/sqlite/archive-version.nix b/pkgs/development/libraries/sqlite/archive-version.nix
new file mode 100644
index 000000000000..1f312ecef23a
--- /dev/null
+++ b/pkgs/development/libraries/sqlite/archive-version.nix
@@ -0,0 +1,11 @@
+lib: version:
+
+with lib;
+  
+let
+  fragments = splitString "." version;
+  major = head fragments;
+  minor = concatMapStrings (fixedWidthNumber 2) (tail fragments);
+in
+
+major + minor + "00"
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index 341474326480..eaeafa741297 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -1,40 +1,29 @@
-{ stdenv, fetchzip, tcl, zlib, interactive ? false, readline ? null, ncurses ? null }:
+{ stdenv, fetchurl, zlib, interactive ? false, readline ? null, ncurses ? null }:
 
 assert interactive -> readline != null && ncurses != null;
 
 with stdenv.lib;
 
 let
-  archiveVersion = version:
-    let
-      segments = splitString "." version;
-      major = head segments;
-      minor = concatMapStrings (fixedWidthNumber 2) (tail segments);
-    in
-    major + minor + "00";
+  archiveVersion = import ./archive-version.nix stdenv.lib;
 in
 
 stdenv.mkDerivation rec {
   name = "sqlite-${version}";
   version = "3.23.1";
 
-  src = fetchzip {
-    url = "https://sqlite.org/2018/sqlite-src-${archiveVersion version}.zip";
-    sha256 = "1dshxmiqdiympg1i2jsz3x543zmcgzhn78lpsjc0546rir0s0zk0";
+  # NB! Make sure to update analyzer.nix src (in the same directory).
+  src = fetchurl {
+    url = "https://sqlite.org/2018/sqlite-autoconf-${archiveVersion version}.tar.gz";
+    sha256 = "09ggapjhqjb2pzk0wkfczil77plijg3d77m2bpzlwx2y7ql2p14j";
   };
 
   outputs = [ "bin" "dev" "out" ];
   separateDebugInfo = stdenv.isLinux;
 
-  nativeBuildInputs = [ tcl ];
-  buildInputs = [ zlib ]
-    ++ optionals interactive [ readline ncurses ];
+  buildInputs = [ zlib ] ++ optionals interactive [ readline ncurses ];
 
-  configureFlags = [
-    # Disables libtclsqlite.so, tcl is still required for the build itself:
-    "--disable-tcl"
-    "--enable-threadsafe"
-  ] ++ optional interactive "--enable-readline";
+  configureFlags = [ "--enable-threadsafe" ] ++ optional interactive "--enable-readline";
 
   NIX_CFLAGS_COMPILE = [
     "-DSQLITE_ENABLE_COLUMN_METADATA"
@@ -72,9 +61,9 @@ stdenv.mkDerivation rec {
     # Necessary for FTS5 on Linux
     export NIX_LDFLAGS="$NIX_LDFLAGS -lm"
 
-    echo
+    echo ""
     echo "NIX_CFLAGS_COMPILE = $NIX_CFLAGS_COMPILE"
-    echo
+    echo ""
   '';
 
   meta = {

From 5380af738f7c3ed2889c2f8d4610525e88251616 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 27 May 2018 11:04:33 +0200
Subject: [PATCH 2578/3370] Revert "bind: 9.12.1-P2 -> 9.13.0"

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

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index e384be1ef44b..d266f534d669 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -6,14 +6,14 @@
 assert enableSeccomp -> libseccomp != null;
 assert enablePython -> python3 != null;
 
-let version = "9.13.0"; in
+let version = "9.12.1-P2"; in
 
 stdenv.mkDerivation rec {
   name = "bind-${version}";
 
   src = fetchurl {
     url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz";
-    sha256 = "1z2gyfps30skhhby1vlyxa7cbpla10b89z51dd4djdbiih49ki6a";
+    sha256 = "0a9dvyg1dk7vpqn9gz7p5jas3bz7z22bjd66b98g1qk16i2w7rqd";
   };
 
   outputs = [ "out" "lib" "dev" "man" "dnsutils" "host" ];

From 55f2889baeb98a650d19948e2db9c01ae7f94edf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 27 May 2018 02:11:45 -0700
Subject: [PATCH 2579/3370] QmidiNet: 0.5.0 -> 0.5.1 (#41045)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qmidinet/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/35mfmy2vrhd1535lbpfdz00mfpcc3rpi-qmidinet-0.5.1/bin/qmidinet had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.5.1 with grep in /nix/store/35mfmy2vrhd1535lbpfdz00mfpcc3rpi-qmidinet-0.5.1
- directory tree listing: https://gist.github.com/899bb536df375d3d1430d5c4883c0429
- du listing: https://gist.github.com/9492519fd9c0cb3b24bfda691ddb03ba
---
 pkgs/applications/audio/qmidinet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
index 831a30bc4fe2..6431a50ddd9a 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/applications/audio/qmidinet/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }:
 
 stdenv.mkDerivation rec {
-  version = "0.5.0";
+  version = "0.5.1";
   name = "qmidinet-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
-    sha256 = "0nxbvjgx11ljy1nxqknyq7pla55ky2ybi1jbisvq2cqxa34jsxf6";
+    sha256 = "1cvz8y63vdqfpxh7lq5qadqjcyhahbyq0py0qz6xrmpk5sxvy7ml";
   };
 
   hardeningDisable = [ "format" ];

From 9cec6df63002a601a5b19d01a5466d8c58b32400 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 27 May 2018 13:53:10 +0200
Subject: [PATCH 2580/3370] tdesktopPackages.preview: 1.2.23 -> 1.2.24

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index a8cfcfab5f9f..12b6179f8e1a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.23";
-    sha256Hash = "1ky2qg2ayqrf4r9v1sm70gssk39f3xwrq92s050g9hpr9bkvjkg8";
+    version = "1.2.24";
+    sha256Hash = "0rrji2h2a7fxdl4wmbwj053vwy3hhbaphymjim55klpzj86jycil";
   });
 }

From d90eea8cff60490249a614813a76ddd8afa517f8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 27 May 2018 06:02:45 -0700
Subject: [PATCH 2581/3370] python.pkgs.bokeh: fix name format (#41135)

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

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 1d2ccc2d5106..85653daaa40a 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -33,7 +33,6 @@
 
 buildPythonPackage rec {
   pname = "bokeh";
-  name = "${pname}${version}";
   version = "0.12.15";
 
   src = fetchPypi {

From 7ed15eed532a7d9cf267882d5f935f1b34a04622 Mon Sep 17 00:00:00 2001
From: Symphorien Gibol <symphorien+git@xlumurb.eu>
Date: Sun, 27 May 2018 15:13:23 +0200
Subject: [PATCH 2582/3370] teamspeak_client: fix startup

segfaults with qt5.10, downgrade to 5.9
tries to load its homegrown libqxcb.so which does not find some libs,
use nixpkgs libqxcb.so instead.
---
 .../networking/instant-messengers/teamspeak/client.nix         | 3 ++-
 pkgs/top-level/all-packages.nix                                | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index ea2030e964b9..23d2e640b4f0 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
       rm *.so.* *.so
       rm QtWebEngineProcess
       rm qt.conf
+      rm -r platforms # contains libqxcb.so
 
       # Install files.
       mkdir -p $out/lib/teamspeak
@@ -91,7 +92,7 @@ stdenv.mkDerivation rec {
 
       wrapProgram $out/bin/ts3client \
         --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
-        --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
+        --set QT_PLUGIN_PATH "${qtbase}/${qtbase.qtPluginPrefix}" \
         --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
     '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19e956e7a76..61680ab0511d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18133,7 +18133,7 @@ with pkgs;
     gconf = gnome2.GConf;
   };
 
-  teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
+  teamspeak_client = libsForQt59.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };
 
   uaskjuggler = callPackage ../applications/misc/taskjuggler { };

From b2317a0b870a6c80874b08b533416f7428a2c1ad Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 27 May 2018 09:12:52 -0700
Subject: [PATCH 2583/3370] libversion: init at 2.6.0

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

diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix
new file mode 100644
index 000000000000..6e7005195bf0
--- /dev/null
+++ b/pkgs/development/libraries/libversion/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, cmake }:
+
+let
+  version = "2.6.0";
+in
+stdenv.mkDerivation {
+  name = "libversion-${version}";
+
+  src = fetchFromGitHub {
+    owner = "repology";
+    repo = "libversion";
+    rev = version;
+    sha256 = "0krhfycva3l4rhac5kx6x1a6fad594i9i77vy52rwn37j62bm601";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "Advanced version string comparison library";
+    homepage = https://github.com/repology/libversion;
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ ryantm ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34fd1a7672be..5c4158d894d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10562,6 +10562,8 @@ with pkgs;
 
   libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { };
 
+  libversion = callPackage ../development/libraries/libversion { };
+
   libvirt = callPackage ../development/libraries/libvirt { };
 
   libvirt-glib = callPackage ../development/libraries/libvirt-glib { };

From 0163b98641be7a143a0d794c9f44fe1a11250fcb Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 27 May 2018 09:13:14 -0700
Subject: [PATCH 2584/3370] python.pkgs.rubymarshal: init at 1.0.3

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

diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix
new file mode 100644
index 000000000000..7184795639c4
--- /dev/null
+++ b/pkgs/development/python-modules/rubymarshal/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi, python, hypothesis }:
+
+buildPythonPackage rec {
+  pname = "rubymarshal";
+  version = "1.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "131lbc18s3rlmby2dpbvi4msz13gqw6xvx067mh4zcx9npygn9r2";
+  };
+
+  propagatedBuildInputs = [ hypothesis ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/d9pouces/RubyMarshal/;
+    description = "Read and write Ruby-marshalled data";
+    license = licenses.wtfpl;
+    maintainers = [ maintainers.ryantm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fdd0b3564669..fe167d56c111 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18195,6 +18195,8 @@ EOF
   pysdl2 = callPackage ../development/python-modules/pysdl2 { };
 
   pyogg = callPackage ../development/python-modules/pyogg { };
+
+  rubymarshal = callPackage ../development/python-modules/rubymarshal { };
 });
 
 in fix' (extends overrides packages)

From 05ea75f5c044be8c91e192b81ef20b3b8b8dda57 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 27 May 2018 09:14:00 -0700
Subject: [PATCH 2585/3370] python3.pkgs.libversion: init at 1.0.0

---
 .../python-modules/libversion/default.nix     | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/libversion/default.nix

diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix
new file mode 100644
index 000000000000..cf0a1a865a19
--- /dev/null
+++ b/pkgs/development/python-modules/libversion/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, python, pkgconfig, libversion, pythonOlder }:
+
+buildPythonPackage rec {
+  pname = "libversion";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18hhn7b7458lybs8z8ckh0idm7a2g4c4b5v2p9rr0lb618rchvds";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libversion ];
+
+  disabled = pythonOlder "3.6";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/repology/py-libversion;
+    description = "Python bindings for libversion, which provides fast, powerful and correct generic version string comparison algorithm";
+    license = licenses.mit;
+    maintainers = [ maintainers.ryantm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fe167d56c111..4a1ec911dbd4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16254,6 +16254,10 @@ EOF
     };
   };
 
+  libversion = callPackage ../development/python-modules/libversion {
+    inherit (pkgs) libversion;
+  };
+
   libvirt = callPackage ../development/python-modules/libvirt {
     inherit (pkgs) libvirt;
   };

From ec632ec3b6c2eb0bca14ea3e87c71479cc55bc50 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 27 May 2018 12:51:54 -0400
Subject: [PATCH 2586/3370] pythonPackages.keyrings-alt: 2.3 -> 3.1

---
 pkgs/development/python-modules/keyrings-alt/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index 140d4297cda5..643cb89920ce 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -1,15 +1,17 @@
 { stdenv, buildPythonPackage, fetchPypi, six
-, pytest, unittest2, mock, keyring
+, pytest, unittest2, mock, keyring, setuptools_scm
 }:
 
 buildPythonPackage rec {
   pname = "keyrings.alt";
-  version = "2.3";
+  version = "3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5cb9b6cdb5ce5e8216533e342d3e1b418ddd210466834061966d7dc1a4736f2d";
+    sha256 = "0nnva8g03dv6gdhjk1ihn2qw7g15232fyj8shipah9whgfv8d75m";
   };
+
+  nativeBuildInputs = [ setuptools_scm ];
   propagatedBuildInputs = [ six ];
 
   # Fails with "ImportError: cannot import name mock"

From 1e5190602509ef2a944b4add238ed2305352aeaa Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 27 May 2018 13:29:53 -0400
Subject: [PATCH 2587/3370] busybox: 1.28.3 -> 1.28.4

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

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index ab75d38ba716..e8972263f38d 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -33,14 +33,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "busybox-1.28.3";
+  name = "busybox-1.28.4";
 
   # Note to whoever is updating busybox: please verify that:
   # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test
   # still builds after the update.
   src = fetchurl {
     url = "http://busybox.net/downloads/${name}.tar.bz2";
-    sha256 = "0via6faqj9xcyi8r39r4n0wxlk8r2292yk0slzwrdri37w1j43dd";
+    sha256 = "0smfn8hlds6nx8war62kyaykg3n7mxbjjfcpsgz84znwk4v4mhg3";
   };
 
   hardeningDisable = [ "format" ] ++ lib.optionals enableStatic [ "fortify" ];

From 1e815b50c98355a1b5d7b9b00b3319dd00b51131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 27 May 2018 19:30:53 +0200
Subject: [PATCH 2588/3370] pythonPackages.keyrings-alt: run tests

---
 .../python-modules/keyrings-alt/default.nix          | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix
index 643cb89920ce..9f3fc8dc4d36 100644
--- a/pkgs/development/python-modules/keyrings-alt/default.nix
+++ b/pkgs/development/python-modules/keyrings-alt/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, buildPythonPackage, fetchPypi, six
-, pytest, unittest2, mock, keyring, setuptools_scm
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, six
+, pytest, pytest-flake8, backports_unittest-mock, keyring, setuptools_scm
 }:
 
 buildPythonPackage rec {
@@ -15,8 +15,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ six ];
 
   # Fails with "ImportError: cannot import name mock"
-  doCheck = false;
-  checkInputs = [ pytest unittest2 mock keyring ];
+  #doCheck = false;
+  checkInputs = [ pytest pytest-flake8 keyring ] ++ stdenv.lib.optional (pythonOlder "3.3") backports_unittest-mock;
+
+  checkPhase = ''
+    py.test
+  '';
 
   meta = with stdenv.lib; {
     license = licenses.mit;

From 6bde47d651643c18fa5295504daacfa6f7d84ec4 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 27 May 2018 13:58:52 -0400
Subject: [PATCH 2589/3370] pythonPackages.keyring: 12.0.2 -> 12.2.1 (#41142)

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

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 98295ff802fa..e773bf7436a0 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "keyring";
-  version = "12.0.2";
+  version = "12.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "445d9521b4fcf900e51c075112e25ddcf8af1db7d1d717380b64eda2cda84abc";
+    sha256 = "1zhg2a59rqgigl8apm4s39md6yf3f2v1d4bl6s5rmiigwfifm624";
   };
 
   nativeBuildInputs = [ setuptools_scm ];

From 3d9cd5d0c58ee35e1ef327f06b2f114e045569b6 Mon Sep 17 00:00:00 2001
From: Grigory Chereshnev <35115302+nonfreeblob@users.noreply.github.com>
Date: Sun, 27 May 2018 22:23:39 +0300
Subject: [PATCH 2590/3370] ivan: init at 052

---
 maintainers/maintainer-list.nix |  5 +++
 pkgs/games/ivan/default.nix     | 44 +++++++++++++++++++
 pkgs/games/ivan/homedir.patch   | 75 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 4 files changed, 126 insertions(+)
 create mode 100644 pkgs/games/ivan/default.nix
 create mode 100644 pkgs/games/ivan/homedir.patch

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 92a4a6e8b412..4c312316da4e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2770,6 +2770,11 @@
     github = "nocoolnametom";
     name = "Tom Doggett";
   };
+  nonfreeblob = {
+    email = "nonfreeblob@yandex.com";
+    github = "nonfreeblob";
+    name ="nonfreeblob";
+  };
   notthemessiah = {
     email = "brian.cohen.88@gmail.com";
     github = "notthemessiah";
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
new file mode 100644
index 000000000000..50b9f03d4bc9
--- /dev/null
+++ b/pkgs/games/ivan/default.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchFromGitHub, libpng, cmake, SDL2, SDL2_mixer, pkgconfig, pcre}:
+
+stdenv.mkDerivation rec {
+
+  name = "ivan-${version}";
+  version = "052";
+
+  src = fetchFromGitHub {
+    owner = "Attnam";
+    repo = "ivan";
+    rev = "v${version}";
+    sha256 = "1vvwb33jw4ppwsqlvaxq3b8npdzh9j9jfangyzszp5sfnnd7fj5b";
+  };
+
+  buildInputs = [SDL2 SDL2_mixer libpng pcre];
+
+  nativeBuildInputs = [cmake pkgconfig];
+
+  hardeningDisable = ["all"];
+  
+  # To store bone and high score files in ~/.ivan of the current user
+  patches = [./homedir.patch];
+
+  # Enable wizard mode
+  cmakeFlags = ["-DCMAKE_CXX_FLAGS=-DWIZARD"];
+
+  # Help CMake find SDL_mixer.h
+  NIX_CFLAGS_COMPILE = "-I${SDL2_mixer}/include/SDL2";
+
+  meta = with stdenv.lib; {
+    description = "Graphical roguelike game";
+    longDescription = ''
+      Iter Vehemens ad Necem (IVAN) is a graphical roguelike game, which currently
+      runs in Windows, DOS, Linux, and OS X. It features advanced bodypart and
+      material handling, multi-colored lighting and, above all, deep gameplay.
+
+      This is a fan continuation of IVAN by members of Attnam.com
+    '';
+    homepage = https://attnam.com/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [nonfreeblob];
+  };
+}
diff --git a/pkgs/games/ivan/homedir.patch b/pkgs/games/ivan/homedir.patch
new file mode 100644
index 000000000000..312099f7ffd9
--- /dev/null
+++ b/pkgs/games/ivan/homedir.patch
@@ -0,0 +1,75 @@
+diff --git a/FeLib/Include/hscore.h b/FeLib/Include/hscore.h
+index 4caf3ff..1a02845 100644
+--- a/FeLib/Include/hscore.h
++++ b/FeLib/Include/hscore.h
+@@ -31,11 +31,11 @@ class festring;
+ class highscore
+ {
+  public:
+-  highscore(cfestring& = HIGH_SCORE_FILENAME);
++  highscore();
+   truth Add(long, cfestring&);
+   void Draw() const;
+-  void Save(cfestring& = HIGH_SCORE_FILENAME) const;
+-  void Load(cfestring& = HIGH_SCORE_FILENAME);
++  void Save() const;
++  void Load();
+   truth LastAddFailed() const;
+   void AddToFile(highscore*) const;
+   truth MergeToFile(highscore*) const;
+diff --git a/FeLib/Source/hscore.cpp b/FeLib/Source/hscore.cpp
+index 2e5318d..ff9c174 100644
+--- a/FeLib/Source/hscore.cpp
++++ b/FeLib/Source/hscore.cpp
+@@ -23,7 +23,7 @@ cfestring& highscore::GetEntry(int I) const { return Entry[I]; }
+ long highscore::GetScore(int I) const { return Score[I]; }
+ long highscore::GetSize() const { return Entry.size(); }
+ 
+-highscore::highscore(cfestring& File) : LastAdd(0xFF), Version(HIGH_SCORE_VERSION) { Load(File); }
++highscore::highscore() : LastAdd(0xFF), Version(HIGH_SCORE_VERSION) { Load(); }
+ 
+ truth highscore::Add(long NewScore, cfestring& NewEntry,
+                      time_t NewTime, long NewRandomID)
+@@ -98,8 +98,12 @@ void highscore::Draw() const
+   List.Draw();
+ }
+ 
+-void highscore::Save(cfestring& File) const
++void highscore::Save() const
+ {
++  std::string buffer(getenv("HOME"));
++  buffer.append("/.ivan/ivan-highscore.scores");
++  cfestring& File = buffer.c_str();
++
+   outputfile HighScore(File);
+   long CheckSum = HIGH_SCORE_VERSION + LastAdd;
+   for(ushort c = 0; c < Score.size(); ++c)
+@@ -112,8 +116,12 @@ void highscore::Save(cfestring& File) const
+ }
+ 
+ /* This function needs much more error handling */
+-void highscore::Load(cfestring& File)
++void highscore::Load()
+ {
++  std::string buffer(getenv("HOME"));
++  buffer.append("/.ivan/ivan-highscore.scores");
++  cfestring& File = buffer.c_str();
++
+   {
+     inputfile HighScore(File, 0, false);
+ 
+diff --git a/Main/Source/game.cpp b/Main/Source/game.cpp
+index 8927305..c18e790 100644
+--- a/Main/Source/game.cpp
++++ b/Main/Source/game.cpp
+@@ -2380,7 +2380,9 @@ festring game::GetDataDir()
+ festring game::GetBoneDir()
+ {
+ #ifdef UNIX
+-  return LOCAL_STATE_DIR "/Bones/";
++  festring BoneDir;
++  BoneDir << getenv("HOME") << "/.ivan/Bones/";
++  return BoneDir;
+ #endif
+ 
+ #if defined(WIN32) || defined(__DJGPP__)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34fd1a7672be..e8e090a87499 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3159,6 +3159,8 @@ with pkgs;
   isync = callPackage ../tools/networking/isync { };
   isyncUnstable = callPackage ../tools/networking/isync/unstable.nix { };
 
+  ivan = callPackage ../games/ivan { };
+
   jaaa = callPackage ../applications/audio/jaaa { };
 
   jackett = callPackage ../servers/jackett {

From d6c4e3e8fb87da73ba38bfe73725618e460a25b0 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Sun, 27 May 2018 21:13:22 +0200
Subject: [PATCH 2591/3370] Mint-lang: Init at 2018.05.27

---
 .../development/compilers/mint/crystal2nix.cr | 27 +++++++++
 pkgs/development/compilers/mint/default.nix   | 59 +++++++++++++++++++
 pkgs/development/compilers/mint/shards.nix    | 42 +++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 130 insertions(+)
 create mode 100644 pkgs/development/compilers/mint/crystal2nix.cr
 create mode 100644 pkgs/development/compilers/mint/default.nix
 create mode 100644 pkgs/development/compilers/mint/shards.nix

diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/mint/crystal2nix.cr
new file mode 100644
index 000000000000..2ec8c92be3fb
--- /dev/null
+++ b/pkgs/development/compilers/mint/crystal2nix.cr
@@ -0,0 +1,27 @@
+require "yaml"
+
+File.open "shards.nix", "w+" do |file|
+  file.puts "{"
+  yaml = YAML.parse(File.read("shard.lock"))
+  yaml["shards"].each do |key, value|
+    file.puts "  #{key} = {"
+    file.puts %(    url = "https://github.com/#{value["github"]}";)
+    if value["commit"]?
+      file.puts %(    rev = "#{value["commit"]}";)
+    else
+      url = "https://github.com/#{value["github"]}"
+      ref = "v#{value["version"]}"
+
+      puts "git ls-remote #{url} #{ref}"
+      Process.run("git", args: ["ls-remote", url, ref]) do |x|
+        x.error.each_line { |e| puts e }
+        x.output.each_line { |o| value.as_h["commit"] = o.split("\t")[0] }
+      end
+
+      file.puts %(    rev = "#{value["commit"]};)
+    end
+
+    file.puts "  };"
+  end
+  file.puts "}"
+end
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
new file mode 100644
index 000000000000..853fa937bafb
--- /dev/null
+++ b/pkgs/development/compilers/mint/default.nix
@@ -0,0 +1,59 @@
+{stdenv, lib, remarshal, runCommand, crystal, zlib, openssl, duktape}:
+let
+  crystalPackages = lib.mapAttrs (name: src:
+    stdenv.mkDerivation {
+      name = lib.replaceStrings ["/"] ["-"] name;
+      src = fetchGit src;
+      phases = "installPhase";
+      installPhase = ''cp -r $src $out'';
+      passthru = { libName = name; };
+    }
+  ) (import ./shards.nix);
+
+  crystalLib = stdenv.mkDerivation {
+    name = "crystal-lib";
+    src = lib.attrValues crystalPackages;
+    libNames = lib.mapAttrsToList (k: v: [k v]) crystalPackages;
+    phases = "buildPhase";
+    buildPhase = ''
+      mkdir -p $out
+      linkup () {
+        while [ "$#" -gt 0 ]; do
+          ln -s $2 $out/$1
+          shift; shift
+        done
+      }
+      linkup $libNames
+    '';
+  };
+in
+stdenv.mkDerivation rec {
+  version = "2018-05-27";
+  name = "mint-${version}";
+  src = fetchGit {
+    url = "https://github.com/mint-lang/mint.git";
+    rev = "a3f0c86f54b8b3a18dda5c39c2089bdb1d774b4f";
+  };
+
+  buildInputs = [ crystal zlib openssl duktape ];
+
+  buildPhase = ''
+    mkdir -p $out/bin
+
+    mkdir tmp
+    cd tmp
+    ln -s ${crystalLib} lib
+    cp -r $src/* .
+    crystal build src/mint.cr -o $out/bin/mint --verbose --progress --release --no-debug
+  '';
+
+  installPhase = ''true'';
+
+  meta = {
+    description = "A refreshing language for the front-end web.";
+    homepage = https://mint-lang.com/;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ manveru ];
+    platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
new file mode 100644
index 000000000000..cac1bba5ccce
--- /dev/null
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -0,0 +1,42 @@
+{
+  admiral = {
+    url = "jwaldrip/admiral.cr";
+    rev = "07dde44b2d499c0a941b8da6270e1eac0baadcc2";
+  };
+  ameba = {
+    url = "veelenga/ameba";
+    rev = "7a4fcec5ce62ff92197014f67143c8112866cf8a";
+  };
+  baked_file_system = {
+    url = "schovi/baked_file_system";
+    rev = "22956aa79e889c241884017461e9dc79443d84d9";
+  };
+  duktape = {
+    url = "jessedoyle/duktape.cr";
+    rev = "0e59b56835da23068fe5bd5fbddb935cf0123b67";
+  };
+  kemal = {
+    url = "kemalcr/kemal";
+    rev = "17bd3dce3724b092fd1151cad126f5973da00204";
+  };
+  kilt = {
+    url = "jeromegn/kilt";
+    rev = "d177f02e124a197d22c4cc6d8dee7e1b33821bb1";
+  };
+  radix = {
+    url = "luislavena/radix";
+    rev = "4acb5cfbc304751d94201cdbca72947214af6ee1";
+  };
+  string_inflection = {
+    url = "mosop/string_inflection";
+    rev = "fe46a7269ff8183d4d24728fb24cfa576e89829e";
+  };
+  time_format = {
+    url = "vladfaust/time_format.cr";
+    rev = "30676d3712cb9a0a667c763c69912d801368f90d";
+  };
+  tree_template = {
+    url = "anykeyh/tree_template";
+    rev = "3fcb71ee6852040077dd1a2c8c55c67f4a95ba4e";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2a254244a2d..bbaf1e2fb819 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6770,6 +6770,8 @@ with pkgs;
 
   microscheme = callPackage ../development/compilers/microscheme { };
 
+  mint = callPackage ../development/compilers/mint { };
+
   mitscheme = callPackage ../development/compilers/mit-scheme {
    texLive = texlive.combine { inherit (texlive) scheme-small; };
    texinfo = texinfo5;

From 29950fe57b92fc53a7682e58a352a2dce7d6321b Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 27 May 2018 22:24:10 +0200
Subject: [PATCH 2592/3370] spring: Fix stdlib.h: No such file or directory

include_next fatal error: stdlib.h: No such file or directory
The fix is the same as here and works:
https://github.com/NixOS/nixpkgs/pull/28748

It seams to have to do with header paths.
---
 pkgs/games/spring/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 3bb69359f162..610998b34347 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip
 , openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils
 , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper
-, jdk ? null, python ? null, systemd, libunwind, glibc, which, minizip
+, jdk ? null, python ? null, systemd, libunwind, which, minizip
 , withAI ? true # support for AI Interfaces and Skirmish AIs
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2
     xorg.libX11 xorg.libXcursor libGLU_combined glew asciidoc libxslt docbook_xsl curl makeWrapper
-    docbook_xsl_ns systemd libunwind glibc.dev glibc.static which minizip ]
+    docbook_xsl_ns systemd libunwind which minizip ]
     ++ stdenv.lib.optional withAI jdk
     ++ stdenv.lib.optional withAI python;
 
@@ -50,6 +50,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
     platforms = platforms.linux;
-    broken = true;
   };
 }

From 4922268077d9485a69fa836fe170e3497b5455fa Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 27 May 2018 22:41:06 +0200
Subject: [PATCH 2593/3370] libftdi1: fix build when docs are enabled

---
 pkgs/development/libraries/libftdi/1.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index d54b05b1c828..c6deb1fc9291 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
     ++ optionals pythonSupport [ python swig ]
     ++ optionals docSupport [ doxygen ];
 
+  preBuild = stdenv.lib.optionalString docSupport ''
+    make doc_i
+  '';
+
   propagatedBuildInputs = [ libusb1 ];
 
   postInstall = ''

From 34c116ab128be144217d020bf992918b71d7c455 Mon Sep 17 00:00:00 2001
From: Herman Fries <baracoder@googlemail.com>
Date: Sun, 27 May 2018 22:42:19 +0200
Subject: [PATCH 2594/3370] spring: 103.0 -> 104.0

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

diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 610998b34347..9ce5c7db83fb 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -8,11 +8,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "103.0";
+  version = "104.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "1fmnwk8ig36429pkp1rafzg4hyzp7i6mwy27p7fdxrdj1q4blx9l";
+    sha256 = "05pclcbw7v481pqz7bgirlk37494hy4hx4jghhnlzhdaz1cvzc6f";
   };
 
   # The cmake included module correcly finds nix's glew, however

From f0d6411c22d91723fef3f935adf35c7884a4dc76 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 27 May 2018 22:45:41 +0200
Subject: [PATCH 2595/3370] pythonPackages.pathlib2: fix build by removing
 obsolete test removal

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

diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix
index 7ba0966de025..412186e6075b 100644
--- a/pkgs/development/python-modules/pathlib2/default.nix
+++ b/pkgs/development/python-modules/pathlib2/default.nix
@@ -22,7 +22,6 @@ if !(pythonOlder "3.4") then null else buildPythonPackage rec {
 
   preCheck = ''
     export LC_ALL="en_US.UTF-8"
-    sed -i test_pathlib2.py -e "s@hasattr(pwd, 'getpwall')@False@"
   '';
 
   meta = {

From 4f7c9186f0c838555f00e28cd46588744a8c2f86 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Sun, 27 May 2018 22:41:44 +0200
Subject: [PATCH 2596/3370] Switch to fetchgit

---
 .../development/compilers/mint/crystal2nix.cr | 40 +++++++++-------
 pkgs/development/compilers/mint/default.nix   |  7 +--
 pkgs/development/compilers/mint/shards.nix    | 48 +++++++++++--------
 3 files changed, 56 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/mint/crystal2nix.cr
index 2ec8c92be3fb..5d92ae4afeae 100644
--- a/pkgs/development/compilers/mint/crystal2nix.cr
+++ b/pkgs/development/compilers/mint/crystal2nix.cr
@@ -1,27 +1,33 @@
 require "yaml"
+require "json"
+
+class PrefetchJSON
+  JSON.mapping(sha256: String)
+end
 
 File.open "shards.nix", "w+" do |file|
-  file.puts "{"
+  file.puts %({)
   yaml = YAML.parse(File.read("shard.lock"))
   yaml["shards"].each do |key, value|
-    file.puts "  #{key} = {"
-    file.puts %(    url = "https://github.com/#{value["github"]}";)
-    if value["commit"]?
-      file.puts %(    rev = "#{value["commit"]}";)
-    else
-      url = "https://github.com/#{value["github"]}"
-      ref = "v#{value["version"]}"
+    url = "https://github.com/#{value["github"]}"
+    rev = if value["version"]?
+            "v#{value["version"]}"
+          else
+            value["commit"].as_s
+          end
 
-      puts "git ls-remote #{url} #{ref}"
-      Process.run("git", args: ["ls-remote", url, ref]) do |x|
-        x.error.each_line { |e| puts e }
-        x.output.each_line { |o| value.as_h["commit"] = o.split("\t")[0] }
-      end
-
-      file.puts %(    rev = "#{value["commit"]};)
+    sha256 = ""
+    args = ["--url", url, "--rev", rev]
+    Process.run("nix-prefetch-git", args: args) do |x|
+      x.error.each_line { |e| puts e }
+      sha256 = PrefetchJSON.from_json(x.output).sha256
     end
 
-    file.puts "  };"
+    file.puts %(  #{key} = {)
+    file.puts %(    url = "#{url}";)
+    file.puts %(    rev = "#{rev}";)
+    file.puts %(    sha256 = "#{sha256}";)
+    file.puts %(  };)
   end
-  file.puts "}"
+  file.puts %(})
 end
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 853fa937bafb..f28b7db3a56d 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -1,9 +1,9 @@
-{stdenv, lib, remarshal, runCommand, crystal, zlib, openssl, duktape}:
+{stdenv, lib, fetchgit, crystal, zlib, openssl, duktape}:
 let
   crystalPackages = lib.mapAttrs (name: src:
     stdenv.mkDerivation {
       name = lib.replaceStrings ["/"] ["-"] name;
-      src = fetchGit src;
+      src = fetchgit src;
       phases = "installPhase";
       installPhase = ''cp -r $src $out'';
       passthru = { libName = name; };
@@ -30,9 +30,10 @@ in
 stdenv.mkDerivation rec {
   version = "2018-05-27";
   name = "mint-${version}";
-  src = fetchGit {
+  src = fetchgit {
     url = "https://github.com/mint-lang/mint.git";
     rev = "a3f0c86f54b8b3a18dda5c39c2089bdb1d774b4f";
+    sha256 = "1bgs6jkwfc2ksq4gj55cl3h2l5g25f5bwlsjryiw9cbx5k4bp1kz";
   };
 
   buildInputs = [ crystal zlib openssl duktape ];
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index cac1bba5ccce..ba42006c461a 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -1,42 +1,52 @@
 {
   admiral = {
-    url = "jwaldrip/admiral.cr";
-    rev = "07dde44b2d499c0a941b8da6270e1eac0baadcc2";
+    url = "https://github.com/jwaldrip/admiral.cr";
+    rev = "v1.6.1";
+    sha256 = "0y30b9b9rkz43afd3b9l24hs0r170qyc07r05kvydbv89376c53i";
   };
   ameba = {
-    url = "veelenga/ameba";
-    rev = "7a4fcec5ce62ff92197014f67143c8112866cf8a";
+    url = "https://github.com/veelenga/ameba";
+    rev = "v0.6.0";
+    sha256 = "16jfyrkfc909h16si513lw944qp3dyapymczcqc2ic0jaal0af5b";
   };
   baked_file_system = {
-    url = "schovi/baked_file_system";
-    rev = "22956aa79e889c241884017461e9dc79443d84d9";
+    url = "https://github.com/schovi/baked_file_system";
+    rev = "v0.9.6";
+    sha256 = "06cpriaizp5pcqwdq3jl2lm4sz9b2gcxg3a9q3lh0fqk2acajzmx";
   };
   duktape = {
-    url = "jessedoyle/duktape.cr";
-    rev = "0e59b56835da23068fe5bd5fbddb935cf0123b67";
+    url = "https://github.com/jessedoyle/duktape.cr";
+    rev = "v0.13.0";
+    sha256 = "0v0nckprgr7idmsx97g98as1a7z4hmlmwl924dbbaqvyslv5ls6w";
   };
   kemal = {
-    url = "kemalcr/kemal";
-    rev = "17bd3dce3724b092fd1151cad126f5973da00204";
+    url = "https://github.com/kemalcr/kemal";
+    rev = "v0.22.0";
+    sha256 = "0gq3c27grgh90fykbj9fdsz507lwd41gk686qfnig6npndqv1v10";
   };
   kilt = {
-    url = "jeromegn/kilt";
-    rev = "d177f02e124a197d22c4cc6d8dee7e1b33821bb1";
+    url = "https://github.com/jeromegn/kilt";
+    rev = "v0.4.0";
+    sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k";
   };
   radix = {
-    url = "luislavena/radix";
-    rev = "4acb5cfbc304751d94201cdbca72947214af6ee1";
+    url = "https://github.com/luislavena/radix";
+    rev = "v0.3.8";
+    sha256 = "1kn2xxj8a8j6f6g1dr0s9mkrj1xqnpzw9wnbq24mbv8ach9a1hva";
   };
   string_inflection = {
-    url = "mosop/string_inflection";
-    rev = "fe46a7269ff8183d4d24728fb24cfa576e89829e";
+    url = "https://github.com/mosop/string_inflection";
+    rev = "v0.2.1";
+    sha256 = "10vkr28h7n53ijjv57ldxhh473086qg313lzs55a7wsh0zgc104m";
   };
   time_format = {
-    url = "vladfaust/time_format.cr";
-    rev = "30676d3712cb9a0a667c763c69912d801368f90d";
+    url = "https://github.com/vladfaust/time_format.cr";
+    rev = "v0.1.0";
+    sha256 = "1f3rssdlcw2a5f74qa8bzlf1rh5dzvyg1d32w9qlisf2cc4lkh9g";
   };
   tree_template = {
-    url = "anykeyh/tree_template";
+    url = "https://github.com/anykeyh/tree_template";
     rev = "3fcb71ee6852040077dd1a2c8c55c67f4a95ba4e";
+    sha256 = "04w89wpnkna4ipyy3pxshqqwgk965hz1d31vqp0mrb0ilmpsywdk";
   };
 }

From e52c4230621c58d54c9a785224d9abf71cee544c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 28 May 2018 00:10:04 +0200
Subject: [PATCH 2597/3370] python.pkgs.transitions: 0.6.5 -> 0.6.8

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

diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix
index 4bda41dd66b9..e72f00846585 100644
--- a/pkgs/development/python-modules/transitions/default.nix
+++ b/pkgs/development/python-modules/transitions/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "transitions";
-  version = "0.6.5";
+  version = "0.6.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f72b6c5fcac3d1345bbf829e1a48a810255bcb4fc2c11a634af68107c378c1be";
+    sha256 = "155de243bd935959ae66cdab5c4c1a92f2bbf48555c6f994365935a0a9fffc1b";
   };
 
   postPatch = ''

From cd8d9fd82c3d14bac12feb31cacda732dcaa4418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Mon, 28 May 2018 00:16:27 +0200
Subject: [PATCH 2598/3370] python.pkgs.moto: fix build

add responses to propagatedBuildInputs
---
 pkgs/development/python-modules/moto/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index a0269e92d086..e268e92cc42e 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, jinja2, werkzeug, flask
-, requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker
+, requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses
 , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml }:
 
 buildPythonPackage rec {
@@ -40,6 +40,7 @@ buildPythonPackage rec {
     jsondiff
     botocore
     docker
+    responses
   ];
 
   checkInputs = [ boto3 nose sure freezegun ];

From d2130cd8b60603e357ed77070df4c774359f2773 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Mon, 7 May 2018 15:21:08 -0700
Subject: [PATCH 2599/3370] minikube: remove kubernetes dependency

---
 .../networking/cluster/minikube/default.nix       | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 2ba7bebc0c61..da951f00a0ed 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,10 +1,7 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, kubernetes, libvirt, qemu, docker-machine-kvm,
+{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu, docker-machine-kvm,
   gpgme, makeWrapper, hostPlatform, vmnet }:
 
-let
-  binPath = [ kubernetes ]
-    ++ stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [];
+let binPath = stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ];
 
   # Normally, minikube bundles localkube in its own binary via go-bindata. Unfortunately, it needs to make that localkube
   # a static linux binary, and our Linux nixpkgs go compiler doesn't seem to work when asking for a cgo binary that's static
@@ -38,9 +35,7 @@ in buildGoPackage rec {
     ./localkube.patch
   ];
 
-  # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
-  # that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions
-  buildInputs = [ go-bindata makeWrapper kubernetes gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
+  buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
   subPackages = [ "cmd/minikube" ];
 
   preBuild = ''
@@ -64,9 +59,9 @@ in buildGoPackage rec {
 
   postInstall = ''
     mkdir -p $bin/share/bash-completion/completions/
-    MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube
+    MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion bash > $bin/share/bash-completion/completions/minikube
     mkdir -p $bin/share/zsh/site-functions/
-    MINIKUBE_WANTUPDATENOTIFICATION=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube
+    MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube
   '';
 
   postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}";

From 4e31cf18496b6ebb6adfeb20afc4573c1ec5f2b7 Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Tue, 8 May 2018 14:20:11 -0700
Subject: [PATCH 2600/3370] minikube: set version of vendored kubernetes
 libraries

This gives a valid default version when minikube attempts to download
localkube, kubeadm, and other binaries, and makes downloading and vendoring
localkube as binary data unnecessary.
---
 .../networking/cluster/minikube/default.nix   | 30 ++++---------------
 .../cluster/minikube/localkube.patch          | 20 -------------
 2 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/applications/networking/cluster/minikube/localkube.patch

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index da951f00a0ed..e9dddecc1603 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -1,22 +1,8 @@
 { stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu, docker-machine-kvm,
-  gpgme, makeWrapper, hostPlatform, vmnet }:
+  gpgme, makeWrapper, hostPlatform, vmnet, python }:
 
 let binPath = stdenv.lib.optionals stdenv.isLinux [ libvirt qemu docker-machine-kvm ];
 
-  # Normally, minikube bundles localkube in its own binary via go-bindata. Unfortunately, it needs to make that localkube
-  # a static linux binary, and our Linux nixpkgs go compiler doesn't seem to work when asking for a cgo binary that's static
-  # (presumably because we don't have some static system libraries it wants), and cross-compiling cgo on Darwin is a nightmare.
-  #
-  # Note that minikube can download (and cache) versions of localkube it needs on demand. Unfortunately, minikube's knowledge
-  # of where it can download versions of localkube seems to rely on a json file that doesn't get updated as often as we'd like. So
-  # instead, we download localkube ourselves and shove it into the minikube binary. The versions URL that minikube uses is
-  # currently https://storage.googleapis.com/minikube/k8s_releases.json
-
-  localkube-version = "1.10.0";
-  localkube-binary = fetchurl {
-    url = "https://storage.googleapis.com/minikube/k8sReleases/v${localkube-version}/localkube-linux-amd64";
-    sha256 = "02lkl2g274689h07pkcwnxn04swy6aa3f2z77n421mx38bbq2kpd";
-  };
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
@@ -31,28 +17,24 @@ in buildGoPackage rec {
     sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
   };
 
-  patches = [
-    ./localkube.patch
-  ];
-
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
   subPackages = [ "cmd/minikube" ];
 
   preBuild = ''
     pushd go/src/${goPackagePath} >/dev/null
 
-    mkdir -p out
-    cp ${localkube-binary} out/localkube
-
-    go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets ./out/localkube deploy/addons/...
+    go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/...
 
     ISO_VERSION=$(grep "^ISO_VERSION" Makefile | sed "s/^.*\s//")
     ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//")
+    KUBERNETES_VERSION=$(${python}/bin/python hack/get_k8s_version.py --k8s-version-only 2>&1) || true
 
     export buildFlagsArray="-ldflags=\
       -X k8s.io/minikube/pkg/version.version=v${version} \
       -X k8s.io/minikube/pkg/version.isoVersion=$ISO_VERSION \
-      -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET"
+      -X k8s.io/minikube/pkg/version.isoPath=$ISO_BUCKET \
+      -X k8s.io/minikube/vendor/k8s.io/client-go/pkg/version.gitVersion=$KUBERNETES_VERSION \
+      -X k8s.io/minikube/vendor/k8s.io/kubernetes/pkg/version.gitVersion=$KUBERNETES_VERSION"
 
     popd >/dev/null
   '';
diff --git a/pkgs/applications/networking/cluster/minikube/localkube.patch b/pkgs/applications/networking/cluster/minikube/localkube.patch
deleted file mode 100644
index 2d69cded555f..000000000000
--- a/pkgs/applications/networking/cluster/minikube/localkube.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/pkg/minikube/bootstrapper/localkube/localkube.go b/pkg/minikube/bootstrapper/localkube/localkube.go
-index 1c4b5000..c9f120d4 100644
---- a/pkg/minikube/bootstrapper/localkube/localkube.go
-+++ b/pkg/minikube/bootstrapper/localkube/localkube.go
-@@ -113,14 +113,9 @@ func (lk *LocalkubeBootstrapper) UpdateCluster(config bootstrapper.KubernetesCon
-
- 	copyableFiles := []assets.CopyableFile{}
- 	var localkubeFile assets.CopyableFile
--	var err error
-
- 	//add url/file/bundled localkube to file list
--	lCacher := localkubeCacher{config}
--	localkubeFile, err = lCacher.fetchLocalkubeFromURI()
--	if err != nil {
--		return errors.Wrap(err, "Error updating localkube from uri")
--	}
-+	localkubeFile = assets.NewBinDataAsset("out/localkube", "/usr/local/bin/", "localkube", "0777")
- 	copyableFiles = append(copyableFiles, localkubeFile)
-
- 	// user added files

From a797bd6bdab7f7f9b9c1ec7efbd7264d1d7aa24c Mon Sep 17 00:00:00 2001
From: Nick Novitski <nick@expo.io>
Date: Mon, 7 May 2018 19:38:29 -0700
Subject: [PATCH 2601/3370] minikube: build hyperkit driver on darwin

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

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index e9dddecc1603..97bcb1bd1b4d 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -18,7 +18,7 @@ in buildGoPackage rec {
   };
 
   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
-  subPackages = [ "cmd/minikube" ];
+  subPackages = [ "cmd/minikube" ] ++ stdenv.lib.optional hostPlatform.isDarwin "cmd/drivers/hyperkit";
 
   preBuild = ''
     pushd go/src/${goPackagePath} >/dev/null
@@ -46,7 +46,11 @@ in buildGoPackage rec {
     MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $bin/bin/minikube completion zsh > $bin/share/zsh/site-functions/_minikube
   '';
 
-  postFixup = "wrapProgram $bin/bin/${pname} --prefix PATH : ${stdenv.lib.makeBinPath binPath}";
+  postFixup = ''
+    wrapProgram $bin/bin/${pname} --prefix PATH : $bin/bin:${stdenv.lib.makeBinPath binPath}
+  '' + stdenv.lib.optionalString hostPlatform.isDarwin ''
+    mv $bin/bin/hyperkit $bin/bin/docker-machine-driver-hyperkit
+  '';
 
   meta = with stdenv.lib; {
     homepage    = https://github.com/kubernetes/minikube;

From 7b744c928767b4c3348fa0542f6918fef2162dc8 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sun, 27 May 2018 20:13:50 -0400
Subject: [PATCH 2602/3370] dbeaver: 5.0.5 -> 5.0.6

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index 23b98200d142..b7acd297d3ee 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.0.5";
+  version = "5.0.6";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "1rcskrv8d3rjcfcn1sxzcaxnvmzgdsbjc9m11li8i4rln712ysza";
+    sha256 = "12crrazlfzvr1c6y33z7v4z7ip9pjbzki8cw15v5d2irkpa710ky";
   };
 
   installPhase = ''

From 9f6af81c3e6f783aa7b6a4f88998893fb6e78fc9 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 28 May 2018 13:12:55 +0800
Subject: [PATCH 2603/3370] go-ethereum: 1.8.6 -> 1.8.8

---
 pkgs/applications/altcoins/go-ethereum.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix
index a47b7fa3168f..021764f5023f 100644
--- a/pkgs/applications/altcoins/go-ethereum.nix
+++ b/pkgs/applications/altcoins/go-ethereum.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "go-ethereum-${version}";
-  version = "1.8.6";
+  version = "1.8.8";
   goPackagePath = "github.com/ethereum/go-ethereum";
 
   # Fix for usb-related segmentation faults on darwin
@@ -27,7 +27,7 @@ buildGoPackage rec {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    sha256 = "1n6f34r7zlc64l1q8xzcjk5sljdznjwp81d9naapprhpqb8g01gl";
+    sha256 = "059nd2jvklziih679dd4cd34xjpj1ci7fha83wv86xjz61awyb16";
   };
 
   meta = with stdenv.lib; {

From 8714a30e4c9cdc56bdeceddb0ab10777ccddc82b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 28 May 2018 11:09:25 +0200
Subject: [PATCH 2604/3370] olm: fix build by disabling _FORTIFY_SOURCE

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

diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix
index e044a7bde423..7b10db9245c5 100644
--- a/pkgs/development/libraries/olm/default.nix
+++ b/pkgs/development/libraries/olm/default.nix
@@ -18,5 +18,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
+  # requires optimisation but memory operations are compiled with -O0
+  hardeningDisable = ["fortify"];
+
   installFlags = "PREFIX=$(out)";
 }

From 0e97d7112626108b5def25bb18f0a8f4f9884b65 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 28 May 2018 09:55:17 +0000
Subject: [PATCH 2605/3370] typora: fix gsettings error (#41125)

---
 pkgs/applications/editors/typora/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index ed4aefd90bc5..3513888f74fb 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gtk3, atk, cairo
-, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev }:
+{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo
+, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
       gnome2.gtk
       gnome2.gdk_pixbuf
       gnome2.pango
+      gnome3.defaultIconTheme
       expat
       gtk3
       atk
@@ -51,6 +52,9 @@ stdenv.mkDerivation rec {
       xorg.libXScrnSaver
   ];
 
+  nativeBuildInputs = [ wrapGAppsHook ];
+
+  dontWrapGApps = true;
 
   buildInputs = [ dpkg makeWrapper ];
 
@@ -72,7 +76,13 @@ stdenv.mkDerivation rec {
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "$out/share/typora:${rpath}" "$out/share/typora/Typora"
 
-    ln -s "$out/share/typora/Typora" "$out/bin/typora"
+    makeWrapper $out/share/typora/Typora $out/bin/typora
+
+    wrapProgram $out/bin/typora \
+      "''${gappsWrapperArgs[@]}" \
+      --suffix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+      --set XDG_RUNTIME_DIR "XDG-RUNTIME-DIR" \
+      --prefix XDG_DATA_DIRS : "${gnome3.defaultIconTheme}/share"
 
     # Fix the desktop link
     substituteInPlace $out/share/applications/typora.desktop \

From 347cc5015c57b3002b07ba7b568d37433e0636a8 Mon Sep 17 00:00:00 2001
From: wucke13 <wucke13@gmail.com>
Date: Mon, 28 May 2018 11:56:35 +0200
Subject: [PATCH 2606/3370] s-tar: init at 1.5.3 (#40771)

---
 maintainers/maintainer-list.nix        |  5 ++++
 pkgs/tools/archivers/s-tar/default.nix | 35 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/archivers/s-tar/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 92a4a6e8b412..a1997c2f765d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4141,6 +4141,11 @@
     github = "wscott";
     name = "Wayne Scott";
   };
+  wucke13 = {
+    email = "info@wucke13.de";
+    github = "wucke13";
+    name = "Wucke";
+  };
   wyvie = {
     email = "elijahrum@gmail.com";
     github = "wyvie";
diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix
new file mode 100644
index 000000000000..de25d00cf21a
--- /dev/null
+++ b/pkgs/tools/archivers/s-tar/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "s-tar-${version}";
+  version = "1.5.3";
+  src = fetchurl {
+    url = "mirror://sourceforge/s-tar/star-${version}.tar.bz2";
+    sha256 = "0nsg3adv8lwqsbizicgmyxx8w26d1f4almprkcb08cd87s1l40q7";
+  };
+
+  preConfigure = "rm configure";
+  preBuild = "sed 's_/bin/__g' -i RULES/*";
+  makeFlags = [ "GMAKE_NOWARN=true" ];
+  installFlags = [ "DESTDIR=$(out)" "INS_BASE=/" ];
+  postInstall = ''
+    find $out/bin -type l -delete
+    rm -r $out/etc $out/include $out/sbin
+  '';
+
+  meta = {
+    description = "A very fast tar like tape archiver with improved functionality";
+    longDescription = ''
+      Star archives and extracts multiple files to and from a single file called a tarfile.
+      A tarfile is usually a magnetic tape, but it can be any file.
+      In all cases, appearance of a directory name refers to the files and (recursively) sub-directories of that directory.
+      Star's actions are controlled by the mandatory command flags from the list below.
+      The way star acts may be modified by additional options.
+      Note that unpacking tar archives may be a security risk because star may overwrite existing files.
+    '';
+    homepage = http://cdrtools.sourceforge.net/private/star.html;
+    license = stdenv.lib.licenses.cddl;
+    maintainers = [ stdenv.lib.maintainers.wucke13 ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a67e23404a47..972052dab5e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2146,6 +2146,8 @@ with pkgs;
 
   mcrcon = callPackage ../tools/networking/mcrcon {};
 
+  s-tar = callPackages ../tools/archivers/s-tar {};
+
   tealdeer = callPackage ../tools/misc/tealdeer/default.nix { };
 
   uudeview = callPackage ../tools/misc/uudeview { };

From 938705cd1fd31b5def3ce63e60c9e09566ad1a25 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 28 May 2018 10:10:04 +0000
Subject: [PATCH 2607/3370] franz: gnome2 cleanup (#41157)

---
 .../networking/instant-messengers/franz/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 75df17bd5b01..12b4bb54cfc6 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
-, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
-, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
+, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
+, gnome3, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -33,8 +33,8 @@ in stdenv.mkDerivation rec {
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
     libXrender libX11 libXtst libXScrnSaver
   ]) ++ [
-    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
-    gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
+    gnome3.gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    gnome3.gconf nss nspr alsaLib cups expat stdenv.cc.cc
   ];
   runtimeDependencies = [ udev.lib libnotify ];
 

From e1b501a7f66f5b9ead02db1240da27fc2bb5c6f6 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 28 May 2018 10:53:20 +0000
Subject: [PATCH 2608/3370] signal-desktop: gnome2 cleanup (#41156)

---
 .../instant-messengers/signal-desktop/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index ca13a8811763..8258fa315dbc 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, gnome2, atk, cairo, gdk_pixbuf, glib, freetype,
+{ stdenv, lib, fetchurl, dpkg, gnome3, atk, cairo, pango, gdk_pixbuf, glib, freetype,
 fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
 libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
 nspr, alsaLib, cups, expat, udev
@@ -15,9 +15,9 @@ let
     freetype
     gdk_pixbuf
     glib
-    gnome2.GConf
-    gnome2.gtk
-    gnome2.pango
+    gnome3.gconf
+    gnome3.gtk2
+    pango
     libX11
     libXScrnSaver
     libXcomposite

From a6519a26764e91b1a1ee21ee378808081501d214 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?=
 <sebastien.maret@univ-grenoble-alpes.fr>
Date: Mon, 28 May 2018 11:30:38 +0200
Subject: [PATCH 2609/3370] Add my name to the maintainer list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a1997c2f765d..107baf2aca98 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3536,6 +3536,11 @@
     github = "sleexyz";
     name = "Sean Lee";
   };
+  smaret = {
+    email = "sebastien.maret@icloud.com";
+    github = "smaret";
+    name = "Sébastien Maret";
+  };
   smironov = {
     email = "grrwlf@gmail.com";
     github = "grwlf";

From 9a76a33e356c12f3bcc0720a19ef1fa6157063dd Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Mon, 28 May 2018 13:10:14 +0200
Subject: [PATCH 2610/3370] dotnetPackages.Boogie: use a recent NUnit

---
 pkgs/top-level/dotnet-packages.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index ca4469e9e998..ed34f7984184 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -309,7 +309,17 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       sha256 = "1mjnf96hbn9abgzyvmrfxlhnm213290xb9wca7rnnl12i4fa4ahl";
     };
 
-    buildInputs = [ dotnetPackages.NUnitRunners ];
+    # emulate `nuget restore Source/Boogie.sln`
+    # which installs in $srcdir/Source/packages
+    preBuild = ''
+      mkdir -p Source/packages/NUnit.2.6.3
+      ln -sn ${dotnetPackages.NUnit}/lib/dotnet/NUnit Source/packages/NUnit.2.6.3/lib
+    '';
+
+    buildInputs = [
+      dotnetPackages.NUnit
+      dotnetPackages.NUnitRunners
+    ];
 
     xBuildFiles = [ "Source/Boogie.sln" ];
 

From c8cb9a92d4fc1cd708b32278fcaa2074433ddf33 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Mon, 28 May 2018 13:10:36 +0200
Subject: [PATCH 2611/3370] dotnetPackages.Boogie: 2017-01-03 -> 2018-05-28

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

diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index ed34f7984184..37d468997cfd 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -299,14 +299,14 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
 
   Boogie = buildDotnetPackage rec {
     baseName = "Boogie";
-    version = "2017-01-03";
+    version = "2018-05-28";
     name = "${baseName}-unstable-${version}";
 
     src = fetchFromGitHub {
       owner = "boogie-org";
       repo = "boogie";
-      rev = "5e42f0dd2891b2b85a9198052e55592a2943b7ef";
-      sha256 = "1mjnf96hbn9abgzyvmrfxlhnm213290xb9wca7rnnl12i4fa4ahl";
+      rev = "fc97aac639505f46cda7904dae95c9557716d037";
+      sha256 = "1hjksc5sapw1shxjwg0swja5afman8i15wnv5b6rzkqd4mg8y6nz";
     };
 
     # emulate `nuget restore Source/Boogie.sln`

From 3b9a34ff30767613a589e3afb128f94f106f2d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?=
 <sebastien.maret@univ-grenoble-alpes.fr>
Date: Mon, 28 May 2018 12:38:44 +0200
Subject: [PATCH 2612/3370] radio_beam: init at 0.2

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

diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix
new file mode 100644
index 000000000000..07a05902a369
--- /dev/null
+++ b/pkgs/development/python-modules/radio_beam/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, astropy }:
+
+buildPythonPackage rec {
+  pname = "radio_beam";
+  version = "0.2";
+
+  doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0gbnwnk89n8z0xwn41rc7wpr0fwrzkvxficyki3dyqbxq7y3qfrv";
+  };
+
+  propagatedBuildInputs = [ astropy ];
+
+  meta = {
+    description = "Tools for Beam IO and Manipulation";
+    homepage = http://radio-astro-tools.github.io;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ smaret ];
+  };
+}
+
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfa9537e5301..deb3e35e0a28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18168,6 +18168,9 @@ EOF
   pyogg = callPackage ../development/python-modules/pyogg { };
 
   rubymarshal = callPackage ../development/python-modules/rubymarshal { };
+
+  radio_beam = callPackage ../development/python-modules/radio_beam { };
+
 });
 
 in fix' (extends overrides packages)

From 12a46601e9ca199d41b039cf585a4b779820baff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Maret?=
 <sebastien.maret@univ-grenoble-alpes.fr>
Date: Mon, 28 May 2018 12:50:10 +0200
Subject: [PATCH 2613/3370] spectral-cube: init at 0.4.3

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

diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix
new file mode 100644
index 000000000000..3f54fefadf24
--- /dev/null
+++ b/pkgs/development/python-modules/spectral-cube/default.nix
@@ -0,0 +1,30 @@
+{ lib
+, fetchPypi
+, buildPythonPackage
+, astropy
+, radio_beam
+, pytest }:
+
+buildPythonPackage rec {
+  pname = "spectral-cube";
+  version = "0.4.3";
+
+  doCheck = false; # the tests requires several pytest plugins that are not in nixpkgs
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "057g3mzlg5cy4wg2hh3p6gssn93rs6i7pswzhldvcq4k8m8hsl3b";
+  };
+
+  propagatedBuildInputs = [ astropy radio_beam pytest ];
+
+  meta = {
+    description = "Library for reading and analyzing astrophysical spectral data cubes";
+    homepage = http://radio-astro-tools.github.io;
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ smaret ];
+  };
+}
+
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index deb3e35e0a28..b766697186c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18171,6 +18171,8 @@ EOF
 
   radio_beam = callPackage ../development/python-modules/radio_beam { };
 
+  spectral-cube = callPackage ../development/python-modules/spectral-cube { };
+
 });
 
 in fix' (extends overrides packages)

From 609f718cabc3390251c29108d9ce5fd039f11764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <balazs.lengyel@tuwien.ac.at>
Date: Mon, 28 May 2018 13:31:13 +0200
Subject: [PATCH 2614/3370] wine: Stable: 3.0 -> 3.0.1; Unstable, Staging 3.7
 -> 3.9

---
 pkgs/misc/emulators/wine/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 817241fbe0fe..5cb2a8208a64 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}:
 in rec {
 
   stable = fetchurl rec {
-    version = "3.0";
+    version = "3.0.1";
     url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz";
-    sha256 = "1v7vq9iinkscbq6wg85fb0d2137660fg2nk5iabxkl2wr850asil";
+    sha256 = "1wr63n70pli83p3rmclr2j4lxzs4ll1cwlpdlaajfrf6v9yhvl5s";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {
@@ -39,16 +39,16 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "3.7";
+    version = "3.9";
     url = "https://dl.winehq.org/wine/source/3.x/wine-${version}.tar.xz";
-    sha256 = "1drbzk3y0m14lkq3vzwwkvain5shykgcbmyzh6gcb5r4sxh3givn";
+    sha256 = "0ddphvlp9lsjyqc6zckinc36bggpkg925v0x2vqr8nkdjs0w5bfc";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     # https://github.com/wine-compholio/wine-staging/releases
     inherit (unstable) version;
-    sha256 = "0kam73jqhah7bzji5csxxhhfdp6byhzpcph6xnzjqz2aic5xk7xi";
+    sha256 = "022hzh9i0pc063vcdy7ilb1lxlxpzgr4llcb52y2j3gz1psrcyqs";
     owner = "wine-staging";
     repo = "wine-staging";
     rev = "v${version}";

From 02dcc8d734302b22ba635844c1c2a57ddca83853 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 28 May 2018 13:46:45 +0200
Subject: [PATCH 2615/3370] cmake: fix darwin build

HAVE_APPLICATION_SERVICES always gets set if cmake is available.
---
 .../cmake/application-services.patch             | 16 ++++++++++++++++
 .../tools/build-managers/cmake/default.nix       |  6 +++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/build-managers/cmake/application-services.patch

diff --git a/pkgs/development/tools/build-managers/cmake/application-services.patch b/pkgs/development/tools/build-managers/cmake/application-services.patch
new file mode 100644
index 000000000000..0ef710fa0195
--- /dev/null
+++ b/pkgs/development/tools/build-managers/cmake/application-services.patch
@@ -0,0 +1,16 @@
+diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
+index 2008a0b..5a3e8ee 100644
+--- a/Source/cmGlobalXCodeGenerator.cxx
++++ b/Source/cmGlobalXCodeGenerator.cxx
+@@ -35,11 +35,6 @@
+ 
+ struct cmLinkImplementation;
+ 
+-#if defined(CMAKE_BUILD_WITH_CMAKE) && defined(__APPLE__)
+-#define HAVE_APPLICATION_SERVICES
+-#include <ApplicationServices/ApplicationServices.h>
+-#endif
+-
+ #if defined(CMAKE_BUILD_WITH_CMAKE)
+ #include "cmXMLParser.h"
+ 
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 4675014880ba..051b8107703d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -57,6 +57,8 @@ stdenv.mkDerivation rec {
 
   # Don't search in non-Nix locations such as /usr, but do search in our libc.
   patches = [ ./search-path-3.9.patch ]
+    # Don't depend on frameworks.
+    ++ optional useSharedLibraries ./application-services.patch  # TODO: remove conditional
     ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
   outputs = [ "out" ];
@@ -101,7 +103,9 @@ stdenv.mkDerivation rec {
     "-DCMAKE_AR=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar"
     "-DCMAKE_RANLIB=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib"
     "-DCMAKE_STRIP=${getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip"
-  ] ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ];
+  ]
+    # Avoid depending on frameworks.
+    ++ optional (!useNcurses) "-DBUILD_CursesDialog=OFF";
 
   dontUseCmakeConfigure = true;
   enableParallelBuilding = true;

From 51556f640db756aed7e4b333a40d9a40af63d735 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 28 May 2018 14:21:30 +0200
Subject: [PATCH 2616/3370] FRidh as owner of update-python-libraries

---
 .github/CODEOWNERS | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 3d4855c5cf40..a4b5c9827328 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -45,10 +45,11 @@
 /nixos/modules/installer/tools/nixos-option.sh        @nbp
 
 # Python-related code and docs
-/pkgs/top-level/python-packages.nix     @FRidh
-/pkgs/development/interpreters/python   @FRidh
-/pkgs/development/python-modules        @FRidh
-/doc/languages-frameworks/python.md     @FRidh
+/maintainers/scripts/update-python-libraries	@FRidh
+/pkgs/top-level/python-packages.nix     	@FRidh
+/pkgs/development/interpreters/python   	@FRidh
+/pkgs/development/python-modules        	@FRidh
+/doc/languages-frameworks/python.md     	@FRidh
 
 # Haskell
 /pkgs/development/compilers/ghc                       @peti

From a6d58c8aba49280d18e85fe8b8747b337872ed04 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 05:36:52 -0700
Subject: [PATCH 2617/3370] pdd: 1.1 -> 1.2 (#40962)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pdd/versions.

These checks were done:

- built on NixOS
- /nix/store/lz66lx9blbjyigwbqph1kakgs5yfrbld-pdd-1.2/bin/.pdd-wrapped passed the binary check.
- /nix/store/lz66lx9blbjyigwbqph1kakgs5yfrbld-pdd-1.2/bin/pdd passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 1.2 with grep in /nix/store/lz66lx9blbjyigwbqph1kakgs5yfrbld-pdd-1.2
- directory tree listing: https://gist.github.com/6e768315d72cdf1b94712a309f2f31e8
- du listing: https://gist.github.com/e6f91bfa7c9a1947b34596e2b745fb82
---
 pkgs/tools/misc/pdd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pdd/default.nix b/pkgs/tools/misc/pdd/default.nix
index d362bccb993e..c075312618b8 100644
--- a/pkgs/tools/misc/pdd/default.nix
+++ b/pkgs/tools/misc/pdd/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonApplication rec {
   pname = "pdd";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "pdd";
     rev = "v${version}";
-    sha256 = "1nb64vdlym4najjyfxq1nprqcwgrwnqj1mml0fcg20hrgbjm4bf2";
+    sha256 = "09nyzzch4jlsjfx8axqyxh9d1sw8x4g3vg5fbxz7m16994fzz75i";
   };
 
   format = "other";

From 2ba2a853904eeebee11175a728d2129cb1141ac3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 05:39:47 -0700
Subject: [PATCH 2618/3370] jackett: 0.8.997 -> 0.8.1014 (#40966)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jackett/versions.

These checks were done:

- built on NixOS
- /nix/store/wbmvjpsv9nkvgmxa1gycn2c6f6cbx60i-jackett-0.8.1014/bin/Jackett passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.8.1014 with grep in /nix/store/wbmvjpsv9nkvgmxa1gycn2c6f6cbx60i-jackett-0.8.1014
- directory tree listing: https://gist.github.com/9c12511f3c3405355ff8757dd51b9acd
- du listing: https://gist.github.com/3e5688b0ab698810d090854a3ed4340a
---
 pkgs/servers/jackett/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix
index ef4b82396937..5a87c423f4f7 100644
--- a/pkgs/servers/jackett/default.nix
+++ b/pkgs/servers/jackett/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jackett-${version}";
-  version = "0.8.997";
+  version = "0.8.1014";
 
   src = fetchurl {
     url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz";
-    sha256 = "0a0viv3aw33kvj9z2fmqacvk2prv8dbdnk85b3xa4knp8cvsva6w";
+    sha256 = "0pvm9q8dpavkgsv180mw4y6555iixjv5s7mnmai9xzjspjpf264k";
   };
 
   buildInputs = [ makeWrapper ];

From 5f583fda04063c5fc4993ecd3596d9fc134ebe00 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 05:40:33 -0700
Subject: [PATCH 2619/3370] xmrig-proxy: 2.5.2 -> 2.6.2 (#41032)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xmrig-proxy/versions.

These checks were done:

- built on NixOS
- /nix/store/q9nnn2j5k9kmfayiairp8l3mjdcz228k-xmrig-proxy-2.6.2/bin/xmrig-proxy passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.6.2 with grep in /nix/store/q9nnn2j5k9kmfayiairp8l3mjdcz228k-xmrig-proxy-2.6.2
- directory tree listing: https://gist.github.com/9498722348ccc1f87735df50817a78ac
- du listing: https://gist.github.com/c7381fd089088b8620cf7e6675c96a83
---
 pkgs/applications/misc/xmrig/proxy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix
index 248f629f2e91..4e1e505e035e 100644
--- a/pkgs/applications/misc/xmrig/proxy.nix
+++ b/pkgs/applications/misc/xmrig/proxy.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "xmrig-proxy-${version}";
-  version = "2.5.2";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "xmrig";
     repo = "xmrig-proxy";
     rev = "v${version}";
-    sha256 = "1x10mrr58lc207zppzkjnhwah83kpxrqpa3idv01lyasv8mfkxzc";
+    sha256 = "1yfbdgyd37r5vb2g8jz4i92hxang3hbiig5y4507v9hr75jvfivh";
   };
 
   nativeBuildInputs = [ cmake ];

From e02be162f92b84db96b50bc0bd8f55786d9132d3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 05:42:17 -0700
Subject: [PATCH 2620/3370] speedtest-cli: 2.0.0 -> 2.0.1 (#41041)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/speedtest-cli/versions.

These checks were done:

- built on NixOS
- /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1/bin/.speedtest-wrapped passed the binary check.
- /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1/bin/speedtest passed the binary check.
- /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1/bin/.speedtest-cli-wrapped passed the binary check.
- /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1/bin/speedtest-cli passed the binary check.
- 4 of 4 passed binary check by having a zero exit code.
- 4 of 4 passed binary check by having the new version present in output.
- found 2.0.1 with grep in /nix/store/rhi9py7nac05v8qsvwjaszp15l5db3p6-speedtest-cli-2.0.1
- directory tree listing: https://gist.github.com/8474ab8a0bcd232ed8b3f5f9bff112ee
- du listing: https://gist.github.com/f130f280bd23afc5797bf84f764288c4
---
 pkgs/tools/networking/speedtest-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index ad3c3a806b33..ff0441c40787 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "speedtest-cli-${version}";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "sivel";
     repo = "speedtest-cli";
     rev = "v${version}";
-    sha256 = "06fini7bqf5paphp8dpck1zpmb33cdxlf4hg6xg2g9k4bdm2k26d";
+    sha256 = "0d3av50qm7bahsdg0k7hp04r9ripsafn95yqcgsy5h5y9yj4rsvf";
   };
 
   meta = with stdenv.lib; {

From 12b690983256eda1fa6a1183cfa51be8e252f11f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 05:46:32 -0700
Subject: [PATCH 2621/3370] girara: 0.2.9 -> 0.3.0 (#41063)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/girara/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.3.0 with grep in /nix/store/sd2h3v53hxkijrlc7xahlrjpa80vrbb7-girara-0.3.0
- directory tree listing: https://gist.github.com/9ae2cdb1a49b9bd9d21fae478768a961
- du listing: https://gist.github.com/f505b0541763899d6ef06322b8258191
---
 pkgs/applications/misc/girara/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index ab4159790de0..43a949ded372 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "girara-${version}";
-  version = "0.2.9";
+  version = "0.3.0";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.xz";
-    sha256 = "0lkxrfna818wkkr2f6mdzf15y5z8xl1b9592ylmzjbqsqya3w7x8";
+    sha256 = "18j1gv8pi4cpndvnap88pcfacdz3lnw6pxmw7dvzm359y1gzllmp";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext ];

From 4e965c62705e70abf40c36d25aead9cafea4f4a4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 05:48:02 -0700
Subject: [PATCH 2622/3370] riemann: 0.3.0 -> 0.3.1 (#41044)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/riemann/versions.

These checks were done:

- built on NixOS
- /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1/bin/.riemann-wrapped passed the binary check.
- /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1/bin/riemann passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.3.1 with grep in /nix/store/j7fjbp411mwd42cp5wynqvk1wr3vcxxi-riemann-0.3.1
- directory tree listing: https://gist.github.com/ed9907cdc302813f2c87257f6a26628e
- du listing: https://gist.github.com/b50c1c815b3cd6102e0ec8d21b9f1365
---
 pkgs/servers/monitoring/riemann/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index b930c1ab1f61..6eb4a3dfe9af 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "riemann-${version}";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchurl {
     url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2";
-    sha256 = "151zd8nkhigphdx6g9jhmza6963qvlnki013j1g7lyqaz43qyk1c";
+    sha256 = "0lc3qmwb33jjw2g64j8inqpr7krjmpjwfdmypdssvjy84acpkyal";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 1d1a81a4496c53503e3bf8541c14a3aff142fa41 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 05:49:25 -0700
Subject: [PATCH 2623/3370] googler: 3.5 -> 3.6 (#41064)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/googler/versions.

These checks were done:

- built on NixOS
- /nix/store/j4h3gxrjzx798n8qrpk6l4v2a2k3awvm-googler-3.6/bin/googler passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 3.6 with grep in /nix/store/j4h3gxrjzx798n8qrpk6l4v2a2k3awvm-googler-3.6
- directory tree listing: https://gist.github.com/bf1d55519dae4406e4f5bdbd78c44644
- du listing: https://gist.github.com/805653ac2fcc2c1c10d65d1e5298620e
---
 pkgs/applications/misc/googler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix
index 3b8b08c1b660..ca6ccdcdb2ae 100644
--- a/pkgs/applications/misc/googler/default.nix
+++ b/pkgs/applications/misc/googler/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchFromGitHub, python}:
 
 stdenv.mkDerivation rec {
-  version = "3.5";
+  version = "3.6";
   name = "googler-${version}";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "googler";
     rev = "v${version}";
-    sha256 = "0z5cngg1kr3b484zddqlg9yn7crbmnd78pdb8vzd32mkp3fahcxa";
+    sha256 = "1j1755b9mfmkqkgjrlsi4wr82352pqc9rfyalammqn6qrm3v3lb6";
   };
 
   propagatedBuildInputs = [ python ];

From b6c1781e5897f07ed688dd5a36e4c99f567e7ee5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 05:59:12 -0700
Subject: [PATCH 2624/3370] wireguard: 0.0.20180519 -> 0.0.20180524 (#41031)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireguard-tools/versions.

These checks were done:

- built on NixOS
- /nix/store/mr991d4pyvfng5bhh06kdlb29mj93cf3-wireguard-tools-0.0.20180524/bin/wg passed the binary check.
- /nix/store/mr991d4pyvfng5bhh06kdlb29mj93cf3-wireguard-tools-0.0.20180524/bin/wg-quick passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.0.20180524 with grep in /nix/store/mr991d4pyvfng5bhh06kdlb29mj93cf3-wireguard-tools-0.0.20180524
- directory tree listing: https://gist.github.com/52b47d18275b1b4550ccdd7bfdd16ef0
- du listing: https://gist.github.com/074aac4bf75c6a0a31e18b04cb0ffbc8
---
 pkgs/tools/networking/wireguard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index c43e7548364e..7411aeed6d2e 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180519";
+  version = "0.0.20180524";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0pd04ia0wcm0f6di4gx5kflccc5j35d72j38l8jqpj8vinl6l070";
+    sha256 = "0h503h9hh1vl3j2daz7lm2fp4wda65iphmx8k21md6yql8f56vmi";
   };
 
   sourceRoot = "source/src/tools";

From af9d10a91b5ef0518ee12b220470735076974210 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 28 May 2018 05:59:57 -0700
Subject: [PATCH 2625/3370] treewide: fix derivation names

---
 pkgs/applications/altcoins/mist.nix                 |  2 +-
 pkgs/applications/audio/infamousPlugins/default.nix |  2 +-
 pkgs/applications/audio/swh-lv2/default.nix         |  2 +-
 pkgs/applications/editors/manuskript/default.nix    | 10 +++++-----
 pkgs/applications/editors/neovim/neovim-remote.nix  |  4 ++--
 pkgs/applications/editors/wxhexeditor/default.nix   |  4 ++--
 pkgs/applications/editors/yi/wrapper.nix            |  4 ++--
 pkgs/applications/graphics/exrtools/default.nix     |  4 ++--
 pkgs/applications/graphics/gnuclad/default.nix      |  6 +++---
 pkgs/applications/misc/cura/lulzbot.nix             |  2 +-
 pkgs/applications/misc/nix-tour/default.nix         |  9 ++++-----
 .../misc/xrandr-invert-colors/default.nix           |  4 ++--
 .../networking/browsers/uzbl/default.nix            |  7 ++++---
 .../networking/instant-messengers/coyim/default.nix |  2 +-
 .../instant-messengers/salut-a-toi/default.nix      |  2 +-
 .../applications/networking/irc/weechat/default.nix |  2 +-
 .../science/chemistry/gwyddion/default.nix          |  2 +-
 pkgs/applications/science/math/ripser/default.nix   |  2 +-
 pkgs/applications/video/dvd-slideshow/default.nix   |  5 +++--
 pkgs/applications/video/lightworks/default.nix      |  2 +-
 pkgs/development/compilers/eli/default.nix          |  4 ++--
 pkgs/development/interpreters/red/default.nix       |  2 +-
 pkgs/development/libraries/cppcms/default.nix       |  4 ++--
 pkgs/development/libraries/cppdb/default.nix        |  4 ++--
 pkgs/development/libraries/ctpp2/default.nix        |  4 ++--
 pkgs/development/libraries/cxxtools/default.nix     |  4 ++--
 .../libraries/dleyna-connector-dbus/default.nix     |  7 ++++---
 pkgs/development/libraries/dleyna-core/default.nix  |  5 +++--
 .../libraries/dleyna-renderer/default.nix           |  7 ++++---
 .../development/libraries/dleyna-server/default.nix |  7 ++++---
 pkgs/development/libraries/fastjson/default.nix     |  2 +-
 pkgs/development/libraries/libbladeRF/default.nix   |  2 +-
 pkgs/development/libraries/tntdb/default.nix        |  5 +++--
 pkgs/development/libraries/tntnet/default.nix       |  5 +++--
 .../python-modules/htmltreediff/default.nix         |  4 ++--
 .../development/python-modules/moinmoin/default.nix |  2 +-
 pkgs/development/python-modules/mt-940/default.nix  |  4 ++--
 pkgs/development/python-modules/podcats/default.nix |  5 ++---
 pkgs/development/python-modules/pyxml/default.nix   |  4 ++--
 .../tools/ocaml/ocsigen-i18n/default.nix            |  5 +++--
 pkgs/misc/screensavers/physlock/default.nix         |  2 +-
 pkgs/servers/monitoring/bosun/default.nix           |  6 +++---
 pkgs/tools/X11/xinput_calibrator/default.nix        |  5 +++--
 pkgs/tools/misc/blink1-tool/default.nix             |  4 ++--
 pkgs/tools/misc/docker-ls/default.nix               |  4 ++--
 pkgs/tools/misc/profile-sync-daemon/default.nix     |  4 ++--
 pkgs/tools/misc/smenu/default.nix                   |  4 ++--
 pkgs/tools/networking/http-prompt/default.nix       |  5 +++--
 pkgs/tools/networking/ssldump/default.nix           |  2 +-
 pkgs/tools/package-management/conda/default.nix     |  2 +-
 pkgs/tools/package-management/nixops/nixops-dns.nix |  2 +-
 pkgs/tools/security/neopg/default.nix               |  6 +++---
 pkgs/tools/security/nitrokey-app/default.nix        |  2 +-
 pkgs/tools/security/stoken/default.nix              |  4 ++--
 pkgs/tools/text/jumanpp/default.nix                 |  5 +++--
 pkgs/tools/text/xml/xmloscopy/default.nix           |  6 +++---
 .../virtualization/xe-guest-utilities/default.nix   | 13 +++++++------
 pkgs/top-level/php-packages.nix                     |  4 ++--
 pkgs/top-level/python-packages.nix                  |  7 ++++---
 59 files changed, 131 insertions(+), 119 deletions(-)

diff --git a/pkgs/applications/altcoins/mist.nix b/pkgs/applications/altcoins/mist.nix
index d80e8b521822..c38e613fdd4a 100644
--- a/pkgs/applications/altcoins/mist.nix
+++ b/pkgs/applications/altcoins/mist.nix
@@ -56,7 +56,7 @@ let
   });
 in
 buildFHSUserEnv {
-  name = "mist-${stdenv.lib.getVersion mist}";
+  inherit name;
 
   targetPkgs = pkgs: with pkgs; [
      mist
diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix
index 9fe0820e5d6f..cae40929f95a 100644
--- a/pkgs/applications/audio/infamousPlugins/default.nix
+++ b/pkgs/applications/audio/infamousPlugins/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cairomm, cmake, lv2, libpthreadstubs, libXdmcp, libXft, ntk, pcre, fftwFloat, zita-resampler }:
 
 stdenv.mkDerivation rec {
-  name = "infamousPlugins-v${version}";
+  name = "infamousPlugins-${version}";
   version = "0.2.04";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index 26ea46149203..6fa0eb7f8f2b 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, fftwSinglePrec, libxslt, lv2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "swh-lv2-v${version}";
+  name = "swh-lv2-${version}";
   version = "1.0.16";
 
   src = fetchurl {
diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix
index fc27e4a00f7e..815af2103d58 100644
--- a/pkgs/applications/editors/manuskript/default.nix
+++ b/pkgs/applications/editors/manuskript/default.nix
@@ -1,11 +1,11 @@
 { stdenv, zlib, fetchFromGitHub, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  name = "manuskript";
+  pname = "manuskript";
   version = "0.3.0";
 
   src = fetchFromGitHub {
-    repo = name;
+    repo = pname;
     owner = "olivierkes";
     rev = version;
     sha256 = "0bqxc4a8kyi6xz1zs0dp85wxl9h4v8lzc6073bbcsn1zg4y59ys7";
@@ -19,15 +19,15 @@ python3Packages.buildPythonApplication rec {
 
   patchPhase = ''
     substituteInPlace manuskript/ui/welcome.py \
-      --replace sample-projects $out/share/${name}/sample-projects
+      --replace sample-projects $out/share/${pname}/sample-projects
    '';
 
   buildPhase = '''';
 
   installPhase = ''
-    mkdir -p $out/share/${name}
+    mkdir -p $out/share/${pname}
     cp -av  bin/ i18n/ libs/ manuskript/ resources/ icons/ $out
-    cp -r sample-projects/ $out/share/${name}
+    cp -r sample-projects/ $out/share/${pname}
   '';
 
   doCheck = false;
diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index 1c99429a7fe2..c4d2be4c740b 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 pythonPackages.buildPythonPackage rec {
   name = "neovim-remote-${version}";
-  version = "v1.8.6";
+  version = "1.8.6";
   disabled = !pythonPackages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "mhinz";
     repo = "neovim-remote";
-    rev = version;
+    rev = "v${version}";
     sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l";
   };
 
diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix
index 85d9b0546d62..5597bf0d0b3c 100644
--- a/pkgs/applications/editors/wxhexeditor/default.nix
+++ b/pkgs/applications/editors/wxhexeditor/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "wxHexEditor-${version}";
-  version = "v0.24";
+  version = "0.24";
 
   src = fetchFromGitHub {
     repo = "wxHexEditor";
     owner = "EUA";
-    rev = version;
+    rev = "v${version}";
     sha256 = "08xnhaif8syv1fa0k6lc3jm7yg2k50b02lyds8w0jyzh4xi5crqj";
   };
 
diff --git a/pkgs/applications/editors/yi/wrapper.nix b/pkgs/applications/editors/yi/wrapper.nix
index 916f296b3fcc..e20c0a3cbca7 100644
--- a/pkgs/applications/editors/yi/wrapper.nix
+++ b/pkgs/applications/editors/yi/wrapper.nix
@@ -8,8 +8,8 @@ let
   yiEnv = haskellPackages.ghcWithPackages
     (self: [ self.yi ] ++ extraPackages self);
 in
-stdenv.mkDerivation {
-  name = "yi-custom";
+stdenv.mkDerivation rec {
+  name = "yi-custom-${version}";
   version = "0.0.0.1";
   unpackPhase = "true";
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix
index 097062a8258a..7980d09fed12 100644
--- a/pkgs/applications/graphics/exrtools/default.nix
+++ b/pkgs/applications/graphics/exrtools/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, openexr, libpng12, libjpeg }:
 
 stdenv.mkDerivation rec {
-  name = "exrtools";
+  name = "exrtools-${version}";
   version = "0.4";
 
   src = fetchurl {
-    url =  "http://scanline.ca/exrtools/${name}-${version}.tar.gz";
+    url =  "http://scanline.ca/exrtools/${name}.tar.gz";
     sha256 = "0jpkskqs1yjiighab4s91jy0c0qxcscwadfn94xy2mm2bx2qwp4z";
   };
 
diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix
index 2b391710907c..b3671ead377a 100644
--- a/pkgs/applications/graphics/gnuclad/default.nix
+++ b/pkgs/applications/graphics/gnuclad/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig
+{ stdenv, lib, fetchurl, pkgconfig
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnuclad";
+  name = "gnuclad-${version}";
   version = "0.2.4";
 
   src = fetchurl {
-    url = "https://launchpad.net/gnuclad/trunk/0.2/+download/${name}-${version}.tar.gz";
+    url = "https://launchpad.net/gnuclad/trunk/${lib.versions.majorMinor version}/+download/${name}.tar.gz";
     sha256 = "0ka2kscpjff7gflsargv3r9fdaxhkf3nym9mfaln3pnq6q7fwdki";
   };
 
diff --git a/pkgs/applications/misc/cura/lulzbot.nix b/pkgs/applications/misc/cura/lulzbot.nix
index 4d13e62bdfec..341cc8ec2d04 100644
--- a/pkgs/applications/misc/cura/lulzbot.nix
+++ b/pkgs/applications/misc/cura/lulzbot.nix
@@ -4,7 +4,7 @@ let
   py = python27Packages;
 in
 stdenv.mkDerivation rec {
-  name = "cura-lulzbot";
+  name = "cura-lulzbot-${version}";
   version = "15.02.1-1.03-5064";
 
   src =
diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix
index 04f10de3d274..7e5a3a7840d7 100644
--- a/pkgs/applications/misc/nix-tour/default.nix
+++ b/pkgs/applications/misc/nix-tour/default.nix
@@ -1,15 +1,14 @@
 { stdenv, fetchgit, electron } :
 
 stdenv.mkDerivation rec {
-  name = "nix-tour";
+  name = "nix-tour-${version}";
+  version = "0.0.1";
 
   buildInputs = [ electron ];
 
-  version = "v0.0.1";
-
   src = fetchgit {
     url = "https://github.com/nixcloud/tour_of_nix";
-    rev = "refs/tags/${version}";
+    rev = "v${version}";
     sha256 = "09b1vxli4zv1nhqnj6c0vrrl51gaira94i8l7ww96fixqxjgdwvb";
   };
 
@@ -34,4 +33,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ qknight ];
   };
 
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix
index e9bb722dcab0..bb3385ad016a 100644
--- a/pkgs/applications/misc/xrandr-invert-colors/default.nix
+++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, libXrandr}:
 
 stdenv.mkDerivation rec {
-  version = "v0.01";
+  version = "0.01";
   name = "xrandr-invert-colors-${version}";
   src = fetchurl {
-    url = "https://github.com/zoltanp/xrandr-invert-colors/archive/${version}.tar.gz";
+    url = "https://github.com/zoltanp/xrandr-invert-colors/archive/v${version}.tar.gz";
     sha256 = "1z4hxn56rlflvqanb8ncqa1xqawnda85b1b37w6r2iqs8rw52d75";
   };
 
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 8c9f23996ede..12cf108355c4 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -5,7 +5,8 @@
 # but Python 2 + packages during runtime.
 
 stdenv.mkDerivation rec {
-  name = "uzbl-v0.9.0";
+  name = "uzbl-${version}";
+  version = "0.9.0";
 
   meta = with stdenv.lib; {
     description = "Tiny externally controllable webkit browser";
@@ -16,8 +17,8 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    name = "${name}.tar.gz";
-    url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz";
+    name = "uzbl-v${version}.tar.gz";
+    url = "https://github.com/uzbl/uzbl/archive/v${version}.tar.gz";
     sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index 5b70d7479269..1e88456e6b24 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -3,7 +3,7 @@
 
 buildGoPackage rec {
   name = "coyim-${version}";
-  version = "v0.3.7_1";
+  version = "0.3.7_1";
 
   goPackagePath = "github.com/twstrike/coyim";
 
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index 9ff1799ddd2d..987a7aa1be05 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -9,7 +9,7 @@ let
 
 in
   stdenv.mkDerivation rec {
-    name = "salut-a-toi";
+    name = "salut-a-toi-${version}";
     version = "0.6.1";
     pname = "sat-${version}";
 
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index dec933489af9..0d9320c12e27 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -117,7 +117,7 @@ in if configure == null then weechat else
         ln -s $plugin $out/plugins
       done
     '';
-  in (writeScriptBin "weechat" ''
+  in (writeScriptBin weechat.name ''
     #!${stdenv.shell}
     export WEECHAT_EXTRA_LIBDIR=${pluginsDir}
     ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins}
diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix
index 80115f4f0222..4f028e0053af 100644
--- a/pkgs/applications/science/chemistry/gwyddion/default.nix
+++ b/pkgs/applications/science/chemistry/gwyddion/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation {
-  name = "gwyddion";
+  name = "gwyddion-${version}";
   version = "2.48";
   src = fetchurl {
     url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz";
diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix
index b7453ecb01d4..651ad8a2c0f8 100644
--- a/pkgs/applications/science/math/ripser/default.nix
+++ b/pkgs/applications/science/math/ripser/default.nix
@@ -15,7 +15,7 @@ let
   inherit (stdenv.lib) optional;
 in
 stdenv.mkDerivation {
-  name = "ripser";
+  name = "ripser-${version}";
   version = "1.0";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index 7785116a835d..a329321b70c6 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -28,10 +28,11 @@ let
     '';
 
 in stdenv.mkDerivation rec {
-  name = "dvd-slideshow";
+  name = "dvd-slideshow-${version}";
   version = "0.8.4-2";
+
   src = fetchurl {
-    url = "mirror://sourceforge/dvd-slideshow/files/${name}-${version}.tar.gz";
+    url = "mirror://sourceforge/dvd-slideshow/files/${name}.tar.gz";
     sha256 = "17c09aqvippiji2sd0pcxjg3nb1mnh9k5nia4gn5lhcvngjcp1q5";
   };
 
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 4d34e08529f7..e3b94b69179c 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -77,7 +77,7 @@ let
 
 # Lightworks expects some files in /usr/share/lightworks
 in buildFHSUserEnv rec {
-  name = "lightworks-${stdenv.lib.getVersion lightworks}";
+  name = lightworks.name;
 
   targetPkgs = pkgs: [
       lightworks
diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix
index 93e53aa30d13..4635c6d0a4e8 100644
--- a/pkgs/development/compilers/eli/default.nix
+++ b/pkgs/development/compilers/eli/default.nix
@@ -28,11 +28,11 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "eli";
+  name = "eli-${version}";
   version = "4.8.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/eli-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/eli-project/Eli/Eli%20${version}/${name}.tar.bz2";
     sha256="1vran8583hbwrr5dciji4zkhz3f88w4mn8n9sdpr6zw0plpf1whj";
   };
 
diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix
index 01b95adf92f4..36047759baae 100644
--- a/pkgs/development/interpreters/red/default.nix
+++ b/pkgs/development/interpreters/red/default.nix
@@ -1,7 +1,7 @@
 { stdenv, stdenv_32bit, pkgsi686Linux, fetchFromGitHub, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "red-v${version}";
+  name = "red-${version}";
   version = "0.6.3";
   src = fetchFromGitHub {
     rev = "6a43c767fa2e85d668b83f749158a18e62c30f70";
diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix
index fcd37239e911..6dc496d0e5aa 100644
--- a/pkgs/development/libraries/cppcms/default.nix
+++ b/pkgs/development/libraries/cppcms/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, pcre, zlib, python, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "cppcms";
+  name = "cppcms-${version}";
   version = "1.0.5";
 
   src = fetchurl {
-      url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2";
+      url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
       sha256 = "0r8qyp102sq4lw8xhrjhan0dnslhsmxj4zs9jzlw75yagfbqbdl4";
   };
 
diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix
index 07c6e1490e7e..3423b29d76c8 100644
--- a/pkgs/development/libraries/cppdb/default.nix
+++ b/pkgs/development/libraries/cppdb/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake, sqlite, mysql, postgresql, unixODBC }:
 
 stdenv.mkDerivation rec {
-  name = "cppdb";
+  name = "cppdb-${version}";
   version = "0.3.1";
 
   src = fetchurl {
-      url = "mirror://sourceforge/cppcms/${name}-${version}.tar.bz2";
+      url = "mirror://sourceforge/cppcms/${name}.tar.bz2";
       sha256 = "0blr1casmxickic84dxzfmn3lm7wrsl4aa2abvpq93rdfddfy3nn";
   };
 
diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix
index bf57bab2f222..55835cdb63db 100644
--- a/pkgs/development/libraries/ctpp2/default.nix
+++ b/pkgs/development/libraries/ctpp2/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "ctpp2";
+  name = "ctpp2-${version}";
   version = "2.8.3";
 
   src = fetchurl {
-    url = "http://ctpp.havoc.ru/download/ctpp2-${version}.tar.gz";
+    url = "http://ctpp.havoc.ru/download/${name}.tar.gz";
     sha256 = "1z22zfw9lb86z4hcan9hlvji49c9b7vznh7gjm95gnvsh43zsgx8";
   };
 
diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix
index 5dd48794f5e2..77b27640fd77 100644
--- a/pkgs/development/libraries/cxxtools/default.nix
+++ b/pkgs/development/libraries/cxxtools/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   version = "2.2.1";
-  name = "cxxtools";
+  name = "cxxtools-${version}";
 
   src = fetchurl {
-    url = "http://www.tntnet.org/download/${name}-${version}.tar.gz";
+    url = "http://www.tntnet.org/download/${name}.tar.gz";
     sha256 = "0hp3qkyhidxkdf8qgkwrnqq5bpahink55mf0yz23rjd7rpbbdswc";
   };
 
diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
index 94efa8e31d3a..e3815165f6e3 100644
--- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix
+++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix
@@ -1,13 +1,14 @@
 { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dbus, dleyna-core, glib }:
 
 stdenv.mkDerivation rec {
-  name = "dleyna-connector-dbus";
+  pname = "dleyna-connector-dbus";
+  name = "${pname}-${version}";
   version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "01org";
-    repo = name;
-    rev = "${version}";
+    repo = pname;
+    rev = version;
     sha256 = "0vziq5gwjm79yl2swch2mz6ias20nvfddf5cqgk9zbg25cb9m117";
   };
 
diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix
index 1fc65b9ac7f0..11cfa31c04b6 100644
--- a/pkgs/development/libraries/dleyna-core/default.nix
+++ b/pkgs/development/libraries/dleyna-core/default.nix
@@ -1,12 +1,13 @@
 { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, gupnp }:
 
 stdenv.mkDerivation rec {
-  name = "dleyna-core";
+  pname = "dleyna-core";
+  name = "${pname}-${version}";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "01org";
-    repo = name;
+    repo = pname;
     rev = "v${version}";
     sha256 = "1x5vj5zfk95avyg6g3nf6gar250cfrgla2ixj2ifn8pcick2d9vq";
   };
diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix
index 176b05126b2b..a8ea7e8bd627 100644
--- a/pkgs/development/libraries/dleyna-renderer/default.nix
+++ b/pkgs/development/libraries/dleyna-renderer/default.nix
@@ -1,13 +1,14 @@
 { stdenv, autoreconfHook, pkgconfig, fetchFromGitHub, dleyna-connector-dbus, dleyna-core, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "dleyna-renderer";
+  pname = "dleyna-renderer";
+  name = "${pname}-${version}";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "01org";
-    repo = name;
-    rev = "${version}";
+    repo = pname;
+    rev = version;
     sha256 = "0jy54aq8hgrvzchrvfzqaj4pcn0cfhafl9bv8a9p6j82yjk4pvpp";
   };
 
diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix
index d36e665bd85d..b4885145f6e4 100644
--- a/pkgs/development/libraries/dleyna-server/default.nix
+++ b/pkgs/development/libraries/dleyna-server/default.nix
@@ -1,13 +1,14 @@
 { stdenv, autoreconfHook, makeWrapper, pkgconfig, fetchFromGitHub, dleyna-core, dleyna-connector-dbus, gssdp, gupnp, gupnp-av, gupnp-dlna, libsoup }:
 
 stdenv.mkDerivation rec {
-  name = "dleyna-server";
+  pname = "dleyna-server";
+  name = "${pname}-${version}";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "01org";
-    repo = name;
-    rev = "${version}";
+    repo = pname;
+    rev = version;
     sha256 = "13a2i6ms27s46yxdvlh2zm7pim7jmr5cylnygzbliz53g3gxxl3j";
   };
 
diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
index 6cedb4d555a5..05088df52105 100644
--- a/pkgs/development/libraries/fastjson/default.nix
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, libtool, autoconf, automake }:
 
 stdenv.mkDerivation rec {
-  version = "v0.99.4";
+  version = "0.99.4";
   name = "fastjson-${version}";
   src = fetchFromGitHub {
     repo = "libfastjson";
diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix
index 3f4f48775c1b..5ccfb0d1b26f 100644
--- a/pkgs/development/libraries/libbladeRF/default.nix
+++ b/pkgs/development/libraries/libbladeRF/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   version = "1.9.0";
-  name = "libbladeRF-v${version}";
+  name = "libbladeRF-${version}";
 
   src = fetchFromGitHub {
     owner = "Nuand";
diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix
index 75a494cfbded..9edfcc88f164 100644
--- a/pkgs/development/libraries/tntdb/default.nix
+++ b/pkgs/development/libraries/tntdb/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, cxxtools, postgresql, mysql, sqlite, zlib, openssl }:
 
 stdenv.mkDerivation rec {
+  name = "tntdb-${version}";
   version = "1.3";
-  name = "tntdb";
+
   src = fetchurl {
-    url = "http://www.tntnet.org/download/tntdb-${version}.tar.gz";
+    url = "http://www.tntnet.org/download/${name}.tar.gz";
     sha256 = "0js79dbvkic30bzw1pf26m64vs2ssw2sbj55w1dc0sy69dlv4fh9";
   };
 
diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix
index cd4ba34b33c6..aaff759525b6 100644
--- a/pkgs/development/libraries/tntnet/default.nix
+++ b/pkgs/development/libraries/tntnet/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, cxxtools, zlib, openssl, zip }:
 
 stdenv.mkDerivation rec {
+  name = "tntnet-${version}";
   version = "2.2.1";
-  name = "tntnet";
+
   src = fetchurl {
-    url = "http://www.tntnet.org/download/tntnet-${version}.tar.gz";
+    url = "http://www.tntnet.org/download/${name}.tar.gz";
     sha256 = "08bmak9mpbamwwl3h9p8x5qzwqlm9g3jh70y0ml5hk7hiv870cf8";
   };
 
diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix
index 5e839e4ada9b..c2c7f4e12f42 100644
--- a/pkgs/development/python-modules/htmltreediff/default.nix
+++ b/pkgs/development/python-modules/htmltreediff/default.nix
@@ -1,7 +1,7 @@
 { buildPythonPackage, fetchFromGitHub, isPy3k, lxml, html5lib, nose, stdenv }:
 
 buildPythonPackage rec {
-  version = "v0.1.2";
+  version = "0.1.2";
   pname = "htmltreediff";
 
   disabled = isPy3k;
@@ -9,7 +9,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "christian-oudard";
     repo = pname;
-    rev = version;
+    rev = "v${version}";
     sha256 = "16mqp2jyznrw1mgd3qzybq28h2k5wz7vmmz1m6xpgscazyjhvvd1";
   };
 
diff --git a/pkgs/development/python-modules/moinmoin/default.nix b/pkgs/development/python-modules/moinmoin/default.nix
index 2097470d4e47..db0a5bcca2b3 100644
--- a/pkgs/development/python-modules/moinmoin/default.nix
+++ b/pkgs/development/python-modules/moinmoin/default.nix
@@ -3,7 +3,7 @@
 }:
 
 buildPythonPackage rec {
-  name = "moinmoin";
+  pname = "moinmoin";
   version = "1.9.9";
 
   # SyntaxError in setup.py
diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix
index 5e2ad1d5aa2a..bab7cc052b9d 100644
--- a/pkgs/development/python-modules/mt-940/default.nix
+++ b/pkgs/development/python-modules/mt-940/default.nix
@@ -3,13 +3,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "v4.10.0";
+  version = "4.10.0";
   pname = "mt940";
 
   src = fetchFromGitHub {
     owner = "WoLpH";
     repo = pname;
-    rev = version;
+    rev = "v${version}";
     sha256 = "1dsf2di8rr0iw2vaz6dppalby3y7i8x2bl0qjqvaiqacjxxvwj65";
   };
 
diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix
index a1b8312b134f..8af9e759c953 100644
--- a/pkgs/development/python-modules/podcats/default.nix
+++ b/pkgs/development/python-modules/podcats/default.nix
@@ -2,13 +2,12 @@
 
 buildPythonPackage rec {
   pname = "podcats";
-  version = "v0.5.0";
-  name = "${pname}-${version}";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "jakubroztocil";
     repo = "podcats";
-    rev = version;
+    rev = "v${version}";
     sha256 = "0zjdgry5n209rv19kj9yaxy7c7zq5gxr488izrgs4sc75vdzz8xc";
   };
 
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
index 0ef91fda9e35..646308feece4 100644
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ b/pkgs/development/python-modules/pyxml/default.nix
@@ -3,10 +3,10 @@
 buildPythonPackage rec {
   pname = "PyXML";
   version = "0.8.4";
-  name = "${pname}-${pname}";
+
   format = "other";
   src = fetchurl {
-    url = "mirror://sourceforge/pyxml/${name}.tar.gz";
+    url = "mirror://sourceforge/pyxml/${pname}-${pname}.tar.gz";
     sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";
   };
 
diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
index 37807b245ff2..75e898fdb3fd 100644
--- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
+++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix
@@ -2,7 +2,8 @@
 
 stdenv.mkDerivation rec
 {
-  name = "ocsigen-i18n";
+  pname = "ocsigen-i18n";
+  name = "${pname}-${version}";
   version = "3.1.0";
 
   buildInputs = with ocamlPackages; [ ocaml findlib ];
@@ -16,7 +17,7 @@ stdenv.mkDerivation rec
   '';
 
   src = fetchurl {
-    url = "https://github.com/besport/${name}/archive/${version}.tar.gz";
+    url = "https://github.com/besport/${pname}/archive/${version}.tar.gz";
     sha256 = "0cw0mmr67wx03j4279z7ldxwb01smkqz9rbklx5lafrj5sf99178";
   };
 
diff --git a/pkgs/misc/screensavers/physlock/default.nix b/pkgs/misc/screensavers/physlock/default.nix
index 14c2e178e923..9855e8688867 100644
--- a/pkgs/misc/screensavers/physlock/default.nix
+++ b/pkgs/misc/screensavers/physlock/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "11-dev";
-  name = "physlock-v${version}";
+  name = "physlock-${version}";
   src = fetchFromGitHub {
     owner = "muennich";
     repo = "physlock";
diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix
index d9af026dfb6a..905244833602 100644
--- a/pkgs/servers/monitoring/bosun/default.nix
+++ b/pkgs/servers/monitoring/bosun/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchFromGitHub, buildGoPackage }:
 
 buildGoPackage rec {
-  name = "bosun";
-  rev = "0.5.0";
+  name = "bosun-${version}";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "bosun-monitor";
     repo = "bosun";
+    rev = version;
     sha256 = "1qj97wiqj6awivvac1n00k0x8wdv4ambzdj4502nmmnr5rdbqq88";
   };
 
diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix
index 8376b2041b30..1ed153030692 100644
--- a/pkgs/tools/X11/xinput_calibrator/default.nix
+++ b/pkgs/tools/X11/xinput_calibrator/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, xlibsWrapper, pkgconfig }:
 
 stdenv.mkDerivation rec {
+  pname = "xinput_calibrator";
   version = "0.7.5";
-  name = "xinput_calibrator";
+  name = "${pname}-${version}";
   src = fetchurl {
-    url = "https://github.com/tias/${name}/archive/v${version}.tar.gz";
+    url = "https://github.com/tias/${pname}/archive/v${version}.tar.gz";
     sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9";
   };
 
diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix
index 9a09fba93e69..e87987aa0835 100644
--- a/pkgs/tools/misc/blink1-tool/default.nix
+++ b/pkgs/tools/misc/blink1-tool/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "blink1-${version}";
-  version = "v1.98";
+  version = "1.98";
 
   src = fetchurl {
-    url = "https://github.com/todbot/blink1/archive/${version}.tar.gz";
+    url = "https://github.com/todbot/blink1/archive/v${version}.tar.gz";
     sha256 = "05hbnp20cdvyyqf6jr01waz1ycis20qzsd8hn27snmn6qd48igrb";
   };
 
diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix
index fdc1a8688346..359b450b5fe3 100644
--- a/pkgs/tools/misc/docker-ls/default.nix
+++ b/pkgs/tools/misc/docker-ls/default.nix
@@ -2,12 +2,12 @@
 
 buildGoPackage rec {
   name = "docker-ls-${version}";
-  version = "v0.3.1";
+  version = "0.3.1";
 
   src = fetchFromGitHub {
     owner = "mayflower";
     repo = "docker-ls";
-    rev = version;
+    rev = "v${version}";
     sha256 = "1dhadi1s3nm3r8q5a0m59fy4jdya8p7zvm22ci7ifm3mmw960xly";
   };
 
diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index d3f017171cb6..670f70677654 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, rsync, glibc, gawk }:
 
 stdenv.mkDerivation rec {
-  version = "v5.53";
+  version = "5.53";
   name = "profile-sync-daemon-${version}";
 
   src = fetchurl {
-    url = "http://github.com/graysky2/profile-sync-daemon/archive/${version}.tar.gz";
+    url = "http://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
     sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx";
   };
 
diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix
index 3db0ee9af267..77622ce8a1ea 100644
--- a/pkgs/tools/misc/smenu/default.nix
+++ b/pkgs/tools/misc/smenu/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "v0.9.11";
+  version = "0.9.11";
   name = "smenu-${version}";
 
   src = fetchFromGitHub {
     owner  = "p-gen";
     repo   = "smenu";
-    rev    = version;
+    rev    = "v${version}";
     sha256 = "1va5gsxniin02casgdrqxvpzccm0vwjiql60qrsvncrq6nm6bz0d";
   };
 
diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix
index 37f4f96a3172..7521a9a13bc2 100644
--- a/pkgs/tools/networking/http-prompt/default.nix
+++ b/pkgs/tools/networking/http-prompt/default.nix
@@ -1,8 +1,9 @@
 { stdenv, fetchFromGitHub, pythonPackages, httpie }:
 
 pythonPackages.buildPythonApplication rec {
+  pname = "http-prompt";
   version = "0.11.1";
-  name = "http-prompt";
+  name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     rev = "v${version}";
@@ -21,7 +22,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   checkPhase = ''
-    $out/bin/${name} --version | grep -q "${version}"
+    $out/bin/${pname} --version | grep -q "${version}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix
index dcc78560fa36..adda38c184d9 100644
--- a/pkgs/tools/networking/ssldump/default.nix
+++ b/pkgs/tools/networking/ssldump/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, openssl, libpcap }:
 
 stdenv.mkDerivation rec {
-  name = "ssldump";
+  name = "ssldump-${version}";
   version = "0.9b3";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix
index 4589cfcec880..f3021b111d10 100644
--- a/pkgs/tools/package-management/conda/default.nix
+++ b/pkgs/tools/package-management/conda/default.nix
@@ -48,7 +48,7 @@ let
     '';
 in
   buildFHSUserEnv {
-    name = "conda-shell";
+    name = "conda-shell-${version}";
     targetPkgs = pkgs: (builtins.concatLists [ [ conda ] condaDeps extraPkgs]);
     profile = ''
       # Add conda to PATH
diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix
index afb0353e687d..27edfa890fcf 100644
--- a/pkgs/tools/package-management/nixops/nixops-dns.nix
+++ b/pkgs/tools/package-management/nixops/nixops-dns.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub }:
 
 buildGoPackage rec {
-  name = "nixops-dns";
+  name = "nixops-dns-${version}";
   version = "1.0";
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix
index 10efe0e7f21d..84c4a68aba0a 100644
--- a/pkgs/tools/security/neopg/default.nix
+++ b/pkgs/tools/security/neopg/default.nix
@@ -11,19 +11,19 @@
 , gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "neopg";
+  name = "neopg-${version}";
   version = "0.0.4";
 
   # no fetchFromGitHub, as repo contains submodules
   src = fetchgit {
     url = "https://github.com/das-labor/neopg.git";
-    rev = "refs/tags/v${version}";
+    rev = "v${version}";
     sha256 = "0hhkl326ff6f76k8pwggpzmivbm13fz497nlyy6ybn5bmi9xfblm";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ]; 
+  buildInputs = [ cmake sqlite botan2 boost164 curl gettext libusb gnutls ];
 
   doCheck = true;
   checkTarget = "test";
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 1396e9b94c9a..4407d5abbfa1 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   # We use fetchgit instead of fetchFromGitHub because of necessary git submodules
   src = fetchgit {
     url = "https://github.com/Nitrokey/nitrokey-app.git";
-    rev = "refs/tags/v${version}";
+    rev = "v${version}";
     sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi";
   };
 
diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix
index 464f6d215841..a9902fe50422 100644
--- a/pkgs/tools/security/stoken/default.nix
+++ b/pkgs/tools/security/stoken/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "stoken";
-  version = "v0.90";
+  version = "0.90";
   name = "${pname}-${version}";
   src = fetchFromGitHub {
     owner = "cernekee";
     repo = pname;
-    rev = version;
+    rev = "v${version}";
     sha256 = "1k7wn8pmp7dv646g938dsr99090lsphl7zy4m9x7qbh2zlnnf9af";
   };
 
diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix
index c4af67b3b481..5eea33d13a47 100644
--- a/pkgs/tools/text/jumanpp/default.nix
+++ b/pkgs/tools/text/jumanpp/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, cmake, protobuf }:
 stdenv.mkDerivation rec {
-  name = "jumanpp-${version}";
+  pname = "jumanpp";
+  name = "${pname}-${version}";
   version = "2.0.0-rc2";
 
   src = fetchurl {
-    url = "https://github.com/ku-nlp/${name}/releases/download/v${version}/${name}.tar.xz";
+    url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${name}.tar.xz";
     sha256 = "17fzmd0f5m9ayfhsr0mg7hjp3pg1mhbgknhgyd8v87x46g8bg6qp";
   };
   buildInputs = [ cmake protobuf ];
diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix
index 337aa61af13a..9703bd1ecea5 100644
--- a/pkgs/tools/text/xml/xmloscopy/default.nix
+++ b/pkgs/tools/text/xml/xmloscopy/default.nix
@@ -6,7 +6,7 @@ docbook5
 }:
 stdenv.mkDerivation rec {
   name = "xmloscopy-${version}";
-  version = "v0.1.2";
+  version = "0.1.2";
 
   buildInputs = [
     makeWrapper
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "grahamc";
     repo = "xmloscopy";
-    rev = version;
+    rev = "v${version}";
     sha256 = "07fcnf1vv0x72lksl1v0frmlh73gca199ldqqbgdjpybjdffz456";
   };
 
   installPhase = ''
-    sed -i "s/hard to say/${version}/" ./xmloscopy
+    sed -i "s/hard to say/v${version}/" ./xmloscopy
     type -P shellcheck && shellcheck ./xmloscopy
     chmod +x ./xmloscopy
     patchShebangs ./xmloscopy
diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index 9c783023d66f..dfb1467b54d5 100644
--- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, bzip2, lzo, zlib, xz, bash, python, gnutar, gnused, gnugrep, which }:
 
 stdenv.mkDerivation (rec {
-  name = "xe-guest-utilities";
+  pname = "xe-guest-utilities";
+  name = "${pname}-${version}";
   version = "6.2.0";
   meta = {
     description = "Citrix XenServer Tools";
@@ -17,14 +18,14 @@ stdenv.mkDerivation (rec {
   buildInputs = [ bzip2 gnutar gnused python lzo zlib xz stdenv gnugrep which ];
   patches = [ ./ip-address.patch ];
   postPatch = ''
-    tar xf "$NIX_BUILD_TOP/$name-$version/xenstore-sources.tar.bz2"
+    tar xf "$NIX_BUILD_TOP/$name/xenstore-sources.tar.bz2"
   '';
 
   buildPhase = ''
     export CC=gcc
     export CFLAGS='-Wall -Wstrict-prototypes -Wno-unused-local-typedefs -Wno-sizeof-pointer-memaccess'
     export PYTHON=python2
-    cd "$NIX_BUILD_TOP/$name-$version/uclibc-sources"
+    cd "$NIX_BUILD_TOP/$name/uclibc-sources"
     for file in Config.mk tools/libxc/Makefile tools/misc/Makefile tools/misc/lomount/Makefile tools/xenstore/Makefile; do
       substituteInPlace "$file" --replace -Werror ""
     done
@@ -39,12 +40,12 @@ stdenv.mkDerivation (rec {
       export LIBLEAFDIR_x86_64=lib
     fi
     for f in include libxc xenstore; do
-      [[ ! -d $NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f ]] && continue
-      make -C "$NIX_BUILD_TOP/$name-$version/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install
+      [[ ! -d $NIX_BUILD_TOP/$name/uclibc-sources/tools/$f ]] && continue
+      make -C "$NIX_BUILD_TOP/$name/uclibc-sources/tools/$f" DESTDIR="$out" BINDIR=/bin SBINDIR=/bin INCLUDEDIR=/include LIBDIR=/lib install
     done
     rm -r "$out"/var
 
-    cd "$NIX_BUILD_TOP/$name-$version"
+    cd "$NIX_BUILD_TOP/$name"
     install -Dm755 xe-update-guest-attrs "$out/bin/xe-update-guest-attrs"
     install -Dm755 xe-daemon "$out/bin/xe-daemon"
     install -Dm644 xen-vcpu-hotplug.rules "$out/lib/udev/rules.d/10-xen-vcpu-hotplug.rules"
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 02d9ec51b3d7..ebba6a2f5ceb 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -74,14 +74,14 @@ let
   };
 
   php_excel = assert isPhp7; buildPecl rec {
-    name = "php_excel";
+    name = "php_excel-${version}";
     version = "1.0.2";
     phpVersion = "php7";
 
     buildInputs = [ pkgs.libxl ];
 
     src = pkgs.fetchurl {
-      url = "https://github.com/iliaal/${name}/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz";
+      url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz";
       sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n";
     };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfa9537e5301..9a24175ebb74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2819,9 +2819,10 @@ in {
   };
 
   gnutls = buildPythonPackage rec {
-    name = "python-gnutls";
+    pname = "python-gnutls";
+    version = "3.0.0";
     src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-gnutls/python-gnutls-3.0.0.tar.gz";
+      url = "mirror://pypi/p/python-gnutls/${pname}-${version}.tar.gz";
       sha256 = "1yrdxcj5rzvz8iglircz6icvyggz5fmdcd010n6w3j60yp4p84kc";
     };
 
@@ -10375,7 +10376,7 @@ in {
   };
 
   pybcrypt = buildPythonPackage rec {
-    name = "pybcrypt";
+    pname = "pybcrypt";
     version = "0.4";
 
     src = pkgs.fetchurl {

From e094cda74fd0e1a8f629334e8b92bf48d2dc17a6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 28 May 2018 06:01:17 -0700
Subject: [PATCH 2626/3370] simgrid: 3.17 -> 3.19.1

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

diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix
index 522c708bf902..17a1719ba1ed 100644
--- a/pkgs/applications/science/misc/simgrid/default.nix
+++ b/pkgs/applications/science/misc/simgrid/default.nix
@@ -14,18 +14,17 @@ with stdenv.lib;
 
 let
   optionOnOff = option: "${if option then "on" else "off"}";
-  urlVersion = replaceStrings ["."] ["_"];
 in
 
 stdenv.mkDerivation rec {
   name = "simgrid-${version}";
-  version = "3.17";
+  version = "3.19.1";
 
   src = fetchFromGitHub {
     owner = "simgrid";
     repo = "simgrid";
-    rev = "v${urlVersion version}";
-    sha256 = "0ffs9w141qhw571jsa9sch1cnr332vs4sgj6dsiij2mc24m6wpb4";
+    rev = "v${version}";
+    sha256 = "0vpgcp40xv20hcpslx5wz2mf2phaq41f7x8yr0bm7mknqd3zwxih";
   };
 
   nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ]

From 7e30cfff780bccd454b3ae956552dce37bf749b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 06:47:00 -0700
Subject: [PATCH 2627/3370] memcached: 1.5.7 -> 1.5.8 (#41110)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/memcached/versions.

These checks were done:

- built on NixOS
- /nix/store/jfhla2f3268dkbi1frd8g1d46cj6f1xm-memcached-1.5.8/bin/memcached passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.5.8 with grep in /nix/store/jfhla2f3268dkbi1frd8g1d46cj6f1xm-memcached-1.5.8
- directory tree listing: https://gist.github.com/69a417ed0d192d2c714645a464ec2ba5
- du listing: https://gist.github.com/94f5ac6323482d6fb77b7fe42d8814a9
---
 pkgs/servers/memcached/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index e326aff0d7ee..8a4159a55213 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  version = "1.5.7";
+  version = "1.5.8";
   name = "memcached-${version}";
 
   src = fetchurl {
     url = "http://memcached.org/files/${name}.tar.gz";
-    sha256 = "0ijfiy1w4hk3j8hhra6kablq8kjabvcdvsl8cwd4drvszjl0ddsv";
+    sha256 = "1ppnhsqv9047vm0rrmqla56y972f8qqjdb780iz6v922jjcc723k";
   };
 
   buildInputs = [cyrus_sasl libevent];

From e30c7eb5ac9b175aea3720c4e6df3064616673ac Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 28 May 2018 16:19:23 +0200
Subject: [PATCH 2628/3370] poppler: fix v0.61 build with clang

---
 pkgs/development/libraries/poppler/0.61.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
index 072de0f9fa06..dfa98d392a2b 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ninja pkgconfig ];
 
+  # Not sure when and how to pass it.  It seems an upstream bug anyway.
+  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+
   cmakeFlags = [
     (mkFlag true "XPDF_HEADERS")
     (mkFlag (!minimal) "GLIB")

From 0b6c2cfc4d15eac58c8023e174edfb069b816a4e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 28 May 2018 16:22:10 +0200
Subject: [PATCH 2629/3370] poppler: remove libintlOrEmpty from v0.61

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

diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix
index dfa98d392a2b..4456cd7ff285 100644
--- a/pkgs/development/libraries/poppler/0.61.nix
+++ b/pkgs/development/libraries/poppler/0.61.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintlOrEmpty
+{ stdenv, lib, fetchurl, cmake, ninja, pkgconfig, libiconv, libintl
 , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg
 , withData ? true, poppler_data
 , qt5Support ? false, qtbase ? null
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
-  buildInputs = [ libiconv ] ++ libintlOrEmpty ++ lib.optional withData poppler_data;
+  buildInputs = [ libiconv libintl ] ++ lib.optional withData poppler_data;
 
   # TODO: reduce propagation to necessary libs
   propagatedBuildInputs = with lib;

From ac404fd9e714f0e9433a7d6afe75e54cf5eb5f3d Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 28 May 2018 17:28:53 +0200
Subject: [PATCH 2630/3370] haskellPackages: mark yarn2nix broken w/ message

---
 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 2fc5c20c3374..7d308f5ab722 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -448,6 +448,9 @@ self: super: {
   rematch = dontCheck super.rematch;            # https://github.com/tcrayford/rematch/issues/5
   rematch-text = dontCheck super.rematch-text;  # https://github.com/tcrayford/rematch/issues/6
 
+  # Should not appear in nixpkgs yet (broken anyway)
+  yarn2nix = throw "yarn2nix is not yet packaged for nixpkgs. See https://github.com/Profpatsch/yarn2nix#yarn2nix";
+
   # no haddock since this is an umbrella package.
   cloud-haskell = dontHaddock super.cloud-haskell;
 

From ac23a7c459d8f6035fcadcac274ff40f1e21a7e9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 11:35:20 -0400
Subject: [PATCH 2631/3370] =?UTF-8?q?emacs:=2025.3=20=E2=86=92=2026.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/applications/editors/emacs/at-fdcwd.patch  | 15 ---------------
 pkgs/applications/editors/emacs/clean-env.patch |  4 ++--
 pkgs/applications/editors/emacs/default.nix     | 14 ++------------
 3 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/at-fdcwd.patch

diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch
deleted file mode 100644
index 2d8099b73736..000000000000
--- a/pkgs/applications/editors/emacs/at-fdcwd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
-index 84ede3e..8e8f42e 100644
---- a/lib/careadlinkat.h
-+++ b/lib/careadlinkat.h
-@@ -23,6 +23,10 @@
- #include <fcntl.h>
- #include <unistd.h>
- 
-+#ifndef AT_FDCWD
-+#define AT_FDCWD -2
-+#endif
-+
- struct allocator;
- 
- /* Assuming the current directory is FD, get the symbolic link value
diff --git a/pkgs/applications/editors/emacs/clean-env.patch b/pkgs/applications/editors/emacs/clean-env.patch
index f80efeeef706..7b4cb9d52667 100644
--- a/pkgs/applications/editors/emacs/clean-env.patch
+++ b/pkgs/applications/editors/emacs/clean-env.patch
@@ -8,8 +8,8 @@ diff -ru -x '*~' emacs-25.3/src/Makefile.in emacs-25.3-new/src/Makefile.in
  ifeq ($(CANNOT_DUMP),yes)
  	ln -f temacs$(EXEEXT) $@
  else
--	LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
-+	env -i LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump
+-	LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
++	env -i LC_ALL=C $(RUN_TEMACS) -batch $(BUILD_DETAILS) -l loadup dump
    ifneq ($(PAXCTL_dumped),)
  	$(PAXCTL_dumped) $@
    endif
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index ba243629cc3e..b82f97e445f6 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -26,28 +26,18 @@ let
 in
 stdenv.mkDerivation rec {
   name = "emacs-${version}${versionModifier}";
-  version = "25.3";
+  version = "26.1";
   versionModifier = "";
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${name}.tar.xz";
-    sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
+    sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";
   };
 
   enableParallelBuilding = true;
 
   patches = [
     ./clean-env.patch
-  ] ++ lib.optionals stdenv.isDarwin [
-    ./at-fdcwd.patch
-
-    # Backport of the fix to
-    # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
-    # Should be removed when switching to Emacs 26.1
-    (fetchurl {
-      url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
-      sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
-    })
   ];
 
   nativeBuildInputs = [ pkgconfig ]

From f607f01b708aae314914b180f9207af37d28710f Mon Sep 17 00:00:00 2001
From: Geoffrey Huntley <ghuntley@ghuntley.com>
Date: Thu, 24 May 2018 20:06:13 +1000
Subject: [PATCH 2632/3370] fix: connect the --bind-address arg to the
 cfg.apiserver.address option

---
 nixos/modules/services/cluster/kubernetes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 8216e686facd..501925597023 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -906,7 +906,7 @@ in {
             ${optionalString (cfg.etcd.keyFile != null)
               "--etcd-keyfile=${cfg.etcd.keyFile}"} \
             --insecure-port=${toString cfg.apiserver.port} \
-            --bind-address=0.0.0.0 \
+            --bind-address=${toString cfg.apiserver.address} \
             ${optionalString (cfg.apiserver.advertiseAddress != null)
               "--advertise-address=${cfg.apiserver.advertiseAddress}"} \
             --allow-privileged=${boolToString cfg.apiserver.allowPrivileged}\

From 2aebd62cfcf649e27e3298254eba7e6132910370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <balazs.lengyel@tuwien.ac.at>
Date: Mon, 28 May 2018 18:09:34 +0200
Subject: [PATCH 2633/3370] winetricks: 20180217 -> 20180513

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 5cb2a8208a64..c55fbbb0b8a1 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -56,8 +56,8 @@ in rec {
 
   winetricks = fetchFromGitHub rec {
     # https://github.com/Winetricks/winetricks/releases
-    version = "20180217";
-    sha256 = "0k3vlsqjbzys5dfbxwgw76al8gh44jsjqkc06va103frkrgjxvc5";
+    version = "20180513";
+    sha256 = "0ijjqvx2110mfcfyj3rvw53phqbay91vsp5ncv40szx0d259jbw4";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From 98c4ac2fa5a3917804d5824b7e6ca66b19327733 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Sat, 26 May 2018 10:55:25 -0700
Subject: [PATCH 2634/3370] php: 7.2.5 -> 7.2.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/php/versions.

These checks were done:

- built on NixOS
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phar.phar passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phar passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/phpdbg passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php-cgi passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/pear passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/peardev passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/pecl passed the binary check.
- /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6/bin/php-fpm passed the binary check.
- 9 of 9 passed binary check by having a zero exit code.
- 0 of 9 passed binary check by having the new version present in output.
- found 7.2.6 with grep in /nix/store/25l2hz7njpg9glpmslcadkgqwai5f77s-php-7.2.6
- directory tree listing: https://gist.github.com/409d2cfaa7e805714825281fbaba0d0f
- du listing: https://gist.github.com/7fbd8e3d56524f70b3dfb94c045fccd2
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 94e1e5f1b692..0e161b0e3f71 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -353,7 +353,7 @@ in {
   };
 
   php72 = generic {
-    version = "7.2.5";
-    sha256 = "0cb0g64mzkir81js27vjwqr8vh043f62ynqvds5n4ygsivx0x0pk";
+    version = "7.2.6";
+    sha256 = "1hzj1z6v1ij4f4zjl1giix9qinf20wyn9gf8s29x5fc0va53wpdf";
   };
 }

From 9424d155612c2a4452ca55ada6dad9a668326e93 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 28 May 2018 19:11:29 +0200
Subject: [PATCH 2635/3370] gtk-doc: don't use pythonEnv for binaries

---
 .../tools/documentation/gtk-doc/default.nix   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 5bd989a4da88..32025edb3064 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,9 +1,6 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, perl, python, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool }:
-
-let
-  pythonEnv = python.withPackages (ps: with ps; [ six ]);
-in
+, docbook_xml_dtd_43, docbook_xsl, gnome-doc-utils, dblatex, gettext, itstool
+}:
 
 stdenv.mkDerivation rec {
   name = "gtk-doc-${version}";
@@ -22,11 +19,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
-   [ pkgconfig perl pythonEnv libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
-     gnome-doc-utils dblatex gettext which itstool
-   ];
+    [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
+      gnome-doc-utils dblatex gettext which itstool
+    ];
 
-  configureFlags = "--disable-scrollkeeper";
+  configureFlags = [ "--disable-scrollkeeper" ];
+
+  # Make six available for binaries, python.withPackages creates a wrapper
+  # but scripts are not allowed in shebangs so we link it into sys.path.
+  postInstall = ''
+    ln -s ${python.pkgs.six}/lib/python2.7/site-packages/* $out/share/gtk-doc/python/
+  '';
 
   doCheck = false; # requires a lot of stuff
   doInstallCheck = false; # fails

From a87b50bc6341c4539ee49fc6b1d14820b85a23db Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 11:42:38 -0400
Subject: [PATCH 2636/3370] emacs: readd version 25

---
 pkgs/applications/editors/emacs/25.nix        | 136 ++++++++++++++++++
 .../applications/editors/emacs/at-fdcwd.patch |  15 ++
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |  31 +++-
 4 files changed, 177 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs/25.nix
 create mode 100644 pkgs/applications/editors/emacs/at-fdcwd.patch

diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix
new file mode 100644
index 000000000000..b659e060e3b4
--- /dev/null
+++ b/pkgs/applications/editors/emacs/25.nix
@@ -0,0 +1,136 @@
+{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
+, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
+, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
+, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
+, withX ? !stdenv.isDarwin
+, withGTK2 ? false, gtk2 ? null
+, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
+, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
+, withCsrc ? true
+, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
+}:
+
+assert (libXft != null) -> libpng != null;      # probably a bug
+assert stdenv.isDarwin -> libXaw != null;       # fails to link otherwise
+assert withGTK2 -> withX || stdenv.isDarwin;
+assert withGTK3 -> withX || stdenv.isDarwin;
+assert withGTK2 -> !withGTK3 && gtk2 != null;
+assert withGTK3 -> !withGTK2 && gtk3 != null;
+assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null;
+
+let
+  toolkit =
+    if withGTK2 then "gtk2"
+    else if withGTK3 then "gtk3"
+    else "lucid";
+in
+stdenv.mkDerivation rec {
+  name = "emacs-${version}${versionModifier}";
+  version = "25.3";
+  versionModifier = "";
+
+  src = fetchurl {
+    url = "mirror://gnu/emacs/${name}.tar.xz";
+    sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
+  };
+
+  enableParallelBuilding = true;
+
+  patches = lib.optionals stdenv.isDarwin [
+    ./at-fdcwd.patch
+
+    # Backport of the fix to
+    # https://lists.gnu.org/archive/html/bug-gnu-emacs/2017-04/msg00201.html
+    # Should be removed when switching to Emacs 26.1
+    (fetchurl {
+      url = "https://gist.githubusercontent.com/aaronjensen/f45894ddf431ecbff78b1bcf533d3e6b/raw/6a5cd7f57341aba673234348d8b0d2e776f86719/Emacs-25-OS-X-use-vfork.patch";
+      sha256 = "1nlsxiaynswqhy99jf4mw9x0sndhwcrwy8713kq1l3xqv9dbrzgj";
+    })
+  ];
+
+  nativeBuildInputs = [ pkgconfig ]
+    ++ lib.optionals srcRepo [ autoconf automake texinfo ]
+    ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;
+
+  buildInputs =
+    [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
+    ++ lib.optionals stdenv.isLinux [ dbus libselinux ]
+    ++ lib.optionals withX
+      [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
+        imagemagick gconf ]
+    ++ lib.optional (withX && withGTK2) gtk2
+    ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
+    ++ lib.optional (stdenv.isDarwin && withX) cairo
+    ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ];
+
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
+
+  hardeningDisable = [ "format" ];
+
+  configureFlags = [ "--with-modules" ] ++
+   (if stdenv.isDarwin
+      then [ "--with-ns" "--disable-ns-self-contained" ]
+    else if withX
+      then [ "--with-x-toolkit=${toolkit}" "--with-xft" ]
+      else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no"
+             "--with-gif=no" "--with-tiff=no" ])
+    ++ lib.optional withXwidgets "--with-xwidgets";
+
+  preConfigure = lib.optionalString srcRepo ''
+    ./autogen.sh
+  '' + ''
+    substituteInPlace lisp/international/mule-cmds.el \
+      --replace /usr/share/locale ${gettext}/share/locale
+
+    for makefile_in in $(find . -name Makefile.in -print); do
+        substituteInPlace $makefile_in --replace /bin/pwd pwd
+    done
+  '';
+
+  installTargets = "tags install";
+
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp
+    cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
+    $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el
+
+    rm -rf $out/var
+    rm -rf $out/share/emacs/${version}/site-lisp
+  '' + lib.optionalString withCsrc ''
+    for srcdir in src lisp lwlib ; do
+      dstdir=$out/share/emacs/${version}/$srcdir
+      mkdir -p $dstdir
+      find $srcdir -name "*.[chm]" -exec cp {} $dstdir \;
+      cp $srcdir/TAGS $dstdir
+      echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el
+    done
+  '' + lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/Applications
+    mv nextstep/Emacs.app $out/Applications
+  '';
+
+  meta = with stdenv.lib; {
+    description = "The extensible, customizable GNU text editor";
+    homepage    = http://www.gnu.org/software/emacs/;
+    license     = licenses.gpl3Plus;
+    maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ];
+    platforms   = platforms.all;
+
+    longDescription = ''
+      GNU Emacs is an extensible, customizable text editor—and more.  At its
+      core is an interpreter for Emacs Lisp, a dialect of the Lisp
+      programming language with extensions to support text editing.
+
+      The features of GNU Emacs include: content-sensitive editing modes,
+      including syntax coloring, for a wide variety of file types including
+      plain text, source code, and HTML; complete built-in documentation,
+      including a tutorial for new users; full Unicode support for nearly all
+      human languages and their scripts; highly customizable, using Emacs
+      Lisp code or a graphical interface; a large number of extensions that
+      add other functionality, including a project planner, mail and news
+      reader, debugger interface, calendar, and more.  Many of these
+      extensions are distributed with GNU Emacs; others are available
+      separately.
+    '';
+  };
+}
diff --git a/pkgs/applications/editors/emacs/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch
new file mode 100644
index 000000000000..2d8099b73736
--- /dev/null
+++ b/pkgs/applications/editors/emacs/at-fdcwd.patch
@@ -0,0 +1,15 @@
+diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
+index 84ede3e..8e8f42e 100644
+--- a/lib/careadlinkat.h
++++ b/lib/careadlinkat.h
+@@ -23,6 +23,10 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ 
++#ifndef AT_FDCWD
++#define AT_FDCWD -2
++#endif
++
+ struct allocator;
+ 
+ /* Assuming the current directory is FD, get the symbolic link value
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 35a16699d430..5724adf16ad7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -78,6 +78,7 @@ mapAliases (rec {
   double_conversion = double-conversion; # 2017-11-22
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
   emacs25Macport_25_1 = emacs25Macport; # added 2018-04-25
+  emacsMelpa = emacs25PackagesNg; # for backward compatibility
   enblendenfuse = enblend-enfuse; # 2015-09-30
   evolution_data_server = evolution-data-server; # added 2018-02-25
   etcdctl = etcd; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 972052dab5e2..4831d3fb9196 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15382,12 +15382,29 @@ with pkgs;
 
   elvis = callPackage ../applications/editors/elvis { };
 
-  emacs = emacs25;
-  emacsPackages = emacs25Packages;
-  emacsPackagesNg = emacs25PackagesNg;
-  emacsMelpa = emacs25PackagesNg; # for backward compatibility
+  emacs = emacs26;
+  emacsPackages = emacs26Packages;
+  emacsPackagesNg = emacs26PackagesNg;
 
-  emacs25 = callPackage ../applications/editors/emacs {
+  emacs26 = callPackage ../applications/editors/emacs {
+    # use override to enable additional features
+    libXaw = xorg.libXaw;
+    Xaw3d = null;
+    gconf = null;
+    alsaLib = null;
+    imagemagick = null;
+    acl = null;
+    gpm = null;
+    inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
+  };
+
+  emacs26-nox = lowPrio (appendToName "nox" (emacs26.override {
+    withX = false;
+    withGTK2 = false;
+    withGTK3 = false;
+  }));
+
+  emacs25 = callPackage ../applications/editors/emacs/25.nix {
     # use override to enable additional features
     libXaw = xorg.libXaw;
     Xaw3d = null;
@@ -15556,6 +15573,7 @@ with pkgs;
   };
 
   emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages;
+  emacs26Packages = emacsPackagesGen emacs26 pkgs.emacs26Packages;
 
   emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
     inherit lib newScope stdenv;
@@ -15579,8 +15597,9 @@ with pkgs;
   };
 
   emacs25PackagesNg = emacsPackagesNgGen emacs25;
-
   emacs25WithPackages = emacs25PackagesNg.emacsWithPackages;
+  emacs26PackagesNg = emacsPackagesNgGen emacs26;
+  emacs26WithPackages = emacs26PackagesNg.emacsWithPackages;
   emacsWithPackages = emacsPackagesNg.emacsWithPackages;
 
   inherit (gnome3) empathy;

From aa2160e1b62bdc6795c465e68301ec8684540b24 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 13:33:08 -0400
Subject: [PATCH 2637/3370] =?UTF-8?q?emacs26:=20add=20some=20tweaks=20from?=
 =?UTF-8?q?=20jwiegley=E2=80=99s=20overlay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

original src:
https://github.com/jwiegley/nix-config/blob/f85c560bf8165fecbbd6a28bc2ba0ebbafeb3cf3/overlays/10-emacs.nix
---
 pkgs/applications/editors/emacs/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix
index b82f97e445f6..67afdb24cd47 100644
--- a/pkgs/applications/editors/emacs/default.nix
+++ b/pkgs/applications/editors/emacs/default.nix
@@ -40,6 +40,12 @@ stdenv.mkDerivation rec {
     ./clean-env.patch
   ];
 
+  postPatch = lib.optionalString srcRepo ''
+    rm -fr .git
+  '';
+
+  CFLAGS = "-DMAC_OS_X_VERSION_MAX_ALLOWED=101200";
+
   nativeBuildInputs = [ pkgconfig ]
     ++ lib.optionals srcRepo [ autoconf automake texinfo ]
     ++ lib.optional (withX && (withGTK3 || withXwidgets)) wrapGAppsHook;

From 382c20912ede5e0da7c3e0addd803762ef68f48c Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 28 May 2018 19:57:10 +0200
Subject: [PATCH 2638/3370] wireshark-gtk: fix build

didn't build (assertion failure) after 48a1345eaa1c modified the
overrides.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4831d3fb9196..a71a4c88726e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15833,7 +15833,7 @@ with pkgs;
   wireshark-qt = wireshark;
 
   # The GTK UI is deprecated by upstream. You probably want the QT version.
-  wireshark-gtk = wireshark.override { withGtk = true; };
+  wireshark-gtk = wireshark.override { withGtk = true; withQt = false; };
   wireshark-cli = wireshark.override { withGtk = false; withQt = false; };
 
   fbida = callPackage ../applications/graphics/fbida { };

From 463b9c9ea3c4b0bed69f6fc4128771942113a5a4 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Mon, 28 May 2018 20:04:06 +0200
Subject: [PATCH 2639/3370] php71: 7.1.17 -> 7.1.18 (#41145)

Changelog: http://www.php.net/ChangeLog-7.php#7.1.18
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 0e161b0e3f71..a669d71036a8 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -348,8 +348,8 @@ in {
   };
 
   php71 = generic {
-    version = "7.1.17";
-    sha256 = "1kyvg1dvn2zddlc7apl8c74wlwz45rxx10fr1s4z6l1cannf6971";
+    version = "7.1.18";
+    sha256 = "13mz8baknpydswjgqzfqqqjv426x4pnc04rfv2k33s7d2makf3jq";
   };
 
   php72 = generic {

From 85016ec3d15648f6468dda1ee872dbc828d44f1f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 11:11:21 -0700
Subject: [PATCH 2640/3370] adapta-gtk-theme: 3.93.1.16 -> 3.93.1.18 (#41124)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/adapta-gtk-theme/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/60eadc1cf0cabf6d0def6a21d1d21c5d
- du listing: https://gist.github.com/afad29a6d76aa88ae6df876a0d28f599
---
 pkgs/misc/themes/adapta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index d696a43b3bcc..372efec785d3 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
-  version = "3.93.1.16";
+  version = "3.93.1.18";
 
   src = fetchFromGitHub {
     owner = "adapta-project";
     repo = "adapta-gtk-theme";
     rev = version;
-    sha256 = "11jjzhqvx74iq12682ymsnms99izwl5hys1anb9l0fl6jy0dh2xx";
+    sha256 = "1jaayfj2h0miaalmgk0i26py4b6750iq3kis2jnm54g2gxyw3ipw";
   };
 
   preferLocalBuild = true;

From 8f43bb4e239e9dfbfbab64a49f8dff3a3f348b8d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 28 May 2018 10:32:16 -0500
Subject: [PATCH 2641/3370] noto-fonts: separate package for unusual weights

Noto provides a large number of unusual font weights so that the complete
package of fonts is more than 300 MB in size. Most of these weights are moved
into noto-fonts-extra; noto-fonts retains the ordinary weights and styles.

See also: #31543
---
 pkgs/data/fonts/noto-fonts/default.nix | 91 +++++++++++++++-----------
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index e2336c51255f..33435c98267a 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -1,47 +1,59 @@
 { stdenv, fetchzip, fetchFromGitHub, optipng, cairo, unzip, pythonPackages, pkgconfig, pngquant, which, imagemagick }:
 
-rec {
-  # 18MB
-  noto-fonts = let version = "2017-10-24-phase3-second-cleanup"; in fetchzip {
-    name = "noto-fonts-${version}";
-
-    url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip";
-    postFetch = ''
-      unzip $downloadedFile
-
-      mkdir -p $out/share/fonts/noto
-      cp noto-fonts-*/hinted/*.ttf $out/share/fonts/noto
-      # Also copy unhinted & alpha fonts for better glyph coverage,
-      # if they don't have a hinted version
-      # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J)
-      cp -n noto-fonts-*/unhinted/*.ttf $out/share/fonts/noto
-      cp -n noto-fonts-*/alpha/*.ttf $out/share/fonts/noto
-    '';
-    sha256 = "013l816cq9svdji266sccscm9sf9pfn472gq9lnqkzlwaxx9qrrl";
-
-    meta = with stdenv.lib; {
-      inherit version;
-      description = "Beautiful and free fonts for many languages";
-      homepage = https://www.google.com/get/noto/;
-      longDescription =
-      ''
-        When text is rendered by a computer, sometimes characters are displayed as
-        “tofu”. They are little boxes to indicate your device doesn’t have a font to
-        display the text.
-
-        Google has been developing a font family called Noto, which aims to support all
-        languages with a harmonious look and feel. Noto is Google’s answer to tofu. The
-        name noto is to convey the idea that Google’s goal is to see “no more tofu”.
-        Noto has multiple styles and weights, and freely available to all.
-
-        This package also includes the Arimo, Cousine, and Tinos fonts.
+let
+  mkNoto = { name, weights, sha256, }:
+    let version = "2017-10-24-phase3-second-cleanup"; in
+    fetchzip {
+      name = "${name}-${version}";
+      inherit sha256;
+      url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip";
+      postFetch = ''
+        unzip $downloadedFile
+        mkdir -p $out/share/fonts/noto
+        # Also copy unhinted & alpha fonts for better glyph coverage,
+        # if they don't have a hinted version
+        # (see https://groups.google.com/d/msg/noto-font/ZJSkZta4n5Y/tZBnLcPdbS0J)
+        for ttf in noto-fonts-*/{hinted,unhinted,alpha}/*-${weights}.ttf
+        do
+            cp -n "$ttf" -t "$out/share/fonts/noto"
+        done
       '';
-      license = licenses.asl20;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ mathnerd314 ];
+      meta = with stdenv.lib; {
+        inherit version;
+        description = "Beautiful and free fonts for many languages";
+        homepage = https://www.google.com/get/noto/;
+        longDescription =
+        ''
+          When text is rendered by a computer, sometimes characters are
+          displayed as “tofu”. They are little boxes to indicate your device
+          doesn’t have a font to display the text.
+
+          Google has been developing a font family called Noto, which aims to
+          support all languages with a harmonious look and feel. Noto is
+          Google’s answer to tofu. The name noto is to convey the idea that
+          Google’s goal is to see “no more tofu”.  Noto has multiple styles and
+          weights, and freely available to all.
+
+          This package also includes the Arimo, Cousine, and Tinos fonts.
+        '';
+        license = licenses.asl20;
+        platforms = platforms.all;
+        maintainers = with maintainers; [ mathnerd314 ];
+      };
     };
+in
+
+rec {
+  noto-fonts = mkNoto {
+    name = "noto-fonts";
+    weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}";
+    sha256 = "1dmarbsfank6xzzx31h5jdv6n99rzblqyb1iqjkpll6dl3627pnb";
+  };
+  noto-fonts-extra = mkNoto {
+    name = "noto-fonts-extra";
+    weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*";
+    sha256 = "1lih49bqmsmblczvbl7qb1bhn0bq8v5xkr991b3gjghpdkx584bc";
   };
-  # 89MB
   noto-fonts-cjk = let version = "1.004"; in fetchzip {
     name = "noto-fonts-cjk-${version}";
 
@@ -74,7 +86,6 @@ rec {
       maintainers = with maintainers; [ mathnerd314 ];
     };
   };
-  # 12MB
   noto-fonts-emoji = let version = "2017-09-13-design-refresh"; in stdenv.mkDerivation {
     name = "noto-fonts-emoji-${version}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a67e23404a47..6c14c69da828 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14516,7 +14516,7 @@ with pkgs;
   nafees = callPackage ../data/fonts/nafees { };
 
   inherit (callPackages ../data/fonts/noto-fonts {})
-    noto-fonts noto-fonts-cjk noto-fonts-emoji;
+    noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra;
 
   nullmailer = callPackage ../servers/mail/nullmailer {
     stdenv = gccStdenv;

From 08c97e8d71a29d2c9cabf5a2c741eba1e0c0edea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 11:22:35 -0700
Subject: [PATCH 2642/3370] arangodb: 3.3.8 -> 3.3.9 (#41070)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/arangodb/versions.

These checks were done:

- built on NixOS
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/foxx-manager passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangobench passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangodump passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangoexport passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangoimp passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangorestore passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangosh passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangovpack passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arango-dfdb passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arango-init-database passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arango-secure-installation passed the binary check.
- /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9/bin/arangod passed the binary check.
- 12 of 12 passed binary check by having a zero exit code.
- 0 of 12 passed binary check by having the new version present in output.
- found 3.3.9 with grep in /nix/store/qkm6rnrq9rkgcgm2yi7ihmmrg7zl1clg-arangodb-3.3.9
- directory tree listing: https://gist.github.com/96b6a91c373183de511e8a58e77045c0
- du listing: https://gist.github.com/58d43e913a2d38280efe4ba36494fddb
---
 pkgs/servers/nosql/arangodb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index b1003687a04d..5d1723274cb4 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -3,14 +3,14 @@
 
 let
 in stdenv.mkDerivation rec {
-  version = "3.3.8";
+  version = "3.3.9";
   name    = "arangodb-${version}";
 
   src = fetchFromGitHub {
     repo = "arangodb";
     owner = "arangodb";
     rev = "v${version}";
-    sha256 = "07qz5fv4w00hs31hmx099vlzlv0x5i10b5i4h8r0bkprih8k3vg3";
+    sha256 = "1zr9byxlqd7s3rnmvdgv85mmk5xxjz0va1pj2gn6y28k569prcbs";
   };
 
   buildInputs = [

From c1d72c6af1dfc06e6688b05bd2ef4bcfe2913a17 Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Mon, 28 May 2018 21:26:37 +0300
Subject: [PATCH 2643/3370] avocode: 2.26.1 -> 2.26.4 (#41131)

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

diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index c1e2da20e548..89a728f1a997 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "avocode-${version}";
-  version = "2.26.1";
+  version = "2.26.4";
 
   src = fetchurl {
     url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip";
-    sha256 = "0npwwz5m4klswc32fs82icpqqfx9v4786sksiwykj75dsznyv3x8";
+    sha256 = "0qbir023zyd53ly6y8zcm3kbhbhjjpclcgp9d0mqb5lc9zajxv12";
   };
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; with gnome2; [

From 50f46e060f88df6b1f73d80862eacaa3daa89a08 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 28 May 2018 20:21:45 +0200
Subject: [PATCH 2644/3370] gdk-pixbuf: fixup library install_names on darwin

Meson tries to use rpaths but we don't use those in the darwin stdenv.
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index f1e73a77bea7..d14e625d4365 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, fetchpatch, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
+{ stdenv, fetchurl, fetchgit, fetchpatch, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
 , docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
 , jasper, gobjectIntrospection, doCheck ? false, makeWrapper }:
 
@@ -53,7 +53,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
     gtk-doc gobjectIntrospection makeWrapper
-  ];
+  ]
+    ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 

From 52dedc9c813a3e9c20f6eeb65f19a774a660f08d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 28 May 2018 14:40:56 -0400
Subject: [PATCH 2645/3370] linux: 4.17-rc6 -> 4.17-rc7

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index e61e9a354dec..4794685a7555 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc6";
-  modDirVersion = "4.17.0-rc6";
+  version = "4.17-rc7";
+  modDirVersion = "4.17.0-rc7";
   extraMeta.branch = "4.17";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "16x8bwhaj35fqhl773qxwabs1rhl3ayapizjsqyzn92pggsgy6p8";
+    sha256 = "0kibvll2h4wvfbfxral7jsjajaijw0jb0scpjascwh66d7cxbbbr";
   };
 
   # Should the testing kernels ever be built on Hydra?

From d58691d38f76739fe275230242a4a46dfb3b9a06 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 12:04:12 -0700
Subject: [PATCH 2646/3370] jruby: 9.1.17.0 -> 9.2.0.0 (#41115)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/jruby/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/rake had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/ast had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jgem had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jirb had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jirb_swing had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/gem had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/ri had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/irb had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/testrb had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/rdoc had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jrubyc had a zero exit code or showed the expected version
- /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jruby passed the binary check.
- /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/jruby.bash passed the binary check.
- /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/ruby passed the binary check.
- /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/.jruby-wrapped passed the binary check.
- /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0/bin/.jruby.bash-wrapped passed the binary check.
- 5 of 16 passed binary check by having a zero exit code.
- 0 of 16 passed binary check by having the new version present in output.
- found 9.2.0.0 with grep in /nix/store/mxi03kwk4c23xpfjpqv1ggfkyf50wjkn-jruby-9.2.0.0
- directory tree listing: https://gist.github.com/4fecc39e96054dd41278b1d505cdb498
- du listing: https://gist.github.com/6382ad0545e74f9ff62a410b61801232
---
 pkgs/development/interpreters/jruby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index 050d5accd2cb..c67fae936ce7 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" "";
 jruby = stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "9.1.17.0";
+  version = "9.2.0.0";
 
   src = fetchurl {
     url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha256 = "1mfzs3mcpx8gmzidilzhpsxhgbblsflq35ww199m46pgiyzzf8ka";
+    sha256 = "1106s1vmcm36gm3vrl1sjrrr2wj6splgik1zrfb7c2y9bzm8swa2";
   };
 
   buildInputs = [ makeWrapper ];

From 5427a1a3831ac7f6a08a2c7c73406af3dbfa49f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 28 May 2018 12:07:28 -0700
Subject: [PATCH 2647/3370] mcelog: 157 -> 158 (#41112)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mcelog/versions.

These checks were done:

- built on NixOS
- /nix/store/1fqizqnwbm6d0m3bfhf07ifi974lf462-mcelog-158/bin/mcelog passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 158 with grep in /nix/store/1fqizqnwbm6d0m3bfhf07ifi974lf462-mcelog-158
- directory tree listing: https://gist.github.com/9d64a5e08433a1d54e003d1331d5dcb4
- du listing: https://gist.github.com/58a6326ee54553f647aebedff6e4e46d
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 4ebc1c00f7af..18e90f85b448 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "157";
+  version = "158";
 
   src = fetchFromGitHub {
     owner  = "andikleen";
     repo   = "mcelog";
     rev    = "v${version}";
-    sha256 = "1965axyfizv2jg412a4wrrghgswwvvgymk7mbwaraw3xl9p21wgv";
+    sha256 = "0hiyj626fv4awzqgf4wnxjkr68cfcllqpibw0ncnpkvk9rn96rqp";
   };
 
   postPatch = ''

From 4b5e23deff87e0c3b7e67f3e7de32270a8e2b9f5 Mon Sep 17 00:00:00 2001
From: CrazedProgrammer <crazedprogrammer@gmail.com>
Date: Wed, 16 May 2018 21:32:35 +0200
Subject: [PATCH 2648/3370] urn: init at 0.7.1

---
 pkgs/development/compilers/urn/default.nix | 61 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/development/compilers/urn/default.nix

diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix
new file mode 100644
index 000000000000..5add2ae4cc55
--- /dev/null
+++ b/pkgs/development/compilers/urn/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchFromGitLab, buildEnv, makeWrapper, lua, luajit, readline
+, useLuaJit ? false
+, extraLibraries ? []
+}:
+
+let
+  version = "0.7.1";
+  # Build a sort of "union package" with all the native dependencies we
+  # have: Lua (or LuaJIT), readline, etc. Then, we can depend on this
+  # and refer to ${urn-rt} instead of ${lua}, ${readline}, etc.
+  urn-rt = buildEnv {
+    name = "urn-rt-${version}";
+    ignoreCollisions = true;
+    paths = if useLuaJit then
+              [ luajit readline ]
+            else
+              [ lua ];
+  };
+
+  inherit (stdenv.lib) optionalString concatMapStringsSep;
+in
+
+stdenv.mkDerivation rec {
+  name = "urn-${optionalString (extraLibraries != []) "with-libraries-"}${version}";
+
+  src = fetchFromGitLab {
+    owner = "urn";
+    repo = "urn";
+    rev = "v${version}";
+    sha256 = "1vw0sljrczbwl7fl5d3frbpklb0larzyp7s7mwwprkb07b027sd5";
+  };
+
+  buildInputs = [ makeWrapper ];
+  # Any packages that depend on the compiler have a transitive
+  # dependency on the Urn runtime support.
+  propagatedBuildInputs = [ urn-rt ];
+
+  makeFlags = ["-B"];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/lib
+    install -m 0755 bin/urn.lua $out/bin/urn
+    cp -r lib $out/lib/urn
+    wrapProgram $out/bin/urn \
+      --add-flags "-i $out/lib/urn --prelude $out/lib/urn/prelude.lisp" \
+      --add-flags "${concatMapStringsSep " " (x: "-i ${x.libraryPath}") extraLibraries}" \
+      --prefix PATH : ${urn-rt}/bin/ \
+      --prefix LD_LIBRARY_PATH : ${urn-rt}/lib/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://urn-lang.com;
+    description = "Yet another Lisp variant which compiles to Lua";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ CrazedProgrammer ];
+  };
+
+  passthru = {
+    inherit urn-rt;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e6c6a526335..bf41d6327331 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6969,6 +6969,8 @@ with pkgs;
 
   bupc = callPackage ../development/compilers/bupc { };
 
+  urn = callPackage ../development/compilers/urn { };
+
   urweb = callPackage ../development/compilers/urweb { };
 
   inherit (callPackage ../development/compilers/vala { })

From de897baceae1783e50bb47d7bdd3396b36c58cdd Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 28 May 2018 15:27:53 -0400
Subject: [PATCH 2649/3370] celf: init at 2013-07-25 (#41141)

---
 .../science/logic/celf/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/applications/science/logic/celf/default.nix

diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/applications/science/logic/celf/default.nix
new file mode 100644
index 000000000000..669cd46cd2ec
--- /dev/null
+++ b/pkgs/applications/science/logic/celf/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, smlnj }:
+
+stdenv.mkDerivation rec {
+  pname = "celf";
+  pversion = "2013-07-25";
+  name = "${pname}-${pversion}";
+
+  src = fetchFromGitHub {
+    owner  = "clf";
+    repo   = pname;
+    rev    = "d61d95900ab316468ae850fa34a2fe9488bc5b59";
+    sha256 = "0slrwcxglp0sdbp6wr65cdkl5wcap2i0fqxbwqfi1q3cpb6ph6hq";
+  };
+
+  buildInputs = [ smlnj ];
+
+  # (can also build with MLton)
+  buildPhase = ''
+    export SMLNJ_HOME=${smlnj}
+    sml < main-export.sml
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp .heap* $out/bin/
+    ./.mkexec ${smlnj}/bin/sml $out/bin celf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Linear logic programming system";
+    homepage = http://github.com/clf/celf;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a71a4c88726e..88df3cd265ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20265,6 +20265,12 @@ with pkgs;
 
   tptp = callPackage ../applications/science/logic/tptp {};
 
+  celf = callPackage ../applications/science/logic/celf {
+    smlnj = if stdenv.isDarwin
+      then smlnjBootstrap
+      else smlnj;
+  };
+
   twelf = callPackage ../applications/science/logic/twelf {
     smlnj = if stdenv.isDarwin
       then smlnjBootstrap

From 9317c05cb388190b1764e520722b7f526ff4cd5e Mon Sep 17 00:00:00 2001
From: Bernard Fortz <bernard.fortz@gmail.com>
Date: Mon, 28 May 2018 15:44:56 -0400
Subject: [PATCH 2650/3370] minergate-cli: init at 8.2 (#41143)

---
 .../misc/minergate-cli/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/misc/minergate-cli/default.nix

diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix
new file mode 100644
index 000000000000..6aa7eea3d7e9
--- /dev/null
+++ b/pkgs/applications/misc/minergate-cli/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, dpkg, makeWrapper, openssl }:
+
+stdenv.mkDerivation rec {
+  version = "8.2";
+  name = "minergate-cli-${version}";
+  src = fetchurl {
+    url = "https://minergate.com/download/ubuntu-cli";
+    sha256 = "393c5ba236f6f92c449496fcda9509f4bfd3887422df98ffa59b3072124a99d8";
+  };
+
+  nativeBuildInputs = [ dpkg makeWrapper ];
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    dpkg-deb -x $src $out
+    pgm=$out/opt/minergate-cli/minergate-cli
+
+    interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2
+    patchelf --set-interpreter "$interpreter" $pgm
+
+    wrapProgram $pgm --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl stdenv.cc.cc ]} 
+
+    rm $out/usr/bin/minergate-cli
+    mkdir -p $out/bin
+    ln -s $pgm $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Minergate CPU/GPU console client mining software";
+    homepage = https://www.minergate.com/;
+    license = licenses.unfree;
+    maintainers = with maintainers; [ bfortz ];
+    platforms = [ "x86_64-linux" ];
+};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88df3cd265ae..63906d3de3b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3370,6 +3370,8 @@ with pkgs;
 
   minergate = callPackage ../applications/misc/minergate { };
 
+  minergate-cli = callPackage ../applications/misc/minergate-cli { };
+
   minidlna = callPackage ../tools/networking/minidlna { };
 
   minisign = callPackage ../tools/security/minisign { };

From e8c5d867a1403a7cbaee94d96644db0ac5c4ec57 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 28 May 2018 12:48:16 -0700
Subject: [PATCH 2651/3370] use https for default Hackage homepage

---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 349f19c96808..a1b92595c78d 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -35,7 +35,7 @@ in
 , enableStaticLibraries ? !hostPlatform.isWindows
 , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
-, homepage ? "http://hackage.haskell.org/package/${pname}"
+, homepage ? "https://hackage.haskell.org/package/${pname}"
 , platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile
 , hydraPlatforms ? null
 , hyperlinkSource ? true

From c5a088bf2b1b03081d64c5a2949e79d8f50e357f Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <lopsided98@users.noreply.github.com>
Date: Mon, 28 May 2018 16:05:05 -0400
Subject: [PATCH 2652/3370] spl, zfs: 0.7.8 -> 0.7.9, unstable to latest
 (#41093)

---
 pkgs/os-specific/linux/spl/default.nix               | 12 ++++++------
 ...prefix-0.7.8.patch => install_prefix-0.7.9.patch} | 12 ------------
 pkgs/os-specific/linux/zfs/default.nix               | 10 +++++-----
 3 files changed, 11 insertions(+), 23 deletions(-)
 rename pkgs/os-specific/linux/spl/{install_prefix-0.7.8.patch => install_prefix-0.7.9.patch} (92%)

diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index 7c37d18c8684..778f00d2a95d 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -62,15 +62,15 @@ in
   assert kernel != null;
 {
     splStable = common {
-      version = "0.7.8";
-      sha256 = "0ypyy7ij280n7rly6ifrvna9k55gxwdx9a7lalf4r1ka714379fi";
-      patches = [ ./install_prefix-0.7.8.patch ];
+      version = "0.7.9";
+      sha256 = "0540m1dv9jvrzk9kw61glg0h0cwj976mr9zb42y3nh17k47ywff0";
+      patches = [ ./install_prefix-0.7.9.patch ];
     };
 
     splUnstable = common {
-      version = "2018-04-10";
-      rev = "9125f8f5bdb36bfbd2d816d30b6b29b9f89ae3d8";
-      sha256 = "00zrbca906rzjd62m4khiw3sdv8x18dapcmvkyaawripwvzc4iri";
+      version = "2018-05-07";
+      rev = "1149b62d20b7ed9d8ae25d5da7a06213d79b7602";
+      sha256 = "07qlx7l23y696gzyy7ynly7n1141w66y21gkmxiia2xwldj8klkx";
       patches = [ ./install_prefix.patch ];
     };
 
diff --git a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch
similarity index 92%
rename from pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch
rename to pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch
index dc91392bd2fe..114ca1231470 100644
--- a/pkgs/os-specific/linux/spl/install_prefix-0.7.8.patch
+++ b/pkgs/os-specific/linux/spl/install_prefix-0.7.9.patch
@@ -112,18 +112,6 @@ index 581083e..0c35fb7 100644
 +kerneldir = @prefix@/libexec/spl/include/sys/fs
  kernel_HEADERS = $(KERNEL_H)
  endif
-diff --git a/include/sys/sysevent/Makefile.am b/include/sys/sysevent/Makefile.am
-index 63d9af3..de1aa18 100644
---- a/include/sys/sysevent/Makefile.am
-+++ b/include/sys/sysevent/Makefile.am
-@@ -8,6 +8,6 @@ USER_H =
- EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
- 
- if CONFIG_KERNEL
--kerneldir = @prefix@/src/spl-$(VERSION)/include/sys/sysevent
-+kerneldir = @prefix@/libexec/spl/include/sys/sysevent
- kernel_HEADERS = $(KERNEL_H)
- endif
 diff --git a/include/util/Makefile.am b/include/util/Makefile.am
 index e2bf09f..3f5d6ce 100644
 --- a/include/util/Makefile.am
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index bdc43a092f7f..b28a5c6416d0 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -156,9 +156,9 @@ in {
     incompatibleKernelVersion = "4.16";
 
     # this package should point to the latest release.
-    version = "0.7.8";
+    version = "0.7.9";
 
-    sha256 = "0m7j5cpz81lqcfbh4w3wvqjjka07wickl27klgy1zplv6vr0baix";
+    sha256 = "0krpxrvnda2jx6l71xhw9fsksyp2a6h9l9asppac3szsd1n7fp9n";
 
     extraPatches = [
       (fetchpatch {
@@ -175,10 +175,10 @@ in {
     incompatibleKernelVersion = "4.16";
 
     # this package should point to a version / git revision compatible with the latest kernel release
-    version = "2018-04-10";
+    version = "2018-05-22";
 
-    rev = "74df0c5e251a920a1966a011c16f960cd7ba562e";
-    sha256 = "1x3mipj3ryznnd7kx84r3n607hv6jqs66mb61g3zcdmvk6al4yq4";
+    rev = "ba863d0be4cbfbea938b10e49fb6ff459ac9ec20";
+    sha256 = "11dhigw1gybalwg2m6si148b6w195dj2lw38snqf6576wb5zndd0";
     isUnstable = true;
 
     extraPatches = [

From 2c933ce2ac32c1fcd5c888cdcdb45f9ac555ba1b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Mon, 28 May 2018 20:19:34 +0000
Subject: [PATCH 2653/3370] Transporter: init at 1.3.3 (#41127)

* Transporter: init at 1.3.3

* Transporter: clarify description
---
 .../networking/transporter/default.nix        | 71 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/networking/transporter/default.nix

diff --git a/pkgs/applications/networking/transporter/default.nix b/pkgs/applications/networking/transporter/default.nix
new file mode 100644
index 000000000000..141c40f3b84e
--- /dev/null
+++ b/pkgs/applications/networking/transporter/default.nix
@@ -0,0 +1,71 @@
+{ stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkgconfig
+, granite
+, vala_0_40
+, gnome3
+, libxml2
+, gettext
+, gobjectIntrospection
+, appstream-glib
+, desktop-file-utils
+, magic-wormhole
+, wrapGAppsHook }:
+
+let
+  pname = "Transporter";
+  version = "1.3.3";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "bleakgrey";
+    repo = pname;
+    rev = version;
+    sha256 = "19zb2yqmyyhk5vgh6p278b76shlq0r8ykk1ks8zzr187nr5lf5k1";
+  };
+
+  nativeBuildInputs = [
+    appstream-glib
+    desktop-file-utils
+    gettext
+    gobjectIntrospection # For setup hook
+    libxml2
+    meson
+    ninja
+    pkgconfig
+    vala_0_40
+    wrapGAppsHook
+  ];
+
+  buildInputs = with gnome3; [
+    defaultIconTheme # If I omit this there's no icons in KDE
+    glib
+    granite
+    gsettings_desktop_schemas
+    gtk3
+    libgee
+    magic-wormhole
+  ];
+
+  prePatch = ''
+  # The paths were hardcoded
+  substituteInPlace ./src/WormholeInterface.vala \
+    --replace /bin/wormhole ${magic-wormhole}/bin/wormhole
+  '';
+  
+  postPatch = ''
+    chmod +x ./meson/post_install.py
+    patchShebangs ./meson/post_install.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple magic-wormhole client";
+    homepage    = https://github.com/bleakgrey/Transporter;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ worldofpeace ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 63906d3de3b8..8faed4d5b510 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5327,6 +5327,8 @@ with pkgs;
 
   translate-shell = callPackage ../applications/misc/translate-shell { };
 
+  transporter = callPackage ../applications/networking/transporter { };
+
   trash-cli = callPackage ../tools/misc/trash-cli { };
 
   trickle = callPackage ../tools/networking/trickle {};

From 3cb60362b7b0f9df61eef8e4ca21d59bf65da689 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 May 2018 22:25:46 +0200
Subject: [PATCH 2654/3370] python-osc: add missing run-time dependency

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a24175ebb74..c8402e184b78 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9117,7 +9117,7 @@ in {
       sha256 = "0hh9j5zd2kc0804d2jmf1q3w5xm9l9s69hhgysbncrv5fw0414lh";
     };
     buildInputs = with pkgs; [ bashInteractive ]; # needed for bash-completion helper
-    propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ];
+    propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml lxml ];
     postInstall = ''
       ln -s $out/bin/osc-wrapper.py $out/bin/osc
       install -D -m444 osc.fish $out/etc/fish/completions/osc.fish

From 29f75982a675d8395777150a281648d9d53b5704 Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <nathaniel@mccallum.life>
Date: Mon, 28 May 2018 16:24:22 -0400
Subject: [PATCH 2655/3370] nixos.modules.tasks.swraid: add raid10 module to
 initrd

---
 nixos/modules/tasks/swraid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix
index d6cb1c96ef46..1b142fb8fd36 100644
--- a/nixos/modules/tasks/swraid.nix
+++ b/nixos/modules/tasks/swraid.nix
@@ -6,7 +6,7 @@
 
   services.udev.packages = [ pkgs.mdadm ];
 
-  boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid456" ];
+  boot.initrd.availableKernelModules = [ "md_mod" "raid0" "raid1" "raid10" "raid456" ];
 
   boot.initrd.extraUdevRulesCommands = ''
     cp -v ${pkgs.mdadm}/lib/udev/rules.d/*.rules $out/

From 98a4fbf85744e7b6cbe8083c8ebee239b65c7b64 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Mon, 28 May 2018 22:53:19 +0200
Subject: [PATCH 2656/3370] libgdiplus: fix build

was broken after b22cc53db147cdbfe84ffbc344143bf1e8c1e515
---
 pkgs/development/libraries/libgdiplus/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index d3a21ee7fa29..79f49c629b86 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
 
   patchFlags = "-p0";
 
+  hardeningDisable = [ "format" ];
+
   buildInputs =
     [ pkgconfig glib cairo fontconfig libtiff giflib
       libjpeg libpng libXrender libexif

From 5509528c2c166c2b2d40b0191e06de7dd5ae8b49 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Mon, 28 May 2018 23:33:00 +0200
Subject: [PATCH 2657/3370] ocamlPackages.opam-file-format: init at 2.0.0-rc2
 (#41164)

---
 .../opam-file-format/default.nix              | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/opam-file-format/default.nix

diff --git a/pkgs/development/ocaml-modules/opam-file-format/default.nix b/pkgs/development/ocaml-modules/opam-file-format/default.nix
new file mode 100644
index 000000000000..1dec7e36e1c9
--- /dev/null
+++ b/pkgs/development/ocaml-modules/opam-file-format/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib }:
+
+stdenv.mkDerivation rec {
+  version = "2.0.0-rc2";
+  name = "ocaml${ocaml.version}-opam-file-format-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ocaml";
+    repo = "opam-file-format";
+    rev = "${version}";
+    sha256 = "05g0pikmifmfkwyws5x82fglgsz3d317yfn6nrz7zmpn22cirvir";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  installFlags = [ "LIBDIR=$(OCAMLFIND_DESTDIR)" ];
+
+  meta = {
+    description = "Parser and printer for the opam file syntax";
+    license = stdenv.lib.licenses.lgpl21;
+    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 c0961a6a5795..ef7e6f4c5888 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -519,6 +519,8 @@ let
 
     omd = callPackage ../development/ocaml-modules/omd { };
 
+    opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { };
+
     otfm = callPackage ../development/ocaml-modules/otfm { };
 
     otr = callPackage ../development/ocaml-modules/otr { };

From 25be6fdb0e4b1bf416a2c00f012710739d68400b Mon Sep 17 00:00:00 2001
From: David Izquierdo <david@izquierdofernandez.com>
Date: Mon, 28 May 2018 23:48:32 +0200
Subject: [PATCH 2658/3370] tbb: update 2018_U1 -> 2018_U3 (#41134)

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

diff --git a/pkgs/development/libraries/tbb/default.nix b/pkgs/development/libraries/tbb/default.nix
index 182fbb35d499..59765adf7a87 100644
--- a/pkgs/development/libraries/tbb/default.nix
+++ b/pkgs/development/libraries/tbb/default.nix
@@ -2,13 +2,13 @@
 
 with stdenv.lib; stdenv.mkDerivation rec {
   name = "tbb-${version}";
-  version = "2018_U1";
+  version = "2018_U3";
 
   src = fetchFromGitHub {
     owner = "01org";
     repo = "tbb";
     rev = version;
-    sha256 = "1lygz07va6hsv2vlx9zwz5d2n81rxsdhmh0pqxgj8n1bvb1rp0qw";
+    sha256 = "137hb03ms93v4svjq038z6clfh41y8iq7wcif8n92xz2wzaap006";
   };
 
   makeFlags = concatStringsSep " " (

From 4200c9c87985be29a7207b806d550c5eee7cf8bd Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 28 May 2018 23:55:39 +0200
Subject: [PATCH 2659/3370] gdk-pixbuf: fix binary @rpath reference on darwin

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index d14e625d4365..f9acc721cc39 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -82,6 +82,11 @@ stdenv.mkDerivation rec {
       $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
+  # The fixDarwinDylibNames hook doesn't patch binaries.
+  preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $out/bin/gdk-pixbuf-thumbnailer
+  '';
+
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
   inherit doCheck;
 

From a7e0fb6ffcae252bdd0c85928f179c74c3492a89 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Tue, 29 May 2018 00:21:33 +0200
Subject: [PATCH 2660/3370] wireshark: 2.4.6 -> 2.4.7 (#41175)

See https://www.wireshark.org/docs/relnotes/wireshark-2.4.7.html for
release information
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 8c745a4aa3f8..f3afeced8f65 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.4.6";
+  version = "2.4.7";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz";
-    sha256 = "1znmjg40pf81ks9lnm6ilx0cy32xan5g19gbqkkhj35whb95z5lf";
+    sha256 = "0i2ggkkx7fphsk7kv9kygsf5pcaf4vgnqgi8mj1rrf2gfdl3rjsy";
   };
 
   cmakeFlags = [

From bf3e3f72877ecd9041834bfb9fde65af605245b7 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Mon, 28 May 2018 18:55:32 -0400
Subject: [PATCH 2661/3370] man-pagess: set low priority for man-pages package
 (#41121)

if a package comes with its own man page, prefer it
---
 pkgs/data/documentation/man-pages/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index d050a15cb794..244e00ec70ac 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     homepage = https://www.kernel.org/doc/man-pages/;
     repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
     platforms = with platforms; unix;
+    priority = 30; # if a package comes with its own man page, prefer it
   };
 }

From 11b799db8bebb617fa5332112ff4a06b01f62723 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 29 May 2018 01:05:58 +0200
Subject: [PATCH 2662/3370] gdk-pixbuf: also patch binaries in dev output for
 darwin

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index f9acc721cc39..d2e3fe5e8ca7 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -84,7 +84,8 @@ stdenv.mkDerivation rec {
 
   # The fixDarwinDylibNames hook doesn't patch binaries.
   preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
-    install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $out/bin/gdk-pixbuf-thumbnailer
+    install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$dev/lib/libgdk_pixbuf-2.0.0.dylib" $out/bin/gdk-pixbuf-thumbnailer
+    install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $dev/bin/gdk-pixbuf-thumbnailer
   '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).

From e22167a6f04f26ca11e1bcf346258149338eef8e Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Tue, 29 May 2018 12:10:18 +1000
Subject: [PATCH 2663/3370] libcef: init at 3.3325.1750.gaabe4c4

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

diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
new file mode 100644
index 000000000000..22debc6d68aa
--- /dev/null
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
+, GConf, gdk_pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
+, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
+, libXtst, nspr, nss, pango, libpulseaudio, systemd }:
+
+let
+  libPath =
+    stdenv.lib.makeLibraryPath [
+      alsaLib atk cairo cups dbus expat fontconfig GConf gdk_pixbuf glib gtk2
+      libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
+      libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
+      systemd
+    ];
+in
+stdenv.mkDerivation rec {
+  name = "cef-binary-${version}";
+  # Not very recent but more recent versions have problems:
+  # https://github.com/bazukas/obs-linuxbrowser/issues/63
+  version = "3.3325.1750.gaabe4c4";
+  src = fetchurl {
+    url = "http://opensource.spotify.com/cefbuilds/cef_binary_${version}_linux64.tar.bz2";
+    sha256 = "06pj1ci1lwammz1vwmbgw2fri7gkvbpv4iw67pqckd9xz0cfhwzr";
+  };
+  nativeBuildInputs = [ cmake ];
+  makeFlags = "libcef_dll_wrapper";
+  dontStrip = true;
+  dontPatchELF = true;
+  installPhase = ''
+    mkdir -p $out/lib/ $out/share/cef/
+    cp libcef_dll_wrapper/libcef_dll_wrapper.a $out/lib/
+    cp ../Release/libcef.so $out/lib/
+    patchelf --set-rpath "${libPath}" $out/lib/libcef.so
+    cp ../Release/*.bin $out/share/cef/
+    cp -r ../Resources/* $out/share/cef/
+    cp -r ../include $out/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple framework for embedding Chromium-based browsers in other applications";
+    homepage = http://opensource.spotify.com/cefbuilds/index.html;
+    maintainers = with maintainers; [ puffnfresh ];
+    license = licenses.bsd3;
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34ecad0c1d1c..ca9ee647f904 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9752,6 +9752,8 @@ with pkgs;
   libcec = callPackage ../development/libraries/libcec { };
   libcec_platform = callPackage ../development/libraries/libcec/platform.nix { };
 
+  libcef = callPackage ../development/libraries/libcef { inherit (gnome2) GConf; };
+
   libcello = callPackage ../development/libraries/libcello {};
 
   libcerf = callPackage ../development/libraries/libcerf {};

From 347f73aeb2149652c872c9db403942681e27923e Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Tue, 29 May 2018 12:10:32 +1000
Subject: [PATCH 2664/3370] obs-linuxbrowser: init at 0.3.1

---
 .../video/obs-studio/linuxbrowser.nix         | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/linuxbrowser.nix

diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix
new file mode 100644
index 000000000000..289c0ffd7074
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix
@@ -0,0 +1,48 @@
+# We don't have a wrapper which can supply obs-studio plugins so you have to
+# somewhat manually install this:
+
+# nix-env -f . -iA obs-linuxbrowser
+# mkdir -p ~/.config/obs-studio/plugins
+# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-linuxbrowser ~/.config/obs-studio/plugins/
+
+{ stdenv, fetchFromGitHub, obs-studio, cmake, libcef
+}:
+
+stdenv.mkDerivation rec {
+  name = "obs-linuxbrowser-${version}";
+  version = "0.3.1";
+  src = fetchFromGitHub {
+    owner = "bazukas";
+    repo = "obs-linuxbrowser";
+    rev = version;
+    sha256 = "0dql7wxyhksqa08j1dn5d09v2jwhgywc1p7psifhhvh97rkp4z7j";
+  };
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ obs-studio ];
+  postUnpack = ''
+    mkdir -p cef/Release cef/Resources cef/libcef_dll_wrapper/
+    for i in ${libcef}/share/cef/*; do
+      ln -s $i cef/Release/
+      ln -s $i cef/Resources/
+    done
+    ln -s ${libcef}/lib/libcef.so cef/Release/
+    ln -s ${libcef}/lib/libcef_dll_wrapper.a cef/libcef_dll_wrapper/
+    ln -s ${libcef}/include cef/
+  '';
+  cmakeFlags = [
+    "-DCEF_DIR=../../cef"
+    "-DOBS_INCLUDE=${obs-studio}/include/obs"
+  ];
+  installPhase = ''
+    mkdir -p $out/share/obs/obs-plugins
+    cp -r build/obs-linuxbrowser $out/share/obs/obs-plugins/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Browser source plugin for obs-studio based on Chromium Embedded Framework";
+    homepage = https://github.com/bazukas/obs-linuxbrowser;
+    maintainers = with maintainers; [ puffnfresh ];
+    license = licenses.gpl2;
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca9ee647f904..fb3b5eef25ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17204,6 +17204,8 @@ with pkgs;
 
   oblogout = callPackage ../tools/X11/oblogout { };
 
+  obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { };
+
   obs-studio = libsForQt5.callPackage ../applications/video/obs-studio {
     alsaSupport = stdenv.isLinux;
     pulseaudioSupport = config.pulseaudio or true;

From 0f51d1fa59c7844990765f6ce36ac7f3df5163a2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 29 May 2018 05:14:44 +0000
Subject: [PATCH 2665/3370] ocamlPackages.gapi-ocaml: clean installPhase

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

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index a7c32a069fc8..9c7be26503f5 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.02"
 then throw "gapi-ocaml is not available for OCaml ${ocaml.version}"
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ ocaml jbuilder findlib ];
   propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ];
 
-  installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
-
-  createFindlibDestdir = true;
+  inherit (jbuilder) installPhase;
 
   meta = {
     description = "OCaml client for google services";

From b0102f550153a98bd44e6efea1bdb030c1cf6507 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 29 May 2018 05:25:14 +0000
Subject: [PATCH 2666/3370] ocamlPackages_4_02.async_ssl: remove redundancy

---
 pkgs/development/ocaml-modules/janestreet/async_ssl.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
index fdfd0338bb23..bc1977ce2d69 100644
--- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
+++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix
@@ -6,7 +6,6 @@ buildOcamlJane rec {
   name = "async_ssl";
   version = "113.33.07";
   hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs";
-  postPatch = "export CAML_LD_LIBRARY_PATH=${integers}/lib/ocaml/${ocaml.version}/site-lib/stubslibs:$CAML_LD_LIBRARY_PATH";
   propagatedBuildInputs = [ ctypes async comparelib core fieldslib
                             herelib pipebang sexplib openssl ocaml_oasis ];
   meta = with stdenv.lib; {

From 8baaa433b6775f480fcd25e36dc8b00ed03e0757 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 29 May 2018 08:46:39 +0200
Subject: [PATCH 2667/3370] gdk-pixbuf: patch all darwin binaries

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index d2e3fe5e8ca7..6c97b806f20b 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -84,8 +84,9 @@ stdenv.mkDerivation rec {
 
   # The fixDarwinDylibNames hook doesn't patch binaries.
   preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
-    install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$dev/lib/libgdk_pixbuf-2.0.0.dylib" $out/bin/gdk-pixbuf-thumbnailer
-    install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $dev/bin/gdk-pixbuf-thumbnailer
+    for f in $out/bin/* $dev/bin/*; do
+        install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $f
+    done
   '';
 
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).

From 725de314efc0f0fa118e69d1c05295b107a31353 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 17 Apr 2018 08:26:39 +0000
Subject: [PATCH 2668/3370] tree-wide: random cleanups

---
 pkgs/development/libraries/enchant/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/enchant/default.nix b/pkgs/development/libraries/enchant/default.nix
index 7363a0239352..c51475ecc2a9 100644
--- a/pkgs/development/libraries/enchant/default.nix
+++ b/pkgs/development/libraries/enchant/default.nix
@@ -4,16 +4,17 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   version = "1.6.0";
   pname = "enchant";
-  
+
   src = fetchurl {
     url = "http://www.abisource.com/downloads/${pname}/${version}/${name}.tar.gz";
     sha256 = "0zq9yw1xzk8k9s6x83n1f9srzcwdavzazn3haln4nhp9wxxrxb1g";
   };
-  
+
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [aspell glib hunspell hspell];
-  
+  buildInputs = [ aspell glib hunspell hspell ];
+
   meta = {
+    description = "Generic spell checking library";
     homepage = http://www.abisource.com/enchant;
     platforms = stdenv.lib.platforms.unix;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34ecad0c1d1c..bc3dde1d1d6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9263,7 +9263,7 @@ with pkgs;
 
   qt-gstreamer = callPackage ../development/libraries/gstreamer/legacy/qt-gstreamer {};
 
-  qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155;};
+  qt-gstreamer1 = callPackage ../development/libraries/gstreamer/qt-gstreamer { boost = boost155; };
 
   qtstyleplugin-kvantum-qt4 = callPackage ../development/libraries/qtstyleplugin-kvantum-qt4 { };
 

From 3d53d140703c1b4f65be9b69a93f90affc9d2279 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:08:06 +0000
Subject: [PATCH 2669/3370] tinyxml: disable format hardening, else tests will
 fail

---
 pkgs/development/libraries/tinyxml/2.6.2.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix
index cc374345c2eb..2ec9c57e2411 100644
--- a/pkgs/development/libraries/tinyxml/2.6.2.nix
+++ b/pkgs/development/libraries/tinyxml/2.6.2.nix
@@ -21,8 +21,11 @@ in stdenv.mkDerivation {
     # Use CC, CXX, and LD from environment
     ./2.6.2-cxx.patch
   ];
+
   preConfigure = "export LD=${if stdenv.isDarwin then "clang++" else "g++"}";
 
+  hardeningDisable = [ "format" ];
+
   NIX_CFLAGS_COMPILE =
     stdenv.lib.optional stdenv.isDarwin "-mmacosx-version-min=10.9";
 

From edc59b47150bcf61fffe21ee16791ff34e6cb734 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:08:35 +0000
Subject: [PATCH 2670/3370] linuxPackages.perf: disable format hardening, else
 tests will fail

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

diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix
index bbef2bd19aea..c58851bb03ec 100644
--- a/pkgs/os-specific/linux/kernel/perf.nix
+++ b/pkgs/os-specific/linux/kernel/perf.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation {
 
   makeFlags = ["prefix=$(out)" "WERROR=0"] ++ kernel.makeFlags;
 
+  hardeningDisable = [ "format" ];
+
   # perf refers both to newt and slang
   nativeBuildInputs = [
     asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt

From 430da809af2e3d5f5cc59f202f4b6e5c66d571f1 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:10:57 +0000
Subject: [PATCH 2671/3370] perlPackages.GD: disable format hardening to fix
 some tests

One test still fails :(
---
 pkgs/top-level/perl-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 41a3e7098620..b89b8403dd22 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6462,10 +6462,9 @@ let self = _self // overrides; _self = with self; {
     patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ];
 
     # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
-    NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ];
+    hardeningDisable = [ "format" ];
 
-    # tests fail
-    doCheck = false;
+    doCheck = false; # fails 1 out of 13 tests
 
     makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}";
   };

From e102dc716d6b6a08779a2aac4d1137152b0d4a25 Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Tue, 15 May 2018 00:00:00 +0000
Subject: [PATCH 2672/3370] a52dec: disable tests on i686

before squashing was: "disable pic hardening on i686, else tests will fail"
---
 pkgs/development/libraries/a52dec/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix
index 0bfe3a88e9f4..183400c7786e 100644
--- a/pkgs/development/libraries/a52dec/default.nix
+++ b/pkgs/development/libraries/a52dec/default.nix
@@ -8,6 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2";
   };
 
+  # fails 1 out of 1 tests with "BAD GLOBAL SYMBOLS" on i686
+  # which can also be fixed with
+  # hardeningDisable = stdenv.lib.optional stdenv.isi686 "pic";
+  # but it's better to disable tests than loose ASLR on i686
+  doCheck = !stdenv.isi686;
+
   meta = {
     description = "ATSC A/52 stream decoder";
     homepage = http://liba52.sourceforge.net/;

From ee5660e7f61338462e1f8a8684a6df77431a54d1 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sun, 13 May 2018 01:02:23 +0000
Subject: [PATCH 2673/3370] haskell.compiler.ghc802: disable format hardening,
 else tests will fail

---
 pkgs/development/compilers/ghc/8.0.2.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ghc/8.0.2.nix b/pkgs/development/compilers/ghc/8.0.2.nix
index 63e3899671df..4aa9f3fc81cb 100644
--- a/pkgs/development/compilers/ghc/8.0.2.nix
+++ b/pkgs/development/compilers/ghc/8.0.2.nix
@@ -162,6 +162,8 @@ stdenv.mkDerivation rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
+  hardeningDisable = [ "format" ];
+
   postInstall = ''
     for bin in "$out"/lib/${name}/bin/*; do
       isELF "$bin" || continue

From 29757f379025a507f45a4cda12fc882b730d8053 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 29 May 2018 07:34:59 +0000
Subject: [PATCH 2674/3370] haskell.compiler.ghc842: disable format hardening

---
 pkgs/development/compilers/ghc/8.4.2.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index aa78480e3326..a2c1a751bc35 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -172,6 +172,8 @@ stdenv.mkDerivation rec {
 
   checkTarget = "test";
 
+  hardeningDisable = [ "format" ];
+
   postInstall = ''
     for bin in "$out"/lib/${name}/bin/*; do
       isELF "$bin" || continue

From e933798469dd970a06ddaece4160e7e9429109b3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:00:00 +0200
Subject: [PATCH 2675/3370] glib-networking: fix patch url

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

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index c3bcb3aa1c45..e0bbae69c4ff 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   patches = [
     # Use GNUTLS system trust for certificates
     (fetchpatch {
-      url = https://git.gnome.org/browse/glib-networking/patch/?id=f1c8feee014007cc913b71357acb609f8d1200df;
+      url = https://gitlab.gnome.org/GNOME/glib-networking/commit/f1c8feee014007cc913b71357acb609f8d1200df.patch;
       sha256 = "1rbxqsrcb5if3xs2d18pqzd9xnjysdj715ijc41n5w326fsawg7i";
     })
   ];

From ccd064450c2900b768513b1d1b28396eefd800e3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:01:30 +0200
Subject: [PATCH 2676/3370] gdk-pixbuf: fix git urls

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

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 6c97b806f20b..ae84b1a17016 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   #   sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
   # };
   src = fetchgit {
-    url = https://git.gnome.org/browse/gdk-pixbuf;
+    url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git;
     rev = version;
     sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
   };
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
     # Add missing test file bug753605-atsize.jpg
     (fetchpatch {
-      url = https://git.gnome.org/browse/gdk-pixbuf/patch/?id=87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7;
+      url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch;
       sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0";
     })
 

From 86270fc19e8dce35bbb81507f0b8c9647a82abf2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:11:02 +0200
Subject: [PATCH 2677/3370] gnome2.gtksourceview: fix patch url

---
 pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index 99a45d0a7696..caf067532392 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
   patches = optionals stdenv.isDarwin [
     (fetchpatch {
       name = "change-igemacintegration-to-gtkosxapplication.patch";
-      url = "https://git.gnome.org/browse/gtksourceview/patch/?id=e88357c5f210a8796104505c090fb6a04c213902";
+      url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/e88357c5f210a8796104505c090fb6a04c213902.patch";
       sha256 = "0h5q79q9dqbg46zcyay71xn1pm4aji925gjd5j93v4wqn41wj5m7";
     })
     (fetchpatch {
       name = "update-to-gtk-mac-integration-2.0-api.patch";
-      url = "https://git.gnome.org/browse/gtksourceview/patch/?id=ab46e552e1d0dae73f72adac8d578e40bdadaf95";
+      url = "https://gitlab.gnome.org/GNOME/gtksourceview/commit/ab46e552e1d0dae73f72adac8d578e40bdadaf95.patch";
       sha256 = "0qzrbv4hpa0v8qbmpi2vp575n13lkrvp3cgllwrd2pslw1v9q3aj";
     })
   ];

From c087482770ded639d9a7369977f662eea0d15747 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:13:36 +0200
Subject: [PATCH 2678/3370] gnome3.nemiver: fix patch url

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

diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
index 19853b19fcae..4cd5cce272da 100644
--- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
+++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   patches = [
     ./bool_slot.patch ./safe_ptr.patch
     (fetchpatch {
-      url = "https://git.gnome.org/browse/nemiver/patch/src/persp/dbgperspective/nmv-dbg-perspective.cc?id=262cf9657f9c2727a816972b348692adcc666008";
+      url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch;
       sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7";
     })
   ];

From adcfd39bb98aac06effcc59106e1df46997c8f73 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:23:49 +0200
Subject: [PATCH 2679/3370] gnome3.libcroco: fix patch url

---
 pkgs/desktops/gnome-3/core/libcroco/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/libcroco/default.nix b/pkgs/desktops/gnome-3/core/libcroco/default.nix
index 7df5165d238c..f5ecf088a87c 100644
--- a/pkgs/desktops/gnome-3/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/core/libcroco/default.nix
@@ -13,12 +13,12 @@ in stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       name = "CVE-2017-7960.patch";
-      url = "https://git.gnome.org/browse/libcroco/patch/?id=898e3a8c8c0314d2e6b106809a8e3e93cf9d4394";
+      url = https://gitlab.gnome.org/GNOME/libcroco/commit/898e3a8c8c0314d2e6b106809a8e3e93cf9d4394.patch;
       sha256 = "1xjwdqijxf4b7mhdp3kkgnb6c14y0bn3b3gg79kyrm82x696d94l";
     })
     (fetchpatch {
       name = "CVE-2017-7961.patch";
-      url = "https://git.gnome.org/browse/libcroco/patch/?id=9ad72875e9f08e4c519ef63d44cdbd94aa9504f7";
+      url = https://gitlab.gnome.org/GNOME/libcroco/commit/9ad72875e9f08e4c519ef63d44cdbd94aa9504f7.patch;
       sha256 = "0zakd72ynzjgzskwyvqglqiznsb93j1bkvc1lgyrzgv9rwrbwv9s";
     })
   ];
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "GNOME CSS2 parsing and manipulation toolkit";
-    homepage = https://git.gnome.org/browse/libcroco;
+    homepage = https://gitlab.gnome.org/GNOME/libcroco;
     license = licenses.lgpl2;
     platforms = platforms.unix;
   };

From f59f7c7efa2c1bda05521bf3f752c937a1ec8e5e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:25:00 +0200
Subject: [PATCH 2680/3370] gnome-desktop-testing: update URL

---
 pkgs/development/tools/gnome-desktop-testing/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix
index 788310d5fe97..70b426dc5942 100644
--- a/pkgs/development/tools/gnome-desktop-testing/default.nix
+++ b/pkgs/development/tools/gnome-desktop-testing/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "gnome-desktop-testing-${version}";
 
   src = fetchgit {
-    url = https://git.gnome.org/browse/gnome-desktop-testing;
+    url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git;
     rev = "v${version}";
     sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc";
   };

From 75e3729032bb64ffabc396a0502cfed3736582d6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:26:03 +0200
Subject: [PATCH 2681/3370] dia: update url

---
 pkgs/applications/graphics/dia/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index 73362588a57e..ef63cb97a735 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   version = "0.97.3.20170622";
 
   src = fetchgit {
-    url = git://git.gnome.org/dia;
+    url = https://gitlab.gnome.org/GNOME/dia.git;
     rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c";
     sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96";
   };

From 2790b30af83e4203ead5786301be8119021556ce Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:31:23 +0200
Subject: [PATCH 2682/3370] libhttpseverywhere: update url

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

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 332dd8444eb4..91e8e2d50f19 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library to use HTTPSEverywhere in desktop applications";
-    homepage = https://git.gnome.org/browse/libhttpseverywhere;
+    homepage = https://gitlab.gnome.org/GNOME/libhttpseverywhere;
     license = licenses.lgpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers;

From 76e928d914aee0a5a6eed9cc3c3c7354fe315faf Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:33:23 +0200
Subject: [PATCH 2683/3370] planner: update url

---
 pkgs/applications/office/planner/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix
index b82531ea0348..358bfc380771 100644
--- a/pkgs/applications/office/planner/default.nix
+++ b/pkgs/applications/office/planner/default.nix
@@ -16,7 +16,7 @@ in stdenv.mkDerivation {
   name = "planner-${version}";
 
   src = fetchgit {
-    url = "https://git.gnome.org/browse/planner";
+    url = https://gitlab.gnome.org/GNOME/planner.git;
     rev = "6a79647e5711b2b8d7435cacc3452e643d2f05e6";
     sha256 = "18k40s0f665qclrzvkgyfqmvjk0nqdc8aj3m8n4ky85di4qbqlwd";
   };

From 89c20aa46c63b88d78b9287d4870aa5be8d25544 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 10:57:50 +0200
Subject: [PATCH 2684/3370] gnome2.vte: fix patch url

---
 pkgs/desktops/gnome-2/desktop/vte/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix
index 80c77d9b291c..c7ed90905acd 100644
--- a/pkgs/desktops/gnome-2/desktop/vte/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix
@@ -18,12 +18,12 @@ in stdenv.mkDerivation rec {
     # fixed in upstream version 0.32.2
     (fetchpatch{
       name = "CVE-2012-2738-1.patch";
-      url = https://git.gnome.org/browse/vte/patch/?id=feeee4b5832b17641e505b7083e0d299fdae318e;
+      url = https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch;
       sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n";
     })
     (fetchpatch{
       name = "CVE-2012-2738-2.patch";
-      url = https://git.gnome.org/browse/vte/patch/?id=98ce2f265f986fb88c38d508286bb5e3716b9e74;
+      url = https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch;
       sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn";
     })
   ];

From 2af5b6eadda12680129f68da89cc5b25f013be9a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 29 May 2018 17:54:18 +0800
Subject: [PATCH 2685/3370] umockdev: fix build

---
 .../libraries/umockdev/default.nix            | 24 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/umockdev/default.nix b/pkgs/development/libraries/umockdev/default.nix
index 0f727a9be476..1ff71fa18114 100644
--- a/pkgs/development/libraries/umockdev/default.nix
+++ b/pkgs/development/libraries/umockdev/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, automake, autoconf, libtool, gtk-doc
+{ stdenv, fetchFromGitHub, autoreconfHook, libtool
 , pkgconfig, glib, systemd, libgudev, vala }:
 
 stdenv.mkDerivation rec {
@@ -6,21 +6,27 @@ stdenv.mkDerivation rec {
   version = "0.11.3";
 
   src = fetchFromGitHub {
-    owner = "martinpitt";
-    repo = "umockdev";
-    rev = version;
-    sha256 ="1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik";
+    owner  = "martinpitt";
+    repo   = "umockdev";
+    rev    = version;
+    sha256 = "1z101yw7clxz39im3y435s3rj1gna3kp0fkj9wd62vxqvk68lhik";
   };
 
-  buildInputs = [ glib systemd libgudev ];
-  nativeBuildInputs = [ automake autoconf libtool gtk-doc pkgconfig vala ];
+  # autoreconfHook complains if we try to build the documentation
+  postPatch = ''
+    echo 'EXTRA_DIST =' > docs/gtk-doc.make
+  '';
 
-  preConfigure = "NOCONFIGURE=1 ./autogen.sh";
+  buildInputs = [ glib systemd libgudev ];
+
+  nativeBuildInputs = [ autoreconfHook libtool pkgconfig vala ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "Mock hardware devices for creating unit tests";
     license = licenses.lgpl2;
-    maintainers = [ maintainers.ndowens ];
+    maintainers = with maintainers; [ ndowens ];
     platforms = with platforms; linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc3dde1d1d6e..4e08ed71e88e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11796,7 +11796,9 @@ with pkgs;
 
   uid_wrapper = callPackage ../development/libraries/uid_wrapper { };
 
-  umockdev = callPackage ../development/libraries/umockdev {  };
+  umockdev = callPackage ../development/libraries/umockdev {
+    vala = vala_0_40;
+  };
 
   unibilium = callPackage ../development/libraries/unibilium { };
 

From e89414ff699ddd0689a696db7889b6e5654c847d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 11:11:40 +0000
Subject: [PATCH 2686/3370] vsqlite: fix build

Probably broken by 1d6a14e24a65d41e30c824d1e339a372060d171a.
---
 pkgs/development/libraries/vsqlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix
index bfb07c2df337..d9a9564e6de1 100644
--- a/pkgs/development/libraries/vsqlite/default.nix
+++ b/pkgs/development/libraries/vsqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, sqlite }:
+{ stdenv, fetchurl, boost, sqlite, zlib }:
 
 stdenv.mkDerivation rec {
   name = "vsqlite-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237";
   };
 
-  buildInputs = [ boost sqlite ];
+  buildInputs = [ boost sqlite zlib ];
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.in \

From f5ef39039c73ced747a277d7d397be12f4f286e2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@fysik.su.se>
Date: Tue, 29 May 2018 13:54:28 +0200
Subject: [PATCH 2687/3370] qgit: 2.7 -> 2.8

---
 .../version-management/git-and-tools/qgit/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 188e5a4faafa..0a88fbd09291 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, cmake, qtbase }:
+{ stdenv, fetchFromGitHub, cmake, qtbase }:
 
 stdenv.mkDerivation rec {
-  name = "qgit-2.7";
+  name = "qgit-2.8";
 
-  src = fetchgit {
-    url = "http://repo.or.cz/qgit4/redivivus.git";
+  src = fetchFromGitHub {
+    owner = "tibirna";
+    repo = "qgit";
     rev = name;
-    sha256 = "0c0zxykpgkxb8gpgzz5i6b8nrzg7cdxikvpg678x7gsnxhlwjv3a";
+    sha256 = "01l6mz2f333x3zbfr68mizwpsh6sdsnadcavpasidiych1m5ry8f";
   };
 
   buildInputs = [ qtbase ];

From b37cb1de2b6051a3b65fb14e22ca10a30fb5955d Mon Sep 17 00:00:00 2001
From: "nagato.pain" <iuns@outlook.fr>
Date: Mon, 28 May 2018 17:15:40 -0700
Subject: [PATCH 2688/3370] pythonPackages.pdfminer_six: init at 20170720

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

diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix
new file mode 100644
index 000000000000..462c4d558567
--- /dev/null
+++ b/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }:
+
+buildPythonPackage rec {
+  pname = "pdfminer_six";
+  version = "20170720";
+
+  src = fetchFromGitHub {
+    owner = "pdfminer";
+    repo = "pdfminer.six";
+    rev = "${version}";
+    sha256 = "0vax5k0a8qn8x86ybpzqydk7x3hajsk8b6xf3y610j19mgag6wvs";
+  };
+
+  propagatedBuildInputs = [ six pycryptodome chardet ];
+  
+  checkInputs = [ nose pytest ];
+  checkPhase = ''
+    # some crappy hack to ensure the test do not fail for python3
+    # for some reason importing from the folder tools fails :\
+    cp tools/dumppdf.py tests/
+    cp tools/pdf2txt.py tests/
+    sed -i '/from tools import dumppdf/c\    import dumppdf' tests/test_tools_dumppdf.py
+    sed -i '/import tools.pdf2txt as pdf2txt/c\import pdf2txt as pdf2txt' tests/test_tools_pdf2txt.py
+    pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "fork of PDFMiner using six for Python 2+3 compatibility";
+    homepage = https://github.com/pdfminer/pdfminer.six;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42f5f6c17112..4d926cb22892 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -311,6 +311,8 @@ in {
 
   outcome = callPackage ../development/python-modules/outcome {};
 
+  pdfminer_six = callPackage ../development/python-modules/pdfminer_six { };
+
   plantuml = callPackage ../tools/misc/plantuml { };
 
   Pmw = callPackage ../development/python-modules/Pmw { };

From a3caa7bd05f7a5070a02efa49eb7fd806b73b549 Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Tue, 29 May 2018 13:30:41 +0100
Subject: [PATCH 2689/3370] pythonPackages.pdfminer: replacing pdfminer with
 pdfminer_six

---
 .../python-modules/pdfminer_six/default.nix   | 10 ++------
 pkgs/top-level/python-packages.nix            | 24 +------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix
index 462c4d558567..71d439d4c201 100644
--- a/pkgs/development/python-modules/pdfminer_six/default.nix
+++ b/pkgs/development/python-modules/pdfminer_six/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }:
+{ stdenv, buildPythonPackage, python, fetchFromGitHub, six, pycryptodome, chardet, nose, pytest }:
 
 buildPythonPackage rec {
   pname = "pdfminer_six";
@@ -15,13 +15,7 @@ buildPythonPackage rec {
   
   checkInputs = [ nose pytest ];
   checkPhase = ''
-    # some crappy hack to ensure the test do not fail for python3
-    # for some reason importing from the folder tools fails :\
-    cp tools/dumppdf.py tests/
-    cp tools/pdf2txt.py tests/
-    sed -i '/from tools import dumppdf/c\    import dumppdf' tests/test_tools_dumppdf.py
-    sed -i '/import tools.pdf2txt as pdf2txt/c\import pdf2txt as pdf2txt' tests/test_tools_pdf2txt.py
-    pytest
+    ${python.interpreter} -m pytest
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d926cb22892..f02a44d925a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -311,7 +311,7 @@ in {
 
   outcome = callPackage ../development/python-modules/outcome {};
 
-  pdfminer_six = callPackage ../development/python-modules/pdfminer_six { };
+  pdfminer = callPackage ../development/python-modules/pdfminer_six { };
 
   plantuml = callPackage ../tools/misc/plantuml { };
 
@@ -3784,28 +3784,6 @@ in {
     };
   };
 
-
-  pdfminer = buildPythonPackage rec {
-    version = "20140328";
-    name = "pdfminer-${version}";
-
-    disabled = ! isPy27;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pdfminer/pdfminer-${version}.tar.gz";
-      sha256 = "0qpjv4b776dwvpf5a7v19g41qsz97bv0qqsyvm7a31k50n9pn65s";
-    };
-
-    propagatedBuildInputs = with self; [  ];
-
-    meta = {
-      description = "Tool for extracting information from PDF documents";
-      homepage = http://euske.github.io/pdfminer/index.html;
-      license = licenses.mit;
-      maintainers = with maintainers; [ ];
-    };
-  };
-
   peppercorn = buildPythonPackage rec {
     name = "peppercorn-0.5";
 

From c52dff6d841361071804fb66ed58ba1cf4d59aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 13 May 2018 10:05:54 +0100
Subject: [PATCH 2690/3370] linuxPackages.bcc: make it useable as a python
 library

---
 pkgs/os-specific/linux/bcc/default.nix        | 48 +++++++++++++------
 .../bcc/fix-deadlock-detector-import.patch    | 14 ++++++
 pkgs/os-specific/linux/bcc/libbcc-path.patch  | 11 +++++
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 62 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
 create mode 100644 pkgs/os-specific/linux/bcc/libbcc-path.patch

diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix
index 2e2c872fb187..4f0a423600f8 100644
--- a/pkgs/os-specific/linux/bcc/default.nix
+++ b/pkgs/os-specific/linux/bcc/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, cmake, llvmPackages, kernel
-, flex, bison, elfutils, python, pythonPackages, luajit, netperf, iperf, libelf
+, flex, bison, elfutils, python, luajit, netperf, iperf, libelf
 , systemtap
 }:
 
-stdenv.mkDerivation rec {
+python.pkgs.buildPythonApplication rec {
   version = "0.5.0";
   name = "bcc-${version}";
 
@@ -14,9 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "0bb3244xll5sqx0lvrchg71qy2zg0yj6r5h4v5fvrg1fjhaldys9";
   };
 
+  format = "other";
+
   buildInputs = [
     llvmPackages.llvm llvmPackages.clang-unwrapped kernel
-    elfutils python pythonPackages.netaddr luajit netperf iperf
+    elfutils luajit netperf iperf
     systemtap.stapBuild
   ];
 
@@ -26,18 +28,31 @@ stdenv.mkDerivation rec {
       url = "https://github.com/iovisor/bcc/commit/bd7fa55bb39b8978dafd0b299e35616061e0a368.patch";
       sha256 = "1sgxhsq174iihyk1x08py73q8fh78d7y3c90k5nh8vcw2pf1xbnf";
     })
+
+    # This is needed until we fix
+    # https://github.com/NixOS/nixpkgs/issues/40427
+    ./fix-deadlock-detector-import.patch
   ];
 
   nativeBuildInputs = [ makeWrapper cmake flex bison ]
     # libelf is incompatible with elfutils-libelf
     ++ stdenv.lib.filter (x: x != libelf) kernel.moduleBuildDependencies;
 
-  cmakeFlags =
-    [ "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"
-      "-DREVISION=${version}"
-      "-DENABLE_USDT=ON"
-      "-DENABLE_CPP_API=ON"
-    ];
+  cmakeFlags = [
+    "-DBCC_KERNEL_MODULES_DIR=${kernel.dev}/lib/modules"
+    "-DREVISION=${version}"
+    "-DENABLE_USDT=ON"
+    "-DENABLE_CPP_API=ON"
+  ];
+
+  postPatch = ''
+    substituteAll ${./libbcc-path.patch} ./libbcc-path.patch
+    patch -p1 < libbcc-path.patch
+  '';
+
+  propagatedBuildInputs = [
+    python.pkgs.netaddr
+  ];
 
   postInstall = ''
     mkdir -p $out/bin $out/share
@@ -47,12 +62,17 @@ stdenv.mkDerivation rec {
 
     find $out/share/bcc/tools -type f -executable -print0 | \
     while IFS= read -r -d ''$'\0' f; do
-      pythonLibs="$out/lib/python2.7/site-packages:${pythonPackages.netaddr}/lib/${python.libPrefix}/site-packages"
-      rm -f $out/bin/$(basename $f)
-      makeWrapper $f $out/bin/$(basename $f) \
-        --prefix LD_LIBRARY_PATH : $out/lib \
-        --prefix PYTHONPATH : "$pythonLibs"
+      bin=$out/bin/$(basename $f)
+      if [ ! -e $bin ]; then
+        ln -s $f $bin
+      fi
     done
+
+    sed -i -e "s!lib=.*!lib=$out/bin!" $out/bin/{java,ruby,node,python}gc
+  '';
+
+  postFixup = ''
+    wrapPythonProgramsIn "$out/share/bcc/tools" "$out $pythonPath"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch b/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
new file mode 100644
index 000000000000..87ce618a0dd9
--- /dev/null
+++ b/pkgs/os-specific/linux/bcc/fix-deadlock-detector-import.patch
@@ -0,0 +1,14 @@
+--- source.org/tools/deadlock_detector.py	1980-01-02 00:00:00.000000000 +0000
++++ source/tools/deadlock_detector.py	2018-05-29 13:57:11.807126673 +0100
+@@ -44,9 +44,8 @@
+ #
+ # 01-Feb-2017   Kenny Yu   Created this.
+ 
+-from __future__ import (
+-    absolute_import, division, unicode_literals, print_function
+-)
++from __future__ import absolute_import, division, unicode_literals, print_function
++
+ from bcc import BPF
+ from collections import defaultdict
+ import argparse
diff --git a/pkgs/os-specific/linux/bcc/libbcc-path.patch b/pkgs/os-specific/linux/bcc/libbcc-path.patch
new file mode 100644
index 000000000000..187bb3aadd00
--- /dev/null
+++ b/pkgs/os-specific/linux/bcc/libbcc-path.patch
@@ -0,0 +1,11 @@
+--- source.org/src/python/bcc/libbcc.py	2018-05-13 08:35:06.850522883 +0100
++++ source/src/python/bcc/libbcc.py	2018-05-13 08:36:24.602733151 +0100
+@@ -14,7 +14,7 @@
+ 
+ import ctypes as ct
+ 
+-lib = ct.CDLL("libbcc.so.0", use_errno=True)
++lib = ct.CDLL("@out@/lib/libbcc.so.0", use_errno=True)
+ 
+ # keep in sync with bpf_common.h
+ lib.bpf_module_create_b.restype = ct.c_void_p
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0106586d03a..993707c0e419 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13548,7 +13548,9 @@ with pkgs;
 
     batman_adv = callPackage ../os-specific/linux/batman-adv {};
 
-    bcc = callPackage ../os-specific/linux/bcc { };
+    bcc = callPackage ../os-specific/linux/bcc {
+      python = python3;
+    };
 
     bbswitch = callPackage ../os-specific/linux/bbswitch {};
 

From 50c82704a8b0c412adc633c95672f863b6c05281 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 12:00:05 +0000
Subject: [PATCH 2691/3370] qt5.qtlocation: enable parallel building

It was fixed in [1] which is part of 5.9.2, 5.10.0.

[1] https://github.com/qt/qtlocation/commit/3ac051c4549575634cecc706175b019f4ed4c3bf#diff-b820e0828543b1da522ff0ab3dac6c75
---
 pkgs/development/libraries/qt-5/modules/qtlocation.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
index e8952e29cbaf..0eee684a53fd 100644
--- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix
@@ -4,8 +4,6 @@ qtModule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
   outputs = [ "bin" "out" "dev" ];
-  # Linking with -lclipper fails with parallel build enabled
-  enableParallelBuilding = false;
   qmakeFlags = stdenv.lib.optional stdenv.isDarwin [
      # boost uses std::auto_ptr which has been disabled in clang with libcxx
      # This flag re-enables this feature

From 5ac2382487f2611df8b7c7d2b92111962b417527 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 08:35:04 +0000
Subject: [PATCH 2692/3370] mirrors: remove obsolete mysql mirror

It does not contain any of the versions currently in Nixpkgs.
---
 pkgs/build-support/fetchurl/mirrors.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index b0d3f373a462..cc015f9d6046 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -368,7 +368,6 @@ rec {
 
   # MySQL mirrors
   mysql = [
-    http://mysql.mirrors.pair.com/Downloads/
     http://cdn.mysql.com/Downloads/
   ];
 

From 4b975f0fb941066ce1a8ab7ec7489e8924149a5f Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 08:36:21 +0000
Subject: [PATCH 2693/3370] mysql55: 5.5.58 -> 5.5.60

mysql-test-run.pl.1 no longer exists.

Do not install and immediately delete mysql-test and sql-bench.
---
 pkgs/servers/sql/mysql/5.5.x.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 29d25b77afc8..15f82a90208c 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -6,11 +6,11 @@
 let
 self = stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.58";
+  version = "5.5.60";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "1f890376ld1qapl038sjh2ialdizys3sj96vfn4mqmb1ybx14scv";
+    sha256 = "071xaamqkbscybqzm79gf2w3bkr9lqlzwafis3gzc8w8fkhi4hd3";
   };
 
   patches = if stdenv.isCygwin then [
@@ -47,6 +47,8 @@ self = stdenv.mkDerivation rec {
     "-DINSTALL_MYSQLSHAREDIR=share/mysql"
     "-DINSTALL_DOCDIR=share/mysql/docs"
     "-DINSTALL_SHAREDIR=share/mysql"
+    "-DINSTALL_MYSQLTESTDIR="
+    "-DINSTALL_SQLBENCHDIR="
   ];
 
   NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7
@@ -57,8 +59,7 @@ self = stdenv.mkDerivation rec {
   '';
   postInstall = ''
     sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
-    rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a
-    rm $out/share/man/man1/mysql-test-run.pl.1
+    rm -r $out/data "$out"/lib/*.a
   '';
 
   passthru = {

From 303a17a939e7c00b6fc69993afed1e971e8a07e0 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 09:40:45 +0000
Subject: [PATCH 2694/3370] mysql57: 5.7.20 -> 5.7.22

Do not SKIP_BUILD_RPATH to let libmysql_api_test run during the build.

There is no WITH_UNITTEST, but there is WITH_UNIT_TESTS.

Do not install and immediately delete mysql-test.

There is no "basedir=" in mysql_install_db.
---
 pkgs/servers/sql/mysql/5.7.x.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 15e8569fd09e..4017f5946a48 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -6,11 +6,11 @@
 let
 self = stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.7.20";
+  version = "5.7.22";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.7/${name}.tar.gz";
-    sha256 = "11v4g3igigv3zvknv67qml8in6fjrbs2vnr3q6bg6f62nydm95sk";
+    sha256 = "1wng15j5caz6fsv28avlcxjgq3c5n90ifk79xa0h7jws19dl1f2f";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
@@ -26,14 +26,14 @@ self = stdenv.mkDerivation rec {
   outputs = [ "out" "static" ];
 
   cmakeFlags = [
+    "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build.
     "-DWITH_SSL=yes"
     "-DWITH_EMBEDDED_SERVER=yes"
-    "-DWITH_UNITTEST=no"
+    "-DWITH_UNIT_TESTS=no"
     "-DWITH_ZLIB=yes"
     "-DWITH_ARCHIVE_STORAGE_ENGINE=yes"
     "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes"
     "-DWITH_FEDERATED_STORAGE_ENGINE=yes"
-    "-DCMAKE_VERBOSE_MAKEFILE=yes"
     "-DHAVE_IPV6=yes"
     "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
     "-DMYSQL_DATADIR=/var/lib/mysql"
@@ -45,6 +45,7 @@ self = stdenv.mkDerivation rec {
     "-DINSTALL_DOCREADMEDIR=share/mysql"
     "-DINSTALL_SUPPORTFILESDIR=share/mysql"
     "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+    "-DINSTALL_MYSQLTESTDIR="
     "-DINSTALL_DOCDIR=share/mysql/docs"
     "-DINSTALL_SHAREDIR=share/mysql"
   ];
@@ -53,13 +54,10 @@ self = stdenv.mkDerivation rec {
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
 
   prePatch = ''
-    sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake
+    sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in
   '';
   postInstall = ''
-    sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db
-    install -vD $out/lib/*.a -t $static/lib
-    rm -r $out/mysql-test
-    rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a
+    moveToOutput "lib/*.a" $static
     ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary}
   '';
 

From 11bf5db639e43e4399ed5bda292e866d929d447f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 29 May 2018 15:36:19 +0200
Subject: [PATCH 2695/3370] inkscape: fix build

---
 pkgs/applications/graphics/inkscape/default.nix | 3 +++
 pkgs/top-level/all-packages.nix                 | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index de4849e21620..ae3de3494122 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -64,6 +64,9 @@ stdenv.mkDerivation rec {
     rm "$out/share/icons/hicolor/icon-theme.cache"
   '';
 
+  # 0.92.3 complains about an invalid conversion from const char * to char *
+  NIX_CFLAGS_COMPILE = " -fpermissive ";
+
   meta = with lib; {
     license = "GPL";
     homepage = https://www.inkscape.org;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0106586d03a..fe4e0cc91f40 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16413,6 +16413,7 @@ with pkgs;
 
   inkscape = callPackage ../applications/graphics/inkscape {
     lcms = lcms2;
+    poppler = poppler_0_61;
   };
 
   inspectrum = libsForQt5.callPackage ../applications/misc/inspectrum { };

From 1ac4be3052c7e78ed07cd6fc8e6150fec4c1db48 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 14:28:41 +0200
Subject: [PATCH 2696/3370] signal-desktop: use top-level gtk

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 8258fa315dbc..b9c1c2a1db0a 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, gnome3, atk, cairo, pango, gdk_pixbuf, glib, freetype,
+{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib, freetype,
 fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
 libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
 nspr, alsaLib, cups, expat, udev
@@ -16,7 +16,7 @@ let
     gdk_pixbuf
     glib
     gnome3.gconf
-    gnome3.gtk2
+    gtk2
     pango
     libX11
     libXScrnSaver

From 6045fb6945d59776498e5529d2cd73edb8f95a7c Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 14:29:13 +0200
Subject: [PATCH 2697/3370] franz: use top-level gtk

---
 .../networking/instant-messengers/franz/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 12b4bb54cfc6..db3cafb355f6 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook
-, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig
+, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk2
 , gnome3, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
     libXrender libX11 libXtst libXScrnSaver
   ]) ++ [
-    gnome3.gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     gnome3.gconf nss nspr alsaLib cups expat stdenv.cc.cc
   ];
   runtimeDependencies = [ udev.lib libnotify ];

From 59f86ab48d44e22dd0411093b2f55f9a969f7b53 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 29 May 2018 14:31:35 +0200
Subject: [PATCH 2698/3370] gnome3: remove gtk2 from the attribute set

---
 pkgs/desktops/gnome-3/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 422dedbce853..d0c6558a611b 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -52,7 +52,7 @@ let
     hitori gnome-taquin
   ];
 
-  inherit (pkgs) atk glib gobjectIntrospection gtk2 webkitgtk gtk3 gtkmm3 libcanberra-gtk2
+  inherit (pkgs) atk glib gobjectIntrospection webkitgtk gtk3 gtkmm3
     libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
     easytag meld orca rhythmbox shotwell gnome-usage
     clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle;
@@ -421,7 +421,6 @@ let
   gnome_themes_standard = gnome-themes-standard; # added 2018-02-25
   gnome-tweak-tool = gnome-tweaks; # added 2018-03-21
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
-  libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25
   libgames-support = libgnome-games-support; # added 2018-03-14
   libgnome_keyring = libgnome-keyring; # added 2018-02-25
   inherit (pkgs) rarian; # added 2018-04-25

From 06f1ae59713db2bd50647652677b5061d913b281 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 14:11:13 +0000
Subject: [PATCH 2699/3370] ccl: fix build after #28029

https://github.com/Clozure/ccl/blob/15d7e26377efa27eeb7086960f090f8c8ab5330e/lisp-kernel/linuxx8664/Makefile#L29
---
 pkgs/development/compilers/ccl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix
index f3a4ff74aa05..9570b0eead85 100644
--- a/pkgs/development/compilers/ccl/default.nix
+++ b/pkgs/development/compilers/ccl/default.nix
@@ -81,6 +81,8 @@ stdenv.mkDerivation rec {
     ln -s "$out"/bin/"${CCL_RUNTIME}" "$out"/bin/ccl
   '';
 
+  hardeningDisable = [ "format" ];
+
   meta = with stdenv.lib; {
     description = "Clozure Common Lisp";
     homepage    = https://ccl.clozure.com/;

From 83c98f3656f42a1dda415bfaf8b4a9ac2412694c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 14:16:06 +0000
Subject: [PATCH 2700/3370] cmake_2_8: fix build after #28029

---
 pkgs/development/tools/build-managers/cmake/2.8.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index e014276cd670..f6da92fe6219 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -77,6 +77,8 @@ stdenv.mkDerivation rec {
       configureFlags="--parallel=''${NIX_BUILD_CORES:-1} $configureFlags"
     '';
 
+  hardeningDisable = [ "format" ];
+
   meta = {
     homepage = https://cmake.org;
     description = "Cross-Platform Makefile Generator";

From 2c92213cd2bb38bcf1a74169f5f615f93df8c49c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 14:19:39 +0000
Subject: [PATCH 2701/3370] dadadodo: fix build after #28029

---
 pkgs/tools/text/dadadodo/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix
index 4a146accffc0..dea8e15b540a 100644
--- a/pkgs/tools/text/dadadodo/default.nix
+++ b/pkgs/tools/text/dadadodo/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     cp dadadodo $out/bin
   '';
 
+  hardeningDisable = [ "format" ];
+
   meta = with stdenv.lib; {
     description = "Markov chain-based text generator";
     homepage = http://www.jwz.org/dadadodo;

From c83a53098599c49ec57823bf655ce8b45f6aea10 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 14:20:43 +0000
Subject: [PATCH 2702/3370] sqlite: do not contaminate dependent libtool-based
 projects with sqlite dependencies

sqlite is built as a shared library, but libtool nevertheless adds -lz into the
link commands of the dependent projects, which fail to link if they do not
directly depend on libz.  Fix this by clearing dependency_libs in libsqlite3.la.
---
 pkgs/development/libraries/sqlite/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index eaeafa741297..03f2f5c7199e 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -66,6 +66,11 @@ stdenv.mkDerivation rec {
     echo ""
   '';
 
+  postInstall = ''
+    # Do not contaminate dependent libtool-based projects with sqlite dependencies.
+    sed -i $out/lib/libsqlite3.la -e "s/dependency_libs=.*/dependency_libs='''/"
+  '';
+
   meta = {
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
     downloadPage = http://sqlite.org/download.html;

From 2100519278a662714e0aa4ff406dc2bb9062dc7a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 15:00:45 +0000
Subject: [PATCH 2703/3370] Revert "vsqlite: fix build"

This reverts commit e89414ff699ddd0689a696db7889b6e5654c847d.
---
 pkgs/development/libraries/vsqlite/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix
index d9a9564e6de1..bfb07c2df337 100644
--- a/pkgs/development/libraries/vsqlite/default.nix
+++ b/pkgs/development/libraries/vsqlite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, boost, sqlite, zlib }:
+{ stdenv, fetchurl, boost, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "vsqlite-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237";
   };
 
-  buildInputs = [ boost sqlite zlib ];
+  buildInputs = [ boost sqlite ];
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace Makefile.in \

From 1e97008bb8c3d736f197211c3c6563bd9a022124 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 15:06:38 +0000
Subject: [PATCH 2704/3370] luaPackages.mpack: fix build after #28029

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 41debeefc892..311bb1eb63f0 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -759,6 +759,8 @@ let
       "LUA_CMOD_INSTALLDIR=$(out)/lib/lua/${lua.luaversion}"
     ];
 
+    hardeningDisable = [ "fortify" ];
+
     meta = with stdenv.lib; {
       description = "Lua bindings for libmpack";
       homepage = "https://github.com/libmpack/libmpack-lua";

From e27df9e35e194521187fb7b9ecd36ade99ac5605 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 15:08:39 +0000
Subject: [PATCH 2705/3370] p0f: fix build after #28029

---
 pkgs/tools/security/p0f/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
index 0b6a9644424b..11e1f14baf9a 100644
--- a/pkgs/tools/security/p0f/default.nix
+++ b/pkgs/tools/security/p0f/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     cp ./tools/p0f-sendsyn6 $out/sbin
   '';
 
+  hardeningDisable = [ "format" ];
+
   meta = {
     description = "Passive network reconnaissance and fingerprinting tool";
     homepage    = "http://lcamtuf.coredump.cx/p0f3/";

From 198c91de8510d3966dde7cd3fe25eb9143219dcc Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 15:10:00 +0000
Subject: [PATCH 2706/3370] pacparser: fix build after #28029

---
 pkgs/tools/networking/pacparser/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix
index 54b3cf8fd81e..fbb17308f90c 100644
--- a/pkgs/tools/networking/pacparser/default.nix
+++ b/pkgs/tools/networking/pacparser/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
+  hardeningDisable = [ "format" ];
+
   meta = with stdenv.lib; {
     description = "A library to parse proxy auto-config (PAC) files";
     homepage = http://pacparser.manugarg.com/;

From c9e7b380e529e98bfca3887dd5011050515ce937 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 9 May 2018 22:40:30 +0300
Subject: [PATCH 2707/3370] linux: enable support for iGVT-g VGPU

---
 pkgs/os-specific/linux/kernel/common-config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index cee2197f3c7a..a226061ecbfa 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -214,6 +214,11 @@ with stdenv.lib;
   ${optionalString (versionOlder version "4.3") ''
     DRM_I915_KMS y
   ''}
+  # iGVT-g support
+  ${optionalString (versionAtLeast version "4.16") ''
+    DRM_I915_GVT y
+    DRM_I915_GVT_KVMGT m
+  ''}
   # Allow specifying custom EDID on the kernel command line
   DRM_LOAD_EDID_FIRMWARE y
   VGA_SWITCHEROO y # Hybrid graphics support

From 30dc2913317b4077912c145cd20fe8804ac67502 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 11 May 2018 20:49:14 +0300
Subject: [PATCH 2708/3370] virt-viewer: support ALSA

---
 pkgs/applications/virtualization/virt-viewer/default.nix | 7 +++++--
 pkgs/development/libraries/spice-gtk/default.nix         | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix
index eb48e1d3d300..33e12d109854 100644
--- a/pkgs/applications/virtualization/virt-viewer/default.nix
+++ b/pkgs/applications/virtualization/virt-viewer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp
 , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen
 , gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl
-, libapparmor
+, libapparmor, gst_all_1
 , spiceSupport ? true
 , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null
 }:
@@ -30,11 +30,14 @@ stdenv.mkDerivation rec {
     xen
   ] ++ optionals spiceSupport [
     spice-gtk spice-protocol libcap gdbm
+    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
   ];
 
   postInstall = ''
     for f in "$out"/bin/*; do
-        wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+        wrapProgram "$f" \
+          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
+          --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
     done
   '';
 
diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 05fd952eb2e8..1b054334c691 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -2,7 +2,7 @@
 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
 , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
 , withPolkit ? true, polkit, acl, usbutils
-, vala, gtk3, epoxy, libdrm }:
+, vala, gtk3, epoxy, libdrm, gst_all_1 }:
 
 # If this package is built with polkit support (withPolkit=true),
 # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root.
@@ -46,7 +46,7 @@ in stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    spice-protocol celt_0_5_1 openssl libpulseaudio pixman
+    spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman
     libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm
   ] ++ optionals withPolkit [ polkit acl usbutils ] ;
 

From ce0d9eecff20b4bcd5df86005763acb8f212b661 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 11 May 2018 21:45:05 +0300
Subject: [PATCH 2709/3370] phodav: init at 2.2

---
 pkgs/tools/networking/phodav/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/networking/phodav/default.nix

diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix
new file mode 100644
index 000000000000..e585af81991e
--- /dev/null
+++ b/pkgs/tools/networking/phodav/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl
+, intltool, pkgconfig, glib, libsoup }:
+
+let
+  version = "2.2";
+in stdenv.mkDerivation rec {
+  name = "phodav-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/GNOME/sources/phodav/${version}/${name}.tar.xz";
+    sha256 = "1hap0lncbcmivnflh0fbx7y58ry78p9wgj7z03r64ic0kvf0a0q8";
+  };
+
+  buildInputs = [ intltool glib libsoup ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "WebDav server implementation and library using libsoup";
+    homepage = https://wiki.gnome.org/phodav;
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe4e0cc91f40..2db43f53bce9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4396,6 +4396,8 @@ with pkgs;
 
   philter = callPackage ../tools/networking/philter { };
 
+  phodav = callPackage ../tools/networking/phodav { };
+
   pinentry = callPackage ../tools/security/pinentry {
     libcap = if stdenv.isDarwin then null else libcap;
   };

From 62500ec9649a17c2bd5380a5551043b426560cd6 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 11 May 2018 22:09:22 +0300
Subject: [PATCH 2710/3370] virt-viewer: folder sharing support

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

diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix
index 1b054334c691..21359c4f0d0b 100644
--- a/pkgs/development/libraries/spice-gtk/default.nix
+++ b/pkgs/development/libraries/spice-gtk/default.nix
@@ -2,7 +2,7 @@
 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib
 , cyrus_sasl, python2Packages, autoreconfHook, usbredir, libsoup
 , withPolkit ? true, polkit, acl, usbutils
-, vala, gtk3, epoxy, libdrm, gst_all_1 }:
+, vala, gtk3, epoxy, libdrm, gst_all_1, phodav }:
 
 # If this package is built with polkit support (withPolkit=true),
 # usb redirection reqires spice-client-glib-usb-acl-helper to run setuid root.
@@ -47,7 +47,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     spice-protocol celt_0_5_1 openssl libpulseaudio gst_all_1.gst-plugins-base pixman
-    libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm
+    libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy libdrm phodav
   ] ++ optionals withPolkit [ polkit acl usbutils ] ;
 
   nativeBuildInputs = [ pkgconfig gettext libsoup autoreconfHook vala gobjectIntrospection ];

From a3e239ac6233dc895edaf90d8d4ba6728d4d4a41 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 29 May 2018 19:29:23 +0300
Subject: [PATCH 2711/3370] nixos/kvmgt: init

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/virtualisation/kvmgt.nix | 64 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 nixos/modules/virtualisation/kvmgt.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 12d9e1adf23d..d6f2c85a8109 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -787,6 +787,7 @@
   ./virtualisation/lxd.nix
   ./virtualisation/amazon-options.nix
   ./virtualisation/hyperv-guest.nix
+  ./virtualisation/kvmgt.nix
   ./virtualisation/openvswitch.nix
   ./virtualisation/parallels-guest.nix
   ./virtualisation/qemu-guest-agent.nix
diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix
new file mode 100644
index 000000000000..fc0bedb68bd0
--- /dev/null
+++ b/nixos/modules/virtualisation/kvmgt.nix
@@ -0,0 +1,64 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.virtualisation.kvmgt;
+  kernelPackages = config.boot.kernelPackages;
+  vgpuOptions = {
+    uuid = mkOption {
+      type = types.string;
+      description = "UUID of VGPU device. You can generate one with <package>libossp_uuid</package>.";
+    };
+  };
+in {
+  options = {
+    virtualisation.kvmgt = {
+      enable = mkEnableOption ''
+        KVMGT (iGVT-g) VGPU support. Allows Qemu/KVM guests to share host's Intel integrated graphics card.
+        Currently only one graphical device can be shared
+      '';
+      # multi GPU support is under the question
+      device = mkOption {
+        type = types.string;
+        default = "0000:00:02.0";
+        description = "PCI ID of graphics card. You can figure it with <command>ls /sys/class/mdev_bus</command>.";
+      };
+      vgpus = mkOption {
+        default = {};
+        type = with types; attrsOf (submodule [ { options = vgpuOptions; } ]);
+        description = ''
+          Virtual GPUs to be used in Qemu. You can find devices via <command>ls /sys/bus/pci/devices/*/mdev_supported_types</command>
+          and find info about device via <command>cat /sys/bus/pci/devices/*/mdev_supported_types/i915-GVTg_V5_4/description</command>
+        '';
+        example = {
+          "i915-GVTg_V5_8" = {
+            uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
+          };
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    assertions = singleton {
+      assertion = versionAtLeast kernelPackages.kernel.version "4.16";
+      message = "KVMGT is not properly supported for kernels older than 4.16";
+    };
+    boot.kernelParams = [ "i915.enable_gvt=1" ];
+    systemd.services = mapAttrs' (name: value:
+      nameValuePair "kvmgt-${name}" {
+        description = "KVMGT VGPU ${name}";
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          ExecStart = "${pkgs.runtimeShell} -c 'echo ${value.uuid} > /sys/bus/pci/devices/${cfg.device}/mdev_supported_types/${name}/create'";
+          ExecStop = "${pkgs.runtimeShell} -c 'echo 1 > /sys/bus/pci/devices/${cfg.device}/${value.uuid}/remove'";
+        };
+        wantedBy = [ "multi-user.target" ];
+      }
+    ) cfg.vgpus;
+  };
+
+  meta.maintainers = with maintainers; [ gnidorah ];
+}

From 01f91267e26d5b765c300d49ac28deb97778ef2b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 29 May 2018 18:42:45 +0200
Subject: [PATCH 2712/3370] gitAndTools.svn-all-fast-export: 1.0.11 -> 1.0.12

patch for https://github.com/svn-all-fast-export/svn2git/pull/40 is
contained in this release, so we can drop it here.
---
 .../git-and-tools/svn-all-fast-export/default.nix   | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
index 2dfa61952a57..e3ceccdcf3bd 100644
--- a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }:
 
 let
-  version = "1.0.11";
+  version = "1.0.12";
 in
 stdenv.mkDerivation {
   name = "svn-all-fast-export-${version}";
@@ -10,18 +10,9 @@ stdenv.mkDerivation {
     owner = "svn-all-fast-export";
     repo = "svn2git";
     rev = version;
-    sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj";
+    sha256 = "158w2ynz16dlp992g8nfk7v2f5962z88b4xyv5dyjvbl4l1v7r0v";
   };
 
-  # https://github.com/svn-all-fast-export/svn2git/pull/40
-  patches = [
-    (fetchpatch {
-      name = "pr40.patch";
-      sha256 = "0mwncklzncsifql9zlxlbj3clsif5p2v1xs8nmxrw44mqvaysjw3";
-      url = https://github.com/svn-all-fast-export/svn2git/compare/f00d5a5...flokli:nixos-20180326.patch;
-    })
-  ];
-
   nativeBuildInputs = [ qmake qttools ];
   buildInputs = [ apr.dev subversion.dev qtbase ];
 

From 72fa40f72ddaff7042846a435d019804474c3d54 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 29 May 2018 13:06:17 -0400
Subject: [PATCH 2713/3370] lib: Fix `nix-env -qaP -f . --xml --meta`

A merge undid my fix in d437f2c365a12fb3894eb87f52decf53c745f475.
---
 lib/systems/for-meta.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index d545bcbeb7d3..96e8b6f86eb0 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -22,9 +22,9 @@ in rec {
   freebsd = [ patterns.isFreeBSD ];
   # Should be better, but MinGW is unclear, and HURD is bit-rotted.
   gnu     = [
-    { kernel = parse.kernels.linux; abi = parse.abis.gnu; }
-    { kernel = parse.kernels.linux; abi = parse.abis.gnueabi; }
-    { kernel = parse.kernels.linux; abi = parse.abis.gnueabihf; }
+    { kernel = parse.kernels.linux; abi = abis.gnu; }
+    { kernel = parse.kernels.linux; abi = abis.gnueabi; }
+    { kernel = parse.kernels.linux; abi = abis.gnueabihf; }
   ];
   illumos = [ patterns.isSunOS ];
   linux   = [ patterns.isLinux ];

From 842f1af65e52d1e3acac927cc9a933651f2822c9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 15:22:48 +0000
Subject: [PATCH 2714/3370] yoda: fix build after #28029

---
 pkgs/development/libraries/physics/yoda/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix
index 7519d0da03fc..6cda6bd310be 100644
--- a/pkgs/development/libraries/physics/yoda/default.nix
+++ b/pkgs/development/libraries/physics/yoda/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  hardeningDisable = [ "format" ];
+
   meta = {
     description = "Provides small set of data analysis (specifically histogramming) classes";
     license     = stdenv.lib.licenses.gpl2;

From 51af2c330b2222f51383ecf11e89b8ec7571455e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 17:09:28 +0000
Subject: [PATCH 2715/3370] kytea: fix build after #28029

It moved our -O2 before their -O3, but -O3 inlines "checkValueVecEqual(&,&)" into
"checkValueVecEqual(*,*)".
---
 pkgs/tools/text/kytea/default.nix  |  4 +++-
 pkgs/tools/text/kytea/gcc-O3.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/text/kytea/gcc-O3.patch

diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix
index 142bb721277f..eb537c67a631 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/pkgs/tools/text/kytea/default.nix
@@ -10,12 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
   };
 
+  patches = [ ./gcc-O3.patch ];
+
   meta = with stdenv.lib; {
     homepage = http://www.phontron.com/kytea/;
     description = "General toolkit developed for analyzing text";
 
     longDescription = ''
-      A general toolkit developed for analyzing text, with a focus on Japanese, 
+      A general toolkit developed for analyzing text, with a focus on Japanese,
       Chinese and other languages requiring word or morpheme segmentation.
     '';
 
diff --git a/pkgs/tools/text/kytea/gcc-O3.patch b/pkgs/tools/text/kytea/gcc-O3.patch
new file mode 100644
index 000000000000..71b1d0c3b16e
--- /dev/null
+++ b/pkgs/tools/text/kytea/gcc-O3.patch
@@ -0,0 +1,13 @@
+diff --git a/src/lib/kytea-util.cpp b/src/lib/kytea-util.cpp
+index 7c8c4c6..4492df1 100644
+--- a/src/lib/kytea-util.cpp
++++ b/src/lib/kytea-util.cpp
+@@ -49,5 +49,8 @@ void checkValueVecEqual(const std::vector<T> * a, const std::vector<T> * b) {
+ 
++template void checkValueVecEqual(const std::vector<unsigned int> & a, const std::vector<unsigned int> & b);
+ template void checkValueVecEqual(const std::vector<unsigned int> * a, const std::vector<unsigned int> * b);
++template void checkValueVecEqual(const std::vector<short> & a, const std::vector<short> & b);
+ template void checkValueVecEqual(const std::vector<short> * a, const std::vector<short> * b);
+ template void checkValueVecEqual(const std::vector<vector<KyteaString> > * a, const std::vector<vector<KyteaString> > * b);
++template void checkValueVecEqual(const std::vector<int> & a, const std::vector<int> & b);
+ template void checkValueVecEqual(const std::vector<int> * a, const std::vector<int> * b);

From 28c20a4731da9d5ba539e2d1ef6bcf3ddf1026ac Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Tue, 29 May 2018 19:53:12 +0200
Subject: [PATCH 2716/3370] nixos/gitea: fix pre start script

The hooks directory contains now one level deep subdirectories which
need to be updated as well.
If you use gitea via ssh, ~/.ssh/authorized_keys also needs to be
updated because of the hardcoded path to gitea in the "command" option.
---
 nixos/modules/services/misc/gitea.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 2d0f66de037d..45dfdc71eb36 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -282,7 +282,7 @@ in
 
         mkdir -p ${cfg.repositoryRoot}
         # update all hooks' binary paths
-        HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*")
+        HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 5 -type f -wholename "*git/hooks/*")
         if [ "$HOOKS" ]
         then
           sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS
@@ -295,6 +295,11 @@ in
           mkdir -p ${cfg.stateDir}/conf
           cp -r ${gitea.out}/locale ${cfg.stateDir}/conf/locale
         fi
+        # update command option in authorized_keys
+        if [ -r ${cfg.stateDir}/.ssh/authorized_keys ]
+        then
+          sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys
+        fi
       '' + optionalString (usePostgresql && cfg.database.createDatabase) ''
         if ! test -e "${cfg.stateDir}/db-created"; then
           echo "CREATE ROLE ${cfg.database.user}

From a12a277e6247a7f43b11f7b16bcf815cd5af2d98 Mon Sep 17 00:00:00 2001
From: tilpner <till@hoeppner.ws>
Date: Tue, 29 May 2018 20:07:41 +0200
Subject: [PATCH 2717/3370] racket: use proper uname, allow for unix sockets

Racket checks the current platform via uname, then disallows
unix domain socket usage based on the result. Previously, it could not
successfully call uname at all, so it fell back to denying UDS.
---
 pkgs/development/interpreters/racket/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 32d24fa88356..f25d2933ab7f 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -58,7 +58,9 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     unset AR
-    substituteInPlace src/configure --replace /usr/bin/uname ${coreutils}/bin/uname
+    for f in src/configure src/racket/src/string.c; do
+      substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname
+    done
     mkdir src/build
     cd src/build
   '';

From 1d2338957a2ad44be0ccfc02b864f8b427815764 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 29 May 2018 11:17:33 -0700
Subject: [PATCH 2718/3370] wesnoth: 1.14.1 -> 1.14.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wesnoth/versions.

These checks were done:

- built on NixOS
- /nix/store/5sh8gb3jwfb9086wiyb5sh66zx158bcc-wesnoth-1.14.2/bin/wesnoth passed the binary check.
- /nix/store/5sh8gb3jwfb9086wiyb5sh66zx158bcc-wesnoth-1.14.2/bin/wesnothd passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 1.14.2 with grep in /nix/store/5sh8gb3jwfb9086wiyb5sh66zx158bcc-wesnoth-1.14.2
- directory tree listing: https://gist.github.com/b0e3a41a54024956b2d7971ee078d50e
- du listing: https://gist.github.com/b92ba34a8adb15bfdc22fe1082734759
---
 pkgs/games/wesnoth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 4a3d2bd78a0b..a30685338b00 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.14.1";
+  version = "1.14.2";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "1mzrnbv71b4s41c5x8clhb53l8lidiwzny1hl828228pvys5bxkb";
+    sha256 = "1xhnhxjc8zjv89xmrbffa54fa4ybw6x0p34k14n9lrz1y18vaar8";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From e62b01b78ec2493bb1ff6b793d98a03919160a0f Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent.demeester@docker.com>
Date: Tue, 29 May 2018 21:21:19 +0200
Subject: [PATCH 2719/3370] drone: 0.5 -> 0.8.5 (#41200)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 .../continuous-integration/drone/default.nix  | 53 +++----------------
 .../continuous-integration/drone/deps.nix     | 38 +++++++++++++
 2 files changed, 44 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/development/tools/continuous-integration/drone/deps.nix

diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix
index 845e3f8a1dc4..d8ba99fbf1a8 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/development/tools/continuous-integration/drone/default.nix
@@ -2,66 +2,25 @@
 
 buildGoPackage rec {
   name = "drone.io-${version}";
-  version = "0.5-20161104-${stdenv.lib.strings.substring 0 7 revision}";
-  revision = "232df356afeeb4aec5e2959fa54b084dcadb267f";
+  version = "0.8.5-20180329-${stdenv.lib.strings.substring 0 7 revision}";
+  revision = "81103a98208b0bfc76be5b07194f359fbc80183b";
   goPackagePath = "github.com/drone/drone";
 
   # These dependencies pulled (in `drone` buildprocess) via Makefile,
   # so I extracted them here, all revisions pinned by same date, as ${version}
-  extraSrcs = [ 
-    {
-      goPackagePath = "github.com/drone/drone-ui";
-      src = fetchFromGitHub {
-        owner = "drone";
-        repo = "drone-ui";
-        rev = "e66df33b4620917a2e7b59760887cc3eed543664";
-        sha256 = "0d50xdzkh9akpf5c0sqgcgy11v2vz858l36jp5snr94zkrdkv0n1";
-      };
-    }
-    {
-      goPackagePath = "github.com/drone/mq";
-      src = fetchFromGitHub {
-        owner = "drone";
-        repo = "mq";
-        rev = "0f296601feeed952dabd038793864acdbefe6dbe";
-        sha256 = "1k7439c90l4w29g7wyixfmpbkap7bn8yh8zynbjyjf9qjzwsnw97";
-      };
-    }
-    {
-      goPackagePath = "github.com/tidwall/redlog";
-      src = fetchFromGitHub {
-        owner = "tidwall";
-        repo = "redlog";
-        rev = "54086c8553cd23aba652513a87d2b085ea961541";
-        sha256 = "12a7mk6r8figjinzkbisxcaly6sasggy62m8zs4cf35lpq2lhffq";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-      src = fetchFromGitHub {
-        owner = "golang";
-        repo = "crypto";
-        rev = "9477e0b78b9ac3d0b03822fd95422e2fe07627cd";
-        sha256 = "1qcqai6nf1q50z9ga7r4ljnrh1qz49kwlcqpri4bknx732lqq0v5";
-      };
-    }
-  ];
-  nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
+  goDeps= ./deps.nix;
 
-  preBuild = ''
-    go generate github.com/drone/drone/server/template
-    go generate github.com/drone/drone/store/datastore/ddl
-  '';
+  nativeBuildInputs = [ go-bindata go-bindata-assetfs ];
 
   src = fetchFromGitHub {
     owner = "drone";
     repo = "drone";
     rev = revision;
-    sha256 = "0xrijcrlv3ag9n2kywkrhdkxyhxc8fs6zqn0hyav6a6jpqnsahg3";
+    sha256 = "1890bwhxr62adv261v4kn1azhq7qvcj2zpll68i9nsvjib8a52bq";
   };
 
   meta = with stdenv.lib; {
-    maintainers = with maintainers; [ avnik ];
+    maintainers = with maintainers; [ avnik vdemeester ];
     license = licenses.asl20;
     description = "Continuous Integration platform built on container technology";
   };
diff --git a/pkgs/development/tools/continuous-integration/drone/deps.nix b/pkgs/development/tools/continuous-integration/drone/deps.nix
new file mode 100644
index 000000000000..86059fba28d9
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/drone/deps.nix
@@ -0,0 +1,38 @@
+[
+  {
+    goPackagePath = "github.com/drone/drone-ui";
+    fetch = {
+      type = "git";
+      url = "https://github.com/drone/drone-ui";
+      rev = "5a497bd6cd5c3c17c53b00d40bcda1bf6f68f475";
+      sha256 = "1666xlz3dg468izfwprg17sgb3f4ppn5sj5klds3wgdfrjjm4v57";
+    };
+  }
+  {
+    goPackagePath = "github.com/drone/mq";
+    fetch = {
+      type = "git";
+      url = "https://github.com/drone/mq";
+      rev = "280af2a3b9c7d9ce90d625150dfff972c6c190b8";
+      sha256 = "10a24yq3ya8mvs7j6m7lqhyws7jd923rnih75ciq1g327qxf743s";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/net";
+      rev = "dfa909b99c79129e1100513e5cd36307665e5723";
+      sha256 = "0nsansy1yqy1kzh5wpv3zi85s0chxfq0ha8knhgnfa0wj0k8q0il";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265";
+      sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq";
+    };
+  }
+]

From 52b3f49797d5c1963eef534074d145b3beb47e75 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 19:35:43 +0000
Subject: [PATCH 2720/3370] hyper: gnome2 cleanup (#41170)

* hyper: gnome2 cleanup

* hyper: use toplevel gtk2
---
 pkgs/applications/misc/hyper/default.nix | 9 ++++-----
 pkgs/top-level/all-packages.nix          | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 75d18c7a774d..65b85868bc59 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -1,14 +1,13 @@
-{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
+{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome3, gtk2, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
-, libxcb
-, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
+, libxcb, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    stdenv.cc.cc gtk2 gnome3.gconf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
-    libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
+    libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat libudev libpulseaudio
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 741b7b55fe2b..f4dcd0314066 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16259,8 +16259,7 @@ with pkgs;
 
   hydrogen = callPackage ../applications/audio/hydrogen { };
 
-  hyper = callPackage ../applications/misc/hyper { inherit (gnome2) GConf; };
-  hyperterm = self.hyper;
+  hyper = callPackage ../applications/misc/hyper { };
 
   hyper-haskell-server-with-packages = callPackage ../development/tools/haskell/hyper-haskell/server.nix {
     inherit (haskellPackages) ghcWithPackages;

From e25e9d619115cfa9bf1529d21ac9a64d17db7cd7 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 19:40:59 +0000
Subject: [PATCH 2721/3370] wire-desktop: gnome2 cleanup (#41155)

* wire-desktop: gnome2 cleanup

* wire-desktop: use toplevel gtk2
---
 .../instant-messengers/wire-desktop/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index f0123024fe2f..87dddff4bd05 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome2, atk, cairo, gdk_pixbuf, glib
+{ stdenv, lib, fetchurl, dpkg, makeDesktopItem, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib
 , freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
 , libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
 , nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell
@@ -15,9 +15,9 @@ let
     freetype
     gdk_pixbuf
     glib
-    gnome2.GConf
-    gnome2.gtk
-    gnome2.pango
+    gnome3.gconf
+    gtk2
+    pango
     hunspell
     libnotify
     libX11

From 9a7b9675d907ea3a95375e2d41857d7b7d4bbd32 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Mon, 28 May 2018 12:06:19 +0200
Subject: [PATCH 2722/3370] nodejs: 10.0.0 -> 10.3.0

---
 pkgs/development/web/nodejs/v10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix
index 9f5f18809897..ec5a0e779c34 100644
--- a/pkgs/development/web/nodejs/v10.nix
+++ b/pkgs/development/web/nodejs/v10.nix
@@ -5,7 +5,7 @@ let
 in
   buildNodejs {
     inherit enableNpm;
-    version = "10.0.0";
-    sha256 = "0l5bx2j4f2ij19kx14my7g7k37j3fn9qpjvbisjvhpbm42810fg2";
+    version = "10.3.0";
+    sha256 = "0c8zcwi7r7nnmk29lprdmvil693x5svy3nzbaaqywmg6x2yyk46b";
     patches = lib.optionals stdenv.isDarwin [ ./no-xcode-v7.patch ./no-xcodebuild.patch ];
   }

From 1f14408b0e499dcc5faf656c1d7c8b21b520a72c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 19:54:42 +0000
Subject: [PATCH 2723/3370] skypeforlinux: gnome2 cleanup (#41176)

* skypeforlinux: gnome2 cleanup

* skypeforlinux: use toplevel gdk_pixbuf and gtk2
---
 .../instant-messengers/skypeforlinux/default.nix  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index fc8a601f1bea..e305a4927204 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, dpkg, makeWrapper
-, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib, glibc, gnome2
-, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, systemd, xorg }:
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
+, gtk2, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, pango, systemd, xorg }:
 
 let
 
@@ -22,17 +22,18 @@ let
     glibc
     libsecret
 
-    gnome2.GConf
-    gnome2.gdk_pixbuf
-    gnome2.gtk
-    gnome2.pango
+    gnome3.gconf
+    gdk_pixbuf
+    gtk2
+    
 
-    gnome2.gnome-keyring
+    gnome3.gnome-keyring
 
     libnotify
     libpulseaudio
     nspr
     nss
+    pango
     stdenv.cc.cc
     systemd
     libstdcxx5

From bab973a28b3d8e565300e798cc43e63fb2bf2a0c Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 19:59:05 +0000
Subject: [PATCH 2724/3370] discord: gnome2 cleanup (#41174)

* discord: gnome2 cleanup

* discord: use top-level gtk2
---
 .../networking/instant-messengers/discord/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 09ead9b3de65..ae0951ba99a1 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
-, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
+, glib, gnome3, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage
 , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
 , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     libPath = stdenv.lib.makeLibraryPath [
         libcxx systemd libpulseaudio
         stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
-        gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite
+        gdk_pixbuf glib gnome3.gconf gtk2 libnotify libX11 libXcomposite
         libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
         libXtst nspr nss libxcb pango systemd libXScrnSaver
      ];

From 41bb69fa88c0c9bb86b34f17f36284c92348ca23 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 20:04:04 +0000
Subject: [PATCH 2725/3370] typora: gnome2 cleanup (#41167)

---
 pkgs/applications/editors/typora/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix
index 3513888f74fb..efde7242793d 100644
--- a/pkgs/applications/editors/typora/default.nix
+++ b/pkgs/applications/editors/typora/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome2, gnome3, gtk3, atk, cairo
-, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
+{ stdenv, fetchurl, dpkg, lib, glib, dbus, makeWrapper, gnome3, gtk3, atk, cairo, pango
+, gdk_pixbuf, freetype, fontconfig, nspr, nss, xorg, alsaLib, cups, expat, udev, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "typora-${version}";
@@ -20,10 +20,9 @@ stdenv.mkDerivation rec {
 
     rpath = stdenv.lib.makeLibraryPath [
       alsaLib
-      gnome2.GConf
-      gnome2.gtk
-      gnome2.gdk_pixbuf
-      gnome2.pango
+      gnome3.gconf
+      gdk_pixbuf
+      pango
       gnome3.defaultIconTheme
       expat
       gtk3

From 570327b0a35ed39e9dfba1a263d3866e8e382575 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Tue, 29 May 2018 21:25:11 +0000
Subject: [PATCH 2726/3370] messenger-for-desktop: remove (#41224)

---
 .../messenger-for-desktop/default.nix         | 104 ------------------
 pkgs/top-level/all-packages.nix               |   1 -
 2 files changed, 105 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix b/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
deleted file mode 100644
index 37a3746669b1..000000000000
--- a/pkgs/applications/networking/instant-messengers/messenger-for-desktop/default.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, curl, dbus, expat,
-  fontconfig, freetype, glib, gnome2, libnotify, nspr, nss, systemd, xorg
-}:
-
-with stdenv.lib;
-
-let
-
-  version = "2.0.6";
-
-  rpath = makeLibraryPath [
-    alsaLib
-    atk
-    cairo
-    cups
-    curl
-    dbus
-    expat
-    fontconfig
-    freetype
-    glib
-    gnome2.GConf
-    gnome2.gdk_pixbuf
-    gnome2.gtk
-    gnome2.pango
-    libnotify
-    nspr
-    nss
-    stdenv.cc.cc
-    systemd
-
-    xorg.libxkbfile
-    xorg.libX11
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXrender
-    xorg.libXtst
-    xorg.libXScrnSaver
-  ] + ":${stdenv.cc.cc.lib}/lib64";
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = "https://github.com/aluxian/Messenger-for-Desktop/releases/download/v2.0.6/messengerfordesktop-2.0.6-linux-amd64.deb";
-        sha256 = "bf3f3ed9ac46ceb4b7dffbeb33c7d15bbcbfcdd141c4dbfbb620e8bfefae906b";
-      }
-    else
-      throw "Messenger for Desktop is not supported on ${stdenv.system}";
-
-in stdenv.mkDerivation {
-  name = "messenger-for-desktop-${version}";
-
-  inherit src;
-
-  buildInputs = [ dpkg ];
-  unpackPhase = "true";
-  buildCommand = ''
-    mkdir -p $out
-    dpkg -x $src $out
-
-    mv $out/usr/share $out/share
-    mv $out/opt/messengerfordesktop $out/libexec
-    rmdir $out/usr $out/opt
-
-    chmod -R g-w $out
-
-    # patch the binaries
-    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
-      patchelf --set-rpath ${rpath}:$out/libexec $file || true
-    done
-
-    # add symlink to bin
-    mkdir -p $out/bin
-    ln -s $out/libexec/messengerfordesktop $out/bin/messengerfordesktop
-
-    # Fix the desktop link
-    substituteInPlace $out/share/applications/messengerfordesktop.desktop                 \
-      --replace /opt/messengerfordesktop/messengerfordesktop $out/bin/messengerfordesktop 
-  '';
-
-  meta = {
-    description = "Bring messenger.com to your Linux desktop.";
-    longDescription = ''
-      A simple & beautiful desktop client for Facebook Messenger. Chat without
-      distractions on macOS, Windows and Linux. Not affiliated with Facebook.
-      This is NOT an official product.
-    '';
-    homepage = https://messengerfordesktop.org;
-    license = licenses.mit;
-    maintainers = [
-      maintainers.shawndellysse
-    ];
-    platforms = [
-      "x86_64-linux"
-    ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4dcd0314066..3ec08d9cf997 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21404,7 +21404,6 @@ with pkgs;
   ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
 
   chrome-gnome-shell = callPackage  ../desktops/gnome-3/extensions/chrome-gnome-shell {};
-  messenger-for-desktop = callPackage ../applications/networking/instant-messengers/messenger-for-desktop {};
 
   NSPlist = callPackage ../development/libraries/NSPlist {};
 

From b02b4648528ee377c717e59af7dfd836bde6c865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 29 May 2018 22:28:25 +0100
Subject: [PATCH 2727/3370] neovim-remote: 1.8.6 -> 2.0.5

---
 pkgs/applications/editors/neovim/neovim-remote.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix
index c4d2be4c740b..49b08534cd8c 100644
--- a/pkgs/applications/editors/neovim/neovim-remote.nix
+++ b/pkgs/applications/editors/neovim/neovim-remote.nix
@@ -4,14 +4,14 @@ with stdenv.lib;
 
 pythonPackages.buildPythonPackage rec {
   name = "neovim-remote-${version}";
-  version = "1.8.6";
+  version = "2.0.5";
   disabled = !pythonPackages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "mhinz";
     repo = "neovim-remote";
     rev = "v${version}";
-    sha256 = "0x01zpmxi37jr7j2az2bd8902h7zhkpg6kpvc8xmll9f7703zz2l";
+    sha256 = "08qsi61ba5d69ca77layypzvi7nalx4niy97xn4w88jibnbmbrxw";
   };
 
   propagatedBuildInputs = with pythonPackages; [ neovim psutil ];

From 7a23f1accaccdbadfb28da89e00c2489aa96245c Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 29 May 2018 17:39:21 -0400
Subject: [PATCH 2728/3370] GHCJS darwin fixes (#41120)

* GHCJS darwin fixes

* Fix ghcjs 80 and 710 packages

* Add socket-io to ghcjs 82 and 84 passthru
---
 pkgs/development/compilers/ghcjs-ng/default.nix | 8 +++++++-
 pkgs/top-level/haskell-packages.nix             | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 035687a64f3a..7f13c373942d 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -14,7 +14,9 @@
 , xorg
 , gmp
 , pkgconfig
+, gcc
 , lib
+, nodePackages
 , ghcjsDepOverrides ? (_:_:{})
 }:
 
@@ -40,6 +42,8 @@ let
     inherit (bootGhcjs) version;
     isGhcjs = true;
 
+    socket-io = nodePackages."socket.io";
+
     # Relics of the old GHCJS build system
     stage1Packages = [];
     mkStage2 = _: {};
@@ -49,7 +53,7 @@ let
   libexec =
     if builtins.compareVersions bootGhcjs.version "8.3" <= 0
       then "${bootGhcjs}/bin"
-      else "${bootGhcjs}/libexec/${stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
+      else "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin"] ["osx"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
 
 in stdenv.mkDerivation {
     name = "ghcjs";
@@ -63,6 +67,8 @@ in stdenv.mkDerivation {
       xorg.lndir
       gmp
       pkgconfig
+    ] ++ lib.optionals stdenv.isDarwin [
+      gcc # https://github.com/ghcjs/ghcjs/issues/663
     ];
     phases = ["unpackPhase" "buildPhase"];
     buildPhase = ''
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2e6bd5ebb853..fab88ab180b5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -159,13 +159,13 @@ in rec {
     ghcjs = packages.ghcjs82;
     ghcjs710 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
-      ghc = bh.compiler.ghcjs;
+      ghc = bh.compiler.ghcjs710;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };
     ghcjs80 = callPackage ../development/haskell-modules rec {
       buildHaskellPackages = ghc.bootPkgs;
-      ghc = bh.compiler.ghcjsHEAD;
+      ghc = bh.compiler.ghcjs80;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };
       packageSetConfig = callPackage ../development/haskell-modules/configuration-ghcjs.nix { };
     };

From 403f9d496fe3545d71b4b5c978cf5f9b26f8aef8 Mon Sep 17 00:00:00 2001
From: Uri Baghin <uri@canva.com>
Date: Tue, 29 May 2018 14:09:24 +1000
Subject: [PATCH 2729/3370] bazel-buildtools: init at 2018-05-24

---
 maintainers/maintainer-list.nix               |  5 ++++
 .../bazel/buildtools/default.nix              | 25 ++++++++++++++++
 .../build-managers/bazel/buildtools/deps.nix  | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++++
 4 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/tools/build-managers/bazel/buildtools/default.nix
 create mode 100644 pkgs/development/tools/build-managers/bazel/buildtools/deps.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a1997c2f765d..180bdb65551f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3930,6 +3930,11 @@
     github = "uralbash";
     name = "Svintsov Dmitry";
   };
+  uri-canva = {
+    email = "uri@canva.com";
+    github = "uri-canva";
+    name = "Uri Baghin";
+  };
   utdemir = {
     email = "me@utdemir.com";
     github = "utdemir";
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
new file mode 100644
index 000000000000..a98c2b4e04bd
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "bazel-buildtools";
+  version = "2018-05-24";
+
+  goPackagePath = "github.com/bazelbuild/buildtools";
+
+  src = fetchFromGitHub {
+    owner = "bazelbuild";
+    repo = "buildtools";
+    rev = "588d90030bc8054b550967aa45a8a8d170deba0b";
+    sha256 = "18q1z138545kh4s5k0jcqwhpzc1w7il4x00l7yzv9wq8bg1vn1rv";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "This derivation contains developer tools for working with Google's bazel buildtool.";
+    homepage = https://github.com/bazelbuild/buildtools;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ uri-canva ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
new file mode 100644
index 000000000000..d53c744d04a9
--- /dev/null
+++ b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix
@@ -0,0 +1,29 @@
+[
+  {
+    goPackagePath = "github.com/bazelbuild/buildtools";
+    fetch = {
+      type = "git";
+      url = "https://github.com/bazelbuild/buildtools";
+      rev = "588d90030bc8054b550967aa45a8a8d170deba0b";
+      sha256 = "18q1z138545kh4s5k0jcqwhpzc1w7il4x00l7yzv9wq8bg1vn1rv";
+    };
+  }
+  {
+    goPackagePath = "github.com/golang/protobuf";
+    fetch = {
+      type = "git";
+      url = "https://github.com/golang/protobuf";
+      rev = "3a3da3a4e26776cc22a79ef46d5d58477532dede";
+      sha256 = "05l0kjgk6ss98qii7vpjj2bqszyd16h448w47sv4422mp2xbni40";
+    };
+  }
+  {
+    goPackagePath = "github.com/google/skylark";
+    fetch = {
+      type = "git";
+      url = "https://github.com/google/skylark";
+      rev = "572cea2bd78e2f1de8f3e136db9413cf02f097eb";
+      sha256 = "0hc7gwvqsw421if06nlfdl86h6jl8wgjx1j2x2mzpnzdh1r03w92";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34ecad0c1d1c..89e643192ced 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7647,6 +7647,11 @@ with pkgs;
   bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { };
   bazel = callPackage ../development/tools/build-managers/bazel { };
 
+  bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };
+  buildifier = bazel-buildtools;
+  buildozer = bazel-buildtools;
+  unused_deps = bazel-buildtools;
+
   buildBazelPackage = callPackage ../build-support/build-bazel-package { };
 
   bear = callPackage ../development/tools/build-managers/bear { };

From 7cadf50be205b664fca0a4a378334095a678df42 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 23:16:51 +0000
Subject: [PATCH 2730/3370] virtualbox: fix build after #28029

---
 pkgs/applications/virtualization/virtualbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 71c9c8fa6441..3c5d3e6dc1b0 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
     ++ optionals (headless) [ libXrandr ]
     ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
 
-  hardeningDisable = [ "fortify" "pic" "stackprotector" ];
+  hardeningDisable = [ "format" "fortify" "pic" "stackprotector" ];
 
   prePatch = ''
     set -x

From 6bb08e881dd41c7cda2569126bec930007c2cc0f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 30 May 2018 01:13:59 +0200
Subject: [PATCH 2731/3370] gdk-pixbuf: patch library rpath references on
 darwin

A bunch of the libraries like libpixbufloader-png link against libgdk_pixbuf,
however the install_name is not correct at this point yet since meson tries to use rpaths.
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index ae84b1a17016..849e72d9a976 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -82,10 +82,14 @@ stdenv.mkDerivation rec {
       $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
-  # The fixDarwinDylibNames hook doesn't patch binaries.
+  # The fixDarwinDylibNames hook doesn't patch library references or binaries.
   preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
+    for f in $(find $out/lib -name '*.dylib'); do
+        install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
+    done
+
     for f in $out/bin/* $dev/bin/*; do
-        install_name_tool -change "@rpath/libgdk_pixbuf-2.0.0.dylib" "$out/lib/libgdk_pixbuf-2.0.0.dylib" $f
+        install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
     done
   '';
 

From e4df80a69bf529a322a06391d47b8b7b444d5c4b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 23:26:30 +0000
Subject: [PATCH 2732/3370] haskellPackages.hlibgit2: fix build after #28029

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7d308f5ab722..866079f2e2d3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -332,6 +332,7 @@ self: super: {
   hgdbmi = dontCheck super.hgdbmi;
   hi = dontCheck super.hi;
   hierarchical-clustering = dontCheck super.hierarchical-clustering;
+  hlibgit2 = disableHardening super.hlibgit2 [ "format" ];
   hmatrix-tests = dontCheck super.hmatrix-tests;
   hquery = dontCheck super.hquery;
   hs2048 = dontCheck super.hs2048;

From 796080f3962276a4da5ee1309e417487d8c7b991 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Tue, 29 May 2018 23:31:58 +0000
Subject: [PATCH 2733/3370] pythonPackages.bsddb3: fix build after 0fd461d5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5849a0bc714..3b0946a0579c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1325,7 +1325,7 @@ in {
     #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];
     # We can also use a variable
     preConfigure = ''
-      export BERKELEYDB_DIR=${pkgs.db};
+      export BERKELEYDB_DIR=${pkgs.db.dev};
     '';
 
     meta = {

From 9d338974618b7071a3c36844b5aa2b162bb5b34a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 00:16:27 +0000
Subject: [PATCH 2734/3370] zeroc-ice: fix parallel building

---
 pkgs/development/libraries/zeroc-ice/default.nix    | 2 ++
 pkgs/development/libraries/zeroc-ice/makefile.patch | 9 +++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/development/libraries/zeroc-ice/makefile.patch

diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index 8527832ad9c2..063d64c69058 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2";
   };
 
+  patches = [ ./makefile.patch ];
+
   buildInputs = [ mcpp bzip2 expat openssl db5 ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ];
 
diff --git a/pkgs/development/libraries/zeroc-ice/makefile.patch b/pkgs/development/libraries/zeroc-ice/makefile.patch
new file mode 100644
index 000000000000..6955bcd0a6d7
--- /dev/null
+++ b/pkgs/development/libraries/zeroc-ice/makefile.patch
@@ -0,0 +1,9 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -77,4 +77,6 @@ FreezeScript: Freeze
+ Glacier2 IceGridLib Glacier2CryptPermissionsVerifier: Glacier2Lib
+ 
++Glacier2: IceSSL
++
+ IcePatch2: IcePatch2Lib
+ 

From 8a0ed10ba729c65cb44aa473327e46a204e3c054 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 29 May 2018 17:31:46 -0700
Subject: [PATCH 2735/3370] sc-controller: 0.4.2 -> 0.4.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sc-controller/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/sc-controller had a zero exit code or showed the expected version
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc passed the binary check.
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-daemon had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-dialog had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-keyboard had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-launcher had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-menu had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-message had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-radial-menu had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/scc-osd-show-bindings had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..sc-controller-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.sc-controller-wrapped had a zero exit code or showed the expected version
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-wrapped-wrapped passed the binary check.
- /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-wrapped passed the binary check.
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-daemon-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-daemon-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-dialog-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-dialog-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-keyboard-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-keyboard-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-launcher-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-launcher-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-menu-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-menu-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-message-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-message-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-radial-menu-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-radial-menu-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/..scc-osd-show-bindings-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3/bin/.scc-osd-show-bindings-wrapped had a zero exit code or showed the expected version
- 3 of 30 passed binary check by having a zero exit code.
- 0 of 30 passed binary check by having the new version present in output.
- found 0.4.3 with grep in /nix/store/2qlhi6fqx37zhcxdfn5gygl8xq4zkyip-sc-controller-0.4.3
- directory tree listing: https://gist.github.com/28b55137e29bb39ba0741bd1847fe529
- du listing: https://gist.github.com/446c39be30dba3aa0dc166afa85e757a
---
 pkgs/misc/drivers/sc-controller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index d4ed749ca9cc..5583461d3754 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonApplication rec {
   pname = "sc-controller";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner  = "kozec";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "19i9z5cjjgi3a94hrz5g3a6m4vj71p1gs6mhklc6dq8ydwsadwzz";
+    sha256 = "0w4ykl78vdppqr3d4d0h1f31wly6kis57a1gxhnrbpfrgpj0qhvj";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 9db1f486e15107e417b63119ad5e1917ee126599 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 29 May 2018 21:33:36 -0400
Subject: [PATCH 2736/3370] git: 2.17.0 -> 2.17.1

---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index a3f61f3399db..ceec9f1e75b6 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -18,7 +18,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.17.0";
+  version = "2.17.1";
   svn = subversionClient.override { perlBindings = perlSupport; };
 in
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9";
+    sha256 = "0pm6bdnrrm165k3krnazxcxadifk2gqi30awlbcf9fism1x6w4vr";
   };
 
   outputs = [ "out" ] ++ stdenv.lib.optional perlSupport "gitweb";

From 798d5f5cdb8a8b8f92f920ffc66cd480c9c661ce Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 01:09:14 +0000
Subject: [PATCH 2737/3370] bitlbee: fix build

---
 .../networking/instant-messengers/bitlbee/default.nix    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
index fa3c66e67b61..0b2a97b53786 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix
@@ -15,9 +15,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnutls glib libotr python ]
     ++ optional enableLibPurple pidgin;
 
-  preConfigure = optionalString enableLibPurple
-    "export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${pidgin}/lib/pkgconfig";
-
   configureFlags = [
     "--gcov=1"
     "--otr=1"
@@ -26,12 +23,12 @@ stdenv.mkDerivation rec {
   ]
   ++ optional enableLibPurple "--purple=1";
 
-  buildPhase = optionalString (!enableLibPurple) ''
-    make install-dev
-  '';
+  installTargets = [ "install" "install-dev" ];
 
   doCheck = !enableLibPurple; # Checks fail with libpurple for some reason
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "IRC instant messaging gateway";
 

From 28ca28296feb4d82a62690fec5750e328358bbcb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 May 2018 10:43:37 +0200
Subject: [PATCH 2738/3370] LTS Haskell 11.11

---
 .../haskell-modules/configuration-hackage2nix.yaml            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 64f0056a7ff9..577ecd804932 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.10
+  # LTS Haskell 11.11
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -1755,8 +1755,8 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2

From 60d8e825589b2544bc4859ee320aec84304385e6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 24 May 2018 02:30:37 +0200
Subject: [PATCH 2739/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-17-g580e4ea from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/ae1b1485e217a3db5e211ad728e45a18aadd7097.
---
 .../haskell-modules/hackage-packages.nix      | 11193 ++--------------
 1 file changed, 1332 insertions(+), 9861 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 574b5e49c2fb..928829c8701c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -13,7 +13,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGL random ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples";
        description = "Examples of 3D graphics programming with OpenGL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27,7 +26,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring linear packer
        ];
-       homepage = "https://github.com/capsjac/3dmodels";
        description = "3D model parsers";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44,7 +42,6 @@ self: {
        executableHaskellDepends = [
          base cairo containers gtk haskell98 mtl
        ];
-       homepage = "http://lambdacolyte.wordpress.com/2009/08/06/tetris-in-haskell/";
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -239,7 +236,6 @@ self: {
        libraryHaskellDepends = [
          base list-extras mtl random random-shuffle void
        ];
-       homepage = "http://alkalisoftware.net";
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -266,7 +262,6 @@ self: {
          base bits OrderedBits PrimitiveArray QuickCheck strict tasty
          tasty-quickcheck tasty-th vector
        ];
-       homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -294,7 +289,6 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th
        ];
        benchmarkHaskellDepends = [ base criterion ForestStructures ];
-       homepage = "https://github.com/choener/ADPfusionForest";
        description = "Dynamic programming on tree and forest structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -320,7 +314,6 @@ self: {
          base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
          tasty-th
        ];
-       homepage = "https://github.com/choener/ADPfusionSet";
        description = "Dynamic programming for Set data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -341,7 +334,6 @@ self: {
          test-framework-quickcheck2
        ];
        executableHaskellDepends = [ base containers directory ];
-       homepage = "http://code.google.com/p/aern/";
        description = "foundational type classes for approximating exact real numbers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -358,7 +350,6 @@ self: {
        libraryHaskellDepends = [
          AERN-Real AERN-RnToRm base binary containers html stm time
        ];
-       homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "Compositional lazy dataflow networks for exact real number computation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -376,7 +367,6 @@ self: {
          AERN-Basics base criterion QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -401,7 +391,6 @@ self: {
          AERN-Basics AERN-Real AERN-Real-Interval base criterion ieee-utils
          QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -419,7 +408,6 @@ self: {
          AERN-Basics AERN-Real base deepseq QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -437,7 +425,6 @@ self: {
          AERN-Real base binary containers directory filepath html QuickCheck
          time
        ];
-       homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -456,7 +443,6 @@ self: {
          AERN-Real AERN-RnToRm base binary containers directory filepath
          glade glib gtk gtkglext mtl OpenGL stm time
        ];
-       homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "GL plotting of polynomial function enclosures (PFEs)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -486,7 +472,6 @@ self: {
        version = "0.1.3.1";
        sha256 = "0yy24nrl99b624x0d8k4w4505zx2b2n25frdq5ijn4j6fhjqwhz6";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/PseudoPower/AFSM";
        description = "Arrowized functional state machines";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -500,7 +485,6 @@ self: {
        libraryHaskellDepends = [
          base mtl network parsec random syb unix
        ];
-       homepage = "http://src.seereason.com/haskell-agi";
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -516,7 +500,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base OpenAL StateVar transformers ];
        librarySystemDepends = [ freealut ];
-       homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) freealut;};
@@ -532,7 +515,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers mtl network pureMD5 stm
        ];
-       homepage = "http://redmine.iportnov.ru/projects/ami";
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -546,7 +528,6 @@ self: {
        sha256 = "06mvkp9b0hxlp1w2yp7bb6340l88mzs15azx7nma401icqdhvbpn";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/DanBurton/ANum#readme";
        description = "Num instance for Applicatives provided via the ANum newtype";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -562,7 +543,6 @@ self: {
        libraryHaskellDepends = [
          base containers HUnit mtl NewBinary old-time pretty QuickCheck
        ];
-       homepage = "http://www.haskell.org/asn1";
        description = "ASN.1 support for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -597,7 +577,6 @@ self: {
        version = "1.0";
        sha256 = "1ijv4bs299ijqbkspbg1kry627ra6p6qlkd74q4y2pvamrm4dn6f";
        libraryHaskellDepends = [ AbortT-transformers base monads-tf ];
-       homepage = "http://github.com/gcross/AbortT-transformers";
        description = "Monads-tf instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -610,7 +589,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1x2iw46nzfjj36pfdzv5n0q6f6l7kgz62gnxpsj2f5p7w10zlxai";
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
-       homepage = "http://github.com/gcross/AbortT-mtl";
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -629,7 +607,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
-       homepage = "http://github.com/gcross/AbortT-transformers";
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -654,7 +631,6 @@ self: {
          template-haskell
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/egonSchiele/actionkid";
        description = "An easy-to-use video game framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -718,7 +694,6 @@ self: {
          aeson attoparsec base bson unordered-containers vector
        ];
        testHaskellDepends = [ aeson base bson hspec HUnit text ];
-       homepage = "https://github.com/nh2/AesonBson";
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -779,7 +754,6 @@ self: {
          done
          $out/bin/agda-mode compile
        '';
-       homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "A dependently typed functional programming language and proof assistant";
        license = "unknown";
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
@@ -794,7 +768,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ Agda base ];
-       homepage = "http://wiki.portal.chalmers.se/agda/";
        description = "Command-line program for type-checking and compiling Agda programs";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -810,7 +783,6 @@ self: {
        libraryHaskellDepends = [
          array base hashable mtl unordered-containers
        ];
-       homepage = "http://github.com/lymar/AhoCorasick";
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -833,7 +805,6 @@ self: {
          transformers
        ];
        benchmarkHaskellDepends = [ base containers criterion ];
-       homepage = "http://github.com/enolan/AlanDeniseEricLauren";
        description = "Find the minimal subset/submap satisfying some property";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -863,7 +834,6 @@ self: {
          QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
-       homepage = "http://github.com/omelkonian/AlgoRhythm/";
        description = "Algorithmic music composition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -878,7 +848,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl pretty ];
-       homepage = "https://github.com/mgrabmueller/AlgorithmW";
        description = "Example implementation of Algorithm W for Hindley-Milner type inference";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -896,7 +865,6 @@ self: {
          ADPfusion base containers fmlist FormalGrammars GrammarProducts
          PrimitiveArray vector
        ];
-       homepage = "https://github.com/choener/AlignmentAlgorithms";
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -922,7 +890,6 @@ self: {
          base containers enummapset-th filepath LambdaHack
          optparse-applicative random template-haskell text zlib
        ];
-       homepage = "http://allureofthestars.com";
        description = "Near-future Sci-Fi roguelike and tactical squad game";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -954,7 +921,6 @@ self: {
        version = "0.2";
        sha256 = "01vpw9s93qq8c0zymp4qzv0ljn9jrnwi3x68qx9lcjr6spa0rkvm";
        libraryHaskellDepends = [ base random ];
-       homepage = "https://github.com/eamsden/Animas";
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -981,7 +947,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl parsec xhtml ];
-       homepage = "http://janzzstimmpfle.de/~jens/software/Ansi2Html/";
        description = "Convert ANSI Terminal Sequences to nice HTML markup";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1012,7 +977,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1jmwixyv5msb3lmza7dljvm3l0x5mx8r93zr607sx9m5x9yhlsvr";
        doHaddock = false;
-       homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1025,7 +989,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1s7amy8ij5bgv8afbjdzqd3lflvhzrrh3cs3krl1rf73y8b1nqpy";
        libraryHaskellDepends = [ base vector ];
-       homepage = "https://github.com/idontgetoutmuch/ApproxFun.hs";
        description = "Function approximation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1038,7 +1001,6 @@ self: {
        version = "0.1.3.1";
        sha256 = "1yb209v3lab3knggplmwih1ww6qalf8v86j8ggv1gkhm5jkwz1yq";
        libraryHaskellDepends = [ base ];
-       homepage = "http://haskell.org/haskellwiki/Library/ArrayRef";
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1051,7 +1013,6 @@ self: {
        version = "1.1";
        sha256 = "1lv76m4qc1sabagllaagi7bpqf1mnmzsra333a77b6134mk2f9hb";
        libraryHaskellDepends = [ base process ];
-       homepage = "https://github.com/frosch03/arrowVHDL";
        description = "A library to generate Netlist code from Arrow descriptions";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1068,7 +1029,6 @@ self: {
        libraryHaskellDepends = [
          base containers HList mtl template-haskell
        ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
        description = "Attribute Grammars in the form of an EDSL";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1090,7 +1050,6 @@ self: {
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://bitbucket.org/FlorianHartwig/attobencode";
        description = "Fast Bencode encoding and parsing library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1108,7 +1067,6 @@ self: {
          attoparsec base bytestring bytestring-show containers mtl
          utf8-string
        ];
-       homepage = "http://github.com/konn/AttoJSON";
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1125,7 +1083,6 @@ self: {
        executableHaskellDepends = [
          array base colour GLUT OpenGL random
        ];
-       homepage = "http://patch-tag.com/r/rhz/StrangeAttractors";
        description = "Visualisation of Strange Attractors in 3-Dimensions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1156,7 +1113,6 @@ self: {
        libraryHaskellDepends = [
          array base haskell98 mtl syb-with-class template-haskell wx wxcore
        ];
-       homepage = "http://autoforms.sourceforge.net/";
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1233,7 +1189,6 @@ self: {
          array base containers deepseq directory doctest filepath hspec
          HUnit mtl pretty process QuickCheck temporary
        ];
-       homepage = "http://bnfc.digitalgrammars.com/";
        description = "A compiler front-end generator";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -1263,7 +1218,6 @@ self: {
        revision = "1";
        editedCabalFile = "16206xd8lm8fkvpxbm19h403264xyjki07s9lam3pgq985xbqk35";
        libraryHaskellDepends = [ base cairo containers mtl ];
-       homepage = "http://pageperso.lif.univ-mrs.fr/~pierre-etienne.meunier/Baggins";
        description = "Tools for self-assembly";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1280,7 +1234,6 @@ self: {
        libraryHaskellDepends = [
          base bifunctors hmidi mtl stm time transformers
        ];
-       homepage = "https://github.com/5outh/Bang/";
        description = "A Drum Machine DSL for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1310,7 +1263,6 @@ self: {
          parsec pkcs1 random regex-compat stm time unix utf8-string
          xml-parsec
        ];
-       homepage = "http://sep07.mroot.net/";
        description = "An ad-hoc P2P chat program";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1325,7 +1277,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base mtl random ];
-       homepage = "http://coder.bsimmons.name/blog/2010/05/befunge-93-interpreter-on-hackage";
        description = "An interpreter for the Befunge-93 Programming Language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1344,7 +1295,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cassava deepseq directory statistics time vector
        ];
-       homepage = "https://github.com/choener/BenchmarkHistory";
        description = "Benchmark functions with history";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1358,7 +1308,6 @@ self: {
        sha256 = "0q1qc6rds05bkxl2m3anp7x75cwinp9nhy8j0g1vaj2scasvki62";
        libraryHaskellDepends = [ base bytestring extensible-exceptions ];
        librarySystemDepends = [ db ];
-       homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB binding";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) db;};
@@ -1373,7 +1322,6 @@ self: {
        sha256 = "1ymdi5qi4hxaikqf8min830r1rs1z4bvy9bdybsq378v7mrgfihp";
        libraryHaskellDepends = [ base BerkeleyDB bytestring ];
        librarySystemDepends = [ db dbxml xercesc xqilla ];
-       homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1402,7 +1350,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl template-haskell th-extras
        ];
-       homepage = "http://www.prg.nii.ac.jp/project/bigul/";
        description = "The Bidirectional Generic Update Language";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1417,7 +1364,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base bmp bytestring gloss ];
-       homepage = "https://github.com/mchakravarty/BigPixel";
        description = "Image editor for pixel art";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1468,7 +1414,6 @@ self: {
          ParsecTools primitive PrimitiveArray split tuple utility-ht vector
          vector-read-instances zlib
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Base library for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1493,7 +1438,6 @@ self: {
          base bytestring containers filepath split tasty tasty-quickcheck
          tasty-silver tasty-th text
        ];
-       homepage = "https://github.com/choener/BiobaseBlast";
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1506,7 +1450,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0m7n3c2ly6kly146xrxzx41g3pv0cylrmzpdgv5c54x9gvb1hg7w";
        libraryHaskellDepends = [ base bytestring iteratee ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1523,7 +1466,6 @@ self: {
        libraryHaskellDepends = [
          base BiobaseXNA bytestring containers filemanip iteratee tuple
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Importer for FR3D resources";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1543,7 +1485,6 @@ self: {
          base biocore bytestring conduit containers transformers
        ];
        executableHaskellDepends = [ cmdargs ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "conduit-based FASTA parser";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1583,7 +1524,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion lens text transformers
        ];
-       homepage = "https://github.com/choener/BiobaseInfernal";
        description = "Infernal data structures and tools";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1596,7 +1536,6 @@ self: {
        version = "0.5.0.0";
        sha256 = "0mwyyb7n232wgjipn9jsbqpcbxqms07adi5a6v14qaiynsjz4n1r";
        libraryHaskellDepends = [ base bytestring containers iteratee ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1625,7 +1564,6 @@ self: {
          aeson base binary cereal QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       homepage = "https://github.com/choener/BiobaseNewick";
        description = "Newick file format parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1645,7 +1583,6 @@ self: {
          iteratee vector
        ];
        executableHaskellDepends = [ cmdargs ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "RNA folding training data";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1664,7 +1601,6 @@ self: {
          base BiobaseXNA bytestring bytestring-lexing conduit containers
          filepath lens primitive PrimitiveArray repa split vector
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Import Turner RNA parameters";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1692,7 +1628,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th
        ];
-       homepage = "https://github.com/choener/BiobaseTypes";
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1709,7 +1644,6 @@ self: {
        libraryHaskellDepends = [
          base BiobaseTurner BiobaseXNA primitive PrimitiveArray vector
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Import Vienna energy parameters";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1741,7 +1675,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
-       homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1790,7 +1723,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring QuickCheck template-haskell
        ];
-       homepage = "https://github.com/joecrayne/hs-bitsyntax";
        description = "A module to aid in the (de)serialisation of binary data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1802,7 +1734,6 @@ self: {
        version = "0.1.0";
        sha256 = "1pmmgg6n6pc0qvp5r4qxan32887132si0cayd0xh1g5v98fa9ari";
        libraryHaskellDepends = [ base HTTP json2 ];
-       homepage = "http://bitbucket.org/jetxee/hs-bitly/";
        description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1821,7 +1752,6 @@ self: {
          base BiobaseBlast biocore biofasta blastxml bytestring conduit
          either-unwrap HTTP http-conduit hxt mtl network transformers
        ];
-       homepage = "https://github.com/eggzilla/BlastHTTP";
        description = "Libary to interface with the NCBI blast REST interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1844,7 +1774,6 @@ self: {
        executableHaskellDepends = [
          base containers directory HaXml polyparse pretty wx wxcore
        ];
-       homepage = "http://www.cs.york.ac.uk/fp/darcs/Blobs/";
        description = "Diagram editor";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1870,7 +1799,6 @@ self: {
          process split strict tagsoup temporary text transformers
        ];
        executableHaskellDepends = [ base cmdargs ];
-       homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -1920,7 +1848,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion MissingH network-uri parsec
        ];
-       homepage = "https://blogdown.io";
        description = "A markdown-like markup language designed for blog posts";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1933,7 +1860,6 @@ self: {
        version = "0.1";
        sha256 = "0ryjgi70isgfv3nw3djzvb1saky40xqy536h6sr3mfpy2iqnim0c";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://git.ierton.ru/?p=BluePrint.git;a=summary";
        description = "Html document layout library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -1945,7 +1871,6 @@ self: {
        version = "0.1";
        sha256 = "16cfmy4ndc15p6jdmyy08nqgv143dvs9xf4qg4mxa6x5r326pi94";
        doHaddock = false;
-       homepage = "http://github.com/gcross/Blueprint";
        description = "Preview of a new build system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -1967,7 +1892,6 @@ self: {
          pandoc-types parseargs
        ];
        testHaskellDepends = [ base process ];
-       homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2007,7 +1931,6 @@ self: {
          base haskell-src-exts haskell-src-meta mtl parsec syb
          template-haskell
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Bravo";
        description = "Static text template generation library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2044,7 +1967,6 @@ self: {
          base bytestring errors hslogger hspec hspec-expectations
          http-conduit http-types string-qq temporary unix yaml
        ];
-       homepage = "http://github.com/michaelxavier/Buster";
        description = "Hits a set of urls periodically to bust caches";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2066,7 +1988,6 @@ self: {
          base binary binary-bits bytestring data-binary-ieee754 doctest
          QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/orclev/CBOR";
        description = "Encode/Decode values to/from CBOR";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2079,7 +2000,6 @@ self: {
        version = "0.2.1.0";
        sha256 = "00v2xjh5a7z87i0hvdflrqmnwi9lb2061d6s0xrp563xpjvkcsvc";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://code.haskell.org/~dolio/CC-delcont";
        description = "Delimited continuations and dynamically scoped variables";
        license = "unknown";
      }) {};
@@ -2163,7 +2083,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim syb template-haskell ];
        executableHaskellDepends = [ array base containers haskell-src ];
        executableToolDepends = [ happy ];
-       homepage = "not available";
        description = "preprocessor and library for Causal Commutative Arrows (CCA)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2179,7 +2098,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring hxt-regex-xmlschema utf8-string
        ];
-       homepage = "http://fuzzpault.com/chxhtml";
        description = "A W3C compliant (X)HTML generating library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2195,7 +2113,6 @@ self: {
        libraryHaskellDepends = [
          base containers filepath mtl parsec template-haskell
        ];
-       homepage = "http://www.zonetora.co.uk/clase/";
        description = "Cursor Library for A Structured Editor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2228,7 +2145,6 @@ self: {
          array base BiobaseInfernal BiobaseXNA containers lens
        ];
        executableHaskellDepends = [ cmdargs ];
-       homepage = "http://www.tbi.univie.ac.at/software/cmcompare/";
        description = "Infernal covariance model comparison";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2246,7 +2162,6 @@ self: {
          base bytestring cereal containers iproute mtl network PSQueue stm
          time
        ];
-       homepage = "http://github.com/viloocity/cmq/";
        description = "cwmwl udp message queue";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2289,7 +2204,6 @@ self: {
        executableHaskellDepends = [
          array base containers mtl parsec readline
        ];
-       homepage = "https://github.com/msakai/cpl";
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2408,7 +2322,6 @@ self: {
        libraryHaskellDepends = [
          base containers hashable mtl unordered-containers
        ];
-       homepage = "http://www.haskell.org/haskellwiki/CTRex";
        description = "Open records using closed type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2437,7 +2350,6 @@ self: {
          opencv_ml opencv_objdetect opencv_video
        ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://aleator.github.com/CV/";
        description = "OpenCV based machine vision library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2467,7 +2379,6 @@ self: {
          test-framework-quickcheck2 unix
        ];
        doCheck = false;
-       homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2493,7 +2404,6 @@ self: {
          test-framework-quickcheck2 unix
        ];
        doCheck = false;
-       homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2521,7 +2431,6 @@ self: {
          tasty-quickcheck transformers unix
        ];
        doCheck = false;
-       homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2550,7 +2459,6 @@ self: {
          tasty-quickcheck text tree-diff
        ];
        doCheck = false;
-       homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2576,7 +2484,6 @@ self: {
          filepath HUnit old-time process QuickCheck regex-posix
          test-framework test-framework-hunit test-framework-quickcheck2 unix
        ];
-       homepage = "http://www.haskell.org/cabal/";
        description = "A framework for packaging Haskell software";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2595,7 +2502,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory filepath HDBC HDBC-sqlite3 process unix
        ];
-       homepage = "http://github.com/brinchj/cabalsearch";
        description = "Search cabal packages by name";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2608,7 +2514,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0nd5yvhbxmabs0890y9gjjiq37h8c3blpplv2m13k29zkijwad04";
        libraryHaskellDepends = [ base compdata directory free unix ];
-       homepage = "https://github.com/Icelandjack/Capabilities";
        description = "Separate and contain effects of IO monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2632,7 +2537,6 @@ self: {
        version = "1.3";
        sha256 = "06ri47cfskvpm65zb63kjrwwhzlmcp2f0z99hqkfw216p85648a3";
        libraryHaskellDepends = [ base containers fgl parsec ];
-       homepage = "http://www.cs.nott.ac.uk/~bmv/CarneadesDSL/";
        description = "An implementation and DSL for the Carneades argumentation model";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2649,7 +2553,6 @@ self: {
        libraryHaskellDepends = [
          base CarneadesDSL cmdargs containers Dung fgl
        ];
-       homepage = "http://www.cs.nott.ac.uk/~bmv/CarneadesIntoDung/";
        description = "A translation from the Carneades argumentation model into Dung's AFs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2673,7 +2576,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1ih8ydc29axckgidc5xvsdac5558gprscw667msh8qh41j9sshng";
        libraryHaskellDepends = [ base comonad ghc-prim mtl void ];
-       homepage = "http://github.com/rampion/Cascade";
        description = "Playing with reified categorical composition";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2701,7 +2603,6 @@ self: {
          quickcheck-instances scientific test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
-       homepage = "https://github.com/tfausak/cassava";
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2726,7 +2627,6 @@ self: {
        version = "0.0.0.7";
        sha256 = "183pghm74vk1vdcn0mdn6g5q284sncpl1cc49lpczz1wbr15s89y";
        libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
-       homepage = "https://github.com/pthariensflame/ChannelT";
        description = "Generalized stream processors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2739,11 +2639,12 @@ self: {
        pname = "Chart";
        version = "1.8.3";
        sha256 = "13s64fhb2pmkdmx5bkgbgcn25qjihs364fvr47a1dw25f804kiy1";
+       revision = "1";
+       editedCabalFile = "1z4vpzdhphd6qdab73ar7a7yn3x6z4602ffgai2mccc02w5412fl";
        libraryHaskellDepends = [
          array base colour data-default-class lens mtl old-locale
          operational time vector
        ];
-       homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2760,7 +2661,6 @@ self: {
          array base cairo Chart colour data-default-class lens mtl
          old-locale operational time
        ];
-       homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Cairo backend for Charts";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2782,7 +2682,6 @@ self: {
          diagrams-svg lens mtl old-locale operational svg-builder SVGFonts
          text time
        ];
-       homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2800,7 +2699,6 @@ self: {
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
        ];
-       homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Utility functions for using the chart library with GTK";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2817,7 +2715,6 @@ self: {
          array base cairo Chart Chart-cairo Chart-gtk colour
          data-default-class gtk mtl old-locale time
        ];
-       homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2851,7 +2748,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers directory ];
-       homepage = "http://cheatsheet.codeslower.com";
        description = "A Haskell cheat sheet in PDF and literate formats";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -2877,7 +2773,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring mtl network ];
-       homepage = "https://github.com/ckkashyap/Chitra";
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2894,7 +2789,6 @@ self: {
        libraryHaskellDepends = [
          base containers fgl template-haskell TTTAS uulib
        ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2907,7 +2801,6 @@ self: {
        version = "0.0.1";
        sha256 = "111ccwiszrjy54y5hincyvjj97kmar9n26bbn902qa9jd9y9k3g9";
        libraryHaskellDepends = [ aeson base text vector ];
-       homepage = "https://github.com/Cirru/parser.hs";
        description = "Cirru Parser in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -2942,7 +2835,6 @@ self: {
        version = "0.3.1.0";
        sha256 = "1277vn384hpxd7xnzg0gpr7ilnw5cqhsi11c24g9zsfqa36llwgk";
        libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ];
-       homepage = "http://wiki.portal.chalmers.se/cse/pmwiki.php/FP/ClassLaws";
        description = "Stating and checking laws for type class methods";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -2979,7 +2871,6 @@ self: {
        version = "2.3.2.0";
        sha256 = "1dr5ifmy5azib140bri9rzlq69jic430v9cv372jb42r78cci0iz";
        libraryHaskellDepends = [ base directory unix utf8-string X11 ];
-       homepage = "http://haskell.org/haskellwiki/Clipboard";
        description = "System clipboard interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3014,7 +2905,6 @@ self: {
          array base bytestring bytestring-csv containers directory fgl
          filepath mtl old-time pretty pureMD5 safe utf8-string
        ];
-       homepage = "http://iki.fi/matti.niemenmaa/coadjute/";
        description = "A generic build tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3027,7 +2917,6 @@ self: {
        version = "0.2";
        sha256 = "0jj2iaa632s60dckj8s46g4vrlqc8x9fndkq0kzk8rk4jzwlbwsn";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.cs.helsinki.fi/u/ekarttun/Codec-Compression-LZF/";
        description = "LZF compression bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3077,7 +2966,6 @@ self: {
        version = "0.0.7";
        sha256 = "043dwvjkc1m2cz0rgiib7gv19ds1vn4cmf27lyw68nmc0lcm2v3d";
        libraryHaskellDepends = [ base directory process ];
-       homepage = "https://github.com/tonymorris/command";
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3100,7 +2988,6 @@ self: {
          base data-default fsnotify optparse-applicative process
          system-fileio system-filepath text
        ];
-       homepage = "https://github.com/sordina/Commando";
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3119,7 +3006,6 @@ self: {
          applicative-numbers base comonad containers distributive
          IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers
        ];
-       homepage = "https://github.com/kwf/ComonadSheet";
        description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3174,7 +3060,6 @@ self: {
        version = "0.5.0.1";
        sha256 = "0xnnkz67hh4mqx09wh17jpr9isgpcrc5xwp28afn3n8sz2y2mnxd";
        libraryHaskellDepends = [ async base ];
-       homepage = "http://github.com/avieth/Concurrential";
        description = "Mix concurrent and sequential computation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3197,7 +3082,6 @@ self: {
        testHaskellDepends = [
          base binary Cabal containers glider-nlp HUnit text
        ];
-       homepage = "https://github.com/klangner/Condor";
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3212,7 +3096,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl parsec ];
-       homepage = "http://software.complete.org/configfile";
        description = "Configuration file reading & writing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3250,7 +3133,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1if0hff6fn7zjj1vh16gxf2kldibh1dkscm8n33d1admvpjpw9sb";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tel/Configurable";
        description = "Declare types as Configurable then specialize them all in one place";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3263,7 +3145,6 @@ self: {
        version = "0.1";
        sha256 = "1ywhrj2wq24my4cji5fm5cwb3j4yjwzch9hxncr7k989smjdmjpz";
        libraryHaskellDepends = [ base Stream ];
-       homepage = "github";
        description = "Trivial re-export of Wouter Swierstra's Stream package, avoiding module name clash";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3277,7 +3158,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
-       homepage = "https://github.com/sordina/Conscript";
        description = "Restart a command on STDIN activity";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3302,7 +3182,6 @@ self: {
        version = "1.2";
        sha256 = "03ham35vh49h780h7dxb6zs85rkdlry0nwi8wp6p9iamw952xi6i";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://src.seereason.com/ghc6103/haskell-consumer";
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3333,7 +3212,6 @@ self: {
        executableHaskellDepends = [
          base containers criterion multiset QuickCheck statistics vector
        ];
-       homepage = "https://github.com/juergenhah/ContextAlgebra";
        description = "Implementation of the context algebra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3346,7 +3224,6 @@ self: {
        version = "0.1";
        sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://www.cs.kent.ac.uk/~oc/contracts.html";
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3359,7 +3236,6 @@ self: {
        version = "1.1.0.1";
        sha256 = "1jyj42xrja8ic3lajgrfmign9n2bdfkaplnlhzcifd5wf30qj6fa";
        libraryHaskellDepends = [ base BoundedChan stm ];
-       homepage = "http://www.haskell.org/haskellwiki/Control-Engine";
        description = "A parallel producer/consumer engine (thread pool)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3380,7 +3256,6 @@ self: {
          array base containers Control-Monad-ST2 mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/kevinbackhouse/Control-Monad-MultiPass";
        description = "A Library for Writing Multi-Pass Algorithms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3399,7 +3274,6 @@ self: {
          array base mtl QuickCheck SafeSemaphore test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/kevinbackhouse/Control-Monad-ST2";
        description = "A variation on the ST monad with two type parameters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3424,7 +3298,6 @@ self: {
        version = "0.0.4";
        sha256 = "034g6c7dxdp13v1x16gvwgagpc7mw33hwd16cbb8yd3i91vf1w8z";
        libraryHaskellDepends = [ base parsec pretty ];
-       homepage = "http://github.com/amtal/CoreErlang";
        description = "Manipulating Core Erlang source code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3444,7 +3317,6 @@ self: {
          tagged text time transformers vector
        ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/reinerp/CoreFoundation";
        description = "Bindings to Mac OSX's CoreFoundation framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3478,7 +3350,6 @@ self: {
          base bytestring containers HTTP HUnit json mtl network network-uri
          utf8-string
        ];
-       homepage = "http://github.com/hsenag/haskell-couchdb/";
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3496,7 +3367,6 @@ self: {
          base HUnit mtl old-locale QuickCheck time
        ];
        doHaddock = false;
-       homepage = "http://www.haskellcraft.com/";
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3599,7 +3469,6 @@ self: {
          network-uri optparse-applicative transformers transformers-base
          transformers-compat utf8-string xml-conduit xml-hamlet
        ];
-       homepage = "http://floss.scru.org/hDAV";
        description = "RFC 4918 WebDAV support";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -3613,7 +3482,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec ];
-       homepage = "http://projects.haskell.org/DBlimited/";
        description = "A command-line SQL interface for flat files (tdf,csv,etc.)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3626,7 +3494,6 @@ self: {
        version = "0.5.1";
        sha256 = "0l212yy40w8sjkv5m7rnd24fkihvnadv7szf10g9n5r34m4jb6lh";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/alexkay/hdbus";
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3639,7 +3506,6 @@ self: {
        version = "0.1.6.0";
        sha256 = "10f0c3y0y39rmvvvrvz426srb18wsv4qfzzx9r9zjac2m14b96jx";
        libraryHaskellDepends = [ base deepseq HUnit parallel random ];
-       homepage = "https://github.com/Poincare/DCFL";
        description = "Communication Free Learning-based constraint solver";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -3653,7 +3519,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base MuCheck ];
-       homepage = "https://bitbucket.com/osu-testing/d-mucheck";
        description = "Distributed Mutation Analysis framework for MuCheck";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3707,7 +3572,6 @@ self: {
        libraryHaskellDepends = [
          array base containers list-tries mtl QuickCheck safe semiring
        ];
-       homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Pragmatic framework for dynamic programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3757,7 +3621,6 @@ self: {
          tasty-quickcheck tasty-th vector
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
-       homepage = "https://github.com/choener/DPutils";
        description = "utilities for DP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3869,7 +3732,6 @@ self: {
        version = "1.1.0.1";
        sha256 = "0m3697zw0j2l9fxx8flr83n8x03pva1hn74rgilgxdrsrifhds5l";
        libraryHaskellDepends = [ base haskell-src-exts ];
-       homepage = "https://github.com/Daniel-Diaz/DTC";
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -3937,7 +3799,6 @@ self: {
        version = "0.9";
        sha256 = "0lk0w64hyqkg99r9ccn5k1nh6rmd99z8d925px4cl09nin7hnm71";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/deadmanswitch/Data.Angle";
        description = "Geometric angles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3953,7 +3814,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring digest utf8-string vector vector-algorithms
        ];
-       homepage = "https://github.com/bradclawsie/haskell-Data.Hash.Consistent";
        description = "Provide a simple consistent hashing mechanism";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -3982,7 +3842,6 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/yuhangwang/DataIndex#readme";
        description = "A package for adding index column to data files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -4029,7 +3888,6 @@ self: {
          text time transformers unordered-containers vector websockets
        ];
        testHaskellDepends = [ base doctest filemanip QuickCheck ];
-       homepage = "http://github.com/sordina/Deadpan-DDP";
        description = "Write clients for Meteor's DDP Protocol";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -4058,7 +3916,6 @@ self: {
          base deepseq HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/PaulJohnson/Haskell-Decimal";
        description = "Decimal numbers with variable precision";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4070,7 +3927,6 @@ self: {
        version = "0.0";
        sha256 = "14yprfh2b5x7dswp6kyaym3z2f32nqvgrfhvwsiv7brxq80cfvbd";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://page.mi.fu-berlin.de/~aneumann/decisiontree.html";
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4083,7 +3939,6 @@ self: {
        version = "0.4.0";
        sha256 = "1jbvb8yk291iimpqi8h302r8554k4j2p3k42znzppv1wqrbhvjyc";
        libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
-       homepage = "http://haskell.org/haskellwiki/DeepArrow";
        description = "Arrows for \"deep application\"";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4120,7 +3975,6 @@ self: {
          base binary bytestring containers GLUT HTTP MaybeT mtl network
          peakachu random time utility-ht zlib
        ];
-       homepage = "http://github.com/yairchu/defend/tree";
        description = "A simple RTS game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4144,7 +3998,6 @@ self: {
          base bytestring Cabal cereal cpphs filepath haskeline megaparsec
          mtl options parallel text wl-pprint
        ];
-       homepage = "https://github.com/listofoptions/delta-lambda";
        description = "A demonstration interpreter for type system delta-lambda (of N.G. De-bruijn)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4157,7 +4010,6 @@ self: {
        version = "0.0.4";
        sha256 = "0ywipcmnr3ysmx8m61yrymyn10lnizjfkk2q2scdfkrkgh7ayj7v";
        libraryHaskellDepends = [ base containers xmonad xmonad-contrib ];
-       homepage = "https://bitbucket.org/dibblego/descriptive-keys/";
        description = "A library for specifying xmonad key bindings with functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4206,7 +4058,6 @@ self: {
        libraryHaskellDepends = [
          base containers fgl FirstOrderTheory HUnit
        ];
-       homepage = "https://github.com/dillonhuff/DifferenceLogic";
        description = "A theory solver for conjunctions of literals in difference logic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4223,7 +4074,6 @@ self: {
        libraryHaskellDepends = [
          base deepseq fclabels mtl mwc-random parallel primitive vector
        ];
-       homepage = "http://yousource.it.jyu.fi/optimization-with-haskell";
        description = "Global optimization using Differential Evolution";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4241,7 +4091,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/tonymorris/digit";
        description = "A data-type representing digits 0-9";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4285,7 +4134,6 @@ self: {
        sha256 = "1x78y1na375nwgk4izsjprj3yrg0xbrhqv6nrzfbvbfdyqlf5kyz";
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ dsound ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Partial binding to the Microsoft DirectSound API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4307,7 +4155,6 @@ self: {
          base Cabal chunks containers directory filepath hinstaller
          old-locale parsec pretty process template-haskell time xhtml
        ];
-       homepage = "http://distract.wellquite.org/";
        description = "Distributed Bug Tracking System";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4325,7 +4172,6 @@ self: {
          base blaze-html blaze-markup html parsers
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/minamiyama1994/DiscussionSupportSystem";
        description = "Discussion support system";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4341,7 +4187,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/zcourts/Dish";
        description = "Hash modules (currently Murmur3)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4355,7 +4200,6 @@ self: {
        sha256 = "1fmln09jai679lwpxngx8dn0yr2g5dsccvjhacl69s3hy76czd0b";
        libraryHaskellDepends = [ base containers MonadRandom ];
        testHaskellDepends = [ base containers MonadRandom ];
-       homepage = "https://github.com/wyager/Dist";
        description = "A Haskell library for probability distributions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4384,7 +4228,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0ls6rq4nqn3z9h9lagl8sff9q94zfm6gssa2jj1zfyfxl5869bas";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/gambogi/DistanceUnits";
        description = "A comprehensive distance library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4411,7 +4254,6 @@ self: {
          BiobaseXNA biocore bytestring cmdargs conduit dlist parallel
          PrimitiveArray repa split vector
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4430,7 +4272,6 @@ self: {
        executableHaskellDepends = [
          base containers ghc ghc-paths haddock HUnit process
        ];
-       homepage = "http://haskell.org/haskellwiki/DocTest";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4443,7 +4284,6 @@ self: {
        version = "1.0.0";
        sha256 = "1hjdznp29kwj9cca0jxr3dds9cnfbss6sgn52wym2380az3jcvnz";
        libraryHaskellDepends = [ base html ];
-       homepage = "http://ddiaz.asofilak.es/packages/Docs.html";
        description = "Documentation types library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4462,7 +4302,6 @@ self: {
          base haskell-src-exts mtl pointless-haskell syb
        ];
        executableHaskellDepends = [ array base containers pretty ];
-       homepage = "http://haskell.di.uminho.pt/wiki/DrHylo";
        description = "A tool for deriving hylomorphisms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4481,7 +4320,6 @@ self: {
        executableHaskellDepends = [
          base filepath old-time process random
        ];
-       homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4497,7 +4335,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base old-time process random ];
-       homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4512,7 +4349,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cmdargs containers parsec ];
-       homepage = "http://www.cs.nott.ac.uk/~bmv/Dung/";
        description = "An implementation of the Dung argumentation frameworks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4630,7 +4466,6 @@ self: {
        executableHaskellDepends = [
          array base criterion QuickCheck random vector
        ];
-       homepage = "https://github.com/zombiecalypse/DynamicTimeWarp";
        description = "Dynamic time warping of sequences";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4645,7 +4480,6 @@ self: {
        libraryHaskellDepends = [
          base contravariant mtl time transformers
        ];
-       homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4657,7 +4491,6 @@ self: {
        version = "0.1";
        sha256 = "1pg6gwyrlvp6z08ab1qp783z9gm0xhnh337shf443f1bwbcz9m7f";
        libraryHaskellDepends = [ base cairo DysFRP gtk mtl ];
-       homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4675,7 +4508,6 @@ self: {
          base cairo containers craftwerk craftwerk-gtk DysFRP DysFRP-Cairo
          gtk
        ];
-       homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Craftwerk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4728,7 +4560,6 @@ self: {
          array base containers directory old-time unix
        ];
        executableToolDepends = [ happy ];
-       homepage = "https://github.com/FranklinChen/Ebnf2ps";
        description = "Peter's Syntax Diagram Drawing Tool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4740,7 +4571,6 @@ self: {
        version = "1.3.1";
        sha256 = "0vmmlsj8ggbpwx6fkf5fvb6jp0zpx6iba6b28m80lllr2p8bi8wm";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficient, purely-functional data structures (API)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -4756,7 +4586,6 @@ self: {
        libraryHaskellDepends = [
          array base containers EdisonAPI mtl QuickCheck
        ];
-       homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficient, purely-functional data structures (Core Implementations)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -4775,7 +4604,6 @@ self: {
          array base containers csv directory editline filepath haskell98
          html pretty xhtml
        ];
-       homepage = "http://github.com/bspaans/EditTimeReport";
        description = "Query language and report generator for edit logs";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4858,7 +4686,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text transformers
          union-find unordered-containers
        ];
-       homepage = "http://elm-lang.org";
        description = "The Elm language module";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -4874,7 +4701,6 @@ self: {
        executableHaskellDepends = [
          array base containers fgl gtk mtl parsec
        ];
-       homepage = "http://www.muitovar.com";
        description = "derives heuristic rules from nominal data";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -4902,7 +4728,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal containers mtl ];
        executableHaskellDepends = [ base Cabal containers mtl ];
-       homepage = "http://otakar-smrz.users.sf.net/";
        description = "Encoding character data";
        license = "GPL";
      }) {};
@@ -4919,7 +4744,6 @@ self: {
          base biocore bytestring conduit HTTP http-conduit hxt mtl network
          Taxonomy text transformers
        ];
-       homepage = "https://github.com/eggzilla/EntrezHTTP";
        description = "Libary to interface with the NCBI Entrez REST service";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -5007,7 +4831,6 @@ self: {
          base base-unicode-symbols bindings-EsounD monad-control network
          regions safer-file-handles storablevector transformers unix
        ];
-       homepage = "http://cielonegro.org/EsounD.html";
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5020,7 +4843,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "15xijkc23sqakwa4qmf2hvcn07kd9ahx3z15a6lr18cs43pbjw93";
        libraryHaskellDepends = [ ansi-terminal base mtl ];
-       homepage = "http://alkalisoftware.net";
        description = "Methods for estimating the progress of functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5045,7 +4867,6 @@ self: {
          transformers unix unordered-containers vcache vector
        ];
        executablePkgconfigDepends = [ pcre ];
-       homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5062,7 +4883,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc mtl operational random SafeSemaphore time unix
        ];
-       homepage = "http://mitar.tnode.com";
        description = "A general data-flow framework";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5082,7 +4902,6 @@ self: {
        executableHaskellDepends = [
          array base containers deepseq Etage fgl mtl parallel random time
        ];
-       homepage = "http://mitar.tnode.com";
        description = "Data-flow based graph algorithms";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5098,7 +4917,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 SDL SDL-mixer ];
-       homepage = "http://www.kryozahiro.org/eternal10/";
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5121,7 +4939,6 @@ self: {
          base binary bytestring haskell98 network pcap
        ];
        executableSystemDepends = [ libpcap ];
-       homepage = "http://etherbunny.anytini.com/";
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5146,13 +4963,12 @@ self: {
        pname = "Euterpea";
        version = "2.0.4";
        sha256 = "1n0b4ksdrr1457abvij76z8r4ski4cic80picddilpg83mxaasw6";
-       revision = "2";
-       editedCabalFile = "0f8fyib7cqb4w54rrcrd00c6ca4fgfj5v9rm7mih7lyybkrs44qv";
+       revision = "3";
+       editedCabalFile = "19llqvhhc1dl8khggvag47xs2ly0kf7wyba4d092r1c9rz4visy9";
        libraryHaskellDepends = [
          array arrows base bytestring containers deepseq ghc-prim HCodecs
          heap PortMidi random stm
        ];
-       homepage = "http://www.euterpea.com";
        description = "Library for computer music research and education";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5189,7 +5005,6 @@ self: {
          network-uri old-locale old-time pretty process pureMD5 QuickCheck
          random regex-compat time unix Unixutils zlib
        ];
-       homepage = "https://github.com/ddssff/haskell-extra";
        description = "A grab bag of modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5230,7 +5045,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers haskell98 ];
-       homepage = "http://spraakbanken.gu.se/eng/research/swefn/fm-sblex";
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5244,7 +5058,6 @@ self: {
        sha256 = "0l2zhlxh88wy9y9gk1aa03yy65iw8zigr4pgp63mn2mqcrskfszl";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fmodex64 ];
-       homepage = "https://github.com/skypers/hsFModEx";
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5259,7 +5072,6 @@ self: {
        revision = "1";
        editedCabalFile = "0d6mjr7b37f5bgjijjgx4x4fgfmkbhksphzkaf0p5jyzxp45fasc";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://www.cs.kent.ac.uk/~oc/pretty.html";
        description = "Efficient simple pretty printing combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5372,7 +5184,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0yxaqyn6nxbyfkn5pmd7wh951dhdvkg1xgh5757f7hn00bx87wv1";
        libraryHaskellDepends = [ base STMonadTrans vector ];
-       homepage = "https://github.com/wyager/FastPush/";
        description = "A monad and monad transformer for pushing things onto a stack very fast";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5404,7 +5215,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        testHaskellDepends = [ base QuickCheck template-haskell ];
-       homepage = "https://github.com/mgajda/FenwickTree";
        description = "Data structure for fast query and update of cumulative sums";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5424,7 +5234,6 @@ self: {
          base HAppS-Data HAppS-IxSet HAppS-Server HAppS-State HAppS-Util
          haskell98 HaXml mtl old-time random syb-with-class template-haskell
        ];
-       homepage = "http://www.scannedinavian.com/";
        description = "Annotate ps and pdf documents";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5456,7 +5265,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec ];
-       homepage = "http://github.com/burz/Feval";
        description = "Evaluation using F-Algebras";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5474,7 +5282,6 @@ self: {
          base GLUT graphicsFormats MemoTrie old-time OpenGL TypeCompose
          vector-space
        ];
-       homepage = "http://haskell.org/haskellwiki/FieldTrip";
        description = "Functional 3D";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5524,7 +5331,6 @@ self: {
          base comonad comonad-transformers data-lens directory filepath mtl
          transformers
        ];
-       homepage = "https://github.com/tonymorris/filepather";
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5540,7 +5346,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring directory filepath mtl old-time
        ];
-       homepage = "http://ddiaz.asofilak.es/packages/FileSystem";
        description = "File system data structure and monad transformer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5558,7 +5363,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/yuhangwang/Files#readme";
        description = "File content extraction/rearrangement";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5587,7 +5391,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-conduit network old-locale time
        ];
-       homepage = "http://www.b7j0c.org/stuff/haskell-yquote.xhtml";
        description = "Obtain quote data from finance.yahoo.com";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5605,7 +5408,6 @@ self: {
          base containers HTTP HTTP-Simple hxt hxt-filter network old-locale
          time
        ];
-       homepage = "http://www.ecoin.net/haskell/Finance-Treasury.html";
        description = "Obtain Treasury yield curve data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5618,7 +5420,6 @@ self: {
        version = "0.0.5";
        sha256 = "197xvn05yysmibm1p5wzxfa256lvpbknr5d1l2ws6g40w1kpk717";
        libraryHaskellDepends = [ base directory filepath ];
-       homepage = "https://github.com/audreyt/findbin";
        description = "Locate directory of original program";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5654,7 +5455,6 @@ self: {
        version = "0.6.1";
        sha256 = "0qfys17q3i56l20wzkpr8inq130j67kya022ynf0sgbc86avlrcn";
        libraryHaskellDepends = [ base deepseq template-haskell ];
-       homepage = "https://github.com/TomMD/FixedPoint";
        description = "Fixed point, large word, and large int numerical representations (types and common class instances)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5673,7 +5473,6 @@ self: {
        executableHaskellDepends = [
          base cgi containers directory haskell98 old-time parsec xhtml
        ];
-       homepage = "http://www.flippac.org/projects/flippi/";
        description = "Wiki";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5711,7 +5510,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base containers HUnit parsec ];
-       homepage = "https://github.com/dillonhuff/Folly";
        description = "A first order logic library in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5747,7 +5545,6 @@ self: {
          parameterized-data pretty process random regex-posix
          template-haskell type-level
        ];
-       homepage = "http://www.ict.kth.se/forsyde/";
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5770,7 +5567,6 @@ self: {
          base containers QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/choener/ForestStructures";
        description = "Tree- and forest structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -5797,7 +5593,6 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/choener/Forestry";
        description = "Comparison of trees and forests";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5810,7 +5605,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0lzrggy1j15cajb6k5qhz2s8ddngr3hhhsj781ya45fcx82mngvj";
        libraryHaskellDepends = [ base monad-control mtl resourcet ];
-       homepage = "https://github.com/exFalso/ForkableT/";
        description = "Forkable monad transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5841,7 +5635,6 @@ self: {
          base QuickCheck smallcheck tasty tasty-quickcheck tasty-smallcheck
          tasty-th
        ];
-       homepage = "https://github.com/choener/FormalGrammars";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -5898,7 +5691,6 @@ self: {
        version = "0.1";
        sha256 = "0h7vi940zrl2fqv8c2g0vj0gh9qfm2jf8c2drclx37zax5kb0r6p";
        libraryHaskellDepends = [ base HaXml ];
-       homepage = "http://www.fpml.org/";
        description = "A binding for the Financial Products Markup Language (v5.3)";
        license = "LGPL";
      }) {};
@@ -5918,7 +5710,6 @@ self: {
          vector
        ];
        executableSystemDepends = [ libX11 ];
-       homepage = "https://github.com/TomSmeets/FractalArt";
        description = "Generates colorful wallpapers";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs.xorg) libX11;};
@@ -6006,7 +5797,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl newtype she void ];
-       homepage = "http://personal.cis.strath.ac.uk/~conor/pub/Frank/";
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6038,7 +5828,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base base-compat GLUT OpenGL random ];
        executableHaskellDepends = [ base GLUT OpenGL random ];
-       homepage = "http://joyful.com/fungen";
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6058,7 +5847,6 @@ self: {
          base bytestring containers directory filepath ListZipper mtl
          mwc-random old-time process random transformers tuple
        ];
-       homepage = "https://github.com/thomaseding/fungi";
        description = "Funge-98 interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6071,7 +5859,6 @@ self: {
        version = "1.0";
        sha256 = "1nsmpph27yv0anrhhfqbpdqs2rrdbhm0jxzs3kk6ab32zb3ivhp2";
        libraryHaskellDepends = [ base directory random transformers ];
-       homepage = "http://boegel.kejo.be";
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6085,7 +5872,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bimap ];
-       homepage = "https://github.com/xnil/GGg";
        description = "GGg cipher";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6099,7 +5885,6 @@ self: {
        sha256 = "056kil71f488xf87xlyx9p5jpah2azhbnb2r7hwdyxbz7izns2ks";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process ];
-       homepage = "http://www.cs.kent.ac.uk/people/staff/cr3/toolbox/haskell/GHood";
        description = "A graphical viewer for Hood";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6112,7 +5897,6 @@ self: {
        sha256 = "029sw2sykr6plffkrmigv5mj2aklllmgi021is5ybsbqv0mxgh9p";
        libraryHaskellDepends = [ base OpenGL ];
        librarySystemDepends = [ libGL libX11 libXext libXfixes ];
-       homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
@@ -6127,7 +5911,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl OGL ];
        librarySystemDepends = [ libX11 libXrandr ];
-       homepage = "http://haskell.org/haskellwiki/GLFW-OGL";
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6195,7 +5978,6 @@ self: {
        libraryHaskellDepends = [
          base GLFW monad-task OpenGL transformers
        ];
-       homepage = "http://github.com/ninegua/GLFW-task";
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6236,7 +6018,6 @@ self: {
          base lens mtl parsec test-framework test-framework-quickcheck2
          test-framework-th
        ];
-       homepage = "http://github.com/sordina/GLM";
        description = "Simple Gridlab-D GLM parser and utilities";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -6248,7 +6029,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "13n80rplyl73ahk8cxgvs9gf655l063sd55spx0zvhw774vvxwv4";
        libraryHaskellDepends = [ base OpenGLRaw ];
-       homepage = "https://github.com/fiendfan1/GLMatrix";
        description = "Utilities for working with OpenGL matrices";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6262,7 +6042,6 @@ self: {
        sha256 = "1i2xi35n5z0d372px9mh6cyhgg1m0cfaiy3fnspkf6kbn9fgsqxq";
        libraryHaskellDepends = [ base OpenGLRaw transformers ];
        librarySystemDepends = [ libGL libGLU ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL; inherit (pkgs) libGLU;};
@@ -6280,7 +6059,6 @@ self: {
        libraryHaskellDepends = [
          array base containers OpenGL StateVar transformers
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6314,7 +6092,6 @@ self: {
          base comonad comonad-transformers containers data-lens hxt newtype
          xsd
        ];
-       homepage = "https://github.com/tonymorris/geo-gpx";
        description = "Parse GPX files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6333,7 +6110,6 @@ self: {
          base Boolean containers exception-transformers gl hashtables linear
          transformers
        ];
-       homepage = "https://github.com/tobbebex/GPipe-Core#readme";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6348,7 +6124,6 @@ self: {
        libraryHaskellDepends = [
          array base containers GPipe HaXml mtl Vec
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe meshes from Collada files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6380,7 +6155,6 @@ self: {
        sha256 = "1sr4dxc9bkfijaxvs7s94x5yfg14pb1r49fycwmzqkcycgz87n8q";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ];
-       homepage = "https://github.com/plredmond/GPipe-GLFW";
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6393,7 +6167,6 @@ self: {
        version = "1.0.4";
        sha256 = "1yf74k3yvpj42ynivlkacp5zwxwsx3yyfxb2436ljrv3339kjkb4";
        libraryHaskellDepends = [ base bitmap GPipe stb-image ];
-       homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6413,7 +6186,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://bitbucket.org/emoto/gtalib";
        description = "A library for GTA programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6452,7 +6224,6 @@ self: {
        executableHaskellDepends = [
          base containers directory filepath mtl parsec transformers
        ];
-       homepage = "https://github.com/BMeph/Ganymede";
        description = "An Io interpreter in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6481,7 +6252,6 @@ self: {
        executableHaskellDepends = [
          array base directory random wx wxcore
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GeBoP";
        description = "Several games";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6516,7 +6286,6 @@ self: {
          test-framework-quickcheck2 test-framework-smallcheck text
          transformers
        ];
-       homepage = "http://projects.haskell.org/GenI";
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6575,7 +6344,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
-       homepage = "https://github.com/choener/Gene-CluEDO";
        description = "Hox gene clustering";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6590,7 +6358,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://afonso.xyz";
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6603,7 +6370,6 @@ self: {
        version = "1.2.2";
        sha256 = "0g5frpzq8hr2wqbf91cxcyxqqsw06p1w9f1sm3k6v1hz13kpmspf";
        libraryHaskellDepends = [ base ghc-prim pretty ];
-       homepage = "https://github.com/RazvanRanca/GenericPretty";
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6631,7 +6397,6 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
-       homepage = "https://github.com/choener/GenussFold";
        description = "MCFGs for Genus-1 RNA Pseudoknots";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6657,7 +6422,6 @@ self: {
        sha256 = "1c5sww3lvwkijsxg37zj77rxx021wlwjwsadiknvci9xlzccnw5b";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
-       homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git";
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6670,7 +6434,6 @@ self: {
        version = "0.4";
        sha256 = "1nb0q5hs9qqgygw35rbvanbjf9l6vjxrl6l4jp9dqwlnl1kdd88q";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.google.com/p/geodetic/";
        description = "Geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6706,7 +6469,6 @@ self: {
        sha256 = "18i6ags8acgi651453g7axw7isiqivjhb4s0nh3lyl87ynqsch6l";
        libraryHaskellDepends = [ base constraints singletons ];
        testHaskellDepends = [ base constraints singletons ];
-       homepage = "https://github.com/MarisaKirisame/Get#readme";
        description = "get stuff out of stuff";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6745,7 +6507,6 @@ self: {
          gi-glib gi-gobject gi-gst gi-gstvideo gi-gtk haskell-gi
          haskell-gi-base process temporary text transformers
        ];
-       homepage = "https://github.com/lettier/gifcurry";
        description = "GIF creation utility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6758,7 +6519,6 @@ self: {
        version = "0.2.2.3";
        sha256 = "10f9yl62gwnjmb0mbfffdzhwscpwpvq9gj52zsrz8w6z6sbkijbf";
        libraryHaskellDepends = [ base directory extra old-time process ];
-       homepage = "https://github.com/Qinka/GiveYouAHead/";
        description = "to auto-do somethings";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -6781,7 +6541,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers transformers-compat
        ];
-       homepage = "http://iki.fi/matti.niemenmaa/glob/";
        description = "Globbing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6793,7 +6552,6 @@ self: {
        version = "0.3";
        sha256 = "0n1290ls68fsky3a80fvfdq6bycvmpn3i3kmflq6yn45qa959f0k";
        libraryHaskellDepends = [ array base GlomeVec ];
-       homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Ray Tracing Library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6807,7 +6565,6 @@ self: {
        sha256 = "08hyiadkbkmcsd1g51xvxqzp6l94hnqqbz4r6yk0zk29iawq8610";
        libraryHaskellDepends = [ array base ];
        libraryPkgconfigDepends = [ llvm ];
-       homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Simple 3D vector library";
        license = "GPL";
      }) {inherit (self.llvmPackages) llvm;};
@@ -6825,7 +6582,6 @@ self: {
        executableHaskellDepends = [
          base deepseq GlomeTrace GlomeVec monad-par random SDL time vector
        ];
-       homepage = "http://haskell.org/haskellwiki/Glome";
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6838,7 +6594,6 @@ self: {
        version = "0.2";
        sha256 = "0wfabsdn4agmg459srnknkwqb7ri5knj9npzgzhilybwrrqq46v9";
        libraryHaskellDepends = [ base ];
-       homepage = "http://neugierig.org/software/darcs/browse/?r=google-chart;a=summary";
        description = "Generate web-based charts using the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -6854,7 +6609,6 @@ self: {
        libraryHaskellDepends = [
          array base containers mtl parallel safe split transformers
        ];
-       homepage = "http://johannesgerer.com/GoogleCodeJam";
        description = "A monad for flexible parsing of Google Code Jam input files with automatic parallelization";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6871,7 +6625,6 @@ self: {
        libraryHaskellDepends = [
          AttoJson base bytestring containers dataenc download-curl
        ];
-       homepage = "https://github.com/favilo/GoogleDirections.git";
        description = "Haskell Interface to Google Directions API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6928,7 +6681,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1w1w1p2cpndiilr002whm58bzqjh9cp9lw3jl7khdxh20c1dfzhy";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/gcross/GotoT-transformers";
        description = "A monad and monadic transformer providing \"goto\" functionality";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6963,7 +6715,6 @@ self: {
          FormalGrammars lens newtype parsers PrimitiveArray semigroups
          template-haskell transformers trifecta
        ];
-       homepage = "https://github.com/choener/GrammarProducts";
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7078,7 +6829,6 @@ self: {
          base mtl parsec QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GroteTrap";
        description = "Parser and selection library for expression languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7101,7 +6851,6 @@ self: {
          definitive-filesystem definitive-parser definitive-reactive
          directory filepath old-locale primitive process time unix vector
        ];
-       homepage = "http://coiffier.net/projects/grow.html";
        description = "A declarative make-like interpreter";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7169,7 +6918,6 @@ self: {
        libraryHaskellDepends = [
          base gtk time TV TypeCompose vector-space
        ];
-       homepage = "http://haskell.org/haskellwiki/GtkTV";
        description = "Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -7188,7 +6936,6 @@ self: {
          base containers directory filepath glade gtk parsec process
          proplang
        ];
-       homepage = "http://www-users.cs.york.ac.uk/~ndm/guihaskell/";
        description = "A graphical REPL and development environment for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7201,7 +6948,6 @@ self: {
        version = "0.4";
        sha256 = "15mndbxm83q0d8ci3vj51zwrmzl0f5i5yqv0caw05vlzfsr4ib5i";
        libraryHaskellDepends = [ base DeepArrow phooey TV TypeCompose ];
-       homepage = "http://haskell.org/haskellwiki/GuiTV";
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7221,7 +6967,6 @@ self: {
          base bytestring cmdargs file-embed inline-r pretty process
          temporary vector
        ];
-       homepage = "https://tweag.github.io/HaskellR";
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -7236,7 +6981,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [ array base ];
-       homepage = "http://www.engr.uconn.edu/~jeffm/Classes/CSE240-Spring-2001/Lectures/index.html";
        description = "A simple ARM emulator in haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7357,7 +7101,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl QuickCheck random
        ];
-       homepage = "http://github.com/m4dc4p/hcl/tree/master";
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7372,7 +7115,6 @@ self: {
        libraryHaskellDepends = [
          base mtl QuickCheck random random-shuffle
        ];
-       homepage = "http://patch-tag.com/publicrepos/HCard";
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7392,7 +7134,6 @@ self: {
        testHaskellDepends = [
          array base bytestring QuickCheck random semigroups
        ];
-       homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "A library to read, write and manipulate MIDI, WAVE, and SoundFont2 files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -7411,7 +7152,6 @@ self: {
          base bytestring containers convertible mtl old-time text time
          utf8-string
        ];
-       homepage = "https://github.com/hdbc/hdbc";
        description = "Haskell Database Connectivity";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -7427,7 +7167,6 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring HDBC time utf8-string ];
        librarySystemDepends = [ mysqlclient openssl zlib ];
-       homepage = "http://github.com/ryantm/hdbc-mysql";
        description = "MySQL driver for HDBC";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7448,7 +7187,6 @@ self: {
          base bytestring concurrent-extra HDBC mtl time utf8-string
        ];
        librarySystemDepends = [ unixODBC ];
-       homepage = "https://github.com/hdbc/hdbc-odbc";
        description = "ODBC driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) unixODBC;};
@@ -7468,7 +7206,6 @@ self: {
          utf8-string
        ];
        librarySystemDepends = [ postgresql ];
-       homepage = "http://github.com/hdbc/hdbc-postgresql";
        description = "PostgreSQL driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
@@ -7480,7 +7217,6 @@ self: {
        version = "0.0.1.2";
        sha256 = "0657a1qy51bihh9gvpwpqpm4gch68rw32plnjcfdbc37yjq5dj1d";
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
-       homepage = "https://bitbucket.org/dpwiz/hdbc-postgresql-hstore";
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7493,7 +7229,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "16ffb6fd6y3qxms6pf4qyc2b03pvnz62bbzrlszp7j48z1alwp15";
        libraryHaskellDepends = [ base HDBC ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Bracketed connection for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -7509,7 +7244,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring HDBC mtl utf8-string ];
        librarySystemDepends = [ sqlite ];
-       homepage = "https://github.com/hdbc/hdbc-sqlite3";
        description = "Sqlite v3 driver for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) sqlite;};
@@ -7524,7 +7258,6 @@ self: {
        sha256 = "0rkykxmqpqiclvxlvfd0v9rrvkkb25shyajdmajxisfqxl684y0g";
        libraryHaskellDepends = [ array base colour containers mtl unix ];
        librarySystemDepends = [ pfstools ];
-       homepage = "http://vis.renci.org/jeff/pfs";
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7559,7 +7292,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/iqsf/HFitUI.git";
        description = "The library for generating a graphical interface on the web";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7572,7 +7304,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "09h6wfalziw39c2sghj8qw82vyvnl01qlsam6ngkfkdirgj5sg5h";
        libraryHaskellDepends = [ base c-storable-deriving ];
-       homepage = "https://github.com/Bellaz/HfrequencyList";
        description = "A Queue with a random (weighted) pick function";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7591,7 +7322,6 @@ self: {
        preConfigure = ''
          sed -i -e "s@  Extra-Lib-Dirs:         /usr/local/lib@  Extra-Lib-Dirs:         ${fuse}/lib@" HFuse.cabal
        '';
-       homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -7609,7 +7339,6 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL safe time ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/I3ck/HGE2D";
        description = "2D game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7639,7 +7368,6 @@ self: {
          base binary-serialise-cbor bytestring cereal clock containers
          directory filepath fresco-binding text vect
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7657,7 +7385,6 @@ self: {
          base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding
          HGamer3D-SFML-Binding
        ];
-       homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - API";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7674,7 +7401,6 @@ self: {
        libraryHaskellDepends = [
          base containers HGamer3D-Common HGamer3D-Data HGamer3D-SFML-Binding
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Audio Functionality";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7687,7 +7413,6 @@ self: {
        version = "0.2.1";
        sha256 = "1ilj8p1gm56dffics90qj6gspnam56s84wvaig9s0cwjbwxqi4hy";
        libraryHaskellDepends = [ base HGamer3D-Data ];
-       homepage = "http://www.hgamer3d.org";
        description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7702,7 +7427,6 @@ self: {
        sha256 = "1q69ffhnnh4iaghb1g8s6bqlsry7jy5sbp5vpg4lprnr4wna5ya1";
        libraryHaskellDepends = [ base haskell98 HGamer3D-Data ];
        librarySystemDepends = [ HGamer3DCAudio015 ];
-       homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7720,7 +7444,6 @@ self: {
        librarySystemDepends = [
          CEGUIBase CEGUIOgreRenderer hg3dcegui050
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7739,7 +7462,6 @@ self: {
          base clock containers directory filepath FindBin HGamer3D-Data stm
          vect
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Game Engine and Utilities";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7756,7 +7478,6 @@ self: {
        libraryHaskellDepends = [
          base clock containers directory filepath FindBin stm vect
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Data Definitions";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7770,7 +7491,6 @@ self: {
        sha256 = "0a5na073ysmcvr9nkbg7jgrkapzbd22wn7p09s2kpxzl9fr8axwd";
        libraryHaskellDepends = [ base HGamer3D-Data ];
        librarySystemDepends = [ enet hg3denet050 ];
-       homepage = "http://www.hgamer3d.org";
        description = "Enet Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7787,7 +7507,6 @@ self: {
        libraryHaskellDepends = [
          base HGamer3D-CEGUI-Binding HGamer3D-Data HGamer3D-WinEvent split
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "GUI Functionality for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7808,7 +7527,6 @@ self: {
          HGamer3D-Common HGamer3D-Data HGamer3D-Ogre-Binding
          HGamer3D-SDL2-Binding mtl split transformers
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - 3D Graphics Functionality";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7826,7 +7544,6 @@ self: {
          base HGamer3D-Common HGamer3D-Data HGamer3D-SDL2-Binding
          HGamer3D-SFML-Binding
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Joystick, Mouse and Keyboard Functionality for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7843,7 +7560,6 @@ self: {
        libraryHaskellDepends = [
          base HGamer3D-Common HGamer3D-Data HGamer3D-Enet-Binding
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Networking Functionality for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7861,7 +7577,6 @@ self: {
          base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding
        ];
        librarySystemDepends = [ HGamer3DOIS015 ];
-       homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7881,7 +7596,6 @@ self: {
          hg3dogre050 OgreMain OgrePaging OgreProperty OgreRTShaderSystem
          OgreTerrain
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Ogre Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7901,7 +7615,6 @@ self: {
          base bytestring HGamer3D-Data utf8-string
        ];
        librarySystemDepends = [ hg3dsdl2050 libX11 SDL2 ];
-       homepage = "http://www.hgamer3d.org";
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7920,7 +7633,6 @@ self: {
        librarySystemDepends = [
          hg3dsfml050 sfml-audio sfml-network sfml-system sfml-window
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "SFML Binding for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7937,7 +7649,6 @@ self: {
        libraryHaskellDepends = [
          base HGamer3D-Data HGamer3D-SDL2-Binding text
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Windowing and Event Functionality for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7956,7 +7667,6 @@ self: {
          base containers HGamer3D HGamer3D-Audio HGamer3D-Data HGamer3D-GUI
          HGamer3D-InputSystem HGamer3D-WinEvent mtl netwire transformers
        ];
-       homepage = "http://www.hgamer3d.org";
        description = "Wire Functionality for HGamer3D";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -7988,7 +7698,6 @@ self: {
          directory filepath monad-logger resourcet tar text text-binary
          transformers zlib
        ];
-       homepage = "https://github.com/JPMoresmau/HGraphStorage";
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8001,7 +7710,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1215nz6l3bbkld2fqqsc494xw4qw4vqavznaqxgja2p60w9mwg0q";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
-       homepage = "http://thesz.mskhug.ru/svn/hhdl/hackage/hhdl/";
        description = "Hardware Description Language embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8014,7 +7722,6 @@ self: {
        version = "0.7.0";
        sha256 = "0xvhzmsl1z6im36svjhcl4zlbnmpknlfn0m426cj5l06a3c5mfa8";
        libraryHaskellDepends = [ base HJavaScript hsp mtl text ];
-       homepage = "http://patch-tag.com/r/nibro/hjscript";
        description = "HJScript is a Haskell EDSL for writing JavaScript programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8038,7 +7745,6 @@ self: {
          base Cabal haskell-src-exts HUnit mtl parsec test-framework
          test-framework-hunit transformers
        ];
-       homepage = "https://github.com/JPMoresmau/HJVM";
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8073,7 +7779,6 @@ self: {
          base ConstraintKinds containers deepseq hashable MonadRandom
          parallel random template-haskell vector vector-heterogenous
        ];
-       homepage = "http://github.com/mikeizbicki/HLearn/";
        description = "Algebraic foundation for homomorphic learning";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8117,7 +7822,6 @@ self: {
          math-functions MonadRandom normaldistribution parsec primitive
          QuickCheck statistics vector vector-th-unbox
        ];
-       homepage = "http://github.com/mikeizbicki/HLearn/";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -8157,7 +7861,6 @@ self: {
          math-functions MonadRandom normaldistribution process QuickCheck
          statistics template-haskell vector vector-th-unbox
        ];
-       homepage = "http://github.com/mikeizbicki/HLearn/";
        description = "Distributions for use with the HLearn library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8198,7 +7901,6 @@ self: {
        executableHaskellDepends = [
          applicative-quoters base regex-applicative
        ];
-       homepage = "http://code.haskell.org/~aavogt/HListPP";
        description = "A preprocessor for HList labelable labels";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8214,7 +7916,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base old-locale time ];
        executableHaskellDepends = [ base old-locale time ];
-       homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8226,7 +7927,6 @@ self: {
        pname = "HMM";
        version = "0.2.1";
        sha256 = "01y8l76c56gysynbilp32yq0wfc129hl24siw8s9fmpn98qa71s6";
-       homepage = "https://github.com/mikeizbicki/hmm";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8244,7 +7944,6 @@ self: {
        libraryHaskellDepends = [
          base data-default hashable mtl unordered-containers
        ];
-       homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable-like functionality";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8263,7 +7962,6 @@ self: {
          base lens mtl QuickCheck random tasty tasty-hunit tasty-quickcheck
          vector
        ];
-       homepage = "https://github.com/swizzard/HMarkov#readme";
        description = "Markov-generated sequences";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8286,7 +7984,6 @@ self: {
        executableHaskellDepends = [
          base containers glib gtk haskell98 mtl process regex-posix unix
        ];
-       homepage = "http://sert.homedns.org/hs/hnm/";
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8334,7 +8031,6 @@ self: {
          mtl random vector zlib
        ];
        testHaskellDepends = [ base HTF ];
-       homepage = "http://www.alpheccar.org";
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8358,7 +8054,6 @@ self: {
          base Cabal containers directory filepath haskell-src-exts mtl
          parsec utf8-string
        ];
-       homepage = "http://github.com/solidsnack/HPath";
        description = "Extract Haskell declarations by name";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8389,7 +8084,6 @@ self: {
        sha256 = "1hh5b5jknmfdz0fjh220fv1p5p3q7i176fphvdin30jk4r7xpin9";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ bcm2835 ];
-       homepage = "https://github.com/WJWH/HPi";
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8408,7 +8102,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base glade glib gtk ];
        executablePkgconfigDepends = [ plplotd-gnome2 ];
-       homepage = "http://yakov.cc/HPlot.html";
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8428,7 +8121,6 @@ self: {
        executableHaskellDepends = [
          base data-accessor data-accessor-template GLFW OpenGL
        ];
-       homepage = "http://bonsaicode.wordpress.com/2009/04/23/hpong-012/";
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8447,7 +8139,6 @@ self: {
          base fficxx fficxx-runtime HROOT-core HROOT-graf HROOT-hist
          HROOT-io HROOT-math HROOT-tree template-haskell
        ];
-       homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to the ROOT data analysis framework";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8462,7 +8153,6 @@ self: {
        libraryHaskellDepends = [
          base fficxx fficxx-runtime template-haskell
        ];
-       homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8479,7 +8169,6 @@ self: {
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core HROOT-hist template-haskell
        ];
-       homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8496,7 +8185,6 @@ self: {
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
-       homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8513,7 +8201,6 @@ self: {
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
-       homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8530,7 +8217,6 @@ self: {
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
-       homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8547,7 +8233,6 @@ self: {
        libraryHaskellDepends = [
          base fficxx fficxx-runtime HROOT-core template-haskell
        ];
-       homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Tree modules";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8563,7 +8248,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base directory haskell98 ];
-       homepage = "http://boegel.kejo.be/ELIS/Haskell/HRay/";
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8585,7 +8269,6 @@ self: {
        executableHaskellDepends = [
          array base Cabal containers directory filepath parsec process unix
        ];
-       homepage = "http://www.haskell.org/haskellwiki/HSFFIG";
        description = "Generate FFI import declarations from C include files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8605,7 +8288,6 @@ self: {
          base mersenne-random-pure64 monad-mersenne-random mtl split vector
        ];
        executableHaskellDepends = [ csv ];
-       homepage = "http://github.com/mjsottile/hsgep/";
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8626,7 +8308,6 @@ self: {
          base bytestring directory filepath hslogger MissingH mtl process
          regex-base regex-compat regex-posix unix
        ];
-       homepage = "http://software.complete.org/hsh";
        description = "Library to mix shell scripting with Haskell programs";
        license = "LGPL";
      }) {};
@@ -8667,7 +8348,6 @@ self: {
        version = "3.0.1";
        sha256 = "03gb5dd59mirwb11b98vbg60w2zwfsbr8akk7qbq01z7n7rkgsr7";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/apeyroux/HSlippyMap";
        description = "OpenStreetMap Slippy Map";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8686,7 +8366,6 @@ self: {
          unordered-containers vector
        ];
        testHaskellDepends = [ aeson attoparsec base HTF text ];
-       homepage = "https://github.com/agrafix/HSmarty";
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8704,7 +8383,6 @@ self: {
          array arrows base containers deepseq Euterpea ghc-prim HCodecs
          markov-chain pure-fft random UISF
        ];
-       homepage = "http://www.euterpea.com";
        description = "Library for computer music education";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8721,7 +8399,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring filepath haskell98 mtl parallel
        ];
-       homepage = "http://mml.music.utexas.edu/jwlato/HSoundFile";
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8757,7 +8434,6 @@ self: {
          base containers directory FileManipCompat filepath HSH
          HStringTemplate mtl safe strict
        ];
-       homepage = "http://patch-tag.com/tphyahoo/r/tphyahoo/HStringTemplateHelpers";
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8802,7 +8478,6 @@ self: {
          process random regex-compat template-haskell temporary text
          unordered-containers
        ];
-       homepage = "https://github.com/skogsbaer/HTF/";
        description = "The Haskell Test Framework";
        license = stdenv.lib.licenses.lgpl21;
      }) {};
@@ -8825,7 +8500,6 @@ self: {
          http-types httpd-shed HUnit mtl network network-uri pureMD5 split
          test-framework test-framework-hunit wai warp
        ];
-       homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8838,7 +8512,6 @@ self: {
        sha256 = "1294pn82fbskgfw2mh3ri31wab5l9y3j0g50dcx5sqbhz79pnj9w";
        libraryHaskellDepends = [ base HTTP network ];
        doHaddock = false;
-       homepage = "http://www.b7j0c.org/content/haskell-http.html";
        description = "DEPRECATED Enable simple wrappers to Network.HTTP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8857,7 +8530,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs containers deepseq hylolib mtl strict
        ];
-       homepage = "http://www.glyc.dc.uba.ar/intohylo/htab.php";
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8876,7 +8548,6 @@ self: {
        executableHaskellDepends = [
          array base mtl random SDL SDL-image SDL-ttf
        ];
-       homepage = "http://github.com/snkkid/HTicTacToe";
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8890,7 +8561,6 @@ self: {
        sha256 = "1pnhwqq5v8h48gbp3ibv3skfj25mf4zs5svxcavq93p9cswycj3l";
        libraryHaskellDepends = [ base call-stack deepseq ];
        testHaskellDepends = [ base call-stack deepseq filepath ];
-       homepage = "https://github.com/hspec/HUnit#readme";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8902,7 +8572,6 @@ self: {
        version = "0.1";
        sha256 = "0dlsx6qicnrqkhb52jbgh31f0y6lxh32yl5gr6bg3fnqr36vc6x6";
        libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ];
-       homepage = "https://github.com/dag/HUnit-Diff";
        description = "Assertions for HUnit with difference reporting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8925,7 +8594,6 @@ self: {
          base bytestring Cabal cmdargs directory hashable hexpat hostname
          parsec text time timeit unordered-containers
        ];
-       homepage = "https://github.com/emc2/HUnit-Plus";
        description = "A test framework building on HUnit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8938,7 +8606,6 @@ self: {
        sha256 = "1brblqpz002jzql9wgzxk5zlfglmkv91s8gcfd6992xv539jfhsa";
        libraryHaskellDepends = [ base call-stack HUnit ];
        testHaskellDepends = [ base call-stack HUnit ];
-       homepage = "https://github.com/goldfirere/HUnit-approx";
        description = "Approximate equality for floating point numbers with HUnit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -8965,7 +8632,6 @@ self: {
          network pureMD5 random regex-posix text transformers utf8-string
          xml-enumerator xml-types
        ];
-       homepage = "http://www.pontarius.org/sub-projects/hxmpp/";
        description = "A (prototyped) easy to use XMPP library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8984,7 +8650,6 @@ self: {
          array base haskeline HTTP mtl regex-base regex-compat
          template-haskell
        ];
-       homepage = "http://lambda.uta.edu/HXQ/";
        description = "A Compiler from XQuery to Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9000,7 +8665,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base HUnit mtl QuickCheck ];
-       homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
        description = "HaLeX enables modelling, manipulation and visualization of regular languages";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -9012,7 +8676,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0q7fq5z0wrk2qg9n715033yp25dpl73g6iqkbvxbg2ahp9caq458";
        libraryHaskellDepends = [ base bytestring serialport stm ];
-       homepage = "https://github.com/Zigazou/HaMinitel";
        description = "An Haskell library to drive the french Minitel through a serial port";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9025,7 +8688,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "0li04k27pkq7ci1dfx4sl022ivl4gjqy5ny25jszifwrx4n4pmwz";
        libraryHaskellDepends = [ base template-haskell th-lift ];
-       homepage = "https://github.com/sakana/HaPy";
        description = "Haskell bindings for Python";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9061,7 +8723,6 @@ self: {
          ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl
          parsec turtle
        ];
-       homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9083,7 +8744,6 @@ self: {
        testHaskellDepends = [
          base parsec QuickCheck tasty tasty-quickcheck text
        ];
-       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9104,7 +8764,6 @@ self: {
        testHaskellDepends = [
          base parsec QuickCheck tasty tasty-quickcheck text
        ];
-       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9181,7 +8840,6 @@ self: {
          base bytestring containers filepath polyparse pretty random
        ];
        executableHaskellDepends = [ base directory polyparse pretty ];
-       homepage = "http://projects.haskell.org/HaXml/";
        description = "Utilities for manipulating XML documents";
        license = "LGPL";
      }) {};
@@ -9198,7 +8856,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers network old-locale ];
        executableHaskellDepends = [ text time vty vty-ui ];
-       homepage = "http://github.com/dmalikov/HaCh";
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9220,7 +8877,6 @@ self: {
        executableHaskellDepends = [
          base Crypto directory hdaemonize hint mtl old-time parsec
        ];
-       homepage = "http://patch-tag.com/publicrepos/Hackmail";
        description = "A Procmail Replacement as Haskell EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9239,7 +8895,6 @@ self: {
          text tokenize tuple vector
        ];
        testHaskellDepends = [ base Cabal containers HUnit tuple vector ];
-       homepage = "https://github.com/Pold87/Haggressive";
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9252,7 +8907,6 @@ self: {
        version = "0.0.5";
        sha256 = "1jp8cwlp6h1wvvkh71813i3lzxc7ckxzc7nvvcsjvcz0apxcl7vv";
        libraryHaskellDepends = [ base bytestring network ];
-       homepage = "https://github.com/wuxb45/HandlerSocket-Haskell-Client";
        description = "Haskell implementation of a HandlerSocket client (API)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9273,7 +8927,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base hspec hxt ];
-       homepage = "https://github.com/egonSchiele/HandsomeSoup";
        description = "Work with HTML more easily in HXT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9288,7 +8941,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base random transformers ];
        testHaskellDepends = [ base hspec transformers ];
-       homepage = "https://github.com/lf94/Hangman";
        description = "The classic game of Hangman";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9307,7 +8959,6 @@ self: {
        testHaskellDepends = [
          base constraints generics-sop safe singletons
        ];
-       homepage = "https://github.com/MarisaKirisame/HappyTree#readme";
        description = "Type Safe and End to End Decision Tree";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9332,7 +8983,6 @@ self: {
          HarmTrace-Base instant-generics ListLike matrix mtl parallel
          process sox template-haskell uu-parsinglib vector
        ];
-       homepage = "https://github.com/haas/harmtrace";
        description = "Harmony Analysis and Retrieval of Music";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9355,7 +9005,6 @@ self: {
          base binary containers ghc-prim ListLike QuickCheck random
          uu-parsinglib
        ];
-       homepage = "https://github.com/chordify/HarmTrace-Base";
        description = "Parsing and unambiguously representing musical chords";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -9368,7 +9017,6 @@ self: {
        sha256 = "0ddyngd1mrx9s11nm7sh0nh76zi1zi7yjzmqk7xbpv6ijqka050a";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/thma/HasBigDecimal#readme";
        description = "A library for arbitrary precision decimal numbers";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -9385,7 +9033,6 @@ self: {
        libraryHaskellDepends = [ base process QuickCheck ];
        librarySystemDepends = [ CacBDD ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/m4lvin/HasCacBDD";
        description = "Haskell bindings for CacBDD";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9403,7 +9050,6 @@ self: {
        libraryHaskellDepends = [
          base haskell98 hmatrix hmatrix-special mtl parsec random
        ];
-       homepage = "http://www.cl.cam.ac.uk/~sbh11/HasGP";
        description = "A Haskell library for inference using Gaussian processes";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9423,7 +9069,6 @@ self: {
        executableHaskellDepends = [
          array base list-tries monad-loops mtl numbers parsec
        ];
-       homepage = "http://iki.fi/matti.niemenmaa/misc-projects.html#haschoo";
        description = "Minimalist R5RS Scheme interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9472,7 +9117,6 @@ self: {
        version = "0.4.8";
        sha256 = "0yn2nj6irmj24j1djvnnq26i2lbf9g9x1wdhmcrk519glcn5k64j";
        libraryHaskellDepends = [ array base containers random ];
-       homepage = "http://haskellformaths.blogspot.com/";
        description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9513,7 +9157,6 @@ self: {
          array base base64-string bytestring cryptohash mime-mail mtl
          network old-time pretty text
        ];
-       homepage = "https://github.com/jtdaugherty/HaskellNet";
        description = "Client support for POP3, SMTP, and IMAP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9530,7 +9173,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring connection data-default HaskellNet network tls
        ];
-       homepage = "https://github.com/dpwright/HaskellNet-SSL";
        description = "Helpers to connect to SSL/TLS mail servers with HaskellNet";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9568,7 +9210,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs text ];
-       homepage = "https://github.com/mrLSD/HaskellTutorials";
        description = "Haskell Tutorials by Evgeny Ukhanov";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9587,7 +9228,6 @@ self: {
        executableHaskellDepends = [
          base containers HGL hmatrix MonadRandom random Yampa
        ];
-       homepage = "http://www.matthewhayden.co.uk";
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9600,14 +9240,13 @@ self: {
      }:
      mkDerivation {
        pname = "Hastodon";
-       version = "0.5.0";
-       sha256 = "1yr72vkj4ir7q6w1fnffra9lr0jvz2pfskd2g1zwg3a778cbyx9h";
+       version = "0.6.0";
+       sha256 = "108a4cgqyfgv8srpnmaiqf8jvqfp2kwfl26vk9b58n6sbmmxcwyn";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit containers exceptions
          http-client http-conduit http-types mime-types MissingH resourcet
          text transformers
        ];
-       homepage = "https://github.com/syucream/hastodon";
        description = "mastodon client module for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -9631,7 +9270,6 @@ self: {
          base GLFW-b GLUtil JuicyPixels JuicyPixels-util lens mtl OpenGL
          random transformers vect vect-opengl vector
        ];
-       homepage = "http://github.com/bananu7/Hate";
        description = "A small 2D game framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9681,7 +9319,6 @@ self: {
          MonadCatchIO-transformers mtl network old-time parsec process snap
          snap-core snap-server tar text transformers xhtml-combinators zlib
        ];
-       homepage = "http://holumbus.fh-wedel.de";
        description = "The Hayoo! search engine for Haskell API search on hackage";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9694,7 +9331,6 @@ self: {
        version = "3.0.0.4";
        sha256 = "04ppwm7vfzndrys8x1n8vfb41vzwx59r9xp4dkbiqmrms390pj6q";
        libraryHaskellDepends = [ base mtl process strict ];
-       homepage = "https://github.com/jetho/Hclip";
        description = "A small cross-platform library for reading and modifying the system clipboard";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9735,7 +9371,6 @@ self: {
          template-haskell text
        ];
        testHaskellDepends = [ base linear subhask ];
-       homepage = "github.com/mikeizbicki/herbie-haskell";
        description = "automatically improve your code's numeric stability";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9773,7 +9408,6 @@ self: {
          array base buster bytestring cairo colour containers glib GLUT gtk
          gtkglext IfElse mtl OpenGL parallel pretty random
        ];
-       homepage = "http://vis.renci.org/jeff/hieroglyph";
        description = "Purely functional 2D graphics for visualization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9791,7 +9425,6 @@ self: {
          base bytestring containers deepseq mtl text th-expand-syns TrieMap
          vector
        ];
-       homepage = "http://github.com/lpeterse/HiggsSet";
        description = "A multi-index set with advanced query capabilites";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9806,7 +9439,6 @@ self: {
        libraryHaskellDepends = [
          array base containers StateVar transformers
        ];
-       homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
      }) {};
@@ -9819,7 +9451,6 @@ self: {
        sha256 = "1nql9101c1philljk20idllpxgq79hlihkk3kyl57bk4cb4iyr2h";
        libraryHaskellDepends = [ base Hipmunk linear StateVar ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/suzumiyasmith/Hipmunk-Utils#readme";
        description = "Useful functions for Hipmunk";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9837,7 +9468,6 @@ self: {
        executableHaskellDepends = [
          base containers GLFW Hipmunk OpenGL StateVar transformers
        ];
-       homepage = "https://github.com/meteficha/HipmunkPlayground";
        description = "A playground for testing Hipmunk";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9859,7 +9489,6 @@ self: {
        executableHaskellDepends = [
          base directory MissingH process regex-tdfa time
        ];
-       homepage = "https://github.com/jaiyalas/Hish";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -9912,7 +9541,6 @@ self: {
          unordered-containers vector vector-th-unbox
        ];
        testHaskellDepends = [ base process QuickCheck ];
-       homepage = "https://github.com/MaartenFaddegon/Hoed";
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9925,7 +9553,6 @@ self: {
        version = "0.1.2";
        sha256 = "0y29gnbxrlj9fh0d5naa7ia1xs36fimszcbzif2zdw451jkk97r9";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/MedeaMelana/HoleyMonoid";
        description = "Monoids with holes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -9945,7 +9572,6 @@ self: {
          array base binary bytestring containers deepseq haskell98 hslogger
          hxt network random readline stm time unix
        ];
-       homepage = "http://holumbus.fh-wedel.de";
        description = "intra- and inter-program communication";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9968,7 +9594,6 @@ self: {
          extensible-exceptions haskell98 Holumbus-Distribution
          Holumbus-Storage hslogger hxt network readline time unix
        ];
-       homepage = "http://holumbus.fh-wedel.de";
        description = "a distributed MapReduce framework";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -9990,7 +9615,6 @@ self: {
          hxt-regex-xmlschema hxt-unicode mtl network parallel parsec process
          SHA unix
        ];
-       homepage = "http://holumbus.fh-wedel.de";
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10011,7 +9635,6 @@ self: {
          base binary bytestring containers directory haskell98
          Holumbus-Distribution hslogger hxt network random time unix
        ];
-       homepage = "http://holumbus.fh-wedel.de";
        description = "a distributed storage system";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10024,7 +9647,6 @@ self: {
        version = "0.1.1";
        sha256 = "12cqfy2vpshly1rgjclzpnhb094s5wr038ahh5agsx03x6mnsr9n";
        libraryHaskellDepends = [ base containers vector ];
-       homepage = "http://www.math.ucla.edu/~damek";
        description = "Compute the homology of a chain complex";
        license = "GPL";
      }) {};
@@ -10058,7 +9680,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base doctest hspec ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/bacher09/hostandport";
        description = "Parser for host and port pairs like localhost:22";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -10072,7 +9693,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
-       homepage = "http://github.com/Raynes/Hricket";
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10101,7 +9721,6 @@ self: {
          syb time
        ];
        testHaskellDepends = [ base directory filepath process ];
-       homepage = "http://blog.zhox.com/category/hs2lib/";
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10114,7 +9733,6 @@ self: {
        version = "0.2";
        sha256 = "1kdf2yq3v8lr84h2pf1ydi6vrqfr685vbkxjz4ai5wd2mij8i361";
        libraryHaskellDepends = [ array base random ];
-       homepage = "http://repetae.net/recent/out/HsASA.html";
        description = "A haskell interface to Lester Ingber's adaptive simulating annealing code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10160,7 +9778,6 @@ self: {
          base base-unicode-symbols bytestring network text
        ];
        libraryPkgconfigDepends = [ hyperestraier qdbm ];
-       homepage = "http://cielonegro.org/HsHyperEstraier.html";
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10175,7 +9792,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ Judy ];
-       homepage = "http://www.pugscode.org/";
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10195,7 +9811,6 @@ self: {
        ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vshabanov/HsOpenSSL";
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
@@ -10207,7 +9822,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "14hzjdpv8ld3nw5fcx451w49vq0s8fhs1zh984vpm85b5ypbgp2v";
        libraryHaskellDepends = [ base bytestring HsOpenSSL unix ];
-       homepage = "https://github.com/redneb/HsOpenSSL-x509-system";
        description = "Use the system's native CA certificate store with HsOpenSSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10245,7 +9859,6 @@ self: {
        version = "0.4.3.3";
        sha256 = "1yx4dzcjmykk4nzrh888jhikb8x635dpx7g27rgnlaiy5nid3pc7";
        libraryHaskellDepends = [ base bytestring mtl stm ];
-       homepage = "https://github.com/phonohawk/HsSVN";
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10295,7 +9908,6 @@ self: {
          GotoT-transformers haskell98 mtl parsec regex-base regex-compat
          regex-posix
        ];
-       homepage = "http://github.com/rukav/Hsed";
        description = "Stream Editor in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10314,7 +9926,6 @@ self: {
        libraryHaskellDepends = [
          base containers parsec pretty process smtLib transformers
        ];
-       homepage = "https://github.com/MfesGA/Hsmtlib";
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10331,7 +9942,6 @@ self: {
        libraryHaskellDepends = [
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
-       homepage = "https://github.com/sjoerdvisscher/HueAPI";
        description = "API for controlling Philips Hue lights";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10350,7 +9960,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base pretty text ];
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base tasty tasty-golden ];
-       homepage = "http://github.com/tobs169/HulkImport#readme";
        description = "Easily bulk import CSV data to SQL Server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10389,7 +9998,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/iqsf/Hydrogen.git";
        description = "The library for generating a WebGL scene for the web";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10418,7 +10026,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers random
        ];
-       homepage = "http://www.alpheccar.org";
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10439,7 +10046,6 @@ self: {
          base containers directory haskell98 HaXml polyparse pretty process
          wx wxcore
        ];
-       homepage = "http://haskell.di.uminho.pt/jmvilaca/INblobs/";
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10470,7 +10076,6 @@ self: {
        testHaskellDepends = [
          base bits-atomic ghc-prim HUnit QuickCheck time
        ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10501,7 +10106,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
        ];
-       homepage = "https://github.com/MichelBoucey/IPv6Addr";
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10530,7 +10134,6 @@ self: {
        testHaskellDepends = [
          aeson base hspec http-client http-types vector
        ];
-       homepage = "http://ipv6db.cybervisible.com";
        description = "A RESTful Web Service for IPv6-related data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10543,7 +10146,6 @@ self: {
        version = "0.1.2";
        sha256 = "0ryb2q5xfddcx2qg019jajac7xvaw2ci5wi094gbrqhhflj7wc8n";
        libraryHaskellDepends = [ array base GlomeVec ];
-       homepage = "http://www.haskell.org/haskellwiki/IcoGrid";
        description = "Library for generating grids of hexagons and pentagons mapped to a sphere";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10578,7 +10180,6 @@ self: {
        version = "2.0.0.1";
        sha256 = "06px87hc6gz7n372lvpbq0g2v2s0aghd3k5a1ajgn5hbxirhnpwb";
        libraryHaskellDepends = [ base mtl template-haskell ];
-       homepage = "https://github.com/mmirman/ImperativeHaskell";
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10591,7 +10192,6 @@ self: {
        version = "0.2.1";
        sha256 = "0l9k8md2n0vhjqlvxcaf43i4cv09lnbbbw8vfz7bkbzhbwirs32j";
        libraryHaskellDepends = [ base parsec ];
-       homepage = "http://www.cse.iitk.ac.in/~ppk";
        description = "Combinators for parsing indentation based syntatic structures";
        license = "GPL";
      }) {};
@@ -10603,7 +10203,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1i7gv3iqjj4j026k0ywmksbpjyqxlgb0f6bq2v0p9pkrj5q3jxfm";
        libraryHaskellDepends = [ base PeanoWitnesses ];
-       homepage = "https://github.com/kwf/IndexedList";
        description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10659,7 +10258,6 @@ self: {
          base containers criterion deepseq fingertree random SegmentTree
          weigh
        ];
-       homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Containers for intervals, with efficient search";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10678,7 +10276,6 @@ self: {
          base containers criterion deepseq fingertree random SegmentTree
          weigh
        ];
-       homepage = "http://www.chr-breitkopf.de/comp/IntervalMap";
        description = "Containers for intervals, with efficient search";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10696,7 +10293,6 @@ self: {
          base data-default mtl network transformers
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/yunxing/Irc";
        description = "DSL for IRC bots";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10729,7 +10325,6 @@ self: {
          quickcheck-instances system-filepath text unordered-containers
          vector
        ];
-       homepage = "https://github.com/jcristovao/IsNull";
        description = "A typeclass to determine if a given value is null";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10795,7 +10390,6 @@ self: {
          attoparsec base bytestring bytestring-nums bytestring-trie
          containers utf8-string
        ];
-       homepage = "http://github.com/solidsnack/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10828,7 +10422,6 @@ self: {
        version = "0.1";
        sha256 = "0ivqfk1rac1hv5j6nlsbpcm5yjqwpic34mdq9gf2m63lygqkbwqp";
        libraryHaskellDepends = [ base hosc ];
-       homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10872,7 +10465,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0zg7xh3apm7x3c9gz876k5cis5jpng1bzf6g9ywbmmndry6dn1c0";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/brunoczim/Json-Data-for-Haskell";
        description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10896,7 +10488,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl parsec pretty syb WebBits WebBits-Html
        ];
-       homepage = "http://www.cs.brown.edu/research/plt/";
        description = "Design-by-contract for JavaScript";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10919,7 +10510,6 @@ self: {
          aeson base HUnit language-typescript stack-prism test-framework
          test-framework-hunit text
        ];
-       homepage = "https://github.com/MedeaMelana/JsonGrammar2";
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10937,7 +10527,6 @@ self: {
        executableHaskellDepends = [
          aeson base bytestring json-autotype text
        ];
-       homepage = "http://github.com/mgajda/ipynb";
        description = "JuPyTer notebook parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10955,7 +10544,6 @@ self: {
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
        ];
-       homepage = "https://github.com/Twinside/Juicy.Pixels";
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10979,7 +10567,6 @@ self: {
          base bytestring directory filepath JuicyPixels optparse-simple
          text-show unordered-containers
        ];
-       homepage = "http://github.com/NCrashed/JuicyPixels-blp#readme";
        description = "BLP format decoder/encoder over JuicyPixels library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -10991,7 +10578,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0y791kwg9gc3nlz5sbpszd7wiqr5b5bwmgvafyjzk9xnlxlc7xcm";
        libraryHaskellDepends = [ base containers JuicyPixels ];
-       homepage = "http://eax.me/";
        description = "Functions for drawing lines, squares and so on pixel by pixel";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11009,7 +10595,6 @@ self: {
        libraryHaskellDepends = [ base JuicyPixels ];
        testHaskellDepends = [ base hspec JuicyPixels ];
        benchmarkHaskellDepends = [ base criterion JuicyPixels ];
-       homepage = "https://github.com/mrkkrp/JuicyPixels-extra";
        description = "Efficiently scale, crop, flip images with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11040,7 +10625,6 @@ self: {
        testHaskellDepends = [
          base base-compat carray fft JuicyPixels time
        ];
-       homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme";
        description = "Scale JuicyPixels images with DCT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11057,7 +10641,6 @@ self: {
          base data-default-class JuicyPixels vector
        ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/mtolly/JuicyPixels-stbir";
        description = "Scale JuicyPixels images with stb_image_resize";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11069,7 +10652,6 @@ self: {
        version = "0.2";
        sha256 = "1b2rx5g8kd83hl50carr02mz21gvkasnsddw1f3pfvfsyfv3yyrc";
        libraryHaskellDepends = [ base JuicyPixels vector ];
-       homepage = "https://github.com/fumieval/JuicyPixels-util";
        description = "Convert JuicyPixel images into RGBA format, flip, trim and so on";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11127,7 +10709,6 @@ self: {
        version = "2.1";
        sha256 = "16il25s1fb4b6ih6njsqxx7p7x0fc0kcwa5vqn7n7knqph6vvjaa";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/grantslatton/JustParse";
        description = "A simple and comprehensive Haskell parsing library";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -11140,7 +10721,6 @@ self: {
        sha256 = "14dpqfji00jq2rc09l8d1ivphpiwkryjk5sn6lrwxv8mcly3pvhn";
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base Cabal ];
-       homepage = "https://github.com/CindyLinz/Haskell-KMP";
        description = "Knuth–Morris–Pratt string searching algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11152,7 +10732,6 @@ self: {
        version = "0.1";
        sha256 = "19sjr9vavxnbv5yp2c01gy6iz1q2abllcsf378n15f3z064ffqn6";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/frosch03/kerbal";
        description = "A library with the kerbal space program universe and demo code";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11165,7 +10744,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1mzdaj6h21is3fwnckzq5zcxd4zqahsdppsx65bv5vdplsiadrw5";
        libraryHaskellDepends = [ base hmatrix ];
-       homepage = "https://github.com/idontgetoutmuch/Kalman";
        description = "A slightly extended Kalman filter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11179,7 +10757,6 @@ self: {
        sha256 = "056396l7rj2c8lxzm53vf9dq8jc5wqhb3lzhbxif1p6fapd6whcf";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/binarysunrise-io/kdtree";
        description = "KdTree, for efficient search in K-dimensional point clouds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11195,7 +10772,6 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring bytestring directory mime-types network text
        ];
-       homepage = "https://github.com/Hamcha/Ketchup";
        description = "A super small web framework for those who don't like big and fancy codebases";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11222,7 +10798,6 @@ self: {
          base containers curry-base curry-frontend directory filepath
          ghc-paths old-time process readline
        ];
-       homepage = "http://www.curry-language.org";
        description = "A compiler from Curry to Haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11245,7 +10820,6 @@ self: {
        executableHaskellDepends = [
          base curry-base directory haskell-src KiCS KiCS-prophecy
        ];
-       homepage = "http://curry-language.org";
        description = "debug features for kics";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11262,7 +10836,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath KiCS ];
        executableHaskellDepends = [ base KiCS ];
-       homepage = "http://curry-language.org";
        description = "a transformation used by the kics debugger";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11286,7 +10859,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "113jxbaw8b17j91aakxli3r3zdvnx3gvf2m57sx5d7mfk2qx28r6";
        libraryHaskellDepends = [ base containers parsec ];
-       homepage = "http://www.gkayaalp.com/p/konf.html";
        description = "A configuration language and a parser";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11299,7 +10871,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1b6r4860qnnszs4giaidd8z1xch8vvq8qdyb9linrdhxpf5ad3sw";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/matteoprovenzano/kriens-hs.git";
        description = "Category for Continuation Passing Style";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11315,7 +10886,6 @@ self: {
        sha256 = "1l7cpppjfz5nd8k67ss959g8sg5kbsfl4zy80a3yrlwbivyrg58n";
        libraryHaskellDepends = [ base bytestring extensible-exceptions ];
        librarySystemDepends = [ kyotocabinet ];
-       homepage = "https://code.google.com/p/kyotocabinet-hs/";
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11334,7 +10904,6 @@ self: {
        libraryHaskellDepends = [
          base cairo containers gtk mtl old-time parsec random
        ];
-       homepage = "http://www.entropia.de/wiki/L-seed";
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11352,7 +10921,6 @@ self: {
          base constraint-classes hmatrix semigroups vector
        ];
        librarySystemDepends = [ openblasCompat ];
-       homepage = "http://github.com/guaraqe/lats#readme";
        description = "Linear Algebra on Typed Spaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11370,7 +10938,6 @@ self: {
        librarySystemDepends = [ openldap ];
        testHaskellDepends = [ base HUnit ];
        testSystemDepends = [ openldap ];
-       homepage = "https://github.com/ezyang/ldap-haskell";
        description = "Haskell binding for C LDAP API";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openldap;};
@@ -11383,7 +10950,6 @@ self: {
        sha256 = "0cgmbn6c7fgk6dngx7j1l56sizi37shs5mrdkiqy2k4imb7bc4hl";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/MarcusVoelker/LParse#readme";
        description = "A continuation-based parser library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -11395,7 +10961,6 @@ self: {
        version = "0.1.1";
        sha256 = "0yppxz78y5myh9f53yqz6naqj15vk2h7fl3h8h8dps72zw9c5aqn";
        libraryHaskellDepends = [ base containers QuickCheck ];
-       homepage = "http://www.imperialviolet.org/lru";
        description = "Implements an LRU data structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11439,7 +11004,6 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/ailrun/LambdaDB/blob/master/README.md";
        description = "On-memory Database using Lambda Function environment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11457,7 +11021,6 @@ self: {
          aeson base bytestring bytestring-trie containers hosc lens
          lens-aeson matrix text transformers vector
        ];
-       homepage = "https://github.com/ulyssesp/LambdaDesigner#readme";
        description = "A type-safe EDSL for TouchDesigner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11498,7 +11061,6 @@ self: {
          template-haskell text time transformers unordered-containers vector
          vector-binary-instances zlib
        ];
-       homepage = "https://lambdahack.github.io";
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11518,7 +11080,6 @@ self: {
          base containers GLFW GLFW-task monad-task mtl OpenGL transformers
          vector
        ];
-       homepage = "not available";
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11560,7 +11121,6 @@ self: {
          QuickCheck syb template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-instances transformers tuple uniplate
        ];
-       homepage = "http://github.com/jfischoff/LambdaPrettyQuote";
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11579,7 +11139,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl parsec Shellac Shellac-compatline
        ];
-       homepage = "http://rwd.rdockins.name/lambda/home/";
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
      }) {};
@@ -11592,7 +11151,6 @@ self: {
        sha256 = "0va3scw7s24wsxkbybwahy7g32sdx3a2pipx0pa6bz6haz4c0b35";
        libraryHaskellDepends = [ base filepath hspec mtl process text ];
        testHaskellDepends = [ base filepath hspec mtl process text ];
-       homepage = "http://venugangireddy.github.io/Lambdajudge/";
        description = "A library to easily host Haskell based programming competitions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11639,7 +11197,6 @@ self: {
          base bytestring containers directory filemanip filepath process
          pureMD5 SHA zip-archive
        ];
-       homepage = "http://code.google.com/p/lastik";
        description = "A library for compiling programs in a variety of languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11690,7 +11247,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath unix ];
-       homepage = "https://github.com/AtticHacker/lazyvault";
        description = "A simple sandboxing tool for Haskell packages";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11707,7 +11263,6 @@ self: {
        libraryHaskellDepends = [ base containers hmatrix vector ];
        executableHaskellDepends = [ base containers hmatrix vector ];
        testHaskellDepends = [ base containers hmatrix vector ];
-       homepage = "https://github.com/masterdezign/Learning#readme";
        description = "The most frequently used machine learning tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11721,7 +11276,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory random SDL SDL-ttf ];
-       homepage = "http://quasimal.com/projects/level_0.html";
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11743,7 +11297,6 @@ self: {
        librarySystemDepends = [ clang ];
        libraryPkgconfigDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/chetant/LibClang";
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11764,7 +11317,6 @@ self: {
          base bindings-libzip bytestring directory filepath HUnit mtl time
          utf8-string
        ];
-       homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Bindings to libzip, a library for manipulating zip archives";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11792,7 +11344,6 @@ self: {
        libraryHaskellDepends = [
          array base cmdargs haskell98 QuickCheck
        ];
-       homepage = "http://github.com/rukav/LinearSplit";
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11821,7 +11372,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring containers criterion deepseq text
        ];
-       homepage = "https://github.com/choener/LinguisticsTypes";
        description = "Collection of types for natural language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11839,7 +11389,6 @@ self: {
        executableHaskellDepends = [
          base containers haskell98 HTTP mtl network tagsoup
        ];
-       homepage = "http://janzzstimmpfle.de/~jens/software/LinkChecker/";
        description = "Check a bunch of local html files for broken links";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -11852,7 +11401,6 @@ self: {
        version = "0.6.2";
        sha256 = "0y5qk6pzpcha01pa9133qgmmk9nkgjqxaxlg04993i9g43hjpff4";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/yairchu/generator";
        description = "List monad transformer and class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11874,7 +11422,6 @@ self: {
          array base bytestring containers dlist fmlist HUnit QuickCheck
          random semigroups text utf8-string vector
        ];
-       homepage = "http://github.com/JohnLato/listlike";
        description = "Generic support for list-like structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11905,7 +11452,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath List transformers
        ];
-       homepage = "http://github.com/yairchu/generator/tree";
        description = "Trees and monadic trees expressed as monadic lists where the underlying monad is a list";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11918,7 +11464,6 @@ self: {
        sha256 = "1hq0ymraa8fpj81n5v0znc1r98zd46rg4mgarg7zaiwvlv88mk28";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/YLiLarry/ListWriter";
        description = "define a list constant using Monadic syntax other than overhead [,]";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -11941,7 +11486,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0jplyy09i2rr5l8qzkyd41wwi7yj3sxlrz8f36ygdwxnwqfk2w01";
        libraryHaskellDepends = [ base ];
-       homepage = "http://gogotanaka.me/";
        description = "Logic";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12075,7 +11619,6 @@ self: {
          mtl network old-time parsec pureMD5 random syb template-haskell
          utf8-string
        ];
-       homepage = "http:/lslplus.sourceforge.net/";
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12097,7 +11640,6 @@ self: {
          directory filepath haskell-src HsOpenSSL hxt mtl network stm time
          time-http unix zlib
        ];
-       homepage = "http://cielonegro.org/Lucu.html";
        description = "HTTP Daemonic Library";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12127,7 +11669,6 @@ self: {
          regex-compat regex-posix safe split template-haskell text time
          transformers
        ];
-       homepage = "http://johannesgerer.com/buchhaltung";
        description = "A static website and blog generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12171,7 +11712,6 @@ self: {
          base Biobase PrimitiveArray tuple vector
        ];
        executableHaskellDepends = [ cmdargs split ];
-       homepage = "http://www.tbi.univie.ac.at/software/mcfolddp/";
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12209,7 +11749,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "0nlj914ahipyfqv1l7qr66pa0a8g4g6ks6mipc38z5f1jy0kjrva";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/DanBurton/MHask#readme";
        description = "The category of monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12222,7 +11761,6 @@ self: {
        version = "0.0.1";
        sha256 = "04yvf4a07cy47qzl9p8x45qbk2i6yapfps7hx85p589338s8b72y";
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
-       homepage = "https://github.com/Julek";
        description = "Michael-Scott queue";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12267,7 +11805,6 @@ self: {
          monad-par mtl mueval network network-uri pretty process random syb
          template-haskell tf-random time transformers unix
        ];
-       homepage = "http://nautilus.cs.miyazaki-u.ac.jp/~skata/MagicHaskeller.html";
        description = "Automatic inductive functional programmer by systematic search";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12287,7 +11824,6 @@ self: {
          directory filepath http-conduit http-types lens safe text time
          transformers vector
        ];
-       homepage = "https://github.com/Dananji/MailchimpSimple";
        description = "Haskell library to interact with Mailchimp JSON API Version 3.0";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12320,7 +11856,6 @@ self: {
        version = "2.0.0.0";
        sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/zaoqi/Mapping.hs";
        description = "Mapping";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12415,7 +11950,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "1qqdvrhqm187gi9dj78z9ijcrrk6wv0a9cx060aa0278nayr4b2w";
        libraryHaskellDepends = [ base machines ];
-       homepage = "http://github.com/cartazio/mecha";
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12428,7 +11962,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "00vmxrydynn8kjqn48q6kmd802m4q4y1n7cqq33vsi482ijrjak1";
        libraryHaskellDepends = [ base machines ];
-       homepage = "http://github.com/cartazio/mecha";
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12443,7 +11976,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base newtype-generics ];
-       homepage = "https://github.com/conal/MemoTrie";
        description = "Trie-based memo functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12482,7 +12014,6 @@ self: {
        version = "0.1.2";
        sha256 = "1ks5h3vlla2d86wvf2a4z1qifsinya2skq8ygdk45ynnwk735y4x";
        libraryHaskellDepends = [ base hstats ];
-       homepage = "http://github.com/benhamner/Metrics/";
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12558,7 +12089,6 @@ self: {
          array base containers haskell-src-exts mtl pretty
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://www.tcs.ifi.lmu.de/~abel/miniagda/";
        description = "A toy dependently typed programming language with type-based termination";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12583,7 +12113,6 @@ self: {
          hslogger HUnit mtl network old-locale old-time parsec process
          QuickCheck random regex-compat testpack time unix
        ];
-       homepage = "http://software.complete.org/missingh";
        description = "Large utility library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12595,7 +12124,6 @@ self: {
        version = "0.0.1";
        sha256 = "1x8ygk64v1crj92zwdv2jh7rw5n53k0wx0bkjmkjn2x1vklsdinz";
        libraryHaskellDepends = [ base glib template-haskell ];
-       homepage = "http://www.keera.co.uk/blog/";
        description = "Useful types and definitions missing from other libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12624,7 +12152,6 @@ self: {
        version = "0.10.6";
        sha256 = "0390ap25qj6a37jllsih39q5apgvwdjdw5m7jgfrllkp5bng6yj6";
        libraryHaskellDepends = [ anydbm base MissingH ];
-       homepage = "http://github.com/softmechanics/missingpy";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12689,7 +12216,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
        ];
-       homepage = "https://github.com/audreyt/MoeDict.hs";
        description = "Utilities working with MoeDict.tw JSON dataset";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12706,7 +12232,6 @@ self: {
        libraryHaskellDepends = [
          base extensible-exceptions MonadCatchIO-transformers
        ];
-       homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl";
        description = "Monad-transformer version of the Control.Exception module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12769,7 +12294,6 @@ self: {
          base data-default ghc-prim kan-extensions mmorph monad-products mtl
          parallel random transformers transformers-compat
        ];
-       homepage = "http://alkalisoftware.net";
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12787,7 +12311,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base parsec template-haskell ];
        executableHaskellDepends = [ base haskell98 process ];
-       homepage = "http://monadgarden.cs.missouri.edu/MonadLab";
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12855,7 +12378,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0fsnc17dxmv3qnmz54gw3wy2camgp23ip9jfi543xqks0l8n7gcz";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/bhurt/MonadStack";
        description = "Generalizing lift to monad stacks";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12871,7 +12393,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base directory GLUT OpenGL ];
-       homepage = "http://www.geocities.jp/takascience/haskell/monadius_en.html";
        description = "2-D arcade scroller";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12891,7 +12412,6 @@ self: {
        executableHaskellDepends = [
          array base containers directory free free-game mtl
        ];
-       homepage = "https://github.com/fumieval/Monaris/";
        description = "A simple tetris clone";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12916,7 +12436,6 @@ self: {
        version = "1.0";
        sha256 = "0svdyfzv4xlwjnc61wwik8a60a5667lhsys49sgry65a1v2csnv0";
        libraryHaskellDepends = [ base Monatron transformers ];
-       homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO";
        description = "MonadIO instances for the Monatron transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12961,7 +12480,6 @@ self: {
          base directory hashable haskell-src-exts hint hspec mtl random syb
          temporary time
        ];
-       homepage = "https://bitbucket.com/osu-testing/mucheck";
        description = "Automated Mutation Testing";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12977,7 +12495,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base HUnit MuCheck ];
        executableHaskellDepends = [ base HUnit MuCheck ];
-       homepage = "https://bitbucket.com/osu-testing/mucheck-hunit";
        description = "Automated Mutation Testing for HUnit tests";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -12993,7 +12510,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hspec hspec-core MuCheck ];
        executableHaskellDepends = [ base hspec hspec-core MuCheck ];
-       homepage = "https://bitbucket.com/osu-testing/mucheck-hspec";
        description = "Automated Mutation Testing for Hspec tests";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13009,7 +12525,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base MuCheck QuickCheck ];
        executableHaskellDepends = [ base MuCheck QuickCheck ];
-       homepage = "https://bitbucket.com/osu-testing/mucheck-quickcheck";
        description = "Automated Mutation Testing for QuickCheck tests";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13025,7 +12540,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base MuCheck smallcheck ];
        executableHaskellDepends = [ base MuCheck smallcheck ];
-       homepage = "https://bitbucket.com/osu-testing/mucheck-smallcheck";
        description = "Automated Mutation Testing for SmallCheck tests";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13069,7 +12583,6 @@ self: {
          http-types monad-control resourcet text time time-locale-compat
          transformers unliftio-core vector xml-conduit xml-types
        ];
-       homepage = "http://floss.scru.org/hMusicBrainz";
        description = "interface to MusicBrainz XML2 and JSON web services";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -13081,7 +12594,6 @@ self: {
        version = "0.5.0.0";
        sha256 = "15fwpbh8yxv41k73j9q4v5d5c5rh3q2xfp7pc7b5mc3rxipw4pa5";
        libraryHaskellDepends = [ base containers vector ];
-       homepage = "https://github.com/atwupack/MusicBrainz-libdiscid";
        description = "Binding to libdiscid by MusicBrainz";
        license = "LGPL";
      }) {};
@@ -13118,7 +12630,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
-       homepage = "https://github.com/choener/MutationOrder";
        description = "Most likely order of mutation events in RNA";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13135,7 +12646,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        benchmarkHaskellDepends = [ base time ];
-       homepage = "http://afonso.xyz";
        description = "Generate all primes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13203,7 +12713,6 @@ self: {
          base bytestring filepath HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
-       homepage = "http://mitar.tnode.com";
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13223,7 +12732,6 @@ self: {
          attoparsec base hashable mtl resourcet stm text
          unordered-containers
        ];
-       homepage = "https://github.com/agrafix/legoDSL";
        description = "Generate NXC Code from DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13236,7 +12744,6 @@ self: {
        version = "0.0.1";
        sha256 = "1zzc944xdfxlqld6fnn6fiqrd9rs2cdzqv5jc8jx7azbvspq6y9f";
        libraryHaskellDepends = [ base containers random ];
-       homepage = "http://github.com/pommicket/name-generator-haskell";
        description = "A name generator written in Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13264,7 +12771,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0h8kijw9y0p7bpy6qr1334xzbkcici3jrnk16w0cm4mxykrqjhwc";
        libraryHaskellDepends = [ base containers ghc-prim vector ];
-       homepage = "https://github.com/idontgetoutmuch/Naperian";
        description = "Naperian Functors for APL-like programming";
        license = "unknown";
      }) {};
@@ -13291,7 +12797,6 @@ self: {
          base containers criterion deepseq hashtables LinguisticsTypes
          mwc-random random unordered-containers vector
        ];
-       homepage = "https://github.com/choener/NaturalLanguageAlphabets";
        description = "Simple scoring schemes for word alignments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13305,7 +12810,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring strict ];
-       homepage = "http://github.com/joachifm/natsort";
        description = "Natural sorting for strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13358,7 +12862,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "1kmv20haxkqn1cwy9g59nmjpn5x1rng2rrd8y3gwxfdwn8blc735";
        libraryHaskellDepends = [ base comonad distributive ];
-       homepage = "https://github.com/kwf/NestedFunctor";
        description = "Nested composition of functors with a type index tracking nesting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13371,7 +12874,6 @@ self: {
        version = "0.1.4";
        sha256 = "1sdlnjnlbk5b04zyhr7574g2ghcivzvkxnm2aak4h9bik00gb1lv";
        libraryHaskellDepends = [ base random vector ];
-       homepage = "https://github.com/ijt/haskell_nested_sampling";
        description = "A port of John Skilling's nested sampling C code to Haskell";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -13385,7 +12887,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ net_snmp ];
        testHaskellDepends = [ base bytestring HUnit process ];
-       homepage = "https://github.com/ptek/netsnmp";
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13431,7 +12932,6 @@ self: {
        version = "0.0.2.1";
        sha256 = "1k6qdp4zmqjl2f6cqy1zzzl6ncb2m9r0qgh4c24i2h5kkxmm3cab";
        libraryHaskellDepends = [ base binary ];
-       homepage = "http://9ph.googlecode.com";
        description = "9P2000 in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13451,7 +12951,6 @@ self: {
          base binary bytestring containers filepath gloss network
          networked-game random
        ];
-       homepage = "http://github.com/glguy/ninjas";
        description = "Ninja game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13464,7 +12963,6 @@ self: {
        version = "0.1.1";
        sha256 = "0g9vqkpcmn66922z2yqp29h4kp2n2xnz1rva294h0kh39hiklrlv";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/pepeiborra/NoHoed";
        description = "Placeholder package to preserve debug ability via conditional builds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13484,7 +12982,6 @@ self: {
          array base containers criterion dph-base dph-prim-seq statistics
          storablevector template-haskell uvector vector
        ];
-       homepage = "http://code.haskell.org/NoSlow";
        description = "Microbenchmarks for various array libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13498,7 +12995,6 @@ self: {
        sha256 = "0nqjjhfycvalva0l660cxgqj793kcsyb75rd3dlp58d2i947isir";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/CindyLinz/Haskell-NoTrace";
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -13529,7 +13025,6 @@ self: {
          base directory exceptions filepath hint-server mtl network
          Nomyx-Core Nomyx-Language Nomyx-Web safe stm time
        ];
-       homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13557,7 +13052,6 @@ self: {
          Nomyx-Language old-locale random safe safecopy stm tar
          template-haskell temporary text time unix
        ];
-       homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13578,7 +13072,6 @@ self: {
          DebugTraceHelpers ghc mtl old-locale random safe time
          time-recurrence
        ];
-       homepage = "http://www.nomyx.net";
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13622,7 +13115,6 @@ self: {
          reform-happstack safe split stm text time web-routes
          web-routes-happstack web-routes-regular web-routes-th
        ];
-       homepage = "http://www.nomyx.net";
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13651,7 +13143,6 @@ self: {
          base category-extras QuickCheck Semigroup test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://code.google.com/p/nonempty/";
        description = "A list with a length of at least one";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13664,7 +13155,6 @@ self: {
        version = "1.4";
        sha256 = "0ycnwn09izajv330l7a31mc0alifqmxjsn9qmfswwnbg6i4jmnyb";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/conal/NumInstances";
        description = "Instances of numeric classes for functions and tuples";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13687,7 +13177,6 @@ self: {
        version = "0.1.2";
        sha256 = "1w8y46ivli37rlhkdrnw13qv6f0m13a88w0qkfw949b09vdp2nw2";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://patch-tag.com/r/lpsmith/NumberSieves";
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13713,7 +13202,6 @@ self: {
        version = "0.2.1";
        sha256 = "1z1v396lar6b0lyis3k5gn5kn17ndggm8j7qxnhirlpgm831fgg7";
        libraryHaskellDepends = [ base random ];
-       homepage = "http://page.mi.fu-berlin.de/aneumann/numbers/index.html";
        description = "An assortment of number theoretic functions";
        license = "LGPL";
      }) {};
@@ -13731,7 +13219,6 @@ self: {
        libraryHaskellDepends = [
          ADPfusion base ghc-prim mtl primitive PrimitiveArray vector
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
        description = "Nussinov78 using the ADPfusion library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13744,7 +13231,6 @@ self: {
        version = "0.1";
        sha256 = "1m7qx5zydz5jpk6a55k7rzchlwmkd91gsiqmn26qqn50ab3di35j";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/frosch03/Nutri";
        description = "A little library to calculate nutrition values of food items";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13757,7 +13243,6 @@ self: {
        version = "0.0.3";
        sha256 = "1w8lpi2r315b4ry234gi4rq09j92zvhr9ibxwsig6544cbb5g8qm";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://haskell.org/haskellwiki/OGL";
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13798,7 +13283,6 @@ self: {
        libraryHaskellDepends = [
          base comonad-transformers containers data-lens hxt newtype
        ];
-       homepage = "https://github.com/tonymorris/geo-osm";
        description = "Parse OpenStreetMap files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13812,7 +13296,6 @@ self: {
        sha256 = "0vcxyfk1vx30cfngq5cv3lc34x0sxsirykhbi4ygw5pvd9ylzadb";
        libraryHaskellDepends = [ base Crypto time ];
        testHaskellDepends = [ base Crypto time ];
-       homepage = "https://github.com/matshch/OTP";
        description = "HMAC-Based and Time-Based One-Time Passwords";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -13824,7 +13307,6 @@ self: {
        version = "1.0";
        sha256 = "05lrqq4008vnfs2x8kxlyrgdvxmzk04rqvn0w65b691bp3vwnbf9";
        libraryHaskellDepends = [ base containers ghc template-haskell ];
-       homepage = "https://github.com/yokto/object";
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13855,7 +13337,6 @@ self: {
        version = "1.1.0.1";
        sha256 = "046jm94rmm46cicd31pl54vdvfjvhd9ffbfycy2lxzc0fliyznvj";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/svenpanne/ObjectName";
        description = "Explicitly handled object names";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13873,7 +13354,6 @@ self: {
          base containers cuda language-c-quote mainland-pretty mtl
          mwc-random process rdtsc text value-supply vector
        ];
-       homepage = "https://github.com/svenssonjoel/Obsidian";
        description = "Embedded language for GPU Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13892,7 +13372,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq ghc-prim lens linear QuickCheck
        ];
-       homepage = "https://github.com/mgajda/octree";
        description = "Simple unbalanced Octree for storing data about 3D points";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -13906,7 +13385,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://www.gekkou.co.uk/";
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13998,7 +13476,6 @@ self: {
          array base binary bytestring containers directory hashable
          hashtables mtl process regex-compat
        ];
-       homepage = "https://github.com/audreyt/openafp/";
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -14038,7 +13515,6 @@ self: {
          base ObjectName OpenGL StateVar transformers
        ];
        librarySystemDepends = [ openal ];
-       homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openal;};
@@ -14053,7 +13529,6 @@ self: {
        librarySystemDepends = [ OpenCL ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/IFCA/opencl";
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14066,7 +13541,6 @@ self: {
        version = "1.0.1001";
        sha256 = "1a9nlrmxp3jwc3hbj79xm35aypfby04qy01fk4vyrp19diiinl07";
        libraryHaskellDepends = [ base bytestring mtl ];
-       homepage = "http://vis.renci.org/jeff/opencl";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14079,7 +13553,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0xlm26jksp4jf1dhkpg4708r1ak5mjdc5x5fjp4fhizmzlk3348s";
        libraryHaskellDepends = [ base bytestring mtl ];
-       homepage = "https://github.com/jkarlson/OpenCLWrappers";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14097,7 +13570,6 @@ self: {
          base bytestring containers GLURaw ObjectName OpenGLRaw StateVar
          text transformers
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14128,7 +13600,6 @@ self: {
          base bytestring containers fixed half text transformers
        ];
        librarySystemDepends = [ libGL ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
@@ -14145,7 +13616,6 @@ self: {
          base bytestring containers fixed half text transformers
        ];
        librarySystemDepends = [ libGL ];
-       homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14178,7 +13648,6 @@ self: {
          base Cabal colour containers deepseq filepath HUnit semigroups
          tasty tasty-hunit testpack
        ];
-       homepage = "https://chiselapp.com/user/mwm/repository/OpenSCAD/";
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14191,7 +13660,6 @@ self: {
        version = "0.7.0";
        sha256 = "0ad96lbwcwl7vvk5vx1mmb0wj28c541jwd9nsm7l5na9qdxfhzvj";
        libraryHaskellDepends = [ base GLUT OpenGL OpenGLRaw OpenVGRaw ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14204,7 +13672,6 @@ self: {
        version = "0.4.0";
        sha256 = "1fdg5b8f2x36x6gmdkazkmhqgknagd0kzr70hydygsmqbf2im5x2";
        libraryHaskellDepends = [ base OpenGLRaw ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14217,7 +13684,6 @@ self: {
        version = "1.0";
        sha256 = "1b880lrzdxww3j19zspnj49ifsn89n0ac1h5xf7nn83847k8q2qk";
        libraryHaskellDepends = [ array base containers mtl ];
-       homepage = "http://math.stanford.edu/~mik/operads";
        description = "Groebner basis computation for Operads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14266,7 +13732,6 @@ self: {
          aeson base bytestring HTTP http-conduit http-types lifted-base
          random
        ];
-       homepage = "https://github.com/dwd31415/Haskell-OrchestrateDB";
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14287,7 +13752,6 @@ self: {
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
-       homepage = "https://github.com/choener/OrderedBits";
        description = "Efficient ordered (by popcount) enumeration of bits";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14299,7 +13763,6 @@ self: {
        version = "0.0.0.2";
        sha256 = "04xk74rl2d6vp1kn197hsbkkwdvwvqpjqg3kgkpkl2i0r90y8lsi";
        libraryHaskellDepends = [ base ];
-       homepage = "http://patch-tag.com/r/kyagrd/Ordinals/";
        description = "Ordinal arithmetic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14315,7 +13778,6 @@ self: {
        libraryHaskellDepends = [ base safe threepenny-gui ];
        executableHaskellDepends = [ base safe threepenny-gui ];
        testHaskellDepends = [ base safe threepenny-gui ];
-       homepage = "https://github.com/MarisaKirisame/Ordinary#readme";
        description = "A Programming Language in Construction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14328,7 +13790,6 @@ self: {
        version = "0.1.1";
        sha256 = "08mkq72zv9ywp002vwjk7gl6pq6915zdd06sp4ap935aqdjrhn0p";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
-       homepage = "http://www.cs.helsinki.fi/u/ekarttun/PArrows/";
        description = "Arrow parser combinators similar to Parsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14356,7 +13817,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers mtl utf8-string
        ];
-       homepage = "http://github.com/Andrey-Sisoyev/PCLT";
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14374,7 +13834,6 @@ self: {
          base bytestring containers convertible HDBC HDBC-postgresql mtl
          PCLT
        ];
-       homepage = "http://github.com/Andrey-Sisoyev/PCLT-DB";
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14389,7 +13848,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
-       homepage = "http://www.github.com/rotskoff";
        description = "A library for analysis of 3-D protein coordinates";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -14432,7 +13890,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl network network-uri xml
        ];
-       homepage = "http://msakai.jp/hiki/?hsPTQ";
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
      }) {};
@@ -14544,7 +14001,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text
          typelevel-tensor vector
        ];
-       homepage = "http://www.paraiso-lang.org/wiki/index.php/Main_Page";
        description = "a code generator for partial differential equations solvers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14564,7 +14020,6 @@ self: {
        testHaskellDepends = [
          base hspec Parallel-Arrows-Definition split
        ];
-       homepage = "https://github.com/s4ke/Parrows#readme";
        description = "BaseSpecs used for @Parallel-Arrows-Definition@ and Co";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -14576,7 +14031,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "1zdsvg0nx2vnvgx9vcwq8l1kanfp056mmiscs3716lswkrvhdlbf";
        libraryHaskellDepends = [ base deepseq split ];
-       homepage = "https://github.com/s4ke/Parrows#readme";
        description = "Multithreaded evaluation using Arrows";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -14597,7 +14051,6 @@ self: {
          base deepseq edenmodules hspec parallel Parallel-Arrows-BaseSpec
          Parallel-Arrows-Definition QuickCheck split
        ];
-       homepage = "https://github.com/s4ke/Parrows#readme";
        description = "Eden based backend for @Parallel-Arrows-Definition@";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14618,7 +14071,6 @@ self: {
          base deepseq hspec parallel Parallel-Arrows-BaseSpec
          Parallel-Arrows-Definition split
        ];
-       homepage = "https://github.com/s4ke/Parrows#readme";
        description = "GpH based backend for @Parallel-Arrows-Definition@ in a multicore variant";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -14638,7 +14090,6 @@ self: {
          base deepseq hspec monad-par Parallel-Arrows-BaseSpec
          Parallel-Arrows-Definition split
        ];
-       homepage = "https://github.com/s4ke/Parrows#readme";
        description = "Par Monad (@monad-par@) based backend for @Parallel-Arrows-Definition@";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -14656,7 +14107,6 @@ self: {
          base binary bytestring containers directory ghc-prim network
          old-locale process random RSA SafeSemaphore time unix
        ];
-       homepage = "http://parry.lif.univ-mrs.fr";
        description = "A proven synchronization server for high performance computing";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14691,7 +14141,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "04c01bcfrb79av2j9bivlwanmycasn7gjnc9gb5jm6gkwyvgv0h3";
        libraryHaskellDepends = [ base containers syb template-haskell ];
-       homepage = "http://code.haskell.org/~aavogt/PartialTypeSignatures";
        description = "emulate partial type signatures with template haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14703,7 +14152,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "12lxylmpi2f1ahy6w1n7jmwn9kay4hajgr95xbnqqdzv4dw6whzw";
        libraryHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/VictorDenisov/PasswordGenerator";
        description = "Simple library for generating passwords";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14719,7 +14167,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base cmdargs HTTP network network-uri ];
        executableHaskellDepends = [ base cmdargs ];
-       homepage = "http://github.com/Fuuzetsu/pastepipe";
        description = "CLI for pasting to lpaste.net";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -14736,7 +14183,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/pjrt/PathTree#readme";
        description = "A tree used to merge and maintain paths";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14802,7 +14248,6 @@ self: {
        version = "0.2";
        sha256 = "0lmmsvqbnw0k321254xfqlzmddvymy0mj50ax7caqj2fnarfgy4l";
        libraryHaskellDepends = [ base ReplicateEffects ];
-       homepage = "https://github.com/MedeaMelana/PermuteEffects";
        description = "Permutations of effectful computations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14814,8 +14259,8 @@ self: {
      }:
      mkDerivation {
        pname = "Persistence";
-       version = "1.0";
-       sha256 = "12n0d5r03cp88svw0mfhimsr4a585qsq90cpszmcr3l5gsai3h9d";
+       version = "1.1";
+       sha256 = "1jyq159w7lpdgk0i6biqifdqf93jqla790lyix3qx7717r98kkav";
        libraryHaskellDepends = [
          base containers maximal-cliques parallel vector
        ];
@@ -14843,7 +14288,6 @@ self: {
          old-locale process regex-base regex-pcre safecopy
          string-conversions temporary text time
        ];
-       homepage = "localhost:9119";
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14856,7 +14300,6 @@ self: {
        version = "2.1.2";
        sha256 = "1453rjp5whl9vywiq8i86vjfa8ys1ppwabhvlibqwsbx804q9yhr";
        libraryHaskellDepends = [ base filepath process unix ];
-       homepage = "http://iki.fi/matti.niemenmaa/pipe/";
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14869,7 +14312,6 @@ self: {
        version = "0.2";
        sha256 = "07rzwkhz4b6nymygrhcz07dxl8fnvfrmfpcdj9qz3mwrcyf1kp9n";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/MedeaMelana/Piso";
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14889,7 +14331,6 @@ self: {
        executableHaskellDepends = [
          base containers directory mtl random regex-compat
        ];
-       homepage = "freizl.github.com";
        description = "Play Hangman Game";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -14947,7 +14388,6 @@ self: {
          array base directory filepath haskell98 old-locale old-time parsec
          process random
        ];
-       homepage = "LLayland.wordpress.com";
        description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -14987,7 +14427,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network splice ];
-       homepage = "http://fusion.corsis.eu";
        description = "high-performance distributed reverse / forward proxy & tunneling for TCP";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15001,7 +14440,6 @@ self: {
        sha256 = "1436a45y4zsip6yslvp9zxk5qxipcwcvzffvjyqj63dqsn9r57mq";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
-       homepage = "http://github.com/ninegua/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -15039,7 +14477,6 @@ self: {
          base containers QuickCheck smallcheck tasty tasty-quickcheck
          tasty-smallcheck tasty-th
        ];
-       homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15063,7 +14500,6 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
-       homepage = "https://github.com/choener/PrimitiveArray-Pretty";
        description = "Pretty-printing for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15114,7 +14550,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base old-time random ];
        executableHaskellDepends = [ base old-time random ];
-       homepage = "http://www.bucephalus.org/PropLogic";
        description = "Propositional Logic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15129,7 +14564,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers syb ];
        executableHaskellDepends = [ base containers HUnit parsec syb ];
-       homepage = "https://github.com/dillonhuff/Proper";
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15142,7 +14576,6 @@ self: {
        version = "0.0.1";
        sha256 = "0mx3kgkcbhppz2p6g8vb9yx27219ca2w7k36j60vfhszni1c4gid";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/exFalso/ProxN";
        description = "Proximity sets in N dimensions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15167,7 +14600,6 @@ self: {
          MetaObject mtl network parsec pretty process pugs-compat pugs-DrIFT
          random stm stringtable-atom text time utf8-string
        ];
-       homepage = "http://pugscode.org/";
        description = "A Perl 6 Implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15279,7 +14711,6 @@ self: {
        version = "1.3";
        sha256 = "19xbnqm90b1wsxbjhjm1q1mld0rv4p6ga1chzl4i00yccpwsh7g8";
        libraryHaskellDepends = [ base containers mtl old-time random ];
-       homepage = "https://github.com/alexandersgreen/qio-haskell";
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15292,7 +14723,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0vbkvc0d7j4awvdiqs0kgz3fa9m0991zlzhs3w7rxi8if2crkn47";
        libraryHaskellDepends = [ base random vector ];
-       homepage = "poincare.github.io/QLearn";
        description = "A library for fast, easy-to-use Q-learning";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15335,7 +14765,6 @@ self: {
          attoparsec base haskell-src-meta template-haskell text
          th-lift-instances
        ];
-       homepage = "https://github.com/mikeplus64/QuasiText";
        description = "A QuasiQuoter for Text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15355,7 +14784,6 @@ self: {
          lens mtl optparse-applicative process random template-haskell text
          time transformers tuple unix uuid z3 zeromq4-haskell
        ];
-       homepage = "http://gowthamk.github.io/Quelea";
        description = "Programming with Eventual Consistency over Cassandra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15371,7 +14799,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base haskell-src-exts ];
-       homepage = "http://code.haskell.org/QuickAnnotate/";
        description = "Annotation Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15386,7 +14813,6 @@ self: {
        revision = "2";
        editedCabalFile = "1nahg4xzlx3hnw60ybzljka3lag3n0iysgnyppahrsblmryg01lg";
        libraryHaskellDepends = [ base random ];
-       homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15405,7 +14831,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/nick8325/quickcheck";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15423,7 +14848,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/nick8325/quickcheck";
        description = "Automatic testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15436,7 +14860,6 @@ self: {
        version = "0.2.0";
        sha256 = "0vbc4zw9f03hm6mnlkiymp75yi9knar12zyyrchlr8792acwlcrd";
        libraryHaskellDepends = [ base mtl QuickCheck random ];
-       homepage = "https://github.com/nikita-volkov/QuickCheck-GenT";
        description = "A GenT monad transformer for QuickCheck library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -15460,7 +14883,6 @@ self: {
        sha256 = "0gxq90fh1bgy2vcpyzbdgnly7q88bbqx06dq44rmv3fwjs61rc82";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/sanjorgek/QuickCheckVariant";
        description = "Generator of \"valid\" and \"invalid\" data in a type class";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -15482,7 +14904,6 @@ self: {
          snap snap-core template-haskell text vector websockets
          websockets-snap
        ];
-       homepage = "http://github.com/tepf/QuickPlot#readme";
        description = "Quick and easy data visualization with Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15498,7 +14919,6 @@ self: {
        libraryHaskellDepends = [
          aeson attoparsec base bytestring either text
        ];
-       homepage = "https://github.com/ssadler/quickson";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15546,7 +14966,6 @@ self: {
        version = "0.0.5";
        sha256 = "0p46b105lixbxqjz8pwxf4asl4s7zdh2ss3nvgmp1rclqfg6cwrq";
        libraryHaskellDepends = [ base ];
-       homepage = "git://github.com/wuxb45/Haskell-RBTree.git";
        description = "Pure haskell Red-Black-Tree implemetation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15582,7 +15001,6 @@ self: {
          base binary bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
-       homepage = "https://github.com/xenog/RFC1751";
        description = "RFC-1751 library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -15642,7 +15060,6 @@ self: {
        executableHaskellDepends = [
          base BiobaseTurner BiobaseVienna BiobaseXNA cmdargs
        ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15709,7 +15126,6 @@ self: {
          QuasiText repa split text vector
        ];
        executableHaskellDepends = [ cmdargs ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15764,7 +15180,6 @@ self: {
          directory parallel PrimitiveArray random StatisticalMethods vector
        ];
        executableHaskellDepends = [ cmdargs split ];
-       homepage = "http://www.tbi.univie.ac.at/software/rnawolf/";
        description = "RNA folding with non-canonical basepairs and base-triplets";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15805,7 +15220,6 @@ self: {
          base containers extensible-exceptions GLUT mtl OpenGL random sdl2
          sdl2-image sdl2-mixer time
        ];
-       homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15826,7 +15240,6 @@ self: {
          test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "http://github.com/Manticore/haskell-random123";
        description = "Haskell port of Random123 library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -15852,7 +15265,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random-fu ];
-       homepage = "http://github.com/Soares/Randometer.hs";
        description = "Randomness intuition trainer";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -15876,7 +15288,6 @@ self: {
        version = "0.3.0";
        sha256 = "1am0lsd3yiyn7ayk9k4ff7zdj67m0pxjl10cxi5f9hgjj4y9380l";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "http://code.haskell.org/ranged-sets";
        description = "Ranged sets for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15893,7 +15304,6 @@ self: {
        executableHaskellDepends = [
          base HTTP json network utf8-string XMPP
        ];
-       homepage = "http://kagami.touhou.ru/projects/show/ranka";
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15915,7 +15325,6 @@ self: {
          array base bytestring cereal containers convertible directory
          filepath ghc GLUT monad-loops OpenGL OpenGLRaw time Yampa
        ];
-       homepage = "http://hub.darcs.net/martingw/Rasenschach";
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15949,7 +15358,6 @@ self: {
        libraryHaskellDepends = [ base system-filepath text ];
        executableHaskellDepends = [ base system-filepath text ];
        testHaskellDepends = [ base hspec system-filepath text ];
-       homepage = "http://github.com/rampion/ReadArgs";
        description = "Simple command line argument parsing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -15973,7 +15381,6 @@ self: {
          http-conduit http-types HUnit MissingH network resourcet text time
          transformers
        ];
-       homepage = "https://github.com/lookunder/RedmineHs";
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15986,7 +15393,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "15qikbjbydbabc26skhavshzrsaz17a71q8hfxqvi5ix2bhhz4hm";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16023,7 +15429,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs cond containers directory
        ];
-       homepage = "https://github.com/pablocouto/Referees";
        description = "A utility for computing distributions of material to review among reviewers";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16040,7 +15445,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl template-haskell transformers
        ];
-       homepage = "https://github.com/sweirich/replib";
        description = "Generic programming library with representation types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16053,7 +15457,6 @@ self: {
        version = "0.3";
        sha256 = "194nbnbrf5g3d2pch6z9zapzhi0i2z30vpgjj0h5x8bfwzpf1527";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/MedeaMelana/ReplicateEffects";
        description = "Composable replication schemes of applicative functors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16084,7 +15487,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "065plckw5r16aalkf51y7hs2xjandad3hgfly795wakqfhdnrajw";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/avieth/RichConditional";
        description = "Tiny library to replace classic if/else";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16109,7 +15511,6 @@ self: {
          utf8-string vector zlib
        ];
        testHaskellDepends = [ base directory doctest hspec lens vector ];
-       homepage = "http://code.haskell.org/~aavogt/Rlang-QQ";
        description = "quasiquoter for inline-R code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16147,7 +15548,6 @@ self: {
        version = "1000.9";
        sha256 = "1gixw6793i4bcf1fsawfqdgvib5q7b1972fi0prrcwq7cp7nrgwr";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/atzeus/RoyalMonad";
        description = "All hail the Royal Monad!";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16159,7 +15559,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "087p4smmbi56y962lchgs2a6q78jab58bl6c5sxir7973hplyly6";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/riottracker/RtMidi";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -16171,7 +15570,6 @@ self: {
        version = "0.2";
        sha256 = "0pwxsvkpdr4vzr6cpgjmkr55ip6ns3gcv8pma7dwzg21myx9c3vl";
        libraryHaskellDepends = [ base containers stm transformers ];
-       homepage = "https://github.com/jspahrsummers/RxHaskell";
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16207,7 +15605,6 @@ self: {
        testHaskellDepends = [
          base containers hspec QuickCheck scalendar text time
        ];
-       homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System";
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -16322,7 +15719,6 @@ self: {
          csfml-audio csfml-graphics csfml-network csfml-system csfml-window
          sfml-audio sfml-graphics sfml-network sfml-system sfml-window
        ];
-       homepage = "https://github.com/jeannekamikaze/SFML";
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16338,7 +15734,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "001h9y9395mz6fr58s1i8svn4pyy5iqbkzzsp19xdphh4w69za9g";
        libraryHaskellDepends = [ base mtl SFML template-haskell ];
-       homepage = "https://github.com/SFML-haskell/SFML-control";
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16351,7 +15746,6 @@ self: {
        version = "0.1.1";
        sha256 = "077yvys00kp8lmkvc4mbynmkk9nn2ib5rh38bqcw0wnwsvl7140i";
        libraryHaskellDepends = [ array base SDL Sprig ];
-       homepage = "http://liamoc.net/static/SFont";
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16455,7 +15849,6 @@ self: {
          base bindings-DSL containers data-default lens mtl transformers
        ];
        libraryToolDepends = [ c2hsc ];
-       homepage = "http://www.snet-home.org/";
        description = "Declarative coördination language for streaming networks";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16487,7 +15880,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc ghc-paths ];
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers ];
-       homepage = "https://github.com/AntonXue/SSTG#readme";
        description = "STG Symbolic Execution";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16500,7 +15892,6 @@ self: {
        version = "0.3.0.4";
        sha256 = "0nms0gbyjzgb6ldhqgzfbpn150dv0ig40df1fgkqmhl0mbg4r2r9";
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
-       homepage = "http://github.com/bergey/STL";
        description = "STL 3D geometry format parsing and pretty-printing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16591,7 +15982,6 @@ self: {
        executableHaskellDepends = [
          base haskell98 language-c pretty svgutils syb xml
        ];
-       homepage = "http://www.informatik.uni-kiel.de/~jgr/svg2q";
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16641,7 +16031,6 @@ self: {
          base binary bytestring data-binary-ieee754 pipes-binary
          pipes-bytestring pipes-parse split
        ];
-       homepage = "https://github.com/siddhanathan/SWMMoutGetMB";
        description = "A parser for SWMM 5 binary .OUT files";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16674,7 +16063,6 @@ self: {
        version = "0.1";
        sha256 = "0ybi5r4635yjx41ig54bm426fbdzrivc5kn8fwqxmzm62ai0v623";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www-users.cs.york.ac.uk/~ndm/projects/libraries.php";
        description = "Library for safe (pattern match free) functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16689,7 +16077,6 @@ self: {
        editedCabalFile = "1k61gqgfh6n3sj8ni8sfvpcm39nqc2msjfxk2pgmhfabvv48w5hv";
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/ChrisKuklewicz/SafeSemaphore";
        description = "Much safer replacement for QSemN, QSem, and SampleVar";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16702,7 +16089,6 @@ self: {
        sha256 = "0915mwi1ksa85in03vzm5hqbvk6ih7l0zslg5cmy7j9fc0jhgwgd";
        libraryHaskellDepends = [ base bytestring file-embed ];
        librarySystemDepends = [ glib mono ];
-       homepage = "http://haskell.org/haskellwiki/Salsa";
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16768,7 +16154,6 @@ self: {
          base bytestring directory filepath HFuse hsyslog process
          regex-compat sqlite-simple unix
        ];
-       homepage = "http://github.com/hirschenberger/ScratchFS";
        description = "Size limited temp filesystem based on fuse";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16788,7 +16173,6 @@ self: {
          base binary bytestring containers network network-bytestring parsec
          random stm time unix
        ];
-       homepage = "http://code.google.com/p/scurry/";
        description = "A cross platform P2P VPN application built using Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16858,7 +16242,6 @@ self: {
        version = "0.0.7";
        sha256 = "1mdw1z50gr02j5hycki5rl95b1yk7xfrdk056ajw9ghw48s0jpx6";
        libraryHaskellDepends = [ base bytestring containers mtl ];
-       homepage = "https://bitbucket.org/dibblego/semigroup/";
        description = "A semigroup";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16914,7 +16297,6 @@ self: {
        testHaskellDepends = [
          base containers directory json mtl parsec QuickCheck regex-tdfa
        ];
-       homepage = "https://www.shellcheck.net/";
        description = "Shell script analysis tool";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -16928,7 +16310,6 @@ self: {
        revision = "1";
        editedCabalFile = "1nq7j00vfrhfzkbsgr6j28zr339gx5bcvq6x9mvh9qvs2jmcdz1z";
        libraryHaskellDepends = [ base directory mtl unix ];
-       homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16942,7 +16323,6 @@ self: {
        revision = "1";
        editedCabalFile = "0ws8prjzj4j9yf1mqdnvlpv367cx4wfqa5jq5n6x7g9npwmd5ya0";
        libraryHaskellDepends = [ base Shellac Shellac-readline ];
-       homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -16956,7 +16336,6 @@ self: {
        revision = "1";
        editedCabalFile = "1wyal7nqnl5sj74d9mid2dw35d37b40v132cg3zhw9ys24k0jl6v";
        libraryHaskellDepends = [ base editline Shellac ];
-       homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -16982,7 +16361,6 @@ self: {
        revision = "1";
        editedCabalFile = "019p7q1nmi2v7rb1rjnch4zaz506c4ry28mkivhkqiq3ay1m86hs";
        libraryHaskellDepends = [ base readline Shellac ];
-       homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17003,7 +16381,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
-       homepage = "https://github.com/choener/ShortestPathProblems";
        description = "grammars for TSP and SHP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17016,7 +16393,6 @@ self: {
        version = "0.1.1";
        sha256 = "1nq4i4h43nfh86f6wgwng1ps6mcdl1ba96x9wsjl3qzn3blavyfh";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/conal/ShowF/";
        description = "Show for * -> *";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17041,7 +16417,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT ];
-       homepage = "http://www.geocities.jp/takascience/index_en.html";
        description = "A vector shooter game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17067,7 +16442,6 @@ self: {
        libraryHaskellDepends = [
          base mersenne-random-pure64 MonadRandom
        ];
-       homepage = "http://www.github.com/ehamberg/simpleea/";
        description = "Simple evolutionary algorithm framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17119,7 +16493,6 @@ self: {
          ForkableT monad-control mtl old-locale resourcet semigroups stm
          template-haskell text th-lift time transformers transformers-base
        ];
-       homepage = "https://github.com/exFalso/SimpleLog/";
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17175,7 +16548,6 @@ self: {
          array base containers data-lens-light mtl
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "https://github.com/andreasabel/Sit";
        description = "Prototypical type checker for Type Theory with Sized Natural Numbers";
        license = "unknown";
      }) {};
@@ -17231,7 +16603,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0wmdzl3anbbfqik2kl2wjy57cd9r3ix8h8g28rmzqbvlajrvqcv1";
        libraryHaskellDepends = [ base parsec transformers ];
-       homepage = "https://github.com/MfesGA/HsmtlibParser";
        description = "Library for parsing SMTLIB2";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17255,7 +16626,6 @@ self: {
        ];
        executableSystemDepends = [ zip ];
        executableToolDepends = [ cpphs ];
-       homepage = "http://bitbucket.org/jetxee/snusmumrik/";
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17273,7 +16643,6 @@ self: {
          base concurrent-supply containers monad-coroutine mtl stm
          transformers
        ];
-       homepage = "http://www.soos-project.eu/";
        description = "Abstract full system simulator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17294,7 +16663,6 @@ self: {
          base base-unicode-symbols binary derive directory mtl process
          random zlib
        ];
-       homepage = "http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html";
        description = "Football simulation framework for teaching functional programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17315,7 +16683,6 @@ self: {
          base base-unicode-symbols binary GLUT OpenGL process random
          SoccerFun
        ];
-       homepage = "http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html";
        description = "OpenGL UI for the SoccerFun framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17329,7 +16696,6 @@ self: {
        sha256 = "0fqaw4wh7ml35kl75qsvqsq17g5pndf7x6clcmqxpwayjn2syzda";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/Zigazou/Sonnex";
        description = "Sonnex is an alternative to Soundex for french language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17382,7 +16748,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base HGL random Yampa ];
-       homepage = "http://www.haskell.org/yampa/";
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17405,7 +16770,6 @@ self: {
          base containers enummapset-th filepath LambdaHack template-haskell
          text
        ];
-       homepage = "https://github.com/tuturto/space-privateers";
        description = "Simple space pirate roguelike";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17418,7 +16782,6 @@ self: {
        version = "0.0.1";
        sha256 = "1rf9r69a2k3qfmy2nvwm3gdimncjglsv698rdc8i8gnjwrr0c1i2";
        libraryHaskellDepends = [ base monad-loops ref-mtl stm ];
-       homepage = "https://github.com/Julek";
        description = "Lock free Spin Counter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17433,7 +16796,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base extra mtl mwc-random text
        ];
-       homepage = "https://github.com/MichelBoucey/spintax";
        description = "Random text generation based on spintax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17461,7 +16823,6 @@ self: {
          base bytestring hspec hspec-wai Spock-core stm text time
          unordered-containers vault wai wai-extra
        ];
-       homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17476,7 +16837,6 @@ self: {
        revision = "1";
        editedCabalFile = "0w0xah0lirgrs1xvlw5z6saa3wvzdl5r3yq3zxipg7kmrfxgbfbz";
        libraryHaskellDepends = [ aeson base deepseq hvect reroute ];
-       homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17493,7 +16853,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring ghcjs-base hvect Spock-api text
        ];
-       homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17506,7 +16865,6 @@ self: {
        version = "0.12.0.0";
        sha256 = "1kiin49jgdbw38cf4x89f00hpdxd2bq4plfasxqyqx9qh8344wr9";
        libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ];
-       homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17519,7 +16877,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1vcrl5dqjn0ri9ybza2yv80xvbv2iwrz5hj5rbhgy6i803ixlpx0";
        libraryHaskellDepends = [ base http-types Spock text time ];
-       homepage = "https://github.com/agrafix/Spock-auth";
        description = "Provides authentification helpers for Spock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17548,7 +16905,6 @@ self: {
          aeson base base64-bytestring bytestring hspec hspec-wai http-types
          reroute text time transformers unordered-containers wai
        ];
-       homepage = "https://www.spock.li";
        description = "Another Haskell web framework for rapid development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17566,7 +16922,6 @@ self: {
          base digestive-functors http-types mtl Spock-core text
          unordered-containers wai
        ];
-       homepage = "https://github.com/agrafix/Spock-digestive";
        description = "Digestive functors support for Spock";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17579,7 +16934,6 @@ self: {
        version = "0.4.0.1";
        sha256 = "15r3vk78vbhqi09liq0a3zabya845zfmblqahgw6r2jjx49da9ii";
        libraryHaskellDepends = [ base lucid Spock transformers ];
-       homepage = "http://github.com/aelve/Spock-lucid";
        description = "Lucid support for Spock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17598,7 +16952,6 @@ self: {
          transformers vector
        ];
        testHaskellDepends = [ base containers HTF stm vector ];
-       homepage = "http://github.com/agrafix/Spock-worker";
        description = "Background workers for Spock";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17622,7 +16975,6 @@ self: {
        version = "0.1.1";
        sha256 = "06jxs1hc69viv38nvafhn8ilj3xn2j9k543abgd8p69gc95w1lbn";
        libraryHaskellDepends = [ base SDL ];
-       homepage = "http://liamoc.net/static/Sprig";
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17635,7 +16987,6 @@ self: {
        version = "0.3.2";
        sha256 = "1rap4xyldzwj26r8mbvzkyy9021q8h06pz8cyd061vyslrl7p89b";
        libraryHaskellDepends = [ base nats stm ];
-       homepage = "https://en.wikipedia.org/wiki/Stack_(abstract_data_type)";
        description = "Stack data structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17650,7 +17001,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/zcourts/Stasis";
        description = "A simple MVCC like library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17663,7 +17013,6 @@ self: {
        version = "1.1.1.0";
        sha256 = "102f4x240zj3jwa7gx6vp813j76cjhlc3zbi9i5kiz6268kcv28s";
        libraryHaskellDepends = [ base stm transformers ];
-       homepage = "https://github.com/haskell-opengl/StateVar";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17675,7 +17024,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "1dbpxwjz6yf4ap20wm5ngvd0i0knkjsdahmd90ymddqj82v8w3d0";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "http://github.com/seagull-kamome/StateVar-transformer";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -17687,7 +17035,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "1h90i6crknxv23zryqi7mfzg65g1ydv62mza1hiri66jlmdahir6";
        libraryHaskellDepends = [ base statistics tuple vector ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/Haskell/";
        description = "Collection of useful statistical methods";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -17721,7 +17068,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring network time utf8-string
        ];
-       homepage = "http://github.com/rukav/Stomp";
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17783,7 +17129,6 @@ self: {
          parsec text transformers
        ];
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
-       homepage = "https://github.com/hansonkd/StrappedTemplates";
        description = "General purpose templates in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17796,7 +17141,6 @@ self: {
        version = "4.0.0.0";
        sha256 = "1sskndywpm1gi4bs4i1gah73jk49inlscg4jzcqhq0phb8f886xk";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://naesten.dyndns.org:8080/repos/StrategyLib";
        license = stdenv.lib.licenses.unfree;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -17820,7 +17164,6 @@ self: {
        sha256 = "1l4l77rjhl5g9089kjyarsrvbvm43bk370ld50qp17dqhvisl73m";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base benchpress parallel ];
-       homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/";
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17859,7 +17202,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring cmdargs criterion deepseq mwc-random vector
        ];
-       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Suffix array construction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17893,7 +17235,6 @@ self: {
          AspectAG base containers HList ListLike template-haskell TTTAS
          uu-parsinglib uulib
        ];
-       homepage = "http://www.cs.uu.nl/wiki/Center/SyntaxMacrosForFree";
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -17913,7 +17254,6 @@ self: {
          base ConfigFile filepath fingertree Glob MissingH mtl old-locale
          pretty statistics template-haskell time vector
        ];
-       homepage = "http://github.com/rukav/Sysmon";
        description = "Sybase 15 sysmon reports processor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18013,7 +17353,6 @@ self: {
        version = "0.6.0";
        sha256 = "18p3rxh3g44ky5q4hjq53l4shg4gd8v68wra6bdxv8bjafxld1wp";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Typed Transformations of Typed Abstract Syntax";
        license = "LGPL";
      }) {};
@@ -18025,7 +17364,6 @@ self: {
        version = "0.5.0";
        sha256 = "0vz9j5vjypnkbzld18f6kczfj54disf43x5052s4n7gqzsjxpxvb";
        libraryHaskellDepends = [ base DeepArrow TypeCompose ];
-       homepage = "http://haskell.org/haskellwiki/TV";
        description = "Tangible Values -- composable interfaces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18084,7 +17422,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec xhtml ];
-       homepage = "http://www.storytotell.org/code/tablify";
        description = "Tool to render CSV into tables of various formats";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18105,7 +17442,6 @@ self: {
          base base64-bytestring bytestring containers cryptohash haskeline
          mtl optparse-applicative text
        ];
-       homepage = "http://github.com/mtesseract/Tahin#readme";
        description = "Tahin Password Generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18118,7 +17454,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1mjr81z42qhwa6njlvlsslpzbbpiab88ns8g8amskwv159gk6mlb";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/RossMeikleham/Tainted";
        description = "Tainted type, and associated operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18144,7 +17479,6 @@ self: {
        version = "0.4.0.0";
        sha256 = "1d66l67cicn3q4a6glfxfkhc9cjm7vqi0bnyjad0bzyyv409j6bp";
        libraryHaskellDepends = [ base comonad distributive Stream ];
-       homepage = "https://github.com/kwf/Tape";
        description = "Bidirectionally infinite streams, akin to the tape of a Turing machine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18202,7 +17536,6 @@ self: {
          base directory dumb-cas filepath haskell-src-meta HaTeX process
          template-haskell text
        ];
-       homepage = "http://github.com/leftaroundabout/Symbolic-math-HaTeX";
        description = "Render general Haskell math to LaTeX. Or: math typesetting with high signal-to-noise–ratio.";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18219,7 +17552,6 @@ self: {
        libraryHaskellDepends = [
          array base containers mtl SDL SDL-image SDL-mixer SFont Sprig
        ];
-       homepage = "http://liamoc.net/tea";
        description = "TeaHS Game Creation Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18232,7 +17564,6 @@ self: {
        version = "1.1.0.1";
        sha256 = "1q8infjcszbbfqybg1fv33fy33chyvj2nbj9d2sxvsixx57hm12m";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/svenpanne/Tensor";
        description = "Tensor data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18265,7 +17596,6 @@ self: {
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
        ];
-       homepage = "https://github.com/testexplode/testexplode";
        description = "Generates testcases from program-snippets";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18318,7 +17648,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring ghc-prim HTTP network
        ];
-       homepage = "http://thrift.apache.org";
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18333,7 +17662,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base safe ];
-       homepage = "https://github.com/2016rshah/Tic-Tac-Toe";
        description = "Tic Tac Toe in your command line!";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -18438,7 +17766,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl ];
        executableHaskellDepends = [ base containers mtl parsec ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18457,7 +17784,6 @@ self: {
          base containers mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/clux/tournament.hs";
        description = "Tournament related algorithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18470,7 +17796,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0la19yynd7bpswi9012hf0vl9c4fdnn8p6y0287xanmdcs9zqz16";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/Peaker/TraceUtils";
        description = "Functions that should have been in Debug.Trace";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18488,7 +17813,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts mtl parsec ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/remysucre/TransformeR#readme";
        description = "eDSL in R for Safe Variable Transformarion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18503,7 +17827,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl ];
-       homepage = "https://github.com/mgrabmueller/TransformersStepByStep";
        description = "Tutorial on monad transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18527,7 +17850,6 @@ self: {
        version = "0.0.2";
        sha256 = "06ci4v8gflsgi73wrpqvhb7w3mdkbjgidhqf95yyk4wiga1mrzal";
        libraryHaskellDepends = [ base ref-mtl stm ];
-       homepage = "https://github.com/Julek";
        description = "Wait-free Tree Counter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18540,7 +17862,6 @@ self: {
        version = "0.0.2";
        sha256 = "1lcj166i8f7850fqjv7xqxdn6zwpdynzxn3bf243wdnwmnn5pysx";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.github.com/bhickey/TreeStructures";
        description = "A collection of heaps and search trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18564,7 +17885,6 @@ self: {
        version = "0.0.4";
        sha256 = "09sd9p1y3zqkfahkp1vgdnlvgv1vnvdl7kdzccsd41h1h61fz3jd";
        libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ];
-       homepage = "https://github.com/Julek";
        description = "Lock free Treiber stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18620,7 +17940,6 @@ self: {
          array base binary bytestring cereal crypto-api HUnit largeword
          tagged
        ];
-       homepage = "http://github.com/rleisti/twofish";
        description = "An implementation of the Twofish Symmetric-key cipher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18654,7 +17973,6 @@ self: {
        revision = "1";
        editedCabalFile = "0j27xdfim7a6a16v834n3jdp1j7bsr3yn19bnfwni3xsvrc732q3";
        libraryHaskellDepends = [ base base-orphans ];
-       homepage = "https://github.com/conal/TypeCompose";
        description = "Type composition classes & instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18668,7 +17986,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 ];
-       homepage = "http://www.cs.kent.ac.uk/people/staff/oc/TypeIlluminator/";
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18681,7 +17998,6 @@ self: {
        version = "0.5.0.0";
        sha256 = "1css4pb2x514s396c35brghgn3pgysdps8k09k1wcx5k2qpg90cx";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/avieth/TypeNat";
        description = "Some Nat-indexed types for GHC";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -18695,7 +18011,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers directory time ];
-       homepage = "https://github.com/xpika/typingtester";
        description = "Command Line Typing speed tester";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -18711,7 +18026,6 @@ self: {
        libraryHaskellDepends = [
          array arrows base containers deepseq GLUT OpenGL stm transformers
        ];
-       homepage = "http://haskell.cs.yale.edu/";
        description = "Library for Arrowized Graphical User Interfaces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18729,7 +18043,6 @@ self: {
        executableHaskellDepends = [
          base haskell98 old-time parsec process utf8-string
        ];
-       homepage = "http://www.korgwal.com/umm/";
        description = "A small command-line accounting tool";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18760,7 +18073,6 @@ self: {
        version = "0.0.1";
        sha256 = "1l62z7798bby4fbrz62ic802g8zah3flb2pmsd3ky7y5903s3nxr";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
-       homepage = "http://github.com/solidsnack/URLb";
        description = "DEPRECATED A simple, liberal URL parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18785,7 +18097,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory filepath hspec JuicyPixels time
        ];
-       homepage = "http://github.com/cirquit/UTFTConverter";
        description = "Processing popular picture formats into .c or .raw format in RGB565";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18819,7 +18130,6 @@ self: {
          base bytestring directory exceptions filepath mtl process
          process-extras pureMD5 regex-tdfa unix zlib
        ];
-       homepage = "https://github.com/seereason/haskell-unixutils.git";
        description = "A crude interface between Haskell and Unix-like operating systems";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18831,7 +18141,6 @@ self: {
        version = "1.0.0";
        sha256 = "11m8lgq2rjvh7j8si7sqixf4k4ns65jy0zp6apqp0xc23c1znyr7";
        libraryHaskellDepends = [ base unix ];
-       homepage = "http://src.seereason.com/haskell-unixutils-shadow";
        description = "A simple interface to shadow passwords (aka, shadow.h)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18843,7 +18152,6 @@ self: {
        version = "0.3";
        sha256 = "0iry59pyd4iy0cmj6flr05lbk3696l1z8wswqcfp8q8m5ibykkz0";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/yokto/Updater";
        description = "Monadic FRP library based on stm";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -18855,7 +18163,6 @@ self: {
        version = "0.1.7";
        sha256 = "1y21v5k7s9sj8z5r3czp5i80x40zvyqxzr1xl28ardwj5q5rrvzp";
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
-       homepage = "http://www.haskell.org/haskellwiki/UrlDisp";
        description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18879,7 +18186,6 @@ self: {
        version = "0.0.4";
        sha256 = "1mjy3w4sw32rbmm13yhmpidfsj91v3p58jvki16z0kzk3fswpa85";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tonymorris/utility-tm";
        description = "Utility functions that are missing from the standard library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18906,7 +18212,6 @@ self: {
          utf8-string vector
        ];
        executableHaskellDepends = [ regexpr text ];
-       homepage = "http://github.com/grwlf/vkhs";
        description = "Provides access to Vkontakte social network via public API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18920,7 +18225,6 @@ self: {
        libraryHaskellDepends = [
          base bifunctors semigroupoids semigroups
        ];
-       homepage = "https://github.com/tonymorris/validation";
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18933,7 +18237,6 @@ self: {
        version = "1.0.5";
        sha256 = "0hyk553pdn72zc1i82njz3md8ycmzfiwi799y08qr3fg0i8r88zm";
        libraryHaskellDepends = [ array base ghc-prim ];
-       homepage = "http://github.net/sedillard/Vec";
        description = "Fixed-length lists and low-dimensional linear algebra";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -18957,7 +18260,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "0qsi1s8qp3fkr5alh2m7y1a1lm5xypjvmk174ywf0aga2y20bblm";
        libraryHaskellDepends = [ base OpenGLRaw Vec ];
-       homepage = "http://www.downstairspeople.org/darcs/Vec-opengl";
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -18970,7 +18272,6 @@ self: {
        version = "1.1";
        sha256 = "0jwi9kgij8xd0419nkksgffwcn94fz6ijdq8s29b771409a1pkfc";
        doHaddock = false;
-       homepage = "https://github.com/tobbebex/Vec-Transform";
        description = "This package is obsolete";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19017,7 +18318,6 @@ self: {
          tasty-th
        ];
        testToolDepends = [ c2hs ];
-       homepage = "https://github.com/choener/ViennaRNA-bindings";
        description = "ViennaRNA v2 bindings";
        license = "unknown";
      }) {};
@@ -19041,7 +18341,6 @@ self: {
          attoparsec base bytestring QuickCheck tasty tasty-quickcheck
          tasty-th vector
        ];
-       homepage = "https://github.com/choener/ViennaRNA-extras";
        description = "ViennaRNA v2 extensions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19085,7 +18384,6 @@ self: {
        testHaskellDepends = [
          base HDBC HDBC-sqlite3 hspec mtl QuickCheck webdriver
        ];
-       homepage = "https://github.com/Chrisr850/Villefort#readme";
        description = "Villefort is a task manager and time tracker written in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19114,7 +18412,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers parseargs
        ];
-       homepage = "http://github.com/BartMassey/WAVE";
        description = "WAVE audio file IO library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -19191,7 +18488,6 @@ self: {
        sha256 = "0vv8s483g3dkxyk833cjczj0a5zxiy9xh56kij6n0jjyzxb9bz0k";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers wx wxcore ];
-       homepage = "http://wewantarock.wordpress.com";
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19211,7 +18507,6 @@ self: {
          base containers haskell98 parsec regex-compat
        ];
        executableHaskellDepends = [ directory ghc-paths process ];
-       homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/";
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19245,7 +18540,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring HTTP text unordered-containers
        ];
-       homepage = "https://github.com/bstamour/weather";
        description = "Library for interacting with the Weather Underground JSON API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -19257,7 +18551,6 @@ self: {
        version = "2.2";
        sha256 = "1frmnjbpgm76dzs1p4766fb6isqc3pxv4dnj8sdhnfliv5j0xv2z";
        libraryHaskellDepends = [ base containers mtl parsec pretty syb ];
-       homepage = "http://github.com/brownplt/webbits";
        description = "JavaScript analysis tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -19273,7 +18566,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl parsec pretty syb WebBits
        ];
-       homepage = "http://www.cs.brown.edu/research/plt/";
        description = "JavaScript analysis tools";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19310,7 +18602,6 @@ self: {
          happstack-server happstack-state happstack-util mtl utf8-string
          xhtml
        ];
-       homepage = "http://patch-tag.com/r/salazar/webconts/snapshot/current/content/pretty";
        description = "Continuation based web programming for Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19326,7 +18617,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base parsec ];
        executableHaskellDepends = [ base parsec ];
-       homepage = "https://github.com/cameronbwhite/WeberLogic";
        description = "Logic interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19379,7 +18669,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "The frictionless WAI Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19403,7 +18692,6 @@ self: {
        pname = "Win32";
        version = "2.8.0.0";
        sha256 = "0ppvpf2zx6547bqx7ysbq9ld99hf1v9rfa9s4f57hkn758l9ldm4";
-       homepage = "https://github.com/haskell/win32";
        description = "A binding to Windows Win32 API";
        license = stdenv.lib.licenses.bsd3;
        platforms = stdenv.lib.platforms.none;
@@ -19428,7 +18716,6 @@ self: {
        version = "0.3.2";
        sha256 = "0r0629nnjmlw245czxf4gyzrl0zhgm3fjgjy1bs8622zsvfdavrz";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
-       homepage = "http://github.com/mikesteele81/win32-dhcp-server";
        description = "Win32 DHCP Server Management API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19441,7 +18728,6 @@ self: {
        version = "0.2.2.1";
        sha256 = "1v7gm7vll1lq6d7d0y8vza7ilcw6i95jkprhy906awhqlhv3z031";
        libraryHaskellDepends = [ base template-haskell text Win32 ];
-       homepage = "http://github.com/mikesteele81/win32-errors";
        description = "Alternative error handling for Win32 foreign calls";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19457,7 +18743,6 @@ self: {
        editedCabalFile = "0gxp1a5sk9jb7x1mvz5jk68n8npvh8b9nlqcw9s2dn4wlyicm4mp";
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ imm32 msimg32 ];
-       homepage = "http://hub.darcs.net/shelarcy/Win32-extras/";
        description = "Provides missing Win32 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19470,7 +18755,6 @@ self: {
        version = "0.2.1.1";
        sha256 = "1pvlvhdp4wcz8kn5nldhrkryz03dmzyzvjbm8x1ri9kwq1icd941";
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
-       homepage = "http://github.com/mikesteele81/Win32-junction-point";
        description = "Support for manipulating NTFS junction points";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19499,7 +18783,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base text Win32 Win32-errors ];
-       homepage = "https://github.com/anton-dessiatov/Win32-security";
        description = "Haskell bindings to a security-related functions of the Windows API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19513,7 +18796,6 @@ self: {
        sha256 = "07vby574s528g259zq8jby1327b6jqn4zlzs406ml99w1p02d9js";
        libraryHaskellDepends = [ base Win32 Win32-errors ];
        librarySystemDepends = [ Advapi32 ];
-       homepage = "http://github.com/mikesteele81/win32-services";
        description = "Windows service applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19545,7 +18827,6 @@ self: {
        sha256 = "1dzz8j8q0mly37fq26j0805m9dnqx5c3431s5x2sgl90rbc6fbaw";
        libraryHaskellDepends = [ base mtl th-utilities Win32 ];
        librarySystemDepends = [ libossp_uuid ole32 ];
-       homepage = "https://github.com/opasly-wieprz/Win32-shortcut";
        description = "Support for manipulating shortcuts (.lnk files) on Windows";
        license = stdenv.lib.licenses.bsd3;
        platforms = stdenv.lib.platforms.none;
@@ -19563,7 +18844,6 @@ self: {
        libraryHaskellDepends = [
          base chalmers-lava2000 containers mtl QuickCheck
        ];
-       homepage = "http://www.cse.chalmers.se/~emax/wired/";
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -19603,7 +18883,6 @@ self: {
          NaturalLanguageAlphabets split tasty tasty-quickcheck tasty-silver
          tasty-th text
        ];
-       homepage = "https://github.com/choener/WordAlignment";
        description = "Bigram word pair alignments";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19643,7 +18922,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base boxes cmdargs ];
        executableHaskellDepends = [ base boxes cmdargs ];
-       homepage = "https://github.com/gbgar/Wordlint";
        description = "Plaintext prose redundancy linter";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19678,7 +18956,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl SybWidget wx wxcore xtc
        ];
-       homepage = "http://www.haskell.org/haskellwiki/WxGeneric";
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19696,7 +18973,6 @@ self: {
        librarySystemDepends = [
          libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
        ];
-       homepage = "https://github.com/xmonad/X11";
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; 
@@ -19715,7 +18991,6 @@ self: {
        librarySystemDepends = [
          libX11 libXext libXinerama libXrandr libXrender libXScrnSaver
        ];
-       homepage = "https://github.com/xmonad/X11";
        description = "A binding to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19758,7 +19033,6 @@ self: {
        sha256 = "0r6dq9xx0v100162y7bvkj1l0lv5m697y35c659kgjj0mg8p9bjv";
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ Xdamage ];
-       homepage = "http://darcs.haskell.org/X11-xdamage";
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19772,7 +19046,6 @@ self: {
        sha256 = "0wwhyqqybrjvy8mi5d5429wraky93xq348gr9ldhg2qj95hj13yk";
        libraryHaskellDepends = [ base X11 ];
        librarySystemDepends = [ Xfixes ];
-       homepage = "https://github.com/reacocard/x11-xfixes";
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19797,7 +19070,6 @@ self: {
        version = "0.1.1";
        sha256 = "19p71lc0hihfn0xzl29j01kd0zf9yalspwj7dava0ybc1rm3g62h";
        libraryHaskellDepends = [ base X11 ];
-       homepage = "http://darcs.haskell.org/X11-xshape";
        description = "A binding to the Xshape X11 extension library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -19821,7 +19093,6 @@ self: {
        sha256 = "1kk0gccv83mw8463x29c7rpl5davmhk9vyf82i4rbksgrdzkhjh9";
        libraryHaskellDepends = [ base Win32 ];
        librarySystemDepends = [ xinput ];
-       homepage = "http://code.fac9.com/xinput/";
        description = "Bindings for the DirectX XInput library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19851,7 +19122,6 @@ self: {
        version = "0.1.0.6";
        sha256 = "0ybdwdxv9pfr20dr40xn6s3mjqqvk1fy4rwl1siams2dlx233k6j";
        libraryHaskellDepends = [ base parsec ];
-       homepage = "xy30.com";
        description = "A library to parse xml";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19866,7 +19136,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ xmmsclient xmmsclient-glib ];
-       homepage = "http://kawais.org.ua/XMMS/";
        description = "XMMS2 client library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19884,7 +19153,6 @@ self: {
        libraryHaskellDepends = [
          base haskell98 hsdns mtl network parsec random utf8-string
        ];
-       homepage = "http://kagami.touhou.ru/projects/show/matsuri";
        description = "XMPP library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19908,7 +19176,6 @@ self: {
          base bifunctors bytestring cgi containers hsparql mtl network
          pretty rdf4h text
        ];
-       homepage = "http://speechweb2.cs.uwindsor.ca/solarman4/demo_sparql.html";
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19952,7 +19219,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "0dv5nvvqy6w0ndjyab4bwhjpw1hlx8xi4bv2jw4rl8v6y68bilk1";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "http://github.com/mmirman/haskogeneous/tree/XmlHtmlWriter";
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19965,7 +19231,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "11g1gipc9v81h5jzndr3j7j4mwr4lva9b52fd0hml4mrzf6vj2dx";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kanaihiroki/Xorshift128Plus";
        description = "Pure haskell implementation of xorshift128plus random number generator";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -19987,7 +19252,6 @@ self: {
          base data-accessor-transformers fclabels monads-fd random SDL
          SDL-image SDL-mixer SDL-ttf transformers
        ];
-       homepage = "http://github.com/snkkid/YACPong";
        description = "Yet Another Pong Clone using SDL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20000,7 +19264,6 @@ self: {
        version = "0.4";
        sha256 = "17pp79yr8jfmhx85vlr5kx7q5wha48p3ra7l4ligd583yxzvlnif";
        libraryHaskellDepends = [ array base HGL Yampa ];
-       homepage = "http://www.haskell.org/yampa/";
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20036,7 +19299,6 @@ self: {
          yesod-default yesod-form yesod-newsfeed yesod-platform
          yesod-recaptcha yesod-static
        ];
-       homepage = "http://gitweb.konn-san.com/repo/Yablog/tree/master";
        description = "A simple blog engine powered by Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20065,7 +19327,6 @@ self: {
          base bytestring containers directory dlist hashmap HUnit mtl
          regex-compat
        ];
-       homepage = "http://www.ben-kiki.org/oren/YamlReference";
        description = "YAML reference implementation";
        license = "LGPL";
      }) {};
@@ -20080,7 +19341,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random ];
        testHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20095,7 +19355,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random ];
        testHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/haskellwiki/Yampa";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20110,7 +19369,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random vector-space ];
-       homepage = "https://github.com/ony/Yampa-core";
        description = "Library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20129,7 +19387,6 @@ self: {
        executableHaskellDepends = [
          array base bytestring containers HCodecs Yampa
        ];
-       homepage = "http://www-db.informatik.uni-tuebingen.de/team/giorgidze";
        description = "Software synthesizer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20141,7 +19398,6 @@ self: {
        version = "0.1.0";
        sha256 = "1krp17rw25b7a280rf3idpfzkx39kpfcjqwznz96y0d2sdqbhg6p";
        libraryHaskellDepends = [ base containers parsec ];
-       homepage = "https://github.com/ajg/yocto";
        description = "A Minimal JSON Parser & Printer for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -20158,7 +19414,6 @@ self: {
          base containers mtl network old-locale process readline regex-posix
          syb time
        ];
-       homepage = "http://code.google.com/p/yogurt-mud/";
        description = "A MUD client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20179,7 +19434,6 @@ self: {
          time Yogurt
        ];
        executableSystemDepends = [ readline ];
-       homepage = "http://code.google.com/p/yogurt-mud/";
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20210,7 +19464,6 @@ self: {
        libraryHaskellDepends = [
          base CC-delcont containers mtl network unix
        ];
-       homepage = "https://github.com/jkarni/ZipperFS";
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20238,7 +19491,6 @@ self: {
        version = "0.1.4";
        sha256 = "05cnpl9c6i0j8jqr4j43b32jgryv34gahimhp9g1m45idgnl2sn0";
        libraryHaskellDepends = [ base TypeCompose ];
-       homepage = "http://haskell.org/haskellwiki/ZipFold";
        description = "Zipping folds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20250,7 +19502,6 @@ self: {
        version = "0.9";
        sha256 = "0nl08r7s3r5hr5jag499fillca16wsb8yqz1dlzydvacqcklcxr9";
        libraryHaskellDepends = [ base syz ];
-       homepage = "www.di.uminho.pt/~prmartins";
        description = "An implementationg of Attribute Grammars using Functional Zippers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20268,7 +19519,6 @@ self: {
          text
        ];
        testHaskellDepends = [ base containers random tasty tasty-hunit ];
-       homepage = "http://github.com/bgwines/zora";
        description = "Graphing library wrapper + assorted useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20280,7 +19530,6 @@ self: {
        version = "0.1";
        sha256 = "1crvcvni5gzpc1c6cnaqqp0gng1l9gk9d8ac23967nvp82xav7s1";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/MedeaMelana/Zwaluw";
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20300,7 +19549,6 @@ self: {
        executableHaskellDepends = [
          base biofasta biopsl cmdargs containers directory process
        ];
-       homepage = "http://blog.malde.org/index.php/a50-a-graphical-comparison-of-genome-assemblies";
        description = "Compare genome assemblies";
        license = "GPL";
      }) {};
@@ -20313,7 +19561,6 @@ self: {
        sha256 = "1lxsn3n77fk7jl8i76nffj1zngvi2s38y17s54ha29h8hrp3s3dg";
        libraryHaskellDepends = [ base parsec text ];
        testHaskellDepends = [ base HUnit text ];
-       homepage = "http://github.com/marcotmarcot/abacate";
        description = "Parser for a language similar to Cucumber's Gherkin";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20331,7 +19578,6 @@ self: {
        executableHaskellDepends = [
          array base minisat random random-shuffle Safe
        ];
-       homepage = "https://github.com/pa-ba/abc-puzzle";
        description = "Generate instances of the ABC Logic Puzzle";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20390,7 +19636,6 @@ self: {
          aeson base base64-bytestring bson bytestring data-default-class
          scientific text time unordered-containers uuid vector
        ];
-       homepage = "https://github.com/philopon/abeson";
        description = "interconversion between aeson and bson";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20411,7 +19656,6 @@ self: {
          attoparsec base containers HUnit megaparsec tasty tasty-hunit
          test-framework test-framework-hunit text
        ];
-       homepage = "https://github.com/Xandaros/abnf.git";
        description = "Parse ABNF and generate parsers for the specified document";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20424,7 +19668,6 @@ self: {
        version = "0.3";
        sha256 = "18jwswjxwzc9bjiy4ds6hw2a74ki797jmfcifxd2ga4kh7ri1ah9";
        libraryHaskellDepends = [ array base containers random time ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "Abstract, parameterized interface to mutable Deques";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20445,7 +19688,6 @@ self: {
          abstract-deque array base containers HUnit random test-framework
          test-framework-hunit time
        ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "A test-suite for any queue or double-ended queue satisfying an interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20457,7 +19699,6 @@ self: {
        version = "0.3.3";
        sha256 = "0q6qsniw4wks2pw6wzncb1p1j3k6al5njnvm2v5n494hplwqg2i4";
        libraryHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/simonmar/monad-par";
        description = "Type classes generalizing the functionality of the 'monad-par' library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20471,7 +19712,6 @@ self: {
        libraryHaskellDepends = [
          abstract-par accelerate array base vector
        ];
-       homepage = "https://github.com/simonmar/monad-par";
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20534,7 +19774,6 @@ self: {
          exceptions fclabels filepath ghc-prim hashable hashtables mtl
          template-haskell time transformers unique unix unordered-containers
        ];
-       homepage = "https://github.com/AccelerateHS/accelerate/";
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20561,7 +19800,6 @@ self: {
          terminal-size transformers unique unix unordered-containers vector
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/AccelerateHS/accelerate/";
        description = "An embedded language for accelerated array processing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20581,7 +19819,6 @@ self: {
        testHaskellDepends = [
          accelerate accelerate-utility base QuickCheck
        ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/";
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20610,7 +19847,6 @@ self: {
          accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx
          base criterion mwc-random vector vector-th-unbox wide-word
        ];
-       homepage = "https://github.com/tmcdonell/accelerate-bignum";
        description = "Fixed-length large integer arithmetic for Accelerate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20639,7 +19875,6 @@ self: {
          accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx
          base criterion mwc-random vector vector-th-unbox wide-word
        ];
-       homepage = "https://github.com/tmcdonell/accelerate-bignum";
        description = "Fixed-length large integer arithmetic for Accelerate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20727,7 +19962,6 @@ self: {
          accelerate accelerate-arithmetic accelerate-cuda accelerate-utility
          base cuda hmatrix pooled-io random timeit utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-cublas/";
        description = "Basic Linear Algebra using native CUBLAS library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20753,7 +19987,6 @@ self: {
          mainland-pretty mtl old-time pretty process SafeSemaphore srcloc
          template-haskell text transformers unix unordered-containers
        ];
-       homepage = "https://github.com/AccelerateHS/accelerate-cuda/";
        description = "Accelerate backend for NVIDIA GPUs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20773,7 +20006,6 @@ self: {
          accelerate accelerate-fourier accelerate-llvm-ptx
          accelerate-utility base cuda cufft
        ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-cufft/";
        description = "Accelerate frontend to the CUFFT library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20813,7 +20045,6 @@ self: {
          normaldistribution random repa repa-io scientific vector
          vector-algorithms
        ];
-       homepage = "https://github.com/AccelerateHS/accelerate-examples";
        description = "Examples using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20833,7 +20064,6 @@ self: {
          accelerate-llvm-ptx base bytestring carray cuda cufft fft
          file-embed storable-complex
        ];
-       homepage = "https://github.com/AccelerateHS/accelerate-fft";
        description = "FFT using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20859,7 +20089,6 @@ self: {
          accelerate accelerate-llvm-native accelerate-llvm-ptx base hedgehog
          tasty tasty-hedgehog
        ];
-       homepage = "https://github.com/AccelerateHS/accelerate-fft";
        description = "FFT using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20876,7 +20105,6 @@ self: {
        libraryHaskellDepends = [
          accelerate accelerate-io base carray fft storable-complex
        ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-fftw/";
        description = "Accelerate frontend to the FFTW library (Fourier transform)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20902,7 +20130,6 @@ self: {
          accelerate accelerate-arithmetic accelerate-llvm-native
          accelerate-utility base criterion utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20921,7 +20148,6 @@ self: {
          accelerate accelerate-cuda accelerate-cufft accelerate-fftw
          accelerate-fourier base criterion
        ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-fourier-benchmark/";
        description = "Compare different implementations of the Fast Fourier Transform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -20940,7 +20166,6 @@ self: {
        libraryHaskellDepends = [
          accelerate array base bmp bytestring repa vector
        ];
-       homepage = "https://github.com/AccelerateHS/accelerate-io";
        description = "Read and write Accelerate arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -20959,7 +20184,6 @@ self: {
        testHaskellDepends = [
          accelerate array base hedgehog tasty tasty-hedgehog vector
        ];
-       homepage = "https://github.com/AccelerateHS/accelerate-io";
        description = "Read and write Accelerate arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21138,7 +20362,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1wdxypkgkjngrlkw4fnxqqqbcy3chaw5fim0xyzcbh52zd0b62wh";
        libraryHaskellDepends = [ accelerate base utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/accelerate-utility/";
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21150,7 +20373,6 @@ self: {
        version = "0.9.4";
        sha256 = "16hgs81cs3zgbvsprh9lzvyxbh58g7rijf1d4j0dkrpnqnrvg0hy";
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
-       homepage = "http://accentuate.us/";
        description = "A Haskell implementation of the Accentuate.us API.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21163,7 +20385,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "13kg8mjrnif88r0w7b041x4vmzdm9aqrx4fskc3qv3smpq2q2ngs";
        libraryHaskellDepends = [ base filepath old-time time unix ];
-       homepage = "http://www.github.com/batterseapower/access-time";
        description = "Cross-platform support for retrieving file access times";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21191,7 +20412,6 @@ self: {
          katip lens mtl random safe-exceptions tasty tasty-hunit text
          th-format unliftio unliftio-core uuid
        ];
-       homepage = "https://github.com/mtesseract/access-token-provider#readme";
        description = "Provides Access Token for Services";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21203,7 +20423,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "0dlszai5bz05algxm98kjhnjwa7mwj620d52vrsc4fxds8q84sjg";
        libraryHaskellDepends = [ base bifunctors lens semigroups ];
-       homepage = "http://www.github.com/massysett/accuerr";
        description = "Data type like Either but with accumulating error type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21244,7 +20463,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion directory mtl random system-fileio system-filepath
        ];
-       homepage = "https://github.com/acid-state/acid-state";
        description = "Add ACID guarantees to any serializable Haskell data structure";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -21286,7 +20504,6 @@ self: {
        libraryHaskellDepends = [
          acid-state base directory HsOpenSSL network safecopy
        ];
-       homepage = "http://acid-state.seize.it/";
        description = "Add TLS support for Data.Acid.Remote";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21326,7 +20543,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/drwebb/acme-box";
        description = "A full featured empty project";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21349,7 +20565,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0ydlnp0bbl5haci3a5x59sj2biylmpkqwzy749fhp8jn1cr8fg4x";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jaspervdj/acme-cofunctor";
        description = "A Cofunctor is a structure from category theory dual to Functor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21387,7 +20602,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/chessai/acme-cuteboy";
        description = "Maybe gives you a cute boy";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -21402,7 +20616,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/Fuuzetsu/acme-cutegirl";
        description = "Maybe gives you a cute girl";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -21414,7 +20627,6 @@ self: {
        version = "0.1.0";
        sha256 = "0hkx2zpk3w9vh1jdhpwkd7x7hwr3zf5z9n6f30rjrbyqmxnicpip";
        libraryHaskellDepends = [ base ];
-       homepage = "http://hub.darcs.net/esz/acme-default";
        description = "A class for types with a distinguished aesthetically pleasing value";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -21437,7 +20649,6 @@ self: {
        version = "0";
        sha256 = "1xl5gwc67acg47fdkgrn7sjvvvnc4sjf5vifph0jb3c7gv93n757";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/jystic/acme-flipping-tables";
        description = "Stop execution with rage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21450,7 +20661,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0b99f1js5w5904rw20xfmg8sfv0l8fdcnp90jx4rrczcirp6h6iq";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/chris-martin/acme-functors";
        description = "The best applicative functors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21462,7 +20672,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "170cvi3b13wb8imfz3yc3323v2dnyhrr080syjqam477ahwggwsn";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kadoban/acme-grawlix";
        description = "More readable names for commonly used symbols";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21474,7 +20683,6 @@ self: {
        version = "0.1";
        sha256 = "0da4ysj74fmhcbbvxxfb6w97pr870518k90vwnc3z8kglj1ni187";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/joeyadams/haskell-acme-hq9plus";
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21493,7 +20701,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring extensible-exceptions mtl network pretty
        ];
-       homepage = "http://www.happstack.com";
        description = "fastest Haskell PONG server in the world";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21520,7 +20727,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "091czdcbydc75ndaw2ns8cncxa6ihlvclhrbcz9vp29kvhf483cb";
        libraryHaskellDepends = [ base ];
-       homepage = "N/A";
        description = "The only true way to do IO in Haskell!";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21544,7 +20750,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0b587ryd63zyap7c3a1dnm25y0k9a6i2sx26xzg0wrq8hfh0f815";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/marcosdumay/acme-kitchen-sink";
        description = "A place for dumping that does-not-feel-right code while you improve it";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21569,7 +20774,6 @@ self: {
        version = "0.1.1";
        sha256 = "08issbr9lgc2saqvgs80sxl1sgi7ig5jg6iykv1g1zl5k1kv2a32";
        libraryHaskellDepends = [ base parsec random random-shuffle text ];
-       homepage = "https://github.com/llelf/acme-lolcat";
        description = "LOLSPEAK translator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21581,7 +20785,6 @@ self: {
        version = "0.1";
        sha256 = "194xvcab14bs3b3nrayxp4z3da60afxa9cmip58mkms5016kwhis";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/llelf/acme-lookofdisapproval";
        description = "Express your disapproval";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21593,7 +20796,6 @@ self: {
        version = "0.0.3";
        sha256 = "1l6kxmdb7fi47ldfpcqbl6h4dnzw6zw0ahxmvx6sxwxm3x4hynhi";
        libraryHaskellDepends = [ base MemoTrie random ];
-       homepage = "https://github.com/ion1/acme-memorandom";
        description = "Memoized random number generation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -21678,7 +20880,6 @@ self: {
        sha256 = "1b0202ikrg81m1v99ax93v60n21aw9anzwsa4hwkfjdn3rhcwrj9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/joachifm/acme-omitted#readme";
        description = "A name for omitted definitions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21690,7 +20891,6 @@ self: {
        version = "0.0.2";
        sha256 = "11sgx648g5594w8m8x8r25x7s61jyyxazp5dcfyglvhc7zlrrvbb";
        doHaddock = false;
-       homepage = "https://github.com/ion1/acme-zero-one";
        description = "The identity element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -21702,7 +20902,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1wf12iphv12srygdvhy7xyja453dzjmm6kd9l2qp00fx986zd01w";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/phadej/acme-operators#readme";
        description = "Operators of base, all in one place!";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21715,7 +20914,6 @@ self: {
        version = "0.0.5";
        sha256 = "1kjfpihicb6f3kn5gzr0ya8f73g4y3kvw7y4plv67cpbc1icnpjl";
        libraryHaskellDepends = [ acme-left-pad base ];
-       homepage = "http://hackage.haskell.org/package/acme-php-0.0.5/src/docs.html";
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21750,7 +20948,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0bmv45b3v45967gdvsy37xfw6x50qpl8234y20m3nc48f4nf0z68";
        libraryHaskellDepends = [ acme-dont base ];
-       homepage = "http://github.com/fgaz/acme-safe";
        description = "Safe versions of some infamous haskell functions such as fromJust";
        license = "unknown";
      }) {};
@@ -21781,7 +20978,6 @@ self: {
        sha256 = "1ivajii0gji1inc9qmli3ri3kyzcxyw90m469gs7a16kbprcs3kl";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/benclifford/acme-smuggler";
        description = "Smuggle arbitrary values in ()";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -21793,7 +20989,6 @@ self: {
        version = "0.1";
        sha256 = "1r6xnkyx22khzq6hlb8bk0fnbb6hlwbf12wajhx8vcxa7bkhh8lb";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/ehird/acme-strfry";
        description = "A binding to the glibc strfry function";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21842,7 +21037,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://github.com/joeyadams/hs-acme-year";
        description = "Get the current year";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -21865,7 +21059,6 @@ self: {
        version = "0.0.2";
        sha256 = "06d4hpda8qwwq9wzkgx6fpiq39l1md8sfm9hnvh4r95xyg5q53f6";
        doHaddock = false;
-       homepage = "https://github.com/ion1/acme-zero-one";
        description = "The absorbing element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21878,7 +21071,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "0l6c3kdvg71z6pfjg71jgaffb403w8y8lixw4dhi7phhhb91phn2";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/metrix-ai/acquire";
        description = "Abstraction over management of resources";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -21965,7 +21157,6 @@ self: {
        libraryHaskellDepends = [
          aeson base text time unordered-containers
        ];
-       homepage = "https://github.com/aisamanra/activitystreams-aeson";
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -21979,7 +21170,6 @@ self: {
        sha256 = "1ic74yrfy6hk7217vh2ff6yacvf3dc5m1hjkcpfvxzdk5xhdv2b5";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm time ];
-       homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html";
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22003,7 +21193,6 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        benchmarkHaskellDepends = [ base criterion erf ];
-       homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22015,7 +21204,6 @@ self: {
        version = "0.3";
        sha256 = "16h0zi55hf9g07xisbcmgkx72m9laiqykh2r9nh2siczx3sxi1qk";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~dons/code/adaptive-containers";
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22028,7 +21216,6 @@ self: {
        version = "0.2.0";
        sha256 = "1kf4d3qf8nv61c7pajv234b2vil84c2cq40csnm456lg55qh53r1";
        libraryHaskellDepends = [ base template-haskell type-level ];
-       homepage = "http://inmachina.net/~jwlato/haskell/";
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22066,7 +21253,6 @@ self: {
          MissingH mtl network network-uri old-locale parsec
          parsec-permutation strict text time
        ];
-       homepage = "https://projects.zubr.me/wiki/adblock2privoxy";
        description = "Convert adblock config files to privoxy format";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22098,7 +21284,6 @@ self: {
          base bytestring containers Crypto dataenc HaXml hsgnutls network
          old-locale parsec pkcs1 random time utf8-string xml-parsec
        ];
-       homepage = "http://sep07.mroot.net/";
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22119,7 +21304,6 @@ self: {
          base containers dawg QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
-       homepage = "https://github.com/kawu/adict";
        description = "Approximate dictionary searching";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22142,7 +21326,6 @@ self: {
        ];
        testHaskellDepends = [ base distributive generic-deriving hspec ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/ekmett/adjunctions/";
        description = "Adjunctions and representable functors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22156,7 +21339,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/redneb/hs-adler32";
        description = "An implementation of Adler-32, supporting rolling checksum operation";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zlib;};
@@ -22177,7 +21359,6 @@ self: {
        executableHaskellDepends = [
          base binary bytestring data-binary-ieee754 language-css mtl pretty
        ];
-       homepage = "https://github.com/stepcut/ase2css";
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22199,7 +21380,6 @@ self: {
          array base containers htrace HUnit mtl QuickCheck random-shuffle
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://adp-multi.ruhoh.com";
        description = "ADP for multiple context-free languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22220,7 +21400,6 @@ self: {
          adp-multi base containers monadiccp mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://adp-multi.ruhoh.com";
        description = "Subword construction in adp-multi using monadiccp";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22242,7 +21421,6 @@ self: {
          mixed-types-num QuickCheck regex-tdfa template-haskell
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/michalkonecny/aern2";
        description = "Multi-precision floats via MPFR";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22266,7 +21444,6 @@ self: {
          aern2-mp base mixed-types-num QuickCheck random
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/michalkonecny/aern2";
        description = "Exact real numbers via Cauchy sequences and MPFR";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22294,7 +21471,6 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
        ];
-       homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22328,7 +21504,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat unordered-containers uuid-types vector
        ];
-       homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22360,7 +21535,6 @@ self: {
          tasty-quickcheck template-haskell text time time-locale-compat
          unordered-containers uuid-types vector
        ];
-       homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22373,7 +21547,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0plbpln1glmf8a53f4nag1lx7sy8lcali6f1m526zifgak99p3qz";
        libraryHaskellDepends = [ aeson base text unordered-containers ];
-       homepage = "https://github.com/gregwebs/aeson-applicative-dsl";
        description = "make To/From JSOn instances from an applicative description";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22387,7 +21560,6 @@ self: {
        sha256 = "0111qzp381jjhv1iymjg8mr3jslx5x1ll3w2dq4b6f3r8y8871m5";
        libraryHaskellDepends = [ aeson attoparsec base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/athanclark/aeson-attoparsec#readme";
        description = "Embed an Attoparsec text parser into an Aeson parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22405,7 +21577,6 @@ self: {
          aeson base bytestring dlist mtl scientific text transformers
          transformers-compat unordered-containers vector void
        ];
-       homepage = "https://github.com/hdgarrood/aeson-better-errors";
        description = "Better error messages when decoding JSON values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -22450,7 +21621,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0i6pv9hkwp4h7wwmnr6lwaqjkwykdgqkvpycm7fpyrlw5ipkp728";
        libraryHaskellDepends = [ aeson base bytestring containers text ];
-       homepage = "https://github.com/lichtzwerge/aeson-coerce#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22479,7 +21649,6 @@ self: {
          scientific tagged tasty tasty-hunit tasty-quickcheck text time
          time-locale-compat unordered-containers vector
        ];
-       homepage = "https://github.com/phadej/aeson-compat#readme";
        description = "Compatibility layer for aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22498,7 +21667,6 @@ self: {
        testHaskellDepends = [
          aeson-qq base containers hedgehog text time
        ];
-       homepage = "https://github.com/typeclasses/aeson-decode";
        description = "Easy functions for converting from Aeson.Value";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -22526,7 +21694,6 @@ self: {
          aeson base bytestring directory doctest filepath Glob QuickCheck
          quickcheck-instances text unordered-containers vector
        ];
-       homepage = "https://github.com/thsutton/aeson-diff";
        description = "Extract and apply patches to JSON documents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22577,7 +21744,6 @@ self: {
          tasty-quickcheck these time time-parsers unordered-containers
          vector
        ];
-       homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22606,7 +21772,6 @@ self: {
          tasty-quickcheck these time time-parsers unordered-containers
          vector
        ];
-       homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22624,7 +21789,6 @@ self: {
          aeson base bytestring text unordered-containers
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/deviant-logic/aeson-filthy";
        description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22639,7 +21803,6 @@ self: {
          aeson base text unordered-containers vector
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/seanhess/aeson-flat#readme";
        description = "Tools for creating flat JSON serializations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22654,7 +21817,6 @@ self: {
        sha256 = "0kb8k01iaksmxhvjpdrg5aymy5zgxyvhfi2sc0hxw4m13ajbd697";
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        testHaskellDepends = [ aeson base bytestring hspec ];
-       homepage = "https://github.com/j1r1k/aeson-flatten#readme";
        description = "JSON flatten for Aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22676,7 +21838,6 @@ self: {
          aeson base containers recursion-schemes tasty tasty-hunit text
          unordered-containers vector
        ];
-       homepage = "https://github.com/mikeplus64/aeson-flowtyped#readme";
        description = "Create Flow type definitions from Haskell data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22727,7 +21888,6 @@ self: {
          aeson base iproute text unordered-containers
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/greydot/aeson-iproute";
        description = "Aeson instances for iproute types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22739,7 +21899,6 @@ self: {
        version = "0.1.1";
        sha256 = "0p9da4cpbj811b9va2rhhn95cqckhabhr9k4fjfd536dzrxqjigz";
        libraryHaskellDepends = [ aeson base json-ast ];
-       homepage = "https://github.com/sannsyn/aeson-json-ast";
        description = "Integration layer for \"json-ast\" and \"aeson\"";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -22776,7 +21935,6 @@ self: {
          containers deepseq hashable mtl old-locale syb text time
          unordered-containers vector
        ];
-       homepage = "http://github.com/mailrank/aeson";
        description = "Fast JSON parsing and encoding (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22789,7 +21947,6 @@ self: {
        version = "0.0.0";
        sha256 = "0z2r1rnh819wms8l1scv18l178i2y1ixcjm6ir59vir5bl19wxm0";
        libraryHaskellDepends = [ aeson base ];
-       homepage = "https://github.com/serokell/aeson-options";
        description = "Options to derive FromJSON/ToJSON instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -22805,7 +21962,6 @@ self: {
        libraryHaskellDepends = [
          aeson base parsec scientific text unordered-containers vector
        ];
-       homepage = "https://github.com/FPBrno/aeson-parsec-picky";
        description = "Alternative JSON parser based on Parsec and Aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22818,7 +21974,6 @@ self: {
        sha256 = "0ln4qwx7app1sc01irmy5lx7bqsq6wsgdig6zihpnp9rbj8263mj";
        libraryHaskellDepends = [ aeson base lens lens-aeson text ];
        testHaskellDepends = [ base hspec text ];
-       homepage = "https://github.com/ozzzzz/aeson-picker#readme";
        description = "Tiny library to get fields from JSON format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22835,7 +21990,6 @@ self: {
          aeson base mtl text unordered-containers vector
        ];
        testHaskellDepends = [ aeson base bytestring hspec mtl text ];
-       homepage = "https://github.com/j1r1k/aeson-prefix#readme";
        description = "Hiearchical prefixing for aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22857,7 +22011,6 @@ self: {
        executableHaskellDepends = [
          aeson attoparsec base bytestring cmdargs
        ];
-       homepage = "http://github.com/informatikr/aeson-pretty";
        description = "JSON pretty-printing library and command-line tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22880,7 +22033,6 @@ self: {
        executableHaskellDepends = [
          aeson attoparsec base bytestring cmdargs
        ];
-       homepage = "http://github.com/informatikr/aeson-pretty";
        description = "JSON pretty-printing library and command-line tool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22902,7 +22054,6 @@ self: {
          aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec
          parsec scientific template-haskell text vector
        ];
-       homepage = "https://github.com/sol/aeson-qq#readme";
        description = "JSON quasiquoter for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -22923,7 +22074,6 @@ self: {
          aeson attoparsec base bytestring microlens tasty tasty-hunit text
        ];
        benchmarkHaskellDepends = [ aeson base bytestring criterion text ];
-       homepage = "https://github.com/libscott/aeson-quick";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22954,7 +22104,6 @@ self: {
          template-haskell temporary test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
-       homepage = "https://github.com/Fuuzetsu/aeson-schema";
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -22984,7 +22133,6 @@ self: {
          aeson base data-default template-haskell text unordered-containers
          vector
        ];
-       homepage = "https://github.com/lassoinc/aeson-smart";
        description = "Smart derivation of Aeson instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23001,7 +22149,6 @@ self: {
        libraryHaskellDepends = [
          aeson attoparsec base bytestring HsOpenSSL http-streams io-streams
        ];
-       homepage = "https://github.com/noteed/aeson-streams";
        description = "An HTTP client library for JSON-based APIs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23022,7 +22169,6 @@ self: {
          aeson aeson-qq base bytestring hspec text unordered-containers
          vector
        ];
-       homepage = "https://github.com/begriffs/aeson-t";
        description = "Transform JSON";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23043,7 +22189,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ aeson base hspec ];
-       homepage = "https://github.com/schell/aeson-tiled#readme";
        description = "Aeson instances for the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23079,7 +22224,6 @@ self: {
          interpolate mtl process template-haskell temporary text
          th-abstraction unordered-containers
        ];
-       homepage = "https://github.com/codedownio/aeson-typescript#readme";
        description = "Generate TypeScript definition files from your ADTs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23116,7 +22260,6 @@ self: {
          mtl-prelude scientific text transformers unordered-containers
          vector
        ];
-       homepage = "https://github.com/sannsyn/aeson-value-parser";
        description = "An API for parsing \"aeson\" JSON tree into Haskell types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -23128,7 +22271,6 @@ self: {
        version = "0.1.1.3";
        sha256 = "0x5a5z0bmiljl9rfapyq6srffp6v3g25qvy0x692a5as66y5ahxg";
        libraryHaskellDepends = [ aeson base ];
-       homepage = "https://github.com/tejon/aeson-yak";
        description = "Handle JSON that may or may not be a list, or exist";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -23147,7 +22289,6 @@ self: {
          base bytestring clock containers glib linear monad-loops
          monad-parallel mtl OpenGL sdl2 stm text uuid
        ];
-       homepage = "https://github.com/nek0/affection#readme";
        description = "A simple Game Engine using SDL";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23176,7 +22317,6 @@ self: {
        libraryHaskellDepends = [
          base containers mwc-random primitive split vector
        ];
-       homepage = "http://github.com/jtobin/affine-invariant-ensemble-mcmc";
        description = "General-purpose sampling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23189,7 +22329,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1bldljkgsb9v7ss3l87mm4r9wjpp3z02hjnfdnp84pmaj0b34vam";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/clintonmead/affinely-extended";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -23211,7 +22350,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/vincenthz/hs-afis";
        description = "Anti-forensic Information Splitter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23229,7 +22367,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory language-c mtl process yices
        ];
-       homepage = "http://tomahawkins.org";
        description = "Infinite state model checking of iterative C programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23244,7 +22381,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers uuagc uulib ];
-       homepage = "https://github.com/UU-ComputerScience/ag-pictgen";
        description = "Attribute Grammar picture generation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23286,7 +22422,6 @@ self: {
          Agda base containers mtl network-uri xhtml
        ];
        executableHaskellDepends = [ Agda base network-uri transformers ];
-       homepage = "http://github.com/liamoc/agda-snippets#readme";
        description = "Render just the Agda snippets of a literate Agda file to HTML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23304,7 +22439,6 @@ self: {
          agda-snippets base directory filepath hakyll network-uri pandoc
          pandoc-types
        ];
-       homepage = "https://github.com/liamoc/agda-snippets#readme";
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23386,7 +22520,6 @@ self: {
          base directory doctest filepath parsec QuickCheck quickcheck-text
          template-haskell
        ];
-       homepage = "https://github.com/qfpl/aip";
        description = "Aeronautical Information Package (AIP)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23403,7 +22536,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers directory filepath mtl text time
        ];
-       homepage = "https://github.com/nfjinjing/air";
        description = "air";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23420,7 +22552,6 @@ self: {
          air array base bytestring containers directory filepath parallel
          parsec regexpr text time
        ];
-       homepage = "https://github.com/nfjinjing/air-extra";
        description = "air-extra";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23433,7 +22564,6 @@ self: {
        sha256 = "0s4y2805nmfydzxgr5lnhmyzkb6rh9mx2kpvzqqgyh4jvccdnwfx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hspec text ];
-       homepage = "https://github.com/nfjinjing/air-spec";
        description = "air spec helper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23445,7 +22575,6 @@ self: {
        version = "2014.11.17";
        sha256 = "0rhp56qvwiwlrs7pvpbslybvlp4xnllfjab6pap2chxgywas34pq";
        libraryHaskellDepends = [ air base template-haskell ];
-       homepage = "https://github.com/nfjinjing/air-th";
        description = "air";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23466,7 +22595,6 @@ self: {
          http-conduit monad-control network semigroups template-haskell text
          transformers utf8-string wai
        ];
-       homepage = "https://github.com/joelteon/airbrake";
        description = "An Airbrake notifier for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23497,7 +22625,6 @@ self: {
          base bytestring tasty tasty-hunit tasty-quickcheck text
          transformers wai
        ];
-       homepage = "https://github.com/helium/airship/";
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23516,7 +22643,6 @@ self: {
          wreq
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/ooblahman/airtable-api";
        description = "Requesting and introspecting Tables within an Airtable project";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23534,7 +22660,6 @@ self: {
          array base binary containers deepseq exceptions mtl mwc-random
          random semigroups vector
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "A multi-method simulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23550,7 +22675,6 @@ self: {
        libraryHaskellDepends = [
          aivika aivika-transformers base containers mtl mwc-random random
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Nested discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23568,7 +22692,6 @@ self: {
          aivika aivika-transformers array base binary containers
          distributed-process exceptions mtl mwc-random random stm time
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23585,7 +22708,6 @@ self: {
          aivika aivika-transformers base containers directory filepath mtl
          network-uri parallel-io split
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Simulation experiments for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23602,7 +22724,6 @@ self: {
          aivika-experiment aivika-experiment-chart base Chart Chart-cairo
          colour lens
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Cairo-based charting backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23620,7 +22741,6 @@ self: {
          aivika aivika-experiment array base Chart colour containers
          data-default-class filepath lens mtl split
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Simulation experiments with charting for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23637,7 +22757,6 @@ self: {
          aivika-experiment aivika-experiment-chart base Chart Chart-diagrams
          colour containers filepath lens
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Diagrams-based charting backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23655,7 +22774,6 @@ self: {
          aivika aivika-transformers base containers hashable mtl
          unordered-containers
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "GPSS-like DSL for Aivika";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23672,7 +22790,6 @@ self: {
          aivika aivika-transformers array base containers mtl mwc-random
          random
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Nested discrete event simulation module for the Aivika library using lattice";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23689,7 +22806,6 @@ self: {
          aivika aivika-transformers async base containers mtl mwc-random
          random stm time vector
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Soft real-time simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23706,7 +22822,6 @@ self: {
          aivika array base containers exceptions mtl mwc-random random
          semigroups vector
        ];
-       homepage = "http://www.aivikasoft.com";
        description = "Transformers for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23734,7 +22849,6 @@ self: {
          haskeline HsSyck HTTP mtl network old-time pretty process random
          regex-compat syb temporary unix utf8-string zlib
        ];
-       homepage = "http://ajhc.metasepi.org/";
        description = "Haskell compiler that produce binary through C language";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23749,7 +22863,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/phaazon/al";
        description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23764,11 +22877,24 @@ self: {
        libraryHaskellDepends = [
          async base clock stm time unbounded-delays
        ];
-       homepage = "https://bitbucket.org/davecturner/alarmclock";
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alarmclock_0_4_0_4" = callPackage
+    ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }:
+     mkDerivation {
+       pname = "alarmclock";
+       version = "0.4.0.4";
+       sha256 = "0jrd0855mxx3hqxnp7g1xg60p9d4i5km9imxajy0q3k94049hxyx";
+       libraryHaskellDepends = [
+         async base clock stm time unbounded-delays
+       ];
+       description = "Wake up and perform an action at a certain time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alea" = callPackage
     ({ mkDerivation, base, optparse-applicative, random, text }:
      mkDerivation {
@@ -23781,7 +22907,6 @@ self: {
        executableHaskellDepends = [
          base optparse-applicative random text
        ];
-       homepage = "https://github.com/Rnhmjoj/alea";
        description = "a diceware passphrase generator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -23800,7 +22925,6 @@ self: {
          http-client servant servant-client servant-client-core
          servant-server text time
        ];
-       homepage = "https://github.com/mjhopkins/alerta-client";
        description = "Bindings to the alerta REST API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23813,7 +22937,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0s6af3267qfg18zsy0fb43hfwf3dym2zpr864n05xwgzmg9qwhaj";
        libraryHaskellDepends = [ base blaze-html text ];
-       homepage = "https://github.com/alx741/alerts#readme";
        description = "Alert messages for web applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23831,7 +22954,6 @@ self: {
        executableHaskellDepends = [ array base containers directory ];
        executableToolDepends = [ happy ];
        testHaskellDepends = [ base process ];
-       homepage = "http://www.haskell.org/alex/";
        description = "Alex is a tool for generating lexical analysers in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23861,7 +22983,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "1ngxkr7jvy48pgq0sjqpi7a84qjm4fjny64hxksyvbj08l2rn7ha";
        libraryHaskellDepends = [ base time ];
-       homepage = "https://www.asayers.com/";
        description = "Collection of useful functions for writing console applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23935,7 +23056,6 @@ self: {
          base containers hspec hxt megaparsec mtl QuickCheck random text
          tf-random transformers
        ];
-       homepage = "https://github.com/mrkkrp/alga";
        description = "Algorithmic automation for various DAWs";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -23953,7 +23073,6 @@ self: {
          adjunctions array base containers distributive mtl nats
          semigroupoids semigroups tagged transformers void
        ];
-       homepage = "http://github.com/ekmett/algebra/";
        description = "Constructive abstract algebra";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24007,7 +23126,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "15gv6w9vz02960r6bd0k979vi6kj7pfxg705ajbrsd1pnwklfnwh";
        libraryHaskellDepends = [ accelerate base ];
-       homepage = "https://github.com/wdanilo/algebraic";
        description = "General linear algebra structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24020,7 +23138,6 @@ self: {
        version = "0.9.1";
        sha256 = "129s5690wc4w92sg246pcmnradzgfdddqpv961a53k2cx9ynmvc6";
        libraryHaskellDepends = [ base syb template-haskell ];
-       homepage = "https://github.com/sjoerdvisscher/algebraic-classes";
        description = "Conversions between algebraic classes and F-algebras";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24042,7 +23159,6 @@ self: {
        benchmarkHaskellDepends = [
          base base-compat containers criterion
        ];
-       homepage = "https://github.com/snowleopard/alga";
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -24058,7 +23174,6 @@ self: {
        libraryHaskellDepends = [
          algebra base basic-prelude lens semigroups
        ];
-       homepage = "https://github.com/konn/algebraic-prelude#readme";
        description = "Algebraically structured Prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24110,7 +23225,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative text ];
-       homepage = "https://github.com/danchoi/align-text";
        description = "A simple unix filter to align text on specified substrings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24123,7 +23237,6 @@ self: {
        version = "0.1";
        sha256 = "0hmnp08k04c0ag9fyp5sajg54r4gi57vrd9krk4g8y8fri0fgc00";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "An aligned ForeignPtr type";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -24190,7 +23303,6 @@ self: {
          incremental-sat-solver mtl network parsec pretty QuickCheck random
          stm syb template-haskell transformers tuple
        ];
-       homepage = "http://www.ccs.neu.edu/~tov/pubs/alms/";
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24212,7 +23324,6 @@ self: {
          containers COrdering cpphs directory filepath ghc-prim mtl parsec
          transformers unix
        ];
-       homepage = "http://www.alpha-lang.net/";
        description = "A compiler for the Alpha language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24230,7 +23341,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/alphachar";
        description = "A character between a-z";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24254,7 +23364,6 @@ self: {
        executableHaskellDepends = [
          base conduit containers MonadRandom mtl resourcet utf8-string
        ];
-       homepage = "http://github.com/danieldk/alpino-tools";
        description = "Alpino data manipulation tools";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24272,7 +23381,6 @@ self: {
          array base extensible-exceptions sample-frame
        ];
        librarySystemDepends = [ alsaLib ];
-       homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24286,7 +23394,6 @@ self: {
        sha256 = "1avh4a419h9d2zsslg6j8hm87ppgsgqafz8ll037rk2yy1g4jl7b";
        libraryHaskellDepends = [ base extensible-exceptions ];
        libraryPkgconfigDepends = [ alsaLib ];
-       homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
@@ -24305,7 +23412,6 @@ self: {
        executableHaskellDepends = [
          alsa-core alsa-seq base midi midi-alsa wx wxcore
        ];
-       homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24327,7 +23433,6 @@ self: {
        ];
        librarySystemDepends = [ alsaLib ];
        executableSystemDepends = [ alsaLib ];
-       homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24342,7 +23447,6 @@ self: {
        libraryHaskellDepends = [ alsa-core base unix ];
        librarySystemDepends = [ alsaLib ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -24363,7 +23467,6 @@ self: {
          storable-record
        ];
        libraryPkgconfigDepends = [ alsaLib ];
-       homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -24399,7 +23502,6 @@ self: {
          extensible-exceptions poll transformers utility-ht
        ];
        libraryPkgconfigDepends = [ alsaLib ];
-       homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -24426,7 +23528,6 @@ self: {
        version = "0.2.3.0";
        sha256 = "1jcc6cx0jj5ddvyq8xii9ar67ic3vlmy351qgybn74clpipgdyrm";
        libraryHaskellDepends = [ base composition ];
-       homepage = "https://github.com/jcristovao/altcomposition";
        description = "Alternative combinators for unorthodox function composition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24468,7 +23569,6 @@ self: {
        version = "0.0.0";
        sha256 = "1cf7akvr9nac1483chh7rd3xp5i5zk78f245lw9ixj6v133lnis2";
        libraryHaskellDepends = [ base vector ];
-       homepage = "https://github.com/athanclark/alternative-vector#readme";
        description = "Use vectors instead of lists for many and some";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24480,7 +23580,6 @@ self: {
        version = "0.1.2.0";
        sha256 = "19i2yhi6nsd2nl7sisbj6wrii5nw1z7xj7zk0fjmivyclnj03r5g";
        libraryHaskellDepends = [ base mmorph transformers ];
-       homepage = "https://github.com/louispan/alternators#readme";
        description = "Handy functions when using transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24492,7 +23591,6 @@ self: {
        version = "0.3.1";
        sha256 = "1n0mxgl1jzap74sglw85l0595lhaj493bz46b90cnsqr5as9mal8";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
-       homepage = "http://repo.or.cz/w/altfloat.git";
        description = "Alternative floating point support for GHC";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24518,7 +23616,6 @@ self: {
          MonadRandom mtl random random-string scrypt servant-server text
        ];
        executableHaskellDepends = [ base warp ];
-       homepage = "https://oss.xkcd.com/";
        description = "Implement a menu experience fit for web users";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24552,7 +23649,6 @@ self: {
          base bytestring configurator http-conduit lifted-base mime-mail
          mime-mail-ses postgresql-simple resourcet text time
        ];
-       homepage = "https://github.com/dbp/amazon-emailer";
        description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24568,7 +23664,6 @@ self: {
        libraryHaskellDepends = [
          base mtl snap snaplet-postgresql-simple text
        ];
-       homepage = "https://github.com/dbp/amazon-emailer-client-snap";
        description = "Client library for amazon-emailer daemon";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24595,7 +23690,6 @@ self: {
        executableHaskellDepends = [
          base bytestring http-conduit text transformers
        ];
-       homepage = "https://github.com/AndrewRademacher/hs-amazon-products";
        description = "Connector for Amazon Products API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24619,7 +23713,6 @@ self: {
          transformers-base transformers-compat void
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Comprehensive Amazon Web Services SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24638,7 +23731,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Alexa For Business SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -24656,7 +23748,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon API Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24675,7 +23766,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Application Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24694,7 +23784,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon AppStream SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24713,7 +23802,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon AppSync SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -24731,7 +23819,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Athena SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24750,7 +23837,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24769,7 +23855,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Auto Scaling Plans SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -24787,7 +23872,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Batch SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24806,7 +23890,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Budgets SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24825,7 +23908,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Certificate Manager SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24844,7 +23926,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Certificate Manager Private Certificate Authority SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -24862,7 +23943,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cloud9 SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -24880,7 +23960,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudDirectory SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24899,7 +23978,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFormation SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24918,7 +23996,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudFront SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24937,7 +24014,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24956,7 +24032,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudHSM V2 SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24975,7 +24050,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24994,7 +24068,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudSearch Domain SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25013,7 +24086,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudTrail SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25032,7 +24104,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25051,7 +24122,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Events SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25070,7 +24140,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CloudWatch Logs SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25089,7 +24158,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeBuild SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25108,7 +24176,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeCommit SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25127,7 +24194,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeDeploy SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25146,7 +24212,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodePipeline SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25165,7 +24230,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon CodeStar SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25184,7 +24248,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25203,7 +24266,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Identity Provider SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25222,7 +24284,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cognito Sync SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25241,7 +24302,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Comprehend SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -25259,7 +24319,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Config SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25278,7 +24337,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Connect Service SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -25309,7 +24367,6 @@ self: {
          http-conduit http-types lens QuickCheck quickcheck-unicode tasty
          tasty-hunit tasty-quickcheck template-haskell text time
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Core data types and functionality for Amazonka libraries";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25328,7 +24385,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cost Explorer Service SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -25346,7 +24402,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Cost and Usage Report Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25365,7 +24420,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Data Pipeline SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25384,7 +24438,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Device Farm SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25403,7 +24456,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Direct Connect SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25422,7 +24474,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Application Discovery Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25441,7 +24492,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Database Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25460,7 +24510,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Directory Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25479,7 +24528,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25498,7 +24546,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB Accelerator (DAX) SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25517,7 +24564,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon DynamoDB Streams SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25536,7 +24582,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25555,7 +24600,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Registry SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25574,7 +24618,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon EC2 Container Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25593,7 +24636,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic File System SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25612,7 +24654,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ElastiCache SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25631,7 +24672,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Beanstalk SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25650,7 +24690,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elasticsearch Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25669,7 +24708,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Transcoder SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25688,7 +24726,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25707,7 +24744,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Load Balancing SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25726,7 +24762,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic MapReduce SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25745,7 +24780,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Firewall Management Service SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -25763,7 +24797,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon GameLift SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25782,7 +24815,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glacier SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25801,7 +24833,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Glue SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25820,7 +24851,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Greengrass SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25839,7 +24869,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon GuardDuty SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -25857,7 +24886,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Health APIs and Notifications SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25876,7 +24904,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Identity and Access Management SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25898,7 +24925,6 @@ self: {
        testHaskellDepends = [
          aeson aeson-pretty base bytestring doctest hspec
        ];
-       homepage = "https://github.com/brendanhay/amazonka-iam-policy";
        description = "Amazon IAM Policy Document DSL and Combinators";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -25916,7 +24942,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25935,7 +24960,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Inspector SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25954,7 +24978,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -25973,7 +24996,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -25991,7 +25013,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26010,7 +25031,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon IoT Jobs Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26028,7 +25048,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26047,7 +25066,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26066,7 +25084,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Firehose SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26085,7 +25102,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Video Streams SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26103,7 +25119,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Video Streams Archived Media SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26121,7 +25136,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Kinesis Video Streams Media SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26139,7 +25153,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Key Management Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26158,7 +25171,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lambda SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26177,7 +25189,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lex Model Building Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26196,7 +25207,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lex Runtime Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26215,7 +25225,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Lightsail SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26234,7 +25243,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Commerce Analytics SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26253,7 +25261,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Entitlement Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26272,7 +25279,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Marketplace Metering SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26291,7 +25297,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Mechanical Turk SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26310,7 +25315,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elemental MediaConvert SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26328,7 +25332,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elemental MediaLive SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26346,7 +25349,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elemental MediaPackage SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26364,7 +25366,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elemental MediaStore SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26382,7 +25383,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elemental MediaStore Data Plane SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26400,7 +25400,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Migration Hub SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26419,7 +25418,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Machine Learning SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26438,7 +25436,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Mobile SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26457,7 +25454,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon MQ SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26475,7 +25471,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26494,7 +25489,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon OpsWorks for Chef Automate SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26513,7 +25507,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Organizations SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26532,7 +25525,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Pinpoint SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26551,7 +25543,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Polly SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26570,7 +25561,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Price List Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26589,7 +25579,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26608,7 +25597,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Redshift SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26627,7 +25615,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Rekognition SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26646,7 +25633,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Resource Groups SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26664,7 +25650,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Resource Groups Tagging API SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26683,7 +25668,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26702,7 +25686,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Auto Naming SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26720,7 +25703,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Route 53 Domains SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26739,7 +25721,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26761,7 +25742,6 @@ self: {
          dlist exceptions http-client lens lifted-async mmap mmorph mtl
          resourcet
        ];
-       homepage = "https://github.com/Axman6/amazonka-s3-streaming#readme";
        description = "Provides conduits to upload data to S3 using the Multipart API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26780,7 +25760,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SageMaker Service SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26798,7 +25777,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SageMaker Runtime SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26816,7 +25794,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon SimpleDB SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26835,7 +25812,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Secrets Manager SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26853,7 +25829,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon ServerlessApplicationRepository SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -26871,7 +25846,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Service Catalog SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26890,7 +25864,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Email Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26909,7 +25882,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Shield SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26928,7 +25900,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Server Migration Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26947,7 +25918,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Import/Export Snowball SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26966,7 +25936,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Notification Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -26985,7 +25954,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27004,7 +25972,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Systems Manager (SSM) SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27023,7 +25990,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Step Functions SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27042,7 +26008,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Storage Gateway SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27061,7 +26026,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Security Token Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27080,7 +26044,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Support SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27099,7 +26062,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27122,7 +26084,6 @@ self: {
          resourcet tasty tasty-hunit template-haskell temporary text time
          unordered-containers yaml
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Common functionality for Amazonka library test-suites";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27141,7 +26102,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Transcribe Service SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -27159,7 +26119,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Translate SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -27177,7 +26136,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WAF SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27196,7 +26154,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WAF Regional SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27215,7 +26172,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkDocs SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27234,7 +26190,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkMail SDK";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -27252,7 +26207,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon WorkSpaces SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27271,7 +26225,6 @@ self: {
          amazonka-core amazonka-test base bytestring tasty tasty-hunit text
          time unordered-containers
        ];
-       homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon X-Ray SDK";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27298,7 +26251,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest tasty tasty-hunit vector ];
        benchmarkHaskellDepends = [ base statistics ];
-       homepage = "https://github.com/jsermeno/amby#readme";
        description = "Statistical data visualization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27330,7 +26282,6 @@ self: {
          simple-sql-parser text time transformers utf8-string wl-pprint xlsx
          zlib
        ];
-       homepage = "http://wiki.tarski.nl";
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27359,7 +26310,6 @@ self: {
          data-binary-ieee754 hspec hspec-expectations network network-uri
          split stm text vector
        ];
-       homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27380,7 +26330,6 @@ self: {
        testHaskellDepends = [
          amqp base bytestring conduit hspec HUnit resourcet transformers
        ];
-       homepage = "http://github.com/tatac1/amqp-conduit/";
        description = "Conduit bindings for AMQP (see amqp package)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27459,7 +26408,6 @@ self: {
          aeson base bytestring exceptions foldl QuickCheck tasty tasty-hunit
          tasty-quickcheck text unordered-containers vector
        ];
-       homepage = "https://github.com/ejconlon/analyze#readme";
        description = "making data science easy and safe with data frames";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27477,7 +26425,6 @@ self: {
          base bytestring http-conduit MonadCatchIO-transformers mtl snap
          snap-core time
        ];
-       homepage = "https://github.com/dbp/analyze-client";
        description = "Client for analyze service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27501,7 +26448,6 @@ self: {
          base bytestring containers monads-tf options parsec system-argv0
          system-fileio system-filepath text
        ];
-       homepage = "https://john-millikin.com/software/anansi/";
        description = "Simple literate programming preprocessor";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -27517,7 +26463,6 @@ self: {
        libraryHaskellDepends = [
          anansi base bytestring containers hscolour monads-tf text
        ];
-       homepage = "https://john-millikin.com/software/anansi/";
        description = "Colorized looms for Anansi";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -27533,7 +26478,6 @@ self: {
        libraryHaskellDepends = [
          anansi base bytestring containers monads-tf pandoc text
        ];
-       homepage = "https://john-millikin.com/software/anansi/";
        description = "Looms which use Pandoc to parse and produce a variety of formats";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27561,7 +26505,6 @@ self: {
          hashable haskeline highlighter mtl parsec pretty pretty-show
          tagsoup text time vector
        ];
-       homepage = "http://atomo-lang.org/";
        description = "Anatomy: Atomo documentation system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27574,7 +26517,6 @@ self: {
        version = "0.0.2";
        sha256 = "1wn0kap7bw6sp9yi1awcmxh11s5ra4b44qbf97plsvrmpfz15cc5";
        libraryHaskellDepends = [ base process ];
-       homepage = "https://github.com/keera-studios/android-haskell";
        description = "Android methods exposed to Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27587,7 +26529,6 @@ self: {
        version = "0.1";
        sha256 = "07mgmpcwj7xi3ibmlcz45l645s5cbfnkr1brlhrzbnbyx72x7dr6";
        libraryHaskellDepends = [ base data-default ];
-       homepage = "https://github.com/obsidiansystems/android-activity";
        description = "Turn regular Haskell programs into Android Activities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27615,7 +26556,6 @@ self: {
        testHaskellDepends = [
          base basic-prelude directory hspec hxt QuickCheck stringable
        ];
-       homepage = "https://github.com/passy/android-lint-summary";
        description = "A pretty printer for Android Lint errors";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27644,7 +26584,6 @@ self: {
          tasty-hunit tasty-quickcheck text time transformers unix
          unordered-containers
        ];
-       homepage = "http://github.com/MichaelXavier/Angel";
        description = "Process management and supervision daemon";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27686,7 +26625,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0csbs9yrl8vhlgs7zax06shqlhcjs38q91wnkz5d3f6a4588lyqi";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "https://github.com/ibotty/animalcase";
        description = "Convert camelCase to snake_case and vice versa";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -27708,7 +26646,6 @@ self: {
          parsec process temporary text
        ];
        testHaskellDepends = [ ansi-terminal-game base hspec parsec ];
-       homepage = "http://www.ariis.it/static/articles/animascii/page.html";
        description = "text-file based ASCII animator";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27726,7 +26663,6 @@ self: {
          aeson base bytestring containers text vector yaml
        ];
        testHaskellDepends = [ aeson base containers hspec vector ];
-       homepage = "https://github.com/jxv/animate#readme";
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27746,7 +26682,6 @@ self: {
          aeson animate base bytestring containers sdl2 sdl2-image StateVar
          text
        ];
-       homepage = "https://github.com/jxv/animate#readme";
        description = "Animation for sprites";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27761,8 +26696,8 @@ self: {
      }:
      mkDerivation {
        pname = "animate-preview";
-       version = "0.1.2.3";
-       sha256 = "0y8j3cmm579wkmswhflkgzlqv05dm5vrdiqxnhsvf4kr6hnaj8im";
+       version = "0.1.2.4";
+       sha256 = "18bl5vwykva5z9w4f53vjfkmqig0cqcwi5zngwqbs37nypp78lyv";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -27773,7 +26708,6 @@ self: {
          sdl2-ttf StateVar text text-conversions vector
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/jxv/animate-preview#readme";
        description = "Preview tool for sprite animation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27786,7 +26720,6 @@ self: {
        version = "0.1.1";
        sha256 = "0wpx0jv2zyphhxi84bw4h1bw6apbazcadfxzzj90ddc3cb5lhv9n";
        libraryHaskellDepends = [ aeson animate base sdl2 sdl2-image ];
-       homepage = "https://github.com/jxv/animate-sdl2#readme";
        description = "sdl2 + animate auxiliary library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27843,7 +26776,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "00f0pyf2fxdvwwz9bz3mpp7db39p1m83frvlif74kp0y1x8r20yp";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/Shou/annihilator#readme";
        description = "Semigroups with annihilators and utility functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27857,7 +26789,6 @@ self: {
        revision = "1";
        editedCabalFile = "138k24qxvl90l7dwdw1b3w36mpw93n0xi0nljblqg88pxg7jcvjx";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/david-christiansen/annotated-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer, with annotation support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27869,7 +26800,6 @@ self: {
        version = "0.6.0.0";
        sha256 = "1bf27vzv21wi634vridxm2mvfjp3wwfwv50pcbdpzscwn4yc3if7";
        libraryHaskellDepends = [ base lens template-haskell ];
-       homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "Anonymous sum types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27882,7 +26812,6 @@ self: {
        version = "0.4.0.0";
        sha256 = "0a7f7d3xzn8nl9gyzr4wl7m83aszmw42nd0dj8b875khh7i01h0b";
        libraryHaskellDepends = [ anonymous-sums base QuickCheck ];
-       homepage = "http://www.github.com/massysett/anonymous-sums";
        description = "QuickCheck functions to accompany the anonymous-sums package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27895,7 +26824,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "1aj7p937c48laz5kkhil45lgkjiivcidky6vxxp3q5yvkymsijvb";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/joegesualdo/ansi-escape-codes";
        description = "Haskell package to generate ANSI escape codes for styling strings in the terminal";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -27916,7 +26844,6 @@ self: {
          nats scientific semigroups tagged text time unordered-containers
          vector
        ];
-       homepage = "https://github.com/futurice/haskell-ansi-pretty#readme";
        description = "AnsiPretty for ansi-wl-pprint";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27930,7 +26857,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour ];
-       homepage = "https://github.com/feuerbach/ansi-terminal";
        description = "Simple ANSI terminal support, with Windows compatibility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27950,7 +26876,6 @@ self: {
          terminal-size timers-tick
        ];
        testHaskellDepends = [ array base hspec linebreak ];
-       homepage = "none-yet";
        description = "sdl-like functions for terminal applications, based on ansi-terminal";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -27965,7 +26890,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base ];
-       homepage = "http://github.com/ekmett/ansi-wl-pprint";
        description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -27978,7 +26902,6 @@ self: {
        sha256 = "03ks75ik0jyfz55iz3gcccxgg73v1dw2nn0myl40c2rc31mwz39f";
        libraryHaskellDepends = [ ansi-terminal base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/BlackBrane/ansigraph";
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -28002,7 +26925,6 @@ self: {
          antisplice base chatty chatty-utils ironforge mtl shakespeare text
          time time-locale-compat yesod yesod-auth
        ];
-       homepage = "http://doomanddarkness.eu/pub/antisplice";
        description = "A web interface to Antisplice dungeons";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28026,7 +26948,6 @@ self: {
          base HUnit minimorph test-framework test-framework-hunit text
          transformers
        ];
-       homepage = "http://hub.darcs.net/kowey/antfarm";
        description = "Referring expressions for definitions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28069,7 +26990,6 @@ self: {
          base bytestring data-default deepseq exceptions failure http-client
          http-conduit resourcet safe text transformers
        ];
-       homepage = "https://github.com/exbb2/antigate";
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28098,7 +27018,6 @@ self: {
        sha256 = "0ar9khd2mz1q7r52i90im5223inl3zywbl9n60ydzf93q9z4b2wf";
        libraryHaskellDepends = [ base primes ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/wokibe/antiprimes#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28126,7 +27045,6 @@ self: {
          base chatty chatty-utils haskeline mtl template-haskell text time
          transformers
        ];
-       homepage = "http://doomanddarkness.eu/pub/antisplice";
        description = "An engine for text-based dungeons";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28148,7 +27066,6 @@ self: {
        executableHaskellDepends = [
          base bytestring enumerator haskell98 regex-posix
        ];
-       homepage = "https://github.com/markwright/antlrc";
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28165,7 +27082,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers MissingH mtl ];
-       homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28199,7 +27115,6 @@ self: {
        version = "0.3";
        sha256 = "16hh3ava0qc8w2y04a8gdh2qfxclh2mhim9zv17d16wlx9dq9qgs";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/cmc-msu-ai/ap-reflect";
        description = "Partial evaluation reflection a la simple-reflect";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28226,7 +27141,6 @@ self: {
          base bytestring criterion deepseq MonadRandom
        ];
        benchmarkSystemDepends = [ openssl ];
-       homepage = "https://github.com/trskop/apache-md5";
        description = "Apache specific MD5 digest algorighm";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
@@ -28244,7 +27158,6 @@ self: {
        ];
        testHaskellDepends = [ base containers QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion linear ];
-       homepage = "https://github.com/jonascarpay/apecs#readme";
        description = "A fast ECS for game engine programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28262,7 +27175,6 @@ self: {
        ];
        testHaskellDepends = [ base containers QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion linear ];
-       homepage = "https://github.com/jonascarpay/apecs#readme";
        description = "A fast ECS for game engine programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28285,7 +27197,6 @@ self: {
          gtk HTTP mtl network process transformers tremulous-query
          xdg-basedir
        ];
-       homepage = "http://ojeling.net/apelsin";
        description = "Server and community browser for the game Tremulous";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28308,7 +27219,6 @@ self: {
          aeson base bytestring Cabal containers hspec http-client text
          transformers
        ];
-       homepage = "https://github.com/intolerable/api-builder";
        description = "Library for easily building REST API wrappers in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28326,7 +27236,6 @@ self: {
          aeson base lens split template-haskell text
        ];
        testHaskellDepends = [ aeson base HUnit lens ];
-       homepage = "https://github.com/nakaji-dayo/api-field-json-th";
        description = "option of aeson's deriveJSON";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28381,7 +27290,6 @@ self: {
          tasty-quickcheck template-haskell text time unordered-containers
          vector
        ];
-       homepage = "http://github.com/iconnect/api-tools";
        description = "DSL for generating API boilerplate and docs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28415,7 +27323,6 @@ self: {
          aeson base bytestring directory http-types HUnit mtl tasty
          tasty-hunit tasty-quickcheck wai wai-extra
        ];
-       homepage = "https://github.com/winterland1989/apiary";
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28436,7 +27343,6 @@ self: {
          cereal data-default-class http-client http-client-tls http-types
          monad-control resourcet text wai
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "authenticate support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28455,7 +27361,6 @@ self: {
          apiary apiary-cookie apiary-session base bytestring cereal
          clientsession data-default-class time unix-compat vault
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "clientsession support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28472,7 +27377,6 @@ self: {
        libraryHaskellDepends = [
          apiary base blaze-builder blaze-html bytestring cookie time wai
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "Cookie support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28485,7 +27389,6 @@ self: {
        version = "1.5.1";
        sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm";
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
-       homepage = "https://github.com/philopon/apiary";
        description = "eventsource support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28506,7 +27409,6 @@ self: {
          apiary base bytestring data-default-class helics helics-wai
          monad-control text transformers types-compat vault wai
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "helics support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28524,7 +27426,6 @@ self: {
          apiary base bytestring bytestring-builder http-client http-types
          text transformers wai
        ];
-       homepage = "https://github.com/winterland1989/apiary-http-client";
        description = "A http client for Apiary";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28543,7 +27444,6 @@ self: {
          apiary base data-default-class fast-logger lifted-base
          monad-control monad-logger transformers transformers-base
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "fast-logger support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28563,7 +27463,6 @@ self: {
          apiary base bytestring data-default-class memcached-binary
          monad-control text transformers types-compat
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "memcached client for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28582,7 +27481,6 @@ self: {
          apiary base bson data-default-class lifted-base monad-control
          mongoDB resource-pool text time transformers
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "mongoDB support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28601,7 +27499,6 @@ self: {
          apiary apiary-logger base monad-control monad-logger persistent
          resource-pool resourcet transformers transformers-base
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "persistent support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28622,7 +27519,6 @@ self: {
          apiary base bytestring data-default-class filepath Glob parsec
          purescript text transformers types-compat unordered-containers
        ];
-       homepage = "https://github.com/philopon/apiary";
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28635,7 +27531,6 @@ self: {
        version = "1.5.1";
        sha256 = "0b9m165qs7nd9iisbkkx0vpdkv37bh0vvrwq769bjc2k8qkqspwl";
        libraryHaskellDepends = [ apiary base hedis transformers ];
-       homepage = "https://github.com/philopon/apiary";
        description = "redis support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28648,7 +27543,6 @@ self: {
        version = "1.5.0";
        sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4";
        libraryHaskellDepends = [ apiary base wai ];
-       homepage = "https://github.com/philopon/apiary";
        description = "session support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28661,7 +27555,6 @@ self: {
        version = "1.5.0";
        sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw";
        libraryHaskellDepends = [ apiary base wai-websockets websockets ];
-       homepage = "https://github.com/philopon/apiary";
        description = "websockets support for apiary web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28675,7 +27568,6 @@ self: {
        sha256 = "0siwf22fvqhq0gx9spj7sfqp0sw90s19szrlhr3sdhvlxs110mhm";
        libraryHaskellDepends = [ aeson base bytestring lens wreq ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/kberger/anapioficeandfire-haskell#readme";
        description = "Consumer library for anapioficeandfire.com";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28696,7 +27588,6 @@ self: {
          template-haskell text th-lift time transformers
          unordered-containers utf8-string yql
        ];
-       homepage = "https://github.com/fabianbergmark/APIs";
        description = "A Template Haskell library for generating type safe API calls";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28726,7 +27617,6 @@ self: {
          mmorph mtl network stm stm-chans stm-conduit text time tls x509
          x509-store x509-system x509-validation
        ];
-       homepage = "https://github.com/ConferHealth/apns-http2#readme";
        description = "Apple Push Notification service HTTP/2 integration";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28757,7 +27647,6 @@ self: {
          openpgp-crypto-api scotty strict tar text transformers wai-extra
          wai-middleware-static zlib
        ];
-       homepage = "https://github.com/pyr/apotiki";
        description = "a faster debian repository";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28773,7 +27662,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion deepseq lens mtl
        ];
-       homepage = "https://bitbucket.org/kztk/app-lens";
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28793,7 +27681,6 @@ self: {
        testHaskellDepends = [
          base containers directory hspec HUnit mtl parsec text
        ];
-       homepage = "https://github.com/emmanueltouzery/app-settings";
        description = "A library to manage application settings (INI file-like)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28842,7 +27729,6 @@ self: {
        version = "0.1.8";
        sha256 = "1svsf8mvb816nksg1dh4dz3cms2zx2hjprz2z7h3zidpxmzs0pr8";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/chriseidhof/applicative-extras/";
        description = "Instances for Applicative";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28861,7 +27747,6 @@ self: {
        testHaskellDepends = [
          base checkers mtl QuickCheck tasty tasty-quickcheck
        ];
-       homepage = "https://bitbucket.org/s9gf4ult/applicative-fail";
        description = "Applicative functor and monad which collects all your fails";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28874,7 +27759,6 @@ self: {
        version = "0.1.3";
        sha256 = "0rnjl7yz6nga4qi0jdvhf911yf1qk6gy2fm5236bsgc50d5wbaw0";
        libraryHaskellDepends = [ base ];
-       homepage = "http://haskell.org/haskellwiki/applicative-numbers";
        description = "Applicative-based numeric instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -28891,7 +27775,6 @@ self: {
        testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://www.github.com/ktvoelker/AParsec";
        description = "An applicative parser combinator library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -28921,7 +27804,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta mtl syb template-haskell
        ];
-       homepage = "https://github.com/takano-akio/applicative-splice";
        description = "Write applicative programs in direct style (generalizes idiom brackets)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29029,7 +27911,6 @@ self: {
        version = "0.0.0.2";
        sha256 = "0azqr4c1zz19rba2gg2w31w38jslvjxgi1qh58qx60fvzxj9ab9m";
        libraryHaskellDepends = [ base containers utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/apportionment";
        description = "Round a set of numbers while maintaining its sum";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29060,7 +27941,6 @@ self: {
          base HUnit ieee754 mersenne-random-pure64 monad-mersenne-random mtl
          test-framework test-framework-hunit vector
        ];
-       homepage = "http://github.com/danieldk/approx-rand-test";
        description = "Approximate randomization test";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29084,7 +27964,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath semigroups simple-reflect
        ];
-       homepage = "http://github.com/analytics/approximate/";
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29097,7 +27976,6 @@ self: {
        version = "1.1.0.2";
        sha256 = "0pxvyb5a6vh0isba81flv7wjlwfn091xrma7g6wzr08bvqmix883";
        libraryHaskellDepends = [ base type-level-natural-number ];
-       homepage = "http://github.com/gcross/approximate-equality";
        description = "Newtype wrappers for approximate equality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29112,7 +27990,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/nh2/ar-timestamp-wiper";
        description = "Wipes time stamps from .a files (like ar -D)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -29136,7 +28013,6 @@ self: {
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck vector
        ];
-       homepage = "https://github.com/ian-ross/arb-fft";
        description = "Pure Haskell arbitrary length FFT library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29154,7 +28030,6 @@ self: {
          base bytestring cereal containers directory mtl pretty
        ];
        librarySystemDepends = [ arbb_dev ];
-       homepage = "https://github.com/svenssonjoel/arbb-vm/wiki";
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29185,7 +28060,6 @@ self: {
          pcre-light process-extras tasty tasty-golden tasty-hunit time
          transformers unix utf8-string
        ];
-       homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29201,7 +28075,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base parsec parsec-numeric ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/nbrk/arcgrid";
        description = "Parse ESRI/ArcInfo (ArcGrid) raster GIS files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29217,7 +28090,6 @@ self: {
        executableHaskellDepends = [
          arcgrid base bytestring gloss transformers
        ];
-       homepage = "https://github.com/nbrk/arcgrid-viewer";
        description = "Simple viewer for ESRI/ArcInfo (ArcGrid) geospatial data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29275,7 +28147,6 @@ self: {
        libraryHaskellDepends = [
          base Cabal containers directory filepath pretty
        ];
-       homepage = "http://github.com/archhaskell/";
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29302,7 +28173,6 @@ self: {
          json old-time parallel pretty prettyclass process
          strict-concurrency xhtml
        ];
-       homepage = "http://code.haskell.org/~dons/code/archlinux";
        description = "Website maintenance for Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29319,7 +28189,6 @@ self: {
        executableHaskellDepends = [
          base containers download-curl feed tagsoup
        ];
-       homepage = "http://archhaskell.wordpress.com/";
        description = "Convert Arch Linux package updates in RSS to pretty markdown";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29362,7 +28231,6 @@ self: {
          base binary bytestring bytestring-lexing bytestring-show old-locale
          time
        ];
-       homepage = "http://code.haskell.org/~StefanKersten/code/arff";
        description = "Generate Attribute-Relation File Format (ARFF) files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29377,7 +28245,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory wx ];
-       homepage = "https://wiki.haskell.org/Argh!";
        description = "An interpreter for the Argh! programming language in wxHaskell";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29405,7 +28272,6 @@ self: {
          aeson ansi-terminal base filepath ghc hlint hspec pipes pipes-safe
          QuickCheck
        ];
-       homepage = "http://github.com/rubik/argon";
        description = "Measure your code's complexity";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29482,7 +28348,6 @@ self: {
          base bert containers directory filepath haskell-src-exts tasty
          tasty-hunit utf8-string
        ];
-       homepage = "https://github.com/feuerbach/ariadne";
        description = "Go-to-definition for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29507,7 +28372,6 @@ self: {
          base containers directory filemanip fsnotify hspec process
          regex-posix safe split system-filepath text time
        ];
-       homepage = "http://github.com/karun012/arion";
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29529,7 +28393,6 @@ self: {
          arithmoi array base binary Cabal containers fgl hashable HUnit-Plus
          unordered-containers
        ];
-       homepage = "https://github.com/emc2/arith-encode";
        description = "A practical arithmetic encoding (aka Godel numbering) library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29597,7 +28460,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion integer-logarithms random
        ];
-       homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -29626,7 +28488,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers gauge integer-logarithms random vector
        ];
-       homepage = "https://github.com/cartazio/arithmoi";
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29660,7 +28521,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers directory hspec HUnit lens text
        ];
-       homepage = "https://github.com/mightybyte/armor";
        description = "Armor data structures against serialization backwards compatibility problems";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29675,7 +28535,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/sfischer13/haskell-arpa";
        description = "Library for reading ARPA n-gram models";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29791,7 +28650,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0v3ab3h3rg38dvmyqqfsysgfpib8i81s87wr965cf7lxhfx3lg61";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/louispan/arrow-extras#readme";
        description = "Extra functions for Control.Arrow";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29806,7 +28664,6 @@ self: {
        libraryHaskellDepends = [
          arrows base pointed profunctors semigroupoids
        ];
-       homepage = "https://github.com/prophile/arrow-improve/";
        description = "Improved arrows";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29819,7 +28676,6 @@ self: {
        version = "0.7";
        sha256 = "1n6m77hdkpjd12r0b8fwxiz3jz0j86cplgsk27m2raj86vr3dy1k";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "https://github.com/silkapp/arrow-list";
        description = "List arrows for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29845,7 +28701,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers haskell-src ];
-       homepage = "http://www.haskell.org/arrows/";
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29867,7 +28722,6 @@ self: {
          haskell-src-meta NoHoed template-haskell transformers uniplate
        ];
        executableHaskellDepends = [ base haskell-src-exts NoHoed ];
-       homepage = "https://github.com/pepeiborra/arrowp";
        description = "A preprocessor and quasiquoter for translating arrow notation";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29880,7 +28734,6 @@ self: {
        version = "0.4.4.2";
        sha256 = "02db4byzz8xb4c36y0v867g9kd3a9p04r4cj1np717k20qrwjnpn";
        libraryHaskellDepends = [ base Stream ];
-       homepage = "http://www.haskell.org/arrows/";
        description = "Arrow classes and transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29894,7 +28747,6 @@ self: {
        libraryHaskellDepends = [
          base containers profunctors transformers
        ];
-       homepage = "https://github.com/fumieval/artery";
        description = "A simple, arrow-based reactive programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29919,7 +28771,6 @@ self: {
          attoparsec base blaze-builder bytestring bytestring-nums containers
          file-embed hashable parsec process shell-escape template-haskell
        ];
-       homepage = "http://github.com/solidsnack/arx/";
        description = "Archive execution tool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29933,7 +28784,6 @@ self: {
        revision = "1";
        editedCabalFile = "19xdrsrcg29c7ncy0gnxbk4zbnyb53j1kk9sys6j8h1l03k12qvl";
        libraryHaskellDepends = [ base parsec split tagsoup ];
-       homepage = "http://github.com/toschoo/Haskell-Libs";
        description = "A client for the Arxiv API";
        license = "LGPL";
      }) {};
@@ -29960,7 +28810,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder bytestring case-insensitive hashable text
        ];
-       homepage = "https://github.com/snoyberg/ascii";
        description = "Type-safe, bytestring-based ASCII values. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -29977,7 +28826,6 @@ self: {
        libraryHaskellDepends = [ base comonad ];
        executableHaskellDepends = [ base strict ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/fmthoma/ascii-art-to-unicode#readme";
        description = "ASCII Art to Unicode Box Drawing converter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -29989,7 +28837,6 @@ self: {
        version = "0.0.2.0";
        sha256 = "0ddnjsqmaqrs2kxys32zqpmvkyway4dqj35x2q3gqxmsir3qg8zq";
        libraryHaskellDepends = [ base random-extras random-fu text ];
-       homepage = "http://github.com/passy/cows-hs";
        description = "A collection of ASCII cows. Moo.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30004,7 +28851,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/danchoi/ascii-flatten";
        description = "Flattens European non-ASCII characaters into ASCII";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30026,7 +28872,6 @@ self: {
        testHaskellDepends = [
          async base concurrent-output data-default hspec QuickCheck time
        ];
-       homepage = "https://github.com/yamadapc/haskell-ascii-progress";
        description = "A simple progress bar for the console";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -30043,7 +28888,6 @@ self: {
          aeson base containers dlist hashable text unordered-containers
          vector wl-pprint-extras
        ];
-       homepage = "https://github.com/Sentenai/ascii-table#readme";
        description = "ASCII table";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30117,7 +28961,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ asil base bytestring utf8-string ];
-       homepage = "http://www.pros.upv.es/fittest/";
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30137,7 +28980,6 @@ self: {
          directory filepath haskell-src-exts mtl pretty utf8-string uuagc
          zip-archive zlib
        ];
-       homepage = "http://www.pros.upv.es/fittest/";
        description = "Action Script Instrumentation Library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30161,7 +29003,6 @@ self: {
          aeson base base16-bytestring bytestring directory HUnit
          test-framework test-framework-hunit text vector
        ];
-       homepage = "https://github.com/andrewthad/asn1-codec";
        description = "Encode and decode ASN.1";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30179,7 +29020,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
-       homepage = "https://github.com/vincenthz/hs-asn1/tree/master/data";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30197,7 +29037,6 @@ self: {
          asn1-types base bytestring hourglass mtl tasty tasty-quickcheck
          text
        ];
-       homepage = "http://github.com/vincenthz/hs-asn1";
        description = "ASN1 data reader and writer in RAW, BER and DER forms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30211,7 +29050,6 @@ self: {
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring
        ];
-       homepage = "https://github.com/vincenthz/hs-asn1";
        description = "Simple monadic parser for ASN1 stream types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30223,7 +29061,6 @@ self: {
        version = "0.3.2";
        sha256 = "05vjchyqiy9n275cygffhn0ma7fz7jx52j0dcdm9qm8h9bziymqc";
        libraryHaskellDepends = [ base bytestring hourglass memory ];
-       homepage = "http://github.com/vincenthz/hs-asn1-types";
        description = "ASN.1 types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30241,7 +29078,6 @@ self: {
        executableHaskellDepends = [
          asn1-encoding asn1-types base bytestring pem
        ];
-       homepage = "http://github.com/vincenthz/hs-asn1dump";
        description = "Dump ASN1 structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30285,7 +29121,6 @@ self: {
        testHaskellDepends = [
          base bytestring Cabal directory filepath system-posix-redirect
        ];
-       homepage = "https://github.com/liyang/assert";
        description = "Helpers for Control.Exception.assert";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30299,7 +29134,6 @@ self: {
        sha256 = "17aapnal893awjwfjw8lfk1n688sfkpckpvfb0rnjkvvabyid57n";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base pretty-show text ];
-       homepage = "https://github.com/Mikolaj/assert-failure";
        description = "Syntactic sugar improving 'assert' and 'error'";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30326,7 +29160,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0fdl3dgnc5q9mv8w5g3qrhyprqhbyp4jrr5gimf9xzd67fwsnf86";
        libraryHaskellDepends = [ base Cabal directory filepath ];
-       homepage = "https://github.com/deech/asset-bundle#readme";
        description = "A build-time Cabal library that bundles executables with assets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30355,7 +29188,6 @@ self: {
        editedCabalFile = "0lj9g3vhlx42hsirxcwfjksy5w6981gpyms7r5xpih7bnz91cxk7";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mouri111/ast-monad#readme";
        description = "A library for constructing AST by using do-notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30370,7 +29202,6 @@ self: {
        editedCabalFile = "0cbayikyr96vcn10253gkwgk0mvx6inymrldv0bhzp8qiv94sm3n";
        libraryHaskellDepends = [ ast-monad base text ];
        testHaskellDepends = [ ast-monad base hspec text ];
-       homepage = "https://github.com/mouri111/ast-monad-json#readme";
        description = "A library for writing JSON";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30384,7 +29215,6 @@ self: {
        libraryHaskellDepends = [
          base hashable psqueues unordered-containers
        ];
-       homepage = "https://github.com/weissi/astar";
        description = "General A* search algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30422,7 +29252,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 time
        ];
-       homepage = "https://github.com/alexander-ignatyev/astro";
        description = "Amateur astronomical computations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30471,7 +29300,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/simonmar/async";
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30490,7 +29318,6 @@ self: {
        testHaskellDepends = [
          base HUnit stm test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/simonmar/async";
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30503,7 +29330,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "012j2kbf4829g4xzbzc1vqb9ybhr05v4zlipvhcn4pqmfb3vgshi";
        libraryHaskellDepends = [ async base ghcjs-ajax text ];
-       homepage = "https://github.com/agrafix/ghcjs-ajax#readme";
        description = "Crossbrowser async AJAX Bindings for GHCJS";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -30524,7 +29350,6 @@ self: {
          base hedgehog HUnit safe-exceptions tasty tasty-discover
          tasty-hedgehog tasty-hunit universum
        ];
-       homepage = "https://github.com/serokell/async-combinators";
        description = "Async combinators";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30542,7 +29367,6 @@ self: {
        testHaskellDepends = [
          base concurrency dejafu HUnit hunit-dejafu
        ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "Run MonadConc operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30555,7 +29379,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0hyc27mphjpc7m9khs47ch0q6j6hy2hmibk82vzrfmc3rfjxa1hd";
        libraryHaskellDepends = [ async base deepseq split ];
-       homepage = "https://github.com/agrafix/async-extra#readme";
        description = "Useful concurrent combinators";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -30572,7 +29395,6 @@ self: {
          async base lifted-async lifted-base monad-control SafeSemaphore stm
          transformers-base
        ];
-       homepage = "http://github.com/jfischoff/async-extras";
        description = "Extra Utilities for the Async Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30584,7 +29406,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "0sksphy0i46w83kw3fhksiyhz9nn337d4xc3ppihdksi79a6ncph";
        libraryHaskellDepends = [ async base retry transformers ];
-       homepage = "https://github.com/mankyKitty/async-io-either#readme";
        description = "Could be useful";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30599,7 +29420,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ async base stm unordered-containers ];
        executableHaskellDepends = [ async base stm unordered-containers ];
-       homepage = "http://github.com/jfischoff/async-manager";
        description = "A thread manager for async";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30644,7 +29464,6 @@ self: {
          base criterion HUnit monad-logger stm test-framework
          test-framework-hunit text
        ];
-       homepage = "https://github.com/mtesseract/async-refresh";
        description = "Package implementing core logic for refreshing of expiring data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30667,7 +29486,6 @@ self: {
          base criterion HUnit monad-logger stm test-framework
          test-framework-hunit text
        ];
-       homepage = "https://github.com/mtesseract/async-refresh";
        description = "Package implementing core logic for refreshing of expiring data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30691,7 +29509,6 @@ self: {
          base criterion HUnit monad-logger stm test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/mtesseract/async-refresh-tokens#readme";
        description = "Package implementing core logic for refreshing of expiring access tokens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30714,7 +29531,6 @@ self: {
          base criterion HUnit monad-logger test-framework
          test-framework-hunit unliftio
        ];
-       homepage = "https://github.com/mtesseract/async-refresh-tokens#readme";
        description = "Package implementing core logic for refreshing of expiring access tokens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30737,7 +29553,6 @@ self: {
          base containers criterion HUnit lifted-async test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/mtesseract/async-timer#readme";
        description = "Provides API for timer based execution of IO actions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30756,7 +29571,6 @@ self: {
        testHaskellDepends = [
          async base containers criterion tasty tasty-hunit
        ];
-       homepage = "https://github.com/mtesseract/async-timer#readme";
        description = "Provides API for timer based execution of IO actions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30769,7 +29583,6 @@ self: {
        version = "1.1.0.1";
        sha256 = "0vfx2ikw61sic35n4ayy7rng6izpafksz7lh4xgkcmbg627vkm8s";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/feuerbach/asynchronous-exceptions";
        description = "Distinguish between synchronous and asynchronous exceptions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30782,7 +29595,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "02aajiirz68wqyrcigfb4cym7j43cf3p0dn4awcw8simnqhfaskh";
        libraryHaskellDepends = [ array base containers ghc-prim ];
-       homepage = "https://svn-agbkb.informatik.uni-bremen.de/Hets/trunk/atermlib";
        description = "serialisation for Haskell values with sharing support";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30798,7 +29610,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ aterm base mtl transformers wl-pprint ];
        executableHaskellDepends = [ aterm base transformers wl-pprint ];
-       homepage = "https://github.com/GaloisInc/aterm-utils";
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30836,7 +29647,6 @@ self: {
          snap-core split text time time-units transformers
        ];
        libraryPkgconfigDepends = [ zlib ];
-       homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core";
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30923,7 +29733,6 @@ self: {
          http-types lifted-base monad-control monad-logger mtl parsec
          QuickCheck resourcet text time transformers
        ];
-       homepage = "http://github.com/ynishi/atndapi#readme";
        description = "An interface of ATND API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -30936,7 +29745,6 @@ self: {
        version = "1.0.13";
        sha256 = "111lz39q12rvh2iigxakcnf2firxgbgm462id805n3z7rmg8f807";
        libraryHaskellDepends = [ base bimap containers mtl process syb ];
-       homepage = "http://tomahawkins.org";
        description = "An EDSL for embedded hard realtime applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -30990,7 +29798,6 @@ self: {
        version = "0.5.3";
        sha256 = "02h1g35f3bd3cjjhr28g63vk1mnghshq9586wa922rfl79jp6jcs";
        libraryHaskellDepends = [ atom base mtl ];
-       homepage = "https://github.com/eightyeight/atom-msp430";
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31007,7 +29814,6 @@ self: {
        libraryHaskellDepends = [
          base directory filelock filepath io-string-like
        ];
-       homepage = "https://github.com/clintonmead/atomic-file-ops#readme";
        description = "Functions to atomically write to files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31019,7 +29825,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0kkfbm7jkarzj42ja7093i1j1h4klg362pfz1cvldvdhzjgs009r";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/chris-martin/atomic-modify";
        description = "A typeclass for mutable references that have an atomic modify operation";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -31031,7 +29836,6 @@ self: {
        version = "0.8.2";
        sha256 = "0cyr2x6xqz6s233znrz9rnrfj56m9bmnawwnka0lsqqy1hp8gy37";
        libraryHaskellDepends = [ base ghc-prim primitive ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "A safe approach to CAS and other atomic ops in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31050,7 +29854,6 @@ self: {
        testHaskellDepends = [
          base bits-atomic HUnit test-framework test-framework-hunit time
        ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31083,7 +29886,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory filepath hspec temporary text unix-compat
        ];
-       homepage = "https://github.com/stackbuilders/atomic-write";
        description = "Atomically write to a file";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31109,7 +29911,6 @@ self: {
          haskeline hint mtl parsec pretty regex-pcre template-haskell text
          time vector
        ];
-       homepage = "http://atomo-lang.org/";
        description = "A highly dynamic, extremely simple, very fun programming language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31128,7 +29929,6 @@ self: {
          template-haskell time
        ];
        testHaskellDepends = [ base containers HUnit time ];
-       homepage = "https://github.com/seereason/atp-haskell";
        description = "Translation from Ocaml to Haskell of John Harrison's ATP code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31141,7 +29941,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0rlv4ikz8k1yjwnqq6yrk1cf4dv9y8jw5i1qaa9m7k6sya2dy6ci";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/aphorisme/atrans";
        description = "A small collection of monad (transformer) instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31153,8 +29952,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.2.0.27";
-       sha256 = "11ln9nkdn5f8fklpddhypf02nkp8ya47kpfg4dbw86wk3h37862z";
+       version = "0.2.0.28";
+       sha256 = "0s538j8v0n8sdfi9pbykk2avbi3vg35iw2c9h6vmiyy3zszflqc4";
        isLibrary = false;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -31177,10 +29976,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.10.1.8";
-       sha256 = "1i6dm3w5qw5xbhlzlazbp6klr31j4qajyqdwdq5r38scascdhjbq";
-       revision = "1";
-       editedCabalFile = "1j2dyw224gspfi7s1c316ip196c8kxx1vzpxxkkbx18bw9s72fa6";
+       version = "2.10.2.0";
+       sha256 = "04pclxd3wx582fx6l6fj7ggs52f0vvdag4rg17zh6xh562qbccsc";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -31196,7 +29993,6 @@ self: {
          base composition-prelude directory microlens optparse-applicative
          parallel-io shake shake-ats temporary text
        ];
-       homepage = "https://github.com/vmchale/atspkg#readme";
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31245,7 +30041,6 @@ self: {
        version = "0.4.0.1";
        sha256 = "1gvq04ds62kk88r2210mxd1fggp6vf5p8j5hci9vqkkss1hy9rxh";
        libraryHaskellDepends = [ base failure ];
-       homepage = "http://github.com/snoyberg/attempt/tree/master";
        description = "Concrete data type for handling extensible exceptions as failures. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31265,7 +30060,6 @@ self: {
          time turtle
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/passy/attic-schedule#readme";
        description = "A script I use to run \"attic\" for my backups";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31288,7 +30082,6 @@ self: {
          attoparsec base bytestring HUnit test-framework
          test-framework-hunit text
        ];
-       homepage = "http://github.com/nominolo/atto-lisp";
        description = "Efficient parsing and serialisation of S-Expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31339,7 +30132,6 @@ self: {
          directory filepath ghc-prim http-types parsec scientific text
          transformers unordered-containers vector
        ];
-       homepage = "https://github.com/bos/attoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31362,7 +30154,6 @@ self: {
        version = "0.0.0";
        sha256 = "1rvkc7kaya42a8djkyj642r5dq952gwkhinif9r22ijaic656cq8";
        libraryHaskellDepends = [ attoparsec base bytestring text word8 ];
-       homepage = "https://github.com/athanclark/attoparsec-base64#readme";
        description = "Fetch only base64 characters, erroring in the attoparsec monad on failure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31386,7 +30177,6 @@ self: {
        sha256 = "18xn3nzxfghcd88cana1jw85ijv0ysw3bp36fb6r5wsf6m79z01y";
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Consume attoparsec parsers via conduit. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31398,7 +30188,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0fbzg22shi0i92pndgnqv6v4zfxxd0bh89fbqr3giiavimml7y7p";
        libraryHaskellDepends = [ attoparsec base text ];
-       homepage = "https://github.com/robinbb/attoparsec-csv";
        description = "A parser for CSV files that uses Attoparsec";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31416,7 +30205,6 @@ self: {
          attoparsec attoparsec-time base base-prelude bytestring scientific
          text time
        ];
-       homepage = "https://github.com/nikita-volkov/attoparsec-data";
        description = "Parsers for the standard Haskell data types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31430,7 +30218,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring enumerator text
        ];
-       homepage = "https://john-millikin.com/software/attoparsec-enumerator/";
        description = "Pass input from an enumerator to an Attoparsec parser";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31454,7 +30241,6 @@ self: {
        sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd";
        libraryHaskellDepends = [ attoparsec base ip ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/athanclark/attoparsec-ip#readme";
        description = "Parse IP data types with attoparsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31468,7 +30254,6 @@ self: {
        revision = "1";
        editedCabalFile = "06f7pgmmc8456p3hc1y23kz1y127gfczy7s00wz1rls9g2sm2vi4";
        libraryHaskellDepends = [ attoparsec base base-compat text time ];
-       homepage = "https://github.com/bos/aeson";
        description = "Parsing of ISO 8601 dates, originally from aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31484,7 +30269,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring iteratee transformers
        ];
-       homepage = "http://github.com/gregorycollins";
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31518,7 +30302,6 @@ self: {
        testHaskellDepends = [
          attoparsec base QuickCheck quickcheck-instances text
        ];
-       homepage = "https://github.com/athanclark/attoparsec-path#readme";
        description = "Convenience bindings between path and attoparsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31530,7 +30313,6 @@ self: {
        version = "0.8.5.3";
        sha256 = "1qq42lp1sah80a6lnnafi6pwl61b4w4q4jk1pbb7pg5p06mmk315";
        libraryHaskellDepends = [ array attoparsec base containers text ];
-       homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home";
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31564,7 +30346,6 @@ self: {
        testHaskellDepends = [
          base base-prelude directory doctest filepath
        ];
-       homepage = "https://github.com/nikita-volkov/attoparsec-time";
        description = "Attoparsec parsers of time";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31576,7 +30357,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0lsbl7hhirr13jmn6fc4g5443j73p4rxjgxvv967n5dsp7xrjaa7";
        libraryHaskellDepends = [ attoparsec base transformers ];
-       homepage = "https://github.com/srijs/haskell-attoparsec-trans";
        description = "Interleaved effects for attoparsec parsers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31593,7 +30373,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec attoparsec-ip base bytedump ip strict text vector
        ];
-       homepage = "https://github.com/athanclark/attoparsec-uri#readme";
        description = "URI parser / printer using attoparsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31611,7 +30390,6 @@ self: {
          attoparsec base bytestring bytestring-builder-varword hspec
          QuickCheck
        ];
-       homepage = "https://github.com/concert/hs-varword#readme";
        description = "Variable-length integer decoding for Attoparsec";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -31623,7 +30401,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "01sh8k9n9040xqx1lbn74rcf59j54n5861d9db1y5cdy7qssxyg4";
        libraryHaskellDepends = [ attoparsec base bytestring ];
-       homepage = "http://projects.haskell.org/attosplit";
        description = "Split a lazy bytestring at boundaries defined by an attoparsec parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31641,7 +30418,6 @@ self: {
        executableHaskellDepends = [
          array base Cabal directory epic haskell98
        ];
-       homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31664,7 +30440,6 @@ self: {
          non-empty semigroups storable-record storablevector tagchup
          transformers utility-ht xml-basic
        ];
-       homepage = "http://hub.darcs.net/thielema/audacity";
        description = "Interchange with the Audacity sound signal editor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31685,7 +30460,6 @@ self: {
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
          random template-haskell transformers vector void WAVE
        ];
-       homepage = "https://github.com/fumieval/audiovisual";
        description = "A battery-included audiovisual framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31706,7 +30480,6 @@ self: {
        executableHaskellDepends = [ HUnit ];
        executableSystemDepends = [ augeas ];
        executablePkgconfigDepends = [ augeas ];
-       homepage = "http://trac.haskell.org/augeas";
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31745,7 +30518,6 @@ self: {
        testHaskellDepends = [
          base http-client http-client-tls tasty tasty-hunit
        ];
-       homepage = "https://github.com/fosskers/haskell-aur";
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31763,7 +30535,6 @@ self: {
          aeson base bytestring exceptions hspec http-client http-client-tls
          mtl text
        ];
-       homepage = "https://github.com/wangbj/aur-api";
        description = "ArchLinux AUR json v5 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31785,7 +30556,6 @@ self: {
          tagstream-conduit text transformers unordered-containers
          xml-conduit
        ];
-       homepage = "http://github.com/yesodweb/authenticate";
        description = "Authentication methods for Haskell web applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31797,7 +30567,6 @@ self: {
        version = "1.0.0";
        sha256 = "06k8xi9n44xq63dpmcv4l0vg35y19dk5x1ibyay05w58k4kv4fdq";
        libraryHaskellDepends = [ base process text ];
-       homepage = "http://github.com/yesodweb/authenticate";
        description = "Authentication methods for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31809,7 +30578,6 @@ self: {
        version = "0.0.3";
        sha256 = "1wsx43l7jl40jpzhiv2fjc1mnpsaaryrjpqaiyqsn3ahacsy4ly5";
        libraryHaskellDepends = [ base LDAP text transformers ];
-       homepage = "http://github.com:mlitchard/authenticate-ldap";
        description = "LDAP authentication for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31831,7 +30599,6 @@ self: {
          data-default http-client http-types random RSA SHA time
          transformers transformers-compat
        ];
-       homepage = "http://github.com/yesodweb/authenticate";
        description = "Library to authenticate with OAuth for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31843,7 +30610,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1jv0y4y2ig8dx95xw3zbxc1h9mv3wi3r8xqx00llmf2qs6wgdlp5";
        libraryHaskellDepends = [ attoparsec base network text ];
-       homepage = "http://github.com/robgssp/authinfo-hs";
        description = "Password querying for .authinfo";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31862,7 +30628,6 @@ self: {
          haskell-src-meta HaTeX lens mtl parsers safe template-haskell text
          transformers trifecta
        ];
-       homepage = "http://github.com/nushio3/authoring";
        description = "A library for writing papers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -31881,7 +30646,6 @@ self: {
          base base-orphans bytestring cereal containers deepseq MonadRandom
          profunctors random semigroups transformers
        ];
-       homepage = "https://github.com/mstksg/auto";
        description = "Denotative, locally stateful programming DSL & platform";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31893,7 +30657,6 @@ self: {
        version = "0.1.4";
        sha256 = "09dlh2alsx2mw5kvj931yhbj0aw7jmly2cm9xbscm2sf098w35jy";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/yesodweb/wai";
        description = "Efficiently run periodic, on-demand actions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31908,7 +30671,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ base Cabal directory filepath ];
-       homepage = "https://github.com/tfausak/autoexporter#readme";
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -31924,7 +30686,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring colour ghc-prim gloss JuicyPixels random vector
        ];
-       homepage = "https://qlfiles.net/the-ql-files/next-nearest-neighbors-cellular-automata";
        description = "Generates and displays patterns from next nearest neighbors cellular automata";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32023,7 +30784,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process unix ];
-       homepage = "https://github.com/dagit/autoproc";
        description = "EDSL for Procmail scripts";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -32049,7 +30809,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base JuicyPixels random ];
-       homepage = "http://github.com/keera-studios/avatar-generator";
        description = "A simple random avatar icon generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32114,7 +30873,6 @@ self: {
          aeson avers base bytestring cookie http-api-data servant text time
          vector
        ];
-       homepage = "http://github.com/wereHamster/avers-api";
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32134,7 +30892,6 @@ self: {
          aeson avers avers-api base cookie lens servant servant-swagger
          swagger2 text unordered-containers
        ];
-       homepage = "http://github.com/wereHamster/avers-api-docs";
        description = "Swagger documentation for the Avers API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32158,7 +30915,6 @@ self: {
          servant-server stm text time transformers wai wai-websockets
          websockets
        ];
-       homepage = "http://github.com/wereHamster/avers-server";
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32184,7 +30940,6 @@ self: {
          base directory doctest filepath parsec QuickCheck quickcheck-text
          template-haskell
        ];
-       homepage = "https://github.com/data61/aviation-cessna172-diagrams";
        description = "Diagrams for the Cessna 172 aircraft in aviation";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32216,7 +30971,6 @@ self: {
        version = "0.0.1.2";
        sha256 = "1k2nw0ibxbr8dhw9css6vryqd8p5klfvk5vxz6h9w61z8y32f430";
        libraryHaskellDepends = [ base dependent-sum mtl process shake ];
-       homepage = "https://github.com/mokus0/avr-shake";
        description = "AVR Crosspack actions for shake build systems";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32244,7 +30998,6 @@ self: {
          pure-zlib QuickCheck scientific semigroups tagged template-haskell
          text transformers unordered-containers vector
        ];
-       homepage = "https://github.com/GaloisInc/avro.git#readme";
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32265,7 +31018,6 @@ self: {
          base optparse-applicative pretty-show text
        ];
        testHaskellDepends = [ attoparsec base lens pretty-show text ];
-       homepage = "https://www.hcesperer.org/posts/2016-09-20-avwx.html";
        description = "Parse aviation weather reports";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -32277,7 +31029,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0mvfirb41jnjvq4mpky0xpdrh238hjwslfqg82ksnam001sxnpng";
        libraryHaskellDepends = [ base ];
-       homepage = "https://notabug.org/koz.ross/awesome-prelude";
        description = "A prelude which I can be happy with. Based on base-prelude.";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32357,7 +31108,6 @@ self: {
          quickcheck-instances resourcet tagged tasty tasty-hunit
          tasty-quickcheck text time transformers transformers-base
        ];
-       homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32396,7 +31146,6 @@ self: {
          quickcheck-instances resourcet tagged tasty tasty-hunit
          tasty-quickcheck text time transformers transformers-base
        ];
-       homepage = "http://github.com/aristidb/aws";
        description = "Amazon Web Services (AWS) for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32421,7 +31170,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog neat-interpolation ];
-       homepage = "https://github.com/typeclasses/aws-cloudfront-signed-cookies";
        description = "Generate signed cookies for AWS CloudFront";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -32438,7 +31186,6 @@ self: {
          asn1-encoding asn1-types base base64-bytestring bytestring
          crypto-pubkey-types RSA time
        ];
-       homepage = "http://github.com/iconnect/aws-cloudfront-signer";
        description = "For signing AWS CloudFront HTTP URL requests";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -32476,7 +31223,6 @@ self: {
          aeson attoparsec-trans aws base bytestring conduit containers
          http-conduit http-types json-togo resourcet text transformers
        ];
-       homepage = "https://github.com/srijs/haskell-aws-dynamodb-query";
        description = "Conduit-based interface for AWS DynamoDB";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32523,7 +31269,6 @@ self: {
          amazonka amazonka-dynamodb amazonka-s3 base lens split text
          unordered-containers
        ];
-       homepage = "https://github.com/rcook/aws-easy#readme";
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32554,7 +31299,6 @@ self: {
          aeson aws base bytestring containers optparse-applicative text
          unordered-containers vector yaml
        ];
-       homepage = "https://github.com/memcachier/aws-ec2";
        description = "AWS EC2/VPC, ELB and CloudWatch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32578,7 +31322,6 @@ self: {
        executableHaskellDepends = [
          aeson base io-streams system-filepath turtle
        ];
-       homepage = "http://github.com/bitnomial/aws-ec2-knownhosts";
        description = "Capture and manage AWS EC2 known_host pubkeys";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32602,7 +31345,6 @@ self: {
        testHaskellDepends = [
          aeson base Cabal containers QuickCheck regex-compat safe text
        ];
-       homepage = "http://github.com/iconnect/aws-elastic-transcoder";
        description = "Haskell suite for the Elastic Transcoder service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32629,7 +31371,6 @@ self: {
          either errors http-types parsers QuickCheck quickcheck-instances
          tagged tasty tasty-quickcheck text time transformers
        ];
-       homepage = "https://github.com/alephcloud/hs-aws-general";
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32656,7 +31397,6 @@ self: {
          aeson aws aws-general base bytestring errors mtl QuickCheck tagged
          tasty tasty-quickcheck text transformers
        ];
-       homepage = "https://github.com/alephcloud/hs-aws-kinesis";
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32721,7 +31461,6 @@ self: {
          lifted-base monad-control mtl optparse-applicative resourcet text
          time transformers
        ];
-       homepage = "https://github.com/alephcloud/hs-aws-kinesis-reshard";
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32742,7 +31481,6 @@ self: {
          exceptions filepath http-client http-types lens lens-action
          lens-aeson mtl old-locale text time wreq zip-archive
        ];
-       homepage = "https://github.com/alephcloud/hs-aws-lambda";
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32765,7 +31503,6 @@ self: {
          filepath freer-effects ini lens optparse-applicative optparse-text
          process text time unordered-containers
        ];
-       homepage = "https://github.com/TaktInc/aws-mfa-credentials";
        description = "Keep your AWS credentials file up to date with MFA-carrying credentials";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32792,7 +31529,6 @@ self: {
          errors http-client lens monad-control optparse-applicative
          resourcet statistics text time transformers vector
        ];
-       homepage = "http://github.com/alephcloud/hs-aws-performance-tests";
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32840,7 +31576,6 @@ self: {
          monad-control QuickCheck random resourcet text time tls
          transformers
        ];
-       homepage = "http://worksap-ate.github.com/aws-sdk";
        description = "AWS SDK for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32863,7 +31598,6 @@ self: {
          base bytestring hspec HUnit iproute QuickCheck safe strptime
          template-haskell text time time-locale-compat
        ];
-       homepage = "https://github.com/yunomu/aws-sdk-text-converter";
        description = "The text converter for aws-sdk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32885,7 +31619,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit hspec mtl resourcet text xml-conduit
        ];
-       homepage = "https://github.com/worksap-ate/aws-sdk-xml-unordered";
        description = "The xml parser for aws-sdk package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32906,7 +31639,6 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/jxv/aws-ses-easy#readme";
        description = "Wrapper over Amazonka's SES";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32931,7 +31663,6 @@ self: {
          bytestring-lexing Cabal case-insensitive cryptohash directory
          filepath http-types old-locale safe text time
        ];
-       homepage = "http://github.com/iconnect/aws-sign4";
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32950,7 +31681,6 @@ self: {
          amazonka amazonka-core amazonka-s3 amazonka-sqs base bytestring
          conduit lens mtl resourcet text timespan unordered-containers
        ];
-       homepage = "https://github.com/agrafix/aws-simple#readme";
        description = "Dead simple bindings to commonly used AWS Services";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32975,7 +31705,6 @@ self: {
          aeson aws aws-general base bytestring errors mtl QuickCheck tagged
          tasty tasty-quickcheck text transformers
        ];
-       homepage = "https://github.com/alephcloud/hs-aws-sns";
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -32993,7 +31722,6 @@ self: {
          base bytestring containers directory ghcjs-perch mtl transformers
          transient transient-universe
        ];
-       homepage = "https://github.com/transient-haskell/axiom";
        description = "Web EDSL for running in browsers and server nodes using transient";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -33033,7 +31761,6 @@ self: {
        testHaskellDepends = [
          base Diff directory filepath hspec options process unix
        ];
-       homepage = "http://palovandalo.com/azubi";
        description = "A simple DevOps tool which will never \"reach\" enterprice level";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33052,7 +31779,6 @@ self: {
          attoparsec base bytestring conduit conduit-extra connection
          http-conduit http-types network time
        ];
-       homepage = "https://github.com/kapilash/hs-azure";
        description = "Windows Azure ACS";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33071,7 +31797,6 @@ self: {
          crypto-pubkey-types http-conduit hxt hxt-xpath pretty resourcet tls
          tls-extra transformers
        ];
-       homepage = "github.com/haskell-distributed/azure-service-api";
        description = "Haskell bindings for the Microsoft Azure Service Management API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33090,7 +31815,6 @@ self: {
          aeson async attoparsec azure-acs base bytestring case-insensitive
          conduit connection http-client http-conduit http-types network text
        ];
-       homepage = "https://github.com/kapilash/hs-azure";
        description = "Haskell wrapper over Microsoft Azure ServiceBus REST API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33121,7 +31845,6 @@ self: {
          hxt-unicode network old-locale SHA text time transformers
          unix-compat utf8-string
        ];
-       homepage = "http://arnovanlumig.com/azure";
        description = "A simple library for accessing Azure blob storage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33147,7 +31870,6 @@ self: {
          base binary containers pipes QuickCheck tasty tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion pipes ];
-       homepage = "http://github.com/bgamari/b-tree";
        description = "Immutable disk-based B* trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33180,7 +31902,6 @@ self: {
          aeson base bytestring hspec hspec-expectations QuickCheck text
          unordered-containers vector yaml
        ];
-       homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -33194,7 +31915,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ babl ];
        libraryPkgconfigDepends = [ babl ];
-       homepage = "http://github.com/nek0/babl#readme";
        description = "Haskell bindings to BABL library";
        license = stdenv.lib.licenses.lgpl3;
      }) {inherit (pkgs) babl;};
@@ -33252,31 +31972,28 @@ self: {
          base bifunctors criterion deepseq directory hmatrix lens mnist-idx
          mwc-random time transformers vector
        ];
-       homepage = "https://github.com/mstksg/backprop#readme";
        description = "Heterogeneous automatic differentation (backpropagation)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "backprop_0_2_2_0" = callPackage
-    ({ mkDerivation, base, bifunctors, containers, criterion, deepseq
-     , directory, hmatrix, lens, microlens, mnist-idx, mwc-random
-     , primitive, reflection, time, transformers, type-combinators
-     , vector
+  "backprop_0_2_4_0" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, directory
+     , hmatrix, lens, microlens, mwc-random, primitive, reflection
+     , simple-reflect, time, transformers, type-combinators, vector
      }:
      mkDerivation {
        pname = "backprop";
-       version = "0.2.2.0";
-       sha256 = "029lc57dhvq3hy38vdf6bgfbmkh93xc64gzi7k34y4rm6d1m2y89";
+       version = "0.2.4.0";
+       sha256 = "0l53ixz171nv92wgmrj7zcv458svg3b3zrxn3a8rx5aphb3m9vwc";
        libraryHaskellDepends = [
-         base containers deepseq microlens primitive reflection transformers
-         type-combinators vector
+         base containers deepseq microlens primitive reflection
+         simple-reflect transformers type-combinators vector
        ];
        benchmarkHaskellDepends = [
-         base bifunctors criterion deepseq directory hmatrix lens mnist-idx
-         mwc-random time transformers vector
+         base criterion deepseq directory hmatrix lens mwc-random time
+         vector
        ];
-       homepage = "https://github.com/mstksg/backprop#readme";
-       description = "Heterogeneous automatic differentation (backpropagation)";
+       description = "Heterogeneous automatic differentation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -33293,7 +32010,6 @@ self: {
          base either free kan-extensions mtl semigroupoids semigroups
          transformers
        ];
-       homepage = "https://github.com/tapuu/backtracking-exceptions";
        description = "A monad transformer for backtracking exceptions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33306,7 +32022,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1akxm0v23gnph5jxwi20wq4lk07vd2kpiqns550k499yw95vqyam";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/luqui/backward-state";
        description = "A state monad that runs the state in reverse through the computation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33321,7 +32036,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gd X11 ];
-       homepage = "http://www.dmwit.com/bacteria";
        description = "braindead utility to compose Xinerama backgrounds";
        license = "unknown";
      }) {};
@@ -33367,7 +32081,6 @@ self: {
          smtp-mail sqlite-simple text time transformers unordered-containers
          wai wai-extra warp
        ];
-       homepage = "https://github.com/ndmitchell/bake#readme";
        description = "Continuous integration system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33392,7 +32105,6 @@ self: {
          base bytestring either-unwrap hspec hspec-expectations http-client
          http-client-tls text time
        ];
-       homepage = "https://github.com/alexeyzab/ballast#readme";
        description = "Shipwire API client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33414,7 +32126,6 @@ self: {
          hack hack-contrib haskell98 mps mtl network old-locale old-time
          pandoc parsec parsedate process time unix utf8-string xhtml zlib
        ];
-       homepage = "http://github.com/nfjinjing/bamboo/tree/master";
        description = "A blog engine on Hack";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33436,7 +32147,6 @@ self: {
          bamboo bamboo-theme-blueprint base bytestring data-default hack
          hack-contrib hack-handler-hyena haskell98 mps process
        ];
-       homepage = "http://github.com/nfjinjing/bamboo-launcher";
        description = "bamboo-launcher";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33455,7 +32165,6 @@ self: {
          bamboo base bytestring hack hack-contrib highlighting-kate hxt mps
          xhtml
        ];
-       homepage = "http://github.com/nfjinjing/bamboo-plugin-highlight/";
        description = "A highlight middleware";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33475,7 +32184,6 @@ self: {
          base bytestring data-default directory filepath hack hack-contrib
          haskell98 hxt mps utf8-string xhtml
        ];
-       homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "A photo album middleware";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33495,7 +32203,6 @@ self: {
          bamboo base bytestring containers data-default gravatar hack
          hack-contrib hcheat mps network rss utf8-string xhtml
        ];
-       homepage = "http://github.com/nfjinjing/bamboo-theme-blueprint";
        description = "bamboo blueprint theme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33519,7 +32226,6 @@ self: {
          mps mtl network old-locale old-time parsec parsedate process rss
          time unix utf8-string xhtml yuuko zlib
        ];
-       homepage = "http://github.com/nfjinjing/bamboo-theme-mini-html5";
        description = "bamboo mini html5 theme";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33552,7 +32258,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs samtools ];
-       homepage = "http://blog.malde.org/posts/bamstats.html";
        description = "A program to extract various information from BAM alignmnet files";
        license = "GPL";
      }) {};
@@ -33565,7 +32270,6 @@ self: {
        sha256 = "12s473bjbv5wgsxwi5vf6ffh9z72dw7fbnih0i9ifry8kim4pgaz";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
-       homepage = "https://github.com/tippenein/BankHoliday";
        description = "A library for determining US bank holidays";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33579,11 +32283,23 @@ self: {
        sha256 = "1arlyjaaq8df2q121r9lc23wacn02ncdx5b7s8yszp6szx5jivap";
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers hspec QuickCheck time ];
-       homepage = "https://bitbucket.org/davecturner/bank-holidays-england";
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bank-holidays-england_0_1_0_7" = callPackage
+    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
+     mkDerivation {
+       pname = "bank-holidays-england";
+       version = "0.1.0.7";
+       sha256 = "196ldac7aljysw8m4nzdyf5mygswbckkvd6axm8a9yw4vchzcjks";
+       libraryHaskellDepends = [ base containers time ];
+       testHaskellDepends = [ base containers hspec QuickCheck time ];
+       description = "Calculation of bank holidays in England and Wales";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "banwords" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit
      , test-framework, test-framework-hunit, text, vector
@@ -33599,7 +32315,6 @@ self: {
          attoparsec base HUnit test-framework test-framework-hunit text
          vector
        ];
-       homepage = "https://github.com/fanjam/banwords";
        description = "Generalized word blacklister";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33615,7 +32330,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base csv diagrams filepath ];
        executableHaskellDepends = [ base cmdargs csv diagrams filepath ];
-       homepage = "http://sebfisch.github.com/haskell-barchart";
        description = "Creating Bar Charts in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33640,7 +32354,6 @@ self: {
        version = "0.2.0.8";
        sha256 = "0hja4lrgv1faqaq41wzf1r88aw4pin8jh60k9n65yd0sxi1103a7";
        libraryHaskellDepends = [ base containers QuickCheck text time ];
-       homepage = "http://github.com/massysett/barecheck";
        description = "QuickCheck implementations for common types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33674,7 +32387,6 @@ self: {
        version = "0.4.1";
        sha256 = "10iraid6v333374mx9vinvaw6r1903ipa92xjxhl8qh4w7xmr9yv";
        libraryHaskellDepends = [ base containers filepath glib gtk ];
-       homepage = "http://thewhitelion.org/haskell/barrie";
        description = "Declarative Gtk GUI library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33700,7 +32412,6 @@ self: {
        testHaskellDepends = [
          base bytestring lens-family-core tasty tasty-golden
        ];
-       homepage = "https://github.com/philopon/barrier";
        description = "Shields.io style badge generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33785,7 +32496,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base base-compat ];
        doHaddock = false;
-       homepage = "https://github.com/bergmark/base-compat-migrate#readme";
        description = "Helps migrating projects to base-compat(-batteries)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33825,7 +32535,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "19k6kl66p71pza23b1n5njmj97k1pdlcm6brl1danfaxlflsmcms";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/HaskellZhangSong/base-generics";
        description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33838,7 +32547,6 @@ self: {
        version = "0.4.0.0";
        sha256 = "0d0i8ndh2j42qf8ns9wprkjiffy3hyybgvs9nbf67yd50di6p263";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/bheklilr/base-io-access";
        description = "The IO functions included in base delimited into small, composable classes";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33852,7 +32560,6 @@ self: {
        sha256 = "19d1x487kwhc60qjix7xx53dlszbx08rdhxd2zab1pwjw62ws3c8";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
-       homepage = "https://github.com/hvr/base-noprelude";
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -33868,7 +32575,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -33880,7 +32586,6 @@ self: {
        version = "1.2.1";
        sha256 = "1f4s2f454zpcfrb5qi7pdlmljsfyw8zpk0kzs3dngki0ysh0rwq7";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed solely from the \"base\" package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -33892,7 +32597,6 @@ self: {
        version = "0.2.2.4";
        sha256 = "1afc5pchd3vw33bmjbjygkd0l5zh7glbsx4bfyxfscpc1x1l3y52";
        libraryHaskellDepends = [ base ];
-       homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33904,7 +32608,6 @@ self: {
        version = "0.1.1.6";
        sha256 = "0jf40m3yijqw6wd1rwwvviww46fasphaay9m9rgqyhf5aahnbzjs";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
-       homepage = "http://github.com/bos/base16-bytestring";
        description = "Fast base16 (hex) encoding and decoding for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33920,7 +32623,6 @@ self: {
        libraryHaskellDepends = [ base bits-extras bytestring cpu ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33934,7 +32636,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a Base-32 string";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -33953,7 +32654,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://bitbucket.org/s9gf4ult/base58-bytestring";
        description = "Implementation of BASE58 transcoding for ByteStrings";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -33973,7 +32673,6 @@ self: {
          base binary bytestring containers cryptohash QuickCheck
          test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/singpolyma/base58address";
        description = "Parsing and serialization for Base58 addresses (Bitcoin and Ripple)";
        license = "unknown";
      }) {};
@@ -33987,7 +32686,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base binary bytestring text ];
        testHaskellDepends = [ base binary bytestring hspec text ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a Base-58 string";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -34005,7 +32703,6 @@ self: {
          base bytestring containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/bos/base64-bytestring";
        description = "Fast base64 encoding and decoding for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34028,7 +32725,6 @@ self: {
        testHaskellDepends = [
          aeson base binary bytestring cereal tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/futurice/haskell-base64-bytestring-type#readme";
        description = "A newtype around ByteString, for base64 encoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34049,7 +32745,6 @@ self: {
          base base64-bytestring bytestring conduit hspec QuickCheck
          transformers
        ];
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Base64-encode and decode streams of bytes. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34062,7 +32757,6 @@ self: {
        version = "0.2";
        sha256 = "0pkhrimabacsjalzq0y3a197fqfbspsbv8xszzg4vbb1fb59dj1y";
        libraryHaskellDepends = [ base ];
-       homepage = "http://urchin.earth.li/~ian/cabal/base64-string/";
        description = "Base64 implementation for String's";
        license = "unknown";
      }) {};
@@ -34084,7 +32778,6 @@ self: {
        testHaskellDepends = [
          base bytestring mono-traversable QuickCheck text
        ];
-       homepage = "https://github.com/ajg/base91";
        description = "A Generic Base91 Encoder & Decoder";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -34096,7 +32789,6 @@ self: {
        version = "0.0.7";
        sha256 = "0w2g4k9bs2ph00p0fgrmcrng8ypdz6xis0r10g380nzkg2rvj0dm";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/haskell-foundation/foundation";
        description = "Foundation scrap box of array & string";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34109,7 +32801,32 @@ self: {
        sha256 = "131aamd4kq7jdmpl4ammgqgykbh81mkziaf0kpic5c20al4a73lp";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring QuickCheck ];
-       homepage = "https://github.com/FilWisher/basen-bytestring#readme";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "baserock-schema" = callPackage
+    ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors
+     , hspec, mtl, QuickCheck, text, transformers, turtle, yaml
+     }:
+     mkDerivation {
+       pname = "baserock-schema";
+       version = "0.0.1.3";
+       sha256 = "1p6q6g61cbmsl7ppfqcs5jn0z17aya4sqp7gdi4y01msgd81cvcc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         algebraic-graphs base bytestring errors mtl text transformers
+         turtle yaml
+       ];
+       executableHaskellDepends = [
+         algebraic-graphs base bytestring docopt errors mtl text
+         transformers turtle yaml
+       ];
+       testHaskellDepends = [
+         algebraic-graphs base bytestring errors hspec mtl QuickCheck text
+         transformers turtle yaml
+       ];
+       description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -34136,7 +32853,6 @@ self: {
          base binary bytestring containers hxt-regex-xmlschema mtl SHA
          shell-escape
        ];
-       homepage = "http://github.com/solidsnack/bash";
        description = "Bash generation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34147,6 +32863,8 @@ self: {
        pname = "basic";
        version = "0.1.0.0";
        sha256 = "13ikd2pkg2qspkdq0h21wa3clyaj47cm41239024g0sdv8m03bpb";
+       revision = "1";
+       editedCabalFile = "1zdychkb5s1j8hyniz7v527q89ciwj1h33x34ghlqqpm0igai52k";
        libraryHaskellDepends = [
          base stm template-haskell transformers util
        ];
@@ -34188,7 +32906,6 @@ self: {
          base bytestring containers filepath hashable text transformers
          unordered-containers vector
        ];
-       homepage = "https://github.com/snoyberg/basic-prelude#readme";
        description = "An enhanced core prelude; a common foundation for alternate preludes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -34219,7 +32936,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl parsec pretty unix
        ];
-       homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "An interpreter for a small functional language";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34238,7 +32954,6 @@ self: {
          transformers-base
        ];
        testHaskellDepends = [ base hspec stm timespan ];
-       homepage = "https://github.com/agrafix/batch#readme";
        description = "Simplify queuing up data and processing it in batch";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34252,7 +32967,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath Glob ];
-       homepage = "https://github.com/uppet/batch_rename";
        description = "Make Linux or MacOS do things like \"rename *.mp3 *.mp4\"";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -34284,7 +32998,6 @@ self: {
          transformers unix unordered-containers vault wai wai-cors wai-extra
          wai-middleware-static warp x509-store yaml
        ];
-       homepage = "https://github.com/portnov/batchd";
        description = "Batch processing toolset for Linux / Unix";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34299,7 +33012,6 @@ self: {
        libraryHaskellDepends = [
          aeson base containers http-conduit text
        ];
-       homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "API client for Battle.Net";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34314,7 +33026,6 @@ self: {
        libraryHaskellDepends = [
          base battlenet http-conduit text yesod-core
        ];
-       homepage = "https://github.com/teozkr/hs-battlenet/";
        description = "Yesod integration for the battlenet package";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34370,7 +33081,6 @@ self: {
        ];
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://hub.darcs.net/thielema/battleship-combinatorics/";
        description = "Compute number of possible arrangements in the battleship game";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34403,7 +33113,6 @@ self: {
          diagrams-svg filepath MonadRandom mtl transformers
          wai-handler-fastcgi yesod
        ];
-       homepage = "https://github.com/zrho/afp";
        description = "A web-based implementation of battleships including an AI opponent";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34424,7 +33133,6 @@ self: {
          logfloat mtl mwc-random pretty random-fu random-source rvar
          statistics stm transformers vector
        ];
-       homepage = "https://github.com/bgamari/bayes-stack";
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34438,7 +33146,6 @@ self: {
        sha256 = "0p1aphzp55h4zlh3h8xnm6mxvsxyrab98ms8f07iqvp4p267kryw";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
-       homepage = "https://github.com/henrylaxen/bbdb";
        description = "Ability to read, write, and modify BBDB files";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -34512,7 +33219,6 @@ self: {
          listsafe monad-logger mtl parsec parsec-numbers persistent
          persistent-sqlite persistent-template resourcet text time unix
        ];
-       homepage = "https://github.com/weldr/bdcs";
        description = "Tools for managing a content store of software packages";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34531,7 +33237,6 @@ self: {
          base directory HUnit mtl process test-framework
          test-framework-hunit
        ];
-       homepage = "http://github.com/humane-software/haskell-bdd";
        description = "Behavior-Driven Development DSL";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -34543,7 +33248,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "17zapldywid4xq0a6qdxh6hnk5igjjgplfydnr800xdpicicbrww";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/joeyadams/haskell-bytestring-delta";
        description = "Simple, fast binary diff/patch";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -34578,7 +33282,6 @@ self: {
          base conduit containers convertible HDBC HDBC-sqlite3 microlens mtl
          pretty semigroups tagged text time uniplate
        ];
-       homepage = "http://travis.athougies.net/projects/beam.html";
        description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34600,7 +33303,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit text time
        ];
-       homepage = "http://travis.athougies.net/projects/beam.html";
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34622,7 +33324,6 @@ self: {
          pqueue pretty scientific text time unordered-containers uuid-types
          vector
        ];
-       homepage = "https://travis.athougies.net/projects/beam.html";
        description = "SQL DDL support and migrations support library for Beam";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34645,7 +33346,6 @@ self: {
          mtl network-uri postgresql-libpq postgresql-simple scientific
          tagged text time unordered-containers uuid-types vector
        ];
-       homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-postgres";
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34664,7 +33364,24 @@ self: {
          aeson attoparsec base beam-core beam-migrate bytestring dlist free
          hashable mtl network-uri scientific sqlite-simple text time unix
        ];
-       homepage = "http://tathougies.github.io/beam/user-guide/backends/beam-sqlite/";
+       description = "Beam driver for SQLite";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "beam-sqlite_0_3_2_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate
+     , bytestring, dlist, free, hashable, mtl, network-uri, scientific
+     , sqlite-simple, text, time, unix
+     }:
+     mkDerivation {
+       pname = "beam-sqlite";
+       version = "0.3.2.1";
+       sha256 = "1ijgqlywb7gvig32zrhgryq0nkfabyxvxy81c36x9zfpyj36x04k";
+       libraryHaskellDepends = [
+         aeson attoparsec base beam-core beam-migrate bytestring dlist free
+         hashable mtl network-uri scientific sqlite-simple text time unix
+       ];
        description = "Beam driver for SQLite";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34687,7 +33404,6 @@ self: {
          base beam doctest doctest-discover tasty tasty-hunit
          template-haskell text
        ];
-       homepage = "https://github.com/hesiod/beam-th";
        description = "Template Haskell utilities for beam";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34727,7 +33443,6 @@ self: {
        libraryHaskellDepends = [
          base dunai MonadRandom mtl transformers
        ];
-       homepage = "keera.co.uk";
        description = "A replacement of Yampa based on Monadic Stream Functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34741,7 +33456,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base haskell98 mtl ];
-       homepage = "http://www.cs.indiana.edu/~lepike/pub_pages/holpp.html";
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34761,7 +33475,6 @@ self: {
          array base binary deepseq template-haskell
        ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://hackage.haskell.org/package/bed-and-breakfast";
        description = "Efficient Matrix operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34839,7 +33552,6 @@ self: {
          bug iri potoki QuickCheck quickcheck-instances rerebase tasty
          tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/nikita-volkov/belka";
        description = "HTTP client DSL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34858,7 +33570,6 @@ self: {
        executableHaskellDepends = [
          base criterion optparse-applicative process silently text turtle
        ];
-       homepage = "http://github.com/Gabriel439/bench";
        description = "Command-line benchmark tool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34876,7 +33587,6 @@ self: {
          transformers Unique
        ];
        testHaskellDepends = [ base split text ];
-       homepage = "https://github.com/composewell/bench-graph";
        description = "Plot and compare benchmarks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34888,7 +33598,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1zwk05lf76xcdbqrbaid3whmn04injrg7dnlji2v2i5li0pnpr3c";
        libraryHaskellDepends = [ base process random time ];
-       homepage = "xy30.com";
        description = "Test the time it takes to run a haskell function";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -34903,7 +33612,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl time ];
        executableHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/WillSewell/benchpress";
        description = "Micro-benchmarking with detailed statistics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -34940,7 +33648,6 @@ self: {
          AttoBencode attoparsec base bencode bytestring criterion deepseq
          ghc-prim
        ];
-       homepage = "https://github.com/cobit/bencoding";
        description = "A library for encoding and decoding of BEncode data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -34953,7 +33660,6 @@ self: {
        version = "0.1.0";
        sha256 = "14li436dp33r4fygkbxr6rjljdamc0yhxv34wafsy4xsv8h898pb";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tfausak/bento#readme";
        description = "🍱 Manage stateful components";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -34992,7 +33698,6 @@ self: {
          ghc-paths haskeline haskell-src-exts language-python monads-tf
          parseargs process transformers
        ];
-       homepage = "http://wiki.github.com/bjpop/berp/";
        description = "An implementation of Python 3";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35016,7 +33721,6 @@ self: {
          async base binary bytestring containers network smallcheck tasty
          tasty-hunit tasty-smallcheck
        ];
-       homepage = "https://github.com/feuerbach/bert";
        description = "BERT implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35055,7 +33759,6 @@ self: {
          base lens QuickCheck semigroups test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       homepage = "https://github.com/Noeda/bet/";
        description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35094,7 +33797,6 @@ self: {
        executableHaskellDepends = [
          base containers lens linear random stm stm-chans vty
        ];
-       homepage = "https://github.com/mlang/betris#readme";
        description = "Braille friendly vertical version of tetris";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35106,7 +33808,6 @@ self: {
        version = "0.11.0.0";
        sha256 = "0pa6f7vadslvff0hlm939r2h8k130f16l2sjnzci79n54q9kadw3";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/trskop/between";
        description = "Function combinator \"between\" and derived combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35118,7 +33819,6 @@ self: {
        version = "1.1";
        sha256 = "0f8pyd2j24x574xs73zhadsd058ib217vd12snkqzg6vg9l7vgzw";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
      }) {};
 
@@ -35148,7 +33848,6 @@ self: {
        version = "0.2.3";
        sha256 = "1qswfjrij01g7g85iiyxpvk1k5hgnf6ll7jcf6b33k6dawi3a4qr";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "https://bitbucket.org/kztk/bff-mono/";
        description = "\"Bidirectionalization for Free\" for Monomorphic Transformations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35160,7 +33859,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "05mw9zv1r1zarnqbbz5qhgd173y52nkkv099x5zi2w1j96ca2pmd";
        libraryHaskellDepends = [ attoparsec base bytestring time ];
-       homepage = "http://github.com/jonpetterbergman/bgmax";
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35196,11 +33894,30 @@ self: {
          base brick bytestring containers directory filepath hoogle lens
          process protolude text time vector vty
        ];
-       homepage = "https://github.com/andrevdm/bhoogle#readme";
        description = "Simple terminal GUI for local hoogle";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bhoogle_0_1_2_7" = callPackage
+    ({ mkDerivation, base, brick, bytestring, containers, directory
+     , filepath, hoogle, lens, process, protolude, text, time, vector
+     , vty
+     }:
+     mkDerivation {
+       pname = "bhoogle";
+       version = "0.1.2.7";
+       sha256 = "0mcqkiddg7lxzambfqwqyqbppn7996a3kjyh1a8fv6h4xqcaf9pz";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base brick bytestring containers directory filepath hoogle lens
+         process protolude text time vector vty
+       ];
+       description = "Simple terminal GUI for local hoogle";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bibdb" = callPackage
     ({ mkDerivation, alex, array, async, base, bibtex, bytestring
      , containers, curl, download-curl, filepath, happy, microlens
@@ -35219,7 +33936,6 @@ self: {
          optparse-applicative parsec pretty transformers
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "https://github.com/cacay/bibdb";
        description = "A database based bibliography manager for BibTeX";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35234,7 +33950,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base latex parsec utility-ht ];
-       homepage = "http://www.haskell.org/haskellwiki/BibTeX";
        description = "Parse, format and processing BibTeX files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35254,7 +33969,6 @@ self: {
          base bytestring cgi containers directory hint mtl parsec pretty
          template-haskell unix utf8-string xhtml
        ];
-       homepage = "http://www.kb.ecei.tohoku.ac.jp/~kztk/b18n-combined/desc.html";
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35304,7 +34018,6 @@ self: {
          transformers-compat
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35338,7 +34051,6 @@ self: {
          base directory filepath HarmTrace-Base HUnit ListLike mtl parseargs
          uu-parsinglib
        ];
-       homepage = "http://ddmal.music.mcgill.ca/billboard";
        description = "A parser for the Billboard chord dataset";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35357,7 +34069,6 @@ self: {
          base billeksah-pane billeksah-services Cabal containers directory
          filepath glib gtk mtl parsec pretty transformers
        ];
-       homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35377,7 +34088,6 @@ self: {
          base billeksah-services containers directory filepath mtl parsec
          plugins pretty transformers
        ];
-       homepage = "http://www.leksah.org";
        description = "Leksah plugin base";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35400,7 +34110,6 @@ self: {
          directory filepath leksah-dummy leksah-main leksah-plugin-pane mtl
          parsec pretty transformers
        ];
-       homepage = "http://www.leksah.org";
        description = "Leksah plugin base";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35420,7 +34129,6 @@ self: {
          base billeksah-services containers directory filepath glib gtk mtl
          parsec pretty time transformers
        ];
-       homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35437,7 +34145,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory filepath mtl parsec pretty transformers
        ];
-       homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35455,7 +34162,6 @@ self: {
        testHaskellDepends = [
          base containers exceptions QuickCheck template-haskell
        ];
-       homepage = "https://github.com/joelwilliamson/bimap";
        description = "Bidirectional mapping between two key types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35498,7 +34204,6 @@ self: {
          base containers criterion deepseq mwc-random unordered-containers
          vector
        ];
-       homepage = "https://github.com/choener/bimaps";
        description = "bijections with multiple implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35523,7 +34228,6 @@ self: {
          array attoparsec base bytestring cereal containers criterion
          deepseq mtl
        ];
-       homepage = "https://github.com/kolmodin/binary";
        description = "Binary serialisation for Haskell values using lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35548,7 +34252,6 @@ self: {
          array attoparsec base bytestring Cabal cereal containers criterion
          deepseq directory filepath mtl tar unordered-containers zlib
        ];
-       homepage = "https://github.com/kolmodin/binary";
        description = "Binary serialisation for Haskell values using lazy ByteStrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35600,7 +34303,6 @@ self: {
          base binary bytestring conduit hspec QuickCheck
          quickcheck-assertions resourcet
        ];
-       homepage = "http://github.com/qnikst/binary-conduit/";
        description = "data serialization/deserialization conduit library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -35624,7 +34326,6 @@ self: {
        version = "0.1.2.0";
        sha256 = "1246lsk6bfwkrcspdsavmbz5ym3dvjc8ik3r0nc2if9x55cx5rqm";
        libraryHaskellDepends = [ base binary ];
-       homepage = "https://github.com/tolysz/binary-enum";
        description = "Simple wrappers around enum types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35645,7 +34346,6 @@ self: {
          array base binary bytestring Cabal containers directory filepath
          HUnit QuickCheck random test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/A1-Triard/binary-ext";
        description = "An alternate with typed errors for Data.Binary.Get monad from 'binary' library.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35662,7 +34362,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring monads-tf peggy template-haskell
        ];
-       homepage = "https://skami.iocikun.jp/haskell/packages/binary-file";
        description = "read/write binary file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35679,7 +34378,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 syb text
        ];
-       homepage = "http://github.com/lpeterse/binary-generic";
        description = "Generic binary serialisation using binary and syb";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35691,7 +34389,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0m2dxr5a4rb18jh1xj5yxjpjybn6bz5pjxd2cx06nd6dif4qki0m";
        libraryHaskellDepends = [ array base binary ];
-       homepage = "https://github.com/winterland1989/binary-ieee754";
        description = "Backport ieee754 float double combinators to older binary";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35759,7 +34456,6 @@ self: {
          quickcheck-instances scientific tagged tasty tasty-quickcheck text
          time unordered-containers vector
        ];
-       homepage = "https://github.com/phadej/binary-orphans#readme";
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35781,7 +34477,6 @@ self: {
        testHaskellDepends = [
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/nikita-volkov/binary-parser";
        description = "A highly-efficient but limited parser API specialised for bytestrings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35814,7 +34509,6 @@ self: {
          deepseq directory filepath http-types scanner scientific text
          unordered-containers vector
        ];
-       homepage = "https://github.com/winterland1989/binary-parsers";
        description = "Extends binary with parsec/attoparsec style parsing combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35827,7 +34521,6 @@ self: {
        version = "1.0";
        sha256 = "1hn6jc4j20z8ni7rpcyamam898yl6jy7zinrhy2rdjvx0p5br13h";
        libraryHaskellDepends = [ base binary bytestring mtl ];
-       homepage = "http://github.com/gcross/binary-protocol";
        description = "Monad to ease implementing a binary network protocol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35844,7 +34537,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring mtl zeromq-haskell
        ];
-       homepage = "http://github.com/NicolasT/binary-protocol-zmq";
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35885,7 +34577,6 @@ self: {
        version = "0.8.3";
        sha256 = "1clqq0rqjw1v7y6glkjnfyga5gxh768flyw617g47z0qa181c0c3";
        libraryHaskellDepends = [ base binary bytestring containers mtl ];
-       homepage = "http://www.leksah.org";
        description = "Sharing for the binary package";
        license = "GPL";
      }) {};
@@ -35936,7 +34627,6 @@ self: {
          base binary bytestring Cabal cabal-test-quickcheck io-streams
          QuickCheck
        ];
-       homepage = "http://github.com/jonpetterbergman/binary-streams";
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -35951,7 +34641,6 @@ self: {
        revision = "1";
        editedCabalFile = "1y4x4zhqs8lxxy9qcmkf93g9a1fa6bkn9my8pb9ac75qnc8mi42x";
        libraryHaskellDepends = [ array base bytestring containers mtl ];
-       homepage = "https://github.com/idontgetoutmuch/binary-low-level";
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -35985,7 +34674,6 @@ self: {
          containers criterion deepseq generics-sop hashable nats scientific
          semigroups SHA tagged text time unordered-containers vector
        ];
-       homepage = "https://github.com/phadej/binary-tagged#readme";
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36017,7 +34705,6 @@ self: {
          containers criterion deepseq generics-sop hashable nats scientific
          semigroups SHA tagged text time unordered-containers vector
        ];
-       homepage = "https://github.com/phadej/binary-tagged#readme";
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36038,7 +34725,6 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/oisdk/binary-tree#readme";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -36059,7 +34745,6 @@ self: {
        benchmarkHaskellDepends = [
          base binary bytestring criterion deepseq
        ];
-       homepage = "https://github.com/quchen/binary-typed";
        description = "Type-safe binary serialization";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36089,7 +34774,6 @@ self: {
          base bytestring containers deepseq ghc-prim monads-tf mtl
          numeric-prelude random stm strict transformers type-level-tf unix
        ];
-       homepage = "https://github.com/coreyoconnor/bind-marshal";
        description = "Data marshaling library that uses type level equations to optimize buffering";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36105,7 +34789,6 @@ self: {
        editedCabalFile = "1ijm34wxyxpx38yw42kl5yrb8i3gv1z7dvxhb98jz6pqxgqcvshs";
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base HTF HUnit QuickCheck random ];
-       homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36120,7 +34803,6 @@ self: {
        editedCabalFile = "1dcccb26m1ih3mbkhf72rmz9ywva7llxjvg9s6fpssjxpms5fhwy";
        libraryHaskellDepends = [ base binding-core gtk mtl ];
        testHaskellDepends = [ base binding-core directory gtk ];
-       homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36136,7 +34818,6 @@ self: {
        editedCabalFile = "1cpgwbzix794by0mvh3lrqv1pakh7i56hap3xhs7z2xccqc461q3";
        libraryHaskellDepends = [ base binding-core stm wx wxcore ];
        testHaskellDepends = [ base binding-core directory wx ];
-       homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36160,7 +34841,6 @@ self: {
        version = "1.0.25";
        sha256 = "0kqrd78nspl3lk4a0fqn47d8dirjg3b24dkvkigcrlb81hw35pk3";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jwiegley/bindings-dsl/wiki";
        description = "FFI domain specific language, on top of hsc2hs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36173,7 +34853,6 @@ self: {
        sha256 = "0fl7gdh60k7wj3bnn5hpgsi0kkji857xb47spii7mrip5p4m8pff";
        libraryHaskellDepends = [ base bindings-audiofile bindings-DSL ];
        libraryPkgconfigDepends = [ esound ];
-       homepage = "http://cielonegro.org/Bindings-EsounD.html";
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36239,7 +34918,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ K8055D ];
-       homepage = "https://github.com/jputcu/bindings-K8055";
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36253,7 +34931,6 @@ self: {
        sha256 = "0fw71z74pv8dxw301iss66kmarhlgwj2lpsy0skmlqfkg98zc96k";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ apr ];
-       homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36267,7 +34944,6 @@ self: {
        sha256 = "0sr041vpakklpf2mmy78wl5wl8yzfbwvsy07wlplmlh5rgjdm4wx";
        libraryHaskellDepends = [ base bindings-apr bindings-DSL ];
        libraryPkgconfigDepends = [ apr-util ];
-       homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36281,7 +34957,6 @@ self: {
        sha256 = "0ls0iy33i0b86fg7hx23s1d8ypa16bdiw3l8nmsni3zgnn67w6mj";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ audiofile ];
-       homepage = "http://cielonegro.org/Bindings-AudioFile.html";
        description = "Low level bindings to audiofile";
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) audiofile;};
@@ -36297,7 +34972,6 @@ self: {
        libraryHaskellDepends = [ array base containers unix ];
        librarySystemDepends = [ bfd opcodes ];
        libraryToolDepends = [ alex happy ];
-       homepage = "http://projects.haskell.org/bindings-bfd/";
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36311,7 +34985,6 @@ self: {
        sha256 = "1k0p0m09ndk6c42h3yy230q86fnm0hzr1zjr3871f9hapvnvzqr8";
        libraryHaskellDepends = [ bindings-DSL ];
        librarySystemDepends = [ dttools ];
-       homepage = "http://bitbucket.org/badi/bindings-cctools";
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36332,7 +35005,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ codec2 ];
        executableHaskellDepends = [ base binary bytestring split ];
-       homepage = "https://github.com/relrod/bindings-codec2";
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36359,7 +35031,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ dc1394 ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/aleator/bindings-dc1394";
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36387,7 +35058,6 @@ self: {
        libraryHaskellDepends = [ array base bindings-DSL ];
        librarySystemDepends = [ eskit ];
        libraryPkgconfigDepends = [ eskit ];
-       homepage = "http://github.com/a1kmm/bindings-eskit";
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36414,7 +35084,6 @@ self: {
        sha256 = "1gigvkgkqg240hnggld9dibzap5lanbifqazksysa53rminaw3yd";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ fluidsynth ];
-       homepage = "http://github.com/bgamari/bindings-fluidsynth";
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36465,7 +35134,6 @@ self: {
        sha256 = "0jz6v52alvczvmwlik0qvw3bfilhzpyp9wd1g92214j2iblyjk8i";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ gpgme ];
-       homepage = "https://github.com/jwiegley/bindings-dsl";
        description = "Project bindings-* raw interface to gpgme";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gpgme;};
@@ -36509,7 +35177,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ hamlib ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/relrod/hamlib-haskell";
        description = "Hamlib bindings for Haskell";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36535,7 +35202,6 @@ self: {
        sha256 = "1pbxwzslg2b1nn66nk8w5z1ryfz205m94ry9vidzyalpz2wnr074";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ blas liblapack ];
-       homepage = "https://github.com/basvandijk/bindings-levmar";
        description = "Low level bindings to the C levmar (Levenberg-Marquardt) library";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36549,7 +35215,6 @@ self: {
        sha256 = "1hygdr4w27igwc513vs7rc9i2xcmr1ndvbiwhkrdw2x0wsmz6yyy";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libcddb ];
-       homepage = "http://bitbucket.org/mauricio/bindings-libcddb";
        description = "Low level binding to libcddb";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libcddb;};
@@ -36587,7 +35252,6 @@ self: {
        sha256 = "1dy4z0m7r7sicqzx4lfibi4nbx6vaq31x93h38v90vn5i4n903vs";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ g15 ];
-       homepage = "https://github.com/Xandaros/bindings-libg15#readme";
        description = "Bindings to libg15";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36601,7 +35265,6 @@ self: {
        sha256 = "1dyhq06rs91g77c67lfnscn7l9fgbzikiqnv2d494jd60y1q8n8y";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ librrd ];
-       homepage = "http://cielonegro.org/Bindings-librrd.html";
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36632,7 +35295,6 @@ self: {
        sha256 = "0xnx9p6wqbwiaqigdnf7x6vd0qq7w9wm0vxsh93adpb5wdpjza66";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libusb ];
-       homepage = "https://github.com/basvandijk/bindings-libusb";
        description = "Low level bindings to libusb";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libusb;};
@@ -36645,7 +35307,6 @@ self: {
        sha256 = "0s31dh5g26nldb6aq6q4i6ypgajincw7n3d3vm838x3w320qvg2g";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ v4l2 ];
-       homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36659,7 +35320,6 @@ self: {
        sha256 = "1v52rms8xghj7ip3mmzmpa45mqywl4lfl3a0v6qp8sfnc01hd3ch";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ libzip ];
-       homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libzip;};
@@ -36671,7 +35331,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0k8h0i8qfmx6fg5d7mbh57brp8h896j9070bss9jmds4bhizhpw9";
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
-       homepage = "https://code.mathr.co.uk/bindings-linux-videodev2";
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36684,7 +35343,6 @@ self: {
        sha256 = "11rhw6593bnl1hzdn13px5zawbdanwz2219hm1ssxckwbkjlbvjg";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ lxc ];
-       homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
@@ -36722,7 +35380,6 @@ self: {
        version = "0.8.0.0";
        sha256 = "18i68ivsrdndjpfnyq6dlmmkkx22v3rp619nm26af8ka3qai12j5";
        libraryHaskellDepends = [ base bindings-DSL ];
-       homepage = "http://www.github.com/massysett/bindings-mpdecimal";
        description = "bindings to mpdecimal library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36741,7 +35398,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec HUnit QuickCheck quickcheck-io
        ];
-       homepage = "http://floss.scru.org/bindings-nettle";
        description = "bindings to nettle crypto library";
        license = stdenv.lib.licenses.gpl3;
      }) {inherit (pkgs) nettle;};
@@ -36788,7 +35444,6 @@ self: {
        sha256 = "0vb889f49li0lwy3zsji0f1cwzriizh9x6kg3r8676q5j08p7znd";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ potrace ];
-       homepage = "https://github.com/rwbarton/bindings-potrace";
        description = "Low-level bindings to the potrace bitmap tracing library";
        license = stdenv.lib.licenses.gpl2;
      }) {inherit (pkgs) potrace;};
@@ -36820,7 +35475,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs containers directory filepath process text unix
        ];
-       homepage = "https://github.com/michelk/bindings-saga-cmd.hs";
        description = "Wrapping saga_cmd";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -36833,7 +35487,6 @@ self: {
        sha256 = "0jxhc0x5hq6y7iznqlxbgnl37a7k8yki2ri475gyc158d47b0zm2";
        libraryHaskellDepends = [ base bindings-DSL ];
        libraryPkgconfigDepends = [ saneBackends ];
-       homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.lgpl3;
      }) {inherit (pkgs) saneBackends;};
@@ -36847,7 +35500,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ scsynth ];
-       homepage = "https://github.com/kaoskorobase/bindings-sc3/";
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36864,7 +35516,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ sipc ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/justinethier/hs-bindings-sipc";
        description = "Low level bindings to SIPC";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36900,7 +35551,6 @@ self: {
        version = "0.2.1";
        sha256 = "1nnmyxn28qdfy2sclnxv2mf2d426vrzgs7f0vvqri6fkjnvmk11b";
        libraryHaskellDepends = [ base bindings-DSL ];
-       homepage = "http://github.com/tanimoto/bindings-svm";
        description = "Low level bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -36925,7 +35575,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL convertible ];
        librarySystemDepends = [ wlc ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/aktowns/bindings-wlc#readme";
        description = "Bindings against the wlc library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36951,7 +35600,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1dp52xagwgzmm77f1cm8mvwjy7xnckbkf1inxskq0c7xcch4wbfb";
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
-       homepage = "https://github.com/lspitzner/bindynamic";
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36971,7 +35619,6 @@ self: {
        executableHaskellDepends = [
          base containers directory dlist filepath
        ];
-       homepage = "http://code.mathr.co.uk/binembed";
        description = "Embed data into object files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -36989,7 +35636,6 @@ self: {
        executableHaskellDepends = [
          base binembed bytestring containers filepath
        ];
-       homepage = "http://code.mathr.co.uk/binembed";
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37024,7 +35670,6 @@ self: {
          parsec QuickCheck tagsoup
        ];
        executableHaskellDepends = [ base bytestring random ];
-       homepage = "http://biohaskell.org/Libraries/Bio";
        description = "A bioinformatics library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37042,7 +35687,6 @@ self: {
          array base bytestring parsec template-haskell text
        ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
-       homepage = "https://github.com/biocad/bio-sequence";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37057,7 +35701,6 @@ self: {
        libraryHaskellDepends = [
          base bioalign biocore bytestring parsec
        ];
-       homepage = "https://patch-tag.com/r/dfornika/bioace/home";
        description = "Library for reading ace assembly files";
        license = "GPL";
      }) {};
@@ -37069,7 +35712,6 @@ self: {
        version = "0.0.5";
        sha256 = "006gg8ds6klrl9rc1csi247rf8gzlgn9mdi0jl4pjz5xmf0jw5dr";
        libraryHaskellDepends = [ base biocore bytestring ];
-       homepage = "https://patch-tag.com/r/dfornika/biophd/home";
        description = "Data structures and helper functions for calculating alignments";
        license = "GPL";
      }) {};
@@ -37092,7 +35734,6 @@ self: {
        version = "0.0.3";
        sha256 = "1l770sg2gcg7wl5yfrrk9nr7hgd5m0q158ad5nd8z7i5vsfah8b2";
        libraryHaskellDepends = [ base biocore bytestring ];
-       homepage = "https://patch-tag.com/r/dfornika/biofasta/home";
        description = "Library for reading fasta sequence files";
        license = "GPL";
      }) {};
@@ -37104,7 +35745,6 @@ self: {
        version = "0.1";
        sha256 = "0453cb2sw6x9hx3z7w3fvymwi0l0s86wlvi6vvsh0jcwas3iirbl";
        libraryHaskellDepends = [ base biocore bytestring ];
-       homepage = "http://biohaskell.org/";
        description = "A library for reading FASTQ files";
        license = "LGPL";
      }) {};
@@ -37124,7 +35764,6 @@ self: {
          hashable primitive stm text transformers unix unordered-containers
          vector vector-algorithms vector-th-unbox zlib
        ];
-       homepage = "https://bitbucket.org/ustenzel/biohazard";
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37177,7 +35816,6 @@ self: {
        libraryHaskellDepends = [
          base binary biocore bytestring parsec text time time-locale-compat
        ];
-       homepage = "https://github.com/dfornika/biophd/wiki";
        description = "Library for reading phd sequence files";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37195,7 +35833,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base biocore bytestring ];
        executableHaskellDepends = [ cmdargs unordered-containers ];
-       homepage = "http://biohaskell.org/";
        description = "Library and executables for working with PSL files";
        license = "LGPL";
      }) {};
@@ -37212,7 +35849,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base binary biocore bytestring ];
        executableHaskellDepends = [ array base cmdargs mtl ];
-       homepage = "http://biohaskell.org/";
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37257,7 +35893,6 @@ self: {
          base bytestring containers data-default hack hack-handler-happstack
          haskell98 MissingH mtl parsec process rallod
        ];
-       homepage = "http://github.com/moonmaster9000/bird";
        description = "A simple, sinatra-inspired web framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37279,7 +35914,6 @@ self: {
          integer-logarithms optparse-applicative process terminal-size time
          yaml
        ];
-       homepage = "http://github.com/nomeata/bisect-binary";
        description = "Determine relevant parts of binary data";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37311,7 +35945,6 @@ self: {
          array base Cabal containers data-default extra filepath HUnit hxt
          mtl polyparse QuickCheck random toolshed
        ];
-       homepage = "https://functionalley.eu/BishBosh/bishbosh.html";
        description = "Plays chess";
        license = "GPL";
      }) {};
@@ -37324,7 +35957,6 @@ self: {
        sha256 = "0g3yr1dp32983x7my8qwqaz6naap0qlxswa0864mb27a59jvq1qn";
        libraryHaskellDepends = [ base numeric-qq ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "https://github.com/nikita-volkov/bit-array";
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37346,7 +35978,6 @@ self: {
          vector
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/Bodigrim/bit-stream#readme";
        description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37363,7 +35994,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th vector
        ];
-       homepage = "https://github.com/acfoltzer/bit-vector";
        description = "Simple bit vectors for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37377,7 +36007,6 @@ self: {
        revision = "1";
        editedCabalFile = "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Mutable and immutable bit arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37402,7 +36031,6 @@ self: {
          base base58string bitcoin-script bitcoin-tx bytestring hspec
          http-client lens text wreq
        ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Provides access to the RPC API of Bitcoin Core";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37425,7 +36053,6 @@ self: {
          base bitcoin-api bitcoin-tx bytestring conduit hspec http-client
          lens text wreq
        ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Higher level constructs on top of the bitcoin-api package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37446,7 +36073,6 @@ self: {
        testHaskellDepends = [
          base bitcoin-tx bitcoin-types bytestring hexstring hspec
        ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Utility functions for manipulating bitcoin blocks";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37470,7 +36096,6 @@ self: {
          array base binary bytestring containers mtl old-locale QuickCheck
          random tasty tasty-hunit tasty-quickcheck time transformers
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Partial implementation of the Bitcoin protocol (as of 2013)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37511,7 +36136,6 @@ self: {
          rbpcp-api scientific semigroups string-conversions tagged text time
          transformers
        ];
-       homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel";
        description = "Instant, two-party Bitcoin payments";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37555,7 +36179,6 @@ self: {
          base base16-bytestring binary bytestring text
        ];
        testHaskellDepends = [ base bytestring hspec ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Compilation, manipulation and decompilation of Bitcoin scripts";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37576,7 +36199,6 @@ self: {
        testHaskellDepends = [
          base bitcoin-script bytestring hexstring hspec
        ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Utility functions for manipulating bitcoin transactions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37596,7 +36218,6 @@ self: {
        testHaskellDepends = [
          base base58string bytestring hexstring hspec
        ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Provides consistent low-level types used commonly among Bitcoin implementations";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37612,7 +36233,6 @@ self: {
        executableHaskellDepends = [
          base Bitly directory filepath regexpr
        ];
-       homepage = "http://bitbucket.org/jetxee/hs-bitly/";
        description = "A command line tool to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37625,7 +36245,6 @@ self: {
        version = "0.0.2";
        sha256 = "1flrfbrsnlcal7qyvl1wb0p8c14w0mvvkmgs7d943jqnlh4gay5m";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "A library for handling and manipulating bitmaps (rectangular pixel arrays)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37637,7 +36256,6 @@ self: {
        version = "0.0.1.5";
        sha256 = "1wq1p0vvif750gpyh2kq3agzwga3hx0fq28irbw5dgrz462dd9pv";
        libraryHaskellDepends = [ base bitmap OpenGL ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for Data.Bitmap.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37654,7 +36272,6 @@ self: {
          array base binary bitmap bytestring cereal containers monad-state
          stb-image string-class tagged zlib
        ];
-       homepage = "https://github.com/bairyn/bitmaps";
        description = "Bitmap library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37673,7 +36290,6 @@ self: {
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base bytes mtl transformers ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/bits";
        description = "Various bit twiddling and bitwise serialization primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37702,7 +36318,6 @@ self: {
        libraryHaskellDepends = [ base bits bytestring ];
        testHaskellDepends = [ base bits bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/oldmanmike/bits-bytestring";
        description = "Bits instance for bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37720,7 +36335,6 @@ self: {
        benchmarkHaskellDepends = [
          base bits-bytestring bytestring criterion
        ];
-       homepage = "https://github.com/semaj/bits-bytestring-lazy";
        description = "Bits instance for lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37749,14 +36363,13 @@ self: {
      }:
      mkDerivation {
        pname = "bits-extra";
-       version = "0.0.1.1";
-       sha256 = "0fsih4vrlq9l7851341n5qj1bp014f8rn7fhqf28803l6m3nrn1l";
+       version = "0.0.1.2";
+       sha256 = "1d950vjf2f8wp9fjpw6nkvafag6pd42zhxg9mmzvcyxvk28i6znq";
        libraryHaskellDepends = [ base ghc-prim vector ];
        testHaskellDepends = [
          base ghc-prim hedgehog hspec hw-hedgehog hw-hspec-hedgehog
        ];
        benchmarkHaskellDepends = [ base criterion ghc-prim vector ];
-       homepage = "https://github.com/haskell-works/bits-extra#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -37813,7 +36426,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq vector
        ];
-       homepage = "https://github.com/nshimaza/bitset-word8#readme";
        description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -37851,7 +36463,6 @@ self: {
        testHaskellDepends = [
          base base-unicode-symbols bytestring QuickCheck vector
        ];
-       homepage = "https://github.com/phonohawk/bitstream";
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37864,7 +36475,6 @@ self: {
        version = "0.0.0";
        sha256 = "1ix2x4v76wq5148k1aax69cf8sk14cd0z362dz1d2qmj9qxsnsw8";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Lazy bit strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37897,7 +36507,6 @@ self: {
          aeson base bencoding bytestring cereal directory filepath hspec
          network QuickCheck quickcheck-instances text time
        ];
-       homepage = "https://github.com/cobit/bittorrent";
        description = "Bittorrent protocol implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37919,7 +36528,6 @@ self: {
          scientific SHA split text time wreq
        ];
        executableHaskellDepends = [ base text turtle ];
-       homepage = "https://github.com/dmjio/bittrex";
        description = "Bindings for the Bittrex API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37937,7 +36545,6 @@ self: {
          base HUnit primitive QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector
        ];
-       homepage = "https://github.com/mokus0/bitvec";
        description = "Unboxed vectors of bits / dense IntSets";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -37952,7 +36559,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ array base bytestring criterion ];
-       homepage = "https://code.mathr.co.uk/bitwise";
        description = "fast multi-dimensional unboxed bit packed Bool arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37976,7 +36582,6 @@ self: {
          aeson base bytestring directory doctest hspec http-client
          http-types microlens safe text time
        ];
-       homepage = "https://github.com/tebello-thejane/bitx.hs";
        description = "A Haskell library for working with the BitX bitcoin exchange";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -37990,7 +36595,6 @@ self: {
        libraryHaskellDepends = [
          base-noprelude containers directory text
        ];
-       homepage = "http://github.com/TheBizzle";
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38003,7 +36607,6 @@ self: {
        version = "1.0.4";
        sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij";
        libraryHaskellDepends = [ base containers text ];
-       homepage = "http://github.com/TheBizzle";
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38015,7 +36618,6 @@ self: {
        version = "0.1.1";
        sha256 = "0av4gkh2vr9righ26hbagh8j30i8k4sp3af98lmwm5gf81vs5az4";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/bitonic/language-spelling";
        description = "BK-tree implementation";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -38039,7 +36641,6 @@ self: {
          aws base bytestring directory filepath HDBC HDBC-sqlite3 hslogger
          http-conduit MissingH pureMD5 random strict text unix utf8-string
        ];
-       homepage = "https://github.com/ingesson/bkr";
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38066,7 +36667,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 unix ];
-       homepage = "http://github.com/nfjinjing/bla";
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38088,7 +36688,6 @@ self: {
          network process safe tagsoup transformers zlib
        ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://git.kaction.name/black-jewel";
        description = "The pirate bay client";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -38110,7 +36709,6 @@ self: {
        benchmarkHaskellDepends = [
          async base criterion network-info time
        ];
-       homepage = "https://github.com/bitemyapp/blacktip";
        description = "Decentralized, k-ordered unique ID generator";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -38129,7 +36727,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/centromere/blake2";
        description = "A library providing BLAKE2";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -38141,7 +36738,6 @@ self: {
        version = "0.5";
        sha256 = "15k3vf9jqcw1a9gyppkhn5ibj7ld8mb2irfhbwd3plj86xyxxa0g";
        libraryHaskellDepends = [ base bytestring text vector ];
-       homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38160,7 +36756,6 @@ self: {
        executableHaskellDepends = [
          base blakesum bytestring haskell98 text vector
        ];
-       homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38189,7 +36784,6 @@ self: {
        testHaskellDepends = [
          base containers directory process shake stm text time unix vector
        ];
-       homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38217,7 +36811,6 @@ self: {
          base base-compat-batteries containers directory process shake stm
          text time unix vector
        ];
-       homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38230,7 +36823,6 @@ self: {
        version = "0.7.6";
        sha256 = "1q6fkw2bsppymy5wi7mgkl09caij52xplw64786548z9i95r0bli";
        libraryHaskellDepends = [ base ieee QuickCheck storable-complex ];
-       homepage = "http://github.com/patperry/blas";
        description = "Bindings to the BLAS library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38248,7 +36840,6 @@ self: {
          base blas-ffi carray netlib-carray netlib-ffi storable-complex
          transformers
        ];
-       homepage = "http://hub.darcs.net/thielema/blas-carray/";
        description = "Auto-generated interface to Fortran BLAS via CArrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38262,7 +36853,6 @@ self: {
        sha256 = "0dphqcnnka0ahfgdnshm8r3bd6r5wbpln9kksa6y09yi2nnqh3gf";
        libraryHaskellDepends = [ base netlib-ffi ];
        libraryPkgconfigDepends = [ blas ];
-       homepage = "http://hub.darcs.net/thielema/blas-ffi/";
        description = "Auto-generated interface to Fortran BLAS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38277,7 +36867,6 @@ self: {
        libraryHaskellDepends = [ base storable-complex ];
        librarySystemDepends = [ blas ];
        testHaskellDepends = [ base vector ];
-       homepage = "https://github.com/Rufflewind/blas-hs";
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38292,7 +36881,6 @@ self: {
        libraryHaskellDepends = [
          base biocore bytestring parallel tagsoup
        ];
-       homepage = "http://biohaskell.org/";
        description = "Library for reading Blast XML output";
        license = "LGPL";
      }) {};
@@ -38310,7 +36898,6 @@ self: {
        executableHaskellDepends = [
          base blaze-html dates directory HaTeX process split tagsoup text
        ];
-       homepage = "https://github.com/2016rshah/BlaTeX";
        description = "Blog in LaTeX";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38334,7 +36921,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0qsis1hwd8sqcciibxwy8p6irszwa2fy5m75qxp46ymfal5lrdak";
        libraryHaskellDepends = [ base blaze-html text ];
-       homepage = "http://github.com/agrafix/blaze-bootstrap";
        description = "Blaze helper functions for bootstrap pages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -38353,7 +36939,6 @@ self: {
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text utf8-string
        ];
-       homepage = "http://github.com/lpsmith/blaze-builder";
        description = "Efficient buffered output";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38366,7 +36951,6 @@ self: {
        sha256 = "0xxyn3lhcn1bkybhrl5dx68d0adf26ilf34gv0mxkwpfj7m7d3k3";
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Convert streams of builders to streams of bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38385,7 +36969,6 @@ self: {
          base blaze-builder bytestring bytestring-builder enumerator
          streaming-commons transformers
        ];
-       homepage = "https://github.com/meiersi/blaze-builder-enumerator";
        description = "Enumeratees for the incremental conversion of builders to bytestrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38403,7 +36986,6 @@ self: {
          base blaze-html blaze-markup colonnade text
        ];
        testHaskellDepends = [ base colonnade doctest ];
-       homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using blaze-html with colonnade";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38419,7 +37001,6 @@ self: {
        executableHaskellDepends = [
          base containers directory filepath tagsoup
        ];
-       homepage = "http://jaspervdj.be/blaze-html";
        description = "Tool to convert HTML to BlazeHtml code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38441,7 +37022,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
-       homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast HTML combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38457,7 +37037,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html cgi data-default network safe text
        ];
-       homepage = "https://github.com/egonSchiele/blaze-html-contrib";
        description = "Some contributions to add handy things to blaze html";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38470,7 +37049,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "11bw5ywvi7dlz5inch3z0vlg936ch1rnp99bh4nmwskvszidd7kg";
        libraryHaskellDepends = [ base blaze-html bytestring hexpat text ];
-       homepage = "https://github.com/jaspervdj/blaze-html-hexpat";
        description = "A hexpat backend for blaze-html";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38487,7 +37065,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-markup bytestring html-truncate tagsoup text
        ];
-       homepage = "http://github.com/mruegenberg/blaze-html-truncate";
        description = "A truncator for blaze-html";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38510,7 +37087,6 @@ self: {
          aeson base doctest QuickCheck scientific tasty tasty-quickcheck
          text unordered-containers vector
        ];
-       homepage = "https://github.com/philopon/blaze-json";
        description = "tiny library for encoding json";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38529,7 +37105,6 @@ self: {
          base blaze-builder bytestring containers HUnit QuickCheck tasty
          tasty-hunit tasty-quickcheck text
        ];
-       homepage = "http://jaspervdj.be/blaze";
        description = "A blazingly fast markup combinator library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38543,7 +37118,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html blaze-markup blaze-svg text
        ];
-       homepage = "http://githubcom/Qinka/blaze-shields";
        description = "create svg by Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38555,7 +37129,6 @@ self: {
        version = "0.3.6.1";
        sha256 = "0q5a4wam0sidng0cfsivwkyph9snyilk7rsdx4vb6wz9l6xz397n";
        libraryHaskellDepends = [ base blaze-markup mtl ];
-       homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38577,7 +37150,6 @@ self: {
          base blaze-builder bytestring double-conversion QuickCheck
          test-framework test-framework-quickcheck2
        ];
-       homepage = "http://github.com/bos/blaze-textual";
        description = "Fast rendering of common datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38594,7 +37166,6 @@ self: {
          base blaze-builder bytestring ghc-prim integer-gmp old-locale text
          time vector
        ];
-       homepage = "http://github.com/mailrank/blaze-textual";
        description = "Fast rendering of common datatypes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38624,7 +37195,6 @@ self: {
          base blaze-builder blaze-html blaze-markup bytestring mtl text
          transformers
        ];
-       homepage = "http://johannesgerer.com/blazeT";
        description = "A true monad (transformer) version of the blaze-markup and blaze-html libraries";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -38656,7 +37226,6 @@ self: {
          hspec microlens microlens-ghc mtl process QuickCheck
          quickcheck-instances random text transformers uuid
        ];
-       homepage = "http://github.com/plow-technologies/ble#readme";
        description = "Bluetooth Low Energy (BLE) peripherals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38694,7 +37263,6 @@ self: {
          base bliplib bytestring containers filepath language-python mtl
          old-time parseargs pretty
        ];
-       homepage = "https://github.com/bjpop/blip";
        description = "Python to bytecode compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38711,7 +37279,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring containers mtl pretty utf8-string
        ];
-       homepage = "https://github.com/bjpop/blip";
        description = "Support code for Blip";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38736,7 +37303,6 @@ self: {
          errors hashable hspec memory mtl QuickCheck quickcheck-instances
          text time transformers unordered-containers
        ];
-       homepage = "https://github.com/TGOlson/blockchain";
        description = "Generic blockchain implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38759,7 +37325,6 @@ self: {
          base JuicyPixels optparse-applicative vector
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/kseo/blockhash#readme";
        description = "Blockhash perceptual image hash algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38772,7 +37337,6 @@ self: {
        version = "0.1.0.5";
        sha256 = "00xlj503h6073f9sk7a1p2b66nw2lryyvxxbawwz030mjdb6hgps";
        libraryHaskellDepends = [ base containers parallel ];
-       homepage = "http://www.downstairspeople.org/git/blocking-transactions.git";
        description = "Composable, blocking transactions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38823,7 +37387,6 @@ self: {
          quickcheck-properties semigroups temporary text time unix-compat
          unordered-containers vector
        ];
-       homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38846,7 +37409,6 @@ self: {
          aeson amazonka amazonka-core base bloodhound http-client
          http-client-tls lens retry tasty tasty-hunit text time
        ];
-       homepage = "http://github.com/MichaelXavier/bloodhound-amazonka-auth#readme";
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38865,7 +37427,6 @@ self: {
          base bytestring QuickCheck random test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/bos/bloomfilter";
        description = "Pure and impure Bloom Filter implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38909,7 +37470,6 @@ self: {
          base containers fasta optparse-applicative pipes pipes-text split
          text
        ];
-       homepage = "http://github.com/GregorySchwartz/blosum#readme";
        description = "BLOSUM generator";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38942,7 +37502,6 @@ self: {
        executableHaskellDepends = [
          base blubber-server bytestring cereal containers gloss network unix
        ];
-       homepage = "https://secure.plaimi.net/games/blubber.html";
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38965,7 +37524,6 @@ self: {
          base Cabal cereal containers data-default-class network pandoc
          process random scotty text transformers unix
        ];
-       homepage = "https://secure.plaimi.net/games/blubber.html";
        description = "The blubber server, serves blubber clients";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -38982,7 +37540,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring http-client http-types text vector
        ];
-       homepage = "https://github.com/agrafix/bluemix-sdk#readme";
        description = "Bindings to Bluemix APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39005,7 +37562,6 @@ self: {
          xmonad-contrib
        ];
        executablePkgconfigDepends = [ gtk2 ];
-       homepage = "http://www.bluetile.org/";
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39042,7 +37598,6 @@ self: {
          wl-pprint-text
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://blunt.herokuapp.com";
        description = "Convert between pointfree and pointful expressions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39055,7 +37610,6 @@ self: {
        version = "1.2.6.3";
        sha256 = "1k6s5z520dadj38y7ja0m4syrg094gyq14c63i6wx2701zj3viiw";
        libraryHaskellDepends = [ base binary bytestring ];
-       homepage = "https://github.com/benl23x5/bmp";
        description = "Read and write uncompressed BMP image files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39069,7 +37623,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal h2c mtl resourcet
        ];
-       homepage = "https://bitbucket.org/fmapE/bno055-haskell";
        description = "Library for communication with the Bosch BNO055 orientation sensor";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39095,7 +37648,6 @@ self: {
        testHaskellDepends = [
          array base containers QuickCheck random transformers utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/games/";
        description = "Three games for inclusion in a web server";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39117,7 +37669,6 @@ self: {
          base directory filemanip filepath optparse-applicative shelly text
          transformers unix
        ];
-       homepage = "https://github.com/phlummox/bogocopy";
        description = "Copy a directory tree, making zero-size sparse copies of big files";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -39159,7 +37710,6 @@ self: {
          base bytestring cereal tasty tasty-quickcheck text
          unordered-containers vector
        ];
-       homepage = "https://github.com/bflyblue/bolt#readme";
        description = "Bolt driver for Neo4j";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39178,7 +37728,6 @@ self: {
          ad base containers hashable hmatrix ieee754 MonadRandom mtl
          QuickCheck transformers unordered-containers vector
        ];
-       homepage = "https://github.com/Lysxia/boltzmann-samplers#readme";
        description = "Uniform random generators";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39208,7 +37757,6 @@ self: {
          filepath HUnit monad-loops parsec pretty QuickCheck tasty
          tasty-golden tasty-hunit tasty-quickcheck text
        ];
-       homepage = "https://github.com/Microsoft/bond";
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39238,7 +37786,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion filepath vector
        ];
-       homepage = "http://github.com/rblaze/bond-haskell#readme";
        description = "Runtime support for BOND serialization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39261,7 +37808,6 @@ self: {
          aeson base bond bytestring cmdargs directory filepath monad-loops
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/rblaze/bond-haskell#readme";
        description = "Bond code generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39290,7 +37836,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion data-default-class type-level-sets
        ];
-       homepage = "http://github.com/turingjump/bookkeeper#readme";
        description = "Anonymous records and overloaded labels";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39303,7 +37848,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1d3wzj4nh8f436wfqhdlhrpxhrrhqh97wrfyykm26bnngy4kdsk6";
        libraryHaskellDepends = [ base bookkeeper type-level-sets ];
-       homepage = "https://github.com/pkamenarsky/bookkeeper-permissions";
        description = "Permissions for bookkeeper records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39317,7 +37861,6 @@ self: {
        sha256 = "1r17x9a5fapqn8ldvyr19l5g5qfxmvzqc5d3rp6rjg60r7k98hpz";
        libraryHaskellDepends = [ base dlist mtl text time ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
        description = "A module for bookkeeping by double entry";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39334,7 +37877,6 @@ self: {
          base mono-traversable text time transaction
        ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
        description = "A module for bookkeeping by double entry";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39352,7 +37894,6 @@ self: {
          base bookkeeping mono-traversable text time
        ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/haskell-bookkeeping-jp#readme";
        description = "Helper functions for Japanese bookkeeping";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39365,7 +37906,6 @@ self: {
        version = "0.4.0";
        sha256 = "008m43f04ncx2c24c241gzwjyyglw8rwpq2gsakqkw0nwz3czs61";
        libraryHaskellDepends = [ base ];
-       homepage = "http://tom.lokhorst.eu/bool-extras";
        description = "A fold function for Bool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39392,7 +37932,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring containers semigroups text vector
        ];
-       homepage = "http://github.com/Shou/boolean-like";
        description = "Logical combinatory operations dealing with datatypes representing booleans by their constructors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39404,7 +37943,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs";
        libraryHaskellDepends = [ base bytestring HUnit ];
-       homepage = "http://xy30.com";
        description = "convert numbers to binary coded lists";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -39489,7 +38027,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring comonad semigroupoids semigroups transformers
        ];
-       homepage = "https://github.com/fumieval/boombox";
        description = "Chronokinetic stream sources and incremental consumers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39535,7 +38072,6 @@ self: {
        sha256 = "1gn4b8y6dlhhf1vi92km32lyryl25xvbc8akbq1xxgn16iq49y8c";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/tdammers/boop";
        description = "OOP primitives for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39559,7 +38095,6 @@ self: {
        sha256 = "1kpx8q50j5k49mbrm1kpcd34jgvx4rfmw3bm4qbjrp48ysai0sfb";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/hverr/bordacount#readme";
        description = "Implementation of the Borda count election method";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39591,7 +38126,6 @@ self: {
          transformers unordered-containers vaultaire-common vector
          zeromq4-haskell
        ];
-       homepage = "https://github.com/anchor/borel-core";
        description = "Metering System for OpenStack metrics provided by Vaultaire";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39610,7 +38144,6 @@ self: {
          adjunctions base base-compat constraints fin generics-sop streams
          tagged transformers transformers-compat vec
        ];
-       homepage = "https://github.com/phadej/boring";
        description = "Boring and Absurd types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39627,7 +38160,6 @@ self: {
        libraryHaskellDepends = [ base gloss ];
        executableHaskellDepends = [ base gloss ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/checkraiser/boring-game#readme";
        description = "An educational game";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39642,7 +38174,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base gtk transformers X11 ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/debug-ito/boring-window-switcher";
        description = "A boring window switcher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39654,7 +38185,6 @@ self: {
        version = "0.3";
        sha256 = "0crs1c6v298zqkjzkdgicigx22gvp9xv7bjlynbyckvx0lrvfmrc";
        libraryHaskellDepends = [ arrows base Stream ];
-       homepage = "http://haskell.org/haskellwiki/Bot";
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39667,7 +38197,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "13hf6j8qfaqw446ifyx0y60j9kvlvm0yj3r4h910bcszfjvyhkkg";
        libraryHaskellDepends = [ base semigroups zero ];
-       homepage = "https://github.com/barrucadu/both";
        description = "Like Maybe, but with a different Monoid instance";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39681,7 +38210,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Build tool for Lambdabot";
        license = "GPL";
      }) {};
@@ -39707,7 +38235,6 @@ self: {
          base deriving-compat doctest functor-classes-compat transformers
          transformers-compat vector void
        ];
-       homepage = "http://github.com/ekmett/bound/";
        description = "Making de Bruijn Succ Less";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39741,7 +38268,6 @@ self: {
        version = "0.2.3";
        sha256 = "0r3mffqxqadn8qklq3kr0ggirkficfj8ic1fxgki2zrc5jm4f2g8";
        libraryHaskellDepends = [ base lens ];
-       homepage = "https://github.com/fumieval/boundingboxes";
        description = "A generic boundingbox for an arbitrary vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39762,7 +38288,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring tasty tasty-hunit text unordered-containers
        ];
-       homepage = "https://github.com/hdgarrood/bower-json";
        description = "Read bower.json from Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -39778,7 +38303,6 @@ self: {
        executableHaskellDepends = [
          base containers GLUT hosc hsc3 random
        ];
-       homepage = "https://code.mathr.co.uk/bowntz";
        description = "audio-visual pseudo-physical simulation of colliding circles";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39836,7 +38360,6 @@ self: {
          base containers diagrams-contrib diagrams-core diagrams-lib
          diagrams-svg split
        ];
-       homepage = "http://github.com/githubuser/braid#readme";
        description = "Types and functions to work with braids and Khovanov homology";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39891,7 +38414,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [ array base ];
-       homepage = "https://gitlab.com/queertypes/brainfuck-tut";
        description = "A simple BF interpreter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -39911,7 +38433,6 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        benchmarkHaskellDepends = [ base criterion text ];
-       homepage = "https://github.com/vmchale/brainheck#readme";
        description = "Brainh*ck interpreter in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39937,7 +38458,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskgame mtl SDL ];
-       homepage = "http://github.com/Peaker/breakout/tree/master";
        description = "A simple Breakout game implementation";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39962,7 +38482,6 @@ self: {
          tls transformers wai wai-extra wai-middleware-static warp warp-tls
          xdg-basedir
        ];
-       homepage = "https://github.com/rnhmjoj/breve";
        description = "a url shortener";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39977,7 +38496,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base parallel random SDL ];
-       homepage = "http://github.com/willdonnelly/brians-brain";
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40002,12 +38520,11 @@ self: {
          microlens microlens-mtl microlens-th stm template-haskell text
          text-zipper transformers vector vty word-wrap
        ];
-       homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "brick_0_37" = callPackage
+  "brick_0_37_1" = callPackage
     ({ mkDerivation, base, config-ini, containers, contravariant
      , data-clist, deepseq, dlist, microlens, microlens-mtl
      , microlens-th, QuickCheck, stm, template-haskell, text
@@ -40015,8 +38532,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.37";
-       sha256 = "1v9ydqwaq116n8f4q9ln4zf9jr28y730y7l7m1r2ipjfjassxfq2";
+       version = "0.37.1";
+       sha256 = "04rpiafw7a30drbk8gmp01m6l3iawayy1ma1hn8m257rh2zk66qy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40025,7 +38542,6 @@ self: {
          text-zipper transformers vector vty word-wrap
        ];
        testHaskellDepends = [ base containers QuickCheck ];
-       homepage = "https://github.com/jtdaugherty/brick/";
        description = "A declarative terminal user interface library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40044,7 +38560,6 @@ self: {
        libraryHaskellDepends = [
          base brick containers skylighting-core text vty
        ];
-       homepage = "https://github.com/jtdaugherty/brick-skylighting/";
        description = "Show syntax-highlighted text in your Brick UI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40069,7 +38584,6 @@ self: {
          bricks-rendering bricks-syntax containers doctest hedgehog mtl
          parsec template-haskell text transformers
        ];
-       homepage = "https://github.com/chris-martin/bricks#readme";
        description = "Bricks is a lazy functional language based on Nix";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40089,7 +38603,6 @@ self: {
        testHaskellDepends = [
          base containers doctest either-list-functions text
        ];
-       homepage = "https://github.com/chris-martin/bricks#readme";
        description = "...";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -40105,7 +38618,6 @@ self: {
        libraryHaskellDepends = [
          base bricks-internal containers hedgehog template-haskell text
        ];
-       homepage = "https://github.com/chris-martin/bricks#readme";
        description = "...";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -40126,7 +38638,6 @@ self: {
          base bricks-internal bricks-internal-test bricks-rendering
          bricks-syntax containers doctest hedgehog parsec text
        ];
-       homepage = "https://github.com/chris-martin/bricks#readme";
        description = "...";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40148,7 +38659,6 @@ self: {
          base bricks-internal bricks-internal-test bricks-syntax containers
          doctest hedgehog template-haskell text
        ];
-       homepage = "https://github.com/chris-martin/bricks#readme";
        description = "...";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40170,7 +38680,6 @@ self: {
          base bricks-internal containers doctest either-list-functions
          exceptions hint text
        ];
-       homepage = "https://github.com/chris-martin/bricks#readme";
        description = "...";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40234,7 +38743,6 @@ self: {
          neat-interpolation parsec pretty safe semigroups strict syb text
          transformers uniplate unsafe yaml
        ];
-       homepage = "https://github.com/lspitzner/brittany/";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -40276,7 +38784,6 @@ self: {
          neat-interpolation parsec pretty safe semigroups strict syb text
          transformers uniplate unsafe yaml
        ];
-       homepage = "https://github.com/lspitzner/brittany/";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40289,7 +38796,6 @@ self: {
        version = "0.1.1";
        sha256 = "1wl5x7qi00z7q9k6rbmzszzbrqycfcpg04a1ikrnvzqs61ddcnxd";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/merijn/broadcast-chan";
        description = "Broadcast channel type that avoids 0 reader space leaks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40315,7 +38821,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ broker ];
        testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/capn-freako/broker-haskell";
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40367,7 +38872,6 @@ self: {
          base bytestring deepseq ini lens lrucache mtl text
          unordered-containers wreq
        ];
-       homepage = "https://oss.xkcd.com";
        description = "A reader and interface for the Browser Capabilities Project data files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40380,7 +38884,6 @@ self: {
        version = "0.0.0.2";
        sha256 = "1x6m6xkrcw6jiaig1bb2wb5pqyw31x8xr9k9pxgq2g3ng44pbjr8";
        libraryHaskellDepends = [ base bytestring bytestring-builder ];
-       homepage = "http://github.com/sjakobi/bsb-http-chunked";
        description = "Chunked HTTP transfer encoding for bytestring builders";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40392,7 +38895,6 @@ self: {
        version = "1.0.8.0";
        sha256 = "0wflh3ncd47j2v70m6lbdmaif974fimv3dd4wyj6krb03vq6lvpd";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com:p-alik/bsd-sysctl";
        description = "Access to the BSD sysctl(3) interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40414,7 +38916,6 @@ self: {
          base binary bytestring cryptohash data-binary-ieee754 mtl network
          QuickCheck test-framework test-framework-quickcheck2 text time
        ];
-       homepage = "http://github.com/mongodb-haskell/bson";
        description = "BSON documents are JSON-like objects with a standard binary encoding";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -40450,7 +38951,6 @@ self: {
        version = "0.1.1";
        sha256 = "0q5ixrfgybf80q0x2p80qjy1kqarm2129hmzzqgcpn7jvqbv8fyp";
        libraryHaskellDepends = [ base bson lens text ];
-       homepage = "https://github.com/jb55/bson-lens";
        description = "BSON lenses";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
@@ -40484,7 +38984,6 @@ self: {
        benchmarkHaskellDepends = [
          base blaze-builder bytestring criterion sandi
        ];
-       homepage = "https://github.com/NicolasDP/hs-bspack";
        description = "A simple and fast bytestring packer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40496,7 +38995,6 @@ self: {
        version = "0.0.5";
        sha256 = "12wn8jlqkb9d9vpdbwc3m288cgnr15cq4wv5fxlp7f10p3y42l2a";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vincenthz/hs-bsparse";
        description = "A simple unassuming parser for bytestring";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40516,7 +39014,6 @@ self: {
          tasty-hunit tasty-smallcheck transformers
        ];
        benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
-       homepage = "https://github.com/andrewthad/btree";
        description = "B-Tree on Unmanaged Heap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40540,7 +39037,6 @@ self: {
          array base base64-bytestring bytestring cereal containers directory
          filepath hashable mtl QuickCheck random snappy stm time unix
        ];
-       homepage = "https://github.com/brinchj/btree-concurrent";
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40555,7 +39051,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring time unix ];
-       homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40594,7 +39089,6 @@ self: {
          regex-tdfa regex-tdfa-text safe semigroups split strict temporary
          text time transformers unordered-containers vector yaml
        ];
-       homepage = "http://johannesgerer.com/buchhaltung";
        description = "Automates most of your plain text accounting data entry in ledger format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40615,7 +39109,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/buffer";
        description = "Simple mutable low-level buffer for IO";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40641,7 +39134,6 @@ self: {
          aeson base bytestring criterion deepseq http-types json-builder
          text vector
        ];
-       homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40700,7 +39192,6 @@ self: {
          base monad-primitive mwc-random mwc-random-monad primitive
          transformers
        ];
-       homepage = "https://github.com/derekelkins/buffon";
        description = "An implementation of Buffon machines";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40713,7 +39204,6 @@ self: {
        version = "1.0.1";
        sha256 = "1xfynvp5fyn46gg3p5qq9cmb1dnw2dyf3bz6w5wdvikfvs19dwhq";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/nikita-volkov/bug";
        description = "Better alternatives to the \"error\" function";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -40738,7 +39228,6 @@ self: {
        testHaskellDepends = [
          aeson aeson-qq base doctest hspec text time
        ];
-       homepage = "https://github.com/pbrisbin/bugsnag-haskell#readme";
        description = "Bugsnag error reporter for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -40759,7 +39248,6 @@ self: {
          data-default http-conduit http-types iso8601-time resourcet text
          time transformers unordered-containers vector
        ];
-       homepage = "https://github.com/sethfowler/hsbugzilla";
        description = "A Haskell interface to the Bugzilla native REST API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40789,7 +39277,6 @@ self: {
          base bytestring containers directory exceptions mtl old-locale
          process stm temporary text time
        ];
-       homepage = "http://code.ouroborus.net/buildbox";
        description = "Rehackable components for writing buildbots and test harnesses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40803,7 +39290,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base buildbox parseargs ];
-       homepage = "http://code.ouroborus.net/buildbox";
        description = "Tools for working with buildbox benchmark result files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40842,7 +39328,6 @@ self: {
          mtl old-time process text time transformers unordered-containers
          vector
        ];
-       homepage = "https://github.com/JPMoresmau/BuildWrapper";
        description = "A library and an executable that provide an easy API for a Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40857,7 +39342,6 @@ self: {
        libraryHaskellDepends = [ base vect ];
        libraryPkgconfigDepends = [ bullet ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://www.haskell.org/haskellwiki/Bullet";
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40878,7 +39362,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers fclabels process regex-compat split strict
        ];
-       homepage = "http://github.com/silkapp/bumper";
        description = "Automatically bump package versions, also transitively";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40895,7 +39378,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base cmdargs text unix ];
        testHaskellDepends = [ base doctest hspec ];
-       homepage = "https://github.com/sendyhalim/bunz";
        description = "CLI tool to beautify JSON string";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40914,7 +39396,6 @@ self: {
        executableHaskellDepends = [
          aeson base bitcoin-script bytestring process scientific
        ];
-       homepage = "https://gitlab.com/KrzysiekJ/burnt-explorer";
        description = "List OP_RETURN cryptocurrency transaction outputs";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40929,7 +39410,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://parsci.com/";
        description = "Burst detection algorithms";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40947,7 +39427,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring errors serialport transformers
        ];
-       homepage = "http://www.github.com/bgamari/bus-pirate";
        description = "Haskell interface to the Bus Pirate binary interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -40964,7 +39443,6 @@ self: {
          base binary bytestring containers dataenc mtl old-locale parsec
          pretty time
        ];
-       homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40982,7 +39460,6 @@ self: {
          base binary buster bytestring containers dataenc gtk mtl old-locale
          parsec pretty time
        ];
-       homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41000,7 +39477,6 @@ self: {
          base binary buster bytestring containers dataenc haxr HTTP mtl
          network old-locale pretty time
        ];
-       homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41029,7 +39505,6 @@ self: {
          base bytestring cairo containers dbus directory filepath gtk3 HUnit
          mtl pango pcap QuickCheck test-framework test-framework-hunit text
        ];
-       homepage = "https://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
      }) {system-glib = pkgs.glib;};
@@ -41049,7 +39524,6 @@ self: {
          base bifunctors containers deque extra free microlens microlens-th
          mtl multistate pretty transformers unsafe void
        ];
-       homepage = "https://github.com/lspitzner/butcher/";
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41071,7 +39545,6 @@ self: {
          base containers deque extra free hspec microlens microlens-th mtl
          multistate pretty transformers unsafe
        ];
-       homepage = "https://github.com/lspitzner/butcher/";
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41093,7 +39566,6 @@ self: {
          base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa
          repa-devil
        ];
-       homepage = "http://code.mathr.co.uk/butterflies";
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41108,7 +39580,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
-       homepage = "https://github.com/iagoabal/haskell-bv";
        description = "Bit-vector arithmetic library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41131,7 +39602,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion deepseq hashable ];
-       homepage = "https://github.com/recursion-ninja/bv-little";
        description = "Efficient little-endian bit vector library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41151,7 +39621,6 @@ self: {
        testHaskellDepends = [
          base lens parameterized-utils prettyclass QuickCheck random
        ];
-       homepage = "https://github.com/benjaminselfridge/bv-sized";
        description = "a BitVector datatype that is parameterized by the vector width";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41171,7 +39640,6 @@ self: {
          ansi-terminal base colour containers exceptions haskeline mtl
          terminfo-hs text transformers
        ];
-       homepage = "http://github.com/pjones/byline";
        description = "Library for creating command-line interfaces (colors, menus, etc.)";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41197,7 +39665,6 @@ self: {
        sha256 = "1qizg0kxxjqnd3cbrjhhidk5pbbciz0pb3z5kzikjjxnnnhk8fr4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/vincenthz/hs-byteable";
        description = "Type class for sequence of bytes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41209,7 +39676,6 @@ self: {
        version = "0.1";
        sha256 = "1b1lz0y1a20v05bpa4xlxchc6k025gmm17hj3ysmv6j2i3k8micd";
        libraryHaskellDepends = [ base bytestring primitive text ];
-       homepage = "https://github.com/nikita-volkov/bytearray-parsing";
        description = "Parsing of bytearray-based data";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -41224,7 +39690,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/vincenthz/hs-bytedump";
        description = "Flexible byte dump helpers for human readers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41236,7 +39701,6 @@ self: {
        version = "1.0.4";
        sha256 = "06995paxbxk8lldvarqpb3ygcjbg4v8dk4scib1rjzwlhssvn85x";
        libraryHaskellDepends = [ base ];
-       homepage = "http://community.haskell.org/~aslatter/code/byteorder";
        description = "Exposes the native endianness or byte ordering of the system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41258,7 +39722,6 @@ self: {
          void
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "https://github.com/ekmett/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41289,7 +39752,6 @@ self: {
          QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/haskell/bytestring";
        description = "Fast, compact, strict and lazy byte strings with a list interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41310,7 +39772,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion cryptohash QuickCheck
        ];
-       homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41339,7 +39800,6 @@ self: {
        testHaskellDepends = [
          attoparsec attoparsec-varword base bytestring hspec QuickCheck
        ];
-       homepage = "https://github.com/concert/hs-varword#readme";
        description = "Variable-length integer encoding";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -41378,7 +39838,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion text transformers
        ];
-       homepage = "https://github.com/twittner/bytestring-conversion/";
        description = "Type-classes to convert values to and from ByteString";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -41390,7 +39849,6 @@ self: {
        version = "0.1.2";
        sha256 = "0x7qklb36jwxry1ih5x3jw7s861vlvd5g9h7yn7b2x64c0phyj0r";
        libraryHaskellDepends = [ array base bytestring dlist ];
-       homepage = "http://code.haskell.org/~dons/code/bytestring-csv";
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41403,7 +39861,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0iq59if3in08ssashk80wvh6yh1yr115387fi9kj952v6bzvzw1q";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/joeyadams/haskell-bytestring-delta";
        description = "Simple, fast binary diff/patch";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -41454,7 +39911,6 @@ self: {
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41466,7 +39922,6 @@ self: {
        version = "0.5.0.2";
        sha256 = "0wrzniawhgpphc6yx1v972gyqxdbv0pizaz9bafahrshyb9svy81";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Parse and produce literals efficiently from strict or lazy bytestrings";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -41478,7 +39933,6 @@ self: {
        version = "0.2.2";
        sha256 = "1bv9xf4cpph1cbdwv6rbmq8ppi5wjpgd97lwln5l9ky5rvnaxg3v";
        libraryHaskellDepends = [ base bytestring unix ];
-       homepage = "http://code.haskell.org/~dons/code/bytestring-mmap/";
        description = "mmap support for strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41492,7 +39946,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring containers ];
-       homepage = "http://github.com/solidsnack/bytestring-nums";
        description = "Parse numeric literals from ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41508,7 +39961,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim hashable
        ];
-       homepage = "https://github.com/hvr/bytestring-plain";
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41523,7 +39975,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring terminal-progress-bar time
        ];
-       homepage = "http://github.com/acw/bytestring-progress";
        description = "A library for tracking the consumption of a lazy ByteString";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41547,7 +39998,6 @@ self: {
          attoparsec base bytestring bytestring-lexing criterion scientific
          text
        ];
-       homepage = "https://github.com/philopon/bytestring-read";
        description = "fast ByteString to number converting library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41562,7 +40012,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec HUnit rematch ];
        doHaddock = false;
-       homepage = "github.com/tcrayford/rematch";
        description = "Rematch support for ByteString";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41593,7 +40042,6 @@ self: {
        libraryHaskellDepends = [
          array base binary bytestring containers integer-gmp
        ];
-       homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient conversion of values into readable byte strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41615,7 +40063,6 @@ self: {
          tasty-smallcheck
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/bytestring-strict-builder";
        description = "An efficient strict bytestring builder";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41633,7 +40080,6 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring Cabal hspec QuickCheck text time
        ];
-       homepage = "https://github.com/klangner/bytestring-time";
        description = "Library for Time parsing from ByteString";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41658,7 +40104,6 @@ self: {
        benchmarkHaskellDepends = [
          base-prelude bytestring criterion deepseq
        ];
-       homepage = "https://github.com/nikita-volkov/bytestring-tree-builder";
        description = "A very efficient ByteString builder implementation based on the binary tree";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41673,7 +40118,6 @@ self: {
        revision = "1";
        editedCabalFile = "0f56pb1k1va7bs9rpn0b8hclxhn5pcjln857k50myhyzrwz8qg7r";
        libraryHaskellDepends = [ base binary bytestring ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "An efficient finite map from (byte)strings to values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41692,7 +40136,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring cryptohash QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion QuickCheck ];
-       homepage = "https://github.com/tsuraan/bytestring-typenats";
        description = "Bytestrings with typenat lengths";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -41779,7 +40222,6 @@ self: {
          base bindings-DSL bytestring conduit data-default-class mtl
          resourcet
        ];
-       homepage = "https://github.com/snoyberg/bzlib-conduit#readme";
        description = "Streaming compression/decompression via conduits";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) bzip2;};
@@ -41824,7 +40266,6 @@ self: {
        librarySystemDepends = [ mosquitto ];
        executableHaskellDepends = [ base options ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/tolysz/c-mosquitto#readme";
        description = "Simpe mosquito MQTT binding able to work with the Amazons IoT";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mosquitto;};
@@ -41837,7 +40278,6 @@ self: {
        sha256 = "03ynlm6nbm2hsqp0bpcqj3kp1hbg2pnif44zrgj8rda8dmsczm9j";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/elaforge/c-storable";
        description = "CStorable class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41849,7 +40289,6 @@ self: {
        version = "0.1.3";
        sha256 = "0zx6r7sfaxl4k2s2b213vm12fskcssy01b828i8rqxixwfjjshv8";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/maurer/c-storable-deriving";
        description = "Generate C-like storable instances from datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41885,7 +40324,6 @@ self: {
        version = "0.5.0";
        sha256 = "1i62ilk95p1vjyk7gl1fv7lwq6yk3ysfn3v1bbyfpabf97gzr0d9";
        libraryHaskellDepends = [ base network unix ];
-       homepage = "http://github.com/kazu-yamamoto/c10k";
        description = "C10k server library using prefork";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -41908,7 +40346,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit test-framework-th
        ];
-       homepage = "https://github.com/metasepi/c2ats#readme";
        description = "Translate C code into ATS";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -41933,7 +40370,6 @@ self: {
          base filepath HUnit shelly test-framework test-framework-hunit text
          transformers
        ];
-       homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -41946,7 +40382,6 @@ self: {
        sha256 = "1vasv9gwsvb3l5faka11rs0rr0h0gwif76bkk49n9pvxskqla9sk";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
        description = "Convenient marshallers for complicate C types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -41972,7 +40407,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base here hspec logging monad-logger text ];
-       homepage = "https://github.com/jwiegley/c2hsc";
        description = "Convert C API header files to .hsc and .hsc.helper.c files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42009,7 +40443,6 @@ self: {
          attoparsec base bytestring Cabal conduit conduit-extra containers
          directory filepath process
        ];
-       homepage = "http://www.mew.org/~kazu/proj/cab/";
        description = "A maintenance command of Haskell cabal packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42043,7 +40476,6 @@ self: {
        executableHaskellDepends = [
          base Cabal directory filepath HTTP optparse-applicative
        ];
-       homepage = "https://github.com/joelteon/cabal-audit.git";
        description = "Check how up-to-date your .cabal dependencies are.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42051,20 +40483,19 @@ self: {
 
   "cabal-bounds" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, cabal-lenses
-     , cmdargs, directory, either, filepath, Glob, lens, lens-aeson
-     , process, strict, tasty, tasty-golden, text, transformers
+     , cmdargs, directory, filepath, Glob, lens, lens-aeson, process
+     , strict, tasty, tasty-golden, text, transformers
      , unordered-containers
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "1.5.0";
-       sha256 = "0qkrrbv8b0ij4hrqzlzzkn2rislz77kbvqb67mh0pnlfrn77kwy7";
+       version = "2.0.0";
+       sha256 = "039j25av78fg4dg34q0i3h4ahb6j820kja1f2411rsxbrl9li5ca";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring Cabal cabal-lenses cmdargs directory either
-         filepath lens lens-aeson strict text transformers
-         unordered-containers
+         aeson base bytestring Cabal cabal-lenses cmdargs directory filepath
+         lens lens-aeson strict text transformers unordered-containers
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
@@ -42077,17 +40508,17 @@ self: {
 
   "cabal-cargs" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-lenses, cmdargs
-     , directory, either, filepath, lens, system-fileio, system-filepath
-     , tasty, tasty-golden, text, transformers, unordered-containers
+     , directory, filepath, lens, system-fileio, system-filepath, tasty
+     , tasty-golden, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "0.9.1";
-       sha256 = "13qbp6416k684chd0f1mk0dw9xkjh85cj6yrgxb9cbhq2944zydi";
+       version = "1.0.0";
+       sha256 = "025cdf78kg572b8bk5xxz4qxibjn4c72x2d3rxn6crz722139rf0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal cabal-lenses cmdargs directory either lens
+         base bytestring Cabal cabal-lenses cmdargs directory lens
          system-fileio system-filepath text transformers
          unordered-containers
        ];
@@ -42107,7 +40538,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal optparse-applicative ];
-       homepage = "https://github.com/benarmston/cabal-constraints";
        description = "Repeatable builds for cabalized Haskell projects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42128,7 +40558,6 @@ self: {
          ansi-wl-pprint base bytestring Cabal containers directory filepath
          mtl optparse-applicative pretty process tar utf8-string
        ];
-       homepage = "http://github.com/vincenthz/cabal-db";
        description = "query tools for the local cabal database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42158,7 +40587,6 @@ self: {
        executableHaskellDepends = [
          base Cabal debian lens mtl pretty Unixutils
        ];
-       homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42174,7 +40602,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers directory filepath
        ];
-       homepage = "http://github.com/jaspervdj/cabal-dependency-licenses";
        description = "Compose a list of a project's transitive dependencies with their licenses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42198,7 +40625,6 @@ self: {
          zlib
        ];
        executableToolDepends = [ cabal-install ];
-       homepage = "http://github.com/creswick/cabal-dev";
        description = "Manage sandboxed Haskell build environments";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42226,7 +40652,6 @@ self: {
        revision = "1";
        editedCabalFile = "1bk85avgc93yvcggwbk01fy8nvg6753wgmaanhkry0hz55h7mpld";
        libraryHaskellDepends = [ base Cabal directory filepath ];
-       homepage = "https://github.com/phadej/cabal-doctest";
        description = "A Setup.hs helper for doctests running";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42242,7 +40667,6 @@ self: {
          base Cabal directory pretty template-haskell
        ];
        testHaskellDepends = [ base Cabal ];
-       homepage = "http://github.com/nkpart/cabal-file-th";
        description = "Template Haskell expressions for reading fields from a project's cabal file";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42254,7 +40678,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "13kxlmz5w0aazafrlignd55zclwl9sb213jry4vhfibgjrg18w8f";
        libraryHaskellDepends = [ base Cabal ghc transformers ];
-       homepage = "http://github.com/bgamari/cabal-ghc-dynflags";
        description = "Conveniently configure GHC's dynamic flags for use with Cabal projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42272,7 +40695,6 @@ self: {
        executableHaskellDepends = [
          base Cabal directory filepath process
        ];
-       homepage = "http://github.com/atnnn/cabal-ghci";
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42291,7 +40713,6 @@ self: {
        executableHaskellDepends = [
          base containers directory options parsec process split temporary
        ];
-       homepage = "https://john-millikin.com/software/cabal-graphdeps/";
        description = "Generate graphs of install-time Cabal dependencies";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42349,7 +40770,6 @@ self: {
        executableHaskellDepends = [
          base Cabal filepath optparse-applicative
        ];
-       homepage = "https://github.com/barrucadu/cabal-info";
        description = "Read information from cabal files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42382,7 +40802,6 @@ self: {
          mkdir $out/etc
          mv bash-completion $out/etc/bash_completion.d
        '';
-       homepage = "http://www.haskell.org/cabal/";
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -42423,7 +40842,6 @@ self: {
          array base Cabal containers directory filepath HTTP network
          old-time pretty process random time unix zlib
        ];
-       homepage = "http://www.haskell.org/cabal/";
        description = "Temporary version of cabal-install for ghc-7.2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42444,22 +40862,21 @@ self: {
          array base Cabal containers directory filepath HTTP network
          old-time pretty process random time unix zlib
        ];
-       homepage = "http://www.haskell.org/cabal/";
        description = "Temporary version of cabal-install for ghc-7.4";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-lenses" = callPackage
-    ({ mkDerivation, base, Cabal, either, lens, strict, system-fileio
+    ({ mkDerivation, base, Cabal, lens, strict, system-fileio
      , system-filepath, text, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.7.1";
-       sha256 = "1y6s99slblishngi2hw0brf6byd5w72kqz10x30vhxw2zdmprvl0";
+       version = "0.8.0";
+       sha256 = "1xz28mj98qfqra4kb7lwjkwa5ail0pn1fvia916wp6005mgvsh60";
        libraryHaskellDepends = [
-         base Cabal either lens strict system-fileio system-filepath text
+         base Cabal lens strict system-fileio system-filepath text
          transformers unordered-containers
        ];
        description = "Lenses and traversals for the Cabal library";
@@ -42489,7 +40906,6 @@ self: {
          base Cabal containers directory filepath HUnit process temporary
          test-framework test-framework-hunit text
        ];
-       homepage = "http://github.com/danfran/cabal-macosx";
        description = "Cabal support for creating Mac OSX application bundles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42511,7 +40927,6 @@ self: {
        testHaskellDepends = [
          base hspec shelly system-filepath text unix
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "build multiple packages at once";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42547,7 +40962,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers directory HTTP process tar
        ];
-       homepage = "http://github.com/snoyberg/cabal-nirvana";
        description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42608,7 +41022,6 @@ self: {
          base bytestring Cabal derive ghc MissingH mtl tar template-haskell
          uniplate
        ];
-       homepage = "http://github.com/explicitcall/cabal-query";
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42628,7 +41041,6 @@ self: {
          base bytestring Cabal directory filepath http-client
          http-client-tls http-conduit process time unix
        ];
-       homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -42655,7 +41067,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
-       homepage = "http://www.haskell.org/cabal/";
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42715,7 +41126,6 @@ self: {
          http-conduit http-types network process resourcet shelly
          system-fileio system-filepath tar text transformers
        ];
-       homepage = "https://github.com/yesodweb/cabal-src";
        description = "Alternative install procedure to avoid the diamond dependency issue";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42761,7 +41171,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "15lxyrza1n9saac1awjx482gi7wq3sshqf4ich6k9xkfj464lrdq";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
-       homepage = "http://twitter.com/khibino/";
        description = "Compatibility interface of cabal test-suite";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42775,7 +41184,6 @@ self: {
        revision = "1";
        editedCabalFile = "1rq6l86sndcv8nb5nl9rki2kmblrarj9cbra0i6kixa5n1wbcmv6";
        libraryHaskellDepends = [ base Cabal QuickCheck ];
-       homepage = "https://github.com/zmthy/cabal-test-quickcheck";
        description = "QuickCheck for Cabal";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -42791,7 +41199,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring Cabal containers ghc template-haskell
        ];
-       homepage = "https://github.com/TerrorJack/cabal-toolkit#readme";
        description = "Helper functions for writing custom Setup.hs scripts.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -42838,7 +41245,6 @@ self: {
          archlinux base bytestring Cabal cmdargs containers directory
          filepath mtl pretty process
        ];
-       homepage = "http://github.com/archhaskell/";
        description = "Create Arch Linux packages from Cabal packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42855,7 +41261,6 @@ self: {
        executableHaskellDepends = [
          base Cabal hsemail hxt parsec process
        ];
-       homepage = "http://gregheartsfield.com/cabal2doap/";
        description = "Cabal to Description-of-a-Project (DOAP)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42871,7 +41276,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ base curl directory ];
-       homepage = "yet";
        description = "make gentoo's .ebuild file from .cabal file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42923,7 +41327,6 @@ self: {
        testHaskellDepends = [
          base Cabal filepath language-nix lens pretty tasty tasty-golden
        ];
-       homepage = "https://github.com/nixos/cabal2nix#readme";
        description = "Convert Cabal files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -42935,8 +41338,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2spec";
-       version = "2.1";
-       sha256 = "0zh3xypxn78z7p7mg46ykxnmj2fv92maqx8wmclj1hqngp8ifnp3";
+       version = "2.1.1";
+       sha256 = "1fm9vi7iyxcpvvivy973njlmsp7ia7cl4jijhf43h8wq60skh1md";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal filepath time ];
@@ -42944,7 +41347,6 @@ self: {
          base Cabal filepath optparse-applicative
        ];
        testHaskellDepends = [ base Cabal filepath tasty tasty-golden ];
-       homepage = "https://github.com/peti/cabal2spec";
        description = "Convert Cabal files into rpm spec files";
        license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -42964,7 +41366,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers directory MissingH
        ];
-       homepage = "http://github.com/creswick/cabal-query";
        description = "A simple tool to query cabal files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -42998,7 +41399,6 @@ self: {
        executableHaskellDepends = [
          base bytestring Cabal containers directory filepath pretty process
        ];
-       homepage = "http://code.haskell.org/~dons/code/cabalgraph";
        description = "Generate pretty graphs of module trees from cabal files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43018,7 +41418,6 @@ self: {
          base Cabal classy-prelude directory filepath optparse-applicative
          text
        ];
-       homepage = "https://github.com/RobertFischer/cabalish#readme";
        description = "Provides access to the cabal file data for shell scripts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43034,7 +41433,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
        executableHaskellDepends = [ base Cabal cabalrpmdeps haskell98 ];
-       homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-cabalmdvrpm;a=shortlog;topi=0";
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43050,7 +41448,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal filepath haskell98 ];
        executableHaskellDepends = [ base Cabal filepath haskell98 ];
-       homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-CabalRpmDeps;a=summary";
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43097,7 +41494,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ cabocha ];
        testHaskellDepends = [ base text-format ];
-       homepage = "http://github.com/pecorarista/hscabocha";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {cabocha = null;};
@@ -43114,7 +41510,6 @@ self: {
          base clock hashable stm transformers unordered-containers
        ];
        testHaskellDepends = [ base clock hspec stm transformers ];
-       homepage = "https://github.com/hverr/haskell-cache#readme";
        description = "An in-memory key/value store with expiration support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43173,7 +41568,6 @@ self: {
        benchmarkHaskellDepends = [
          async base base16-bytestring bytestring criterion deepseq
        ];
-       homepage = "https://github.com/centromere/cacophony#readme";
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43186,7 +41580,6 @@ self: {
        version = "0.0.3";
        sha256 = "1yrl3ffkfwgs4kljx57m1ldam087s7iby2qs74c4crxkrcj0j7a8";
        libraryHaskellDepends = [ base ];
-       homepage = "http://sites.google.com/site/cafwiki/";
        description = "A library of Concurrency Abstractions using Futures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43198,7 +41591,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1iyasmd8zcg98vy7ffhxyyr664f02ird5z7rks9n67ixv7n60mrl";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/Scott-Fleischman/cafeteria-prelude";
        description = "Prelude subsets—take only what you want!";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43218,7 +41610,6 @@ self: {
          mtl optparse-applicative process protocol-buffers
          protocol-buffers-descriptor template-haskell temporary text
        ];
-       homepage = "https://github.com/ajtulloch/caffegraph/";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -43237,7 +41628,6 @@ self: {
          array base bytestring mtl text utf8-string
        ];
        libraryPkgconfigDepends = [ cairo ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Cairo library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) cairo;};
@@ -43317,7 +41707,6 @@ self: {
          optparse-applicative parsec process syb template-haskell text
          transformers utf8-string
        ];
-       homepage = "https://github.com/grwlf/cake3";
        description = "Third cake the Makefile EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43336,7 +41725,6 @@ self: {
        executableHaskellDepends = [
          base GLUT gluturtle lojbanParser yjsvg yjtools
        ];
-       homepage = "http://homepage3.nifty.com/salamander/myblog/cakyrespa.html";
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43350,7 +41738,6 @@ self: {
        sha256 = "1b4pajzpf879vns2kffkqgyk5sbsfrr3q2kv5ryvls8rgwcjc3q6";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ cal3d ];
-       homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43366,7 +41753,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ];
-       homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Examples for the Cal3d animation library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43379,7 +41765,6 @@ self: {
        version = "0.1";
        sha256 = "02na1ww5dw08n2y7v2vkgdvzw0zpiic5683jac7f2zvhcij68sf2";
        libraryHaskellDepends = [ base cal3d OpenGL ];
-       homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43416,7 +41801,6 @@ self: {
        testHaskellDepends = [
          base containers gtk parsec plot-gtk-ui QuickCheck
        ];
-       homepage = "https://github.com/sumitsahrawat/calculator";
        description = "A calculator repl, with variables, functions & Mathematica like dynamic plots";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43456,7 +41840,6 @@ self: {
        executableHaskellDepends = [
          base containers cpphs lens mtl parsec transformers
        ];
-       homepage = "https://github.com/mmirman/caledon";
        description = "a logic programming language based on the calculus of constructions";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -43472,7 +41855,6 @@ self: {
        executableHaskellDepends = [
          base containers html old-time utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/calendar-recycling";
        description = "List years with the same calendars";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43498,7 +41880,6 @@ self: {
          OpenGL OpenGLRaw random template-haskell text transformers vector
          WAVE
        ];
-       homepage = "https://github.com/fumieval/call";
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43518,7 +41899,6 @@ self: {
          base bytestring data-msgpack mtl storable-endian template-haskell
        ];
        executableHaskellDepends = [ base bytestring data-msgpack mtl ];
-       homepage = "https://github.com/nh2/call-haskell-from-anything";
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43532,7 +41912,6 @@ self: {
        sha256 = "1qmihf5jafmc79sk52l6gpx75f5bnla2lp62kh3p34x3j84mwpzj";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base nanospec ];
-       homepage = "https://github.com/sol/call-stack#readme";
        description = "Use GHC call-stacks in a backward compatible way";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43567,7 +41946,6 @@ self: {
          QuickCheck sbv silently temporary text time uniplate
          verifiable-expressions
        ];
-       homepage = "https://camfort.github.io";
        description = "CamFort - Cambridge Fortran infrastructure";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43583,7 +41961,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bytestring Imlib terminfo ];
-       homepage = "not yet available";
        description = "write image files onto 256(or 24bit) color terminals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43602,7 +41979,6 @@ self: {
          http-enumerator http-types mtl old-locale process text time
          transformers unordered-containers url
        ];
-       homepage = "http://github.com/michaelxavier/Campfire";
        description = "Haskell implementation of the Campfire API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43617,7 +41993,6 @@ self: {
        libraryHaskellDepends = [
          arithmoi array base containers polynomial
        ];
-       homepage = "https://github.com/grandpascorpion/canon";
        description = "Massive Number Arithmetic";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43630,7 +42005,6 @@ self: {
        version = "1.0.0.3";
        sha256 = "0dg9d4v08gykbjmzafpakgwc51mq5d5m6ilmhp68czpl30sqjhwf";
        libraryHaskellDepends = [ base deepseq directory filepath ];
-       homepage = "http://github.com/nominolo/canonical-filepath";
        description = "Abstract data type for canonical file paths";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43662,7 +42036,6 @@ self: {
          http-types mime-types monad-logger template-haskell text time
          transformers unix uuid wai wai-extra
        ];
-       homepage = "https://github.com/SumAll/canteven-http";
        description = "Utilities for HTTP programming";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43693,7 +42066,6 @@ self: {
          aeson base bytestring directory fast-logger filepath monad-logger
          template-haskell text time transformers yaml
        ];
-       homepage = "https://github.com/SumAll/haskell-canteven-log";
        description = "A canteven way of setting up logging for your program";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -43726,7 +42098,6 @@ self: {
          base blaze-html bytestring data-default markdown template-haskell
          text
        ];
-       homepage = "https://github.com/SumAll/haskell-canteven-template/";
        description = "A few utilites and helpers for using Template Haskell in your projects";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -43749,7 +42120,6 @@ self: {
          base bytestring Cabal containers directory filepath hspec hxt
          hxt-xpath parsec QuickCheck split
        ];
-       homepage = "https://github.com/klangner/cantor";
        description = "Application for analysis of java source code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43772,7 +42142,6 @@ self: {
          language-c mtl pretty process yices
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://haslab.uminho.pt/mbb/software/cao-domain-specific-language-cryptography";
        description = "CAO Compiler";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43813,7 +42182,28 @@ self: {
          safe-exceptions stm tasty tasty-hunit tasty-rerun tasty-smallcheck
          teardown text time unordered-containers uuid vector
        ];
-       homepage = "https://github.com/roman/Haskell-capataz#readme";
+       description = "OTP-like supervision trees in Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "capataz_0_2_0_0" = callPackage
+    ({ mkDerivation, async, base, bytestring, pretty-show
+     , prettyprinter, rio, tasty, tasty-hunit, tasty-smallcheck
+     , teardown, time, uuid
+     }:
+     mkDerivation {
+       pname = "capataz";
+       version = "0.2.0.0";
+       sha256 = "0b026vbp9xkwfis5xr1z4svi5z5b4dpj5c3w28133fr4rl6cdpx4";
+       libraryHaskellDepends = [
+         async base bytestring pretty-show prettyprinter rio teardown time
+         uuid
+       ];
+       testHaskellDepends = [
+         async base bytestring pretty-show prettyprinter rio tasty
+         tasty-hunit tasty-smallcheck teardown time uuid
+       ];
        description = "OTP-like supervision trees in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43864,7 +42254,6 @@ self: {
          explicit-exception happstack-server non-empty spreadsheet text
          transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/car-pool/";
        description = "Simple web-server for organizing car-pooling for an event";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43890,7 +42279,6 @@ self: {
          base containers HUnit linear sdl2 test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
-       homepage = "https://github.com/Noeda/caramia/";
        description = "High-level OpenGL bindings";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43905,7 +42293,6 @@ self: {
        libraryHaskellDepends = [
          base mysql-simple postgresql-simple split time
        ];
-       homepage = "https://github.com/szehk/Haskell-Carbonara-Library";
        description = "some spaghetti code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -43923,7 +42310,6 @@ self: {
        executableHaskellDepends = [
          base bytestring filepath haskell98 IfElse MissingH
        ];
-       homepage = "http://github.com/jdevelop/carboncopy";
        description = "Drop emails from threads being watched into special CC folder";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43945,7 +42331,6 @@ self: {
          base cairo directory filepath gtk gtk2hs-buildtools hcwiid
          highlighting-kate mtl pandoc pango process text time
        ];
-       homepage = "https://github.com/master-q/carettah";
        description = "A presentation tool written with Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -43982,7 +42367,6 @@ self: {
          base filepath mtl network optparse-applicative random semigroups
          time transformers tuple
        ];
-       homepage = "https://github.com/m1dnight/carte";
        description = "Carte: A commandline pastebin server";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44012,7 +42396,6 @@ self: {
          process QuickCheck random split tasty tasty-quickcheck tasty-th
          time transformers
        ];
-       homepage = "http://www.github.com/massysett/cartel";
        description = "Specify Cabal files in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44029,7 +42412,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casa-abbreviations-and-acronyms";
        description = "CASA Abbreviations and Acronyms";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44055,7 +42437,6 @@ self: {
          base containers doctest HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
-       homepage = "http://github.com/ghorn/casadi-bindings";
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44103,7 +42484,6 @@ self: {
        sha256 = "0p7kbg015447sasn6n4l5kdafrxc2yhgqrxg46xadma6vvv00hf2";
        libraryHaskellDepends = [ base containers vector ];
        librarySystemDepends = [ casadi ];
-       homepage = "http://github.com/ghorn/casadi-bindings";
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44171,7 +42551,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "www.xy30.com";
        description = "Convert between different cases";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44189,7 +42568,6 @@ self: {
          base bytestring HUnit test-framework test-framework-hunit text
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-       homepage = "https://github.com/basvandijk/case-insensitive";
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44211,7 +42589,6 @@ self: {
          base bytestring case-insensitive criterion random-strings tagsoup
          text
        ];
-       homepage = "https://github.com/mikehat/case-insensitive-match";
        description = "A simplified, faster way to do case-insensitive matching";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44223,7 +42600,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "08xdc0mpp6b6inaxh6cr6ni08sy2ahfcbq8xbs3m4cfqbrqfd543";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/jb55/cased";
        description = "Track string casing in its type";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
@@ -44236,7 +42612,6 @@ self: {
        version = "0.0.1";
        sha256 = "1j8r8ldaxgyvka3zpqfl8qp0mbwrnh1s1xl5fgx3jjzqxlisfdp3";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/chrisdone/caseof#readme";
        description = "Combinators for casing on constructors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44255,7 +42630,6 @@ self: {
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
        benchmarkHaskellDepends = [ criterion mwc-random rerebase ];
-       homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -44272,7 +42646,6 @@ self: {
        libraryHaskellDepends = [
          base deepseq haskell98 HaXml network parallel pretty
        ];
-       homepage = "http://www.cs.st-andrews.ac.uk/~hwloidl/SCIEnce/SymGrid-Par/CASH/";
        description = "the Computer Algebra SHell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44304,7 +42677,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook";
        description = "CASR 61.345 Pilot Personal Logbook";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44325,7 +42697,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook-html";
        description = "CASR 61.345 Pilot Personal Logbook HTML output";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44343,7 +42714,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook-meta";
        description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44365,7 +42735,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook-meta-html";
        description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook) HTML output";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44385,7 +42754,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook-reports";
        description = "CASR 61.345 logbook (casr-logbook) reports.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44407,7 +42775,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook-reports-html";
        description = "CASR 61.345 logbook reports HTML output";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44427,7 +42794,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook-reports-meta";
        description = "Reports on meta-information about entries in a CASR 61.345 logbook (casr-logbook)";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44451,7 +42817,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook-reports-meta-html";
        description = "HTML output for reports on meta-information about entries in a CASR 61.345 logbook";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44469,7 +42834,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/casr-logbook-types";
        description = "CASR 61.345 Pilot Personal Logbook";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44501,7 +42865,6 @@ self: {
        version = "0.8.5.1";
        sha256 = "0hmmi0g32nfwcny56sb4jw463jp7hiwj2hhv42bf8h9az30vjxwc";
        libraryHaskellDepends = [ base bytestring containers Thrift ];
-       homepage = "http://cassandra.apache.org/";
        description = "thrift bindings to the cassandra database";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44528,7 +42891,6 @@ self: {
          quickcheck-instances scientific test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
-       homepage = "https://github.com/hvr/cassava";
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44549,7 +42911,6 @@ self: {
          base bytestring cassava conduit QuickCheck text
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/domdere/cassava-conduit";
        description = "Conduit interface for cassava package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44568,7 +42929,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cassava template-haskell vector
        ];
-       homepage = "https://github.com/typeable/cassava-embed#readme";
        description = "CSV-file embedding library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44590,7 +42950,6 @@ self: {
        testHaskellDepends = [
          base bytestring cassava hspec hspec-megaparsec vector
        ];
-       homepage = "https://github.com/stackbuilders/cassava-megaparsec";
        description = "Megaparsec parser of CSV files that plays nicely with Cassava";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -44613,7 +42972,6 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck template-haskell text
          unordered-containers vector
        ];
-       homepage = "https://github.com/gdevanla/cassava-records#readme";
        description = "Auto-generation of records data type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44635,7 +42993,6 @@ self: {
          base bytestring cassava io-streams QuickCheck tasty
          tasty-quickcheck vector
        ];
-       homepage = "https://github.com/pjones/cassava-streams";
        description = "io-streams interface for the cassava CSV library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44675,7 +43032,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text Thrift time
        ];
-       homepage = "http://github.com/ozataman/cassy";
        description = "A high level driver for the Cassandra datastore";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44688,7 +43044,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "14dwsy80v1k0d9ksxb83h5lrz311d3nsgzcxxvivcdj4jzjlbm94";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/haskell-patterns/cast#readme";
        description = "Abstact cast pattern";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44707,7 +43062,6 @@ self: {
          base containers optparse-applicative shelly system-fileio
          system-filepath text
        ];
-       homepage = "https://github.com/erochest/castle";
        description = "A tool to manage shared cabal-install sandboxes";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44723,7 +43077,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk haskell98 mtl parsec ];
-       homepage = "http://code.atnnn.com/projects/casui";
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44737,7 +43090,6 @@ self: {
        sha256 = "0a01nr2lk80pfv9dr4sxyixwhfpprrvbgh44901as4jnb3gcbk33";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/frerich/catamorphism";
        description = "Exposes a Template Haskell function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44749,7 +43101,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "05fvrkvqyj7xdn6vvdwhfbym7rg9fl7r7lzzcsr2cx59iqi23frx";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "http://github.com/sonyandy/catch-fd";
        description = "MonadThrow and MonadCatch, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44774,7 +43125,6 @@ self: {
        version = "1.0.7";
        sha256 = "18ihv16g4w0s6n89c64j4998hbsgzhp5w9ph2gdkygq7f30cx7f2";
        libraryHaskellDepends = [ base void ];
-       homepage = "http://github.com/ekmett/categories";
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44814,7 +43164,6 @@ self: {
          semigroups void
        ];
        doHaddock = false;
-       homepage = "http://comonad.com/reader/";
        description = "A meta-package documenting various packages inspired by category theory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44858,7 +43207,6 @@ self: {
          ansi-terminal base directory either optparse-applicative
          template-haskell terminal-size transformers vcs-revision
        ];
-       homepage = "https://github.com/rcook/catnplus#readme";
        description = "Simple tool to display text files with line numbers and paging";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44871,7 +43219,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "0kydmb5f714pfgjz6drqi91m43bgs2sfap2nbww92xxyjbcls3j6";
        libraryHaskellDepends = [ aeson base transformers validity ];
-       homepage = "https://github.com/Nickske666/cautious#readme";
        description = "Keep track of warnings and errors during calculations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -44907,7 +43254,6 @@ self: {
          base cautious genvalidity genvalidity-hspec genvalidity-hspec-aeson
          hspec QuickCheck
        ];
-       homepage = "https://github.com/Nickske666/cautious#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -44927,7 +43273,6 @@ self: {
          unordered-containers vector
        ];
        testHaskellDepends = [ aeson base hspec unordered-containers ];
-       homepage = "https://github.com/MichelBoucey/cayley-client";
        description = "A Haskell client for the Cayley graph database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44941,7 +43286,6 @@ self: {
        sha256 = "1hq4njmjzbc7l4s16xivks5v5gvp4mj4iq6qr78q3vd9p1fmgfmw";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base random ];
-       homepage = "https://github.com/lmj/cayley-dickson";
        description = "Complex numbers, quaternions, octonions, sedenions, etc";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -44986,7 +43330,6 @@ self: {
          aeson aeson-pretty base bytestring cborg cborg-json filepath
          scientific text unordered-containers vector
        ];
-       homepage = "https://github.com/well-typed/cborg";
        description = "A tool for manipulating CBOR";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45021,7 +43364,6 @@ self: {
          aeson aeson-pretty base cborg scientific text unordered-containers
          vector
        ];
-       homepage = "https://github.com/well-typed/cborg";
        description = "A library for encoding JSON as CBOR";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45056,7 +43398,6 @@ self: {
        version = "0.0.0";
        sha256 = "18gnm6skzdnh6cis7l7v3d5813zn6irw6nywg6shffrn8v2y6xh7";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://tomahawkins.org";
        description = "A Haskell implementation of the CCNx network protocol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45074,7 +43415,6 @@ self: {
          bindings-cctools bytestring lens monad-loops unix
        ];
        librarySystemDepends = [ dttools ];
-       homepage = "http://bitbucket.org/badi/hs-cctools-workqueue";
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45128,7 +43468,6 @@ self: {
        sha256 = "1jy4prprrhcjr0xjhbyz9h7wa19s52ckn3nls8jy9zic6455hr45";
        libraryHaskellDepends = [ base bytestring text time ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/picussecurity/haskell-cef.git";
        description = "CEF log format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45179,7 +43518,6 @@ self: {
          lens lens-properties mtl pipes QuickCheck siphash template-haskell
          text transformers vaultaire-common
        ];
-       homepage = "https://github.com/anchor/ceilometer-common";
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45219,7 +43557,6 @@ self: {
          yaml
        ];
        testHaskellDepends = [ base hspec raw-strings-qq ];
-       homepage = "https://nest.pijul.com/lthms/celtchar";
        description = "A tool to build a novel";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45248,7 +43585,6 @@ self: {
          base cmdargs ekg ekg-core hslogger pretty-show
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/yogsototh/cerberus#readme";
        description = "Protect and control API access with cerberus";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45269,7 +43605,6 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/GaloisInc/cereal";
        description = "A binary serialization library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45290,7 +43625,6 @@ self: {
        testHaskellDepends = [
          base bytestring cereal conduit HUnit mtl transformers
        ];
-       homepage = "https://github.com/snoyberg/conduit";
        description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45326,7 +43660,6 @@ self: {
        version = "0.1";
        sha256 = "1gr22ziz9bj4q3y8j1vg46m648zqvbajfdks8p64xc28ci25pw2s";
        libraryHaskellDepends = [ array base cereal ];
-       homepage = "http://github.com/jystic/cereal-ieee754";
        description = "Floating point support for the 'cereal' serialization library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45374,7 +43707,6 @@ self: {
          HTF HUnit mmorph mtl QuickCheck quickcheck-instances stm text time
          unordered-containers vector
        ];
-       homepage = "https://github.com/nikita-volkov/cereal-plus";
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45410,7 +43742,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0k1ml0z5rksvrhz15i9afld7bybgylqmy5nmvik3p98zd3s1ayiw";
        libraryHaskellDepends = [ base cereal text ];
-       homepage = "https://github.com/ulikoehler/cereal-text";
        description = "Data.Text instances for the cereal serialization library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -45435,7 +43766,6 @@ self: {
        sha256 = "0czrb4l1n73cfxxlzbcqfa34qa3gw0m5w5mlz0rawylyqfk8a1pz";
        libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [ base cereal QuickCheck vector ];
-       homepage = "https://github.com/acfoltzer/cereal-vector";
        description = "Serialize instances for Data.Vector types.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45457,7 +43787,6 @@ self: {
          asn1-data base bytestring containers crypto-pubkey-types cryptohash
          directory filepath mtl pem process time
        ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45476,7 +43805,6 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
-       homepage = "http://github.com/mvr/cf";
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45495,7 +43823,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers data-default dequeue mtl
        ];
-       homepage = "https://github.com/bairyn/cfipu";
        description = "cfipu processor for toy brainfuck-like language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45515,7 +43842,6 @@ self: {
          level-monad logict MonadRandom mtl random stream-monad syb
          value-supply
        ];
-       homepage = "http://www-ps.informatik.uni-kiel.de/~sebf/projects/cflp.html";
        description = "Constraint Functional-Logic Programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45575,7 +43901,6 @@ self: {
          template-haskell
        ];
        doHaddock = false;
-       homepage = "http://anttisalonen.github.com/cgen";
        description = "generates Haskell bindings and C wrappers for C++ libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45595,7 +43920,6 @@ self: {
          network-uri parsec time xhtml
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
-       homepage = "https://github.com/cheecheeo/haskell-cgi";
        description = "A library for writing CGI programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45622,7 +43946,6 @@ self: {
        revision = "1";
        editedCabalFile = "0lnx7n8pagi3pw57cz4nz01lhfjmsyhk3z3kwgfrmdyrb3kb276z";
        libraryHaskellDepends = [ base cgi containers mtl random ];
-       homepage = "http://github.com/chrisdone/haskell-cgi-utils";
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45649,7 +43972,6 @@ self: {
          transformers unicode-show unix-compat unordered-containers
          utf8-string yaml
        ];
-       homepage = "http://awgn.github.io/cgrep/";
        description = "Command line tool";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45663,7 +43985,6 @@ self: {
        sha256 = "0vw6qwgcljxgrjrsgkpkdqqnpxvibnsc0c4h5kyg5p8h4avsk8k6";
        libraryHaskellDepends = [ base containers JuicyPixels ];
        testHaskellDepends = [ base containers hspec JuicyPixels ];
-       homepage = "http://github.com/Fuuzetsu/chain-codes";
        description = "Library decoding chain codes from images";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -45675,7 +43996,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1iyyz3rmnry3myw985qmqjyikhq41dw16rjs5gfgqbx7j1wrykpj";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/joom/chalk";
        description = "Terminal string styling";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -45694,7 +44014,6 @@ self: {
          array base binary bytestring Codec-Image-DevIL containers
          data-reify directory GLUT OpenGLRaw process time
        ];
-       homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard";
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45707,7 +44026,6 @@ self: {
        version = "0.1";
        sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2";
        libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ];
-       homepage = "http://ittc.ku.edu/~andygill/chalkboard.php";
        description = "OpenGL based viewer for chalkboard rendered images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45721,7 +44039,6 @@ self: {
        sha256 = "12cwp804z1grsn4pyygd2mffr5lm02g1rxibjill5wyd24k1brgb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base process random ];
-       homepage = "http://projects.haskell.org/chalmers-lava2000/Doc/tutorial.pdf";
        description = "Hardware description EDSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45734,7 +44051,6 @@ self: {
        sha256 = "0ci20y0wd232qnh1mql3vjqml13mkrpm9dgv005wcgym7w18isgr";
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base stm ];
-       homepage = "https://github.com/athanclark/chan#readme";
        description = "Some extra kit for Chans";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45746,7 +44062,6 @@ self: {
        version = "0.5.0";
        sha256 = "1mzvrxcf263gs61hj7gafra1cqvpfbzy7rza7ql0xvnmj2g2ybrc";
        libraryHaskellDepends = [ base stm ];
-       homepage = "http://brandon.si/code/module-chan-split-released/";
        description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45790,7 +44105,6 @@ self: {
          ansi-terminal base doctest Glob QuickCheck turtle
          unordered-containers
        ];
-       homepage = "https://github.com/GetShopTV/changelogged#readme";
        description = "Changelog manager for Git projects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45814,7 +44128,6 @@ self: {
          base configurator containers filepath heist lens mtl QuickCheck
          random snap snap-core snap-extras snap-server text xmlhtml
        ];
-       homepage = "https://github.com/soostone/charade";
        description = "Rapid prototyping websites with Snap and Heist";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45831,7 +44144,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers semigroups unordered-containers
        ];
-       homepage = "http://github.com/ekmett/charset";
        description = "Fast unicode character sets based on complemented PATRICIA tries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45843,7 +44155,6 @@ self: {
        version = "1.1.0.2";
        sha256 = "1rnm36lvh1g4i9pz87jqqznn8d9pmxlin549ch0nacpi0bn3k0sy";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://www.github.com/batterseapower/charsetdetect";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
      }) {};
@@ -45855,11 +44166,22 @@ self: {
        version = "1.1.0.3";
        sha256 = "15kf9g708ics81s3gj4vkx4xcvywj2fripf0g9p29v4xliwd9m7y";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
      }) {};
 
+  "charsetdetect-ae_1_1_0_4" = callPackage
+    ({ mkDerivation, base, bytestring }:
+     mkDerivation {
+       pname = "charsetdetect-ae";
+       version = "1.1.0.4";
+       sha256 = "0321j2kmlvf88bhlbi8ddnzgbckq37sfb7nm7r0dvar6626s9flv";
+       libraryHaskellDepends = [ base bytestring ];
+       description = "Character set detection using Mozilla's Universal Character Set Detector";
+       license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "chart-histogram" = callPackage
     ({ mkDerivation, base, Chart }:
      mkDerivation {
@@ -45900,7 +44222,6 @@ self: {
          base doctest numhask numhask-prelude numhask-range tasty
          tasty-hspec
        ];
-       homepage = "https://github.com/tonyday567/chart-unit#readme";
        description = "Native haskell charts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45924,7 +44245,6 @@ self: {
          containers ghc-prim HUnit test-framework test-framework-hunit
          vector
        ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "Chase & Lev work-stealing lock-free double-ended queues (deques)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45959,7 +44279,6 @@ self: {
          quickcheck-instances tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck text tokenize unordered-containers
        ];
-       homepage = "http://github.com/creswick/chatter";
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -45978,7 +44297,6 @@ self: {
          ansi-terminal base chatty-utils directory mtl process random setenv
          template-haskell text time transformers unix
        ];
-       homepage = "http://hub.darcs.net/enum/chatty";
        description = "Some monad transformers and typeclasses for abstraction of global dependencies";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -45990,7 +44308,6 @@ self: {
        version = "0.6.2.1";
        sha256 = "00f3h0vw0mxrcqjfwas9ddx9hhcvfzvy0p43xqq29ibwdcgms3w2";
        libraryHaskellDepends = [ base chatty transformers ];
-       homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46003,7 +44320,6 @@ self: {
        version = "0.7.3.4";
        sha256 = "1dp1k641sryzp7zh5l3f8v4dajc71ly8l9fyv1c45cf0s81cxhys";
        libraryHaskellDepends = [ base mtl text transformers ];
-       homepage = "http://hub.darcs.net/enum/chatty-utils";
        description = "Some utilities every serious chatty-based application may need";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -46032,7 +44348,6 @@ self: {
          hspec http-api-data http-client http-client-tls http-types req
          servant-server text warp
        ];
-       homepage = "https://github.com/matsubara0507/chatwork#readme";
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -46054,7 +44369,6 @@ self: {
          uniplate xss-sanitize
        ];
        executableHaskellDepends = [ base blaze-html bytestring text ];
-       homepage = "http://github.com/jgm/cheapskate";
        description = "Experimental markdown processor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46072,7 +44386,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html cheapskate highlighting-kate text
        ];
-       homepage = "http://github.com/aelve/cheapskate-highlight";
        description = "Code highlighting for cheapskate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46086,7 +44399,6 @@ self: {
        revision = "1";
        editedCabalFile = "197nx95xw21i7zyvgzcgnr36ab6vrk17c66iz8ndwz61vp1jf6hc";
        libraryHaskellDepends = [ base blaze-html cheapskate lucid ];
-       homepage = "http://github.com/aelve/cheapskate-lucid";
        description = "Use cheapskate with Lucid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46113,7 +44425,6 @@ self: {
          ansi-terminal base cheapskate data-default directory hpygments
          hscolour terminal-size text
        ];
-       homepage = "http://github.com/yamadapc/cheapskate-terminal#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46127,7 +44438,6 @@ self: {
        sha256 = "09wkz853ikr4yns2z12rnzprb98q4b8li1n6lmx5v6m0vgx1a9hw";
        libraryHaskellDepends = [ base bytestring email-validate ];
        librarySystemDepends = [ resolv ];
-       homepage = "https://github.com/qoelet/check-email#readme";
        description = "Confirm whether an email is valid and probably existant";
        license = stdenv.lib.licenses.bsd3;
      }) {resolv = null;};
@@ -46146,7 +44456,6 @@ self: {
          base Cabal containers explicit-exception filepath haskell-src-exts
          non-empty transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Import_modules_properly";
        description = "Check whether module and package imports conform to the PVP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46175,7 +44484,6 @@ self: {
        libraryHaskellDepends = [
          array base QuickCheck random semigroupoids
        ];
-       homepage = "https://github.com/conal/checkers";
        description = "Check properties on standard classes and data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46206,7 +44514,6 @@ self: {
          hspec hspec-megaparsec interpolatedstring-perl6 megaparsec
          QuickCheck quickcheck-text range temporary text
        ];
-       homepage = "https://github.com/spoqa/checkmate#readme";
        description = "Generate checklists relevant to a given patch";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46219,7 +44526,6 @@ self: {
        version = "0.0";
        sha256 = "0327lihvibnhs2c0gnmm13g6iaw53ka3w2j1rng4d1vnrxphyyik";
        libraryHaskellDepends = [ base explicit-exception utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/checksum";
        description = "Compute and verify checksums of ISBN, IBAN, etc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46236,7 +44542,6 @@ self: {
          ansi-terminal base bytestring options patience random
          template-haskell text transformers
        ];
-       homepage = "https://john-millikin.com/software/chell/";
        description = "A simple and intuitive library for automated testing";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -46248,7 +44553,6 @@ self: {
        version = "0.2.1";
        sha256 = "006l2j98gmgjrapyp00vz93hxlx9gwkdnxwh5nx293zp7vm27x00";
        libraryHaskellDepends = [ base chell HUnit ];
-       homepage = "https://john-millikin.com/software/chell/";
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46261,7 +44565,6 @@ self: {
        version = "0.2.5.1";
        sha256 = "1iicsys9igx7m7n4l2b8djardmjy2ah5ibzp7kzs758h460fq53a";
        libraryHaskellDepends = [ base chell QuickCheck random ];
-       homepage = "https://john-millikin.com/software/chell/";
        description = "QuickCheck support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -46275,7 +44578,6 @@ self: {
        libraryHaskellDepends = [
          array attoparsec base bytestring containers
        ];
-       homepage = "http://arnovanlumig.com/chesshs.html";
        description = "Simple library for validating chess moves and parsing PGN files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46313,7 +44615,6 @@ self: {
          base digits either-unwrap generic-trie haskeline parsec
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/marcusbuffett/chitauri";
        description = "Helper for the Major System";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46326,7 +44627,6 @@ self: {
        version = "0.2.2";
        sha256 = "0qcyf6nqi0nyhbf3xwyib95y29j5ir94d5vg449mkpr92crf8ryk";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mboes/choice#readme";
        description = "A solution to boolean blindness";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -46371,7 +44671,6 @@ self: {
          base containers HUnit ieee754 QuickCheck safe test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mocnik-science/chorale";
        description = "A module containing basic functions that the prelude does not offer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46390,7 +44689,6 @@ self: {
          base binary chorale HUnit ieee754 QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mocnik-science/chorale-geo";
        description = "A module containing basic geo functions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46407,7 +44705,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq extensible-exceptions pretty stm
        ];
-       homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46420,7 +44717,6 @@ self: {
        version = "1.0.0";
        sha256 = "1x14xl9hm9n3zczj6xhffvpac09q5a13i94fhkq2kzj2s3rk1b4z";
        libraryHaskellDepends = [ base chp chp-plus mtl ];
-       homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "MTL class instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46438,7 +44734,6 @@ self: {
          base chp containers deepseq extensible-exceptions HUnit pretty
          QuickCheck stm
        ];
-       homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46455,7 +44750,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq mtl pretty TypeCompose
        ];
-       homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "A mirror implementation of chp that generates a specification of the program";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46468,7 +44762,6 @@ self: {
        version = "1.0.0";
        sha256 = "0d4hcqpjxmns1fhq918s6z9f4bxlbjlkxzq5xkpqwjxpzy83wq23";
        libraryHaskellDepends = [ base chp chp-plus transformers ];
-       homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "Transformers instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46486,7 +44779,6 @@ self: {
          base chr-data chr-pretty containers hashable logict-state mtl
          pqueue unordered-containers
        ];
-       homepage = "https://github.com/atzedijkstra/chr";
        description = "Constraint Handling Rules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46508,7 +44800,6 @@ self: {
          microlens-mtl microlens-th mtl template-haskell
          unordered-containers vector
        ];
-       homepage = "https://github.com/atzedijkstra/chr";
        description = "Datatypes required for chr library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46528,7 +44819,6 @@ self: {
          mtl time unordered-containers
        ];
        executableHaskellDepends = [ base chr-data ];
-       homepage = "https://github.com/atzedijkstra/chr";
        description = "AST + surface language around chr";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46543,7 +44833,6 @@ self: {
        revision = "1";
        editedCabalFile = "0h3qyn306sxqsvxmz9hfba169nkc3hx7ygkxr5j2sz033fvi31jc";
        libraryHaskellDepends = [ base containers uulib ];
-       homepage = "https://github.com/atzedijkstra/chr";
        description = "Parsing for chr library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46557,7 +44846,6 @@ self: {
        revision = "1";
        editedCabalFile = "15v5bv7azi7qw33rg849wggpy07ingd8fp24dm0azwgwsqd05mb9";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/atzedijkstra/chr";
        description = "Pretty printing for chr library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46588,7 +44876,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hourglass hspec QuickCheck vector
        ];
-       homepage = "https://github.com/afcowie/chronologique/";
        description = "Time to manipulate time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46611,7 +44898,6 @@ self: {
          attoparsec base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/andrewthad/chronos#readme";
        description = "A performant time library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46629,7 +44915,6 @@ self: {
          base bytestring data-default hack2 hack2-handler-snap-server
          utf8-string
        ];
-       homepage = "https://github.com/nfjinjing/chu2";
        description = "FFI for Chu2 Agda Web Server Interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46648,7 +44933,6 @@ self: {
          parsec text transformers
        ];
        testHaskellDepends = [ base HUnit text transformers unix ];
-       homepage = "http://github.com/marcotmarcot/chuchu";
        description = "Behaviour Driven Development like Cucumber for Haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46665,7 +44949,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers semigroups text transformers vector
        ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Typeclasses for dealing with various chunked data representations";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -46677,7 +44960,6 @@ self: {
        version = "2007.4.18";
        sha256 = "0qdwilzhbnx5zgga65lcwd6kzwvsbvi8ybfw9i4d8ziz89190fkz";
        libraryHaskellDepends = [ base haskell98 parsec template-haskell ];
-       homepage = "http://www.wellquite.org/chunks/";
        description = "Simple template library with static safety";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46742,7 +45024,6 @@ self: {
          http-types lens mtl pretty-show QuickCheck template-haskell text
          uuid wreq
        ];
-       homepage = "https://github.com/beijaflor-io/haskell-cielo";
        description = "Cielo API v3 Bindings for Haskell";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46755,7 +45036,6 @@ self: {
        version = "0.1.1";
        sha256 = "0farjdyq6w33jm0qqdkfd6l7b8rr6k55dqfha643mj6nh1y904az";
        libraryHaskellDepends = [ base bytestring language-c ];
-       homepage = "http://tomahawkins.org";
        description = "An interface to CIL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46769,7 +45049,6 @@ self: {
        sha256 = "0niz7banhrkcwdfp6w5gwy1brz1c26mylnlavi5zxgawfq4d3sl2";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ cinvoke ];
-       homepage = "http://haskell.org/haskellwiki/Library/cinvoke";
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46782,7 +45061,6 @@ self: {
        version = "0.1.0";
        sha256 = "0518cbfyjh13ghihvnxvbhlw4060cqw5047bdrflphmigwbvpplb";
        libraryHaskellDepends = [ base monad-stm mtl parallel-io stm ];
-       homepage = "https://github.com/nikita-volkov/cio";
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -46809,7 +45087,6 @@ self: {
          base bytestring criterion crypto-cipher-benchmarks
          crypto-cipher-types mtl
        ];
-       homepage = "https://github.com/vincenthz/hs-cipher-aes";
        description = "Fast AES cipher implementation with advanced mode of operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46833,7 +45110,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring cereal criterion crypto-api entropy tagged
        ];
-       homepage = "https://github.com/TomMD/cipher-aes128";
        description = "AES and common modes using AES-NI when available";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46859,7 +45135,6 @@ self: {
          base bytestring criterion crypto-cipher-benchmarks
          crypto-cipher-types mtl
        ];
-       homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Blowfish cipher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46885,7 +45160,6 @@ self: {
          base bytestring criterion crypto-cipher-benchmarks
          crypto-cipher-types mtl
        ];
-       homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Camellia block cipher primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46911,7 +45185,6 @@ self: {
          base bytestring criterion crypto-cipher-benchmarks
          crypto-cipher-types mtl
        ];
-       homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "DES and 3DES primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46937,7 +45210,6 @@ self: {
          base bytestring criterion crypto-cipher-benchmarks
          crypto-cipher-types deepseq mtl
        ];
-       homepage = "http://github.com/vincenthz/hs-cipher-rc4";
        description = "Fast RC4 cipher implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46949,7 +45221,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0l9lhyqn74mlgwm4mplm94i0x2xjmvnxnp8nm3h6aj8v5ishl1md";
        libraryHaskellDepends = [ base split ];
-       homepage = "http://github.com/fegu/cipher-rc5";
        description = "Pure RC5 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -46964,7 +45235,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base bytestring ];
        executableHaskellDepends = [ array base bytestring parseargs ];
-       homepage = "http://github.com/BartMassey/ciphersaber";
        description = "Implementation of CipherSaber2 RC4 cryptography";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47006,7 +45276,6 @@ self: {
          aeson base http-client http-client-tls mtl servant servant-client
          text time transformers unordered-containers
        ];
-       homepage = "https://github.com/denisshevchenko/circlehs";
        description = "The CircleCI REST API for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47019,7 +45288,6 @@ self: {
        version = "0.0.2";
        sha256 = "11qnc8rbw9zxrsaa49x5wmkrnr0vi6pgb1j18nrn40sbbww95xrz";
        libraryHaskellDepends = [ aeson base text vector ];
-       homepage = "https://github.com/Cirru/parser.hs";
        description = "Cirru Parser in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47048,7 +45316,6 @@ self: {
          aeson async attoparsec base bytestring conduit data-default hspec
          http-conduit http-types network-uri text wai warp
        ];
-       homepage = "https://github.com/nshimaza/webex-teams-api#readme";
        description = "A Haskell bindings for Webex Teams API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47072,7 +45339,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath hspec MissingH QuickCheck
        ];
-       homepage = "https://github.com/nushio3/citation-resolve";
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47093,7 +45359,6 @@ self: {
          HTTP json mtl network network-uri old-locale pandoc-types parsec
          syb time utf8-string
        ];
-       homepage = "http://istitutocolli.org/repos/citeproc-hs/";
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47114,7 +45379,6 @@ self: {
          aeson base bytestring citeproc-hs containers directory filepath mtl
          pandoc pandoc-types parsec tagsoup texmath utf8-string yaml
        ];
-       homepage = "http://istitutocolli.org/repos/citeproc-hs-pandoc-filter/";
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47133,7 +45397,6 @@ self: {
          base bytestring largeword QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/thoughtpolice/hs-cityhash";
        description = "Bindings to CityHash";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47174,7 +45437,6 @@ self: {
          attoparsec base bytestring containers text text-icu
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/batterseapower/cjk";
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47229,7 +45491,6 @@ self: {
          lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit
          tasty-th transformers-compat
        ];
-       homepage = "http://clafer.org";
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47263,7 +45524,6 @@ self: {
          array base clafer cmdargs directory filepath HUnit tasty
          tasty-hunit tasty-th transformers transformers-compat
        ];
-       homepage = "http://clafer.org";
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47284,7 +45544,6 @@ self: {
          network-uri process SHA split time transformers transformers-compat
          utf8-string
        ];
-       homepage = "http://github.com/gsdlab/claferwiki";
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47298,7 +45557,6 @@ self: {
        sha256 = "1a0wvk82k65b5lscsvg5p41shpz98rahq44d5vyf8wclfshh2ihi";
        libraryHaskellDepends = [ aeson base bytestring text ];
        testHaskellDepends = [ aeson base bytestring ];
-       homepage = "https://github.com/lambdageek/clang-compilation-database";
        description = "JSON Compilation Database Format encoding and decoding";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47373,7 +45631,6 @@ self: {
          filepath ghc haskell98 pretty prettyclass template-haskell tfp
          th-lift time transformers utility-ht vhdl
        ];
-       homepage = "http://clash.ewi.utwente.nl/";
        description = "CAES Language for Synchronous Hardware (CLaSH)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47405,7 +45662,6 @@ self: {
          uniplate unix unordered-containers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47431,7 +45687,6 @@ self: {
          prettyprinter process reducers template-haskell text time
          transformers trifecta unbound-generics unordered-containers
        ];
-       homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - As a Library";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47448,7 +45703,6 @@ self: {
        libraryHaskellDepends = [
          base clash-prelude deepseq ghc-typelits-knownnat QuickCheck
        ];
-       homepage = "https://github.com/ra1u/clash-multisignal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -47474,7 +45728,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq template-haskell
        ];
-       homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47506,7 +45759,6 @@ self: {
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
        ];
-       homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47525,7 +45777,6 @@ self: {
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
        ];
-       homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47544,7 +45795,6 @@ self: {
          base clash-lib clash-prelude fgl hashable lens mtl text
          unordered-containers wl-pprint-text
        ];
-       homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - VHDL backend";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47573,7 +45823,6 @@ self: {
          aeson async-io-either base bytestring lens mtl scientific text time
          vector wreq
        ];
-       homepage = "https://github.com/mankyKitty/classy-influxdb-simple#readme";
        description = "Super simple InfluxDB package in Classy-MTL style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47594,7 +45843,6 @@ self: {
        ];
        executableHaskellDepends = [ base miso rfc ];
        testHaskellDepends = [ base miso rfc ];
-       homepage = "https://github.com/RobertFischer/Classy-Miso#README.md";
        description = "Typeclass based support for Miso, the Tasty Web Framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47638,7 +45886,6 @@ self: {
        testHaskellDepends = [
          base containers hspec QuickCheck transformers unordered-containers
        ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "A typeclass-based Prelude";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47658,7 +45905,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit hspec QuickCheck transformers
        ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "classy-prelude together with conduit functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47677,7 +45923,6 @@ self: {
          http-conduit http-types persistent yesod yesod-newsfeed
          yesod-static
        ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Provide a classy prelude including common Yesod functionality";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -47702,22 +45947,22 @@ self: {
        pname = "clay";
        version = "0.12.2";
        sha256 = "12p9hrky0dynsraz46ddhr4ah5aw9kragvcd5xza7j388ni9b2za";
+       revision = "1";
+       editedCabalFile = "1db2rc6q4a1699n43xmq31mv24b7ayc4ivc3n748zkzhs6ff4nbg";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base hspec hspec-expectations mtl text ];
-       homepage = "http://fvisser.nl/clay";
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "clay_0_13_0" = callPackage
-    ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
+  "clay_0_13_1" = callPackage
+    ({ mkDerivation, base, hspec, hspec-discover, mtl, text }:
      mkDerivation {
        pname = "clay";
-       version = "0.13.0";
-       sha256 = "0kyg5ifrjdvd7rxzsa6jjfyv9xx8amlfzbmrfwksrqla2nxqyljl";
+       version = "0.13.1";
+       sha256 = "18r8lgzyscxnw6xdxg0jxvp2977i02fjh3n5p89fnd8qrh0r2kl4";
        libraryHaskellDepends = [ base mtl text ];
-       testHaskellDepends = [ base hspec hspec-expectations mtl text ];
-       homepage = "http://fvisser.nl/clay";
+       testHaskellDepends = [ base hspec hspec-discover mtl text ];
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47753,7 +45998,6 @@ self: {
          web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
        ];
        librarySystemDepends = [ openssl ];
-       homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
@@ -47771,7 +46015,6 @@ self: {
        executableHaskellDepends = [
          acid-state base clckwrks haskeline mtl network parsec
        ];
-       homepage = "http://www.clckwrks.com/";
        description = "a command-line interface for adminstrating some aspects of clckwrks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47793,7 +46036,6 @@ self: {
          text web-plugins
        ];
        executableToolDepends = [ hsx2hs ];
-       homepage = "http://www.clckwrks.com/";
        description = "clckwrks.com";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47820,7 +46062,6 @@ self: {
          web-routes web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
-       homepage = "http://clckwrks.com/";
        description = "bug tracking plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47845,7 +46086,6 @@ self: {
          safecopy text web-plugins web-routes web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
-       homepage = "http://www.clckwrks.com/";
        description = "ircbot plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47870,7 +46110,6 @@ self: {
          network-uri reform reform-happstack reform-hsp safecopy text time
          uuid uuid-orphans web-plugins web-routes web-routes-th
        ];
-       homepage = "http://www.clckwrks.com/";
        description = "mailing list plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47894,7 +46133,6 @@ self: {
          web-routes-th
        ];
        libraryToolDepends = [ hsx2hs ];
-       homepage = "http://clckwrks.com/";
        description = "media plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47921,7 +46159,6 @@ self: {
          uuid-orphans web-plugins web-routes web-routes-happstack
          web-routes-th
        ];
-       homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47939,7 +46176,6 @@ self: {
          base clckwrks happstack-authenticate hsp hsx-jmacro hsx2hs jmacro
          mtl text web-plugins
        ];
-       homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -47957,7 +46193,6 @@ self: {
          base clckwrks containers happstack-authenticate hsp hsx2hs mtl text
          web-plugins
        ];
-       homepage = "http://www.clckwrks.com/";
        description = "simple bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47971,7 +46206,6 @@ self: {
        sha256 = "1qxik7hdz300n5lfb5xzh2md44b4xwwlr0c92y9x2na2xz41da7k";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base clckwrks hsp text ];
-       homepage = "http://divshot.github.com/geo-bootstrap/";
        description = "geo bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -47984,7 +46218,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "04sh2077pn67y1apgzx6rp4z15dw7qbvwg6yrwg416k40ilz7nbd";
        libraryHaskellDepends = [ base bytestring hashable text ];
-       homepage = "https://github.com/dfoxfranke/haskell-cld2";
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48003,7 +46236,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs containers directory HSH IfElse
        ];
-       homepage = "https://github.com/ivanperez-keera/clean-home";
        description = "Keep your home dir clean by finding old conf files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48015,7 +46247,6 @@ self: {
        version = "0.1.1";
        sha256 = "1y4cj15s6gjcazwk0iycyc2qs7chrqcvchf4g5h4xnf2x8ld4i21";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/fumieval/clean-unions";
        description = "Open unions without need for Typeable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48035,7 +46266,6 @@ self: {
          base highlighting-kate optparse-applicative process terminfo
          wl-pprint-extras wl-pprint-terminfo
        ];
-       homepage = "https://github.com/tanakh/cless";
        description = "Colorized LESS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48051,7 +46281,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl parsec ];
        executableHaskellDepends = [ parsec ];
-       homepage = "http://sandbox.pocoo.org/clevercss-hs/";
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48080,7 +46309,6 @@ self: {
        testHaskellDepends = [
          base directory QuickCheck tasty tasty-quickcheck transformers
        ];
-       homepage = "https://github.com/vincenthz/hs-cli";
        description = "Command Line Interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48097,7 +46325,6 @@ self: {
          base either exceptions optparse-applicative transformers
        ];
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
-       homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/cli-builder";
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48113,7 +46340,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory file-embed process
        ];
-       homepage = "https://github.com/vmchale/cli-setup#readme";
        description = "Helper setup scripts for packaging command-line tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48158,7 +46384,6 @@ self: {
          base bytestring cereal containers hspec HUnit QuickCheck
          transformers
        ];
-       homepage = "http://github.com/yesodweb/clientsession/tree/master";
        description = "Securely store session data in a client-side cookie";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -48209,7 +46434,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion numeric-prelude stream-fusion
        ];
-       homepage = "http://github.com/spacekitteh/haskell-clifford";
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48229,7 +46453,6 @@ self: {
          base brick byteunits directory filepath optparse-applicative
          pointedlist process time vector vty
        ];
-       homepage = "https://github.com/pasqu4le/clifm";
        description = "Command Line Interface File Manager";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48249,7 +46472,6 @@ self: {
          transformers wl-pprint-text
        ];
        librarySystemDepends = [ clingo ];
-       homepage = "https://github.com/tsahyt/clingo-haskell#readme";
        description = "Haskell bindings to the Clingo ASP solver";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48262,7 +46484,6 @@ self: {
        version = "0.1.1";
        sha256 = "0qhi727irlkvi4ygx5qvd6h1zzz22588lymi39s0gcjir473a538";
        libraryHaskellDepends = [ base process ];
-       homepage = "https://github.com/Raynes/clippard";
        description = "A simple Haskell library for copying text to the clipboard in a cross-platform way";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48275,7 +46496,6 @@ self: {
        version = "0.0.1";
        sha256 = "0s4n8d07190yarkxpa2kjphkm6lw2ljgwcix3x6m3lxcxrvc3nr0";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/chetant/clipper";
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48314,7 +46534,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "1wicpkc1rxyjnmnlsdh975d58fwfmfqwhkd50v044g4763i36bdr";
        libraryHaskellDepends = [ base natural-induction peano ];
-       homepage = "https://github.com/strake/clist.hs";
        description = "Counted list";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48338,7 +46557,6 @@ self: {
          MissingH optparse-applicative split text
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Post tweets from stdin";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48357,7 +46575,6 @@ self: {
        executableHaskellDepends = [
          base foldl process system-filepath temporary text turtle
        ];
-       homepage = "http://github.com/sgraf812/cloben#readme";
        description = "Clone and benchmark Haskell cabal projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48371,7 +46588,6 @@ self: {
        sha256 = "07v91s20halsqjmziqb1sqjp2sjpckl9by7y28aaklwqi2bh2rl8";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48400,7 +46616,6 @@ self: {
          base clock containers MonadCatchIO-transformers transformers
        ];
        libraryPkgconfigDepends = [ QtCore ];
-       homepage = "http://patch-tag.com/r/shahn/clocked/home";
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48438,7 +46653,6 @@ self: {
          aeson base bytestring directory github optparse-applicative process
          system-fileio system-filepath text transformers
        ];
-       homepage = "https://github.com/silky/clone-all";
        description = "Clone all github repositories from a given user";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48459,7 +46673,6 @@ self: {
          aeson base cassava deepseq hashable hspec markdown-unlit persistent
          QuickCheck text vector
        ];
-       homepage = "https://github.com/frontrowed/closed#readme";
        description = "Integers bounded by a closed interval";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -48471,7 +46684,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1z9clkwjpj01g258h8bldlc759vwsgdlyppn29sr11kyani1zjwf";
        libraryHaskellDepends = [ base hashable unordered-containers ];
-       homepage = "http://github.com/tel/closure";
        description = "Depth- and breadth-first set closures";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48496,7 +46708,6 @@ self: {
          rank1dynamic
        ];
        doHaddock = false;
-       homepage = "http://github.com/haskell-distributed/cloud-haskell";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48526,7 +46737,6 @@ self: {
          fast-logger hspec lens monad-logger monad-mock mtl
          optparse-applicative text these transformers yaml
        ];
-       homepage = "https://github.com/cjdev/cloud-seeder#readme";
        description = "A tool for interacting with AWS CloudFormation";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48544,7 +46754,6 @@ self: {
          asn1-encoding asn1-types base base64-bytestring bytestring
          crypto-pubkey-types old-locale RSA time
        ];
-       homepage = "http://github.com/cdornan/cloudfront-signer";
        description = "CloudFront URL signer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48561,7 +46770,6 @@ self: {
        libraryHaskellDepends = [
          array base binary bytestring containers network time unix zlib
        ];
-       homepage = "https://github.com/CloudI/cloudi_api_haskell";
        description = "Haskell CloudI API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -48581,7 +46789,6 @@ self: {
          base bytestring containers convertible datetime filepath HFuse HTTP
          regex-base regex-tdfa tagsoup timerep unix
        ];
-       homepage = "https://github.com/bhickey/cloudyfs";
        description = "A cloud in the file system";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48599,7 +46806,6 @@ self: {
          base clr-host clr-marshal clr-typed pipes template-haskell text
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-bindings";
        description = "Glue between clr-host and clr-typed";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48620,7 +46826,6 @@ self: {
        ];
        librarySystemDepends = [ glib mono ];
        testHaskellDepends = [ base ];
-       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-host";
        description = "Hosting the Common Language Runtime";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
@@ -48650,7 +46855,6 @@ self: {
          containers criterion directory extra filepath here lens parsec
          pipes process split template-haskell temporary text transformers
        ];
-       homepage = "https://gitlab.com/tim-m89/clr-haskell";
        description = "Quasiquoters for inline C# and F#";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48663,7 +46867,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1mnwxfmhz548bb1g17bddhmvd6lzl66bfi1a7f0j3phh7lgna4s1";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-marshal";
        description = "Marshaling for the clr";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48676,7 +46879,6 @@ self: {
        sha256 = "1ay3970fccvr4hbmv5dah2qdxv51q09n1v3m9wkj62mbpsp3zk2y";
        libraryHaskellDepends = [ base clr-marshal ghc-prim text tuple ];
        testHaskellDepends = [ base clr-marshal hspec text ];
-       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/libs/clr-typed";
        description = "A strongly typed Haskell interface to the CLR type system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48692,7 +46894,6 @@ self: {
        executableHaskellDepends = [
          base directory pipes pipes-safe process
        ];
-       homepage = "https://gitlab.com/tim-m89/clr-haskell/tree/master/utils/clr-win-linker";
        description = "A GHC linker wrapper tool to workaround a GHC >8.2 bug";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48706,7 +46907,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base curl mtl random tagsoup ];
-       homepage = "http://ui3.info/d/proj/cltw.html";
        description = "Command line Twitter utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48724,7 +46924,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers haskell98 language-c pretty pretty-show
        ];
-       homepage = "http://zwizwa.be/-/meta";
        description = "C to Lua data wrapper generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48748,7 +46947,6 @@ self: {
        version = "0.3";
        sha256 = "1q5km2f8zwnzcwnzj0khnszsgrb1x53zp0ryjwz2nfx9ajvh7zgg";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/Kinokkory/cluss";
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48794,7 +46992,6 @@ self: {
        executableHaskellDepends = [
          base bio bytestring containers QuickCheck regex-compat simpleargs
        ];
-       homepage = "http://malde.org/~ketil/";
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48848,7 +47045,6 @@ self: {
        benchmarkHaskellDepends = [
          base blaze-html cheapskate criterion discount markdown sundown text
        ];
-       homepage = "https://github.com/jgm/cmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48866,7 +47062,6 @@ self: {
        benchmarkHaskellDepends = [
          base blaze-html cheapskate criterion discount markdown sundown text
        ];
-       homepage = "https://github.com/kivikakk/cmark-gfm-hs";
        description = "Fast, accurate GitHub Flavored Markdown parser and renderer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48883,7 +47078,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html cmark highlighting-kate text
        ];
-       homepage = "http://github.com/aelve/cmark-highlight";
        description = "Code highlighting for cmark";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48897,7 +47091,6 @@ self: {
        revision = "1";
        editedCabalFile = "1mizbv18bl8qrgz27wlz7sb6cfhblmp7p7gh7dqq8g0r4djrvqg5";
        libraryHaskellDepends = [ base cmark lucid ];
-       homepage = "http://github.com/aelve/cmark-lucid";
        description = "Use cmark with Lucid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48909,7 +47102,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "15pdlcc0ak1pbx7qz6w5xfv4g9wkapx0flxqqkhcksa4k1h3hr1f";
        libraryHaskellDepends = [ base cmark ];
-       homepage = "http://github.com/aelve/cmark-patterns";
        description = "Pattern synonyms for cmark";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -48928,7 +47120,6 @@ self: {
        testHaskellDepends = [
          base base-prelude cmark containers hspec QuickCheck text
        ];
-       homepage = "http://github.com/aelve/cmark-sections";
        description = "Represent cmark-parsed Markdown as a tree of sections";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48941,7 +47132,6 @@ self: {
        version = "0.3";
        sha256 = "1hb92cgblmwp49lv0x0ib8g557mhjk6db7ihnim75ldii2f93dnm";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~dons/code/cmath";
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48979,7 +47169,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-laws HUnit QuickCheck quickcheck-instances text
        ];
-       homepage = "https://github.com/geraud/cmd-item";
        description = "Library to compose and reuse command line fragments";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -48998,7 +47187,6 @@ self: {
        libraryHaskellDepends = [
          base filepath process template-haskell transformers
        ];
-       homepage = "https://github.com/ndmitchell/cmdargs#readme";
        description = "Command line argument processing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49018,7 +47206,6 @@ self: {
          base bytestring cmdargs directory filepath http-types process text
          transformers wai wai-handler-launch
        ];
-       homepage = "http://community.haskell.org/~ndm/cmdargs/";
        description = "Helper to enter cmdargs command lines using a web browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49054,7 +47241,6 @@ self: {
          base containers directory filepath HUnit parsec pretty process
          test-framework test-framework-hunit transformers
        ];
-       homepage = "http://github.com/eli-frey/cmdtheline";
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49067,7 +47253,6 @@ self: {
        version = "0.1.3";
        sha256 = "1hym074a8akzg3c96b1yczmdw5pgn4g0ahqxsxhg8d0kf8lzi5ph";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/cml/";
        description = "Events and Channels as in Concurrent ML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49163,7 +47348,6 @@ self: {
          filepath graphviz HaXml haxr hubigraph HUnit mtl parsec pretty
          prettyclass process split stringtable-atom unix zlib
        ];
-       homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Compiler/Translator for CnC Specification Files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49176,7 +47360,6 @@ self: {
        version = "0.10.0";
        sha256 = "12vybpji4bxwn8in18xqp4l2js1cbnn8fgk3r6m5c8idp769ph2m";
        libraryHaskellDepends = [ array base bytestring file-embed text ];
-       homepage = "https://github.com/Lemmih/cndict";
        description = "Chinese/Mandarin <-> English dictionary, Chinese lexer";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -49219,7 +47402,6 @@ self: {
        sha256 = "1491frk4jx6dlhifky9dvcxbsbcfssrz979a5hp5zn061rh8cp76";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/RyanGlScott/code-page";
        description = "Windows code page library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49242,7 +47424,6 @@ self: {
          aeson base binary bytestring generic-arbitrary tasty
          tasty-quickcheck
        ];
-       homepage = "https://github.com/chpatrick/codec";
        description = "Simple bidirectional serialization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49257,7 +47438,6 @@ self: {
        sha256 = "1d6dsa4di4wil6wqc2jpfqvf09vk4zw9c2905py5vygl87q1y9jq";
        libraryHaskellDepends = [ base bytestring containers text zlib ];
        testHaskellDepends = [ base bytestring filepath process text ];
-       homepage = "https://github.com/hkgumbs/codec-beam#readme";
        description = "Erlang VM byte code assembler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49305,8 +47485,8 @@ self: {
      }:
      mkDerivation {
        pname = "codec-rpm";
-       version = "0.2.1";
-       sha256 = "00ywr4frndvw3chlxpqdx2rimd7jjdyzmjlm1kvw23qbgfyd60is";
+       version = "0.2.2";
+       sha256 = "15sbxns2p3fcc5gc8kf2jmjich6rnrimfl9rdjshi6y7ilvqhjx3";
        libraryHaskellDepends = [
          attoparsec attoparsec-binary base bytestring conduit conduit-extra
          cpio-conduit exceptions lzma-conduit mtl parsec pretty resourcet
@@ -49316,7 +47496,6 @@ self: {
          attoparsec attoparsec-binary base bytestring hspec hspec-attoparsec
          HUnit parsec pretty text
        ];
-       homepage = "https://github.com/weldr/codec-rpm";
        description = "A library for manipulating RPM files";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49341,7 +47520,6 @@ self: {
          regex-posix retry safe split
        ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/guillaume-nargeot/codecov-haskell";
        description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49361,7 +47539,6 @@ self: {
          base cairo containers directory filepath gtk haskell98 hinotify
          MissingH process regex-posix time
        ];
-       homepage = "http://github.com/rickardlindberg/codemonitor";
        description = "Tool that automatically runs arbitrary commands when files change on disk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49376,7 +47553,6 @@ self: {
        revision = "3";
        editedCabalFile = "11kw4xs61c5d3kvlanx9waws8sj5k4d5445a8w1p5zx69x9im7bg";
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
-       homepage = "http://github.com/chrisdone/codepad";
        description = "Submit and retrieve paste output from CodePad.org.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49424,7 +47600,6 @@ self: {
          hackage-db MissingH monad-loops network process transformers wreq
          yaml
        ];
-       homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49452,7 +47627,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0v4ymcrqij8q9s8pcgbfrnl8y379fki3zp80lg4xqvbx0i89vsxf";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/chessai/coerce-util.git";
        description = "utils for Data.Coerce";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -49490,7 +47664,6 @@ self: {
          base bytestring containers mtl QuickCheck template-haskell
          transformers
        ];
-       homepage = "https://github.com/Cognimeta/cognimeta-utils";
        description = "Utilities for Cognimeta products (such as perdure). API may change often.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49515,7 +47688,6 @@ self: {
          persistent-sqlite persistent-template resourcet text time
          transformers
        ];
-       homepage = "https://bitbucket.org/borekpiotr/coin";
        description = "Simple account manager";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49574,7 +47746,6 @@ self: {
        testHaskellDepends = [
          array base combinat containers tasty tasty-hunit
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Equivariant CSM classes of coincident root loci";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49598,7 +47769,6 @@ self: {
          base bytestring cereal cmdargs containers fclabels ghc-prim
          ListZipper monad-atom mtl nlp-scores split swift-lda text vector
        ];
-       homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Colada implements incremental word class class induction using online LDA";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49633,7 +47803,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/mihaigiurgeanu/cold-widow#readme";
        description = "File transfer via QR Codes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49681,7 +47850,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/mwotton/collapse";
        description = "utility for collapsing adjacent writes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49705,7 +47873,6 @@ self: {
          text
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/alunduil/collection-json.hs";
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49734,7 +47901,6 @@ self: {
        revision = "2";
        editedCabalFile = "073x7vwgsj2xcqpywqdwk7pbj9zc9sinm17sknafgyxacx1r15xl";
        libraryHaskellDepends = [ array base QuickCheck ];
-       homepage = "http://code.haskell.org/collections/";
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49751,7 +47917,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring collections-api containers
        ];
-       homepage = "http://code.haskell.org/collections/";
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49780,7 +47945,6 @@ self: {
          base bytestring contravariant profunctors semigroups text vector
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Generic types and functions for columnar encoding and decoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49805,7 +47969,6 @@ self: {
          aeson base cmdargs colour containers data-default directory friday
          friday-devil split v4l2 vector vector-space yaml
        ];
-       homepage = "https://bitbucket.org/functionally/color-counter";
        description = "Count colors in images";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49819,7 +47982,6 @@ self: {
        sha256 = "0n1f9x6kyb3fcg1fbs80wrlm3c897l089ma4cxm47v1dcgczix8b";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/minad/colorful-monoids#readme";
        description = "Styled console text output using ANSI escape sequences";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -49834,7 +47996,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base haskell-lexer ];
        executableHaskellDepends = [ ansi-terminal base haskell-lexer ];
-       homepage = "http://github.com/yav/colorize-haskell";
        description = "Highligt Haskell source";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49902,7 +48063,6 @@ self: {
        revision = "1";
        editedCabalFile = "0q152j8ybnga46azvfg3xmsjk01lz4wkhlli07cd92803vc4d6dl";
        libraryHaskellDepends = [ base lens linear profunctors ];
-       homepage = "https://github.com/fumieval/colors";
        description = "A type for colors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49915,7 +48075,6 @@ self: {
        sha256 = "1qmn1778xzg07jg9nx4k1spdz2llivpblf6wwrps1qpqjhsac5cd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/haskellwiki/Colour";
        description = "A model for human colour/color perception";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49934,7 +48093,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck random test-framework test-framework-quickcheck2
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Colour";
        description = "A model for human colour/color perception";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -49946,7 +48104,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "10176caf5j7g8z24d8wmr35p6gg6xv7ma0ibgbc7q6r71qvq0zzc";
        libraryHaskellDepends = [ accelerate base ];
-       homepage = "https://github.com/tmcdonell/colour-accelerate";
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -49958,7 +48115,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz";
        libraryHaskellDepends = [ accelerate base ];
-       homepage = "https://github.com/tmcdonell/colour-accelerate";
        description = "Working with colours in Accelerate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49976,7 +48132,6 @@ self: {
          base colour constrained-categories JuicyPixels linear
          linearmap-category manifolds semigroups vector-space
        ];
-       homepage = "https://github.com/leftaroundabout/colour-space";
        description = "Instances of the manifold-classes for colour types";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49994,7 +48149,6 @@ self: {
          base bytestring HTTP http-types HUnit mtl regex-compat text wai
          wai-extra warp
        ];
-       homepage = "https://github.com/wellecks/coltrane";
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50126,7 +48280,6 @@ self: {
          array base containers QuickCheck random test-framework
          test-framework-quickcheck2 transformers
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50146,7 +48299,6 @@ self: {
          array base containers QuickCheck random test-framework
          test-framework-quickcheck2 transformers
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50164,7 +48316,6 @@ self: {
          array base colour combinat containers diagrams-core diagrams-lib
          linear transformers
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50187,7 +48338,6 @@ self: {
          base bytestring cereal containers directory lens mtl
          template-haskell th-lift trifecta void
        ];
-       homepage = "https://github.com/fumieval/combinator-interactive";
        description = "SKI Combinator interpreter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50209,7 +48359,6 @@ self: {
        testHaskellDepends = [
          array base containers QuickCheck transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/combinatorial/";
        description = "Count, enumerate, rank and unrank combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50225,7 +48374,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring bytestring-lexing containers parsec random
        ];
-       homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellCombinatorialProblems";
        description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50238,7 +48386,6 @@ self: {
        version = "0.1.0";
        sha256 = "101b3lycfav6wqdqjhs0v93vgy4g3pfn5xyimip0x3alq0q2ix9a";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Efficient computation of common combinatoric functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50254,7 +48401,6 @@ self: {
        libraryHaskellDepends = [
          base containers template-haskell vector vector-space
        ];
-       homepage = "https://github.com/JohnLato/combobuffer";
        description = "Various buffer implementations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50267,7 +48413,6 @@ self: {
        version = "0.0.1";
        sha256 = "1nbnnhmfbsiq31damx998sm7hz127mdqbnzzybz00962bmlmvp72";
        libraryHaskellDepends = [ base utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/comfort-array/";
        description = "Arrays where the index type is a function of the shape type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50286,7 +48431,6 @@ self: {
        testHaskellDepends = [
          base containers QuickCheck transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/comfort-graph";
        description = "Graph structure with type parameters for nodes and edges";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50298,7 +48442,6 @@ self: {
        version = "0";
        sha256 = "00y23pd6pp4siggs0wkf102phi961dyfffbj5wjsvmhlg2nv5hg3";
        libraryHaskellDepends = [ aeson base text ];
-       homepage = "https://oss.xkcd.com/";
        description = "A format for describing comics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50312,7 +48455,6 @@ self: {
        sha256 = "1yxy6f5v1d2s27hfzagqj12yd3c65ijwglhdcqckv7y3g4yv5h7y";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base QuickCheck text ];
-       homepage = "https://github.com/lovasko/comma";
        description = "CSV Parser & Producer";
        license = "unknown";
      }) {};
@@ -50324,7 +48466,6 @@ self: {
        version = "0.1.1";
        sha256 = "0qj6i5r1iz3d8visqpd74xwkribxzs4p66b1vgp0i3jiqgfrn2hw";
        libraryHaskellDepends = [ base deepseq process ];
-       homepage = "https://github.com/nh2/command";
        description = "Conveniently run shell commands";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50339,7 +48480,6 @@ self: {
        sha256 = "1bqfb4gc5ja9d9jygijqpf6014bmfcxnsvpv7c5n4f1z2aj07jy5";
        libraryHaskellDepends = [ base process template-haskell text ];
        testHaskellDepends = [ base doctest hspec template-haskell text ];
-       homepage = "http://biegunka.github.io/command-qq/";
        description = "Quasiquoters for external commands";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50355,7 +48495,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl transformers ];
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/jsdw/hs-commander";
        description = "pattern matching against string based commands";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50415,7 +48554,6 @@ self: {
          crypto-pubkey-types cryptohash-cryptoapi DRBG monadcryptorandom
          network RSA
        ];
-       homepage = "https://github.com/TomMD/commsec-keyExchange";
        description = "Key agreement for commsec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50456,7 +48594,6 @@ self: {
          transformers transformers-compat
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/comonad/";
        description = "Comonads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50473,7 +48610,6 @@ self: {
          array base comonad containers distributive semigroupoids
          transformers
        ];
-       homepage = "http://github.com/ekmett/comonad-extras/";
        description = "Exotic comonad transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50499,7 +48635,6 @@ self: {
        sha256 = "13zzp6r6s6c80skniphwvzxhpazbyal5854m53139kgcw560rv6z";
        libraryHaskellDepends = [ base comonad ];
        doHaddock = false;
-       homepage = "http://github.com/ekmett/comonad-transformers/";
        description = "This package has been merged into comonad 4.0";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50512,7 +48647,6 @@ self: {
        sha256 = "19xpv0dsz7w3a1sq1gdxwzglfal45vj2s22zb12g9mpk5rp3hw1s";
        libraryHaskellDepends = [ base comonad ];
        doHaddock = false;
-       homepage = "http://github.com/ekmett/comonads-fd/";
        description = "This package has been merged into comonad 4.0";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50526,7 +48660,6 @@ self: {
        sha256 = "0lynnbvsyr07driy7lm9llrhvmk9wprjdbfc34svzfwldghk71gf";
        libraryHaskellDepends = [ base binary bytestring ghc-compact ];
        testHaskellDepends = [ base directory ];
-       homepage = "https://github.com/ezyang/compact";
        description = "Non-GC'd, contiguous storage for immutable data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50560,7 +48693,6 @@ self: {
          base containers ghc-compact ghc-prim prim-array primitive
          transformers
        ];
-       homepage = "https://github.com/andrewthad/compact-mutable#readme";
        description = "Mutable arrays living on the compact heap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50592,7 +48724,6 @@ self: {
        revision = "1";
        editedCabalFile = "03cw0x4dg0qwaysf2sndyzm27sva6x415dxd70fs2vcbys5m1j8j";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50605,7 +48736,6 @@ self: {
        version = "0.3.2";
        sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50644,7 +48774,6 @@ self: {
        version = "0.1.1";
        sha256 = "1s6p3ni8pqxbp08ci4w6y646wrh60s0g34figrwdcqrywscyicsb";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/Kinokkory/compare-type";
        description = "compare types of any kinds in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50754,7 +48883,6 @@ self: {
        testHaskellDepends = [
          base doctest generic-deriving semigroups simple-reflect
        ];
-       homepage = "http://github.com/analytics/compensated/";
        description = "Compensated floating-point arithmetic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50766,7 +48894,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "07c6b6yai8x9i8qndimzmyp5bzhwckis8kg207n152gnskk7i3zn";
        libraryHaskellDepends = [ base filepath parsec ];
-       homepage = "github.com/yanatan16/haskell-competition";
        description = "Helpers and runners for code competitions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50796,7 +48923,6 @@ self: {
        testHaskellDepends = [
          base binary parsec tasty tasty-hunit tasty-quickcheck tasty-th text
        ];
-       homepage = "https://github.com/yi-editor/compiler-warnings#readme";
        description = "Parser for common compiler warning formats";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -50810,7 +48936,6 @@ self: {
        revision = "2";
        editedCabalFile = "160lw045p7j5vm4j2sqqfpnfgkxkil2kwjnmi7x6am03gfi9g9kw";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://code.mathr.co.uk/complex-generic";
        description = "complex numbers with non-mandatory RealFloat";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50822,7 +48947,6 @@ self: {
        version = "1.0.0";
        sha256 = "0q0ffpqir4f2ch7d7p2fxgb73n7dg7xf19rg78an7i7zdl430cfj";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/hijarian/complex-integrate";
        description = "A simple integration function to integrate a complex-valued complex functions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -50860,7 +48984,6 @@ self: {
          base containers pretty-show prettyprinter rio tasty tasty-hunit
          teardown
        ];
-       homepage = "https://github.com/roman/Haskell-componentm#readme";
        description = "Monad for allocation and cleanup of application resources";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50875,7 +48998,6 @@ self: {
        libraryHaskellDepends = [
          base componentm foreign-store rio teardown
        ];
-       homepage = "https://github.com/roman/Haskell-componentm#readme";
        description = "Easy REPL driven development using ComponentM";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50889,7 +49011,6 @@ self: {
        sha256 = "03l056yb6k8x5xrfdszsn4w2739zyiqzrl6q3ci19dg1gsy106lx";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base lens tasty tasty-hunit ];
-       homepage = "https://github.com/SamProtas/composable-associations#readme";
        description = "Types and helpers for composing types into a single larger key-value type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50909,7 +49030,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring doctest tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/SamProtas/composable-associations#readme";
        description = "Aeson ToJSON/FromJSON implementation for the types of composable-associations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -50961,7 +49081,6 @@ self: {
          profunctors QuickCheck scientific tagged template-haskell text time
          unordered-containers vector vinyl
        ];
-       homepage = "https://github.com/ConferHealth/composite#readme";
        description = "JSON for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -50978,7 +49097,6 @@ self: {
        libraryHaskellDepends = [
          aeson-better-errors base composite-aeson mtl refined
        ];
-       homepage = "https://github.com/ConferHealth/composite#readme";
        description = "composite-aeson support for Refined from the refined package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51001,7 +49119,6 @@ self: {
          base exceptions hspec lens monad-control mtl profunctors QuickCheck
          template-haskell text transformers transformers-base vinyl
        ];
-       homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Shared utilities for composite-* packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51016,7 +49133,6 @@ self: {
        libraryHaskellDepends = [
          base composite-base ekg-core lens text vinyl
        ];
-       homepage = "https://github.com/ConferHealth/composite#readme";
        description = "EKG Metrics for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51039,7 +49155,6 @@ self: {
          product-profunctors profunctors QuickCheck template-haskell text
          vinyl
        ];
-       homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Opaleye SQL for Frames records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51062,7 +49177,6 @@ self: {
          base composite-aeson composite-base hspec insert-ordered-containers
          lens QuickCheck swagger2 template-haskell text vinyl
        ];
-       homepage = "https://github.com/ConferHealth/composite#readme";
        description = "Swagger for Vinyl/Frames records";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51096,7 +49210,6 @@ self: {
        sha256 = "17ihwvkv7plwnwnk7ny81cj4xy2v776yk85gssgix92yc65p47b2";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
-       homepage = "https://github.com/vmchale/composition-prelude#readme";
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51109,7 +49222,6 @@ self: {
        sha256 = "0bcz7lx4v25dz9d11qy8im6fk1gviqqhgcr1bwxg4yqyzbfl8bas";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
-       homepage = "https://github.com/vmchale/composition-prelude#readme";
        description = "Higher-order function combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51123,7 +49235,6 @@ self: {
        sha256 = "0n707qc1xx96wpq4vl1fs47jkm9vbxp8ff3hi7bj1cnd77yzhf01";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
-       homepage = "https://github.com/liamoc/composition-tree";
        description = "Composition trees for arbitrary monoids";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51137,7 +49248,6 @@ self: {
        sha256 = "1lnmlql90v66vs2dr5lqg2lzfvf7m3z8naazfzj7zdyqjf9jnpkc";
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base-prelude ];
-       homepage = "https://github.com/nikita-volkov/compound-types";
        description = "Sum and Product types and such";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -51155,7 +49265,6 @@ self: {
          base comonad containers fingertree hashable keys pointed reducers
          semigroupoids semigroups unordered-containers
        ];
-       homepage = "http://github.com/ekmett/compressed/";
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51167,7 +49276,6 @@ self: {
        version = "0.1";
        sha256 = "0cy7851i7dvn5aphg649jr3wmw9x57s29adk7qv0mvwz99fb4cpr";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://urchin.earth.li/~ian/cabal/compression/";
        description = "Common compression algorithms";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51202,7 +49310,6 @@ self: {
          base compdata containers deepseq deepseq-generics ghc-prim lens
          template-haskell th-expand-syns
        ];
-       homepage = "https://github.com/jkoppel/comptrans";
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51255,7 +49362,6 @@ self: {
          reflection singletons sized smallcheck tagged test-framework
          test-framework-hunit transformers type-natural vector
        ];
-       homepage = "https://konn.github.com/computational-algebra";
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51284,7 +49390,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "1kyg3dmgq5z0217rxgljs3x7x3xvcdly2aqj2ky4h4kbw1h0r260";
        libraryHaskellDepends = [ base ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/computations";
        description = "Advanced notions of computation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51296,7 +49401,6 @@ self: {
        version = "1.0.1";
        sha256 = "05xwqvcdnk8bsyj698ab9jxpa1nk23pf3m7wi9mwmw0q8n99fngd";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://patch-tag.com/r/salazar/concatenative/snapshot/current/content/pretty";
        description = "A library for postfix control flow";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51328,7 +49432,6 @@ self: {
          base bytestring lens QuickCheck quickcheck-instances tasty
          tasty-quickcheck text
        ];
-       homepage = "https://github.com/frasertweedale/hs-concise";
        description = "Utilities for Control.Lens.Cons";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51363,7 +49466,6 @@ self: {
          monad-codec monad-ox sgd tagset-positional temporary text
          text-binary transformers vector vector-binary zlib
        ];
-       homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51386,7 +49488,6 @@ self: {
          lazy-io moan network sgd split tagset-positional text
        ];
        executableHaskellDepends = [ cmdargs ];
-       homepage = "https://github.com/vjeranc/concraft-hr";
        description = "Part-of-speech tagger for Croatian";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51409,7 +49510,6 @@ self: {
          network process sgd split tagset-positional text transformers
        ];
        executableHaskellDepends = [ cmdargs ];
-       homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51454,7 +49554,6 @@ self: {
          process QuickCheck scientific stm tar tar-conduit text thrift time
          unordered-containers uuid vector zip zip-conduit zlib
        ];
-       homepage = "https://github.com/hltcoe";
        description = "Library for the Concrete data format";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51472,7 +49571,6 @@ self: {
          base bytestring containers hashable lens QuickCheck text thrift
          unordered-containers vector
        ];
-       homepage = "https://github.com/hltcoe";
        description = "Automatically generated Thrift definitions for the Concrete data format";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51529,7 +49627,6 @@ self: {
          array atomic-primops base exceptions monad-control mtl stm
          transformers
        ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "Typeclasses, functions, and data types for concurrency and STM";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -51546,7 +49643,6 @@ self: {
          array atomic-primops base exceptions monad-control mtl stm
          transformers
        ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "Typeclasses, functions, and data types for concurrency and STM";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51559,7 +49655,6 @@ self: {
        version = "0.1.2";
        sha256 = "13idx7w5k8rk3qqls3yn9xqwk116xsqb36ya3vxkb5x4q4vix3mv";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jsgf/concurrent-barrier";
        description = "Simple thread barriers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51579,7 +49674,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/concurrent-buffer";
        description = "Concurrent expanding buffer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51623,7 +49717,6 @@ self: {
          async base HUnit random stm test-framework test-framework-hunit
          unbounded-delays
        ];
-       homepage = "https://github.com/basvandijk/concurrent-extra";
        description = "Extra concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51672,7 +49765,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0k0iwax6nx4jvqh7rawis5dp7lxx8bc3r3x0rr8qy7vsp14lmvgg";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/lpeterse/haskell-concurrent-rpc";
        description = "An abstraction for inter-thread RPC based on MVars";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -51706,7 +49798,6 @@ self: {
        version = "0.1";
        sha256 = "08zjpyf1jrsn161z9dngag63s47vrvz4m8aani9lvmlacbzpjfwd";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/andrewthad/concurrent-st#readme";
        description = "Concurrent Haskell in ST";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51720,7 +49811,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base exceptions mtl stm transformers ];
-       homepage = "https://github.com/joelteon/concurrent-state";
        description = "MTL-like library using TVars";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51734,7 +49824,6 @@ self: {
        sha256 = "07zjczcgxwpi8imp0w86vrb78w067b322q5d7zlqla91sbf2gy6c";
        libraryHaskellDepends = [ base ghc-prim hashable ];
        testHaskellDepends = [ base containers ];
-       homepage = "http://github.com/ekmett/concurrent-supply/";
        description = "A fast concurrent unique identifier supply with a pure API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51746,7 +49835,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi";
        libraryHaskellDepends = [ base ];
-       homepage = "-";
        description = "More utilities and broad-used datastructures for concurrency";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51769,7 +49857,6 @@ self: {
        version = "0.4.1.1";
        sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kallisti-dev/cond";
        description = "Basic conditional and boolean operators with monadic variants";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51791,7 +49878,6 @@ self: {
        testHaskellDepends = [
          base binary Cabal containers glider-nlp HUnit text
        ];
-       homepage = "https://github.com/klangner/Condor";
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51804,7 +49890,6 @@ self: {
        version = "0.0.1";
        sha256 = "1raf8mrnfnn90ymcnyhqf1kzb9mpfsk83qlmajibjd8n94iq76nd";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://neugierig.org/software/darcs/condorcet";
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51817,7 +49902,6 @@ self: {
        version = "0.3";
        sha256 = "1jdslfnwyh7l10xhk9i0293p0qnw0xsd70d5xgpc6xlijhrsg8wp";
        libraryHaskellDepends = [ array base containers random stm time ];
-       homepage = "http://www.renickbell.net/doku.php?id=conductive-base";
        description = "a library for live coding and real-time musical applications";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51830,7 +49914,6 @@ self: {
        version = "0.2";
        sha256 = "1plml14h5d31jr3bvjjgaxcdqssxqfwwnbz9c5gvjlds6lla145p";
        doHaddock = false;
-       homepage = "http://www.renickbell.net/doku.php?id=conductive-clock";
        description = "a library for displaying musical time in a terminal-based clock";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -51847,7 +49930,6 @@ self: {
          base conductive-base conductive-song containers directory filepath
          hosc hsc3 random
        ];
-       homepage = "http://www.renickbell.net/doku.php?id=conductive-hsc3";
        description = "a library with examples of using Conductive with hsc3";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51860,7 +49942,6 @@ self: {
        version = "0.2";
        sha256 = "16bdsjv64fc3ydv230rja5q9rqzlr4vd9mh3jabiyahck44imrvi";
        libraryHaskellDepends = [ base conductive-base random ];
-       homepage = "http://www.renickbell.net/doku.php?id=conductive-song";
        description = "a library of functions which are useful for composing music";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51888,7 +49969,6 @@ self: {
          base containers criterion deepseq hspec kan-extensions mwc-random
          transformers vector
        ];
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51918,7 +49998,6 @@ self: {
          base containers deepseq gauge hspec kan-extensions mwc-random
          transformers vector
        ];
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -51948,7 +50027,6 @@ self: {
          streaming-commons test-framework test-framework-hunit
          test-framework-th transformers unliftio-core vector
        ];
-       homepage = "https://github.com/luispedro/conduit-algorithms#readme";
        description = "Conduit-based algorithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -51963,7 +50041,6 @@ self: {
        revision = "1";
        editedCabalFile = "0ab8qxh5b60m4dyrdbaak8xj7kxlp3kzbs5fpg3fjxkpcqhnm1mx";
        libraryHaskellDepends = [ base conduit vector ];
-       homepage = "http://github.com/mtolly/conduit-audio";
        description = "Combinators to efficiently slice and dice audio streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51983,7 +50060,6 @@ self: {
        ];
        librarySystemDepends = [ mp3lame ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the LAME MP3 library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52004,7 +50080,6 @@ self: {
        ];
        librarySystemDepends = [ samplerate ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52024,7 +50099,6 @@ self: {
          base conduit conduit-audio hsndfile hsndfile-vector resourcet
          transformers
        ];
-       homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsndfile audio file library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52037,7 +50111,6 @@ self: {
        sha256 = "1lz70vwp4y4lpsivxl0cshq7aq3968rh48r6rjvpyaj2l0bdj5wp";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "DEPRECATED Functionality merged into the conduit package itself";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -52058,7 +50131,6 @@ self: {
          base bytestring conduit connection HUnit network resourcet
          test-framework test-framework-hunit transformers
        ];
-       homepage = "https://github.com/sdroege/conduit-connection";
        description = "Conduit source and sink for Network.Connection.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52091,7 +50163,6 @@ self: {
          base blaze-builder bytestring bytestring-builder conduit criterion
          transformers
        ];
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52121,7 +50192,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring bytestring-builder conduit gauge transformers
        ];
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -52156,7 +50226,6 @@ self: {
          regex-posix semigroups streaming-commons text time transformers
          transformers-base unix-compat
        ];
-       homepage = "https://github.com/erikd/conduit-find";
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52178,7 +50247,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring conduit criterion mtl text
        ];
-       homepage = "https://github.com/sdroege/conduit-iconv";
        description = "Conduit for character encoding conversion";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52190,7 +50258,6 @@ self: {
        version = "0.1.2.0";
        sha256 = "07nfq13cqn8mwnkdkrn96mpw479ynfb261w1mx2w6yacmwq2ycsd";
        libraryHaskellDepends = [ base conduit mtl ];
-       homepage = "https://github.com/cblp/conduit-merge#readme";
        description = "Merge multiple sorted conduits";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52228,7 +50295,6 @@ self: {
          base conduit mtl parsers resourcet safe-exceptions tasty
          tasty-hunit
        ];
-       homepage = "https://github.com/k0ral/conduit-parse";
        description = "Parsing framework based on conduit";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -52245,7 +50311,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit hspec resourcet transformers void
        ];
-       homepage = "http://github.com/A1kmm/conduit-resumablesink";
        description = "Allows conduit to resume sinks to feed multiple sources into it";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52270,7 +50335,6 @@ self: {
          monad-control resourcet stm stm-chans stm-conduit test-framework
          test-framework-hunit throttle-io-stream unliftio unliftio-core
        ];
-       homepage = "https://github.com/mtesseract/conduit-throttle#readme";
        description = "Throttle Conduit Producers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52291,7 +50355,6 @@ self: {
        ];
        executableHaskellDepends = [ attoparsec base conduit resourcet ];
        testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
-       homepage = "http://github.com/haskell-works/conduit-tokenize-attoparsec#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52311,7 +50374,6 @@ self: {
          base bytestring conduit conduit-combinators conduit-extra directory
          HUnit test-framework test-framework-hunit test-framework-th zstd
        ];
-       homepage = "https://github.com/luispedro/conduit-zstd#readme";
        description = "Conduit-based ZStd Compression";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52348,7 +50410,6 @@ self: {
        testHaskellDepends = [
          aeson base binary bytestring directory hspec QuickCheck
        ];
-       homepage = "https://github.com/ciez/conf-json";
        description = "read, parse json config";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -52366,7 +50427,6 @@ self: {
        executableHaskellDepends = [
          base language-conf megaparsec optparse-applicative pretty text
        ];
-       homepage = "https://github.com/beijaflor-io/haskell-language-conf#readme";
        description = "A .conf file formatter";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52382,7 +50442,6 @@ self: {
        sha256 = "0agq5naldbs1lwpw9nf5jldzrqh6pbc1n5vn5cb3kk7rj7j1a8ik";
        libraryHaskellDepends = [ base deiko-config exceptions text ];
        testHaskellDepends = [ base deiko-config tasty tasty-hunit text ];
-       homepage = "https://github.com/amilkov3/confide";
        description = "derive typeclass instances for decoding types from HOCON conf";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52402,7 +50461,6 @@ self: {
        testHaskellDepends = [
          base containers directory hedgehog ini text unordered-containers
        ];
-       homepage = "https://github.com/aisamanra/config-ini";
        description = "A library for simple INI-based configuration files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52424,7 +50482,6 @@ self: {
          base directory HUnit temporary test-framework test-framework-hunit
          text time unordered-containers
        ];
-       homepage = "https://gitlab.com/guyonvarch/config-manager";
        description = "Configuration management";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -52437,7 +50494,6 @@ self: {
        sha256 = "1jmb8c2ksxp9gfryymg100hjfn5kfshi95a1533d6h18ypqd5zb3";
        libraryHaskellDepends = [ base parsec text ];
        testHaskellDepends = [ base extra hspec lens parsec text ];
-       homepage = "https://github.com/protoben/config-parser";
        description = "Parse config files using parsec and generate parse errors on unhandled keys";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52456,7 +50512,6 @@ self: {
          semigroupoids text transformers
        ];
        testHaskellDepends = [ base config-value text ];
-       homepage = "https://github.com/glguy/config-schema";
        description = "Schema definitions for the config-value package";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -52485,7 +50540,6 @@ self: {
        sha256 = "0gfr9qcw8a7y1y9cn6635y8fgvrpkmcqx31bn2a070rbrmk3757z";
        libraryHaskellDepends = [ array base pretty text ];
        libraryToolDepends = [ alex happy ];
-       homepage = "https://github.com/glguy/config-value";
        description = "Simple, layout-based value language similar to YAML or JSON";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -52497,7 +50551,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0ypg8wl17vqdqsk1gpaba11v63xmqysfp4cd4ii8zha7pfmlhb4c";
        libraryHaskellDepends = [ base config-value text ];
-       homepage = "https://github.com/GaloisInc/config-value-getopt";
        description = "Interface between config-value and System.GetOpt";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -52569,7 +50622,6 @@ self: {
          http-types monad-control mtl text transformers unordered-containers
          wai warp warp-tls yaml
        ];
-       homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -52592,7 +50644,6 @@ self: {
          base bytestring directory filepath HUnit test-framework
          test-framework-hunit text
        ];
-       homepage = "http://github.com/bos/configurator";
        description = "Configuration management";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52610,7 +50661,6 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/mstksg/configurator-export";
        description = "Pretty printer and exporter for configurations from the \"configurator\" library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52634,7 +50684,6 @@ self: {
          base bytestring directory filepath HUnit test-framework
          test-framework-hunit text
        ];
-       homepage = "http://github.com/lpsmith/configurator-ng";
        description = "The next generation of configuration management";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52677,7 +50726,6 @@ self: {
        version = "2.2";
        sha256 = "1is3j61ra1whjpm8rq89yj9rscqj1ipgqlnh1nwvyzi2nggl06ya";
        libraryHaskellDepends = [ base containers random ];
-       homepage = "http://github.com/LeventErkok/conjugateGradient";
        description = "Sparse matrix linear-equation solver";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52715,7 +50763,6 @@ self: {
        testHaskellDepends = [
          base data-default doctest markdown-unlit pretty-show
        ];
-       homepage = "http://github.com/rampion/conkin";
        description = "Tools for functors from Hask^k to Hask";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52731,7 +50778,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/tattsun/conlogger";
        description = "A logger for a concurrent program";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52750,7 +50796,6 @@ self: {
          base byteable bytestring containers data-default-class network
          socks tls x509 x509-store x509-system x509-validation
        ];
-       homepage = "http://github.com/vincenthz/hs-connection";
        description = "Simple and easy network connections API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52768,7 +50813,6 @@ self: {
          base between data-default-class monad-control network resource-pool
          streaming-commons time transformers-base
        ];
-       homepage = "https://github.com/trskop/connection-pool";
        description = "Connection pool built on top of resource-pool and streaming-commons";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52785,7 +50829,6 @@ self: {
          base case-insensitive containers megaparsec parser-combinators
        ];
        testHaskellDepends = [ base doctest text ];
-       homepage = "https://github.com/Porges/connection-string-hs";
        description = "A library for parsing connection strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52833,7 +50876,6 @@ self: {
        version = "0.1";
        sha256 = "07s4p41hjsalbaayxq2j973f3wnk8d7aybvl84fww7sz6mj7kvhw";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jlamothe/console-prompt";
        description = "console user prompts";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -52845,7 +50887,6 @@ self: {
        version = "0.0.2.1";
        sha256 = "0zxxs59bzgf81d3ww285znmmciij3rswfgyc89ngxb6p86l8x0bd";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/minad/console-style#readme";
        description = "Styled console text output using ANSI escape sequences";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -52858,7 +50899,6 @@ self: {
        sha256 = "1fcj3ssfyxnq4cmb3lr5cg7qkgnkhf1ra0469cbw61gr2fl3kzdl";
        libraryHaskellDepends = [ base containers ghc ];
        testHaskellDepends = [ base directory process ];
-       homepage = "https://github.com/kfish/const-math-ghc-plugin";
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52871,7 +50911,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d";
        libraryHaskellDepends = [ attoparsec base bytestring vector ];
-       homepage = "https://github.com/chessai/constaparser";
        description = "Parse ByteStrings of a constant length";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52883,7 +50922,6 @@ self: {
        version = "0.3.1.0";
        sha256 = "0xxmbvzxa2phwn25haxbr6gv0cnh92c1i2l5anhckqizx29gl668";
        libraryHaskellDepends = [ base tagged void ];
-       homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -52920,7 +50958,6 @@ self: {
          base containers criterion deepseq nat-sized-numbers QuickCheck
          smallcheck transformers vector
        ];
-       homepage = "https://github.com/oisdk/constrained-monads#readme";
        description = "Typeclasses and instances for monads with constraints";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52935,7 +50972,6 @@ self: {
        revision = "1";
        editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj";
        libraryHaskellDepends = [ base ];
-       homepage = "http://dx.doi.org/10.1145/2500365.2500602";
        description = "Normalised Deep Embeddings for Constrained Type-Class Instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -52959,7 +50995,6 @@ self: {
        version = "0.5.1";
        sha256 = "08b9rsvrmwkb1gl3x7d24cpghfband7cgzw4ldvxzjqvgmnyf9jy";
        libraryHaskellDepends = [ base constraints transformers ];
-       homepage = "http://github.com/guaraqe/constraint-classes#readme";
        description = "Various typeclasses using ConstraintKinds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53003,7 +51038,6 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -53020,7 +51054,6 @@ self: {
          base constraints containers ghc hashable
        ];
        testHaskellDepends = [ base constraints hspec transformers ];
-       homepage = "https://github.com/isovector/constraints-emerge";
        description = "Defer instance lookups until runtime";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53029,10 +51062,9 @@ self: {
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "constrictor";
-       version = "0.1.1.1";
-       sha256 = "0rw36xbrrqm40rqacl8zps7hm424nqwkhxr82c98b16n182zvnan";
+       version = "0.1.1.2";
+       sha256 = "0cqnc0hd73wjmmv9qcvakgg36mhxxp5f9wv2jh3nc45bxjd91snq";
        libraryHaskellDepends = [ base ghc-prim transformers ];
-       homepage = "https://github.com/chessai/constrictor.git";
        description = "strict versions of many things in base";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53046,7 +51078,6 @@ self: {
        libraryHaskellDepends = [
          arithmoi base binary-search complex-generic
        ];
-       homepage = "http://andersk.mit.edu/haskell/constructible/";
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53084,7 +51115,6 @@ self: {
          base http-client HUnit network random tasty tasty-hunit text
          transformers uuid
        ];
-       homepage = "https://github.com/alphaHeavy/consul-haskell";
        description = "A consul client for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53110,7 +51140,6 @@ self: {
          monad-control monad-loops monad-time mtl stm text text-show time
          transformers transformers-base
        ];
-       homepage = "https://github.com/scrive/consumers";
        description = "Concurrent PostgreSQL data consumers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53123,7 +51152,6 @@ self: {
        version = "1.1.0";
        sha256 = "19x7jvzc499y4349gallwwy4wpw4pf4azbsp4gr8ly4j0flfgk6g";
        libraryHaskellDepends = [ base containers convert lens text ];
-       homepage = "https://github.com/luna/container";
        description = "Containers abstraction and utilities";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53136,7 +51164,6 @@ self: {
        version = "0.1";
        sha256 = "1vlwaf363ymxpq0ry3h1lbn1dlyvf0dmja1q410ks0byz8kc77r7";
        libraryHaskellDepends = [ base vector ];
-       homepage = "https://github.com/andrewthad/container-builder#readme";
        description = "Functions for building containers from a known number of elements";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53202,7 +51229,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers criterion deepseq ghc-prim random
        ];
-       homepage = "http://git.auryn.cz/haskell/containers-benchmark/";
        description = "Extensive benchmark suite for containers package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53226,7 +51252,6 @@ self: {
        version = "0.3.1.1";
        sha256 = "0ccv7rqkykfk5wmr73mc0kwrnwyzakgp5x495dgwn5nila3g4ma6";
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
-       homepage = "http://haskell.org/haskellwiki/Unicode-symbols";
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53240,7 +51265,6 @@ self: {
        revision = "3";
        editedCabalFile = "092g7yj27pxpap1qh4spp2yvb1y22jaca9s4x36rnkafvqn0yyl3";
        libraryHaskellDepends = [ containers ];
-       homepage = "https://github.com/nomeata/containers-verified";
        description = "Formally verified drop-in replacement of containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53266,7 +51290,6 @@ self: {
          base bytestring conduit conduit-combinators directory filepath
          hspec memory mtl resourcet temporary
        ];
-       homepage = "https://github.com/weldr/content-store";
        description = "Store and retrieve data from an on-disk store";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53291,7 +51314,6 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/nedervold/context-free-grammar";
        description = "Basic algorithms on context-free grammars";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53305,7 +51327,6 @@ self: {
        libraryHaskellDepends = [
          base classy-prelude mtl unordered-containers
        ];
-       homepage = "http://github.com/thinkpad20/context-stack";
        description = "An abstraction of a stack and stack-based monadic context";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53348,7 +51369,6 @@ self: {
        version = "0.9.1.1";
        sha256 = "0gqp1yazmmmdf04saa306jdsf8r5s98fll9rnm8ff6jzr87nvnnh";
        libraryHaskellDepends = [ base ];
-       homepage = "/dev/null";
        description = "Continued fractions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -53397,7 +51417,6 @@ self: {
        libraryHaskellDepends = [
          base StateVar transformers transformers-compat
        ];
-       homepage = "http://github.com/ekmett/contravariant/";
        description = "Contravariant functors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53414,7 +51433,6 @@ self: {
          base base-prelude contravariant semigroups template-haskell
          tuple-th
        ];
-       homepage = "https://github.com/nikita-volkov/contravariant-extras";
        description = "Extras for the \"contravariant\" package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53426,7 +51444,6 @@ self: {
        version = "0.2.1";
        sha256 = "10amxm1ff7xhd8g66n65wkbb8d17n77v1nmwxkbzhrask398asp4";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/fumieval/control-bool";
        description = "Useful combinators for boolean expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53438,7 +51455,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0rwi5zwvqn18g7qyp9aw51w3yzkqbff9g7rcqdk1l871fvq8qhha";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/erisco/control-dotdotdot";
        description = "Haskell operator `g ... f = \x1 .. xn -> g (f x1 .. xn)`.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53477,7 +51493,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "140n27vdbyjz5qycrwlrmyd7s48fxcl6msl16g7czg40k5y23j5s";
        libraryHaskellDepends = [ attempt base transformers ];
-       homepage = "http://github.com/snoyberg/control-monad-attempt";
        description = "Monad transformer for attempt. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53495,7 +51510,6 @@ self: {
          base failure lifted-base monad-control monadloc transformers
          transformers-base
        ];
-       homepage = "http://pepeiborra.github.com/control-monad-exception";
        description = "Explicitly typed, checked exceptions with stack traces";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53511,7 +51525,6 @@ self: {
        libraryHaskellDepends = [
          base control-monad-exception monads-fd transformers
        ];
-       homepage = "http://pepeiborra.github.com/control-monad-exception";
        description = "Monads-fd instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53528,7 +51541,6 @@ self: {
        libraryHaskellDepends = [
          base control-monad-exception monads-tf transformers
        ];
-       homepage = "http://pepeiborra.github.com/control-monad-exception";
        description = "Monads-tf instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -53541,7 +51553,6 @@ self: {
        sha256 = "1wwqn3xcd2fspfd2cnf9cym0cbbgvlajr3pkx7f2v3b37mx6blni";
        libraryHaskellDepends = [ base control-monad-exception mtl ];
        doHaddock = false;
-       homepage = "http://pepeiborra.github.com/control-monad-exception";
        description = "MTL instances for the EMT exceptions monad transformer";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -53553,7 +51564,6 @@ self: {
        version = "0.7.0.1";
        sha256 = "1g304wb1fhx81iw2vv7nv6cp2qmy69frwiv3vax85lxw03s4nlkq";
        libraryHaskellDepends = [ base failure transformers ];
-       homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error. (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53566,7 +51576,6 @@ self: {
        version = "0.7.1";
        sha256 = "0j9i85vq033789vx2589mfqwk954hqy1wla527ssbyf05k6vkn8j";
        libraryHaskellDepends = [ base failure mtl ];
-       homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53579,7 +51588,6 @@ self: {
        version = "0.5.3";
        sha256 = "1igwawcdpg8irayjax1xdrlpa9587k1v4y28ib3xfb7yk0xv7vk1";
        libraryHaskellDepends = [ base deepseq transformers ];
-       homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53594,7 +51602,6 @@ self: {
        revision = "1";
        editedCabalFile = "1901lm2md7flri4ms745lgla18x2k7v0xh51jbjbx6202ppcx3fh";
        libraryHaskellDepends = [ base prelude-extras transformers ];
-       homepage = "http://github.com/pepeiborra/control-monad-free";
        description = "Free monads and monad transformers";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -53606,7 +51613,6 @@ self: {
        version = "0.1";
        sha256 = "003k4pp6wgn30m9ksbh8680f0klzsvd90wsl9jpqs9lpg14hi6zj";
        libraryHaskellDepends = [ base transformers transformers-base ];
-       homepage = "https://github.com/joeyadams/haskell-control-monad-loop";
        description = "Simple monad transformer for imperative-style loops";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53618,7 +51624,6 @@ self: {
        version = "0.3.1";
        sha256 = "11hirysr76i01qj8rm22xjcrv2qwxgwjlrqqyd1dsnnvypn9hfrq";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/luqui/control-monad-omega";
        description = "A breadth-first list monad";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -53652,7 +51657,6 @@ self: {
        version = "1.2.6";
        sha256 = "0rw2bslajjch057fsxf881wi39bsd9y6196j0kb0lz47r0zn8003";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://haskell.org/haskellwiki/Contstuff";
        description = "Fast, easy to use CPS-based monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53688,7 +51692,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0y28m7kgphknra0w2kzf0g4m2bdj604nr3f22xng46nl7kljbpvj";
        libraryHaskellDepends = [ base ];
-       homepage = "/dev/null";
        description = "Limit operations for converging sequences";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -53702,7 +51705,6 @@ self: {
        revision = "1";
        editedCabalFile = "17hrwyhlcch970vb4gk793xhcpg035n0gxypbjz58vkka04j3d4d";
        libraryHaskellDepends = [ base-prelude ];
-       homepage = "https://github.com/nikita-volkov/conversion";
        description = "Universal converter between values of different types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53714,7 +51716,6 @@ self: {
        version = "1.0.1";
        sha256 = "0ybh702mrwjvm48i03bb5hfiiz5qypyxyz5n14wai0kjn4ks1qwh";
        libraryHaskellDepends = [ base-prelude bytestring conversion ];
-       homepage = "https://github.com/nikita-volkov/conversion-bytestring";
        description = "\"Conversion\" instances for the \"bytestring\" library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53726,7 +51727,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "14mf5jincplqrdln6xja0c840mmj4khd5n3z5f4glgpnmk9r3dcp";
        libraryHaskellDepends = [ case-insensitive conversion ];
-       homepage = "https://github.com/nikita-volkov/conversion-case-insensitive";
        description = "\"Conversion\" instances for the \"case-insensitive\" library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53742,7 +51742,6 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring conversion conversion-bytestring text
        ];
-       homepage = "https://github.com/nikita-volkov/conversion-text";
        description = "\"Conversion\" instances for the \"text\" library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53759,7 +51758,6 @@ self: {
          ansi-wl-pprint base bytestring containers data-default lens
          template-haskell text utf8-string
        ];
-       homepage = "https://github.com/luna/convert";
        description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53784,7 +51782,6 @@ self: {
          base bytestring cassava inline-r lens optparse-generic pipes
          pipes-bytestring pipes-csv text vector
        ];
-       homepage = "http://github.com/GregorySchwartz/convert-annotation#readme";
        description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53803,7 +51800,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers mtl old-locale old-time text time
        ];
-       homepage = "http://hackage.haskell.org/package/convertible";
        description = "Typeclasses and instances for converting between types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -53820,7 +51816,6 @@ self: {
          ascii base base-unicode-symbols blaze-builder bytestring
          convertible-text failure text
        ];
-       homepage = "https://github.com/phonohawk/convertible-ascii";
        description = "convertible instances for ascii";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53840,7 +51835,6 @@ self: {
          attempt base bytestring containers old-time template-haskell text
          time
        ];
-       homepage = "http://github.com/snoyberg/convertible/tree/text";
        description = "Typeclasses and instances for converting between types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53873,7 +51867,6 @@ self: {
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
          text time
        ];
-       homepage = "http://github.com/snoyberg/cookie";
        description = "HTTP cookie parsing and rendering";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -53886,7 +51879,6 @@ self: {
        sha256 = "1sph59d8008amhb4pi4gk8ymwjf2r6iy378phriqb42zy01bn0vb";
        libraryHaskellDepends = [ base lens papa transformers ];
        testHaskellDepends = [ base HUnit lens ];
-       homepage = "https://github.com/qfpl/coordinate";
        description = "A representation of latitude and longitude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53911,7 +51903,6 @@ self: {
          base copilot-c99 copilot-cbmc copilot-core copilot-language
          copilot-libraries copilot-sbv copilot-theorem directory random
        ];
-       homepage = "http://leepike.github.com/Copilot/";
        description = "A stream DSL for writing embedded C programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53999,7 +51990,6 @@ self: {
        libraryHaskellDepends = [
          array base containers copilot-language mtl parsec
        ];
-       homepage = "https://github.com/Copilot-Language/copilot-libraries";
        description = "Libraries for the Copilot language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54053,7 +52043,6 @@ self: {
          semigroups text
        ];
        testHaskellDepends = [ base hlint ];
-       homepage = "https://github.com/relrod/copr-hs";
        description = "Haskell interface to the Fedora Copr system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54086,7 +52075,6 @@ self: {
        ];
        executableHaskellDepends = [ array base ];
        executableToolDepends = [ alex happy ];
-       homepage = "https://github.com/aneksteind/Core#readme";
        description = "compile your own mini functional language with Core";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54102,7 +52090,6 @@ self: {
        executableHaskellDepends = [
          base haskeline haskell-src-exts hint
        ];
-       homepage = "https://github.com/happlebao/Core-Haskell";
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54130,7 +52117,6 @@ self: {
          filestore http-types monads-tf pandoc template-haskell text time
          yesod
        ];
-       homepage = "http://github.com/coreyoconnor/corebot-bliki";
        description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54152,7 +52138,6 @@ self: {
          string-class temporary text unordered-containers
        ];
        librarySystemDepends = [ rocksdb ];
-       homepage = "https://github.com/k-bx/corenlp-parser#readme";
        description = "Launches CoreNLP and parses the JSON output";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54165,7 +52150,6 @@ self: {
        version = "0.1.1";
        sha256 = "1rjbhpy5vw1maawi47jsrnagqm19say9w1i31pgcpxl45vhrshp7";
        libraryHaskellDepends = [ base enumerator monad-coroutine ];
-       homepage = "http://trac.haskell.org/SCC/wiki/coroutine-enumerator";
        description = "Bridge between the monad-coroutine and enumerator packages";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54178,7 +52162,6 @@ self: {
        version = "0.1.1";
        sha256 = "1ycir4kwpcz34yg64cdb9q0jxv3ma12vrrs28cr5jm64jmi8m0wd";
        libraryHaskellDepends = [ base iteratee monad-coroutine ];
-       homepage = "http://trac.haskell.org/SCC/wiki/coroutine-iteratee";
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54237,7 +52220,6 @@ self: {
          text transformers unordered-containers uuid
        ];
        testToolDepends = [ couchdb ];
-       homepage = "https://github.com/mdorman/couch-simple";
        description = "A modern, lightweight, complete client for CouchDB";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54268,7 +52250,6 @@ self: {
          test-framework-hunit text transformers transformers-base
          unordered-containers
        ];
-       homepage = "https://github.com/akaspin/couchdb-conduit";
        description = "Couch DB client library using http-conduit and aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54297,7 +52278,6 @@ self: {
          test-framework-quickcheck2 text transformers unordered-containers
          utf8-string vector
        ];
-       homepage = "http://bitbucket.org/wuzzeb/couchdb-enumerator";
        description = "Couch DB client library using http-enumerator and aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54326,7 +52306,6 @@ self: {
        testHaskellDepends = [
          base bytestring silently tasty tasty-golden tasty-hunit
        ];
-       homepage = "https://github.com/AshleyYakeley/countable";
        description = "Countable, Searchable, Finite, Empty classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54343,7 +52322,6 @@ self: {
          base bytestring exceptions pcre-utils regex-pcre-builtin text
        ];
        testHaskellDepends = [ base hspec QuickCheck text ];
-       homepage = "https://github.com/tippenein/countable-inflections";
        description = "Countable Text Inflections";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54356,7 +52334,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0jc34nrbzxzilrr1s2k7krrp9g5xc40hpf2srw6mccfrcsyacsnc";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/wei2912/counter";
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54374,7 +52351,6 @@ self: {
          scientific text unordered-containers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/andrewthad/country#readme";
        description = "Country data type and functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54389,7 +52365,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ aeson base shakespeare text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
-       homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54414,7 +52389,6 @@ self: {
          async base cereal containers directory hslogger HUnit network stm
          test-framework test-framework-hunit
        ];
-       homepage = "http://github.com/hargettp/courier";
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54434,7 +52408,6 @@ self: {
          aeson base bytestring directory filepath old-locale
          optparse-applicative process stm text time unix
        ];
-       homepage = "http://hub.darcs.net/thoferon/court";
        description = "Simple and flexible CI system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54448,7 +52421,6 @@ self: {
        sha256 = "1nl2wzvv9azba96haaa19vx87qrdfnm0y8sj3f24yvc0byg4kdyr";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
-       homepage = "https://github.com/nicodelpiano/coverage";
        description = "Exhaustivity Checking Library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54486,7 +52458,6 @@ self: {
          base base16-bytestring binary bytestring conduit conduit-extra
          resourcet
        ];
-       homepage = "http://github.com/da-x/cpio-conduit";
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54505,7 +52476,6 @@ self: {
          unordered-containers vector
        ];
        librarySystemDepends = [ cplex ];
-       homepage = "https://github.com/stefan-j/cplex-haskell";
        description = "high-level CPLEX interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54523,7 +52493,6 @@ self: {
          base bytestring containers process template-haskell
        ];
        testHaskellDepends = [ base process QuickCheck ];
-       homepage = "https://github.com/nicta/cplusplus-th";
        description = "C++ Foreign Import Generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54538,7 +52507,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/0xd34df00d/cppfilt#readme";
        description = "Bindings for C++ demangling routines";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54558,7 +52526,6 @@ self: {
        executableHaskellDepends = [
          base directory old-locale old-time polyparse
        ];
-       homepage = "http://projects.haskell.org/cpphs/";
        description = "A liberalised re-implementation of cpp, the C pre-processor";
        license = "LGPL";
      }) {};
@@ -54578,7 +52545,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion crypto-random mtl
        ];
-       homepage = "http://github.com/vincenthz/hs-cprng-aes";
        description = "Crypto Pseudo Random Number Generator using AES in counter mode";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54597,7 +52563,6 @@ self: {
          base cprng-aes crypto-random crypto-random-effect
          extensible-effects
        ];
-       homepage = "https://github.com/ibotty/crypto-random-effect";
        description = "Run random effect using cprng-aes, a crypto pseudo number generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54627,7 +52592,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/vincenthz/hs-cpu";
        description = "Cpu information and properties helpers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -54641,7 +52605,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-accessor enumset ];
-       homepage = "http://code.haskell.org/cpuid/";
        description = "Binding for the cpuid machine instruction on x86 compatible processors";
        license = "GPL";
      }) {};
@@ -54653,7 +52616,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0mans1i26w3rl1vvf9isn8y6lvmn9dlf2c0znbgjxj605jcy7cyi";
        libraryHaskellDepends = [ attoparsec base bytestring deepseq ];
-       homepage = "https://github.com/TravisWhitaker/cpuinfo";
        description = "Haskell Library for Checking CPU Information";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -54667,7 +52629,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl process ];
-       homepage = "http://code.haskell.org/~dons/code/cpuperf";
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54682,7 +52643,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        libraryPkgconfigDepends = [ python34 ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://john-millikin.com/software/haskell-python/";
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54705,7 +52665,6 @@ self: {
          base bytestring cereal Decimal iproute network QuickCheck tasty
          tasty-quickcheck text time uuid
        ];
-       homepage = "https://gitlab.com/twittner/cql/";
        description = "Cassandra CQL binary protocol";
        license = "unknown";
      }) {};
@@ -54727,7 +52686,6 @@ self: {
          base bytestring cereal Decimal iproute network QuickCheck tasty
          tasty-quickcheck text time uuid
        ];
-       homepage = "https://gitlab.com/twittner/cql/";
        description = "Cassandra CQL binary protocol";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54752,7 +52710,6 @@ self: {
          monad-control mtl mwc-random network retry semigroups stm text time
          tinylog transformers transformers-base uuid vector
        ];
-       homepage = "https://gitlab.com/twittner/cql-io/";
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -54780,7 +52737,6 @@ self: {
          base containers cql Decimal iproute mtl raw-strings-qq tasty
          tasty-hunit text time tinylog uuid
        ];
-       homepage = "https://gitlab.com/twittner/cql-io/";
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -54960,7 +52916,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs directory process shelly text transformers unix
        ];
-       homepage = "https://github.com/scvalex/cr";
        description = "Code review tool";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55057,7 +53012,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base colour mtl vector-space ];
-       homepage = "http://mahrz.github.com/craftwerk.html";
        description = "2D graphics library with integrated TikZ output";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55070,7 +53024,6 @@ self: {
        version = "0.1";
        sha256 = "16in87l2v49k785fldm7fvprywg0v497kz29jr22y91q5j5gnm4z";
        libraryHaskellDepends = [ base cairo craftwerk mtl ];
-       homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Cairo backend for Craftwerk";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55089,27 +53042,26 @@ self: {
        libraryHaskellDepends = [
          base cairo containers craftwerk craftwerk-cairo gtk mtl
        ];
-       homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Gtk UI for Craftwerk";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crawlchain" = callPackage
-    ({ mkDerivation, base, bytestring, directory, http-streams
-     , network-uri, split, tagsoup, text, time
+    ({ mkDerivation, base, bytestring, directory, HsOpenSSL
+     , http-streams, network-uri, split, tagsoup, text, time
      }:
      mkDerivation {
        pname = "crawlchain";
-       version = "0.2.0.0";
-       sha256 = "0fs8996lzwibnqcaq3j5zgw7alnq8y1k3xqylpdgcp06p7na744q";
+       version = "0.3.1.0";
+       sha256 = "1w4bwd8aqqpzp5lj5rqnvzaqnr2hh0civ0rj1hjc0gdyb96mwd2s";
        libraryHaskellDepends = [
-         base bytestring directory http-streams network-uri split tagsoup
-         text time
+         base bytestring directory HsOpenSSL http-streams network-uri split
+         tagsoup text time
        ];
        testHaskellDepends = [
-         base bytestring directory http-streams network-uri split tagsoup
-         text time
+         base bytestring directory HsOpenSSL http-streams network-uri split
+         tagsoup text time
        ];
        description = "Simulation user crawl paths";
        license = stdenv.lib.licenses.bsd3;
@@ -55143,7 +53095,6 @@ self: {
          hspec-discover HTTP http-types lens lifted-async lifted-base
          monad-control mtl text transformers transformers-base
        ];
-       homepage = "https://github.com/etcinit/craze#readme";
        description = "HTTP Racing Library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55162,7 +53113,6 @@ self: {
          base bytestring conduit conduit-extra resourcet tasty tasty-golden
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "http://github.com/MichaelXavier/crc";
        description = "Implements various Cyclic Redundancy Checks (CRC)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55203,7 +53153,6 @@ self: {
          base binary bytestring containers Diff hashable mtl network-info
          safe stm time vector
        ];
-       homepage = "https://github.com/cblp/crdt#readme";
        description = "Conflict-free replicated data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55229,7 +53178,6 @@ self: {
          MonadRandom mtl QuickCheck temporary test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mhwombat/creatur";
        description = "Framework for artificial life experiments";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55250,7 +53198,6 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
-       homepage = "https://github.com/rblaze/credential-store#readme";
        description = "Library to access secure credential storage providers";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55272,7 +53219,6 @@ self: {
          semigroups text time transformers unordered-containers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/brendanhay/credentials";
        description = "Secure Credentials Storage and Distribution";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55298,7 +53244,6 @@ self: {
          resourcet text transformers-base unordered-containers
          uri-bytestring
        ];
-       homepage = "https://github.com/brendanhay/credentials";
        description = "Secure Credentials Administration";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55319,7 +53264,6 @@ self: {
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
        ];
-       homepage = "https://github.com/kawu/crf-chain1";
        description = "First-order, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55338,7 +53282,6 @@ self: {
          array base binary containers data-lens logfloat monad-codec
          parallel random sgd vector vector-binary vector-th-unbox
        ];
-       homepage = "https://github.com/kawu/crf-chain1-constrained";
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55357,7 +53300,6 @@ self: {
          array base binary comonad-transformers containers data-lens
          logfloat monad-codec parallel sgd vector vector-binary
        ];
-       homepage = "https://github.com/kawu/crf-chain2-generic";
        description = "Second-order, generic, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55376,7 +53318,6 @@ self: {
          array base binary comonad containers data-lens logfloat monad-codec
          parallel sgd vector vector-binary vector-th-unbox
        ];
-       homepage = "https://github.com/kawu/crf-chain2-tiers";
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55406,7 +53347,6 @@ self: {
          hashable mtl mwc-random text transformers unordered-containers
          vector
        ];
-       homepage = "https://github.com/bos/critbit";
        description = "Crit-bit maps and sets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55444,7 +53384,6 @@ self: {
          aeson base base-compat bytestring deepseq directory HUnit
          QuickCheck statistics tasty tasty-hunit tasty-quickcheck vector
        ];
-       homepage = "http://www.serpentine.com/criterion";
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55480,7 +53419,6 @@ self: {
          directory HUnit QuickCheck statistics tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       homepage = "http://www.serpentine.com/criterion";
        description = "Robust, reliable performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55509,7 +53447,6 @@ self: {
          string-conversions system-fileio system-filepath text th-printf
          transformers transformers-base vector
        ];
-       homepage = "https://github.com/nikita-volkov/criterion-plus";
        description = "Enhancement of the \"criterion\" benchmarking library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55529,7 +53466,6 @@ self: {
        executableHaskellDepends = [
          aeson base blaze-html blaze-markup bytestring containers filepath
        ];
-       homepage = "http://github.com/jaspervdj/criterion-to-html";
        description = "Convert criterion output to HTML reports";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55561,7 +53497,6 @@ self: {
        setupHaskellDepends = [ base proto-lens-protoc ];
        libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
        libraryPkgconfigDepends = [ protobuf ];
-       homepage = "https://github.com/wayofthepie/haskell-criu-rpc-types";
        description = "Criu RPC protocol buffer types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55578,7 +53513,6 @@ self: {
        editedCabalFile = "118xzpnj3mlhag71dhpr0lj35pfxkz5xgykw9wqjyfldqy53p00b";
        libraryHaskellDepends = [ base containers free mtl text ];
        testHaskellDepends = [ base containers hedgehog hspec mtl ];
-       homepage = "https://github.com/amarpotghan/crjdt-haskell#readme";
        description = "A Conflict-Free Replicated JSON Datatype for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55609,7 +53543,6 @@ self: {
          base bmp bytestring deepseq ghc-prim heap HUnit
          mersenne-random-pure64 mtl parallel
        ];
-       homepage = "https://github.com/TomHammersley/HaskellRenderer/";
        description = "An offline renderer supporting ray tracing and photon mapping";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55634,7 +53567,6 @@ self: {
          tasty-hunit tasty-quickcheck text time transformers-compat
        ];
        benchmarkHaskellDepends = [ attoparsec base criterion text time ];
-       homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -55656,7 +53588,6 @@ self: {
          attoparsec base cron derive hspec hspec-expectations QuickCheck
          text time transformers
        ];
-       homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55670,7 +53601,6 @@ self: {
        sha256 = "0kp0vm8mvgn12kk5csyhzv6g6az43acl6iwjbhvfdfr2mqif2b9h";
        libraryHaskellDepends = [ aeson base containers lens text ];
        testHaskellDepends = [ base hlint ];
-       homepage = "http://github.com/eval-so/cruncher-types";
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55712,7 +53642,6 @@ self: {
          base bytestring quickcheck-instances tasty tasty-hunit
          tasty-quickcheck
        ];
-       homepage = "https://github.com/phadej/crypt-sha512";
        description = "Pure Haskell implelementation for GNU SHA512 crypt algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55731,7 +53660,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal entropy tagged transformers
        ];
-       homepage = "https://github.com/TomMD/crypto-api";
        description = "A generic interface for cryptographic operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55751,7 +53679,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://trac.haskell.org/crypto-api/wiki";
        description = "A test framework and KATs for cryptographic operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55768,7 +53695,6 @@ self: {
          base byteable bytestring criterion crypto-cipher-types mtl pretty
          securemem
        ];
-       homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher benchmarks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55792,7 +53718,6 @@ self: {
          base byteable bytestring crypto-cipher-types HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher tests";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55805,7 +53730,6 @@ self: {
        sha256 = "03qa1i1kj07pfrxsi7fiaqnnd0vi94jd4jfswbmnm4gp1nvzcwr0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base byteable bytestring securemem ];
-       homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55824,7 +53748,6 @@ self: {
          microlens-th modular-arithmetic QuickCheck random random-shuffle
          text transformers
        ];
-       homepage = "https://github.com/fosskers/crypto-classical";
        description = "An educational tool for studying classical cryptography schemes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55847,7 +53770,6 @@ self: {
          base bytestring cereal conduit conduit-extra crypto-api
          cryptocipher cryptohash-cryptoapi hspec skein transformers
        ];
-       homepage = "https://github.com/prowdsponsor/crypto-conduit";
        description = "Conduit interface for cryptographic operations (from crypto-api)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55863,7 +53785,6 @@ self: {
        sha256 = "0g5qnr7pds5q1n77w1sw4m6kmzm020w9mdf4x2cs18iwg8wl5f9b";
        libraryHaskellDepends = [ base containers MissingH mtl split ];
        testHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/orome/crypto-enigma-hs";
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55884,7 +53805,6 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
-       homepage = "https://github.com/mseri/crypto-multihash#crypto-multihash";
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -55909,7 +53829,6 @@ self: {
          tasty-quickcheck vector
        ];
        benchmarkHaskellDepends = [ base bytestring criterion mtl ];
-       homepage = "https://github.com/vincenthz/hs-crypto-numbers";
        description = "Cryptographic numbers: functions and algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55936,7 +53855,6 @@ self: {
          base bytestring criterion crypto-pubkey-types crypto-random
          cryptohash deepseq mtl
        ];
-       homepage = "https://github.com/vincenthz/hs-crypto-pubkey";
        description = "Public Key cryptography";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55960,7 +53878,6 @@ self: {
          bytestring cereal crypto-pubkey-types deepseq filepath pem process
          QuickCheck tasty tasty-quickcheck temporary
        ];
-       homepage = "https://github.com/knsd/crypto-pubkey-openssh";
        description = "OpenSSH keys decoder/encoder";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -55972,7 +53889,6 @@ self: {
        version = "0.4.3";
        sha256 = "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby";
        libraryHaskellDepends = [ asn1-encoding asn1-types base ];
-       homepage = "http://github.com/vincenthz/hs-crypto-pubkey-types";
        description = "Generic cryptography Public keys algorithm types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55984,7 +53900,6 @@ self: {
        version = "0.0.9";
        sha256 = "0139kbbb2h7vshf68y3fvjda29lhj7jjwl4vq78w4y8k8hc7l2hp";
        libraryHaskellDepends = [ base bytestring securemem unix vector ];
-       homepage = "http://github.com/vincenthz/hs-crypto-random";
        description = "Simple cryptographic random related types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -55996,7 +53911,6 @@ self: {
        version = "0.2.0";
        sha256 = "0z49kwgjj7rz235642q64hbkgp0zl6ipn29xd19yb75xc5q7gsan";
        libraryHaskellDepends = [ base bytestring entropy ];
-       homepage = "http://github.com/vincenthz/hs-crypto-random-api";
        description = "Simple random generators API for cryptography related code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56015,7 +53929,6 @@ self: {
          base bytestring crypto-random extensible-effects securemem
          transformers
        ];
-       homepage = "https://github.com/ibotty/crypto-random-effect";
        description = "A random effect using crypto-random";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56033,7 +53946,6 @@ self: {
          base bytestring crypto-api DRBG exceptions monad-control mtl
          transformers-base
        ];
-       homepage = "https://github.com/scrive/crypto-rng";
        description = "Cryptographic random number generator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56048,7 +53960,6 @@ self: {
        testHaskellDepends = [
          base bytestring cryptonite hspec QuickCheck
        ];
-       homepage = "https://github.com/Risto-Stevcev/haskell-crypto-simple#readme";
        description = "A simple high level encryption interface based on cryptonite";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56081,7 +53992,6 @@ self: {
          base cipher-aes cipher-blowfish cipher-camellia cipher-des
          cipher-rc4 crypto-cipher-types
        ];
-       homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Symmetrical block and stream ciphers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56100,7 +54010,6 @@ self: {
          MissingH text time transformers unordered-containers
        ];
        testHaskellDepends = [ base hspec hspec-expectations MissingH ];
-       homepage = "https://github.com/aviaviavi/cryptocompare";
        description = "Haskell wrapper for the cryptocompare API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56125,7 +54034,6 @@ self: {
          base64-bytestring bytestring containers cryptonite tasty
          tasty-hunit text transformers
        ];
-       homepage = "https://github.com/libscott/cryptoconditions-hs";
        description = "Interledger Crypto-Conditions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56148,7 +54056,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base byteable bytestring criterion ];
-       homepage = "http://github.com/vincenthz/hs-cryptohash";
        description = "collection of crypto hashes, fast, pure and practical";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56165,7 +54072,6 @@ self: {
          base bytestring conduit conduit-extra cryptohash resourcet
          transformers
        ];
-       homepage = "http://github.com/vincenthz/hs-cryptohash-conduit";
        description = "cryptohash conduit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56182,7 +54088,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal crypto-api cryptonite memory tagged
        ];
-       homepage = "https://github.com/vincenthz/hs-cryptohash-cryptoapi";
        description = "Crypto-api interfaces for cryptohash";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56203,7 +54108,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/hvr/cryptohash-md5";
        description = "Fast, pure and practical MD5 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56224,7 +54128,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/hvr/cryptohash-sha1";
        description = "Fast, pure and practical SHA-1 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56247,7 +54150,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/hvr/cryptohash-sha256";
        description = "Fast, pure and practical SHA-256 implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56268,7 +54170,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/hvr/cryptohash-sha512";
        description = "Fast, pure and practical SHA-512 implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56353,7 +54254,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq directory filepath sbv text
        ];
-       homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56376,7 +54276,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring deepseq gauge memory random
        ];
-       homepage = "https://github.com/haskell-crypto/cryptonite";
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56400,7 +54299,6 @@ self: {
          base bytestring conduit conduit-combinators cryptonite memory tasty
          tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/haskell-crypto/cryptonite-conduit";
        description = "cryptonite conduit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56419,7 +54317,6 @@ self: {
          base bytestring cryptonite tasty tasty-hunit tasty-kat
          tasty-quickcheck
        ];
-       homepage = "https://github.com/haskell-crypto/cryptonite-openssl";
        description = "Crypto stuff using OpenSSL cryptographic library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
@@ -56440,7 +54337,6 @@ self: {
          base bytestring cryptonite tasty tasty-hunit tasty-kat
          tasty-quickcheck
        ];
-       homepage = "https://github.com/haskell-crypto/cryptonite-openssl";
        description = "Crypto stuff using OpenSSL cryptographic library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56485,7 +54381,6 @@ self: {
        version = "0.1.1";
        sha256 = "123x10ircbj8lrsqapf6cb9b3ibjgp1q8l862a3i6i0ak7ash49f";
        libraryHaskellDepends = [ base ghc ];
-       homepage = "http://thoughtpolice.github.com/cse-ghc-plugin";
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56518,7 +54413,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion simple-vec3 strict vector
        ];
-       homepage = "https://github.com/dzhus/csg#readme";
        description = "Analytical CSG (Constructive Solid Geometry) library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56535,7 +54429,6 @@ self: {
        libraryHaskellDepends = [
          base csound-expression csound-sampler sharc-timbre transformers
        ];
-       homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56555,7 +54448,6 @@ self: {
          csound-expression-opcodes csound-expression-typed data-default
          process temporal-media transformers
        ];
-       homepage = "https://github.com/anton-k/csound-expression";
        description = "library to make electronic music";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56572,7 +54464,6 @@ self: {
          array base Boolean containers data-default data-fix data-fix-cse
          hashable transformers wl-pprint
        ];
-       homepage = "https://github.com/anton-k/csound-expression-dynamic";
        description = "dynamic core for csound-expression library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56608,7 +54499,6 @@ self: {
          data-default deepseq directory filepath ghc-prim hashable
          NumInstances temporal-media transformers wl-pprint
        ];
-       homepage = "https://github.com/anton-k/csound-expression-typed";
        description = "typed core for the library csound-expression";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56620,7 +54510,6 @@ self: {
        version = "0.0.9.0";
        sha256 = "0vvsqbnd1yjwijz4g0y9av6d20m73b5swln4v7gna3jd16mrg2k1";
        libraryHaskellDepends = [ base csound-expression transformers ];
-       homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56666,7 +54555,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath haskeline libcspm mtl
        ];
-       homepage = "https://github.com/tomgr/libcspm";
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56722,7 +54610,6 @@ self: {
        sha256 = "0ynd9f4hn2sfwqzbsa0y7phmxq8za7jiblpjwx0ry8b372zhgxaz";
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base hspec QuickCheck text ];
-       homepage = "https://github.com/yesodweb/css-text.git#readme";
        description = "CSS parser and renderer";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -56759,7 +54646,6 @@ self: {
          base bytestring containers directory HUnit mtl primitive
          test-framework test-framework-hunit text transformers vector
        ];
-       homepage = "http://github.com/ozataman/csv-conduit";
        description = "A flexible, fast, conduit-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56777,7 +54663,6 @@ self: {
          attoparsec attoparsec-enumerator base bytestring containers
          directory enumerator safe transformers unix-compat
        ];
-       homepage = "http://github.com/ozataman/csv-enumerator";
        description = "A flexible, fast, enumerator-based CSV parser library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56806,7 +54691,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1p5waqb9sj3xjrc01isqbii282sxs865ciyy03f7kzi66as5j6g9";
        libraryHaskellDepends = [ base containers csv filepath process ];
-       homepage = "https://github.com/ucsd-progsys/csv-table";
        description = "Scripts for manipulating tables stored as CSV files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -56828,7 +54712,6 @@ self: {
          base Cabal explicit-exception hspec parsec QuickCheck regex-tdfa
          split spreadsheet
        ];
-       homepage = "http://mrvandalo.github.io/csv-to-qif/";
        description = "A small program that will read csv files and create qif files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -56841,7 +54724,6 @@ self: {
        sha256 = "02xsw0zpg728cq018w6zjgbzk6d7px62mapn40gir9c0hi6rqlx8";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ ctemplate ];
-       homepage = "http://darcs.imperialviolet.org/ctemplate";
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56869,7 +54751,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base chatty-text chatty-utils ];
        executableHaskellDepends = [ array base chatty-text chatty-utils ];
-       homepage = "http://doomanddarkness.eu/pub/ctpl";
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -56894,7 +54775,6 @@ self: {
          async base containers criterion deepseq hashable random
          random-shuffle stm transformers unordered-containers
        ];
-       homepage = "https://github.com/mcschroeder/ctrie";
        description = "Non-blocking concurrent map";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -56931,7 +54811,6 @@ self: {
          array base BNFC directory filepath haskeline mtl transformers
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "https://github.com/simhu/cubical";
        description = "Implementation of Univalence in Cubical Sets";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57012,7 +54891,6 @@ self: {
        ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base pretty ];
-       homepage = "https://github.com/tmcdonell/cuda";
        description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57026,7 +54904,6 @@ self: {
        libraryHaskellDepends = [ array base mtl transformers ];
        librarySystemDepends = [ cudd ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/adamwalker/haskell_cudd";
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57052,7 +54929,6 @@ self: {
          base bytestring exceptions hspec hspec-megaparsec megaparsec
          QuickCheck text
        ];
-       homepage = "https://github.com/mrkkrp/cue-sheet";
        description = "Support for construction, rendering, and parsing of CUE sheets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57070,7 +54946,6 @@ self: {
        ];
        libraryHaskellDepends = [ base cuda ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/robeverest/cufft";
        description = "Haskell bindings for the CUFFT library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57089,7 +54964,6 @@ self: {
        ];
        libraryHaskellDepends = [ base cuda ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/robeverest/cufft";
        description = "Haskell bindings for the CUFFT library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57116,7 +54990,6 @@ self: {
        version = "0.0.4";
        sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx";
        libraryHaskellDepends = [ aeson base curl text utf8-string ];
-       homepage = "https://github.com/zouppen/haskell-curl-aeson";
        description = "Communicate with HTTP service using JSON";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57138,7 +55011,6 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs text ];
        testHaskellDepends = [ base directory hspec hspec-expectations ];
-       homepage = "https://github.com/aviaviavi/curl-runnings#readme";
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57162,7 +55034,6 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs text ];
        testHaskellDepends = [ base directory hspec hspec-expectations ];
-       homepage = "https://github.com/aviaviavi/curl-runnings#readme";
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57178,7 +55049,6 @@ self: {
        editedCabalFile = "077s3k8rpjqfzfvzaqpd1ch0mx6svdigw6ghfikp8rnf901vx3dc";
        libraryHaskellDepends = [ base bytestring rtld time ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/kkardzis/curlhs";
        description = "bindings to libcurl, the multiprotocol file transfer library";
        license = "unknown";
      }) {};
@@ -57191,7 +55061,6 @@ self: {
        sha256 = "1w0b7wp3kz8iqm25s28w131g923pysp9s1p7ll7df5wr64fh53nm";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
-       homepage = "https://github.com/alx741/currencies#readme";
        description = "Currencies representation, pretty printing and conversion";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57206,7 +55075,6 @@ self: {
        libraryHaskellDepends = [
          base containers hashable iso3166-country-codes
        ];
-       homepage = "https://github.com/singpolyma/currency-haskell";
        description = "Types representing standard and non-standard currencies";
        license = "unknown";
      }) {};
@@ -57223,7 +55091,6 @@ self: {
          aeson base bson deepseq random safe text
        ];
        testHaskellDepends = [ aeson base bson hspec QuickCheck ];
-       homepage = "https://github.com/chordify/currency-codes";
        description = "ISO-4217 Currency Codes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57240,7 +55107,6 @@ self: {
        libraryHaskellDepends = [
          aeson base http-conduit text unordered-containers
        ];
-       homepage = "http://tuomas56.github.io/currency-convert";
        description = "Typesafe currency conversion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57253,7 +55119,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "18lg46fzpz207bd60hbcas6ippw0wnsc8n93pnz775ks5y7apyr5";
        libraryHaskellDepends = [ base old-locale process split ];
-       homepage = "https://github.com/koterpillar/current-locale";
        description = "Get the current system locale in System.Locale format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -57283,7 +55148,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base Cabal filepath mtl ];
-       homepage = "http://curry-language.org";
        description = "Functions for manipulating Curry programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57309,7 +55173,6 @@ self: {
          pretty process set-extra transformers
        ];
        testHaskellDepends = [ base Cabal curry-base filepath ];
-       homepage = "http://curry-language.org";
        description = "Compile the functional logic language Curry to several intermediate formats";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57328,7 +55191,6 @@ self: {
          aeson base blaze-html bytestring case-insensitive containers cookie
          http-types mtl regex-pcre text transformers wai warp
        ];
-       homepage = "https://github.com/ChrisPenner/curryer#readme";
        description = "A simple HTTP server framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57342,7 +55204,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base ];
-       homepage = "https://github.com/mgattozzi/curryrs#readme";
        description = "Easy to use FFI Bridge for using Rust in Haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57380,7 +55241,6 @@ self: {
          base bytestring crypto-api DRBG HUnit QuickCheck tagged
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/acw/curve25519";
        description = "Fast implementations of the curve25519 elliptic curve primitives";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57444,7 +55304,6 @@ self: {
        version = "0.2.2.0";
        sha256 = "00lkpkl79kznib0s6xm644f3k13dv59x5z06ccymvx6l6iqxyzn6";
        libraryHaskellDepends = [ base basic-prelude monad-loops ];
-       homepage = "https://github.com/ajnsit/custom-prelude";
        description = "An enhanced prelude, serving as a foundation for my projects";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57493,7 +55352,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0ywwkwm3sfm8dx447512jm57pdy8sr29z6bvnd3q58h5prz3r2nm";
        libraryHaskellDepends = [ aeson base text ];
-       homepage = "github.com/chessai/cve.git";
        description = "simple and efficient cve datatype";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57505,8 +55363,8 @@ self: {
      }:
      mkDerivation {
        pname = "cyclotomic";
-       version = "0.5.0.0";
-       sha256 = "1r8hsc2x59g5xwch417iaxd8cldm0bg00wvhjb48cb7d53lx3zf8";
+       version = "0.5.1";
+       sha256 = "1zazdzsiv42p244f0js2fj81l6wkv0s46rfcl9hyabzcq6x9h87p";
        libraryHaskellDepends = [ arithmoi base containers ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -57546,7 +55404,6 @@ self: {
        editedCabalFile = "1vz6nrmxhl2rrwcg16dpp09q64pk9z9j0ka97lqhxdzpvqm0fg88";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/lspitzner/czipwith/";
        description = "CZipWith class and deriving via TH";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57559,7 +55416,6 @@ self: {
        sha256 = "0s1gz76789w5grm121fikgrxz1hjca6v6dwmds5zg63j6iir3f0p";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/lspitzner/czipwith/";
        description = "CZipWith class and deriving via TH";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57610,7 +55466,6 @@ self: {
          d3d11 D3DCompiler d3dx11 d3dxof dxgi dxguid
        ];
        executableHaskellDepends = [ base c-storable-deriving vect Win32 ];
-       homepage = "https://github.com/jwvg0425/d3d11binding";
        description = "A raw binding for the directX 11";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57624,7 +55479,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0wrxvfgss9fiv1pwsdi1md0plc4mf9sadkhgm46dsfq16dwrp3q2";
        libraryHaskellDepends = [ base mtl random text ];
-       homepage = "https://github.com/nebuta/d3js-haskell";
        description = "Declarative visualization on a web browser with DSL approach";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57638,7 +55492,6 @@ self: {
        sha256 = "1g446qxff8ajv44341y0f9v39j8idmnn23lwi08gq3ps4qrz0py2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory unix ];
-       homepage = "https://github.com/scvalex/daemonize-doublefork";
        description = "Start background daemons by double-forking";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -57667,7 +55520,6 @@ self: {
          base data-default directory ghc-prim HUnit test-framework
          test-framework-hunit unix
        ];
-       homepage = "https://github.com/scvalex/daemons";
        description = "Daemons in Haskell made fun and easy";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -57776,7 +55628,6 @@ self: {
          base containers explicit-exception multiarg old-locale parsec
          prednote rainbow text time transformers
        ];
-       homepage = "http://massysett.github.com/dapi";
        description = "Prints a series of dates";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57823,7 +55674,6 @@ self: {
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
        '';
-       homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57847,7 +55697,6 @@ self: {
          SHA split statistics strict tabular tar time utf8-string uvector
          zlib
        ];
-       homepage = "http://wiki.darcs.net/Development/Benchmarks";
        description = "Comparative benchmark suite for darcs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57880,7 +55729,6 @@ self: {
          vector zlib
        ];
        executableSystemDepends = [ curl ];
-       homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57922,7 +55770,6 @@ self: {
          parsec process QuickCheck regex-compat unix
        ];
        executableSystemDepends = [ curl ncurses zlib ];
-       homepage = "http://darcs.net/";
        description = "David's Advanced Version Control System";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -57981,7 +55828,6 @@ self: {
        executableHaskellDepends = [
          base containers directory HaXml mtl process
        ];
-       homepage = "http://wiki.darcs.net/RelatedSoftware/DarcsMonitor";
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58041,7 +55887,6 @@ self: {
          pureMD5 random redis safe SHA snap-core snap-server split ssh
          system-uuid text time utf8-string webdriver xhtml xml
        ];
-       homepage = "http://hackage.haskell.org/package/darcsden";
        description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58065,7 +55910,6 @@ self: {
          filepath HTTP mime-string mtl nano-md5 network old-locale old-time
          parsec process regex-compat safe time unix xhtml zlib
        ];
-       homepage = "http://darcswatch.nomeata.de/";
        description = "Track application of Darcs patches";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58094,7 +55938,6 @@ self: {
        benchmarkHaskellDepends = [
          base binary bytestring criterion transformers
        ];
-       homepage = "https://github.com/bacher09/darkplaces-demo";
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58112,7 +55955,6 @@ self: {
          base byteable bytestring cryptohash network time
        ];
        testHaskellDepends = [ base bytestring hspec hspec-core ];
-       homepage = "https://github.com/bacher09/darkplaces-rcon";
        description = "Darkplaces rcon client library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58143,7 +55985,6 @@ self: {
          base bytestring darkplaces-rcon darkplaces-text hspec hspec-core
          text
        ];
-       homepage = "https://github.com/bacher09/darkplaces-rcon";
        description = "Darplaces rcon utility";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58162,7 +56003,6 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
-       homepage = "https://github.com/bacher09/darkplaces-text";
        description = "Parser for darkplaces colorful text";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -58183,7 +56023,6 @@ self: {
          haddock-api optparse-applicative parsec pipes sqlite-simple tagsoup
          text transformers
        ];
-       homepage = "http://www.github.com/jfeltz/dash-haskell";
        description = "Convert package Haddock to Dash docsets (IDE docs)";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58196,7 +56035,6 @@ self: {
        version = "0.2.2.7";
        sha256 = "1vf2g1gac3rm32g97rl0fll51m88q7ry4m6khnl5j47qsmx24r9l";
        libraryHaskellDepends = [ array base containers transformers ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58222,7 +56060,6 @@ self: {
        libraryHaskellDepends = [
          base data-accessor monads-fd transformers
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in monads-fd State monad class";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58237,7 +56074,6 @@ self: {
        libraryHaskellDepends = [
          base data-accessor monads-tf transformers
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in monads-tf State monad type family";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58250,7 +56086,6 @@ self: {
        version = "0.2.0.4";
        sha256 = "1i8lk0vy04giixng5addgj740cbvwlc7g62qgrmhfip0w9k93kqh";
        libraryHaskellDepends = [ base data-accessor mtl ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in mtl State monad class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58265,7 +56100,6 @@ self: {
        libraryHaskellDepends = [
          base data-accessor template-haskell utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58277,7 +56111,6 @@ self: {
        version = "0.2.1.7";
        sha256 = "0yp030vafbpddl27m606aibbbr5ar5j5bsv4bksscz3cq4yq5j10";
        libraryHaskellDepends = [ base data-accessor transformers ];
-       homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in transformers State monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58289,7 +56122,6 @@ self: {
        version = "0.4.0";
        sha256 = "03jhlb7w98bwx5xa23as9i6id0qxcl4f7k9rql2cgcy8nxf7c2xn";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Combinator birds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58301,7 +56133,6 @@ self: {
        version = "1.1";
        sha256 = "1l95mrl6333hp46vsv54fglg4gwz8p14z3rysx6115blc81yx18x";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/wdanilo/data-base";
        description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58326,7 +56157,6 @@ self: {
        testHaskellDepends = [
          aeson base lens postgresql-simple string-conv time
        ];
-       homepage = "https://gitlab.com/haskell-hr/basic";
        description = "A database library with a focus on ease of use, type safety and useful error messages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58339,7 +56169,6 @@ self: {
        version = "0.4.4";
        sha256 = "02nzg1barhqhpf4x26mpzvk7jd29nali033qy01adjplv2z5m5sr";
        libraryHaskellDepends = [ base binary ];
-       homepage = "https://john-millikin.com/software/data-binary-ieee754/";
        description = "Parser/Serialiser for IEEE-754 floating-point values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -58352,7 +56181,6 @@ self: {
        sha256 = "0zfvk7b7qi6inra0kc03rhsic2rj0818n4i03lfwzvb5g22izw3h";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       homepage = "https://github.com/mvv/data-bword";
        description = "Extra operations on binary words of fixed length";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58376,7 +56204,6 @@ self: {
        pname = "data-category";
        version = "0.7";
        sha256 = "000x29a8x2ca7m85z0h7snm0297jf9ndr46dh3arv43fjlvfy3ag";
-       homepage = "http://github.com/sjoerdvisscher/data-category";
        description = "Category theory";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58388,7 +56215,6 @@ self: {
        version = "1.0.0.2";
        sha256 = "03liak61gr90i48rd4dlm5lhr8z9v02nn6kdy33sinbpm6313agr";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/zadarnowski/data-cell";
        description = "Generic cellular data representation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58401,7 +56227,6 @@ self: {
        sha256 = "00di2szqavzmbx4y5b6dq7qalm5pgalb19lfqcdawd5n61fj2gq1";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/mrkkrp/data-check";
        description = "Library for checking and normalization of data (e.g. from web forms)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58413,7 +56238,6 @@ self: {
        version = "0.3";
        sha256 = "0xjn7iqlsgi51h8gz4x40kc2qb5lwf6nw5kjwgkck1w5gjfd11yw";
        libraryHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/mvv/data-checked";
        description = "Type-indexed runtime-checked properties";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58425,7 +56249,6 @@ self: {
        version = "0.1.2.1";
        sha256 = "05l4gkb9k9p7cykx831n9w8i5yy6qffi4pip2y2l5xg2hvi8464s";
        libraryHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/sw17ch/data-clist";
        description = "Simple functional ring type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58449,7 +56272,6 @@ self: {
        version = "1.1";
        sha256 = "0hdkj8fpa0mmi57ljl744kkh6hk99d4x8dbm2djprw7rvrj5irg8";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/wdanilo/data-construction";
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58466,7 +56288,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq QuickCheck ];
-       homepage = "https://github.com/daig/data-constructors#readme";
        description = "Generically compare data by their constructors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58536,7 +56357,6 @@ self: {
          data-default-instances-unordered-containers
          data-default-instances-vector
        ];
-       homepage = "https://github.com/trskop/data-default-extra";
        description = "A class for types with a default value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58582,7 +56402,6 @@ self: {
        revision = "1";
        editedCabalFile = "0gpdba4y17rp0kp9pd2qj6r4pnrc86vx47fkk3zfkggmv73pa82r";
        libraryHaskellDepends = [ base bytestring data-default-class ];
-       homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58596,7 +56415,6 @@ self: {
        revision = "1";
        editedCabalFile = "0w8k7zjxwbj1y2acxadg956pfpf7y70jc23wgjivqvafbv69ra25";
        libraryHaskellDepends = [ case-insensitive data-default-class ];
-       homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instance for CI type from case-insensitive package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58630,7 +56448,6 @@ self: {
        version = "0.0.2";
        sha256 = "0hzi7szmjf2df3v4aaid6pk6i4ma25k78v5mcxkhd6w52ifg67c3";
        libraryHaskellDepends = [ base data-default-class ];
-       homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for types in newer versions of base package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58655,7 +56472,6 @@ self: {
        revision = "1";
        editedCabalFile = "01125vbzwq35rkppm96x8fnwjyfid7x6ay6wq8n0qhr0skhcp2js";
        libraryHaskellDepends = [ base data-default-class text ];
-       homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for (lazy and strict) Text and Text Builder";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58671,7 +56487,6 @@ self: {
        libraryHaskellDepends = [
          data-default-class unordered-containers
        ];
-       homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for unordered-containers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58685,7 +56500,6 @@ self: {
        revision = "1";
        editedCabalFile = "0piq9b9ywzyk12glndy9w6dka6d5zrc1mywq5j032li3j6sbwy4a";
        libraryHaskellDepends = [ data-default-class vector ];
-       homepage = "https://github.com/trskop/data-default-extra";
        description = "Default instances for types defined in vector package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58707,7 +56521,6 @@ self: {
          array base binary bytestring QuickCheck spool syb test-framework
          test-framework-quickcheck2 vector
        ];
-       homepage = "http://monoid.at/code";
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58726,25 +56539,23 @@ self: {
        ];
        testHaskellDepends = [ base hspec tagged ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/louispan/data-diverse#readme";
        description = "Extensible records and polymorphic variants";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse_4_0_0_0" = callPackage
+  "data-diverse_4_1_0_0" = callPackage
     ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim
      , hspec, tagged
      }:
      mkDerivation {
        pname = "data-diverse";
-       version = "4.0.0.0";
-       sha256 = "0kxhfxqb97hcp2pynsmpa9a5akg49x754ivqlm7dr0jy5kay0fa3";
+       version = "4.1.0.0";
+       sha256 = "154a7jipfk1wav7pjzghcs54saaphdpxgfgn7jhkvacd51phs0if";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim tagged
        ];
        testHaskellDepends = [ base hspec tagged ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/louispan/data-diverse#readme";
        description = "Extensible records and polymorphic variants";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58764,26 +56575,22 @@ self: {
        testHaskellDepends = [
          base data-diverse generic-lens hspec lens tagged
        ];
-       homepage = "https://github.com/louispan/data-diverse-lens#readme";
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse-lens_4_0_0_0" = callPackage
-    ({ mkDerivation, base, data-diverse, data-has, generic-lens, hspec
-     , lens, profunctors, tagged
+  "data-diverse-lens_4_1_0_0" = callPackage
+    ({ mkDerivation, base, data-diverse, data-has, hspec, lens
+     , profunctors, tagged
      }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "4.0.0.0";
-       sha256 = "06k8s7dfql4gdwws6nsajhj2g7fl1bs3nvgv76x6kxqwr42l675a";
+       version = "4.1.0.0";
+       sha256 = "1kzmxlrnvz0xl4fvdgi9qm0vdkwh8129x5af9cjcji5rhmshh5bh";
        libraryHaskellDepends = [
-         base data-diverse data-has generic-lens lens profunctors tagged
+         base data-diverse data-has lens profunctors tagged
        ];
-       testHaskellDepends = [
-         base data-diverse generic-lens hspec lens tagged
-       ];
-       homepage = "https://github.com/louispan/data-diverse-lens#readme";
+       testHaskellDepends = [ base data-diverse hspec lens tagged ];
        description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58801,7 +56608,6 @@ self: {
          base data-bword ghc-prim hashable template-haskell
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       homepage = "https://github.com/mvv/data-dword";
        description = "Stick two binary words together to get a bigger one";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58820,7 +56626,6 @@ self: {
          base containers directory errors haskell-src-exts hlint hspec HUnit
          QuickCheck safe text transformers unix
        ];
-       homepage = "https://github.com/jcristovao/data-easy";
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58835,7 +56640,6 @@ self: {
        libraryHaskellDepends = [
          base data-flags data-serializer data-sword
        ];
-       homepage = "https://github.com/mvv/data-elf";
        description = "Executable and Linkable Format (ELF) data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58858,7 +56662,6 @@ self: {
          base bytestring cereal containers directory executable-path
          hashable utf8-string
        ];
-       homepage = "https://github.com/valderman/data-embed";
        description = "Embed files and other binary blobs inside executables without Template Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58883,7 +56686,6 @@ self: {
        version = "0.1.1";
        sha256 = "1h1abz87nha7cpw50yvf8fwvcca350wnnz2d3z9k30sg6wq4y7cc";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mvv/data-endian";
        description = "Endian-sensitive data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58898,7 +56700,6 @@ self: {
        editedCabalFile = "1cxn0mfhnvw40jmd682rj2b9p748pwvql4743yw0dbwxy7rg06vd";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "http://github.com/ylilarry/data-extend-generic";
        description = "Extend Haskell data or newtype like in OOP languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58926,7 +56727,6 @@ self: {
        libraryHaskellDepends = [
          base bifunctors ghc-prim semigroups split template-haskell
        ];
-       homepage = "https://github.com/maxpow4h/data-filepath";
        description = "A type safe file path data structure";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58947,7 +56747,6 @@ self: {
        ];
        executableHaskellDepends = [ base containers data-default ];
        testHaskellDepends = [ base containers data-default hspec ];
-       homepage = "https://github.com/JPMoresmau/data-files-gen#readme";
        description = "Generate data-files Cabal file field from existing files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -58959,7 +56758,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1yz22b42rqsf4i9p4lnl06l8id3f1a84dng96q2nk1mmih9v3pbm";
        libraryHaskellDepends = [ base data-default ];
-       homepage = "https://github.com/LadyBoonami/data-filter";
        description = "Utilities for filtering";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -58976,7 +56774,6 @@ self: {
          base lazysmallcheck prelude-safeenum QuickCheck reflection
          smallcheck tagged
        ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Finite totally ordered sets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -58990,7 +56787,6 @@ self: {
        sha256 = "17qj3b3lkrakdk3vbs9nqc2pvqr81n43qxphcznfbkv91k1ygrp6";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/seagull-kamome/data-fin-simple";
        description = "Simple integral finite set";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59003,7 +56799,6 @@ self: {
        version = "0.2.0";
        sha256 = "14hk6hq5hdb3l5bhmzhw086jpzlvp9qbw9dzw30wlz5jbh2ihmvy";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/anton-k/data-fix";
        description = "Fixpoint data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59015,7 +56810,6 @@ self: {
        version = "0.0.2";
        sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2";
        libraryHaskellDepends = [ base containers data-fix transformers ];
-       homepage = "https://github.com/anton-k/data-fix-cse";
        description = "Common subexpression elimination for the fixploint types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59027,7 +56821,6 @@ self: {
        version = "0.0.3.4";
        sha256 = "183h2dzqrp9wl4sg59sijlhqw5pgi10xgw7cx8vz1s86rkia3hj8";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/mvv/data-flags";
        description = "A package for working with bit masks and flags in general";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59051,7 +56844,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "1415cf59wkf1599qcqmrpn9m4v9br3d763v1809mwg9bm2310x65";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/erisco/data-foldapp";
        description = "Fold function applications. Framework for variadic functions.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59064,7 +56856,6 @@ self: {
        sha256 = "11iisc82cgma5pp6apnjg112dd4cvqxclwf09zh9rh50lzkml9dk";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/chris-martin/data-forest";
        description = "A simple multi-way tree data structure";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -59087,7 +56878,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0gnnd23cwhg8l46a4y3brb059mhh9a05l8qbwpf6avl5cj5jkgwd";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/erisco/data-function-meld";
        description = "Map the arguments and return value of functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59099,7 +56889,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0fxmacmcnzvzspscliqbx31rmvif7ymc1knjijmx9pb92yaibcla";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/erisco/data-function-tacit";
        description = "Write functions in tacit (pointless) style using Applicative and De Bruijn index notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59112,7 +56901,6 @@ self: {
        sha256 = "0ybkm9zvl0l60f44p80fislbdmwwhavqz31wymnikjsyc01x899w";
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion transformers ];
-       homepage = "https://github.com/winterland1989/data-has";
        description = "Simple extensible product";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59141,7 +56929,6 @@ self: {
        sha256 = "0rfb688h0q6prsiyf1rfax1xv20m2r69m2389qar1z85izk2hfjf";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/Toucandy/data-index#readme";
        description = "Extending the concept of indices for lists and other containers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59175,7 +56962,6 @@ self: {
        version = "0.1.4";
        sha256 = "0m5xww8zvsa0whxl89wndpbdz9p5n03q3h3a904nqrxh966psfkb";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/luqui/data-inttrie";
        description = "A simple lazy, infinite trie from integers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59203,7 +56989,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/haskell-works/data-json-token#readme";
        description = "Json Token datatype";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59219,7 +57004,6 @@ self: {
        libraryHaskellDepends = [
          base containers data-fix IfElse mtl transformers
        ];
-       homepage = "https://github.com/kwf/data-kiln";
        description = "Sculpt mutable recursive data with reference equality; bake it using a data kiln into an immutable lazy structure";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59232,7 +57016,6 @@ self: {
        version = "1.0.4";
        sha256 = "0vck7a3vgdqml2pg3ilkw41d52pmx452sgh2h2q4qzysq26vw49w";
        libraryHaskellDepends = [ base convert data-construction lens ];
-       homepage = "https://github.com/wdanilo/layer";
        description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59245,7 +57028,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1w8r4vw731dmam8vcidz9a4wb2swqd5djsf9vkkxihxnphh0a1x5";
        libraryHaskellDepends = [ base bytestring vector ];
-       homepage = "http://github.com/jystic/data-layout";
        description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59261,7 +57043,6 @@ self: {
        libraryHaskellDepends = [
          base comonad containers semigroupoids transformers
        ];
-       homepage = "http://github.com/roconnor/data-lens/";
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59275,7 +57056,6 @@ self: {
        libraryHaskellDepends = [
          base comonad data-lens mtl transformers
        ];
-       homepage = "http://github.com/roconnor/data-lens-fd/";
        description = "Lenses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59288,7 +57068,6 @@ self: {
        sha256 = "0frzjfcp7w1ayfai1m07n0fpj3z1vbi971bc1kn1iarxhakny651";
        libraryHaskellDepends = [ base data-lens ixset ];
        testHaskellDepends = [ QuickCheck ];
-       homepage = "https://github.com/dag/data-lens-ixset";
        description = "A Lens for IxSet";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59301,7 +57080,6 @@ self: {
        version = "0.1.2.2";
        sha256 = "0vmkvhl7zcsaxnx7d7b59cnrdnlnr9cfn910rpn34jny7fkydlvj";
        libraryHaskellDepends = [ base mtl template-haskell ];
-       homepage = "https://github.com/feuerbach/data-lens-light";
        description = "Simple lenses, minimum dependencies";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -59313,7 +57091,6 @@ self: {
        version = "2.2";
        sha256 = "1w1a32298naha7sv8d0v018l8z1bmwpwnb3jg09a3n65ci9hy2zm";
        libraryHaskellDepends = [ base data-lens template-haskell ];
-       homepage = "http://github.com/roconnor/data-lens-template/";
        description = "Utilities for Data.Lens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59326,7 +57103,6 @@ self: {
        version = "0.1";
        sha256 = "0r3y66lxgk0sdg500xnz0fvg4dvzvx47imnw0qkici22b9d92kv8";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jkramer/data-list-sequences";
        description = "Utilities for working with sequences within lists";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -59338,7 +57114,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/erisco/data-list-zigzag";
        description = "A list but with a balanced enumeration of Cartesian product";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59350,7 +57125,6 @@ self: {
        version = "0.0.1.2";
        sha256 = "04h4k2zn6w8rahzyr80hwf8mvsmzgbqh7aw2138sva874bsk9mkf";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://github.com/jhickner/data-map-multikey";
        description = "Data.Map with multiple, unique keys";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59363,7 +57137,6 @@ self: {
        version = "0.5.1";
        sha256 = "1mvfc1xri3kgkx5q7za01bqg1x3bfvbgcffw5vwl6jmq4hh1sd5l";
        libraryHaskellDepends = [ array base data-inttrie ];
-       homepage = "http://github.com/luqui/data-memocombinators";
        description = "Combinators for building memo tables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59390,7 +57163,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq QuickCheck
        ];
-       homepage = "http://msgpack.org/";
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59407,7 +57179,6 @@ self: {
          base bytestring containers deepseq hashable QuickCheck text
          unordered-containers vector void
        ];
-       homepage = "http://msgpack.org/";
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59419,7 +57190,6 @@ self: {
        version = "0.6.1";
        sha256 = "14xhjp13hq2d9raybw50v85pax54xb1niczd6f32gvn8cdd28pji";
        libraryHaskellDepends = [ attoparsec base binary containers text ];
-       homepage = "https://github.com/kawu/data-named";
        description = "Data types for named entities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59431,7 +57201,6 @@ self: {
        version = "0.1.2";
        sha256 = "1yzxkch0xzy76iyad0yshfnpvz38xklqdlyj8lgqnqsllw0vwh0m";
        libraryHaskellDepends = [ base semigroups ];
-       homepage = "http://github.com/glehel/data-nat";
        description = "data Nat = Zero | Succ Nat";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59444,7 +57213,6 @@ self: {
        version = "0.3.1.9";
        sha256 = "0z8m23kw8mj6hhy1r8y1vvlxxpwl273dhanszig2673a1sw0l98l";
        libraryHaskellDepends = [ base bytestring failure text time ];
-       homepage = "http://github.com/snoyberg/data-object/tree/master";
        description = "Represent hierachichal structures, called objects in JSON. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59462,7 +57230,6 @@ self: {
          base bytestring bytestring-trie convertible-text data-object
          failure JSONb text
        ];
-       homepage = "http://github.com/snoyberg/data-object-json/tree/master";
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59482,7 +57249,6 @@ self: {
          base bytestring conduit containers convertible-text data-object
          failure text transformers yaml
        ];
-       homepage = "http://github.com/snoyberg/data-object-yaml";
        description = "Serialize data to and from Yaml files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59495,7 +57261,6 @@ self: {
        version = "1.0.0.5";
        sha256 = "0wp6qqq6k1zbdw9bv9gkzdiz6y8wp8r7zsqbjh54c43j3i7vdvwx";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "A data type for non-exclusive disjunction";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59518,7 +57283,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "05i8fg9q7fpc9jalhwbqpw6pfki2flqj4nqwgs3yfi0hvasvgjjb";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/luqui/data-partition";
        description = "A pure disjoint set (union find) data structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59562,7 +57326,6 @@ self: {
          base binary containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/sebastian-philipp/r-tree";
        description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -59574,7 +57337,6 @@ self: {
        version = "0.0.1.1";
        sha256 = "0s7jckxgfd61ngzfqqd36jl1qswj1y3zgsyhj6bij6bl7klbxnm4";
        libraryHaskellDepends = [ base stm transformers ];
-       homepage = "http://wiki.haskell.org/Mutable_variable";
        description = "Unify STRef and IORef in plain Haskell 98";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59590,7 +57352,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://ku-fpg.github.io/software/data-reify/";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59613,7 +57374,6 @@ self: {
        version = "1.0";
        sha256 = "14k4agv5z8vlvb21vmfz9x1dcz6cgph6ix6qrac9mfyylywdffa9";
        libraryHaskellDepends = [ base generic-deriving lens ];
-       homepage = "https://github.com/wdanilo/data-repr";
        description = "Alternative to Show data printing utility";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59626,7 +57386,6 @@ self: {
        version = "1.0";
        sha256 = "0186py0zj9k987vxbsaxbckc7ik64rx87kq3mzkjzvam9qcc0rmj";
        libraryHaskellDepends = [ base poly-control prologue ];
-       homepage = "https://github.com/wdanilo/data-result";
        description = "Data types for returning results distinguishable by types";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59639,7 +57398,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "13bqp3vvsc6i6lcvw480i08fz2rm3f8varwyhvrp44dzv2q8zkl1";
        libraryHaskellDepends = [ base bytestring containers text vector ];
-       homepage = "https://github.com/jxv/data-rev";
        description = "A typeclass for reversing order of contents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59664,7 +57422,6 @@ self: {
        version = "1.0";
        sha256 = "01gv16yz5y3wyc370a2snihz95wdnl7sk1jz9k7aypixsaw28a2f";
        libraryHaskellDepends = [ base lens typelevel ];
-       homepage = "https://github.com/wdanilo/rtuple";
        description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59684,7 +57441,6 @@ self: {
        testHaskellDepends = [
          base binary bytestring cereal tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/mvv/data-serializer";
        description = "Common API for serialization libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59709,7 +57465,6 @@ self: {
        version = "20090215.0";
        sha256 = "0h6z4yibjbnzck2fvh9mnppz9j0lzgx8nzmzm08q5yzmzjydy3rk";
        libraryHaskellDepends = [ base vector-space ];
-       homepage = "http://code.haskell.org/data-spacepart";
        description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59737,7 +57492,6 @@ self: {
          ansi-wl-pprint attoparsec base containers hxt hxt-xpath
          pretty-simple text time
        ];
-       homepage = "https://github.com/sorki/data-stm32#readme";
        description = "ARM SVD and CubeMX XML parser and pretty printer for STM32 family";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59764,7 +57518,6 @@ self: {
          random safecopy tables tagged transformers unordered-containers
          vector
        ];
-       homepage = "https://github.com/Palmik/data-store";
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59805,7 +57558,6 @@ self: {
          language-c mtl random safe utility-ht
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://github.com/alistra/data-structure-inferrer";
        description = "Program that infers the fastest data structure available for your program";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -59823,7 +57575,6 @@ self: {
          base data-bword hashable template-haskell
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       homepage = "https://github.com/mvv/data-sword";
        description = "Shorter binary words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59835,7 +57586,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0j6jsgj3lhx6ps3xs90vbgyvzmlr3sfl33r6rz34rvb29gs171n8";
        libraryHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/tdammers/data-tensor";
        description = "Tensor and Group typeclasses";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -59856,7 +57606,6 @@ self: {
          base parsers QuickCheck test-framework test-framework-quickcheck2
          text-printer type-hint
        ];
-       homepage = "https://github.com/mvv/data-textual";
        description = "Human-friendly textual representations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59872,7 +57621,6 @@ self: {
        libraryHaskellDepends = [
          base data-textual parsers tagged text-printer transformers-base
        ];
-       homepage = "https://github.com/mvv/data-timeout";
        description = "64-bit timeouts of nanosecond precision";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59895,7 +57643,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1zh1akyf8vvsqq39vrbn95v5md5in9fvzmz2jz79adh3w5wc5j6f";
        libraryHaskellDepends = [ base pretty syb ];
-       homepage = "https://github.com/lspitzner/data-tree-print";
        description = "Print Data instances as a nested tree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59907,7 +57654,6 @@ self: {
        version = "0.3.4";
        sha256 = "03xchr2h0f54rlcq285xaq5bakjq13mbjwz3xi3kfa6i71rr2rk9";
        libraryHaskellDepends = [ base containers ty ];
-       homepage = "http://ittc.ku.edu/~andygill/data-reify.php";
        description = "Reify a recursive data structure into an explicit graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59931,7 +57677,6 @@ self: {
        version = "0.5";
        sha256 = "0zhpr40sf1vqa4k7f4j5crjkd701xls86whxrhdq8v8h08ssxvxj";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/cutsea110/data-util";
        description = "utilities for handle data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59943,7 +57688,6 @@ self: {
        version = "0.28.0.5";
        sha256 = "11ia37q28xz8a87xkc8yyvqqd3qzfvcbdnp2caxdbzvdnjbazhmk";
        libraryHaskellDepends = [ base safe ];
-       homepage = "https://bitbucket.org/tdammers/data-variant";
        description = "A variant data type, useful for modeling dynamically-typed programming languages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59961,7 +57705,6 @@ self: {
          base bytestring cmdargs containers directory either filepath lens
          postgresql-simple text time transformers
        ];
-       homepage = "https://github.com/markhibberd/database-migrate";
        description = "Database versioning and migration (experimental)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -59973,7 +57716,6 @@ self: {
        version = "0.0.1";
        sha256 = "1aqp7a46p758f1q99cn700mgc1dic896gpsih3vj2fmffqj42gd7";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://dbs.informatik.uni-halle.de/Lehre/LP09/";
        description = "Demonstrate how a database can be implemented the functional way";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60001,7 +57743,6 @@ self: {
          lifted-base monad-control network old-locale random text time
          transformers-base unordered-containers vector
        ];
-       homepage = "https://github.com/iand675/datadog";
        description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60016,7 +57757,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base containers ];
-       homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60044,7 +57784,6 @@ self: {
          base Cabal cabal-toolkit containers criterion deepseq directory
          filepath ghc ghc-paths lattices primitive text transformers turtle
        ];
-       homepage = "https://github.com/sgraf812/datafix";
        description = "Fixing data-flow problems";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60069,7 +57808,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers hspec HUnit parsec vector
        ];
-       homepage = "https://github.com/sonyxperiadev/dataflow";
        description = "Generate Graphviz documents from a Haskell representation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60115,7 +57853,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath hslogger MissingH mtl process unix
        ];
-       homepage = "http://software.complete.org/datapacker";
        description = "Tool to help pack files into the minimum number of CDs/DVDs/etc";
        license = "GPL";
      }) {};
@@ -60137,7 +57874,6 @@ self: {
          aeson base bytestring exceptions microlens network-uri safe
          scientific string-conversions text unordered-containers vector wreq
        ];
-       homepage = "https://github.com/orbital/datarobot-haskell#readme";
        description = "Client for DataRobot API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60155,7 +57891,6 @@ self: {
          aeson attoparsec base bytestring cassava directory file-embed
          filepath hashable microlens stringsearch text time vector wreq
        ];
-       homepage = "https://github.com/diffusionkinetics/open/datasets";
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -60174,7 +57909,6 @@ self: {
        testHaskellDepends = [
          attoparsec base base64-bytestring bytestring HTF text
        ];
-       homepage = "http://github.com/agrafix/dataurl#readme";
        description = "Handle data-urls";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -60198,7 +57932,6 @@ self: {
        sha256 = "086vmgq58n2gcmz93idngh2hq1zfz8d231qazjzv19p08np5j3zm";
        libraryHaskellDepends = [ base dates time ];
        testHaskellDepends = [ base dates hspec QuickCheck time ];
-       homepage = "https://github.com/thoughtbot/date-conversions#readme";
        description = "Date conversions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -60212,7 +57945,6 @@ self: {
        libraryHaskellDepends = [
          base base-unicode-symbols parsec syb time
        ];
-       homepage = "http://redmine.iportnov.ru/projects/dates/";
        description = "Small library for parsing different dates formats";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60231,7 +57963,6 @@ self: {
          base HUnit old-locale old-time QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
-       homepage = "http://github.com/stackbuilders/datetime";
        description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60251,7 +57982,6 @@ self: {
          base HUnit old-locale old-time QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
-       homepage = "http://github.com/stackbuilders/datetime";
        description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60267,7 +57997,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base parsec pretty text time ];
        executableHaskellDepends = [ base filepath parsec pretty text ];
-       homepage = "https://github.com/arnons1/dawdle";
        description = "Generates DDL suggestions based on a CSV file";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60284,7 +58013,6 @@ self: {
        libraryHaskellDepends = [
          base binary containers mtl transformers vector vector-binary
        ];
-       homepage = "https://github.com/kawu/dawg";
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60305,7 +58033,6 @@ self: {
          base containers HUnit mtl smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "https://github.com/kawu/dawg-ord";
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -60332,7 +58059,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring monad-loops rwlock
        ];
-       homepage = "http://code.haskell.org/~mokus/dbf";
        description = "Read and write XBase \".dbf\" files";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -60353,7 +58079,6 @@ self: {
        executableHaskellDepends = [
          base binary bytestring haskell98 process uulib
        ];
-       homepage = "http://devel.comunidadhaskell.org/dbjava/";
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60373,7 +58098,6 @@ self: {
          base direct-sqlite directory ini optparse-applicative sqlite-simple
          text time
        ];
-       homepage = "https://github.com/relrod/dbm";
        description = "A *simple* database migration tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60483,7 +58207,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        doCheck = false;
-       homepage = "https://github.com/rblaze/haskell-dbus#readme";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -60512,7 +58235,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base criterion ];
        doCheck = false;
-       homepage = "https://github.com/rblaze/haskell-dbus#readme";
        description = "A client library for the D-Bus IPC system";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60529,7 +58251,6 @@ self: {
        libraryHaskellDepends = [
          base containers dbus-core monads-tf text transformers
        ];
-       homepage = "http://john-millikin.com/software/haskell-dbus/";
        description = "Monadic and object-oriented interfaces to DBus";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60548,7 +58269,6 @@ self: {
          base binary bytestring containers data-binary-ieee754 libxml-sax
          network parsec text unix vector xml-types
        ];
-       homepage = "https://john-millikin.com/software/dbus-core/";
        description = "Low-level D-Bus protocol implementation";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60566,7 +58286,6 @@ self: {
        executableHaskellDepends = [
          base dbus hslogger optparse-applicative
        ];
-       homepage = "https://github.com/IvanMalison/dbus-hslogger#readme";
        description = "Expose a dbus server to control hslogger";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60674,7 +58393,6 @@ self: {
        ];
        executableHaskellDepends = [ base filepath optparse-applicative ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/anatolat/dcpu16#readme";
        description = "DCPU-16 Emulator & Assembler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60703,7 +58421,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq parsec transformers wl-pprint
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler common utilities";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60724,7 +58441,6 @@ self: {
          ddc-core-salt ddc-core-simpl ddc-core-tetra ddc-source-tetra
          deepseq directory filepath mtl process text time
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60738,7 +58454,6 @@ self: {
        sha256 = "19ah5j1l84g06szyaf0qni89cqdnpygrlczppzx3qjl280q1qpzd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler base libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60756,7 +58471,6 @@ self: {
          array base containers deepseq directory filepath inchworm mtl
          parsec text transformers wl-pprint
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60771,7 +58485,6 @@ self: {
        libraryHaskellDepends = [
          base containers ddc-core ddc-core-tetra
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler PHP code generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60788,7 +58501,6 @@ self: {
        libraryHaskellDepends = [
          array base containers ddc-base ddc-core deepseq mtl transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60807,7 +58519,6 @@ self: {
          array base containers ddc-core ddc-core-salt ddc-core-simpl
          ddc-core-tetra deepseq limp limp-cbc mtl transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60825,7 +58536,6 @@ self: {
          array base bytestring containers ddc-core ddc-core-salt
          ddc-core-simpl mtl text transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60842,7 +58552,6 @@ self: {
        libraryHaskellDepends = [
          array base containers ddc-core deepseq mtl text transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60859,7 +58568,6 @@ self: {
        libraryHaskellDepends = [
          array base containers ddc-core deepseq mtl transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60877,7 +58585,6 @@ self: {
          array base containers ddc-core ddc-core-salt ddc-core-simpl deepseq
          mtl pretty-show text transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60898,7 +58605,6 @@ self: {
          ddc-core-salt ddc-core-simpl ddc-core-tetra ddc-source-tetra
          deepseq directory filepath mtl process time transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60911,7 +58617,6 @@ self: {
        version = "0.4.1.3";
        sha256 = "0pbsnxzlbx9xblqf9199wrl80aard59l3193gm8gzxx7ispfhs3f";
        libraryHaskellDepends = [ base containers ddc-base directory ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler user interface support";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60929,7 +58634,6 @@ self: {
          array base containers ddc-core ddc-core-salt ddc-core-tetra deepseq
          mtl pretty-show text transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60953,7 +58657,6 @@ self: {
          ddc-driver ddc-source-tetra directory filepath haskeline mtl
          process transformers
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler command line tools";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60972,7 +58675,6 @@ self: {
        executableHaskellDepends = [
          base buildbox containers directory filepath process random stm
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler test driver and buildbot";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60992,7 +58694,6 @@ self: {
          base containers ddc-base ddc-core ddc-core-eval ddc-core-simpl
          haskeline haskell-src-exts
        ];
-       homepage = "http://disciple.ouroborus.net";
        description = "Disciple Core language interactive interpreter";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61020,7 +58721,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion free-vector-spaces lens linear vector
        ];
-       homepage = "https://github.com/masterdezign/dde#readme";
        description = "Delay differential equations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61047,7 +58747,6 @@ self: {
          gitrev Glob graph-wrapper hspec interpolate mockery silently
          string-conversions uniplate
        ];
-       homepage = "https://github.com/soenkehahn/dead-code-detection#readme";
        description = "detect dead code in haskell projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61064,7 +58763,6 @@ self: {
        libraryHaskellDepends = [
          base containers parsec template-haskell transformers vector
        ];
-       homepage = "http://hub.darcs.net/scravy/dead-simple-json";
        description = "Dead simple JSON parser, with some Template Haskell sugar";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61094,7 +58792,6 @@ self: {
          base directory filepath HaXml pretty process unix
        ];
        testHaskellDepends = [ base HUnit parsec pretty regex-tdfa text ];
-       homepage = "https://github.com/ddssff/debian-haskell";
        description = "Modules for working with the Debian package system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61126,7 +58823,6 @@ self: {
          base directory filepath process split transformers
        ];
        executableHaskellDepends = [ base filepath transformers ];
-       homepage = "http://twitter.com/khibino/";
        description = "Debian package build sequence tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61155,7 +58851,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers directory extra filepath text
        ];
-       homepage = "https://github.com/ndmitchell/debug";
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61195,7 +58890,6 @@ self: {
          unbounded-delays unix unordered-containers utf8-string uuid wai
          wai-websockets warp websockets
        ];
-       homepage = "https://debug-me.branchable.com/";
        description = "secure remote debugging";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61213,7 +58907,6 @@ self: {
        executableHaskellDepends = [
          aeson base debug-hoed directory filepath yaml
        ];
-       homepage = "https://github.com/pepeiborra/debug-hoed-pp#readme";
        description = "A preprocessor for the debug package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61228,7 +58921,6 @@ self: {
        sha256 = "16adr8dg2rsjzx6rwrfai75lhcfad68fqmz1iqmr0ah18a7afxk0";
        libraryHaskellDepends = [ base clock containers ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/LukaHorvat/debug-time#readme";
        description = "Debug.Trace equivalent for timing computations";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -61252,7 +58944,6 @@ self: {
        sha256 = "0r6mqsb3x6pa2g4s24fyg67gx2ld3c2a539j96skg1lk7wxaxj54";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/pinktrink/deburr";
        description = "Convert Unicode characters with burrs to their ASCII counterparts";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -61279,7 +58970,6 @@ self: {
        sha256 = "0l740xpnqs5m67hwp3p6l5mzyhs9si39mp5z2x57mnrhvjdydq1j";
        libraryHaskellDepends = [ base binary binary-bits deepseq mtl ];
        testHaskellDepends = [ base binary doctest hspec QuickCheck ];
-       homepage = "https://github.com/verement/decimal-arithmetic#readme";
        description = "An implementation of the General Decimal Arithmetic Specification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61295,7 +58985,6 @@ self: {
        editedCabalFile = "14qc6k8bjsixk5bzqwir1lbs1kqnl0a1py7779a63civv2ph5g5v";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/leftaroundabout/decimal-literals";
        description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -61315,7 +59004,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base mwc-probability ];
-       homepage = "http://github.com/jtobin/declarative";
        description = "DIY Markov Chains";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -61343,7 +59031,6 @@ self: {
        version = "0.0.1.1";
        sha256 = "0z5krcl4xd385f7v2bsnfyr7zidqwfjvc6b432gbbn2vcrx966c7";
        libraryHaskellDepends = [ base binary bytestring conduit ];
-       homepage = "https://github.com/hansonkd/decoder-conduit";
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61367,7 +59054,6 @@ self: {
          haskell-src-exts-qq hmk mtl parsec process Stream stringtable-atom
          wl-pprint
        ];
-       homepage = "http://www.lix.polytechnique.fr/dedukti";
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61385,7 +59071,6 @@ self: {
        testHaskellDepends = [
          base containers doctest HUnit mtl QuickCheck safe transformers
        ];
-       homepage = "https://github.com/ocean0yohsuke/deepcontrol";
        description = "A library that provides deep-level programming style and(or) notation on Applicative and Monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61413,7 +59098,6 @@ self: {
          accelerate base mtl QuickCheck repa repa-algorithms test-framework
          test-framework-quickcheck2 vector
        ];
-       homepage = "https://github.com/ajtulloch/deeplearning-hs";
        description = "Deep Learning in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61469,7 +59153,6 @@ self: {
          base cpphs deepseq deepseq-generics generics-sop ghc-prim HUnit
          parallel random syb template-haskell
        ];
-       homepage = "http://fremissant.net/deepseq-bounded";
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61489,7 +59172,6 @@ self: {
        testHaskellDepends = [
          base deepseq ghc-prim HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/hvr/deepseq-generics";
        description = "GHC.Generics-based Control.DeepSeq.rnf implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61501,7 +59183,6 @@ self: {
        version = "1.0.0.3";
        sha256 = "15nisjmhcfippz153b8l8f291halkgbrync5c2v6xwkh07ibn7yp";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/ezyang/deepseq-magic";
        description = "Deep evaluation of data structures without NFData";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -61538,20 +59219,18 @@ self: {
        version = "0.3";
        sha256 = "1rz37w83awji034spyv4cnfbqb6r98r1bbvzh2i979qh5c5s6ckg";
        libraryHaskellDepends = [ base cluss ];
-       homepage = "https://github.com/Kinokkory/defargs";
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deferred-folds" = callPackage
-    ({ mkDerivation, base, foldl }:
+    ({ mkDerivation, base, containers, foldl }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.4.0.1";
-       sha256 = "1n2wr03bqpp2yfm1jl54b3xrq4q2dwdj0ijssk8hbk3mzr4pac00";
-       libraryHaskellDepends = [ base foldl ];
-       homepage = "https://github.com/metrix-ai/deferred-folds";
+       version = "0.4.1";
+       sha256 = "0r74biiq9mwf15ky4pb8pan1gjyfc38fsl9ndn9iirsx288fhins";
+       libraryHaskellDepends = [ base containers foldl ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -61568,7 +59247,6 @@ self: {
          array base bytestring containers deepseq ghc-prim GLURaw OpenGL
          OpenGLRaw primitive vector
        ];
-       homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "The base modules of the Definitive framework";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61590,7 +59268,6 @@ self: {
          definitive-reactive directory filepath old-locale primitive time
          unix vector
        ];
-       homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A library that enable you to interact with the filesystem in a definitive way";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61614,7 +59291,6 @@ self: {
          JuicyPixels mtl primitive stb-truetype transformers utf8-string
          vector zlib
        ];
-       homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A definitive package allowing you to open windows, read image files and render text to be displayed or saved";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61633,7 +59309,6 @@ self: {
          array base bytestring containers cpu deepseq definitive-base
          ghc-prim GLURaw OpenGL OpenGLRaw primitive utf8-string vector
        ];
-       homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A parser combinator library for the Definitive framework";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61653,7 +59328,6 @@ self: {
          array base bytestring clock containers deepseq definitive-base
          primitive vector
        ];
-       homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A simple Reactive library";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61674,7 +59348,6 @@ self: {
          alsa-core alsa-pcm array base bytestring clock containers deepseq
          definitive-base primitive sample-frame storable-record vector
        ];
-       homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A definitive package to handle sound and play it back";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61691,7 +59364,6 @@ self: {
        libraryHaskellDepends = [
          array base containers exceptions mtl parsec text transformers
        ];
-       homepage = "https://github.com/YoEight/deiko-config";
        description = "Small and typesafe configuration library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61708,7 +59380,6 @@ self: {
          base concurrency containers deepseq exceptions leancheck
          profunctors random ref-fd transformers
        ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -61725,7 +59396,6 @@ self: {
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
        ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "A library for unit-testing concurrent programs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61739,7 +59409,6 @@ self: {
        sha256 = "1l23b5v0wjg72vlnyxa87v3j2dxbld536ws8j03ddcwgqgws1fj4";
        libraryHaskellDepends = [ base bytestring parsec transformers ];
        librarySystemDepends = [ mpdec ];
-       homepage = "https://github.com/massysett/deka";
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61761,7 +59430,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base bytestring deka QuickCheck quickpull ];
-       homepage = "https://github.com/massysett/deka";
        description = "Tests for deka, decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61779,7 +59447,6 @@ self: {
          AC-Vector base hashable unordered-containers
        ];
        testHaskellDepends = [ AC-Vector base HUnit QuickCheck ];
-       homepage = "http://github.com/mruegenberg/Delaunay";
        description = "Build a Delaunay triangulation of a set of points";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61810,7 +59477,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring curl feed json nano-md5 xml
        ];
-       homepage = "https://github.com/sof/delicious";
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61827,7 +59493,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base binary bytestring bytestring-show
        ];
-       homepage = "http://space.k-hornz.de/software/delimited-text";
        description = "Parse character delimited textual data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -61840,7 +59505,6 @@ self: {
        sha256 = "17ff9ipsnqicjkwsfg7zfb5gm0k9scsb44dl82gmf8i0f0nnd0h6";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base uhc-util uulib ];
-       homepage = "https://github.com/atzedijkstra/delimiter-separated";
        description = "Library for dealing with tab and/or comma (or other) separated files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61865,7 +59529,6 @@ self: {
          base directory optparse-applicative process sodium
        ];
        testHaskellDepends = [ base directory filepath hspec ];
-       homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61888,7 +59551,6 @@ self: {
        executableHaskellDepends = [
          base binary bytestring containers monad-atom nlp-scores text
        ];
-       homepage = "https://bitbucket.org/gchrupala/delta-h";
        description = "Online entropy-based model of lexical category acquisition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61914,7 +59576,6 @@ self: {
        sha256 = "130yk7461rwmjgzivsya10xzh0d0ca8pfkxh7fpll239r7xlbds3";
        libraryHaskellDepends = [ base free transformers ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/fizruk/demarcate";
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61930,7 +59591,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
-       homepage = "http://protempore.net/denominate/";
        description = "Functions supporting bulk file and directory name normalization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -61986,7 +59646,6 @@ self: {
        version = "0.2.4.0";
        sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx";
        libraryHaskellDepends = [ base containers dependent-sum ];
-       homepage = "https://github.com/mokus0/dependent-map";
        description = "Dependent finite maps (partial dependent products)";
        license = "unknown";
      }) {};
@@ -61998,7 +59657,6 @@ self: {
        version = "1.0.1";
        sha256 = "0rvl1svd0ya8wrmlimkcb7iki33gvpm5h0ix9vac2id38l4a4fh9";
        libraryHaskellDepends = [ base lens mtl prologue ];
-       homepage = "https://github.com/wdanilo/dependent-state";
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62011,7 +59669,6 @@ self: {
        version = "0.4";
        sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mokus0/dependent-sum";
        description = "Dependent sum type";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -62027,7 +59684,6 @@ self: {
          base dependent-sum template-haskell th-extras
        ];
        testHaskellDepends = [ base dependent-sum ];
-       homepage = "/dev/null";
        description = "Template Haskell code to generate instances of classes in dependent-sum package";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -62068,7 +59724,6 @@ self: {
        executableHaskellDepends = [
          base bio bytestring cmdargs directory process regex-compat
        ];
-       homepage = "http://malde.org/~ketil/biohaskell/dephd";
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62081,7 +59736,6 @@ self: {
        version = "0.2.1";
        sha256 = "0r1jabz5jamm79nrbwjnajzzn77fkhqbjfnmkahg293761z1k781";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/deque";
        description = "Double-ended queue";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -62142,7 +59796,6 @@ self: {
          pretty process syb template-haskell transformers uniplate
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ndmitchell/derive#readme";
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62155,7 +59808,6 @@ self: {
        version = "0.1.1";
        sha256 = "0bggj2jb3bbgxcz75v8q2yx29v88skiwjaj3fxkkynnv5zvrbgwr";
        libraryHaskellDepends = [ base instant-generics template-haskell ];
-       homepage = "http://github.com/konn/derive-IG";
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62168,7 +59820,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "08zhyn9xcmhrrnh7y2a1r7v4nmgm2af0d41ns0wjqais67rzsxsp";
        libraryHaskellDepends = [ base data-default ];
-       homepage = "https://github.com/mgoszcz2/derive-enumerable";
        description = "Generic instances for enumerating complex data types";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62207,22 +59858,19 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base semigroups ];
-       homepage = "https://github.com/sboosali/derive-monoid#readme";
        description = "derive Semigroup/Monoid/IsList";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "derive-storable" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck }:
+    ({ mkDerivation, base, criterion, deepseq, hspec, QuickCheck }:
      mkDerivation {
        pname = "derive-storable";
-       version = "0.1.1.1";
-       sha256 = "0rb60s5wznlqqq2s8l2wrvbgzalk719x550h321vf1xx6ck6g8g2";
-       revision = "1";
-       editedCabalFile = "1rf8k42k35lq7rq4g506s06cn3fn94m39934gn0mcbznbqhmvd8v";
+       version = "0.1.2.0";
+       sha256 = "1rh2nm4cb34x9rdg9jpz15kidvkvlzja1354v8z5jwpc0pqkp50s";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://www.github.com/mkloczko/derive-storable/";
+       benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Derive Storable instances with GHC.Generics.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -62242,7 +59890,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq derive-storable
        ];
-       homepage = "https://www.github.com/mkloczko/derive-storable-plugin/";
        description = "GHC core plugin supporting the derive-storable package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -62264,7 +59911,6 @@ self: {
          QuickCheck simple-sql-parser syb template-haskell th-expand-syns
          transformers
        ];
-       homepage = "https://github.com/HaskellZhangSong/derive-topdown";
        description = "Help Haskellers derive class instances for composited data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62277,7 +59923,6 @@ self: {
        version = "0.2.1";
        sha256 = "11c378mh5razibd9ljffm5353v4plrgvkfb62p6029f04sf29jnc";
        libraryHaskellDepends = [ array base containers template-haskell ];
-       homepage = "http://github.com/baldo/derive-trie";
        description = "Automatic derivation of Trie implementations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62302,7 +59947,6 @@ self: {
          template-haskell transformers transformers-compat
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/haskell-compat/deriving-compat";
        description = "Backports of GHC deriving extensions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62325,7 +59969,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "0j883w01k9scz6cfxljkw9s2kgs9f7vdxyyxxhlvvkgzb0050v0x";
        libraryHaskellDepends = [ base derp ];
-       homepage = "http://darcsden.com/kyagrd/derp-lib";
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62342,7 +59985,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/tfausak/derulo#readme";
        description = "Parse and render JSON simply";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -62388,7 +60030,6 @@ self: {
          filepath hashtables hspec HUnit megaparsec QuickCheck stm text
          transformers yaml
        ];
-       homepage = "https://bitbucket.org/jakobeha/descript-lang/src/master/README.md";
        description = "Library, interpreter, and CLI for Descript programming language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62409,7 +60050,6 @@ self: {
        testHaskellDepends = [
          aeson base bifunctors containers hspec HUnit mtl text transformers
        ];
-       homepage = "https://github.com/chrisdone/descriptive";
        description = "Self-describing consumers/parsers; forms, cmd-line args, JSON, etc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62430,7 +60070,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/zjhmale/desert";
        description = "a simple build tool for OCaml projects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62454,7 +60093,6 @@ self: {
        sha256 = "1hdwr1vxfng3yc9mdnnsraapikq9kq1c07ik16csgp2ggnhgpprs";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/TGOlson/deterministic-game-engine";
        description = "Simple deterministic game engine";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62506,7 +60144,6 @@ self: {
          aeson base bytestring directory filepath hinotify process split
          text unix unordered-containers
        ];
-       homepage = "https://github.com/luanzhu/devil";
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -62520,7 +60157,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers elf hdis86 syb
        ];
-       homepage = "https://github.com/kmcallister/dewdrop";
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62541,7 +60177,6 @@ self: {
          attoparsec base bytestring QuickCheck tasty tasty-quickcheck text
          time
        ];
-       homepage = "https://github.com/k0001/di";
        description = "Type, render and parse the df1 hierarchical structured log format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62585,7 +60220,6 @@ self: {
        sha256 = "1brffyfawrdgr2659hbda42mpn9jiiq474a0yd57kj7z0dzq25f6";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal QuickCheck ];
-       homepage = "https://github.com/musically-ut/haskell-dgim";
        description = "Implementation of DGIM algorithm";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62598,7 +60232,6 @@ self: {
        version = "0.2";
        sha256 = "100xlxqhy33kllyb4dy7q0bwwy5wn9w45qy1cb5f0yb0dqff1pnx";
        libraryHaskellDepends = [ base HTTP mtl network split ];
-       homepage = "http://www.dmwit.com/dgs";
        description = "Haskell front-end for DGS' bot interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62714,7 +60347,6 @@ self: {
        executableHaskellDepends = [
          base containers dhall directory filepath fsnotify text trifecta
        ];
-       homepage = "https://github.com/anfelor/dhall-check#readme";
        description = "Check all dhall files in a project";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62843,7 +60475,6 @@ self: {
        testHaskellDepends = [
          base bytestring Cabal Diff filepath tasty tasty-golden text
        ];
-       homepage = "https://github.com/ocharles/dhall-to-cabal";
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62863,7 +60494,6 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring chronos ip tasty tasty-hunit
        ];
-       homepage = "https://github.com/andrewthad/dhcp-lease-parser#readme";
        description = "Parse a DHCP lease file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62880,7 +60510,6 @@ self: {
        libraryHaskellDepends = [
          base df1 di-core di-df1 di-handle di-monad exceptions
        ];
-       homepage = "https://github.com/k0001/di";
        description = "Typeful hierarchical structured logging using di, mtl and df1";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62899,7 +60528,6 @@ self: {
          base exceptions QuickCheck stm tasty tasty-hunit tasty-quickcheck
          time
        ];
-       homepage = "https://github.com/k0001/di";
        description = "Typeful hierarchical structured logging without monad towers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62919,7 +60547,6 @@ self: {
          base bytestring df1 di-core QuickCheck tasty tasty-quickcheck text
          time
        ];
-       homepage = "https://github.com/k0001/di";
        description = "Write logs in the df1 format using the di logging framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62934,7 +60561,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring di-core exceptions unix
        ];
-       homepage = "https://github.com/k0001/di";
        description = "IO support for file handles in di-core";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62951,7 +60577,6 @@ self: {
        libraryHaskellDepends = [
          base containers di-core exceptions mtl pipes stm transformers
        ];
-       homepage = "https://github.com/k0001/di";
        description = "mtl flavoured typeful hierarchical structured logging for di-core";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -62999,7 +60624,6 @@ self: {
          diagrams-contrib diagrams-core diagrams-lib diagrams-svg
        ];
        doHaddock = false;
-       homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63040,7 +60664,6 @@ self: {
          filepath hashable JuicyPixels lens mtl optparse-applicative
          Rasterific time
        ];
-       homepage = "https://github.com/mlang/diagrams-braille#readme";
        description = "Braille diagrams with plain text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63070,7 +60693,6 @@ self: {
          diagrams-postscript diagrams-rasterific diagrams-svg directory
          filepath JuicyPixels lens svg-builder
        ];
-       homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63092,7 +60714,6 @@ self: {
          optparse-applicative pango split statestack transformers unix
          vector
        ];
-       homepage = "http://projects.haskell.org/diagrams";
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63112,7 +60733,6 @@ self: {
          diagrams-core diagrams-lib lens mtl NumInstances
          optparse-applicative statestack text
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63140,7 +60760,6 @@ self: {
          base containers diagrams-lib HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63161,7 +60780,6 @@ self: {
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl profunctors semigroups unordered-containers
        ];
-       homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63173,14 +60791,11 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-graphviz";
-       version = "1.4";
-       sha256 = "1lb1r8681c2dypm420102grnkxkwjqzgv30gljnq2dnpm6m42fj8";
-       revision = "1";
-       editedCabalFile = "0x1nsbp8np317qx96civ9bgknqhvjff7afcj24bg8ql56f5sd2cl";
+       version = "1.4.1";
+       sha256 = "05mddk0ii8afhiv4ysig6ngns7s2zg328k7xswz37vvg1f2j2gvy";
        libraryHaskellDepends = [
          base containers diagrams-lib fgl graphviz split
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "Graph layout and drawing with GrahpViz and diagrams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63197,7 +60812,6 @@ self: {
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib gtk
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63229,7 +60843,6 @@ self: {
          base containers haskell-src-exts lens parsec QuickCheck tasty
          tasty-quickcheck
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63247,7 +60860,6 @@ self: {
          base colour containers diagrams-core diagrams-lib hsqml lens text
          transformers
        ];
-       homepage = "https://github.com/marcinmrotek/diagrams-hsqml";
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63267,7 +60879,6 @@ self: {
          diagrams-lib lens mtl NumInstances optparse-applicative split
          statestack static-canvas text
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63287,8 +60898,8 @@ self: {
        pname = "diagrams-lib";
        version = "1.4.2.2";
        sha256 = "1rfn1fk251n84bxfn6p82p62gdjiq4yp4dwqmspp7ha2x6abn2s7";
-       revision = "2";
-       editedCabalFile = "1iwcrwfsga9kxp1h9cf3358dn64fzw3rbzrx1z24nd3ayy937vjk";
+       revision = "3";
+       editedCabalFile = "033w27x3w0s567hsifb7nxc1msv9fvzz8idl88n8d5pifpgxg803";
        libraryHaskellDepends = [
          active adjunctions array base bytestring cereal colour containers
          data-default-class diagrams-core diagrams-solve directory
@@ -63302,7 +60913,6 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion diagrams-core ];
-       homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63345,7 +60955,6 @@ self: {
          base cmdargs colour diagrams-core diagrams-lib filepath HPDF lens
          monoid-extras mtl semigroups split vector-space
        ];
-       homepage = "http://www.alpheccar.org";
        description = "PDF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63368,7 +60977,6 @@ self: {
          diagrams-lib directory filepath hashable JuicyPixels mtl
          optparse-applicative process split texrunner time vector zlib
        ];
-       homepage = "http://github.com/cchalmers/diagrams-pgf";
        description = "PGF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63383,11 +60991,12 @@ self: {
        pname = "diagrams-postscript";
        version = "1.4.1";
        sha256 = "171c53msr2x8da87fghl7jikbmrwy7gdxwhdviixc2y3k4fijn57";
+       revision = "1";
+       editedCabalFile = "0z0rh7lwyr3vx6llq6q9s5f1vzqk4zxpcg5ibfn5jdp274kfd7r1";
        libraryHaskellDepends = [
          base containers data-default-class diagrams-core diagrams-lib dlist
          hashable lens monoid-extras mtl semigroups split statestack
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63403,7 +61012,6 @@ self: {
        libraryHaskellDepends = [
          array base colour diagrams-core diagrams-lib
        ];
-       homepage = "https://github.com/prowdsponsor/diagrams-qrcode";
        description = "Draw QR codes to SVG, PNG, PDF or PS files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63426,7 +61034,6 @@ self: {
          lens mtl optparse-applicative Rasterific
        ];
        testHaskellDepends = [ base diagrams-core diagrams-lib ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "Rasterific backend for diagrams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63445,7 +61052,6 @@ self: {
          base colour containers diagrams-core diagrams-lib lens
          monoid-extras mtl reflex reflex-dom reflex-dom-contrib
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "reflex backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63462,7 +61068,6 @@ self: {
        libraryHaskellDepends = [
          adjunctions base data-default-class diagrams-lib distributive lens
        ];
-       homepage = "https://github.com/timjb/rubiks-cube";
        description = "Library for drawing the Rubik's Cube";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63482,7 +61087,6 @@ self: {
        testHaskellDepends = [
          base deepseq tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://projects.haskell.org/diagrams";
        description = "Pure Haskell solver routines used by diagrams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -63504,7 +61108,6 @@ self: {
          diagrams-lib filepath hashable JuicyPixels lens monoid-extras mtl
          optparse-applicative semigroups split svg-builder text
        ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63519,7 +61122,6 @@ self: {
        libraryHaskellDepends = [
          base diagrams-core diagrams-lib dlist mtl
        ];
-       homepage = "http://projects.haskell.org/diagrams";
        description = "TikZ backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63538,7 +61140,6 @@ self: {
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib wx wxcore
        ];
-       homepage = "https://github.com/spinda/diagrams-wx#readme";
        description = "Backend for rendering diagrams in wxWidgets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63557,7 +61158,6 @@ self: {
          base bytestring filepath glib gtk3 open-browser text transformers
          webkitgtk3
        ];
-       homepage = "https://gitlab.com/lamefun/dialog";
        description = "Simple dialog-based user interfaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63611,7 +61211,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://monoid.at/code";
        description = "Cryptographically secure n-sided dice via rejection sampling";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63640,7 +61239,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring pretty safe time
        ];
-       homepage = "http://github.com/dicomgrid/dicom-haskell-library/";
        description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63698,7 +61296,6 @@ self: {
        libraryHaskellDepends = [ base parsec split ];
        executableHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
-       homepage = "http://github.com/mwotton/dictparser";
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63711,7 +61308,6 @@ self: {
        version = "0.0.1";
        sha256 = "0qkyfmys5k6la10dvi8wsmw120xfarjblpkr33xiazll2m9845wh";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tonymorris/diet";
        description = "Discrete Interval Encoding Tree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -63737,7 +61333,6 @@ self: {
          base Diff KMP QuickCheck string-similarity
        ];
        testHaskellDepends = [ base Diff ];
-       homepage = "http://github.com/chrismwendt/diff-gestalt";
        description = "A diff algorithm based on recursive longest common substrings";
        license = "unknown";
      }) {};
@@ -63766,7 +61361,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://github.com/ocharles/diff3.git";
        description = "Perform a 3-way difference of documents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -63796,7 +61390,6 @@ self: {
          base bytestring Cabal containers Diff directory filepath pretty
          process
        ];
-       homepage = "http://code.haskell.org/~dons/code/diffcabal";
        description = "Diff two .cabal files syntactically";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63837,7 +61430,6 @@ self: {
          adjunctions base comonad containers deepseq distributive doctest
          groups hedgehog hedgehog-checkers QuickCheck semigroupoids
        ];
-       homepage = "https://github.com/oisdk/difference-monoid#readme";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -63863,7 +61455,6 @@ self: {
          base bytestring highlighter2 pretty-show protolude tasty
          tasty-hunit text
        ];
-       homepage = "https://github.com/jml/difftodo#readme";
        description = "Generate todo lists from source code";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -63876,7 +61467,6 @@ self: {
        version = "1.0";
        sha256 = "1156jr67fjpp68r2qnq0py80cmk42cz356aarqsd8al98dnvxxn6";
        libraryHaskellDepends = [ base math-functions ];
-       homepage = "https://github.com/bgamari/digamma";
        description = "A (deprecated) implementation of the digamma function";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -63901,7 +61491,6 @@ self: {
        sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ array base bytestring digest QuickCheck ];
-       homepage = "http://github.com/danieldk/digest-pure";
        description = "Pure hash functions for bytestrings";
        license = "unknown";
      }) {};
@@ -63956,7 +61545,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time
        ];
-       homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "A practical formlet library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -63978,7 +61566,6 @@ self: {
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
-       homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -63994,7 +61581,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html blaze-markup digestive-functors text
        ];
-       homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Blaze frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64010,7 +61596,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring digestive-functors happstack-server text
        ];
-       homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Happstack backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64027,7 +61612,6 @@ self: {
          base blaze-builder digestive-functors heist map-syntax mtl text
          xmlhtml
        ];
-       homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Heist frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64041,7 +61625,6 @@ self: {
        sha256 = "00n1cxkrkd3ayl7pp6pr7nyx6zcwqpsqzflnnnf0f8dabrz4wzdc";
        libraryHaskellDepends = [ base digestive-functors hsp hsx text ];
        libraryToolDepends = [ trhsx ];
-       homepage = "http://src.seereason.com/digestive-functors-hsp";
        description = "HSP support for digestive-functors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64054,7 +61637,6 @@ self: {
        version = "0.0.0.5";
        sha256 = "176vc7gsm0379100imk1i8y8r2gx0l66dijgmxkqbq1qwkjfizs5";
        libraryHaskellDepends = [ base digestive-functors lucid text ];
-       homepage = "https://github.com/athanclark/digestive-functors-lucid";
        description = "Lucid frontend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64073,7 +61655,6 @@ self: {
          base bytestring digestive-functors http-types scotty text wai
          wai-extra
        ];
-       homepage = "https://github.com/mmartin/digestive-functors-scotty";
        description = "Scotty backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64090,7 +61671,6 @@ self: {
          base bytestring containers digestive-functors directory filepath
          mtl snap-core text
        ];
-       homepage = "http://github.com/jaspervdj/digestive-functors";
        description = "Snap backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64112,7 +61692,6 @@ self: {
          ansi-wl-pprint base hedgehog lens papa parsec parsers pretty tasty
          tasty-hedgehog tasty-hspec tasty-hunit text
        ];
-       homepage = "https://github.com/qfpl/digit";
        description = "A data-type representing digits 0-9 and other combinations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64130,7 +61709,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base doctest hspec ];
-       homepage = "https://github.com/KazumaSATO/digitalocean-kzs";
        description = "digitalocean api for haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64161,7 +61739,6 @@ self: {
        executableHaskellDepends = [
          base FontyFruity JuicyPixels Rasterific vector
        ];
-       homepage = "http://sha-bang.de";
        description = "ASCII based Diagram drawing in Haskell (Idea based on ditaa)";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -64182,7 +61759,6 @@ self: {
          base doctest Glob hspec QuickCheck template-haskell
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/bjornbm/dimensional/";
        description = "Statically checked physical dimensions, using Type Families and Data Kinds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64194,7 +61770,6 @@ self: {
        version = "2014.0.0.0";
        sha256 = "1qyalw1y4ijl293s8qx2xp34716yiq4pfafb5czlk5vrwb4ym925";
        libraryHaskellDepends = [ base dimensional numtype-dk ];
-       homepage = "https://github.com/dmcclean/dimensional-codata";
        description = "CODATA Recommended Physical Constants with Dimensional Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64207,7 +61782,6 @@ self: {
        version = "0.3.0.4";
        sha256 = "052daw4kj1ivj3h2lvs39m3xz1xy5ra8fj5pmpfnjmjgg5kfv2w1";
        libraryHaskellDepends = [ base numtype-tf time ];
-       homepage = "http://dimensional.googlecode.com/";
        description = "Statically checked physical dimensions, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64221,7 +61795,6 @@ self: {
        sha256 = "13y87wakhkw7fzfhqjif96y8z57h6pa0c7wirb0rvhfzdknyc1x0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal QuickCheck ];
-       homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Safe type-level dimensionality for multidimensional data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64297,7 +61870,6 @@ self: {
        sha256 = "118r59mwvihzqsjd530x4pdnvqjk87b3jjdhx5avq31cfdbiyaj9";
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
-       homepage = "https://github.com/llllllllll/Math.Diophantine";
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64314,7 +61886,6 @@ self: {
        libraryHaskellDepends = [
          base containers HUnit parsec transformers TypeNat
        ];
-       homepage = "https://github.com/avieth/diplomacy";
        description = "Diplomacy board game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64339,7 +61910,6 @@ self: {
          rest-core rest-wai stm Stream text transformers transformers-compat
          TypeNat wai warp warp-tls
        ];
-       homepage = "https://github.com/avieth/diplomacy-server";
        description = "Play Diplomacy over HTTP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64352,7 +61922,6 @@ self: {
        version = "1.0";
        sha256 = "0ci6av8sgrlsn12dbpvqf3imq9w1hm2ll5np2fz7gh9760vvdidr";
        libraryHaskellDepends = [ base bytestring mtl ];
-       homepage = "http://ireneknapp.com/software/";
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64365,7 +61934,6 @@ self: {
        version = "3.1";
        sha256 = "0698l8zylkgafx8g91icysz6rq2lyrnd25blhday67s9vkdpbvxh";
        libraryHaskellDepends = [ base unix ];
-       homepage = "http://dankna.com/software/";
        description = "Library to switch to daemon mode using built-in OS facilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64381,7 +61949,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers mtl network utf8-string
        ];
-       homepage = "http://dankna.com/software/";
        description = "Native implementation of the FastCGI protocol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64401,7 +61968,6 @@ self: {
          monad-control mtl network old-locale SafeSemaphore time
          transformers-base unix utf8-string
        ];
-       homepage = "http://ireneknapp.com/software/";
        description = "Native webserver that acts as a library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64414,7 +61980,6 @@ self: {
        version = "1.0.1";
        sha256 = "09hv06hslz83gpqfxxv6bfg4i6l7pfv82jxab4lf8g964ciaa42q";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://ireneknapp.com/software/";
        description = "An implementation of the MurmurHash3 algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64426,7 +61991,6 @@ self: {
        version = "1.1";
        sha256 = "03f7jrx0skqiirvpzzakk3wwwdjanjxpzv8j5nwpzvqpb4syshcr";
        libraryHaskellDepends = [ base ghc ghc-paths ];
-       homepage = "http://dankna.com/software/";
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64447,7 +62011,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory filepath safe-exceptions
        ];
-       homepage = "https://github.com/TerrorJack/direct-rocksdb#readme";
        description = "Bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64465,7 +62028,6 @@ self: {
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit temporary text
        ];
-       homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64548,7 +62110,6 @@ self: {
        sha256 = "05z5ws58kky3wcwwwv6q16m9vs0lzj35qqs9v5acy9m2nfal8272";
        libraryHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [ base directory filepath process ];
-       homepage = "http://brandon.si/code/directory-tree-module-released/";
        description = "A simple directory-like tree datatype, with useful IO functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64591,7 +62152,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1yg1mb9w679m1iml0rx2i6gq1ps8s56da4dvn2knvkgg7m1cr39c";
        libraryHaskellDepends = [ array base containers mtl parsec ];
-       homepage = "https://github.com/mgrabmueller/disassembler";
        description = "Disassembler for X86 & AMD64 machine code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64615,7 +62175,6 @@ self: {
          aeson api-builder base bytestring Cabal hspec text time
          transformers
        ];
-       homepage = "http://github.com/accraze/discogs-haskell";
        description = "Client for Discogs REST API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64632,7 +62191,6 @@ self: {
        libraryHaskellDepends = [
          aeson base discord-types hslogger transformers url websockets wuss
        ];
-       homepage = "https://github.com/jano017/Discord.hs";
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64650,7 +62208,6 @@ self: {
          base discord-gateway discord-rest discord-types hashable mtl url
          websockets
        ];
-       homepage = "https://github.com/jano017/Discord.hs";
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64669,7 +62226,6 @@ self: {
          aeson base bytestring comonad data-default discord-types hashable
          hslogger http-client mtl req stm text time url
        ];
-       homepage = "https://github.com/jano017/Discord.hs";
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64687,7 +62243,6 @@ self: {
          aeson base hashable text time transformers unordered-containers
          vector
        ];
-       homepage = "https://github.com/jano017/Discord.hs";
        description = "Type information for discord-hs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64700,7 +62255,6 @@ self: {
        version = "0.1";
        sha256 = "0ykbfisrb6k8vsqx5avv99j0z4j4615hmql263h12jzhjxfzd22d";
        libraryHaskellDepends = [ base time ];
-       homepage = "https://github.com/kallisti-dev/discordian-calendar";
        description = "library for handling Discordian calendar dates";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64714,7 +62268,6 @@ self: {
        sha256 = "1q1lz9dgxp5kq0ngh7pagijmlc616vwrfrb14pjx2vc9s7yvg779";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ markdown ];
-       homepage = "http://github.com/lightquake/discount";
        description = "Haskell bindings to the discount Markdown library";
        license = stdenv.lib.licenses.mit;
      }) {markdown = null;};
@@ -64726,7 +62279,6 @@ self: {
        version = "0.0.3";
        sha256 = "1in70wlm6qcmc743v0w1lha4wffjinbwsgcyq44gzk0lb79ix6lb";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/chessai/discrete-intervals";
        description = "Discrete Intervals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64742,7 +62294,6 @@ self: {
        libraryHaskellDepends = [
          adjunctions base comonad distributive keys semigroupoids
        ];
-       homepage = "https://github.com/sjoerdvisscher/discrete-space-map";
        description = "A discrete space map";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64766,7 +62317,6 @@ self: {
          base containers criterion deepseq ghc-prim primitive
          unordered-containers
        ];
-       homepage = "http://github.com/ekmett/discrimination/";
        description = "Fast generic linear-time sorting, joins and container construction";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64784,7 +62334,6 @@ self: {
          aeson base containers doctest QuickCheck quickcheck-classes
          semigroups
        ];
-       homepage = "https://github.com/andrewthad/disjoint-containers#readme";
        description = "Disjoint containers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64802,7 +62351,6 @@ self: {
        testHaskellDepends = [
          base containers HUnit mtl QuickCheck transformers
        ];
-       homepage = "https://github.com/maxwellsayles/disjoint-set";
        description = "Persistent disjoint-sets, a.k.a union-find.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64816,7 +62364,6 @@ self: {
        sha256 = "0fl3yii5pr41hy5fqg9vg902xq342l6xvfl6vb4nf15vbsff84c5";
        libraryHaskellDepends = [ base primitive ref-tf vector ];
        testHaskellDepends = [ base hspec primitive ref-tf vector ];
-       homepage = "https://github.com/clintonmead/disjoint-set-stateful";
        description = "Monadic disjoint set";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -64829,7 +62376,6 @@ self: {
        version = "0.1";
        sha256 = "0yy4gp5jhfsj3gbk7gh3yplxkxxfsmrl84chp4wfr4v46ff9pc2m";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://github.com/ppetr/disjoint-sets-st/";
        description = "Imperative ST/IO based disjoint set data structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64843,7 +62389,6 @@ self: {
        revision = "3";
        editedCabalFile = "0x0wjycr3rhw9vcq51b4sz8cf7mcvx7whhywv72y25r9385lxb3i";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/redneb/disk-free-space";
        description = "Retrieve information about disk space usage";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64874,7 +62419,6 @@ self: {
        version = "0.0.1";
        sha256 = "0hn1zdis621h87r4mr35vic9473iwqcdjnmmfgs1j5dfsh62kd6b";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "https://github.com/chrisdone/display#readme";
        description = "Display things for humans to read";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64886,7 +62430,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0j2rsmgmkfwy0w96y1qzr5vmhr16qgd46rka8ya17rakb4rzvi3q";
        libraryHaskellDepends = [ aeson base text ];
-       homepage = "https://github.com/KitFreddura/HaskellDO-Display";
        description = "A display API for HaskellDO";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -64898,7 +62441,6 @@ self: {
        version = "0.2.0.4";
        sha256 = "0sn93wmwajzbdj6h4cjwmyj1mbn6ga9gw1i2sny4kvqarqny2gy2";
        libraryHaskellDepends = [ base dlist ghcjs-base-stub ];
-       homepage = "https://github.com/louispan/disposable#readme";
        description = "Allows storing different resource-releasing actions together";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64927,7 +62469,6 @@ self: {
        revision = "1";
        editedCabalFile = "0iysmnl4p1fsb4zd0mmr6q7zc7w90jrwcxxm7vi38658x19r8qmq";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/agrafix/distance#readme";
        description = "Useful distance datatype and functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -64940,7 +62481,6 @@ self: {
        sha256 = "0s6d6a2b3pqxmgs3h7pqalwgb5m3f3pfjgc80wa57bf85f9f0gpk";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec QuickCheck time ];
-       homepage = "https://github.com/joshuaclayton/distance-of-time#readme";
        description = "Generate readable distances between times";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -64957,7 +62497,6 @@ self: {
          base binary bytestring constraints syb template-haskell
        ];
        testHaskellDepends = [ base binary hspec QuickCheck ];
-       homepage = "https://github.com/tweag/distributed-closure";
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -64982,7 +62521,6 @@ self: {
        benchmarkHaskellDepends = [
          base binary bytestring network-transport-tcp
        ];
-       homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65008,7 +62546,6 @@ self: {
          network-transport network-transport-tcp rematch stm test-framework
          test-framework-hunit transformers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-async";
        description = "Cloud Haskell Async API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65032,7 +62569,6 @@ self: {
          libssh2 mtl network-transport network-transport-tcp pureMD5
          rank1dynamic transformers unix
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process";
        description = "Microsoft Azure backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65063,7 +62599,6 @@ self: {
          mtl network network-transport network-transport-tcp rematch stm
          test-framework test-framework-hunit transformers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65115,7 +62650,6 @@ self: {
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-execution";
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65149,7 +62683,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 time
          transformers unordered-containers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-extras";
        description = "Cloud Haskell Extras";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65183,7 +62716,6 @@ self: {
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-fsm";
        description = "The Cloud Haskell implementation of Erlang/OTP gen_statem";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65210,7 +62742,6 @@ self: {
          network-transport network-transport-tcp rematch test-framework
          test-framework-hunit transformers
        ];
-       homepage = "https://github.com/jeremyjh/distributed-process-lifted";
        description = "monad-control style typeclass and transformer instances for Process monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65228,7 +62759,6 @@ self: {
          base distributed-process monad-control transformers
          transformers-base
        ];
-       homepage = "http://haskell-distributed.github.io";
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65249,7 +62779,6 @@ self: {
          network-transport network-transport-tcp
        ];
        executableHaskellDepends = [ base distributed-process mtl ];
-       homepage = "https://bitbucket.org/dpwiz/distributed-process-p2p/";
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65280,7 +62809,6 @@ self: {
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-platform";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65314,7 +62842,6 @@ self: {
          stm test-framework test-framework-hunit time transformers
          unordered-containers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-registry";
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65338,7 +62865,6 @@ self: {
          network network-multicast network-transport network-transport-tcp
          transformers
        ];
-       homepage = "http://haskell-distributed.github.com";
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65371,7 +62897,6 @@ self: {
          rematch stm test-framework test-framework-hunit time transformers
          unordered-containers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-supervisor";
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65392,7 +62917,6 @@ self: {
          distributed-static HUnit network network-transport random rematch
          stm test-framework test-framework-hunit
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-systest";
        description = "Cloud Haskell Test Support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65430,7 +62954,6 @@ self: {
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-task";
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65455,7 +62978,6 @@ self: {
          base network network-transport network-transport-inmemory
          test-framework
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process/tree/master/distributed-process-tests";
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65484,7 +63006,6 @@ self: {
          lifted-base monad-control network network-transport
          network-transport-tcp transformers
        ];
-       homepage = "https://github.com/jeremyjh/distributed-process-zookeeper";
        description = "A Zookeeper back-end for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65501,7 +63022,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring containers deepseq rank1dynamic
        ];
-       homepage = "http://haskell-distributed.github.com";
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65515,7 +63035,6 @@ self: {
        libraryHaskellDepends = [
          array base containers MonadRandom random
        ];
-       homepage = "https://github.com/redelmann/haskell-distribution";
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -65533,7 +63052,6 @@ self: {
          pretty process split
        ];
        testHaskellDepends = [ base deepseq hspec lens ];
-       homepage = "https://github.com/peti/distribution-nixpkgs#readme";
        description = "Types and functions to manipulate the Nixpkgs distribution";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -65551,7 +63069,6 @@ self: {
          base Chart Chart-cairo colour containers data-default-class
          distribution lens
        ];
-       homepage = "https://github.com/redelmann/haskell-distribution-plot";
        description = "Easily plot distributions from the distribution package..";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65573,7 +63090,6 @@ self: {
          base base-orphans tagged transformers transformers-compat
        ];
        testHaskellDepends = [ base doctest generic-deriving hspec ];
-       homepage = "http://github.com/ekmett/distributive/";
        description = "Distributive functors -- Dual to Traversable";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65596,7 +63112,6 @@ self: {
        executableHaskellDepends = [
          base containers fasta optparse-applicative pipes semigroups
        ];
-       homepage = "https://github.com/GregorySchwartz/diversity";
        description = "Quantify the diversity of a population";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65635,7 +63150,6 @@ self: {
          patches-vector servant servant-blaze servant-docs shakespeare text
          time vector
        ];
-       homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65652,7 +63166,6 @@ self: {
          base hmidi hspec lens mtl QuickCheck random
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/reedrosenbluth/Djembe";
        description = "Hit drums with haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65695,7 +63208,6 @@ self: {
        version = "0.0.1.3";
        sha256 = "0r1kby67flpyizj117r5q0q3sj61csqxd44za5r9292hj3cacd9v";
        libraryHaskellDepends = [ base containers mtl pretty ];
-       homepage = "http://www.augustsson.net/Darcs/Djinn/";
        description = "Generate Haskell code from a type. Library extracted from djinn package.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65709,7 +63221,6 @@ self: {
        libraryHaskellDepends = [
          base containers logict template-haskell
        ];
-       homepage = "http://gitorious.org/djinn-th";
        description = "Generate executable Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65723,7 +63234,6 @@ self: {
        sha256 = "0yirrh0s6acjy9hhvf5fqg2d6q5y6gm9xs04v6w1imndh1xqdwdc";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base Cabal QuickCheck ];
-       homepage = "https://github.com/spl/dlist";
        description = "Difference lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65735,7 +63245,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "0nsgrr25r4qxv2kpn7i20hra8jjkyllxfrhh5hml3ysjdz010jni";
        libraryHaskellDepends = [ base dlist semigroups ];
-       homepage = "https://github.com/gregwebs/dlist-instances";
        description = "Difference lists instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65760,7 +63269,6 @@ self: {
        benchmarkHaskellDepends = [
          base base-compat criterion dlist dlist-instances
        ];
-       homepage = "https://github.com/phadej/dlist-nonempty";
        description = "Non-empty difference lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65775,7 +63283,6 @@ self: {
        editedCabalFile = "1rpxbbk5mqk39xajn8f73v0z0kignl60rf3ippwr526n4hssxs56";
        libraryHaskellDepends = [ base process ];
        testHaskellDepends = [ base hspec process QuickCheck ];
-       homepage = "https://github.com/ciez/dmc";
        description = "cmd: run shell commands from code";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -65804,7 +63311,6 @@ self: {
          aeson base bytestring classy-prelude configurator containers
          monad-control monad-logger random stm text unix unliftio websockets
        ];
-       homepage = "https://github.com/f-me/dmcc#readme";
        description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -65820,7 +63326,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory lens mtl process transformers
        ];
-       homepage = "https://github.com/m0rphism/haskell-dmenu";
        description = "Complete bindings to the dmenu and dmenu2 command line tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65839,7 +63344,6 @@ self: {
        executableHaskellDepends = [
          base containers directory dmenu lens mtl process transformers
        ];
-       homepage = "https://github.com/m0rphism/haskell-dmenu-pkill";
        description = "dmenu script for killing applications. Sortable by process id or CPU/MEM usage.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65858,7 +63362,6 @@ self: {
        executableHaskellDepends = [
          base containers directory dmenu lens mtl process transformers
        ];
-       homepage = "https://github.com/m0rphism/haskell-dmenu-pmount";
        description = "Mounting and unmounting linux devices as user with dmenu and pmount";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65877,7 +63380,6 @@ self: {
        executableHaskellDepends = [
          base containers directory dmenu lens mtl process transformers
        ];
-       homepage = "https://github.com/m0rphism/haskell-dmenu-search";
        description = "dmenu script for searching the web with customizable search engines";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65957,7 +63459,6 @@ self: {
        sha256 = "07xq52aqqmzq1f68m8spr7fyax0cqnpv9mh5m4x3klxm0iznv9xm";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hsdns HUnit network ];
-       homepage = "http://www.pigscanfly.ca/~holden/dnsrbl/";
        description = "Asynchronous DNS RBL lookup";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65971,7 +63472,6 @@ self: {
        sha256 = "0gfyyr1wcxni0r0r9df6lkmv6gvi0qvwclwi9majzg10pas6dk2n";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ dns_sd ];
-       homepage = "https://github.com/maxpow4h/dnssd";
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -65986,7 +63486,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion mtl text ];
-       homepage = "https://github.com/tserduke/do-list#readme";
        description = "Do notation for free";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66012,7 +63511,6 @@ self: {
          sqlite tagchup text time transformers unix xhtml-combinators xml
          xml-basic
        ];
-       homepage = "https://github.com/j3h/doc-review";
        description = "Document review Web application, like http://book.realworldhaskell.org/";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66032,7 +63530,6 @@ self: {
          attoparsec base directory directory-tree filepath ghc ghc-paths
          text
        ];
-       homepage = "https://github.com/Fuuzetsu/doccheck";
        description = "Checks Haddock comments for pitfalls and version changes";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66052,7 +63549,6 @@ self: {
          base Cabal containers directory filepath html MissingH mtl
          old-locale tagsoup time
        ];
-       homepage = "http://github.com/gimbo/docidx.hs";
        description = "Generate an HTML index of installed Haskell packages and their documentation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66087,7 +63583,6 @@ self: {
          tasty-hunit tasty-quickcheck text transformers unordered-containers
          vector
        ];
-       homepage = "https://github.com/denibertovic/docker-hs";
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66105,7 +63600,6 @@ self: {
        executableHaskellDepends = [
          base containers foldl language-docker system-filepath text turtle
        ];
-       homepage = "https://github.com/seatgeek/docker-build-cacher#readme";
        description = "Builds a services with docker and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66123,7 +63617,6 @@ self: {
        executableHaskellDepends = [
          base containers foldl language-docker system-filepath text turtle
        ];
-       homepage = "https://github.com/seatgeek/docker-build-cacher#readme";
        description = "Builds a services with docker and caches all of its intermediate stages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66158,7 +63651,6 @@ self: {
          optparse-applicative process text unordered-containers
        ];
        testHaskellDepends = [ base HTF text vector ];
-       homepage = "https://github.com/factisresearch/dockercook";
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66192,7 +63684,6 @@ self: {
          aeson ansi-terminal base bytestring containers HUnit parsec split
          template-haskell text th-lift
        ];
-       homepage = "https://github.com/docopt/docopt.hs";
        description = "A command-line interface parser that will make you smile";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -66206,7 +63697,6 @@ self: {
        libraryHaskellDepends = [
          base containers heredoc template-haskell
        ];
-       homepage = "https://github.com/daig/docstrings#readme";
        description = "Docstrings for documentation in the repl";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -66226,7 +63716,6 @@ self: {
          scientific text unordered-containers vector
        ];
        testHaskellDepends = [ aeson base hspec text ];
-       homepage = "https://github.com/jgm/doctemplates#readme";
        description = "Pandoc-style document templates";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66253,7 +63742,6 @@ self: {
          hspec HUnit mockery process QuickCheck setenv silently
          stringbuilder syb transformers with-location
        ];
-       homepage = "https://github.com/sol/doctest#readme";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -66283,7 +63771,6 @@ self: {
          hspec HUnit mockery process QuickCheck setenv silently
          stringbuilder syb transformers with-location
        ];
-       homepage = "https://github.com/sol/doctest#readme";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66307,7 +63794,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        doHaddock = false;
-       homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66331,7 +63817,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        doHaddock = false;
-       homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66357,7 +63842,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        doHaddock = false;
-       homepage = "http://github.com/relrod/doctest-discover-noaeson";
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66374,7 +63858,6 @@ self: {
        libraryHaskellDepends = [ base doctest ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/Hexirp/doctest-driver-gen#readme";
        description = "Generate driver file for doctest's cabal integration";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66414,7 +63897,6 @@ self: {
          lens mtl parsec pretty-show process split tasty tasty-golden
          tasty-hunit temporary
        ];
-       homepage = "https://github.com/wincent/docvim";
        description = "Documentation generator for Vim plug-ins";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66444,7 +63926,6 @@ self: {
          regex-tdfa safe strict tagsoup temporary time transformers
          urlencoded utility-ht
        ];
-       homepage = "http://johannesgerer.com/doi";
        description = "Automatic Bibtex and fulltext of scientific articles";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66457,7 +63938,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1pipbyfpny8mq540rpfkgkwbc3mc13yf6xm1h9vxm0fnaa8kcbw9";
        libraryHaskellDepends = [ base profunctors semigroups ];
-       homepage = "https://github.com/qfpl/dollaridoos";
        description = "A newtype for monetary values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66490,7 +63970,6 @@ self: {
          base data-default hspec lens semigroups shakespeare text
          xml-conduit
        ];
-       homepage = "https://github.com/typeable/dom-parser";
        description = "Simple monadic DOM parser";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -66512,7 +63991,6 @@ self: {
          base data-default hspec lens semigroups shakespeare text
          xml-conduit
        ];
-       homepage = "https://github.com/typeable/dom-parser";
        description = "Simple monadic DOM parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66534,7 +64012,6 @@ self: {
          base blaze-html containers html-conduit parsec QuickCheck
          template-haskell text th-lift xml-conduit
        ];
-       homepage = "https://github.com/nebuta/";
        description = "DOM traversal by CSS selectors for xml-conduit package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66569,7 +64046,6 @@ self: {
        libraryHaskellDepends = [ base containers lens mtl random ];
        executableHaskellDepends = [ base containers lens mtl random ];
        testHaskellDepends = [ base containers hspec lens mtl random ];
-       homepage = "http://github.com/egonschiele/dominion";
        description = "A simulator for the board game Dominion";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66586,7 +64062,6 @@ self: {
          base bytestring containers tagsoup text unordered-containers vector
          yaml
        ];
-       homepage = "https://github.com/valderman/domplate";
        description = "A simple templating library using HTML5 as its template language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66599,7 +64074,6 @@ self: {
        version = "0.2.2";
        sha256 = "0j4v7vbmm6gfv1y4dp0r7ajiw7iinzflhw8sp867gyafszrpb0a3";
        libraryHaskellDepends = [ base impure-containers text ];
-       homepage = "https://github.com/andrewthad/dot#readme";
        description = "Data types and encoding for graphviz dot files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66626,7 +64100,6 @@ self: {
          attoparsec base bytestring HUnit tasty tasty-hunit turtle
          unordered-containers
        ];
-       homepage = "https://github.com/pjrt/Dot-Linker#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66641,7 +64114,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers graphviz hxt text ];
-       homepage = "http://redmine.iportnov.ru/projects/dot2graphml";
        description = "Converter from GraphViz .dot format to yEd GraphML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66670,7 +64142,6 @@ self: {
          base base-compat directory exceptions hspec hspec-megaparsec
          megaparsec process text transformers yaml
        ];
-       homepage = "https://github.com/stackbuilders/dotenv-hs";
        description = "Loads environment variables from dotenv files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66703,7 +64174,6 @@ self: {
          test-framework-quickcheck2 transformers
        ];
        doHaddock = false;
-       homepage = "http://github.com/toothbrush/dotfs";
        description = "Filesystem to manage and parse dotfiles";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66718,7 +64188,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/ku-fpg/dotgen";
        description = "A simple interface for building .dot graph files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66730,7 +64199,6 @@ self: {
        version = "0.0.1.0";
        sha256 = "1hws424hf4ifijmz2xn3jvwvayll5jig83bgkl9zavwipkzqvjnq";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/YoEight/dotnet-timespan";
        description = ".NET TimeSpan";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66748,7 +64216,6 @@ self: {
          base bytestring HUnit test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/bos/double-conversion";
        description = "Fast conversion between double precision floating point and text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66765,7 +64232,6 @@ self: {
          aeson base bytestring cassava deepseq double-conversion
          rawstring-qm text
        ];
-       homepage = "https://github.com/tolysz/double-extra#readme";
        description = "Missing presentations for Double numbers (fixed, scientific etc.)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66777,7 +64243,6 @@ self: {
        version = "0.0.2";
        sha256 = "15rwwhxi3pm1dvxdbc3rwiw1cjz7pxr0khf6kw29nw4hg9w5b0ic";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/christian-marie/double-metaphone";
        description = "Haskell bindings to a C double-metaphone implementation";
        license = "GPL";
      }) {};
@@ -66789,7 +64254,6 @@ self: {
        version = "0.0.1";
        sha256 = "0libb7w3a8ffcr08x6s3xqzhbkxb8n111f53g638jr0xpz3r98yv";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/doublifyapis/toolkit-haskell";
        description = "Doublify API toolkit for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66832,7 +64296,6 @@ self: {
        sha256 = "1wpf8kxq924482p7bm5l24nhmvrr75sjqinfjkj6x2x55hd40vd0";
        libraryHaskellDepends = [ base bytestring feed tagsoup xml ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/psibi/download";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66846,7 +64309,6 @@ self: {
        revision = "2";
        editedCabalFile = "032f19gn7bnx3fpfdwclm1z1hsxaya6yml7p2hcg3b2ad6d11pyl";
        libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ];
-       homepage = "http://code.haskell.org/~dons/code/download-curl";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -66864,7 +64326,6 @@ self: {
        executableHaskellDepends = [
          base bytestring filepath http-enumerator tagsoup text
        ];
-       homepage = "http://github.com/jaspervdj/download-media-content";
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66877,7 +64338,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0sqvxyj3aybqvjlrz2a93lnp1vbjiqikysm575wizri2rd3vfj1l";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/siddhanathan/dozenal";
        description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66898,7 +64358,6 @@ self: {
          aeson base bytestring data-default-class http-client http-types
          reflection scientific text transformers
        ];
-       homepage = "https://github.com/philopon/dozens-hs";
        description = "dozens api library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66913,7 +64372,6 @@ self: {
        libraryHaskellDepends = [
          array base ghc-prim pretty random vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell common config and debugging functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66933,7 +64391,6 @@ self: {
          base containers dph-base dph-lifted-vseg dph-prim-par HUnit
          old-time parseargs random vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell example programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66951,7 +64408,6 @@ self: {
          array base containers dph-base dph-prim-par ghc pretty random
          template-haskell vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66968,7 +64424,6 @@ self: {
        libraryHaskellDepends = [
          array base dph-base dph-prim-par ghc random template-haskell vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66986,7 +64441,6 @@ self: {
          array base containers dph-base dph-lifted-base dph-prim-par ghc
          pretty random template-haskell vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell lifted array combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -66999,7 +64453,6 @@ self: {
        version = "0.5.1.99";
        sha256 = "0csgd8ghbxv1vwp95dn98qv1zp8229fffm9j274bmjg857588i97";
        doHaddock = false;
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67011,7 +64464,6 @@ self: {
        version = "0.7.0.1";
        sha256 = "17m03gylc61d7mx26rz70kwmi014rv1g14683vraa1b77pci5h8j";
        libraryHaskellDepends = [ base dph-base random vector ];
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (abstract interface)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67029,7 +64481,6 @@ self: {
          base dph-base dph-prim-interface dph-prim-seq old-time random
          vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (production version)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67046,7 +64497,6 @@ self: {
        libraryHaskellDepends = [
          base dph-base dph-prim-interface ghc-prim primitive random vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67059,7 +64509,6 @@ self: {
        version = "0.5.1.99";
        sha256 = "10s6qq4ayh85wvhnyl7dfdr72a76irvg83s71lww8ig988599ygp";
        doHaddock = false;
-       homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67094,7 +64543,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq random semigroups
        ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67106,7 +64554,6 @@ self: {
        version = "0.1";
        sha256 = "10rcmqa2x5xlh5pqfsg9dagf2lmrwc2bby3zklzv3x4s3yqg2ar3";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/cwi-swat/monadic-frp";
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67125,7 +64572,6 @@ self: {
        libraryHaskellDepends = [ base random-shuffle safe ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "http://tune.hateblo.jp/entry/2015/05/12/023112";
        description = "playing draw poker";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67140,7 +64586,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
-       homepage = "https://github.com/yamadapc/haskell-drawille#readme";
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -67180,7 +64625,6 @@ self: {
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck text
        ];
-       homepage = "https://github.com/AndrewRademacher/drifter";
        description = "Simple schema management for arbitrary databases";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67201,7 +64645,6 @@ self: {
        testHaskellDepends = [
          base drifter either postgresql-simple tasty tasty-hunit text
        ];
-       homepage = "http://github.com/michaelxavier/drifter-postgresql";
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67220,7 +64663,6 @@ self: {
          base conduit conduit-combinators exceptions gauge list-t ListT
          machines mtl pipes transformers
        ];
-       homepage = "https://github.com/fumieval/drinkery#readme";
        description = "Boozy streaming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67255,7 +64697,6 @@ self: {
          pem resourcet template-haskell time tls tls-extra transformers
          urlencoded utf8-string
        ];
-       homepage = "http://github.com/cakoose/dropbox-sdk-haskell";
        description = "A library to access the Dropbox HTTP API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67310,7 +64751,6 @@ self: {
          base base64-bytestring bytestring hspec QuickCheck SimpleAES
          string-conversions
        ];
-       homepage = "https://github.com/qoelet/dsc#readme";
        description = "Helper functions for setting up Double Submit Cookie defense for forms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67388,7 +64828,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "15pqja0q1lram7xi5xk8dlcfg5m1z0l4zscqw24wm50hmqpxi09d";
        libraryHaskellDepends = [ base parsec ];
-       homepage = "https://github.com/lcycon/hs-dson";
        description = "Haskell DogeScript Object Notation Parser";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67401,7 +64840,6 @@ self: {
        version = "0.4.1.1";
        sha256 = "1zflz9vhcz7psssn6hrizmwdmrvpagxhl0648k6f1n9xj50kp99y";
        libraryHaskellDepends = [ base parsec ];
-       homepage = "https://github.com/alvare/dson-parsec";
        description = "DSON parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67417,7 +64855,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base containers random ];
        testHaskellDepends = [ array base containers QuickCheck ];
-       homepage = "http://www.haskell.org/haskellwiki/DSP";
        description = "Haskell Digital Signal Processing";
        license = "GPL";
      }) {};
@@ -67429,7 +64866,6 @@ self: {
        version = "0.4.0.4";
        sha256 = "15zy1dhfs87hxq1qm54ym0pdhvg7l76m7vy5y06dnksb1sblhaqm";
        libraryHaskellDepends = [ base base-unicode-symbols dlist ];
-       homepage = "https://github.com/basvandijk/dstring";
        description = "Difference strings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67471,7 +64907,6 @@ self: {
          lifted-base monad-control network resourcet text transformers
          uri-conduit xml-catalog xml-conduit xml-types
        ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "Parse and render DTD files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67488,7 +64923,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base containers dtd-types text xml-types
        ];
-       homepage = "http://github.com/m15k/hs-dtd-text";
        description = "Parse and render XML DTDs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67501,7 +64935,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "1w2ni9b8kn242grdqb4wxvgxqpkpp9qy66d57n33l5jghlg8b0s7";
        libraryHaskellDepends = [ base text xml-types ];
-       homepage = "http://projects.haskell.org/dtd/";
        description = "Basic types for representing XML DTDs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67558,12 +64991,13 @@ self: {
        pname = "dual-game";
        version = "0.1.0.1";
        sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg";
+       revision = "1";
+       editedCabalFile = "0cd1kjlkbslyhchqp6p52rkxli88z65ky1345zxz67sr5hq9ia66";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bifunctors cereal gloss network websockets
        ];
-       homepage = "https://github.com/fgaz/dual";
        description = "Network multiplayer 2D shooting game";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67607,7 +65041,6 @@ self: {
          quickcheck-instances resourcet safe-exceptions tasty tasty-hunit
          tasty-quickcheck text time uri-bytestring xml-conduit xml-types
        ];
-       homepage = "https://github.com/k0ral/dublincore-xml-conduit";
        description = "XML streaming parser/renderer for the Dublin Core standard elements";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67639,7 +65072,6 @@ self: {
        testHaskellDepends = [
          aeson base tasty tasty-hunit text time unordered-containers
        ];
-       homepage = "https://github.com/facebookincubator/duckling#readme";
        description = "A Haskell library for parsing text into structured data";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67658,7 +65090,6 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/leftaroundabout/dumb-cas";
        description = "A computer “algebra” system that knows nothing about algebra, at the core";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -67679,7 +65110,6 @@ self: {
          base haskell-src-meta hspec interpolatedstring-perl6 QuickCheck
          template-haskell text
        ];
-       homepage = "https://github.com/Wizek/dump";
        description = "Dumps the names and values of expressions to ease debugging";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -67711,7 +65141,6 @@ self: {
        libraryHaskellDepends = [
          base MonadRandom transformers transformers-base
        ];
-       homepage = "https://github.com/ivanperez-keera/dunai";
        description = "Generalised reactive framework supporting classic, arrowized and monadic FRP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67765,7 +65194,6 @@ self: {
        testHaskellDepends = [
          base doctest hspec parsec template-haskell time
        ];
-       homepage = "https://github.com/ryota-ka/duration#readme";
        description = "A tiny compile-time time utility library inspired by zeit/ms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67788,7 +65216,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/mwotton/dustme#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67850,7 +65277,6 @@ self: {
        sha256 = "1kxnzzm24kslsyy9fsjazfz14svbh9svh6f7rnf060as864vmj5g";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/kvanberendonck/codec-dvorak";
        description = "Dvorak encoding for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67910,7 +65336,6 @@ self: {
        sha256 = "117f3s3rvka5m9zk8lhwxmqx3slxpf040r7485x6gz58ra33dsg9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/xngns/dwergaz";
        description = "A minimal testing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67965,7 +65390,6 @@ self: {
        editedCabalFile = "0w0az7jkkyfvaldh44b9pmqlwrfvjxmfk07hvrdiwxl62klg4plq";
        libraryHaskellDepends = [ base exact-combinatorics text ];
        testHaskellDepends = [ ansi-terminal base hspec text ];
-       homepage = "https://github.com/laserpants/dyckword#readme";
        description = "A library for working with binary Dyck words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -67987,7 +65411,6 @@ self: {
          base containers directory doctest filepath ghc HUnit tasty
          tasty-hunit tasty-th
        ];
-       homepage = "http://github.com/bennofs/dynamic-cabal/";
        description = "Access the functions from the Cabal library without depending on it";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68005,7 +65428,6 @@ self: {
        libraryHaskellDepends = [
          base cairo colour GLFW-b GLUtil OpenGL pango pipes transformers
        ];
-       homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68018,7 +65440,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz";
        libraryHaskellDepends = [ base containers template-haskell unix ];
-       homepage = "http://github.com/hsyl20/dynamic-linker-template";
        description = "Automatically derive dynamic linking methods from a data type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68035,7 +65456,6 @@ self: {
        libraryHaskellDepends = [
          base directory ghc-prim hashable hashtables time transformers
        ];
-       homepage = "https://github.com/ggreif/dynamic-loader";
        description = "lightweight loader of GHC-based modules or packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68047,7 +65467,6 @@ self: {
        version = "0.1.0.5";
        sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2";
        libraryHaskellDepends = [ base primitive vector ];
-       homepage = "https://github.com/AndrasKovacs/dynamic-mvector";
        description = "A wrapper around MVector that enables pushing, popping and extending";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68091,7 +65510,6 @@ self: {
          random random-fu semigroups tagged time transformers vector
          vector-space
        ];
-       homepage = "https://github.com/leftaroundabout/dynamic-plot";
        description = "Interactive diagram windows";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68113,7 +65531,6 @@ self: {
          ansi-terminal base blaze-builder bytestring Cabal hashable
          HUnit-Plus unordered-containers utf8-string
        ];
-       homepage = "https://github.com/emc2/dynamic-pp";
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68158,7 +65575,6 @@ self: {
          lens safe-exceptions semigroups tagged text transformers
          unordered-containers
        ];
-       homepage = "https://github.com/ondrap/dynamodb-simple";
        description = "Typesafe library for working with DynamoDB database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68208,7 +65624,6 @@ self: {
          base binary directory executable-path filepath ghc-paths io-storage
          process time unix xdg-basedir
        ];
-       homepage = "http://github.com/willdonnelly/dyre";
        description = "Dynamic reconfiguration in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68245,7 +65660,6 @@ self: {
        sha256 = "0yh7q86kmz7ryl95hzm3qvi1l1qhsqf34b35mpkph41snda5g4xl";
        libraryHaskellDepends = [ base dlist template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/dramforever/each#readme";
        description = "Template Haskell library for writing monadic expressions more easily";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68275,7 +65689,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring cryptonite memory mtl pretty-hex
        ];
-       homepage = "https://github.com/erickg/eap#readme";
        description = "Extensible Authentication Protocol (EAP)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68291,7 +65704,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base filepath hspec ];
-       homepage = "https://github.com/zaidan/earclipper#readme";
        description = "Ear Clipping Triangulation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68320,7 +65732,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring either http-conduit mtl resourcet text
        ];
-       homepage = "http://github.com/sanetracker/easy-api";
        description = "Utility code for building HTTP API bindings more quickly";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68339,7 +65750,6 @@ self: {
          aeson base base16-bytestring binary byteable bytestring cryptohash
          deepseq lens postgresql-simple safe text
        ];
-       homepage = "https://github.com/vwwv/easy-bitcoin";
        description = "types and functions for bitcoin applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68351,7 +65761,6 @@ self: {
        version = "0.2.2";
        sha256 = "0zmlcz723051qpn8l8vi51c5rx1blwrw4094jcshkmj8p9r2xxaj";
        libraryHaskellDepends = [ base directory filepath time unix ];
-       homepage = "http://github.com/kazu-yamamoto/easy-file";
        description = "Cross-platform File handling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68367,7 +65776,6 @@ self: {
        libraryHaskellDepends = [
          base mtl parsec text unordered-containers vector
        ];
-       homepage = "https://github.com/thinkpad20/easyjson";
        description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68380,7 +65788,6 @@ self: {
        version = "1.0";
        sha256 = "18kndgvdj2apjpfga6fp7m16y1gx8zrwp3c5vfj03sx4v6jvciqk";
        libraryHaskellDepends = [ base process ];
-       homepage = "http://hub.darcs.net/scravy/easyplot";
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68396,7 +65803,6 @@ self: {
        sha256 = "105s3d5yz7qz9cv5jq005kzd7jfdn2fccnc4s1xgkszk46y83qbx";
        setupHaskellDepends = [ base Cabal superdoc ];
        libraryHaskellDepends = [ base bytestring containers mtl zlib ];
-       homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/";
        description = "User-friendly creation of EPS, PostScript, and PDF files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68411,7 +65817,6 @@ self: {
        libraryHaskellDepends = [ base dimensions ];
        testHaskellDepends = [ base Cabal dimensions QuickCheck ];
        benchmarkHaskellDepends = [ base dimensions time ];
-       homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68423,7 +65828,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "1d3jxqhv0c6pd08av31mdxshban2g0msdpljhl3wi5flrj93s8m3";
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
-       homepage = "https://github.com/achirkin/easytensor#readme";
        description = "Use easytensor with vulkan-api";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68440,7 +65844,6 @@ self: {
          async base call-stack containers mtl random stm text transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/joelburget/easytest";
        description = "Simple, expressive testing library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -68491,7 +65894,6 @@ self: {
          base base64-bytestring bytestring doctest hspec http-types HUnit
          QuickCheck SHA
        ];
-       homepage = "https://github.com/worksap-ate/ec2-signature";
        description = "The Amazon EC2 style signature calculator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68511,7 +65913,6 @@ self: {
          amazonka amazonka-core amazonka-ec2 amazonka-s3 base bytestring
          directory filepath lens process semigroups temporary text time unix
        ];
-       homepage = "http://github.com/GaloisInc/ec2-unikernel";
        description = "A handy tool for uploading unikernels to Amazon's EC2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68544,7 +65945,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring crypto-api crypto-pubkey-types hecc
        ];
-       homepage = "https://github.com/singpolyma/ecdsa-haskell";
        description = "Basic ECDSA signing implementation";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68561,7 +65961,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
-       homepage = "https://github.com/RyanGlScott/echo";
        description = "A cross-platform, cross-console way to handle echoing terminal input";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68580,7 +65979,6 @@ self: {
          base containers data-default lens parsec safe transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/fabianbergmark/ECMA-262";
        description = "A ECMA-262 interpreter library";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68597,7 +65995,6 @@ self: {
        libraryHaskellDepends = [
          base containers kan-extensions mtl transformers
        ];
-       homepage = "http://github.com/isovector/ecstasy/";
        description = "A GHC.Generics based entity component system.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68636,7 +66033,6 @@ self: {
          base bytestring directory doctest filepath hlint QuickCheck
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-       homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "Ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -68648,7 +66044,6 @@ self: {
        version = "0.1.1";
        sha256 = "0kpqh4fzij9152sazbwxmbzv1b16ih17lwmr1bkii2xi5kkjbnvd";
        libraryHaskellDepends = [ base bytestring crypto-api ];
-       homepage = "github.com/tommd/hs-ed25519-donna";
        description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68666,7 +66061,6 @@ self: {
        executableHaskellDepends = [
          base bifunctors classy-prelude hint optparse-applicative safe
        ];
-       homepage = "http://chiselapp.com/user/mwm/repository/eddie/";
        description = "Command line file filtering with haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68693,7 +66087,6 @@ self: {
        testHaskellDepends = [
          aeson base bifunctors bytestring directory tasty tasty-golden text
        ];
-       homepage = "http://github.com/brendanhay/ede";
        description = "Templating language with similar syntax and features to Liquid or Jinja2";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68706,7 +66099,6 @@ self: {
        version = "1.2.0.0";
        sha256 = "1wbasb9lsw2rycl2ibd8r9p3d9dl8gd75390qsc83znqx802ylxj";
        libraryHaskellDepends = [ base containers deepseq parallel ];
-       homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "Semi-explicit parallel programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68740,7 +66132,6 @@ self: {
          array base binary bytestring cairo containers directory filepath
          ghc-events-parallel gtk mtl text zip-archive
        ];
-       homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68760,7 +66151,6 @@ self: {
        executableHaskellDepends = [
          ALUT base cmdtheline containers gloss OpenAL random wraparound
        ];
-       homepage = "https://qlfiles.net/the-ql-files/the-edge/";
        description = "Top view space combat arcade game";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68777,6 +66167,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "edit" = callPackage
+    ({ mkDerivation, base, comonad, deepseq, doctest, QuickCheck, tasty
+     , tasty-discover, tasty-quickcheck, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "edit";
+       version = "0.0.1.1";
+       sha256 = "0smxb6v4n83b09dyaj388hhi7kx1ca6axg60q3adnixy13a284lz";
+       libraryHaskellDepends = [ base deepseq transformers ];
+       testHaskellDepends = [
+         base comonad doctest QuickCheck tasty tasty-discover
+         tasty-quickcheck uniplate
+       ];
+       description = "A monad for rewriting things";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "edit-distance" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , process, QuickCheck, random, test-framework
@@ -68796,7 +66203,6 @@ self: {
        benchmarkHaskellDepends = [
          array base containers criterion deepseq process random time unix
        ];
-       homepage = "http://github.com/phadej/edit-distance";
        description = "Levenshtein and restricted Damerau-Levenshtein edit distances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68811,7 +66217,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck quickcheck-instances vector
        ];
-       homepage = "https://github.com/thsutton/edit-distance-vector";
        description = "Calculate edit distances and edit scripts between vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68850,7 +66255,6 @@ self: {
        version = "1.0.0.2";
        sha256 = "15jz0b913xd8yd3nzk4vrlj0vzbhjarl05h9j0mdcfgxns5j0yxi";
        libraryHaskellDepends = [ base text vty vty-ui ];
-       homepage = "https://github.com/maxpow4h/editable";
        description = "Interactive editors for Generics";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68863,7 +66267,6 @@ self: {
        version = "0.2.1.1";
        sha256 = "101zhzja14n8bhbrly7w2aywx3sxyzgyjdrmgpg4gn4alf4lzdlz";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/editline";
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68887,7 +66290,6 @@ self: {
        executableHaskellDepends = [
          base bytestring conduit conduit-extra resourcet
        ];
-       homepage = "https://github.com/pharpend/editor-open";
        description = "Open the user's $VISUAL or $EDITOR for text input";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -68905,7 +66307,6 @@ self: {
        executableHaskellDepends = [
          base optparse-applicative process temporary unix
        ];
-       homepage = "http://github.com/puffnfresh/editpipe#readme";
        description = "Edit stdin using an editor before sending to stdout";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -68923,7 +66324,6 @@ self: {
          base hspec hspec-discover HUnit QuickCheck
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68956,7 +66356,6 @@ self: {
          base Cabal ghc-prim hashtables HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://pleiad.cl/EffectiveAspects";
        description = "A monadic embedding of aspect oriented programming";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68978,7 +66377,6 @@ self: {
          base Cabal ghc-prim hashtables HUnit mzv QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://pleiad.cl/EffectiveAspects";
        description = "A monadic embedding of aspect oriented programming, using \"Monads, Zippers and Views\" instead of mtl";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68991,7 +66389,6 @@ self: {
        version = "0.2.3";
        sha256 = "174mlzs1n2zw2jzxn95lkr8f2m2rjigvgpqljrvim9bsb991dhc0";
        libraryHaskellDepends = [ base containers newtype-generics void ];
-       homepage = "http://github.com/sjoerdvisscher/effects";
        description = "Computational Effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69003,7 +66400,6 @@ self: {
        version = "0.1";
        sha256 = "0vjjld95kg02a4nr2a0lwlcwaq3867qvbbjk8b1g6fd3d1qj456r";
        libraryHaskellDepends = [ base effects ];
-       homepage = "http://github.com/nybble41/effects-parser";
        description = "Parser Effect for the Control.Effects Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69015,7 +66411,6 @@ self: {
        version = "0.3.0.3";
        sha256 = "1kq5n25m7bzw4zrz35b5zc8r4q0p0ai801hdf7r537fim0ia973x";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/YellPika/effin";
        description = "A Typeable-free implementation of extensible effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69051,7 +66446,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq mtl transformers
        ];
-       homepage = "http://www.egison.org";
        description = "Programming language with non-linear pattern-matching against non-free data";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69065,7 +66459,6 @@ self: {
        libraryHaskellDepends = [
          base egison mtl parsec template-haskell
        ];
-       homepage = "https://github.com/xenophobia/Egison-Quote";
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69087,7 +66480,6 @@ self: {
          ghc-paths haskeline mtl parsec regex-posix transformers
          unordered-containers
        ];
-       homepage = "http://www.egison.org";
        description = "A tutorial program for the Egison programming language";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -69106,7 +66498,6 @@ self: {
          base directory filepath mtlparse process regexpr utf8-string
          yjtools
        ];
-       homepage = "http://homepage3.nifty.com/salamander/second/projects/ehaskell/index.xhtml";
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69128,7 +66519,6 @@ self: {
          base bytestring haskell-src-meta parsec template-haskell text
          transformers
        ];
-       homepage = "http://github.com/minpou/ehs/";
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69167,7 +66557,6 @@ self: {
        testHaskellDepends = [
          base binary bytestring mtl primitive transformers vector
        ];
-       homepage = "https://github.com/osidorkin/haskell-eigen";
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69184,7 +66573,6 @@ self: {
          base bifunctors mtl profunctors semigroupoids semigroups
        ];
        testHaskellDepends = [ base hedgehog ];
-       homepage = "http://github.com/ekmett/either/";
        description = "Combinators for working with sums";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69209,7 +66597,6 @@ self: {
        sha256 = "0m7fkf8r1i0z3zrfmnqsdzk0fc9mhanqmx7x6rjiisjiaf91yr8d";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/chris-martin/either-list-functions#readme";
        description = "Functions involving lists of Either";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -69221,7 +66608,6 @@ self: {
        version = "1.1";
        sha256 = "0g1f5m7bcpnyg2sdvwx8x34ml6dqfrn326s8pbfciaqqf7wddayc";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/gcross/either-unwrap";
        description = "Functions for probing and unwrapping values inside of Either";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69253,7 +66639,6 @@ self: {
          aeson base bytestring ekg-core ekg-json filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
-       homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69271,7 +66656,6 @@ self: {
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
        ];
-       homepage = "http://github.com/ocharles/ekg-bosun";
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69288,7 +66672,6 @@ self: {
          base ekg-core network network-carbon text time unordered-containers
          vector
        ];
-       homepage = "http://github.com/ocharles/ekg-carbon";
        description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69306,7 +66689,6 @@ self: {
          amazonka amazonka-cloudwatch amazonka-core base bytestring ekg-core
          lens resourcet semigroups text time unordered-containers
        ];
-       homepage = "https://github.com/sellerlabs/ekg-cloudwatch#readme";
        description = "An ekg backend for Amazon Cloudwatch";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69326,7 +66708,6 @@ self: {
          base containers ghc-prim text unordered-containers
        ];
        benchmarkHaskellDepends = [ base ];
-       homepage = "https://github.com/tibbe/ekg-core";
        description = "Tracking of system metrics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69343,7 +66724,6 @@ self: {
          aeson base bytestring ekg-core hostname http-client lens text time
          unordered-containers wreq
        ];
-       homepage = "https://github.com/cdodev/ekg-elastic";
        description = "Push metrics to elastic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69362,7 +66742,6 @@ self: {
          aeson base bytestring data-default-class ekg-core hostname
          http-client lens req text time unordered-containers
        ];
-       homepage = "https://github.com/cdodev/ekg-elasticsearch";
        description = "Push metrics to elasticsearch";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69379,7 +66758,6 @@ self: {
          base clock containers ekg-core libinfluxdb text time
          unordered-containers vector
        ];
-       homepage = "https://github.com/angerman/ekg-influxdb";
        description = "An EKG backend to send statistics to influxdb";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69397,7 +66775,6 @@ self: {
        libraryHaskellDepends = [
          aeson base ekg-core text unordered-containers
        ];
-       homepage = "https://github.com/tibbe/ekg-json";
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69414,7 +66791,6 @@ self: {
          aeson base bytestring directory ekg-core fast-logger filepath text
          time unix unordered-containers
        ];
-       homepage = "https://github.com/ixmatus/ekg-log";
        description = "Push metrics to a log file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69433,7 +66809,6 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/adinapoli/ekg-prometheus-adapter#readme";
        description = "Easily expose your EKG metrics to Prometheus";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69452,7 +66827,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring ekg-core text time unordered-containers
        ];
-       homepage = "https://github.com/adarqui/ekg-push";
        description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69474,7 +66848,6 @@ self: {
          base ekg-core HUnit test-framework test-framework-hunit text time
          unordered-containers
        ];
-       homepage = "https://bitbucket.org/davecturner/ekg-rrd";
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69493,7 +66866,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring ekg-core network text time unordered-containers
        ];
-       homepage = "https://github.com/tibbe/ekg-statsd";
        description = "Push metrics to statsd";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69514,7 +66886,6 @@ self: {
          aeson base bytestring ekg-core ekg-json filepath http-types network
          text time transformers unordered-containers wai wai-app-static warp
        ];
-       homepage = "https://github.com/tvh/ekg-wai";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69539,7 +66910,6 @@ self: {
        sha256 = "1plqdvyy4ln1cg2195bx6wpylnscj8b7zvks24qmq6sqskhckspr";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://bitbucket.org/ciezbit/elenco-albero";
        description = "make tree from a list";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -69578,7 +66948,6 @@ self: {
        version = "0.1.1";
        sha256 = "1dfbgnwn0jj3lv2fskc2k3m4h0crars2d1p0gpj265r4k58qis36";
        libraryHaskellDepends = [ base elerea SDL ];
-       homepage = "http://github.com/singpolyma/elerea-sdl";
        description = "Elerea FRP wrapper for SDL";
        license = "unknown";
      }) {};
@@ -69590,7 +66959,6 @@ self: {
        version = "0.2.3";
        sha256 = "1m509dh5k9ci87g22gd2j8lfg4hm4wn156gvd86p3r636c5hbdw2";
        libraryHaskellDepends = [ base extensible transformers ];
-       homepage = "https://github.com/fumieval/elevator";
        description = "Immediately lifts to a desired level";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69604,7 +66972,6 @@ self: {
        sha256 = "0mzikwgd3dnzjgj1xa69lgrs38pnvwffvblckrqnwf0h7fd149wy";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
-       homepage = "https://github.com/wangbj/elf";
        description = "Parser for ELF object format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69622,7 +66989,6 @@ self: {
          th-abstraction th-desugar
        ];
        testHaskellDepends = [ base hspec singleton-nats singletons ];
-       homepage = "https://github.com/RyanGlScott/eliminators";
        description = "Dependently typed elimination functions using singletons";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69641,7 +67007,6 @@ self: {
        ];
        testHaskellDepends = [ base hspec singleton-nats singletons ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/RyanGlScott/eliminators";
        description = "Dependently typed elimination functions using singletons";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69657,7 +67022,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base profunctors ];
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/crough/elision#readme";
        description = "Arrows with holes";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -69675,7 +67039,6 @@ self: {
        testHaskellDepends = [
          aeson base containers hspec QuickCheck text
        ];
-       homepage = "https://github.com/agrafix/elm-bridge";
        description = "Derive Elm types and Json code from Haskell types, using aeson's options";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69692,7 +67055,6 @@ self: {
          base bytestring containers elm-compiler elm-core-sources file-embed
          template-haskell
        ];
-       homepage = "http://github.com/JoeyEremondi/elm-build-lib";
        description = "Compile Elm code to JS within Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69731,7 +67093,6 @@ self: {
          test-framework-quickcheck2 text transformers union-find
          unordered-containers
        ];
-       homepage = "http://elm-lang.org";
        description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69747,7 +67108,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers file-embed template-haskell
        ];
-       homepage = "http://github.com/JoeyEremondi/elm-build-lib";
        description = "Source files for the Elm runtime and standard libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69769,7 +67129,6 @@ self: {
          base bytestring containers Diff hspec hspec-core HUnit QuickCheck
          quickcheck-instances text time
        ];
-       homepage = "http://github.com/krisajenkins/elm-export";
        description = "A library to generate Elm types from Haskell source";
        license = "unknown";
      }) {};
@@ -69786,7 +67145,6 @@ self: {
          aeson base elm-export persistent scientific text
          unordered-containers
        ];
-       homepage = "https://github.com/jb55/elm-export-persistent";
        description = "elm-export persistent entities";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
@@ -69813,7 +67171,6 @@ self: {
          directory Elm filepath HTTP http-client http-client-tls http-types
          mtl network optparse-applicative process vector
        ];
-       homepage = "http://github.com/elm-lang/elm-get";
        description = "Tool for sharing and using Elm libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69828,7 +67185,6 @@ self: {
          base directory filepath split text time
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://gitlab.com/paramander/elm-hybrid";
        description = "Combine Elm with Haskell for data based applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69869,7 +67225,6 @@ self: {
          containers directory elm-compiler elm-package filepath mtl
          optparse-applicative text
        ];
-       homepage = "http://elm-lang.org";
        description = "A build tool for Elm projects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69899,7 +67254,6 @@ self: {
          http-types mtl network optparse-applicative pretty process text
          time unordered-containers vector zip-archive
        ];
-       homepage = "http://github.com/elm-lang/elm-package";
        description = "Package manager for Elm libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69924,7 +67278,6 @@ self: {
          snap-server system-filepath text time transformers
          unordered-containers websockets websockets-snap
        ];
-       homepage = "http://elm-lang.org";
        description = "Interactive development tool for Elm programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69950,7 +67303,6 @@ self: {
          elm-package filepath haskeline HUnit mtl parsec process QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/elm-lang/elm-repl";
        description = "a REPL for Elm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -69970,7 +67322,6 @@ self: {
          base bytestring cmdargs containers directory Elm filepath mtl
          process snap-core snap-server unordered-containers
        ];
-       homepage = "http://elm-lang.org";
        description = "Server for developing Elm projects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70000,7 +67351,6 @@ self: {
          aeson base concurrent-extra hspec http-types mtl network text wai
          warp websockets
        ];
-       homepage = "http://github.com/rhyskeepence/elm-websocket";
        description = "Generate ELM code from a Wai websocket application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70017,7 +67367,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-markup Elm shakespeare-js text yesod-core
        ];
-       homepage = "http://elm-lang.org";
        description = "The Elm language Yesod compatibility module";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70030,7 +67379,6 @@ self: {
        sha256 = "0bfabxy48jdcnhplvjb4n42m3yl4by2r00gsy627mw8qaw3iinrb";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty ];
-       homepage = "http://github.com/mfine/elo";
        description = "Elo Rating Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70051,7 +67399,6 @@ self: {
          base hlint MonadRandom proctest QuickCheck random tasty
          tasty-quickcheck tasty-th
        ];
-       homepage = "https://www.github.com/sgillespie/elocrypt";
        description = "Generate easy-to-remember, hard-to-guess passwords";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70074,7 +67421,6 @@ self: {
        ];
        executableHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base directory filepath tasty tasty-hunit ];
-       homepage = "http://github.com/ucsd-progsys/elsa";
        description = "A tiny language for understanding the lambda-calculus";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70094,7 +67440,6 @@ self: {
        testHaskellDepends = [
          base doctest tasty tasty-hspec tasty-quickcheck xkbcommon
        ];
-       homepage = "https://github.com/cocreature/emacs-keys";
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70134,7 +67479,6 @@ self: {
          base bytestring case-insensitive containers QuickCheck tasty
          tasty-quickcheck text time
        ];
-       homepage = "http://github.com/knrafto/email-header";
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70167,7 +67511,6 @@ self: {
          attoparsec base bytestring template-haskell
        ];
        testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
-       homepage = "https://github.com/Porges/email-validate-hs";
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70179,7 +67522,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "06fwm2m83pqp1l4sij7vmxhcry2w8dcp52cwwvpkfimw8iszxqqc";
        libraryHaskellDepends = [ aeson base email-validate text ];
-       homepage = "https://github.com/mwotton/email-validate-json#readme";
        description = "Aeson instances for email-validate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70224,7 +67566,6 @@ self: {
          product-profunctors profunctors text
        ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/emailaddress#readme";
        description = "Wrapper around email-validate library adding instances for common type classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70236,8 +67577,8 @@ self: {
      }:
      mkDerivation {
        pname = "emailparse";
-       version = "0.2.0.8";
-       sha256 = "1x6hzmmsmdyqbcsx3sfgzi59y21ps7knz5hdinsyg1s30i22zgkz";
+       version = "0.2.0.9";
+       sha256 = "13fg4sly6a3v8xy9prrn9nh3ly14y8k2jghr9b7dmyi7pvmlpss7";
        libraryHaskellDepends = [
          attoparsec base bytestring either either-unwrap mime MissingH
          strptime text text-icu time word8
@@ -70264,7 +67605,6 @@ self: {
        executableHaskellDepends = [
          base filepath her-lexer MissingH process
        ];
-       homepage = "https://github.com/nushio3/embeddock";
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70277,7 +67617,6 @@ self: {
        version = "0.1";
        sha256 = "07xc7kdnlbfwr08zhgjphbcmn8ycilp6pna3nk4y0w2hw87g7db0";
        libraryHaskellDepends = [ base embeddock time ];
-       homepage = "https://github.com/nushio3/embeddock-example";
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70297,7 +67636,6 @@ self: {
          base bytestring dlist gloss haskell98 HCodecs mtl
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://ludflu@github.com/ludflu/embroidery.git";
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70311,7 +67649,6 @@ self: {
        sha256 = "0cpcwrb6wqwq371wqjmhzfhdwk3vfhjjgz4vgjsjvw6cdhbpw5p1";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit QuickCheck syb ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM";
        description = "Extensible and Modular Generics for the Masses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70331,7 +67668,6 @@ self: {
          aeson base bytestring template-haskell text unordered-containers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/nakaji-dayo/hs-emoji#readme";
        description = "emoji utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70354,7 +67690,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0h68fff0qpyapkpsqcd6mgg8nyxcbjsw389dv8z8vm4hrqh1pip5";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/vadimvinnik/empty-monad";
        description = "A container that always has no values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70371,7 +67706,6 @@ self: {
        libraryPkgconfigDepends = [ enchant ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/kseo/enchant#readme";
        description = "Binding to the Enchant library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70395,7 +67729,6 @@ self: {
          async base deepseq hspec lifted-base monad-control QuickCheck stm
          transformers transformers-base
        ];
-       homepage = "https://github.com/jcristovao/enclosed-exceptions";
        description = "Catching all exceptions from within an enclosed computation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -70412,7 +67745,6 @@ self: {
        testHaskellDepends = [
          base bytestring QuickCheck quickcheck-instances text
        ];
-       homepage = "https://github.com/minad/encode-string#readme";
        description = "Safe string conversion and encoding";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -70434,7 +67766,6 @@ self: {
          ghc-prim mtl regex-compat
        ];
        testHaskellDepends = [ base bytestring HUnit QuickCheck ];
-       homepage = "http://code.haskell.org/encoding/";
        description = "A library for various character encodings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70449,7 +67780,6 @@ self: {
        libraryHaskellDepends = [
          base chunked-data deepseq transformers-base
        ];
-       homepage = "https://github.com/TerrorJack/encoding-io#readme";
        description = "Encoding-aware file I/O";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70468,7 +67798,6 @@ self: {
        libraryHaskellDepends = [
          base between data-default-class mtl transformers
        ];
-       homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70488,7 +67817,6 @@ self: {
        testHaskellDepends = [
          base containers doctest tasty tasty-hunit text
        ];
-       homepage = "https://github.com/ChrisCoffey/eng-stemmer";
        description = "An English language stemmer (Porter2)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70507,7 +67835,6 @@ self: {
          free monad-loops mwc-random stm stm-delay text transformers
          unordered-containers vector websockets
        ];
-       homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70528,7 +67855,6 @@ self: {
          pipes-attoparsec pipes-wai socket-io text transformers
          unordered-containers wai wai-websockets websockets
        ];
-       homepage = "http://github.com/iand675/growler";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -70546,7 +67872,6 @@ self: {
          base bytestring containers engine-io io-streams lifted-base
          snap-core unordered-containers websockets websockets-snap
        ];
-       homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -70565,7 +67890,6 @@ self: {
          transformers transformers-compat unordered-containers wai
          wai-websockets websockets
        ];
-       homepage = "http://github.com/ocharles/engine.io";
        description = "An @engine-io@ @ServerAPI@ that is compatible with @Wai@";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70626,7 +67950,6 @@ self: {
        sha256 = "1l3lfigqvdlmxkz1wl7zdkmc0i2r5p6z4xzhiw8xdsbsw7aljfkl";
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base bytestring unix ];
-       homepage = "https://github.com/TomMD/entropy";
        description = "A platform independent entropy source";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70641,12 +67964,27 @@ self: {
        sha256 = "1ahz5g148l6sax3dy505na2513i99c7bxix68jja5kbx4f271zcf";
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base bytestring unix ];
-       homepage = "https://github.com/TomMD/entropy";
        description = "A platform independent entropy source";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "enum-subset-generate" = callPackage
+    ({ mkDerivation, base, generic-random, hspec, microlens, QuickCheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "enum-subset-generate";
+       version = "0.1.0.0";
+       sha256 = "10a5n6bvg5pfc947sa5wijsysha3008bqwdkpl3mpvlmjh4c41yx";
+       libraryHaskellDepends = [ base microlens template-haskell ];
+       testHaskellDepends = [
+         base generic-random hspec microlens QuickCheck template-haskell
+       ];
+       description = "Generate an ADT being a subset of another ADT, and the corresponding mappings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "enumerable" = callPackage
     ({ mkDerivation, base, control-monad-omega, tagged }:
      mkDerivation {
@@ -70673,7 +68011,6 @@ self: {
          vinyl
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/sboosali/enumerate";
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -70694,7 +68031,6 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "http://github.com/sboosali/enumerate-function#readme";
        description = "simple package for inverting functions and testing totality, via brute enumeration of the domain";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70714,7 +68050,6 @@ self: {
        testHaskellDepends = [
          arith-encode arithmoi base binary Cabal containers heap HUnit-Plus
        ];
-       homepage = "https://github.com/emc2/enumeration";
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70730,7 +68065,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers text transformers
        ];
-       homepage = "https://john-millikin.com/software/enumerator/";
        description = "Reliable, high-performance processing with left-fold enumerators";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -70742,7 +68076,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0xbrkv65m206qlvnjlbfb52kvjhw91rdnihwv3y31p2qj5zlz29p";
        libraryHaskellDepends = [ base enumerator mtl ];
-       homepage = "https://john-millikin.com/software/enumerator/";
        description = "Enumerator instances for monads-fd classes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -70754,7 +68087,6 @@ self: {
        version = "0.1.1";
        sha256 = "0s47j6pf05nwl105i2vwvsn18gis1v96gid85kj49ngb8ax0pjsp";
        libraryHaskellDepends = [ base enumerator monads-tf ];
-       homepage = "https://john-millikin.com/software/enumerator/";
        description = "Enumerator instances for monads-tf classes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -70766,7 +68098,6 @@ self: {
        version = "0.5.1.0";
        sha256 = "1fq4zmhc825bmyslfm7kbsa29qq773cgrz4npj2bcfl0jkbl3ndc";
        libraryHaskellDepends = [ base enummapset-th ];
-       homepage = "https://github.com/liyang/enumfun";
        description = "Finitely represented /total/ EnumMaps";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70804,7 +68135,6 @@ self: {
        version = "0.5.2.2";
        sha256 = "0x6fihrgvb2y6m0z2gi8n97b54aidydd8fnbmj02bq3x73gxnbvr";
        libraryHaskellDepends = [ base containers deepseq semigroups ];
-       homepage = "https://github.com/michalt/enummapset";
        description = "IntMap and IntSet with Enum keys/elements";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70818,7 +68148,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq template-haskell
        ];
-       homepage = "https://github.com/tsurucapital/enummapset-th";
        description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70844,7 +68173,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1wgw8z144w5l9sns44jf9acld5zx06jw2yg7m2yq868lwfwzxwgj";
        libraryHaskellDepends = [ base old-locale time ];
-       homepage = "https://github.com/Ongy/locale-hs";
        description = "A (non-forking) interface to the current locale";
        license = "LGPL";
      }) {};
@@ -70863,7 +68191,6 @@ self: {
          bytestring containers http-types mtl network old-locale text time
          transformers
        ];
-       homepage = "http://github.com/tel/env-parser";
        description = "Pull configuration information from the ENV";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70879,7 +68206,6 @@ self: {
        sha256 = "1ybyhq3yfcyaj1q1pwm41xzyfjdkmy6lls0n7kn5ks06z7inykfg";
        libraryHaskellDepends = [ aeson base http-api-data mtl text ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/envelope#readme";
        description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70892,7 +68218,6 @@ self: {
        sha256 = "0gc0h9cyrszydfkbbsmm48qdilwannbb9js5x9iqzhyk1v6xg7dz";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec text ];
-       homepage = "https://supki.github.io/envparse";
        description = "Parse environment variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -70924,7 +68249,6 @@ self: {
        version = "2.0.12.4";
        sha256 = "1jpz58zlkhgf2fl4fzicpdkqqdbwy3sw56dga8yvjmgv5zcqqshx";
        libraryHaskellDepends = [ base ];
-       homepage = "http://epanet.de/developer/haskell.html";
        description = "Haskell binding for EPANET";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70937,7 +68261,6 @@ self: {
        version = "0.2.1";
        sha256 = "0sg5pipzc4s9xq83ari7rigjbvhyh76kqnp57i98bs3k54ba53ym";
        libraryHaskellDepends = [ base stm time ];
-       homepage = "http://github.com/baldo/epass";
        description = "Baisc, Erlang-like message passing supporting sockets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70956,7 +68279,6 @@ self: {
        executableHaskellDepends = [
          array base Cabal directory mtl process
        ];
-       homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70971,7 +68293,6 @@ self: {
        revision = "1";
        editedCabalFile = "1f0asynn06lr4mjn0cf29a624pfn45n2vddmamv8plxmdg176mi1";
        libraryHaskellDepends = [ base unix ];
-       homepage = "https://gitlab.com/twittner/epoll";
        description = "epoll bindings";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71025,7 +68346,6 @@ self: {
          base bytestring directory filepath HUnit hxt mtl regex-compat-tdfa
          utf8-string zip-archive
        ];
-       homepage = "http://hub.darcs.net/dino/epub-metadata";
        description = "Library for parsing epub document metadata";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71047,7 +68367,6 @@ self: {
        testHaskellDepends = [
          base directory epub-metadata filepath HUnit mtl parsec regex-compat
        ];
-       homepage = "https://github.com/dino-/epub-tools.git";
        description = "Command line utilities for working with epub files";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -71064,7 +68383,6 @@ self: {
        executableHaskellDepends = [
          base directory epub-metadata mtl regex-compat
        ];
-       homepage = "http://ui3.info/d/proj/epubname.html";
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71077,7 +68395,6 @@ self: {
        version = "4.1";
        sha256 = "10k1xnvga7c6ijmkfq2qd4vc5i2lnkz4xjmba74g0xzhk6gkvp0n";
        libraryHaskellDepends = [ base semigroupoids ];
-       homepage = "http://github.com/ekmett/eq/";
        description = "Leibnizian equality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71089,7 +68406,6 @@ self: {
        version = "4.2";
        sha256 = "1s3h77i0h4z3dg97sqqjl027rz0k82h48cpzp0c7a75g0qx70q21";
        libraryHaskellDepends = [ base semigroupoids ];
-       homepage = "http://github.com/ekmett/eq/";
        description = "Leibnizian equality";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71109,7 +68425,6 @@ self: {
          base bytestring explicit-exception filemanip transformers
          utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/equal-files/";
        description = "Shell command for finding equal files";
        license = "GPL";
      }) {};
@@ -71149,7 +68464,6 @@ self: {
          test-framework test-framework-quickcheck2 transformers
          transformers-compat
        ];
-       homepage = "https://github.com/pa-ba/equivalence";
        description = "Maintaining an equivalence relation implemented as union-find using STT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71167,7 +68481,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers graphviz parsec text
        ];
-       homepage = "https://github.com/BurntSushi/erd";
        description = "An entity-relationship diagram generator from a plain text description";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71191,7 +68504,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "0i031ws189rjl5gn44qpkfylx8kz7rdf3nzw9h0dmy2h86xbkckc";
        libraryHaskellDepends = [ base polynomial ];
-       homepage = "http://code.haskell.org/~mokus/erf-native";
        description = "Native Haskell implementation of the interface from the erf package";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71208,7 +68520,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring directory filepath MissingH network random
        ];
-       homepage = "http://github.com/gombocarti/erlang-ffi";
        description = "FFI interface to Erlang";
        license = "GPL";
      }) {};
@@ -71306,7 +68617,6 @@ self: {
          safe-exceptions tasty tasty-hunit text unliftio-core
          unordered-containers
        ];
-       homepage = "https://github.com/mtesseract/error-context#readme";
        description = "Provides API for enriching errors with contexts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71319,7 +68629,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0rv59fhlfr03qis957mjgl4gyk1i5axfyvr680z3ykbfd3k5gc1s";
        libraryHaskellDepends = [ base either mtl transformers ];
-       homepage = "https://github.com/echatav/error-continuations";
        description = "Error Continuations";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71332,7 +68641,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0k0rpscg4h55215mgkd72yd5la3f2im21vlsgyg7v4pkrxd1cj1j";
        libraryHaskellDepends = [ base mtl text text-render ];
-       homepage = "http://github.com/thinkpad20/error-list";
        description = "A useful type for collecting error messages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71345,7 +68653,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0ch7c537fp52yg3qmc1v9rs4y70cc0zyb3g3i0bmmhgdhxd90bm5";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/joelteon/error-loc";
        description = "An error replacement with call-site metadata";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71358,7 +68665,6 @@ self: {
        version = "0.1.5.5";
        sha256 = "1gfi3jvag662xbsiv75ndb8p9s3c7j6lny15a9gqk8wd4l71myid";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/gregwebs/ErrorLocation.hs";
        description = "error functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71374,7 +68680,6 @@ self: {
        libraryHaskellDepends = [
          ansi-wl-pprint base containers either-unwrap InfixApplicative mtl
        ];
-       homepage = "http://github.com/gcross/error-message";
        description = "Composable error messages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71387,7 +68692,6 @@ self: {
        version = "0.0.1.2";
        sha256 = "01jfbq43ps6wjl9z5l1g8zfdi225mfn3xy59n6vrfxh0vsi1c6fz";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/pmlodawski/error-util";
        description = "Set of utils and operators for error handling";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -71450,7 +68754,6 @@ self: {
        testHaskellDepends = [
          base errors exceptions HUnit monad-control mtl transformers
        ];
-       homepage = "https://github.com/A1-Triard/errors-ext#readme";
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -71474,7 +68777,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/ersaconcat";
        description = "A script to concatenate AIP ERSA";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71504,7 +68806,6 @@ self: {
          array base containers lens mtl parsec semigroups
        ];
        testHaskellDepends = [ array base directory doctest filepath mtl ];
-       homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71523,7 +68824,6 @@ self: {
        libraryHaskellDepends = [
          array base containers ersatz toysolver transformers
        ];
-       homepage = "https://github.com/msakai/ersatz-toysat";
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71547,7 +68847,6 @@ self: {
        executableHaskellDepends = [
          aeson attoparsec base bytestring yaml
        ];
-       homepage = "https://bitbucket.org/kayo/ert";
        description = "Easy Runtime Templates";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71565,7 +68864,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec QuickCheck silently text
        ];
-       homepage = "https://github.com/EarthCitizen/escape-artist#readme";
        description = "ANSI Escape Sequence Text Decoration Made Easy";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71616,7 +68914,6 @@ self: {
          stream-fusion tuple unix
        ];
        doHaddock = false;
-       homepage = "http://www.killersmurf.com/projects/esotericbot";
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71641,7 +68938,6 @@ self: {
          persistent persistent-sqlite persistent-template QuickCheck
          resourcet text transformers
        ];
-       homepage = "https://github.com/bitemyapp/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71654,7 +68950,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0pxrs9vr6gc61md9q4rxdc5fikvjandqw2rygs0xamrqlna51bcq";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/michaelochurch/ess";
        description = "The type-level S combinator in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71670,7 +68965,6 @@ self: {
        libraryHaskellDepends = [
          ad base distributive lens linear reflection
        ];
-       homepage = "https://github.com/GaloisInc/estimator";
        description = "State-space estimation algorithms such as Kalman Filters";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71704,7 +68998,6 @@ self: {
        executableHaskellDepends = [
          base bio bytestring containers random
        ];
-       homepage = "http://blog.malde.org/";
        description = "Repeats from ESTs";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71723,7 +69016,6 @@ self: {
          aeson base hashable rio text typed-process unliftio
        ];
        testHaskellDepends = [ aeson base rio tasty tasty-hunit ];
-       homepage = "https://github.com/roman/Haskell-etc";
        description = "Declarative configuration spec for Haskell projects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71781,7 +69073,6 @@ self: {
          cereal directory potoki potoki-cereal QuickCheck
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/metrix-ai/eternity";
        description = "Native event-sourcing database";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71800,7 +69091,6 @@ self: {
          attoparsec base cereal directory eternity generic-random hashable
          potoki QuickCheck text time timestamp
        ];
-       homepage = "https://github.com/metrix-ai/eternity-timestamped";
        description = "Automatic timestamping for Eternity";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71830,7 +69120,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq lens mtl transformers
        ];
-       homepage = "https://int-index.github.io/ether/";
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -71854,7 +69143,6 @@ self: {
          base bytestring ethereum-analyzer-deps extra GenericPretty hoopl
          hspec protolude text wl-pprint-text
        ];
-       homepage = "https://github.com/zchn/ethereum-analyzer";
        description = "A Ethereum contract analyzer";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71883,7 +69171,6 @@ self: {
        executableHaskellDepends = [
          base ethereum-analyzer-deps hflags monad-logger protolude
        ];
-       homepage = "https://github.com/zchn/ethereum-analyzer";
        description = "A CLI frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -71930,7 +69217,6 @@ self: {
        executableHaskellDepends = [
          base ethereum-analyzer ethereum-analyzer-deps hflags monad-logger
        ];
-       homepage = "https://github.com/zchn/ethereum-analyzer";
        description = "A web frontend for ethereum-analyzer";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72058,7 +69344,6 @@ self: {
        ];
        testToolDepends = [ happy ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/decomputed/euler";
        description = "Mathematics utilities for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72080,7 +69365,6 @@ self: {
          base containers keys QuickCheck sequence tasty tasty-hunit
          tasty-quickcheck
        ];
-       homepage = "https://github.com/k0ral/euler-tour-tree";
        description = "Euler tour trees";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -72105,7 +69389,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq enummapset-th unordered-containers
        ];
-       homepage = "http://github.com/tsurucapital/euphoria";
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72143,7 +69426,6 @@ self: {
        testHaskellDepends = [
          base data-default hspec hspec-core lens mtl
        ];
-       homepage = "https://github.com/ChrisPenner/eve#readme";
        description = "An extensible event framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72161,7 +69443,6 @@ self: {
          base bytestring eve lens mtl text vty
        ];
        testHaskellDepends = [ base bytestring eve lens mtl text vty ];
-       homepage = "https://github.com/ChrisPenner/eve-cli#readme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -72197,7 +69478,6 @@ self: {
        version = "0.0.0.3";
        sha256 = "1515v1khdkr145z5inrm2ardhpzfsbncpl5wmfd9nmilw97da9ld";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://code.haskell.org/~mokus/event-handlers";
        description = "Event handlers";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -72217,7 +69497,6 @@ self: {
          base non-negative QuickCheck random semigroups transformers
          utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/event-list/";
        description = "Event lists with relative or absolute time stamps";
        license = "GPL";
      }) {};
@@ -72234,7 +69513,6 @@ self: {
          base containers event-handlers haskell98 monad-loops mtl pretty
          prettyclass priority-queue stateref
        ];
-       homepage = "http://code.haskell.org/~mokus/event-monad";
        description = "Event-graph simulation monad transformer";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72251,7 +69529,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/schell/event-transformer#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72274,7 +69551,6 @@ self: {
          path-pieces sum-type-boilerplate template-haskell text transformers
          uuid
        ];
-       homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Core module for eventful";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72298,7 +69574,6 @@ self: {
          eventful-core eventful-test-helpers hspec HUnit lens QuickCheck
          quickcheck-instances safe text unordered-containers vector
        ];
-       homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Library for eventful DynamoDB event stores";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72319,7 +69594,6 @@ self: {
          base containers eventful-core eventful-test-helpers hspec HUnit mtl
          safe stm
        ];
-       homepage = "https://github.com/jdreaver/eventful#readme";
        description = "In-memory implementations for eventful";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72342,7 +69616,6 @@ self: {
          eventful-test-helpers hspec HUnit mtl persistent
          persistent-postgresql text
        ];
-       homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Postgres implementations for eventful";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72360,7 +69633,6 @@ self: {
          aeson base bytestring eventful-core mtl persistent
          persistent-template text uuid
        ];
-       homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Common library for SQL event stores";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72383,7 +69655,6 @@ self: {
          eventful-test-helpers hspec HUnit mtl persistent persistent-sqlite
          text uuid
        ];
-       homepage = "https://github.com/jdreaver/eventful#readme";
        description = "SQLite implementations for eventful";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72399,7 +69670,6 @@ self: {
        libraryHaskellDepends = [
          aeson aeson-casing base eventful-core extra hspec monad-logger text
        ];
-       homepage = "https://github.com/jdreaver/eventful#readme";
        description = "Common module used for eventful tests";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72416,7 +69686,6 @@ self: {
          aeson base bytestring concurrent-utilities deepseq network stm
          suspend text timers websockets
        ];
-       homepage = "-";
        description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72437,11 +69706,30 @@ self: {
          lifted-base monad-control monad-loops mtl stm stm-chans
          string-conversions text transformers-base unordered-containers uuid
        ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "Provides an eventsourcing high level API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "eventsource-api_1_3_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , enclosed-exceptions, lifted-async, lifted-base, monad-control
+     , monad-loops, mtl, stm, stm-chans, string-conversions, text
+     , transformers-base, unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "eventsource-api";
+       version = "1.3.1";
+       sha256 = "0dlrbc3xxijz1hf8w34lvk70ic6gsfb9j5z3ldqdssvv9c8fksy2";
+       libraryHaskellDepends = [
+         aeson base bytestring containers enclosed-exceptions lifted-async
+         lifted-base monad-control monad-loops mtl stm stm-chans
+         string-conversions text transformers-base unordered-containers uuid
+       ];
+       description = "Provides an eventsourcing high level API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eventsource-geteventstore-store" = callPackage
     ({ mkDerivation, aeson, base, eventsource-api
      , eventsource-store-specs, eventstore, mtl, protolude
@@ -72459,7 +69747,6 @@ self: {
          base eventsource-api eventsource-store-specs eventstore protolude
          tasty tasty-hspec
        ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "GetEventStore store implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72477,7 +69764,6 @@ self: {
          aeson async base eventsource-api mtl tasty tasty-hspec text
          transformers-base uuid
        ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "Provides common test specification for Store implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72498,7 +69784,6 @@ self: {
          aeson base eventsource-api eventsource-store-specs protolude tasty
          tasty-hspec
        ];
-       homepage = "https://github.com/YoEight/eventsource-api#readme";
        description = "An in-memory stub store implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72520,7 +69805,6 @@ self: {
        testHaskellDepends = [
          base blaze-builder bytestring HUnit wai-extra
        ];
-       homepage = "https://github.com/richardTowers/eventsourced#readme";
        description = "Server-Sent Events the UNIX way";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72554,7 +69838,41 @@ self: {
          semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
          transformers-base unordered-containers uuid
        ];
-       homepage = "https://github.com/YoEight/eventstore#readme";
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "eventstore_1_1_4" = callPackage
+    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
+     , cereal, clock, connection, containers, dns, dotnet-timespan
+     , ekg-core, exceptions, fast-logger, hashable, http-client
+     , interpolate, lifted-async, lifted-base, machines, monad-control
+     , monad-logger, mono-traversable, mtl, protobuf, random
+     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
+     , tasty-hunit, text, time, transformers-base, unordered-containers
+     , uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "1.1.4";
+       sha256 = "0xhhw5dxq1h4w7dpngrhnaipzhfpzvs4y7jdvimzk86hvgv0mmfj";
+       libraryHaskellDepends = [
+         aeson array base bifunctors bytestring cereal clock connection
+         containers dns dotnet-timespan ekg-core exceptions fast-logger
+         hashable http-client interpolate lifted-async lifted-base machines
+         monad-control monad-logger mono-traversable mtl protobuf random
+         safe-exceptions semigroups stm stm-chans text time
+         transformers-base unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring cereal connection containers
+         dotnet-timespan exceptions fast-logger hashable lifted-async
+         lifted-base monad-control mono-traversable protobuf safe-exceptions
+         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
+         transformers-base unordered-containers uuid
+       ];
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -72568,7 +69886,6 @@ self: {
        version = "0.0.1";
        sha256 = "1rc0g5rn8hzglm2b4biaf8jvj5kb2j1s5vsxnm24q2gvrvjg03sx";
        libraryHaskellDepends = [ async base stm ];
-       homepage = "https://github.com/athanclark/every#readme";
        description = "Run a process every so often";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72580,7 +69897,6 @@ self: {
        version = "0.1";
        sha256 = "0r959iyd5nsw3sj7p0gwsccdgaald9lwisg0lvq9qynyz09kh4vj";
        libraryHaskellDepends = [ base haskell98 ];
-       homepage = "http://research.microsoft.com/en-us/people/dimitris/pearl.pdf";
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72600,7 +69916,6 @@ self: {
          array base containers mtl pretty transformers
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://github.com/jfcmacro/ewe";
        description = "A language for teaching simple programming languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72617,7 +69932,6 @@ self: {
        libraryHaskellDepends = [
          base exceptions hashable stm time transformers vector
        ];
-       homepage = "https://github.com/kim/ex-pool";
        description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72629,7 +69943,6 @@ self: {
        version = "0.2.0.8";
        sha256 = "0pj7sh6s1kawk39hb42q1sx20g2rmzanpmr3zri9yvmb16qj5a1j";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Efficient exact computation of combinatoric functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72644,7 +69957,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers tasty tasty-hunit ];
-       homepage = "https://github.com/arthurl/exact-cover";
        description = "Efficient exact cover solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72657,7 +69969,6 @@ self: {
        version = "0.4.1.3";
        sha256 = "1r1cjyz6aqbq8ydn3gq4107n3hnd6zbygj7pw299nqdaag38g7jf";
        libraryHaskellDepends = [ base numtype-dk semigroups ];
-       homepage = "https://github.com/dmcclean/exact-pi/";
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72677,7 +69988,6 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://github.com/expipiplus1/exact-real";
        description = "Exact real arithmetic";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72704,7 +70014,6 @@ self: {
        revision = "1";
        editedCabalFile = "09i2w1ry7vmjc0a4d05a4hs7kdj3brn5jrxsy638f6acj41g5dhk";
        libraryHaskellDepends = [ base exceptions transformers ];
-       homepage = "https://github.com/thumphries/except-exceptions";
        description = "Safely deal with exceptions in ExceptT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72716,7 +70025,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1zk06z8fwr4g701c79vvsqmagjcm2h850d9m96zrig08kz3lshm9";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "yet";
        description = "Exception type hierarchy with TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72729,7 +70037,6 @@ self: {
        version = "0.4.1";
        sha256 = "068zhr90gldin0f6xafqp1pncf6rhhm3gagnvn6r3p0kx060ia23";
        libraryHaskellDepends = [ base hslogger mime-mail text ];
-       homepage = "https://github.com/drpowell/exception-mailer";
        description = "Catch all runtime exceptions and send an email";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72745,7 +70052,6 @@ self: {
        libraryHaskellDepends = [
          base exception-transformers monads-fd transformers
        ];
-       homepage = "http://www.eecs.harvard.edu/~mainland/";
        description = "Exception monad transformer instances for monads-fd classes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72808,7 +70114,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "01lzx4ihdvyivjnkvn78hcdsk83dvm6iy9v5q1f28kd1iv96x1ns";
        libraryHaskellDepends = [ base exceptions ];
-       homepage = "https://github.com/";
        description = "Essentially the Maybe type with error messages";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -72831,7 +70136,6 @@ self: {
          base mtl QuickCheck stm template-haskell test-framework
          test-framework-quickcheck2 transformers transformers-compat
        ];
-       homepage = "http://github.com/ekmett/exceptions/";
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -72853,7 +70157,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
          transformers-compat
        ];
-       homepage = "http://github.com/ekmett/exceptions/";
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72869,7 +70172,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base directory process text ];
-       homepage = "https://github.com/wapxmas/execs#readme";
        description = "Tool to run stack exec prj-exe more easy";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72895,7 +70197,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/fpco/executable-hash";
        description = "Provides the SHA1 hash of the program executable";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -72907,7 +70208,6 @@ self: {
        version = "0.0.3.1";
        sha256 = "0vxwmnsvx13cawcyhbyljkds0l1vr996ijldycx7nj0asjv45iww";
        libraryHaskellDepends = [ base directory filepath unix ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Finding out the full path of the executable";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -72920,7 +70220,6 @@ self: {
        sha256 = "0knqdlq3ziwpx5dx7i015009ks1qyhzs8cz0sx383xy5im5wcrg7";
        libraryHaskellDepends = [ async base process ];
        testHaskellDepends = [ async base doctest hspec process ];
-       homepage = "https://github.com/GianlucaGuarini/executor";
        description = "Shell helpers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72952,7 +70251,6 @@ self: {
          base containers data-pprint deepseq either haskell-src-exts hood
          mtl multistate process transformers
        ];
-       homepage = "https://github.com/lspitzner/exference";
        description = "Tool to search/generate (haskell) expressions with a given type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72968,7 +70266,6 @@ self: {
        libraryHaskellDepends = [
          base generics-sop template-haskell transformers
        ];
-       homepage = "http://github.com/ocharles/exhaustive";
        description = "Compile time checks that a computation considers producing data through all possible constructors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73029,7 +70326,6 @@ self: {
          hashable profunctors QuickCheck serialise singletons tasty
          tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/k0001/exinst";
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73044,7 +70340,6 @@ self: {
        libraryHaskellDepends = [
          aeson base constraints exinst singletons
        ];
-       homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for the `aeson` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73059,7 +70354,6 @@ self: {
        libraryHaskellDepends = [
          base bytes constraints exinst singletons
        ];
-       homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for the `bytes` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73072,7 +70366,6 @@ self: {
        version = "0.2";
        sha256 = "0q9fq5w6lir3qqybf8d0j0hhs33zsvv1xg49669cv5irl9hixh9z";
        libraryHaskellDepends = [ base constraints deepseq exinst ];
-       homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for the `deepseq` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73087,7 +70380,6 @@ self: {
        libraryHaskellDepends = [
          base constraints exinst hashable singletons
        ];
-       homepage = "https://github.com/k0001/exinst";
        description = "Derive instances for the `hashable` library for your existential types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73122,7 +70414,6 @@ self: {
        version = "0.2";
        sha256 = "1f7v2f7jmqx0nkl2wla88mnb21nava74b73rvsmfbj4kxmwchsgy";
        libraryHaskellDepends = [ base contravariant ];
-       homepage = "http://github.com/glehel/exists";
        description = "Existential datatypes holding evidence of constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73135,7 +70426,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0v8z5wkhyavd7zzcfbjm229mbgp1xcjbz9mvcxnjikcljn5xi181";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/JustusAdam/exit-codes";
        description = "Exit codes as defined by BSD";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73158,7 +70448,6 @@ self: {
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
          transformers
        ];
-       homepage = "https://github.com/qfpl/exitcode";
        description = "Monad transformer for exit codes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73171,8 +70460,8 @@ self: {
      }:
      mkDerivation {
        pname = "exp-cache";
-       version = "0.1.0.0";
-       sha256 = "01y5kxskbai7a34xkr1b0clsawj3583m3m7l86zziyjfsbn048nm";
+       version = "0.1.0.1";
+       sha256 = "0yg5p3682fgkb0cn8gyb01zr9qy7y5maqzc6ssc04w9ll06l66jd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73183,7 +70472,6 @@ self: {
        testHaskellDepends = [
          base HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/ChrisCoffey/exp-cache#readme";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -73196,7 +70484,6 @@ self: {
        revision = "2";
        editedCabalFile = "050v0c9l9gi1bxpqbfcl2j9mdiv7xdh1mdfwymxcgpjydv60xwh0";
        libraryHaskellDepends = [ base compensated log-domain ];
-       homepage = "https://code.mathr.co.uk/exp-extended";
        description = "floating point with extended exponent range";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73218,7 +70505,6 @@ self: {
          base matrix QuickCheck random smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "https://github.com/Bodigrim/exp-pairs";
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -73248,7 +70534,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring enumerator hexpat text transformers xml-types
        ];
-       homepage = "http://john-millikin.com/software/expat-enumerator/";
        description = "Enumerator-based API for Expat";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73268,7 +70553,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers hashable time unordered-containers
        ];
-       homepage = "https://github.com/elblake/expiring-cache-map";
        description = "General purpose simple caching";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73290,7 +70574,6 @@ self: {
          base containers hashable int-multimap quickcheck-instances tasty
          tasty-hunit tasty-quickcheck time timestamp unordered-containers
        ];
-       homepage = "https://github.com/metrix-ai/expiring-containers";
        description = "Expiring containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73318,7 +70601,6 @@ self: {
        executableHaskellDepends = [
          ansi-wl-pprint base haskell-src-exts
        ];
-       homepage = "https://github.com/joelteon/explain";
        description = "Show how expressions are parsed";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73332,7 +70614,6 @@ self: {
        sha256 = "181frvmgv65rcjpiya4gswvpq9ahz97c8lalhgmwknx9jx5nqd98";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/leftaroundabout/explicit-constraint-lens";
        description = "Fully-flexible polymorphic lenses, without any bizarre profunctors";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -73344,7 +70625,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0g20kblzvhx53mi82frpx29x0nsfjrzsanqq8f6yw22lh47pbm4y";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jwaldmann/haskell-explicit-determinant";
        description = "explicit computation of determinant of small matrices";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73359,7 +70639,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq semigroups transformers ];
-       homepage = "http://www.haskell.org/haskellwiki/Exception";
        description = "Exceptions which are explicit in the type signature";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73371,7 +70650,6 @@ self: {
        version = "0.6.0.5";
        sha256 = "0irz1zy6iaipym73x343zvr6cqym6ci2vbjbyr564d29ymd6ldzd";
        libraryHaskellDepends = [ base base-unicode-symbols tagged ];
-       homepage = "https://github.com/basvandijk/explicit-iomodes/";
        description = "File handles with explicit IOModes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73384,7 +70662,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "0h3dlgkd2gx8zr3sh949nhqgrdg943dgpp4v1n599jjjpqpw16hj";
        libraryHaskellDepends = [ base bytestring explicit-iomodes ];
-       homepage = "https://github.com/basvandijk/explicit-iomodes-bytestring/";
        description = "Extends explicit-iomodes with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73397,7 +70674,6 @@ self: {
        version = "0.1.0.8";
        sha256 = "12ny5wa1j1wp8fbg5k8zkv4a3axmssxcvfvhg3frsm4dych6hmyg";
        libraryHaskellDepends = [ base explicit-iomodes text ];
-       homepage = "https://github.com/basvandijk/explicit-iomodes-text/";
        description = "Extends explicit-iomodes with Text operations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73412,7 +70688,6 @@ self: {
        libraryHaskellDepends = [
          base containers derive mtl template-haskell
        ];
-       homepage = "http://sebfisch.github.com/explicit-sharing";
        description = "Explicit Sharing of Monadic Effects";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73427,7 +70702,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base directory pngload ];
-       homepage = "http://corsis.sourceforge.net/haskell/explore";
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73538,7 +70812,6 @@ self: {
          network old-locale regex-tdfa smartGroup stringsearch time xhtml
          xml
        ];
-       homepage = "http://patch-tag.com/r/salazar/extemp";
        description = "automated printing for extemp speakers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73551,7 +70824,6 @@ self: {
        version = "0.2.0";
        sha256 = "1dg9zvqszlg5v3mygazzgm84qlkcmpryv3vv4x3zwrzi1g0idq72";
        libraryHaskellDepends = [ base constraints ghc-prim tagged ];
-       homepage = "github.com/ian-mi/extended-categories";
        description = "Extended Categories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73570,7 +70842,6 @@ self: {
          base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
          tasty-th
        ];
-       homepage = "https://github.com/msakai/extended-reals/";
        description = "Extension of real numbers with positive/negative infinities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73593,7 +70864,6 @@ self: {
          transformers unordered-containers vector
        ];
        testHaskellDepends = [ base lens QuickCheck template-haskell ];
-       homepage = "https://github.com/fumieval/extensible";
        description = "Extensible, efficient, optics-friendly data types and effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73632,7 +70902,6 @@ self: {
          base criterion HUnit mtl test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
-       homepage = "https://github.com/suhailshergill/extensible-effects";
        description = "An Alternative to Monad Transformers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73656,7 +70925,6 @@ self: {
          base criterion HUnit mtl test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
        ];
-       homepage = "https://github.com/suhailshergill/extensible-effects";
        description = "An Alternative to Monad Transformers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73664,19 +70932,19 @@ self: {
 
   "extensible-effects-concurrent" = callPackage
     ({ mkDerivation, base, containers, directory, extensible-effects
-     , filepath, lens, mtl, parallel, process, QuickCheck, random, stm
-     , tagged, time, transformers
+     , filepath, lens, logging-effect, monad-control, mtl, parallel
+     , process, QuickCheck, random, stm, tagged, time, transformers
      }:
      mkDerivation {
        pname = "extensible-effects-concurrent";
-       version = "0.1.1.0";
-       sha256 = "1zf67f7400n4nvwvvb0znr3aigkhawqnlz911rl79bybcibx85nc";
+       version = "0.1.2.2";
+       sha256 = "0iylnsg2q7gx7y2zi7sfklx71p6lghyink0692clipd7z5915ysf";
        libraryHaskellDepends = [
-         base containers directory extensible-effects filepath lens mtl
-         parallel process QuickCheck random stm tagged time transformers
+         base containers directory extensible-effects filepath lens
+         logging-effect monad-control mtl parallel process QuickCheck random
+         stm tagged time transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/sheyll/extensible-effects-concurrent#readme";
        description = "Message passing concurrency as extensible-effect";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73699,7 +70967,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0s51rvsg41dymk173fxf7065yynlgx234xjs149lzm00gcwv92r6";
        libraryHaskellDepends = [ base lens ];
-       homepage = "https://github.com/githubuser/extensible-sp#readme";
        description = "light-weight, extensible sums and products over types and kinds";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -73729,11 +70996,27 @@ self: {
          base clock directory filepath process time unix
        ];
        testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "extra_1_6_8" = callPackage
+    ({ mkDerivation, base, clock, directory, filepath, process
+     , QuickCheck, time, unix
+     }:
+     mkDerivation {
+       pname = "extra";
+       version = "1.6.8";
+       sha256 = "1kngk46nkrjkpqaj845c6r823r8aawlk1ir693lr6rskhy1k7dlp";
+       libraryHaskellDepends = [
+         base clock directory filepath process time unix
+       ];
+       testHaskellDepends = [ base directory filepath QuickCheck unix ];
+       description = "Extra functions I use";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "extract-dependencies" = callPackage
     ({ mkDerivation, async, base, Cabal, containers
      , package-description-remote
@@ -73750,7 +71033,6 @@ self: {
        executableHaskellDepends = [
          async base Cabal containers package-description-remote
        ];
-       homepage = "https://github.com/yamadapc/stack-run-auto";
        description = "Given a hackage package outputs the list of its dependencies";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73763,7 +71045,6 @@ self: {
        version = "0.0.1";
        sha256 = "1bf0naqx0gb66dr7g58lfaba87zmg09ynzdb3cyyymwcv4l1knp8";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/athanclark/extractable-singleton#readme";
        description = "A functor, where the \"stored\" value is isomorphic to Identity";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73782,7 +71063,6 @@ self: {
          base bytestring bytestring-mmap directory elf filepath
          optparse-applicative
        ];
-       homepage = "https://github.com/Peaker/extractelf";
        description = "Extract an ELF's metadata and sections into files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73799,7 +71079,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls text time
        ];
-       homepage = "https://github.com/wuest/haskell-extralife-api";
        description = "API Client for ExtraLife team and user data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73814,7 +71093,6 @@ self: {
          base leancheck speculate template-haskell
        ];
        testHaskellDepends = [ base leancheck speculate ];
-       homepage = "https://github.com/rudymatela/extrapolate#readme";
        description = "generalize counter-examples of test properties";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73838,7 +71116,6 @@ self: {
          random resourcet string-conversions text time unordered-containers
          vector
        ];
-       homepage = "https://github.com/nikita-volkov/ez-couch";
        description = "A high level static library for working with CouchDB";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73864,7 +71141,6 @@ self: {
        version = "0.0.2.0";
        sha256 = "0apgad2rqpgxypm10n98agmfrlxydcawvsvyafdwj8jhynfycx03";
        libraryHaskellDepends = [ base free ];
-       homepage = "http://github.com/haskell-faceted/haskell-faceted";
        description = "Faceted computation for dynamic information flow security";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73891,7 +71167,6 @@ self: {
          array base containers data-default deepseq primes QuickCheck random
          toolshed
        ];
-       homepage = "https://functionalley.eu/Factory/factory.html";
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
      }) {};
@@ -73909,7 +71184,6 @@ self: {
          aeson attoparsec base bytestring containers curl dataenc hoauth
          HTTP MissingH text unordered-containers utf8-string vector
        ];
-       homepage = "https://github.com/rudyl313/factual-haskell-driver";
        description = "A driver for the Factual API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73922,7 +71196,6 @@ self: {
        version = "1.1.0.1";
        sha256 = "00n5m3fa14y882rnzw7pwc154bgp46rhvvj2cghldvybxmj61zgm";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/bjornbm/fad";
        description = "Forward Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -73945,7 +71218,6 @@ self: {
        testHaskellDepends = [
          base containers hspec hspec-contrib HUnit lens
        ];
-       homepage = "http://github.com/slpopejoy/fadno";
        description = "Minimal library for music generation and notation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73963,7 +71235,6 @@ self: {
          base containers data-default diagrams diagrams-lib
          diagrams-rasterific lens random
        ];
-       homepage = "http://github.com/slpopejoy/";
        description = "Braid representations in Haskell";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73979,7 +71250,6 @@ self: {
        libraryHaskellDepends = [
          base containers Decimal lens mtl parsec xml
        ];
-       homepage = "http://github.com/slpopejoy/fadno-xml";
        description = "XML/XSD combinators/schemas/codegen";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -73992,7 +71262,6 @@ self: {
        version = "4.9.0.0";
        sha256 = "18nlj6xvnggy61gwbyrpmvbdkq928wv0wx2zcsljb52kbhddnp3d";
        doHaddock = false;
-       homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
        description = "Forward-compatible MonadFail class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74015,7 +71284,6 @@ self: {
        version = "0.2.0.3";
        sha256 = "0jimc2x46zq7wnmzfbnqi67jl8yhbvr0fa65ljlc9p3fns9mca3p";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://www.haskell.org/haskellwiki/Failure";
        description = "A simple type class for success/failure computations. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74045,7 +71313,6 @@ self: {
        sha256 = "1z0c83gfmvwhzsj2iz422mxcyxc8jnic25i1vz6yp4xzv41ibmj6";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://sebfisch.github.com/fair-predicates";
        description = "Fair Predicates";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -74062,7 +71329,6 @@ self: {
          base containers generics-sop random text time
        ];
        testHaskellDepends = [ base hspec random text time ];
-       homepage = "https://github.com/mightybyte/fake";
        description = "Randomly generated fake data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74075,7 +71341,6 @@ self: {
        sha256 = "0m1w0qhny6vwnv320irrla82qzdk9ih9zyvi5lkkdj4jiqlsgriw";
        libraryHaskellDepends = [ base base-prelude split X11 ];
        librarySystemDepends = [ libXtst ];
-       homepage = "http://github.com/aelve/fake-type";
        description = "A crossplatform library to simulate keyboard input";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74089,7 +71354,6 @@ self: {
        sha256 = "1wl0jx3adibf7z8k3jadnr90jvkmf3zhkq34qpsifcl18zip8skq";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base gimlh random split ];
-       homepage = "https://github.com/gazay/faker";
        description = "Pure Haskell library for generating fake data";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74109,7 +71373,6 @@ self: {
          base gloss gloss-raster JuicyPixels-repa QuickCheck random repa
          repa-algorithms vector
        ];
-       homepage = "http://github.com/tranma/falling-turnip";
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74129,7 +71392,6 @@ self: {
        executableHaskellDepends = [
          base containers haskell98 SDL SDL-mixer SDL-ttf
        ];
-       homepage = "http://bencode.blogspot.com/2009/03/falling-blocks-tetris-clone-in-haskell.html";
        description = "A fun falling blocks game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74158,7 +71420,6 @@ self: {
          base binary containers hashable intervals lens tables text time
          unordered-containers
        ];
-       homepage = "https://github.com/Taneb/family-tree";
        description = "A family tree library for the Haskell programming language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74173,7 +71434,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74189,7 +71449,6 @@ self: {
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
        benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
-       homepage = "https://github.com/vmchale/fast-arithmetic#readme";
        description = "Fast functions on integers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74211,7 +71470,6 @@ self: {
          scientific template-haskell text true-name unordered-containers
          vector
        ];
-       homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74231,7 +71489,6 @@ self: {
        libraryHaskellDepends = [ base composition-prelude ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com//fast-combinatorics#readme";
        description = "Fast combinatorics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74251,7 +71508,6 @@ self: {
          tasty-smallcheck
        ];
        benchmarkHaskellDepends = [ base criterion digits ];
-       homepage = "https://github.com/Bodigrim/fast-digits";
        description = "The fast library for integer-to-digits conversion";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -74269,7 +71525,6 @@ self: {
          unix unix-time
        ];
        testHaskellDepends = [ base bytestring directory hspec ];
-       homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74292,7 +71547,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0lpgfb1a2kf0c9w9br2izzqn0f66pchydnq87a7z74lzs5jm1bba";
        libraryHaskellDepends = [ base ghc-prim integer-gmp strict-base ];
-       homepage = "https://github.com/clintonmead/fast-mult#readme";
        description = "Numeric type with asymptotically faster multiplications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74316,8 +71570,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.4.1";
-       sha256 = "0d3i5npmc9nx91nmfbd2cwq33yd48b269gbc9k2ls6sbj9qdi172";
+       version = "1.4.2";
+       sha256 = "19z36f76w2cp763ija5di0zn1p9c9i1albx6q429f0afrpxymzp5";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -74333,7 +71587,6 @@ self: {
          async base bytestring containers directory filepath tasty
          tasty-hunit text
        ];
-       homepage = "https://github.com/elaforge/fast-tags";
        description = "Fast incremental vi and emacs tags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74349,7 +71602,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers tagsoup text text-icu
        ];
-       homepage = "https://github.com/vshabanov/fast-tagsoup";
        description = "Fast parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74361,7 +71613,6 @@ self: {
        version = "1.0.5";
        sha256 = "10svhgjvp1802jawr1s5chkincl2xhh6k0grm60f216jpasbvff4";
        libraryHaskellDepends = [ base bytestring tagsoup text ];
-       homepage = "https://github.com/exbb2/fast-tagsoup";
        description = "Fast parser for tagsoup package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74379,7 +71630,6 @@ self: {
          attoparsec base bytestring containers foldl lens parsec pipes
          pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
        ];
-       homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74392,7 +71642,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1nqrfrhw8gd3blfzrwbf7pm4wwqbxfaw640bzx62kwh7x2h6v3cm";
        libraryHaskellDepends = [ base hmatrix vector ];
-       homepage = "https://github.com/cscherrer/fastbayes";
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74466,7 +71715,6 @@ self: {
          microlens thyme transformers vector-space
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/bartavelle/fastparser#readme";
        description = "A fast, but bare bones, bytestring parser combinators library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74487,7 +71735,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion cryptonite pbkdf
        ];
-       homepage = "https://github.com/adinapoli/fastpbkdf2-hs#readme";
        description = "Haskell bindings to the fastpbkdf2 C library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
@@ -74502,7 +71749,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cassava hxt network-uri text
        ];
-       homepage = "https://github.com/guiltydolphin/fathead-util";
        description = "Utilities for working with DuckDuckHack's FatHead Instant Answers";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74515,7 +71761,6 @@ self: {
        version = "0.0.0";
        sha256 = "04m6hfj0sqhmq89fwfq4igz1rc0p3rzkhfg6fzsw5kyda2c8bbz0";
        libraryHaskellDepends = [ base yices ];
-       homepage = "http://tomahawkins.org";
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74549,7 +71794,6 @@ self: {
          unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [ base mtl optparse-applicative split ];
-       homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74563,7 +71807,6 @@ self: {
        sha256 = "1i19q04a4z3aix8njw5im8ixkw7l53xfhff0rrgx3ibnf9jy752z";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base fay ];
-       homepage = "https://github.com/faylang/fay/";
        description = "The base package for Fay";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74595,7 +71838,6 @@ self: {
        sha256 = "1zm6w6nccswaksr283alhnsss6xw4k7s61yp8ff4lg5127ff9wp0";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
-       homepage = "https://github.com/faylang/fay-dom";
        description = "DOM FFI wrapper library for Fay";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74609,7 +71851,6 @@ self: {
        sha256 = "1qmkwfqgvj6a8fan1l3i18ggpl00vrfd2mhqj13g0gh9yhvgxv1q";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
-       homepage = "https://github.com/victoredwardocallaghan/fay-geoposition";
        description = "W3C compliant implementation of GeoPosition API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74623,7 +71864,6 @@ self: {
        sha256 = "1mzjna8yc7jczgggpcgh9i6akiy72d60jczvmzxngh778z3g5zmi";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
-       homepage = "http://www.happstack.com/";
        description = "Clientside HTML generation for fay";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74637,7 +71877,6 @@ self: {
        sha256 = "04vg018zynb5ckj7ca9a9a3lbs8kjx8a5k0l3k73yp2y27w7xx8g";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-text ];
-       homepage = "https://github.com/faylang/fay-jquery";
        description = "jQuery bindings for Fay";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74651,7 +71890,6 @@ self: {
        sha256 = "1dcifraih13zqwmm4xn57wfg63rdkiac81avyymid308r6p1x9cn";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
-       homepage = "https://github.com/A1kmm/fay-ref";
        description = "Like IORef but for Fay";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74665,7 +71903,6 @@ self: {
        sha256 = "0cw06vl39p7mflf8wfl8ql1h8bryv2d1kvvf4swqgda05jk13mxq";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
-       homepage = "https://github.com/Lupino/fay-simplejson";
        description = "SimpleJSON library for Fay";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74679,7 +71916,6 @@ self: {
        sha256 = "1q1v8jzkccy9arq6jkz4ynpzm1691d1dv9wzyi4i5m6n0gl7aans";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay fay-base text ];
-       homepage = "https://github.com/faylang/fay-text";
        description = "Fay Text type represented as JavaScript strings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74693,7 +71929,6 @@ self: {
        sha256 = "1vv4jgkz9cx8inbn6g6sn3a0nf1ak81qlj5li21sk2isj0yws1nr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base ];
-       homepage = "https://github.com/faylang/fay-uri";
        description = "Persistent FFI bindings for using jsUri in Fay";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74724,7 +71959,6 @@ self: {
          http-conduit HUnit QuickCheck resourcet text time transformers
          unliftio
        ];
-       homepage = "https://github.com/psibi/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74754,7 +71988,6 @@ self: {
          http-conduit HUnit QuickCheck resourcet text time transformers
          unliftio
        ];
-       homepage = "https://github.com/psibi/fb";
        description = "Bindings to Facebook's API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74767,7 +72000,6 @@ self: {
        version = "0.3.6";
        sha256 = "1il06mlvvjybfnqpdnir9nr1g0irf84fa4q8lzavrlqgny8f294s";
        libraryHaskellDepends = [ base cereal fb persistent text time ];
-       homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74797,7 +72029,6 @@ self: {
          servant servant-server stm text transformers wai wai-logger warp
        ];
        testHaskellDepends = [ aeson base bytestring filepath hspec text ];
-       homepage = "https://github.com/mseri/fbmessenger-api-hs#fbmessenger-api";
        description = "High-level bindings to Facebook Messenger Platform API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74832,7 +72063,6 @@ self: {
          base containers hashable mtl unordered-containers
        ];
        testHaskellDepends = [ base hspec mtl ];
-       homepage = "http://github.com/ylilarry/fcache#readme";
        description = "Cache a function (a -> b)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74853,7 +72083,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/Neki/fcd";
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74879,7 +72108,6 @@ self: {
        version = "0.1";
        sha256 = "1yvsnk9awik143jh2268w1l5x70kmky60gac10fy2y1450dcn65x";
        libraryHaskellDepends = [ base cgi HaXml xhtml ];
-       homepage = "http://peteg.org/";
        description = "Server-Side Integration for FCKeditor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74900,7 +72128,6 @@ self: {
          base HUnit mtl template-haskell transformers
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/sebastiaanvisser/fclabels";
        description = "First class accessor labels implemented as lenses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74924,7 +72151,6 @@ self: {
        version = "0.3.1";
        sha256 = "1n4zk1i7g34w0wk5zy8n4r63xbglxf62h8j78kv5fc2yn95l30vh";
        libraryHaskellDepends = [ base containers dbus ];
-       homepage = "http://bitbucket.org/taejo/fdo-notify/";
        description = "Desktop Notifications client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -74945,7 +72171,6 @@ self: {
        executableHaskellDepends = [
          base Diff directory filepath old-locale parsec time unix url
        ];
-       homepage = "https://github.com/jkarlson/fdo-trash";
        description = "Utilities related to freedesktop Trash standard";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -74958,7 +72183,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1lssjgksq0k2dd7l5lmzxnr9f5zk3gbh386zfmcqgc4iczdzfk0f";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/iand675/feature-flags";
        description = "A simple library for dynamically enabling and disabling functionality";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74977,7 +72201,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers digest hspec mtl text
        ];
-       homepage = "https://github.com/toddmohney/flipper#readme";
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -74999,7 +72222,6 @@ self: {
          base bytestring containers feature-flipper hspec monad-logger mtl
          persistent persistent-postgresql
        ];
-       homepage = "https://github.com/toddmohney/flipper-postgres#readme";
        description = "A minimally obtrusive feature flag library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75012,7 +72234,6 @@ self: {
        version = "0.1.1";
        sha256 = "04ryd1c06l45af6627vjvprhs0rk1rwl0k9gq0byr95ghvc6mk6d";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://allmydata.org/source/zfec";
        description = "Forward error correction of ByteStrings";
        license = "GPL";
      }) {};
@@ -75028,7 +72249,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath process time unix
        ];
-       homepage = "https://github.com/fedora-haskell/fedora-haskell-tools";
        description = "Building and managing tools for Fedora Haskell";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -75051,7 +72271,6 @@ self: {
          aeson base bytestring containers hlint HsOpenSSL hspec http-streams
          io-streams lens text
        ];
-       homepage = "https://github.com/relrod/fedora-packages-hs";
        description = "Haskell interface to the Fedora Packages webapp API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75068,7 +72287,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        executableHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/sahabi/fee-estimate#readme";
        description = "Short description of your package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75094,7 +72312,6 @@ self: {
          test-framework-hunit text time time-locale-compat utf8-string
          xml-conduit xml-types
        ];
-       homepage = "https://github.com/bergmark/feed";
        description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75113,7 +72330,6 @@ self: {
        executableHaskellDepends = [
          base directory feed old-locale old-time time xml
        ];
-       homepage = "http://www.syntaxpolice.org/darcs_repos/feed-cli";
        description = "A simple command line interface for creating and updating feeds like RSS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75132,7 +72348,6 @@ self: {
          base data-default-class feed http-client http-client-tls time
          time-interval time-units timerep transformers utf8-string
        ];
-       homepage = "http://rel4tion.org/projects/feed-collect/";
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75150,7 +72365,6 @@ self: {
          base bytestring conduit connection http-conduit http-types hxt
          network-uri text transformers
        ];
-       homepage = "https://github.com/danchoi/feed-crawl";
        description = "Utility for fetching feeds with redirect info and HTML link detection";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75190,7 +72404,6 @@ self: {
          process tasty tasty-hspec tasty-hunit tasty-quickcheck
          tasty-smallcheck temporary text transformers
        ];
-       homepage = "http://github.com/sgraf812/feed-gipeda#readme";
        description = "CI service around gipeda";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75213,7 +72426,6 @@ self: {
          cryptohash feed iso639 lens naver-translate network-uri
          raw-strings-qq scotty text transformers wai warp wreq xml
        ];
-       homepage = "https://github.com/dahlia/feed-translator";
        description = "Translate syndication feeds";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75250,7 +72462,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring download-curl feed hs-twitter
        ];
-       homepage = "http://github.com/tomlokhorst/feed2twitter";
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75280,7 +72491,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion data-default deepseq feldspar-language
        ];
-       homepage = "http://feldspar.github.com";
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75305,7 +72515,6 @@ self: {
          base bytestring QuickCheck random tasty tasty-golden
          tasty-quickcheck tasty-th utf8-string
        ];
-       homepage = "http://feldspar.github.com";
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75324,7 +72533,6 @@ self: {
          base base-compat feldspar-compiler feldspar-compiler-shim
          feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv
        ];
-       homepage = "https://github.com/markus-git/feldspar-signal";
        description = "Signal Processing extension for Feldspar";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75380,7 +72588,6 @@ self: {
          base cairo gtk harp HaXml mtl template-haskell unix
        ];
        executableSystemDepends = [ raptor ];
-       homepage = "http://fenfire.org/";
        description = "Graph-based notetaking system";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75407,7 +72614,6 @@ self: {
          aeson base bytestring HUnit memory QuickCheck tasty tasty-golden
          tasty-hunit tasty-quickcheck time
        ];
-       homepage = "https://github.com/rvl/fernet-hs";
        description = "Generate and verify HMAC-based authentication tokens";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75420,7 +72626,6 @@ self: {
        version = "1.0.3";
        sha256 = "1gssbkwg9lqm3ajqkkcjnxjz8nhz855ki2hi5n2di3dappr73f0b";
        libraryHaskellDepends = [ base containers regex-compat ];
-       homepage = "http://ui3.info/d/proj/fez-conf.html";
        description = "Simple functions for loading config files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75491,7 +72696,6 @@ self: {
        libraryPkgconfigDepends = [
          ffmpeg libavcodec libavdevice libavformat libswscale
        ];
-       homepage = "http://github.com/acowley/ffmpeg-light";
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75510,7 +72714,6 @@ self: {
        executableHaskellDepends = [
          base bytestring haskell98 hs-ffmpeg SDL stm
        ];
-       homepage = "http://patch-tag.com/r/VasylPasternak/ffmpeg-tutorials";
        description = "Tutorials on ffmpeg usage to play video/audio";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75541,7 +72744,6 @@ self: {
        sha256 = "1ka58mkn30mrhma7l5cshilhaif4r2jqxqpm6rvmscrvnrjq3nyz";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fftw ];
-       homepage = "https://github.com/adamwalker/haskell-fftw-simple";
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) fftw;};
@@ -75582,7 +72784,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0p9dv7hq312wjqzm2ha4rafnmd1vplzwd5vk5fmzypgl2a1cz42s";
        libraryHaskellDepends = [ base containers fgl ];
-       homepage = "http://www.bioinf.uni-leipzig.de/~choener/";
        description = "Graph decomposition algorithms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75616,7 +72817,6 @@ self: {
          containers directory filepath hslogger mtl old-locale old-time
          process regex-compat statistics syb tabular time vector
        ];
-       homepage = "http://github.com/dmpots/fibon/wiki";
        description = "Tools for running and analyzing Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75629,7 +72829,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "18jqb4ynjsnpvydzpqzh7l5wyrjb3s3kxgc6a6ipwb6w2hygyf7k";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/sebfisch/fibonacci";
        description = "Fast computation of Fibonacci numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75666,7 +72865,6 @@ self: {
        libraryHaskellDepends = [
          array base containers fclabels monads-fd transformers
        ];
-       homepage = "http://github.com/AstraFIN/fields";
        description = "First-class record field combinators with infix record field syntax";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75707,7 +72905,6 @@ self: {
        version = "1.4.0";
        sha256 = "03bxiicvfwia5g0whg454ph2s34n8firjcqhn6d7qvbim338hkxq";
        libraryHaskellDepends = [ base containers parsec pretty ];
-       homepage = "http://www.bergsoe.org/fig";
        description = "Manipulation of FIG files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75721,7 +72918,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring clock directory zip-archive
        ];
-       homepage = "https://github.com/joelwilliamson/file-collection";
        description = "Provide a uniform interface over file archives and directories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75738,7 +72934,6 @@ self: {
        libraryHaskellDepends = [
          base parsec process system-filepath template-haskell text
        ];
-       homepage = "https://github.com/jfischoff/file-command-qq";
        description = "Quasiquoter for system commands involving filepaths";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75756,7 +72951,6 @@ self: {
          base bytestring directory filepath template-haskell
        ];
        testHaskellDepends = [ base filepath ];
-       homepage = "https://github.com/snoyberg/file-embed";
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75776,7 +72970,6 @@ self: {
          template-haskell text th-lift-instances transformers
        ];
        testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/phadej/file-embed-lzma";
        description = "Use Template Haskell to embed (LZMA compressed) data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75795,7 +72988,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory file-embed filepath hspec
        ];
-       homepage = "https://github.com/sasinestro/file-embed";
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75813,7 +73005,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base lifted-base process ];
-       homepage = "https://github.com/gregwebs/FileLocation.hs";
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75837,7 +73028,6 @@ self: {
          async base directory filepath haskell-src-exts MissingH
          regex-compat regex-pcre
        ];
-       homepage = "https://github.com/yamadapc/stack-run-auto";
        description = "Takes a Haskell source-code file and outputs its modules";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -75856,7 +73046,6 @@ self: {
          attoparsec base bytestring directory filepath foundation
          transformers unordered-containers
        ];
-       homepage = "https://github.com/anfelor/file-templates#readme";
        description = "Use templates for files and directories";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75876,7 +73065,6 @@ self: {
        testHaskellDepends = [
          base containers directory filepath hspec stm temporary
        ];
-       homepage = "http://lpuppet.banquise.net/";
        description = "A cache system associating values to files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75898,7 +73086,6 @@ self: {
        testHaskellDepends = [
          base directory either mtl tasty tasty-hunit text time transformers
        ];
-       homepage = "https://github.com/bgwines/filediff";
        description = "Diffing and patching module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -75912,7 +73099,6 @@ self: {
        sha256 = "0g90wgm4bcfr5j44sc5s2jlcd7ggk092lph3jqjgf6f67sqxrw8g";
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ async base process ];
-       homepage = "http://github.com/takano-akio/filelock";
        description = "Portable interface to file locking (flock / LockFileEx)";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -75928,7 +73114,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory filepath mtl unix-compat
        ];
-       homepage = "https://github.com/bos/filemanip";
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -75952,7 +73137,6 @@ self: {
        sha256 = "0bnryq00xbcsswxmahl42x85bfh23mxsap0gq8q0dm1v67ij7a0q";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/haskell/filepath#readme";
        description = "Library for manipulating FilePaths in a cross platform way";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76001,7 +73185,6 @@ self: {
          base comonad comonad-transformers data-lens directory filepath mtl
          transformers
        ];
-       homepage = "https://github.com/tonymorris/filepather";
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76018,7 +73201,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec mtl QuickCheck temporary
        ];
-       homepage = "https://github.com/agrafix/fileplow#readme";
        description = "Library to process and search large files or a collection of files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76062,7 +73244,6 @@ self: {
          base blaze-builder bytestring conduit hspec QuickCheck text
          transformers
        ];
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Use system-filepath data types with conduits. (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76079,7 +73260,6 @@ self: {
        libraryHaskellDepends = [
          base enumerator system-fileio system-filepath transformers unix
        ];
-       homepage = "https://john-millikin.com/software/haskell-filesystem/";
        description = "Enumerator-based API for manipulating the filesystem";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76097,7 +73277,6 @@ self: {
          base cond containers data-lens-light deepseq directory dlist
          filepath mtl unix
        ];
-       homepage = "https://github.com/kallisti-dev/filesystem-trees";
        description = "Recursively manipulate and traverse filesystems as lazy rose trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76115,7 +73294,6 @@ self: {
          base data-default parsec text unordered-containers
        ];
        testHaskellDepends = [ base doctest hspec unordered-containers ];
-       homepage = "https://github.com/ishiy1993/fillit#readme";
        description = "Flexible string substitution";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76138,7 +73316,6 @@ self: {
        ];
        executableHaskellDepends = [ aeson base bytestring scotty ];
        testHaskellDepends = [ base bytestring HUnit ];
-       homepage = "https://github.com/caneroj1/filter-logger#readme";
        description = "Filterable request logging wai middleware. Change how data is logged and when.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -76150,7 +73327,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0g1ngsbxrydbwa637sk8zvpvygppr6abj9hh87maf56ily4ki9fn";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76166,7 +73342,6 @@ self: {
        sha256 = "0mqs6qayj2n54siz3bpab9z6sk9030wdaxgvgg9g36983yaqmlil";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [ base inspection-testing tagged ];
-       homepage = "https://github.com/phadej/vec";
        description = "Nat and Fin: peano naturals and finite numbers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76179,7 +73354,6 @@ self: {
        version = "0.1";
        sha256 = "189vby5ym6hcjpz6y9chlgkyzl8wnndqkhzk7s7qy8mksr3g66f9";
        libraryHaskellDepends = [ base stm transformers ];
-       homepage = "http://github.com/errge/final";
        description = "utility to add extra safety to monadic returns";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76221,7 +73395,6 @@ self: {
          aeson base BiobaseNewick bytestring clumpiness containers
          optparse-applicative text tree-fun unordered-containers
        ];
-       homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme";
        description = "Find the clumpiness of labels in a tree";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -76268,7 +73441,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1iiyfp8p0iaf39brii95wp6887ds63bx8qrrm4raks8y4b1hflrc";
        libraryHaskellDepends = [ base Cabal directory filepath mtl ];
-       homepage = "https://github.com/oisdk/find-source-files#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -76341,7 +73513,6 @@ self: {
        version = "0.1.3.0";
        sha256 = "17a82djlpapdzw34afv79w99jrpy5nlbdw1k1xjs59bvvqv36wyv";
        libraryHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/mniip/finite-typelits";
        description = "A type inhabited by finitely many values, indexed by type-level naturals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76359,7 +73530,6 @@ self: {
          aeson base blaze-html bytestring case-insensitive containers cookie
          http-types mtl regex-pcre text transformers wai warp
        ];
-       homepage = "https://github.com/ChrisPenner/firefly#readme";
        description = "A simple HTTP server framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76376,7 +73546,6 @@ self: {
        executableHaskellDepends = [
          aeson base blaze-html firefly mtl text wai
        ];
-       homepage = "https://github.com/ChrisPenner/Firefly#readme";
        description = "A simple example using Firefly";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76390,7 +73559,6 @@ self: {
        sha256 = "1nprsgkv6qr6ld0a11rpwfpm88jv3xyr8gsxam09r5haagaqhn7j";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/markandrus/first-and-last";
        description = "First and Last generalized to return up to n values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76403,7 +73571,6 @@ self: {
        version = "0.3.2.3";
        sha256 = "051pmakbg3ipa4vrzk47c0v9ng3sj19wd99qi6gvp40gdkjjmplk";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/reinerp/first-class-patterns";
        description = "First class patterns and pattern matching, using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76421,7 +73588,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory filepath homeomorphic mtl Safe yhccore
        ];
-       homepage = "http://www-users.cs.york.ac.uk/~ndm/firstify/";
        description = "Defunctionalisation for Yhc Core";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76446,7 +73612,6 @@ self: {
        testHaskellDepends = [
          base Cabal containers mtl QuickCheck toolshed
        ];
-       homepage = "http://functionalley.eu";
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
      }) {};
@@ -76479,7 +73644,6 @@ self: {
        sha256 = "07zsd05ncq8rnrswk4kzg97sam8czibw2nhlrqxg8q1a5canisag";
        libraryHaskellDepends = [ base filepath mtl ];
        librarySystemDepends = [ cfitsio ];
-       homepage = "http://github.com/esessoms/fitsio";
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76497,7 +73661,6 @@ self: {
        ];
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base pretty ];
-       homepage = "https://github.com/rudymatela/fitspec#readme";
        description = "refining property sets for testing Haskell programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76552,7 +73715,6 @@ self: {
        version = "0.2.1.1";
        sha256 = "1qhmwx8iqshns0crmr9d2f8hm65jxbcp3dvv0c39v34ra7if3a94";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/ekmett/fixed";
        description = "Signed 15.16 precision fixed point arithmetic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76564,7 +73726,6 @@ self: {
        version = "0.2";
        sha256 = "16rqls3zhrm757brz7zkw7m58nvxbj03af9vff98w6hp8gag4w9i";
        libraryHaskellDepends = [ base non-empty tfp utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/fixed-length/";
        description = "Lists with statically known length based on non-empty package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76576,7 +73737,6 @@ self: {
        version = "0.1.6";
        sha256 = "1gpv0p7xyzmrrq20irf0mpggnc0vm5hpq36j4vd1xlq6bplq1xmb";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/jvranish/FixedList/tree/master";
        description = "A fixed length list type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76628,7 +73788,6 @@ self: {
        libraryHaskellDepends = [
          base hmpfr integer-gmp reflection tagged template-haskell
        ];
-       homepage = "http://github.com/ekmett/fixed-precision";
        description = "Fixed Precision Arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76716,7 +73875,6 @@ self: {
        revision = "1";
        editedCabalFile = "0gc12lyp07yjs1xhdbfwllbw2ccdr131w0naxv5cn09bh9iay5xs";
        libraryHaskellDepends = [ base deepseq fixed-vector primitive ];
-       homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
        description = "Generic heterogeneous vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76728,7 +73886,6 @@ self: {
        version = "0.5.0.0";
        sha256 = "1446xsj030xr7zry2pqq0yxv4f0j46jmpisfmp357jb0n9l5kwm3";
        libraryHaskellDepends = [ base deepseq fixed-vector primitive ];
-       homepage = "http://github.org/Shimuuar/fixed-vector-hetero";
        description = "Generic heterogeneous vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76769,7 +73926,6 @@ self: {
        executableHaskellDepends = [
          aeson attoparsec base bytestring text
        ];
-       homepage = "https://github.com/michaelochurch/fixedwidth-hs";
        description = "Quick parsing of fixed-width data formats";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -76798,7 +73954,6 @@ self: {
          servant servant-client stm text time validity validity-containers
          validity-time yaml
        ];
-       homepage = "https://github.com/NorfairKing/fixer#readme";
        description = "A Haskell client for http://fixer.io/";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76821,7 +73976,6 @@ self: {
          base bytestring cereal directory exceptions lens mtl QuickCheck
          tasty tasty-quickcheck temporary
        ];
-       homepage = "https://github.com/revnull/fixfile";
        description = "File-backed recursive data structures";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76847,7 +74001,6 @@ self: {
          attoparsec base bytestring containers deepseq dlist HaXml MissingH
          old-time QuickCheck text
        ];
-       homepage = "http://github.com/urv/fixhs";
        description = "FIX (co)parser";
        license = stdenv.lib.licenses.lgpl21;
      }) {};
@@ -76868,7 +74021,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover mtl template-haskell transformers
        ];
-       homepage = "http://github.com/jxv/fixie#readme";
        description = "Opininated testing framework for mtl style (spies, stubs, and mocks)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -76888,7 +74040,6 @@ self: {
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Uniplate-style generic traversals for optionally annotated fixed-point types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76900,7 +74051,6 @@ self: {
        version = "0.1.1";
        sha256 = "05h1cw1gpnwk1qjlia4l27j375cva8pp75fzn99w2rxsv6khszpb";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.cse.unsw.edu.au/~rl/code/fixpoint.html";
        description = "Data types as fixpoints";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -76912,7 +74062,6 @@ self: {
        version = "1.5.0.2";
        sha256 = "1walxcyi1wrv28vgy318c88z3mprz6mc8qfhbjgxb156iwfv80w5";
        libraryHaskellDepends = [ base time ];
-       homepage = "https://github.com/pharpend/fixtime";
        description = "Some fixes to the time package";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -76953,7 +74102,6 @@ self: {
        executableHaskellDepends = [
          async base bytestring network-simple optparse-applicative
        ];
-       homepage = "https://github.com/chris-martin/fizzbuzz-as-a-service";
        description = "FizzBuzz as a service";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -76979,7 +74127,6 @@ self: {
          base bytestring data-default-class directory filepath hspec
          temporary transformers vector wave
        ];
-       homepage = "https://github.com/mrkkrp/flac";
        description = "Complete high-level binding to libFLAC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77001,7 +74148,6 @@ self: {
          base bytestring data-default-class directory flac hspec JuicyPixels
          temporary
        ];
-       homepage = "https://github.com/mrkkrp/flac-picture";
        description = "Support for writing picture to FLAC metadata blocks with JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77020,7 +74166,6 @@ self: {
        executableHaskellDepends = [
          base binary deepseq HTTP optparse-applicative process
        ];
-       homepage = "http://noaxiom.org/flAccurateRip";
        description = "Verify FLAC files ripped form CD using AccurateRip™";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -77032,7 +74177,6 @@ self: {
        version = "0.0.5.1";
        sha256 = "10kfy1cnp721hgz6lbc28y7hkjhbv6gpk2jff6nk2avrfbaqqd8x";
        libraryHaskellDepends = [ base template-haskell text ];
-       homepage = "https://charmander.me/flamethrower/";
        description = "A template engine for HTML";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77072,7 +74216,6 @@ self: {
          base bytestring containers cpu deepseq derive ghc-prim pretty tasty
          tasty-hunit tasty-quickcheck text
        ];
-       homepage = "http://github.com/tittoassini/flat";
        description = "Principled and efficient bit-oriented binary serialization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77085,7 +74228,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0kxyr7k47lsw7xg523kf98d57p6i1iz5dmyp91zg1xs2hsbjgvlq";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/AndrasKovacs/flat-maybe";
        description = "Strict Maybe without space and indirection overhead";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77107,7 +74249,6 @@ self: {
          mwc-probability pipes primitive text transformers vector
        ];
        testHaskellDepends = [ base vector ];
-       homepage = "https://github.com/jtobin/flat-mcmc";
        description = "Painless general-purpose sampling";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77121,7 +74262,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory parsec ];
-       homepage = "https://github.com/jwaldmann/flat-tex";
        description = "flatten a latex multi-file latex document";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -77132,11 +74272,10 @@ self: {
      }:
      mkDerivation {
        pname = "flay";
-       version = "0.3";
-       sha256 = "1m5580xbmk9113ksx7b5z27b03b9w21ayn9y13hv7dk5khlividx";
+       version = "0.4";
+       sha256 = "1vqkjjf2bzmi489wsx23ryyplbg26q9qrzb98dz80j5b5rj3xzq1";
        libraryHaskellDepends = [ base constraints transformers ];
-       testHaskellDepends = [ base tasty tasty-quickcheck ];
-       homepage = "https://github.com/k0001/flay";
+       testHaskellDepends = [ base tasty tasty-quickcheck transformers ];
        description = "Work generically on your datatype without knowing its shape nor its contents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77152,7 +74291,6 @@ self: {
        libraryHaskellDepends = [
          base containers template-haskell th-extras transformers
        ];
-       homepage = "https://github.com/mokus0/flexible-defaults";
        description = "Generate default function implementations for complex type classes";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -77164,7 +74302,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "179k0r58r5s0g1vfs7ab382iq7qf5xbrnmvx2y8p86pz8fcz7a8l";
        libraryHaskellDepends = [ base bytestring unix-time ];
-       homepage = "https://github.com/tattsun/flexible-time";
        description = "simple extension of Data.UnixTime.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77245,7 +74382,6 @@ self: {
          system-filepath transformers
        ];
        testHaskellDepends = [ base hlint ];
-       homepage = "https://github.com/BlockScope/haskell-flight-igc#readme";
        description = "A parser for IGC files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77260,7 +74396,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process safe-exceptions ];
-       homepage = "https://github.com/aiya000/hs-flip-cmd";
        description = "e.g. `flip systemctl foo.service start` does `systemctl start foo.service`";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77290,7 +74425,6 @@ self: {
        executableHaskellDepends = [
          array base containers haskell98 parsec
        ];
-       homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "f-lite compiler, interpreter and libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77328,7 +74462,6 @@ self: {
        testHaskellDepends = [
          attoparsec base hspec HUnit QuickCheck split text
        ];
-       homepage = "https://github.com/llelf/float-binstring";
        description = "C99 printf \"%a\" style formatting and parsing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77354,7 +74487,6 @@ self: {
        version = "0.2.4";
        sha256 = "1zsxjwgm8nkphnmsbz03yvplc2r02qybb387n910j4j6vya98khc";
        libraryHaskellDepends = [ array base integer-gmp ];
-       homepage = "https://bitbucket.org/dafis/floatshow";
        description = "Alternative faster String representations for Double and Float, String representations for more general numeric types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77367,12 +74499,11 @@ self: {
        pname = "flock";
        version = "0.3.1.8";
        sha256 = "1g1gf7qnlqkl57h28nzxnbzj7v2h73czffp5y7s7jm9vbihcwd4n";
-       revision = "3";
-       editedCabalFile = "06hdirzgghlxpdymb5b5l58v20m34lmn2z8hmp9lwcskc8xfqqfn";
+       revision = "4";
+       editedCabalFile = "02jqldkxg366v0gljiqg7zv5sd3zhswabcvg5xx6h8ns67kn3my6";
        libraryHaskellDepends = [
          base lifted-base monad-control transformers unix
        ];
-       homepage = "http://github.com/hesselink/flock";
        description = "Wrapper for flock(2)";
        license = "unknown";
      }) {};
@@ -77385,7 +74516,6 @@ self: {
        sha256 = "0c9mg6d8krv7c0sxlkgcpvhcspb8g65hp0h7pgjql4644ivqpn3p";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck template-haskell ];
-       homepage = "https://github.com/tfausak/flow#readme";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77398,7 +74528,6 @@ self: {
        sha256 = "19nvcg1dsr9spqmjgrixqckbs7rc12fxbgn54ydq05qmy6w6p7f8";
        libraryHaskellDepends = [ base flow ];
        testHaskellDepends = [ base doctest flow QuickCheck ];
-       homepage = "https://github.com/expede/flower#README";
        description = "More directional operators";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77417,7 +74546,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl parsec QuickCheck utf8-string
        ];
-       homepage = "http://adept.linux.kiev.ua:8080/repos/flow2dot";
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77438,7 +74566,6 @@ self: {
          lens lens-action mtl network pipes pipes-aeson pipes-http
          pipes-parse template-haskell text unordered-containers uuid
        ];
-       homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77476,7 +74603,6 @@ self: {
          monad-logger MonadCatchIO-transformers template-haskell text time
          transformers unordered-containers vector
        ];
-       homepage = "https://github.com/gabemc/flowdock-api";
        description = "API integration with Flowdock";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77505,7 +74631,6 @@ self: {
          http-client http-client-tls lens semigroups tagged tasty
          tasty-quickcheck text time unordered-containers
        ];
-       homepage = "https://github.com/futurice/haskell-flowdock-rest#readme";
        description = "Flowdock REST API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77524,7 +74649,6 @@ self: {
        executableHaskellDepends = [
          array base binary bio bytestring cmdargs containers mtl random
        ];
-       homepage = "http://biohaskell.org/Applications/Flower";
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77557,7 +74681,6 @@ self: {
          array base biocore biofasta biosff bytestring cmdargs containers
          directory MonadRandom mtl random
        ];
-       homepage = "http://biohaskell.org/Applications/FlowSim";
        description = "Simulate 454 pyrosequencing";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77577,7 +74700,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base directory filepath mtl parsec ];
-       homepage = "http://github.com/deech/fltkhs";
        description = "FLTK bindings";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77594,7 +74716,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory fltkhs process stm
        ];
-       homepage = "http://github.com/deech/fltkhs-demos";
        description = "FLTKHS demos. Please scroll to the bottom for more information.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77609,7 +74730,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring fltkhs ];
-       homepage = "http://github.com/deech/fltkhs-fluid-demos";
        description = "Fltkhs Fluid Demos";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77624,7 +74744,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring fltkhs ];
-       homepage = "http://github.com/deech/fltkhs-fluid-examples";
        description = "Fltkhs Fluid Examples";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77638,7 +74757,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base fltkhs ];
-       homepage = "http://github.com/deech/fltkhs-hello-world";
        description = "Fltkhs template project";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77781,7 +74899,6 @@ self: {
        sha256 = "18r7q7sh35sr71ays0c9ic6f7vmrblpw25mz1y5v9sbk5x2lh64s";
        libraryHaskellDepends = [ base bindings-DSL containers directory ];
        librarySystemDepends = [ fluidsynth ];
-       homepage = "https://github.com/MostAwesomeDude/hsfluidsynth";
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77800,7 +74917,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath mtl process Unixutils
        ];
-       homepage = "http://github.com/jabolopes/fmark";
        description = "A Friendly Markup language without syntax";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77813,7 +74929,6 @@ self: {
        version = "0.9.2";
        sha256 = "02868865hqm189h5wjd916abvqwkhbrx5b0119s1dwp70ifvbi4g";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/sjoerdvisscher/fmlist";
        description = "FoldMap lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77841,7 +74956,6 @@ self: {
          base bytestring containers criterion deepseq formatting interpolate
          text text-format vector
        ];
-       homepage = "http://github.com/aelve/fmt";
        description = "A new formatting library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77869,7 +74983,6 @@ self: {
          base bytestring containers criterion deepseq formatting interpolate
          text vector
        ];
-       homepage = "http://github.com/aelve/fmt";
        description = "A new formatting library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77892,7 +75005,6 @@ self: {
          base directory filepath hspec http-types resourcet text
          unordered-containers wai wai-extra
        ];
-       homepage = "http://github.com/positiondev/fn#readme";
        description = "A functional web framework";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -77912,7 +75024,6 @@ self: {
          fn heist http-types lens map-syntax mtl resourcet text wai
          wai-extra wai-util xmlhtml
        ];
-       homepage = "http://github.com/positiondev/fn#readme";
        description = "Extras for Fn, a functional web framework";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -77925,7 +75036,6 @@ self: {
        version = "0.1.5.2";
        sha256 = "1dswf4l7d6z3rrv1d00fr3vcpawnvxhj3q741fh62s5wq948v662";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/focus";
        description = "A general abstraction for manipulating elements of container data structures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -77942,7 +75052,6 @@ self: {
          base data-default-class stm stm-delay time
        ];
        testHaskellDepends = [ base hspec stm time ];
-       homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -77962,7 +75071,6 @@ self: {
        testHaskellDepends = [
          base conduit hspec resourcet stm transformers
        ];
-       homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78025,7 +75133,6 @@ self: {
          QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck vector
        ];
        benchmarkHaskellDepends = [ base containers criterion foldl ];
-       homepage = "https://github.com/tonyday567/foldl-incremental";
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78051,7 +75158,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion foldl mwc-random statistics vector
        ];
-       homepage = "http://github.com/Data61/foldl-statistics#readme";
        description = "Statistical functions from the statistics package implemented as Folds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78127,7 +75233,6 @@ self: {
        testHaskellDepends = [
          base bytestring deepseq directory doctest filepath mtl semigroups
        ];
-       homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78160,7 +75265,6 @@ self: {
        executableHaskellDepends = [
          array base containers gloss optparse-applicative xml
        ];
-       homepage = "https://github.com/SU-LOSP/folgerhs#readme";
        description = "Toolset for Folger Shakespeare Library's XML annotated plays";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -78202,7 +75306,6 @@ self: {
          ansi-wl-pprint base cmdargs directory filepath hs-twitter
          old-locale strict time
        ];
-       homepage = "http://rebworks.net/projects/follower/";
        description = "Follow Tweets anonymously";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78216,7 +75319,6 @@ self: {
        sha256 = "1aiy4bizzx5g87lvlx8xy24rxvzh093mlaavxkcr542fq9ki8yb3";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ foma ];
-       homepage = "http://github.com/joom/foma.hs";
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78229,7 +75331,6 @@ self: {
        version = "0.1";
        sha256 = "1njwikgrsm52diq84j6lgjcndssk3ihmgp7fndwjq9m2v2h346gh";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/spl/font-awesome-type";
        description = "A Font Awesome data type enumerating all icon classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78260,7 +75361,6 @@ self: {
        executableHaskellDepends = [
          base containers GLUT haskell98 OpenGL
        ];
-       homepage = "http://sourceforge.net/projects/fooengine/?abmode=1";
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78277,7 +75377,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/githubuser/foobar#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78315,7 +75414,6 @@ self: {
          base control-monad-loop hashable hashtables hspec primitive
          transformers vector
        ];
-       homepage = "http://github.com/minpou/forbidden-fruit";
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78358,7 +75456,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "17wsqrq1zq1p80gnrfsvks5bhickfqj5mh2prbzzkzb3s28l1mby";
        libraryHaskellDepends = [ aeson base text ];
-       homepage = "https://github.com/stormont/forecast-io";
        description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78382,7 +75479,6 @@ self: {
        version = "0.2";
        sha256 = "1p436dn6l5zjzizcsj0hn10s2n907gr7c8y89i4sm3h69lhqlw86";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/chrisdone/foreign-store";
        description = "Store a stable pointer in a foreign context to be retrieved later";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78396,7 +75492,6 @@ self: {
        revision = "1";
        editedCabalFile = "077s05370sx7pn053z1y6ygjg77dsvpcd5r8ivx9q9rk8m1hdjgr";
        libraryHaskellDepends = [ base stm transformers ];
-       homepage = "http://github.com/ekmett/foreign-var/";
        description = "Encapsulating mutatable state in external libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78413,7 +75508,6 @@ self: {
        libraryHaskellDepends = [
          aeson base deepseq hashable profunctors semigroupoids
        ];
-       homepage = "https://github.com/duairc/forest";
        description = "Tree and Forest types";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -78435,7 +75529,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers HUnit mtl tasty tasty-hunit
        ];
-       homepage = "https://github.com/toothbrush/forest-fire#readme";
        description = "Recursively delete CloudFormation stacks and their dependants";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78451,7 +75544,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/sfischer13/haskell-forger";
        description = "Library for generating fake placeholder data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78464,7 +75556,6 @@ self: {
        version = "0.1.1";
        sha256 = "0nxcjx3cf8bkl0cwkpgz5c6byld13kw2601q4157fmfa370bi11h";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://code.google.com/p/forkable-monad/";
        description = "An implementation of forkIO for monad stacks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78485,24 +75576,22 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [ aeson base hspec mtl text ];
-       homepage = "https://github.com/mrkkrp/forma";
        description = "Parse and validate forms in JSON format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "forma_1_0_0" = callPackage
+  "forma_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, mtl, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "forma";
-       version = "1.0.0";
-       sha256 = "11rqwlqsjw5r674zqv9lmafqhlb339afifa2376a6cgbxm7j2msd";
+       version = "1.1.0";
+       sha256 = "09f377ak1208lr8sskdga3nq47a151whd7z982pwv552w1q75p5p";
        libraryHaskellDepends = [
          aeson base containers mtl text unordered-containers
        ];
        testHaskellDepends = [ aeson base containers hspec mtl text ];
-       homepage = "https://github.com/mrkkrp/forma";
        description = "Parse and validate forms in JSON format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78539,7 +75628,6 @@ self: {
        sha256 = "1vv9b0hif5hi3jkd1n6j85b5mkfkjyixldblm2l4qfgrj95igmph";
        libraryHaskellDepends = [ haskell2010 parsec ];
        testHaskellDepends = [ haskell2010 parsec QuickCheck ];
-       homepage = "https://github.com/bytbox/hs-format";
        description = "Rendering from and scanning to format strings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78553,7 +75641,6 @@ self: {
        sha256 = "19ii2b804i6rmz21qpjy1p5yvb32gglniszhgcpmb268aldmd90c";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec text ];
-       homepage = "https://github.com/agrafix/format-numbers#readme";
        description = "Various number formatting functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -78592,7 +75679,6 @@ self: {
          base bytestring data-default-class double-conversion hspec HUnit
          lens old-locale QuickCheck text time
        ];
-       homepage = "https://github.com/Soostone/formattable";
        description = "Business-quality formatting of numbers, dates, and other things";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78636,7 +75722,6 @@ self: {
          interpolatedstring-perl6 jmacro MissingH mtl network pandoc parsec
          process text urlencoded utf8-string zlib
        ];
-       homepage = "http://texodus.github.com/forml";
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78654,7 +75739,6 @@ self: {
          applicative-extras base blaze-html bytestring haskell98 syb
          transformers xhtml
        ];
-       homepage = "http://github.com/chriseidhof/formlets/tree/master";
        description = "Formlets implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78694,7 +75778,6 @@ self: {
        executableHaskellDepends = [
          ansi-wl-pprint base containers lens text trifecta
        ];
-       homepage = "http://nushio3.github.io";
        description = "Formura is a simple language to describe stencil computation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78709,7 +75792,6 @@ self: {
        sha256 = "1cfqv2mn1ccbp2j7vnjj123ys2n5s414dqid4ywy1l749pzf7w1j";
        libraryHaskellDepends = [ base directory old-time process random ];
        testHaskellDepends = [ base hspec ];
-       homepage = "http://forsyde.ict.kth.se/";
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78766,7 +75848,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ ansi-terminal base text ];
        testHaskellDepends = [ async base doctest hspec process ];
-       homepage = "https://github.com/gianlucaguarini/fortytwo#readme";
        description = "Interactive terminal prompt";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78779,7 +75860,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "0q11h91mlbaflxl35sya5r4h9r5d18v5ib0hplrzcnsgwchdcd3f";
        libraryHaskellDepends = [ base SafeSemaphore stm unagi-chan ];
-       homepage = "http://github.com/mmirman/forward-chan";
        description = "Concurrent channels with a forwarding primitive";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -78799,7 +75879,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/foscam-directory";
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78820,7 +75899,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/foscam-filename";
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78848,7 +75926,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/foscam-sort";
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78863,7 +75940,6 @@ self: {
        libraryHaskellDepends = [ base basement ghc-prim ];
        testHaskellDepends = [ base basement ];
        benchmarkHaskellDepends = [ base basement gauge ];
-       homepage = "https://github.com/haskell-foundation/foundation";
        description = "Alternative prelude with batteries and no dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78875,7 +75951,6 @@ self: {
        version = "0.0.3";
        sha256 = "0dqpalqn9p10vmz3sw60aga76rpi4d92hrvq2v91pv44p1iva2mb";
        libraryHaskellDepends = [ bytestring foundation text ];
-       homepage = "https://github.com/haskell-foundation/foundation";
        description = "foundation's edge with the conventional set of packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78887,7 +75962,6 @@ self: {
        version = "0.1";
        sha256 = "0mxzrvrag2qwn22llklmdkcf4icd8n9ifg1awd9q7ffll8a1a67p";
        libraryHaskellDepends = [ base containers random ];
-       homepage = "http://tomahawkins.org";
        description = "A fountain codec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -78924,7 +75998,6 @@ self: {
          aeson base bytestring data-default directory filepath ini network
          optparse-applicative process safe text unordered-containers
        ];
-       homepage = "https://www.fpcomplete.com/page/api";
        description = "Simple interface to the FP Complete IDE API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -78998,7 +76071,6 @@ self: {
          QuickCheck regex-compat test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/jrp2014/fptest";
        description = "IEEE754r floating point conformance tests";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79054,7 +76126,6 @@ self: {
        version = "0.1.0.6";
        sha256 = "0ajkrp7babip4y0symj65yanyazsazp7lsbbsa3il2b6kp9fwgxd";
        libraryHaskellDepends = [ base semigroups ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/fraction";
        description = "Fractions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79069,7 +76140,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
-       homepage = "http://haskell.org/haskellwiki/Frag";
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79139,7 +76209,6 @@ self: {
          transformers type-aligned vinyl-plus
        ];
        testHaskellDepends = [ base mtl time transformers ];
-       homepage = "https://github.com/ElvishJerricco/fraxl";
        description = "Cached and parallel data fetching";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79160,7 +76229,6 @@ self: {
          amqp async base broadcast-chan bytestring data-default hspec random
          text uuid
        ];
-       homepage = "https://github.com/salemove/freddy-hs";
        description = "RabbitMQ Messaging API supporting request-response";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -79180,7 +76248,6 @@ self: {
          profunctors semigroupoids semigroups template-haskell transformers
          transformers-base transformers-compat
        ];
-       homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79192,7 +76259,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1caiwxhm2wx0cnr2g4zvk2qv170jps14lf9j1q40qvx5qy3fxwlz";
        libraryHaskellDepends = [ base type-aligned ];
-       homepage = "https://github.com/srijs/haskell-free-concurrent";
        description = "Free monads suitable for concurrent computation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79208,7 +76274,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/osa1/free-er";
        description = "An extensible effects library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79226,7 +76291,6 @@ self: {
          algebraic-classes base bifunctors comonad constraints contravariant
          profunctors template-haskell transformers
        ];
-       homepage = "https://github.com/sjoerdvisscher/free-functors";
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79249,7 +76313,6 @@ self: {
          JuicyPixels-util lens linear mtl OpenGL OpenGLRaw random reflection
          StateVar template-haskell transformers vector void
        ];
-       homepage = "https://github.com/fumieval/free-game";
        description = "Create games for free";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79267,7 +76330,6 @@ self: {
          base bytestring free http-client http-types mtl QuickCheck text
          time transformers
        ];
-       homepage = "https://github.com/aaronlevin/free-http";
        description = "An HTTP Client based on Free Monads";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79392,7 +76454,6 @@ self: {
        libraryHaskellDepends = [
          base lens linear MemoTrie pragmatic-show vector vector-space
        ];
-       homepage = "https://github.com/leftaroundabout/free-vector-spaces";
        description = "Instantiate the classes from the vector-space package with types from linear";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79411,7 +76472,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
-       homepage = "http://github.com/aaronlevin/free-vl";
        description = "van Laarhoven encoded Free Monad with Extensible Effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79433,7 +76493,6 @@ self: {
          filepath FTGL haskell98 mtl OpenGL pngload random SDL
          template-haskell
        ];
-       homepage = "http://github.com/anttisalonen/freekick2";
        description = "A soccer game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79454,7 +76513,6 @@ self: {
          array base bytestring containers doctest indextype text
          transformers
        ];
-       homepage = "https://github.com/clintonmead/freelude#readme";
        description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79469,7 +76527,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ freenect freenect_sync ];
        libraryPkgconfigDepends = [ libfreenect ];
-       homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -79492,7 +76549,6 @@ self: {
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion free mtl ];
-       homepage = "https://gitlab.com/queertypes/freer";
        description = "Implementation of the Freer Monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79530,7 +76586,6 @@ self: {
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion free mtl ];
-       homepage = "https://github.com/IxpertaSolutions/freer-effects";
        description = "Implementation of effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79557,7 +76612,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion extensible-effects free mtl
        ];
-       homepage = "https://github.com/lexi-lambda/freer-simple#readme";
        description = "Implementation of a friendly effect system for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79575,7 +76629,6 @@ self: {
        executableHaskellDepends = [
          array base cpphs directory mtl parallel pretty random syb
        ];
-       homepage = "http://fremissant.net/freesect";
        description = "A Haskell syntax extension for generalised sections";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79598,7 +76651,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers data-default hspec hspec-core
        ];
-       homepage = "https://github.com/kaoskorobase/freesound";
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79614,7 +76666,6 @@ self: {
        libraryHaskellDepends = [
          base boundingboxes bytestring freetype2 linear
        ];
-       homepage = "https://github.com/capsjac/freetype-simple";
        description = "Single line text rendering for OpenGL ES";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79641,20 +76692,26 @@ self: {
        sha256 = "1lvgazbqfcbrngvmp0k9pm2sldlg950hm8x9z4dcygmyjc2ncw2w";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit ];
-       homepage = "https://github.com/tserduke/french-cards#readme";
        description = "French Playing Cards";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "freq" = callPackage
-    ({ mkDerivation }:
+    ({ mkDerivation, base, bytestring, containers, gauge, hedgehog
+     , primitive
+     }:
      mkDerivation {
        pname = "freq";
-       version = "0.0.0";
-       sha256 = "0vrhdmhahhxp43312864mvq38w8100970n92vjd77fj50cbh0r2i";
-       doHaddock = false;
-       description = "TBA";
-       license = stdenv.lib.licenses.bsd3;
+       version = "0.1.0.3";
+       sha256 = "0b9ji45n6yhz24x29adyhwmrwp9xyhl2ydm0kk5a9jqv9lddddkp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring containers primitive ];
+       executableHaskellDepends = [ base bytestring containers ];
+       testHaskellDepends = [ base bytestring containers hedgehog ];
+       benchmarkHaskellDepends = [ base bytestring containers gauge ];
+       description = "Are you ready to get freaky?";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "fresco-binding" = callPackage
@@ -79680,7 +76737,6 @@ self: {
        version = "0.1.1";
        sha256 = "1441yv55bwmiwnr6jsccq91anq8vhc2a4ka0irn3i2i9cjzw0gkw";
        libraryHaskellDepends = [ base containers haskell-src-exts syb ];
-       homepage = "https://github.com/davidlazar/fresh";
        description = "Introduce fresh variables into Haskell source code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79704,7 +76760,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2 vector
        ];
-       homepage = "https://github.com/RaphaelJ/friday";
        description = "A functional image processing library for Haskell";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -79721,7 +76776,6 @@ self: {
          base bytestring convertible deepseq friday transformers vector
        ];
        librarySystemDepends = [ libdevil ];
-       homepage = "https://github.com/RaphaelJ/friday-devil";
        description = "Uses the DevIL C library to read and write images from and to files and memory buffers";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79739,7 +76793,6 @@ self: {
        testHaskellDepends = [
          base bytestring file-embed friday hspec JuicyPixels
        ];
-       homepage = "github.com/TomMD/friday-juicypixels";
        description = "Converts between the Friday and JuicyPixels image types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79755,7 +76808,6 @@ self: {
        libraryHaskellDepends = [
          base base-compat carray fft friday vector
        ];
-       homepage = "https://github.com/axman6/friday-scale-dct#readme";
        description = "Scale Friday images with DCT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79797,7 +76849,6 @@ self: {
        version = "0.2.2";
        sha256 = "1mdncc38qwakadr8q4ncz9vzvx9scfhlgk2m540y2mjdypdiicy1";
        libraryHaskellDepends = [ array base containers mtl semigroups ];
-       homepage = "http://repetae.net/computer/frisby/";
        description = "Linear time composable parser for PEG grammars";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79810,7 +76861,6 @@ self: {
        sha256 = "0rv66a7mhswb4sqkyarg9kxxfpiymsmrk49gprq8mpwq7d1qmvd1";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/from-sum";
        description = "Canonical fromMaybeM and fromEitherM functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79827,7 +76877,6 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring hspec QuickCheck text yaml
        ];
-       homepage = "https://github.com/yamadapc/haskell-frontmatter";
        description = "Parses frontmatter as used in Jekyll markdown files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -79853,7 +76902,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "18mnxlwlyh4q18xc9svpwma3qgwp473dfg1z1rmdll6za82zmvzn";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79867,7 +76915,6 @@ self: {
        sha256 = "1ixhcif2db8v6k8m4bgrpiivl0ygb83padnj18w4jyy5br6s1bqz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers mtl transformers ];
-       homepage = "https://github.com/atzeus/FRPNow";
        description = "Principled practical FRP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79883,7 +76930,6 @@ self: {
        libraryHaskellDepends = [
          base containers frpnow gloss mtl transformers
        ];
-       homepage = "https://github.com/atzeus/FRPNow";
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79900,7 +76946,6 @@ self: {
        libraryHaskellDepends = [
          base containers frpnow glib gtk mtl transformers
        ];
-       homepage = "https://github.com/atzeus/FRPNow";
        description = "Program GUIs with GTK and frpnow!";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -79914,7 +76959,6 @@ self: {
        libraryHaskellDepends = [
          base containers frpnow glib gtk3 mtl text
        ];
-       homepage = "https://github.com/george-steel/frpnow-gtk3";
        description = "Program GUIs with GTK3 and frpnow!";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79930,7 +76974,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base frpnow vty ];
        executableHaskellDepends = [ base containers frpnow vty ];
-       homepage = "https://github.com/noughtmare/frpnow-vty";
        description = "Program terminal applications with vty and frpnow!";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79957,7 +77000,6 @@ self: {
        version = "0.1";
        sha256 = "0jw6cx9fzzs8r20acjq8nq8zjhwiwnvg1b0kc97c2sij1bhw6pw4";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/nkpart/fs-events";
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -79997,7 +77039,6 @@ self: {
        libraryHaskellDepends = [
          base containers fgl filepath graphviz MissingH mtl parsec pretty
        ];
-       homepage = "http://projects.haskell.org/fsmActions/";
        description = "Finite state machines and FSM actions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80021,29 +77062,27 @@ self: {
          async base directory filepath tasty tasty-hunit temporary
          unix-compat
        ];
-       homepage = "https://github.com/haskell-fswatch/hfsnotify";
        description = "Cross platform library for file change notification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fsnotify_0_2_1_2" = callPackage
+  "fsnotify_0_3_0_0" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
-     , filepath, hinotify, tasty, tasty-hunit, temporary, text, time
-     , unix-compat
+     , filepath, hinotify, random, shelly, tasty, tasty-hunit, temporary
+     , text, time, unix, unix-compat
      }:
      mkDerivation {
        pname = "fsnotify";
-       version = "0.2.1.2";
-       sha256 = "1384yksg5v1rsbbhncairxh8ahwqmg661mgc2yrcs6hbnv5jzjyp";
+       version = "0.3.0.0";
+       sha256 = "1ni5zmrbc255raxn4ws20n6b1n89yyjxrf96d1fs8y74h3z4ny85";
        libraryHaskellDepends = [
-         async base bytestring containers directory filepath hinotify text
-         time unix-compat
+         async base bytestring containers directory filepath hinotify shelly
+         text time unix unix-compat
        ];
        testHaskellDepends = [
-         async base directory filepath tasty tasty-hunit temporary
+         async base directory filepath random tasty tasty-hunit temporary
          unix-compat
        ];
-       homepage = "https://github.com/haskell-fswatch/hfsnotify";
        description = "Cross platform library for file change notification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80064,7 +77103,6 @@ self: {
          base conduit directory filepath fsnotify hspec resourcet temporary
          transformers
        ];
-       homepage = "https://github.com/fpco/fsnotify-conduit#readme";
        description = "Get filesystem notifications as a stream of events";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80085,7 +77123,6 @@ self: {
          array base haskeline mtl transformers
        ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://www.cse.chalmers.se/alumni/markus/fstStudio/";
        description = "Finite state transducers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80097,7 +77134,6 @@ self: {
        version = "0.1.2";
        sha256 = "07lx4928d1fnjbpfmky4jhhk7sqj98b11vdbv4f67p3bwfn5lrp8";
        libraryHaskellDepends = [ base directory filepath ];
-       homepage = "https://github.com/Raynes/fsutils";
        description = "File system utilities for Haskell that are missing from built in libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80118,7 +77154,6 @@ self: {
          base hinotify optparse-applicative optparse-generic semigroups stm
          system-filepath text time-units turtle
        ];
-       homepage = "https://github.com/ixmatus/fswait";
        description = "Wait and observe events on the filesystem for a path, with a timeout";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80140,7 +77175,6 @@ self: {
        executableHaskellDepends = [
          base directory fsnotify haskeline optparse-applicative process
        ];
-       homepage = "https://github.com/kelemzol/watch";
        description = "File System watching tool with cli and slave functionalities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80159,7 +77193,6 @@ self: {
          base directory fsnotify optparse-applicative process
          regex-pcre-builtin system-filepath unix
        ];
-       homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80196,7 +77229,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mr/ftp-client";
        description = "Transfer files with FTP and FTPS";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80215,7 +77247,6 @@ self: {
          ftp-client resourcet
        ];
        testHaskellDepends = [ base ftp-clientconduit ];
-       homepage = "https://github.com/mr/ftp-client";
        description = "Transfer file with FTP and FTPS with Conduit";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80234,7 +77265,6 @@ self: {
          base byteorder bytestring conduit MissingH network transformers
          utf8-string
        ];
-       homepage = "https://github.com/litherum/ftp-conduit";
        description = "FTP client package with conduit interface based off http-conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80253,7 +77283,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring hslogger MissingH mtl network parsec regex-compat
        ];
-       homepage = "http://software.complete.org/ftphs";
        description = "FTP Client and Server Library";
        license = "LGPL";
      }) {};
@@ -80265,7 +77294,6 @@ self: {
        version = "0.1.3";
        sha256 = "1ma87jnwsgzlr7z6ac303i0qy9i2lywvjgb2zjv9qgnbkf18pg3m";
        libraryHaskellDepends = [ base ShowF type-unary ];
-       homepage = "https://github.com/conal/ftree/";
        description = "Depth-typed functor-based trees, both top-down and bottom-up";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80307,7 +77335,6 @@ self: {
        version = "0.6.2.1";
        sha256 = "0irm1zrggjl9zrapzxfl3kj32d81k30c8nbmr3bf9ramjg65xm90";
        libraryHaskellDepends = [ base ghc network ];
-       homepage = "http://www.agusa.i.is.nagoya-u.ac.jp/person/sydney/full-sessions.html";
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80346,7 +77373,6 @@ self: {
        testHaskellDepends = [
          base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://hub.darcs.net/kowey/fullstop";
        description = "Simple sentence segmenter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80376,7 +77402,6 @@ self: {
          settings tagsoup text time time-interval time-units transformers
          unordered-containers utf8-string vcs-web-hook-parse
        ];
-       homepage = "https://notabug.org/fr33domlover/funbot";
        description = "IRC bot for fun, learning, creativity and collaboration";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80396,7 +77421,6 @@ self: {
          aeson aeson-pretty base bytestring funbot-ext-events HTTP
          network-uri
        ];
-       homepage = "https://notabug.org/fr33domlover/funbot-client/";
        description = "Report events to FunBot over a JSON/HTTP API";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80409,7 +77433,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "075h2iwa4vjhl2ckv7qv4n5s1zfvsnsam06xsznhqpjb9m2m1208";
        libraryHaskellDepends = [ aeson base text ];
-       homepage = "https://notabug.org/fr33domlover/funbot-ext-events";
        description = "Interact with FunBot's external events";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -80429,7 +77452,6 @@ self: {
          base bytestring directory filepath funbot-client funbot-ext-events
          hit network-uri template text utf8-string
        ];
-       homepage = "https://notabug.org/fr33domlover/funbot-git-hook/";
        description = "Git hook which sends events to FunBot";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80443,7 +77465,6 @@ self: {
        sha256 = "1d5appkjhajb9ndv2gwnfz8lw2w53v8baajzmrhg26ihzj1bkch8";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath pretty process ];
-       homepage = "https://github.com/peti/funcmp";
        description = "Functional MetaPost is a Haskell frontend to the MetaPost language";
        license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -80470,7 +77491,6 @@ self: {
          base bv containers directory funcons-values gll mtl multiset
          random-strings regex-applicative split text TypeCompose vector
        ];
-       homepage = "http://plancomps.org";
        description = "A modular interpreter for executing funcons";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80487,7 +77507,6 @@ self: {
        libraryHaskellDepends = [
          base bv containers multiset random-strings text vector
        ];
-       homepage = "http://plancomps.org";
        description = "Library providing values and operations on values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -80511,7 +77530,6 @@ self: {
        version = "0.1";
        sha256 = "0dxym6xrylngw8r5spi246nmi8fvvxxx776qismcr04zqshv7ygw";
        libraryHaskellDepends = [ base numeric-prelude ];
-       homepage = "github.com/kreuzschlitzschraubenzieher/function-instances-algebra";
        description = "Instances of the Algebra.* classes for functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80536,7 +77554,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1l72f0zz2hfhxydsmi0kqcq7mwib0cvk050mdhgyqgqdglphdpi9";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/mniip/functional-kmp";
        description = "KMP implemented on haskell's built-in cons-cell-based lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80562,7 +77579,6 @@ self: {
        version = "0.11";
        sha256 = "0jshf7and80p0gq26zz83xj4p3ff8lppa5252qg0646xsr06lfkr";
        doHaddock = false;
-       homepage = "http://comonad.com/reader/";
        description = "This package has been subsumed by semigroupoids";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80580,7 +77596,6 @@ self: {
        libraryHaskellDepends = [
          base containers hashable unordered-containers vector
        ];
-       homepage = "https://github.com/phadej/functor-classes-compat#readme";
        description = "Data.Functor.Classes instances for core packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80608,7 +77623,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1apbdfhmhw1f30w62wwq6nr98pqhqbadp9c05vc424jm82v0169d";
        libraryHaskellDepends = [ base recursion-schemes ];
-       homepage = "https://github.com/matt-noonan/functor-friends#readme";
        description = "Friendly helpers for your recursion schemes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80620,7 +77634,6 @@ self: {
        version = "0.0.5";
        sha256 = "0rifm1p5zq2711vak2lyxzz2xs03saym3m3695wpf3zy38safbpn";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/fmap/functor-infix";
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80633,7 +77646,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "1qfrnny4qsn94n24q705z8d9gh9llz9nbyqbyy7hwh79bf1rkrcg";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/ombocomp/FunctorMonadic/";
        description = "Monad-style combinators for functors";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -80645,7 +77657,6 @@ self: {
        version = "1.17.1";
        sha256 = "1ixssxdhw94l1kjxd5k4gvq8wz4b9d0vww5mg2al9q3vzb7d4pld";
        libraryHaskellDepends = [ base ghc-prim lens ];
-       homepage = "https://github.com/luna/functor-utils";
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80670,7 +77681,6 @@ self: {
        version = "0.1";
        sha256 = "0nfnjxihn0nhj0rhi1wvqax1f95wskr3fwb7c2clz4lvsma6bfg6";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/aristidb/functors";
        description = "(.:) and friends, syntax for Functor and Applicative.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80709,7 +77719,6 @@ self: {
          path-io process random safe-exceptions tasty tasty-hunit temporary
          text unix
        ];
-       homepage = "https://github.com/tweag/funflow";
        description = "Workflows with arrows";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80728,7 +77737,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory filepath haskell98 HFuse unix
        ];
-       homepage = "http://github.com/nathanwiegand/funion";
        description = "A unioning file-system using HFuse";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80745,7 +77753,6 @@ self: {
        libraryHaskellDepends = [ base hscolour ipprint ];
        testHaskellDepends = [ base hscolour ipprint tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion hscolour ipprint ];
-       homepage = "https://github.com/Pitometsu/funnyprint#readme";
        description = "funnyPrint function to colorize GHCi output";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -80779,7 +77786,6 @@ self: {
          array base bimap bitset containers fgl mtl parse-dimacs pretty
          QuickCheck random time
        ];
-       homepage = "http://github.com/dbueno/funsat";
        description = "A modern DPLL-style SAT solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80795,7 +77801,6 @@ self: {
        sha256 = "0vs899jxnxx7hkw4rxwdd372zpkxb8na8mgc92jidylqxsjw5a4m";
        libraryHaskellDepends = [ base pipes-safe transformers void ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "https://github.com/jwiegley/fusion";
        description = "Effectful streaming library based on shortcut fusion techniques";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80822,7 +77827,6 @@ self: {
        version = "2.0.0";
        sha256 = "1gvv1m6sfxdc28h4rzp5dh6hrz6nfh031nhs192606v8wg78m3ri";
        libraryHaskellDepends = [ base ];
-       homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/future";
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80853,7 +77857,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-expectations HUnit QuickCheck
        ];
-       homepage = "https://github.com/fpco/fuzzcheck";
        description = "A simple checker for stress testing monadic code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80866,7 +77869,6 @@ self: {
        sha256 = "1jz9arrg33x64ygipk0115b7jfchxh20cy14177iwg0na8mpl2l2";
        libraryHaskellDepends = [ base monoid-subclasses ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "http://github.com/joom/fuzzy";
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80880,7 +77882,6 @@ self: {
        sha256 = "1hanmwzr1g11am4z3r9wrkzfycvk76a03cg9bqpifidv7y9hcd73";
        libraryHaskellDepends = [ base hourglass hspec lens parsec ];
        testHaskellDepends = [ base hourglass hspec lens parsec ];
-       homepage = "https://github.com/ReedOei/fuzzy-dates#readme";
        description = "Libary for parsing dates in strings in varied formats";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80901,7 +77902,6 @@ self: {
          base containers HUnit mtl QuickCheck random test-framework
          test-framework-hunit test-framework-quickcheck2 time
        ];
-       homepage = "https://github.com/tlaitinen/fuzzy-timings";
        description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80923,7 +77923,6 @@ self: {
          base base-unicode-symbols hspec ieee754 lens text
          unordered-containers
        ];
-       homepage = "https://github.com/laserpants/fuzzyset-haskell";
        description = "Fuzzy set for approximate string matching";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -80955,7 +77954,6 @@ self: {
        libraryHaskellDepends = [
          base hashable transformers unordered-containers vect vector Yampa
        ];
-       homepage = "https://github.com/ziocroc/FWGL";
        description = "Game engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80973,7 +77971,6 @@ self: {
          base fwgl gl GLFW-b hashable JuicyPixels transformers
          unordered-containers vect vector
        ];
-       homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80990,7 +77987,6 @@ self: {
        libraryHaskellDepends = [
          base fwgl ghcjs-base hashable unordered-containers vect
        ];
-       homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GHCJS backend";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81003,7 +77999,6 @@ self: {
        version = "0.10.1";
        sha256 = "1awscv2y8ywcyyn08hdmlh3qdjs33akr7grfdfls59rmhidg4fhd";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/fx";
        description = "Horizontally composable effects";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81030,7 +78025,6 @@ self: {
        sha256 = "11n0kq3gmmsb5gx796k1x0m20s9zwhx5bgq4ng8j8qwyzmrh4a7w";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/cacay/G4ip";
        description = "A theorem prover for propositional logic that uses G4ip";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81080,7 +78074,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base hscurses random text ];
        testHaskellDepends = [ array base hspec ];
-       homepage = "http://github.com/marcusbuffett/game-of-life";
        description = "Conway's Game of Life";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81133,7 +78126,6 @@ self: {
        libraryHaskellDepends = [
          base continued-fractions converge template-haskell vector
        ];
-       homepage = "https://github.com/mokus0/gamma";
        description = "Gamma function and related functions";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -81159,7 +78151,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base haskeline transformers ];
        executableHaskellDepends = [ base haskeline transformers ];
-       homepage = "http://hub.darcs.net/mekeor/Garepinoh/text/README.md";
        description = "reverse prefix notation calculator and calculation library";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81210,7 +78201,6 @@ self: {
        sha256 = "1mky2jm8qadlv4534xnzfn4r24dipw6ac8s3wpkf90mxw9s6m8xm";
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base hspec mtl transformers ];
-       homepage = "https://github.com/parsonsmatt/garlic-bread#readme";
        description = "A monad transformer for keeping track of where you've come from";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81252,7 +78242,6 @@ self: {
          base bytestring deepseq directory HUnit tasty tasty-hunit
        ];
        benchmarkHaskellDepends = [ base ];
-       homepage = "https://github.com/vincenthz/hs-gauge";
        description = "small framework for performance measurement and analysis";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81268,7 +78257,6 @@ self: {
        libraryHaskellDepends = [
          base containers fgl Graphalyze haskell98 mtl regex-posix
        ];
-       homepage = "http://www.daneel0yaitskov.000space.com";
        description = "planar graph embedding into a plane";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81287,7 +78275,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath hlint parallel
        ];
-       homepage = "http://github.com/ekmett/gc/";
        description = "Poor Richard's Memory Manager";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81304,7 +78291,6 @@ self: {
          aeson base blaze-builder conduit http-types text transformers
          unordered-containers wai
        ];
-       homepage = "https://github.com/yihuang/gc-monitoring-wai";
        description = "a wai application to show GHC.GCStats";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81331,7 +78317,6 @@ self: {
          pipes-aeson pipes-attoparsec pipes-bytestring pipes-parse
          pipes-safe text
        ];
-       homepage = "https://github.com/hackerspace/gcodehs";
        description = "GCode processor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81348,7 +78333,6 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib text ];
        libraryPkgconfigDepends = [ GConf ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) GConf;};
@@ -81402,7 +78386,6 @@ self: {
          exceptions lens lens-aeson mtl tasty tasty-hunit tasty-quickcheck
          tasty-th text time unordered-containers vector websockets wuss
        ];
-       homepage = "https://github.com/AndrewRademacher/gdax";
        description = "API Wrapping for Coinbase's GDAX exchange";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81415,7 +78398,6 @@ self: {
        version = "1.1";
        sha256 = "1d0d8f8bfw7ld6a1d5y6syzdha5qsm909mqzd5gfqcbi2wnh8aqc";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/eelco/gdiff";
        description = "Generic diff and patch";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81431,7 +78413,6 @@ self: {
        libraryHaskellDepends = [
          array base ghc-prim instant-generics template-haskell
        ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic diff for the instant-generics library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81451,7 +78432,6 @@ self: {
        testHaskellDepends = [
          base containers gdiff mtl template-haskell th-expand-syns uniplate
        ];
-       homepage = "https://github.com/jfischoff/gdiff-th";
        description = "Generate gdiff GADTs and Instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81484,7 +78464,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
-       homepage = "https://code.mathr.co.uk/gearbox";
        description = "zooming rotating fractal gears graphics demo";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -81502,7 +78481,6 @@ self: {
          text-all time
        ];
        testHaskellDepends = [ base hspec megaparsec text-all ];
-       homepage = "https://github.com/CLowcay/hs-gedcom";
        description = "Parser for the GEDCOM genealogy file format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81524,7 +78502,6 @@ self: {
          hack2-contrib miku moe mtl process random safe system-filepath text
          text-icu time
        ];
-       homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81549,7 +78526,6 @@ self: {
          air base bytestring data-default geek hack2
          hack2-handler-snap-server pandoc text
        ];
-       homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine server";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81571,7 +78547,6 @@ self: {
        ];
        librarySystemDepends = [ gegl ];
        libraryPkgconfigDepends = [ gegl ];
-       homepage = "https://github.com/nek0/gegl#readme";
        description = "Haskell bindings to GEGL library";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81591,7 +78566,6 @@ self: {
          base bytestring containers lens linear mtl transformers vector
        ];
        executableHaskellDepends = [ base linear mtl vector ];
-       homepage = "https://github.com/schell/gelatin";
        description = "A graphics description language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81610,7 +78584,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/schell/gelatin/gelatin-freetype2#readme";
        description = "FreeType2 based text rendering for the gelatin realtime rendering system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81623,7 +78596,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r";
        libraryHaskellDepends = [ base FontyFruity gelatin linear vector ];
-       homepage = "https://github.com/schell/gelatin-fruity#readme";
        description = "Gelatin's support for rendering TTF outlines, using FontyFruity";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81646,7 +78618,6 @@ self: {
          transformers vector
        ];
        executableHaskellDepends = [ base gelatin lens linear mtl vector ];
-       homepage = "https://github.com/schell/gelatin/gelatin-gl";
        description = "OpenGL rendering routines for the gelatin-picture graphics EDSL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81665,7 +78636,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ];
        executableHaskellDepends = [ base either filepath sdl2 ];
-       homepage = "https://github.com/schell/gelatin";
        description = "An SDL2 backend for the gelatin renderer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81679,7 +78649,6 @@ self: {
        sha256 = "001ifyyv85b9gb5l4hf21b5dqakg4f7n3bil5a1abb4vcj2zmpfr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring filepath gelatin ];
-       homepage = "https://github.com/schell/gelatin-shaders#readme";
        description = "Gelatin's OpenGL shaders";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81698,7 +78667,6 @@ self: {
          array base bitmap bitmap-opengl containers FTGL lens linear OpenGL
          random SDL SDL-image stb-image transformers
        ];
-       homepage = "http://corbinsimpson.com/";
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81715,7 +78683,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring Cabal containers filepath hackage-db pretty
        ];
-       homepage = "https://github.com/clintonmead/gen-imports#readme";
        description = "Code to generate instances for the package \"ghc-instances\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81734,7 +78701,6 @@ self: {
        executableHaskellDepends = [
          base bytestring optparse-applicative random vector
        ];
-       homepage = "https://github.com/anfelor/gen-passwd#readme";
        description = "Create wordlist-based passwords easily";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81752,7 +78718,6 @@ self: {
          base combinat containers ieee754 memoize random template-haskell
          transformers
        ];
-       homepage = "http://github.com/JacquesCarette/GenCheck";
        description = "A testing framework inspired by QuickCheck and SmallCheck";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81769,7 +78734,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ attoparsec base text ];
        executableHaskellDepends = [ attoparsec base text ];
-       homepage = "https://github.com/womfoo/gender";
        description = "Identify a persons gender by their first name";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81802,7 +78766,6 @@ self: {
          aeson aeson-pretty base bytestring safe text
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/seanhess/gendocs#readme";
        description = "Library for generating interface documentation from types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81819,7 +78782,6 @@ self: {
          base monad-loops MonadRandom random random-shuffle
        ];
        testHaskellDepends = [ base hspec HUnit MonadRandom ];
-       homepage = "https://github.com/cgorski/general-games";
        description = "Library supporting simulation of a number of games";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81846,7 +78808,6 @@ self: {
        version = "0.5.5";
        sha256 = "1rwz2ribijj5hb2isg0yz6hb2mwyjhzfg0ys041yb43qlcbhkhdd";
        libraryHaskellDepends = [ base List transformers ];
-       homepage = "http://github.com/yairchu/generator/tree";
        description = "Python-generators notation for creation of monadic lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -81858,7 +78819,6 @@ self: {
        version = "1.0.3";
        sha256 = "0i51xx2hhjqjdvyzy2jza921jcfhy37azyp1cfaakvrj9kxl2w2q";
        libraryHaskellDepends = [ base mtl random ];
-       homepage = "http://liamoc.net/pdf/Generator.pdf";
        description = "Actually useful monadic random value generators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81947,11 +78907,10 @@ self: {
      }:
      mkDerivation {
        pname = "generic-data";
-       version = "0.1.0.0";
-       sha256 = "1fc2q8wzs67ww0dy00wsyyqnhb5igrpqsvi1hwxxsq5z00icvk6z";
+       version = "0.1.1.0";
+       sha256 = "1a7pjpr5xmwdmy9l2243a0259n9ndmh868x99ckhm4r7gnra9gg6";
        libraryHaskellDepends = [ base contravariant show-combinators ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/Lysxia/generic-data#readme";
        description = "Utilities for GHC.Generics";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81978,7 +78937,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
-       homepage = "https://github.com/dreixel/generic-deriving";
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -81999,7 +78957,6 @@ self: {
        ];
        testHaskellDepends = [ base hspec template-haskell ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/dreixel/generic-deriving";
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82030,7 +78987,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq lens QuickCheck
        ];
-       homepage = "https://github.com/kcsongor/generic-lens";
        description = "Generic data-structure operations exposed as lenses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82050,7 +79006,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq lens QuickCheck
        ];
-       homepage = "https://github.com/kcsongor/generic-lens";
        description = "Generically derive traversals, lenses and prisms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82063,7 +79018,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0lhzxknz8117zc28d7l9wfvln5lp7alxfx8f6q4b986i93dzkl09";
        libraryHaskellDepends = [ base generic-lens ];
-       homepage = "https://github.com/duog/generic-lens-labels";
        description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82096,7 +79050,6 @@ self: {
          split text unordered-containers vector
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/jfischoff/generic-maybe";
        description = "A generic version of Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82116,7 +79069,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers tasty tasty-hunit text vector
        ];
-       homepage = "https://github.com/tanakh/generic-pretty";
        description = "Pretty printing for Generic value";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82132,7 +79084,6 @@ self: {
        editedCabalFile = "1qhjsxaadvnh41qrlnzp2wxrbxxsbsz9np4mhwq5vck07kqws5bk";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://github.com/lysxia/generic-random";
        description = "Generic random generators";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -82144,7 +79095,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0xga8vm89xjgzmnz5032kqyq1q8nhbf01n55xjgda4kfjzkx1yr0";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kcsongor/generic-records";
        description = "Magic record operations using generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82193,7 +79143,6 @@ self: {
        revision = "1";
        editedCabalFile = "0rr6fncm17ff7z9jdb90gvd03smd8vlhmhzf5b9hzms7s2scnvh6";
        libraryHaskellDepends = [ base containers transformers ];
-       homepage = "http://github.com/glguy/tries";
        description = "A map, where the keys may be complex structured data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82228,7 +79177,6 @@ self: {
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
        ];
-       homepage = "http://github.com/silkapp/generic-xmlpickler";
        description = "Generic generation of HXT XmlPickler instances using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82248,7 +79196,6 @@ self: {
          mockery QuickCheck shake
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/soenkehahn/generics-eot#readme";
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82266,12 +79213,22 @@ self: {
          base directory doctest filepath hspec interpolate markdown-unlit
          mockery QuickCheck shake silently
        ];
-       homepage = "https://generics-eot.readthedocs.io/";
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "generics-mrsop" = callPackage
+    ({ mkDerivation, base, containers, mtl, template-haskell }:
+     mkDerivation {
+       pname = "generics-mrsop";
+       version = "1.0.0.1";
+       sha256 = "1spnsr127rhcpjwd7604pp7rpqp3q4rc8lb9msgl424hf62xbqq3";
+       libraryHaskellDepends = [ base containers mtl template-haskell ];
+       description = "Generic Programming with Mutually Recursive Sums of Products";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "generics-sop" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }:
      mkDerivation {
@@ -82295,7 +79252,6 @@ self: {
        revision = "3";
        editedCabalFile = "1phq0hjpgxfvb8ay9v4ix6axk07mbd266javss9nmqmqmn3vnb51";
        libraryHaskellDepends = [ base generics-sop lens ];
-       homepage = "https://github.com/phadej/generics-sop-lens#readme";
        description = "Lenses for types in generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82336,7 +79292,6 @@ self: {
          base hspec monad-control monad-logger monad-persist
          persistent-sqlite persistent-template text
        ];
-       homepage = "https://github.com/cjdev/genesis#readme";
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82361,7 +79316,6 @@ self: {
          base envparse genesis hspec monad-logger monad-persist
          persistent-template text
        ];
-       homepage = "https://github.com/cjdev/genesis#readme";
        description = "Opinionated bootstrapping for Haskell web services";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82400,7 +79354,6 @@ self: {
          hslogger json mtl process text transformers wx wxcore yaml-light
        ];
        executableHaskellDepends = [ base GenI ];
-       homepage = "http://projects.haskell.org/GenI";
        description = "GenI graphical user interface";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82425,7 +79378,6 @@ self: {
        executableHaskellDepends = [
          base bytestring cmdargs directory filepath GenI json text
        ];
-       homepage = "http://kowey.github.io/GenI";
        description = "Companion tools for use with the GenI surface realiser";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82446,7 +79398,6 @@ self: {
          base binary containers GenI haskell98 HaXml HUnit mtl parsec
          QuickCheck utf8-string
        ];
-       homepage = "http://wiki.loria.fr/wiki/GenI";
        description = "Conversion utility for the GenI generator";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82460,7 +79411,6 @@ self: {
        sha256 = "0ic0hhdm789gj1s88n1zhixc0c2y81ycicgcnlzgl6l6lv7z3w1d";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base containers mtl template-haskell ];
-       homepage = "https://github.com/danr/genifunctors";
        description = "Generate generalized fmap, foldMap and traverse";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82484,7 +79434,6 @@ self: {
        version = "0.7.6";
        sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb";
        libraryHaskellDepends = [ base mtl template-haskell ];
-       homepage = "https://github.com/danr/geniplate";
        description = "Use Template Haskell to generate Uniplate-like functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -82518,7 +79467,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1a9b2h4swfwx5zwcyr2zdhxdxi9f68pwpglijxhxb5javjc4dppr";
        libraryHaskellDepends = [ base MonadRandom syb syz ];
-       homepage = "http://github.com/jsnajder/genprog";
        description = "Genetic programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82532,7 +79480,6 @@ self: {
        sha256 = "1cb9si5axwqi1d893vp6n2mr68isdxc9qp6dfygy0v6hci2spnmm";
        libraryHaskellDepends = [ base parsec transformers ];
        testHaskellDepends = [ base HUnit parsec transformers ];
-       homepage = "http://github.com/andriyp/gentlemark";
        description = "Gentle markup language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82546,7 +79493,6 @@ self: {
        sha256 = "0gfndjss4j2dmyk46r9ab3ahw8pmc6bry7nzzx7qpgim6zz5597w";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -82559,7 +79505,6 @@ self: {
        sha256 = "0xf1sd5g87gvdg1n3g7in7x8x4cf1jnsbaxmq64qmjlns4qr0fnk";
        libraryHaskellDepends = [ base QuickCheck validity ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Testing utilities for the validity library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82583,7 +79528,6 @@ self: {
        testHaskellDepends = [
          aeson base genvalidity genvalidity-hspec hspec
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for aeson";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82607,7 +79551,6 @@ self: {
        testHaskellDepends = [
          aeson base genvalidity genvalidity-hspec hspec
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for aeson";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82627,7 +79570,6 @@ self: {
        testHaskellDepends = [
          base bytestring genvalidity genvalidity-hspec hspec QuickCheck
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for ByteString";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82647,7 +79589,6 @@ self: {
        testHaskellDepends = [
          base bytestring genvalidity genvalidity-hspec hspec QuickCheck
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for ByteString";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82667,7 +79608,6 @@ self: {
        testHaskellDepends = [
          base containers genvalidity genvalidity-hspec hspec
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82687,7 +79627,6 @@ self: {
        testHaskellDepends = [
          base containers genvalidity genvalidity-hspec hspec
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82708,7 +79647,6 @@ self: {
        testHaskellDepends = [
          base doctest genvalidity hspec hspec-core QuickCheck
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82729,7 +79667,6 @@ self: {
        testHaskellDepends = [
          base doctest genvalidity hspec hspec-core QuickCheck
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82752,7 +79689,6 @@ self: {
          aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
          genvalidity-text hspec text
        ];
-       homepage = "http://cs-syd.eu";
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82775,7 +79711,6 @@ self: {
          aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
          genvalidity-text hspec text
        ];
-       homepage = "http://cs-syd.eu";
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82793,7 +79728,6 @@ self: {
          base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
        testHaskellDepends = [ base doctest genvalidity hspec ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for binary-related Instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82811,7 +79745,6 @@ self: {
          base binary deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
        testHaskellDepends = [ base doctest genvalidity hspec ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for binary-related Instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82829,7 +79762,6 @@ self: {
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
        testHaskellDepends = [ base doctest genvalidity hspec ];
-       homepage = "http://cs-syd.eu";
        description = "Standard spec's for cereal-related instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82847,7 +79779,6 @@ self: {
          base cereal deepseq genvalidity genvalidity-hspec hspec QuickCheck
        ];
        testHaskellDepends = [ base doctest genvalidity hspec ];
-       homepage = "http://cs-syd.eu";
        description = "Standard spec's for cereal-related instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82870,7 +79801,6 @@ self: {
          base doctest genvalidity genvalidity-hspec hashable hspec
          hspec-core QuickCheck
        ];
-       homepage = "https://github.com/NorfairKing/validity";
        description = "Standard spec's for Hashable instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82893,7 +79823,6 @@ self: {
          base doctest genvalidity genvalidity-hspec hashable hspec
          hspec-core QuickCheck
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard spec's for Hashable instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82909,7 +79838,6 @@ self: {
        sha256 = "140myxs62amq43mrxdkyxg33ilj8ll4jwd602c5cwz05x0wn634h";
        libraryHaskellDepends = [ base genvalidity path validity-path ];
        testHaskellDepends = [ base genvalidity-hspec hspec path ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Path";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82930,7 +79858,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion genvalidity path QuickCheck
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Path";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82948,7 +79875,6 @@ self: {
          base genvalidity hspec QuickCheck validity
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard properties for functions on `Validity` types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -82965,7 +79891,6 @@ self: {
          base genvalidity hspec QuickCheck validity
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Standard properties for functions on `Validity` types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -82985,7 +79910,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec QuickCheck scientific
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Scientific";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83005,7 +79929,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec QuickCheck scientific
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Scientific";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83025,7 +79948,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec QuickCheck text
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83045,7 +79967,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec QuickCheck text
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83063,7 +79984,6 @@ self: {
          base genvalidity QuickCheck time validity-time
        ];
        testHaskellDepends = [ base genvalidity-hspec hspec time ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for time";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83081,7 +80001,6 @@ self: {
          base genvalidity QuickCheck time validity-time
        ];
        testHaskellDepends = [ base genvalidity-hspec hspec time ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for time";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83103,7 +80022,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec unordered-containers
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for unordered-containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83125,7 +80043,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec unordered-containers
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for unordered-containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83145,7 +80062,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec QuickCheck uuid
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for UUID";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83165,7 +80081,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec QuickCheck uuid
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for UUID";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83185,7 +80100,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec vector
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for vector";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83205,7 +80119,6 @@ self: {
        testHaskellDepends = [
          base genvalidity genvalidity-hspec hspec vector
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "GenValidity support for vector";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83229,7 +80142,6 @@ self: {
          base base64-bytestring bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/markenwerk/haskell-geo-resolver/";
        description = "Performs geo location lookups and parses the results";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83247,7 +80159,6 @@ self: {
        libraryHaskellDepends = [
          array base binary bytestring bzlib template-haskell th-lift
        ];
-       homepage = "https://github.com/tolysz/geo-uk";
        description = "High precision conversion between GPS and UK Grid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83274,7 +80185,6 @@ self: {
        libraryHaskellDepends = [
          base containers hjson HTTP network network-uri
        ];
-       homepage = "http://github.com/mrd/geocode-google";
        description = "Geocoding using the Google Web API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83291,7 +80201,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/NICTA/geodetic";
        description = "Geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83312,7 +80221,6 @@ self: {
          array base checkers dimensional HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/PaulJohnson/geodetics";
        description = "Terrestrial coordinate systems and geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83361,7 +80269,6 @@ self: {
          base bytestring directory doctest filepath hlint QuickCheck
          template-haskell
        ];
-       homepage = "https://github.com/domdere/hs-geojson";
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83374,7 +80281,6 @@ self: {
        version = "0.1.3";
        sha256 = "10kcrvimb7mdy59bk7x7nwkzhp85ws4511xakcl6bgiwhls39x4j";
        libraryHaskellDepends = [ aeson base bson bytestring lens text ];
-       homepage = "https://github.com/alios/geojson-types/";
        description = "GeoJSON data types including JSON/BSON conversion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83394,7 +80300,6 @@ self: {
          base colonnade directory HUnit pipes pipes-bytestring pipes-text
          siphon test-framework test-framework-hunit text
        ];
-       homepage = "https://github.com/andrewthad/colonnade";
        description = "Geolite CSV Parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83446,7 +80351,6 @@ self: {
          base curl directory filepath haskell98 hxt mtl old-locale process
          time
        ];
-       homepage = "http://bitbucket.org/kenko/getemx";
        description = "Fetch from emusic using .emx files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83479,7 +80383,6 @@ self: {
          base base-compat base-orphans filepath generics-sop hspec
          QuickCheck safe silently tagged
        ];
-       homepage = "https://github.com/soenkehahn/getopt-generics#readme";
        description = "Create command line interfaces with ease";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83491,7 +80394,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1pf40nc3jzprv4wn9h8mr0nhzxzilffgkapxg3k0qksfxydzv7pp";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://bitbucket.org/dpwiz/getopt-simple";
        description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83527,7 +80429,6 @@ self: {
          sed -i "s|numJobs (bf bi)++||" ./Setup.hs
        '';
        preBuild = ''export LD_LIBRARY_PATH=`pwd`/dist/build:$LD_LIBRARY_PATH'';
-       homepage = "http://www.grammaticalframework.org/";
        description = "Grammatical Framework";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83543,7 +80444,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers parsec ];
-       homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
        description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83560,7 +80460,6 @@ self: {
        executableHaskellDepends = [
          base directory github memory text vector
        ];
-       homepage = "https://github.com/vincenthz/gh-labeler#readme";
        description = "Github Standard Labeler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83580,7 +80479,6 @@ self: {
        ];
        executableHaskellDepends = [ aeson base bytestring ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/pbrisbin/gh-pocket-knife#readme";
        description = "Script helpers for interacting with GitHub";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83601,7 +80499,6 @@ self: {
          time transformers unix
        ];
        libraryToolDepends = [ alex happy ];
-       homepage = "http://www.haskell.org/ghc/";
        description = "The GHC API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83642,7 +80539,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "01gvyl2r7jqxca33gdavv6l2a6yz4xh2ndmb4v0y2mdgc9sskymc";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/treeowl/ghc-call-stack-extras";
        description = "Extra utilities for HasCallStack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83674,7 +80570,6 @@ self: {
        executableHaskellDepends = [
          base colorize-haskell directory filepath pcre-light process
        ];
-       homepage = "https://github.com/shachaf/ghc-core";
        description = "Display GHC's core and assembly output in a pager";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83693,7 +80588,6 @@ self: {
        executableHaskellDepends = [
          base blaze-html bytestring containers mtl parsec process
        ];
-       homepage = "https://github.com/vincenthz/ghc-core-html";
        description = "Core to HTML display";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83718,7 +80612,6 @@ self: {
        version = "0.2.0";
        sha256 = "0wmlryqsw4mhk85wnril0p14gx2y0wjmq9iv9jjy0wl6gw5ps1yh";
        libraryHaskellDepends = [ base deepseq ghc-heap-view ];
-       homepage = "http://felsin9.de/nnis/ghc-datasize";
        description = "Determine the size of data structures in GHC's memory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83759,7 +80652,6 @@ self: {
          aeson base bytestring ghc optparse-applicative pretty pretty-show
          process unordered-containers vector
        ];
-       homepage = "https://github.com/edsko/ghc-dump-tree";
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83899,7 +80791,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath process ];
-       homepage = "http://code.haskell.org/~dons/code/ghc-gc-tune";
        description = "Graph performance of Haskell programs with different GC flags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -83911,7 +80802,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0264ma0w85fwypnagd0l4zfs1wi1yk16rygn6fhpzgsxycwmg47h";
        libraryHaskellDepends = [ base ghc ];
-       homepage = "https://github.com/alanz/ghc-generic-instances";
        description = "Derived instances of GHC.Generic of the GHC AST";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83967,7 +80857,6 @@ self: {
          monad-journal mtl optparse-applicative parsec process
          process-streaming safe syb transformers
        ];
-       homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -83990,7 +80879,6 @@ self: {
          filepath ghc ghc-boot ghc-compact ghc-prim hoopl hpc integer-gmp
          process template-haskell time unix
        ];
-       homepage = "https://github.com/clintonmead/ghc-instances#readme";
        description = "Easily import all instances contained in GHC distributed libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84003,7 +80891,6 @@ self: {
        sha256 = "0qr6ipsq7g1275svdgqcppcb37r387fvap5fyyn6fn4h84dhvkby";
        libraryHaskellDepends = [ base ghc hashable ];
        testHaskellDepends = [ base inspection-testing ];
-       homepage = "https://github.com/nomeata/ghc-justdoit";
        description = "A magic typeclass that just does it";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84020,7 +80907,6 @@ self: {
        executableHaskellDepends = [
          base process shake unordered-containers
        ];
-       homepage = "https://github.com/ndmitchell/ghc-make#readme";
        description = "Accelerated version of ghc --make";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84081,7 +80967,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion directory filepath temporary
        ];
-       homepage = "https://github.com/DanielG/ghc-mod";
        description = "Happy Haskell Hacking";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84097,7 +80982,6 @@ self: {
        libraryHaskellDepends = [
          base exceptions extensible-exceptions ghc mtl
        ];
-       homepage = "http://hub.darcs.net/jcpetruzza/ghc-mtl";
        description = "An mtl compatible version of the Ghc-Api monads and monad-transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84120,7 +81004,6 @@ self: {
          base bin-package-db Cabal directory filepath ghc ghc-paths process
          transformers unix
        ];
-       homepage = "https://github.com/ranjitjhala/ghc-options.git";
        description = "Utilities for extracting GHC options needed to compile a given Haskell target";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84148,7 +81031,6 @@ self: {
          base directory filepath HUnit process QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/23Skidoo/ghc-parmake";
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84161,7 +81043,6 @@ self: {
        sha256 = "1130fpddf3jx84k558gsc83j3166qy15jp878w2d3lwgzxjcqx5v";
        libraryHaskellDepends = [ base ghc ];
        libraryToolDepends = [ cpphs happy ];
-       homepage = "https://github.com/gibiansky/IHaskell";
        description = "Haskell source parser from GHC";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -84208,7 +81089,6 @@ self: {
        libraryHaskellDepends = [
          base Cabal directory filepath ghc ghc-paths
        ];
-       homepage = "https://github.com/JPMoresmau/ghc-pkg-lib";
        description = "Provide library support for ghc-pkg information";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84243,7 +81123,6 @@ self: {
          attoparsec base containers directory filepath process tasty
          tasty-hunit temporary text
        ];
-       homepage = "https://github.com/maoe/ghc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84256,7 +81135,6 @@ self: {
        sha256 = "10vwwxiy53bacdzz0i62ashbr5snzda1v3qlb5bqk4f770fa7mpl";
        libraryHaskellDepends = [ aeson base text vector ];
        testHaskellDepends = [ aeson base bytestring hspec ];
-       homepage = "https://github.com/Fuuzetsu/ghc-prof-aeson#readme";
        description = "Parser for GHC's JSON profiling output";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84275,7 +81153,6 @@ self: {
          aeson base bytestring containers ghc-prof-aeson
          optparse-applicative text vector
        ];
-       homepage = "https://github.com/Fuuzetsu/ghc-prof-aeson-flamegraph#readme";
        description = "Turn GHC `-pj` profiling output into FlameGraph format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84302,7 +81179,6 @@ self: {
        sha256 = "1kyy2wck8n6cjfcsqv4ki5dsakgps9brpad0lcsgnpixx9x8w88h";
        libraryHaskellDepends = [ base ghc ];
        testHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/nomeata/ghc-proofs";
        description = "GHC plugin to prove program equations by simplification";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -84333,7 +81209,6 @@ self: {
          transformers-compat
        ];
        executableHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/pmlodawski/ghc-session";
        description = "Simplified GHC API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84350,7 +81225,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring directory filepath ghc ghc-paths
        ];
-       homepage = "https://github.com/valderman/ghc-simple";
        description = "Simplified interface to the GHC API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84375,7 +81249,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0rwx7l89r5yfi1187c0zgx1ph2rsagyvrizb1c0vnbyrwhpbslh0";
        libraryHaskellDepends = [ base ghc ];
-       homepage = "http://github.com/nominolo/ghc-syb";
        description = "Data and Typeable instances for the GHC API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84389,7 +81262,6 @@ self: {
        sha256 = "0fj7cqkdkb2kbfsif62bgc17cymnxjr6nnbsd1z4hfw8hz4pchjz";
        libraryHaskellDepends = [ base ghc syb ];
        testHaskellDepends = [ base directory filepath ghc ghc-paths ];
-       homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84404,7 +81276,6 @@ self: {
        libraryHaskellDepends = [ base ghc text ];
        testHaskellDepends = [ base hspec text ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/mrkkrp/ghc-syntax-highlighter";
        description = "Syntax highlighter for Haskell using lexer of GHC itself";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84417,7 +81288,6 @@ self: {
        version = "0.2.5";
        sha256 = "0xkq24dr2div9d9hr4rpz65968syqjignn9xn5q48vmzh1m1xwws";
        libraryHaskellDepends = [ base ghc ];
-       homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -84429,7 +81299,6 @@ self: {
        version = "0.3";
        sha256 = "0k1ph8za52mx6f146xhaakn630xrzk42ylchv4b9r04hslhzvb1h";
        libraryHaskellDepends = [ base ghc ];
-       homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84450,7 +81319,6 @@ self: {
          attoparsec base directory filepath process tasty tasty-hunit
          temporary text
        ];
-       homepage = "https://github.com/maoe/ghc-time-alloc-prof";
        description = "Library for parsing GHC time and allocation profiling reports";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84463,7 +81331,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "074pvam1mb5sranh04i6xcs55vgk3h45vg0mdxnbxc3jmmv76lgi";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/bitonic/ghc-timers#readme";
        description = "Provides bindings to functions starting and stopping the RTS timers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84476,7 +81343,6 @@ self: {
        sha256 = "00lq6bcl78drqlzj39avf9k2x2q4d2fdac3rrxrxicsdwry6brkk";
        libraryHaskellDepends = [ base bytestring text ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/maoe/ghc-trace-events";
        description = "Faster replacements for traceEvent and traceEventMarker";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84500,7 +81366,6 @@ self: {
          base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
          tasty-hunit template-haskell
        ];
-       homepage = "http://www.clash-lang.org/";
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -84522,7 +81387,6 @@ self: {
          base ghc-typelits-knownnat ghc-typelits-natnormalise tasty
          tasty-hunit template-haskell
        ];
-       homepage = "http://www.clash-lang.org/";
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84546,7 +81410,6 @@ self: {
        testHaskellDepends = [
          base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://clash-lang.org/";
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -84567,7 +81430,6 @@ self: {
        testHaskellDepends = [
          base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://clash-lang.org/";
        description = "Derive KnownNat constraints from other KnownNat constraints";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84587,7 +81449,6 @@ self: {
          base ghc ghc-tcplugins-extra integer-gmp
        ];
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -84604,7 +81465,6 @@ self: {
          base ghc ghc-tcplugins-extra integer-gmp transformers
        ];
        testHaskellDepends = [ base tasty tasty-hunit template-haskell ];
-       homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84624,7 +81484,6 @@ self: {
          base containers equational-reasoning ghc ghc-tcplugins-extra pretty
          reflection
        ];
-       homepage = "https://github.com/konn/ghc-typelits-presburger#readme";
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84657,7 +81516,6 @@ self: {
          base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl
          svgcairo text transformers xdot
        ];
-       homepage = "http://felsin9.de/nnis/ghc-vis";
        description = "Live visualization of data structures in GHCi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84707,7 +81565,6 @@ self: {
          array base bytestring directory filepath ghc ghc-paths haskeline
          mtl process unix
        ];
-       homepage = "http://code.haskell.org/~judah/ghci-haskeline";
        description = "An implementation of ghci using the Haskeline line-input library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84733,7 +81590,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "06lg1czsr6k5h18aks33p2kbahiidhv7xsrv7n1fcvqsgglzgk3z";
        libraryHaskellDepends = [ base ghc MissingH ];
-       homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for interactively evaluating Haskell code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84756,7 +81612,6 @@ self: {
          array base bytestring containers directory filepath ghc ghc-paths
          haskeline process syb time transformers unix
        ];
-       homepage = "https://github.com/chrisdone/ghci-ng";
        description = "Next generation GHCi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84769,7 +81624,6 @@ self: {
        version = "0.0.2";
        sha256 = "01syl5c6ana4m8d3jc5pbi64zf3c4l2x0r7jwkizm7kymszmbns5";
        libraryHaskellDepends = [ base hscolour ipprint ];
-       homepage = "https://github.com/larskuhtz/ghci-pretty";
        description = "colored pretty-printing within ghci";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -84796,7 +81650,6 @@ self: {
          ansi-terminal base cmdargs containers directory extra filepath
          fsnotify process tasty tasty-hunit terminal-size time unix
        ];
-       homepage = "https://github.com/ndmitchell/ghcid#readme";
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84823,7 +81676,6 @@ self: {
          ansi-terminal base cmdargs containers directory extra filepath
          fsnotify process tasty tasty-hunit terminal-size time unix
        ];
-       homepage = "https://github.com/ndmitchell/ghcid#readme";
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84836,7 +81688,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0yf2lpd7n891i61w1g0zbmi2zv93a2jzifxdsrqj39wxhl6afpc6";
        libraryHaskellDepends = [ aeson base http-types text ];
-       homepage = "https://github.com/agrafix/ghcjs-ajax#readme";
        description = "Crossbrowser AJAX Bindings for GHCJS";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -84854,7 +81705,6 @@ self: {
          aeson attoparsec base containers deepseq ghc-prim primitive
          scientific text transformers unordered-containers vector
        ];
-       homepage = "https://github.com/louispan/javascript-stub#readme";
        description = "Allow GHCJS projects to compile under GHC and develop using intero";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -84867,7 +81717,6 @@ self: {
        sha256 = "04x5h0i4fgyc2c5ihrnk0w3l1f3avvcl115zlnich93nillgbnfw";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/ghcjs/CodeMirror";
        description = "Installs CodeMirror JavaScript files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -84904,7 +81753,6 @@ self: {
        executableHaskellDepends = [
          base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl
        ];
-       homepage = "https://github.com/ghcjs/ghcjs-dom-hello";
        description = "GHCJS DOM Hello World, an example package";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84957,10 +81805,11 @@ self: {
        pname = "ghcjs-fetch";
        version = "0.1.0.0";
        sha256 = "0ya6n8716likfgmm69z8q6dj4gf1w7063ni24di8xbv5ylxa0d39";
+       revision = "1";
+       editedCabalFile = "1fh6jdi5n448g3s61l178q7kc15nch7lzrdqya1w2sggrakww42k";
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive ghcjs-base-stub http-types
        ];
-       homepage = "https://github.com/cocreature/ghcjs-fetch#readme";
        description = "GHCJS bindings for the JavaScript Fetch API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -84978,7 +81827,6 @@ self: {
          base bytestring containers directory ghcjs-perch mtl transformers
          transient transient-universe
        ];
-       homepage = "https://github.com/transient-haskell/ghcjs-hplay";
        description = "Client-side web EDSL for transient nodes running in the web browser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85002,7 +81850,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "06zq3bqcrci7zgkgphkhv5awzw75ivg6hn9avx9c4yp2c1ra3593";
        libraryHaskellDepends = [ base ghcjs-base protolude ];
-       homepage = "https://github.com/vwwv/ghcjs-promise";
        description = "Bidirectional bidings to javascript's promise";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85041,7 +81888,6 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring binary bytestring ghcjs-base text
        ];
-       homepage = "http://github.com/mstksg/ghcjs-websockets";
        description = "Deprecated: use ghcjs-base's native websockets";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -85053,7 +81899,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "07nra5d0hc70v23wqaivwj96lakiz34vv96m9khi5y9f5lsads0l";
        libraryHaskellDepends = [ base ghcjs-base text ];
-       homepage = "https://github.com/tdammers/ghcjs-xhr";
        description = "XmlHttpRequest (\"AJAX\") bindings for GHCJS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85081,7 +81926,6 @@ self: {
          file-embed hint mtl text time unix unordered-containers vector wai
          wai-websockets warp websockets yesod yesod-static
        ];
-       homepage = "http://github.com/shapr/ghclive/";
        description = "Interactive Haskell interpreter in a browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85096,7 +81940,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base zenc ];
-       homepage = "https://github.com/Peaker/ghczdecode";
        description = "Decode Z-encoded strings from GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85109,7 +81952,6 @@ self: {
        sha256 = "1mpnvdb6p6hda645njnfia5j259byrs0mg2fl3syff3qww797l02";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/Lazersmoke/ghost-buster#readme";
        description = "Existential type utilites";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85154,7 +81996,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ atk ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Atk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85180,7 +82021,6 @@ self: {
          PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Cairo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85202,7 +82042,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ libdbusmenu-glib ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Dbusmenu bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85226,7 +82065,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ libdbusmenu-gtk3 ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85250,7 +82088,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gdk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85272,7 +82109,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gdk_pixbuf ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85294,7 +82130,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GdkX11 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85316,7 +82151,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ libgit2-glib ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "libgit2-glib bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85338,7 +82172,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gio bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85360,7 +82193,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gobjectIntrospection ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GIRepository (gobject-introspection) bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85382,7 +82214,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GLib bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85404,7 +82235,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ glib ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GObject bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85426,7 +82256,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamer bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85448,7 +82277,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85470,7 +82298,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerBase bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85494,7 +82321,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer-pbutils ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamer Plugins Base Utils bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85516,7 +82342,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gstreamer-tag ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamer Tag bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85538,7 +82363,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gst-plugins-base ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GStreamerVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85562,7 +82386,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85581,7 +82404,6 @@ self: {
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
        ];
-       homepage = "https://github.com/haskell-gi/gi-gtk-hs";
        description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85603,7 +82425,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GtkosxApplication bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85627,7 +82448,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtksourceview3 ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GtkSource bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85649,7 +82469,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85671,7 +82490,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ libnotify ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libnotify bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85693,7 +82511,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ ostree ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "OSTree bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85719,7 +82536,6 @@ self: {
          PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Pango bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85746,7 +82562,6 @@ self: {
          PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig"
          setupCompileFlags+=" $(pkg-config --libs cairo-gobject)"
        '';
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "PangoCairo bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85768,7 +82583,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ poppler ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Poppler bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85790,7 +82604,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ libsecret ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libsecret bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85812,7 +82625,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ libsoup ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Libsoup bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85835,7 +82647,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ vte ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Vte bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85859,7 +82670,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85883,7 +82693,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit2 bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85907,7 +82716,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ webkitgtk-web-extension ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit2-WebExtension bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85928,7 +82736,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ x11 ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "xlib bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85949,7 +82756,6 @@ self: {
          async base bytestring Cabal containers directory extra filemanip
          filepath mtl process semigroups stm stm-chans text unix wybor
        ];
-       homepage = "http://github.com/nmattia/giak";
        description = "Fuzzy finder for cabal executables";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -85962,7 +82768,6 @@ self: {
        version = "0.1.3.0";
        sha256 = "1hxdgff1rw3yp3a2p26bj6034jgc458bdzma1xkbh9pahlhwhs2l";
        libraryHaskellDepends = [ base split ];
-       homepage = "https://github.com/gazay/gimlh";
        description = "Haskell parser for GIML";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -85994,7 +82799,6 @@ self: {
          tasty-quickcheck text time transformers unordered-containers
          utf8-string
        ];
-       homepage = "https://bitbucket.org/tdammers/ginger";
        description = "An implementation of the Jinja2 template language in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -86018,7 +82822,6 @@ self: {
          random regex-posix syb unix utf8-string
        ];
        executableSystemDepends = [ openssl ];
-       homepage = "http://repetae.net/computer/ginsu/";
        description = "Ginsu Gale Client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86038,7 +82841,6 @@ self: {
          array base bytestring containers glib mtl
        ];
        libraryPkgconfigDepends = [ system-glib ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to GIO";
        license = stdenv.lib.licenses.lgpl21;
      }) {system-glib = pkgs.glib;};
@@ -86061,7 +82863,6 @@ self: {
          scientific shake split tagged text transformers
          unordered-containers vector yaml
        ];
-       homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86088,7 +82889,6 @@ self: {
          aeson base basic-prelude bytestring containers directory hspec lens
          network-uri text
        ];
-       homepage = "http://github.com/passy/giphy-api#readme";
        description = "Giphy HTTP API wrapper and CLI search tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86107,7 +82907,6 @@ self: {
        executableHaskellDepends = [
          aeson base bytestring conduit http-conduit text
        ];
-       homepage = "http://github.com/simonmichael/gist";
        description = "A reliable command-line client for gist.github.com";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86133,7 +82932,6 @@ self: {
          base bytedump bytestring hourglass tasty tasty-quickcheck
        ];
        doCheck = false;
-       homepage = "https://github.com/vincenthz/hs-git";
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86152,7 +82950,6 @@ self: {
          base cmdargs hslogger parallel-io regex-posix shelly system-fileio
          system-filepath text transformers unix
        ];
-       homepage = "https://github.com/jwiegley/git-all";
        description = "Determine which Git repositories need actions to be taken";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86223,7 +83020,6 @@ self: {
          git-annex test
        '';
        enableSharedExecutables = false;
-       homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -86246,7 +83042,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath optparse-applicative parsec pretty process
        ];
-       homepage = "https://github.com/dougalstanton/git-checklist";
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86268,7 +83063,6 @@ self: {
          base megaparsec smallcheck smallcheck-series tasty tasty-discover
          tasty-hunit tasty-smallcheck tasty-travis text unordered-containers
        ];
-       homepage = "https://github.com/dogonthehorizon/git-config#readme";
        description = "A simple parser for Git configuration files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86287,7 +83081,6 @@ self: {
          base bytestring old-locale QuickCheck test-framework
          test-framework-quickcheck2 time utf8-string
        ];
-       homepage = "https://github.com/singpolyma/git-date-haskell";
        description = "Bindings to the date parsing from Git";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86304,7 +83097,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath process template-haskell
        ];
-       homepage = "https://github.com/borsboom/git-embed";
        description = "Use TH to embed Git repo information";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -86327,7 +83119,6 @@ self: {
          monad-parallel mtl omnifmt optparse-applicative pipes
          pipes-concurrency process temporary text time
        ];
-       homepage = "https://github.com/hjwylde/git-fmt";
        description = "Custom git command for formatting code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86351,7 +83142,6 @@ self: {
          base bytestring containers hspec io-streams optparse-applicative
          process text
        ];
-       homepage = "https://github.com/fujimura/git-freq";
        description = "A Git subcommand to show total addition, deletion per file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86373,7 +83163,6 @@ self: {
          hslogger old-locale optparse-applicative shelly tagged text time
          transformers
        ];
-       homepage = "http://github.com/jwiegley/gitlib";
        description = "More intelligent push-to-GitHub utility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86388,7 +83177,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base base-compat process ];
-       homepage = "https://github.com/Peaker/git-jump";
        description = "Move a git branch";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86408,7 +83196,6 @@ self: {
          ansi-terminal base base-compat Diff directory filepath mtl
          optparse-applicative process unix
        ];
-       homepage = "https://github.com/Peaker/git-mediate";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -86430,7 +83217,6 @@ self: {
          lifted-async logging old-locale optparse-applicative shelly tagged
          template-haskell text time transformers unix unordered-containers
        ];
-       homepage = "http://github.com/jwiegley/gitlib";
        description = "Passively snapshots working tree changes efficiently";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86448,7 +83234,6 @@ self: {
          attoparsec attoparsec-enumerator base bytestring directory
          enumerator filepath zlib-enum
        ];
-       homepage = "http://www.mew.org/~kazu/";
        description = "Git object and its parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86477,7 +83262,6 @@ self: {
          optparse-applicative process QuickCheck split text time
          transformers unix unix-compat utf8-string
        ];
-       homepage = "http://git-repair.branchable.com/";
        description = "repairs a damanged git repisitory";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86498,7 +83282,6 @@ self: {
          transformers
        ];
        executableHaskellDepends = [ base Cabal ];
-       homepage = "github.com/aloiscochard/git-sanity";
        description = "A sanity checker for your git history";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86529,7 +83312,6 @@ self: {
          base containers directory filepath hspec process temporary
        ];
        testToolDepends = [ git ];
-       homepage = "https://github.com/christian-marie/git-vogue";
        description = "A framework for pre-commit checks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86550,7 +83332,6 @@ self: {
        testHaskellDepends = [
          base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "http://github.com/gbataille/gitHUD#readme";
        description = "More efficient replacement to the great git-radar";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86568,7 +83349,6 @@ self: {
        executableHaskellDepends = [
          base cryptonite directory filepath process utf8-string
        ];
-       homepage = "https://github.com/vincenthz/gitcache";
        description = "Simple git utility to use and manage clone cache";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86588,7 +83368,6 @@ self: {
          aeson aeson-lens base bytestring foldl lens mtl
          optparse-applicative sqlite-simple system-filepath text turtle wreq
        ];
-       homepage = "https://github.com/mattyhall/gitdo";
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86623,7 +83402,6 @@ self: {
          unordered-containers vector
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86651,7 +83429,6 @@ self: {
          utf8-string vector
        ];
        executableToolDepends = [ git ];
-       homepage = "https://github-backup.branchable.com/";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86676,7 +83453,6 @@ self: {
          text time tls transformers transformers-compat unordered-containers
          vector vector-instances
        ];
-       homepage = "https://github.com/strake/github.hs";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86694,7 +83470,6 @@ self: {
          aeson base bytestring containers email-validate http-types text wai
          wai-logger warp
        ];
-       homepage = "https://github.com/amutake/github-post-receive";
        description = "GitHub webhooks library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -86718,7 +83493,6 @@ self: {
          aeson base bytestring http-client http-client-tls http-types
          mime-types optparse-generic text unordered-containers uri-templater
        ];
-       homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -86742,7 +83516,6 @@ self: {
          aeson base bytestring http-client http-client-tls http-types
          mime-types optparse-generic text unordered-containers uri-templater
        ];
-       homepage = "https://github.com/tfausak/github-release#readme";
        description = "Upload files to GitHub releases";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86763,7 +83536,6 @@ self: {
          base bytestring containers exceptions github groom html http-client
          http-client-tls monad-parallel tabular tagsoup text time vector
        ];
-       homepage = "https://toktok.github.io/";
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -86793,7 +83565,6 @@ self: {
        version = "0.1.0";
        sha256 = "1d7g1rzaqg19bc41vqvcdxdi37z9h7ajy3khsqa4pwbfavj412a5";
        libraryHaskellDepends = [ base basic-prelude github text ];
-       homepage = "https://github.com/greenrd/github-utils";
        description = "Useful functions that use the GitHub API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86849,7 +83620,6 @@ self: {
          deepseq-generics memory text time vector
        ];
        testHaskellDepends = [ aeson base bytestring hspec text vector ];
-       homepage = "https://github.com/onrock-eng/github-webhooks#readme";
        description = "Aeson instances for GitHub Webhook payloads";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -86868,7 +83638,6 @@ self: {
          deepseq-generics memory text time vector
        ];
        testHaskellDepends = [ aeson base bytestring hspec text vector ];
-       homepage = "https://github.com/onrock-eng/github-webhooks#readme";
        description = "Aeson instances for GitHub Webhook payloads";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86889,7 +83658,6 @@ self: {
        testHaskellDepends = [
          base mtl parsec tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "http://github.com/gbataille/gitHUD#readme";
        description = "More efficient replacement to the great git-radar";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86909,7 +83677,6 @@ self: {
          aeson base base64-bytestring bytestring http-conduit network safe
          text
        ];
-       homepage = "https://github.com/relrod/gitignore";
        description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -86945,7 +83712,6 @@ self: {
          base bytestring directory filepath hslogger HTTP mtl network
          network-uri syb url utf8-string
        ];
-       homepage = "http://gitit.net";
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87142,7 +83908,6 @@ self: {
        libraryHaskellDepends = [
          base base-compat directory filepath process template-haskell
        ];
-       homepage = "https://github.com/acfoltzer/gitrev";
        description = "Compile git revision info into Haskell projects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87168,7 +83933,6 @@ self: {
        benchmarkHaskellDepends = [
          aeson base criterion directory random transformers
        ];
-       homepage = "https://github.com/myfreeweb/gitson";
        description = "A document store library for Git + JSON";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87213,7 +83977,6 @@ self: {
          base base64-bytestring bytestring containers hspec lens network-uri
          text
        ];
-       homepage = "http://github.com/passy/givegif#readme";
        description = "CLI Giphy search tool with previews in iTerm 2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87227,7 +83990,6 @@ self: {
        sha256 = "0kqhvich6slcihxg64nwrg1zk9nnpymi7nqrnlmn71flzw6w27ca";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/zaidan/gjk#readme";
        description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87240,7 +84002,6 @@ self: {
        sha256 = "163av54lmkqbayx9vkvviv3mdqq60zwkk9kjn75j7mk13d0iwpp3";
        libraryHaskellDepends = [ base linear ];
        testHaskellDepends = [ base linear ];
-       homepage = "https://github.com/suzumiyasmith/gjk2d#readme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -87292,7 +84053,6 @@ self: {
        testHaskellDepends = [
          base directory either hspec text unordered-containers
        ];
-       homepage = "https://github.com/MichelBoucey/glabrous";
        description = "A template DSL library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87309,7 +84069,6 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk ];
        libraryPkgconfigDepends = [ libglade ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87347,7 +84106,6 @@ self: {
          ansi-wl-pprint base mtl parsec tasty tasty-hunit template-haskell
          transformers
        ];
-       homepage = "https://github.com/goldfirere/glambda";
        description = "A simply typed lambda calculus interpreter, written with GADTs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87364,7 +84122,6 @@ self: {
        executableHaskellDepends = [
          base containers GLFW-b lens mtl OpenGL
        ];
-       homepage = "zyghost.com";
        description = "An OpenGL micro framework";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87390,7 +84147,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "18925rqf3ah1k7xcb15zk0gcbc4slvvhr5lsz32fh96gid089cdv";
        libraryHaskellDepends = [ base lens ];
-       homepage = "https://github.com/louispan/glaze#readme";
        description = "Framework for rendering things with metadata/headers and values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87406,7 +84162,6 @@ self: {
        libraryHaskellDepends = [
          base lens mmorph mtl semigroupoids transformers
        ];
-       homepage = "https://github.com/louispan/glazier#readme";
        description = "Composable widgets framework with enhanced with transformers and lens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87422,7 +84177,6 @@ self: {
        libraryHaskellDepends = [
          base glazier mmorph pipes stm stm-extras transformers
        ];
-       homepage = "https://github.com/louispan/glazier-pipes#readme";
        description = "A threaded rendering framework using glaizer and pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87443,7 +84197,6 @@ self: {
          profunctors semigroupoids stm text transformers
          unordered-containers
        ];
-       homepage = "https://github.com/louispan/glazier-react#readme";
        description = "ReactJS binding using Glazier and Pipes.Fluid";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87467,7 +84220,6 @@ self: {
          mtl pipes pipes-concurrency pipes-misc stm text transformers
          unordered-containers
        ];
-       homepage = "https://github.com/louispan/glazier-react#readme";
        description = "Examples of using glazier-react";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87487,7 +84239,6 @@ self: {
          glazier-react javascript-extras lens mmorph mtl pipes-concurrency
          stm transformers
        ];
-       homepage = "https://github.com/louispan/glazier-react-widget#readme";
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87513,7 +84264,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/goromlagche/gli#readme";
        description = "Tiny cli to fetch PR info from gitlab";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87532,7 +84282,6 @@ self: {
          base bytestring containers text utf8-string
        ];
        libraryPkgconfigDepends = [ glib ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GLIB library for Gtk2Hs";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
@@ -87562,7 +84311,6 @@ self: {
        sha256 = "122m1nrly1fnskjbsgm06jq1v7jyw2p2rqmzpj8vmgyw8xpd1f44";
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base Cabal containers hspec text ];
-       homepage = "https://github.com/klangner/glider-nlp";
        description = "Natural Language Processing library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87606,7 +84354,6 @@ self: {
        ];
        executableHaskellDepends = [ base lens text vty ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/glguy/irc-core";
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -87640,7 +84387,6 @@ self: {
          unix
        ];
        benchmarkHaskellDepends = [ base criterion Glob MissingH ];
-       homepage = "https://github.com/rdnetto/glob-posix#readme";
        description = "Haskell bindings for POSIX glob library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87659,7 +84405,6 @@ self: {
          base haskell-src-exts haskell-src-exts-qq loch-th SafeSemaphore stm
          syntax-trees-fork-bairyn tagged template-haskell
        ];
-       homepage = "https://github.com/bairyn/global";
        description = "Library enabling unique top-level declarations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87681,7 +84426,6 @@ self: {
          base bytestring data-default HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
-       homepage = "https://github.com/akaspin/global-config";
        description = "Global mutable configuration";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87729,7 +84473,6 @@ self: {
          random time
        ];
        doHaddock = false;
-       homepage = "http://haskell.org/haskellwiki/Glome";
        description = "ray tracer";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87746,7 +84489,6 @@ self: {
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
-       homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87765,7 +84507,6 @@ self: {
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
-       homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87781,7 +84522,6 @@ self: {
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
-       homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87807,7 +84547,6 @@ self: {
        revision = "1";
        editedCabalFile = "08w84grwvl079gzjwnshfgs12kh1p2gbc5kvbw6qdxc7g292hd5m";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
-       homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87819,7 +84558,6 @@ self: {
        version = "1.12.0.0";
        sha256 = "00vji2mlakawarqsywgvl10yk32jmlxcj2d058a6psjqb0pkq0wb";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
-       homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87834,7 +84572,6 @@ self: {
        revision = "1";
        editedCabalFile = "0nia67zywmxyvcnlk0a906dijh9h7m6w48330n9gs2mjkhkyqb13";
        libraryHaskellDepends = [ base gloss reactive-banana ];
-       homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87867,7 +84604,6 @@ self: {
          base bmp bytestring containers ghc-prim gloss gloss-algorithms
          gloss-raster random repa repa-algorithms repa-io vector
        ];
-       homepage = "http://gloss.ouroborus.net";
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87880,7 +84616,6 @@ self: {
        version = "0.3.3.0";
        sha256 = "01k9600f9lv65n9bi2v40gzcl14gg9cm27fxz8yk4kx1hk5hv980";
        libraryHaskellDepends = [ base gloss gloss-juicy ];
-       homepage = "https://github.com/mchakravarty/gloss-game";
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87900,7 +84635,6 @@ self: {
        executableHaskellDepends = [
          base bmp bytestring gloss JuicyPixels vector
        ];
-       homepage = "http://github.com/alpmestan/gloss-juicy";
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -87918,7 +84652,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
-       homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -87934,7 +84667,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
-       homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -87994,7 +84726,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0ygjqzb1pn092j0d0gcwhxdv940rdlvpaj1gxa347mdgvp4jb9za";
        libraryHaskellDepends = [ base gloss sodium ];
-       homepage = "https://github.com/Twey/gloss-sodium";
        description = "A Sodium interface to the Gloss drawing package";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88222,7 +84953,6 @@ self: {
        librarySystemDepends = [ gnome-keyring ];
        libraryPkgconfigDepends = [ gnome-keyring ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://john-millikin.com/software/haskell-gnome-keyring/";
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88241,7 +84971,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gnome-vfs gnome-vfs_module ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88270,7 +84999,6 @@ self: {
          aeson aeson-pretty base basic-prelude binary-conduit bytestring
          conduit conduit-extra lens sbp tasty tasty-golden tasty-hunit time
        ];
-       homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88294,7 +85022,6 @@ self: {
        testSystemDepends = [ libidn ];
        testPkgconfigDepends = [ libidn ];
        testToolDepends = [ c2hs ];
-       homepage = "https://john-millikin.com/software/haskell-gnuidn/";
        description = "Bindings for GNU IDN";
        license = stdenv.lib.licenses.gpl3;
      }) {inherit (pkgs) libidn;};
@@ -88316,7 +85043,6 @@ self: {
          deepseq filepath process semigroups temporary time transformers
          utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Gnuplot";
        description = "2D and 3D plots using gnuplot";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88331,7 +85057,6 @@ self: {
        libraryHaskellDepends = [ base bytestring monads-tf transformers ];
        librarySystemDepends = [ gnutls ];
        libraryPkgconfigDepends = [ gnutls ];
-       homepage = "https://john-millikin.com/software/haskell-gnutls/";
        description = "Bindings for GNU libgnutls";
        license = stdenv.lib.licenses.gpl3;
      }) {inherit (pkgs) gnutls;};
@@ -88442,7 +85167,6 @@ self: {
          base bytestring cereal floating-bits safe split
        ];
        testHaskellDepends = [ base bytestring cereal QuickCheck safe ];
-       homepage = "https://github.com/lovasko/goat";
        description = "Time Series Compression";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88461,7 +85185,6 @@ self: {
          base containers mtl parsec template-haskell
        ];
        testHaskellDepends = [ base containers HUnit mtl parsec ];
-       homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - library";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88483,7 +85206,6 @@ self: {
        ];
        executableHaskellDepends = [ base gtk ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "http://khumba.net/projects/goatee";
        description = "A monadic take on a 2,500-year-old board game - GTK+ UI";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88506,7 +85228,6 @@ self: {
        ];
        executableHaskellDepends = [ base criterion random weigh ];
        testHaskellDepends = [ base hspec hspec-core ];
-       homepage = "http://github.com/cstrahan/gochan";
        description = "Go-style channels";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88519,7 +85240,6 @@ self: {
        version = "2.30.3";
        sha256 = "1whl3fvwxh26nsb4l6brljsmwl891w5yxlsv69mdfvfb1rl7p64f";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "http://code.haskell.org/~dons/code/gofer-prelude";
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88543,7 +85263,6 @@ self: {
          time transformers unix-time x509 x509-store
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/ocramz/goggles";
        description = "Extensible interface to Web APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88560,7 +85279,6 @@ self: {
          aeson base bytestring cryptonite exceptions goggles memory mtl req
          text unix-time
        ];
-       homepage = "https://github.com/ocramz/goggles-gcs";
        description = "`goggles` interface to Google Cloud Storage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88585,7 +85303,6 @@ self: {
          monad-control mtl resourcet text time transformers
          transformers-base unordered-containers x509 x509-store
        ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Comprehensive Google Services SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88598,7 +85315,6 @@ self: {
        version = "0.3.0";
        sha256 = "1hn2cn3p7jkqvpy0qq3hakcnrns4j2j961zg4xbb8z4mjjj3fgm8";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Buyer SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88611,7 +85327,6 @@ self: {
        version = "0.3.0";
        sha256 = "1r8pvad01qjdv040agfisnj0183la74p44hvppa0zzbjsybv5n99";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Ad Exchange Seller SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88624,7 +85339,6 @@ self: {
        version = "0.3.0";
        sha256 = "1qjlhg4kgfy93rl2nzivvdhjpyaf4csm4nl097ny649dmxjjf1q9";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Data Transfer SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88637,7 +85351,6 @@ self: {
        version = "0.3.0";
        sha256 = "0pb3ymvx6hw46i1iwrvc4zv7mkmjwjk8w4q6h91jph7kv98kpmpk";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Directory SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88650,7 +85363,6 @@ self: {
        version = "0.3.0";
        sha256 = "1d7w4fv4v54mja7yx8rf29ms1hbjnkjgly54fqx5h4xyfgypymca";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Email Migration API v2 SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88663,7 +85375,6 @@ self: {
        version = "0.3.0";
        sha256 = "0fms60bb7vyn3kkrg5j53x7f2r5111xy922w7a3i7xb04lsbxv3j";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Admin Reports SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88676,7 +85387,6 @@ self: {
        version = "0.3.0";
        sha256 = "0dispksc95m3ig409f44fl57jz4lqnhljhk6y957d520sf1arv53";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Management SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88689,7 +85399,6 @@ self: {
        version = "0.3.0";
        sha256 = "1rvglzr4a2lilknrdjla0s47gdkp5n2z6kpwcl0gfgdr00fbrcrw";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google AdSense Host SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88702,7 +85411,6 @@ self: {
        version = "0.3.0";
        sha256 = "1h7kx1ra0vz8pgvcjvj5ip44h077s9q5m7ixplq5vzrr4wdbrvvf";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Affiliate Network SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88715,7 +85423,6 @@ self: {
        version = "0.3.0";
        sha256 = "0myggz1cxq88q3s1sbw5v5zhcmrybjkqj9zd0ap6x4sa7qrp7dys";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Analytics SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88728,7 +85435,6 @@ self: {
        version = "0.3.0";
        sha256 = "0lnliq42ykmizlr8g43ic99lzk5rc7j1l3dl81xbymw0dq0frbcm";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play EMM SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88741,7 +85447,6 @@ self: {
        version = "0.3.0";
        sha256 = "1cf449zz6ahnqa71fqa25brj5h11xhbq4chw4hn2vczjwz8s6vrv";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Developer SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88754,7 +85459,6 @@ self: {
        version = "0.3.0";
        sha256 = "131m4hqf84j4r2xjdbpsp95iww4sbxyw3lvn80pnddrzmvaj52hr";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google App Engine Admin SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88767,7 +85471,6 @@ self: {
        version = "0.3.0";
        sha256 = "0ci85yml0sjjkwxcyfnb1xsw93zkvll0n6fb35kci1h07ywvl8d2";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Activity SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88780,7 +85483,6 @@ self: {
        version = "0.3.0";
        sha256 = "0gjill8hdkhp385i0ay6isb8rm6zcxh6ymdb7389wv6nhzpf5p3x";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Calendar SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88793,7 +85495,6 @@ self: {
        version = "0.3.0";
        sha256 = "0l7yknlp4c2qh0a86q504a6h0gnb0s8jd4glii30qsnim52pijhp";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise License Manager SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88806,7 +85507,6 @@ self: {
        version = "0.3.0";
        sha256 = "119mlxr6yxmym9pgcmhix9m2s1s9i5zgh2pa3zzayk0jnqjjdpn4";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Enterprise Apps Reseller SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88819,7 +85519,6 @@ self: {
        version = "0.3.0";
        sha256 = "0mcnz2qiymjriqplypzl3gycn9cyc362a38962b4ci7g718wx74v";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tasks SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88832,7 +85531,6 @@ self: {
        version = "0.3.0";
        sha256 = "129f5gdiq5gbdi6dg6ddz1cq2m0jjp48q7vk5lkxrr82iig05jkw";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google App State SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88845,7 +85543,6 @@ self: {
        version = "0.3.0";
        sha256 = "0insf84wrnn98yqfm6scfmzjnxdj9hikz7wy0cg0vk25dpc2mhp0";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Autoscaler SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88858,7 +85555,6 @@ self: {
        version = "0.3.0";
        sha256 = "1zs497pxcpd87rhblg02bvi0wsqj16ym74v3kgm2mhwfw4spqv9z";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google BigQuery SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88871,7 +85567,6 @@ self: {
        version = "0.3.0";
        sha256 = "12scf28cj2rr0r4z1g0y4ik22gd3yh5sy2wdllydi05qv1cffqbf";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Billing SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88884,7 +85579,6 @@ self: {
        version = "0.3.0";
        sha256 = "08p1hjm29xsmvbb9dj7krr7i1wapn32g9wh283ia2zajys6zscl7";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Blogger SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88897,7 +85591,6 @@ self: {
        version = "0.3.0";
        sha256 = "08g2ah36fk3a6val2p1wczd9b3h7zqp1a4ka7nrn3f9m04say5hs";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Books SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88910,7 +85603,6 @@ self: {
        version = "0.3.0";
        sha256 = "0sgw2jgwki4nmyg9igavf8g2myxr8qnf4nif00jn236rg26pfr2d";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Civic Information SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88923,7 +85615,6 @@ self: {
        version = "0.3.0";
        sha256 = "1bij8szdrxlcfz8xl5472k8rfl10ffnq7hlq38za2pmm9jfhn2dn";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Classroom SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88936,7 +85627,6 @@ self: {
        version = "0.3.0";
        sha256 = "01mfc8f6vl3n499p4f70inak68g83yxc5pci485sxgwvfx078glx";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Monitoring SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88949,7 +85639,6 @@ self: {
        version = "0.3.0";
        sha256 = "1r2whm4s5dwhg9davw9qpcabwhpasyfd7qkjw471xnpnwrq4vcb6";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Trace SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88962,7 +85651,6 @@ self: {
        version = "0.3.0";
        sha256 = "0v902dgjn0hzf42di0kr159p9scpnsha7wxap4fj933x5pv7c97s";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88975,7 +85663,6 @@ self: {
        version = "0.3.0";
        sha256 = "1vxl3k48mdfn3rnlld5rmgkjv30pfvg9agz6k2v9pbci5i9kbl8i";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Container Engine SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88988,7 +85675,6 @@ self: {
        version = "0.3.0";
        sha256 = "15k8d8b58hggfw5izdmzkl44jkaiv1l0gfx237ciwmjjvaw5fdfy";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Container Builder SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89012,7 +85698,6 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [ base tasty ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Core data types and functionality for Gogol libraries";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89025,7 +85710,6 @@ self: {
        version = "0.3.0";
        sha256 = "075r7j4z9i1jbw6hznrq3ndb23yrp9xpqmwq64laqmh4mw3c47zj";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google CustomSearch SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89038,7 +85722,6 @@ self: {
        version = "0.3.0";
        sha256 = "1cvzhvfipjpvprhgw2rdw9xsrkyka7cdfdk9716x4admly221qcx";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Dataflow SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89051,7 +85734,6 @@ self: {
        version = "0.3.0";
        sha256 = "1b1s148xslz23ibcrx0gifim6kc5f3fsgfdnwh2n4bp0djvp8zy0";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Dataproc SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89064,7 +85746,6 @@ self: {
        version = "0.3.0";
        sha256 = "0wdxvslimfhfm0nw8qv88av14gxjpfif9rxxp3gv8png0qf1qs25";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Datastore SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89077,7 +85758,6 @@ self: {
        version = "0.3.0";
        sha256 = "05qjl7lg62xc5y6yycn98yk6d0qpk60caafw7q9drrgrdz5k7s7v";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Debugger SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89090,7 +85770,6 @@ self: {
        version = "0.3.0";
        sha256 = "01lc27xp2gry9fws5ysq46hld30fxh4lfr7p9lw4985ir82llb9s";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Deployment Manager SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89103,7 +85782,6 @@ self: {
        version = "0.3.0";
        sha256 = "0dhayxwi4pjbj73gxflgk1gp3dvjw4vb07ai9nq22flac1xl1si7";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google DCM/DFA Reporting And Trafficking SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89116,7 +85794,6 @@ self: {
        version = "0.3.0";
        sha256 = "1j2j3zxqq95cd50cdwsvyn633x61fwlghld8nhn1hy12g9l7xdf8";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google APIs Discovery Service SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89129,7 +85806,6 @@ self: {
        version = "0.3.0";
        sha256 = "18af36fx7w0ybcfiacfih7fyvri0rxlm4920yigmgsx551rgrm5l";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud DNS SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89142,7 +85818,6 @@ self: {
        version = "0.3.0";
        sha256 = "0gqlxdnxf2hqdaczvd0gi3ch3p23lk9mjd0xk03h6lhr8c2mx60c";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Bid Manager SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89155,7 +85830,6 @@ self: {
        version = "0.3.0";
        sha256 = "1wwsv0gbqcjd6xmz7pqjv9hyfg20hwwnxld46yjgiwsyadxrd54d";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google DoubleClick Search SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89168,7 +85842,6 @@ self: {
        version = "0.3.0";
        sha256 = "1l353bwhkw1a3pv2ngjddgiilazq4qds3askkxxyajxzy5f19blz";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Drive SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89181,7 +85854,6 @@ self: {
        version = "0.3.0";
        sha256 = "096rc42f6ajw7biys45zaz4wgwxyqh67js6ihj8aqi4w1b05j3zz";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Dynamic Links SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89194,7 +85866,6 @@ self: {
        version = "0.3.0";
        sha256 = "0mrq1gp3s770lybwlzy126g8fx1kasqfh1qjd8lczga186972pqq";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Firebase Rules SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89207,7 +85878,6 @@ self: {
        version = "0.3.0";
        sha256 = "1awl1c1z4bcph8b6wgw34vyly7r6svs9h276h8h97z427006p1mv";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fitness SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89220,7 +85890,6 @@ self: {
        version = "0.3.0";
        sha256 = "0p2ckncnrdgkjqp67l0mygqp80nkp7w3p7plhmraxw2wrjpy15mv";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fonts Developer SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89233,7 +85902,6 @@ self: {
        version = "0.3.0";
        sha256 = "02m2cpf6jdvd2km3gjvhvhkq3cgy7ijy5abwkrpcwvjzl1hps2vc";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Freebase Search SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89246,7 +85914,6 @@ self: {
        version = "0.3.0";
        sha256 = "0icaa7zdblgs180gww0w4ffffim9fzb4qbl1pwjyvxa6b7vhrks7";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Fusion Tables SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89259,7 +85926,6 @@ self: {
        version = "0.3.0";
        sha256 = "0r0x1g8wkq6vn4hk655wkl8fpfjlqppb0w9gscz99qsvv1gm16dz";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89272,7 +85938,6 @@ self: {
        version = "0.3.0";
        sha256 = "04g2kiyzhnyczxl6648gzl14wfszxiihyajvc7428whp54b3b4yg";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Publishing SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89285,7 +85950,6 @@ self: {
        version = "0.3.0";
        sha256 = "192phwrhnsnanq3gf7ss3dsflvnkzf058r1jnb9vqf5035mckb4p";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Game Services Management SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89298,7 +85962,6 @@ self: {
        version = "0.3.0";
        sha256 = "0d9i4jlv09fc4ry6qsdypkmx3faj6i5m9c6xv3xys1d06v4mzxkf";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Genomics SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89311,7 +85974,6 @@ self: {
        version = "0.3.0";
        sha256 = "0h9z55bcdyp0as0jzv5wj89v71fz2n75pg8dhwg90iw1pp3rrg83";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Gmail SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89324,7 +85986,6 @@ self: {
        version = "0.3.0";
        sha256 = "0c676dk7x62bdv8nr8wsk1icd7v93060zjbzwzl2xi46q0j59dmk";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Migration SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89337,7 +85998,6 @@ self: {
        version = "0.3.0";
        sha256 = "1xy466x9xcbi7scf7fpnc5cy47hgsmdcg17hqzys4bp86sdc6738";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Groups Settings SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89350,7 +86010,6 @@ self: {
        version = "0.3.0";
        sha256 = "1fn8jx5hq4dxh2i1xf4cbmbsbjwxcplxxh7har1ai4z9ya1zghxs";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity and Access Management (IAM) SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89363,7 +86022,6 @@ self: {
        version = "0.3.0";
        sha256 = "1mdkzd5gb8nlaf5nj04fsl97ghyzpkmr4w93pcd5vsr8yxy3lkwz";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Identity Toolkit SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89376,7 +86034,6 @@ self: {
        version = "0.3.0";
        sha256 = "0kldw64ff2p8h8mfdfbplxfk3jinxc8ibr33wa1qzpfzixb72v2n";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Knowledge Graph Search SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89389,7 +86046,6 @@ self: {
        version = "0.3.0";
        sha256 = "0ny2d5bv9dxn1w8rwzv5m7lr5g8akrxqvfhs15bwk87fxdainz5j";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Natural Language SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89402,7 +86058,6 @@ self: {
        version = "0.3.0";
        sha256 = "1gdllvcp6s7rf4093xl2fxq3bvqkrysnrs2s4abyppq54p4s6afk";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Network Performance Monitoring SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89415,7 +86070,6 @@ self: {
        version = "0.3.0";
        sha256 = "1i5q2qqr041qxn458a6300z07idbz17srix9kr2sm3mxbvc5h04g";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Logging SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89428,7 +86082,6 @@ self: {
        version = "0.3.0";
        sha256 = "0211aq7gjmpkhvcqf7fyrwrhdfsn8k5g1qw9gjsisxq0m873i6w0";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Manufacturer Center SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89441,7 +86094,6 @@ self: {
        version = "0.3.0";
        sha256 = "1ajgf2g9yad6zwhap8b0qigf0nfsw5k3132ksnzkcrfflz74swvn";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Coordinate SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89454,7 +86106,6 @@ self: {
        version = "0.3.0";
        sha256 = "15a6z7kxvad3ylr1pkwqlimzbwsk0p8qblfnwgnjbl3mr681xdvv";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Maps Engine SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89467,7 +86118,6 @@ self: {
        version = "0.3.0";
        sha256 = "0ckh2bkjd8c7ybc2yc295wgn0z9kmp471kfkxkjl3swb9dab3fhm";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Mirror SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89480,7 +86130,6 @@ self: {
        version = "0.3.0";
        sha256 = "1qkk8v0yhdyphi5r18x4wawvhn0vwsfbz0gjvrf5mr0sdd80qhav";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Machine Learning SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89493,7 +86142,6 @@ self: {
        version = "0.3.0";
        sha256 = "03jslg15crnngarylydybb48vwq338hsb260mk4riahkg78kd7ga";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Stackdriver Monitoring SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89506,7 +86154,6 @@ self: {
        version = "0.3.0";
        sha256 = "0fdjq6kvh04csi29g4nagmji5vqprvwra2gas42n79rq2qhxfx5n";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google OAuth2 SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89519,7 +86166,6 @@ self: {
        version = "0.3.0";
        sha256 = "1k6n60w4z77fyy5bnsab8bdgr490zfb753m3ljsc7vxwqqfiqhrx";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google PageSpeed Insights SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89532,7 +86178,6 @@ self: {
        version = "0.3.0";
        sha256 = "0xhhmsplvfmsi860skrgpzzz3lixa0qcx73w9cv6da679fh0ddfv";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Partners SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89545,7 +86190,6 @@ self: {
        version = "0.3.0";
        sha256 = "0j2frq599kjrv0wl9bpmpglw51wcjid2ysmm50hhlpbv78z55sfv";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google People SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89558,7 +86202,6 @@ self: {
        version = "0.3.0";
        sha256 = "0v1cs21y94m4ma414nann6k1mc0jfdyj5ariy9bm6hyqbd3c60zc";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Play Movies Partner SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89571,7 +86214,6 @@ self: {
        version = "0.3.0";
        sha256 = "0qwswkjcv0i8m23y7dm9yrk343m3kdckg6srzi9q2jfip6h9hv8v";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google + SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89584,7 +86226,6 @@ self: {
        version = "0.3.0";
        sha256 = "0d0aijvdl2z9prv6qs6qriw54d6z9ljpl2nc5zwwk3647s62kvvi";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google + Domains SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89597,7 +86238,6 @@ self: {
        version = "0.3.0";
        sha256 = "136jrwlwwygz4icl8c5c1bj1l7j9lypc5qxkygs6azc3x3l8ih6g";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Prediction SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89610,7 +86250,6 @@ self: {
        version = "0.3.0";
        sha256 = "1f54km4v9mgil6p12vvziwv5v00d23l5rvk66yl4h614mh402m2v";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Proximity Beacon SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89623,7 +86262,6 @@ self: {
        version = "0.3.0";
        sha256 = "1c2qwqmq3bjfcd322kpyyxfdhsbyxq3r2v614v14dm0kr4cxqnik";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Pub/Sub SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89636,7 +86274,6 @@ self: {
        version = "0.3.0";
        sha256 = "10v82f2bkn4i0w8gq79skagksi13p5i3280cb50x206a8cy9j350";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google QPX Express SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89649,7 +86286,6 @@ self: {
        version = "0.3.0";
        sha256 = "1kjkf7bykmz5wzndj7h0yzwfds56m34d0jvq7m1rkhp2qnn1v1jl";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Manager SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89662,7 +86298,6 @@ self: {
        version = "0.3.0";
        sha256 = "14gm5wfay5d079hn39fcjwxfsz8pd02cc60id7jsxxc4jbyxjq42";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Group Updater SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89675,7 +86310,6 @@ self: {
        version = "0.3.0";
        sha256 = "0n2j9liwx5zd2flzmrq2z2hahbbgw2wx53d6nqykvaf5g3vc6l6b";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Resource Manager SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89688,7 +86322,6 @@ self: {
        version = "0.3.0";
        sha256 = "114gjdxzm4kq3ibk32dzy73zvmp9ls9bzb4k7szdkxr922861akp";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Compute Engine Instance Groups SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89701,7 +86334,6 @@ self: {
        version = "0.3.0";
        sha256 = "004k1zy27gk98xh0h3c7ll3zxk2qif31znwnnyyxi30gmwlg19sj";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud RuntimeConfig SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89714,7 +86346,6 @@ self: {
        version = "0.3.0";
        sha256 = "0sxhc8l7ck20zbn2h7zgcywkygh0gp3mzg0mkgvx1qs4hp0nryvq";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Safe Browsing APIs SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89727,7 +86358,6 @@ self: {
        version = "0.3.0";
        sha256 = "1l2bd93zndmi4zy28ygq63cz020q83viz2pyzy1j0hk0inji9k81";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Apps Script Execution SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89740,7 +86370,6 @@ self: {
        version = "0.3.0";
        sha256 = "0lfw9592arh01d3swxyp97glxqzc3cvcd3mn6pcm5q6dsjnda1hi";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Control SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89753,7 +86382,6 @@ self: {
        version = "0.3.0";
        sha256 = "0qasq71k1bm9pm298sdivgnnr1sx9701nhmdn82lx8qglnxvd4v3";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Service Management SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89766,7 +86394,6 @@ self: {
        version = "0.3.0";
        sha256 = "1kj179262lada2dh3pq129kc6p0rdzppxhmyglin5p2nnlzmkm9d";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Sheets SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89779,7 +86406,6 @@ self: {
        version = "0.3.0";
        sha256 = "05q68x2krghnv0j7f7bizhqpjgni2lqm03bp74ydcy7f2y675i55";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Content API for Shopping SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89792,7 +86418,6 @@ self: {
        version = "0.3.0";
        sha256 = "0pi4ljv20p5xjw11p99hksn8qz284pjv9f36i7hsdlf5bjd3v1dh";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Site Verification SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89805,7 +86430,6 @@ self: {
        version = "0.3.0";
        sha256 = "1bqyq767c4w8m2w9i78vn6psnv68687l0kwf6kbmn150gvg9c1mb";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Slides SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89818,7 +86442,6 @@ self: {
        version = "0.3.0";
        sha256 = "0b596ajxy6ph28l46wnh03cr264ry4yki197bxls8spvzf8pwf5b";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Spectrum Database SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89831,7 +86454,6 @@ self: {
        version = "0.3.0";
        sha256 = "164w0sqy75m1dsvi64kyrihy647j2gm0k7kar46m9wvym1gvcr3r";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud SQL Administration SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89844,7 +86466,6 @@ self: {
        version = "0.3.0";
        sha256 = "18n4grbbwwg0ymh0gp6qhqdw7v9x81y70lxmslql0w9dlirg959v";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Storage JSON SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89857,7 +86478,6 @@ self: {
        version = "0.3.0";
        sha256 = "0iwal6slja14gbdw2xjs79y3c6l56c1hvv0gyip3b3pz5i2xh4zb";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Storage Transfer SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89870,7 +86490,6 @@ self: {
        version = "0.3.0";
        sha256 = "0hsplk3yvkdglv38pl9cckc6csh23adasyvfdzw08kfbk8b1llgp";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Tag Manager SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89883,7 +86502,6 @@ self: {
        version = "0.3.0";
        sha256 = "0irzyv80q2n4jv144rryv5xqbg51gqyws1pnvpdi5lddq90yvjq3";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google TaskQueue SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89896,7 +86514,6 @@ self: {
        version = "0.3.0";
        sha256 = "0bwmymiz1whc2rffxzlkva72j5cq51y8gxfl7lq5bg668p3grcvk";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Translate SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89909,7 +86526,6 @@ self: {
        version = "0.3.0";
        sha256 = "1hmwk3pfxzyv0hxn33jms7c72yl8pnqnbfpza53ljq0abd749fcv";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google URL Shortener SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89922,7 +86538,6 @@ self: {
        version = "0.3.0";
        sha256 = "0fzmq082x0vvml8c0pxhb3vrnvizmq9cmh8y30yapkad7xwgx3i9";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud User Accounts SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89935,7 +86550,6 @@ self: {
        version = "0.3.0";
        sha256 = "1ssdz7cv3v3hz024m3djv4asj6lpd4c7a3dzrnxm9ipfbfmjb5f9";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Cloud Vision SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89948,7 +86562,6 @@ self: {
        version = "0.3.0";
        sha256 = "0rkpjwnb064i7256j0q8gnkynny596qrg79h2wviadmifz9gyixp";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google Search Console SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89961,7 +86574,6 @@ self: {
        version = "0.3.0";
        sha256 = "1sv7djr2x73n3w0cbxncyzz64kxn7pwydcyznqipni7xv6hi5s1j";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Data SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89974,7 +86586,6 @@ self: {
        version = "0.3.0";
        sha256 = "10888jai56jpw6snssclldmxn2my9vadrqm14dmrhl6sr3mabdbh";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Analytics SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89987,7 +86598,6 @@ self: {
        version = "0.3.0";
        sha256 = "0j8xalrigh3rvxb8z009s6bs34nw68kwjvczm1hlx1fcifgjrp4f";
        libraryHaskellDepends = [ base gogol-core ];
-       homepage = "https://github.com/brendanhay/gogol";
        description = "Google YouTube Reporting SDK";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90031,7 +86641,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "12ib4y8cjg0dvvizy8yxgjaqvyawdy7vxmh1ab12b4yg40wwsg6g";
        libraryHaskellDepends = [ aeson base bytestring HTTP lens mtl ];
-       homepage = "https://github.com/mitchellwrosen/google-dictionary-api";
        description = "Simple interface to the google.com/dictionary API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90091,7 +86700,6 @@ self: {
          base containers google-search text time xml-conduit
        ];
        testHaskellDepends = [ base google-search text time xml-conduit ];
-       homepage = "https://github.com/liyang/google-mail-filters";
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90109,7 +86717,6 @@ self: {
          aeson base google-static-maps http-client servant servant-client
          text
        ];
-       homepage = "https://github.com/mpilgrem/google-maps-geocoding#readme";
        description = "Google Maps Geocoding API bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90131,7 +86738,6 @@ self: {
        testHaskellDepends = [
          base bytestring hoauth2 hspec http-conduit load-env text
        ];
-       homepage = "https://github.com/pbrisbin/google-oauth2#readme";
        description = "Google OAuth2 token negotiation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90152,7 +86758,6 @@ self: {
        ];
        testHaskellDepends = [ base tasty tasty-hspec ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/jxv/google-oauth2-easy#readme";
        description = "Opininated use of Google Authentication for ease";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90171,7 +86776,6 @@ self: {
          wai warp
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/ishiy1993/google-oauth2-for-cli#readme";
        description = "Get Google OAuth2 token for CLI tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90187,7 +86791,6 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring bytestring HsOpenSSL RSA text unix-time
        ];
-       homepage = "https://github.com/MichelBoucey/google-oauth2-jwt";
        description = "Get a signed JWT for Google Service Accounts";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90203,7 +86806,6 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring bytestring HsOpenSSL RSA text unix-time
        ];
-       homepage = "https://github.com/MichelBoucey/google-oauth2-jwt";
        description = "Get a signed JWT for Google Service Accounts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90216,7 +86818,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1jn22iykcl6694lsshj7xxnqx33d6spqlr2q93v6ak3yaygxd7hr";
        libraryHaskellDepends = [ base free nats text time ];
-       homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90240,7 +86841,6 @@ self: {
          monad-logger mtl RSA servant servant-client text time transformers
          transformers-base unix-time unordered-containers wai wai-extra warp
        ];
-       homepage = "https://github.com/arowM/haskell-google-server-api#readme";
        description = "Google APIs for server to server applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90261,7 +86861,6 @@ self: {
          double-conversion http-client JuicyPixels memory network-uri
          servant servant-client servant-JuicyPixels text utf8-string
        ];
-       homepage = "https://github.com/mpilgrem/google-static-maps#readme";
        description = "Bindings to the Google Static Maps API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90297,7 +86896,6 @@ self: {
          aeson attoparsec base bytestring containers enumerator haskell98
          http-enumerator http-types mtl text time timerep transformers url
        ];
-       homepage = "http://github.com/michaelxavier/GooglePlus";
        description = "Haskell implementation of the Google+ API v1";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90317,7 +86915,6 @@ self: {
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/lornap/googlepolyline";
        description = "Google Polyline Encoder/Decoder";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90339,7 +86936,6 @@ self: {
          attoparsec base bytestring directory errors http-types lucid
          mime-types network optparse-applicative text wai warp
        ];
-       homepage = "https://github.com/sternenseemann/gopher-proxy";
        description = "proxy gopher over http";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90377,7 +86973,6 @@ self: {
          profunctors random semigroups time transformers
          unordered-containers
        ];
-       homepage = "https://github.com/Teaspot-Studio/gore-and-ash";
        description = "Core of FRP game engine called Gore&Ash";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90395,7 +86990,6 @@ self: {
          base containers deepseq exceptions gore-and-ash hashable mtl
          resourcet transformers transformers-base unordered-containers
        ];
-       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-actor";
        description = "Gore&Ash engine extension that implements actor style of programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90419,7 +87013,6 @@ self: {
          base containers deepseq exceptions gore-and-ash HUnit mtl
          test-framework test-framework-hunit transformers
        ];
-       homepage = "https://github.com/TeaspotStudio/gore-and-ash-async#readme";
        description = "Core module for Gore&Ash engine that embeds async IO actions into game loop";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90446,7 +87039,6 @@ self: {
          gore-and-ash-sync hashable lens linear network OpenGL sdl2 text
          text-show time transformers unordered-containers vector
        ];
-       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-demo";
        description = "Demonstration game for Gore&Ash game engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90464,7 +87056,6 @@ self: {
          base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl
          transformers unordered-containers
        ];
-       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-glfw";
        description = "Core module for Gore&Ash engine for GLFW input events";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90485,7 +87076,6 @@ self: {
          base containers deepseq exceptions gore-and-ash hashable
          lambdacube-compiler lambdacube-gl mtl text unordered-containers
        ];
-       homepage = "https://github.com/TeaspotStudio/gore-and-ash-lambdacube#readme";
        description = "Core module for Gore&Ash engine that do something";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90505,7 +87095,6 @@ self: {
          resourcet text text-show transformers transformers-base
          unordered-containers
        ];
-       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-logging";
        description = "Core module for gore-and-ash with logging utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90527,7 +87116,6 @@ self: {
          resourcet text text-show transformers transformers-base
          typesafe-endian unordered-containers
        ];
-       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-network";
        description = "Core module for Gore&Ash engine with low level network API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90547,7 +87135,6 @@ self: {
          resourcet sdl2 text transformers transformers-base
          unordered-containers
        ];
-       homepage = "git@github.com:Teaspot-Studio/gore-and-ash-sdl.git";
        description = "Gore&Ash core module for integration with SDL library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90568,7 +87155,6 @@ self: {
          gore-and-ash-actor gore-and-ash-logging gore-and-ash-network
          hashable mtl text unordered-containers
        ];
-       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-sync";
        description = "Gore&Ash module for high level network synchronization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90587,7 +87173,6 @@ self: {
        executableHaskellDepends = [
          base brick cmdargs directory random text time vty word-wrap
        ];
-       homepage = "https://github.com/hot-leaf-juice/gotta-go-fast";
        description = "A command line utility for practicing typing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90640,7 +87225,6 @@ self: {
        executableHaskellDepends = [
          base directory exceptions monad-control optparse-generic safe
        ];
-       homepage = "http://github.com/tgolson/gpio";
        description = "Haskell GPIO interface, designed specifically for the RaspberryPi";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90652,7 +87236,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "01bsl7s8r33jgvk9lyca02awj43acii8spa6sskz19ivhm2adcr8";
        libraryHaskellDepends = [ base split ];
-       homepage = "https://github.com/fegu/gpolyline";
        description = "Pure module for encoding/decoding Google Polyline";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90694,7 +87277,6 @@ self: {
          filepath gd gps GPX hsmagick html http-enumerator process random
          tar time xsd
        ];
-       homepage = "https://github.com/robstewart57/Gps2HtmlReport";
        description = "GPS to HTML Summary Report";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90748,7 +87330,6 @@ self: {
        testHaskellDepends = [
          aeson base containers hspec mtl test-fixture text
        ];
-       homepage = "https://github.com/m-arnold/graflog#readme";
        description = "Monadic correlated log events";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90771,7 +87352,6 @@ self: {
          MissingH mtl process QuickCheck regex-posix scientific servant
          servant-client text
        ];
-       homepage = "https://github.com/graknlabs/grakn-haskell";
        description = "A Haskell client for Grakn";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90790,7 +87370,6 @@ self: {
          base containers enumerable fgl graphviz MaybeT mtl multirec parsec
          template-haskell text uu-parsinglib
        ];
-       homepage = "http://projects.haskell.org/grammar-combinators/";
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90821,7 +87400,6 @@ self: {
          base containers criterion deepseq monoid-subclasses rank2classes
          text
        ];
-       homepage = "https://github.com/blamario/grampa/tree/master/grammatical-parsers";
        description = "parsers that combine into grammars";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90839,7 +87417,6 @@ self: {
          base colour containers fraction grapefruit-frp grapefruit-records
          grapefruit-ui
        ];
-       homepage = "https://grapefruit-project.org/";
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90855,7 +87432,6 @@ self: {
        libraryHaskellDepends = [
          arrows base containers fingertree semigroups TypeCompose
        ];
-       homepage = "https://grapefruit-project.org/";
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90867,7 +87443,6 @@ self: {
        version = "0.1.0.7";
        sha256 = "0j1jy4rq11gk7j08cz7skdqlbnjrciiv0vi491lvmbbwmvf15cd6";
        libraryHaskellDepends = [ arrows base grapefruit-frp ];
-       homepage = "https://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90884,7 +87459,6 @@ self: {
          arrows base colour containers fraction grapefruit-frp
          grapefruit-records
        ];
-       homepage = "https://grapefruit-project.org/";
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -90902,7 +87476,6 @@ self: {
          base colour containers fraction glib grapefruit-frp
          grapefruit-records grapefruit-ui gtk3 transformers
        ];
-       homepage = "https://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90924,7 +87497,6 @@ self: {
          base containers deepseq hashable HTF mtl QuickCheck safe
          unordered-containers vector
        ];
-       homepage = "https://github.com/factisresearch/graph-core";
        description = "Fast, memory efficient and persistent graph implementation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -90949,7 +87521,6 @@ self: {
          base Cabal containers fgl hspec hspec-expectations multiset
          mwc-random QuickCheck
        ];
-       homepage = "https://github.com/ulikoehler/graph-random";
        description = "Functions for generating structured or random FGL graphs";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -90975,7 +87546,6 @@ self: {
        libraryHaskellDepends = [
          base base-unicode-symbols containers mtl
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90996,7 +87566,6 @@ self: {
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "Interactive graph rewriting system implementing various well-known combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91014,7 +87583,6 @@ self: {
          AC-Vector base base-unicode-symbols containers GLUT graph-rewriting
          graph-rewriting-layout OpenGL
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91037,7 +87605,6 @@ self: {
          graph-rewriting-layout graph-rewriting-strategies IndentParser
          OpenGL parsec
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91054,7 +87621,6 @@ self: {
        libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91075,7 +87641,6 @@ self: {
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91092,7 +87657,6 @@ self: {
        libraryHaskellDepends = [
          base base-unicode-symbols containers graph-rewriting
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91115,7 +87679,6 @@ self: {
          graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL
          uu-parsinglib
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91137,7 +87700,6 @@ self: {
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout IndentParser OpenGL parsec
        ];
-       homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91150,7 +87712,6 @@ self: {
        version = "0.2";
        sha256 = "1a9qq5gpyxg6j6ja3kjldnf11wywjvvxpwvgiahlsrmwfw2c8d74";
        libraryHaskellDepends = [ array base bytestring containers ];
-       homepage = "http://github.com/nominolo/graph-serialize";
        description = "Serialization of data structures with references";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91166,7 +87727,6 @@ self: {
        libraryHaskellDepends = [
          base containers fgl mtl parsec syb template-haskell
        ];
-       homepage = "http://github.com/konn/graph-utils/";
        description = "A simple wrapper & quasi quoter for fgl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91183,7 +87743,6 @@ self: {
        libraryHaskellDepends = [
          base containers data-lens data-lens-template mtl
        ];
-       homepage = "https://github.com/atzedijkstra/graph-visit";
        description = "Graph walk abstraction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91201,7 +87760,6 @@ self: {
        testHaskellDepends = [
          array base containers deepseq hspec QuickCheck
        ];
-       homepage = "https://github.com/soenkehahn/graph-wrapper";
        description = "A wrapper around the standard Data.Graph with a less awkward interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91219,7 +87777,6 @@ self: {
          base containers mtl QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/tel/graphbuilder";
        description = "A declarative, monadic graph construction language for small graphs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91237,7 +87794,6 @@ self: {
          base bifunctors containers hashable lens-family lens-family-core
          mtl transformers
        ];
-       homepage = "https://github.com/5outh/graphene";
        description = "A minimal Graph Theory library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91256,7 +87812,6 @@ self: {
        libraryHaskellDepends = [
          base bitmap bitmap-opengl FTGL OpenGL stb-image
        ];
-       homepage = "http://github.com/luqui/graphics-drawingcombinators";
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91273,7 +87828,6 @@ self: {
        libraryHaskellDepends = [
          base bitmap-opengl containers hxt OpenGL stb-image transformers
        ];
-       homepage = "http://github.com/luqui/collada";
        description = "Load 3D geometry in the COLLADA format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91305,7 +87859,6 @@ self: {
          base bindings-DSL containers CV directory ghc-prim wx wxcore
        ];
        executableHaskellDepends = [ base CV wx wxcore ];
-       homepage = "https://yousource.it.jyu.fi/cvlab/pages/GraphicsTools";
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91327,7 +87880,6 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/alx741/graphite#readme";
        description = "Graphs and networks library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91346,7 +87898,6 @@ self: {
          base Cabal containers directory dotgen filepath haskell-lexer
          pretty
        ];
-       homepage = "http://github.com/yav/graphmod/wiki";
        description = "Present the module dependencies of a program as a \"dot\" graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91360,7 +87911,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ attoparsec base tasty tasty-hunit text ];
-       homepage = "https://github.com/jdnavarro/graphql-haskell";
        description = "Haskell GraphQL implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91386,7 +87936,6 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base criterion exceptions protolude transformers
        ];
-       homepage = "https://github.com/haskell-graphql/graphql-api#readme";
        description = "GraphQL API";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -91402,7 +87951,6 @@ self: {
        libraryHaskellDepends = [
          array base containers transformers transformers-compat void
        ];
-       homepage = "http://github.com/ekmett/graphs";
        description = "A simple monadic graph library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91414,7 +87962,6 @@ self: {
        version = "0.3.1.0";
        sha256 = "0y2nqsygqcxb0w7x1irikqqx10m209nihqmxqy1s18snrlvh06c9";
        libraryHaskellDepends = [ base indexed ];
-       homepage = "https://github.com/aaronfriel/graphted#readme";
        description = "Graph indexed monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91432,7 +87979,6 @@ self: {
        executableHaskellDepends = [
          base containers dotgen haskell-src-exts haskell98 uniplate
        ];
-       homepage = "http://github.com/explicitcall/graphtype";
        description = "A simple tool to illustrate dependencies between Haskell types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91446,8 +87992,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphviz";
-       version = "2999.20.0.1";
-       sha256 = "147pwfswjkpmby55j5dwwhrvxpy63gzybrrq6zs4r22mrkcpjx94";
+       version = "2999.20.0.2";
+       sha256 = "0kj7ap0gnliviq2p8lscw1m06capnsa90vpvcys24nqy5nw2wrp7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -91459,7 +88005,6 @@ self: {
          QuickCheck text
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
-       homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91476,7 +88021,6 @@ self: {
          aeson base containers process regex-posix scientific text
        ];
        testHaskellDepends = [ base hspec markdown-unlit text ];
-       homepage = "https://github.com/graknlabs/graql-haskell";
        description = "Execute Graql queries on a Grakn graph";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91502,7 +88046,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/janmasrovira/am3-project/overview";
        description = "GRASP implementation for the AMMM project";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91532,7 +88075,6 @@ self: {
        sha256 = "0b0pm24mxjsxg95q6yisr9pa0jfklsfw66cicryib42czvv083av";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://bitbucket.org/astanin/hs-gray-code";
        description = "Gray code encoder/decoder";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91549,7 +88091,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mhwombat/gray-extended#readme";
        description = "Gray encoding schemes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91572,7 +88113,6 @@ self: {
          aeson aeson-casing base bytestring file-embed network scientific
          tasty tasty-hunit text time vector
        ];
-       homepage = "https://github.com/AndrewRademacher/haskell-graylog";
        description = "Support for graylog output";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91588,7 +88128,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ array base containers pretty ];
-       homepage = "https://github.com/sof/greencard";
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91602,7 +88141,6 @@ self: {
        sha256 = "1a8h36kclb5db7kfy1pb4h2pwy6a6wwnjpm21xzvc9fjx9vj44kd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base containers greencard pretty ];
-       homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91622,7 +88160,6 @@ self: {
          base binary classy-prelude directory microlens microlens-mtl text
          unix utf8-string vector X11
        ];
-       homepage = "https://github.com/erebe/greenclip#readme";
        description = "Simple clipboard manager to be integrated with rofi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91639,7 +88176,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring clock hostname network stm system-uuid time
        ];
-       homepage = "http://code.google.com/p/greg/";
        description = "A scalable distributed logger with a high-precision global time axis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91664,7 +88200,6 @@ self: {
          aeson base lens lens-aeson mtl text unordered-containers
        ];
        testHaskellDepends = [ aeson-qq base hspec lens lens-aeson mtl ];
-       homepage = "http://github.com/nakaji-dayo/gremlin-haskell";
        description = "Graph database client for TinkerPop3 Gremlin Server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91706,7 +88241,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/NICTA/greplicate";
        description = "Generalised replicate functions";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91729,7 +88263,6 @@ self: {
          aeson base bytestring doctest doctest-discover greskell-core hint
          hspec text unordered-containers
        ];
-       homepage = "https://github.com/debug-ito/greskell/";
        description = "Haskell binding for Gremlin graph query language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91749,7 +88282,6 @@ self: {
        testHaskellDepends = [
          aeson base doctest doctest-discover hspec QuickCheck text
        ];
-       homepage = "https://github.com/debug-ito/greskell/";
        description = "Haskell binding for Gremlin graph query language - core data types and tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91767,7 +88299,6 @@ self: {
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mhwombat/grid#readme";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91781,7 +88312,6 @@ self: {
        sha256 = "1shycjhis1hsyw8qxm6jfrh03q507rj85689733hrv46c9z022hh";
        libraryHaskellDepends = [ base earclipper gjk gridbox ];
        testHaskellDepends = [ base earclipper gjk gridbox hspec ];
-       homepage = "https://github.com/zaidan/gridbounds#readme";
        description = "Collision detection for GridBox";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91795,7 +88325,6 @@ self: {
        sha256 = "0idal1vxpjw6jizhmj3kc1l3iw8yx6xf9byad0zk8gfzyyw949wi";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/zaidan/gridbox#readme";
        description = "A grid box model";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -91813,7 +88342,6 @@ self: {
          base bson bytestring conduit conduit-extra monad-control mongoDB
          mtl pureMD5 resourcet tagged text time transformers
        ];
-       homepage = "http://github.com/btubbs/haskell-gridfs#readme";
        description = "GridFS (MongoDB file storage) implementation";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91919,7 +88447,6 @@ self: {
          stm-delay text these time transformers unordered-containers uuid
          vector yaml
        ];
-       homepage = "https://github.com/alonsodomin/groot#readme";
        description = "Command line utility to manage AWS ECS resources";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91955,7 +88482,6 @@ self: {
          containers monad-control mtl resourcet safe-exceptions scientific
          text time transformers transformers-base transformers-compat
        ];
-       homepage = "http://github.com/lykahb/groundhog";
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -91998,7 +88524,6 @@ self: {
          base bytestring cmdargs containers groundhog groundhog-sqlite
          groundhog-th mtl
        ];
-       homepage = "http://github.com/lykahb/groundhog";
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92086,7 +88611,6 @@ self: {
          base explicit-exception filemanip hsshellscript pathtype time
          transformers unix-compat utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/group-by-date/";
        description = "Shell command for grouping files by dates into folders";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92103,7 +88627,6 @@ self: {
        testHaskellDepends = [
          base Cabal containers hspec hspec-expectations QuickCheck
        ];
-       homepage = "https://github.com/ulikoehler/group-with";
        description = "Classify objects by key-generating function, like SQL GROUP BY";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92122,7 +88645,6 @@ self: {
        benchmarkHaskellDepends = [
          base code-page criterion optparse-applicative random utility-ht
        ];
-       homepage = "https://github.com/oisdk/groupBy#readme";
        description = "Replacement definition of Data.List.GroupBy";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -92138,7 +88660,6 @@ self: {
        libraryHaskellDepends = [ base binary containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92150,7 +88671,6 @@ self: {
        version = "0.1.0";
        sha256 = "0gpjlq9f2il4vp7ihh1sf5g2jr1rbi5big5c6dhjk961n8b1dq0z";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "A Groupoid class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92163,7 +88683,6 @@ self: {
        sha256 = "08la44c19pz2clws5mb939zc1d17cb6qy9qlh2n1634pl0zrawb6";
        libraryHaskellDepends = [ base semigroupoids ];
        doHaddock = false;
-       homepage = "http://github.com/ekmett/groupoids/";
        description = "This package has been absorbed into semigroupoids 4.0";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92196,7 +88715,6 @@ self: {
          regex-compat text transformers transformers-base
          unordered-containers vector wai wai-extra warp
        ];
-       homepage = "http://github.com/iand675/growler";
        description = "A revised version of the scotty library that attempts to be simpler and more performant";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92251,7 +88769,6 @@ self: {
        sha256 = "0cgrw5ypkwp4mzj8m12q783jqng1jp1j7ny15704jmjxbq13cq3q";
        libraryHaskellDepends = [ base bytestring transformers ];
        libraryPkgconfigDepends = [ gsasl ];
-       homepage = "https://john-millikin.com/software/haskell-gsasl/";
        description = "Bindings for GNU libgsasl";
        license = stdenv.lib.licenses.gpl3;
      }) {inherit (pkgs) gsasl;};
@@ -92275,7 +88792,6 @@ self: {
        sha256 = "08jrxpgshvygw7m91nvnwynyrrn94iw6k6gp24fzwdkv8dayzqb2";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base vector ];
-       homepage = "http://github.com/patperry/hs-gsl-random";
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92288,7 +88804,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "1qf5m3zksn16mlgavrwbq6yd1mbyafy27qf1ws4nmkxl8ci0k48i";
        libraryHaskellDepends = [ base gsl-random random-fu ];
-       homepage = "http://code.haskell.org/~mokus/gsl-random-fu";
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92307,7 +88822,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl parsec permute sindre text X11
        ];
-       homepage = "http://sigkill.dk/programs/gsmenu";
        description = "A visual generic menu";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92323,11 +88837,10 @@ self: {
        sha256 = "0bpwjggsdkckwfgmp89rvkzxjlagiliawrzf9pzvxrka7wk1ip14";
        libraryHaskellDepends = [ base bytestring resourcet transformers ];
        librarySystemDepends = [ gssapi_krb5 krb5 ];
-       homepage = "https://github.com/ondrap/gssapi";
        description = "libgssapi and libkrb5 bindings for haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {gssapi_krb5 = null; krb5 = null;};
+     }) {gssapi_krb5 = null; inherit (pkgs) krb5;};
 
   "gssapi-wai" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring
@@ -92341,7 +88854,6 @@ self: {
          base base64-bytestring bytestring case-insensitive gssapi
          http-types vault wai wai-extra
        ];
-       homepage = "https://github.com/ondrap/gssapi-wai";
        description = "WAI Middleware for SPNEGO authentiaction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92378,7 +88890,6 @@ self: {
          array base bytestring directory glib mtl
        ];
        libraryPkgconfigDepends = [ gst-plugins-base gstreamer ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
@@ -92398,7 +88909,6 @@ self: {
          base containers extensible-exceptions haskeline HTTP json mtl unix
          url utf8-string
        ];
-       homepage = "http://github.com/styx/gtc";
        description = "Console and GUI interface for Google Translate service";
        license = "GPL";
      }) {};
@@ -92432,7 +88942,6 @@ self: {
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk2 ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
      }) {gtk2 = pkgs.gnome2.gtk;};
@@ -92448,7 +88957,6 @@ self: {
        libraryHaskellDepends = [
          array base gio glib gtk mtl process template-haskell
        ];
-       homepage = "http://keera.es/blog/community";
        description = "A collection of auxiliary operations and widgets related to Gtk+";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -92460,7 +88968,6 @@ self: {
        version = "0.0.0";
        sha256 = "0fjlk6z8j77l35k9cdzgbyf1w5wd0v0k1sry78vf7f6j4mvv8wb0";
        libraryHaskellDepends = [ base gtk json transformers ];
-       homepage = "http://github.com/timthelion/gtk-jsinput";
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -92493,7 +89000,6 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk2 ];
-       homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92512,7 +89018,6 @@ self: {
          array base containers glib gtk haskell98 mtl
        ];
        libraryPkgconfigDepends = [ gtk2 ];
-       homepage = "http://www.haskell.org/gtk2hs/";
        description = "GTK+ Serialized event";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92525,7 +89030,6 @@ self: {
        version = "0.0.0";
        sha256 = "1qqfhaap2996015h3jkgg9j3hyxrh88wn6kba29ys0q1h35f8yws";
        libraryHaskellDepends = [ base gtk ];
-       homepage = "http://github.com/timthelion/gtk-simple-list-view";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -92554,7 +89058,6 @@ self: {
          base dbus dbus-hslogger gi-gdk gi-gtk gtk-strut hslogger
          optparse-applicative status-notifier-item text unix
        ];
-       homepage = "https://github.com/IvanMalison/gtk-sni-tray#readme";
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92567,7 +89070,6 @@ self: {
        version = "0.1.2.1";
        sha256 = "1m5vvyiyn4v6a8jhizcm8dyi20q2nag9ycm0c2hdxfhsl7fxbx31";
        libraryHaskellDepends = [ base gi-gdk gi-gtk text transformers ];
-       homepage = "https://github.com/IvanMalison/gtk-strut#readme";
        description = "Libary for creating strut windows with gi-gtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92580,7 +89082,6 @@ self: {
        version = "0.0.0";
        sha256 = "14hb7nxf4l0q7hab8dzll8dh5ccb4hhc8arywijdgdrz4i2s2706";
        libraryHaskellDepends = [ base gtk ];
-       homepage = "http://github.com/timthelion/gtk-toggle-button-list";
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -92605,7 +89106,6 @@ self: {
        sha256 = "0vc1gwhg5l7l5iqb1i3zwd1bsy8fxsiwkwzza7j15zi07f97k7di";
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ x11 ];
-       homepage = "http://github.com/travitch/gtk-traymanager";
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) x11;};
@@ -92627,7 +89127,6 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Tools to build the Gtk2Hs suite of User Interface libraries";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -92745,7 +89244,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base glib gtk3 transformers ];
-       homepage = "http://www.haskell.org/hello/";
        description = "Gtk2Hs Hello World, an example package";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92779,7 +89277,6 @@ self: {
          array base bytestring cairo containers gio glib mtl pango text
        ];
        libraryPkgconfigDepends = [ gtk3 ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gtk3;};
@@ -92796,7 +89293,6 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ array base containers glib gtk3 mtl ];
        libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ];
-       homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92814,7 +89310,6 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ gtkglext ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92834,7 +89329,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtkimageview ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92854,7 +89348,6 @@ self: {
        executableHaskellDepends = [
          base gconf glade gtk MissingH process regex-posix unix
        ];
-       homepage = "http://hg.complete.org/gtkrsync";
        description = "Gnome rsync progress display";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92874,7 +89367,6 @@ self: {
          array base containers glib gtk mtl text
        ];
        libraryPkgconfigDepends = [ gtksourceview ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) gtksourceview;};
@@ -92893,7 +89385,6 @@ self: {
          array base containers glib gtk3 mtl text
        ];
        libraryPkgconfigDepends = [ gtksourceview3 ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
@@ -92905,7 +89396,6 @@ self: {
        version = "0.1";
        sha256 = "04396pd4c4yqpw6ai5ciigva9l3acdz7yn4d5hvyks52khv5fsf9";
        libraryHaskellDepends = [ base instant-generics ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/GuardedRewriting";
        description = "Datatype-generic rewriting with preconditions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92918,7 +89408,6 @@ self: {
        version = "0.1.1";
        sha256 = "1xaj8zl6cbgks3r0asbnkz1ixq1hlglpjxdymj6ikyjq955sxmzj";
        libraryHaskellDepends = [ base HList ];
-       homepage = "http://code.atnnn.com/project/guess";
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -92947,7 +89436,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base cairo containers filepath gtk ];
-       homepage = "https://code.mathr.co.uk/gulcii";
        description = "graphical untyped lambda calculus interactive interpreter";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -92959,7 +89447,6 @@ self: {
        version = "1.1.0";
        sha256 = "0vvzlfnvh9r9jqf7v83d0piqpvl40sg0mswf9f41vncgzg0z79v2";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/justinhanekom/gutenberg-fibonaccis";
        description = "The first 1001 Fibonacci numbers, retrieved from the Gutenberg Project";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -92995,7 +89482,6 @@ self: {
        executableHaskellDepends = [
          base exceptions http-client servant-client
        ];
-       homepage = "https://github.com/stites/gym-http-api#readme";
        description = "REST client to the gym-http-api project";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93020,7 +89506,6 @@ self: {
          base bytestring containers directory filepath http-conduit hxt mtl
          stm template-haskell transformers utf8-string vinyl
        ];
-       homepage = "https://github.com/Fuuzetsu/h-booru";
        description = "Haskell library for retrieving data from various booru image sites";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93045,7 +89530,6 @@ self: {
          email-validate exceptions filepath HUnit QuickCheck tasty
          tasty-hunit tasty-quickcheck temporary time transformers unix
        ];
-       homepage = "https://github.com/rethab/h-gpgme";
        description = "High Level Binding for GnuPG Made Easy (gpgme)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93070,7 +89554,6 @@ self: {
        testHaskellDepends = [
          base containers hspec QuickCheck split text
        ];
-       homepage = "https://github.com/apoorvingle/h-reversi";
        description = "Reversi game in haskell/blank-canvas";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93093,7 +89576,6 @@ self: {
          base MonadRandom mtl text transformers vty vty-ui
        ];
        testHaskellDepends = [ base HUnit MonadRandom mtl transformers ];
-       homepage = "https://github.com/Javran/h2048";
        description = "a haskell implementation of Game 2048";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93106,7 +89588,6 @@ self: {
        version = "1.0.0";
        sha256 = "16aljqvzf8n1js0drqii99z3v8xba0468w27c9vmf5w483awkqjb";
        libraryHaskellDepends = [ base bytestring mtl resourcet ];
-       homepage = "https://bitbucket.org/fmapE/h2c";
        description = "Bindings to Linux I2C with support for repeated-start transactions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93123,7 +89604,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers mtl serialport time
        ];
-       homepage = "http://leventerkok.github.com/hArduino";
        description = "Control your Arduino board from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93183,7 +89663,6 @@ self: {
        libraryHaskellDepends = [ base hashable haskell-src ];
        executableHaskellDepends = [ base hashable ];
        testHaskellDepends = [ base hashable ];
-       homepage = "https://github.com/MarekSuchanek/hCM";
        description = "Conceptual modelling support for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -93283,7 +89762,6 @@ self: {
          aeson attoparsec base bytestring Crypto dataenc ghc-prim HTTP mtl
          old-locale old-time pureMD5 random time
        ];
-       homepage = "http://github.com/itkovian/hMollom";
        description = "Library to interact with the @Mollom anti-spam service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93299,7 +89777,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hOff-parser OpenGL ];
        executableHaskellDepends = [ base GLFW hOff-parser OpenGL parsec ];
-       homepage = "https://github.com/Qinka/hOff";
        description = "The tool to transform the OFF to other image format";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -93311,7 +89788,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1vjvn4sr9nb7dd0in57kay6sb49nqzs377v6k9570h5faaj1dyci";
        libraryHaskellDepends = [ base parsec ];
-       homepage = "https://github.com/Qinka/hOff";
        description = "The parser to parser the OFF(Object File Format, Princeton ModelNet)";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -93360,7 +89836,6 @@ self: {
          split text time time-locale-compat transformers unliftio-core
          unordered-containers wl-pprint-extras zlib
        ];
-       homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93411,7 +89886,6 @@ self: {
          resourcet semigroups split text time time-locale-compat
          transformers unliftio-core unordered-containers zlib
        ];
-       homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93432,7 +89906,6 @@ self: {
          iterable mmap mtl Octree parallel QuickCheck tagged
          template-haskell text unordered-containers vector zlib
        ];
-       homepage = "https://github.com/BioHaskell/hPDB";
        description = "Protein Databank file format library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93459,7 +89932,6 @@ self: {
          AC-Vector base bytestring containers deepseq directory ghc-prim
          hPDB IfElse iterable mtl process template-haskell text time vector
        ];
-       homepage = "https://github.com/BioHaskell/hPDB-examples";
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93476,7 +89948,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring http-conduit network text
        ];
-       homepage = "tot";
        description = "Pushover.net API functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93501,7 +89972,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "188rs1g2yacka8c4wbqkhwjrin95f3ribm8007lqsxiapaj1d89y";
        libraryHaskellDepends = [ attoparsec base bytestring ];
-       homepage = "https://github.com/yihuang/hresp";
        description = "haskell implementation of RESP (REdis Serialization Protocol)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93521,7 +89991,6 @@ self: {
          base bytestring Crypto dataenc HTTP hxt MissingH network
          network-uri old-locale old-time random regex-compat utf8-string
        ];
-       homepage = "http://gregheartsfield.com/hS3/";
        description = "Interface to Amazon's Simple Storage Service (S3)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93569,7 +90038,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mgajda/hTalos";
        description = "Parser, print and manipulate structures in PDB file format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93582,7 +90050,6 @@ self: {
        version = "0.9.1";
        sha256 = "08zmzzwbvqsyz7v5grjwg81434bdr3zkkd12ifhk76xg2p0xfhmk";
        libraryHaskellDepends = [ base containers hmatrix random ];
-       homepage = "http://perception.inf.um.es/tensor";
        description = "Multidimensional arrays and simple tensor computations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93598,7 +90065,6 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base hmatrix ];
        executableSystemDepends = [ blas liblapack ];
-       homepage = "http://dslsrv4.cs.missouri.edu/~qqbm9";
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93633,7 +90099,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mhwombat/haar";
        description = "Haar wavelet transforms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93659,7 +90124,6 @@ self: {
          resourcet telegram-api text transformers transformers-base
        ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/airalab/habit#readme";
        description = "Haskell message bot framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93672,7 +90136,6 @@ self: {
        version = "0.3.1";
        sha256 = "07h9a8l32j6j5ssrl7f1j02jlmn5f7c48h88fn7lbzhj24kqasl3";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mekeor/hable";
        description = "customizable pretty printer library for tables";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -93719,7 +90182,6 @@ self: {
        sha256 = "0wrfa9fa6skl985fi2a6iv4m8kchg87w9x3k37nf3l8vaz95jmdr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring data-default ];
-       homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "a Haskell Webserver Interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93739,7 +90201,6 @@ self: {
          directory filepath hack haskell98 mps network old-locale old-time
          time utf8-string
        ];
-       homepage = "http://github.com/nfjinjing/hack-contrib";
        description = "Hack contrib";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93757,7 +90218,6 @@ self: {
          base bytestring bytestring-class containers hack json mtl parsec
          press
        ];
-       homepage = "http://github.com/bickfordb/hack-contrib-press";
        description = "Hack helper that renders Press templates";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93776,7 +90236,6 @@ self: {
          base bytestring containers hack happstack-server network
          utf8-string
        ];
-       homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "hack-frontend-happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93801,7 +90260,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "0pm8vs94dbaahqrdwfffwa1jb9ghyjnq48sirlw1dj2gcsa3np2x";
        libraryHaskellDepends = [ base bytestring hack ];
-       homepage = "http://github.com/snoyberg/hack-handler-cgi/tree/master";
        description = "Hack handler using CGI protocol. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93821,7 +90279,6 @@ self: {
          base containers data-default epoll failure hack HTTP network unix
          utf8-string
        ];
-       homepage = "https://gitlab.com/twittner/hack-handler-epoll";
        description = "hack handler implementation using epoll";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93841,7 +90298,6 @@ self: {
          hack-contrib network
        ];
        librarySystemDepends = [ event ];
-       homepage = "http://github.com/bickfordb/hack-handler-evhttp";
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93855,7 +90311,6 @@ self: {
        sha256 = "02slh33r9qy8q0vpi4s4vvf5lmb14ypk8bixdicvxakahjvxhanr";
        libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ];
        librarySystemDepends = [ fcgi ];
-       homepage = "http://github.com/snoyberg/hack-handler-fastcgi/tree/master";
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93874,7 +90329,6 @@ self: {
          base bytestring cgi containers data-default hack happstack-server
          mtl network
        ];
-       homepage = "http://github.com/nfjinjing/hack-handler-happstack";
        description = "Hack Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93892,7 +90346,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers data-default hack hyena network
        ];
-       homepage = "http://github.com/nfjinjing/hack-handler-hyena";
        description = "Hyena hack handler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93908,7 +90361,6 @@ self: {
        libraryHaskellDepends = [
          base cgi data-default hack kibro network
        ];
-       homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "Hack Kibro handler";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93925,7 +90377,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring failure hack network web-encodings
        ];
-       homepage = "http://github.com/snoyberg/hack-handler-simpleserver/tree/master";
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93940,7 +90391,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring hack split web-encodings
        ];
-       homepage = "http://github.com/snoyberg/hack-middleware-cleanpath/tree/master";
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93957,7 +90407,6 @@ self: {
        libraryHaskellDepends = [
          base clientsession hack old-locale predicates time web-encodings
        ];
-       homepage = "http://github.com/snoyberg/hack-middleware-clientsession/tree/master";
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93970,7 +90419,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "1x7526939h7g44yyscyk324gdb40cryyiffh13iinf8aw1rach70";
        libraryHaskellDepends = [ base hack split zlib ];
-       homepage = "http://github.com/snoyberg/hack-middleware-gzip/tree/master";
        description = "Automatic gzip compression of responses. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -93986,7 +90434,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring bytestring-class hack web-encodings
        ];
-       homepage = "http://github.com/snoyberg/hack-middleware-jsonp/tree/master";
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -93999,7 +90446,6 @@ self: {
        version = "2014.11.17";
        sha256 = "1b6jzdisv58scyzb9pxhqrnz74sy0j96jkbbnf84wccwbwn4rf28";
        libraryHaskellDepends = [ base bytestring data-default ];
-       homepage = "https://github.com/nfjinjing/hack2";
        description = "a Haskell Webserver Interface (V2)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94016,7 +90462,6 @@ self: {
          air base bytestring containers data-default directory filepath
          hack2 network-uri text time
        ];
-       homepage = "https://github.com/nfjinjing/hack2-contrib";
        description = "Hack2 contrib";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94035,7 +90480,6 @@ self: {
          air air-extra base bytestring cgi containers data-default directory
          filepath hack2 hack2-contrib network old-locale old-time time
        ];
-       homepage = "https://github.com/nfjinjing/hack2-contrib";
        description = "Hack2 contrib extra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94054,7 +90498,6 @@ self: {
          base bytestring cgi containers data-default enumerator hack2
          happstack-server mtl network
        ];
-       homepage = "https://github.com/nfjinjing/hack2-handler-happstack-server";
        description = "Hack2 Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94076,7 +90519,6 @@ self: {
          containers data-default directory enumerator hack2 mtl network safe
          stm text unix zeromq-haskell
        ];
-       homepage = "https://github.com/nfjinjing/hack2-handler-mongrel2-http";
        description = "Hack2 Mongrel2 HTTP handler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94096,7 +90538,6 @@ self: {
          data-default directory enumerator hack2 mtl network snap-core
          snap-server
        ];
-       homepage = "https://github.com/nfjinjing/hack2-handler-snap-server";
        description = "Hack2 Snap server handler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94114,7 +90555,6 @@ self: {
        libraryHaskellDepends = [
          air base data-default hack2 hack2-interface-wai warp
        ];
-       homepage = "https://github.com/nfjinjing/hack2-handler-warp";
        description = "Hack2 warp handler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94132,7 +90572,6 @@ self: {
          base bytestring case-insensitive containers data-default hack2
          http-types network safe wai
        ];
-       homepage = "https://github.com/nfjinjing/hack2-interface-wai";
        description = "Hack2 interface to WAI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94156,7 +90595,6 @@ self: {
        executableHaskellDepends = [
          base bytestring Cabal containers utf8-string
        ];
-       homepage = "https://github.com/peti/hackage-db#readme";
        description = "Access Hackage's package database via Data.Map";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -94176,7 +90614,6 @@ self: {
          aeson base bytestring Cabal containers directory filepath tar time
          utf8-string
        ];
-       homepage = "https://github.com/peti/hackage-db#readme";
        description = "Access Hackage's package database via Data.Map";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94198,7 +90635,6 @@ self: {
          ansi-terminal async attoparsec base Cabal cpphs directory filepath
          haskell-src-exts HTTP mtl process text
        ];
-       homepage = "https://github.com/blitzcode/hackage-diff";
        description = "Compare the public API of different versions of a Hackage library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94229,7 +90665,6 @@ self: {
        executableHaskellDepends = [
          base monad-logger optparse-applicative
        ];
-       homepage = "http://fpcomplete.com";
        description = "Simple mirroring utility for Hackage";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94249,7 +90684,6 @@ self: {
          base bytestring containers directory download-curl filepath gnuplot
          old-locale old-time parsedate
        ];
-       homepage = "http://code.haskell.org/~dons/code/hackage-plot";
        description = "Generate cumulative graphs of hackage uploads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94263,7 +90697,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal containers hackage-db ];
-       homepage = "http://hub.darcs.net/thielema/hackage-processing";
        description = "Process 00-index.tar.gz from Hackage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94288,7 +90721,6 @@ self: {
          http-conduit http-types optparse-applicative tar text transformers
          unordered-containers wai warp zlib zlib-conduit
        ];
-       homepage = "http://github.com/snoyberg/hackage-proxy";
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94309,7 +90741,6 @@ self: {
          base bytestring Cabal directory filepath hackage-security network
          network-uri old-time optparse-applicative tar time unix zlib
        ];
-       homepage = "https://github.com/haskell/hackage-security";
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94336,7 +90767,6 @@ self: {
          base bytestring Cabal containers network-uri QuickCheck tar tasty
          tasty-hunit tasty-quickcheck temporary time zlib
        ];
-       homepage = "https://github.com/haskell/hackage-security";
        description = "Hackage security library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94354,7 +90784,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
-       homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94412,7 +90841,6 @@ self: {
          base bytestring directory download filepath hsparklines old-locale
          old-time parsedate tagsoup
        ];
-       homepage = "http://code.haskell.org/~dons/code/hackage-sparks";
        description = "Generate sparkline graphs of hackage statistics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94431,7 +90859,6 @@ self: {
          base Cabal containers directory filepath hackage-db process
          temporary
        ];
-       homepage = "https://github.com/stepcut/hackage-whatsnew";
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94445,7 +90872,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base download feed tagsoup ];
-       homepage = "http://code.haskell.org/~dons/code/hackage2hwn";
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94460,7 +90886,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base feed feed2twitter ];
-       homepage = "http://github.com/tomlokhorst/hackage2twitter";
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94479,7 +90904,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers directory filepath mtl process regex-tdfa
        ];
-       homepage = "https://github.com/dterei/Hackager";
        description = "Hackage testing tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94522,7 +90946,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/fgaz/hackertyper";
        description = "\"Hack\" like a programmer in movies and games!";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -94543,7 +90966,6 @@ self: {
          http-client http-client-tls http-types mtl process text
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
-       homepage = "http://github.com/agrafix/hackmanager";
        description = "Generate useful files for Haskell projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94593,7 +91015,6 @@ self: {
          base containers monad-control mtl resourcet stm stm-chans
          transformers-base
        ];
-       homepage = "https://github.com/Forkk/hactor";
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94606,7 +91027,6 @@ self: {
        version = "0.0.3.1";
        sha256 = "0nxcl3v9gnnyjzdpk30m2pmrhwcva9rky2dxrj4nnkr67ajm2dj0";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/treep/hactors";
        description = "Practical actors for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94626,7 +91046,6 @@ self: {
        testHaskellDepends = [ base Cabal directory filepath process ];
        doCheck = false;
        preCheck = "unset GHC_PACKAGE_PATH";
-       homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94644,7 +91063,6 @@ self: {
        testHaskellDepends = [ base filepath hspec ];
        doCheck = false;
        preCheck = "unset GHC_PACKAGE_PATH";
-       homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94662,7 +91080,6 @@ self: {
        testHaskellDepends = [ base filepath hspec ];
        doCheck = false;
        preCheck = "unset GHC_PACKAGE_PATH";
-       homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94682,7 +91099,6 @@ self: {
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
        ];
-       homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94702,7 +91118,6 @@ self: {
          array base bytestring Cabal containers deepseq directory filepath
          ghc ghc-paths haddock-library xhtml
        ];
-       homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94725,7 +91140,6 @@ self: {
          ghc ghc-boot ghc-paths haddock-library transformers xhtml
        ];
        testHaskellDepends = [ base containers ghc hspec QuickCheck ];
-       homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94752,7 +91166,6 @@ self: {
          transformers xhtml
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94772,7 +91185,6 @@ self: {
        executableHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths pretty
        ];
-       homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94790,7 +91202,6 @@ self: {
        testHaskellDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
        ];
-       homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94808,7 +91219,6 @@ self: {
        testHaskellDepends = [
          base base-compat bytestring deepseq hspec QuickCheck transformers
        ];
-       homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94828,7 +91238,6 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        doHaddock = false;
-       homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94848,7 +91257,6 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        doHaddock = false;
-       homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -94871,7 +91279,6 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        doHaddock = false;
-       homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94895,7 +91302,6 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        doHaddock = false;
-       homepage = "http://www.haskell.org/haddock/";
        description = "Library exposing some functionality of Haddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94912,7 +91318,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring Cabal directory filepath process syb xhtml xml
        ];
-       homepage = "http://www.haskell.org/haddock/";
        description = "Test utilities for Haddock";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94935,26 +91340,25 @@ self: {
          haddock-api http-types mtl optparse-applicative process resourcet
          sqlite-simple tagsoup text transformers
        ];
-       homepage = "https://github.com/philopon/haddocset";
        description = "Generate docset of Dash by Haddock haskell documentation tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hadolint" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, dlist
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, gitrev, hspec, HUnit, language-docker
      , optparse-applicative, parsec, ShellCheck, split, text, yaml
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.6.5";
-       sha256 = "10pn82hichabqxxk931zwqkis8p0z235ydv7dlcrl8nisj6lzda1";
+       version = "1.6.6";
+       sha256 = "13rkz6f5dzkh9qy674ia34ld25xwpylja2mivmwfsijh5pc5qvwq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring dlist language-docker parsec ShellCheck split
-         text
+         aeson base bytestring containers language-docker parsec ShellCheck
+         split text
        ];
        executableHaskellDepends = [
          base directory filepath gitrev language-docker optparse-applicative
@@ -94964,7 +91368,6 @@ self: {
          aeson base bytestring hspec HUnit language-docker parsec ShellCheck
          split
        ];
-       homepage = "https://github.com/hadolint/hadolint";
        description = "Dockerfile Linter JavaScript API";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -94983,7 +91386,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring text vector ];
        librarySystemDepends = [ snappy ];
        testHaskellDepends = [ base bytestring filepath text vector ];
-       homepage = "http://github.com/jystic/hadoop-formats";
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95005,7 +91407,6 @@ self: {
          unix unordered-containers uuid vector xmlhtml
        ];
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
-       homepage = "http://github.com/jystic/hadoop-rpc";
        description = "Use the Hadoop RPC interface from Haskell";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -95032,7 +91433,6 @@ self: {
          attoparsec base bytestring hadoop-rpc tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       homepage = "http://github.com/jystic/hadoop-tools";
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95052,7 +91452,6 @@ self: {
          base bytestring cmdargs dns iproute MissingH parallel-io
        ];
        testHaskellDepends = [ base doctest filemanip ];
-       homepage = "http://michael.orlitzky.com/code/haeredes.php";
        description = "Confirm delegation of NS and MX records";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -95079,7 +91478,6 @@ self: {
        executableHaskellDepends = [
          base directory filemanip filepath optparse-applicative
        ];
-       homepage = "http://github.com/tych0/haggis";
        description = "A static site generator with blogging/comments support";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95155,7 +91553,6 @@ self: {
          base bytestring directory filepath http-client lens lens-aeson
          netrc network-uri optparse-applicative parsec process text wreq
        ];
-       homepage = "https://github.com/TaktInc/hail";
        description = "A service for pull-based continuous deployment based on hydra";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95175,7 +91572,6 @@ self: {
          http-client http-client-tls http-types tagsoup text time
          transformers
        ];
-       homepage = "https://bitbucket.org/robertmassaioli/hailgun";
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95207,7 +91603,6 @@ self: {
        libraryHaskellDepends = [
          base email-validate hailgun mtl text transformers
        ];
-       homepage = "https://github.com/cdepillabout/hailgun-simple";
        description = "Easy-to-use wrapper for the hailgun package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95297,7 +91692,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion http-types mtl persistent scotty time wai wai-extra
        ];
-       homepage = "https://github.com/tfausak/hairy";
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95328,7 +91722,6 @@ self: {
          test-framework-quickcheck2 vector
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ghc-prim ];
-       homepage = "http://indiana.edu/~ppaml/";
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95346,7 +91739,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base filepath mtl time ];
        executableHaskellDepends = [ directory process regexpr yjtools ];
-       homepage = "http://homepage3.nifty.com/salamander/second/projects/hake/index.xhtml";
        description = "make tool. ruby : rake = haskell : hake";
        license = "GPL";
      }) {};
@@ -95358,7 +91750,6 @@ self: {
        version = "0.1";
        sha256 = "1ddmnzan16vn0fbp1fgsidahayihhr0vw8saypdqq7lnhqw8j9d4";
        libraryHaskellDepends = [ base HTTP network ];
-       homepage = "https://code.reaktor42.de/projects/hakismet";
        description = "Akismet spam protection library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95429,7 +91820,6 @@ self: {
          tasty-quickcheck text unordered-containers yaml
        ];
        testToolDepends = [ utillinux ];
-       homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
@@ -95461,7 +91851,6 @@ self: {
          Agda base containers directory filepath hakyll mtl pandoc
          transformers xhtml
        ];
-       homepage = "https://github.com/bitonic/hakyll-agda";
        description = "Wrapper to integrate literate Agda files with Hakyll";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95490,7 +91879,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hakyll pandoc ];
        executableHaskellDepends = [ base directory filepath hakyll ];
-       homepage = "http://jaspervdj.be/hakyll";
        description = "Extra modules for the hakyll website compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95508,7 +91896,6 @@ self: {
          base blaze-html bytestring cassava hakyll vector
        ];
        testHaskellDepends = [ base blaze-html bytestring cassava hspec ];
-       homepage = "https://github.com/narrative/hakyll-contrib-csv#readme";
        description = "Generate Html tables from Csv files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95528,7 +91915,6 @@ self: {
          base bytestring directory hakyll process temporary
        ];
        executableHaskellDepends = [ base hakyll ];
-       homepage = "https://github.com/narrative/hakyll-contrib-elm#readme";
        description = "Compile Elm code for inclusion in Hakyll static site";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95541,7 +91927,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0mkbsivifggi64k97ssxb0dskzwf7h0sny4m8gmkdsvwqjhfdjam";
        libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ];
-       homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation";
        description = "automatic hyphenation for Hakyll";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95584,7 +91969,6 @@ self: {
        executableHaskellDepends = [
          base bytestring cmdargs directory feed filepath text time xml
        ];
-       homepage = "http://github.com/Minoru/hakyll-convert";
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95600,7 +91984,6 @@ self: {
        libraryHaskellDepends = [
          base containers data-default filepath hakyll
        ];
-       homepage = "http://github.com/freylax/hakyll-dir-list";
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95616,7 +91999,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html blaze-markup Elm hakyll mtl
        ];
-       homepage = "https://github.com/maxsnew/hakyll-elm";
        description = "Hakyll wrapper for the Elm compiler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95632,7 +92014,6 @@ self: {
        libraryHaskellDepends = [ base filepath hakyll ];
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/elaye/hakyll-favicon#README.md";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -95646,7 +92027,6 @@ self: {
        libraryHaskellDepends = [
          base filestore hakyll time time-locale-compat
        ];
-       homepage = "https://gitlab.com/aergus/hakyll-filestore";
        description = "FileStore utilities for Hakyll";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95659,7 +92039,6 @@ self: {
        version = "4.0";
        sha256 = "1w8wmqdfxf9w4mb9k77gak9iqxysa7mbb5phfh9a0hy30vx2qb1d";
        libraryHaskellDepends = [ base hakyll ogmarkup ];
-       homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme";
        description = "Integrate ogmarkup document with Hakyll";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95676,7 +92055,6 @@ self: {
        libraryHaskellDepends = [
          aeson-pretty base data-default-class filepath hakyll hsass
        ];
-       homepage = "https://github.com/meoblast001/hakyll-sass";
        description = "Hakyll SASS compiler over hsass";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95689,7 +92067,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1c86lzfri5s3xzh5qyw1rpbv1wag26vbxl7pbcmjl25ad380riax";
        libraryHaskellDepends = [ base containers hakyll ];
-       homepage = "https://github.com/oisdk/hakyll-series";
        description = "Adds series functionality to hakyll";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95757,7 +92134,6 @@ self: {
          haskell-src-exts HUnit mtl split tagged test-framework
          test-framework-hunit
        ];
-       homepage = "http://github.com/haskell-suite/halberd/";
        description = "A tool to generate missing import statements for Haskell modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95770,7 +92146,6 @@ self: {
        version = "0.2.2.3";
        sha256 = "0p4sb7vv9cljv48wlx65wgdnkryrk5d6yfh7g4yrm20w1p449hl5";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/ekmett/half";
        description = "Half-precision floating-point";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -95784,7 +92159,6 @@ self: {
        sha256 = "14r0nx8hm5fic9gz0ybjjw4kyc758zfgvhhwvzsshpx5caq6zch6";
        libraryHaskellDepends = [ base deepseq template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/ekmett/half";
        description = "Half-precision floating-point";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95821,7 +92195,6 @@ self: {
        version = "2.4.1";
        sha256 = "1anyf6mh13rmj5a0lsayrcxzvm3zk0a2943pzkgz06y3aqgmcbdb";
        libraryHaskellDepends = [ base directory HaXml pandoc ];
-       homepage = "http://github.com/peti/halipeto";
        description = "Haskell Static Web Page Generator";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95850,7 +92223,6 @@ self: {
          base bytestring containers filepath foreign-store gl linear mtl
          random sdl2 stm text time
        ];
-       homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95872,7 +92244,6 @@ self: {
          base containers grid HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/timjb/halma";
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95892,7 +92263,6 @@ self: {
          async base data-default diagrams-cairo diagrams-gtk diagrams-lib
          gtk halma mtl mvc pipes timeit
        ];
-       homepage = "https://github.com/timjb/halma";
        description = "GTK application for playing Halma";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95918,7 +92288,6 @@ self: {
          semigroups servant-client telegram-api temporary text transformers
          vector
        ];
-       homepage = "https://github.com/timjb/halma";
        description = "Telegram bot for playing Halma";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -95964,7 +92333,6 @@ self: {
          async base bytestring cereal containers HALVMCore hans HTTP
          mime-types network-uri simple-tar text XenDevice
        ];
-       homepage = "http://halvm.org";
        description = "A simple, static HaLVM web server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96001,7 +92369,6 @@ self: {
          ansi-wl-pprint base containers hmatrix optparse-applicative vector
          vector-sized vty
        ];
-       homepage = "https://github.com/mstksg/hamilton";
        description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96027,7 +92394,6 @@ self: {
          ghc-typelits-knownnat hmatrix optparse-applicative vector
          vector-sized vty
        ];
-       homepage = "https://github.com/mstksg/hamilton#readme";
        description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96041,7 +92407,6 @@ self: {
        sha256 = "0rla3ap3malk8j6mh07fr2aqvbscpy743wrfq3skgjv3j4jlpjfi";
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Haml-like template files that are compile-time checked (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -96084,7 +92449,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://git.hemio.de/hemio/hamsql";
        description = "Interpreter for SQL-structure definitions in YAML (YamSql)";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96099,7 +92463,6 @@ self: {
        revision = "1";
        editedCabalFile = "1dik6zsi0x310m2x9qy64c0b4bd2gag1l6v1nsh09xqj7vlfpp5v";
        libraryHaskellDepends = [ array base deepseq hashable ];
-       homepage = "https://github.com/exclipy/pdata";
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96122,7 +92485,6 @@ self: {
          conduit-combinators conduit-extra exceptions gitrev
          optparse-applicative resourcet stm-conduit unix
        ];
-       homepage = "https://github.com/tfc/hamtsolo#readme";
        description = "Intel AMT serial-over-lan (SOL) client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96143,7 +92505,6 @@ self: {
          process
        ];
        executableHaskellDepends = [ filepath ];
-       homepage = "https://troglodita.di.uminho.pt/svn/musica/work/HaMusic";
        description = "Library to handle abstract music";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96156,7 +92517,6 @@ self: {
        version = "0.2.9.9";
        sha256 = "1ldfq3y9h9wvhqd3qs99hdi0d02016s7vkmf74p6wppkrzgfs3xn";
        libraryHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/functionally/raft";
        description = "This package is deprecated. It formerly contained Haskell utilities for data structures and data manipulation.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -96186,7 +92546,6 @@ self: {
          old-locale pretty process pureMD5 random regex-posix resourcet
          split time unix-compat utf8-string xml
        ];
-       homepage = "http://code.google.com/p/hgdata";
        description = "Library and command-line utility for accessing Google services and APIs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96207,7 +92566,6 @@ self: {
        executableHaskellDepends = [
          aeson base bytestring containers scientific
        ];
-       homepage = "http://code.bwbush.io/handa-geodata/";
        description = "Geographic and Geometric Data";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -96224,7 +92582,6 @@ self: {
          aeson array base binary data-default GLUT OpenGL opengl-dlp-stereo
          split vector-space
        ];
-       homepage = "https://bitbucket.org/functionally/handa-opengl";
        description = "Utility functions for OpenGL and GLUT";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -96256,7 +92613,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-th
        ];
-       homepage = "https://github.com/utdemir/handsy";
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96281,7 +92637,6 @@ self: {
          base bytestring directory filepath random text
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/ismailmustafa/handwriting-haskell#readme";
        description = "API Client for the handwriting.io API.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96353,7 +92708,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "10zj129s6l4gf9acvs1yahdwv5vqj9kqwshvfjdak3gbi7arw48s";
        libraryHaskellDepends = [ base bytestring hans pcap ];
-       homepage = "https://github.com/tolysz/hans-pcap";
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96366,7 +92720,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "07jspsi8y921n5m5ar93w4gqaff4mjx79ss416ccm4s1k4l2km0b";
        libraryHaskellDepends = [ base bytestring hans pfq ];
-       homepage = "https://github.com/tolysz/hans-pfq";
        description = "Driver for real ethernet devices for HaNS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96414,7 +92767,6 @@ self: {
        testHaskellDepends = [
          base directory filepath hspec mtl path path-io process temporary
        ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -96441,7 +92793,6 @@ self: {
        testHaskellDepends = [
          base directory filepath hspec mtl path path-io process temporary
        ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96476,12 +92827,49 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base glib gtk3 ];
        libraryPkgconfigDepends = [ libappindicator-gtk3 ];
-       homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libappindicator-gtk3;};
 
+  "happlets" = callPackage
+    ({ mkDerivation, base, bytestring, colour, containers, fail, lens
+     , linear, mtl, semigroups, text, time, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "happlets";
+       version = "0.1.0.0";
+       sha256 = "0y93pwhq3sgcsb5ll13yjrmgw0frrwhwkmc2nxwipdr1wv5cdyl8";
+       libraryHaskellDepends = [
+         base bytestring colour containers fail lens linear mtl semigroups
+         text time transformers unordered-containers
+       ];
+       description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps";
+       license = "AGPL";
+     }) {};
+
+  "happlets-lib-gtk" = callPackage
+    ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-core
+     , diagrams-lib, glib, gtk, happlets, lens, linear, mtl, pango
+     , semigroups, text, time
+     }:
+     mkDerivation {
+       pname = "happlets-lib-gtk";
+       version = "0.1.0.0";
+       sha256 = "1dih333zfqg6g9rh5wwli4vv9aq5m13cmph5zyijf7bf2zibrgsj";
+       libraryHaskellDepends = [
+         base cairo diagrams-cairo diagrams-core diagrams-lib glib gtk
+         happlets lens linear mtl pango semigroups text time
+       ];
+       testHaskellDepends = [
+         base cairo diagrams-cairo diagrams-core diagrams-lib glib gtk
+         happlets lens linear mtl semigroups text time
+       ];
+       description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\".";
+       license = "AGPL";
+     }) {};
+
   "happraise" = callPackage
     ({ mkDerivation, base, directory, filepath }:
      mkDerivation {
@@ -96562,7 +92950,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base happstack-server ];
        doHaddock = false;
-       homepage = "http://happstack.com";
        description = "The haskell application server stack + code generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96582,7 +92969,6 @@ self: {
          happstack-ixset happstack-server happstack-state mtl old-time
          random
        ];
-       homepage = "http://n-sch.de/happstack-auth";
        description = "A Happstack Authentication Suite";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96613,7 +92999,6 @@ self: {
          time unordered-containers userid web-routes web-routes-boomerang
          web-routes-happstack web-routes-hsp web-routes-th
        ];
-       homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96630,7 +93015,6 @@ self: {
          base bytestring cereal clientsession happstack-server monad-control
          mtl safecopy transformers-base
        ];
-       homepage = "http://happstack.com";
        description = "client-side session data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96652,7 +93036,6 @@ self: {
          happstack-server happstack-state happstack-util HTTP mtl network
          old-time syb unix
        ];
-       homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96675,7 +93058,6 @@ self: {
          base binary bytestring containers mtl pretty syb syb-with-class
          syb-with-class-instances-text template-haskell text time
        ];
-       homepage = "http://happstack.com";
        description = "Happstack data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96694,7 +93076,6 @@ self: {
          applicative-extras base bytestring containers formlets
          happstack-server mtl random template-haskell time xhtml
        ];
-       homepage = "http://patch-tag.com/r/cdsmith/happstack-dlg";
        description = "Cross-request user interactions for Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96721,7 +93102,6 @@ self: {
          network old-time random RJson syb text time utf8-string web-routes
          web-routes-mtl
        ];
-       homepage = "http://src.seereason.com/happstack-facebook/";
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96755,7 +93135,6 @@ self: {
        libraryHaskellDepends = [
          aeson base fay happstack-fay-ajax happstack-server mtl
        ];
-       homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96769,7 +93148,6 @@ self: {
        sha256 = "0zdkvvmywnfvqg5jdvf29qczzxmprvspxj0r1vj46fd6vld53j4j";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ fay-base fay-jquery ];
-       homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96791,7 +93169,6 @@ self: {
          monad-control mtl reform reform-happstack reform-hsp safecopy text
          web-routes web-routes-happstack web-routes-hsp web-routes-th
        ];
-       homepage = "http://www.happstack.com/";
        description = "Glue code for using Happstack with acid-state, web-routes, reform, and HSP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96803,7 +93180,6 @@ self: {
        version = "7.0.4";
        sha256 = "1l12gyyqzblb9psk6692r9xw640jxzyxqldfyg2yrzz8y0zi649a";
        libraryHaskellDepends = [ base happstack-server shakespeare text ];
-       homepage = "http://www.happstack.com/";
        description = "Support for Hamlet HTML templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96821,7 +93197,6 @@ self: {
          base blaze-builder bytestring either filepath happstack-server
          heist mtl text
        ];
-       homepage = "http://www.happstack.com/";
        description = "Support for using Heist templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96846,7 +93221,6 @@ self: {
          MissingH mtl network old-time parsec PBKDF2 pureMD5 random safe syb
          text utf8-string
        ];
-       homepage = "http://patch-tag.com/r/tphyahoo/HAppSHelpers/home";
        description = "Convenience functions for Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96864,7 +93238,6 @@ self: {
          base bytestring happstack-server harp hsp hsx2hs mtl syb text
          utf8-string
        ];
-       homepage = "http://www.happstack.com/";
        description = "Support for using HSP templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96880,7 +93253,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring happstack-server hslogger HStringTemplate mtl
        ];
-       homepage = "http://www.happstack.com/";
        description = "Support for using HStringTemplate in Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96900,7 +93272,6 @@ self: {
          base containers happstack-data happstack-util mtl syb
          syb-with-class template-haskell
        ];
-       homepage = "http://happstack.com";
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96919,7 +93290,6 @@ self: {
          base base64-bytestring bytestring cereal digest happstack-server
          jmacro text utf8-string wl-pprint-text
        ];
-       homepage = "http://www.happstack.com/";
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -96933,7 +93303,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring happstack-server mtl text
        ];
-       homepage = "http://www.happstack.com/";
        description = "Happstack minus the useless stuff";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96966,7 +93335,6 @@ self: {
        libraryHaskellDepends = [
          base happstack-server mtl plugins-auto template-haskell th-lift
        ];
-       homepage = "http://happstack.com";
        description = "The haskell application server stack + reload";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -96996,7 +93364,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers HUnit parsec zlib
        ];
-       homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97015,7 +93382,6 @@ self: {
          HsOpenSSL network sendfile time unix
        ];
        librarySystemDepends = [ openssl ];
-       homepage = "http://www.happstack.com/";
        description = "extend happstack-server with https:// support (TLS/SSL)";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
@@ -97054,7 +93420,6 @@ self: {
          filepath happstack-data happstack-util hslogger mtl old-time random
          stm syb template-haskell unix
        ];
-       homepage = "http://happstack.com";
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97071,7 +93436,6 @@ self: {
        libraryHaskellDepends = [
          base containers happstack-server list-tries transformers
        ];
-       homepage = "https://github.com/scrive/happstack-static-routing";
        description = "Support for static URL routing with overlap detection for Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97094,7 +93458,6 @@ self: {
          hslogger mtl network old-locale old-time parsec process random
          template-haskell time unix unix-compat
        ];
-       homepage = "http://happstack.com";
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97117,7 +93480,6 @@ self: {
          template-haskell text web-routes web-routes-boomerang
          web-routes-happstack web-routes-th
        ];
-       homepage = "http://hub.darcs.net/dag/yui/browse/happstack-yui";
        description = "Utilities for using YUI3 with Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97138,7 +93500,6 @@ self: {
        setupHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ array base containers mtl ];
        testHaskellDepends = [ base process ];
-       homepage = "http://www.haskell.org/happy/";
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97159,7 +93520,6 @@ self: {
        setupHaskellDepends = [ base Cabal directory filepath ];
        executableHaskellDepends = [ array base containers mtl ];
        testHaskellDepends = [ base process ];
-       homepage = "https://www.haskell.org/happy/";
        description = "Happy is a parser generator for Haskell";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -97194,7 +93554,6 @@ self: {
          aeson base filepath http-types lifted-base monad-control mtl text
          time transformers transformers-base
        ];
-       homepage = "https://github.com/cstrahan/happybara";
        description = "Acceptance test framework for web applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97215,7 +93574,6 @@ self: {
          filepath happybara http-types lifted-base monad-control mtl network
          process text time transformers transformers-base vector word8
        ];
-       homepage = "https://github.com/cstrahan/happybara/happybara-webkit";
        description = "WebKit Happybara driver";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97228,7 +93586,6 @@ self: {
        version = "0.0.1";
        sha256 = "0vh9ig9mvg12qgysk7gbqwiib3m2ciwi10asb1i0x25xjp585shi";
        libraryHaskellDepends = [ base directory filepath process ];
-       homepage = "https://github.com/cstrahan/happybara/happybara-webkit-server";
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97248,7 +93605,6 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
        ];
-       homepage = "http://github.com/ibabushkin/hapstone";
        description = "Capstone bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97265,7 +93621,6 @@ self: {
        libraryHaskellDepends = [
          base containers parsec split tagsoup text transformers
        ];
-       homepage = "https://github.com/crufter/haquery";
        description = "jQuery for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97288,7 +93643,6 @@ self: {
          base bv data-binary-ieee754 data-default hTensor MonadRandom
          QuickCheck random template-haskell vector
        ];
-       homepage = "https://bitbucket.org/functionally/haquil";
        description = "A Haskell implementation of the Quil instruction set for quantum computing";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97304,7 +93658,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring directory filepath text
        ];
-       homepage = "https://github.com/freizl/har";
        description = "HAR spec in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97323,7 +93676,6 @@ self: {
          base binary network parsec unix zlib
        ];
        executableSystemDepends = [ openssl sqlite ];
-       homepage = "http://www.davidb.org/darcs/harchive/";
        description = "Networked content addressed backup and restore software";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97342,7 +93694,6 @@ self: {
          array base bytestring constraints containers deepseq language-vhdl
          mtl operational-alacarte pretty syntactic
        ];
-       homepage = "https://github.com/markus-git/hardware-edsl";
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97362,7 +93713,6 @@ self: {
          base bytestring directory filepath haskell98 mtl old-locale
          old-time regex-pcre
        ];
-       homepage = "http://code.google.com/p/hark/";
        description = "A Gentoo package query tool";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97437,7 +93787,6 @@ self: {
        version = "0.4.3.1";
        sha256 = "0g4ig5s5rawlbq7zj1hkydnkw2s1gn7x0sdimd6j6kr5bynrdnhk";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/seereason/harp";
        description = "HaRP allows pattern-matching with regular expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97454,7 +93803,6 @@ self: {
          array base containers disassembler mtl parsec pretty
          template-haskell
        ];
-       homepage = "https://github.com/mgrabmueller/harpy";
        description = "Runtime code generation for x86 machine code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97475,7 +93823,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring file-embed hspec time
        ];
-       homepage = "https://github.com/stackbuilders/harvest-api";
        description = "Bindings for Harvest API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97490,7 +93837,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck ];
-       homepage = "http://github.com/nonowarn/has";
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97503,7 +93849,6 @@ self: {
        version = "0.1";
        sha256 = "0yyrfd8mgxwyfgwcg61q7yj2cq2zj6zlk1l340y4vzj71r53qgc4";
        libraryHaskellDepends = [ base has template-haskell ];
-       homepage = "http://github.com/chrisdone/has-th";
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97524,7 +93869,6 @@ self: {
          base binary bytestring connection containers data-binary-ieee754
          data-default hex network text transformers
        ];
-       homepage = "https://github.com/zmactep/hasbolt#readme";
        description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97535,13 +93879,12 @@ self: {
      }:
      mkDerivation {
        pname = "hasbolt-extras";
-       version = "0.0.0.9";
-       sha256 = "08crjy05k2jryfl3cqz4xdmmrj546pyjd4474di67rya8bn3zjwl";
+       version = "0.0.0.10";
+       sha256 = "1h1cz15x531y0h7ss79jbhziypjwwjl70w5hrpcljdfy1kkcgd2m";
        libraryHaskellDepends = [
          base containers free hasbolt lens mtl neat-interpolation
          template-haskell text th-lift-instances
        ];
-       homepage = "https://github.com/biocad/hasbolt-extras#readme";
        description = "Extras for hasbolt library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97556,7 +93899,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base data-default split ];
        executableHaskellDepends = [ base data-default split ];
-       homepage = "https://github.com/mekeor/hascal";
        description = "tiny calculator library and command-line program";
        license = "GPL";
      }) {};
@@ -97584,7 +93926,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit cryptohash hex path
        ];
-       homepage = "https://github.com/VirtualForgeGmbH/hascar";
        description = "Decompress SAPCAR archives";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -97606,7 +93947,6 @@ self: {
          base binary bytestring containers data-binary-ieee754 hspec mtl
          network safe-exceptions stm template-haskell uuid
        ];
-       homepage = "https://github.com/eklavya/hascas#readme";
        description = "Cassandra driver for haskell";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97702,7 +94042,6 @@ self: {
          lens transformers
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/analytics/hash/";
        description = "Hashing tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97748,7 +94087,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion ghc-prim integer-gmp siphash text
        ];
-       homepage = "http://github.com/tibbe/hashable";
        description = "A class for types that can be converted to a hash value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97768,7 +94106,6 @@ self: {
          transformers-compat
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/analytics/hashable-extras/";
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97788,7 +94125,6 @@ self: {
          test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion ghc-prim hashable ];
-       homepage = "https://github.com/wowus/hashable-generics";
        description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97801,7 +94137,6 @@ self: {
        version = "0";
        sha256 = "0mpvfhf07swhj7vb9mrrrbq4a4il0i49nlzh2157kf66a891ih47";
        libraryHaskellDepends = [ base hashable sorted-list time ];
-       homepage = "https://oss.xkcd.com/";
        description = "Provides instances missing from Hashable";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97833,7 +94168,6 @@ self: {
          array base bytestring ghc-prim integer-gmp primitive
          template-haskell text
        ];
-       homepage = "https://github.com/jberryman/hashabler";
        description = "Principled, portable & extensible hashing of data and types, including an implementation of the FNV-1a and SipHash algorithms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97879,7 +94213,6 @@ self: {
        sha256 = "1kzkyni9hfwpvyq9rdv62iziwiax5avzd05ghsh7dgnylv41z697";
        libraryHaskellDepends = [ base bytestring containers split ];
        testHaskellDepends = [ base bytestring containers split ];
-       homepage = "http://hashids.org/";
        description = "Hashids generates short, unique, non-sequential ids from numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -97903,7 +94236,6 @@ self: {
        testHaskellDepends = [
          array base bytestring cryptonite mtl QuickCheck template-haskell
        ];
-       homepage = "https://github.com/wangbj/hashing";
        description = "A pure haskell library implements several hash algorithms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -97915,7 +94247,6 @@ self: {
        version = "1.3.3";
        sha256 = "0ma7svf9nanlfbj9nkk6bzk4m98i7xd71xrdc3a5dmmws5yba1nw";
        libraryHaskellDepends = [ base containers deepseq hashable ];
-       homepage = "https://github.com/foxik/hashmap";
        description = "Persistent containers Map and Set based on hashing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97932,7 +94263,6 @@ self: {
        executableHaskellDepends = [
          base bytestring cryptohash directory filepath
        ];
-       homepage = "https://gist.github.com/rnhmjoj/20ea1b366d45b1c4c0e8";
        description = "Rename every file in a directory with his SHA1 hash";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -97949,7 +94279,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mkscrg/hashring";
        description = "Efficient consistent hashing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -97969,7 +94298,6 @@ self: {
          base containers criterion hashtables QuickCheck
          unordered-containers
        ];
-       homepage = "https://github.com/hongchangwu/hashtable-benchmark#readme";
        description = "Benchmark of hash table implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -97983,11 +94311,24 @@ self: {
        libraryHaskellDepends = [
          base ghc-prim hashable primitive vector
        ];
-       homepage = "http://github.com/gregorycollins/hashtables";
        description = "Mutable hash tables in the ST monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hashtables_1_2_3_1" = callPackage
+    ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
+     mkDerivation {
+       pname = "hashtables";
+       version = "1.2.3.1";
+       sha256 = "1giw9caajr07slf09j7zry9b0kvm4yj9q78zy1mawzi6gk3wglcg";
+       libraryHaskellDepends = [
+         base ghc-prim hashable primitive vector
+       ];
+       description = "Mutable hash tables in the ST monad";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hashtables-plus" = callPackage
     ({ mkDerivation, base, criterion-plus, deepseq, hashable
      , hashtables, lens, loch-th, mtl, mwc-random, placeholders
@@ -98005,7 +94346,6 @@ self: {
          mwc-random placeholders string-conversions text th-printf
          transformers
        ];
-       homepage = "https://github.com/nikita-volkov/hashtables-plus";
        description = "Extensions for a \"hashtables\" library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98018,7 +94358,6 @@ self: {
        version = "0.1.2";
        sha256 = "03wn142r0sh7adfghjqwb2mgq4rgkqs8nq2rx2jq717dr2xp987n";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "http://huygens.functor.nl/hasim/";
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98037,7 +94376,6 @@ self: {
        libraryHaskellDepends = [
          base constraints ghc-prim reflection tagged transformers void
        ];
-       homepage = "http://github.com/ekmett/hask";
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98057,7 +94395,6 @@ self: {
          base Cabal directory hmarkup hsemail network parsec process
          regex-compat xhtml
        ];
-       homepage = "http://gregheartsfield.com/hask-home";
        description = "Generate homepages for cabal packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98076,7 +94413,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers errors haskell-src text text-format
        ];
-       homepage = "http://github.com/singpolyma/haskades";
        description = "Utility to generate bindings for BlackBerry Cascades";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98102,7 +94438,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers either-unwrap hspec regex-posix
        ];
-       homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) rdkafka;};
@@ -98122,7 +94457,6 @@ self: {
          base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer
          SDL-ttf transformers vector Yampa
        ];
-       homepage = "http://github.com/ivanperez-keera/haskanoid";
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
      }) {};
@@ -98161,7 +94495,6 @@ self: {
          aeson base bytestring connection containers hspec http-conduit
          http-types monads-tf stm text wai warp
        ];
-       homepage = "https://github.com/jonplussed/haskbot-core";
        description = "Easily-extensible chatbot for Slack messaging service";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98187,7 +94520,6 @@ self: {
          optparse-applicative regex-tdfa regex-tdfa-text resourcet text time
          transformers unix-compat
        ];
-       homepage = "https://github.com/maurotrb/haskdeep";
        description = "Computes and audits file hashes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98207,7 +94539,6 @@ self: {
          base bytestring containers directory filepath hasktags
          optparse-applicative process text
        ];
-       homepage = "http://github.com/grwlf/haskdogs";
        description = "Generate tags file for Haskell project and its nearest deps";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98227,7 +94558,6 @@ self: {
          base containers directory haskeline haskell98 mtl network old-time
          parsec process random unix
        ];
-       homepage = "http://www.korgwal.com/haskeem/";
        description = "A small scheme interpreter";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98246,7 +94576,6 @@ self: {
          base bytestring containers directory filepath process stm terminfo
          transformers unix
        ];
-       homepage = "https://github.com/judah/haskeline";
        description = "A command-line interface for user input, written in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98259,7 +94588,6 @@ self: {
        version = "0.6.2";
        sha256 = "0xgdq2xgw2ccyfzkj5n36s5n6km5l947d2iy4y1qms8kbc05zmfl";
        libraryHaskellDepends = [ base haskeline mtl ];
-       homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";
        description = "Class interface for working with Haskeline";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98272,7 +94600,6 @@ self: {
        version = "0.4.0.0";
        sha256 = "0bbjbrhxdms8wbv1dh129l2pkqw5rfva26121ayfx5vr8h7aa7zf";
        libraryHaskellDepends = [ ansi-terminal base haskeline mtl safe ];
-       homepage = "https://github.com/githubuser/haskeline-repl#readme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -98285,7 +94612,6 @@ self: {
        revision = "1";
        editedCabalFile = "0h900mw5kzd9fvywpbhfd9acnfwp3qk7nfi9yr9ibamjb8s87cm1";
        libraryHaskellDepends = [ base containers mtl protolude text ];
-       homepage = "http://github.com/githubuser/haskelisp#readme";
        description = "Write Emacs module in Haskell, using Emacs 25's Dynamic Module feature";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98312,7 +94638,6 @@ self: {
        executableHaskellDepends = [
          base binary bytestring foundation lens text
        ];
-       homepage = "https://github.com/cwgoes/haskell-abci#readme";
        description = "Haskell Application BlockChain Interface (ABCI) Server Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98336,7 +94661,6 @@ self: {
          system-filepath text time transformers transformers-base vector
          xml2json
        ];
-       homepage = "https://github.com/yihuang/haskell-aliyun/";
        description = "haskell client of aliyun service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98381,7 +94705,6 @@ self: {
        sha256 = "0nlalip5xs1bizj97yjw3np5cdmz8igppcflm19vvqxrl2akyz22";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring QuickCheck random ];
-       homepage = "http://www.github.com/zbskii/haskell-bcrypt";
        description = "A bcrypt implementation for haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -98422,7 +94745,6 @@ self: {
          HUnit MissingH mtl random time unix
        ];
        executableHaskellDepends = [ base directory process ];
-       homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98455,7 +94777,6 @@ self: {
        executableHaskellDepends = [
          base bimap boolean-list bytestring containers
        ];
-       homepage = "http://xy30.com";
        description = "compress files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98472,7 +94793,6 @@ self: {
        libraryHaskellDepends = [
          base containers lens pretty-show protolude split text
        ];
-       homepage = "https://github.com/mgajda/haskell-conll#readme";
        description = "Core Types for NLP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98507,7 +94827,6 @@ self: {
          ghc-boot ghc-paths ghci haskeline process text time transformers
          unix
        ];
-       homepage = "https://github.com/phoityne/haskell-dap";
        description = "haskell-dap is a GHCi having DAP interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98525,7 +94844,6 @@ self: {
          base bytestring hedis string-conversions transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/ArekCzarnik/haskell-disque#readme";
        description = "Client library for the Disque datastore";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98549,7 +94867,6 @@ self: {
        ];
        executableHaskellDepends = [ base ghc text ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/ivan-m/haskell-docs";
        description = "A program to find and display the docs and type of a name";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98563,7 +94880,6 @@ self: {
        sha256 = "16sxdyfvxb9xvfd3jl2x1kdlf758wpj2350jlrl16m94w8l2r98b";
        libraryHaskellDepends = [ base eigen vector ];
        testHaskellDepends = [ base eigen vector ];
-       homepage = "https://github.com/dilawar/haskell-eigen-util#README.md";
        description = "Some utility functions for haskell-eigen library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98576,7 +94892,6 @@ self: {
        sha256 = "0p4p5ygw068chw6grci8mny2a1bn6nz74jm1q2sj97v7gglglg55";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/emilaxelsson/haskell-exp-parser";
        description = "Simple parser parser from Haskell to TemplateHaskell expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98617,7 +94932,6 @@ self: {
          base containers directory-tree doctest filemanip filepath hlint
          tasty tasty-hunit
        ];
-       homepage = "https://github.com/evolutics/haskell-formatter";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98645,7 +94959,6 @@ self: {
          lifted-base monad-control network network-conduit process-conduit
          system-filepath text transformers transformers-base unix
        ];
-       homepage = "https://github.com/yihuang/haskell-ftp";
        description = "A Haskell ftp server with configurable backend";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98663,7 +94976,6 @@ self: {
          base containers haskell-src-exts template-haskell transformers
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/bennofs/haskell-generate/";
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98713,7 +95025,6 @@ self: {
          base containers directory filepath haskell-gi-base pretty-show text
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98728,7 +95039,6 @@ self: {
        sha256 = "0p992mpyy9z699zpvp8i8b5v8a3jhiq6c4n29zlf7qbcxc8z4z36";
        libraryHaskellDepends = [ base bytestring containers text ];
        libraryPkgconfigDepends = [ glib ];
-       homepage = "https://github.com/haskell-gi/haskell-gi-base";
        description = "Foundation for libraries generated by haskell-gi";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
@@ -98740,7 +95050,6 @@ self: {
        version = "0.0";
        sha256 = "1smz5fr5saw1l129h21qcywyp47mrbf7355kmwkspjh75yl2gix5";
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Overloading support for haskell-gi";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98752,7 +95061,6 @@ self: {
        version = "1.0";
        sha256 = "0ak8f79ia9zlk94zr02sq8bqi5n5pd8ria8w1dj3adcdvpw9gmry";
        doHaddock = false;
-       homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Overloading support for haskell-gi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98767,7 +95075,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers gloss ];
-       homepage = "https://github.com/prateekkumarweb/haskell-go-checkers";
        description = "Go and Checkers game in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98787,7 +95094,6 @@ self: {
          base bytestring haskell-fake-user-agent lens regex-base regex-posix
          tagsoup text wreq
        ];
-       homepage = "https://github.com/grzegorzgoldapl/haskell-google-trends";
        description = "Simple library for accessing Google Trends";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -98799,26 +95105,23 @@ self: {
        version = "1.0.0.0";
        sha256 = "13xyxck9f15mwi641zs9zw77cnrgh30p2771f66haby96k8wx9jf";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/8084/haskell-holes-th";
        description = "Infer haskell code by given type";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-igraph" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-lexing, c2hs, cereal
-     , colour, conduit, data-ordlist, hashable, hxt, igraph, matrices
-     , primitive, random, singletons, split, tasty, tasty-golden
-     , tasty-hunit, unordered-containers
+    ({ mkDerivation, base, bytestring, c2hs, cereal, colour, conduit
+     , containers, data-ordlist, hxt, igraph, matrices, primitive
+     , random, singletons, split, tasty, tasty-golden, tasty-hunit
      }:
      mkDerivation {
        pname = "haskell-igraph";
-       version = "0.6.0";
-       sha256 = "15mq27zxgnnd0z0xcv8ncg7spw3hwmr7w65cr4y1wqixgxjzqsm0";
+       version = "0.7.0";
+       sha256 = "139qicfqg2m6jl3r7lbs2wcp1bvra3rp0vgb7ghafj2k70i0vddv";
        libraryHaskellDepends = [
-         base bytestring bytestring-lexing cereal colour conduit
-         data-ordlist hashable hxt primitive singletons split
-         unordered-containers
+         base bytestring cereal colour conduit containers data-ordlist hxt
+         primitive singletons split
        ];
        librarySystemDepends = [ igraph ];
        libraryToolDepends = [ c2hs ];
@@ -98845,7 +95148,6 @@ self: {
          base classy-prelude ghc graphviz process text transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ncaq/haskell-import-graph#readme";
        description = "create haskell import graph for graphviz";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -98859,7 +95161,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HGL random ];
-       homepage = "http://www.informatik.uni-bremen.de/~cxl/lehre/pi3.ws01/asteroids/";
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -98879,7 +95180,6 @@ self: {
          lens network-uri QuickCheck quickcheck-instances scientific servant
          servant-client split text unordered-containers vector wai
        ];
-       homepage = "https://github.com/soundcloud/haskell-kubernetes";
        description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98922,7 +95222,6 @@ self: {
          aeson base containers directory hashable hspec lens sorted-list
          text yi-rope
        ];
-       homepage = "https://github.com/alanz/haskell-lsp";
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -98953,7 +95252,6 @@ self: {
          aeson base containers directory filepath hashable hspec lens
          network-uri sorted-list text yi-rope
        ];
-       homepage = "https://github.com/alanz/haskell-lsp";
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -98975,7 +95273,6 @@ self: {
        executableHaskellDepends = [
          base directory haskell-lsp lens process text unix
        ];
-       homepage = "https://github.com/noughtmare/haskell-lsp-client#readme";
        description = "A haskell package to build your own Language Server client";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -98992,7 +95289,6 @@ self: {
          aeson base bytestring data-default filepath hashable lens
          network-uri text unordered-containers
        ];
-       homepage = "https://github.com/alanz/haskell-lsp";
        description = "Haskell library for the Microsoft Language Server Protocol, data types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -99004,7 +95300,6 @@ self: {
        version = "0.2.1";
        sha256 = "18s8g82v3h4b7maz6di43vfym6d3w16j4rbh5sjh4ps26yjnnfy4";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/jlamothe/haskell-menu";
        description = "A simple menu system for Haskell programs";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -99036,7 +95331,6 @@ self: {
        sha256 = "08bcw7g84509rak9xqn2g4pr1mk3a2clikgfdiafrsr7lff16gyf";
        libraryHaskellDepends = [ array base bytestring cereal ];
        testHaskellDepends = [ array base bytestring cereal hspec ];
-       homepage = "http://www.github.com/jhickner/haskell-modbus";
        description = "A cereal-based parser for the Modbus protocol";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99048,7 +95342,6 @@ self: {
        version = "0.1";
        sha256 = "1bbj26sgd1szb5309rrbiibsb4zai80lmadmkzb7jd2kzyyxvlcv";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
-       homepage = "http://github.com/comius/haskell-mpfr";
        description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99069,7 +95362,6 @@ self: {
        ];
        librarySystemDepends = [ open-pal open-rte openmpi ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/bjpop/haskell-mpi";
        description = "Distributed parallel programming in Haskell using MPI";
        license = stdenv.lib.licenses.bsd3;
      }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;};
@@ -99093,7 +95385,6 @@ self: {
          base containers filemanip filepath haskell-src-exts mtl pretty-show
          tasty tasty-golden traverse-with-class
        ];
-       homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99126,7 +95417,6 @@ self: {
          text transformers transformers-base transformers-compat
          unordered-containers vector
        ];
-       homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99142,7 +95432,6 @@ self: {
          base bytestring cereal network network-info
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/brooksbp/haskell-openflow";
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99162,7 +95451,6 @@ self: {
          haskell-src-exts hse-cpp mtl optparse-applicative tagged
          transformers transformers-compat
        ];
-       homepage = "http://documentup.com/haskell-suite/haskell-packages";
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99183,7 +95471,6 @@ self: {
          base bytestring cairo containers directory filepath glib gtk
          old-locale poppler template-haskell time zlib
        ];
-       homepage = "http://michaeldadams.org/projects/haskell-pdf-presenter/";
        description = "Tool for presenting PDF-based presentations";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99213,7 +95500,6 @@ self: {
          zlib
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://code.haskell.org/~dons/code/haskell-platform-test";
        description = "A test system for the Haskell Platform environment";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99236,7 +95522,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/potomak/haskell-player";
        description = "A terminal music player based on afplay";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99254,7 +95539,6 @@ self: {
          base Chart Chart-cairo Chart-gtk colour data-default lens
          math-functions vector
        ];
-       homepage = "https://github.com/kaizhang/haskell-plot";
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99274,7 +95558,6 @@ self: {
          base base64-string bytestring lens random regex-base regex-posix
          text wreq
        ];
-       homepage = "https://github.com/grzegorzgoldapl/haskell-proxy-list";
        description = "Simple library for retrieving proxy servers info from https://proxy-list.org";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -99287,7 +95570,6 @@ self: {
        sha256 = "1cq6fpz4vsx1kfnxnxnqz0pi5nzfg86s76vd0hcqvyqxnqbcd8hj";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ qrencode ];
-       homepage = "https://github.com/jamessanders/haskell-qrencode";
        description = "Haskell bindings for libqrencode";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) qrencode;};
@@ -99300,7 +95582,6 @@ self: {
        sha256 = "08sx6hxqssx9qm2yd9pmpr9vsqck3wlm6kzp13p63dpkyxln8kga";
        libraryHaskellDepends = [ base directory process ];
        testHaskellDepends = [ base directory hspec process ];
-       homepage = "https://github.com/yamadapc/haskell-read-editor";
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99335,6 +95616,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-snake" = callPackage
+    ({ mkDerivation, base, containers, lens, linear, mtl, random, sdl2
+     , sdl2-ttf, text, vector
+     }:
+     mkDerivation {
+       pname = "haskell-snake";
+       version = "1.0.0";
+       sha256 = "0qm7m4whki060vwlgns5apsl7cw8i8grmnywjwhv9i01dkg952qw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers lens linear mtl random sdl2 sdl2-ttf text vector
+       ];
+       executableHaskellDepends = [
+         base containers lens linear mtl random sdl2 sdl2-ttf text vector
+       ];
+       description = "Snake game implemetation in Haskell using SDL2";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "haskell-spacegoo" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra
      , mtl, pretty, pretty-show, text, vector, vector-space
@@ -99379,7 +95680,6 @@ self: {
          tasty-golden tasty-smallcheck
        ];
        doCheck = false;
-       homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99401,7 +95701,6 @@ self: {
          tasty-golden tasty-smallcheck
        ];
        doCheck = false;
-       homepage = "https://github.com/haskell-suite/haskell-src-exts";
        description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99415,7 +95714,6 @@ self: {
        revision = "1";
        editedCabalFile = "1n4f4yylk09g95040g6pbcygzp95yadihv0sxr4sj87j0d4xa6fc";
        libraryHaskellDepends = [ base haskell-src-exts Hoed ];
-       homepage = "https://github.com/pepeiborra/haskell-src-exts-observe";
        description = "Observable orphan instances for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99430,7 +95728,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-exts lens template-haskell
        ];
-       homepage = "https://github.com/DanielWaterworth/haskell-src-exts-prisms";
        description = "Prisms with newtype wrappers for haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99462,7 +95759,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskell-src-exts ];
-       homepage = "https://github.com/achirkin/haskell-src-exts-sc#readme";
        description = "Pretty print haskell code with comments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99474,7 +95770,6 @@ self: {
        version = "1.20.0.0";
        sha256 = "0p79ppmwb14lj2a1wy42zgm3z3zk5jbyn7rfgwxsyw2g424bw1dk";
        libraryHaskellDepends = [ base haskell-src-exts ];
-       homepage = "https://github.com/int-e/haskell-src-exts-simple";
        description = "A simplified view on the haskell-src-exts AST";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -99491,7 +95786,6 @@ self: {
          base containers data-default haskell-src-exts semigroups
          transformers uniplate
        ];
-       homepage = "https://github.com/pepeiborra/haskell-src-exts-util";
        description = "Helper functions for working with haskell-src-exts trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99543,7 +95837,6 @@ self: {
        sha256 = "1xhf68b5a8x6fpjv5w3dc41jc1nv5mdipimxa2g3xhk72761b4r4";
        libraryHaskellDepends = [ base lens semigroups text time ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/mankyKitty/haskell-time-range#readme";
        description = "Some useful wrappers and functions for building time ranges";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99567,7 +95860,6 @@ self: {
          ghc-prim ghc-syb-utils haskell-src-exts hspec HUnit monoid-extras
          mtl pretty QuickCheck rosezipper semigroups syb uniplate
        ];
-       homepage = "https://github.com/alanz/haskell-token-utils";
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99585,7 +95877,6 @@ self: {
          base classyplate ghc mtl pretty references template-haskell
          uniplate
        ];
-       homepage = "https://github.com/nboldi/haskell-tools";
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99603,7 +95894,6 @@ self: {
          base bytestring containers ghc haskell-tools-ast mtl references
          safe split template-haskell uniplate
        ];
-       homepage = "https://github.com/nboldi/haskell-tools";
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99621,7 +95911,6 @@ self: {
          base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl
          references
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99638,7 +95927,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc haskell-tools-ast mtl references uniplate
        ];
-       homepage = "https://github.com/nboldi/haskell-tools";
        description = "Conversions on Haskell-Tools AST to prepare for refactorings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99657,7 +95945,6 @@ self: {
          base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl
          references safe split template-haskell transformers uniplate
        ];
-       homepage = "https://github.com/nboldi/haskell-tools";
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99689,7 +95976,6 @@ self: {
          haskell-tools-rewrite mtl references split tasty tasty-hunit
          template-haskell time transformers uniplate
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99726,7 +96012,6 @@ self: {
          haskell-tools-builtin-refactorings haskell-tools-daemon knob split
          time
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Command-line frontend for Haskell-tools Refact";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99761,7 +96046,6 @@ self: {
          haskell-tools-builtin-refactorings HUnit network process tasty
          tasty-hunit
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Background process for Haskell-tools that editors can connect to";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99787,7 +96071,6 @@ self: {
          split template-haskell uniplate
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Debugging Tools for Haskell-tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99819,7 +96102,6 @@ self: {
          aeson base bytestring directory filepath HUnit network tasty
          tasty-hunit websockets
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99851,7 +96133,6 @@ self: {
          haskell-tools-rewrite mtl references split tasty tasty-hunit
          template-haskell time transformers uniplate
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99869,7 +96150,6 @@ self: {
          base containers ghc haskell-tools-ast mtl references split text
          uniplate
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99899,7 +96179,6 @@ self: {
          polyparse references split tasty tasty-hunit template-haskell time
          transformers uniplate
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99922,7 +96201,6 @@ self: {
          base directory filepath haskell-tools-ast haskell-tools-prettyprint
          tasty tasty-hunit
        ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -99956,7 +96234,6 @@ self: {
          pretty-hex QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 time x509
        ];
-       homepage = "http://github.com/GaloisInc/haskell-tor";
        description = "A Haskell Tor Node";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99971,7 +96248,6 @@ self: {
        libraryHaskellDepends = [
          base containers haskell-src-exts pretty
        ];
-       homepage = "http://code.haskell.org/haskell-type-exts";
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -99996,7 +96272,6 @@ self: {
        version = "0.4";
        sha256 = "1pqh1v0klpi8iq882l5gk0fsf87kabq6rw1wjwkiq6fvw8cc1l97";
        libraryHaskellDepends = [ base binary bytestring network ];
-       homepage = "https://github.com/PeterScott/haskell-tyrant";
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100015,7 +96290,6 @@ self: {
        executableHaskellDepends = [
          base bytestring Cabal containers directory filepath process
        ];
-       homepage = "https://haskell.org/haskellwiki/Gentoo#haskell-updater";
        description = "Rebuild Haskell dependencies in Gentoo";
        license = "GPL";
      }) {};
@@ -100034,7 +96308,6 @@ self: {
          array base HaXml html mtl network polyparse pretty random
          regex-compat stm utf8-string
        ];
-       homepage = "http://patch-tag.com/r/adept/haskell-xmpp/home";
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100047,7 +96320,6 @@ self: {
        version = "1.1.2.0";
        sha256 = "1s0avb08b5iwaym42jz783mk1az9kmjf3zmhfag0kzdw10qcnz4m";
        libraryHaskellDepends = [ array base ghc-prim ];
-       homepage = "http://www.haskell.org/onlinereport/haskell2010/";
        description = "Compatibility with Haskell 2010";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100064,7 +96336,6 @@ self: {
        libraryHaskellDepends = [
          array base directory old-locale old-time process time
        ];
-       homepage = "http://www.haskell.org/definition/";
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100081,7 +96352,6 @@ self: {
        libraryHaskellDepends = [
          array base directory old-locale old-time process time
        ];
-       homepage = "http://www.haskell.org/definition/";
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100098,7 +96368,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory mtl old-locale old-time pretty time
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "A library of combinators for generating and executing SQL statements";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100111,7 +96380,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1l9ifff33xbgdr6fahnzz00nb7va2r0i3pncjd1j8bbnyya1w2kl";
        libraryHaskellDepends = [ base containers haskelldb HDBC ];
-       homepage = "http://twitter.com/khibino";
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100128,7 +96396,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-connect-hdbc HDBC MonadCatchIO-mtl mtl
        ];
-       homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100146,7 +96413,6 @@ self: {
          base haskelldb haskelldb-connect-hdbc HDBC
          MonadCatchIO-transformers transformers
        ];
-       homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100164,7 +96430,6 @@ self: {
          base haskelldb haskelldb-connect-hdbc HDBC
          MonadCatchIO-transformers transformers
        ];
-       homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100182,7 +96447,6 @@ self: {
          base haskelldb haskelldb-connect-hdbc HDBC lifted-base
          monad-control transformers-base
        ];
-       homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using lifted-base";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100198,7 +96462,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ];
        executableHaskellDepends = [ haskelldb ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the dynamically loaded drivers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100217,7 +96480,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory haskelldb mtl old-time
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "An experimental HaskellDB back-end in pure Haskell (no SQL)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100234,7 +96496,6 @@ self: {
        libraryHaskellDepends = [
          base containers convertible haskelldb HDBC mtl old-time
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for HDBC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100271,7 +96532,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-odbc mtl
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC ODBC driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100291,7 +96551,6 @@ self: {
          base haskelldb haskelldb-hdbc HDBC HDBC-postgresql mtl
        ];
        executableSystemDepends = [ postgresql ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100310,7 +96569,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-hdbc HDBC HDBC-sqlite3 mtl
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HDBC SQLite driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100323,7 +96581,6 @@ self: {
        version = "1.0.0";
        sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0";
        libraryHaskellDepends = [ base haskelldb hsql mtl old-time ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for HSQL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100342,7 +96599,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-mysql mtl
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL MySQL driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100361,7 +96617,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-odbc mtl
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL ODBC driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100380,7 +96635,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-oracle mtl
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL Oracle driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100400,7 +96654,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-postgresql mtl
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100419,7 +96672,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-sqlite mtl
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL SQLite driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100439,7 +96691,6 @@ self: {
        libraryHaskellDepends = [
          base haskelldb haskelldb-hsql hsql hsql-sqlite3 mtl
        ];
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL SQLite3 driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100452,7 +96703,6 @@ self: {
        version = "2.1.0";
        sha256 = "12whvz0qy9lqk1frfl5px9lhr1nwy519vj2z9c3g8nqjzscwzayb";
        libraryHaskellDepends = [ base haskelldb mtl template-haskell ];
-       homepage = "http://trac.haskell.org/haskelldb-th";
        description = "Template Haskell utilities for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100464,7 +96714,6 @@ self: {
        pname = "haskelldb-wx";
        version = "1.0.0";
        sha256 = "01652m0bym80400navqlpdv5n0gfgnfzd1d0857f3kd13ksqk2hy";
-       homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for WXHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100489,7 +96738,6 @@ self: {
          semigroups test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://www.github.com/happy0/haskellscrabble";
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100508,7 +96756,6 @@ self: {
        executableHaskellDepends = [
          base cryptohash directory either filepath mtl process text
        ];
-       homepage = "http://github.com/seanparsons/haskellscript/";
        description = "Command line tool for running Haskell scripts with a hashbang";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100542,7 +96789,6 @@ self: {
          template-haskell temporary text th-desugar unordered-containers
          vector
        ];
-       homepage = "http://github.com/JoeyEremondi/haskelm";
        description = "Elm to Haskell translation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100586,7 +96832,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text transformers
          vector
        ];
-       homepage = "https://github.com/haskell-haskey";
        description = "A transactional, ACID compliant, embeddable key-value store";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100611,7 +96856,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers vector
        ];
-       homepage = "https://github.com/haskell-haskey/haskey-btree";
        description = "B+-tree implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100632,7 +96876,6 @@ self: {
          base binary exceptions haskey haskey-btree lens mtl text
          transformers
        ];
-       homepage = "https://github.com/haskell-haskey";
        description = "A monad transformer supporting Haskey transactions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100645,7 +96888,6 @@ self: {
        version = "0.0.6";
        sha256 = "061dhk7d9d8mnb1rs7077q383sqlby8s31ips8jjadkkhyxi5lvz";
        libraryHaskellDepends = [ base containers haskell98 SDL SDL-ttf ];
-       homepage = "http://haskell.org/haskellwiki/HaskGame";
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100663,7 +96905,6 @@ self: {
          aeson base bytestring http-conduit http-types network old-locale
          text time unordered-containers
        ];
-       homepage = "https://github.com/Raynes/haskheap";
        description = "Haskell bindings to refheap";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100684,7 +96925,6 @@ self: {
          parsec pretty safecopy shelly template-haskell text text-show
          th-lift unordered-containers
        ];
-       homepage = "http://haskhol.org";
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100706,7 +96946,6 @@ self: {
          haskell-src-exts HaTeX hint parsec process text transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://daniel-diaz.github.io/projects/haskintex";
        description = "Haskell Evaluation inside of LaTeX code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -100747,7 +96986,6 @@ self: {
          deepseq either HUnit json-rpc mtl pbkdf QuickCheck split
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
-       homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the Bitcoin protocol";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100778,7 +97016,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          unordered-containers vector
        ];
-       homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the core Bitcoin protocol features";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100802,7 +97039,6 @@ self: {
          HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/plaprade/haskoin-crypto";
        description = "Implementation of Bitcoin cryptographic primitives";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100836,7 +97072,6 @@ self: {
          persistent-sqlite QuickCheck resourcet test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of a Bitoin node";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100858,7 +97093,6 @@ self: {
          base binary bytestring haskoin-crypto haskoin-util HUnit QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/plaprade/haskoin-protocol";
        description = "Implementation of the Bitcoin network protocol messages";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100882,7 +97116,6 @@ self: {
          HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/plaprade/haskoin-script";
        description = "Implementation of Bitcoin script parsing and evaluation";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100904,7 +97137,6 @@ self: {
          base binary bytestring containers either HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/plaprade/haskoin-util";
        description = "Utility functions for the Network.Haskoin project";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100948,7 +97180,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          unordered-containers
        ];
-       homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101026,7 +97257,6 @@ self: {
          base bytestring data-accessor event-list HUnit midi non-negative
          process QuickCheck random transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Haskore";
        description = "The Haskore Computer Music System";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101045,7 +97275,6 @@ self: {
          base bytestring data-accessor directory event-list haskore midi
          non-negative old-time process transformers unix utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Haskore/";
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101068,7 +97297,6 @@ self: {
          haskore-realtime hosc hsc3 non-negative opensoundcontrol-ht process
          random supercollider-ht transformers unix utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101089,7 +97317,6 @@ self: {
          base data-accessor event-list haskore non-negative numeric-prelude
          random synthesizer-core synthesizer-filter utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Music rendering coded in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101102,7 +97329,6 @@ self: {
        version = "0.3";
        sha256 = "1aq8lwyj4whz4llkwgx7n44rnrhk6ykyi8cpb0cjsabk3h29mm0b";
        libraryHaskellDepends = [ base ];
-       homepage = "http://haskell.org/haskore/";
        description = "The February 2000 version of Haskore";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101126,7 +97352,6 @@ self: {
          base bytestring directory filepath HUnit json microlens-platform
          utf8-string
        ];
-       homepage = "http://github.com/MarcWeber/hasktags";
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101147,7 +97372,6 @@ self: {
          base bytestring haskus-utils QuickCheck tasty tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://www.haskus.org/system";
        description = "Haskus binary format manipulation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101168,7 +97392,6 @@ self: {
          base directory filepath hashable haskus-utils optparse-applicative
          optparse-simple process simple-download temporary text yaml
        ];
-       homepage = "http://www.haskus.org/system";
        description = "Haskus system build tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101188,7 +97411,6 @@ self: {
          template-haskell transformers vector
        ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       homepage = "http://www.haskus.org/system";
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101221,7 +97443,6 @@ self: {
          markdown mtl network parsec persistent persistent-sqlite
          persistent-template split tagsoup text time utf8-string
        ];
-       homepage = "https://github.com/okue/haskyapi#readme";
        description = "HTTP server";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -101284,7 +97505,6 @@ self: {
          QuickCheck quickcheck-instances text
        ];
        benchmarkHaskellDepends = [ base criterion directory text ];
-       homepage = "https://github.com/contivero/hasmin#readme";
        description = "CSS Minifier";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101297,7 +97517,6 @@ self: {
        version = "0.1";
        sha256 = "1ln0kdm40y6l8sncrjl0mj9bpd30ffg3msaxyd6fq520ypyws9pm";
        libraryHaskellDepends = [ base HTTP monads-fd network xml ];
-       homepage = "https://github.com/lhpaladin/HaSparql-Client";
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101311,7 +97530,6 @@ self: {
        sha256 = "08ihdjgjvr8mgxxw62xwymj1lyl33r6w3mhy9chlw7ijcsy44y21";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ aspell ];
-       homepage = "https://github.com/otters/haspell";
        description = "Haskell bindings to aspell";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) aspell;};
@@ -101340,13 +97558,12 @@ self: {
          rerebase tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/hasql";
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql_1_3" = callPackage
+  "hasql_1_3_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, bug, bytestring
      , bytestring-strict-builder, contravariant, contravariant-extras
      , criterion, data-default-class, dlist, hashable, hashtables
@@ -101357,8 +97574,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "1.3";
-       sha256 = "1xqw967jzn8jsyzhfnfyvqgaqr0sb9qppv3knxxvsji15hj5zrid";
+       version = "1.3.0.1";
+       sha256 = "07v79w80k0xrvr4whlcx205a9fpdvlbqdzhq911r7sh3df10kg8f";
        libraryHaskellDepends = [
          attoparsec base base-prelude bytestring bytestring-strict-builder
          contravariant contravariant-extras data-default-class dlist
@@ -101371,7 +97588,6 @@ self: {
          rerebase tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ bug criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/hasql";
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101389,7 +97605,6 @@ self: {
          base base-prelude bytestring either free list-t text transformers
          vector
        ];
-       homepage = "https://github.com/nikita-volkov/hasql-backend";
        description = "API for backends of \"hasql\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101413,7 +97628,6 @@ self: {
          hspec process QuickCheck quickcheck-instances string-qq text time
          vector
        ];
-       homepage = "http://github.com/turingjump/hasql-class#readme";
        description = "Encodable and Decodable classes for hasql";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101437,7 +97651,6 @@ self: {
          foldl hasql QuickCheck quickcheck-instances rebase tasty
          tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "https://github.com/nikita-volkov/hasql-cursor-query";
        description = "A declarative abstraction over PostgreSQL Cursor";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101456,7 +97669,6 @@ self: {
          base base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras hasql hasql-transaction transformers
        ];
-       homepage = "https://github.com/nikita-volkov/hasql-cursor-transaction";
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101476,7 +97688,6 @@ self: {
          generics-sop hasql postgresql-binary scientific text time uuid
          vector
        ];
-       homepage = "https://github.com/chris-kahn/hasql-generic#readme";
        description = "Generic encoder and decoder deriving for Hasql";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101500,7 +97711,6 @@ self: {
        testHaskellDepends = [
          base bytestring hasql hasql-transaction hspec transformers
        ];
-       homepage = "https://github.com/tvh/hasql-migration";
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101517,7 +97727,22 @@ self: {
        libraryHaskellDepends = [
          base-prelude hasql hasql-pool optparse-applicative
        ];
-       homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
+       description = "\"optparse-applicative\" parsers for \"hasql\"";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hasql-optparse-applicative_0_3_0_3" = callPackage
+    ({ mkDerivation, base-prelude, hasql, hasql-pool
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "hasql-optparse-applicative";
+       version = "0.3.0.3";
+       sha256 = "0d33y3bzy3q5yj4vizi9i2xwwnw1lzyxq72jk2daqjs347dc7d33";
+       libraryHaskellDepends = [
+         base-prelude hasql hasql-pool optparse-applicative
+       ];
        description = "\"optparse-applicative\" parsers for \"hasql\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101530,7 +97755,18 @@ self: {
        version = "0.4.3";
        sha256 = "08fzh0y1cxaslp8ia26p9jhs3dckjfdvmiqw1lasdabb7ij82i0j";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
-       homepage = "https://github.com/nikita-volkov/hasql-pool";
+       description = "A pool of connections for Hasql";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hasql-pool_0_5" = callPackage
+    ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
+     mkDerivation {
+       pname = "hasql-pool";
+       version = "0.5";
+       sha256 = "0bsxh9yf5p2iknrnssrif563n42ih14cj95qmy9z2lz2kbycscrs";
+       libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101567,7 +97803,6 @@ self: {
          HDBC-postgresql list-t monad-control mtl-prelude postgresql-simple
          QuickCheck quickcheck-instances scientific text time vector
        ];
-       homepage = "https://github.com/nikita-volkov/hasql-postgres";
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101583,7 +97818,6 @@ self: {
        libraryHaskellDepends = [
          base-prelude hasql-postgres optparse-applicative
        ];
-       homepage = "https://github.com/nikita-volkov/hasql-postgres-options";
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101601,7 +97835,6 @@ self: {
          aeson base bytestring contravariant hasql text time
          unordered-containers vector
        ];
-       homepage = "https://github.com/agrafix/hasql-simple#readme";
        description = "A somewhat opinionated \"simpler\" API to hasql";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101617,7 +97850,6 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring template-haskell text
        ];
-       homepage = "https://github.com/nikita-volkov/hasql-th";
        description = "Template Haskell utilities for Hasql";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -101636,7 +97868,6 @@ self: {
          contravariant-extras hasql mtl transformers
        ];
        testHaskellDepends = [ async hasql rebase ];
-       homepage = "https://github.com/nikita-volkov/hasql-transaction";
        description = "A composable abstraction over the retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101656,7 +97887,6 @@ self: {
          contravariant-extras hasql mtl transformers
        ];
        testHaskellDepends = [ async hasql rebase ];
-       homepage = "https://github.com/nikita-volkov/hasql-transaction";
        description = "A composable abstraction over the retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101686,7 +97916,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory HUnit mtl syb text
        ];
-       homepage = "http://github.com/lymar/hastache";
        description = "Haskell implementation of Mustache templates";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101703,7 +97932,6 @@ self: {
          aeson base bytestring containers hastache scientific text
          unordered-containers vector
        ];
-       homepage = "https://github.com/proger/hastache-aeson";
        description = "render hastache templates using aeson values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101737,7 +97965,6 @@ self: {
          haste-lib haste-prim http-types mtl text transformers utf8-string
          wai wai-websockets warp websockets
        ];
-       homepage = "http://haste-lang.org";
        description = "Framework for type-safe, distributed web applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101766,7 +97993,6 @@ self: {
          shellmate shellmate-extras system-fileio tar terminfo transformers
          unix utf8-string
        ];
-       homepage = "http://haste-lang.org/";
        description = "Haskell To ECMAScript compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101802,7 +98028,6 @@ self: {
          ghc-prim haste-prim integer-gmp monads-tf random time transformers
          utf8-string
        ];
-       homepage = "http://github.com/valderman/haste-compiler";
        description = "Base libraries for haste-compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101818,7 +98043,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory filepath haste-lib
        ];
-       homepage = "http://github.com/ajnsit/haste-markup";
        description = "A port of blaze-markup and blaze-html to Haste";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101831,7 +98055,6 @@ self: {
        version = "0.1.0.9";
        sha256 = "1a92ahmphsr0dgj1jlp2cxpq5yy59b3avw3gzmv0jzrds41p3ic8";
        libraryHaskellDepends = [ base haste-compiler transformers ];
-       homepage = "https://github.com/agocorona/haste-perch";
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101844,7 +98067,6 @@ self: {
        version = "0.6.0.0";
        sha256 = "1gmvvqy0xy396r3jnfmdhh70j7k73qs38cw9znwgl8jjywpzrmw5";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
-       homepage = "http://haste-lang.org";
        description = "Low level primitives for the Haste compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101871,7 +98093,6 @@ self: {
          base directory string-conversions text
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://bitbucket.org/sras/hastily";
        description = "A program to download subtitle files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -101889,7 +98110,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ ad base mwc-probability ];
-       homepage = "http://github.com/jtobin/hasty-hamiltonian";
        description = "Speedy traversal through parameter space";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -101913,7 +98133,6 @@ self: {
          base bytestring containers directory filepath haskeline
          haskell-src-exts polyparse process
        ];
-       homepage = "http://projects.haskell.org/hat/";
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -101952,7 +98171,6 @@ self: {
        testHaskellDepends = [
          base cmdargs process split tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://michael.orlitzky.com/code/hath.xhtml";
        description = "Hath manipulates network blocks in CIDR notation";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -101983,7 +98201,6 @@ self: {
        benchmarkHaskellDepends = [
          async attoparsec base bytestring criterion random stm
        ];
-       homepage = "https://github.com/kosmoskatten/hats";
        description = "Haskell client for the NATS messaging system";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102007,7 +98224,6 @@ self: {
        testHaskellDepends = [
          base test-framework test-framework-quickcheck2
        ];
-       homepage = "http://extralogical.net/projects/hatt";
        description = "A truth table generator for classical propositional logic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102074,7 +98290,6 @@ self: {
          hoauth HTTP json mtl network old-locale parsec regex-base
          regex-tdfa SHA time utf8-string
        ];
-       homepage = "http://d.hatena.ne.jp/xanxys/20100321/1269137834";
        description = "A twitter client for GTK+. Beta version.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102101,7 +98316,6 @@ self: {
          containers Decimal directory filepath mtl split template-haskell
          text transformers
        ];
-       homepage = "http://johannesgerer.com/hax";
        description = "Haskell cash-flow and tax simulation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102130,7 +98344,6 @@ self: {
          HUnit test-framework test-framework-hunit text time
          unordered-containers
        ];
-       homepage = "https://github.com/facebook/Haxl";
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = "unknown";
      }) {};
@@ -102157,7 +98370,6 @@ self: {
          HUnit test-framework test-framework-hunit text time
          unordered-containers
        ];
-       homepage = "https://github.com/facebook/Haxl";
        description = "A Haskell library for efficient, concurrent, and concise data access";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102175,7 +98387,6 @@ self: {
          amazonka amazonka-core async base conduit hashable haxl
          transformers
        ];
-       homepage = "http://github.com/tvh/haxl-amazonka#readme";
        description = "Haxl data source for accessing AWS services through amazonka";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102199,7 +98410,6 @@ self: {
          http-client-tls http-conduit resourcet text time transformers
          unordered-containers vector
        ];
-       homepage = "https://github.com/facebook/Haxl";
        description = "An example Haxl data source for accessing the Facebook Graph API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102225,7 +98435,6 @@ self: {
          mtl optparse-applicative parsec split template-haskell transformers
          utf8-string zlib
        ];
-       homepage = "https://github.com/joelteon/haxparse";
        description = "Readable HaxBall replays";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102247,7 +98456,6 @@ self: {
          network network-uri old-locale old-time template-haskell text time
          utf8-string
        ];
-       homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102259,7 +98467,6 @@ self: {
        version = "3000.5";
        sha256 = "1h1g4r7c5k3rja49ip4m21f2sscn06xjxharnlyazvvs6mzfysif";
        libraryHaskellDepends = [ base haxr template-haskell ];
-       homepage = "http://www.haskell.org/haxr/";
        description = "Automatic deriving of XML-RPC structs for Haskell records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102277,7 +98484,6 @@ self: {
          base bytestring data-default-class hostname HTTP http-server mtl
          url
        ];
-       homepage = "http://github.com/achudnov/haxy";
        description = "A simple HTTP proxy server library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102318,7 +98524,6 @@ self: {
          aeson base bytestring http-conduit http-types optparse-applicative
          pandoc url
        ];
-       homepage = "https://github.com/Gonzih/hayoo-cli";
        description = "Hayoo CLI";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102338,7 +98543,6 @@ self: {
        executableHaskellDepends = [
          base cairo filepath glade gtk haskell98 process svgcairo time unix
        ];
-       homepage = "http://hback.googlecode.com/";
        description = "N-back memory game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102369,7 +98573,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
        ];
-       homepage = "http://www.alpheccar.org";
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102387,7 +98590,6 @@ self: {
        executableHaskellDepends = [
          base directory ghc ghc-mod ghc-paths libhbb
        ];
-       homepage = "https://bitbucket.org/bhris/hbb";
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102415,7 +98617,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring containers network
        ];
-       homepage = "http://github.com/scsibug/hbeanstalk/";
        description = "Client for the beanstalkd workqueue service";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102434,7 +98635,6 @@ self: {
          base containers mtl old-time OpenGL SDL SDL-mixer
        ];
        executableSystemDepends = [ SDL_mixer ];
-       homepage = "http://www.dockerz.net/software/hbeat.html";
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102451,7 +98651,6 @@ self: {
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ blas liblapack ];
        testHaskellDepends = [ base hspec primitive vector ];
-       homepage = "http://github.com/wellposed/hblas/";
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102504,7 +98703,6 @@ self: {
          webkitgtk3 zeromq4-haskell
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102536,7 +98734,6 @@ self: {
          mono-traversable mtl network-uri pango parsec process resourcet
          safe safe-exceptions text time transformers-base unix webkitgtk3
        ];
-       homepage = "https://github.com/k0ral/hbro-contrib";
        description = "Third-party extensions to hbro";
        license = "unknown";
      }) {};
@@ -102557,7 +98754,6 @@ self: {
          array base containers filepath mtl pretty utf8-string
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "https://www.bytelabs.org/project/haskell-bottom-up-rewrite-generator/";
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102571,7 +98767,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring language-c ];
-       homepage = "http://tomahawkins.org";
        description = "A toy C compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102585,7 +98780,6 @@ self: {
        sha256 = "0578yi5zc61chmp936s5wczdd8j3593br24zx57sqr5a50c0mwmc";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base colour random ];
-       homepage = "http://rd.slavepianos.org/t/hcg-minus";
        description = "haskell cg (minus)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102602,7 +98796,6 @@ self: {
        libraryHaskellDepends = [
          base cairo colour filepath hcg-minus process
        ];
-       homepage = "http://rd.slavepianos.org/t/hcg-minus-cairo";
        description = "haskell cg (minus) (cairo rendering)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102616,7 +98809,6 @@ self: {
        sha256 = "1fwgnp15kha9qb7iagd8n5ahjjhg194wbva5i436mb57fn86pya2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mps ];
-       homepage = "http://github.com/nfjinjing/hcheat/";
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102634,7 +98826,6 @@ self: {
        testHaskellDepends = [
          array attoparsec base containers hlint hspec QuickCheck text
        ];
-       homepage = "https://github.com/nablaa/hchesslib";
        description = "Chess library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102656,7 +98847,6 @@ self: {
          stm tagged tasty temporary text transformers transformers-base
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/bennofs/hcltest/";
        description = "A testing library for command line applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102680,7 +98870,6 @@ self: {
        testHaskellDepends = [
          async base bytestring HUnit network QuickCheck random
        ];
-       homepage = "https://github.com/lulf/hcoap";
        description = "CoAP implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102711,7 +98900,6 @@ self: {
        libraryHaskellDepends = [ base mtl regex-pcre ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base data-default HUnit ieee754 mtl ];
-       homepage = "https://github.com/danfran/hcoord#readme";
        description = "Easily convert between latitude/longitude, UTM and OSGB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102729,7 +98917,6 @@ self: {
          base bytestring containers directory mtl old-locale pretty process
          random stm time
        ];
-       homepage = "http://github.com/tbh/hcron";
        description = "A simple job scheduler, which just runs some IO action at a given time";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102764,7 +98951,6 @@ self: {
        sha256 = "1c7lglbc4zf77b8nfc7jbk4d7v7n7asi451wrmyxsw6nzqlvib91";
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ bluetooth cwiid ];
-       homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -102781,7 +98967,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring extensible-exceptions filepath hsyslog mtl unix
        ];
-       homepage = "http://github.com/greydot/hdaemonize";
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -102797,7 +98982,6 @@ self: {
        libraryHaskellDepends = [
          base extensible-exceptions filepath hsyslog mtl unix
        ];
-       homepage = "http://github.com/madhadron/hdaemonize";
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102815,7 +98999,6 @@ self: {
          aeson base convertible HDBC scientific text unordered-containers
          vector
        ];
-       homepage = "https://github.com/danchoi/hdbc-aeson";
        description = "Deserialize from HDBC rows to FromJSON instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102828,7 +99011,6 @@ self: {
        version = "0.0.1.1";
        sha256 = "034zsmqgavh4ns69f6j4a1afyqbd1b7h35macmf20vzxj0j0bawj";
        libraryHaskellDepends = [ attoparsec base containers HDBC text ];
-       homepage = "http://bitbucket.com/dpwiz/hdbc-postgresql-hstore";
        description = "Manipulate data in PostgreSQL \"hstore\" columns";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102868,7 +99050,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time uuid
        ];
-       homepage = "https://github.com/s9gf4ult/hdbi";
        description = "Haskell Database Independent interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102890,7 +99071,6 @@ self: {
          base conduit hdbi hdbi-sqlite QuickCheck quickcheck-assertions
          resourcet test-framework test-framework-quickcheck2 transformers
        ];
-       homepage = "https://github.com/s9gf4ult/hdbi-conduit";
        description = "Conduit glue for HDBI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102919,7 +99099,6 @@ self: {
          quickcheck-instances safe test-framework test-framework-hunit
          test-framework-quickcheck2 text time uuid
        ];
-       homepage = "https://github.com/s9gf4ult/hdbi-postgresql";
        description = "PostgreSQL driver for hdbi";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102940,7 +99119,6 @@ self: {
          base blaze-builder bytestring direct-sqlite hdbi hdbi-tests
          test-framework text
        ];
-       homepage = "https://github.com/s9gf4ult/hdbi-sqlite";
        description = "SQlite driver for HDBI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102961,7 +99139,6 @@ self: {
          quickcheck-assertions quickcheck-instances stm test-framework
          test-framework-hunit test-framework-quickcheck2 text time uuid
        ];
-       homepage = "https://github.com/s9gf4ult/hdbi-tests";
        description = "test suite for testing HDBI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -102982,7 +99159,6 @@ self: {
          base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths
          network process syb time transformers unix
        ];
-       homepage = "https://github.com/hdevtools/hdevtools/";
        description = "Persistent GHC powered background server for FAST haskell development tools";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -103000,7 +99176,6 @@ self: {
          base directory fgl fgl-visualize filepath hosc hsc3 murmur-hash
          process split transformers
        ];
-       homepage = "http://rd.slavepianos.org/t/hdf";
        description = "HDF: Uniform Rate Audio Signal Processing in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103022,7 +99197,6 @@ self: {
        librarySystemDepends = [ hdf5 ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/ocramz/hdf5-lite";
        description = "High-level bindings to the HDF5 \"lite\" interface";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) hdf5;};
@@ -103054,7 +99228,6 @@ self: {
        libraryToolDepends = [ happy ];
        executableHaskellDepends = [ array base haskell98 pretty ];
        executableToolDepends = [ happy ];
-       homepage = "http://www.haskell.org/hdirect/";
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103067,7 +99240,6 @@ self: {
        version = "0.2";
        sha256 = "0qr8d4qbvkncv4im0iwwdr9khvkyy4ky8wnwxri1jqhylcq8vdks";
        libraryHaskellDepends = [ base bytestring containers QuickCheck ];
-       homepage = "https://github.com/kmcallister/hdis86";
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103081,7 +99253,6 @@ self: {
        sha256 = "0z6kpsk57gjqwpvs5v6ikiirnyyg26mbrxx827bb1v27lhsy7py0";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ markdown ];
-       homepage = "https://github.com/jamwt/hdiscount";
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103149,7 +99320,6 @@ self: {
          mtl network text
        ];
        testHaskellDepends = [ base containers mtl ];
-       homepage = "https://github.com/mvoidex/hdocs";
        description = "Haskell docs tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103177,7 +99347,6 @@ self: {
          network-info network-multicast network-transport
          network-transport-tcp random template-haskell time
        ];
-       homepage = "https://github.com/PatrickMaier/HdpH";
        description = "Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103194,7 +99363,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cereal containers deepseq template-haskell
        ];
-       homepage = "https://github.com/PatrickMaier/HdpH";
        description = "Explicit closures in Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103215,7 +99383,6 @@ self: {
          base hspec QuickCheck random tagged vector vector-algorithms
        ];
        benchmarkHaskellDepends = [ base criterion deepseq primitive ];
-       homepage = "http://github.com/joshbohde/hdr-histogram#readme";
        description = "Haskell implementation of High Dynamic Range (HDR) Histograms";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103236,7 +99403,6 @@ self: {
          aeson aeson-pretty base bytestring directory filepath haskeline
          time
        ];
-       homepage = "https://github.com/aka-bash0r/headergen";
        description = "Creates a header for a haskell source file";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103268,7 +99434,6 @@ self: {
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103282,7 +99447,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ array base ];
-       homepage = "http://wiki.cs.pdx.edu/bartforge/heapsort";
        description = "Heapsort of MArrays as a demo of imperative programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103294,7 +99458,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0019qgdc4ylyv7bb8w094qp38qiv81jb6x00s6z64j0zgy3lg4ss";
        libraryHaskellDepends = [ async base io-streams time ];
-       homepage = "https://github.com/bitnomial/heartbeat-streams";
        description = "Heartbeats for io-streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103313,7 +99476,6 @@ self: {
          base bytestring cereal pcre-heavy tasty tasty-golden tasty-hunit
          text
        ];
-       homepage = "https://github.com/fpinsight/heatshrink#readme";
        description = "Compression and decompression using heatshrink";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103350,7 +99512,6 @@ self: {
        libraryHaskellDepends = [
          amazonka-core base binary heavy-logger template-haskell text
        ];
-       homepage = "https://github.com/portnov/heavy-logger-amazon#readme";
        description = "heavy-logger compatibility with amazonka-core logging";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103372,7 +99533,6 @@ self: {
          base binary exceptions heavy-logger hsyslog mtl template-haskell
          text text-format-heavy
        ];
-       homepage = "https://github.com/portnov/heavy-logger#readme";
        description = "Orphan instances for data types in heavy-logger package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103390,7 +99550,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 time
        ];
-       homepage = "https://github.com/snoyberg/hebrew-time";
        description = "Hebrew dates and prayer times";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -103423,7 +99582,6 @@ self: {
          time
        ];
        executableHaskellDepends = [ base directory process split ];
-       homepage = "https://github.com/2016rshah/heckle";
        description = "Jekyll in Haskell (feat. LaTeX)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103453,7 +99611,6 @@ self: {
        testHaskellDepends = [
          base containers pretty-show semigroups text transformers
        ];
-       homepage = "https://hedgehog.qa";
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103480,7 +99637,6 @@ self: {
        testHaskellDepends = [
          base containers pretty-show semigroups text transformers
        ];
-       homepage = "https://hedgehog.qa";
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103498,7 +99654,6 @@ self: {
          base containers hedgehog semigroupoids semigroups
        ];
        testHaskellDepends = [ base either hedgehog ];
-       homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -103511,7 +99666,6 @@ self: {
        sha256 = "0zfk967xzpwfh3y3ys8d0c3zcz251dnp41xha11613ji3yfk0wff";
        libraryHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
        testHaskellDepends = [ base hedgehog hedgehog-checkers lens ];
-       homepage = "https://github.com/bitemyapp/hedgehog-checkers#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -103523,7 +99677,6 @@ self: {
        version = "0.1.0";
        sha256 = "1whrszkd03d9a86vqnp38sq8gs2hfdc39wxcf5c12w3767c9qmn3";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tmcgilchrist/hedgehog-corpus";
        description = "hedgehog-corpus";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103548,7 +99701,6 @@ self: {
          regex-genex regex-pcre scientific tasty tasty-hedgehog text time
          timerep tz unordered-containers vector
        ];
-       homepage = "https://github.com/amrhassan/haskell-hedgehog-gen-json";
        description = "JSON generators for Hedgehog";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103563,7 +99715,6 @@ self: {
        revision = "1";
        editedCabalFile = "1l6gpzhi56mj4a4nqmqhndhly3pdffkpbxinypk5ra77nxqns6n5";
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
-       homepage = "https://hedgehog.qa";
        description = "Use QuickCheck generators in Hedgehog and vice versa";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103588,7 +99739,6 @@ self: {
          test-framework test-framework-hunit text time
        ];
        benchmarkHaskellDepends = [ base mtl time ];
-       homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103614,7 +99764,6 @@ self: {
          test-framework test-framework-hunit text time
        ];
        benchmarkHaskellDepends = [ base mtl time ];
-       homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103631,7 +99780,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring hedis scientific text time
        ];
-       homepage = "https://bitbucket.org/s9gf4ult/hedis-config";
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103649,7 +99797,6 @@ self: {
          base hedis monad-control mtl transformers transformers-base
          transformers-compat
        ];
-       homepage = "https://bitbucket.org/s9gf4ult/redis-monadic";
        description = "A la MonadReader for Redis connection";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103665,7 +99812,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hedis mtl ];
        executableHaskellDepends = [ base bytestring hedis mtl ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/githubuser/hedis-namespace#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -103687,7 +99833,6 @@ self: {
          base binary bytestring hedis HUnit lifted-base string-conversions
          test-framework test-framework-hunit transformers
        ];
-       homepage = "https://github.com/akaspin/hedis-pile";
        description = "Caching mandatory data with Redis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103700,7 +99845,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1dq7rpqg35caqj664q2ndqgd59mq7cfjahkaka5mlk1k5yjvz7av";
        libraryHaskellDepends = [ base bytestring either hedis mtl ];
-       homepage = "http://github.com/sanetracker/hedis-simple";
        description = "A simplified API for hedis";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103719,7 +99863,6 @@ self: {
          base bytestring hedis HUnit lifted-base test-framework
          test-framework-hunit transformers
        ];
-       homepage = "https://github.com/akaspin/hedis-tags";
        description = "Tags for hedis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103744,7 +99887,6 @@ self: {
          base bytestring containers hspec hspec-contrib HUnit QuickCheck
          template-haskell text time vector
        ];
-       homepage = "https://bitbucket.org/dpwiz/hedn";
        description = "EDN parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103764,7 +99906,6 @@ self: {
          base bytestring directory filepath http-conduit process
          transformers
        ];
-       homepage = "https://github.com/khanage/heineken";
        description = "An extensible build helper for haskell, in the vein of leiningen";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103806,7 +99947,6 @@ self: {
          random statistics test-framework test-framework-hunit text time
          transformers transformers-base unordered-containers vector xmlhtml
        ];
-       homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103846,7 +99986,6 @@ self: {
          random statistics test-framework test-framework-hunit text time
          transformers transformers-base unordered-containers vector xmlhtml
        ];
-       homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103878,7 +100017,6 @@ self: {
        libraryHaskellDepends = [
          base heist template-haskell text xmlhtml
        ];
-       homepage = "http://github.com/dbp/heist-async";
        description = "Adding support for asynchronous updates (\"AJAX\") with heist";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103901,7 +100039,6 @@ self: {
          array base containers mtl pretty QuickCheck
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://www2.tcs.ifi.lmu.de/~abel/projects.html#helf";
        description = "Typechecking terms of the Edinburgh Logical Framework (LF)";
        license = "unknown";
      }) {};
@@ -103925,7 +100062,6 @@ self: {
        librarySystemDepends = [
          newrelic-collector-client newrelic-common newrelic-transaction
        ];
-       homepage = "https://github.com/philopon/helics";
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103945,7 +100081,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring data-default-class helics vault wai
        ];
-       homepage = "https://github.com/philopon/helics";
        description = "New Relic® agent SDK wrapper for wai";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103960,7 +100095,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers mtl parsec process ];
-       homepage = "http://www.codersbase.com/index.php/Helisp";
        description = "An incomplete Elisp compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -103985,7 +100119,6 @@ self: {
          base containers directory filepath lvmlib mtl network parsec
          process Top transformers wl-pprint
        ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Helium Compiler";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104026,7 +100159,6 @@ self: {
        testHaskellDepends = [
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
-       homepage = "https://ajnsit.github.io/helix/";
        description = "Web development micro framework for haskell with typesafe URLs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104072,7 +100204,6 @@ self: {
          base bytestring containers directory hellnet hjpath hjson HTTP Lucu
          mtl network regex-pcre safe stm tar utf8-string zlib
        ];
-       homepage = "http://bitcheese.net/wiki/hellnet/hellage";
        description = "Distributed hackage mirror";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104098,7 +100229,6 @@ self: {
        executableHaskellDepends = [
          base containers Lucu mtl network regex-posix
        ];
-       homepage = "http://bitcheese.net/wiki/hellnet/hspawn";
        description = "Simple, distributed, anonymous data sharing network";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104113,7 +100243,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/hello/";
        description = "Hello World, an example package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104136,7 +100265,6 @@ self: {
        ];
        executableHaskellDepends = [ base linear random ];
        testHaskellDepends = [ base hspec ];
-       homepage = "http://github.com/switchface/helm";
        description = "A functionally reactive game engine";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -104153,7 +100281,6 @@ self: {
          aeson base bytestring containers MissingH network network-uri text
          uuid
        ];
-       homepage = "https://github.com/helpdotcom/help-esb.hs";
        description = "A Haskell client for the Help.com team's ESB.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104213,7 +100340,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
        benchmarkHaskellDepends = [ base conduit criterion mtl ];
-       homepage = "https://github.com/nh2/hemokit";
        description = "Haskell port of the Emokit EEG project";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104235,7 +100361,6 @@ self: {
          base bitset exceptions mtl QuickCheck tasty tasty-quickcheck
          transformers uuid
        ];
-       homepage = "https://github.com/selectel/hen";
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104275,7 +100400,6 @@ self: {
        version = "0.1.1";
        sha256 = "1hbx48r8zdmyr5qjf0b3pagmamj8pibsp7ca7bxdgk4jz8pxv2my";
        libraryHaskellDepends = [ base mtl split ];
-       homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104306,7 +100430,6 @@ self: {
        executableHaskellDepends = [
          base containers ghc-prim indents mtl parsec regex-posix
        ];
-       homepage = "https://github.com/danchoi/herbalizer";
        description = "HAML to ERB translator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104323,7 +100446,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-meta mtl parsec template-haskell
        ];
-       homepage = "https://github.com/tmhedberg/here";
        description = "Here docs & interpolated strings via quasiquotation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104335,7 +100457,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0h0g2f7yscwl1ba1yn3jnz2drvd6ns9m910hwlmq3kdq3k39y3f9";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://hackage.haskell.org/package/heredoc";
        description = "multi-line string / here document using QuasiQuotes";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -104352,7 +100473,6 @@ self: {
          base bytestring doctest parsec template-haskell text
        ];
        testHaskellDepends = [ base bytestring doctest text ];
-       homepage = "http://github.com/cutsea110/heredoc.git";
        description = "heredocument";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104432,7 +100552,6 @@ self: {
          ansi-terminal base brick directory microlens microlens-th
          optparse-applicative semigroups split vty
        ];
-       homepage = "https://github.com/JackKiefer/herms";
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104453,7 +100572,6 @@ self: {
          ansi-terminal base brick directory microlens microlens-th mtl
          optparse-applicative semigroups split vty
        ];
-       homepage = "https://github.com/JackKiefer/herms";
        description = "A command-line manager for delicious kitchen recipes";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104469,7 +100587,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base random text ];
        executableHaskellDepends = [ base random text ];
-       homepage = "https://github.com/i-amd3/hero-club-five-tenets";
        description = "Think back of the five tenets of hero club";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104482,7 +100599,6 @@ self: {
        sha256 = "1gldsdpnmj7ljrmyvjfwqdmhhml2yp27icl2qqj9pz42pllq4x2k";
        libraryHaskellDepends = [ base network-uri text ];
        testHaskellDepends = [ base hspec network-uri text ];
-       homepage = "https://github.com/gregwebs/haskell-heroku";
        description = "helpers for deploying to Heroku";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104579,7 +100695,6 @@ self: {
          data-default directory filepath hackage-db haskell-src-exts parsec
          process text time uniplate unix
        ];
-       homepage = "https://github.com/jekor/hesh";
        description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104630,7 +100745,6 @@ self: {
        version = "0.21";
        sha256 = "1fnzj37kya5gqjchm3yq0709ay50n0spb24x5rxkxfbl0yy2nzk7";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/luqui/hetero-map";
        description = "Pure heterogeneous maps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104649,7 +100763,6 @@ self: {
          shakespeare template-haskell text transformers
        ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/heterocephalus#readme";
        description = "A type-safe template engine for working with popular front end development tools";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -104662,7 +100775,6 @@ self: {
        sha256 = "0cb38kpw01fzwfrhlgi2l1869b8hd9cd7kzbyr1ap6ik5gkljq6k";
        libraryHaskellDepends = [ base OneTuple ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/davidm-d/heterogeneous-list-literals";
        description = "Allows the use of tuples as literals for Heterogeneous collections";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104697,7 +100809,6 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base hscurses old-time random ];
        executableSystemDepends = [ ncurses ];
-       homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/";
        description = "Text Tetris";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104713,7 +100824,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq parallel random text
        ];
-       homepage = "https://github.com/t3476/heukarya";
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104775,7 +100885,6 @@ self: {
        sha256 = "0if46jkzd67jwp56vmvd021qq2vfzpmaf1v2w07cy0w61icfvjxr";
        libraryHaskellDepends = [ base base16-bytestring bytestring text ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/typeclasses/hex-text";
        description = "ByteString-Text hexidecimal conversions";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -104787,7 +100896,6 @@ self: {
        version = "0.0.2.0";
        sha256 = "1bx49z3ycc24bsn0x0617x0gmgapan6qnwnwq6v0w06gjrahr4r4";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/mniip/hexchat-haskell";
        description = "Haskell scripting interface for HexChat";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104812,7 +100920,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1asv5vs694mcifffvm5a4gsplpz7frk3p3zr9lqqv1f172ql9lql";
        libraryHaskellDepends = [ base binary bytestring filepath ];
-       homepage = "http://www.github.com/hansroland/hexif";
        description = "Reading Exif data form a JPEG file with Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104832,7 +100939,6 @@ self: {
          base containers directory filepath gloss grid optparse-applicative
          random
        ];
-       homepage = "https://github.com/pasqu4le/hexmino";
        description = "A small game based on domino-like hexagonal tiles";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104846,7 +100952,6 @@ self: {
        sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4";
        libraryHaskellDepends = [ base bytestring extra ];
        testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/ndmitchell/hexml#readme";
        description = "XML subset DOM parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104867,7 +100972,6 @@ self: {
        testHaskellDepends = [
          base bytestring doctest hexml hspec lens QuickCheck wreq
        ];
-       homepage = "https://github.com/pepeiborra/hexml-lens#readme";
        description = "Lenses for the hexml package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104886,7 +100990,6 @@ self: {
          utf8-string
        ];
        librarySystemDepends = [ expat ];
-       homepage = "http://haskell.org/haskellwiki/Hexpat/";
        description = "XML parser/formatter based on expat";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) expat;};
@@ -104904,7 +101007,6 @@ self: {
          base bytestring containers extensible-exceptions hexpat iteratee
          List parallel transformers
        ];
-       homepage = "http://haskell.org/haskellwiki/Hexpat/";
        description = "Chunked XML parsing using iteratees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104921,7 +101023,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring deepseq hexpat hexpat-tagsoup lens
        ];
-       homepage = "https://github.com/tel/hexpat-lens";
        description = "Lenses for Hexpat";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -104939,7 +101040,6 @@ self: {
          base bytestring containers extensible-exceptions hexpat text
          utf8-string
        ];
-       homepage = "http://code.haskell.org/hexpat-pickle/";
        description = "XML picklers based on hexpat, source-code-similar to those of the HXT package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -104983,7 +101083,6 @@ self: {
        libraryHaskellDepends = [
          base data-ref either mtl parsec transformers
        ];
-       homepage = "https://github.com/Zankoku-Okuno/hexpr/";
        description = "A framework for symbolic, homoiconic languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105002,7 +101101,6 @@ self: {
          aeson base binary bytestring case-insensitive filepath http-types
          mime-types mtl text transformers vault wai warp
        ];
-       homepage = "https://github.com/allonsy/hexpress";
        description = "An express-like http framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -105036,7 +101134,6 @@ self: {
          aeson base base16-bytestring binary bytestring text
        ];
        testHaskellDepends = [ base binary bytestring hspec text ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Fast and safe representation of a hex string";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -105053,7 +101150,6 @@ self: {
          base containers text unordered-containers
        ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/aneksteind/hext#readme";
        description = "a text classification library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105085,7 +101181,6 @@ self: {
          temporary text time transformers unix unordered-containers
          utf8-string wai wai-extra warp
        ];
-       homepage = "https://github.com/ryantm/heyefi";
        description = "A server for Eye-Fi SD cards";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105137,7 +101232,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base eprocess mtl ];
        executableHaskellDepends = [ wx wxcore ];
-       homepage = "http://github.com/elbrujohalcon/hfiar";
        description = "Four in a Row in Haskell!!";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105150,7 +101244,6 @@ self: {
        version = "0.4.3";
        sha256 = "0lmjgwgfp1s2ag2fbi6n8yryafb5qz87yb0p122lxzm3487sf98h";
        libraryHaskellDepends = [ base containers template-haskell text ];
-       homepage = "http://github.com/errge/hflags";
        description = "Command line flag parser, very similar to Google's gflags";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -105180,7 +101273,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "http://github.com/danstiner/hfmt";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105218,7 +101310,6 @@ self: {
          ansi-terminal base base-unicode-symbols text
        ];
        testHaskellDepends = [ base base-unicode-symbols hspec text ];
-       homepage = "http://github.com/mvoidex/hformat";
        description = "Simple Haskell formatting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105230,7 +101321,6 @@ self: {
        version = "1.0.2";
        sha256 = "04qwmjxm06akvpakc5imcx0ls9zlsz74s4r9p7xzj0q5fv20z09l";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nornagon/hfov";
        description = "Field-of-view calculation for low-resolution 2D raster grids";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105250,7 +101340,6 @@ self: {
          array base colour containers data-accessor data-accessor-template
          gd GLUT OpenGL OpenGLRaw
        ];
-       homepage = "http://github.com/cmh/Hfractal";
        description = "OpenGL fractal renderer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105267,7 +101356,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal mtl text ];
        librarySystemDepends = [ Cocoa ];
        libraryToolDepends = [ CoreServices ];
-       homepage = "http://github.com/luite/hfsevents";
        description = "File/folder watching for OS X";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" ];
@@ -105284,7 +101372,6 @@ self: {
        libraryHaskellDepends = [
          base containers haskell-src mtl pretty syb
        ];
-       homepage = "http://www.fing.edu.uy/inco/proyectos/fusion";
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105346,7 +101433,6 @@ self: {
          base directory HUnit process template-haskell temporary
          test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/copton/hgdbmi";
        description = "GDB Machine Interface: program-driven control of GDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105381,7 +101467,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath hylolib mtl random
        ];
-       homepage = "http://www.glyc.dc.uba.ar/intohylo/hgen.php";
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105394,7 +101479,6 @@ self: {
        version = "0.0.2.2";
        sha256 = "0l460mmbla7354dldil0d7qzba7dp4jhhsna0s27gdd9aad4flsd";
        libraryHaskellDepends = [ base containers ];
-       homepage = "ftp://ftp.cs.man.ac.uk/pub/toby/gpc/";
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105428,7 +101512,6 @@ self: {
          base criterion deepseq deepseq-generics Frames lens QuickCheck
          semigroups
        ];
-       homepage = "https://fstaals.net/software/hgeometry";
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105444,7 +101527,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ geos_c ];
        testHaskellDepends = [ base MissingH ];
-       homepage = "https://github.com/rcook/hgeos#readme";
        description = "Simple Haskell bindings to GEOS C API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105507,7 +101589,6 @@ self: {
          http-enumerator text
        ];
        executableHaskellDepends = [ base cmdargs directory ];
-       homepage = "https://github.com/noteed/hgithub";
        description = "Haskell bindings to the GitHub API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105524,7 +101605,6 @@ self: {
        executableHaskellDepends = [
          array base HGL HTam random utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/hgl-example/";
        description = "Various animations generated using HGL";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105541,7 +101621,6 @@ self: {
        editedCabalFile = "0v318nifmgqq5jg1d5q0jspfgyqp7cfnkz3ikqaz9xjg8inzl8mr";
        libraryHaskellDepends = [ base ghc-prim integer-gmp ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://code.mathr.co.uk/hgmp";
        description = "Haskell interface to GMP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105560,7 +101639,6 @@ self: {
        executableHaskellDepends = [
          base containers directory filepath mtl parsec wl-pprint
        ];
-       homepage = "http://github.com/polux/hgom";
        description = "An haskell port of the java version of gom";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105596,7 +101674,6 @@ self: {
        executableHaskellDepends = [
          ansi-terminal base optparse-applicative
        ];
-       homepage = "https://github.com/thumphries/hgrep";
        description = "Search Haskell source code from the command line";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105613,7 +101690,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring directory filepath process template-haskell
        ];
-       homepage = "https://github.com/bitnomial/hgrev";
        description = "Compile Mercurial (hg) version info into Haskell code";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -105632,7 +101708,6 @@ self: {
        librarySystemDepends = [ grib_api ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base directory hspec ];
-       homepage = "https://github.com/mjakob/hgrib";
        description = "Unofficial bindings for GRIB API";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105646,7 +101721,6 @@ self: {
        sha256 = "0pmn2j92pnyy0w3x550qqrzs91mi0sx8dwk592649x9l3xpqx1pm";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ harp ];
-       homepage = "http://www.harphttp.org";
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105678,7 +101752,6 @@ self: {
          HUnit optparse-applicative parsec process silently split template
          temporary text time
        ];
-       homepage = "https://github.com/fujimura/hi.git#readme";
        description = "Generate scaffold for cabal project";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105720,7 +101793,6 @@ self: {
          base bytestring containers haskell98 HUnit mtl parsec random
          readline time
        ];
-       homepage = "http://hiccup.googlecode.com/";
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105749,11 +101821,29 @@ self: {
        libraryHaskellDepends = [ base bytestring transformers ];
        libraryPkgconfigDepends = [ hidapi ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/phaazon/hid";
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) hidapi;};
 
+  "hid-examples" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, cassava, Chart
+     , Chart-diagrams, fmt, hint, optparse-applicative, safe, text, time
+     }:
+     mkDerivation {
+       pname = "hid-examples";
+       version = "0.1.0.0";
+       sha256 = "0x8i9532w5gxlajx4pw7n31qf6hbqf5335lsqwvwvk12igww7mg8";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base blaze-html bytestring cassava Chart Chart-diagrams fmt hint
+         optparse-applicative safe text time
+       ];
+       description = "Examples to accompany the book \"Haskell in Depth\"";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hidapi" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, deepseq-generics
      , systemd
@@ -105766,10 +101856,9 @@ self: {
          base bytestring deepseq deepseq-generics
        ];
        librarySystemDepends = [ systemd ];
-       homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
-     }) {systemd = null;};
+     }) {inherit (pkgs) systemd;};
 
   "hidden-char" = callPackage
     ({ mkDerivation, base, hspec }:
@@ -105781,7 +101870,6 @@ self: {
        editedCabalFile = "1d0k297hxff31k0x5xbli6l7c151d2y9wq4w0x0prgagjc0l7z5n";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/rcook/hidden-char#readme";
        description = "Provides cross-platform getHiddenChar function";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -105861,7 +101949,6 @@ self: {
          monad-control mtl transformers transformers-base
          transformers-compat
        ];
-       homepage = "https://github.com/jwiegley/hierarchy#readme";
        description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105878,29 +101965,27 @@ self: {
        libraryHaskellDepends = [
          base directory filepath mtl old-time stm timers-updatable
        ];
-       homepage = "http://github.com/paolino/hiernotify";
        description = "Notification library for a filesystem hierarchy";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hifi" = callPackage
-    ({ mkDerivation, base, directory, filepath, mustache, parsec
-     , process, text, unix
+    ({ mkDerivation, base, cmdargs, directory, filepath, mustache
+     , parsec, process, text, unix
      }:
      mkDerivation {
        pname = "hifi";
-       version = "0.1.2.0";
-       sha256 = "0zhraby44j5zjrvjmqj22sa15qsl5jxhfs07gkggc8zfahvg822d";
+       version = "0.1.4.0";
+       sha256 = "0rgmhj1fn0ldyzbscv1q447fbqggqaw3zqxagsn95zq2dqyhrpyl";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base directory filepath mustache parsec process text unix
        ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base cmdargs ];
        testHaskellDepends = [ base ];
-       homepage = "https://gitlab.com/gonz/hifi";
        description = "WiFi connection script generator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105915,7 +102000,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ghc ];
-       homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Memory usage statistics";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -105938,7 +102022,6 @@ self: {
          base bytestring cereal hspec leveldb-haskell mtl process resourcet
          transformers transformers-base unliftio
        ];
-       homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -105970,7 +102053,6 @@ self: {
        benchmarkHaskellDepends = [
          aeson base bytestring criterion deepseq text
        ];
-       homepage = "https://github.com/agrafix/highjson";
        description = "Spec based JSON parsing/serialisation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -105989,7 +102071,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring highjson hspec lens QuickCheck swagger2 text
        ];
-       homepage = "https://github.com/agrafix/highjson";
        description = "Derive swagger instances from highjson specs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -106010,7 +102091,6 @@ self: {
          aeson base bytestring highjson highjson-swagger hspec lens
          QuickCheck swagger2 text
        ];
-       homepage = "https://github.com/agrafix/highjson";
        description = "Template Haskell helpers for highjson specs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -106042,7 +102122,6 @@ self: {
          QuickCheck tasty tasty-golden transformers transformers-compat unix
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/cdepillabout/highlight";
        description = "Command line tool for highlighting parts of files matching a regex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106118,7 +102197,6 @@ self: {
        testHaskellDepends = [
          base blaze-html containers Diff directory filepath process
        ];
-       homepage = "http://github.com/jgm/highlighting-kate";
        description = "Syntax highlighting";
        license = "GPL";
      }) {};
@@ -106139,7 +102217,6 @@ self: {
          array base bytestring directory filepath optparse-applicative text
          transformers
        ];
-       homepage = "http://www.bubblycloud.com/hills/";
        description = "Generate STL models from SRTM elevation data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106158,7 +102235,6 @@ self: {
          base directory glib gtk haskell98 mozembed old-time parallel
          process unix
        ];
-       homepage = "http://www.haskell.org/himerge";
        description = "Haskell Graphical User Interface for Emerge";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106181,7 +102257,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory gtk HTTP http-conduit network temporary
        ];
-       homepage = "http://github.com/Fuuzetsu/himg";
        description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106204,7 +102279,6 @@ self: {
          NetSNMP network old-time protobuf regex-posix stm text type-level
          unordered-containers vector
        ];
-       homepage = "https://github.com/pyr/himpy";
        description = "multithreaded snmp poller for riemann";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106240,7 +102314,6 @@ self: {
          base bytestring criterion deepseq directory exceptions ghc-prim
          haskell-src-exts utf8-string
        ];
-       homepage = "https://github.com/commercialhaskell/hindent";
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106273,7 +102346,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq hinduce-missingh parallel vector
        ];
-       homepage = "https://github.com/roberth/hinduce-associations-apriori";
        description = "Apriori algorithm for association rule mining";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -106302,7 +102374,6 @@ self: {
        libraryHaskellDepends = [
          base convertible hinduce-classifier hinduce-missingh layout
        ];
-       homepage = "https://github.com/roberth/hinduce-classifier-decisiontree#readme";
        description = "Decision Tree Classifiers for hInduce";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106333,7 +102404,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "1606fz8qhvwqidi798y3mxlmbmwn8yp3a4cl59j4i8s05vgbaj9z";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/roberth/hinduce-missingh";
        description = "Utility functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106348,7 +102418,6 @@ self: {
        editedCabalFile = "0df5pak0586626k3ryzg2lb26ys562l3i94jr9vpa0krs8iia209";
        libraryHaskellDepends = [ async base containers directory unix ];
        testHaskellDepends = [ base directory ];
-       homepage = "https://github.com/kolmodin/hinotify.git";
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106365,7 +102434,6 @@ self: {
        editedCabalFile = "07z0n5rvki3w0kjr190bwv7sq8p3myspv8999ilz9rlsqf5a0324";
        libraryHaskellDepends = [ async base bytestring containers unix ];
        testHaskellDepends = [ base bytestring directory unix ];
-       homepage = "https://github.com/kolmodin/hinotify.git";
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106385,7 +102453,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory posix-paths unix utf8-string
        ];
-       homepage = "https://github.com/hasufell/hinotify-bytestring.git";
        description = "Haskell binding to inotify, using ByteString filepaths";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106406,7 +102473,6 @@ self: {
          base bifunctors QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       homepage = "https://github.com/joneshf/hinquire";
        description = "Generate armet style query strings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106423,7 +102489,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring Cabal directory filepath process template-haskell
        ];
-       homepage = "http://www.wellquite.org/hinstaller/";
        description = "Installer wrapper for Haskell applications";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106445,7 +102510,6 @@ self: {
        testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit
        ];
-       homepage = "https://github.com/mvdan/hint";
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106465,7 +102529,6 @@ self: {
        testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit unix
        ];
-       homepage = "https://github.com/mvdan/hint";
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106502,7 +102565,6 @@ self: {
        testHaskellDepends = [
          base directory exceptions extensible-exceptions filepath HUnit unix
        ];
-       homepage = "https://github.com/strake/hint.hs";
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106529,7 +102591,6 @@ self: {
          async base binary bytestring hspec monad-logger QuickCheck
          transformers
        ];
-       homepage = "https://github.com/LTI2000/hinterface";
        description = "Haskell / Erlang interoperability library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106545,7 +102606,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskell98 random ];
-       homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Space Invaders";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106558,7 +102618,6 @@ self: {
        version = "1.0";
        sha256 = "137jjwcs3a9n2zybkqqfdy2m1a2ahpdcmficwfmn7ykdz487xcsq";
        libraryHaskellDepends = [ base haskell98 Stream ];
-       homepage = "http://code.haskell.org/~dons/code/hinze-streams";
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106582,7 +102641,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq repa repa-algorithms vector
        ];
-       homepage = "https://github.com/lehins/hip";
        description = "Haskell Image Processing (HIP) Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106608,7 +102666,6 @@ self: {
          unordered-containers utf8-string wai wai-lens webcrank webcrank-wai
          wreq
        ];
-       homepage = "https://github.com/purefn/hipbot";
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106644,7 +102701,6 @@ self: {
        libraryHaskellDepends = [
          base containers hgeometry hxt parsec split text text-format
        ];
-       homepage = "http://fstaals.net/software/hipe";
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106661,7 +102717,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory functors mtl
        ];
-       homepage = "http://closure.ath.cx/hips";
        description = "an IPS patcher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106701,7 +102756,6 @@ self: {
          numeric-extras random statistics text text-format vector
          vector-space
        ];
-       homepage = "https://people.ksp.sk/~ivan/hirt";
        description = "Calculates IRT 2PL and 3PL models";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106718,7 +102772,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring conduit http-conduit http-types text time
        ];
-       homepage = "https://github.com/prowdsponsor/hissmetrics";
        description = "Unofficial API bindings to KISSmetrics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106743,7 +102796,6 @@ self: {
          aeson-pretty base bytestring cmdargs containers hist-pl-dawg
          hist-pl-fusion hist-pl-lexicon hist-pl-lmf pipes polimorf
        ];
-       homepage = "https://github.com/kawu/hist-pl/tree/master/umbrella";
        description = "Umbrella package for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106759,7 +102811,6 @@ self: {
        libraryHaskellDepends = [
          base binary containers dawg text text-binary
        ];
-       homepage = "https://github.com/kawu/hist-pl/tree/master/dawg";
        description = "A generic, DAWG-based dictionary";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106776,7 +102827,6 @@ self: {
          base binary containers dawg hist-pl-dawg hist-pl-lexicon polimorf
          text text-binary
        ];
-       homepage = "https://github.com/kawu/hist-pl/tree/master/fusion";
        description = "Merging historical dictionary with PoliMorf";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106794,7 +102844,6 @@ self: {
          base binary containers dawg directory filepath hist-pl-dawg
          hist-pl-types pipes text transformers
        ];
-       homepage = "https://github.com/kawu/hist-pl/tree/master/lexicon";
        description = "A binary representation of the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106807,7 +102856,6 @@ self: {
        version = "0.1.0";
        sha256 = "146vz15fig8k1wcvcw7fg64abxvg1nyarvhigz9jkzf5yngkzwvm";
        libraryHaskellDepends = [ base hist-pl-types polysoup text ];
-       homepage = "https://github.com/kawu/hist-pl/tree/master/lmf";
        description = "LMF parsing for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106820,7 +102868,6 @@ self: {
        version = "0.1.1";
        sha256 = "146ywyh67a0hasgcpfmffrj8w1kg6anksaa3mm9f80k83shqhvrb";
        libraryHaskellDepends = [ base parsec ];
-       homepage = "https://github.com/kawu/hist-pl/tree/master/transliter";
        description = "A simple EDSL for transliteration rules";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106832,7 +102879,6 @@ self: {
        version = "0.1.0";
        sha256 = "0i13aj1xcwap0k3w48vyiiganbvj93zydawmw3gw7m0kr6nl5l9v";
        libraryHaskellDepends = [ base binary text text-binary ];
-       homepage = "https://github.com/kawu/hist-pl/tree/master/types";
        description = "Types in the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106850,7 +102896,6 @@ self: {
        editedCabalFile = "0pa5i5187g0y7r7ngy4gf9lqp76k9saz5qjri4nx0f98kwsacagg";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
-       homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Library for histograms creation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106865,7 +102910,6 @@ self: {
        sha256 = "00j4ncqy0s5wil158wx1f8x0n2mj4ki2hgs4hmkrx0vbkc2pil56";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive vector ];
        benchmarkHaskellDepends = [ base criterion mwc-random vector ];
-       homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Library for histograms creation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106878,7 +102922,6 @@ self: {
        version = "0.8.5.0";
        sha256 = "0dkvdc5sbnarpdam9gg6q1rvc5xx51pga0whzf6mq81yjn2ydvqy";
        libraryHaskellDepends = [ base binary histogram-fill vector ];
-       homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Binary instances for histogram-fill package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106890,7 +102933,6 @@ self: {
        version = "0.8.5.0";
        sha256 = "1kaj56b7cp2c4s0fdkirw48igy54zhdrcrjsjpyv4cnywq8nvqrq";
        libraryHaskellDepends = [ base cereal histogram-fill vector ];
-       homepage = "https://github.com/Shimuuar/histogram-fill/";
        description = "Binary instances for histogram-fill package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106934,7 +102976,6 @@ self: {
        testHaskellDepends = [
          base bytedump bytestring hourglass tasty tasty-quickcheck
        ];
-       homepage = "http://github.com/vincenthz/hit";
        description = "Git operations in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106950,7 +102991,6 @@ self: {
        libraryHaskellDepends = [
          base containers fgl hashable hit transformers unordered-containers
        ];
-       homepage = "http://hub.darcs.net/fr33domlover/hit-graph";
        description = "Use graph algorithms to access and manipulate Git repos";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -106967,7 +103007,6 @@ self: {
          aeson base bytestring HUnit test-framework test-framework-hunit
          text unordered-containers vector
        ];
-       homepage = "https://github.com/seagreen/hjcase";
        description = "Jcase library for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -106980,7 +103019,6 @@ self: {
        version = "3.0.1";
        sha256 = "0wmzxwi24q7r0yxnalzqnn3k0bzf7wc4ql26dv94pvzir156kahj";
        libraryHaskellDepends = [ base containers hjson parsec ];
-       homepage = "http://bitcheese.net/wiki/code/hjpath";
        description = "XPath-like syntax for querying JSON";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -106999,7 +103037,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers directory mtl parsec regex-compat
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Libraries_and_tools/HJS";
        description = "JavaScript Parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107022,7 +103059,6 @@ self: {
          base blaze-builder bytestring containers language-javascript
          optparse-applicative text
        ];
-       homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107067,7 +103103,6 @@ self: {
          aeson base hspec http-types QuickCheck text unordered-containers
          vector
        ];
-       homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107090,7 +103125,6 @@ self: {
          aeson base hspec http-types QuickCheck text unordered-containers
          vector
        ];
-       homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107118,7 +103152,6 @@ self: {
          profunctors protolude QuickCheck semigroups text
          unordered-containers vector wai-app-static warp
        ];
-       homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107148,7 +103181,6 @@ self: {
          profunctors protolude QuickCheck text unordered-containers vector
          wai-app-static warp
        ];
-       homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107179,7 +103211,6 @@ self: {
        sha256 = "0qvlrfw3bsnhym58iddijvkgzfxk59cpasy74pnsnxwmnjmh06js";
        libraryHaskellDepends = [ base byteable bytestring cryptohash ];
        testHaskellDepends = [ base byteable bytestring cryptohash hspec ];
-       homepage = "http://github.com/j1r1k/hkdf";
        description = "Implementation of HKDF (RFC 5869)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107195,7 +103226,6 @@ self: {
        testHaskellDepends = [
          base hspec inspection-testing protolude text
        ];
-       homepage = "https://github.com/eliaslfox/hkt#readme";
        description = "A library for higher kinded types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107234,7 +103264,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit vector
        ];
-       homepage = "http://people.ksp.sk/~ivan/hlbfgsb";
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107257,7 +103286,6 @@ self: {
        executableHaskellDepends = [
          array base bytestring bytestring-csv containers haskell98 parallel
        ];
-       homepage = "http://membres-liglab.imag.fr/termier/HLCM/hlcm.html";
        description = "Fast algorithm for mining closed frequent itemsets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107281,7 +103309,6 @@ self: {
          aeson base containers data-default mtl text unordered-containers
          websockets
        ];
-       homepage = "https://bitbucket.org/functionally/hleap";
        description = "Web Socket interface to Leap Motion controller";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107332,7 +103359,6 @@ self: {
          filepath here hledger-lib html pretty-show process shakespeare
          tabular temporary terminfo time timeit utility-ht
        ];
-       homepage = "http://hledger.org";
        description = "Command-line interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -107356,7 +103382,6 @@ self: {
          servant-server servant-swagger swagger2 text transformers wai
          wai-extra warp
        ];
-       homepage = "http://hledger.org";
        description = "Web API server for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -107375,7 +103400,6 @@ self: {
          base Chart cmdargs colour containers hledger hledger-lib HUnit safe
          time
        ];
-       homepage = "http://hledger.org";
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107390,7 +103414,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hledger-lib text time ];
-       homepage = "https://github.com/gebner/hledger-diff";
        description = "Compares the transactions in two ledger files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107424,7 +103447,6 @@ self: {
          base free hledger-lib hspec megaparsec QuickCheck text text-zipper
          time transformers vector
        ];
-       homepage = "https://github.com/hpdeifel/hledger-iadd#readme";
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107441,7 +103463,6 @@ self: {
        executableHaskellDepends = [
          base Cabal Decimal hledger-lib mtl text time
        ];
-       homepage = "http://github.com/peti/hledger-interest";
        description = "computes interest for a given account";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -107453,8 +103474,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.13";
-       sha256 = "16y195h5wjs8vrccs18dx65kz3xrcifcwy1ggrsblf0kgml0cj7l";
+       version = "0.1.1.14";
+       sha256 = "06y1y6qgq9arhqwdna1kfafhjwin8qmlczl5rxazms3g45dl72rr";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -107493,7 +103514,6 @@ self: {
          tabular test-framework test-framework-hunit text time transformers
          uglymemo utf8-string
        ];
-       homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -107517,7 +103537,6 @@ self: {
          megaparsec microlens microlens-platform pretty-show process safe
          split text text-zipper time transformers vector vty
        ];
-       homepage = "http://hledger.org";
        description = "Curses-style user interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -107536,7 +103555,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs hledger hledger-lib HUnit safe time vty
        ];
-       homepage = "http://hledger.org";
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107581,7 +103599,6 @@ self: {
          transformers wai wai-extra wai-handler-launch warp yaml yesod
          yesod-core yesod-form yesod-static yesod-test
        ];
-       homepage = "http://hledger.org";
        description = "Web interface for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -107597,7 +103614,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL bytestring ];
        libraryPkgconfigDepends = [ libbladeRF ];
        testHaskellDepends = [ base hlint ];
-       homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107611,7 +103627,6 @@ self: {
        sha256 = "0416w0k5ahnj57gc6n15ihpsyznmm36s1sjkycl35l7s8bxdldyw";
        libraryHaskellDepends = [ base network ];
        librarySystemDepends = [ ev ];
-       homepage = "http://github.com/aycanirican/hlibev";
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107655,7 +103670,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libsass ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107672,7 +103686,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libsass ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/jakubfijalkowski/hlibsass";
        description = "Low-level bindings to Libsass";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107699,7 +103712,6 @@ self: {
          uniplate unordered-containers vector yaml
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ndmitchell/hlint#readme";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107714,7 +103726,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hlint ];
        executableHaskellDepends = [ base hlint ];
-       homepage = "https://github.com/Siprj/hlint-test#readme";
        description = "Run hlint in test suite";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -107738,7 +103749,6 @@ self: {
        version = "0.0.3.0";
        sha256 = "1q3jsnxy7x0lv7wqfv9hlqnr22661k4agbb8yjbhj32fxyjqrn4f";
        libraryHaskellDepends = [ base old-locale time ];
-       homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107775,7 +103785,6 @@ self: {
          base base64-bytestring bytestring cryptonite hashable hedis
          hlrdb-core memory random store time unordered-containers
        ];
-       homepage = "https://github.com/identicalsnowflake/hlrdb";
        description = "High-level Redis Database";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107793,7 +103802,6 @@ self: {
          base bytestring hashable hedis lens mtl profunctors random time
          unordered-containers
        ];
-       homepage = "https://github.com/identicalsnowflake/hlrdb-core";
        description = "High-level Redis Database Core API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -107806,7 +103814,6 @@ self: {
        sha256 = "0h32fyvnqkxx8c9vfpdjvnqaxkvr8b15myjavxmnm6kwh7v2796l";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers hcg-minus hps ];
-       homepage = "http://rd.slavepianos.org/t/hls";
        description = "Haskell Lindenmayer Systems";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107823,7 +103830,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base stm transformers unix X11 ];
-       homepage = "https://github.com/hpdeifel/hlwm-haskell";
        description = "Bindings to the herbstluftwm window manager";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107839,7 +103845,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath hmt process split
        ];
-       homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107859,7 +103864,6 @@ self: {
          base bytestring random safe tokyocabinet-haskell utf8-string
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://bitcheese.net/wiki/code/hmark";
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107894,7 +103898,6 @@ self: {
          storable-complex vector
        ];
        librarySystemDepends = [ openblasCompat ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openblasCompat;};
@@ -107914,7 +103917,6 @@ self: {
          storable-complex vector
        ];
        librarySystemDepends = [ openblasCompat ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numeric Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107939,13 +103941,12 @@ self: {
          backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
          microlens microlens-platform vector-sized
        ];
-       homepage = "https://github.com/mstksg/hmatrix-backprop#readme";
        description = "hmatrix operations lifted for backprop";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hmatrix-backprop_0_1_2_1" = callPackage
+  "hmatrix-backprop_0_1_2_2" = callPackage
     ({ mkDerivation, backprop, base, finite-typelits
      , ghc-typelits-knownnat, ghc-typelits-natnormalise, hedgehog
      , hmatrix, hmatrix-vector-sized, microlens, microlens-platform
@@ -107953,18 +103954,16 @@ self: {
      }:
      mkDerivation {
        pname = "hmatrix-backprop";
-       version = "0.1.2.1";
-       sha256 = "0qcm2hkdh50xgvxhs6nr303h0gs1x9apiklgnk8xjzgibsy8vb1n";
+       version = "0.1.2.2";
+       sha256 = "130lby9nx21mcn85qy86xgmzjm9qyb98b0fhgafkyr2fgfnnqphj";
        libraryHaskellDepends = [
-         backprop base finite-typelits ghc-typelits-knownnat
-         ghc-typelits-natnormalise hmatrix hmatrix-vector-sized microlens
-         vector vector-sized
+         backprop base ghc-typelits-knownnat ghc-typelits-natnormalise
+         hmatrix hmatrix-vector-sized microlens vector vector-sized
        ];
        testHaskellDepends = [
          backprop base finite-typelits hedgehog hmatrix hmatrix-vector-sized
          microlens microlens-platform vector-sized
        ];
-       homepage = "https://github.com/mstksg/hmatrix-backprop#readme";
        description = "hmatrix operations lifted for backprop";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107978,7 +103977,6 @@ self: {
        sha256 = "0civscp7bqqcdfnz33ypg86ly98d42f1jhyz3fyi667g9rfq4fyb";
        libraryHaskellDepends = [ base hmatrix transformers ];
        librarySystemDepends = [ liblapack ];
-       homepage = "http://hub.darcs.net/thielema/hmatrix-banded/";
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -107991,7 +103989,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0cbnxzl9ymqnyrikwk13d660l3hmi4ln5zdx0q814k8b7hyvsnkb";
        libraryHaskellDepends = [ base bytestring cassava hmatrix vector ];
-       homepage = "https://github.com/grtlr/hmatrix-csv";
        description = "CSV encoding and decoding for hmatrix";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108004,7 +104001,6 @@ self: {
        sha256 = "1rbbzz1jc9r7blbqd37jb8f054xfk521q54b3srz3k34nkp05yb1";
        libraryHaskellDepends = [ base containers hmatrix ];
        librarySystemDepends = [ glpk ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Linear Programming based on GLPK";
        license = stdenv.lib.licenses.gpl3;
      }) {inherit (pkgs) glpk;};
@@ -108020,7 +104016,6 @@ self: {
          array base hmatrix process random vector
        ];
        libraryPkgconfigDepends = [ gsl ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = "GPL";
      }) {inherit (pkgs) gsl;};
@@ -108036,7 +104031,6 @@ self: {
          array base hmatrix process random vector
        ];
        libraryPkgconfigDepends = [ gsl ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Numerical computation";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108054,7 +104048,6 @@ self: {
          base binary hmatrix storable-complex vector
        ];
        libraryPkgconfigDepends = [ gsl ];
-       homepage = "http://code.haskell.org/hmatrix-gsl-stats";
        description = "GSL Statistics interface";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gsl;};
@@ -108066,7 +104059,6 @@ self: {
        version = "0.0.5";
        sha256 = "03z1f1xqw4hqh41q6hh8p103cl7dg9hqcawqlinapfmkvw5mzy8d";
        libraryHaskellDepends = [ base hmatrix mmap ];
-       homepage = "http://github.com/alanfalloon/hmatrix-mmap";
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108088,7 +104080,6 @@ self: {
          test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion hmatrix ];
-       homepage = "https://github.com/Alexander-Ignatyev/morpheus/tree/master/hmatrix-morpheus";
        description = "Low-level machine learning auxiliary functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108103,7 +104094,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix ];
-       homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108117,7 +104107,6 @@ self: {
        sha256 = "1fgicpzi811ifdyrc8gzd8dgb0f14lw92rdidmbps3yisczysz29";
        libraryHaskellDepends = [ base hmatrix nlopt-haskell vector ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/peddie/hmatrix-nlopt";
        description = "Interface HMatrix with the NLOPT minimizer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108143,7 +104132,6 @@ self: {
        version = "0.1.2.2";
        sha256 = "1gki1qp8gi8953iqq9i6nsxrjjgjqsq7q105icjp585f01la9hsi";
        libraryHaskellDepends = [ base hmatrix repa vector ];
-       homepage = "http://code.haskell.org/hmatrix-repa";
        description = "Adaptors for interoperability between hmatrix and repa";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108157,7 +104145,6 @@ self: {
        sha256 = "04h9vf4aayhmjnlk8wnf9mg3rfjx9n6dhnv49vpwv7j8c4qhbd4s";
        libraryHaskellDepends = [ base hmatrix ];
        librarySystemDepends = [ mkl_core mkl_intel mkl_sequential ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Sparse linear solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108170,7 +104157,6 @@ self: {
        version = "0.4.0.1";
        sha256 = "0kpcqdchi7ikzhqacy4rh4dxz3v37paxyb84wqa66sysb72wkabj";
        libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Interface to GSL special functions";
        license = "GPL";
      }) {};
@@ -108182,7 +104168,6 @@ self: {
        version = "0.19.0.0";
        sha256 = "1mywr61kr852sbff26n9x95kswx9l4ycbv6s68qsbkh02xzqq7qz";
        libraryHaskellDepends = [ base hmatrix hmatrix-gsl ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Interface to GSL special functions";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108199,7 +104184,6 @@ self: {
        libraryHaskellDepends = [
          array base haskell-src-meta hmatrix parsec template-haskell tfp
        ];
-       homepage = "http://code.haskell.org/hmatrix-static/";
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108223,7 +104207,6 @@ self: {
          inline-c lens plots template-haskell vector
        ];
        testSystemDepends = [ sundials_arkode ];
-       homepage = "https://github.com/idontgetoutmuch/hmatrix/tree/sundials";
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108240,7 +104223,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix vector ];
        testHaskellDepends = [ base hmatrix hspec QuickCheck vector ];
        benchmarkHaskellDepends = [ base criterion hmatrix vector ];
-       homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108256,7 +104238,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-exts haskell-src-meta hmatrix template-haskell
        ];
-       homepage = "http://github.com/reinerp/hmatrix-syntax";
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108275,7 +104256,6 @@ self: {
        ];
        testHaskellDepends = [ base HUnit QuickCheck random ];
        benchmarkHaskellDepends = [ base HUnit QuickCheck random ];
-       homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Tests for hmatrix";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108292,7 +104272,6 @@ self: {
        testHaskellDepends = [
          base ghc-typelits-knownnat hedgehog hmatrix vector vector-sized
        ];
-       homepage = "https://github.com/mstksg/hmatrix-vector-sized#readme";
        description = "Conversions between hmatrix and vector-sized types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108308,7 +104287,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring bytestring-lexing delimited-text parsec
        ];
-       homepage = "http://rd.slavepianos.org/t/hmeap";
        description = "Haskell Meapsoft Parser";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108329,7 +104307,6 @@ self: {
          array base bytestring bytestring-lexing delimited-text gnuplot
          hmatrix hmeap hosc hsc3 parsec
        ];
-       homepage = "http://slavepianos.org/rd/?t=hmeap-utils";
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108379,7 +104356,6 @@ self: {
        ];
        executableHaskellDepends = [ base probable vector ];
        testHaskellDepends = [ base HUnit vector ];
-       homepage = "https://github.com/masterdezign/hmep#readme";
        description = "HMEP Multi Expression Programming – a genetic programming variant";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108391,7 +104367,6 @@ self: {
        version = "0.2.2.1";
        sha256 = "15sf5jxr8nzbmn78bx971jic0ia51s8mrzdik2iqbgznairr30ay";
        libraryHaskellDepends = [ base stm ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Binding to the OS level MIDI services";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108411,7 +104386,6 @@ self: {
          base bytestring containers directory filepath mtl parsec pcre-light
          process unix
        ];
-       homepage = "http://www.github.com/mboes/hmk";
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108428,7 +104402,6 @@ self: {
        libraryHaskellDepends = [
          array base data-memocombinators list-extras logfloat
        ];
-       homepage = "https://github.com/mikeizbicki/hmm";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108447,7 +104420,6 @@ self: {
          array base containers deepseq explicit-exception hmatrix lazy-csv
          non-empty random semigroups transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/hmm-hmatrix";
        description = "Hidden Markov Models using HMatrix primitives";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108469,7 +104441,6 @@ self: {
          old-time pcre-light process unix zlib
        ];
        executableSystemDepends = [ ncurses ];
-       homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108484,7 +104455,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base integer-gmp ];
        librarySystemDepends = [ mpfr ];
-       homepage = "https://github.com/michalkonecny/hmpfr";
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mpfr;};
@@ -108505,7 +104475,6 @@ self: {
          directory fgl filepath lazy-csv logict modular-arithmetic
          multiset-comb parsec permutation primes random safe split text
        ];
-       homepage = "http://rd.slavepianos.org/t/hmt";
        description = "Haskell Music Theory";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108524,7 +104493,6 @@ self: {
          base cairo colour filepath hcg-minus hcg-minus-cairo hmt
          html-minimalist process xml
        ];
-       homepage = "http://rd.slavepianos.org/t/hmt-diagrams";
        description = "Haskell Music Theory Diagrams";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108574,7 +104542,6 @@ self: {
          vector
        ];
        testSystemDepends = [ netcdf ];
-       homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108637,7 +104604,6 @@ self: {
          optparse-applicative serialise template-haskell text time
          transformers unordered-containers
        ];
-       homepage = "https://github.com/haskell-nix/hnix#readme";
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108655,7 +104621,6 @@ self: {
          base binary bytestring hmatrix mwc-random random vector
          vector-binary-instances zlib
        ];
-       homepage = "http://github.com/alpmestan/hnn";
        description = "A reasonably fast and simple neural network library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108710,7 +104675,6 @@ self: {
        benchmarkHaskellDepends = [
          aeson attoparsec base criterion random text
        ];
-       homepage = "https://github.com/itkovian/hnormalise#readme";
        description = "Log message normalisation tool producing structured JSON messages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108729,7 +104693,6 @@ self: {
          base compdata containers mtl patch-combinators
        ];
        testHaskellDepends = [ base compdata patch-combinators ];
-       homepage = "https://github.com/emilaxelsson/ho-rewriting";
        description = "Generic rewrite rules with safe treatment of variables and binders";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108768,7 +104731,6 @@ self: {
          aeson base bytestring exceptions http-conduit http-types microlens
          text unordered-containers uri-bytestring uri-bytestring-aeson
        ];
-       homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108796,7 +104758,6 @@ self: {
        testHaskellDepends = [
          base containers gtk3 gtksourceview3 hspec mtl text
        ];
-       homepage = "http://svalaskevicius.github.io/hob/";
        description = "A source code editor aiming for the convenience of use";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108815,7 +104776,6 @@ self: {
        executableHaskellDepends = [
          base filemanip filepath fsnotify system-filepath text
        ];
-       homepage = "http://github.com/jhickner/hobbes";
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108853,7 +104813,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
        testSystemDepends = [ ocilib ];
-       homepage = "https://github.com/fpinsight/hocilib";
        description = "FFI binding to OCILIB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108896,7 +104855,6 @@ self: {
          network network-uri tasty tasty-golden tasty-hunit tasty-quickcheck
          tasty-smallcheck text unordered-containers
        ];
-       homepage = "https://github.com/awakesecurity/hocker#readme";
        description = "Interact with the docker registry and generate nix build instructions";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108919,7 +104877,6 @@ self: {
          time
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/jason-johnson/hodatime";
        description = "A fully featured date/time library based on Nodatime";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -108939,7 +104896,6 @@ self: {
          base exceptions hint mtl optparse-declarative regex-posix split
          text time
        ];
-       homepage = "http://github.com/tanakh/hoe";
        description = "hoe: Haskell One-liner Evaluator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -108987,7 +104943,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers HUnit mtl old-locale random time
        ];
-       homepage = "http://www.kfish.org/software/hogg/";
        description = "Library and tools to manipulate the Ogg container format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109030,7 +104985,6 @@ self: {
        libraryPkgconfigDepends = [ OGRE ];
        libraryToolDepends = [ cgen-hs grgen ];
        doHaddock = false;
-       homepage = "http://anttisalonen.github.com/hogre";
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109047,7 +105001,6 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hogre ];
        executableSystemDepends = [ OgreMain ];
-       homepage = "http://github.com/anttisalonen/hogre-examples";
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109178,7 +105131,6 @@ self: {
          tasty-quickcheck tasty-smallcheck
        ];
        doCheck = false;
-       homepage = "http://github.com/yogsototh/holy-project";
        description = "Start your Haskell project with cabal, git and tests";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109191,7 +105143,6 @@ self: {
        version = "0.1";
        sha256 = "1wm15bdz02sjgpz2n266xd50q3p6mncnv8mhimky6ps1kmzb5r6c";
        libraryHaskellDepends = [ base containers mtl QuickCheck ];
-       homepage = "http://www-users.cs.york.ac.uk/~ndm/homeomorphic/";
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109220,7 +105171,6 @@ self: {
        libraryHaskellDepends = [
          array base DirectSound haskell98 hommage
        ];
-       homepage = "substitut-fuer-feinmotorik/projects/haskellommage";
        description = "DirectSound extension (Windows) for the Hommage sound library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109234,7 +105184,6 @@ self: {
        sha256 = "1gc1qq7pxk2dnv6m84hlbjxl0afwh12qcqnjgjqja5k4xidn5jaw";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
-       homepage = "github.com/mikeizbicki/homoiconic";
        description = "Constructs FAlgebras from typeclasses, making Haskell functions homoiconic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109257,7 +105206,6 @@ self: {
        ];
        executableToolDepends = [ happy ];
        testHaskellDepends = [ base haskell-src-exts uniplate ];
-       homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109287,7 +105235,6 @@ self: {
        version = "1.3.0.0";
        sha256 = "102jw5j89amgvz3k3b05plpw9pjkhg1rjpjpcvpxq11x8mfdxyhf";
        libraryHaskellDepends = [ base ];
-       homepage = "https://lambda.xyz/honk/";
        description = "Cross-platform interface to the PC speaker";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -109306,7 +105253,6 @@ self: {
          aeson base bytestring Cabal directory filepath hoogle monad-loops
          mtl process yaml
        ];
-       homepage = "http://github.com/gilligan/hoobuddy";
        description = "Simple tool for fetching and merging hoogle data";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109320,7 +105266,6 @@ self: {
        sha256 = "0bi1knfp6h6x7rrw5gggiip0h7ynhw2ds7k2q2fynrhsg9jdp5qv";
        libraryHaskellDepends = [ array base FPretty ghc-prim ];
        testHaskellDepends = [ base ghc-prim ];
-       homepage = "http://ku-fpg.github.io/software/hood";
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -109344,7 +105289,6 @@ self: {
        version = "0.2.1";
        sha256 = "0iyi1zljywamfaqc0mbd1xw3gn1hq0lcdgx688rr8zliw23jix02";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://www.ittc.ku.edu/csdl/fpg/Hood";
        description = "Debugging by observing in place";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -109383,7 +105327,6 @@ self: {
          mtl
        ];
        executableHaskellDepends = [ base cmdargs hoodle-core ];
-       homepage = "http://ianwookim.org/hoodle";
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109433,7 +105376,6 @@ self: {
          unordered-containers uuid vector xournal-parser
        ];
        librarySystemDepends = [ libX11 libXi ];
-       homepage = "http://ianwookim.org/hoodle";
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109460,7 +105402,6 @@ self: {
          network-simple process pureMD5 resourcet text time transformers
          unordered-containers xournal-parser
        ];
-       homepage = "http://ianwookim.org/hoodle";
        description = "extra hoodle tools";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109479,7 +105420,6 @@ self: {
          attoparsec base bytestring containers directory either hoodle-types
          lens mtl strict text transformers xournal-types
        ];
-       homepage = "http://ianwookim.org/hoodle";
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109507,7 +105447,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs directory directory-tree filepath gtk3
        ];
-       homepage = "http://ianwookim.org/hoodle";
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109579,7 +105518,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testTarget = "--test-option=--no-net";
-       homepage = "http://hoogle.haskell.org/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109611,7 +105549,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testTarget = "--test-option=--no-net";
-       homepage = "http://hoogle.haskell.org/";
        description = "Haskell API Search";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -109631,7 +105568,6 @@ self: {
          base bytestring Cabal containers directory errors filepath hoogle
          optparse-applicative process temporary transformers
        ];
-       homepage = "http://github.com/bgamari/hoogle-index";
        description = "Easily generate Hoogle indices for installed packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109644,7 +105580,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0gwdqpml8kn8xxxaq628d4way29k2f31f5av49fx7qj150h5qs5b";
        libraryHaskellDepends = [ base directory process text ];
-       homepage = "https://github.com/ibotty/hooks-dir";
        description = "run executables in a directory as hooks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109664,7 +105599,6 @@ self: {
          base bytestring HsOpenSSL HsOpenSSL-x509-system network socks
        ];
        librarySystemDepends = [ openssl ];
-       homepage = "https://github.com/glguy/irc-core";
        description = "Abstraction over creating network connections with SOCKS5 and TLS";
        license = stdenv.lib.licenses.isc;
      }) {inherit (pkgs) openssl;};
@@ -109684,7 +105618,6 @@ self: {
          base containers filepath mtl parsec test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/haskell/hoopl";
        description = "A library to support dataflow analysis and optimization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109709,7 +105642,6 @@ self: {
          network-multicast old-locale old-time process regex-compat
          snap-core snap-server text time transformers unix xml
        ];
-       homepage = "https://bitbucket.org/pvdbrand/hoovie";
        description = "Haskell Media Server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109727,7 +105659,6 @@ self: {
        libraryPkgconfigDepends = [ opencc ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/MnO2/hopencc";
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109748,39 +105679,39 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/merijn/hopencl";
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {OpenCL = null;};
 
   "hopenpgp-tools" = callPackage
-    ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
-     , base, base16-bytestring, binary, binary-conduit, bytestring
-     , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
-     , directory, errors, fgl, graphviz, happy, hOpenPGP, http-client
+    ({ mkDerivation, aeson, alex, array, attoparsec, base
+     , base16-bytestring, binary, binary-conduit, bytestring, conduit
+     , conduit-extra, containers, crypto-pubkey, cryptohash, directory
+     , errors, fgl, graphviz, happy, hOpenPGP, http-client
      , http-client-tls, http-types, ixset-typed, lens, monad-loops
      , openpgp-asciiarmor, optparse-applicative, prettyprinter
-     , prettyprinter-ansi-terminal, resourcet, text, time
-     , time-locale-compat, transformers, unordered-containers, yaml
+     , prettyprinter-ansi-terminal, prettyprinter-convert-ansi-wl-pprint
+     , resourcet, text, time, time-locale-compat, transformers
+     , unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hopenpgp-tools";
-       version = "0.21";
-       sha256 = "0ks84gnr3wgca7h0nh8igiigp2y2vv9vrjng49fyrak8k8fw2ln3";
+       version = "0.21.1";
+       sha256 = "0zy7in5i65c4shrcy7vn1l3vapkc3vx14kl40961658iq8ja45wa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson ansi-wl-pprint array attoparsec base base16-bytestring binary
-         binary-conduit bytestring conduit conduit-extra containers
-         crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP
-         http-client http-client-tls http-types ixset-typed lens monad-loops
+         aeson array attoparsec base base16-bytestring binary binary-conduit
+         bytestring conduit conduit-extra containers crypto-pubkey
+         cryptohash directory errors fgl graphviz hOpenPGP http-client
+         http-client-tls http-types ixset-typed lens monad-loops
          openpgp-asciiarmor optparse-applicative prettyprinter
-         prettyprinter-ansi-terminal resourcet text time time-locale-compat
-         transformers unordered-containers yaml
+         prettyprinter-ansi-terminal prettyprinter-convert-ansi-wl-pprint
+         resourcet text time time-locale-compat transformers
+         unordered-containers yaml
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "https://salsa.debian.org/clint/hOpenPGP";
        description = "hOpenPGP-based command-line tools";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109798,7 +105729,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base doctest HUnit ];
-       homepage = "http://github.com/peti/hopenssl";
        description = "FFI Bindings to OpenSSL's EVP Digest Interface";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -109831,7 +105761,6 @@ self: {
          base erf exact-combinatorics hspec HUnit MonadRandom parallel
          QuickCheck random vector
        ];
-       homepage = "https://github.com/imperialhopfield/hopfield";
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109855,7 +105784,6 @@ self: {
          base matrix MonadRandom QuickCheck test-framework
          test-framework-quickcheck2 vector
        ];
-       homepage = "https://github.com/ajtulloch/hopfield-networks";
        description = "Hopfield Networks for unsupervised learning in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -109870,7 +105798,6 @@ self: {
        editedCabalFile = "116jns5im51sb9xiwpx308wz3pr67335633anrf8f704pz8vwjka";
        libraryHaskellDepends = [ base bytestring zlib ];
        testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
-       homepage = "https://github.com/ananthakumaran/hopfli";
        description = "Bidings to Google's Zopfli compression library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -109885,7 +105812,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src hoppy-generator hoppy-runtime
        ];
-       homepage = "http://khumba.net/projects/hoppy";
        description = "C++ FFI generator - Documentation";
        license = stdenv.lib.licenses.agpl3;
        maintainers = with stdenv.lib.maintainers; [ khumba ];
@@ -109902,7 +105828,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory filepath haskell-src mtl
        ];
-       homepage = "http://khumba.net/projects/hoppy";
        description = "C++ FFI generator - Code generator";
        license = stdenv.lib.licenses.agpl3;
        maintainers = with stdenv.lib.maintainers; [ khumba ];
@@ -109917,7 +105842,6 @@ self: {
        libraryHaskellDepends = [
          base Cabal containers directory filepath
        ];
-       homepage = "http://khumba.net/projects/hoppy";
        description = "C++ FFI generator - Runtime support";
        license = stdenv.lib.licenses.asl20;
        maintainers = with stdenv.lib.maintainers; [ khumba ];
@@ -109933,7 +105857,6 @@ self: {
        libraryHaskellDepends = [
          base filepath haskell-src hoppy-generator
        ];
-       homepage = "http://khumba.net/projects/hoppy";
        description = "C++ FFI generator - Standard library bindings";
        license = stdenv.lib.licenses.asl20;
        maintainers = with stdenv.lib.maintainers; [ khumba ];
@@ -109967,7 +105890,6 @@ self: {
          aeson attoparsec base bytestring containers deepseq directory
          filepath process QuickCheck text transformers vector
        ];
-       homepage = "http://akc.is/hops";
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -109988,7 +105910,6 @@ self: {
          array base bifunctors bytestring filepath mtl pretty readline void
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://github.com/valis/hoq";
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110008,7 +105929,6 @@ self: {
        testHaskellDepends = [
          base binary hspec QuickCheck time timezone-olson timezone-series
        ];
-       homepage = "https://github.com/ciez/hora";
        description = "date time";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -110020,7 +105940,6 @@ self: {
        version = "0.1.1";
        sha256 = "1qx27i0xlrgcrdzp6lc06skipj888cfdxwwfrd7fyig48jn3wyd4";
        libraryHaskellDepends = [ AC-Angle base time ];
-       homepage = "https://github.com/intractable/horizon";
        description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110042,7 +105961,6 @@ self: {
          base containers megaparsec text these uniplate wl-pprint-text
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
-       homepage = "https://github.com/cocreature/horname#readme";
        description = "Rename function definitions returned by SMT solvers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110061,7 +105979,6 @@ self: {
          base binary blaze-builder bytestring data-binary-ieee754 network
          time transformers
        ];
-       homepage = "http://rd.slavepianos.org/t/hosc";
        description = "Haskell Open Sound Control";
        license = "GPL";
      }) {};
@@ -110080,7 +105997,6 @@ self: {
          aeson attoparsec base bifunctors bytestring hosc json text
          transformers unordered-containers utf8-string vector
        ];
-       homepage = "http://rd.slavepianos.org/t/hosc-json";
        description = "Haskell Open Sound Control JSON Serialisation";
        license = "GPL";
      }) {};
@@ -110101,7 +106017,6 @@ self: {
          base bytestring cgi haskeline hosc hosc-json hsc3 json text
          transformers utf8-string websockets www-minus
        ];
-       homepage = "http://rd.slavepianos.org/?t=hosc-utils";
        description = "Haskell Open Sound Control Utilities";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110143,7 +106058,6 @@ self: {
        executableHaskellDepends = [
          attoparsec base bytestring data-default dns iproute network
        ];
-       homepage = "https://github.com/yihuang/hosts-server";
        description = "An dns server which is extremely easy to config";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110163,7 +106077,6 @@ self: {
          array base containers cpphs filemanip filepath Glob
          haskell-src-exts optparse-applicative split
        ];
-       homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110176,7 +106089,6 @@ self: {
        version = "0.1.9.13";
        sha256 = "1c614gvwypfqaj4gqsdimqq40i34w393vikq5hhy3d4qll2qp8hv";
        libraryHaskellDepends = [ base plugins ];
-       homepage = "https://github.com/mikeplus64/hotswap";
        description = "Simple code hotswapping";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110197,7 +106109,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring deepseq gauge mtl old-locale time
        ];
-       homepage = "https://github.com/vincenthz/hs-hourglass";
        description = "simple performant time related library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110209,7 +106120,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "188mw1z8n650y3qik98x2m70sr8q66x4l4pg34mirk6kg4mgzy37";
        libraryHaskellDepends = [ base hourglass parsec ];
-       homepage = "https://gitlab.com/doshitan/hourglass-fuzzy-parsing";
        description = "A small library for parsing more human friendly date/time formats";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110227,7 +106137,6 @@ self: {
        testHaskellDepends = [
          aeson base hourglass hspec hspec-expectations text
        ];
-       homepage = "https://github.com/psibi/hourglass-orphans#readme";
        description = "Orphan Aeson instances to hourglass";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110257,7 +106166,6 @@ self: {
          mockery mtl optparse-generic parsers process QuickCheck silently
          streaming-commons temporary text time trifecta unix
        ];
-       homepage = "https://github.com/fujimura/houseman#readme";
        description = "A Haskell implementation of Foreman";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110275,7 +106183,6 @@ self: {
          attoparsec base bytestring containers directory filepath network
          old-locale process time
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Heap profiling helper library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110298,7 +106205,6 @@ self: {
          network OpenGL parseargs process
        ];
        executableSystemDepends = [ freeglut libGL libGLU ];
-       homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110321,7 +106227,6 @@ self: {
          array base bytestring cairo containers directory filepath glade
          glib gtk gtkglext hp2any-core hp2any-graph OpenGL time
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "A utility to visualise and compare heap profiles";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110355,7 +106260,6 @@ self: {
          array attoparsec base containers filepath floatshow mtl
          optparse-applicative semigroups text
        ];
-       homepage = "https://code.mathr.co.uk/hp2pretty";
        description = "generate pretty graphs from heap profiles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110392,7 +106296,6 @@ self: {
          template-haskell temporary text transformers unordered-containers
          vector yaml
        ];
-       homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -110429,7 +106332,6 @@ self: {
          template-haskell temporary text transformers unordered-containers
          vector yaml
        ];
-       homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110462,7 +106364,6 @@ self: {
          directory filepath Glob hspec interpolate mockery pretty QuickCheck
          split temporary text unordered-containers vector yaml
        ];
-       homepage = "https://github.com/yamadapc/hpack-convert#readme";
        description = "Convert Cabal manifests into hpack's package.yamls";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110487,7 +106388,6 @@ self: {
          aeson base dhall dhall-json hpack hspec interpolate mockery text
          transformers trifecta
        ];
-       homepage = "https://github.com/sol/hpack-dhall#readme";
        description = "Dhall support for Hpack";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110506,7 +106406,6 @@ self: {
        executableHaskellDepends = [
          aeson base cmdargs filepath hpaco-lib strict utf8-string yaml
        ];
-       homepage = "https://bitbucket.org/tdammers/hpaco";
        description = "Modular template compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110525,7 +106424,6 @@ self: {
          aeson base bytestring containers data-variant file-embed filepath
          mtl parsec safe split strict transformers
        ];
-       homepage = "https://bitbucket.org/tdammers/hpaco";
        description = "Modular template compiler library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110548,7 +106446,6 @@ self: {
          filepath FindBin haskell-src-exts hint hint-server monad-loops mtl
          process time wx wxcore
        ];
-       homepage = "http://haskell.hpage.com";
        description = "A scrapbook for Haskell developers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110590,7 +106487,6 @@ self: {
          old-locale postgresql-simple process safe snap-app snap-core
          snap-server text time transformers utf8-string
        ];
-       homepage = "http://hpaste.org/";
        description = "Haskell paste web site";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110611,7 +106507,6 @@ self: {
          base bytestring directory filepath http-conduit http-types
          lifted-base network optparse-applicative process safe utf8-string
        ];
-       homepage = "http://github.com/parcs/hpasteit";
        description = "A command-line client for hpaste.org";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110675,7 +106570,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110704,7 +106598,6 @@ self: {
        libraryHaskellDepends = [ base bytestring interpolate pcre-heavy ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq hspec ];
-       homepage = "https://github.com/eckyputrady/hpc-threshold#readme";
        description = "Ensure the code coverage is above configured thresholds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110741,7 +106634,6 @@ self: {
          attoparsec base binary bytestring containers directory file-embed
          parsec text utf8-string zlib
        ];
-       homepage = "https://github.com/k16shikano/hpdft";
        description = "A tool for looking through PDF file using Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110756,7 +106648,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random ];
-       homepage = "https://darcs.alokat.org/hpg";
        description = "a simple password generator";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -110786,7 +106677,6 @@ self: {
          base containers directory doctest exceptions filepath hspec
          protolude QuickCheck
        ];
-       homepage = "https://github.com/quixoftic/hpio#readme";
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110803,7 +106693,6 @@ self: {
          base containers data-default haste-compiler haste-perch monads-tf
          transformers
        ];
-       homepage = "https://github.com/agocorona/hplayground";
        description = "monadic, reactive Formlets running in the Web browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110839,7 +106728,6 @@ self: {
          base ConfigFile directory filepath HaXml HDBC HDBC-sqlite3 hslogger
          MissingH mtl network old-time parsec process unix
        ];
-       homepage = "http://software.complete.org/hpodder";
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110861,7 +106749,6 @@ self: {
        ];
        executableHaskellDepends = [ base directory filepath time ];
        testHaskellDepends = [ base bytestring transformers ];
-       homepage = "https://github.com/acowley/hpp";
        description = "A Haskell pre-processor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -110891,7 +106778,6 @@ self: {
          test-framework-hunit text text-show time transformers-base
          unordered-containers vector
        ];
-       homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110916,7 +106802,6 @@ self: {
          base exceptions hpqtypes lifted-base log-base monad-control tasty
          tasty-hunit text transformers
        ];
-       homepage = "https://github.com/scrive/hpqtypes-extras";
        description = "Extra utilities for hpqtypes library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110945,7 +106830,6 @@ self: {
          protocol-buffers-descriptor utf8-string
        ];
        executableToolDepends = [ alex ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110975,7 +106859,6 @@ self: {
          protocol-buffers-fork utf8-string
        ];
        executableToolDepends = [ alex ];
-       homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -110989,7 +106872,6 @@ self: {
        sha256 = "0y819776sk97hdwf67x67289gdqmxn2g39l7ri0n8z8vdap5rq96";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath hcg-minus process ];
-       homepage = "http://rd.slavepianos.org/t/hps";
        description = "Haskell Postscript";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111006,7 +106888,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk hps ];
        executableHaskellDepends = [ base cairo gtk hps random ];
-       homepage = "http://slavepianos.org/rd/?t=hps-cairo";
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111019,7 +106900,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0w1yyrv4k7fi016084j4k1lh6jgxg5502r83zszr9cjc6rraj8fc";
        libraryHaskellDepends = [ base vector ];
-       homepage = "http://stathacking.com/hps-kmeans";
        description = "A nice implementation of the k-Means algorithm";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111033,7 +106913,6 @@ self: {
        sha256 = "04k9hdbc3ipn9z0qzzpm6xsiv0bkr1v48sfs2haapawd49bw7rhk";
        libraryHaskellDepends = [ array base bytestring parsec ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/ccasin/hpuz";
        description = "Haskell bindings for libpuz";
        license = "unknown";
      }) {};
@@ -111049,7 +106928,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring process process-extras
        ];
-       homepage = "https://github.com/davidlazar/hpygments";
        description = "Highlight source code using Pygments";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111066,7 +106944,6 @@ self: {
        executableHaskellDepends = [
          array base containers EEConfig GLUT OpenGL
        ];
-       homepage = "http://sourceforge.net/projects/hpylos/";
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111114,7 +106991,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/paulrzcz/hquantlib.git";
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111164,7 +107040,6 @@ self: {
          transformers-base
        ];
        testHaskellDepends = [ base hset transformers-base ];
-       homepage = "https://bitbucket.org/s9gf4ult/hreader";
        description = "Generalization of MonadReader and ReaderT using hset";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111180,7 +107055,6 @@ self: {
        libraryHaskellDepends = [
          base comonad hreader hset lens lens-action profunctors
        ];
-       homepage = "http://github.com/dredozubov/hreader-lens";
        description = "Optics for hreader package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -111194,7 +107068,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers ];
-       homepage = "http://github.com/Raynes/Hricket";
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111218,7 +107091,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/shmish111/hriemann";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111252,7 +107124,6 @@ self: {
        sha256 = "135bl4cjijq6mr485waz7aaxgkaji2fsdjhdy4v4756q6ahzcpwf";
        libraryHaskellDepends = [ base bytestring deepseq ];
        librarySystemDepends = [ GeoIP ];
-       homepage = "http://github.com/ozataman/hs-GeoIP";
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
        license = stdenv.lib.licenses.bsd3;
      }) {GeoIP = null;};
@@ -111264,7 +107135,6 @@ self: {
        version = "6.2.0.1";
        sha256 = "0c56sjgg82kjcg5rrplnyn7vf02ccsj3kkcbgc87zxlv0j880rjb";
        libraryHaskellDepends = [ base syb ];
-       homepage = "https://github.com/wilx/hs-bibutils";
        description = "Haskell bindings to bibutils, the bibliography conversion utilities";
        license = "GPL";
      }) {};
@@ -111286,7 +107156,6 @@ self: {
        testSystemDepends = [ libb2 ];
        benchmarkHaskellDepends = [ base bytestring criterion cryptohash ];
        benchmarkSystemDepends = [ libb2 ];
-       homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111308,7 +107177,6 @@ self: {
          base brotli bytestring QuickCheck quickcheck-instances
          tasty-quickcheck
        ];
-       homepage = "https://github.com/iand675/brotli#readme";
        description = "Compression and decompression in the brotli format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111323,7 +107191,6 @@ self: {
        version = "1.0";
        sha256 = "02dd7kli8nm01jxs0p8imqvbdr4yzqizi6bwyyr228p3wscbdsn8";
        libraryHaskellDepends = [ base bytestring gd random ];
-       homepage = "http://www.dankna.com/software/";
        description = "Generate images suitable for use as CAPTCHAs in online web-form security";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111369,7 +107236,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring bytestring-mmap directory filepath mtl
        ];
-       homepage = "http://github.com/adamsmasher/hs-cdb";
        description = "A library for reading CDB (Constant Database) files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111391,7 +107257,6 @@ self: {
        executableHaskellDepends = [
          base containers directory filepath megaparsec
        ];
-       homepage = "https://github.com/odanoburu/hs-conllu";
        description = "Conllu validating parser and utils";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -111421,7 +107286,6 @@ self: {
          interpolatedstring-perl6 MissingH neat-interpolation QuickCheck
          regex-tdfa template-haskell text time
        ];
-       homepage = "https://github.com/Wizek/hs-di#readme";
        description = "Dependency Injection library for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111456,7 +107320,6 @@ self: {
          aeson aeson-qq base bytestring hspec hspec-expectations-pretty-diff
          raw-strings-qq template-haskell text
        ];
-       homepage = "https://github.com/myfreeweb/hs-duktape";
        description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -111484,7 +107347,6 @@ self: {
        version = "0.3.4";
        sha256 = "0j52drd3pb6ssgngfqxdsvvjjnx11nsmxwjsin6cmbv0nifpyq51";
        libraryHaskellDepends = [ base bytestring haskell98 ];
-       homepage = "http://patch-tag.com/r/VasylPasternak/hs-ffmpeg";
        description = "Bindings to FFMPEG library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111499,7 +107361,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ fltk fltk_images ];
-       homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/";
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111524,7 +107385,6 @@ self: {
        sha256 = "0nmykgdzkqidxv51bhlcn4zax4zfw26s4l65z3a3405si2s5x459";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111606,7 +107466,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring HTTP network text
        ];
-       homepage = "http://patch-tag.com/r/Azel/hs-json-rpc";
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111634,7 +107493,6 @@ self: {
          diagrams-svg HUnit mtl parsec parsec-numbers QuickCheck random
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://deepakjois.github.com/hs-logo";
        description = "Logo interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111679,7 +107537,6 @@ self: {
        testHaskellDepends = [
          base bytestring either-unwrap hs-multihash hspec iproute sandi
        ];
-       homepage = "https://github.com/MatrixAI/hs-multiaddr#readme";
        description = "Multiaddr library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111727,7 +107584,6 @@ self: {
        version = "0.0.9.3";
        sha256 = "1xwdikiqy2dxyzr6wx51wy51vifsvshblx7kkhfqd7izjf87ww8f";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/elblake/hs-php-session";
        description = "PHP session and values serialization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111741,7 +107597,6 @@ self: {
        revision = "2";
        editedCabalFile = "1kj5lrv2a9mgzqbwkznpsgjgs5s9wnwrcsab2mykxpkm8f71nk81";
        libraryHaskellDepends = [ base data-default-class text ];
-       homepage = "https://github.com/trskop/hs-pkg-config";
        description = "Create pkg-config configuration files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111762,7 +107617,6 @@ self: {
          system-filepath text time transformers unordered-containers uuid
          zip-archive
        ];
-       homepage = "https://github.com/tazjin/hs-pkpass";
        description = "A library for Passbook pass creation & signing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111778,7 +107632,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/deech/hs-popen#readme";
        description = "Bindings to C pipe functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111811,7 +107664,6 @@ self: {
        executableHaskellDepends = [ base protolude ];
        executableSystemDepends = [ notifier ];
        testHaskellDepends = [ base protolude ];
-       homepage = "https://github.com/NoRedInk/hs-rs-notify#readme";
        description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111833,7 +107685,6 @@ self: {
        testHaskellDepends = [
          base containers hspec tasty tasty-hunit xml-conduit
        ];
-       homepage = "https://github.com/codygman/hs-scrape/";
        description = "Simple and easy web scraping and automation in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111850,7 +107701,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory network ];
        testHaskellDepends = [ base HUnit network temporary unix ];
-       homepage = "https://github.com/hiratara/hs-server-starter";
        description = "Write a server supporting Server::Starter's protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -111867,7 +107717,6 @@ self: {
        executableHaskellDepends = [
          base either safe safe-exceptions text turtle
        ];
-       homepage = "https://github.com/aiya000/hs-snowtify#README.md";
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111899,7 +107748,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base HTTP json mtl network pretty ];
-       homepage = "https://github.com/deepakjois/hs-twitterarchiver";
        description = "Commandline Twitter feed archiver";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111912,7 +107760,6 @@ self: {
        version = "0.1";
        sha256 = "0qb7gsbki3ciqddxp9j46rnx64vv622n2p9vidv1b000wbmmrz15";
        libraryHaskellDepends = [ base old-locale time ];
-       homepage = "http://qrcard.us/";
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111933,7 +107780,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers filepath tasty tasty-hunit temporary
        ];
-       homepage = "https://github.com/bitc/hs-watchman";
        description = "Client library for Facebook's Watchman tool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -111959,7 +107805,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion hastache random statistics
        ];
-       homepage = "https://github.com/tfausak/hs2048";
        description = "A 2048 clone in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -111983,7 +107828,6 @@ self: {
          base hspec hspec-dirstream system-filepath
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/vmchale/hs2ats#readme";
        description = "Create ATS types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112003,7 +107847,6 @@ self: {
        executableHaskellDepends = [
          array base containers directory filepath haskell-src mtl
        ];
-       homepage = "http://www.xanxys.net/hs2bf/";
        description = "Haskell to Brainfuck compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112022,7 +107865,6 @@ self: {
        executableHaskellDepends = [
          base directory haskell-src haskell-src-exts haskell98 split
        ];
-       homepage = "http://www.github.com/finnsson/hs2graphviz";
        description = "Generate graphviz-code from Haskell-code";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112037,7 +107879,6 @@ self: {
        revision = "2";
        editedCabalFile = "00jwlii1w8smc5b0hn8lhiynld3v35hr0fwizm07xq4ryzmn8cmb";
        libraryHaskellDepends = [ base directory filepath process unix ];
-       homepage = "http://github.com/YoshikuniJujo/hsConfigure/wiki";
        description = "By using this package, you can make application configurable";
        license = "LGPL";
      }) {};
@@ -112078,7 +107919,6 @@ self: {
        sha256 = "0zxmlyckp9c0i5s8vi62d3qvnilh8kl093ckqr7dchgmki4az7rp";
        libraryHaskellDepends = [ array base bytestring dlist mtl ];
        librarySystemDepends = [ xenctrl ];
-       homepage = "http://haskell.org/haskellwiki/HsXenCtrl";
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112128,7 +107968,6 @@ self: {
        testHaskellDepends = [
          base bytestring data-default-class hspec hspec-discover temporary
        ];
-       homepage = "https://github.com/jakubfijalkowski/hsass";
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112151,7 +107990,6 @@ self: {
          base bytestring data-default-class hspec hspec-discover temporary
          text
        ];
-       homepage = "https://github.com/jakubfijalkowski/hsass";
        description = "Integrating Sass into Haskell applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112319,7 +108157,6 @@ self: {
          directory filepath hashable hosc network process random safe split
          transformers vector
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3";
        description = "Haskell SuperCollider";
        license = "GPL";
      }) {};
@@ -112335,7 +108172,6 @@ self: {
        libraryHaskellDepends = [
          base filepath hmt hosc hsc3 hsc3-sf-hsndfile
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-auditor";
        description = "Haskell SuperCollider Auditor";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112349,7 +108185,6 @@ self: {
        sha256 = "1f62mfjssky7igbp1nx2zf1azbih76m65xydnf5akp8pim7nzmis";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ];
-       homepage = "http://rd.slavepianos.org/?t=hsc3-cairo";
        description = "haskell supercollider cairo drawing";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112368,7 +108203,6 @@ self: {
          base bifunctors Glob hcg-minus hmt hsc3-lang hsc3-plot
          hsc3-sf-hsndfile safe split SVGPath xml
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-data";
        description = "haskell supercollider data";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112382,7 +108216,6 @@ self: {
        sha256 = "0sj3hq0d8dl4m6fn75lvyr78sg283p6y13lg8yi2yrgz74kn4zbl";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 safe ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-db";
        description = "Haskell SuperCollider Unit Generator Database";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112396,7 +108229,6 @@ self: {
        sha256 = "0jz3x6s6svgil1cyalq4xkv09s55d8r44cc2ksp0npmgpmp3x454";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-dot";
        description = "haskell supercollider graph drawing";
        license = "GPL";
      }) {};
@@ -112416,7 +108248,6 @@ self: {
          base containers directory filepath hashable hosc hsc3 hsc3-db
          hsc3-dot mtl unix
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-forth";
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112442,7 +108273,6 @@ self: {
          random-shuffle sc3-rdu she split
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-graphs";
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112464,7 +108294,6 @@ self: {
          data-ordlist dlist hashable hmatrix-special hosc hsc3 MonadRandom
          random random-shuffle split transformers vector
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-lang";
        description = "Haskell SuperCollider Language";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112485,7 +108314,6 @@ self: {
          base containers directory filepath hashable hosc hsc3 hsc3-dot
          husk-scheme mtl safe unix
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-lisp";
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112504,7 +108332,6 @@ self: {
          base directory filepath hosc hsc3 hsc3-lang process split
          statistics vector
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-plot";
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112525,7 +108352,6 @@ self: {
          base bytestring containers data-default directory filepath hosc
          hsc3 process time time-compat transformers
        ];
-       homepage = "https://github.com/kaoskorobase/hsc3-process";
        description = "Create and control scsynth processes";
        license = "GPL";
      }) {};
@@ -112538,7 +108364,6 @@ self: {
        sha256 = "0m814vr41i0mm0c001vbih9i93048niljv3z8czaz32wysa8xpfl";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 ];
-       homepage = "http://rd.slavepianos.org/?t=hsc3-rec";
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112557,7 +108382,6 @@ self: {
          base directory haskell-src-exts parsec polyparse split syb
          transformers
        ];
-       homepage = "http://rd.slavepianos.org/?t=hsc3-rw";
        description = "hsc3 re-writing";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112585,7 +108409,6 @@ self: {
          base failure QuickCheck random test-framework
          test-framework-quickcheck2 transformers
        ];
-       homepage = "https://github.com/kaoskorobase/hsc3-server";
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112599,7 +108422,6 @@ self: {
        sha256 = "1dg3gqhvi2rshfqnw7i89bd4bvqjvbk4f9g17x18swyrvgkz9wr7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring hosc ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-sf";
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112617,7 +108439,6 @@ self: {
        libraryHaskellDepends = [
          array base hsc3-sf hsndfile hsndfile-vector vector
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-sf-hsndfile";
        description = "Haskell SuperCollider SoundFile";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112631,7 +108452,6 @@ self: {
        sha256 = "0kywqx7x10hqzhq8by0f62aznrnq4y3013cxkccx1r0naajpz3yj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 ];
-       homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe";
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112654,7 +108474,6 @@ self: {
        executableHaskellDepends = [
          base filepath hsc3 hsc3-dot hsc3-rw process
        ];
-       homepage = "http://rd.slavepianos.org/t/hsc3-utils";
        description = "Haskell SuperCollider Utilities";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112682,7 +108501,6 @@ self: {
          base directory exceptions filepath hspec mtl QuickCheck
          regex-compat temporary text transformers unix
        ];
-       homepage = "https://github.com/yamadapc/hscaffold#readme";
        description = "Very simple file/directory structure scaffolding writer monad EDSL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112715,7 +108533,6 @@ self: {
          base bytestring cassandra-thrift containers mtl network old-time
          Thrift
        ];
-       homepage = "https://github.com/necrobious/hscassandra";
        description = "cassandra database interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112731,7 +108548,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
        executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ];
-       homepage = "https://bitbucket.org/sebasmagri/hscd";
        description = "Command line client and library for SoundCloud.com";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112760,7 +108576,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cairo glib gtk old-time ];
-       homepage = "http://haskell.org/gtk2hs/archives/2006/01/26/cairo-eye-candy/";
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112777,7 +108592,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
-       homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "LGPL";
      }) {};
@@ -112800,7 +108614,6 @@ self: {
        testHaskellDepends = [
          base directory mtl process test-simple Unixutils
        ];
-       homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112815,7 +108628,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory process time ];
-       homepage = "http://hub.darcs.net/dino/hscrtmpl";
        description = "Haskell shell script template";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -112835,7 +108647,6 @@ self: {
        ];
        executableHaskellDepends = [ base criterion ];
        testHaskellDepends = [ base containers text ];
-       homepage = "https://github.com/crabmusket/hscuid";
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -112853,7 +108664,6 @@ self: {
        libraryHaskellDepends = [
          base exceptions mtl old-locale old-time unix
        ];
-       homepage = "https://github.com/skogsbaer/hscurses";
        description = "NCurses bindings for Haskell";
        license = "LGPL";
      }) {};
@@ -112867,7 +108677,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hscurses random safe unix ];
-       homepage = "http://hub.darcs.net/dino/hscurses-fish-ex";
        description = "hscurses swimming fish example";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -112910,7 +108719,6 @@ self: {
          aeson aeson-lens async base containers data-default deepseq
          directory filepath hformat hspec lens mtl text
        ];
-       homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112924,7 +108732,6 @@ self: {
        sha256 = "1wxms6z8mpyf4l1qqxi6gvscls3mwlj5aq6g3ldashzrmb7pcimm";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring hosc ];
-       homepage = "http://rd.slavepianos.org/?t=hsdif";
        description = "Haskell SDIF";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112940,7 +108747,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo containers HUnit parsec ];
-       homepage = "http://neugierig.org/software/darcs/hsdip/";
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112956,7 +108762,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers network ];
        librarySystemDepends = [ adns ];
-       homepage = "http://github.com/peti/hsdns";
        description = "Asynchronous DNS Resolver";
        license = stdenv.lib.licenses.lgpl3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -112973,7 +108778,6 @@ self: {
        libraryHaskellDepends = [
          base hsdns network SafeSemaphore text time unordered-containers
        ];
-       homepage = "https://github.com/bazqux/hsdns-cache";
        description = "Caching asynchronous DNS resolver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113002,7 +108806,6 @@ self: {
          aeson base bytestring http-client http-types text time transformers
          unordered-containers
        ];
-       homepage = "https://github.com/creichert/hsebaysdk";
        description = "Haskell eBay SDK";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113015,7 +108818,6 @@ self: {
        sha256 = "1nd8pzsdan6zxddm96xswcm67g43zkbj1rm3m3wx3as4jj3qmw7m";
        libraryHaskellDepends = [ base mtl old-time parsec ];
        testHaskellDepends = [ base doctest hspec mtl old-time parsec ];
-       homepage = "https://github.com/peti/hsemail#readme";
        description = "Parsec parsers for the RFC2822 Internet Message format";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -113029,7 +108831,6 @@ self: {
        sha256 = "01vnlcv5gj7zj33b6m8mc4n6n8d15casywgicn1lr699hkh287hg";
        libraryHaskellDepends = [ base mtl old-time parsec ];
        testHaskellDepends = [ base doctest hspec old-time parsec ];
-       homepage = "https://github.com/phlummox/hsemail-ns/tree/hsemail-ns";
        description = "Internet Message Parsers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113050,7 +108851,6 @@ self: {
          base bytestring Cabal directory file-embed filepath http-streams
          io-streams mtl process safe split unix
        ];
-       homepage = "https://github.com/tmhedberg/hsenv";
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113065,7 +108865,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs wai-app-static warp ];
-       homepage = "http://github.com/rejuvyesh/hserv";
        description = "Simple http server in haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -113078,7 +108877,6 @@ self: {
        sha256 = "0c7i1c2gdj1j3igfmyl3mhv2z875km7k6yjfh75a5b5f4q47lx5q";
        libraryHaskellDepends = [ base deepseq tagged type-fun ];
        testHaskellDepends = [ base HUnit tagged ];
-       homepage = "https://bitbucket.org/s9gf4ult/hset";
        description = "Primitive list with elements of unique types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113097,7 +108895,6 @@ self: {
        testHaskellDepends = [
          base binary bytestring containers hspec HUnit iconv text time
        ];
-       homepage = "https://github.com/emmanueltouzery/hsexif";
        description = "EXIF handling library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113109,7 +108906,6 @@ self: {
        version = "0.2.1";
        sha256 = "1j7pny0yjpx5qw2d9br723dyic4v09k1qbvrham57p9qxn9m5b0q";
        libraryHaskellDepends = [ base containers language-puppet text ];
-       homepage = "http://lpuppet.banquise.net";
        description = "A small and ugly library that emulates the output of the puppet facter program";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113126,7 +108922,6 @@ self: {
        executableHaskellDepends = [
          base hdaemonize hslogger network process
        ];
-       homepage = "https://github.com/Yuras/hsfcsh";
        description = "Incremental builder for flash";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113154,7 +108949,6 @@ self: {
        sha256 = "1nd3z8kb4qjaj0hic9b305c15a7g6sfx6dixz8pspvqg1x84cjnm";
        libraryHaskellDepends = [ base bytestring mtl old-time ];
        librarySystemDepends = [ gcrypt gnutls ];
-       homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113168,7 +108962,6 @@ self: {
        sha256 = "05dn7kvjxk2pnzv040hyw71nvr83jvdvajq4a9v76kcyjhhwiv0w";
        libraryHaskellDepends = [ base bytestring mtl old-time ];
        librarySystemDepends = [ gcrypt gnutls ];
-       homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113200,7 +108993,6 @@ self: {
        executableHaskellDepends = [
          ansi-terminal base containers directory haskeline mtl
        ];
-       homepage = "http://www.mlesniak.com/haskell/gettings-things-done-in-haskell/";
        description = "Console-based gettings-things-done application";
        license = "GPL";
      }) {};
@@ -113212,7 +109004,6 @@ self: {
        version = "0.14";
        sha256 = "1mzi074iiz48pcy6rvgqz6ckm0zx115kmvax60bx9bfcanw686vf";
        libraryHaskellDepends = [ base xml ];
-       homepage = "http://rd.slavepianos.org/?t=hsharc";
        description = "Haskell SHARC bindings";
        license = "GPL";
      }) {};
@@ -113232,7 +109023,6 @@ self: {
        ];
        librarySystemDepends = [ blas liblapack ];
        libraryPkgconfigDepends = [ gsl ];
-       homepage = "http://code.haskell.org/hsignal";
        description = "Signal processing and EEG data analysis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113251,7 +109041,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath haskeline xdg-basedir
        ];
-       homepage = "https://github.com/Rnhmjoj/hsilop";
        description = "RPN calculator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -113335,7 +109124,6 @@ self: {
        executableHaskellDepends = [
          base Cabal directory filepath process unix
        ];
-       homepage = "http://code.haskell.org/~arossato/hslackbuilder";
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113383,7 +109171,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
-       homepage = "http://software.complete.org/hslogger";
        description = "Versatile logging framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113402,7 +109189,6 @@ self: {
        executableHaskellDepends = [
          attoparsec base hslogger optparse-applicative text text-icu time
        ];
-       homepage = "http://github.com/prophet-on-that/hslogger-reader";
        description = "Parsing hslogger-produced logs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113427,7 +109213,6 @@ self: {
        sha256 = "0mypcdj8npygj9g8d276rhr2wagk96zc4rjimwx2ylw4qm0scv5n";
        libraryHaskellDepends = [ hslogger ];
        doHaddock = false;
-       homepage = "http://hslogger4j.googlecode.com/";
        description = "DEPRECATED hslogger handlers for log4j's XMLLayout";
        license = "LGPL";
      }) {};
@@ -113454,7 +109239,6 @@ self: {
        testHaskellDepends = [
          base conduit hspec QuickCheck split stm transformers
        ];
-       homepage = "https://github.com/bartavelle/hslogstash";
        description = "A library to work with, or as, a logstash server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113501,7 +109285,6 @@ self: {
          aeson base hashable hslua hspec HUnit ieee754 QuickCheck
          quickcheck-instances scientific text unordered-containers vector
        ];
-       homepage = "https://github.com/tarleb/hslua-aeson#readme";
        description = "Allow aeson data types to be used with lua";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -113516,7 +109299,6 @@ self: {
        editedCabalFile = "0vajlsd7y6pwa08635q0cx8z5c1c55bk7fvavw7g2vmyvxqjzx6n";
        libraryHaskellDepends = [ base hslua text ];
        testHaskellDepends = [ base hslua tasty tasty-hunit text ];
-       homepage = "https://github.com/hslua/hslua-module-test";
        description = "Lua module for text";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -113553,7 +109335,6 @@ self: {
        libraryPkgconfigDepends = [
          freetype2 GraphicsMagick lcms libxml2
        ];
-       homepage = "https://github.com/vincentg/hsmagick";
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113575,7 +109356,6 @@ self: {
          base containers mtl old-locale parsec time
        ];
        testHaskellDepends = [ base containers HUnit mtl ];
-       homepage = "http://hub.darcs.net/dino/hsmisc";
        description = "A collection of miscellaneous modules";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113593,7 +109373,6 @@ self: {
        executableHaskellDepends = [
          base containers directory hpack protolude text
        ];
-       homepage = "https://github.com/mwotton/scriptable/#hsmodetweaks";
        description = "Tool for generating .dir-locals.el for intero";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113606,7 +109385,6 @@ self: {
        version = "1.0";
        sha256 = "08gbrwrc85in34nrgjm0zr5sjz2zbjc7hk2zlpvk1dq8x62a6wsg";
        libraryHaskellDepends = [ array base directory network old-time ];
-       homepage = "http://code.google.com/p/hsmtpclient/";
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113621,7 +109399,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ libsndfile ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) libsndfile;};
@@ -113633,7 +109410,6 @@ self: {
        version = "0.5.2";
        sha256 = "1n7jw14pnixiv1z50lb7yzwyyl3yd3gdfg5w0gx0m52pnmqiav9z";
        libraryHaskellDepends = [ base hsndfile storablevector ];
-       homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
        license = stdenv.lib.licenses.lgpl2;
      }) {};
@@ -113645,7 +109421,6 @@ self: {
        version = "0.5.2";
        sha256 = "1598bf87llbiri1qh8zirhbsd94c9vhd41lf9vialqrykbmi3zig";
        libraryHaskellDepends = [ base hsndfile vector ];
-       homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.Vector interface)";
        license = stdenv.lib.licenses.lgpl2;
      }) {};
@@ -113667,7 +109442,6 @@ self: {
          base HUnit parsec QuickCheck readline test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mrdomino/hsnock/";
        description = "Nock 5K interpreter";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113680,7 +109454,6 @@ self: {
        version = "0.0.2";
        sha256 = "0f8xpmzmg71l7qn1vjvzncsx8r7vfpzvlnlq0029ixf64gshbmzl";
        libraryHaskellDepends = [ base vector ];
-       homepage = "https://github.com/colinhect/hsnoise";
        description = "A coherent 3d noise library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113713,7 +109486,6 @@ self: {
          hostname hslogger mtl network pipes pipes-attoparsec pipes-network
          stm stm-chans text
        ];
-       homepage = "https://github.com/gamelost/hsnsq";
        description = "Haskell NSQ client";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113731,7 +109503,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base mtl network old-time random ];
        executableHaskellDepends = [ unix ];
-       homepage = "http://www.cs.helsinki.fi/u/ekarttun/util/";
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113757,7 +109528,6 @@ self: {
          regex-posix test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/josercruz01/hsoptions";
        description = "Haskell library that supports command-line flag processing";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113797,7 +109567,6 @@ self: {
          QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text
          time wai
        ];
-       homepage = "https://github.com/rvl/hsoz";
        description = "Iron, Hawk, Oz: Web auth protocols";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113810,7 +109579,6 @@ self: {
        version = "0.10.0";
        sha256 = "1ayfywgrlmzivsq6lirmgvl65x1shf8041lzw2yh245rkmd91lsf";
        libraryHaskellDepends = [ base mtl text ];
-       homepage = "http://hub.darcs.net/nibro/hsp";
        description = "Haskell Server Pages is a library for writing dynamic server-side web pages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113822,7 +109590,6 @@ self: {
        version = "0.4.4";
        sha256 = "0m1xylqzmi2c1c92zk5bq6232id9fmjlx4s88ic2fvf5a389n11n";
        libraryHaskellDepends = [ base containers harp hsp network ];
-       homepage = "http://code.google.com/p/hsp";
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113835,7 +109602,6 @@ self: {
        version = "0.1.0";
        sha256 = "10za4f07a5agg3zgy32fdz02vg9fl344qswhzj5mnx8wpnxmr3y6";
        libraryHaskellDepends = [ base bytestring dataenc gd ];
-       homepage = "http://www.jasani.org/search/label/hsparklines";
        description = "Sparklines for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113857,7 +109623,6 @@ self: {
          base containers http-types HUnit network-uri rdf4h test-framework
          test-framework-hunit text wai warp
        ];
-       homepage = "https://github.com/robstewart57/hsparql";
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113874,7 +109639,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring bytestring-lexing split utf8-string zlib
        ];
-       homepage = "http://rd.slavepianos.org/?t=hspear";
        description = "Haskell Spear Parser";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113898,7 +109662,6 @@ self: {
          hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
          transformers
        ];
-       homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -113921,7 +109684,6 @@ self: {
          hspec-expectations hspec-meta HUnit QuickCheck stringbuilder
          transformers
        ];
-       homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113941,7 +109703,6 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring hspec hspec-expectations text
        ];
-       homepage = "http://github.com/alpmestan/hspec-attoparsec";
        description = "Utility functions for testing your attoparsec parsers with hspec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -113968,7 +109729,6 @@ self: {
        editedCabalFile = "029h7dl49vlrhn62v8kgk8zdavjjc80ga1m8fwhl0pnmvnfkn7sq";
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
-       homepage = "http://hspec.github.io/";
        description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -113981,7 +109741,6 @@ self: {
        sha256 = "13579xdqwbsy8k0vxdcvgy932d4p76mij1rzkzbpqbspfn7399yv";
        libraryHaskellDepends = [ base hspec-core HUnit ];
        testHaskellDepends = [ base hspec hspec-core HUnit QuickCheck ];
-       homepage = "http://hspec.github.io/";
        description = "Contributed functionality for Hspec";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114009,7 +109768,6 @@ self: {
          transformers
        ];
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
-       homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114036,7 +109794,6 @@ self: {
          transformers
        ];
        testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
-       homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114056,7 +109813,6 @@ self: {
          system-filepath text
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://hub.darcs.net/vmchale/hspec-dirstream";
        description = "Helper functions to simplify adding integration tests";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114075,7 +109831,6 @@ self: {
        testHaskellDepends = [
          base directory filepath hspec-meta QuickCheck
        ];
-       homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114094,7 +109849,6 @@ self: {
        testHaskellDepends = [
          base directory filepath hspec-meta QuickCheck
        ];
-       homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114108,7 +109862,6 @@ self: {
        sha256 = "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1";
        libraryHaskellDepends = [ base call-stack HUnit ];
        testHaskellDepends = [ base call-stack HUnit nanospec ];
-       homepage = "https://github.com/hspec/hspec-expectations#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114125,7 +109878,6 @@ self: {
          base hspec hspec-expectations HUnit lens
        ];
        testHaskellDepends = [ base hspec lens silently ];
-       homepage = "http://supki.github.io/hspec-expectations-lens/";
        description = "Hspec expectations for the lens stuff";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -114153,7 +109905,6 @@ self: {
          base hspec-expectations template-haskell transformers-base
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/cjdev/hspec-expectations-match#readme";
        description = "An hspec expectation that asserts a value matches a pattern";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -114169,7 +109920,6 @@ self: {
        libraryHaskellDepends = [
          base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo
        ];
-       homepage = "https://github.com/hspec/hspec-expectations#readme";
        description = "hspec-expectations with pretty printing on failure";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114187,7 +109937,6 @@ self: {
          ansi-terminal base Diff hscolour HUnit nicify-lib text
        ];
        testHaskellDepends = [ aeson base hspec HUnit text ];
-       homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114222,7 +109971,6 @@ self: {
          aeson base directory hspec hspec-core QuickCheck
          quickcheck-arbitrary-adt silently transformers
        ];
-       homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme";
        description = "Use tests to monitor changes in Aeson serialization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114244,7 +109992,6 @@ self: {
          aeson base directory hspec hspec-core QuickCheck
          quickcheck-arbitrary-adt silently transformers
        ];
-       homepage = "https://github.com/plow-technologies/hspec-golden-aeson#readme";
        description = "Use tests to monitor changes in Aeson serialization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114262,7 +110009,6 @@ self: {
        testHaskellDepends = [
          base hashable hspec hspec-core QuickCheck silently
        ];
-       homepage = "https://github.com/plow-technologies/hspec-hashable#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114275,7 +110021,6 @@ self: {
        sha256 = "08689r0s7qkj7gkkz20z3qhka69b0lvvmcr3zg28yy5x7wgdbi9v";
        libraryHaskellDepends = [ base hedgehog hspec-core ];
        testHaskellDepends = [ base hedgehog hspec hspec-core ];
-       homepage = "https://github.com/erikd/hspec-hedgehog/";
        description = "Hedgehog support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114288,7 +110033,6 @@ self: {
        version = "0.1.1";
        sha256 = "16aql0fyssc16z85isskccq93dj5i1pydblnf2q1np7z6pl1azy2";
        libraryHaskellDepends = [ base blaze-markup hspec ];
-       homepage = "https://github.com/worksap-ate/hspec-jenkins";
        description = "Jenkins-friendly XML formatter for Hspec";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114318,7 +110062,6 @@ self: {
          base containers hspec-expectations megaparsec
        ];
        testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
-       homepage = "https://github.com/mrkkrp/hspec-megaparsec";
        description = "Utility functions for testing Megaparsec parsers with Hspec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114344,7 +110087,6 @@ self: {
          filepath hspec-expectations HUnit QuickCheck quickcheck-io random
          setenv time transformers
        ];
-       homepage = "http://hspec.github.io/";
        description = "A version of Hspec which is used to test Hspec itself";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114377,7 +110119,6 @@ self: {
          base hspec hspec-smallcheck QuickCheck smallcheck
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/marcellussiegburg/hspec-multicheck";
        description = "A testing framework for Haskell using Hspec";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -114394,7 +110135,6 @@ self: {
          base bytestring hspec pg-transact postgresql-simple resource-pool
          text tmp-postgres
        ];
-       homepage = "https://github.com/jfischoff/pg-transact-hspec#readme";
        description = "Helpers for creating database tests with hspec and pg-transact";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114443,7 +110183,6 @@ self: {
          filepath haskell-src-exts hspec language-dockerfile pretty process
          projectroot QuickCheck split strict
        ];
-       homepage = "https://github.com/yamadapc/haskell-hspec-setup";
        description = "Add an hspec test-suite in one command";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114469,7 +110208,6 @@ self: {
        sha256 = "1nvhvxqmvlkg7zjh0b59rfdjghcinal7ncf3l1jin21zrjcwzfhq";
        libraryHaskellDepends = [ base hspec mtl stm time transformers ];
        testHaskellDepends = [ base hspec mtl stm ];
-       homepage = "https://github.com/bobjflong/hspec-slow#readme";
        description = "Find slow test cases";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114488,7 +110226,6 @@ self: {
        testHaskellDepends = [
          base call-stack hspec hspec-core HUnit QuickCheck smallcheck
        ];
-       homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114508,7 +110245,6 @@ self: {
          base base-orphans call-stack hspec hspec-core HUnit QuickCheck
          smallcheck
        ];
-       homepage = "http://hspec.github.io/";
        description = "SmallCheck support for the Hspec testing framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114533,7 +110269,6 @@ self: {
          HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
          transformers
        ];
-       homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114546,7 +110281,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "1svdw7z92cxfflyahq1gn6kfb33p7pl4byqp5a4baj7b5gd18rqg";
        libraryHaskellDepends = [ base directory hspec safe strict ];
-       homepage = "https://github.com/mwotton/hspec-stack-rerun#readme";
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -114572,7 +110306,6 @@ self: {
        libraryHaskellDepends = [
          base hspec hspec-contrib hspec-core HUnit QuickCheck
        ];
-       homepage = "http://hspec.github.io/";
        description = "Run test-framework tests with Hspec";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114589,7 +110322,6 @@ self: {
          base hspec-test-framework language-haskell-extract template-haskell
        ];
        testHaskellDepends = [ base hspec-test-framework HUnit ];
-       homepage = "http://hspec.github.io/";
        description = "Run test-framework tests with Hspec";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114625,7 +110357,6 @@ self: {
          hspec-expectations http-types QuickCheck text transformers wai
          wai-extra
        ];
-       homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Experimental Hspec support for testing WAI applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114643,7 +110374,6 @@ self: {
          template-haskell
        ];
        testHaskellDepends = [ base hspec hspec-wai ];
-       homepage = "https://github.com/hspec/hspec-wai#readme";
        description = "Testing JSON APIs with hspec-wai";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114661,7 +110391,6 @@ self: {
          aeson base data-default hashable hspec hspec-core HUnit lifted-base
          stm text transformers unordered-containers webdriver
        ];
-       homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Write end2end web application tests using webdriver and hspec";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114675,7 +110404,6 @@ self: {
        revision = "1";
        editedCabalFile = "0zqh0f7d89aw3ib7mx2wlkpc166f3zipgka4m54y2shcz3rbl7nl";
        libraryHaskellDepends = [ base hspec hspec-discover ];
-       homepage = "http://hspec.github.io/";
        description = "Alpha version of Hspec 2.0";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -114687,7 +110415,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "0y45jizkf2kfj3yjjkq96kavkfp74vf5dyyjvi9pj3kshf8sx8il";
        libraryHaskellDepends = [ base hspec QuickCheckVariant ];
-       homepage = "https://github.com/sanjorgek/hspecVariant";
        description = "Spec for testing properties for variant types";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -114706,7 +110433,6 @@ self: {
          base base64-bytestring bytestring cipher-aes cprng-aes crypto-api
          RSA unix utf8-string
        ];
-       homepage = "https://github.com/denisenkom/hspkcs11";
        description = "Wrapper for PKCS #11 interface";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114719,7 +110445,6 @@ self: {
        version = "0.3";
        sha256 = "1qnqg2gg93l5dp2nyvvaq7n58gsnljvbafbhfpvys48g5ry2dk7a";
        libraryHaskellDepends = [ base old-time ];
-       homepage = "http://www.cs.chalmers.se/~d00nibro/hsp/";
        description = "Session handler for HSP";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -114864,7 +110589,6 @@ self: {
        testHaskellDepends = [
          base containers directory QuickCheck tagged text
        ];
-       homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114878,7 +110602,6 @@ self: {
        sha256 = "1v6wywky4sf8lx2g06b7nik5mpyyfngwblrmid1ki2bs9b47razv";
        libraryHaskellDepends = [ base hsqml template-haskell text ];
        libraryPkgconfigDepends = [ qt5 ];
-       homepage = "https://github.com/marcinmrotek/hsqml-datamodel";
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114895,7 +110618,6 @@ self: {
        libraryHaskellDepends = [
          base exceptions hsqml-datamodel type-list vinyl
        ];
-       homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl";
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114913,7 +110635,6 @@ self: {
        executableHaskellDepends = [
          base containers hsqml MonadRandom text
        ];
-       homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML-based clone of Pipe Mania";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114933,7 +110654,6 @@ self: {
        executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord text
        ];
-       homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114953,7 +110673,6 @@ self: {
        executableHaskellDepends = [
          base containers hsqml sqlite-simple text transformers
        ];
-       homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114969,7 +110688,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
-       homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114989,7 +110707,6 @@ self: {
        executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord tagged
        ];
-       homepage = "http://www.gekkou.co.uk/";
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115014,7 +110731,6 @@ self: {
          aeson base file-embed HUnit test-framework test-framework-hunit
          text
        ];
-       homepage = "http://github.com/rasendubi/hsreadability";
        description = "Access to the Readability API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115030,7 +110746,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring network utf8-string
        ];
-       homepage = "https://github.com/verrens/hsrelp";
        description = "RELP (Reliable Event Logging Protocol) server implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115057,7 +110772,6 @@ self: {
        sha256 = "0d66gsm7s2j4f60cjca6fsddg4i1m3l6rcyq29ywskifhfaxbgvx";
        libraryHaskellDepends = [ base directory parsec random unix ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://www.volker-wysk.de/hsshellscript/";
        description = "Haskell for Unix shell scripting tasks";
        license = "LGPL";
      }) {};
@@ -115094,7 +110808,6 @@ self: {
          base containers haskell-src-exts mtl parsec pretty pretty-show syb
          tasty tasty-hunit template-haskell text transformers uniplate
        ];
-       homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "SQL parser and type checker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115114,7 +110827,6 @@ self: {
        testHaskellDepends = [
          base hssqlppp syb tasty tasty-hunit template-haskell text
        ];
-       homepage = "http://jakewheat.github.com/hssqlppp/";
        description = "hssqlppp extras which need template-haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115131,7 +110843,6 @@ self: {
        libraryHaskellDepends = [
          array base hmatrix hmatrix-gsl-stats random vector
        ];
-       homepage = "http://code.haskell.org/hstatistics";
        description = "Statistics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115143,7 +110854,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "1a0rzbnbxd7r9b0ibs74nzijbdhj019wssdk1fls2r9i0w1v6i9h";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/haas/hstats";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115156,7 +110866,6 @@ self: {
        version = "0.1";
        sha256 = "092q52yyb1xdji1y72bdcgvp8by2w1z9j717sl1gmh2p89cpjrs4";
        libraryHaskellDepends = [ base bytestring mtl network text ];
-       homepage = "https://github.com/mokus0/hstatsd";
        description = "Quick and dirty statsd interface";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -115174,7 +110883,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath ghc ghc-paths HUnit mtl QuickCheck random
        ];
-       homepage = "http://bitbucket.org/dave4420/hstest/wiki/Home";
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115189,7 +110897,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell-src-exts ];
-       homepage = "http://code.haskell.org/~morrow/code/haskell/hstidy";
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115243,7 +110950,6 @@ self: {
        ];
        executableHaskellDepends = [ base process ];
        testHaskellDepends = [ async base ];
-       homepage = "http://hstox.github.io";
        description = "A Tox protocol implementation in Haskell";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115308,7 +111014,6 @@ self: {
          array base cairo containers directory filepath glade gtk hashable
          mtl parallel QuickCheck random unordered-containers vector xml
        ];
-       homepage = "http://www.dcc.fc.up.pt/~pbv/stuff/hstzaar";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115331,7 +111036,6 @@ self: {
          parallel-io regex-posix stringable svndump system-fileio
          system-filepath text text-format time transformers unix
        ];
-       homepage = "https://github.com/jwiegley/hsubconvert";
        description = "One-time, faithful conversion of Subversion repositories to Git";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115361,7 +111065,6 @@ self: {
          base bytestring gi-gtk HandsomeSoup haskell-gi-base hspec
          http-client http-client-tls hxt QuickCheck text
        ];
-       homepage = "https://github.com/marcelmoosbrugger/hsudoku";
        description = "Sudoku game with a GTK3 interface";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115411,7 +111114,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ];
-       homepage = "http://patch-tag.com/r/nibro/hsx";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115426,7 +111128,6 @@ self: {
        libraryHaskellDepends = [
          base hsp jmacro mtl text wl-pprint-text
        ];
-       homepage = "http://www.happstack.com/";
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115438,7 +111139,6 @@ self: {
        version = "0.4.4";
        sha256 = "1051fh4yjnsax60v4rfh5r87n660ygq033gmg710nm3gw57ihkl2";
        libraryHaskellDepends = [ base hsx mtl ];
-       homepage = "http://code.google.com/hsp";
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115458,7 +111158,6 @@ self: {
          base bytestring haskell-src-exts haskell-src-meta mtl
          template-haskell utf8-string
        ];
-       homepage = "https://github.com/seereason/hsx2hs";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115470,7 +111169,6 @@ self: {
        version = "0.4";
        sha256 = "0ysi317vwgksaq78k31sb8s34rjjhl4w8ncvycfsmmdnv7cdg2ld";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/aycanirican/hsyscall";
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115487,7 +111185,6 @@ self: {
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/peti/hsyslog";
        description = "FFI interface to syslog(3) from POSIX.1-2001";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -115504,7 +111201,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring hsyslog hsyslog-udp network text time
        ];
-       homepage = "https://github.com/osa1/hsyslog-tcp#readme";
        description = "syslog over TCP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115522,7 +111218,6 @@ self: {
          base bytestring hsyslog network text time unix
        ];
        testHaskellDepends = [ base hspec time ];
-       homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115554,7 +111249,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text transformers ];
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [ base directory filepath hspec ];
-       homepage = "https://github.com/mrkkrp/htaglib";
        description = "Bindings to TagLib, audio meta-data library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) taglib;};
@@ -115572,7 +111266,6 @@ self: {
        librarySystemDepends = [ taglib ];
        testHaskellDepends = [ base directory filepath hspec ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/mrkkrp/htaglib";
        description = "Bindings to TagLib, audio meta-data library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115618,7 +111311,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "18kgglc22k4v66hh9yf2qa7zx60ka2xl9bvzpinvc5v4zv0prl7l";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/ailrun/htaut#readme";
        description = "Tautology Proving Logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115634,7 +111326,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        libraryToolDepends = [ gcc ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/nkartashov/htestu";
        description = "A library for testing correctness of pseudo random number generators in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115692,7 +111383,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "18wbw6zfb424xq3m05hjxypiiaqc75nd365y9l8035dvi29mfbnf";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/kelemzol/htlset";
        description = "Heterogenous Set";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115725,7 +111415,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers hspec HUnit xml-conduit
        ];
-       homepage = "https://github.com/snoyberg/xml";
        description = "Parse HTML documents using xml-conduit datatypes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115747,7 +111436,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers hspec HUnit xml-conduit
        ];
-       homepage = "https://github.com/snoyberg/xml";
        description = "Parse HTML documents using xml-conduit datatypes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -115780,7 +111468,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base base-prelude text unordered-containers
        ];
-       homepage = "https://github.com/nikita-volkov/html-entities";
        description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115798,7 +111485,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion text unordered-containers
        ];
-       homepage = "https://github.com/mrkkrp/html-entity-map";
        description = "Map from HTML5 entity names to the corresponding Unicode text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115810,7 +111496,6 @@ self: {
        version = "0.2.1";
        sha256 = "1x72f3r6nayv03y0a7x5dyj2lnbli14nmqi5i7i8isqbngsvca0l";
        libraryHaskellDepends = [ base hxt kure ];
-       homepage = "www.ittc.ku.edu/csdl/fpg/software/html-kure";
        description = "HTML rewrite engine, using KURE";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115823,7 +111508,6 @@ self: {
        sha256 = "06qhjb8c1x9wab77g493bbqqm068alkc4vn7c6dj810gdgxwgw5j";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base xml ];
-       homepage = "http://rd.slavepianos.org/t/html-minimalist";
        description = "Minimalist haskell html library";
        license = "GPL";
      }) {};
@@ -115847,7 +111531,6 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base criterion deepseq tagsoup text
        ];
-       homepage = "http://github.com/bgamari/html-parse";
        description = "A high-performance HTML tokenizer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115859,7 +111542,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1k0jqx1mlcar6z8ggrz3fv1nzilkwdxvg3gvsb3pg7nvbkhz5lpw";
        libraryHaskellDepends = [ base lens mtl tagsoup transformers ];
-       homepage = "http://github.com/kylcarte/html-rules/";
        description = "Perform traversals of HTML structures using sets of rules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115883,7 +111565,6 @@ self: {
          attoparsec QuickCheck quickcheck-instances rerebase tasty
          tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/nikita-volkov/html-tokenizer";
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -115896,7 +111577,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "1d66kdg81774b8isw1mfkl54sgmaz0n04n6shd5jjz18sjwyxp14";
        libraryHaskellDepends = [ base tagsoup ];
-       homepage = "https://github.com/mruegenberg/html-truncate";
        description = "A HTML truncator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115916,7 +111596,6 @@ self: {
          base bytestring containers hamlet html-conduit http-conduit mtl
          optparse-declarative regex-tdfa text wl-pprint-text xml-conduit
        ];
-       homepage = "http://github.com/tanakh/html2hamlet";
        description = "HTML to Hamlet converter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115931,7 +111610,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers text ];
        benchmarkHaskellDepends = [ base containers criterion ];
-       homepage = "https://github.com/zudov/html5-entity/";
        description = "A library for looking up and validating HTML5 entities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115944,7 +111622,6 @@ self: {
        sha256 = "1r9wcy70sv7jk766yir2ixjwfd3skja7n8h8gan3nkbm3wb9rx0k";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
-       homepage = "https://github.com/y-kamiya/htn-haskell#readme";
        description = "resolver using htn algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115958,7 +111635,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base HDBC HDBC-sqlite3 ];
-       homepage = "http://github.com/pirapira/htodo";
        description = "A todo application";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115984,7 +111660,6 @@ self: {
          aeson base containers criterion parsec text time
          unordered-containers vector
        ];
-       homepage = "https://github.com/cies/htoml";
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -115997,8 +111672,8 @@ self: {
      }:
      mkDerivation {
        pname = "htoml-megaparsec";
-       version = "1.2.0.2";
-       sha256 = "0kqy3vfiira8bm0ipynwk2dny99llsw2gnvyh0rsdc0bphiwjh62";
+       version = "2.0.0.0";
+       sha256 = "0szpk1zszpvd0hs4jljjnlrr60159b33rqxhb1bgbbap2nxzxsgs";
        libraryHaskellDepends = [
          base composition-prelude containers deepseq megaparsec mtl text
          time unordered-containers vector
@@ -116008,7 +111683,7 @@ self: {
          tasty-hspec tasty-hunit text time unordered-containers vector
        ];
        benchmarkHaskellDepends = [ base criterion text ];
-       homepage = "https://hub.darcs.net/vmchale/htoml-megaparsec";
+       doHaddock = false;
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116032,7 +111707,6 @@ self: {
        sha256 = "0l09skjsds4p9kdwrwrxg8hdd1ja7m2zmggf23dfimzm1jsij6y2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hmt xml ];
-       homepage = "http://rd.slavepianos.org/t/hts";
        description = "Haskell Music Typesetting";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116111,7 +111785,6 @@ self: {
        version = "0.2";
        sha256 = "1ivwkwr9jgbf6m2dv4gaw5vxrz2vm5wzz65ncl5jpma6wimwh4ii";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/singpolyma/http-accept";
        description = "Functions for working with HTTP Accept headers";
        license = "unknown";
      }) {};
@@ -116138,7 +111811,6 @@ self: {
          quickcheck-instances text time unordered-containers uuid
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116165,7 +111837,6 @@ self: {
          quickcheck-instances text time unordered-containers uuid-types
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/fizruk/http-api-data";
        description = "Converting to/from HTTP API data like URL pieces, headers and query parameters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116178,7 +111849,6 @@ self: {
        version = "0.1.1";
        sha256 = "12l892fix11mrvm10awwvv31y59q5rb6gb0sqjp6l4p4ym9ngqa3";
        libraryHaskellDepends = [ attoparsec base bytestring http-types ];
-       homepage = "https://github.com/tlaitinen/http-attoparsec";
        description = "Attoparsec parsers for http-types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116209,7 +111879,6 @@ self: {
          network-uri streaming-commons text time transformers zlib
        ];
        doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116241,7 +111910,6 @@ self: {
        sha256 = "0k2vq9y7kfbkhcsszjr74ahq5nw5z7dbzjhw1ixbigcr56axsd19";
        libraryHaskellDepends = [ base http-client ];
        doHaddock = false;
-       homepage = "https://github.com/snoyberg/http-client";
        description = "Frontend support for using http-client with conduit (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116276,7 +111944,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-client http-types lens network
        ];
-       homepage = "http://github.com/reinh/http-client-lens";
        description = "Optics for http-client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116290,7 +111957,6 @@ self: {
        sha256 = "18za6s3658hgm95rrygghrz0b643c7nkzaimb14v2hv82w3k9crg";
        libraryHaskellDepends = [ base http-client ];
        doHaddock = false;
-       homepage = "https://github.com/snoyberg/http-client";
        description = "Generate multipart uploads for http-client. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116308,7 +111974,6 @@ self: {
          base HsOpenSSL hspec http-client http-types
        ];
        doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the OpenSSL library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116325,7 +111990,6 @@ self: {
          base bytestring exceptions http-client http-media http-types
          network network-uri
        ];
-       homepage = "https://github.com/spl/http-client-request-modifiers";
        description = "Convenient monadic HTTP request modifiers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116342,7 +112006,6 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring either http-client mtl-prelude
        ];
-       homepage = "https://github.com/sannsyn/http-client-session";
        description = "A simple abstraction over the \"http-client\" connection manager";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116385,7 +112048,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base gauge http-client ];
        doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
        description = "http-client backend using the connection package and tls library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116403,7 +112065,6 @@ self: {
          base base64-bytestring blaze-builder bytestring case-insensitive
          directory mtl network text transformers unordered-containers
        ];
-       homepage = "http://research.operationaldynamics.com/projects/http-streams/";
        description = "Common types for HTTP clients and servers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116433,7 +112094,6 @@ self: {
          wai-conduit warp warp-tls
        ];
        doCheck = false;
-       homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116463,7 +112123,6 @@ self: {
          wai-conduit warp warp-tls
        ];
        doCheck = false;
-       homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116490,7 +112149,6 @@ self: {
          http-conduit http-types HUnit lifted-base monad-control network
          resourcet text time transformers wai warp
        ];
-       homepage = "https://github.com/exbb2/http-conduit-browser";
        description = "Browser interface to the http-conduit package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116510,7 +112168,6 @@ self: {
          http-client http-conduit http-types lifted-base mtl network
          network-uri resourcet time zlib
        ];
-       homepage = "https://github.com/bazqux/http-conduit-downloader";
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116545,7 +112202,6 @@ self: {
          http-client-tls http-types
        ];
        testHaskellDepends = [ aeson base hspec ];
-       homepage = "http://github.com/owainlewis/http-dispatch#readme";
        description = "High level HTTP client for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116564,7 +112220,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
-       homepage = "http://github.com/achudnov/http-encodings";
        description = "A library for encoding and decoding bodies of HTTP messages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116589,7 +112244,6 @@ self: {
          http-types monad-control network tls tls-extra transformers
          utf8-string zlib-enum
        ];
-       homepage = "http://github.com/snoyberg/http-enumerator";
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116602,7 +112256,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1x073nw7fagbj16x42n7xgyr5liv69l0g4ig1f4adzdc9p997l27";
        libraryHaskellDepends = [ attoparsec base bytestring ];
-       homepage = "https://github.com/owensmurray/http-grammar";
        description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116626,7 +112279,6 @@ self: {
          base HUnit QuickCheck tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck text wai wai-extra
        ];
-       homepage = "http://github.com/tel/serv#readme";
        description = "Generic kinds and types for working with HTTP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116670,7 +112322,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion directory network-uri text transformers
        ];
-       homepage = "https://github.com/myfreeweb/http-link-header";
        description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\"";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -116688,7 +112339,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring exceptions HTTP network transformers
        ];
-       homepage = "http://rel4tion.org/projects/http-listen/";
        description = "Listen to HTTP requests and handle them in arbitrary ways";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -116711,7 +112361,6 @@ self: {
          base bytestring case-insensitive containers QuickCheck
          test-framework test-framework-quickcheck2 utf8-string
        ];
-       homepage = "https://github.com/zmthy/http-media";
        description = "Processing HTTP Content-Type and Accept headers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -116747,7 +112396,6 @@ self: {
          base bytestring exceptions network pipes pipes-network pipes-safe
          transformers
        ];
-       homepage = "https://github.com/nfjinjing/http-pony";
        description = "A type unsafe http library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116767,7 +112415,6 @@ self: {
          http-pony-transformer-http http-pony-transformer-startline
          http-types pipes pipes-bytestring pipes-safe transformers wai
        ];
-       homepage = "https://github.com/nfjinjing/http-pony-serve-wai";
        description = "Serve a WAI application with http-pony";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116780,7 +112427,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "14fbqw5bqsbyvr99g4bpk54n38mz2ilkyb6979rgdr2fpvzkv6rr";
        libraryHaskellDepends = [ base case-insensitive lens profunctors ];
-       homepage = "https://github.com/nfjinjing/http-pony-transformer-case-insensitive";
        description = "Tag http headers as case insensitive";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116836,7 +112482,6 @@ self: {
          http-conduit http-types network QuickCheck random resourcet text
          vault wai wai-conduit warp warp-tls
        ];
-       homepage = "https://github.com/erikd/http-proxy";
        description = "A library for writing HTTP and HTTPS proxies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116854,7 +112499,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers doctest hspec http-types QuickCheck
        ];
-       homepage = "https://github.com/worksap-ate/http-querystring";
        description = "The HTTP query builder";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116874,7 +112518,6 @@ self: {
          case-insensitive http-client http-types matcher profunctors text
          transformers unordered-containers
        ];
-       homepage = "https://github.com/sannsyn/http-response-decoder";
        description = "Declarative DSL for parsing an HTTP response";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116902,7 +112545,6 @@ self: {
          http-conduit http-types lifted-base network resourcet
          streaming-commons transformers wai warp
        ];
-       homepage = "https://github.com/fpco/http-reverse-proxy";
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116928,7 +112570,6 @@ self: {
          http-conduit http-types network resourcet streaming-commons
          transformers unliftio wai warp
        ];
-       homepage = "https://github.com/fpco/http-reverse-proxy";
        description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -116945,7 +112586,6 @@ self: {
        libraryHaskellDepends = [
          base HTTP mime network network-uri text unix url utf8-string
        ];
-       homepage = "https://github.com/GaloisInc/http-server";
        description = "A library for writing Haskell web servers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -116992,7 +112632,6 @@ self: {
          system-fileio system-filepath text transformers
          unordered-containers
        ];
-       homepage = "https://github.com/afcowie/http-streams/";
        description = "An HTTP client using io-streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117012,7 +112651,6 @@ self: {
          tasty-hunit text time wreq
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/openbrainsrc/http-test";
        description = "Test framework for HTTP APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117032,7 +112670,6 @@ self: {
          transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/sigrlami/http-trace#readme";
        description = "Tracking http redirects";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -117051,7 +112688,6 @@ self: {
        testHaskellDepends = [
          base bytestring doctest hspec QuickCheck quickcheck-instances text
        ];
-       homepage = "https://github.com/aristidb/http-types";
        description = "Generic HTTP types for Haskell (for both client and server code)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117063,7 +112699,6 @@ self: {
        version = "0.6.2.3";
        sha256 = "1sbg4gpx8ikaxb15wflm7fnjnkr32fj07bva62z54dsm630s37fx";
        libraryHaskellDepends = [ base failure process transformers ];
-       homepage = "http://github.com/snoyberg/http-wget/tree/master";
        description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117095,7 +112730,6 @@ self: {
          array base bytestring case-insensitive containers criterion
          hashtables heaps mwc-random psqueues stm
        ];
-       homepage = "https://github.com/kazu-yamamoto/http2";
        description = "HTTP/2 library including frames, priority queues and HPACK";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117119,7 +112753,6 @@ self: {
          time tls
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/lucasdicioccio/http2-client";
        description = "A native HTTP2 client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117157,7 +112790,6 @@ self: {
          https-everywhere-rules-raw lens network pipes string-conversions
          taggy-lens text text-icu
        ];
-       homepage = "https://github.com/fmap/https-everywhere-rules";
        description = "High-level access to HTTPS Everywhere rulesets";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117173,7 +112805,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath functor-infix text
        ];
-       homepage = "https://github.com/fmap/https-everywhere-rules-raw";
        description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117220,7 +112851,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base OpenGL random SDL ];
-       homepage = "http://tomahawkins.org";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117240,7 +112870,6 @@ self: {
          array base bytestring containers directory fgl filepath hexpat
          process regex-compat unix utf8-string
        ];
-       homepage = "http://justhub.org";
        description = "For multiplexing GHC installations and providing development sandboxes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117253,7 +112882,6 @@ self: {
        sha256 = "19mxblqy3bchhrk725x4kmpa9hidjzj0d0sqhx34smqw7v36x814";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers haxr mtl ];
-       homepage = "http://ooxo.org/hubigraph/";
        description = "A haskell wrap for Ubigraph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117299,7 +112927,6 @@ self: {
          base classy-prelude hedgehog megaparsec text time
          unordered-containers
        ];
-       homepage = "https://github.com/tmcgilchrist/huck";
        description = "huck";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117312,7 +112939,6 @@ self: {
        version = "0.10.0.2";
        sha256 = "0ajyqwnpdhby9h6skl3l0dys53ycnyq7y7r72ma7x0b5rdi3djd2";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mitsuji/huckleberry#readme";
        description = "Haskell IOT on Intel Edison and other Linux computers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117333,7 +112959,6 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/elliottt/huff";
        description = "A fast-foward-based planner";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117363,7 +112988,6 @@ self: {
          base containers directory filepath mtl parsec uniplate ycextra
          yhccore
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Hugs Front-end to Yhc Core";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117403,7 +113027,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0lr2m5gci1k0x7w1i49cb6nhbnnkym4raaagn916ahf79y05jv7d";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/chris-martin/human";
        description = "A lawless typeclass for parsing text entered by humans";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -117417,7 +113040,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://github.com/yogsototh/human-readable-duration#readme";
        description = "Provide duration helper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117429,7 +113051,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0v6wrs9mcmiwk9ladjcibw1yqpbbl0y6v9i3ni39v0byby0a2zpa";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/chris-martin/human";
        description = "A lawless typeclass for converting values to human-friendly text";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -117477,7 +113098,6 @@ self: {
          base containers directory filepath optparse-applicative parsec
          QuickCheck split
        ];
-       homepage = "https://github.com/loganbraga/hunch";
        description = "CSS-like syntax for file system manipulation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117490,7 +113110,6 @@ self: {
        version = "1.1.0.3";
        sha256 = "18zpvc77p0djay8d8lz3d6y7ppmdjk2cihakhlin7bqpzmyydkbl";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -117502,7 +113121,6 @@ self: {
        version = "1.2.0.1";
        sha256 = "1shkfbn14qfk9bjnrmdn3zz88718jb1m942idg2vl53yfj16ahy9";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117519,7 +113137,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ];
        executableHaskellDepends = [ base cairo gtk haskell98 HUnit ];
-       homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home";
        description = "A GUI testrunner for HUnit";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117544,7 +113161,6 @@ self: {
        sha256 = "1xj5f6l8nfanbf0xdwl2j2na45w5h0spi9a8pxqgpxx2rak145gs";
        libraryHaskellDepends = [ base HUnit rematch ];
        testHaskellDepends = [ base hspec HUnit rematch ];
-       homepage = "github.com/tcrayford/rematch";
        description = "HUnit support for rematch";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117564,7 +113180,6 @@ self: {
          base bytestring directory filepath monads-fd parsec pcre-light
          process split
        ];
-       homepage = "http://github.com/skorpan/hunp/tree/master";
        description = "Unpacker tool with DWIM";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117597,7 +113212,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time
        ];
-       homepage = "http://github.com/hunt-framework/";
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117622,7 +113236,6 @@ self: {
          http-types hunt-searchengine mtl scotty shakespeare-js text wai
          wai-extra wai-middleware-static warp
        ];
-       homepage = "http://github.com/hunt-framework";
        description = "A search and indexing engine server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117647,7 +113260,6 @@ self: {
          hunt-client hunt-searchengine mtl resourcet string-conversions text
          time transformers unordered-containers
        ];
-       homepage = "http://github.com/hunt-framework";
        description = "A Command line Interface for the Hunt server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117680,7 +113292,6 @@ self: {
          http-client http-types QuickCheck simple temporary transformers wai
          wai-extra
        ];
-       homepage = "https://github.com/phlummox/hup";
        description = "Upload packages or documentation to a hackage server";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -117696,7 +113307,6 @@ self: {
        executableHaskellDepends = [
          array base bytestring containers kangaroo
        ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Extract function names from Windows DLLs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117716,7 +113326,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers here hspec text
        ];
-       homepage = "https://github.com/yigitozkavci/hurriyet-haskell";
        description = "Haskell bindings for Hurriyet API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117742,7 +113351,6 @@ self: {
          array base containers directory filepath ghc-paths haskeline mtl
          parsec process transformers
        ];
-       homepage = "http://justinethier.github.com/husk-scheme";
        description = "R5RS Scheme interpreter, compiler, and library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -117758,7 +113366,6 @@ self: {
        libraryHaskellDepends = [
          array base containers husk-scheme json mtl transformers
        ];
-       homepage = "http://justinethier.github.com/husk-scheme";
        description = "Extra libraries for the husk Scheme platform";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -117776,7 +113383,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl old-locale parsec readline time
        ];
-       homepage = "http://github.com/markusle/husky/tree/master";
        description = "A simple command line calculator";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117812,7 +113418,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec parsec-numbers ];
-       homepage = "https://github.com/steshaw/huttons-razor";
        description = "Quick implemention of Hutton's Razor";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117838,7 +113443,6 @@ self: {
        sha256 = "1dihbqfjwgd92khlrc8mwjxsjbwbassma3bxg8hqr7qqgwdfyl6b";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/agrafix/hvect";
        description = "Simple strict heterogeneous lists";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -117850,7 +113454,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "14czd3qhji2aq4x23v0a1fhschnq1azd8spiar9pw5z12z4n9j1l";
        libraryHaskellDepends = [ aeson base text vector ];
-       homepage = "https://github.com/DougBurke/hvega";
        description = "Create Vega and Vega-Lite visualizations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117873,7 +113476,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion hw-bits hw-prim vector
        ];
-       homepage = "http://github.com/haskell-works/hw-balancedparens#readme";
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117886,6 +113488,8 @@ self: {
        pname = "hw-bits";
        version = "0.7.0.2";
        sha256 = "1s0as4d1a80hzx47zpa7qjiwdbgwzg1j4lgqd0grri5scq0iwqiq";
+       revision = "1";
+       editedCabalFile = "1gvv5ryx1lrgb3hk362fkqz98rggdxfmjp7fy0id7mqvdz6lk2av";
        libraryHaskellDepends = [
          base bytestring hw-int hw-prim hw-string-parse safe vector
        ];
@@ -117893,7 +113497,6 @@ self: {
          base bytestring hspec hw-prim QuickCheck vector
        ];
        benchmarkHaskellDepends = [ base criterion hw-prim vector ];
-       homepage = "http://github.com/haskell-works/hw-bits#readme";
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117913,7 +113516,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring conduit criterion mmap vector
        ];
-       homepage = "http://github.com/haskell-works/hw-conduit#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -117925,7 +113527,6 @@ self: {
        version = "0.0.0.5";
        sha256 = "0cfrgcjj7c2bi5l4qan23ipylfa73qh19xc9x03sbia6qh0yrsjw";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/haskell-works/hw-diagnostics#readme";
        description = "Diagnostics library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117944,7 +113545,6 @@ self: {
        testHaskellDepends = [
          base hspec hw-bits hw-int hw-prim QuickCheck vector
        ];
-       homepage = "http://github.com/haskell-works/hw-eliasfano#readme";
        description = "Elias-Fano";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117963,7 +113563,6 @@ self: {
        testHaskellDepends = [
          base hspec hw-bits hw-prim QuickCheck vector
        ];
-       homepage = "http://github.com/haskell-works/hw-excess#readme";
        description = "Excess";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117982,7 +113581,6 @@ self: {
          base deepseq hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/haskell-works/hw-fingertree#readme";
        description = "Generic finger-tree structure, with example instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -117996,16 +113594,38 @@ self: {
        pname = "hw-fingertree-strict";
        version = "0.1.0.3";
        sha256 = "03njx1g23f8s8a9dcyanpfm8pzgcbyds4zwkmp7g8mshk1rljfcm";
+       revision = "1";
+       editedCabalFile = "027ds9pl198478hyimfqaff52r8qhwgmhzazck847z2i5igp30i2";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/haskell-works/hw-fingertree-strict#readme";
        description = "Generic strict finger-tree structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-fingertree-strict_0_1_1_0" = callPackage
+    ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
+     , hw-hspec-hedgehog, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "hw-fingertree-strict";
+       version = "0.1.1.0";
+       sha256 = "0a709kcly1wi3lxznk92bcir29yawv5hz6fxnw2dp1zhdmxqj09q";
+       revision = "1";
+       editedCabalFile = "06dv0zbxzvayymf2syi3dqcm6q8x9c91yl35z1dgkz36lddqbidh";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "Generic strict finger-tree structure";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-hedgehog" = callPackage
     ({ mkDerivation, base, hedgehog, vector }:
      mkDerivation {
@@ -118014,7 +113634,6 @@ self: {
        sha256 = "0fngvmx60a3z1sl798ghvfzya5dgi1mfln8p1vkqapcgfjh7w5r6";
        libraryHaskellDepends = [ base hedgehog vector ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/githubuser/hw-hedgehog#readme";
        description = "Extra hedgehog functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118025,13 +113644,31 @@ self: {
        pname = "hw-hspec-hedgehog";
        version = "0.1.0.4";
        sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq";
+       revision = "1";
+       editedCabalFile = "12bh7ms7kjmpk43fwmnbbaflsl41icjck3bn8pcjybp7f7j0mrk5";
        libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
        testHaskellDepends = [ base hedgehog hspec ];
-       homepage = "https://github.com/haskell-works/hw-hspec-hedgehog#readme";
        description = "Interoperability between hspec and hedgehog";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-hspec-hedgehog_0_1_0_5" = callPackage
+    ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hw-hspec-hedgehog";
+       version = "0.1.0.5";
+       sha256 = "0kznqpliqnahyayi1q08mfz4qwhqvz54hb8cv6r2ps3lyjnpmlfk";
+       libraryHaskellDepends = [
+         base call-stack hedgehog hspec HUnit transformers
+       ];
+       testHaskellDepends = [ base hedgehog hspec ];
+       description = "Interoperability between hspec and hedgehog";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-int" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -118039,7 +113676,6 @@ self: {
        version = "0.0.0.3";
        sha256 = "0gsaimfx7gg39yfj2n6mlszri5x06f14b8f9cs12klrq2q8sadl3";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/haskell-works/hw-int#readme";
        description = "Integers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118052,7 +113688,6 @@ self: {
        sha256 = "1gw0g6xd6q2rbnpb8j2yi8ddq39r2l8rplx8nfwk9mqzpgxx0r1n";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ];
-       homepage = "https://github.com/haskell-works/hw-ip#readme";
        description = "Library for manipulating IP addresses and CIDR blocks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118094,7 +113729,6 @@ self: {
          hw-conduit hw-prim hw-rankselect hw-rankselect-base mmap resourcet
          vector
        ];
-       homepage = "http://github.com/haskell-works/hw-json#readme";
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118129,7 +113763,6 @@ self: {
          hw-rankselect lens mmap resourcet scientific unordered-containers
          vector
        ];
-       homepage = "http://github.com/haskell-works/hw-json-lens#readme";
        description = "Lens for hw-json";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118157,7 +113790,6 @@ self: {
          hspec http-client mtl pure-zlib QuickCheck semigroups servant
          servant-client text transformers unordered-containers
        ];
-       homepage = "https://github.com/haskell-works/hw-kafka-avro#readme";
        description = "Avro support for Kafka infrastructure";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118181,7 +113813,6 @@ self: {
        testHaskellDepends = [
          base bifunctors bytestring containers either hspec monad-loops
        ];
-       homepage = "https://github.com/haskell-works/hw-kafka-client";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) rdkafka;};
@@ -118205,7 +113836,6 @@ self: {
          base bifunctors bytestring conduit conduit-extra containers extra
          hspec hw-kafka-client mtl QuickCheck resourcet transformers
        ];
-       homepage = "https://github.com/haskell-works/hw-kafka-conduit";
        description = "Conduit bindings for hw-kafka-client";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118221,7 +113851,6 @@ self: {
        libraryHaskellDepends = [ ansi-wl-pprint base dlist ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/haskell-works/hw-mquery#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118240,7 +113869,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec hw-bits hw-prim QuickCheck vector
        ];
-       homepage = "http://github.com/haskell-works/hw-packed-vector#readme";
        description = "Packed Vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118256,7 +113884,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring hw-prim mono-traversable text
        ];
-       homepage = "http://github.com/haskell-works/hw-parser#readme";
        description = "Simple parser support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118269,6 +113896,8 @@ self: {
        pname = "hw-prim";
        version = "0.5.0.5";
        sha256 = "1bl1jfdcp8vpl83qcnq168rnvmpl4kxz7mv94vzal8mi2sw7iilk";
+       revision = "1";
+       editedCabalFile = "0i40x22z95zdzhnz0kz8nlaajdykviplgyyxh4v21z0i69xqlxgr";
        libraryHaskellDepends = [ base bytestring mmap vector ];
        testHaskellDepends = [
          base bytestring directory exceptions hedgehog hspec
@@ -118277,19 +113906,20 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion mmap vector
        ];
-       homepage = "http://github.com/haskell-works/hw-prim#readme";
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-prim_0_6_0_0" = callPackage
+  "hw-prim_0_6_2_0" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
      , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, vector
      }:
      mkDerivation {
        pname = "hw-prim";
-       version = "0.6.0.0";
-       sha256 = "1x1ypc098zkgc0gcsyszfqgf2jw7b239d0qrwqzg5iwvzwlwapwk";
+       version = "0.6.2.0";
+       sha256 = "0pafq65nx222innl45k4s5qdavbh4yrsky1q6l1dzpbqdsxx28nx";
+       revision = "1";
+       editedCabalFile = "0ff5ms3h8gnjnpx5n9d0jy42lmdxv1sc85rgjikhkwpsi1i8j321";
        libraryHaskellDepends = [ base bytestring mmap vector ];
        testHaskellDepends = [
          base bytestring directory exceptions hedgehog hspec
@@ -118298,7 +113928,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion mmap vector
        ];
-       homepage = "http://github.com/haskell-works/hw-prim#readme";
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118320,7 +113949,6 @@ self: {
          base hedgehog hspec hw-hedgehog hw-hspec-hedgehog QuickCheck
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
-       homepage = "https://github.com/githubuser/hw-prim-bits#readme";
        description = "Primitive support for bit manipulation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118353,7 +113981,6 @@ self: {
          base bytestring conduit criterion directory hw-bits hw-prim
          hw-rankselect-base mmap resourcet vector
        ];
-       homepage = "http://github.com/haskell-works/hw-rankselect#readme";
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118386,7 +114013,6 @@ self: {
          base bytestring conduit criterion directory hw-bits hw-prim
          hw-rankselect-base mmap resourcet vector
        ];
-       homepage = "http://github.com/haskell-works/hw-rankselect#readme";
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118409,7 +114035,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion hw-bits hw-prim vector
        ];
-       homepage = "http://github.com/haskell-works/hw-rankselect-base#readme";
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118433,7 +114058,6 @@ self: {
        benchmarkHaskellDepends = [
          base bits-extra criterion hw-bits hw-prim vector
        ];
-       homepage = "http://github.com/haskell-works/hw-rankselect-base#readme";
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118447,7 +114071,6 @@ self: {
        sha256 = "1dzjx6virpikbqnpzdjlliakm8kd6kxyn3y4jgr5bqhisgwfp8b4";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base bytestring hspec QuickCheck vector ];
-       homepage = "http://github.com/haskell-works/hw-string-parse#readme";
        description = "String parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118466,7 +114089,6 @@ self: {
          hw-bits hw-prim hw-rankselect hw-rankselect-base mmap
          mono-traversable text vector word8
        ];
-       homepage = "http://github.com/haskell-works/hw-succinct#readme";
        description = "Succint datastructures";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118481,7 +114103,6 @@ self: {
        sha256 = "0x5h38ys1d3myxxw71927nr7lji352hj5q8cyspw4vflaq3xk083";
        libraryHaskellDepends = [ base bytestring hw-prim vector ];
        testHaskellDepends = [ base hspec QuickCheck vector ];
-       homepage = "http://github.com/haskell-works/hw-vector#readme";
        description = "Vector type with convenient typeclass instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118519,7 +114140,6 @@ self: {
          base bytestring conduit criterion hw-balancedparens hw-bits
          hw-conduit hw-prim mmap resourcet vector
        ];
-       homepage = "http://github.com/haskell-works/hw-xml#readme";
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118562,7 +114182,6 @@ self: {
          attoparsec base bytestring containers criterion HUnit mtl
          transformers
        ];
-       homepage = "http://github.com/aycanirican/hweblib";
        description = "Haskell Web Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118606,7 +114225,6 @@ self: {
          aeson attoparsec base bytestring hedis hspec hspec-contrib HUnit
          text time uuid
        ];
-       homepage = "http://github.com/dbp/hworker";
        description = "A reliable at-least-once job queue built on top of redis";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118624,7 +114242,6 @@ self: {
          aeson amazonka amazonka-core amazonka-ses base hworker lens text
          time unordered-containers
        ];
-       homepage = "http://github.com/position/hworker-ses";
        description = "Library for sending email with Amazon's SES and hworker";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118664,7 +114281,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring Cabal criterion cryptohash parallel
        ];
-       homepage = "https://github.com/srijs/hwsl2";
        description = "Hashing with SL2";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118677,7 +114293,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0kfsc85k4vgdbkryrw80rgpjzzbavwqqzqylc95h80vm7xnlg2p9";
        libraryHaskellDepends = [ base bytestring fingertree hwsl2 ];
-       homepage = "https://github.com/srijs/hwsl2-haskell-bytevector";
        description = "A hashed byte-vector based on algebraic hashes and finger trees";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118692,7 +114307,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring hwsl2 reducers semigroups
        ];
-       homepage = "https://github.com/srijs/hwsl2-reducers";
        description = "Semigroup and Reducer instances for Data.Hash.SL2";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118750,7 +114364,6 @@ self: {
          xournal-render xournal-types
        ];
        executableHaskellDepends = [ base cmdargs ];
-       homepage = "http://ianwookim.org/hxournal";
        description = "A pen notetaking program written in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118770,7 +114383,6 @@ self: {
          hxt-charproperties hxt-regex-xmlschema hxt-unicode mtl network-uri
          parsec
        ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "A collection of tools for processing XML with Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118786,7 +114398,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring bzlib deepseq haskell98 hxt
        ];
-       homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Serialisation and deserialisation of HXT XmlTrees";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118804,7 +114415,6 @@ self: {
          base binary bytestring containers deepseq directory filepath hxt
          SHA time unix-compat
        ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "Cache for HXT XML Documents and other binary data";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118817,7 +114427,6 @@ self: {
        version = "9.2.0.1";
        sha256 = "1mml8wglvagqq891rchgli6r8rnkwrqhgsxfl6kb5403pzb18rp4";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "Character properties and classes for XML and Unicode";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118831,7 +114440,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base hxt parsec split ];
-       homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118843,7 +114451,6 @@ self: {
        version = "9.1.1.1";
        sha256 = "1sn5ngzz5qszdb3anbpqbjdijz29gmrwjrg9vsmrqsdqz65wrhfd";
        libraryHaskellDepends = [ base bytestring curl hxt parsec ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "LibCurl interface for HXT";
        license = "unknown";
      }) {};
@@ -118855,7 +114462,6 @@ self: {
        version = "9.1.1";
        sha256 = "1mi2f2i31nqjqzwl82iypm1qngrpxp7lz506pjgqfbn840yc9n8h";
        libraryHaskellDepends = [ base bytestring hexpat hxt ];
-       homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Expat parser for HXT";
        license = "unknown";
      }) {};
@@ -118867,7 +114473,6 @@ self: {
        version = "0.4.1";
        sha256 = "1bv8kcra2vgjbp7k0yczlrfbjh7ib2xixaqpnnd60hq84878nzb1";
        libraryHaskellDepends = [ base hxt ];
-       homepage = "http://code.google.com/p/hxt-extras/";
        description = "Extra functions for HXT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118884,7 +114489,6 @@ self: {
          base containers directory filepath haskell98 HTTP HUnit hxt network
          parsec process
        ];
-       homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "A collection of tools for processing XML with Haskell (Filter variant)";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -118901,7 +114505,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring HTTP hxt network network-uri parsec
        ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "Interface to native Haskell HTTP package HTTP";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118915,7 +114518,6 @@ self: {
        revision = "3";
        editedCabalFile = "0d5fg718y7xzw76ip33q0w1liqk70q9074qkd198mjnijxjcrkf3";
        libraryHaskellDepends = [ base hxt mtl ];
-       homepage = "https://github.com/silkapp/hxt-pickle-utils";
        description = "Utility functions for using HXT picklers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -118935,7 +114537,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq parsec text
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118952,7 +114553,6 @@ self: {
          base containers hxt hxt-charproperties hxt-regex-xmlschema
          network-uri parsec
        ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "The HXT RelaxNG validator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118968,7 +114568,6 @@ self: {
        libraryHaskellDepends = [
          base hxt hxt-charproperties hxt-unicode tagsoup
        ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "TagSoup parser for HXT";
        license = "unknown";
      }) {};
@@ -118980,7 +114579,6 @@ self: {
        version = "9.0.2.4";
        sha256 = "0rj48cy8z4fl3zpg5bpa458kqr83adav6jnqv4i71dclpprj6n3v";
        libraryHaskellDepends = [ base hxt-charproperties ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "Unicode en-/decoding functions for utf8, iso-latin-* and other encodings";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -118995,7 +114593,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory filepath hxt parsec
        ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "The XPath modules for HXT";
        license = "unknown";
      }) {};
@@ -119011,7 +114608,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory filepath hxt hxt-xpath parsec
        ];
-       homepage = "https://github.com/UweSchmidt/hxt";
        description = "The XSLT modules for HXT";
        license = "unknown";
      }) {};
@@ -119049,7 +114645,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers HUnit random ];
-       homepage = "http://github.com/DamienCassou/HYahtzee";
        description = "A Yahtzee game implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119072,7 +114667,6 @@ self: {
          highlighting-kate mtl pandoc regex-pcre-builtin text
          unordered-containers
        ];
-       homepage = "http://sourrust.github.io/hyakko/";
        description = "Literate-style Documentation Generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119090,7 +114684,6 @@ self: {
        executableHaskellDepends = [
          base containers haskell98 mtl parsec
        ];
-       homepage = "http://repos.mine.nu/davve/darcs/hybrid";
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119105,7 +114698,6 @@ self: {
        libraryHaskellDepends = [
          base deepseq primitive semigroups vector
        ];
-       homepage = "http://github.com/ekmett/hybrid-vectors";
        description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119119,7 +114711,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        librarySystemDepends = [ sixense_x64 ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mruegenberg/hydra-hs";
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119152,7 +114743,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          text time transformers unix
        ];
-       homepage = "https://github.com/rrnewton/hydra-print";
        description = "NCurses interface to view multiple ByteString streams in parallel";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119170,7 +114760,6 @@ self: {
          base bytestring containers mtl pretty text
        ];
        testHaskellDepends = [ base Cabal containers mtl QuickCheck ];
-       homepage = "https://www.github.com/ktvoelker/hydrogen";
        description = "An alternate Prelude";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119192,7 +114781,6 @@ self: {
          base hydrogen-cli-args hydrogen-data hydrogen-multimap
          hydrogen-parsing hydrogen-prelude hydrogen-syntax
        ];
-       homepage = "https://scravy.de/hydrogen-cli/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119209,7 +114797,6 @@ self: {
        libraryHaskellDepends = [
          base containers hydrogen-multimap hydrogen-prelude
        ];
-       homepage = "https://scravy.de/hydrogen-cli-args/";
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119222,7 +114809,6 @@ self: {
        version = "0.14";
        sha256 = "0d9457sarii5z1m2p1jzfk1g1ix2bm0s3ghfw7gab1w74i3hlh88";
        libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ];
-       homepage = "https://scravy.de/hydrogen-data/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119235,7 +114821,6 @@ self: {
        version = "0.3";
        sha256 = "0ik68a85yxdz12sgfpqi7bagkhvm9qgvl2bgplm2anxjsxcqbi93";
        libraryHaskellDepends = [ base containers ghc-prim ];
-       homepage = "https://scravy.de/hydrogen-multimap/";
        description = "Hydrogen Multimap";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119250,7 +114835,6 @@ self: {
        libraryHaskellDepends = [
          base containers hydrogen-prelude parsec
        ];
-       homepage = "https://scravy.de/hydrogen-parsing/";
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119271,7 +114855,6 @@ self: {
          hashable hydrogen-multimap hydrogen-version network process random
          regex-base regex-tdfa strict text time transformers uuid
        ];
-       homepage = "http://scravy.de/hydrogen-prelude/";
        description = "Hydrogen Prelude";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119284,7 +114867,6 @@ self: {
        version = "0.17";
        sha256 = "0hdvvp3kxc66y6bxzcrjqp7wc6s21isvfra0ps53j69jmnzqd2mh";
        libraryHaskellDepends = [ base hydrogen-prelude parsec ];
-       homepage = "http://scravy.de/hydrogen-prelude-parsec/";
        description = "Hydrogen Prelude /w Parsec";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119302,7 +114884,6 @@ self: {
          base containers hydrogen-parsing hydrogen-prelude nicify parsec
          uuid
        ];
-       homepage = "https://scravy.de/hydrogen-syntax/";
        description = "Hydrogen Syntax";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119318,7 +114899,6 @@ self: {
        libraryHaskellDepends = [
          base containers hydrogen-prelude parsec time
        ];
-       homepage = "https://scravy.de/hydrogen-util/";
        description = "Hydrogen Tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119331,7 +114911,6 @@ self: {
        version = "1.4";
        sha256 = "04v39lvh0z0ig6igsz7ncfasag3j6pdbsa86gyp63n4g325fmf38";
        libraryHaskellDepends = [ base ];
-       homepage = "https://scravy.de/hydrogen-version/";
        description = "Hydrogen Version Type";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -119349,7 +114928,6 @@ self: {
          base bytestring containers directory extensible-exceptions filepath
          mtl network network-bytestring unix
        ];
-       homepage = "http://github.com/tibbe/hyena";
        description = "Simple web application server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119372,7 +114950,6 @@ self: {
          aeson base bytestring filepath fsnotify hint http-types hylogen
          process text wai warp websockets
        ];
-       homepage = "https://github.com/sleexyz/hylogen";
        description = "WebGL live-coding environment for writing shaders with Hylogen";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -119384,7 +114961,6 @@ self: {
        version = "0.1.5.1";
        sha256 = "0ha9bn7mqyqwpxzzcd4p0hm59dbrf3rcnpyihjkgnb7j4wk1f1rx";
        libraryHaskellDepends = [ base data-reify vector-space ];
-       homepage = "https://github.com/sleexyz/hylogen";
        description = "GLSL embedded in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -119415,7 +114991,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base hylolib mtl ];
-       homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php";
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119512,7 +115087,6 @@ self: {
        libraryHaskellDepends = [
          adjunctions base distributive profunctors transformers
        ];
-       homepage = "http://github.com/ekmett/hyperfunctions";
        description = "Hyperfunctions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119541,7 +115115,6 @@ self: {
        testHaskellDepends = [
          base hspec lens QuickCheck text unordered-containers
        ];
-       homepage = "https://github.com/tweag/hyperion#readme";
        description = "Reliable performance measurement with robust data export";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119567,7 +115140,6 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
-       homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119585,7 +115157,6 @@ self: {
          base bits containers murmur-hash semigroups vector
        ];
        testHaskellDepends = [ base HUnit semigroups tasty tasty-hunit ];
-       homepage = "https://github.com/ezhulenev/hyperloglogplus#readme";
        description = "Approximate cardinality estimation using constant space";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119602,7 +115173,6 @@ self: {
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-enumerator http-types
        ];
-       homepage = "https://github.com/mkscrg/hyperpublic-haskell";
        description = "A thin wrapper for the Hyperpublic API";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119615,7 +115185,6 @@ self: {
        version = "0.1";
        sha256 = "0pnp5d1a0hwn6jm8v6i7yygd831q2bvsz6qb9n8db8n17lfxikx4";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://www.alpheccar.org";
        description = "Text hyphenation algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119638,7 +115207,6 @@ self: {
        testHaskellDepends = [
          base containers doctest unordered-containers
        ];
-       homepage = "http://github.com/ekmett/hyphenation";
        description = "Configurable Knuth-Liang hyphenation";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -119668,7 +115236,6 @@ self: {
          test-framework-quickcheck2 test-framework-th text transformers
          transformers-base unordered-containers vector
        ];
-       homepage = "https://github.com/zoetic-community/hypher";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119687,7 +115254,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/i-amd3/hzaif";
        description = "This package is Zaif Exchange Api wrapper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119700,7 +115266,6 @@ self: {
        sha256 = "1n7nrkngr395n6dhgdkqwbx2dmq6hmmfggyv62nr29kxf580hd8k";
        libraryHaskellDepends = [ base containers text ];
        testHaskellDepends = [ base containers QuickCheck text ];
-       homepage = "https://github.com/karky7/hzenhan#readme";
        description = "Zenhan library for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119716,7 +115281,6 @@ self: {
        libraryHaskellDepends = [
          base containers data-default process process-extras text time
        ];
-       homepage = "https://github.com/emilaxelsson/hzenity";
        description = "Haskell interface to Zenity dialogs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119735,7 +115299,6 @@ self: {
          base bytestring resource-pool tasty tasty-hunit time
        ];
        testSystemDepends = [ zookeeper_mt ];
-       homepage = "http://github.com/dgvncsz0f/hzk";
        description = "Haskell client library for Apache Zookeeper";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zookeeper_mt;};
@@ -119760,7 +115323,6 @@ self: {
          http-client-tls http-types lens lens-aeson mtl raw-strings-qq
          scotty stm stm-conduit text transformers
        ];
-       homepage = "https://github.com/yamadapc/hzulip";
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119782,7 +115344,6 @@ self: {
        testHaskellDepends = [
          base containers hspec tasty tasty-hspec text
        ];
-       homepage = "https://github.com/filib/i18n";
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119802,7 +115363,6 @@ self: {
          data-default mime mtl network network-uri old-locale parsec text
          time
        ];
-       homepage = "http://github.com/chrra/iCalendar";
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -119831,7 +115391,6 @@ self: {
          aeson base base64-bytestring bytestring conduit http-conduit
          monads-tf text transformers
        ];
-       homepage = "http://github.com/tattsun/iap-verifier";
        description = "A simple wrapper of In-App-Purchase receipt validate APIs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119849,7 +115408,6 @@ self: {
        executableHaskellDepends = [
          attoparsec base bytestring network unix
        ];
-       homepage = "https://github.com/rbermani/ib-api";
        description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119869,7 +115427,6 @@ self: {
          base containers iso3166-country-codes text unordered-containers
        ];
        testHaskellDepends = [ base HUnit tasty tasty-hunit text ];
-       homepage = "https://github.com/ibotty/iban";
        description = "Validate and generate IBANs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119882,7 +115439,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "0yrdh4y0ssldg0lmrbr6yk0zg2sihirp3mnh20dvg3m887kdhrj1";
        libraryHaskellDepends = [ base dbus directory unix xdg-basedir ];
-       homepage = "https://github.com/Ongy/ibus-hs";
        description = "A simple uncomplete ibus api";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -119902,7 +115458,6 @@ self: {
        ];
        executableHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/chrisdone/ical#readme";
        description = "iCalendar format parser and org-mode converter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -119943,7 +115498,6 @@ self: {
          base bytestring iconv shelly template-haskell text
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/adinapoli/iconv-typed#readme";
        description = "Type safe iconv wrapper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120056,20 +115610,20 @@ self: {
      }) {};
 
   "ideas" = callPackage
-    ({ mkDerivation, base, cgi, containers, Diff, directory, filepath
-     , parsec, QuickCheck, random, time, uniplate, wl-pprint
+    ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive
+     , containers, Diff, directory, filepath, HDBC, HDBC-sqlite3
+     , http-types, network, parsec, QuickCheck, random
+     , streaming-commons, time, uniplate, wai, wl-pprint
      }:
      mkDerivation {
        pname = "ideas";
-       version = "1.6";
-       sha256 = "0xl49alcsrr913yk7nj0ln86r7428arb12r1nvx2rywmrfppv9yy";
-       revision = "1";
-       editedCabalFile = "1c4l8z3pkccwhza10yry74dkji48y614i9hkx40rfz8aw3rg16ls";
+       version = "1.7";
+       sha256 = "0blazd950wpxjg0mfcx64m32wgcgia34gki987xgqmgkqyc5y2hm";
        libraryHaskellDepends = [
-         base cgi containers Diff directory filepath parsec QuickCheck
-         random time uniplate wl-pprint
+         base blaze-builder bytestring case-insensitive containers Diff
+         directory filepath HDBC HDBC-sqlite3 http-types network parsec
+         QuickCheck random streaming-commons time uniplate wai wl-pprint
        ];
-       homepage = "http://ideas.cs.uu.nl/www/";
        description = "Feedback services for intelligent tutoring systems";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120088,7 +115642,6 @@ self: {
        executableHaskellDepends = [
          base containers ideas parsec QuickCheck random
        ];
-       homepage = "http://ideas.cs.uu.nl/www/";
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120102,7 +115655,6 @@ self: {
        sha256 = "18jwk65mm50lqnbx9px4c8aa2x7n5dkrazzpzvdwq7cy4q614bj0";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
-       homepage = "https://github.com/prophile/idempotent";
        description = "Idempotent monoids";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120126,7 +115678,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion JuicyPixels random tf-random
        ];
-       homepage = "https://github.com/mrkkrp/identicon";
        description = "Flexible generation of identicons";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120139,13 +115690,14 @@ self: {
        pname = "identicon-style-squares";
        version = "0.1.0.0";
        sha256 = "12iawbazg5dd6n2giyib3ihj42xh9fnp53lgi3a5gd5x8spixwi9";
+       revision = "1";
+       editedCabalFile = "00ry1hxan1kgq46wdq3l5n7aiv9v54kmyc7zh4xczvikn6x0gcg9";
        libraryHaskellDepends = [
          base identicon JuicyPixels polyvariadic
        ];
        testHaskellDepends = [
          base bytestring cryptohash identicon JuicyPixels
        ];
-       homepage = "https://github.com/fgaz/identicon-styles";
        description = "Squares style for the identicon package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120240,7 +115792,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/zjhmale/idringen";
        description = "A project manage tool for Idris";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120258,8 +115809,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "1.2.0";
-       sha256 = "0bim5lmr1wh3sc5nj5axy8xa2qq8rajp13x363mb9kkrnfy5wbxk";
+       version = "1.3.0";
+       sha256 = "1w5i2z88li4niykwc6yrgxgfp25ll6ih95cip0ri7d8i7ik03c48";
        configureFlags = [ "-fcurses" "-fexeconly" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -120284,7 +115835,6 @@ self: {
          optparse-applicative process tagged tasty tasty-golden tasty-rerun
          time transformers
        ];
-       homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) gmp;};
@@ -120296,7 +115846,6 @@ self: {
        version = "0.7";
        sha256 = "0ckhmy10l4kchr5bg1hlygrj86ij0wrj3r8in9g3c3jhh00dx3km";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/patperry/hs-ieee";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120331,7 +115880,6 @@ self: {
        version = "0.8.0";
        sha256 = "1lcs521g9lzy9d7337vg4w7q7s8500rfqy7rcifcz6pm6yfgyb8f";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/patperry/hs-ieee754";
        description = "Utilities for dealing with IEEE floating point numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120353,7 +115901,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "078lg8b6n4bhlhh6ax4k4n8k8fk7hiwcnzyr4h9zbq6vczl77xi8";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/winterland1989/if";
        description = "(?) and (?>) conditional operator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120368,7 +115915,6 @@ self: {
        sha256 = "0maxamkasfiwwjcrba158as79hkrip4plhqy9mby1fx662rss0fc";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       homepage = "http://github.com/mikeizbicki/ifcxt";
        description = "put if statements within type constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120381,7 +115927,6 @@ self: {
        version = "0.0.6";
        sha256 = "0dr8w7lqb1yv4zg8mkqjws215pm5h9zd3n2g6wnpwc41hj04b23b";
        libraryHaskellDepends = [ base binary bytestring ];
-       homepage = "http://code.haskell.org/~thielema/iff/";
        description = "Constructing and dissecting IFF files";
        license = "GPL";
      }) {};
@@ -120419,7 +115964,6 @@ self: {
          http-conduit http-types lifted-base monad-control resourcet text
          time transformers transformers-base unordered-containers
        ];
-       homepage = "https://github.com/prowdsponsor/ig";
        description = "Bindings to Instagram's API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120443,7 +115987,6 @@ self: {
          mtl mwc-random protolude stm stm-chans stm-conduit text
          transformers wl-pprint-text
        ];
-       homepage = "https://github.com/olynch/ige";
        description = "An keyboard-driven interactive graph editor";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120463,7 +116006,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ ige-mac-integration ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120484,7 +116026,6 @@ self: {
        ];
        executableHaskellDepends = [ base directory path ];
        testHaskellDepends = [ base HTF text ];
-       homepage = "http://github.com/agrafix/ignore";
        description = "Handle ignore files of different VCSes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120502,7 +116043,6 @@ self: {
        ];
        librarySystemDepends = [ igraph ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://giorgidze.github.com/igraph/";
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120517,7 +116057,6 @@ self: {
        revision = "1";
        editedCabalFile = "0kqyrvv7wnr35nlyip14g1shjb8zfqg7x4vm0qqhc57vc6s6qqbx";
        libraryHaskellDepends = [ ad base polynomial ];
-       homepage = "https://github.com/dmcclean/igrf";
        description = "International Geomagnetic Reference Field";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120554,7 +116093,6 @@ self: {
          base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
          shelly text transformers
        ];
-       homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120570,7 +116108,6 @@ self: {
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring here ihaskell text
        ];
-       homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Aeson";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120583,7 +116120,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "1vb4x6h6bs3liq1bbnhs3ns0zrk4czy63zmkp1q075g7fq1fh7hw";
        libraryHaskellDepends = [ base ihaskell ];
-       homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120596,7 +116132,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "1733lg13v3pn95249gxbxrvbwfg2a95badvf98vkx6hx2mbxv9q7";
        libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ];
-       homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for blaze-html types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120613,7 +116148,6 @@ self: {
          base bytestring Chart Chart-cairo data-default-class directory
          ihaskell
        ];
-       homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for charts types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120630,7 +116164,6 @@ self: {
          active base bytestring diagrams diagrams-cairo diagrams-lib
          directory ihaskell text
        ];
-       homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for diagram types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120643,7 +116176,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1cbfhv9kg33dj28mn6mhhi363pz9jr2kw4ph64ga1fiawlj563l0";
        libraryHaskellDepends = [ base classy-prelude ihaskell ];
-       homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for basic types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120656,7 +116188,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1qdcx0y52w805z5dg2xwsy1ykbbk05i4k04y0w3r4r3wwjvq3kk6";
        libraryHaskellDepends = [ base bytestring gnuplot ihaskell ];
-       homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Gnuplot (from gnuplot package)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120668,7 +116199,6 @@ self: {
        version = "0.2.1.1";
        sha256 = "0rsfavpxm14bbrjcsi9rps3p1bjhhgvam0znhn8vwfmic3fpsda8";
        libraryHaskellDepends = [ base HaTeX ihaskell text ];
-       homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for hatex";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120680,7 +116210,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0fwn0c7v5g67gkrzq7k3myy3cxk5b176svzcgaidfs7ckl3hbsnm";
        libraryHaskellDepends = [ aeson base hvega ihaskell text ];
-       homepage = "https://github.com/githubuser/ihaskell-hvega#readme";
        description = "IHaskell display instance for hvega types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120698,7 +116227,6 @@ self: {
          base base64-bytestring blaze-html bytestring filepath ihaskell
          ihaskell-blaze inline-r template-haskell temporary
        ];
-       homepage = "https://tweag.github.io/HaskellR/";
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120713,7 +116241,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory ihaskell JuicyPixels
        ];
-       homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120730,7 +116257,6 @@ self: {
          base base64-bytestring bytestring ihaskell ipython-kernel magic
          text utf8-string
        ];
-       homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IHaskell display instances for bytestrings";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120746,7 +116272,6 @@ self: {
        libraryHaskellDepends = [
          aeson base here ihaskell parsec random text unordered-containers
        ];
-       homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instances for Parsec";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120759,7 +116284,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "12bi8im5489kmy0d26kn3hljkj4c1xynsa97h6nh5dp53awklm3y";
        libraryHaskellDepends = [ base bytestring hmatrix ihaskell plot ];
-       homepage = "http://www.github.com/gibiansky/ihaskell";
        description = "IHaskell display instance for Plot (from plot package)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120795,7 +116319,6 @@ self: {
          aeson base containers ihaskell ipython-kernel scientific singletons
          text unix unordered-containers vector vinyl
        ];
-       homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -120809,7 +116332,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
-       homepage = "https://github.com/minad/ihs";
        description = "Interpolated Haskell";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -120846,7 +116368,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion lens loop transformers vector
        ];
-       homepage = "http://github.com/aelve/ilist";
        description = "Optimised list functions for doing index-related things";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120867,7 +116388,6 @@ self: {
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ array base containers html xhtml ];
        executableToolDepends = [ alex ];
-       homepage = "http://github.com/jgm/illuminate";
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120882,7 +116402,6 @@ self: {
        revision = "1";
        editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/Icelandjack/Image-type";
        description = "Determine the type of an image by reading the first bytes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120894,7 +116413,6 @@ self: {
        version = "0.1";
        sha256 = "1n7awx8wsm6z0sp54jri3sp403n14wzr08vjj4a422q1lf306l3y";
        libraryHaskellDepends = [ base gd ];
-       homepage = "https://github.com/tchannel/imagefilters";
        description = "Image Filters (contrast, brightness, gaussian blur, etc)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120939,7 +116457,6 @@ self: {
          base containers HTTP json mtl network regex-posix tagsoup
          template-haskell transformers vcs-revision
        ];
-       homepage = "https://bitbucket.org/balta2ar/imagepaste";
        description = "Command-line image paste utility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120961,7 +116478,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit conduit-extra hspec resourcet
        ];
-       homepage = "http://github.com/silkapp/imagesize-conduit";
        description = "Determine the size of some common image formats";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -120975,12 +116491,12 @@ self: {
      }:
      mkDerivation {
        pname = "imap";
-       version = "0.3.0.6";
-       sha256 = "1acmjpp2l4d7p5yxayd3w6h8mc29siq3y3s50cj0n8japmqrrcgm";
+       version = "0.3.0.7";
+       sha256 = "0d5g1fiyfp1d207fjkpyfnp6hi5hdf1jsh50a06mrcdb8dawpbqa";
        libraryHaskellDepends = [
-         attoparsec base bytestring connection containers derive either
-         exceptions hslogger list-t network pipes random rolling-queue stm
-         stm-delay text transformers word8
+         attoparsec base bytestring connection containers either exceptions
+         hslogger list-t network pipes random rolling-queue stm stm-delay
+         text transformers word8
        ];
        testHaskellDepends = [
          attoparsec base bytestring connection containers derive either
@@ -121062,7 +116578,6 @@ self: {
        sha256 = "1v0rji1b45n309wn4ld5fs60rri8gn4xg0wz319f2mcqqrih6ir4";
        libraryHaskellDepends = [ base imj-base imj-prelude mtl ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-animation/README.md";
        description = "Animation Framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121087,7 +116602,6 @@ self: {
        testHaskellDepends = [
          ansi-terminal base imj-prelude mtl text time
        ];
-       homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-base/README.md";
        description = "Game engine with geometry, easing, animated text, delta rendering";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121108,7 +116622,6 @@ self: {
        ];
        executableHaskellDepends = [ base imj-prelude ];
        testHaskellDepends = [ base imj-base mtl text ];
-       homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-game-hamazed//README.md";
        description = "A game with flying numbers and 8-bit color animations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121124,7 +116637,6 @@ self: {
        executableHaskellDepends = [
          base imj-prelude optparse-applicative
        ];
-       homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-measure-stdout/README.md";
        description = "An application to determine the maximum capacity of stdout buffer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121136,7 +116648,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1nv3fxps3i4znibv98qygxdl22dzri5zkw6hjaqajb4nlnh4bd0v";
        libraryHaskellDepends = [ base mtl text ];
-       homepage = "https://github.com/OlivierSohn/hamazed/blob/master/imj-prelude/README.md";
        description = "Prelude library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121171,7 +116682,6 @@ self: {
          xml-conduit xml-types
        ];
        executableHaskellDepends = [ base free ];
-       homepage = "https://github.com/k0ral/imm";
        description = "Execute arbitrary actions for each unread element of RSS/Atom feeds";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121191,7 +116701,6 @@ self: {
        testHaskellDepends = [
          base lifted-base stm tasty tasty-hunit transformers
        ];
-       homepage = "https://github.com/feuerbach/immortal";
        description = "Spawn threads that never die (unless told to do so)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -121206,7 +116715,6 @@ self: {
        sha256 = "120znjn7jrmcnzgka8zbiih4g8imh732iivjdzzbpj1kgywrvj0i";
        libraryHaskellDepends = [ base stm unliftio-core ];
        testHaskellDepends = [ base stm tasty tasty-hunit transformers ];
-       homepage = "https://github.com/feuerbach/immortal";
        description = "Spawn threads that never die (unless told to do so)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121257,7 +116765,6 @@ self: {
          base directory filepath process random syntactic tasty-quickcheck
          tasty-th
        ];
-       homepage = "https://github.com/emilaxelsson/imperative-edsl";
        description = "Deep embedding of imperative programs with code generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121309,7 +116816,6 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec mtl parsec ];
        benchmarkHaskellDepends = [ base criterion parsec random ];
-       homepage = "http://kalli1.faikvm.com/ImplicitCAD/Stable";
        description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121324,7 +116830,6 @@ self: {
        revision = "1";
        editedCabalFile = "02x6cmbxyw26y5azhjrx8461vngsj27l0a255xvhg2pl25zwfbfs";
        libraryHaskellDepends = [ base mtl time transformers ];
-       homepage = "https://github.com/revnull/implicit-logging";
        description = "A logging framework built around implicit parameters";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121337,7 +116842,6 @@ self: {
        version = "0.2.1";
        sha256 = "1da01fnwxf1350ywawvl58qf479q2rz81wi9s8lvw2n3d75qpn8i";
        libraryHaskellDepends = [ base data-default-class ];
-       homepage = "http://github.com/duairc/implicit-params";
        description = "Named and unnamed implicit parameters with defaults";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121371,7 +116875,6 @@ self: {
          base filepath hspec log-warper microlens-platform path path-io
          universum unordered-containers
        ];
-       homepage = "https://github.com/serokell/importify";
        description = "Tool for haskell imports refactoring";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121385,7 +116888,6 @@ self: {
        sha256 = "0qfwy9iyw0rfb95100azz2i2w9n34fgm2rvaj9jjz1p4pik3hhla";
        libraryHaskellDepends = [ base directory filepath mtl ];
        testHaskellDepends = [ base directory filepath mtl ];
-       homepage = "https://github.com/CindyLinz/Haskell-imports";
        description = "Generate code for importing directories automatically";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121398,7 +116900,6 @@ self: {
        version = "1.1.2";
        sha256 = "13iwy9pn3w3whg8hqy83mgbzcb156pz88nfcx4axkw9hpkh4810s";
        libraryHaskellDepends = [ base lens ];
-       homepage = "https://github.com/luna/impossible";
        description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121420,7 +116921,6 @@ self: {
          stm time time-recurrence validation
        ];
        testHaskellDepends = [ base Cabal Imprevu ];
-       homepage = "http://www.nomyx.net";
        description = "Reactive programming language based on a DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121443,7 +116943,6 @@ self: {
          reform-blaze reform-happstack safe stm text
        ];
        testHaskellDepends = [ base Cabal ];
-       homepage = "http://www.nomyx.net";
        description = "Imprevu support for Happstack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121459,7 +116958,6 @@ self: {
        editedCabalFile = "13418pfcsanj7cl651v4qqbypgjkrpld2gs560kpw3k2lj6w4wa0";
        libraryHaskellDepends = [ base binary bytestring constraints ];
        testHaskellDepends = [ base binary constraints hspec ];
-       homepage = "https://github.com/mrkkrp/imprint";
        description = "Serialization of arbitrary Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121471,7 +116969,6 @@ self: {
        version = "0.4.0";
        sha256 = "0z8w7lgk263ickb4l3ajhvy1bjq38bbiiw6c048a3yn4h8kpg67a";
        libraryHaskellDepends = [ base mtl yices ];
-       homepage = "http://github.com/tomahawkins/improve/wiki/ImProve";
        description = "An imperative, verifiable programming language for high assurance applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121495,7 +116992,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers vector
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/andrewthad/impure-containers#readme";
        description = "Mutable containers in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121507,7 +117003,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "0hr25bdwq2a1mj74wb8dvb95jyfqx13rz0h4makyb5kqlhxz40xl";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/jfischoff/inc-ref";
        description = "A STM reference useful for incremental computing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121530,7 +117025,6 @@ self: {
          base containers directory filepath IndentParser mtl parsec
          presburger pretty
        ];
-       homepage = "https://github.com/adamgundry/inch/";
        description = "A type-checker for Haskell with integer constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121543,7 +117037,6 @@ self: {
        version = "1.0.2.2";
        sha256 = "0r8a8hg3fzfc619zsjdnid1la0njnfrijhqfgqjmis4ncivah52h";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/DDCSF/inchworm";
        description = "Inchworm Lexer Framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -121573,7 +117066,6 @@ self: {
        sha256 = "01fvc963gln6svash9cf9v2wbfnssh4j5r49l6y23zmnmqnzxs8x";
        libraryHaskellDepends = [ base containers deepseq semigroups ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/fumieval/incremental#readme";
        description = "incremental update library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121594,7 +117086,6 @@ self: {
          base Cabal cabal-test-quickcheck containers QuickCheck
        ];
        benchmarkHaskellDepends = [ base containers deepseq QuickCheck ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121639,7 +117130,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq monoid-subclasses text
        ];
-       homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121660,7 +117150,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq monoid-subclasses text
        ];
-       homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121673,7 +117162,6 @@ self: {
        version = "0.1.8";
        sha256 = "1a75jkv48awijwdch0lnvcxdihh8ns9rflzgsbbhw8p34k1jpz8s";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "http://github.com/sebfisch/incremental-sat-solver";
        description = "Simple, Incremental SAT Solving as a Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121710,7 +117198,6 @@ self: {
          base indentation-core indentation-parsec indentation-trifecta mtl
          parsec parsers trifecta
        ];
-       homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121722,7 +117209,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "136skn3parvsyfii0ywm8cqfmsysi562944fbb0xsgckx0sq1dr1";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators core library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121737,7 +117223,6 @@ self: {
        sha256 = "12s7ic8i7l2g7knzzab0c6k1s59cjlcdsrwygzh8l6l9azvya5lp";
        libraryHaskellDepends = [ base indentation-core mtl parsec ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
-       homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Parsec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121754,7 +117239,6 @@ self: {
          base indentation-core mtl parsers trifecta
        ];
        testHaskellDepends = [ base tasty tasty-hunit trifecta ];
-       homepage = "https://bitbucket.org/adamsmd/indentation";
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121768,7 +117252,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec ];
-       homepage = "http://www.cse.iitk.ac.in/users/ppk/code/HASKELL/indentparser";
        description = "A parser for indentation based structures";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -121781,7 +117264,6 @@ self: {
        sha256 = "0zv8mzn6r14fjgm2llg3babzgdfdkb97r2avj34lfjzmql4yrkql";
        libraryHaskellDepends = [ base mtl parsec ];
        testHaskellDepends = [ base mtl parsec tasty tasty-hunit ];
-       homepage = "http://github.com/jaspervdj/indents";
        description = "indentation sensitive parser-combinators for parsec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121805,7 +117287,6 @@ self: {
        version = "0.1.3";
        sha256 = "1hpmzg9ziqgng4wh4g0x4p6sdvn9f31hymwxdvfffydzqq70k17g";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/reinerp/indexed";
        description = "Haskell98 indexed functors, monads, comonads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121820,7 +117301,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-meta indexed template-haskell
        ];
-       homepage = "https://github.com/fumieval/indexed-do-notation";
        description = "Do notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121832,7 +117312,6 @@ self: {
        version = "0.2";
        sha256 = "17rbk2kgiy04n48i6hk4lracwdl45qqklvs1lri7mma2r62f67xh";
        libraryHaskellDepends = [ base bifunctors indexed mtl pointed ];
-       homepage = "https://github.com/reinerp/indexed-extras";
        description = "Indexed functors, monads and comonads that require extensions to Haskell98";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121845,7 +117324,6 @@ self: {
        version = "0.3.1";
        sha256 = "1172vxhyzyf061mnlb8dndnvycjk3shxhiqd8hdz42ipv223admx";
        libraryHaskellDepends = [ base indexed ];
-       homepage = "https://github.com/fumieval/indexed-free";
        description = "indexed monads for free";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121858,7 +117336,6 @@ self: {
        sha256 = "1l38x0s90gfsrfz43k9sx0xbv4pg93m2pfm6hy3rk52wdxrw0qad";
        libraryHaskellDepends = [ base OneTuple ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/davidm-d/indexed-list-literals";
        description = "Type safe indexed list literals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -121871,7 +117348,6 @@ self: {
        sha256 = "1b4g2196pi7v347gzl1x68qriwwfgr2iddjqfs49h5swh7qqqpfg";
        libraryHaskellDepends = [ base Only ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/davidm-d/indexed-list-literals";
        description = "Type safe indexed list literals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121937,7 +117413,6 @@ self: {
          hspec-expectations-pretty-diff microformats2-parser mtl network-uri
          raw-strings-qq template-haskell text time
        ];
-       homepage = "https://github.com/myfreeweb/indieweb-algorithms";
        description = "A collection of implementations of IndieWeb algorithms";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121951,7 +117426,6 @@ self: {
        sha256 = "08fjmza05wlj11mvdjwfcp3fn6k5zi1hsld84805clipd55sbp0r";
        libraryHaskellDepends = [ array base deepseq vector ];
        testHaskellDepends = [ array base deepseq QuickCheck text vector ];
-       homepage = "https://github.com/RaminHAL9001/inf-interval";
        description = "Non-contiguous interval data types with potentially infinite ranges";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121970,7 +117444,6 @@ self: {
        executableHaskellDepends = [
          ansi-wl-pprint base github optparse-applicative parsec process text
        ];
-       homepage = "https://github.com/silky/infer-upstream";
        description = "Find the repository from where a given repo was forked";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -121992,7 +117465,6 @@ self: {
          optparse-applicative parsec transformers
        ];
        executableHaskellDepends = [ base optparse-applicative parsec ];
-       homepage = "https://github.com/sinelaw/infernu";
        description = "Type inference and checker for JavaScript (experimental)";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122005,7 +117477,6 @@ self: {
        version = "0.12";
        sha256 = "18sf9798nna155xix71lw68k19r7ayk9kmppjzd76yxa61r38g41";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/luqui/infinite-search";
        description = "Exhaustively searchable infinite sets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122033,7 +117504,6 @@ self: {
        version = "0.1.1";
        sha256 = "156lcw4bvav9w41vggfjk84z41ppam31880wpislxwcsvc9jrd6q";
        libraryHaskellDepends = [ base containers haskell-src ];
-       homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122054,7 +117524,6 @@ self: {
        testHaskellDepends = [
          base containers hspec hspec-megaparsec megaparsec QuickCheck text
        ];
-       homepage = "https://github.com/stackbuilders/inflections-hs";
        description = "Inflections library for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122067,7 +117536,6 @@ self: {
        sha256 = "0srw75ds7hic0sjs2fnj0hsqsygzvppgy17y8qmsjz9z14ryqncw";
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://bitbucket.org/eegg/inflist";
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122096,7 +117564,6 @@ self: {
          base doctest http-client HUnit mtl QuickCheck tasty tasty-hunit
          tasty-quickcheck tasty-th template-haskell text vector
        ];
-       homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122125,7 +117592,6 @@ self: {
          base doctest http-client HUnit mtl QuickCheck tasty tasty-hunit
          tasty-quickcheck tasty-th template-haskell text vector
        ];
-       homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122153,7 +117619,6 @@ self: {
          pandoc persistent persistent-postgresql shakespeare text time
          time-locale-compat yesod yesod-auth yesod-core yesod-form
        ];
-       homepage = "http://doomanddarkness.eu/pub/informative";
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122168,7 +117633,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base text unordered-containers
        ];
-       homepage = "http://github.com/chrisdone/ini";
        description = "Quick and easy configuration files in the INI format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122183,7 +117647,6 @@ self: {
        sha256 = "1szsx2jdq4qqjrj4z5xvwzx35j6apf7i1p4iqbiy0z9hyfh9splc";
        libraryHaskellDepends = [ base ini template-haskell text ];
        testHaskellDepends = [ base HUnit ini raw-strings-qq text ];
-       homepage = "https://github.com/kseo/ini-qq#readme";
        description = "Quasiquoter for INI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122203,7 +117666,6 @@ self: {
          base bifunctors containers deepseq HUnit safe tasty tasty-hunit
          testpack trifecta
        ];
-       homepage = "https://chiselapp.com/user/mwm/repository/inilist";
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122234,7 +117696,6 @@ self: {
        version = "0.2.1.0";
        sha256 = "1iw82rzw2w3y40zndz3mxpa7k5ds8zs87ccvp228s4zva0mp5ddl";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/skypers/inject-function";
        description = "Monadic functions with injected parameters";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122375,7 +117836,6 @@ self: {
        libraryHaskellDepends = [
          base containers inline-c template-haskell Win32
        ];
-       homepage = "https://github.com/anton-dessiatov/inline-c-win32";
        description = "Win32 API Context for the inline-c library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122394,7 +117854,6 @@ self: {
          mtl process template-haskell temporary text
        ];
        testHaskellDepends = [ base hspec jni jvm text ];
-       homepage = "http://github.com/tweag/inline-java#readme";
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122429,7 +117888,6 @@ self: {
          base criterion filepath primitive process singletons
          template-haskell vector
        ];
-       homepage = "https://tweag.github.io/HaskellR";
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) R;};
@@ -122450,7 +117908,6 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base text ];
-       homepage = "https://github.com/diffusionkinetics/open/inliterate";
        description = "Interactive literate programming";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122490,7 +117947,6 @@ self: {
          semigroups tasty tasty-quickcheck text transformers
          unordered-containers
        ];
-       homepage = "https://github.com/phadej/insert-ordered-containers#readme";
        description = "Associative containers retaining insertion order for traversals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122502,7 +117958,6 @@ self: {
        version = "0.1.2";
        sha256 = "1m72ysfd2g2jszvcihh7zbfxvpj2a8qjq3ra4vs4bjzpja4kh477";
        libraryHaskellDepends = [ attoparsec base bytestring dlist ];
-       homepage = "http://github.com/tel/inserts";
        description = "Stupid simple bytestring templates";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122537,7 +117992,6 @@ self: {
          base containers ghc mtl template-haskell transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/nomeata/inspection-testing";
        description = "GHC plugin to do inspection testing";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122560,7 +118014,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/skedgeme/inspector-wrecker#readme";
        description = "Create benchmarks from the HAR files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122573,7 +118026,6 @@ self: {
        version = "0.1.2.0";
        sha256 = "0wvb3hia5n0nmfd5ih17qp6f7517s164c5mhrn29ai7vv20x6vbx";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/lazac/instance-control";
        description = "Controls how the compiler searches for instances using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122590,7 +118042,6 @@ self: {
        testHaskellDepends = [
          aeson base instant-generics tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/k0001/instant-aeson";
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122608,7 +118059,6 @@ self: {
        testHaskellDepends = [
          base bytes instant-generics tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/k0001/instant-bytes";
        description = "Generic Serial instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122621,7 +118071,6 @@ self: {
        version = "0.2";
        sha256 = "088fwsj4hllp96ik91wpqyjfjcb5n64sb6b4fqfvplcsn3zzlvv0";
        libraryHaskellDepends = [ base deepseq instant-generics ];
-       homepage = "https://github.com/k0001/instant-deepseq";
        description = "Generic NFData instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122636,7 +118085,6 @@ self: {
        revision = "1";
        editedCabalFile = "1z5224dfrwlz29clxb2x2s4cn88sfgmq4264zj4vgkkgakvp848w";
        libraryHaskellDepends = [ base containers syb template-haskell ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122649,7 +118097,6 @@ self: {
        version = "0.2";
        sha256 = "0xrs81j6dmwd5xb69rn24ibngkhrs51n9kr8bs292vhj0awm3y4b";
        libraryHaskellDepends = [ base hashable instant-generics ];
-       homepage = "https://github.com/k0001/instant-hashable";
        description = "Generic Hashable instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122684,7 +118131,6 @@ self: {
          aeson base bytestring data-default-class HaskellNet HaskellNet-SSL
          http-types network scotty text wai wai-extra
        ];
-       homepage = "https://github.com/spinda/instapaper-sender#readme";
        description = "Basic HTTP gateway to save articles to Instapaper";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122708,7 +118154,6 @@ self: {
        version = "0.1.0.10";
        sha256 = "1bbpjxr8ya46zrhx3nkxkmylbhzkmkav9a7gydz3g2j9ynp4l2fn";
        libraryHaskellDepends = [ array base containers music-diatonic ];
-       homepage = "https://github.com/xpika/chord";
        description = "Render Instrument Chords";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -122725,7 +118170,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/hvr/int-cast";
        description = "Checked conversions between integral types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122745,7 +118189,6 @@ self: {
          base containers hashable tasty tasty-hunit tasty-quickcheck
          unordered-containers
        ];
-       homepage = "https://github.com/metrix-ai/int-multimap";
        description = "A data structure that associates each Int key with a set of values";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122777,7 +118220,6 @@ self: {
          base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
-       homepage = "https://github.com/phadej/integer-logarithms";
        description = "Integer logarithms";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122788,7 +118230,6 @@ self: {
        pname = "integer-pure";
        version = "1.0";
        sha256 = "0lrhf6mw90bfph3hbyxv3n7g2n2xnjfq4qnhyhw4ml76k4yybmxa";
-       homepage = "http://projects.haskell.org/~malcolm/integer-pure";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122812,7 +118253,6 @@ self: {
        version = "0.2.1";
        sha256 = "0bsqad6q4kc0wykswwqykcn6nd4wj6yd9dzpg075h2n1mmg3h9qc";
        libraryHaskellDepends = [ base parallel ];
-       homepage = "https://github.com/ekmett/integration";
        description = "Fast robust numeric integration via tanh-sinh quadrature";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122839,7 +118279,6 @@ self: {
          base bytestring cassava containers lens mtl optparse-generic text
          vector
        ];
-       homepage = "http://github.com/GregorySchwartz/integreat#readme";
        description = "Integrate different assays";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122859,7 +118298,6 @@ self: {
          rdtsc split tagged time unix
        ];
        librarySystemDepends = [ intel_aes ];
-       homepage = "https://github.com/rrnewton/intel-aes/wiki";
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -122872,7 +118310,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1r0gxwbl2k4i9r7jlbmabr1088q8nk1an4nhf79gsx2ybfdzlndh";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/arowM/interchangeable";
        description = "A type class for interchangeable data";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122922,7 +118359,6 @@ self: {
        sha256 = "1yiv24n0mfjzbpm9p6djllhwck3brjz9adzyp6k4fpk430304k7s";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://malde.org/~ketil/";
        description = "Replaces some Prelude functions for enhanced error reporting";
        license = "GPL";
      }) {};
@@ -122956,7 +118392,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring hashable text unordered-containers
        ];
-       homepage = "http://github.com/ekmett/intern/";
        description = "Efficient hash-consing for arbitrary data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -122975,7 +118410,6 @@ self: {
        executableHaskellDepends = [
          base explicit-exception HPDF parsec process transformers utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/internetmarke/";
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123003,7 +118437,6 @@ self: {
          base directory filepath hspec process regex-compat temporary
          transformers
        ];
-       homepage = "https://github.com/commercialhaskell/intero";
        description = "Complete interactive development program for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123028,7 +118461,6 @@ self: {
          base haskell-src-exts HUnit regex-posix syb test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/scvalex/interpol";
        description = "GHC preprocessor and library to enable variable interpolation in strings";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123047,7 +118479,6 @@ self: {
          base base-compat bytestring haskell-src-meta hspec QuickCheck
          quickcheck-instances template-haskell text
        ];
-       homepage = "https://github.com/sol/interpolate#readme";
        description = "String interpolation done right";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -123112,7 +118543,6 @@ self: {
        testHaskellDepends = [
          array base containers QuickCheck utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/interpolation/";
        description = "piecewise linear and cubic Hermite interpolation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123131,7 +118561,6 @@ self: {
          base either lifted-base monad-control transformers
        ];
        testHaskellDepends = [ base Cabal either transformers ];
-       homepage = "https://sealgram.com/git/haskell/interruptible/";
        description = "Monad transformers that can be run and resumed later, conserving their context";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123144,7 +118573,6 @@ self: {
        version = "0.1.2";
        sha256 = "1z0ca16vp3j9l2nkzg8gck2jrysqn2fw4vxr2br0j41fp7iss5wx";
        libraryHaskellDepends = [ base base-prelude transformers ];
-       homepage = "https://github.com/nikita-volkov/interspersed";
        description = "An abstraction over interspersing monadic actions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -123179,7 +118607,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123203,7 +118630,6 @@ self: {
          network-fancy random RSA safe SDL SDL-gfx SDL-mixer SDL-ttf stm
          time transformers vector
        ];
-       homepage = "http://mbays.freeshell.org/intricacy";
        description = "A game of competitive puzzle-design";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -123219,7 +118645,6 @@ self: {
        libraryHaskellDepends = [
          base containers haskell-src-meta mtl template-haskell
        ];
-       homepage = "https://github.com/daig/intrinsic-superclasses#readme";
        description = "A quasiquoter for better instance deriving and default methods";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -123242,7 +118667,6 @@ self: {
          mtl QuickCheck safe text transformers unordered-containers
          writer-cps-mtl
        ];
-       homepage = "https://github.com/minad/intro#readme";
        description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -123258,7 +118682,6 @@ self: {
        libraryHaskellDepends = [ intro ];
        testHaskellDepends = [ intro ];
        doHaddock = false;
-       homepage = "https://github.com/minad/intro-prelude#readme";
        description = "Intro reexported as Prelude";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123280,7 +118703,6 @@ self: {
          string-conv text transformers transformers-base validity
          validity-containers
        ];
-       homepage = "https://github.com/NorfairKing/introduction";
        description = "A prelude for safe new projects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123301,7 +118723,6 @@ self: {
          genvalidity-containers genvalidity-hspec genvalidity-text hspec
          introduction path path-io QuickCheck time
        ];
-       homepage = "https://github.com/NorfairKing/introduction";
        description = "A prelude for the tests of safe new projects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123314,7 +118735,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "044nw8z2ga46mal9pr64vsc714n4dibx0k2lwgnrkk49729c7lk0";
        libraryHaskellDepends = [ base bits-extras bytestring deepseq ];
-       homepage = "https://github.com/pxqr/intset";
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123340,7 +118760,6 @@ self: {
          unordered-containers
        ];
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
-       homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell98 invariant functors";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -123397,7 +118816,6 @@ self: {
        version = "0.2.1";
        sha256 = "0kyi7gq0a792v4lwmpq8i56vzwk6g7cjc3lbpxch47jsqv8lfhbp";
        libraryHaskellDepends = [ base partial-isomorphisms ];
-       homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Invertible syntax descriptions for both parsing and pretty printing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123416,7 +118834,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec hspec-core streaming-bytestring unix
        ];
-       homepage = "https://github.com/mitchellwrosen/io-capture#readme";
        description = "Capture IO actions' stdout and stderr";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123449,7 +118866,6 @@ self: {
        sha256 = "1jqw6g0nm1mx9c6qnbrwr5mpgaiyfjzqwj0r6mzhsvxvzkawip05";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/YoshikuniJujo/io-machine#readme";
        description = "Easy I/O model to learn IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123475,7 +118891,6 @@ self: {
        version = "1.1.1.0";
        sha256 = "0ga85wdvz67jjx8qh6f687kfikcrfmp7winn13v6na7vlaqs2ly7";
        libraryHaskellDepends = [ async base ];
-       homepage = "https://github.com/DanBurton/io-memoize";
        description = "Memoize IO actions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123503,7 +118918,6 @@ self: {
        sha256 = "1w8m21zkhbhqr9lsdzwxfpy0jhb2ciybn3bvhyp3zlxkq9k3yc7f";
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base hspec transformers ];
-       homepage = "https://github.com/Yuras/io-region/wiki";
        description = "Exception safe resource management with dynamic regions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123515,7 +118929,6 @@ self: {
        version = "0.3";
        sha256 = "1ga9bd7iri6vlsxnjx765yy3bxc4lbz644wyw88yzvpjgz6ga3cs";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://github.com/willdonnelly/io-storage";
        description = "A key-value store in the IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123565,7 +118978,6 @@ self: {
          attoparsec base bytestring HUnit io-streams network test-framework
          test-framework-hunit transformers
        ];
-       homepage = "http://snapframework.com/";
        description = "HAProxy protocol 1.5 support for io-streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123595,7 +119007,6 @@ self: {
        revision = "1";
        editedCabalFile = "1q10d2pjhy3k549pw3lid2lda5z4790x0vmg1qajwyapm7q5cma6";
        libraryHaskellDepends = [ base binary bytestring text ];
-       homepage = "https://github.com/clintonmead/io-string-like#readme";
        description = "Classes to handle Prelude style IO functions for different datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123610,7 +119021,6 @@ self: {
        editedCabalFile = "0vm1c6ncb6ckchrmyhk201b2mc3s3z8p59cy49sf6xjza4r3b463";
        libraryHaskellDepends = [ base SafeSemaphore threads ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/rodrigosetti/io-throttle";
        description = "Limit number of IO actions started per second";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -123642,7 +119052,6 @@ self: {
        executableHaskellDepends = [
          base containers ivory ivory-backend-c mtl
        ];
-       homepage = "https://haskellembedded.github.io/";
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123655,7 +119064,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "1iwi1675ggfwfh5as0zj19q4375b58hrb3g4jfn8myrhlhncixpl";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/cocreature/ioref-stable#readme";
        description = "iorefs with a unique stable index";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -123667,7 +119075,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "0bqi5b8j0i56nqm2fw2ylk6qnc2hm41qx36p93hs0f8javpmv1nn";
        libraryHaskellDepends = [ base bytestring path text ];
-       homepage = "http://cs-syd.eu";
        description = "A class of strings that can be involved in IO";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123680,7 +119087,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1nvysb0nmx42q0ilr09nzbsmr7mbbclhgl0iikibhhfb34r2afx0";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tattsun/iothread";
        description = "run IOs in a single thread";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123693,7 +119099,6 @@ self: {
        version = "0.1";
        sha256 = "0ylwrim2wfx3v03syd8v0iwf9kbw9154wlxsp8wc1d3n6sz7p1cc";
        libraryHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/dshearer/iotransaction/";
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123720,7 +119125,6 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base bytestring criterion text
        ];
-       homepage = "https://github.com/andrewthad/haskell-ip#readme";
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123747,7 +119151,6 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base bytestring criterion text
        ];
-       homepage = "https://github.com/andrewthad/haskell-ip#readme";
        description = "Library for IP and MAC addresses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123763,7 +119166,6 @@ self: {
        sha256 = "1819742yjdl96k2z8s55a5x9xw9mg4lps1dq1f55zvc31afkdi4l";
        libraryHaskellDepends = [ base cpu network template-haskell ];
        testHaskellDepends = [ base cpu network tasty tasty-hunit ];
-       homepage = "https://github.com/shlevy/ip-quoter";
        description = "Quasiquoter for IP addresses";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -123775,7 +119177,6 @@ self: {
        version = "8.0.4";
        sha256 = "0fry56zk9nbpqp58qvm1xxbq53pjiahkb58gh2h8dax80q3iczh4";
        libraryHaskellDepends = [ base binary bytestring iproute ];
-       homepage = "http://www.ip2location.com";
        description = "IP2Location Haskell package for IP geolocation";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123790,7 +119191,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base cmdargs IPv6Addr text ];
-       homepage = "https://github.com/MichelBoucey/ip6addr";
        description = "Commandline tool to generate IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123809,7 +119209,6 @@ self: {
          base bytestring darcs directory filepath hashed-storage process
          unix
        ];
-       homepage = "http://darcs.nomeata.de/ipatch";
        description = "interactive patch editor";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123895,7 +119294,6 @@ self: {
          appar base byteorder containers doctest hspec network QuickCheck
          safe
        ];
-       homepage = "http://www.mew.org/~kazu/proj/iproute/";
        description = "IP Routing Table";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -123939,7 +119337,6 @@ self: {
          network old-time pam parsec process random safe template-haskell
          time unix utf8-string
        ];
-       homepage = "http://iptadmin.117.su";
        description = "web-interface for iptables";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -123962,7 +119359,6 @@ self: {
          process SHA temporary text transformers unordered-containers uuid
          zeromq4-haskell
        ];
-       homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -123991,7 +119387,6 @@ self: {
        version = "0.1";
        sha256 = "09n4y93x74wblbz89s1hwzmanwwi72cj0baz72485svarg55kid7";
        libraryHaskellDepends = [ attoparsec base bytestring ];
-       homepage = "https://github.com/kallisti-dev/irc-bytestring";
        description = "serialization and parsing of IRC messages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124012,7 +119407,6 @@ self: {
          profunctors stm stm-chans text time tls transformers x509
          x509-store x509-validation
        ];
-       homepage = "https://github.com/barrucadu/irc-client";
        description = "An IRC client library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124042,7 +119436,6 @@ self: {
          network-conduit-tls profunctors text time tls transformers
          x509-validation
        ];
-       homepage = "https://github.com/barrucadu/irc-conduit";
        description = "Streaming IRC message library using conduits";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124062,7 +119455,6 @@ self: {
          text time vector
        ];
        testHaskellDepends = [ base hashable HUnit text ];
-       homepage = "https://github.com/glguy/irc-core";
        description = "IRC core library for glirc";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -124074,7 +119466,6 @@ self: {
        version = "0.1.3.0";
        sha256 = "16mp9dpp57id760zc932dszd5r1ncskwwxrp0djka5r1alddjz6n";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "https://github.com/barrucadu/irc-ctcp";
        description = "A CTCP encoding and decoding library for IRC clients";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124099,7 +119490,6 @@ self: {
          base bytestring hspec-attoparsec iproute network path tasty
          tasty-hspec tasty-quickcheck utf8-string
        ];
-       homepage = "https://github.com/JanGe/irc-dcc";
        description = "A DCC message parsing and helper library for IRC clients";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124120,7 +119510,6 @@ self: {
          irc-fun-types json-state text time time-interval time-units
          transformers unordered-containers
        ];
-       homepage = "http://rel4tion.org/projects/irc-fun-bot/";
        description = "Library for writing fun IRC bots";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124140,7 +119529,6 @@ self: {
          fast-logger hashable irc-fun-messages irc-fun-types text time
          time-units unordered-containers
        ];
-       homepage = "http://rel4tion.org/projects/irc-fun-client/";
        description = "Another library for writing IRC clients";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124158,7 +119546,6 @@ self: {
          base dlist formatting irc-fun-types text text-show
        ];
        testHaskellDepends = [ base text ];
-       homepage = "http://rel4tion.org/projects/irc-fun-color/";
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124173,7 +119560,6 @@ self: {
        libraryHaskellDepends = [
          base irc-fun-types regex-applicative text
        ];
-       homepage = "http://rel4tion.org/projects/irc-fun-messages/";
        description = "Types and functions for working with the IRC protocol";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -124185,7 +119571,6 @@ self: {
        version = "0.2";
        sha256 = "15q9sfpazrnplj8yp1v641amnw8zcvwb9wp8siy8fbhi6gcx5lip";
        libraryHaskellDepends = [ base hashable text ];
-       homepage = "http://hub.darcs.net/fr33domlover/irc-fun-types";
        description = "Common types for IRC related packages";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -124208,7 +119593,6 @@ self: {
          base bytestring containers directory filepath irc mtl network
          parsec random SafeSemaphore stm time unix
        ];
-       homepage = "https://github.com/stepcut/ircbot";
        description = "A library for writing IRC bots";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124257,7 +119641,6 @@ self: {
          QuickCheck quickcheck-instances rerebase tasty tasty-hunit
          tasty-quickcheck
        ];
-       homepage = "https://github.com/nikita-volkov/iri";
        description = "RFC-based International Resource Identifier library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124286,7 +119669,6 @@ self: {
        executableHaskellDepends = [
          base extra multistate text transformers unordered-containers yaml
        ];
-       homepage = "https://github.com/lspitzner/iridium";
        description = "Automated Local Cabal Package Testing and Uploading";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124299,7 +119681,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "1yi1ia4ii6xg17ndp0v47cix0ds6bbrsbf0pghcmx3y4b55v0dlr";
        libraryHaskellDepends = [ aeson base http-client lens text wreq ];
-       homepage = "https://github.com/arnoblalam/iron_mq_haskell";
        description = "Iron.IO message queueing client library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124321,7 +119702,6 @@ self: {
        executableHaskellDepends = [
          antisplice base chatty chatty-utils mtl transformers
        ];
-       homepage = "http://doomanddarkness.eu/pub/antisplice";
        description = "A technical demo for Antisplice";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124334,7 +119714,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "05a1k70cj4rlaz7yx84m7riz6zhsb588vfyzkza2gr4i5wlhjr6c";
        libraryHaskellDepends = [ ad base data-default-class statistics ];
-       homepage = "https://github.com/argiopetech/irt";
        description = "Item Response Theory functions for use in computerized adaptive testing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124367,7 +119746,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/isdicom";
        description = "An executable and library to determine if a file is a DICOM file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124405,7 +119783,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1mxfs8k0znc7v2iynjnhr4k5c9as4ip37ybvxnvjfqy4dld9rgyg";
        libraryHaskellDepends = [ base unordered-containers ];
-       homepage = "https://github.com/redneb/islink";
        description = "Check if an HTML element is a link";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124447,7 +119824,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "1s15vb00nqxnmm59axapipib1snh6q5qhfdw7pgb9vdsz8i86jqj";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/HugoDaniel/iso639";
        description = "ISO-639-1 language codes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124477,7 +119853,6 @@ self: {
        sha256 = "09h1jfdj9fv1nsryhka2mgl8nig9840f5kv06vyyh7l4l1z767bn";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit time ];
-       homepage = "https://github.com/nh2/iso8601-time";
        description = "Convert to/from the ISO 8601 time format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -124502,7 +119877,6 @@ self: {
        benchmarkHaskellDepends = [
          base binary bytestring criterion tagged type-spec
        ];
-       homepage = "https://github.com/sheyll/isobmff-builder#readme";
        description = "A (bytestring-) builder for the ISO-14496-12 base media file format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124520,7 +119894,6 @@ self: {
          aeson base bytestring data-default ghc-prim http-conduit text
          unordered-containers uri vector
        ];
-       homepage = "https://github.com/reinerp/isohunt";
        description = "Bindings to the isoHunt torrent search API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124540,7 +119913,6 @@ self: {
        testHaskellDepends = [
          base containers hspec megaparsec QuickCheck
        ];
-       homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md";
        description = "Isotopic masses and relative abundances";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124618,7 +119990,6 @@ self: {
          base heap HUnit iteratee ListLike mtl statistics test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
-       homepage = "https://github.com/JohnLato/iter-stats";
        description = "iteratees for statistical processing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124638,7 +120009,6 @@ self: {
          ListLike mtl network old-locale process stringsearch time unix
        ];
        librarySystemDepends = [ zlib ];
-       homepage = "http://www.scs.stanford.edu/~dm/iterIO";
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124654,7 +120024,6 @@ self: {
        libraryHaskellDepends = [
          base mtl tagged template-haskell vector
        ];
-       homepage = "https://github.com/BioHaskell/iterable";
        description = "API for hierarchical multilevel collections";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124684,7 +120053,6 @@ self: {
          base bytestring criterion deepseq exceptions ListLike monad-control
          mtl transformers transformers-base unix
        ];
-       homepage = "http://www.tiresiaspress.us/haskell/iteratee";
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124716,7 +120084,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers ListLike MonadCatchIO-mtl mtl unix
        ];
-       homepage = "http://inmachina.net/~jwlato/haskell/iteratee";
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124747,7 +120114,6 @@ self: {
        libraryHaskellDepends = [
          base iteratee stm stm-chans transformers
        ];
-       homepage = "http://www.tiresiaspress.us/~jwlato/haskell/iteratee-stm";
        description = "Concurrent iteratees using STM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124765,7 +120131,6 @@ self: {
          base bytestring filepath iterIO ListLike monadIO mtl network split
          transformers unix
        ];
-       homepage = "https://github.com/alevy/iterio-server";
        description = "Library for building servers with IterIO";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124796,7 +120161,6 @@ self: {
        libraryHaskellDepends = [
          base binary containers directory haskell98 mtl parsec
        ];
-       homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/";
        description = "Theorem proving library based on dependent type theory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124816,7 +120180,6 @@ self: {
          template-haskell text th-abstraction th-lift
        ];
        libraryToolDepends = [ alex happy ];
-       homepage = "http://ivorylang.org";
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124832,7 +120195,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath HStringTemplate text utf8-string
        ];
-       homepage = "http://ivorylang.org";
        description = "Manage additional data files during Ivory compilation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124853,7 +120215,6 @@ self: {
          ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib
          process srcloc template-haskell
        ];
-       homepage = "http://ivorylang.org";
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124873,7 +120234,6 @@ self: {
          base ivory ivory-backend-c monadLib parsec template-haskell
        ];
        executableHaskellDepends = [ base ivory ivory-backend-c ];
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124893,7 +120253,6 @@ self: {
        testHaskellDepends = [
          base base-compat containers ivory monadLib tasty tasty-hunit
        ];
-       homepage = "http://ivorylang.org";
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124916,7 +120275,6 @@ self: {
          base base-compat ivory ivory-backend-c ivory-opts ivory-stdlib
          monadLib pretty QuickCheck template-haskell
        ];
-       homepage = "http://ivorylang.org/";
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -124930,7 +120288,6 @@ self: {
        sha256 = "0h21r9ij3n49b0m3dcjx22vyxc68v4jifl6yv1wpyn1hgrzxlyck";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
-       homepage = "http://ivorylang.org";
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124949,7 +120306,6 @@ self: {
          base base-compat containers data-reify dlist fgl filepath ivory
          monadLib pretty
        ];
-       homepage = "http://ivorylang.org";
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -124971,7 +120327,6 @@ self: {
          base base-compat directory filepath ivory ivory-backend-c
          ivory-stdlib monadLib process QuickCheck tasty tasty-hunit
        ];
-       homepage = "http://ivorylang.org";
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125001,7 +120356,6 @@ self: {
        sha256 = "1sdbwy5sqa87zidfp7xmxwvfw3xx26kc8m68hgmhsxvs8j6xavmg";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
-       homepage = "http://ivorylang.org";
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125017,7 +120371,6 @@ self: {
        libraryHaskellDepends = [
          base invertible-syntax partial-isomorphisms snap snap-core
        ];
-       homepage = "https://github.com/lilac/ivy-web/";
        description = "A lightweight web framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125031,7 +120384,6 @@ self: {
        sha256 = "0khmfwql4vwj55idsxmhjhrbqzfir3g9wm5lmpvnf77mm95cfpdz";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ wirelesstools ];
-       homepage = "https://github.com/jaor/iwlib";
        description = "Bindings for the iw C library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) wirelesstools;};
@@ -125056,7 +120408,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base preprocessor-tools syb ];
-       homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125087,11 +120438,30 @@ self: {
        libraryHaskellDepends = [
          base containers safecopy syb syb-with-class template-haskell
        ];
-       homepage = "http://happstack.com";
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ixset_1_1" = callPackage
+    ({ mkDerivation, base, Cabal, containers, HUnit, QuickCheck, random
+     , safecopy, semigroups, syb, syb-with-class, template-haskell
+     }:
+     mkDerivation {
+       pname = "ixset";
+       version = "1.1";
+       sha256 = "147fr6hqvbnlrhy7zpxzg1iiciz4gzk2g281fkp4ylklq1lz9c4v";
+       libraryHaskellDepends = [
+         base containers safecopy semigroups syb syb-with-class
+         template-haskell
+       ];
+       testHaskellDepends = [
+         base Cabal containers HUnit QuickCheck random
+       ];
+       description = "Efficient relational queries on Haskell sets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ixset-typed" = callPackage
     ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck
      , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck
@@ -125143,7 +120513,6 @@ self: {
          base ghc-prim indexed language-glsl parsec prettyclass singletons
          template-haskell text
        ];
-       homepage = "https://github.com/schell/ixshader#readme";
        description = "A shallow embedding of the OpenGL Shading Language in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125217,7 +120586,6 @@ self: {
          non-negative semigroups transformers
        ];
        libraryPkgconfigDepends = [ libjack2 ];
-       homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
      }) {inherit (pkgs) libjack2;};
@@ -125243,7 +120611,6 @@ self: {
        version = "0.1";
        sha256 = "03ysmgg5f3dsimskqw5vpnrv5jg4gf1gd0khmf0s1ilfm1jc1nfd";
        libraryHaskellDepends = [ base hosc ];
-       homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125257,7 +120624,6 @@ self: {
        sha256 = "1skpw2jm5g0lylc79n5fk37d3lrvhwb3cmn50wcy4i5nnjvfdijc";
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ghorn/jacobi-roots";
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125288,7 +120654,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
-       homepage = "https://github.com/peti/jailbreak-cabal#readme";
        description = "Strip version restrictions from Cabal files";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -125303,7 +120668,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base deepseq time ];
-       homepage = "https://github.com/jalaali/jalaali-hs";
        description = "Convert Jalaali and Gregorian calendar systems to each other";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125327,7 +120691,6 @@ self: {
          base HUnit QuickCheck random test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/cgo/jalla";
        description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125350,7 +120713,6 @@ self: {
          vector xml
        ];
        executableHaskellDepends = [ base boxes directory filepath ];
-       homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125364,7 +120726,6 @@ self: {
        sha256 = "1phlq2jzvkdr9askpnbryc7aw6mk7121kh2fz5wqr23cs8mg5m6b";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base doctest hspec QuickCheck time ];
-       homepage = "http://github.com/cohei/japanese-holidays#readme";
        description = "Japanese holidays utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125427,7 +120788,6 @@ self: {
        ];
        executableHaskellDepends = [ aeson base bytestring text ];
        testHaskellDepends = [ aeson base bytestring text ];
-       homepage = "https://github.com/Lupino/jason#readme";
        description = "A fast JASONETTE-iOS JSON combinator library for haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125444,7 +120804,6 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base pretty ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://github.com/andreasabel/java-adt";
        description = "Create immutable algebraic data structures for Java";
        license = "unknown";
      }) {};
@@ -125492,7 +120851,6 @@ self: {
        version = "0.0.4";
        sha256 = "1ms8m95mara3pp7qdg8jn2ajbq3zj8pnbs1b9jhpxbdkl5220768";
        libraryHaskellDepends = [ base diet ];
-       homepage = "https://github.com/tonymorris/java-character";
        description = "Functions to simulate Java's Character class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125507,7 +120865,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base random-shuffle ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tobynet/java-poker#readme";
        description = "The etude of the Haskell programming";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -125540,7 +120897,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/NICTA/javaclass";
        description = "Java class files";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125558,7 +120914,6 @@ self: {
          base deepseq ghcjs-base-stub parallel text
        ];
        executableHaskellDepends = [ base ghcjs-base-stub ];
-       homepage = "https://github.com/louispan/javascript-extras#readme";
        description = "Extra javascript functions when using GHCJS";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125575,7 +120930,6 @@ self: {
          base deepseq ghcjs-base-stub parallel text
        ];
        executableHaskellDepends = [ base ghcjs-base-stub ];
-       homepage = "https://github.com/louispan/javascript-extras#readme";
        description = "Extra javascript functions when using GHCJS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125597,7 +120951,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck
        ];
-       homepage = "https://github.com/tonymorris/javasf";
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125615,7 +120968,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck
        ];
-       homepage = "https://github.com/tonymorris/javav";
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125653,7 +121005,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring http-conduit text transformers
        ];
-       homepage = "http://github.com/Herzult/jcdecaux-vls";
        description = "JCDecaux self-service bicycles API client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125673,7 +121024,6 @@ self: {
          base binary bytestring containers mtl network transformers
        ];
        executableHaskellDepends = [ base mtl network ];
-       homepage = "https://github.com/VictorDenisov/jdi";
        description = "Implementation of Java Debug Interface";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125696,7 +121046,6 @@ self: {
          yaml
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
-       homepage = "https://github.com/erikd/jenga";
        description = "Generate a cabal freeze file from a stack.yaml";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125721,7 +121070,6 @@ self: {
          ansi-wl-pprint base bimap optparse-applicative text
        ];
        testHaskellDepends = [ base containers tasty-hspec text ];
-       homepage = "https://github.com/Fuuzetsu/jenkinsPlugins2nix#readme";
        description = "Generate nix for Jenkins plugins";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125752,7 +121100,6 @@ self: {
          arrows base Diff directory filepath hxt tasty tasty-golden
          transformers
        ];
-       homepage = "http://github.com/achudnov/jespresso";
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125798,7 +121145,6 @@ self: {
          contravariant jmacro mtl scientific split text unordered-containers
          vector
        ];
-       homepage = "http://hub.darcs.net/gershomb/jmacro";
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125817,7 +121163,6 @@ self: {
          contravariant jmacro mtl scientific split text unordered-containers
          vector
        ];
-       homepage = "http://hub.darcs.net/gershomb/jmacro";
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125835,7 +121180,6 @@ self: {
          aeson base blaze-html bytestring containers happstack-server jmacro
          jmacro-rpc mtl
        ];
-       homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
        description = "Happstack backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125851,7 +121195,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring containers jmacro jmacro-rpc mtl snap-core
        ];
-       homepage = "http://hub.darcs.net/gershomb/jmacro-rpc";
        description = "Snap backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125872,7 +121215,6 @@ self: {
          protolude text wai wai-extra warp
        ];
        testHaskellDepends = [ base protolude tasty ];
-       homepage = "https://github.com/jml/jml-web-service#readme";
        description = "Common utilities for running a web service";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -125891,7 +121233,6 @@ self: {
        ];
        librarySystemDepends = [ jdk ];
        libraryToolDepends = [ cpphs ];
-       homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) jdk;};
@@ -125917,7 +121258,6 @@ self: {
          async base bytestring data-default directory hspec network
          QuickCheck stm
        ];
-       homepage = "https://github.com/gree/haskell-jobqueue";
        description = "A job queue library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125931,7 +121271,6 @@ self: {
        sha256 = "0bx9cvdhhw7z30qgxwpl0j23z18sx7xyin2y7bwxvg5ga737j8qx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 multisetrewrite stm ];
-       homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html";
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125946,7 +121285,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring lens text url wreq
        ];
-       homepage = "https://github.com/cotrone/join-api#readme";
        description = "Bindings for Join push notifications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125958,7 +121296,6 @@ self: {
        version = "0.3.0";
        sha256 = "0hjlyyylbh471696v9b1jckm7d4gfp1ka978sr1j0005d03gwv35";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -125975,7 +121312,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers HTTP json mtl network old-locale time
        ];
-       homepage = "http://rawr.mschade.me/jonathanscard/";
        description = "An implementation of the Jonathan's Card API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126022,7 +121358,6 @@ self: {
          tasty-quickcheck template-haskell text time unordered-containers
          vector x509
        ];
-       homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -126054,7 +121389,6 @@ self: {
          tasty-quickcheck template-haskell text time unordered-containers
          vector x509
        ];
-       homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126080,7 +121414,6 @@ self: {
          mtl QuickCheck text unordered-containers vector
        ];
        benchmarkHaskellDepends = [ base bytestring criterion cryptonite ];
-       homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126099,7 +121432,6 @@ self: {
          base data-default dhall docopt extra filepath process time turtle
          yaml
        ];
-       homepage = "http://gitlab.com/locallycompact/jot";
        description = "Tiny markdown notebook";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -126124,7 +121456,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
-       homepage = "https://github.com/ndmitchell/js-flot#readme";
        description = "Obtain minified flot code";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126136,7 +121467,6 @@ self: {
        version = "0.0.7";
        sha256 = "0i3r3xl8hi2a3d6hrj77vbfi54bkq4pidrjcz13vz4az9dvz6k75";
        libraryHaskellDepends = [ base wl-pprint ];
-       homepage = "https://github.com/sseefried/js-good-parts.git";
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126152,7 +121482,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HTTP ];
        doCheck = false;
-       homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126219,7 +121548,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base jsaddle lens text ];
-       homepage = "https://github.com/ghcjs/jsaddle-hello";
        description = "JSaddle Hello World, an example package";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126367,7 +121695,6 @@ self: {
          aeson aeson-pretty base bytestring containers data-default hspec
          lens lens-aeson text unordered-containers url
        ];
-       homepage = "https://github.com/toddmohney/json-api";
        description = "Utilities for generating JSON-API payloads";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126384,7 +121711,6 @@ self: {
        libraryHaskellDepends = [
          aeson base indexed indexed-free lens lens-aeson text
        ];
-       homepage = "http://github.com/ocharles/json-assertions.git";
        description = "Test that your (Aeson) JSON encoding matches your expectations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126400,7 +121726,6 @@ self: {
        libraryHaskellDepends = [
          base scientific text unordered-containers vector
        ];
-       homepage = "https://github.com/nikita-volkov/json-ast";
        description = "Universal JSON AST datastructure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126418,7 +121743,6 @@ self: {
          base-prelude contravariant contravariant-extras json-ast
          json-encoder scientific text unordered-containers vector
        ];
-       homepage = "https://github.com/sannsyn/json-ast-json-encoder";
        description = "Encoders of JSON AST";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126434,7 +121758,6 @@ self: {
        libraryHaskellDepends = [
          base json-ast QuickCheck quickcheck-instances
        ];
-       homepage = "https://github.com/nikita-volkov/json-ast-quickcheck";
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126469,7 +121792,6 @@ self: {
          hashable lens mtl optparse-applicative pretty process QuickCheck
          scientific smallcheck text uniplate unordered-containers vector
        ];
-       homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -126501,7 +121823,6 @@ self: {
          hashable lens mtl optparse-applicative pretty process QuickCheck
          scientific smallcheck text uniplate unordered-containers vector
        ];
-       homepage = "https://github.com/mgajda/json-autotype";
        description = "Automatic type declaration for JSON input data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126526,7 +121847,6 @@ self: {
          base bytestring bytestring-nums bytestring-trie
          bytestringparser-temporary containers utf8-string
        ];
-       homepage = "http://github.com/jsnx/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126544,7 +121864,6 @@ self: {
          base blaze-builder blaze-textual bytestring containers text
          unordered-containers utf8-string vector
        ];
-       homepage = "http://github.com/lpsmith/json-builder";
        description = "Data structure agnostic JSON serialization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126562,7 +121881,6 @@ self: {
        ];
        testHaskellDepends = [ base-prelude bytestring text ];
        benchmarkHaskellDepends = [ aeson criterion rebase ];
-       homepage = "https://github.com/nikita-volkov/json-bytes-builder";
        description = "Direct-to-bytes JSON Builder";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126580,7 +121898,6 @@ self: {
          base base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras scientific semigroups text
        ];
-       homepage = "https://github.com/sannsyn/json-encoder";
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126599,7 +121916,6 @@ self: {
          base blaze-builder blaze-builder-enumerator bytestring containers
          enumerator json-types text transformers
        ];
-       homepage = "http://github.com/snoyberg/json-enumerator";
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126617,7 +121933,6 @@ self: {
          aeson base bytestring data-default template-haskell
          unordered-containers yaml
        ];
-       homepage = "https://bitbucket.org/tdammers/json-extra";
        description = "Utility functions to extend Aeson";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126638,7 +121953,6 @@ self: {
          aeson base bytestring filepath hspec mime-types network-uri tagsoup
          text time
        ];
-       homepage = "https://github.com/tfausak/json-feed#readme";
        description = "JSON Feed";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126684,7 +121998,6 @@ self: {
          QuickCheck quickcheck-instances rebase tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "https://github.com/nikita-volkov/json-incremental-decoder";
        description = "Incremental JSON parser with early termination and a declarative DSL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126698,7 +122011,6 @@ self: {
        sha256 = "1rhwlkcap4hk3hj1vf5s93bzvc14gx4n6xsp8n2d8nd5qqybvi2a";
        libraryHaskellDepends = [ base json ];
        testHaskellDepends = [ base hspec json QuickCheck ];
-       homepage = "https://github.com/jonathankochems/json-litobj";
        description = "Extends Text.JSON to handle literal JS objects.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126711,7 +122023,6 @@ self: {
        version = "0.1.2.1";
        sha256 = "1anij6svbkygz9qyssqhz9vyj43gyhsvrypb6fzjl4k5ss7aibq0";
        libraryHaskellDepends = [ attoparsec base-prelude text ];
-       homepage = "https://github.com/sannsyn/json-pointer";
        description = "JSON Pointer parsing and interpretation utilities";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126727,7 +122038,6 @@ self: {
        libraryHaskellDepends = [
          aeson base-prelude json-pointer unordered-containers vector
        ];
-       homepage = "https://github.com/sannsyn/json-pointer-aeson";
        description = "Integration layer for \"json-pointer\" and \"aeson\"";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126744,7 +122054,6 @@ self: {
        testHaskellDepends = [
          aeson either hasql json-pointer rebase transformers
        ];
-       homepage = "https://github.com/sannsyn/json-pointer-hasql";
        description = "JSON Pointer extensions for Hasql";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126762,7 +122071,6 @@ self: {
          aeson base bytestring containers pureMD5 template-haskell
        ];
        libraryPkgconfigDepends = [ python ];
-       homepage = "http://stewart.guru";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126780,7 +122088,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-meta parsec template-haskell
        ];
-       homepage = "http://github.com/finnsson/json-qq";
        description = "Json Quasiquatation library for Haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126807,7 +122114,6 @@ self: {
          QuickCheck stm stm-conduit test-framework
          test-framework-quickcheck2 text transformers unordered-containers
        ];
-       homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -126836,7 +122142,6 @@ self: {
          scientific test-framework test-framework-hunit
          test-framework-quickcheck2 text unordered-containers vector
        ];
-       homepage = "https://github.com/grayjay/json-rpc-client";
        description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126857,7 +122162,6 @@ self: {
        testHaskellDepends = [
          aeson base QuickCheck quickcheck-simple text
        ];
-       homepage = "http://github.com/khibino/haskell-json-rpc-generic";
        description = "Generic encoder and decode for JSON-RPC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126882,7 +122186,6 @@ self: {
          aeson base bytestring HUnit mtl test-framework test-framework-hunit
          text unordered-containers vector
        ];
-       homepage = "https://github.com/grayjay/json-rpc-server";
        description = "JSON-RPC 2.0 on the server side.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -126940,7 +122243,6 @@ self: {
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring libgit time-units
        ];
-       homepage = "http://rel4tion.org/projects/json-state/";
        description = "Keep program state in JSON files";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -126961,7 +122263,6 @@ self: {
          aeson base bytestring directory hspec QuickCheck quickcheck-unicode
          scientific text unordered-containers vector
        ];
-       homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -126979,7 +122280,6 @@ self: {
          aeson attoparsec attoparsec-trans base bytestring scientific text
          transformers unordered-containers vector
        ];
-       homepage = "https://github.com/srijs/haskell-json-togo";
        description = "Effectful parsing of JSON documents";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127022,7 +122322,6 @@ self: {
          aeson aeson-pretty base bytestring containers hspec hspec-core
          hspec-discover hspec-expectations microlens mtl time
        ];
-       homepage = "https://github.com/autotaker/json-tracer#readme";
        description = "A polymorphic, type-safe, json-structured tracing library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127092,7 +122391,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ aeson base bytestring yaml ];
-       homepage = "http://github.com/snoyberg/json2yaml/tree/master";
        description = "Utility to convert a file from JSON to YAML format. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127113,7 +122411,6 @@ self: {
          optparse-applicative process scientific string-qq text
          unordered-containers vector
        ];
-       homepage = "https://github.com/mackeyrms/jsonextfilter#readme";
        description = "Filter select values in JSON objects to unix programs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127130,7 +122427,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring old-locale text time unordered-containers
        ];
-       homepage = "https://github.com/dpwright/jsonresume.hs";
        description = "Parser and datatypes for the JSON Resume format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127184,7 +122480,6 @@ self: {
          neat-interpolation protolude QuickCheck quickcheck-instances
          scientific text uniplate unordered-containers vector
        ];
-       homepage = "https://github.com/garetht/jsons-to-schema/README.md";
        description = "JSON to JSON Schema";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127205,7 +122500,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers process tagged text
        ];
-       homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127226,7 +122520,6 @@ self: {
          optparse-applicative scientific string-qq text unordered-containers
          vector
        ];
-       homepage = "https://github.com/danchoi/jsonsql";
        description = "Interpolate JSON object values into SQL strings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127248,7 +122541,6 @@ self: {
          optparse-applicative scientific string-qq text unordered-containers
          vector
        ];
-       homepage = "https://github.com/danchoi/jsontsv";
        description = "JSON to TSV transformer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127270,7 +122562,6 @@ self: {
          optparse-applicative scientific string-qq text time
          unordered-containers vector xlsx
        ];
-       homepage = "https://github.com/mackeyrms/jsonxlsx#readme";
        description = "json to xlsx converter";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127338,7 +122629,6 @@ self: {
          ansi-wl-pprint attoparsec base directory filepath
          optparse-applicative text unordered-containers yaml
        ];
-       homepage = "https://github.com/slakkenhuis/judge#readme";
        description = "Tableau-based theorem prover for justification logic";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127355,7 +122645,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        librarySystemDepends = [ Judy ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/mwotton/judy";
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127375,7 +122664,6 @@ self: {
          base configurator lens linear matrix optparse-applicative svg-tree
          text
        ];
-       homepage = "https://github.com/domoszlai/juicy-gcode";
        description = "SVG to G-Code converter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127410,7 +122698,6 @@ self: {
        sha256 = "193yy1k1x4lqmpxr2gmk4q59qki6hj1f5c6zz4cqdqa4zcwchi1i";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base criterion hspec ];
-       homepage = "http://github.com/commercialhaskell/jump#readme";
        description = "Nothing to see here, move along";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -127452,7 +122739,6 @@ self: {
          process silently tasty tasty-hunit text transformers
          unordered-containers zeromq4-haskell
        ];
-       homepage = "http://github.com/gibiansky/haskell-jupyter";
        description = "A library for creating and using Jupyter kernels";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127470,7 +122756,6 @@ self: {
        testHaskellDepends = [
          base containers ghc-prim hspec QuickCheck should-not-typecheck
        ];
-       homepage = "https://github.com/matt-noonan/justified-containers";
        description = "Keyed container types with type-checked proofs of key presence";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -127492,7 +122777,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq jni singletons
        ];
-       homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127517,7 +122801,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq jvm split vector
        ];
-       homepage = "http://github.com/tweag/inline-java/tree/master/jvm-batching#readme";
        description = "Provides batched marshalling of values between Java and Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127540,7 +122823,6 @@ self: {
          tasty-discover tasty-hspec tasty-quickcheck text
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/ucla-pls/jvm-binary#readme";
        description = "A library for reading Java class-files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127580,7 +122862,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq jvm streaming text vector
        ];
-       homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme";
        description = "Expose Java iterators as streams from the streaming package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127610,7 +122891,6 @@ self: {
          scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th
          text time unordered-containers vector
        ];
-       homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
        description = "JSON Web Token (JWT) decoding and encoding";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -127639,7 +122919,6 @@ self: {
          scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th
          text time unordered-containers vector
        ];
-       homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
        description = "JSON Web Token (JWT) decoding and encoding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127662,7 +122941,6 @@ self: {
          base bytestring containers HUnit mtl network QuickCheck stm tasty
          tasty-hunit tasty-quickcheck transformers transformers-compat
        ];
-       homepage = "https://github.com/froozen/kademlia";
        description = "An implementation of the Kademlia DHT Protocol";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127681,7 +122959,6 @@ self: {
        testHaskellDepends = [
          base bytestring cereal hspec hspec-discover QuickCheck time
        ];
-       homepage = "https://github.com/abhinav/kafka-client";
        description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127703,7 +122980,6 @@ self: {
        executableHaskellDepends = [
          aeson base binary bytestring cereal linear milena mtl
        ];
-       homepage = "https://bitbucket.org/functionally/kafka-device";
        description = "UI device events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127719,7 +122995,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base GLUT kafka-device OpenGL ];
        executableHaskellDepends = [ base GLUT kafka-device OpenGL ];
-       homepage = "https://bitbucket.org/functionally/kafka-device-glut";
        description = "GLUT events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127741,7 +123016,6 @@ self: {
        executableHaskellDepends = [
          aeson base binary bytestring cereal kafka-device yaml
        ];
-       homepage = "https://bitbucket.org/functionally/kafka-device-joystick";
        description = "Linux joystick events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127761,7 +123035,6 @@ self: {
        executableHaskellDepends = [
          aeson base hleap kafka-device websockets
        ];
-       homepage = "https://bitbucket.org/functionally/kafka-device-leap";
        description = "Leap Motion events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127783,7 +123056,6 @@ self: {
        executableHaskellDepends = [
          aeson base binary bytestring cereal kafka-device yaml
        ];
-       homepage = "https://bitbucket.org/functionally/kafka-device-spacenav";
        description = "Linux SpaceNavigator events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127799,7 +123071,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base kafka-device vrpn ];
        executableHaskellDepends = [ base kafka-device vrpn ];
-       homepage = "https://bitbucket.org/functionally/kafka-device-vrpn";
        description = "VRPN events via a Kafka message broker";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127823,7 +123094,6 @@ self: {
          transformers
        ];
        doHaddock = false;
-       homepage = "https://github.com/sdiehl/kaleidoscope";
        description = "Haskell Kaleidoscope tutorial";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127844,7 +123114,6 @@ self: {
          base Chart Chart-cairo Chart-diagrams hmatrix random-fu
          random-fu-multivariate
        ];
-       homepage = "https://github.com/idontgetoutmuch/Kalman";
        description = "Kalman and particle filters and smoothers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127866,7 +123135,6 @@ self: {
          distributive fail free mtl profunctors semigroupoids tagged
          transformers transformers-compat
        ];
-       homepage = "http://github.com/ekmett/kan-extensions/";
        description = "Kan extensions, Kan lifts, the Yoneda lemma, and (co)density (co)monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127878,7 +123146,6 @@ self: {
        version = "0.4.0";
        sha256 = "1l7b71dhrxd2g3nbqg3h0n5dvgxr23av1cy1f0mvw347y91rx36x";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Binary parsing with random access";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127907,7 +123174,6 @@ self: {
          aeson base containers HUnit-approx tasty tasty-hunit text
        ];
        benchmarkHaskellDepends = [ aeson base containers criterion text ];
-       homepage = "https://github.com/fosskers/kanji";
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127934,7 +123200,6 @@ self: {
          aeson base containers HUnit-approx tasty tasty-hunit text
        ];
        benchmarkHaskellDepends = [ aeson base containers criterion text ];
-       homepage = "https://github.com/fosskers/kanji";
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127955,7 +123220,6 @@ self: {
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
        ];
-       homepage = "https://github.com/ku-fpg/kansas-comet/";
        description = "A JavaScript push mechanism based on the comet idiom";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -127978,7 +123242,6 @@ self: {
          directory dotgen filepath netlist netlist-to-vhdl process random
          sized-types strict template-haskell
        ];
-       homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -127999,7 +123262,6 @@ self: {
          ansi-terminal base bytestring data-default directory filepath
          kansas-lava network sized-types
        ];
-       homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128048,7 +123310,6 @@ self: {
        libraryHaskellDepends = [
          base comonad containers minioperational mtl transformers
        ];
-       homepage = "https://github.com/fumieval/karakuri";
        description = "Good stateful automata";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128077,7 +123338,6 @@ self: {
          aeson base bytestring containers formatting hspec QuickCheck
          raw-strings-qq text vector
        ];
-       homepage = "https://github.com/krapsh/kraps-haskell";
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128132,7 +123392,6 @@ self: {
          aeson async base blaze-builder criterion deepseq directory filepath
          safe-exceptions text time transformers unix
        ];
-       homepage = "https://github.com/Soostone/katip";
        description = "A structured logging framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128164,7 +123423,6 @@ self: {
          aeson base bloodhound criterion deepseq random text
          unordered-containers uuid
        ];
-       homepage = "https://github.com/Soostone/katip";
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128179,7 +123437,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring hw-kafka-client katip
        ];
-       homepage = "https://github.com/s9gf4ult/katip-kafka";
        description = "Katip scribe to send logs to Kafka";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128196,7 +123453,6 @@ self: {
          aeson async base hostname http-client katip rollbar-hs stm-chans
          text time
        ];
-       homepage = "https://github.com/joneshf/katip-rollbar#readme";
        description = "Katip scribe that logs to Rollbar";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128215,7 +123471,6 @@ self: {
        testHaskellDepends = [
          aeson base katip scientific text unordered-containers
        ];
-       homepage = "https://github.com/reactormonk/katip-scalyr-scribe#readme";
        description = "A katip scribe for logging to json";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128232,7 +123487,6 @@ self: {
          aeson base bytestring hsyslog katip string-conv text
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/iconnect/katip-syslog#readme";
        description = "Syslog Katip Scribe";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128255,7 +123509,6 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring mtl ];
        testHaskellDepends = [ base bytestring directory mtl ];
-       homepage = "https://github.com/davnils/katt";
        description = "Client for the Kattis judge system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128279,7 +123532,6 @@ self: {
          base containers directory filepath HUnit hxt json mtl parsec tasty
          tasty-hunit
        ];
-       homepage = "https://github.com/katydid/katydid-haskell";
        description = "A haskell implementation of Katydid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128308,7 +123560,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq directory filepath hxt mtl text
        ];
-       homepage = "https://github.com/katydid/katydid-haskell";
        description = "A haskell implementation of Katydid";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128331,7 +123582,6 @@ self: {
          base directory optparse-applicative text unordered-containers
        ];
        testHaskellDepends = [ base hedgehog text unordered-containers ];
-       homepage = "https://github.com/thoferon/kawa#readme";
        description = "Key-value store in single files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128357,7 +123607,6 @@ self: {
          QuickCheck safe streaming-commons text wai wai-app-static wai-extra
          warp warp-tls
        ];
-       homepage = "https://phabricator.chromabits.com/diffusion/KWAI/";
        description = "Utilities for serving static sites and blogs with Wai/Warp";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128381,7 +123630,6 @@ self: {
          scientific smallcheck tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text
        ];
-       homepage = "https://github.com/thunky-monk/kawhi";
        description = "stats.NBA.com library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -128403,7 +123651,6 @@ self: {
          hspec-expectations HUnit mtl QuickCheck transformers
        ];
        benchmarkHaskellDepends = [ async base containers criterion stm ];
-       homepage = "http://github.com/asakamirai/kazura-queue";
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128419,7 +123666,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://tcana.info/rpoku";
        description = "Rpoku spoken word programming language";
        license = "GPL";
      }) {};
@@ -128438,7 +123684,6 @@ self: {
          xml-conduit xml-types
        ];
        testHaskellDepends = [ base kcd-parser tasty tasty-hunit ];
-       homepage = "https://github.com/marcelbuesing/kcd";
        description = "Kayak .kcd parsing library.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128454,7 +123699,6 @@ self: {
        libraryHaskellDepends = [
          base lens linear vector vector-algorithms
        ];
-       homepage = "http://github.com/bgamari/kd-tree";
        description = "A simple k-d tree implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128493,7 +123737,6 @@ self: {
          base criterion deepseq deepseq-generics heap mersenne-random-pure64
          MonadRandom QuickCheck
        ];
-       homepage = "https://github.com/giogadi/kdt";
        description = "Fast and flexible k-d trees for various types of point queries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128513,7 +123756,6 @@ self: {
          base base16-bytestring bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/aupiff/keccak#readme";
        description = "haskell keccak functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -128541,7 +123783,6 @@ self: {
          aeson base bytestring fast-logger hedis monad-logger text unix
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/jamesdabbs/keenser#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128569,7 +123810,6 @@ self: {
          base directory filepath glib hgettext MissingK setlocale
          utf8-string
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128581,7 +123821,6 @@ self: {
        version = "0.0.3.3";
        sha256 = "00qr5czm0hq3jxwp42fc50v6r458rm9qq9fpri4rhnc41il79nzb";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based controller for MVC applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128598,7 +123837,6 @@ self: {
          base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view
          keera-hails-mvc-view-gtk
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128616,7 +123854,6 @@ self: {
          base containers keera-hails-reactivevalues MissingK stm
          template-haskell
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128634,7 +123871,6 @@ self: {
          base containers keera-hails-reactivevalues MissingK stm
          template-haskell
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - Protected Reactive Models";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128647,7 +123883,6 @@ self: {
        version = "0.0.3.3";
        sha256 = "16c6nh5fqw2r42nxs3x27rqbpscypjzgqnprl99241giwcvy98x1";
        libraryHaskellDepends = [ base directory filepath MissingK ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Easy handling of configuration files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128669,7 +123904,6 @@ self: {
          keera-hails-mvc-view-gtk keera-hails-reactivevalues MissingK mtl
          network network-uri template-haskell
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128682,7 +123916,6 @@ self: {
        version = "0.0.3.3";
        sha256 = "0jkwbpw23ba5z83nfk51hp8wsfkrbbiwr0f6bvx39wzz1v81n58p";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Generic View for MVC applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128696,7 +123929,6 @@ self: {
        libraryHaskellDepends = [
          base gtk gtk-helpers keera-hails-mvc-view
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based View for MVC applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128712,7 +123944,6 @@ self: {
        libraryHaskellDepends = [
          base directory fsnotify keera-hails-reactivevalues system-filepath
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128730,7 +123961,6 @@ self: {
          base bytestring cairo glib gtk gtk-helpers
          keera-hails-reactivevalues mtl transformers
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128745,7 +123975,6 @@ self: {
        libraryHaskellDepends = [
          base keera-hails-reactivevalues network
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128761,7 +123990,6 @@ self: {
        libraryHaskellDepends = [
          base keera-callbacks keera-hails-reactivevalues
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128776,7 +124004,6 @@ self: {
        libraryHaskellDepends = [
          base keera-hails-reactivevalues wx wxcore
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128793,7 +124020,6 @@ self: {
        libraryHaskellDepends = [
          base keera-callbacks keera-hails-reactivevalues time Yampa
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128806,7 +124032,6 @@ self: {
        version = "0.0.1";
        sha256 = "1c72sc68wqvsxhjr7y16k7iw784swk8wfp2j7xw0y0ggdjlamn0x";
        libraryHaskellDepends = [ base keera-hails-reactivevalues lens ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128826,7 +124051,6 @@ self: {
          base directory filepath hlint HUnit mtl process QuickCheck
          regex-posix tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128862,7 +124086,6 @@ self: {
          SDL-mixer setlocale time utf8-string
        ];
        executableSystemDepends = [ SDL_mixer ];
-       homepage = "http://keera.co.uk/projects/keera-posture";
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128919,7 +124142,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit hspec HUnit transformers unix
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Web application deployment manager, focusing on Haskell web frameworks";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128954,7 +124176,6 @@ self: {
        sha256 = "1n8bp8g2w16mb7ifafx4ypyx393lra4r2vnnmasxjc22fvyiwvsl";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/jxv/key-state#readme";
        description = "Manage key and button states and statuses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128970,7 +124191,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
-       homepage = "https://github.com/RyanGlScott/keycode";
        description = "Maps web browser keycodes to their corresponding keyboard keys";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128982,7 +124202,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "0q53nv4babmvj1nzc2my3d88aqm8yxl10rd396y62z7412jvnp5q";
        libraryHaskellDepends = [ base containers vector ];
-       homepage = "https://github.com/wyager/keyed";
        description = "Generic indexing for many data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -128997,7 +124216,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base udbus ];
-       homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129019,7 +124237,6 @@ self: {
          semigroups tagged transformers transformers-compat
          unordered-containers
        ];
-       homepage = "http://github.com/ekmett/keys/";
        description = "Keyed functors and containers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129049,7 +124266,6 @@ self: {
          stm text text-short time token-bucket transformers unbounded-delays
          unix unix-compat utf8-string wai warp zxcvbn-c
        ];
-       homepage = "https://keysafe.branchable.com/";
        description = "back up a secret key securely to the cloud";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129082,7 +124298,6 @@ self: {
          mtl optparse-applicative process raw-strings-qq setenv text
          unordered-containers
        ];
-       homepage = "http://github.com/cdornan/keystore";
        description = "Managing stores of secret things";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129122,7 +124337,6 @@ self: {
        testHaskellDepends = [
          base containers hspec parsec parseerror-eq
        ];
-       homepage = "https://github.com/stackbuilders/keyword-args";
        description = "Extract data from a keyword-args config file format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129143,7 +124357,6 @@ self: {
          aeson base bytestring cmdargs containers directory filepath mtl
          parsec text transformers unix unordered-containers yaml
        ];
-       homepage = "http://khumba.net/projects/khph";
        description = "Command-line file tagging and organization tool";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129177,7 +124390,6 @@ self: {
          pretty-compact QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/kasbah/haskell-kicad-data";
        description = "Parser and writer for KiCad files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129215,7 +124427,6 @@ self: {
          base containers HUnit primitive QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
-       homepage = "https://github.com/JohnLato/kickchan";
        description = "Kick Channels: bounded channels with non-blocking writes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129246,7 +124457,6 @@ self: {
        version = "0.0.1.5";
        sha256 = "169f2b0nn7mkjws6c5sb3mih2p6snhfq42bkfds3zxz01y53v2g5";
        libraryHaskellDepends = [ base ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/kinds";
        description = "Emulation of subkinds and subkind polymorphism";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129267,7 +124477,6 @@ self: {
          directory errors filepath Glob mtl process text unix
          unordered-containers yaml
        ];
-       homepage = "http://github.com/nkpart/kit";
        description = "A dependency manager for Xcode (Objective-C) projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129286,7 +124495,6 @@ self: {
          base base-compat-batteries containers lattices MemoTrie QuickCheck
          range-set-list regex-applicative step-function text transformers
        ];
-       homepage = "https://github.com/phadej/kleene";
        description = "Kleene algebra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129337,7 +124545,6 @@ self: {
        libraryHaskellDepends = [ base mtl vector ];
        executableHaskellDepends = [ base probable vector ];
        benchmarkHaskellDepends = [ base criterion QuickCheck vector ];
-       homepage = "http://github.com/alpmestan/kmeans-vector";
        description = "An implementation of the kmeans clustering algorithm based on the vector package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129350,7 +124557,6 @@ self: {
        sha256 = "0h0jk0pidikk655yw8nwmgrvwknhikjmalhizqspfd28w9ijxprg";
        libraryHaskellDepends = [ array base QuickCheck ];
        testHaskellDepends = [ array base QuickCheck ];
-       homepage = "https://github.com/paolino/kmp-dfa";
        description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129368,7 +124574,6 @@ self: {
          base llvm-extra llvm-tf storable-record storable-tuple tfp
          transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/knead/";
        description = "Repa array processing using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129383,7 +124588,6 @@ self: {
        libraryHaskellDepends = [
          base knead llvm-extra llvm-tf utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/knead-arithmetic/";
        description = "Linear algebra and interpolation using LLVM JIT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129396,7 +124600,6 @@ self: {
        version = "0.1.1";
        sha256 = "05qj7s04p5pbasivyxc06l0jbii250zjnvb3l1y2sfhglb7q8b4c";
        libraryHaskellDepends = [ base bytestring transformers ];
-       homepage = "https://john-millikin.com/software/knob/";
        description = "Memory-backed handles";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -129446,7 +124649,6 @@ self: {
          base bytestring data-default exceptions text transformers-base
          unjson utf8-string yaml
        ];
-       homepage = "https://github.com/scrive/kontra-config";
        description = "JSON config file parsing based on unjson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129490,7 +124692,6 @@ self: {
          aeson base bytestring filepath http-client http-client-tls
          http-types mtl
        ];
-       homepage = "https://github.com/edofic/koofr-api-hs";
        description = "Client to Koofr API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -129506,7 +124707,6 @@ self: {
        executableHaskellDepends = [
          base bio bytestring haskell98 simpleargs
        ];
-       homepage = "http://blog.malde.org/";
        description = "The Korfu ORF Utility";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129523,7 +124723,6 @@ self: {
        editedCabalFile = "0l4qgfjim0g1x9zs7w9mkvrj0dl13km8wximkn7ksczwp174k9ff";
        libraryHaskellDepends = [ base directory filepath mtl time unix ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/hesselink/kqueue";
        description = "A binding to the kqueue event library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129567,7 +124766,6 @@ self: {
          aeson base bytestring containers formatting hspec QuickCheck
          raw-strings-qq text vector
        ];
-       homepage = "https://github.com/krapsh/kraps-haskell";
        description = "Haskell bindings for Spark Dataframes and Datasets";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129594,7 +124792,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion monad-logger mtl
        ];
-       homepage = "https://github.com/cobit/krpc";
        description = "KRPC protocol implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129618,7 +124815,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0lvdb3z73nm5csnrvjd3dvzxm411ns8wz07wcpaxqk26szc5igv1";
        libraryHaskellDepends = [ base directory ];
-       homepage = "https://github.com/kisom/ksystools#readme";
        description = "System management tooling";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -129631,7 +124827,6 @@ self: {
        sha256 = "1s7jw27p96spksja6ks2xdnhyds8diwc5y7h22bj6cq5kglskvxf";
        libraryHaskellDepends = [ base bytestring OpenGL ];
        libraryPkgconfigDepends = [ egl glew ];
-       homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129646,7 +124841,6 @@ self: {
        revision = "2";
        editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3";
        libraryHaskellDepends = [ base dlist transformers ];
-       homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html";
        description = "Combinators for Strategic Programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129658,7 +124852,6 @@ self: {
        version = "0.1.3";
        sha256 = "0bfcmx1fz521vkc2lrbpyvaqcy4c29h5xp6wmyxvgrjjnq32ld1b";
        libraryHaskellDepends = [ base kure template-haskell ];
-       homepage = "http://ittc.ku.edu/~andygill/kure.php";
        description = "Generator for Boilerplate KURE Combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129672,7 +124865,6 @@ self: {
        sha256 = "0wvrmykl1fi135hmsgclyzwhpq5bxy9wqb4s4lp0vd0bghyr9w83";
        libraryHaskellDepends = [ base bytestring cereal ];
        librarySystemDepends = [ kyotocabinet ];
-       homepage = "https://github.com/bitonic/kyotocabinet";
        description = "Mid level bindings to Kyoto Cabinet";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) kyotocabinet;};
@@ -129685,7 +124877,6 @@ self: {
        sha256 = "0ypzkq2rpbmdjfqba72pl3wf6d4wz0z5vmy84dq5m38ij5mlb4y7";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ lbfgsb ];
-       homepage = "http://nonempty.org/software/haskell-l-bfgs-b";
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129698,7 +124889,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "182w8l9h2zw8lxr1fahnmcasbd09z2z00ii7gkmq2y95dm3k4w0a";
        libraryHaskellDepends = [ base text time ];
-       homepage = "https://github.com/louispan/l10n#readme";
        description = "Enables providing localization as typeclass instances in separate files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129733,7 +124923,6 @@ self: {
        version = "0.3.3";
        sha256 = "04rh8c9ncd9radarz4fjka9hc3i6crvibpyj3y8qpij0acmw1d76";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/chrisdone/labels#readme";
        description = "Anonymous records via named tuples";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -129757,7 +124946,6 @@ self: {
          aeson base bytestring cmdlib containers directory hslogger mtl
          random split text transformers uuid
        ];
-       homepage = "https://github.com/lucasdicioccio/laborantin-hs";
        description = "an experiment management framework";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129782,7 +124970,6 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring preamble tasty tasty-hunit
        ];
-       homepage = "https://github.com/swift-nav/labsat";
        description = "LabSat TCP Interface Wrapper";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129805,7 +124992,6 @@ self: {
          base containers derive HTF HUnit lens monad-loops MonadRandom mtl
          parsec QuickCheck random safecopy template-haskell transformers
        ];
-       homepage = "https://github.com/koterpillar/labyrinth";
        description = "A complicated turn-based game";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129840,7 +125026,6 @@ self: {
          vector wai wai-test wai-websockets warp websockets yesod
          yesod-static
        ];
-       homepage = "https://github.com/koterpillar/labyrinth-server";
        description = "A complicated turn-based game - Web server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129854,7 +125039,6 @@ self: {
        sha256 = "00zvbdls0nr4q18889xr8z3cpfldi5gg3m2g7d572bcxvwfhm4y4";
        libraryHaskellDepends = [ base servant servant-foreign text ];
        testHaskellDepends = [ base hspec servant servant-foreign text ];
-       homepage = "https://github.com/tfausak/lackey#readme";
        description = "Generate Ruby clients from Servant APIs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -129875,7 +125059,6 @@ self: {
          ad base hmatrix HUnit nonlinear-optimization test-framework
          test-framework-hunit test-framework-quickcheck2 vector
        ];
-       homepage = "http://github.com/jfischoff/lagrangian";
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129896,7 +125079,6 @@ self: {
          attoparsec base-prelude either record system-fileio system-filepath
          template-haskell text transformers
        ];
-       homepage = "https://github.com/nikita-volkov/laika";
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129923,7 +125105,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/LambdaBridge";
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129944,7 +125125,6 @@ self: {
          base optparse-applicative Shellac Shellac-readline
        ];
        testHaskellDepends = [ base containers hlint hspec HUnit ];
-       homepage = "https://github.com/sgillespie/lambda-calculus#readme";
        description = "A lambda calculus interpreter";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129984,7 +125164,6 @@ self: {
          QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/alios/lambda-devs";
        description = "a Paralell-DEVS implementaion based on distributed-process";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -129997,7 +125176,6 @@ self: {
        version = "0.9.1.0";
        sha256 = "0rylch5v4lpd5ynyhrzzj72npqdv6q8mp2rx9v7p641r0njw5r5n";
        libraryHaskellDepends = [ base containers mtl read-bounded ];
-       homepage = "https://github.com/thomaseding/lambda-options";
        description = "Declarative command line parser using type-driven pattern matching";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -130009,7 +125187,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "0s3y55yqa5js1q3rfq8dgdip6rnjag4w5j5vdldghq9ax5yph3gd";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mmirman/lambda-placeholders";
        description = "A library to emulate laceholders similar to Scala";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130026,7 +125203,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/maciej-bendkowski/lambda-sampler";
        description = "Boltzmann sampler utilities for lambda calculus";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130040,7 +125216,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://scravy.de/blog/2012-02-20/a-lambda-toolbox-in-haskell.htm";
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130055,7 +125230,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
-       homepage = "https://github.com/xkollar/lambda2js";
        description = "Untyped Lambda calculus to JavaScript compiler";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130082,7 +125256,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 html ];
-       homepage = "http://www.cse.unsw.edu.au/~chak/haskell/lambdaFeed/";
        description = "RSS 2.0 feed generator";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130124,7 +125297,6 @@ self: {
          lambdabot-misc-plugins lambdabot-novelty-plugins
          lambdabot-reference-plugins lambdabot-social-plugins mtl
        ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
      }) {};
@@ -130150,7 +125322,6 @@ self: {
          split syb template-haskell time transformers transformers-base unix
          utf8-string zlib
        ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -130177,7 +125348,6 @@ self: {
          parsec pretty process QuickCheck regex-tdfa show split syb
          transformers utf8-string vector-space
        ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
      }) {};
@@ -130195,7 +125365,6 @@ self: {
          base bytestring containers directory filepath lambdabot-core
          lifted-base mtl network SafeSemaphore split time
        ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -130219,7 +125388,6 @@ self: {
          template-haskell time transformers transformers-base unix
          utf8-string zlib
        ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
      }) {};
@@ -130237,7 +125405,6 @@ self: {
          base binary brainfuck bytestring containers dice directory
          lambdabot-core misfortune process random-fu regex-tdfa unlambda
        ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
      }) {};
@@ -130255,7 +125422,6 @@ self: {
          base bytestring containers HTTP lambdabot-core mtl network
          network-uri oeis process regex-tdfa split tagsoup utf8-string
        ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
      }) {};
@@ -130271,7 +125437,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring containers lambdabot-core mtl split time
        ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
      }) {};
@@ -130283,7 +125448,6 @@ self: {
        version = "5.1.0.1";
        sha256 = "11qvpxgv4xbs8iw0lix8mdj174dzj0gwgny7vgvs4vd9pi37sb7r";
        libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ];
-       homepage = "https://wiki.haskell.org/Lambdabot";
        description = "Lambdabot trusted code";
        license = "GPL";
      }) {};
@@ -130304,7 +125468,6 @@ self: {
          process random regex-compat regex-posix syb tagsoup unix
          utf8-string zlib
        ];
-       homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130324,7 +125487,6 @@ self: {
        libraryHaskellDepends = [
          base cmdargs containers dyre glade gtk mtl network webkit
        ];
-       homepage = "http://github.com/baldo/lambdacat";
        description = "Webkit Browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130350,7 +125512,6 @@ self: {
        testHaskellDepends = [
          base classy-prelude classy-prelude-yesod hspec yesod yesod-core
        ];
-       homepage = "http://lambdacms.org";
        description = "LambdaCms 'core' subsite for Yesod apps";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130368,7 +125529,6 @@ self: {
          base directory filepath lambdacms-core persistent shakespeare text
          time yesod yesod-form
        ];
-       homepage = "http://lambdacms.org";
        description = "LambdaCms \"media\" extension";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130397,7 +125557,6 @@ self: {
        libraryHaskellDepends = [
          base bullet lambdacube-engine mtl vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130423,7 +125582,6 @@ self: {
        executableHaskellDepends = [
          aeson base bytestring filepath optparse-applicative
        ];
-       homepage = "http://lambdacube3d.com";
        description = "LambdaCube 3D is a DSL to program GPUs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130440,7 +125598,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring bytestring-trie containers mtl vector
        ];
-       homepage = "http://lambdacube3d.wordpress.com/";
        description = "LambdaCube 3D IR";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130458,7 +125615,6 @@ self: {
          base bytestring bytestring-trie containers ghc-prim lambdacube-core
          mtl vector
        ];
-       homepage = "http://lambdacube3d.wordpress.com/";
        description = "LambdaCube 3D EDSL definition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130479,7 +125635,6 @@ self: {
          directory filepath mtl OpenGLRaw stb-image uulib vect vector
          vector-algorithms xml zip-archive
        ];
-       homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "3D rendering engine written entirely in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130497,7 +125652,6 @@ self: {
        executableHaskellDepends = [
          base elerea GLFW-b lambdacube-engine mtl
        ];
-       homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130517,7 +125671,6 @@ self: {
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
        ];
-       homepage = "http://lambdacube3d.com";
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130552,7 +125705,6 @@ self: {
          lambdacube-edsl lambdacube-gl mtl OpenGLRaw stb-image time vect
          vector
        ];
-       homepage = "http://lambdacube3d.wordpress.com/";
        description = "Samples for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130574,7 +125726,6 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-text text
        ];
-       homepage = "http://github.com/NorfairKing/lambdatex";
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130601,7 +125752,6 @@ self: {
          network-uri resourcet safecopy text transformers transformers-base
          twitter-conduit twitter-types utf8-string
        ];
-       homepage = "http://github.com/ashyisme/lambdatwit";
        description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130634,7 +125784,6 @@ self: {
        executableHaskellDepends = [
          attoparsec attoparsec-enumerator base bytestring enumerator gtk mtl
        ];
-       homepage = "https://github.com/jamwt/lambdiff.git";
        description = "Diff Viewer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130661,7 +125810,6 @@ self: {
          base data-default-class directory filepath hspec htaglib temporary
          text
        ];
-       homepage = "https://github.com/mrkkrp/lame";
        description = "Fairly complete high-level binding to LAME encoder";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130679,7 +125827,6 @@ self: {
          base-noprelude bizzlelude containers semigroups validation
        ];
        testHaskellDepends = [ bizzlelude containers tasty tasty-hunit ];
-       homepage = "http://github.com/TheBizzle";
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130692,7 +125839,6 @@ self: {
        version = "0.2.2";
        sha256 = "1nmyirpf07q7lrgfdqxwaspa173a2g3077gy9k7rpviw8pg2az0w";
        libraryHaskellDepends = [ base bytestring http-streams Mapping ];
-       homepage = "语.ml";
        description = "A Lisp";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130707,7 +125853,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base parsec syb ];
-       homepage = "http://patch-tag.com/r/adept/language-asn1";
        description = "Parsing of ASN1 definitions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130751,7 +125896,6 @@ self: {
          base parsec process QuickCheck tasty tasty-expected-failure
          tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://github.com/knrafto/language-bash/";
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130775,7 +125919,6 @@ self: {
          ansi-terminal base cmdargs containers lens mtl parsec pretty random
          stream-monad time transformers
        ];
-       homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo";
        description = "Interpreter and language infrastructure for Boogie";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130795,7 +125938,6 @@ self: {
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [ base directory filepath process ];
-       homepage = "http://visq.github.io/language-c/";
        description = "Analysis and generation of C code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130809,7 +125951,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base language-c ];
        libraryToolDepends = [ alex ];
-       homepage = "http://github.com/ghulette/language-c-comments";
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130827,7 +125968,6 @@ self: {
          array base containers filepath language-c-quote mainland-pretty
          template-haskell
        ];
-       homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130853,7 +125993,6 @@ self: {
          base bytestring HUnit mainland-pretty srcloc symbol test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/mainland/language-c-quote";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130879,7 +126018,6 @@ self: {
          base bytestring HUnit mainland-pretty srcloc symbol test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/mainland/language-c-quote";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130892,7 +126030,6 @@ self: {
        version = "0.4.0";
        sha256 = "1150fzhkn9zfxmam27wf2nyhai0ab66aaw8fqak559v39p0nri10";
        libraryHaskellDepends = [ base bool-extras ];
-       homepage = "https://github.com/tomlokhorst/language-cil";
        description = "Manipulating Common Intermediate Language AST";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130916,7 +126053,6 @@ self: {
          aeson base directory filepath hspec hspec-megaparsec megaparsec
          pretty QuickCheck semigroups text transformers
        ];
-       homepage = "https://github.com/beijaflor-io/haskell-language-conf#readme";
        description = "Conf parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130941,7 +126077,6 @@ self: {
        sha256 = "1ig9njsc13877kwrfnwiny7qsq1jyd4s5cmjymf380gh7am49ca1";
        libraryHaskellDepends = [ base pretty ];
        testHaskellDepends = [ base hspec raw-strings-qq ];
-       homepage = "https://github.com/kseo/language-dart#readme";
        description = "Manipulating Dart source: abstract syntax and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -130967,7 +126102,6 @@ self: {
          text th-lift th-lift-instances time transformers
          unordered-containers yaml
        ];
-       homepage = "https://github.com/hadolint/language-docker#readme";
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -130989,7 +126123,6 @@ self: {
          base bytestring directory filepath free Glob hspec HUnit mtl parsec
          pretty process QuickCheck split template-haskell text th-lift time
        ];
-       homepage = "https://github.com/hadolint/language-docker#readme";
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131019,7 +126152,6 @@ self: {
          test-framework test-framework-hunit text th-lift th-lift-instances
          transformers unordered-containers yaml
        ];
-       homepage = "https://github.com/beijaflor-io/language-dockerfile#readme";
        description = "Dockerfile linter, parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131059,7 +126191,6 @@ self: {
          mtl parsec QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 uniplate wl-pprint
        ];
-       homepage = "http://github.com/jswebtools/language-ecmascript";
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131084,7 +126215,6 @@ self: {
          filepath HUnit mtl parsec QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 uniplate
        ];
-       homepage = "http://github.com/jswebtools/language-ecmascript";
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131101,7 +126231,6 @@ self: {
        libraryHaskellDepends = [
          base containers language-ecmascript parsec uniplate
        ];
-       homepage = "http://github.com/jswebtools/language-ecmascript-analysis";
        description = "JavaScript static analysis library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131120,7 +126249,6 @@ self: {
          hashable lens mtl parsec pretty text unordered-containers
        ];
        libraryToolDepends = [ alex ];
-       homepage = "https://github.com/scottgw/language-eiffel";
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131134,7 +126262,6 @@ self: {
        sha256 = "07pyj3ibrpa3mrqn6skjpk0w44hi32mm0c08yqpnql3qv2xy4wcz";
        libraryHaskellDepends = [ base MissingH mtl pretty protolude ];
        testHaskellDepends = [ base hspec mtl pretty protolude ];
-       homepage = "https://github.com/eliaslfox/language-elm#readme";
        description = "Generate elm code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131216,7 +126343,6 @@ self: {
        version = "0.2.4";
        sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl";
        libraryHaskellDepends = [ base regex-posix template-haskell ];
-       homepage = "http://github.com/finnsson/template-helper";
        description = "Module to automatically extract functions from the local code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131241,7 +126367,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion directory filepath text
        ];
-       homepage = "https://github.com/beijaflor-io/haskell-language-hcl#readme";
        description = "HCL parsers and pretty-printers for the Haskell programming language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131260,7 +126385,6 @@ self: {
        testHaskellDepends = [
          base directory filepath mtl tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://github.com/vincenthz/language-java";
        description = "Java source manipulation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131300,7 +126424,6 @@ self: {
          array base blaze-builder bytestring Cabal containers hspec mtl
          QuickCheck utf8-light utf8-string
        ];
-       homepage = "https://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131313,7 +126436,6 @@ self: {
        sha256 = "0j87w6sqyl67ad9qar2q240kbzksds3a301cdykjfa3n6a0r81z1";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
-       homepage = "https://github.com/diasbruno/language-js#readme";
        description = "javascript parser for es6 and es7";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131337,7 +126459,6 @@ self: {
        testHaskellDepends = [
          base bytestring QuickCheck smaoin text vocabulary-kadma
        ];
-       homepage = "http://rel4tion.org/projects/language-kort/";
        description = "Parser and serializer for the Kort information language";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131363,7 +126484,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion directory filepath text
        ];
-       homepage = "http://github.com/glguy/language-lua";
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131380,7 +126500,6 @@ self: {
          base haskell-src-meta language-lua mtl syb template-haskell text
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/konn/language-lua-qq#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131407,7 +126526,6 @@ self: {
          base deepseq lexer-applicative QuickCheck semigroups srcloc tasty
          tasty-hunit tasty-quickcheck unordered-containers
        ];
-       homepage = "http://github.com/mitchellwrosen/language-lua2";
        description = "Lua parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131422,7 +126540,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec pretty ];
        executableHaskellDepends = [ base pretty ];
-       homepage = "http://github.com/jtdaugherty/language-mixal/";
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131462,7 +126579,6 @@ self: {
          template-haskell text transformers turtle unordered-containers
          versions
        ];
-       homepage = "https://github.com/awakesecurity/language-ninja";
        description = "A library for dealing with the Ninja build language";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131484,7 +126600,6 @@ self: {
        testHaskellDepends = [
          base base-compat Cabal deepseq doctest lens pretty QuickCheck
        ];
-       homepage = "https://github.com/peti/language-nix#readme";
        description = "Data types and useful functions to represent and manipulate the Nix language";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -131512,7 +126627,6 @@ self: {
        testHaskellDepends = [
          base directory either filepath tasty tasty-hunit
        ];
-       homepage = "https://github.com/blamario/language-oberon";
        description = "Parser and pretty-printer for the Oberon programming language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131531,7 +126645,6 @@ self: {
          process syb
        ];
        libraryToolDepends = [ alex happy ];
-       homepage = "http://www.tiresiaspress.us/haskell/language-objc";
        description = "Analysis and generation of Objective C code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131549,7 +126662,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base bytestring ];
        executableHaskellDepends = [ attoparsec base bytestring ];
-       homepage = "http://www.github.com/bgamari/language-openscad";
        description = "A simple parser for OpenSCAD";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131615,7 +126727,6 @@ self: {
          protolude scientific strict-base-types temporary text transformers
          unordered-containers vector
        ];
-       homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-linux" ];
@@ -131633,7 +126744,6 @@ self: {
          array base containers monads-tf pretty transformers utf8-string
        ];
        libraryToolDepends = [ alex happy ];
-       homepage = "http://github.com/bjpop/language-python";
        description = "Parsing and pretty printing of Python code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131650,7 +126760,6 @@ self: {
        executableHaskellDepends = [
          base haskell98 language-python xhtml
        ];
-       homepage = "http://www.cs.mu.oz.au/~bjpop/";
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131665,7 +126774,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base language-python ];
-       homepage = "http://github.com/bjpop/language-python-test";
        description = "testing code for the language-python library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131683,7 +126791,6 @@ self: {
          base containers either indents llvm-general-pure mtl parsec pretty
          transformers
        ];
-       homepage = "https://github.com/qux-lang/language-qux";
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131714,7 +126821,6 @@ self: {
          aeson base bytestring criterion directory filepath process
          statistics weigh
        ];
-       homepage = "https://github.com/harpocrates/language-rust";
        description = "Parsing and pretty printing of Rust code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131743,7 +126849,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath mtl parsec pcre-light
        ];
-       homepage = "http://code.haskell.org/shsh/";
        description = "A package for parsing shell scripts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131763,7 +126868,6 @@ self: {
          base bytestring HUnit parsec QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
-       homepage = "https://github.com/paulkoerbitz/language-slice";
        description = "AST and parser for the ZeroC Slice language (Specification language for ICE)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131784,7 +126888,6 @@ self: {
        testHaskellDepends = [
          base bytestring criterion random-shuffle time
        ];
-       homepage = "https://github.com/bitonic/language-spelling";
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131801,7 +126904,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers mtl template-haskell utf8-string
        ];
-       homepage = "http://dankna.com/software/";
        description = "Full parser and generator for SQL as implemented by SQLite3";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131824,7 +126926,6 @@ self: {
          ansi-wl-pprint base containers hspec hspec-discover megaparsec
          QuickCheck scientific semigroups text transformers
        ];
-       homepage = "https://github.com/abhinav/language-thrift#readme";
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131837,7 +126938,6 @@ self: {
        version = "0.0.4";
        sha256 = "07lm3d4m7c6j2b5gywqm05189iwkh2zjiv5xwwmcw1fm2a63r2zd";
        libraryHaskellDepends = [ base containers parsec pretty ];
-       homepage = "http://github.com/paf31/language-typescript";
        description = "A library for working with TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -131849,7 +126949,6 @@ self: {
        version = "0.1.3";
        sha256 = "03n5cnr71zq3fl0ajjiyzjq2x2848lwd9gfp4kjkkjaxw0lb6bka";
        libraryHaskellDepends = [ base pretty ];
-       homepage = "https://github.com/markus-git/language-vhdl";
        description = "VHDL AST and pretty printer in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131879,7 +126978,6 @@ self: {
          base blas-ffi comfort-array lapack-ffi netlib-ffi non-empty
          transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/lapack/";
        description = "Numerical Linear Algebra using LAPACK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131897,7 +126995,6 @@ self: {
          base carray lapack-ffi netlib-carray netlib-ffi storable-complex
          transformers
        ];
-       homepage = "http://hub.darcs.net/thielema/lapack-carray/";
        description = "Auto-generated interface to Fortran LAPACK via CArrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131911,7 +127008,6 @@ self: {
        sha256 = "11759avf0kzkqy4s24kn556j93l10x28njpg6h14y915pdl35dyl";
        libraryHaskellDepends = [ base netlib-ffi ];
        libraryPkgconfigDepends = [ liblapack ];
-       homepage = "http://hub.darcs.net/thielema/lapack-ffi/";
        description = "Auto-generated interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131935,7 +127031,6 @@ self: {
          non-empty optparse-applicative parsec pathtype transformers
          unordered-containers utility-ht vector
        ];
-       homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
        description = "Generator for Haskell interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131964,7 +127059,6 @@ self: {
          base base16-bytestring byteable bytes bytestring cereal cryptohash
          deepseq safecopy text transformers
        ];
-       homepage = "https://github.com/factisresearch/large-hashable";
        description = "Efficiently hash (large) Haskell values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -131982,7 +127076,6 @@ self: {
          base binary bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/idontgetoutmuch/largeword";
        description = "Provides Word128, Word192 and Word256 and a way of producing other large words if required";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132033,7 +127126,6 @@ self: {
          pipes-attoparsec pipes-bytestring pipes-http text text-format
          transformers
        ];
-       homepage = "https://github.com/passy/latest-npm-version";
        description = "Find the latest version of a package on npm";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132046,7 +127138,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "1linwqab6z2s91vdxr874vk7rg7gv1ckabsxwmlr80gnhdfgyhmp";
        libraryHaskellDepends = [ base containers utility-ht ];
-       homepage = "http://www.haskell.org/haskellwiki/LaTeX";
        description = "Parse, format and process LaTeX files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132063,7 +127154,6 @@ self: {
          base hakyll latex-formulae-image latex-formulae-pandoc lrucache
          pandoc-types
        ];
-       homepage = "https://github.com/liamoc/latex-formulae#readme";
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132081,7 +127171,6 @@ self: {
          base directory errors filepath JuicyPixels process temporary
          transformers
        ];
-       homepage = "http://github.com/liamoc/latex-formulae#readme";
        description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132104,7 +127193,6 @@ self: {
        executableHaskellDepends = [
          base latex-formulae-image pandoc-types
        ];
-       homepage = "http://github.com/liamoc/latex-formulae#readme";
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132128,7 +127216,6 @@ self: {
        ];
        executableHaskellDepends = [ base HaTeX process template-haskell ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/unitb/latex-function-tables";
        description = "Function table specifications in latex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132155,7 +127242,6 @@ self: {
          tasty-quickcheck transformers universe-instances-base
          unordered-containers
        ];
-       homepage = "http://github.com/phadej/lattices/";
        description = "Fine-grained library for constructing and manipulating lattices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132173,7 +127259,6 @@ self: {
          array base containers hmidi mtl transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132207,7 +127292,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "12f0k2545nk50cvs3gd41dhsfls19xkhvn3avhmgx69y57mhalcy";
        libraryHaskellDepends = [ base ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/lax";
        description = "Lax arrows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132230,7 +127314,6 @@ self: {
        benchmarkHaskellDepends = [
          criterion deepseq either kan-extensions mtl-c timeit
        ];
-       homepage = "https://github.com/luna/layered-state";
        description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132243,7 +127326,6 @@ self: {
        version = "0.1";
        sha256 = "1yn8swgxb908wslcnh04919m9rzy47dxgawns89zw5v1gbq3wmdf";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/duairc/layers";
        description = "Modular type class machinery for monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132287,7 +127369,6 @@ self: {
        version = "0.2.2";
        sha256 = "0rm0w5l4g865ais4rg3vdfx6fyzp1dginlhlabvqclbjwwzkiyqi";
        libraryHaskellDepends = [ base blaze-html containers text ];
-       homepage = "https://bitbucket.org/dpwiz/layout-bootstrap";
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132302,7 +127383,6 @@ self: {
        revision = "1";
        editedCabalFile = "00zh22xvwg5fmycj04xsxyyxvl2zjpskcp7wcng86bbwm5kipydh";
        libraryHaskellDepends = [ alex-tools base text ];
-       homepage = "https://github.com/elliottt/layout-rules";
        description = "A collection of different layout implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132318,7 +127398,6 @@ self: {
        libraryHaskellDepends = [
          base container layered-state prologue terminal-text text
        ];
-       homepage = "https://github.com/luna/layouting";
        description = "General layouting library. Currently supports layouting 2D areas and can be used as a backend for text pretty printing or automatic windows layouting managers.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132331,7 +127410,6 @@ self: {
        version = "0.1";
        sha256 = "02a9iw0ns12hszi5rim4x6pa15y3zycmbcmcwmsr6m31rzgz8ryp";
        libraryHaskellDepends = [ base comonad ];
-       homepage = "https://github.com/nikita-volkov/lazy";
        description = "Explicit laziness for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -132346,7 +127424,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        executableHaskellDepends = [ base bytestring ];
-       homepage = "http://code.haskell.org/lazy-csv";
        description = "Efficient lazy parsers for CSV (comma-separated values)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132394,7 +127471,6 @@ self: {
        version = "0.1.0";
        sha256 = "0fbvm8wwvp4xm4rq2mdfnrra7c88dps91j7ay2vn7iqmpdkcwly9";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kawu/lazy-io";
        description = "Lazy IO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132443,7 +127519,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base transformers unsafe ];
-       homepage = "http://www.haskell.org/haskellwiki/Lazy_IO";
        description = "Run IO actions lazily while respecting their order";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132461,7 +127536,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers data-ordlist time timeit
        ];
-       homepage = "https://github.com/happyherp/lazyset";
        description = "Set and Map from lazy/infinite lists";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132474,7 +127548,6 @@ self: {
        version = "0.6";
        sha256 = "0lqggm75m1qd34lzqj3ibvnjwhjqvq16cab8zxm4yzn7j2sxzm4x";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.cs.york.ac.uk/~mfn/lazysmallcheck/";
        description = "A library for demand-driven testing of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132511,7 +127584,6 @@ self: {
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/lca/";
        description = "O(log n) persistent online lowest common ancestor search without preprocessing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132523,7 +127595,6 @@ self: {
        version = "0.2";
        sha256 = "1w8z80vqb86zl6ap4nd87kpl91qms8310k1d8r6qrxg2skm6gnxl";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://urchin.earth.li/~ian/cabal/lcs/";
        description = "Find longest common sublist of two lists";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132536,7 +127607,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1mi94kdc61d4vhzvcr4gvzy3zl2wrd4i353gpmmaxp652rm9xm99";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/savannidgerinel/intervals#readme";
        description = "Data structures for representing arbitrary intervals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132552,7 +127622,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim mtl random-fu random-source rvar vector
        ];
-       homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Online Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132571,7 +127640,6 @@ self: {
          containers network semigroups stm text
        ];
        testHaskellDepends = [ base bytestring hspec process semigroups ];
-       homepage = "https://supki.github.io/ldap-client";
        description = "Pure Haskell LDAP Client Library";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -132613,7 +127681,6 @@ self: {
          base bytestring cmdargs containers filepath
        ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "http://rampa.sk/static/ldif.html";
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132633,7 +127700,6 @@ self: {
        executableHaskellDepends = [
          base blaze-html directory filepath pandoc split
        ];
-       homepage = "https://github.com/skypers/leaf";
        description = "A simple portfolio generator";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132653,7 +127719,6 @@ self: {
          base cpphs deepseq-bounded deepseq-generics generics-sop random
          seqaid template-haskell
        ];
-       homepage = "http://fremissant.net/leaky";
        description = "Robust space leak, and its strictification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132667,7 +127732,6 @@ self: {
        sha256 = "1mz6fwh3rbwkfx514imh044v1ng7065sd5bivcd94xw0cb530p3f";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/rudymatela/leancheck#readme";
        description = "Cholesterol-free property-based testing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132707,7 +127771,6 @@ self: {
        sha256 = "1mm8j994106gyx9p3widkydczn8wcj79m2kiymg9fjkhmxyb4fyd";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base QuickCheck time ];
-       homepage = "https://github.com/bjornbm/leapseconds-announced";
        description = "Leap seconds announced at library release time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132774,7 +127837,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq hmatrix random-fu random-source vector
        ];
-       homepage = "https://github.com/mnacamura/learning-hmm";
        description = "Yet another library for hidden Markov models";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -132789,7 +127851,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers ];
-       homepage = "http://github.com/phaazon/leetify";
        description = "Leetify text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132825,7 +127886,6 @@ self: {
          http-types monad-logger network Ranged-sets scotty scotty-resource
          stm text time transformers unix uuid wai wai-extra warp
        ];
-       homepage = "https://github.com/owensmurray/legion#readme";
        description = "Distributed, stateful, homogeneous microservice framework";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132852,7 +127912,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/owensmurray/legion-discovery#readme";
        description = "A discovery service based on Legion";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132873,7 +127932,6 @@ self: {
          text-show transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/owensmurray/legion-discovery-client#readme";
        description = "Client library for communicating with legion-discovery";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132896,7 +127954,6 @@ self: {
          safe split stm transformers yaml
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/owensmurray/legion-extra#readme";
        description = "Extra non-essential utilities for building legion applications";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132935,7 +127992,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        executableHaskellDepends = [ base gi-gtk-hs leksah-server stm ];
-       homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132974,7 +128030,6 @@ self: {
          base conduit conduit-extra directory doctest filepath hslogger
          HUnit process resourcet text transformers
        ];
-       homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -132992,7 +128047,6 @@ self: {
          aeson base blaze-builder bytestring HsOpenSSL http-streams
          io-streams mtl scientific text vector
        ];
-       homepage = "https://www.lendingclub.com/developers/lc-api.action";
        description = "Bindings for the LendingClub marketplace API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133034,7 +128088,6 @@ self: {
          base bytestring comonad containers criterion deepseq
          generic-deriving transformers unordered-containers vector
        ];
-       homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -133048,7 +128101,6 @@ self: {
        revision = "2";
        editedCabalFile = "1yk1zjwp7sabh90rgz4sa15vqj1wq837nypqjb0qhymslmrnvvnl";
        libraryHaskellDepends = [ accelerate base lens ];
-       homepage = "https://github.com/tmcdonell/lens-accelerate";
        description = "Instances to mix lens with accelerate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133060,7 +128112,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk";
        libraryHaskellDepends = [ accelerate base lens ];
-       homepage = "https://github.com/tmcdonell/lens-accelerate";
        description = "Instances to mix lens with accelerate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133081,7 +128132,6 @@ self: {
          semigroups transformers
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/lens-action/";
        description = "Monadic Getters and Folds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133105,7 +128155,6 @@ self: {
        testHaskellDepends = [
          base doctest generic-deriving semigroups simple-reflect
        ];
-       homepage = "http://github.com/lens/lens-aeson/";
        description = "Law-abiding lenses for aeson";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -133117,7 +128166,6 @@ self: {
        version = "0.3";
        sha256 = "1m6cns38xggw8kcc9h0mf4q024cvc8njm7n33f8gi7hwyxxqs7xv";
        libraryHaskellDepends = [ base lens time ];
-       homepage = "https://github.com/nilcons/lens-datetime";
        description = "Lenses for Data.Time.* types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133158,7 +128206,6 @@ self: {
        editedCabalFile = "190jxqskd61irc97zb95h08zlkszlhpik4zmb7y4vk7x06zz00m6";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec lens-family template-haskell ];
-       homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133170,7 +128217,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "11pwdqnjd0gybjrfz79fbd9vdwcimkzqqr91zy6hswlylp42dvq1";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/google/proto-lens";
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133182,7 +128228,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1nn0qp0xl65wc5axy68jlmif1k97af8v5r09sf02fw3iww7ym7wj";
        libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
-       homepage = "https://github.com/google/proto-lens#readme";
        description = "Integration of lenses with OverloadedLabels";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133195,7 +128240,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1w6y1caah0yr7gilwsv7ji7pp3mz1m9wlx5zpq0n0z1q2wbdsmfp";
        libraryHaskellDepends = [ base lens template-haskell ];
-       homepage = "https://github.com/vmchale/lens-named#readme";
        description = "Helper for use with lens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133213,7 +128257,6 @@ self: {
          array base bytestring containers contravariant either hashable lens
          mtl text time transformers unordered-containers vector
        ];
-       homepage = "https://github.com/andrewthad/lens-prelude";
        description = "Alternate prelude that exports lens combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133228,7 +128271,6 @@ self: {
        revision = "1";
        editedCabalFile = "1b9db7dbfq46q63y6w1471nffj77rb363rk4b1l3l23g15cq6a5i";
        libraryHaskellDepends = [ base lens QuickCheck transformers ];
-       homepage = "http://github.com/ekmett/lens/";
        description = "QuickCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133249,7 +128291,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath regex-posix
        ];
-       homepage = "https://github.com/himura/lens-regex";
        description = "Lens powered regular expression";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133265,7 +128306,6 @@ self: {
        libraryHaskellDepends = [
          base lens-family lens-family-core lens-family-th mtl transformers
        ];
-       homepage = "https://github.com/michaelt/lens-simple";
        description = "simplified import of elementary lens-family combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133290,7 +128330,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1yxab87ci6gl0c5gsdd8pb780ai8lmxxa3fxkpl1shv1pw124fsv";
        libraryHaskellDepends = [ base bytestring lens text ];
-       homepage = "http://github.com/iand675/text-lens-encoding";
        description = "Isomorphisms and prisms for text <=> bytestring conversions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133320,7 +128359,6 @@ self: {
        testHaskellDepends = [
          base containers dwergaz hlint lens-family text toml-parser
        ];
-       homepage = "https://github.com/xngns/lens-toml-parser";
        description = "Lenses for toml-parser";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133351,7 +128389,6 @@ self: {
          aeson base containers data-default lens monoid split
          template-haskell
        ];
-       homepage = "https://github.com/luna/lens-utils";
        description = "Collection of missing lens utilities";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133367,7 +128404,6 @@ self: {
        editedCabalFile = "07dj8g29p5pg57pn9l2l1960vs1ikqr6z6hc47kgw8hf4y78i6sy";
        libraryHaskellDepends = [ base lens xml ];
        testHaskellDepends = [ base lens xml ];
-       homepage = "https://github.com/nkpart/lens-xml#readme";
        description = "Lenses for the xml package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133379,7 +128415,6 @@ self: {
        version = "0.1.7";
        sha256 = "09p1ph5ih2dzrbn7h9wjnf4xch04g0amf8cc3q64g5a2clg3vjx4";
        libraryHaskellDepends = [ base mtl template-haskell ];
-       homepage = "http://github.com/jvranish/Lenses/tree/master";
        description = "Simple Functional Lenses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133393,7 +128428,6 @@ self: {
        sha256 = "0dj43hqrv198dgfnngq4l8kwnksqcm6nydcr1z1a5gqz5s99m4bn";
        libraryHaskellDepends = [ base monad-control mtl transformers ];
        testHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/haskellwiki/LGtk";
        description = "References which can be joined and on which lenses can be applied";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133421,7 +128455,6 @@ self: {
          natural-sort optparse-applicative parsec pipes regex-tdfa
          semigroups terminal-progress-bar text transformers
        ];
-       homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -133467,7 +128500,6 @@ self: {
        version = "0.4.1";
        sha256 = "1l5jyhpvbcj4fmyggp8bjy4gx9igcydply3yb1s23fxdcz0b638a";
        libraryHaskellDepends = [ base fmlist ];
-       homepage = "http://github.com/sebfisch/level-monad";
        description = "Non-Determinism Monad for Level-Wise Search";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -133492,7 +128524,6 @@ self: {
          base bytestring data-default directory exceptions mtl QuickCheck
          tasty tasty-quickcheck temporary transformers
        ];
-       homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) leveldb;};
@@ -133516,7 +128547,6 @@ self: {
          base bytestring data-default hspec hspec-expectations mtl process
          QuickCheck transformers
        ];
-       homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133529,7 +128559,6 @@ self: {
        version = "1.2.1.8";
        sha256 = "0v2mfqw4irzpfq100i1rm5djfqzvxilq9i7pcslsb92jkcv2zgbc";
        libraryHaskellDepends = [ base bindings-levmar hmatrix vector ];
-       homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133561,7 +128590,6 @@ self: {
        testHaskellDepends = [
          base deepseq regex-applicative srcloc tasty tasty-hunit
        ];
-       homepage = "https://github.com/feuerbach/lexer-applicative";
        description = "Simple lexer based on applicative regular expressions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -133574,7 +128602,6 @@ self: {
        sha256 = "1x7in410k930fc3qc8ng1i04ggxy75xw30r710wlk0rra9xidxfs";
        libraryHaskellDepends = [ base containers doctest lattices ];
        testHaskellDepends = [ base doctest QuickCheck ];
-       homepage = "https://github.com/ci-fst/lfst";
        description = "L-Fuzzy Set Theory implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133603,7 +128630,6 @@ self: {
          array base containers diagrams-lib lens mtl random random-shuffle
          vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/LGtk";
        description = "Lens GUI Toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133616,7 +128642,6 @@ self: {
        version = "0.1.2";
        sha256 = "0a5h1d0sdnpy209k4zkmcrrxl4b000226hif098bqs9pngpbgki1";
        libraryHaskellDepends = [ haskell2010 ];
-       homepage = "https://github.com/bytbox/lha.hs";
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133637,7 +128662,6 @@ self: {
          array base containers directory filepath hgettext mtl parsec
          process setlocale utf8-string wx wxcore
        ];
-       homepage = "http://www.imn.htwk-leipzig.de/~abau/lhae";
        description = "Simple spreadsheet program";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133652,7 +128676,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
-       homepage = "http://lhc.seize.it/";
        description = "LHC Haskell Compiler";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133684,7 +128707,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs filepath haskell-src-exts syb uu-parsinglib
        ];
-       homepage = "http://spockz.github.com/lhs2texhl/";
        description = "Literate highlighter preprocessor for lhs2tex";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133720,7 +128742,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath mtl process regex-compat
        ];
-       homepage = "https://github.com/kosmikus/lhs2tex";
        description = "Preprocessor for typesetting Haskell sources with LaTeX";
        license = "GPL";
      }) {};
@@ -133736,7 +128757,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath process regex-posix
        ];
-       homepage = "https://github.com/tvh/lhslatex";
        description = "Tool for using pdflatex with .lhs files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133754,7 +128774,6 @@ self: {
        libraryHaskellDepends = [
          base binary containers HUnit mtl parsec process QuickCheck
        ];
-       homepage = "http://trac.loria.fr/~geni";
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133792,7 +128811,6 @@ self: {
        librarySystemDepends = [ libconfig ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base doctest doctest-prop lens ];
-       homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133814,7 +128832,6 @@ self: {
        testHaskellDepends = [
          base directory filepath mtl test-framework
        ];
-       homepage = "https://github.com/tomgr/libcspm";
        description = "A library providing a parser, type checker and evaluator for CSPM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -133853,7 +128870,6 @@ self: {
        version = "0.3.1";
        sha256 = "08km9y2wqz426c5c6r49ar5snl8ss1w7d55yqivksdkwk3fn0k0x";
        libraryHaskellDepends = [ base mtl process ];
-       homepage = "https://github.com/vincenthz/hs-libgit";
        description = "Simple Git Wrapper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133869,7 +128885,6 @@ self: {
        libraryHaskellDepends = [
          array base containers monads-tf process union-find
        ];
-       homepage = "http://maartenfaddegon.nl";
        description = "Store and manipulate data in a graph";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133893,7 +128908,6 @@ self: {
        testHaskellDepends = [
          base bytestring ghc ghc-paths hspec mtl syb
        ];
-       homepage = "https://bitbucket.org/bhris/libhbb";
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134004,7 +129018,6 @@ self: {
          temporary test-framework test-framework-quickcheck2
          test-framework-th text time transformers
        ];
-       homepage = "https://gitlab.com/theunixman/liblawless";
        description = "Prelude based on protolude for GHC 8 and beyond";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134019,7 +129032,6 @@ self: {
        libraryHaskellDepends = [
          base bindings-DSL enumerator mtl vector
        ];
-       homepage = "http://github.com/NathanHowell/liblinear-enumerator";
        description = "liblinear iteratee";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134034,7 +129046,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mainland/libltdl";
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134090,7 +129101,6 @@ self: {
          attoparsec base bytestring containers data-default-class filepath
          hspec mtl network old-locale QuickCheck text time unix utf8-string
        ];
-       homepage = "http://github.com/vimus/libmpd-haskell#readme";
        description = "An MPD client library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -134121,7 +129131,6 @@ self: {
        testHaskellDepends = [
          base bytestring Cabal HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/nvidia-compiler-sdk/hsnvvm";
        description = "FFI binding to libNVVM, a compiler SDK component from NVIDIA";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134144,7 +129153,6 @@ self: {
        libraryPkgconfigDepends = [ liboath ];
        executableHaskellDepends = [ base bytestring time ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/parsonsmatt/liboath-hs#readme";
        description = "Bindings to liboath";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134161,7 +129169,6 @@ self: {
        libraryHaskellDepends = [
          base CC-delcont containers mtl template-haskell unix
        ];
-       homepage = "http://okmij.org/ftp/";
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134189,7 +129196,6 @@ self: {
        sha256 = "11s8zaxq7qwzqdgyfd3v7sk6vf5cq3wzv2j02g0gnri9w45wf2i7";
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ postgresql ];
-       homepage = "http://github.com/tnarg/haskell-libpq";
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134202,7 +129208,6 @@ self: {
        version = "0.0.1.0";
        sha256 = "07xg59f48jw78mjbx83bz1rc2fxvdnlb08cdfd7hwkj43a127kxn";
        libraryHaskellDepends = [ base bytestring curl ];
-       homepage = "https://github.com/supki/haskell-random.org";
        description = "Wrapper to Random.org API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134224,7 +129229,6 @@ self: {
          http-types mtl resourcet text unordered-containers uri-templater
          vector
        ];
-       homepage = "https://github.com/SaneTracker/librato";
        description = "Bindings to the Librato API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134244,7 +129248,6 @@ self: {
          base bytestring cryptonite data-default-class dns memory random
          text uri-bytestring url
        ];
-       homepage = "https://hub.darcs.net/fr33domlover/libravatar";
        description = "Use Libravatar, the decentralized avatar delivery service";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -134257,7 +129260,6 @@ self: {
        sha256 = "11yg74v290s4dy5bn94hb0lwncbbxqljgjldaxr80iy9c52z9hzi";
        libraryHaskellDepends = [ base split ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://ahakki.xyz";
        description = "Use Roman Numerals as a Numeric Datatype (sort of)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134276,7 +129278,6 @@ self: {
        librarySystemDepends = [ libssh2 ];
        libraryPkgconfigDepends = [ libssh2 ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/portnov/libssh2-hs";
        description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libssh2;};
@@ -134294,7 +129295,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring conduit libssh2 stm transformers
        ];
-       homepage = "https://github.com/portnov/libssh2-hs";
        description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134311,7 +129311,6 @@ self: {
          aeson attoparsec base bytestring containers data-default
          http-conduit profunctors text
        ];
-       homepage = "https://github.com/supki/libstackexchange";
        description = "StackExchange API interface";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134352,10 +129351,9 @@ self: {
          vector
        ];
        libraryPkgconfigDepends = [ systemd ];
-       homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-     }) {systemd = null;};
+     }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
     ({ mkDerivation, base, bytestring, glib, taglib }:
@@ -134367,7 +129365,6 @@ self: {
        libraryHaskellDepends = [ base bytestring glib ];
        librarySystemDepends = [ taglib ];
        libraryPkgconfigDepends = [ taglib ];
-       homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home";
        description = "Binding to TagLib C library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134382,7 +129379,6 @@ self: {
        libraryHaskellDepends = [ base syb unix ];
        libraryPkgconfigDepends = [ libvirt ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134395,7 +129391,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "19mx07gvwsqhbish8cbbiplgpw75birn19sl0hhn2300kpryyxfb";
        libraryHaskellDepends = [ base bytestring cpu ];
-       homepage = "https://github.com/the-real-blackh/libvorbis";
        description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134438,7 +129433,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring enumerator libxml-sax text transformers xml-types
        ];
-       homepage = "http://john-millikin.com/software/libxml-enumerator/";
        description = "Enumerator-based API for libXML's SAX interface";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134453,7 +129447,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text xml-types ];
        librarySystemDepends = [ libxml2 ];
        libraryPkgconfigDepends = [ libxml2 ];
-       homepage = "https://john-millikin.com/software/haskell-libxml/";
        description = "Bindings for the libXML2 SAX interface";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) libxml2;};
@@ -134503,7 +129496,6 @@ self: {
        executableHaskellDepends = [
          base Cabal cmdargs containers directory
        ];
-       homepage = "https://github.com/jpvillaisaza/licensor";
        description = "A license compatibility helper";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -134518,7 +129510,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base GLUT OpenGL random ];
-       homepage = "http://github.com/sproingie/haskell-cells/";
        description = "Conway's Life cellular automaton";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134539,7 +129530,6 @@ self: {
        testHaskellDepends = [
          base base-compat generic-deriving hspec template-haskell
        ];
-       homepage = "https://github.com/RyanGlScott/lift-generics";
        description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134572,7 +129562,6 @@ self: {
          tasty-th
        ];
        benchmarkHaskellDepends = [ async base criterion deepseq ];
-       homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134594,7 +129583,6 @@ self: {
          tasty-expected-failure tasty-hunit tasty-th
        ];
        benchmarkHaskellDepends = [ async base criterion deepseq ];
-       homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134617,7 +129605,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion monad-control monad-peel transformers
        ];
-       homepage = "https://github.com/basvandijk/lifted-base";
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134635,7 +129622,6 @@ self: {
          async base bytestring containers deepseq exceptions ghc-prim
          lifted-async lifted-base mtl safe stm text transformers
        ];
-       homepage = "https://github.com/parsonsmat/lifted-protolude";
        description = "A sensible set of defaults for writing lifted custom Preludes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134653,7 +129639,6 @@ self: {
          array base monad-finally stm transformers transformers-abort
          transformers-base transformers-compat
        ];
-       homepage = "https://github.com/mvv/lifted-stm";
        description = "STM operations lifted through monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134670,7 +129655,6 @@ self: {
        libraryHaskellDepends = [
          base monad-control threads transformers-base
        ];
-       homepage = "https://github.com/scrive/lifted-threads";
        description = "lifted IO operations from the threads library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134689,7 +129673,6 @@ self: {
        executableHaskellDepends = [
          array base bitmap bytestring directory filepath gloss mtl stb-image
        ];
-       homepage = "http://icfpcontest2012.wordpress.com/";
        description = "A boulderdash-like game and solution validator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134714,7 +129697,6 @@ self: {
        version = "0.2";
        sha256 = "1hxfx514ar9hr9gqzzdgd7avfvlsvr7lv6hgza5k04b2xm73ysrp";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/spl/ligd";
        description = "Lightweight Implementation of Generics and Dynamics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134729,7 +129711,6 @@ self: {
        sha256 = "1lhwir14di3chnj6xn28cwkzmim5d4cq39da82ils6mhghjgzjbg";
        libraryHaskellDepends = [ base containers gjk2d lens linear mtl ];
        testHaskellDepends = [ base containers lens linear QuickCheck ];
-       homepage = "https://github.com/suzumiyasmith/light#readme";
        description = "a simple physics engine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134751,7 +129732,6 @@ self: {
        testHaskellDepends = [
          aeson api-builder base bytestring hspec text transformers
        ];
-       homepage = "https://github.com/cmoresid/lightning-haskell#readme";
        description = "Haskell client for lightning-viz REST API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134820,7 +129800,6 @@ self: {
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
        ];
-       homepage = "https://github.com/amosr/limp";
        description = "representation of Integer Linear Programs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134835,7 +129814,6 @@ self: {
        libraryHaskellDepends = [ base containers limp vector ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base limp ];
-       homepage = "https://github.com/amosr/limp-cbc";
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134889,7 +129867,6 @@ self: {
        executableHaskellDepends = [
          base containers hashable mtl random-fu rosezipper text uuid warp
        ];
-       homepage = "https://oss.xkcd.com/";
        description = "Zen gardening, based on l-systems";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -134902,7 +129879,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "07gz4lbvyzahffcp6f1f87zl20kf834iswh671vb8vxffigrz5y1";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/reinh/hs-lindenmayer";
        description = "L-systems in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -134926,7 +129902,6 @@ self: {
          hspec-wai QuickCheck quickcheck-instances raw-strings-qq scotty
          text time transformers
        ];
-       homepage = "https://github.com/utatti/line";
        description = "Haskell SDK for the LINE API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -134953,7 +129928,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "xy30.com";
        description = "Display the number of bytes of each line";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -134998,7 +129972,6 @@ self: {
          base binary bytestring deepseq doctest HUnit lens reflection
          simple-reflect test-framework test-framework-hunit vector
        ];
-       homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135018,7 +129991,6 @@ self: {
          accelerate base distributive lens linear
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/linear-accelerate/";
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135036,7 +130008,6 @@ self: {
          accelerate base distributive lens linear
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/linear-accelerate/";
        description = "Lifting linear vector spaces into Accelerate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135058,7 +130029,6 @@ self: {
        executableHaskellDepends = [
          QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://github.com/cartazio/hs-cblas";
        description = "A linear algebra library with bindings to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135079,7 +130049,6 @@ self: {
          base comfort-graph containers non-empty QuickCheck transformers
          utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/linear-circuit";
        description = "Compute resistance of linear electrical circuits";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135123,7 +130092,6 @@ self: {
        libraryHaskellDepends = [
          base distributive lens linear OpenGL OpenGLRaw tagged
        ];
-       homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135154,7 +130122,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0i6z10pgqcykkygl6kq63phx5hvwi2d84j2f5vw4nrnic59sm9jy";
        libraryHaskellDepends = [ base random ];
-       homepage = "https://github.com/capsjac/linear-vect";
        description = "A low-dimensional linear algebra library, operating on the Num typeclass";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135167,7 +130134,6 @@ self: {
        version = "2.0";
        sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w";
        libraryHaskellDepends = [ base sbv ];
-       homepage = "http://github.com/LeventErkok/linearEqSolver";
        description = "Use SMT solvers to solve linear systems over integers and rationals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135188,7 +130154,6 @@ self: {
          lens linear manifolds-core semigroups tagged transformers vector
          vector-space
        ];
-       homepage = "https://github.com/leftaroundabout/linearmap-family";
        description = "Native, complete, matrix-free linear algebra";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135203,7 +130168,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim mtl transformers
        ];
-       homepage = "http://github.com/jwiegley/linearscan";
        description = "Linear scan register allocator, formally verified in Coq";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135225,7 +130189,6 @@ self: {
          base containers deepseq hoopl hspec hspec-expectations
          lens-family-core linearscan QuickCheck transformers
        ];
-       homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135238,7 +130201,6 @@ self: {
        version = "1.0.0.3";
        sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7";
        libraryHaskellDepends = [ base hyphenation ];
-       homepage = "http://ariis.it/static/articles/linebreak/page.html";
        description = "breaks strings to fit width";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135250,7 +130212,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "11f01j9qak8rhaj84gkx27qhfc334cj9pchi7qcb6brpqbwgdsik";
        libraryHaskellDepends = [ base text ];
-       homepage = "http://github.com/argiopetech/linguistic-ordinals";
        description = "Express Integral types as linguistic ordinals (1st, 2nd, 3rd, etc)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135266,7 +130227,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring hashable unordered-containers uri-bytestring
        ];
-       homepage = "http://hub.darcs.net/fr33domlover/link-relations";
        description = "Use web link relation types (RFC 5988) in Haskell";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -135284,7 +130244,6 @@ self: {
        executableHaskellDepends = [
          base gtk haskell98 popenhs regex-compat unix
        ];
-       homepage = "http://www.haskell.org/~petersen/haskell/linkchk/";
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135315,7 +130274,6 @@ self: {
        sha256 = "128vy6rhnhmgr4xggxxxi4s73lz6vb2zkzi85ywzqfhjkp63gbn6";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/CindyLinz/Haskell-linked-list-with-iterator#readme";
        description = "A pure linked list which is mutable through iterators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135338,7 +130296,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion deepseq hashable unordered-containers
        ];
-       homepage = "https://github.com/abasko/linkedhashmap";
        description = "Persistent LinkedHashMap data structure";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135362,7 +130319,6 @@ self: {
          lens lens-aeson mtl safe-exceptions tasty tasty-hunit text
          uri-bytestring wai wreq
        ];
-       homepage = "https://github.com/hlian/linklater";
        description = "A Haskell library for the Slack API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135384,7 +130340,6 @@ self: {
          aeson base bytestring containers tasty tasty-hunit tasty-quickcheck
          text
        ];
-       homepage = "http://github.com/Helkafen/haskell-linode#readme";
        description = "Bindings to the Linode API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135401,7 +130356,6 @@ self: {
          aeson base bytestring http-conduit unordered-containers
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/eatonphil/linode-haskell";
        description = "Haskell wrapper for the Linode v4 API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135445,7 +130399,6 @@ self: {
        revision = "1";
        editedCabalFile = "0s7yb9wwh5rp4v2phm5lih29f033rgffldhkm9i2mxsag2qbfg0k";
        libraryHaskellDepends = [ base bytestring time unix ];
-       homepage = "http://github.com/bgamari/linux-evdev";
        description = "Bindings to Linux evdev input device interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135459,7 +130412,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
-       homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135483,7 +130435,6 @@ self: {
        sha256 = "1vqbibp93fw6r03v5q2cisya6m12xb12rad11myxrkbn29rjmhws";
        libraryHaskellDepends = [ base directory ];
        libraryPkgconfigDepends = [ libkmod ];
-       homepage = "https://github.com/tensor5/linux-kmod";
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135496,7 +130447,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "12bwrniaxg6gm347jdgbf535pdz4z57pkyiwa98c903y9q9ssnyi";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/tensor5/linux-mount";
        description = "Mount and unmount filesystems";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135508,7 +130458,6 @@ self: {
        version = "0.1.2.0";
        sha256 = "0yznnp9rdz15drm79pvbqbrbk2nczbkmlf00pb7rki7w1l9njp2q";
        libraryHaskellDepends = [ base unix ];
-       homepage = "https://github.com/redneb/hs-linux-namespaces";
        description = "Create new or enter an existing linux namespaces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135531,7 +130480,6 @@ self: {
          base bytestring containers directory filepath ghc-events process
          unix
        ];
-       homepage = "https://github.com/bjpop/haskell-linux-perf";
        description = "Read files generated by perf on Linux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135562,7 +130510,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0rpq5sm557gm227id2rfsffgr47lrj4d4kpzh194d74dx2qkg5g6";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/tensor5/linux-xattr";
        description = "Read, set and list extended attributes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135583,7 +130530,6 @@ self: {
          base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/kosmoskatten/linx-gateway";
        description = "Implementation of the Enea LINX gateway protocol";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135596,7 +130542,6 @@ self: {
        version = "0.11.6.0";
        sha256 = "1lylxwcm0j9iyivi11h6wsq6xb4fn8k5bpbjj3694kcdby9b8hr6";
        libraryHaskellDepends = [ base bytestring containers hashable ];
-       homepage = "https://github.com/plsyssec/lio";
        description = "Labeled IO Information Flow Control Library";
        license = "GPL";
      }) {};
@@ -135654,7 +130599,6 @@ self: {
          aeson attoparsec base bytestring cmdargs directory filepath
          simple-templates text
        ];
-       homepage = "http://simple.cx";
        description = "LIO support for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135692,7 +130636,6 @@ self: {
          unordered-containers validation vector
        ];
        benchmarkHaskellDepends = [ aeson attoparsec base criterion text ];
-       homepage = "https://github.com/projectorhq/haskell-liquid";
        description = "Liquid template language library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135730,7 +130673,6 @@ self: {
        ];
        testSystemDepends = [ git nettools z3 ];
        doCheck = false;
-       homepage = "https://github.com/ucsd-progsys/liquid-fixpoint";
        description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) git; inherit (pkgs) nettools; 
@@ -135773,7 +130715,6 @@ self: {
          text time transformers
        ];
        testSystemDepends = [ z3 ];
-       homepage = "https://github.com/ucsd-progsys/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
@@ -135785,7 +130726,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0qwpssjq2xiajhkx4jdmzkcvlhi6921dkgplih5jiq4i64av50zy";
        libraryHaskellDepends = [ base Cabal filepath ];
-       homepage = "https://github.com/spinda/liquidhaskell-cabal#readme";
        description = "Liquid Haskell integration for Cabal and stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135801,7 +130741,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base liquidhaskell-cabal ];
        executableHaskellDepends = [ base liquidhaskell-cabal ];
-       homepage = "https://github.com/spinda/liquidhaskell-cabal-demo#readme";
        description = "Demo of Liquid Haskell integration for Cabal and stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135825,7 +130764,6 @@ self: {
        version = "0.4.1.4";
        sha256 = "15vjk6y3zwiffm1x8wlzv6203ykzm2phalqlq4zhmhcj2wd70viw";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Common not-so-common functions for lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135850,7 +130788,6 @@ self: {
        version = "0.1.1";
        sha256 = "0w9f68cr4k0p8zl81y8ax19i6ypzks0y27hdlz71wwmgn5v2y63l";
        libraryHaskellDepends = [ base ];
-       homepage = "http://coder.bsimmons.name/blog/2009/08/list-grouping-module-released/";
        description = "Functions for grouping a list into sublists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135862,7 +130799,6 @@ self: {
        version = "1.0";
        sha256 = "147zb156g79a5p1w0b9vcvjy5x7nsrhng5rgjqq3cy3xpbam4nys";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/hellertime/list-mux";
        description = "List Multiplexing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135884,7 +130820,6 @@ self: {
        testHaskellDepends = [
          ansi-terminal base data-default hspec stm terminal-size vty
        ];
-       homepage = "https://github.com/yamadapc/list-prompt.git";
        description = "A simple list prompt UI for the terminal";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135929,7 +130864,6 @@ self: {
          base mmorph monad-control mtl transformers transformers-base
        ];
        testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
-       homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -135948,7 +130882,6 @@ self: {
        testHaskellDepends = [
          attoparsec base-prelude either hspec list-t list-t-text text
        ];
-       homepage = "https://github.com/nikita-volkov/list-t-attoparsec";
        description = "An \"attoparsec\" adapter for \"list-t\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135973,7 +130906,6 @@ self: {
          base-prelude conversion conversion-text either hspec html-tokenizer
          list-t-attoparsec list-t-text text xml-types
        ];
-       homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -135990,7 +130922,6 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring http-client list-t mtl-prelude
        ];
-       homepage = "https://github.com/nikita-volkov/list-t-http-client";
        description = "A streaming HTTP client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136008,7 +130939,6 @@ self: {
          base base-prelude bytestring curlhs list-t mtl-prelude
          resource-pool stm
        ];
-       homepage = "https://github.com/nikita-volkov/list-t-libcurl";
        description = "A \"libcurl\"-based streaming HTTP client";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -136028,7 +130958,6 @@ self: {
          base base-prelude bytestring hspec list-t QuickCheck
          quickcheck-instances text transformers
        ];
-       homepage = "https://github.com/nikita-volkov/list-t-text";
        description = "A streaming text codec";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136042,7 +130971,6 @@ self: {
        sha256 = "0zia1b2phk4skv39q2k481jsagz1syd6rkgfcdra15i2s5dhzvyp";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/Gabriel439/Haskell-List-Transformer-Library";
        description = "List monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136061,7 +130989,6 @@ self: {
          base binary ChasingBottoms HUnit QuickCheck template-haskell
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://iki.fi/matti.niemenmaa/list-tries/";
        description = "Tries and Patricia tries: finite sets and maps for list keys";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136092,7 +131019,6 @@ self: {
          aeson base free freer-effects http-client kan-extensions mtl
          servant servant-client text time transformers
        ];
-       homepage = "https://github.com/ocharles/listenbrainz-client";
        description = "A client library to the ListenBrainz project";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136105,7 +131031,6 @@ self: {
        version = "0.2.3.1";
        sha256 = "0mkhnqn7wxspzxvivhaksxmxp7d6x9bazhl28nl9gck56bpa90sm";
        libraryHaskellDepends = [ base bytestring ListLike text vector ];
-       homepage = "http://jwlato.webfactional.com/haskell/listlike-instances";
        description = "Extra instances of the ListLike class";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136129,7 +131054,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0scd74fv6gzl7yi5ssb1z9kwwfyx9p39yqprnzbpvspvxm3k41qs";
        libraryHaskellDepends = [ base exceptions ];
-       homepage = "https://github.com/ombocomp/listsafe";
        description = "Safe wrappers for partial list functions, supporting MonadThrow";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -136149,7 +131073,6 @@ self: {
          base blaze-html blaze-markup cheapskate directory filepath
          highlighting-kate parsec text time unordered-containers
        ];
-       homepage = "https://github.com/cdosborn/lit";
        description = "A simple tool for literate programming";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136190,7 +131113,6 @@ self: {
          pathtype pretty process semigroups stm stm-split strict
          transformers unix utility-ht wx wxcore
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
        description = "Live coding of MIDI music";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136259,7 +131181,6 @@ self: {
          mtl network old-locale parsec pretty random template-haskell text
          time utf8-string uuid
        ];
-       homepage = "http://wiki.secondlife.com/wiki/LLSD";
        description = "An implementation of the LLSD data system";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136277,7 +131198,6 @@ self: {
          base bytestring containers directory llvm-base mtl process
          type-level
        ];
-       homepage = "https://github.com/bos/llvm";
        description = "Bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136318,7 +131238,6 @@ self: {
        version = "3.2.0.2";
        sha256 = "1f76nb85hnidp06v6lbl4aasac4h7ff9r8i054m8cnby2vc59r4n";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/bos/llvm";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136352,7 +131271,6 @@ self: {
        version = "3.0.1.0";
        sha256 = "07q6dvwkg7h6qkwq0a7719g82anipj2pk0xid5p24pvzssa9z22w";
        libraryHaskellDepends = [ base llvm-base ];
-       homepage = "https://github.com/bos/llvm";
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136393,7 +131311,6 @@ self: {
          base bifunctors containers cpuid llvm-tf non-empty tfp transformers
          unsafe utility-ht
        ];
-       homepage = "https://wiki.haskell.org/LLVM";
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136409,7 +131326,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base enumset ];
        libraryPkgconfigDepends = [ llvm ];
-       homepage = "http://haskell.org/haskellwiki/LLVM";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136428,7 +131344,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers regex-posix utility-ht
        ];
-       homepage = "http://haskell.org/haskellwiki/LLVM";
        description = "Tools for maintaining the llvm-ffi package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136455,7 +131370,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers transformers-compat
        ];
-       homepage = "http://github.com/bscarlet/llvm-general/";
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136477,7 +131391,6 @@ self: {
          base containers HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/bscarlet/llvm-general/";
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136502,7 +131415,6 @@ self: {
        testHaskellDepends = [
          base containers HUnit llvm-general-pure tasty tasty-hunit
        ];
-       homepage = "https://github.com/tvh/llvm-general-quote";
        description = "QuasiQuoting llvm code for llvm-general";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136530,7 +131442,6 @@ self: {
          base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck
          tasty tasty-hunit tasty-quickcheck temporary transformers
        ];
-       homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {llvm-config = null;};
@@ -136555,7 +131466,6 @@ self: {
          base bytestring containers llvm-hs-pure mtl pretty-show QuickCheck
          tasty tasty-hunit tasty-quickcheck temporary transformers
        ];
-       homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136577,7 +131487,6 @@ self: {
          base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden
          tasty-hspec tasty-hunit text transformers
        ];
-       homepage = "https://github.com/llvm-hs/llvm-hs-pretty";
        description = "A pretty printer for LLVM IR";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136600,7 +131509,6 @@ self: {
          base bytestring containers hspec mtl tasty tasty-hunit
          tasty-quickcheck text transformers unordered-containers
        ];
-       homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136621,7 +131529,6 @@ self: {
        testHaskellDepends = [
          base containers mtl tasty tasty-hunit tasty-quickcheck transformers
        ];
-       homepage = "http://github.com/llvm-hs/llvm-hs/";
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136638,7 +131545,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory mtl process type-level
        ];
-       homepage = "http://darcs.serpentine.com/llvm/";
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136756,7 +131662,6 @@ self: {
        sha256 = "0z8wj06b5ii0w6pls2jlqmd3mhyrplhxd1c6h1my1p0w45b2hmc0";
        libraryHaskellDepends = [ array base ];
        librarySystemDepends = [ lmdb ];
-       homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
      }) {inherit (pkgs) lmdb;};
@@ -136779,7 +131684,6 @@ self: {
          base bytestring containers directory HUnit pipes QuickCheck random
          test-framework test-framework-hunit test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/andrewthad/lmdb-high-level";
        description = "Higher level API for working with LMDB";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136795,7 +131699,6 @@ self: {
        libraryHaskellDepends = [ base bytestring lmdb serialise ];
        testHaskellDepends = [ base hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/verement/lmdb-simple#readme";
        description = "Simple API for LMDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136850,7 +131753,6 @@ self: {
        version = "1.0.1.1";
        sha256 = "1vszir1b79fdn545k3k86mgqhivyg8s5vv5v24y4cp4cc47aiwmi";
        libraryHaskellDepends = [ base containers hslogger PSQueue stm ];
-       homepage = "https://github.com/SumAll/haskell-load-balancing";
        description = "Client-side load balancing utilities";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -136863,11 +131765,27 @@ self: {
        sha256 = "1d5xms4q969w1ry3j3qv4gz82sc9j9qhw7nyc25rbn66gznxlb06";
        libraryHaskellDepends = [ base directory parsec ];
        testHaskellDepends = [ base directory hspec parsec ];
-       homepage = "https://github.com/pbrisbin/load-env#readme";
        description = "Load environment variables from a file";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "load-env_0_2_0_1" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec, parsec
+     , temporary
+     }:
+     mkDerivation {
+       pname = "load-env";
+       version = "0.2.0.1";
+       sha256 = "1xkk72lfpb4fbnmm7wqxxl1v7jwk9b6da53i90k3dvypakl4gryb";
+       libraryHaskellDepends = [ base directory filepath parsec ];
+       testHaskellDepends = [
+         base directory doctest hspec parsec temporary
+       ];
+       description = "Load environment variables from a file";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "load-font" = callPackage
     ({ mkDerivation, base, c2hs, Cabal }:
      mkDerivation {
@@ -136880,7 +131798,6 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/deech/load-font#readme";
        description = "A cross platform library for loading bundled fonts into your application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136905,7 +131822,6 @@ self: {
        sha256 = "1p8df8jyddma3mk54azgiqf6adlq0l4g00cjffdvx8bk30xnrank";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hedgehog ];
-       homepage = "https://github.com/chris-martin/loc";
        description = "Types representing line and column positions and ranges in text files";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -136917,7 +131833,6 @@ self: {
        version = "0.1.3.2";
        sha256 = "06yccmyxk7cvkxjra28ardxc61h6h59w0rw08d27llppfjh5bn01";
        libraryHaskellDepends = [ base containers hedgehog loc ];
-       homepage = "https://github.com/chris-martin/loc";
        description = "Test-related utilities related to the /loc/ package";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -136929,7 +131844,6 @@ self: {
        version = "0.0.1";
        sha256 = "1846lhs0jc8finxcp1hfgifzs7hwzzxvmmv03laxzl63p5h2k8x9";
        libraryHaskellDepends = [ base network ];
-       homepage = "http://bitbucket.org/khibino/haskell-local-address";
        description = "Functions to get local interface address";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -136946,7 +131860,6 @@ self: {
        libraryHaskellDepends = [
          base combinatorial-problems containers erf random
        ];
-       homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch";
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -136988,7 +131901,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "15mkhpp2r9l94qkqdxfc0llw9nbxcj8n3a70qs5lmv416a1i4qk2";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/elliottt/located";
        description = "Source location helpers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137001,7 +131913,6 @@ self: {
        sha256 = "1f8k78p7nx7dbrjrkx6ff8d02a0zspg1pc1y3whqbxrhm0ynl1ay";
        libraryHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://github.com/gridaphobe/located-base";
        description = "Location-aware variants of partial functions";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ gridaphobe ];
@@ -137014,7 +131925,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "1xkckg3qgqrqmkli9d6cbzqf5aanqpbxchy650yflpjygwapn4xn";
        libraryHaskellDepends = [ base monad-logger text ];
-       homepage = "https://github.com/MailOnline/located-monad-logger#readme";
        description = "Location-aware logging without Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137058,7 +131968,6 @@ self: {
        version = "0.2.2";
        sha256 = "1hvdkcyrlnv65q8x8h0441x30wr9bbfbg3961xd3fy9an5r961fc";
        libraryHaskellDepends = [ base pretty template-haskell ];
-       homepage = "https://github.com/liskin/loch-th";
        description = "Support for precise error locations in source files (Template Haskell version)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137079,7 +131988,6 @@ self: {
          base data-default-class directory exceptions filepath HUnit
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/trskop/lock-file#readme";
        description = "Provide exclusive access to a resource using lock file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137123,7 +132031,6 @@ self: {
          abstract-deque abstract-deque-tests atomic-primops base bytestring
          ghc-prim HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "Michael and Scott lock-free queues";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137135,7 +132042,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "004lipzc3rbvixhmx4ssngmpsp3pcrdd1hw9byqmi0jp4xm17xxi";
        libraryHaskellDepends = [ base clock stm ];
-       homepage = "https://github.com/chessai/lockpool.git";
        description = "set a maximum on the number of concurrent actions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137163,7 +132069,6 @@ self: {
          base ekg hpqtypes random text text-show transformers
          transformers-base
        ];
-       homepage = "https://github.com/scrive/log";
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137183,7 +132088,6 @@ self: {
          monad-control monad-time mtl semigroups stm text time
          transformers-base unordered-containers
        ];
-       homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (base package)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137207,7 +132111,6 @@ self: {
        testHaskellDepends = [
          base doctest generic-deriving semigroups simple-reflect
        ];
-       homepage = "http://github.com/ekmett/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137224,7 +132127,6 @@ self: {
          base bytestring extensible-effects monad-control text
          transformers-base
        ];
-       homepage = "https://github.com/greydot/log-effect";
        description = "An extensible log effect using extensible-effects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137242,7 +132144,6 @@ self: {
          base bytestring extensible-effects hsyslog log-effect monad-control
          transformers-base
        ];
-       homepage = "https://github.com/greydot/log-effect-syslog";
        description = "Syslog functions for log-effect";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137265,7 +132166,6 @@ self: {
          deepseq http-client http-client-tls log-base semigroups text
          text-show time transformers unordered-containers vector
        ];
-       homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137285,7 +132185,6 @@ self: {
          deepseq http-client http-client-tls log-base semigroups text
          text-show time transformers unordered-containers vector
        ];
-       homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137308,7 +132207,6 @@ self: {
          hpqtypes http-client lifted-base log-base mtl semigroups split text
          text-show time unordered-containers vector
        ];
-       homepage = "https://github.com/scrive/log";
        description = "Structured logging solution (PostgreSQL back end)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137332,7 +132230,6 @@ self: {
          monad-control random text time transformers transformers-base
          unjson vector wai warp
        ];
-       homepage = "https://github.com/scrive/log-utils";
        description = "Utils for working with logs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137368,7 +132265,6 @@ self: {
          microlens-mtl QuickCheck universum unordered-containers
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/serokell/log-warper";
        description = "Flexible, configurable, monadic and pretty logging";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137383,7 +132279,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ base containers json parsec ];
-       homepage = "https://github.com/haroldl/log2json";
        description = "Turn log file records into JSON";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137404,7 +132299,6 @@ self: {
        testHaskellDepends = [
          base bytestring fast-logger hspec uuid-types
        ];
-       homepage = "https://github.com/toddmohney/logentries#README.md";
        description = "Request logger middleware for Logentries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137417,7 +132311,6 @@ self: {
        version = "0.13.3.3";
        sha256 = "10kza99pzs0ajn6xqd66sm059xp43i2sl0mnd8257q1av1qvsx7p";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137435,7 +132328,6 @@ self: {
          ansi-wl-pprint base containers lens mtl template-haskell time
          time-locale-compat transformers transformers-compat unagi-chan
        ];
-       homepage = "https://github.com/wdanilo/haskell-logger";
        description = "Fast & extensible logging framework";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137455,7 +132347,6 @@ self: {
          base fast-logger protolude safe-exceptions stm text time
        ];
        executableHaskellDepends = [ base protolude stm ];
-       homepage = "https://github.com/joe9/logger-thread#readme";
        description = "Run FastLogger in a thread and direct all queued messages to it";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137496,7 +132387,6 @@ self: {
          base bytestring criterion fast-logger lifted-async monad-logger
          text time wl-pprint-text
        ];
-       homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137519,7 +132409,6 @@ self: {
          base bytestring criterion fast-logger lifted-async monad-logger
          text time wl-pprint-text
        ];
-       homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137540,7 +132429,6 @@ self: {
          logging-effect-extra-handler wl-pprint-text
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "Supplemental packages for `logging-effect`";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -137559,7 +132447,6 @@ self: {
          base logging-effect template-haskell wl-pprint-text
        ];
        executableHaskellDepends = [ base logging-effect wl-pprint-text ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "TH splices to augment log messages with file info";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -137578,7 +132465,6 @@ self: {
          base exceptions logging-effect time wl-pprint-text
        ];
        executableHaskellDepends = [ base logging-effect wl-pprint-text ];
-       homepage = "https://github.com/jship/logging-effect-extra#readme";
        description = "Handy logging handler combinators";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -137591,7 +132477,6 @@ self: {
        sha256 = "0d0lwxxgd16is9aw6v3ps4r9prv3dj8xscmm45fvzq3nicjiawcf";
        libraryHaskellDepends = [ base call-stack transformers ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/sol/logging-facade#readme";
        description = "Simple logging abstraction that allows multiple back-ends";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -137622,7 +132507,6 @@ self: {
        version = "1";
        sha256 = "1acfkmr3cgprij9sfa0hfqyni6s8py22s3n0xa8qhy3syz1j72zb";
        libraryHaskellDepends = [ base hsyslog logging-facade ];
-       homepage = "https://github.com/peti/logging-facade-syslog#readme";
        description = "A logging back-end to syslog(3) for the logging-facade library";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -137663,7 +132547,6 @@ self: {
          applicative-extras atp-haskell base containers HUnit mtl pretty
          PropLogic safe set-extra syb
        ];
-       homepage = "https://github.com/seereason/logic-classes";
        description = "Framework for propositional and first order logic, theorem proving";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137676,7 +132559,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "061x6g92334m2776xclh8mcbjind3l595pggc0g7yi4qzs31zbdc";
        libraryHaskellDepends = [ base logict transformers ];
-       homepage = "http://github.com/sonyandy/logicst";
        description = "Backtracking mutable references in the ST and IO monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137688,7 +132570,6 @@ self: {
        version = "0.6.0.2";
        sha256 = "07hnirv6snnym2r7iijlfz00b60jpy2856zvqxh989q0in7bd0hi";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://code.haskell.org/~dolio/";
        description = "A backtracking logic-programming monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137700,7 +132581,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "0mkwggh97c3x96v7a4y7i4scdvr38d49an3617i9zgj328xkr6w9";
        libraryHaskellDepends = [ base logict mtl transformers ];
-       homepage = "https://github.com/atzedijkstra/logict-state";
        description = "Library for logic programming based on haskell package logict";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -137713,7 +132593,6 @@ self: {
        sha256 = "011n824n9s5jrif1cgrl2fjr82s5jayvgq7blbggjwqclhd2a0p8";
        libraryHaskellDepends = [ base iso8601-time parsec text time ];
        testHaskellDepends = [ base hspec time ];
-       homepage = "https://github.com/keithduncan/logplex-parse";
        description = "Parse Heroku application/logplex documents";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137727,7 +132606,6 @@ self: {
        sha256 = "1mvxwfdqqk9hkkffz5fx0zrh27z9x44v2wp2jrjjmidj2k9i1hrh";
        libraryHaskellDepends = [ base hsyslog logging-facade time ];
        testHaskellDepends = [ base hspec hsyslog logging-facade time ];
-       homepage = "https://github.com/sol/logsink#readme";
        description = "A logging framework for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -137794,7 +132672,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base lojbanParser yjtools ];
-       homepage = "http://homepage3.nifty.com/salamander/myblog/lojysamban.html";
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137821,7 +132698,6 @@ self: {
          reflection singletons tagged-transformer template-haskell vector
          vector-th-unbox
        ];
-       homepage = "https://github.com/cpeikert/Lol";
        description = "A library for lattice cryptography";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137855,7 +132731,6 @@ self: {
          base DRBG lol lol-benches lol-cpp lol-repa MonadRandom mtl
          numeric-prelude
        ];
-       homepage = "https://github.com/cpeikert/Lol";
        description = "Lattice-based cryptographic applications using <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137873,7 +132748,6 @@ self: {
          ansi-terminal base containers criterion crypto-api deepseq DRBG lol
          MonadRandom split statistics
        ];
-       homepage = "https://github.com/cpeikert/Lol";
        description = "A library for benchmarking <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137915,7 +132789,6 @@ self: {
        ];
        testHaskellDepends = [ base lol-tests ];
        benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
-       homepage = "https://github.com/cpeikert/Lol";
        description = "A fast C++ backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137936,7 +132809,6 @@ self: {
        ];
        testHaskellDepends = [ base lol-tests ];
        benchmarkHaskellDepends = [ base DRBG lol lol-benches ];
-       homepage = "https://github.com/cpeikert/Lol";
        description = "A repa backend for <https://hackage.haskell.org/package/lol lol>.";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137957,7 +132829,6 @@ self: {
          test-framework-quickcheck2
        ];
        testHaskellDepends = [ base lol test-framework ];
-       homepage = "https://github.com/cpeikert/Lol";
        description = "A library for testing <https://hackage.haskell.org/package/lol Λ ∘ λ>.";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138001,7 +132872,6 @@ self: {
          base bytestring containers data-default hack hack-contrib mps mtl
          template utf8-string
        ];
-       homepage = "http://github.com/nfjinjing/loli";
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138014,7 +132884,6 @@ self: {
        version = "0.1";
        sha256 = "072yfv1kv83k8qc9apks2czr9p6znk46bbbjmsdbcpzyb8byh64j";
        libraryHaskellDepends = [ base integer-gmp ];
-       homepage = "https://code.mathr.co.uk/long-double";
        description = "FFI bindings for C long double";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138026,7 +132895,6 @@ self: {
        version = "1.0.0";
        sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/chessai/longboi";
        description = "Dependently-typed linked list implementation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -138041,7 +132909,6 @@ self: {
        sha256 = "13j7gjbpzdjvxfklvfjy44r219piqqk6nk4023aldq97m37f57mv";
        libraryHaskellDepends = [ base primitive template-haskell ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "http://hub.darcs.net/jmcarthur/lookup-tables/issues";
        description = "Statically generate lookup tables using Template Haskell";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138059,7 +132926,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion foldl mtl random vector
        ];
-       homepage = "https://github.com/nh2/loop";
        description = "Fast loops (for when GHC can't optimize forM_)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -138071,7 +132937,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "02x02m98ka1y8f1jjqwfwmsyx29g583gnr4jdm5syqxfr0dz6c52";
        libraryHaskellDepends = [ base effin ];
-       homepage = "https://github.com/konn/loop-effin";
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138121,7 +132986,6 @@ self: {
          base cmdargs containers directory filepath GoogleChart hmatrix
          process random
        ];
-       homepage = "http://www.esc.cam.ac.uk/people/research-students/emily-king";
        description = "Find all biological feedback loops within an ecosystem graph";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138163,7 +133027,6 @@ self: {
          optparse-applicative process text transformers unix
          unordered-containers utf8-string wai-logger xml-conduit yaml
        ];
-       homepage = "https://github.com/rnons/lord";
        description = "A command line interface to online radios";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138179,7 +133042,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/sfischer13/haskell-lorem";
        description = "Library for generating filler text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138194,7 +133056,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ loris ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://www.tiresiaspress.us/haskell/loris";
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138214,7 +133075,6 @@ self: {
          aeson base binary bytestring cryptohash directory hex network
          process split
        ];
-       homepage = "https://github.com/tvorcesky/loshadka";
        description = "Minecraft 1.7 server proxy that answers to queries when the server is offline";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138233,7 +133093,6 @@ self: {
        executableHaskellDepends = [
          array base containers haskell98 mtl wx wxcore
        ];
-       homepage = "http://www.ncc.up.pt/~pbv/stuff/lostcities";
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138255,7 +133114,6 @@ self: {
          lifted-base preamble time turtle unordered-containers uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic shakers ];
-       homepage = "https://github.com/swift-nav/loup";
        description = "Amazon Simple Workflow Service Wrapper for Work Pools";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138318,7 +133176,6 @@ self: {
        version = "1.2.0.0";
        sha256 = "05knlckzx261yxbz38rqq8vy86zj1np0w2l32cnib6714vhaj5sz";
        libraryHaskellDepends = [ base containers contravariant ];
-       homepage = "http://github.com/chowells79/lrucache";
        description = "a simple, pure LRU cache";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138339,7 +133196,6 @@ self: {
        testHaskellDepends = [
          base containers deepseq hashable hspec QuickCheck transformers
        ];
-       homepage = "https://github.com/cocreature/lrucaching#readme";
        description = "LRU cache";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138358,7 +133214,6 @@ self: {
          ansi-wl-pprint base base-unicode-symbols cmdtheline text usb
          usb-id-database vector
        ];
-       homepage = "https://github.com/roelvandijk/ls-usb";
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138377,7 +133232,6 @@ self: {
        executableHaskellDepends = [
          base bytestring Cabal containers directory filepath pretty process
        ];
-       homepage = "http://code.haskell.org/~dons/code/lscabal";
        description = "List exported modules from a set of .cabal files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138399,7 +133253,6 @@ self: {
          attoparsec base containers hspec2 language-css
          language-css-attoparsec text
        ];
-       homepage = "https://github.com/dbp/lss";
        description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138468,7 +133321,6 @@ self: {
          data-default http-client http-types random text time transformers
          wai wai-extra xml-conduit xml-hamlet yesod-core
        ];
-       homepage = "https://github.com/achirkin/qua-kit";
        description = "Partial implementation of a service provider for LTI 1.1.";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -138489,7 +133341,6 @@ self: {
          haskell-gi-overloading mtl parsec pretty text transformers
        ];
        libraryPkgconfigDepends = [ gtk3 ];
-       homepage = "http://www.leksah.org";
        description = "Leksah tool kit";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138502,7 +133353,6 @@ self: {
        version = "0.0.0";
        sha256 = "0h3jxngsdmakcr35zapxjaykjsqs44lxxk86d5i4rg0gi0i9qw3g";
        libraryHaskellDepends = [ base vcd ];
-       homepage = "http://tomahawkins.org";
        description = "Using linear temporal logic (LTL) to verify embedded software and hardware";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138521,7 +133371,6 @@ self: {
          base binary bytestring containers data-binary-ieee754 pretty text
          vector
        ];
-       homepage = "https://github.com/GaloisInc/lua-bc";
        description = "Lua bytecode parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138589,7 +133438,6 @@ self: {
        version = "0.1.7";
        sha256 = "1dsm7cg0i930r5dn8591aabkl0p8b5l348pccdvi7p0g7asx451h";
        libraryHaskellDepends = [ base unamb ];
-       homepage = "http://haskell.org/haskellwiki/lub";
        description = "information operators: least upper bound (lub) and greatest lower bound (glb)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138615,7 +133463,6 @@ self: {
        benchmarkHaskellDepends = [
          base blaze-builder bytestring criterion deepseq text transformers
        ];
-       homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138629,7 +133476,6 @@ self: {
        revision = "1";
        editedCabalFile = "08zcksc8pd7sh4z78i80rinlmr3mghhclhcqn8kdkgv4p7ynldlv";
        libraryHaskellDepends = [ base colonnade lucid text ];
-       homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using lucid with colonnade";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -138642,11 +133488,12 @@ self: {
        pname = "lucid-extras";
        version = "0.1.0.1";
        sha256 = "0wyb5pqhphfckmzpnl0xp6fy8fmnwqjqim3h3f3sdjqkqdly5iaw";
+       revision = "1";
+       editedCabalFile = "030mj3yddbia6dkbl8d6mssi42l3z8gs79z50r78gwiif6mh5dny";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring lucid text
        ];
        testHaskellDepends = [ base directory lucid ];
-       homepage = "https://github.com/diffusionkinetics/open/lucid-extras";
        description = "Generate more HTML with Lucid";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -138676,7 +133523,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder lucid text transformers
        ];
-       homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git";
        description = "DSL for SVG using lucid for HTML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138699,7 +133545,6 @@ self: {
          compact-string-fix feed happstack happstack-server HTTP mongoDB mtl
          network SHA text time
        ];
-       homepage = "http://www.imn.htwk-leipzig.de/~abau/lucienne";
        description = "Server side feed aggregator/reader";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138742,7 +133587,6 @@ self: {
        libraryHaskellDepends = [
          aeson base http-client lens text vector wreq
        ];
-       homepage = "https://github.com/micxjo/hs-luis-client";
        description = "An unofficial client for the LUIS NLP service";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138757,7 +133601,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ air base bytestring libffi ];
        librarySystemDepends = [ objc ];
-       homepage = "https://github.com/nfjinjing/luka";
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138775,7 +133618,6 @@ self: {
          base containers contravariant dlist gl linear mtl resourcet
          semigroups transformers vector void
        ];
-       homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138795,7 +133637,6 @@ self: {
          base contravariant GLFW-b JuicyPixels linear luminance mtl
          resourcet transformers
        ];
-       homepage = "https://github.com/phaazon/luminance-samples";
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138810,7 +133651,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell-src-exts text vector ];
-       homepage = "https://github.com/bitc/lushtags";
        description = "Create ctags compatible tags files for Haskell programs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138824,7 +133664,6 @@ self: {
        sha256 = "1qnd5p9nv4rqp024pf7bbivj7w4glr0pyc0sq6cifzdii6b1ybya";
        libraryHaskellDepends = [ base mtl parsec transformers ];
        testHaskellDepends = [ base mtl parsec ];
-       homepage = "https://github.com/Zankoku-Okuno/luthor";
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138876,7 +133715,6 @@ self: {
        executableHaskellDepends = [
          array base containers directory filepath parsec wl-pprint
        ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Lazy Virtual Machine (LVM)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138890,7 +133728,6 @@ self: {
        sha256 = "0wcf9brcvf4b7qcs51mngca3qxilk0x50h3dml28zg6lg93wwbfa";
        isLibrary = false;
        isExecutable = true;
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Lazy Virtual Machine (LVM) Runtime System";
        license = "LGPL";
      }) {};
@@ -138902,7 +133739,6 @@ self: {
        version = "0.3.2";
        sha256 = "0nxwmbcfbwpd4dx1zmcdxrb9n7q12v17khi4h4qi7hiwy2zxk8wv";
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
-       homepage = "https://github.com/fizruk/lxc";
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138933,7 +133769,6 @@ self: {
        testHaskellDepends = [
          base exceptions hspec hspec-core random text turtle uuid
        ];
-       homepage = "https://github.com/hverr/haskell-lxd-client#readme";
        description = "LXD client written in Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -138955,7 +133790,6 @@ self: {
          base containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text yaml
        ];
-       homepage = "https://github.com/hverr/haskell-lxd-client-config#readme";
        description = "Read the configuration file of the standard LXD client";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -138991,7 +133825,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq quicklz snappy
        ];
-       homepage = "http://github.com/mwotton/lz4hs";
        description = "LZ4 compression for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139015,7 +133848,6 @@ self: {
        testHaskellDepends = [
          base bytestring bytestring-arbitrary conduit QuickCheck resourcet
        ];
-       homepage = "https://github.com/bigmac2k/lz4-conduit";
        description = "LZ4 compression for conduits";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139036,7 +133868,6 @@ self: {
        testHaskellDepends = [
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/hvr/lzma";
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139070,7 +133901,6 @@ self: {
          base base-compat bytestring conduit HUnit QuickCheck resourcet
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/alphaHeavy/lzma-conduit";
        description = "Conduit interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139093,7 +133923,6 @@ self: {
          base bytestring enumerator HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/alphaHeavy/lzma-enumerator";
        description = "Enumerator interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139115,7 +133944,6 @@ self: {
          base bytestring HUnit io-streams QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139133,7 +133961,6 @@ self: {
          base bytestring ctrie data-endian network network-msg transformers
        ];
        testHaskellDepends = [ base bytestring Cabal ];
-       homepage = "https://github.com/obsidiansystems/mDNSResponder-client";
        description = "Library for talking to the mDNSResponder daemon";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139188,7 +134015,6 @@ self: {
        ];
        executableHaskellDepends = [ base stm wx wxcore ];
        testHaskellDepends = [ attoparsec base bytestring hspec ];
-       homepage = "http://www.macbeth-ficsclient.com";
        description = "Macbeth - A beautiful and minimalistic FICS client";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139221,7 +134047,6 @@ self: {
        testHaskellDepends = [
          base doctest hspec mtl profunctors QuickCheck semigroups
        ];
-       homepage = "http://github.com/as-capabl/machinecell";
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139249,7 +134074,6 @@ self: {
        benchmarkHaskellDepends = [
          base conduit conduit-combinators criterion mtl pipes
        ];
-       homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139283,7 +134107,6 @@ self: {
        version = "0.3.0.3";
        sha256 = "0lh6q99xfmxl53gkxlrbjh1pfbkff8faxr9fycks98cfcmnlbzv0";
        libraryHaskellDepends = [ base binary bytestring machines ];
-       homepage = "http://github.com/aloiscochard/machines-binary";
        description = "Binary utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -139310,7 +134133,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath machines machines-io transformers
        ];
-       homepage = "http://github.com/aloiscochard/machines-directory";
        description = "Directory (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -139326,7 +134148,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring chunked-data machines transformers
        ];
-       homepage = "http://github.com/aloiscochard/machines-io";
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -139341,7 +134162,6 @@ self: {
        libraryHaskellDepends = [
          base chunked-data machines machines-io process
        ];
-       homepage = "http://github.com/aloiscochard/machines-process";
        description = "Process (system) utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139357,7 +134177,6 @@ self: {
        libraryHaskellDepends = [
          base basic-prelude machines streaming-commons
        ];
-       homepage = "https://github.com/lshift/machines-zlib";
        description = "Decompression support for machines";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139371,7 +134190,6 @@ self: {
        sha256 = "13i8bap38ha8j0259kw4gfx18jxc4860awp3s9rz16i4q2vik0v2";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring ];
-       homepage = "http://github.com/erikcharlebois/macho";
        description = "Parser for Mach-O object format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139395,7 +134213,6 @@ self: {
          aeson aeson-qq base data-default hspec raw-strings-qq
          unordered-containers
        ];
-       homepage = "https://github.com/itchyny/mackerel-client-hs";
        description = "An API client library for Mackerel";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -139418,7 +134235,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "http://github.com/tych0/maclight";
        description = "Control screen and keyboard backlights on MACs under Linux";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139439,7 +134255,6 @@ self: {
          base containers data-lens data-lens-template deepseq directory
          filepath graph-visit mtl process transformers unix
        ];
-       homepage = "https://github.com/atzedijkstra/macosx-make-standalone";
        description = "Make a macosx app standalone deployable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139471,7 +134286,6 @@ self: {
        ];
        testHaskellDepends = [ base hspec hspec-megaparsec text ];
        benchmarkHaskellDepends = [ base criterion megaparsec text ];
-       homepage = "https://hub.darcs.net/vmchale/madlang";
        description = "Randomized templating language DSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139488,7 +134302,6 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ array base containers mtl random ];
        executableSystemDepends = [ ncurses ];
-       homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz";
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139532,7 +134345,6 @@ self: {
          aeson base bytestring hedgehog memory process protolude saltine
          spake2 stm tasty tasty-hedgehog tasty-hspec
        ];
-       homepage = "https://github.com/LeastAuthority/haskell-magic-wormhole#readme";
        description = "Interact with Magic Wormhole";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139563,7 +134375,6 @@ self: {
          split string-conversions text transformers transformers-base
          unordered-containers wai wai-cli wai-middleware-metrics
        ];
-       homepage = "https://github.com/myfreeweb/magicbane#readme";
        description = "A web framework that integrates Servant, EKG, fast-logger, wai-cli…";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139580,7 +134391,6 @@ self: {
        executableHaskellDepends = [
          base hmatrix transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/magico";
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139593,7 +134403,6 @@ self: {
        version = "0.4.0.0";
        sha256 = "18s93ap84cd74sl89fy89dpj89j6qxayc1v771n0zhshbp7g9gkz";
        libraryHaskellDepends = [ base deepseq profunctors semigroups ];
-       homepage = "https://github.com/cutsea110/magma";
        description = "magma is an algebraic structure consisting a set together with an binary operation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139615,7 +134424,6 @@ self: {
          base ConfigFile containers curl directory happstack-state MissingH
          mtl network old-time regex-posix tagsoup utf8-string XMPP
        ];
-       homepage = "http://kagami.touhou.ru/projects/show/mahoro";
        description = "ImageBoards to XMPP gate";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139638,7 +134446,6 @@ self: {
          filepath hack2 hack2-contrib hack2-handler-snap-server moe process
          text
        ];
-       homepage = "https://github.com/nfjinjing/maid";
        description = "A simple static web server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139683,7 +134490,6 @@ self: {
          http-client-tls servant servant-client text transformers
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/jpvillaisaza/mailchimp-haskell";
        description = "Bindings for the MailChimp API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139703,7 +134509,6 @@ self: {
          aeson base http-client http-client-tls http-types reflection scotty
          text transformers wai-extra
        ];
-       homepage = "https://github.com/mietek/mailchimp-subscribe/";
        description = "MailChimp subscription request handler";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139726,7 +134531,6 @@ self: {
          transformers
        ];
        executableHaskellDepends = [ base http-conduit text transformers ];
-       homepage = "https://github.com/AndrewRademacher/mailgun";
        description = "Connector to Rackspace's Mailgun Service";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139744,7 +134548,6 @@ self: {
        testHaskellDepends = [
          base bytestring doctest hspec hspec-core QuickCheck text
        ];
-       homepage = "https://gitlab.com/igrep/main-tester#readme";
        description = "Capture stdout/stderr/exit code, and replace stdin of your main function";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139759,7 +134562,6 @@ self: {
        libraryHaskellDepends = [
          base containers srcloc text transformers
        ];
-       homepage = "https://github.com/mainland/mainland-pretty";
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -139773,7 +134575,6 @@ self: {
        libraryHaskellDepends = [
          base containers srcloc text transformers
        ];
-       homepage = "https://github.com/mainland/mainland-pretty";
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139807,7 +134608,6 @@ self: {
        version = "1.1";
        sha256 = "1442xw8i9jgk3hqavqikks98qs9l3i37lk63xyzpdgnlkfqapzka";
        libraryHaskellDepends = [ haskell2010 ];
-       homepage = "https://github.com/niswegmann/majority";
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139859,7 +134659,6 @@ self: {
          async base bytestring configurator containers directory filepath
          github haskeline lens lens-datetime mtl process text time
        ];
-       homepage = "https://github.com/Philonous/make-package";
        description = "Make a cabalized package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139872,7 +134671,6 @@ self: {
        version = "0.1";
        sha256 = "0sc2fa45a046lw5x5z839gb1zk0d5nj663ghxajiclm6iw65kl2n";
        libraryHaskellDepends = [ base directory filepath HSH process ];
-       homepage = "http://darcsden.com/kowey/makedo";
        description = "Helper for writing redo scripts in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139891,7 +134689,6 @@ self: {
          attoparsec base doctest Glob QuickCheck tasty tasty-hunit
          tasty-quickcheck text
        ];
-       homepage = "http://github.com/nmattia/mask";
        description = "Simple Makefile parser and generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -139920,12 +134717,26 @@ self: {
          lens mtl optparse-applicative optparse-text path path-io text
          unordered-containers
        ];
-       homepage = "https://github.com/AndrewRademacher/mallard";
        description = "Database migration and testing as a library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mameya" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "mameya";
+       version = "0.1.0";
+       sha256 = "15yxnr2b678gb358xy78zws4wgjcr3rqd8ia1d04924yfcm670pb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "static site generator made to learn Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "managed" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -140313,7 +135124,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/julianalucena/mancala";
        description = "Simple mancala game";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -140356,7 +135166,6 @@ self: {
        executableHaskellDepends = [
          array base bytestring containers directory filepath GLUT hslua time
        ];
-       homepage = "http://gitorious.org/maximus/mandulia";
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140396,7 +135205,6 @@ self: {
          template-haskell text time tls transformers transformers-base
          unordered-containers utf8-string vector wai warp x509-system
        ];
-       homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140414,7 +135222,6 @@ self: {
          base constrained-categories linearmap-category manifolds random-fu
          semigroups vector-space
        ];
-       homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Sampling random points on general manifolds";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140443,7 +135250,6 @@ self: {
          linearmap-category pragmatic-show tasty tasty-hunit
          tasty-quickcheck vector-space
        ];
-       homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140456,7 +135262,6 @@ self: {
        version = "0.4.5.0";
        sha256 = "1g2lb8f2l9gwpflifm8idvf2w6if497gc6pgpr7j6s9c7byh8p3p";
        libraryHaskellDepends = [ base call-stack tagged vector-space ];
-       homepage = "https://github.com/leftaroundabout/manifolds";
        description = "The basic classes for the manifolds hierarchy";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -140473,7 +135278,6 @@ self: {
          array base bytestring containers kan-extensions transformers
          utility-ht
        ];
-       homepage = "https://github.com/clintonmead/map-classes";
        description = "A set of classes and instances for working with key/value mappings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140488,7 +135292,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base bytestring cassava containers ];
-       homepage = "http://github.com/charles-cooper/map-exts#readme";
        description = "Extensions to Data.Map";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140550,7 +135353,6 @@ self: {
          base bytestring containers criterion data-default deepseq hmatrix
          massiv massiv-io vector
        ];
-       homepage = "https://github.com/fosskers/mapalgebra";
        description = "Efficient, polymorphic Map Algebra";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140573,7 +135375,6 @@ self: {
          ansi-terminal base directory haskeline parsec
        ];
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
-       homepage = "https://github.com/PolyglotSymposium/mappy";
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140590,7 +135391,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring exceptions goggles mtl req text
        ];
-       homepage = "https://github.com/ocramz/mapquest-api";
        description = "Bindings to the MapQuest API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140608,7 +135408,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        executableHaskellDepends = [ base directory filepath process ];
        testHaskellDepends = [ base directory filepath process ];
-       homepage = "https://github.com/suzukeno/marihana#readme";
        description = "Minimal tool to make your blog in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -140626,7 +135425,6 @@ self: {
        executableHaskellDepends = [
          base containers gloss mtl splines vector vector-space
        ];
-       homepage = "https://github.com/paolino/marionetta";
        description = "A study of marionetta movements";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140651,7 +135449,6 @@ self: {
          base blaze-html call-stack conduit conduit-extra containers
          directory filepath hspec text transformers
        ];
-       homepage = "https://github.com/snoyberg/markdown";
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140674,7 +135471,6 @@ self: {
          base blaze-html conduit containers hspec markdown system-fileio
          system-filepath text transformers
        ];
-       homepage = "https://github.com/joelteon/markdown-kate";
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140707,7 +135503,6 @@ self: {
          base base-compat directory hspec QuickCheck silently stringbuilder
          temporary
        ];
-       homepage = "https://github.com/sol/markdown-unlit#readme";
        description = "Literate Haskell support for Markdown";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -140739,7 +135534,6 @@ self: {
        sha256 = "01dsqdckrm93ydc5frsxj55vgj238213qr31n1iybjdmw5x2r0dl";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/ku-fpg/marked-pretty";
        description = "Pretty-printing library, with scoping, based on pretty";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140762,7 +135556,6 @@ self: {
        version = "0.0.3.4";
        sha256 = "1kcjgfdwca4arngbj7w2g8bpmk5p44dyzrwcw8xmja0s200bhlbf";
        libraryHaskellDepends = [ base containers random transformers ];
-       homepage = "http://code.haskell.org/~thielema/markov-chain/";
        description = "Markov Chains for generating random sequences with a user definable behaviour";
        license = "GPL";
      }) {};
@@ -140816,7 +135609,6 @@ self: {
          mmorph monad-control monad-logger mtl path path-extra resourcet
          text transformers-base urlpath
        ];
-       homepage = "https://github.com/athanclark/markup#readme";
        description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140866,7 +135658,6 @@ self: {
        testHaskellDepends = [
          aeson base exceptions tasty tasty-hunit text transformers
        ];
-       homepage = "https://github.com/lunaryorn/marmalade-upload";
        description = "Upload packages to Marmalade";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140918,7 +135709,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring colour gloss MonadRandom mtl random
        ];
-       homepage = "https://qlfiles.net";
        description = "Generates mountainous terrain using a random walk algorithm";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140954,7 +135744,6 @@ self: {
          optparse-applicative text
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://marvin.readthedocs.io";
        description = "A framework for modular, portable chat bots";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140972,7 +135761,6 @@ self: {
          base haskell-src-meta mtl parsec template-haskell text
        ];
        testHaskellDepends = [ base hspec text ];
-       homepage = "http://marvin.readthedocs.io/en/latest/interpolation.html";
        description = "Compile time string interpolation a la Scala and CoffeeScript";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141018,7 +135806,6 @@ self: {
          persistent-template regex-posix text transformers twitter-conduit
          twitter-types
        ];
-       homepage = "https://github.com/minamiyama1994/chomado-bot-on-haskell/tree/minamiyama1994";
        description = "@minamiyama1994_bot on haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141038,7 +135825,6 @@ self: {
        testHaskellDepends = [
          base data-default deepseq hspec QuickCheck safe-exceptions vector
        ];
-       homepage = "https://github.com/lehins/massiv";
        description = "Massiv (Массив) is an Array Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141055,7 +135841,6 @@ self: {
          base bytestring data-default deepseq directory filepath JuicyPixels
          massiv netpbm process vector
        ];
-       homepage = "https://github.com/lehins/massiv";
        description = "Import/export of Image files into massiv Arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141080,7 +135865,6 @@ self: {
          base hspec mtl QuickCheck quickcheck-instances random
          random-shuffle text
        ];
-       homepage = "https://github.com/rodrigosetti/master-plan";
        description = "The project management tool for hackers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141095,7 +135879,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random ];
-       homepage = "http://wiki.github.com/paolino/mastermind";
        description = "console mastermind decypher";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141111,7 +135894,6 @@ self: {
        libraryHaskellDepends = [
          base base-prelude profunctors success text transformers
        ];
-       homepage = "https://github.com/sannsyn/matcher";
        description = "A composable abstraction for checking or converting a context value";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -141124,7 +135906,6 @@ self: {
        sha256 = "171ncbch38nzy46lb6p9navaar1b492hgf4b9kbd3g6fsldvny64";
        libraryHaskellDepends = [ base bytestring prednote text ];
        librarySystemDepends = [ pcre ];
-       homepage = "http://www.github.com/massysett/matchers";
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141147,7 +135928,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
          vector-th-unbox
        ];
-       homepage = "https://github.com/bos/math-functions";
        description = "Special functions and Chebyshev polynomials";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141174,7 +135954,6 @@ self: {
          process SHA system-filepath temporary test-framework
          test-framework-hunit time unix url
        ];
-       homepage = "http://jtdaugherty.github.io/mathblog/";
        description = "A program for creating and managing a static weblog with LaTeX math and diagrams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141187,7 +135966,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "1bbi9368zg50xvhn0lkrza1fpfi1cjz21lxyay6qb9v2r7h0mhr3";
        libraryHaskellDepends = [ base data-default-class ];
-       homepage = "https://github.com/mdibaiee/mathexpr";
        description = "Parse and evaluate math expressions with variables and functions";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -141207,7 +135985,6 @@ self: {
          base doctest hspec hspec-server QuickCheck shakespeare singletons
          template-haskell text
        ];
-       homepage = "https://github.com/junjihashimoto/mathflow#readme";
        description = "Dependently typed tensorflow modeler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141250,7 +136027,6 @@ self: {
          base filepath MissingH parsec regex-compat split
        ];
        testHaskellDepends = [ base hspec parsec ];
-       homepage = "https://github.com/nuta/mathista";
        description = "A small programming language for numerical computing";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -141267,7 +136043,6 @@ self: {
          array base containers haskell98 ix-shapable mtl
        ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://community.haskell.org/~TracyWadleigh/mathlink";
        description = "Write Mathematica packages in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141303,7 +136078,6 @@ self: {
          ad base bytestring process random raw-strings-qq split tasty
          tasty-expected-failure tasty-golden tasty-hunit temporary
        ];
-       homepage = "https://github.com/abarbu/matplotlib-haskell";
        description = "Bindings to Matplotlib; a Python plotting library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141366,7 +136140,6 @@ self: {
        version = "1.2";
        sha256 = "1hzpjkmwr24073mf9i13rx3n23ri0b5vmvwx8k9lxbrg1821hy28";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://stat.stanford.edu/~patperry/code/matrix-market";
        description = "Read and write NIST Matrix Market files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141386,7 +136159,6 @@ self: {
        testHaskellDepends = [
          base directory exceptions hspec QuickCheck
        ];
-       homepage = "https://github.com/ocramz/matrix-market-attoparsec";
        description = "Parsing and serialization functions for the NIST Matrix Market format";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -141398,7 +136170,6 @@ self: {
        version = "0.2";
        sha256 = "05jjf5wnxhbafrca1qfzlrxvysy5bff22mzk45pia5b9gwdhygn1";
        libraryHaskellDepends = [ array base containers ];
-       homepage = "http://bitbucket.org/jetxee/hs-matrix-market";
        description = "Pure and composable reader and writer of the Matrix Market format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141418,7 +136189,6 @@ self: {
          base ConfigFile containers directory MissingH mtl network
          old-locale split time vty vty-ui XMPP
        ];
-       homepage = "http://kagami.touhou.ru/projects/show/matsuri";
        description = "ncurses XMPP client";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141505,7 +136275,6 @@ self: {
        libraryHaskellDepends = [
          base containers mattermost-api QuickCheck text time
        ];
-       homepage = "https://github.com/matterhorn-chat/mattermost-api-qc";
        description = "QuickCheck instances for the Mattermost client API library";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141522,7 +136291,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath process process-extras temporary text xml
        ];
-       homepage = "https://github.com/davidlazar/maude-hs";
        description = "An interface to the Maude rewriting system";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141545,7 +136313,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
        ];
-       homepage = "https://github.com/jfischoff/maxent";
        description = "Compute Maximum Entropy Distributions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141570,7 +136337,6 @@ self: {
          array base bytestring containers deepseq file-embed mtl
          optparse-applicative parallel random random-shuffle text
        ];
-       homepage = "https://github.com/george-steel/maxent-learner";
        description = "Hayes and Wilson's maxent learning algorithm for phonotactic grammars";
        license = "GPL";
      }) {};
@@ -141592,7 +136358,6 @@ self: {
          deepseq file-embed frpnow frpnow-gtk3 glib gtk3 maxent-learner-hw
          mtl parallel random raw-strings-qq text transformers tuple
        ];
-       homepage = "https://github.com/george-steel/maxent-learner";
        description = "GUI for maxent-learner-hw";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141626,7 +136391,6 @@ self: {
          containers-unicode-symbols fgl HaLeX indentparser mtl parsec
          process uuagc uuagc-cabal
        ];
-       homepage = "http://arxiv.org/abs/1401.1460";
        description = "Maximal sharing of terms in the lambda calculus with letrec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141658,7 +136422,6 @@ self: {
        executableHaskellDepends = [
          base benchpress Cabal directory filepath mtl process time
        ];
-       homepage = "http://code.google.com/p/maybench/";
        description = "Automated benchmarking tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141691,7 +136454,6 @@ self: {
          base bytestring codec-mbox containers fclabels hsemail mtl parsec
          process pureMD5
        ];
-       homepage = "https://github.com/np/mbox-tools";
        description = "A collection of tools to process mbox files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141729,7 +136491,6 @@ self: {
          sqlite-simple text transformers unordered-containers
        ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/caneroj1/mbtiles#readme";
        description = "Haskell MBTiles client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -141778,7 +136539,6 @@ self: {
          base blaze-html bytestring containers directory filepath hostname
          MissingH polyparse process text unix
        ];
-       homepage = "http://interfaces.org.uk/mcm";
        description = "Manages the contents of files and directories";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141793,7 +136553,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gloss ];
-       homepage = "http://www.cas.mcmaster.ca/~anand/";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -141835,7 +136594,6 @@ self: {
        libraryHaskellDepends = [
          base containers mwc-probability transformers
        ];
-       homepage = "http://github.com/jtobin/mcmc-types";
        description = "Common types for sampling";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -141850,7 +136608,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base network split transformers ];
        executableHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/DougBurke/hmcpi";
        description = "Connect to MineCraft running on a Raspberry PI";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141870,7 +136627,6 @@ self: {
          aeson base bytestring data-default lens lens-aeson text
          transformers wreq
        ];
-       homepage = "https://github.com/relrod/mdapi-hs";
        description = "Haskell interface to Fedora's mdapi";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141891,7 +136647,6 @@ self: {
        executableHaskellDepends = [
          ansi-terminal base directory pandoc terminfo
        ];
-       homepage = "https://github.com/dorafmon/mdcat";
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141944,7 +136699,6 @@ self: {
          aeson async base bytestring hashable list-t postgresql-simple
          resource-pool stm stm-containers tasty tasty-hunit text time uuid
        ];
-       homepage = "https://github.com/linearray/mealstrom";
        description = "Manipulate FSMs and store them in PostgreSQL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141969,7 +136723,6 @@ self: {
        sha256 = "0z650y4fnxr4mk0i5s8axjbq14dcpgnrzkafbpg17vfhl2v5a3z3";
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ mecab ];
-       homepage = "http://github.com/tanakh/hsmecab";
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141982,7 +136735,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "0r9n04r6rv9dn38l469h40mk7fbmjwq0m72jvq69qahjw11y5lns";
        libraryHaskellDepends = [ base machines ];
-       homepage = "http://github.com/cartazio/mecha";
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141997,7 +136749,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://tomahawkins.org";
        description = "A constructive solid geometry (CSG) modeling language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142009,7 +136760,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "04z4qsjmls6h1ndczirldprn42pngm9v8g7kbmwilp7gk1zl0wyx";
        libraryHaskellDepends = [ base machines ];
-       homepage = "http://github.com/cartazio/mecha";
        description = "mecha are the most complex composite machines known to humanity, lets build them well!";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142058,7 +136808,6 @@ self: {
          monad-control mtl QuickCheck singletons spool stm tagged
          template-haskell text time transformers type-spec vector
        ];
-       homepage = "https://github.com/sheyll/mediabus";
        description = "Multimedia streaming on top of Conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142087,7 +136836,6 @@ self: {
          base conduit criterion deepseq ghc-prim lens mediabus monad-logger
          time vector
        ];
-       homepage = "https://github.com/lindenbaum/mediabus-fdk-aac";
        description = "Mediabus plugin for the Frauenhofer ISO-14496-3 AAC FDK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142126,7 +136874,6 @@ self: {
          monad-control monad-logger mtl QuickCheck singletons spool stm
          tagged template-haskell text time transformers type-spec vector
        ];
-       homepage = "https://github.com/sheyll/mediabus-rtp";
        description = "Receive and Send RTP Packets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142140,7 +136887,6 @@ self: {
        sha256 = "0g8zqyv9scj2ccvj667yn782c3vqc9a25b8a37lsz78qx15w8bz9";
        libraryHaskellDepends = [ base heap ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/caneroj1/median-stream#readme";
        description = "Constant-time queries for the median of a stream of numeric data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142185,7 +136931,6 @@ self: {
          process split temporary text transformers url utf8-string
          utility-ht
        ];
-       homepage = "http://sourceforge.net/projects/wb2pdf/";
        description = "Convert MediaWiki text to LaTeX";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142242,7 +136987,6 @@ self: {
          base bytestring conduit conduit-extra http-conduit optparse-simple
          rio tar-conduit yaml
        ];
-       homepage = "https://github.com/snoyberg/mega-sdist#readme";
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142269,7 +137013,6 @@ self: {
          scientific text transformers
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
-       homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -142296,7 +137039,6 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
-       homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142312,7 +137054,6 @@ self: {
        editedCabalFile = "1igir17mnzrmvbcp5n93x1zqjbc44dv0gl4z7szvi7nqh47h72k7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jbapple/priority-queues";
        description = "Asymptotically optimal, Coq-verified meldable heaps, AKA priority queues";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142332,7 +137073,6 @@ self: {
          async base doctest hspec mtl protolude QuickCheck
          quickcheck-instances time transformers
        ];
-       homepage = "https://github.com/quixoftic/mellon#readme";
        description = "Control physical access devices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142344,7 +137084,6 @@ self: {
        version = "0.8.0.7";
        sha256 = "0hg878il0d31lfqwkb3rsd7gxbhs5cb1sxgc3rwdv70fdg63iirp";
        libraryHaskellDepends = [ base hpio mellon-core protolude ];
-       homepage = "https://github.com/quixoftic/mellon#readme";
        description = "GPIO support for mellon";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142386,7 +137125,6 @@ self: {
          servant-swagger servant-swagger-ui swagger2 text time transformers
          wai wai-extra warp
        ];
-       homepage = "https://github.com/quixoftic/mellon#readme";
        description = "A REST web service for Mellon controllers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142431,7 +137169,6 @@ self: {
          base binary blaze-builder bytestring network
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/dterei/memcache-hs";
        description = "A memcached client library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142486,7 +137223,6 @@ self: {
        version = "0.2.1";
        sha256 = "1a6wzznhpz06c0y3wrjf5bskdd8myild8v0p0x1h0swhmy6di2yd";
        libraryHaskellDepends = [ base bytestring network utf8-light ];
-       homepage = "http://github.com/olegkat/haskell-memcached";
        description = "haskell bindings for memcached";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142510,7 +137246,6 @@ self: {
        testHaskellDepends = [
          base bytestring data-default-class hspec HUnit network process
        ];
-       homepage = "https://github.com/philopon/memcached-binary";
        description = "memcached client using binary protocol";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142523,7 +137258,6 @@ self: {
        version = "0.0.3";
        sha256 = "1x3gi54d1yzxi2046vb62dxa6jvbhggsazh4dasxcbjc1pkq6pp8";
        libraryHaskellDepends = [ base hxt ];
-       homepage = "https://github.com/eggzilla/memexml";
        description = "Library for reading Meme XML output";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142560,7 +137294,6 @@ self: {
          transformers unordered-containers utf8-string wai wai-extra
          wai-middleware-static warp
        ];
-       homepage = "http://johannesgerer.com/memis";
        description = "Memis Efficient Manual Image Sorting";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142585,7 +137318,6 @@ self: {
        version = "0.2";
        sha256 = "0x6vpf5kcr4icli0hjdqzphbpsakh0yn2ih2jyh65hnk1nh4j8n7";
        libraryHaskellDepends = [ base direct-sqlite text ];
-       homepage = "https://code.mathr.co.uk/memo-sqlite";
        description = "memoize functions using SQLite3 database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142603,7 +137335,6 @@ self: {
          base containers lrucache time time-units
        ];
        testHaskellDepends = [ base hspec time time-units ];
-       homepage = "http://github.com/yamadapc/haskell-memoization-utils";
        description = "Utilities for memoizing functions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142662,7 +137393,6 @@ self: {
          base basement bytestring deepseq foundation ghc-prim
        ];
        testHaskellDepends = [ base basement bytestring foundation ];
-       homepage = "https://github.com/vincenthz/hs-memory";
        description = "memory and related abstraction stuff";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142678,7 +137408,6 @@ self: {
        libraryHaskellDepends = [
          base containers transformers unsafe vector
        ];
-       homepage = "https://github.com/lspitzner/memorypool";
        description = "basic memory pool outside of haskell heap/GC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142693,7 +137422,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base haskeline transformers ];
-       homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/memscript";
        description = "Command line utility for memorizing scriptures or any other text";
        license = "GPL";
      }) {};
@@ -142720,7 +137448,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory HUnit optparse-applicative text
        ];
-       homepage = "https://github.com/ppelleti/hs-mercury-api";
        description = "Haskell binding to Mercury API for ThingMagic RFID readers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142741,7 +137468,6 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/j1r1k/merge-bash-history#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142791,7 +137517,6 @@ self: {
          base bytestring cereal cryptonite memory protolude QuickCheck
          random tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/adjoint-io/merkle-tree#readme";
        description = "An implementation of a Merkle Tree and merkle tree proofs";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -142803,7 +137528,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "193qz3wn7lz18aywddr9qyn8v08ifv2yxwr68c67p5mn8vr8mvmw";
        libraryHaskellDepends = [ base old-time ];
-       homepage = "http://code.haskell.org/~dons/code/mersenne-random";
        description = "Generate high quality pseudorandom numbers using a SIMD Fast Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142815,7 +137539,6 @@ self: {
        version = "0.2.2.0";
        sha256 = "1lbmdnlk21qqbzw1g7jph6d21dg3vf5saca3inwv1byxq7fh057g";
        libraryHaskellDepends = [ base random time ];
-       homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/";
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142838,7 +137561,6 @@ self: {
          base bytestring cereal containers QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       homepage = "https://github.com/rodrigosetti/messagepack";
        description = "Serialize instance for Message Pack Object";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -142856,7 +137578,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers messagepack network-simple
        ];
-       homepage = "http://github.com/rodrigosetti/messagepack-rpc";
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -142870,7 +137591,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring HTTP http-conduit network
        ];
-       homepage = "http://github.com/kaiko/messente-haskell";
        description = "Messente SMS Gateway";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142883,7 +137603,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0pxsg67r2z0f9zxr8m98sndlii0bixyxwgjkc31z5743ciw9ch0c";
        libraryHaskellDepends = [ base loch-th template-haskell ];
-       homepage = "https://github.com/bairyn/meta-misc";
        description = "Utility library providing miscellaneous meta-programming utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142901,7 +137620,6 @@ self: {
          abstract-deque abstract-par base bytestring containers deepseq mtl
          mwc-random transformers vector
        ];
-       homepage = "https://github.com/simonmar/monad-par";
        description = "Provides the monad-par interface, but based on modular scheduler \"mix-ins\"";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -142919,7 +137637,6 @@ self: {
          abstract-deque abstract-par abstract-par-accelerate accelerate
          array base meta-par QuickCheck transformers vector
        ];
-       homepage = "https://github.com/simonmar/monad-par";
        description = "Support for integrated Accelerate computations within Meta-par";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142932,7 +137649,6 @@ self: {
        version = "0.4.3.0";
        sha256 = "0860ggpksvaagrb1gqvnpp8gx6xd6h05dqg2ciis6i2my9gxmcmz";
        libraryHaskellDepends = [ base text time ];
-       homepage = "https://github.com/cutsea110/metadata";
        description = "metadata library for semantic web";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -142945,7 +137661,6 @@ self: {
        version = "0.1.2.3";
        sha256 = "0pazw2kdsl8g4dax6bg0hfg7vp2nna6lrsnzdkixpins7ac95078";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/technogeeky/metamorphic";
        description = "metamorphisms: ana . cata or understanding folds and unfolds";
        license = "unknown";
      }) {};
@@ -143045,7 +137760,6 @@ self: {
        testHaskellDepends = [
          base deepseq hspec HUnit QuickCheck should-not-typecheck
        ];
-       homepage = "https://github.com/DimaSamoz/mezzo";
        description = "Typesafe music composition";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143088,7 +137802,6 @@ self: {
        libraryHaskellDepends = [
          base containers lens mtl template-haskell
        ];
-       homepage = "http://github.com/RafaelBocquet/haskell-mgeneric/";
        description = "Generics with multiple parameters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143105,7 +137818,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-meta parsec split template-haskell
        ];
-       homepage = "https://github.com/matt76k/mi";
        description = "Multiple Instance for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143155,7 +137867,6 @@ self: {
        version = "0.1";
        sha256 = "05yphn77rxg7zqpn27292yvmah2634hqfx2mgfyp5yws5ickrvkg";
        libraryHaskellDepends = [ base time ];
-       homepage = "http://neugierig.org/software/darcs/browse/?r=microbench;a=summary";
        description = "Microbenchmark Haskell code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143171,7 +137882,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/hurou927/microc-haskell#readme";
        description = "microc compiler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143208,7 +137918,6 @@ self: {
          hspec-expectations-pretty-diff html-conduit mtl network-uri
          raw-strings-qq template-haskell text time xml-lens
        ];
-       homepage = "https://github.com/myfreeweb/microformats2-parser";
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -143224,7 +137933,6 @@ self: {
        libraryHaskellDepends = [
          aeson base data-default-class pandoc-types setters text time
        ];
-       homepage = "https://github.com/myfreeweb/microformats2-types";
        description = "Microformats 2 types (with Aeson instances)";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143237,7 +137945,6 @@ self: {
        version = "0.2.1.0";
        sha256 = "1dfkiiiksb4wnf6kgxmla37w1xmmxpzim4ribjckvn58pd2hn2a0";
        libraryHaskellDepends = [ base primitive vector ];
-       homepage = "https://github.com/daig/microgroove#readme";
        description = "Array-backed extensible records";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -143249,7 +137956,6 @@ self: {
        version = "0.4.8.3";
        sha256 = "17qx2mbqdrlnkc3gxq8njbp7qw8nh51drmz6fc8khgj9bls5ni2k";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/aelve/microlens";
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143261,7 +137967,6 @@ self: {
        version = "0.4.9.1";
        sha256 = "0j2nzf0vpx2anvsrg2w0vy2z4jn3kkcs2n6glkzblhn1j9piqh51";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/aelve/microlens";
        description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143288,7 +137993,6 @@ self: {
          aeson base bytestring criterion deepseq hashable lens lens-aeson
          microlens text unordered-containers vector
        ];
-       homepage = "http://github.com/fosskers/microlens-aeson/";
        description = "Law-abiding lenses for Aeson, using microlens";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -143300,7 +138004,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "15gmqxi24jy8w83852y5qf4xymiilkl24sppcaw7r2hn6yfz30s9";
        libraryHaskellDepends = [ base contravariant microlens ];
-       homepage = "http://github.com/aelve/microlens";
        description = "True folds and getters for microlens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143312,7 +138015,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
        libraryHaskellDepends = [ base microlens ];
-       homepage = "http://github.com/aelve/microlens";
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143329,7 +138031,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers microlens transformers
        ];
-       homepage = "http://github.com/aelve/microlens";
        description = "microlens + array, bytestring, containers, transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143345,7 +138046,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers microlens transformers
        ];
-       homepage = "http://github.com/aelve/microlens";
        description = "microlens + array, bytestring, containers, transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143362,7 +138062,6 @@ self: {
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
-       homepage = "http://github.com/aelve/microlens";
        description = "microlens support for Reader/Writer/State from mtl";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143379,7 +138078,6 @@ self: {
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
        ];
-       homepage = "http://github.com/aelve/microlens";
        description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143396,7 +138094,6 @@ self: {
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
        ];
-       homepage = "http://github.com/aelve/microlens";
        description = "Feature-complete microlens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143411,7 +138108,6 @@ self: {
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
-       homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143429,7 +138125,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base microlens ];
-       homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143448,7 +138143,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ aeson base hspec text ];
-       homepage = "https://github.com/savannidgerinel/micrologger#readme";
        description = "A super simple logging module";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143467,7 +138161,6 @@ self: {
          base bytestring http-api-data http-client http-client-tls
          http-media mtl safe servant servant-client text time xml
        ];
-       homepage = "https://github.com/BlackBrane/microsoft-translator";
        description = "Bindings to the Microsoft Translator API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143502,7 +138195,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers hspec parsec text
        ];
-       homepage = "https://github.com/phadej/microstache";
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143514,7 +138206,6 @@ self: {
        version = "0.0.1.2";
        sha256 = "09w8jn6g8fq3zsp2ahdrzv33mvayh8vladmc2wf8pbmpmdii0kap";
        libraryHaskellDepends = [ base time ];
-       homepage = "http://thoughtpolice.github.com/hs-microtimer";
        description = "A tiny library for benchmarking IO actions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143546,7 +138237,6 @@ self: {
          base containers HCodecs hspec megaparsec mtl QuickCheck random text
          tf-random transformers
        ];
-       homepage = "https://github.com/mrkkrp/mida";
        description = "Language for algorithmic generation of MIDI files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143582,7 +138272,6 @@ self: {
          base bytestring event-list explicit-exception non-negative
          QuickCheck transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Handling of MIDI messages and files";
        license = "GPL";
      }) {};
@@ -143596,7 +138285,6 @@ self: {
        libraryHaskellDepends = [
          alsa-seq base data-accessor midi utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -143617,7 +138305,6 @@ self: {
          base containers diagrams-lib diagrams-postscript event-list midi
          non-empty optparse-applicative utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/midi-music-box";
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143640,7 +138327,6 @@ self: {
          QuickCheck tasty tasty-hspec tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/tsahyt/midi-simple#readme";
        description = "A simple and fast library for working with MIDI messages";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -143657,7 +138343,6 @@ self: {
        libraryHaskellDepends = [
          base containers event-list midi non-negative
        ];
-       homepage = "http://github.com/mtolly/midi-util";
        description = "Utility functions for processing MIDI files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143674,7 +138359,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory event-list midi parsec process
        ];
-       homepage = "https://github.com/GuiltyDolphin/midi-utils";
        description = "Utilities for working with MIDI data";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143695,7 +138379,6 @@ self: {
          alsa-core alsa-seq array base containers optparse-applicative
          random transformers utility-ht wx wxcore
        ];
-       homepage = "http://www.youtube.com/watch?v=cOlR73h2uII";
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143735,7 +138418,6 @@ self: {
          base bytestring c10k directory filepath haskell98 hdaemonize
          hslogger network parsec time unix webserver
        ];
-       homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "Simple Web Server in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143769,7 +138451,6 @@ self: {
          warp
        ];
        testHaskellDepends = [ base hspec http-client ];
-       homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143787,7 +138468,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base containers mwc-probability ];
-       homepage = "http://github.com/jtobin/mighty-metropolis";
        description = "The Metropolis algorithm";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -143801,7 +138481,6 @@ self: {
        revision = "1";
        editedCabalFile = "0anjsdm2xvsaqczfip1a9bwahdlxdn1zamg3lb7qg4l3k4cdp6vb";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/evanrinehart/mikmod";
        description = "MikMod bindings";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143826,7 +138505,6 @@ self: {
          ansi-terminal base containers directory haskeline HUnit mtl
          multimap options parsec tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/M42/mikrokosmos";
        description = "Lambda calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -143843,7 +138521,6 @@ self: {
          base blaze-builder bytestring case-insensitive containers filepath
          http-types mtl wai wai-extra
        ];
-       homepage = "https://github.com/nfjinjing/miku";
        description = "A minimum web dev DSL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143867,11 +138544,34 @@ self: {
          base bytestring lens mtl network QuickCheck semigroups tasty
          tasty-hspec tasty-quickcheck
        ];
-       homepage = "https://github.com/adamflott/milena.git#readme";
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "milena_0_5_2_2" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, digest, lens
+     , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck
+     , random, resource-pool, semigroups, tasty, tasty-hspec
+     , tasty-quickcheck, transformers, zlib
+     }:
+     mkDerivation {
+       pname = "milena";
+       version = "0.5.2.2";
+       sha256 = "0dag2r79wpq67ydd7blwha2jf8nd5311bxv3li3fm88m0kbqrni1";
+       libraryHaskellDepends = [
+         base bytestring cereal containers digest lens lifted-base
+         monad-control mtl murmur-hash network random resource-pool
+         semigroups transformers zlib
+       ];
+       testHaskellDepends = [
+         base bytestring lens mtl network QuickCheck semigroups tasty
+         tasty-hspec tasty-quickcheck
+       ];
+       description = "A Kafka client for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mime" = callPackage
     ({ mkDerivation, base, text }:
      mkDerivation {
@@ -143879,7 +138579,6 @@ self: {
        version = "0.4.0.2";
        sha256 = "0x9qx8adradc5irfwfn4xs4j9pd228j1b3lpngap2qxabhz2iyp7";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/GaloisInc/mime";
        description = "Working with MIME types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -143895,7 +138594,6 @@ self: {
        libraryHaskellDepends = [
          base base64-string bytestring containers old-locale regex-pcre time
        ];
-       homepage = "http://github.com/mboes/mime-directory";
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
      }) {};
@@ -143913,7 +138611,6 @@ self: {
          random text
        ];
        testHaskellDepends = [ base blaze-builder bytestring hspec text ];
-       homepage = "http://github.com/snoyberg/mime-mail";
        description = "Compose MIME email messages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -143933,7 +138630,6 @@ self: {
          http-client http-client-tls http-conduit http-types mime-mail
          old-locale text time transformers xml-conduit xml-types
        ];
-       homepage = "http://github.com/snoyberg/mime-mail";
        description = "Send mime-mail messages via Amazon SES";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -143961,7 +138657,6 @@ self: {
        version = "0.1.0.7";
        sha256 = "1fg9cqpp5lswk8ajlq4f41n12c2v2naz179l8dsz6zisjqj4l5l3";
        libraryHaskellDepends = [ base bytestring containers text ];
-       homepage = "https://github.com/yesodweb/wai";
        description = "Basic mime-type handling types and functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -143980,7 +138675,6 @@ self: {
          pipes-bytestring pipes-cereal pipes-parse pipes-zlib text text-show
          time vector zlib
        ];
-       homepage = "https://github.com/stepcut/minecraft-data";
        description = "a DSL for generating minecraft commands and levels";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -143996,7 +138690,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory mtl random ];
-       homepage = "http://finder.homelinux.org/haskell/Mines";
        description = "Minesweeper simulation using neural networks";
        license = "unknown";
      }) {};
@@ -144028,7 +138721,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "16fdzbfspxqi0h7v6gn25n065anvk9zm28236qvfwbvr9l2ki172";
        libraryHaskellDepends = [ base vector ];
-       homepage = "http://nonempty.org/software/haskell-miniball";
        description = "Bindings to Miniball, a smallest enclosing ball library";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -144066,7 +138758,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers mtl semigroups text transformers
        ];
-       homepage = "https://github.com/RaminHAL9001/minilens";
        description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144097,7 +138788,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit text
        ];
-       homepage = "https://github.com/Mikolaj/minimorph";
        description = "English spelling functions with an emphasis on simplicity";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144144,7 +138834,6 @@ self: {
          tasty-quickcheck tasty-smallcheck temporary text text-format time
          transformers unliftio unliftio-core xml-conduit
        ];
-       homepage = "https://github.com/minio/minio-hs#readme";
        description = "A Minio Haskell Library for Amazon S3 compatible cloud storage";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144161,7 +138850,6 @@ self: {
        executableHaskellDepends = [
          ansi-terminal base MissingH process time
        ];
-       homepage = "http://github.com/jhickner/minions";
        description = "A fast parallel ssh tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144179,7 +138867,6 @@ self: {
          base containers elevator extensible mtl template-haskell
          transformers
        ];
-       homepage = "https://github.com/fumieval/minioperational";
        description = "fast and simple operational monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144217,7 +138904,6 @@ self: {
          base data-accessor data-accessor-template directory filepath mtl
          old-locale old-time process safe split template-haskell
        ];
-       homepage = "http://tener.github.com/haskell-minirotate/";
        description = "Minimalistic file rotation utility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144242,7 +138928,6 @@ self: {
        sha256 = "0zfk1w960lfjfdshxqqigi9s74wb753c6ynf665vkbrlw3g9h861";
        libraryHaskellDepends = [ base containers transformers ];
        benchmarkHaskellDepends = [ base containers easyrender ];
-       homepage = "http://www.mathstat.dal.ca/~selinger/minisat-solver/";
        description = "High-level Haskell bindings for the MiniSat SAT solver";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -144261,7 +138946,6 @@ self: {
          base containers directory filepath monads-tf parsec pretty
          transformers xhtml
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Ministg";
        description = "an interpreter for an operational semantics for the STG machine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144281,7 +138965,6 @@ self: {
        testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit text
        ];
-       homepage = "https://github.com/Mikolaj/miniutter";
        description = "Simple English clause creation from arbitrary words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144296,7 +138979,6 @@ self: {
        libraryHaskellDepends = [
          base mono-traversable semigroups transformers
        ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Express the minimum length of a container in its type";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -144310,7 +138992,6 @@ self: {
        sha256 = "06ixg6bm55h1mjym3qp667gddy7f32inaxgyfbrh918zl283briv";
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
-       homepage = "https://github.com/kryoxide/minst-idx/";
        description = "Read and write IDX data that is used in e.g. the MINST database.";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144323,7 +139004,6 @@ self: {
        version = "0.1.2";
        sha256 = "1njhz7wjmsk5pbr7gfkl95k50npkmm0iyxp3j93bbsg4rmxzg2kw";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/RyanGlScott/mintty";
        description = "A reliable way to detect the presence of a MinTTY console on Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144342,7 +139022,6 @@ self: {
        executableHaskellDepends = [
          base bytestring ghc-prim primitive vector
        ];
-       homepage = "https://github.com/shnarazk/mios";
        description = "A Minisat-based CDCL SAT solver in Haskell";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -144361,7 +139040,6 @@ self: {
          authenticate-oauth base bytestring conduit lens monad-logger text
          transformers twitter-conduit
        ];
-       homepage = "https://github.com/minamiyama1994/mirror-tweet";
        description = "Tweet mirror";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144384,7 +139062,6 @@ self: {
          text utf8-string vector
        ];
        executableHaskellDepends = [ monad-loops regex-base regex-pcre ];
-       homepage = "https://github.com/mokus0/misfortune";
        description = "fortune-mod clone";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -144404,7 +139081,6 @@ self: {
          aeson base bytestring containers http-api-data http-types lucid
          network-uri servant servant-lucid text transformers vector
        ];
-       homepage = "http://github.com/dmjio/miso";
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144424,7 +139100,6 @@ self: {
          aeson base bytestring containers http-api-data http-types lucid
          network-uri servant servant-lucid text transformers vector
        ];
-       homepage = "http://github.com/dmjio/miso";
        description = "A tasty Haskell front-end framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144451,7 +139126,6 @@ self: {
        testHaskellDepends = [
          anydbm base Cabal directory HUnit MissingH
        ];
-       homepage = "https://github.com/domdere/missing-py2";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144480,7 +139154,6 @@ self: {
        executableHaskellDepends = [
          array base containers simple-tabular
        ];
-       homepage = "http://wiki.cs.pdx.edu/bartforge/oms";
        description = "Find optimal mixed strategies for two-player games";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144499,7 +139172,6 @@ self: {
          template-haskell
        ];
        testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
-       homepage = "https://github.com/michalkonecny/mixed-types-num";
        description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144533,7 +139205,6 @@ self: {
          base directory extensible-exceptions mtl old-locale old-time
          pcre-light pretty readline
        ];
-       homepage = "http://code.haskell.org/~dons/code/mkcabal";
        description = "Generate cabal files for a Haskell project";
        license = "GPL";
      }) {};
@@ -144560,7 +139231,6 @@ self: {
        version = "0.0.2";
        sha256 = "06mwmahyp781wigjva12kz7w75vjkkprl8k1yiqd1yd0162vp31k";
        libraryHaskellDepends = [ base haskell98 ];
-       homepage = "http://haskell.org/haskellwiki/mlist";
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144585,7 +139255,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
        ];
-       homepage = "https://github.com/alexander-ignatyev/mltool";
        description = "Machine Learning Toolbox";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144609,7 +139278,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          vector
        ];
-       homepage = "https://github.com/alexander-ignatyev/mltool";
        description = "Machine Learning Toolbox";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144654,7 +139322,6 @@ self: {
          QuickCheck text
        ];
        benchmarkHaskellDepends = [ base criterion text weigh ];
-       homepage = "https://github.com/mmark-md/mmark";
        description = "Strict markdown processor for writers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144676,7 +139343,6 @@ self: {
          aeson base bytestring directory gitrev lucid megaparsec mmark
          mmark-ext optparse-applicative stache text unordered-containers
        ];
-       homepage = "https://github.com/mmark-md/mmark-cli";
        description = "Command line interface to MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144696,7 +139362,6 @@ self: {
        ];
        testHaskellDepends = [ base hspec lucid mmark text ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/mmark-md/mmark-ext";
        description = "Commonly useful extensions for the MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144726,7 +139391,6 @@ self: {
          base binary bytestring containers data-msgpack text
        ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
-       homepage = "https://github.com/zmactep/mmtf#readme";
        description = "Macromolecular Transmission Format implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144765,7 +139429,6 @@ self: {
        sha256 = "1zmjj71bv5yzdjm4hmlkiwcvv810mln090yp8znj2j21hiz1dzs2";
        libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [ base binary directory hspec vector ];
-       homepage = "https://github.com/kryoxide/mnist-idx/";
        description = "Read and write IDX data that is used in e.g. the MNIST database.";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -144782,7 +139445,6 @@ self: {
          base binary bytestring containers dawg regex-tdfa regex-tdfa-text
          tagset-positional text zlib
        ];
-       homepage = "https://github.com/vjeranc/moan";
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144817,7 +139479,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal mtl transformers
        ];
-       homepage = "https://github.com/roelvandijk/modbus-tcp";
        description = "Communicate with Modbus devices over TCP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144838,7 +139499,6 @@ self: {
          base containers doctest filemanip ghc-prim pretty tasty tasty-hunit
          tasty-quickcheck
        ];
-       homepage = "http://github.com/tittoassini/model";
        description = "Derive a model of a data type using Generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144884,7 +139544,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq megaparsec text weigh
        ];
-       homepage = "https://github.com/mrkkrp/modern-uri";
        description = "Modern library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -144908,7 +139567,6 @@ self: {
          base containers fasta mtl optparse-applicative pipes pipes-text
          semigroups split text transformers
        ];
-       homepage = "https://github.com/GregorySchwartz/modify-fasta";
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144943,7 +139601,6 @@ self: {
        sha256 = "1f5k25gqnn037fpan3l956ly0g5cgwnw7qxyc6sm6hgdcl91wn1l";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/TikhonJelvis/modular-arithmetic";
        description = "A type for integers modulo some constant";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144962,7 +139619,6 @@ self: {
          base basic-prelude bytestring containers data-default hashable
          system-filepath text transformers unordered-containers vector
        ];
-       homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "A new Prelude featuring first class modules";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -144975,7 +139631,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1izinrgd9a6sm57isg8jgs4wjidczwqcxl6vg5h4gy5zz9dg8xnx";
        libraryHaskellDepends = [ base classy-prelude modular-prelude ];
-       homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "Reifying ClassyPrelude a la ModularPrelude";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145007,7 +139662,6 @@ self: {
        testHaskellDepends = [
          base containers filepath haskell-src-exts HUnit process
        ];
-       homepage = "https://github.com/seereason/module-management";
        description = "Clean up module imports, split and merge modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145025,7 +139679,6 @@ self: {
          base exceptions filepath ghc ghc-paths template-haskell temporary
          transformers
        ];
-       homepage = "https://github.com/jfischoff/modulespection";
        description = "Template Haskell for introspecting a module's declarations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145062,7 +139715,6 @@ self: {
        libraryHaskellDepends = [
          air base bytestring data-default dlist mtl text
        ];
-       homepage = "https://github.com/nfjinjing/moe";
        description = "html with style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145085,7 +139737,6 @@ self: {
          optparse-applicative random stm strict text time transformers
          unordered-containers
        ];
-       homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -145108,7 +139759,6 @@ self: {
          explicit-exception filepath html HTTP network network-uri
          old-locale old-time parsec process transformers unix utility-ht
        ];
-       homepage = "http://code.haskell.org/mohws/";
        description = "Modular Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145156,7 +139806,6 @@ self: {
          http-types mtl text time
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/paramander/mollie-api-haskell";
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145174,7 +139823,6 @@ self: {
          base mtl stm transformers transformers-abort transformers-base
          transformers-compat
        ];
-       homepage = "https://github.com/mvv/monad-abort-fd";
        description = "A better error monad transformer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145187,7 +139835,6 @@ self: {
        version = "0.4.1";
        sha256 = "16dnp6wz0s56gm58k6m5cv5c47hb2vz1m4a3pqvrg3j97y344c3q";
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
-       homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145212,7 +139859,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "0zjyy9apc5zr51nh31p3f6bzbnfbc40hkf9p52370ynj4513lz4r";
        libraryHaskellDepends = [ base exceptions ];
-       homepage = "https://github.com/basvandijk/monad-batcher";
        description = "An applicative monad that batches commands for later more efficient execution";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145236,7 +139882,6 @@ self: {
        version = "1.0.3";
        sha256 = "15nk9lvwz4s6lx8g08x5npai0bk13s6mj26vz6biwy3shpf5v11r";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/luna/monad-branch";
        description = "Monadic abstraction for computations that can be branched and run independently";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -145258,7 +139903,6 @@ self: {
          base conduit data-lens-light ghc-prim mmorph tasty tasty-hunit
          transformers
        ];
-       homepage = "https://github.com/strake/monad-classes.hs";
        description = "more flexible mtl";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145278,7 +139922,6 @@ self: {
        testHaskellDepends = [
          base logging-effect monad-classes tasty tasty-hunit transformers
        ];
-       homepage = "https://github.com/edwardgeorge/monad-classes-logging#readme";
        description = "monad-classes based typeclass for Ollie's logging-effect LoggingT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145291,7 +139934,6 @@ self: {
        version = "0.2.0";
        sha256 = "0jim6hk891jby2gch6f1k4262jm8fl9jgl808dj204ylz8w1475l";
        libraryHaskellDepends = [ base binary containers data-lens mtl ];
-       homepage = "https://github.com/kawu/monad-codec";
        description = "Monadic conversion between complex data structures and unique integers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145307,7 +139949,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring connection exceptions transformers
        ];
-       homepage = "http://hub.darcs.net/fr33domlover/monad-connect";
        description = "Transformer for TCP connection with TLS and SOCKS support";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -145323,7 +139964,6 @@ self: {
        libraryHaskellDepends = [
          base stm transformers transformers-base transformers-compat
        ];
-       homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145339,7 +139979,6 @@ self: {
        libraryHaskellDepends = [
          base stm transformers transformers-base transformers-compat
        ];
-       homepage = "https://github.com/athanclark/monad-control#readme";
        description = "Just like monad-control, except less efficient, and the monadic state terms are all * -> *";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145355,7 +139994,6 @@ self: {
        libraryHaskellDepends = [
          base monad-parallel transformers transformers-compat
        ];
-       homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
        description = "Coroutine monad transformer for suspending and resuming monadic computations";
        license = "GPL";
      }) {};
@@ -145372,7 +140010,6 @@ self: {
        editedCabalFile = "1jkxalyj9libzgg1whzp3dw152j8abxng4jm9xrh2y2i48dw412c";
        libraryHaskellDepends = [ base free mtl psqueues transformers ];
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
-       homepage = "https://github.com/ennocramer/monad-dijkstra";
        description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145406,7 +140043,6 @@ self: {
        libraryHaskellDepends = [
          base mmorph monad-control stm transformers transformers-base
        ];
-       homepage = "http://github.com/jwiegley/monad-extras";
        description = "Extra utility functions for working with monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145423,7 +140059,6 @@ self: {
          base monad-abort-fd monad-control transformers transformers-abort
          transformers-base transformers-compat
        ];
-       homepage = "https://github.com/mvv/monad-finally";
        description = "Guard monadic computations with cleanup actions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145464,7 +140099,6 @@ self: {
          base cryptonite exceptions memory transformers
        ];
        testHaskellDepends = [ base bytestring cryptonite transformers ];
-       homepage = "http://hub.darcs.net/fr33domlover/monad-hash";
        description = "Monad transformer for incremental hashing";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -145486,7 +140120,6 @@ self: {
          http-types monad-logger monadcryptorandom MonadRandom mtl text
          transformers transformers-compat
        ];
-       homepage = "https://github.com/futurice/haskell-monad-http#readme";
        description = "A class of monads which can do http requests";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145499,7 +140132,6 @@ self: {
        version = "0.1";
        sha256 = "09hpl7ah5ivsrx4xlk96d129n1j4wpx7kj6l95zwadyaz7rj9fp7";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/patperry/monad-interleave";
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145518,7 +140150,6 @@ self: {
          transformers-base
        ];
        testHaskellDepends = [ base hspec transformers-base ];
-       homepage = "https://github.com/cjdev/monad-io-adapter#readme";
        description = "Adapters between MonadIO and MonadBase IO";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -145534,7 +140165,6 @@ self: {
        libraryHaskellDepends = [
          base monad-control mtl transformers transformers-base
        ];
-       homepage = "http://github.com/phaazon/monad-journal";
        description = "Pure logger typeclass and monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145550,7 +140180,6 @@ self: {
        libraryHaskellDepends = [
          base constraints transformers transformers-compat
        ];
-       homepage = "https://github.com/ivan-m/monad-levels";
        description = "Specific levels of monad transformers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145570,7 +140199,6 @@ self: {
        testHaskellDepends = [
          base containers deepseq hspec logict mtl QuickCheck
        ];
-       homepage = "https://github.com/mgajda/monad-lgbt#readme";
        description = "Monad transformers for combining local and global state";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145611,7 +140239,6 @@ self: {
          template-haskell text transformers transformers-base
          transformers-compat unliftio-core
        ];
-       homepage = "https://github.com/snoyberg/monad-logger#readme";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -145626,7 +140253,6 @@ self: {
        libraryHaskellDepends = [
          aeson base monad-logger template-haskell text
        ];
-       homepage = "http://github.com/fpco/monad-logger-json";
        description = "JSON-friendly Logging APIs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -145646,7 +140272,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion monad-logger ];
-       homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme";
        description = "Add prefixes to your monad-logger output";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -145662,7 +140287,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring fast-logger hsyslog monad-logger text transformers
        ];
-       homepage = "https://github.com/fpco/monad-logger-syslog";
        description = "syslog output for monad-logger";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -145675,7 +140299,6 @@ self: {
        sha256 = "062c2sn3hc8h50p1mhqkpyv6x8dydz2zh3ridvlfjq9nqimszaky";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/mokus0/monad-loops";
        description = "Monadic loops";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -145687,7 +140310,6 @@ self: {
        version = "0.4";
        sha256 = "0y7j2xpr1s7ggwm3vvpb5mlagsnxhq9qpncapibhk2pbf2d5r7as";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/mokus0/monad-loops-stm";
        description = "Monadic loops for STM";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -145707,7 +140329,6 @@ self: {
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/bjin/monad-lrs";
        description = "a monad to calculate linear recursive sequence";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145732,7 +140353,6 @@ self: {
        benchmarkHaskellDepends = [
          array base containers criterion mtl primitive transformers vector
        ];
-       homepage = "https://github.com/EduardSergeev/monad-memo";
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145744,7 +140364,6 @@ self: {
        version = "0.1";
        sha256 = "03kbqbgv4npzfzn90jk4p17y8kb62sslby6q36819qkif1j76lq6";
        libraryHaskellDepends = [ base mersenne-random-pure64 ];
-       homepage = "http://code.haskell.org/~dons/code/monad-mersenne-random";
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145763,7 +140382,6 @@ self: {
          transformers unordered-containers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/sellerlabs/monad-metrics#readme";
        description = "A convenient wrapper around EKG metrics";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -145782,7 +140400,6 @@ self: {
          monad-control mtl template-haskell th-orphans transformers-base
        ];
        testHaskellDepends = [ base hspec mtl ];
-       homepage = "https://github.com/cjdev/monad-mock#readme";
        description = "A monad transformer for mocking mtl-style typeclasses";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -145806,7 +140423,6 @@ self: {
        version = "0.3.0";
        sha256 = "1x65jvh816a296y2ds8vysfzl83am4pwwrnap4zdg0prpcxfpwl8";
        libraryHaskellDepends = [ base containers mtl text vector ];
-       homepage = "https://github.com/kawu/monad-ox";
        description = "Monad for observation extraction";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145831,7 +140447,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          time
        ];
-       homepage = "https://github.com/simonmar/monad-par";
        description = "A library for parallel programming based on a monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145847,7 +140462,6 @@ self: {
        libraryHaskellDepends = [
          abstract-par base cereal deepseq mtl random transformers
        ];
-       homepage = "https://github.com/simonmar/monad-par";
        description = "Combinators and extra features for Par monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145862,7 +140476,6 @@ self: {
        libraryHaskellDepends = [
          base parallel transformers transformers-compat
        ];
-       homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
        description = "Parallel execution of monadic computations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145878,7 +140491,6 @@ self: {
        libraryHaskellDepends = [
          base monad-parallel monadIO terminal-progress-bar
        ];
-       homepage = "https://github.com/mnacamura/monad-parallel-progressbar";
        description = "Parallel execution of monadic computations with a progress bar";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145891,7 +140503,6 @@ self: {
        version = "0.0.4";
        sha256 = "08rm902kclapqh1iafjrsqspf0szhbx5jaqv6hh9p5zbg8ipdkhc";
        libraryHaskellDepends = [ base mtl stm ];
-       homepage = "http://hackage.haskell.org/package/monad-param";
        description = "Parameterized monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145911,7 +140522,6 @@ self: {
          base extensible-exceptions HUnit test-framework
          test-framework-hunit transformers
        ];
-       homepage = "http://andersk.mit.edu/haskell/monad-peel/";
        description = "Lift control operations like exception catching through monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145935,7 +140545,6 @@ self: {
          base hspec monad-control monad-logger persistent persistent-sqlite
          persistent-template text
        ];
-       homepage = "https://github.com/cjdev/monad-persist#readme";
        description = "An mtl-style typeclass and transformer for persistent";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -145948,7 +140557,6 @@ self: {
        version = "0.1";
        sha256 = "1vi6g65hdyq5vq78mfag0qljxgzb6vq83m82x3cpgjl7dr9k5h1x";
        libraryHaskellDepends = [ base primitive transformers ];
-       homepage = "http://bitbucket.org/Shimuuar/monad-primitive";
        description = "Type class for monad transformers stack with pirimitive base monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145960,7 +140568,6 @@ self: {
        version = "4.0.1";
        sha256 = "1skcjjkn14fh92l4rx3akxjg1c85jqhnlwvkkzqwz9g15bdy3gq2";
        libraryHaskellDepends = [ base semigroupoids ];
-       homepage = "http://github.com/ekmett/monad-products";
        description = "Monad products";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -145989,7 +140596,6 @@ self: {
          base exceptions monad-control mtl transformers transformers-base
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "http://github.com/harendra-kumar/monad-recorder";
        description = "Record and replay the results of monadic actions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -146001,7 +140607,6 @@ self: {
        version = "0.1.3.0";
        sha256 = "0zi4p8v02shw0m471xsq1d3wbskz6jd2j92wpdi3qcd8fx4i283q";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
-       homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146013,7 +140618,6 @@ self: {
        version = "0.1.5";
        sha256 = "17jm69pwysx2kbx06n80iy396nbj5dys9iwdivargfzx7xql0s59";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/fumieval/monad-skeleton";
        description = "Monads of program skeleta";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146025,7 +140629,6 @@ self: {
        version = "0.2.4.1";
        sha256 = "025zi9xzliwgyasq5hrfxwzg4ksj3kj0ys2kp62fi1n4ddbih64f";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/ekmett/monad-st";
        description = "Provides a MonadST class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146041,7 +140644,6 @@ self: {
        libraryHaskellDepends = [
          AbortT-transformers base fclabels monads-tf transformers
        ];
-       homepage = "https://github.com/bairyn/monad-state";
        description = "Utility library for monads, particularly those involving state";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146055,7 +140657,6 @@ self: {
        sha256 = "08sr29qr02kfqja51ciqcpsf95wp3bypx64f4cwgpwh23xapr1fx";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base stm ];
-       homepage = "http://github.com/joeyadams/hs-monad-statevar";
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146072,7 +140673,6 @@ self: {
        editedCabalFile = "17xfha8zn0snlqwi8cr44my3d1zbyvhh83qlmb747dblhmj1rdi1";
        libraryHaskellDepends = [ base exceptions ghc-prim primitive ];
        testHaskellDepends = [ base hspec HUnit ];
-       homepage = "http://github.com/cartazio/monad-ste";
        description = "ST monad with efficient explicit errors";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146088,7 +140688,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers deepseq monads-tf
        ];
-       homepage = "http://github.com/taruti/monad-stlike-io";
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146101,7 +140700,6 @@ self: {
        version = "0.1.1";
        sha256 = "007rsq9x0dq8xmiimgqb0v8k15xizx63qmc76b1b8a66nfsd9w56";
        libraryHaskellDepends = [ base monad-stlike-io stm ];
-       homepage = "http://github.com/taruti/monad-stlike-stm";
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146136,7 +140734,6 @@ self: {
        version = "0.2.0";
        sha256 = "02qp31w0zgms07b13km3aiina4iqbzxkiajab3b0czmc17xv4kx4";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "http://github.com/ninegua/monad-task";
        description = "A monad transformer that turns event processing into co-routine programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146151,7 +140748,6 @@ self: {
        editedCabalFile = "1v59w75w589mh6n3ga2fcihgmjmg0vd0q7fg9l2q52yhgx5pz9m3";
        libraryHaskellDepends = [ base mtl time ];
        testHaskellDepends = [ base mtl time ];
-       homepage = "https://github.com/scrive/monad-time";
        description = "Type class for monads which carry the notion of the current time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146164,7 +140760,6 @@ self: {
        sha256 = "0z30c0k5bqlz86vwajnm6kj26i09zx6dzqwd00z6ba8hqyzm1x0a";
        libraryHaskellDepends = [ base mtl time ];
        testHaskellDepends = [ base mtl time ];
-       homepage = "https://github.com/scrive/monad-time";
        description = "Type class for monads which carry the notion of the current time";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146183,7 +140778,6 @@ self: {
          transformers-base
        ];
        testHaskellDepends = [ base containers hlint hspec transformers ];
-       homepage = "https://github.com/pikajude/monad-timing";
        description = "Monad transformer for recording timing events";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -146225,7 +140819,6 @@ self: {
        libraryHaskellDepends = [
          base constraints monad-control transformers transformers-base
        ];
-       homepage = "https://github.com/fpco/monad-unlift";
        description = "Typeclasses for representing monad transformer unlifting";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -146243,7 +140836,6 @@ self: {
          base constraints exceptions monad-control monad-unlift mtl
          mutable-containers resourcet stm transformers transformers-base
        ];
-       homepage = "https://github.com/fpco/monad-unlift";
        description = "Typeclasses for representing monad transformer unlifting";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -146255,7 +140847,6 @@ self: {
        version = "0.2.1.0";
        sha256 = "1amlkcwwmgqscq0w660lawnwz07swlmiz8g61qn0fb1vmfpvas88";
        libraryHaskellDepends = [ base base-compat stm ];
-       homepage = "https://github.com/effectfully/monad-var#readme";
        description = "Generic operations over variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146290,7 +140881,6 @@ self: {
        version = "3.7.3";
        sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q";
        libraryHaskellDepends = [ base ];
-       homepage = "http://wiki.github.com/yav/monadlib";
        description = "A collection of monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146302,7 +140892,6 @@ self: {
        version = "0.2";
        sha256 = "14byhdcby094qpgmkblysnplz5r88xnfk7rnfddihzz4jgjzlvy1";
        libraryHaskellDepends = [ base monadLib ];
-       homepage = "http://github.com/aristidb/monadLib-compose";
        description = "Arrow-like monad composition for monadLib";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146327,7 +140916,6 @@ self: {
        version = "0.1";
        sha256 = "0r5hja34nalhvlc4x2rmhk9j1rsd363ilfjkd7y7cv4l8yzvifq7";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/ajnsit/monadbi";
        description = "Extract underlying monads from monad transformers";
        license = "GPL";
      }) {};
@@ -146344,7 +140932,6 @@ self: {
          base bytestring crypto-api exceptions mtl tagged transformers
          transformers-compat
        ];
-       homepage = "https://github.com/TomMD/monadcryptorandom";
        description = "A monad for using CryptoRandomGen";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146356,7 +140943,6 @@ self: {
        version = "0.1.2.1";
        sha256 = "0vj84g5y0k903pz4lk12sa6l6c0f26dc42x62f1mqny8457r3ds6";
        libraryHaskellDepends = [ base monadbi ];
-       homepage = "https://github.com/ajnsit/monadfibre";
        description = "Monadic functions which provide Choice and Parallelism";
        license = "GPL";
      }) {};
@@ -146372,7 +140958,6 @@ self: {
        libraryHaskellDepends = [
          array base stm transformers transformers-compat
        ];
-       homepage = "http://github.com/ekmett/monadic-arrays/";
        description = "Boxed and unboxed arrays for monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146390,7 +140975,6 @@ self: {
          base containers mtl parsec pretty random semigroups
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://people.cs.kuleuven.be/~tom.schrijvers/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146409,7 +140993,6 @@ self: {
        librarySystemDepends = [
          gecodeint gecodekernel gecodesearch gecodeset gecodesupport
        ];
-       homepage = "http://users.ugent.be/~tschrijv/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146445,7 +141028,6 @@ self: {
        version = "0.7.1";
        sha256 = "1a773nysrsj61ka7bdacb0i7dxlgb1fjz3x5w9c1w1dv7rmhynmj";
        libraryHaskellDepends = [ base template-haskell transformers ];
-       homepage = "http://github.com/pepeiborra/monadloc";
        description = "A class for monads which can keep a monadic call trace";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -146463,7 +141045,6 @@ self: {
        executableHaskellDepends = [
          base filepath haskell-src-exts monadloc pretty syb
        ];
-       homepage = "http://github.com/pepeiborra/monadloc-pp";
        description = "A preprocessor for generating monadic call traces";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146543,7 +141124,6 @@ self: {
        version = "0.0.2";
        sha256 = "0i586zh6247jfmkw2x27j0aq47yz1c71irj9iwrlx1zrmvzak1yv";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/tonymorris/monadtransform";
        description = "A type-class for transforming monads (homomorphism) in a transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146562,7 +141142,6 @@ self: {
          network pool-conduit stm transformers transformers-base
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/notogawa/monarch";
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146612,7 +141191,6 @@ self: {
        sha256 = "173z82r3z7dvz7397m069m7ppr6fqfvnyxr4spkxy092pzk7il5k";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/jpvillaisaza/money";
        description = "Money";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146646,7 +141224,6 @@ self: {
          hashtables lifted-base monad-control mtl network nonce parsec
          random random-shuffle text transformers-base
        ];
-       homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -146677,7 +141254,6 @@ self: {
          hashtables lifted-base monad-control mtl network nonce parsec
          random random-shuffle stm text transformers-base
        ];
-       homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146699,7 +141275,6 @@ self: {
          base data-default hspec lifted-base monad-control mongoDB network
          text transformers
        ];
-       homepage = "https://github.com/docmunch/haskell-mongodb-queue";
        description = "message queue using MongoDB";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146768,7 +141343,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1qnbw9pd06czwyj2xcsjdigg7bj8d23p3ljnnkgd3d0r67qxxlxm";
        libraryHaskellDepends = [ base bytestring text vector ];
-       homepage = "http://github.com/JohnLato/mono-foldable";
        description = "Folds for monomorphic containers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146793,7 +141367,6 @@ self: {
          text transformers unordered-containers vector
        ];
        benchmarkHaskellDepends = [ base gauge mwc-random vector ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -146811,7 +141384,6 @@ self: {
          base comonad containers dlist dlist-instances mono-traversable
          semigroupoids semigroups transformers vector-instances
        ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Extra typeclass instances for mono-traversable";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -146823,7 +141395,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1jv40qwj08vfsy06cdrwdi05j06b1q3q7p30gh60ccq9l8y1qi2d";
        libraryHaskellDepends = [ base mono-traversable ];
-       homepage = "https://github.com/oisdk/mono-traversable-wrapper";
        description = "Wrapper providing Foldable instance for MonoFoldables";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -146835,7 +141406,6 @@ self: {
        version = "0.1.8";
        sha256 = "15mwj4w46wszawhiabykamaf020m795zg017jb2j49gpzk8abqjf";
        libraryHaskellDepends = [ base containers lens mtl ];
-       homepage = "https://github.com/luna/monoid";
        description = "Monoid type classes, designed in modular way, distinguish Monoid from Mempty and Semigroup. This design allows mempty operation don't bring Semigroups related constraints until (<>) is used.";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -146847,7 +141417,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "1sq2ll3ac3fxb0gdcy6gzjlv5j17pnrj8zs2bhi2s96dx2gp6zrv";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://github.com/maciejpirog/monoid-absorbing";
        description = "A library for (left, right) zero monoids and backtracking with cut";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -146887,7 +141456,6 @@ self: {
        sha256 = "1n05f95yhn6jp7rdnlx686k1lsls4iilxdxnp41ds4afsypaclfk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base bytestring containers ];
-       homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146918,7 +141486,6 @@ self: {
        testHaskellDepends = [
          base math-functions QuickCheck tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/Shimuuar/monoid-statistics";
        description = "Monoids for calculation of statistics of sample";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146938,7 +141505,6 @@ self: {
          base bytestring containers primes QuickCheck quickcheck-instances
          tasty tasty-quickcheck text vector
        ];
-       homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -146967,7 +141533,6 @@ self: {
          base containers deepseq hashable lens newtype semigroups
          unordered-containers
        ];
-       homepage = "http://github.com/bgamari/monoidal-containers";
        description = "Containers with monoidal accumulation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146997,7 +141562,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers fingertree parallel text
        ];
-       homepage = "http://github.com/ekmett/monoids";
        description = "Deprecated: Use 'reducers'";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147010,7 +141574,6 @@ self: {
        version = "0.0.3.3";
        sha256 = "0x7fig4ms5qqiah4847ghl13s2r1xv2372hj6xrhjw6bdfh85cln";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/konn/monomorphic";
        description = "Library to convert polymorphic datatypes to/from its monomorphic represetation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -147031,7 +141594,6 @@ self: {
          stats-web stm system-uuid text time unordered-containers
          zeromq-haskell
        ];
-       homepage = "http://github.com/bumptech/montage";
        description = "Riak Resolution Proxy";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147055,7 +141617,6 @@ self: {
          safe stats-web stm system-uuid text text-format time
          unordered-containers zeromq-haskell
        ];
-       homepage = "http://github.com/bumptech/montage-haskell-client";
        description = "Riak Resolution Proxy Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147078,7 +141639,6 @@ self: {
          base gsl-random ieee754 primitive QuickCheck random test-framework
          test-framework-quickcheck2 transformers vector
        ];
-       homepage = "http://github.com/patperry/hs-monte-carlo";
        description = "A monad and transformer for Monte Carlo calculations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147125,7 +141685,6 @@ self: {
          array base containers gray-code HUnit mersenne-random-pure64
          monad-mersenne-random mtl random random-shuffle time
        ];
-       homepage = "http://www.github.com/astanin/moo/";
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147143,7 +141702,6 @@ self: {
          aeson base bytestring canteven-config ekg ekg-core hslogger snap
          text time transformers yaml
        ];
-       homepage = "https://github.com/SumAll/moonshine";
        description = "A web service framework for Haskell, similar in purpose to dropwizard";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147157,7 +141715,6 @@ self: {
        sha256 = "1q1fs56a61ryild0zp43ash5mm83162v5v61x29vmc3hv1h79bnm";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
-       homepage = "https://github.com/mtth/more-containers#readme";
        description = "A few more collections";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -147169,7 +141726,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "1sl4m02ji5my13kajcr2csqm24jph01qsihxj5dj66cxgw99idq1";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/qzchenwl/more-extensible-effects#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -147190,7 +141746,6 @@ self: {
          array base binary bytestring containers directory filepath mtl
          pretty QuickCheck text utf8-string vector
        ];
-       homepage = "http://sites.google.com/site/morfetteweb/";
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147209,7 +141764,6 @@ self: {
          base bytestring containers directory mtl text
        ];
        librarySystemDepends = [ morfeusz ];
-       homepage = "https://github.com/kawu/morfeusz";
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147281,7 +141835,6 @@ self: {
          diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm
          stm-chans transformers
        ];
-       homepage = "http://ldc.usb.ve/~05-38235/cursos/CI3661/2015AJ/";
        description = "Generación interactiva de mosaicos";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147294,7 +141847,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0c80pf189gkxr3zrf8r5rsw5gli1kk4q4pd3giww9wxwpc2nyjln";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/anishray/mosquitto-hs#readme";
        description = "Mosquitto client library bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -147399,7 +141951,6 @@ self: {
          haskell-gi-overloading MissingH network-uri process system-fileio
          system-filepath text time
        ];
-       homepage = "https://github.com/lettier/movie-monad";
        description = "Plays videos using GStreamer and GTK+";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147413,7 +141964,6 @@ self: {
        sha256 = "12vrwwm61pa3fp0adm1xmbivaw16hahb5b8lpn7358qrdgw1b29n";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/joshuaclayton/moving-averages#readme";
        description = "This is a library for calculating moving averages on lists of numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -147438,7 +141988,6 @@ self: {
          haskell-gi-overloading lens MissingH mtl network random resourcet
          simple-ui template-haskell text utf8-string vty
        ];
-       homepage = "http://bitbucket.org/borekpiotr/linux-music-player";
        description = "Music player for linux";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147455,7 +142004,6 @@ self: {
        executableHaskellDepends = [
          base binary-strict bytestring haskell98 mtl
        ];
-       homepage = "http://www.bjrn.se/mp3dec";
        description = "MP3 decoder for teaching";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147472,7 +142020,6 @@ self: {
        executableHaskellDepends = [
          base directory network powermate unix
        ];
-       homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147486,7 +142033,6 @@ self: {
        sha256 = "1lfjz80jv3r82pggj05ixngisaspqyx0g1i80px0issv9aqqqm8p";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpg123 ];
-       homepage = "https://github.com/pakanek/mpg123-haskell-binding";
        description = "Mpg132 bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mpg123;};
@@ -147529,7 +142075,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "11c62m19ngap44fv4gnv0ln8iff1b08dg2vclj16jx1fj8pqps9y";
        libraryHaskellDepends = [ base containers dbus mtl ];
-       homepage = "http://github.com/Fuco1/mpris";
        description = "Interface for MPRIS";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147568,7 +142113,6 @@ self: {
          old-locale old-time parallel parsec regexpr template-haskell time
          utf8-string
        ];
-       homepage = "http://github.com/nfjinjing/mps/";
        description = "simply oo";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147588,7 +142132,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath gtk mtl process template-haskell unix
        ];
-       homepage = "https://github.com/sebadoom/mpvguihs";
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147618,7 +142161,6 @@ self: {
        benchmarkHaskellDepends = [
          base binary bytestring criterion text
        ];
-       homepage = "https://github.com/lpeterse/haskell-mqtt";
        description = "An MQTT protocol implementation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147636,7 +142178,6 @@ self: {
          async attoparsec base bytestring monad-loops mtl network singletons
          stm text transformers
        ];
-       homepage = "http://github.com/k00mi/mqtt-hs";
        description = "A MQTT client library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147663,7 +142204,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1qmfki808284yz8l5l30s10q6idhlmp864wi6xbk14chh331xaiw";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/scmu/mrm";
        description = "Modular Refiable Matching, first-class matches";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147685,7 +142225,6 @@ self: {
        testHaskellDepends = [
          base doctest profunctors tasty tasty-quickcheck vector
        ];
-       homepage = "https://github.com/relrod/ms";
        description = "metric spaces";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147710,7 +142249,6 @@ self: {
        testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
        ];
-       homepage = "http://msgpack.org/";
        description = "A Haskell implementation of MessagePack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147730,7 +142268,6 @@ self: {
          unordered-containers vector
        ];
        testHaskellDepends = [ aeson base msgpack tasty tasty-hunit ];
-       homepage = "http://msgpack.org/";
        description = "Aeson adapter for MessagePack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147753,7 +142290,6 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs directory peggy ];
        testHaskellDepends = [ base hspec ];
-       homepage = "http://msgpack.org/";
        description = "An IDL Compiler for MessagePack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147773,7 +142309,6 @@ self: {
          exceptions monad-control msgpack mtl network random text
        ];
        testHaskellDepends = [ async base mtl network tasty tasty-hunit ];
-       homepage = "http://msgpack.org/";
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147791,7 +142326,6 @@ self: {
          base containers haskell-src-exts haskell-src-meta lens mtl parsec
          template-haskell text
        ];
-       homepage = "http://www.cl.cam.ac.uk/~mbg28/";
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147835,7 +142369,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath mtl parsec process xdg-basedir
        ];
-       homepage = "http://github.com/pbrisbin/msu";
        description = "Monitor Setup Utility";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -147874,7 +142407,6 @@ self: {
        version = "2.1.3.1";
        sha256 = "1xpn2wjmqbh2cg1yssc6749xpgcqlrrg4iilwqgkcjgvaxlpdbvp";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/ekmett/mtl";
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147887,7 +142419,6 @@ self: {
        version = "2.2.2";
        sha256 = "1xmy5741h8cyy0d91ahvqdz2hykkk20l8br7lg1rccnkis5g80w8";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/haskell/mtl";
        description = "Monad classes, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -147899,7 +142430,6 @@ self: {
        version = "0.1.1";
        sha256 = "12zays8x0b65dc11s95f5j6gwz2kksh9md5m9cpal1yj5qydmmrd";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/fumieval/mtl-c";
        description = "Very strict CPS'd transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -147914,7 +142444,6 @@ self: {
        editedCabalFile = "1mfrx8cpx0502sjv0bmlfkl0h46c4krldg8m89k4fj6iawwg2ab5";
        libraryHaskellDepends = [ base mtl ];
        doHaddock = false;
-       homepage = "https://github.com/haskell-compat/mtl-compat";
        description = "Backported Control.Monad.Except module from mtl";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -147954,7 +142483,6 @@ self: {
        version = "1.0.3";
        sha256 = "1qr0bwcg9rlj53gbnji969s86qh8laaiibkfy2msziqnp011108x";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -147967,7 +142495,6 @@ self: {
        version = "2.0.3.1";
        sha256 = "0cqjl0mcnj6qgx46qxjygndzlgch4mc0q0sm3wbd4fynjfhdv9n4";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/nikita-volkov/mtl-prelude";
        description = "Reexports of most definitions from \"mtl\" and \"transformers\"";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -147998,7 +142525,6 @@ self: {
        testHaskellDepends = [
          base contravariant hspec hspec-core lens mtl profunctors
        ];
-       homepage = "https://github.com/seereason/mtl-unleashed";
        description = "MTL classes without the functional dependency";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148010,7 +142536,6 @@ self: {
        version = "0.1.4.0";
        sha256 = "1fl5rvmgk37bqgjzs3c2wh80pfhr0i4yakxbsaryg7piws7j6ygc";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://homepage3.nifty.com/salamander/second/projects/mtlparse/";
        description = "parse library using mtl package";
        license = "LGPL";
      }) {};
@@ -148120,7 +142645,6 @@ self: {
          base bytestring cereal containers directory filepath hashable mtl
          psqueues time
        ];
-       homepage = "https://github.com/clnx/muesli";
        description = "A simple document-oriented database";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -148142,7 +142666,6 @@ self: {
          mtl process QuickCheck show simple-reflect unix
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/gwern/mueval";
        description = "Safely evaluate pure Haskell expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148185,7 +142708,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "1if1ip22y7w59lkyshn4ic4p46zrfs4kcdzzjai9l8xbscavgdl6";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/jsnajder/multex-east-msd";
        description = "MULTEXT-East morphosyntactic descriptors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148208,7 +142730,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/aka-bash0r/multi-cabal";
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148222,7 +142743,6 @@ self: {
        sha256 = "11r7wy143zy9drjrz7l57bdsbaj2fd3sjwbiz7pcmcdr1bxxga63";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/chris-martin/multi-instance#readme";
        description = "Typeclasses augmented with a phantom type parameter";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -148235,7 +142755,6 @@ self: {
        sha256 = "0i3vjvndja92zm86wp8sh6lljzk06ld9yrk35kb7kqzpy08abjpz";
        libraryHaskellDepends = [ base composition containers ];
        testHaskellDepends = [ base containers HTF ];
-       homepage = "https://github.com/vadimvinnik/multi-trie";
        description = "Trie of sets, as a model for compound names having multiple values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -148256,7 +142775,6 @@ self: {
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck text
        ];
-       homepage = "http://github.com/micxjo/hs-multiaddr";
        description = "A network address format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148276,7 +142794,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck tasty-th
        ];
-       homepage = "https://github.com/massysett/multiarg";
        description = "Command lines for options that take multiple arguments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148295,7 +142812,6 @@ self: {
          base directory HaXml optparse-applicative pretty process
          transformers
        ];
-       homepage = "xy30.com";
        description = "create many files from one";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148346,7 +142862,6 @@ self: {
          base base58-bytestring base64-bytestring byteable bytestring
          cryptohash hex io-streams optparse-applicative
        ];
-       homepage = "https://github.com/LukeHoersten/multihash";
        description = "Multihash library and CLI executable";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148359,7 +142874,6 @@ self: {
        version = "1.2.1";
        sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://hub.darcs.net/scravy/multimap";
        description = "A multimap";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -148371,7 +142885,6 @@ self: {
        version = "0.1.2";
        sha256 = "0g04jhyw1ib1s7c9bcldyyn4n90qd9x7dmvic4vgq57bgcqgnhz5";
        libraryHaskellDepends = [ base bytestring parsec ];
-       homepage = "http://www.github.com/silkapp/multipart";
        description = "HTTP multipart split out of the cgi package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148388,7 +142901,6 @@ self: {
        testHaskellDepends = [
          base HUnit lens test-framework test-framework-hunit
        ];
-       homepage = "http://github.com/nedervold/multipart-names";
        description = "Handling of multipart names in various casing styles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148405,7 +142917,6 @@ self: {
          base binary containers ghc-prim hashable keys math-functions
          newtype unordered-containers
        ];
-       homepage = "http://github.com/ekmett/multipass/";
        description = "Folding data with multiple named passes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148418,7 +142929,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0m4wmh5iib5g1qxzj23q330gznib7q80r405df10k9685aqafgn3";
        libraryHaskellDepends = [ base parsec utf8-string ];
-       homepage = "https://github.com/SupraSummus/haskell-multipath";
        description = "Parser and builder for unix-path-like objects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148434,7 +142944,6 @@ self: {
        editedCabalFile = "0cka6nwvbiddlv2j4f7jqq4cxz5mfw7vga5p020h0m9ws98gqbsx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://haskell.org/haskellwiki/Multiplate";
        description = "Lightweight generic library for mutually recursive data types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148465,7 +142974,6 @@ self: {
        executableHaskellDepends = [
          base containers fez-conf mtl process
        ];
-       homepage = "http://ui3.info/d/proj/multiplicity.html";
        description = "Wrapper program for duplicity, adding config files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148478,7 +142986,6 @@ self: {
        sha256 = "0n5rsjrg8b98aim1wsv1s2i17299h8g4k2gb7mgn1swzldrigjhz";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic programming for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148525,6 +143032,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multiset_0_3_4" = callPackage
+    ({ mkDerivation, base, containers, deepseq, doctest, Glob }:
+     mkDerivation {
+       pname = "multiset";
+       version = "0.3.4";
+       sha256 = "0kdmf0ba946pxq1m8q0x5bk2my2fd5frhaw3cj2i3x88nc9f0ycp";
+       libraryHaskellDepends = [ base containers deepseq ];
+       testHaskellDepends = [ base doctest Glob ];
+       description = "The Data.MultiSet container type";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "multiset-comb" = callPackage
     ({ mkDerivation, base, containers, transformers }:
      mkDerivation {
@@ -148544,7 +143064,6 @@ self: {
        sha256 = "1chgdikgp70rkzw2k3wy7i276j5vb435vq26yl37lkh0im1bg5ay";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 stm ];
-       homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html";
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148564,7 +143083,6 @@ self: {
          base monad-control mtl tagged transformers transformers-base
        ];
        testHaskellDepends = [ base hspec transformers ];
-       homepage = "https://github.com/lspitzner/multistate";
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148585,7 +143103,6 @@ self: {
          base monad-control mtl tagged transformers transformers-base
        ];
        testHaskellDepends = [ base hspec transformers ];
-       homepage = "https://github.com/lspitzner/multistate";
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148617,7 +143134,6 @@ self: {
          QuickCheck semigroupoids tasty tasty-hunit tasty-quickcheck text
          transformers
        ];
-       homepage = "https://bitbucket.org/gltronred/multivariant#readme";
        description = "Multivariant assignments generation language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148657,7 +143173,6 @@ self: {
          base blaze-html ConfigFile directory Glob happstack-server
          HStringTemplate markdown MissingH process text
        ];
-       homepage = "http://github.com/kaashif-hymabaccus/muon";
        description = "Static blog generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148675,7 +143190,6 @@ self: {
          AspectAG base containers HList ListLike template-haskell TTTAS
          uu-parsinglib uulib
        ];
-       homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148702,7 +143216,6 @@ self: {
          base directory optparse-declarative transformers twitter-conduit
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/tokiwoousaka/murmur#readme";
        description = "Simple CUI Twitter Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148715,7 +143228,6 @@ self: {
        version = "0.1.0.9";
        sha256 = "1bb58kfnzvx3mpc0rc0dhqc1fk36nm8prd6gvf20gk6lxaadpfc9";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/nominolo/murmur-hash";
        description = "MurmurHash2 implementation for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -148734,7 +143246,6 @@ self: {
          base base16-bytestring bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/plaprade/murmur3";
        description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -148746,7 +143257,6 @@ self: {
        version = "1.0";
        sha256 = "1hz6rf1qrzgixx19bn9hnp07jfb61wnrjq5bgqnd3px569afwdb2";
        libraryHaskellDepends = [ haskell2010 ];
-       homepage = "https://github.com/niswegmann/murmurhash3";
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148774,7 +143284,6 @@ self: {
          transformers unordered-containers vector vty
        ];
        testHaskellDepends = [ base classy-prelude ];
-       homepage = "https://github.com/elaye/mushu#README.md";
        description = "Minimalist MPD client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149036,7 +143545,6 @@ self: {
          smallcheck stm test-framework test-framework-hunit
          test-framework-smallcheck text time transformers xmlhtml
        ];
-       homepage = "http://github.com/metabrainz/mass-mail";
        description = "Send an email to all MusicBrainz editors";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149053,7 +143561,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory HaXml old-time pretty
        ];
-       homepage = "https://troglodita.di.uminho.pt/svn/musica/work/MusicXML";
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149101,7 +143608,6 @@ self: {
          aeson base base-unicode-symbols bytestring directory filepath hspec
          lens process tar temporary text unordered-containers wreq yaml zlib
        ];
-       homepage = "https://github.com/JustusAdam/mustache";
        description = "A mustache template parser library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -149126,7 +143632,6 @@ self: {
          pretty-show scientific text transformers unordered-containers
          vector
        ];
-       homepage = "https://github.com/danchoi/mustache-haskell";
        description = "Straight implementation of mustache templates";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149146,7 +143651,6 @@ self: {
          base blaze-builder bytestring filepath haskell-src parsec text
          transformers utf8-string
        ];
-       homepage = "http://github.com/singpolyma/mustache2hs";
        description = "Utility to generate Haskell code from Mustache templates";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149167,7 +143671,6 @@ self: {
          base containers hspec primitive QuickCheck vector
        ];
        benchmarkHaskellDepends = [ base containers gauge vector ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Abstactions and concrete implementations of mutable containers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -149183,7 +143686,6 @@ self: {
        libraryHaskellDepends = [
          base iteratee MonadCatchIO-transformers transformers vector
        ];
-       homepage = "http://jwlato.webfactional.com/haskell/mutable-iter";
        description = "iteratees based upon mutable buffers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149203,7 +143705,6 @@ self: {
          base directory filepath hslogger hslogger-template mtl network-dbus
          process
        ];
-       homepage = "http://github.com/Tener/mute-unmute";
        description = "Watches your screensaver and (un)mutes music when you (un)lock the screen";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149216,7 +143717,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0kdf7811kxwfj032d8g18za0nn9jlssh7dpvvr8kzjk01b77804r";
        libraryHaskellDepends = [ base safe-exceptions ];
-       homepage = "https://github.com/chris-martin/mvar-lock";
        description = "A trivial lock based on MVar";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -149276,27 +143776,25 @@ self: {
        version = "2.0.3";
        sha256 = "18gnr5bjmz2bl717dhvg6hwj6z06y5sw2nmsw7d3vl37qd9rp6by";
        libraryHaskellDepends = [ base mwc-random primitive transformers ];
-       homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "mwc-probability-transition" = callPackage
-    ({ mkDerivation, base, ghc-prim, hspec, logging-effect, mtl
-     , mwc-probability, primitive, QuickCheck, transformers
+    ({ mkDerivation, base, exceptions, ghc-prim, hspec, logging-effect
+     , mtl, mwc-probability, primitive, QuickCheck, transformers
      }:
      mkDerivation {
        pname = "mwc-probability-transition";
-       version = "0.3.0.3";
-       sha256 = "04jnszan9723ycrf1xgh2k87vcx0xyq5ga8q3fjskr3937j0ydxj";
+       version = "0.4";
+       sha256 = "0s770dhcj2ig1nj57fmwa1z5q7dbk2mx9rw4civkk9xjygrvci1y";
        libraryHaskellDepends = [
-         base ghc-prim logging-effect mtl mwc-probability primitive
-         transformers
+         base exceptions ghc-prim hspec logging-effect mtl mwc-probability
+         primitive QuickCheck transformers
        ];
        testHaskellDepends = [
          base hspec logging-effect mwc-probability QuickCheck
        ];
-       homepage = "https://github.com/ocramz/mwc-probability-transition";
        description = "A Markov stochastic transition operator with logging";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -149311,7 +143809,6 @@ self: {
          base math-functions primitive time vector
        ];
        doCheck = false;
-       homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -149360,7 +143857,6 @@ self: {
        librarySystemDepends = [ mxnet ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base tasty tasty-hunit vector ];
-       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
        description = "MXNet interface in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149379,7 +143875,6 @@ self: {
          template-haskell
        ];
        testHaskellDepends = [ base hspec mxnet streaming ];
-       homepage = "https://github.com/pierric/mxnet-dataiter#readme";
        description = "mxnet dataiters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149394,7 +143889,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mxnet ];
-       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
        description = "Examples for MXNet in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149421,7 +143915,6 @@ self: {
          mmorph mtl mxnet resourcet streaming streaming-bytestring
          streaming-utils unordered-containers vector
        ];
-       homepage = "http://github.com/pierric/mxnet-nn";
        description = "Train a neural network with MXNet in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149436,7 +143929,6 @@ self: {
        libraryHaskellDepends = [ base c2hs-extra ];
        librarySystemDepends = [ mxnet ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/sighingnow/mxnet-haskell#readme";
        description = "NNVM interface in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149512,7 +144004,6 @@ self: {
        testHaskellDepends = [
          ansi-terminal base Cabal Euterpea QuickCheck
        ];
-       homepage = "http://haskell.cs.yale.edu/";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149539,7 +144030,6 @@ self: {
          aeson base bytestring conduit conduit-extra directory http-client
          http-client-tls network-uri text yaml
        ];
-       homepage = "https://github.com/mat8913/myanimelist-export#readme";
        description = "Export from MyAnimeList";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149578,7 +144068,6 @@ self: {
          aeson base lens-family string-conv websockets
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "http://github.com/adinapoli/myo";
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149632,7 +144121,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        librarySystemDepends = [ mysql ];
        testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/paul-rouse/mysql";
        description = "A low-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) mysql;};
@@ -149650,7 +144138,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring extensible-effects mysql mysql-simple
        ];
-       homepage = "https://github.com/ibotty/mysql-effect";
        description = "An extensible mysql effect using extensible-effects and mysql-simple";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149677,7 +144164,6 @@ self: {
        testHaskellDepends = [
          base bytestring io-streams tasty tasty-hunit text time vector
        ];
-       homepage = "https://github.com/winterland1989/mysql-haskell";
        description = "pure haskell MySQL driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149694,7 +144180,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring io-streams mysql-haskell scientific text time
        ];
-       homepage = "https://github.com/lorenzo/mysql-haskell-nem#readme";
        description = "Adds a interface like mysql-simple to mysql-haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149712,7 +144197,6 @@ self: {
          base binary HsOpenSSL mysql-haskell tcp-streams tcp-streams-openssl
          wire-streams
        ];
-       homepage = "https://github.com/winterland1989/mysql-haskell";
        description = "TLS support for mysql-haskell package using openssl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149732,7 +144216,6 @@ self: {
          bytestring containers mysql old-locale pcre-light text time
        ];
        testHaskellDepends = [ base blaze-builder hspec text ];
-       homepage = "https://github.com/paul-rouse/mysql-simple";
        description = "A mid-level MySQL client library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -149764,7 +144247,6 @@ self: {
        libraryHaskellDepends = [
          base mysql mysql-simple template-haskell typedquery utf8-string
        ];
-       homepage = "https://github.com/tolysz/mysql-simple-typed";
        description = "Typed extension to mysql simple";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149784,7 +144266,6 @@ self: {
          attoparsec base data-default directory process text
        ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/wapxmas/mystem#readme";
        description = "Bindings for Mystem morphological analyzer executabe";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149821,7 +144302,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "044x87jzyqsg5npp3s0mncgcl0gv26h6hzhc7bbgjja95x16ma2l";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/ifigueroap/mzv";
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149835,7 +144315,6 @@ self: {
        sha256 = "1v1ki6mfgj7jhj7w94w15sisd57akwlb0c2s3bczvj47f7f8p7vi";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest doctest-discover ];
-       homepage = "https://github.com/gelisam/n-ary-functor";
        description = "An n-ary version of Functor";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149862,7 +144341,6 @@ self: {
        version = "0.0.2.0";
        sha256 = "0gq2s7cfivzspr446h21c79md6wzg2q8wzmx8kivbxiixsr3bxva";
        libraryHaskellDepends = [ base singletons vector ];
-       homepage = "https://github.com/athanclark/n-tuple#readme";
        description = "Homogeneous tuples of arbitrary length";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -149877,7 +144355,6 @@ self: {
        sha256 = "1dv0g25iz61ql9nz9s7krlpa1hjv3iqf4i1wsm1njf8cn5fbij8v";
        libraryHaskellDepends = [ base bifunctors exceptions mtl text ];
        testHaskellDepends = [ base hspec QuickCheck text ];
-       homepage = "https://github.com/olorin/haskell-nagios-check";
        description = "Package for writing monitoring plugins";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -149896,7 +144373,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec HUnit MissingH transformers
        ];
-       homepage = "https://github.com/anchor/nagios-perfdata";
        description = "Parse Nagios performance data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -149920,7 +144396,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec HUnit nagios-check text transformers
        ];
-       homepage = "https://github.com/fractalcat/nagios-plugin-ekg";
        description = "Monitor ekg metrics via Nagios";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149960,7 +144435,6 @@ self: {
          transformers transformers-base unliftio unliftio-core
          unordered-containers uuid vector wai warp
        ];
-       homepage = "http://nakadi-client.haskell.silverratio.net";
        description = "Client library for the Nakadi Event Broker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150014,7 +144488,6 @@ self: {
        version = "0.1";
        sha256 = "1db12f2q395yk6pwz5gnb2q0kf4s868z8d1vvwa7vngnfc1h924i";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://github.com/nominolo/named-lock";
        description = "A named lock that is created on demand";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150045,7 +144518,6 @@ self: {
        testHaskellDepends = [
          base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/philopon/namelist-hs";
        description = "fortran90 namelist parser/pretty printer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150069,11 +144541,22 @@ self: {
        version = "0.2.0.3";
        sha256 = "1ijy7wkmw8y5lv7f1p975jlp17r3yfv5v05csiqrs1zykcpjpghf";
        libraryHaskellDepends = [ base containers template-haskell ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "names-th_0_2_0_4" = callPackage
+    ({ mkDerivation, base, containers, template-haskell }:
+     mkDerivation {
+       pname = "names-th";
+       version = "0.2.0.4";
+       sha256 = "03nj3qdqkdl4wgb9s4p1dmrcx19ffc03br0a3n8z85bih0p4vgsq";
+       libraryHaskellDepends = [ base containers template-haskell ];
+       description = "Manipulate name strings for TH";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "namespace" = callPackage
     ({ mkDerivation, base, containers, monoid-extras }:
      mkDerivation {
@@ -150082,7 +144565,6 @@ self: {
        sha256 = "01iar2sj5819bzc9swn051qmiz190qa34rmh00gcnwpbhs1wxfdz";
        libraryHaskellDepends = [ base containers monoid-extras ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/xu-hao/namespace";
        description = "A Generic Haskell library for managing namespaces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150094,7 +144576,6 @@ self: {
        version = "0.1.1.3";
        sha256 = "1pqwzl8l48c4q83jhjj11jd3kwwa0ail2c6kv3k38kig9yvj7ff8";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/chowells79/nano-cryptr";
        description = "A threadsafe binding to glibc's crypt_r function";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150119,7 +144600,6 @@ self: {
        sha256 = "0rrwa1c3mval1jm4siqyx1vk14ibifya62hni13cimcdafj35fnq";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
-       homepage = "http://www.jasani.org/search/label/nano-hmac";
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150135,7 +144615,6 @@ self: {
        editedCabalFile = "093sf0fk6mmy8whjdxr4bh9mnw2vl73srdxjmvxg3pqji6mrpfca";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
-       homepage = "http://code.haskell.org/~dons/code/nano-md5";
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150167,7 +144646,6 @@ self: {
        sha256 = "04kgf3vvjdx6d1fmfzp0xy5x42zlg0ij59ayi1zhz8hkwsfn5g1m";
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ ncurses ];
-       homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150204,7 +144682,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion zeromq4-haskell
        ];
-       homepage = "https://github.com/ivarnymoen/nanomsg-haskell";
        description = "Bindings to the nanomsg library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150230,7 +144707,6 @@ self: {
        sha256 = "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec silently ];
-       homepage = "https://github.com/hspec/nanospec#readme";
        description = "A lightweight implementation of a subset of Hspec's API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -150250,7 +144726,6 @@ self: {
        libraryPkgconfigDepends = [ glew ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
-       homepage = "https://github.com/cocreature/nanovg-hs";
        description = "Haskell bindings for nanovg";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150272,7 +144747,6 @@ self: {
          aeson aeson-pretty base bytestring containers extensible-effects
          kanji microlens microlens-aeson optparse-applicative text
        ];
-       homepage = "https://github.com/fosskers/nanq";
        description = "Performs 漢字検定 (Japan Kanji Aptitude Test) level analysis on given Kanji";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150289,7 +144763,6 @@ self: {
        libraryHaskellDepends = [
          adjunctions base comonad distributive free streams transformers
        ];
-       homepage = "https://github.com/aaronvargo/naperian#readme";
        description = "Efficient representable functors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150304,7 +144777,6 @@ self: {
        sha256 = "154wydlz7y6mic4d1670dwn9g1c7z92v6bydll0shn6z05324ha9";
        libraryHaskellDepends = [ base bytestring groups vector ];
        testHaskellDepends = [ base groups hspec HUnit QuickCheck ];
-       homepage = "http://github.com/naqsha/naqsha.git";
        description = "A library for working with geospatial data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150316,7 +144788,6 @@ self: {
        version = "0.1.3";
        sha256 = "1ng1rzj1lf6h9g3pk8gsz05bnck72rp5j62iwn82vlcw8pyk0fsc";
        libraryHaskellDepends = [ base HDBC HUnit mtl QuickCheck random ];
-       homepage = "http://ezrakilty.net/projects/narc";
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150341,7 +144812,6 @@ self: {
        sha256 = "1hkgg8hfsbvq46ndlwpz5apkc4yyarq2yvbghfkx8qgsyacfgrml";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [ base doctest hedgehog QuickCheck ];
-       homepage = "https://github.com/oisdk/nat-sized-numbers#readme";
        description = "Variable-sized numbers from type-level nats";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150359,7 +144829,6 @@ self: {
          base bytestring clock containers http-client http-client-tls
          http-types multiset tls transformers xml
        ];
-       homepage = "https://github.com/lfairy/nationstates";
        description = "NationStates API client";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -150392,7 +144861,6 @@ self: {
        version = "1.1.2";
        sha256 = "1v40drmhixck3pz3mdfghamh73l4rp71mzcviipv1y8jhrfxilmr";
        doHaddock = false;
-       homepage = "http://github.com/ekmett/nats/";
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150419,7 +144887,6 @@ self: {
          aeson base bytestring hedgehog mtl test-framework
        ];
        benchmarkHaskellDepends = [ base criterion time ];
-       homepage = "https://bitbucket.org/jpgneves/nats-client#readme";
        description = "Another Haskell client for NATS (https://nats.io)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150479,7 +144946,6 @@ self: {
        version = "0.1.2.0";
        sha256 = "0cj9lnnlvry425bkixqv9fh5b9xhy7dmwcqsxprj6lamccvxspwn";
        libraryHaskellDepends = [ base ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/natural-numbers";
        description = "Natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150491,7 +144957,6 @@ self: {
        version = "0.1.2";
        sha256 = "0l3bkbqzrlpdhzazqqlx71ah0m13ypa0981qvw3sn9q8d0sbfwkv";
        libraryHaskellDepends = [ base bytestring parsec text ];
-       homepage = "https://john-millikin.com/software/natural-sort/";
        description = "User-friendly text collation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150510,7 +144975,6 @@ self: {
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/ku-fpg/natural-transformation";
        description = "A natural transformation package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150522,7 +144986,6 @@ self: {
        version = "0.0.3";
        sha256 = "1l594lkd3yb52lhh0raygvk3jlzwkcc2pmcqjmg02dmd6j6mw42x";
        libraryHaskellDepends = [ base text utf8-string ];
-       homepage = "not yet available";
        description = "Natural-order string comparison";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150534,7 +144997,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "1ay291833dcah411zc3r4qjilaw8x13ljlnb5z40d1s7784djm16";
        libraryHaskellDepends = [ base ];
-       homepage = "frigidcode.com";
        description = "Constructors and related functions for natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150550,7 +145012,6 @@ self: {
        libraryHaskellDepends = [
          aeson base iso639 lens lens-aeson network-uri random text wreq
        ];
-       homepage = "https://github.com/dahlia/naver-translate";
        description = "Interface to Naver Translate";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150571,7 +145032,6 @@ self: {
          array base bytestring cereal HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text zlib
        ];
-       homepage = "https://github.com/acfoltzer/nbt";
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150590,7 +145050,6 @@ self: {
          array attoparsec base bytestring containers gtk hflags lens pipes
          stm unix
        ];
-       homepage = "https://github.com/nilcons/nc-indicators";
        description = "CPU load and memory usage indicators for i3bar";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -150608,7 +145067,6 @@ self: {
        libraryHaskellDepends = [ base containers text transformers ];
        librarySystemDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://john-millikin.com/software/haskell-ncurses/";
        description = "Modernised bindings to GNU ncurses";
        license = stdenv.lib.licenses.gpl3;
      }) {inherit (pkgs) ncurses;};
@@ -150622,7 +145080,6 @@ self: {
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit
        ];
-       homepage = "https://github.com/srijs/haskell-ndjson-conduit";
        description = "Conduit-based parsing and serialization for newline delimited JSON";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -150637,7 +145094,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base filepath parsec ];
        executableHaskellDepends = [ base filepath parsec ];
-       homepage = "https://github.com/ajg/neat";
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150655,7 +145111,6 @@ self: {
          base base-prelude parsec template-haskell text
        ];
        testHaskellDepends = [ base-prelude HTF ];
-       homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -150672,7 +145127,6 @@ self: {
          base containers haskell-src-meta mtl parsec parsec-extra
          template-haskell text vector
        ];
-       homepage = "http://scrambledeggsontoast.github.io/2014/09/28/needle-announce/";
        description = "ASCII-fied arrow notation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150690,7 +145144,6 @@ self: {
          base cereal containers graphviz MonadRandom multimap parallel
          random transformers
        ];
-       homepage = "https://github.com/raymoo/NEET";
        description = "A NEAT library for Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150730,7 +145183,6 @@ self: {
          base cmdargs containers directory extra filepath GoogleChart json
          old-time process time
        ];
-       homepage = "http://community.haskell.org/~ndm/";
        description = "General tools for Neil";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150742,7 +145194,6 @@ self: {
        version = "0.3.1.1";
        sha256 = "192l840yb1pprfjjq7ax5xaraagl1pbmsidkg1yibp6r4azd61yf";
        libraryHaskellDepends = [ base failure transformers ];
-       homepage = "http://github.com/snoyberg/neither";
        description = "Provide versions of Either with good monad and applicative instances. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150764,7 +145215,6 @@ self: {
          base binary bytestring containers directory optparse-applicative
          process random tagged tasty tasty-hunit tasty-smallcheck temporary
        ];
-       homepage = "http://github.com/ppenzin/neko-lib-hs/";
        description = "Neko VM code generation and disassembly library";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150787,7 +145237,6 @@ self: {
          optparse-generic pipes pipes-attoparsec pipes-network pipes-safe
          random text transformers
        ];
-       homepage = "http://github.com/nfjinjing/neko-obfs";
        description = "a TCP tunnel with packet length obfuscation";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -150803,7 +145252,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory dlist Glob lens mtl process time
        ];
-       homepage = "http://github.com/nfjinjing/nemesis";
        description = "a task management tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150821,7 +145269,6 @@ self: {
          air air-th base bytestring directory filepath hspec HStringTemplate
          nemesis random uuid
        ];
-       homepage = "http://github.com/nfjinjing/nemesis-titan";
        description = "A collection of Nemesis tasks to bootstrap a Haskell project with a focus on continuous integration";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150845,7 +145292,6 @@ self: {
          text text-binary tokenize vector
        ];
        executableHaskellDepends = [ directory filepath temporary ];
-       homepage = "https://github.com/kawu/nerf";
        description = "Nerf, the named entity recognition tool based on linear-chain CRFs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150865,7 +145311,6 @@ self: {
        testHaskellDepends = [
          base bytestring doctest Glob lens tasty tasty-hunit text
        ];
-       homepage = "https://github.com/plutonbrb/nero";
        description = "Lens-based HTTP toolkit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150882,7 +145327,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-types lens nero text wai wai-extra
        ];
-       homepage = "https://github.com/plutonbrb/nero-wai";
        description = "WAI adapter for Nero server applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150895,7 +145339,6 @@ self: {
        version = "0.3";
        sha256 = "1ddr0hs9x7r74f5bb00fbi0z87cfkxp21m5ikp5qgyblqb09940s";
        libraryHaskellDepends = [ base nero nero-wai warp ];
-       homepage = "https://github.com/plutonbrb/nero-warp";
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150942,7 +145385,6 @@ self: {
          unordered-containers wai wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
-       homepage = "https://github.com/athanclark/nested-routes#readme";
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150960,7 +145402,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "List-like data structures with O(log(n)) random access";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151005,7 +145446,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers ghc-binary hslogger monad-loops network
        ];
-       homepage = "http://phaul.hobby-site.org/node/4123";
        description = "Concurrent over the network execution library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151019,7 +145459,6 @@ self: {
        version = "0.6";
        sha256 = "0vskyczfhv9bszl2hnr6j9cvhkfampja5s41kh6i9wk8j9kpf9p8";
        libraryHaskellDepends = [ base bytestring hosc network ];
-       homepage = "http://netclock.slab.org/";
        description = "Netclock protocol";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151052,7 +145491,6 @@ self: {
          containers fgl HList hslogger mtl multiset network parsec process
          random syb
        ];
-       homepage = "http://frenetic-lang.org";
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151082,7 +145520,6 @@ self: {
          base brick containers data-default-class directory mtl process
          random stm transformers vty
        ];
-       homepage = "http://github.com/foreverbell/netease-fm#readme";
        description = "NetEase Cloud Music FM client in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151095,7 +145532,6 @@ self: {
        version = "0.0.1.1";
        sha256 = "1vxyffhpayyxwak36b9i7gw35gz61ym9lxnhk45l0h4js3v05iwv";
        libraryHaskellDepends = [ base carray netlib-ffi transformers ];
-       homepage = "http://hub.darcs.net/thielema/netlib-carray/";
        description = "Helper modules for CArray wrappers to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151107,7 +145543,6 @@ self: {
        version = "0.0.1";
        sha256 = "1v973ibi6jsv09q3n9bmyavv9wqvnljzr9nrvf4pbi6p5l2kyjnw";
        libraryHaskellDepends = [ base storable-complex transformers ];
-       homepage = "http://hub.darcs.net/thielema/netlib-ffi/";
        description = "Helper modules for FFI to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151119,7 +145554,6 @@ self: {
        version = "0.1";
        sha256 = "0ckwa5r8fx2j7qb5phy6gm3xbg9crr9amglcicdxgnzgjd8aap2h";
        libraryHaskellDepends = [ base storable-complex transformers ];
-       homepage = "http://hub.darcs.net/thielema/netlib-ffi/";
        description = "Helper modules for FFI to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151158,7 +145592,6 @@ self: {
          base bytestring cereal containers monad-loops pretty-hex unix
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/Ongy/netlink-hs";
        description = "Netlink communication for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151202,7 +145635,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec HUnit vector ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/nh2/haskell-netpbm";
        description = "Loading PBM, PGM, PPM image files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -151221,7 +145653,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-quickcheck
        ];
-       homepage = "https://github.com/hvr/netrc";
        description = "Parser for .netrc files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151259,7 +145690,6 @@ self: {
          aeson base binary bytestring mtl network template-haskell text
          transformers
        ];
-       homepage = "http://github.com/DanBurton/netspec";
        description = "Simplify static Networking tasks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151274,7 +145704,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring enumerator transformers
        ];
-       homepage = "https://john-millikin.com/software/netstring-enumerator/";
        description = "Enumerator-based netstring parsing";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151299,7 +145728,6 @@ self: {
          QuickCheck tagged test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151367,7 +145795,6 @@ self: {
          base containers deepseq parallel profunctors random semigroups time
          transformers
        ];
-       homepage = "https://github.com/esoeylemez/netwire";
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151379,7 +145806,6 @@ self: {
        version = "0.0.7";
        sha256 = "1f9xxlcpy2brqn5hv0mdc428fav402jsqa1b8h4s8b09qa3v1ii9";
        libraryHaskellDepends = [ base deepseq netwire ];
-       homepage = "https://www.github.com/Mokosha/netwire-input";
        description = "Input handling abstractions for netwire";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -151397,7 +145823,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq GLFW-b mtl netwire-input stm
        ];
-       homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -151413,7 +145838,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghcjs-base netwire netwire-input transformers
        ];
-       homepage = "https://github.com/ziocroc/netwire-input-javascript";
        description = "JavaScript instance of netwire-input";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151454,7 +145878,6 @@ self: {
        testHaskellDepends = [
          base bytestring doctest HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/haskell/network";
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151468,7 +145891,6 @@ self: {
        sha256 = "0h84pv672psxhh5ls407w175cik0gbyx39zynzmw991hr7jgc64s";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring doctest hspec HUnit ];
-       homepage = "https://github.com/haskell/network";
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151485,7 +145907,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory doctest hspec HUnit
        ];
-       homepage = "https://github.com/haskell/network";
        description = "Low-level networking interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151505,7 +145926,6 @@ self: {
        testHaskellDepends = [
          base Cabal QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://github.com/sebnow/haskell-network-address";
        description = "IP data structures and textual representation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151529,7 +145949,6 @@ self: {
          attoparsec base bytestring exceptions hspec hspec-attoparsec
          hspec-expectations mtl network network-simple transformers uuid
        ];
-       homepage = "http://github.com/solatis/haskell-network-anonymous-i2p";
        description = "Haskell API for I2P anonymous networking";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151560,7 +145979,6 @@ self: {
          hspec-attoparsec hspec-expectations network network-simple socks
          text transformers
        ];
-       homepage = "http://www.leonmergen.com/opensource.html";
        description = "Haskell API for Tor anonymous networking";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -151578,7 +145996,6 @@ self: {
          aeson attoparsec base bytestring case-insensitive http-client
          http-client-tls http-types text time tls
        ];
-       homepage = "https://github.com/markhibberd/network-api-support";
        description = "Toolkit for building http client libraries over Network.Http.Conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151601,7 +146018,6 @@ self: {
          network-uri QuickCheck test-invariant
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/alunduil/network-arbitrary";
        description = "Arbitrary Instances for Network Types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151626,7 +146042,6 @@ self: {
          network-simple transformers
        ];
        doCheck = false;
-       homepage = "http://github.com/solatis/haskell-network-attoparsec";
        description = "Utility functions for running a parser against a socket";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -151650,7 +146065,6 @@ self: {
          aeson attoparsec base bytestring cookie HTTP http-client http-types
          network QuickCheck text time unordered-containers vector
        ];
-       homepage = "http://github.com/mndrix/network-bitcoin";
        description = "An interface to bitcoind";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151685,7 +146099,6 @@ self: {
        version = "0.1.3.4";
        sha256 = "19m10mj9nqsa7s0syv9dyhqkhvmf2h7yna8n7bq0xkdp8m9l0g96";
        libraryHaskellDepends = [ base bytestring network unix ];
-       homepage = "http://github.com/tibbe/network-bytestring";
        description = "Fast, memory-efficient, low-level networking";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151700,7 +146113,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring network text time vector
        ];
-       homepage = "http://github.com/ocharles/network-carbon";
        description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151713,7 +146125,6 @@ self: {
        sha256 = "06amxl8rg4zfnmgc1iyq5mxy9qihcqddqgqkbfvaf25mwr43992p";
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Stream socket data using conduits. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151734,7 +146145,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit conduit-extra connection HUnit mtl
        ];
-       homepage = "https://github.com/snoyberg/conduit";
        description = "Create TLS-aware network code with conduits";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -151750,7 +146160,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers network network-bytestring stm
        ];
-       homepage = "http://darcs.imperialviolet.org/network-connection";
        description = "A wrapper around a generic stream-like connection";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151802,7 +146211,6 @@ self: {
        executableHaskellDepends = [
          base data-serializer data-textual network-ip posix-socket
        ];
-       homepage = "https://github.com/mvv/network-dns";
        description = "Domain Name System data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151818,7 +146226,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring enumerator network transformers
        ];
-       homepage = "https://john-millikin.com/software/network-enumerator/";
        description = "Enumerators for network sockets";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -151830,7 +146237,6 @@ self: {
        version = "0.2.4";
        sha256 = "0myzfvmv6xny7nmq2p5dhyrz8yl7n48p4brkarkacs07k1zyldj9";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/taruti/network-fancy";
        description = "Networking support with a cleaner API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151854,7 +146260,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0hxbzzdjrxnx9pknsbma7iyfr3pxrsff5n9mhbkpaqaizhibq7q7";
        libraryHaskellDepends = [ array base containers mtl ];
-       homepage = "https://github.com/nh2/network-house";
        description = "data and parsers for Ethernet, TCP, UDP, IPv4, IPv6, ICMP, DHCP, TFTP";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -151866,7 +146271,6 @@ self: {
        version = "0.2.0.10";
        sha256 = "0anmgzcpnz7nw3n6vq0r25m1s9l2svpwi83wza0lzkrlbnbzd02n";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/jystic/network-info";
        description = "Access the local computer's basic network configuration";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151900,7 +146304,6 @@ self: {
          base data-dword data-textual parsers tasty tasty-quickcheck
          text-printer
        ];
-       homepage = "https://github.com/mvv/network-ip";
        description = "Internet Protocol data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -151916,7 +146319,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring data-default network random time
        ];
-       homepage = "http://github.com/brendanhay/network-metrics";
        description = "Send metrics to Ganglia, Graphite, and statsd";
        license = "unknown";
      }) {};
@@ -151936,7 +146338,6 @@ self: {
          mtl network network-bytestring network-connection network-dns
          old-locale stm tagsoup time unix
        ];
-       homepage = "http://darcs.imperialviolet.org/network-minihttp";
        description = "A ByteString based library for writing HTTP(S) servers and clients";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -151973,7 +146374,6 @@ self: {
          tagged text
        ];
        testHaskellDepends = [ async base bytestring hspec mtl network ];
-       homepage = "http://msgpack.org/";
        description = "A MessagePack-RPC Implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152034,7 +146434,6 @@ self: {
          base bytestring gnuidn gnutls gsasl libxml-sax monads-tf network
          text transformers xml-types
        ];
-       homepage = "https://john-millikin.com/software/haskell-xmpp/";
        description = "Client library for the XMPP protocol";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -152083,7 +146482,6 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring bytestring network
        ];
-       homepage = "https://github.com/angerman/network-service";
        description = "Provide a service at the data type level";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152100,7 +146498,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring exceptions network transformers
        ];
-       homepage = "https://github.com/k0001/network-simple";
        description = "Simple network sockets usage patterns";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152116,7 +146513,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory exceptions network transformers
        ];
-       homepage = "https://github.com/jdnavarro/network-simple-sockaddr";
        description = "network-simple for resolved addresses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152135,7 +146531,6 @@ self: {
          base bytestring data-default exceptions network network-simple tls
          transformers x509 x509-store x509-system x509-validation
        ];
-       homepage = "https://github.com/k0001/network-simple-tls";
        description = "Simple interface to TLS secured network sockets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152148,7 +146543,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "00qf22nwzsv8229gb7yqaaafiz573xl4v78mn1zf9ajvwzvwb63r";
        libraryHaskellDepends = [ base network ];
-       homepage = "https://github.com/joeyadams/haskell-network-socket-options";
        description = "Type-safe, portable alternative to getSocketOption/setSocketOption";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152187,7 +146581,6 @@ self: {
          directory filepath logfloat mwc-random optparse-applicative
          random-fu statistics stm text transformers vector
        ];
-       homepage = "https://github.com/bgamari/bayes-stack";
        description = "A few network topic model implementations for bayes-stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152204,7 +146597,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
-       homepage = "http://haskell-distributed.github.com";
        description = "Network abstraction layer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152242,7 +146634,6 @@ self: {
        version = "0.2.1";
        sha256 = "0i2rwl1hwbp87kvnhfc6h0v2zy1hbfgrz0wx1vicd9m76nzbynx3";
        libraryHaskellDepends = [ base bytestring network-transport ];
-       homepage = "http://haskell-distributed.github.com";
        description = "Compose network transports";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152263,7 +146654,6 @@ self: {
        testHaskellDepends = [
          base network-transport network-transport-tests
        ];
-       homepage = "http://haskell-distributed.github.com";
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152282,7 +146672,6 @@ self: {
        testHaskellDepends = [
          base bytestring network network-transport network-transport-tests
        ];
-       homepage = "http://haskell-distributed.github.com";
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152299,7 +146688,6 @@ self: {
          ansi-terminal base bytestring containers mtl network-transport
          random
        ];
-       homepage = "http://haskell-distributed.github.com";
        description = "Unit tests for Network.Transport implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152328,7 +146716,6 @@ self: {
        benchmarkHaskellDepends = [
          base binary bytestring criterion distributed-process
        ];
-       homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152348,7 +146735,6 @@ self: {
          base HUnit test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/haskell/network-uri";
        description = "URI manipulation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152381,7 +146767,6 @@ self: {
          test-invariant text
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/alunduil/network-uri-json";
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152395,7 +146780,6 @@ self: {
        sha256 = "16b8jn72g76zd2gxzimnnj77l42y430y862sxzdnsclsnc7w4fn9";
        libraryHaskellDepends = [ base network-uri template-haskell ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/snakamura/network-uri-static";
        description = "A small utility to declare type-safe static URIs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152413,7 +146797,6 @@ self: {
          base bytestring exceptions http-client-tls http-conduit http-types
          resourcet transformers utf8-string
        ];
-       homepage = "https://github.com/zaneli/network-voicetext";
        description = "VoiceText Web API wrapper";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152440,7 +146823,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base haskell98 network webserver ];
-       homepage = "http://github.com/michaelmelanson/network-websocket";
        description = "WebSocket library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152491,7 +146873,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob hspec MonadRandom ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/brunjlar/neural";
        description = "Neural Networks in native Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152504,7 +146885,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1pmgy3qmijkw3g542pg9wxzqncql3h2mh7slibgz8x0w9sfydmbd";
        libraryHaskellDepends = [ base constraints ];
-       homepage = "https://github.com/pierric/neural-network";
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152524,7 +146904,6 @@ self: {
        testHaskellDepends = [
          base blas-hs hmatrix hspec neural-network-base QuickCheck vector
        ];
-       homepage = "https://github.com/pierric/neural-network";
        description = "Yet Another High Performance and Extendable Neural Network in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152557,7 +146936,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory old-time ];
-       homepage = "http://www.b7j0c.org/content/haskell-newports.html";
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152577,7 +146955,6 @@ self: {
          base containers fixedprec random superdoc
        ];
        executableHaskellDepends = [ base random superdoc time ];
-       homepage = "http://www.mathstat.dal.ca/~selinger/newsynth/";
        description = "Exact and approximate synthesis of quantum circuits";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152627,7 +147004,6 @@ self: {
          base base-prelude monad-control template-haskell transformers
          transformers-base
        ];
-       homepage = "https://github.com/nikita-volkov/newtype-deriving";
        description = "Instance derivers for newtype wrappers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152645,7 +147021,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion semigroups ];
-       homepage = "http://github.com/sjakobi/bsb-http-chunked";
        description = "A typeclass and set of functions for working with newtypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152662,7 +147037,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-meta newtype syb template-haskell
        ];
-       homepage = "http://github.com/mgsloan/newtype-th";
        description = "A template haskell deriver to create Control.Newtype instances.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152675,7 +147049,6 @@ self: {
        version = "0.1";
        sha256 = "1s1mzy1m3wpawv1ci85dl02105v550l1fdi5rxi5gqnxb0jrg4fs";
        libraryHaskellDepends = [ base Kleislify newtype ];
-       homepage = "https://github.com/techtangents/Newtyper";
        description = "Extra functions for the Control.Newtype typeclass";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152711,7 +147084,6 @@ self: {
        version = "1.0.1.0";
        sha256 = "1yrw6skp2n8fd874481bfalli8lcglakhdggdsj8dm036wpm935a";
        libraryHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/ezyang/nf";
        description = "NF data type to statically enforce normal form";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152727,7 +147099,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ nfc ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/centromere/nfc#readme";
        description = "libnfc bindings";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152747,7 +147118,6 @@ self: {
          attoparsec base machines mtl resourcet sqlite-simple text
        ];
        executableHaskellDepends = [ base parseargs ];
-       homepage = "http://github.com/YoEight/ngrams-loader";
        description = "Ngrams loader based on http://www.ngrams.info format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152765,7 +147135,6 @@ self: {
          async base binary bytestring deepseq monad-loops template-haskell
          unix
        ];
-       homepage = "http://github.com/lyokha/nginx-haskell-module";
        description = "Helper module for Nginx haskell module";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152782,7 +147151,6 @@ self: {
          base ghc-prim mtl primitive text transformers
        ];
        testHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/fhsjaagshs/niagra";
        description = "High performance CSS EDSL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152828,7 +147196,6 @@ self: {
          base blaze-html blaze-markup bytestring criterion lucid pretty-show
          shakespeare text transformers type-of-html weigh
        ];
-       homepage = "https://github.com/mikeplus64/nice-html#readme";
        description = "A fast and nice HTML templating library with distinct compilation/rendering phases";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -152875,7 +147242,6 @@ self: {
          text-format unordered-containers wai warp wreq xml-conduit
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/dahlia/nicovideo-translator";
        description = "Nico Nico Douga (ニコニコ動画) Comment Translator";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152897,7 +147263,6 @@ self: {
          HStringTemplate HTTP hxt json network old-locale old-time
          regex-compat regex-posix syb time
        ];
-       homepage = "http://www.codemanic.com/uwe";
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152910,7 +147275,6 @@ self: {
        version = "0.1.3";
        sha256 = "0350fmddnfp09051i89fl5ibrxqy36cx5560l00cjssx2gs2dh8w";
        libraryHaskellDepends = [ arithmoi base ];
-       homepage = "http://andersk.mit.edu/haskell/nimber/";
        description = "Finite nimber arithmetic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152950,7 +147314,6 @@ self: {
          semigroups semver string-qq temporary text turtle
          unordered-containers
        ];
-       homepage = "http://nirum.org/";
        description = "IDL compiler and RPC/distributed object framework for microservices";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152965,7 +147328,6 @@ self: {
        revision = "1";
        editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q";
        libraryHaskellDepends = [ base bytestring http-conduit xml ];
-       homepage = "https://github.com/bstamour/haskell-nist-beacon";
        description = "Haskell interface to the nist random beacon";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152977,7 +147339,6 @@ self: {
        version = "0.2.2.5";
        sha256 = "17aqzk1kq670fwawia0qjmd8ld1b0h8zh0w8j8x4y48hlzyb75xb";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://haskell.gonitro.io";
        description = "Haskell bindings for Nitro";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153017,7 +147378,6 @@ self: {
          base neat-interpolation optparse-applicative optparse-generic text
          turtle
        ];
-       homepage = "https://github.com/awakesecurity/nix-deploy#readme";
        description = "Deploy Nix-built software to a NixOS machine";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153060,7 +147420,6 @@ self: {
          attoparsec base containers Diff mtl nix-derivation optparse-generic
          system-filepath text unix vector
        ];
-       homepage = "https://github.com/Gabriel439/nix-diff";
        description = "Explain why two Nix derivations differ";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153077,7 +147436,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hindent process strict ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       homepage = "http://chriswarbo.net/git/nix-eval";
        description = "Evaluate Haskell expressions using Nix to get packages";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153091,7 +147449,6 @@ self: {
        sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb";
        libraryHaskellDepends = [ base process ];
        libraryToolDepends = [ nix ];
-       homepage = "https://github.com/peti/nix-paths";
        description = "Knowledge of Nix's installation directories";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -153131,7 +147488,6 @@ self: {
        version = "1.5";
        sha256 = "1q38cs0747fyf94y35cq734yzmsdcyfmmk5w6qv563jns55qj36c";
        doHaddock = false;
-       homepage = "http://hackage.haskell.org/package/cabal2nix";
        description = "this package is obsolete; see cabal2nix instead";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153150,7 +147506,6 @@ self: {
          base bytestring containers data-named filepath polysoup tar text
          zlib
        ];
-       homepage = "https://github.com/kawu/nkjp";
        description = "Manipulating the National Corpus of Polish (NKJP)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153165,7 +147520,6 @@ self: {
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ nlopt ];
        testHaskellDepends = [ base vector ];
-       homepage = "https://github.com/peddie/nlopt-haskell";
        description = "Low-level bindings to the NLOPT optimization library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153178,7 +147532,6 @@ self: {
        version = "0.7.0";
        sha256 = "0cxa6f4y3416hlal4wnqf0qpq82zj9x58nprnaw3s2kdxxav0d9m";
        libraryHaskellDepends = [ base containers strict ];
-       homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Scoring functions commonly used for evaluation in NLP and IR";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153194,7 +147547,6 @@ self: {
        executableHaskellDepends = [
          base containers nlp-scores split text
        ];
-       homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "NLP scoring command-line programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153225,7 +147577,6 @@ self: {
        version = "0.2";
        sha256 = "14qzc4af1pm1myjdfs7z4b1jxxj0gz9c4cl9qgpm06hjzvjjf8wm";
        libraryHaskellDepends = [ base bytestring utf8-string ];
-       homepage = "https://github.com/singpolyma/NME-Haskell";
        description = "Bindings to the Nyctergatis Markup Engine";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153239,7 +147590,6 @@ self: {
        sha256 = "0fgh0x2b468j3pxx5nqkvq1wavgap9q7hdnypmdqn5v5jp45l36z";
        libraryHaskellDepends = [ base containers megaparsec ];
        testHaskellDepends = [ base Nmis ];
-       homepage = "https://github.com/v0d1ch/nmis-parser#readme";
        description = "NMIS file parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153256,7 +147606,6 @@ self: {
        sha256 = "1jl267495x7rc34x35dzrwb05z57w1w97vzgj774ld6z2w1yri7l";
        libraryHaskellDepends = [ base random split ];
        testHaskellDepends = [ base tasty tasty-hspec tasty-quickcheck ];
-       homepage = "https://github.com/saschagrunert/nn#readme";
        description = "A tiny neural network";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -153284,7 +147633,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "19yswbnwwfp7n33irdk12vggczhxp198cjd68jdbaz1wcd00ryld";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/arotenberg/no-buffering-workaround#readme";
        description = "Workaround for GHC bug #2189";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -153297,7 +147645,6 @@ self: {
        sha256 = "1kk9ii5w40di3azlqzbz4vkvwdz8apca0lh4jn94nvr3hns6l5s7";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/goldfirere/no-role-annots";
        description = "Role annotations without -XRoleAnnotations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153321,7 +147668,6 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hedgehog ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/mrkgnao/noether#readme";
        description = "Math in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153336,7 +147682,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
-       homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib";
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153350,7 +147695,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers regex-compat ];
-       homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib";
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153375,7 +147719,6 @@ self: {
        testHaskellDepends = [
          base HTF HUnit parsec QuickCheck string-qq
        ];
-       homepage = "http://github.com/brow/noise";
        description = "A friendly language for graphic design";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153398,7 +147741,6 @@ self: {
          servant servant-client servant-server servant-swagger split stm
          swagger2 text transformers wai wai-cors wai-extra warp yaml
        ];
-       homepage = "http://www.nomyx.net";
        description = "REST API for Nomyx";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153428,7 +147770,6 @@ self: {
          yaml
        ];
        testHaskellDepends = [ base Cabal ];
-       homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153449,7 +147790,6 @@ self: {
          monad-loops mtl old-locale random safe shortcut text time
          time-recurrence
        ];
-       homepage = "http://www.nomyx.net";
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153468,7 +147808,6 @@ self: {
          base containers ghc lens mtl nomyx-language old-locale safe
          shortcut time time-recurrence
        ];
-       homepage = "http://www.nomyx.net";
        description = "Library of rules for Nomyx";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153491,7 +147830,6 @@ self: {
          safe stm time
        ];
        testHaskellDepends = [ base Cabal ];
-       homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153517,7 +147855,6 @@ self: {
          nomyx-language old-locale reform reform-blaze reform-happstack safe
          split stm text time web-routes web-routes-happstack web-routes-th
        ];
-       homepage = "http://www.nomyx.net";
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153534,7 +147871,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq QuickCheck utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/non-empty/";
        description = "List-like structures with static restrictions on the number of elements";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153546,7 +147882,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "1qfidlv190wxrrp67h7rcrlczwfv7r0mdbwm31rrf08l1i6618yr";
        libraryHaskellDepends = [ base containers semigroups ];
-       homepage = "http://www.github.com/massysett/non-empty-sequence";
        description = "Non-empty sequence";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153559,7 +147894,6 @@ self: {
        sha256 = "1s2rzcaiilid2dv462hkr3mxg4gk1dqyyayvwhs5nl81y7a35krd";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck text ];
-       homepage = "https://github.com/acatton/haskell-non-empty-text#readme";
        description = "Non empty Data.Text type";
        license = "unknown";
      }) {};
@@ -153585,7 +147919,6 @@ self: {
        sha256 = "0f01q916dzkl1i0v15qrw9cviycki5g3fgi6x8gs45iwbzssq52n";
        libraryHaskellDepends = [ base QuickCheck semigroups utility-ht ];
        testHaskellDepends = [ base QuickCheck semigroups utility-ht ];
-       homepage = "http://code.haskell.org/~thielema/non-negative/";
        description = "Non-negative numbers";
        license = "GPL";
      }) {};
@@ -153602,7 +147935,6 @@ self: {
          base base64-bytestring bytestring entropy text transformers
          unliftio unliftio-core
        ];
-       homepage = "https://github.com/prowdsponsor/nonce";
        description = "Generate cryptographic nonces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153626,7 +147958,6 @@ self: {
        version = "0.4.0";
        sha256 = "1ymndk1aqaw0n0vgj9gbajm5ma21ld77g0a06z92frqi8wvp67ii";
        libraryHaskellDepends = [ base comonad semigroups ];
-       homepage = "http://github.com/guaraqe/nonempty-alternative#readme";
        description = "NonEmpty for Alternative types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153669,7 +148000,6 @@ self: {
        libraryHaskellDepends = [
          ad base nonlinear-optimization primitive reflection vector
        ];
-       homepage = "https://github.com/msakai/nonlinear-optimization-ad";
        description = "Wrapper of nonlinear-optimization package for using with AD package";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153685,7 +148015,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath ];
        executableHaskellDepends = [ base directory filepath ];
-       homepage = "https://github.com/jessopher/noodle";
        description = "the noodle programming language";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153698,7 +148027,6 @@ self: {
        version = "1.1.0.3";
        sha256 = "1q7p0bx435amqb7r9qksix0mrbpnqsyfb44chjyz6xkgjj0s6yvd";
        libraryHaskellDepends = [ base random ];
-       homepage = "https://github.com/bjornbm/normaldistribution";
        description = "Minimum fuss normally distributed random values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153722,7 +148050,6 @@ self: {
          text
        ];
        benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-       homepage = "https://github.com/ppelleti/normalization-insensitive";
        description = "Normalization insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153743,7 +148070,6 @@ self: {
        executableHaskellDepends = [
          base bytestring cassava containers optparse-generic text vector
        ];
-       homepage = "http://github.com/GregorySchwartz/normalize#readme";
        description = "Normalize data using a variety of methods";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -153758,7 +148084,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/qoelet/normalize-imports#readme";
        description = "Sort and align Haskell import statements";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153805,7 +148130,6 @@ self: {
        version = "0.1.1";
        sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/finnsson/not-in-base";
        description = "Useful utility functions that only depend on base";
        license = "unknown";
      }) {};
@@ -153875,7 +148199,6 @@ self: {
        testHaskellDepends = [
          base hspec HUnit mime-mail text yesod yesod-core yesod-test
        ];
-       homepage = "https://bitbucket.org/wuzzeb/notmuch-web";
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153896,7 +148219,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/NICTA/notzero";
        description = "A data type for representing numeric values, except zero";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153967,7 +148289,6 @@ self: {
          async base bytestring conduit conduit-extra exceptions hspec stm
          stm-conduit text
        ];
-       homepage = "https://github.com/xenog/nqe#readme";
        description = "Concurrency library in the style of Erlang/OTP";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153984,7 +148305,6 @@ self: {
        testHaskellDepends = [
          base directory process transformers uniplate
        ];
-       homepage = "https://github.com/ndmitchell/nsis#readme";
        description = "DSL for producing Windows Installer using NSIS";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154024,7 +148344,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base containers haskeline lens mtl ];
        testHaskellDepends = [ base containers hspec pretty ];
-       homepage = "https://github.com/zjhmale/ntha";
        description = "A tiny statically typed functional programming language";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154095,7 +148414,6 @@ self: {
          aeson base containers filepath scotty split stm text transformers
          wai-extra warp
        ];
-       homepage = "https://github.com/Tener/null-canvas";
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154108,7 +148426,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "19vwgyscil4rmgfnla8msmhgamn6j3wfy7wqghb539byca0gim0c";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/derekelkins/nullary";
        description = "A package for working with nullary type classes";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154122,7 +148439,6 @@ self: {
        sha256 = "14yg2422hljn7zy1k1w3cvh4vff5njpgm2wpxhay0knrkr2vz6r8";
        libraryHaskellDepends = [ base bytestring pipes ];
        testHaskellDepends = [ base hspec pipes ];
-       homepage = "https://github.com/mwotton/nullpipe#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154154,7 +148470,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/trskop/number-length";
        description = "Number of digits in a number in decimal and hexadecimal representation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154180,7 +148495,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2";
        libraryHaskellDepends = [ base call-stack semigroups ];
-       homepage = "https://github.com/leftaroundabout/numbered-semigroups";
        description = "A sequence of semigroups, for composing stuff in multiple spatial directions";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -154192,7 +148506,6 @@ self: {
        version = "0.2.1";
        sha256 = "0hh4km2zbvs7rsb142f1rifqvwzajh0grgky2vyyyf48dk5plrlv";
        libraryHaskellDepends = [ base containers vector ];
-       homepage = "https://github.com/DanielSchuessler/numbering";
        description = "Combinators for creating bijections from some type to the natural numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154209,7 +148522,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/jwiegley/numbers#readme";
        description = "Various number types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154231,7 +148543,6 @@ self: {
          test-framework-quickcheck2 text
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154253,7 +148564,6 @@ self: {
          base base-unicode-symbols containers containers-unicode-symbols
          fingertree HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/roelvandijk/numerals-base";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154266,7 +148576,6 @@ self: {
        version = "0.1";
        sha256 = "1mk11c0gz1yjy5b8dvq6czfny57pln0bs7x28fz38qyr44872067";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/ekmett/numeric-extras";
        description = "Useful tools from the C standard library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154306,7 +148615,6 @@ self: {
          diagrams-cairo diagrams-lib diagrams-rasterific JuicyPixels linear
          mtl plots vector vector-space
        ];
-       homepage = "https://github.com/qnikst/numeric-ode";
        description = "Ode solvers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154327,7 +148635,6 @@ self: {
          array base containers deepseq non-negative parsec QuickCheck random
          semigroups storable-record utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Numeric_Prelude";
        description = "An experimental alternative hierarchy of numeric type classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154345,7 +148652,6 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest filepath ];
        doCheck = false;
-       homepage = "https://github.com/nikita-volkov/numeric-qq";
        description = "Quasi-quoters for numbers of different bases";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154359,7 +148665,6 @@ self: {
        sha256 = "0agwfmbxyig502ac7xvf7208m0v7wdrcg7m30d1iw22c687ph5k9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ array base prelude-compat ];
-       homepage = "http://www.haskell.org/haskellwiki/Numeric_Quest";
        description = "Math and quantum mechanics";
        license = "GPL";
      }) {};
@@ -154374,7 +148679,6 @@ self: {
        editedCabalFile = "01za4j4bnds4kwsmfg2a3msf1n7wzaqg5x77qcygwjxqcx6aick8";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
-       homepage = "http://github.com/nicodelpiano/numeric-ranges";
        description = "A framework for numeric ranges";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154388,7 +148692,6 @@ self: {
        sha256 = "0frdsj90gqpa55ybjfkzfcda43bbwkqd2v26l6w35kyq1snqyhd3";
        libraryHaskellDepends = [ base ieee754 primitive vector ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://bitbucket.org/Shimuuar/numeric-tools";
        description = "Collection of numerical tools for integration, differentiation etc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154400,7 +148703,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1f9ar8kdwzi8xarzb7mrq204v1n3n8kh0fbqv06l9677vv1pc19v";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/ombocomp/numericpeano/";
        description = "Peano numbers with attendant bells and whistles";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -154419,20 +148721,18 @@ self: {
        testHaskellDepends = [
          base doctest protolude QuickCheck tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/tonyday567/numhask#readme";
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask_0_2_1_0" = callPackage
+  "numhask_0_2_2_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "numhask";
-       version = "0.2.1.0";
-       sha256 = "04bz8ddip48fiszjqc6km9xg63sn26jrnjxswc3qfls37jqzk2c3";
+       version = "0.2.2.0";
+       sha256 = "0i0acm03qirj6xnpyv87v4vss7bmcnzkv8j7rymvshp92nrxihgd";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tonyday567/numhask#readme";
        description = "numeric classes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154454,7 +148754,6 @@ self: {
        testHaskellDepends = [
          base doctest numhask-prelude tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/tonyday567/numhask-array#readme";
        description = "n-dimensional arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154466,13 +148765,12 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-histogram";
-       version = "0.1.2.0";
-       sha256 = "03zq5qg9m5yndllc1gs5f7848j37dysb94zkh6pc465ascskl7d9";
+       version = "0.1.2.1";
+       sha256 = "0pjl4xqfi9kr56sr83ais1mx9k3rz739axr9wrj0n1xzdp4q9yr9";
        libraryHaskellDepends = [
          base containers foldl numhask-prelude numhask-range tdigest
        ];
        testHaskellDepends = [ base doctest protolude tasty ];
-       homepage = "https://github.com/tonyday567/numhask-histogram#readme";
        description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154484,13 +148782,12 @@ self: {
      }:
      mkDerivation {
        pname = "numhask-prelude";
-       version = "0.0.4.1";
-       sha256 = "1sj7l62cgk68b1d2lfxd944yxw43l6a3qr335x21jjhgdaffwg3x";
+       version = "0.0.5.1";
+       sha256 = "0bpisfh0ngxbxpb080fpd02bjvl451n0rqdr1c3zxyljv6xnkbvj";
        libraryHaskellDepends = [
          base numhask protolude QuickCheck tasty tasty-quickcheck
        ];
        testHaskellDepends = [ base doctest QuickCheck tasty ];
-       homepage = "https://github.com/tonyday567/numhask#readme";
        description = "A numeric prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154509,26 +148806,24 @@ self: {
          semigroupoids
        ];
        testHaskellDepends = [ base doctest numhask tasty ];
-       homepage = "https://github.com/tonyday567/numhask-range#readme";
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_2_2_0" = callPackage
+  "numhask-range_0_2_2_1" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest
      , numhask-prelude, protolude, QuickCheck, semigroupoids, tasty
      }:
      mkDerivation {
        pname = "numhask-range";
-       version = "0.2.2.0";
-       sha256 = "1wrh8s6nknw6jkbl91iym7cvy1g1qmccikfbr1qhc4gzylkf5m4v";
+       version = "0.2.2.1";
+       sha256 = "1bay0jsarz7d2kbgi3zvdl2dip9arv9qdlk41szgvsbgqbadxjxf";
        libraryHaskellDepends = [
          adjunctions base distributive numhask-prelude protolude QuickCheck
          semigroupoids
        ];
        testHaskellDepends = [ base doctest numhask-prelude tasty ];
-       homepage = "https://github.com/tonyday567/numhask-range#readme";
        description = "Numbers that are range representations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154552,7 +148847,6 @@ self: {
        version = "1.2";
        sha256 = "1pdawf6zyany5jz5jmszwbm7ms7c125if52v9cw0chy0xz5ahdym";
        libraryHaskellDepends = [ base ];
-       homepage = "http://dimensional.googlecode.com/";
        description = "Type-level (low cardinality) integers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154564,7 +148858,6 @@ self: {
        version = "0.5.0.1";
        sha256 = "05yhjnp8wa25chsf0v2nmd9wznm4n4qxw12qc2a9z64kfszvknr9";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/bjornbm/numtype-dk";
        description = "Type-level integers, using TypeNats, Data Kinds, and Closed Type Families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154576,7 +148869,6 @@ self: {
        version = "0.1.2";
        sha256 = "00bnz9k4nq21z4vax37qjv6ra2jvlshk0jlici1w8y9rx39zrjyx";
        libraryHaskellDepends = [ base ];
-       homepage = "http://dimensional.googlecode.com/";
        description = "Type-level (low cardinality) integers, implemented using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154597,7 +148889,6 @@ self: {
        testHaskellDepends = [
          base base-unicode-symbols hspec lens linear
        ];
-       homepage = "https://github.com/mvoidex/nurbs";
        description = "NURBS";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154652,7 +148943,6 @@ self: {
          template-haskell text time time-locale-compat transformers
          transformers-base unliftio unliftio-core utf8-string
        ];
-       homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154676,7 +148966,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover nvim-hs QuickCheck
        ];
-       homepage = "https://github.com/neovimhaskell/nvim-hs-contrib";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154695,7 +148984,6 @@ self: {
          base bytestring containers directory filepath ghcid nvim-hs
          nvim-hs-contrib resourcet transformers unliftio yaml
        ];
-       homepage = "https://github.com/saep/nvim-hs-ghcid";
        description = "Neovim plugin that runs ghcid to update the quickfix list";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154714,7 +149002,6 @@ self: {
        ];
        libraryHaskellDepends = [ base bytestring cuda template-haskell ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/tmcdonell/nvvm";
        description = "FFI bindings to NVVM";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154746,7 +149033,6 @@ self: {
          aeson base bytestring lens lens-aeson pipes pipes-aeson
          pipes-bytestring pipes-http pipes-parse text time wreq
        ];
-       homepage = "https://github.com/bts/nylas-hs";
        description = "Client for the Nylas API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154789,7 +149075,6 @@ self: {
          tasty-hspec type-spec
        ];
        benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ];
-       homepage = "https://github.com/serokell/o-clock";
        description = "Type-safe time library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154815,7 +149100,6 @@ self: {
          http-client http-conduit HUnit lens old-locale resourcet scientific
          text thyme transformers vector
        ];
-       homepage = "https://github.com/jdreaver/oanda-rest-api#readme";
        description = "Client to the OANDA REST API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154839,7 +149123,6 @@ self: {
          aeson aeson-pretty base bytestring containers text time
          uri-bytestring xml-conduit xml-conduit-writer
        ];
-       homepage = "https://gitlab.com/dpwiz/oasis-xrd";
        description = "Extensible Resource Descriptor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -154859,7 +149142,6 @@ self: {
          http-types time transformers
        ];
        testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/gatlin/oauth10a#readme";
        description = "Fully Automatic Luxury OAuth 1.0a headers";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -154885,7 +149167,6 @@ self: {
          http-client http-client-tls http-types memory mtl network
          network-uri text time transformers
        ];
-       homepage = "https://github.com/tel/oauthenticated.git#readme";
        description = "Simple OAuth for http-client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154911,7 +149192,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/hverr/haskell-obd#readme";
        description = "Communicate to OBD interfaces over ELM327";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154929,7 +149209,6 @@ self: {
          array base containers ersatz mtl process-extras random text
        ];
        testHaskellDepends = [ array base containers text ];
-       homepage = "https://github.com/jwaldmann/haskell-obdd";
        description = "Ordered Reduced Binary Decision Diagrams";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154950,7 +149229,6 @@ self: {
          template-haskell transformers uu-parsinglib uulib
        ];
        doHaddock = false;
-       homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "Oberon0 Compiler";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -154992,7 +149270,6 @@ self: {
          base bytestring bytestring-arbitrary cereal QuickCheck tasty
          tasty-quickcheck
        ];
-       homepage = "https://github.com/tsuraan/objectid";
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155014,7 +149291,6 @@ self: {
          profunctors template-haskell transformers transformers-compat
          unordered-containers void witherable
        ];
-       homepage = "https://github.com/fumieval/objective";
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -155026,7 +149302,6 @@ self: {
        version = "0.2.4";
        sha256 = "1lqig0r4f7gqjdymsc4jpwspc3jr01xkmk5cgiqr5ngxvk6zw3j0";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/atzeus/observable-sharing";
        description = "Simple observable sharing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -155054,7 +149329,6 @@ self: {
          servant servant-server template-haskell text time
          typelits-witnesses wai wai-extra warp
        ];
-       homepage = "https://github.com/plow-technologies/ocaml-export#readme";
        description = "Convert Haskell types in OCaml types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155068,7 +149342,6 @@ self: {
        sha256 = "1s2n0k8ix4lc9x07s2qhgiiln6xyfswkkz14ri6jm1k9k3hr946l";
        libraryHaskellDepends = [ base bookkeeping text ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme";
        description = "A module to manage payroll books for Japanese companies";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -155085,7 +149358,6 @@ self: {
          base bookkeeping mono-traversable text transaction
        ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme";
        description = "A module to manage payroll books for Japanese companies";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155111,7 +149383,6 @@ self: {
          file-embed http-client http-client-tls overloaded-records
          rattletrap text
        ];
-       homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155143,7 +149414,6 @@ self: {
        testHaskellDepends = [
          base base-compat dotenv hspec hspec-expectations text transformers
        ];
-       homepage = "https://github.com/stackbuilders/octohat";
        description = "A tested, minimal wrapper around GitHub's API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155165,7 +149435,6 @@ self: {
        executableHaskellDepends = [
          array base bytestring containers hexpr mtl parsec symbol text
        ];
-       homepage = "https://github.com/Zankoku-Okuno/octopus/";
        description = "Lisp with more dynamism, more power, more simplicity";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155183,12 +149452,12 @@ self: {
          base either monads-tf transformers vect-floating
        ];
        librarySystemDepends = [ libGL libX11 libXinerama ovr systemd ];
-       homepage = "http://github.com/cpdurham/oculus";
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
-         inherit (pkgs.xorg) libXinerama; ovr = null; systemd = null;};
+         inherit (pkgs.xorg) libXinerama; ovr = null; 
+         inherit (pkgs) systemd;};
 
   "odbc" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
@@ -155213,7 +149482,6 @@ self: {
          base bytestring hspec QuickCheck text time
        ];
        benchmarkHaskellDepends = [ async base text weigh ];
-       homepage = "https://github.com/fpco/odbc";
        description = "Haskell binding to the ODBC API, aimed at SQL Server driver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155230,7 +149498,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
        ];
-       homepage = "http://oden-lang.org";
        description = "Provides Go package metadata";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155252,7 +149519,6 @@ self: {
        testHaskellDepends = [
          base conduit hspec monad-logger QuickCheck resourcet
        ];
-       homepage = "https://github.com/leptonyu/odpic-raw#readme";
        description = "Oracle Database Bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155283,7 +149549,6 @@ self: {
        version = "0.1";
        sha256 = "03sb2bmjw8v01908zkzmw8njsmqy5k2hcnv6ajbia7n8qawyhivj";
        libraryHaskellDepends = [ base parsec3 vector ];
-       homepage = "https://github.com/acfoltzer/off-simple";
        description = "A parser for simplified-syntax OFF files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155299,7 +149564,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base parsec pretty time ];
        executableHaskellDepends = [ base parsec pretty time ];
-       homepage = "http://www.github.com/massysett/ofx";
        description = "Parser for OFX data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -155316,7 +149580,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-megaparsec megaparsec shakespeare text
        ];
-       homepage = "https://nest.pijul.com/lthms/ogmarkup";
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -155340,7 +149603,6 @@ self: {
          base data-lens hxt QuickCheck test-framework
          test-framework-quickcheck2 text-format-simple
        ];
-       homepage = "https://github.com/fthomas/ohloh-hs";
        description = "Interface to the Ohloh API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155382,7 +149644,6 @@ self: {
          aeson base bytestring exceptions hspec http-client http-client-tls
          http-types jose-jwt network-uri text time
        ];
-       homepage = "https://github.com/krdlab/haskell-oidc-client";
        description = "OpenID Connect 1.0 library for RP";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155478,7 +149739,6 @@ self: {
          base bytestring Cabal containers directory http-types safe
          safe-exceptions template-haskell text unix wai
        ];
-       homepage = "https://github.com/owensmurray/om-elm";
        description = "Haskell utilities for building embedded Elm programs";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155497,7 +149757,6 @@ self: {
        executableHaskellDepends = [
          base optparse-applicative shakespeare-text shelly text
        ];
-       homepage = "https://github.com/pcapriotti/omaketex";
        description = "A simple tool to generate OMakefile for latex files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155518,7 +149777,6 @@ self: {
          base Boolean gl hashable hashtables MemoTrie monad-control
          transformers transformers-base unordered-containers vector-space
        ];
-       homepage = "https://github.com/ziocroc/Ombra";
        description = "Render engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155538,7 +149796,6 @@ self: {
        executableHaskellDepends = [
          array base containers directory filepath pretty time
        ];
-       homepage = "http://code.google.com/p/omega/";
        description = "A purely functional programming language and a proof system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155585,7 +149842,6 @@ self: {
          monad-parallel mtl optparse-applicative pipes pipes-concurrency
          temporary text time
        ];
-       homepage = "https://github.com/hjwylde/omnifmt";
        description = "A pretty-printer wrapper to faciliate ease of formatting during development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155605,7 +149861,6 @@ self: {
          http-types mtl random safe split text time transformers utf8-string
          wai wai-extra warp
        ];
-       homepage = "http://haskell.on-a-horse.org";
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155627,7 +149882,6 @@ self: {
        executableHaskellDepends = [
          base bytestring GenericPretty network process random
        ];
-       homepage = "https://github.com/crackleware/on-demand-ssh-tunnel";
        description = "Program that sends traffic through SSH tunnels on-demand";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -155655,7 +149909,6 @@ self: {
        libraryHaskellDepends = [
          base containers hashable template-haskell unordered-containers
        ];
-       homepage = "https://anonscm.debian.org/cgit/users/kaction-guest/haskell-once.git";
        description = "memoization for IO actions and functions";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -155669,7 +149922,6 @@ self: {
        sha256 = "026qycb9nvc2v648p2cc74h6xqczkv9mvpawq54zx4r3vlc4lppn";
        libraryHaskellDepends = [ aeson base text unordered-containers ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/typeclasses/one-line-aeson-text";
        description = "Pretty-printing short Aeson values as text";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -155687,7 +149939,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base contravariant HUnit ];
-       homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -155705,7 +149956,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base contravariant HUnit ];
-       homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155718,7 +149968,6 @@ self: {
        version = "0.1.2.1";
        sha256 = "1gy900nd5n6cffqw63hlkqg4ly86wjlfqgdcm1zy2nyx7dxg914k";
        libraryHaskellDepends = [ base one-liner random ];
-       homepage = "https://github.com/mstksg/one-liner-instances#readme";
        description = "Generics-based implementations for common typeclasses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -155737,7 +149986,6 @@ self: {
        testHaskellDepends = [
          base bytestring cryptonite tasty tasty-hunit time
        ];
-       homepage = "https://github.com/s9gf4ult/one-time-password";
        description = "HMAC-Based and Time-Based One-Time Passwords";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -155749,7 +149997,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "05gycp2zvq08bjl9dx1lm3cjr12i50k3cwq4al34y1rlp2r531lk";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mokus0/oneOfN";
        description = "Anonymous coproduct type";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -155761,7 +150008,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "1lz429abk7qqwfya3wa1m5pcyyldagcmmc0ghjfbl8byhkaax63p";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/thinkpad20/oneormore";
        description = "A never-empty list type";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155786,7 +150032,6 @@ self: {
          scientific text
        ];
        testHaskellDepends = [ base doctest protolude tasty ];
-       homepage = "https://github.com/tonyday567/online#readme";
        description = "online statistics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155805,7 +150050,6 @@ self: {
          vector-algorithms
        ];
        testHaskellDepends = [ base doctest protolude tasty ];
-       homepage = "https://github.com/tonyday567/online#readme";
        description = "online statistics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155831,7 +150075,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0iy4hpibiz6v93kz8jv5phb96sh6ygcdakf9vqss5d5622s5pgf1";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/paolino/onpartitions";
        description = "partition lenses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155856,7 +150099,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0xpm2adf47clhzpwd833w706mc5xfxwr2wp4aywigy11687f9bly";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/yi-editor/oo-prototypes";
        description = "Support for OO-like prototypes";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -155886,7 +150128,6 @@ self: {
          multiset postgresql-simple product-profunctors profunctors
          QuickCheck semigroups text time transformers
        ];
-       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -155905,7 +150146,6 @@ self: {
          base bytestring lens mtl opaleye postgresql-simple
          product-profunctors transformers
        ];
-       homepage = "https://github.com/benkolera/opaleye-classy/tree/master";
        description = "Opaleye wrapped up in classy MTL attire";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155931,7 +150171,6 @@ self: {
          base containers contravariant product-profunctors profunctors
          QuickCheck semigroups sqlite-simple time
        ];
-       homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "An SQL-generating DSL targeting SQLite";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155954,7 +150193,6 @@ self: {
        executableHaskellDepends = [
          base opaleye postgresql-simple product-profunctors
        ];
-       homepage = "https://github.com/WraithM/opaleye-trans";
        description = "A monad transformer for Opaleye";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -155970,7 +150208,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base process ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/rightfold/open-browser";
        description = "Open a web browser from Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156007,7 +150244,6 @@ self: {
          HTTP mtl network old-time parsec pretty process syb texmath
          utf8-string xhtml xml zip-archive
        ];
-       homepage = "http://johnmacfarlane.net/pandoc";
        description = "Conversion between markup formats";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156033,7 +150269,6 @@ self: {
        version = "0.1";
        sha256 = "0dz6ci2i43mghp0v40q11pz2q3511m25sxds44dixish14cs5gym";
        libraryHaskellDepends = [ attoparsec base conduit mtl text ];
-       homepage = "https://github.com/alphaHeavy/open-symbology";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -156051,7 +150286,6 @@ self: {
        ];
        testHaskellDepends = [ base syntactic ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156067,7 +150301,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base type-fun ];
        executableHaskellDepends = [ base type-fun ];
-       homepage = "https://github.com/bfops/open-union";
        description = "Extensible, type-safe unions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156085,7 +150318,6 @@ self: {
          witness
        ];
        testHaskellDepends = [ base mtl tasty tasty-hunit witness ];
-       homepage = "https://github.com/AshleyYakeley/open-witness";
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156097,7 +150329,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "0xj9v7xl11j6p4kk5dz64kqpmyc5d68sldakiaby0j8qvyw7sf9r";
        libraryHaskellDepends = [ aeson base data-default text time ];
-       homepage = "https://github.com/hansroland/opench";
        description = "A Haskell implementation of the Swiss Meteo Net data API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156110,7 +150341,6 @@ self: {
        sha256 = "1h5k849fw0w4wny05gby12n4i6yw4wh3vccnlmh2kp6lh7bdd98b";
        libraryHaskellDepends = [ base transformers ];
        librarySystemDepends = [ atomspace-cwrapper ];
-       homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
        description = "Haskell Bindings for the AtomSpace";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156146,7 +150376,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base bytestring criterion repa ];
        hardeningDisable = [ "bindnow" ];
-       homepage = "https://github.com/LumiGuide/haskell-opencv";
        description = "Haskell binding to OpenCV-3.x";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156172,7 +150401,6 @@ self: {
          haskell-src-exts JuicyPixels linear opencv primitive
          template-haskell text transformers vector
        ];
-       homepage = "https://github.com/LumiGuide/haskell-opencv";
        description = "Haskell binding to OpenCV-3.x extra modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156186,7 +150414,6 @@ self: {
        sha256 = "040hjkqd2zqkd8zbnfv8wmyzkfgckiv4njryilx1gpyp7c6qxpwn";
        libraryHaskellDepends = [ base bindings-DSL Cabal vector ];
        libraryPkgconfigDepends = [ opencv ];
-       homepage = "www.github.com/arjuncomar/opencv-raw.git";
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156199,7 +150426,6 @@ self: {
        version = "0.0.0";
        sha256 = "1bv729ljw07arz9fzg0nqj6fkpwkxkjds073cz3zr9in0a5b1531";
        libraryHaskellDepends = [ base hxt template-haskell th-lift ];
-       homepage = "https://github.com/fabianbergmark/OpenDataTable";
        description = "A library for working with Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156216,7 +150442,6 @@ self: {
        libraryHaskellDepends = [
          aeson base containers currency errors HTTP network text
        ];
-       homepage = "https://github.com/singpolyma/openexchangerates-haskell";
        description = "Fetch exchange rates from OpenExchangeRates.org";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156235,7 +150460,6 @@ self: {
          vector-split zlib
        ];
        testHaskellDepends = [ base bytestring directory hspec vector ];
-       homepage = "https://github.com/pavolzetor/openexr-write#readme";
        description = "Library for writing images in OpenEXR HDR file format";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -156252,7 +150476,6 @@ self: {
          aeson base bimap binary bytestring containers deepseq
          deepseq-generics hashable network
        ];
-       homepage = "https://github.com/AndreasVoellmy/openflow";
        description = "OpenFlow";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156270,7 +150493,6 @@ self: {
        executableHaskellDepends = [
          base data-default GLUT OpenGL vector
        ];
-       homepage = "https://bitbucket.org/functionally/opengl-dlp-stereo";
        description = "Library and example for using DLP stereo in OpenGL";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156287,7 +150509,6 @@ self: {
        executableHaskellDepends = [
          base binary data-default GLUT OpenGL
        ];
-       homepage = "https://bitbucket.org/functionally/opengl-spacenavigator";
        description = "Library and example for using a SpaceNavigator-compatible 3-D mouse with OpenGL";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156312,7 +150533,6 @@ self: {
          base bytestring future-resource GLFW-b random time
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/capsjac/opengles#readme";
        description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156332,7 +150552,6 @@ self: {
          base base-compat bytestring containers HsOpenSSL HTTP monadLib
          network network-uri time xml
        ];
-       homepage = "http://github.com/elliottt/hsopenid";
        description = "An implementation of the OpenID-2.0 spec.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156354,7 +150573,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          utf8-string zlib
        ];
-       homepage = "http://github.com/singpolyma/OpenPGP-Haskell";
        description = "Implementation of the OpenPGP message format";
        license = "unknown";
      }) {};
@@ -156376,7 +150594,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          utf8-string
        ];
-       homepage = "http://github.com/singpolyma/OpenPGP-Crypto";
        description = "Implementation of cryptography for use with OpenPGP using the Crypto library";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156398,7 +150615,6 @@ self: {
          tasty-hunit
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "http://floss.scru.org/openpgp-asciiarmor";
        description = "OpenPGP (RFC4880) ASCII Armor codec";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -156424,7 +150640,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 transformers
          utf8-string
        ];
-       homepage = "http://github.com/singpolyma/OpenPGP-CryptoAPI";
        description = "Implement cryptography for OpenPGP using crypto-api compatible libraries";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156441,7 +150656,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring hosc process random transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
        description = "Haskell OpenSoundControl utilities";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156464,7 +150678,6 @@ self: {
          aeson base bytestring http-client http-client-tls tasty tasty-hunit
          text transformers
        ];
-       homepage = "https://api.opensource.org/";
        description = "Haskell API Wrapper for the Open Source License API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156487,7 +150700,6 @@ self: {
        testHaskellDepends = [
          base hspec keyword-args octohat optparse-applicative parsec text
        ];
-       homepage = "https://github.com/stackbuilders/openssh-github-keys";
        description = "Fetch OpenSSH keys from a GitHub team";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156531,7 +150743,6 @@ self: {
        sha256 = "0fdxrpsw3c4p1y80xfab0cl5zhkjcp9dlylgxywzq5kcpqv07ifh";
        libraryHaskellDepends = [ base opentheory-primitive QuickCheck ];
        testHaskellDepends = [ base opentheory-primitive QuickCheck ];
-       homepage = "http://opentheory.gilith.com/?pkg=base";
        description = "The standard theory library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156548,7 +150759,6 @@ self: {
          base opentheory opentheory-primitive opentheory-probability
          QuickCheck
        ];
-       homepage = "http://opentheory.gilith.com/?pkg=natural-bits";
        description = "Natural number to bit-list conversions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156565,7 +150775,6 @@ self: {
          base opentheory opentheory-bits opentheory-primitive
          opentheory-probability QuickCheck
        ];
-       homepage = "http://opentheory.gilith.com/?pkg=byte";
        description = "Bytes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156606,7 +150815,6 @@ self: {
        testHaskellDepends = [
          base opentheory opentheory-primitive QuickCheck
        ];
-       homepage = "http://opentheory.gilith.com/?pkg=natural-divides";
        description = "The divides relation on natural numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156642,7 +150850,6 @@ self: {
        testHaskellDepends = [
          base opentheory opentheory-primitive QuickCheck
        ];
-       homepage = "http://opentheory.gilith.com/?pkg=parser";
        description = "Stream parsers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156663,7 +150870,6 @@ self: {
          base opentheory opentheory-divides opentheory-primitive
          opentheory-stream QuickCheck
        ];
-       homepage = "http://opentheory.gilith.com/?pkg=natural-prime";
        description = "Prime natural numbers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156676,7 +150882,6 @@ self: {
        sha256 = "12pfg1ydiy1gabn31ga5k1qsbc3p4nkw035zzz20z0j2wq8lv4p8";
        libraryHaskellDepends = [ base QuickCheck random ];
        testHaskellDepends = [ base QuickCheck random ];
-       homepage = "http://www.gilith.com/research/opentheory/";
        description = "Haskell primitives used by OpenTheory packages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156691,7 +150896,6 @@ self: {
        libraryHaskellDepends = [
          base opentheory opentheory-primitive QuickCheck
        ];
-       homepage = "http://opentheory.gilith.com/?pkg=probability";
        description = "Probability";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156706,7 +150910,6 @@ self: {
        libraryHaskellDepends = [
          base opentheory opentheory-primitive QuickCheck
        ];
-       homepage = "http://opentheory.gilith.com/?pkg=stream";
        description = "Infinite stream types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156728,7 +150931,6 @@ self: {
          base opentheory opentheory-bits opentheory-byte opentheory-parser
          opentheory-primitive opentheory-probability QuickCheck
        ];
-       homepage = "http://opentheory.gilith.com/?pkg=char";
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156784,7 +150986,6 @@ self: {
          base charset haskell-src-meta template-haskell
        ];
        testHaskellDepends = [ base doctest filemanip hspec QuickCheck ];
-       homepage = "https://github.com/uecmma/haskell-library-collections/tree/master/operate-do";
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156799,7 +151000,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl ];
        executableHaskellDepends = [ base mtl random ];
-       homepage = "http://wiki.haskell.org/Operational";
        description = "Implementation of difficult monads made easy with operational semantics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156812,7 +151012,6 @@ self: {
        sha256 = "0n4xjv0li4z5lvkx8z0y72dyv9aa0hc315cvpwqcfsh5wvp7fanm";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/emilaxelsson/operational-alacarte";
        description = "A version of Operational suitable for extensible EDSLs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156824,7 +151023,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "02z766b5a6fa7dgmw3qa1xryijf2im9n79gnjq0m5pd2hv5vja4b";
        libraryHaskellDepends = [ base operational transformers ];
-       homepage = "https://github.com/srijs/haskell-operational-class";
        description = "MonadProgram typeclass for the operational package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -156840,7 +151038,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring operational text time transformers
        ];
-       homepage = "http://github.com/andrewthad/vinyl-ecosystem";
        description = "Interpretation functions and simple instruction sets for operational";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156880,7 +151077,6 @@ self: {
          quickcheck-instances resourcet semigroups tasty tasty-hunit
          tasty-quickcheck text time uri-bytestring xml-conduit
        ];
-       homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156900,7 +151096,6 @@ self: {
          base directory filepath ini network-uri optparse-applicative
          process text unordered-containers
        ];
-       homepage = "http://github.com/akc/opn";
        description = "Open files or URLs using associated programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156925,7 +151120,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq vector
        ];
-       homepage = "https://github.com/tsuraan/optimal-blocks";
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156942,7 +151136,6 @@ self: {
        libraryHaskellDepends = [
          ad base distributive linear semigroupoids vector
        ];
-       homepage = "http://github.com/bgamari/optimization";
        description = "Numerical optimization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -156961,7 +151154,6 @@ self: {
          base cmdargs containers fgl flite graphviz haskell98 mtl parsec
          uniplate wl-pprint
        ];
-       homepage = "http://optimusprime.posterous.com/";
        description = "A supercompiler for f-lite";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -156988,7 +151180,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck
        ];
-       homepage = "https://github.com/tonymorris/optional";
        description = "Using type-classes for optional function arguments";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157017,7 +151208,6 @@ self: {
        testHaskellDepends = [
          base chell chell-quickcheck containers monads-tf transformers
        ];
-       homepage = "https://john-millikin.com/software/haskell-options/";
        description = "A powerful and easy-to-use command-line option parser";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -157030,7 +151220,6 @@ self: {
        sha256 = "0rsmwalmnry71w23k6sg0a307xgb2s71j9s12zqqq380fw6c1bhm";
        libraryHaskellDepends = [ base options time ];
        testHaskellDepends = [ base chell options time ];
-       homepage = "https://john-millikin.com/software/haskell-options/";
        description = "Command-line option types for dates and times";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -157047,7 +151236,6 @@ self: {
          ansi-wl-pprint base process transformers transformers-compat
        ];
        testHaskellDepends = [ base bytestring QuickCheck ];
-       homepage = "https://github.com/pcapriotti/optparse-applicative";
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157064,7 +151252,6 @@ self: {
          attoparsec attoparsec-data base-prelude optparse-applicative text
        ];
        testHaskellDepends = [ attoparsec-data rerebase ];
-       homepage = "https://github.com/nikita-volkov/optparse-applicative-simple";
        description = "Simple command line interface arguments parser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157077,7 +151264,6 @@ self: {
        version = "0.3.0";
        sha256 = "1avy0g6jk34jbfp1xzqcyhb4j53knsbzx1pssl4b5f6nn981mbj8";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://github.com/tanakh/optparse-declarative";
        description = "Declarative command line option parser";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -157105,7 +151291,6 @@ self: {
        version = "0.2.1.1";
        sha256 = "043mdm25lpzbfghmda0iayv7lnff1gni9g29pd5h2ssgscyvs2qa";
        libraryHaskellDepends = [ base optparse-applicative ];
-       homepage = "https://github.com/pharpend/optparse-helper";
        description = "Helper functions for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157123,7 +151308,6 @@ self: {
          base gitrev optparse-applicative template-haskell transformers
        ];
        testHaskellDepends = [ base bytestring directory ];
-       homepage = "https://github.com/fpco/optparse-simple#readme";
        description = "Simple interface to optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157136,7 +151320,6 @@ self: {
        sha256 = "1vw410q7vayfgfbrxpigkpnwm8x1lcdxkh959w9f82l8xkn83h7n";
        libraryHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base hspec optparse-applicative text ];
-       homepage = "https://github.com/passy/optparse-text#readme";
        description = "Data.Text helpers for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157148,7 +151331,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "08mv8ah4g5xs91245gpgh6r0mgdz6rk7ykk1ywr8gfwn3dx1zm7x";
        libraryHaskellDepends = [ base optparse-applicative ];
-       homepage = "https://github.com/shmish111/optparse-version";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -157241,7 +151423,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "062wkfpww1ic3xiy26k22369azk5wjlpn5wm5xh1w75kc9crv263";
        libraryHaskellDepends = [ base void ];
-       homepage = "https://github.com/fumieval/ord-adhoc/";
        description = "Creating Ord instances instantly";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157258,7 +151439,6 @@ self: {
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck containers QuickCheck transformers
        ];
-       homepage = "http://hackage.haskell.org/package/order-maintenance";
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157293,7 +151473,6 @@ self: {
        libraryHaskellDepends = [
          base containers math-functions statistics vector vector-space
        ];
-       homepage = "http://github.com/ekmett/order-statistics/";
        description = "L-Estimators for robust statistics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157357,7 +151536,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec regex-compat ];
-       homepage = "https://github.com/M42/org2anki";
        description = "Basic org to anki exporter";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -157446,7 +151624,6 @@ self: {
          base colour hspec HUnit lens QuickCheck quickcheck-text text time
          transformers universum
        ];
-       homepage = "https://github.com/volhovM/orgstat";
        description = "Statistics visualizer for org-mode";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157466,7 +151643,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "http://github.com/nedervold/origami";
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157489,7 +151665,6 @@ self: {
          aeson base bytestring jwt mtl optparse-applicative text time
        ];
        testHaskellDepends = [ base hspec jwt mtl time ];
-       homepage = "https://github.com/luminescent-dreams/orizentic#readme";
        description = "Token-based authentication and authorization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157508,7 +151683,6 @@ self: {
          base containers hlint hspec parsec process regex-compat temporary
          transformers
        ];
-       homepage = "https://github.com/yaccz/os-release";
        description = "/etc/os-release helpers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157524,7 +151698,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base binary bytestring data-binary-ieee754 network
        ];
-       homepage = "https://github.com/peacememories/haskell-osc";
        description = "A library to handle messages in the OSC protocol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157576,7 +151749,6 @@ self: {
        testHaskellDepends = [
          base conduit exceptions hspec resourcet text xml-conduit xml-types
        ];
-       homepage = "http://github.com/przembot/osm-conduit#readme";
        description = "Parse and operate on OSM data in efficient way";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157618,7 +151790,6 @@ self: {
          base directory filepath lens mtl optparse-applicative pandoc-types
          process temporary
        ];
-       homepage = "https://github.com/spwhitton/oso2pdf";
        description = "Better conversion of Oxford Scholarship Online material to PDF";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157652,7 +151823,6 @@ self: {
          aeson base binary HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/operational-transformation/ot.hs";
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157682,7 +151852,6 @@ self: {
          aeson base binary bytestring h-gpgme text yaml
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mstksg/otp-authenticator";
        description = "OTP Authenticator (a la google) command line client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157712,7 +151881,6 @@ self: {
        version = "1.0.0";
        sha256 = "07iafybg45130jhwin6jj2fnkgcwra367f5df91xn34kaj9zas0x";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jship/overhang#readme";
        description = "Hang loose with your lambdas!";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -157728,7 +151896,6 @@ self: {
        libraryHaskellDepends = [
          base simple-effects template-haskell th-expand-syns
        ];
-       homepage = "https://gitlab.com/LukaHorvat/overload";
        description = "Finite overloading";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157751,7 +151918,6 @@ self: {
          base data-default-class HUnit template-haskell test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/trskop/overloaded-records";
        description = "Overloaded Records based on current GHC proposal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157782,7 +151948,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring lens transformers vector
        ];
-       homepage = "https://github.com/capsjac/pack";
        description = "Bidirectional fast ByteString packer/unpacker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157798,7 +151963,6 @@ self: {
          base bytestring Cabal lens lens-aeson wreq
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/yamadapc/stack-run-auto/package-description-remote";
        description = "Fetches a 'GenericPackageDescription' from Hackage";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -157847,7 +152011,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
-       homepage = "https://github.com/harendra-kumar/packcheck";
        description = "Universal build and CI testing for Haskell packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157870,7 +152033,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers optparse-applicative process semigroups
        ];
-       homepage = "http://packdeps.haskellers.com/";
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157893,7 +152055,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers optparse-applicative process semigroups
        ];
-       homepage = "http://packdeps.haskellers.com/";
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157912,7 +152073,6 @@ self: {
          base containers ghc-prim hedgehog tasty tasty-hedgehog tasty-hunit
        ];
        benchmarkHaskellDepends = [ base gauge ];
-       homepage = "https://github.com/andrewthad/bytearray#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -157957,7 +152117,6 @@ self: {
          base constraints containers QuickCheck transformers vector
        ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       homepage = "https://github.com/leftaroundabout/packed-multikey-map";
        description = "Efficient “spreadsheet table” like maps with multiple marginals";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157989,7 +152148,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "http://github.com/vincenthz/hs-packer";
        description = "Fast byte serializer and unserializer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158008,7 +152166,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers hedgehog packer safe-exceptions text
        ];
-       homepage = "https://github.com/mtesseract/packer-messagepack#readme";
        description = "MessagePack Serialization an Deserialization for Packer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158049,7 +152206,6 @@ self: {
          base Cabal directory filepath haskell-src-exts optparse-applicative
          process split
        ];
-       homepage = "https://github.com/hvr/packunused";
        description = "Tool for detecting redundant Cabal package dependencies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158064,7 +152220,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base deepseq directory-tree ];
-       homepage = "https://github.com/Tener/archlinux-utils";
        description = "Read whole Pacman database which pushes it into the memory cache";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158081,7 +152236,6 @@ self: {
        libraryHaskellDepends = [
          base containers hmidi minioperational transformers
        ];
-       homepage = "https://github.com/fumieval/padKONTROL";
        description = "Controlling padKONTROL native mode";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158114,7 +152268,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 th-lift time
          transformers
        ];
-       homepage = "http://www.padsproj.org";
        description = "PADS data description language for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158133,7 +152286,6 @@ self: {
          aeson base bytestring containers lens text wreq
        ];
        executableHaskellDepends = [ base text wreq ];
-       homepage = "https://github.com/diogob/pagarme_haskell";
        description = "Pagarme API wrapper";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158156,7 +152308,6 @@ self: {
          safe terminfo text transformers unix
        ];
        executableHaskellDepends = [ base bytestring conduit-extra text ];
-       homepage = "https://github.com/pharpend/pager";
        description = "Open up a pager, like 'less' or 'more'";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -158180,7 +152331,6 @@ self: {
          time-locale-compat transformers transformers-base
          transformers-compat unordered-containers
        ];
-       homepage = "http://github.com/brendanhay/pagerduty";
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
      }) {};
@@ -158195,7 +152345,6 @@ self: {
        editedCabalFile = "0wvwi3hymp2vhhpzpycdc65zbsqmi2h0c6r0nf8p5nkgsk4pm1k2";
        libraryHaskellDepends = [ base deepseq exceptions ];
        testHaskellDepends = [ base exceptions hspec QuickCheck ];
-       homepage = "https://github.com/mrkkrp/pagination";
        description = "Framework-agnostic pagination boilerplate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158211,7 +152360,6 @@ self: {
        libraryHaskellDepends = [
          base containers scotty shelly text transformers unix
        ];
-       homepage = "https://pagure.io/pagure-hook-receiver";
        description = "Receive hooks from pagure and do things with them";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -158223,7 +152371,6 @@ self: {
        version = "1.0.0";
        sha256 = "0ks2nrjy40lfkwzxf0b22qg2zzmjj1pcbrm6vx73i4af2ibr00m4";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/lovasko/paint";
        description = "Colorization of text for command-line output";
        license = "unknown";
      }) {};
@@ -158237,7 +152384,6 @@ self: {
        revision = "1";
        editedCabalFile = "1a5qsbd43wmw1f3dj6vnmzd9imh9gsnz29jc47ivbgj4x6mdmsq1";
        libraryHaskellDepends = [ array base colour containers ];
-       homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158251,7 +152397,6 @@ self: {
        libraryHaskellDepends = [
          array base colour containers MonadRandom
        ];
-       homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158266,7 +152411,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        executableHaskellDepends = [ array base bytestring containers ];
-       homepage = "http://www.jeuring.net/homepage/palindromes/index.html";
        description = "Finding palindromes in strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158301,7 +152445,6 @@ self: {
          haskell98 hcheat kibro MissingH mps network old-locale old-time
          pandoc parsec parsedate process rss utf8-string xhtml
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Panda";
        description = "A simple static blog engine";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158352,7 +152495,6 @@ self: {
          base bytestring containers criterion text time
        ];
        doCheck = false;
-       homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -158402,7 +152544,6 @@ self: {
          weigh
        ];
        doCheck = false;
-       homepage = "https://pandoc.org";
        description = "Conversion between markup formats";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158439,7 +152580,6 @@ self: {
          pandoc pandoc-types process temporary text yaml
        ];
        doCheck = false;
-       homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158456,7 +152596,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath pandoc-types process
        ];
-       homepage = "https://github.com/spwhitton/pandoc-citeproc-preamble";
        description = "Insert a preamble before pandoc-citeproc's bibliography";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -158493,7 +152632,6 @@ self: {
          mtl pandoc pandoc-types roman-numerals syb template-haskell text
          utility-ht
        ];
-       homepage = "https://github.com/lierdakil/pandoc-crossref#readme";
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158510,7 +152648,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
        executableHaskellDepends = [ base csv pandoc pandoc-types ];
-       homepage = "https://github.com/baig/pandoc-csv2table-filter";
        description = "Convert CSV to Pandoc Table Markdown";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158536,7 +152673,6 @@ self: {
          base pandoc-types tasty tasty-discover tasty-hspec tasty-hunit
          unordered-containers
        ];
-       homepage = "https://github.com/owickstrom/pandoc-emphasize-code";
        description = "A Pandoc filter for emphasizing code in fenced blocks";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -158556,7 +152692,6 @@ self: {
          base base16-bytestring byteable bytestring containers cryptonite
          directory filepath pandoc pandoc-types process text
        ];
-       homepage = "https://github.com/jpierre03/pandoc-filter-graphviz";
        description = "A Pandoc filter to use graphviz";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158577,7 +152712,6 @@ self: {
          base directory pandoc pandoc-types text
        ];
        doHaddock = false;
-       homepage = "https://github.com/steindani/pandoc-include";
        description = "Include other Markdown files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158602,7 +152736,6 @@ self: {
          base hspec hspec-expectations pandoc-types tasty tasty-hspec
          tasty-hunit
        ];
-       homepage = "https://github.com/owickstrom/pandoc-include-code";
        description = "A Pandoc filter for including code from source files";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158635,7 +152768,6 @@ self: {
        version = "0.6.3";
        sha256 = "1gv9n753qp8l7fivi96sgb8qsia5bijw2fla21dxyn81qza3fk6v";
        libraryHaskellDepends = [ base containers lens pandoc-types ];
-       homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158656,7 +152788,6 @@ self: {
          aeson base bytestring explicit-exception http-conduit pandoc-types
          spreadsheet text utf8-string
        ];
-       homepage = "https://github.com/mb21/pandoc-placetable";
        description = "Pandoc filter to include CSV files";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158694,7 +152825,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base monad-gen pandoc pandoc-types ];
        executableHaskellDepends = [ base pandoc-types ];
-       homepage = "https://github.com/jez/pandoc-sidenote#readme";
        description = "Convert Pandoc Markdown-style footnotes into sidenotes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -158712,7 +152842,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers MissingH pandoc pandoc-types text
        ];
-       homepage = "http://github.com/lyokha/styleFromMeta";
        description = "Pandoc filter to customize links, images and paragraphs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158736,7 +152865,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158762,7 +152890,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158796,7 +152923,6 @@ self: {
          base cond directory filepath pandoc-types process regex-compat
          temporary
        ];
-       homepage = "http://github.com/lyokha/vim-publish-helper";
        description = "Pandoc filter for native Vim code highlighting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158836,7 +152962,6 @@ self: {
          array base cairo containers directory glib mtl pretty process text
        ];
        libraryPkgconfigDepends = [ pango ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome2) pango;};
@@ -158853,7 +152978,6 @@ self: {
          algebraic-graphs base bytestring containers hexml
        ];
        testHaskellDepends = [ base bytestring containers HUnit ];
-       homepage = "https://github.com/tuura/pangraph#readme";
        description = "A set of parsers for graph languages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158876,7 +153000,6 @@ self: {
          aeson base containers derive lazysmallcheck2012 pandoc pandoc-types
          QuickCheck syb tagged tasty tasty-quickcheck
        ];
-       homepage = "http://chriswarbo.net/projects/activecode";
        description = "Pandoc filter to unwrap nested blocks";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158911,7 +153034,6 @@ self: {
        testHaskellDepends = [
          base pandoc QuickCheck tasty tasty-quickcheck
        ];
-       homepage = "http://chriswarbo.net/essays/activecode";
        description = "Pandoc filter to execute code blocks";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158941,7 +153063,6 @@ self: {
          wai wai-logger warp
        ];
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
-       homepage = "https://github.com/rcook/pansite#readme";
        description = "Pansite: a simple web site management tool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -158966,7 +153087,6 @@ self: {
          papa-semigroupoids-export papa-semigroupoids-implement papa-x
          papa-x-export papa-x-implement
        ];
-       homepage = "https://github.com/qfpl/papa";
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158980,7 +153100,6 @@ self: {
        libraryHaskellDepends = [
          base papa-base-export papa-base-implement
        ];
-       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158992,7 +153111,6 @@ self: {
        version = "0.4";
        sha256 = "120b3ks9h3m9w6z365hmqrcp349kh3w8ii4kgki1zxjhh9z05mnm";
        libraryHaskellDepends = [ base semigroups ];
-       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159004,7 +153122,6 @@ self: {
        version = "0.3.1";
        sha256 = "07wpz625sdsjajaf3imqns92hs4h5gwjlmmfsr5mk9rbb3zph7ck";
        libraryHaskellDepends = [ base papa-base-export semigroups ];
-       homepage = "https://github.com/qfpl/papa";
        description = "Useful base functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159020,7 +153137,6 @@ self: {
        libraryHaskellDepends = [
          base papa-bifunctors-export papa-bifunctors-implement
        ];
-       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159032,7 +153148,6 @@ self: {
        version = "0.3.1";
        sha256 = "070br6i23pdhha9kakfw4sq8rslyrjsf1n0iikm60ca5ldbl8vn0";
        libraryHaskellDepends = [ base bifunctors ];
-       homepage = "https://github.com/qfpl/papa";
        description = "export useful functions from `bifunctors`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159044,7 +153159,6 @@ self: {
        version = "0.3.1";
        sha256 = "0s1hcpchiz9xrip25z677lkglmflnqibrvy98xmn2ppzp489pm24";
        libraryHaskellDepends = [ base bifunctors ];
-       homepage = "https://github.com/qfpl/papa";
        description = "useful `bifunctors` functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159065,7 +153179,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-export";
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159088,7 +153201,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa";
        description = "Reasonable default import";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159106,7 +153218,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-include";
        description = "Third party libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159121,7 +153232,6 @@ self: {
        libraryHaskellDepends = [
          base papa-lens-export papa-lens-implement
        ];
-       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159133,7 +153243,6 @@ self: {
        version = "0.3.1";
        sha256 = "1sckrsfljk8r9jkjv1ccpzw6bk4fq50zwvkddhfidjrjnfvkycfb";
        libraryHaskellDepends = [ base lens ];
-       homepage = "https://github.com/qfpl/papa";
        description = "export useful functions from `lens`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159145,7 +153254,6 @@ self: {
        version = "0.3.1";
        sha256 = "1x7439f7s625mdhnphvwy4pj7llpj6qsvzgvhzjcfg9m3n2a8bn4";
        libraryHaskellDepends = [ base lens ];
-       homepage = "https://github.com/qfpl/papa";
        description = "useful `lens` functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159162,7 +153270,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-prelude";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159180,7 +153287,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-prelude-core";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159198,7 +153304,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-prelude-lens";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159216,7 +153321,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-prelude-semigroupoids";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159234,7 +153338,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/papa-prelude-semigroups";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159251,7 +153354,6 @@ self: {
        libraryHaskellDepends = [
          base papa-semigroupoids-export papa-semigroupoids-implement
        ];
-       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159263,7 +153365,6 @@ self: {
        version = "0.3.1";
        sha256 = "0arqnnavjmpk0r9rfmpkyr3cxgc3gcr01ym8p15ix0iv0svghhx3";
        libraryHaskellDepends = [ base semigroupoids ];
-       homepage = "https://github.com/qfpl/papa";
        description = "export useful functions from `semigroupoids`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159275,7 +153376,6 @@ self: {
        version = "0.3.1";
        sha256 = "0walc4zzm8cyjmjl577zrc01lkgf321r8law5mwhlr7n9ihiqfxg";
        libraryHaskellDepends = [ base semigroupoids semigroups ];
-       homepage = "https://github.com/qfpl/papa";
        description = "useful `semigroupoids` functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159287,7 +153387,6 @@ self: {
        version = "0.3.1";
        sha256 = "1dvnnpdbiaxry2mxsfxlm0c42zi8ssx0sxj6m9z5mihwcf76cpld";
        libraryHaskellDepends = [ base papa-x-export papa-x-implement ];
-       homepage = "https://github.com/qfpl/papa";
        description = "Prelude with only useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159299,7 +153398,6 @@ self: {
        version = "0.3.1";
        sha256 = "1l0rklbpg9py2cbp22qlshcxh51wxv9ayiixqh32q70jsgfbkind";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/qfpl/papa";
        description = "export useful functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159311,7 +153409,6 @@ self: {
        version = "0.3.1";
        sha256 = "1hwd93nig7vgqsdy3qyxrgvjcq8wwbj98z6r66wpp7lw8jfpqhff";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/qfpl/papa";
        description = "useful functions reimplemented";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159346,7 +153443,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath monads-tf template-haskell transformers
        ];
-       homepage = "https://skami.iocikun.jp/haskell/packages/papillon";
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159367,7 +153463,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath monads-tf template-haskell transformers
        ];
-       homepage = "https://skami.iocikun.jp/haskell/packages/papillon";
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159382,7 +153477,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://pdos.csail.mit.edu/~baford/packrat/thesis/";
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159406,7 +153500,6 @@ self: {
          file-embed http-types mtl network-transport-inmemory text wai
          wai-app-static wai-websockets warp websockets word8
        ];
-       homepage = "https://github.com/mitsuji/paprika#readme";
        description = "The Haskell library and examples for the kids programming robot paprika";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159489,7 +153582,6 @@ self: {
        libraryHaskellDepends = [
          base containers extensible-exceptions random
        ];
-       homepage = "http://batterseapower.github.com/parallel-io";
        description = "Combinators for executing IO actions in parallel on a thread pool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159517,7 +153609,6 @@ self: {
        version = "0.4.1";
        sha256 = "1x2k649q6gqz9z16vwg1j59ajf2wp59lfwb65g8819fz4rwimncr";
        libraryHaskellDepends = [ base parallel tree-monad ];
-       homepage = "http://github.com/sebfisch/parallel-tree-search";
        description = "Parallel Tree Search";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -159530,7 +153621,6 @@ self: {
        sha256 = "0iik6wx6i52sqgiah9xb70cv4p29yi2fr0q6ri4c9wviqrrw8syp";
        libraryHaskellDepends = [ base data-diverse transformers ];
        testHaskellDepends = [ base data-diverse hspec transformers ];
-       homepage = "https://github.com/louispan/parameterized#readme";
        description = "Parameterized/indexed monoids and monads using only a single parameter type variable";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159542,7 +153632,6 @@ self: {
        version = "0.1.6";
        sha256 = "0fsghadd533qzav40xi3yfb8xmfv4wqsqmb0bk93rczyzyff2900";
        libraryHaskellDepends = [ base template-haskell type-level ];
-       homepage = "http://code.haskell.org/parameterized-data";
        description = "Parameterized data library implementing lightweight dependent types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159581,7 +153670,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-golden tasty-hunit temporary
        ];
-       homepage = "https://github.com/merijn/paramtree";
        description = "Generate labelled test/benchmark trees from sets of parameters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159608,7 +153696,6 @@ self: {
          base hdaemonize optparse-applicative
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/troydm/paranoia#readme";
        description = "http proxy server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159661,7 +153748,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers mtl text transformers utf8-string word8
        ];
-       homepage = "https://bitbucket.org/tdammers/parcom-lib";
        description = "A simple parser-combinator library, a bit like Parsec but without the frills";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159688,7 +153774,6 @@ self: {
          parallel random repa stm template-haskell time transformers
          utf8-string vector xml
        ];
-       homepage = "http://github.com/simonmar/parconc-examples";
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159701,7 +153786,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0b05zrc3v1hczasgg8ir83qfsz52lq02kwgn9nd39wnfliw6a4n0";
        libraryHaskellDepends = [ base ];
-       homepage = "http://bitbucket.org/hyllos/pareto-haskell";
        description = "A library for cause-effect relationships";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159742,7 +153826,6 @@ self: {
          template-haskell text th-lift
        ];
        testHaskellDepends = [ cmdargs ];
-       homepage = "http://github.com/gregwebs/cmdargs-help";
        description = "generate command line arguments from a --help output";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159759,7 +153842,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base process ];
-       homepage = "http://github.com/BartMassey/parseargs";
        description = "Full-featured command-line argument parsing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159778,7 +153860,6 @@ self: {
        testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/hvr/parsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159805,7 +153886,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers free lens mtl parsec text transformers
        ];
-       homepage = "https://github.com/jwiegley/parsec-free";
        description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159835,7 +153915,6 @@ self: {
          base bytestring parsec tasty tasty-hunit tasty-quickcheck tasty-th
          text
        ];
-       homepage = "https://github.com/AndrewRademacher/parsec-numeric";
        description = "Parsec combinators for parsing Haskell numeric types";
        license = "unknown";
      }) {};
@@ -159850,7 +153929,6 @@ self: {
        sha256 = "1knmcciyq07vp06s3xh4hwz654n017863dh9hdp1mwm57vc43s3j";
        libraryHaskellDepends = [ base parsec parsers ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/parsec-parsers/";
        description = "Parsing instances for Parsec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -159878,7 +153956,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base containers mtl parsec pretty ];
-       homepage = "http://github.com/jh3141/parsec-pratt/";
        description = "Pratt Parser combinator for Parsec";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -159901,7 +153978,6 @@ self: {
        version = "0.0.0.2";
        sha256 = "085899pyr7sff5d5zgr9pmflv3384hwm7p2b5k2lf0pcnvzf2mgw";
        libraryHaskellDepends = [ base containers mtl parsec ];
-       homepage = "http://github.com/sleepomeno/parsec-trace#readme";
        description = "Add a hierarchical trace to Parsec parsers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -159924,7 +154000,6 @@ self: {
        version = "1.0.0.6";
        sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Portable monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159936,7 +154011,6 @@ self: {
        version = "1.0.1";
        sha256 = "075y56pbi02ssyb965di1b6d2047jdjwq2wp2maraqjm6gdk824y";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/aslatter/parsec2";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159948,7 +154022,6 @@ self: {
        version = "1.0.1.8";
        sha256 = "00p3kffqmsi6lvxbpa60nql3lgm9vnxsspp8m0jz2d2hfl7hadqf";
        libraryHaskellDepends = [ base bytestring mtl text ];
-       homepage = "http://www.cs.uu.nl/~daan/parsec.html";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159971,7 +154044,6 @@ self: {
        version = "3000.0.0";
        sha256 = "0gsylvm8srddmh3g3ysjgqqmgp0ddg6pdi2sz15v6nrvsqfabiip";
        libraryHaskellDepends = [ base old-locale old-time parsec ];
-       homepage = "http://www.cs.chalmers.se/~bringert/darcs/parsedate/doc/";
        description = "Data and time parsing for CalendarTime";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -159984,7 +154056,6 @@ self: {
        sha256 = "1w5hn50gwyq2qcax869nplmhrclpsxfy0ckij6ydlhmq22zh0l03";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec parsec ];
-       homepage = "https://github.com/stackbuilders/parseerror-eq";
        description = "Adds and Eq instance for Parsec's ParseError if needed";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160008,7 +154079,6 @@ self: {
        version = "0.1";
        sha256 = "16sg32qs1kq184wk6d83z20b9firh1kjmysqwd2aqaiyq37zjyyb";
        libraryHaskellDepends = [ base mtl parsec ];
-       homepage = "http://naesten.dyndns.org:8080/repos/parsely";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -160020,7 +154090,6 @@ self: {
        version = "0.4.0";
        sha256 = "1azkz0a6ikym02s8wydjcklp7rz8k512bs4s9lp9g1g03m0yj95i";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mrkkrp/parser-combinators";
        description = "Lightweight package providing commonly useful parser combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160032,7 +154101,6 @@ self: {
        version = "1.0.0";
        sha256 = "1pwfdsklqwvaynwpdzmx1bs35mp6dpsyaqdnzxnqcrxwf5h8sk75";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mrkkrp/parser-combinators";
        description = "Lightweight package providing commonly useful parser combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160064,7 +154132,6 @@ self: {
        editedCabalFile = "083i7k8lx2by3kilvp3nbzm2fi91g0panizzf2z4d7i3a3x103jk";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec mtl ];
-       homepage = "https://github.com/YLiLarry/parser241";
        description = "An interface to create production rules using augmented grammars";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160109,7 +154176,6 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring parsec QuickCheck quickcheck-instances
        ];
-       homepage = "http://github.com/ekmett/parsers/";
        description = "Parsing combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160163,7 +154229,6 @@ self: {
          pipes PSQueue random transformers vector
        ];
        testHaskellDepends = [ base containers HUnit tasty tasty-hunit ];
-       homepage = "https://github.com/kawu/partage";
        description = "Parsing factorized";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160176,7 +154241,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "1pgmiddwhk40bzhwznv6lwmxglsnp41z45qhpd5cm0nh2wmzgx5p";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/paf31/partial";
        description = "A nullary type class for partial functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -160188,7 +154252,6 @@ self: {
        version = "1.0.3";
        sha256 = "0cf1748zyr07zv0ffi44rf5b9f7ygdybbdcl7m7c0zj14kq2miwl";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nikita-volkov/partial-handler";
        description = "A composable exception handler";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -160200,7 +154263,6 @@ self: {
        version = "0.2.2.1";
        sha256 = "0r51ykq6i11gzypv93bnw8pzn4zdyrabiiqfpbhpvs0rj6k1ymac";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse";
        description = "Partial isomorphisms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160234,7 +154296,6 @@ self: {
          base containers HUnit test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mtesseract/haskell-partial-order";
        description = "Provides typeclass suitable for types admitting a partial order";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160248,7 +154309,6 @@ self: {
        sha256 = "1vsn82kpv2ny4yjj8gq8xaq8kvi55wzy8ix0k4lsppsda8j3s9rx";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hedgehog ];
-       homepage = "https://github.com/chris-martin/partial-semigroup";
        description = "A partial binary associative operator";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -160260,7 +154320,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr";
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
-       homepage = "https://github.com/chris-martin/partial-semigroup";
        description = "Property testing for partial semigroups using Hedgehog";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -160273,7 +154332,6 @@ self: {
        sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n";
        libraryHaskellDepends = [ partial-semigroup-hedgehog ];
        doHaddock = false;
-       homepage = "https://github.com/chris-martin/partial-semigroup";
        description = "Testing utilities for the partial-semigroup package";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -160285,7 +154343,6 @@ self: {
        version = "0.2";
        sha256 = "0n3rmajbmnydqk6jk36n83a6ra5p1dkdbd592ywjfq4jhmh98333";
        libraryHaskellDepends = [ base network-uri ];
-       homepage = "https://github.com/singpolyma/partial-uri";
        description = "Datatype for passing around unresolved URIs";
        license = "unknown";
      }) {};
@@ -160308,7 +154365,6 @@ self: {
        testHaskellDepends = [
          aeson base base64-bytestring binary bytestring QuickCheck vector
        ];
-       homepage = "https://github.com/startling/partly";
        description = "Inspect, create, and alter MBRs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160347,7 +154403,6 @@ self: {
          base conduit contravariant haskeline optparse-applicative
          passman-core resourcet text X11 yaml
        ];
-       homepage = "https://github.com/PasswordManager/passman-cli#readme";
        description = "Deterministic password generator command line interface";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160374,7 +154429,6 @@ self: {
          template-haskell temporary text yaml
        ];
        doHaddock = false;
-       homepage = "https://github.com/PasswordManager/passman-core#readme";
        description = "Deterministic password generator core";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160403,7 +154457,6 @@ self: {
          base microlens microlens-th protolude semigroups text text-show
        ];
        testHaskellDepends = [ base hspec microlens protolude ];
-       homepage = "http://github.com/diogob/pasta#readme";
        description = "PostgreSQL Abstract Syntax Tree Assember";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160430,7 +154483,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring mtl ];
-       homepage = "http://github.com/markusle/pasty/tree/master";
        description = "A simple command line pasting utility";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160454,7 +154506,6 @@ self: {
          pandoc skylighting terminal-size text time unordered-containers
          yaml
        ];
-       homepage = "http://github.com/jaspervdj/patat";
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160495,7 +154546,6 @@ self: {
          llvm-extra llvm-tf non-empty pqueue storable-tuple tfp
          unordered-containers utility-ht vector
        ];
-       homepage = "http://hub.darcs.net/thielema/patch-image/";
        description = "Compose a big image from overlapping parts";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160515,7 +154565,6 @@ self: {
        testHaskellDepends = [
          base criterion doctest hspec QuickCheck vector
        ];
-       homepage = "https://github.com/liamoc/patches-vector";
        description = "Patches (diffs) on vectors: composable, mergeable, and invertible";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160567,7 +154616,6 @@ self: {
          attoparsec base path QuickCheck quickcheck-instances tasty
          tasty-quickcheck text
        ];
-       homepage = "https://github.com/athanclark/path-extra#readme";
        description = "URLs without host information";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160590,7 +154638,6 @@ self: {
        testHaskellDepends = [
          base directory exceptions hspec path transformers unix-compat
        ];
-       homepage = "https://github.com/mrkkrp/path-io";
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160621,7 +154668,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring path safe-exceptions text
        ];
-       homepage = "https://github.com/chris-martin/path-text-utf8";
        description = "Read and write UTF-8 text files";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -160633,7 +154679,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1d1vpkx4gl438b71mni80n46yrhz57z2hq2p9j2fkkpxj3k72y80";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/rvion/pathfinding";
        description = "pathfinding in grid and graphs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -160652,7 +154697,6 @@ self: {
        testHaskellDepends = [
          array base-noprelude bizzlelude tasty tasty-hunit
        ];
-       homepage = "http://github.com/TheBizzle";
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160689,7 +154733,6 @@ self: {
          transformers utility-ht
        ];
        testHaskellDepends = [ base random ];
-       homepage = "http://hub.darcs.net/thielema/pathtype/";
        description = "Type-safe replacement for System.FilePath etc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160702,7 +154745,6 @@ self: {
        sha256 = "148fapj00f59aa2igfq6hwrdcwcyslvrskmfvdia0crid9jd1q3n";
        libraryHaskellDepends = [ base directory filepath transformers ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/Xe/pathwalk";
        description = "Path walking utilities for Haskell programs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -160739,7 +154781,6 @@ self: {
        version = "0.0.2";
        sha256 = "13q7bj19hd60rnjfc05wxlyck8llxy11z3mns8kxg197wxrdkhkg";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://blog.functorial.com/posts/2013-10-27-Pretty-Printing-Arrows.html";
        description = "Arrows for Pretty Printing";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -160756,7 +154797,6 @@ self: {
          base bytestring conduit containers mtl time utf8-string
          zeromq-haskell
        ];
-       homepage = "http://github.com/toschoo/mom";
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160794,7 +154834,6 @@ self: {
          aeson base bytestring directory filepath HUnit test-framework
          test-framework-hunit text
        ];
-       homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160812,7 +154851,6 @@ self: {
          base bytestring conduit containers failure http-conduit http-types
          mtl old-locale text time wai
        ];
-       homepage = "http://projects.haskell.org/paypal-api/";
        description = "PayPal API, currently supporting \"ButtonManager\"";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160830,7 +154868,6 @@ self: {
          aeson base bytestring containers country-codes Decimal http-client
          http-types lens safe text time wreq
        ];
-       homepage = "https://github.com/meoblast001/paypal-rest-client";
        description = "A client to connect to PayPal's REST API (v1)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160867,7 +154904,6 @@ self: {
          base data-default either optparse-applicative text
        ];
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
-       homepage = "https://github.com/githubuser/pb-next#readme";
        description = "Utility CLI for working with protobuf files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160880,7 +154916,6 @@ self: {
        version = "0.1.1.5";
        sha256 = "16dki82d9x6rpkbax090ax8ynwjxv31cvpzpy51ynq83kjg3v2z9";
        libraryHaskellDepends = [ base hslua string-qq ];
-       homepage = "https://github.com/DavidFeng/pbc4hs";
        description = "pbc for HsLua";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -160900,7 +154935,6 @@ self: {
        testHaskellDepends = [
          base binary byteable bytedump bytestring cryptohash utf8-string
        ];
-       homepage = "https://github.com/cdornan/pbkdf";
        description = "Haskell implementation of the PBKDF functions from RFC-2898";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160912,7 +154946,6 @@ self: {
        version = "0.4.5.2";
        sha256 = "0pydw62qqw61sxfd8x9vvwgpgl3zp6mqv8rm4c825ymzyipjxsg7";
        libraryHaskellDepends = [ base bytestring network time ];
-       homepage = "https://github.com/bos/pcap";
        description = "A system-independent interface for user-level packet capture";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160926,7 +154959,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring conduit pcap transformers
        ];
-       homepage = "http://github.com/thoughtpolice/pcap-conduit";
        description = "Conduit <-> libpcap";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160941,7 +154973,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring enumerator pcap transformers
        ];
-       homepage = "http://github.com/cutsea110/pcap-enumerator";
        description = "Convert a pcap into an enumerator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -160998,7 +155029,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring containers vector zlib
        ];
-       homepage = "https://github.com/michael-swan/pcf-font";
        description = "PCF font parsing and rendering library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161014,7 +155044,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring pcf-font template-haskell vector
        ];
-       homepage = "https://github.com/michael-swan/pcf-font-embed";
        description = "Template Haskell for embedding text rendered using PCF fonts";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161031,7 +155060,6 @@ self: {
          base bytestring entropy primitive random
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/cchalmers/pcg-random";
        description = "Haskell bindings to the PCG random number generator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161047,7 +155075,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        testHaskellDepends = [ base hspec QuickCheck random ];
        benchmarkHaskellDepends = [ base criterion deepseq random ];
-       homepage = "https://github.com/Lokathor/pcgen-hs";
        description = "A fast, pseudorandom number generator";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -161065,7 +155092,6 @@ self: {
          string-conversions template-haskell
        ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/myfreeweb/pcre-heavy";
        description = "A regexp library on top of pcre-light you can actually use";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -161089,7 +155115,6 @@ self: {
        sha256 = "0xcyi1fivwg7a92mch5bcqzmrfxzqj42rmb3m8kgs61x4qwpxj82";
        libraryHaskellDepends = [ base bytestring ];
        libraryPkgconfigDepends = [ pcre ];
-       homepage = "https://github.com/Daniel-Diaz/pcre-light";
        description = "Portable regex library for Perl 5 compatible regular expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) pcre;};
@@ -161101,7 +155126,6 @@ self: {
        version = "0.0.0";
        sha256 = "1kjh36gglszd16rsh0rm2q5fxjlfipzld4hw0l2r23y0flbqkbvx";
        libraryHaskellDepends = [ base bytestring pcre-light ];
-       homepage = "http://github.com/urso/pcre-light-extra";
        description = "pcre-light extra functionality";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161119,7 +155143,6 @@ self: {
          array attoparsec base bytestring mtl regex-pcre-builtin vector
        ];
        testHaskellDepends = [ base bytestring HUnit regex-pcre-builtin ];
-       homepage = "https://github.com/bartavelle/pcre-utils";
        description = "Perl-like substitute and split for PCRE regexps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161145,7 +155168,6 @@ self: {
          aeson base bytestring optparse-applicative pdf-slave-template
          shelly system-filepath text transformers yaml
        ];
-       homepage = "https://github.com/NCrashed/pdf-slave#readme";
        description = "Tool to generate PDF from haskintex templates and YAML input";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161180,7 +155202,6 @@ self: {
        executableHaskellDepends = [
          base lens optparse-applicative text wai-extra warp
        ];
-       homepage = "https://github.com/NCrashed/pdf-slave-server#readme";
        description = "Web service for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161198,7 +155219,6 @@ self: {
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring containers text
        ];
-       homepage = "https://github.com/ncrashed/pdf-slave#readme";
        description = "Template format definition for pdf-slave tool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161215,7 +155235,6 @@ self: {
          attoparsec base base16-bytestring bytestring containers io-streams
          pdf-toolbox-core text
        ];
-       homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161232,7 +155251,6 @@ self: {
          attoparsec base bytestring containers errors io-streams scientific
          transformers zlib-bindings
        ];
-       homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161251,7 +155269,6 @@ self: {
          cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
          transformers
        ];
-       homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161272,7 +155289,6 @@ self: {
          pdf-toolbox-content pdf-toolbox-document process random text
          transformers
        ];
-       homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "Simple pdf viewer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161305,7 +155321,6 @@ self: {
        libraryHaskellDepends = [
          base mtl old-locale process-extras text time time-locale-compat
        ];
-       homepage = "https://github.com/chrisdone/pdfinfo";
        description = "Wrapper around the pdfinfo command";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161323,7 +155338,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath optparse-applicative pdfinfo text
        ];
-       homepage = "https://github.com/asr/pdfname#readme";
        description = "Name a PDF file using information from the pdfinfo command";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -161339,7 +155353,6 @@ self: {
        executableHaskellDepends = [
          base directory pdfinfo process temporary
        ];
-       homepage = "http://dmwit.com/pdfsplit";
        description = "split two-column PDFs, so there is one column per page";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161455,7 +155468,6 @@ self: {
          base bytestring containers cryptonite memory mtl protolude
          QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
-       homepage = "https://github.com/adjoint-io/pedersen-commitment#readme";
        description = "An implementation of Pedersen commitment schemes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -161473,7 +155485,6 @@ self: {
        executableHaskellDepends = [
          base containers filepath haskeline logict mtl parsec
        ];
-       homepage = "http://github.com/HackerFoo/peg";
        description = "a lazy non-deterministic concatenative programming language";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161493,7 +155504,6 @@ self: {
          base hashtables haskell-src-meta ListLike monad-control mtl
          template-haskell
        ];
-       homepage = "http://tanakh.github.com/Peggy";
        description = "The Parser Generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161512,7 +155522,6 @@ self: {
          arithmoi base Cabal cabal-test-quickcheck containers primes
          QuickCheck
        ];
-       homepage = "https://github.com/brunjlar/pell";
        description = "Package to solve the Generalized Pell Equation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161532,7 +155541,6 @@ self: {
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/vincenthz/hs-pem";
        description = "Privacy Enhanced Mail (PEM) format reader and writer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161556,7 +155564,6 @@ self: {
        ];
        executableHaskellDepends = [ base text unordered-containers ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/elben/pencil";
        description = "Static site generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161597,7 +155604,6 @@ self: {
          anonymous-sums base parsec QuickCheck random-shuffle semigroups
          tasty tasty-quickcheck text time transformers
        ];
-       homepage = "http://www.github.com/massysett/penny";
        description = "Extensible double-entry accounting system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161617,7 +155623,6 @@ self: {
          base containers explicit-exception multiarg parsec penny-lib
          pretty-show semigroups text transformers
        ];
-       homepage = "http://www.github.com/massysett/penny";
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161640,7 +155645,6 @@ self: {
          explicit-exception matchers multiarg ofx old-locale parsec prednote
          pretty-show rainbow semigroups split text time transformers
        ];
-       homepage = "http://www.github.com/massysett/penny";
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161660,7 +155664,6 @@ self: {
          ad aeson base containers gloss megaparsec old-time random text
          websockets
        ];
-       homepage = "http://penrose.ink";
        description = "A system that automatically visualize mathematics";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161673,7 +155676,6 @@ self: {
        version = "0.21";
        sha256 = "1qy8hghpvp9idiq4ksn55n1dpx7823s7mjfvqfgrmhj0xl1b1y54";
        libraryHaskellDepends = [ base binary bytestring haskell98 ];
-       homepage = "https://github.com/igraves/peparser-haskell";
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161715,7 +155717,6 @@ self: {
          base bytestring cognimeta-utils containers MonadRandom mtl
          QuickCheck template-haskell transformers
        ];
-       homepage = "https://github.com/Cognimeta/perdure";
        description = "Robust persistence for acyclic immutable data";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161758,7 +155759,6 @@ self: {
          vector
        ];
        testHaskellDepends = [ base doctest protolude ];
-       homepage = "https://github.com/tonyday567/perf#readme";
        description = "low-level performance statistics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161776,7 +155776,6 @@ self: {
          base containers deepseq foldl rdtsc text time transformers
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/tonyday567/perf#readme";
        description = "Low-level run time measurement";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161807,7 +155806,6 @@ self: {
          test-framework test-framework-hunit text unordered-containers
          vector
        ];
-       homepage = "https://github.com/kostmo/perfect-hash-generator#readme";
        description = "Perfect minimal hashing implementation in native Haskell";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -161849,7 +155847,6 @@ self: {
          base mtl transformers transformers-compat
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/perhaps/";
        description = "Perhaps, a monad";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -161869,7 +155866,6 @@ self: {
        ];
        executableHaskellDepends = [ base optparse-applicative text ];
        testHaskellDepends = [ base hspec HUnit text time ];
-       homepage = "https://github.com/w3rs/period";
        description = "Parse and format date periods, collapse and expand their text representations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161885,7 +155881,6 @@ self: {
        libraryHaskellDepends = [ base cereal hedis text time ];
        executableHaskellDepends = [ base cereal hedis text time ];
        testHaskellDepends = [ base cereal hedis hspec text time ];
-       homepage = "https://github.com/positiondev/periodic";
        description = "A reliable at-least-once periodic job scheduler backed by redis";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161903,7 +155898,6 @@ self: {
        testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/sonyandy/perm";
        description = "permutation Applicative and Monad with many mtl instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -161916,7 +155910,6 @@ self: {
        version = "0.5.0.5";
        sha256 = "005737s6k9dfpjmjf41m3k1wc31c2kql08ig7fd6npk22nhwmdai";
        libraryHaskellDepends = [ base ghc-prim QuickCheck ];
-       homepage = "https://github.com/spacekitteh/permutation";
        description = "A library for permutations and combinations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -161985,7 +155978,6 @@ self: {
          template-haskell th-data-compat transformers
        ];
        testHaskellDepends = [ base quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Binding between SQL database values and haskell records";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -162006,7 +155998,6 @@ self: {
        testHaskellDepends = [
          base relational-query relational-query-HDBC text-postgresql
        ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC and Relational-Record instances of PostgreSQL extended types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -162041,7 +156032,6 @@ self: {
          resourcet scientific tagged template-haskell text time transformers
          unordered-containers vector
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162077,7 +156067,6 @@ self: {
          scientific tagged template-haskell text time transformers
          unordered-containers vector
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, multi-backend data serialization";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
@@ -162119,7 +156108,6 @@ self: {
        version = "0.1.0";
        sha256 = "09akf8vpkn2jskf1vf9mq96sakqzr7mfs8hhri8qlbkwx3i5nr6f";
        libraryHaskellDepends = [ base cereal persistent text ];
-       homepage = "http://hub.darcs.net/co-dan/persistent-cereal";
        description = "Helper functions for writing Persistent instances";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162197,7 +156185,6 @@ self: {
          aeson aeson-iproute base bytestring http-api-data iproute
          path-pieces persistent text
        ];
-       homepage = "https://github.com/greydot/persistent-iproute";
        description = "Persistent instances for types in iproute";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -162214,7 +156201,6 @@ self: {
          base binary containers directory EdisonAPI EdisonCore filepath LRU
          mtl stm-io-hooks
        ];
-       homepage = "http://darcs.monoid.at/persistent-map";
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162235,7 +156221,6 @@ self: {
          http-api-data mongoDB network path-pieces persistent resource-pool
          resourcet text time transformers unliftio-core
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -162254,7 +156239,6 @@ self: {
          mysql mysql-simple persistent resource-pool resourcet text
          transformers unliftio-core
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -162279,7 +156263,6 @@ self: {
        executableHaskellDepends = [
          base monad-logger persistent persistent-template transformers
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "A pure haskell backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162302,7 +156285,6 @@ self: {
          monad-control monad-logger persistent persistent-template resourcet
          text time transformers
        ];
-       homepage = "https://github.com/gbwey/persistent-odbc";
        description = "Backend for the persistent library using ODBC";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162335,7 +156317,6 @@ self: {
          persistent postgresql-libpq postgresql-simple resource-pool
          resourcet text time transformers unliftio-core
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
@@ -162353,7 +156334,6 @@ self: {
          base bytestring persistent protocol-buffers
          protocol-buffers-descriptor template-haskell text
        ];
-       homepage = "https://github.com/mstone/persistent-protobuf";
        description = "Template-Haskell helpers for integrating protobufs with persistent";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162366,7 +156346,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m";
        libraryHaskellDepends = [ base time yesod ];
-       homepage = "https://github.com/jprider63/persistent-ratelimit";
        description = "A library for rate limiting activities with a persistent backend";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162405,7 +156384,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl ref-fd transformers
        ];
-       homepage = "https://github.com/acfoltzer/persistent-refs";
        description = "Haskell references backed by an IntMap for persistence and reversibility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -162428,7 +156406,6 @@ self: {
          base hlint HUnit persistent-template relational-query
          test-framework test-framework-hunit test-framework-th text time
        ];
-       homepage = "http://github.com/himura/persistent-relational-record";
        description = "relational-record on persisten backends";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162457,7 +156434,6 @@ self: {
          base hspec persistent persistent-template temporary text time
          transformers
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162487,7 +156463,6 @@ self: {
          base hspec persistent persistent-template temporary text time
          transformers
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using sqlite3";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
@@ -162513,7 +156488,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
@@ -162553,7 +156527,6 @@ self: {
          base hspec persistent resourcet scientific system-fileio
          system-filepath
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Tests for Persistent";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162572,7 +156545,6 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base containers criterion deepseq ];
-       homepage = "https://github.com/travitch/persistent-vector";
        description = "A persistent sequence based on array mapped tries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -162619,7 +156591,6 @@ self: {
          aeson base data-default-class jose lens network-uri text time
          unordered-containers
        ];
-       homepage = "https://github.com/frasertweedale/hs-persona";
        description = "Persona (BrowserID) library";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162642,7 +156613,6 @@ self: {
          directory filepath hamlet http-types jose lens optparse-applicative
          pem persona scotty shakespeare text time transformers unix wai x509
        ];
-       homepage = "https://github.com/frasertweedale/hs-persona-idp";
        description = "Persona (BrowserID) Identity Provider";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162658,7 +156628,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base process ];
-       homepage = "http://www.cs.chalmers.se/~aarne/pesca/";
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162686,7 +156655,6 @@ self: {
          base bytestring crypto-random handle-like network random stm x509
          x509-store
        ];
-       homepage = "https://github.com/YoshikuniJujo/peyotls/wiki";
        description = "Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162705,7 +156673,6 @@ self: {
          asn1-encoding asn1-types base bytable bytestring crypto-pubkey
          crypto-pubkey-types monads-tf word24 x509 x509-store
        ];
-       homepage = "https://github.com/YoshikuniJujo/peyotls/wiki";
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162723,7 +156690,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://brandon.si/code/pez-zipper-library-released/";
        description = "A Pretty Extraordinary Zipper library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162744,7 +156710,6 @@ self: {
        executableHaskellDepends = [
          async base ini postgresql-simple random scotty text transformers
        ];
-       homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162757,7 +156722,6 @@ self: {
        version = "0.5.0";
        sha256 = "0bqvrhkiwmqqp6w82d9xz7s31yjv2i0c3md0pc4fgvyr4gj2r2ki";
        libraryHaskellDepends = [ base bytestring HTTP ];
-       homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "Client library for pg-harness-server";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -162777,7 +156741,6 @@ self: {
          async base ini postgresql-simple random scotty text transformers
          warp
        ];
-       homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service for creating temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162804,7 +156767,6 @@ self: {
          base hasql hasql-pool hspec postgresql-libpq protolude
          resource-pool
        ];
-       homepage = "https://github.com/githubuser/pg-recorder#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162829,7 +156791,6 @@ self: {
          base bytestring mtl postgresql-libpq QuickCheck scientific
          test-framework test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/vapourismo/pg-store";
        description = "Simple storage interface to PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162852,7 +156813,6 @@ self: {
          base bytestring exceptions hspec hspec-discover postgresql-simple
          tmp-postgres
        ];
-       homepage = "https://github.com/jfischoff/pg-transact#readme";
        description = "Another postgresql-simple transaction monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162891,7 +156851,6 @@ self: {
        version = "0.1.4";
        sha256 = "1s3kch1qsxrfzk9sa4b0jn9vzjhw7dvh1sajgnnz97gl5y0gydmv";
        libraryHaskellDepends = [ array base bytestring parsec ];
-       homepage = "https://github.com/astanin/haskell-pgm";
        description = "Pure Haskell implementation of PGM image format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -162909,7 +156868,6 @@ self: {
          base bytestring deepseq doctest HUnit tasty tasty-hunit
          tasty-quickcheck text
        ];
-       homepage = "https://github.com/quchen/pgp-wordlist";
        description = "Translate between binary data and a human-readable collection of words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -162929,7 +156887,6 @@ self: {
          blaze-textual bytestring containers MonadCatchIO-transformers mtl
          network old-locale pcre-light text time utf8-string
        ];
-       homepage = "https://github.com/chrisdone/pgsql-simple";
        description = "A mid-level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162982,7 +156939,6 @@ self: {
        libraryHaskellDepends = [
          array base ghc-prim monad-st primitive vector
        ];
-       homepage = "http://github.com/glehel/phasechange";
        description = "Freezing, thawing, and copy elision";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -162995,7 +156951,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1ig3hcalfg2qxb092krii6zv95kvq0kng4acvq7l3wz03x66wj29";
        libraryHaskellDepends = [ base bytestring containers text ];
-       homepage = "https://github.com/quickdudley/phaser";
        description = "Incremental multiple pass parser library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163015,7 +156970,6 @@ self: {
          base doctest HUnit smallcheck tasty tasty-hunit tasty-smallcheck
        ];
        testSystemDepends = [ pHash ];
-       homepage = "http://github.com/michaelxavier/phash";
        description = "Haskell bindings to pHash, the open source perceptual hash library";
        license = stdenv.lib.licenses.gpl3;
      }) {pHash = null;};
@@ -163032,7 +156986,6 @@ self: {
          aeson base bytestring network network-uri regex-pcre text
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/b-mcg/phizzle#readme";
        description = "Library for checking if a given link is in a phishtank json file";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -163080,7 +157033,6 @@ self: {
          hslogger lens MissingH mtl parsec process resourcet safe
          safe-exceptions split text transformers
        ];
-       homepage = "https://github.com/phoityne/phoityne-vscode";
        description = "Haskell Debug Adapter for Visual Studio Code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163109,7 +157061,6 @@ self: {
        librarySystemDepends = [ phonenumber protobuf ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/christian-marie/phone-numbers";
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163128,7 +157079,6 @@ self: {
          base base16-bytestring binary bytestring conduit convertible
          HsOpenSSL http-conduit network time transformers
        ];
-       homepage = "https://github.com/gurgeh/haskell-phone-push";
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163141,7 +157091,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "0pjvjqxp37n901s16ys5qq5rzblamz8izvsd1992w06bcyrs36cw";
        libraryHaskellDepends = [ array base containers regex-compat ];
-       homepage = "http://wiki.cs.pdx.edu/bartforge/phonetic-code";
        description = "Phonetic codes: Soundex and Phonix";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163157,7 +157106,6 @@ self: {
        libraryHaskellDepends = [
          array base mtl reactive TypeCompose wx wxcore
        ];
-       homepage = "http://haskell.org/haskellwiki/Phooey";
        description = "Functional user interfaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163180,7 +157128,6 @@ self: {
          base directory exif filepath HUnit mtl old-locale parsec process
          regex-posix time unix
        ];
-       homepage = "http://hub.darcs.net/dino/photoname";
        description = "Rename photo image files based on EXIF shoot date";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163195,7 +157142,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl SDL transformers ];
-       homepage = "https://github.com/skypers/phraskell";
        description = "A fractal viewer";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163229,7 +157175,6 @@ self: {
          test-framework test-framework-hunit test-framework-th text time
          vector
        ];
-       homepage = "http://www.cs.indiana.edu/~rrnewton/projects/phybin/";
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163251,7 +157196,6 @@ self: {
          AES base binary byteable bytestring containers cryptohash HTTP
          io-streams mtl network parsec RSA transformers
        ];
-       homepage = "https://github.com/renzyq19/pi-calculus";
        description = "Applied pi-calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163276,7 +157220,6 @@ self: {
          array base containers directory filepath HUnit mtl parsec pretty
          QuickCheck transformers unbound-generics
        ];
-       homepage = "https://github.com/sweirich/pi-forall";
        description = "Demo implementation of typechecker for dependently-typed language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163322,7 +157265,6 @@ self: {
          base bytestring clock deepseq text unix unordered-containers
        ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/ppelleti/pi-lcd";
        description = "Control an Adafruit character LCD and keypad kit on a Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163343,7 +157285,6 @@ self: {
          http-client-tls network-info process random text text-format time
          xdg-basedir
        ];
-       homepage = "https://github.com/enolan/pia-forward";
        description = "Set up port forwarding with the Private Internet Access VPN service";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163382,7 +157323,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base hmatrix JuicyPixels vector ];
        executableHaskellDepends = [ base cli hmatrix ];
-       homepage = "https://github.com/mdibaiee/picedit#readme";
        description = "simple image manipulation functions";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -163405,7 +157345,6 @@ self: {
        testHaskellDepends = [
          base containers mtl picosat pretty QuickCheck
        ];
-       homepage = "https://github.com/sdiehl/picologic";
        description = "Utilities for symbolic predicate logic expressions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163437,7 +157376,6 @@ self: {
          directory filepath ghc-prim hashable http-types monoid-subclasses
          parsec scientific text unordered-containers vector
        ];
-       homepage = "https://bitbucket.org/blamario/picoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163451,7 +157389,6 @@ self: {
        sha256 = "0fch3s2q5g5sif6xqd69v0kbf41061vdviifr6l9aym70jp9yvas";
        libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [ base containers random rdtsc transformers ];
-       homepage = "https://github.com/sdiehl/haskell-picosat";
        description = "Bindings to the PicoSAT solver";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163483,7 +157420,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory process unix ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/fpco/pid1#readme";
        description = "Do signal handling and orphan reaping for Unix PID1 init processes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -163495,7 +157431,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1iriansay0vq1b6crd1gc86ghv6iqcrnpflsa5b22x1lrlvxcwmj";
        libraryHaskellDepends = [ base unix ];
-       homepage = "https://github.com/jonpetterbergman/pidfile";
        description = "Run an IO action protected by a pidfile";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163523,7 +157458,6 @@ self: {
          base Cabal directory optparse-applicative shake split
          unordered-containers
        ];
-       homepage = "https://github.com/judah/pier#readme";
        description = "Yet another Haskell build system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163570,7 +157504,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base mtl parsec text ];
-       homepage = "http://www.mew.org/~kazu/proj/piki/";
        description = "Yet another text-to-html converter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163596,7 +157529,6 @@ self: {
          safe-exceptions semigroups text time transformers
          unordered-containers
        ];
-       homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -163618,7 +157550,6 @@ self: {
          base bytestring containers hspec hspec-discover QuickCheck text
          unordered-containers vector
        ];
-       homepage = "https://github.com/abhinav/pinch#readme";
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163637,7 +157568,6 @@ self: {
          base containers Earley lens pretty-show semigroups template-haskell
          transformers
        ];
-       homepage = "http://www.github.com/massysett/pinchot";
        description = "Write grammars, not parsers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163660,7 +157590,6 @@ self: {
        testHaskellDepends = [
          attoparsec base hspec iproute QuickCheck quickcheck-text
        ];
-       homepage = "https://github.com/frincon/ping-parser-attoparsec";
        description = "Attoparsec parsers of ping utility";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -163684,7 +157613,6 @@ self: {
          base optparse-applicative optparse-generic
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/frincon/ping-wrapper";
        description = "Haskell Ping wrapper";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -163719,7 +157647,6 @@ self: {
          time transformers warp
        ];
        testHaskellDepends = [ base doctest protolude ];
-       homepage = "https://github.com/quixoftic/pinpon#readme";
        description = "A gateway for various cloud notification services";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163732,7 +157659,6 @@ self: {
        version = "0.3.0.2";
        sha256 = "0h6k00k85pn0jajk3rvvfnrfwlkllprhv00x0qd9zg9gg7lf7zkc";
        libraryHaskellDepends = [ base enumerator pipes transformers ];
-       homepage = "https://github.com/zadarnowski/pipe-enumerator";
        description = "A bidirectional bridge between pipes and iteratees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163749,7 +157675,6 @@ self: {
        executableHaskellDepends = [
          base bytestring editor-open Hclip safe
        ];
-       homepage = "https://github.com/pharpend/pipeclip";
        description = "Open your editor, pipe the output to the system clipboard";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -163789,7 +157714,6 @@ self: {
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
-       homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163811,7 +157735,6 @@ self: {
          base hspec lifted-async lifted-base monad-control pipes pipes-safe
          stm transformers-base
        ];
-       homepage = "https://github.com/jwiegley/pipes-async";
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163831,7 +157754,6 @@ self: {
          attoparsec base HUnit mmorph pipes pipes-parse tasty tasty-hunit
          text transformers
        ];
-       homepage = "https://github.com/k0001/pipes-attoparsec";
        description = "Attoparsec and Pipes integration";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163890,7 +157812,6 @@ self: {
          base binary bytestring ghc-prim lens-family-core pipes pipes-parse
          smallcheck tasty tasty-hunit tasty-smallcheck transformers
        ];
-       homepage = "https://github.com/k0001/pipes-binary";
        description = "Encode and decode binary streams using the pipes and binary libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163908,7 +157829,6 @@ self: {
          base bytestring pipes pipes-group pipes-parse text
        ];
        testHaskellDepends = [ base bytestring mtl pipes QuickCheck ];
-       homepage = "https://github.com/mindreader/pipes-break";
        description = "Pipes to group by any delimiter (such as lines with carriage returns)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163950,7 +157870,6 @@ self: {
          pipes-bytestring pipes-safe QuickCheck random
        ];
        benchmarkHaskellDepends = [ base ];
-       homepage = "https://github.com/chemist/pipes-bzip";
        description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163968,7 +157887,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring cacophony pipes ];
        testHaskellDepends = [ base hlint ];
-       homepage = "https://github.com/centromere/pipes-cacophony#readme";
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -163984,7 +157902,6 @@ self: {
        sha256 = "008733qffml0cqgalacrl1r8sdz08rbsz4n2pd5j9xrbxn4xh4a7";
        libraryHaskellDepends = [ base lens mtl pipes pipes-extras ];
        testHaskellDepends = [ base hspec pipes transformers ];
-       homepage = "https://github.com/louispan/pipes-category#readme";
        description = "Allows instances for Category, Arrow and ArrowChoice for Pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163996,7 +157913,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "0j0ayzvc9k3fmd9j37p41z50nqp4hwyywashcvng23qgp7m4ahdc";
        libraryHaskellDepends = [ base bytestring data-cell pipes ];
-       homepage = "https://github.com/zadarnowski/pipes-cellular";
        description = "Pipes-based combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164011,7 +157927,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring data-cell pipes pipes-cellular
        ];
-       homepage = "https://github.com/zadarnowski/pipes-cellular-csv";
        description = "Efficient pipes-based cellular CSV codec";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164043,7 +157958,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal-plus errors mtl pipes pipes-bytestring text
        ];
-       homepage = "https://github.com/nikita-volkov/pipes-cereal-plus";
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164062,7 +157976,6 @@ self: {
        libraryHaskellDepends = [
          async base bytestring pipes pipes-safe process stm unix
        ];
-       homepage = "http://www.github.com/massysett/pipes-cliff";
        description = "Streaming to and from subprocesses using Pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164090,7 +158003,6 @@ self: {
        version = "0.0.1";
        sha256 = "1nzylhmi3f2m0xnqgx0m9g0p5pwl6xnidsz8ykzmv8wafrh60dh8";
        libraryHaskellDepends = [ base conduit mtl pipes-core ];
-       homepage = "https://github.com/pcapriotti/pipes-extra";
        description = "Conduit adapters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164107,7 +158019,6 @@ self: {
        libraryHaskellDepends = [
          base categories lifted-base monad-control transformers void
        ];
-       homepage = "https://github.com/pcapriotti/pipes-core";
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164120,7 +158031,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1v2bm2cmzb6a7bmpv8byrb5x4k5pivp3s8ma6r6dwhldic294jgf";
        libraryHaskellDepends = [ base courier pipes ];
-       homepage = "http://github.com/kvanberendonck/pipes-courier";
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164155,7 +158065,6 @@ self: {
        version = "0.3";
        sha256 = "1vbpchs3v08sc1rfa9fl89wzxg9ak823xjbkl0k37ycwwc36fn76";
        libraryHaskellDepends = [ base errors pipes ];
-       homepage = "https://github.com/jdnavarro/pipes-errors";
        description = "Integration between pipes and errors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164184,7 +158093,6 @@ self: {
          base bytestring conduit criterion enumerator pipes-core pipes-zlib
          transformers zlib zlib-conduit zlib-enum
        ];
-       homepage = "https://github.com/pcapriotti/pipes-extra";
        description = "Various basic utilities for Pipes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164246,7 +158154,6 @@ self: {
          hspec-expectations mtl pipes pipes-safe process semigroups text
          transformers unix
        ];
-       homepage = "https://github.com/jwiegley/pipes-files";
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164270,7 +158177,6 @@ self: {
          async base constraints hspec lens lifted-async mmorph monad-control
          mtl pipes pipes-concurrency pipes-misc stm transformers
        ];
-       homepage = "https://github.com/louispan/pipes-fluid#readme";
        description = "Reactively combines Producers so that a value is yielded as soon as possible";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164318,7 +158224,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory filepath pipes pipes-bgzf
        ];
-       homepage = "http://github.com/rcallahan/pipes-illumina";
        description = "Illumina NGS data processing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164331,7 +158236,6 @@ self: {
        version = "1.1.2";
        sha256 = "0anjd66z0z7813jcakqcagp4ml8q4dg6bvygy8mn2jqggm2bqs4d";
        libraryHaskellDepends = [ base containers heaps pipes ];
-       homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164364,7 +158268,6 @@ self: {
          base bytestring exceptions hw-kafka-client monad-logger pipes
          pipes-safe text transformers transformers-base
        ];
-       homepage = "https://github.com/boothead/pipes-kafka";
        description = "Kafka in the Pipes ecosystem";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -164388,7 +158291,6 @@ self: {
          base contravariant data-default-class lens pipes pipes-text
          QuickCheck reflection text transformers vinyl vinyl-utils
        ];
-       homepage = "https://github.com/marcinmrotek/key-value-csv";
        description = "Streaming processing of CSV files preceded by key-value pairs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164406,7 +158308,6 @@ self: {
        testHaskellDepends = [
          base bytestring lens mtl pipes pipes-group QuickCheck
        ];
-       homepage = "https://github.com/mindreader/pipes-lines";
        description = "Pipes for grouping by lines with carriage returns";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164427,7 +158328,6 @@ self: {
        testHaskellDepends = [
          base bytestring pipes pipes-bytestring QuickCheck
        ];
-       homepage = "http://github.com/bgamari/pipes-lzma";
        description = "LZMA compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164449,7 +158349,6 @@ self: {
        testHaskellDepends = [
          base hspec lens mmorph pipes pipes-concurrency stm transformers
        ];
-       homepage = "https://github.com/louispan/pipes-misc#readme";
        description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164470,7 +158369,6 @@ self: {
        testHaskellDepends = [
          base hspec lens mmorph pipes pipes-concurrency stm transformers
        ];
-       homepage = "https://github.com/louispan/pipes-misc#readme";
        description = "Miscellaneous utilities for pipes, required by glazier-tutorial";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164484,7 +158382,6 @@ self: {
        sha256 = "0h4334fajrza7r8jrr78nqhs522kxnbzdj0gnbp7ndvzvx5ij888";
        libraryHaskellDepends = [ base monad-control mongoDB pipes ];
        testHaskellDepends = [ base monad-control mongoDB pipes text ];
-       homepage = "http://github.com/jb55/pipes-mongodb";
        description = "Stream results from MongoDB";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
@@ -164502,7 +158399,6 @@ self: {
          base bytestring exceptions network network-simple pipes pipes-safe
          transformers
        ];
-       homepage = "https://github.com/k0001/pipes-network";
        description = "Use network sockets together with the pipes library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164520,7 +158416,6 @@ self: {
          base bytestring network network-simple network-simple-tls pipes
          pipes-network pipes-safe tls transformers
        ];
-       homepage = "https://github.com/k0001/pipes-network-tls";
        description = "TLS-secured network connections support for pipes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164539,7 +158434,6 @@ self: {
          async base binary bytestring errors exceptions mtl network
          network-simple-sockaddr pipes pipes-concurrency pipes-network
        ];
-       homepage = "https://github.com/jdnavarro/pipes-p2p";
        description = "P2P network nodes with pipes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164559,7 +158453,6 @@ self: {
          base binary bytestring containers errors mtl network
          network-simple-sockaddr pipes pipes-network pipes-p2p
        ];
-       homepage = "https://github.com/jdnavarro/pipes-p2p-examples";
        description = "Examples using pipes-p2p";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164611,7 +158504,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mckeankylej/pipes-protolude#readme";
        description = "Alternate Prelude for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164626,7 +158518,6 @@ self: {
        revision = "1";
        editedCabalFile = "0m32wz3rwxx9gdcl1chk64yspyd1ls13z03zcgjcn865mpbhz97h";
        libraryHaskellDepends = [ base mwc-random pipes vector ];
-       homepage = "https://github.com/fosskers/pipes-random";
        description = "Producers for handling randomness";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164641,7 +158532,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mwc-random pipes time ];
        executableHaskellDepends = [ base pipes time ];
-       homepage = "http://github.com/ImAlsoGreg/pipes-rt";
        description = "A few pipes to control the timing of yields";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164667,7 +158557,6 @@ self: {
          base bytestring exceptions pipes pipes-bytestring pipes-safe
          QuickCheck tasty tasty-quickcheck text
        ];
-       homepage = "http://github.com/bgamari/pipes-s3";
        description = "A simple interface for streaming data to and from Amazon S3";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164737,7 +158626,6 @@ self: {
          base bytestring pipes pipes-bytestring pipes-group pipes-parse
          pipes-safe streaming-commons text transformers
        ];
-       homepage = "https://github.com/michaelt/text-pipes";
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164793,7 +158681,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder bytestring http-types pipes transformers wai
        ];
-       homepage = "http://github.com/iand675/pipes-wai";
        description = "A port of wai-conduit for the pipes ecosystem";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -164812,7 +158699,6 @@ self: {
          base pipes pipes-concurrency text transformers websockets
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/silky/pipes-websockets#readme";
        description = "WebSockets in the Pipes framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164830,7 +158716,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring pipes pipes-safe semigroups zeromq4-haskell
        ];
-       homepage = "https://github.com/peddie/pipes-zeromq4";
        description = "Pipes integration for ZeroMQ messaging";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164843,10 +158728,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-zlib";
-       version = "0.4.4.1";
-       sha256 = "1sdxhb3000k57ck1mbasdwaxmkmw2bbh2m1ry3fvpgsilq91xb4g";
-       revision = "1";
-       editedCabalFile = "1vjvbww9b0892p1r1vz3biim3r5zaxkg8ks8w9cj2nc6i0bs7qy1";
+       version = "0.4.4.2";
+       sha256 = "0s42dnack5yasbx958dshhlhq58qd41vw2plwr9c20d6lkd95wh5";
        libraryHaskellDepends = [
          base bytestring pipes streaming-commons transformers
        ];
@@ -164854,7 +158737,6 @@ self: {
          base bytestring HUnit pipes QuickCheck quickcheck-instances tasty
          tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/k0001/pipes-zlib";
        description = "Zlib and GZip compression and decompression for Pipes streams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -164897,7 +158779,6 @@ self: {
        executableHaskellDepends = [
          base bytestring optparse-applicative text unordered-containers yaml
        ];
-       homepage = "https://github.com/chiro/haskell-pit";
        description = "Account management tool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164965,7 +158846,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec JuicyPixels QuickCheck
        ];
-       homepage = "https://github.com/ExcaliburZero/pixelated-avatar-generator";
        description = "A library and application for generating pixelated avatars";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164978,7 +158858,6 @@ self: {
        version = "1.0.2";
        sha256 = "1598gj6r6mv3z68qir1rgjk4p73w0k2fwkkban04s97xf86a0669";
        libraryHaskellDepends = [ base bytestring random ];
-       homepage = "http://sep07.mroot.net/";
        description = "RSA encryption with PKCS1 padding";
        license = "GPL";
      }) {};
@@ -165000,7 +158879,6 @@ self: {
          asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem
          QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509
        ];
-       homepage = "https://github.com/fcomb/pkcs10-hs#readme";
        description = "PKCS#10 library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165014,7 +158892,6 @@ self: {
        sha256 = "0i4hpy9rmc49apsmadz72prgmkb13ww575v8flhdymd3dkjn6b52";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring Cabal HUnit QuickCheck ];
-       homepage = "https://github.com/kisom/pkcs7";
        description = "PKCS #7 padding in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165041,7 +158918,6 @@ self: {
        version = "0.2";
        sha256 = "172dsg1krxqamq8ids9xwyfqidr9z0qq4nmbq4rk2x62g4q0960c";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/singpolyma/pktree-haskell";
        description = "Implementation of the PKTree spatial index data structure";
        license = "unknown";
      }) {};
@@ -165053,7 +158929,6 @@ self: {
        version = "0.1";
        sha256 = "0ih35n2pw5gr9ggj2xz5zfcs4bdk200fdw6q9hdy3xna7maphak5";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/ahammar/placeholders";
        description = "Placeholders for use while developing Haskell code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165065,7 +158940,6 @@ self: {
        version = "0.6.0";
        sha256 = "13hqkz0p3c81d7v3qnbcf90cxyb15na9icfjch4hw0222i6kn21i";
        libraryHaskellDepends = [ base bytestring mtl time unix ];
-       homepage = "https://secure.plaimi.net/works/plailude";
        description = "plaimi's prelude";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165106,7 +158980,6 @@ self: {
          base exceptions path path-io transformers
        ];
        testHaskellDepends = [ base hspec path path-io ];
-       homepage = "https://github.com/mrkkrp/plan-b";
        description = "Failure-tolerant file and directory editing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165147,7 +159020,6 @@ self: {
          lens mtl random safe-exceptions tasty tasty-hunit text th-format
          unliftio-core
        ];
-       homepage = "https://github.com/mtesseract/planb-token-introspection#readme";
        description = "Token Introspection for PlanB";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165159,7 +159031,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "049dqzxygj81kzb5zqpw8cc3ql1hakwl3j84dzqhrc6vk6r9a50q";
        libraryHaskellDepends = [ adjunctions base protolude ];
-       homepage = "https://github.com/chessai/plankton";
        description = "The core of a numeric prelude, taken from numhask";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165197,7 +159068,6 @@ self: {
          optparse-applicative text vector yaml
        ];
        testHaskellDepends = [ base containers fgl hspec vector ];
-       homepage = "https://github.com/chlablak/platinum-parsing";
        description = "General Framework for compiler development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165222,7 +159092,6 @@ self: {
        testHaskellDepends = [
          base bytestring doctest filepath hspec text
        ];
-       homepage = "https://github.com/pjones/playlists";
        description = "Library and executable for working with playlist files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165241,7 +159110,6 @@ self: {
          attoparsec base bytestring exceptions http-client mtl playlists
          text transformers
        ];
-       homepage = "https://github.com/pjones/playlists-http";
        description = "Library to glue together playlists and http-client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165260,7 +159128,6 @@ self: {
        testHaskellDepends = [
          async base bytestring deepseq hspec QuickCheck unix
        ];
-       homepage = "https://github.com/phlummox/hs-plex#readme";
        description = "run a subprocess, combining stdout and stderr";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165317,7 +159184,6 @@ self: {
          aeson base blaze-builder bytestring errors http-streams http-types
          io-streams network-uri old-locale time unexceptionalio
        ];
-       homepage = "https://github.com/singpolyma/plivo-haskell";
        description = "Plivo API wrapper for Haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165348,7 +159214,6 @@ self: {
        libraryHaskellDepends = [
          array base cairo colour hmatrix mtl pango transformers
        ];
-       homepage = "http://github.com/amcphail/plot";
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165360,7 +159225,6 @@ self: {
        version = "0.2.0.4";
        sha256 = "1fq75kg8f1sm9bmn89w5c54arr2y1xv0lswbvnxc4rmfc98l82lw";
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
-       homepage = "http://code.haskell.org/plot";
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165377,7 +159241,6 @@ self: {
        libraryHaskellDepends = [
          base cairo colour fixed-vector gtk hmatrix plot text vector
        ];
-       homepage = "https://github.com/sumitsahrawat/plot-gtk-ui";
        description = "A quick way to use Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165392,7 +159255,6 @@ self: {
        libraryHaskellDepends = [
          base glib gtk3 hmatrix mtl plot process
        ];
-       homepage = "http://code.haskell.org/plot";
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165409,7 +159271,6 @@ self: {
        executableHaskellDepends = [
          base colour gtk hmatrix plot text vector
        ];
-       homepage = "https://github.com/sumitsahrawat/plot-lab";
        description = "A plotting tool with Mathematica like Manipulation abilities";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165436,7 +159297,6 @@ self: {
          text time
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/ocramz/plot-light";
        description = "A lightweight plotting library, exporting to SVG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165455,7 +159315,6 @@ self: {
          histogram-fill mtl scientific text time vector
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/ocramz/plot-light";
        description = "A lightweight plotting library, exporting to SVG";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165477,7 +159336,6 @@ self: {
          attoparsec attoparsec-time base blaze-svg colour plot-light
          scientific text time
        ];
-       homepage = "https://github.com/ocramz/plot-light-examples";
        description = "Example binaries for plot-light";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165507,7 +159365,6 @@ self: {
          aeson base blaze-html blaze-markup bytestring lucid microlens
          microlens-th text
        ];
-       homepage = "https://github.com/filopodia/open/plotlyhs";
        description = "Haskell bindings to Plotly.js";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -165527,7 +159384,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/ishiy1993/ploton#readme";
        description = "A useful cli tool to draw figures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165553,7 +159409,6 @@ self: {
          mtl optparse-applicative process profunctors semigroupoids
          semigroups split statistics time transformers vector
        ];
-       homepage = "http://github.com/cchalmers/plots";
        description = "Diagrams based plotting library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165582,7 +159437,6 @@ self: {
          array base Cabal containers directory filepath ghc ghc-paths
          ghc-prim haskell-src process random
        ];
-       homepage = "https://github.com/stepcut/plugins";
        description = "Dynamic linking for Haskell and C objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165634,6 +159488,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "plur" = callPackage
+    ({ mkDerivation, base, semigroups }:
+     mkDerivation {
+       pname = "plur";
+       version = "0.1.0.0";
+       sha256 = "0xak3xsq57x3h0n6i3pps938ba00sn5a2dy9jh9m01sraqqk3c24";
+       libraryHaskellDepends = [ base semigroups ];
+       description = "Plurality monad: Zero, one, or at least two";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "plural" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec }:
      mkDerivation {
@@ -165676,7 +159541,6 @@ self: {
        libraryHaskellDepends = [
          array base binary-file bytestring monads-tf template-haskell zlib
        ];
-       homepage = "https://skami.iocikun.jp/haskell/packages/png-file";
        description = "read/write png file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165735,7 +159599,6 @@ self: {
          aeson base http-client http-client-tls servant servant-client text
          transformers
        ];
-       homepage = "https://github.com/jpvillaisaza/pocket-haskell";
        description = "Bindings for the Pocket API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165789,7 +159652,6 @@ self: {
          AC-Vector base hspec markdown-unlit QuickCheck random
          random-shuffle
        ];
-       homepage = "https://github.com/mlitchard/point-octree";
        description = "Point octree, with bounding boxes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165809,7 +159671,6 @@ self: {
          semigroupoids semigroups stm tagged transformers
          transformers-compat unordered-containers
        ];
-       homepage = "http://github.com/ekmett/pointed/";
        description = "Pointed and copointed data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165821,7 +159682,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "12l380hgl17l0jxdx38kipvnip6gz4p9n27n03h9q37k5qhzjfha";
        libraryHaskellDepends = [ base mtl semigroups transformers ];
-       homepage = "http://ircbrowse.net/browse/haskell?q=manyLazy";
        description = "Alternative done right";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165902,7 +159762,6 @@ self: {
          base containers haskell-src-exts-simple mtl syb transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/23Skidoo/pointful";
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165915,7 +159774,6 @@ self: {
        version = "1.1.0.6";
        sha256 = "0m5hwd0mr7bmb2sbs1qa7l65xrr5h2wjznknsrk1ga08qkd5jp6h";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Some common point-free combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165927,7 +159785,6 @@ self: {
        version = "0.0.9";
        sha256 = "0f0bnd6dyi1ancdxd2hkszshws9d8jz8iamz5pir0i4nsj69mqyx";
        libraryHaskellDepends = [ base GHood process syb ];
-       homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Haskell";
        description = "Pointless Haskell library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -165943,7 +159800,6 @@ self: {
        libraryHaskellDepends = [
          base containers derive pointless-haskell process QuickCheck
        ];
-       homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Lenses";
        description = "Pointless Lenses library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165977,7 +159833,6 @@ self: {
          base bytestring containers data-default-class lens-family
          proto-lens text
        ];
-       homepage = "https://github.com/relrod/pokemon-go-protobuf-types";
        description = "Haskell types for the Pokemon Go protobuf protocol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166008,7 +159863,6 @@ self: {
          aeson base base64-string bytestring case-insensitive directory hex
          HTTP http-client http-conduit http-types strict text time
        ];
-       homepage = "https://platform.pokitdok.com";
        description = "PokitDok Platform API Client for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166021,7 +159875,6 @@ self: {
        version = "0.0.1";
        sha256 = "1f0anpxc57vxa5z0x4wrfay0g1sw2qwnz5nkz74y9vmh8vd99kkh";
        libraryHaskellDepends = [ base ];
-       homepage = "http://space.k-hornz.de/polar";
        description = "Complex numbers in polar form";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166066,7 +159919,6 @@ self: {
          base binary containers dawg directory filepath mtl polysoup text
          text-binary transformers
        ];
-       homepage = "https://github.com/kawu/polh/tree/master/lexicon";
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166081,7 +159933,6 @@ self: {
        libraryHaskellDepends = [
          base binary containers text text-binary
        ];
-       homepage = "https://github.com/kawu/polimorf";
        description = "Working with the PoliMorf dictionary";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166128,7 +159979,6 @@ self: {
        version = "1.0.0";
        sha256 = "044xsfpxwp3h7vsx86y2d099qmgiiknslmh3jjfnbr2qy9aj73r6";
        libraryHaskellDepends = [ base lens ];
-       homepage = "https://github.com/wdanilo/poly-control";
        description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166171,7 +160021,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1wdi8a1s235knb98bmhfqvy7qbqvj804dx6rn846x8aj50drjjqv";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/clintonmead/polydata-core#readme";
        description = "Core data definitions for the \"polydata\" package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166226,7 +160075,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector vector-space
        ];
-       homepage = "https://github.com/mokus0/polynomial";
        description = "Polynomials";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166250,7 +160098,6 @@ self: {
        version = "1.12";
        sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "http://code.haskell.org/~malcolm/polyparse/";
        description = "A variety of alternative parser combinator libraries";
        license = "LGPL";
      }) {};
@@ -166285,7 +160132,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq polyparse tagsoup
        ];
-       homepage = "https://github.com/kawu/polysoup";
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166320,9 +160166,10 @@ self: {
        pname = "polyvariadic";
        version = "0.3.0.3";
        sha256 = "0zf7znslayjmcnajmsymc79f0lyyk7ph9zfczq78inirg0hv7hq1";
+       revision = "1";
+       editedCabalFile = "11jrr3xbkc828564sg3cc6ca1qaibbp43lbyrgi32kjy5l97w7y0";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/fgaz/polyvariadic";
        description = "Creation and application of polyvariadic functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166346,7 +160193,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq lattices random vector
        ];
-       homepage = "https://github.com/sgraf812/pomaps#readme";
        description = "Maps and sets of partial orders";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -166389,7 +160235,6 @@ self: {
          base hdaemonize optparse-applicative protolude text time
        ];
        testHaskellDepends = [ base hspec protolude ];
-       homepage = "https://github.com/kqr/pomohoro#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166402,7 +160247,6 @@ self: {
        version = "0.0.1";
        sha256 = "1nq4z063g429hxwf4vbyyr2b2s7sn325m0h6ggf793inlj48ci0h";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "https://gihub.com/matt76k/ponder";
        description = "PEG parser combinator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166421,7 +160265,6 @@ self: {
          network
        ];
        testHaskellDepends = [ base hspec network QuickCheck ];
-       homepage = "http://github.com/RobertFischer/pong-server#readme";
        description = "A simple embedded pingable server that runs in the background";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166441,7 +160284,6 @@ self: {
          base HDBC HDBC-sqlite3 hlogger pontarius-xmpp pontarius-xpmn
          xml-types
        ];
-       homepage = "http://www.pontarius.org/projects/pontarius-mediaserver/";
        description = "Extended Personal Media Network (XPMN) media server";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166482,7 +160324,6 @@ self: {
          xml-types
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/pontarius/pontarius-xmpp/";
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166499,7 +160340,6 @@ self: {
        libraryHaskellDepends = [
          base containers pontarius-xmpp random text xml-types
        ];
-       homepage = "http://www.pontarius.org/projects/pontarius-xpmn/";
        description = "Extended Personal Media Network (XPMN) library";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166514,7 +160354,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://www.ascii-art.de/ascii/uvw/unicorn.txt";
        description = "Can I have a pony?";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166528,7 +160367,6 @@ self: {
        revision = "1";
        editedCabalFile = "0lf9m19hl5asyb85xc8h34kh0iqpfdpwzil4lm5lskvn4fbi77n7";
        libraryHaskellDepends = [ base monad-control transformers ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Thread-safe resource pools. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166547,7 +160385,6 @@ self: {
        libraryHaskellDepends = [
          base monad-control resource-pool resourcet transformers
        ];
-       homepage = "http://www.yesodweb.com/book/persistent";
        description = "Resource pool allocations via ResourceT. (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166567,7 +160404,6 @@ self: {
          base concurrent-split containers deepseq transformers unsafe
          utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/pooled-io/";
        description = "Run jobs on a limited number of threads and support data dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166580,7 +160416,6 @@ self: {
        sha256 = "0kfcfxfwg5rjm7qx9r0ssdvkrvca95hflahrip1hi5wbplf224xv";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base mtl network ];
-       homepage = "https://github.com/tmrudick/haskell-pop3-client/";
        description = "POP3 Client Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166593,7 +160428,6 @@ self: {
        sha256 = "01pb8g5zl99zccnjnkwklfgaz1pqjp1xrgz5b3qy45nclyln0bm4";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory haskell98 unix ];
-       homepage = "http://www.haskell.org/~petersen/haskell/popenhs/";
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166614,7 +160448,6 @@ self: {
          array base bytestring cairo containers glib gtk mtl
        ];
        libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ];
-       homepage = "http://projects.haskell.org/gtk2hs";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166628,7 +160461,6 @@ self: {
        version = "1.0";
        sha256 = "06z723fgqwvcxgxy63pqwmjb6xkcl69xmdry117f0i5rhy0aix3y";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mietek/populate-setup-exe-cache/";
        description = "Empty Cabal package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -166670,7 +160502,6 @@ self: {
          text transformers
        ];
        testHaskellDepends = [ base containers hspec mtl QuickCheck text ];
-       homepage = "https://github.com/j1r1k/portager";
        description = "DSL for configuring Gentoo portage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166684,7 +160515,6 @@ self: {
        sha256 = "0vxlfn2462fmknj94sd5ajbm3lydy3z8mrqb3vgh47wwn0sq8sk3";
        libraryHaskellDepends = [ base containers ];
        librarySystemDepends = [ portaudio ];
-       homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
      }) {inherit (pkgs) portaudio;};
@@ -166726,7 +160556,6 @@ self: {
        version = "0.4.3.2";
        sha256 = "1ixyrg4k1f91v2r485r2fs8bgq373bhvg02mza5jdcb1amyfi7rm";
        libraryHaskellDepends = [ base haskell98 unix ];
-       homepage = "http://www.cse.unsw.edu.au/~chak/haskell/ports/";
        description = "The Haskell Ports Library";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166739,7 +160568,6 @@ self: {
        version = "0.0.1";
        sha256 = "0bs7b88qiczf59dliqhbxbzciv4xi07b6djspgpydigyrf5maac6";
        libraryHaskellDepends = [ base directory process ];
-       homepage = "http://github.com/ppenzin/hs-ports-tools/";
        description = "Library to interact with port tools on FreeBSD";
        license = "unknown";
      }) {};
@@ -166768,7 +160596,6 @@ self: {
          template-haskell text
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/xtendo-org/positron#readme";
        description = "Experiment";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -166786,7 +160613,6 @@ self: {
          transformers-base unix
        ];
        librarySystemDepends = [ acl ];
-       homepage = "https://github.com/tensor5/posix-acl";
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) acl;};
@@ -166798,7 +160624,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1462njrxsfb26xavpwji17p172bsy6ivicsjzfvh8sq60rqyzjv1";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/kerscher/posix-error-codes";
        description = "POSIX error codes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166821,7 +160646,6 @@ self: {
        version = "0.1";
        sha256 = "106rrbw4d0f13wcj19m6h0vy3v53j11bawqd3q4r0pcsypk53qmk";
        libraryHaskellDepends = [ base transformers unix ];
-       homepage = "https://github.com/singpolyma/posix-filelock-haskell";
        description = "Nice wrapper around POSIX fcntl advisory locks";
        license = "unknown";
      }) {};
@@ -166856,7 +160680,6 @@ self: {
        libraryHaskellDepends = [ base bytestring process unix ];
        librarySystemDepends = [ util ];
        testHaskellDepends = [ base bytestring process ];
-       homepage = "https://bitbucket.org/merijnv/posix-pty";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166886,7 +160709,6 @@ self: {
          base bytestring data-default-class data-flags network-ip
          transformers-base unix
        ];
-       homepage = "https://github.com/mvv/posix-socket";
        description = "Bindings to the POSIX socket API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166898,7 +160720,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "01s9hd23xcgdnryi72vj635435ccryv98a911l0zipxmvq4d8ri8";
        libraryHaskellDepends = [ base transformers-base unix ];
-       homepage = "https://github.com/mvv/posix-timer";
        description = "Bindings to POSIX clock and timer functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166924,7 +160745,6 @@ self: {
        version = "0.1.0.5";
        sha256 = "1iiyz3yf5rwcdawrbawdrx3fwrhb1s62ram6yavfwkvc7j9rfvzx";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tolysz/possible";
        description = "Three valued Data.Maybe";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166947,7 +160767,6 @@ self: {
        version = "0.1.1";
        sha256 = "1z0d5pl11jymd0jj1k50si35lq2af3y0apiyz6mbi25zl5x49bi8";
        libraryHaskellDepends = [ aeson base bytestring HTTP ];
-       homepage = "https://github.com/mattyhall/haskell-postcodes";
        description = "A library that gets postcode information from the uk-postcodes.com";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166967,7 +160786,6 @@ self: {
        testHaskellDepends = [
          base bytestring filepath postgresql-simple process
        ];
-       homepage = "https://github.com/ilya-murzinov/postgres-embedded";
        description = "Library for easily running embedded PostgreSQL server for tests";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -166980,7 +160798,6 @@ self: {
        version = "0.2.0";
        sha256 = "1zx5inxczzlhyb5f89f92f0ngzln49qahzraqr6ksvi5r7n7gk86";
        libraryHaskellDepends = [ base bytestring postgresql-simple text ];
-       homepage = "https://github.com/cocreature/postgres-tmp#readme";
        description = "Create a temporary database that is deleted after performing some operation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167016,7 +160833,6 @@ self: {
          hspec-wai-json http-types protolude stm unordered-containers
          wai-extra
        ];
-       homepage = "https://github.com/diogob/postgres-websockets#readme";
        description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167047,7 +160863,6 @@ self: {
          quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167065,7 +160880,6 @@ self: {
          aeson base bytestring monad-control mtl postgresql-simple
          resource-pool time
        ];
-       homepage = "https://bitbucket.org/s9gf4ult/postgresql-config";
        description = "Types for easy adding postgresql configuration to your program";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167083,7 +160897,6 @@ self: {
          base bytestring exceptions lens mtl postgresql-simple resource-pool
          resourcet time transformers-base
        ];
-       homepage = "http://github.com/mfine/postgresql-connector";
        description = "Initial project postgresql-connector from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167095,7 +160908,6 @@ self: {
        version = "0.1";
        sha256 = "063phxj8r3vy25awwwn47k9ac0s8z59igpgqrhb9gbfdq4ldrlpm";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/joeyadams/hs-postgresql-copy-escape";
        description = "Format data to feed to a PostgreSQL COPY FROM statement";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167118,7 +160930,6 @@ self: {
        version = "1.0.1";
        sha256 = "1r1dv1pi1z16q0v1329g2j856j3afdlhv42qhgdabl9p4wyrvm76";
        libraryHaskellDepends = [ bytestring ];
-       homepage = "https://github.com/nikita-volkov/postgresql-error-codes";
        description = "PostgreSQL error codes";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -167132,7 +160943,6 @@ self: {
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base bytestring unix ];
        librarySystemDepends = [ postgresql ];
-       homepage = "https://github.com/lpsmith/postgresql-libpq";
        description = "low-level binding to libpq";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) postgresql;};
@@ -167150,7 +160960,6 @@ self: {
          postgresql-simple utf8-string
        ];
        testHaskellDepends = [ base generics-sop hspec postgresql-simple ];
-       homepage = "https://github.com/cocreature/postgresql-named#readme";
        description = "Generic deserialization of PostgreSQL rows based on column names";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167210,7 +161019,6 @@ self: {
          quickcheck-assertions quickcheck-instances tasty tasty-hunit
          tasty-quickcheck tasty-th text time
        ];
-       homepage = "https://bitbucket.org/s9gf4ult/postgresql-query";
        description = "Sql interpolating quasiquote plus some kind of primitive ORM using it";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167233,7 +161041,6 @@ self: {
        executableHaskellDepends = [
          base basic-prelude optparse-applicative shelly text time
        ];
-       homepage = "https://github.com/mfine/postgresql-schema";
        description = "PostgreSQL Schema Management";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167264,6 +161071,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple_0_5_4_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , cryptohash, filepath, hashable, HUnit, postgresql-libpq
+     , scientific, tasty, tasty-golden, tasty-hunit, template-haskell
+     , text, time, transformers, uuid-types, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-simple";
+       version = "0.5.4.0";
+       sha256 = "0xrsyx25v5z06qziy32wlb3lvkyci3nxkbb25nis21vkj3kimlgm";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring bytestring-builder
+         case-insensitive containers hashable postgresql-libpq scientific
+         template-haskell text time transformers uuid-types vector
+       ];
+       testHaskellDepends = [
+         aeson base base16-bytestring bytestring containers cryptohash
+         filepath HUnit tasty tasty-golden tasty-hunit text time vector
+       ];
+       description = "Mid-Level PostgreSQL client library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple-bind" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, data-default
      , exceptions, heredoc, hspec, postgresql-simple, template-haskell
@@ -167304,11 +161136,34 @@ self: {
          postgresql-simple text time
        ];
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       homepage = "https://github.com/ameingast/postgresql-simple-migration";
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "postgresql-simple-migration_0_1_12_0" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
+     , directory, hspec, postgresql-simple, text, time
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-migration";
+       version = "0.1.12.0";
+       sha256 = "18sx8ila7w7k4ym4rs36dc48v0cdl3b4il5jfqyfcx34n3mb5y4q";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple time
+       ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring cryptohash directory
+         postgresql-simple text time
+       ];
+       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
+       description = "PostgreSQL Schema Migrations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-simple-opts" = callPackage
     ({ mkDerivation, base, bytestring, data-default, either
      , generic-deriving, hspec, optparse-applicative, optparse-generic
@@ -167327,7 +161182,6 @@ self: {
          base bytestring data-default hspec optparse-applicative
          postgresql-simple
        ];
-       homepage = "https://github.com/jfischoff/postgresql-simple-opts#readme";
        description = "An optparse-applicative parser for postgresql-simple's connection options";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167353,7 +161207,6 @@ self: {
          pg-transact postgresql-simple random split stm text time
          transformers
        ];
-       homepage = "https://github.com/jfischoff/postgresql-queue#readme";
        description = "A PostgreSQL backed queue";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167366,7 +161219,6 @@ self: {
        version = "0.2";
        sha256 = "05plsdm4i4nw35pcbbk1yb91gpj6jq5hygsqijdmnsxyl9d6vbby";
        libraryHaskellDepends = [ base generics-sop postgresql-simple ];
-       homepage = "https://github.com/openbrainsrc/postgresql-simple-sop";
        description = "Generic functions for postgresql-simple";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167384,7 +161236,6 @@ self: {
          base postgresql-libpq postgresql-simple template-haskell
          transformers typedquery utf8-string
        ];
-       homepage = "https://github.com/tolysz/postgresql-simple-typed";
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167404,7 +161255,6 @@ self: {
        testHaskellDepends = [
          base postgresql-simple tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/futurice/postgresql-simple-url";
        description = "Parse postgres:// url into ConnectInfo";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167421,7 +161271,6 @@ self: {
        libraryHaskellDepends = [ base base-prelude bytestring text ];
        librarySystemDepends = [ pg_query ];
        testHaskellDepends = [ rerebase ];
-       homepage = "https://github.com/nikita-volkov/postgresql-syntax";
        description = "PostgreSQL SQL syntax utilities";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167459,7 +161308,6 @@ self: {
          base bytestring containers convertible HDBC HUnit network
          QuickCheck time
        ];
-       homepage = "https://github.com/dylex/postgresql-typed";
        description = "PostgreSQL interface with compile-time SQL type checking, optional HDBC backend";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167477,7 +161325,6 @@ self: {
          base base-unicode-symbols bytestring exceptions lens monad-control
          postgresql-typed transformers-base
        ];
-       homepage = "https://gitlab.com/theunixman/postgresql-typed-lifted";
        description = "postgresql-typed operations lifted to any instance of MonadBase or MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167523,7 +161370,6 @@ self: {
          lens-aeson monad-control process protolude regex-tdfa
          transformers-base wai wai-extra
        ];
-       homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167560,7 +161406,6 @@ self: {
          hspec-wai-json http-types protolude stm unordered-containers
          wai-extra
        ];
-       homepage = "https://github.com/diogob/postgrest-ws#readme";
        description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167600,7 +161445,6 @@ self: {
          aeson attoparsec base bytestring containers http-client-tls
          http-types network-api-support text
        ];
-       homepage = "https://github.com/apiengine/postmark";
        description = "Library for postmarkapp.com HTTP Api";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167636,7 +161480,6 @@ self: {
          base bytestring containers directory hopenssl hsdns hsemail hsyslog
          mtl network old-time parsec unix
        ];
-       homepage = "http://github.com/peti/postmaster";
        description = "Postmaster ESMTP Server";
        license = "GPL";
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -167651,7 +161494,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base binary bytestring split ];
-       homepage = "https://github.com/RossMeikleham/Potato_Tool";
        description = "Command line Dreamcast VMU filesystem toolset";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167677,7 +161519,6 @@ self: {
          attoparsec QuickCheck quickcheck-instances random rerebase tasty
          tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/metrix-ai/potoki";
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167694,7 +161535,6 @@ self: {
        libraryHaskellDepends = [
          base base-prelude bytestring cereal potoki potoki-core text
        ];
-       homepage = "https://github.com/metrix-ai/potoki-cereal";
        description = "Streaming serialization";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167714,7 +161554,6 @@ self: {
          QuickCheck quickcheck-instances rerebase tasty tasty-hunit
          tasty-quickcheck
        ];
-       homepage = "https://github.com/metrix-ai/potoki-core";
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167726,12 +161565,11 @@ self: {
      }:
      mkDerivation {
        pname = "potoki-hasql";
-       version = "1.4";
-       sha256 = "1ahdmc98pkfvbj8z1ds6xfzrj77wqbagfkn9jfzsz14z2m2rw8b2";
+       version = "1.5";
+       sha256 = "1pxl1fcw1khp4gbhpranv685ri67995d76nisx7ba7l2vg438mn8";
        libraryHaskellDepends = [
          base bytestring hasql potoki potoki-core profunctors text vector
        ];
-       homepage = "https://github.com/metrix-ai/potoki-hasql";
        description = "Integration of \"potoki\" and \"hasql\"";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167762,7 +161600,6 @@ self: {
        revision = "1";
        editedCabalFile = "1iwsxi5zkqqjf9wr460bqjpghcvjhpgqgk27a11ji6bpdf6gnhga";
        libraryHaskellDepends = [ base diagrams-lib JuicyPixels potrace ];
-       homepage = "http://projects.haskell.org/diagrams/";
        description = "Potrace bindings for the diagrams library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167778,7 +161615,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory unix ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ppelleti/powermate";
        description = "bindings for Griffin PowerMate USB";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -167790,7 +161626,6 @@ self: {
        version = "0.0.1";
        sha256 = "0z3nqv8l9h0kwdaqb2vnk7vx5d0hmx02giv2k01llk7vznlkqqny";
        libraryHaskellDepends = [ base ];
-       homepage = "http://tomahawkins.org";
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167805,7 +161640,6 @@ self: {
        sha256 = "1xhlv9gpj03cy2fq5aszvglp3ix85hg5c7zgxz99ss2pkb9hvi6r";
        libraryHaskellDepends = [ async base contravariant timespan ];
        testHaskellDepends = [ async base hspec stm ];
-       homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A flexible job queue with exchangeable backends";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167824,7 +161658,6 @@ self: {
          powerqueue text timespan
        ];
        testHaskellDepends = [ async base hspec powerqueue stm timespan ];
-       homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A distributed worker backend for powerqueu";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167852,7 +161685,6 @@ self: {
          base cereal criterion powerqueue temporary
        ];
        benchmarkSystemDepends = [ leveldb snappy ];
-       homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A high performance in memory and LevelDB backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167867,7 +161699,6 @@ self: {
        libraryHaskellDepends = [
          aws-simple base powerqueue text timespan
        ];
-       homepage = "https://github.com/agrafix/powerqueue#readme";
        description = "A Amazon SQS backend for powerqueue";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167880,7 +161711,6 @@ self: {
        version = "2009.5.13";
        sha256 = "0nzvxi1ybfxb1zqkbfqfic8j3mf3r6i2zdyjf7x41rz6m6lhqfcy";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://github.com/nfjinjing/ppm/tree/master";
        description = "a tiny PPM image generator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167901,7 +161731,6 @@ self: {
          base boxes containers HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       homepage = "https://github.com/gdevanla/pptable#readme";
        description = "Pretty Print containers in a tabular format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -167924,7 +161753,6 @@ self: {
          base boxes containers HUnit markdown-unlit QuickCheck tasty
          tasty-hunit tasty-quickcheck vector
        ];
-       homepage = "https://github.com/gdevanla/pptable#readme";
        description = "Pretty Print containers in a tabular format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167937,7 +161765,6 @@ self: {
        version = "0.8";
        sha256 = "1n71qhlxn9js5cizyqdq9f7m08m5j0354871r8b47bnzdi2kqkc4";
        libraryHaskellDepends = [ base QuickCheck random stm ];
-       homepage = "http://hub.darcs.net/shelarcy/pqc";
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167985,7 +161812,6 @@ self: {
        executableHaskellDepends = [
          base bytestring data-default directory json mps
        ];
-       homepage = "http://github.com/nfjinjing/practice-room";
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168007,7 +161833,6 @@ self: {
          semigroups string-convert template-haskell text time
          unordered-containers vector
        ];
-       homepage = "https://github.com/tdammers/praglude";
        description = "A pragmatic Prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168025,7 +161850,6 @@ self: {
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck vector-space
        ];
-       homepage = "https://github.com/leftaroundabout/pragmatic-show";
        description = "Alternative Show class that gives shorter view if possible";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -168047,7 +161871,6 @@ self: {
          template-haskell text text-manipulate time transformers-base
          unordered-containers uuid
        ];
-       homepage = "https://github.com/swift-nav/preamble";
        description = "Yet another prelude";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -168066,7 +161889,6 @@ self: {
          base Cabal containers cpphs directory filepath haskell-src-exts
          xhtml
        ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Diff Cabal packages";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168084,7 +161906,6 @@ self: {
          base bifunctors bytestring containers mtl text text-show
        ];
        testHaskellDepends = [ base doctest QuickCheck ];
-       homepage = "https://github.com/oisdk/precursor#readme";
        description = "Prelude replacement";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -168155,7 +161976,6 @@ self: {
          mtl poly-arity pred-set QuickCheck semigroups sets strict text
          tries unordered-containers
        ];
-       homepage = "https://github.com/athanclark/pred-trie#readme";
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168190,7 +162010,6 @@ self: {
        version = "0.1.0";
        sha256 = "0n1ilbr3zs8gaji37xn5iab5nwk02my3g18x8bci6pp8znisrbi0";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/esoeylemez/predictive";
        description = "Predict the future, backtrack on failure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168212,7 +162031,6 @@ self: {
          base bytestring containers contravariant QuickCheck rainbow split
          tasty tasty-quickcheck tasty-th text transformers
        ];
-       homepage = "http://www.github.com/massysett/prednote";
        description = "Evaluate and display trees of predicates";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168236,7 +162054,6 @@ self: {
          barecheck base containers prednote QuickCheck quickpull rainbow
          rainbow-tests text
        ];
-       homepage = "http://www.github.com/massysett/prednote";
        description = "Tests and QuickCheck generators to accompany prednote";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168250,7 +162067,6 @@ self: {
        sha256 = "0brw6rrykfsg67ckcfs3d5x4n7m8c6vbnh9hqrk1iq9whlz6vpwy";
        libraryHaskellDepends = [ base regex-pcre-builtin ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/VonFry/prefix-expression";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -168267,7 +162083,6 @@ self: {
          base Cabal HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/iustin/prefix-units";
        description = "A basic library for SI/binary prefix units";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168310,7 +162125,6 @@ self: {
          ghc-prim integer-gmp lens mtl safe StateVar stm text
          text-conversions time tuple unordered-containers vector
        ];
-       homepage = "https://github.com/jxv/pregame";
        description = "Prelude for applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -168332,7 +162146,6 @@ self: {
          mono-traversable-instances mtl parallel stm-conduit
          string-conversions
        ];
-       homepage = "http://github.com/kerscher/preliminaries";
        description = "A larger alternative to the Prelude";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168356,7 +162169,6 @@ self: {
        version = "0.4";
        sha256 = "0ms63ggqciin92qld07cx6110n534idk38hzj7c69jw68cz3bw1f";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/emilaxelsson/prelude-edsl";
        description = "An EDSL-motivated subset of the Prelude";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168368,7 +162180,6 @@ self: {
        version = "0.4.0.3";
        sha256 = "0xzqdf3nl2h0ra4gnslm1m1nsxlsgc0hh6ky3vn578vh11zhifq9";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/ekmett/prelude-extras";
        description = "Higher order versions of Prelude classes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168417,7 +162228,6 @@ self: {
        version = "0.1.1.2";
        sha256 = "09wp6b7bvnp2wz0kigwm4vfca74phh3bbpqybqdgm60isfaz3yfl";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "A redefinition of the Prelude's Enum class in order to render it safe";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168469,7 +162279,6 @@ self: {
        testHaskellDepends = [
          base directory haskell-src-exts hspec process temporary
        ];
-       homepage = "http://github.com/meditans/preprocessor#readme";
        description = "Remove cpp annotations to get the source ready for static analysis";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168482,7 +162291,6 @@ self: {
        version = "1.0.1";
        sha256 = "0ngfmvw6hvbr52i01n180ls4c8rx2wk2rka6g6igpvy9x2gwjin9";
        libraryHaskellDepends = [ base mtl parsec syb ];
-       homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168494,7 +162302,6 @@ self: {
        version = "2.0.2";
        sha256 = "0m825wnz7vs3as10glfzy7j0laf6j9w566isly95005gj2sb0lwp";
        libraryHaskellDepends = [ base mtl parsec syb ];
-       homepage = "https://github.com/tov/preprocessor-tools-hs";
        description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168510,7 +162317,6 @@ self: {
        editedCabalFile = "0pabxck7iyhyj7wf1bflg86xb2jip4vaspf080rfdc5s2cg0d23w";
        libraryHaskellDepends = [ base containers pretty ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://github.com/yav/presburger";
        description = "A decision procedure for quantifier-free linear arithmetic";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168522,7 +162328,6 @@ self: {
        version = "4.1.0";
        sha256 = "0ys2ibfh518r9rg9bl2m5cmyfxmri47g8wg7q0n5fcbsh4sb7s5s";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/chrisdone/present";
        description = "Make presentations for data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168534,7 +162339,6 @@ self: {
        version = "0.1.2";
        sha256 = "0aa3079az8bazyzqxxhx575vxr4a0p3wvlgh765w3k01vh6dkzgf";
        libraryHaskellDepends = [ base containers json mtl parsec ];
-       homepage = "http://github.com/bickfordb/text-press";
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168580,7 +162384,6 @@ self: {
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://github.com/haskell/pretty";
        description = "Pretty-printing library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168593,7 +162396,6 @@ self: {
        version = "1.0.1.1";
        sha256 = "1qdfp2kpahzflq9a3idwmb0pqs4l7almxn5rbw5gp2pmdx81p3am";
        libraryHaskellDepends = [ base pretty ];
-       homepage = "https://github.com/ddssff/pretty-class";
        description = "Pretty printing class similar to Show";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168628,7 +162430,6 @@ self: {
        libraryHaskellDepends = [ base pretty-show text ];
        executableHaskellDepends = [ ansi-wl-pprint base pretty-show ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/githubuser/pretty-display#readme";
        description = "Typeclass for human-readable display";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168642,7 +162443,6 @@ self: {
        libraryHaskellDepends = [
          base basic-prelude bytestring pretty-show
        ];
-       homepage = "https://github.com/jml/pretty-error";
        description = "Pretty error messages for runtime invariants";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -168682,7 +162482,6 @@ self: {
          base genvalidity-hspec genvalidity-time hspec QuickCheck time
          validity validity-time
        ];
-       homepage = "https://github.com/NorfairKing/pretty-relative-time#readme";
        description = "Pretty relative time";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168704,7 +162503,6 @@ self: {
        ];
        libraryToolDepends = [ happy ];
        executableHaskellDepends = [ base ];
-       homepage = "http://wiki.github.com/yav/pretty-show";
        description = "Tools for working with derived `Show` instances and generic inspection of values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -168725,7 +162523,6 @@ self: {
        ];
        libraryToolDepends = [ happy ];
        executableHaskellDepends = [ base ];
-       homepage = "http://wiki.github.com/yav/pretty-show";
        description = "Tools for working with derived `Show` instances and generic inspection of values";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168746,7 +162543,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest Glob ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/cdepillabout/pretty-simple";
        description = "pretty printer for data types with a 'Show' instance";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168772,7 +162568,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/loganmac/pretty-terminal#readme";
        description = "Styling and coloring terminal output with ANSI escape sequences";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168796,7 +162591,6 @@ self: {
        sha256 = "0kvqp39q1qydgf6rlrabgjcgv53irdh9xvw2p7hazbls178ljv75";
        libraryHaskellDepends = [ base mtl tagged ];
        testHaskellDepends = [ base hspec tagged ];
-       homepage = "https://github.com/sheyll/pretty-types#readme";
        description = "A small pretty printing DSL for complex types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168843,7 +162637,6 @@ self: {
          ansi-wl-pprint base containers criterion deepseq mtl QuickCheck
          random text transformers
        ];
-       homepage = "http://github.com/quchen/prettyprinter";
        description = "A modern, easy to use, well-documented, extensible prettyprinter";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -168857,7 +162650,6 @@ self: {
        sha256 = "0ha6vz707qzb5ky7kdsnw2zgphg2dnxrpbrxy8gaw119vwhb9q6k";
        libraryHaskellDepends = [ ansi-terminal base prettyprinter text ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/quchen/prettyprinter";
        description = "ANSI terminal backend for the »prettyprinter« package";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -168871,7 +162663,6 @@ self: {
        revision = "3";
        editedCabalFile = "0vzi7id60pfj35xp61akzvfx9x6py45r5b8343i48ljpir91rvgw";
        libraryHaskellDepends = [ base prettyprinter text ];
-       homepage = "http://github.com/quchen/prettyprinter";
        description = "Prettyprinter compatibility module for previous users of the annotated-wl-pprint package";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -168889,7 +162680,6 @@ self: {
        libraryHaskellDepends = [
          base prettyprinter prettyprinter-ansi-terminal text
        ];
-       homepage = "http://github.com/quchen/prettyprinter";
        description = "Drop-in compatibility package to migrate from »ansi-wl-pprint« to »prettyprinter«";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -168903,7 +162693,6 @@ self: {
        revision = "3";
        editedCabalFile = "0cb1i1hmr6wl8lacy3w822h273lapqhp537snxgbmhf9xvfckbpr";
        libraryHaskellDepends = [ base prettyprinter text ];
-       homepage = "http://github.com/quchen/prettyprinter";
        description = "Prettyprinter compatibility module for previous users of the wl-pprint package";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -168923,7 +162712,6 @@ self: {
          prettyprinter-ansi-terminal text
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/quchen/prettyprinter";
        description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -168951,7 +162739,6 @@ self: {
        libraryHaskellDepends = [
          base containers pretty strict-data text util-plus
        ];
-       homepage = "https://github.com/factisresearch/opensource-mono#readme";
        description = "The method of previewing data (instead of wholly show-ing it)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168963,7 +162750,6 @@ self: {
        version = "0.2.2";
        sha256 = "0lr7qni6wfiazn2gj6hnlkfzxdwvfhfqfkacj43w26s34irda4g3";
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
-       homepage = "https://github.com/andrewthad/prim-array#readme";
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168975,7 +162761,6 @@ self: {
        version = "0.1";
        sha256 = "0fyjxpk4xllkh3r5b7fbb4sb6whxwbdm5lr9zn44qb9v4g0nx2d8";
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
-       homepage = "https://github.com/andrewthad/prim-array#readme";
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -168991,7 +162776,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim spoon ];
        testHaskellDepends = [ base HUnit QuickCheck spoon ];
        benchmarkHaskellDepends = [ base criterion ghc-prim spoon ];
-       homepage = "https://github.com/michaeljklein/prim-spoon";
        description = "Catch errors thrown from pure computations using primops";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169003,7 +162787,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1zssi4zaihjaf3an10ar39d4qb155wcl1j66aymfrr9z2f2rf1gv";
        libraryHaskellDepends = [ base dependent-sum primitive ];
-       homepage = "https://github.com/mokus0/prim-uniq";
        description = "Opaque unique identifiers in primitive state monads";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -169015,7 +162798,6 @@ self: {
        version = "0.2.1.0";
        sha256 = "0ny6fzr967d1fifk050k95j9snnbjjif2bxf3v9s93k3zdc6bmkl";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/sebfisch/primes";
        description = "Efficient, purely functional generation of prime numbers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169029,7 +162811,6 @@ self: {
        libraryHaskellDepends = [ base deepseq primes ];
        testHaskellDepends = [ base HTF primes ];
        benchmarkHaskellDepends = [ base criterion primes ];
-       homepage = "https://github.com/kindaro/primes-type#readme";
        description = "Type-safe prime numbers";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -169045,7 +162826,6 @@ self: {
        libraryHaskellDepends = [ base foundation ];
        executableHaskellDepends = [ base foundation ];
        executableSystemDepends = [ primesieve ];
-       homepage = "https://github.com/sighingnow/computations/tree/master/primesieve#readme";
        description = "FFI bindings for the primesieve library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169060,7 +162840,6 @@ self: {
        revision = "1";
        editedCabalFile = "1v4q1mz08fzagp4xpbw5ifmymlrsw380yccdvhcgqfrl2lrgb2zf";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169074,7 +162853,6 @@ self: {
        sha256 = "0mcmbnj08wd6zfwn7xk6zf5hy5zwbla5v78pw0dpymqg9s0gzpnd";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        testHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/haskell/primitive";
        description = "Primitive memory-related operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169086,7 +162864,6 @@ self: {
        version = "0.6.3.0";
        sha256 = "02097f658qidmcfaisrcl4k3vmipx8w8p6mcbnajc8ndb3m58bbl";
        libraryHaskellDepends = [ base primitive ];
-       homepage = "https://github.com/andrewthad/primitive-checked#readme";
        description = "primitive functions with bounds-checking";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169124,7 +162901,6 @@ self: {
          happstack-server happstack-state hsp MissingH mtl old-locale
          old-time random regex-posix split time
        ];
-       homepage = "http://kagami.touhou.ru/projects/show/primula";
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169144,7 +162920,6 @@ self: {
        executableHaskellDepends = [
          base ConfigFile directory HTTP mtl network parsec utf8-string XMPP
        ];
-       homepage = "http://kagami.touhou.ru/projects/show/primula";
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169162,7 +162937,6 @@ self: {
          aeson base hashable singletons template-haskell text
          unordered-containers vector vinyl
        ];
-       homepage = "https://github.com/andrewthad/pringletons";
        description = "Classes and data structures complementing the singletons library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169175,7 +162949,6 @@ self: {
        version = "1.1.9";
        sha256 = "10c4dsf0kz5ydbx5gr8dzcd280l6nj8dd6h77k56ggy5icnhx6p8";
        libraryHaskellDepends = [ base split ];
-       homepage = "https://github.com/JohnReedLOL/HaskellPrintDebugger";
        description = "Debug print formatting library";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169193,7 +162966,6 @@ self: {
        testHaskellDepends = [
          base containers hspec HUnit lens mtl QuickCheck transformers
        ];
-       homepage = "https://github.com/m0rphism/printcess/";
        description = "Pretty printing with indentation, mixfix operators, and automatic line breaks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169236,7 +163008,6 @@ self: {
        libraryHaskellDepends = [
          base hscolour pretty-show pretty-simple text transformers
        ];
-       homepage = "https://github.com/evturn/prints";
        description = "The Artist Formerly Known as Prints";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169250,7 +163021,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base xosd ];
-       homepage = "http://code.haskell.org/~dons/code/printxosd";
        description = "Simple tool to display some text on an on-screen display";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169262,7 +163032,6 @@ self: {
        version = "0.2.2";
        sha256 = "0nsiil0yl32m80a1kpg3z0wd5fxwkpz2lzf66pa06iy24q0rz5lf";
        libraryHaskellDepends = [ base containers queue reord stateref ];
-       homepage = "http://code.haskell.org/~mokus/priority-queue";
        description = "Simple implementation of a priority queue";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169332,7 +163101,6 @@ self: {
          base convertible HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/ixmatus/prizm";
        description = "Convert colors to different color spaces, interpolate colors, and transform colors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169348,7 +163116,6 @@ self: {
        libraryHaskellDepends = [
          base containers random transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming";
        description = "Probabilistic Functional Programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169367,7 +163134,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion mwc-random mwc-random-monad vector
        ];
-       homepage = "http://github.com/alpmestan/probable";
        description = "Easy and reasonably efficient probabilistic programming and random generation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169435,7 +163201,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit conduit-extra hspec resourcet
        ];
-       homepage = "http://github.com/snoyberg/process-conduit";
        description = "Conduits for processes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169454,7 +163219,6 @@ self: {
          process text
        ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -169473,7 +163237,6 @@ self: {
        testHaskellDepends = [
          base bytestring cpphs iterIO process transformers
        ];
-       homepage = "https://github.com/garious/process-iterio";
        description = "IterIO Process Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169503,7 +163266,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring deepseq ListLike process text
        ];
-       homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169521,7 +163283,6 @@ self: {
          base bytestring deepseq HUnit ListLike mtl process process-listlike
          text time unix utf8-string
        ];
-       homepage = "https://src.seereason.com/process-progress";
        description = "Run a process and do reportsing on its progress";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169539,7 +163300,6 @@ self: {
          base bytestring enumerator mtl process shakespeare-text
          template-haskell text
        ];
-       homepage = "http://github.com/tanakh/process-qq";
        description = "Quasi-Quoters for exec process";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169608,7 +163368,6 @@ self: {
          base data-default GLUT hsnoise NumInstances OpenGL random time
          transformers utf8-string vector-space
        ];
-       homepage = "https://github.com/anton-k/processing-for-haskell";
        description = "Computer graphics for kids and artists with Processing implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169624,7 +163383,6 @@ self: {
        libraryHaskellDepends = [
          array attoparsec base bytestring containers deepseq mtl
        ];
-       homepage = "https://github.com/takenobu-hs/processor-creative-kit";
        description = "a creation kit for instruction sets and cpu simulators and development tools";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169648,7 +163406,6 @@ self: {
        version = "1.0.2";
        sha256 = "12px0nk7j74hyfzcvxacd9020gk3cd3ijqb7fjmmg8y33354jkc4";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/gcross/procrastinating-variable";
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169661,7 +163418,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1md75jc32nfnvs7ygf1mna00gl0wmimp2lkdcs9r9v0iy4b1hr5m";
        libraryHaskellDepends = [ attoparsec base bytestring ];
-       homepage = "http://closure.ath.cx/procstat";
        description = "get information on processes in Linux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169681,7 +163437,6 @@ self: {
        executableHaskellDepends = [
          base bytestring hspec HUnit process QuickCheck text
        ];
-       homepage = "https://github.com/nh2/proctest";
        description = "An IO library for testing interactive command line programs";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -169699,7 +163454,6 @@ self: {
          base checkers QuickCheck tasty tasty-auto tasty-hunit
          tasty-quickcheck
        ];
-       homepage = "https://github.com/etorreborre/producer-hs#readme";
        description = "Simple streaming datatype";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169725,7 +163479,6 @@ self: {
        sha256 = "1yqpfdbdq0zh69mbpgns8faj0ajc9a8wgp3c8sgn373py2as9jxl";
        libraryHaskellDepends = [ base template-haskell th-data-compat ];
        testHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/khibino/haskell-product-isomorphic";
        description = "Weaken applicative functor on products";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169743,7 +163496,6 @@ self: {
        ];
        testHaskellDepends = [ base profunctors ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169761,7 +163513,6 @@ self: {
        ];
        testHaskellDepends = [ base profunctors ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169778,7 +163529,6 @@ self: {
        executableHaskellDepends = [
          base containers filepath haskell98 parsec
        ];
-       homepage = "http://antiope.com/downloads.html";
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169798,7 +163548,6 @@ self: {
        executableHaskellDepends = [
          base containers filepath haskell-src-exts semigroups uniplate zenc
        ];
-       homepage = "https://gitorious.org/prof2pretty";
        description = "generate pretty source from time/allocation profiles";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169818,7 +163567,6 @@ self: {
          base containers directory extra filepath ghc-prof hashable
          scientific text
        ];
-       homepage = "https://github.com/ndmitchell/profiterole#readme";
        description = "Restructure GHC profile reports";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169839,7 +163587,6 @@ self: {
          aeson base bytestring containers filepath ghc-prof js-jquery
          scientific text unordered-containers vector
        ];
-       homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169853,7 +163600,6 @@ self: {
        sha256 = "10j458liqlyz5s9gkg95c6aq7ap5fa7d8pc7hygy71nn87pm2g4a";
        libraryHaskellDepends = [ base profunctors ];
        doHaddock = false;
-       homepage = "http://github.com/ekmett/profunctor-extras/";
        description = "This package has been absorbed into profunctors 4.0";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169872,7 +163618,6 @@ self: {
          base base-orphans bifunctors comonad contravariant distributive
          semigroups tagged transformers
        ];
-       homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169896,7 +163641,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1mdzwbzkf9ja7i21hds26gqn2ll4hnidbcq145yigkfzv93r6hq6";
        libraryHaskellDepends = [ ansi-terminal async base stm ];
-       homepage = "https://github.com/esoeylemez/progress-meter";
        description = "Live diagnostics for concurrent activity";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169941,7 +163685,6 @@ self: {
          base containers criterion directory filepath haskeline process
          txt-sushi
        ];
-       homepage = "http://chplib.wordpress.com/2010/02/04/progression-supporting-optimisation-in-haskell/";
        description = "Automates the recording and graphing of criterion benchmarks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -169961,7 +163704,6 @@ self: {
          base binary bytestring containers directory filepath ghc-prim
          process text
        ];
-       homepage = "https://bitbucket.org/gchrupala/progression";
        description = "Multilabel classification model which learns sequentially (online)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170043,7 +163785,6 @@ self: {
          megaparsec mtl parallel stm stm-containers temporary text time
          unordered-containers uuid vector vector-binary-instances
        ];
-       homepage = "https://github.com/agentm/project-m36";
        description = "Relational Algebra Engine";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170066,7 +163807,6 @@ self: {
          base base64-bytestring bytestring conduit containers hspec
          QuickCheck resourcet text transformers
        ];
-       homepage = "https://github.com/fpco/haskell-ide";
        description = "Specify Haskell project templates and generate files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170086,7 +163826,6 @@ self: {
          base deepseq path path-io protolude safe-exceptions tasty
          tasty-hunit tasty-rerun text vector
        ];
-       homepage = "https://github.com/roman/Haskell-projectile#readme";
        description = "Go to README.md";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170113,7 +163852,6 @@ self: {
        sha256 = "1f0sgrdq83af1wff5pmzfh44rmzmc0k8axhddz7rkl9yaj330xak";
        libraryHaskellDepends = [ base directory ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/yamadapc/haskell-projectroot";
        description = "Bindings to the projectroot C logic";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -170130,7 +163868,6 @@ self: {
          base containers mtl parsec syb template-haskell th-lift
          transformers
        ];
-       homepage = "https://github.com/Erdwolf/prolog";
        description = "A Prolog interpreter written in Haskell";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170149,7 +163886,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs fgl graphviz mtl prolog prolog-graph-lib text
        ];
-       homepage = "https://github.com/Erdwolf/prolog";
        description = "A command line tool to visualize query resolution in Prolog";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170162,7 +163898,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "02xa4hqmhmsv7vkdy3m3dr1w3z88kc8ly0jjn7q6pba5yarci7nr";
        libraryHaskellDepends = [ base fgl graphviz mtl prolog text ];
-       homepage = "https://github.com/Erdwolf/prolog";
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170189,7 +163924,6 @@ self: {
          recursion-schemes semigroupoids string-qq template-haskell text
          transformers transformers-base typelevel vector
        ];
-       homepage = "https://github.com/wdanilo/prologue";
        description = "Better, more general Prelude exporting common utilities";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170208,7 +163942,6 @@ self: {
          atomic-primops base bytestring containers http-client http-types
          lens proto-lens proto-lens-protoc text transformers wai warp wreq
        ];
-       homepage = "http://github.com/bitnomial/prometheus";
        description = "Prometheus Haskell Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170234,7 +163967,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion random utf8-string
        ];
-       homepage = "https://github.com/fimad/prometheus-haskell";
        description = "Haskell client library for http://prometheus.io.";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -170262,7 +163994,6 @@ self: {
        ];
        testHaskellDepends = [ base text weigh ];
        benchmarkHaskellDepends = [ base criterion text ];
-       homepage = "https://github.com/ocharles/prometheus-effect";
        description = "Instrument applications with metrics and publish/push to Prometheus";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170276,7 +164007,6 @@ self: {
        sha256 = "0cgcgzd7f39fhi0hxwjawif55a3i5mnnv7afxrrbk7gnhqb589nx";
        libraryHaskellDepends = [ base prometheus-client utf8-string ];
        testHaskellDepends = [ base doctest prometheus-client ];
-       homepage = "https://github.com/fimad/prometheus-haskell";
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -170288,7 +164018,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1hzsprmw15apc654n77ima1pgs9nj6287d412jb5z37154bd0nfg";
        libraryHaskellDepends = [ async base ];
-       homepage = "http://github.com/jfischoff/promise";
        description = "A monadic interface for async";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170301,7 +164030,6 @@ self: {
        version = "0.3";
        sha256 = "0q7jjk9dqli4vi46j94gywxp0fp80b7r0k0g4ymyf8n12lcr0z5z";
        libraryHaskellDepends = [ base primitive ];
-       homepage = "http://github.com/ekmett/promises/";
        description = "Lazy demand-driven promises";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170317,7 +164045,6 @@ self: {
        libraryHaskellDepends = [
          base base-compat mtl transformers transformers-compat
        ];
-       homepage = "https://github.com/mstksg/prompt";
        description = "Monad (and transformer) for deferred-effect pure prompt-response queries";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -170332,7 +164059,6 @@ self: {
        libraryHaskellDepends = [
          base binary containers filepath mtl text
        ];
-       homepage = "https://github.com/buonuomo/Text.Pronounce";
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170344,7 +164070,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1wcm5wxzqm4lq340l3ga15cmjfabpf8njnvma3zagwyhmndabxfw";
        libraryHaskellDepends = [ base ];
-       homepage = "http://nikivazou.github.io/";
        description = "Proof Combinators used in Liquid Haskell for Theorem Proving";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -170383,7 +164108,6 @@ self: {
          text time transformers unix unix-compat
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://propellor.branchable.com/";
        description = "property-based host configuration management in haskell";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -170415,7 +164139,6 @@ self: {
          recursion-schemes syb template-haskell text time time-locale-compat
          transformers vector xml
        ];
-       homepage = "https://github.com/mokus0/property-list";
        description = "Apple property list parser";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170428,7 +164151,6 @@ self: {
        version = "0.1";
        sha256 = "1vm01qvd0jgcdpqx3p2h6gafhxi5x7bs8r5a6xsk4zz6cc1cbw4m";
        libraryHaskellDepends = [ base glade glib gtk ];
-       homepage = "http://www-users.cs.york.ac.uk/~ndm/proplang/";
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170442,7 +164164,6 @@ self: {
        sha256 = "10bkbqhl15xgc9iglx0f9h218a2hcfg0wali2c6a17wvlpfcwjbx";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest QuickCheck ];
-       homepage = "http://github.com/deviant-logic/props";
        description = "Reusable quickcheck properties";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170460,7 +164181,6 @@ self: {
          aeson base bytestring cereal containers HsOpenSSL http-streams
          io-streams mtl text transformers vector
        ];
-       homepage = "https://api.prosper.com";
        description = "Bindings to the Prosper marketplace API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170494,7 +164214,6 @@ self: {
          attoparsec base bytestring containers data-default-class
          lens-family parsec pretty text transformers void
        ];
-       homepage = "https://github.com/google/proto-lens";
        description = "A lens-based implementation of protocol buffers in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170513,7 +164232,6 @@ self: {
          attoparsec base bytestring containers data-default-class deepseq
          lens-family lens-labels parsec pretty text transformers void
        ];
-       homepage = "https://github.com/google/proto-lens#readme";
        description = "A lens-based implementation of protocol buffers in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170530,7 +164248,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers lens-family proto-lens QuickCheck text
        ];
-       homepage = "https://github.com/google/proto-lens";
        description = "Arbitrary instances for proto-lens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170546,7 +164263,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers lens-family proto-lens QuickCheck text
        ];
-       homepage = "https://github.com/google/proto-lens#readme";
        description = "Arbitrary instances for proto-lens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170569,7 +164285,6 @@ self: {
          base HUnit lens-family lens-family-core proto-lens
          proto-lens-protoc test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/google/proto-lens#readme";
        description = "Utilities functions to proto-lens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170600,7 +164315,6 @@ self: {
        libraryHaskellDepends = [
          base optparse-applicative proto-lens text
        ];
-       homepage = "https://github.com/google/proto-lens#readme";
        description = "Adapting proto-lens to optparse-applicative ReadMs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170617,7 +164331,6 @@ self: {
        libraryHaskellDepends = [
          base lens-family proto-lens proto-lens-protoc text
        ];
-       homepage = "https://github.com/google/proto-lens#readme";
        description = "Basic protocol buffer message types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170644,7 +164357,6 @@ self: {
          base bytestring containers data-default-class deepseq filepath
          haskell-src-exts lens-family proto-lens text
        ];
-       homepage = "https://github.com/google/proto-lens#readme";
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170667,7 +164379,6 @@ self: {
          base bytestring cereal containers hex HUnit mtl QuickCheck tagged
          tasty tasty-hunit tasty-quickcheck text unordered-containers
        ];
-       homepage = "https://github.com/alphaHeavy/protobuf";
        description = "Google Protocol Buffers via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170689,7 +164400,6 @@ self: {
          base bytestring cereal containers hex HUnit mtl QuickCheck tagged
          tasty tasty-hunit tasty-quickcheck text unordered-containers
        ];
-       homepage = "https://github.com/alphaHeavy/protobuf";
        description = "Google Protocol Buffers via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170714,7 +164424,6 @@ self: {
          base bytestring cereal cplusplus-th criterion hprotoc-fork protobuf
          protocol-buffers-fork QuickCheck text utf8-string
        ];
-       homepage = "https://github.com/nicta/protobuf-native";
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170741,7 +164450,6 @@ self: {
          base binary bytestring containers data-binary-ieee754 filepath
          hspec parsec QuickCheck quickcheck-instances split text
        ];
-       homepage = "https://github.com/sru-systems/protobuf-simple";
        description = "Simple Protocol Buffers library (proto2)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -170758,7 +164466,6 @@ self: {
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
        ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170775,7 +164482,6 @@ self: {
          array base binary bytestring containers directory filepath mtl
          parsec syb utf8-string
        ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170791,7 +164497,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170806,7 +164511,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers
        ];
-       homepage = "https://github.com/k-bx/protocol-buffers";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170824,7 +164528,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers protocol-buffers-fork
        ];
-       homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170842,7 +164545,6 @@ self: {
          array base binary bytestring containers directory filepath mtl syb
          utf8-string
        ];
-       homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170894,7 +164596,6 @@ self: {
          array async base bytestring containers deepseq ghc-prim hashable
          mtl mtl-compat stm text transformers transformers-compat
        ];
-       homepage = "https://github.com/sdiehl/protolude";
        description = "A small prelude";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -170909,7 +164610,6 @@ self: {
        libraryHaskellDepends = [
          async base lifted-async lifted-base protolude
        ];
-       homepage = "https://github.com/pbogdan/protolude-lifted";
        description = "Protolude with lifted-base and lifted-async";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170929,7 +164629,6 @@ self: {
          base containers directory filepath HUnit test-framework
          test-framework-hunit
        ];
-       homepage = "http://github.com/jasonrbriggs/proton";
        description = "Simple XML templating library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170962,7 +164661,6 @@ self: {
          optparse-applicative parsec parsers process safe text time
          unordered-containers wai warp
        ];
-       homepage = "https://github.com/prove-everywhere/server";
        description = "The server for ProveEverywhere";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -170975,7 +164673,6 @@ self: {
        version = "0.3";
        sha256 = "09pbvf40qykrzmg4lrk5krhx30gzsldk1bz2i6bb6d18bx14skak";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/RyanGlScott/proxied";
        description = "Make functions consume Proxy instead of undefined";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -170987,7 +164684,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1465mvkdq9cv202sj2hiwa8a2a07906dww2msan235fvkrnhj9jz";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/chessai/proxy.git";
        description = "proxy helpers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -170999,7 +164695,6 @@ self: {
        version = "0.1";
        sha256 = "0wpzj6hnlxvgd7lfd2921mrk97aw7ljf77jry3my97zdapkxz8i7";
        libraryHaskellDepends = [ base tagged ];
-       homepage = "https://github.com/jberryman/proxy-kindness";
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171042,7 +164737,6 @@ self: {
        testHaskellDepends = [
          base containers hspec monad-logger mtl stm
        ];
-       homepage = "http://github.com/kRITZCREEK/psc-ide";
        description = "Language support for the PureScript programming language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171068,7 +164762,6 @@ self: {
          base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
          tasty-th temporary
        ];
-       homepage = "https://github.com/msakai/pseudo-boolean";
        description = "Reading/Writing OPB/WBO files used in pseudo boolean competition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -171117,7 +164810,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1x0r68mfv56rp87j8ick875wbq3qzkii9ia60amx6xr40x1acg7i";
        libraryHaskellDepends = [ base postgresql-simple ];
-       homepage = "http://github.com/agrafix/psql-helpers#readme";
        description = "A small collection of helper functions to generate postgresql queries";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -171155,7 +164847,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base text ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/wapxmas/pstemmer#readme";
        description = "A Haskell Implementation of the Porter Stemmer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -171168,7 +164859,6 @@ self: {
        sha256 = "12130fpdskml0mdgbr38zki48n5ffid0diiixyn89kzcq948vvmn";
        libraryHaskellDepends = [ base generic-deriving ];
        testHaskellDepends = [ base hspec hspec-discover ];
-       homepage = "http://github.com/tweag/pthread";
        description = "Bindings for the pthread library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -171177,21 +164867,20 @@ self: {
     ({ mkDerivation, base, base-prelude, bug, bytestring, contravariant
      , mtl, profunctors, QuickCheck, quickcheck-instances, rerebase
      , semigroups, tasty, tasty-hunit, tasty-quickcheck, text, time
-     , transformers
+     , transformers, vector
      }:
      mkDerivation {
        pname = "ptr";
-       version = "0.16.4";
-       sha256 = "0na3by8mh43cd0xn1s1l7hi3mmm3damr9swgv6mzyg9lhilsndxb";
+       version = "0.16.5";
+       sha256 = "0hywqysklzy5xixd8wdhrlwzf2336z1kn593sg5q30kbg3b0bgj2";
        libraryHaskellDepends = [
          base base-prelude bug bytestring contravariant mtl profunctors
-         semigroups text time transformers
+         semigroups text time transformers vector
        ];
        testHaskellDepends = [
          bug QuickCheck quickcheck-instances rerebase tasty tasty-hunit
          tasty-quickcheck
        ];
-       homepage = "https://github.com/nikita-volkov/ptr";
        description = "Abstractions for operations on pointers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171227,7 +164916,6 @@ self: {
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -171243,7 +164931,6 @@ self: {
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171264,7 +164951,6 @@ self: {
          base bytestring cereal containers data-default HUnit idna text
          utf8-string
        ];
-       homepage = "https://github.com/litherum/publicsuffixlist";
        description = "Is a given string a domain suffix?";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -171282,7 +164968,6 @@ self: {
          publicsuffixlist text
        ];
        testHaskellDepends = [ base cereal HUnit publicsuffixlist ];
-       homepage = "https://github.com/litherum/publicsuffixlist";
        description = "Create the publicsuffixlist package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171316,7 +165001,6 @@ self: {
          base Cabal HUnit QuickCheck smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "http://github.com/pubnub/haskell";
        description = "PubNub Haskell SDK";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171336,7 +165020,6 @@ self: {
          base feed HTTP json mime network random utf8-string xml
        ];
        executableHaskellDepends = [ fastcgi ];
-       homepage = "http://projects.haskell.org/pubsub/";
        description = "A library for Google/SixApart pubsub hub interaction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171367,7 +165050,6 @@ self: {
          aeson base bytestring QuickCheck test-framework
          test-framework-quickcheck2 text time vector
        ];
-       homepage = "https://github.com/pharpend/puffytools";
        description = "A CLI assistant";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171385,7 +165067,6 @@ self: {
          base bytestring data-default-class template-haskell
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit ];
-       homepage = "https://github.com/philopon/pugixml-hs";
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171410,7 +165091,6 @@ self: {
          base bytestring containers hashable hashtables HsSyck mtl old-time
          pretty random stm utf8-string
        ];
-       homepage = "http://pugscode.org/";
        description = "DrIFT with pugs-specific rules";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -171455,7 +165135,6 @@ self: {
        version = "1.0";
        sha256 = "1px8qvz7afws2w8scplxs4zm628anvh5ssbf0ba9hajh686h133i";
        libraryHaskellDepends = [ array base haskell98 ];
-       homepage = "http://repetae.net/john/computer/haskell/hsregex/";
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171468,7 +165147,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0npq49hm17h3p7acmvbg10qkqx74asbk3f6c2rlw7zaa1zhb9r6d";
        libraryHaskellDepends = [ async base containers time ];
-       homepage = "https://github.com/agrafix/pulse#readme";
        description = "Synchronize actions to a time pulse";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -171513,7 +165191,6 @@ self: {
        testHaskellDepends = [
          base mtl regex-tdfa tasty tasty-hunit tasty-quickcheck text
        ];
-       homepage = "https://github.com/bryant/punkt";
        description = "Multilingual unsupervised sentence tokenization with Punkt";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171531,7 +165208,6 @@ self: {
        testHaskellDepends = [
          base bytestring cereal encoding HUnit mtl QuickCheck text
        ];
-       homepage = "https://github.com/litherum/punycode";
        description = "Encode unicode strings to ascii forms according to RFC 3492";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -171550,7 +165226,6 @@ self: {
          base bytestring containers Diff hsfacter hslogger language-puppet
          mtl text
        ];
-       homepage = "http://lpuppet.banquise.net";
        description = "A program that displays the puppet resources associated to a node given .pp files.";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171570,7 +165245,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers mtl test-simple Unixutils vector
        ];
-       homepage = "https://github.com/bosu/pure-cdb";
        description = "Another pure-haskell CDB (Constant Database) implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171650,7 +165324,6 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base base-compat bytestring time ];
-       homepage = "http://github.com/GaloisInc/pure-zlib";
        description = "A Haskell-only implementation of zlib / DEFLATE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171731,7 +165404,6 @@ self: {
          transformers-compat unordered-containers utf8-string vector
        ];
        doCheck = false;
-       homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171757,15 +165429,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "purescript-bridge_0_12_0_0" = callPackage
+  "purescript-bridge_0_13_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, hspec, hspec-expectations-pretty-diff, lens
      , mtl, text, transformers
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.12.0.0";
-       sha256 = "1kh3ydqn7vs3ybda9ic8gbmzzjigiiibls9w1nh5ffgwf42dij7j";
+       version = "0.13.0.0";
+       sha256 = "0jai0vrfw997w7gjs168bk8n2xjw30hnhd82pch5n58w1sy6n6ib";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving lens mtl text
          transformers
@@ -171791,7 +165463,6 @@ self: {
        executableHaskellDepends = [
          base containers directory filepath optparse-applicative text vector
        ];
-       homepage = "https://github.com/bitc/purescript-bundle-fast";
        description = "A fast alternative to Purescript's `psc-bundle` to be used during development";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171815,7 +165486,6 @@ self: {
          aeson base bytestring containers directory filepath mtl
          optparse-applicative purescript text
        ];
-       homepage = "https://github.com/minoki/purescript-tsd-gen#readme";
        description = "TypeScript Declaration File (.d.ts) generator for PureScript";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171833,7 +165503,6 @@ self: {
          base http-client lens taggy-lens text wreq
        ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/soupi/pursuit-client";
        description = "A cli client for pursuit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -171857,7 +165526,6 @@ self: {
          monad-control mtl network resourcet retry stm text time tls
          tls-extra transformers unordered-containers xml-conduit
        ];
-       homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
        description = "A server-side library for sending push notifications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171883,7 +165551,6 @@ self: {
          base bytestring optparse-applicative text
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/memrange/apn#readme";
        description = "Send push notifications to mobile iOS devices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171904,7 +165571,6 @@ self: {
          data-default hslogger mtl network pontarius-xmpp push-notify retry
          stm text tls tls-extra unordered-containers xml-types
        ];
-       homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
        description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171924,7 +165590,6 @@ self: {
          http-conduit http-types push-notify push-notify-ccs text
          unordered-containers xml-conduit yesod
        ];
-       homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
        description = "A general library for sending/receiving push notif. through dif. services.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171974,7 +165639,6 @@ self: {
          aeson base bytestring HTTP MissingH mtl SHA time
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "http://www.github.com/sidraval/pusher-haskell";
        description = "A Pusher.com client written in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172000,7 +165664,6 @@ self: {
          http-client http-types QuickCheck scientific text time transformers
          unordered-containers vector
        ];
-       homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -172020,7 +165683,6 @@ self: {
          lens-aeson network scientific stm text time transformers
          unordered-containers websockets wuss
        ];
-       homepage = "https://github.com/barrucadu/pusher-ws";
        description = "Implementation of the Pusher WebSocket protocol";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172047,7 +165709,6 @@ self: {
          system-fileio system-filepath temporary text text-format time
          transformers unix unordered-containers yaml
        ];
-       homepage = "https://github.com/jwiegley/pushme#readme";
        description = "Tool to synchronize directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172069,7 +165730,6 @@ self: {
        testHaskellDepends = [
          base bytestring http-client tasty tasty-hunit text time
        ];
-       homepage = "https://github.com/DanMeakin/pushover";
        description = "A Haskell Pushover API library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -172157,7 +165817,6 @@ self: {
          X11
        ];
        executableSystemDepends = [ libdevil ];
-       homepage = "http://code.haskell.org/pvd";
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172182,7 +165841,6 @@ self: {
          base cryptonite deepseq hourglass memory vector
        ];
        testHaskellDepends = [ base cryptonite tasty tasty-quickcheck ];
-       homepage = "https://github.com/input-output-hk/pvss-haskell#readme";
        description = "Public Verifiable Secret Sharing";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -172204,7 +165862,6 @@ self: {
          base bytestring HUnit process pwstore-fast test-framework
          test-framework-hunit
        ];
-       homepage = "http://hub.darcs.net/rycee/pwstore-cli";
        description = "Command line interface for the pwstore library";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -172220,7 +165877,6 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring binary byteable bytestring cryptohash random
        ];
-       homepage = "https://github.com/PeterScott/pwstore";
        description = "Secure password storage";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -172236,7 +165892,6 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring byteable bytestring random SHA
        ];
-       homepage = "https://github.com/PeterScott/pwstore";
        description = "Secure password storage, in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -172251,7 +165906,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base containers mtl parsec ];
-       homepage = "http://community.moertel.com/ss/space/PXSL";
        description = "Parsimonious XML Shorthand Language--to-XML compiler";
        license = "GPL";
      }) {};
@@ -172268,7 +165922,6 @@ self: {
          aeson base bytestring containers pureMD5 template-haskell
        ];
        libraryPkgconfigDepends = [ python ];
-       homepage = "http://github.com/Russell91/json-python";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172286,7 +165939,6 @@ self: {
          aeson base bytestring containers pureMD5 template-haskell
        ];
        libraryPkgconfigDepends = [ python ];
-       homepage = "http://github.com/Russell91/pyfi";
        description = "Call python inline from haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172330,7 +165982,6 @@ self: {
        testHaskellDepends = [
          base doctest lens lens-properties tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/quasicomputational/mega/tree/master/packages/twofinger";
        description = "Efficient alternating finger trees";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172345,7 +165996,6 @@ self: {
        libraryHaskellDepends = [
          base fclabels QuickCheck template-haskell
        ];
-       homepage = "http://www.iai.uni-bonn.de/~jv/GV14.html";
        description = "Compile time generation of operation invariance tests for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172363,7 +166013,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix linear random ];
        executableHaskellDepends = [ base hmatrix ];
        testHaskellDepends = [ base hmatrix linear tasty tasty-hunit ];
-       homepage = "https://github.com/ardeleanasm/qchas#readme";
        description = "A library for implementing Quantum Algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -172407,7 +166056,6 @@ self: {
          transformers uniplate
        ];
        testHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/ndmitchell/qed#readme";
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172421,7 +166069,6 @@ self: {
        sha256 = "0g0abqc5z9nysm21c77kylkka1bvyn16ycinws1lcrjy53cb82sw";
        libraryHaskellDepends = [ base vector ];
        librarySystemDepends = [ qhull ];
-       homepage = "http://nonempty.org/software/haskell-qhull-simple";
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172442,7 +166089,6 @@ self: {
          attoparsec base microlens QuickCheck tasty tasty-hunit
          tasty-quickcheck text time
        ];
-       homepage = "https://github.com/acw/qif";
        description = "A simple QIF file format parser / printer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172460,7 +166106,6 @@ self: {
          base bytestring haskell-src-meta template-haskell text
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/unclechu/haskell-qm-interpolated-string";
        description = "Implementation of interpolated multiline strings";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -172492,7 +166137,6 @@ self: {
          crypto-api directory filepath hspec HUnit streaming-commons tagged
          temporary utf8-string
        ];
-       homepage = "https://github.com/alexkazik/qnap-decrypt#readme";
        description = "Decrypt files encrypted by QNAP's Hybrid Backup Sync";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -172505,7 +166149,6 @@ self: {
        sha256 = "1fsl1639jzik9zrkks1badx6pd303rjdm3dmnb6cfjjb1jg50cqr";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base network-uri template-haskell ];
-       homepage = "https://github.com/hdgarrood/qq-literals";
        description = "Compile-time checked literal values via QuasiQuoters";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -172525,7 +166168,6 @@ self: {
        ];
        libraryPkgconfigDepends = [ libqrencode ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/vmchale/QRImager#readme";
        description = "Library to generate images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172546,7 +166188,6 @@ self: {
          jose-jwt lens repa repa-devil vector
        ];
        executableHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/vmchale/QRRepa#readme";
        description = "Library to generate QR codes from bytestrings and objects and scale image files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172576,7 +166217,6 @@ self: {
        librarySystemDepends = [
          qtc_core qtc_gui qtc_network qtc_opengl qtc_script qtc_tools
        ];
-       homepage = "http://github.com/keerastudios/hsQt";
        description = "Qt bindings";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172594,7 +166234,6 @@ self: {
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base process qtah-generator ];
        librarySystemDepends = [ qtbase ];
-       homepage = "http://khumba.net/projects/qtah";
        description = "Qt bindings for Haskell - C++ library";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172613,7 +166252,6 @@ self: {
        executableHaskellDepends = [
          base binary bytestring containers filepath hoppy-runtime qtah-qt5
        ];
-       homepage = "http://khumba.net/projects/qtah";
        description = "Example programs for Qtah Qt bindings";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172637,7 +166275,6 @@ self: {
          hoppy-std mtl process transformers
        ];
        doHaddock = false;
-       homepage = "http://khumba.net/projects/qtah";
        description = "Generator for Qtah Qt bindings";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172660,7 +166297,6 @@ self: {
        libraryToolDepends = [ qtbase ];
        testHaskellDepends = [ base hoppy-runtime HUnit ];
        testSystemDepends = [ qtah ];
-       homepage = "http://khumba.net/projects/qtah";
        description = "Qt bindings for Haskell";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172695,7 +166331,6 @@ self: {
          base directory doctest filepath mtl numbers QuickCheck tasty
          tasty-quickcheck
        ];
-       homepage = "https://github.com/ion1/quadratic-irrational";
        description = "An implementation of quadratic irrationals";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172714,7 +166349,6 @@ self: {
          aeson base blaze-builder bytestring http-conduit http-types syb
          text time time-locale-compat unordered-containers
        ];
-       homepage = "https://github.com/pvdbrand/quandl-api";
        description = "Quandl.com API library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -172734,7 +166368,6 @@ self: {
          random-source rvar transformers vector
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/boundedvariation/quantfin";
        description = "Quant finance library in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172754,7 +166387,6 @@ self: {
          aeson base containers ghc-prim hashable path-pieces text
          unordered-containers vector
        ];
-       homepage = "https://github.com/andrewthad/quantification#readme";
        description = "Rage against the quantification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -172775,7 +166407,6 @@ self: {
          base containers doctest Glob hlint hspec mtl parsec process
          regex-compat
        ];
-       homepage = "http://github.com/jdreaver/quantities";
        description = "Unit conversion and manipulation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -172787,7 +166418,6 @@ self: {
        version = "0.0.5";
        sha256 = "19z5b0jwnz20g0203xd78cv8rgm92diyxard4mbj6dyrj2kkfgww";
        libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ];
-       homepage = "http://github.com/luqui/quantum-arrow";
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172811,7 +166441,6 @@ self: {
        ];
        executableHaskellDepends = [ base haskeline mtl ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/BlackBrane/quantum-random/";
        description = "Retrieve, store and manage real quantum random data";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172831,7 +166460,6 @@ self: {
          array base bytestring directory mtl snappy
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "https://github.com/jstepien/qudb";
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172981,7 +166609,6 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base readline terminal-size
        ];
-       homepage = "https://github.com/yamadapc/haskell-questioner.git";
        description = "A package for prompting values from the command-line";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172994,7 +166621,6 @@ self: {
        version = "0.1.2";
        sha256 = "0fx2svkj2sy2wd056lha9h20hy2z6gjspzl11jmv7i3rdwwfr6f7";
        libraryHaskellDepends = [ base stm ];
-       homepage = "http://code.haskell.org/~mokus/queue";
        description = "Abstraction typeclasses for queue-like things";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173037,7 +166663,6 @@ self: {
          aeson base hspec QuickCheck scientific text unordered-containers
          vector
        ];
-       homepage = "https://github.com/benweitzman/quick-schema";
        description = "Slimmed down json schema language and validator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173059,7 +166684,6 @@ self: {
        ];
        executableHaskellDepends = [ base process ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/simonmichael/quickbench#readme";
        description = "quick & easy benchmarking of command-line programs";
        license = "GPL";
      }) {};
@@ -173095,7 +166719,6 @@ self: {
        testHaskellDepends = [
          base hspec lens QuickCheck template-haskell transformers
        ];
-       homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme";
        description = "Generic typeclasses for generating arbitrary ADTs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173113,7 +166736,6 @@ self: {
          base QuickCheck safe tasty tasty-golden tasty-hunit
          tasty-quickcheck template-haskell
        ];
-       homepage = "https://github.com/plow-technologies/quickcheck-arbitrary-adt#readme";
        description = "Generate QuickCheck Gen for Sum Types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173126,7 +166748,6 @@ self: {
        sha256 = "1kyam4cy7qmnizjwjm8jamq43w7f0fs6ljfplwj0ib6wi2kjh0wv";
        libraryHaskellDepends = [ base ieee754 pretty-show QuickCheck ];
        testHaskellDepends = [ base hspec ieee754 QuickCheck ];
-       homepage = "https://github.com/s9gf4ult/quickcheck-assertions";
        description = "HUnit like assertions for QuickCheck";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -173143,28 +166764,26 @@ self: {
          aeson base containers prim-array primitive QuickCheck transformers
        ];
        testHaskellDepends = [ aeson base primitive QuickCheck vector ];
-       homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-classes_0_4_10" = callPackage
+  "quickcheck-classes_0_4_11_1" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, containers, primitive
-     , QuickCheck, semigroupoids, semigroups, tagged, transformers
-     , vector
+     , QuickCheck, semigroupoids, semigroups, semirings, tagged
+     , transformers, vector
      }:
      mkDerivation {
        pname = "quickcheck-classes";
-       version = "0.4.10";
-       sha256 = "1x01746853wbfrfry807gva15wn02jcd0cfqbag7f5xm1fd8nlss";
+       version = "0.4.11.1";
+       sha256 = "1x75fm8axvxdvqds93df1cgb3gp047d4n3yr6ydwsl6xhvmb023g";
        libraryHaskellDepends = [
          aeson base bifunctors containers primitive QuickCheck semigroupoids
-         semigroups tagged transformers
+         semigroups semirings tagged transformers
        ];
        testHaskellDepends = [
          aeson base primitive QuickCheck tagged transformers vector
        ];
-       homepage = "https://github.com/andrewthad/quickcheck-classes#readme";
        description = "QuickCheck common typeclasses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173202,7 +166821,6 @@ self: {
        testHaskellDepends = [
          base containers QuickCheck tagged uuid-types
        ];
-       homepage = "https://github.com/phadej/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173214,7 +166832,6 @@ self: {
        version = "0.2.0";
        sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv";
        libraryHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/hspec/quickcheck-io#readme";
        description = "Use HUnit assertions as QuickCheck properties";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -173254,7 +166871,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0wqz2amhwf1djbwwdin142mzp94mxbzb12khznijissjdz38knp5";
        libraryHaskellDepends = [ base mtl QuickCheck ];
-       homepage = "http://www.github.com/jfeltz/quickcheck-property-comb";
        description = "Combinators for Quickcheck Property construction and diagnostics";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173267,7 +166883,6 @@ self: {
        version = "0.2.4";
        sha256 = "0sp7592jfh6i8xsykl2lv8bspnp755fnpqvqa09dhwq6hm0r1r9c";
        libraryHaskellDepends = [ base either QuickCheck transformers ];
-       homepage = "http://github.com/bennofs/quickcheck-property-monad/";
        description = "A monad for generating QuickCheck properties without Arbitrary instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173284,7 +166899,6 @@ self: {
        libraryHaskellDepends = [
          base containers QuickCheck regex-genex regex-tdfa
        ];
-       homepage = "http://github.com/audreyt/quickcheck-regex/";
        description = "Generate regex-constrained strings for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173301,7 +166915,6 @@ self: {
        libraryHaskellDepends = [
          base hxt hxt-relaxng QuickCheck quickcheck-regex
        ];
-       homepage = "http://github.com/audreyt/quickcheck-relaxng/";
        description = "Generate RelaxNG-constrained XML documents for QuickCheck";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173315,7 +166928,6 @@ self: {
        sha256 = "0pmw9441l36sprw9ngq6gn2yi4v427zd5n22s9zicfyiwi4qf5ba";
        libraryHaskellDepends = [ base QuickCheck rematch ];
        testHaskellDepends = [ base hspec HUnit QuickCheck rematch ];
-       homepage = "http://github.com/tcrayford/rematch";
        description = "QuickCheck support for rematch";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173346,7 +166958,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory process QuickCheck ];
-       homepage = "http://www.cs.chalmers.se/~rjmh/QuickCheck/";
        description = "Automated test tool for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173371,7 +166982,6 @@ self: {
        revision = "1";
        editedCabalFile = "1whwmij115vw0qwkzlkc4z4yhj7iwwqjhf5aaxn5np0gh2gzihb3";
        libraryHaskellDepends = [ base QuickCheck special-values ];
-       homepage = "https://github.com/minad/quickcheck-special#readme";
        description = "Edge cases and special values for QuickCheck Arbitrary instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -173392,7 +167002,6 @@ self: {
          stm template-haskell th-abstraction
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme";
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173416,7 +167025,6 @@ self: {
          network-transport network-transport-tcp QuickCheck random stm
          strict tasty tasty-quickcheck temporary
        ];
-       homepage = "https://github.com/advancedtelematic/quickcheck-state-machine-distributed#readme";
        description = "Test monadic programs using state machine based models";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -173433,7 +167041,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-quickcheck text
        ];
-       homepage = "https://github.com/hiratara/hs-string-random#readme";
        description = "Helper to build generators with Text.StringRandom";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173446,7 +167053,6 @@ self: {
        sha256 = "02dbs0k6igmsa1hcw8yfvp09v7038vp4zlsp9706km3cmswgshj4";
        libraryHaskellDepends = [ base binary bytestring QuickCheck text ];
        testHaskellDepends = [ base bytestring QuickCheck text ];
-       homepage = "https://github.com/olorin/quickcheck-text";
        description = "Alternative arbitrary instance for Text";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -173458,7 +167064,6 @@ self: {
        version = "1.0.1.0";
        sha256 = "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k";
        libraryHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/bos/quickcheck-unicode";
        description = "Generator and shrink functions for testing Unicode-related software";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -173484,7 +167089,6 @@ self: {
        revision = "3";
        editedCabalFile = "0wz7iwpgxx977y46xis4imrhds1i341fv6mpwydr1mzhzazifvz8";
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
-       homepage = "http://www.github.com/nick8325/quickcheck-with-counterexamples";
        description = "Get counterexamples from QuickCheck as Haskell values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173502,7 +167106,6 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/thoughtpolice/hs-quicklz";
        description = "QuickLZ compression for ByteStrings";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -173518,12 +167121,25 @@ self: {
        libraryHaskellDepends = [ base directory filepath QuickCheck ];
        executableHaskellDepends = [ base directory filepath QuickCheck ];
        testHaskellDepends = [ base directory filepath QuickCheck ];
-       homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "quickselect" = callPackage
+    ({ mkDerivation, base, criterion, doctest, QuickCheck, random
+     , vector
+     }:
+     mkDerivation {
+       pname = "quickselect";
+       version = "0.1.0.0";
+       sha256 = "00jl29mimsxj17m2n3hwg58dmvqs78bk1k61iihjnaprr5zga8ki";
+       libraryHaskellDepends = [ base vector ];
+       testHaskellDepends = [ base doctest QuickCheck vector ];
+       benchmarkHaskellDepends = [ base criterion random vector ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "quickset" = callPackage
     ({ mkDerivation, base, vector, vector-algorithms }:
      mkDerivation {
@@ -173543,7 +167159,6 @@ self: {
        version = "0.3";
        sha256 = "1aa56ng45la91kd40hvqmg5mdprmw7mdgg0zjfz0l71qg2yka14a";
        libraryHaskellDepends = [ aeson attoparsec base bytestring text ];
-       homepage = "https://github.com/libscott/quickson";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173562,7 +167177,6 @@ self: {
          quickcheck-instances random spoon template-haskell transformers
          twee-lib uglymemo
        ];
-       homepage = "https://github.com/nick8325/quickspec";
        description = "Equational laws for free!";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173582,7 +167196,6 @@ self: {
          base edit-distance hashmap regex-base regex-tdfa uu-parsinglib
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/SamuelSchlesinger/Quickterm";
        description = "An interface for describing and executing terminal applications";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -173598,7 +167211,6 @@ self: {
        executableHaskellDepends = [
          base directory haskell98 mtl process
        ];
-       homepage = "https://github.com/davidsiegel/quicktest";
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173618,7 +167230,6 @@ self: {
          aeson base bytestring containers either lucid servant servant-lucid
          servant-server text warp
        ];
-       homepage = "https://github.com/jtanguy/quickwebapp";
        description = "A quick webapp generator for any file processing tool";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173636,7 +167247,6 @@ self: {
          base containers directory easyrender mtl primes process random
          template-haskell unix
        ];
-       homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173653,7 +167263,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl primes random template-haskell
        ];
-       homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173671,7 +167280,6 @@ self: {
          base containers directory easyrender mtl primes process
          quipper-core random template-haskell unix
        ];
-       homepage = "http://www.mathstat.dal.ca/~selinger/quipper/";
        description = "An embedded, scalable functional programming language for quantum computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173684,7 +167292,6 @@ self: {
        version = "1.1.3";
        sha256 = "1gg02lnrd2c1wq8zhbj8n355v23ijzm5nj0jyply91sppjma9w7x";
        libraryHaskellDepends = [ base mmorph transformers ];
-       homepage = "https://github.com/zadarnowski/quiver";
        description = "Quiver finite stream processing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173713,7 +167320,6 @@ self: {
        version = "1.0.0";
        sha256 = "1iwp6z76n2iramd21l2j9gvsqzq3j90qprblscp1yvk73fq4vcmz";
        libraryHaskellDepends = [ base bytestring quiver ];
-       homepage = "https://github.com/zadarnowski/quiver-bytestring";
        description = "Quiver combinators for bytestring streaming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173725,7 +167331,6 @@ self: {
        version = "1.0.0";
        sha256 = "0l8c5vhhbjlijvx27mda62y6sq6lr7irva6c47fhvf26zfgx41p8";
        libraryHaskellDepends = [ base data-cell quiver ];
-       homepage = "https://github.com/zadarnowski/quiver-cell";
        description = "Quiver combinators for cellular data processing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173741,7 +167346,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring data-cell quiver quiver-bytestring
        ];
-       homepage = "https://github.com/zadarnowski/quiver-csv";
        description = "Quiver combinators for cellular CSV data processing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173753,7 +167357,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "0k0822yzlxkb6b46834hm3bad3x1gma1gqcjl9ryxpqsl73nc4mp";
        libraryHaskellDepends = [ base enumerator quiver ];
-       homepage = "https://github.com/zadarnowski/quiver-enumerator";
        description = "Bridge between Quiver and Iteratee paradigms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173784,7 +167387,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-client http-client-tls quiver
        ];
-       homepage = "https://github.com/christian-marie/quiver-http/";
        description = "Adapter to stream over HTTP(s) with quiver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173863,7 +167465,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit mtl ];
-       homepage = "https://github.com/talw/quoridor-hs";
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173883,7 +167484,6 @@ self: {
          base bytestring containers directory filepath language-qux
          llvm-general mtl optparse-applicative pretty
        ];
-       homepage = "https://github.com/qux-lang/qux";
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173909,7 +167509,6 @@ self: {
        benchmarkHaskellDepends = [
          base blaze-builder bytestring criterion pretty
        ];
-       homepage = "http://github.com/raaz-crypto/raaz";
        description = "The raaz cryptographic library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -173939,7 +167538,6 @@ self: {
        version = "0.1.6.3";
        sha256 = "19g2lc3vmnapccdxf390cmkfl9bd3agcn01kk8ccd4lmaqn2c12d";
        libraryHaskellDepends = [ array base containers data-reify ];
-       homepage = "http://comonad.com/reader/";
        description = "Reverse Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173953,7 +167551,6 @@ self: {
        sha256 = "150vb9wk73avh8rrsz92y1fcwlm30w4k23lbdncb8ivinqhdi4pv";
        libraryHaskellDepends = [ base profunctors ];
        testHaskellDepends = [ base HUnit lens ];
-       homepage = "https://github.com/qfpl/radian";
        description = "Isomorphisms for measurements that use radians";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173971,7 +167568,6 @@ self: {
        testHaskellDepends = [
          base Cabal containers hspec lens parsec QuickCheck
        ];
-       homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -173988,7 +167584,6 @@ self: {
        testHaskellDepends = [
          base Cabal containers hspec parsec QuickCheck
        ];
-       homepage = "https://github.com/klangner/radium-formula-parser";
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174005,7 +167600,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring cryptonite iproute memory
        ];
-       homepage = "https://github.com/erickg/radius#readme";
        description = "Remote Authentication Dial In User Service (RADIUS)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174019,7 +167613,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath ];
-       homepage = "https://github.com/thomaseding/radix";
        description = "Command-line tool for emitting numbers in various bases";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174043,7 +167636,6 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base criterion deepseq QuasiText text vector
        ];
-       homepage = "https://gitlab.com/transportengineering/radixtree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -174066,7 +167658,6 @@ self: {
        benchmarkHaskellDepends = [
          async base bytestring criterion mtl transformers
        ];
-       homepage = "github";
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174086,7 +167677,6 @@ self: {
          data-default ghc-prim mtl parallel scientific split stm text time
          tostring zlib
        ];
-       homepage = "https://bitbucket.org/functionally/raft";
        description = "Miscellaneous Haskell utilities for data structures and data manipulation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174110,7 +167700,6 @@ self: {
          base cairo containers gtk mtl process transformers
        ];
        testHaskellDepends = [ base containers HUnit process ];
-       homepage = "https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14";
        description = "Compiler and editor for the esolang rail";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174135,7 +167724,6 @@ self: {
          base bytestring filepath ruby-marshal semigroups tasty tasty-hspec
          transformers vector
        ];
-       homepage = "http://github.com/iconnect/rails-session#readme";
        description = "Decrypt Ruby on Rails sessions in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174155,7 +167743,6 @@ self: {
        testHaskellDepends = [
          base bytestring lens-simple process QuickCheck text
        ];
-       homepage = "https://www.github.com/massysett/rainbow";
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174174,7 +167761,6 @@ self: {
        testHaskellDepends = [
          base bytestring lens-simple process QuickCheck text
        ];
-       homepage = "https://www.github.com/massysett/rainbow";
        description = "Print text to terminal with colors and effects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174191,7 +167777,6 @@ self: {
        libraryHaskellDepends = [
          barecheck base QuickCheck rainbow terminfo text
        ];
-       homepage = "http://www.github.com/massysett/rainbow";
        description = "Tests and QuickCheck generators to accompany rainbow";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174212,11 +167797,30 @@ self: {
          base bytestring containers lens-simple QuickCheck rainbow tasty
          tasty-quickcheck text
        ];
-       homepage = "http://www.github.com/massysett/rainbox";
        description = "Two-dimensional box pretty printing, with colors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rainbox_0_20_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens-simple
+     , QuickCheck, rainbow, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "rainbox";
+       version = "0.20.0.0";
+       sha256 = "07xn8n2wyy7gfc7x725pa9p38m0bapbbk6zcbh31zd67zg962zwk";
+       libraryHaskellDepends = [
+         base bytestring containers lens-simple rainbow text
+       ];
+       testHaskellDepends = [
+         base bytestring containers lens-simple QuickCheck rainbow tasty
+         tasty-quickcheck text
+       ];
+       description = "Two-dimensional box pretty printing, with colors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rake" = callPackage
     ({ mkDerivation, base, containers, text }:
      mkDerivation {
@@ -174224,7 +167828,6 @@ self: {
        version = "0.0.1";
        sha256 = "0cn22xg7r80f61z8pf7i0rqqag4qx43rhlfpncgkv5b6vcrsafpn";
        libraryHaskellDepends = [ base containers text ];
-       homepage = "http://github.com/toschoo/Haskell-Libs";
        description = "Rapid Automatic Keyword Extraction (RAKE)";
        license = "LGPL";
      }) {};
@@ -174256,7 +167859,6 @@ self: {
          template-haskell
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/ciez/raketka";
        description = "distributed-process node";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174274,7 +167876,6 @@ self: {
          attoparsec base bytestring containers lens mtl pipes scientific
          transformers vector zlib
        ];
-       homepage = "http://github.com/YoEight/rakhana";
        description = "Stream based PDF library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174300,7 +167901,6 @@ self: {
          extensible hspec http-api-data http-client http-client-tls
          http-types lens req servant-server text warp
        ];
-       homepage = "https://github.com/matsubara0507/rakuten#readme";
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -174314,7 +167914,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "http://github.com/cartazio/ralist";
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174328,7 +167927,6 @@ self: {
        sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 ];
-       homepage = "http://github.com/moonmaster9000/rallod";
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174345,7 +167943,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring text unordered-containers yaml
        ];
-       homepage = "https://github.com/fnoble/raml";
        description = "RESTful API Modeling Language (RAML) library for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174361,7 +167958,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck quickcheck-io ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/NickSeagull/ramus#readme";
        description = "Elm signal system for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -174450,7 +168046,6 @@ self: {
          async base bytestring criterion cryptonite entropy ghc-prim
          mwc-random pcg-random primitive random
        ];
-       homepage = "https://www.github.com/larskuhtz/random-bytestring";
        description = "Efficient generation of random bytestrings";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -174474,7 +168069,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "08irzyg8cgigj009zp5hg33gdwranrdyyzrxhmwyib6fm5bmsj8p";
        libraryHaskellDepends = [ base random template-haskell ];
-       homepage = "https://github.com/frerich/random-derive";
        description = "A Template Haskell helper for deriving Random instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174514,7 +168108,6 @@ self: {
        libraryHaskellDepends = [
          array base containers random-fu random-source
        ];
-       homepage = "http://github.com/aristidb/random-extras";
        description = "Additional functions for random values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174532,7 +168125,6 @@ self: {
          base erf log-domain math-functions monad-loops mtl random-shuffle
          random-source rvar syb template-haskell transformers vector
        ];
-       homepage = "https://github.com/mokus0/random-fu";
        description = "Random number generation";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -174545,7 +168137,6 @@ self: {
        sha256 = "11hss3d1aa917g7w7k76zcakk82ras3046vb768yh5kayrb6a347";
        libraryHaskellDepends = [ base hmatrix mtl random-fu ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/fpco/random-fu-multivariate";
        description = "Multivariate distributions for random-fu";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174563,7 +168154,6 @@ self: {
          base Cabal cabal-test-quickcheck math-functions mwc-random
          QuickCheck random-fu vector
        ];
-       homepage = "https://github.com/srijs/random-hypergeometric";
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174576,7 +168166,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1sj88ccw4pnqlwbga78pvsvzib4irg7xzz4lhqs89xkdz7l043dy";
        libraryHaskellDepends = [ base QuickCheck random safe text ];
-       homepage = "https://github.com/aiya000/hs-random-names";
        description = "Expose Random and Arbitrary instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -174605,7 +168194,6 @@ self: {
          base flexible-defaults mersenne-random-pure64 mtl mwc-random random
          stateref syb template-haskell th-extras
        ];
-       homepage = "https://github.com/mokus0/random-fu";
        description = "Generic basis for random number generators";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -174650,7 +168238,6 @@ self: {
        libraryHaskellDepends = [ base random ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base containers mtl QuickCheck ];
-       homepage = "https://github.com/mikehat/random-strings";
        description = "Generate random strings with specific qualities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174687,7 +168274,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory HUnit random ];
-       homepage = "https://bitbucket.org/kpratt/random-variate";
        description = "\"Uniform RNG => Non-Uniform RNGs\"";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -174706,7 +168292,6 @@ self: {
          base binary bytestring mersenne-random-pure64
        ];
        executableSystemDepends = [ openssl ];
-       homepage = "http://galois.com";
        description = "A fast, SMP parallel random data generator";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
@@ -174718,7 +168303,6 @@ self: {
        version = "0.4";
        sha256 = "0fb0239fwvn1n3rbdr03k4kx1igzbb638a1iq0ln1k1i1fpaayd7";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.haskell.org/haskellwiki/Random_Processes";
        description = "Data structures and support functions for working with random processes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174749,7 +168333,6 @@ self: {
          base Cabal free QuickCheck random test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://bitbucket.org/robertmassaioli/range";
        description = "This has a bunch of code for specifying and managing ranges in your code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174767,7 +168350,6 @@ self: {
        testHaskellDepends = [
          base containers deepseq hashable tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/phadej/range-set-list#readme";
        description = "Memory efficient sets with ranges of elements";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174785,7 +168367,6 @@ self: {
        testHaskellDepends = [
          base containers deepseq hashable tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/phadej/range-set-list#readme";
        description = "Memory efficient sets with ranges of elements";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174807,7 +168388,6 @@ self: {
          base QuickCheck semigroups test-framework
          test-framework-quickcheck2 time vector-space vector-space-points
        ];
-       homepage = "https://github.com/JohnLato/range-space";
        description = "A Range type with vector-space instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174843,7 +168423,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1dn03zlh7n8qk7dir2qdijyk207g9p4nbsc0zw4p3cvfpl4xzzvr";
        libraryHaskellDepends = [ base random-fu ];
-       homepage = "http://github.com/GregorySchwartz/rank-product#readme";
        description = "Find the rank product of a data set";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -174860,7 +168439,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174873,7 +168451,6 @@ self: {
        sha256 = "1qkknjas2w0zrv5kx47i1cxaiyv7814fqj8y69kywsl93q919p42";
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/blamario/grampa/tree/master/rank2classes";
        description = "standard type constructor class hierarchy, only with methods of rank 2 types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174888,7 +168465,6 @@ self: {
        libraryHaskellDepends = [
          async base containers foreign-store stm
        ];
-       homepage = "https://github.com/esoeylemez/rapid";
        description = "Rapid prototyping with GHCi: hot reloading of running components and reload-surviving values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -174904,7 +168480,6 @@ self: {
        libraryHaskellDepends = [
          base clock kan-extensions process transformers unix
        ];
-       homepage = "https://github.com/esoeylemez/rapid-term";
        description = "External terminal support for rapid";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174930,7 +168505,6 @@ self: {
        testHaskellDepends = [
          base eve hspec lens QuickCheck quickcheck-instances text yi-rope
        ];
-       homepage = "https://github.com/ChrisPenner/rasa#readme";
        description = "A modular text editor";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174951,7 +168525,6 @@ self: {
          base data-default lens mtl rasa rasa-ext-cursors rasa-ext-files
          rasa-ext-logger rasa-ext-slate rasa-ext-views rasa-ext-vim yi-rope
        ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Example user config for Rasa";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174967,7 +168540,6 @@ self: {
        libraryHaskellDepends = [
          base containers data-default lens rasa text
        ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for useful buffer utilities";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -174983,7 +168555,6 @@ self: {
        libraryHaskellDepends = [
          base containers data-default lens rasa text
        ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for running commands";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175000,7 +168571,6 @@ self: {
        libraryHaskellDepends = [
          base data-default lens mtl rasa text text-lens yi-rope
        ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext adding cursor(s)";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175018,7 +168588,6 @@ self: {
          base data-default lens mtl rasa rasa-ext-cmd rasa-ext-views text
          yi-rope
        ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for filesystem actions";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175031,7 +168600,6 @@ self: {
        version = "0.1.4";
        sha256 = "1wv3bkfq92h7b91x88mzqcijbpb2kh7zkgg4ljxdx59qi4lb7hry";
        libraryHaskellDepends = [ base lens mtl rasa ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for logging state/actions";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175049,7 +168617,6 @@ self: {
          base lens mtl rasa rasa-ext-logger rasa-ext-views recursion-schemes
          text vty yi-rope
        ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa extension for rendering to terminal with vty";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175062,7 +168629,6 @@ self: {
        version = "0.1.3";
        sha256 = "0grfj3qxlmk63x5cxrbibkhrrgij077f7sr0kj6vcl0np7a5dl98";
        libraryHaskellDepends = [ base data-default lens rasa yi-rope ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for populating status-bar";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175075,7 +168641,6 @@ self: {
        version = "0.1.4";
        sha256 = "198phwvsndsk149rj744znjzw8w2n0238pbv07d7rfs2c1987s04";
        libraryHaskellDepends = [ base data-default lens rasa ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering styles";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175093,7 +168658,6 @@ self: {
          base bifunctors data-default lens mtl rasa recursion-schemes
          yi-rope
        ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext managing rendering views";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175113,7 +168677,6 @@ self: {
          rasa-ext-views text text-lens yi-rope
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/ChrisPenner/rasa/";
        description = "Rasa Ext for vim bindings";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175143,7 +168706,6 @@ self: {
          filepath HUnit mtl process QuickCheck tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       homepage = "http://soli.github.io/rascal/";
        description = "A command-line client for Reddit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175182,7 +168744,6 @@ self: {
        version = "1.4.0";
        sha256 = "0p0bnfnn790kkpgj6v6646fbczznf28a65zsf92xyiab00jw6ilb";
        libraryHaskellDepends = [ base stm time time-units ];
-       homepage = "http://github.com/acw/rate-limit";
        description = "A basic library for rate-limiting IO actions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175204,7 +168765,6 @@ self: {
          aeson base bytestring case-insensitive containers filepath hspec
          http-client http-client-tls http-types text uuid
        ];
-       homepage = "https://github.com/tfausak/ratel#readme";
        description = "Notify Honeybadger about exceptions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -175220,7 +168780,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-client ratel wai
        ];
-       homepage = "https://github.com/tfausak/ratel-wai#readme";
        description = "Notify Honeybadger about exceptions via a WAI middleware";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -175232,7 +168791,6 @@ self: {
        version = "0.1";
        sha256 = "17mqfqvh59vid7sb0vr029az4pn8bb83axf706ngc6i5lir49709";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mightybyte/rating-systems";
        description = "Implementations of several rating systems: Elo, Glicko, etc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175244,7 +168802,6 @@ self: {
        version = "0.1.2";
        sha256 = "06kqr4iyi184sa8y2vdkw5h0pvh5f8lwcqb8mbcn34lpqm961s7g";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/RaphaelJ/ratio-int";
        description = "Fast specialisation of Data.Ratio for Int.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175275,7 +168832,6 @@ self: {
          filepath http-client http-client-tls HUnit template-haskell
          temporary text transformers
        ];
-       homepage = "https://github.com/tfausak/rattletrap#readme";
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -175296,7 +168852,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hspec unordered-containers
        ];
-       homepage = "https://bitbucket.org/dpwiz/raven-haskell";
        description = "Haskell client for Sentry logging service";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -175312,7 +168867,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring case-insensitive mtl raven-haskell scotty text wai
        ];
-       homepage = "http://bitbucket.org/dpwiz/raven-haskell";
        description = "Sentry http interface for Scotty web server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175339,7 +168893,6 @@ self: {
          base mtl QuickCheck syntactic tasty tasty-hunit tasty-quickcheck
          tasty-th
        ];
-       homepage = "https://github.com/Feldspar/raw-feldspar";
        description = "Resource-Aware Feldspar";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175353,7 +168906,6 @@ self: {
        sha256 = "1lxy1wy3awf52968iy5y9r5z4qgnn2sxkdrh7js3m9gadb11w09f";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/23Skidoo/raw-strings-qq";
        description = "Raw string literals for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175366,7 +168918,6 @@ self: {
        sha256 = "1lsvpnv1dncxw6a8a9w1jnzxlv2ya69ly4p4qsl720pzyx4ipc6b";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/xtendo-org/rawfilepath#readme";
        description = "Use RawFilePath instead of FilePath";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -175384,7 +168935,6 @@ self: {
          base deepseq doctest ghc-datasize lens tasty tasty-hunit
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/pkmx/rawr";
        description = "Anonymous extensible records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175397,7 +168947,6 @@ self: {
        version = "0.2.3.0";
        sha256 = "1zk82akj2p4hl9hqwr30fixqfkjlpnb02qwhhflvcpv8gnxpg88i";
        libraryHaskellDepends = [ base bytestring template-haskell text ];
-       homepage = "https://github.com/tolysz/rawstring-qm";
        description = "Simple raw string quotation and dictionary interpolation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175415,7 +168964,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion deepseq MonadRandom random transformers
        ];
-       homepage = "https://github.com/Lysxia/raz.haskell";
        description = "Random Access Zippers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175435,7 +168983,6 @@ self: {
          base regex-applicative smaoin text text-position
        ];
        testHaskellDepends = [ base QuickCheck regex-applicative smaoin ];
-       homepage = "http://rel4tion.org/projects/razom-text-util/";
        description = "Common text/parsing tools for Razom language packages";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175456,7 +169003,6 @@ self: {
          cereal haskoin-core http-api-data servant servant-client
          string-conversions text time
        ];
-       homepage = "http://paychandoc.runeks.me/";
        description = "RESTful Bitcoin Payment Channel Protocol Servant API description";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175473,7 +169019,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bio bytestring containers ];
-       homepage = "http://malde.org/~ketil/";
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175494,7 +169039,6 @@ self: {
          base dde hmatrix Learning random vector
        ];
        testHaskellDepends = [ base dde hmatrix Learning random vector ];
-       homepage = "https://github.com/masterdezign/rc#readme";
        description = "Reservoir Computing, fast RNNs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175539,7 +169083,6 @@ self: {
          base containers criterion deepseq ghc-prim optparse-applicative
          primitive rdtsc time transformers
        ];
-       homepage = "http://github.com/ekmett/rcu/";
        description = "Read-Copy-Update for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175558,7 +169101,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq text
        ];
-       homepage = "https://github.com/traviswhitaker/rdf";
        description = "Representation and Incremental Processing of RDF Data";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -175589,7 +169131,6 @@ self: {
          QuickCheck safe tasty tasty-hunit tasty-quickcheck text
        ];
        benchmarkHaskellDepends = [ base criterion deepseq text ];
-       homepage = "https://github.com/robstewart57/rdf4h";
        description = "A library for RDF processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175625,7 +169166,6 @@ self: {
        version = "1.3.0.1";
        sha256 = "0l6r5v6bgqf7lq9j6bf7w362bz7bv4xrsbz90ns60v4dyqjskjal";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mgrabmueller/rdtsc";
        description = "Binding for the rdtsc machine instruction";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175637,7 +169177,6 @@ self: {
        version = "0.1";
        sha256 = "0v3x7ga4gx5q4gwh8xdhb2arlmjyilr9igz28wysy9qqlcdw775q";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/rdtsc";
        description = "Binding to sources of high-efficiency, high-precision, monotonically increasing relative time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175651,7 +169190,6 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        librarySystemDepends = [ re2 ];
        testHaskellDepends = [ base bytestring HUnit vector ];
-       homepage = "https://github.com/rblaze/haskell-re2#readme";
        description = "Bindings to the re2 regular expression library";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) re2;};
@@ -175670,7 +169208,6 @@ self: {
          aeson base bytestring deepseq mtl template-haskell text time
          unordered-containers
        ];
-       homepage = "https://bitbucket.org/wuzzeb/react-flux";
        description = "A binding to React based on the Flux application architecture for GHCJS";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175682,7 +169219,6 @@ self: {
        version = "0.1.1";
        sha256 = "171q9h2yd78bcwsbhzhggin9wvnwc560vr73zw7abbx2q8aik4q4";
        libraryHaskellDepends = [ aeson base react-flux servant text ];
-       homepage = "https://bitbucket.org/wuzzeb/react-flux-servant";
        description = "Allow react-flux stores to send requests to a servant server";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -175700,7 +169236,6 @@ self: {
          aeson base deepseq lens-family monads-tf text transformers
          unordered-containers void
        ];
-       homepage = "https://github.com/joelburget/react-haskell";
        description = "Haskell React bindings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175734,7 +169269,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl QuickCheck ];
        executableHaskellDepends = [ base mtl QuickCheck ];
-       homepage = "http://wiki.github.com/paolino/realogic";
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175752,7 +169286,6 @@ self: {
          base category-extras checkers old-time QuickCheck random Stream
          TypeCompose unamb vector-space
        ];
-       homepage = "http://haskell.org/haskellwiki/reactive";
        description = "Push-pull functional reactive programming";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175766,7 +169299,6 @@ self: {
        sha256 = "0cic01yikwgalbprz8y0fs7i7c0pynxl7aivsfjgsl75wdpjsj3m";
        libraryHaskellDepends = [ base old-time stm ];
        testHaskellDepends = [ base containers HUnit old-time stm ];
-       homepage = "http://github.com/raimohanska/reactive-bacon";
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175789,7 +169321,6 @@ self: {
          midi-alsa non-empty non-negative random reactive-banana-bunch
          reactive-midyim transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175813,7 +169344,6 @@ self: {
          test-framework test-framework-hunit transformers
          unordered-containers vault
        ];
-       homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Library for functional reactive programming (FRP)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175846,7 +169376,6 @@ self: {
        libraryHaskellDepends = [
          base non-empty reactive-banana transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/reactive-banana-bunch/";
        description = "Extend reactive-banana to multiple events per time point";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175864,7 +169393,6 @@ self: {
          base gi-gtk haskell-gi-base reactive-banana text transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mr/reactive-banana-gi-gtk";
        description = "Simple reactive programming with GTK GObject Introspection";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175882,7 +169410,6 @@ self: {
          base data-lens data-lens-template reactive-banana SDL SDL-image
          SDL-ttf
        ];
-       homepage = "https://github.com/JPMoresmau/reactive-banana-sdl";
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175896,7 +169423,6 @@ self: {
        sha256 = "158yisv0dm9a3b9705rrfywx2kpsc1z1n4ianscfhj7cx4b1r647";
        libraryHaskellDepends = [ base reactive-banana sdl2 ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/cies/reactive-banana-sdl2#readme";
        description = "Reactive Banana integration with SDL2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175912,7 +169438,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base reactive-banana threepenny-gui ];
-       homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175931,7 +169456,6 @@ self: {
        libraryHaskellDepends = [
          base cabal-macosx reactive-banana wx wxcore
        ];
-       homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175949,7 +169473,6 @@ self: {
          base FieldTrip InfixApplicative reactive reactive-glut unamb
          vector-space
        ];
-       homepage = "http://haskell.org/haskellwiki/reactive-fieldtrip";
        description = "Connect Reactive and FieldTrip";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -175966,7 +169489,6 @@ self: {
        libraryHaskellDepends = [
          base GLUT old-time OpenGL reactive vector-space
        ];
-       homepage = "http://haskell.org/haskellwiki/reactive-glut";
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176010,7 +169532,6 @@ self: {
          reactive-banana-bunch reactive-midyim semigroups transformers
          utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana and JACK";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176031,7 +169552,6 @@ self: {
          midi non-negative random reactive-banana-bunch semigroups
          transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Process MIDI events via reactive-banana";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176049,7 +169569,6 @@ self: {
        executableHaskellDepends = [
          base monad-parallel SDL stm transformers
        ];
-       homepage = "https://github.com/strager/reactive-thread";
        description = "Reactive programming via imperative threads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176068,7 +169587,6 @@ self: {
          array base bmp bytestring containers exceptions ghc-prim
          list-extras monad-loops monads-tf parallel random time transformers
        ];
-       homepage = "http://www.alkalisoftware.net/Reactivity.html";
        description = "An alternate implementation of push-pull FRP";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176086,7 +169604,6 @@ self: {
          array base bits-atomic comonad contravariant mtl semigroupoids
          transformers
        ];
-       homepage = "http://comonad.com/reader/";
        description = "Reactor - task parallel reactive programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176099,7 +169616,6 @@ self: {
        version = "0.1.1.1";
        sha256 = "0l4hhnk1s1a5hqda2bw9dgmid0xcqy40wa49dwv2p6314r9074gx";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/thomaseding/read-bounded";
        description = "Class for reading bounded values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176113,7 +169629,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory process ];
-       homepage = "https://github.com/yamadapc/haskell-read-editor";
        description = "Opens a temporary file on the system's EDITOR and returns the resulting edits";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -176126,7 +169641,6 @@ self: {
        sha256 = "0p5pw1y6wcq03bdixircf6bb9qjq2aci6bvpmqwfi360dwbwiwq3";
        libraryHaskellDepends = [ base exceptions transformers ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/read-env-var#readme";
        description = "Functions for safely reading environment variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176139,7 +169653,6 @@ self: {
        sha256 = "1ripb73cnr0zj6li5w5j975ja640frq955xsaf83pxc1ww3zngjw";
        libraryHaskellDepends = [ base containers directory filepath ];
        testHaskellDepends = [ base containers directory filepath hspec ];
-       homepage = "https://github.com/zaidan/read-io#readme";
        description = "Read IO library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176152,7 +169665,6 @@ self: {
        version = "0.3.1";
        sha256 = "1ja39cg26wy2fs00gi12x7iq5k8i366pbqi3p916skfa5jnkfc3h";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "https://github.com/mightybyte/readable";
        description = "Reading from Text and ByteString";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176166,7 +169678,6 @@ self: {
        revision = "1";
        editedCabalFile = "1lcgpdjlv1kaasyhk327cvkw4ar06mr7ks8xrkvxf27njdiv035s";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/george-steel/readcsv";
        description = "Lightweight CSV parser/emitter based on ReadP";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -176212,7 +169723,6 @@ self: {
        testHaskellDepends = [
          base HUnit protolude tasty tasty-hunit text
        ];
-       homepage = "https://github.com/tonyday567/readme-lhs";
        description = "See readme.lhs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176227,7 +169737,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bliplib parseargs ];
-       homepage = "https://github.com/bjpop/blip";
        description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176263,7 +169772,6 @@ self: {
        testHaskellDepends = [
          base quickcheck-instances tasty tasty-quickcheck time
        ];
-       homepage = "https://github.com/s9gf4ult/real-day-end";
        description = "Tiny library to calculate date considering when your day realy ends";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176275,7 +169783,6 @@ self: {
        version = "0.4.0.0";
        sha256 = "1qmrfisnvm9a25a9ssg4r466yna69vzbwn7s7f4zql28cndg3syy";
        libraryHaskellDepends = [ base parsec ];
-       homepage = "http://website-ckkashyap.rhcloud.com";
        description = "A really simple XML parser";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176288,7 +169795,6 @@ self: {
        version = "0.2.1.1";
        sha256 = "0ic239ikxqsk4qjnyraka3jn4pjmmsgwqyga6zmqlw7z1kpgaxam";
        libraryHaskellDepends = [ base mtl split template-haskell ];
-       homepage = "https://github.com/tokiwoousaka/reasonable-lens";
        description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176303,7 +169809,6 @@ self: {
        revision = "1";
        editedCabalFile = "1ky8nncf441i32hni0090lm5vrh67dqvj99c09c1i58gxjad4gln";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/tokiwoousaka/reasonable-operational";
        description = "Just size Operational Monad implementation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -176325,7 +169830,6 @@ self: {
          profunctors scientific semigroupoids semigroups stm text time
          transformers unordered-containers uuid vector void
        ];
-       homepage = "https://github.com/nikita-volkov/rebase";
        description = "A more progressive alternative to the \"base\" package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -176337,7 +169841,6 @@ self: {
        version = "0.1.2";
        sha256 = "0zd1ik544hcfwmxwg0jvfsw6giwkzppf7hb573a9ck0xm6daslp7";
        libraryHaskellDepends = [ base data-default-class indexed ];
-       homepage = "https://github.com/sleexyz/rebindable";
        description = "A library to facilitate rebinding of Haskell syntax";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -176349,7 +169852,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "03a3f34lcd387112pfa931wwna58av5yv4jvx4nl0zkryp1p4qd2";
        libraryHaskellDepends = [ base HTTP network network-uri xhtml ];
-       homepage = "http://github.com/jgm/recaptcha/tree/master";
        description = "Functions for using the reCAPTCHA service in web applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176365,7 +169867,6 @@ self: {
        libraryHaskellDepends = [
          base base-prelude basic-lens template-haskell transformers
        ];
-       homepage = "https://github.com/nikita-volkov/record";
        description = "Anonymous records";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176383,7 +169884,6 @@ self: {
          aeson base base-prelude record template-haskell
        ];
        testHaskellDepends = [ aeson base-prelude hspec record ];
-       homepage = "https://github.com/nikita-volkov/record-aeson";
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176398,7 +169898,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base extra filepath ];
-       homepage = "https://github.com/ndmitchell/record-dot-preprocessor#readme";
        description = "Preprocessor to allow record.field syntax";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176442,7 +169941,6 @@ self: {
        ];
        benchmarkHaskellDepends = [ base-prelude basic-lens record ];
        doHaddock = false;
-       homepage = "https://github.com/nikita-volkov/record-preprocessor";
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176467,7 +169965,6 @@ self: {
        benchmarkHaskellDepends = [
          base-prelude conversion conversion-text record text
        ];
-       homepage = "https://github.com/nikita-volkov/record-syntax";
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176482,7 +169979,6 @@ self: {
        revision = "1";
        editedCabalFile = "01ydi3gzgr72z56i1rdq10g4xrfz2f9vz6vn03mp84r74k5zdgrv";
        libraryHaskellDepends = [ base kinds type-functions ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records";
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176516,7 +170012,6 @@ self: {
          aeson base data-default kinds records template-haskell text
          type-functions unordered-containers
        ];
-       homepage = "github.com/lassoinc/records-th";
        description = "Template Haskell declarations for the records package";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176538,7 +170033,6 @@ self: {
          template-haskell transformers transformers-compat
        ];
        testHaskellDepends = [ base HUnit template-haskell transformers ];
-       homepage = "http://github.com/ekmett/recursion-schemes/";
        description = "Generalized bananas, lenses and barbed wire";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176558,7 +170052,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq recursion-schemes
        ];
-       homepage = "https://hub.darcs.net/vmchale/recursion-schemes-ext#readme";
        description = "Amateur addenda to recursion-schemes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176576,7 +170069,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers filepath gtk mtl process
        ];
-       homepage = "https://github.com/joeyadams/haskell-recursive-line-count";
        description = "Count lines in files and display them hierarchically";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176589,7 +170081,6 @@ self: {
        sha256 = "1k23whbj4yh10sdv58b69hjsx1ysdps78ny2ylgbl1nbp40xy60b";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec QuickCheck template-haskell ];
-       homepage = "https://www.github.com/jwiegley/recursors";
        description = "Auto-generate final encodings and their isomorphisms using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176603,7 +170094,6 @@ self: {
        sha256 = "0wz3afh2d2rzhp76whbn607pzmpkd28imycrdrdbk1pxrk1psbxf";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/GAumala/red-black-tree";
        description = "Red Black Trees implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176645,7 +170135,6 @@ self: {
          aeson api-builder base bytestring Cabal data-default-class hspec
          http-client http-client-tls text time transformers yaml
        ];
-       homepage = "https://github.com/intolerable/reddit#readme";
        description = "Library for interfacing with Reddit's API";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176663,7 +170152,6 @@ self: {
          base bytestring concurrent-extra containers exceptions mtl network
          old-time utf8-string
        ];
-       homepage = "http://hub.darcs.net/ganesh/redis";
        description = "A driver for Redis key-value database";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -176675,7 +170163,6 @@ self: {
        version = "0.1.2";
        sha256 = "1irayxwkdksc9v70g7il7zl7pmkrim2admcgjwcm9inyca7618wg";
        libraryHaskellDepends = [ base bytestring network utf8-string ];
-       homepage = "http://ohloh.net/p/redis-hs";
        description = "A simple Redis library for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -176704,7 +170191,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion hedis redis-resp tinylog transformers
        ];
-       homepage = "https://gitlab.com/twittner/redis-io/";
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -176733,7 +170219,6 @@ self: {
          attoparsec base bytestring bytestring-conversion containers dlist
          double-conversion operational semigroups split transformers
        ];
-       homepage = "https://gitlab.com/twittner/redis-resp/";
        description = "REdis Serialization Protocol (RESP) implementation";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -176745,7 +170230,6 @@ self: {
        version = "0.1.1";
        sha256 = "0kzs5lc2y40dzx57k0klz0k9zijhi7mh0awi6rzhzd3h5z1gdr43";
        libraryHaskellDepends = [ base binary bytestring redis ];
-       homepage = "http://github.com/jaspervdj/redis-simple";
        description = "Simple redis bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176761,7 +170245,7 @@ self: {
        description = "Redland RDF library bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {raptor2 = null; redland = null;};
+     }) {raptor2 = null; inherit (pkgs) redland;};
 
   "redo" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
@@ -176776,7 +170260,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers directory filepath process pureMD5
        ];
-       homepage = "https://github.com/jekor/redo";
        description = "software build system, make replacement, implementation of djb's redo";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -176802,7 +170285,6 @@ self: {
          MissingH QuickCheck quickspec stringable tasty tasty-quickcheck
          text
        ];
-       homepage = "http://chriswarbo.net/projects/repos/reduce-equations.html";
        description = "Simplify a set of equations by removing redundancies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176821,7 +170303,6 @@ self: {
          array base bytestring containers fingertree hashable semigroupoids
          semigroups text transformers unordered-containers
        ];
-       homepage = "http://github.com/ekmett/reducers/";
        description = "Semigroups, specialized containers and a general map/reduce framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -176849,7 +170330,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion exceptions loop mtl primitive vector
        ];
-       homepage = "http://github.com/NicolasT/reedsolomon";
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176886,7 +170366,6 @@ self: {
        version = "0.1.1.2";
        sha256 = "109illgbz4g4a6qavgc4wvyxfjvjhyrxa2gpps67avmr1v90gihr";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176910,7 +170389,6 @@ self: {
        version = "0.3";
        sha256 = "0wijkaf3qyp6qjz0cwyhb89z5jrcz792hx8m9a43xrp7v2f84080";
        libraryHaskellDepends = [ base mtl stm transformers ];
-       homepage = "http://www.eecs.harvard.edu/~mainland/";
        description = "A type class for monads with references compatible with the mtl2 library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176955,7 +170433,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 test-framework-th
          unordered-containers
        ];
-       homepage = "https://github.com/RobotGymnast/refcount";
        description = "Container with element counts";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176990,7 +170467,6 @@ self: {
          instance-control lens mtl template-haskell text transformers
          uniplate
        ];
-       homepage = "https://github.com/lazac/references";
        description = "Selectors for reading and updating data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177008,7 +170484,6 @@ self: {
        executableHaskellDepends = [
          base clippard cmdargs directory filepath haskheap network
        ];
-       homepage = "https://github.com/Raynes/refh";
        description = "A command-line tool for pasting to https://www.refheap.com";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177021,7 +170496,6 @@ self: {
        version = "0.1.2.1";
        sha256 = "0xz712w0qg8dv7v4ijiqq5r61v7cy6vn14d31ka37i5khsr0hvhm";
        libraryHaskellDepends = [ base base-prelude template-haskell ];
-       homepage = "https://github.com/nikita-volkov/refined";
        description = "Refinement types with static and runtime checking";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -177033,7 +170507,6 @@ self: {
        version = "2.1.3";
        sha256 = "01g4ilgj073vvn6dx4y1fkiq81xk01ccswbhvr8iw8fpmciiky48";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177048,7 +170521,6 @@ self: {
        libraryHaskellDepends = [
          aeson base constraints lens reflection tagged
        ];
-       homepage = "http://github.com/jfischoff/reflection-extras";
        description = "Utilities for the reflection package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177062,7 +170534,6 @@ self: {
        sha256 = "1iz4k42hc8f11a6kg2db847zmq5qpfiwns1448s62jswc2xm0x0r";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base type-aligned ];
-       homepage = "https://github.com/atzeus/reflection-without-remorse";
        description = "Efficient free and operational monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177090,7 +170561,6 @@ self: {
          base containers criterion deepseq dependent-map dependent-sum mtl
          primitive ref-tf split stm transformers
        ];
-       homepage = "https://github.com/reflex-frp/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177108,7 +170578,6 @@ self: {
          base bifunctors containers profunctors reflex reflex-transformers
          semigroups vector-space
        ];
-       homepage = "https://github.com/saulzar/reflex-animation";
        description = "Continuous animations support for reflex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177152,7 +170621,6 @@ self: {
          base colonnade containers contravariant reflex reflex-dom
          semigroups text vector
        ];
-       homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Use colonnade with reflex-dom";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177172,7 +170640,6 @@ self: {
          http-types lens mtl random readable reflex reflex-dom safe
          string-conv text time transformers
        ];
-       homepage = "https://github.com/reflex-frp/reflex-dom-contrib";
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177188,7 +170655,6 @@ self: {
          base reflex reflex-dom template-haskell
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/layer-3-communications/reflex-dom-helpers";
        description = "Element tag helpers for working with reflex-dom";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177205,7 +170671,6 @@ self: {
        libraryHaskellDepends = [
          base dependent-sum gloss mtl reflex transformers
        ];
-       homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177234,7 +170699,6 @@ self: {
          base containers gloss lens linear mtl reflex reflex-animation
          reflex-transformers transformers
        ];
-       homepage = "https://github.com/saulzar/reflex-gloss-scene";
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177252,7 +170716,6 @@ self: {
          base containers haskell-src-meta parsec reflex reflex-dom
          template-haskell text
        ];
-       homepage = "https://github.com/dackerman/reflex-jsx";
        description = "Use jsx-like syntax in Reflex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177290,7 +170753,6 @@ self: {
          primitive ref-tf reflex sdl2 stm
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/schell/reflex-sdl2#readme";
        description = "SDL2 and reflex FRP";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177307,7 +170769,6 @@ self: {
        libraryHaskellDepends = [
          base containers lens mtl reflex semigroups stateWriter transformers
        ];
-       homepage = "http://github.com/saulzar/reflex-transformers";
        description = "Collections and switchable Monad transformers for Reflex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177320,7 +170781,6 @@ self: {
        version = "0.2.7.2";
        sha256 = "14as5chpwfrrqdfxk5g03f4zia0dx10npb802cphfq2j598mjczv";
        libraryHaskellDepends = [ base containers mtl semigroups text ];
-       homepage = "http://www.happstack.com/";
        description = "reform is a type-safe HTML form generation and validation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177334,7 +170794,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html blaze-markup reform text
        ];
-       homepage = "http://www.happstack.com/";
        description = "Add support for using blaze-html with Reform";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177348,7 +170807,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-markup reform shakespeare text
        ];
-       homepage = "http://www.happstack.com/";
        description = "Add support for using Hamlet with Reform";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177364,7 +170822,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring happstack-server mtl random reform text utf8-string
        ];
-       homepage = "http://www.happstack.com/";
        description = "Happstack support for reform";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177376,7 +170833,6 @@ self: {
        version = "0.2.7.1";
        sha256 = "084d03inyplx3n2zykaz2g7gskzs9hcjq8klhlnzpb1b6ahx5va8";
        libraryHaskellDepends = [ base hsp hsx2hs reform text ];
-       homepage = "http://www.happstack.com/";
        description = "Add support for using HSP with Reform";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177388,7 +170844,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1cvffbx2vhv18k4p95p0ddcxzyn8f10hg2bxa2da60fy9zkjg3am";
        libraryHaskellDepends = [ base parsec ];
-       homepage = "https://github.com/Qinka/reformat";
        description = "The parser and render to parsec and render the string";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177405,7 +170860,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-default exceptions lens mtl ];
-       homepage = "https://github.com/konn/refresht#readme";
        description = "Environment Monad with automatic resource refreshment";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177418,7 +170872,6 @@ self: {
        sha256 = "1jg2kadp64m5jsxygc3kwdd4wghfl6fs26l019j6s1vgmvsspnyq";
        libraryHaskellDepends = [ aeson base containers text ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/oreshinya/refty";
        description = "Formatted JSON generator for API server inspired by normalizr";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -177446,7 +170899,6 @@ self: {
          old-locale opaleye optparse-applicative postgresql-simple process
          product-profunctors template-haskell text these thyme vector-space
        ];
-       homepage = "https://github.com/ConferHealth/refurb#readme";
        description = "Tools for maintaining a database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177468,7 +170920,6 @@ self: {
          time time-locale-compat transformers unordered-containers
          utf8-string
        ];
-       homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177487,7 +170938,6 @@ self: {
          base containers smallcheck tasty tasty-hunit tasty-smallcheck
          transformers
        ];
-       homepage = "https://github.com/feuerbach/regex-applicative";
        description = "Regex-based parsing with applicative interface";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -177501,7 +170951,6 @@ self: {
        revision = "2";
        editedCabalFile = "19sdafr0i252xyy017yxmz76ipl5bdg3hiv3ka8sjbwryj16gdwi";
        libraryHaskellDepends = [ base regex-applicative text ];
-       homepage = "https://github.com/phadej/regex-applicative-text#readme";
        description = "regex-applicative on text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177513,7 +170962,6 @@ self: {
        version = "0.93.2";
        sha256 = "0y1j4h2pg12c853nzmczs263di7xkkmlnsq5dlp5wgbgl49mgp10";
        libraryHaskellDepends = [ array base bytestring containers mtl ];
-       homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177525,7 +170973,6 @@ self: {
        version = "0.95.1";
        sha256 = "0fwmima3f04p9y4h3c23493n1xj629ia2dxaisqm6rynljjv2z6m";
        libraryHaskellDepends = [ array base regex-base regex-posix ];
-       homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177537,7 +170984,6 @@ self: {
        version = "0.95.1.4";
        sha256 = "1p90fn90yhp7fvljjdqjp41cszidcfz4pw7fwvzyx4739b98x8sg";
        libraryHaskellDepends = [ array base regex-base regex-tdfa ];
-       homepage = "http://hub.darcs.net/shelarcy/regex-compat-tdfa";
        description = "Unicode Support version of Text.Regex, using regex-tdfa";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177555,7 +171001,6 @@ self: {
          base bitset bytestring containers deepseq dequeue ghc-prim hashable
          hashtables mtl parallel parsec regex-base
        ];
-       homepage = "http://code.google.com/p/xhaskell-regex-deriv/";
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177568,7 +171013,6 @@ self: {
        version = "0.91";
        sha256 = "1f846d86wg7yha29qinchpi3r5gv9795f384pqahbyc13wfky7dp";
        libraryHaskellDepends = [ base mtl parsec regex-base ];
-       homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177590,7 +171034,6 @@ self: {
          array base bytestring hspec QuickCheck regex-base regex-pcre
          stringsearch tagged text
        ];
-       homepage = "https://github.com/ciez/regex-do";
        description = "PCRE wrapper";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -177606,7 +171049,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring regex-pcre string-conversions
        ];
-       homepage = "https://github.com/zerobuzz/regex-easy";
        description = "sugar for regex-pcre";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177642,7 +171084,6 @@ self: {
          tasty-smallcheck template-haskell text time time-locale-compat
          transformers unordered-containers utf8-string
        ];
-       homepage = "http://regex.uk";
        description = "Tutorial, tests and example programs for regex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177662,7 +171103,6 @@ self: {
          base containers logict mtl regex-tdfa sbv stream-monad text
        ];
        executableHaskellDepends = [ base containers mtl regex-tdfa sbv ];
-       homepage = "https://github.com/audreyt/regex-genex";
        description = "From a regex, generate all possible strings it can match";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177675,7 +171115,6 @@ self: {
        version = "0.90";
        sha256 = "0zf5cr10mxlxxd8fp4q4ix6ibxc5xx3ml3k043kx28f9vfdh2xnx";
        libraryHaskellDepends = [ base parsec regex-base ];
-       homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177693,7 +171132,6 @@ self: {
          array base bytestring containers regex-base
        ];
        librarySystemDepends = [ pcre ];
-       homepage = "http://hackage.haskell.org/package/regex-pcre";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) pcre;};
@@ -177707,7 +171145,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
-       homepage = "http://hackage.haskell.org/package/regex-pcre";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177724,7 +171161,6 @@ self: {
          array base bytestring regex-base regex-pcre-builtin regex-tdfa-text
          text
        ];
-       homepage = "https://github.com/cdornan/regex-pcre-text";
        description = "Text-based PCRE API for regex-base";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177741,7 +171177,6 @@ self: {
          base bitset bytestring containers deepseq ghc-prim mtl parallel
          parsec regex-base
        ];
-       homepage = "http://code.google.com/p/xhaskell-library/";
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177756,7 +171191,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers regex-base
        ];
-       homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177790,7 +171224,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
-       homepage = "https://github.com/ChrisKuklewicz/regex-tdfa";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177806,7 +171239,6 @@ self: {
        libraryHaskellDepends = [
          array base lens monads-tf pipes regex-base regex-tdfa
        ];
-       homepage = "http://github.com/erisco/regex-tdfa-pipes";
        description = "Parse with regular expressions on Producers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177819,7 +171251,6 @@ self: {
        version = "0.2.1.0";
        sha256 = "1l0yk2m2k4ybjx3pidcn2xpij9cnyi76ar74llf09vwv764mh36f";
        libraryHaskellDepends = [ base regex-tdfa template-haskell ];
-       homepage = "http://github.com/erisco/regex-tdfa-quasiquoter";
        description = "Quasi-quoter for TDFA (extended POSIX) regular expressions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177836,7 +171267,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers ghc-prim mtl parsec regex-base
        ];
-       homepage = "http://hackage.haskell.org/package/regex-tdfa";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -177896,7 +171326,6 @@ self: {
        sha256 = "1b7x0y8q1fvipnzh06by48f8l9l5ypm6yblpl35fzf641z3m9b7j";
        libraryHaskellDepends = [ base regex-base ];
        librarySystemDepends = [ tre ];
-       homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177909,7 +171338,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "02pwls2yfp9y6g7lcfnkxjfbz3h280y9ifqh870bis16fa8dy6gv";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kcsongor/regex-type";
        description = "Type-level regular expressions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177929,7 +171357,6 @@ self: {
          regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text
          transformers unordered-containers
        ];
-       homepage = "http://regex.uk";
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177942,7 +171369,6 @@ self: {
        version = "0.1.5";
        sha256 = "1dmhvnz6sj80kdnm2v7n0lvx8g9arhf9pqqzkn0rwzfhr2by0ss4";
        libraryHaskellDepends = [ base haskell98 parsec ];
-       homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177969,7 +171395,6 @@ self: {
          toolshed
        ];
        testHaskellDepends = [ base QuickCheck regexdot toolshed ];
-       homepage = "http://functionalley.eu/RegExChar/regExChar.html";
        description = "A POSIX, extended regex-engine";
        license = "GPL";
      }) {};
@@ -177985,7 +171410,6 @@ self: {
        libraryHaskellDepends = [
          base data-default deepseq extra parallel parsec toolshed
        ];
-       homepage = "http://functionalley.eu/RegExDot/regExDot.html";
        description = "A polymorphic, POSIX, extended regex-engine";
        license = "GPL";
      }) {};
@@ -178001,7 +171425,6 @@ self: {
        libraryHaskellDepends = [
          base containers derive-trie template-haskell weighted-regexp
        ];
-       homepage = "http://github.com/baldo/regexp-tries";
        description = "Regular Expressions on Tries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178014,7 +171437,6 @@ self: {
        version = "0.5.4";
        sha256 = "0136wp6hrnmj6pbdhp3a131dzz8bp1pbd92bpagpv1r6gwj16y5z";
        libraryHaskellDepends = [ base HUnit mtl mtlparse ];
-       homepage = "http://homepage3.nifty.com/salamander/second/projects/regexpr/";
        description = "regular expression like Perl/Ruby in Haskell";
        license = "LGPL";
      }) {};
@@ -178027,7 +171449,6 @@ self: {
        sha256 = "1cpwvb5mmcaqwy617m6cr25pcb4v4yxwzxng82bcrwkhjfdklsdr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html";
        description = "Regular expressions via symbolic manipulation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178042,7 +171463,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring pcre-light template-haskell
        ];
-       homepage = "http://code.haskell.org/~morrow/code/haskell/regexqq";
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178058,7 +171478,6 @@ self: {
        libraryHaskellDepends = [
          base base-unicode-symbols regions transformers
        ];
-       homepage = "https://github.com/basvandijk/regional-pointers/";
        description = "Regional memory pointers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178075,7 +171494,6 @@ self: {
        libraryHaskellDepends = [
          base base-unicode-symbols monad-control transformers
        ];
-       homepage = "https://github.com/basvandijk/regions/";
        description = "Provides the region monad for safely opening and working with scarce resources";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178108,7 +171526,6 @@ self: {
        libraryHaskellDepends = [
          base-unicode-symbols monads-tf regions transformers
        ];
-       homepage = "https://github.com/basvandijk/regions-monadstf/";
        description = "Monads-tf instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178121,7 +171538,6 @@ self: {
        version = "0.3.1.7";
        sha256 = "1s0sr42k1kmwgmrnj5zcan0j9br8xrrm1vdnj6yhliqdfz41ifc0";
        libraryHaskellDepends = [ base-unicode-symbols mtl regions ];
-       homepage = "https://github.com/basvandijk/regions-mtl/";
        description = "mtl instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178134,7 +171550,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0zsvpsqksms9fh0zwyngb0sm1scffi47ipphgfn7b5m3km9z6cjj";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kcsongor/register-machine-type";
        description = "A computationally universal register machine implementation at the type-level";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178147,7 +171562,6 @@ self: {
        version = "0.1.1";
        sha256 = "00b4n4gw5y0mpayb0zlkvz91nfrpbspz22kqhpvdnxbb4zcz7pnj";
        libraryHaskellDepends = [ ad base vector ];
-       homepage = "https://github.com/alpmestan/regress";
        description = "Linear and logistic regression through automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178190,7 +171604,6 @@ self: {
        libraryHaskellDepends = [
          applicative-extras base fclabels formlets json mtl regular xhtml
        ];
-       homepage = "http://github.com/chriseidhof/regular-web";
        description = "Generic programming for the web";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178203,7 +171616,6 @@ self: {
        version = "0.2";
        sha256 = "1qjx4xsidnpr2as3m2ir97ap5vc9cw6a0z332g53ifx9gskjli9f";
        libraryHaskellDepends = [ base hxt regular text ];
-       homepage = "http://github.com/silkapp/regular-xmlpickler";
        description = "Generic generation of HXT XmlPickler instances using Regular";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178219,7 +171631,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base directory text vty vty-ui ];
        testHaskellDepends = [ base directory QuickCheck text vty vty-ui ];
-       homepage = "https://github.com/mrVanDalo/reheat";
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178238,7 +171649,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs parallel-io shelly split system-filepath text
        ];
-       homepage = "https://github.com/jwiegley/rehoo";
        description = "Rebuild default.hoo from many .hoo files in the current directory";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178256,7 +171666,6 @@ self: {
        executableHaskellDepends = [
          attoparsec base bytestring containers directory regex-tdfa split
        ];
-       homepage = "https://github.com/kerkomen/rei";
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178269,7 +171678,6 @@ self: {
        version = "0.2.2";
        sha256 = "0vg05idyiy3havw8rlsky7x4y34mpk6by9500r7rb921xgpdq70a";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "http://bitbucket.org/jozefg/reified-records";
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178286,7 +171694,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ghc ];
        executableHaskellDepends = [ base ghc ];
-       homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Serialize data";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178303,7 +171710,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        testHaskellDepends = [ base data-binary-ieee754 hspec loop ];
        benchmarkHaskellDepends = [ base criterion data-binary-ieee754 ];
-       homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -178315,7 +171721,6 @@ self: {
        version = "0.1";
        sha256 = "1jq3ii9j8s7q8fr7ac2pdr2l33jvzsyyq70cjd9q1spqa1v6k976";
        libraryHaskellDepends = [ array base containers ];
-       homepage = "not available";
        description = "A relation data structure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178334,7 +171739,6 @@ self: {
          aeson base base16-bytestring bytestring containers include-file
          tasty tasty-hspec text vector
        ];
-       homepage = "https://github.com/iostat/relapse#readme";
        description = "Sensible RLP encoding";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -178346,7 +171750,6 @@ self: {
        version = "0.2.1";
        sha256 = "03h6l8v3ppxbwg9ddgg121yx3i2v4vbcpwrv1vg3mgbw5pwq7x4c";
        libraryHaskellDepends = [ array base containers groom ];
-       homepage = "https://www.github.com/d-day/relation/";
        description = "A data structure representing Relations on Sets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178365,7 +171768,6 @@ self: {
          base containers HDBC names-th persistable-record relational-query
          relational-query-HDBC template-haskell time transformers
        ];
-       homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8";
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178389,7 +171791,6 @@ self: {
        testHaskellDepends = [
          base containers product-isomorphic quickcheck-simple transformers
        ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Typeful, Modular, Relational, algebraic query engine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178410,7 +171811,6 @@ self: {
          relational-schemas sql-words template-haskell th-data-compat
          transformers
        ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "HDBC instance of relational-query and typed query interface for HDBC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178428,7 +171828,6 @@ self: {
          base persistable-record persistable-types-HDBC-pg
          product-isomorphic relational-query relational-query-HDBC
        ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Meta package of Relational Record";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178464,7 +171863,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers relational-query template-haskell time
        ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "RDBMSs' schema templates for relational-query";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178491,7 +171889,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0i9g6rqq31y6y9jnc9bi0vfrpxmjr3vqfjz2w4q7jc87dplyd2qk";
        libraryHaskellDepends = [ aeson base chronos text torsor ];
-       homepage = "https://github.com/chessai/relevant-time.git";
        description = "humanised relevant time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178538,7 +171935,6 @@ self: {
          wai-handler-launch wai-middleware-static wai-websockets warp
          websockets
        ];
-       homepage = "https://github.com/jpmoresmau/reload#readme";
        description = "A web based Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178559,7 +171955,6 @@ self: {
        testHaskellDepends = [
          base GenericPretty tasty tasty-golden tasty-hunit
        ];
-       homepage = "https://github.com/oleks/remark#readme";
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178582,7 +171977,6 @@ self: {
        testHaskellDepends = [
          base GenericPretty tasty tasty-golden tasty-hunit
        ];
-       homepage = "https://github.com/DIKU-EDU/remarks#readme";
        description = "A DSL for marking student work";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178641,7 +172035,6 @@ self: {
        executableHaskellDepends = [
          array base ghc ghc-paths json network
        ];
-       homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178759,7 +172152,6 @@ self: {
          placeholders QuickCheck quickcheck-instances stm system-fileio
          system-filepath text time transformers-base
        ];
-       homepage = "https://github.com/nikita-volkov/remotion";
        description = "A library for client-server applications based on custom protocols";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178772,7 +172164,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1idn0jg74wm3ksy5n4jk2dzsij64r1byghr6qc03g4d85n6mmsni";
        libraryHaskellDepends = [ base containers hashable transformers ];
-       homepage = "https://github.com/schell/renderable";
        description = "An API for managing renderable resources";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -178817,7 +172208,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring ghc-prim QuickCheck template-haskell vector
        ];
-       homepage = "http://repa.ouroborus.net";
        description = "High performance, regular, shape polymorphic parallel arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178831,7 +172221,6 @@ self: {
        revision = "1";
        editedCabalFile = "1dj9gq4v9y8818d5vx2zlsdl4fspwi4aywfbminr7dvlljhf415k";
        libraryHaskellDepends = [ base repa vector ];
-       homepage = "http://repa.ouroborus.net";
        description = "Algorithms using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178849,7 +172238,6 @@ self: {
          base bytestring double-conversion filelock mtl primitive
          repa-convert repa-eval repa-scalar repa-stream text vector
        ];
-       homepage = "http://repa.ouroborus.net";
        description = "Bulk array representations and operators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178863,7 +172251,6 @@ self: {
        sha256 = "1q7kvm39iqabanrgyi438n8mfn1ikvpygralyakfc02rm2gpl0gb";
        libraryHaskellDepends = [ base repa ];
        doHaddock = false;
-       homepage = "http://repa.ouroborus.net";
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178880,7 +172267,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring double-conversion primitive repa-scalar text vector
        ];
-       homepage = "http://repa.ouroborus.net";
        description = "Packing and unpacking flat tables";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178894,7 +172280,6 @@ self: {
        sha256 = "0f7xawg4qlfbf24lrjbpqzl3f3zf63f8g5b2gi17h0rpyw3cxhzy";
        libraryHaskellDepends = [ base repa transformers ];
        librarySystemDepends = [ libdevil ];
-       homepage = "https://github.com/RaphaelJ/repa-devil";
        description = "Support for image reading and writing of Repa arrays using in-place FFI calls";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178907,7 +172292,6 @@ self: {
        version = "4.2.3.1";
        sha256 = "13dla66r1k85zibic3291xdwgv8hf44z9i6814p14xk8cqgbj9an";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "http://repa.ouroborus.net";
        description = "Low-level parallel operators on bulk random-accessble arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178929,7 +172313,6 @@ self: {
          base QuickCheck random repa repa-algorithms repa-io
          template-haskell vector
        ];
-       homepage = "http://repa.ouroborus.net";
        description = "Examples using the Repa array library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178968,7 +172351,6 @@ self: {
          repa-array repa-convert repa-eval repa-scalar repa-stream text
          vector
        ];
-       homepage = "http://repa.ouroborus.net";
        description = "Data-parallel data flows";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178987,7 +172369,6 @@ self: {
        libraryHaskellDepends = [
          base binary bmp bytestring old-time repa vector
        ];
-       homepage = "http://repa.ouroborus.net";
        description = "Read and write Repa arrays in various formats";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -178999,7 +172380,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "18lryk19dfcgq8d09lyc4bchg3gxlr1n8k4m50np2zmhk911n3jn";
        libraryHaskellDepends = [ base hmatrix repa vector ];
-       homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179033,7 +172413,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring double-conversion primitive time vector
        ];
-       homepage = "http://repa.ouroborus.net";
        description = "Scalar data types and conversions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179076,7 +172455,6 @@ self: {
        version = "4.2.3.1";
        sha256 = "0xdsnfmm8pw1daprz609h5qmiz9qdiv7n1zxk0yvxqmfpm3r4kl9";
        libraryHaskellDepends = [ base mtl primitive repa-scalar vector ];
-       homepage = "http://repa.ouroborus.net";
        description = "Stream functions not present in the vector library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179097,7 +172475,6 @@ self: {
          vector
        ];
        executableHaskellDepends = [ base gloss repa ];
-       homepage = "https://github.com/cgo/hsimage";
        description = "Provides high-level access to webcams";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179112,7 +172489,6 @@ self: {
        libraryHaskellDepends = [
          base ghc ghc-paths haskell-src-exts parsec
        ];
-       homepage = "https://github.com/mikeplus64/repl";
        description = "IRC friendly REPL library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179132,7 +172508,6 @@ self: {
          functor-monadic ListLike listsafe monad-loops mtl parsec
          semigroupoids text transformers
        ];
-       homepage = "https://github.com/ombocomp/repl-toolkit";
        description = "Toolkit for quickly whipping up config files and command-line interfaces";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -179159,7 +172534,6 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring hedis-namespace mtl ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/jamesdabbs/replicant#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179172,7 +172546,6 @@ self: {
        version = "0.1.7.0";
        sha256 = "1pjmkr5lnc6vdy8g90wnxlh1rzq6f3sc0j1facfc42iqi9fh6fjh";
        libraryHaskellDepends = [ base containers haskeline mtl process ];
-       homepage = "https://github.com/sdiehl/repline";
        description = "Haskeline wrapper for GHCi-like REPL interfaces";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -179200,7 +172573,6 @@ self: {
          hspec-discover ixset lens mtl old-locale parsec QuickCheck stm text
          time transformers transformers-base transformers-compat
        ];
-       homepage = "https://github.com/saep/repo-based-blog";
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179217,7 +172589,6 @@ self: {
        libraryHaskellDepends = [
          base base-unicode-symbols dstring random string-combinators
        ];
-       homepage = "https://github.com/basvandijk/repr";
        description = "Render overloaded expressions to their textual representation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179230,7 +172601,6 @@ self: {
        version = "0.1.1";
        sha256 = "1ypfb65ghjwxzsx525lcqc3f6pdr357lw6c2xgn54d4f3xi6xphj";
        libraryHaskellDepends = [ base containers syb text ];
-       homepage = "https://github.com/nikita-volkov/repr-tree-syb";
        description = "Tree representation and pretty-printing of data structures based on SYB";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -179249,7 +172619,6 @@ self: {
          contravariant distributive free keys mtl semigroupoids semigroups
          transformers
        ];
-       homepage = "http://github.com/ekmett/representable-functors/";
        description = "Representable functors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179263,7 +172632,6 @@ self: {
        sha256 = "0bly94xix00krgl7iaxwb0l0bvykrm0zqz57m78p8j7pdmkr89wc";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
-       homepage = "http://github.com/ekmett/representable-profunctors/";
        description = "This package has been absorbed into profunctor-extras";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -179282,7 +172650,6 @@ self: {
          distributive keys mtl representable-functors semigroupoids
          semigroups transformers
        ];
-       homepage = "http://github.com/ekmett/representable-tries/";
        description = "Tries from representations of polynomial functors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179298,7 +172665,6 @@ self: {
        libraryHaskellDepends = [
          base mtl syb syz text transformers uniplate
        ];
-       homepage = "https://github.com/camfort/reprinter#readme";
        description = "Scrap Your Reprinter";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179312,7 +172678,6 @@ self: {
        sha256 = "1h1m5fdlhd2dxpk8bphcvbjybw40lw48b7j1bkk2grq3ljyvgmwl";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/agrafix/reproject#readme";
        description = "Define and combine \"materialized\" projections";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179344,7 +172709,6 @@ self: {
          monad-control mtl QuickCheck text time unordered-containers
        ];
        doCheck = false;
-       homepage = "https://github.com/mrkkrp/req";
        description = "Easy-to-use, type-safe, expandable, high-level HTTP library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -179375,7 +172739,6 @@ self: {
        ];
        testToolDepends = [ hspec-discover ];
        doCheck = false;
-       homepage = "https://github.com/mrkkrp/req";
        description = "Easy-to-use, type-safe, expandable, high-level HTTP client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179401,7 +172764,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring conduit conduit-extra req resourcet temporary weigh
        ];
-       homepage = "https://github.com/mrkkrp/req-conduit";
        description = "Conduit helpers for the req HTTP client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179425,7 +172787,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/rcook/req-oauth2#readme";
        description = "Provides OAuth2 authentication for use with Req";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -179445,7 +172806,6 @@ self: {
          aeson base data-default-class modern-uri req text
        ];
        testHaskellDepends = [ base hspec modern-uri req ];
-       homepage = "https://github.com/rcook/req-url-extra#readme";
        description = "Provides URI/URL helper functions for use with Req";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -179462,7 +172822,6 @@ self: {
        testHaskellDepends = [
          base http-client http-types HUnit lens tasty tasty-hunit wai wreq
        ];
-       homepage = "http://github.com/hiratara/hs-reqcatcher";
        description = "A local http server to catch the HTTP redirect";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179475,12 +172834,33 @@ self: {
        version = "0.3.0.1";
        sha256 = "1aqcsm9a3zd11k7d4nbvxsy7l35fr77z7gyhrl7rvflnixid29ws";
        libraryHaskellDepends = [ base free mtl transformers ];
-       homepage = "http://github.com/nahiluhmot/request-monad";
        description = "A transformer for generic requests";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "require" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, tasty, tasty-hspec
+     , text, universum
+     }:
+     mkDerivation {
+       pname = "require";
+       version = "0.0.1";
+       sha256 = "04zi13y2xzgwrw4n0z2l7ii8rkl2d78n0cwq1xi2v5amr3kb8jjn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring text universum ];
+       executableHaskellDepends = [ base bytestring text universum ];
+       testHaskellDepends = [
+         base bytestring tasty tasty-hspec text universum
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion text universum
+       ];
+       description = "Scrap your qualified import clutter";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "rerebase" = callPackage
     ({ mkDerivation, rebase }:
      mkDerivation {
@@ -179488,7 +172868,6 @@ self: {
        version = "1.2.1";
        sha256 = "02j119pabivn2x23mvvmzlkypxwi31p7s2fpakavhqfs6bmbnb2a";
        libraryHaskellDepends = [ rebase ];
-       homepage = "https://github.com/nikita-volkov/rerebase";
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179514,7 +172893,6 @@ self: {
          base criterion deepseq graph-core hashable http-api-data hvect mtl
          random regex-compat text unordered-containers vector
        ];
-       homepage = "http://github.com/agrafix/Spock";
        description = "abstract implementation of typed and untyped web routing";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179551,7 +172929,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "01cllvyxiyqd0a8kg2whwrgmhgfb4akxmb2nx88l2z8lxa5nfz2j";
        libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
-       homepage = "http://github.com/cartazio/resin";
        description = "High performance variable binders";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179568,7 +172945,6 @@ self: {
        executableHaskellDepends = [
          base hmatrix transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/resistor-cube";
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179608,7 +172984,6 @@ self: {
          attoparsec attoparsec-binary base bv bytestring hashable hashmap
          hslogger iproute network parsec stm stm-containers transformers
        ];
-       homepage = "https://github.com/riaqn/resolve#readme";
        description = "A name resolusion library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179628,7 +173003,6 @@ self: {
          ansi-terminal base base-compat Diff directory filepath mtl
          optparse-applicative process unix
        ];
-       homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179648,7 +173022,6 @@ self: {
          base containers extensible-effects HUnit mtl QuickCheck
          test-framework test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/wowus/resource-effect/";
        description = "A port of the package 'resourcet' for extensible effects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179663,7 +173036,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring directory ];
-       homepage = "https://bitbucket.org/tdammers/resource-embed";
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179681,7 +173053,6 @@ self: {
          base hashable monad-control stm time transformers transformers-base
          vector
        ];
-       homepage = "http://github.com/bos/pool";
        description = "A high-performance striped resource pooling implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -179698,7 +173069,6 @@ self: {
          base hashable MonadCatchIO-transformers stm time transformers
          transformers-base vector
        ];
-       homepage = "http://github.com/norm2782/pool";
        description = "Fork of resource-pool, with a MonadCatchIO constraint";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179715,7 +173085,6 @@ self: {
        libraryHaskellDepends = [
          base free kan-extensions monad-control resource-pool transformers
        ];
-       homepage = "https://github.com/srijs/haskell-resource-pool-monad";
        description = "A monadic interface for resource-pool";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -179753,7 +173122,6 @@ self: {
          transformers transformers-base transformers-compat unliftio-core
        ];
        testHaskellDepends = [ base hspec lifted-base transformers ];
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179771,7 +173139,6 @@ self: {
          base containers exceptions mtl primitive transformers unliftio-core
        ];
        testHaskellDepends = [ base exceptions hspec transformers ];
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -179800,7 +173167,6 @@ self: {
        executableHaskellDepends = [
          aeson base fast-logger http-types text wai
        ];
-       homepage = "https://github.com/raptros/respond";
        description = "process and route HTTP requests and generate responses on top of WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -179903,7 +173269,6 @@ self: {
          transformers transformers-compat unordered-containers
        ];
        executableHaskellDepends = [ base base-compat rest-gen ];
-       homepage = "http://www.github.com/silkapp/rest";
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180040,7 +173405,6 @@ self: {
          digestive-functors errors heist lens mtl old-locale readable snap
          snap-core snap-extras template-haskell text time xmlhtml
        ];
-       homepage = "https://github.com/ozataman/restful-snap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -180059,7 +173423,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers tasty tasty-hunit temporary text
        ];
-       homepage = "https://github.com/lessrest/restless-git";
        description = "Easy Git repository serialization";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -180078,7 +173441,6 @@ self: {
          monad-control mtl network selinux stm text transformers
          transformers-base unix
        ];
-       homepage = "https://github.com/co-dan/interactive-diagrams/wiki/Restricted-Workers";
        description = "Running worker processes under system resource restrictions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180107,7 +173469,6 @@ self: {
        sha256 = "1ibqc5h2vxy4h3sn94jxmjk099fkainnyd2y457g4ldqv9ydj9pm";
        libraryHaskellDepends = [ base bifunctors keys mtl transformers ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/srijs/haskell-result";
        description = "Encode success or at least one error";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -180143,7 +173504,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ aeson async base criterion text ];
-       homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.2";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180173,7 +173533,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion text time unordered-containers vector
        ];
-       homepage = "https://github.com/wereHamster/rethinkdb-client-driver";
        description = "Client driver for RethinkDB";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180190,7 +173549,6 @@ self: {
        libraryHaskellDepends = [
          aeson base mtl rethinkdb text transformers unordered-containers
        ];
-       homepage = "http://github.com/seanhess/rethinkdb-model";
        description = "Useful tools for modeling data with rethinkdb";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180211,7 +173569,6 @@ self: {
          mtl network protocol-buffers protocol-buffers-descriptor text time
          unordered-containers utf8-string vector
        ];
-       homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "RethinkDB driver for Haskell";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180233,7 +173590,6 @@ self: {
          base data-default-class exceptions ghc-prim hedgehog HUnit mtl
          random stm tasty tasty-hedgehog tasty-hunit time transformers
        ];
-       homepage = "http://github.com/Soostone/retry";
        description = "Retry combinators for monadic actions that may fail";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180247,7 +173603,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base optparse-applicative process ];
-       homepage = "https://github.com/dgonyeo/retryer";
        description = "Retry failed commands";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180263,7 +173618,6 @@ self: {
        editedCabalFile = "0dfiwf4808vjhayv7xr058rzwl6jmsmhzy03mk48m9kmlqibk3fy";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/DanBurton/rev-state#readme";
        description = "Reverse State monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180314,7 +173668,6 @@ self: {
        libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
-       homepage = "https://github.com/jcristovao/reverse-geocoding";
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180345,7 +173698,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory multiarg process
        ];
-       homepage = "http://www.github.com/massysett/rewrite";
        description = "open file and rewrite it with new contents";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180376,7 +173728,6 @@ self: {
          base bytestring containers haskell-src-exts haskell-src-meta
          pcre-light template-haskell
        ];
-       homepage = "http://github.com/mgsloan/rex";
        description = "A quasi-quoter for typeful results of regex captures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180429,7 +173780,6 @@ self: {
          unordered-containers url uuid-types wai wai-cli wai-cors wai-extra
          warp wreq
        ];
-       homepage = "https://github.com/RobertFischer/rfc#README.md";
        description = "Robert Fischer's Common library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180442,7 +173792,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "065x5fgsqdi4d5sjd1gridwshag3afdbip1g8qi4jz41xdi2xm38";
        libraryHaskellDepends = [ base network-simple rfc1413-types ];
-       homepage = "https://github.com/cotrone/rfc1413-server#readme";
        description = "rfc1413 server";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180454,7 +173803,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "1lyf0wpjyzj43przl6k7mv1484aciizy03ch6ygbzkm0b0f70ha5";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/cotrone/rfc1413-types#readme";
        description = "An rfc1413 parser and response renderer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180492,7 +173840,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0vhqw2hylv0228g48b4q81fs0pjgmv68rzlasnz39g6yqddws97c";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/joegesualdo/rgb-color-model";
        description = "Haskell types for working with RGB colors";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -180544,7 +173891,6 @@ self: {
        executableHaskellDepends = [
          base call containers lens mtl objective split
        ];
-       homepage = "https://github.com/fumieval/rhythm-game-tutorial";
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180578,7 +173924,6 @@ self: {
          tasty-quickcheck template-haskell text yaml
        ];
        benchmarkHaskellDepends = [ base bytestring criterion semigroups ];
-       homepage = "http://github.com/riak-haskell-client/riak-haskell-client";
        description = "A Haskell client for the Riak decentralized data store";
        license = "unknown";
      }) {};
@@ -180594,7 +173939,6 @@ self: {
        libraryHaskellDepends = [
          array base parsec protocol-buffers protocol-buffers-descriptor
        ];
-       homepage = "http://github.com/riak-haskell-client/riak-haskell-client";
        description = "Haskell types for the Riak protocol buffer API";
        license = "unknown";
      }) {};
@@ -180616,7 +173960,6 @@ self: {
          base bytestring containers microlens microlens-th riak-protobuf
          template-haskell
        ];
-       homepage = "https://github.com/riak-haskell-client/riak-haskell-client#readme";
        description = "Lenses for riak-protobuf";
        license = "unknown";
      }) {};
@@ -180656,7 +173999,6 @@ self: {
          http-client microlens prometheus string-conv tasty tasty-hunit
          tasty-quickcheck text
        ];
-       homepage = "https://github.com/iconnect/ridley#README";
        description = "Quick metrics to grow your app strong";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180675,7 +174017,6 @@ self: {
          text transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/iconnect/ridley/ridley-extras#readme";
        description = "Handy metrics that don't belong to ridley";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180706,7 +174047,6 @@ self: {
          base directory doctest filepath HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/tel/riemann-hs";
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -180725,7 +174065,6 @@ self: {
          base binary bytestring either transformers
        ];
        executableHaskellDepends = [ base bytestring filepath ];
-       homepage = "https://bitbucket.org/robertmassaioli/riff/overview";
        description = "RIFF parser for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180741,7 +174080,6 @@ self: {
        sha256 = "14h1rzxzk9qzr6bimxng8nhxydngx92x75p1mrjfwbwi17bbwgby";
        libraryHaskellDepends = [ base exceptions mtl primitive vector ];
        testHaskellDepends = [ base HUnit QuickCheck vector ];
-       homepage = "http://github.com/bgamari/ring-buffer";
        description = "A concurrent, mutable ring-buffer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180766,7 +174104,6 @@ self: {
          hashable hspec microlens mtl primitive process text time
          typed-process unix unliftio unordered-containers vector
        ];
-       homepage = "https://github.com/commercialhaskell/rio#readme";
        description = "A standard library for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -180785,7 +174122,6 @@ self: {
        testHaskellDepends = [
          base exceptions hspec monad-control resourcet rio transformers-base
        ];
-       homepage = "https://github.com/commercialhaskell/rio#readme";
        description = "Orphan instances for the RIO type in the rio package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -180805,7 +174141,6 @@ self: {
          process unix
        ];
        executableSystemDepends = [ ncurses ];
-       homepage = "http://modeemi.fi/~tuomov/riot/";
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180826,7 +174161,6 @@ self: {
          crypto-api crypto-pubkey-types cryptohash-cryptoapi ecdsa errors
          largeword text time transformers utility-ht websockets
        ];
-       homepage = "https://github.com/singpolyma/ripple-haskell";
        description = "Ripple payment system library";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180845,7 +174179,6 @@ self: {
          aeson attoparsec base base58address blaze-builder bytestring errors
          http-streams http-types io-streams network-uri text unexceptionalio
        ];
-       homepage = "https://github.com/singpolyma/ripple-federation-haskell";
        description = "Utilities and types to work with the Ripple federation protocol";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180862,7 +174195,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ array base containers mtl pretty ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://www2.tcs.ifi.lmu.de/~abel/";
        description = "Reduced instruction set i386 simulator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180878,7 +174210,6 @@ self: {
        editedCabalFile = "0wvy4j5ffn3pm06dklcp89gcdvfa8296y2zqnvby4ryb10np767r";
        libraryHaskellDepends = [ base mtl QuickCheck ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/cocreature/riscv-isa#readme";
        description = "Haskell representation of the RISC-V instruction set architecture";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180900,7 +174231,6 @@ self: {
          aeson attoparsec base bytestring hspec scientific text
          unordered-containers vector
        ];
-       homepage = "https://github.com/martinvlk/rison-hs#readme";
        description = "Parses and renders RISON strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180912,7 +174242,6 @@ self: {
        version = "0.1.0";
        sha256 = "0x7r04mwxwnqckfk865dckml4am11zx80a9k5kc91kz5ikq1ns64";
        libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ];
-       homepage = "https://github.com/d-rive/rivers";
        description = "Rivers are like Streams, but different";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180927,7 +174256,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base rivet-core rivet-simple-deploy ];
-       homepage = "https://github.com/dbp/rivet";
        description = "A project management tool for Haskell applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180940,7 +174268,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0gpvlxrg6m4avxk6zhym20mx7ha2qdjr1dkjzjwsvyk4fhcjk399";
        libraryHaskellDepends = [ base postgresql-simple rivet-core text ];
-       homepage = "http://github.com/name/project";
        description = "Rivet migration library postgresql backend";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180954,7 +174281,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath ];
-       homepage = "http://github.com/dbp/rivet";
        description = "Database migration library; automatic importer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180967,7 +174293,6 @@ self: {
        sha256 = "07j0br6akvb4gp4cz82n6w6bp9alxz0j2vx4nw6041iljbjmfy8q";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/dbp/rivet";
        description = "Database migration library; core functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -180979,7 +174304,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1vg6ns5scq5nqyj2w070hswynji8pqfh654qa3zjda2xhna5mnbd";
        libraryHaskellDepends = [ base postgresql-simple text ];
-       homepage = "https://github.com/dbp/rivet";
        description = "Postgresql migration support for project management tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -180992,7 +174316,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1003sm8mpnc7l7fbp1j08cvc55va54arp6j0qdg2cc2m8cy5bpxf";
        libraryHaskellDepends = [ base configurator mtl rivet-core text ];
-       homepage = "https://github.com/dbp/rivet";
        description = "Basic deployment support for project management tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181019,7 +174342,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl unordered-containers
        ];
-       homepage = "https://github.com/grwlf/rl";
        description = "Collection of Reinforcement Learning algorithms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181055,7 +174377,6 @@ self: {
        version = "0.1.0";
        sha256 = "17v8sbgfk1mnm6qfqsnrjcm2nh7i2bibgyr6bh0bic8cfcx0haia";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/guaraqe/rlist#readme";
        description = "Lists with cheap snocs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181080,7 +174401,6 @@ self: {
          tagged time
        ];
        executableHaskellDepends = [ ansi-terminal base options time ];
-       homepage = "https://github.com/cpeikert/Lol";
        description = "Ring-LWE/LWR challenges using Lol";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181145,7 +174465,6 @@ self: {
          base bytestring hedgehog tasty tasty-hedgehog
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://bitbucket.org/soostone/rng-utils";
        description = "RNG within an IORef for convenient concurrent use";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181167,7 +174486,6 @@ self: {
        ];
        executableHaskellDepends = [ base cmdargs ];
        testHaskellDepends = [ base directory ];
-       homepage = "https://github.com/gianlucaguarini/rob#readme";
        description = "Simple projects generator";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181188,7 +174506,6 @@ self: {
          base Cabal directory filepath fsnotify hdaemonize lens lifted-base
          monad-control mtl process resourcet text time unix
        ];
-       homepage = "https://www.github.com/ktvoelker/robin";
        description = "A build daemon for Haskell development";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181203,7 +174520,6 @@ self: {
        libraryHaskellDepends = [
          base containers exceptions transformers xhb
        ];
-       homepage = "https://github.com/lfairy/robot";
        description = "Simulate keyboard and mouse events";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181224,7 +174540,6 @@ self: {
          attoparsec base bytestring directory heredoc hspec QuickCheck
          transformers
        ];
-       homepage = "http://github.com/meanpath/robots";
        description = "Parser for robots.txt";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181240,7 +174555,6 @@ self: {
        editedCabalFile = "0q1h70mx90dr3hcqgmp7gj9ypk235jyv71qgzzdr50is4r07j9hd";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec HUnit ];
-       homepage = "https://github.com/hexresearch/roc-cluster#readme";
        description = "ROC online clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181259,7 +174573,6 @@ self: {
        executableHaskellDepends = [
          base containers gloss optparse-applicative roc-cluster
        ];
-       homepage = "https://github.com/ncrashed/roc-cluster-demo#readme";
        description = "Gloss interactive demo for roc-cluster package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181283,7 +174596,6 @@ self: {
          base bytestring data-default hspec hspec-expectations process
          QuickCheck resourcet temporary transformers
        ];
-       homepage = "http://github.com/serokell/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181302,7 +174614,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory filepath old-time process
        ];
-       homepage = "http://roguestar.downstairspeople.org/";
        description = "Sci-fi roguelike game. Client application.";
        license = "unknown";
      }) {};
@@ -181323,7 +174634,6 @@ self: {
          MaybeT MonadRandom mtl old-time parallel priority-sync PSQueue
          random stm
        ];
-       homepage = "http://roguestar.downstairspeople.org/";
        description = "Sci-fi roguelike game. Backend.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181342,7 +174652,6 @@ self: {
          arrows base bytestring containers filepath GLUT MonadRandom mtl
          OpenGL priority-sync random rsagl rsagl-frp rsagl-math stm
        ];
-       homepage = "http://roguestar.downstairspeople.org/";
        description = "Sci-fi roguelike game. Client library.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181357,7 +174666,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
-       homepage = "http://roguestar.downstairspeople.org/";
        description = "Sci-fi roguelike game. GLUT front-end.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181386,7 +174694,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://github.com/matt-noonan/roles/";
        description = "Composable class-based roles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181403,7 +174710,6 @@ self: {
          aeson base basic-prelude http-conduit lifted-base monad-control
          network resourcet text vector
        ];
-       homepage = "https://github.com/azara/rollbar-haskell";
        description = "error tracking through rollbar.com";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -181426,7 +174732,6 @@ self: {
          aeson base bytestring case-insensitive containers hspec
          hspec-golden-aeson lens lens-aeson QuickCheck text
        ];
-       homepage = "https://github.com/joneshf/rollbar-hs#readme";
        description = "Core Rollbar data types and APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181447,7 +174752,6 @@ self: {
        executableHaskellDepends = [
          base optparse-applicative random regex-applicative
        ];
-       homepage = "https://github.com/PiotrJustyna/roller";
        description = "Playing with applicatives and dice!";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181460,7 +174764,6 @@ self: {
        version = "0.1";
        sha256 = "1l39dlq8pn38b48iwqgrnh83h74qkmm34l5m9a0rbg76s2z04c43";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/joeyadams/haskell-rolling-queue";
        description = "Bounded channel for STM that discards old entries when full";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181474,7 +174777,6 @@ self: {
        libraryHaskellDepends = [
          base base-unicode-symbols bytestring text
        ];
-       homepage = "https://github.com/roelvandijk/roman-numerals";
        description = "Parsing and pretty printing of Roman numerals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181492,7 +174794,6 @@ self: {
          attoparsec base containers HUnit test-framework
          test-framework-hunit text
        ];
-       homepage = "https://github.com/karlvoigtland/romkan-hs";
        description = "Japanese Romaji <-> Japanese Kana conversion library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181504,7 +174805,6 @@ self: {
        version = "0.1.1.2";
        sha256 = "0xzsz4w153mbkkkv07558xkv83fph4g98hvjf6iljwvbbp47l0j9";
        libraryHaskellDepends = [ base tagged ];
-       homepage = "/dev/null";
        description = "Root-finding algorithms (1-dimensional)";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -181518,7 +174818,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring fingertree mtl utf8-string
        ];
-       homepage = "http://github.com/ekmett/rope";
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181536,7 +174835,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck text
        ];
-       homepage = "https://github.com/ollef/rope-utf16-splay";
        description = "Ropes optimised for updating using UTF-16 code units and row/column pairs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181600,7 +174898,6 @@ self: {
        libraryHaskellDepends = [
          base containers deepseq minilens mtl transformers
        ];
-       homepage = "https://github.com/RaminHAL9001/rose-trie";
        description = "Trees with polymorphic paths to nodes, combining properties of Rose Trees and Tries";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181645,7 +174942,6 @@ self: {
          attoparsec base bytestring containers data-default-generics
          filepath mtl pureMD5 tasty tasty-hunit testpack transformers
        ];
-       homepage = "http://github.com/acowley/roshask";
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181664,7 +174960,6 @@ self: {
          attoparsec base binary bytestring data-default-class
          lens-family-core pureMD5 template-haskell text
        ];
-       homepage = "https://github.com/RoboticsHS/rosmsg#readme";
        description = "ROS message parser, render, TH";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181683,7 +174978,6 @@ self: {
        executableHaskellDepends = [
          base filepath monad-logger rosmsg rospkg stack temporary text
        ];
-       homepage = "https://github.com/RoboticsHS/rosmsg-bin#readme";
        description = "ROS message management tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181705,7 +174999,6 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/RoboticsHS/rospkg#readme";
        description = "ROS package system information";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181730,7 +175023,6 @@ self: {
        sha256 = "1p6lrjgigzbjigsyfsmx3kxrzm1aws3i708yl4xyh73arhcd89p0";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base bytestring hspec QuickCheck text ];
-       homepage = "https://github.com/kvanberendonck/codec-rot13";
        description = "Fast ROT13 cipher for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181750,7 +175042,6 @@ self: {
        testHaskellDepends = [
          base bytestring directory filepath time time-locale-compat
        ];
-       homepage = "http://github.com/Soostone/rotating-log";
        description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181778,7 +175069,6 @@ self: {
        version = "0.3.0";
        sha256 = "1d2vaijcna8gwcrhsjpclqw4gjdvdpmnrlyszqzcxnqf0l206a6y";
        libraryHaskellDepends = [ array base numeric-extras ];
-       homepage = "http://patch-tag.com/r/ekmett/rounding";
        description = "Explicit floating point rounding mode wrappers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181815,7 +175105,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring lens-aeson roundtrip text vector
        ];
-       homepage = "https://github.com/anchor/roundtrip-aeson";
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181865,7 +175154,6 @@ self: {
        executableHaskellDepends = [
          attoparsec base network text yesod-routes
        ];
-       homepage = "http://github.com/singpolyma/route-generator";
        description = "Utility to generate routes for use with yesod-routes";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181885,7 +175173,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck
        ];
-       homepage = "https://github.com/tonymorris/route";
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181916,7 +175203,6 @@ self: {
        sha256 = "19nafk4zmhx76j0qzg1d5kh6mnzwnr5x3kvvxi56x24kfmvrq5qq";
        libraryHaskellDepends = [ base containers dlist mtl ];
        testHaskellDepends = [ base containers dlist hspec mtl ];
-       homepage = "https://github.com/parsonsmatt/rowdy#readme";
        description = "An EDSL for web application routes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181929,7 +175215,6 @@ self: {
        sha256 = "17k9bbxwpmxpswkmax6jrlcfrp6qhgdkjixsp4d6rn7mj676010g";
        libraryHaskellDepends = [ base rowdy yesod-core ];
        testHaskellDepends = [ base hspec rowdy yesod-core ];
-       homepage = "https://github.com/parsonsmatt/rowdy#readme";
        description = "An EDSL for web application routes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181977,7 +175262,6 @@ self: {
          base containers mtl network template-haskell transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/mmirman/rpc-framework";
        description = "a remote procedure call framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -181998,7 +175282,6 @@ self: {
          appar base blaze-builder bytestring c10k containers dns domain-auth
          hslogger iproute parsec unix
        ];
-       homepage = "http://www.mew.org/~kazu/proj/rpf/";
        description = "Receiver Policy Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182033,7 +175316,6 @@ self: {
          old-time OpenGL OpenGLRaw parallel parsec random rsagl-frp
          rsagl-math stm Vec Vec-OpenGLRaw
        ];
-       homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182050,7 +175332,6 @@ self: {
        libraryHaskellDepends = [
          array arrows base containers mtl old-time random rsagl-math stm
        ];
-       homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182068,7 +175349,6 @@ self: {
          array base containers deepseq OpenGL OpenGLRaw parallel parsec
          random Vec Vec-OpenGLRaw
        ];
-       homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library: Mathematics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182082,7 +175362,6 @@ self: {
        sha256 = "1d1r9hp38mhl1jmmqhn42al7gd0nsqk5d5msqrzjwxdyj884y3pq";
        libraryHaskellDepends = [ base safe ];
        testHaskellDepends = [ base QuickCheck safe ];
-       homepage = "https://github.com/lovasko/rset";
        description = "Range set";
        license = "unknown";
      }) {};
@@ -182094,7 +175373,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "132s7pbm49fgpiq7znr72h52wcmwblljblr0s0krr56593gp2rry";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/AJChapman/rspp";
        description = "A Rational Street Performer Protocol solver";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182111,7 +175389,6 @@ self: {
        libraryHaskellDepends = [
          base HaXml network network-uri old-locale time
        ];
-       homepage = "https://github.com/basvandijk/rss";
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182165,7 +175442,6 @@ self: {
          old-locale parsec regexpr resourcet safe SafeSemaphore split stm
          text time transformers utf8-string
        ];
-       homepage = "http://hackage.haskell.org/package/rss2irc";
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182179,8 +175455,8 @@ self: {
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.2.16";
-       sha256 = "0sfllzq97yl1dn3f9avi538121kn7bj5syc27g7139fqrjhvjy18";
+       version = "0.2.17";
+       sha256 = "0g40krmbjy4irrxs3iabbr296l8hr98driz75j3s0dhqqzdxv4vm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182195,7 +175471,6 @@ self: {
          base basic-prelude binary binary-bits bytestring lens random tasty
          tasty-hunit tasty-quickcheck text word24
        ];
-       homepage = "http://github.com/swift-nav/librtcm";
        description = "Haskell bindings for RTCM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182207,7 +175482,6 @@ self: {
        version = "0.0.2";
        sha256 = "18y55lv3vyl4kpwzphw5gb1jsvp1f6i4dqh9rs6i9fyvabndvfik";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kkardzis/rtld";
        description = "dynamic linker tools for Haskell";
        license = "unknown";
      }) {};
@@ -182221,7 +175495,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ rtl-sdr ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -182242,7 +175515,6 @@ self: {
          transformers unix
        ];
        testHaskellDepends = [ base hspec socket unix ];
-       homepage = "https://gitlab.com/formaltech/rtnetlink-hs";
        description = "Manipulate network devices, addresses, and routes on Linux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182260,7 +175532,6 @@ self: {
          attoparsec base blaze-builder blaze-textual bytestring deepseq haxr
          mtl network split utf8-string
        ];
-       homepage = "https://github.com/megantti/rtorrent-rpc";
        description = "A library for communicating with RTorrent over its XML-RPC interface";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182282,7 +175553,6 @@ self: {
          base bencoding bytestring containers directory filepath hspec
          QuickCheck temporary utf8-string
        ];
-       homepage = "http://github.com/Fuuzetsu/rtorrent-state";
        description = "Parsing and manipulation of rtorrent state file contents";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182303,7 +175573,6 @@ self: {
          base Cabal directory filepath unix zenc
        ];
        executableHaskellDepends = [ base Cabal process ];
-       homepage = "https://github.com/DanielG/rts-loader";
        description = "Dynamically load Haskell libraries";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182322,7 +175591,6 @@ self: {
        libraryPkgconfigDepends = [ rubberband ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -182342,7 +175610,6 @@ self: {
        testHaskellDepends = [
          base bytestring cereal containers hspec mtl string-conv vector
        ];
-       homepage = "https://github.com/filib/ruby-marshal";
        description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182360,7 +175627,6 @@ self: {
          base bytestring haskell-src-exts haskell-src-meta pcre-light
          process template-haskell trifecta
        ];
-       homepage = "https://github.com/joelteon/ruby-qq";
        description = "rubyish quasiquoters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182373,7 +175639,6 @@ self: {
        version = "0.4.0.1";
        sha256 = "1id3rpfzqwhnmv2w4p35a70zfanwrpazix27ak1hzaz1jd2yfmz5";
        libraryHaskellDepends = [ array base mtl parsec safe strict Vec ];
-       homepage = "http://code.mathr.co.uk/ruff";
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182414,7 +175679,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers mtl shuffle uhc-util uuagc uuagc-cabal uulib
        ];
-       homepage = "https://github.com/UU-ComputerScience/ruler";
        description = "Ruler tool for UHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182434,7 +175698,6 @@ self: {
          array base containers directory fgl filepath haskell98 mtl uuagc
          uulib
        ];
-       homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -182464,7 +175727,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs directory filepath old-time process
        ];
-       homepage = "https://github.com/bacchanalia/runghc";
        description = "runghc replacement for fast repeated runs";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -182482,7 +175744,6 @@ self: {
        executableHaskellDepends = [
          async base bytestring optparse-applicative process stm
        ];
-       homepage = "https://github.com/jwiegley/runmany#readme";
        description = "Run multiple commands, interleaving output and errors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182495,7 +175756,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "12fn0lsil0rj0pj0ixzppsdw2fmj0cnzci4fh11z9rcggwbz6pms";
        testHaskellDepends = [ base data-memocombinators time ];
-       homepage = "https://github.com/DanBurton/runmemo";
        description = "A simple memoization helper library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182507,7 +175767,6 @@ self: {
        version = "0.1.0.6";
        sha256 = "1lb9c174vmbcjpm4y1j2jwngbzx5s0s1iiq8iam5g87h475k2bh1";
        libraryHaskellDepends = [ base ifcxt QuickCheck template-haskell ];
-       homepage = "http://chriswarbo.net/projects/repos/runtime-arbitrary.html";
        description = "Runtime generation of Arbitrary values";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182524,7 +175783,6 @@ self: {
        libraryHaskellDepends = [
          base MonadPrompt mtl random-source transformers
        ];
-       homepage = "https://github.com/mokus0/random-fu";
        description = "Random Variables";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -182536,7 +175794,6 @@ self: {
        version = "0.0.0.3";
        sha256 = "0isx32ayaqh7vhcyl11ykdy8f1chs1fdw73h3c2r53k989yfkmba";
        libraryHaskellDepends = [ base monad-loops-stm stm syb ];
-       homepage = "https://github.com/mokus0/rwlock";
        description = "Multiple-read / single-write locks";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -182557,7 +175814,6 @@ self: {
          base binary bytestring parsec QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/karknu/rws";
        description = "Packet Generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182574,7 +175830,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec text ];
        testHaskellDepends = [ base HUnit parsec QuickCheck text ];
-       homepage = "https://github.com/aisamanra/s-cargot";
        description = "A flexible, extensible s-expression library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182587,7 +175842,6 @@ self: {
        sha256 = "0yv15kqfx21qwrm4i7rkwb1iybx27314f86xqbf2yyh4ala35wr1";
        libraryHaskellDepends = [ base s-cargot text ];
        testHaskellDepends = [ base HUnit parsec s-cargot text ];
-       homepage = "https://github.com/GaloisInc/s-cargot-letbind";
        description = "Enables let-binding and let-expansion for s-cargot defined S-expressions";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -182602,7 +175856,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base derive-monoid lens semigroups ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/sboosali/s-expression#readme";
        description = "simple general-purpose s-expressions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -182618,7 +175871,6 @@ self: {
        libraryHaskellDepends = [
          base base64-bytestring cryptohash http-types time utf8-string
        ];
-       homepage = "https://github.com/dmjio/s3-signer";
        description = "Pre-signed Amazon S3 URLs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182640,7 +175892,6 @@ self: {
          base base64-bytestring blaze-builder byteable bytestring
          case-insensitive cryptohash http-types time utf8-string
        ];
-       homepage = "https://github.com/dmjio/s3-signer";
        description = "Pre-signed Amazon S3 URLs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182654,7 +175905,6 @@ self: {
        sha256 = "0p3yaf5slvyz1cyy51jq64c5rlp8yzwim8iy2dlnk42if4gc9ibr";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base deepseq QuickCheck ];
-       homepage = "https://github.com/ndmitchell/safe#readme";
        description = "Library of safe (exception free) functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182666,7 +175916,6 @@ self: {
        version = "0.3.3.0";
        sha256 = "0j3k6nlp3qch9kxv2zh5lfx1cfqy4w0xc7pbivqkn38drdjd920z";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "http://darcs.redspline.com/safe-access";
        description = "A simple environment to control access to data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182694,7 +175943,6 @@ self: {
        editedCabalFile = "0y1b9pw5wriyiffcmvk9g53imh6lm5fgfbjsgpn2w96qspaagdb5";
        libraryHaskellDepends = [ base deepseq exceptions transformers ];
        testHaskellDepends = [ base hspec void ];
-       homepage = "https://github.com/fpco/safe-exceptions#readme";
        description = "Safe, consistent, and easy exception handling";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -182713,7 +175961,6 @@ self: {
          base deepseq safe-exceptions transformers
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/mitchellwrosen/safe-exceptions-checked#readme";
        description = "Safe, checked exceptions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182725,7 +175972,6 @@ self: {
        version = "0.5.0.2";
        sha256 = "102fjardfdf9zy0vyalgq6m1l64356b0a0xaam49j31lqgfldaw7";
        libraryHaskellDepends = [ base failure ];
-       homepage = "http://www-users.cs.york.ac.uk/~ndm/safe/";
        description = "Library for safe functions (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -182750,7 +175996,6 @@ self: {
        version = "0.2.1";
        sha256 = "12mqgak0rla20n9b4m6ynx64bwr06njcr849csc0z0r573xw2v33";
        libraryHaskellDepends = [ base indexed mtl vector ];
-       homepage = "https://github.com/reinerp/safe-freeze";
        description = "Support for safely freezing multiple arrays in the ST monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182796,7 +176041,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-core QuickCheck should-not-typecheck
        ];
-       homepage = "http://www.github.com/stepcut/safe-length";
        description = "Tired of accidentally calling length on tuples? Relief at last!";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182820,7 +176064,6 @@ self: {
          serialise store tasty tasty-hunit tasty-quickcheck text
          vector-space xmlbf
        ];
-       homepage = "https://github.com/k0001/safe-money";
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182857,7 +176100,6 @@ self: {
          base doctest haskell-src-meta hspec QuickCheck template-haskell
          th-lift
        ];
-       homepage = "https://github.com/konn/safe-printf";
        description = "Well-typed, flexible and variadic printf for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182881,7 +176123,6 @@ self: {
          quickcheck-instances tasty tasty-quickcheck template-haskell time
          vector
        ];
-       homepage = "https://github.com/acid-state/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -182898,7 +176139,6 @@ self: {
          base base-prelude cereal containers extra haskell-src-meta
          microlens safecopy template-haskell uniplate
        ];
-       homepage = "http://github.com/aelve/safecopy-migrate";
        description = "Making SafeCopy migrations easier";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182923,7 +176163,6 @@ self: {
          quickcheck-instances store tasty tasty-hunit tasty-quickcheck
          template-haskell time vector
        ];
-       homepage = "https://github.com/NCrashed/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -182964,7 +176203,6 @@ self: {
          filepath HUnit resourcet test-framework test-framework-hunit
          test-framework-th unix
        ];
-       homepage = "https://github.com/luispedro/safeio#readme";
        description = "Write output to disk atomically";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -182977,7 +176215,6 @@ self: {
        sha256 = "1wp80s12yp9lavkjk6cbcaaj8aa9gmcs05ld7b8ssrqzhd32jrbj";
        libraryHaskellDepends = [ base text validity ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/githubuser/safepath#readme";
        description = "Safe Paths in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -182995,7 +176232,6 @@ self: {
          base base-unicode-symbols explicit-iomodes pathtype
          regional-pointers regions transformers
        ];
-       homepage = "https://github.com/basvandijk/safer-file-handles/";
        description = "Type-safe file handling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183013,7 +176249,6 @@ self: {
          base bytestring explicit-iomodes-bytestring regions
          safer-file-handles transformers
        ];
-       homepage = "https://github.com/basvandijk/safer-file-handles-bytestring/";
        description = "Extends safer-file-handles with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183030,7 +176265,6 @@ self: {
        libraryHaskellDepends = [
          explicit-iomodes-text regions safer-file-handles text transformers
        ];
-       homepage = "https://github.com/basvandijk/safer-file-handles-text/";
        description = "Extends safer-file-handles with Text operations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183059,7 +176293,6 @@ self: {
        testHaskellDepends = [
          base containers ghc ghc-syb-utils HUnit syb
        ];
-       homepage = "http://fremissant.net/shape-syb";
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183083,7 +176316,6 @@ self: {
          aeson base bytestring hspec QuickCheck scientific text
          unordered-containers vector
        ];
-       homepage = "https://github.com/kccqzy/haskell-sajson#readme";
        description = "Fast JSON parsing powered by Chad Austin's sajson library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183123,7 +176355,6 @@ self: {
        testHaskellDepends = [
          base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183137,7 +176368,6 @@ self: {
        sha256 = "0c5022vd2pll27q49s4jq47jip27v1kr417wzip7dw5z3b3dd1ni";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/tfausak/salve#readme";
        description = "Semantic version numbers and constraints";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -183268,7 +176498,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base QuickCheck storable-record ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Handling of samples in an (audio) signal";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183280,7 +176509,6 @@ self: {
        version = "0.0.4.1";
        sha256 = "091nz5w5511xl8hp2q8dfvs4jz15nkhz22rr97zga0vmn0hpdnxi";
        libraryHaskellDepends = [ base numeric-prelude sample-frame ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Orphan instances for types from sample-frame and numericprelude";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183298,7 +176526,6 @@ self: {
        ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/jtobin/sampling";
        description = "Sample values from collections";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -183314,7 +176541,6 @@ self: {
        libraryHaskellDepends = [ base bytestring seqloc vector ];
        librarySystemDepends = [ zlib ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Binding to the C samtools library";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) zlib;};
@@ -183335,7 +176561,6 @@ self: {
        executableHaskellDepends = [
          base bytestring conduit filepath resourcet samtools transformers
        ];
-       homepage = "http://www.ingolia-lab.org/samtools-tutorial.html";
        description = "Conduit interface to SAM/BAM format files through samtools";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183389,7 +176614,6 @@ self: {
          base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "http://hackage.haskell.org/package/sandi";
        description = "Data encoding library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183401,7 +176625,6 @@ self: {
        version = "0.0.2";
        sha256 = "07wh6va4rpf6vvxnjqbmwfna3rg20ysjh2pnzylz6xzlayzq0pkx";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/regularlambda/sandlib";
        description = "SAND data serialization and manipulation library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183421,7 +176644,6 @@ self: {
          base Cabal containers directory filepath optparse-applicative
          process text unix-compat
        ];
-       homepage = "https://github.com/abhinav/sandman#readme";
        description = "Manages Cabal sandboxes to avoid rebuilding packages";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -183433,7 +176655,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "0x8d5n2mydhwl9h7vzk7nr58b2aym9xb21p4m21rfa6vy6r2n438";
        libraryHaskellDepends = [ base deepseq portaudio ];
-       homepage = "https://github.com/tokiwoousaka/Sarasvati";
        description = "audio library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183462,7 +176683,6 @@ self: {
          filepath machines machines-binary machines-io machines-process
          network process text unordered-containers vector
        ];
-       homepage = "http://github.com/aloiscochard/sarsi";
        description = "A universal quickfix toolkit and his protocol";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183480,7 +176700,6 @@ self: {
          base base64-bytestring bytestring cryptohash monads-tf papillon
          simple-pipe
        ];
-       homepage = "https://github.com/YoshikuniJujo/sasl/wiki";
        description = "SASL implementation using simple-pipe";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183495,7 +176714,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://tcana.info/sat.html";
        description = "CNF SATisfier";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183533,7 +176751,6 @@ self: {
          lens memoize minisat mtl process transformers
        ];
        testHaskellDepends = [ array base ];
-       homepage = "https://github.com/jwaldmann/satchmo";
        description = "SAT encoding monad";
        license = "GPL";
      }) {};
@@ -183549,7 +176766,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers process satchmo timeit
        ];
-       homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "driver for external satchmo backends";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183568,7 +176784,6 @@ self: {
        executableHaskellDepends = [
          array base containers process satchmo satchmo-backends
        ];
-       homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "examples that show how to use satchmo";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183585,7 +176800,6 @@ self: {
        libraryHaskellDepends = [
          array base containers funsat parse-dimacs satchmo
        ];
-       homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "funsat driver as backend for satchmo";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183598,7 +176812,6 @@ self: {
        version = "1.3";
        sha256 = "1dwgj16l2zjqfmf92kpr695ycliwki6a38sxc06scvs6sv6wkc56";
        libraryHaskellDepends = [ base containers process satchmo ];
-       homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "minisat driver as backend for satchmo";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183615,7 +176828,6 @@ self: {
        libraryHaskellDepends = [
          array base containers satchmo toysolver
        ];
-       homepage = "https://github.com/msakai/satchmo-toysat";
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183635,7 +176847,6 @@ self: {
          primitive random resourcet text time transformers transformers-base
          unix
        ];
-       homepage = "https://github.com/chessai/savage";
        description = "re-export of the random generators from Hedgehog";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183655,7 +176866,6 @@ self: {
          base bytestring deepseq mtl streaming text xeno
        ];
        testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/dredozubov/sax-parser";
        description = "Monadic streaming XML parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183673,7 +176883,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion temporary text
        ];
-       homepage = "https://github.com/fpco/say#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -183700,7 +176909,6 @@ self: {
          conduit-extra resourcet time yaml
        ];
        testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
-       homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -183748,7 +176956,6 @@ self: {
          template-haskell
        ];
        testSystemDepends = [ z3 ];
-       homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
@@ -183776,7 +176983,6 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell
        ];
        testSystemDepends = [ z3 ];
-       homepage = "http://leventerkok.github.com/sbv/";
        description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183797,7 +177003,6 @@ self: {
        testHaskellDepends = [
          base directory filepath process tasty tasty-golden
        ];
-       homepage = "http://github.com/LeventErkok/sbvPlugin";
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183810,7 +177015,6 @@ self: {
        sha256 = "0zrd9w3s535b2dpnmmrfg4i6jd9f4nh338x1cbggcw3pjyv8gk30";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base hsc3 hsc3-db ];
-       homepage = "http://rd.slavepianos.org/t/sc3-rdu";
        description = "Haskell bindings to sc3-rdu (sc3 rd ugens)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183829,7 +177033,6 @@ self: {
          attoparsec attoparsec-enumerator base blaze-builder BoundedChan
          bytestring enumerator mtl network network-enumerator
        ];
-       homepage = "https://github.com/jamwt/haskell-scalable-server/";
        description = "Library for writing fast/scalable TCP-based services";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183844,7 +177047,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath gd ];
-       homepage = "http://code.haskell.org/~dons/code/scaleimage";
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183862,7 +177064,6 @@ self: {
        testHaskellDepends = [
          base containers hspec QuickCheck text time
        ];
-       homepage = "https://www.researchgate.net/publication/311582722_Method_of_Managing_Resources_in_a_Telecommunication_Network_or_a_Computing_System";
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -183880,7 +177081,6 @@ self: {
        testHaskellDepends = [
          base containers hspec QuickCheck SCalendar text time
        ];
-       homepage = "https://github.com/stackbuilders/scalendar";
        description = "A library for handling calendars and resource availability over time";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -183923,7 +177123,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring curl data-default scalpel-core tagsoup text
        ];
-       homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -183943,7 +177142,6 @@ self: {
        ];
        testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
        benchmarkHaskellDepends = [ base criterion tagsoup text ];
-       homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -183957,7 +177155,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base parsec ];
-       homepage = "http://projects.haskell.org/style-scanner";
        description = "lexical style suggestions for source code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -183983,7 +177180,6 @@ self: {
        sha256 = "0xf3g3dajaci71mgnd7z5xy4a29w40gg43a41x3fvd1a2wpi6xan";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/Lysxia/scanf#readme";
        description = "Easy and type-safe format strings for parsing and printing";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -184001,7 +177197,6 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base bytestring cereal criterion text
        ];
-       homepage = "https://github.com/Yuras/scanner";
        description = "Fast non-backtracking incremental combinator parsing for bytestrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -184014,7 +177209,6 @@ self: {
        sha256 = "1x3calmq7hwbpvxzfsm5n1qkvkdsh73bhj3h1sckxl8ksc5zrbxi";
        libraryHaskellDepends = [ attoparsec base scanner ];
        testHaskellDepends = [ attoparsec base bytestring hspec scanner ];
-       homepage = "https://github.com/Yuras/scanner-attoparsec";
        description = "Inject attoparsec parser with backtracking into non-backtracking scanner";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -184038,7 +177232,6 @@ self: {
          ansi-terminal base bytestring mtl optparse-applicative scrypt
          vector
        ];
-       homepage = "https://github.com/redelmann/scat";
        description = "Generates unique passwords for various websites from a single password";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -184071,7 +177264,6 @@ self: {
          monad-parallel monoid-subclasses QuickCheck test-framework
          test-framework-quickcheck2 text transformers transformers-compat
        ];
-       homepage = "http://trac.haskell.org/SCC/";
        description = "Streaming component combinators";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184089,7 +177281,6 @@ self: {
          array base containers fgl GLUT haskell98 hmatrix mtl old-time
          OpenGL process
        ];
-       homepage = "http://www.haskell.org/haskellwiki/SceneGraph";
        description = "Scene Graph";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184169,7 +177360,6 @@ self: {
        sha256 = "0357j9xn0rw427x2f5pqkzmya9scyqwz3ksn4lyryzvmm9p6lii7";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://toktok.github.io/";
        description = "Encoding-independent schemas for Haskell data types";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -184197,7 +177387,6 @@ self: {
          regex-tdfa-text singletons smallcheck tagged text
          unordered-containers validationt vinyl
        ];
-       homepage = "http://github.com/typeable/schematic";
        description = "JSON-biased spec and validation tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184243,7 +177432,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184278,7 +177466,6 @@ self: {
          aeson base bytestring directory filepath process scholdoc
          scholdoc-types temporary text yaml
        ];
-       homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184302,7 +177489,6 @@ self: {
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
-       homepage = "http://github.com/timtylin/scholdoc-texmath";
        description = "Scholdoc fork of texmath";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184319,7 +177505,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
-       homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Scholdoc fork of pandoc-types";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184344,7 +177529,6 @@ self: {
        sha256 = "1qddamwk2fzakixx9f0y0r3z9z6kmyyxgpb3dhiiiza6krnf8r9k";
        libraryHaskellDepends = [ base hashable ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/Rufflewind/sci-ratio";
        description = "Rational numbers in scientific notation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -184394,7 +177578,6 @@ self: {
          tasty-hunit tasty-quickcheck tasty-smallcheck text
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -184420,7 +177603,6 @@ self: {
          ghc-syb hslogger json multiset network network-bytestring time
          utf8-string
        ];
-       homepage = "http://github.com/nominolo/scion";
        description = "Haskell IDE library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184456,7 +177638,6 @@ self: {
          resourcet tar text transformers unix unordered-containers
          utf8-string vector zlib
        ];
-       homepage = "http://github.com/JPMoresmau/scion-class-browser";
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184531,7 +177712,6 @@ self: {
          base data-default enclosed-exceptions http-types lens mtl
          persistent resource-pool scotty stm text transformers wai warp
        ];
-       homepage = "https://github.com/echaozh/scottish";
        description = "scotty with batteries included";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184562,7 +177742,6 @@ self: {
          hspec hspec-wai http-types lifted-base network text wai
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/scotty-web/scotty";
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -184581,7 +177760,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec http-client HUnit scotty text transformers
        ];
-       homepage = "https://github.com/welmo/scotty-binding-play";
        description = "The Play Framework style data binding in Scotty";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184616,7 +177794,6 @@ self: {
          base blaze-builder bytestring containers cookie scotty text time
          transformers
        ];
-       homepage = "https://github.com/mmartin/scotty-cookie";
        description = "Cookie management helper functions for Scotty framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -184656,7 +177833,6 @@ self: {
        libraryHaskellDepends = [ base http-media http-types scotty text ];
        executableHaskellDepends = [ aeson base scotty text ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/potomak/scotty-format#readme";
        description = "Response format helper for the Scotty web framework";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184674,7 +177850,6 @@ self: {
          base containers filepath hastache http-types mtl scotty text wai
          warp
        ];
-       homepage = "https://github.com/scotty-web/scotty-hastache";
        description = "Easy Mustache templating support for Scotty";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184692,7 +177867,6 @@ self: {
          base-prelude matcher scotty success text transformers
          unordered-containers
        ];
-       homepage = "https://github.com/sannsyn/scotty-params-parser";
        description = "HTTP-request's query parameters parser abstraction for \"scotty\"";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -184708,7 +177882,6 @@ self: {
        libraryHaskellDepends = [
          base containers http-types scotty text transformers wai
        ];
-       homepage = "https://github.com/taphu/scotty-resource";
        description = "A Better way of modeling web resources";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184735,7 +177908,6 @@ self: {
          base bytestring hspec hspec-wai mtl QuickCheck scotty
          string-conversions text wai
        ];
-       homepage = "http://github.com/ehamberg/scotty-rest";
        description = "Webmachine-style REST library for scotty";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184755,7 +177927,6 @@ self: {
          http-types scotty stm text time transformers unordered-containers
          wai
        ];
-       homepage = "https://github.com/agrafix/scotty-session";
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184770,7 +177941,6 @@ self: {
        libraryHaskellDepends = [
          base scotty transformers wai warp warp-tls
        ];
-       homepage = "https://github.com/dmjio/scotty-tls.git";
        description = "TLS for Scotty";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -184809,7 +177979,6 @@ self: {
          base bytestring cmdargs io-streams SHA sha-streams unix
        ];
        testHaskellDepends = [ base bytestring io-streams ];
-       homepage = "https://github.com/noteed/scp-streams";
        description = "An SCP protocol implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184901,7 +178070,6 @@ self: {
          monad-loops mtl ncurses optparse-applicative random text unix
          vector
        ];
-       homepage = "https://joeyh.name/code/scroll/";
        description = "scroll(6), a roguelike game";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -184923,7 +178091,6 @@ self: {
          base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/informatikr/scrypt";
        description = "Stronger password hashing via sequential memory-hard functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -184947,7 +178114,6 @@ self: {
          http-types MonadRandom mtl network old-locale process random stm
          template-haskell text time unix
        ];
-       homepage = "http://github.com/wereHamster/scrz";
        description = "Process management and supervision daemon";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185006,7 +178172,6 @@ self: {
          mersenne-random-pure64 mtl mwc-random normaldistribution parallel
          vector
        ];
-       homepage = "https://github.com/davnils/sde-solver";
        description = "Distributed SDE solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185025,7 +178190,6 @@ self: {
          base bytestring Cabal HUnit parsec test-framework
          test-framework-hunit transformers
        ];
-       homepage = "https://github.com/kojung/sdf2p1-parser";
        description = "A parser for SDF version 2.1 using Parsec";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -185106,7 +178270,6 @@ self: {
        version = "0.0.2";
        sha256 = "0lid8c2fdy43i9qjjn60mzn6mrcfnn1jflmbwfl93gc6ab5fwz63";
        libraryHaskellDepends = [ base sdl2 ];
-       homepage = "https://github.com/jxv/sdl2-fps#readme";
        description = "Run of the mill, frames per second timer implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185187,7 +178350,6 @@ self: {
        executableHaskellDepends = [
          base optparse-simple sdl2 sdl2-image split text
        ];
-       homepage = "https://github.com/chrisdone/sdl2-sprite#readme";
        description = "Sprite previewer/animator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185268,7 +178430,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion primitive storable-complex vector
        ];
-       homepage = "https://github.com/adamwalker/sdr";
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -185294,7 +178455,6 @@ self: {
          persistent-template text time transformers wai wai-extra
          wai-middleware-static warp web-routes web-routes-wai
        ];
-       homepage = "https://github.com/Barrucadu/lambdadelta";
        description = "Small web framework using Warp and WAI";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185366,7 +178526,6 @@ self: {
          base ghc-prim profunctors semigroupoids tagged transformers
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       homepage = "http://github.com/ekmett/search/";
        description = "Infinite search in finite time with Hilbert's epsilon";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185379,7 +178538,6 @@ self: {
        sha256 = "046v424bvfnvf3hw38k9isdn9f05l4jk8k1fb2p3zn5zgb4h77aa";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest hspec ];
-       homepage = "https://github.com/devonhollowood/search-algorithms#readme";
        description = "Common graph search algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185391,7 +178549,6 @@ self: {
        version = "0.0.1";
        sha256 = "1ryl0nm1a37r606xhxy6ykf3c8c1gml6gdqna428w8y3a2vg5q2v";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/urso/sec";
        description = "Semantic Editor Combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185408,7 +178565,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec ];
        executableHaskellDepends = [ base haskeline ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/kseo/secd#readme";
        description = "A Haskell implementation of the SECD abstract machine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185424,7 +178580,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
-       homepage = "http://github.com/pgavin/secdh";
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185465,7 +178620,6 @@ self: {
          lens network network-uri stm text transformers unordered-containers
        ];
        testToolDepends = [ cpphs ];
-       homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185490,7 +178644,6 @@ self: {
          mtl QuickCheck string-conversions test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "http://github.com/haskoin/secp256k1-haskell#readme";
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -185508,7 +178661,6 @@ self: {
        executableHaskellDepends = [
          base containers diagrams-cairo diagrams-lib haskell-qrencode random
        ];
-       homepage = "https://github.com/rodrigosetti/secret-santa";
        description = "Secret Santa game assigner using QR-Codes";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185532,7 +178684,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "http://monoid.at/code";
        description = "Information-theoretic secure secret sharing";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185563,7 +178714,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory HsOpenSSL network process transformers
        ];
-       homepage = "http://code.google.com/p/secure-hs/";
        description = "Secure point-to-point connectivity library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185588,7 +178738,6 @@ self: {
        libraryHaskellDepends = [
          base byteable bytestring ghc-prim memory
        ];
-       homepage = "https://github.com/vincenthz/hs-securemem";
        description = "abstraction to an auto scrubbing and const time eq, memory chunk";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185622,7 +178771,6 @@ self: {
          base bytestring exceptions hashable mtl psqueues text time
          unordered-containers
        ];
-       homepage = "https://selda.link";
        description = "Multi-backend, high-level EDSL for interacting with SQL databases";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -185639,7 +178787,6 @@ self: {
          base bytestring exceptions hashable mtl psqueues text time
          unordered-containers
        ];
-       homepage = "https://selda.link";
        description = "Multi-backend, high-level EDSL for interacting with SQL databases";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185658,7 +178805,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-libpq selda text
        ];
-       homepage = "https://github.com/valderman/selda";
        description = "PostgreSQL backend for the Selda database EDSL";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -185676,7 +178822,6 @@ self: {
        libraryHaskellDepends = [
          base direct-sqlite directory exceptions selda text
        ];
-       homepage = "https://github.com/valderman/selda";
        description = "SQLite backend for the Selda database EDSL";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -185688,7 +178833,6 @@ self: {
        version = "0.4.0.1";
        sha256 = "180cj5m0bap1lb19s68icpn1dvk2s395cmlcc6dnwz3mpbj5alj0";
        libraryHaskellDepends = [ base ];
-       homepage = "http://nonempty.org/software/haskell-select";
        description = "Wrap the select(2) POSIX function";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185700,7 +178844,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "000hdwdp56pc67j1iw0mc6m74dfim67g16ib4yr7vyilq8rfccb0";
        libraryHaskellDepends = [ base bifunctors comonad profunctors ];
-       homepage = "https://github.com/ChrisPenner/selections#readme";
        description = "Combinators for operating with selections over an underlying functor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185717,7 +178860,6 @@ self: {
          array base containers template-haskell text xml-conduit
        ];
        libraryToolDepends = [ alex happy ];
-       homepage = "http://github.com/rcallahan/selectors";
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185750,7 +178892,6 @@ self: {
          utf8-string
        ];
        testHaskellDepends = [ base hspec text webdriver ];
-       homepage = "https://github.com/joelteon/selenium-server.git";
        description = "Run the selenium standalone server for usage with webdriver";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185779,7 +178920,6 @@ self: {
        version = "0.1.0";
        sha256 = "100a427r8xjfv7fsh7khj3db9klqwnalfy33w23khxqp7k1bkq3n";
        libraryHaskellDepends = [ base directory executable-path unix ];
-       homepage = "https://github.com/nh2/selfrestart";
        description = "Restarts the current executable (on binary change)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -185792,7 +178932,6 @@ self: {
        sha256 = "1r0lwah32y3cza5jnihzwkl4wdk23qh7sgw6yzcajq7rjnzrf8qw";
        libraryHaskellDepends = [ base unix ];
        librarySystemDepends = [ selinux ];
-       homepage = "https://github.com/luite/selinux";
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185825,7 +178964,6 @@ self: {
          ghc-paths Glob groom mtl pandoc pandoc-types regex-tdfa
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://toktok.github.io/semdoc";
        description = "Evaluate code snippets in Literate Haskell";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185855,7 +178993,6 @@ self: {
        sha256 = "0xqxmh0chq4vgga5lx2d5pcz4rq000kgpkglj8jgdv2nx6rf8pka";
        libraryHaskellDepends = [ base containers lattices ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/xu-hao/semibounded-lattices#readme";
        description = "A Haskell implementation of semibounded lattices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185867,7 +179004,6 @@ self: {
        version = "5";
        sha256 = "0ciq1jnc0d9d8jph9103v04vphiz7xqa69a8f4dmmcf3bjsk6bhh";
        libraryHaskellDepends = [ base profunctors semigroupoids ];
-       homepage = "http://github.com/ekmett/semigroupoid-extras";
        description = "Semigroupoids that depend on PolyKinds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185891,7 +179027,6 @@ self: {
          transformers transformers-compat unordered-containers
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185912,7 +179047,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/NICTA/semigroupoids-syntax";
        description = "RebindableSyntax using the semigroupoids package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185925,7 +179059,6 @@ self: {
        version = "0.18.4";
        sha256 = "09sxd17h1kcjsjaf1am2nwpb4vaq8d0q718fbkxwysws691317jq";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/ekmett/semigroups/";
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -185937,7 +179070,6 @@ self: {
        version = "0.1";
        sha256 = "0vns2vdchszw34i12s9rfl4cm76ympfrivpb397j2vzg2i7bghqb";
        libraryHaskellDepends = [ base containers semigroups ];
-       homepage = "http://github.com/ppetr/semigroups-actions/";
        description = "Semigroups actions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185952,7 +179084,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Boolean containers monoids ];
-       homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185979,7 +179110,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion random vector
        ];
-       homepage = "https://github.com/oisdk/semiring-num";
        description = "Basic semiring class and instances";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -185997,19 +179127,16 @@ self: {
      }) {};
 
   "semirings" = callPackage
-    ({ mkDerivation, base, constrictor, containers, hashable
-     , integer-gmp, semigroups, transformers, unordered-containers
-     , vector
+    ({ mkDerivation, base, containers, hashable, integer-gmp
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "semirings";
-       version = "0.1.2";
-       sha256 = "1fn1hbrnljgx8kdnmk0c01zi1r0pk59cildla9gb6bykqs4rwmws";
+       version = "0.1.3.0";
+       sha256 = "0m2fs5d7w60mfihsyg95r6x923r0lby1g92bkzar0xm8r7kl1g90";
        libraryHaskellDepends = [
-         base constrictor containers hashable integer-gmp semigroups
-         transformers unordered-containers vector
+         base containers hashable integer-gmp unordered-containers vector
        ];
-       homepage = "http://github.com/chessai/semirings";
        description = "two monoids as one, in holy haskimony";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186025,7 +179152,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base deepseq text ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
        benchmarkHaskellDepends = [ base criterion text ];
-       homepage = "https://github.com/brendanhay/semver";
        description = "Representation, manipulation, and de/serialisation of Semantic Versions";
        license = "unknown";
      }) {};
@@ -186057,7 +179183,6 @@ self: {
        version = "0.7.9";
        sha256 = "0hnw1ym81cff49dwww19kgbs4s0kpandbvn6h5cml3y0p1nxybqh";
        libraryHaskellDepends = [ base bytestring network ];
-       homepage = "http://hub.darcs.net/stepcut/sendfile";
        description = "A portable sendfile library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186074,7 +179199,6 @@ self: {
          aeson base bytestring containers exceptions http-conduit
          monad-control text transformers
        ];
-       homepage = "https://owainlewis.com";
        description = "Sengrid API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186090,7 +179214,6 @@ self: {
        sha256 = "0sn1a47155d13w15jjbcbcl5sqnl286mf8q7k39qhir98qlq045s";
        libraryHaskellDepends = [ aeson base lens semigroups text wreq ];
        testHaskellDepends = [ base semigroups tasty tasty-hunit text ];
-       homepage = "https://github.com/marcelbuesing/sendgrid-v3";
        description = "Sendgrid v3 API library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186119,7 +179242,6 @@ self: {
          interpolate mockery network process silently stm text time unix wai
          warp
        ];
-       homepage = "https://github.com/hspec/sensei#readme";
        description = "Automatically run Hspec tests on file modifications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -186137,7 +179259,6 @@ self: {
        executableHaskellDepends = [
          aeson base bytestring containers process stm zeromq3-haskell
        ];
-       homepage = "https://github.com/rossdylan/sensenet";
        description = "Distributed sensor network for the raspberry pi";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186159,7 +179280,6 @@ self: {
          optparse-applicative process temporary text time unix unix-compat
          vector wreq
        ];
-       homepage = "https://github.com/maoe/sensu-run#readme";
        description = "A tool to send command execution results to Sensu";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186181,7 +179301,6 @@ self: {
          http-types lens network optparse-applicative process temporary text
          time unix unix-compat vector wreq
        ];
-       homepage = "https://github.com/maoe/sensu-run#readme";
        description = "A tool to send command execution results to Sensu";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186196,7 +179315,6 @@ self: {
        libraryHaskellDepends = [
          base mecab random-shuffle text transformers
        ];
-       homepage = "https://github.com/aiya000/hs-sentence-jp#readme";
        description = "Easily generating message of japanese natural language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186214,7 +179332,6 @@ self: {
          base Decimal hashable parsers safe string-class text trifecta
          unordered-containers vector
        ];
-       homepage = "https://github.com/k-bx/sentiwordnet-parser#readme";
        description = "Parser for the SentiWordNet tab-separated file";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186235,7 +179352,6 @@ self: {
          old-locale old-time process safecopy time unix
        ];
        executableHaskellDepends = [ base directory filepath unix ];
-       homepage = "https://github.com/noteed/sentry";
        description = "Process monitoring tool written and configured in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186268,7 +179384,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
-       homepage = "https://github.com/qfpl/separated";
        description = "A data type with elements separated by values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186294,7 +179409,6 @@ self: {
        executableHaskellDepends = [
          base Cabal cpphs directory process regex-base regex-pcre temporary
        ];
-       homepage = "http://fremissant.net/seqaid";
        description = "Dynamic strictness control, including space leak repair";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186332,7 +179446,6 @@ self: {
        revision = "1";
        editedCabalFile = "0khdf4panw2wvs80z6lx1vgn5h7xaswdxsh9rppb1fvvfjqzb7d9";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/bitnomial/seqid";
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186356,7 +179469,6 @@ self: {
        version = "0.6.2";
        sha256 = "0iaxd3ay36lbkzz19dgnb0pn6fi699afv556wkpnd8zl23p4qif3";
        libraryHaskellDepends = [ base io-streams seqid ];
-       homepage = "https://github.com/bitnomial/seqid-streams";
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186378,7 +179490,6 @@ self: {
          attoparsec base biocore bytestring hashable QuickCheck random
          unordered-containers vector
        ];
-       homepage = "http://www.ingolia-lab.org/seqloc-tutorial.html";
        description = "Handle sequence locations for bioinformatics";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -186412,7 +179523,6 @@ self: {
          hashable iteratee lifted-base process QuickCheck random seqloc
          transformers transformers-base unordered-containers vector
        ];
-       homepage = "http://www.ingolia-lab.org/seqloc-datafiles-tutorial.html";
        description = "Read and write BED and GTF format genome annotations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186426,7 +179536,6 @@ self: {
        sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers transformers ];
-       homepage = "https://github.com/atzeus/sequence";
        description = "A type class for sequences and various sequence data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186442,7 +179551,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers ghc transformers
        ];
-       homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186455,7 +179563,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "0vd7nrkx59vsxrhpb46kgzbvz7v830wh5zx3vg9494wvski983y6";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/aristidb/sequential-index";
        description = "Sequential numbers that allow arbitrarily inserting numbers - for containers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186479,7 +179586,6 @@ self: {
          array base binary bytestring containers mtl nlp-scores pretty split
          text vector
        ];
-       homepage = "https://bitbucket.org/gchrupala/sequor";
        description = "A sequence labeler based on Collins's sequence perceptron";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186497,7 +179603,6 @@ self: {
          attoparsec base conduit conduit-extra mtl operational process
          resourcet text
        ];
-       homepage = "http://github.com/sanetracker/serf";
        description = "Interact with Serf via Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -186560,7 +179665,6 @@ self: {
          containers criterion deepseq directory filepath ghc-prim half
          pretty store tar text time vector zlib
        ];
-       homepage = "https://github.com/well-typed/cborg";
        description = "A binary serialisation library for Haskell values";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186592,7 +179696,6 @@ self: {
        sha256 = "1z2drw7ighyws72wqms015n5hy0zxbrphdca7ldn34pz28122z07";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring HUnit ];
-       homepage = "https://github.com/jputcu/serialport";
        description = "Cross platform serial port library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186625,7 +179728,6 @@ self: {
          vector
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/serokell/serokell-util";
        description = "General-purpose functions by Serokell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186645,7 +179747,6 @@ self: {
          base pringletons singletons template-haskell text vinyl
        ];
        executableHaskellDepends = [ base singletons text ];
-       homepage = "http://github.com/githubuser/serpentine#readme";
        description = "Simple project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186660,7 +179761,6 @@ self: {
        libraryHaskellDepends = [
          base containers http-kinder singletons text
        ];
-       homepage = "http://github.com/tel/serv#readme";
        description = "Dependently typed API framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186686,7 +179786,6 @@ self: {
          base HUnit QuickCheck serv tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck text wai wai-extra
        ];
-       homepage = "http://github.com/tel/serv#readme";
        description = "Dependently typed API servers with Serv";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186716,7 +179815,6 @@ self: {
          hspec QuickCheck quickcheck-instances string-conversions text
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186737,7 +179835,6 @@ self: {
        executableHaskellDepends = [
          base JuicyPixels servant servant-server wai warp
        ];
-       homepage = "https://github.com/tvh/servant-JuicyPixels";
        description = "Servant support for JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186763,7 +179860,6 @@ self: {
          quickcheck-arbitrary-adt quickcheck-instances random servant
          silently string-conversions temporary text
        ];
-       homepage = "https://github.com/plow-technologies/servant-aeson-specs#readme";
        description = "generic tests for aeson serialization in servant";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186776,7 +179872,6 @@ self: {
        version = "0.3.1.0";
        sha256 = "0fa8r5rwrihsadzv74npb16yfvw3lzn3faajw660n5vxz36l56ia";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/haskell-servant/servant-auth#readme";
        description = "Authentication combinators for servant";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186802,7 +179897,6 @@ self: {
          servant-server time transformers wai warp
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/haskell-servant/servant-auth#readme";
        description = "servant-client/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186857,7 +179951,6 @@ self: {
          servant-docs template-haskell text
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/haskell-servant/servant-auth#readme";
        description = "servant-docs/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186930,7 +180023,6 @@ self: {
          wreq
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/haskell-servant/servant-auth#readme";
        description = "servant-server/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186952,7 +180044,6 @@ self: {
          swagger2 text
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://github.com/haskell-servant/servant-auth#readme";
        description = "servant-swagger/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186971,7 +180062,6 @@ self: {
          pwstore-fast servant servant-auth-token-api servant-server text
          time transformers uuid wai
        ];
-       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Servant based API and server for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186993,7 +180083,6 @@ self: {
          servant-auth-token-api servant-server template-haskell text time
          transformers transformers-base uuid
        ];
-       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Acid-state backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187011,7 +180100,6 @@ self: {
          aeson aeson-injector base lens raw-strings-qq servant servant-docs
          servant-swagger swagger2 text
        ];
-       homepage = "https://github.com/ncrashed/servant-auth-token-api#readme";
        description = "Servant based API for token based authorisation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187034,7 +180122,6 @@ self: {
          servant-server store text time transformers transformers-base uuid
          vector
        ];
-       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Leveldb backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187056,7 +180143,6 @@ self: {
          servant-auth-token-api servant-server text time transformers
          transformers-base uuid
        ];
-       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "Persistent backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187080,7 +180166,6 @@ self: {
          servant-server store text time transformers transformers-base uuid
          vector
        ];
-       homepage = "https://github.com/ncrashed/servant-auth-token#readme";
        description = "RocksDB backend for servant-auth-token server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187096,7 +180181,6 @@ self: {
        sha256 = "155f20pizgkhn0hczwpxwxw1i99h0l6kfwwhs2r6bmr305aqisj6";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        testHaskellDepends = [ base blaze-html servant-server wai warp ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "Blaze-html support for servant";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187118,7 +180202,6 @@ self: {
          base base-compat bytestring cassava http-media servant
          servant-server wai warp
        ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "Servant CSV content-type for cassava";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187145,7 +180228,6 @@ self: {
          base bytestring doctest Glob hspec-wai http-types servant
          servant-server tasty tasty-hspec tasty-hunit wai
        ];
-       homepage = "https://github.com/cdepillabout/servant-checked-exceptions";
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187163,6 +180245,8 @@ self: {
        pname = "servant-client";
        version = "0.13.0.1";
        sha256 = "120qs135arlby811p9z6zqjyrhsm517dq1xq41x3s2f167zkd7q8";
+       revision = "1";
+       editedCabalFile = "12iac58pgx5w20x0v6l5ikxxapgl0ql0c91hyv8vcw8mbrjq2qpv";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring containers exceptions
          http-client http-client-tls http-media http-types monad-control mtl
@@ -187176,7 +180260,6 @@ self: {
          transformers transformers-compat wai warp
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187198,7 +180281,6 @@ self: {
        ];
        testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "Core functionality and class for client function generation for servant APIs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187219,7 +180301,6 @@ self: {
          mtl servant servant-foreign servant-swagger swagger2 text time
          unordered-containers uuid uuid-types
        ];
-       homepage = "https://github.com/cutsea110/servant-csharp.git";
        description = "Generate servant client library for C#";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187258,7 +180339,6 @@ self: {
          optparse-applicative postgresql-query QuickCheck
          quickcheck-instances servant-db text time transformers-base
        ];
-       homepage = "https://github.com/NCrashed/servant-db-postgresql";
        description = "Derive a postgres client to database API specified by servant-db";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187290,7 +180370,6 @@ self: {
          aeson base hspec lens servant string-conversions
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187314,7 +180393,6 @@ self: {
        executableHaskellDepends = [
          base ede http-media servant-server text unordered-containers warp
        ];
-       homepage = "http://github.com/alpmestan/servant-ede";
        description = "Combinators for rendering EDE templates in servant web applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187362,7 +180440,6 @@ self: {
        testHaskellDepends = [
          aeson base Diff elm-export hspec HUnit servant text
        ];
-       homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187384,7 +180461,6 @@ self: {
        testHaskellDepends = [
          aeson base Diff elm-export hspec HUnit servant text
        ];
-       homepage = "http://github.com/mattjbray/servant-elm#readme";
        description = "Automatically derive Elm functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187408,7 +180484,6 @@ self: {
          servant-lucid servant-server text time transformers wai wai-extra
          warp
        ];
-       homepage = "http://haskell-servant.github.io/";
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187431,7 +180506,6 @@ self: {
        executableHaskellDepends = [
          aeson base exceptions http-types servant-server text warp
        ];
-       homepage = "https://github.com/ch1bo/servant-exceptions#readme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -187442,7 +180516,6 @@ self: {
        version = "0.2";
        sha256 = "0j8dv8010yr63sl3ks0an64ry53ajc2xd47vpd6i1svhb9b6l79i";
        libraryHaskellDepends = [ base servant ];
-       homepage = "https://github.com/alpmestan/servant-flatten";
        description = "Utilities for flattening servant API types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187475,7 +180548,6 @@ self: {
        revision = "1";
        editedCabalFile = "1viavg5pijjsdcmmdi7ibr9cvfz3r3b646jxxvmya10ss3zvlzh4";
        libraryHaskellDepends = [ base servant servant-server ];
-       homepage = "https://github.com/alpmestan/servant-generate";
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187515,7 +180587,6 @@ self: {
        ];
        executableHaskellDepends = [ base text transformers ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/finlay/servant-github#readme";
        description = "Bindings to GitHub API using servant";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187539,7 +180610,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring servant-server text transformers wai warp
        ];
-       homepage = "https://github.com/tsani/servant-github-webhook";
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -187567,7 +180637,6 @@ self: {
          http-client-tls http-media http-types HUnit network QuickCheck
          servant servant-server text wai warp
        ];
-       homepage = "http://github.com/ElvishJerricco/servant-haxl-client/";
        description = "automatical derivation of querying functions for servant webservices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187585,7 +180654,6 @@ self: {
        libraryHaskellDepends = [
          base data-default http-media iCalendar servant
        ];
-       homepage = "https://github.com/fgaz/servant-iCalendar#readme";
        description = "Servant support for iCalendar";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187605,7 +180673,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-expectations language-ecmascript lens servant
        ];
-       homepage = "http://haskell-servant.github.io/";
        description = "Automatically derive (jquery) javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187632,7 +180699,6 @@ self: {
          QuickCheck servant text
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187658,7 +180724,6 @@ self: {
          aeson base containers directory formatting http-api-data lens
          servant servant-foreign shelly text time wl-pprint-text
        ];
-       homepage = "https://github.com/matsubara0507/servant-kotlin#readme";
        description = "Automatically derive Kotlin class to query servant webservices";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -187673,7 +180738,6 @@ self: {
        sha256 = "0vkhh6n51672l3cvd64xdddnzr351j9hd80j7raqkq6k1wrygfi5";
        libraryHaskellDepends = [ base http-media lucid servant ];
        testHaskellDepends = [ base lucid servant-server wai warp ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "Servant support for lucid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187690,7 +180754,6 @@ self: {
          base bytestring http-types network-uri servant text utf8-string
        ];
        testHaskellDepends = [ base hspec network-uri servant text ];
-       homepage = "https://github.com/cocreature/servant-match#readme";
        description = "Standalone implementation of servant’s dispatching mechanism";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187743,7 +180806,6 @@ self: {
          servant-server wai
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "Derive a mock server for free from your servant API types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187767,7 +180829,6 @@ self: {
          base bytestring http-client network servant servant-server text
          transformers wai warp
        ];
-       homepage = "https://github.com/haskell-servant/servant-multipart#readme";
        description = "multipart/form-data (e.g file upload) support for servant";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187786,7 +180847,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-wai http-types servant servant-server
        ];
-       homepage = "https://github.com/bemweitzman/servant-named#readme";
        description = "Add named endpoints to servant";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187802,7 +180862,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-types servant-foreign servant-server text wai
        ];
-       homepage = "https://github.com/sordina/servant-options";
        description = "Provide responses to OPTIONS requests for Servant applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -187821,7 +180880,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base safe servant servant-server text ];
        testHaskellDepends = [ base hspec QuickCheck servant-server text ];
-       homepage = "https://github.com/chordify/haskell-servant-pagination";
        description = "Type-safe pagination for Servant APIs";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -187852,7 +180910,6 @@ self: {
        revision = "1";
        editedCabalFile = "15wcxjn22zmwj7dqrbg5kmca4niri6p4cs0gm8b3dnr1iv2l0jgq";
        libraryHaskellDepends = [ base resource-pool servant time ];
-       homepage = "http://github.com/zalora/servant-pool";
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187870,7 +180927,6 @@ self: {
          base bytestring postgresql-simple servant servant-pool
          servant-response
        ];
-       homepage = "http://github.com/zalora/servant-postgresql";
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187894,7 +180950,6 @@ self: {
          proto-lens-protobuf-types servant-client servant-server
          test-framework test-framework-hunit warp
        ];
-       homepage = "https://github.com/plredmond/servant-proto-lens";
        description = "Servant Content-Type for proto-lens protobuf modules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187919,7 +180974,6 @@ self: {
          aeson base containers lens mainland-pretty purescript-bridge
          servant servant-foreign servant-subscriber text
        ];
-       homepage = "https://github.com/eskimor/servant-purescript#readme";
        description = "Generate PureScript accessor functions for you servant API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -187962,7 +181016,6 @@ self: {
          aeson base base-compat bytestring hspec hspec-expectations lens
          QuickCheck servant servant-foreign text
        ];
-       homepage = "https://github.com/pellagic-puffbomb/servant-py#readme";
        description = "Automatically derive python functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188019,7 +181072,6 @@ self: {
          http-types servant servant-client servant-server tasty tasty-hspec
          tasty-hunit transformers wai warp
        ];
-       homepage = "https://github.com/cdepillabout/servant-rawm";
        description = "Embed a raw 'Application' in a Servant API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188034,7 +181086,6 @@ self: {
        revision = "1";
        editedCabalFile = "1lhxc5kjz4459v65h57imv3k9l9nrkgid1qqlbwb4987q7y83qay";
        libraryHaskellDepends = [ aeson base http-types text ];
-       homepage = "http://github.com/zalora/servant";
        description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188054,7 +181105,6 @@ self: {
        testHaskellDepends = [
          base blaze-html servant servant-blaze servant-server warp
        ];
-       homepage = "https://github.com/ElvishJerricco/servant-router";
        description = "Servant router for non-server applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188070,7 +181120,6 @@ self: {
        sha256 = "0r39ixsmqslbygd38bvz61a7n0r7g54zfrcgjfn506599ybianm9";
        libraryHaskellDepends = [ base casing lens servant-foreign text ];
        testHaskellDepends = [ base doctest QuickCheck ];
-       homepage = "https://github.com/joneshf/servant-ruby#readme";
        description = "Generate a Ruby client from a Servant API with Net::HTTP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188089,7 +181138,6 @@ self: {
          aeson base http-types scotty servant servant-response text
          transformers
        ];
-       homepage = "http://github.com/zalora/servant";
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188110,6 +181158,8 @@ self: {
        pname = "servant-server";
        version = "0.13.0.1";
        sha256 = "0fggdqz2d6q96x8vnm64yvarg4fgxqh0jd3vis6yxpybfi174arm";
+       revision = "1";
+       editedCabalFile = "102w8rbl7hrm3gqsdzk1g794vssvn1c89h5d2j0hqkc587qws0nd";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cabal-doctest ];
@@ -188129,7 +181179,6 @@ self: {
          wai wai-extra warp
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "http://haskell-servant.readthedocs.org/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188152,7 +181201,6 @@ self: {
          aeson base bytestring HUnit QuickCheck quickcheck-text tasty
          tasty-hunit tasty-quickcheck text
        ];
-       homepage = "https://github.com/NCrashed/servant-smsc-ru#readme";
        description = "Servant client for smsc.ru service for sending SMS to cell phones";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188191,7 +181239,6 @@ self: {
          QuickCheck servant snap snap-core snap-cors snap-server
          string-conversions temporary text time transformers
        ];
-       homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188219,11 +181266,84 @@ self: {
          hspec-wai servant servant-blaze servant-server tasty tasty-hspec
          tasty-hunit wai
        ];
-       homepage = "https://github.com/cdepillabout/servant-static-th";
        description = "Embed a directory of static files in your Servant server";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-streaming" = callPackage
+    ({ mkDerivation, base, hspec, http-types, QuickCheck, servant }:
+     mkDerivation {
+       pname = "servant-streaming";
+       version = "0.2.0.0";
+       sha256 = "10cs6yrzy75w8zvjddqw0gcnqmwmk28112vbj9dwpg2qgh1s1194";
+       libraryHaskellDepends = [ base http-types servant ];
+       testHaskellDepends = [ base hspec http-types QuickCheck servant ];
+       description = "Servant combinators for the 'streaming' package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-streaming-client" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, http-client, http-media
+     , http-types, QuickCheck, resourcet, servant, servant-client
+     , servant-client-core, servant-server, servant-streaming
+     , servant-streaming-server, streaming, warp
+     }:
+     mkDerivation {
+       pname = "servant-streaming-client";
+       version = "0.2.0.0";
+       sha256 = "056k8ysani675ab9x7ls6fns55frw26krcdrsznwc2808bi71p3x";
+       libraryHaskellDepends = [
+         base bytestring http-media http-types resourcet servant
+         servant-client-core servant-streaming streaming
+       ];
+       testHaskellDepends = [
+         base bytestring hspec http-client http-media http-types QuickCheck
+         resourcet servant servant-client servant-client-core servant-server
+         servant-streaming servant-streaming-server streaming warp
+       ];
+       description = "Client instances for the 'servant-streaming' package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-streaming-docs" = callPackage
+    ({ mkDerivation, base, lens, servant, servant-docs
+     , servant-streaming
+     }:
+     mkDerivation {
+       pname = "servant-streaming-docs";
+       version = "0.2.0.0";
+       sha256 = "0a5f5bz4qgk9a7bfgym950mcqxx83629j3x35rmp7faxd50jx055";
+       libraryHaskellDepends = [
+         base lens servant servant-docs servant-streaming
+       ];
+       description = "Client instances for the 'servant-docs' package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-streaming-server" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hspec, http-media
+     , http-types, pipes, pipes-http, QuickCheck, resourcet, servant
+     , servant-server, servant-streaming, streaming
+     , streaming-bytestring, streaming-wai, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-streaming-server";
+       version = "0.2.0.0";
+       sha256 = "1a95hzvcki51109hd563kk23zgv909pwdvpdxah3asbv78b9i7id";
+       libraryHaskellDepends = [
+         base bytestring http-media http-types resourcet servant
+         servant-server servant-streaming streaming streaming-wai wai
+       ];
+       testHaskellDepends = [
+         base bytestring directory hspec http-media http-types pipes
+         pipes-http QuickCheck resourcet servant servant-server
+         servant-streaming streaming streaming-bytestring streaming-wai wai
+         warp
+       ];
+       description = "Server instances for the 'servant-streaming' package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-subscriber" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder
      , bytestring, case-insensitive, containers, directory, filepath
@@ -188246,7 +181366,6 @@ self: {
          wai-websockets warp websockets
        ];
        executableHaskellDepends = [ base purescript-bridge ];
-       homepage = "http://github.com/eskimor/servant-subscriber#readme";
        description = "When REST is not enough ...";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188275,7 +181394,6 @@ self: {
          QuickCheck servant swagger2 text time
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/haskell-servant/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188303,7 +181421,6 @@ self: {
          aeson base base-compat lens servant servant-server servant-swagger
          swagger2 text transformers transformers-compat wai warp
        ];
-       homepage = "https://github.com/phadej/servant-swagger-ui#readme";
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188320,7 +181437,6 @@ self: {
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
        ];
-       homepage = "https://github.com/phadej/servant-swagger-ui";
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188342,7 +181458,6 @@ self: {
          servant-server swagger2 text transformers transformers-compat
          wai-app-static
        ];
-       homepage = "https://github.com/phadej/servant-swagger-ui";
        description = "Servant swagger ui core components";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188359,7 +181474,6 @@ self: {
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
        ];
-       homepage = "https://github.com/phadej/servant-swagger-ui";
        description = "Servant swagger ui: Jens-Ole Graulund theme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188376,7 +181490,6 @@ self: {
          base bytestring file-embed-lzma servant servant-server
          servant-swagger-ui-core swagger2 text
        ];
-       homepage = "https://github.com/phadej/servant-swagger-ui";
        description = "Servant swagger ui: ReDoc theme";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188408,7 +181521,6 @@ self: {
          QuickCheck tasty tasty-hunit tasty-quickcheck text time
          transformers
        ];
-       homepage = "https://github.com/ChrisCoffey/haskell-opentracing-light#readme";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -188430,7 +181542,6 @@ self: {
        executableHaskellDepends = [
          aeson base conduit servant-server text wai warp websockets
        ];
-       homepage = "https://github.com/moesenle/servant-websockets#readme";
        description = "Small library providing WebSocket endpoints for servant";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188446,7 +181557,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-media servant xmlbf xmlbf-xeno
        ];
-       homepage = "https://github.com/fosskers/servant-xml";
        description = "Servant support for the XML Content-Type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188469,7 +181579,6 @@ self: {
          aeson base base-compat bytestring http-media servant servant-server
          wai warp yaml
        ];
-       homepage = "https://github.com/phadej/servant-yaml#readme";
        description = "Servant support for yaml";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188481,7 +181590,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "1pga7l2akxqhkfq6gqaiiz6svvhzb83dbc5bw487kkrs3vriyyc3";
        libraryHaskellDepends = [ base singletons ];
-       homepage = "https://github.com/martyall/servant-zeppelin#readme";
        description = "Types and definitions of servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188506,7 +181614,6 @@ self: {
          servant-zeppelin-server singletons string-conversions wai-extra
          warp
        ];
-       homepage = "https://github.com/martyall/servant-zeppelin#readme";
        description = "Client library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188531,7 +181638,6 @@ self: {
          QuickCheck servant servant-server servant-zeppelin
          string-conversions warp wreq
        ];
-       homepage = "https://github.com/martyall/servant-zeppelin#readme";
        description = "Server library for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188554,7 +181660,6 @@ self: {
          aeson base containers hspec insert-ordered-containers lens servant
          servant-swagger servant-zeppelin swagger2
        ];
-       homepage = "https://github.com/martyall/servant-zeppelin#readme";
        description = "Swagger instances for servant-zeppelin combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188571,7 +181676,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring http-types mtl text void wai warp
        ];
-       homepage = "https://github.com/Gabriel439/Haskell-Server-Generic-Library";
        description = "Auto-generate a server for your datatype";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188580,24 +181684,24 @@ self: {
   "serverless-haskell" = callPackage
     ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
-     , hspec, hspec-discover, lens, raw-strings-qq, text, time, unix
-     , unordered-containers
+     , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
+     , text, time, unix, unordered-containers
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.4.3";
-       sha256 = "0sdx28v81b6d5iankxbyb6psbrrsz5s2y01q36b7kbmg5sc4jiyy";
+       version = "0.5.0";
+       sha256 = "0di9l77x6skbf26vic4sg83187lgkc98yzakip1ix5d9a45niz6m";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive lens text time unix
-         unordered-containers
+         amazonka-s3 base bytestring case-insensitive http-types iproute
+         lens text time unix unordered-containers
        ];
        testHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive hspec hspec-discover
-         lens raw-strings-qq text time unix unordered-containers
+         http-types iproute lens raw-strings-qq text time unix
+         unordered-containers
        ];
-       homepage = "https://github.com/seek-oss/serverless-haskell#readme";
        description = "Deploying Haskell code onto AWS Lambda using Serverless";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188621,7 +181725,6 @@ self: {
          hspec nonce path-pieces QuickCheck text time transformers
          unordered-containers
        ];
-       homepage = "https://github.com/yesodweb/serversession";
        description = "Secure, modular server-side sessions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -188642,7 +181745,6 @@ self: {
          acid-state base containers hspec mtl safecopy serversession
          unordered-containers
        ];
-       homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -188669,7 +181771,6 @@ self: {
          persistent-template QuickCheck resource-pool serversession text
          time transformers unordered-containers
        ];
-       homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using persistent and an RDBMS";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -188691,7 +181792,6 @@ self: {
          base bytestring hedis hspec path-pieces serversession text time
          transformers unordered-containers
        ];
-       homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using Redis";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -188709,7 +181809,6 @@ self: {
          base bytestring nonce path-pieces serversession snap snap-core text
          time transformers unordered-containers
        ];
-       homepage = "https://github.com/yesodweb/serversession";
        description = "Snap bindings for serversession";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188728,7 +181827,6 @@ self: {
          base bytestring cookie data-default path-pieces serversession text
          time transformers unordered-containers vault wai wai-session
        ];
-       homepage = "https://github.com/yesodweb/serversession";
        description = "wai-session bindings for serversession";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -188747,7 +181845,6 @@ self: {
          serversession text time transformers unordered-containers wai
          yesod-core
        ];
-       homepage = "https://github.com/yesodweb/serversession";
        description = "Yesod bindings for serversession";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188766,7 +181863,6 @@ self: {
          text wai
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/seanhess/services#readme";
        description = "Tools for building services";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188783,7 +181879,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring generic-deriving text text-show
        ];
-       homepage = "https://github.com/v0d1ch/serviette#readme";
        description = "JSON to Sql";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188802,7 +181897,6 @@ self: {
          base blaze-builder blaze-html bytestring http-types markdown
          shakespeare text wai wai-app-static
        ];
-       homepage = "http://github.com/snoyberg/servius#readme";
        description = "Warp web server with template rendering";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -188850,7 +181944,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring containers mtl network
        ];
-       homepage = "http://www.wellquite.org/sessions/";
        description = "Session Types for Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188873,7 +181966,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base directory exceptions hspec ];
-       homepage = "https://github.com/Ferdinand-vW/sessiontypes#readme";
        description = "Session types library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188897,7 +181989,6 @@ self: {
        testHaskellDepends = [
          base distributed-process hspec network-transport-tcp sessiontypes
        ];
-       homepage = "https://github.com/Ferdinand-vW/sessiontypes-distributed#readme";
        description = "Session types distributed";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -188916,7 +182007,6 @@ self: {
        libraryHaskellDepends = [
          base containers enummapset psqueues semigroups utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188928,7 +182018,6 @@ self: {
        version = "1.4.1";
        sha256 = "10kbvd09hp12rlfkc15xqiglrbxzi7gchb0aazqyg77ah66wjn10";
        libraryHaskellDepends = [ base containers mtl syb ];
-       homepage = "https://github.com/ddssff/set-extra";
        description = "Functions that could be added to Data.Set.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -188977,7 +182066,6 @@ self: {
          split text uuid
        ];
        executableToolDepends = [ alex happy ];
-       homepage = "http://bitbucket.org/robertmassaioli/setdown";
        description = "Treating files as sets to perform rapid set manipulation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189019,7 +182107,6 @@ self: {
        version = "1.0.0.6";
        sha256 = "1rl8qb8vzv8fdbczy2dxwgn4cb68lfrjdxf2w8nn9wy1acqzcyjq";
        libraryHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189058,7 +182145,6 @@ self: {
        testHaskellDepends = [
          base containers doctest hlint hspec protolude
        ];
-       homepage = "https://github.com/fmind/setop";
        description = "Perform set operations on files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -189125,7 +182211,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "1hnbr2r99i2cgjl329zh7i1g059vq2id3d2drmx0gzmw6x9nvqs8";
        libraryHaskellDepends = [ base text unordered-containers ];
-       homepage = "http://rel4tion.org/projects/settings/";
        description = "Runtime-editable program settings";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -189150,7 +182235,6 @@ self: {
          base bytestring containers HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/scvalex/sexp";
        description = "S-Expression parsing/printing made fun and easy";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189179,7 +182263,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion scientific semigroups text
        ];
-       homepage = "https://github.com/esmolanka/sexp-grammar";
        description = "Invertible parsers for S-expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189229,7 +182312,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit template-haskell
        ];
-       homepage = "https://github.com/dzhus/sext#readme";
        description = "Lists, Texts, ByteStrings and Vectors with type-encoded length";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189243,7 +182325,6 @@ self: {
        sha256 = "057z0z2xbls1p43k0kixbw26v0pv6lsvfh5ycjx37r8xw8ks31ba";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ libsndfile openal ];
-       homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
      }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
@@ -189255,7 +182336,6 @@ self: {
        version = "0.1.1";
        sha256 = "1jwzsk43kkvlmw551z46bhbvccf9yn1ncrhd27lm4pn93as2v1p6";
        libraryHaskellDepends = [ base bytestring entropy primitive ];
-       homepage = "https://github.com/philopon/sfmt-hs";
        description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189277,7 +182357,6 @@ self: {
          base bytestring filepath optparse-applicative parsec
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/kseo/sfnt2woff#readme";
        description = "A command line tool to convert TrueType/OpenType fonts to WOFF format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189296,7 +182375,6 @@ self: {
          base binary bytestring containers deepseq filepath lazy-io logfloat
          monad-par mtl primitive random temporary vector
        ];
-       homepage = "https://github.com/kawu/sgd";
        description = "Stochastic gradient descent";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189314,7 +182392,6 @@ self: {
          base containers encoding extensible-exceptions mtl parsec split
          time transformers
        ];
-       homepage = "https://github.com/tonicebrian/sgf";
        description = "SGF (Smart Game Format) parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189329,7 +182406,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bio regex-compat ];
-       homepage = "http://blog.malde.org/";
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189345,7 +182421,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base binary bytestring io-streams SHA ];
        executableHaskellDepends = [ base io-streams SHA ];
-       homepage = "https://github.com/noteed/sha-streams";
        description = "SHA hashes for io-streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189360,7 +182435,6 @@ self: {
        revision = "1";
        editedCabalFile = "164nw1gg6yl3fb4pqbgxxphafw2120a8kryhqx0i09l8c1n49557";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/fredefox/shade#readme";
        description = "A control structure used to combine heterogenous types with delayed effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189383,7 +182457,6 @@ self: {
          base doctest filemanip fsnotify MissingH mtl process safe
          system-filepath text
        ];
-       homepage = "http://github.com/karun012/shadower";
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189414,7 +182487,6 @@ self: {
        testHaskellDepends = [
          base binary bytestring containers cryptohash HUnit process
        ];
-       homepage = "https://github.com/rnons/shadowsocks-haskell";
        description = "A fast SOCKS5 proxy that help you get through firewalls";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189433,7 +182505,6 @@ self: {
          applicative-numbers base Boolean containers data-treify MemoTrie
          mtl ty TypeCompose vector-space wl-pprint
        ];
-       homepage = "http://haskell.org/haskellwiki/shady";
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189452,7 +182523,6 @@ self: {
          applicative-numbers base Boolean containers data-treify MemoTrie
          mtl shady-gen ty TypeCompose vector-space wl-pprint
        ];
-       homepage = "http://haskell.org/haskellwiki/shady";
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189486,7 +182556,6 @@ self: {
          js-flot js-jquery primitive process QuickCheck random time
          transformers unix unordered-containers utf8-string
        ];
-       homepage = "https://shakebuild.com";
        description = "Build system library, like Make, but more accurate dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189504,7 +182573,6 @@ self: {
          base binary dependency directory hashable hs2ats language-ats
          microlens microlens-th shake shake-ext text
        ];
-       homepage = "https://github.com/vmchale/shake-ats#readme";
        description = "Utilities for building ATS projects with shake";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189521,7 +182589,6 @@ self: {
        executableHaskellDepends = [
          base Cabal directory filepath process
        ];
-       homepage = "https://github.com/samplecount/shake-cabal-build";
        description = "Utility for building Shake build systems using Cabal sandboxes";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189539,7 +182606,6 @@ self: {
          base Cabal cdeps composition-prelude cpphs directory shake
          template-haskell
        ];
-       homepage = "https://hub.darcs.net/vmchale/shake-ext";
        description = "Helper functions for linting with shake";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189556,7 +182622,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cmdargs directory filepath shake
        ];
-       homepage = "http://thoughtpolice.github.com/shake-extras";
        description = "Extra utilities for shake build systems";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189576,7 +182641,6 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest hspec shake ];
        doCheck = false;
-       homepage = "https://github.com/samplecount/shake-language-c";
        description = "Utilities for cross-compiling with Shake";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -189595,7 +182659,6 @@ self: {
        ];
        testHaskellDepends = [ base directory doctest hspec shake ];
        doCheck = false;
-       homepage = "https://github.com/samplecount/shake-language-c";
        description = "Utilities for cross-compiling with Shake";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189610,7 +182673,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring css-text hjsmin shake text
        ];
-       homepage = "https://github.com/LukeHoersten/shake-minify";
        description = "Shake Minify Rules";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189623,7 +182685,6 @@ self: {
        version = "0.2.0";
        sha256 = "13v9p6idndg3xy8fb63g037csgmj5kaxj0903kx5py050cj6rbaz";
        libraryHaskellDepends = [ base bytestring bzlib shake tar ];
-       homepage = "https://github.com/LukeHoersten/shake-pack";
        description = "Shake File Pack Rule";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189636,7 +182697,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "0sjw0hcs6i9c8vfirrk90y5xd3cf0f9c0wa2p5pqimc5wfid9plk";
        libraryHaskellDepends = [ base path path-io shake ];
-       homepage = "http://cs-syd.eu";
        description = "path alternatives to shake functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -189654,7 +182714,6 @@ self: {
          base binary directory shake template-haskell
        ];
        executableHaskellDepends = [ base shake ];
-       homepage = "https://anonscm.debian.org/cgit/users/kaction-guest/haskell-shake-persist.git";
        description = "Shake build system on-disk caching";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189684,7 +182743,6 @@ self: {
          regex-posix template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/bonnefoa/Shaker";
        description = "simple and interactive command-line build tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189700,7 +182758,6 @@ self: {
        libraryHaskellDepends = [
          base basic-prelude directory lifted-base shake
        ];
-       homepage = "https://github.com/swift-nav/shakers";
        description = "Shake helpers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -189725,7 +182782,6 @@ self: {
          exceptions ghc-prim hspec HUnit parsec process template-haskell
          text time transformers
        ];
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
@@ -189756,7 +182812,6 @@ self: {
        sha256 = "18d0kxfrs0aj9pfd9p1j7w5amch1hvsww3xycgn5qk6i0z7l4ywz";
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Stick your haskell variables into css at compile time. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -189769,7 +182824,6 @@ self: {
        sha256 = "0ahhg9r7d8kdxn0x33bp5p8wmwkh1yvdqhw05yjwif0ky5y9h625";
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A type-based approach to internationalization. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -189782,7 +182836,6 @@ self: {
        sha256 = "0hihcrgvzf4nsrgw6vqpkzbgskq01yc1mnvp7g2wy7vq0dv4pjp4";
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Stick your haskell variables into javascript/coffeescript at compile time. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -189798,7 +182851,6 @@ self: {
        libraryHaskellDepends = [
          base hsass shakespeare template-haskell yesod yesod-core
        ];
-       homepage = "https://github.com/brcha/shakespeare-sass";
        description = "SASS support for Shakespeare and Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189812,7 +182864,6 @@ self: {
        sha256 = "18ixixb9aqn630s9wblxcki1gggm4i0fj9752c55p3b42q8h86rc";
        libraryHaskellDepends = [ base shakespeare ];
        doHaddock = false;
-       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "Interpolation with quasi-quotation: put variables strings (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -189825,7 +182876,6 @@ self: {
        sha256 = "0fg16nbi0r0pdd3sfabzdz1f4595x3hz3b4pxfwy8l78p8lppv0y";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory regex-posix ];
-       homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "treat haskell functions as unix pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189841,7 +182891,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring data-binary-ieee754 dbf filepath rwlock
        ];
-       homepage = "http://code.haskell.org/~mokus/shapefile";
        description = "Parser and related tools for ESRI shapefile format";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -189860,7 +182909,6 @@ self: {
        testHaskellDepends = [
          base containers proxy-kindness QuickCheck tagged template-haskell
        ];
-       homepage = "http://github.com/jberryman/shapely-data";
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189889,7 +182937,6 @@ self: {
          array base containers deepseq either ghc-prim hspec lens linear mtl
          QuickCheck shapes-math transformers vector vector-th-unbox
        ];
-       homepage = "https://github.com/ublubu/shapes#readme";
        description = "physics engine and other tools for 2D shapes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189909,7 +182956,6 @@ self: {
          array base containers either ghc-prim lens linear monad-extras mtl
          sdl2 shapes StateVar text transformers vector
        ];
-       homepage = "https://github.com/ublubu/shapes#readme";
        description = "demos for the 'shapes' package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189933,7 +182979,6 @@ self: {
        testHaskellDepends = [
          base ghc-prim hspec linear QuickCheck template-haskell
        ];
-       homepage = "https://github.com/ublubu/shapes#readme";
        description = "faster vector/matrix math using unboxed numbers and Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189945,7 +182990,6 @@ self: {
        version = "0.2";
        sha256 = "1cwzks95jlpa4cd99mz5cz509h7j8k08w53xpvwny1bdb3p1cpsa";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/anton-k/sharc";
        description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189977,7 +183021,6 @@ self: {
        sha256 = "107n6w4dn0n4iv7qmfm1d9y04rgj3ab3qc8kyqqddnbnfa44y157";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base Cabal hspec lens text ];
-       homepage = "http://github.com/intolerable/shared-fields";
        description = "a tiny library for using shared lens fields";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -189991,7 +183034,6 @@ self: {
        sha256 = "15h4j81q2v97dx61pnpaqs99z4vvlw7xl1dxbh878imxj8zn4z84";
        libraryHaskellDepends = [ base unix ];
        testHaskellDepends = [ base bytestring unix ];
-       homepage = "https://github.com/nh2/shared-memory";
        description = "POSIX shared memory";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -190003,7 +183045,6 @@ self: {
        version = "0.1.0";
        sha256 = "08hmmb2nn2lpirdnpp928m6xadzkv8k90x1nycw2b58vp1rpk7zv";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nh2/haskell-sharedio";
        description = "Bundles shared calls to IO functions to perform them only once";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -190020,7 +183061,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base filepath mtl ];
        executableHaskellDepends = [ base filepath mtl ];
-       homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190076,7 +183116,6 @@ self: {
          base bytestring conduit conduit-extra hspec hspec-expectations
          template-haskell
        ];
-       homepage = "https://github.com/psibi/shell-conduit";
        description = "Write shell scripts with Conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190091,7 +183130,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring containers vector
        ];
-       homepage = "http://github.com/solidsnack/shell-escape";
        description = "Shell escaping library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190118,7 +183156,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "http://gnu.rtin.bz/directory/devel/prog/other/shell-haskell.html";
        description = "Pipe streams through external shell commands";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190136,7 +183173,6 @@ self: {
          base bytestring directory filepath mtl process strict time
          unix-compat
        ];
-       homepage = "http://repos.mornfall.net/shellish";
        description = "shell-/perl- like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190154,7 +183190,6 @@ self: {
          base bytestring directory filepath process temporary transformers
          unix
        ];
-       homepage = "https://github.com/valderman/shellmate";
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190173,7 +183208,6 @@ self: {
          base bytestring feed http-conduit http-types mime-types shellmate
          tagsoup text utf8-string xml
        ];
-       homepage = "https://github.com/valderman/shellmate";
        description = "Extra functionality for shellmate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190189,7 +183223,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ async base stm text typed-process ];
        executableHaskellDepends = [ async base stm text typed-process ];
-       homepage = "https://github.com/loganmac/shellout#readme";
        description = "A threaded manager for Haskell that can run and stream external process output/err/exits";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190210,7 +183243,6 @@ self: {
          pretty-show process regex-tdfa safe test-framework
          test-framework-hunit utf8-string
        ];
-       homepage = "https://github.com/simonmichael/shelltestrunner";
        description = "Easy, repeatable testing of CLI programs/commands";
        license = "GPL";
      }) {};
@@ -190223,7 +183255,6 @@ self: {
        sha256 = "1k3wmkmxr1rvjjrgg2swz8pl2nwf723q8zwpybadss4kz0f4w314";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec text ];
-       homepage = "https://github.com/pbrisbin/hs-shellwords#readme";
        description = "Parse strings into words, like a shell would";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -190253,7 +183284,6 @@ self: {
          lifted-base monad-control mtl process system-fileio system-filepath
          text time transformers transformers-base unix-compat
        ];
-       homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190283,7 +183313,6 @@ self: {
          lifted-base monad-control mtl process system-fileio system-filepath
          text time transformers transformers-base unix-compat
        ];
-       homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190301,7 +183330,6 @@ self: {
        testHaskellDepends = [
          async base hspec HUnit mtl SafeSemaphore shelly text
        ];
-       homepage = "https://github.com/yesodweb/Shelly.hs";
        description = "shelly features that require extra dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190340,7 +183368,6 @@ self: {
          optparse-applicative system-fileio system-filepath text turtle
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/vmchale/teleport#readme";
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -190361,7 +183388,6 @@ self: {
          aeson base bytestring directory filepath flow Glob tasty
          tasty-hunit text unordered-containers
        ];
-       homepage = "https://github.com/icidasset/shikensu#readme";
        description = "Run a sequence of functions on in-memory representations of files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190399,7 +183425,6 @@ self: {
          base ghcjs-dom ghcjs-prim keycode mtl time transformers
        ];
        testHaskellDepends = [ base ghcjs-dom ];
-       homepage = "https://github.com/fgaz/shine";
        description = "Declarative graphics for the browser using GHCJS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190416,7 +183441,6 @@ self: {
        editedCabalFile = "1icg7mcfw6zrdf884kh2g0ss2lki0zf0b3r0yqzmz4h2cwvxl910";
        libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ];
        testHaskellDepends = [ base ghcjs-dom keycode shine varying ];
-       homepage = "https://github.com/fgaz/shine-varying";
        description = "FRP interface for shine using the varying package";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190445,7 +183469,6 @@ self: {
        version = "0.2";
        sha256 = "0ywb8bfkdpqqv2spb92j9rzx4fv5k1c7b65wj0zwnn9rp7ckq59v";
        libraryHaskellDepends = [ base curl ];
-       homepage = "http://richardfergie.com/shoap";
        description = "A very basic SOAP package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190467,7 +183490,6 @@ self: {
          lifted-base mtl resourcet safe text time unordered-containers
          vector
        ];
-       homepage = "https://oss.xkcd.com/";
        description = "A haskell API binding for shopify.com";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190480,7 +183502,6 @@ self: {
        version = "0.1";
        sha256 = "02gcr6glp1kjs4l7ds8487dbblr1pw8nyq34i3rg1hskz0b83l6z";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/aristidb/shortcircuit";
        description = "Short-circuit values and expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190494,7 +183515,6 @@ self: {
        revision = "1";
        editedCabalFile = "14yp03pynaw3wwj6fnnr6ns7f74h2x7m75wvg3dkxc0dv6snl9l7";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.nomyx.net";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -190505,7 +183525,6 @@ self: {
        version = "0.4.2.0";
        sha256 = "09sh6c1cwhs9x49mim8z1pafb0sh1z3im0k5wvigkpagx72pasqy";
        libraryHaskellDepends = [ base text ];
-       homepage = "http://github.com/aelve/shortcut-links";
        description = "Link shortcuts for use in text markup";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190517,7 +183536,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1srqbc2kx1zn0xlzv94y7kqdrflmdck3jy6d2fl75zhf11wilxw3";
        libraryHaskellDepends = [ base text ];
-       homepage = "https://github.com/Tarrasch/shorten-strings";
        description = "Shorten a variety of string-like types adding ellipsis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190533,7 +183551,6 @@ self: {
        testHaskellDepends = [
          base deepseq hspec hspec-expectations HUnit
        ];
-       homepage = "http://github.com/CRogers/should-not-typecheck";
        description = "A HUnit/hspec assertion library to verify that an expression does not typecheck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190559,7 +183576,6 @@ self: {
        editedCabalFile = "09zd78jap17ralla3833gwv6bwmh93bpjgdshkyf7j06xg2c1mq8";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/Lysxia/show-combinators#readme";
        description = "Combinators to write Show instances";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -190575,7 +183591,6 @@ self: {
        libraryHaskellDepends = [
          base mtl parsec template-haskell th-orphans time
        ];
-       homepage = "https://github.com/ddssff/show-please";
        description = "A wrapper type V with improved Show instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190592,7 +183607,6 @@ self: {
          ansi-wl-pprint base prettyprinter trifecta
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/quchen/show-prettyprint#readme";
        description = "Robust prettyprinter for output of auto-generated Show instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190604,7 +183618,6 @@ self: {
        version = "0.1.1";
        sha256 = "1sppi8vj1cg7gwz7vagc1cry22b814wlwbm6jjj1c4d5f4kmpyyv";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/Kinokkory/show-type";
        description = "convert types into string values in haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190636,7 +183649,6 @@ self: {
          base bytestring containers curl mtl regex-posix tagsoup
          tagsoup-parsec time url web-encodings
        ];
-       homepage = "http://github.com/ozataman/shpider";
        description = "Web automation library in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190651,7 +183663,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl ];
-       homepage = "http://personal.cis.strath.ac.uk/~conor/pub/shplit";
        description = "A Haskell pattern splitter with emacs attachments";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -190688,7 +183699,6 @@ self: {
          process uhc-util uuagc uuagc-cabal uulib
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/UU-ComputerScience/shuffle";
        description = "Shuffle tool for UHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190701,7 +183711,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "1imidmpjs1ps6j9hzizhknfgw6zwb8qb8zphfknjv9zgjmwn15x4";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/githubuser/shunya-library#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190713,7 +183722,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1yh6xcfhjwb02y731s0lh1y6q63cdfmbnvxv3djylkf1hwdkqhpa";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/penguinshunya/shunyalib";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190752,7 +183760,6 @@ self: {
          base Chart Chart-cairo containers data-default-class directory
          hmatrix JuicyPixels random random-shuffle split vector
        ];
-       homepage = "https://github.com/mdibaiee/sibe";
        description = "Machine Learning algorithms";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190765,7 +183772,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.the-singleton.com";
        description = "Sieve is an implementation of the Sieve abstract data type";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -190789,7 +183795,6 @@ self: {
        testHaskellDepends = [
          base Cabal cairo containers fgl HUnit parsec process
        ];
-       homepage = "http://pages.iu.edu/~gdweber/software/sifflet/";
        description = "Simple, visual, functional language for learning about recursion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190809,7 +183814,6 @@ self: {
          parsec process unix
        ];
        librarySystemDepends = [ gdk_x11 gtk_x11 ];
-       homepage = "http://mypage.iu.edu/~gdweber/software/sifflet/";
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190832,7 +183836,6 @@ self: {
        executableHaskellDepends = [
          base combinat optparse-applicative time
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Thom polynomials of second order Thom-Boardman singularities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190869,7 +183872,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base unix ];
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/pmlodawski/signal";
        description = "Multiplatform signal support for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -190911,7 +183913,6 @@ self: {
        sha256 = "0f9qm3f7y0hpxn6mddhhg51mm1r134qkvd2kr8r6192ka1ijbxnf";
        libraryHaskellDepends = [ base deepseq directory ];
        testHaskellDepends = [ base deepseq directory nanospec temporary ];
-       homepage = "https://github.com/hspec/silently";
        description = "Prevent or capture writing to stdout and other handles";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -190929,7 +183930,6 @@ self: {
          savage text
        ];
        testHaskellDepends = [ base quantification savage text ];
-       homepage = "https://github.com/chessai/silvi#readme";
        description = "A generator for different kinds of data";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190942,7 +183942,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0rmp715k7k41h7nnfg3ik28pf602jvh5wb23yzbpz0j8vkfysn8m";
        libraryHaskellDepends = [ base ghc-prim primitive vector ];
-       homepage = "http://github.com/mikeizbicki/simd";
        description = "simple interface to GHC's SIMD instructions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190961,7 +183960,6 @@ self: {
        executableHaskellDepends = [
          base containers haskell98 mersenne-random-pure64 mtl parsec random
        ];
-       homepage = "http://simgi.sourceforge.net/";
        description = "stochastic simulation engine";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190997,7 +183995,6 @@ self: {
          mtl simple-templates text transformers transformers-base
          unordered-containers vector wai wai-extra
        ];
-       homepage = "http://simple.cx";
        description = "A minimalist web framework for the WAI server interface";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -191012,7 +184009,6 @@ self: {
        libraryHaskellDepends = [
          base chan-split contravariant mtl transformers
        ];
-       homepage = "http://brandon.si/code/simple-actors-0-1-0-released/";
        description = "A library for more structured concurrent programming, based on the Actor Model";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191024,7 +184020,6 @@ self: {
        version = "0.2";
        sha256 = "1kqkaay3r03plxvvyan3hdgj2rfynygnisi6hrsjwqgj4nw6va17";
        libraryHaskellDepends = [ base containers deepseq ];
-       homepage = "http://github.com/nominolo/simple-atom";
        description = "Atom (or symbol) datatype for fast comparision and sorting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191061,7 +184056,6 @@ self: {
          QuickCheck template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 tuple uniplate
        ];
-       homepage = "https://github.com/jfischoff/simple-c-value";
        description = "A simple C value type";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191094,7 +184088,6 @@ self: {
          QuickCheck semigroups stm streaming-commons text transformers
          transformers-base vector void
        ];
-       homepage = "http://github.com/jwiegley/simple-conduit";
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191113,7 +184106,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/yunomu/simple-config";
        description = "Simple config file parser generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191146,7 +184138,6 @@ self: {
        libraryHaskellDepends = [
          base conduit-combinators http-client http-conduit mtl transformers
        ];
-       homepage = "https://github.com/TerrorJack/simple-download#readme";
        description = "A simple wrapper of http-conduit for file download";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191159,15 +184150,14 @@ self: {
      }:
      mkDerivation {
        pname = "simple-effects";
-       version = "0.10.0.1";
-       sha256 = "1fixv7gymd03bnn8aysyyr7jwp1j943xyd69659xcjmljknd1h5m";
+       version = "0.12.0.0";
+       sha256 = "1k7wslyiv0hqpq7b92xyxlv3a1431cbaraxiw1ircjrm3ay28bd0";
        libraryHaskellDepends = [
          array async base bytestring exceptions list-t monad-control
          MonadRandom mtl text transformers transformers-base
        ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base criterion mtl transformers ];
-       homepage = "https://gitlab.com/LukaHorvat/simple-effects";
        description = "A simple effect system that integrates with MTL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191183,7 +184173,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base parsec text transformers ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/gitfoxi/Language.Eval";
        description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191196,7 +184185,6 @@ self: {
        version = "0.1.3.4";
        sha256 = "14fh3z3vqkmfgvgxja431ivm3lk1ksgrxaqjzz25wdc493j640ka";
        libraryHaskellDepends = [ base bindings-dc1394 CV ];
-       homepage = "https://github.com/aleator/simple-firewire";
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191214,7 +184202,6 @@ self: {
          base blaze-html digestive-functors email-validate network-uri
          old-locale text time transformers
        ];
-       homepage = "https://github.com/singpolyma/simple-form-haskell";
        description = "Forms that configure themselves based on type";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191230,7 +184217,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base parallel random ];
        executableHaskellDepends = [ base deepseq parallel random ];
-       homepage = "http://eax.me/haskell-genetic-algorithm/";
        description = "Simple parallel genetic algorithm implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191252,7 +184238,6 @@ self: {
        executableHaskellDepends = [
          base deepseq MonadRandom parallel random transformers
        ];
-       homepage = "http://eax.me/haskell-genetic-algorithm/";
        description = "Simple parallel genetic algorithm implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191300,7 +184285,6 @@ self: {
          mmorph mtl SafeSemaphore text time transformers
        ];
        testHaskellDepends = [ base hspec microlens-platform text ];
-       homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191321,7 +184305,6 @@ self: {
          mmorph mtl SafeSemaphore text time transformers
        ];
        testHaskellDepends = [ base hspec microlens-platform text ];
-       homepage = "http://github.com/mvoidex/simple-log";
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191334,7 +184317,6 @@ self: {
        version = "0.2.0";
        sha256 = "1619jsxgz5afmwhjcixg54i7dhh8jl29cmziifjrg60mm4rf2c34";
        libraryHaskellDepends = [ base hsyslog simple-log text ];
-       homepage = "http://github.com/mvoidex/simple-log-syslog";
        description = "Syslog backend for simple-log";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191347,7 +184329,6 @@ self: {
        version = "0.0.4";
        sha256 = "0550in9vkgf78rxfkzcrna40mihmaqhlixysfz8n0rz0rhw0z9gk";
        libraryHaskellDepends = [ base fast-logger mtl text ];
-       homepage = "https://github.com/agrafix/simple-logger#readme";
        description = "A very simple but efficient logging framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -191370,7 +184351,6 @@ self: {
          aeson base bytestring exceptions hscolour iso8601-time lens mtl
          simple-effects string-conv text time vector
        ];
-       homepage = "https://gitlab.com/haskell-hr/logging";
        description = "Logging effect to plug into the simple-effects framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191383,7 +184363,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "0bhiqnk7nh2y4qk7zkbfygna7kcg0gwqy8a5m70dqxs3f34h3fwf";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/nbrk/simple-money";
        description = "Simple library to handle and interexchange money";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -191403,7 +184382,6 @@ self: {
        executableHaskellDepends = [
          base containers deepseq parallel random split
        ];
-       homepage = "http://eax.me/haskell-neural-networks/";
        description = "Simple parallel neural networks implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191426,7 +184404,6 @@ self: {
          base classy-prelude error-list hspec hspec-expectations MissingH
          mtl parsec system-filepath text text-render unordered-containers
        ];
-       homepage = "https://github.com/adnelson/simple-nix";
        description = "Simple parsing/pretty printing for Nix expressions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191439,7 +184416,6 @@ self: {
        version = "0.0.1";
        sha256 = "1njzw6zjarlpjrmbkxwivr9azj8v1298bsd1ai3ddlmylwyhn24r";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/gimbo/observer.hs";
        description = "The Observer pattern";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191474,7 +184450,6 @@ self: {
          base bytestring lifted-base monad-control monads-tf stm
          transformers-base
        ];
-       homepage = "https://github.com/YoshikuniJujo/simple-pipe/wiki";
        description = "simple pipeline library like conduit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191492,7 +184467,6 @@ self: {
          base bytestring directory filepath postgresql-orm postgresql-simple
          resource-pool simple transformers
        ];
-       homepage = "http://simple.cx";
        description = "Connector package for integrating postgresql-orm with the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191505,7 +184479,6 @@ self: {
        version = "0.3.3";
        sha256 = "0ayvrx5cm8n6db21jiyjmk5h93pw7cz1707hih09hlhk9jh5x0h7";
        libraryHaskellDepends = [ base ];
-       homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
        description = "Simple reflection of expressions containing variables";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191517,7 +184490,6 @@ self: {
        version = "0.1";
        sha256 = "187ghgn8nivvn5m8nsn0vrjh8mr6h7n6r1p1119gr4h3m2hpmrpl";
        libraryHaskellDepends = [ base bytestring QuickCheck ];
-       homepage = "http://github.com/jkff/haskell-rope";
        description = "Memory-efficient strings with concatenation and splitting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191568,7 +184540,6 @@ self: {
          base base64-bytestring blaze-builder byteable bytestring containers
          cookie cryptohash http-types simple transformers wai wai-extra
        ];
-       homepage = "http://simple.cx";
        description = "Cookie-based session management for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -191580,7 +184551,6 @@ self: {
        version = "0.1.3";
        sha256 = "08abag1im9gp2jpndd12sv911ca2qwh6frrz6qr87mj11xfhbky5";
        libraryHaskellDepends = [ base indexed synchronous-channels ];
-       homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A simple implementation of session types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191610,7 +184580,6 @@ self: {
        testHaskellDepends = [
          base HUnit mtl parsec pretty test-framework test-framework-hunit
        ];
-       homepage = "http://jakewheat.github.io/simple-sql-parser/latest";
        description = "A parser for SQL queries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191627,7 +184596,6 @@ self: {
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base extra text ];
        testHaskellDepends = [ base extra tasty tasty-hunit text ];
-       homepage = "https://github.com/elaforge/simple-src-utils";
        description = "source code editing utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191656,7 +184624,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0p7rd8y6rhwg0ap6cib7l32bglvfkvbzg938pdwpb2ss6cv8b9zs";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/BartMassey/simple-tabular";
        description = "Simple tabular-text formatter";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191692,7 +184659,6 @@ self: {
        testHaskellDepends = [
          aeson attoparsec base hspec HUnit scientific vector
        ];
-       homepage = "http://simple.cx";
        description = "A basic template language for the Simple web framework";
        license = stdenv.lib.licenses.lgpl3;
      }) {};
@@ -191709,7 +184675,6 @@ self: {
        testHaskellDepends = [
          base hspec microlens-platform text unordered-containers
        ];
-       homepage = "https://github.com/JustusAdam/simple-text-format#readme";
        description = "Simple text based format strings with named identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191744,7 +184709,6 @@ self: {
          base doctest doctest-driver-gen tasty tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion vector ];
-       homepage = "https://github.com/dzhus/simple-vec3#readme";
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191758,7 +184722,6 @@ self: {
        sha256 = "1ai59qp617y4gvij602ykzc245w49mby2jag3r0rzr868v1vzzsy";
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base hspec lens ];
-       homepage = "https://github.com/DanielWaterworth/simple-zipper";
        description = "Zippers made slightly easier";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191772,7 +184735,6 @@ self: {
        sha256 = "1grjjpb3397wnr6sd0bn679k9pfg1zlm61350zd2gj5yq6pshl6p";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://malde.org/~ketil/simpleargs";
        description = "Provides a more flexible getArgs function with better error reporting";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191790,7 +184752,6 @@ self: {
        testHaskellDepends = [
          base containers either generic-deriving hspec lens text
        ];
-       homepage = "https://github.com/koterpillar/simpleconfig#readme";
        description = "Short description of your package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191807,7 +184768,6 @@ self: {
          base bytestring connection containers network old-locale time
        ];
        testHaskellDepends = [ base bytestring hspec HUnit knob ];
-       homepage = "http://github.com/dom96/SimpleIRC";
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191820,7 +184780,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1cmzln3lya1scz10c6p33aqwy7djivc1dm9qkpkbwp2c8adq02bw";
        libraryHaskellDepends = [ base bytestring simpleirc ];
-       homepage = "https://github.com/relrod/simpleirc-lens";
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191833,7 +184792,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1cq8h96kr1qnxqma7if3pmxcw05nrirpnw703r4cba75xwgwlqcl";
        libraryHaskellDepends = [ base linear ];
-       homepage = "https://github.com/jonascarpay/simplemesh#readme";
        description = "Generators for primitive meshes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -191895,7 +184853,6 @@ self: {
        sha256 = "1w67k70740dyrrp1k2xz5vbj6qm2smrq9g867z81dphwscqaknm3";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ libssh2 ];
-       homepage = "https://github.com/thoferon/simplessh";
        description = "Simple wrapper around libssh2";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libssh2;};
@@ -191912,7 +184869,6 @@ self: {
          base bytestring exception-hierarchy template-haskell text
        ];
        librarySystemDepends = [ sqlite ];
-       homepage = "comming soon";
        description = "Simplest SQLite3 binding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191931,7 +184887,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath mtl process random regex-compat split time
        ];
-       homepage = "http://github.com/scravy/simplex";
        description = "A simple markup language that translates to LaTeX";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -191967,7 +184922,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base bio bytestring random ];
-       homepage = "http://malde.org/~ketil/";
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191991,7 +184945,6 @@ self: {
        version = "0.0.0";
        sha256 = "1zy1vwna8a0421l3jvdm8mg36xwgj4xl3p2xkf678ahbzk0179vs";
        libraryHaskellDepends = [ base time ];
-       homepage = "https://github.com/athanclark/since#readme";
        description = "Get the number of seconds since the last invocation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192019,7 +184972,6 @@ self: {
          x11-xim X11-xshape
        ];
        executablePkgconfigDepends = [ libXft ];
-       homepage = "http://sigkill.dk/programs/sindre";
        description = "A programming language for simple GUIs";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXft;};
@@ -192031,7 +184983,6 @@ self: {
        version = "0.1.4";
        sha256 = "0apvzb6ym0fnm4rx7paz6ivv72ahzn2bxhvyd1drw50ypvicd581";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/phadej/singleton-bool#readme";
        description = "Type level booleans";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192043,7 +184994,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "125mb6j4gf3qcgmvjf6zibnzl7sw8jcmrh60nig16ahk55cjczic";
        libraryHaskellDepends = [ base singletons ];
-       homepage = "https://github.com/amiddelk/singleton-dict#readme";
        description = "Typelevel balanced search trees via a singletonized Data.Map";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192056,7 +185006,6 @@ self: {
        version = "0.4.1";
        sha256 = "1fb87qgh35z31rwzrpclf7d071krffr5vvqr1nwvpgikggfjhlss";
        libraryHaskellDepends = [ base singletons ];
-       homepage = "https://github.com/AndrasKovacs/singleton-nats";
        description = "Unary natural numbers relying on the singletons infrastructure";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192068,7 +185017,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "00f2nvs4avl3kxijcl7wb17ip1mcnb4fzqq5ckcz0a247qvv4yig";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mniip/singleton-typelits";
        description = "Singletons and induction over GHC TypeLits";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192088,7 +185036,6 @@ self: {
        testHaskellDepends = [
          base Cabal directory filepath process tasty tasty-golden
        ];
-       homepage = "http://www.github.com/goldfirere/singletons";
        description = "A framework for generating singleton types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192109,7 +185056,6 @@ self: {
        testHaskellDepends = [
          base directory filepath process tasty tasty-golden
        ];
-       homepage = "http://www.github.com/goldfirere/singletons";
        description = "A framework for generating singleton types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192122,7 +185068,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "16f0grf63wgkaab64mmqhxwwk50pzzy354i3v23lzw7s5x0bk8sj";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/zaoqi/Signal.hs";
        description = "Singnal";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192156,7 +185101,6 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/vincenthz/hs-siphash";
        description = "siphash: a fast short input PRF";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192180,7 +185124,6 @@ self: {
          profunctors QuickCheck streaming test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Encode and decode CSV files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192207,7 +185150,6 @@ self: {
          unordered-containers
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/alunduil/siren-json.hs";
        description = "Siren Tools for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192237,7 +185179,6 @@ self: {
        version = "0.1.2";
        sha256 = "0njb20w6kazsqgw61ykvfx3syqywv9frs7ch9bf2sr0i1d3b61bd";
        libraryHaskellDepends = [ base lens taggy taggy-lens text ];
-       homepage = "http://github.com/alpmestan/sitemap";
        description = "Sitemap parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192258,7 +185199,6 @@ self: {
          optparse-applicative pandoc parsec shelly text unordered-containers
          yaml
        ];
-       homepage = "https://github.com/ChrisPenner/sitepipe#readme";
        description = "A simple to understand static site generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192276,12 +185216,23 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath parsec QuickCheck template-haskell
        ];
-       homepage = "https://github.com/data61/sixfiguregroup";
        description = "A six figure group of time";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "sixty-five-oh-two" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens, mtl }:
+     mkDerivation {
+       pname = "sixty-five-oh-two";
+       version = "1.1.0.0";
+       sha256 = "1jw86xxim016gqws34diabdlrlilypg22s6670n7x887sjc1bkz6";
+       libraryHaskellDepends = [ base bytestring containers lens mtl ];
+       testHaskellDepends = [ base bytestring containers lens mtl ];
+       description = "An eDSL for writing 65(C)02 bytecode";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "size-based" = callPackage
     ({ mkDerivation, base, dictionary-sharing, template-haskell
      , testing-type-modifiers
@@ -192335,7 +185286,6 @@ self: {
          generics-sop hedgehog HUnit lens markdown-unlit tasty
          tasty-hedgehog tasty-hunit vector-space
        ];
-       homepage = "https://github.com/edwardwas/sized-grid";
        description = "Multidimensional grids with sized specified at compile time";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -192354,7 +185304,6 @@ self: {
        libraryHaskellDepends = [
          array base base-compat containers singletons
        ];
-       homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools";
        description = "Sized types in Haskell using the GHC Nat kind";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192372,7 +185321,6 @@ self: {
          base constraints deepseq equational-reasoning hashable monomorphic
          singletons template-haskell type-natural
        ];
-       homepage = "https://github.com/konn/sized-vector";
        description = "Size-parameterized vector types and functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192393,7 +185341,6 @@ self: {
          base bytestring cmdargs deepseq dlist lens parallel-io regex-posix
          system-fileio system-filepath text unix
        ];
-       homepage = "https://github.com/jwiegley/sizes";
        description = "Recursively show space (size and i-nodes) used in subdirectories";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192434,7 +185381,6 @@ self: {
        testHaskellDepends = [
          base bytestring cereal crypto-api filepath hspec tagged
        ];
-       homepage = "https://github.com/meteficha/skein";
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192489,7 +185435,6 @@ self: {
          ansi-wl-pprint base containers directory filepath text tinytemplate
          transformers transformers-compat
        ];
-       homepage = "https://github.com/jb55/skeletons";
        description = "Manage project skeletons";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
@@ -192506,7 +185451,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html bytestring containers http-types text wai
        ];
-       homepage = "https://github.com/pharpend/skell";
        description = "An overly complex Haskell web framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192526,7 +185470,6 @@ self: {
          base bytestring data-default http-client http-types lens text time
          wreq xml-conduit
        ];
-       homepage = "https://github.com/nyorem/skemmtun";
        description = "A MyAnimeList.net client.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192541,7 +185484,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/gmalecha/skip-list#readme";
        description = "An implementation of pure skip lists";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -192554,7 +185496,6 @@ self: {
        sha256 = "1afqqj89i2jg3ix1zw50r35vjrk8dfjv7am39zcir2cqx4r3srar";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "http://github.com/geekyfox/skulk";
        description = "Eclectic collection of utility functions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192578,7 +185519,6 @@ self: {
        executableHaskellDepends = [
          base conduit-extra optparse-generic preamble shakers
        ];
-       homepage = "https://github.com/githubuser/skylark-client#readme";
        description = "Skylark client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192611,7 +185551,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion directory filepath text
        ];
-       homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -192635,7 +185574,6 @@ self: {
          filepath hxt mtl regex-pcre-builtin safe skylighting-core text
          utf8-string
        ];
-       homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192669,7 +185607,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion directory filepath text
        ];
-       homepage = "https://github.com/jgm/skylighting";
        description = "syntax highlighting library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192687,7 +185624,6 @@ self: {
          attoparsec base bytestring lifted-base monad-control mtl stm text
          time transformers-base word8 X11
        ];
-       homepage = "https://github.com/emonkak/haskell-skype";
        description = "Skype Desktop API binding for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192708,7 +185644,6 @@ self: {
          attoparsec base bytestring containers directory filepath ghc-binary
          haskell98 IfElse old-locale regex-pcre time utf8-string
        ];
-       homepage = "https://github.com/jdevelop/skypelogexport/wiki";
        description = "Export Skype chat logs to text files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192770,7 +185705,6 @@ self: {
          text
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/tattsun/slack-notify-haskell";
        description = "Slack notifier for Haskell project";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -192794,7 +185728,6 @@ self: {
          aeson base containers errors hspec http-api-data megaparsec text
          time
        ];
-       homepage = "https://github.com/jpvillaisaza/slack-web";
        description = "Bindings for the Slack web API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192823,7 +185756,6 @@ self: {
          base directory filepath htoml optparse-applicative process
          string-conversions unordered-containers
        ];
-       homepage = "https://github.com/evuez/slate#readme";
        description = "A note taking CLI tool";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -192844,7 +185776,6 @@ self: {
        testHaskellDepends = [
          base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore
        ];
-       homepage = "https://github.com/nikita-volkov/slave-thread";
        description = "A principal solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192878,7 +185809,6 @@ self: {
          base bytestring cmdargs containers directory filepath
          language-slice MissingH
        ];
-       homepage = "https://github.com/paulkoerbitz/slice-cpp-gen";
        description = "Generate C++ skeletons from slice files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192934,7 +185864,6 @@ self: {
          conduit-extra containers directory filepath http-conduit http-types
          optparse-applicative resourcet stringsearch text transformers
        ];
-       homepage = "http://akc.is/sloane";
        description = "A command line interface to Sloane's OEIS";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -192954,7 +185883,6 @@ self: {
        executableHaskellDepends = [
          base Chart Chart-cairo colour data-default-class lens
        ];
-       homepage = "https://github.com/mdibaiee/slope-field";
        description = "Visualize mathematical function's slope fields";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -192971,7 +185899,6 @@ self: {
          base containers haskell-src-exts haskell-src-meta syb
          template-haskell vector
        ];
-       homepage = "https://github.com/ducis/pa_slot";
        description = "Write lambdas without naming the parameters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193006,7 +185933,6 @@ self: {
        testHaskellDepends = [
          base exceptions hspec http-api-data path-pieces QuickCheck text
        ];
-       homepage = "https://github.com/mrkkrp/slug";
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193018,7 +185944,6 @@ self: {
        version = "0.2.2.4";
        sha256 = "16fgxsg8grxhqx6d4s3mm89qbkw2k72qvr4r701ih1i8gmf1ms1z";
        libraryHaskellDepends = [ base bytestring deepseq hashable ];
-       homepage = "http://community.haskell.org/~aslatter/code/bytearray";
        description = "low-level unboxed arrays, with minimal features";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193053,7 +185978,6 @@ self: {
        version = "1.1.4";
        sha256 = "0x2p9rfsx0hvcmsq7v1m5qdgs9mvf4zrcpz4wywn4q8mr8hb416y";
        libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
-       homepage = "https://github.com/feuerbach/smallcheck";
        description = "A property-based testing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193065,7 +185989,6 @@ self: {
        version = "0.3";
        sha256 = "1jyn1bsn78jsnf5lzscvqzbf68ljf82vclq0k9aba58r2dayxn47";
        libraryHaskellDepends = [ base smallcheck smallcheck-series ];
-       homepage = "http://github.com/jdnavarro/smallcheck-laws";
        description = "SmallCheck properties for common laws";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193082,7 +186005,6 @@ self: {
        libraryHaskellDepends = [
          base lens smallcheck smallcheck-series transformers
        ];
-       homepage = "https://github.com/jdnavarro/smallcheck-lens";
        description = "SmallCheck properties for lens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193100,7 +186022,6 @@ self: {
          base bytestring containers logict smallcheck text transformers
        ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/jdnavarro/smallcheck-series";
        description = "Extra SmallCheck series and utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193115,7 +186036,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base vector ];
-       homepage = "http://github.com/noteed/smallpt-hs";
        description = "A Haskell port of the smallpt path tracer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193132,7 +186052,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring deepseq hashable smallarray text utf8-string
        ];
-       homepage = "http://community.haskell.org/~aslatter/code/smallstring/";
        description = "A Unicode text type, optimized for low memory overhead";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193149,7 +186068,6 @@ self: {
        editedCabalFile = "0dhrz33n5yrc51kzvrikv13ldv8v8z2wab57fqrdk080vjqwni0n";
        libraryHaskellDepends = [ base bytestring random text uuid ];
        testHaskellDepends = [ base bytestring QuickCheck ];
-       homepage = "http://rel4tion.org/projects/smaoin-hs/";
        description = "Utilities for the Smaoin semantic information model";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -193163,7 +186081,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers template-haskell
        ];
-       homepage = "http://patch-tag.com/r/salazar/smartGroup";
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193185,7 +186102,6 @@ self: {
        executableHaskellDepends = [
          base containers generic-deriving ghc-prim mtl QuickCheck random
        ];
-       homepage = "https://github.com/leepike/SmartCheck";
        description = "A smarter QuickCheck";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193198,7 +186114,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1082siphwd4xx9akqip78kzpqi19i3l53h0s2vghhdm5lwplcvlv";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/frerich/smartconstructor";
        description = "A package exposing a helper function for generating smart constructors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193216,7 +186131,6 @@ self: {
        executableHaskellDepends = [
          base haskell98 pretty unix utf8-string
        ];
-       homepage = "http://kyagrd.dyndns.org/~kyagrd/project/smartword/";
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193245,7 +186159,6 @@ self: {
        executableToolDepends = [ alex happy ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
        benchmarkHaskellDepends = [ base containers criterion time ];
-       homepage = "https://github.com/jrclogic/SMCDEL";
        description = "Symbolic Model Checking for Dynamic Epistemic Logic";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193278,7 +186191,6 @@ self: {
          base doctest exceptions free Glob hspec mtl process QuickCheck text
          transformers yaml
        ];
-       homepage = "http://github.com/jkarni/smerdyakov#README.md";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -193291,7 +186203,6 @@ self: {
        sha256 = "0k1yy1bhgavsmm40zz1i6ihyfksb6fr06wxlbqyj1y0igmrrrlrw";
        libraryHaskellDepends = [ base megaparsec text ];
        testHaskellDepends = [ base hspec megaparsec QuickCheck text ];
-       homepage = "https://github.com/zmactep/smiles#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -193304,7 +186215,6 @@ self: {
        sha256 = "0fy0rygg2r73zfcgxmamlz1xfbpfxbljxcwjx9rnp0c8v9aq2m2s";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ aeson base linear text vector ];
-       homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193321,7 +186231,6 @@ self: {
          aeson base containers http-api-data http-client servant
          servant-client servant-docs text time
        ];
-       homepage = "https://github.com/GetShopTV/smsaero";
        description = "SMSAero API and HTTP client based on servant library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193334,7 +186243,6 @@ self: {
        version = "0.0.2";
        sha256 = "1phm50pabahrpxrzp25mfhpafzhp4hz8cxp6fp93rwh4cl7cckky";
        libraryHaskellDepends = [ array base directory polyparse ];
-       homepage = "http://tomahawkins.org";
        description = "Parsing and printing SMT-LIB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193445,7 +186353,6 @@ self: {
          array base base16-bytestring base64-bytestring bytestring
          cryptohash filepath mime-mail network text
        ];
-       homepage = "http://github.com/jhickner/smtp-mail";
        description = "Simple email sending via SMTP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193466,7 +186373,6 @@ self: {
          stringsearch text tls transformers transformers-compat x509-store
          x509-system
        ];
-       homepage = "https://github.com/avieth/smtp-mail-ng";
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193481,7 +186387,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 network process ];
-       homepage = "https://github.com/singpolyma/sock2stream";
        description = "Listen for SMTP traffic and send it to an MTA script";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193501,7 +186406,6 @@ self: {
          data-default filepath mime-mail network resourcet stringsearch text
          tls transformers
        ];
-       homepage = "https://github.com/enzoh/smtps-gmail";
        description = "Gmail SMTP Client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193516,7 +186420,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base random split terminal-size ];
-       homepage = "http://code.alaminium.me/habibalamin/snake";
        description = "A basic console snake game";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193567,7 +186470,42 @@ self: {
          test-framework-smallcheck text time transformers transformers-base
          unordered-containers xmlhtml
        ];
-       homepage = "http://snapframework.com/";
+       description = "Top-level package for the Snap Web Framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "snap_1_1_1_0" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal
+     , clientsession, configurator, containers, deepseq, directory
+     , directory-tree, dlist, filepath, hashable, heist, http-streams
+     , HUnit, lens, lifted-base, map-syntax, monad-control, mtl
+     , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core
+     , snap-server, stm, syb, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-smallcheck, text, time
+     , transformers, transformers-base, unordered-containers, xmlhtml
+     }:
+     mkDerivation {
+       pname = "snap";
+       version = "1.1.1.0";
+       sha256 = "08kgvry18kfkspif2xn8j7w9jfinhrnl33g6ap74fz7rsrg68jz7";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring cereal clientsession configurator
+         containers directory directory-tree dlist filepath hashable heist
+         lens lifted-base map-syntax monad-control mtl mwc-random
+         pwstore-fast snap-core snap-server stm text time transformers
+         transformers-base unordered-containers xmlhtml
+       ];
+       testHaskellDepends = [
+         aeson async attoparsec base bytestring cereal clientsession
+         configurator containers deepseq directory directory-tree dlist
+         filepath hashable heist http-streams HUnit lens lifted-base
+         map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck
+         smallcheck snap-core snap-server stm syb test-framework
+         test-framework-hunit test-framework-quickcheck2
+         test-framework-smallcheck text time transformers transformers-base
+         unordered-containers xmlhtml
+       ];
        description = "Top-level package for the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193584,7 +186522,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring case-insensitive http-media snap-core
        ];
-       homepage = "https://github.com/zmthy/snap-accept";
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -193616,7 +186553,6 @@ self: {
          snaplet-sqlite-simple sqlite-simple text unordered-containers
          utf8-string
        ];
-       homepage = "https://github.com/dzhus/snap-auth-cli#readme";
        description = "Command-line tool to manage Snap AuthManager database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193629,7 +186565,6 @@ self: {
        version = "0.2.1.5";
        sha256 = "0hc8k0cviq7ayjymsfr435bnfw35pa4f80i7x4ypn2539fykavmk";
        libraryHaskellDepends = [ base blaze-html snap-core ];
-       homepage = "http://github.com/jaspervdj/snap-blaze";
        description = "blaze-html integration for Snap";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193641,7 +186576,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "05zi9rjd37xznjj8yhm5har12mfrclsrwd9fbcwh5ngccd7h7fiy";
        libraryHaskellDepends = [ base blaze-html clay snap-core ];
-       homepage = "http://github.com/deckool/snap-blaze-clay";
        description = "blaze-html-clay integration for Snap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193693,7 +186627,6 @@ self: {
          transformers transformers-base unix-compat unordered-containers
          vector zlib
        ];
-       homepage = "http://snapframework.com/";
        description = "Snap: A Haskell Web Framework (core interfaces and types)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193706,7 +186639,6 @@ self: {
        sha256 = "182l2wfkjanxa5n2g5ypsvdgvigfnk5f4n0am37c26lgk3n6zi9a";
        libraryHaskellDepends = [ snap-core ];
        doHaddock = false;
-       homepage = "https://github.com/ocharles/snap-cors";
        description = "Add CORS headers to Snap applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193739,7 +186671,6 @@ self: {
          async base containers lifted-base monad-loops snap stm time
          transformers
        ];
-       homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193788,7 +186719,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring containers snap-core
        ];
-       homepage = "https://github.com/jonpetterbergman/snap-accept-language";
        description = "Language handling for Snap";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193807,7 +186737,6 @@ self: {
          base directory directory-tree hint mtl snap-core template-haskell
          time unix
        ];
-       homepage = "http://snapframework.com/";
        description = "Snap dynamic loader";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193822,7 +186751,6 @@ self: {
        revision = "1";
        editedCabalFile = "0ghxjdh5hv2nb3m1rax3rlgszxrfv4x1dxb5n4f1h6xaya9ya0hh";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://snapframework.com/";
        description = "Snap static loader";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193909,7 +186837,6 @@ self: {
          attoparsec base blaze-builder bytestring bytestring-builder
          criterion io-streams io-streams-haproxy snap-core vector
        ];
-       homepage = "http://snapframework.com/";
        description = "A web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193952,7 +186879,6 @@ self: {
          attoparsec base blaze-builder bytestring bytestring-builder
          criterion io-streams io-streams-haproxy snap-core vector
        ];
-       homepage = "http://snapframework.com/";
        description = "A web server for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -193973,7 +186899,6 @@ self: {
          base bytestring containers directory directory-tree filepath
          hashable old-time template-haskell text
        ];
-       homepage = "http://snapframework.com/";
        description = "Scaffolding CLI for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -193997,7 +186922,6 @@ self: {
          hxt io-streams lens mtl process QuickCheck snap snap-core text
          transformers
        ];
-       homepage = "https://github.com/dbp/snap-testing";
        description = "A library for BDD-style testing with the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194016,7 +186940,6 @@ self: {
          base bytestring heist http-types MonadCatchIO-transformers mtl snap
          snap-core text xmlhtml
        ];
-       homepage = "https://github.com/LukeHoersten/snap-utils";
        description = "Snap Framework utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194033,7 +186956,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring heist mtl snap snap-core text web-routes xmlhtml
        ];
-       homepage = "https://github.com/lukerandall/snap-web-routes";
        description = "Type safe URLs for Snap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194048,7 +186970,6 @@ self: {
        libraryHaskellDepends = [
          acid-state base mtl snap text transformers
        ];
-       homepage = "https://github.com/mightybyte/snaplet-acid-state";
        description = "acid-state snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194074,7 +186995,6 @@ self: {
          restful-snap snap snap-extras snaplet-persistent text time
          transformers unordered-containers xmlhtml
        ];
-       homepage = "https://github.com/soostone/snaplet-actionlog";
        description = "Generic action log snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194093,7 +187013,6 @@ self: {
          amqp base bytestring configurator lens monad-control mtl network
          resource-pool snap transformers
        ];
-       homepage = "https://github.com/ixmatus/snaplet-amqp";
        description = "Snap framework snaplet for the AMQP library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194133,7 +187052,6 @@ self: {
          base bytestring configurator directory filepath haskell-coffee mtl
          snap snap-core
        ];
-       homepage = "https://github.com/AtticHacker/snaplet-coffee";
        description = "CoffeeScript for Snap, auto-compilation and pre-compilation";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194151,7 +187069,6 @@ self: {
          base bytestring css-text directory filepath lens snap text
          utf8-string
        ];
-       homepage = "https://github.com/zmthy/snaplet-css-min";
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194211,7 +187128,6 @@ self: {
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
        ];
-       homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194247,7 +187163,6 @@ self: {
          aeson base bytestring clientsession configurator hasql
          hasql-backend lens mtl snap text time
        ];
-       homepage = "https://github.com/mikeplus64/snaplet-hasql";
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194264,7 +187179,6 @@ self: {
        libraryHaskellDepends = [
          base haxl MonadCatchIO-transformers snap transformers
        ];
-       homepage = "https://github.com/ChristopherBiscardi/snaplet-haxl";
        description = "Snaplet for Facebook's Haxl";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194286,7 +187200,6 @@ self: {
          resource-pool-catchio snap text time transformers
          unordered-containers
        ];
-       homepage = "http://norm2782.com/";
        description = "HDBC snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194304,7 +187217,6 @@ self: {
        libraryHaskellDepends = [
          base configurator hslogger mtl snap transformers
        ];
-       homepage = "https://github.com/ixmatus/snaplet-logger";
        description = "Snap framework snaplet for the Logger API library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194329,7 +187241,6 @@ self: {
          base bytestring configurator filepath heist lens map-syntax snap
          snap-loader-static text transformers xmlhtml
        ];
-       homepage = "https://github.com/HaskellCNOrg/snaplet-i18n";
        description = "snaplet-i18n";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194349,7 +187260,6 @@ self: {
          base bytestring configurator http-client influxdb lens
          monad-control mtl network snap text transformers
        ];
-       homepage = "https://github.com/ixmatus/snaplet-influxdb";
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194367,7 +187277,6 @@ self: {
          base directory filepath heist lss snap text xmlhtml
        ];
        testHaskellDepends = [ base hspec-snap hspec2 lens snap text ];
-       homepage = "https://github.com/dbp/lss";
        description = "Lexical Style Sheets - Snap Web Framework adaptor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -194384,7 +187293,6 @@ self: {
        libraryHaskellDepends = [
          base configurator mandrill mtl network snap transformers
        ];
-       homepage = "https://github.com/ixmatus/snaplet-mandrill";
        description = "Snap framework snaplet for the Mandrill API library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194420,7 +187328,6 @@ self: {
        libraryHaskellDepends = [
          base lens mongoDB mtl snap text transformers
        ];
-       homepage = "https://github.com/Palmik/snaplet-mongodb-minimalistic";
        description = "Minimalistic MongoDB Snaplet";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194442,7 +187349,6 @@ self: {
          MonadCatchIO-transformers mtl mysql mysql-simple
          resource-pool-catchio snap text transformers unordered-containers
        ];
-       homepage = "https://github.com/ibotty/snaplet-mysql-simple";
        description = "mysql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194469,7 +187375,6 @@ self: {
          aeson base bytestring bytestring-show HUnit test-framework
          test-framework-hunit text
        ];
-       homepage = "https://github.com/HaskellCNOrg/snaplet-oauth";
        description = "snaplet-oauth";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194493,7 +187398,6 @@ self: {
          persistent-template readable resource-pool resourcet safe snap text
          time transformers unordered-containers
        ];
-       homepage = "https://github.com/soostone/snaplet-persistent";
        description = "persistent snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194507,15 +187411,16 @@ self: {
      }:
      mkDerivation {
        pname = "snaplet-postgresql-simple";
-       version = "1.0.2.0";
-       sha256 = "1agykln1mr08bh5yp8xf5nhjirbvwc9kgl4k3rkl700hfjhdpbb7";
+       version = "1.1.0.0";
+       sha256 = "0k82g3540jx7bddg0x6764c8xr955y8v5rc69kagi01nvhh7n2z5";
+       isLibrary = true;
+       isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring clientsession configurator lens lifted-base
          monad-control mtl postgresql-simple resource-pool snap text
          transformers transformers-base unordered-containers
        ];
-       homepage = "https://github.com/mightybyte/snaplet-postgresql-simple";
        description = "postgresql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194533,7 +187438,6 @@ self: {
        libraryHaskellDepends = [
          base configurator mtl postmark snap text transformers
        ];
-       homepage = "https://github.com/LukeHoersten/snaplet-postmark";
        description = "Postmark snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194569,7 +187473,6 @@ self: {
          aeson base blaze-builder bytestring configurator heist http-conduit
          lens MonadCatchIO-transformers mtl snap text transformers
        ];
-       homepage = "http://github.com/mikeplus64/snaplet-recaptcha";
        description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194590,7 +187493,6 @@ self: {
          base bytestring cereal clientsession configurator hedis lens mtl
          network snap snap-core text time transformers unordered-containers
        ];
-       homepage = "https://github.com/dzhus/snaplet-redis#readme";
        description = "Redis support for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194611,7 +187513,6 @@ self: {
          data-lens-template easy-file hedis mtl snap snap-core snaplet-redis
          text utf8-string websockets websockets-snap
        ];
-       homepage = "https://github.com/dzhus/snaplet-redson/";
        description = "CRUD for JSON data with Redis storage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194630,7 +187531,6 @@ self: {
          aeson base blaze-builder bytestring case-insensitive http-media
          lens mtl snap snap-accept snap-core text utf8-string xmlhtml
        ];
-       homepage = "http://github.com/zimothy/snaplet-rest";
        description = "REST resources for the Snap web framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194649,7 +187549,6 @@ self: {
          aeson base containers data-lens data-lens-template mtl riak
          riak-protobuf snap snap-core time transformers
        ];
-       homepage = "http://github.com/tmcgilchrist/snaplet-riak";
        description = "A Snaplet for the Riak database";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194668,7 +187567,6 @@ self: {
          base bytestring configurator directory filepath mtl process snap
          snap-core transformers
        ];
-       homepage = "https://github.com/lukerandall/snaplet-sass";
        description = "Sass integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194686,7 +187584,6 @@ self: {
          async base classy-prelude configurator data-default lens mtl snap
          time unordered-containers
        ];
-       homepage = "https://github.com/JustusAdam/snaplet-scoped-session#readme";
        description = "Modularised session state for Snaplets, in a Snaplet";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194752,7 +187649,6 @@ self: {
          snap-core sqlite-simple stm test-framework test-framework-hunit
          text time transformers unordered-containers
        ];
-       homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194773,7 +187669,6 @@ self: {
          directory either errors jwt lens mtl snap snap-core
          snaplet-sqlite-simple sqlite-simple text time unordered-containers
        ];
-       homepage = "https://github.com/nurpax/snaplet-sqlite-simple-jwt-auth#readme";
        description = "Snaplet for JWT authentication with snaplet-sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194793,7 +187688,6 @@ self: {
          base bytestring configurator heist lens-family-core mtl snap stripe
          text text-format transformers xmlhtml
        ];
-       homepage = "https://github.com/LukeHoersten/snaplet-stripe";
        description = "Stripe snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194856,7 +187750,6 @@ self: {
          hspec hspec-core hspec-snap lens mtl snap snaplet-redis text
          unordered-containers xmlhtml
        ];
-       homepage = "https://github.com/dbp/snaplet-wordpress";
        description = "A snaplet that communicates with wordpress over its api";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194876,7 +187769,6 @@ self: {
          base bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) snappy;};
@@ -194888,7 +187780,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0k93v3dyv7818xy45l7i5wykfmnwyqkykxjh6xr937zh8a4qapfi";
        libraryHaskellDepends = [ base bytestring conduit snappy ];
-       homepage = "http://github.com/tatac1/snappy-conduit/";
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194901,7 +187792,6 @@ self: {
        version = "0.1.1";
        sha256 = "1rabqb43cyc5n629vrhqhd5h600amvh5462ywivwdlp8lb7rj6zh";
        libraryHaskellDepends = [ array base binary bytestring snappy ];
-       homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194914,7 +187804,6 @@ self: {
        version = "0.1";
        sha256 = "17jwsvw7ik2bjanmzw4h72mdjaz031b5a6hi7cjz4ba1yjkiqnmk";
        libraryHaskellDepends = [ base bytestring iteratee snappy ];
-       homepage = "http://github.com/iand675/snappy-iteratee";
        description = "An enumeratee that uses Google's snappy compression library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194934,7 +187823,6 @@ self: {
          listlike-instances MonadCatchIO-transformers transformers vector
          word24
        ];
-       homepage = "http://www.tiresiaspress.us/haskell/sndfile-enumerators";
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194951,7 +187839,6 @@ self: {
        libraryHaskellDepends = [
          base classy-prelude containers lens linear mtl ncurses transformers
        ];
-       homepage = "https://github.com/pmiddend/sneakyterm";
        description = "Tiny, declarative wrapper around ncurses";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194964,7 +187851,6 @@ self: {
        version = "2";
        sha256 = "0yyway7rhx1x2p6mxfrs6xw22ylc780hsppbq2xkd4rpd1cdw54n";
        libraryHaskellDepends = [ base haste-compiler ];
-       homepage = "http://sneathlane.com";
        description = "A compositional web UI library, which draws to a Canvas element";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -194977,7 +187863,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "15n6dwkkbr7yh1xvl0xj1kba5s3qy4s8zq01px552fm1qqa8wdzk";
        libraryHaskellDepends = [ base containers pandoc process ];
-       homepage = "https://github.com/nmattia/snipcheck#readme";
        description = "Markdown tester";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195013,7 +187898,6 @@ self: {
        executableHaskellDepends = [
          base containers directory filepath HsSyck parsec safe spoonutil
        ];
-       homepage = "http://github.com/elginer/snm";
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195070,7 +187954,6 @@ self: {
        sha256 = "007hzr8dpj0mhvmnpdg0gi296q3mlicnx36s6hmgifzmyaa8kssi";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base binary bytestring mps ];
-       homepage = "http://github.com/nfjinjing/snow-white";
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195094,7 +187977,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion language-haskell-extract text
        ];
-       homepage = "http://hub.darcs.net/dag/snowball";
        description = "Bindings to the Snowball library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195120,7 +188002,6 @@ self: {
        sha256 = "0m49xyi3l2y540kgsb8p0i2x1w9k1wpf051w5i14rs5yhvx2f924";
        libraryHaskellDepends = [ base time-exts ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/jiakai0419/snowflake#readme";
        description = "twitter's snowflake";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195158,7 +188039,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers gl-capture GLUT OpenGL OpenGLRaw random
        ];
-       homepage = "https://code.mathr.co.uk/snowglobe";
        description = "randomized fractal snowflakes demo";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -195175,7 +188055,6 @@ self: {
        executableHaskellDepends = [
          base either safe safe-exceptions text turtle
        ];
-       homepage = "https://github.com/aiya000/hs-snowtify#README.md";
        description = "snowtify send your result of `stack build` (`stack test`) to notify-daemon :dog2:";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195200,7 +188079,6 @@ self: {
          base bytestring hspec HUnit text unordered-containers xml-conduit
          xml-conduit-writer
        ];
-       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "SOAP client tools";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -195219,7 +188097,6 @@ self: {
          base configurator data-default HsOpenSSL http-client
          http-client-openssl soap text
        ];
-       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using openssl bindings)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -195237,7 +188114,6 @@ self: {
          base configurator connection data-default http-client
          http-client-tls soap text tls x509 x509-store x509-validation
        ];
-       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using tls package)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -195255,7 +188131,6 @@ self: {
        executableHaskellDepends = [
          base binary bytestring containers directory haskell98 network
        ];
-       homepage = "https://github.com/singpolyma/sock2stream";
        description = "Tunnel a socket over a single datastream (stdin/stdout)";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195284,7 +188159,6 @@ self: {
        testHaskellDepends = [
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/lpeterse/haskell-socket";
        description = "An extensible socket library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -195296,7 +188170,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0fxl9v1mvlv31bhyjl8k1l4f4lr9n0gvcnsfr2m65m3c557pp7mr";
        libraryHaskellDepends = [ base network transformers unix ];
-       homepage = "https://github.com/ddfisher/haskell-socket-activation";
        description = "systemd socket activation library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195313,7 +188186,6 @@ self: {
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
-       homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195327,7 +188199,6 @@ self: {
        libraryHaskellDepends = [ base bytestring socket ];
        librarySystemDepends = [ lksctp-tools ];
        testHaskellDepends = [ base bytestring socket ];
-       homepage = "https://github.com/shlevy/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195345,7 +188216,6 @@ self: {
        testHaskellDepends = [
          async base bytestring socket tasty tasty-hunit unix
        ];
-       homepage = "https://github.com/vyacheslavhashov/haskell-socket-unix#readme";
        description = "Unix domain sockets";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195428,7 +188298,6 @@ self: {
        executableHaskellDepends = [
          aeson base bytestring either network text websockets
        ];
-       homepage = "https://github.com/aphorisme/socketson";
        description = "A small websocket backend provider";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195441,7 +188310,6 @@ self: {
        version = "0.5.6";
        sha256 = "0f44qy74i0n6ll3jym0a2ipafkpw1h67amcpqmj8iq95h21wsqzs";
        libraryHaskellDepends = [ base bytestring cereal network ];
-       homepage = "http://github.com/vincenthz/hs-socks";
        description = "Socks proxy (ver 5)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195466,7 +188334,6 @@ self: {
        sha256 = "01f49hwxc5h85iwzgnddxlh1lmb3s27zddmghxrlq958gcrr2iar";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base cairo gtk old-time stm ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "GUI functions as used in the book \"The Haskell School of Expression\"";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195491,7 +188358,6 @@ self: {
          http-types QuickCheck scientific text unordered-containers vector
          wai wai-extra
        ];
-       homepage = "https://github.com/chpatrick/solga";
        description = "Simple typesafe web routing";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195510,7 +188376,6 @@ self: {
          base bytestring dlist http-types insert-ordered-containers lens mtl
          solga swagger2 text unordered-containers
        ];
-       homepage = "https://github.com/chpatrick/solga";
        description = "Swagger generation for Solga";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195536,7 +188401,6 @@ self: {
          optparse-applicative-simple profunctors semigroups text
          transformers uri-encode
        ];
-       homepage = "https://github.com/sannsyn/solr";
        description = "A minimal Solr client library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195558,7 +188422,6 @@ self: {
        executableHaskellDepends = [
          array base bytestring bzlib containers mtl pretty utf8-string xml
        ];
-       homepage = "http://darcs.k-hornz.de/cgi-bin/darcsweb.cgi?r=sonic-visualiser;a=summary";
        description = "Sonic Visualiser";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195590,7 +188453,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "03bpyn0mimfyilfjs26b9c8sclbzsbardjhy6d822jybg548kqyf";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/cdornan/sort";
        description = "A Haskell sorting toolkit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195603,7 +188465,6 @@ self: {
        sha256 = "0gxz5kmkcmq8330v1iclhxqzfb6p9qk4prnskm16qmv2i4dp1p34";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ air base bytestring containers text ];
-       homepage = "https://github.com/nfjinjing/sort-by-pinyin";
        description = "Sort Simplified Chinese by PinYin";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195629,7 +188490,6 @@ self: {
        sha256 = "0f6ihm4xsg31izzl4c13lic2aq4m2rq0d7y5xjlx7x2nn23wflnc";
        libraryHaskellDepends = [ base deepseq ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195642,7 +188502,6 @@ self: {
        sha256 = "1x2ygkh32q2kk5g7b7hnrl8z8azvgwsj36f3ndg79pzhghapdr5l";
        libraryHaskellDepends = [ base deepseq ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md";
        description = "Type-enforced sorted lists and related functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195655,7 +188514,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1i2vbmq7p7rja9rnhalyrspc2p5nc8yg6mfj9ia89j55vkc6225n";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/joneshf/sorting";
        description = "Utils for sorting";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195706,7 +188564,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers parseargs WAVE ];
-       homepage = "http://github.com/BartMassey/sounddelay";
        description = "Audio delay line";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195743,7 +188600,6 @@ self: {
          HDBC-sqlite3 json loli mps mtl process safe StateVar stm
          template-haskell time unix
        ];
-       homepage = "http://github.com/nfjinjing/source-code-server";
        description = "The server backend for the source code iPhone app";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195786,7 +188642,6 @@ self: {
        testHaskellDepends = [
          base mtl QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/msiegenthaler/SouSiT";
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195805,7 +188660,6 @@ self: {
          base containers explicit-exception extensible-exceptions process
          sample-frame semigroups transformers unix utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Sox";
        description = "Play, write, read, convert audio signals using Sox";
        license = "GPL";
      }) {};
@@ -195826,7 +188680,6 @@ self: {
          sample-frame storablevector transformers utility-ht
        ];
        libraryPkgconfigDepends = [ sox ];
-       homepage = "http://www.haskell.org/haskellwiki/Sox";
        description = "Write, read, convert audio signals using libsox";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) sox;};
@@ -195845,7 +188698,6 @@ self: {
          base bytestring cereal cmdargs containers pretty QuickCheck
          trifecta uniplate vector
        ];
-       homepage = "https://github.com/amtal/0x10c";
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195866,7 +188718,6 @@ self: {
          template-haskell text unix wai warp
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/xtendo-org/space#readme";
        description = "Experimental library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -195879,7 +188730,6 @@ self: {
        sha256 = "0md1ygps2y2ri49g012xj5vv9iglixw06sicl685k60h4sskiqsk";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/knz/spacefill";
        description = "Generators for space-filling curves";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -195891,7 +188741,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "118wch92ix54jp1hi4qw9mk46571lnak4df8ji83bs2vz3vax6jp";
        libraryHaskellDepends = [ base vector-space ];
-       homepage = "http://code.haskell.org/data-spacepart";
        description = "Space partition data structures. Currently only a QuadTree.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195911,7 +188760,6 @@ self: {
          test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/SeanRBurton/spaceprobe";
        description = "Optimization over arbitrary search spaces";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195938,7 +188786,6 @@ self: {
          aeson base bytestring cryptonite memory process protolude
          QuickCheck tasty tasty-hspec
        ];
-       homepage = "https://github.com/jml/haskell-spake2#readme";
        description = "Implementation of the SPAKE2 Password-Authenticated Key Exchange algorithm";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195957,7 +188804,6 @@ self: {
        executableHaskellDepends = [
          base containers gloss lens linear MonadRandom mtl netwire
        ];
-       homepage = "https://github.com/vtan/spanout";
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195984,7 +188830,6 @@ self: {
          base bytestring filepath process regex-tdfa temporary text unix
          zip-archive
        ];
-       homepage = "http://github.com/tweag/sparkle#readme";
        description = "Distributed Apache Spark applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196003,7 +188848,6 @@ self: {
          wreq
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/ardamose123/sparql-protocol";
        description = "An SPARQL 1.1 Protocol client library.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -196059,7 +188903,6 @@ self: {
          transformers vector
        ];
        benchmarkHaskellDepends = [ array base criterion deepseq vector ];
-       homepage = "http://github.com/ekmett/sparse";
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196078,7 +188921,6 @@ self: {
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/laughedelic/sparse-lin-alg";
        description = "Effective linear algebra on sparse matrices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196101,7 +188943,6 @@ self: {
          base containers exceptions hspec matrix-market-attoparsec mtl
          mwc-random primitive QuickCheck scientific
        ];
-       homepage = "https://github.com/ocramz/sparse-linear-algebra";
        description = "Numerical computing in native Haskell";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -196124,7 +188965,6 @@ self: {
          base containers exceptions hspec matrix-market-attoparsec mtl
          mwc-random primitive QuickCheck scientific
        ];
-       homepage = "https://github.com/ocramz/sparse-linear-algebra";
        description = "Numerical computing in native Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196137,7 +188977,6 @@ self: {
        version = "0.5";
        sha256 = "1a4gsnmr1y8b05iws2vrmjqbs5y9svfsz0jb3k19dddn1aszzm07";
        libraryHaskellDepends = [ base haskell98 ];
-       homepage = "http://kyagrd.dyndns.org/wiki/SparseBitmapsForPatternMatchCoverage";
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196150,7 +188989,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "19h9vy7arhi35rqafbq3nf9a50vnlw5mbfwvl6sp1j61w0yxai95";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://www.cs.york.ac.uk/~mfn/sparsecheck/";
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196179,7 +189017,6 @@ self: {
        sha256 = "1cr0d82l2b96jvszca4yavdgwq450yzigcyrrlddrf9m9908kkzy";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base dlist mps mtl ];
-       homepage = "http://github.com/nfjinjing/spata";
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196224,7 +189061,6 @@ self: {
        sha256 = "1jxxivxlhzjx4idy69qhqqv37sspqhk3f3i93mydzn8cyhn87aqp";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
-       homepage = "https://github.com/phadej/spdx";
        description = "SPDX license expression language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196238,7 +189074,6 @@ self: {
        sha256 = "02cq8f9yz5z3rwkcj4nj8dgzwnn2w3b1jpndmmcqwsjymmivy8fr";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/akc/spe";
        description = "Combinatorial species lite";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196281,7 +189116,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring ieee754 scientific text
        ];
-       homepage = "https://github.com/minad/special-values#readme";
        description = "Typeclass providing special values";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -196308,7 +189142,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 th-expand-syns
          type-sub-th uniplate universe-th
        ];
-       homepage = "https://github.com/jfischoff/specialize-th";
        description = "Create specialized types from polymorphic ones using TH";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196341,7 +189174,6 @@ self: {
        libraryHaskellDepends = [ base cmdargs containers leancheck ];
        testHaskellDepends = [ base leancheck ];
        benchmarkHaskellDepends = [ base leancheck ];
-       homepage = "https://github.com/rudymatela/speculate#readme";
        description = "discovery of properties about Haskell functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196353,7 +189185,6 @@ self: {
        version = "1.5.0.3";
        sha256 = "0gsdxgi1bw33z7v23m2fq8ynqxz06swjv4ikl8mqmlp0hwd69gvk";
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
-       homepage = "http://github.com/ekmett/speculation";
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196366,7 +189197,6 @@ self: {
        sha256 = "0050iy5q9m1ylkhbbnpff7yl99917pa46pgvj76isij4lvdl4f5a";
        libraryHaskellDepends = [ speculation ];
        doHaddock = false;
-       homepage = "http://github.com/ekmett/speculation/";
        description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196384,7 +189214,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base containers mwc-probability ];
-       homepage = "http://github.com/jtobin/speedy-slice";
        description = "Speedy slice sampling";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -196406,7 +189235,6 @@ self: {
        executableHaskellDepends = [
          base edit-distance parseargs phonetic-code sqlite
        ];
-       homepage = "https://github.com/gregwebs/haskell-spell-suggest";
        description = "Spelling suggestion tool with library and command-line interfaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196440,7 +189268,6 @@ self: {
          base binary bytestring data-binary-ieee754 network text text-icu
          xml
        ];
-       homepage = "https://github.com/gregwebs/haskell-sphinx-client";
        description = "Haskell bindings to the Sphinx full-text searching daemon";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196473,7 +189300,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base MissingH parsec split ];
        executableHaskellDepends = [ base optparse-applicative ];
-       homepage = "https://github.com/mackeyrms/sphinxesc#readme";
        description = "Transform queries for sphinx input";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196491,7 +189317,6 @@ self: {
          base bytestring containers data-default elerea GLFW JuicyPixels
          JuicyPixels-repa OpenGL
        ];
-       homepage = "http://github.com/crockeo/spice";
        description = "An FRP-based game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196513,7 +189338,6 @@ self: {
          process random rosezipper stm webkit
        ];
        executablePkgconfigDepends = [ libsoup ];
-       homepage = "http://github.com/Tener/spike";
        description = "Experimental web browser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196526,7 +189350,6 @@ self: {
        version = "0.1";
        sha256 = "1sk2vkslcbmr4z87xc7q38ywbj118bcgqrkz9fqsp7jffxvy4bgv";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/spl/spine";
        description = "Simple implementation of the generic spine view";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196538,7 +189361,6 @@ self: {
        version = "0.0.1.0";
        sha256 = "1jnnc9pgy22iayln4ljgirr4ixspjn7iljyxz2pp7fxgvmvb3msr";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/expipiplus1/spir-v";
        description = "Some utilities for reading and writing SPIR-V files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196559,7 +189381,6 @@ self: {
          hashable mtl process safe semigroups split stm text time
          transformers unordered-containers vector vinyl wl-pprint-text
        ];
-       homepage = "http://github.com/sboosali/spiros#readme";
        description = "my custom prelude";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196588,7 +189409,6 @@ self: {
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/JohnLato/splaytree";
        description = "Provides an annotated splay tree";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196601,7 +189421,6 @@ self: {
        version = "0.6.1.1";
        sha256 = "0lsfkm4vfipzbnqpf3yli6fwrv5a5mwbs149dfzhs7spa9kbxyl1";
        libraryHaskellDepends = [ base network ];
-       homepage = "http://corsis.github.com/splice/";
        description = "Cross-platform Socket to Socket Data Splicing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196625,7 +189444,6 @@ self: {
          base cmdargs doctest filepath MissingH repa repa-algorithms repa-io
          tasty tasty-hunit tasty-quickcheck vector
        ];
-       homepage = "http://michael.orlitzky.com/code/spline3.php";
        description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196660,7 +189478,6 @@ self: {
        version = "0.1.4.3";
        sha256 = "1i9vmb0zvmhqj6qcbnsapsk9lhsyzznz336c8s7v4sz20s99hsby";
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~byorgey/code/split";
        description = "Combinator library for splitting lists";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196703,7 +189520,6 @@ self: {
          base numeric-prelude soxlib storablevector synthesizer-core
          transformers utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/split-record/";
        description = "Split a big audio file into pieces at positions of silence";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196773,7 +189589,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath parsec range
        ];
-       homepage = "https://bitbucket.org/robertmassaioli/splitter";
        description = "Use numerical ranges to split out certain lines from a file";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196794,7 +189609,6 @@ self: {
          base bytestring bytestring-lexing cairo colour containers HUnit mtl
          strptime template-haskell time vcs-revision
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Splot";
        description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196837,7 +189651,6 @@ self: {
        libraryHaskellDepends = [
          base directory extensible-exceptions filepath parsec
        ];
-       homepage = "http://github.com/elginer/SpoonUtilities";
        description = "Spoon's utilities. Simple testing and nice looking error reporting.";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196855,7 +189668,6 @@ self: {
          aeson base bytestring lens lens-aeson pipes text
          unordered-containers wreq
        ];
-       homepage = "https://github.com/davnils/spoty";
        description = "Spotify web API wrapper";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196873,7 +189685,6 @@ self: {
        libraryHaskellDepends = [
          base explicit-exception transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Spreadsheet";
        description = "Read and write spreadsheets from and to CSV files in a lazy way";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -196916,7 +189727,6 @@ self: {
          regex-base regex-pcre tasty tasty-hunit tasty-quickcheck temporary
          wai-extra
        ];
-       homepage = "https://bitbucket.org/tdammers/sprinkles";
        description = "JSON API to HTML website wrapper";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -196930,7 +189740,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1syv2l0z7c2s6bbi5103i4var40j8pavahiic813v8m9s6waa4fk";
        libraryHaskellDepends = [ base lens mtl vector ];
-       homepage = "https://github.com/relrod/spritz";
        description = "An implementation of the Spritz RC4-like stream cipher in Haskell";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197026,7 +189835,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion hmatrix random ];
-       homepage = "https://github.com/yanatan16/haskell-spsa";
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197053,7 +189861,6 @@ self: {
          process QuickCheck system-filepath test-framework
          test-framework-hunit test-framework-quickcheck2 time unix
        ];
-       homepage = "https://bitbucket.org/ssaasen/spy";
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197070,7 +189877,6 @@ self: {
          base containers exceptions monad-control text transformers
          transformers-base
        ];
-       homepage = "https://github.com/philopon/sql-simple";
        description = "common middle-level sql client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197087,7 +189893,6 @@ self: {
        libraryHaskellDepends = [
          base data-default-class mysql mysql-simple sql-simple text
        ];
-       homepage = "https://github.com/philopon/sql-simple";
        description = "mysql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197105,7 +189910,6 @@ self: {
          base data-default-class monad-control resource-pool sql-simple text
          time
        ];
-       homepage = "https://github.com/philopon/sql-simple";
        description = "conection pool for sql-simple";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197122,7 +189926,6 @@ self: {
        libraryHaskellDepends = [
          base data-default-class postgresql-simple sql-simple text
        ];
-       homepage = "https://github.com/philopon/sql-simple";
        description = "postgresql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197135,7 +189938,6 @@ self: {
        version = "0.3.0";
        sha256 = "07ji17b4q9b8w9q9r8digb218qkjcrxfc24113p0f3pmgbwci3f1";
        libraryHaskellDepends = [ base sql-simple sqlite-simple ];
-       homepage = "https://github.com/philopon/sql-simple";
        description = "sqlite backend for sql-simple";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197149,11 +189951,23 @@ self: {
        sha256 = "065ymcym5vm5xmprbzgv88wk3b09j44ajvsd59apw6qr32j218rn";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "SQL keywords data constructors into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sql-words_0_1_6_1" = callPackage
+    ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
+     mkDerivation {
+       pname = "sql-words";
+       version = "0.1.6.1";
+       sha256 = "07prq4bcvl469m0sr767kxidr0kk27yynb9zsm48sjz84h0bx2v3";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
+       description = "SQL keywords data constructors into OverloadedString";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sqlcipher" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , hspec, openssl, pretty, temporary, time, utf8-string
@@ -197168,7 +189982,6 @@ self: {
        ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ base filepath hspec temporary ];
-       homepage = "http://github.com/figome/haskell-sqlcipher";
        description = "Haskell binding to sqlcipher";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197182,7 +189995,6 @@ self: {
        sha256 = "09x9g3rjz1idyr0rh885y4pdddn08g7hwcspa47n6yf5wlx33gln";
        libraryHaskellDepends = [ base logging text transformers ];
        librarySystemDepends = [ unixODBC ];
-       homepage = "http://hub.darcs.net/mihaigiurgeanu/sqlcli";
        description = "Sql Call-Level Interface bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) unixODBC;};
@@ -197194,7 +190006,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1rfhdaa0wmvc78nbjhi93p9sv66xa6rjr79yyhlkqi1d335b8vb5";
        libraryHaskellDepends = [ base logging sqlcli ];
-       homepage = "https://hub.darcs.net/mihaigiurgeanu/sqlcli-odbc";
        description = "ODBC specific definitions to be used by SQL CLI clients";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197212,7 +190023,6 @@ self: {
        ];
        librarySystemDepends = [ sqlite ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/GaloisInc/sqlite";
        description = "Haskell binding to sqlite3";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) sqlite;};
@@ -197233,7 +190043,6 @@ self: {
        testHaskellDepends = [
          base base16-bytestring bytestring direct-sqlite HUnit text time
        ];
-       homepage = "http://github.com/nurpax/sqlite-simple";
        description = "Mid-Level SQLite client library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197246,7 +190055,6 @@ self: {
        sha256 = "0vvim8zcrl3yqhf30j69x59qs5f6sdx5bvy4ihwmimkldm5gh0ai";
        libraryHaskellDepends = [ base parsec sqlite-simple text ];
        testHaskellDepends = [ base mtl sqlite-simple text ];
-       homepage = "https://github.com/caneroj1/sqlite-simple-errors";
        description = "Wrapper around errors from sqlite-simple";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197264,7 +190072,6 @@ self: {
          base haskell-src-meta sqlite sqlite-simple template-haskell
          typedquery utf8-string
        ];
-       homepage = "https://github.com/tolysz/sqlite-simple-typed";
        description = "Typed extension to sqlite simple";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197299,7 +190106,6 @@ self: {
          wreq
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/owickstrom/sqsd-local#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197327,7 +190133,6 @@ self: {
          transformers-base
        ];
        testHaskellDepends = [ base doctest generics-sop hspec ];
-       homepage = "https://github.com/morphismtech/squeal";
        description = "Squeal PostgreSQL Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197356,7 +190161,6 @@ self: {
          transformers-base vector
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/morphismtech/squeal";
        description = "Squeal PostgreSQL Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197381,7 +190185,6 @@ self: {
        testHaskellDepends = [
          base Cabal extra factory QuickCheck toolshed
        ];
-       homepage = "http://functionalley.eu/Squeeze/squeeze.html";
        description = "A file-packing application";
        license = "GPL";
      }) {};
@@ -197401,7 +190204,6 @@ self: {
          network-uri old-locale old-time pretty process pureMD5 QuickCheck
          random regex-compat time unix Unixutils zlib
        ];
-       homepage = "https://github.com/seereason/sr-extra";
        description = "A grab bag of modules";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197432,7 +190234,6 @@ self: {
        version = "0.5.1.2";
        sha256 = "0vn0zqsk191ghh2993hls05hp7kvnskaafnfrrqhfbmpdg7dp7h6";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mainland/srcloc";
        description = "Data types for managing source code locations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197444,7 +190245,6 @@ self: {
        version = "0.1.0";
        sha256 = "028sb4znvdqsygipcsf44j0xazk03pdfkirzrczmxcd11srh3h1k";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://tomahawkins.org";
        description = "Parsing and processing s-records";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197481,7 +190281,6 @@ self: {
          attoparsec base bytestring case-insensitive containers Glob
          MonadCatchIO-mtl mtl transformers utf8-string
        ];
-       homepage = "https://github.com/jekor/haskell-sscgi";
        description = "Simple SCGI Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197495,7 +190294,6 @@ self: {
        sha256 = "1npir8050jiwfsdrczkmql6vypqq9smgqbi6avxsknxr4z11cz60";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/khalilfazal/sscript#readme";
        description = "Formats Strings with subscript or superscript characters";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197525,7 +190323,6 @@ self: {
          template-haskell th-lift-instances
        ];
        doCheck = false;
-       homepage = "http://hub.darcs.net/ganesh/ssh";
        description = "A pure-Haskell SSH server library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197547,7 +190344,6 @@ self: {
          base HUnit iproute QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 text unix
        ];
-       homepage = "http://hub.darcs.net/kquick/ssh-known-hosts";
        description = "Read and interpret the SSH known-hosts file";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197565,7 +190361,6 @@ self: {
        libraryHaskellDepends = [
          base foldl http-client managed text transformers turtle uuid
        ];
-       homepage = "https://github.com/Teaspot-Studio/ssh-tunnel#readme";
        description = "Proxy http-client via ssh tunnel";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197607,7 +190402,6 @@ self: {
          base containers curl directory hdaemonize hslogger mtl process
          regex-compat stm unix
        ];
-       homepage = "http://ui3.info/d/proj/sshtun.html";
        description = "Wrapper daemon to manage an ssh tunnel";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197636,7 +190430,6 @@ self: {
          data-default http-conduit http-types mtl network-conduit text wai
          wai-extra warp
        ];
-       homepage = "http://github.com/erudify/sssp/";
        description = "HTTP proxy for S3";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197671,7 +190464,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
-       homepage = "https://github.com/BartMassey/ssv";
        description = "Comma-separated-value (CSV) read, show and write routines";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -197688,7 +190480,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion fingertree heaps mwc-random pqueue vector
        ];
-       homepage = "http://hub.darcs.net/jmcarthur/stable-heap";
        description = "Purely functional stable heaps (fair priority queues)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197701,7 +190492,6 @@ self: {
        version = "0.0.5";
        sha256 = "1sjidykbj5f692di93nml0frazvyw9kxyhjwbyyvrb9gwgc2ms3w";
        libraryHaskellDepends = [ base containers ghc-prim ];
-       homepage = "http://github.com/ekmett/stable-maps";
        description = "Heterogeneous maps keyed by StableNames";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197714,7 +190504,6 @@ self: {
        version = "0.1.2.0";
        sha256 = "1xm99zdgzdlaz48njpyl0ji9hmyxcf9zxjs0dg46si4lj64qavmz";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "http://github.com/cutsea110/stable-marriage";
        description = "algorithms around stable marriage";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197753,7 +190542,6 @@ self: {
          base bytestring bytestring-arbitrary cereal containers mtl objectid
          QuickCheck tasty tasty-quickcheck text
        ];
-       homepage = "https://github.com/tsuraan/stable-tree";
        description = "Trees whose branches are resistant to change";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197783,7 +190571,6 @@ self: {
        benchmarkHaskellDepends = [
          aeson base criterion deepseq megaparsec text
        ];
-       homepage = "https://github.com/stackbuilders/stache";
        description = "Mustache templates for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -197874,7 +190661,6 @@ self: {
          mkdir -p $out/share/bash-completion/completions
          $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
        '';
-       homepage = "http://haskellstack.org";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -197899,7 +190685,6 @@ self: {
          ansi-terminal async base bytestring filepath Glob hspec lens
          lens-aeson optparse-applicative process QuickCheck strict text yaml
        ];
-       homepage = "https://github.com/yamadapc/stack-bump";
        description = "Dead simple version bumping for hpack packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197927,7 +190712,6 @@ self: {
          aeson base containers deepseq hlint hpc hspec hspec-contrib HUnit
          time
        ];
-       homepage = "http://github.com/rubik/stack-hpc-coveralls";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197944,7 +190728,6 @@ self: {
        libraryHaskellDepends = [
          base monad-logger path stack time transformers
        ];
-       homepage = "https://github.com/clintonmead/stack-lib#readme";
        description = "Wrapper to use stack as a library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -197987,7 +190770,6 @@ self: {
          raw-strings-qq system-fileio system-filepath temporary text
          transformers yaml
        ];
-       homepage = "https://github.com/McGizzle/stack-network#readme";
        description = "A program for extending Stack to add distributed capabilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198005,7 +190787,6 @@ self: {
          base profunctors tagged template-haskell transformers
        ];
        testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198026,7 +190807,6 @@ self: {
          ansi-terminal async base bytestring Cabal conduit conduit-extra
          directory filepath MissingH stm terminal-size time vty
        ];
-       homepage = "https://github.com/yamadapc/stack-run";
        description = "An equivalent to cabal run for stack";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198055,7 +190835,6 @@ self: {
          async base directory extract-dependencies file-modules filepath
          lens lens-aeson MissingH process stm-containers text time wreq
        ];
-       homepage = "http://github.com/yamadapc/stack-run-auto#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198068,7 +190847,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "13kc36p62kmni6lksr3j5mlndc1rmmgir9p0k7qcv5ph6rbrc47k";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/aiya000/hs-stack-type";
        description = "The basic stack type";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -198085,7 +190863,6 @@ self: {
          base bytestring directory filepath text yaml
        ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/phlummox/stack-yaml";
        description = "Parse a stack.yaml file";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -198126,7 +190903,6 @@ self: {
          stackage-install stackage-sandbox stackage-setup stackage-update
          stackage-upload
        ];
-       homepage = "https://www.stackage.org/";
        description = "Dummy package forcing installation of other Stackage packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198152,7 +190928,6 @@ self: {
        executableHaskellDepends = [
          aeson base optparse-applicative stackage-cli text
        ];
-       homepage = "https://github.com/fpco/stackage-build-plan";
        description = "Calculate and print (in different formats) Stackage build plans";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198174,7 +190949,6 @@ self: {
          base bytestring exceptions http-client http-client-tls http-types
          optparse-applicative parsec process stackage-cli system-fileio text
        ];
-       homepage = "https://www.stackage.org/package/stackage-cabal";
        description = "A CLI executable for cabal-based stackage commands";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198197,7 +190971,6 @@ self: {
          transformers unordered-containers
        ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://www.stackage.org/package/stackage-cli";
        description = "A CLI library for stackage commands";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198243,7 +191016,6 @@ self: {
          base Cabal classy-prelude-conduit containers directory hspec
          http-client http-client-tls QuickCheck text yaml
        ];
-       homepage = "https://github.com/fpco/stackage-curator";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198266,7 +191038,6 @@ self: {
          text
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/fpco/stackage-install";
        description = "Secure download of packages for cabal-install";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -198294,7 +191065,6 @@ self: {
          cryptohash directory filepath http-client http-client-tls resourcet
          stackage-install stackage-update tar text transformers yaml
        ];
-       homepage = "https://github.com/commercialhaskell/all-cabal-metadata-tool";
        description = "DEPRECATED Grab current metadata for all packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198314,7 +191084,6 @@ self: {
          base Cabal containers directory filepath optparse-applicative
          process stackage-types text yaml
        ];
-       homepage = "https://github.com/juhp/stackage-query";
        description = "Stackage package query";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198336,7 +191105,6 @@ self: {
          attoparsec base bytestring conduit-combinators conduit-extra
          directory filepath optparse-applicative process stackage-cli text
        ];
-       homepage = "https://www.stackage.org/package/stackage-sandbox";
        description = "Work with shared stackage sandboxes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198361,7 +191129,6 @@ self: {
          http-types optparse-applicative process stackage-cli text
          unordered-containers yaml
        ];
-       homepage = "https://www.stackage.org/package/stackage-setup";
        description = "An executable for downloading a Haskell setup";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198380,7 +191147,6 @@ self: {
          aeson base Cabal containers exceptions hashable safe semigroups
          text time unordered-containers vector
        ];
-       homepage = "https://github.com/fpco/stackage-types";
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198396,7 +191162,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base directory filepath process ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/fpco/stackage-update";
        description = "Update your package index incrementally (requires git)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -198419,7 +191184,6 @@ self: {
        executableHaskellDepends = [
          base optparse-applicative stackage-cli
        ];
-       homepage = "https://github.com/fpco/stackage-upload";
        description = "A more secure version of cabal upload which uses HTTPS";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198451,7 +191215,6 @@ self: {
          base bytestring Cabal hspec network-uri pretty shakespeare text
          yaml
        ];
-       homepage = "https://github.com/typeable/stackage2nix#readme";
        description = "Convert Stack files into Nix build instructions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198464,7 +191227,6 @@ self: {
        version = "1.0.0";
        sha256 = "0c32vhc59kgw0ss4jcsrq7293jnb8ca2j7pbad19hn2m3mhslzky";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/lovasko/staf";
        description = "Numerical statistics for Foldable containers";
        license = "unknown";
      }) {};
@@ -198499,7 +191261,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "0rfpx73v28xa3spwb24crq7li2ia54yaz7sjc6ag9zagxn3wsyv5";
        libraryHaskellDepends = [ base mtl template-haskell ];
-       homepage = "https://github.com/HaskellZhangSong/TopdownDerive";
        description = "This package will derive class instance along the data type declaration tree";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198518,7 +191279,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers directory filepath optparse-applicative
        ];
-       homepage = "http://documentup.com/feuerbach/standalone-haddock";
        description = "Generate standalone haddock documentation for a set of packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198531,7 +191291,6 @@ self: {
        version = "0.0.1.0";
        sha256 = "03lk46s8v3pgxgk4ddyf382rspqvkf61v9bffhym0pd4didnz9d5";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/chessai/star#readme";
        description = "*-semirings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -198567,7 +191326,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring failure transformers
        ];
-       homepage = "http://community.haskell.org/~aslatter/starling";
        description = "A memcached client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198588,7 +191346,6 @@ self: {
          base bytestring directory EdisonCore FTGL haskell98 mtl OpenGL
          random SDL
        ];
-       homepage = "http://github.com/anttisalonen/starrover2";
        description = "Space simulation game";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198601,7 +191358,6 @@ self: {
        version = "0.2.1";
        sha256 = "1lghrnygc984a4ybdisp11kdcljwygx5ybiacnk7d0p1x8205zk0";
        libraryHaskellDepends = [ base fsnotify ];
-       homepage = "https://github.com/rkaippully/starter#readme";
        description = "Develop applications without restarts";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -198646,7 +191402,6 @@ self: {
          base ghc-prim primitive transformers vector
        ];
        testHaskellDepends = [ base hspec transformers ];
-       homepage = "http://www.gekkou.co.uk/software/";
        description = "Monad transformers for holding bags of state";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198661,7 +191416,6 @@ self: {
        sha256 = "18gls0gyk3iz9i03zw31x3xhi5m1y2r98qkkrah8kz07fsbxqrqn";
        libraryHaskellDepends = [ aeson base shakespeare text ];
        testHaskellDepends = [ aeson base hspec QuickCheck text ];
-       homepage = "https://github.com/acamino/state-codes#README";
        description = "ISO 3166-2:US state codes and i18n names";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -198686,7 +191440,6 @@ self: {
        version = "0.0.1";
        sha256 = "1y9ql1dlv2kf564x153gyw5h967pjn5zilfq88px8rqmkydqix7g";
        libraryHaskellDepends = [ base mtl template-haskell ];
-       homepage = "https://github.com/ktvoelker/state-record";
        description = "Better records for State monad states";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198722,7 +191475,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base polyparse ];
-       homepage = "http://tomahawkins.org";
        description = "Compiles Rhapsody statecharts to C";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -198746,7 +191498,6 @@ self: {
        version = "0.3";
        sha256 = "0hdpw6g255lj7jjvgqwhjdpzmka546vda5qjvry8gjj6nfm91lvx";
        libraryHaskellDepends = [ base mtl stm ];
-       homepage = "http://code.haskell.org/~mokus/stateref/";
        description = "Abstraction for things that work like IORef";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -198791,7 +191542,6 @@ self: {
          async base bytestring time transformers
        ];
        librarySystemDepends = [ libstatgrab ];
-       homepage = "http://github.com/brendanhay/statgrab";
        description = "Collect system level metrics and statistics";
        license = "unknown";
      }) {inherit (pkgs) libstatgrab;};
@@ -198805,7 +191555,6 @@ self: {
        revision = "1";
        editedCabalFile = "1z3mi5z590xxmipd5fxylcmf39rrwvmwva2rkk6km1nxb5kfasl7";
        libraryHaskellDepends = [ base double-conversion free mtl text ];
-       homepage = "https://github.com/jeffreyrosenbluth/static-canvas";
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198823,7 +191572,6 @@ self: {
          base binary bytestring constraints containers ghc-instances
          template-haskell
        ];
-       homepage = "https://github.com/clintonmead/static-closure#readme";
        description = "Serialisable static pointers to functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -198879,7 +191627,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq linear mwc-random vector
        ];
-       homepage = "https://github.com/vagarenko/static-tensor";
        description = "Tensors of statically known size";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198900,7 +191647,6 @@ self: {
          base bytestring doctest doctest-discover tasty tasty-hunit
          template-haskell
        ];
-       homepage = "https://github.com/dzhus/static-text#readme";
        description = "Lists, Texts, ByteStrings and Vectors of statically known length";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198940,7 +191686,6 @@ self: {
          primitive QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 vector vector-algorithms
        ];
-       homepage = "https://github.com/bos/statistics";
        description = "A library of statistical types, data, and functions";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -198968,7 +191713,6 @@ self: {
        version = "1.0.1";
        sha256 = "17w7vz0jarbyf9y72bn9yg134q6ja5ymfyl1v9nx94glbhbybrlf";
        libraryHaskellDepends = [ base vector ];
-       homepage = "http://code.haskell.org/~dons/code/statistics-fusion";
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -198985,7 +191729,6 @@ self: {
        libraryHaskellDepends = [
          base math-functions mwc-random primitive statistics
        ];
-       homepage = "https://github.com/srijs/statistics-hypergeometric-genvar";
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199002,7 +191745,6 @@ self: {
        libraryHaskellDepends = [
          base MonadRandom random random-shuffle safe statistics vector
        ];
-       homepage = "http://github.com/alpmestan/statistics-linreg";
        description = "Linear regression between two samples, based on the 'statistics' package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -199016,7 +191758,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base statistics text vector ];
-       homepage = "http://github.com/cheecheeo/stats/";
        description = "command line statistics";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199033,7 +191774,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring monad-control mtl network random
        ];
-       homepage = "https://github.com/mitchellwrosen/statsd-haskell";
        description = "StatsD API";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199052,7 +191792,6 @@ self: {
          base byteable bytestring crypto-api cryptohash digest-pure DRBG
          network network-uri old-time random time-units
        ];
-       homepage = "https://github.com/keithduncan/statsd-client";
        description = "Statsd UDP client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199069,7 +191808,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring monad-control network text transformers-base
        ];
-       homepage = "https://bitbucket.org/dpwiz/statsd-datadog";
        description = "DataDog-flavored StatsD client";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -199092,7 +191830,6 @@ self: {
        executableHaskellDepends = [
          base dbus dbus-hslogger hslogger optparse-applicative
        ];
-       homepage = "https://github.com/IvanMalison/status-notifier-item#readme";
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199132,7 +191869,6 @@ self: {
        testHaskellDepends = [
          base bytestring Cabal filepath hspec QuickCheck semigroups text
        ];
-       homepage = "https://github.com/debug-ito/staversion";
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199144,7 +191880,6 @@ self: {
        version = "0.2.1";
        sha256 = "1mx6i5q56wy13fvpnypb2c6fk2z3i5xdfblkpazzc70p2dgxaf52";
        libraryHaskellDepends = [ base bitmap bytestring ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's JPEG/PNG decoder";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -199157,7 +191892,6 @@ self: {
        sha256 = "1s23f38za0zv9vzj4qn5qq2ajhgr6g9gsd2nck2hmkqfjpw1mx1v";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
-       homepage = "https://github.com/typedrat/stb-image-redux#readme";
        description = "Image loading and writing microlibrary";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199169,7 +191903,6 @@ self: {
        version = "0.1.2";
        sha256 = "1hbbi7hax5fw5zb7ashfs5paixqzqrrr64lwisda80dskdazld4m";
        libraryHaskellDepends = [ array base bytestring containers ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199205,7 +191938,6 @@ self: {
        executableHaskellDepends = [
          aeson base base64-bytestring binary bytestring split text
        ];
-       homepage = "https://github.com/gitfoxi/Stdf";
        description = "Parse Structured Test Data Format (STDF)";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199250,7 +191982,6 @@ self: {
          async base bytestring fsnotify hspec mtl regex-tdfa resourcet
          semigroups stm streaming text yaml
        ];
-       homepage = "https://github.com/schell/steeloverseer#readme";
        description = "A file watcher and development tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199265,7 +191996,6 @@ self: {
        sha256 = "1czdfnfama0phsbgv1a55815gnnkrqm5wggw9n10g4lfl866qbyv";
        libraryHaskellDepends = [ base bytestring cryptonite memory uuid ];
        testHaskellDepends = [ base random uuid ];
-       homepage = "https://github.com/dimitri-xyz/stego-uuid#readme";
        description = "Generator and verifier for steganographic numbers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199278,7 +192008,6 @@ self: {
        version = "0.5.2";
        sha256 = "1pg6bk9p1agip8nqzvdpw1hjjf0nwq9fmr58750wda6il7nljx3m";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.github.com/bgamari/stemmer";
        description = "Haskell bindings to the Snowball stemming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199308,7 +192037,6 @@ self: {
          base base-compat-batteries containers deepseq QuickCheck
        ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/jonpetterbergman/step-function";
        description = "Staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199321,7 +192049,6 @@ self: {
        version = "1.0.2";
        sha256 = "059k8g3wb4hkxk42vm83vv6kh3igrpf7fc97xvn3qai5rx3jmgqf";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -199350,7 +192077,6 @@ self: {
          semigroups smallcheck tasty tasty-html tasty-hunit tasty-quickcheck
          tasty-rerun tasty-smallcheck template-haskell text
        ];
-       homepage = "https://github.com/quchen/stgi#readme";
        description = "Educational implementation of the STG (Spineless Tagless G-machine)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199390,7 +192116,6 @@ self: {
        version = "2.4.5.0";
        sha256 = "19sr11a0hqikhvf561b38phz6k3zg9s157a0f5ffvghk7wcdpmri";
        libraryHaskellDepends = [ array base ];
-       homepage = "https://wiki.haskell.org/Software_transactional_memory";
        description = "Software Transactional Memory";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199416,7 +192141,6 @@ self: {
        editedCabalFile = "0v9axxcfszqdmf3dhjxy34ybh22x3r5c48mdnbvjh5i5lp7g7vp2";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [ base stm ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Additional types of channels for STM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199429,7 +192153,6 @@ self: {
        sha256 = "0264air2mhwbya2sxskrh4z1bs8il7d9iv4vm6wyz8zxxc95v1nj";
        libraryHaskellDepends = [ async base stm ];
        testHaskellDepends = [ async base HUnit stm tasty tasty-hunit ];
-       homepage = "http://github.com/kholdstare/stm-chunked-queues/";
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199456,7 +192179,6 @@ self: {
          stm-chans test-framework test-framework-hunit
          test-framework-quickcheck2 transformers unliftio
        ];
-       homepage = "https://github.com/cgaebel/stm-conduit";
        description = "Introduces conduits to channels, and promotes using conduits concurrently";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199485,7 +192207,6 @@ self: {
          hashtables list-t loch-th mtl mtl-prelude mwc-random
          mwc-random-monad placeholders text unordered-containers vector
        ];
-       homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199499,7 +192220,6 @@ self: {
        sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi";
        libraryHaskellDepends = [ base stm ];
        testHaskellDepends = [ base stm ];
-       homepage = "https://github.com/joeyadams/haskell-stm-delay";
        description = "Updatable one-shot timer polled with STM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199511,7 +192231,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0pmpf1r8q1favrbgvrnggvs93vwvml79yfqbs4xjqnjsglahl8c8";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/louispan/stm-extras#readme";
        description = "Extra STM functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199530,7 +192249,6 @@ self: {
          stm-conduit transformers wai wai-conduit warp
        ];
        testHaskellDepends = [ base hspec HUnit stm ];
-       homepage = "https://github.com/bartavelle/stm-firehose";
        description = "Conduits and STM operations for fire hoses";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199578,7 +192296,6 @@ self: {
        version = "0.1";
        sha256 = "11v0xc5zlw641mf6r5k8lqhzxc4y9bsx3xivwmbkfniph0x7g5m4";
        libraryHaskellDepends = [ base stm ];
-       homepage = "http://nonempty.org/software/stm-orelse-io";
        description = "Choose between the return value of an STM operation and an IO action";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199591,7 +192308,6 @@ self: {
        sha256 = "07wrbj88gwdbsczjr225g0z1ai1v13mdg71gl9qsmipqs0s0pfwc";
        libraryHaskellDepends = [ base mtl process stm unix ];
        testHaskellDepends = [ base QuickCheck stm ];
-       homepage = "http://www.github.com/danr/stm-promise";
        description = "Simple STM Promises for IO computations and external processes";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199615,7 +192331,6 @@ self: {
        version = "0.1";
        sha256 = "0fz4vfbyr848b32vbdm3pjj9gwi7wj39l3vsqmdpjnbfwvkw0y0s";
        libraryHaskellDepends = [ base stm stm-tlist ];
-       homepage = "https://github.com/joeyadams/haskell-stm-sbchan";
        description = "Bounded channel for STM where item sizes can vary";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199654,7 +192369,6 @@ self: {
        sha256 = "131q9y32120laylc0r1xz5pkmw69yky17vc621rlk5dcwnkasfgq";
        libraryHaskellDepends = [ base concurrent-supply ];
        testHaskellDepends = [ async base QuickCheck random Unique ];
-       homepage = "https://github.com/caneroj1/stm-supply#readme";
        description = "STM wrapper around Control.Concurrent.Supply.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199666,7 +192380,6 @@ self: {
        version = "0.1.1";
        sha256 = "0ssr8phmm9m93kcp045jr0rcn1dxzz202cgyw1vzjl2ch55bcsy6";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/joeyadams/haskell-stm-tlist";
        description = "Mutable, singly-linked list in STM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199679,7 +192392,6 @@ self: {
        sha256 = "0m42pgnvzqadqycq0qbml5da0zw7myc24y5vka1qydz7rdfyaa24";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base haskell98 mtl stm ];
-       homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html";
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199696,7 +192408,6 @@ self: {
        testHaskellDepends = [
          base Chart Chart-cairo containers mtl random
        ];
-       homepage = "http://kevinl.io/posts/2016-08-24-sampling-monad.html";
        description = "Monadic composition of probabilistic functions and sampling";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199712,7 +192423,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring http-conduit semigroups
        ];
-       homepage = "https://github.com/dabcoder/stocks#readme";
        description = "Library for the IEX Trading API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199728,7 +192438,6 @@ self: {
        libraryHaskellDepends = [
          base conduit mime mtl resourcet stomp-queue stompl
        ];
-       homepage = "http://github.com/toschoo/mom";
        description = "Stompl Conduit Client";
        license = "LGPL";
      }) {};
@@ -199744,7 +192453,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers mime mtl split stomp-queue stompl time
        ];
-       homepage = "http://github.com/toschoo/mom";
        description = "Stompl MOM Stomp Patterns";
        license = "LGPL";
      }) {};
@@ -199762,7 +192470,6 @@ self: {
          attoparsec base bytestring conduit conduit-extra mime mtl
          network-conduit-tls split stompl time utf8-string
        ];
-       homepage = "http://github.com/toschoo/mom";
        description = "Stompl Client Library";
        license = "LGPL";
      }) {};
@@ -199778,7 +192485,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring mime split text utf8-string word8
        ];
-       homepage = "http://github.com/toschoo/mom";
        description = "Stomp Parser and Utilities";
        license = "LGPL";
      }) {};
@@ -199791,7 +192497,6 @@ self: {
        sha256 = "0q9l27cpfz5hs3ggxij0lk8p3vrgkjg1binhv2nwss4dvygdc7j6";
        libraryHaskellDepends = [ base clock transformers ];
        testHaskellDepends = [ base clock hspec ];
-       homepage = "https://github.com/debug-ito/stopwatch";
        description = "A simple stopwatch utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199803,7 +192508,6 @@ self: {
        version = "0.1";
        sha256 = "10289mf3fskfpg0jwgzyhvg4arb0hcj3r94jngb3hlbidvf8k1jg";
        libraryHaskellDepends = [ base mtl ];
-       homepage = "http://anna.fi.muni.cz/~xjanous3/gitweb/?p=storable.git;a=summary";
        description = "Storable type class for variable-sized data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199815,7 +192519,6 @@ self: {
        version = "0.2.2";
        sha256 = "01kwwkpbfjrv26vj83cd92px5qbq1bpgxj0r45534aksqhany1xb";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/cartazio/storable-complex";
        description = "Storable instance for Complex";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199844,7 +192547,6 @@ self: {
        libraryHaskellDepends = [
          base semigroups transformers utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/storable-record/";
        description = "Elegant definition of Storable instances for records";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199870,7 +192572,6 @@ self: {
        libraryHaskellDepends = [
          base base-orphans storable-record utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/storable-tuple/";
        description = "Storable instance for pairs and triples";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199894,7 +192595,6 @@ self: {
        benchmarkHaskellDepends = [
          base deepseq sample-frame unsafe utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199906,7 +192606,6 @@ self: {
        version = "0.0";
        sha256 = "1cqgfddaldxj2yig39fr2smm23nfz52dvh5grf4zr222djm7043i";
        libraryHaskellDepends = [ base carray storablevector utility-ht ];
-       homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and carray";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -199922,7 +192621,6 @@ self: {
        libraryHaskellDepends = [
          base storablevector stream-fusion utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -199975,7 +192673,6 @@ self: {
          th-reify-many th-utilities time transformers unordered-containers
          vector void
        ];
-       homepage = "https://github.com/fpco/store#readme";
        description = "Fast binary serialization";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -199991,7 +192688,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring fail ghc-prim primitive text transformers
        ];
-       homepage = "https://github.com/fpco/store#readme";
        description = "Fast and lightweight binary serialization";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -200008,7 +192704,6 @@ self: {
          base base16-bytestring bytestring Crypto hashable MissingH text
          utf8-string
        ];
-       homepage = "http://www.github.com/thinkpad20/str";
        description = "A type class to abstract between many different string types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200033,20 +192728,19 @@ self: {
          aeson aeson-pretty base bytestring containers hashable hspec
          hspec-discover lens template-haskell text unordered-containers
        ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_22_3" = callPackage
+  "stratosphere_0_23_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.22.3";
-       sha256 = "1s6zc9d1kmgqicjk2d0mqqysg3jcva0d2fcygb2zxpdbiifrfz26";
+       version = "0.23.0";
+       sha256 = "0np2rxcs0fld06ihldgmi9i61344dx64w1dz0vlfrnkrcjpkqhif";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -200057,7 +192751,6 @@ self: {
          aeson aeson-pretty base bytestring containers hashable hspec
          hspec-discover lens template-haskell text unordered-containers
        ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200098,7 +192791,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/stratux";
        description = "A library for stratux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200119,7 +192811,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/stratux-http";
        description = "A library for using HTTP with stratux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200140,7 +192831,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/stratux-types";
        description = "A library for reading JSON output from stratux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200162,7 +192852,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/tonymorris/stratux-websockets";
        description = "A library for using websockets with stratux";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200183,7 +192872,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion ghc-prim temporary vector
        ];
-       homepage = "https://github.com/githubuser/stream#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200198,7 +192886,6 @@ self: {
        revision = "1";
        editedCabalFile = "1jyb8mc99ag72y4bqxw997klrikhnxqrbacmx2ag5kmwsd1v1p12";
        libraryHaskellDepends = [ base ];
-       homepage = "http://hackage.haskell.org/trac/ghc/ticket/915";
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200213,7 +192900,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base logict ];
-       homepage = "http://github.com/sebfisch/stream-monad";
        description = "Simple, Fair and Terminating Backtracking Monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200226,7 +192912,6 @@ self: {
        version = "0.0.1";
        sha256 = "05qdnhhjqjs7cg7yvg9ryzxlw1mw3y5y55z4dy1cf5g98j01s449";
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
-       homepage = "https://github.com/wuest/haskell-streamdeck";
        description = "Control library for the Elgato Stream Deck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200245,7 +192930,6 @@ self: {
          data-accessor-transformers event-list midi midi-alsa non-negative
          random transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Programmatically edit MIDI event streams via ALSA";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200263,7 +192947,6 @@ self: {
          base containers ghc-prim mmorph mtl semigroups transformers
          transformers-base
        ];
-       homepage = "https://github.com/haskell-streaming/streaming";
        description = "an elementary streaming prelude and general stream type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200285,7 +192968,6 @@ self: {
          attoparsec base bytestring streaming streaming-bytestring tasty
          tasty-hunit
        ];
-       homepage = "https://github.com/haskell-streaming/streaming-attoparsec";
        description = "Attoparsec integration for the streaming ecosystem";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200329,7 +193011,6 @@ self: {
          base conduit deepseq gauge list-t list-transformer logict machines
          mtl pipes random streaming streamly transformers vector
        ];
-       homepage = "http://github.com/composewell/streaming-benchmarks";
        description = "Benchmarks to compare streaming packages";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200349,7 +193030,6 @@ self: {
        testHaskellDepends = [
          base binary bytestring hspec streaming streaming-bytestring
        ];
-       homepage = "https://github.com/mboes/streaming-binary#readme";
        description = "Streaming interface to binary";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200371,7 +193051,6 @@ self: {
          base bytestring smallcheck streaming tasty tasty-smallcheck
          transformers
        ];
-       homepage = "https://github.com/haskell-streaming/streaming-bytestring";
        description = "effectful byte steams, or: bytestring io done right";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200417,7 +193096,6 @@ self: {
        benchmarkHaskellDepends = [
          base blaze-builder bytestring deepseq gauge text
        ];
-       homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -200440,7 +193118,6 @@ self: {
          unix zlib
        ];
        benchmarkHaskellDepends = [ base bytestring deepseq gauge text ];
-       homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200453,8 +193130,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-concurrency";
-       version = "0.3.1.1";
-       sha256 = "1qpcplkwdw8dinhn20wwnfgqf07gzyp61lx6m6w0126hr8fq9r35";
+       version = "0.3.1.2";
+       sha256 = "0ra4svn595qx08rfg3qz2n30y6dsv2xj2kdl4s61xbhi4cmff819";
        libraryHaskellDepends = [
          base exceptions lifted-async monad-control stm streaming
          streaming-with transformers-base
@@ -200569,7 +193246,6 @@ self: {
          attoparsec base bytestring criterion pcap streaming
          streaming-bytestring streaming-utils
        ];
-       homepage = "https://github.com/fosskers/streaming-pcap";
        description = "Stream packets via libpcap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200591,7 +193267,6 @@ self: {
          streaming streaming-bytestring streaming-commons transformers
          vector
        ];
-       homepage = "http://github.com/bch29/streaming-png#readme";
        description = "Perfectly streaming PNG image decoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200615,6 +193290,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "streaming-process" = callPackage
+    ({ mkDerivation, base, bytestring, directory, exceptions, hspec
+     , lifted-async, monad-control, process, QuickCheck
+     , quickcheck-instances, streaming, streaming-bytestring
+     , streaming-commons, streaming-concurrency, streaming-with
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streaming-process";
+       version = "0.1.0.0";
+       sha256 = "0q0h48pzrq4zqwx4v6gyw6srfp8za6mxa241sl00g2pn90v0ma0j";
+       libraryHaskellDepends = [
+         base bytestring directory exceptions lifted-async monad-control
+         process streaming streaming-bytestring streaming-commons
+         streaming-concurrency streaming-with transformers transformers-base
+       ];
+       testHaskellDepends = [
+         base bytestring hspec QuickCheck quickcheck-instances streaming
+         streaming-bytestring
+       ];
+       description = "Streaming support for running system process";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "streaming-sort" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, exceptions
      , hspec, QuickCheck, streaming, streaming-binary
@@ -200651,7 +193350,6 @@ self: {
          json-stream mtl network network-simple pipes resourcet streaming
          streaming-bytestring streaming-commons transformers
        ];
-       homepage = "https://github.com/michaelt/streaming-utils";
        description = "http, attoparsec, pipes and other utilities for the streaming libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200668,7 +193366,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring bytestring-builder http-types streaming wai
        ];
-       homepage = "http://github.com/jb55/streaming-wai";
        description = "Streaming Wai utilities";
        license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ jb55 ];
@@ -200706,7 +193403,6 @@ self: {
        ];
        testHaskellDepends = [ base containers hspec ];
        benchmarkHaskellDepends = [ atomic-primops base criterion mtl ];
-       homepage = "https://github.com/composewell/streamly";
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200731,7 +193427,6 @@ self: {
          base containers exceptions hspec mtl QuickCheck random transformers
        ];
        benchmarkHaskellDepends = [ base deepseq gauge random ];
-       homepage = "https://github.com/composewell/streamly";
        description = "Beautiful Streaming, Concurrent and Reactive Composition";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200744,7 +193439,6 @@ self: {
        version = "1.6.2";
        sha256 = "1wl44n4nav4h203mzfdf1bd5nh4v23dib54lvxka1rl3zymgyvp7";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/peti/streamproc";
        description = "Stream Processer Arrow";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -200761,7 +193455,6 @@ self: {
        libraryHaskellDepends = [
          adjunctions base comonad distributive semigroupoids semigroups
        ];
-       homepage = "http://github.com/ekmett/streams/issues";
        description = "Various Haskell 2010 stream comonads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200783,7 +193476,6 @@ self: {
          mtl scientific semigroups strelka-core text text-builder time
          transformers unordered-containers url-decoders
        ];
-       homepage = "https://github.com/nikita-volkov/strelka";
        description = "A simple, flexible and composable web-router";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200802,7 +193494,6 @@ self: {
          base base-prelude bifunctors bytestring hashable mtl semigroups
          text transformers unordered-containers
        ];
-       homepage = "https://github.com/nikita-volkov/strelka-core";
        description = "Core components of \"strelka\"";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -200819,7 +193510,6 @@ self: {
          base base-prelude bytestring case-insensitive http-types
          strelka-core text unordered-containers wai warp
        ];
-       homepage = "https://github.com/nikita-volkov/strelka-wai";
        description = "WAI compatibility layer for \"strelka\"";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -200831,7 +193521,6 @@ self: {
        version = "0.3.2";
        sha256 = "08cjajqz9h47fkq98mlf3rc8n5ghbmnmgn8pfsl3bdldjdkmmlrc";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://www.cse.unsw.edu.au/~rl/code/strict.html";
        description = "Strict data types and String IO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200845,7 +193534,6 @@ self: {
        revision = "1";
        editedCabalFile = "17zgiwiahgjvdamfcffx2dj88qlks4sgrmsqancz5vayp4yf9x1g";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/minad/strict-base";
        description = "Strict versions of base data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200862,7 +193550,6 @@ self: {
          aeson base bifunctors binary deepseq ghc-prim hashable lens
          QuickCheck strict
        ];
-       homepage = "https://github.com/meiersi/strict-base-types";
        description = "Strict variants of the types provided in base";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200874,7 +193561,6 @@ self: {
        version = "0.2.4.2";
        sha256 = "0vzqhd0sqcs2ci3zw7rm3ydmc9brl2sdc8k3jq47kd9l878xanmz";
        libraryHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/ygale/strict-concurrency";
        description = "Strict concurrency abstractions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200899,7 +193585,6 @@ self: {
        testHaskellDepends = [
          base containers deepseq doctest hashable HTF vector
        ];
-       homepage = "https://github.com/agrafix/strict-data#readme";
        description = "A collection of commonly used strict data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200911,7 +193596,6 @@ self: {
        version = "0.1.1";
        sha256 = "0hx1zp99npwdp5w3q93xfidcw59lxskilmbqc80xi97d4w4h8jrb";
        libraryHaskellDepends = [ base ghc syb ];
-       homepage = "http://thoughtpolice.github.com/strict-ghc-plugin";
        description = "Compiler plugin for making Haskell strict";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200925,7 +193609,6 @@ self: {
        revision = "1";
        editedCabalFile = "0lvazdvzfaawrbj3pklc9p3q1ajfclzirpsiw84hhgn16pqy7fnz";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/cartazio/strict-identity";
        description = "Strict Identity Monad, handy for writing fast code!";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200953,7 +193636,6 @@ self: {
          array base bytestring containers deepseq hashable text
          unordered-containers vector
        ];
-       homepage = "https://github.com/pepeiborra/strict-types";
        description = "A type level predicate ranging over strict types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200966,7 +193648,6 @@ self: {
        sha256 = "1ajchh99m0bafcy0q3zvbhnzwlb5zvak5i0x97mn2sprhj1vbqds";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/oisdk/strict-writer";
        description = "A stricter writer, which uses StateT in order to avoid space leaks";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -200993,7 +193674,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "1a3azrg9ksb4kmbckjqw3krxj0app6q19ighd6k3z7xpf682qx3c";
        libraryHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/DanBurton/strictly#readme";
        description = "Combinators for strictifying functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201017,7 +193697,6 @@ self: {
        version = "0.1.7.0";
        sha256 = "1s0bj0wvwriw4516za6ar7w7zsz5mmnf1dba0ch239n27rb00nwf";
        libraryHaskellDepends = [ base bytestring tagged text ];
-       homepage = "https://github.com/string-class/string-class";
        description = "String class library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201029,7 +193708,6 @@ self: {
        version = "0.6.0.5";
        sha256 = "07ky2z5f1l5mb7r3rvyraak0bzciq4krkg5lv8g0a5vxpnzlm4cl";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/basvandijk/string-combinators";
        description = "Polymorphic functions to build and combine stringlike values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201041,7 +193719,6 @@ self: {
        version = "0.1.2";
        sha256 = "0fb04bm384rpiq7kd7v783z1sriqialvjyn0f6dg2si9dwza0ngj";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "https://github.com/Soostone/string-conv";
        description = "Standardized conversion between string types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201059,7 +193736,6 @@ self: {
          base bytestring deepseq hspec QuickCheck quickcheck-instances text
          utf8-string
        ];
-       homepage = "https://github.com/soenkehahn/string-conversions#readme";
        description = "Simplifies dealing with different types for strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201076,7 +193752,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit text utf8-string
        ];
-       homepage = "https://bitbucket.org/tdammers/string-convert";
        description = "Universal string conversions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201140,7 +193815,6 @@ self: {
          base bytestring pcre-heavy QuickCheck tasty tasty-hunit
          tasty-quickcheck text
        ];
-       homepage = "https://github.com/hiratara/hs-string-random#readme";
        description = "A library for generating random string from a regular experession";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201156,7 +193830,6 @@ self: {
        libraryHaskellDepends = [ base suffixtree ];
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "http://github.com/mwotton/string-similarity";
        description = "longest common substring";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201173,7 +193846,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
        ];
-       homepage = "https://github.com/ncaq/string-transform#readme";
        description = "simple and easy haskell string transform wrapper";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -201190,7 +193862,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-smallcheck text utf8-string
        ];
-       homepage = "https://github.com/ncaq/string-transform#readme";
        description = "simple and easy haskell string transform wrapper";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201207,7 +193878,6 @@ self: {
        libraryHaskellDepends = [
          base template-haskell type-combinators type-combinators-quote
        ];
-       homepage = "https://github.com/kylcarte/string-typelits";
        description = "Type-level Chars and Strings, with decidable equality";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201249,7 +193919,6 @@ self: {
          base bytestring QuickCheck quickcheck-instances test-framework
          test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/selectel/stringlike";
        description = "Transformations to several string-like types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201279,7 +193948,6 @@ self: {
        version = "1.1";
        sha256 = "1xz9v3w5s13yhk7iy9dw6i8s2jc6c0b1ci96dwmcq9a1n3l3ng4v";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "http://hub.darcs.net/scravy/strings";
        description = "Functions for working with strings, including Text, ByteString, etc";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -201291,7 +193959,6 @@ self: {
        version = "0.3.6.6";
        sha256 = "0jpy9xjcjdbpi3wk6mg7xwd7wfi2mma70p97v1ij5i8bj9qijpr9";
        libraryHaskellDepends = [ array base bytestring containers ];
-       homepage = "https://bitbucket.org/dafis/stringsearch";
        description = "Fast searching, splitting and replacing of ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201303,7 +193970,6 @@ self: {
        version = "0.0.7";
        sha256 = "1wp6w12bflrqcwi09y7s1crj72n4pbj8bkpwj2ia5gaqn5x56wjs";
        libraryHaskellDepends = [ base binary bytestring containers syb ];
-       homepage = "http://github.com/audreyt/stringtable-atom/";
        description = "Memoize Strings as Atoms for fast comparison and sorting, with maps and sets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201319,7 +193985,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/yulii/strio";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201336,7 +194001,6 @@ self: {
          aeson base bytestring http-conduit http-types mtl text time
          unordered-containers utf8-string
        ];
-       homepage = "https://github.com/michaelschade/hs-stripe";
        description = "A Haskell implementation of the Stripe API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201354,7 +194018,6 @@ self: {
          aeson base bytestring mtl text time transformers
          unordered-containers
        ];
-       homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -201366,7 +194029,6 @@ self: {
        version = "2.3.0";
        sha256 = "18358axxx2rkv06bh1n48hsx3bh3bj4h3xx1ma3hvv68l9cprwsm";
        libraryHaskellDepends = [ base stripe-core stripe-http-streams ];
-       homepage = "https://github.com/dmjio/stripe";
        description = "Stripe API for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -201404,7 +194066,6 @@ self: {
          aeson base bytestring free hspec hspec-core mtl random stripe-core
          text time transformers unordered-containers
        ];
-       homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Tests for Stripe API bindings for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201420,7 +194081,6 @@ self: {
        editedCabalFile = "1qbswlglkcjh4s5zqp4jzqwy6n5b0aj9drdr86rk6f3h31qjvmkv";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec mtl ];
-       homepage = "https://github.com/y-kamiya/strips-haskell#readme";
        description = "resolver using strips algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201443,7 +194103,6 @@ self: {
          http-client-tls http-types markdown-unlit template-haskell text
          time transformers
        ];
-       homepage = "https://github.com/tfausak/strive#readme";
        description = "A client for the Strava V3 API";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -201477,7 +194136,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath hlint parallel
        ];
-       homepage = "http://github.com/ekmett/structs/";
        description = "Strict GC'd imperative object-oriented programming with cheap pointers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201498,7 +194156,6 @@ self: {
          base geniplate language-haskell-extract mtl pretty QuickCheck safe
          testing-feat
        ];
-       homepage = "http://www.github.com/danr/structural-induction";
        description = "Instantiate structural induction schemas for algebraic data types";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201512,7 +194169,6 @@ self: {
        sha256 = "1sb1w8p473xb3r0pmbg265g841qx7cyg4cgc4cfbvaiym1j02rcg";
        libraryHaskellDepends = [ base mtl template-haskell ];
        testHaskellDepends = [ base HUnit mtl ];
-       homepage = "http://github.com/nboldi/structural-traversal#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201532,7 +194188,6 @@ self: {
          base data-default haskeline mtl split transformers
        ];
        executableHaskellDepends = [ base data-default mtl split ];
-       homepage = "https://github.com/erickg/structured-cli#readme";
        description = "Application library for building interactive console CLIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201551,7 +194206,6 @@ self: {
        executableHaskellDepends = [
          base descriptive ghc-prim haskell-src-exts text
        ];
-       homepage = "https://github.com/chrisdone/structured-haskell-mode";
        description = "Structured editing Emacs mode for Haskell";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -201602,7 +194256,6 @@ self: {
          array base containers criterion deepseq MonadRandom
          unordered-containers vector
        ];
-       homepage = "http://github.com/ekmett/structures";
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201664,7 +194317,6 @@ self: {
          base binary bullet bytestring containers directory elerea GLFW-b
          lambdacube-bullet lambdacube-engine mtl random vector
        ];
-       homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201692,7 +194344,6 @@ self: {
        testHaskellDepends = [
          attoparsec base snipcheck tasty tasty-ant-xml tasty-hunit
        ];
-       homepage = "https://github.com/nmattia/stutter#readme";
        description = "(Stutter Text|String)-Utterer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201749,7 +194400,6 @@ self: {
          haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
          yaml
        ];
-       homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201761,7 +194411,6 @@ self: {
        version = "0.1.3";
        sha256 = "09gacqlq3vlnsnbjjr44pjypw9v3amg8sqsxg0xwl8ricxpww774";
        libraryHaskellDepends = [ ansi-terminal base ];
-       homepage = "http://patch-tag.com/r/lucid/Stylized";
        description = "Ways to output stylized text on ANSI consoles";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201825,7 +194474,6 @@ self: {
          base test-framework test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion MonadRandom ];
-       homepage = "http://github.com/mikeizbicki/subhask";
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201870,7 +194518,6 @@ self: {
        testHaskellDepends = [
          base cmark hlint hspec template-haskell text
        ];
-       homepage = "https://github.com/dahlia/submark#readme";
        description = "Extract a part from CommonMark/Markdown docs";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201883,7 +194530,6 @@ self: {
        version = "0.0.1.2";
        sha256 = "199kslgxlhxv8zx3mj5pxgicjxyff7vzjhw13fwfxcf9pa9289nv";
        libraryHaskellDepends = [ base split ];
-       homepage = "https://github.com/gcganley/subnet";
        description = "subnetting calculator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -201902,7 +194548,6 @@ self: {
        executableHaskellDepends = [
          base bytestring cassava containers optparse-generic text vector
        ];
-       homepage = "http://github.com/GregorySchwartz/subsample#readme";
        description = "Subsample data";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -201920,7 +194565,6 @@ self: {
        testHaskellDepends = [
          attoparsec base hspec NoTrace QuickCheck text
        ];
-       homepage = "https://gitlab.com/igrep/substring-parser";
        description = "Match / replace substrings with a parser combinators";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -201932,7 +194576,6 @@ self: {
        version = "0.5";
        sha256 = "1kkr6zbnv777gnv2lwq3pyxq3vv5r24f4avwv5g4dds3y8d8mv3q";
        libraryHaskellDepends = [ attoparsec base containers text ];
-       homepage = "https://patch-tag.com/r/rubenAst/subtitleParser/home";
        description = "A parser for .srt and .sub files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201958,7 +194601,6 @@ self: {
        sha256 = "0dnwpccvm0y5cysv2w541gkjvx88v64pvjdviqaw1q5k8sx3iz9v";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "https://github.com/danielnowakowski/Subword-Graph";
        description = "Subword graph implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -201971,7 +194613,6 @@ self: {
        sha256 = "0vf5crr60nixklxndpay1lp9yvhxjzmza8g5b5gz97hkyqicaid7";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers hspec ];
-       homepage = "https://github.com/code5hot/subzero#readme";
        description = "Helps when going \"seed values\" -> alternatives and optional -> answers";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -201987,7 +194628,6 @@ self: {
        libraryHaskellDepends = [
          base monad-control mtl transformers transformers-base
        ];
-       homepage = "https://github.com/nikita-volkov/success";
        description = "A version of Either specialised for encoding of success or failure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -201999,7 +194639,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/nomeata/haskell-successors";
        description = "An applicative functor to manage successors";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -202020,7 +194659,6 @@ self: {
          array base containers tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/kadoban/suffix-array#readme";
        description = "Simple and moderately efficient suffix array implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202036,7 +194674,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base vector ];
        executableHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/VictorDenisov/suffixarray";
        description = "n log n implementation of suffix array";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202049,7 +194686,6 @@ self: {
        version = "0.2.2.1";
        sha256 = "1ddk2hp27al9jzcgkrhv7v1i7knci4l22flkgb2r94h96z5nhfq6";
        libraryHaskellDepends = [ base bytestring containers ];
-       homepage = "https://github.com/bos/suffixtree";
        description = "Efficient, lazy suffix tree implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202063,7 +194699,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
-       homepage = "http://sugarj.org";
        description = "Library-based syntactic extensibility for Haskell";
        license = "GPL";
      }) {};
@@ -202088,7 +194723,6 @@ self: {
        sha256 = "17xby0mqdsbax0afrfr3p8c6cj5r94byy8gprgyrmq84qqadls9i";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
-       homepage = "https://github.com/jdreaver/sum-type-boilerplate#readme";
        description = "Library for reducing the boilerplate involved with sum types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -202106,7 +194740,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring data-default lens serialport transformers vector
        ];
-       homepage = "http://github.com/bgamari/sump";
        description = "A Haskell interface to SUMP-compatible logic analyzers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202118,7 +194751,6 @@ self: {
        version = "0.6";
        sha256 = "09xh3pbyarflfjk17bn2isgpmsq49d6gmq7z918kf4c32fc7x6yb";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "https://github.com/bitonic/sundown";
        description = "Bindings to the sundown markdown library";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -202135,7 +194767,6 @@ self: {
          base bytestring Cabal directory old-locale process random time
          tuple
        ];
-       homepage = "http://www.github.com/massysett/sunlight";
        description = "Test Cabalized package against multiple dependency versions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202154,7 +194785,6 @@ self: {
          base Boolean containers data-default data-reify mtl operational
          semigroups tagged template-haskell transformers vector-space
        ];
-       homepage = "https://github.com/ku-fpg/sunroof-compiler";
        description = "Monadic Javascript Compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202177,7 +194807,6 @@ self: {
          process QuickCheck random semigroups shake stm sunroof-compiler
          sunroof-server
        ];
-       homepage = "https://github.com/ku-fpg/sunroof-examples";
        description = "Tests for Sunroof";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202200,7 +194829,6 @@ self: {
          transformers unordered-containers vector vector-space
          wai-middleware-static warp
        ];
-       homepage = "https://github.com/ku-fpg/sunroof-server";
        description = "Monadic Javascript Compiler - Server Utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202247,7 +194875,6 @@ self: {
        editedCabalFile = "1140dgrvc5i0dv7iqj4ykyrf3bk8dr450ihqbgglk2zmgzcb2zaz";
        libraryHaskellDepends = [ base containers mtl ];
        testHaskellDepends = [ base containers hspec ];
-       homepage = "https://github.com/bartavelle/superbubbles#readme";
        description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202265,7 +194892,6 @@ self: {
        benchmarkHaskellDepends = [
          async base buffer-builder bytestring criterion
        ];
-       homepage = "https://github.com/agrafix/superbuffer#readme";
        description = "Efficiently build a bytestring from smaller chunks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202284,7 +194910,6 @@ self: {
        libraryHaskellDepends = [
          base hosc hsc3 opensoundcontrol-ht process random transformers
        ];
-       homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
        description = "Haskell SuperCollider utilities";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202308,7 +194933,6 @@ self: {
          non-negative opensoundcontrol-ht random supercollider-ht
          transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202326,7 +194950,6 @@ self: {
          base constraints containers haskell-src-meta mtl tagged
          template-haskell type-eq
        ];
-       homepage = "http://github.com/ryantrinkle/superconstraints";
        description = "Access an instance's constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202347,7 +194970,6 @@ self: {
        executableHaskellDepends = [
          base Cabal containers directory filepath
        ];
-       homepage = "http://www.mathstat.dal.ca/~selinger/superdoc/";
        description = "Additional documentation markup and Unicode support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202374,7 +194996,6 @@ self: {
          aeson async base conduit hspec mtl QuickCheck stm temporary text
          transformers uuid vector
        ];
-       homepage = "https://github.com/agrafix/superevent#readme";
        description = "A simple opinionated event store implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202411,7 +195032,6 @@ self: {
          base containers cpphs directory filepath haskell-src-exts mtl
          process time uniplate
        ];
-       homepage = "http://community.haskell.org/~ndm/supero/";
        description = "A Supercompiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202432,7 +195052,6 @@ self: {
        benchmarkHaskellDepends = [
          aeson base bookkeeper criterion deepseq labels text
        ];
-       homepage = "https://github.com/agrafix/superrecord#readme";
        description = "Supercharged anonymous records";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202447,7 +195066,6 @@ self: {
        libraryHaskellDepends = [
          base containers exceptions monadloc mtl
        ];
-       homepage = "http://github.com/agocorona/supervisor";
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202467,7 +195085,6 @@ self: {
          QuickCheck quickcheck-instances rebase tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "https://github.com/nikita-volkov/supplemented";
        description = "Early termination for monads";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202480,7 +195097,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1nhq7lfzsbh9ra1m1n7649q35ch6l1lgm110p1qbxgvv6w6xmz41";
        libraryHaskellDepends = [ base lens mtl template-haskell ];
-       homepage = "https://github.com/gelisam/surjective";
        description = "An output coverage checker";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -202518,7 +195134,6 @@ self: {
          semigroupoids semigroups tasty tasty-hedgehog tasty-hunit text
          trifecta utf8-string validation vector
        ];
-       homepage = "https://github.com/qfpl/sv";
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202538,7 +195153,6 @@ self: {
        testHaskellDepends = [
          base bytestring cassava HUnit sv text validation vector
        ];
-       homepage = "https://github.com/qfpl/sv";
        description = "Integration to use sv with cassava's parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202554,7 +195168,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder bytestring hashable text unordered-containers
        ];
-       homepage = "https://github.com/diagrams/svg-builder.git";
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202570,7 +195183,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder bytestring hashable text unordered-containers
        ];
-       homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git";
        description = "DSL for building SVG";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202606,7 +195218,6 @@ self: {
        executableHaskellDepends = [
          base haskell98 language-c pretty svgutils syb xml
        ];
-       homepage = "http://www.informatik.uni-kiel.de/~jgr/svg2q";
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202624,7 +195235,6 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base cairo glib mtl text ];
        libraryPkgconfigDepends = [ librsvg ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs.gnome3) librsvg;};
@@ -202639,7 +195249,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base xml ];
        executableHaskellDepends = [ base filepath xml ];
-       homepage = "https://patch-tag.com/r/twistedsquare/svgutils/home";
        description = "Helper functions for dealing with SVG files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202652,7 +195261,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "19fr1lzp8j0hmqqy1hyx85gmkgxc2hy8cz5zv6jlvni0qqibiksz";
        libraryHaskellDepends = [ array base ];
-       homepage = "http://github.com/andrewdougherty/svm";
        description = "A support vector machine written in Haskell";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -202666,7 +195274,6 @@ self: {
        revision = "1";
        editedCabalFile = "1yqvr9i681wv7y4qjqmyg617sjbgcpmkhxkf2r77xh1kv0zagylv";
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
-       homepage = "http://github.com/bgamari/svm-light-utils";
        description = "Parsers and formatters for the SVMlight input file format";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202683,7 +195290,6 @@ self: {
          base binary bindings-svm bytestring containers deepseq directory
          monad-par mwc-random vector
        ];
-       homepage = "http://github.com/aleator/Simple-SVM";
        description = "Medium level, simplified, bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202703,7 +195309,6 @@ self: {
        testHaskellDepends = [
          attoparsec base bytestring directory doctest filepath zlib
        ];
-       homepage = "http://github.com/jwiegley/svndump/";
        description = "Library for reading Subversion dump files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202748,7 +195353,6 @@ self: {
          aeson base bytestring containers hspec iso8601-time mtl QuickCheck
          semigroups text time transformers unordered-containers vector
        ];
-       homepage = "https://openapi-generator.tech";
        description = "Auto-generated openapi-petstore API Client";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -202778,7 +195382,6 @@ self: {
          aeson async base bytestring directory filepath lens
          optparse-applicative random swagger2 text
        ];
-       homepage = "https://github.com/rodrigosetti/swagger-test";
        description = "Testing of Swagger APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202811,7 +195414,6 @@ self: {
          quickcheck-instances text time unordered-containers vector
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -202843,7 +195445,6 @@ self: {
          vector
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202862,7 +195463,6 @@ self: {
          parallel
        ];
        librarySystemDepends = [ tokyocabinet ];
-       homepage = "http://github.com/roman-smrz/swapper/";
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202883,7 +195483,6 @@ self: {
          attoparsec base containers fixplate mtl pretty random
          random-shuffle readline system-fileio system-filepath text
        ];
-       homepage = "http://www.swearjure.com";
        description = "Clojure without alphanumerics";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202896,7 +195495,6 @@ self: {
        version = "1.0.1";
        sha256 = "1jx5941kb97w4zpgz7m1r2x2lxllmi1i9a9nmwflinyj74xxg1rl";
        libraryHaskellDepends = [ base mtl pretty ];
-       homepage = "http://www.n-heptane.com/nhlab";
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202913,7 +195511,6 @@ self: {
        libraryHaskellDepends = [
          array base containers ghc-prim mwc-random primitive vector
        ];
-       homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Online sampler for Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202940,7 +195537,6 @@ self: {
          base containers hashable HUnit network-uri old-locale semigroups
          test-framework test-framework-hunit text time
        ];
-       homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home";
        description = "A semantic web toolkit";
        license = stdenv.lib.licenses.lgpl21;
      }) {};
@@ -202977,7 +195573,6 @@ self: {
        libraryHaskellDepends = [
          base containers polyparse text xml-types
        ];
-       homepage = "http://blog.luigiscorner.com/";
        description = "A SXML-parser";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -202990,7 +195585,6 @@ self: {
        sha256 = "1da2zz7gqm4xbkx5vpd74dayx1svaxyl145fl14mq15lbb77sxdq";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base containers HUnit mtl ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
        description = "Scrap Your Boilerplate";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203004,7 +195598,6 @@ self: {
        revision = "2";
        editedCabalFile = "1a0kb7an663vhhi4wd4hfc5235bampxcyl8g5ssajm6ggs7n7gm3";
        libraryHaskellDepends = [ base eq prelude-extras ];
-       homepage = "http://github.com/ekmett/syb-extras/";
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203053,7 +195646,6 @@ self: {
        executableHaskellDepends = [
          array base containers convertible directory mtl parsec transformers
        ];
-       homepage = "https://github.com/reactive-systems/syfco";
        description = "Synthesis Format Conversion Tool / Library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203080,7 +195672,6 @@ self: {
          base parsec smallcheck test-framework test-framework-smallcheck
          void
        ];
-       homepage = "https://github.com/lfairy/sylvia";
        description = "Lambda calculus visualization";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203094,7 +195685,6 @@ self: {
        sha256 = "0ppgdhhxn5w05194mwcsca6m853h8hh5bxsm2l3jz52y388pi0ic";
        libraryHaskellDepends = [ base containers hashable vector ];
        testHaskellDepends = [ base hashable QuickCheck ];
-       homepage = "https://github.com/akc/sym";
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203107,7 +195697,6 @@ self: {
        version = "0.3.0";
        sha256 = "1ppq86fv5knfdcfn3pfiyg7v9k1aq47xp0b6yn8bwkfhcxxmbbhp";
        libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ];
-       homepage = "http://github.com/akc/sym-plot";
        description = "Plot permutations; an addition to the sym package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203188,7 +195777,6 @@ self: {
        revision = "1";
        editedCabalFile = "01ab7600ja88wfvg9x8zmxksw44j9klmm71y9zmig7qxs1qslb25";
        libraryHaskellDepends = [ base containers deepseq ];
-       homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "A 'Symbol' type for fast symbol comparison";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203204,7 +195792,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        testSystemDepends = [ gmp gmpxx symengine ];
-       homepage = "http://github.com/symengine/symengine.hs#readme";
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203223,7 +195810,6 @@ self: {
        executableSystemDepends = [ gmp gmpxx symengine ];
        testHaskellDepends = [ base ];
        testSystemDepends = [ gmp gmpxx symengine ];
-       homepage = "http://github.com/bollu/symengine.hs#readme";
        description = "SymEngine symbolic mathematics engine for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203237,7 +195823,6 @@ self: {
        sha256 = "10q6w071fa9nyrg7kz9zil3jz7xpvp5l8ni4kddra10dp2hnwg80";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base hspec HUnit ];
-       homepage = "https://github.com/joelburget/symmetric-properties#readme";
        description = "Monoids for sameness and uniqueness";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203253,7 +195838,6 @@ self: {
        executableHaskellDepends = [
          ansi-terminal base monad-loops random
        ];
-       homepage = "https://github.com/simonmichael/symon";
        description = "Minimal implementation(s) of the classic electronic memory game";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -203303,7 +195887,6 @@ self: {
        benchmarkHaskellDepends = [
          aeson base bytestring directory filepath process temporary time
        ];
-       homepage = "https://github.com/ekarayel/sync-mht";
        description = "Fast incremental file transfer using Merkle-Hash-Trees";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203343,7 +195926,6 @@ self: {
          scientific tasty tasty-hunit tasty-quickcheck text transformers
          vector wreq
        ];
-       homepage = "https://github.com/jetho/syncthing-hs";
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203368,7 +195950,6 @@ self: {
        testHaskellDepends = [
          argparser base haskell-src-exts hpc hspec regexpr split Synt
        ];
-       homepage = "http://github.com/brentlintner/synt";
        description = "Similar code analysis";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203394,7 +195975,6 @@ self: {
          tasty-quickcheck tasty-th utf8-string
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/emilaxelsson/syntactic";
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203561,7 +196141,6 @@ self: {
          lens protolude safe split text text-format vector
        ];
        testHaskellDepends = [ aeson base cassava haskell-conll hspec ];
-       homepage = "https://github.com/mgajda/syntaxnet-haskell#readme";
        description = "Working with Google's SyntaxNet output files - CoNLL, Tree";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203584,7 +196163,6 @@ self: {
          non-negative numeric-prelude numeric-quest process QuickCheck
          random sox storable-record storablevector transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203608,7 +196186,6 @@ self: {
          synthesizer-core synthesizer-dimensional synthesizer-midi
          transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Control synthesizer effects via ALSA/MIDI";
        license = "GPL";
      }) {};
@@ -203641,7 +196218,6 @@ self: {
          array base binary bytestring directory numeric-prelude old-time
          storable-tuple storablevector timeit utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Low level part";
        license = "GPL";
      }) {};
@@ -203662,7 +196238,6 @@ self: {
          semigroups sox storable-record storablevector synthesizer-core
          transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing with static physical dimensions";
        license = "GPL";
      }) {};
@@ -203679,7 +196254,6 @@ self: {
          base containers numeric-prelude numeric-quest synthesizer-core
          transformers utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Filter networks";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203699,7 +196273,6 @@ self: {
          base event-list non-negative numeric-prelude random
          synthesizer-core transformers UniqueLogicNP utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing with dynamic physical dimensions";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203729,7 +196302,6 @@ self: {
          base llvm-extra llvm-tf numeric-prelude QuickCheck random
          storablevector synthesizer-core tfp utility-ht
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Efficient signal processing using runtime compilation";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203758,7 +196330,6 @@ self: {
          base event-list midi numeric-prelude storablevector
          synthesizer-core transformers
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Render audio signals from MIDI files or realtime messages";
        license = "GPL";
      }) {};
@@ -203771,7 +196342,6 @@ self: {
        sha256 = "00j1ss8xsnd8m0v0p9r9mampbczclzanzcli2qrxcl4j9vkp2mb7";
        libraryHaskellDepends = [ base process text ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/kkazuo/sys-auth-smbclient";
        description = "Auth with smbclient command";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -203792,7 +196362,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck template-haskell
        ];
-       homepage = "https://github.com/NICTA/sys-process";
        description = "A replacement for System.Exit and System.Process.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203806,7 +196375,6 @@ self: {
        sha256 = "0afa9nv1sf1c4w2d9ysm0ass4a48na1mb3x9ri3nb5c6s7r41ns6";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec hspec-expectations ];
-       homepage = "https://github.com/psibi/sysinfo#readme";
        description = "Haskell Interface for getting overall system statistics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203818,7 +196386,6 @@ self: {
        version = "0.1.1";
        sha256 = "1ijfry2r3cypp3zmws6dczk21m4n86fkxjld7yl19gjp46fxllbd";
        libraryHaskellDepends = [ base bytestring system-filepath text ];
-       homepage = "https://john-millikin.com/software/haskell-filesystem/";
        description = "Get argv[0] as a FilePath";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -203835,7 +196402,6 @@ self: {
          base basic-prelude directory system-filepath text
        ];
        testHaskellDepends = [ base basic-prelude chell system-filepath ];
-       homepage = "https://github.com/d12frosted/CanonicalPath";
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203855,7 +196421,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck
        ];
-       homepage = "https://github.com/tonymorris/system-command";
        description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203868,7 +196433,6 @@ self: {
        version = "1.0.0";
        sha256 = "1hig7m7arrj6hmgix8abkidy6wf1a4a4y72k81csq90kv5jhynxk";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/heroin-moose/system-error";
        description = "Error reporting functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203902,7 +196466,6 @@ self: {
          base bytestring chell system-filepath temporary text time
          transformers unix
        ];
-       homepage = "https://github.com/fpco/haskell-filesystem";
        description = "Consistent filesystem interaction across GHC versions (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -203922,7 +196485,6 @@ self: {
        testHaskellDepends = [
          base bytestring chell chell-quickcheck QuickCheck text
        ];
-       homepage = "https://github.com/fpco/haskell-filesystem";
        description = "High-level, byte-based file and directory path manipulations (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -203934,7 +196496,6 @@ self: {
        version = "0.0.2";
        sha256 = "1i718k96xvsfl9rh1x4n5ra88838wd6rzmj3p70bfkxxrsvv1zi4";
        libraryHaskellDepends = [ array base ghc-prim ];
-       homepage = "https://github.com/luzhuomi/system-gpio/";
        description = "GPIO wrapper libary for Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203947,7 +196508,6 @@ self: {
        sha256 = "1v18ds9k7vnvzghpyqkh1ixskf27cb94f9r696982h2vp373zh43";
        libraryHaskellDepends = [ attoparsec base process text ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/ChaosGroup/system-info";
        description = "Get information about CPUs, memory, etc";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -203959,7 +196519,6 @@ self: {
        version = "0.1";
        sha256 = "0ndw4vcvvf7p6nb5vn91mhbj4w9lmgm4cl0jzsks4mxs625bv4lg";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://darcs.imperialviolet.org/system-inotify";
        description = "Binding to Linux's inotify interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203982,7 +196541,6 @@ self: {
          base directory either haskell-src-meta template-haskell text time
          transformers unix
        ];
-       homepage = "https://github.com/jcristovao/system-lifted";
        description = "Lifted versions of System functions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204000,7 +196558,6 @@ self: {
          attoparsec base bytestring containers directory errors text
        ];
        testHaskellDepends = [ base hedgehog ];
-       homepage = "https://github.com/erikd/system-linux-proc";
        description = "A library for accessing the /proc filesystem in Linux";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204013,7 +196570,6 @@ self: {
        sha256 = "1mvzcnqybdv30xrpfp87l61kcdss2wgqsbgpdl2gl9nz62hyd5z5";
        libraryHaskellDepends = [ attoparsec base process text time ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/cocreature/system-locale";
        description = "Get system locales";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204052,7 +196608,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq extensible-effects vector
        ];
-       homepage = "https://github.com/wowus/system-random-effect";
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204073,7 +196628,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/ExcaliburZero/system-test-haskell";
        description = "Runs system tests of applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -204085,7 +196639,6 @@ self: {
        version = "0.2";
        sha256 = "0f5grhh6x2fbawmdk0gq1nsjz47iz8f8r2592d1l69fqddwdhc3v";
        libraryHaskellDepends = [ base time ];
-       homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
        description = "Simple library for using the system's monotonic clock";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204107,7 +196660,6 @@ self: {
          base directory easy-data either filepath hspec quickcheck-instances
          semigroups system-lifted template-haskell transformers
        ];
-       homepage = "https://github.com/jcristovao/system-util";
        description = "Various system utils lifted to EitherT";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204129,7 +196681,6 @@ self: {
          template-haskell
        ];
        librarySystemDepends = [ libossp_uuid ];
-       homepage = "http://github.com/solidsnack/system-uuid/";
        description = "Bindings to system UUID functions";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libossp_uuid;};
@@ -204144,7 +196695,6 @@ self: {
          base bytestring network transformers unix
        ];
        testHaskellDepends = [ base network unix ];
-       homepage = "https://github.com/erebe/systemd";
        description = "Systemd facilities (Socket activation, Notify)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204163,7 +196713,6 @@ self: {
          base micrologger optparse-applicative statgrab text text-format
          transformers
        ];
-       homepage = "https://github.com/githubuser/systemlog#readme";
        description = "An application that regularly logs system stats for later analysis";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204176,7 +196725,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1m5395937yyxsa1bmlfn1dxa1jr15yjhlz9s15bpwapshcd8119y";
        libraryHaskellDepends = [ base syb ];
-       homepage = "http://www.cs.indiana.edu/~adamsmd/papers/scrap_your_zippers/";
        description = "Scrap Your Zippers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204206,7 +196754,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1pnikcyczwy7x4gf35pxkmr9p8b6smqb637r1h8rc9p2hjag2kak";
        libraryHaskellDepends = [ base t3-game t3-server ];
-       homepage = "http://github.com/jxv/t3#readme";
        description = "tic-tac-toe Rexports for client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204224,7 +196771,6 @@ self: {
          aeson base bytestring containers mtl safe text vector
        ];
        testHaskellDepends = [ aeson base hspec ];
-       homepage = "http://github.com/jxv/t3#readme";
        description = "tic-tac-toe core";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204260,7 +196806,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim mtl Takusen template-haskell time
        ];
-       homepage = "not available";
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204273,7 +196818,6 @@ self: {
        version = "1.0.3";
        sha256 = "1pxh6g1xjbp37fsab3hl2ldrpnbxdnp4s7pcr3mqxv62qi9b3m2f";
        libraryHaskellDepends = [ base safe text ];
-       homepage = "https://github.com/lovasko/tabl";
        description = "Table layout";
        license = "unknown";
      }) {};
@@ -204289,7 +196833,6 @@ self: {
        executableHaskellDepends = [
          base csv optparse-applicative process split
        ];
-       homepage = "https://github.com/danchoi/table";
        description = "Simple tool to generate tables from DSV input";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204315,7 +196858,6 @@ self: {
          base data-default-class data-default-instances-base hspec HUnit
          QuickCheck
        ];
-       homepage = "https://github.com/muesli4/table-layout";
        description = "Layout text as grid or table";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204370,7 +196912,6 @@ self: {
          base containers directory doctest filepath lens transformers
          unordered-containers
        ];
-       homepage = "http://github.com/ekmett/tables/";
        description = "In-memory storage with multiple keys using lenses and traversals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204392,7 +196933,6 @@ self: {
          HTTP http-conduit http-types mtl network old-locale resourcet SHA
          time transformers utf8-string xml
        ];
-       homepage = "http://github.com/paf31/tablestorage";
        description = "Azure Table Storage REST API Wrapper";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204411,7 +196951,6 @@ self: {
        executableHaskellDepends = [
          attoparsec base comma optparse-applicative tabl text
        ];
-       homepage = "https://github.com/lovasko/tablize";
        description = "Pretty-printing of CSV files";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204457,7 +196996,6 @@ self: {
        version = "0.2.2.7";
        sha256 = "1ysgq7rrks7f98nnvxil8xz1q27hxdgz4szbjhqwzbwd209dmy0k";
        libraryHaskellDepends = [ base csv html mtl ];
-       homepage = "http://hub.darcs.net/kowey/tabular";
        description = "Two-dimensional data tables with rendering functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204494,7 +197032,6 @@ self: {
          xdg-basedir xml xml-helpers xmonad xmonad-contrib
        ];
        executableHaskellDepends = [ base hslogger optparse-applicative ];
-       homepage = "http://github.com/taffybar/taffybar";
        description = "A desktop bar similar to xmobar, but with more GUI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204507,7 +197044,6 @@ self: {
        version = "0.1.1.2";
        sha256 = "0crn1g3dh97s3b55z0pkvjm9h89kq99c2agk687vr0vij6r5di65";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "http://github.com/ekmett/tag-bits";
        description = "Provides access to the dynamic pointer tagging bits used by GHC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204524,7 +197060,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base blaze-builder bytestring enumerator
        ];
-       homepage = "http://github.com/yihuang/tag-stream";
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204550,7 +197085,6 @@ self: {
          base bytestring containers data-accessor explicit-exception
          old-time transformers utility-ht xml-basic
        ];
-       homepage = "http://code.haskell.org/~thielema/tagchup/";
        description = "alternative package for processing of tag soups";
        license = "GPL";
      }) {};
@@ -204568,7 +197102,6 @@ self: {
        libraryHaskellDepends = [
          base deepseq template-haskell transformers transformers-compat
        ];
-       homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204595,7 +197128,6 @@ self: {
        libraryHaskellDepends = [
          base exceptions mmorph mtl transformers
        ];
-       homepage = "https://github.com/trskop/tagged-exception-core";
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204608,7 +197140,6 @@ self: {
        version = "0.1.2";
        sha256 = "0402snxl1cpi7yq03aqkp036hjcrrqiy0if3c3bz6ljls7yxfvci";
        libraryHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/mrkkrp/tagged-identity";
        description = "Trivial monad transformer that allows identical monad stacks have different types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204656,7 +197187,6 @@ self: {
        libraryHaskellDepends = [
          base time transformers unordered-containers
        ];
-       homepage = "http://github.com/ucsd-progsys/tagged-timers";
        description = "Simple wrappers for timing IO actions (single-threaded)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204674,7 +197204,6 @@ self: {
          base comonad contravariant distributive exceptions mtl reflection
          semigroupoids tagged
        ];
-       homepage = "http://github.com/ekmett/tagged-transformer";
        description = "Monad transformer carrying an extra phantom type tag";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204686,7 +197215,6 @@ self: {
        version = "0.1";
        sha256 = "012lcbp2c9a38s4l2i9jaiqcxaidk93v7gxcnf9lplixrnzczy93";
        libraryHaskellDepends = [ base bytestring pcre-light ];
-       homepage = "git://github.com/jre2/HaskellTagging.git";
        description = "Library for tagging data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204715,7 +197243,6 @@ self: {
        benchmarkHaskellDepends = [
          attoparsec base criterion tagsoup text vector
        ];
-       homepage = "http://github.com/alpmestan/taggy";
        description = "Efficient and simple HTML/XML parsing library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204734,7 +197261,6 @@ self: {
        testHaskellDepends = [
          base doctest hspec lens taggy text unordered-containers
        ];
-       homepage = "http://github.com/alpmestan/taggy-lens";
        description = "Lenses for the taggy html/xml parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204780,7 +197306,6 @@ self: {
        libraryHaskellDepends = [
          base binary containers parsec text text-binary
        ];
-       homepage = "https://github.com/kawu/tagset-positional";
        description = "Positional tags and tagsets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204809,7 +197334,6 @@ self: {
        testHaskellDepends = [
          base bytestring deepseq directory process QuickCheck time
        ];
-       homepage = "https://github.com/ndmitchell/tagsoup#readme";
        description = "Parsing and extracting information from (possibly malformed) HTML/XML documents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204833,7 +197357,6 @@ self: {
          base bytestring containers data-accessor explicit-exception
          old-time tagsoup transformers utility-ht xml-basic
        ];
-       homepage = "http://code.haskell.org/~thielema/tagsoup-ht/";
        description = "alternative parser for the tagsoup package";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204851,7 +197374,6 @@ self: {
        testHaskellDepends = [
          base hspec megaparsec raw-strings-qq tagsoup
        ];
-       homepage = "https://github.com/kseo/tagsoup-megaparsec#readme";
        description = "A Tag token parser and Tag specific parsing combinators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204864,7 +197386,6 @@ self: {
        version = "0.0.8";
        sha256 = "0h62kqls8nrq5wqxbzvxav4kfn1lxc6qm5vg8dhkvqdp5z6xnkzk";
        libraryHaskellDepends = [ base parsec tagsoup ];
-       homepage = "http://www.killersmurf.com";
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204898,7 +197419,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit hspec HUnit QuickCheck resourcet text
        ];
-       homepage = "http://github.com/yihuang/tagstream-conduit";
        description = "streamlined html tag parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204914,7 +197434,6 @@ self: {
        libraryHaskellDepends = [
          base clock lens mtl parsers time trifecta wreq
        ];
-       homepage = "https://oss.xkcd.com/";
        description = "Support library to enable TAI usage on systems with time kept in UTC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204934,7 +197453,6 @@ self: {
          time vector
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/kim/tai64";
        description = "Tai64 Labels for Haskell";
        license = stdenv.lib.licenses.mpl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -204979,7 +197497,6 @@ self: {
          base bytestring hashable hslogger HUnit matrix network parsec
          random-shuffle safe
        ];
-       homepage = "http://bitbucket.org/sffubs/tak";
        description = "A library encoding the rules of Tak, and a playtak.com client.";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -204997,7 +197514,6 @@ self: {
        testHaskellDepends = [
          base HUnit matrix parsec random-shuffle tak
        ];
-       homepage = "http://bitbucket.org/sffubs/tak";
        description = "AI(s) for playing Tak on playtak.com";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -205024,7 +197540,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base mtl old-time time ];
        librarySystemDepends = [ clntsh ];
-       homepage = "https://github.com/paulrzcz/takusen-oracle.git";
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205041,7 +197556,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl pretty transformers unbound
        ];
-       homepage = "https://github.com/sweirich/tal";
        description = "An implementation of Typed Assembly Language (Morrisett, Walker, Crary, Glew)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205072,7 +197586,6 @@ self: {
          tamarin-prover-theory tamarin-prover-utils text threads time
          transformers uniplate wai warp yesod-core yesod-json yesod-static
        ];
-       homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205092,7 +197605,6 @@ self: {
          directory dlist HUnit mtl parsec process safe split syb
          tamarin-prover-utils
        ];
-       homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205115,7 +197627,6 @@ self: {
          safe syb tamarin-prover-term tamarin-prover-utils time transformers
          uniplate
        ];
-       homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205134,7 +197645,6 @@ self: {
          base base64-bytestring binary blaze-builder bytestring containers
          deepseq dlist fclabels mtl parsec pretty SHA syb time transformers
        ];
-       homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Utility library for the tamarin prover";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205147,7 +197657,6 @@ self: {
        version = "0.4.2.2";
        sha256 = "0jzx76k1bd47ag3y73xmhi7yw7abr5hk9gy95gv3y7knb6mj9cdl";
        libraryHaskellDepends = [ base containers mtl safe text ];
-       homepage = "https://bitbucket.org/tdammers/tamper/";
        description = "Blaze-style HTML templates as a Monad Transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205159,7 +197668,6 @@ self: {
        version = "1.0.0";
        sha256 = "0iqsah4l87bd25cpk575hsq5qbx506gz1ajf6fyv6pmi0sb1w2hb";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jship/tao#readme";
        description = "Type-level assertion operators";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205171,7 +197679,6 @@ self: {
        version = "1.0.0";
        sha256 = "1ch09fgj46fy5h33rcqlbkm02v8cq246bpxswxfdj8p9g1dkkpk5";
        libraryHaskellDepends = [ base tao ];
-       homepage = "https://github.com/jship/tao#readme";
        description = "Example usage of the tao package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205237,7 +197744,6 @@ self: {
          base bytestring conduit conduit-combinators containers criterion
          deepseq directory filepath hspec
        ];
-       homepage = "https://github.com/snoyberg/tar-conduit#readme";
        description = "Extract and create tar files using conduit for streaming";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205251,7 +197757,6 @@ self: {
        revision = "1";
        editedCabalFile = "1wp6vp90g19hv8r2l83ava7qxf0933gb7ni2zgyfa66vlvxvhibv";
        libraryHaskellDepends = [ base mmorph mtl ];
-       homepage = "https://github.com/DanBurton/tardis";
        description = "Bidirectional state monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205313,7 +197818,6 @@ self: {
          base brick containers directory microlens-platform microlens-th mtl
          text text-zipper vector vty
        ];
-       homepage = "https://github.com/jtdaugherty/tart/";
        description = "Terminal Art";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205371,7 +197875,6 @@ self: {
          hadoop-rpc hint hslogger hspec packman process rank1dynamic split
          temporary text transformers vector
        ];
-       homepage = "http://github.com/michaxm/task-distribution#readme";
        description = "Distributed processing of changing tasks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205407,7 +197910,6 @@ self: {
          ansi-terminal async base clock containers mtl optparse-applicative
          stm tagged unbounded-delays unix
        ];
-       homepage = "https://github.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205424,7 +197926,6 @@ self: {
          ansi-terminal async base clock containers mtl optparse-applicative
          stm tagged unbounded-delays unix
        ];
-       homepage = "https://github.com/feuerbach/tasty";
        description = "Modern and extensible testing framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205443,7 +197944,6 @@ self: {
          base containers directory filepath generic-deriving ghc-prim mtl
          stm tagged tasty transformers xml
        ];
-       homepage = "http://github.com/ocharles/tasty-ant-xml";
        description = "Render tasty output to XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205464,7 +197964,6 @@ self: {
          base directory filepath tasty tasty-hspec tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "https://github.com/minad/tasty-auto#readme";
        description = "Auto discovery for Tasty with support for ingredients and test tree generation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205477,7 +197976,6 @@ self: {
        version = "1.1.0.2";
        sha256 = "0navsbmga0zzia6v8halqm0hli8x8zs0g80zix2170a55w8k3f0h";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205489,7 +197987,6 @@ self: {
        version = "1.2.0.2";
        sha256 = "145w018mv8928g9bbp5pjwzciyfspxxqdg5grzq0mlpydkpmmgr5";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
-       homepage = "https://github.com/barrucadu/dejafu";
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205517,7 +198014,6 @@ self: {
          tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck
          tasty-smallcheck
        ];
-       homepage = "https://github.com/lwm/tasty-discover#readme";
        description = "Test discovery for the tasty framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205529,7 +198025,6 @@ self: {
        version = "0.11.1.1";
        sha256 = "1i2s809m644b7hgiblqay9j364r3fjj1rwbrahsn1pgr5q6mr6ji";
        libraryHaskellDepends = [ base tagged tasty ];
-       homepage = "http://github.com/nomeata/tasty-expected-failure";
        description = "Mark tasty tests as failure expected";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205546,7 +198041,6 @@ self: {
        testHaskellDepends = [
          base directory tasty tasty-golden tasty-hunit tasty-tap
        ];
-       homepage = "http://github.com/MichaelXavier/tasty-fail-fast#readme";
        description = "Adds the ability to fail a tasty test suite on first test failure";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205568,7 +198062,6 @@ self: {
        testHaskellDepends = [
          base directory filepath process tasty tasty-hunit temporary-rc
        ];
-       homepage = "https://github.com/feuerbach/tasty-golden";
        description = "Golden tests support for tasty";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205606,7 +198099,6 @@ self: {
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
        ];
-       homepage = "https://github.com/qfpl/tasty-hedgehog";
        description = "Integrates the hedgehog testing library with the tasty testing framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205625,7 +198117,6 @@ self: {
        testHaskellDepends = [
          base hedgehog tasty tasty-expected-failure
        ];
-       homepage = "https://github.com/qfpl/tasty-hedgehog";
        description = "Integration for tasty and hedgehog";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205645,7 +198136,6 @@ self: {
          base hspec hspec-core QuickCheck tasty tasty-quickcheck
          tasty-smallcheck
        ];
-       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
        description = "Hspec support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205663,7 +198153,6 @@ self: {
          base blaze-html bytestring containers filepath generic-deriving mtl
          stm tagged tasty text transformers
        ];
-       homepage = "http://github.com/feuerbach/tasty-html";
        description = "Render tasty output to HTML";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205675,7 +198164,6 @@ self: {
        version = "0.10.0.1";
        sha256 = "0j3hgga6c3s8h5snzivb8a75h96207ia2rlbxzj07xbf4zpkp44g";
        libraryHaskellDepends = [ base call-stack tasty ];
-       homepage = "https://github.com/feuerbach/tasty";
        description = "HUnit support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205687,7 +198175,6 @@ self: {
        version = "1.1";
        sha256 = "06rywmn6gc1qyhf65iwm6i0ysg99ygr2ghk1alkklz4ycagidyvg";
        libraryHaskellDepends = [ base HUnit tasty tasty-hunit ];
-       homepage = "https://github.com/jstolarek/tasty-hunit-adapter";
        description = "Use existing HUnit tests with tasty";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205738,7 +198225,6 @@ self: {
          base bytestring directory hlint hspec io-capture mockery tasty
          tasty-hunit unix
        ];
-       homepage = "https://github.com/IxpertaSolutions/tasty-jenkins-xml#readme";
        description = "Render tasty output to both console and XML for Jenkins";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205756,7 +198242,6 @@ self: {
        testHaskellDepends = [
          base bytestring mtl tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/vincenthz/tasty-kat";
        description = "Known Answer Tests (KAT) framework for tasty";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205774,7 +198259,6 @@ self: {
          tasty-smallcheck
        ];
        testHaskellDepends = [ base smallcheck smallcheck-laws tasty ];
-       homepage = "https://github.com/jdnavarro/tasty-laws";
        description = "Test common laws";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205792,7 +198276,6 @@ self: {
          base lens smallcheck smallcheck-lens tasty tasty-smallcheck
        ];
        testHaskellDepends = [ base lens tasty ];
-       homepage = "https://github.com/jdnavarro/tasty-lens";
        description = "Tasty TestTrees for Lens validation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205808,7 +198291,6 @@ self: {
        libraryHaskellDepends = [
          base deepseq directory filepath process tasty
        ];
-       homepage = "https://github.com/jstolarek/tasty-program";
        description = "Use tasty framework to test whether a program executes correctly";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205823,7 +198305,6 @@ self: {
        sha256 = "0wsqm4fjxnh64sjlccjapvgvw4dhl603qpxl79g3sa3fmgg0m4n5";
        libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
-       homepage = "https://github.com/feuerbach/tasty";
        description = "QuickCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205842,7 +198323,6 @@ self: {
          base optparse-applicative QuickCheck random tagged tasty
        ];
        testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
-       homepage = "https://github.com/feuerbach/tasty";
        description = "QuickCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205860,7 +198340,6 @@ self: {
          base containers mtl optparse-applicative reducers split stm tagged
          tasty transformers
        ];
-       homepage = "http://github.com/ocharles/tasty-rerun";
        description = "Run tests by filtering the test tree depending on the result of previous test runs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205884,7 +198363,6 @@ self: {
          base directory filepath process tasty tasty-hunit temporary
          transformers
        ];
-       homepage = "https://github.com/phile314/tasty-silver";
        description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205896,7 +198374,6 @@ self: {
        version = "0.8.1";
        sha256 = "1n66ngzllf3xrlqykwszlkwsi96n5nkm7xbpfq7774vpvfnafjri";
        libraryHaskellDepends = [ async base smallcheck tagged tasty ];
-       homepage = "http://documentup.com/feuerbach/tasty";
        description = "SmallCheck support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205912,7 +198389,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory process stm tagged tasty time
        ];
-       homepage = "https://github.com/minad/tasty-stats#readme";
        description = "Collect statistics of your Tasty testsuite";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -205929,7 +198405,6 @@ self: {
        testHaskellDepends = [
          base directory tasty tasty-golden tasty-hunit
        ];
-       homepage = "https://github.com/michaelxavier/tasty-tap";
        description = "TAP (Test Anything Protocol) Version 13 formatter for tasty";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205947,7 +198422,6 @@ self: {
          base haskell-src-exts tasty template-haskell
        ];
        testHaskellDepends = [ base tasty-hunit ];
-       homepage = "http://github.com/bennofs/tasty-th";
        description = "Automatic tasty test case discovery using TH";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -205960,7 +198434,6 @@ self: {
        sha256 = "05k9zddmhbcs2xf9n6ln3591cscxix7pakc42j4arw4iwrfiqp17";
        libraryHaskellDepends = [ base tasty ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/merijn/tasty-travis";
        description = "Fancy Travis CI output for tasty tests";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -205977,7 +198450,6 @@ self: {
        executableHaskellDepends = [
          array base lens-simple mtl ncurses random
        ];
-       homepage = "http://github.com/alvare/tateti-tateti#readme";
        description = "Meta tic-tac-toe ncurses game";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206006,7 +198478,6 @@ self: {
          array base binary cautious-file containers directory filepath
          IfElse monad-loops mtl random safe-failure stm-io-hooks
        ];
-       homepage = "http://darcs.monoid.at/tbox";
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206041,7 +198512,6 @@ self: {
        executableHaskellDepends = [
          base bytestring tokyocabinet-haskell utf8-string
        ];
-       homepage = "http://bitcheese.net/wiki/code/tccli";
        description = "TokyoCabinet CLI interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206058,7 +198528,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers HUnit ];
-       homepage = "http://hub.darcs.net/dino/tce-conf";
        description = "Very simple config file reading";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206077,7 +198546,6 @@ self: {
          base bytestring containers inline-c repa sdl2 vector
        ];
        librarySystemDepends = [ tcod ];
-       homepage = "https://github.com/ncrashed/tcod-haskell#readme";
        description = "Bindings to libtcod roguelike engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206101,7 +198569,6 @@ self: {
        version = "0.0.2";
        sha256 = "1wqkfnkd2di9a6h0br33fd7jaf1yqpaf7kjnpjwp52l4xv04ajlv";
        libraryHaskellDepends = [ base containers old-time ];
-       homepage = "http://www.cl.cam.ac.uk/~pes20/Netsem/";
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206125,7 +198592,6 @@ self: {
          base bytestring directory HUnit io-streams network test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/didi-FP/tcp-streams";
        description = "One stop solution for tcp client and server with tls support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206147,7 +198613,6 @@ self: {
          base bytestring HUnit io-streams network tcp-streams test-framework
          test-framework-hunit
        ];
-       homepage = "https://github.com/didi-FP/tcp-streams";
        description = "Tcp streams using openssl for tls support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206201,7 +198666,6 @@ self: {
          base base-compat binary deepseq doctest semigroups tasty
          tasty-quickcheck vector vector-algorithms
        ];
-       homepage = "https://github.com/futurice/haskell-tdigest#readme";
        description = "On-line accumulation of rank-based statistics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206225,7 +198689,6 @@ self: {
          base base-compat binary deepseq doctest semigroups tasty
          tasty-quickcheck vector vector-algorithms
        ];
-       homepage = "https://github.com/futurice/haskell-tdigest#readme";
        description = "On-line accumulation of rank-based statistics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206246,7 +198709,6 @@ self: {
          base base-compat Chart Chart-diagrams lens mwc-random statistics
          tdigest vector
        ];
-       homepage = "https://github.com/futurice/haskell-tdigest#readme";
        description = "Chart generation from tdigest";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206263,7 +198725,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring template-haskell transformers xhtml
        ];
-       homepage = "https://github.com/np/tdoc";
        description = "TDoc is a typed document builder with support for (X)HTML";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206301,7 +198762,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion protolude safe-exceptions text time
        ];
-       homepage = "https://github.com/roman/Haskell-teardown#readme";
        description = "Build composable components for your application with clear teardown semantics";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -206323,7 +198783,6 @@ self: {
        benchmarkHaskellDepends = [
          base gauge rio typed-process unliftio
        ];
-       homepage = "https://github.com/roman/Haskell-teardown#readme";
        description = "Build safe and composable teardown sub-routines for resources";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206336,7 +198795,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "0vkaf4prvyi8056mq7kmnn9h7l8z6in2272vzmr1fnchqi7xnn8c";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/expipiplus1/teeth";
        description = "Dental data types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206381,7 +198839,6 @@ self: {
          http-client-tls http-types optparse-applicative random servant
          servant-client servant-client-core text transformers utf8-string
        ];
-       homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206403,7 +198860,6 @@ self: {
        ];
        executableHaskellDepends = [ base text ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/akru/telegram-bot#readme";
        description = "Telegram Bot microframework for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206425,7 +198881,6 @@ self: {
          optparse-applicative system-filepath text turtle
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/bollu/teleport#readme";
        description = "A tool to quickly switch between directories";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206449,7 +198904,6 @@ self: {
          base bytestring pipes QuickCheck split tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       homepage = "https://github.com/andrewthad/teleshell#readme";
        description = "Telnet client and other things";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206470,7 +198924,6 @@ self: {
          base bifunctors bytestring containers http-conduit mtl network
          regex-pcre split tagsoup text time transformers
        ];
-       homepage = "https://github.com/phaazon/tellbot";
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206493,7 +198946,6 @@ self: {
          base containers directory mtl optparse-applicative
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/ChrisPenner/tempered#readme";
        description = "A dead-simple shell interpolation templating utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206516,7 +198968,6 @@ self: {
        version = "0.1.2";
        sha256 = "1fxfyfnwlw9yslbz012rygw2j5iywplybmgbaawkfq4jda7yail4";
        libraryHaskellDepends = [ base data-default template-haskell ];
-       homepage = "https://github.com/haskell-pkg-janitors/template-default";
        description = "declaring Default instances just got even easier";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206541,7 +198992,6 @@ self: {
        version = "0.1.1";
        sha256 = "1dgxfcz68h583r15vc3zmj2fchsv5v4n2v55fz2ccw6sl3kyvlp3";
        libraryHaskellDepends = [ base base-prelude template-haskell ];
-       homepage = "https://github.com/nikita-volkov/template-haskell-compat-v0208";
        description = "A backwards compatibility layer for Template Haskell newer than 2.8";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206556,7 +199006,6 @@ self: {
        libraryHaskellDepends = [
          base GenericPretty ghc-prim template-haskell
        ];
-       homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils";
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206596,7 +199045,6 @@ self: {
          aeson base bytestring containers directory mtl parsec pcre-utils
          regex-pcre-builtin scientific text unordered-containers uri-encode
        ];
-       homepage = "https://github.com/kobargh/template-toolkit";
        description = "Template Toolkit implementation for Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206609,7 +199057,6 @@ self: {
        version = "0.0.0.2";
        sha256 = "1vj856dcmnipzxkzs3y33sgkyldqirq8rz9mi6grllv6mqq6lgj2";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "https://github.com/YoshikuniJujo/template/wiki";
        description = "Process template file";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206624,7 +199071,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base mtl tagsoup uniplate ];
-       homepage = "http://github.com/xpika/templateify";
        description = "Make template from website";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206643,7 +199089,6 @@ self: {
          base binary bytestring haskell-src-meta mtl network parsec
          regex-compat regex-posix template-haskell time utf8-string
        ];
-       homepage = "https://github.com/jekor/templatepg";
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206661,7 +199106,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-attoparsec HUnit QuickCheck text
        ];
-       homepage = "https://github.com/geraud/templater";
        description = "Simple string templater";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -206683,7 +199127,6 @@ self: {
        ];
        executableHaskellDepends = [ base MissingH mtl time ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/candidtim/tempo#readme";
        description = "Command-line tool to log time-tracking information into JIRA Tempo plugin";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206701,7 +199144,6 @@ self: {
          aeson base blaze-builder bytestring containers HsOpenSSL HTTP
          http-streams io-streams mtl old-locale text time
        ];
-       homepage = "https://github.com/ixmatus/hs-tempodb";
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206720,7 +199162,6 @@ self: {
          base csound-catalog csound-expression temporal-media
          temporal-music-notation temporal-music-notation-western
        ];
-       homepage = "https://github.com/anton-k/temporal-csound";
        description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206733,7 +199174,6 @@ self: {
        version = "0.6.3";
        sha256 = "04qbbx32rs6mz5w3j7wj2hx744x858rv60hmpla3zpx2491r0qi9";
        libraryHaskellDepends = [ base Boolean ];
-       homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206747,7 +199187,6 @@ self: {
        libraryHaskellDepends = [
          base data-default temporal-media vector
        ];
-       homepage = "https://github.com/anton-k/temporal-music-notation";
        description = "music notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206763,7 +199202,6 @@ self: {
        libraryHaskellDepends = [
          base binary data-default HCodecs temporal-music-notation
        ];
-       homepage = "https://github.com/anton-k/temporal-music-notation-demo";
        description = "generates midi from score notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206775,7 +199213,6 @@ self: {
        version = "0.4.0";
        sha256 = "012pv4l5r3ijnyid7b8h1lpifjs7cf3k4a13f6773r93qfgvxpkc";
        libraryHaskellDepends = [ base temporal-music-notation ];
-       homepage = "https://github.com/anton-k/temporal-music-notation-western";
        description = "western music notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206794,7 +199231,6 @@ self: {
        testHaskellDepends = [
          base base-compat directory filepath tasty tasty-hunit unix
        ];
-       homepage = "https://github.com/feuerbach/temporary";
        description = "Portable temporary file and directory support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206813,7 +199249,6 @@ self: {
        testHaskellDepends = [
          base base-compat directory filepath tasty tasty-hunit unix
        ];
-       homepage = "https://github.com/feuerbach/temporary";
        description = "Portable temporary file and directory support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206830,7 +199265,6 @@ self: {
        libraryHaskellDepends = [
          base directory exceptions filepath transformers unix
        ];
-       homepage = "http://www.github.com/feuerbach/temporary";
        description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206849,7 +199283,6 @@ self: {
        testHaskellDepends = [
          base directory resourcet tasty tasty-hunit transformers
        ];
-       homepage = "http://www.github.com/ttuegel/temporary-resourcet";
        description = "Portable temporary files and directories with automatic deletion";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206887,7 +199320,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/kadoban/tempus-fugit";
        description = "Programmers' time tracker";
        license = stdenv.lib.licenses.agpl3;
      }) {};
@@ -206900,7 +199332,6 @@ self: {
        sha256 = "03m612xvx3p44za0g291xir89lcgm4pk885lpy3wshp0987ij1nf";
        libraryHaskellDepends = [ base ghc-prim random vector ];
        testHaskellDepends = [ base QuickCheck random ];
-       homepage = "http://noaxiom.org/tensor";
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206931,7 +199362,6 @@ self: {
          tensorflow-proto test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206953,7 +199383,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring lens-family proto-lens tensorflow text
        ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -206982,7 +199411,6 @@ self: {
          lens-family proto-lens resourcet temporary tensorflow-proto
          tensorflow-records-conduit test-framework test-framework-hunit text
        ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207001,7 +199429,6 @@ self: {
          base bytestring containers filepath lens-family mainland-pretty
          optparse-applicative proto-lens semigroups tensorflow-proto text
        ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207032,7 +199459,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion deepseq tensorflow transformers vector
        ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207046,7 +199472,6 @@ self: {
        sha256 = "06k87dvpsf8pnbb1qq5gjxpjc2sra95y1bwmsnpmlg1qn0ppi5mn";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [ base proto-lens proto-lens-protoc ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207064,7 +199489,6 @@ self: {
        testHaskellDepends = [
          base bytestring cereal test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "Encoder and decoder for the TensorFlow \"TFRecords\" format";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207082,7 +199506,6 @@ self: {
          base bytestring cereal-conduit conduit conduit-extra exceptions
          resourcet tensorflow-records
        ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "Conduit wrappers for TensorFlow.Records.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207095,7 +199518,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1z2anh5ikjpsb1sjfn290bcf5rcxsmzb0gwdk9czdnlmx3fig0ip";
        libraryHaskellDepends = [ base HUnit vector ];
-       homepage = "https://github.com/tensorflow/haskell#readme";
        description = "Some common functions for test suites";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -207113,7 +199535,6 @@ self: {
          union-find-array
        ];
        testHaskellDepends = [ base containers HUnit QuickCheck ];
-       homepage = "http://cl-informatik.uibk.ac.at/software/haskell-rewriting/";
        description = "Term Rewriting Library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207130,7 +199551,6 @@ self: {
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ c2hs ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207146,7 +199566,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base cli ];
-       homepage = "https://github.com/mdibaiee/termcolor#readme";
        description = "Composable terminal colors";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -207165,7 +199584,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/roelvandijk/terminal-progress-bar";
        description = "A simple progress bar in the terminal";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207192,7 +199610,6 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base container layered-state prologue text
        ];
-       homepage = "https://github.com/luna/terminal-text";
        description = "Text data type for styled terminal output, including all standard ANSI effects (bold, italic, blinking) and ANSI / 256 / truecolor colors support for Unix and Windows (whenever possible)";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207205,7 +199622,6 @@ self: {
        version = "0.1";
        sha256 = "1k32s5vzkxnsawj8vdscyfc96hk0s97zpj1mgw1hk93hwcrxn9wh";
        libraryHaskellDepends = [ base containers contravariant ];
-       homepage = "http://www.github.com/batterseapower/termination-combinators";
        description = "Termination combinators for forcing non-terminating algorithms to terminate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207219,7 +199635,6 @@ self: {
        sha256 = "1pfd2vdk298v23af2zqcl66xxivrzwjjpdf3dr0fa0isl70fi3hp";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ncurses ];
-       homepage = "https://github.com/judah/terminfo";
        description = "Haskell bindings to the terminfo library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207255,7 +199670,6 @@ self: {
          base brick data-default optparse-applicative process split
          time-units transformers unix vty
        ];
-       homepage = "https://github.com/jimenezrick/termplot";
        description = "Plot time series in your terminal using commands stdout";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207287,7 +199701,6 @@ self: {
        sha256 = "0gciz8nvn7x1lclzihvwy8v1c53p6frb1q32ckpmsqw7xiasqlhb";
        libraryHaskellDepends = [ base haskell98 old-time ];
        librarySystemDepends = [ terralib4c translib ];
-       homepage = "http://lucc.ess.inpe.br/doku.php?id=terrahs";
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207309,7 +199722,6 @@ self: {
        executableHaskellDepends = [
          base containers mtl process syb transformers
        ];
-       homepage = "http://mbays.freeshell.org/tersmu";
        description = "A semantic parser for lojban";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207331,7 +199743,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-discover mtl template-haskell transformers
        ];
-       homepage = "http://github.com/cjdev/test-fixture#readme";
        description = "Test monadic side-effects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207354,7 +199765,6 @@ self: {
          HUnit libxml old-locale QuickCheck random regex-posix semigroups
          time xml
        ];
-       homepage = "http://haskell.github.io/test-framework/";
        description = "Framework for running and organising tests, with HUnit and QuickCheck support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207387,7 +199797,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring filepath mtl process temporary test-framework
        ];
-       homepage = "https://github.com/feuerbach/test-framework-golden";
        description = "Golden tests support for test-framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -207404,7 +199813,6 @@ self: {
        libraryHaskellDepends = [
          base extensible-exceptions HUnit test-framework
        ];
-       homepage = "https://batterseapower.github.io/test-framework/";
        description = "HUnit support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207431,7 +199839,6 @@ self: {
        libraryHaskellDepends = [
          base deepseq extensible-exceptions QuickCheck random test-framework
        ];
-       homepage = "http://batterseapower.github.com/test-framework/";
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207450,7 +199857,6 @@ self: {
        libraryHaskellDepends = [
          base extensible-exceptions QuickCheck random test-framework
        ];
-       homepage = "http://haskell.github.io/test-framework/";
        description = "QuickCheck-2 support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207471,7 +199877,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-sandbox test-sandbox-hunit
        ];
-       homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "test-sandbox support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207506,7 +199911,6 @@ self: {
        libraryHaskellDepends = [
          base smallcheck test-framework transformers
        ];
-       homepage = "https://github.com/feuerbach/smallcheck";
        description = "Support for SmallCheck tests in test-framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207519,7 +199923,6 @@ self: {
        sha256 = "0pf07psqc4ihg0wrqqm127hd9qjbllmqw9lzf1ridg6r3xs63994";
        libraryHaskellDepends = [ base test-framework testing-feat ];
        testHaskellDepends = [ base test-framework testing-feat ];
-       homepage = "http://github.com/jfischoff/test-framework-testing-feat";
        description = "A test framework provider for testing-feat";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207536,7 +199939,6 @@ self: {
          base haskell-src-exts language-haskell-extract regex-posix
          template-haskell test-framework
        ];
-       homepage = "http://github.com/finnsson/test-generator";
        description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207567,7 +199969,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        benchmarkHaskellDepends = [ base criterion QuickCheck ];
-       homepage = "https://github.com/knupfer/test-invariant";
        description = "Provide common invariants to be checked with QuickCheck";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207607,7 +200008,6 @@ self: {
          hspec-expectations-lifted mtl process QuickCheck regex-posix
          template-haskell text transformers transformers-compat unix
        ];
-       homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "Sandbox for system tests";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207651,7 +200051,6 @@ self: {
        version = "0.1.2";
        sha256 = "0v8nfgjn46q4z5ic5vlqm240dfkk0ci90n86bb3b7nk3hvka1zpk";
        libraryHaskellDepends = [ base HUnit lifted-base test-sandbox ];
-       homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "HUnit convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207668,7 +200067,6 @@ self: {
        libraryHaskellDepends = [
          base mtl QuickCheck random test-sandbox transformers
        ];
-       homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "QuickCheck convenience functions for use with test-sandbox";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207744,8 +200142,8 @@ self: {
      }:
      mkDerivation {
        pname = "testbench";
-       version = "0.2.1.1";
-       sha256 = "0ps4q86258j41iv3xisxw3154xgxg0dmk3khc4ibr1k0dbvkr8r6";
+       version = "0.2.1.2";
+       sha256 = "1mvqvc7k9a7nwx4m1bqhsykmdc4zq3myma2b2vq7s8a88bm8w10r";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -207774,18 +200172,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "testing-feat_1_0_1_0" = callPackage
+  "testing-feat_1_1_0_0" = callPackage
     ({ mkDerivation, base, QuickCheck, size-based
      , testing-type-modifiers
      }:
      mkDerivation {
        pname = "testing-feat";
-       version = "1.0.1.0";
-       sha256 = "0f3b4q97nwgk6gdcg0475r7g15hbghdp8vh7iiw6lrp87v7w00b3";
+       version = "1.1.0.0";
+       sha256 = "1v2qzzpf1s008g7q6q67glf7vbm1pkpq4rc3ii74f4g6vhfx610r";
        libraryHaskellDepends = [
          base QuickCheck size-based testing-type-modifiers
        ];
-       homepage = "https://github.com/JonasDuregard/testing-feat";
        description = "Functional Enumeration of Algebraic Types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207816,7 +200213,6 @@ self: {
          base Cabal directory filepath fsnotify hint mtl system-filepath
          time unix
        ];
-       homepage = "http://github.com/roman/testloop";
        description = "Quick feedback loop for test suites";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207834,7 +200230,6 @@ self: {
        libraryHaskellDepends = [
          base containers HUnit mtl QuickCheck random
        ];
-       homepage = "https://github.com/jgoerzen/testpack";
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207850,7 +200245,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base filepath gtk ];
-       homepage = "http://code.haskell.org/~dons/code/testpattern";
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207881,7 +200275,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base GLUT random ];
-       homepage = "http://d.hatena.ne.jp/mokehehe/20080921/tetris";
        description = "A 2-D clone of Tetris";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -207896,7 +200289,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers deepseq parsec ];
        executableHaskellDepends = [ base containers deepseq parsec ];
-       homepage = "http://textmining.lt/tex2txt/";
        description = "LaTeX to plain-text conversion";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207918,7 +200310,6 @@ self: {
          directory extra filepath hinotify mtl optparse-applicative process
          temporary unix
        ];
-       homepage = "https://gitlab.com/xaverdh/tex-builder#texbuilder";
        description = "View your latex output while editing";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -207942,7 +200333,6 @@ self: {
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
-       homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -207965,7 +200355,6 @@ self: {
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
-       homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208011,7 +200400,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        doCheck = false;
-       homepage = "https://github.com/haskell/text";
        description = "An efficient packed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -208026,7 +200414,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring text text-format utf8-string
        ];
-       homepage = "http://github.com/aelve/text-all";
        description = "Everything Data.Text related in one package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208043,7 +200430,6 @@ self: {
          base blaze-html bytestring containers markdown text
          unordered-containers
        ];
-       homepage = "https://github.com/andersjel/haskell-text-and-plots";
        description = "EDSL to create HTML documents with plots based on the C3.js library.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208056,7 +200442,6 @@ self: {
        version = "0.2.1.1";
        sha256 = "18gl10pwg3qwsk0za3c70j4n6a9129wwf1b7d3a461h816yv55xn";
        libraryHaskellDepends = [ base binary text ];
-       homepage = "https://github.com/kawu/text-binary";
        description = "Binary instances for text types";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -208078,7 +200463,6 @@ self: {
          tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ criterion rerebase ];
-       homepage = "https://github.com/nikita-volkov/text-builder";
        description = "An efficient strict text builder";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208117,7 +200501,6 @@ self: {
          base base16-bytestring base64-bytestring bytestring errors text
        ];
        testHaskellDepends = [ base bytestring hspec hspec-discover text ];
-       homepage = "https://github.com/cjdev/text-conversions#readme";
        description = "Safe conversions between textual types";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -208134,7 +200517,6 @@ self: {
        testHaskellDepends = [
          base bytestring QuickCheck quickcheck-text text
        ];
-       homepage = "https://github.com/pliosoft/text-cp437#readme";
        description = "Conversion of Text to and from CP437";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208153,7 +200535,6 @@ self: {
          array base double-conversion ghc-prim integer-gmp old-locale text
          time transformers
        ];
-       homepage = "https://github.com/bos/text-format";
        description = "Text formatting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208202,7 +200583,6 @@ self: {
          base containers protolude QuickCheck string-conversions tasty
          tasty-hunit tasty-quickcheck time unordered-containers
        ];
-       homepage = "https://github.com/joe9/GenericPretty";
        description = "A generic, derivable, haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208224,7 +200604,6 @@ self: {
          random test-framework test-framework-hunit
          test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/bos/text-icu";
        description = "Bindings to the ICU library";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) icu;};
@@ -208248,7 +200627,6 @@ self: {
          HUnit lens parsec QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th text text-icu
        ];
-       homepage = "https://www.lambdanow.us/browser/text-icu-normalized";
        description = "Dealing with Strict Text in NFC normalization";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208284,7 +200662,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-meta json json-qq parsec template-haskell
        ];
-       homepage = "http://github.com/finnsson/text-json-qq";
        description = "Json Quasiquatation for Haskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208302,7 +200679,6 @@ self: {
          base bytestring case-insensitive data-checked hashable semigroups
          text
        ];
-       homepage = "https://github.com/mvv/text-latin1";
        description = "Latin-1 (including ASCII) utility functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208336,7 +200712,6 @@ self: {
        sha256 = "1n3h33g2yqwn4am9r693qs1wwg2ar9074zfmc535xa5yyjk64afi";
        libraryHaskellDepends = [ base extra lens text ];
        testHaskellDepends = [ base hspec lens ];
-       homepage = "https://github.com/ChrisPenner/rasa";
        description = "Lenses for operating over text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208353,7 +200728,6 @@ self: {
        libraryHaskellDepends = [
          base containers parsers text text-loc transformers
        ];
-       homepage = "https://github.com/mvv/text-lips";
        description = "Monadic parsing combinator library with attention to locations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208365,7 +200739,6 @@ self: {
        version = "0.1";
        sha256 = "069v99jnlayl2srl09355i56wpry0f6mq4bfp8lj0sxcsm1bzpgw";
        libraryHaskellDepends = [ base hashable ];
-       homepage = "https://github.com/mvv/text-loc";
        description = "Line-column locations within a text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208377,7 +200750,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1ls41s45qwrmmac8k1gryvxbhhczqy2wanwanw48m7xnbv52p9fg";
        libraryHaskellDepends = [ base bytestring bytestring-handle text ];
-       homepage = "https://github.com/exbb2/text-locale-encoding";
        description = "Encode and decode Text to/from ByteString using TextEncoding";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208391,7 +200763,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
        benchmarkHaskellDepends = [ base criterion text ];
-       homepage = "https://github.com/brendanhay/text-manipulate";
        description = "Case conversion, word boundary manipulation, and textual subjugation";
        license = "unknown";
      }) {};
@@ -208409,7 +200780,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck quickcheck-text tasty tasty-quickcheck text
        ];
-       homepage = "https://github.com/jtdaugherty/text-markup/";
        description = "A data structure for mapping metadata to text subsequences";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208428,7 +200798,6 @@ self: {
        libraryHaskellDepends = [ base containers text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
        benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
-       homepage = "https://github.com/mrkkrp/text-metrics";
        description = "Calculate various string metrics efficiently";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208445,7 +200814,6 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-instances
        ];
-       homepage = "https://github.com/joelteon/text-normal.git";
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208463,7 +200831,6 @@ self: {
          base bytestring pretty QuickCheck strict-data text util-plus
        ];
        testHaskellDepends = [ base doctest HTF text ];
-       homepage = "https://github.com/factisresearch/opensource-mono#readme";
        description = "Utils for text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208478,7 +200845,6 @@ self: {
        editedCabalFile = "1qy82sjkl92scmb2x3k662jq41plkbf8mb7b6r9p13rzbwkpbba7";
        libraryHaskellDepends = [ base regex-applicative ];
        testHaskellDepends = [ base QuickCheck regex-applicative ];
-       homepage = "http://rel4tion.org/projects/text-position/";
        description = "Handling positions in text and position-tagging it";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208496,11 +200862,27 @@ self: {
          base dlist transformers transformers-compat
        ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Parser and Printer of PostgreSQL extended types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-postgresql_0_0_3_0" = callPackage
+    ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "text-postgresql";
+       version = "0.0.3.0";
+       sha256 = "0db08ri1zixxm8vhcnijv2wpmcyv3bali30a1fx4vmb8d6c1fh35";
+       libraryHaskellDepends = [
+         base dlist transformers transformers-compat
+       ];
+       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
+       description = "Parser and Printer of PostgreSQL extended types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-printer" = callPackage
     ({ mkDerivation, base, bytestring, pretty, QuickCheck, semigroups
      , test-framework, test-framework-quickcheck2, text, text-latin1
@@ -208515,7 +200897,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
-       homepage = "https://github.com/mvv/text-printer";
        description = "Abstract interface for text builders/printers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208526,8 +200907,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-regex-replace";
-       version = "0.1.1.2";
-       sha256 = "1v6gjimq4qzldpc3ihvf0mn24n3mfk4vs87b7xzgmzk63sbpijyk";
+       version = "0.1.1.3";
+       sha256 = "0i0ifjxd24kfiljk3l0slxc8345d0rdb92ixxdzn04brs2fs5h53";
        libraryHaskellDepends = [ attoparsec base text text-icu ];
        testHaskellDepends = [
          base hspec QuickCheck smallcheck text text-icu
@@ -208548,7 +200929,6 @@ self: {
          aeson base base-unicode-symbols bytestring groups lens text
        ];
        testHaskellDepends = [ base base-unicode-symbols hspec lens text ];
-       homepage = "https://github.com/mvoidex/text-region";
        description = "Marking text regions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208565,7 +200945,6 @@ self: {
          aeson base base-unicode-symbols bytestring groups lens text
        ];
        testHaskellDepends = [ base base-unicode-symbols hspec lens text ];
-       homepage = "https://github.com/mvoidex/text-region";
        description = "Marking text regions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208578,7 +200957,6 @@ self: {
        version = "0.4.0";
        sha256 = "0g0iihfin5vjfk69r7jjw4vs3l1k3f0kkg3bbc4xqm274vd72bph";
        libraryHaskellDepends = [ base containers mtl vector ];
-       homepage = "https://github.com/acfoltzer/text-register-machine";
        description = "A Haskell implementation of the 1# Text Register Machine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208591,7 +200969,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "1p78xsr25qxmfgsl73lzfn7j32ni897667k48448fkihdsg0a15g";
        libraryHaskellDepends = [ base classy-prelude mtl parsec text ];
-       homepage = "http://github.com/thinkpad20/text-render";
        description = "A type class for rendering objects as text, pretty-printing, etc";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -208609,7 +200986,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base optparse-applicative parsec ];
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
-       homepage = "https://github.com/chris-martin/text-replace";
        description = "Simple text replacements from a list of search/replace pairs";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -208669,7 +201045,6 @@ self: {
          ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
          template-haskell text th-lift transformers transformers-compat void
        ];
-       homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208709,7 +201084,6 @@ self: {
          tagged template-haskell text th-lift transformers
          transformers-compat void
        ];
-       homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208744,7 +201118,6 @@ self: {
          unordered-containers vector xhtml
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208781,7 +201154,6 @@ self: {
          transformers-compat unix unordered-containers vector xhtml
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208799,7 +201171,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base bytestring deepseq hspec text ];
        benchmarkHaskellDepends = [ base bytestring criterion text ];
-       homepage = "http://github.com/fpco/text-stream-decode";
        description = "Streaming decoding functions for UTF encodings. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -208816,7 +201187,6 @@ self: {
        testHaskellDepends = [
          attoparsec base Cabal formatting hspec QuickCheck text time
        ];
-       homepage = "https://github.com/klangner/text-time";
        description = "Library for Time parsing from Text into UTCTime";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208835,7 +201205,6 @@ self: {
          base bytestring quickcheck-instances tasty tasty-hunit
          tasty-quickcheck text
        ];
-       homepage = "https://github.com/dpwright/text-utf7";
        description = "UTF-7 encoding/decoding for Data.Text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208858,7 +201227,6 @@ self: {
          integer-gmp QuickCheck quickcheck-unicode random test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/text-utf8";
        description = "An efficient packed UTF-8 backed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -208871,7 +201239,6 @@ self: {
        sha256 = "0qi64qznipg43x39ah3cnv6l8axj7az2fplcm6jr6xch52yf1dk3";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base HTF text ];
-       homepage = "https://github.com/agrafix/text-utils#readme";
        description = "Various text utilities";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -208888,7 +201255,6 @@ self: {
          base bytestring containers haskell98 mtl not-in-base split syb
          template-haskell xml
        ];
-       homepage = "http://github.com/finnsson/Text.XML.Generic";
        description = "Serialize Data to XML (strings)";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208901,7 +201267,6 @@ self: {
        version = "0.1";
        sha256 = "0311in43n89bk1fg4y9qglvbbl47ygvcvr0f7zpr8bpaqbb1ard5";
        libraryHaskellDepends = [ base parsec template-haskell xml ];
-       homepage = "http://www.github.com/finnsson/text-xml-qq";
        description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208916,7 +201281,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq text vector ];
        testHaskellDepends = [ base hspec QuickCheck text ];
-       homepage = "https://github.com/jtdaugherty/text-zipper/";
        description = "A text editor zipper library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208929,7 +201293,6 @@ self: {
        sha256 = "0dcv715lfwvknyllb7p18gllay4258lsg6wsdjlpy5j6f24x0ac6";
        libraryHaskellDepends = [ base mtl text-zipper ];
        testHaskellDepends = [ base hspec text-zipper ];
-       homepage = "https://github.com/kseo/text-zipper-monad#readme";
        description = "Monadic interface to the text-zipper package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -208947,7 +201310,6 @@ self: {
        testHaskellDepends = [
          base HUnit lens QuickCheck semigroups text
        ];
-       homepage = "https://github.com/qfpl/text1";
        description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208975,7 +201337,6 @@ self: {
          aeson base bytestring http-client http-client-tls http-conduit text
          unix-time
        ];
-       homepage = "https://github.com/just-chow/textlocal";
        description = "Haskell wrapper for textlocal SMS gateway";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -208989,7 +201350,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskell98 process ];
-       homepage = "https://github.com/spockz/Haskell-Code-Completion-for-TextMate";
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209011,7 +201371,6 @@ self: {
          aeson base bytestring conduit http-conduit http-types resourcet
          tasty tasty-hunit text transformers
        ];
-       homepage = "https://github.com/gltronred/textocat-api-haskell";
        description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209035,7 +201394,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0facdj7h789pz7ll43wdkfn6zs6d4q1ns61wq64d2gixwi2fq06y";
        libraryHaskellDepends = [ base bytestring text utf8-string ];
-       homepage = "https://sealgram.com/git/haskell/text-like/";
        description = "Textual type class for data that represent text";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209060,7 +201418,6 @@ self: {
        sha256 = "1njccng7gj8za3ywjydphw054nx6grmgnfzwmwj89xwirf8710cs";
        libraryHaskellDepends = [ base utility-ht ];
        testHaskellDepends = [ base QuickCheck ];
-       homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Type-level integers, booleans, lists using type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209072,7 +201429,6 @@ self: {
        version = "0.8";
        sha256 = "139dcwvik8yfpl3i71ddjml1xn126qrx1mbxa4mcwfm6q81fvkzm";
        libraryHaskellDepends = [ base template-haskell tfp ];
-       homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Template-Haskell code for tfp";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209098,7 +201454,6 @@ self: {
        testHaskellDepends = [
          base hslogger mtl network QuickCheck transformers
        ];
-       homepage = "http://github.com/sheyll/tftp";
        description = "A library for building tftp servers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209128,7 +201483,6 @@ self: {
          base containers ghc-prim template-haskell
        ];
        testHaskellDepends = [ base containers template-haskell ];
-       homepage = "https://github.com/glguy/th-abstraction";
        description = "Nicer interface for reified information about data types";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -209148,7 +201502,6 @@ self: {
        testHaskellDepends = [
          base derive tasty tasty-hunit tasty-quickcheck template-haskell
        ];
-       homepage = "https://github.com/jkarni/th-alpha";
        description = "Alpha equivalence for TH Exp";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209161,7 +201514,6 @@ self: {
        version = "0.4.0.0";
        sha256 = "0f16cgwkmqhkm5nxyic0f56swzm96yqmagmbh7vjd203mn9zv9z6";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/DanielSchuessler/th-build";
        description = "More convenient construction of TH ASTs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209175,7 +201527,6 @@ self: {
        sha256 = "0gv5p5359jmpd9zxsrc8zw2hkpjj9y4fzd61c0bs9ax8nw6v9akc";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
-       homepage = "https://github/junjihashimoto/th-cas";
        description = "Compile-time CAS(Computer Algebra System)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -209210,7 +201561,6 @@ self: {
          ghc-prim hspec hspec-core lens mtl mtl-unleashed syb
          template-haskell text th-desugar th-orphans th-reify-many
        ];
-       homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209245,7 +201595,6 @@ self: {
          base containers hspec HUnit mtl syb template-haskell th-expand-syns
          th-lift th-orphans
        ];
-       homepage = "https://github.com/goldfirere/th-desugar";
        description = "Functions to desugar Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209268,7 +201617,6 @@ self: {
          base containers hspec HUnit mtl syb template-haskell th-expand-syns
          th-lift th-orphans
        ];
-       homepage = "https://github.com/goldfirere/th-desugar";
        description = "Functions to desugar Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209281,7 +201629,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1dmkj8is73mwngy1dw3ba34744whqj0jc243bjnkyrrwkbwn55ih";
        libraryHaskellDepends = [ base constraints template-haskell ];
-       homepage = "http://github.com/isovector/th-dict-discovery/";
        description = "Automatically discover available dictionaries at compile time";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209295,7 +201642,6 @@ self: {
        sha256 = "01prlvh3py5hq5ccjidfyp9ixq2zd88dkbsidyjrpkja6v8m43yc";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/DanielSchuessler/th-expand-syns";
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209307,7 +201653,6 @@ self: {
        version = "0.0.0.4";
        sha256 = "1vgvqgfm2lvx6v5r2mglwyl63647c9n6b9a5ikqc93pjm98g9vwg";
        libraryHaskellDepends = [ base syb template-haskell ];
-       homepage = "https://github.com/mokus0/th-extras";
        description = "A grab bag of functions for use with Template Haskell";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -209319,7 +201664,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "10n1aw74xi5gzs1847dhiv6yjxcz99idw91hvf34zhhs8hp8zf2z";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://code.haskell.org/~mokus/th-fold";
        description = "TH fold generator";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209337,7 +201681,6 @@ self: {
          base Earley haskell-src-meta template-haskell text
        ];
        testHaskellDepends = [ base tasty tasty-hunit text ];
-       homepage = "https://github.com/mtesseract/th-format#readme";
        description = "Template Haskell based support for format strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209349,7 +201692,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "09xxfgyy56284cd2fry8pshlpawva4yq1k6bhza5samn694yinkq";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/tolysz/inline-io-action";
        description = "Simple inline IO action into compiled code using TH";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209370,7 +201712,6 @@ self: {
          base containers HTF list-extras loch-th placeholders
          template-haskell th-expand-syns
        ];
-       homepage = "https://github.com/nikita-volkov/th-instance-reification";
        description = "Fixed versions of instances reification functions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209411,7 +201752,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl template-haskell th-orphans
        ];
-       homepage = "https://github.com/ddssff/th-kinds";
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209443,7 +201783,6 @@ self: {
          base ghc-prim template-haskell th-abstraction
        ];
        testHaskellDepends = [ base ghc-prim template-haskell ];
-       homepage = "http://github.com/mboes/th-lift";
        description = "Derive Template Haskell's Lift class for datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209462,7 +201801,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers QuickCheck template-haskell text vector
        ];
-       homepage = "http://github.com/bennofs/th-lift-instances/";
        description = "Lift instances for template-haskell for common data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209475,7 +201813,6 @@ self: {
        sha256 = "1r9qwj3aw5adxzgxb1kgr9s1scrqclf4jfmlhv8nz1dhbqwg84h1";
        libraryHaskellDepends = [ base template-haskell time ];
        testHaskellDepends = [ base markdown-unlit ];
-       homepage = "https://github.com/dzhus/th-nowq#readme";
        description = "Template Haskell splice that expands to current time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209527,7 +201864,6 @@ self: {
          base bytestring hspec HUnit QuickCheck template-haskell text
        ];
        benchmarkHaskellDepends = [ base criterion text ];
-       homepage = "https://github.com/pikajude/th-printf";
        description = "Compile-time printf";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -209539,7 +201875,6 @@ self: {
        version = "0.0.1.4";
        sha256 = "08lal845ixcw62skw2rsi98y9v3dgj7bq4ygmlxm6k3lfgd9v7q8";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/khibino/haskell-th-reify-compat/";
        description = "Compatibility for the result type of TH reify";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209556,7 +201891,6 @@ self: {
          base containers mtl safe template-haskell th-expand-syns
        ];
        testHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/mgsloan/th-reify-many";
        description = "Recurseively reify template haskell datatype info";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209580,7 +201914,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0jmajcnw832df503jbg2fmrmnskc43i07214vpc4fw359cgd7yn3";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "https://gitlab.com/igrep/th-strict-compat";
        description = "Compatibility shim for Bang and Strict in Template Haskell";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -209593,7 +201926,6 @@ self: {
        sha256 = "09aqjrvgarygcbry01f6kmwbf7lzsbravmwz4277jdzdhwwj2zw6";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base hspec template-haskell ];
-       homepage = "https://github.com/lexi-lambda/th-to-exp#readme";
        description = "Provides a way to persist data from compile-time to runtime";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -209605,7 +201937,6 @@ self: {
        version = "0.0.1.0";
        sha256 = "1hmhpcxg0hhqhb8qmqqi9x8jb4h8a6045k0q8162mm0vl47s4rz2";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
-       homepage = "https://github.com/konn/th-traced";
        description = "Tracing Q monad computation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209634,7 +201965,6 @@ self: {
        testHaskellDepends = [
          aeson base HUnit network-uri syb template-haskell th-lift
        ];
-       homepage = "https://github.com/seereason/th-typegraph";
        description = "Graph of the subtype relation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209656,7 +201986,6 @@ self: {
          base bytestring containers directory filepath hspec primitive syb
          template-haskell text th-orphans vector
        ];
-       homepage = "https://github.com/fpco/th-utilities#readme";
        description = "Collection of useful functions for use with Template Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -209679,7 +202008,6 @@ self: {
        testHaskellDepends = [
          base Cabal containers directory filepath hspec
        ];
-       homepage = "https://github.com/y-taka-23/thank-you-stars#readme";
        description = "Give your dependencies stars on GitHub!";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209696,7 +202024,6 @@ self: {
        libraryHaskellDepends = [
          base base-prelude contravariant semigroups slave-thread unagi-chan
        ];
-       homepage = "https://github.com/nikita-volkov/theatre";
        description = "Minimalistic actor library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209723,7 +202050,6 @@ self: {
        testHaskellDepends = [
          base bytestring tasty tasty-hunit text time
        ];
-       homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209746,7 +202072,6 @@ self: {
          base configurator directory either errors filepath
          optparse-applicative text transformers transformers-compat
        ];
-       homepage = "http://github.com/bennofs/themplate/";
        description = "Project templating tool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209772,7 +202097,6 @@ self: {
          base cookie hspec hspec-wai http-types servant-server transformers
          vault wai wai-extra wai-session
        ];
-       homepage = "https://github.com/liqd/thentos";
        description = "All-in-one session handling for servant-based frontends";
        license = "AGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209827,7 +202151,6 @@ self: {
          quickcheck-instances tasty tasty-quickcheck transformers
          unordered-containers vector
        ];
-       homepage = "https://github.com/isomorphism/these";
        description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209839,7 +202162,6 @@ self: {
        version = "0.999";
        sha256 = "0z3cqjcf6xr0z7g3s1jszcs39w43sl0793gl0qm3dklbginqbcnn";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "http://bitbucket.org/alinabi/thespian";
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209851,7 +202173,6 @@ self: {
        version = "1.0.1";
        sha256 = "0m9k1b75ja5a6vq7jdqzsbqjc4fh1kzy29rzss08ph6700bm6z8f";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/hijarian/theta-functions";
        description = "Theta-functions implemented as trigonometric series";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -209866,7 +202187,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base pretty ];
-       homepage = "http://web.cecs.pdx.edu/~mpj/thih/";
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209886,7 +202206,6 @@ self: {
        executableHaskellDepends = [
          base edit-distance parseargs phonetic-code sqlite
        ];
-       homepage = "http://wiki.cs.pdx.edu/bartforge/thimk";
        description = "Command-line spelling word suggestion tool";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209906,7 +202225,6 @@ self: {
          base bifunctors containers contravariant mtl profunctors random
          template-haskell
        ];
-       homepage = "https://github.com/Kinokkory/Thorn";
        description = "Datatype Manipulation with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -209920,7 +202238,6 @@ self: {
        sha256 = "064s46pg3l015lp4zvz9kj0yki48hvwqccfjxqs52jz5pd9rd1z8";
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ base containers hspec stm ];
-       homepage = "https://github.com/nshimaza/thread-hierarchy#readme";
        description = "Simple Haskel thread management in hierarchical manner";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -209934,7 +202251,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ atomic-primops base ];
        benchmarkHaskellDepends = [ atomic-primops base criterion ];
-       homepage = "https://github.com/rrnewton/thread-local-storage";
        description = "Several options for thread-local-storage (TLS) in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209948,7 +202264,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process ];
-       homepage = "http://bjaress.blogspot.com/";
        description = "Runs other programs in the manner of a thread pool";
        license = "GPL";
      }) {};
@@ -209977,7 +202292,6 @@ self: {
        testHaskellDepends = [
          base concurrent-extra HUnit stm test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/basvandijk/threads";
        description = "Fork threads and wait for their result";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210045,7 +202359,6 @@ self: {
          filepath ghc-events glib gtk mtl pango template-haskell temporary
          text time unix
        ];
-       homepage = "http://www.haskell.org/haskellwiki/ThreadScope";
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210063,7 +202376,6 @@ self: {
          array base bytestring cereal crypto-api data-default entropy random
          tagged
        ];
-       homepage = "http://github.com/valderman/threefish";
        description = "The Threefish block cipher and the Skein hash function for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210082,7 +202394,6 @@ self: {
          base bifunctors casing containers generics-sop profunctors text
          threepenny-gui
        ];
-       homepage = "https://github.com/pepeiborra/threepenny-editors";
        description = "Composable algebraic editors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210107,7 +202418,6 @@ self: {
          snap-server stm template-haskell text transformers
          unordered-containers vault vector websockets websockets-snap
        ];
-       homepage = "http://wiki.haskell.org/Threepenny-gui";
        description = "GUI framework that uses the web browser as a display";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210122,7 +202432,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base threepenny-gui ];
        executableHaskellDepends = [ base threepenny-gui ];
-       homepage = "https://github.com/barischj/threepenny-gui-contextmenu#readme";
        description = "Write simple nested context menus for threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210138,7 +202447,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base clay text threepenny-gui ];
        executableHaskellDepends = [ base threepenny-gui ];
-       homepage = "https://github.com/barischj/threepenny-gui-flexbox";
        description = "Flexbox layouts for Threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210161,7 +202469,6 @@ self: {
        testHaskellDepends = [
          base bytestring hspec QuickCheck unordered-containers
        ];
-       homepage = "http://thrift.apache.org";
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210174,7 +202481,6 @@ self: {
        version = "0.3.0.2";
        sha256 = "01y4s5mpk7d0y878fr40j9k19dryj37am9g86v2s9lr5d0q2nnqp";
        libraryHaskellDepends = [ base ];
-       homepage = "http://heisenbug.blogspot.com/search/label/thrist";
        description = "Type-threaded list";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210203,7 +202509,6 @@ self: {
          async base bytestring clock HUnit say stm stm-chans test-framework
          test-framework-hunit text
        ];
-       homepage = "https://github.com/mtesseract/throttle-io-stream#readme";
        description = "Throttler between arbitrary IO producer and consumer functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210216,7 +202521,6 @@ self: {
        sha256 = "031mf4fwvqfnlazz0ypjs2bn2245xqb3i5k3k8mmm429grflwa6m";
        libraryHaskellDepends = [ base natural-numbers time ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/AxialExchange/haskell-throttled-io-loop#readme";
        description = "Loop over an action but throttle it to a certain rate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210231,7 +202535,6 @@ self: {
        revision = "3";
        editedCabalFile = "1gia9j7zq3g74kqvkzwp68d690nhddix1kpmj23d5a3zns3rxasn";
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
-       homepage = "https://www.github.com/bergmark/through-text";
        description = "Convert textual types through Text without needing O(n^2) instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210249,7 +202552,6 @@ self: {
          base doctest either safe-exceptions silently tasty tasty-discover
          tasty-hunit text
        ];
-       homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md";
        description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210262,7 +202564,6 @@ self: {
        version = "0.8.0";
        sha256 = "1ms7pzw4lrpkpv6sb0l7jvw5a0n5j7fc9wyi28bq7ik22d4sc8kd";
        libraryHaskellDepends = [ base bytestring gd ];
-       homepage = "https://github.com/cutsea110/thumbnail";
        description = "generate thumbnail image";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210284,7 +202585,6 @@ self: {
          base conduit conduit-extra data-default directory hspec resourcet
          transformers
        ];
-       homepage = "https://github.com/prowdsponsor/thumbnail-plus";
        description = "Generate thumbnails easily and safely";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210316,7 +202616,6 @@ self: {
          base criterion mtl old-locale profunctors QuickCheck random time
          vector vector-space
        ];
-       homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210354,7 +202653,6 @@ self: {
          tasty-quickcheck text transformers unordered-containers utf8-string
          vector xdg-basedir
        ];
-       homepage = "https://github.com/koterpillar/tianbar";
        description = "A desktop bar based on WebKit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210376,7 +202674,6 @@ self: {
        testHaskellDepends = [
          base hspec hspec-megaparsec megaparsec text
        ];
-       homepage = "https://github.com/vmchale/tibetan-utils#readme";
        description = "Parse and display tibetan numerals";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210392,7 +202689,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base glade gtk haskell98 ];
-       homepage = "http://ecks.homeunix.net";
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210410,7 +202706,6 @@ self: {
        editedCabalFile = "1d1zj1x0plk3s0jy8ps6mwx94rg82smcmjzb85fwv7dy2dhrkzg7";
        libraryHaskellDepends = [ async base safe-exceptions ];
        testHaskellDepends = [ async base deepseq doctest Glob hspec ];
-       homepage = "https://github.com/syocy/ticker-hs";
        description = "A concurrent utility inspired by Ticker in golang";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210431,7 +202726,6 @@ self: {
        testHaskellDepends = [
          base checkers lens QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://github.com/qfpl/tickle";
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210444,7 +202738,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0xpfcabhlpnp883jb23sjcilan1cwwykvvlqvc6qzhda63fcyqp1";
        libraryHaskellDepends = [ base tuples-homogenous-h98 vector ];
-       homepage = "https://github.com/ryo0ka/tictactoe3d";
        description = "3D Tic-Tac-Toe game";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210464,7 +202757,6 @@ self: {
          parsec safe semigroups text time websockets
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "http://tidalcycles.org/";
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -210480,7 +202772,6 @@ self: {
        libraryHaskellDepends = [
          base containers PortMidi tidal time transformers
        ];
-       homepage = "http://tidal.lurk.org/";
        description = "MIDI support for tidal";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -210494,7 +202785,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers serialport tidal
        ];
-       homepage = "http://tidalcycles.org/";
        description = "Serial support for tidal";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210507,7 +202797,6 @@ self: {
        version = "0.9.3";
        sha256 = "1sj17czyzpfrq0a8kalr170dw1zcphix0dnhdf6ggryskb1wswdp";
        libraryHaskellDepends = [ base cairo colour tidal ];
-       homepage = "http://yaxu.org/tidal/";
        description = "Visual rendering for Tidal patterns";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -210519,7 +202808,6 @@ self: {
        version = "0.2";
        sha256 = "1iksr5h6cyyl88z35fbaskriv4vhc1696d3i1i3c171c0vq0hwg4";
        libraryHaskellDepends = [ base containers mtl recursion-schemes ];
-       homepage = "https://github.com/ppetr/tie-knot";
        description = "\"Ties the knot\" on a given set of structures that reference each other by keys";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210532,7 +202820,6 @@ self: {
        version = "0.0.1.1";
        sha256 = "13jazsgjs95hykshjsvjx05hdhj5jcl85sqhci4hmjhyivplxc58";
        libraryHaskellDepends = [ base deepseq time ];
-       homepage = "http://github.com/HaskVan/tiempo";
        description = "Specify time intervals in different units (secs, mins, hours, etc.)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210550,7 +202837,6 @@ self: {
        executableHaskellDepends = [
          array base containers uuagc uuagc-cabal uulib
        ];
-       homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210596,7 +202882,6 @@ self: {
          base bytestring handle-like monads-tf old-locale papillon
          simple-pipe time
        ];
-       homepage = "https://github.com/YoshikuniJujo/tighttp/wiki";
        description = "Tiny and Incrementally-Growing HTTP library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210610,7 +202895,6 @@ self: {
        sha256 = "1w35rhrpjs39xbcg2i635jxdkbp4nhkzrrnl9p3bz85yc1iiiv8m";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/caneroj1/tile#readme";
        description = "Slippy map tile functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210622,7 +202906,6 @@ self: {
        version = "0.1";
        sha256 = "03a9bc4zbfb3c0dd75rxj7h9pj3sc23l9a9gmabcww5nsx8kpjys";
        libraryHaskellDepends = [ base ];
-       homepage = "https://gitorious.org/tilings";
        description = "substitution tilings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210642,7 +202925,6 @@ self: {
          array base binary bytestring bzlib filepath haskell98 mtl pretty
        ];
        executableToolDepends = [ happy ];
-       homepage = "http://www.timber-lang.org";
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210661,7 +202943,6 @@ self: {
          base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck
          unix
        ];
-       homepage = "https://github.com/haskell/time";
        description = "A time library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210678,7 +202959,6 @@ self: {
        libraryHaskellDepends = [
          auto-update base text time time-units transformers
        ];
-       homepage = "http://rel4tion.org/projects/time-cache";
        description = "Cache current time and formatted time text";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -210690,7 +202970,6 @@ self: {
        version = "0.1.0.3";
        sha256 = "0zqgzr8yjn36rn6gflwh5s0c92vl44xzxiw0jz8d5h0h8lhi21sr";
        libraryHaskellDepends = [ base old-time time ];
-       homepage = "http://hub.darcs.net/dag/time-compat";
        description = "Compatibility with old-time for the time package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210702,7 +202981,6 @@ self: {
        version = "1.1.4";
        sha256 = "1k9adm922l431gyk8figx5df1n2xk5awir2fpijnvvyphrwk5p3l";
        libraryHaskellDepends = [ base time ];
-       homepage = "http://semantic.org/TimeLib/";
        description = "Data instances for the time package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210725,7 +203003,6 @@ self: {
          attoparsec base bindings-DSL deepseq HUnit ieee754 lens-simple mtl
          old-locale QuickCheck random text time tz
        ];
-       homepage = "https://github.com/enzoh/time-exts";
        description = "Yet another time library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210749,7 +203026,6 @@ self: {
          blaze-textual bytestring convertible-text data-default failure
          QuickCheck tagged time
        ];
-       homepage = "http://cielonegro.org/HTTPDateTime.html";
        description = "Parse and format HTTP/1.1 Date and Time strings";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210762,7 +203038,6 @@ self: {
        version = "0.1.1";
        sha256 = "097yab0j9dpplq65a9x6liisdrakag6azmylis4yxv2zlg1f2wrl";
        libraryHaskellDepends = [ base time-units ];
-       homepage = "http://hub.darcs.net/fr33domlover/time-interval";
        description = "Use a time unit class, but hold a concrete time type";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -210786,7 +203061,6 @@ self: {
        version = "0.4.0.2";
        sha256 = "07nh97x1mx5hc48xqv3gk3cgls6xpb829h3bzsjx8rwqnzybijyq";
        libraryHaskellDepends = [ base data-lens-light time ];
-       homepage = "https://github.com/feuerbach/time-lens";
        description = "Lens-based interface to Data.Time data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210798,7 +203072,6 @@ self: {
        version = "0.1.1.4";
        sha256 = "0qmyxf8nz0q6brvplc4s2wsb1bbpq7kb65b69m503g9bgranblgj";
        libraryHaskellDepends = [ base old-locale time ];
-       homepage = "https://github.com/khibino/haskell-time-locale-compat";
        description = "Compatibile module for time-format locale";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210810,7 +203083,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "0xhbfdzrlhj3096w2dgk2ijpzs4kzym11sz3r0h8r19a3jrjs1ln";
        libraryHaskellDepends = [ base time ];
-       homepage = "https://github.com/tungd/time-locale-vietnamese#readme";
        description = "Vietnamese locale for date and time format";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -210823,7 +203095,6 @@ self: {
        sha256 = "1nz14g7n4igy46gkw3xvksmi062vxkbbmp8q5hbjky2x7jnc8h8j";
        libraryHaskellDepends = [ base mtl time tz ];
        testHaskellDepends = [ base hspec HUnit mtl time tz ];
-       homepage = "https://github.com/y-taka-23/time-machine#readme";
        description = "A library to mock the current time";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210842,7 +203113,6 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base time-units transformers ];
-       homepage = "http://hub.darcs.net/fr33domlover/time-out";
        description = "Timers, timeouts, alarms, monadic wrappers";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -210862,7 +203132,6 @@ self: {
          attoparsec base bifunctors parsec parsers tasty tasty-hunit
          template-haskell text time
        ];
-       homepage = "https://github.com/phadej/time-parsers#readme";
        description = "Parsers for types in `time`";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210875,7 +203144,6 @@ self: {
        version = "0.1.4.2";
        sha256 = "1xh50plr6dk21cpc3mqcq00xakhm7zvnsgwbi0hyk1prgr408asl";
        libraryHaskellDepends = [ base intervals time ];
-       homepage = "https://github.com/j-mueller/time-patterns";
        description = "Patterns for recurring events";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210893,11 +203161,26 @@ self: {
          base template-haskell time time-locale-compat
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/christian-marie/time-qq";
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "time-quote" = callPackage
+    ({ mkDerivation, base, doctest, doctest-discover, template-haskell
+     , time
+     }:
+     mkDerivation {
+       pname = "time-quote";
+       version = "1.9.0.0";
+       sha256 = "0yppmprksy2c28rnswdlipwprgb6fck7wjm9dr9z28xhq329hgg6";
+       libraryHaskellDepends = [ base template-haskell time ];
+       testHaskellDepends = [
+         base doctest doctest-discover template-haskell time
+       ];
+       description = "Quasi-quoters for dates and times";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "time-recurrence" = callPackage
     ({ mkDerivation, base, data-ordlist, HUnit, mtl, old-locale
      , test-framework, test-framework-hunit, time
@@ -210911,7 +203194,6 @@ self: {
          base data-ordlist HUnit mtl old-locale test-framework
          test-framework-hunit time
        ];
-       homepage = "http://github.com/hellertime/time-recurrence";
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210941,7 +203223,6 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base Cabal hspec QuickCheck ];
        doHaddock = false;
-       homepage = "https://github.com/klangner/time-series-lib";
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -210954,7 +203235,6 @@ self: {
        version = "1.0.0";
        sha256 = "16g0i6r6vj9w4lbn12jqrhgbbjjca8wbzq6546dz08aks1yrk0g1";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/acw/time-units";
        description = "A basic library for defining units of time as types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210968,7 +203248,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base convertible parsec time ];
-       homepage = "http://cielonegro.org/W3CDateTime.html";
        description = "Parse, format and convert W3C Date and Time";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211007,7 +203286,6 @@ self: {
          log-warper mtl QuickCheck random serokell-util stm text text-format
          time-units transformers
        ];
-       homepage = "https://github.com/serokell/time-warp";
        description = "Distributed systems execution emulation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211022,7 +203300,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
-       homepage = "https://github.com/chriseidhof/TimeCalc";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -211036,7 +203313,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base process time ];
-       homepage = "https://github.com/xpika/Time-Console";
        description = "time each line of terminal output";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -211048,7 +203324,6 @@ self: {
        version = "2.0";
        sha256 = "1sliqpvl501rlcj6s0lhmsf5ym24j4h881wzc1f1wdyvg3jz8kd1";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/merijn/timeit";
        description = "Time monadic computations with an IO base";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211060,7 +203335,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "0r57fib5nzvrk8gsn26364l1a14zj9sg3kv2db4pjzy3dq0zmrpl";
        libraryHaskellDepends = [ base lens time ];
-       homepage = "http://www.github.com/massysett/timelens";
        description = "Lenses for the time package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211074,7 +203348,6 @@ self: {
        libraryHaskellDepends = [
          ansi-terminal base linear time transformers
        ];
-       homepage = "https://github.com/carldong/timeless";
        description = "An Arrow based Functional Reactive Programming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211089,7 +203362,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base timeless ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/carldong/timeless-tutorials#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211101,7 +203373,6 @@ self: {
        version = "0.2.2";
        sha256 = "0gxpagh4pp0wfraryxvij52gm7b42alsgg8l34xsf6p06cxh8h5d";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://hub.darcs.net/esz/timelike";
        description = "Type classes for types representing time";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -211113,7 +203384,6 @@ self: {
        version = "0.1.0";
        sha256 = "1bnwp4bzn58pmdcwnrarafvh8m28ahwsgl6lysrnyv7k2krb7qny";
        libraryHaskellDepends = [ base clock timelike transformers ];
-       homepage = "http://hub.darcs.net/esz/timelike-clock";
        description = "Timelike interface for the clock library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -211125,7 +203395,6 @@ self: {
        version = "0.1.1";
        sha256 = "07a853ggcbzggcm5sg943mgb7b2qy1dzmh2ghmix9iiyc5pm6jxy";
        libraryHaskellDepends = [ base time timelike transformers ];
-       homepage = "http://hub.darcs.net/esz/timelike-time";
        description = "Timelike interface for the time library";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -211152,7 +203421,6 @@ self: {
          base containers criterion focus hashable list-t stm stm-containers
          time unordered-containers
        ];
-       homepage = "https://github.com/athanclark/timemap#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -211169,7 +203437,6 @@ self: {
        testHaskellDepends = [
          base exceptions mtl QuickCheck tasty tasty-quickcheck time
        ];
-       homepage = "https://github.com/lambda-llama/timeout";
        description = "Generalized sleep and timeout functions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211186,7 +203453,6 @@ self: {
        libraryHaskellDepends = [
          base ghc-prim lifted-base monad-control mtl transformers-base
        ];
-       homepage = "http://github.com/alphaHeavy/timeout-control";
        description = "Updatable timeouts as a Monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211198,7 +203464,6 @@ self: {
        version = "0.2";
        sha256 = "1y5mc1awahcp9xpmmwqc74cfn7g0zm1cyxi396xirll8nk335nd0";
        libraryHaskellDepends = [ base deepseq mtl parallel ];
-       homepage = "https://github.com/ppetr/timeout-with-results";
        description = "Runs a time-limited computation alowing it to return intermediate results";
        license = "LGPL";
      }) {};
@@ -211235,7 +203500,6 @@ self: {
          containers data-default lens regex-tdfa strptime template-haskell
          time transformers vcs-revision
        ];
-       homepage = "http://haskell.org/haskellwiki/Timeplot";
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211266,7 +203530,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck text time
        ];
-       homepage = "https://github.com/HugoDaniel/timerep";
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211295,7 +203558,6 @@ self: {
        sha256 = "02da32j9jz21awmsf38rrj3l3ks7s9a6vvqadr98c35shx3sxzcq";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "http://ariis.it/static/articles/timers-tick/page.html";
        description = "tick based timers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211308,7 +203570,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "1naw59xvbfhgz49qhvgzng4xjf4fzi59gl996pcp5l6s2sbpx4mw";
        libraryHaskellDepends = [ base stm ];
-       homepage = "http://github.com/paolino/timers-updatable";
        description = "timers which are updatable in the remaining time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211328,7 +203589,6 @@ self: {
          base bytestring Cabal cassava hspec QuickCheck statistics text
          text-time time vector
        ];
-       homepage = "https://github.com/klangner/timeseries";
        description = "Library for Time Series processing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211341,7 +203601,6 @@ self: {
        version = "0.3.0.0";
        sha256 = "07w529iq0xql1adz7m54p8gljmc2jf61by2b1786avbp1lg1x9a6";
        libraryHaskellDepends = [ base time ];
-       homepage = "https://github.com/agrafix/timespan#readme";
        description = "Useful timespan datatype and functions";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -211357,7 +203616,6 @@ self: {
        libraryHaskellDepends = [
          base cereal foldl generic-random hashable QuickCheck time
        ];
-       homepage = "https://github.com/metrix-ai/timestamp";
        description = "Space-efficient Unix timestamp and utilities";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -211375,7 +203633,6 @@ self: {
        executableHaskellDepends = [
          base bytestring process split time transformers
        ];
-       homepage = "https://github.com/Peaker/timestamp-subprocess-lines";
        description = "Run a command and timestamp its stdout/stderr lines";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211389,7 +203646,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base old-locale time ];
-       homepage = "https://github.com/kisom/timestamper";
        description = "Read standard input and prepend each line with a timestamp";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -211405,7 +203661,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring extensible-exceptions time timezone-series
        ];
-       homepage = "http://projects.haskell.org/time-ng/";
        description = "A pure Haskell parser and renderer for binary Olson timezone files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211421,7 +203676,6 @@ self: {
        libraryHaskellDepends = [
          base template-haskell time timezone-olson timezone-series
        ];
-       homepage = "http://github.com/jonpetterbergman/timezone-olson-th";
        description = "Load TimeZoneSeries from an Olson file at compile time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211433,7 +203687,6 @@ self: {
        version = "0.1.9";
        sha256 = "1blwgnyzqn917rgqkl4dncv9whv3xmk0lav040qq0214vksmvlz5";
        libraryHaskellDepends = [ base deepseq time ];
-       homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211472,22 +203725,23 @@ self: {
 
   "tintin" = callPackage
     ({ mkDerivation, base, clay, data-has, directory, frontmatter
-     , inliterate, lucid, optparse-generic, process, temporary, text
-     , universum, yaml
+     , inliterate, lucid, optparse-generic, process, require, temporary
+     , text, universum, yaml
      }:
      mkDerivation {
        pname = "tintin";
-       version = "1.2.4";
-       sha256 = "1jfnw911jfa9wn1inldz3qry238hrl276yb9f690c59yb3zcnvjh";
+       version = "1.4.6";
+       sha256 = "012mvfwn9dy50xpmi4hgf5rq7k4660fjbwdhs3f02x0wndh77n49";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base clay data-has directory frontmatter inliterate lucid process
-         temporary text universum yaml
+         require temporary text universum yaml
        ];
-       executableHaskellDepends = [ base optparse-generic universum ];
-       testHaskellDepends = [ base ];
-       homepage = "https://github.com/theam/tintin#readme";
+       executableHaskellDepends = [
+         base optparse-generic require universum
+       ];
+       testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -211499,7 +203753,6 @@ self: {
        version = "0.1.4.3";
        sha256 = "04bcz2ifkrw0f6razvzpycvzdbarv1ain800l4rapqyqzykgzxjw";
        libraryHaskellDepends = [ async base time ];
-       homepage = "https://github.com/functor-soup/tiny-scheduler#readme";
        description = "tiny no-brainer job scheduler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211515,7 +203768,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base bytestring hex serialport unix
        ];
-       homepage = "http://github.com/mgajda/tinyMesh";
        description = "TinyMesh - communicating with auto-meshing sensor network";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211553,7 +203805,6 @@ self: {
        sha256 = "1nbsbzh33q4py5164lsif08ll98ysiz5d2ysvz4lcrf4jh9vgggg";
        libraryHaskellDepends = [ base text ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/mtolly/tinyfiledialogs";
        description = "Wrapper around the 'tiny file dialogs' C library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211571,7 +203822,6 @@ self: {
          transformers unix-time
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://gitlab.com/twittner/tinylog/";
        description = "Simplistic logging using fast-logger";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -211584,7 +203834,6 @@ self: {
        sha256 = "02kxs4qkrqribqx4sk4hs4qc76x9r8ii2jr1rff17gbmymj3kirh";
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base QuickCheck text ];
-       homepage = "http://github.com/dicomgrid/tinytemplate";
        description = "A tiny text templating library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -211609,7 +203858,6 @@ self: {
        executableHaskellDepends = [
          base optparse-applicative pretty pretty-show tip-lib
        ];
-       homepage = "http://tip-org.github.io";
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211634,7 +203882,6 @@ self: {
        executableHaskellDepends = [
          base filepath optparse-applicative pretty
        ];
-       homepage = "http://tip-org.github.io";
        description = "tons of inductive problems - support library and tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211652,7 +203899,6 @@ self: {
          aeson attoparsec base errors text unordered-containers vector
        ];
        testHaskellDepends = [ aeson base hspec vector ];
-       homepage = "https://github.com/llhotka/tiphys";
        description = "Navigating and editing JSON data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211666,7 +203912,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://keera.co.uk";
        description = "Testing Infrastructure for Temporal AbstractioNs";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211683,7 +203928,6 @@ self: {
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       homepage = "https://github.com/peti/titlecase#readme";
        description = "Convert English Words to Title Case";
        license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ peti ];
@@ -211703,7 +203947,6 @@ self: {
          base mtl parsec pretty utf8-string vty
        ];
        testHaskellDepends = [ HUnit test-framework test-framework-hunit ];
-       homepage = "http://patch-tag.com/r/nonowarn/tkhs/snapshot/current/content/pretty/README";
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211731,7 +203974,6 @@ self: {
          transformers unordered-containers vector wai wai-extra warp
          web-routes yesod yesod-core yesod-form yesod-static
        ];
-       homepage = "https://github.com/maoe/tkyprof";
        description = "A web-based visualizer for GHC Profiling Reports";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211767,7 +204009,6 @@ self: {
          typed-process
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/psibi/tldr-hs#readme";
        description = "Haskell tldr client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211796,7 +204037,6 @@ self: {
          asn1-types base bytestring criterion cryptonite data-default-class
          hourglass mtl QuickCheck tasty-quickcheck x509 x509-validation
        ];
-       homepage = "http://github.com/vincenthz/hs-tls";
        description = "TLS/SSL protocol native implementation (Server and Client)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211816,7 +204056,6 @@ self: {
          base bytestring cryptonite data-default-class network pem time tls
          x509 x509-store x509-system x509-validation
        ];
-       homepage = "http://github.com/vincenthz/hs-tls";
        description = "Set of programs for TLS testing and debugging";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211836,7 +204075,6 @@ self: {
          base bytestring certificate cipher-aes cipher-rc4 crypto-pubkey
          crypto-random cryptohash mtl network pem time tls vector
        ];
-       homepage = "http://github.com/vincenthz/hs-tls";
        description = "TLS extra default values and helpers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211864,7 +204102,6 @@ self: {
        libraryHaskellDepends = [
          base containers hashable stm unordered-containers
        ];
-       homepage = "https://github.com/athanclark/tmapchan#readme";
        description = "An insert-ordered multimap (indexed FIFO) which consumes values as you lookup";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211905,7 +204142,6 @@ self: {
          base bytestring directory hspec hspec-discover postgresql-simple
          process temporary
        ];
-       homepage = "https://github.com/jfischoff/tmp-postgres#readme";
        description = "Start and stop a temporary postgres for testing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -211921,7 +204157,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory template text
        ];
-       homepage = "https://www.github.com/michelk/tmpl";
        description = "simple executable for templating";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -211944,7 +204179,6 @@ self: {
        executableHaskellDepends = [
          base bytestring file-embed optparse-applicative optparse-helper
        ];
-       homepage = "https://github.com/pharpend/tn";
        description = "A simple daily journal program";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -211971,7 +204205,6 @@ self: {
        libraryHaskellDepends = [
          base containers haskell-src-exts transformers
        ];
-       homepage = "https://github.com/conal/to-haskell";
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212015,7 +204248,6 @@ self: {
          base directory madlang optparse-generic text tweet-hs
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/vmchale/toboggan#readme";
        description = "Twitter bot generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212054,7 +204286,6 @@ self: {
          directory dyre filepath Glob mtl parsec process regex-pcre syb time
          utf8-string
        ];
-       homepage = "http://gitorious.org/todos";
        description = "Easy-to-use TODOs manager";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212092,7 +204323,6 @@ self: {
        executableHaskellDepends = [
          base containers old-locale strict time transformers utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/toilet/";
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212108,7 +204338,6 @@ self: {
        editedCabalFile = "1gqlxy3rwrgag4qbjkh1f2kya4gcy1x5ic9xn997nzc6yi334v7m";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
-       homepage = "https://github.com/hvr/token-bucket";
        description = "Rate limiter using lazy bucket algorithm";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -212120,7 +204349,6 @@ self: {
        version = "0.1.2.0";
        sha256 = "1fyf1ym91dbhiw7hybzhllc375v4pizl058qazfdyw6cymqm4rch";
        libraryHaskellDepends = [ base containers text ];
-       homepage = "https://github.com/AKST/tokenify";
        description = "A regex lexer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212138,7 +204366,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq filepath split text
        ];
-       homepage = "https://bitbucket.org/gchrupala/lingo/overview";
        description = "Simple tokenizer for English text";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -212178,7 +204405,6 @@ self: {
        sha256 = "1v6s39q8a6cnc0ggpspz9i0xw6aih4ixn9bhn4hwf9kwgcspardg";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ tokyocabinet ];
-       homepage = "http://tom-lpsd.github.com/tokyocabinet-haskell/";
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212193,7 +204419,6 @@ self: {
        sha256 = "1xz8n3hgkhrdabwc8hsqj3yf5x112palzz192f6pkl07vi8yz1ph";
        libraryHaskellDepends = [ base bytestring mtl ];
        librarySystemDepends = [ tokyocabinet tokyotyrant ];
-       homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212206,7 +204431,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "0xffc0xjkg1jqdq7s5x0y4gi13s9yhpcwb5zvrcbmv194bp65xx1";
        libraryHaskellDepends = [ base OpenAL stm vector ];
-       homepage = "http://www.haskell.org/haskellwiki/tomato-rubato";
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212237,7 +204461,6 @@ self: {
        sha256 = "0p1nl3009qlcqn4jjggbm1v719a6bswklkyjb3plm0cz3bsyr0fs";
        libraryHaskellDepends = [ array base text time ];
        libraryToolDepends = [ alex happy ];
-       homepage = "https://github.com/glguy/toml-parser";
        description = "Parser for the TOML configuration language";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -212249,8 +204472,8 @@ self: {
      }:
      mkDerivation {
        pname = "tomland";
-       version = "0.1.0";
-       sha256 = "1f31awp7qy1npm4nnyk25lf4cng942mbfm7mmvglr0h7c1y11wpc";
+       version = "0.2.1";
+       sha256 = "09d0i1sys7nljbcky53qz4w2ibjyhcysa8ik0drb1pcyqyzppj8x";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212262,7 +204485,6 @@ self: {
          base hedgehog tasty tasty-hedgehog tasty-hspec text
          unordered-containers
        ];
-       homepage = "https://github.com/kowainik/tomland";
        description = "TOML parser";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -212299,7 +204521,6 @@ self: {
        testHaskellDepends = [
          base containers extra HUnit QuickCheck random
        ];
-       homepage = "http://functionalley.eu";
        description = "Ill-defined library";
        license = "GPL";
      }) {};
@@ -212322,7 +204543,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filemanip tasty tasty-hunit zm
        ];
-       homepage = "http://github.com/tittoassini/top";
        description = "Top (typed oriented protocol) API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212342,7 +204562,6 @@ self: {
        executableHaskellDepends = [
          ALUT array base filepath GLFW-b OpenAL OpenGL parseargs random
        ];
-       homepage = "http://home.arcor.de/chr_bauer/topkata.html";
        description = "OpenGL Arcade Game";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212355,7 +204574,6 @@ self: {
        version = "0.1";
        sha256 = "1bai1vxd2vfxl9zn37dvrb05yh4knr5gw5syqpi6lxxd3lf0ngzc";
        libraryHaskellDepends = [ base mtl parallel QuickCheck ];
-       homepage = "http://patch-tag.com/repo/torch/home";
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212383,7 +204601,6 @@ self: {
        version = "0.1";
        sha256 = "173dn2n24xdlyymw5hqd6qd1r6h65bqrhpkcl49kccxr10xgb8vm";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/andrewthad/torsor#readme";
        description = "Torsor Typeclass";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -212417,7 +204634,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1krm6jymnrr6iiys16rwar60avnaxpbn583szarnd4lqjhk0g5cq";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/guaraqe/total-alternative#readme";
        description = "Alternative interface for total versions of partial function on the Prelude";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -212429,7 +204645,6 @@ self: {
        version = "0.0.6";
        sha256 = "11dgcl7ab7akkfnmprnmphj4kazh3x3k09lz7m5glyg39kw8pzrj";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://github.com/conal/total-map/";
        description = "Finitely represented /total/ maps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -212478,7 +204693,6 @@ self: {
          base HUnit protolude QuickCheck smallcheck tasty tasty-hunit
          tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "https://github.com/tonyday567/tower";
        description = "A numeric tower";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -212499,7 +204713,6 @@ self: {
        testHaskellDepends = [
          base data-default-class hspec QuickCheck saltine
        ];
-       homepage = "https://toktok.github.io";
        description = "Haskell bindings to the C reference implementation of Tox";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212520,7 +204733,6 @@ self: {
          base containers hspec http-client process servant servant-client
          silently time
        ];
-       homepage = "https://github.com/jpittis/toxiproxy-haskell#readme";
        description = "Client library for Toxiproxy: a TCP failure testing proxy";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212573,7 +204785,6 @@ self: {
        benchmarkHaskellDepends = [
          array base criterion data-default-class vector
        ];
-       homepage = "https://github.com/msakai/toysolver/";
        description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212611,7 +204822,6 @@ self: {
          optparse-applicative pipes pipes-bytestring pipes-concurrency
          pipes-safe process stm transformers trifecta
        ];
-       homepage = "http://github.com/bgamari/tpar/";
        description = "simple, parallel job scheduling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212660,7 +204870,6 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ base bytestring HaXml pretty ];
-       homepage = "https://github.com/jwaldmann/haskell-tpdb";
        description = "Data Type for Rewriting Systems";
        license = "GPL";
      }) {};
@@ -212726,7 +204935,6 @@ self: {
        sha256 = "1rgnls2zry29zrnvxv700bljdf7iqkkyzayr4lan0qvhv1bcs5jm";
        libraryHaskellDepends = [ base mtl transformers ];
        testHaskellDepends = [ base mtl transformers ];
-       homepage = "https://github.com/knz/hs-tracer";
        description = "Tracing utilities for Functor/Applicative/Monad types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -212831,7 +205039,6 @@ self: {
          aeson attoparsec base bytestring cmdargs containers http-enumerator
          http-types regexpr text unordered-containers uri
        ];
-       homepage = "https://github.com/mike-burns/trajectory";
        description = "Tools and a library for working with Trajectory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212849,7 +205056,6 @@ self: {
        testHaskellDepends = [
          base doctest Glob hspec mono-traversable QuickCheck
        ];
-       homepage = "https://github.com/arowM/haskell-transaction#readme";
        description = "Monadic representation of transactions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212912,7 +205118,6 @@ self: {
        testHaskellDepends = [
          base bytestring cpu hspec QuickCheck sqlcli store time transformers
        ];
-       homepage = "http://hub.darcs.net/mihaigiurgeanu/transfer-db";
        description = "ODBC database transfer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -212977,7 +205182,6 @@ self: {
          base monad-control pointed semigroupoids transformers
          transformers-base
        ];
-       homepage = "https://github.com/mvv/transformers-abort";
        description = "Error and short-circuit monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -212993,7 +205197,6 @@ self: {
        libraryHaskellDepends = [
          base stm transformers transformers-compat
        ];
-       homepage = "https://github.com/mvv/transformers-base";
        description = "Lift computations from the bottom of a transformer stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213009,7 +205212,6 @@ self: {
        libraryHaskellDepends = [
          base base-orphans stm transformers transformers-compat
        ];
-       homepage = "https://github.com/mvv/transformers-base";
        description = "Lift computations from the bottom of a transformer stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213022,7 +205224,6 @@ self: {
        version = "0.1";
        sha256 = "01s8516m9cybx5gqxk8g00fnkbwpfi5vrm1pgi62pxk1cgbx699w";
        libraryHaskellDepends = [ base mmorph transformers ];
-       homepage = "https://github.com/jystic/transformers-bifunctors";
        description = "Bifunctors over monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213034,7 +205235,6 @@ self: {
        version = "0.5.1.4";
        sha256 = "17yam0199fh9ndsn9n69jx9nvbsmymzzwbi23dck3dk4q57fz0fq";
        libraryHaskellDepends = [ base ghc-prim transformers ];
-       homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213046,7 +205246,6 @@ self: {
        version = "0.6.2";
        sha256 = "1gp4a8kvniwgm8947ghb4iwv4b7wd6ry4kvv4nfnym4agf5j41nw";
        libraryHaskellDepends = [ base ghc-prim transformers ];
-       homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim for the transformers library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213059,7 +205258,6 @@ self: {
        version = "0.1";
        sha256 = "0kvhl5s1js6i639hc6c4ib9jmgy4l1503ifs30a9ajrk97nagp6d";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/aristidb/transformers-compose";
        description = "Arrow-like / category-like composition for transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213072,7 +205270,6 @@ self: {
        version = "0.0.1";
        sha256 = "0h0qbhk7b4wm3h06m26ga3i6rqw60fjs469iq6p3j6pdvq58bb5x";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "http://github.com/nhibberd/transformers-continue";
        description = "Control flow data type and monad transformer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213091,7 +205288,6 @@ self: {
          base data-easy directory either errors haskell-src-exts hlint hspec
          HUnit QuickCheck text transformers unix
        ];
-       homepage = "https://github.com/jcristovao/transformers-convert";
        description = "Sensible conversions between some of the monad transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213111,7 +205307,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion effect-interpreters mtl pipes transformers
        ];
-       homepage = "https://github.com/ocharles/transformers-eff";
        description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213138,7 +205333,6 @@ self: {
        version = "0.1.1";
        sha256 = "1hjkiz3dhk4dp8a4lgpyns4nd867lg7ydq4r4zf57w4i6ys7j4l7";
        libraryHaskellDepends = [ base exceptions text transformers ];
-       homepage = "http://github.com/tmcgilchrist/transformers-either/";
        description = "An Either monad transformer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213153,7 +205347,6 @@ self: {
        revision = "1";
        editedCabalFile = "126gyjr8jp42md6nblx7c0kan97jgsakvsf2vzv2pj828ax1icrs";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/thumphries/transformers-fix";
        description = "Monad transformer for evaluating to a fixpoint";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213193,7 +205386,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0m1vvdfi661mmxm5rghsfnwcjd2r0r7ryc3jk0nwlzs0kaw5xi1s";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/JanBessai/transformers-runnable";
        description = "A unified interface for the run operation of monad transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213226,7 +205418,6 @@ self: {
          atomic-primops base bytestring containers directory mtl random stm
          time transformers
        ];
-       homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -213247,7 +205438,6 @@ self: {
          atomic-primops base bytestring containers directory mtl random stm
          time transformers
        ];
-       homepage = "https://github.com/transient-haskell/transient";
        description = "composing programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213281,7 +205471,6 @@ self: {
          hashable HTTP mtl network network-info network-uri process random
          stm TCache text time transformers transient vector websockets
        ];
-       homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "Remote execution and map-reduce: distributed computing for Transient";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -213314,7 +205503,6 @@ self: {
          hashable HTTP mtl network network-info network-uri process random
          stm TCache text time transformers transient vector websockets
        ];
-       homepage = "https://github.com/transient-haskell/transient-universe";
        description = "Remote execution and map-reduce: distributed computing for Transient";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213332,7 +205520,6 @@ self: {
          base bytestring cprng-aes data-default network tls transient
          transient-universe x509-store x509-system
        ];
-       homepage = "http://github.com/transient-haskell/transient-universe-tls";
        description = "transient with secure communications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213360,7 +205547,6 @@ self: {
        sha256 = "0vcqw0x7c9nb8yigvk35x72rds50kvma02rwkb757y1sk80q0mzf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base curl json network utf8-string ];
-       homepage = "http://github.com/nfjinjing/translate";
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213379,7 +205565,6 @@ self: {
        libraryHaskellDepends = [ aeson aeson-lens base lens text wreq ];
        executableHaskellDepends = [ base text turtle ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "https://github.com/andys8/translate-cli#readme";
        description = "Translation cli tool";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213402,7 +205587,6 @@ self: {
          base bytestring doctest tasty tasty-hunit tasty-quickcheck text
          vinyl
        ];
-       homepage = "https://github.com/haskell-trasa/trasa#readme";
        description = "Type Safe Web Routing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213464,7 +205648,6 @@ self: {
          base bytestring doctest http-client tasty tasty-hunit
          tasty-quickcheck text trasa vinyl warp
        ];
-       homepage = "https://github.com/haskell-trasa/trasa#readme";
        description = "Type safe web server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213495,7 +205678,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring http-conduit transformers
        ];
-       homepage = "http://github.com/tomtau/travis#readme";
        description = "A simple client implementation using Travis CI API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213526,7 +205708,6 @@ self: {
          regex-applicative tasty tasty-quickcheck text unordered-containers
          yaml
        ];
-       homepage = "https://github.com/phadej/travis-meta-yaml#readme";
        description = ".travis.yml preprocessor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213542,7 +205723,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base optparse-applicative process ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/4e6/travis-pogodi#readme";
        description = "A better travis_wait";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213561,7 +205741,6 @@ self: {
          base Cabal directory filepath MissingH optparse-applicative process
          split
        ];
-       homepage = "https://github.com/bmjames/trawl";
        description = "A tool for finding haddocks";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213577,7 +205756,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base gtk process ];
-       homepage = "http://projects.haskell.org/traypoweroff";
        description = "Tray Icon application to PowerOff / Reboot computer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213606,7 +205784,6 @@ self: {
          ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck
          tasty tasty-golden tasty-quickcheck trifecta
        ];
-       homepage = "https://github.com/phadej/tree-diff";
        description = "Diffing of (expression) trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213630,7 +205807,6 @@ self: {
        version = "0.3";
        sha256 = "1zs1qgp908d0y7dm9mhzwl529z2aw24zr8balsvn1lzl1aynzslm";
        libraryHaskellDepends = [ base ];
-       homepage = "http://sebfisch.github.com/tree-monad";
        description = "Non-Determinism Monad for Tree Search";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213643,7 +205819,6 @@ self: {
        sha256 = "0wdy1p94096qdc00w8pmbz6qcawc0ivlhy0sg0b3jir0s2ksdccb";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base containers doctest mtl ];
-       homepage = "https://github.com/rampion/tree-traversals";
        description = "Functions and newtype wrappers for traversing Trees";
        license = stdenv.lib.licenses.cc0;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213673,7 +205848,6 @@ self: {
        libraryHaskellDepends = [ base parallel ];
        testHaskellDepends = [ base doctest hedgehog ];
        benchmarkHaskellDepends = [ base containers criterion random ];
-       homepage = "https://github.com/oisdk/treefold";
        description = "Provides folds which try to combine elements in a balanced way";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -213709,7 +205883,6 @@ self: {
        libraryHaskellDepends = [
          base Cabal containers filepath ghc html parsec regex-posix
        ];
-       homepage = "http://rampa.sk/static/treemap-html.html";
        description = "Generates HTML for Data.Tree as TreeMap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213730,7 +205903,6 @@ self: {
          split treemap-html xml
        ];
        doHaddock = false;
-       homepage = "http://rampa.sk/static/treemap-html.html";
        description = "Treemap related commands for producing foldable TreeMap HTML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213743,7 +205915,6 @@ self: {
        version = "1";
        sha256 = "0an35kz6hq5m7wc16d08v1i05zr8fp4v2yrf6zay2lfas1ilh3i2";
        libraryHaskellDepends = [ base haste-compiler sneathlane-haste ];
-       homepage = "http://sneathlane.com/treersec";
        description = "Structure Editing Combinators";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213769,7 +205940,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl QuickCheck random ];
-       homepage = "http://www.haskell.org/haskellwiki/Treeviz";
        description = "Visualization of computation decomposition trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213812,7 +205982,6 @@ self: {
        libraryHaskellDepends = [
          array base collada-types haskell98 tuple vector vector-algorithms
        ];
-       homepage = "http://www.dinkla.net/";
        description = "triangulation of polygons";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213843,7 +206012,6 @@ self: {
          deepseq hashable keys mtl QuickCheck quickcheck-instances
          rose-trees semigroups sets unordered-containers
        ];
-       homepage = "https://github.com/athanclark/tries#readme";
        description = "Various trie implementations in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213871,7 +206039,6 @@ self: {
          semigroups transformers unordered-containers utf8-string
        ];
        testHaskellDepends = [ base doctest parsers QuickCheck ];
-       homepage = "http://github.com/ekmett/trifecta/";
        description = "A modern parser combinator library with convenient diagnostics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213893,7 +206060,6 @@ self: {
        ];
        executableHaskellDepends = [ base protolude ];
        testHaskellDepends = [ base hspec protolude ];
-       homepage = "https://github.com/rhyskeepence/trigger";
        description = "Trigger is a cross platform file system watcher for super fast build-and-restart workflows";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213924,7 +206090,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal filepath leveldb-haskell
        ];
-       homepage = "https://github.com/aphorisme/tripLL";
        description = "A very simple triple store";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213945,7 +206110,6 @@ self: {
          base bytestring doctest memory QuickCheck tasty tasty-hunit
          tasty-quickcheck
        ];
-       homepage = "https://github.com/SamProtas/hs-triplesec";
        description = "TripleSec is a simple, triple-paranoid, symmetric encryption library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213958,7 +206122,6 @@ self: {
        version = "0.0";
        sha256 = "03xmzjqwk6492jmmbq6066ymsxb0wk0pmyf0c5f018nfps0g3i78";
        libraryHaskellDepends = [ base comonad distributive ];
-       homepage = "https://github.com/fumieval/trivia";
        description = "The trivial monad and comonad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -213971,7 +206134,6 @@ self: {
        version = "0.4.0.0";
        sha256 = "1hc6vjgw32sz5x40zifgxy1zd107d4gyfi6mmmdqr87a5f4ldz0p";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/leftaroundabout/trivial-constraint";
        description = "Constraints that any type, resp. no type fulfills";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -213998,7 +206160,6 @@ self: {
        editedCabalFile = "0x56r3wyrrsckx6kdvr4v9janrby5qa21fjqwg9k211765c9ddj6";
        libraryHaskellDepends = [ base template-haskell ];
        testHaskellDepends = [ base containers template-haskell time ];
-       homepage = "https://github.com/liyang/true-name";
        description = "Template Haskell hack to violate module abstractions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214012,7 +206173,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers parseargs WAVE ];
-       homepage = "http://github.com/BartMassey/truelevel";
        description = "Audio file compressor-limiter";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214035,7 +206195,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hastache tasty tasty-hunit ];
-       homepage = "http://github.com/dbushenko/trurl";
        description = "Haskell template code generator";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214087,7 +206246,6 @@ self: {
        sha256 = "1jb1d18hq4vyinx5z2qrj3kw969snp4rmwv3gmqpjfynxwgn0jhx";
        libraryHaskellDepends = [ base containers stm ];
        testHaskellDepends = [ async base stm ];
-       homepage = "https://github.com/githubuser/tsetchan#readme";
        description = "Hides duplicating channels when broadcasting";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214101,7 +206259,6 @@ self: {
        revision = "1";
        editedCabalFile = "162s24i0n1pcgp8m4lqhs9vm3m78by88axdvn358zxjpfrpln817";
        libraryHaskellDepends = [ array base containers random stm ];
-       homepage = "https://github.com/thaldyron/tskiplist";
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214157,7 +206314,6 @@ self: {
        ];
        executableHaskellDepends = [ base data-default pipes time ];
        testHaskellDepends = [ base data-default hspec ];
-       homepage = "https://bitbucket.org/robagar/haskell-tsne";
        description = "t-SNE";
        license = "LGPL";
      }) {};
@@ -214171,7 +206327,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gloss stm vector ];
-       homepage = "https://github.com/davnils/tsp-viz";
        description = "Real time TSP tour visualization";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214190,7 +206345,6 @@ self: {
        libraryHaskellDepends = [
          base Decimal parsec pretty process split time
        ];
-       homepage = "http://www.github.com/massysett/tsparse";
        description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214203,7 +206357,6 @@ self: {
        version = "0.1.1";
        sha256 = "1vr1l4pm02pwr8238qd9j0drkildns8m79qyq0lbzll30gc12vhx";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/bitonic/language-spelling";
        description = "BK-tree implementation";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -214224,7 +206377,6 @@ self: {
          gtk3 optparse-applicative resourcet stm template-haskell text
          typed-process
        ];
-       homepage = "https://github.com/Fuuzetsu/tsuntsun";
        description = "Interacts with tesseract to ease reading of RAW Japanese manga";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214258,7 +206410,6 @@ self: {
          attoparsec base bytestring containers optparse-applicative
          string-qq text unordered-containers
        ];
-       homepage = "https://github.com/danchoi/tsvsql";
        description = "Template tsv into SQL";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214282,7 +206433,6 @@ self: {
          base optparse-declarative time transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/tokiwoousaka/ttask#readme";
        description = "This is task management tool for yourself, that inspired by scrum";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214311,7 +206461,6 @@ self: {
          primitive stm stm-containers stm-stats text transformers
          unordered-containers vector
        ];
-       homepage = "http://github.com/mcschroeder/ttrie";
        description = "Contention-free STM hash map";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -214335,7 +206484,6 @@ self: {
          JuicyPixels mtl natural-sort optparse-applicative parsec process
          random split spool template-haskell text time vector yaml zlib
        ];
-       homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214353,7 +206501,6 @@ self: {
          base comonad contravariant free mtl profunctors semigroups
          transformers
        ];
-       homepage = "https://github.com/gatlin/tubes";
        description = "Write stream processing computations with side effects in a series of tubes";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -214379,7 +206526,6 @@ self: {
        revision = "2";
        editedCabalFile = "15jav5fj1ggjczn2mh4yv5rmsfydwc17vzlah3j1z5mkyq1691i8";
        libraryHaskellDepends = [ base ioctl ];
-       homepage = "https://github.com/riaqn/tuntap-simple#readme";
        description = "A simple tun/tap library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214394,7 +206540,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base cpphs ];
        executableHaskellDepends = [ base haskell-src-exts parsec2 ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Homogeneous tuples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214430,7 +206575,6 @@ self: {
        version = "0.6.0.0";
        sha256 = "034yzdwksydl9dxprv786lznwdfafa1nnzcsywjd40zv6las3gdm";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/aelve/tuple-generic";
        description = "Generic operations on tuples";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -214442,7 +206586,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "16vj2n521yd4fxxcfgizfr37y7kkpk57q9s9p9z9xhiw0k974r48";
        libraryHaskellDepends = [ base HList OneTuple ];
-       homepage = "http://github.com/dudebout/tuple-hlist";
        description = "Functions to convert between tuples and HLists";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214455,7 +206598,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1qq1sla89410wr9pnkmj100izkraad1gr163815p3dvh7qi04c7w";
        libraryHaskellDepends = [ base lens template-haskell ];
-       homepage = "http://github.com/jfischoff/tuple-lenses";
        description = "Stock FieldN combos and generators";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214482,7 +206624,6 @@ self: {
        version = "0.0.0.2";
        sha256 = "05hmw9s4bync4j9sr8cs9nknkgpzwqd55aiw5s3iax4qnbxsccyp";
        libraryHaskellDepends = [ base type-combinators ];
-       homepage = "https://github.com/pierric/tuple-ops";
        description = "various operations on n-ary tuples via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214495,7 +206636,6 @@ self: {
        sha256 = "1m9xsjnnyavms4hxgdam79vc9c4bf6ssmammmzvvidqvyl9z1g15";
        libraryHaskellDepends = [ base generics-sop ];
        testHaskellDepends = [ base generics-sop ];
-       homepage = "https://github.com/Ferdinand-vW/tuple-sop#readme";
        description = "functions on n-ary tuples using generics-sop";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -214518,7 +206658,6 @@ self: {
        version = "0.0.1";
        sha256 = "0kcmcg1fxsslpzpg766r9hr8aysg0s5fyang2xc0aa77zi71qyi3";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/diegoeche/tupleinstances";
        description = "Functor, Applicative and Monad for n-ary tuples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214531,7 +206670,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "0fhz246wh6x0s0sjkmd3qcylsx2gfrmgmvgb7js2zjg91y7zqnh2";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/ppetr/tuples-homogenous-h98";
        description = "Wrappers for n-ary tuples with Traversable and Applicative/Monad instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214544,7 +206682,6 @@ self: {
        sha256 = "1bk0rc15z71wnp0frzmq5vv9x1hlz8jns49n11g6pngapzc0vipk";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
-       homepage = "http://github.com/sebastianpoeplau/turing#readme";
        description = "A simple simulator for Turing machines";
        license = "GPL";
      }) {};
@@ -214556,7 +206693,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1anh6x4vdkys5b89ni18gsh3fl68v667qg5aw1867s4hwlvsii35";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/jariazavalverde/hackage-turing-machines";
        description = "A simple simulator for Turing machines";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214587,7 +206723,6 @@ self: {
        testHaskellDepends = [
          base containers hspec hspecVariant QuickCheck QuickCheckVariant
        ];
-       homepage = "https://github.com/sanjorgek/turingMachine";
        description = "An implementation of Turing Machine and Automaton";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -214603,7 +206738,6 @@ self: {
        libraryHaskellDepends = [ base containers vector ];
        executableHaskellDepends = [ base containers vector ];
        testHaskellDepends = [ base HUnit ];
-       homepage = "http://github.com/joom/turkish-deasciifier.hs";
        description = "Haskell port of Deniz Yuret's Turkish deasciifier";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -214615,7 +206749,6 @@ self: {
        version = "0.1.0";
        sha256 = "180yplkjf0c4n17a5ad2pakjwnh7830rldzmaqjj7gwcl3pg0lc6";
        libraryHaskellDepends = [ base containers stm ];
-       homepage = "https://github.com/jxv/turn-loop#readme";
        description = "Manage multiple turned-based sessions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214629,7 +206762,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base containers MonadRandom random ];
-       homepage = "http://wiki.github.com/paolino/turni";
        description = "shifts scheduling tool";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214669,7 +206801,6 @@ self: {
        libraryHaskellDepends = [ base optional-args parsec text turtle ];
        executableHaskellDepends = [ base turtle ];
        testHaskellDepends = [ base HUnit parsec ];
-       homepage = "https://github.com/elaye/turtle-options#readme";
        description = "Collection of command line options and parsers for these options";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214683,7 +206814,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/lovasko/tw";
        description = "Trailing Whitespace";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214695,7 +206825,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1l5y94gac9s55wgn6w610pqb63c8l20vmlpsnmgbzw1f9vbnzgiw";
        libraryHaskellDepends = [ base containers lens stm transformers ];
-       homepage = "http://github.com/jfischoff/tweak";
        description = "A library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214713,7 +206842,6 @@ self: {
        executableHaskellDepends = [
          base containers jukebox pretty split twee-lib
        ];
-       homepage = "http://github.com/nick8325/twee";
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214729,7 +206857,6 @@ self: {
        libraryHaskellDepends = [
          base containers dlist ghc-prim pretty primitive transformers vector
        ];
-       homepage = "http://github.com/nick8325/twee";
        description = "An equational theorem prover";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -214743,8 +206870,8 @@ self: {
      }:
      mkDerivation {
        pname = "tweet-hs";
-       version = "1.0.1.39";
-       sha256 = "148lan5d4mzngkfq5l5rsz20s9dcgn71y145d1y59pr7nnlg3ipw";
+       version = "1.0.1.40";
+       sha256 = "0zbhnx2hl6cgfdzgd3iwmlzkf4kgdz87m0ghmq2irdblfiz5kspr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -214758,7 +206885,6 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base bytestring criterion megaparsec ];
-       homepage = "https://github.com/vmchale/command-line-tweeter#readme";
        description = "Command-line tool for twitter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214899,7 +207025,6 @@ self: {
        testHaskellDepends = [
          base Cabal cabal-test-quickcheck HUnit-Plus QuickCheck split vector
        ];
-       homepage = "https://github.com/lysxia/twentyseven";
        description = "Rubik's cube solver";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214926,7 +207051,6 @@ self: {
          http-client-tls mtl servant servant-client text transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/wiggly/twfy-api-client#readme";
        description = "They Work For You API Client Library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214958,7 +207082,6 @@ self: {
          twitter-conduit
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/suzuki-shin/twhs";
        description = "CLI twitter client";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214980,7 +207103,6 @@ self: {
          hslogger MissingH mtl network old-locale parsec regex-posix text
          time unix utf8-string
        ];
-       homepage = "http://software.complete.org/twidge";
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -214993,7 +207115,6 @@ self: {
        version = "1.2";
        sha256 = "1hp9mkfasjyh1ji6gfmdpmx3nm9g22ag3y47nva7i30bjrs65cdr";
        libraryHaskellDepends = [ base containers haskell98 mtl ];
-       homepage = "http://proglang.informatik.uni-freiburg.de/projects/twilight/";
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215021,7 +207142,6 @@ self: {
          network-uri QuickCheck quickcheck-instances text transformers
        ];
        doCheck = false;
-       homepage = "https://github.com/markandrus/twilio-haskell";
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215059,7 +207179,6 @@ self: {
          text void xml
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/markandrus/twiml-haskell";
        description = "TwiML library for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215076,7 +207195,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers convertible filepath mtl parsec
        ];
-       homepage = "http://twine.james-sanders.com";
        description = "very simple template language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215114,7 +207232,6 @@ self: {
          base data-default directory filepath fsnotify Glob hspec
          optparse-applicative time transformers
        ];
-       homepage = "https://github.com/jfischoff/twitch";
        description = "A high level file watcher DSL";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -215166,7 +207283,6 @@ self: {
          twitter-types twitter-types-lens
        ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215186,7 +207302,6 @@ self: {
          containers enumerator http-enumerator http-types text tls-extra
          transformers
        ];
-       homepage = "https://github.com/himura/twitter-enumerator";
        description = "Twitter API package with enumerator interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215209,7 +207324,6 @@ self: {
        testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215234,7 +207348,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text time
          unordered-containers
        ];
-       homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215253,7 +207366,6 @@ self: {
        libraryHaskellDepends = [
          base lens template-haskell text time twitter-types
        ];
-       homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215270,7 +207382,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal safecopy stm transformers
        ];
-       homepage = "https://github.com/mcschroeder/tx";
        description = "Persistent transactions on top of STM";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215306,7 +207417,6 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring containers directory parsec regex-posix
        ];
-       homepage = "http://keithsheppard.name/txt-sushi";
        description = "The SQL link in your *NIX chain";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215320,7 +207430,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/jgoerzen/txt2rtf";
        description = "Filter to convert plain text files to RTF";
        license = "GPL";
      }) {};
@@ -215344,7 +207453,6 @@ self: {
        version = "0.1.7";
        sha256 = "0nn9lr9q0vmkkw25j7yfi3js2qmfmsrhrkviipjj8y7hrhmkfimm";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/conal/ty";
        description = "Typed type representations and equality proofs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215375,7 +207483,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory filepath ghc process
        ];
-       homepage = "http://www.decidable.org/haskell/typalyze";
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215389,7 +207496,6 @@ self: {
        sha256 = "0mfyd9w13kd3ha43220p9qabw828xv19sxywy9imadpwrdqp51qv";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/atzeus/type-aligned";
        description = "Various type-aligned sequence data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215402,7 +207508,6 @@ self: {
        sha256 = "1fvrlvklz0kjsdx1sgy9iyqvpq7h1ibqaqvif04ig84zr5qlbixa";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec test-fixture ];
-       homepage = "https://github.com/lexi-lambda/type-assertions#readme";
        description = "Runtime type assertions for testing";
        license = stdenv.lib.licenses.isc;
      }) {};
@@ -215429,7 +207534,6 @@ self: {
        libraryHaskellDepends = [
          base containers lens lens-utils template-haskell
        ];
-       homepage = "https://github.com/wdanilo/type-cache";
        description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215459,7 +207563,6 @@ self: {
        version = "0.2.4.3";
        sha256 = "1xip4gav1fn3ip62mrlbr7p6i1254fa1q542cmp6ffzm55lwn30z";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/kylcarte/type-combinators";
        description = "A collection of data types for type-level programming";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215475,7 +207578,6 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-meta template-haskell type-combinators
        ];
-       homepage = "https://github.com/kylcarte/type-combinators-quote";
        description = "Quasiquoters for the 'type-combinators' package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215488,7 +207590,6 @@ self: {
        version = "0.2.1.0";
        sha256 = "00cwlfcka2d1wcp7159r3sk3gz852dmc71jvjfr8bn1rrr781n0q";
        libraryHaskellDepends = [ base singletons type-combinators ];
-       homepage = "https://github.com/mstksg/type-combinators-singletons";
        description = "Interop between /type-combinators/ and /singletons/";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215515,7 +207616,6 @@ self: {
        editedCabalFile = "1g8m6f73pbz8mqvqbrvxhp2klj7lf624jgqdn1gchd56z4pcnryw";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
-       homepage = "http://github.com/glaebhoerl/type-eq";
        description = "Type equality evidence you can carry around";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215528,7 +207628,6 @@ self: {
        version = "0.1.2";
        sha256 = "06acqpkvyvalv5knjzzbgm40hzas6cdfsypvjxsbb0mhq4d80xwr";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/hesselink/type-equality/";
        description = "Type equality, coercion/cast and other operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215540,7 +207639,6 @@ self: {
        version = "0.0.0.4";
        sha256 = "1r0g2xpkyj3765z07s559xy9vx4ipwnlk13sxrbcjds7wghfb8ci";
        libraryHaskellDepends = [ base type-level ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-equality-check";
        description = "Type equality check";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215553,7 +207651,6 @@ self: {
        sha256 = "18axaln9ahrn6023pk4ig79d2qimmflikf608vgka4hhi91cfpnz";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/s9gf4ult/type-fun";
        description = "Collection of widely reimplemented type families";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215565,7 +207662,6 @@ self: {
        version = "0.2.0.4";
        sha256 = "1ib1d5z9wxc63hq2gyxplpzs49k5rfafgz1r59bqsqh63yk4lly8";
        libraryHaskellDepends = [ base kinds ];
-       homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-functions";
        description = "Emulation of type-level functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215577,7 +207673,6 @@ self: {
        version = "0.1";
        sha256 = "1fcrma7m6y7i1y42rzhv7qch8xkk93lkh1767saw4hsb9fzwsq8i";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/mvv/type-hint";
        description = "Guide type inference with proxy values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215600,7 +207695,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers criterion pqueue random
        ];
-       homepage = "https://github.com/oisdk/type-indexed-queues";
        description = "Queues with verified and unverified versions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215613,7 +207707,6 @@ self: {
        version = "0.5.0.2";
        sha256 = "1lakw4mvkii32a570zain510n9x7b2ka2r3qj5rpil1j4bpc662w";
        libraryHaskellDepends = [ base template-haskell ];
-       homepage = "http://github.com/ekmett/type-int";
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215640,7 +207733,6 @@ self: {
        libraryHaskellDepends = [
          base data-default nats numericpeano text
        ];
-       homepage = "https://github.com/ombocomp/type-iso";
        description = "Typeclasses for injective relations and isomorphisms between types";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -215652,7 +207744,6 @@ self: {
        version = "0.3.0";
        sha256 = "03w9dkb2d8351y2ic2wxh1sr2dnwh9ph9qa5mak0iciqraxvqxlr";
        libraryHaskellDepends = [ base syb template-haskell ];
-       homepage = "http://code.haskell.org/type-level";
        description = "Type-level programming library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215664,7 +207755,6 @@ self: {
        version = "0.1";
        sha256 = "0c51p6dy84ddikj6jch5hljn1i37q38wbak3chbc3ds5r674y5hk";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/Kinokkory/type-level-bst";
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215678,7 +207768,6 @@ self: {
        sha256 = "1fn7zhpmixbp2nd4lryvfzy19g8kj03kh1r264fvnrdbnfjf72qi";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/mtesseract/type-level-integers";
        description = "Provides integers lifted to the type level";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215691,7 +207780,6 @@ self: {
        sha256 = "0wvxgxp7rlqbf2crcpb9pbzl3k47i7pc16ih4zfwgv88j7jk5w2g";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/type-level-kv-list#readme";
        description = "A module for hash map like object with type level keys";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -215763,7 +207851,6 @@ self: {
        version = "0.2.1";
        sha256 = "07q69219yvf7rpfwilp70hvx2fzsxklvld7j3gayj17l9wp23g2m";
        libraryHaskellDepends = [ base syb template-haskell ];
-       homepage = "https://github.com/coreyoconnor/type-level-tf";
        description = "Type-level programming library (type families)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215792,7 +207879,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/Lysxia/type-map";
        description = "Type-indexed maps";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -215810,7 +207896,6 @@ self: {
          base constraints equational-reasoning ghc-typelits-natnormalise
          ghc-typelits-presburger singletons template-haskell
        ];
-       homepage = "https://github.com/konn/type-natural";
        description = "Type-level natural and proofs of their properties";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215833,20 +207918,19 @@ self: {
          base blaze-html bytestring criterion deepseq ghc ghc-paths random
          temporary text weigh
        ];
-       homepage = "https://github.com/knupfer/type-of-html";
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "type-of-html_1_4_0_0" = callPackage
+  "type-of-html_1_4_0_1" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, criterion, deepseq
      , double-conversion, ghc, ghc-paths, ghc-prim, hspec, QuickCheck
      , random, temporary, text, weigh
      }:
      mkDerivation {
        pname = "type-of-html";
-       version = "1.4.0.0";
-       sha256 = "09dr97illgfn11javij6nmqp3cvgdf7air7kavxcdlr25nx6wkd7";
+       version = "1.4.0.1";
+       sha256 = "1bcjpkrqa7pmgb7a48q2q8rkx15yz40d91mn7jhj91hzc1h2z6g3";
        libraryHaskellDepends = [
          base bytestring double-conversion ghc-prim text
        ];
@@ -215855,7 +207939,6 @@ self: {
          base blaze-html bytestring criterion deepseq ghc ghc-paths random
          temporary text weigh
        ];
-       homepage = "https://github.com/knupfer/type-of-html";
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215869,7 +207952,6 @@ self: {
        sha256 = "00329zkxlbsjlwnw2pz2w6ahiam5c1k9j9fv2608wjfmxr8xkcr9";
        libraryHaskellDepends = [ base template-haskell type-of-html ];
        testHaskellDepends = [ base type-of-html ];
-       homepage = "https://github.com/knupfer/type-of-html-static";
        description = "Optimize static parts of type-of-html";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215881,7 +207963,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "0x0bshb13b7i4imn0pgpljcj109c9z5mgw84mjmlcg62d3ryvg6v";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/Shou/type-operators#readme";
        description = "Various type-level operators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215923,7 +208004,6 @@ self: {
        version = "0.1";
        sha256 = "1ygg511j0av1g94mclrsf3p0qb2kc89jcz9nfr5fm073a2jlzlih";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "http://code.atnnn.com/projects/type-prelude";
        description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -215953,7 +208033,6 @@ self: {
        sha256 = "0hd2lgfp6vydynr2ip4zy4kg2jzrfkrrqj1vnx1fn4zwkqqimkdf";
        libraryHaskellDepends = [ base pretty ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/sheyll/type-spec#readme";
        description = "Type Level Specification by Example";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -215992,7 +208071,6 @@ self: {
          template-haskell text th-instance-reification time transformers
          unordered-containers vector
        ];
-       homepage = "https://github.com/nikita-volkov/type-structure";
        description = "Type structure analysis";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216018,7 +208096,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          th-instances tuple uniplate
        ];
-       homepage = "http://github.com/jfischoff/type-sub-th";
        description = "Substitute types for other types with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216037,7 +208114,6 @@ self: {
          base base-compat containers mtl pretty template-haskell zenc
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/pikajude/type-tree";
        description = "Tree representations of datatypes";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216056,7 +208132,6 @@ self: {
          applicative-numbers base constraints newtype-generics ty
          vector-space
        ];
-       homepage = "https://github.com/conal/type-unary";
        description = "Type-level and typed unary natural numbers, inequality proofs, vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216069,7 +208144,6 @@ self: {
        sha256 = "1ps9rkysx7zbcqkz51ahayg2jivlihiqdlb27iq7bf9aa7383k6v";
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/bennofs/typeable-th";
        description = "Automatic deriving of TypeableN instances with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216086,7 +208160,6 @@ self: {
        libraryHaskellDepends = [
          base lifted-base monad-control transformers-base
        ];
-       homepage = "https://github.com/osa1/typed-duration#readme";
        description = "Thread delay and timeout functions with typed arguments";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216106,7 +208179,6 @@ self: {
          async base base64-bytestring bytestring hspec process stm temporary
          transformers
        ];
-       homepage = "https://haskell-lang.org/library/typed-process";
        description = "Run external processes, with strong typing of streams";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -216173,7 +208245,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring directory filepath HTF process temporary text
        ];
-       homepage = "http://github.com/typed-wire/typed-wire#readme";
        description = "Language-independent type-safe communication";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216190,7 +208261,6 @@ self: {
        libraryHaskellDepends = [
          aeson base base64-bytestring bytestring text time
        ];
-       homepage = "http://github.com/typed-wire/hs-typed-wire-utils#readme";
        description = "Haskell utility library required for code generated by typed-wire compiler";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216221,7 +208291,6 @@ self: {
          aeson base bytestring haskell-src-meta parsec template-haskell text
          transformers
        ];
-       homepage = "https://github.com/tolysz/typedquery";
        description = "Parser for SQL augmented with types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216251,7 +208320,6 @@ self: {
          base constraints convert exceptions lens mtl pretty pretty-show
          primitive transformers
        ];
-       homepage = "https://github.com/luna/typelevel";
        description = "Useful type level operations (type families and related operators)";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216270,7 +208338,6 @@ self: {
          array base HUnit numeric-prelude QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/nushio3/typelevel-tensor";
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216287,7 +208354,6 @@ self: {
        libraryHaskellDepends = [
          base base-compat constraints reflection transformers
        ];
-       homepage = "https://github.com/mstksg/typelits-witnesses";
        description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -216317,7 +208383,6 @@ self: {
          base constraints deepseq ghc-prim primitive reflection tagged
          template-haskell vector
        ];
-       homepage = "http://github.com/mikeizbicki/typeparams/";
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216332,7 +208397,6 @@ self: {
        revision = "2";
        editedCabalFile = "0h8hlx3zb7s8dfh275ich99j4aa4gdj2f8yvzwpmzgylcvn1gfwg";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/philopon/types-compat";
        description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216345,7 +208409,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1kg4pvrnf7vwvrcb998l9w08dpdy9hg7x2d9h5s3lqpnvvxfgcfj";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/Ericson2314/typesafe-endian";
        description = "Enforce endianness with types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216365,7 +208428,6 @@ self: {
          th-strict-compat th-utilities
        ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/igrep/typesafe-precure#readme";
        description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216386,7 +208448,6 @@ self: {
          base blaze-html cmdtheline containers filemanip filepath
          language-typescript parsec split syb utf8-string
        ];
-       homepage = "http://github.com/paf31/typescript-docs";
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216434,7 +208495,6 @@ self: {
          aeson base bytestring HUnit protolude reflection singletons
          test-framework test-framework-hunit text vector
        ];
-       homepage = "https://github.com/rlupton20/tyro#readme";
        description = "Type derived JSON parsing using Aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216463,7 +208523,6 @@ self: {
          base criterion lens thyme time timezone-olson timezone-series
        ];
        preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo";
-       homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -216485,7 +208544,6 @@ self: {
          base bytestring HUnit test-framework test-framework-hunit
          test-framework-th unix
        ];
-       homepage = "https://github.com/nilcons/haskell-tzdata";
        description = "Time zone database (as files and as a module)";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -216504,7 +208562,6 @@ self: {
          bytestring cryptohash cryptonite text
        ];
        testHaskellDepends = [ base bytestring either-unwrap hspec text ];
-       homepage = "https://github.com/EButlerIV/u2f";
        description = "Haskell Universal Two Factor helper toolbox library thing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216571,7 +208628,6 @@ self: {
          base containers directory filepath hslogger mtl network process
          regex-compat time time-locale-compat unix
        ];
-       homepage = "http://hub.darcs.net/dino/uacpid";
        description = "Userspace Advanced Configuration and Power Interface event daemon";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216584,7 +208640,6 @@ self: {
        sha256 = "19wmvcx4l2zx45x4czaipy01i1m3zxrdbpiqnnq33x1yawivhskm";
        libraryHaskellDepends = [ aeson base text webapi ];
        testHaskellDepends = [ base hspec text ];
-       homepage = "https://github.com/byteally/webapi-uber.git";
        description = "Uber client for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216597,7 +208652,6 @@ self: {
        version = "0.0";
        sha256 = "12p948706scjiazlwv0x1afl3v8fhv4a3l8yqn1x4y9xnr4pfmc9";
        libraryHaskellDepends = [ base lens tagged template-haskell ];
-       homepage = "https:/github.com/fumieval/uberlast";
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216631,7 +208685,6 @@ self: {
          base binary bytestring cereal containers ghc-prim mtl network unix
          utf8-string
        ];
-       homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Small DBus implementation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216645,7 +208698,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring udbus xml ];
-       homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216671,7 +208723,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring posix-paths unix ];
        libraryPkgconfigDepends = [ libudev ];
-       homepage = "https://github.com/pxqr/udev";
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
@@ -216688,7 +208739,6 @@ self: {
        libraryHaskellDepends = [
          base chunked-data conduit-combinators mono-traversable network
        ];
-       homepage = "https://github.com/kqr/udp-conduit#readme";
        description = "Simple fire-and-forget conduit UDP wrappers";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216703,7 +208753,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring network resourcet streaming
        ];
-       homepage = "https://hub.darcs.net/mihaigiurgeanu/udp-streaming";
        description = "Streaming to and from UDP socket";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -216742,7 +208791,6 @@ self: {
          filepath hashable mtl network old-locale primitive process syb
          transformers uhc-util utf8-string uulib vector
        ];
-       homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216763,7 +208811,6 @@ self: {
          containers directory fclabels fgl hashable logict-state mtl pqueue
          process time time-compat transformers uulib vector
        ];
-       homepage = "https://github.com/UU-ComputerScience/uhc-util";
        description = "UHC utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216802,7 +208849,6 @@ self: {
          async base bytestring bytestring-lexing deepseq network
          optparse-applicative
        ];
-       homepage = "https://github.com/hvr/uhttpc";
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216833,7 +208879,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring cereal dataenc text uuid
        ];
-       homepage = "http://github.com/hargettp/uid.git";
        description = "Simple unique identifier datatype, serializable and encodable as base32";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -216859,7 +208904,6 @@ self: {
        benchmarkHaskellDepends = [
          base deepseq format-numbers text time
        ];
-       homepage = "https://github.com/steven777400/ulid";
        description = "Implementation of ULID, lexicographically sortable unique identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216877,7 +208921,6 @@ self: {
        executableHaskellDepends = [
          base bytestring cmdargs directory filepath io-storage process
        ];
-       homepage = "https://github.com/jwiegley/una";
        description = "Universal un-archiver utility";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216895,7 +208938,6 @@ self: {
        libraryHaskellDepends = [
          atomic-primops base bytestring hashabler primitive
        ];
-       homepage = "http://github.com/jberryman/unagi-bloomfilter";
        description = "A fast, cache-efficient, concurrent bloom filter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216925,7 +208967,6 @@ self: {
        version = "0.2.3";
        sha256 = "1nhv6wbaw9knryq4rsb3y0k5kvhzb9ivkh9vjkvw4rccjikabc9a";
        libraryHaskellDepends = [ base io-streams unagi-chan ];
-       homepage = "https://github.com/bitnomial/unagi-streams";
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216940,7 +208981,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://haskell.org/haskellwiki/unamb";
        description = "Unambiguous choice";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216952,7 +208992,6 @@ self: {
        version = "0.13";
        sha256 = "0r694wi9xg8brgcwl2kyv5amp6v539l121s9bpmd5lhjdnrvqjwk";
        libraryHaskellDepends = [ base containers mtl ];
-       homepage = "http://github.com/luqui/unamb-custom";
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216973,7 +209012,6 @@ self: {
          base binary containers mtl parsec pretty QuickCheck RepLib
          template-haskell transformers
        ];
-       homepage = "https://github.com/sweirich/replib";
        description = "Generic support for programming with names and binders";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -216997,7 +209035,6 @@ self: {
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "http://github.com/lambdageek/unbound-generics";
        description = "Support for programming with names and binders using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217009,7 +209046,6 @@ self: {
        version = "0.1.1.0";
        sha256 = "1ir9fghbrc214c97bwafk5ck6cacxz1pdnq4i18p604d1b8zg9wa";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/basvandijk/unbounded-delays";
        description = "Unbounded thread delays and timeouts";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217021,7 +209057,6 @@ self: {
        version = "0.4";
        sha256 = "02j4i2dms15vb87ar3m99hvpxrjdakljyql708zs716k1jdm7614";
        libraryHaskellDepends = [ base unbounded-delays units units-defs ];
-       homepage = "https://github.com/jcristovao/unbouded-delays-units";
        description = "Thread delays and timeouts using proper time units";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217034,7 +209069,6 @@ self: {
        version = "0.0.2.4";
        sha256 = "0yahavqjjnlf4ps8kd41s9s64nbhx2hf7qzk2xxkmq0i3b91d123";
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://github.com/ekmett/unboxed-containers";
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217048,7 +209082,6 @@ self: {
        sha256 = "0gvpp35mzx6ydwhwqdv319pl4yw7g4pyayciry83lnh3a3asisv4";
        libraryHaskellDepends = [ base ghc-prim primitive ];
        testHaskellDepends = [ async base HUnit ];
-       homepage = "https://github.com/winterland1989/unboxed-ref";
        description = "Fast unboxed references for ST and IO monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217069,7 +209102,6 @@ self: {
          cryptonite memory process text unix
        ];
        executableHaskellDepends = [ base bytestring cmdargs ];
-       homepage = "https://e.xtendo.org/scs/unbreak";
        description = "Secure and resilient remote file storage utility";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217087,7 +209119,6 @@ self: {
          ad base base-compat containers free mwc-random primitive
          transformers
        ];
-       homepage = "https://github.com/mstksg/uncertain";
        description = "Manipulating numbers with inherent experimental/measurement uncertainty";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217109,7 +209140,6 @@ self: {
        version = "0.3.0";
        sha256 = "1f7h7zwky4scdcyjspg4ksfh7x6yra0wjybxq70p7vcwpgk2nzlj";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/singpolyma/unexceptionalio";
        description = "IO without any non-error, synchronous exceptions";
        license = "unknown";
      }) {};
@@ -217121,7 +209151,6 @@ self: {
        version = "0.4.0";
        sha256 = "09gynk472l7nn5l2w320n4dwigwp0wh0shfp6dyw6r5h2jdxz18p";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/singpolyma/unexceptionalio";
        description = "IO without any non-error, synchronous exceptions";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217134,7 +209163,6 @@ self: {
        version = "0.4.0";
        sha256 = "19jzvxx0z4w7d1mp09spiz01sd349376hf5xkg8r2zfr8fx7hj71";
        libraryHaskellDepends = [ base transformers unexceptionalio ];
-       homepage = "https://github.com/singpolyma/unexceptionalio-trans";
        description = "A wrapper around UnexceptionalIO using monad transformers";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217151,7 +209179,6 @@ self: {
        libraryHaskellDepends = [
          base containers ghc-prim one-liner QuickCheck random transformers
        ];
-       homepage = "https://github.com/sjoerdvisscher/unfoldable";
        description = "Class of data structures that can be unfolded";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217179,7 +209206,6 @@ self: {
        version = "1.0.0";
        sha256 = "1hn30p9vpsvkph54grzwdrca5vh9grpa7d0w1zlvim1mnvqxmn4b";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/andriyp/ungadtagger";
        description = "Abstract GADTs from typelevel tags";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217191,7 +209217,6 @@ self: {
        version = "2.2.2.0";
        sha256 = "1damlhi56xfp4xvdk2ijxjx7vxywhhbi4hiprdx09b5ipblrfpqz";
        libraryHaskellDepends = [ base containers uni-util ];
-       homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Event handling for the uniform workbench";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217208,7 +209233,6 @@ self: {
        libraryHaskellDepends = [
          base containers mtl uni-events uni-htk uni-reactor uni-util
        ];
-       homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Graphs";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217226,7 +209250,6 @@ self: {
          base containers directory uni-events uni-posixutil uni-reactor
          uni-util
        ];
-       homepage = "http://www.informatik.uni-bremen.de/htk/";
        description = "Graphical User Interface for Haskell Programs";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217243,7 +209266,6 @@ self: {
        libraryHaskellDepends = [
          base directory process uni-events uni-util unix
        ];
-       homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217259,7 +209281,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory uni-events uni-util
        ];
-       homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Reactors for the uniform workbench";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217277,7 +209298,6 @@ self: {
          base containers uni-events uni-graphs uni-posixutil uni-reactor
          uni-util
        ];
-       homepage = "http://www.informatik.uni-bremen.de/uniform/wb";
        description = "Graphs binding";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217295,7 +209315,6 @@ self: {
          array base bytestring containers directory ghc-prim mtl network
          old-time parsec
        ];
-       homepage = "http://www.informatik.uni-bremen.de/uniform/wb/";
        description = "Utilities for the uniform workbench";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217311,7 +209330,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base containers semigroups ];
        testHaskellDepends = [ base containers utility-ht ];
-       homepage = "http://hub.darcs.net/thielema/unicode/";
        description = "Construct and transform unicode characters";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217337,7 +209355,6 @@ self: {
        sha256 = "1smfc7a62xi6y4sc0vai2l0nljxl9dr9l5zkqi17n14cq36ppfwb";
        libraryHaskellDepends = [ base bytestring compact-string ];
        librarySystemDepends = [ icu ];
-       homepage = "http://sloompie.reinier.de/unicode-normalization/";
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217378,7 +209395,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/nushio3/unicode-show#readme";
        description = "print and show in unicode";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217412,7 +209428,6 @@ self: {
        benchmarkHaskellDepends = [
          base deepseq filepath gauge optparse-applicative path path-io text
        ];
-       homepage = "http://github.com/harendra-kumar/unicode-transforms";
        description = "Unicode normalization";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217435,7 +209450,6 @@ self: {
          base data-default directory filepath text twitch
        ];
        testHaskellDepends = [ base text ];
-       homepage = "https://github.com/Zankoku-Okuno/unicoder";
        description = "Make writing in unicode easy";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217448,7 +209462,6 @@ self: {
        sha256 = "1s8j1vpdhj6fby9r2vi9yyyjd960mvz6hh0lx25p38hl9akkvjrz";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/mwotton/unidecode#readme";
        description = "Haskell binding of Unidecode";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217460,7 +209473,6 @@ self: {
        version = "0.10.0.1";
        sha256 = "15hrnmgr0pqq43fwgxc168r08xjgfhr2nchmz5blq46vwrh6gx2v";
        libraryHaskellDepends = [ base containers logict mtl ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Simple generic unification algorithms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217480,7 +209492,6 @@ self: {
        ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ attoparsec base bytestring Cabal ];
-       homepage = "https://sealgram.com/git/haskell/uniform-io";
        description = "Uniform IO over files, network, anything";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217494,7 +209505,6 @@ self: {
        sha256 = "17dz0car02w2x5m23hlqlgjnpl86darc8vvr4axpsc9xim4sf7nk";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base deepseq prelude-extras ];
-       homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217524,7 +209534,6 @@ self: {
        revision = "1";
        editedCabalFile = "13cwjh03n82sgshbk4fdlvhc0pb3v979sdcdrpvnpjdqmvcprs92";
        libraryHaskellDepends = [ base containers transformers ];
-       homepage = "http://github.com/nominolo/union-find";
        description = "Efficient union and equivalence testing of sets";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217536,7 +209545,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1pxb1v2k04i8ds2n8zqra74gacry6dj5p87sxgkf4fazx4s316dk";
        libraryHaskellDepends = [ array base mtl ];
-       homepage = "https://github.com/haskell-rewriting/union-find-array";
        description = "union find data structure";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -217548,7 +209556,6 @@ self: {
        version = "0.1";
        sha256 = "0q1qg0vg01ypjlb90xq8zl3zc53b3yn23vgpnzv92q7xmc46gb5l";
        libraryHaskellDepends = [ base containers extensible ];
-       homepage = "http://github.com/minpou/union-map";
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217565,7 +209572,6 @@ self: {
        libraryHaskellDepends = [
          base containers hashable syb unordered-containers
        ];
-       homepage = "http://community.haskell.org/~ndm/uniplate/";
        description = "Help writing simple, concise and fast generic operations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217582,7 +209588,6 @@ self: {
        testHaskellDepends = [
          attoparsec base hspec neat-interpolation QuickCheck text
        ];
-       homepage = "https://github.com/biocad/uniprot-kb#readme";
        description = "UniProt-KB format parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217596,7 +209601,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring containers ];
-       homepage = "https://github.com/ncaq/uniq-deep";
        description = "uniq-deep";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -217610,7 +209614,6 @@ self: {
        revision = "1";
        editedCabalFile = "0pq3a5y8ddgd37x21vafwxpyi079ir7k9g96y99pygmxwibkg4v8";
        libraryHaskellDepends = [ base ghc-prim hashable ];
-       homepage = "http://github.com/ekmett/unique/";
        description = "Fully concurrent unique identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217629,7 +209632,6 @@ self: {
        testHaskellDepends = [
          base non-empty QuickCheck semigroups transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/unique-logic/";
        description = "Solve simple simultaneous equations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217648,7 +209650,6 @@ self: {
        testHaskellDepends = [
          base non-empty QuickCheck transformers utility-ht
        ];
-       homepage = "http://hub.darcs.net/thielema/unique-logic-tf/";
        description = "Solve simple simultaneous equations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217660,7 +209661,6 @@ self: {
        version = "0.1.1";
        sha256 = "0s1jw29g5s9ll8hbfkyalhdjpsv54w1n63mz4jph36dbq68zb7g6";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/sebfisch/uniqueid/wikis";
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217679,7 +209679,6 @@ self: {
          base checkers containers doctest QuickCheck
        ];
        benchmarkHaskellDepends = [ base criterion random ];
-       homepage = "https://github.com/oisdk/uniquely-represented-sets#readme";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -217691,7 +209690,6 @@ self: {
        sha256 = "1v7fv4xpb2jvcicbl6mhjkgqmap4m842dwc41fpidd9l9pb8mpaz";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/amohrland/haskell-unit";
        description = "Aliases for `()`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217725,7 +209723,6 @@ self: {
          singletons syb tasty tasty-hunit template-haskell th-desugar
          units-parser vector-space
        ];
-       homepage = "https://github.com/goldfirere/units";
        description = "A domain-specific type system for dimensional analysis";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217741,7 +209738,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base template-haskell text units units-defs
        ];
-       homepage = "https://github.com/jcristovao/units-attoparsec";
        description = "Attoparsec parsers for the units package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217754,7 +209750,6 @@ self: {
        version = "2.0.1.1";
        sha256 = "0p99gchk3m4ibmhr6jws57sv083q142rhxjavq9laz97gjm2r9w2";
        libraryHaskellDepends = [ base template-haskell units ];
-       homepage = "http://github.com/goldfirere/units-defs";
        description = "Definitions for use with the units package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217784,12 +209779,33 @@ self: {
        sha256 = "1ab27rwnp8ncfn5sm4llxjxx7fbp495sl1838g8z9hishr5dgddl";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/xnyhps/haskell-unittyped/";
        description = "An extendable library for type-safe computations including units";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unity-testresult-parser" = callPackage
+    ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers
+     , mtl, optparse-applicative, split, text, unordered-containers
+     , xml-conduit
+     }:
+     mkDerivation {
+       pname = "unity-testresult-parser";
+       version = "0.1.0.1";
+       sha256 = "1siz1iq66bvwraws628haqf3q2hycd4a2yihpmqs778mzjnhs26r";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers optparse-applicative text unordered-containers
+         xml-conduit
+       ];
+       executableHaskellDepends = [
+         ansi-terminal ansi-wl-pprint base mtl optparse-applicative split
+         text
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unitym" = callPackage
     ({ mkDerivation, base, text, transformers }:
      mkDerivation {
@@ -217797,7 +209813,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "16rvv72ya9dp5x0lr6n4kbslgqds87x3fbf9v5rsylx0dgig48js";
        libraryHaskellDepends = [ base text transformers ];
-       homepage = "https://github.com/bhurt/unitym#readme";
        description = "A monad type class shared between web services";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217813,7 +209828,6 @@ self: {
        libraryHaskellDepends = [
          base mtl servant-server text transformers unitym
        ];
-       homepage = "https://github.com/bhurt/unitym#readme";
        description = "Implementaation of unitym for Servant servers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217825,7 +209839,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "1qg0iqww3yq5kzy6x9fc3p64vcsa53ricagnknzwhhjirh9yy3yw";
        libraryHaskellDepends = [ base unitym yesod ];
-       homepage = "https://github.com/bhurt/unitym#readme";
        description = "Implementation of the unity monad for the Yesod framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217856,7 +209869,6 @@ self: {
          universe-instances-base universe-instances-extended
          universe-instances-trans universe-reverse-instances
        ];
-       homepage = "https://github.com/dmwit/universe";
        description = "Classes for types where we know all the values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217868,7 +209880,6 @@ self: {
        version = "1.0.2.1";
        sha256 = "0ldvk0bj16hl1v824vvsich3rzx84xm3sbppd5ahpp5cmx887i07";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/dmwit/universe";
        description = "A class for finite and recursively enumerable types and some helper functions for enumerating them";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217882,7 +209893,6 @@ self: {
        revision = "1";
        editedCabalFile = "13s8gxsvkw6phwvd79h9f3xaqbyzsx1svpysbmq72z1hv3mqyz8a";
        libraryHaskellDepends = [ base containers universe-base ];
-       homepage = "https://github.com/dmwit/universe";
        description = "Universe instances for types from the base package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217900,7 +209910,6 @@ self: {
        libraryHaskellDepends = [
          adjunctions base comonad universe-instances-base void
        ];
-       homepage = "https://github.com/dmwit/universe";
        description = "Universe instances for types from select extra packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217918,7 +209927,6 @@ self: {
        libraryHaskellDepends = [
          base mtl transformers universe-base universe-instances-base
        ];
-       homepage = "https://github.com/dmwit/universe";
        description = "Universe instances for types from the transformers and mtl packages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217934,7 +209942,6 @@ self: {
        libraryHaskellDepends = [
          base containers universe-instances-base
        ];
-       homepage = "https://github.com/dmwit/universe";
        description = "instances of standard classes that are made possible by enumerations";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -217957,7 +209964,6 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 th-instances tuple uniplate
        ];
-       homepage = "http://github.com/jfishcoff/universe-th";
        description = "Construct a Dec's ancestor list";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -217986,7 +209992,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers gauge unordered-containers
        ];
-       homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -218014,7 +210019,6 @@ self: {
        benchmarkHaskellDepends = [
          base containers gauge unordered-containers
        ];
-       homepage = "https://github.com/serokell/universum";
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218029,7 +210033,6 @@ self: {
        revision = "1";
        editedCabalFile = "0cag1vm2pmzgy0v1j27lhp37iipck06n6gjlphpl26p5xw3gwd31";
        libraryHaskellDepends = [ base bytestring time ];
-       homepage = "https://github.com/haskell/unix";
        description = "POSIX functionality";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218042,7 +210045,6 @@ self: {
        version = "0.3.7.3";
        sha256 = "1340zxy9w8nmmhhwgg9rznvz8iyfhinpycdpkryqp60ilhyjgv53";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://code.haskell.org/~wren/";
        description = "Unix/Posix-specific functions for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218054,7 +210056,6 @@ self: {
        version = "0.5.0.1";
        sha256 = "1gdf3h2knbymkivm784vq51mbcyj5y91r480awyxj5cw8gh9kwn2";
        libraryHaskellDepends = [ base unix ];
-       homepage = "http://github.com/jystic/unix-compat";
        description = "Portable POSIX-compatibility layer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218068,7 +210069,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base foreign-var ];
-       homepage = "https://github.com/maoe/unix-fcntl";
        description = "Comprehensive bindings to fcntl(2)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218110,7 +210110,6 @@ self: {
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck unix
        ];
-       homepage = "http://github.com/vincenthz/hs-unix-memory";
        description = "Unix memory syscalls";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218132,7 +210131,6 @@ self: {
        testHaskellDepends = [
          base bytestring conduit hspec transformers unix
        ];
-       homepage = "https://github.com/snoyberg/conduit";
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218145,7 +210143,6 @@ self: {
        version = "0.1";
        sha256 = "1n21cd6chih86g6kfl6b0x4k533ykzz93anhf6wga3033rvy09wj";
        libraryHaskellDepends = [ base unix ];
-       homepage = "http://code.haskell.org/~scook0/unix-pty-light";
        description = "POSIX pseudo-terminal support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218185,7 +210182,6 @@ self: {
          invariant pretty primitive scientific text time
          unordered-containers vector
        ];
-       homepage = "https://github.com/scrive/unjson";
        description = "Bidirectional JSON parsing and generation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218220,7 +210216,6 @@ self: {
          async base deepseq directory filepath hspec process stm time
          transformers unix unliftio-core
        ];
-       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -218234,7 +210229,6 @@ self: {
        revision = "1";
        editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme";
        description = "The MonadUnliftIO typeclass for unlifting monads to IO";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -218245,8 +210239,8 @@ self: {
      }:
      mkDerivation {
        pname = "unliftio-pool";
-       version = "0.2.0.0";
-       sha256 = "0alwn39ri4npgxfxvnv43bl8vfjhjl4ffcvv8l9nmrmzsh770p59";
+       version = "0.2.1.0";
+       sha256 = "0qhgiym7slz3n68py4izs52wfhs5d7nyxzwnj8q86rvkvy6lfm5v";
        libraryHaskellDepends = [
          base resource-pool time transformers unliftio-core
        ];
@@ -218315,7 +210309,6 @@ self: {
          base bytestring containers criterion deepseq deepseq-generics
          hashable hashmap mtl random
        ];
-       homepage = "https://github.com/tibbe/unordered-containers";
        description = "Efficient hashing-based container types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218334,7 +210327,6 @@ self: {
        testHaskellDepends = [
          base hashable hspec HUnit rematch unordered-containers
        ];
-       homepage = "http://github.com/tcrayford/rematch";
        description = "Rematch support for unordered containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218368,7 +210360,6 @@ self: {
        testHaskellDepends = [
          base containers deepseq primitive QuickCheck tasty tasty-quickcheck
        ];
-       homepage = "https://github.com/ethercrow/unordered-intmap";
        description = "A specialization of `HashMap Int v`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218402,11 +210393,34 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        doHaddock = false;
-       homepage = "http://github.com/ekmett/unpacked-containers/";
        description = "Unpacked containers via backpack";
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "unpacked-either" = callPackage
+    ({ mkDerivation, base, ghc-prim, QuickCheck, quickcheck-classes }:
+     mkDerivation {
+       pname = "unpacked-either";
+       version = "0.1.0.0";
+       sha256 = "156njvsi91c0vmn0inr0n714qcj4y8hvjcjhp3k35h59l7jmlcph";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base QuickCheck quickcheck-classes ];
+       description = "An unpacked either data type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "unpacked-maybe" = callPackage
+    ({ mkDerivation, base, ghc-prim, QuickCheck, quickcheck-classes }:
+     mkDerivation {
+       pname = "unpacked-maybe";
+       version = "0.1.0.0";
+       sha256 = "13m0yai735cw910p4vm508yyxp0dgmizp6pjgja698aasarvrn96";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base QuickCheck quickcheck-classes ];
+       description = "An unpacked maybe data type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unroll-ghc-plugin" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -218414,7 +210428,6 @@ self: {
        version = "0.1.1";
        sha256 = "0n05777fqqpbgnh9jab04ayw1j1as4wkkbrjixi1288fhi44m87p";
        libraryHaskellDepends = [ base ghc ];
-       homepage = "http://thoughtpolice.github.com/unroll-ghc-plugin";
        description = "Compiler plugin for loop unrolling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218428,7 +210441,6 @@ self: {
        sha256 = "0hc6xr1i3hkz25gdgfx1jqgpsc9mwa05bkfynp0mcfdlyz6782nz";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://code.haskell.org/~thielema/unsafe/";
        description = "Unified interface to unsafe functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218440,7 +210452,6 @@ self: {
        version = "0.0.1.3";
        sha256 = "1018c3q0aq6l0011az661dvlibiv6jvwdv4c40bi8pwapri66k70";
        libraryHaskellDepends = [ base threads ];
-       homepage = "https://github.com/kallisti-dev/unsafe-promises";
        description = "Create pure futures using lazy IO";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218454,7 +210465,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/konn/unsafely";
        description = "Flexible access control for unsafe operations and instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218468,7 +210478,6 @@ self: {
        sha256 = "0l268mzlmswm0p9cybjvi6krsgic706av9kf90fx3ylyvhgzygvc";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/atzeus/unsafeperformst";
        description = "Like unsafeperformIO, but for the ST monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218506,7 +210515,6 @@ self: {
          attoparsec interspersed QuickCheck quickcheck-instances rebase
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
-       homepage = "https://github.com/nikita-volkov/unsequential";
        description = "An extension removing the sequentiality from monads";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218549,7 +210557,6 @@ self: {
          base mtl optparse-applicative transformers
        ];
        testHaskellDepends = [ base containers hspec text ];
-       homepage = "https://github.com/joshuaclayton/unused#readme";
        description = "A command line tool to identify unused code";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218569,7 +210576,6 @@ self: {
          units-parser
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       homepage = "https://github.com/adamgundry/uom-plugin";
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218588,7 +210594,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath lambda-options mtl split
        ];
-       homepage = "https://github.com/thomaseding/up";
        description = "Command line tool to generate pathnames to facilitate moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218603,7 +210608,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ports-tools process ];
-       homepage = "http://github.com/ppenzin/up/";
        description = "Software management tool";
        license = "unknown";
      }) {};
@@ -218624,7 +210628,6 @@ self: {
          process text time transformers trifecta uniplate utf8-string
        ];
        executableHaskellDepends = [ base text ];
-       homepage = "https://github.com/expipiplus1/update-nix-fetchgit#readme";
        description = "A program to update fetchgit values in Nix expressions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218648,7 +210651,6 @@ self: {
          base directory filepath monad-parallel split
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/pedrovgs/update-repos";
        description = "Update all your git repositories with just one command";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -218701,7 +210703,6 @@ self: {
          network old-locale opml optparse-applicative parallel-io split
          tagsoup terminal-size text time xml
        ];
-       homepage = "https://github.com/pxqr/ureader";
        description = "Minimalistic CLI RSS reader";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218723,7 +210724,6 @@ self: {
          base bytestring cake3 directory filepath language-javascript
          mime-types mtl optparse-applicative process syb text
        ];
-       homepage = "http://github.com/grwlf/urembed";
        description = "Ur/Web static content generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218736,7 +210736,6 @@ self: {
        version = "0.1.6.4";
        sha256 = "02g49smrq4j3wnk4f9w73a80fxva4rrlgw9jqw6p8cqxrb9x6359";
        libraryHaskellDepends = [ base parsec safe utf8-string ];
-       homepage = "http://gitorious.org/uri";
        description = "Library for working with URIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218766,7 +210765,6 @@ self: {
          base blaze-builder bytestring criterion deepseq deepseq-generics
          network-uri
        ];
-       homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218796,7 +210794,6 @@ self: {
          base blaze-builder bytestring criterion deepseq deepseq-generics
          network-uri
        ];
-       homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218811,7 +210808,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring text uri-bytestring
        ];
-       homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
        description = "Aeson instances for URI Bytestring";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218829,7 +210825,6 @@ self: {
          base bytestring conduit containers deepseq failure monad-control
          network system-fileio system-filepath text transformers
        ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218863,7 +210858,6 @@ self: {
          base bytestring containers enumerator failure network text
          transformers
        ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218883,7 +210877,6 @@ self: {
          network system-fileio system-filepath text transformers
          uri-enumerator
        ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "uri-enumerator backend for the file scheme (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218901,7 +210894,6 @@ self: {
          attoparsec base bytestring data-default http-types lens text
        ];
        testHaskellDepends = [ base data-default hspec lens ];
-       homepage = "https://github.com/luminescent-dreams/uri-parse#readme";
        description = "A simple library for parsing and generating URIs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -218941,7 +210933,6 @@ self: {
        testHaskellDepends = [
          ansi-wl-pprint base HUnit mtl template-haskell
        ];
-       homepage = "https://github.com/iand675/uri-templater";
        description = "Parsing & Quasiquoting for RFC 6570 URI Templates";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -218953,7 +210944,6 @@ self: {
        version = "2.1.3";
        sha256 = "0qag18wbrq9jjk1444mjigz1xl7xl03fz66b1lnya9qaihzpxwjs";
        libraryHaskellDepends = [ base utf8-string ];
-       homepage = "http://www.haskell.org/haskellwiki/Url";
        description = "A library for working with URLs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -218976,7 +210966,6 @@ self: {
          tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ criterion http-types rerebase ];
-       homepage = "https://github.com/nikita-volkov/url-decoders";
        description = "Decoders for URL-encoding (aka Percent-encoding)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219009,7 +210998,6 @@ self: {
        executableHaskellDepends = [
          base bytestring containers mtl network old-time
        ];
-       homepage = "http://code.haskell.org/~dons/code/urlcheck";
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219024,7 +211012,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base network ];
-       homepage = "https://github.com/beastaugh/urldecode";
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219043,15 +211030,16 @@ self: {
      }) {};
 
   "urlencoded" = callPackage
-    ({ mkDerivation, base, mtl, network, network-uri, split }:
+    ({ mkDerivation, base, mtl, network, network-uri, QuickCheck, split
+     }:
      mkDerivation {
        pname = "urlencoded";
-       version = "0.4.1";
-       sha256 = "16b7jxkfva8dyvl4fdg337jmv08aicycj041s79ak9r6zh41hhwi";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.2.0";
+       sha256 = "1i88qf5dq52ra7hl29ka1i0bhyfic3sg7ksm1n6bpb2hj38hr139";
+       revision = "1";
+       editedCabalFile = "1bglhr4dsfw0yzm5kb6jwrx2dpz7zjyvg5341idncvmlc0f6wx7w";
        libraryHaskellDepends = [ base mtl network network-uri split ];
-       homepage = "https://github.com/pheaver/urlencoded";
+       testHaskellDepends = [ base network network-uri QuickCheck ];
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219090,7 +211078,6 @@ self: {
          monad-control-aligned monad-logger mtl path path-extra resourcet
          split strict text transformers transformers-base vector
        ];
-       homepage = "https://github.com/athanclark/urlpath#readme";
        description = "Painfully simple URL deployment";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219104,7 +211091,6 @@ self: {
        sha256 = "1wxgq445nzfly9773bjx3mr15l8ga4840d2q1zw50kk07fwxx6h7";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/pxqr/urn";
        description = "Universal Resource Names";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219122,7 +211108,6 @@ self: {
          base deepseq haskell-src-meta integer-gmp MonadRandom QuickCheck
          template-haskell transformers
        ];
-       homepage = "https://github.com/antalsz/urn-random";
        description = "A package for updatable discrete distributions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219141,7 +211126,6 @@ self: {
        executableHaskellDepends = [
          base filepath mtl optparse-applicative parsec process syb
        ];
-       homepage = "http://github.com/grwlf/urxml";
        description = "XML parser-printer supporting Ur/Web syntax extensions";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219158,7 +211142,6 @@ self: {
        libraryHaskellDepends = [
          base bindings-libusb bytestring containers ghc-prim text vector
        ];
-       homepage = "http://basvandijk.github.com/usb";
        description = "Communicate with USB devices";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219189,7 +211172,6 @@ self: {
        revision = "1";
        editedCabalFile = "1p780v435frqi04gc8db1jj1ra9c98jpdwmy4p274azp0gi51q9z";
        libraryHaskellDepends = [ attoparsec base bytestring usb ];
-       homepage = "https://github.com/mapinguari/usb-hid";
        description = "Parser and request Library for USB HIDs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219210,7 +211192,6 @@ self: {
          base base-unicode-symbols bytestring containers
          containers-unicode-symbols parsimony
        ];
-       homepage = "https://github.com/roelvandijk/usb-id-database";
        description = "A database of USB identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219227,7 +211208,6 @@ self: {
          base base-unicode-symbols bindings-libusb iteratee monad-control
          usb vector
        ];
-       homepage = "https://github.com/basvandijk/usb-iteratee";
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219245,7 +211225,6 @@ self: {
          base base-unicode-symbols bindings-libusb bytestring iteratee
          regions text transformers usb
        ];
-       homepage = "https://github.com/basvandijk/usb-safe/";
        description = "Type-safe communication with USB devices";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219262,7 +211241,6 @@ self: {
        libraryHaskellDepends = [
          aeson base boomerang cereal safecopy web-routes web-routes-th
        ];
-       homepage = "http://www.github.com/Happstack/userid";
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219278,7 +211256,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bcrypt path-pieces text time
        ];
-       homepage = "https://github.com/agrafix/users";
        description = "A library simplifying user management for web applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -219319,7 +211296,6 @@ self: {
        testHaskellDepends = [
          base hspec monad-logger persistent-sqlite temporary text users-test
        ];
-       homepage = "https://github.com/agrafix/users";
        description = "A persistent backend for the users package";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219337,7 +211313,6 @@ self: {
          base bytestring mtl postgresql-simple text time users uuid
        ];
        testHaskellDepends = [ base hspec postgresql-simple users-test ];
-       homepage = "https://github.com/agrafix/users";
        description = "A PostgreSQL backend for the users package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -219349,7 +211324,6 @@ self: {
        version = "0.5.0.1";
        sha256 = "0gmcbimbp8sj282c915m9bka4fj238xsf8szqmnv20n01kx4k1gn";
        libraryHaskellDepends = [ base hspec text users ];
-       homepage = "https://github.com/agrafix/users";
        description = "Library to test backends for the users library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -219370,7 +211344,6 @@ self: {
          attoparsec base bytestring Cabal clock exceptions QuickCheck
          test-framework test-framework-quickcheck2 text
        ];
-       homepage = "https://github.com/lpeterse/haskell-utc";
        description = "A pragmatic time and date library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219422,7 +211395,6 @@ self: {
        revision = "3";
        editedCabalFile = "02vhj5gykkqa2dyn7s6gn8is1b5fdn9xcqqvlls268g7cpv6rk38";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "http://github.com/glguy/utf8-string/";
        description = "Support for reading and writing UTF8 Strings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219440,7 +211412,6 @@ self: {
          base bytestring tasty tasty-hunit text utf8-string
        ];
        benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/edwardgeorge/utf8-validator#readme";
        description = "Constant-space UTF8 validator for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219480,7 +211451,6 @@ self: {
          array base containers hashable safe unordered-containers
        ];
        testHaskellDepends = [ base containers HTF QuickCheck ];
-       homepage = "https://github.com/factisresearch/opensource-mono#readme";
        description = "A collection of commonly used utils";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219504,7 +211474,6 @@ self: {
        version = "0.1.0.5";
        sha256 = "008ckslrc60959k6l6mvk8dixr6vmfmiir6qj8wakgixcyd6ar6d";
        libraryHaskellDepends = [ ansi-terminal base ];
-       homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: core functionality";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219518,7 +211487,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base uu-cco uuagc uuagc-cabal ];
-       homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: example programs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219530,7 +211498,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "06ddh2fcvy0zbzzdgpcx8kvlssrcmxx4swgkl8iy7223llanx0px";
        libraryHaskellDepends = [ base uu-cco uulib ];
-       homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uulib";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219542,7 +211509,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1sshnlqb0ydxgrhm0i1c3mpnixfsqwrf3gl59yz4rhiw5hy33z71";
        libraryHaskellDepends = [ base ListLike uu-cco uu-parsinglib ];
-       homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: Feedback wrapper around parser in uu-parsinglib";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219554,7 +211520,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1rysap86jrq43b99ay52nrmbdpcba7cl0ac85nsb7gll1rbyr59i";
        libraryHaskellDepends = [ base ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Providing an interleaving combinator for use with applicative/alternative style implementations";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -219571,7 +211536,6 @@ self: {
          base lenses mtl template-haskell transformers uu-interleaved
          uu-parsinglib
        ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Parse command line options using uu-interleave and uu-parsinglib";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219584,7 +211548,6 @@ self: {
        version = "2.9.1.1";
        sha256 = "0v5vcxfix04hmwc7ajni4xrv0g099pr2j79bqx1n24s1cvimlpyj";
        libraryHaskellDepends = [ base ListLike time uu-interleaved ];
-       homepage = "http://www.cs.uu.nl/wiki/bin/view/HUT/ParserCombinators";
        description = "Fast, online, error-correcting, monadic, applicative, merging, permuting, interleaving, idiomatic parser combinators";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -219615,7 +211578,6 @@ self: {
          mtl uuagc-cabal uulib
        ];
        executableHaskellDepends = [ base uuagc-cabal ];
-       homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219638,7 +211600,6 @@ self: {
          array base containers directory filepath ghc-prim haskell-src-exts
          mtl uulib
        ];
-       homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Attribute Grammar System of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219654,7 +211615,6 @@ self: {
        libraryHaskellDepends = [
          base Cabal containers directory filepath mtl process uulib
        ];
-       homepage = "https://github.com/UU-ComputerScience/uuagc";
        description = "Cabal plugin for UUAGC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219682,7 +211642,6 @@ self: {
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base blaze-html ];
        executableHaskellDepends = [ base process ];
-       homepage = "https://github.com/matthijssteen/uuagd";
        description = "A debugger for the UUAG system";
        license = "unknown";
      }) {};
@@ -219710,7 +211669,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion mersenne-random-pure64 random
        ];
-       homepage = "https://github.com/hvr/uuid";
        description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219780,7 +211738,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "09ijnbj2znaqanaxghql3yy1fqb0nsjhrwi6kfzg4h8nrw1ir2pj";
        libraryHaskellDepends = [ base template-haskell uuid ];
-       homepage = "http://github.com/lpeterse/uuid-quasi";
        description = "Supplemental package for 'uuid' allowing quasiquotation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219805,7 +211762,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring containers criterion deepseq random
        ];
-       homepage = "https://github.com/aslatter/uuid";
        description = "Type definitions for Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219817,7 +211773,6 @@ self: {
        version = "0.9.23";
        sha256 = "1v9gwy1zdkyc8f36n52p127gz1r95ykaqklshg0abiai4xnr1yy6";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "https://github.com/UU-ComputerScience/uulib";
        description = "Haskell Utrecht Tools Library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -219831,7 +211786,6 @@ self: {
        revision = "1";
        editedCabalFile = "023may02r17xg5wqh0lplcjdfiwaprbqn9p6jgmqs935qf9zz2g2";
        libraryHaskellDepends = [ base ghc-prim ];
-       homepage = "http://code.haskell.org/~dons/code/uvector";
        description = "Fast unboxed arrays with a flexible interface";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219844,7 +211798,6 @@ self: {
        version = "0.2";
        sha256 = "0jzlirrar7grq3h02k22zxyvy1wmfrjw9lscnhpjqmsxjli1jh81";
        libraryHaskellDepends = [ base uvector ];
-       homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219868,7 +211821,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0q6n18kqga839gkdgdwsfbnbpfm4hh1qjln17qnmfxm3ylh2l9la";
        libraryHaskellDepends = [ base process ];
-       homepage = "http://github.com/Fuuzetsu/uzbl-with-source";
        description = "Utility function for reading a source of loaded uzbl pages";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -219885,7 +211837,6 @@ self: {
          base bindings-DSL bindings-libv4l2 bindings-linux-videodev2
          bindings-posix containers ioctl
        ];
-       homepage = "https://gitorious.org/hsv4l2";
        description = "interface to Video For Linux Two (V4L2)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219900,7 +211851,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base GLUT v4l2 ];
-       homepage = "https://gitorious.org/hsv4l2";
        description = "video for linux two examples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219913,7 +211863,6 @@ self: {
        version = "2.2.0.0";
        sha256 = "157wjx2shzfh6dfl6h8x017cn9ji3ql1p0gpi79ginz4s81f2ny1";
        libraryHaskellDepends = [ array base containers ghc-prim ];
-       homepage = "http://thoughtpolice.github.com/vacuum";
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219931,7 +211880,6 @@ self: {
          base cairo deepseq directory gtk pretty process strict-concurrency
          svgcairo vacuum
        ];
-       homepage = "http://code.haskell.org/~dons/code/vacuum-cairo";
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219964,7 +211912,6 @@ self: {
          base bitmap bitmap-opengl directory filepath GLUT network OpenGL
          process stb-image
        ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220001,7 +211948,6 @@ self: {
        testHaskellDepends = [
          attoparsec base directory filepath process QuickCheck text
        ];
-       homepage = "https://github.com/hamishmack/vado";
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220013,7 +211959,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "14gpkb6pbkvmny17g2gpq6i6kq7ahmcnkgrcrwm72vda12wxsl78";
        libraryHaskellDepends = [ base containers MonadRandom ];
-       homepage = "https://i.joelt.io/symbols.html";
        description = "Valid operator/module characters";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220043,7 +211988,6 @@ self: {
          text
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/agrafix/validate-input";
        description = "Input validation combinator library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220056,7 +212000,6 @@ self: {
        version = "0.2.0";
        sha256 = "0wd4dyv2gfmcxqbhmcil884bdcw8a1qw441280j7rrqy6fp442q2";
        libraryHaskellDepends = [ base bytestring template-haskell ];
-       homepage = "https://github.com/merijn/validated-literals";
        description = "Compile-time checking for partial smart-constructors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220070,7 +212013,6 @@ self: {
        sha256 = "05rxb1i46icjzsjmik97jzxn3vkg3mpvwhprifz1ilsc0s46dv9q";
        libraryHaskellDepends = [ base refined text ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/seanhess/validated-types#readme";
        description = "Type-level constraints on strings and other input";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220087,7 +212029,6 @@ self: {
          base bifunctors deepseq lens semigroupoids semigroups
        ];
        testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
-       homepage = "https://github.com/qfpl/validation";
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220109,7 +212050,6 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          transformers
        ];
-       homepage = "https://github.com/mavenraven/validations";
        description = "A nice way to define field validations in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220128,7 +212068,6 @@ self: {
          aeson base containers exceptions lens monad-control mtl QuickCheck
          text transformers transformers-base transformers-lift vector
        ];
-       homepage = "typeable.io";
        description = "Straightforward validation monad. Convenient solution for validating web forms and APIs.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220140,7 +212079,6 @@ self: {
        version = "0.4.0.4";
        sha256 = "1iva60sfaqnkwdk5b2w6skvsg6096x24bjyd5h057n9dlbimiblx";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220153,7 +212091,6 @@ self: {
        sha256 = "1ba7dvxz2x3ng4k221xawp0bz4gk4lz5gklklgypavp1fdrhf27q";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity typeclass";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220171,7 +212108,6 @@ self: {
          aeson base validity validity-scientific validity-text
          validity-unordered-containers validity-vector
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for aeson";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220188,7 +212124,6 @@ self: {
          aeson base validity validity-scientific validity-text
          validity-unordered-containers validity-vector
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for aeson";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220201,7 +212136,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "118g7as13kvfbwid1qy461vswzgl7bbdclapi6hr2majmwvrlgl7";
        libraryHaskellDepends = [ base bytestring validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for bytestring";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220213,7 +212147,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "1jp1d72qr9axngzgq18k0kvvmc2x8yndpnh9g52zcmm66nkhn2d9";
        libraryHaskellDepends = [ base bytestring validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for bytestring";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220226,7 +212159,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "02kzrz78ikp3hx5szvflixmyddh30iipbapfrc8ypp5k5qar3sgh";
        libraryHaskellDepends = [ base containers validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220238,7 +212170,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "0ksqyr335f0d686j0slpzyph7663xiyv86rblgiaqjjwbj9y1jqf";
        libraryHaskellDepends = [ base containers validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220251,7 +212182,6 @@ self: {
        version = "0.2.0.2";
        sha256 = "0c01nzd998fgxpkiddz6p91s84i10202md9pa1zmza0gik4rcv6y";
        libraryHaskellDepends = [ base filepath path validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for Path";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220268,7 +212198,6 @@ self: {
        testHaskellDepends = [
          base filepath genvalidity-hspec hspec path validity
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for Path";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220281,7 +212210,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0pd5kjdb8nwj8rwvqa3wr377fmcs6wad7zmdv7r41bxzch1qf5zc";
        libraryHaskellDepends = [ base scientific validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for scientific";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220293,7 +212221,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1iphzdh9vqa51im1mx3sg7gpqczm39bcdc6li84lssyflg20kraw";
        libraryHaskellDepends = [ base scientific validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for scientific";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220306,7 +212233,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1r96nn0y7hgm49y79kf3n86960z7gbz2mw4wcnsi9qlccnjq5qk4";
        libraryHaskellDepends = [ base bytestring text validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220318,7 +212244,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "0ccy6b21lxgqp9q2cmddip1r0axwh6ny4c2vrw1a16712yrhrcdf";
        libraryHaskellDepends = [ base bytestring text validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for text";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220331,7 +212256,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1mwyh92vfjq5s2p54vqfyawvvwqvpl2g4f6bqmnk149qqqgxv32z";
        libraryHaskellDepends = [ base time validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for time";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220343,7 +212267,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "1m8wsm97s7cwax183qsbmr8p010k9czigwlqbqr6qha3bk83n4bf";
        libraryHaskellDepends = [ base time validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for time";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220358,7 +212281,6 @@ self: {
        libraryHaskellDepends = [
          base hashable unordered-containers validity
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for unordered-containers";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220372,7 +212294,6 @@ self: {
        libraryHaskellDepends = [
          base hashable unordered-containers validity
        ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for unordered-containers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220385,7 +212306,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "12v1r92skk4acnd8s3kqj1la24anvs5w1h9cjxzgs2j0pqmzdrbf";
        libraryHaskellDepends = [ base uuid validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for uuid";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220397,7 +212317,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "15lk4hig0j6xhz1b7m2hwpvyfwhlrvncgwb1830lpmgvvg18qb9n";
        libraryHaskellDepends = [ base uuid validity ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for uuid";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220410,7 +212329,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0z74m1arw92f96156zxgpbkv1x6fll22hysn2iwrk4i3642127h1";
        libraryHaskellDepends = [ base hashable validity vector ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for vector";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220422,7 +212340,6 @@ self: {
        version = "0.2.0.1";
        sha256 = "0ljihk6qdb52c44hf39wigf3b0f0xs1z7adgxg4fqfxq8zq2a3k4";
        libraryHaskellDepends = [ base hashable validity vector ];
-       homepage = "https://github.com/NorfairKing/validity#readme";
        description = "Validity instances for vector";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220457,7 +212374,6 @@ self: {
          base deepseq directory dlist fgl graphviz haskell-src-exts mtl
          optparse-applicative process uniplate
        ];
-       homepage = "https://github.com/benzrf/vampire";
        description = "Analyze and visualize expression trees";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220476,7 +212392,6 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ array base criterion deepseq ];
-       homepage = "http://github.com/sonyandy/var";
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220489,7 +212404,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "12l536ca32dhvylp3kizq664lsfysmc5r0hqzs50aqrbx8db40ji";
        libraryHaskellDepends = [ base stm ];
-       homepage = "https://github.com/chris-martin/var-monad";
        description = "The VarMonad typeclass, generalizing types of references";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -220525,7 +212439,6 @@ self: {
          base complex-generic floatshow integer-gmp
          type-level-natural-number
        ];
-       homepage = "https://gitorious.org/variable-precision";
        description = "variable-precision floating point";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220539,7 +212452,6 @@ self: {
        sha256 = "0garxmxm11qhp2wm7xib4nrlkfiqbyzf3glkdbqb582nip0sb1rp";
        libraryHaskellDepends = [ base mtl stm ];
        testHaskellDepends = [ base hspec mtl QuickCheck stm ];
-       homepage = "https://github.com/prophile/variables";
        description = "Monads with variables, without deep magic";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220573,7 +212485,6 @@ self: {
        executableHaskellDepends = [ base time transformers ];
        testHaskellDepends = [ base hspec QuickCheck time transformers ];
        benchmarkHaskellDepends = [ base criterion time transformers ];
-       homepage = "https://github.com/schell/varying";
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220589,7 +212500,6 @@ self: {
        libraryHaskellDepends = [
          base containers hashable semigroups unordered-containers
        ];
-       homepage = "https://github.com/HeinrichApfelmus/vault";
        description = "a persistent store for values of arbitrary types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220606,7 +212516,6 @@ self: {
          aeson base bytestring http-client http-client-tls http-types text
          unordered-containers
        ];
-       homepage = "https://github.com/bitc/hs-vault-tool";
        description = "Client library for HashiCorp's Vault tool (via HTTP API)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -220626,7 +212535,6 @@ self: {
        testHaskellDepends = [
          aeson base tasty-hunit temporary vault-tool
        ];
-       homepage = "https://github.com/bitc/hs-vault-tool";
        description = "Utility library for spawning a HashiCorp Vault process";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220668,7 +212576,6 @@ self: {
          base bytestring containers direct-murmur-hash easy-file filelock
          lmdb random stm transformers
        ];
-       homepage = "http://github.com/dmbarbour/haskell-vcache";
        description = "semi-transparent persistence for Haskell using LMDB, STM";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220684,7 +212591,6 @@ self: {
        libraryHaskellDepends = [
          array base bytestring bytestring-builder vcache
        ];
-       homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220698,7 +212604,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers mime-directory
        ];
-       homepage = "http://github.com/mboes/vCard";
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
      }) {};
@@ -220713,7 +212618,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base extra shelly system-filepath ];
        executableHaskellDepends = [ base shelly text ];
-       homepage = "http://github.com/bergey/vcatt";
        description = "Recursively check that a directory is under version control";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220726,7 +212630,6 @@ self: {
        version = "0.2.2";
        sha256 = "0x0smhllghzn0xjfk5cwxaf1vnd2yp3saxw92ylyws8a546mzhzm";
        libraryHaskellDepends = [ base polyparse ];
-       homepage = "http://tomahawkins.org";
        description = "Reading and writing VCD files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220766,7 +212669,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "02lm4czrjwbnfmhybqn80j8xravi37z1a319s23hgxdbxpw970nv";
        libraryHaskellDepends = [ aeson base bytestring text ];
-       homepage = "http://rel4tion.org/projects/vcs-web-hook-parse/";
        description = "Parse development platform web hook messages";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -220790,7 +212692,6 @@ self: {
          base directory filepath gi-gtk gi-gtk-hs haskell-gi-base mtl
          process text vcswrapper
        ];
-       homepage = "https://github.com/forste/haskellVCSGUI";
        description = "GUI library for source code management systems";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220815,7 +212716,6 @@ self: {
          base containers directory filepath hxt mtl parsec process split
          text
        ];
-       homepage = "https://github.com/forste/haskellVCSWrapper";
        description = "Wrapper for source code management systems";
        license = "GPL";
      }) {};
@@ -220837,7 +212737,6 @@ self: {
        ];
        testHaskellDepends = [ base fin inspection-testing tagged ];
        benchmarkHaskellDepends = [ base criterion fin vector ];
-       homepage = "https://github.com/phadej/vec";
        description = "Vec: length-indexed (sized) list";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220850,7 +212749,6 @@ self: {
        version = "0.4.7";
        sha256 = "1049jh8rcxfnyckz5m5asdlyafqszlig96k387raldyfzbrf8f4d";
        libraryHaskellDepends = [ base random ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "A low-dimensional linear algebra library, tailored to computer graphics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220862,7 +212760,6 @@ self: {
        version = "0.1.0.4";
        sha256 = "1kxsjsiqqpi7k0xz597z7r2fd45s38plgk6jplzxagg0i3bm0q4g";
        libraryHaskellDepends = [ base random ];
-       homepage = "http://github.com/cpdurham/vect-floating";
        description = "A low-dimensional linear algebra library, operating on the Floating typeclass";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220877,7 +212774,6 @@ self: {
        revision = "1";
        editedCabalFile = "05k20xd7rcf3hypbbw53bv8yl65sgpdawdfmskypk3mbl1w5fymg";
        libraryHaskellDepends = [ accelerate base vect-floating ];
-       homepage = "http://github.com/cpdurham/vect-floating-accelerate";
        description = "Accelerate instances for vect-floating types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220890,7 +212786,6 @@ self: {
        version = "0.4.6.1";
        sha256 = "1qp98j6bgldjcs71pd7iqc5sjf1ixb1jj0l267hw532j4yf81dig";
        libraryHaskellDepends = [ base OpenGL vect ];
-       homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220903,7 +212798,6 @@ self: {
        version = "0.10.9.3";
        sha256 = "08mlg0v7an6mm04skvxrgfndab0wikfs4glv7jj8ylxwc8959kdx";
        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
-       homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -220925,7 +212819,6 @@ self: {
          base HUnit QuickCheck random template-haskell test-framework
          test-framework-hunit test-framework-quickcheck2 transformers
        ];
-       homepage = "https://github.com/haskell/vector";
        description = "Efficient Arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220946,7 +212839,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers QuickCheck vector
        ];
-       homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for vector arrays";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220958,7 +212850,6 @@ self: {
        version = "0.1.1";
        sha256 = "1qdjibh3ywfa0lvawdahnr9qhh2qy6899lm5inbzmksjpykgbazz";
        libraryHaskellDepends = [ base binary vector ];
-       homepage = "https://github.com/kawu/vector-binary";
        description = "Binary instances for vector types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -220978,7 +212869,6 @@ self: {
        benchmarkHaskellDepends = [
          base binary bytestring criterion deepseq vector
        ];
-       homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221009,7 +212899,6 @@ self: {
          tasty tasty-hunit tasty-quickcheck
        ];
        benchmarkHaskellDepends = [ criterion foldl rerebase ];
-       homepage = "https://github.com/nikita-volkov/vector-builder";
        description = "Vector builder";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -221022,7 +212911,6 @@ self: {
        sha256 = "0i4cxgm984qs5ldp1x7m9blxh8wd5y8acy2ic8kpgaak8pzycrkn";
        libraryHaskellDepends = [ base bytes vector ];
        testHaskellDepends = [ base bytes tasty tasty-quickcheck vector ];
-       homepage = "https://github.com/k0001/vector-bytes-instances";
        description = "Serial (from the bytes package) for Vector (from the vector package)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221042,7 +212930,6 @@ self: {
          base bytestring deepseq ghc-prim primitive vector
        ];
        testHaskellDepends = [ base directory QuickCheck random ];
-       homepage = "https://github.com/basvandijk/vector-bytestring";
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221063,7 +212950,6 @@ self: {
          array base binary ghc-prim HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       homepage = "https://github.com/scvalex/vector-clock";
        description = "Vector clocks for versioning message flows";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221098,7 +212984,6 @@ self: {
        editedCabalFile = "0417f7grdvs3ws508a7k9ngpnisw7f7b6bcmmasflvvr66m6166f";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ fftw ];
-       homepage = "http://hackage.haskell.org/package/vector-fftw";
        description = "A binding to the fftw library for one-dimensional vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) fftw;};
@@ -221113,7 +212998,6 @@ self: {
        libraryHaskellDepends = [
          base ghc-prim primitive vector vector-th-unbox
        ];
-       homepage = "http://github.com/mikeizbicki/vector-functorlazy/";
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221126,7 +213010,6 @@ self: {
        version = "0.2.0";
        sha256 = "14v0qj2r484pwbjhdymvdqjnsbqszl9wr71hv6wsvs2d8ja1bajl";
        libraryHaskellDepends = [ base vector ];
-       homepage = "http://github.com/mikeizbicki/vector-heterogenous/";
        description = "A type-safe library for vectors whose elements can be of any type, or any type satisfying some constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221143,7 +213026,6 @@ self: {
        libraryHaskellDepends = [
          base comonad hashable keys pointed semigroupoids semigroups vector
        ];
-       homepage = "http://github.com/ekmett/vector-instances";
        description = "Orphan Instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221157,7 +213039,6 @@ self: {
        libraryHaskellDepends = [
          base collections-api template-haskell vector
        ];
-       homepage = "http://github.com/kreuzschlitzschraubenzieher/vector-instances-collections";
        description = "Instances of the Data.Collections classes for Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221173,7 +213054,6 @@ self: {
        sha256 = "12l6ka6vgl5g193sycn3k6gr2q3k64jaq196p825vawh46qdsfg5";
        libraryHaskellDepends = [ base mmap primitive vector ];
        testHaskellDepends = [ base QuickCheck temporary vector ];
-       homepage = "http://github.com/pumpkin/vector-mmap";
        description = "Memory map immutable and mutable vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221187,7 +213067,6 @@ self: {
        revision = "2";
        editedCabalFile = "0ys49lp4hqdm9hmfirfycksi31k03w7i6fralmqz6p9l4rc1lcyy";
        libraryHaskellDepends = [ base mersenne-random-pure64 vector ];
-       homepage = "http://code.haskell.org/~dons/code/vector-random";
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221200,7 +213079,6 @@ self: {
        version = "0.0.2.0";
        sha256 = "1k30n5qh16sdfxy77vp10bx52lb1ffmjn70vg87hx12j8wg9vbv6";
        libraryHaskellDepends = [ base vector ];
-       homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221213,7 +213091,6 @@ self: {
        version = "1.1";
        sha256 = "04kpp7529jd4avhprfxdy6nfikx3d3ans0knhz3lspms4iky068i";
        libraryHaskellDepends = [ base random vector ];
-       homepage = "https://github.com/metrix-ai/vector-shuffling";
        description = "Algorithms for vector shuffling";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -221227,7 +213104,6 @@ self: {
        revision = "1";
        editedCabalFile = "0lcm7gdzqnp5v0rfd9f611yspa493j4azdj3gzy71398z3zda5w4";
        libraryHaskellDepends = [ base deepseq finite-typelits vector ];
-       homepage = "http://github.com/expipiplus1/vector-sized#readme";
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221244,7 +213120,6 @@ self: {
          adjunctions base deepseq distributive finite-typelits
          indexed-list-literals primitive vector
        ];
-       homepage = "http://github.com/expipiplus1/vector-sized#readme";
        description = "Size tagged vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221269,7 +213144,6 @@ self: {
        sha256 = "092lr61hi8sm0i4302r7zy2s08b4d97k5hyrbnkvnyhfi1529v6f";
        libraryHaskellDepends = [ base containers vector-space ];
        testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/conklech/vector-space-map";
        description = "vector-space operations for finite maps using Data.Map";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221318,7 +213192,6 @@ self: {
        testHaskellDepends = [
          base QuickCheck split tasty tasty-quickcheck vector
        ];
-       homepage = "https://github.com/fhaust/vector-split";
        description = "Combinator library for splitting vectors";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -221330,7 +213203,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "19spzrk64j2rgyi15dvs8gfbx3nc79ybssaxkv8dn9df4fwksv91";
        libraryHaskellDepends = [ base primitive vector ];
-       homepage = "http://github.com/geezusfreeek/vector-static";
        description = "Statically checked sizes on Data.Vector";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221358,7 +213230,6 @@ self: {
        libraryHaskellDepends = [
          base binary prologue text vector vector-binary-instances
        ];
-       homepage = "https://github.com/luna/vector-text";
        description = "Text implementation based on unboxed char vector";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221403,7 +213274,6 @@ self: {
          microlens-platform protocol-buffers protocol-buffers-descriptor
          text unordered-containers vector
        ];
-       homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221433,7 +213303,6 @@ self: {
          microlens-platform mtl protocol-buffers protocol-buffers-descriptor
          text unordered-containers vector
        ];
-       homepage = "https://github.com/fosskers/vectortiles";
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221446,7 +213315,6 @@ self: {
        version = "1.0.0.0";
        sha256 = "0wai72bqb1vp4p7ml1yj2jdmkjglihai9vhmgj7ri6y2qgzkpwly";
        libraryHaskellDepends = [ base regex-pcre ];
-       homepage = "https://github.com/VerbalExpressions/HaskellVerbalExpressions";
        description = "Regular expressions made easy";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221459,7 +213327,6 @@ self: {
        version = "0.2.3.0";
        sha256 = "0r7jj2h7xzz3i8ck00z19h4bfr4r4nxfzi6ya9kppcda92myak4b";
        libraryHaskellDepends = [ base binary data-default-class deepseq ];
-       homepage = "https://github.com/trskop/verbosity";
        description = "Simple enum that encodes application verbosity";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221550,7 +213417,6 @@ self: {
        sha256 = "0lhl6zcf8f8ndyqx7ksj1qy4a5wnhvphsawb944d5rynrnj8fd46";
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ alex happy ];
-       homepage = "http://github.com/tomahawkins/verilog";
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221598,7 +213464,6 @@ self: {
        testHaskellDepends = [
          base containers doctest lens QuickCheck tasty tasty-quickcheck text
        ];
-       homepage = "http://github.com/fmthoma/vgrep#readme";
        description = "A pager for grep";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221624,7 +213489,6 @@ self: {
          base byteable bytestring cereal cryptohash filepath mmap QuickCheck
          random test-framework test-framework-quickcheck2 text time
        ];
-       homepage = "https://github.com/vincenthz/hs-vhd";
        description = "Provides functions to inspect and manipulate virtual hard disk (VHD) files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221652,7 +213516,6 @@ self: {
        testHaskellDepends = [
          base containers doctest QuickCheck quickcheck-classes
        ];
-       homepage = "https://github.com/andrewthad/vicinity#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -221671,7 +213534,6 @@ self: {
          base brick containers directory ghc-prof lens scientific text
          vector vector-algorithms vty
        ];
-       homepage = "https://github.com/maoe/viewprof";
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221724,7 +213586,6 @@ self: {
          time transformers unix unordered-containers vector warp yesod
          yesod-core yesod-platform
        ];
-       homepage = "http://github.com/michaelxavier/vigilance";
        description = "An extensible dead-man's switch system";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221750,7 +213611,6 @@ self: {
          time-locale-compat transformers xdg-basedir yaml
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221802,7 +213662,6 @@ self: {
          process random regex-base regex-posix time
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://www.vintage-basic.net";
        description = "Interpreter for microcomputer-era BASIC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221897,7 +213756,6 @@ self: {
        libraryHaskellDepends = [
          base operational operational-extra vinyl-plus
        ];
-       homepage = "http://github.com/andrewthad/vinyl-operational#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221918,7 +213776,6 @@ self: {
          unordered-containers vinyl
        ];
        testHaskellDepends = [ base doctest vinyl ];
-       homepage = "http://github.com/andrew/vinyl-plus";
        description = "Vinyl records utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221931,7 +213788,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "0lcpg2mxmr41lqpn5ksc35c0w16s45z6qq9wjbm0cv8r047k9bq5";
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
-       homepage = "https://github.com/marcinmrotek/vinyl-utils";
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -221950,7 +213806,6 @@ self: {
          base bytestring constraints data-default primitive template-haskell
          text vector vinyl
        ];
-       homepage = "http://github.com/andrewthad/vinyl-vectors";
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221971,7 +213826,6 @@ self: {
          base bytestring Cabal directory file-embed filepath mtl process
          safe split
        ];
-       homepage = "https://github.com/Paczesiowa/virthualenv";
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -221984,7 +213838,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0a1abwjg2c41xxmmn7dalvk2lfh1h76waj327dxzjsg0lkkjvhx4";
        libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/LukaHorvat/visibility";
        description = "Simple computation of visibility polygons";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -222034,7 +213887,6 @@ self: {
          ipprint isevaluated lazysmallcheck parallel pretty process
          strict-concurrency svgcairo value-supply
        ];
-       homepage = "http://github.com/zsol/visual-graphrewrite/";
        description = "Visualize the graph-rewrite steps of a Haskell program";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222054,7 +213906,6 @@ self: {
          base containers directory filepath haskell-src-exts mtl pretty
          process regexpr split uniplate
        ];
-       homepage = "http://github.com/djv/VisualProf";
        description = "Create a visual profile of a program's source code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222159,7 +214010,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring process unix ];
        executableHaskellDepends = [ base bytestring process unix ];
-       homepage = "https://github.com/proger/posix-pty/tree/fork";
        description = "Pseudo terminal interaction with subprocesses";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -222173,7 +214023,6 @@ self: {
        revision = "1";
        editedCabalFile = "0p70z83k5cg9yl91afks3ipvzv61nf5i7v0yqz59x1vdmml7fis0";
        libraryHaskellDepends = [ base smaoin ];
-       homepage = "http://rel4tion.org/projects/vocabularies-hs/";
        description = "Smaoin vocabulary definitions of the base framework";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -222195,7 +214044,6 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring mime-types options ];
        testHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/daisee/voicebase";
        description = "Upload audio files to voicebase to get a transcription";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -222207,7 +214055,6 @@ self: {
        version = "0.7.2";
        sha256 = "0aygw0yb1h3yhmfl3bkwh5d3h0l4mmsxz7j53vdm6jryl1kgxzyk";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/ekmett/void";
        description = "A Haskell 98 logically uninhabited data type";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -222233,7 +214080,6 @@ self: {
        version = "0.1.2";
        sha256 = "09z6nbsj4rqzhksk75glrsrmcs21p8x0jmcpqs6rc9iizz79db8g";
        libraryHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/cartazio/Vowpal-Utils";
        description = "Vowpal Wabbit utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222246,7 +214092,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "117xvh6llh3aw8nxrvvqyjaflq35l69b7s4j1sc79p8r972mdwff";
        libraryHaskellDepends = [ base bytestring process utf8-string ];
-       homepage = "https://github.com/sethfowler/hslibvoyeur";
        description = "Haskell bindings for libvoyeur";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222281,7 +214126,6 @@ self: {
        librarySystemDepends = [ vrpn ];
        executableHaskellDepends = [ base ];
        executableSystemDepends = [ vrpn ];
-       homepage = "https://bitbucket.org/functionally/vrpn";
        description = "Bindings to VRPN";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222299,7 +214143,6 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk pango ];
        libraryPkgconfigDepends = [ vte ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222317,7 +214160,6 @@ self: {
        setupHaskellDepends = [ base Cabal gtk2hs-buildtools ];
        libraryHaskellDepends = [ base glib gtk3 pango ];
        libraryPkgconfigDepends = [ vte ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222355,7 +214197,6 @@ self: {
          test-framework-hunit test-framework-smallcheck text unix
          utf8-string vector
        ];
-       homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -222390,7 +214231,6 @@ self: {
          test-framework-hunit test-framework-smallcheck text unix
          utf8-string vector
        ];
-       homepage = "https://github.com/jtdaugherty/vty";
        description = "A simple terminal UI library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222412,7 +214252,6 @@ self: {
          mtl parallel parsec QuickCheck random string-qq terminfo text unix
          utf8-string vector vty
        ];
-       homepage = "https://github.com/coreyoconnor/vty";
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222449,7 +214288,6 @@ self: {
          regex-base stm text unix vector vty
        ];
        executableHaskellDepends = [ base QuickCheck random text vty ];
-       homepage = "http://jtdaugherty.github.com/vty-ui/";
        description = "An interactive terminal user interface library for Vty";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222475,7 +214313,6 @@ self: {
        sha256 = "1w19ip6qc5qbscp06a2b58x9yhjc98naaq1gxymk7gs3iagylrzq";
        libraryHaskellDepends = [ base cpphs vector-sized ];
        librarySystemDepends = [ vulkan ];
-       homepage = "http://github.com/expipiplus1/vulkan#readme";
        description = "Bindings to the Vulkan graphics API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222488,7 +214325,6 @@ self: {
        version = "1.1.2.1";
        sha256 = "0iwzjr2w6ifsj6lah8viahsxcqxiqy0dk1v6lnzi77nb05sjpr6d";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/achirkin/vulkan#readme";
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222513,7 +214349,6 @@ self: {
          aeson base bytestring containers directory filepath Glob libnotify
          process select text udev unordered-containers vector X11 yaml
        ];
-       homepage = "https://github.com/portnov/wacom-intuos-pro-scripts";
        description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222537,7 +214372,6 @@ self: {
          base binary bytestring case-insensitive containers directory
          JuicyPixels
        ];
-       homepage = "https://github.com/mgrabmueller/waddle";
        description = "DOOM WAD file utilities";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222559,7 +214393,6 @@ self: {
          aeson base data-default-class kansas-comet natural-transformation
          remote-monad scotty semigroups stm text wai-middleware-static
        ];
-       homepage = "https://github.com/nshaheed/WebAudioHs/";
        description = "A haskell binding of the Web Audio API ala blank-canvas";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222578,7 +214411,6 @@ self: {
        ];
        testHaskellDepends = [ base bytestring hspec ];
        testToolDepends = [ hspec-discover ];
-       homepage = "https://github.com/yesodweb/wai";
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -222599,7 +214431,6 @@ self: {
        executableHaskellDepends = [
          base file-embed wai wai-app-static warp
        ];
-       homepage = "https://github.com/mitsuji/wai-accept-language";
        description = "Rewrite based on Accept-Language header";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -222628,7 +214459,6 @@ self: {
          base bytestring conduit conduit-extra directory doctest filepath
          hspec HTTP http-types unix wai warp
        ];
-       homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "File/CGI/Rev Proxy App of WAI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -222662,7 +214492,6 @@ self: {
          mockery network old-locale temporary text time transformers
          unix-compat wai wai-extra zlib
        ];
-       homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -222681,7 +214510,6 @@ self: {
          socket-activation stm streaming-commons unix wai wai-extra warp
          warp-tls
        ];
-       homepage = "https://github.com/myfreeweb/wai-cli";
        description = "Command line runner for Wai apps (using Warp) with TLS, CGI, socket activation & graceful shutdown";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -222697,7 +214525,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring conduit http-types transformers wai
        ];
-       homepage = "https://github.com/yesodweb/wai";
        description = "conduit wrappers for WAI";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -222722,7 +214549,6 @@ self: {
          process tasty tasty-hunit text wai wai-extra wai-websockets warp
          websockets
        ];
-       homepage = "https://github.com/larskuhtz/wai-cors";
        description = "CORS for WAI";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -222751,7 +214577,6 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec stm ];
-       homepage = "https://github.com/urbanslug/wai-devel";
        description = "A web server for the development of WAI compliant web applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222769,7 +214594,6 @@ self: {
          base digestive-functors http-types resourcet text transformers wai
          wai-extra wai-util
        ];
-       homepage = "https://github.com/singpolyma/wai-digestive-functors";
        description = "Helpers to bind digestive-functors onto wai requests";
        license = "unknown";
      }) {};
@@ -222781,7 +214605,6 @@ self: {
        version = "0.1";
        sha256 = "1qyarjbpnngb2x272gkmvrhy3f8kqygxj4nvi6giz09rdx9pfrza";
        libraryHaskellDepends = [ base text wai yesod-routes ];
-       homepage = "https://github.com/singpolyma/wai-dispatch";
        description = "Nice wrapper around yesod-routes for use with WAI";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222795,7 +214618,6 @@ self: {
        sha256 = "1h5zlqky7ldqbmiaixizhk1s8ghf5i3ha1xfz8flxgzr7gr0al3q";
        libraryHaskellDepends = [ wai ];
        doHaddock = false;
-       homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI support for server-sent events (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -222826,7 +214648,6 @@ self: {
          base blaze-builder bytestring case-insensitive cookie fast-logger
          hspec http-types HUnit resourcet text time transformers wai zlib
        ];
-       homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -222857,7 +214678,6 @@ self: {
          base bytestring case-insensitive cookie fast-logger hspec
          http-types HUnit resourcet text time transformers wai zlib
        ];
-       homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222899,7 +214719,6 @@ self: {
          base bytestring conduit conduit-extra directory hspec process wai
          warp
        ];
-       homepage = "https://github.com/NorfairKing/wai-git-http";
        description = "Git http-backend CGI App of WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222912,7 +214731,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "0a06yrakg9gwjjj4f9nr474j8i8xz642aj56m8vaq621i1kn7jaq";
        libraryHaskellDepends = [ base http-types mtl resourcet unix wai ];
-       homepage = "https://bitbucket.org/dpwiz/wai-graceful";
        description = "Graceful shutdown for WAI applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222934,7 +214752,6 @@ self: {
          old-time text time transformers wai wai-extra warp
        ];
        executableHaskellDepends = [ cmdargs ];
-       homepage = "http://github.com/yesodweb/wai";
        description = "WAI server that automatically reloads code after modification. (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -222948,7 +214765,6 @@ self: {
        sha256 = "1pvkykviql5qp8jvgy5d9abc8vkakmbw0bgmnsg53rna1zfvlmdm";
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
        librarySystemDepends = [ fcgi ];
-       homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Wai handler to fastcgi";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) fcgi;};
@@ -222993,7 +214809,6 @@ self: {
        version = "2.0.0.2";
        sha256 = "0h7d78d641bjsnmxsnz4b7s9pw4x0y0xi8bld51y4nqnbjl8gvac";
        libraryHaskellDepends = [ base bytestring wai wai-extra ];
-       homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Wai handler to SCGI (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223011,7 +214826,6 @@ self: {
          base bytestring containers enumerator snap-core snap-server
          transformers wai
        ];
-       homepage = "http://github.com/snoyberg/wai-handler-snap";
        description = "Web Application Interface handler using snap-server. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223025,7 +214839,6 @@ self: {
        sha256 = "10sr9xgd95ncwczbmchaf2qjyadqchm566r3zhqc3bwgsydrsq08";
        libraryHaskellDepends = [ base wai warp ];
        libraryPkgconfigDepends = [ QtWebKit ];
-       homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223042,7 +214855,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring hastache http-types transformers wai
        ];
-       homepage = "https://github.com/singpolyma/wai-hastache";
        description = "Nice wrapper around hastache for use with WAI";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223066,7 +214878,6 @@ self: {
          cryptohash hspec http-types monad-loops mtl transformers wai
          wai-extra
        ];
-       homepage = "https://github.com/raptros/wai-hmac-auth";
        description = "hmac authentication tools for WAI apps";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223084,7 +214895,6 @@ self: {
          auto-update base bytestring containers http-types wai warp word8
        ];
        testHaskellDepends = [ base doctest ];
-       homepage = "http://github.com/yesodweb/wai";
        description = "WAI utilities for HTTP/2";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -223100,7 +214910,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-types lens network text vault wai
        ];
-       homepage = "https://github.com/webcrank/wai-lens";
        description = "Lenses for WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223158,7 +214967,6 @@ self: {
        testHaskellDepends = [
          base bytestring containers data-default time wai
        ];
-       homepage = "https://github.com/ChrisCoffey/wai-logger-buffered#readme";
        description = "Buffer requets before logging them";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223205,7 +215013,6 @@ self: {
          lens mockery shake silently string-conversions wai wai-app-static
          warp wreq
        ];
-       homepage = "https://github.com/soenkehahn/wai-make-assets#readme";
        description = "Compiling and serving assets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223264,7 +215071,6 @@ self: {
          base bytestring hs-brotli http-types mtl tasty tasty-hspec
          tasty-hunit wai wai-extra
        ];
-       homepage = "https://github.com/iand675/wai-middleware-brotli#readme";
        description = "WAI middleware for brotli compression";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223287,7 +215093,6 @@ self: {
          base bytestring http-types HUnit test-framework
          test-framework-hunit wai wai-test
        ];
-       homepage = "https://github.com/akaspin/wai-middleware-cache";
        description = "Caching middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223307,7 +215112,6 @@ self: {
          conduit hedis hedis-pile http-types transformers wai
          wai-middleware-cache
        ];
-       homepage = "https://github.com/akaspin/wai-middleware-cache-redis";
        description = "Redis backend for wai-middleware-cache";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223324,7 +215128,6 @@ self: {
          base blaze-builder bytestring http-types wai
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/yogsototh/wai-middleware-caching/tree/master/wai-middleware-caching#readme";
        description = "WAI Middleware to cache things";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223342,7 +215145,6 @@ self: {
          wai-middleware-caching
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/yogsototh/wai-middleware-caching/tree/master/wai-middleware-caching-lru#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223360,7 +215162,6 @@ self: {
          wai-middleware-caching
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/yogsototh/wai-middleware-caching/tree/master/wai-middleware-caching-redis#readme";
        description = "Cache Wai Middleware using Redis backend";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223374,7 +215175,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-types lifted-base wai
        ];
-       homepage = "https://github.com/akaspin/wai-middleware-catch";
        description = "Wai error catching middleware";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223398,7 +215198,6 @@ self: {
          monad-control monad-logger network process resourcet text
          transformers void wai wai-conduit
        ];
-       homepage = "https://github.com/fpco/wai-middleware-consul";
        description = "Wai Middleware for Consul";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223432,7 +215231,6 @@ self: {
          transformers transformers-base unordered-containers urlpath wai
          wai-logger wai-transformers warp
        ];
-       homepage = "https://github.com/athanclark/wai-middleware-content-type#readme";
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223483,7 +215281,6 @@ self: {
          base base64-bytestring bytestring cryptohash filepath http-date
          http-types unix-compat unordered-containers wai
        ];
-       homepage = "https://github.com/ameingast/wai-middleware-etag";
        description = "WAI ETag middleware for static files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223500,7 +215297,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring http-types streaming-commons wai
        ];
-       homepage = "https://github.com/twittner/wai-middleware-gunzip";
        description = "WAI middleware to unzip request bodies";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -223512,7 +215308,6 @@ self: {
        version = "0.1";
        sha256 = "10ap355j4dx42y7ycf1plpbg04wazv0q62mi3ibza8sb33hiiprh";
        libraryHaskellDepends = [ base bytestring http-types wai ];
-       homepage = "http://github.com/seanhess/wai-middleware-headers";
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223536,7 +215331,6 @@ self: {
          base bytestring doctest Glob hlint hspec http-types HUnit process
          regex-compat wai wai-extra
        ];
-       homepage = "https://github.com/creichert/wai-middleware-hmac";
        description = "HMAC Authentication Middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223576,7 +215370,6 @@ self: {
        testHaskellDepends = [
          aeson base binary bytestring http-types text wai
        ];
-       homepage = "https://github.com/orbital/wai-middleware-json-errors#readme";
        description = "Converts errors from plaintext to json";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223599,7 +215392,6 @@ self: {
          base bytestring criterion ekg-core http-types scotty text time wai
          wai-extra
        ];
-       homepage = "https://github.com/Helkafen/wai-middleware-metrics";
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223618,7 +215410,6 @@ self: {
        testHaskellDepends = [
          base Cabal directory mtl split text wai wai-middleware-static warp
        ];
-       homepage = "https://github.com/taktoa/wai-middleware-preprocessor";
        description = "WAI middleware for preprocessing static files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223637,7 +215428,6 @@ self: {
          text wai
        ];
        testHaskellDepends = [ base doctest prometheus-client ];
-       homepage = "https://github.com/fimad/prometheus-haskell";
        description = "WAI middlware for exposing http://prometheus.io metrics.";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -223654,7 +215444,6 @@ self: {
          aeson base bytestring hostname http-client http-conduit http-types
          rollbar-hs text time uuid wai
        ];
-       homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme";
        description = "Middleware that communicates to Rollbar";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223675,7 +215464,6 @@ self: {
          base bytestring http-types HUnit test-framework
          test-framework-hunit text wai wai-test
        ];
-       homepage = "https://github.com/akaspin/wai-middleware-route";
        description = "Wai dispatch middleware";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223695,7 +215483,6 @@ self: {
          filepath http-types memory mime-types mtl old-locale semigroups
          text time wai
        ];
-       homepage = "https://github.com/scotty-web/wai-middleware-static";
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223714,7 +215501,6 @@ self: {
          expiring-cache-map filepath http-types mtl old-locale text time
          unix wai
        ];
-       homepage = "https://github.com/agrafix/wai-middleware-static";
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223734,7 +215520,6 @@ self: {
          base bytestring cryptonite http-types memory mime-types text wai
          wai-extra
        ];
-       homepage = "https://github.com/adamse/wai-middleware-static-embedded#readme";
        description = "Serve embedded static files as a Wai middleware";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223772,7 +215557,6 @@ self: {
          aeson base base64-bytestring bytestring cryptonite http-types text
          transformers vault wai
        ];
-       homepage = "https://github.com/mitchellwrosen/wai-middleware-travisci";
        description = "WAI middleware for authenticating webhook payloads from Travis CI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223792,7 +215576,6 @@ self: {
          monad-control-aligned monad-logger mtl resourcet transformers
          transformers-base unordered-containers wai wai-transformers
        ];
-       homepage = "https://github.com/athanclark/wai-middleware-verbs#readme";
        description = "Route Wai middlewares based on HTTP verbs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223816,7 +215599,6 @@ self: {
          base blaze-builder bytestring case-insensitive http-types tasty
          tasty-hunit tasty-quickcheck wai
        ];
-       homepage = "https://gitlab.com/twittner/wai-predicates/";
        description = "WAI request predicates";
        license = "unknown";
      }) {};
@@ -223835,7 +215617,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion http-types text wai
        ];
-       homepage = "https://gitlab.com/queertypes/wai-request-spec";
        description = "Declarative request parsing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -223847,7 +215628,6 @@ self: {
        version = "0.0.0.0";
        sha256 = "0qf64g11113gl45bfn12j2ikdjwrdxg9r8cicfs4pmh0dq5vj0va";
        libraryHaskellDepends = [ base bytestring http-types wai ];
-       homepage = "https://github.com/pharpend/wai-responsible";
        description = "Response interface for WAI";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223879,7 +215659,6 @@ self: {
        version = "1.0.0.1";
        sha256 = "1827mk64vyivdc12z4h230c4b993i6g8wl4sl0364jda586z58p7";
        libraryHaskellDepends = [ base text wai ];
-       homepage = "http://github.com/mdmarek/wai-router";
        description = "Provides basic routing on URL paths for WAI";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223905,7 +215684,6 @@ self: {
        testHaskellDepends = [
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
-       homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -223933,7 +215711,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion http-types wai wai-predicates
        ];
-       homepage = "https://gitlab.com/twittner/wai-routing/";
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
      }) {};
@@ -223953,7 +215730,6 @@ self: {
          wai
        ];
        executableHaskellDepends = [ base bytestring cryptonite memory ];
-       homepage = "https://github.com/habibalamin/wai-secure-cookies";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -223971,7 +215747,6 @@ self: {
          base blaze-builder bytestring bytestring-builder containers cookie
          entropy http-types StateVar time transformers vault wai
        ];
-       homepage = "https://github.com/singpolyma/wai-session";
        description = "Flexible session middleware for WAI";
        license = "unknown";
      }) {};
@@ -224004,7 +215779,6 @@ self: {
          base bytestring cereal clientsession errors transformers
          wai-session
        ];
-       homepage = "https://github.com/singpolyma/wai-session-clientsession";
        description = "Session store based on clientsession";
        license = "unknown";
      }) {};
@@ -224025,7 +215799,6 @@ self: {
        testHaskellDepends = [
          base bytestring data-default mysql-simple text wai-session
        ];
-       homepage = "https://github.com/Lupino/mysql-session#readme";
        description = "MySQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224048,7 +215821,6 @@ self: {
        testHaskellDepends = [
          base bytestring data-default postgresql-simple text wai-session
        ];
-       homepage = "https://github.com/hce/postgresql-session#readme";
        description = "PostgreSQL backed Wai session store";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224066,7 +215838,6 @@ self: {
          base bytestring cereal errors tokyocabinet-haskell transformers
          wai-session
        ];
-       homepage = "https://github.com/singpolyma/wai-session-tokyocabinet";
        description = "Session store based on Tokyo Cabinet";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224080,7 +215851,6 @@ self: {
        sha256 = "0l2pd61vxnfjdjzkvmwqfgf07a3nir3mnbr8qw2nzqa767s84i6i";
        libraryHaskellDepends = [ aeson base http-client http-types wai ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/psibi/wai-slack-middleware#readme";
        description = "A Slack middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224117,7 +215887,6 @@ self: {
          base blaze-builder bytestring conduit directory http-types text wai
          wai-extra
        ];
-       homepage = "https://github.com/gregwebs/wai-static-pages";
        description = "generate static html pages from a WAI application";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -224130,7 +215899,6 @@ self: {
        sha256 = "0xys01jniib0pnhadcm7s0v5z0wcxfgi0bf5ax808zm9qzvl3xfx";
        libraryHaskellDepends = [ wai ];
        doHaddock = false;
-       homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "Unit test framework (built on HUnit) for WAI applications. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -224146,7 +215914,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder bytestring http-types thrift wai
        ];
-       homepage = "https://github.com/yogeshsajanikar/wai-thrift";
        description = "Thrift transport layer for Wai";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224196,7 +215963,6 @@ self: {
          base exceptions extractable-singleton monad-control-aligned
          transformers wai wai-websockets websockets
        ];
-       homepage = "https://github.com/athanclark/wai-transformers#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -224214,7 +215980,6 @@ self: {
          aeson base blaze-builder bytestring conduit http-accept http-types
          network-uri text transformers wai wai-extra
        ];
-       homepage = "https://github.com/singpolyma/wai-util";
        description = "Collection of utility functions for use with WAI";
        license = "unknown";
      }) {};
@@ -224238,7 +216003,6 @@ self: {
          base bytestring case-insensitive file-embed http-types network text
          transformers wai wai-app-static warp websockets
        ];
-       homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -224250,7 +216014,6 @@ self: {
        version = "0.1.1";
        sha256 = "09080zx6m4lqli85867ilck82gvgnz4vkq9nxx5f1v5fli1i0n7m";
        libraryHaskellDepends = [ base ];
-       homepage = "https://www.github.com/fmap/waithandle";
        description = "Wait handles are MVars which can only be written to once, and from which values can never be removed";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224286,7 +216049,6 @@ self: {
        testHaskellDepends = [
          aeson base http-types tasty tasty-hunit wai wai-extra
        ];
-       homepage = "https://github.com/futurice/waitra";
        description = "A very simple Wai router";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224342,7 +216104,6 @@ self: {
        ];
        executableHaskellDepends = [ base JuicyPixels yaml ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/jeffreyrosenbluth/wallpaper#readme";
        description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224371,7 +216132,6 @@ self: {
          optparse-applicative pipes pipes-attoparsec pipes-bytestring
          pipes-zlib text time transformers
        ];
-       homepage = "http://github.com/bgamari/warc";
        description = "A parser for the Web Archive (WARC) format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224407,7 +216167,6 @@ self: {
          auto-update base bytestring containers gauge hashable http-date
          http-types network unix unix-compat
        ];
-       homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -224424,7 +216183,6 @@ self: {
          base data-default dyre http-types wai warp
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://tanakh.jp";
        description = "Dynamic configurable warp HTTP server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224446,7 +216204,6 @@ self: {
          base bytestring cmdargs containers directory mime-types text
          wai-app-static wai-extra warp
        ];
-       homepage = "http://github.com/yesodweb/wai";
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224464,25 +216221,23 @@ self: {
          base bytestring cryptonite data-default-class network
          streaming-commons tls tls-session-manager wai warp
        ];
-       homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
      }) {};
 
   "warp-tls-uid" = callPackage
-    ({ mkDerivation, base, bytestring, certificate, conduit
-     , crypto-random, network, network-conduit, pem, tls, tls-extra
-     , unix, wai, warp
+    ({ mkDerivation, base, bytestring, network, streaming-commons, unix
+     , wai, warp, warp-tls
      }:
      mkDerivation {
        pname = "warp-tls-uid";
-       version = "0.1.0.4";
-       sha256 = "11av9jkf8z2xcpwg3nyx018qwpdrm0cs79qj14z93ah1yxbavb5y";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.1";
+       sha256 = "1f9la7hz5x6xhyz3b4zgxqgp8hn0085k5fhp03fw9gzhkdgq1c08";
        libraryHaskellDepends = [
-         base bytestring certificate conduit crypto-random network
-         network-conduit pem tls tls-extra unix wai warp
+         base bytestring network streaming-commons unix wai warp warp-tls
+       ];
+       testHaskellDepends = [
+         base bytestring network streaming-commons unix wai warp warp-tls
        ];
        description = "set group and user id before running server";
        license = stdenv.lib.licenses.bsd3;
@@ -224502,7 +216257,6 @@ self: {
          aeson base blaze-builder conduit http-types lifted-async
          monad-control preamble uuid wai wai-conduit wai-cors warp
        ];
-       homepage = "https://github.com/swift-nav/warped";
        description = "Warp and Wai Library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -224597,7 +216351,6 @@ self: {
          base bytestring containers data-default-class hspec QuickCheck
          temporary
        ];
-       homepage = "https://github.com/mrkkrp/wave";
        description = "Work with WAVE and RF64 files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224613,7 +216366,6 @@ self: {
        libraryHaskellDepends = [
          attoparsec base dlist filepath mtl text transformers vector
        ];
-       homepage = "https://github.com/phaazon/wavefront";
        description = "Wavefront OBJ loader";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224632,7 +216384,6 @@ self: {
          attoparsec base containers linear text transformers
        ];
        testHaskellDepends = [ base hspec linear ];
-       homepage = "https://github.com/sasinestro/wavefront-obj#readme";
        description = "Wavefront .obj file loader";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224650,7 +216401,6 @@ self: {
          base binary bytestring bytestring-lexing bytestring-show
          delimited-text
        ];
-       homepage = "http://code.haskell.org/~StefanKersten/code/wavesurfer";
        description = "Parse WaveSurfer files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224672,7 +216422,6 @@ self: {
        executableHaskellDepends = [
          base bytestring filepath pretty-show split vector
        ];
-       homepage = "http://bitbucket.org/robertmassaioli/wavy";
        description = "Process WAVE files in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224687,7 +216436,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers ];
-       homepage = "http://github.com/solidsnack/wcwidth/";
        description = "Native wcwidth";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224704,7 +216452,6 @@ self: {
          aeson attoparsec base bytestring HTTP network network-uri
          utf8-string vector
        ];
-       homepage = "https://github.com/cvb/hs-weather-api#readme";
        description = "Weather API implemented in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224747,7 +216494,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory failure old-locale text time
        ];
-       homepage = "http://github.com/snoyberg/web-encodings/tree/master";
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224764,7 +216510,6 @@ self: {
        libraryHaskellDepends = [
          base happstack-server safe snap snap-core snap-server
        ];
-       homepage = "https://github.com/fpco/web-fpco";
        description = "Wrappers for web frameworks to ease usage with the FP Complete environment";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224805,7 +216550,6 @@ self: {
          json mtl old-time parsec system-uuid template-haskell text
          zeromq-haskell
        ];
-       homepage = "http://github.com/cmoore/web-mongrel2";
        description = "Bindings for the Mongrel2 web server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224825,7 +216569,6 @@ self: {
        testHaskellDepends = [
          base directory filepath open-browser temporary text
        ];
-       homepage = "https://github.com/danse/web-output";
        description = "Library to present content to an user via their browser";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224846,7 +216589,6 @@ self: {
          base blaze-builder blaze-html bytestring clay containers jmacro
          lens mtl Stream text vector wl-pprint-text
        ];
-       homepage = "http://hub.darcs.net/ertes/web-page";
        description = "Monoidally construct web pages";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224858,7 +216600,6 @@ self: {
        version = "0.2.9";
        sha256 = "0l3s98l69yg8gvx4bxqa95f4mvsvvij0q1rajvzwfh3bcrzzsfz6";
        libraryHaskellDepends = [ base containers mtl stm text ];
-       homepage = "https://github.com/clckwrks/web-plugins";
        description = "dynamic plugin system for web applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224881,7 +216622,6 @@ self: {
        testHaskellDepends = [
          base base64-bytestring binary bytestring hspec
        ];
-       homepage = "https://github.com/sarthakbagaria/web-push#readme";
        description = "Send messages using Web Push protocol";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224901,7 +216641,6 @@ self: {
          parsec split text utf8-string
        ];
        testHaskellDepends = [ base hspec HUnit QuickCheck text ];
-       homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes";
        description = "portable, type-safe URL routing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -224965,7 +216704,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base path-pieces template-haskell text ];
-       homepage = "http://docs.yesodweb.com/web-routes-quasi/";
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -224995,7 +216733,6 @@ self: {
          base parsec split template-haskell text web-routes
        ];
        testHaskellDepends = [ base hspec HUnit QuickCheck web-routes ];
-       homepage = "https://github.com/happstack/web-routes-th";
        description = "Support for deriving PathInfo using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225042,7 +216779,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion text ];
-       homepage = "https://github.com/philopon/web-routing";
        description = "simple routing library";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225069,7 +216805,6 @@ self: {
          hspec-discover hspec-expectations memory split stm tagged text time
          transformers
        ];
-       homepage = "https://github.com/airalab/hs-web3#readme";
        description = "Ethereum API for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225097,7 +216832,6 @@ self: {
          aeson base bytestring case-insensitive hspec hspec-wai http-media
          http-types QuickCheck text time vector wai wai-extra warp
        ];
-       homepage = "http://byteally.github.io/webapi/";
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225121,7 +216855,6 @@ self: {
        testHaskellDepends = [
          base hspec http-types network text transformers wai
        ];
-       homepage = "https://github.com/natesymer/webapp";
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225167,7 +216900,6 @@ self: {
          http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck
          unordered-containers
        ];
-       homepage = "https://github.com/webcrank/webcrank.hs";
        description = "Webmachine inspired toolkit for building http applications and services";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225184,7 +216916,6 @@ self: {
        libraryHaskellDepends = [
          base hvect mtl path-pieces reroute text unordered-containers
        ];
-       homepage = "https://github.com/webcrank/webcrank-dispatch.hs";
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225203,7 +216934,6 @@ self: {
          base bytestring exceptions lens mtl unix-compat
          unordered-containers wai wai-lens webcrank webcrank-dispatch
        ];
-       homepage = "https://github.com/webcrank/webcrank-wai";
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225228,7 +216958,6 @@ self: {
          network-uri scientific temporary text time transformers
          transformers-base unordered-containers vector zip-archive
        ];
-       homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225250,7 +216979,6 @@ self: {
          base hspec hspec-webdriver transformers wai-app-static warp
          webdriver
        ];
-       homepage = "https://bitbucket.org/wuzzeb/webdriver-utils";
        description = "Webdriver actions to assist with testing a webpage which uses Angular.Js";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -225277,7 +217005,6 @@ self: {
          unordered-containers vector zip-archive
        ];
        testHaskellDepends = [ base parallel text ];
-       homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225297,7 +217024,6 @@ self: {
          http-client-tls http-types link-relations text unordered-containers
          uri-bytestring
        ];
-       homepage = "http://hub.darcs.net/fr33domlover/webfinger-client";
        description = "WebFinger client library";
        license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225340,7 +217066,6 @@ self: {
          base binary binary-strict blaze-builder bytestring containers
          filepath hopfli optparse-applicative text vector xmlgen zlib
        ];
-       homepage = "http://github.com/ananthakumaran/webify";
        description = "webfont generator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -225359,7 +217084,6 @@ self: {
          base bytestring cairo glib gtk mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225408,7 +217132,6 @@ self: {
          base bytestring cairo glib gtk3 mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkitgtk24x-gtk3 ];
-       homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225480,7 +217203,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base filepath gtk webkit ];
-       homepage = "https://github.com/jrb/websnap";
        description = "Transforms URLs to PNGs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225516,7 +217238,6 @@ self: {
          network random SHA text
        ];
        doCheck = false;
-       homepage = "http://jaspervdj.be/websockets";
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225570,7 +217291,6 @@ self: {
          tasty-quickcheck text transformers unordered-containers uuid
          wai-transformers websockets websockets-simple
        ];
-       homepage = "https://github.com/athanclark/websockets-rpc#readme";
        description = "Simple streaming RPC mechanism using WebSockets";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225590,7 +217310,6 @@ self: {
          transformers wai-transformers websockets
        ];
        testHaskellDepends = [ base hspec stm tasty tasty-hspec ];
-       homepage = "https://github.com/athanclark/websockets-simple#readme";
        description = "Simpler interface to the websockets api";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225615,7 +217334,6 @@ self: {
          monad-control-aligned profunctors stm tasty tasty-hspec
          transformers vector wai-transformers websockets
        ];
-       homepage = "https://github.com/athanclark/websockets-simple#readme";
        description = "Composable websockets clients";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225667,7 +217385,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ];
-       homepage = "http://web.mornfall.net";
        description = "a wedding announcement";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -225707,7 +217424,6 @@ self: {
          foundation hashable process text unordered-containers vector yaml
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ndmitchell/weeder#readme";
        description = "Detect dead code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225722,7 +217438,6 @@ self: {
          base deepseq mtl process split temporary
        ];
        testHaskellDepends = [ base deepseq ];
-       homepage = "https://github.com/fpco/weigh#readme";
        description = "Measure allocations of a Haskell functions/values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225734,7 +217449,6 @@ self: {
        version = "0.3.0.1";
        sha256 = "1xizw6509rwj3l75haxl8sgdbd5mailj14d6qgy77r83g9qr6p8s";
        libraryHaskellDepends = [ base mtl semiring-num transformers ];
-       homepage = "https://github.com/oisdk/weighted";
        description = "Writer monad which uses semiring constraint";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225750,7 +217464,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
        libraryToolDepends = [ happy ];
-       homepage = "http://sebfisch.github.com/haskell-regexp";
        description = "Weighted Regular Expression Matcher";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225763,7 +217476,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1va2b10g3h2wfl9d7f27d55z5c93fvz41sb023l4c2ym1w9kw8zv";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/luqui/weighted-search";
        description = "A weighted nondeterministic search monad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225783,7 +217495,6 @@ self: {
          aeson base blaze-builder bytestring conduit http-types lifted-base
          resourcet text transformers unordered-containers wai warp
        ];
-       homepage = "https://github.com/mcschroeder/welshy";
        description = "Haskell web framework (because Scotty had trouble yodeling)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225802,7 +217513,6 @@ self: {
        executableHaskellDepends = [
          base bytestring filemanip filepath optparse-applicative split
        ];
-       homepage = "https://github.com/lovasko/wembley";
        description = "Pretty-printing of codebases";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225827,7 +217537,6 @@ self: {
          aeson base containers directory extra filepath lens MonadRandom mtl
          optparse-applicative random-shuffle text transformers
        ];
-       homepage = "https://github.com/hjwylde/werewolf";
        description = "A game engine for playing werewolf within an arbitrary chat client";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225848,7 +217557,6 @@ self: {
          aeson base bytestring extra http-client http-client-tls http-types
          mtl optparse-applicative process text wai warp werewolf
        ];
-       homepage = "https://github.com/hjwylde/werewolf-slack";
        description = "A chat interface for playing werewolf in Slack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225861,7 +217569,6 @@ self: {
        version = "0.0.3.0";
        sha256 = "1xxks0jxjwph7372jqnscm6z0b28zz3dvb49b2aw37jmnvwrfdcy";
        libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ];
-       homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "MongoDB plugin for Wheb";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225874,7 +217581,6 @@ self: {
        version = "0.0.1.0";
        sha256 = "025chjp41qbjr9m6c3pd9v510h4aac1rvbyrki3c7617sca8a45h";
        libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ];
-       homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Redis connection for Wheb";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225887,7 +217593,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1wykpp325336kk7a1vnnjffankcw0kaw3jcfin53cp8hsx4bwfdp";
        libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ];
-       homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Strapped templates for Wheb";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225900,7 +217605,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0dlq2rldak4lb0w8hcx7aigdj7b59crp1k130p36cha7zpqdixll";
        libraryHaskellDepends = [ base indents parsec ];
-       homepage = "https://github.com/davnils/while-lang-parser";
        description = "Parser for the While language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225920,7 +217624,6 @@ self: {
        libraryHaskellDepends = [
          base containers GLUT mtl OpenGL process random X11
        ];
-       homepage = "http://neugierig.org/software/darcs/whim/";
        description = "A Haskell window manager";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225948,7 +217651,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ haskell98 random ];
-       homepage = "https://github.com/haroldl/whitespace-nd";
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -225963,7 +217665,6 @@ self: {
        revision = "1";
        editedCabalFile = "07jpszzhzfygz920y09j4xrkw6pgwbpxqn79lavzz0w6jpd447y1";
        libraryHaskellDepends = [ base network network-uri split ];
-       homepage = "http://github.com/relrod/whois-hs";
        description = "WHOIS client library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -225997,7 +217698,6 @@ self: {
        sha256 = "0y3wdd5kslz71nlk32nvmi3yqd331jjl49njm58bixqanyc0k30x";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
-       homepage = "https://github.com/erikd/wide-word";
        description = "Data types for large but fixed width signed and unsigned integers";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -226015,7 +217715,6 @@ self: {
        benchmarkHaskellDepends = [
          base criterion primitive random vector
        ];
-       homepage = "https://github.com/Rufflewind/wigner-symbols";
        description = "CG coefficients and Wigner symbols";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -226028,7 +217727,6 @@ self: {
        sha256 = "1h5zdn3lkjnlr4m7s2xxiv36cr6hs7bnkr5rq20z585rfhbhavj5";
        libraryHaskellDepends = [ accelerate accelerate-fft base ];
        testHaskellDepends = [ base wigner ];
-       homepage = "https://github.com/Haskell-mouse/wigner-ville-accelerate";
        description = "Wigner-ville transform using the Accelerate library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226047,7 +217745,6 @@ self: {
          attoparsec base bytestring scalpel-core text time
        ];
        testHaskellDepends = [ base bytestring filepath hspec time ];
-       homepage = "https://github.com/debug-ito/wikicfp-scraper";
        description = "Scrape WikiCFP web site";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226067,7 +217764,6 @@ self: {
          base bytestring directory epub filepath haskell98 HTTP network
          regex-base regex-posix tagsoup url xml zip-archive zlib
        ];
-       homepage = "http://rampa.sk/static/wikipedia4epub.html";
        description = "Wikipedia EPUB E-Book construction from Firefox history";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226087,7 +217783,6 @@ self: {
        testHaskellDepends = [
          base hspec microlens QuickCheck stm transformers
        ];
-       homepage = "https://github.com/debug-ito/wild-bind";
        description = "Dynamic key binding framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226104,7 +217799,6 @@ self: {
        libraryHaskellDepends = [
          base containers gtk text transformers wild-bind
        ];
-       homepage = "https://github.com/debug-ito/wild-bind";
        description = "Graphical indicator for WildBind";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226121,7 +217815,6 @@ self: {
          base text transformers wild-bind wild-bind-indicator wild-bind-x11
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/debug-ito/wild-bind";
        description = "Task to install and export everything you need to use WildBind in X11";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226142,7 +217835,6 @@ self: {
        testHaskellDepends = [
          async base hspec text time transformers wild-bind X11
        ];
-       homepage = "https://github.com/debug-ito/wild-bind";
        description = "X11-specific implementation for WildBind";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226154,7 +217846,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "1n2cgf0cnpr7f9rgf2369qnz3mm1qvylpzncc7s42vcrrq4x3wj7";
        libraryHaskellDepends = [ aeson base bytestring utf8-string ];
-       homepage = "https://github.com/wilton-iot/wilton-ffi#readme";
        description = "Haskell modules support for Wilton JavaScript runtime";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -226169,7 +217860,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base split ];
        executableHaskellDepends = [ base process split ];
-       homepage = "http://github.com/ygale/win-hp-path";
        description = "Work with multiple Haskell Platform versions on Windows";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226202,7 +217892,6 @@ self: {
        libraryHaskellDepends = [
          base Crypto dataenc mtl network parsec pretty split time urlencoded
        ];
-       homepage = "http://patch-tag.com/repo/windowslive";
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226232,7 +217921,6 @@ self: {
          base bytestring extensible-exceptions network winerror
        ];
        librarySystemDepends = [ kernel32 ws2_32 ];
-       homepage = "http://github.com/felixmar/winio";
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226259,7 +217947,6 @@ self: {
          base binary bytestring cereal cereal-conduit conduit conduit-extra
          criterion io-streams transformers
        ];
-       homepage = "https://github.com/winterland1989/wire-streams";
        description = "Fast binary io-streams adapter";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226278,7 +217965,6 @@ self: {
        libraryHaskellDepends = [
          base deepseq mtl profunctors semigroupoids these
        ];
-       homepage = "https://github.com/esoeylemez/wires";
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226296,7 +217982,6 @@ self: {
        testHaskellDepends = [
          base hspec mtl QuickCheck template-haskell transformers
        ];
-       homepage = "http://github.com/seanparsons/wiring/";
        description = "Wiring, promotion and demotion of types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226312,7 +217997,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/ppelleti/hs-wiringPi";
        description = "Access GPIO pins on Raspberry Pi via wiringPi library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226324,7 +218008,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0dv81mp66l0j0dfa0mm9vqmdfxvhfg5py1gxqwh1jvpr8iks1q8q";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/paf31/with-index";
        description = "A tiny library for composing indexed traversals";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226337,7 +218020,6 @@ self: {
        sha256 = "1rzxvsyh8x3ql3zh7gyw9hjx9bl4v73h0y5kzgaxcfcdn86dg49c";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/sol/with-location#readme";
        description = "Use ImplicitParams-based source locations in a backward compatible way";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -226354,7 +218036,6 @@ self: {
          base conduit containers mtl profunctors
        ];
        testHaskellDepends = [ base conduit hspec HUnit mtl ];
-       homepage = "https://github.com/bartavelle/withdependencies";
        description = "Run computations that depend on one or more elements in a stream";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -226371,7 +218052,6 @@ self: {
          base base-orphans containers hashable transformers
          unordered-containers vector
        ];
-       homepage = "https://github.com/fumieval/witherable";
        description = "filterable traversable";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226385,7 +218065,6 @@ self: {
        libraryHaskellDepends = [
          base constraints semigroupoids transformers
        ];
-       homepage = "https://github.com/AshleyYakeley/witness";
        description = "values that witness types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226399,7 +218078,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base bytestring network unix ];
-       homepage = "https://github.com/kazu-yamamoto/witty/blob/master/README.md";
        description = "A network server to show bottlenecks of GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226411,7 +218089,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0j485hbk42ipmc14ydickfm268b7z183rs37ih3j99lbzrdm1s8l";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/chessai/wizard.git";
        description = "the fantastical wizard monoid";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226445,7 +218122,6 @@ self: {
        testHaskellDepends = [
          base filepath lens linear tasty tasty-golden trifecta
        ];
-       homepage = "http://github.com/bgamari/wkt";
        description = "Parsec parsers and types for geographic data in well-known text (WKT) format";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226474,7 +218150,6 @@ self: {
        testHaskellDepends = [
          base containers deepseq tasty tasty-hunit text
        ];
-       homepage = "https://github.com/minad/wl-pprint-annotated#readme";
        description = "Wadler/Leijen pretty printer with annotations and slightly modernized API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226491,7 +218166,6 @@ self: {
          ansi-terminal base bytestring containers mtl nats semigroups text
          transformers wl-pprint-extras
        ];
-       homepage = "https://github.com/seagull-kamome/wl-pprint-ansiterm";
        description = "ANSI Terminal support with wl-pprint-extras";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226510,7 +218184,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring colorful-monoids text wl-pprint-annotated
        ];
-       homepage = "https://github.com/minad/wl-pprint-console#readme";
        description = "Wadler/Leijen pretty printer supporting colorful console output";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -226530,7 +218203,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       homepage = "http://github.com/ekmett/wl-pprint-extras/";
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226548,7 +218220,6 @@ self: {
          base bytestring containers nats semigroups terminfo text
          transformers wl-pprint-extras
        ];
-       homepage = "http://github.com/ekmett/wl-pprint-terminfo/";
        description = "A color pretty printer with terminfo support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226626,7 +218297,6 @@ self: {
          lifted-async mwc-random network QuickCheck quickcheck-instances
          safe system-fileio system-filepath text transformers
        ];
-       homepage = "https://github.com/nikita-volkov/wobsurv";
        description = "A simple and highly performant HTTP file server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226658,7 +218328,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring network split ];
        executableHaskellDepends = [ base ];
-       homepage = "http://tom.lokhorst.eu/wol";
        description = "Send a Wake on LAN Magic Packet";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226681,7 +218350,6 @@ self: {
          uuid yaml
        ];
        executableHaskellDepends = [ base optparse-generic ];
-       homepage = "https://github.com/swift-nav/wolf";
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226695,7 +218363,6 @@ self: {
        sha256 = "1dw2rrcv7gl42hs1zfsf787382lil57apl6w97bfda8qzq94qysf";
        libraryHaskellDepends = [ base vector ];
        testHaskellDepends = [ base hspec vector ];
-       homepage = "https://github.com/TGOlson/woot-haskell";
        description = "Real time group editor without operational transform";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -226727,7 +218394,6 @@ self: {
        editedCabalFile = "01aanzslm69z94lqy43hgyxj1ys7sqfqwn72l0snw3h2n3pjwn45";
        libraryHaskellDepends = [ base binary containers ];
        testHaskellDepends = [ base binary containers hspec QuickCheck ];
-       homepage = "https://github.com/yi-editor/word-trie";
        description = "Implementation of a finite trie over words";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -226739,7 +218405,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "1fkbxrr7qh6dj9w7wihxjvb3d8kgcymz0zp8avnqpx5jsvwd5jdm";
        libraryHaskellDepends = [ base bytestring ghc-prim vector ];
-       homepage = "https://github.com/andrewthad/bytestring-coerce";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226755,7 +218420,6 @@ self: {
        libraryHaskellDepends = [ base text ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion text ];
-       homepage = "https://github.com/jtdaugherty/word-wrap/";
        description = "A library for word-wrapping";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226773,7 +218437,6 @@ self: {
          base deepseq QuickCheck test-framework test-framework-quickcheck2
        ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "https://github.com/winterland1989/word24";
        description = "24-bit word and int types for GHC";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226801,7 +218464,6 @@ self: {
          attoparsec base binary binary-ieee754 bytestring hspec HUnit text
          unordered-containers vector
        ];
-       homepage = "https://gonito.net/gitlist/word2vec-model.git";
        description = "Reading word2vec binary models";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226888,7 +218550,6 @@ self: {
          base containers deepseq directory filepath optparse-applicative
          QuickCheck text unix-compat vector
        ];
-       homepage = "https://github.com/mgajda/wordpass";
        description = "Dictionary-based password generator";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226935,7 +218596,6 @@ self: {
          ansi-terminal base bytestring containers directory filepath hashmap
          process
        ];
-       homepage = "http://people.csail.mit.edu/newton/wordsetdiff";
        description = "Compare two files as sets of N-tuples of words";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -226948,7 +218608,6 @@ self: {
        sha256 = "1rw9hba50z3b5lcbv34h061nqpzs9wg3359jwwfgjmya2xxzc747";
        libraryHaskellDepends = [ base containers time ];
        testHaskellDepends = [ base containers doctest hspec ];
-       homepage = "https://github.com/stackbuilders/workdays";
        description = "Workday calculations";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226972,7 +218631,6 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "http://github.com/sboosali/workflow-extra#readme";
        description = "Utilities (e.g. Googling the clipboard contents) for the `workflow` pacakge";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226993,7 +218651,6 @@ self: {
          transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/sboosali/workflow-osx#readme";
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227017,7 +218674,6 @@ self: {
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
-       homepage = "http://github.com/sboosali/workflow-pure#readme";
        description = "manipulate `workflow-types:Workflow`'s";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227037,7 +218693,6 @@ self: {
          base containers exceptions free spiros split text transformers
        ];
        executableHaskellDepends = [ base ];
-       homepage = "http://github.com/sboosali/workflow-types#readme";
        description = "Automate keyboard\/mouse\/clipboard\/application interaction";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227052,7 +218707,6 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest hspec QuickCheck ];
-       homepage = "http://github.com/sboosali/workflow-windows#readme";
        description = "Automate keyboard/mouse/clipboard/application interaction";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227068,7 +218722,6 @@ self: {
        sha256 = "19anwyh9n9agpcdhzfbh0l28nm0mdn8616klihbw55yxkiwqaxkk";
        libraryHaskellDepends = [ aeson base deepseq profunctors tagged ];
        testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/cdepillabout/world-peace";
        description = "Open Union and Open Product Types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227107,7 +218760,6 @@ self: {
        version = "0.0.2";
        sha256 = "161mz5bfmx13s9azh3dss64fw98vbaab8krysr9pbbp9dh79i1cf";
        libraryHaskellDepends = [ base ];
-       homepage = "http://frigidcode.com";
        description = "Convenient handling of points on a seamless 2-dimensional plane";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227128,7 +218780,6 @@ self: {
          hxt-filter polyparse tagchup tagsoup transformers utility-ht
          xml-basic
        ];
-       homepage = "http://code.haskell.org/~thielema/wraxml/";
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227168,7 +218819,6 @@ self: {
          base http-client http-client-tls lens markdown-unlit
          optparse-applicative transformers wreq
        ];
-       homepage = "https://github.com/lorenzo/wrecker#readme";
        description = "An HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227202,7 +218852,6 @@ self: {
          postgresql-simple postgresql-simple-url process resource-pool
          resourcet scotty stm temporary text time transformers wai-cors
        ];
-       homepage = "https://github.com/seatgeek/wrecker-ui#readme";
        description = "A web interface for Wrecker, the HTTP Performance Benchmarker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227242,7 +218891,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text time
          transformers unix-compat unordered-containers uuid vector
        ];
-       homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227280,7 +218928,6 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text time
          transformers unix-compat uuid vector
        ];
-       homepage = "http://www.serpentine.com/wreq";
        description = "An easy-to-use HTTP client library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227293,7 +218940,6 @@ self: {
        version = "0.5.9.1";
        sha256 = "0dgjjybbc4nza1a0af2j8jxscyhlcwdspmvy8zsmcczzcdhx2b2h";
        libraryHaskellDepends = [ base bytestring text utf8-string wreq ];
-       homepage = "https://github.com/j-keck/wreq-stringless#readme";
        description = "Simple wrapper to use wreq without Strings";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -227328,7 +218974,6 @@ self: {
          base bytestring clock dlist exceptions lifted-async lifted-base
          monad-control mtl stm stm-chans
        ];
-       homepage = "https://github.com/parsonsmatt/write-buffer#readme";
        description = "Buffer your writes, transparently";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227340,7 +218985,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "0q03pnkw3343jmcs2f2mrx84g3wj3plcagnjdviphzsg7rrf3a4l";
        libraryHaskellDepends = [ base stm stm-chans write-buffer-core ];
-       homepage = "https://github.com/parsonsmatt/write-buffer#readme";
        description = "A write buffer for STM channels and queues";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227357,7 +219001,6 @@ self: {
          base writer-cps-lens writer-cps-morph writer-cps-mtl
          writer-cps-transformers
        ];
-       homepage = "https://github.com/minad/writer-cps-full#readme";
        description = "WriteT and RWST monad transformers (Reexport with all dependencies)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227374,7 +219017,6 @@ self: {
          base lens profunctors transformers writer-cps-mtl
          writer-cps-transformers
        ];
-       homepage = "https://github.com/louispan/writer-cps-lens#readme";
        description = "Lens instances for the stricter CPS WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227390,7 +219032,6 @@ self: {
        libraryHaskellDepends = [
          base monads-tf transformers writer-cps-transformers
        ];
-       homepage = "https://github.com/minad/writer-cps-monads-tf#readme";
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227404,7 +219045,6 @@ self: {
        revision = "1";
        editedCabalFile = "0dqpbpaidwa7ahk0n7pv397mv7ncr26p3vcrjh1xzl6vk26bdah5";
        libraryHaskellDepends = [ base mmorph writer-cps-transformers ];
-       homepage = "https://github.com/louispan/writer-cps-morph#readme";
        description = "MFunctor instance for CPS style WriterT and RWST";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227419,7 +219059,6 @@ self: {
        libraryHaskellDepends = [
          base mtl transformers writer-cps-transformers
        ];
-       homepage = "https://github.com/minad/writer-cps-mtl#readme";
        description = "MonadWriter orphan instances for writer-cps-transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227431,7 +219070,6 @@ self: {
        version = "0.1.1.3";
        sha256 = "1bjarnjz4v07wnkaqn46mrhxvy2f9anq6aw6lq3cf4xlzlr2i8la";
        libraryHaskellDepends = [ base transformers ];
-       homepage = "https://github.com/minad/writer-cps-transformers#readme";
        description = "WriteT and RWST monad transformers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227444,7 +219082,6 @@ self: {
        sha256 = "1hb7dh4sayy11whx25012pwc914g6v2dl8gldc2ipkzaa6wpycsh";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/tdammers/wryte#readme";
        description = "Pretty output for source generators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227469,7 +219106,6 @@ self: {
          haskeline mtl network optparse-applicative strict text vector
          websockets wuss
        ];
-       homepage = "https://github.com/athanclark/ws#readme";
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227493,7 +219129,6 @@ self: {
          test-framework test-framework-quickcheck2 text unagi-chan wai
          wai-websockets warp websockets
        ];
-       homepage = "https://github.com/shmish111/ws-chans";
        description = "Unagi chan based websocket client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227550,7 +219185,6 @@ self: {
          aeson base binary binary-parsers bytestring network text time
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/MarcFontaine/wsjtx-udp";
        description = "WSJT-X UDP protocol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227595,7 +219229,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory filepath vector-space wumpus-core
        ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Basic objects and system code built on Wumpus-Core";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227610,7 +219243,6 @@ self: {
        revision = "1";
        editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h";
        libraryHaskellDepends = [ base containers time vector-space ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227627,7 +219259,6 @@ self: {
        libraryHaskellDepends = [
          base containers vector-space wumpus-basic wumpus-core
        ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "High-level drawing objects built on Wumpus-Basic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227644,7 +219275,6 @@ self: {
        libraryHaskellDepends = [
          base vector-space wumpus-basic wumpus-core wumpus-drawing
        ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Microprints - \"greek-text\" pictures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227662,7 +219292,6 @@ self: {
          base containers vector-space wumpus-basic wumpus-core
          wumpus-drawing
        ];
-       homepage = "http://code.google.com/p/copperbox/";
        description = "Drawing trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227678,7 +219307,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring connection network websockets
        ];
-       homepage = "https://github.com/tfausak/wuss#readme";
        description = "Secure WebSocket (WSS) clients";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -227691,7 +219319,6 @@ self: {
        sha256 = "04ccw9g8a08ipp4r1282jzgmx0lvxsbwgiasxq7ivij133mspjxx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base stm time wxcore ];
-       homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227707,7 +219334,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base directory random wx wxcore ];
-       homepage = "https://wiki.haskell.org/WxAsteroids";
        description = "Try to avoid the asteroids with your space ship";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227723,7 +219349,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base old-time wx wxcore Yampa ];
        executableHaskellDepends = [ base wx wxcore Yampa ];
-       homepage = "http://www.haskell.org/haskellwiki/WxFruit";
        description = "An implementation of Fruit using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227760,7 +219385,6 @@ self: {
        doHaddock = false;
        postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $out/lib/libwxc.so";
        postPatch = "sed -i -e '/ldconfig inst_lib_dir/d' Setup.hs";
-       homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227782,7 +219406,6 @@ self: {
          wxc wxdirect
        ];
        libraryPkgconfigDepends = [ wxGTK ];
-       homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227801,7 +219424,6 @@ self: {
        executableHaskellDepends = [
          base containers directory filepath parsec process strict time
        ];
-       homepage = "https://wiki.haskell.org/WxHaskell";
        description = "helper tool for building wxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227817,7 +219439,6 @@ self: {
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [ base wx wxcore ];
-       homepage = "http://github.com/elbrujohalcon/wxhnotepad";
        description = "An example of how to implement a basic notepad with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227856,7 +219477,6 @@ self: {
          ansi-terminal base conduit containers hspec lens process resourcet
          semigroups terminal-size text transformers unix
        ];
-       homepage = "https://github.com/supki/wybor";
        description = "Console line fuzzy search";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -227875,7 +219495,6 @@ self: {
          base bytestring ConfigFile containers dgs directory filepath mtl
          parsec process sgf split
        ];
-       homepage = "http://dmwit.com/wyvern";
        description = "An autoresponder for Dragon Go Server";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227893,7 +219512,6 @@ self: {
          array base bytestring containers monads-tf text transformers
          type-level
        ];
-       homepage = "http://jwlato.webfactional.com/haskell/x-dsp";
        description = "A embedded DSL for manipulating DSP languages in Haskell";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227908,7 +219526,6 @@ self: {
        revision = "1";
        editedCabalFile = "1c561z9xvfcd7ddbiw3r0frhjvsrklachd38s66fzwjdgw1sl124";
        libraryHaskellDepends = [ base utf8-string X11 ];
-       homepage = "https://github.com/YoshikuniJujo/x11-xim_haskell/wiki/";
        description = "A binding to the xim of X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227922,7 +219539,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl X11 ];
        librarySystemDepends = [ libXi ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://redmine.iportnov.ru/projects/x11-xinput";
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs.xorg) libXi;};
@@ -227946,7 +219562,6 @@ self: {
          asn1-types base bytestring cryptonite hourglass mtl tasty
          tasty-quickcheck
        ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X509 reader and writer";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227965,7 +219580,6 @@ self: {
          directory filepath mtl pem x509
        ];
        testHaskellDepends = [ base bytestring tasty tasty-hunit x509 ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 collection accessing and storing methods";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -227982,7 +219596,6 @@ self: {
          base bytestring containers directory filepath mtl pem process x509
          x509-store
        ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Handle per-operating-system X.509 accessors and storage";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228002,7 +219615,6 @@ self: {
          asn1-encoding asn1-types base bytestring cryptonite directory
          hourglass pem x509 x509-store x509-system x509-validation
        ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Utility for X509 certificate and chain";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228026,7 +219638,6 @@ self: {
          asn1-encoding asn1-types base bytestring cryptonite
          data-default-class hourglass tasty tasty-hunit x509 x509-store
        ];
-       homepage = "http://github.com/vincenthz/hs-certificate";
        description = "X.509 Certificate and CRL validation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228045,7 +219656,6 @@ self: {
        testHaskellDepends = [
          base deepseq monads-tf QuickCheck tardis vector
        ];
-       homepage = "https://github.com/divipp/x86-64";
        description = "Runtime code generation for x86 64 bit machine code";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228079,7 +219689,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base old-time select X11 ];
-       homepage = "https://github.com/polachok/xbattbar";
        description = "Simple battery indicator";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -228091,7 +219700,6 @@ self: {
        version = "0.9.0";
        sha256 = "14bxm6djq4571w313q0qj3v2mfrb2ji2cy0sgl5fh5bsbk2m5i3g";
        libraryHaskellDepends = [ base containers mtl pretty xml ];
-       homepage = "http://community.haskell.org/~aslatter/code/xcb-types";
        description = "Parses XML files used by the XCB project";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228121,7 +219729,6 @@ self: {
          base filepath HUnit language-python test-framework
          test-framework-hunit xcb-types
        ];
-       homepage = "http://github.com/tych0/xcffib";
        description = "A cffi-based python binding for X";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228182,7 +219789,6 @@ self: {
          network optparse-applicative path random safe-exceptions signal stm
          text transformers transformers-base unix-compat
        ];
-       homepage = "https://github.com/JanGe/xdcc";
        description = "A wget-like utility for retrieving files from XDCC bots on IRC";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228195,7 +219801,6 @@ self: {
        version = "0.2.2";
        sha256 = "0azlzaxp2dn4l1nr7shsxah2magk1szf6fx0mv75az00qsjw6qg4";
        libraryHaskellDepends = [ base directory filepath ];
-       homepage = "http://github.com/willdonnelly/xdg-basedir";
        description = "A basic implementation of the XDG Base Directory specification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228210,7 +219815,6 @@ self: {
        libraryHaskellDepends = [
          base containers directory filepath xdg-basedir
        ];
-       homepage = "http://redmine.iportnov.ru/projects/xdg-userdirs";
        description = "Basic implementation of XDG user directories specification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228252,7 +219856,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
        ];
-       homepage = "https://github.com/ocramz/xeno";
        description = "A fast event-based XML parser in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228286,7 +219889,6 @@ self: {
        libraryHaskellDepends = [ base glib ];
        libraryPkgconfigDepends = [ libxfconf ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228300,7 +219902,6 @@ self: {
        sha256 = "1q2wm0wffvppbv5rd16z367yfkx2sq7j0i5dkfwpawf859c9pz7x";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/spl/xformat";
        description = "Extensible, type-safe formatting with scanf- and printf-like functions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228316,7 +219917,6 @@ self: {
        libraryHaskellDepends = [ base foundation ];
        executableHaskellDepends = [ base foundation ];
        executableSystemDepends = [ xgboost ];
-       homepage = "https://github.com/sighingnow/xgboost-haskell#readme";
        description = "XGBoost library for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) xgboost;};
@@ -228332,7 +219932,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers ghc-prim mtl parsec regex-base
        ];
-       homepage = "http://code.google.com/p/xhaskell-library/";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228350,7 +219949,6 @@ self: {
          base binary byteorder bytestring containers network parsec stm
          Xauth
        ];
-       homepage = "https://github.com/aslatter/xhb";
        description = "X Haskell Bindings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228367,7 +219965,6 @@ self: {
        libraryHaskellDepends = [
          base hashable mtl transformers unordered-containers xhb
        ];
-       homepage = "http://github.com/jotrk/xhb-atom-cache/";
        description = "Atom cache for XHB";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228385,7 +219982,6 @@ self: {
          base binary bytestring dlist hashable mtl transformers xhb
          xhb-atom-cache
        ];
-       homepage = "http://github.com/jotrk/xhb-ewmh/";
        description = "EWMH utilities for XHB";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228398,7 +219994,6 @@ self: {
        version = "3000.2.2.1";
        sha256 = "0939kwpinq6l4n3nyvd1gzyl7f83gymw0wzqndlgy1yc7q0nkj2w";
        libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/haskell/xhtml";
        description = "An XHTML combinator library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228414,7 +220009,6 @@ self: {
        libraryHaskellDepends = [
          base containers random text transformers xml
        ];
-       homepage = "http://www.dcs.shef.ac.uk/~aca08aa/xhtmlc.html";
        description = "Fast and easy to use XHTML combinators";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228445,7 +220039,6 @@ self: {
        librarySystemDepends = [ xine ];
        libraryPkgconfigDepends = [ libxine ];
        libraryToolDepends = [ c2hs ];
-       homepage = "http://github.com/joachifm/hxine";
        description = "Bindings to xine-lib";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228470,7 +220063,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring containers HTF text time
        ];
-       homepage = "http://github.com/JanAhrens/xing-api-haskell";
        description = "Wrapper for the XING API, v1";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228529,7 +220121,6 @@ self: {
        executableHaskellDepends = [
          base bytestring directory filepath HTTP network tagsoup
        ];
-       homepage = "http://github.com/sellweek/xkcd";
        description = "Downloads the most recent xkcd comic";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228546,7 +220137,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers mtl xml ];
-       homepage = "https://github.com/aisamanra/xleb";
        description = "A simple monadic language for parsing XML structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228568,7 +220158,6 @@ self: {
          base conduit getopt-generics resourcet transformers
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/harendra-kumar/xls";
        description = "Parse Microsoft Excel xls files (BIFF/Excel 97-2004)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228621,7 +220210,6 @@ self: {
          xml-conduit
        ];
        benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228639,7 +220227,6 @@ self: {
          aeson base bytestring containers data-default lens text xlsx
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/kkazuo/xlsx-tabular";
        description = "Xlsx table cell value extraction utility";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228659,7 +220246,6 @@ self: {
          base bytestring conduit containers data-default parsec text time
          transformers xlsx
        ];
-       homepage = "https://github.com/qrilka/xlsx-templater";
        description = "Simple and incomplete Excel file templater";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228672,7 +220258,6 @@ self: {
        version = "1.3.14";
        sha256 = "0g814lj7vaxvib2g3r734221k80k7ap9czv9hinifn8syals3l9j";
        libraryHaskellDepends = [ base bytestring text ];
-       homepage = "http://code.galois.com";
        description = "A simple XML library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228705,7 +220290,6 @@ self: {
          base bytestring conduit containers text transformers uri-conduit
          xml-conduit
        ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "Parse XML catalog files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228730,7 +220314,6 @@ self: {
          base blaze-markup bytestring conduit containers hspec HUnit
          resourcet text transformers xml-types
        ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228755,7 +220338,6 @@ self: {
          base blaze-markup bytestring conduit containers hspec HUnit
          resourcet text transformers xml-types
        ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -228775,7 +220357,6 @@ self: {
          base data-default lens tasty tasty-hunit text time xml-conduit
          xml-types
        ];
-       homepage = "https://github.com/benkolera/xml-conduit-decode";
        description = "Historical cursors & decoding on top of xml-conduit";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228798,7 +220379,6 @@ self: {
          base conduit conduit-parse data-default parsers resourcet tasty
          tasty-hunit
        ];
-       homepage = "https://github.com/k0ral/xml-conduit-parse";
        description = "Streaming XML parser based on conduits";
        license = "unknown";
      }) {};
@@ -228815,7 +220395,6 @@ self: {
          base containers data-default dlist mtl text xml-conduit xml-types
        ];
        testHaskellDepends = [ base text ];
-       homepage = "https://bitbucket.org/dpwiz/xml-conduit-writer";
        description = "Warm and fuzzy creation of XML documents";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -228839,7 +220418,6 @@ self: {
          base bytestring containers enumerator hspec HUnit text transformers
          xml-types
        ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228870,7 +220448,6 @@ self: {
        version = "0.4.0.2";
        sha256 = "0ivzl1ikijrbz5mi75rxa340dxf7ilyzlxzka25si91jmjq0a9xa";
        libraryHaskellDepends = [ base mtl transformers xml ];
-       homepage = "https://github.com/holmisen/xml-extractors";
        description = "Extension to the xml package to extract data from parsed xml";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228891,7 +220468,6 @@ self: {
          base containers hspec HUnit parsec shakespeare template-haskell
          text xml-conduit
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Hamlet-style quasiquoter for XML content";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228903,7 +220479,6 @@ self: {
        version = "1.0.0";
        sha256 = "0rrk0j7m8ws86hbjw0l4ryq4m9i8llhsag2sfisy5r1iv2zwa0lv";
        libraryHaskellDepends = [ base xml ];
-       homepage = "http://github.com/acw/xml-helpers";
        description = "Some useful helper functions for the xml library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228922,7 +220497,6 @@ self: {
        testHaskellDepends = [
          base doctest hspec hspec-expectations-lens lens xml-conduit
        ];
-       homepage = "https://github.com/supki/xml-html-conduit-lens#readme";
        description = "Optics for xml-conduit and html-conduit";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -228946,7 +220520,6 @@ self: {
        testHaskellDepends = [
          base doctest Glob tasty tasty-hunit text xml-conduit
        ];
-       homepage = "https://github.com/cdepillabout/xml-html-qq";
        description = "Quasi-quoters for XML and HTML Documents";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228966,7 +220539,6 @@ self: {
          base bytestring data-default doctest Glob tasty tasty-hunit text
          xml-conduit
        ];
-       homepage = "https://github.com/cdepillabout/xml-indexed-cursor";
        description = "Indexed XML cursors similar to 'Text.XML.Cursor' from xml-conduit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -228988,7 +220560,6 @@ self: {
          base data-default dom-parser generic-arbitrary hspec QuickCheck
          quickcheck-instances semigroups xml-conduit xml-conduit-writer
        ];
-       homepage = "https://github.com/typeable/xml-isogen";
        description = "Generate XML-isomorphic types";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -229012,7 +220583,6 @@ self: {
          QuickCheck quickcheck-instances semigroups xml-conduit
          xml-conduit-writer
        ];
-       homepage = "https://github.com/typeable/xml-isogen";
        description = "Generate XML-isomorphic types";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229031,7 +220601,6 @@ self: {
        libraryHaskellDepends = [
          base case-insensitive containers lens text xml-conduit
        ];
-       homepage = "https://github.com/fumieval/xml-lens";
        description = "Lenses, traversals, and prisms for xml-conduit";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229046,7 +220615,6 @@ self: {
        libraryHaskellDepends = [
          base mtl transformers transformers-compose xml
        ];
-       homepage = "http://github.com/aristidb/xml-monad";
        description = "Monadic extensions to the xml package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229059,7 +220627,6 @@ self: {
        version = "1.0.3";
        sha256 = "1zcmiqyw6bs50kl2417ygvnpsk9wy025ls5ck8cd863x47bqpdn2";
        libraryHaskellDepends = [ base HaXml parsec ];
-       homepage = "http://sep07.mroot.net/";
        description = "Parsing XML with Parsec";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229089,7 +220656,6 @@ self: {
        version = "0.0.0.11";
        sha256 = "0j5fjnf6r7cagcl1ni5idwj1k5q6vjp6c59ajwsx39iqx1kdmly4";
        libraryHaskellDepends = [ base bytestring papillon simple-pipe ];
-       homepage = "https://github.com/YoshikuniJujo/xml-pipe/wiki";
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229105,7 +220671,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base cmdargs unix ];
-       homepage = "http://github.com/rosenbergdm/xml-prettify";
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229127,7 +220692,6 @@ self: {
          peyotls random sasl simple-pipe stm tighttp transformers-base uuid
          x509 x509-store x509-validation xml-pipe xmpipe
        ];
-       homepage = "https://github.com/YoshikuniJujo/xml-push/wiki";
        description = "Push XML from/to client to/from server over XMPP or HTTP";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229140,7 +220704,6 @@ self: {
        version = "0.9.1";
        sha256 = "16wszpvz8cp8nx18rmgyjy6mqk9awd3yf9w0is5rw77r73w88nwq";
        libraryHaskellDepends = [ base-prelude free text ];
-       homepage = "https://github.com/sannsyn/xml-query";
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229158,7 +220721,6 @@ self: {
          base-prelude text xml-conduit xml-query xml-query-xml-types
          xml-types
        ];
-       homepage = "https://github.com/sannsyn/xml-query-xml-conduit";
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229183,7 +220745,6 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text xml-conduit xml-query xml-types
        ];
-       homepage = "https://github.com/sannsyn/xml-query-xml-types";
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229206,7 +220767,6 @@ self: {
          vector
        ];
        executableHaskellDepends = [ base ];
-       homepage = "https://github.com/sinelaw/xml-to-json";
        description = "Library and command line tool for converting XML files to json";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -229221,7 +220781,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base tagsoup text ];
        executableHaskellDepends = [ base directory process ];
-       homepage = "https://github.com/sinelaw/xml-to-json-fast";
        description = "Fast, light converter of xml to json capable of handling huge xml files";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -229243,7 +220802,6 @@ self: {
          base QuickCheck quickcheck-instances tasty tasty-hunit
          tasty-quickcheck text time xml-conduit
        ];
-       homepage = "https://github.com/lancelet/xml-tydom";
        description = "Typed XML encoding for an xml-conduit backend";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229256,7 +220814,6 @@ self: {
        version = "0.1.0.0";
        sha256 = "09svwcfcqmxrczs7qb4haf68dnb8q47cm19f504cqfnr4brs093l";
        libraryHaskellDepends = [ base containers mtl QuickCheck text ];
-       homepage = "https://github.com/lancelet/xml-tydom";
        description = "Typed XML encoding (core library)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229268,7 +220825,6 @@ self: {
        version = "0.3.6";
        sha256 = "1jgqxsa9p2q3h6nymbfmvhldqrqlwrhrzmwadlyc0li50x0d8dwr";
        libraryHaskellDepends = [ base deepseq text ];
-       homepage = "https://john-millikin.com/software/haskell-xml/";
        description = "Basic types for representing XML";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -229280,7 +220836,6 @@ self: {
        version = "0.2.0";
        sha256 = "1kf4vjg4cfkd4vx8jpikbb0ib4pglmyf5vqrg3j0yllmycj22ska";
        libraryHaskellDepends = [ base xml-conduit ];
-       homepage = "http://github.com/snoyberg/xml";
        description = "blaze-html instances for xml-conduit types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229310,7 +220865,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hspec resourcet text transformers
        ];
-       homepage = "http://github.com/yihuang/xml2json";
        description = "translate xml to json";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229351,7 +220905,6 @@ self: {
          base bytestring QuickCheck quickcheck-instances tasty tasty-hunit
          tasty-quickcheck text transformers unordered-containers
        ];
-       homepage = "https://gitlab.com/k0001/xmlbf";
        description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints";
        license = stdenv.lib.licenses.asl20;
      }) {};
@@ -229372,7 +220925,6 @@ self: {
          base bytestring QuickCheck quickcheck-instances tasty tasty-hunit
          tasty-quickcheck text unordered-containers xmlbf
        ];
-       homepage = "https://gitlab.com/k0001/xmlbf";
        description = "xeno backend support for the xmlbf library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229395,7 +220947,6 @@ self: {
          base bytestring QuickCheck quickcheck-instances tasty tasty-hunit
          tasty-quickcheck text unordered-containers xmlbf
        ];
-       homepage = "https://gitlab.com/k0001/xmlbf";
        description = "xmlhtml backend support for the xmlbf library";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229440,7 +220991,6 @@ self: {
          bytestring-builder containers directory hspec HUnit text
          unordered-containers
        ];
-       homepage = "https://github.com/snapframework/xmlhtml";
        description = "XML parser and renderer with HTML 5 quirks mode";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229463,7 +221013,6 @@ self: {
          old-locale split terminfo time unix wl-pprint-extras
          wl-pprint-terminfo xdg-basedir xml
        ];
-       homepage = "http://github.com/dagle/hs-xmltv";
        description = "Show tv channels in the terminal";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229527,7 +221076,6 @@ self: {
          base bytestring containers directory filepath hspec mtl old-locale
          parsec process regex-compat stm time transformers unix X11
        ];
-       homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -229560,7 +221108,6 @@ self: {
          mv "$data/"**"/man/"*[0-9] $doc/share/man/man1/
          rm "$data/"**"/man/"*
        '';
-       homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229580,7 +221127,6 @@ self: {
          base containers directory extensible-exceptions filepath mtl
          process unix X11
        ];
-       homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229600,7 +221146,6 @@ self: {
          mtl old-locale old-time process random unix utf8-string X11 X11-xft
          xmonad
        ];
-       homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229619,7 +221164,6 @@ self: {
          old-time process random unix utf8-string X11 X11-xft
          xmonad-bluetilebranch
        ];
-       homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229632,7 +221176,6 @@ self: {
        version = "0.12.1";
        sha256 = "1xs9qwzq9x552jw9wxdaddk2w1m5kc060mqahhk2f2q3zs9nk2n9";
        libraryHaskellDepends = [ base mtl xmonad xmonad-contrib ];
-       homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229650,7 +221193,6 @@ self: {
          base directory extensible-exceptions filepath mtl process unix X11
          xmonad xmonad-contrib
        ];
-       homepage = "https://github.com/Javran/xmonad-entryhelper";
        description = "XMonad config entry point wrapper";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -229667,7 +221209,6 @@ self: {
          base containers directory hint mtl old-locale old-time process
          random unix X11 xmonad xmonad-contrib
        ];
-       homepage = "http://xmonad.org/";
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229688,7 +221229,6 @@ self: {
          alsa-mixer base bytestring containers hint libmpd mtl network
          regex-posix X11 xmonad xmonad-contrib
        ];
-       homepage = "https://github.com/xmonad/xmonad-extras";
        description = "Third party extensions for xmonad with wacky dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229700,7 +221240,6 @@ self: {
        version = "0.1.2";
        sha256 = "1m7bmdhc1nlwflli1ymnjlmysg9d54w0shpxq05xwmiycg4jbwr1";
        libraryHaskellDepends = [ base gtk xmonad ];
-       homepage = "https://github.com/supki/xmonad-screenshot";
        description = "Workspaces screenshooting utility for XMonad";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -229714,7 +221253,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base ghc random unix X11 ];
-       homepage = "https://github.com/LeifW/xmonad-utils";
        description = "A small collection of X utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229734,7 +221272,6 @@ self: {
          xmonad-contrib
        ];
        testHaskellDepends = [ base hspec xmonad ];
-       homepage = "https://hub.darcs.net/vmchale/xmonad-vanessa";
        description = "Custom xmonad, which builds with stack or cabal";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229762,7 +221299,6 @@ self: {
        libraryHaskellDepends = [
          base containers utf8-string xmonad xmonad-contrib
        ];
-       homepage = "https://github.com/plindbe2/xmonad-windownames";
        description = "A library to automatically put named windows into the DynamicLog";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229780,7 +221316,6 @@ self: {
          base base64-bytestring bytestring handle-like monads-tf sasl
          simple-pipe uuid xml-pipe
        ];
-       homepage = "https://github.com/YoshikuniJujo/xmpipe/wiki";
        description = "XMPP implementation using simple-PIPE";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229805,7 +221340,6 @@ self: {
        sha256 = "1j0j64668vi0jxrzxrwyp8gwcz5zpaiai2r5k5rfsfrglhrhvhrv";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ xosd ];
-       homepage = "http://code.haskell.org/~dons/code/xosd";
        description = "A binding to the X on-screen display";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) xosd;};
@@ -229845,7 +221379,6 @@ self: {
          mtl xournal-parser xournal-render xournal-types
        ];
        executableHaskellDepends = [ base cmdargs ];
-       homepage = "http://ianwookim.org/hxournal";
        description = "convert utility for xoj files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229866,7 +221399,6 @@ self: {
          containers exceptions lens mtl strict text transformers xml-conduit
          xml-types xournal-types zlib-conduit
        ];
-       homepage = "http://ianwookim.org/hoodle";
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -229918,7 +221450,6 @@ self: {
        executableHaskellDepends = [
          base hxt hxt-xpath optparse-applicative text
        ];
-       homepage = "https://github.com/danchoi/xpathdsv#readme";
        description = "Command line tool to extract DSV data from HTML and XML with XPATH expressions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229937,7 +221468,6 @@ self: {
        executableHaskellDepends = [
          array base containers directory process random unix
        ];
-       homepage = "http://malde.org/~ketil/";
        description = "Cluster EST sequences";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -229955,7 +221485,6 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath QuickCheck quickcheck-instances
        ];
-       homepage = "https://github.com/tonymorris/xsd";
        description = "XML Schema data structures";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230001,7 +221530,6 @@ self: {
          attoparsec base containers css-text hspec HUnit network-uri tagsoup
          text utf8-string
        ];
-       homepage = "http://github.com/yesodweb/haskell-xss-sanitize";
        description = "sanitize untrusted HTML to prevent XSS attacks";
        license = stdenv.lib.licenses.bsd2;
      }) {};
@@ -230014,7 +221542,6 @@ self: {
        sha256 = "0jfs3qbcx5h26irkq73dyc2m84qyrlj5dvy6d1s6p6520vhnqfal";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base wx wxcore ];
-       homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230078,7 +221605,6 @@ self: {
          base bytestring criterion deepseq digest hashable murmur-hash
          xxhash
        ];
-       homepage = "https://github.com/haskell-haskey/xxhash-ffi#readme";
        description = "Bindings to the C implementation the xxHash algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -230111,7 +221637,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base word8 ];
-       homepage = "https://github.com/fgaz/yabi";
        description = "Yet Another Brainfuck Interpreter";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -230154,7 +221679,6 @@ self: {
          tar text transformers unordered-containers vector wai warp yaml
          yesod-core yesod-form zlib
        ];
-       homepage = "http://github.com/snoyberg/yackage";
        description = "Personal Hackage replacement for testing new packages";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230177,7 +221701,6 @@ self: {
          base doctest either Glob hspec http-client http-client-tls mtl safe
          servant servant-client
        ];
-       homepage = "https://github.com/cdepillabout/yahoo-finance-api";
        description = "Read quotes from Yahoo Finance API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230206,7 +221729,6 @@ self: {
        version = "0.2";
        sha256 = "064qakx4khzz9ih9isw46c8pm8wpg662fwnis4d64nszy6y9yfck";
        libraryHaskellDepends = [ base HTTP network xml ];
-       homepage = "http://www.people.fas.harvard.edu/~stewart5/code/yahoo-web-search";
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230221,7 +221743,6 @@ self: {
        libraryHaskellDepends = [ base bytestring text ];
        librarySystemDepends = [ yajl ];
        libraryToolDepends = [ c2hs ];
-       homepage = "https://john-millikin.com/software/haskell-yajl/";
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230238,7 +221759,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring enumerator json-types text transformers yajl
        ];
-       homepage = "https://john-millikin.com/software/haskell-yajl/";
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230251,7 +221771,6 @@ self: {
        version = "0.2.1";
        sha256 = "131x7hl309zpwl31k6mwqd4fdrhkcwxvn4dvlky9bh3prc8kdm2s";
        libraryHaskellDepends = [ base categories transformers ];
-       homepage = "http://brandon.si/code/yall/";
        description = "Lenses with a southern twang";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -230275,12 +221794,27 @@ self: {
          text time transformers unliftio-core unordered-containers
          wai-logger yaml
        ];
-       homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme";
        description = "Yam App";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yam-config" = callPackage
+    ({ mkDerivation, aeson, base, data-default, random
+     , string-conversions, text, unordered-containers, vault, yaml
+     }:
+     mkDerivation {
+       pname = "yam-config";
+       version = "0.3.3";
+       sha256 = "1qkxls422nym457rqyrbrzk1dx2gw3c6zxk1nzpm9287qd5pwp5n";
+       libraryHaskellDepends = [
+         aeson base data-default random string-conversions text
+         unordered-containers vault yaml
+       ];
+       description = "Yam Configuation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yam-job" = callPackage
     ({ mkDerivation, base, cron, yam-app }:
      mkDerivation {
@@ -230288,11 +221822,25 @@ self: {
        version = "0.2.0";
        sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895";
        libraryHaskellDepends = [ base cron yam-app ];
-       homepage = "https://github.com/leptonyu/yam/tree/master/yam-job#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yam-logger" = callPackage
+    ({ mkDerivation, aeson, base, fast-logger, monad-logger, text
+     , vault, yam-config
+     }:
+     mkDerivation {
+       pname = "yam-logger";
+       version = "0.3.2";
+       sha256 = "0i28d47b9dmjc039r4gwp7zijj04kg3092rsi9xwch991wxipbkc";
+       libraryHaskellDepends = [
+         aeson base fast-logger monad-logger text vault yam-config
+       ];
+       description = "Yam Logger";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yam-servant" = callPackage
     ({ mkDerivation, aeson, base, http-types, lens, servant
      , servant-server, servant-swagger, servant-swagger-ui, swagger2
@@ -230306,11 +221854,30 @@ self: {
          aeson base http-types lens servant servant-server servant-swagger
          servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job
        ];
-       homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yam-transaction" = callPackage
+    ({ mkDerivation, aeson, base, conduit, data-default, monad-logger
+     , persistent, persistent-postgresql, persistent-sqlite
+     , resource-pool, resourcet, string-conversions, text, time
+     , transformers, unliftio-core, vault, yam-logger
+     }:
+     mkDerivation {
+       pname = "yam-transaction";
+       version = "0.3.3";
+       sha256 = "105npa993x4g7xgq5z6j9md98ynaycxypcgll6ihrj7nscymdfca";
+       libraryHaskellDepends = [
+         aeson base conduit data-default monad-logger persistent
+         persistent-postgresql persistent-sqlite resource-pool resourcet
+         string-conversions text time transformers unliftio-core vault
+         yam-logger
+       ];
+       description = "Yam transaction";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yam-transaction-odbc" = callPackage
     ({ mkDerivation, base, containers, persistent-odbc, yam-app }:
      mkDerivation {
@@ -230320,7 +221887,6 @@ self: {
        libraryHaskellDepends = [
          base containers persistent-odbc yam-app
        ];
-       homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-odbc#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -230336,11 +221902,39 @@ self: {
        libraryHaskellDepends = [
          base containers persistent-postgresql unliftio-core yam-app
        ];
-       homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-postgresql#readme";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yam-web" = callPackage
+    ({ mkDerivation, aeson, base, data-default, lens, persistent
+     , persistent-template, reflection, servant-server, servant-swagger
+     , servant-swagger-ui, string-conversions, swagger2, text, time
+     , transformers, unliftio-core, vault, wai, wai-extra, warp
+     , yam-config, yam-logger, yam-transaction
+     }:
+     mkDerivation {
+       pname = "yam-web";
+       version = "0.3.3";
+       sha256 = "1599lwblymwf3bh16s9lw7j98174iaingnjjz0a5zlhqxw277ma6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base data-default lens reflection servant-server
+         servant-swagger servant-swagger-ui string-conversions swagger2 text
+         transformers unliftio-core vault wai wai-extra warp yam-config
+         yam-logger yam-transaction
+       ];
+       executableHaskellDepends = [
+         aeson base data-default lens persistent persistent-template
+         reflection servant-server servant-swagger servant-swagger-ui
+         string-conversions swagger2 text time transformers unliftio-core
+         vault wai wai-extra warp yam-config yam-logger yam-transaction
+       ];
+       description = "Yam Web";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yamemo" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -230377,7 +221971,6 @@ self: {
          mockery resourcet temporary text transformers unordered-containers
          vector
        ];
-       homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libyaml;};
@@ -230398,7 +221991,6 @@ self: {
        testHaskellDepends = [
          aeson base doctest tasty tasty-hunit text unordered-containers
        ];
-       homepage = "https://github.com/feuerbach/yaml-combinators";
        description = "YAML parsing combinators for improved validation and error reporting";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -230463,7 +222055,6 @@ self: {
          template-haskell text th-lift transformers unordered-containers
          vector wreq yaml
        ];
-       homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Simple library for network (HTTP REST-like) YAML RPC";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230481,7 +222072,6 @@ self: {
          aeson base containers http-types mmorph scotty text transformers
          yaml yaml-rpc
        ];
-       homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Scotty server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230499,7 +222089,6 @@ self: {
          aeson base bytestring containers http-types snap text transformers
          yaml yaml-rpc
        ];
-       homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Snap server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230528,7 +222117,6 @@ self: {
          base hspec QuickCheck quickcheck-instances scientific text
          unordered-containers vector yaml
        ];
-       homepage = "https://github.com/michelk/yaml-union.hs";
        description = "Read multiple yaml-files and override fields recursively";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -230546,7 +222134,6 @@ self: {
        executableHaskellDepends = [
          base containers directory filepath network swish text xml yaml
        ];
-       homepage = "http://github.com/leifw/yaml2owl";
        description = "Generate OWL schema from YAML syntax, and an RDFa template";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230565,7 +222152,6 @@ self: {
        executableHaskellDepends = [
          base containers parsec text unordered-containers yaml
        ];
-       homepage = "https://github.com/acatton/yamlkeysdiff";
        description = "Compares the keys from two yaml files";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230600,7 +222186,6 @@ self: {
        executableHaskellDepends = [
          base GLFW-b newtype OpenGL vector-space Yampa
        ];
-       homepage = "https://github.com/deepfire/yampa-glfw";
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230619,7 +222204,6 @@ self: {
        libraryHaskellDepends = [
          base GLUT newtype OpenGL vector-space Yampa-core
        ];
-       homepage = "https://github.com/ony/yampa-glut";
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -230638,7 +222222,6 @@ self: {
        testHaskellDepends = [
          base data-memocombinators linear sdl2 StateVar text vector Yampa
        ];
-       homepage = "https://github.com/Simre1/YampaSDL2#readme";
        description = "Yampa and SDL2 made easy";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230653,7 +222236,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gloss random Yampa ];
-       homepage = "https://github.com/ksaveljev/yampa-2048";
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230686,7 +222268,6 @@ self: {
        revision = "1";
        editedCabalFile = "0p55j9q5idzw5bmpg0i4vkifaadzvf3fdhjd02bh2ym2y15g0csk";
        libraryHaskellDepends = [ base mtl template-haskell ];
-       homepage = "https://github.com/esmolanka/yaop";
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230721,7 +222302,6 @@ self: {
          protolude quickcheck-instances tasty tasty-hunit tasty-quickcheck
          tasty-th text
        ];
-       homepage = "https://github.com/Profpatsch/yarn-lock#readme";
        description = "Represent and parse yarn.lock files";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230758,7 +222338,6 @@ self: {
          protolude regex-tdfa regex-tdfa-text stm tasty tasty-hunit
          tasty-quickcheck tasty-th text unordered-containers yarn-lock
        ];
-       homepage = "https://github.com/Profpatsch/yarn2nix#readme";
        description = "Convert yarn.lock files to nix expressions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230843,7 +222422,6 @@ self: {
        libraryHaskellDepends = [
          base containers csv mtl uniplate yhccore
        ];
-       homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230863,7 +222441,6 @@ self: {
          base containers directory filepath process strict time unix
          xdg-basedir
        ];
-       homepage = "http://dmwit.com/yeganesh";
        description = "small dmenu wrapper";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -230889,7 +222466,6 @@ self: {
          aeson base bytestring containers criterion deepseq http-client
          http-client-tls http-types network stm text unordered-containers
        ];
-       homepage = "http://yellerapp.com";
        description = "A Yeller Client For Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230912,7 +222488,6 @@ self: {
          base Cabal containers mtl parsec random
        ];
        testHaskellDepends = [ base containers hspec QuickCheck ];
-       homepage = "https://github.com/igrep/yes-precure5-command/";
        description = "Extended yes command to reproduce phrases in Yes! Precure 5";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -230955,7 +222530,6 @@ self: {
          text transformers unix unordered-containers wai wai-extra
          wai-logger warp yaml yesod-core yesod-form yesod-persistent
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -230980,7 +222554,6 @@ self: {
          transformers unix unordered-containers wai wai-extra wai-logger
          warp yaml yesod-core yesod-form yesod-persistent
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -230996,7 +222569,6 @@ self: {
        libraryHaskellDepends = [
          alerts base blaze-html blaze-markup safe text yesod-core
        ];
-       homepage = "https://github.com/alx741/yesod-alerts#readme";
        description = "Alert messages for the Yesod framework";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -231032,7 +222604,6 @@ self: {
          base blaze-html containers directory hjsmin mtl resourcet
          shakespeare template-haskell text transformers yesod yesod-core
        ];
-       homepage = "https://github.com/tolysz/yesod-angular-ui";
        description = "Angular Helpers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231056,7 +222627,6 @@ self: {
          shakespeare template-haskell text th-lift-instances yesod
          yesod-core yesod-test
        ];
-       homepage = "https://github.com/matthew-eads/yesod-articles";
        description = "Automatically generate article previews for a yesod site";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231087,7 +222657,6 @@ self: {
          transformers unliftio unliftio-core unordered-containers wai
          yesod-core yesod-form yesod-persistent
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -231110,7 +222679,6 @@ self: {
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-test
        ];
-       homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account";
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231136,7 +222704,6 @@ self: {
          base bytestring hspec monad-logger mtl persistent-sqlite resourcet
          text xml-conduit yesod yesod-auth yesod-test
        ];
-       homepage = "https://github.com/meteficha/yesod-auth-account-fork";
        description = "An account authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231171,7 +222738,6 @@ self: {
          base bcrypt bytestring text yesod-auth yesod-core yesod-form
          yesod-persistent
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "BCrypt salted and hashed passwords in a database as auth for yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231189,7 +222755,6 @@ self: {
          aeson base bcrypt bytestring persistent text yesod-auth yesod-core
          yesod-form yesod-persistent
        ];
-       homepage = "https://github.com/yusent/yesod-auth-bcryptdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231212,7 +222777,6 @@ self: {
          http-conduit http-types template-haskell text time transformers
          yesod-auth yesod-core
        ];
-       homepage = "https://github.com/prowdsponsor/yesod-auth-deskcom";
        description = "Desk.com remote authentication support for Yesod apps.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231231,7 +222795,6 @@ self: {
          aeson base bytestring conduit fb http-conduit resourcet shakespeare
          text time transformers unliftio wai yesod-auth yesod-core yesod-fb
        ];
-       homepage = "https://github.com/psibi/yesod-auth-fb";
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -231257,7 +222820,6 @@ self: {
          text unordered-containers wai-extra yesod yesod-auth yesod-core
          yesod-test
        ];
-       homepage = "https://github.com/paul-rouse/yesod-auth-hashdb";
        description = "Authentication plugin for Yesod";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -231294,7 +222856,6 @@ self: {
          authenticate-kerberos base bytestring shakespeare text transformers
          yesod-auth yesod-core yesod-form
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Kerberos Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231312,7 +222873,6 @@ self: {
          authenticate-ldap base bytestring hamlet LDAP text transformers
          yesod-auth yesod-core yesod-form
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "LDAP Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231347,7 +222907,6 @@ self: {
          yesod-core yesod-form
        ];
        testHaskellDepends = [ base ];
-       homepage = "http://github.com/mulderr/yesod-auth-ldap-native";
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231365,7 +222924,6 @@ self: {
          base blaze-markup http-types pwstore-fast text uuid yesod-auth
          yesod-core yesod-form
        ];
-       homepage = "https://github.com/danpalmer/yesod-auth-nopassword#readme";
        description = "A plugin for Yesod to provide email-only authentication";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231383,7 +222941,6 @@ self: {
          authenticate-oauth base bytestring text transformers unliftio
          yesod-auth yesod-core yesod-form
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "OAuth Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231406,7 +222963,6 @@ self: {
          yesod-auth yesod-core
        ];
        testHaskellDepends = [ base hspec uri-bytestring ];
-       homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231440,7 +222996,6 @@ self: {
          base hamlet sys-auth-smbclient text yesod-auth yesod-core
          yesod-form
        ];
-       homepage = "https://github.com/kkazuo/yesod-auth-smbclient.git";
        description = "Authentication plugin for Yesod using smbclient";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231460,7 +223015,6 @@ self: {
          http-conduit http-types template-haskell text time transformers wai
          yesod-auth yesod-core
        ];
-       homepage = "https://github.com/prowdsponsor/yesod-auth-zendesk";
        description = "Zendesk remote authentication support for Yesod apps";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231481,6 +223035,8 @@ self: {
        pname = "yesod-bin";
        version = "1.6.0.3";
        sha256 = "1p5f6bl4gynm47m1xg1x1xh9nz913i83iprh2xd207359idjknz4";
+       revision = "1";
+       editedCabalFile = "0dr9i8jisp5vd0pz6pckdiax1ynm9rhgjjr2xhxlrlfy24k14gg3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -231493,7 +223049,6 @@ self: {
          transformers-compat unix-compat unliftio unordered-containers wai
          wai-extra warp warp-tls yaml zlib
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231511,7 +223066,6 @@ self: {
          base blaze-html blaze-markup bootstrap-types shakespeare text
          transformers yesod-core yesod-elements
        ];
-       homepage = "https://github.com/andrewthad/haskell-bootstrap";
        description = "Bootstrap widgets for yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231528,7 +223082,6 @@ self: {
        libraryHaskellDepends = [
          base blaze-html blaze-markup colonnade text yesod-core
        ];
-       homepage = "https://github.com/andrewthad/colonnade#readme";
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231548,7 +223101,6 @@ self: {
          persistent template-haskell text time wai yesod yesod-auth
          yesod-form yesod-markdown
        ];
-       homepage = "http://github.com/pbrisbin/yesod-comments";
        description = "A generic comments interface for a Yesod application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231571,7 +223123,6 @@ self: {
        testHaskellDepends = [
          base blaze-html hspec hspec-expectations utf8-string
        ];
-       homepage = "https://github.com/alexkyllo/yesod-content-pdf#readme";
        description = "PDF Content Type for Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231591,7 +223142,6 @@ self: {
          base datetime hashable hashmap stm system-uuid template-haskell
          yesod
        ];
-       homepage = "https://github.com/softmechanics/yesod-continuations/";
        description = "Continuations for Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231635,7 +223185,6 @@ self: {
        benchmarkHaskellDepends = [
          base blaze-html bytestring criterion shakespeare text transformers
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231676,7 +223225,6 @@ self: {
        benchmarkHaskellDepends = [
          base blaze-html bytestring gauge shakespeare text transformers
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -231694,7 +223242,6 @@ self: {
          base classy-prelude containers MissingH monad-control persistent
          random safe stm uuid yesod-core yesod-form yesod-persistent
        ];
-       homepage = "https://github.com/league/yesod-crud";
        description = "Generic administrative CRUD operations as a Yesod subsite";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231714,7 +223261,6 @@ self: {
          transformers wai yesod-core yesod-form yesod-markdown
          yesod-persistent
        ];
-       homepage = "https://github.com/andrewthad/yesod-crud-persist";
        description = "Flexible CRUD subsite usable with Yesod and Persistent";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231763,7 +223309,6 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text transformers
        ];
-       homepage = "http://github.com/tlaitinen/yesod-datatables";
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231776,7 +223321,6 @@ self: {
        version = "1.2.0";
        sha256 = "15nsknnxnfbkpg4pswxcpgfb2y0hz0xxj56jknd93hcm7aay36pk";
        libraryHaskellDepends = [ base yesod-core ];
-       homepage = "http://www.yesodweb.com/";
        description = "Default config and main functions for your yesod application (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -231832,7 +223376,6 @@ self: {
          base blaze-builder conduit transformers wai wai-eventsource
          wai-extra yesod-core
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Server-sent events support for Yesod apps";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -231854,7 +223397,6 @@ self: {
          yesod-core yesod-static
        ];
        executableSystemDepends = [ sqlite ];
-       homepage = "http://www.yesodweb.com/";
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231877,7 +223419,6 @@ self: {
          optparse-applicative process pureMD5 stm system-filepath temporary
          text
        ];
-       homepage = "https://github.com/haskellbr/yesod-fast-devel#readme";
        description = "Fast live-reloading for yesod applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -231897,7 +223438,6 @@ self: {
          monad-loops process pureMD5 shakespeare template-haskell text
          transformers utf8-string yesod-core yesod-form yesod-static
        ];
-       homepage = "https://github.com/fpco/yesod-fay";
        description = "Utilities for using the Fay Haskell-to-JS compiler with Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231915,7 +223455,6 @@ self: {
          aeson base bytestring conduit crypto-api fb http-client-tls
          http-conduit text wai yesod-core
        ];
-       homepage = "https://github.com/psibi/yesod-fb";
        description = "Useful glue functions between the fb library and Yesod";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -231939,7 +223478,6 @@ self: {
          yesod-persistent
        ];
        testHaskellDepends = [ base hspec text time ];
-       homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -231964,7 +223502,6 @@ self: {
          yesod-persistent
        ];
        testHaskellDepends = [ base hspec text time ];
-       homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -231976,7 +223513,6 @@ self: {
        version = "0.1.1";
        sha256 = "17bdd0pmhpj85w7vc7vzzb3iggl3azr1jzpkmy9x9mxdl1birgmg";
        libraryHaskellDepends = [ base classy-prelude-yesod yesod-form ];
-       homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme";
        description = "renderBootstrap4";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -231990,7 +223526,6 @@ self: {
        libraryHaskellDepends = [
          base shakespeare text yesod-core yesod-form
        ];
-       homepage = "https://github.com/ncaq/yesod-form-bootstrap4#readme";
        description = "renderBootstrap4";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232024,7 +223559,6 @@ self: {
          base blaze-builder blaze-html shakespeare text xss-sanitize
          yesod-core yesod-form
        ];
-       homepage = "http://github.com/geraldus/yesod-form-richtext#readme";
        description = "Various rich-text WYSIWYG editors for Yesod forms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232042,7 +223576,6 @@ self: {
          base directory http-types process temporary text unliftio wai
          yesod-core
        ];
-       homepage = "https://github.com/snoyberg/yesod-gitrepo#readme";
        description = "Host content provided by a Git repo";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232059,7 +223592,6 @@ self: {
        libraryHaskellDepends = [
          aeson base gitrev template-haskell yesod-core
        ];
-       homepage = "https://github.com/DanBurton/yesod-gitrev";
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232077,7 +223609,6 @@ self: {
          base blaze-html bytestring directory HTTP old-locale pandoc pureMD5
          text time yesod yesod-form
        ];
-       homepage = "http://github.com/pbrisbin/yesod-goodies";
        description = "A collection of various small helpers useful in any yesod application";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232097,7 +223628,6 @@ self: {
          base http-api-data ip path-pieces persistent text yesod-core
          yesod-form
        ];
-       homepage = "https://github.com/andrewthad/yesod-ip#readme";
        description = "Code for using the ip package with yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232120,7 +223650,6 @@ self: {
          yesod-core yesod-persistent
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme";
        description = "Background jobs library for Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232133,7 +223662,6 @@ self: {
        version = "1.2.0";
        sha256 = "0d035k1ls5iq1c12yxknyc33qd22ayyhl69y62zmcw7arwx35sgw";
        libraryHaskellDepends = [ base yesod-core ];
-       homepage = "http://www.yesodweb.com/";
        description = "Generate content for Yesod using the aeson package. (deprecated)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232145,7 +223673,6 @@ self: {
        version = "0.3.0";
        sha256 = "0i1b4lgwv98pp7251fm3h4cdb1d868fqwm6175rk7zg699g2v61y";
        libraryHaskellDepends = [ base text yesod-core ];
-       homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links";
        description = "A typeclass which simplifies creating link widgets throughout your site";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232178,7 +223705,6 @@ self: {
          base containers http-conduit http-types lifted-base mangopay
          persistent-template text time yesod yesod-core
        ];
-       homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232198,7 +223724,6 @@ self: {
          shakespeare text xss-sanitize yesod-core yesod-form
        ];
        testHaskellDepends = [ base blaze-html hspec text ];
-       homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -232215,7 +223740,6 @@ self: {
          base bytestring diagrams-cairo diagrams-core diagrams-lib directory
          JuicyPixels vector yesod
        ];
-       homepage = "https://github.com/mgsloan/yesod-media-simple";
        description = "Simple display of media types, served by yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232233,7 +223757,6 @@ self: {
          base blaze-html blaze-markup bytestring containers shakespeare text
          time xml-conduit yesod-core
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Helper functions and data types for producing News feeds";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232264,7 +223787,6 @@ self: {
          base hspec monad-logger persistent persistent-sqlite resource-pool
          resourcet shakespeare utf8-string wai-test yesod yesod-test
        ];
-       homepage = "https://github.com/joelteon/yesod-pagination";
        description = "Pagination in Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232286,7 +223808,6 @@ self: {
        testHaskellDepends = [
          base data-default hspec wai-extra yesod-core yesod-test
        ];
-       homepage = "http://github.com/pbrisbin/yesod-paginator";
        description = "A pagination approach for yesod";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -232322,7 +223843,6 @@ self: {
          base blaze-builder conduit hspec persistent persistent-sqlite text
          wai-extra yesod-core
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232345,7 +223865,6 @@ self: {
          base blaze-builder conduit hspec persistent persistent-sqlite text
          wai-extra yesod-core
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232415,7 +223934,6 @@ self: {
          yesod-auth yesod-auth-hashdb yesod-core yesod-form yesod-persistent
          yesod-routes yesod-static yesod-test
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Meta package for Yesod (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232437,7 +223955,6 @@ self: {
        executableHaskellDepends = [
          aeson base shakespeare text transformers yesod yesod-form
        ];
-       homepage = "https://github.com/cutsea110/yesod-pnotify";
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232450,7 +223967,6 @@ self: {
        version = "0.1.0.2";
        sha256 = "0v3xvhk5nxc2y3c21y6h7w6lg5vm1s2vzf9f02qw8gj928vsidzg";
        libraryHaskellDepends = [ base fast-logger text yesod yesod-core ];
-       homepage = "https://github.com/snoyberg/yesod-pure";
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232471,7 +223987,6 @@ self: {
          mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio
          system-filepath template-haskell text time transformers yesod-core
        ];
-       homepage = "https://github.com/mpietrzak/yesod-purescript";
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232579,7 +224094,6 @@ self: {
          network network-info resourcet text wai yesod-auth yesod-core
          yesod-form
        ];
-       homepage = "https://github.com/prowdsponsor/yesod-recaptcha";
        description = "Dead simple support for reCAPTCHA on Yesod applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232596,7 +224110,6 @@ self: {
        libraryHaskellDepends = [
          base classy-prelude-yesod http-conduit yesod-auth
        ];
-       homepage = "https://github.com/ncaq/yesod-recaptcha2#readme";
        description = "yesod recaptcha2";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232618,7 +224131,6 @@ self: {
          base bytestring containers hspec HUnit path-pieces template-haskell
          text
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Efficient routing for Yesod. (deprecated)";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232636,7 +224148,6 @@ self: {
          attoparsec base classy-prelude containers system-fileio
          system-filepath text yesod-core
        ];
-       homepage = "https://github.com/frontrowed/yesod-routes-flow";
        description = "Generate Flow routes for Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232654,7 +224165,6 @@ self: {
          attoparsec base classy-prelude system-fileio text yesod-core
          yesod-routes
        ];
-       homepage = "https://github.com/docmunch/yesod-routes-typescript";
        description = "generate TypeScript routes for Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232672,7 +224182,6 @@ self: {
          base blaze-html directory hamlet pandoc persistent text
          xss-sanitize yesod-core yesod-form
        ];
-       homepage = "http://github.com/pSub/yesod-rst";
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232690,7 +224199,6 @@ self: {
          base bytestring conduit conduit-extra gd hS3 mtl network resourcet
          text yesod-core
        ];
-       homepage = "https://github.com/tvh/yesod-s3";
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232726,7 +224234,6 @@ self: {
          base binary bytestring containers cookie hedis mtl network
          pool-conduit random text time wai yesod-core
        ];
-       homepage = "https://github.com/ollieh/yesod-session-redis";
        description = "Redis-Powered Sessions for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232744,7 +224251,6 @@ self: {
          base conduit containers data-default text time xml-conduit
          xml-types yesod-core
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Generate XML sitemaps";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232779,7 +224285,6 @@ self: {
          text transformers unix-compat unordered-containers wai
          wai-app-static wai-extra yesod-core yesod-test
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232815,7 +224320,6 @@ self: {
          unix-compat unordered-containers wai wai-app-static wai-extra
          yesod-core yesod-test
        ];
-       homepage = "http://www.yesodweb.com/";
        description = "Static file serving subsite for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232841,7 +224345,6 @@ self: {
          base bytestring hamlet hspec HUnit shakespeare template-haskell
          text yesod-core yesod-static yesod-test
        ];
-       homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular";
        description = "Yesod generators for embedding AngularJs code into yesod-static at compile time";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232858,7 +224361,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring containers contravariant semigroups text yesod-core
        ];
-       homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232896,7 +224398,6 @@ self: {
          base bytestring containers hspec html-conduit http-types HUnit
          lifted-base text wai xml-conduit yesod-core yesod-form
        ];
-       homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232924,7 +224425,6 @@ self: {
          base bytestring containers hspec html-conduit http-types HUnit text
          unliftio wai wai-extra xml-conduit yesod-core yesod-form
        ];
-       homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -232942,7 +224442,6 @@ self: {
          aeson base bytestring conduit hspec http-types HUnit text
          transformers wai wai-test yesod-default
        ];
-       homepage = "https://github.com/bogiebro/yesod-test-json";
        description = "Utility functions for testing JSON web services written in Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -232977,7 +224476,6 @@ self: {
          base fast-logger monad-logger template-haskell unix wai wai-extra
          warp warp-tls yesod
        ];
-       homepage = "http://github.com/netom/yesod-tls";
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233023,7 +224521,6 @@ self: {
          base blaze-html hamlet monad-logger persistent persistent-sqlite
          resourcet text yesod yesod-form
        ];
-       homepage = "https://github.com/Tener/yesod-vend";
        description = "Simple CRUD classes for easy view creation for Yesod";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233041,7 +224538,6 @@ self: {
          base conduit mtl transformers unliftio wai wai-websockets
          websockets yesod-core
        ];
-       homepage = "https://github.com/yesodweb/yesod";
        description = "WebSockets support for Yesod";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -233073,7 +224569,6 @@ self: {
          base blaze-markup bytestring containers hedis keenser thyme yesod
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/jamesdabbs/yesod-worker#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233106,7 +224601,6 @@ self: {
          enclosed-exceptions lens lifted-base tagged tasty tasty-hunit text
          transformers transformers-base void
        ];
-       homepage = "https://github.com/alephcloud/hs-yet-another-logger";
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233119,7 +224613,6 @@ self: {
        version = "0.9.1";
        sha256 = "18gjzlpxn0hp723ybjgq1zdbpl35iqphs7b8r5x9ddbkm435sw93";
        libraryHaskellDepends = [ base containers mtl pretty uniplate ];
-       homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233143,7 +224636,6 @@ self: {
          yi-frontend-vty yi-keymap-emacs yi-keymap-vim yi-misc-modes
          yi-mode-haskell yi-mode-javascript yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233162,7 +224654,6 @@ self: {
          oo-prototypes split text time transformers-base yi yi-language
          yi-rope
        ];
-       homepage = "http://haskell.org/haskellwiki/Yi";
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233194,7 +224685,6 @@ self: {
          tasty-quickcheck text yi-rope
        ];
        benchmarkHaskellDepends = [ base criterion deepseq yi-rope ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor core library";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233211,7 +224701,6 @@ self: {
          base data-default dyre microlens-platform mtl text
          transformers-base yi-core yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Dynamic configuration support for Yi";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233223,7 +224712,6 @@ self: {
        version = "0.1.0.1";
        sha256 = "1kbds9s0r67bdvigjk0c58slbifnddp6ppv4jrgv6493pylp78qv";
        libraryHaskellDepends = [ base containers split yi-language ];
-       homepage = "https://github.com/Fuuzetsu/yi-emacs-colours";
        description = "Simple mapping from colour names used in emacs to Color";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233243,7 +224731,6 @@ self: {
          oo-prototypes pango pointedlist text transformers-base yi-core
          yi-language yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Pango frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233261,7 +224748,6 @@ self: {
          base containers data-default dlist microlens-platform pointedlist
          stm text vty yi-core yi-language yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Vty frontend for Yi editor";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233280,7 +224766,6 @@ self: {
          pointedlist text transformers-base vector yi-core yi-language
          yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Fuzzy open plugin for yi";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233292,7 +224777,6 @@ self: {
        version = "0.3";
        sha256 = "1lgdzrxq3g24wy658ydknb98isyksdknn2bfdzsfi68rnij6z6nz";
        doHaddock = false;
-       homepage = "http://haskell.org/haskellwiki/Yi";
        description = "The Haskell-Scriptable Editor, helper package";
        license = "GPL";
      }) {};
@@ -233309,7 +224793,6 @@ self: {
          base binary bytestring containers data-default microlens-platform
          text yi-core yi-language yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor incremental reader";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233325,7 +224808,6 @@ self: {
        libraryHaskellDepends = [
          base microlens-platform text yi-core yi-keymap-emacs yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Cua keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233343,7 +224825,6 @@ self: {
          base containers filepath Hclip microlens-platform mtl oo-prototypes
          text transformers-base yi-core yi-language yi-misc-modes yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Emacs keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233370,7 +224851,6 @@ self: {
          safe tasty tasty-hunit tasty-quickcheck text transformers-base
          unordered-containers yi-core yi-language yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Vim keymap for Yi editor";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233398,7 +224878,6 @@ self: {
          tasty-hspec tasty-quickcheck template-haskell transformers-base
          unordered-containers
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Collection of language-related Yi libraries";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233416,7 +224895,6 @@ self: {
          yi-core yi-language yi-rope
        ];
        libraryToolDepends = [ alex ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor miscellaneous modes";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233434,7 +224912,6 @@ self: {
          yi-core yi-language yi-rope
        ];
        libraryToolDepends = [ alex ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor haskell mode";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233453,7 +224930,6 @@ self: {
          mtl text yi-core yi-language yi-rope
        ];
        libraryToolDepends = [ alex ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Yi editor javascript mode";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233465,7 +224941,6 @@ self: {
        version = "0.1.1.2";
        sha256 = "1nghfyiy8jdz144nbw0c2cdy8n6xyjmk31g6z24jk8dij7iwb60l";
        libraryHaskellDepends = [ base yi ];
-       homepage = "https://github.com/Fuuzetsu/yi-monokai";
        description = "Monokai colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233506,7 +224981,6 @@ self: {
        testHaskellDepends = [
          base containers tasty-hunit tasty-th yi-rope
        ];
-       homepage = "https://github.com/yi-editor/yi#readme";
        description = "Snippet support for yi";
        license = stdenv.lib.licenses.gpl2;
      }) {};
@@ -233518,7 +224992,6 @@ self: {
        version = "0.1.1";
        sha256 = "17ifjm9vgrhv00bll5zj9siz08fng1626bff9q5sfbvzd7y6i9nc";
        libraryHaskellDepends = [ base yi ];
-       homepage = "https://github.com/NorfairKing/yi-solarized";
        description = "Solarized colour theme for the Yi text editor";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233531,7 +225004,6 @@ self: {
        version = "0.1";
        sha256 = "152ys2x416322c13nxmi25wpilq0ddd6hj36mr25jaacf1qszv6q";
        libraryHaskellDepends = [ base yi ];
-       homepage = "https://github.com/melrief/yi-spolsky";
        description = "Spolsky colour theme for the Yi text editor";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233544,7 +225016,6 @@ self: {
        version = "0.3";
        sha256 = "01jp8xcxq9a1s6fp4yivnvr5a48svjir70yl0dhhwil0l3m9v9c9";
        doHaddock = false;
-       homepage = "http://haskell.org/haskellwiki/Yi";
        description = "The Haskell-Scriptable Editor, helper package";
        license = "GPL";
      }) {};
@@ -233571,7 +225042,6 @@ self: {
        libraryHaskellDepends = [
          base bindings-yices containers transformers
        ];
-       homepage = "http://www.ugcs.caltech.edu/~keegan/haskell/yices-easy/";
        description = "Simple interface to the Yices SMT (SAT modulo theories) solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233589,7 +225059,6 @@ self: {
          base containers pretty strict-concurrency vector
        ];
        librarySystemDepends = [ gmp yices ];
-       homepage = "http://code.haskell.org/~dons/code/yices-painless";
        description = "An embedded language for programming the Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233610,7 +225079,6 @@ self: {
          base directory ftphs haskeline mtl process unix
        ];
        executableHaskellDepends = [ hsConfigure ];
-       homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml";
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233625,7 +225093,6 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base directory ftphs mtl process unix ];
-       homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml";
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233649,7 +225116,6 @@ self: {
        version = "0.9.18";
        sha256 = "13zbq37p2prbyxq1wply7qqpc2wwsic78wzcgbc430nfrrpiq4lv";
        libraryHaskellDepends = [ base ];
-       homepage = "http://homepage3.nifty.com/salamander/second/projects/yjtools/index.xhtml";
        description = "some tools for Monad, List, Tuple and so on";
        license = "LGPL";
      }) {};
@@ -233666,7 +225132,6 @@ self: {
        testHaskellDepends = [
          base containers parsec QuickCheck quickcheck-instances
        ];
-       homepage = "https://github.com/ajg/yocto";
        description = "A Minimal JSON Parser & Printer for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -233680,7 +225145,6 @@ self: {
        revision = "1";
        editedCabalFile = "12qzdi2dx22kvfmvsj8yy82fgl29m15ys9myra3jrq4fqr5n0br9";
        libraryHaskellDepends = [ base free mtl ];
-       homepage = "https://github.com/mniip/yoctoparsec";
        description = "A truly tiny monadic parsing library";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -233726,7 +225190,6 @@ self: {
        version = "0.2";
        sha256 = "1rpkxlfvk84zl965ik5bpplzcskd96wsnicp66ixnfs9bkqfj7qb";
        libraryHaskellDepends = [ base containers haskell98 ];
-       homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233768,7 +225231,6 @@ self: {
        executableHaskellDepends = [
          base containers ecma262 exceptions hxt opendatatable
        ];
-       homepage = "https://github.com/fabianbergmark/YQL";
        description = "A YQL engine to execute Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233792,7 +225254,6 @@ self: {
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
          split text time unordered-containers yaml
        ];
-       homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
      }) {};
@@ -233807,7 +225268,6 @@ self: {
        sha256 = "165m0ppp60gh5c6wlyjbvqlsh5gbpr0xz173ivkprjalxivr4r6j";
        libraryHaskellDepends = [ base cryptonite memory yu-utils ];
        testHaskellDepends = [ base MonadRandom random yu-utils ];
-       homepage = "https://github.com/Qinka/Yu";
        description = "Auth module for Yu";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -233820,7 +225280,6 @@ self: {
        sha256 = "17wdvwa6hs38asvsysv2g0xzjc654479c0229hggpyq17flfzwjs";
        libraryHaskellDepends = [ base yu-auth yu-utils ];
        testHaskellDepends = [ base blaze-markup hspec yu-utils ];
-       homepage = "https://github.com/Qinka/Yu";
        description = "The core of Yu";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233837,7 +225296,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs yaml yu-auth yu-core yu-utils
        ];
-       homepage = "https://github.com/Qinka/Yu";
        description = "The launcher for Yu";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233856,7 +225314,6 @@ self: {
        executableHaskellDepends = [
          base cmdargs directory echo filepath process yu-auth yu-utils
        ];
-       homepage = "https://github.com/Qinka/Yu";
        description = "Tool for Yu";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -233915,7 +225372,6 @@ self: {
          base bytestring containers curl deepseq directory filepath
          haskell98 mtl network parsec
        ];
-       homepage = "http://github.com/nfjinjing/yuuko";
        description = "A transcendental HTML parser gently wrapping the HXT library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -233972,7 +225428,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        librarySystemDepends = [ gomp z3 ];
        testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/IagoAbal/haskell-z3";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
      }) {gomp = null; inherit (pkgs) z3;};
@@ -233998,7 +225453,6 @@ self: {
        sha256 = "0azskw8176n0d61j6l4ag84nn57wrgmdzj0xk9r56zg3hxps4z9r";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base tasty tasty-hspec ];
-       homepage = "https://github.com/tel/hs-zabt#readme";
        description = "Simple-minded abstract binding trees";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234011,7 +225465,6 @@ self: {
        version = "0.2.0.0";
        sha256 = "0nxz74svi7as52vr84jr58zmcykll8g5kcq795cxs4zf720ahqsz";
        libraryHaskellDepends = [ base ];
-       homepage = "http://github.com/mniip/zalgo";
        description = "Z-algorithm implemented on haskell's built-in cons-cell-based lists";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234030,7 +225483,6 @@ self: {
          base cmdargs containers directory filepath HSH MissingH old-locale
          parsec time
        ];
-       homepage = "https://github.com/briansniffen/zampolit";
        description = "A tool for checking how much work is done on group projects";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234043,7 +225495,6 @@ self: {
        version = "0.0.7";
        sha256 = "1zl2kcd0hr021xl6pjvvxwxvmpb02cq04ck39qkwil56vannnksw";
        libraryHaskellDepends = [ base papillon ];
-       homepage = "https://skami.iocikun.jp/haskell/packages/zasni-gerna";
        description = "lojban parser (zasni gerna)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234058,7 +225509,6 @@ self: {
        libraryHaskellDepends = [
          array base containers mersenne-random-pure64
        ];
-       homepage = "https://patch-tag.com/r/salazar/zcache/";
        description = "Zobrist keys for game state tracking";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234091,7 +225541,6 @@ self: {
          http-types monad-logger mtl pem template-haskell text time tls
          transformers unordered-containers x509 x509-store x509-validation
        ];
-       homepage = "https://github.com/VictorDenisov/zendesk-api";
        description = "Zendesk API for Haskell programming language";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234117,6 +225566,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "zephyr" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base-compat, boxes
+     , bytestring, containers, directory, filepath, formatting, Glob
+     , hspec, hspec-core, HUnit, language-javascript, mtl
+     , optparse-applicative, process, purescript, safe, text
+     , transformers, transformers-base, transformers-compat, utf8-string
+     }:
+     mkDerivation {
+       pname = "zephyr";
+       version = "0.1.1.0";
+       sha256 = "0wh6yarc890j442s5kmqpsl03y0f8n4kq43sx1k8y63avhq1qi2m";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base-compat boxes bytestring containers
+         directory filepath formatting Glob language-javascript mtl
+         optparse-applicative purescript safe text transformers
+         transformers-base transformers-compat utf8-string
+       ];
+       executableHaskellDepends = [
+         aeson ansi-terminal base base-compat bytestring containers
+         directory filepath formatting Glob language-javascript mtl
+         optparse-applicative purescript text transformers transformers-base
+         transformers-compat utf8-string
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal base base-compat bytestring containers
+         directory filepath hspec hspec-core HUnit language-javascript mtl
+         optparse-applicative process purescript text transformers
+         transformers-base transformers-compat utf8-string
+       ];
+       description = "Zephyr tree shaking for PureScript Language";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "zero" = callPackage
     ({ mkDerivation, base, semigroups }:
      mkDerivation {
@@ -234124,7 +225608,6 @@ self: {
        version = "0.1.4";
        sha256 = "1mfmc7na5q2lrlz168hwzdjpmaqdqqpdlsfyk44v9f3kjqnwdk9q";
        libraryHaskellDepends = [ base semigroups ];
-       homepage = "https://github.com/phaazon/zero";
        description = "Semigroups with absorption";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234164,7 +225647,6 @@ self: {
          base bytestring containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234182,7 +225664,6 @@ self: {
          base bytestring conduit lifted-base monad-control mtl resourcet
          transformers zeromq3-haskell
        ];
-       homepage = "https://github.com/NicolasT/zeromq3-conduit";
        description = "Conduit bindings for zeromq3-haskell";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234206,7 +225687,6 @@ self: {
          ansi-terminal async base bytestring checkers containers
          MonadCatchIO-transformers QuickCheck transformers
        ];
-       homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234234,7 +225714,6 @@ self: {
          async base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/hverr/zeromq4-clone-pattern#readme";
        description = "Haskell implementation of the ZeroMQ clone pattern";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234253,7 +225732,6 @@ self: {
          semigroups transformers transformers-base zeromq4-haskell
        ];
        testHaskellDepends = [ base ];
-       homepage = "https://github.com/itkovian/zeromq4-conduit#readme";
        description = "Conduit wrapper around zeromq4-haskell";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234276,7 +225754,6 @@ self: {
        testHaskellDepends = [
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://gitlab.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) zeromq;};
@@ -234300,7 +225777,6 @@ self: {
          async base binary bytestring QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       homepage = "https://github.com/hverr/zeromq4-patterns#readme";
        description = "Haskell implementation of several ZeroMQ patterns";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234348,7 +225824,6 @@ self: {
          ansi-terminal base colour directory genvalidity genvalidity-hspec
          genvalidity-path hspec path path-io QuickCheck stm
        ];
-       homepage = "http://cs-syd.eu";
        description = "zifter";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234365,7 +225840,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath path path-io process safe zifter
        ];
-       homepage = "http://cs-syd.eu";
        description = "zifter-cabal";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234378,7 +225852,6 @@ self: {
        version = "0.0.0.1";
        sha256 = "1fsrair0c0a6j2jmghcxvbs3dr6j7gzh3yfimflva64nvwfx8vb8";
        libraryHaskellDepends = [ base path process zifter ];
-       homepage = "http://cs-syd.eu";
        description = "zifter-git";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234395,7 +225868,6 @@ self: {
        libraryHaskellDepends = [
          base filepath path path-io process safe zifter
        ];
-       homepage = "http://cs-syd.eu";
        description = "zifter-google-java-format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234412,7 +225884,6 @@ self: {
        libraryHaskellDepends = [
          base directory filepath path path-io process safe zifter
        ];
-       homepage = "http://cs-syd.eu";
        description = "zifter-hindent";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234428,7 +225899,6 @@ self: {
        libraryHaskellDepends = [
          base filepath hlint path path-io safe zifter
        ];
-       homepage = "http://cs-syd.eu";
        description = "zifter-hlint";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234449,7 +225919,6 @@ self: {
          base Cabal directory filepath hspec path path-io process safe stm
          zifter
        ];
-       homepage = "http://cs-syd.eu";
        description = "zifter-stack";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234467,7 +225936,6 @@ self: {
          base bytestring cereal MissingH mtl transformers
        ];
        testHaskellDepends = [ base bytestring mtl QuickCheck random ];
-       homepage = "https://github.com/djoyner/zigbee-znet25";
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234488,7 +225956,6 @@ self: {
          array base base-compat binary binary-conduit bytestring conduit
          conduit-extra hspec lzma
        ];
-       homepage = "https://github.com/robbinch/zim-parser#readme";
        description = "Read and parse ZIM files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234517,11 +225984,36 @@ self: {
          base bytestring conduit containers directory dlist exceptions
          filepath hspec QuickCheck temporary text time transformers
        ];
-       homepage = "https://github.com/mrkkrp/zip";
        description = "Operations on zip archives";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zip_1_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive
+     , cereal, conduit, conduit-extra, containers, digest, directory
+     , dlist, exceptions, filepath, hspec, monad-control, mtl
+     , QuickCheck, resourcet, temporary, text, time, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "zip";
+       version = "1.1.0";
+       sha256 = "1p6r4rmagq2x44wizpxk3844vh5nv2k51wl3h6vx5xnf5im2v535";
+       libraryHaskellDepends = [
+         base bytestring bzlib-conduit case-insensitive cereal conduit
+         conduit-extra containers digest directory dlist exceptions filepath
+         monad-control mtl resourcet text time transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base bytestring conduit containers directory dlist exceptions
+         filepath hspec QuickCheck temporary text time transformers
+       ];
+       description = "Operations on zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zip-archive" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty
@@ -234543,7 +226035,6 @@ self: {
          base bytestring directory filepath HUnit old-time process temporary
          time unix
        ];
-       homepage = "http://github.com/jgm/zip-archive";
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) unzip;};
@@ -234573,7 +226064,6 @@ self: {
          base bytestring criterion directory filepath LibZip random
          temporary zip-archive
        ];
-       homepage = "https://github.com/tymmym/zip-conduit";
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234611,7 +226101,6 @@ self: {
        sha256 = "17msh3gwylmsiabyz5x05ir2xh8h904kbp5isnvbf0z4kzfv33cr";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base directory mtl process ];
-       homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234628,7 +226117,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring mersenne-random-pure64 mtl safe
        ];
-       homepage = "https://github.com/srijs/haskell-zipkin";
        description = "Zipkin-style request tracing monad";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234641,7 +226129,6 @@ self: {
        version = "0.4.2";
        sha256 = "1r8092amq5w9gl5szycl1r7wx87xnmkcapdzcwfa4c3pvxrhjy44";
        libraryHaskellDepends = [ base multirec ];
-       homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/Multirec";
        description = "Generic zipper for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234662,7 +226149,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        benchmarkHaskellDepends = [ base criterion lens ];
-       homepage = "http://github.com/ekmett/zippers/";
        description = "Traversal based zippers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234674,7 +226160,6 @@ self: {
        version = "0.3";
        sha256 = "1ihdird5yryfb2ki9bwwchj8bxjcmmgjkp3hl605zzhi2lz3awx2";
        libraryHaskellDepends = [ base mtl yall ];
-       homepage = "http://brandon.si/code/zippo/";
        description = "A simple lens-based, generic, heterogenous, type-checked zipper library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234696,7 +226181,6 @@ self: {
          base base-compat hspec http-client http-client-tls http-types
          iso3166-country-codes servant-client
        ];
-       homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
        description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234717,7 +226201,6 @@ self: {
        testHaskellDepends = [
          aeson base base-compat here hspec iso3166-country-codes text tz
        ];
-       homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme";
        description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234750,7 +226233,6 @@ self: {
        editedCabalFile = "0fq49694gqkab8m0vq4i879blswczwd66n7xh4r4gwiahf0ryvqc";
        libraryHaskellDepends = [ base bytestring zlib ];
        testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
-       homepage = "http://github.com/snapframework/zlib-bindings";
        description = "Low-level bindings to the zlib package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234763,7 +226245,6 @@ self: {
        sha256 = "1b22mca8bbg7f84h8y0qsb5ckzg2dw1b26y27x7b7xdxqbwpz93a";
        libraryHaskellDepends = [ base conduit ];
        doHaddock = false;
-       homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming compression/decompression via conduits. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234781,7 +226262,6 @@ self: {
        libraryHaskellDepends = [
          base bytestring enumerator transformers zlib-bindings
        ];
-       homepage = "http://github.com/maltem/zlib-enum";
        description = "Enumerator interface for zlib compression";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234794,7 +226274,6 @@ self: {
        version = "0.1.2.1";
        sha256 = "1sv6yx7p06zk653d3rmcj0lh2rzwzfi25v9sz9n8kq4r712n79g5";
        libraryHaskellDepends = [ base bytestring profunctors zlib ];
-       homepage = "http://lens.github.io/";
        description = "Lenses for zlib";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234817,7 +226296,6 @@ self: {
          base bytestring containers doctest filemanip flat model pretty
          tasty tasty-hunit tasty-quickcheck text timeit
        ];
-       homepage = "http://github.com/tittoassini/zm";
        description = "Language independent, reproducible, absolute types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234833,7 +226311,6 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring zeromq3-haskell ];
        executableHaskellDepends = [ base bytestring ];
-       homepage = "https://github.com/lucasdicioccio/zmcat";
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234846,7 +226323,6 @@ self: {
        version = "0.8.2";
        sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh";
        libraryHaskellDepends = [ base binary bytestring containers ];
-       homepage = "https://github.com/stephentetley/zmidi-core";
        description = "Read and write MIDI files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -234864,7 +226340,6 @@ self: {
          aeson base binary containers data-ordlist deepseq deepseq-generics
          directory filepath mtl parallel-io text zmidi-core
        ];
-       homepage = "https://bitbucket.org/bash/zmidi-score";
        description = "Representing MIDI a simple score";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234914,7 +226389,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath ghc hint mtl
        ];
-       homepage = "http://github.com/iand675/Zoom";
        description = "A rake/thor-like task runner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -235053,7 +226527,6 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath mtl ];
-       homepage = "https://github.com/MasseR/zsh-battery";
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -235075,7 +226548,6 @@ self: {
        benchmarkHaskellDepends = [
          base bytestring criterion ghc-prim zlib
        ];
-       homepage = "https://github.com/facebookexperimental/hs-zstd";
        description = "Haskell bindings to the Zstandard compression algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -235133,7 +226605,6 @@ self: {
          tasty-discover tasty-hunit template-haskell text text-show
          throwable-exceptions transformers
        ];
-       homepage = "https://github.com/aiya000/hs-zuramaru";
        description = "A lisp processor, An inline-lisp, in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;

From 9ef8d70d230ec94140b1e05617c6ebf473a8ee06 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 23 May 2018 17:02:16 +0200
Subject: [PATCH 2740/3370] haskell-graphviz: override dependency versions to
 fix the build

Closes https://github.com/ivan-m/graphviz/issues/34.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 866079f2e2d3..1460cad26e25 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -658,6 +658,7 @@ self: super: {
   # Need newer versions of their dependencies than the ones we have in LTS-11.x.
   cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
   dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
+  graphviz = (addBuildTool super.graphviz pkgs.graphviz).overrideScope (self: super: { wl-pprint-text = self.wl-pprint-text_1_2_0_0; base-compat = self.base-compat_0_10_1; });
   status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
 
   # https://github.com/bos/configurator/issues/22
@@ -893,7 +894,6 @@ self: super: {
   attoparsec = dontCheck super.attoparsec;      # 1 out of 67 tests fails
   int-cast = doJailbreak super.int-cast;
   nix-derivation = doJailbreak super.nix-derivation;
-  graphviz = doJailbreak super.graphviz;
 
   # Needs QuickCheck <2.10, HUnit <1.6 and base <4.10
   pointfree = doJailbreak super.pointfree;

From 852e9dc448fcaab4a6bf62e22cfc49cf1be8c00d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 May 2018 10:48:03 +0200
Subject: [PATCH 2741/3370] haskell-brick: update override for ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 0adaa5f274c3..d615dddbdcc5 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -413,7 +413,7 @@ self: super: {
 
   # Older versions don't compile.
   base-compat = self.base-compat_0_10_1;
-  brick = self.brick_0_37;
+  brick = self.brick_0_37_1;
   dhall = self.dhall_1_13_0;
   dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;

From 5b73d202abb58aa4ea199a4c30139fe3ef1719ec Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 May 2018 16:19:58 +0200
Subject: [PATCH 2742/3370] haskell-jailbreak-cabal: build with Cabal 2.2.x in
 ghc-8.2.x package set

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

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 d1bb60e83958..ce24d9a27f48 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
@@ -41,8 +41,8 @@ self: super: {
     prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal";
   });
 
-  # jailbreak-cabal doesn't seem to work right with the native Cabal version.
-  jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
+  # Build with the latest Cabal version, which works best albeit not perfectly.
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; };
 
   # https://github.com/bmillwood/applicative-quoters/issues/6
   applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {

From b8254815785b367eb6976cc56855ae61f1895ea4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 May 2018 16:34:03 +0200
Subject: [PATCH 2743/3370] haskell-jailbreak-cabal: build with native Cabal
 version in ghc-8.4.x package set

---
 .../haskell-modules/configuration-ghc-8.4.x.nix           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d615dddbdcc5..c4ba4b9cba73 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -290,14 +290,6 @@ self: super: {
     jailbreak       = true;
   });
 
-  jailbreak-cabal = super.jailbreak-cabal.override {
-    ##     • No instance for (Semigroup CDialect)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid CDialect’
-    ## Undo the override in `configuration-common.nix`: GHC 8.4 bumps Cabal to 2.1:
-    Cabal = self.Cabal;
-  };
-
   kan-extensions = overrideCabal super.kan-extensions (drv: {
     ## Setup: Encountered missing dependencies:
     ## free ==4.*

From e168ae6a9d8622da40f7c463097c2032edfa3f1a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 28 May 2018 16:32:05 +0200
Subject: [PATCH 2744/3370] ghc: build version >8.4 with hscolour to enable
 source links

Fixes https://github.com/NixOS/nixpkgs/issues/41179.
---
 pkgs/development/compilers/ghc/8.4.2.nix | 4 ++--
 pkgs/development/compilers/ghc/head.nix  | 4 ++--
 pkgs/top-level/haskell-packages.nix      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghc/8.4.2.nix b/pkgs/development/compilers/ghc/8.4.2.nix
index a2c1a751bc35..9a57161d3a71 100644
--- a/pkgs/development/compilers/ghc/8.4.2.nix
+++ b/pkgs/development/compilers/ghc/8.4.2.nix
@@ -2,7 +2,7 @@
 , buildPlatform, hostPlatform, targetPlatform
 
 # build-tools
-, bootPkgs, alex, happy
+, bootPkgs, alex, happy, hscolour
 , autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
 
 , libffi, libiconv ? null, ncurses
@@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3
-    ghc alex happy
+    ghc alex happy hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 0d9412761b33..4bc8fb671a2d 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -2,7 +2,7 @@
 , buildPlatform, hostPlatform, targetPlatform
 
 # build-tools
-, bootPkgs, alex, happy
+, bootPkgs, alex, happy, hscolour
 , autoconf, automake, coreutils, fetchgit, perl, python3, m4
 
 , libffi, libiconv ? null, ncurses
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     perl autoconf automake m4 python3
-    ghc alex happy
+    ghc alex happy hscolour
   ];
 
   # For building runtime libs
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index fab88ab180b5..e95b5046355b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -69,13 +69,13 @@ in rec {
     };
     ghc842 = callPackage ../development/compilers/ghc/8.4.2.nix rec {
       bootPkgs = packages.ghc821Binary;
-      inherit (bootPkgs) alex happy;
+      inherit (bootPkgs) alex happy hscolour;
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
       bootPkgs = packages.ghc821Binary;
-      inherit (bootPkgs) alex happy;
+      inherit (bootPkgs) alex happy hscolour;
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };

From 31706eeb93deaf4ea112276362802892c2b820ab Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 May 2018 10:58:49 +0200
Subject: [PATCH 2745/3370] haskell.compiler.ghc7103: disable format hardening

---
 pkgs/development/compilers/ghc/7.10.3.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 6b1c909cf484..2565afab334b 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -161,6 +161,8 @@ stdenv.mkDerivation rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
+  hardeningDisable = [ "format" ];
+
   postInstall = ''
     # Install the bash completion file.
     install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc

From 57fed4f5b506dfe8201ef7d964248020f547591d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 May 2018 10:59:15 +0200
Subject: [PATCH 2746/3370] haskell.compiler.ghcHEAD: disable format hardening

---
 pkgs/development/compilers/ghc/head.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 4bc8fb671a2d..c9effb90ac33 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -168,6 +168,8 @@ stdenv.mkDerivation rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
 
+  hardeningDisable = [ "format" ];
+
   checkTarget = "test";
 
   postInstall = ''

From 85c5e8d65165fe414a6904b84c4c233f5f46bdbc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 May 2018 11:39:19 +0200
Subject: [PATCH 2747/3370] haskell-parsec: drop obsolete jailbreak

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1460cad26e25..0638b7cc98f3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -784,9 +784,6 @@ self: super: {
   # Still needed as HUnit < 1.5
   lifted-base = doJailbreak super.lifted-base;
 
-  # https://github.com/aslatter/parsec/issues/68
-  parsec = doJailbreak super.parsec;
-
   # Don't depend on chell-quickcheck, which doesn't compile due to restricting
   # QuickCheck to versions ">=2.3 && <2.9".
   system-filepath = dontCheck super.system-filepath;

From 2495f07222284e8619cab2402d3ce946d17ae211 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 30 May 2018 00:07:19 +0200
Subject: [PATCH 2748/3370] haskell-cryptohash-sha256: avoid jailbreak, which
 breaks the Cabal file

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0638b7cc98f3..08f68ea31f4a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -896,7 +896,7 @@ self: super: {
   pointfree = doJailbreak super.pointfree;
 
   # Needs tasty-quickcheck ==0.8.*, which we don't have.
-  cryptohash-sha256 = doJailbreak super.cryptohash-sha256;
+  cryptohash-sha256 = dontCheck super.cryptohash-sha256;
   cryptohash-sha1 = doJailbreak super.cryptohash-sha1;
   cryptohash-md5 = doJailbreak super.cryptohash-md5;
   text-short = doJailbreak super.text-short;

From 4f696f391dfeb84aa95ef085565e486b62a13988 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 30 May 2018 00:19:10 +0200
Subject: [PATCH 2749/3370] haskell-fgl: avoid jailbreak to fix the build

A jailbreak-cabal binary compiles against Cabal 2.2.x will break fgl's Cabal
file. Therefore, we just disable the test suite that causes these version
issues.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 08f68ea31f4a..a63462028795 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -801,7 +801,7 @@ self: super: {
 
   # https://github.com/haskell/fgl/issues/60
   # Needed for QuickCheck < 2.10
-  fgl = doJailbreak super.fgl;
+  fgl = dontCheck super.fgl;
   fgl-arbitrary = doJailbreak super.fgl-arbitrary;
 
   # The tests spuriously fail

From deeeb5002c1ca27ca685e191f659e11f5ff01f4f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 30 May 2018 00:37:47 +0200
Subject: [PATCH 2750/3370] ghc: add version 8.4.3

---
 pkgs/development/compilers/ghc/8.4.3.nix | 210 +++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix      |  11 ++
 2 files changed, 221 insertions(+)
 create mode 100644 pkgs/development/compilers/ghc/8.4.3.nix

diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix
new file mode 100644
index 000000000000..0fecb1d29622
--- /dev/null
+++ b/pkgs/development/compilers/ghc/8.4.3.nix
@@ -0,0 +1,210 @@
+{ stdenv, targetPackages
+, buildPlatform, hostPlatform, targetPlatform
+
+# build-tools
+, bootPkgs, alex, happy, hscolour
+, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4
+
+, libffi, libiconv ? null, ncurses
+
+, useLLVM ? !targetPlatform.isx86
+, # LLVM is conceptually a run-time-only depedendency, but for
+  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
+  # build-time dependency too.
+  buildLlvmPackages, llvmPackages
+
+, # If enabled, GHC will be built with the GPL-free but slower integer-simple
+  # library instead of the faster but GPLed integer-gmp library.
+  enableIntegerSimple ? false, gmp ? null
+
+, # If enabled, use -fPIC when compiling static libs.
+  enableRelocatedStaticLibs ? targetPlatform != hostPlatform
+
+, # Whether to build dynamic libs for the standard library (on the target
+  # platform). Static libs are always built.
+  enableShared ? !targetPlatform.isWindows && !targetPlatform.useAndroidPrebuilt
+
+, # Whetherto build terminfo.
+  enableTerminfo ? !targetPlatform.isWindows
+
+, # What flavour to build. An empty string indicates no
+  # specific flavour and falls back to ghc default values.
+  ghcFlavour ? stdenv.lib.optionalString (targetPlatform != hostPlatform) "perf-cross"
+}:
+
+assert !enableIntegerSimple -> gmp != null;
+
+let
+  inherit (bootPkgs) ghc;
+
+  # TODO(@Ericson2314) Make unconditional
+  targetPrefix = stdenv.lib.optionalString
+    (targetPlatform != hostPlatform)
+    "${targetPlatform.config}-";
+
+  buildMK = ''
+    BuildFlavour = ${ghcFlavour}
+    ifneq \"\$(BuildFlavour)\" \"\"
+    include mk/flavours/\$(BuildFlavour).mk
+    endif
+    DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
+  '' + stdenv.lib.optionalString enableIntegerSimple ''
+    INTEGER_LIBRARY = integer-simple
+  '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) ''
+    Stage1Only = YES
+    HADDOCK_DOCS = NO
+    BUILD_SPHINX_HTML = NO
+    BUILD_SPHINX_PDF = NO
+  '' + stdenv.lib.optionalString enableRelocatedStaticLibs ''
+    GhcLibHcOpts += -fPIC
+    GhcRtsHcOpts += -fPIC
+  '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
+    EXTRA_CC_OPTS += -std=gnu99
+  '';
+
+  # Splicer will pull out correct variations
+  libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
+    ++ stdenv.lib.optional (!enableIntegerSimple) gmp
+    ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
+
+  toolsForTarget =
+    if hostPlatform == buildPlatform then
+      [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm
+    else assert targetPlatform == hostPlatform; # build != host == target
+      [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm;
+
+  targetCC = builtins.head toolsForTarget;
+
+in
+stdenv.mkDerivation rec {
+  version = "8.4.3";
+  name = "${targetPrefix}ghc-${version}";
+
+  src = fetchurl {
+    url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz";
+    sha256 = "1mk046vb561j75saz05rghhbkps46ym5aci4264dwc2qk3dayixf";
+  };
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "doc" ];
+
+  patches = [(fetchpatch {
+    url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf";
+    sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3";
+    extraPrefix = "utils/hsc2hs/";
+    stripLen = 1;
+  })]
+    ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch;
+
+  postPatch = "patchShebangs .";
+
+  # GHC is a bit confused on its cross terminology.
+  preConfigure = ''
+    for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
+      export "''${env#TARGET_}=''${!env}"
+    done
+    # GHC is a bit confused on its cross terminology, as these would normally be
+    # the *host* tools.
+    export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
+    export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
+    # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
+    export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}"
+    export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
+    export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
+    export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
+    export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
+    export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
+    export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
+
+    echo -n "${buildMK}" > mk/build.mk
+    sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    export NIX_LDFLAGS+=" -no_dtrace_dof"
+  '';
+
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ]
+    ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  # `--with` flags for libraries needed for RTS linker
+  configureFlags = [
+    "--datadir=$doc/share/doc/ghc"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && ! enableIntegerSimple) [
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+  ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
+    "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
+  ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [
+    "--enable-bootstrap-with-devel-snapshot"
+  ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [
+    "CFLAGS=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
+    "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
+  ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
+    # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
+    "--disable-large-address-space"
+  ];
+
+  # Make sure we never relax`$PATH` and hooks support for compatability.
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    perl autoconf automake m4 python3
+    ghc alex happy hscolour
+  ];
+
+  # For building runtime libs
+  depsBuildTarget = toolsForTarget;
+
+  buildInputs = libDeps hostPlatform;
+
+  propagatedBuildInputs = [ targetPackages.stdenv.cc ]
+    ++ stdenv.lib.optional useLLVM llvmPackages.llvm;
+
+  depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform);
+  depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform);
+
+  # required, because otherwise all symbols from HSffi.o are stripped, and
+  # that in turn causes GHCi to abort
+  stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
+
+  checkTarget = "test";
+
+  hardeningDisable = [ "format" ];
+
+  postInstall = ''
+    for bin in "$out"/lib/${name}/bin/*; do
+      isELF "$bin" || continue
+      paxmark m "$bin"
+    done
+
+    # Install the bash completion file.
+    install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
+
+    # Patch scripts to include "readelf" and "cat" in $PATH.
+    for i in "$out/bin/"*; do
+      test ! -h $i || continue
+      egrep --quiet '^#!' <(head -n 1 $i) || continue
+      sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i
+    done
+  '';
+
+  passthru = {
+    inherit bootPkgs targetPrefix;
+
+    inherit llvmPackages;
+
+    # Our Cabal compiler name
+    haskellCompilerName = "ghc-8.4.3";
+  };
+
+  meta = {
+    homepage = http://haskell.org/ghc;
+    description = "The Glasgow Haskell Compiler";
+    maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ];
+    inherit (ghc.meta) license platforms;
+  };
+
+}
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e95b5046355b..7ec9da39a9c5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -73,6 +73,12 @@ in rec {
       buildLlvmPackages = buildPackages.llvmPackages_5;
       llvmPackages = pkgs.llvmPackages_5;
     };
+    ghc843 = callPackage ../development/compilers/ghc/8.4.3.nix rec {
+      bootPkgs = packages.ghc821Binary;
+      inherit (bootPkgs) alex happy hscolour;
+      buildLlvmPackages = buildPackages.llvmPackages_5;
+      llvmPackages = pkgs.llvmPackages_5;
+    };
     ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
       bootPkgs = packages.ghc821Binary;
       inherit (bootPkgs) alex happy hscolour;
@@ -151,6 +157,11 @@ in rec {
       ghc = bh.compiler.ghc842;
       compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
     };
+    ghc843 = callPackage ../development/haskell-modules {
+      buildHaskellPackages = bh.packages.ghc843;
+      ghc = bh.compiler.ghc843;
+      compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { };
+    };
     ghcHEAD = callPackage ../development/haskell-modules {
       buildHaskellPackages = bh.packages.ghcHEAD;
       ghc = bh.compiler.ghcHEAD;

From 024871718d767e3682c2a1c8fdaee66db4c83c48 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 02:00:06 +0000
Subject: [PATCH 2751/3370] libffi: fix check

(cherry picked from commit 13b80d7805ef11db1a3d1511171cee378f0a692f)
---
 pkgs/development/libraries/libffi/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 50cf8526c362..1c7c0715e75b 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -49,6 +49,11 @@ stdenv.mkDerivation rec {
     "--enable-pax_emutramp"
   ];
 
+  preCheck = ''
+    # The tests use -O0 which is not compatible with -D_FORTIFY_SOURCE.
+    NIX_HARDENING_ENABLE=''${NIX_HARDENING_ENABLE/fortify/}
+  '';
+
   inherit doCheck;
 
   dontStrip = hostPlatform != buildPlatform; # Don't run the native `strip' when cross-compiling.

From 8edccd928e883e2b3ef5cac49d4398c561c36701 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 02:26:05 +0000
Subject: [PATCH 2752/3370] pythonPackages.datadog: disable check

The tests are nondeterministic.
---
 pkgs/development/python-modules/datadog/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index 35d830f81b58..d01029652a98 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -19,6 +19,11 @@ buildPythonPackage rec {
 
   checkInputs = [ nose mock ];
 
+  # v0.20.0 tests are nondeterministic:
+  # test_send_batch_metrics: https://hydra.nixos.org/build/74920933
+  # test_timed_decorator_threaded: https://hydra.nixos.org/build/74328993
+  doCheck = false;
+
   meta = with lib; {
     description = "The Datadog Python library";
     license = licenses.bsd3;

From 0159beb89cfa62afa14b7d8bb4a9bce3a6408eae Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 02:37:16 +0000
Subject: [PATCH 2753/3370] ns-3: fix build after #28029

---
 pkgs/development/libraries/science/networking/ns3/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/science/networking/ns3/default.nix b/pkgs/development/libraries/science/networking/ns3/default.nix
index 9fc72f18e5d7..3601066cb22f 100644
--- a/pkgs/development/libraries/science/networking/ns3/default.nix
+++ b/pkgs/development/libraries/science/networking/ns3/default.nix
@@ -89,6 +89,8 @@ stdenv.mkDerivation rec {
     ${pythonEnv.interpreter} ./test.py
   '';
 
+  hardeningDisable = [ "fortify" ];
+
   meta = {
     homepage = http://www.nsnam.org;
     license = stdenv.lib.licenses.gpl3;

From a7e93690afa02053373a59061f310f6f3953f254 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 02:43:55 +0000
Subject: [PATCH 2754/3370] pythonPackages.rx: disable check

The tests are nondeterminstic.
---
 pkgs/development/python-modules/rx/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix
index 6945d7486f66..7f8ba49e0274 100644
--- a/pkgs/development/python-modules/rx/default.nix
+++ b/pkgs/development/python-modules/rx/default.nix
@@ -14,6 +14,11 @@ buildPythonPackage rec {
 
   checkInputs = [ nose ];
 
+  # Some tests are nondeterministic. (`grep sleep -r tests`)
+  # test_timeout_schedule_action_cancel: https://hydra.nixos.org/build/74954646
+  # test_new_thread_scheduler_timeout: https://hydra.nixos.org/build/74949851
+  doCheck = false;
+
   meta = {
     homepage = https://github.com/ReactiveX/RxPY;
     description = "Reactive Extensions for Python";

From 3816372808320ee2d3526f75e1a2b6164ca511d6 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Sat, 7 Apr 2018 08:29:37 -0400
Subject: [PATCH 2755/3370] gambit: use release tarball, not git, for 4.8.9

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

diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index 0996d0c3078a..93f1d9184b4d 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -1,13 +1,11 @@
-{ callPackage, fetchgit }:
+{ callPackage, fetchurl }:
 
 callPackage ./build.nix {
   version = "4.8.9";
-  # TODO: for next version, prefer the unpatched tarball for the stable/default gambit.
-  git-version = "4.8.9-8-g793679bd";
+  git-version = "4.8.9";
 
-  SRC = fetchgit {
-    url = "https://github.com/feeley/gambit.git";
-    rev = "dd54a71dfc0bd09813592f1645d755867a02195d";
-    sha256 = "120kg73k39gshrwas8a3xcrxgnq1c7ww92wgy4d3mmrwy3j9nzzc";
+  SRC = fetchurl {
+    url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v4_8_9-devel.tgz";
+    sha256 = "1gwzz1ag9hlv266nvfq1bhwzrps3f2yghhffasjjqy8i8xwnry5p";
   };
 }

From 69926e61ea3870832bcc4183656803b21e7703d8 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Tue, 10 Apr 2018 00:47:16 -0400
Subject: [PATCH 2756/3370] gambit-unstable: 2018-03-26 -> 2018-05-30

---
 pkgs/development/compilers/gambit/unstable.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix
index f98fd5ca935a..545bece12c48 100644
--- a/pkgs/development/compilers/gambit/unstable.nix
+++ b/pkgs/development/compilers/gambit/unstable.nix
@@ -1,11 +1,11 @@
 { callPackage, fetchgit }:
 
 callPackage ./build.nix {
-  version = "unstable-2018-03-26";
-  git-version = "4.8.9-8-g793679bd";
+  version = "unstable-2018-05-30";
+  git-version = "4.8.9-54-gffe8841b";
   SRC = fetchgit {
     url = "https://github.com/feeley/gambit.git";
-    rev = "793679bd57eb6275cb06e6570b05f4a78df61bf9";
-    sha256 = "0bippvmrc8vcaa6ka3mhzfgkagb6a1616g7nxk0i0wapxai5cngj";
+    rev = "ffe8841b56330eb86fd794b16dc7f83914ecc7c5";
+    sha256 = "1xzkwa2f6zazybbgd5zynhr36krayhr29vsbras5ld63hkrxrp7q";
   };
 }

From fcc6e91c4ed2896b7124c777976e88b439fd786d Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Tue, 10 Apr 2018 00:48:36 -0400
Subject: [PATCH 2757/3370] gerbil-unstable: 2018-04-03 -> 2018-05-12

---
 pkgs/development/compilers/gerbil/unstable.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix
index ec36f42d86e6..25c6b75fa03e 100644
--- a/pkgs/development/compilers/gerbil/unstable.nix
+++ b/pkgs/development/compilers/gerbil/unstable.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, gambit-unstable }:
 
 callPackage ./build.nix {
-  version = "unstable-2018-04-03";
-  git-version = "0.13-DEV-357-ge61318dc";
+  version = "unstable-2018-05-12";
+  git-version = "0.13-DEV-437-gaefdb47f";
   GAMBIT = gambit-unstable;
   SRC = fetchgit {
     url = "https://github.com/vyzo/gerbil.git";
-    rev = "e61318dcaa3a9c843e2cf259e67851f240e4beda";
-    sha256 = "1xd7yxiramifdxgp6b3s24z6nkkmy5h4a6pkchvy4w358qv1vqin";
+    rev = "aefdb47f3d1ceaa735fd5c3dcaac2aeb0d4d2436";
+    sha256 = "0xhsilm5kix5lsmykv273npp1gk6dgx9axh266mimwh7j0nxf7ms";
   };
 }

From 94bc38e6c1f1422bcd5362af043dff2cb48961fa Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 7 May 2018 03:05:30 +0200
Subject: [PATCH 2758/3370] nixos/bind: Allow to set extra options

BIND doesn't allow the options section (or any section I'd guess) to be
defined more than once, so whenever you want to set an additional option
you're stuck using weird hacks like this:

services.bind.forwarders = lib.mkForce [ "}; empty-zones-enable no; #" ];

This basically exploits the fact that values coming from the module
options aren't escaped and thus works in a similar vain to how SQL
injection works.

Another option would be to just set configFile to a file that includes
all the options, including zones. That obviously makes the configuration
way less extensible and more awkward to use with the module system.

To make sure this change does work correctly I added a small test just
for that. The test could use some improvements, but better to have a
test rather than none at all. For a future improvement the test could be
merged with the NSD test, because both use the same zone file format.

This change has been reviewed in #40053 and after not getting any
opposition, I'm hereby adding this to master.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @peti, @edolstra
Closes: #40053
---
 nixos/modules/services/networking/bind.nix | 10 ++++++++
 nixos/release.nix                          |  1 +
 nixos/tests/bind.nix                       | 27 ++++++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 nixos/tests/bind.nix

diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 763283dfe7a2..7775a4bd87fe 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -27,6 +27,7 @@ let
         forwarders { ${concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };
         directory "/var/run/named";
         pid-file "/var/run/named/named.pid";
+        ${cfg.extraOptions}
       };
 
       ${cfg.extraConfig}
@@ -141,6 +142,15 @@ in
         ";
       };
 
+      extraOptions = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Extra lines to be added verbatim to the options section of the
+          generated named configuration file.
+        '';
+      };
+
       configFile = mkOption {
         type = types.path;
         default = confFile;
diff --git a/nixos/release.nix b/nixos/release.nix
index 78448b5c9701..1e52c0f86a7a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -248,6 +248,7 @@ in rec {
   tests.avahi = callTest tests/avahi.nix {};
   tests.beegfs = callTest tests/beegfs.nix {};
   tests.bittorrent = callTest tests/bittorrent.nix {};
+  tests.bind = callTest tests/bind.nix {};
   tests.blivet = callTest tests/blivet.nix {};
   tests.boot = callSubTests tests/boot.nix {};
   tests.boot-stage1 = callTest tests/boot-stage1.nix {};
diff --git a/nixos/tests/bind.nix b/nixos/tests/bind.nix
new file mode 100644
index 000000000000..1f8c1dc7be40
--- /dev/null
+++ b/nixos/tests/bind.nix
@@ -0,0 +1,27 @@
+import ./make-test.nix {
+  name = "bind";
+
+  machine = { pkgs, lib, ... }: {
+    services.bind.enable = true;
+    services.bind.extraOptions = "empty-zones-enable no;";
+    services.bind.zones = lib.singleton {
+      name = ".";
+      file = pkgs.writeText "root.zone" ''
+        $TTL 3600
+        . IN SOA ns.example.org. admin.example.org. ( 1 3h 1h 1w 1d )
+        . IN NS ns.example.org.
+
+        ns.example.org. IN A    192.168.0.1
+        ns.example.org. IN AAAA abcd::1
+
+        1.0.168.192.in-addr.arpa IN PTR ns.example.org.
+      '';
+    };
+  };
+
+  testScript = ''
+    $machine->waitForUnit('bind.service');
+    $machine->waitForOpenPort(53);
+    $machine->succeed('host 192.168.0.1 127.0.0.1 | grep -qF ns.example.org');
+  '';
+}

From ce1b5ff26ec62e8ea51dfeb6f89a654b95c3b6eb Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 29 May 2018 19:43:18 +0800
Subject: [PATCH 2759/3370] firefox-devedition-bin: 61.0b8 -> 61.0b9

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 1fc1e618931f..7b518e3714eb 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b8";
+  version = "61.0b9";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ach/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ach/firefox-61.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "98e72aedd104c408be5f040459959ee5f1c6a7f0716db2f5e8b3f19db0a56d541f7f1cfdd9528a863bd6431461ee66fb6bc37837a805bddfe7733aa9b03267a0";
+      sha512 = "75fb64c0c50503e92393c2294ad48c63abae225bcd88f9e5d3e681ee1e1d59d9100d672ba7440523ac0a365a5a6fb5ec08cc4bbc09c59ebaee33e826565c9a6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/af/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/af/firefox-61.0b9.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "9d96f72a7bf9be3984999f59a0ab2c5eb0a569553c9075cd6c9e594e0d160f2a53a570a723f230cf8ea270c4c22cb3de040a09002acdeb3f3f8b7596c7cf181b";
+      sha512 = "96a5aa4c1952144b8867f98b5fbc5b2f7e3707e0b6d1629310284a6099c28bd415ff16cac453beb91bdd7848d86e360907eb6cacb711e7dfea54d08b91fc09a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/an/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/an/firefox-61.0b9.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "45d46621e837ae4f1540d26d9ea048717ddb5aef75bef7f1130bd846d3482c09dfc723df81e0666e25aa09d2c50684f8b95252c3097d5b87615e5acfe1020627";
+      sha512 = "e1a0ef6531a26db01cda6403d18c20d27f19a6f97d61c48441706d05ffae12de2e2b349ab709027dd9f2ef72f52343703feef372922120902f8a6f3479603dd3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ar/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ar/firefox-61.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "9b82ec22834d6460861bad085e5c7f1eb30e35c4deff367ac33e6ff69b4aaae4a0cb63e24b686888003c02b126d103c0055eca853ea0512a3d63a3ce84d65ce5";
+      sha512 = "7dd862b547f4c996269a627f40b43445421af04f6043f4ba7904be3426ec1ef68d2fdc25e48825d2f078342f7481144fca1a64275ecbbe78a2d5c0c199a1110c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/as/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/as/firefox-61.0b9.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "25fd9af7699cc51e514e68524ed7f3b60f7a4506d88120b9458cbf7727a7d7a8249f57209e8f95c7a3cdba3f27d5e3a5ad7f363d89e7fbeadfccfcba150cf696";
+      sha512 = "1396ffecab2ef9a183f3faac009eb8cd94f4f3aec74a2a4f5c7d4cf84d4e70c157b4608ba1c5b48e01f6ac3563a567329ef3137bca9749a4694f815f01ee82cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ast/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ast/firefox-61.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "0574a2caa146049b52c21fe632bf47e8880524624af063266c219be25845af6e24f0e315635d00a90dd663199bde25f9250e97f4481845e02ad87b957f4a7506";
+      sha512 = "f07e660a8e390fec025ba0ae12c86ed45aa39abf1cb168596fbf480a4a2bffa91cb667dc10beb75f3d9bf007669d63e6e93104b7276d12dfd1e0dade27269990";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/az/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/az/firefox-61.0b9.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "49a86939dee753453cffebb909edf0c592089c24a0d9fdeab6271a306ca8b235e4965b687027e68617b745a7ec4bd055775789af9490225c372831641e164001";
+      sha512 = "715f4e1782c759d3578f9f57ba1912a47c1fea41f878432b999ec6b68906ffb794c1413f5372653e8b3119c16837d19351004323331c1b29012f14fc47be897f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/be/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/be/firefox-61.0b9.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "32bbdd608037f5134683231bb1157c64099b79c36170381db7ef5e4e23aeaa52d6331d7be31eec6b8518b370a7000e16616545650326b3968de8802c4f011c41";
+      sha512 = "e4b6e9357b45d56a985811e5b60ded4feed851981a3d39d013b43af70c6c83dc6dafd3c200a8ba945162923985b19960b6cbe54435c8d89fff1f36fe8fb42991";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bg/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bg/firefox-61.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "c7ad8b857a67c2306e26009023cf4d9b55c5f7c3e42ece2703540d90f97b192d611f40b0fec8b9181472f749d70f20df550dc1c83c954c4286f3c0b3b738208b";
+      sha512 = "1d9341f17b3d82e26bb79541cc87b189cf624557d5e59978fa2248640d9756b7ece0aa6c64a59ecca47c23f65ece8ca6bc3b2bd7e6ed6d09003e2b23265dd048";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bn-BD/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bn-BD/firefox-61.0b9.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "b9ed13ad1161cdfeff5f19ec022ba1ccf24f3720680f7c6c67cf46d997787f9e8f7c1aeb78b7a4871ffafdb68a198f1d049e1cbd855c02cfc11c5a130a32066d";
+      sha512 = "8c187890d236e847e33d994635e2e3fbe3a8c4b5e6aed0e65ed41659bb02ca0aa72be2bf65a8bd73e5f786fc42032b659a36e0516bad2663e72a9bd18ed1aafc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bn-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bn-IN/firefox-61.0b9.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "66bcea77afca3b39b5bf66fc8861b25d6556142642d8452fa29bfe6a7519f4d0e1f102ff4b8a251e0ff719eda1bb98c06c591e38248d024c88f5ea9dc7c49856";
+      sha512 = "94757d9cebe243e06c0e454b72b8898f0ca1c8ee5682529775c4b86b871fdec03041dd00ee048b7a875ae2f91d0b81f173d48576a16a1e03f240c74ed0c7afeb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/br/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/br/firefox-61.0b9.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "b6517c8845a70a275a854a48df1aa5f4d21912b2e2ca08cff88919381d848ab9f472b60c9e83e99d27ad3f1a0a1786fb0dfcba99bfd82766f9335afde98f0ab0";
+      sha512 = "7b55fb596d76c18d8f6271b1b7d7fb8646abaa2e765f7a3ff428ee75ea6e23de662f77544c72fd1e1462ff7a633e3f244cda23388315488daa65e11ec35d95fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/bs/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bs/firefox-61.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "e6482d66e6f59d07b652179310d07c2d0bd2b189ead907962615c01cbc365859af69ad92494fea98d5b5ee7609acc4d30e5c0c90bfe052ffaebcc11835bcba9e";
+      sha512 = "8f37addc81aa8283a489a5d1c4f756f7532429c661124c1294e00bffb8b313c43c0bdef0e4c0b7be05b3e1f306a7a77c44909cdd9030cb45d85e643f58cc8799";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ca/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ca/firefox-61.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "2d11907753ff1d79f79a5883477251380b29d83eb0bdd528e707f584242e6a24da658fbed1b37e2a38394b612ebdee9b525c8984ea1f91dff31f97f2b957445e";
+      sha512 = "672eb7c624d0e574fc8028c4cd0877e17f77c540876c64f652c3531c1c1abff67c4408ea26bcec8b9a68212cf0e13f494c02d7aa63195c6f26d08b35bae556b4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cak/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cak/firefox-61.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "5004eb99b5880f43b14eb4f74332887d526cd3c969c6c2643f76246b22a5a40f0c2e7333e1c8f8a83b30cb399cd659c63224c581d215fc41f49b6143864eca7a";
+      sha512 = "2638169827de1a5ac36af21297695bb3883c755cd6995f02bd63375988253b9f925bf88a9aff03e942c8e0a4de0f5a7a9acfdf55a8c0ffcd4ad200152c051901";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cs/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cs/firefox-61.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "3b7552ed106101befefd6d5299178cff0f8faaa838408cbdf79c1460e68220133fc25e34cc9a203f04edcca1bc6dc002b78226bd79bdea9876cfe05d8201c6b5";
+      sha512 = "0e1e30e740c9a2ab4fc6121d929d21275b7007555a475f003fe64cc58c5f0c664b499b6361322c1c4f6f5b6bc3fc1de4b9cf21ffc15e9c0889cb00f3d12bceb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/cy/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cy/firefox-61.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "7d5e4361acc5cb94bf7178d8160a6c146a1c8056eea98cd752d0fc6620b994d956932dca5cf1c8f3f67e279fd1f4debeefe061e58e1e255ed8abe90a8e13d4e4";
+      sha512 = "71011db2d4a7b023c03f6c253662ae31301c0a8e0d66d769775094ae2dafe3e1b6723c30749e0a96a0a2e470100ed5aa58ca2b6b37ce41d3f06fb82e54a92f6e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/da/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/da/firefox-61.0b9.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "8800b03eff899760729d905512eee77e9f4590c896f819e9303533512cdd47a2b49346d46616768a5fb1fe195cb3ed3a6deb31097ebfd428d79e80d6bc1250ee";
+      sha512 = "af01926560242286366d3abfcb499eec06ddbd3cd07d6789489145e06b5689969bd6e80be15f457ba3f36009c15097ba56dbe9ccf91d61913db3bd563a0167be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/de/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/de/firefox-61.0b9.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "64a845fdaec33499cb2863813b5b3ebfe8f5200bb615ed6ef2961106afef677c620d117c59f42fdb4206caf0a875bce8bd932ed84b4ce8a3e0d5129abd2c699c";
+      sha512 = "8bb69b0557a110331472e8d85f5978713e7e3824342225fcee2dad27f248f8568175339e2e9dcaab216009c3f71e905a79c5efbf4910e337b040eb43e83bc887";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/dsb/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/dsb/firefox-61.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "2a5fab91bcd025ea6f0b327bca397dda31c51c5a6fe2070bb7f955379056795443bef4275daf362396d6dda6a0ed2c3b10efb0d3ab21e840efaa368e51501f01";
+      sha512 = "7e6839670e1024bcc9124baa6072ac9381885ed979903c4eecce2234baeb471c64a445d2fd5085cce05c27b134792530dfa8a971863f67e38ddd3dca7ac90e50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/el/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/el/firefox-61.0b9.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "72fb83eee5cfa80355a1aae15b627589a1d1d559c6073da7a5d4ca36fdc19b4fdc4addbedb921d2ae24ef2b760ce5e2414a3158f817c0944f566fc7b1dee693c";
+      sha512 = "c392024823653a78d3e7e47eaa522e6b2e465e3caf9e1e3dff1c1bb3a15e48176c616c9f8daba332254e6efea4c9425cc8bfef75a0eefafe9485cb8e18bb807c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-GB/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-GB/firefox-61.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "92ff8d0491b9910a01c2794869cdc008f469378d00ed706cd02051676a3a9b969fa134057df59857ed2941933671dd58bdb1656ad6eddfa8521dcd3e76c58710";
+      sha512 = "316c9fefc7fac7b1013e0f0e32633ceb3125b5d8865d0ee8b8db7283c5d18c28dc85de57b25fbb15d569b907690b49e4351da2b9fa5116e910aba1375bf1d4be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-US/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-US/firefox-61.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "be34950a70280a979e861581e0109bf8308e81d097be9fd479b6bc1c679b016280d4a52c0cf0d3dc2c33f6b143f68626c15dace6c1f7041508d5f76b975a1d6a";
+      sha512 = "30aa0f0329f76b52fafc22332cbf6e278c0cca5507cc2a806e7fb78969a203e8b7c1b89ef029a38bb3da8b78f11fcba4b7c6c1fed0cedca6031fa080cebf1ee4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/en-ZA/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-ZA/firefox-61.0b9.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "d23165f4635549c687c240b1421f6d8c6982e5ca8bc4933b9081a2a21bd583e1faca4ff94d669df153d51824fdbc15d1861b059ca9002f8156529f9753190cf9";
+      sha512 = "86a2fa792c357040a006e6558864a417dd973464231197857e05e17a5b2abf2299811fd4c2cd21de5979de5631017d7057f675b05820198d4e1dbe3b89432fea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/eo/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/eo/firefox-61.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "d1b17e03020b9def7667ff9704ddc27f994e1889d20d7e6ed876327f8c271d3e66f27329c29c7b3c26cea0f38449a9c7587d86dc08dfca2e415a777812d7b6c0";
+      sha512 = "350feffc864f163595c24540e23f8d8e81bf25e8a353f344ca3fdac6b80e0b4646287232332310d10b87b1fe64a2cbecfad24752200a1aa05d25b0a00fc0c698";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-AR/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-AR/firefox-61.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "7879a6ad84f93d6cc9221aa336fe7015abfeb62ef5e207691d2e2e6f9c96b2898297a093aa470a149cd16dcbf61868a79a3f1db32620cc9339d545b082ede6de";
+      sha512 = "2a735cbdd073ef00cdfb1b37134c7959faae380f69533dd46ebc67e1644990452e8e55d643e41f1b61d600a8ffd200cf26c9952d08130f50b2d0557c19fbc710";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-CL/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-CL/firefox-61.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "20fd2189a0bb691031deae1842e078d2c25522b0650b2c3cb8c3fcdd4d8051a9670f37281705ec1b2488ee7c0179ab7625c936682b38caed774e64529c749ed4";
+      sha512 = "69d6dfcd9426970681864dbc81e092c5a00a1360401bb641863f07acc6fc11450a62a7ddcc1799eb290f07cdfcf98ed713be84e9ef13b4257594a7511d922ab0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-ES/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-ES/firefox-61.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "ecb61862b93bc6dc79ea1b01815f2e42a3b9c7548c724167dbf9545e59e5275f21229ae9ef5f45458cd81fa734a14a3b3c1260492abe83d7d4af3e3c4a7c4e94";
+      sha512 = "e46e6871499bab27d57d37cce001abf97646c841321b4e1fe9d05fc1e1b2282077c7fdcdcdc53869322b7b6c0ded791a092020a16cf82152551240c0415fa2ff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/es-MX/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-MX/firefox-61.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "0943c44b9fcf4d3f9f28c39c34e0f94ade4485140d66fb34400e63e00389b9775f78496e4216b2a33ed8afda3e5bdafef592b8f43456a4b4266fc0101b42ca3f";
+      sha512 = "20ac9ff086c905f8b46abc959909495faaebeb09ae125c9f0ec0c75d41a2eba9d661a2a3b1f21b061f7d148784129a43fe5e39cd1daced601f02ebe1d8980743";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/et/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/et/firefox-61.0b9.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "0d8e29424b06bdac469424a7d87a0c6b621b57e5ee00265ea7b5a8735d03cf81c281c9938bf87d462cc0ed74e8016ee9c09bd70182ea64e5ad94345736eaa87e";
+      sha512 = "1bf54cac4cd8e3b640357897af7a3eb15e082d24950fac0243006f2e402a67137cf17ab927c287a600ab6a13f803073d47168be6fce85f4910c751ff9d772ceb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/eu/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/eu/firefox-61.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "81dc587390ad74706a3f963cefdffe2bfc96690ec3cc64e1fd6613b45f977b5f452ac8c42c24518d8649b8d4e87e52a8b0c6b1a228f149aff42385bcfddc8a6e";
+      sha512 = "4201780fb972013086b454028bb42b32ae8b8519952272a129045e557c8f8f377eb4c6b12d59a8cdac23fb49250cc6bd3a0f9aeb8b14eafebb48bb34310baafe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fa/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fa/firefox-61.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "79dc75a9957786f671378ab76a633f347121128e0aab9d1b9c728867fd1c1e8107f0ef48611e9b858bf5f89c265a02d7d2a50968a62285dac3fa533ca84e9c2f";
+      sha512 = "d371143546311601cc3177f327211c9e67bf57156dfb7ad3d9664ac11f45e3c0461acd64ff8f445a106f904773d8734b498993978e8c6fd14f8572cfc8a514de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ff/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ff/firefox-61.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "73355261b7aedaf8011019e29b34fca17edf64e74a37e01bf9b72d71d972320422ac5bdb2affdbf54b018a91c492824b06a25ab6e1415905d10a22181678d61c";
+      sha512 = "72b8e0ada0e725f9dfc5727b55a0efee0acbfc5837bdc5ce6b7b9fbca4bbca59852f00df3b983dc70e233a2c4e643aa0e066830934965c63427a19da8fbba0de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fi/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fi/firefox-61.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "8669ae701785bc9499b05d2bc966e283d0a457bbad9f583132abf4467bd6bd527d114a76d6c275c921c32a7b5717db56a9b4b79fc1c88c939cb0e3efb85d3ff8";
+      sha512 = "30394db6c85ddc94f21a49c41b6b9e26b77ffda48061c53abefb114c85dbe09bac1f6f2f40f83a719b98ae673936a4bbc90b3f74d399b50b0e98f50faddda1e8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fr/firefox-61.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "3afa54b25ab285049f96c60d6c07f2b5019acd84834edc1b712b9c89695e9addd8486613750776e3791d67805aaf4d2d5b0313095f651d0deba823b0f291199e";
+      sha512 = "6fb78971dcc3fe3ac5f52809c217b893678d80f33b712c9f9afe0d133aaac6a02d446becbc3bf533a8913aa272ab6bcdb9a21a884227b609e8fd0a4ee419b2c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/fy-NL/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fy-NL/firefox-61.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "7300b60ede717098c91628f1827d26bf3aa2281919f577921a5e9c9dbdb91f7c53d39e7a831490d55486583f66b60fc12d954f3bb91c2a3f30cbcbf90e2b0315";
+      sha512 = "bf92a74774aaa365fa7e4630e0543ac017a4d4692df25282fa7763bcf2afae2824ba8147d9f1b33cc8ba1c7b2ecbb6edf6c00e9e13edeb669900a58a8dd3d839";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ga-IE/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ga-IE/firefox-61.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "369af882b8e9e4469cb9c83fcc70504f97b505fbb964fbcf7457fcaded1917d19c97374fd37dd9d7ee0bce2143fa7543d25cac09b591fd6d68ec9bc44c532865";
+      sha512 = "ae835b5886193657584754244f0fa3ffb93b1e0efe3fea4e56e0633e867a8772fe0b1bd2a49d5d26cbab03bfd4f2c8c14090de91e286624917637ba50838fb3d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gd/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gd/firefox-61.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "e34cb61423079cf772bc572e26243ab87a89e6f91024dd6e79df80ecf05895f943e8eaceb1d7918c26d192fcf65832e9032bb44f8cdcfd420572c06401863a1c";
+      sha512 = "53cc4518af97928f836c4427ff22ce60325682705a6941ced6fab32cf1aa1814e7d295a7b1cb7d389bb1fc8f2a691fb178f9ddff5d69ddb377e282f2f2e07171";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gl/firefox-61.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "feb1a015b46aeef21a93a2afd7528860e9a712058e51cc863650314dc48b262acfaeeec1575a50be0ee20af8522c99a92a9b09b077a22f575842f950a80d78db";
+      sha512 = "eb3b1d9c6565864bb870a6d98f303a749afcfcc66b619ec85c5babb3e93ad26fc1a4054159c75f3f6e400da3538499f2f26abe65ab1a01a68c7ce85be70be935";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gn/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gn/firefox-61.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "73e012d684b384ef95c780e3db9763ef68c86e94d84be4848d2c660acda981b8757aa8a51e90e606506e0908fa4af78d7d440cd51c9e492c2edb1bba85e75058";
+      sha512 = "23e34458f7776d192271eb29d6d06072753b16b929cb3efdd9d9fdd741625a650d407e51ee6f2f5415bd60392872aed7de231419c1cb32d5d45ba7435a445ae5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/gu-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gu-IN/firefox-61.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "f9b734a8a2c836e579409f53125aaaf901f3018b22eb11b7c8848d726fbd6a69ad1388e8492ba347d02c87c5638851aea1ac7750273d0c660d5c2a839e095da2";
+      sha512 = "7f7b8993077ff366c9153d732f6c294400d0fd887bace7c35dfc056d0f3171eeb465f599cff802f9d73873d77d10deaa423762ddb0a469f98ef79e1bb512312f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/he/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/he/firefox-61.0b9.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "5d1e16cb0152af48e89f1e517c886a57467c789c04bf0055b92ff347f7bc2d6ecd9bbd20f86be736f0e4e6679c780eaf14a49a5d909139e3055ce9329058f911";
+      sha512 = "5678f36bf759bbe510914cd522309c43d4f346e3386261bcac77e0e6101f0fa88dda99b38dc54f0d28aad73f4c233758d297758816b5601806e578a288fc9918";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hi-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hi-IN/firefox-61.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "581c0d55fcefc848bb5e2fc851119eff2ba3126afd3865733be71302fd3ab691f14b5bd549ab244ba1f00eceeb881e5ac9f9403c7b3009556db21aa2fbb97726";
+      sha512 = "89d448c4967e611bd90936499c83003744a1c505ed5f282cbcdb37f10655d75793992328237e3d08054d9e14c42755cd1bda8d60bb3432f85be5d55fca499e3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hr/firefox-61.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "87a8ccaa35a96bbcfaa219716ab5d9a3a686e6c0a613efa7b7e27cbafabab8dad57315599f32c56c1455be2be70355b595d15a66828febcf36f30b561a09c9e2";
+      sha512 = "28504ecdb7c0f2a76ba5d2dc257b5e8f4dd31bc93b341ad2db987ffa59685f67f04d4550118259869052ff2943acf97efc356e0b117af7dd78969af731edc538";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hsb/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hsb/firefox-61.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "33233fd5261a3af284e077ec9a11cacc62a946fdaf70939b9c7201e12105eb98b8dd3d965ed6fe95a4617144a881693a6588e5869ebeed72c0730a582a36ba10";
+      sha512 = "7d04bb5f3f4b00d43c20406f1d1fc2945855edc9280ded91a41f0deb9c5ef348cd3a3b440619cce67117cffec88e408426c25024248da4540413d660c1287008";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hu/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hu/firefox-61.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "dbc3222c66ac95ca23e7c41068c7746a97d86d2155294006b8e74aaa4d377f80d115c49637e7c13e389dc27e1b7baa24398d54d4f03fa11e6f6444e968c69d71";
+      sha512 = "1702ef8af27cdbf85a331cce97f640c50f03ef0eb9f8a3dfc33308138ec9a9a255c1997666772a732ebb197f8dec1eddf0d84184b717b8ecb1bbd373df551a69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/hy-AM/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hy-AM/firefox-61.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "2a6f98415bef2cb434b271dc6bff04a7b9090af9a0f834d8220e535acbb3bd0341b53916d7b29cdd55bd41462555aabf6f284dd1c10555d451e53ce59990937e";
+      sha512 = "65a9c00c3ade5acff7fc8f325be456d876a2595ae7cbfb37afea8d6ab9a941bddeb23ed8e06722d8ea05260d48a77a7f77fc69748c5255c1f7f0955068e04c90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ia/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ia/firefox-61.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "ee75efb7c8699e314edb2abe63c98fbc1c45298ffe7c92490749716e3fd3d3321d6b91bf38f041f8134877ab9db2223a9cf92fecd27d20549577568290ecc8b7";
+      sha512 = "bed9ddd51fc5bf8d5e12ae8964901696002a047fd3bc33ef52bad2253f13307db518ebdf0218816a7e0fc184f8ec2c697270d71e30337647634e9b993169c13f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/id/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/id/firefox-61.0b9.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "e1021f1a1492da01bbb4e758fd909c1aac7c21767232e9678919e7031109ac1356f23ea02dc8af6894dd917706347ba635666181c82c7f7558b97cfc61c9cb8b";
+      sha512 = "3a5bace1ff0ca4ca7af8cf93dab07a88e869f678c0e1f173bb26d5ffa44ac25af35dafe6840a4132cce59a528b07f307d03d4e7886dfa4eaa47323374d129786";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/is/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/is/firefox-61.0b9.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "206afd8684eef6bbcfe9c28055a227a74855bb7e36885a60343536e1aa4af8509fe7346e9ca040c0915975585f4b8a663bcc881bb327b98a0e5d5996dfea90d2";
+      sha512 = "ae9257f6e9423bf71ee51c645d41c48583a5b4b0c2c76517c1edb4fdea2e109ee5562d7ec35097e558cbd46e1a929f215113390c04991e18f3cd26ecd7d8e87e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/it/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/it/firefox-61.0b9.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "477e034544bfae4897bd244e4de13f4c94cb39b4dac926594c6f216f03990fb2d4595ff32cd72bd1f90ca51f850b6b3cc8e1a26fa6c8d2599adc02dc13373721";
+      sha512 = "24f39efc482e1051ad934259b47a79702f1232d1be308fefc06a0c80eea4195ebad7ac195303b646b52cd385c27ca7e3a8f9053e2e0487d337443ba61794176b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ja/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ja/firefox-61.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "3caef46394dcdec0c2669c864080bef4fb8dfd22f61d4c7c2073d94d8c3b820bb85742791a5edc07df91cf53524bf3fea18d820938a96ebcfe259419af2ab4eb";
+      sha512 = "a9ccd225ebfd6d4d4975a4ee731935f7bb7b16f23c6e2f23b7939b5348e6f8a6a3b11fd683b579d93d9caf826acf50a3a12116d8e4cdb91aa8ca908ef2c9c72a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ka/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ka/firefox-61.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "b08aa17eb8cf8109f7505acd6d1661b42bc0f5606c051ede14c73b2d0298d927f6b803bc02eb1a93e0acc133a6ac9b2515e6c8ccd2a00719e9a91ff5a16e75b6";
+      sha512 = "e8b4f18dd35ecfeb4840c955a067376defa72c609e853f48c1c2e8e364e367477f08cc63ab02f8e7449c00bc45df3c6d6e8ac48762c425217c3ba3eb9ab68a7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kab/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kab/firefox-61.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "4b1e8e198feeb9d15f3943e5dc857eb72445312dfb1e5b93344645daad406b8335a00acfd7aa93e4203e10484c73f6d3c1bb04c3e08597d05b11af0bcb26cb56";
+      sha512 = "a624c332fcb259401de7a5e6a6e9412ca76d861010f150e3b68b6913e3b4a2493c51bd4c584533ec6c10c84c5801d874519feaf6da4266797ec27ab532157e9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kk/firefox-61.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "0d7f7e0bb954cb84ad168b12c908db5f8449e7f4f1ebcfb902a40e20ece33dd2ac1b3f01bfc716a87d99ec1cdc1607a877c76fa0ce952896fae14d8b47813f0c";
+      sha512 = "12bdcd149cbe8eec06956dc101b55fe45b938b92131ce5b11a7c8581c019932199f7ddd2f510c2015c800a226dd98650509616839776452c535f48d22b5486d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/km/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/km/firefox-61.0b9.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "b85a45daaf2f0bcfe8e5be8b8c7906804c55402232601845b05e5501db7f3657ef4e8faa336512c9593eea0bbb9dc408ab8a2f5483792dd1210f477cafb5f872";
+      sha512 = "856123aa5a7fc476f74fd959cca25099c1de9cadf2b7f15b0f7c850d5399a337f8ee0d944b649e0bad3107b8fb52cf46fd887e4418e7fd8f148f95d86f3fad02";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/kn/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kn/firefox-61.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "8d41ff39bae0fd5a6e9d479fc07dcd3c76db3fcb4a4d041456df2943c77b90989f6668fc8ba8d9043835502d3ec711c7a75eac6d7dcfcb8c7537aa264d2161e5";
+      sha512 = "3a3f20b713d1d9a49de9c7309231e75755132495b105b19f5bb2361c5ceb82166c715bbc0b74094cbf81a1e451cdbe648a19b81a3d68cb73d495540f95e54432";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ko/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ko/firefox-61.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "5ae2e6f2819ae6e9a06dcee582b2bf7c532b796808dc47bd19e81c77b53b07dd69ed80e2ff789315800680114c793bd15c6ee89f48c632874f806a4d251f3963";
+      sha512 = "bbb64dcd8afb5af7c7d3dae71321f39be97fa9d20b92ab8158383687c1dbed5e71fd4e5bebb29bebb1b14de3027410f595a240c472c9eef9cf009c1ebfa93773";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lij/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lij/firefox-61.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "4fadb6ce04a85acb9bd6e21ede16b68643c8259e27aa92fc194ded784185c4d46bbbbe1a56c2ac26b169a6e58439f13f9073534dd14f249d85ba8fab1219f232";
+      sha512 = "5808ef41ea5aab9ca5333855271fb6c72cd776009c4827997211ed1216eae9cb1455871dd14c0bbafdd095c7c68d569b708a67f6004754ae7ba24da05e31b322";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lt/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lt/firefox-61.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "1108a9179a746f00cd01014bacc9bf5d430d1cf36fd5ebb5eb28a85783e5f8257c0d115cee88bbaa92fcec38603be08ca9b22cb9d302cdd72fbb06d2b94db04b";
+      sha512 = "ce54d32adbfe12ae70b982bf8a98174dec1bd34c3d98e0f5092d2b19ca09dc3a13a1ae4f62ce52829cca764210bf9095e0f535d4a05972fbd67a49b00213c200";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/lv/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lv/firefox-61.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "50ad3ca480e137f93950d701c82a6faad9a1839aae26075bf7133dff828e7341f93275b73ad1eb4fefec8cddf1405c39cf5cc486d0d327181c520787824b3dc8";
+      sha512 = "9abd019bea5f3b27bbc04af20bc7d0b47da91348d143fcaf4fe946c1e368373d0e5df1bf252d65fe341c767e52420ebf86ef5ff40ba9ebcc05880de6642ac865";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mai/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mai/firefox-61.0b9.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "7cb94252144566feb841d728b08aa88ee50d769521f48ec62b45ec7aabeddfa36ff6b2ebb5f8a0d1e30e2b122e13b4b0600aca3ce1e7bbf6df7e7cb588f97138";
+      sha512 = "446754bac17853bb1cbd79a8e9ea988e4795ee35c92020218b5f2fababaa7931918cda588ffaef75913b33e7546f141ebb578914a9fb1ef4c672e02df1abe51b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mk/firefox-61.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "7f9c3b04c5926f34a97706352f6c919b146c1fedb4db242a6dac3f16da4422d5a9ee124516197c483d31b8a9ba8da2533d2c75c1d11221c713b80b93557da913";
+      sha512 = "a1323b05df4856259e6198c81887e0d1b4f7b2b25d8ed14da52f80fa09b9fd62d6bc49af4ab90ec54b866316786de330021a1877aaa9f8863017e5537bf06e14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ml/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ml/firefox-61.0b9.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "a05652b8fa3c794792ab554bd255b640729a148ea0c8378b2b812879824c58040cc19a41208201a0f891840be709a191209f1aac08efbaac30409ee3e61d30b1";
+      sha512 = "07d4707a71e55f27b9ab931026b42476bb1facffb9998523ffdc7b6d6acbecb8f9bf0c1fb90a7eaadc136b374c9d1a7c8df6a52011efffc924cadfd6a1596bd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/mr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mr/firefox-61.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "8b9f0714a0355ef0120e7c2c0afb13925e039097e5402a68565da40f5b2ce538c4dbf95595a8f557f5133ba20373f3dde192ac1af1a8f5f9b1bcd7967b227864";
+      sha512 = "add2dcb55bc2da5691b497610bd87f9adc7a67a7e1de04acf21562aedd5fd71a1fe3f70b69098807b3d85b6cfe3cb91676c6297b9ffde7707e7d3178e2abebaf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ms/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ms/firefox-61.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "9f9db7cce63679e5d123afda03467db973539e9a91aae0c1f844f7a036fbfb6556afdc0abf3435d961279a51dd95b95b5a18464ad066e2afdde0abcbf553d194";
+      sha512 = "352ada2093c4e8eb6964d053fb61c3d971d296377505775c72feff02811f1ba4cd7f9fa955f413c809205e68d1ff05be0189873b8a0664a440d2102275061936";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/my/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/my/firefox-61.0b9.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "5b3a515b6f4f277baec0f96c6c53a97a7b50cdf2d76c07967b406111cd0f926b6c6dc09d1563b15b1dccdd46f3740901fd000665e0c72a4bd53a5181734823fb";
+      sha512 = "c0553541ab4fade9c7b2a5957b24ee7fc415cb6071ca2fa94b74e3b31806ad340f5e75565a6c1a6c25353d2a1e2375e3d954f5f3bd076fc4eb75f71e58ec26bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nb-NO/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nb-NO/firefox-61.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "96c3379ec8cf52b5501a5b12567df1b8e84dfec2a93a79ba7599d75aaad04875ef2dd4639b185ebf54bb7acfd0a9f779745abd82f696e84a4c865bce7ec001b8";
+      sha512 = "e94f4f77b29b15018333c2aad853aaea2ddb360a5dbfbd0bf8b10fbc57f6b3e8c241b34e72df38873157bd46bfb2c95c25a1ccf2946aa24dffd1920d913ea763";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ne-NP/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ne-NP/firefox-61.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "6015582d14edead06910be4a088844a8bd931b13f4800dd884806153e5afec1b9df39424ffe2f88943c05ab195cc983667360831157ea7f41cfc2bcbdc6be6a6";
+      sha512 = "f41df5a5212e906a5ced3b4d7193ce84df9a38bfb8da3f0a6603bf22bfd4ddbd1c357ddc7429b6103d063634127104b56b55db9692a3af65c848227d7e825f5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nl/firefox-61.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "32ca0aad1f398ae854fddc4d82783c761457c68333a7217e62fff9e4b74a2c6525e70756da365669d2b4994851996423a6a9022bb899746c84e0df730c4323f0";
+      sha512 = "6baef38f5722497fb5e576785d788e23e51fed88ea49ecbf47d8f9abb5b497e2921f51ebbd1e9111becced65dfadae2e84ac4f01bcb0cfd8a6fb017a51b81604";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/nn-NO/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nn-NO/firefox-61.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "633179d1c842e5ce83ef436e1e0a6b31ff0a7edb2d14da08184a7edca5cb2895ef90f2eb907470c71974daed865af53e40ca92fdf57922ebf13c187b8f3cc683";
+      sha512 = "4af7b502e8447acebc362adb703516b77dbb3388b8656a2cb41cc4f63d303533c038e1fc24b97d2d45ba81f5bb1bdd9880568943166da0b7bff458a8921068c4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/oc/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/oc/firefox-61.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "0d8000ff088ac948d10bea9d5999366f2208a952fe9a89158ef925a5bb2e1bed8c50f8b70f2a9f8727931cc020b571b0f959cc04626b843c1dcd46c8e70a3798";
+      sha512 = "3cbab81d47d46ceb78df4b133c960192eaa34d4fe936872a29dfd9985d8561266c3bca7aec9c6d142cbadac165ff3729632036a028462b583c1a55f4e0510687";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/or/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/or/firefox-61.0b9.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "09fa13ad879cf8c1ff685eedf0a74a4e23dd26512320ad1e5c14f9cc8209d74a21bf2d3425a45c29d5c8ca6e2091a5c41d60bab75a75bc73b519cd1cc8b78b9a";
+      sha512 = "22ef57941c62010d0874b1b12d8f0c6d6c03f3123a05e32fcf88ab0c53f127daad70bc16c2ad14c5c157f4a71db53ed1e04869f3cc76f4a4a3ffc69f0879dbb7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pa-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pa-IN/firefox-61.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "a79af673fac2c32ff43de9334059e2b98011f68f3e2aa0f7d0442a7297f918d60776d57336a832c33a182e9c582767e2fa126001e75f99a68a1d1fb43c357d07";
+      sha512 = "85accf8c383738df43dfc26c3258502fda0ed2659bddb0fafd666894324d2d1503df06783d3d317e29898a1254d4f05b945f0882b37f4e58012f57473a3ebfe8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pl/firefox-61.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "ed976499ba60ad964aabe2001922a6c223449a289094e585b5c0272a6ea712ab8cfc193fbd3ec89ff096e467d4731a97cb6a0156c91a9620bd9a4cc04e033cf4";
+      sha512 = "a6bfea30bdf8b9db4ddbb9bf1dc66ae351e4bc616ce287859af78e56a1babfe027384161f33a9db144d326532706029c1a2bc8a5369db62a645872c1b36c10e3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pt-BR/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pt-BR/firefox-61.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "856d611e360871751148d6bc4767f8509137dec22816268b5e77d2f28b00716e2d73f470e4be741661da90fc1c795e2568260f17edae5208fa42d033a2e6da86";
+      sha512 = "9d20c00c9decbf3e57ef6266ac45fc8762ae527b642fb000b3b580b304f9b90fe7b226f420ac3de6ebdf4e2381edf1c17b0a18153e39eca29d34d849cab5a63b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/pt-PT/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pt-PT/firefox-61.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "e8a8fcd1afcd0a6d685ac583a171c1f6d3d9b0cd311e4156621d279d58af1e1502cabfcd39083843642d2f79d374f435984334610797937292ddcbbeddf7726f";
+      sha512 = "92fdf84fd3a98dc2c3da6267cd6d794d111cf8e9a99c9a7f2e703ec85702238e5486c28bc17415eed57053934fa17ab0c38269bcc72a3196b340ac1841af5d85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/rm/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/rm/firefox-61.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "7f5c56d0520685fdca1c82745d1c9e2a34086a07e739d9fb1728afc543ab9b171c311c7be1fc1d19d39f8c2d5afcb36ae91737895c3abc3ca53103b1c1b52f62";
+      sha512 = "7dfa630b451ef91b85990a611b3e4f8a0e998efbe8b1cb4838cd50fb08d5fa64f53197ba7bf6b64b6223fc9739987a75966a1acad83a94743a18274ac1584ed6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ro/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ro/firefox-61.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "a24a11f791889a6b0845c7ad0850b2d5391548cd7e904682d6d463728fc77b1e864acaee8f9881df6cbb981d307372199c52285e14f787a8ea25285d37441d23";
+      sha512 = "1db4df7de8906f3a702ef3e205144ea6e090b2b649d82037393dbb58f998987a11517b51af124af3ddc2402241d846d9eea9556f9d976a9de323af23ccd43a24";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ru/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ru/firefox-61.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "eaeb3d5e36358e9a17da28ea0d87b1632bcae4a0eb7c36a842276e12642f1cc2fd250b01098e24586dd20be220a31413be0549ea7d284c40a7cc25ea1792847b";
+      sha512 = "2cfe54d682547355c384f46f60bdce9629db039842084f7b9b3dbb1eb65769b8531c41f41bc23da63af9b9fa2c69ee987ba362baa7541f7a09d6e77a1dcee024";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/si/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/si/firefox-61.0b9.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "4663a84c9c7f4b111e49368218512e75b8a819fe6fe00b2b299d6f3666e598852eae4c6411c2f7efa1bb9d0219ae78433e94ecb62f124b9bfa27cbf55612f715";
+      sha512 = "fc2ad8db7c8eb65f1506d066001b33bd7412b711adec7f35edeeaf25bc8ef9b9c9b8ba77e5941366aab63ff2c45587d09cbd576f455f076cc6e0d3eb034ce21d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sk/firefox-61.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "d85c8870bdc303302c4c670d07743dcc01ab8dcd0d90ffbaeb5b5a0a79c9ff6a73afed09b299501fa2a874cf566b2a755b032e243a0fdcd2921f0d52d41c46fe";
+      sha512 = "8ee88dfe9d8457e0414dd8252487d7757ad62d6e16ab3dc44ef05f4d83948e6db714b1160208a9953f7b71b3bc2f5efeace559d9db956bf0d1fb70b9943846b7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sl/firefox-61.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "e81fedf3f452f2fe3ce969b797b41be181fc1d859b93a750c721d0dec4d69a236a8be9b668a2f63c22a5e11fd5f5df750bba02f813f7403e6661b78bffb453b7";
+      sha512 = "975a8a5eece45ce927fb6bdc7179ef0e9b9a6ac568f924c6892310fcd67f6edc6ad1ddfb10776b375ee70eb538ae84da531e3b98d04c856987b9f04d75d2519f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/son/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/son/firefox-61.0b9.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "6d57838a18e7bc250ae55638740e32110bcb253f8505f7a11bb8f042910a400667735a882d213856a136e0dc05e8cd7cc0f92458a9f046ee92561844978e461b";
+      sha512 = "8a7832f815843c46c1333ada75d2db3745ea300f6999478e95fee23b5824fa0d7aba7a51b7bd36c75ebbcbd2c0f59182bedd2f7e1b5c73239915f12905da12b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sq/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sq/firefox-61.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "a89d88ea6628ce8e57923137faa962a5c06cae186e4f2bbe865bc3323d998903a39abf93bab5a2a9ac644e0806e3fbd3ea11a8d8569c13cb7477aae06119aca0";
+      sha512 = "4f184c5310ee496f9f321badec736d7849511f6b3d5c95cfa82f927c79c69a3c120f708ebd3d055fcaef30c8ef5e38e4511c029f13e6a7b187fb2ed650e3a754";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sr/firefox-61.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "889b56bb35a5b163c0ff7aedd5857b0e3dea222faa33fbd39002e5617493d143ef64d3b801530fa2d2efa6c1484cd853b70bf9a3e23b5edebec8eb13bdc241e2";
+      sha512 = "9615f2b72aed205eaa41ea211fc96253a3a13f4086a95eef976f2211fb238c0ec713f825928935c0fd45c327759e23e54ad6061f061f349f49046f630f37a2db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/sv-SE/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sv-SE/firefox-61.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "ce23933ea889292f9022f14288f6a141a95896a6991ec29f5c69f3c07b8b912f02434158e7b36051e2bef254d977923b248f74863b7d5a8d28e4f0c1be5fe832";
+      sha512 = "2fc015bb42a9ac9a0d2778ad2d9b4b05ea42e51fcee85d139c035e7115a29649eeee1b9f283cc96c6df701765504da31ca6cc96c20248f493da44a0c7ebfb5a6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ta/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ta/firefox-61.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "786fca42571716dd0031708f09ddfeffb688b1ea39679752e923107d266652f2d49f2cd67c084dc98a7bbe47e82162d0d12ea9ed73dead6784167257268b7591";
+      sha512 = "2b9d9b78d691cdfde7da5ef55d45a535081d9e548aa861fd6b71999602b9599b2c1d06f554049b967136f39ec1995339bbae7a4878fb208a071072e68e15b633";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/te/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/te/firefox-61.0b9.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "763b525dc7f6e5d2dec6d5f1b7fc3472fcba6d7e31714ff1a4d8bf29f6595b76d1c496ac4824a9f7bcad737f305654b21c8ec2d87a25f7fb0690832df5ef7793";
+      sha512 = "0b12221b03ab876994901901f2838a18ed6936ad5e31ca47dcc0aff2c1963a1fd5b2874e01c69808acd7adf44fb5a653c537b433178ba38b4db7c45192fb4248";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/th/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/th/firefox-61.0b9.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "8c8acca6527a5061608d3019adf708884750e31bdbd856035e96db77ed6493f8e9786d813654ac0603b9608476c4a9bcb958d8ccfac23bb6314c4ad83a1a8ff5";
+      sha512 = "027bf7acc4a0b95378dc2eb4ceec31a15dabae2a6870489ecba858b9009dda05442f9958646e113c7ad8c669ccf185fe6674e971ea1e3e1e37f0a6ad630ee4ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/tr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/tr/firefox-61.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "1494c4408dcd99f54dd0534ded3c6d69b293e4f79b0435c60fb3c5298ded9224a08a75b8850bbf2e94add391d37b14b82a447194aeec706784fd9ed020909df4";
+      sha512 = "f8e385ba8269763b48a4a5455c8d96b2237f2a71744c5dea2969f95896d18e1108a1025606a4ade56aea0dca397228bfc08c60e0fff954831fd92d288bee7b6f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/uk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/uk/firefox-61.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "a86f128d1b09263a854c3f9119b44bf69946b382d9e5cda98d279bf2864fa37f453c6f6778c765b23a5714a1645bb663713faf08eb418565115e263c0ef6ed43";
+      sha512 = "4d3a0ec7f4e03bcfb2c04020fc3775c08da0ff2f727cd5e5e4132f6d99336bf8ab5a79c6a863a0bf027da81b13de45aa203fb10f7c8c38dd087e7953c4d7561d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/ur/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ur/firefox-61.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "4e318cc474c011b145eac452b7348db3722ce914ce669aad7c44678b807dd91aee17d1e82554f21ff497e5efba3e0e1277ea47de77b21abffbc85b098034b6dd";
+      sha512 = "da9e0a98bb3c0b791831aee8f688f1e525141be609ab4b3a65136a6bfd41c2aab220675540429231b6a63636ffd0f9333732dc4c0cbfd21b08dba92de9edb755";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/uz/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/uz/firefox-61.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "bc5bd87e47602647f188f5a9af294c87a71387114dcd9f3e42bf5e0abcf91ddcd45d53419281e656f07ff5b815b06bacc9edaceda804c85af3c8aa4193b8ede0";
+      sha512 = "3712d5d80364978d28d49eb47a8e7a25a0d085a11826b4aeeab16636c4d277c45839d65afebe3ccc94afdd305ac76b0c5c508ce2208633eca89367600ba623d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/vi/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/vi/firefox-61.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "a16b86c625ca7565d4ee4d888e3d1d2eb2b46e96d4a2146feb3b02224e6dd73f0206ed09bbea17fedfd4b315c7b022d81971713f2522d7c2bbdc6b6528bb34b1";
+      sha512 = "0d6fe8b3b05fc42e2e6abcdd88d127bf4d45d60984386fb6d6d8ed3dddc9b8423977aa04c189162a20fbe72518a2d5cc4474aa4f71fd8ff5a3039b42fc6ff62f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/xh/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/xh/firefox-61.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "772cb46f695162c0b59abd121b1f0321da4139c4f7f8c4bb706454872d7e215edf1d43d5c179dae736cdcef05615df8fdac2493abcd63624a16afca0ee8d2c87";
+      sha512 = "b83af193af0813f5e820ee5abab820f18b5e037f767729fd8a7c332f6e921a0a684813dd3e489e95d7ed24ae252f95149771aa5929f42e37f97d1e35e7746bb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/zh-CN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/zh-CN/firefox-61.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "8fe1d61c2a7bc981f8abb1e654a3b095a5cc9623bb73b6e4ce9b4bb628f17a4fe253e9f38ea8159ed137ff275993421b3724e0eca53fbb824532aed1c523dc90";
+      sha512 = "c63b6893b8926eedf6289bf2c8dac0f3a8fd5d069f34a9159efe0decb1b2ba825d4e9adc646a28acd555f9d68f65def8cd1f80f2faa1f973f4a9629817e3ecce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-x86_64/zh-TW/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/zh-TW/firefox-61.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "c4408e6c0b29971fe67539ed88def054b67ae9db52324667b5bdea895996c30a81771027b1bccea15f4aadd9e2eb5a3302de2d597d43798b70a6f57bd6a63aba";
+      sha512 = "c9dc03480201e6030b2d0016e25d3b1044b1718d40f58def0aaf8e646c0061e737ee1aee317d17aee4ae98624b09cca2c2dbcf0c70a85b97652a443666881b76";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ach/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ach/firefox-61.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "9cf2faf55c7b862743c32e11f8ed591874df1fd89315df82f211898d70bb0c8c3f961ba91ce4dbf380929ca642952ec351cc38f28c45098fb6b069ed7c538c24";
+      sha512 = "b9954501ed8d449079263a14b481aa2c20f151590377f3519d919ff6bb493d982b7bfba3279d37d2627d96d3d83c4a68bf6affe4d5e486d47b22d1f5391b1348";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/af/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/af/firefox-61.0b9.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "8b9b28428fc35002a2a965cd023e1f837f154a3b207ddf7e0faef7f7cb33cda726a37e0bf1ae549a2236d7bd29cca2a667cebf8aedd508795d11875435ebe2ba";
+      sha512 = "5b8fd0240dbbfe10e866f84275591612fb568281c0d6b28573fcd39514b31a3c4a83fd5a710fee8d7a13be5ad1ab95048cf4915f3643d7a438c8f22f1738f6e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/an/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/an/firefox-61.0b9.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "b9ba2465ebe938f3c211c6e7f38e6b8005b27c460d08f462f8494ff0a88e6575348e2ecb0f0433d4b80d883f1495e2d239b1c4d6f00d5db7e3d55d6497dc87de";
+      sha512 = "07d49cc079c37e6bba667d27f8bea54edd04b94159f5d4dced279323ce0d400f76e2e31eebfbf7e13db184f299ea9c47068745e01f9a43a704effd79448b93ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ar/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ar/firefox-61.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "76ac262633330c4bff1dbaf37311e699ef717adf8431e5dfce56ab204ec4745d51dbde20fd29f79d30cdb19055058320c7affb801a0df27af0a6239273d3d92e";
+      sha512 = "44428d88329b13c99b745bea63cf61ab9041b5217704618e728e10c80b4665a87cb011d4e26ad2ba56f628f0c3d331608a6a6308c514cdcc01c22ef2b85d942f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/as/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/as/firefox-61.0b9.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "985775b42b9053f703901ddf85af7a78540bb2c7f9e2317d76b93a030d888d0211c4434876b01c1f62c977457b54313c91f72bfa9134b47189a702e39261c4bb";
+      sha512 = "ea016f0f343a4b65ffd97db4403ec76fe9d32c03b56638ec27a4764bd08863194eb9052c2ed52555786d24684d8f2e27257877374833eb51b62b862b065ed198";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ast/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ast/firefox-61.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "b2ca211293fa09fb70f1df21419ddc6ab7a03182db765a2618b00af9b227db20f8da8a2b8cf9ca4b4a4a8cfab9366981a38d2b22193fe0b3c82918afaa834fda";
+      sha512 = "efcf5678e84d588a58e33f9eed56b5567eac0f704bee59f5d2a9a81f1df696abc7f9dbd0344373add689e201de9efb31dee5e22f1ef1097adbf62ef054d02850";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/az/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/az/firefox-61.0b9.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "c6887b108f311d693ca2ca68c4ba9d5b178479d0d5a4f2473f1bcd851fc4fb41b84f905c2e3b67ef95d8c3bb8f97c8a94d5d7a047b74b1da464c679bbe849e4b";
+      sha512 = "701222574544b535015fced8e48f8999a424646e5535d8ba2020c60fa7bee3a32f3ccc3cc2f5630c64e69d594cee26017b856ef8b13133c4a9589b0c72b22ec4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/be/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/be/firefox-61.0b9.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "a8ff0a459d5ba3b43d6a7dd807908f303b940a0d49878bcff04bad0c8f69d43efd58466588e0d7a8b96f670c9ee3c4cbd8058f4c8f881804c128d76052f062ca";
+      sha512 = "96c8037997a2f16fd01fa511895925d8c8d55feea1b4472673e84128bf98f1a24457c56f3707812fa0330c3b387e0b79bf9b5534c3d59358c86f283ba6be3770";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bg/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bg/firefox-61.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "4a170243cf396ae186dd481e07574b8f2b8a0074f51e752885b1de14ba2c78a37262c66330c8c76371dbfa0397712a7915700f817e5d2229c950571b86a821f9";
+      sha512 = "dc2df8e6154eb44dcbd80563a362fc54c74888f689ac8836b8e0a8c8c67b4ee7683544ef45320a4ef31a6bf101c0e162d757c29c583df1382a650722db466bd9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bn-BD/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bn-BD/firefox-61.0b9.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "167c0b54145c5e04d3555d7322c643d28239f087f89f352bcf52be6bb472e78dd48773352d56717fc9472ed88e10ea582fea61d758c5f9f744bde591e70cb0f5";
+      sha512 = "ff6a1cc88071b422bd6055ff0d88609551d4acb3ae57c4a0924e48f789fe7dba6d1325ba15eeaf20746c4e0ee796964094827a8cdaf0251ffeaa6c0d8b3e8402";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bn-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bn-IN/firefox-61.0b9.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "f238dbec621fa7263502c1e99d6fd845ab94936884c117e2c3731fcb9410f66050467223a445e0855456c65f511721a714225f1bae0229887253dc474d7d3388";
+      sha512 = "726f93f9094ea50bc24e00578a73bf8b906d460fa2aabba8ca1b84f73e2e82346833eb050aaa58361f43a5d12982d85168302c3bc73e630a26b38e029f8fe536";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/br/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/br/firefox-61.0b9.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "53d5855ad975a5d6002b2720234f7b55cc8d34f1fd4c927ba7845d245caf9291daf333e77d9eb73b560e7a8eaf2d9a37f329e6bdb69a48aaa73f6948c28f535a";
+      sha512 = "a1660a0ad425cdf16ddf69259bbdd833204e813af5f36e81757defa470f45c43b1a1235b7d937d85f9d8584255eda668373ef8b8087bf5b7a6d82eb2930a69c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/bs/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bs/firefox-61.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "07d0286615ce670991b868fcffca0589376052c7693f62150bcf93485829cc19198ee7835928cf87d5c3dd25faefbe4b45752625919bc46f4f1f35de4274ec08";
+      sha512 = "695b4622a597345cecb4a9462d58c5f58f5a4395b4b46fa72b1a47cf7ce9bd1e0052ad070298cab0614092b9ce0f268c95866f2cd77c35a5aebb0968bf4c42eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ca/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ca/firefox-61.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "b8a1c24297021a148c60f9a8ee1baa614541db34bc280e4ed5366f3b9a07d4aaac1535cd9ffef555cc8c16840c3a8f352c2769a1445932560535cf1df2ccaee0";
+      sha512 = "0c38f24c68731780c99c4f361a4e1ed06ead7aa95382ffd3a9d2b939e5fb6890498528433f1cf9ed60505b540805656dfbd12e06170aa3af2b7aded1728d2300";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cak/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cak/firefox-61.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "f9533c950198d7c49977c9b42a8349d241be1a4a2dd490f6459780056906153ca9cd4ef290efbc8b3699d300158fc90cdbc2697e2f5d65962f1831b714b7f49a";
+      sha512 = "4e6c26ec08a8b49e06a7139734216824de6f3ebef6f175403e43b641603eee066d83511dc0fb9f19e5ef9a126637b137bb3b31d345d00753f03b4ade413e4002";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cs/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cs/firefox-61.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "f7b46fbcaed63f1d2a90b70ddbe39f973ca6474559ae3cc998c0f6082203037f6363c34744f2de0ee766e066fe80a88983ce88923a28f73b7fc4f56b7ec7b7c5";
+      sha512 = "c76a823191caa3655bfdb45d10c4333155b71808d08da8b85c581521d0f9fdb1105f60d9586df6d655dde082dc93f212926bdd8970c629b80e3c4328d2d7d994";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/cy/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cy/firefox-61.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "759395373de80f58af74c94be676a9e4212fb1c11423ef3f942f367a723a60535e71f81134598d93cedceacced3507b364bdc0f98d5c14e566dc73a1b2368a3f";
+      sha512 = "d5ca0b5db73a8c1bf6a718e7b7cc7435a40506e49997bd18ce869aa9b198e3a424313e4bc8cd19529ec4d9f93c92a75de9f08d8750626b32d8f0744523c4380a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/da/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/da/firefox-61.0b9.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "d4a873976c3f044fdf59e05b929107000c9c9a4b5ed837d2e7732d83d598c6d6a6f722855052e9049c0c058e868d595fdca01012343a70404ebadcbac7f83dc9";
+      sha512 = "eaacbb06990c820d62cbc24bea736ddbd815679d72495f57089ac29b9b1f47c2740c905b979b0b6679f44170986651e1756e616d000331221233cb2aaaf82f92";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/de/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/de/firefox-61.0b9.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "6ab0a58ab3bcb4d36ce29f0e7118b2f5bde3dbb0eb516bb0c57036292b17fb69b45b79b2fc312ab0f849f4b68b75479f49648d123b7fcc036e5bf1dd2ed81951";
+      sha512 = "bcfd0e3cf4dc1d5666add6aafeac746452641e6888772a8ee7593f68939a409067f10b5ac58826e2fe4234f7edf7bd0066b21e8abe0381a53ea0fa1a8baedd05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/dsb/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/dsb/firefox-61.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "41e2f8fa5df88934bdde248227ee599620f6378d1cfa708e84cf9b5236d3a1a6a1d268543ce20ad5daf5b9a5b1cf6526cf8624a7cf24544b3853ad1601ac2da5";
+      sha512 = "25450381401bc26153a8b8bcccfb090f6bbdd0511b515f7db13108f4b7625c60c1abeeae8123b59a3178b8d2afcb4da33ece5519d150c4a60871593f62210c12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/el/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/el/firefox-61.0b9.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "151942fafc47528207ed6464d5164304d67f743b3b72a5b52f995dc2ae3d08c57c87639db78dd0b0f70b8709b5d718eb46c18af34e616cde10d3841f9269cf50";
+      sha512 = "f6514c01acae82c66738d0564f2237b1598b1a0b83894aeab4a6f2abca209c8e7c5db1033e87b8b6e5b9904a6011afd57e28a2d438668ad0d6883d30868f555a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-GB/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-GB/firefox-61.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "4e4700f99dcebb5bc2989729fc6454e655b77cf504f6485c2e432656604bc241af284c664fd929fff41a5a4c96128feecf93ac88c1524da102e865f8a280c143";
+      sha512 = "371571ac90445231ed59650fb6796fff63cf9f0ae26ebbbb33dc4174e8021b59edc0eddfdcbe0618e308dc8828407984ca91fd2b3435452bc5d2d033e25fcb48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-US/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-US/firefox-61.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "0b5f5bc92bb56fb5db437a62c330e28ac9eb1e7dd89b3a9f678f7d3ca1d575ab0f9e65a1d1463cd878878913675fa06abaa815a5fe4312847f08f95b660d34cb";
+      sha512 = "3d664fb83d2c15198d8d054d99de307f17cd5f5c26d8167b47a44a74a6e0d65bf81395802d350c84c54c7635845b233be60f3dd626007dc7bbe2e67583d9a42c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/en-ZA/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-ZA/firefox-61.0b9.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "049fcb7505ef21ae0c77dbb89b5761e202daf9dc63bb2c1ad249277a67e2ddf3e7a9d2c0a66881fb9b9f6522bf767514087b038df984aa2aa1ba96ae2de7b627";
+      sha512 = "9ca6c029cb33cdd8fb7a01e323b5a29a894f10eee122c6fa47fbf4bfc965258ac986b7feebfe2094220671bbc77492ec0329c2ed4b3c54c76481a97496c7b3c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/eo/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/eo/firefox-61.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e77e7b214149815f6286a595172c5720951cdd58e1165e23b486854e83b406a8060f23a1c75e4e7f29fd53ec361596fb1f92e82ae57a41acd73ec25d8d4b8b1a";
+      sha512 = "16175f3bbebaf395146a23accc071cdc2f62ce407e78a52b79c32afa43f1cb9b6729261e2939930d6c6dff2276e888f093b58225b52e57c650910a1f1c46a4e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-AR/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-AR/firefox-61.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "df3eb78a2e535b2eded7a2c9ce71654a7c4f937bc8b0c24cd3d8e0a11377fc8827de129f1a7a65962e2d2bf001c4c3dd82fcade612353a6e3e72fafc267deb01";
+      sha512 = "6b90005fbf9aba2a4d20d57f307abeeb5d8662d8405a4c6ada4da5c302e27e20448d3966ae8742e932ece81f7bf8d909c5ac2e8e4e71a65430c2cda3073617c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-CL/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-CL/firefox-61.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "461d452e2644539aa57e7568fde8e3d870039468ea2c235c1ebc88205f9f53e3d1d8313749907e12eb8561620319e8160402ecf9baf0806dd23bdb697b41b565";
+      sha512 = "f710706658a248fc40c2bfd6c8f6ac543837ea1e2dcce7cd25a33982bff50b36a7b9463261c033ee49a01d1f340bb7468460bf73bb882ac814c5b15fbe7d13c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-ES/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-ES/firefox-61.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "0c296a2b71a8fb828a2284d73fd5fdf3f8d71fbc46d0c13ae4bce534e686dd008ad44ceb0e2fe1ab3f4f1efd8153fea9e704bdff72eb7fab0abd8849b625f7cb";
+      sha512 = "37d95434ce619068412fa5e74e15e6460b310527723d4e0d763072661721aa7eef649eff79243ad4260c2724387fbe7a71fb7700e8b1dea9ab2374fa49cee579";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/es-MX/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-MX/firefox-61.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "44989dd727ed54dca4ea4ba035b74f0129262289e0888b2f04502fdd1d675bfb2860cdba0a9093c985ad40eea131b859caff73f53ec9616ece3d9871e1dd8925";
+      sha512 = "b3cba4eb00e705050f2cbd8bf559c35f43742dce6f8afee6abda620ccbcc0657887b35077cb1512de0a3653992f6227c493c655ec11d048eee1a5111d27c42de";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/et/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/et/firefox-61.0b9.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "f6faa25750832a2ad378babe29558dbb76e39759403af59aa445b2f5042af5776e14f2b1e99dcf9df949bd4826ce057e7cd27f64309efff2eee3345b00246934";
+      sha512 = "56dd03e6ac80b2d41ea3132845a72972eccab4e70834b0eb77412d75da16428ec8d518f4873abb4b45db183546cb3c9e6ff6716e6f1667477df60315e51e6610";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/eu/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/eu/firefox-61.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "0a6b4476622ea6c1064070b9bf7c80efafd8c55a2ea231733ed9cd2d16c68e49d0f20017d00c419c6e9603583866e321b1b441ca486cdc558812901c46049fb4";
+      sha512 = "24a589c4091eed2cd2333f769d32913751444f9bbb5421f6f1efb29134f64e095a8fdbd52342895d57bbe277e7e6a6d437f201e5a9402510cfbf9e0589fa7372";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fa/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fa/firefox-61.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "f9e3390601d0340d7202c7bf99896f8439e69645ca704aa0943ee30c55956a6a806f1d56ef856e8eacef2fac84080934f3186cbb21e9527a0b5f878fcc5b7c52";
+      sha512 = "a53b212685a7dda9a8044d7390664007cedde3005276f5b84502f7693abc7b573207a25160930f4269b97aa48962eed796e2f4cb91a6b9d251c786716c1eb8a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ff/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ff/firefox-61.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "c79bdbbbb8e458f72d0cf0c80c197f55d88d4c8e4adef062dd752e160aea9c8944b0aebdfe2428d45b93fb6b902caff306e21dd3c3dcff7181a9a4bbb7ed09ea";
+      sha512 = "029d0a32f54a7f59801c53309d4bc6a7ddfcaf5cf8398a98d42451d2f7dfc398bf4d3f54a7fa7cfdd309b6fcaa91cb751ea227d3c230ce79ed1306263b50977a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fi/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fi/firefox-61.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "b1a1118ab0cfc073eddddb6a12362b84438ee44919949ea1d4d331126c67d3afb762b6fce9f34b44b04fc4d64cf6ea6cc0865c2067d69d2bf5da35922165fd18";
+      sha512 = "6c76910971236407f4eda6f54e9fc8cdcc94362341eaea189c0fe32fd09bdfb6a817b14ee81485397752ad6f9d6a7177f224d98025aa962061e32ea83add2173";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fr/firefox-61.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "3193d4f7be6e44a642d14c2c4338eea9998554d022ff524cc9f91b9395dfa80ef9b74337e246b190a3b6f87ac63d6974231b4b68de799745569d44904d08d50e";
+      sha512 = "d5873e3637038213feab288002fd16bea5b4d8744ef186ebc47fd4b94dab93defb4384ea45152851e131e1ff9d362e6af7b59cb63c1a853e7242a12eac896b80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/fy-NL/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fy-NL/firefox-61.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "eac747092b65ecbd2e92d833df338ac3637bef7bf083d6502c0d03d5993e92701b643b728f561fa6b431dea39e75cfe8df28c194c1a7abd02a8362075887deff";
+      sha512 = "f2a02746ce4b527835acae82de58e465bc58021b7c41e850576715587933f5e54ac6472809f0fe6c1441c4350b938affb3358056af098f36daac9005edad60f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ga-IE/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ga-IE/firefox-61.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "9e3bf811f8733019d3e5a0b1da147232fdea907d6f493bd311440c1711bdfcfa610fda6bfec6b77b91cd48b6c0bd9835da2edab4e950e5cc289cd00db8ace3a0";
+      sha512 = "f99b18f2b13a6789910a6cbf4dd97bc4da6540c95cd08daf90c0744d69372333bfdb6946391d930b608b640da07a19db9468daa186fb86eb837e7df45e66a2fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gd/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gd/firefox-61.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "774b5f66df1608ee613f28989ff38a64eb017c8671f6fcc8d923f802dc4700b25b71c239b2c6c39f89cf217a40833a5a81559bbec98476acac5f71279675f357";
+      sha512 = "5f61378ff50b566e02cd9f70647558b2bacbafa07007ce7bda340d79b13d69dc86a7918614e411e5bbf1e3c5c739c6bb62a655605f1d5617a9176526120b14ca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gl/firefox-61.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "e42af15a9713eb85676fd20fb1243f1444eca871e724fedf00653b204156ff57478e56d84e8e22fce801852a3c5cec91fca201a3000f7c3aa0dc54b019b6f387";
+      sha512 = "eea76df7b67364649f10a5532103035212b0ff7a42336a6732ec0d22aa452f931326c1251b1ab8f61dfd201cc54d0f47a1083705b2b7d8a675ccd9134e106a44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gn/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gn/firefox-61.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "5e4cf51eba5fe02c95179af802ba0a395f03d59cbfdd8dcd670b4710fa11f4c329d4a5099a8799a04c249105472521149d26c65c28520fedcb851713889cb4ac";
+      sha512 = "5a9e5aa33ead532f51e07a9fc4bc5aaf6ad77795e49a9abfbe4e488958befc16d51e4c047f60b4b884dd53040624d9f315f1f29dcad32a52ba6f2853e244a99c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/gu-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gu-IN/firefox-61.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "a7dd519e7b79a1f7473a6ed30ccbf465ac6132ee3d329fb7d823bca7917b54110e8979d0c4606977789f30ff50b87fd27a230bf18b5397c12d057f0877d28aed";
+      sha512 = "b757b32b9733f7cca8b9a5673403df2887861f6dec66319f8316cb23dd20be03078647bc3546189016a25af58f4b74ebde7abc29f68212d3205978f313aa7279";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/he/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/he/firefox-61.0b9.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "a98e5c9a195b0b90d0e352e6d52d26c2c3b48874567a23700f8acb26d551a1d8947bdb7838bcd7f9fbc8532a55afbaa9e948e563ca421088ecec2480bd6640bb";
+      sha512 = "157862e9f36f6990e139fae95222c31c65377594c36e348a1ca5f69dc7a11f70972b603c0eb588401ba6706a7c117679b92caa6099b09569df1aeb78883beb42";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hi-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hi-IN/firefox-61.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "01810ec36be0842c6fa4b2c766da20f2b6e551ede85864bf1533eafc17779282591c09d5f7cf24fd634cd0db34aa814018cbb2f78ca07be93b465061c90de7a4";
+      sha512 = "d64db24b335df9e41a873b8b5f7dd86439ad96921707d0956f5ed31bb7e38039173226031fec48fe957d255cadcb0cddf5bc897fb64ea404a46bcf8466a8a05b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hr/firefox-61.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "729d675aae14368a3a665d1fc4150d70f8081cb997d56d0bfe1c1599152c17508fc59263d5dede6c4ab0ebe20967d6414eb35a95ef438889f611a73917dbf304";
+      sha512 = "1851c28d00e8298b75c3e98bd32c384643932fe2528ed547fc08f04ea1440663184e928be69accc034628068d935509f5f9f0df79675803bb23cf8fa1e00a067";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hsb/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hsb/firefox-61.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "18ce4e11b7ef42537023792d98370b304ec39198f1f93affdf17ce9cb81806eb634ee2238cbad3b5e31145f0c99ed83d52b138263b3e726c72ab05ac2c8f3f3a";
+      sha512 = "77e0dd746cfd9553a56a3912f1e4eec31c846fbc7a309241e064145f42ef572cd54fdc30d788531069505b0b30371dc9e977a3e506d1e6d0af881160f21b8eb6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hu/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hu/firefox-61.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "635b2436580b409417c92c90bc79fa1d292c6afaabf2e9a8801ccccf8380225953b85fc626f3f94f0860d2af043afe319beac0b2bc5426f08e44f58cbeef1120";
+      sha512 = "a2624628a55d83b67e8fe795ab41a200a2feebed8cc6d3235025d8ab32b7423ab23ba1eba914104594f74c114ec79f55f1e339ef8f9b2999f9f69d5db81d3e5d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/hy-AM/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hy-AM/firefox-61.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "8f6dbb4d245255fe06bc5e738063e59bccd9a5f951ba27ee0867ee356c7f3fe90915a75048a7a7f5a851ffffe3442905962bce6cd06fad81422540005317f87a";
+      sha512 = "6acd8b6a40ce2b80117ffed130600209907916da0e3751466295ef4c17795d459ba410a1979ba6755ece14aedc974afe815f774f03a53c9418d0d5023e36950a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ia/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ia/firefox-61.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "e4184d8ac4f186de4f6667f4e52b9655ef37a778bbb8dc1bbcaa1c1b82d5d4522ece4b7780142b508addccb7a1ee1f85255032d913915986bce17336c7707a75";
+      sha512 = "84de46654d08503f735e41cc2c8083f6adbc80244625601a242f31b3229840bddbe3245b843f9f5cd4483945b78f14b3998f438be4f26bff9d34741cee21e271";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/id/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/id/firefox-61.0b9.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "117c57d6b42526933f9426ac18aa840321be246eac04f15e39400846031e249eff35b0fc39328427a22e68a392bc5f7907808b326a696e6138542e956f41f0f1";
+      sha512 = "295153e98a8feaeea1f5ba6c8148893cde566449ab766f28a5c6f99d5a8918a6c654162c888c883d0f4f2edde6b6740f7b60077f9d1748eaa0fc7cfc3bc8636c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/is/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/is/firefox-61.0b9.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "0fda8360ee74c5a79a9625c90cdd0956438945de61a0fe3eb0a1414c6d004274e90444bc01f0ea65145e897faca345e35a4902d2ba3a5c89fc52d19643525d0a";
+      sha512 = "6bb9b3f62140548a6e9c188aaccde4265b6c81d6b19c4bf5bc8fd9b38680ace5740e483af35da878290b5f8c14610a91ef0c041e6ad733350d99d85c47d0c250";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/it/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/it/firefox-61.0b9.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "a6567c4cd90f814c0f0abea87ed7991ede97713b1f7f9b01432b0ca53e0731d0598840688b8265bb0a019d7e65b42f89e9f43bce466732c90332e1ae28226848";
+      sha512 = "dd1f3336ef41030f78d3a2c246f677f0863c3b5fdda45bb439cb99f620afe66642d0cb436fa1472904e2abaffbb2e512fedc461ec615262a0899e236efede0a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ja/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ja/firefox-61.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "16cbc3adab6d19dafc7c52cf6149b2c544b998c37afa5edaccee1b0b5f5ba8cf9c94628be4927af777628bc6d22b58c10c29aa4125b9799891c0e381e9959f6c";
+      sha512 = "db4962a11da935032958e7387e27f178d78caa6903a992f6a014a213a3f6278ff961d746c32c074c4a6320f122bebdb5f48813534e570e2386a1fc52c74d6a6d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ka/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ka/firefox-61.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "b7d5716343ca3df107c103e1827805569b6d68ae4af6b9cba07069215dc77965344e0a280bdd969b108acd1e61a965aee04bdcf9a667bb8f1a2d60a216a8a883";
+      sha512 = "5cbb7e135aab4e36021f2323335368dcb6ed32e50304a69c74a3d6a88aaa1bb7c0dda646b141caf9d6a381a4fd260f46da638ac0df2487884ae8cd0bcb19d13f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kab/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kab/firefox-61.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "d7d92cc89a125ba51ff0971b5e1e4f3f75bf4a0f057a475889e1ebd32c698a189122f062af207b62d24d9bc88f2da92aee7e070b4fc1824fe48502ae3178c9f6";
+      sha512 = "ef84eb38c46ebbfa43e93bf26c0aab073fe22ac6abd7683de068ad22566f0f5ee1316bcc80a9a1c15215edba82c42eafcb7d5a0555ead5e03baa9c09b17558ed";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kk/firefox-61.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "10fe26d49f964163c4cf151cb1da1003a2babfd54607078bfae08a10c261ea6eebf58d7922a28b31e774aab5ff8dad9d3af7ebc6ac43a9a1c8bde89ea2b9c2f2";
+      sha512 = "e1c913e4bd51637e757162e453a7f9a5d452e4f1b656c5259bf4cf6e1a6680c5a5b8d065e692cc503f180eeaced7f08a0e14731b85077a45d46a62f89bd390cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/km/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/km/firefox-61.0b9.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "8e803bdc592ce0706e6bb074ac92853b5976823aa6d64e20f0bdf45b966c467ee2eaf658b3495310b03e1a5fdc2ea8cf68447dc367c0070ac804b1f2c8ce7aea";
+      sha512 = "0da0ae2a02b271667e58872b48cc1ea6c01d2778c31c38020fd120c6f32ff990627a529f178304af80efb5dedcaf9558a44f3f198b0e2b2a4c12129e6e278c3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/kn/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kn/firefox-61.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "7f835175b2575958ed9c9a72de322c89f8ae8964a39a454f18a106435b9a1c5873ce2eb411ff979736bd0cef36caa03f048bf7ab404613a7cbd58b4756794386";
+      sha512 = "ab937a1f08c0f0ba6b70ad29a9aeec0d61115ee15f57644cbd33cef4765a19820968b36b8618732ec9aec09111a4504a840d3d4df99728f44f04e6dbb100a71c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ko/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ko/firefox-61.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "822382bfb8f7efcb16252c19993b9b7b4527073fa0de80da80731876ffdabf76b2fff53bedf3ceac0b7970f74f5ced506f446f915967b6a39963a863f22d88b1";
+      sha512 = "20ce9c08906e2fbab91ff4ced398e5a956ebddd96e6128de79a4ec3370ac512322a9535605f9aa3c196d6f52fb55630550afd39a6c0e46d7adff2669e637ec53";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lij/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lij/firefox-61.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "42a5cddf78de17154dd5fe34f7ea6f9f840c4f26afb7787689aa49b1269758603a9b23e0382085e1ea8fa87b60cb4655037d1e5be8b9b4c314ac423bbf0f3f40";
+      sha512 = "9b213b2e8d1063a369b673e07040aa5bb53d1213a3725d9276534dab45e2d87707009bcbc5cbca7de7d321e5457c7e38e5c801d57c6d1a400a8b9441fa2d2b08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lt/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lt/firefox-61.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "f56c1144b7c5c45393278a20b7b59700e1e2a93ee3a998b4014733cbee9b2b9f46531a7400ee1da615e59027d7ab2da0767c53725f2dd95d6c9d1d59c7945466";
+      sha512 = "4c89b3ae40b27f07652ac580a4484b7b3fd50e69e3894677206feb45f13238066618eac22b17bf81616b9a0fd004d023152ee5e028bcd31e72214a361d36c639";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/lv/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lv/firefox-61.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "8498765c639c1a6fd01b8f76e35887cf139125bab3608cfcc88b6be7bc731e10b2908def1e6a63c7b7d6ae9f23006047abdbc0cd593e739de0a689a369881ada";
+      sha512 = "ff23b317791f8782c2aa267a5a6a1fedf8a10c5774263e4a6c8059d649e0b3e52972b33778d092e99712aa777e4a03679dbc4d350fd753c3e2b963655f36d5fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mai/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mai/firefox-61.0b9.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "59ad5f1705e39992108656d1e5522bfb7b2a61336cddbfbcf3120c95703901b5bf613a213d9694523b196fd436995b1be13affd431f2a3b5df4bb6a001d09496";
+      sha512 = "6205561e9b7badbb308649b2caa9bf610cc71dea0cf8c02322b682839c8279fd3708768f62970a6efdda6d0f2d2a6f72960f1ee86a174760c1ec235d7b30dcbd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mk/firefox-61.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "72bcaea40129d248218f944591242e08f74cc714d8686cf668ff2e96028a3ce0e462f73fa8fd48c35fbc7aaeef74df201b4e134e6d8b8fde3f46abdc8f10870b";
+      sha512 = "a74f1e49bdd1b7c0bc29a9023571149859ec145bf0a12bf49aac45f2e381689f49370f5e02a3777334f3470bc439e6b962c49e5bb05092cd3c817adc9a8e890a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ml/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ml/firefox-61.0b9.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "2bb457ce772fc6a6dae8cb6b6f41ab0fc19a495e9e253ae1ddc55eb00485020242462f1155d5c250a3d73451081ce55fc84c0c625cd1b2d8a71d3d0555940ebf";
+      sha512 = "5ca453fa3c321a9503088bfe01824e3b3c287a90fc48c792cd0658e9723f982888847cbccea423c1b9fc1ed77caf703141a4dd0c697a30d0ae1e5f8d8d8c547c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/mr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mr/firefox-61.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "bdc9163085983105a712580df72ec7340afe410a49e4087f73483b5d8d78abe41a92c5be3e776e743405806dfbcdc1c023ad096102df566c73dc345c5ddb8252";
+      sha512 = "f3a5109dba2f2c4516d689a17ce19faa7385f5bac96fb0b9f72fdbdde0626df701fc821a1defab8326db93af7baf9edab594992a9b2d05eceeb4b1176098b557";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ms/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ms/firefox-61.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "f2d178abe8845ec27d3a36e963abf9a3f9206ae20fb29c8538851025f4bd7aa45790e3752b319fd8aa35a5c37174bbfd86212fd37297172c86b3d92434d2f3a4";
+      sha512 = "d2bb114188c11fda8e3ed59454cb623f8883328fd83705d21fc74dc344f41582880f1a231aeb941d32bd1b3ee1f6694532f9da82944be56e2898e6e750e48da6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/my/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/my/firefox-61.0b9.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "127b8855d8b1609cfac6ed3591a211bbc0eca6020b019b97eab3ec643caa7e120e052537c5395beeeba0250e5b3e390487bce3537d3f85367b5be80d49478618";
+      sha512 = "bd71fc5dc34c76bb99a2da062e987666fec47be8f883065ca456e3bb888eadb747648571c0012d924574c60acd5bec7c8443890687309cc2885de09d2f695ee0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nb-NO/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nb-NO/firefox-61.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "2d34166f962aed767f45734a86fd976390fba2bdc389c72911011ef73abd5ad74e2f83a50bcba9b4f80bd39e28012d67668112c4bc18d861fa9c2ee00181458a";
+      sha512 = "0991d3ee984d0e8f265a0b8092f75d4f87b03b7b0b29bf87706373d130adc827bb5511006b4e708fe06cb7ca83de27cee5c55166eb8ef2f01b02e343e1e6785e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ne-NP/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ne-NP/firefox-61.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "55126af093594fcecdfe5354cff608837685f9297b8c33e3de712cccbc33553bce2d91218c93e4e4d3ee21d0d3cfb5ea9272191d0227a8350afbf8a18b6bc53f";
+      sha512 = "5a600d7f0b48c6a6a96bb346d64a8df9d5737e81215420fc221526ec66d18ede9a32471244fd226398bab08c4d722ebb154021ae13594133c34048d7e0a2eaf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nl/firefox-61.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "c582ba4fda0f40129ef0f793259c5f871e8b3d6317c688c2ef867161cfff4ebb1e276a7cf135282382152711bc7c9c8cf9acae07ccff50789830d5469a08309f";
+      sha512 = "27e53c68f58fc3a16e4ab7e56bf0ca9df84beec10a2b037c9ee6a70b7a426c45fe3afa84d42d0346a384f7c8587f9d3269a70403d5babeb59d300ccf6703d423";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/nn-NO/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nn-NO/firefox-61.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "9eb9f55d905507d555f2e3cb753fbcd0583d93789c07bfee538ae52512799b0aa18f5b284fe8a4f7d84c882ee43fa2a6e5d447b5b102ea0f3772ef09b8573655";
+      sha512 = "3d1525c74bb1a841a300f55e382732383db62907e76bffc7dc25a1c4f9b6abfda3831f2a6fe8edd143a41059a0cf3810f9b0f07a36ef45d2ed3225155893ce51";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/oc/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/oc/firefox-61.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "b1c00a0ba38f3d26c165867dabd8723b97ddb73be5f53729aede0566d6bfe4a48ecc213746bdbf5fb724477f2f901763dc62943f2511324951c863e0bb4e1c8e";
+      sha512 = "769ed67982c898de539ab8cc45e45ad0877fbebcb9254ff00ce90eb2dac2e886d3d9b3724ad9b696e57a0fd3911e52e8e379c5c46bb8de7a41ddeaaf6a207237";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/or/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/or/firefox-61.0b9.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "d55738efb93450f609e9e82fe742972680cc553e02d1407eab00641fdc9f5d06f32c7d540d3da5a2d6c6fafd5fff09b4e67bd90f2d3a9a1db3662f5c8ec0ec9f";
+      sha512 = "575de9b7df4c1dcc720628508393888beba930466a582651cc8cb5faafe63ddf813fb387763590270e81eb7a31bd78229ae311365f42f42823073bee9d35714c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pa-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pa-IN/firefox-61.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "18bfa2d588633337778020444bd1fc64b3ec2ee062377b6090bbce3346c85d3ea3b5b254f8597e700fa34a1ac5461ea13fc37c186704dc1e0ef4451d69aa016b";
+      sha512 = "f886074ac57d1cd92bd0bd02bec7f33f9044d874bcd740b7d1d46980744e744201cac4585307844f700e3f0ac7aca8809c3c8e68ce19b0ce4d1d81912e3d7c18";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pl/firefox-61.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "29d48be03fc6221af7a75e83b8faccbf4e19afd38d67b046cccf9ada6044196ca54ec24a6d43f71e8bda505c1b618340c403906d4d44a39af109e8169e597b7a";
+      sha512 = "c7a95edd18e5b2f88c1228950ae311ae90f303e0cb18eac856418a9714da20458936194a26b92f4d3862af12dbcaf9a2452f4ee360d2c4223c088c4be9f25bd2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pt-BR/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pt-BR/firefox-61.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "7c1576e9c74f576261795fbf6c3e0269f99aad933f8341344b4c2d964a1e031a399c106052669d2b7e06ccbccbd0e5949e793811a99cff719b43033270671dae";
+      sha512 = "f359a63f34e63f4727d0792664dca1ce69c0a2bde9b0201d1894589a0db2f8a99126aab553c8ecd1578bb05b8422820f27cb9fa6919ac09791056691a35410e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/pt-PT/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pt-PT/firefox-61.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "2e33669d871d4f8e1414788a616ad640858305c8b44c51719cb31f625572adc04b749ac9e1a783366bae9e89b0411ae10648cd63c552f18037fa9f69229b6861";
+      sha512 = "1d64be7fee2f41c88d082761c6f65b57f299061f3e3eb6db2d8b524b7f2c4bb8ab8632cc2ed611faacb5ab2a47cc96ada67fce7acbf332ceba105538a849e942";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/rm/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/rm/firefox-61.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "0d68ba0fbcbd3785afe30796a2b616e4205e9890b5df601153043ce985ee09a38a6d7de25e2d8fda2862f5ce4cff38c035c1ffb559c0867810813116c6483a56";
+      sha512 = "a493559f9a276a388a01316b123d3861a73ba677805b16c2984437e42aa7399d821c13c678d9c23fd4939c9b97687273514d454c679820db3279ec5f74aa811f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ro/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ro/firefox-61.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "9d97a5d100e67356e978f88e1a2f3a2c6e7172d7152505a34dc45a0fb270d1a3b63952ee5a434fffb4a5fc3dae524316a749a3a89222b8bc368fa95231c2e13c";
+      sha512 = "06f443ea5ff57033ffef5092d5e47adb0213db21ceea8c5b08aff9c140c0a6d9b8d9c590dc5e36d9084eac3a7de26c5754f09e0b41dd3773cedea4f212e762a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ru/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ru/firefox-61.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "6305d3fa7dc7b04e812eea49e29f4a3a740727439d3deaf6c10dd5b43a1e68a60b10a5386217d2f9b0f79554901fbfc047aa5c10a940f94c1939d9da6479dea7";
+      sha512 = "34b50bb908ba61cb54fb99ba3a02447caabbc463c2093edebfae8c555712ca2dd921bb64960a782b6b83673e6756004f84836022b319513ddec6344442703ec3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/si/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/si/firefox-61.0b9.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "fd1201e1b8fc35c3785186739802f4336d808b00ec96cc31286b9842cc8337dd1066496efb4a053ca2f26fdb1af5386d294eb3ad0b90156b26f79b81eebc8077";
+      sha512 = "3fa9e1c43af9b7e290a936fd63d8cc552b1bcf92e0daa000f177ba729b850c43a315883fd66417b5de00f14b16d73ab4cb9060e263125ebbcc7d6a6011c7b4d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sk/firefox-61.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "c11733ce21827136ff9fa16ef616230bad5774184059d4c451113a552c4106a55de1b8abc7befd918033015f6b6721fc689710fc3d35c525cd4b8617ffb79b57";
+      sha512 = "55f1ea454d4cfa5d9c53f8724ca96256694805cb11c1ad2c7f87b70e91cf506c0aedb91346b29fa853df63c637c89fdf600422ca92f54fef4e9e9792d350b018";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sl/firefox-61.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "28a15c0d983644f8c550830bc0db26441150194a2a7466fc1967a61cf92034572c9ac6160937ce900b6086be72695903aa74b15e8191ae755d0d7bfb8b1d4aad";
+      sha512 = "62adb09839258d0f1a08ec7a2c1fcf3a2d6a306d1cd3caf383d9ad281d43beece215587de3bd71ced2bb18c3e9362c1b8855f60aaae556c4f73b5bfd6dac1015";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/son/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/son/firefox-61.0b9.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "7ceafb0b351ded8298213b7ae6de0c2bc5a82115976c4560db3da334c9d4c4c8409d44cd75a1fa2fc1c0c9af6cacd2e2fdf0b918564b1bbecbea4363b825a6e9";
+      sha512 = "07fcdc1c3d39339ecdfaec8be13bc104ec1f081d54faa2811abfd0a568624c1ecc05d5375c12a419f975e3b75ec00397f7f5ba0bb0f0b4271e1a7304225c0f27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sq/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sq/firefox-61.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "3094667fefc2953514a7ffc4e5940dfaf9894071fde927be177017586a07c12e1e3e697c031e51ec0b72850991ed44522cbff8a24f753dcad956cf2fc827f32e";
+      sha512 = "38ca6d4bdd0a170202be79c3b0d501643f2dae9dee7e257609a915b444cb0a680628b6ee1c812e67e0aa656d3771b0194af64138f181cf618c3df70bc002f93b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sr/firefox-61.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "b579ffd5c27ecbaef7b313c504a6f127bdf9febb1f28caad00afd16898f4deacae63436226bedb79268d58232f1e16fd0c080e5983cf2005d4ed47888b325609";
+      sha512 = "1e77086a1c55571475227c0b4a76fccc99802abda94d30cc24c4a0ad36430c3fd5459719c0a06db64010d35413cc11342d6e8be364aca6d726040827d152ab59";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/sv-SE/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sv-SE/firefox-61.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "3febff89e22c35ce8e96f11922a0dcb75dc1407ad84f9526aef3ba5608416ccff02f9df98adec1bccdc94741384fdc9f05af3fb3a53cf4ccfafd0a0b3052f945";
+      sha512 = "9327d9408d0904123769e5001ff5c31e2187d0d198c29f39edd009d7f6b2d4f68f73a4026aec57bf9542f669c55ebd8748c58e30d8eed2e4df28eb0c07221340";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ta/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ta/firefox-61.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "d932580b6670bff7de09fe19ccb89092fd621507c557beabae28491bf1d0e6ed6fcee98746822be97c5d5887a75dc0e9a5d02777e5caa46009ffb8007e8dc93d";
+      sha512 = "eb81e72e10d123a6d301107213149ec2fccb522326baf726cc56fba0944143512b1984d747b256554e6d0d6c861483a6d2c53804556b4eeedbaac64fb65b42d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/te/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/te/firefox-61.0b9.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "cf722fcb15a6509f82c20b9bd3439b5e923e66f5b75da559079a0058f6cb985852cbfed8e390de098cffd39affc7ccb04f40071757e395c2ed648f89a77af504";
+      sha512 = "0ec83ed676ad164571c45242e4a8f06cdc68ca1069c449cfa3fad0dc799ec5439a8c7bdf68bd196486ab9bd3bb7d956dc179dd872d8165b229c222c1f34188b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/th/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/th/firefox-61.0b9.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "37be96d449f35b77c82e1d62b959613882e853dbcb38798b42edb85d19e4f59cd3cad04e0caffaa9c72651f2a92de32478eced2caeff23fab6ec891583f08ba4";
+      sha512 = "5bf46c9e5d0d409af159d59ee643303660c55cefc4a7ca91bfd21b9ce5f0dd09d531b15fdef9a5dc9649fed5ccab28610298523cb5c56362cfc6ba12e97f2b4a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/tr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/tr/firefox-61.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e9a9dd3313b18c0945fd55744463d6649e694572106bc0514535c8c7cd06a68aaac1752bd9ad4ca6e98b717e0bd756bc16c4bc538d8522649d312b8165b4022e";
+      sha512 = "e718aa0877c3561085ae4ea619fe902ef6eeb8e4db1c6f18b82f0811df6b80b14d9cd2241a6f551148d7d75899731d843ccc3e6de9cc6d769d327cfe8db9651f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/uk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/uk/firefox-61.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "f8c1c7339183daaae66d11c48e60d951c1fce800839926b3a4d9a7b4ab05b7731c0899a9fc1837ec806bd5e281a8d38f9d8757d12e746b330385a19542a13a11";
+      sha512 = "55eae1f05a00991678300c563ed44fe362eb41513b48b39d51607e7acf2a46fcbf9653161d9fbb1e82c5626f5069337536023418fecdffd058069711fafa8b4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/ur/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ur/firefox-61.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "847ab1bd49690cf0969fbaf24a8cc17f1b67c3d80b47beaaa0dfa6e658e910f8c511f41cd28bab58dbd966ab0b291a1a7d3635337f6be822bda33bf1a3af1ea8";
+      sha512 = "afea9f0143a8910028ea7751a6f06d116beacd576c3407cc57bc6d92d4ee3340fccf9801787f281d6bd04ffe75fba907e044ec179a2dd30bad58096285db6ffa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/uz/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/uz/firefox-61.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "8457e61ed1b18e1c6b0bfec1d7c8196c6d9c5e1984b50c0d94f9c6d7c03f16d70449e7c5110de9be82e9fd7995306c04a1aa9d0c58e55fff4145020bd1810520";
+      sha512 = "00e26875f2250fa32c3ff1b6082f998b1d66711dbe3c4d0407f88adece9140379025cd117f9798827e63ff4ec2456b146e0b1bfbc376522e469aa0f55ec96ad9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/vi/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/vi/firefox-61.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "9d3a2636000b053a962e612fe426bea88a20321b77be867a2747b5522f10ca8f4ab602c73525e22313f1d4bfbde269b8f6a11affe0bd4b7699b0ce8298621613";
+      sha512 = "859a5bb8928a4892aed82920f51ee2b5ec6a7bfc0a4f0e3a149f417393095fc49b3a5f9cd7c4eb9f1c33777f20f769698363d92e195d7f19cdab28b7444d90bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/xh/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/xh/firefox-61.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "f03514abfd9792785a7a1c75668ce61a6acf0ef500d837d84620c403668f5290d02c3ad5801d31f1868401e75a23c5ab795d2fc7ef54b94128dbfb83dc82dc7f";
+      sha512 = "d99ed33f72b671ab0a4833e25fa18071240491fa2e256f9748149e878fcca828d5e9c36e54abbd56f3bf92a190e1c4d81a7101e89a78c1b69525961a3184a207";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/zh-CN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/zh-CN/firefox-61.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "57e15b084dc80f4ff292b92a6aa96d7989e1b41401a02ca6c38330ff85740773a5155549766bebe16fd16f631c956d6ff2fa380d823cd56aa7b7dc11cc59159d";
+      sha512 = "c45bebd4526245e46d58031078add808ef38fcf301661fa754f40afccedfd727f19788accc098576f1757aed54652e1a88c4d868bc16644270bd8feecb086d7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b8/linux-i686/zh-TW/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/zh-TW/firefox-61.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "26dea2954edcdf98ae2c4607dd3504ee6e277e6aafb2d2e1026ebfce7730f19e1c3e620dd23078000414a68175c24ac456b4000cced258eb887f7f6c23e26874";
+      sha512 = "39301c26b62d60670396ee7e6f6d4c04c2372d345094b65d37ad280b3aeebc5a48b4b7773c6c6a285b137875b1ae8957e29266ae352f0de1068925c428fa4b32";
     }
     ];
 }

From 8f66cd075f591f98e503f5071d56e5d3532ebb35 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Tue, 29 May 2018 19:43:27 +0800
Subject: [PATCH 2760/3370] firefox-beta-bin: 61.0b8 -> 61.0b9

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 274724973615..13619aba30d3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b8";
+  version = "61.0b9";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ach/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ach/firefox-61.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "0c085d106276da11585c79f9d7e0b550e6b123cd9f032168c8606c6f370ffbc7d62b83981e39fd04b5a781467a762e8d720fec8fdfb3c64036444ee42b4fb3da";
+      sha512 = "54e9f255a3c7a03206774fd9a7a5ca159d87aaa87c2c4bb097372a32e468f623ccd3bf871022a2a2abbf048e878eb7de8ef6f4fefc5793cf687b7afd4f68325c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/af/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/af/firefox-61.0b9.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "5456f1267e1df0f0b3f21ef9d1bce16c0618d2acf50154f432dc52bb99e2d0c0d678406586bfc1ac0c4d7a2a3e3ee976da593ef7fdaa199470119d1d0f6822e2";
+      sha512 = "3b492abe56f91c88e43b4fda7e9a5ee804073e0416db3806f97593d928bf6988dd33c337e10fe1ebab5bdb3160d4a747d508be0531a0f86441515e1e8bfd1ffa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/an/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/an/firefox-61.0b9.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "27959567c69e8575194dd9d2a251b3dcbc019c8bbd2bfc79ee801621bfe5054fcdcfeb36ca7b6c5a0daa3bbd532f67638822f359ad59ac3e567a82907243ae05";
+      sha512 = "26304c889df459a7379dcf50ac29be7e1484e8b7cb9587dc9bc8fd83565f800c3813258d6e6f66926fa85ecd7363dca3c6e7e1418cdcb67577719cb72d2ecfb2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ar/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ar/firefox-61.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "35a941605d8bfe0c840a75da4edfa5e7e66ab857a2247cedee672e84ad16bb1b6ae77a8c5dbc3f29807069d6961d65c04f36b2190974777451870b8cdcefce7e";
+      sha512 = "c046459a9e0d2e6d486c60faff2cfd843d26b229263d8a908ee1db91a054bf4891bfd6bf4333de28d138dc5e55de886593a6a5ab0c1f0d3e88da4d67ca06892d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/as/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/as/firefox-61.0b9.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "c976f354a47fe41bdc99c9eff708e1af0f0a5398287e3140bc6e88e2d2c8ad52010323cd0ab0dd154820ab40af586895d1347fbbd23f1e3cb448fed496797979";
+      sha512 = "055673b62be410b9d456c61ae2db0c9959327cafe5ab75906c3be5d3ed2309988816f23d61d2c268ca0eaeeb367354201d9ca0f94adc94e273e8af96e0a94ce5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ast/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ast/firefox-61.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "4499cdfb34c177aec59e8e83bdea9f013b300c123109ad944bfb0a26c5f207e57fa76e90c8effb18ef9876dd87d7ce13df049b7bb6a8d56ed48e2fa47123a202";
+      sha512 = "abb3187d4fee2fe48ace82cc28a1dbd7a050977085d31ea7e429b069c805a011000ae0cd6995a729ceed84b92cc725a1d7df6e7f36ed284b71ea818ffcb4ffb0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/az/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/az/firefox-61.0b9.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "aeedf355f8e7d5676e424ffe444fc74ec92e51c2e8e331f16ae6dcbf62d1d91238f34ffce5ea8507fa5c888a688f13b2f3d1309a5790059909f370ad09f1d510";
+      sha512 = "1ef3ac146b59a364dcafe89a4024b53914f92453fc2ac9f01cd71dca1cade3062530b45ca1ee17c0b832433dd603b6c7faf8d971db5f19cbe62b7733a5ad4608";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/be/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/be/firefox-61.0b9.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "880f422cdf9873298ec8d580b51d3346a67f2940b3b5f93155a32742028f0d6954b2c8437e20e7fb96ec60361f2ec7693015790dae1b203f21658b6f95a00090";
+      sha512 = "8c7cf00731984eefd891dc31b3f7da88f8aa2bab110df3d45fd2622fc4cebeb51efc5c23849fd6f773cac0ce39bb442c627a3ac10657177e29311fa5f5e82d33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bg/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bg/firefox-61.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "84054bd55f558557f8b945d8b01098bbd33778c89d48617683bc27aeadc5068136607ea238272edac6c130b524faa9f920823c31136b979a05d2c46e0053df45";
+      sha512 = "e33245d7a8d169c9d15e70ed7951f96530e88df7648f022684ce8bb6c81f4e3fbe421480dafa8541a3adb5e6a76e01756165c435cb6d086837c834e318f773e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bn-BD/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bn-BD/firefox-61.0b9.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "f7a7dc51878b451438854a512ca2fbefc21f637c0ded711d6dd5cefc92958eb4d7ea558fc67281ab04f79aae86d749442467059b2c7537672601eb2e4f6233b9";
+      sha512 = "77da98a1bab406a5b5c71d83fc7a31bf5c18901f8977af4831a09bf09ec6d549d829e1ca5e01982c704229e53d0b10cc99449bd76b138ea3a4d8f89e5593a955";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bn-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bn-IN/firefox-61.0b9.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "734702d1c790f08bbb5f60175649be24f180d58514f1f2872d8ebb47143cf9f5318232d5badce3025fcacbbde98ce28dd20581b0f69dbc1fd0e8cab61ccb9e25";
+      sha512 = "230413831fb4a3c9ac7a66c5201398ed90ff0e6f32479cea646c397cd901c0f4542b465aabd4cf4541d0a2af1734e42c054114c7ca1cf131be3aad6fa7915e49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/br/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/br/firefox-61.0b9.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "ac1739f1c762257a7912d87e62c9115736a4c5cac9ed1abe7ebf9615f961f757e34a6cb750cb0cd902e7fccf115db669c9d3cbb59ba51c9d2f4662abb587aa36";
+      sha512 = "29d83c329e73f5d85863da3b5ca54d5f90e2b83a8e500eaca16370c8ca0b848a721e7b92c6d335e4a8f3acbf5f38e1ee4470d2042f3a9f04cdd30fca48c1ebbf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/bs/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bs/firefox-61.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "aff34d6b9706d1a6fb836263d45438afef1213d82444e349aab9c2b19af869c0752a9ad4082b34ccf3d34d682837e49c2629a7c350fe2a4c896ff9640aa53330";
+      sha512 = "0277de6ef5ba15d6ee9c31e6512837338c5715d35dc9741190a876e8c853e85e82724b9a533a22fcfea57e6083a2ae6cda5026e8036ac9eaf0992294aa4bc609";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ca/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ca/firefox-61.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "2ca6337337c1d6fa12fbbca58a2e544f1287f23dc31dd8c5797b0438df8eba7a8d6f7a3decb88655d0959bb928222996ea13243680e985924452524b64eb390e";
+      sha512 = "b8bd25c0470ef22b9127614f56dd9b25c823f0f542772333d02874aed80a16186ec501aaffd72b6786eb03f8ae24e477ed0439851ef45ac301827b11561c3c5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cak/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cak/firefox-61.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "1ad83c3d20214c2b2bd59765c42404dd62b56b85b1ecd527ca524ec54bd2f9a65de5fdebe1c664bf1f19df01fe231d337fc0c74d3494add5cbdc3f3718ac2bef";
+      sha512 = "97df63b6f4fb78320bb7821ac6459528ff765b08c9c93b2704f50cb9437663be7c01a31c98ac26d15416c5836c4d36b31de6d94575f96e160137da3850853128";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cs/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cs/firefox-61.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "9ab80378bc5560daed5716fecdd8e10c0678b162cbddde2e4dcfc4989ede99268ce1398ec180f1643d6602e1fb89f9c15d3f8e48544b24fdebabfb5c517a5089";
+      sha512 = "25c0befa4481726efc87b766c3b647c21baa2cc2f8a969ca1af2cbe250032ec9cf86af8c13f1a9a6110ce86146ba5cc586e5fcc284b3059f6409cd0e75b0dde5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/cy/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cy/firefox-61.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "d653267e7513e3703da0d884e0e91e8412dddb7d0d45f6c1f3e4113b394148b61dc3ec6f58b41f94af72fc17929d0138cfba3c3e57530b5fb68eac1177ca3b8a";
+      sha512 = "3dc4f1f3d5ac4e393f832f6d65747e1b8fb6324153b87d20fc79b44076686c2fe2f7c3846cd10efef6a996518edff7866ed36ef54150b0fe9b24644b30e37dfe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/da/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/da/firefox-61.0b9.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b4731869c79652472112d61933a47c4323957bc4da77088c1ebe27cebf6b0470e5827244f4142598fed1d81d3b9ff8421c7ef2b76652172da4630c8548972b2c";
+      sha512 = "47c2fbf47d9ad269832e49778d47b623bb910d55954190275d2bed1f2f0101aab31c782f4624b5eff7ebaba165d243af55d798835ff9bb11a62e13c93fec53ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/de/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/de/firefox-61.0b9.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "9f5129c3475790d658eddfa0e5d3369823a6c47226903aac365fea3bb8578381ef883404e7db4615bcf655c2adda99c8dde6a64254448b4592e18ba41cf9ecfc";
+      sha512 = "857d22d48c8798454b374543ec0d5a28c7befe4e159f75394e9eddefcdf679e5628d56d65c3f473f8da362a8df4e314285de3540fa65344af1f290bf92d8c78a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/dsb/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/dsb/firefox-61.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "78cdc95f22cf2a52a2e81012d067a74fcd252dadfb8c9f3859e7a392ced75b8dedbdb649bce9c67c5e7751bb663c1e1bc2d857d0eb481c73855e8f54beb7ae9f";
+      sha512 = "bf57cb64d6f4304b4387ef6793fe0326a1598843a28ba7b319ca90c759b3335aa80d2bab6c38d2388a567aa10121f68b3fbc807c025218bfe991bfe0e7ac3b5f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/el/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/el/firefox-61.0b9.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "18828e03a5fb079b45c9fe5890924577f33c2557805dc362986528556f4c0480a52d0c7f455b61ba9b5ccc486b6174936cdf230fdc78c7d22cddb5b56cc22d45";
+      sha512 = "4ec0167050257963f41b69e79a8ffbd5e2c4daa6f05bb9629c4c86e34b37825d4736af371d00da3aeeae5bc935a496cf9413aa06ecc56866cd76520026a8dbff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-GB/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-GB/firefox-61.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "59b1ba40e32ee20d28ee2a2beccefc766d3b75f422ef991b9e9a0039b54ae15ab3280ae14dca42411096f994adcdc2c782a2615e97f78fd21802d9788bd5d8a7";
+      sha512 = "0119050c48451ea8b4e83a79d75a0244d1498369f5ea940bcc9213b8e045f4f2bdf8265924c6929aea090dc5e452acd12b8ac64285208c37bffaab2ee0d6803e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-US/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-US/firefox-61.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "7261958538ea05d603270279a21c3685f0defe98e8308b9dd7dceb9780b5ec5720e3c7e5d492e309aeca3fded09c802d79ab1c043a052196b77e91453e95c2d7";
+      sha512 = "40702554f1baa31ca75c5411388f39f5d073d16670bffc10f68674c0f49ebc13832922ba35bcd43c2de96c19ee48901942205abb4083112b3c7d654a36c2f631";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/en-ZA/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-ZA/firefox-61.0b9.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "2e9604186cd227532ccc9b10fa12632c59f9f5607227ef56768495c350a169ebef34dcc4606c2fa602a0f403a556c56bd0bafdb9b0af1bdfd8c63ba190a6c094";
+      sha512 = "df4af3bf6c246314b3eca57f7e30ccf1981fc7cca95a32612934aa0a7f5391c3c5627238331a83c37500d6fc9311e397aab5ac6beaae8758bcc22d8dd16f0eda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/eo/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/eo/firefox-61.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "47fb5fc1325d30d4715fa0d9b238740bd47d2ba8e325ca481de3085c0e7952fb64bf95d1b2f0aecf774331bcb7e3f254d42daa80fca6271aa5a077e7434494bb";
+      sha512 = "053e570e858aeb0eb059a377698120d6e670be4e0f531cf86dd86490f931c0d03eba4d95763ffd88d6aab916f6d4ac2393596ee08f681f435ce1b4547c2ab7a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-AR/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-AR/firefox-61.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "8c66bf866c0be623310ff56f3fdab94427567a02144d961e306b263948592924b245ffebfce7784887bc54052eb3c36bc0653f9897e1bd01c028b6f23fa4275e";
+      sha512 = "d918d1b1e35e206e409991e1eb754952b49e741b01bea5f83b61ee1a345b90af42e0965f2e5919403c25be7141c752498ca388985b4c897c850a0667f8ab45b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-CL/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-CL/firefox-61.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "9bc881ceb00d1cbabdc3507a8efafa8a8d74a1b5bfe09c77541ada456453b7c9aad73b91ef8df2fb74b8cf353905ab6f8f63d2cd448edc68be701c4c2530c620";
+      sha512 = "43ea381fab19c998d1eb5544811e81504237731b2032a8ed84925eaafa253df7ac4b0a0543c4cffd7b072ea0ed0c0a26d75dbee997c4613863f0bafb39e78bf7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-ES/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-ES/firefox-61.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "48c268f3cf16a483231072636eca7937d4cbb48d5bf0abace574bd933bbbde218af48a4fc76892f696c222075e2754971ba8ddfcfebd1920cef5f1b0343b7d19";
+      sha512 = "a9a246c5e7f4559fb96c92d3f4384dffd8656218c582988da984a7c081c2cd741dd1cd5c384f96d846e39216bcace099453122006b4508a25013716a4ed356a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/es-MX/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-MX/firefox-61.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "4cf2729e02c988dc34a467ca1db2a845845fba7ea9d8c37f0807259de9640b373926caf9870730f083b836b06b9a11615ada7764a2b9a1d52723e05dd8750423";
+      sha512 = "373f2d8cfdeb77c2da3c88420d7eb9dfd2f41dde0408c0d9c69676114bf109f4c7271eeef3e21f030e192332fe26a0fa9daf4d9e3366fbc85e2626d1d32cfc07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/et/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/et/firefox-61.0b9.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "8eb43956bd466c408ddd844d8ad2f11a57f1bfc2f2bf1a5564a390fa424a8836d32ba35826244ee51be8e01d9570729add972d7bfeaa65ce20c8956e075c7376";
+      sha512 = "68d8cd59cf761e2bd5e6857d9d39edac254772d522b5e3103a83a0f133e903c3dbfaa518c8fba310b318b96452a3e4376ce07336b7f5c43b595bd4fe1b4e5f97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/eu/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/eu/firefox-61.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "488decff8a3bf071b0cb4f398fe233f9401c69c256012d37a89f9496a867de54879c6ee56980af2a35fb478c94a708ced09dcd789218f01d37cb4312f5c16bf9";
+      sha512 = "ec9278b7c2ae3c1093677fd38b05377bfa19a01f7b9d45fe6d9bcaec399ed015facd53634649561047f4723d8cdac458d9c73cac345569bb31837fe30c316bf3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fa/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fa/firefox-61.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "6eedcfa103949184b95c84aca5692d094691a7f6f78047a49db59e71ccec070b8f04fa7276cfe36dbe6ab98db6ba5fa7efb6b3b6b9dc8629a31b4ae67f0eed10";
+      sha512 = "543f75d7b7fa724f18a0ab20d158ba14f1200531f9582e54609573d104d57549c40c1805dad4ccf764b0a924984fe0226677089a1191c77e3c03ea3220989382";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ff/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ff/firefox-61.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "8813bad6fc28a12fc5ec4d95af682654638015f166d8beb22eb276ce1457a80df65ed222224174cebd03c7aef1004b989c58969ed8065a979f16d307ff38be9d";
+      sha512 = "f353aa0fe010a0897592d1611c7b3327915b78b8eaa0bead1a14d9b305f49e1d91b8fd5a124e723d494f591186fdadda76ba93852dbbb66be7942a078f537138";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fi/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fi/firefox-61.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "094f738031e1a2aa0fd0bffbbc19387a02a5c2ff317cf2229015255ddce05650919c877c1d249a8d35d2c1c9d4944c11c12015161442ff90dbe86d298a0db0b4";
+      sha512 = "10dfa66ef00d961fe2558995421424bda7a22b5a97342724e33de1bba8d2f6e5d8646ce953fb7f6a338870df5aad2642faa2fada481c49f0aeaede3be9813ad3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fr/firefox-61.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b52ad471a82f69d2d08f952664d95207f362beb6dff3d910d52b30d287cf14a5599e80604a8fc3f12fedef5af2ab1afb6d0bc3e2a673eac2764674b6e5f17d71";
+      sha512 = "2bc74014bcd3163aa5d59ec400ab57212e168992240372d06cdf6d1e3f620e183cfeb23a28a41f61246ae172b24a8fe69eb699b312975f7cb8e1ce490e4ec336";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/fy-NL/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fy-NL/firefox-61.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "3b951c0a7b39e6125b272a0fb87e5ff8b4368cd80f32b4eedb9e084fe9b7390559418d7d1954d64bf47c04e3ab5736479f93c75187b59f17105e295074992968";
+      sha512 = "b3c49a5407b714dc83ea34a669fa7487f25d4b810026d32540ed7a59e76d460d97f2fe282528d634887fec9ec15481bd5b47aabebe62d3d7b4fc70868a37d525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ga-IE/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ga-IE/firefox-61.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "1cd31e0129789c77346c7543b54315dfbae370c8f7e3fe1e7e6a02cdc5ad9331d00b4023d724ea884ea03a8476c0821615ae8dc107e083cd6a779ea2598bac21";
+      sha512 = "aa97023bce92cb2dd450d6a65ba09d36af49870eab6c2823a4221cbdc5590f1a535e759867a1777c0f5f8d540f6be8fab7a1c814d55d3fd0670547c2ddd5e876";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gd/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gd/firefox-61.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "e008618f2dfdb82cac31f4ec81a18ffb0596de383dc3173c0741f3e9c47ca36a8c14682d66b18421ee0b3e5672f96d23b829f5caa0ad82722915cbf4e47812ef";
+      sha512 = "202319e8cd0fb328bbc1af9aab327b608853ccb516d59ca2af45723b13da707a458eacedf538e64acce94676db6e4a588d40bb50b9cd8e1bf5d732e92c1823e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gl/firefox-61.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "95aa7da68db55d59fb30052efa9bf97dad57f30ce4898d643e24235bb30c86cb73895554c445e59d54d4071ca3c2dad1f1082c3609fe9971e3f417c4f7d8865b";
+      sha512 = "f765645de5ced254fc74d637b1d7edf0b110d70f894375b4c698e31241fb4ee61400a63a2a64c3688df4b10ada76616170dcdb969c7e26e77997353f7cf0ca05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gn/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gn/firefox-61.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "dbec91471737e08dbba93010a8779963e4cc2d14061d3a571042e88527c0b05933404267ccd7fcf05bd3a3916401013ee2458e2c6daf133578dff5f9184843fe";
+      sha512 = "e46f4c2ca5e1f6198e3bd5c6a5d304df69282fd95e9a4ac06df462e6263b2cec3e9dc1b07d43a583f3a14b3a678cd99cd1cca3a8575f41b2670bf6f9bdb21d32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/gu-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gu-IN/firefox-61.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "6a883a7edb63ae866f09ec6b40297c3c688b5f3df42ca7f30064cbacde4a427fb981bd2e17f7b82c34221daecf782eaa231dfb11c731dbae08f0b343457bd6d1";
+      sha512 = "9fe5708fd788aed90b59c0b7cdbb73e9ee8f805199a4ff06c737602a234af6bfba3d5542a625a3b044866c598c1b771f258b980675a06b3393afa5e1e88d422e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/he/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/he/firefox-61.0b9.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "3d7fe4f97970f91dc723d9d8086fd5d402b8776d6d0e45d8f6c5f3feec868491bac64573c678ecbc35d2b0f367a1fc62c0a6a2ebe264abafcca8919e545d7d1d";
+      sha512 = "7b3ec2007304097be1682f5ffca4972e533d8d93225639375521bccc996e1416ae844b4b5f26969f14c1d880ca369d399a4b1d6c1dfd9d9f549c583e01d3a5b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hi-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hi-IN/firefox-61.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "dcb2465cc2524a309e1afba7e55ac78effe814b1fd1dc927b7c6518f2806b1fa9686abf2a5b98843bdf1716ae7bd399f04cf4527cd2c8fb2aacd06e7744dfa2e";
+      sha512 = "12187fa3ebc6c45ec1ddf9d2320cc434d0ff7ac4c49a080d204a466211fcc65106117a635b771c5171b509292302930e6d3da87c83888e38c099c4a6823a1c29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hr/firefox-61.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "dccd06533eda2513033ffac6f53f0469b1c23950270018f27fb15cf57ddc02804947ad74dec3e60dd1a59e81340fbe1318de70fe2ba8f15299a5905e361d7bc7";
+      sha512 = "2aafef00064448b5e3f884a956aa90298869c1dcf25b58746e7568fd3cc49e1229d84baf9972395a3b7202e8e82c44629a67774f02b985516a88d66f53beb320";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hsb/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hsb/firefox-61.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "1f46d42600c46c5f38dcacc2915f475d9183911355ccd0074068cc1d5ea4b1c1c588f6852f0ab5af67d71d4f539c1a5eafd949b6675761e972566cddb16bb712";
+      sha512 = "970c8cb83e625976c355c7f773037974aa0fdf25560b1004d1e03a81866cac5cdaa0ac80f40d318aabb7a89bf921b03eb68ae9905c61ef7a7bf1db5cba8e2d42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hu/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hu/firefox-61.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "73ebb472d1517b4eaad59108fa0762b887fe8a4771c58f906979673e4c942d57b8ba3fc7cdcd9e9cc5175d015fe48e57223120d99c581e51351a5abf97f34201";
+      sha512 = "d93448919741035a1d988895efadfabfa41a2a06f91ea6728dc7e952607a65bb3038380e007c2b6f1f2e3c67daabfe16325929d81d315aa48ddee51238895a7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/hy-AM/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hy-AM/firefox-61.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "d0ddd9665a72c2fa481de49806880bf5bb17ae468febaa849b7a578175da5014c96eb30b7db5e04d99b52e04d28381ab88aa38cd76d4260fbaf2ac447a84e9af";
+      sha512 = "1c66b62a0ec38a66dfefd29a92b29c065b089eda9cefd06ece92de0502bf4d80e86655bf3453f4d28828dc4d2fb03996100da5f6da31892ba62eb55be59675e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ia/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ia/firefox-61.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "2a0be3c049418b0b4925a5bcfe885c97c59c3e6868e1ce92b0e4183fd2c23265e78645dc07e6defe34b7082b65cf2a57c3bbe176a0297fe5c8d6b5de7554d38d";
+      sha512 = "44abb1074d87ddbc4ae414e9a2ef744ffa7e2c1ccee9ddf7f55f8f4602cdfd88c0f634b277087aed0643b40f0f87307d8ba06c374b49cf7e24151dace7d4a31f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/id/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/id/firefox-61.0b9.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "fc7906c47e04f23e8e6591cfadafbd031564ef2538abe021092668caa1b61f02c0769e983e18ef4ea6afcd7ab5943b12010120807eaa625a9b73c27800ffe9d5";
+      sha512 = "49b055c1a0561ec26ee81005f9cc8f95e7375e5e2b6354febc78f64b9272e7d999d3dcd4777a01f7d37fcdf24cee92dd4d9564d864d8af0910cfc327970a3977";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/is/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/is/firefox-61.0b9.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "09f62453b0ad6895bf79444d0963185a88c8e0a2374ca4800875bb78b44e45046542fe68e117a7ff8ef013577635613cd7f2d0b414b9dc6fc2cd98e1d27eeac5";
+      sha512 = "c5ae438e2a2523fcf446da39301954d61d9099ff9373b3665682dfd6eee02859c6d228138c89315e8bfb9a41b92001a218df079fa916f07fe034c4591cb32954";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/it/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/it/firefox-61.0b9.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "2fe90fa1b29724e1a0b36688d4ba705cbff7cdadeb6073c07804555c0c5269a6990312723c66d0f6a54ad343fcb1d672bd2215217d28ee485f20370d199a5a6d";
+      sha512 = "ca0e426078cf44cc90f3f5bb696de77d36565020442324d89cd6acf09405b36b088f33b4de7ad7ab2d9be9d88acaf16059c75fc8ffe7745f275e021b4b34575a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ja/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ja/firefox-61.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "8e0cca6ea3877030ac8a1de847e3a5fa4a0a53e9e8f75d6b9b3594864e7268b30331af23a06810da9de871499e3402e254685f6d36dc6b0d7e132b8760e112fc";
+      sha512 = "b47b6edacd8e7f2f9bf05632aa7cd6ced932bc3399587244d7e806dce77d04d3d7cbe9c31cdea31d40df8a10c9b284a6bbdd246a4bdf31e12aff4d8bf021ae24";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ka/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ka/firefox-61.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "a901959e1097bb154febfbd29376e6fc1084b309bd32b189ddc257dd57cde4b8398746b8de63e6863f8bf93e0d3f1681269c34feab458fbc51394c8accde1d92";
+      sha512 = "2711d46506ed9438ff0528e113de3c1cb10d1bbc0a9042e9b0fce67feb37de484275ebe6c6999a07a9a77b3b5edf1bfae9100d24db4fc2a35f90a61f6a99aedb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kab/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kab/firefox-61.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "47212bd4e81e30e2df047317a678980ebb186c7e50f7159fbe354fe87fa62c182c390dfe87f8a5090201c685b72146fc249648652f9a0dceb073cd2b5a192ff6";
+      sha512 = "874d0a6991d243b369a0d2b4619ede4d9f14d825944faad22fa997a39466182349d4455180e425d32db87dfbe33f7d584c9c7bf49fa9d71a76a6ff5df7552952";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kk/firefox-61.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "63b06a097bb243585752e24f3ce02f41f6bf09c379d1b6f2bc9198058f636a66f62090ffbccab82ddc0a8939bf4f59f92f212119945ad65cfac0bb12a0c670b4";
+      sha512 = "09a0a3f8080694decb259619a421d5ba566ef5f002fb24e4c4bfbcb82eb8f697b5b86be4fb35c3f88d269cf178f8b15efdd93f693d65c07ce12d7ee3df98e4da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/km/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/km/firefox-61.0b9.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "f8033a972e9771f30d5dfc1cc175d76982abffe5fb1e16641853053f1955b0a4f1cea15fbd0125e1481eba89a51699d6b416d36b633d78479d7ccba9e7b28991";
+      sha512 = "0dd4932a1dd9b973234f5b0d723a98dcaf50f9cf5cd957a4782b427b382cedd7a4bd19fb1622dcedfe71f6ee5d60ccca71650fcb756de3cba5aa67e773e73ea6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/kn/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kn/firefox-61.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "b541f15fb8727ae25af2fb920c0f364e2fa90a0da093d3551b1953c54db9044af77639fb9ae9c395751bf9ae0ae0162e73a7b263e59e11b2e2208ee2926d7cde";
+      sha512 = "5e47e7d5b729186a23c4d7f8a097a16f079b6996e05fde2d19aa0537c9713f08aa34350ed0aa75159c3cf5aa4aaf855b5f5ad6609f5b9f14153b23033bc940bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ko/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ko/firefox-61.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "84e16300f91ec5c5f8ef6e15e51efa3a014e2df1c7e41b20bc90ed614677dd0b6a81d4547878a596de192cb7171d063c939ba0e282b00a4b2c6e107da844c242";
+      sha512 = "8dc20d9f5db63f641f83404d807d3b4284b8a242618a22af6f33d79f9e736ee67886fa2d9e8efe6eb2186e5b6ed5212d3180c247b132e02b91eb25f07006c37c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lij/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lij/firefox-61.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "889203c5c99c25a48e967d3837aea42a0cb37197fe4877643064f8a8a0cb2ba0a96e15778c8f451e3385f8d10a8cac01b7c14ba40fa7cf504f8edb0d2d66c97c";
+      sha512 = "ea876f0cc7c7c9dc4afc7035af098fb9bbc429d89349f7b5e12782159622820e8bd82935fba81a1da8cae3e4a38bba1717d70d671b2501a24fae248d7d1fff79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lt/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lt/firefox-61.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "987363db23dcb9649e825fc4c9193580da77f9464df45736a01e2cb45caf062da88366efa7d7cc907383d405db1ea92472406346d430e0bf587c82284c188d18";
+      sha512 = "ec438f7a85d8730a9c9e11e0c310eecb7ac14c52ad3edb43fadd13083d8cd182bdb77e1b847e585f126167fec4d087563b736cf5300ef297fad171b36e8c3bc5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/lv/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lv/firefox-61.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "9ab22f8d232e7eef9a6499139537e7047a71d1e8dfa801fff5d602be5b73a8463cf2bb5320ae557ad7163b2c69782070cd20222b18ded554861315ae247d90da";
+      sha512 = "65664dbf460447d24bdd7e54af5c05a9768b71d5de160273173939f0cb170bc0aa543f6886a6c45d7f0bf716844f21ab5f1c84a554aef5e2cca2a060a9379fba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mai/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mai/firefox-61.0b9.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "f5712112048d0dd7dac8ed33e66b340cccae3343055bacc44e6c8c8da878db00703bd18ce672090bf1b1efb79c730fd7b452230682b8d828229c82f9e7ca8ea9";
+      sha512 = "38ceb85c2ab2c0021f5877805c800976b590e56005320f60a5d375ee346f1e2441bf744fac86ae4a5513465459a3a9e02287379d24baa4ada3e86acadfb82753";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mk/firefox-61.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "95715fb3347917429bb6016a3ff2f4b985e05ec8e04293511dbd839360c1e61435b6f548321c63586bca7eaeea541a9ce6f1b78665c38306f4c3781b08813e64";
+      sha512 = "976f841c1cad0180bbd18f578393d61a3c0c80c251aa67d22f8bfe247c09fdf719ca7de003db9b3b6aaf941c8e1284c7ae407f25c18e4f64714e2797de08e41a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ml/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ml/firefox-61.0b9.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "2c7d1e1627755f556695bced2ea3a125473e644824f3566e390804347dd70e17afbbd8246c7e94adef5d2e4bfb9892d5f696e7f27083d21721fc400332017b5d";
+      sha512 = "a7cb8203aa1ec3b0f2b436774036f82b71940569eaa553a476ca6133e13960fd3ebd00cfc9a70b2812bde0f388d054b9a219fe44522e19d9bb113177fffa505d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/mr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mr/firefox-61.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "93fcd79b8bf2715ea0441f87191876df4d53da0aee03c237c7c29b9eb926fc7e8094bfe20a77434951bab85df25ed3eb578c482f4d53c210e1bcd2514c990e2c";
+      sha512 = "f36b95b08786751a90c3d19d53761b971d0043a0b3049edf40f81edf629f87b4b9c9f3bd2cb2401149a41eba883eefe1dfbea5b62955b94659c3ffb982687e5b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ms/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ms/firefox-61.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "2eded92de24f67f981d88d14f5300d8352ef2385e365b9886023b7f4d529909e6875e42b44679da9cd869b3678a48b1b252b212f45390373b64419412bcea012";
+      sha512 = "03d0171327097bdde583770e10f4852b7ba955d7392d1997c4c82bce781b8540157665c641497e69ff50d7fcd9d04c3fa48d6f22f867197b71a5d68e46a31590";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/my/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/my/firefox-61.0b9.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "24d5f52017ec7921535b036a562f0451cbea7f3eafb4af7dc7c9befa87713044ae3511a549852163ebe473dd31257a2a4ba48b286df12b9f0b515538bc2d46d8";
+      sha512 = "75ba4ced40a26fce83ba3e688d260c3becd1b98e5914f525681c4c04a7d7f9476e45fc12789e7df78135614113deb196f2403085d605bbba061fbfef10027c31";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nb-NO/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nb-NO/firefox-61.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "9ce23f7e2573fff390a9cc12160090767b5a5b50884aeb6e8150c09a0628af4d628de63042ef1939820450ae1186627fbebe745215062df25ac6025acbe548c3";
+      sha512 = "dd741fd32bae0f327a19d019870ee587ab24b6004410cb41e0cc6bd79a3893647c14216ccdff11a54b16adc6504b95cf414905a5bb5de35c250123f9c078a964";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ne-NP/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ne-NP/firefox-61.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "dd3150888232e127264c66fc478ad91bc621d4e49c792a327f311d1f66f743ba99d844db6092d32b13e57f43f7146bb6d831b834ae7d797a65350653e63b8d25";
+      sha512 = "eb3cc5309e52ab663f37866089c6f42c543f640c6144bc66319a850534cfc0732e545b10f5c56045683a4c61943d59e8e46b90d795c4e5c3ca80e30f5a7b04df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nl/firefox-61.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "ea717463bc22e468d429a4a9145ac70a73330e3e18050d6af2d04939f586b2a536faea44e193d5d9861cc76b89c41795583d29c723501ad2e72a1581021fb59f";
+      sha512 = "74aee78453e4e78c4bcab739c363de3d6bcdea7d23583398ef03fde87b619d54c3e478f3eeceacd52e3f4c7824240c4cee1c067ee6ec8d1db1c29f5862a356ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/nn-NO/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nn-NO/firefox-61.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "075f8310f1ccdd76d8c88943261d4f6c37091b5a527f7dbb57f77a6e1b0f23ab889ec6ecf36c7a99bf59eb52d3443c6c0dd9815b9444bc7c20137feedf289c46";
+      sha512 = "4d11560b237d4cd9ce5b3fba3f369ff2e8273939d5f2ae85a6f2bc1a872de413ca58c16c15818f5588fe8e52c6d103c92c8755003bb2e0a3875ca8aec7adb908";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/oc/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/oc/firefox-61.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "03623b979bec538828122d27784682630624971913857c416c055aa614eae8f0ceb692409cfc79782b64ac9b9946d51f943216787686a2c09bfdfc8214f81a64";
+      sha512 = "625455a5c5043e416f66b65417e09982e0e491abd1c1b28d9fc63375d9cf5c29c9d11be9936ea2db97b0011460e832d44f7fc5a3cfd9c95c95f4934c3d6ea40a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/or/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/or/firefox-61.0b9.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "4049b878dcd6bb5c61a98dca756ca69c1197c0da1c5712c7b16120be9fdc6292b93144d0b72962453c585cf9eb3b624e8283666112293365631c3cb6e07046ea";
+      sha512 = "ddd26fd7e5f69663e831246ec9d71dfca4d4894a00ef22d72594a8fce9c6a230bf81e1ed9bf1c0cec9f86b0059a3b87980aca31db4151204419bf174c89e2cac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pa-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pa-IN/firefox-61.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c6723079225149c5be4f786fd8aa7120b5a8b7f3c71abd629607e23d3b5910da54f1a20bd98b70a3f30dd98c34d10b84d1bc16b89229aa64cd081bc6e00a0b56";
+      sha512 = "eb7bf00fd7ac6521e93f7fc87373e87d5d2d58fbb82a76f8df675c64a2f9f443ad018e47d86d6f86913c166cd05d6703c3553e82e5d27ba095bdbe7188fd1e96";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pl/firefox-61.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "1768cdcf6180d26126e8414c8abf530adef1fd3037bc43f931bee15b0eea04a54ca626c093565e1fbe09a980a9c56054fbace43a137477aeba62f4f4b23f9c96";
+      sha512 = "98cddf287453fd68db2f84732dd7768ebd0a72f492cdc0578cfe71a3f3eeff9bc1be6161b810efcf22f64bfd2f6b52f93aacade45df55380d5d9830cfc1cbfe3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pt-BR/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pt-BR/firefox-61.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "10286961a02c19d2b51c9a470853169e55a09573e941fee077232e3b507ef9b7f1f5514c82da114d219552c51f01259262da3ab9ac58d3e0d5fdf312e2e10df0";
+      sha512 = "35e3f27b7e2dadef3e93239e6530fb1ca5ab5f2dff619f24f8bd66d7ab5c95b23da1d744769e99fadbfb0eb94ee81a5f5db76f2eb842cdaa4432bd0187f92b4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/pt-PT/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pt-PT/firefox-61.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "f24654c601fa6d62e8aaf5096ce8a55d86614d0e73aa40d14be5f921e5ef40f4615c9b485673eaab0c58af700a8673864915a3353a9a165f9590d7906dc8c174";
+      sha512 = "721d13aab5ef95bb3ee4d7d52c1e80bacd6f372c2e68598cc6a0c146fc6abb5f2f52248e9b26bb0dee6a88fa68517bf7c1bc28fe20d9c9d9faf7e49f9524a0b0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/rm/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/rm/firefox-61.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "ac607e4087103257517201ebc05b9b7a7c337c2d876d32c4ba9eb0524218bd947b6271bfa948a70b02930501c8d6b2c6e89d908979539a0542e1246a0bb4aa60";
+      sha512 = "4018a271f732d96d7f61871deb91a08bea47a24b0f1a5b4fe2212fb46c23bf3fd5bef6bc3871ef0ab0303c98875671b1fdd1de740797005b6fd0f5bebd874048";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ro/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ro/firefox-61.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "ef7376c092b8a7ff8dd7dd48e97c199c87ddcee5e543166a9850cc0128966c865cb67f8e61ddfc1edbca1f3dbd8efbd9419ae72435c5a5bd9c2b2fe58418903f";
+      sha512 = "ce71174e9f1e1f6cbe3ad4dac63a06019ecca88e1849ede786c19cc20f1a08ae32ec99913f49d894731b7975896326a1f96ced12344d593f9efe3230412c125a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ru/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ru/firefox-61.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "504832ed8414ab0d75256489855c763f4628abc4702a9ddaf1a823603a7d4710bf6c1e421a7bc6d07fe494b4f93c87c1ddc26184610806f20755a888969b13c5";
+      sha512 = "774ae2146f629550e7b3eb36a5e27bdd2a5aa845d8119f5ca67b181aaded964e9609f9e3ddcf212efcd8baab58de66cdadf0bf7a5f088b9a39e2b63f53dac48a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/si/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/si/firefox-61.0b9.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "270a5ade916b439199cb6fe539b593d747b67fcdc0857a4fadcee328244909d28186bdf50701f863d4f817afb15c38e5f4380278d495b1d627111b53d567c186";
+      sha512 = "942d12625cd0063ffe09b1c6fd83a19bddd89220ca37f1b78d88fb184e08eae044ec3d7e545b3dc2a3b020693cd62a8f21f10e803191ee2dc98b538e9ec57f27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sk/firefox-61.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "b88074c7fd37e45486b40f4c665a1ccb19112daa4c8c344e0a4b2b3cb4d41390824e5d7f6446adb0256cf25e0fe71c969b51b4ae08f521d0f619387d56ebb72d";
+      sha512 = "0588b18c99369288e188dd329fc77f73c04bce1fde3acb1a940dbbf01223ee8e2b852fd145e531841d950e53d008fe8e24ce681f2b36f1d5afd434e96b6f95a8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sl/firefox-61.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "fc871d74fbc8a59b97197bab790b543fe5b7478174dc4120b04eeca90c79275ef7867dbddf7e31f3e58fa5b738ce9af00d42525667482727a7abbd0979c3d969";
+      sha512 = "7c0c826eefaa3304f32c4a817a4913417833ab56575ab577d42391421a449bb366168cb5f62e2f1f1fd9c551a32875484a77462491fbd5e274adfe51b0584a9c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/son/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/son/firefox-61.0b9.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "26a9f8fd86e7f733dcdf822335fbbd780a69d3789162b8f536336fb9ab45802c9b67ab7f5681b96236530f040e489ce99da005dcf8bd529d4f8e5201ad424cab";
+      sha512 = "9f8614124d669df9f0e539bbd14c9d99214a012128619c5e6c509029664782bd75a887967f255bd886da0a645c47934f53317ddc20624820c5badfd08724d44d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sq/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sq/firefox-61.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "94ce101af7225da4f8309824d0511344be52f52c6f9a14a21863eaeb79db755d0bed72927f707467b862ca9083f5270ebdc9faee13817097b0f73f6820e4d6d3";
+      sha512 = "2227eac2f7c71a627c2cde8f545011a7049897256fa7ec226ee795576f35f06eddd7333ad9bfa2a474023cad5029c9159d6904db50e80094c3f405f857f4ccc6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sr/firefox-61.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "b5e734d2e1b8563cf47bc6a0a5dd59d8f7f4be1f95f9992426be690363450439cc09bc89b506df189dabe7588292da25aecfdd5796829630f095931ab2aec19b";
+      sha512 = "3843eb3b078bd581849615ad8a8b936835b4a85a6ba4ba33b917d9ec549e43d847e160ff4a760775dc6e2c1688674f43e16eb9f561c93263afd3e532a74590ff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/sv-SE/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sv-SE/firefox-61.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "32abc54a25fcc979911916d83c101be8d5ba08331ca8ff8673cb9c4677c55263a661e780fd344642714cac5a5b9af6c831c01ca0651f67a7dc872ef701f25a98";
+      sha512 = "5dd55e468825c8b13473c57c9ed6a24f0920364ff339136c7f03b576a6f9d473b63c173f95c597365d68e9f9afaa653ae1e961d5eb2eaa5c670f48a4dbae5466";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ta/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ta/firefox-61.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6ad4405ba59143765b3cb82ace718b1f8075813636f9109ed69bb2674e035bfcd5174b49d2de2f73cf9ea616b2de5b31c2bcadb071e49e3ad0177087ebeb0b19";
+      sha512 = "6c45af1110563f53e7ad536b266e84b23e98e47eed4a88d91b4ceaf7bddfc81c54680a93c00ffc7367a0fb79bba5e29e69069b0e7d9cd9fb8e1b2375b9e489a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/te/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/te/firefox-61.0b9.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "ccc213e1266219ee8f5a230d7f8a96e503897ce70f66dc7b2576b24db7927bb9032124856c46a85c345ff5adff42a3d08963920f41d99e095af95c170a72794e";
+      sha512 = "58ccf32e884cd7d2a2258e12f3cc89f2e56e5bdd367aa44b944a656d03732d936a4e64d308ac10039bdda92ed491e3369241e72a189b936e9fe718c3ae373af6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/th/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/th/firefox-61.0b9.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "d470b8bc1fd69fe021e9871f98262e17a157ae758d6ec8e90747627491f6ea57e01457ffe670df582f0c3f5ce11f37147a4e71596e79a46f52e6c53beb67a95d";
+      sha512 = "04afab7b77c679aacba048b73b39b661f47ef58327fadfc0e22d7d86111e3c43fb9bd63e13c0c71b3b789d2ae9a24f939eb046acd189b5b88677868fab24a6d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/tr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/tr/firefox-61.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "3e5057597af10891a3c65c0f2ca32316dd627b7fd9895edbb89a559f07053bd03dd6a545d82899c922f9055f9f975b944d4e7b3a4c746c4f6148bd50f655975f";
+      sha512 = "9fa6f4cb7de48647aa239192d3fbe97d40f5d090b8fa47c11e76cce479cb4838b28345642215d1ec049b0bc76f334895c387beae513593347cd262f9cd830eac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/uk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/uk/firefox-61.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4d8117e6bc56d85018a900f6f97d2f82a0b76f23f2807ac9a6821e8842b9c7b8fd20840c4c784ab27ecd869fa6012511e4b4cbaa2c5f3fe11d79c35500d7ca67";
+      sha512 = "418df497b4e51af407fbed1ee83bd608cd1fe128a2d3f24a3663e57d3c2675c025f25fee213aec73b9f805cf3e88b8bb979dfb1e18a998b2054c666092e52b08";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/ur/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ur/firefox-61.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "f4ddc2a57e920c9272a23c5fc794e7f6fb855ea98a1dd12ed03cbf21bb5a2b85789b526dc5e49d6a27c31165eb98716da4995673856b48891d0e21c66a977238";
+      sha512 = "0483583dcd3f4b25357bfd6807b757b139096ddfe68752e65dfca20521e3e6c12b66f50562954d79af1377e45e4e59748adf070b6ec20a424467017757885762";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/uz/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/uz/firefox-61.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "02c30764a9368c883215ed418bf32a4a39c4c2db6a7f0646c6e4998d51e3965f87306ff6b7276e8a375506821aba02734b360a307cea785dcec543da993cae88";
+      sha512 = "64ab03909d03ac497bdcbceb0c17ddd6b4c57ac453ce9125ca28a9458116617737c413f293e42b83c27c998b9a2352b20921d0c3ca5cf9dbd7bee717541568f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/vi/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/vi/firefox-61.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "a42e9c7da499451903800f57ec44df070dbdda2eecffc3c2f0a9729e4993570ad791ea3299fae085b0dab0a2ccd5b95bb14b4bdfc15b223666630ecb785f9009";
+      sha512 = "faa55bacae7b3c97336e3a1e4352fa32f504392b56d42d16d4d544083ab3e9d26503c28b3066298f7fe11bad4dc81e52241c72558984b2b4b85f88ac1f4e8ec6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/xh/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/xh/firefox-61.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "8631b3b6384d8650e98fa9590973e2c603e6a557b17c3369e573ed5902243cdb023cb9bb15468418775b845d25cd054a2e6ade8b81410cbde1d9634d6681f7d5";
+      sha512 = "92866b07535bfafebe35c3f193bc0f61c8952f1fae00e66530abbabf9268ad3d06ec44fca332677163cfa4832c6990b70aecc6a80c1448012a9695901185085e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/zh-CN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/zh-CN/firefox-61.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "498088f972504dd63e7a3cd1a97463d17bf62e186d8e5f5bc83d28ac7dcaebcabadf76f16f57fd5bef59726cdc75dadc19113f73fe4e2736042472ac33f0ad2b";
+      sha512 = "7b02a18303661b4e3d6ad941f25d454fa322e95af520c5ee9504364dbbdd04f498c195099559bee74313efef02f46e259f43a54ef8036378ca27611316970b18";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-x86_64/zh-TW/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/zh-TW/firefox-61.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "40b463f4d6a5b808e1c7e992639cbce315b7a6994f9401e0e92929f0288e7976df42eb1f923d4b620f265ca44b3eb07b2058ff6ccb8c8581b06df49836b060d6";
+      sha512 = "0d60e2c69bb76bd26e4522e4a216d05e47f822147c84b360bbbb246a1f9f4cef3f823c066dbfc35be660060027af4dc0eb1cf4bad9904ce32a40799b7d616237";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ach/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ach/firefox-61.0b9.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "972839d2b5c2b0af5363e0d0f85c6b39e2c641fb29375911afb90eefff0508b9fcb4728a016eb071b55e2ac5474700f078c0abe5c83a7fec004afd6ba635fd6e";
+      sha512 = "21c5e60f9536a360222d9d933bc71f152ad115379e897257c56fdc9162c681f98d612e40c5a877ca859e3353b8a3ae193d7c938c262ebd548c3741e04d83da89";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/af/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/af/firefox-61.0b9.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "87c01acd04b6a11d9fad202cce7d912629d4537b1eae6305a21fe35567d57a1fedf5b2502efe603ff1d75461f5096858ec53c7db1c5f7cbf5f4b9833d0bc6559";
+      sha512 = "6899e468cb5412ab0d9e29e0160239987839b897b878ae2f4b0ddba13f89e62dff716f454e23635882aea74e1c833259a88013b787e4a908feb74626ae31f163";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/an/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/an/firefox-61.0b9.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "4d1953385fa190a9d965d5e40b878e59e92a5f973b3e7190030346c383056f85e049172a723127a45b242cbecb17a7e44126d9aaf9405f56b9458c0f4e87d81e";
+      sha512 = "7da4f066cfa181d81f792db0f6772f576306248ecf68b7ae7bd43989db243427a2c81dd3488fa0fddb953b4d3680f2bc1802f8b0c459d99e6df791476f83c905";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ar/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ar/firefox-61.0b9.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c52dab7ba3645c44b60e052490d66327ee5571ed151b05d5b084d31d7948e7b4913b9dc0fe25a14f5553363f900d91b20dd0ac830b65b3acf4b49438e7d53e76";
+      sha512 = "1c317e4fd9aa4fa0fab8abb7b3f9b38822a4e4ed84c513e4c6714f1726e450fdfb5945b2954820a13079975b96275352b43a1bcbfcb69a17cb2bb241ce0a67b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/as/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/as/firefox-61.0b9.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "45145403143f9b0c6dcf4abb287400a1978eed93c3f2e1358906cad3cc441f6471818a6fe2656a7417aa8714ae4117731baa1afa118d756726f87cc54ddd6f67";
+      sha512 = "5ff20af423a327ba0ed9ff700c8edc2d543c791593125bdba92f513a26826db749b58bd25afd8dfcd05a4edf312c3326bbd9e8aa63a2c5592c3ef828e27f5836";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ast/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ast/firefox-61.0b9.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "83bad32114ed3e5dc856e3be813da148388c6070098aa0c275df38459680dfed4f0e13795f59cda8faffd074a7ff14945c4d279109a427e1241bbf07070d9b18";
+      sha512 = "fa45afa676ab9fad755b3cd256f2d11f9700719f1ad48835e07b870c7604c7c14730a4e19c4e9244b284c64bb668642fb4fa0207244e0543baa5d2387ee9c846";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/az/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/az/firefox-61.0b9.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "548b421eb5c5675be324b3eff3dd315bf2357434d59f3df216a9f9c276cde6896bfc8fd2b5e35b3a5cefca886cee712d9cbe91766c73794f7e3eed18d93da8e0";
+      sha512 = "19351061671bed7347ccf3977feeb4faf250a0c86e2eadca80fe5ed06864f081c76cb16456420bbdd53295f529f61cabe9a2aeabdb2dce1add087bf1f0916b16";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/be/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/be/firefox-61.0b9.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "00edfdfdeb842952a12b11935dc159f07e5c5016448d36fa6835467139322195ffe9f34ddffb20a593e7c0621eeca7bfd1fef697550a8ed4beca4a2ab3752a0f";
+      sha512 = "d5a765a34705dabe43aca3fc5216061e9f17615b8e54be2de34db766f23c6ecd62781a8d8cd18442c5a41191545f72faab2f6330a5a0e160dc1306e30bebbc26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bg/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bg/firefox-61.0b9.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "9634dd7837d870a350bc92472ee97b06f01e3c67ef9035fbef388ddafa649fedb12ed12df304a1e68e9dcda089e8079e8de8eefa1473100b28a0c340a45baa3b";
+      sha512 = "1958969e36cd3b63071725fed3bff2bf9489290d380e690d9b09a6873cccae3233b967cc666fe9639f85ca194003830c91763c0373a9e015897cb5744200eac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bn-BD/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bn-BD/firefox-61.0b9.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "39d58f13051e40ebb1e5348ae1a76bb952f1e16ed16d7b953c0b92775a4c728ebcb1b0283e5494aecf4a6ab38caffb9b522b7ad6cdd1a4cca10c838d2239f21b";
+      sha512 = "9d4d1c24b0336d042b404103f4f3a59d073c6ee612ae669ca667d1cac57b0f936a4d2dcead956dca5390b910e2141c2c9ecfa7b526edf1581bcbe1fb99d7ae32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bn-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bn-IN/firefox-61.0b9.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "af6537ce6b6658b702761e5aeb9c5dc673f9bad23a512c7210f16b3a68f991dc06d9fed2fbf8ee20d6f338923284ab8afda68d6c6aad844ab0419adfc0955a9b";
+      sha512 = "0e87d8792d4ae45a9f5188065e3fade5dca047eef5e4670451468cd9deff4064a9f206d4ffc2fcb231a97f19ecd7604d028e577069a48bd447d3b27baeebd03a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/br/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/br/firefox-61.0b9.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "68e7806d5c682d9b8c9781283d373a99ac2915c3770c4d96a6284ffcac149c70b8cbbc3ed7b4c5dccf32ebc5e9f5d7b76c84df76ac7d57a68a0f86d26fd3097a";
+      sha512 = "44872968154009726fe0ab81620a8ff65b67dbc3b8e2191c63420c793c5bca3bf7919f3b53afef048fa38b698ab13fe718d5d91b1d03e0e6f7921ce8beea4d06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/bs/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bs/firefox-61.0b9.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "9d1138732df0f3d68460732bfaa508c27293078c244f575b4651b32b23deec8dd9c7afe2fb38caf7769e993ca03646c49d34e5d2c8c402d0f2491646ab15f799";
+      sha512 = "5f10561b78d6b6932adaca728bbdadb2143ba88fa149678811f74435cb312021d2a5da4df6081dbf08dfb203e3ac68a0833ed4eabb8982cf5965db02116fe3f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ca/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ca/firefox-61.0b9.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "53ce04660ce3c84a154ff4c7d0635719337ad705941106e8a744802b284ce6dffa3060844da74b6fa0d68550329682f3f997457154accef1037013637b5f9c41";
+      sha512 = "8b59ba083d00a16ef0a0c38cffdca64102bac770d9095b0bfa0cce55fd57c38c0a74cf41d1e66838806d57709082659eaf462de167fb55bc3d3b78f24558ca05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cak/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cak/firefox-61.0b9.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "bcd41ebf0cea329de9519c8c3ff7c35dda9546e51e1b9eabfa632d12e87da98c27ad9c327a15baa0fd2761f93a2de22cd724c6c84fb75ea4c68dcdcfe9e3edc3";
+      sha512 = "d7758e213d282976b50885ad10240e594f762d4c5f0643e5146ff4c0b289da645d9e1d41206162566175147f83a6589be19f64010625b0941b5a69eb39d387bd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cs/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cs/firefox-61.0b9.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "beeba005504c2675051bb87cc870ad54845665e88bd52594fe822c47a65a6949024b16877f0454af2c5027446a612f0a5b9cbbb48cbe8990157997a8f63c8006";
+      sha512 = "97dcf8fa04df58333420358f3dc30291e5d2eddeecb7e4b1f956e4508ead0dd5ef83dda2725eed02708ba8d9c4fca3f8a13b70d86858f3f011a616d80a816b7d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/cy/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cy/firefox-61.0b9.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "168651dee334e3de02739ebda89b12d3cff0b50eae7723905843c93e5e6272c52b2e621b59044a9b909495ac8c193257b2506878eeb053ce87e02d01c81ba3e5";
+      sha512 = "d463de168e07810595ba7171454576b0882ac28d9bfd3b9e315b00ace8cced905ea26a38dbb83417e8ee0df2b03eb3408d810df13ba68735758c6d14f3ad8536";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/da/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/da/firefox-61.0b9.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "2d3a5cf9d480c95e1241b3d2d2ffda70ef08767adf9c1408833aa181b74c6812a0c82bf4da529ac1e654ab1c25e18658ef412d3a3a0b51fc8a0a67f0a1eee0dc";
+      sha512 = "4ed7ece1863ad330bc74f14185b9dc94d62a9dcaa83a94c6b744b9b8caf2e3d21fd2f0590890f961205062a8b5b79d5ea43c1e67f23b328a125d581535247e06";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/de/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/de/firefox-61.0b9.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "020aaaefa75f5a271b60b0dc3eff47448629093388bf7496f4e2a50d1a71866d3fae358bd83588a79c2ab1309a86593aa2e5f39baa29eb8ecfcba69ea8440bfd";
+      sha512 = "bc1692b0d04e5b3fcf6dd09d5dbed9b2f40d0558710944819a394ece4cec9488e1cc8f588bdba2d2cdd8f35513f75afc47c07890e81a242a039e407bf029e72a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/dsb/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/dsb/firefox-61.0b9.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "fb76b0faeea87283ed087c4dbcbe740b8fa8c7c764f9768f649e10698e7dcd8bc7419c22ddfa27297c69d192c2b5c60a74ed1d60f36ea484a48e4727b4a65570";
+      sha512 = "4d6c29e5a52822d4b1d747f922cb117d068e4a55c281df4f563c478776d250beb66091bc67d65e5d584e93bab6f01ecfd2d30013c7b0e0bede1184f88c96263a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/el/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/el/firefox-61.0b9.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "33ad079eede28e786cbd7976ce46aa735ed2c41af2c629d14fbde4221291ca2ec00e8009d2941abe7c72d659776fc586bcbecf9694f0a44ef3f2f502884102bb";
+      sha512 = "00baf5f4164bd0a9bfea3b9d94976688dcab170f8c7a79fbda00cc026ba58ff293d258e50f40105bac206373022d7354cd51d56fc8252b979b6d1f588e57c7c5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-GB/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-GB/firefox-61.0b9.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "37bf02b68bf50ac6f77d82648b1e6b1182a154e2b315af1a746b4668783d772ba15bccadd679144bb924925b648a272ef07a9a891f7015ea15d51712b84f4c80";
+      sha512 = "5471902249f97c29cd66ed2703356f1e79a81c7f33eea14634003e335578fc087032abe2f032b763031db42a7564007c3acfde9ce6e337c271f0babab75fae7e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-US/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-US/firefox-61.0b9.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "d6b245f0cfec5ac80af2a5094afed988b7b15acb04e6303dcf8d597c5f3fe5ba4abd1b047ae68c47a7cc58efbcd978a05edf760b71f8563ede83aaff4db2bbac";
+      sha512 = "2bb21a3726725c861492d501876e6236dcfb1f718d61fa12f50fe512c1a391f61db16249ac49b95fc6ff8f31a12de3b70cdb43cc8c40f2210f0fbaf93b31bd85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/en-ZA/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-ZA/firefox-61.0b9.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "f6e8cdf680f390ba6f60d34d4eaa2a68ac4741e6935f1f5edb0ee89b29f3f152dc23b3a0e52a80bec1815aa89ffd816d30579bfd04927c48cd3f5e242bd07c2c";
+      sha512 = "c357161871ecda52551d9961dc22d85aa310fbff1eba00203efba529e3760c9cafaa7aae93cf84ef8f122f1ece4fa2f6660ee72518c1ee72e38c967325a41d03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/eo/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/eo/firefox-61.0b9.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "86d37914c8d107b15840f61eae925507ed8b780afaaced5af20d8fe88bffa0213dbb897a4157830125d31d7f35b6ffafe33047043818e11a013cd0519a12b5b7";
+      sha512 = "951e0247b0da69601be706dba8ffc7d701a9c10020ef70e37632379281a2259e02c6631da634c6565bc70d0248a7acd1aac961b030c2d141889e0228b8fd59d1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-AR/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-AR/firefox-61.0b9.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "f63ea85239718d852d49720306cd85a4ab13be5796b9b05eba7890196703506873db271b823debe860c64e7f40c9c8fb8bb912de01c22b0745f4c1682b95c190";
+      sha512 = "9401ba099715e1dc977a5e912ca6886f0af7a7a715fdd8275e7cbd383a94ed35dac9919f281fe0e20481ca31d0cf5c321b4dfb09d0318a0e5c9244d3823c15f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-CL/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-CL/firefox-61.0b9.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "a435633c1bf0395964e6a2bcc10a2ed4ea1da3d1a4637ad62756e669d0b50374a5bcc3623bc8618bd9dc3c949f6cbbd26a09d3b6408b5eddd889e0b96efe3680";
+      sha512 = "8e204b19ecc12c8273414d14b68bfbb48ebab18eb8c76e77682e3ae28eafdb063755d13ab5d7798727cd71107b588cc39f8f2e33d01d5418434a212bcf38af60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-ES/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-ES/firefox-61.0b9.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "ffed1897a097f740be3bdf504b9b9a9eb8648a833af33963d25cac859ca21eb352ad88ea2f498086c603d375f10493d1d85cba7cd390bad1e5a5900e7750c18a";
+      sha512 = "6c970d1c90c2bc1da19df2beeac9f7ef19bb075812a3dd33865bb4f3d0d26cda5d0645a432f0a95cae0bcf6cd0f63229f7288cfa729b4ba71a1a177ca6b5e1c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/es-MX/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-MX/firefox-61.0b9.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "44a650253f24cc63cc07b7cc5d9e2a8d20fe51b60d983a1b4e230a2d2d3014a4d79e1615d2658c51d749a65c753ac9affdd6aef0643fee89d7ef05e469afd973";
+      sha512 = "5130a89d187dae0b622e557fff536e6e01ece8b139277c78f8ed57abb6a402cb24171170cf1f1585758389ebd17876835f80a103028e699837475261b85b00f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/et/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/et/firefox-61.0b9.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "b01e85e1f84058a54ce828f5d4075e7c44f128e70f72afd5f505031d7b5ca5c7b7fee0bb31f1a40206b45fc28afb4ffde4fbdc003b226639d92103b656d94e43";
+      sha512 = "bb967d8ca372464218b3f38c8e7b66660f0a40eb95c067e3d020dce9da168cab14a9437392a0feb5a3858f2cde9f51678b28537d42d1a05cc89821c7bc492dae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/eu/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/eu/firefox-61.0b9.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "57361375d288954a7a63f6ea3410213576f1f7038b0f2b8d25061497240103cf7cfc9eeb2ff9c1b32aee693b2841fae5d66f52ad74065416e51985c9a83cb7cd";
+      sha512 = "ec1de732e07863f6b89c35e74c052df882b877c557abfcc53b69617b3269f99d1747334391befa85591b46350fef57202276eed04a97495406f356eb6c428d05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fa/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fa/firefox-61.0b9.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "a3a1ea34d0c0c26345cf23ca1c1c6937f78691d29fc583a7daadd93c84820aa2f34fd8f888b7f20aa7b8def5d48bcdd0fb81ddaca29be37cb351b9f2756e1465";
+      sha512 = "ea12b5e6c090e2edbe1b25438bf07f21edc9f4f63a4b6ddbe10465ec6351664ab591c51229fad8c04017456e6ac495ff06820f976fe433710a2f4f386c0cf004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ff/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ff/firefox-61.0b9.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "f661999fec94fa4c7290adfdc82ae7ac8b955fe006e38806bd5d7681372831dc6e5190fb41c37517799ce284c403c61218f54875bc035c098caf4a92e2d5627c";
+      sha512 = "92d15a1aea67cae4c4c1ac9b5b084f186502006f8850ff6daace5d43cf02a1169fdefc5ce55f86fea356cd965290b263e2cb1fe13450482a7fdb4836cf18e77d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fi/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fi/firefox-61.0b9.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "3bb9799c8351f00d3dc9ba258dd5f13eb7ffb71552e17c5244c50a3e2d363e742572f676ed538d16d7d12b2a477382d666c428b3f1be5d450be7033e0a926751";
+      sha512 = "1de8cd725fd50fc0f551b8e5ce7c68d295826cecf36539a64dcbec8f1796c87597a54f4ddee365392c92c21d18c460e3196d0b308232cc7c18fb26518b2318e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fr/firefox-61.0b9.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "38e2c97830eb161a894664e6480434994afdc9c9e8517477ef1e9feceed88e991a3786426deb03674ce30beb183956b66a8152a046b1ca94a9df153e17f73c4c";
+      sha512 = "caa72eec283e962aa8bf9df0350ccb31e62859e894adbd8fce82b7bfe309cff5d2f66bea006baad34b93b5861855ac21c512ef38a0321ca49b196b21433e2814";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/fy-NL/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fy-NL/firefox-61.0b9.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "b67993ce30d5eb41443aec2101ba5f88be0bcd8f55a44049e8f264f895219a8d4af18644a30855b59f5c6a436b57b5159d2fbfbd4b8c0969a78fb392a202bd84";
+      sha512 = "1e709986af8046c51c380ea2a1763cecb0f050074b4385e5e2814044cdceac2829dff1efe8e692dfd40d2c3d943ab5235ead273b052422e2a8c053790ac659db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ga-IE/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ga-IE/firefox-61.0b9.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "8783fd8cc23af2721cbf72572ed77c0e4916d5942819c003836c27a226a393c585b992fd53e7fce2c52ff89f002f6da16d501b33ff1537a7189aaa91645972cf";
+      sha512 = "91fa3b71f34c068b7c54ddd36feb53f3851040d85de34cbd5a28f5946cd3bfa81e98224035d6218fa63a1f584cacee9728e6167eca3ccbc25916f8b6bf3c917d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gd/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gd/firefox-61.0b9.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "2c7f9cb7f246ba38cc8c2da608d82d674296d8d5f2e168668466c85ba89e42322c213df381afd9bc2181d120de03fcd8118510d77cff7a54f4009c8fc3a10545";
+      sha512 = "db99f01106489e4c1135c4a34e86e9215fd280819d739d75c902b295513e294cc270e07a4c85994ce3922c5a1081e2e127431c6d8a72011281543f1069157dcf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gl/firefox-61.0b9.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "e2af1b4a6cdb8c03fa228a6311c51a12af0d419cb044393d1494183d850675357343d68b09dfe6382c782bc2c5aeda234607563c74b9175fa6240ea030a1a71a";
+      sha512 = "e68c2b71e55f5caeaf34a46d2ffa6f50d7d19b04cd4b6b0d097cade0961f9b53571acbc5ba4eafe7af1ced8437f7d442432061856325fec6aa6d3b679325070a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gn/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gn/firefox-61.0b9.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "da338d0df7bdffdf1fee30f5b1aa240c4fa88c5f41451c7120cefcefbc20f616089c52b05423e7dc4c0f67288163c07617b21980f10e4d0b45d7a96fef87ee2c";
+      sha512 = "9635821b0e53b384de19f77eb2d34312f8a68bfe5c128096799cd7f80e18d43d66ffca6d576d73c1ae3817ec7b979b168fb55e905cbbc4824b08bfcd93ea5af7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/gu-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gu-IN/firefox-61.0b9.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "894ca0443b5a67970ffa7ccbb44012cdabe3580b917f81027018648d0b9f3faeeb165975333724434e195b2f606e4f24c9f5fdbf7034f07aa123e5abb76682a2";
+      sha512 = "73084cb2163eea8bd7325793287267185d38f2c83d1b803fb02f218c5ade82f6a5d78fb25d74418ae358ab90b8dbd413204cfcb732bbb979f7111f2e6480472d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/he/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/he/firefox-61.0b9.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "eca00e09083766056fa725f74687b5b823432d71498e57bd221ab650fa1b3c0609dc4e141e6ec9a0346f904c9f731c706cfdae12fb1d5d742ca1b65514dcd1e7";
+      sha512 = "12ccf678a8c6006ab70a0681779be3de7420a01d6b418559dc7f0b6cad40270bbc082f9fdcd03ff83ae06547a8743106d8be7a5e5378bec751d32eacca709f51";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hi-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hi-IN/firefox-61.0b9.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "0cc000001c85e3a84e05cf90c92008fb9da850d74c7f421ff37ec1f7d0bd78669a6db7b6f593f0b376e953229f35bc0c588b8027c79b6bd973ee4523cc9bcd5b";
+      sha512 = "d457133bb210748e6aef9a588dc345f440330c2300bcd961cfaffee0d9b0e7e2728a7194638096c62b7ec736fb497b1865f7a2da1a9f87422ace4b37261856f0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hr/firefox-61.0b9.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "a7a1aec5d8f7d92ce95d7ef12d16633905a68312d45e5e2a755e481b7ed4894e8778a82bc2b91daf700cdd36b574fdc275b3c7b1e49096f173d0ee7ef24175bb";
+      sha512 = "629223cb5a84acb1bc9dabefffa489590a4b6be55f64a6c639f9196ddd93f2d51b5d154ee4488a54a87785093c0b046f03f1a8aacbf017ef4daa0237c14f6812";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hsb/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hsb/firefox-61.0b9.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "e28384a0bda3a053f639fce02dd0dd54ad00be0f313f28b6d87f01092d626e06a18dd1ada1a8203cae9877acb04a5e855127f47132cd32c17a043cb1c009930a";
+      sha512 = "e3a2ae377fcf74a29c216e4d82e969993af27bce553050d7318071eeefa921524aa8e3bda4e06391fd0017d5b49b17858bfefbba76e1dc03c3061899eca8f68e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hu/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hu/firefox-61.0b9.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "7170b290b408a31ef30303c2cc628a3ddd33a16165eb40bc776fc7c9d235f00edc47f2ed3c3241a03e45b532c57969036c40ca4c4d8983638f30721c3b69b1c6";
+      sha512 = "e13549b23549abb978b1bffd3653348c982f1cac38d69d16814e1e6cf3b7ad07b29a4844f2ba5d76a1018b0819ab889fa638f662d47cc63e258f1cc065a44a26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/hy-AM/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hy-AM/firefox-61.0b9.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "43212bf7aa32ab9b1a54d09c501ea1a93e5bcd8e2947c77130e55195d93fb299bee8ca675aff17baa6fb5fa0ce0223eec9ac8416e2123d658ecd672bd95158ce";
+      sha512 = "70ee2755b76813e32f9c986ddd81cb23945bd7a25593193c0243ee6eded7141e4657b1549dc0a376f9e46b986fdf9605e6690463549cecf3435507c0e2a8c65e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ia/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ia/firefox-61.0b9.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "7fa2dc007c14de2079fb79ce1d290eb36ce101857724e85570f54c47c23073bfa6dd27ab6ec72bf22d9369ee0c73706bec5bc92b67c5d5de179867d6c6530ff6";
+      sha512 = "37ac67a3ef2b9a2ccb23a2cdb4557b38cd7056808bf1cc620aea664d51406fb24e7bb623b74b8e14282b3b20e3ddb3e8547ac0daa9e4f844e5eb275e01479205";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/id/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/id/firefox-61.0b9.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "cef93689dac12efdf6e6098ba942a9b345bd273ea1ecfea5132c4d654d7a170afb833c7cef7ef4d52a7643dc9dba15a72fa1a51d69ded365e8b7a0f71e21ced7";
+      sha512 = "e679dcbaec7aca833f3a4cc8c3f2f371d804983a43ac8a5f08911873ea688c2c1847d89f27897b76f16f75a4dc93998c565f1eb78285b5b54a216f19322fc889";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/is/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/is/firefox-61.0b9.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "2ff1a81d452af6b038c3170b70fb66d7aabf8440a8ad66136afc84d6b20edda63202de57e69d13b5f60d21860f11da757a74733e921641d8b87cfdc7275c478c";
+      sha512 = "b17f433ea41533e3820479c8b00ed9967f21255cffc130015cfc69ec050aafe4952c5c3e112de845092bfc74ea5f3e94d6af788c82ae86028398a4c8ec809395";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/it/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/it/firefox-61.0b9.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "28a74e3d6b3f75c6ea60a71251adcfcadb1ff53f68b984290d5e207463f01ef00069242de2df9c85f459527fd5d2fca1d6d371c9371fff2c4f34a209bef5605b";
+      sha512 = "1d91fe9523aeadf7c9ef7561d7996607cc58b0a18ab73204343d2a05ae754a1e0b9dd388d2734a8e81a77aa8069c7e07ca9e178060fe73532e550ed430c3068c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ja/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ja/firefox-61.0b9.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "8aa2eb75b8475273f9ec7e0ff3d3f69c79a85c24c87cf391af38c1d2a433ffdd7c905e84de1a2832cb7f69ff106ab85219b63193aab470dcc0e60c53bb359c70";
+      sha512 = "47efd7f3c63a41b638236bcdf523fa174a5db944f1e7debc68f5e456955d910ab66dfe885a516f707610c6c05c3b126dcbc3f5010688b18f86af90fb92f0e122";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ka/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ka/firefox-61.0b9.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "1ad33a7718b842b3a5a47ddc3c24012ced28d4c5d585c2811bc0fc5178205e710f3bd7ed64e00072a22bb17c01281e2bb0d58c16ae0e643990d62b9804a03905";
+      sha512 = "bf3603ab02401915155dfa32f6aa009777615835e21464ad39a4a7f17bccdfd21a707eb9e8eeb23194df7fa8aaed80071b54b589bb8f8e1617d3520f06bba4db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kab/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kab/firefox-61.0b9.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "17447df47d98cdda66be6e337524e0ea2c8cf1c5de032fa1017c812ed2fee5c38f0a65431f5c957d334ca00ec840028a725abb2935c31bf769fc8ae05095fd01";
+      sha512 = "8301ada1fd1ba2ffae4a2edb6882ffdd022f93a0b3e1c8ef739bd7e3053d9530ea177877a7263ae6c21aba8e467746e40318374375423516f206d9f3c953e999";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kk/firefox-61.0b9.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "7722a64125fdd13dd2bd7de7fd0b31a6bc2ae021f5b5d147adac90773f4c1b7c44548c402af6283a2ab12bc53796980a435fefb688a9cea90dc119fb2d61e543";
+      sha512 = "58f789dd68b8974c9237dfa4754811dfa4e3fb7ad1f41b0936b19bc990d28b010397b4f6e71fc4b1633080475a71086dde1b9719b07d281b51112672069ca690";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/km/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/km/firefox-61.0b9.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "d30c5bc08420a80f199ab2dee4644f7a7e5cccef4a7c0521b4b254544ef9f1f3edc9c3a2783d37d370e03b7c1b9b6e2af9a17f0fbf75592b2e8cb82adaeeb773";
+      sha512 = "f7fe0f0afc75196e0ffef3110956b8ca3def1949541df36b965b776b95c884622df54db098a1aca3a9fc9818cb5e4af545f749bd8f7a815f8ac4917bda6c0f8b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/kn/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kn/firefox-61.0b9.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "389d1b3ea9e7ee0941a8842cb93d2bd69580b6aa3203f14e8ec92cb93f2b44b33e2aa00c5bd6adb359bd2cac91a38c6d7e4e91b2179b91d77c71c3dde4f1fb2b";
+      sha512 = "fb4b19d2f48b9977ea8b9e0113be90be339f3eceb167a7c6ed34e6cc47ad8fa74f933ec35f2971c42bd7028810450426aee692dc167f10404935fbadc927d2df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ko/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ko/firefox-61.0b9.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "9214c37f7d13a6fd84329e25a8e19f5324c224ee4fc65b20a12bb14f37c9cd6f421fa7a78cdfc22bc491f0eeeaf3f215e5399098b3ee22b83330e3424d750512";
+      sha512 = "262f678940aee5583264a1ace147d3a3dab52a4fce1687d6dbac31835701f3f28e7302e89e7dc064276a3fefc348c8136d27ac7649c06d556f71e314c6cb3ee0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lij/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lij/firefox-61.0b9.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "12b419b54ca65bee3f61193c7add6cbfe0b19a037834f4bcdb432be8969383572503bb8043b41771e9c33aa25dc843d58cc22aea45b8d695115d9212749cbb4a";
+      sha512 = "01bf9f12281e35432d2c548490b0d45bd94294415453f5f5e5080b734f9804c13fac581786f213d8812c3433b5f085fbd91fa51b8ec5ab2719e1c8c522988355";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lt/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lt/firefox-61.0b9.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "e5d73cf833fb612a269a843b10da78bd8cfc62e92bfafe2572c8f30b5e167b5a5c36a6edb79c28ccaa13bf00f520e193f1e953e61e18ed96f4dab43e8261900f";
+      sha512 = "ea61f60c91b79e06bf2ce3ff18206ca4410928ddbaf4bcc3e873be60f4b9d35a2a987df852c18eb098d51cf7ad853c19de10398246e40c518de310a22deef4df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/lv/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lv/firefox-61.0b9.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "96279db6cc91c8b150aff4f5ef15e70fcb41c0412ae63e33b3456fe19e8080ddeb7af03314feac27b444c9d06329370b171ee3001b9616f0a96ce735e2369871";
+      sha512 = "73d96a7957b4a2667c25e9561a499616ef5d87f564fc48e49fcfb59686648438bddbc06bb4b19af879e3ce8607d7742bc0c84b585456044642ba2f42fe1eef5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mai/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mai/firefox-61.0b9.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "d1887e22742ab27ab5d023a7f1812b96bc3f505e7f6b9d7fb21f9ef57be105912f1c4cbe5688c16824c37876f391a77d22cf4439ef81988fd74e67fdcc5cbeff";
+      sha512 = "dc7a015d1a7d63dd31c3c3a1ae2b4aa4a6e63a58a46f9b8bcd33c21e1b80487580ff5499536424af31290f556ddb35b17e161ac956b9c8dc821b998b56edb021";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mk/firefox-61.0b9.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "010a71764b2afa5cf9d0f1d9108733505ab585800f13d7c10bec4f9f3578922fbf1a26741e376904c1febf03dbcffc17658619c8bf22c77d9476777bd71dde53";
+      sha512 = "94b89adbd22884cd96f21690aaf70d1271df04555218ca3180d3571d546adbe201eecb2f93aa2e0613187c780089a569933c0b0fdab1ef22f4be03fd39e5b868";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ml/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ml/firefox-61.0b9.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "6622a6fb8e86669cd5cced64bef601f49f75cfd45f107371df03eba124288184712e9f609d549ae34734bd61b2b10376f3b1a7524b7baf60e3223634ff3c53a6";
+      sha512 = "d4bafc665e1f06daf14f320e24992052f1875ca0267d7bf9915052f202f3e506130a97d82343ed9be784636a9725efd9c5a286d9e91149120f62a01ff86a7057";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/mr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mr/firefox-61.0b9.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "a0251d67deae2bf3ea1382bbe6e08442152dc66687925f04e5c548d04eaf6258a954b349dd394ac10d4bc945de98c09937cb2434b328e07b7d55da51a2434d4c";
+      sha512 = "43a7e1066df8f854a2af7dea6240ebc14abe09c51bd3ab96f5b2e050f2c138826f302c1592f4e6652e5541380aa3b126f2b70d7cc83abb8215cac6cf2c0f27a2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ms/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ms/firefox-61.0b9.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "327cb543c9a065e874984968955f542cc834b569a7b5c1aa34a71ece9307aaed4c7b4b71fbafd4aea6de19265b61c0b5ac9a688981c21087414b9c2b26631f76";
+      sha512 = "c38b25895cb2486dc5de1d4f759cb3660f81084327ae66166582ca2f39e1783edb1da374162e7b3e28d9519bbaa8995f2864748a3b2170404d47d265f08f38c0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/my/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/my/firefox-61.0b9.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "bbd0eff3ba746da8e547b1b8eca26ab6f75f7371ba532d265eeddab90ae5386b1fcec7e28bbd51e30ce10b372ee0f045eb018809d9c06de070bdcd1a104d77bc";
+      sha512 = "968fbafdf4eb8cd71de1cb276f253eb4c6a7078adcb4b5e1af294e764c4fa37a9397023ad35a41cfcf34097fc6fe20d73e664fb2695cd1698e4fdac81a59f9ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nb-NO/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nb-NO/firefox-61.0b9.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "cd19b1a379423a8f980ce8b8c2d7512a6f2ef513df264d8412c03a779a87e81be253a93ac536bba2284ed9491e03354d77499e13d25f26b3fc1e264aad3b2fe4";
+      sha512 = "f49509695435c0ed75bef24640203d9ddbb2ee799c5c47341938dfdaf5238c3d0408dbc00a88c84e38b73d31b955066aceed1545119508ed9d510e5551c3c145";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ne-NP/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ne-NP/firefox-61.0b9.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "95837d9c588782ab23244bacaf84867dee0a0dffe977e650d231697410f4fda5d17bf15c1d104b0ffde85cda6cbe500c02ef06d6dc8a313ff9b4078c02b40913";
+      sha512 = "3b5df92eb3684622a3991878ae0231674dc33947d350b05c978edf4ef3649ef6e69b773cda17e8b5d3cb8f8a604c59c19e6314c889081e5ca98e1bf44fcb1850";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nl/firefox-61.0b9.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "812350aa3fce5908314b850858117a6744118ebe4a7acb30f6bb0b433cf6597020dc1011e3b0e0c0ae36e307d18c32401bf2391f7aba027eac189f545876b9c6";
+      sha512 = "3439ef70a3a099be344f71242e2ad45fb89f3cb63ca762a770aa34499b7d0d7dce33546fc987263c309b5c504a04026b2f7ddad327bcf3906b095e965292e6d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/nn-NO/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nn-NO/firefox-61.0b9.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "34c5af7ae0f4658dc61e32e1a1119e5274930e2d14d8444354c69f30ad9ed418f785c18f8c29d36a736d84df8206536bcc66f4e0de71dadf5eda45c1d8804900";
+      sha512 = "e405691dd3fe2ec0e6b54e055da8ca60945068dbc669a95f2baf64348b15ef57785f4add6fcbf4d37aa06f7f618d63db3c794495ff5bcc944def442045188e74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/oc/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/oc/firefox-61.0b9.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "f94347638aed6dc1a922f5d317123ecd43f3fd2ea90733e306b3294020d6d342cf405c2bcf36e3fdde029008eff2d89362d3391984494c4b46c6e22d1167e5f1";
+      sha512 = "3200665e5382d1df831f46ff61b92df6086076bc025b44564169f233a7700ad2ea8f3e1a36c98ce88e2e99860a72d6092c8887180f5d89a1840a3e5a0aab4b2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/or/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/or/firefox-61.0b9.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "9ac83ee0f4ae3575735b352565e77f1679b42beb0180fd130e1e9ff9a08f5dc16bf22cdea964c7b301943f98246a04bb9e6ee701bbd13ac39a9918e23243ebb5";
+      sha512 = "a05c84cbc6ec9afa919a6061fd0cf637ba5337c407ef52bed903f435d2fb7d3e7c3f77298b04bd80f13d0153fc771a1cb3f91a266883e0fa796674880ffcc03f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pa-IN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pa-IN/firefox-61.0b9.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "e790a8b0e681c0ca2e1050f10469de7d40285d1b6320de5c746d247152301f7840b0d97722217ec1c91e8b60d776469312b50b404b00060be1c12ddce66a1bd3";
+      sha512 = "b71d5784ad5f26cd299141f3192d1cd6d1484caf4c5eb45f90b96237b5dd5d6333076a9817fcc62b44e5e05bcef6340b1f5bdf908582b02a798bdd3988d59370";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pl/firefox-61.0b9.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "743098c536707cbef541dc3a5ee7cefd1a6bf57ebe19bc059e459c028f95860714b5b37c086a3501ae61e7750d04da55f9f711f92b8619d8726e5b6f3c1a9112";
+      sha512 = "8db81ab58c019e0abc4a8c3b58c41681a248d64369b9c1a48336e7f04c3bde8af996b30de8cd440e914ac1ea221fbf000df7ec87352e22720cf99883e6d64290";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pt-BR/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pt-BR/firefox-61.0b9.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "a667d28a6ddf5d0d8d12435d0b9187f25a89c4432a74d75b71455b3ddad39ffaf6466028b41fbbf3b27c2eaf8fee8cc33eeb7f9d1d8d302a07ab0d17f2c55a24";
+      sha512 = "d2d499aad2075d23c3eca76b4af2c9d25c026deaea5cfed9e8954cd1248a63f051d0a670d043d8dbe4a8dd62b001f460ec7141e4f00769c1dd62239124e777be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/pt-PT/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pt-PT/firefox-61.0b9.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "f94fec90086a3bcafeb27b751c83cb387ebe7d3c4d526a4989995df37096605476fccdc936b98d60ef3aa213df908cc9bc63878888354b54cd591ac3f9aed11a";
+      sha512 = "5dd6a7e1d3dbdef7c3987744a3dc79dc9beaa2ceb59291160e43b2691151653f98303c2bd7023302fa86986887aacc780e31fb563238e08e748a05939251599c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/rm/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/rm/firefox-61.0b9.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "a18afe847507286caac299c2ed943e0c98159a6492c1c76e157bd82565831b2ae0611548f441a2ca6fcf56aad77db2c6147c4fe115d4a64fed6bb580c5f4fdf1";
+      sha512 = "43b7e42163f582f496bb1fbedf95d822c3a6d801e3695001e9d9265f73cfd4101d1d20a8ea5e8f2051b3a4633365af393b044559440924f825d4fb7ec8a700df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ro/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ro/firefox-61.0b9.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "71de8c374087f5bcb2a39e4ff602369996e7cd7f57eb6c0ed10889a69f3fdab87205876680c3511947a4e4a4b3cff8f85f75bef10f646360cb739bd3ea9d2e5b";
+      sha512 = "6d9928ae2f79c3331a7ee308d1b140c9b379de32cf5f3d9eea14e8dd820968264b2e7e90f53fdee0a64fe01fd4d343025a0c83f68def289c53fef97707880e05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ru/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ru/firefox-61.0b9.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "269bf1871a8b70771901dfc21dcdb073af5a11f7df9b512995bfea91be6d8a27660b1c6e18a7b952f3b6358e7ed2e054e7111eadfdda074cc103bb7f05fcccfb";
+      sha512 = "d591bd1d9b178f620f8ec139759aa6825bb13483fdd622149f6106deca780f802cf19f016e3ec9fdcc71ada5bd34ef6a8d4a79a26676769cd2b020e0cdfced81";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/si/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/si/firefox-61.0b9.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "01fc1c359088029645a2e37ccb40c5638d7a11be97618184ef1ac1b0f67249af24dd84fe4b8c00e19fa2436dcd9defcb1ef26f003b44a0bc039078f26447cc5c";
+      sha512 = "537ca6ac0cdcffa041e9cfd4817132e5ed6278c21d600d52a0075242ba7681838c7850a795e8953783ddb4c723b1f470ae723c148dbff793b97929c0ffa97175";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sk/firefox-61.0b9.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "c4cecec4ef1d90bcfdf2c1da97b02864f21c52c23a7dbdc1ad5f10ea8010a8540c98847a1b7155c88c22200bbac51d1802e7fedb21f379ce16b34548c7b063a1";
+      sha512 = "8ec463c0b4dcdc8af09a68b161aa0b44b554e0520d0f59b2ea0b97a0fce0f6fe4084f5d942f51480ff55071f41a06e0e90aba78591ae63b20a255ca51c4c1fd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sl/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sl/firefox-61.0b9.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "a3ab6bd25bdc33bcd062b0ae3bc50808e1a2dd1728c3f9872b071cbf0d352746718e743a2488503a6981a3c3ff48d2bdf0fe0001bd56cb6b90e675067fd555e5";
+      sha512 = "6e48bd9b56110db58b78c7f46009be572ac5d70d6423732f42e583f5bf1f07bac88a63381d800ba419d502d5deda242cd65c2ebb493975f75ad4b73d23d3229b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/son/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/son/firefox-61.0b9.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "a67a2d0260e3f83750d00d9fdbc787a12663bb4c574e263cef065b590fee14fabe4e0ee51012f3c434f1ce27f094c6752a5811f71026bd1f1c3dc3c02adfab7d";
+      sha512 = "5d38f57f414ffc2497ae08a58ae7458c57f8c346d97e39c6c5f1d6400fe6c2243461a822080932a38873a1f0e497730ef0df74de78017789dca5290e92d2f92f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sq/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sq/firefox-61.0b9.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "ab847007a0b3f4d2a7f6455970a12bb1c613f3b9fc1904094e45531de97a559b7e3dafa99319acd2953eb9bd7779b2e6b3a3371d5bb2275fbd58c7545c5ddcb9";
+      sha512 = "c8e1ea770afd0e69816d1ca8f9b12b440c99227f2e5c49d6130a8eaef9988fa7735fd05087dc28b428dd977ed6035c96895ce6b9091a08b0a3b2bf0ea38e97fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sr/firefox-61.0b9.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "65c574255e33141c39b0b17600a7dd957b0d35075d167dc659cce449b0b2c72cf3afb116ddb71ffb20404dd80e2af0db3a5722706f22a62d5cabb5f7e48a1ccf";
+      sha512 = "56585f6e9a6581d6ba21e528f8806ae84dc24c0ddddae0137a5563fdcf049cf2250d9fe7996e5ced947c285a5765cf45543bc442cc8e0c7c56e3abac277e7fd7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/sv-SE/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sv-SE/firefox-61.0b9.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "8277dffec3048999fc588c56490306c9da2891d91fe30c49c21a3cf958bc6528243067d02eee9aeb05800cdd0fb98739754bcc6811c8d67f2175f5cb2b3d47ec";
+      sha512 = "7db5b6a4d25e30641743cce3cf2eb366c8a6fac93d421d6d14d9e71a1f3a772a737223b8954e2b3c41b7ae20079e2a8d24976c4869ec4d3abf085ab784c9f805";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ta/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ta/firefox-61.0b9.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "13656b88fe3f49c11fb7ed8815b8b0e9782bb8ee0d55ea18ba43e3a4254d5a8b5dbff358f2560df38af6b2d05a6c9738296c38ade5d871c47f02fdeca24f7a8a";
+      sha512 = "860c256a0893ea5f4ef0876997d807afe24d7526dd62811c079b3d2c9678df187ccee3020277c172d50077121e601345d9a654e0f6eb2f28ee8e8dd2c96678e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/te/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/te/firefox-61.0b9.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "55f6793a2f885a7a23235e7b8e9f3ffdfb84318f1e4d19e3532f23530b90c199b0595e2085ff6012c36658aabbf05f0a0cccbe8fdf3f7a4503b781a19eea80fa";
+      sha512 = "365d1f7d61441056e3240d30ffa8f507337b44fda9b8a1c04fef5ef32613535e2ef29061a4570c1239fc3dd7183892eb896acd823c5805d77e4167adef077e77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/th/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/th/firefox-61.0b9.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "236de626cf8c423b2fb6fc357956822426621effa6cc5cc2910c59d63d7e2a3812b40dbc1d198a4fefcef6bf9d48086c1407ddbc4689d905d07b16aac5ad8811";
+      sha512 = "5c3e4320848c716e90d1426f76d43a9ba44660eeba55fe6d08d7e1cdc88987f9d2051141c5b3bb45bdd977a8793c9cc1713fa8ae95c23c04cbebab546d9a86d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/tr/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/tr/firefox-61.0b9.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "82362cbbc0be52b2e35253637b3fdce21ecc0736770a04e9b19f1d99c18e185fd6e84820c2d086eb7f53bd6852c4355451da4fc8d08b559bd4630bdfa87847ae";
+      sha512 = "6bd8bc524a9fba341f0be0c5c73897279e4e70713545ddd279c1ea760f87f6a14e8d7ce72486a26bb2e42f6238f4e4806b8fb7b0cff04a89a564c0a6c5188055";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/uk/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/uk/firefox-61.0b9.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "dd8a9b74437371f7bf32a71056956d9f38d103c53f727b2c8ef8939d778d32e7b2e6f5e74f76b69db0bb41a7853aedcdd3402dc93f0e6d5a69671abef248ef16";
+      sha512 = "187869732f00a8fa29c3c7ca1437f90ac795a155578a0742a802e6fe3c5a03de54da7d6fa0f4a85bde009bf346e2f505f4485be86bf34dab0b221ed9a6505009";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/ur/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ur/firefox-61.0b9.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "ccd0ce9840db659afd1364c0284e426cfd3844de28ab06da474688423aed0159e07c831e620b3743b82f868b1d273ca561e906680b90683076f9279adc292659";
+      sha512 = "ba2e4d0e603dcafc3d18881506ea5d7cf9493c116cb5771d2b00b455ee37453dfcba4df30401c390d86377252ba6f961b4ad92c0b777eaef23081443280ce3e8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/uz/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/uz/firefox-61.0b9.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "6128afe781edc53e4407f3039b84947774e08d72f9734e209a7ad27200aeb01696d6453df9f6044f6af701f84ca479a17f8d43f955102d431c069f409045320c";
+      sha512 = "4cbe45129e0b4d7961cdc911dd6e220b5be7a82cfa8b86d688d0c0489c872f50c3fa34f2fc7b6f645a81511a1035ffc9e0bee695d87f512039416b0541698ee9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/vi/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/vi/firefox-61.0b9.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "fc7b6e37518e0c7350f3871a0980f2ad4b8fcc89164f425b2f8666f73290330fb2e98fba64e410b2f0e8c14207b621db08a62dac6817e7288374f46a29d5eb9b";
+      sha512 = "482feb16a9cf314d4aa6807bc31477e5149a7a769f060e69f9e9a94ef97cc6e951cc585f9fa8bc93b2614f02904791a027de81034174e9a976d33f01bb111462";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/xh/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/xh/firefox-61.0b9.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "28b6d0ad1335a39d7a742d4592c7ece02412ebe094180d80e7644f9a7c00013dc0e436227e2c58288e2a2d78a4ec092e450e44c21f9465eca0aa5210a0863423";
+      sha512 = "be46161eb9c7cafc89229afcc4242d4780738a040316ee61297bd97b45531fcf84c0df329fbe97bfde4f6b42c63e2715b43a24c93855b1493140fbedf24ab158";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/zh-CN/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/zh-CN/firefox-61.0b9.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "31970227a01282d9a5381d988cf276ea1ddefba5fdf97e065e371fe4394eaaa0f092697fbdfd9bd6d8a83e538c66bfbc0b6b8e2733d5efc881ade74ee5b4526d";
+      sha512 = "0be0d3df82ba0623ab20386c52bdfbe95f9348ce9eebc7419ee825e8bbd27dcda3e16d0258fd30deea814c4133130842ec9108ebc3c5d79f2138ec3ce3adfa90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b8/linux-i686/zh-TW/firefox-61.0b8.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/zh-TW/firefox-61.0b9.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "4fd5524002e224c6a2601af7f7989647b4cdb7c9bb99680675f5af45508b2555d3317d4d933cc1917d54572fa4571405490c6af1649bf696bacdd4188ead7bff";
+      sha512 = "67f180a71b1cce75d24b9dbf78b914202dcb2e03e7e659e1538b6fe1e3d833ab188dcea70ce5ef99c9fadd7d8ddadab3de808f002005ea2de9038cccfe20e25e";
     }
     ];
 }

From 4e4fb651305251d02120d4ced7c1bc095eefef64 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 30 May 2018 13:10:47 +0800
Subject: [PATCH 2761/3370] xca: 1.4.1 -> 2.0.1

---
 pkgs/applications/misc/xca/default.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 270380a8c3fb..5373d2394c16 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,20 +1,27 @@
-{ mkDerivation, lib, fetchurl, pkgconfig, which
+{ mkDerivation, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, which
 , libtool, openssl, qtbase, qttools }:
 
 mkDerivation rec {
   name = "xca-${version}";
-  version = "1.4.1";
+  version = "2.0.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/xca/${name}.tar.gz";
-    sha256 = "11niik2m4yswkp71hrdh54z5kgkvdg8y0b6wdqbrn6vy1n8gz63q";
+  src = fetchFromGitHub {
+    owner  = "chris2511";
+    repo   = "xca";
+    rev    = "RELEASE.${version}";
+    sha256 = "0906xnmqzd9q5irxzm19361vhzig9yqsmf6wsc3rggniix5bk3a8";
   };
 
-  enableParallelBuilding = true;
+  postPatch = ''
+    substituteInPlace doc/code2html \
+      --replace /usr/bin/perl ${perl}/bin/per l
+  '';
 
   buildInputs = [ libtool openssl qtbase qttools ];
 
-  nativeBuildInputs = [ pkgconfig which ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig which ];
+
+  enableParallelBuilding = true;
 
   configureFlags = [ "CXXFLAGS=-std=c++11" ];
 

From 70a041ea8ba75a38f9fa2a4a83aad83599e56c55 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 05:54:48 +0000
Subject: [PATCH 2762/3370] conntrack-tools: 1.4.4 -> 1.4.5

Fix build with libnetfilter_conntrack 1.0.7.
---
 pkgs/os-specific/linux/conntrack-tools/default.nix | 4 ++--
 pkgs/tools/networking/telepresence/default.nix     | 4 ++--
 pkgs/top-level/aliases.nix                         | 1 +
 pkgs/top-level/all-packages.nix                    | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix
index 9736d7a8f4bd..8f9983b5d6e3 100644
--- a/pkgs/os-specific/linux/conntrack-tools/default.nix
+++ b/pkgs/os-specific/linux/conntrack-tools/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "conntrack-tools-${version}";
-  version = "1.4.4";
+  version = "1.4.5";
 
   src = fetchurl {
     url = "http://www.netfilter.org/projects/conntrack-tools/files/${name}.tar.bz2";
-    sha256 = "0v5spmlcw5n6va8z34f82vcpynadb0b54pnjazgpadf0qkyg9jmp";
+    sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix
index fe728dbbd0ab..bbdaed4ccc04 100644
--- a/pkgs/tools/networking/telepresence/default.nix
+++ b/pkgs/tools/networking/telepresence/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git
-, python3, sshfs-fuse, torsocks, sshuttle, conntrack_tools }:
+, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools }:
 
 let
   sshuttle-telepresence = lib.overrideDerivation sshuttle (p: {
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
     cp cli/telepresence $out/libexec/telepresence
 
     makeWrapper $out/libexec/telepresence $out/bin/telepresence \
-      --prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack_tools sshuttle-telepresence]}
+      --prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence]}
   '';
 
   meta = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5724adf16ad7..458250acce64 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -56,6 +56,7 @@ mapAliases (rec {
   clawsMail = claws-mail; # added 2016-04-29
   clutter_gtk = clutter-gtk; # added 2018-02-25
   conkerorWrapper = conkeror; # added 2015-01
+  conntrack_tools = conntrack-tools; # added 2018-05
   cool-old-term = cool-retro-term; # added 2015-01-31
   cupsBjnp = cups-bjnp; # added 2016-01-02
   cups_filters = cups-filters; # added 2016-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ec08d9cf997..36779a377534 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13175,7 +13175,7 @@ with pkgs;
     pulseSupport = config.pulseaudio or false;
   } // config.conky or {});
 
-  conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { };
+  conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { };
 
   coredns = callPackage ../servers/dns/coredns { };
 

From a94021ef40bbc9f3f5b74310724e02bc369aea6d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 06:04:39 +0000
Subject: [PATCH 2763/3370] uade123: fix build after #28029

---
 pkgs/applications/audio/uade123/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix
index de39c8ecc1cb..7db3b7ec2376 100644
--- a/pkgs/applications/audio/uade123/default.nix
+++ b/pkgs/applications/audio/uade123/default.nix
@@ -8,8 +8,11 @@ in stdenv.mkDerivation rec {
     url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2";
     sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v";
   };
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ which libao ];
+  nativeBuildInputs = [ pkgconfig which ];
+  buildInputs = [ libao ];
+
+  enableParallelBuilding = true;
+  hardeningDisable = [ "format" ];
 
   meta = with stdenv.lib; {
     description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API";

From ac8dc50c5db723f7a93495272f359e3d5d98ae98 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 06:23:46 +0000
Subject: [PATCH 2764/3370] pythonPackages.pypeg2: fix nondeterministic test
 failure

If test_xmlast runs before test_pyPEG2, the tests fail with:

ERROR: runTest (pypeg2.test.test_pyPEG2.ParseInvisibleTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/build/pyPEG2-2.15.2/pypeg2/test/test_pyPEG2.py", line 258, in runTest
    self.assertEqual(r._ignore1, None)
AttributeError: 'C1' object has no attribute '_ignore1'

https://hydra.nixos.org/build/74632015
---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b0946a0579c..7023ff68e71f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16941,6 +16941,11 @@ EOF
       sha256 = "0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b";
     };
 
+    checkPhase = ''
+      # The tests assume that test_xmlast does not run before test_pyPEG2.
+      python -m unittest pypeg2.test.test_pyPEG2 pypeg2.test.test_xmlast
+    '';
+
     #https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35
     doCheck = !isPy3k;
 

From 10e4e6a45f8a7d5a305c313d0b00fa972c5fe505 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 30 May 2018 15:01:02 +0800
Subject: [PATCH 2765/3370] xca: typo

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

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 5373d2394c16..ee07401d4846 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -14,7 +14,7 @@ mkDerivation rec {
 
   postPatch = ''
     substituteInPlace doc/code2html \
-      --replace /usr/bin/perl ${perl}/bin/per l
+      --replace /usr/bin/perl ${perl}/bin/perl
   '';
 
   buildInputs = [ libtool openssl qtbase qttools ];

From f43446c9ca382e8d50901b409080171a2087f630 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 22 May 2018 14:07:41 +0200
Subject: [PATCH 2766/3370] vim_configurable: restore ability to override
 python for modules

It seems as Python will be fetched from $PATH in Vim 8.1:

```
stat("/home/ma27/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/run/wrappers/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/home/ma27/.nix-profile/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/nix/var/nix/profiles/default/bin/python", 0x7ffe57a317b0) = -1 ENOENT (No such file or directory)
stat("/run/current-system/sw/bin/python", {st_mode=S_IFREG|0555, st_size=291, ...}) = 0
readlink("/run/current-system/sw/bin/python", "/nix/store/ggjkqbvwnv7dflkmdgmmp"..., 4096) = 72
```

This breaks in cases where you want to use a modified Python derivation
for the VIM plugins you use in `vim_configurable`:

```
let
  vim_configurable' = vim_configurable.override {
    # python with modules for ensime
    python = python.withPackages (ps: with ps; [ sexpdata websocket_client ]);
  };
in
  vim_configurable'.customize {
    # ...
  }
```

With VIM 8.0 this worked perfectly fine, now it's necessary to install
the modified `python` in $PATH to actually use it, otherwise an error
like this arises:

```
[ensime] A dependency is missing, please `pip2 install sexpdata websocket-client` and restart Vim.
Press ENTER or type command to continue
```

However it should be possible to pass the modified Python to the
modules, the easiest workaround is to write a wrapper which prefixes
$PATH to have the Python derivation available.
---
 pkgs/applications/editors/vim/configurable.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 9ffa31f2f2e0..ad04cab62f51 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -5,10 +5,13 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
 , libICE
 , vimPlugins
+, makeWrapper
 
 # apple frameworks
 , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
 
+, wrapPythonDrv ? false
+
 , ... }: with args;
 
 
@@ -106,6 +109,11 @@ composableDerivation {
         feat = "python${if python ? isPy3 then "3" else ""}interp";
         enable = {
           buildInputs = [ python ];
+        } // lib.optionalAttrs wrapPythonDrv {
+          nativeBuildInputs = [ makeWrapper ];
+          postInstall = ''
+            wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin"
+          '';
         } // lib.optionalAttrs stdenv.isDarwin {
           configureFlags
             = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"

From 914994276bc942cefb11804ff3d44e75d7ee168f Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 30 May 2018 07:20:22 +0000
Subject: [PATCH 2767/3370] terminus: gnome2 cleanup (#41173)

* terminus: gnome2 cleanup

* terminus: use toplevel gtk2
---
 pkgs/applications/misc/terminus/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index 67ca05fdb10f..d2a2936680f9 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo
+{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, glib, pango, gdk_pixbuf, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
 , libxcb, makeWrapper, nodejs
-, GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
+, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
-    libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio
+    libXrender libX11 libXtst libXScrnSaver gnome3.gconf nss nspr alsaLib cups expat libudev libpulseaudio
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 36779a377534..b7e449ffdf12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18098,7 +18098,7 @@ with pkgs;
 
   terminator = callPackage ../applications/misc/terminator { };
 
-  terminus = callPackage ../applications/misc/terminus { inherit (gnome2) GConf; };
+  terminus = callPackage ../applications/misc/terminus { };
 
   lxterminal = callPackage ../applications/misc/lxterminal {
     vte = gnome3.vte;

From ca143a4db67aef6ebdf70bb4419d094aa33689dd Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 30 May 2018 15:27:10 +0800
Subject: [PATCH 2768/3370] vcal: 2.7 -> 2.8

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

diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix
index 0964be1f1ea1..9225bd86492e 100644
--- a/pkgs/applications/misc/vcal/default.nix
+++ b/pkgs/applications/misc/vcal/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "vcal-${version}";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchurl {
     url    = "http://waynemorrison.com/software/vcal";
-    sha256 = "0fknrlad7vb84ngh242xjaq96vkids85ksnxaflk2cr9wcwxfmix";
+    sha256 = "0jrm0jzqxb1xjp24hwbzlxsh22gjssay9gj4zszljzdm68r5afvc";
   };
 
   nativeBuildInputs = [ perl ]; # for pod2man
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     substitute ${src} $out/bin/vcal \
       --replace /usr/bin/perl ${perl}/bin/perl
     chmod 0755 $out/bin/*
-    pod2man -n vcal ${src} > $out/share/man/man1/vcal.1
+    pod2man --name=vcal --release=${version} ${src} > $out/share/man/man1/vcal.1
 
     runHook postInstall
   '';
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Parser for VCalendar and ICalendar files, usable from the command line";
     homepage = http://waynemorrison.com/software/;
-    license = licenses.unfree; # "These are made publicly available for personal use."
+    license = licenses.asl20;
     maintainers = with maintainers; [ peterhoeg ];
   };
 }

From 1d5c454b727bfb206e7c5d4cb6044fcb457e9412 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Wed, 30 May 2018 09:30:50 +0200
Subject: [PATCH 2769/3370] gtkd: dontStrip as a workaround for
 https://github.com/NixOS/nixpkgs/issues/40397 (#41226)

This fixes https://github.com/NixOS/nixpkgs/issues/41188
---
 pkgs/development/libraries/gtkd/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index 5a4cf75048f7..cf4a990d7f71 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -84,6 +84,10 @@ stdenv.mkDerivation rec {
 
   installFlags = "prefix=$(out)";
 
+  # Workaround for https://github.com/NixOS/nixpkgs/issues/40397
+  # Remove after update to binutils 2.31
+  dontStrip = true;
+
   inherit atk cairo gdk_pixbuf librsvg pango;
   inherit (gnome3) glib gtk3 gtksourceview libgda libpeas vte;
   inherit (gst_all_1) gstreamer;

From e26e99b64c6fc878c5198a5e2a671c16a0e52af2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 May 2018 02:12:58 -0700
Subject: [PATCH 2770/3370] thttpd: 2.28 -> 2.29 (#41233)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/thttpd/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/hbab4sxrd03rn29fr2hzxcqhdb11ac7r-thttpd-2.29/bin/htpasswd had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/hbab4sxrd03rn29fr2hzxcqhdb11ac7r-thttpd-2.29/bin/makeweb had a zero exit code or showed the expected version
- /nix/store/hbab4sxrd03rn29fr2hzxcqhdb11ac7r-thttpd-2.29/bin/syslogtocern passed the binary check.
- /nix/store/hbab4sxrd03rn29fr2hzxcqhdb11ac7r-thttpd-2.29/bin/thttpd passed the binary check.
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 2.29 with grep in /nix/store/hbab4sxrd03rn29fr2hzxcqhdb11ac7r-thttpd-2.29
- directory tree listing: https://gist.github.com/e0eb71192cc958ded9003250a4a4f65b
- du listing: https://gist.github.com/890be31bcaa84f99915896503cde2679
---
 pkgs/servers/http/thttpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index c234a1ae1ee7..8256bd9c734b 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "thttpd-${version}";
-  version = "2.28";
+  version = "2.29";
 
   src = fetchurl {
     url = "http://acme.com/software/thttpd/${name}.tar.gz";
-    sha256 = "0a03w7wg994dizdb37pf4kd9s5lf2q414721jfqnrqpdshlzjll5";
+    sha256 = "15x3h4b49wgfywn82i3wwbf38mdns94mbi4ma9xiwsrjv93rzh4r";
   };
 
   prePatch = ''

From 003a0b7ccdb003cef54f4c7a1ccce1630a954ece Mon Sep 17 00:00:00 2001
From: patternspandemic <patternspandemic@live.com>
Date: Wed, 30 May 2018 02:40:44 -0700
Subject: [PATCH 2771/3370] ponyc: 0.21.3 -> 0.22.2 (#41234)

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

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 28f12b8ba370..998d7cd90dee 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.21.3";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "0cdp6wbpirl3jnlqkm0hbxyz67v00nwhi4hvk4sq2g74f36j2bnm";
+    sha256 = "1sw038mci4174zn8n3b4p511bdwjb3hwrv5gyzbv477nna1y9lvn";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From 0eea0209cf3e49fc1fdaffd9812afcc8977018ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 30 May 2018 11:47:09 +0200
Subject: [PATCH 2772/3370] nix: 2.0.2 -> 2.0.3

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 5ad28ea9499e..a7d41d4a8436 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/z6avpvg24f6d1br2sr6qlphsq3h4d91v-nix-2.0.2";
-  i686-linux = "/nix/store/cdqjyb9srhwkc4gqbknnap7y31lws4yq-nix-2.0.2";
-  aarch64-linux = "/nix/store/fbgaa3fb2am30klwv4lls44njwqh487a-nix-2.0.2";
-  x86_64-darwin = "/nix/store/hs8mxsvdhm95dxgx943d74fws01j2zj3-nix-2.0.2";
+  x86_64-linux = "/nix/store/8d9zsq17v8f7lgbc5ca6gv438gk1ydqm-nix-2.0.3";
+  i686-linux = "/nix/store/7k7ca4ck24yqinbr9nyl5z2wmcx4l81g-nix-2.0.3";
+  aarch64-linux = "/nix/store/ckmrh426n1swlq9h4d53hvrxjc72avzp-nix-2.0.3";
+  x86_64-darwin = "/nix/store/2jp9d9qns3372hkx4k523hc1bbzkr4yp-nix-2.0.3";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 8f503d12935e..076451de31e2 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -133,10 +133,10 @@ in rec {
   }) // { perl-bindings = nixStable; };
 
   nixStable = (common rec {
-    name = "nix-2.0.2";
+    name = "nix-2.0.3";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435";
+      sha256 = "4f2f1d624cecac3baf7a026f89e08cf3d01bd6983cc7812bca4178092e436660";
     };
   }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
 

From ad14ad89ab67c02772466665146df5a1541bf0bb Mon Sep 17 00:00:00 2001
From: patternspandemic <patternspandemic@live.com>
Date: Wed, 30 May 2018 02:55:14 -0700
Subject: [PATCH 2773/3370] pony-stable: 0.1.1 -> 0.1.2 (#41235)

---
 pkgs/development/compilers/ponyc/pony-stable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix
index 0e382efd7079..ce4d44774f69 100644
--- a/pkgs/development/compilers/ponyc/pony-stable.nix
+++ b/pkgs/development/compilers/ponyc/pony-stable.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pony-stable-${version}";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "pony-stable";
     rev = version;
-    sha256 = "0v4039iijjv93m89s3dsikcbp1y0hml6g1agj44s6w2g4m8kiiw3";
+    sha256 = "1g0508r66qjx857cb1cycq98b0gw7s1zn1l7bplyj1psk8mqh7kz";
   };
 
   buildInputs = [ ponyc ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "A simple dependency manager for the Pony language.";
     homepage = https://www.ponylang.org;
     license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm ];
+    maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

From d985d9d2d5fdf34df26466ed4b14e9834dd6b637 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 30 May 2018 01:39:49 -0700
Subject: [PATCH 2774/3370] rr: 5.1.0 -> 5.2.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/rr/versions.

These checks were done:

- built on NixOS
- /nix/store/yavka83b6xy0fd22d63gvs5jhzq2yl4f-rr-5.2.0/bin/signal-rr-recording.sh passed the binary check.
- Warning: no invocation of /nix/store/yavka83b6xy0fd22d63gvs5jhzq2yl4f-rr-5.2.0/bin/rr_page_64 had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/yavka83b6xy0fd22d63gvs5jhzq2yl4f-rr-5.2.0/bin/rr_page_64_replay had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/yavka83b6xy0fd22d63gvs5jhzq2yl4f-rr-5.2.0/bin/rr_page_32 had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/yavka83b6xy0fd22d63gvs5jhzq2yl4f-rr-5.2.0/bin/rr_page_32_replay had a zero exit code or showed the expected version
- /nix/store/yavka83b6xy0fd22d63gvs5jhzq2yl4f-rr-5.2.0/bin/rr passed the binary check.
- Warning: no invocation of /nix/store/yavka83b6xy0fd22d63gvs5jhzq2yl4f-rr-5.2.0/bin/rr_exec_stub had a zero exit code or showed the expected version
- 2 of 7 passed binary check by having a zero exit code.
- 1 of 7 passed binary check by having the new version present in output.
- found 5.2.0 with grep in /nix/store/yavka83b6xy0fd22d63gvs5jhzq2yl4f-rr-5.2.0
- directory tree listing: https://gist.github.com/74edbd75eb39af483431d15e9b4c34a8
- du listing: https://gist.github.com/a6983da3782900061246fd222ecc50f9
---
 pkgs/development/tools/analysis/rr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 84bcac18b0fd..01caa59fe4c3 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb, capnproto }:
 
 stdenv.mkDerivation rec {
-  version = "5.1.0";
+  version = "5.2.0";
   name = "rr-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "rr";
     rev = version;
-    sha256 = "16v08irycb295jjw5yrcjdagvkgcgg4hl5qz215hrw1ff4g7sazy";
+    sha256 = "19jsnm8n2smalx2z60x9d8f6g4kdm7zghwyjfvwcxnslk1vn9dkc";
   };
 
   postPatch = ''

From 7edfd9dbe15b865a4db6da81cc97697de2f8ff79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 30 May 2018 12:52:04 +0200
Subject: [PATCH 2775/3370] multi-ghc-travis: update to git head from
 2018-05-22

---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 2ba1d64675a6..394e603ee217 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -8,8 +8,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "b65ea5b35c59d1e7d0f89ff4e21840dc0e2ec3a0";
-    sha256 = "0qgsll772x24nnkarj30mplmvvwzz5vn5aadn5xzkcn77g5jiqmg";
+    rev = "a0d76bc5dde3b1cc790a32f84b9ce084e7596f1e";
+    sha256 = "1wrn9f5rz0nafcwisima6rp18v3a2kjgsyq2wj7vhinqwx9z72r4";
   };
   isLibrary = true;
   isExecutable = true;

From 396d01415a7d82abd616a3def5f075b80ab7e542 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 07:19:30 +0000
Subject: [PATCH 2776/3370] pythonPackages.cryptacular: disable on the current
 Pythons

---
 pkgs/development/python-modules/cryptacular/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cryptacular/default.nix b/pkgs/development/python-modules/cryptacular/default.nix
index e81426a892d6..02c1c420bfda 100644
--- a/pkgs/development/python-modules/cryptacular/default.nix
+++ b/pkgs/development/python-modules/cryptacular/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi
+{ stdenv, buildPythonPackage, fetchPypi, isPy27, pythonAtLeast
 , coverage, nose, pbkdf2 }:
 
 buildPythonPackage rec {
@@ -16,6 +16,10 @@ buildPythonPackage rec {
   # TODO: tests fail: TypeError: object of type 'NoneType' has no len()
   doCheck = false;
 
+  # Python >=2.7.15, >=3.6.5 are incompatible:
+  # https://bitbucket.org/dholth/cryptacular/issues/11
+  disabled = isPy27 || pythonAtLeast "3.6";
+
   meta = with stdenv.lib; {
     maintainers = with maintainers; [ domenkozar ];
   };

From 3d2fd2268b1c9b923bbc2482332a93a863027c27 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr>
Date: Wed, 30 May 2018 14:31:07 +0200
Subject: [PATCH 2777/3370] cfitsio: add darwin support

---
 .../cfitsio/darwin-curl-config.patch          | 25 +++++++++++++++++++
 .../libraries/cfitsio/darwin-universal.patch  | 12 +++++++++
 .../development/libraries/cfitsio/default.nix |  6 +++--
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/cfitsio/darwin-curl-config.patch
 create mode 100644 pkgs/development/libraries/cfitsio/darwin-universal.patch

diff --git a/pkgs/development/libraries/cfitsio/darwin-curl-config.patch b/pkgs/development/libraries/cfitsio/darwin-curl-config.patch
new file mode 100644
index 000000000000..77d8f719d778
--- /dev/null
+++ b/pkgs/development/libraries/cfitsio/darwin-curl-config.patch
@@ -0,0 +1,25 @@
+diff -ruN cfitsio/configure cfitsio-curl-config/configure
+--- cfitsio/configure	2018-05-09 21:16:00.000000000 +0200
++++ cfitsio-curl-config/configure	2018-05-30 13:28:58.000000000 +0200
+@@ -4783,13 +4783,6 @@
+ CURL_LIB=""
+ CURL_INC=""
+ # Use curl-config to get compiler & linker flags, if available.
+-# On Macs, prefer XCode curl-config, and reject MacPorts version
+-# until further notice to prevent build errors:
+-if test "x$EXT" = xdarwin -a -x /usr/bin/curl-config; then
+-  CURLCONFIG="/usr/bin/curl-config"
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: checking for curl-config... choosing /usr/bin/curl-config on Mac" >&5
+-$as_echo "checking for curl-config... choosing /usr/bin/curl-config on Mac" >&6; }
+-else
+   # Extract the first word of "curl-config", so it can be a program name with args.
+ set dummy curl-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -4833,7 +4826,6 @@
+   fi
+ fi
+ fi
+-fi
+ CURLCONFIG=$ac_cv_prog_CURLCONFIG
+ if test -n "$CURLCONFIG"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLCONFIG" >&5
diff --git a/pkgs/development/libraries/cfitsio/darwin-universal.patch b/pkgs/development/libraries/cfitsio/darwin-universal.patch
new file mode 100644
index 000000000000..db9b7b5a56e4
--- /dev/null
+++ b/pkgs/development/libraries/cfitsio/darwin-universal.patch
@@ -0,0 +1,12 @@
+diff -ruN cfitsio/configure cfitsio-universal/configure
+--- cfitsio/configure	2018-05-09 21:16:00.000000000 +0200
++++ cfitsio-universal/configure	2018-05-30 14:26:03.000000000 +0200
+@@ -4734,7 +4734,7 @@
+         *)
+             # Build 'Universal' binaries (i386 & x86_64 architectures) and
+             # use rpath token on Darwin 10.x or newer:
+-            SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
++            SHLIB_LD="$CC -dynamiclib -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
+             ;;
+     esac
+ 
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index ecf5fb1f02fd..1fc9b62ccc86 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -8,9 +8,11 @@
     sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l";
   };
 
+  patches = [ ./darwin-curl-config.patch ./darwin-universal.patch ];
+
   # Shared-only build
   buildFlags = "shared";
-  patchPhase = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
+  postPatch = '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
    '';
 
   meta = with stdenv.lib; {
@@ -27,6 +29,6 @@
       '';
     # Permissive BSD-style license.
     license = "permissive";
-    platforms = platforms.linux;
+    platforms = with platforms; linux ++ darwin;
   };
 }

From b4b65b2e67202d32a19bad9f83674d6e937ed8a9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 30 May 2018 07:44:47 -0500
Subject: [PATCH 2778/3370] hub: 2.2.9 -> 2.3.0

Hooray!
---
 .../git-and-tools/hub/default.nix             | 26 +++++++++----------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 5c70b2cb2053..46d33d1944ca 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -1,31 +1,29 @@
-{ stdenv, fetchgit, go, Security }:
+{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }:
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "2.2.9";
+  version = "2.3.0";
 
   src = fetchgit {
     url = https://github.com/github/hub.git;
     rev = "refs/tags/v${version}";
-    sha256 = "195ckp1idz2azv0mm1q258yjz2n51sia9xdcjnqlprmq9aig5ldh";
+    sha256 = "0rx5izxgjxh4jdn991x90xvgbc7nhwx15pkmmzc8rkdzf0hnas1s";
   };
 
 
-  buildInputs = [ go ] ++ stdenv.lib.optional stdenv.isDarwin Security;
-
-  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+  buildInputs = [ go ronn groff utillinux ]
+    ++ stdenv.lib.optional stdenv.isDarwin Security;
 
   buildPhase = ''
+    mkdir bin
+    ln -s ${ronn}/bin/ronn bin/ronn
+
     patchShebangs .
-    sh script/build
+    make all man-pages
   '';
 
   installPhase = ''
-    mkdir -p "$out/bin"
-    cp bin/hub "$out/bin/"
-
-    mkdir -p "$out/share/man/man1"
-    cp "man/hub.1" "$out/share/man/man1/"
+    prefix=$out sh -x < script/install.sh
 
     mkdir -p "$out/share/zsh/site-functions"
     cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub"
@@ -33,8 +31,8 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/etc/bash_completion.d"
     cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/"
 
-# Should we also install provided git-hooks?
-# ?
+    # Should we also install provided git-hooks?
+    # And fish completion?
   '';
 
   meta = with stdenv.lib; {

From 1ecb4eb4e0307ef17c4f9ea1955c62ce248b4955 Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Wed, 30 May 2018 13:58:34 +0100
Subject: [PATCH 2779/3370] invoice2data: init at 0.2.93

---
 pkgs/tools/text/invoice2data/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/text/invoice2data/default.nix

diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix
new file mode 100644
index 000000000000..646efbab5bf3
--- /dev/null
+++ b/pkgs/tools/text/invoice2data/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, python3Packages, xpdf, imagemagick, tesseract }:
+
+python3Packages.buildPythonPackage rec {
+  pname = "invoice2data";
+  version = "0.2.93";
+
+  src = python3Packages.fetchPypi {
+    inherit pname version;
+    sha256 = "1phz0a8jxg074k0im7shrrdfvdps7bn1fa4zwcf8q3sa2iig26l4";
+  };
+
+  makeWrapperArgs = ["--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ imagemagick xpdf tesseract ]}" ];
+
+  propagatedBuildInputs = with python3Packages; [ unidecode dateparser pyyaml pillow chardet pdfminer ];
+
+  # Tests fails even when ran manually on my ubuntu machine !!
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Data extractor for PDF invoices";
+    homepage = https://github.com/invoice-x/invoice2data;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7e449ffdf12..e76602fb3d99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3099,6 +3099,8 @@ with pkgs;
 
   intecture-cli = callPackage ../tools/admin/intecture/cli.nix { };
 
+  invoice2data  = callPackage ../tools/text/invoice2data  { };
+
   iodine = callPackage ../tools/networking/iodine { };
 
   ioping = callPackage ../tools/system/ioping { };

From 4f2d387a6420b6d53af24531abf6b0e9707d52c4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 May 2018 10:05:25 -0400
Subject: [PATCH 2780/3370] linux: 4.4.133 -> 4.4.134

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 409bc590ac06..1f9b52c8db74 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.133";
+  version = "4.4.134";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0vhg23i49s4k8lbsrs8y6rvqjld84qgifmim5qcrndr6yj68fmk0";
+    sha256 = "14gvkpdm3wbdfifnkrlk8b3i2isb439prqrzzlvjh88h582x4y20";
   };
 } // (args.argsOverride or {}))

From 1267e75d441889cdedd58f75b00fdf59d5a9d1a7 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 May 2018 10:05:42 -0400
Subject: [PATCH 2781/3370] linux: 4.9.103 -> 4.9.104

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index bf74d91a7d7b..8d4094075a49 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.103";
+  version = "4.9.104";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1n4kqa0yf5svg8jk647h4awz3ygq696yi0agnmbz0alxnynffsij";
+    sha256 = "13f30b7z9sp9h1kwjahla194k7ji46z3pr706caapn71npn55abv";
   };
 } // (args.argsOverride or {}))

From 346304cc787a5292276e66f54569a00243aa0342 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 May 2018 10:05:57 -0400
Subject: [PATCH 2782/3370] linux: 4.14.44 -> 4.14.46

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index c1246e56dea1..a7277d679684 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.44";
+  version = "4.14.46";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1r68dvcyidnmr4d49rq58lidy32fijz08xzymxjwmxi5mzk5dcrf";
+    sha256 = "0cpnfsxf2ici3yfn1bxix6219fri2s3ld19hpf00z9im8x91px4h";
   };
 } // (args.argsOverride or {}))

From bbfd8e4f6f646714de5304f0e874ccfc361189b6 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 May 2018 10:06:24 -0400
Subject: [PATCH 2783/3370] linux: 4.16.12 -> 4.16.13

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index c2bebb361342..4fe2e405698b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.12";
+  version = "4.16.13";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "078if7mmlq4csv0d7x7rpsc8zs7m6rpz75h6878r0d2silsphw2n";
+    sha256 = "1qzj5mbkxkrpmnwws8vdz292gp863kybrgr9bvgs7v28plx7n2kg";
   };
 } // (args.argsOverride or {}))

From db82093857902d15b3ae35f783e2e1f431105e1c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 29 May 2018 16:30:35 -0700
Subject: [PATCH 2784/3370] stunnel: 5.45 -> 5.46

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/stunnel/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/9dvqa02pamz2wgzrpsjlzvf02qlmmabj-stunnel-5.46/bin/stunnel3 had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/9dvqa02pamz2wgzrpsjlzvf02qlmmabj-stunnel-5.46/bin/stunnel had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 5.46 with grep in /nix/store/9dvqa02pamz2wgzrpsjlzvf02qlmmabj-stunnel-5.46
- directory tree listing: https://gist.github.com/fa7d88d4b57706beacb1a6c4ca25a0ab
- du listing: https://gist.github.com/1eb91f78f53c9d1e590c49e38c2869f3
---
 pkgs/tools/networking/stunnel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 4ae7f87c54d2..bbef1f285c33 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.45";
+  version = "5.46";
 
   src = fetchurl {
     url    = "https://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "1qrfb418skdcm7b3v30ixng1ng907f4rfv54zvgz8jwakf1l90jl";
+    sha256 = "1iw4gap9ysag8iww2ik029scmdllk7jdzcpnnbj7hgbl526b9akn";
     # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256",
     # not the output of `nix-prefetch-url`
   };

From aa637fe12acf45eb86a2c3084be6e93c3f6b39ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@apb.name>
Date: Mon, 28 May 2018 21:52:55 +0200
Subject: [PATCH 2785/3370] medfile: init at 3.3.1

---
 .../development/libraries/medfile/default.nix | 24 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/libraries/medfile/default.nix

diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix
new file mode 100644
index 000000000000..5a29a9219fb8
--- /dev/null
+++ b/pkgs/development/libraries/medfile/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, hdf5 }:
+
+stdenv.mkDerivation rec {
+  name = "medfile-${version}";
+  version = "3.3.1";
+
+  src = fetchurl {
+    url = "http://files.salome-platform.org/Salome/other/med-${version}.tar.gz";
+    sha256 = "1215sal10xp6xirgggdszay2bmx0sxhn9pgh7x0wg2w32gw1wqyx";
+  };
+
+  buildInputs = [ cmake hdf5 ];
+
+  checkPhase = "make test";
+
+  postInstall = "rm -r $out/bin/testc";
+
+  meta = with stdenv.lib; {
+    description = "Library to read and write MED files";
+    homepage = http://salome-platform.org/;
+    platforms = platforms.linux;
+    license = licenses.lgpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34fd1a7672be..b0ac1fcd3d0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3369,6 +3369,10 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
 
+  medfile = callPackage ../development/libraries/medfile {
+    hdf5 = hdf5_1_8;
+  };
+
   memtester = callPackage ../tools/system/memtester { };
 
   minergate = callPackage ../applications/misc/minergate { };

From 3088bdd04e118b5bc7927224df4ffd2e17082a8b Mon Sep 17 00:00:00 2001
From: Casey Ransom <casey@dailykos.com>
Date: Wed, 30 May 2018 10:38:58 -0400
Subject: [PATCH 2786/3370] librarian-puppet-go: update license

Issue closed and upstream notes it's under MIT.
---
 pkgs/development/tools/librarian-puppet-go/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/librarian-puppet-go/default.nix b/pkgs/development/tools/librarian-puppet-go/default.nix
index 1e2a421a6702..8adea820ec76 100644
--- a/pkgs/development/tools/librarian-puppet-go/default.nix
+++ b/pkgs/development/tools/librarian-puppet-go/default.nix
@@ -18,7 +18,7 @@ buildGoPackage rec {
   meta = with lib; {
     inherit (src.meta) homepage;
     description = "librarian-puppet implementation in go.";
-    license = licenses.unfree; # still unspecified https://github.com/tmtk75/librarian-puppet-go/issues/5
+    license = licenses.mit;
     maintainers = with maintainers; [ womfoo ];
     platforms = [ "x86_64-linux" ];
   };

From 95998480e69c83fd236b085f6a44092a078197af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= <code@apb.name>
Date: Sun, 27 May 2018 17:22:24 +0200
Subject: [PATCH 2787/3370] freecad: 0.16.6712 -> 0.17

---
 pkgs/applications/graphics/freecad/default.nix | 12 ++++++++----
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix
index d517306c1d61..87565a1e53e5 100644
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@@ -1,19 +1,23 @@
 { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts
-, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper, makeDesktopItem }:
+, hdf5, vtk, medfile, boost, zlib, python27Packages, swig, gfortran
+, soqt, libf2c, makeWrapper, makeDesktopItem
+, mpi ? null }:
+
+assert mpi != null;
 
 let
   pythonPackages = python27Packages;
 in stdenv.mkDerivation rec {
   name = "freecad-${version}";
-  version = "0.16.6712";
+  version = "0.17";
 
   src = fetchurl {
     url = "https://github.com/FreeCAD/FreeCAD/archive/${version}.tar.gz";
-    sha256 = "14hs26gvv7gbg9misxq34v4nrds2sbxjhj4yyw5kq3zbvl517alp";
+    sha256 = "1yv6abdzlpn4wxy315943xwrnbywxqfgkjib37qwfvbb8y9p60df";
   };
 
   buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost
-    zlib python swig gfortran soqt libf2c makeWrapper matplotlib
+    zlib python swig gfortran soqt libf2c makeWrapper matplotlib mpi vtk hdf5 medfile
     pycollada pyside pysideShiboken pysideTools pivy
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0ac1fcd3d0b..eb4f6d901f54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16021,7 +16021,7 @@ with pkgs;
 
   fomp = callPackage ../applications/audio/fomp { };
 
-  freecad = callPackage ../applications/graphics/freecad { };
+  freecad = callPackage ../applications/graphics/freecad { mpi = openmpi; };
 
   freemind = callPackage ../applications/misc/freemind { };
 

From ba1268fd9d557850014484bc38a6ae57009f5ffa Mon Sep 17 00:00:00 2001
From: Michael Fellinger <michael.fellinger@xing.com>
Date: Wed, 30 May 2018 17:54:56 +0200
Subject: [PATCH 2788/3370] Use fetchFromGitHub instead

---
 .../development/compilers/mint/crystal2nix.cr |  4 ++-
 pkgs/development/compilers/mint/default.nix   | 11 +++----
 pkgs/development/compilers/mint/shards.nix    | 30 ++++++++++++-------
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/mint/crystal2nix.cr b/pkgs/development/compilers/mint/crystal2nix.cr
index 5d92ae4afeae..017ebe62b495 100644
--- a/pkgs/development/compilers/mint/crystal2nix.cr
+++ b/pkgs/development/compilers/mint/crystal2nix.cr
@@ -9,6 +9,7 @@ File.open "shards.nix", "w+" do |file|
   file.puts %({)
   yaml = YAML.parse(File.read("shard.lock"))
   yaml["shards"].each do |key, value|
+    owner, repo = value["github"].as_s.split("/")
     url = "https://github.com/#{value["github"]}"
     rev = if value["version"]?
             "v#{value["version"]}"
@@ -24,7 +25,8 @@ File.open "shards.nix", "w+" do |file|
     end
 
     file.puts %(  #{key} = {)
-    file.puts %(    url = "#{url}";)
+    file.puts %(    owner = "#{owner}";)
+    file.puts %(    repo = "#{repo}";)
     file.puts %(    rev = "#{rev}";)
     file.puts %(    sha256 = "#{sha256}";)
     file.puts %(  };)
diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index f28b7db3a56d..619170d4a486 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -1,9 +1,9 @@
-{stdenv, lib, fetchgit, crystal, zlib, openssl, duktape}:
+{stdenv, lib, fetchFromGitHub, crystal, zlib, openssl, duktape}:
 let
   crystalPackages = lib.mapAttrs (name: src:
     stdenv.mkDerivation {
       name = lib.replaceStrings ["/"] ["-"] name;
-      src = fetchgit src;
+      src = fetchFromGitHub src;
       phases = "installPhase";
       installPhase = ''cp -r $src $out'';
       passthru = { libName = name; };
@@ -30,8 +30,9 @@ in
 stdenv.mkDerivation rec {
   version = "2018-05-27";
   name = "mint-${version}";
-  src = fetchgit {
-    url = "https://github.com/mint-lang/mint.git";
+  src = fetchFromGitHub {
+    owner = "mint-lang";
+    repo = "mint";
     rev = "a3f0c86f54b8b3a18dda5c39c2089bdb1d774b4f";
     sha256 = "1bgs6jkwfc2ksq4gj55cl3h2l5g25f5bwlsjryiw9cbx5k4bp1kz";
   };
@@ -51,7 +52,7 @@ stdenv.mkDerivation rec {
   installPhase = ''true'';
 
   meta = {
-    description = "A refreshing language for the front-end web.";
+    description = "A refreshing language for the front-end web";
     homepage = https://mint-lang.com/;
     license = stdenv.lib.licenses.bsd3;
     maintainers = with stdenv.lib.maintainers; [ manveru ];
diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix
index ba42006c461a..dcf7454b4ca8 100644
--- a/pkgs/development/compilers/mint/shards.nix
+++ b/pkgs/development/compilers/mint/shards.nix
@@ -1,51 +1,61 @@
 {
   admiral = {
-    url = "https://github.com/jwaldrip/admiral.cr";
+    owner = "jwaldrip";
+    repo = "admiral.cr";
     rev = "v1.6.1";
     sha256 = "0y30b9b9rkz43afd3b9l24hs0r170qyc07r05kvydbv89376c53i";
   };
   ameba = {
-    url = "https://github.com/veelenga/ameba";
+    owner = "veelenga";
+    repo = "ameba";
     rev = "v0.6.0";
     sha256 = "16jfyrkfc909h16si513lw944qp3dyapymczcqc2ic0jaal0af5b";
   };
   baked_file_system = {
-    url = "https://github.com/schovi/baked_file_system";
+    owner = "schovi";
+    repo = "baked_file_system";
     rev = "v0.9.6";
     sha256 = "06cpriaizp5pcqwdq3jl2lm4sz9b2gcxg3a9q3lh0fqk2acajzmx";
   };
   duktape = {
-    url = "https://github.com/jessedoyle/duktape.cr";
+    owner = "jessedoyle";
+    repo = "duktape.cr";
     rev = "v0.13.0";
     sha256 = "0v0nckprgr7idmsx97g98as1a7z4hmlmwl924dbbaqvyslv5ls6w";
   };
   kemal = {
-    url = "https://github.com/kemalcr/kemal";
+    owner = "kemalcr";
+    repo = "kemal";
     rev = "v0.22.0";
     sha256 = "0gq3c27grgh90fykbj9fdsz507lwd41gk686qfnig6npndqv1v10";
   };
   kilt = {
-    url = "https://github.com/jeromegn/kilt";
+    owner = "jeromegn";
+    repo = "kilt";
     rev = "v0.4.0";
     sha256 = "1w9ib6j4xhwxdxx58nzc06gw7ci7vga03vgj1z1bnklamb0b0l0k";
   };
   radix = {
-    url = "https://github.com/luislavena/radix";
+    owner = "luislavena";
+    repo = "radix";
     rev = "v0.3.8";
     sha256 = "1kn2xxj8a8j6f6g1dr0s9mkrj1xqnpzw9wnbq24mbv8ach9a1hva";
   };
   string_inflection = {
-    url = "https://github.com/mosop/string_inflection";
+    owner = "mosop";
+    repo = "string_inflection";
     rev = "v0.2.1";
     sha256 = "10vkr28h7n53ijjv57ldxhh473086qg313lzs55a7wsh0zgc104m";
   };
   time_format = {
-    url = "https://github.com/vladfaust/time_format.cr";
+    owner = "vladfaust";
+    repo = "time_format.cr";
     rev = "v0.1.0";
     sha256 = "1f3rssdlcw2a5f74qa8bzlf1rh5dzvyg1d32w9qlisf2cc4lkh9g";
   };
   tree_template = {
-    url = "https://github.com/anykeyh/tree_template";
+    owner = "anykeyh";
+    repo = "tree_template";
     rev = "3fcb71ee6852040077dd1a2c8c55c67f4a95ba4e";
     sha256 = "04w89wpnkna4ipyy3pxshqqwgk965hz1d31vqp0mrb0ilmpsywdk";
   };

From f12f058a85b8bb1e48d4f7fec69637b93cea747d Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Wed, 30 May 2018 18:10:36 +0200
Subject: [PATCH 2789/3370] morty: init -> 0.2.0

---
 pkgs/servers/web-apps/morty/default.nix | 41 ++++++++++++++++++
 pkgs/servers/web-apps/morty/deps.nix    | 57 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 +
 3 files changed, 100 insertions(+)
 create mode 100644 pkgs/servers/web-apps/morty/default.nix
 create mode 100644 pkgs/servers/web-apps/morty/deps.nix

diff --git a/pkgs/servers/web-apps/morty/default.nix b/pkgs/servers/web-apps/morty/default.nix
new file mode 100644
index 000000000000..eeb19f81c54d
--- /dev/null
+++ b/pkgs/servers/web-apps/morty/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "morty-${version}";
+  version = "0.2.0";
+
+  goPackagePath = "github.com/asciimoo/morty";
+
+  src = fetchgit {
+    rev = "v${version}";
+    url = "https://github.com/asciimoo/morty";
+    sha256 = "1wvrdlwbpzizfg7wrcfyf1x6qllp3aw425n88z516wc9jalfqrrm";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/asciimoo/morty";
+    maintainers = with maintainers; [ leenaars ];
+    description = "Privacy aware web content sanitizer proxy as a service";
+    longDescription = ''
+      Morty is a web content sanitizer proxy as a service. It rewrites web
+      pages to exclude malicious HTML tags and attributes. It also replaces
+      external resource references to prevent third party information leaks.
+
+      The main goal of morty is to provide a result proxy for searx, but it
+      can be used as a standalone sanitizer service too.
+
+      Features:
+
+      * HTML sanitization
+      * Rewrites HTML/CSS external references to locals
+      * JavaScript blocking
+      * No Cookies forwarded
+      * No Referrers
+      * No Caching/Etag
+      * Supports GET/POST forms and IFrames
+      * Optional HMAC URL verifier key to prevent service abuse
+'';
+   };
+}
diff --git a/pkgs/servers/web-apps/morty/deps.nix b/pkgs/servers/web-apps/morty/deps.nix
new file mode 100644
index 000000000000..643fc5bb7636
--- /dev/null
+++ b/pkgs/servers/web-apps/morty/deps.nix
@@ -0,0 +1,57 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/klauspost/compress";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/compress";
+      rev = "5698df94daded084fa836b7df2ffbf6cbd3dd63a";
+      sha256 = "1jligmzsyv08dysdaih3r95ki0dqnay9wlzganl4r0mamwhq22wz";
+    };
+  }
+  {
+    goPackagePath = "github.com/klauspost/cpuid";
+    fetch = {
+      type = "git";
+      url = "https://github.com/klauspost/cpuid";
+      rev = "ae832f27941af41db13bd6d8efd2493e3b22415a";
+      sha256 = "1h46y0lbzx0zjdnwbh0znf2ghgbvpzk1p269kkn7v8645xk3apk9";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/bytebufferpool";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/bytebufferpool";
+      rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
+      sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
+    };
+  }
+  {
+    goPackagePath = "github.com/valyala/fasthttp";
+    fetch = {
+      type = "git";
+      url = "https://github.com/valyala/fasthttp";
+      rev = "e5f51c11919d4f66400334047b897ef0a94c6f3c";
+      sha256 = "0g24gys7xk449jd9ja89vr33i3amcb12jnmhsrmd5r2q8byv3l09";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/net";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/net";
+      rev = "f5dfe339be1d06f81b22525fe34671ee7d2c8904";
+      sha256 = "01y9j7pjnnld4ipmzjvs0hls0hh698f2sga8cxaw5y6r5j7igaah";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/text";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/text";
+      rev = "4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1";
+      sha256 = "10505r4xw1njnr2ns1s5r62s4pwif0kfaa30xxpgpz6qxrrmw15s";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34fd1a7672be..12ad09e88b27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12639,6 +12639,8 @@ with pkgs;
 
   mlmmj = callPackage ../servers/mail/mlmmj { };
 
+  morty = callPackage ../servers/web-apps/morty { };
+
   myserver = callPackage ../servers/http/myserver { };
 
   nas = callPackage ../servers/nas { };

From eee16f8ecc977f1848b77964720790b50f3fca55 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 16:11:41 +0000
Subject: [PATCH 2790/3370] flann: fix build with cmake 3.11 after #40800

---
 pkgs/development/libraries/flann/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix
index 3cc518fee501..a25f3ea04e27 100644
--- a/pkgs/development/libraries/flann/default.nix
+++ b/pkgs/development/libraries/flann/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, unzip, cmake, python }:
+{ stdenv, fetchFromGitHub, fetchpatch, unzip, cmake, python }:
 
 stdenv.mkDerivation {
   name = "flann-1.9.1";
@@ -10,6 +10,14 @@ stdenv.mkDerivation {
     sha256 = "13lg9nazj5s9a41j61vbijy04v6839i67lqd925xmxsbybf36gjc";
   };
 
+  patches = [
+    # Upstream issue: https://github.com/mariusmuja/flann/issues/369
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/buildroot/buildroot/45a39b3e2ba42b72d19bfcef30db1b8da9ead51a/package/flann/0001-src-cpp-fix-cmake-3.11-build.patch";
+      sha256 = "1gmj06cmnqvwxx649mxaivd35727wj6w7710zbcmmgmsnyfh2js4";
+    })
+  ];
+
   buildInputs = [ unzip cmake python ];
 
   meta = {

From e9ff80d24a14d786e68141cf18e40edcc8e58fa8 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Wed, 30 May 2018 18:13:16 +0200
Subject: [PATCH 2791/3370] morty: init as service

---
 nixos/modules/module-list.nix               |  1 +
 nixos/modules/services/networking/morty.nix | 98 +++++++++++++++++++++
 nixos/release.nix                           |  1 +
 nixos/tests/morty.nix                       | 32 +++++++
 4 files changed, 132 insertions(+)
 create mode 100644 nixos/modules/services/networking/morty.nix
 create mode 100644 nixos/tests/morty.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 65b4cfd7e0b5..3c6277a2af57 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -514,6 +514,7 @@
   ./services/networking/miniupnpd.nix
   ./services/networking/mosquitto.nix
   ./services/networking/monero.nix
+  ./services/networking/morty.nix
   ./services/networking/miredo.nix
   ./services/networking/mstpd.nix
   ./services/networking/murmur.nix
diff --git a/nixos/modules/services/networking/morty.nix b/nixos/modules/services/networking/morty.nix
new file mode 100644
index 000000000000..b31bec9a8627
--- /dev/null
+++ b/nixos/modules/services/networking/morty.nix
@@ -0,0 +1,98 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.morty;
+
+  configFile = cfg.configFile;
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.morty = {
+
+      enable = mkEnableOption
+        "Morty proxy server. See https://github.com/asciimoo/morty";
+
+      ipv6 = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Allow IPv6 HTTP requests?";
+        defaultText = "Allow IPv6 HTTP requests.";
+      };
+
+      key = mkOption {
+        type = types.string;
+        default = "";
+        description = "HMAC url validation key (hexadecimal encoded).
+	Leave blank to disable. Without validation key, anyone can
+	submit proxy requests. Leave blank to disable.";
+        defaultText = "No HMAC url validation. Generate with echo -n somevalue | openssl dgst -sha1 -hmac somekey";
+      };
+
+      timeout = mkOption {
+        type = types.int;
+        default = 2;
+        description = "Request timeout in seconds.";
+        defaultText = "A resource now gets 2 seconds to respond.";
+      };
+
+      package = mkOption {
+        type = types.package;
+        default = pkgs.morty;
+        defaultText = "pkgs.morty";
+        description = "morty package to use.";
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 3000;
+        description = "Listing port";
+      };
+
+      listenAddress = mkOption {
+        type = types.string;
+        default = "127.0.0.1";
+        description = "The address on which the service listens";
+        defaultText = "127.0.0.1 (localhost)";
+      };
+
+    };
+
+  };
+
+  ###### Service definition
+
+  config = mkIf config.services.morty.enable {
+
+    users.extraUsers.morty =
+      { description = "Morty user";
+        createHome = true;
+        home = "/var/lib/morty";
+      };
+
+    systemd.services.morty =
+      {
+        description = "Morty sanitizing proxy server.";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          User = "morty";
+          ExecStart = ''${cfg.package}/bin/morty              \
+	    -listen ${cfg.listenAddress}:${toString cfg.port} \
+	    ${optionalString cfg.ipv6 "-ipv6"}                \
+	    ${optionalString (cfg.key != "") "-key " + cfg.key} \
+	  '';
+        };
+      };
+    environment.systemPackages = [ cfg.package ];
+
+  };
+}
diff --git a/nixos/release.nix b/nixos/release.nix
index 8d9202e87b08..15e52022032e 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -406,6 +406,7 @@ in rec {
   tests.xss-lock = callTest tests/xss-lock.nix {};
   tests.yabar = callTest tests/yabar.nix {};
   tests.zookeeper = callTest tests/zookeeper.nix {};
+  tests.morty = callTest tests/morty.nix { };
 
   /* Build a bunch of typical closures so that Hydra can keep track of
      the evolution of closure sizes. */
diff --git a/nixos/tests/morty.nix b/nixos/tests/morty.nix
new file mode 100644
index 000000000000..e052ee988060
--- /dev/null
+++ b/nixos/tests/morty.nix
@@ -0,0 +1,32 @@
+import ./make-test.nix ({ pkgs, ... }:
+
+{
+  name = "morty";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ leenaars ];
+  };
+
+  nodes =
+    { mortyProxyWithKey =
+
+      { config, pkgs, ... }:
+      { services.morty = {
+        enable = true;
+	key = "78a9cd0cfee20c672f78427efb2a2a96036027f0";
+	port = 3001;
+	};
+      };
+
+    };
+
+  testScript =
+    { nodes , ... }:
+    ''
+      startAll;
+
+      $mortyProxyWithKey->waitForUnit("morty");
+      $mortyProxyWithKey->succeed("curl -L 127.0.0.1:3001 | grep MortyProxy");
+
+    '';
+
+})

From 097937330a00163ed42059c5fdbf4dfe6c237de6 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Wed, 30 May 2018 12:58:51 -0400
Subject: [PATCH 2792/3370] fetchFromGitlab: domain can be specified

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 889d2040dc09..ba182ec54b0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -286,13 +286,13 @@ with pkgs;
 
   # gitlab example
   fetchFromGitLab = {
-    owner, repo, rev, name ? "source",
+    owner, repo, rev, domain ? "gitlab.com", name ? "source",
     ... # For hash agility
   }@args: fetchzip ({
     inherit name;
-    url = "https://gitlab.com/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}";
-    meta.homepage = "https://gitlab.com/${owner}/${repo}/";
-  } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; };
+    url = "https://${domain}/api/v4/projects/${owner}%2F${repo}/repository/archive.tar.gz?sha=${rev}";
+    meta.homepage = "https://${domain}/${owner}/${repo}/";
+  } // removeAttrs args [ "domain" "owner" "repo" "rev" ]) // { inherit rev; };
 
   # gitweb example, snapshot support is optional in gitweb
   fetchFromRepoOrCz = {

From 39e9de1b85f1bec437333ed684cb0dc8cfe715c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 30 May 2018 19:07:02 +0200
Subject: [PATCH 2793/3370] Docs: improve Python section

Explain `toPythonApplication` and `toPythonModule` as well as some minor improvements.
---
 doc/languages-frameworks/python.section.md | 68 ++++++++++++++++------
 1 file changed, 50 insertions(+), 18 deletions(-)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 23ceb82eb31e..7a48bbaeeeec 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -587,30 +587,32 @@ The `buildPythonPackage` mainly does four things:
 
 As in Perl, dependencies on other Python packages can be specified in the
 `buildInputs` and `propagatedBuildInputs` attributes.  If something is
-exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime
+exclusively a build-time dependency, use `buildInputs`; if it is (also) a runtime
 dependency, use `propagatedBuildInputs`.
 
 By default tests are run because `doCheck = true`. Test dependencies, like
-e.g. the test runner, should be added to `buildInputs`.
+e.g. the test runner, should be added to `checkInputs`.
 
 By default `meta.platforms` is set to the same value
 as the interpreter unless overridden otherwise.
 
 ##### `buildPythonPackage` parameters
 
-All parameters from `mkDerivation` function are still supported.
+All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`:
 
-* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool.
-* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples.
-* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command.
-* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
+* `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
+* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
+* `disabled` ? false: If `true`, package is not build for the particular Python interpreter version.
+* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs.
+* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
+* `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
+* `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
+* `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`.
+* `pythonPath ? []`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
 * `preShellHook`: Hook to execute commands before `shellHook`.
 * `postShellHook`: Hook to execute commands after `shellHook`.
-* `makeWrapperArgs`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
-* `installFlags`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
-* `format`: Format of the source. Valid options are `setuptools` (default), `flit`, `wheel`, and `other`. `setuptools` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. In case you need to provide your own `buildPhase` and `installPhase` you can use `other`.
-* `catchConflicts` If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
-* `checkInputs` Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
+* `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`.
+* `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command.
 
 ##### Overriding Python packages
 
@@ -646,7 +648,37 @@ The `buildPythonApplication` function is practically the same as `buildPythonPac
 The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter.
 Because with an application we're not interested in multiple version the prefix is dropped.
 
-#### python.buildEnv function
+#### `toPythonApplication` function
+
+A distinction is made between applications and libraries, however, sometimes a
+package is used as both. In this case the package is added as a library to
+`python-packages.nix` and as an application to `all-packages.nix`. To reduce
+duplication the `toPythonApplication` can be used to convert a library to an
+application.
+
+The Nix expression shall use `buildPythonPackage` and be called from
+`python-packages.nix`. A reference shall be created from `all-packages.nix` to
+the attribute in `python-packages.nix`, and the `toPythonApplication` shall be
+applied to the reference:
+```nix
+youtube-dl = with pythonPackages; toPythonApplication youtube-dl;
+```
+
+#### `toPythonModule` function
+
+In some cases, such as bindings, a package is created using
+`stdenv.mkDerivation` and added as attribute in `all-packages.nix`.
+The Python bindings should be made available from `python-packages.nix`.
+The `toPythonModule` function takes a derivation and makes certain Python-specific modifications.
+```nix
+opencv = toPythonModule (pkgs.opencv.override {
+  enablePython = true;
+  pythonPackages = self;
+});
+```
+Do pay attention to passing in the right Python version!
+
+#### `python.buildEnv` function
 
 Python environments can be created using the low-level `pkgs.buildEnv` function.
 This example shows how to create an environment that has the Pyramid Web Framework.
@@ -688,7 +720,7 @@ specified packages in its path.
 * `postBuild`: Shell command executed after the build of environment.
 * `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`).
 
-#### python.withPackages function
+#### `python.withPackages` function
 
 The `python.withPackages` function provides a simpler interface to the `python.buildEnv` functionality.
 It takes a function as an argument that is passed the set of python packages and returns the list
@@ -722,7 +754,7 @@ with import <nixpkgs> {};
 In contrast to `python.buildEnv`, `python.withPackages` does not support the more advanced options
 such as `ignoreCollisions = true` or `postBuild`. If you need them, you have to use `python.buildEnv`.
 
-Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv` 
+Python 2 namespace packages may provide `__init__.py` that collide. In that case `python.buildEnv`
 should be used with `ignoreCollisions = true`.
 
 ### Development mode
@@ -790,8 +822,8 @@ example of such a situation is when `py.test` is used.
 
 - Non-working tests can often be deselected. By default `buildPythonPackage` runs `python setup.py test`.
   Most python modules follows the standard test protocol where the pytest runner can be used instead.
-  `py.test` supports a `-k` parameter to ignore test methods or classes: 
-  
+  `py.test` supports a `-k` parameter to ignore test methods or classes:
+
   ```nix
   buildPythonPackage {
     # ...
@@ -988,7 +1020,7 @@ If you need to change a package's attribute(s) from `configuration.nix` you coul
   };
 ```
 
-If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`). 
+If you are using the `bepasty-server` package somewhere, for example in `systemPackages` or indirectly from `services.bepasty`, then a `nixos-rebuild switch` will rebuild the system but with the `bepasty-server` package using a different `src` attribute. This way one can modify `python` based software/libraries easily. Using `self` and `super` one can also alter dependencies (`buildInputs`) between the old state (`self`) and new state (`super`).
 
 ### How to override a Python package using overlays?
 

From a4867b30d1863e2ca45a66a2d5d4640c5e9b05d3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 May 2018 19:24:57 +0200
Subject: [PATCH 2794/3370] lispPackages.quicklisp: 2018-01-31 -> 2018-04-30;
 regenerate packages

---
 .../lisp-modules/lisp-packages.nix            |   4 +-
 .../quicklisp-to-nix-output/anaphora.nix      |  14 +-
 .../quicklisp-to-nix-output/caveman.nix       |  53 +-
 .../quicklisp-to-nix-output/cffi-grovel.nix   |   4 +-
 .../cffi-toolchain.nix                        |   4 +-
 .../quicklisp-to-nix-output/cffi.nix          |   4 +-
 .../quicklisp-to-nix-output/chipz.nix         |  14 +-
 .../circular-streams.nix                      |   7 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |  14 +-
 .../quicklisp-to-nix-output/cl-async-repl.nix |   9 +-
 .../quicklisp-to-nix-output/cl-async-ssl.nix  |   9 +-
 .../quicklisp-to-nix-output/cl-async.nix      |   8 +-
 .../quicklisp-to-nix-output/cl-colors.nix     |  14 +-
 .../quicklisp-to-nix-output/cl-csv.nix        |  18 +-
 .../quicklisp-to-nix-output/cl-dbi.nix        |  14 +-
 .../quicklisp-to-nix-output/cl-emb.nix        |  14 +-
 .../quicklisp-to-nix-output/cl-fad.nix        |  14 +-
 .../cl-fuse-meta-fs.nix                       |   7 +-
 .../quicklisp-to-nix-output/cl-fuse.nix       |   7 +-
 .../quicklisp-to-nix-output/cl-libuv.nix      |  20 +-
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |  14 +-
 .../quicklisp-to-nix-output/cl-paths.nix      |  14 +-
 .../quicklisp-to-nix-output/cl-postgres.nix   |  14 +-
 .../quicklisp-to-nix-output/cl-protobufs.nix  |  14 +-
 .../quicklisp-to-nix-output/cl-store.nix      |  14 +-
 .../quicklisp-to-nix-output/cl-unicode.nix    |  14 +-
 .../quicklisp-to-nix-output/cl-vectors.nix    |  14 +-
 .../quicklisp-to-nix-output/cl_plus_ssl.nix   |  14 +-
 .../quicklisp-to-nix-output/clack-socket.nix  |  14 +-
 .../quicklisp-to-nix-output/clack-test.nix    |  63 +-
 .../clack-v1-compat.nix                       |  61 +-
 .../quicklisp-to-nix-output/clack.nix         |  25 +-
 .../quicklisp-to-nix-output/closer-mop.nix    |  14 +-
 .../quicklisp-to-nix-output/clx-truetype.nix  |   7 +-
 .../quicklisp-to-nix-output/clx.nix           |  14 +-
 .../css-selectors-simple-tree.nix             |  53 ++
 .../css-selectors-stp.nix                     |  52 ++
 .../quicklisp-to-nix-output/dbd-mysql.nix     |  14 +-
 .../quicklisp-to-nix-output/dbd-postgres.nix  |  14 +-
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |  14 +-
 .../quicklisp-to-nix-output/dbi.nix           |  14 +-
 .../quicklisp-to-nix-output/dexador.nix       |  31 +-
 .../documentation-utils.nix                   |  14 +-
 .../quicklisp-to-nix-output/esrap.nix         |  14 +-
 .../quicklisp-to-nix-output/fast-io.nix       |   7 +-
 .../quicklisp-to-nix-output/fiasco.nix        |  14 +-
 .../quicklisp-to-nix-output/fiveam.nix        |  14 +-
 .../quicklisp-to-nix-output/flexi-streams.nix |  14 +-
 .../quicklisp-to-nix-output/http-body.nix     |  21 +-
 .../hu_dot_dwim_dot_asdf.nix                  |  14 +-
 .../quicklisp-to-nix-output/iolib.nix         |  10 +-
 .../iolib_dot_asdf.nix                        |   4 +-
 .../iolib_dot_base.nix                        |   4 +-
 .../iolib_dot_common-lisp.nix                 |   4 +-
 .../iolib_dot_conf.nix                        |   4 +-
 .../iolib_dot_grovel.nix                      |  18 +-
 .../quicklisp-to-nix-output/ironclad.nix      |  19 +-
 .../quicklisp-to-nix-output/iterate.nix       |  14 +-
 .../quicklisp-to-nix-output/ixf.nix           |  26 +-
 .../quicklisp-to-nix-output/jonathan.nix      |  35 +-
 .../lack-component.nix                        |  14 +-
 .../lack-middleware-backtrace.nix             |  14 +-
 .../quicklisp-to-nix-output/lack-util.nix     |  14 +-
 .../quicklisp-to-nix-output/lack.nix          |  14 +-
 .../quicklisp-to-nix-output/local-time.nix    |  14 +-
 .../quicklisp-to-nix-output/marshal.nix       |  14 +-
 .../quicklisp-to-nix-output/md5.nix           |  14 +-
 .../quicklisp-to-nix-output/mssql.nix         |  25 +-
 .../quicklisp-to-nix-output/nibbles.nix       |  18 +-
 .../quicklisp-to-nix-output/parse-number.nix  |  18 +-
 .../quicklisp-to-nix-output/plump.nix         |  14 +-
 .../quicklisp-to-nix-output/postmodern.nix    |  21 +-
 .../quicklisp-to-nix-output/puri.nix          |  14 +-
 .../quicklisp-to-nix-output/query-fs.nix      |   9 +-
 .../quicklisp-to-nix-output/s-sql.nix         |  30 +-
 .../quicklisp-to-nix-output/simple-date.nix   |  14 +-
 .../split-sequence.nix                        |  16 +-
 .../static-vectors.nix                        |   6 +-
 .../quicklisp-to-nix-output/stumpwm.nix       |  14 +-
 .../trivial-gray-streams.nix                  |  14 +-
 .../quicklisp-to-nix-output/uffi.nix          |  14 +-
 .../quicklisp-to-nix-output/woo.nix           |  11 +-
 .../quicklisp-to-nix-output/wookie.nix        |  47 +-
 .../quicklisp-to-nix-output/xmls.nix          |  21 +-
 .../lisp-modules/quicklisp-to-nix-systems.txt |   2 +
 .../lisp-modules/quicklisp-to-nix.nix         | 540 +++++++++++++-----
 86 files changed, 1231 insertions(+), 719 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix

diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix
index c63a9b3a054d..f208b47234c6 100644
--- a/pkgs/development/lisp-modules/lisp-packages.nix
+++ b/pkgs/development/lisp-modules/lisp-packages.nix
@@ -24,8 +24,8 @@ let lispPackages = rec {
       quicklispdist = pkgs.fetchurl {
         # Will usually be replaced with a fresh version anyway, but needs to be
         # a valid distinfo.txt
-        url = "http://beta.quicklisp.org/dist/quicklisp/2018-01-31/distinfo.txt";
-        sha256 = "0z28yz205cl8pa8lbflw9072mywg69jx0gf091rhx2wjjf9h14qy";
+        url = "http://beta.quicklisp.org/dist/quicklisp/2018-04-30/distinfo.txt";
+        sha256 = "0zpabwgvsmy90yca25sfixi6waixqdchllayyvcsdl3jaibbz4rq";
       };
       buildPhase = '' true; '';
       postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index f1fdf5bb8dca..61a07c61ca07 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''anaphora'';
-  version = ''20170227-git'';
+  version = ''20180228-git'';
 
   parasites = [ "anaphora/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz'';
-    sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9'';
+    url = ''http://beta.quicklisp.org/archive/anaphora/2018-02-28/anaphora-20180228-git.tgz'';
+    sha256 = ''1bd2mvrxdf460wqrmg93lrvrjzvhbxjq8fcpvh24afx6573g2d41'';
   };
 
   packageName = "anaphora";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM anaphora DESCRIPTION The Anaphoric Macro Package from Hell SHA256
-    1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9 URL
-    http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz
-    MD5 6121d9bbc92df29d823b60ae0d0c556d NAME anaphora FILENAME anaphora DEPS
-    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20170227-git SIBLINGS NIL
+    1bd2mvrxdf460wqrmg93lrvrjzvhbxjq8fcpvh24afx6573g2d41 URL
+    http://beta.quicklisp.org/archive/anaphora/2018-02-28/anaphora-20180228-git.tgz
+    MD5 a884be2d820c0bc7dc59dea7ffd72731 NAME anaphora FILENAME anaphora DEPS
+    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180228-git SIBLINGS NIL
     PARASITES (anaphora/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index e60f60a303bf..02e6e2bf6045 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Web Application Framework for Common Lisp'';
 
-  deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."circular-streams" args."cl-annot" args."cl-ansi-text" args."cl-colors" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack-v1-compat" args."dexador" args."do-urlencode" args."http-body" args."lack" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."usocket" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."babel-streams" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-emb" args."cl-fad" args."cl-ppcre" args."cl-project" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."clack-v1-compat" args."dexador" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."map-set" args."marshal" args."myway" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/caveman/2017-10-19/caveman-20171019-git.tgz'';
@@ -24,35 +24,56 @@ rec {
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz)
+     (NAME chunga FILENAME chunga)
      (NAME circular-streams FILENAME circular-streams)
-     (NAME cl-annot FILENAME cl-annot)
+     (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-annot FILENAME cl-annot)
      (NAME cl-ansi-text FILENAME cl-ansi-text)
-     (NAME cl-colors FILENAME cl-colors) (NAME cl-emb FILENAME cl-emb)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors)
+     (NAME cl-cookie FILENAME cl-cookie) (NAME cl-emb FILENAME cl-emb)
      (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
-     (NAME cl-project FILENAME cl-project) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-project FILENAME cl-project)
+     (NAME cl-reexport FILENAME cl-reexport)
+     (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-syntax-annot FILENAME cl-syntax-annot)
-     (NAME cl-utilities FILENAME cl-utilities)
+     (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+     (NAME clack-test FILENAME clack-test)
      (NAME clack-v1-compat FILENAME clack-v1-compat)
      (NAME dexador FILENAME dexador) (NAME do-urlencode FILENAME do-urlencode)
-     (NAME http-body FILENAME http-body) (NAME lack FILENAME lack)
-     (NAME let-plus FILENAME let-plus) (NAME local-time FILENAME local-time)
-     (NAME map-set FILENAME map-set) (NAME marshal FILENAME marshal)
-     (NAME myway FILENAME myway)
+     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+     (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
+     (NAME lack-component FILENAME lack-component)
+     (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
+     (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
+     (NAME local-time FILENAME local-time) (NAME map-set FILENAME map-set)
+     (NAME marshal FILENAME marshal) (NAME myway FILENAME myway)
      (NAME named-readtables FILENAME named-readtables)
+     (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
      (NAME prove FILENAME prove) (NAME quri FILENAME quri)
+     (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
+     (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-backtrace FILENAME trivial-backtrace)
      (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME trivial-mimes FILENAME trivial-mimes)
      (NAME trivial-types FILENAME trivial-types)
-     (NAME usocket FILENAME usocket))
+     (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria anaphora babel babel-streams bordeaux-threads circular-streams
-     cl-annot cl-ansi-text cl-colors cl-emb cl-fad cl-ppcre cl-project
-     cl-syntax cl-syntax-annot cl-utilities clack-v1-compat dexador
-     do-urlencode http-body lack let-plus local-time map-set marshal myway
-     named-readtables prove quri split-sequence trivial-backtrace
-     trivial-features trivial-gray-streams trivial-types usocket)
+    (alexandria anaphora babel babel-streams bordeaux-threads cffi cffi-grovel
+     cffi-toolchain chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text
+     cl-base64 cl-colors cl-cookie cl-emb cl-fad cl-ppcre cl-project
+     cl-reexport cl-syntax cl-syntax-annot cl-utilities clack clack-test
+     clack-v1-compat dexador do-urlencode fast-http fast-io flexi-streams
+     http-body ironclad jonathan lack lack-component lack-middleware-backtrace
+     lack-util let-plus local-time map-set marshal myway named-readtables
+     nibbles proc-parse prove quri smart-buffer split-sequence static-vectors
+     trivial-backtrace trivial-features trivial-garbage trivial-gray-streams
+     trivial-mimes trivial-types usocket xsubseq)
     VERSION 20171019-git SIBLINGS
     (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test
      caveman2)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index 7923c444f24d..07b062b51978 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -8,7 +8,7 @@ rec {
   deps = [ args."alexandria" args."babel" args."cffi" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz'';
     sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
   };
 
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256
     12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
-    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5
+    http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5
     7589b6437fec19fdabc65892536c3dc3 NAME cffi-grovel FILENAME cffi-grovel DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-toolchain FILENAME cffi-toolchain)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
index 8234b83edfbb..f1d7e117655b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-toolchain.nix
@@ -8,7 +8,7 @@ rec {
   deps = [ args."alexandria" args."babel" args."cffi" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz'';
     sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
   };
 
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM cffi-toolchain DESCRIPTION The CFFI toolchain SHA256
     12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
-    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5
+    http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5
     7589b6437fec19fdabc65892536c3dc3 NAME cffi-toolchain FILENAME
     cffi-toolchain DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index d79a36e03028..8568d9a3dfab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -10,7 +10,7 @@ rec {
   deps = [ args."alexandria" args."babel" args."cl-json" args."cl-ppcre" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz'';
+    url = ''http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz'';
     sha256 = ''12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9'';
   };
 
@@ -21,7 +21,7 @@ rec {
 }
 /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256
     12v3ha0qp3f9lq2h3d7y3mwdq216nsdfig0s3c4akw90rsbnydj9 URL
-    http://beta.quicklisp.org/archive/cffi/2017-06-30/cffi_0.19.0.tgz MD5
+    http://beta.quicklisp.org/archive/cffi/2018-02-28/cffi_0.19.0.tgz MD5
     7589b6437fec19fdabc65892536c3dc3 NAME cffi FILENAME cffi DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cl-json FILENAME cl-json) (NAME cl-ppcre FILENAME cl-ppcre)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index e13932346a62..a9808173b626 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''chipz'';
-  version = ''20160318-git'';
+  version = ''20180328-git'';
 
   description = ''A library for decompressing deflate, zlib, and gzip data'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz'';
-    sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826'';
+    url = ''http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz'';
+    sha256 = ''0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7'';
   };
 
   packageName = "chipz";
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM chipz DESCRIPTION
     A library for decompressing deflate, zlib, and gzip data SHA256
-    1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826 URL
-    http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz
-    MD5 625cb9c551f3692799e2029d4a0dd7e9 NAME chipz FILENAME chipz DEPS NIL
-    DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */
+    0ryjrfrlzyjkzb799indyzxivq8s9d7pgjzss7ha91xzr8sl6xf7 URL
+    http://beta.quicklisp.org/archive/chipz/2018-03-28/chipz-20180328-git.tgz
+    MD5 a548809d6ef705c69356a2057ecd8a52 NAME chipz FILENAME chipz DEPS NIL
+    DEPENDENCIES NIL VERSION 20180328-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index 8d2254e4bdcb..2e387d29833f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Circularly readable streams for Common Lisp'';
 
-  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
@@ -25,11 +25,12 @@ rec {
     circular-streams DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME fast-io FILENAME fast-io)
      (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
     DEPENDENCIES
-    (alexandria babel cffi cffi-grovel fast-io static-vectors trivial-features
-     trivial-gray-streams)
+    (alexandria babel cffi cffi-grovel cffi-toolchain fast-io static-vectors
+     trivial-features trivial-gray-streams)
     VERSION 20161204-git SIBLINGS (circular-streams-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 9a664aa97735..531d429df244 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-aa'';
-  version = ''cl-vectors-20170630-git'';
+  version = ''cl-vectors-20180228-git'';
 
   description = ''cl-aa: polygon rasterizer'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
-    sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
+    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
   };
 
   packageName = "cl-aa";
@@ -18,8 +18,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256
-    0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz
-    MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-aa FILENAME cl-aa DEPS NIL
-    DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS
+    0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL
+    http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz
+    MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-aa FILENAME cl-aa DEPS NIL
+    DEPENDENCIES NIL VERSION cl-vectors-20180228-git SIBLINGS
     (cl-aa-misc cl-paths-ttf cl-paths cl-vectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index 9291be14e33a..d72a9c69ac0f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''REPL integration for CL-ASYNC.'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
@@ -25,6 +25,7 @@ rec {
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME cl-async FILENAME cl-async)
      (NAME cl-async-base FILENAME cl-async-base)
      (NAME cl-async-util FILENAME cl-async-util)
@@ -35,8 +36,8 @@ rec {
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
      (NAME vom FILENAME vom))
     DEPENDENCIES
-    (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base
-     cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features
-     trivial-gray-streams vom)
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
+     cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
+     trivial-features trivial-gray-streams vom)
     VERSION cl-async-20171130-git SIBLINGS
     (cl-async-ssl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index 4417d25be9f7..f7392b880d11 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''SSL Wrapper around cl-async socket implementation.'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-async" args."cl-async-base" args."cl-async-util" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
@@ -26,6 +26,7 @@ rec {
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME cl-async FILENAME cl-async)
      (NAME cl-async-base FILENAME cl-async-base)
      (NAME cl-async-util FILENAME cl-async-util)
@@ -36,8 +37,8 @@ rec {
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
      (NAME vom FILENAME vom))
     DEPENDENCIES
-    (alexandria babel bordeaux-threads cffi cffi-grovel cl-async cl-async-base
-     cl-async-util cl-libuv cl-ppcre fast-io static-vectors trivial-features
-     trivial-gray-streams vom)
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-async
+     cl-async-base cl-async-util cl-libuv cl-ppcre fast-io static-vectors
+     trivial-features trivial-gray-streams vom)
     VERSION cl-async-20171130-git SIBLINGS
     (cl-async-repl cl-async-test cl-async) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index 6f62c9ff6b90..90638ed56f16 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''Asynchronous operations for Common Lisp.'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-libuv" args."cl-ppcre" args."fast-io" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."uiop" args."vom" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-async/2017-11-30/cl-async-20171130-git.tgz'';
@@ -26,6 +26,7 @@ rec {
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME fast-io FILENAME fast-io)
      (NAME static-vectors FILENAME static-vectors)
@@ -33,7 +34,8 @@ rec {
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
      (NAME uiop FILENAME uiop) (NAME vom FILENAME vom))
     DEPENDENCIES
-    (alexandria babel bordeaux-threads cffi cffi-grovel cl-libuv cl-ppcre
-     fast-io static-vectors trivial-features trivial-gray-streams uiop vom)
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-libuv
+     cl-ppcre fast-io static-vectors trivial-features trivial-gray-streams uiop
+     vom)
     VERSION 20171130-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)
     PARASITES (cl-async-base cl-async-util)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 6a6ad9a6e700..0d0337a65cec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-colors'';
-  version = ''20151218-git'';
+  version = ''20180328-git'';
 
   parasites = [ "cl-colors-tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."anaphora" args."let-plus" args."lift" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz'';
-    sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4'';
+    url = ''http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz'';
+    sha256 = ''0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a'';
   };
 
   packageName = "cl-colors";
@@ -20,10 +20,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256
-    032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL
-    http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz
-    MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors FILENAME cl-colors DEPS
+    0anrb3zsi03dixfsjz92y06w93kpn0d0c5142fhx72f5kafwvc4a URL
+    http://beta.quicklisp.org/archive/cl-colors/2018-03-28/cl-colors-20180328-git.tgz
+    MD5 5e59ea59b32a0254df9610a5662ae2ec NAME cl-colors FILENAME cl-colors DEPS
     ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
      (NAME let-plus FILENAME let-plus) (NAME lift FILENAME lift))
-    DEPENDENCIES (alexandria anaphora let-plus lift) VERSION 20151218-git
+    DEPENDENCIES (alexandria anaphora let-plus lift) VERSION 20180328-git
     SIBLINGS NIL PARASITES (cl-colors-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
index 82571660280a..b0fe8888dcfc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-csv'';
-  version = ''20180131-git'';
+  version = ''20180228-git'';
 
-  parasites = [ "cl-csv/test" ];
+  parasites = [ "cl-csv/speed-test" "cl-csv/test" ];
 
   description = ''Facilities for reading and writing CSV format files'';
 
   deps = [ args."alexandria" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."flexi-streams" args."iterate" args."lisp-unit2" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz'';
-    sha256 = ''0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh'';
+    url = ''http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz'';
+    sha256 = ''1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r'';
   };
 
   packageName = "cl-csv";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM cl-csv DESCRIPTION
     Facilities for reading and writing CSV format files SHA256
-    0i912ch1mvms5iynmxrlxclzc325n3zsn3y9qdszh5lhpmw043wh URL
-    http://beta.quicklisp.org/archive/cl-csv/2018-01-31/cl-csv-20180131-git.tgz
-    MD5 0be8956ee31e03436f8a2190387bad46 NAME cl-csv FILENAME cl-csv DEPS
+    1xfdiyxj793inrlfqi1yi9sf6p29mg9h7qqhnjk94masmx5zq93r URL
+    http://beta.quicklisp.org/archive/cl-csv/2018-02-28/cl-csv-20180228-git.tgz
+    MD5 be174a4d7cc2ea24418df63757daed94 NAME cl-csv FILENAME cl-csv DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME cl-unicode FILENAME cl-unicode)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria cl-interpol cl-ppcre cl-unicode flexi-streams iterate
      lisp-unit2)
-    VERSION 20180131-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
-    (cl-csv/test)) */
+    VERSION 20180228-git SIBLINGS (cl-csv-clsql cl-csv-data-table) PARASITES
+    (cl-csv/speed-test cl-csv/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index d485d276bab7..995ef9bc745e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-dbi'';
-  version = ''20180131-git'';
+  version = ''20180430-git'';
 
   description = '''';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz'';
-    sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
+    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
   };
 
   packageName = "cl-dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-dbi DESCRIPTION NIL SHA256
-    0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz
-    MD5 7dacf1c276fab38b952813795ff1f707 NAME cl-dbi FILENAME cl-dbi DEPS
+    0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
+    MD5 1bc845e8738c4987342cb0f56200ba50 NAME cl-dbi FILENAME cl-dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      dbi named-readtables split-sequence trivial-types)
-    VERSION 20180131-git SIBLINGS
+    VERSION 20180430-git SIBLINGS
     (dbd-mysql dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index a4da254cc6b7..78f70be2f1fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-emb'';
-  version = ''20170227-git'';
+  version = ''20180228-git'';
 
   description = ''A templating system for Common Lisp'';
 
   deps = [ args."cl-ppcre" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz'';
-    sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80'';
+    url = ''http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz'';
+    sha256 = ''0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw'';
   };
 
   packageName = "cl-emb";
@@ -18,8 +18,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-emb DESCRIPTION A templating system for Common Lisp SHA256
-    03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80 URL
-    http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz
-    MD5 01d850432cc2f8e920e50b4b36e42d42 NAME cl-emb FILENAME cl-emb DEPS
+    0b7y3n65sjn3xk03jflw363m6jkx86zf9v540d4n5jv4vcn34sqw URL
+    http://beta.quicklisp.org/archive/cl-emb/2018-02-28/cl-emb-20180228-git.tgz
+    MD5 94db80b2a91611e71ada33f500b49d22 NAME cl-emb FILENAME cl-emb DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
-    20170227-git SIBLINGS NIL PARASITES NIL) */
+    20180228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 0bc8488b2a8c..d032b4768dd6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-fad'';
-  version = ''20171227-git'';
+  version = ''20180430-git'';
 
   parasites = [ "cl-fad-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-ppcre" args."unit-test" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz'';
-    sha256 = ''0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8'';
+    url = ''http://beta.quicklisp.org/archive/cl-fad/2018-04-30/cl-fad-20180430-git.tgz'';
+    sha256 = ''175v6y32q6qpc8axacf8nw44pmsw7a6r476w0f01cp1gwvpis1cs'';
   };
 
   packageName = "cl-fad";
@@ -20,11 +20,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256
-    0dl2c1klv55vk99j1b31f2s1rd1m9c94l1n0aly8spwxz3yd3za8 URL
-    http://beta.quicklisp.org/archive/cl-fad/2017-12-27/cl-fad-20171227-git.tgz
-    MD5 f6b34f61ebba1c68e8fe122bb7de3f77 NAME cl-fad FILENAME cl-fad DEPS
+    175v6y32q6qpc8axacf8nw44pmsw7a6r476w0f01cp1gwvpis1cs URL
+    http://beta.quicklisp.org/archive/cl-fad/2018-04-30/cl-fad-20180430-git.tgz
+    MD5 005c1b7b376fc60dea72574d2acdc704 NAME cl-fad FILENAME cl-fad DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-ppcre FILENAME cl-ppcre) (NAME unit-test FILENAME unit-test))
     DEPENDENCIES (alexandria bordeaux-threads cl-ppcre unit-test) VERSION
-    20171227-git SIBLINGS NIL PARASITES (cl-fad-test)) */
+    20180430-git SIBLINGS NIL PARASITES (cl-fad-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index a972751f36a6..c33efa2eb08a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''CFFI bindings to FUSE (Filesystem in user space)'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-utilities" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
@@ -26,6 +26,7 @@ rec {
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME cl-fuse FILENAME cl-fuse) (NAME cl-utilities FILENAME cl-utilities)
      (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall)
      (NAME pcall-queue FILENAME pcall-queue)
@@ -33,7 +34,7 @@ rec {
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-utf-8 FILENAME trivial-utf-8))
     DEPENDENCIES
-    (alexandria babel bordeaux-threads cffi cffi-grovel cl-fuse cl-utilities
-     iterate pcall pcall-queue trivial-backtrace trivial-features
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse
+     cl-utilities iterate pcall pcall-queue trivial-backtrace trivial-features
      trivial-utf-8)
     VERSION 20150608-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index e597b192b308..d41fe76ca232 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''CFFI bindings to FUSE (Filesystem in user space)'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."iterate" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
@@ -24,11 +24,12 @@ rec {
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate)
      (NAME trivial-backtrace FILENAME trivial-backtrace)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-utf-8 FILENAME trivial-utf-8))
     DEPENDENCIES
-    (alexandria babel bordeaux-threads cffi cffi-grovel cl-utilities iterate
-     trivial-backtrace trivial-features trivial-utf-8)
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain
+     cl-utilities iterate trivial-backtrace trivial-features trivial-utf-8)
     VERSION 20160318-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index deda83b7e0f6..1aced09d34fd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-libuv'';
-  version = ''20160825-git'';
+  version = ''20180328-git'';
 
   description = ''Low-level libuv bindings for Common Lisp.'';
 
-  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."trivial-features" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz'';
-    sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r'';
+    url = ''http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz'';
+    sha256 = ''1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p'';
   };
 
   packageName = "cl-libuv";
@@ -18,11 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp.
-    SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL
-    http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz
-    MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv FILENAME cl-libuv DEPS
+    SHA256 1pq0fsrhv6aa3fpq1ppwid8nmxaa3fs3dk4iq1bl28prpzzkkg0p URL
+    http://beta.quicklisp.org/archive/cl-libuv/2018-03-28/cl-libuv-20180328-git.tgz
+    MD5 c50f2cca0bd8d25db35b4ec176242858 NAME cl-libuv FILENAME cl-libuv DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (alexandria babel cffi cffi-grovel trivial-features) VERSION
-    20160825-git SIBLINGS NIL PARASITES NIL) */
+    DEPENDENCIES
+    (alexandria babel cffi cffi-grovel cffi-toolchain trivial-features) VERSION
+    20180328-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index b0514e306d30..cfca59e3b503 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-paths-ttf'';
-  version = ''cl-vectors-20170630-git'';
+  version = ''cl-vectors-20180228-git'';
 
   description = ''cl-paths-ttf: vectorial paths manipulation'';
 
   deps = [ args."cl-paths" args."zpb-ttf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
-    sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
+    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
   };
 
   packageName = "cl-paths-ttf";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation
-    SHA256 0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz
-    MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths-ttf FILENAME
+    SHA256 0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL
+    http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz
+    MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-paths-ttf FILENAME
     cl-paths-ttf DEPS
     ((NAME cl-paths FILENAME cl-paths) (NAME zpb-ttf FILENAME zpb-ttf))
-    DEPENDENCIES (cl-paths zpb-ttf) VERSION cl-vectors-20170630-git SIBLINGS
+    DEPENDENCIES (cl-paths zpb-ttf) VERSION cl-vectors-20180228-git SIBLINGS
     (cl-aa-misc cl-aa cl-paths cl-vectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
index 770c25d924de..e8034b11c237 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-paths'';
-  version = ''cl-vectors-20170630-git'';
+  version = ''cl-vectors-20180228-git'';
 
   description = ''cl-paths: vectorial paths manipulation'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
-    sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
+    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
   };
 
   packageName = "cl-paths";
@@ -18,8 +18,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-paths DESCRIPTION cl-paths: vectorial paths manipulation SHA256
-    0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz
-    MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-paths FILENAME cl-paths DEPS
-    NIL DEPENDENCIES NIL VERSION cl-vectors-20170630-git SIBLINGS
+    0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL
+    http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz
+    MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-paths FILENAME cl-paths DEPS
+    NIL DEPENDENCIES NIL VERSION cl-vectors-20180228-git SIBLINGS
     (cl-aa-misc cl-aa cl-paths-ttf cl-vectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 721dbf61aa92..60e38a7de720 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-postgres'';
-  version = ''postmodern-20180131-git'';
+  version = ''postmodern-20180430-git'';
 
   parasites = [ "cl-postgres/simple-date-tests" "cl-postgres/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiveam" args."md5" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz'';
-    sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
+    sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
   };
 
   packageName = "cl-postgres";
@@ -20,14 +20,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL
-    SHA256 0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL
-    http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz
-    MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME cl-postgres FILENAME cl-postgres
+    SHA256 0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
+    http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
+    MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME cl-postgres FILENAME cl-postgres
     DEPS
     ((NAME fiveam FILENAME fiveam) (NAME md5 FILENAME md5)
      (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
      (NAME split-sequence FILENAME split-sequence)
      (NAME usocket FILENAME usocket))
     DEPENDENCIES (fiveam md5 simple-date/postgres-glue split-sequence usocket)
-    VERSION postmodern-20180131-git SIBLINGS (postmodern s-sql simple-date)
+    VERSION postmodern-20180430-git SIBLINGS (postmodern s-sql simple-date)
     PARASITES (cl-postgres/simple-date-tests cl-postgres/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
index 7ec440076c35..046f910a8660 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-protobufs.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-protobufs'';
-  version = ''20170403-git'';
+  version = ''20180328-git'';
 
   description = ''Protobufs for Common Lisp'';
 
   deps = [ args."alexandria" args."babel" args."closer-mop" args."trivial-features" args."trivial-garbage" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-protobufs/2017-04-03/cl-protobufs-20170403-git.tgz'';
-    sha256 = ''0ibpl076k8gq79sacg96mzjf5hqkrxzi5wlx3bjap52pla53w4g5'';
+    url = ''http://beta.quicklisp.org/archive/cl-protobufs/2018-03-28/cl-protobufs-20180328-git.tgz'';
+    sha256 = ''0pkm5mphs2yks8v1i8wxq92ywm6fx9lasybrx8rccrd7dm156nzj'';
   };
 
   packageName = "cl-protobufs";
@@ -18,13 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-protobufs DESCRIPTION Protobufs for Common Lisp SHA256
-    0ibpl076k8gq79sacg96mzjf5hqkrxzi5wlx3bjap52pla53w4g5 URL
-    http://beta.quicklisp.org/archive/cl-protobufs/2017-04-03/cl-protobufs-20170403-git.tgz
-    MD5 86c8da92b246b4b77d6107bc5dfaff08 NAME cl-protobufs FILENAME
+    0pkm5mphs2yks8v1i8wxq92ywm6fx9lasybrx8rccrd7dm156nzj URL
+    http://beta.quicklisp.org/archive/cl-protobufs/2018-03-28/cl-protobufs-20180328-git.tgz
+    MD5 6573322beb8f27653f0c9b418c5f5b92 NAME cl-protobufs FILENAME
     cl-protobufs DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME closer-mop FILENAME closer-mop)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-garbage FILENAME trivial-garbage))
     DEPENDENCIES (alexandria babel closer-mop trivial-features trivial-garbage)
-    VERSION 20170403-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */
+    VERSION 20180328-git SIBLINGS (cl-protobufs-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index 142fbfee2eab..2aff988dfd24 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-store'';
-  version = ''20160531-git'';
+  version = ''20180328-git'';
 
   parasites = [ "cl-store-tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz'';
-    sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz'';
+    url = ''http://beta.quicklisp.org/archive/cl-store/2018-03-28/cl-store-20180328-git.tgz'';
+    sha256 = ''1r5fmmpjcshfqv43zv282kjsxxp0imxd2fdpwwcr7y7m256w660n'';
   };
 
   packageName = "cl-store";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-store DESCRIPTION Serialization package SHA256
-    0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz URL
-    http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz
-    MD5 8b3f33956b05d8e900346663f6abca3c NAME cl-store FILENAME cl-store DEPS
-    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20160531-git SIBLINGS NIL
+    1r5fmmpjcshfqv43zv282kjsxxp0imxd2fdpwwcr7y7m256w660n URL
+    http://beta.quicklisp.org/archive/cl-store/2018-03-28/cl-store-20180328-git.tgz
+    MD5 2f8831cb60c0b0575c65e1dbebc07dee NAME cl-store FILENAME cl-store DEPS
+    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180328-git SIBLINGS NIL
     PARASITES (cl-store-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index 25dfbbcae5f7..cec8cc2865c2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-unicode'';
-  version = ''20180131-git'';
+  version = ''20180328-git'';
 
   parasites = [ "cl-unicode/base" "cl-unicode/build" "cl-unicode/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."cl-ppcre" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz'';
-    sha256 = ''113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa'';
+    url = ''http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz'';
+    sha256 = ''1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln'';
   };
 
   packageName = "cl-unicode";
@@ -20,11 +20,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-unicode DESCRIPTION Portable Unicode Library SHA256
-    113hsx22pw4ydwzkyr9y7l8a8jq3nkhwazs03wj3mh2dczwv28xa URL
-    http://beta.quicklisp.org/archive/cl-unicode/2018-01-31/cl-unicode-20180131-git.tgz
-    MD5 653ba12d595599b32aa2a8c7c8b65c28 NAME cl-unicode FILENAME cl-unicode
+    1ky8qhvisagyvd7qcqzvy40z2sl9dr16q94k21wpgpvlz3kwbpln URL
+    http://beta.quicklisp.org/archive/cl-unicode/2018-03-28/cl-unicode-20180328-git.tgz
+    MD5 6030b7833f08f78946ddd44d6c6a9086 NAME cl-unicode FILENAME cl-unicode
     DEPS
     ((NAME cl-ppcre FILENAME cl-ppcre)
      (NAME flexi-streams FILENAME flexi-streams))
-    DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180131-git SIBLINGS NIL
+    DEPENDENCIES (cl-ppcre flexi-streams) VERSION 20180328-git SIBLINGS NIL
     PARASITES (cl-unicode/base cl-unicode/build cl-unicode/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index b0e89eb23038..f44bd0f22e0c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-vectors'';
-  version = ''20170630-git'';
+  version = ''20180228-git'';
 
   description = ''cl-paths: vectorial paths manipulation'';
 
   deps = [ args."cl-aa" args."cl-paths" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz'';
-    sha256 = ''0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz'';
+    sha256 = ''0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly'';
   };
 
   packageName = "cl-vectors";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256
-    0820qwi6pp8683rqp37x9l9shm0vh873bc4p9q38cz56ck7il740 URL
-    http://beta.quicklisp.org/archive/cl-vectors/2017-06-30/cl-vectors-20170630-git.tgz
-    MD5 cee3bb14adbba3142b782c646f7651ce NAME cl-vectors FILENAME cl-vectors
+    0fcypjfzqra8ryb4nx1vx1fqy7fwvyz3f443qkjg2z81akhkscly URL
+    http://beta.quicklisp.org/archive/cl-vectors/2018-02-28/cl-vectors-20180228-git.tgz
+    MD5 9d9629786d4f2c19c15cc6cd3049c343 NAME cl-vectors FILENAME cl-vectors
     DEPS ((NAME cl-aa FILENAME cl-aa) (NAME cl-paths FILENAME cl-paths))
-    DEPENDENCIES (cl-aa cl-paths) VERSION 20170630-git SIBLINGS
+    DEPENDENCIES (cl-aa cl-paths) VERSION 20180228-git SIBLINGS
     (cl-aa-misc cl-aa cl-paths-ttf cl-paths) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
index 99aa768c8dfc..a757b3d4a8a0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl_plus_ssl.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl_plus_ssl'';
-  version = ''cl+ssl-20171227-git'';
+  version = ''cl+ssl-20180328-git'';
 
   parasites = [ "openssl-1.1.0" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."flexi-streams" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz'';
-    sha256 = ''1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4'';
+    url = ''http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz'';
+    sha256 = ''095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62'';
   };
 
   packageName = "cl+ssl";
@@ -20,9 +20,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256
-    1m6wcyccjyrz44mq0v1gvmpi44i9phknym5pimmicx3jvjyr37s4 URL
-    http://beta.quicklisp.org/archive/cl+ssl/2017-12-27/cl+ssl-20171227-git.tgz
-    MD5 d00ce843db6038e6ff33d19668b5e038 NAME cl+ssl FILENAME cl_plus_ssl DEPS
+    095rn0dl0izjambjry4n4j72l9abijhlvs47h44a2mcgjc9alj62 URL
+    http://beta.quicklisp.org/archive/cl+ssl/2018-03-28/cl+ssl-20180328-git.tgz
+    MD5 ec6f921505ba7bb8e35878b3ae9eea29 NAME cl+ssl FILENAME cl_plus_ssl DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME flexi-streams FILENAME flexi-streams)
@@ -33,5 +33,5 @@ rec {
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi flexi-streams trivial-features
      trivial-garbage trivial-gray-streams uiop)
-    VERSION cl+ssl-20171227-git SIBLINGS (cl+ssl.test) PARASITES
+    VERSION cl+ssl-20180328-git SIBLINGS (cl+ssl.test) PARASITES
     (openssl-1.1.0)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
index 7ced3fd41b18..fe511ec40bdf 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-socket.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-socket'';
-  version = ''clack-20170630-git'';
+  version = ''clack-20180328-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
-    sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
+    sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
   };
 
   packageName = "clack-socket";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-socket DESCRIPTION NIL SHA256
-    1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
-    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz
-    MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-socket FILENAME
-    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20170630-git SIBLINGS
+    1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
+    http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
+    MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-socket FILENAME
+    clack-socket DEPS NIL DEPENDENCIES NIL VERSION clack-20180328-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-test clack-v1-compat clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
index 35fa6046ae51..be88069fd5d9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-test.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-test'';
-  version = ''clack-20170630-git'';
+  version = ''clack-20180328-git'';
 
   description = ''Testing Clack Applications.'';
 
-  deps = [ args."bordeaux-threads" args."clack" args."dexador" args."flexi-streams" args."http-body" args."lack" args."prove" args."usocket" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
-    sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
+    sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
   };
 
   packageName = "clack-test";
@@ -18,18 +18,55 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-test DESCRIPTION Testing Clack Applications. SHA256
-    1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
-    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz
-    MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-test FILENAME clack-test
+    1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
+    http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
+    MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-test FILENAME clack-test
     DEPS
-    ((NAME bordeaux-threads FILENAME bordeaux-threads)
-     (NAME clack FILENAME clack) (NAME dexador FILENAME dexador)
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME babel FILENAME babel)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz)
+     (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl)
+     (NAME cl-annot FILENAME cl-annot)
+     (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors)
+     (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport)
+     (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
+     (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+     (NAME dexador FILENAME dexador) (NAME fast-http FILENAME fast-http)
+     (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME http-body FILENAME http-body) (NAME lack FILENAME lack)
-     (NAME prove FILENAME prove) (NAME usocket FILENAME usocket))
+     (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
+     (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
+     (NAME lack-component FILENAME lack-component)
+     (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
+     (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
+     (NAME local-time FILENAME local-time)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
+     (NAME prove FILENAME prove) (NAME quri FILENAME quri)
+     (NAME smart-buffer FILENAME smart-buffer)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME trivial-mimes FILENAME trivial-mimes)
+     (NAME trivial-types FILENAME trivial-types)
+     (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (bordeaux-threads clack dexador flexi-streams http-body lack prove usocket)
-    VERSION clack-20170630-git SIBLINGS
+    (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
+     chipz chunga cl+ssl cl-annot cl-ansi-text cl-base64 cl-colors cl-cookie
+     cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot cl-utilities clack
+     dexador fast-http fast-io flexi-streams http-body ironclad jonathan lack
+     lack-component lack-middleware-backtrace lack-util let-plus local-time
+     named-readtables nibbles proc-parse prove quri smart-buffer split-sequence
+     static-vectors trivial-features trivial-garbage trivial-gray-streams
+     trivial-mimes trivial-types usocket xsubseq)
+    VERSION clack-20180328-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-v1-compat clack
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index bf6b3dbfa652..b810de3fd1c8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20170630-git'';
+  version = ''clack-20180328-git'';
 
   description = '''';
 
-  deps = [ args."alexandria" args."bordeaux-threads" args."circular-streams" args."cl-base64" args."cl-ppcre" args."cl-syntax-annot" args."clack" args."clack-test" args."dexador" args."flexi-streams" args."http-body" args."ironclad" args."lack" args."lack-util" args."local-time" args."marshal" args."prove" args."quri" args."split-sequence" args."trivial-backtrace" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" ];
+  deps = [ args."alexandria" args."anaphora" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."circular-streams" args."cl_plus_ssl" args."cl-annot" args."cl-ansi-text" args."cl-base64" args."cl-colors" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."clack" args."clack-test" args."dexador" args."fast-http" args."fast-io" args."flexi-streams" args."http-body" args."ironclad" args."jonathan" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."let-plus" args."local-time" args."marshal" args."named-readtables" args."nibbles" args."proc-parse" args."prove" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-backtrace" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."trivial-types" args."uiop" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
-    sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
+    sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
   };
 
   packageName = "clack-v1-compat";
@@ -18,33 +18,58 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256
-    1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
-    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz
-    MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack-v1-compat FILENAME
+    1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
+    http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
+    MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack-v1-compat FILENAME
     clack-v1-compat DEPS
-    ((NAME alexandria FILENAME alexandria)
+    ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)
+     (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz)
+     (NAME chunga FILENAME chunga)
      (NAME circular-streams FILENAME circular-streams)
-     (NAME cl-base64 FILENAME cl-base64) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-annot FILENAME cl-annot)
+     (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl-colors FILENAME cl-colors)
+     (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport)
+     (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-syntax-annot FILENAME cl-syntax-annot)
-     (NAME clack FILENAME clack) (NAME clack-test FILENAME clack-test)
-     (NAME dexador FILENAME dexador)
+     (NAME cl-utilities FILENAME cl-utilities) (NAME clack FILENAME clack)
+     (NAME clack-test FILENAME clack-test) (NAME dexador FILENAME dexador)
+     (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
      (NAME http-body FILENAME http-body) (NAME ironclad FILENAME ironclad)
-     (NAME lack FILENAME lack) (NAME lack-util FILENAME lack-util)
+     (NAME jonathan FILENAME jonathan) (NAME lack FILENAME lack)
+     (NAME lack-component FILENAME lack-component)
+     (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
+     (NAME lack-util FILENAME lack-util) (NAME let-plus FILENAME let-plus)
      (NAME local-time FILENAME local-time) (NAME marshal FILENAME marshal)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME nibbles FILENAME nibbles) (NAME proc-parse FILENAME proc-parse)
      (NAME prove FILENAME prove) (NAME quri FILENAME quri)
+     (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
+     (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
      (NAME trivial-mimes FILENAME trivial-mimes)
      (NAME trivial-types FILENAME trivial-types) (NAME uiop FILENAME uiop)
-     (NAME usocket FILENAME usocket))
+     (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria bordeaux-threads circular-streams cl-base64 cl-ppcre
-     cl-syntax-annot clack clack-test dexador flexi-streams http-body ironclad
-     lack lack-util local-time marshal prove quri split-sequence
-     trivial-backtrace trivial-mimes trivial-types uiop usocket)
-    VERSION clack-20170630-git SIBLINGS
+    (alexandria anaphora babel bordeaux-threads cffi cffi-grovel cffi-toolchain
+     chipz chunga circular-streams cl+ssl cl-annot cl-ansi-text cl-base64
+     cl-colors cl-cookie cl-fad cl-ppcre cl-reexport cl-syntax cl-syntax-annot
+     cl-utilities clack clack-test dexador fast-http fast-io flexi-streams
+     http-body ironclad jonathan lack lack-component lack-middleware-backtrace
+     lack-util let-plus local-time marshal named-readtables nibbles proc-parse
+     prove quri smart-buffer split-sequence static-vectors trivial-backtrace
+     trivial-features trivial-garbage trivial-gray-streams trivial-mimes
+     trivial-types uiop usocket xsubseq)
+    VERSION clack-20180328-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 26ded8945cd0..08e5ff71cc5c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20170630-git'';
+  version = ''20180328-git'';
 
   description = ''Web application environment for Common Lisp'';
 
-  deps = [ args."alexandria" args."bordeaux-threads" args."lack" args."lack-middleware-backtrace" args."lack-util" args."uiop" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."ironclad" args."lack" args."lack-component" args."lack-middleware-backtrace" args."lack-util" args."nibbles" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz'';
-    sha256 = ''1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg'';
+    url = ''http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz'';
+    sha256 = ''1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai'';
   };
 
   packageName = "clack";
@@ -18,17 +18,20 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256
-    1z3xrwldfzd4nagk2d0gw5hspnr35r6kh19ksqr3kyf6wpn2lybg URL
-    http://beta.quicklisp.org/archive/clack/2017-06-30/clack-20170630-git.tgz
-    MD5 845b25a3cc6f3a1ee1dbd6de73dfb815 NAME clack FILENAME clack DEPS
+    1appp17m7b5laxwgnidf9kral1476nl394mm10xzi1c0i18rssai URL
+    http://beta.quicklisp.org/archive/clack/2018-03-28/clack-20180328-git.tgz
+    MD5 5cf75a5d908efcd779438dc13f917d57 NAME clack FILENAME clack DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
-     (NAME lack FILENAME lack)
+     (NAME ironclad FILENAME ironclad) (NAME lack FILENAME lack)
+     (NAME lack-component FILENAME lack-component)
      (NAME lack-middleware-backtrace FILENAME lack-middleware-backtrace)
-     (NAME lack-util FILENAME lack-util) (NAME uiop FILENAME uiop))
+     (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles)
+     (NAME uiop FILENAME uiop))
     DEPENDENCIES
-    (alexandria bordeaux-threads lack lack-middleware-backtrace lack-util uiop)
-    VERSION 20170630-git SIBLINGS
+    (alexandria bordeaux-threads ironclad lack lack-component
+     lack-middleware-backtrace lack-util nibbles uiop)
+    VERSION 20180328-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot
      clack-handler-wookie clack-socket clack-test clack-v1-compat
      t-clack-handler-fcgi t-clack-handler-hunchentoot t-clack-handler-toot
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 3ecc0e101498..312d0eb10a44 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20180131-git'';
+  version = ''20180430-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz'';
-    sha256 = ''0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz'';
+    sha256 = ''1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v'';
   };
 
   packageName = "closer-mop";
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 0lsfpxppbd8j4ayfrhd723ck367yb4amdywwaqj9yivh00zn4r6s URL
-    http://beta.quicklisp.org/archive/closer-mop/2018-01-31/closer-mop-20180131-git.tgz
-    MD5 d572109e102869d89f206a46619c2ed0 NAME closer-mop FILENAME closer-mop
-    DEPS NIL DEPENDENCIES NIL VERSION 20180131-git SIBLINGS NIL PARASITES NIL) */
+    SHA256 1bbvjkqjw17dgzy6spqqpdlarcxd0rchki769r43g5p5sghxlb6v URL
+    http://beta.quicklisp.org/archive/closer-mop/2018-04-30/closer-mop-20180430-git.tgz
+    MD5 7578c66d4d468a21de9c5cf065b8615f NAME closer-mop FILENAME closer-mop
+    DEPS NIL DEPENDENCIES NIL VERSION 20180430-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index 6cc6c24c3b93..303d43a964ee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension.'';
 
-  deps = [ args."alexandria" args."bordeaux-threads" args."cl-aa" args."cl-fad" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-aa" args."cl-fad" args."cl-paths" args."cl-paths-ttf" args."cl-store" args."cl-vectors" args."clx" args."trivial-features" args."zpb-ttf" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
@@ -28,11 +28,12 @@ rec {
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad)
+     (NAME cl-paths FILENAME cl-paths)
      (NAME cl-paths-ttf FILENAME cl-paths-ttf)
      (NAME cl-store FILENAME cl-store) (NAME cl-vectors FILENAME cl-vectors)
      (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features)
      (NAME zpb-ttf FILENAME zpb-ttf))
     DEPENDENCIES
-    (alexandria bordeaux-threads cl-aa cl-fad cl-paths-ttf cl-store cl-vectors
-     clx trivial-features zpb-ttf)
+    (alexandria bordeaux-threads cl-aa cl-fad cl-paths cl-paths-ttf cl-store
+     cl-vectors clx trivial-features zpb-ttf)
     VERSION 20160825-git SIBLINGS NIL PARASITES (clx-truetype-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index 2a7ec984e7fb..bd2b0ff19bdb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20171227-git'';
+  version = ''20180430-git'';
 
   parasites = [ "clx/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."fiasco" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz'';
-    sha256 = ''159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri'';
+    url = ''http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz'';
+    sha256 = ''18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3'';
   };
 
   packageName = "clx";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM clx DESCRIPTION
     An implementation of the X Window System protocol in Lisp. SHA256
-    159kwwilyvaffjdz7sbwwd4cncfa8kxndc7n3adml9ivbvaz2wri URL
-    http://beta.quicklisp.org/archive/clx/2017-12-27/clx-20171227-git.tgz MD5
-    40642f49e26b88859376efe2e5330a24 NAME clx FILENAME clx DEPS
-    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20171227-git
+    18ghhirnx0js7q1samwyah990nmgqbas7b1y0wy0fqynaznaz9x3 URL
+    http://beta.quicklisp.org/archive/clx/2018-04-30/clx-20180430-git.tgz MD5
+    bf9c1d6b1b2856ddbd4bf2fa75bbc309 NAME clx FILENAME clx DEPS
+    ((NAME fiasco FILENAME fiasco)) DEPENDENCIES (fiasco) VERSION 20180430-git
     SIBLINGS NIL PARASITES (clx/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
new file mode 100644
index 000000000000..ba523ae837d7
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-simple-tree.nix
@@ -0,0 +1,53 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''css-selectors-simple-tree'';
+  version = ''css-selectors-20160628-git'';
+
+  description = ''An implementation of css selectors that interacts with cl-html5-parser's simple-tree'';
+
+  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-html5-parser" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."puri" args."split-sequence" args."string-case" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."yacc" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
+    sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
+  };
+
+  packageName = "css-selectors-simple-tree";
+
+  asdFilesToKeep = ["css-selectors-simple-tree.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM css-selectors-simple-tree DESCRIPTION
+    An implementation of css selectors that interacts with cl-html5-parser's simple-tree
+    SHA256 0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL
+    http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz
+    MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors-simple-tree
+    FILENAME css-selectors-simple-tree DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME buildnode FILENAME buildnode)
+     (NAME cl-html5-parser FILENAME cl-html5-parser)
+     (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-unicode FILENAME cl-unicode)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME closure-common FILENAME closure-common)
+     (NAME closure-html FILENAME closure-html)
+     (NAME collectors FILENAME collectors)
+     (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml)
+     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
+     (NAME cxml-test FILENAME cxml-test) (NAME cxml-xml FILENAME cxml-xml)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME iterate FILENAME iterate) (NAME puri FILENAME puri)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME string-case FILENAME string-case) (NAME swank FILENAME swank)
+     (NAME symbol-munger FILENAME symbol-munger)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME yacc FILENAME yacc))
+    DEPENDENCIES
+    (alexandria babel buildnode cl-html5-parser cl-interpol cl-ppcre cl-unicode
+     closer-mop closure-common closure-html collectors css-selectors cxml
+     cxml-dom cxml-klacks cxml-test cxml-xml flexi-streams iterate puri
+     split-sequence string-case swank symbol-munger trivial-features
+     trivial-gray-streams yacc)
+    VERSION css-selectors-20160628-git SIBLINGS
+    (css-selectors-stp css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
new file mode 100644
index 000000000000..fbe06a179fdd
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-selectors-stp.nix
@@ -0,0 +1,52 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''css-selectors-stp'';
+  version = ''css-selectors-20160628-git'';
+
+  description = ''An implementation of css selectors that interacts with cxml-stp'';
+
+  deps = [ args."alexandria" args."babel" args."buildnode" args."cl-interpol" args."cl-ppcre" args."cl-unicode" args."closer-mop" args."closure-common" args."closure-html" args."collectors" args."css-selectors" args."cxml" args."cxml-dom" args."cxml-klacks" args."cxml-stp" args."cxml-test" args."cxml-xml" args."flexi-streams" args."iterate" args."parse-number" args."puri" args."split-sequence" args."swank" args."symbol-munger" args."trivial-features" args."trivial-gray-streams" args."xpath" args."yacc" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz'';
+    sha256 = ''0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b'';
+  };
+
+  packageName = "css-selectors-stp";
+
+  asdFilesToKeep = ["css-selectors-stp.asd"];
+  overrides = x: x;
+}
+/* (SYSTEM css-selectors-stp DESCRIPTION
+    An implementation of css selectors that interacts with cxml-stp SHA256
+    0y9q719w5cv4g7in731q5p98n7pznb05vr7i7wi92mmpah2g1w4b URL
+    http://beta.quicklisp.org/archive/css-selectors/2016-06-28/css-selectors-20160628-git.tgz
+    MD5 28537144b89af4ebe28c2eb365d5569f NAME css-selectors-stp FILENAME
+    css-selectors-stp DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME buildnode FILENAME buildnode)
+     (NAME cl-interpol FILENAME cl-interpol) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-unicode FILENAME cl-unicode)
+     (NAME closer-mop FILENAME closer-mop)
+     (NAME closure-common FILENAME closure-common)
+     (NAME closure-html FILENAME closure-html)
+     (NAME collectors FILENAME collectors)
+     (NAME css-selectors FILENAME css-selectors) (NAME cxml FILENAME cxml)
+     (NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks)
+     (NAME cxml-stp FILENAME cxml-stp) (NAME cxml-test FILENAME cxml-test)
+     (NAME cxml-xml FILENAME cxml-xml)
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number)
+     (NAME puri FILENAME puri) (NAME split-sequence FILENAME split-sequence)
+     (NAME swank FILENAME swank) (NAME symbol-munger FILENAME symbol-munger)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME xpath FILENAME xpath) (NAME yacc FILENAME yacc))
+    DEPENDENCIES
+    (alexandria babel buildnode cl-interpol cl-ppcre cl-unicode closer-mop
+     closure-common closure-html collectors css-selectors cxml cxml-dom
+     cxml-klacks cxml-stp cxml-test cxml-xml flexi-streams iterate parse-number
+     puri split-sequence swank symbol-munger trivial-features
+     trivial-gray-streams xpath yacc)
+    VERSION css-selectors-20160628-git SIBLINGS
+    (css-selectors-simple-tree css-selectors) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 52444db0e798..6dfa61634f2b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-mysql'';
-  version = ''cl-dbi-20180131-git'';
+  version = ''cl-dbi-20180430-git'';
 
   description = ''Database driver for MySQL.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-mysql" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."named-readtables" args."split-sequence" args."trivial-features" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz'';
-    sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
+    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
   };
 
   packageName = "dbd-mysql";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256
-    0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz
-    MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-mysql FILENAME dbd-mysql DEPS
+    0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
+    MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-mysql FILENAME dbd-mysql DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cl-annot FILENAME cl-annot)
@@ -35,5 +35,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-mysql cl-syntax
      cl-syntax-annot closer-mop dbi named-readtables split-sequence
      trivial-features trivial-types)
-    VERSION cl-dbi-20180131-git SIBLINGS
+    VERSION cl-dbi-20180430-git SIBLINGS
     (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 4dc4683ff9a0..bb9558fda51e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-postgres'';
-  version = ''cl-dbi-20180131-git'';
+  version = ''cl-dbi-20180430-git'';
 
   description = ''Database driver for PostgreSQL.'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-postgres" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."md5" args."named-readtables" args."split-sequence" args."trivial-garbage" args."trivial-types" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz'';
-    sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
+    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
   };
 
   packageName = "dbd-postgres";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256
-    0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz
-    MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-postgres FILENAME
+    0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
+    MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-postgres FILENAME
     dbd-postgres DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -37,5 +37,5 @@ rec {
     (alexandria bordeaux-threads cl-annot cl-postgres cl-syntax cl-syntax-annot
      closer-mop dbi md5 named-readtables split-sequence trivial-garbage
      trivial-types usocket)
-    VERSION cl-dbi-20180131-git SIBLINGS
+    VERSION cl-dbi-20180430-git SIBLINGS
     (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index cce90acfdf9c..6e8e85e72abc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbd-sqlite3'';
-  version = ''cl-dbi-20180131-git'';
+  version = ''cl-dbi-20180430-git'';
 
   description = ''Database driver for SQLite3.'';
 
   deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."dbi" args."iterate" args."named-readtables" args."split-sequence" args."sqlite" args."trivial-features" args."trivial-types" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz'';
-    sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
+    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
   };
 
   packageName = "dbd-sqlite3";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256
-    0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz
-    MD5 7dacf1c276fab38b952813795ff1f707 NAME dbd-sqlite3 FILENAME dbd-sqlite3
+    0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
+    MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbd-sqlite3 FILENAME dbd-sqlite3
     DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -38,5 +38,5 @@ rec {
     (alexandria babel bordeaux-threads cffi cl-annot cl-syntax cl-syntax-annot
      closer-mop dbi iterate named-readtables split-sequence sqlite
      trivial-features trivial-types uiop)
-    VERSION cl-dbi-20180131-git SIBLINGS
+    VERSION cl-dbi-20180430-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbi-test dbi) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
index 31a48ea807b4..e75961dd9ace 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dbi'';
-  version = ''cl-20180131-git'';
+  version = ''cl-20180430-git'';
 
   description = ''Database independent interface for Common Lisp'';
 
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-annot" args."cl-syntax" args."cl-syntax-annot" args."closer-mop" args."named-readtables" args."split-sequence" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz'';
-    sha256 = ''0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn'';
+    url = ''http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz'';
+    sha256 = ''0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv'';
   };
 
   packageName = "dbi";
@@ -18,9 +18,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dbi DESCRIPTION Database independent interface for Common Lisp
-    SHA256 0hz5na9aqfi3z78yhzz4dhf2zy3h0v639w41w8b1adffyqqf1vhn URL
-    http://beta.quicklisp.org/archive/cl-dbi/2018-01-31/cl-dbi-20180131-git.tgz
-    MD5 7dacf1c276fab38b952813795ff1f707 NAME dbi FILENAME dbi DEPS
+    SHA256 0bjkba9z93h2sf9n40dvmw1p6nq2p3d5zw9w3zw9k1crn7a601sv URL
+    http://beta.quicklisp.org/archive/cl-dbi/2018-04-30/cl-dbi-20180430-git.tgz
+    MD5 1bc845e8738c4987342cb0f56200ba50 NAME dbi FILENAME dbi DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-syntax FILENAME cl-syntax)
@@ -32,5 +32,5 @@ rec {
     DEPENDENCIES
     (alexandria bordeaux-threads cl-annot cl-syntax cl-syntax-annot closer-mop
      named-readtables split-sequence trivial-types)
-    VERSION cl-20180131-git SIBLINGS
+    VERSION cl-20180430-git SIBLINGS
     (cl-dbi dbd-mysql dbd-postgres dbd-sqlite3 dbi-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index f03a95d27b1f..d3111b18b22b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20171130-git'';
+  version = ''20180328-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chipz" args."chunga" args."cl_plus_ssl" args."cl-base64" args."cl-cookie" args."cl-fad" args."cl-ppcre" args."cl-reexport" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."local-time" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-garbage" args."trivial-gray-streams" args."trivial-mimes" args."usocket" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz'';
-    sha256 = ''0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz'';
+    sha256 = ''13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb'';
   };
 
   packageName = "dexador";
@@ -18,16 +18,17 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256
-    0qg8jxij1s5j7jm2hxick9bvgc5nvq7fjalaah0rarynq70z61bd URL
-    http://beta.quicklisp.org/archive/dexador/2017-11-30/dexador-20171130-git.tgz
-    MD5 e1b5154f2169708e2f351707a2bc135f NAME dexador FILENAME dexador DEPS
+    13kqm1knm13rskgqyvabj284nxi68f8h3grq54snly0imw6s0ikb URL
+    http://beta.quicklisp.org/archive/dexador/2018-03-28/dexador-20180328-git.tgz
+    MD5 27eaa0c3c15e6e12e5d6046d62e4394f NAME dexador FILENAME dexador DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
-     (NAME chipz FILENAME chipz) (NAME chunga FILENAME chunga)
-     (NAME cl+ssl FILENAME cl_plus_ssl) (NAME cl-base64 FILENAME cl-base64)
-     (NAME cl-cookie FILENAME cl-cookie) (NAME cl-fad FILENAME cl-fad)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-reexport FILENAME cl-reexport)
+     (NAME cffi-toolchain FILENAME cffi-toolchain) (NAME chipz FILENAME chipz)
+     (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl_plus_ssl)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl-cookie FILENAME cl-cookie)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-reexport FILENAME cl-reexport)
      (NAME cl-utilities FILENAME cl-utilities)
      (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
@@ -42,9 +43,9 @@ rec {
      (NAME trivial-mimes FILENAME trivial-mimes)
      (NAME usocket FILENAME usocket) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria babel bordeaux-threads cffi cffi-grovel chipz chunga cl+ssl
-     cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities fast-http
-     fast-io flexi-streams local-time proc-parse quri smart-buffer
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain chipz
+     chunga cl+ssl cl-base64 cl-cookie cl-fad cl-ppcre cl-reexport cl-utilities
+     fast-http fast-io flexi-streams local-time proc-parse quri smart-buffer
      split-sequence static-vectors trivial-features trivial-garbage
      trivial-gray-streams trivial-mimes usocket xsubseq)
-    VERSION 20171130-git SIBLINGS (dexador-test) PARASITES NIL) */
+    VERSION 20180328-git SIBLINGS (dexador-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 0c3470d755cf..7ee5f91a1580 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''documentation-utils'';
-  version = ''20180131-git'';
+  version = ''20180228-git'';
 
   description = ''A few simple tools to help you with documenting your library.'';
 
   deps = [ args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz'';
-    sha256 = ''0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm'';
+    url = ''http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz'';
+    sha256 = ''0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w'';
   };
 
   packageName = "documentation-utils";
@@ -19,9 +19,9 @@ rec {
 }
 /* (SYSTEM documentation-utils DESCRIPTION
     A few simple tools to help you with documenting your library. SHA256
-    0kyxjcl7dvylymzvmrn90kdwaxgrzyzpi1mqpirsr3yyb8h71avm URL
-    http://beta.quicklisp.org/archive/documentation-utils/2018-01-31/documentation-utils-20180131-git.tgz
-    MD5 375dbb8ce48543fce1526eeea8d2a976 NAME documentation-utils FILENAME
+    0jwbsm5qk2pg6fpzf9ny3gp780k5lqjgb5p6gv45s9h7x247pb2w URL
+    http://beta.quicklisp.org/archive/documentation-utils/2018-02-28/documentation-utils-20180228-git.tgz
+    MD5 b0c823120a376e0474433d151df52548 NAME documentation-utils FILENAME
     documentation-utils DEPS ((NAME trivial-indent FILENAME trivial-indent))
-    DEPENDENCIES (trivial-indent) VERSION 20180131-git SIBLINGS NIL PARASITES
+    DEPENDENCIES (trivial-indent) VERSION 20180228-git SIBLINGS NIL PARASITES
     NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index b9f17a5d241f..36411ca05753 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap'';
-  version = ''20180131-git'';
+  version = ''20180430-git'';
 
   parasites = [ "esrap/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz'';
-    sha256 = ''1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc'';
+    url = ''http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz'';
+    sha256 = ''1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav'';
   };
 
   packageName = "esrap";
@@ -21,9 +21,9 @@ rec {
 }
 /* (SYSTEM esrap DESCRIPTION
     A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256
-    1kgr77w1ya125c04h6szxhzkxnq578rdf8f399wadqkav6x9dpkc URL
-    http://beta.quicklisp.org/archive/esrap/2018-01-31/esrap-20180131-git.tgz
-    MD5 89b22e10575198b9f680e0c4e90bec2c NAME esrap FILENAME esrap DEPS
+    1wv33nzsm6hinr4blfih9napd0gqx8jf8dnnp224h95lhn9fxaav URL
+    http://beta.quicklisp.org/archive/esrap/2018-04-30/esrap-20180430-git.tgz
+    MD5 51efcf9b228ebfe63831db8ba797b0e8 NAME esrap FILENAME esrap DEPS
     ((NAME alexandria FILENAME alexandria) (NAME fiveam FILENAME fiveam))
-    DEPENDENCIES (alexandria fiveam) VERSION 20180131-git SIBLINGS NIL
+    DEPENDENCIES (alexandria fiveam) VERSION 20180430-git SIBLINGS NIL
     PARASITES (esrap/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index f78b7ae0cb69..89bed83acd54 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''Alternative I/O mechanism to a stream or vector'';
 
-  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."static-vectors" args."trivial-features" args."trivial-gray-streams" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/fast-io/2017-10-23/fast-io-20171023-git.tgz'';
@@ -23,10 +23,11 @@ rec {
     MD5 89105f8277f3bf3709fae1b789e3d5ad NAME fast-io FILENAME fast-io DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams))
     DEPENDENCIES
-    (alexandria babel cffi cffi-grovel static-vectors trivial-features
-     trivial-gray-streams)
+    (alexandria babel cffi cffi-grovel cffi-toolchain static-vectors
+     trivial-features trivial-gray-streams)
     VERSION 20171023-git SIBLINGS (fast-io-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
index 245ee8b394af..29fd1efe2f5e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiasco.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fiasco'';
-  version = ''20171227-git'';
+  version = ''20180228-git'';
 
   parasites = [ "fiasco-self-tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz'';
-    sha256 = ''1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2'';
+    url = ''http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz'';
+    sha256 = ''0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy'';
   };
 
   packageName = "fiasco";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM fiasco DESCRIPTION
     A Common Lisp test framework that treasures your failures, logical continuation of Stefil.
-    SHA256 1kv88yp4vjglahvknaxcdsp2kiwbs1nm94f857mkr2pmy87qbqx2 URL
-    http://beta.quicklisp.org/archive/fiasco/2017-12-27/fiasco-20171227-git.tgz
-    MD5 3cc915e91f18617eb3d436b6fea9dd49 NAME fiasco FILENAME fiasco DEPS
+    SHA256 0a67wvi5whmlw7kiv3b3rzy9kxn9m3135j9cnn92vads66adpxpy URL
+    http://beta.quicklisp.org/archive/fiasco/2018-02-28/fiasco-20180228-git.tgz
+    MD5 a924e43c335836d2e44731dee6a1b8e6 NAME fiasco FILENAME fiasco DEPS
     ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION
-    20171227-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */
+    20180228-git SIBLINGS NIL PARASITES (fiasco-self-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
index 364d62266042..be9648a0da4a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fiveam.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fiveam'';
-  version = ''v1.3'';
+  version = ''v1.4.1'';
 
   parasites = [ "fiveam/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."net_dot_didierverna_dot_asdf-flv" args."trivial-backtrace" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz'';
-    sha256 = ''0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2'';
+    url = ''http://beta.quicklisp.org/archive/fiveam/2018-02-28/fiveam-v1.4.1.tgz'';
+    sha256 = ''06y82y58x0haj20pkbqvm1rv19adafyvf01q56v73yhzs94nb7f3'';
   };
 
   packageName = "fiveam";
@@ -20,11 +20,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM fiveam DESCRIPTION A simple regression testing framework SHA256
-    0cdjl3lg1xib5mc3rnw80n58zxmf3hz1xa567lq4jvh8kzxl30q2 URL
-    http://beta.quicklisp.org/archive/fiveam/2016-08-25/fiveam-v1.3.tgz MD5
-    bd03a588915f834031eeae9139c51aa4 NAME fiveam FILENAME fiveam DEPS
+    06y82y58x0haj20pkbqvm1rv19adafyvf01q56v73yhzs94nb7f3 URL
+    http://beta.quicklisp.org/archive/fiveam/2018-02-28/fiveam-v1.4.1.tgz MD5
+    7f182f8a4c12b98671e1707ae0f140b7 NAME fiveam FILENAME fiveam DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME net.didierverna.asdf-flv FILENAME net_dot_didierverna_dot_asdf-flv)
      (NAME trivial-backtrace FILENAME trivial-backtrace))
     DEPENDENCIES (alexandria net.didierverna.asdf-flv trivial-backtrace)
-    VERSION v1.3 SIBLINGS NIL PARASITES (fiveam/test)) */
+    VERSION v1.4.1 SIBLINGS NIL PARASITES (fiveam/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 6e652e8b312e..7b37e5709e86 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''flexi-streams'';
-  version = ''20171227-git'';
+  version = ''20180328-git'';
 
   parasites = [ "flexi-streams-test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."trivial-gray-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz'';
-    sha256 = ''1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc'';
+    url = ''http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz'';
+    sha256 = ''0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11'';
   };
 
   packageName = "flexi-streams";
@@ -20,10 +20,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp
-    SHA256 1hw3w8syz7pyggxz1fwskrvjjwz5518vz5clkkjxfshlzqhwxfyc URL
-    http://beta.quicklisp.org/archive/flexi-streams/2017-12-27/flexi-streams-20171227-git.tgz
-    MD5 583aa697051062a0d6a6a73923f865d3 NAME flexi-streams FILENAME
+    SHA256 0hdmzihii3wv6769dfkkw15avpgifizdd7lxdlgjk7h0h8v7yw11 URL
+    http://beta.quicklisp.org/archive/flexi-streams/2018-03-28/flexi-streams-20180328-git.tgz
+    MD5 af40ae10a0aab65eccfe161a32e1033b NAME flexi-streams FILENAME
     flexi-streams DEPS
     ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
-    (trivial-gray-streams) VERSION 20171227-git SIBLINGS NIL PARASITES
+    (trivial-gray-streams) VERSION 20180328-git SIBLINGS NIL PARASITES
     (flexi-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index 604ccf0bdc73..433a31be0d8b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''HTTP POST data parser for Common Lisp'';
 
-  deps = [ args."alexandria" args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."trivial-features" args."trivial-gray-streams" args."xsubseq" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."cl-utilities" args."fast-http" args."fast-io" args."flexi-streams" args."jonathan" args."named-readtables" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" args."xsubseq" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz'';
@@ -22,19 +22,28 @@ rec {
     http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz
     MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body FILENAME http-body DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME cl-annot FILENAME cl-annot) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-syntax-annot FILENAME cl-syntax-annot)
      (NAME cl-utilities FILENAME cl-utilities)
      (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
      (NAME flexi-streams FILENAME flexi-streams)
-     (NAME jonathan FILENAME jonathan) (NAME proc-parse FILENAME proc-parse)
-     (NAME quri FILENAME quri) (NAME smart-buffer FILENAME smart-buffer)
+     (NAME jonathan FILENAME jonathan)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri)
+     (NAME smart-buffer FILENAME smart-buffer)
      (NAME split-sequence FILENAME split-sequence)
+     (NAME static-vectors FILENAME static-vectors)
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME trivial-types FILENAME trivial-types)
      (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria babel cl-annot cl-ppcre cl-syntax cl-utilities fast-http
-     fast-io flexi-streams jonathan proc-parse quri smart-buffer split-sequence
-     trivial-features trivial-gray-streams xsubseq)
+    (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre
+     cl-syntax cl-syntax-annot cl-utilities fast-http fast-io flexi-streams
+     jonathan named-readtables proc-parse quri smart-buffer split-sequence
+     static-vectors trivial-features trivial-gray-streams trivial-types
+     xsubseq)
     VERSION 20161204-git SIBLINGS (http-body-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
index a3d8f6133a00..a74f24f8642f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu_dot_dwim_dot_asdf'';
-  version = ''20170630-darcs'';
+  version = ''20180228-darcs'';
 
   description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz'';
-    sha256 = ''151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz'';
+    sha256 = ''19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld'';
   };
 
   packageName = "hu.dwim.asdf";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM hu.dwim.asdf DESCRIPTION
     Various ASDF extensions such as attached test and documentation system, explicit development support, etc.
-    SHA256 151l4s0cd6jxhz1q635zhyq48b1sz9ns88agj92r0f2q8igdx0fb URL
-    http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-06-30/hu.dwim.asdf-20170630-darcs.tgz
-    MD5 b086cb36b6a88641497b20c39937c9d4 NAME hu.dwim.asdf FILENAME
+    SHA256 19ak3krzlzbdh8chbimwjca8q4jksaf9v88k86jsdgxchfr0dkld URL
+    http://beta.quicklisp.org/archive/hu.dwim.asdf/2018-02-28/hu.dwim.asdf-20180228-darcs.tgz
+    MD5 a1f3085cbd7ea77f9212112cc8914e86 NAME hu.dwim.asdf FILENAME
     hu_dot_dwim_dot_asdf DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES (uiop)
-    VERSION 20170630-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */
+    VERSION 20180228-darcs SIBLINGS (hu.dwim.asdf.documentation) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index ce3508da8165..c4ae44cd6761 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -7,10 +7,10 @@ rec {
 
   description = ''I/O library.'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."iolib_dot_grovel" args."split-sequence" args."swap-bytes" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
     sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
   };
 
@@ -21,13 +21,14 @@ rec {
 }
 /* (SYSTEM iolib DESCRIPTION I/O library. SHA256
     12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5
     fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib FILENAME iolib DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME idna FILENAME idna)
      (NAME iolib.asdf FILENAME iolib_dot_asdf)
      (NAME iolib.base FILENAME iolib_dot_base)
+     (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp)
      (NAME iolib.conf FILENAME iolib_dot_conf)
      (NAME iolib.grovel FILENAME iolib_dot_grovel)
      (NAME split-sequence FILENAME split-sequence)
@@ -35,7 +36,8 @@ rec {
      (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES
     (alexandria babel bordeaux-threads cffi idna iolib.asdf iolib.base
-     iolib.conf iolib.grovel split-sequence swap-bytes trivial-features)
+     iolib.common-lisp iolib.conf iolib.grovel split-sequence swap-bytes
+     trivial-features)
     VERSION v0.8.3 SIBLINGS
     (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples
      iolib.grovel iolib.tests)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
index f566d159e0f5..195b52c08c45 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_asdf.nix
@@ -8,7 +8,7 @@ rec {
   deps = [ args."alexandria" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
     sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
   };
 
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM iolib.asdf DESCRIPTION A few ASDF component classes. SHA256
     12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5
     fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.asdf FILENAME iolib_dot_asdf
     DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria)
     VERSION iolib-v0.8.3 SIBLINGS
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
index c42eb7e602b0..aa650edde020 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_base.nix
@@ -8,7 +8,7 @@ rec {
   deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
     sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
   };
 
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM iolib.base DESCRIPTION Base IOlib package, used instead of CL.
     SHA256 12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5
     fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.base FILENAME iolib_dot_base
     DEPS
     ((NAME alexandria FILENAME alexandria)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
index 1171ae0f391d..c0ec72d48695 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_common-lisp.nix
@@ -8,7 +8,7 @@ rec {
   deps = [ args."alexandria" args."iolib_dot_asdf" args."iolib_dot_conf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
     sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
   };
 
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM iolib.common-lisp DESCRIPTION Slightly modified Common Lisp. SHA256
     12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5
     fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.common-lisp FILENAME
     iolib_dot_common-lisp DEPS
     ((NAME alexandria FILENAME alexandria)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
index 2dc99c742a4e..4ba0cfa1ce2e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_conf.nix
@@ -8,7 +8,7 @@ rec {
   deps = [ args."alexandria" args."iolib_dot_asdf" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
     sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
   };
 
@@ -19,7 +19,7 @@ rec {
 }
 /* (SYSTEM iolib.conf DESCRIPTION Compile-time configuration for IOLib. SHA256
     12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5
     fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.conf FILENAME iolib_dot_conf
     DEPS
     ((NAME alexandria FILENAME alexandria)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
index d6c97ad7838a..7a1a12243fe2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib_dot_grovel.nix
@@ -5,10 +5,10 @@ rec {
 
   description = ''The CFFI Groveller'';
 
-  deps = [ args."alexandria" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_conf" args."split-sequence" args."uiop" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."iolib_dot_asdf" args."iolib_dot_base" args."iolib_dot_common-lisp" args."iolib_dot_conf" args."split-sequence" args."trivial-features" args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz'';
     sha256 = ''12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c'';
   };
 
@@ -19,16 +19,20 @@ rec {
 }
 /* (SYSTEM iolib.grovel DESCRIPTION The CFFI Groveller SHA256
     12gsvsjyxmclwidcjvyrfvd0773ib54a3qzmf33hmgc9knxlli7c URL
-    http://beta.quicklisp.org/archive/iolib/2017-06-30/iolib-v0.8.3.tgz MD5
+    http://beta.quicklisp.org/archive/iolib/2018-02-28/iolib-v0.8.3.tgz MD5
     fc28d4cad6f8e43972df3baa6a8ac45c NAME iolib.grovel FILENAME
     iolib_dot_grovel DEPS
-    ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi)
-     (NAME iolib.asdf FILENAME iolib_dot_asdf)
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME iolib.asdf FILENAME iolib_dot_asdf)
      (NAME iolib.base FILENAME iolib_dot_base)
+     (NAME iolib.common-lisp FILENAME iolib_dot_common-lisp)
      (NAME iolib.conf FILENAME iolib_dot_conf)
-     (NAME split-sequence FILENAME split-sequence) (NAME uiop FILENAME uiop))
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME uiop FILENAME uiop))
     DEPENDENCIES
-    (alexandria cffi iolib.asdf iolib.base iolib.conf split-sequence uiop)
+    (alexandria babel cffi iolib.asdf iolib.base iolib.common-lisp iolib.conf
+     split-sequence trivial-features uiop)
     VERSION iolib-v0.8.3 SIBLINGS
     (iolib iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples
      iolib.tests)
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index 578b251ecec2..8061f3844e0b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ironclad'';
-  version = ''v0.37'';
+  version = ''v0.39'';
 
   parasites = [ "ironclad/tests" ];
 
   description = ''A cryptographic toolkit written in pure Common Lisp'';
 
-  deps = [ args."nibbles" ];
+  deps = [ args."nibbles" args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz'';
-    sha256 = ''061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz'';
+    sha256 = ''0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8'';
   };
 
   packageName = "ironclad";
@@ -21,8 +21,9 @@ rec {
 }
 /* (SYSTEM ironclad DESCRIPTION
     A cryptographic toolkit written in pure Common Lisp SHA256
-    061ln65yj9psch84nmsjrrlq41bkfv6iyg8sd9kpdc75lfc0vpi2 URL
-    http://beta.quicklisp.org/archive/ironclad/2017-11-30/ironclad-v0.37.tgz
-    MD5 9d8734764eead79f3a5d230b8e800d8f NAME ironclad FILENAME ironclad DEPS
-    ((NAME nibbles FILENAME nibbles)) DEPENDENCIES (nibbles) VERSION v0.37
-    SIBLINGS (ironclad-text) PARASITES (ironclad/tests)) */
+    0nqm6bnxiiv78c33zlr5n53wdkpcfxh1xrx7af6122n29ggzj3h8 URL
+    http://beta.quicklisp.org/archive/ironclad/2018-04-30/ironclad-v0.39.tgz
+    MD5 f4abb18cbbe173c569d8ed99800d9f9e NAME ironclad FILENAME ironclad DEPS
+    ((NAME nibbles FILENAME nibbles) (NAME rt FILENAME rt)) DEPENDENCIES
+    (nibbles rt) VERSION v0.39 SIBLINGS (ironclad-text) PARASITES
+    (ironclad/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index 645048c71909..f276ec72736d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''iterate'';
-  version = ''20180131-darcs'';
+  version = ''20180228-git'';
 
   parasites = [ "iterate/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz'';
-    sha256 = ''05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj'';
+    url = ''http://beta.quicklisp.org/archive/iterate/2018-02-28/iterate-20180228-git.tgz'';
+    sha256 = ''0bz5dspx778v2fdfbi5x8v8r56mmda8svhp3immjkrpzc21rc7ib'';
   };
 
   packageName = "iterate";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM iterate DESCRIPTION
     Jonathan Amsterdam's iterator/gatherer/accumulator facility SHA256
-    05jlwd59w13k4n9x7a0mszdv7i78cbmx93w2p1yzsi30593rh9hj URL
-    http://beta.quicklisp.org/archive/iterate/2018-01-31/iterate-20180131-darcs.tgz
-    MD5 40a1776b445e42463c2c6f754468fb83 NAME iterate FILENAME iterate DEPS NIL
-    DEPENDENCIES NIL VERSION 20180131-darcs SIBLINGS NIL PARASITES
+    0bz5dspx778v2fdfbi5x8v8r56mmda8svhp3immjkrpzc21rc7ib URL
+    http://beta.quicklisp.org/archive/iterate/2018-02-28/iterate-20180228-git.tgz
+    MD5 ee3b198b0f9674c11e5283e56f57ed78 NAME iterate FILENAME iterate DEPS NIL
+    DEPENDENCIES NIL VERSION 20180228-git SIBLINGS NIL PARASITES
     (iterate/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
index 978e58d26925..9a4681894818 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ixf'';
-  version = ''cl-20170630-git'';
+  version = ''cl-20180228-git'';
 
   description = ''Tools to handle IBM PC version of IXF file format'';
 
-  deps = [ args."alexandria" args."babel" args."cl-ppcre" args."ieee-floats" args."local-time" args."md5" args."split-sequence" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cl-fad" args."cl-ppcre" args."ieee-floats" args."local-time" args."md5" args."split-sequence" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz'';
-    sha256 = ''1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2'';
+    url = ''http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz'';
+    sha256 = ''1yqlzyl51kj5fjfg064fc9606zha5b2xdjapfivr2vqz4azs1nvs'';
   };
 
   packageName = "ixf";
@@ -18,13 +18,17 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format
-    SHA256 1qfmsz3lbydas7iv0bxdl4gl5ah4ydjxxqfpyini7qy0cb4wplf2 URL
-    http://beta.quicklisp.org/archive/cl-ixf/2017-06-30/cl-ixf-20170630-git.tgz
-    MD5 51db2caba094cac90982396cf552c847 NAME ixf FILENAME ixf DEPS
+    SHA256 1yqlzyl51kj5fjfg064fc9606zha5b2xdjapfivr2vqz4azs1nvs URL
+    http://beta.quicklisp.org/archive/cl-ixf/2018-02-28/cl-ixf-20180228-git.tgz
+    MD5 23732795aa317d24c1a40cc321a0e394 NAME ixf FILENAME ixf DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME ieee-floats FILENAME ieee-floats)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME ieee-floats FILENAME ieee-floats)
      (NAME local-time FILENAME local-time) (NAME md5 FILENAME md5)
-     (NAME split-sequence FILENAME split-sequence))
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME trivial-features FILENAME trivial-features))
     DEPENDENCIES
-    (alexandria babel cl-ppcre ieee-floats local-time md5 split-sequence)
-    VERSION cl-20170630-git SIBLINGS NIL PARASITES NIL) */
+    (alexandria babel bordeaux-threads cl-fad cl-ppcre ieee-floats local-time
+     md5 split-sequence trivial-features)
+    VERSION cl-20180228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 8a4d21575157..ae323790ba06 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''jonathan'';
-  version = ''20170630-git'';
+  version = ''20180430-git'';
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
-  deps = [ args."babel" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."proc-parse" args."trivial-types" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-annot" args."cl-ppcre" args."cl-syntax" args."cl-syntax-annot" args."fast-io" args."named-readtables" args."proc-parse" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."trivial-types" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz'';
-    sha256 = ''0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm'';
+    url = ''http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz'';
+    sha256 = ''0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0'';
   };
 
   packageName = "jonathan";
@@ -19,15 +19,24 @@ rec {
 }
 /* (SYSTEM jonathan DESCRIPTION
     High performance JSON encoder and decoder. Currently support: SBCL, CCL.
-    SHA256 0vxnxs38f6gxw51b69n09p2qmph17jkhwdvwq02sayiq3p4w10bm URL
-    http://beta.quicklisp.org/archive/jonathan/2017-06-30/jonathan-20170630-git.tgz
-    MD5 5d82723835164f4e3d9c4d031322eb98 NAME jonathan FILENAME jonathan DEPS
-    ((NAME babel FILENAME babel) (NAME cl-annot FILENAME cl-annot)
-     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-syntax FILENAME cl-syntax)
+    SHA256 0kv6jwd5rimfgydwfgn87wa9m4w4cnsmsx2n284jx9z7frqspdz0 URL
+    http://beta.quicklisp.org/archive/jonathan/2018-04-30/jonathan-20180430-git.tgz
+    MD5 7dc695be1b571f19aa9cd2b13aa231bb NAME jonathan FILENAME jonathan DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
+     (NAME cl-annot FILENAME cl-annot) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-syntax FILENAME cl-syntax)
      (NAME cl-syntax-annot FILENAME cl-syntax-annot)
-     (NAME fast-io FILENAME fast-io) (NAME proc-parse FILENAME proc-parse)
+     (NAME fast-io FILENAME fast-io)
+     (NAME named-readtables FILENAME named-readtables)
+     (NAME proc-parse FILENAME proc-parse)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
      (NAME trivial-types FILENAME trivial-types))
     DEPENDENCIES
-    (babel cl-annot cl-ppcre cl-syntax cl-syntax-annot fast-io proc-parse
-     trivial-types)
-    VERSION 20170630-git SIBLINGS (jonathan-test) PARASITES NIL) */
+    (alexandria babel cffi cffi-grovel cffi-toolchain cl-annot cl-ppcre
+     cl-syntax cl-syntax-annot fast-io named-readtables proc-parse
+     static-vectors trivial-features trivial-gray-streams trivial-types)
+    VERSION 20180430-git SIBLINGS (jonathan-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
index 408ef5dfabc9..4dfdce68bc8a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-component.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-component'';
-  version = ''lack-20180131-git'';
+  version = ''lack-20180430-git'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz'';
-    sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
+    sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
   };
 
   packageName = "lack-component";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-component DESCRIPTION NIL SHA256
-    17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL
-    http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5
-    e1807a22a021ca27d8d1add9219091eb NAME lack-component FILENAME
-    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180131-git SIBLINGS
+    07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
+    http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
+    b9a0c08d54538679a8dd141022e8abb1 NAME lack-component FILENAME
+    lack-component DEPS NIL DEPENDENCIES NIL VERSION lack-20180430-git SIBLINGS
     (lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
index a6816fa75c5c..c0acbc2f01fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20180131-git'';
+  version = ''lack-20180430-git'';
 
   description = '''';
 
   deps = [ args."uiop" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz'';
-    sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
+    sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
   };
 
   packageName = "lack-middleware-backtrace";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256
-    17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL
-    http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5
-    e1807a22a021ca27d8d1add9219091eb NAME lack-middleware-backtrace FILENAME
+    07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
+    http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
+    b9a0c08d54538679a8dd141022e8abb1 NAME lack-middleware-backtrace FILENAME
     lack-middleware-backtrace DEPS ((NAME uiop FILENAME uiop)) DEPENDENCIES
-    (uiop) VERSION lack-20180131-git SIBLINGS
+    (uiop) VERSION lack-20180430-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-csrf lack-middleware-mount lack-middleware-session
      lack-middleware-static lack-request lack-response lack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
index a056d9d0d146..29fcd359f6b6 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack-util'';
-  version = ''lack-20180131-git'';
+  version = ''lack-20180430-git'';
 
   description = '''';
 
   deps = [ args."ironclad" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz'';
-    sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
+    sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
   };
 
   packageName = "lack-util";
@@ -18,11 +18,11 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack-util DESCRIPTION NIL SHA256
-    17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL
-    http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5
-    e1807a22a021ca27d8d1add9219091eb NAME lack-util FILENAME lack-util DEPS
+    07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
+    http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
+    b9a0c08d54538679a8dd141022e8abb1 NAME lack-util FILENAME lack-util DEPS
     ((NAME ironclad FILENAME ironclad) (NAME nibbles FILENAME nibbles))
-    DEPENDENCIES (ironclad nibbles) VERSION lack-20180131-git SIBLINGS
+    DEPENDENCIES (ironclad nibbles) VERSION lack-20180430-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index 1c3998a3025c..9260b06dd830 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lack'';
-  version = ''20180131-git'';
+  version = ''20180430-git'';
 
   description = ''A minimal Clack'';
 
   deps = [ args."ironclad" args."lack-component" args."lack-util" args."nibbles" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz'';
-    sha256 = ''17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl'';
+    url = ''http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz'';
+    sha256 = ''07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v'';
   };
 
   packageName = "lack";
@@ -18,14 +18,14 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM lack DESCRIPTION A minimal Clack SHA256
-    17ydk90rjxjijc2r6kcwkbhh0l4a83xvhrbp0bc8wzbpkh2plywl URL
-    http://beta.quicklisp.org/archive/lack/2018-01-31/lack-20180131-git.tgz MD5
-    e1807a22a021ca27d8d1add9219091eb NAME lack FILENAME lack DEPS
+    07f0nn1y8ghzg6s9rnmazaq3n7hr91mczdci5l3v4ncs79272h5v URL
+    http://beta.quicklisp.org/archive/lack/2018-04-30/lack-20180430-git.tgz MD5
+    b9a0c08d54538679a8dd141022e8abb1 NAME lack FILENAME lack DEPS
     ((NAME ironclad FILENAME ironclad)
      (NAME lack-component FILENAME lack-component)
      (NAME lack-util FILENAME lack-util) (NAME nibbles FILENAME nibbles))
     DEPENDENCIES (ironclad lack-component lack-util nibbles) VERSION
-    20180131-git SIBLINGS
+    20180430-git SIBLINGS
     (lack-component lack-middleware-accesslog lack-middleware-auth-basic
      lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
      lack-middleware-session lack-middleware-static lack-request lack-response
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index 0b2556b2572d..a123b7ed3c02 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''local-time'';
-  version = ''20180131-git'';
+  version = ''20180228-git'';
 
   parasites = [ "local-time/test" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."alexandria" args."bordeaux-threads" args."cl-fad" args."stefil" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz'';
-    sha256 = ''1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr'';
+    url = ''http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz'';
+    sha256 = ''0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1'';
   };
 
   packageName = "local-time";
@@ -21,12 +21,12 @@ rec {
 }
 /* (SYSTEM local-time DESCRIPTION
     A library for manipulating dates and times, based on a paper by Erik Naggum
-    SHA256 1i8km0ndqk1kx914n0chi4c3kkk6m0zk0kplh87fgzwn4lh79rpr URL
-    http://beta.quicklisp.org/archive/local-time/2018-01-31/local-time-20180131-git.tgz
-    MD5 61982a1f2b29793e00369d9c2b6d1b12 NAME local-time FILENAME local-time
+    SHA256 0s38rm8rjr4m34ibrvd42y0qgchfqs1pvfm0yv46wbhgg24jgbm1 URL
+    http://beta.quicklisp.org/archive/local-time/2018-02-28/local-time-20180228-git.tgz
+    MD5 6bb475cb979c4ba004ef4f4c970dec47 NAME local-time FILENAME local-time
     DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cl-fad FILENAME cl-fad) (NAME stefil FILENAME stefil))
     DEPENDENCIES (alexandria bordeaux-threads cl-fad stefil) VERSION
-    20180131-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */
+    20180228-git SIBLINGS (cl-postgres+local-time) PARASITES (local-time/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index 4d17bd6341f2..4f6842606b45 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''marshal'';
-  version = ''cl-20170830-git'';
+  version = ''cl-20180328-git'';
 
   description = ''marshal: Simple (de)serialization of Lisp datastructures.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz'';
-    sha256 = ''1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp'';
+    url = ''http://beta.quicklisp.org/archive/cl-marshal/2018-03-28/cl-marshal-20180328-git.tgz'';
+    sha256 = ''09qmrq9lv9jlb2cnac80qd9b20swy598sfkhvngs3vcjl5xmmdhd'';
   };
 
   packageName = "marshal";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM marshal DESCRIPTION
     marshal: Simple (de)serialization of Lisp datastructures. SHA256
-    1yirhxyizfxsvsrmbh2dipzzlq09afahzmi2zlsbbv6cvijxnisp URL
-    http://beta.quicklisp.org/archive/cl-marshal/2017-08-30/cl-marshal-20170830-git.tgz
-    MD5 54bce031cdb215cd7624fdf3265b9bec NAME marshal FILENAME marshal DEPS NIL
-    DEPENDENCIES NIL VERSION cl-20170830-git SIBLINGS (marshal-tests) PARASITES
+    09qmrq9lv9jlb2cnac80qd9b20swy598sfkhvngs3vcjl5xmmdhd URL
+    http://beta.quicklisp.org/archive/cl-marshal/2018-03-28/cl-marshal-20180328-git.tgz
+    MD5 2d13dd2a276f1e63965498d10d9406ce NAME marshal FILENAME marshal DEPS NIL
+    DEPENDENCIES NIL VERSION cl-20180328-git SIBLINGS (marshal-tests) PARASITES
     NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index 472205924a9c..953dd0a58a4a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''md5'';
-  version = ''20170630-git'';
+  version = ''20180228-git'';
 
   description = ''The MD5 Message-Digest Algorithm RFC 1321'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz'';
-    sha256 = ''0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx'';
+    url = ''http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz'';
+    sha256 = ''1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4'';
   };
 
   packageName = "md5";
@@ -18,7 +18,7 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256
-    0pli483skkfbi9ln8ghxnvzw9p5srs8zyilkygsimkzy8fcc5hyx URL
-    http://beta.quicklisp.org/archive/md5/2017-06-30/md5-20170630-git.tgz MD5
-    c6a5b3ca5a23fad3dfde23963db84910 NAME md5 FILENAME md5 DEPS NIL
-    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */
+    1261ix6bmkjyx8bkpj6ksa0kgyrhngm31as77dyy3vfg6dvrsnd4 URL
+    http://beta.quicklisp.org/archive/md5/2018-02-28/md5-20180228-git.tgz MD5
+    7f250f8a2487e4e0aac1ed9c50b79b4d NAME md5 FILENAME md5 DEPS NIL
+    DEPENDENCIES NIL VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
index 565003d1e877..470d2fed738c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''mssql'';
-  version = ''cl-20170630-git'';
+  version = ''cl-20180228-git'';
 
   description = '''';
 
-  deps = [ args."cffi" args."garbage-pools" args."iterate" args."parse-number" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."garbage-pools" args."iterate" args."parse-number" args."trivial-features" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz'';
-    sha256 = ''0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy'';
+    url = ''http://beta.quicklisp.org/archive/cl-mssql/2018-02-28/cl-mssql-20180228-git.tgz'';
+    sha256 = ''1f9vq78xx4vv1898cigkf09mzimknc6ry6qrkys3xj167vyqhwm0'';
   };
 
   packageName = "mssql";
@@ -18,10 +18,13 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM mssql DESCRIPTION NIL SHA256
-    0vwssk39m8pqn8srwvbcnq43wkqlav5rvq64byrnpsrwlfcbfvxy URL
-    http://beta.quicklisp.org/archive/cl-mssql/2017-06-30/cl-mssql-20170630-git.tgz
-    MD5 88e65c72923896df603ecf20039ae305 NAME mssql FILENAME mssql DEPS
-    ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools)
-     (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number))
-    DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION
-    cl-20170630-git SIBLINGS NIL PARASITES NIL) */
+    1f9vq78xx4vv1898cigkf09mzimknc6ry6qrkys3xj167vyqhwm0 URL
+    http://beta.quicklisp.org/archive/cl-mssql/2018-02-28/cl-mssql-20180228-git.tgz
+    MD5 03a269f5221948393643432fc6de9d5d NAME mssql FILENAME mssql DEPS
+    ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
+     (NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools)
+     (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number)
+     (NAME trivial-features FILENAME trivial-features))
+    DEPENDENCIES
+    (alexandria babel cffi garbage-pools iterate parse-number trivial-features)
+    VERSION cl-20180228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index 9275e5583f56..d706bc5bad1a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''nibbles'';
-  version = ''20171130-git'';
+  version = ''20180430-git'';
 
   parasites = [ "nibbles/tests" ];
 
   description = ''A library for accessing octet-addressed blocks of data in big- and little-endian orders'';
 
-  deps = [ ];
+  deps = [ args."rt" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz'';
-    sha256 = ''05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn'';
+    url = ''http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz'';
+    sha256 = ''1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g'';
   };
 
   packageName = "nibbles";
@@ -21,8 +21,8 @@ rec {
 }
 /* (SYSTEM nibbles DESCRIPTION
     A library for accessing octet-addressed blocks of data in big- and little-endian orders
-    SHA256 05ykyniak1m0whr7pnbhg53yblr5mny0crmh72bmgnvpmkm345zn URL
-    http://beta.quicklisp.org/archive/nibbles/2017-11-30/nibbles-20171130-git.tgz
-    MD5 edce3702da9979fca3e40a4594fe36e6 NAME nibbles FILENAME nibbles DEPS NIL
-    DEPENDENCIES NIL VERSION 20171130-git SIBLINGS NIL PARASITES
-    (nibbles/tests)) */
+    SHA256 1z79x7w0qp66vdxq7lac1jkc56brmpy0x0wmm9flf91d8y9lh34g URL
+    http://beta.quicklisp.org/archive/nibbles/2018-04-30/nibbles-20180430-git.tgz
+    MD5 8d8d1cc72ce11253d01854219ea20a06 NAME nibbles FILENAME nibbles DEPS
+    ((NAME rt FILENAME rt)) DEPENDENCIES (rt) VERSION 20180430-git SIBLINGS NIL
+    PARASITES (nibbles/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
index d998ed305bb5..e636df0805e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''parse-number'';
-  version = ''1.4'';
+  version = ''v1.7'';
 
-  parasites = [ "parse-number-tests" ];
+  parasites = [ "parse-number/tests" ];
 
   description = ''Number parsing library'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz'';
-    sha256 = ''0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh'';
+    url = ''http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz'';
+    sha256 = ''11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha'';
   };
 
   packageName = "parse-number";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256
-    0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh URL
-    http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz
-    MD5 f189d474a2cd063f9743b452241e59a9 NAME parse-number FILENAME
-    parse-number DEPS NIL DEPENDENCIES NIL VERSION 1.4 SIBLINGS NIL PARASITES
-    (parse-number-tests)) */
+    11ji8856ipmqki5i4cw1zgx8hahfi8x1raz1xb20c4rmgad6nsha URL
+    http://beta.quicklisp.org/archive/parse-number/2018-02-28/parse-number-v1.7.tgz
+    MD5 b9ec925018b8f10193d73403873dde8f NAME parse-number FILENAME
+    parse-number DEPS NIL DEPENDENCIES NIL VERSION v1.7 SIBLINGS NIL PARASITES
+    (parse-number/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 02bb16e0b78d..2bde901ad43e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''plump'';
-  version = ''20180131-git'';
+  version = ''20180228-git'';
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
   deps = [ args."array-utils" args."documentation-utils" args."trivial-indent" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz'';
-    sha256 = ''12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis'';
+    url = ''http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz'';
+    sha256 = ''0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01'';
   };
 
   packageName = "plump";
@@ -19,11 +19,11 @@ rec {
 }
 /* (SYSTEM plump DESCRIPTION
     An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256
-    12kawjp88kh7cl2f3s2rg3fp3m09pr477nl9nxcfhmfkbrprslis URL
-    http://beta.quicklisp.org/archive/plump/2018-01-31/plump-20180131-git.tgz
-    MD5 b9e7e174b2322b6547bca7beddda6f3b NAME plump FILENAME plump DEPS
+    0q8carmnrh1qdhdag9w5iikdlga8g7jn824bjypzx0iwyqn1ap01 URL
+    http://beta.quicklisp.org/archive/plump/2018-02-28/plump-20180228-git.tgz
+    MD5 f210bc3fae00bac3140d939cbb2fd1de NAME plump FILENAME plump DEPS
     ((NAME array-utils FILENAME array-utils)
      (NAME documentation-utils FILENAME documentation-utils)
      (NAME trivial-indent FILENAME trivial-indent))
     DEPENDENCIES (array-utils documentation-utils trivial-indent) VERSION
-    20180131-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
+    20180228-git SIBLINGS (plump-dom plump-lexer plump-parser) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
index 441f78171098..ba7bef260c08 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''postmodern'';
-  version = ''20180131-git'';
+  version = ''20180430-git'';
 
   parasites = [ "postmodern/tests" ];
 
   description = ''PostgreSQL programming API'';
 
-  deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
+  deps = [ args."alexandria" args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."s-sql" args."s-sql_slash_tests" args."simple-date" args."simple-date_slash_postgres-glue" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz'';
-    sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
+    sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
   };
 
   packageName = "postmodern";
@@ -20,9 +20,9 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256
-    0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL
-    http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz
-    MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME postmodern FILENAME postmodern
+    0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
+    http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
+    MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME postmodern FILENAME postmodern
     DEPS
     ((NAME alexandria FILENAME alexandria)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
@@ -30,13 +30,14 @@ rec {
      (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests)
      (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam)
      (NAME md5 FILENAME md5) (NAME s-sql FILENAME s-sql)
+     (NAME s-sql/tests FILENAME s-sql_slash_tests)
      (NAME simple-date FILENAME simple-date)
      (NAME simple-date/postgres-glue FILENAME simple-date_slash_postgres-glue)
      (NAME split-sequence FILENAME split-sequence)
      (NAME usocket FILENAME usocket))
     DEPENDENCIES
     (alexandria bordeaux-threads cl-postgres cl-postgres/tests closer-mop
-     fiveam md5 s-sql simple-date simple-date/postgres-glue split-sequence
-     usocket)
-    VERSION 20180131-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES
+     fiveam md5 s-sql s-sql/tests simple-date simple-date/postgres-glue
+     split-sequence usocket)
+    VERSION 20180430-git SIBLINGS (cl-postgres s-sql simple-date) PARASITES
     (postmodern/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index e0e6bdc0f172..4f6946783939 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''puri'';
-  version = ''20150923-git'';
+  version = ''20180228-git'';
 
   parasites = [ "puri-tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."ptester" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz'';
-    sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa'';
+    url = ''http://beta.quicklisp.org/archive/puri/2018-02-28/puri-20180228-git.tgz'';
+    sha256 = ''1s4r5adrjy5asry45xbcbklxhdjydvf6n55z897nvyw33bigrnbz'';
   };
 
   packageName = "puri";
@@ -20,8 +20,8 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM puri DESCRIPTION Portable Universal Resource Indentifier Library
-    SHA256 099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa URL
-    http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz MD5
-    3bd4e30aa6b6baf6f26753b5fc357e0f NAME puri FILENAME puri DEPS
+    SHA256 1s4r5adrjy5asry45xbcbklxhdjydvf6n55z897nvyw33bigrnbz URL
+    http://beta.quicklisp.org/archive/puri/2018-02-28/puri-20180228-git.tgz MD5
+    0c43ad5d862ed0d18ef84d8e2a42f67f NAME puri FILENAME puri DEPS
     ((NAME ptester FILENAME ptester)) DEPENDENCIES (ptester) VERSION
-    20150923-git SIBLINGS NIL PARASITES (puri-tests)) */
+    20180228-git SIBLINGS NIL PARASITES (puri-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 45300754647e..da8cb466b412 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-fuse" args."cl-fuse-meta-fs" args."cl-ppcre" args."cl-utilities" args."command-line-arguments" args."iterate" args."pcall" args."pcall-queue" args."trivial-backtrace" args."trivial-features" args."trivial-utf-8" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz'';
@@ -25,6 +25,7 @@ rec {
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME cl-fuse FILENAME cl-fuse)
      (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs)
      (NAME cl-ppcre FILENAME cl-ppcre)
@@ -36,7 +37,7 @@ rec {
      (NAME trivial-features FILENAME trivial-features)
      (NAME trivial-utf-8 FILENAME trivial-utf-8))
     DEPENDENCIES
-    (alexandria babel bordeaux-threads cffi cffi-grovel cl-fuse cl-fuse-meta-fs
-     cl-ppcre cl-utilities command-line-arguments iterate pcall pcall-queue
-     trivial-backtrace trivial-features trivial-utf-8)
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain cl-fuse
+     cl-fuse-meta-fs cl-ppcre cl-utilities command-line-arguments iterate pcall
+     pcall-queue trivial-backtrace trivial-features trivial-utf-8)
     VERSION 20160531-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
index 83d835fe2dd8..c283abd479ed 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/s-sql.nix
@@ -1,15 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''s-sql'';
-  version = ''postmodern-20180131-git'';
+  version = ''postmodern-20180430-git'';
+
+  parasites = [ "s-sql/tests" ];
 
   description = '''';
 
-  deps = [ args."cl-postgres" args."md5" args."split-sequence" args."usocket" ];
+  deps = [ args."bordeaux-threads" args."cl-postgres" args."cl-postgres_slash_tests" args."closer-mop" args."fiveam" args."md5" args."postmodern" args."split-sequence" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz'';
-    sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
+    sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
   };
 
   packageName = "s-sql";
@@ -18,12 +20,18 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM s-sql DESCRIPTION NIL SHA256
-    0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL
-    http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz
-    MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME s-sql FILENAME s-sql DEPS
-    ((NAME cl-postgres FILENAME cl-postgres) (NAME md5 FILENAME md5)
+    0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
+    http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
+    MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME s-sql FILENAME s-sql DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cl-postgres FILENAME cl-postgres)
+     (NAME cl-postgres/tests FILENAME cl-postgres_slash_tests)
+     (NAME closer-mop FILENAME closer-mop) (NAME fiveam FILENAME fiveam)
+     (NAME md5 FILENAME md5) (NAME postmodern FILENAME postmodern)
      (NAME split-sequence FILENAME split-sequence)
      (NAME usocket FILENAME usocket))
-    DEPENDENCIES (cl-postgres md5 split-sequence usocket) VERSION
-    postmodern-20180131-git SIBLINGS (cl-postgres postmodern simple-date)
-    PARASITES NIL) */
+    DEPENDENCIES
+    (bordeaux-threads cl-postgres cl-postgres/tests closer-mop fiveam md5
+     postmodern split-sequence usocket)
+    VERSION postmodern-20180430-git SIBLINGS
+    (cl-postgres postmodern simple-date) PARASITES (s-sql/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
index d718b1293106..07b1498f2e3f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''simple-date'';
-  version = ''postmodern-20180131-git'';
+  version = ''postmodern-20180430-git'';
 
   parasites = [ "simple-date/postgres-glue" "simple-date/tests" ];
 
@@ -10,8 +10,8 @@ rec {
   deps = [ args."cl-postgres" args."fiveam" args."md5" args."usocket" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz'';
-    sha256 = ''0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki'';
+    url = ''http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz'';
+    sha256 = ''0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f'';
   };
 
   packageName = "simple-date";
@@ -20,12 +20,12 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM simple-date DESCRIPTION NIL SHA256
-    0mz5pm759py1iscfn44c00dal2fijkyp5479fpx9l6i7wrdx2mki URL
-    http://beta.quicklisp.org/archive/postmodern/2018-01-31/postmodern-20180131-git.tgz
-    MD5 a3b7bf25eb342cd49fe144fcd7ddcb16 NAME simple-date FILENAME simple-date
+    0b6w8f5ihbk036v1fclyskns615xhnib9q3cjn0ql6r6sk3nca7f URL
+    http://beta.quicklisp.org/archive/postmodern/2018-04-30/postmodern-20180430-git.tgz
+    MD5 9ca2a4ccf4ea7dbcd14d69cb355a8214 NAME simple-date FILENAME simple-date
     DEPS
     ((NAME cl-postgres FILENAME cl-postgres) (NAME fiveam FILENAME fiveam)
      (NAME md5 FILENAME md5) (NAME usocket FILENAME usocket))
     DEPENDENCIES (cl-postgres fiveam md5 usocket) VERSION
-    postmodern-20180131-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
+    postmodern-20180430-git SIBLINGS (cl-postgres postmodern s-sql) PARASITES
     (simple-date/postgres-glue simple-date/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index e9d1fc5f305d..4db468081da8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -1,9 +1,9 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''split-sequence'';
-  version = ''1.2'';
+  version = ''v1.4.1'';
 
-  parasites = [ "split-sequence-tests" ];
+  parasites = [ "split-sequence/tests" ];
 
   description = ''Splits a sequence into a list of subsequences
   delimited by objects satisfying a test.'';
@@ -11,8 +11,8 @@ rec {
   deps = [ args."fiveam" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz'';
-    sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l'';
+    url = ''http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz'';
+    sha256 = ''04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q'';
   };
 
   packageName = "split-sequence";
@@ -23,8 +23,8 @@ rec {
 /* (SYSTEM split-sequence DESCRIPTION
     Splits a sequence into a list of subsequences
   delimited by objects satisfying a test.
-    SHA256 12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l URL
-    http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz
-    MD5 194e24d60f0fba70a059633960052e21 NAME split-sequence FILENAME
+    SHA256 04ag6cdllqhc45psjp7bcwkhnqdhpidi8grn15c7pnaf86apgq3q URL
+    http://beta.quicklisp.org/archive/split-sequence/2018-02-28/split-sequence-v1.4.1.tgz
+    MD5 b85e3ef2bc2cb2ce8a2c101759539ba7 NAME split-sequence FILENAME
     split-sequence DEPS ((NAME fiveam FILENAME fiveam)) DEPENDENCIES (fiveam)
-    VERSION 1.2 SIBLINGS NIL PARASITES (split-sequence-tests)) */
+    VERSION v1.4.1 SIBLINGS NIL PARASITES (split-sequence/tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index b07feca16b00..1cd4e4c44027 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -7,7 +7,7 @@ rec {
 
   description = ''Create vectors allocated in static memory.'';
 
-  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."fiveam" args."trivial-features" ];
+  deps = [ args."alexandria" args."babel" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."fiveam" args."trivial-features" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/static-vectors/2017-10-19/static-vectors-v1.8.3.tgz'';
@@ -27,7 +27,9 @@ rec {
     static-vectors DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME fiveam FILENAME fiveam)
      (NAME trivial-features FILENAME trivial-features))
-    DEPENDENCIES (alexandria babel cffi cffi-grovel fiveam trivial-features)
+    DEPENDENCIES
+    (alexandria babel cffi cffi-grovel cffi-toolchain fiveam trivial-features)
     VERSION v1.8.3 SIBLINGS NIL PARASITES (static-vectors/test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index 5191e2f336d8..883e648a2f68 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20180131-git'';
+  version = ''20180430-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
   deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz'';
-    sha256 = ''1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz'';
+    sha256 = ''0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m'';
   };
 
   packageName = "stumpwm";
@@ -18,10 +18,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256
-    1mlwgs0b8hd64wqk9qcv2x08zzfvbnn81fsdza7v5rcb8mx5abg0 URL
-    http://beta.quicklisp.org/archive/stumpwm/2018-01-31/stumpwm-20180131-git.tgz
-    MD5 252427acf3f2dbc2a5522598c4e37be1 NAME stumpwm FILENAME stumpwm DEPS
+    0ayw562iya02j8rzdnzpxn5yxwaapr2jqnm83m16h4595gv1jr6m URL
+    http://beta.quicklisp.org/archive/stumpwm/2018-04-30/stumpwm-20180430-git.tgz
+    MD5 40e1be3872e6a87a6f9e03f8ede5e48e NAME stumpwm FILENAME stumpwm DEPS
     ((NAME alexandria FILENAME alexandria) (NAME cl-ppcre FILENAME cl-ppcre)
      (NAME clx FILENAME clx))
-    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180131-git SIBLINGS NIL
+    DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20180430-git SIBLINGS NIL
     PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 53d6be525f69..dd93a599d699 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-gray-streams'';
-  version = ''20140826-git'';
+  version = ''20180328-git'';
 
   description = ''Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz'';
-    sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92'';
+    url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz'';
+    sha256 = ''01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f'';
   };
 
   packageName = "trivial-gray-streams";
@@ -19,8 +19,8 @@ rec {
 }
 /* (SYSTEM trivial-gray-streams DESCRIPTION
     Compatibility layer for Gray Streams (see http://www.cliki.net/Gray%20streams).
-    SHA256 1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92 URL
-    http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz
-    MD5 1ca280830c8c438ca2ccfadb3763ae83 NAME trivial-gray-streams FILENAME
-    trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20140826-git
+    SHA256 01z5mp71005vgpvazhs3gqgqr2ym8mm4n5pw2y7bfjiygcl8b06f URL
+    http://beta.quicklisp.org/archive/trivial-gray-streams/2018-03-28/trivial-gray-streams-20180328-git.tgz
+    MD5 9f831cbb7a4efe93eaa8fa2acee4b01b NAME trivial-gray-streams FILENAME
+    trivial-gray-streams DEPS NIL DEPENDENCIES NIL VERSION 20180328-git
     SIBLINGS (trivial-gray-streams-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index 3e8d4155ce3d..1986f7c88f7a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''uffi'';
-  version = ''20170630-git'';
+  version = ''20180228-git'';
 
   description = ''Universal Foreign Function Library for Common Lisp'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz'';
-    sha256 = ''1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf'';
+    url = ''http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz'';
+    sha256 = ''1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479'';
   };
 
   packageName = "uffi";
@@ -18,7 +18,7 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM uffi DESCRIPTION Universal Foreign Function Library for Common Lisp
-    SHA256 1y8f4pw1sw9d7zgaj1lfi87fjws934qc3gl3fan9py967cl5i7jf URL
-    http://beta.quicklisp.org/archive/uffi/2017-06-30/uffi-20170630-git.tgz MD5
-    8ac448122b79a41ec2b0647f06af7c12 NAME uffi FILENAME uffi DEPS NIL
-    DEPENDENCIES NIL VERSION 20170630-git SIBLINGS (uffi-tests) PARASITES NIL) */
+    SHA256 1kknzwxsbg2ydy2w0n88y2bq37lqqwg02ffsmz57gqbxvlk26479 URL
+    http://beta.quicklisp.org/archive/uffi/2018-02-28/uffi-20180228-git.tgz MD5
+    b0dfb2f966912f4797327948aa7e9119 NAME uffi FILENAME uffi DEPS NIL
+    DEPENDENCIES NIL VERSION 20180228-git SIBLINGS (uffi-tests) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index fb483662df53..cc5c23faf862 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -5,7 +5,7 @@ rec {
 
   description = ''An asynchronous HTTP server written in Common Lisp'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ];
+  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."cl-utilities" args."clack-socket" args."fast-http" args."fast-io" args."flexi-streams" args."lev" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."swap-bytes" args."trivial-features" args."trivial-gray-streams" args."trivial-utf-8" args."uiop" args."vom" args."xsubseq" ];
 
   src = fetchurl {
     url = ''http://beta.quicklisp.org/archive/woo/2017-08-30/woo-20170830-git.tgz'';
@@ -24,6 +24,7 @@ rec {
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
      (NAME bordeaux-threads FILENAME bordeaux-threads)
      (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
      (NAME cl-utilities FILENAME cl-utilities)
      (NAME clack-socket FILENAME clack-socket)
      (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
@@ -38,8 +39,8 @@ rec {
      (NAME trivial-utf-8 FILENAME trivial-utf-8) (NAME uiop FILENAME uiop)
      (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria babel bordeaux-threads cffi cffi-grovel cl-utilities
-     clack-socket fast-http fast-io flexi-streams lev proc-parse quri
-     smart-buffer split-sequence static-vectors swap-bytes trivial-features
-     trivial-gray-streams trivial-utf-8 uiop vom xsubseq)
+    (alexandria babel bordeaux-threads cffi cffi-grovel cffi-toolchain
+     cl-utilities clack-socket fast-http fast-io flexi-streams lev proc-parse
+     quri smart-buffer split-sequence static-vectors swap-bytes
+     trivial-features trivial-gray-streams trivial-utf-8 uiop vom xsubseq)
     VERSION 20170830-git SIBLINGS (clack-handler-woo woo-test) PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index a64ff45a1879..8c4afa9697d8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -1,15 +1,15 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''wookie'';
-  version = ''20170227-git'';
+  version = ''20180228-git'';
 
   description = ''An evented webserver for Common Lisp.'';
 
-  deps = [ args."alexandria" args."babel" args."blackbird" args."chunga" args."cl-async" args."cl-async-ssl" args."cl-fad" args."cl-ppcre" args."do-urlencode" args."fast-http" args."fast-io" args."quri" args."vom" ];
+  deps = [ args."alexandria" args."babel" args."babel-streams" args."blackbird" args."bordeaux-threads" args."cffi" args."cffi-grovel" args."cffi-toolchain" args."chunga" args."cl-async" args."cl-async-base" args."cl-async-ssl" args."cl-async-util" args."cl-fad" args."cl-libuv" args."cl-ppcre" args."cl-utilities" args."do-urlencode" args."fast-http" args."fast-io" args."flexi-streams" args."proc-parse" args."quri" args."smart-buffer" args."split-sequence" args."static-vectors" args."trivial-features" args."trivial-gray-streams" args."vom" args."xsubseq" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz'';
-    sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0'';
+    url = ''http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz'';
+    sha256 = ''1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq'';
   };
 
   packageName = "wookie";
@@ -18,18 +18,35 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM wookie DESCRIPTION An evented webserver for Common Lisp. SHA256
-    0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0 URL
-    http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz
-    MD5 aeb084106facdc9c8dab100c97e05b92 NAME wookie FILENAME wookie DEPS
+    1w6qkz6l7lq9v7zzq2c9q2bx73vs9m9svlhh2058csjqqbv383kq URL
+    http://beta.quicklisp.org/archive/wookie/2018-02-28/wookie-20180228-git.tgz
+    MD5 7cd3d634686e532f2c6e2f5f2d4e1dae NAME wookie FILENAME wookie DEPS
     ((NAME alexandria FILENAME alexandria) (NAME babel FILENAME babel)
-     (NAME blackbird FILENAME blackbird) (NAME chunga FILENAME chunga)
-     (NAME cl-async FILENAME cl-async)
-     (NAME cl-async-ssl FILENAME cl-async-ssl) (NAME cl-fad FILENAME cl-fad)
-     (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME babel-streams FILENAME babel-streams)
+     (NAME blackbird FILENAME blackbird)
+     (NAME bordeaux-threads FILENAME bordeaux-threads)
+     (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cffi-toolchain FILENAME cffi-toolchain)
+     (NAME chunga FILENAME chunga) (NAME cl-async FILENAME cl-async)
+     (NAME cl-async-base FILENAME cl-async-base)
+     (NAME cl-async-ssl FILENAME cl-async-ssl)
+     (NAME cl-async-util FILENAME cl-async-util) (NAME cl-fad FILENAME cl-fad)
+     (NAME cl-libuv FILENAME cl-libuv) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-utilities FILENAME cl-utilities)
      (NAME do-urlencode FILENAME do-urlencode)
      (NAME fast-http FILENAME fast-http) (NAME fast-io FILENAME fast-io)
-     (NAME quri FILENAME quri) (NAME vom FILENAME vom))
+     (NAME flexi-streams FILENAME flexi-streams)
+     (NAME proc-parse FILENAME proc-parse) (NAME quri FILENAME quri)
+     (NAME smart-buffer FILENAME smart-buffer)
+     (NAME split-sequence FILENAME split-sequence)
+     (NAME static-vectors FILENAME static-vectors)
+     (NAME trivial-features FILENAME trivial-features)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams)
+     (NAME vom FILENAME vom) (NAME xsubseq FILENAME xsubseq))
     DEPENDENCIES
-    (alexandria babel blackbird chunga cl-async cl-async-ssl cl-fad cl-ppcre
-     do-urlencode fast-http fast-io quri vom)
-    VERSION 20170227-git SIBLINGS NIL PARASITES NIL) */
+    (alexandria babel babel-streams blackbird bordeaux-threads cffi cffi-grovel
+     cffi-toolchain chunga cl-async cl-async-base cl-async-ssl cl-async-util
+     cl-fad cl-libuv cl-ppcre cl-utilities do-urlencode fast-http fast-io
+     flexi-streams proc-parse quri smart-buffer split-sequence static-vectors
+     trivial-features trivial-gray-streams vom xsubseq)
+    VERSION 20180228-git SIBLINGS NIL PARASITES NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index d9df8c752961..0fd076509c22 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -1,17 +1,17 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''xmls'';
-  version = ''1.7'';
+  version = ''3.0.2'';
 
-  parasites = [ "xmls/test" ];
+  parasites = [ "xmls/octets" "xmls/test" "xmls/unit-test" ];
 
   description = '''';
 
-  deps = [ ];
+  deps = [ args."cl-ppcre" args."fiveam" args."flexi-streams" ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz'';
-    sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b'';
+    url = ''http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz'';
+    sha256 = ''1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi'';
   };
 
   packageName = "xmls";
@@ -20,7 +20,10 @@ rec {
   overrides = x: x;
 }
 /* (SYSTEM xmls DESCRIPTION NIL SHA256
-    1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b URL
-    http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz MD5
-    697c9f49a60651b759e24ea0c1eb1cfe NAME xmls FILENAME xmls DEPS NIL
-    DEPENDENCIES NIL VERSION 1.7 SIBLINGS NIL PARASITES (xmls/test)) */
+    1r7mvw62zjcg45j3hm8jlbiisad2b415pghn6qcmhl03dmgp7kgi URL
+    http://beta.quicklisp.org/archive/xmls/2018-04-30/xmls-3.0.2.tgz MD5
+    2462bab4a5d74e87ef7bdef41cd06dc8 NAME xmls FILENAME xmls DEPS
+    ((NAME cl-ppcre FILENAME cl-ppcre) (NAME fiveam FILENAME fiveam)
+     (NAME flexi-streams FILENAME flexi-streams))
+    DEPENDENCIES (cl-ppcre fiveam flexi-streams) VERSION 3.0.2 SIBLINGS NIL
+    PARASITES (xmls/octets xmls/test xmls/unit-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index b133c3009ae6..babfba3f653d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -61,6 +61,8 @@ xembed
 command-line-arguments
 css-lite
 css-selectors
+css-selectors-simple-tree
+css-selectors-stp
 cxml
 dbd-mysql
 dbd-postgres
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 8ea7d4700bd6..8d150cc29b3c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,6 +6,9 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
+  "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql";
+
+
   "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres";
 
 
@@ -18,17 +21,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "iolib_dot_common-lisp" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."iolib_dot_common-lisp" or (x: {}))
-       (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
-           "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
-       }));
-
-
   "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date";
 
 
@@ -40,14 +32,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "rt" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."rt" or (x: {}))
-       (import ./quicklisp-to-nix-output/rt.nix {
-         inherit fetchurl;
-       }));
-
-
   "clack-socket" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clack-socket" or (x: {}))
@@ -84,8 +68,13 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."s-sql" or (x: {}))
        (import ./quicklisp-to-nix-output/s-sql.nix {
          inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
            "md5" = quicklisp-to-nix-packages."md5";
+           "postmodern" = quicklisp-to-nix-packages."postmodern";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "usocket" = quicklisp-to-nix-packages."usocket";
        }));
@@ -138,6 +127,7 @@ let quicklisp-to-nix-packages = rec {
            "fiveam" = quicklisp-to-nix-packages."fiveam";
            "md5" = quicklisp-to-nix-packages."md5";
            "s-sql" = quicklisp-to-nix-packages."s-sql";
+           "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql_slash_tests";
            "simple-date" = quicklisp-to-nix-packages."simple-date";
            "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
@@ -150,10 +140,13 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."mssql" or (x: {}))
        (import ./quicklisp-to-nix-output/mssql.nix {
          inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "garbage-pools" = quicklisp-to-nix-packages."garbage-pools";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "parse-number" = quicklisp-to-nix-packages."parse-number";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -191,11 +184,14 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
            "local-time" = quicklisp-to-nix-packages."local-time";
            "md5" = quicklisp-to-nix-packages."md5";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
 
@@ -289,10 +285,10 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "lack-component" = buildLispPackage
+  "rt" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."lack-component" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-component.nix {
+       (qlOverrides."rt" or (x: {}))
+       (import ./quicklisp-to-nix-output/rt.nix {
          inherit fetchurl;
        }));
 
@@ -303,11 +299,14 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/iolib_dot_grovel.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
            "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
+           "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
            "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
@@ -322,6 +321,17 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "iolib_dot_common-lisp" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."iolib_dot_common-lisp" or (x: {}))
+       (import ./quicklisp-to-nix-output/iolib_dot_common-lisp.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
+           "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
+       }));
+
+
   "iolib_dot_base" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."iolib_dot_base" or (x: {}))
@@ -344,28 +354,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "xpath" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."xpath" or (x: {}))
-       (import ./quicklisp-to-nix-output/xpath.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "closure-common" = quicklisp-to-nix-packages."closure-common";
-           "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-           "parse-number" = quicklisp-to-nix-packages."parse-number";
-           "puri" = quicklisp-to-nix-packages."puri";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "yacc" = quicklisp-to-nix-packages."yacc";
-       }));
-
-
   "rfc2388" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."rfc2388" or (x: {}))
@@ -374,46 +362,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "cxml-stp" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cxml-stp" or (x: {}))
-       (import ./quicklisp-to-nix-output/cxml-stp.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "closure-common" = quicklisp-to-nix-packages."closure-common";
-           "cxml" = quicklisp-to-nix-packages."cxml";
-           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
-           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
-           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
-           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
-           "parse-number" = quicklisp-to-nix-packages."parse-number";
-           "puri" = quicklisp-to-nix-packages."puri";
-           "rt" = quicklisp-to-nix-packages."rt";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "xpath" = quicklisp-to-nix-packages."xpath";
-           "yacc" = quicklisp-to-nix-packages."yacc";
-       }));
-
-
-  "jonathan" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."jonathan" or (x: {}))
-       (import ./quicklisp-to-nix-output/jonathan.nix {
-         inherit fetchurl;
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-       }));
-
-
   "net_dot_didierverna_dot_asdf-flv" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."net_dot_didierverna_dot_asdf-flv" or (x: {}))
@@ -422,15 +370,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "chunga" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."chunga" or (x: {}))
-       (import ./quicklisp-to-nix-output/chunga.nix {
-         inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-       }));
-
-
   "sqlite" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."sqlite" or (x: {}))
@@ -457,6 +396,52 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "xpath" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."xpath" or (x: {}))
+       (import ./quicklisp-to-nix-output/xpath.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "yacc" = quicklisp-to-nix-packages."yacc";
+       }));
+
+
+  "cxml-stp" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cxml-stp" or (x: {}))
+       (import ./quicklisp-to-nix-output/cxml-stp.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "rt" = quicklisp-to-nix-packages."rt";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "xpath" = quicklisp-to-nix-packages."xpath";
+           "yacc" = quicklisp-to-nix-packages."yacc";
+       }));
+
+
   "yacc" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."yacc" or (x: {}))
@@ -645,15 +630,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "trivial-garbage" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-garbage" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
-         inherit fetchurl;
-           "rt" = quicklisp-to-nix-packages."rt";
-       }));
-
-
   "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre";
 
 
@@ -812,53 +788,6 @@ let quicklisp-to-nix-packages = rec {
   "cl-async-util" = quicklisp-to-nix-packages."cl-async";
 
 
-  "clack-test" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clack-test" or (x: {}))
-       (import ./quicklisp-to-nix-output/clack-test.nix {
-         inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "clack" = quicklisp-to-nix-packages."clack";
-           "dexador" = quicklisp-to-nix-packages."dexador";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "http-body" = quicklisp-to-nix-packages."http-body";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "prove" = quicklisp-to-nix-packages."prove";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-       }));
-
-
-  "lack-util" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-util" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-util.nix {
-         inherit fetchurl;
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
-       }));
-
-
-  "lack-middleware-backtrace" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-middleware-backtrace" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix {
-         inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
-  "cffi-toolchain" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cffi-toolchain" or (x: {}))
-       (import ./quicklisp-to-nix-output/cffi-toolchain.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-       }));
-
-
   "uiop" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."uiop" or (x: {}))
@@ -875,6 +804,15 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-garbage" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-garbage" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-garbage.nix {
+         inherit fetchurl;
+           "rt" = quicklisp-to-nix-packages."rt";
+       }));
+
+
   "named-readtables" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."named-readtables" or (x: {}))
@@ -907,6 +845,57 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "lack-util" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-util" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-util.nix {
+         inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+       }));
+
+
+  "lack-middleware-backtrace" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-middleware-backtrace" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix {
+         inherit fetchurl;
+           "uiop" = quicklisp-to-nix-packages."uiop";
+       }));
+
+
+  "lack-component" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lack-component" or (x: {}))
+       (import ./quicklisp-to-nix-output/lack-component.nix {
+         inherit fetchurl;
+       }));
+
+
+  "jonathan" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."jonathan" or (x: {}))
+       (import ./quicklisp-to-nix-output/jonathan.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+       }));
+
+
   "do-urlencode" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."do-urlencode" or (x: {}))
@@ -920,6 +909,64 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clack-test" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clack-test" or (x: {}))
+       (import ./quicklisp-to-nix-output/clack-test.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
+           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "clack" = quicklisp-to-nix-packages."clack";
+           "dexador" = quicklisp-to-nix-packages."dexador";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "http-body" = quicklisp-to-nix-packages."http-body";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "jonathan" = quicklisp-to-nix-packages."jonathan";
+           "lack" = quicklisp-to-nix-packages."lack";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
+           "prove" = quicklisp-to-nix-packages."prove";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
+       }));
+
+
   "cl-syntax" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."cl-syntax" or (x: {}))
@@ -971,6 +1018,27 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "chunga" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."chunga" or (x: {}))
+       (import ./quicklisp-to-nix-output/chunga.nix {
+         inherit fetchurl;
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+       }));
+
+
+  "cffi-toolchain" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cffi-toolchain" or (x: {}))
+       (import ./quicklisp-to-nix-output/cffi-toolchain.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
   "babel-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."babel-streams" or (x: {}))
@@ -1031,6 +1099,9 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."xmls" or (x: {}))
        (import ./quicklisp-to-nix-output/xmls.nix {
          inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
        }));
 
 
@@ -1050,17 +1121,34 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
+           "babel-streams" = quicklisp-to-nix-packages."babel-streams";
            "blackbird" = quicklisp-to-nix-packages."blackbird";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "chunga" = quicklisp-to-nix-packages."chunga";
            "cl-async" = quicklisp-to-nix-packages."cl-async";
+           "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
            "cl-async-ssl" = quicklisp-to-nix-packages."cl-async-ssl";
+           "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
            "fast-http" = quicklisp-to-nix-packages."fast-http";
            "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
            "quri" = quicklisp-to-nix-packages."quri";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "vom" = quicklisp-to-nix-packages."vom";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
 
@@ -1074,6 +1162,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "clack-socket" = quicklisp-to-nix-packages."clack-socket";
            "fast-http" = quicklisp-to-nix-packages."fast-http";
@@ -1182,6 +1271,7 @@ let quicklisp-to-nix-packages = rec {
            "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "fiveam" = quicklisp-to-nix-packages."fiveam";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
@@ -1239,6 +1329,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "cl-fuse" = quicklisp-to-nix-packages."cl-fuse";
            "cl-fuse-meta-fs" = quicklisp-to-nix-packages."cl-fuse-meta-fs";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
@@ -1397,6 +1488,7 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."nibbles" or (x: {}))
        (import ./quicklisp-to-nix-output/nibbles.nix {
          inherit fetchurl;
+           "rt" = quicklisp-to-nix-packages."rt";
        }));
 
 
@@ -1508,6 +1600,7 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/ironclad.nix {
          inherit fetchurl;
            "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "rt" = quicklisp-to-nix-packages."rt";
        }));
 
 
@@ -1523,6 +1616,7 @@ let quicklisp-to-nix-packages = rec {
            "idna" = quicklisp-to-nix-packages."idna";
            "iolib_dot_asdf" = quicklisp-to-nix-packages."iolib_dot_asdf";
            "iolib_dot_base" = quicklisp-to-nix-packages."iolib_dot_base";
+           "iolib_dot_common-lisp" = quicklisp-to-nix-packages."iolib_dot_common-lisp";
            "iolib_dot_conf" = quicklisp-to-nix-packages."iolib_dot_conf";
            "iolib_dot_grovel" = quicklisp-to-nix-packages."iolib_dot_grovel";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
@@ -1596,20 +1690,27 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "babel" = quicklisp-to-nix-packages."babel";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "cl-annot" = quicklisp-to-nix-packages."cl-annot";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
+           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
            "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "fast-http" = quicklisp-to-nix-packages."fast-http";
            "fast-io" = quicklisp-to-nix-packages."fast-io";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "jonathan" = quicklisp-to-nix-packages."jonathan";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
            "proc-parse" = quicklisp-to-nix-packages."proc-parse";
            "quri" = quicklisp-to-nix-packages."quri";
            "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
            "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
@@ -1663,6 +1764,7 @@ let quicklisp-to-nix-packages = rec {
            "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "static-vectors" = quicklisp-to-nix-packages."static-vectors";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
@@ -1761,6 +1863,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "chipz" = quicklisp-to-nix-packages."chipz";
            "chunga" = quicklisp-to-nix-packages."chunga";
            "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
@@ -1870,6 +1973,77 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "css-selectors-stp" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."css-selectors-stp" or (x: {}))
+       (import ./quicklisp-to-nix-output/css-selectors-stp.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "buildnode" = quicklisp-to-nix-packages."buildnode";
+           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "closure-html" = quicklisp-to-nix-packages."closure-html";
+           "collectors" = quicklisp-to-nix-packages."collectors";
+           "css-selectors" = quicklisp-to-nix-packages."css-selectors";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-stp" = quicklisp-to-nix-packages."cxml-stp";
+           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "swank" = quicklisp-to-nix-packages."swank";
+           "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "xpath" = quicklisp-to-nix-packages."xpath";
+           "yacc" = quicklisp-to-nix-packages."yacc";
+       }));
+
+
+  "css-selectors-simple-tree" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."css-selectors-simple-tree" or (x: {}))
+       (import ./quicklisp-to-nix-output/css-selectors-simple-tree.nix {
+         inherit fetchurl;
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "babel" = quicklisp-to-nix-packages."babel";
+           "buildnode" = quicklisp-to-nix-packages."buildnode";
+           "cl-html5-parser" = quicklisp-to-nix-packages."cl-html5-parser";
+           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "closure-common" = quicklisp-to-nix-packages."closure-common";
+           "closure-html" = quicklisp-to-nix-packages."closure-html";
+           "collectors" = quicklisp-to-nix-packages."collectors";
+           "css-selectors" = quicklisp-to-nix-packages."css-selectors";
+           "cxml" = quicklisp-to-nix-packages."cxml";
+           "cxml-dom" = quicklisp-to-nix-packages."cxml-dom";
+           "cxml-klacks" = quicklisp-to-nix-packages."cxml-klacks";
+           "cxml-test" = quicklisp-to-nix-packages."cxml-test";
+           "cxml-xml" = quicklisp-to-nix-packages."cxml-xml";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "puri" = quicklisp-to-nix-packages."puri";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "string-case" = quicklisp-to-nix-packages."string-case";
+           "swank" = quicklisp-to-nix-packages."swank";
+           "symbol-munger" = quicklisp-to-nix-packages."symbol-munger";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "yacc" = quicklisp-to-nix-packages."yacc";
+       }));
+
+
   "css-selectors" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."css-selectors" or (x: {}))
@@ -1938,6 +2112,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cl-aa" = quicklisp-to-nix-packages."cl-aa";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-paths" = quicklisp-to-nix-packages."cl-paths";
            "cl-paths-ttf" = quicklisp-to-nix-packages."cl-paths-ttf";
            "cl-store" = quicklisp-to-nix-packages."cl-store";
            "cl-vectors" = quicklisp-to-nix-packages."cl-vectors";
@@ -2240,6 +2415,7 @@ let quicklisp-to-nix-packages = rec {
            "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
        }));
 
@@ -2313,6 +2489,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "cl-fuse" = quicklisp-to-nix-packages."cl-fuse";
            "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "iterate" = quicklisp-to-nix-packages."iterate";
@@ -2334,6 +2511,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "iterate" = quicklisp-to-nix-packages."iterate";
            "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
@@ -2444,6 +2622,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "cl-async" = quicklisp-to-nix-packages."cl-async";
            "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
            "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
@@ -2467,6 +2646,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "cl-async" = quicklisp-to-nix-packages."cl-async";
            "cl-async-base" = quicklisp-to-nix-packages."cl-async-base";
            "cl-async-util" = quicklisp-to-nix-packages."cl-async-util";
@@ -2493,6 +2673,7 @@ let quicklisp-to-nix-packages = rec {
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "cl-libuv" = quicklisp-to-nix-packages."cl-libuv";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "fast-io" = quicklisp-to-nix-packages."fast-io";
@@ -2522,29 +2703,60 @@ let quicklisp-to-nix-packages = rec {
        (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+           "babel" = quicklisp-to-nix-packages."babel";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
            "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
+           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
+           "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
            "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
+           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
            "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
+           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
            "clack" = quicklisp-to-nix-packages."clack";
            "clack-test" = quicklisp-to-nix-packages."clack-test";
            "dexador" = quicklisp-to-nix-packages."dexador";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
            "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "http-body" = quicklisp-to-nix-packages."http-body";
            "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "jonathan" = quicklisp-to-nix-packages."jonathan";
            "lack" = quicklisp-to-nix-packages."lack";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
            "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "let-plus" = quicklisp-to-nix-packages."let-plus";
            "local-time" = quicklisp-to-nix-packages."local-time";
            "marshal" = quicklisp-to-nix-packages."marshal";
+           "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
            "prove" = quicklisp-to-nix-packages."prove";
            "quri" = quicklisp-to-nix-packages."quri";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
            "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
            "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
            "trivial-types" = quicklisp-to-nix-packages."trivial-types";
            "uiop" = quicklisp-to-nix-packages."uiop";
            "usocket" = quicklisp-to-nix-packages."usocket";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
 
@@ -2555,9 +2767,12 @@ let quicklisp-to-nix-packages = rec {
          inherit fetchurl;
            "alexandria" = quicklisp-to-nix-packages."alexandria";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
            "lack" = quicklisp-to-nix-packages."lack";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
            "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
            "lack-util" = quicklisp-to-nix-packages."lack-util";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
            "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
@@ -2571,6 +2786,7 @@ let quicklisp-to-nix-packages = rec {
            "babel" = quicklisp-to-nix-packages."babel";
            "cffi" = quicklisp-to-nix-packages."cffi";
            "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
            "fast-io" = quicklisp-to-nix-packages."fast-io";
            "static-vectors" = quicklisp-to-nix-packages."static-vectors";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
@@ -2623,36 +2839,62 @@ let quicklisp-to-nix-packages = rec {
            "babel" = quicklisp-to-nix-packages."babel";
            "babel-streams" = quicklisp-to-nix-packages."babel-streams";
            "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "cffi-grovel" = quicklisp-to-nix-packages."cffi-grovel";
+           "cffi-toolchain" = quicklisp-to-nix-packages."cffi-toolchain";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "chunga" = quicklisp-to-nix-packages."chunga";
            "circular-streams" = quicklisp-to-nix-packages."circular-streams";
+           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
            "cl-annot" = quicklisp-to-nix-packages."cl-annot";
            "cl-ansi-text" = quicklisp-to-nix-packages."cl-ansi-text";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
            "cl-colors" = quicklisp-to-nix-packages."cl-colors";
+           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
            "cl-emb" = quicklisp-to-nix-packages."cl-emb";
            "cl-fad" = quicklisp-to-nix-packages."cl-fad";
            "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
            "cl-project" = quicklisp-to-nix-packages."cl-project";
+           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
            "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
            "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
            "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
+           "clack" = quicklisp-to-nix-packages."clack";
+           "clack-test" = quicklisp-to-nix-packages."clack-test";
            "clack-v1-compat" = quicklisp-to-nix-packages."clack-v1-compat";
            "dexador" = quicklisp-to-nix-packages."dexador";
            "do-urlencode" = quicklisp-to-nix-packages."do-urlencode";
+           "fast-http" = quicklisp-to-nix-packages."fast-http";
+           "fast-io" = quicklisp-to-nix-packages."fast-io";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
            "http-body" = quicklisp-to-nix-packages."http-body";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "jonathan" = quicklisp-to-nix-packages."jonathan";
            "lack" = quicklisp-to-nix-packages."lack";
+           "lack-component" = quicklisp-to-nix-packages."lack-component";
+           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
+           "lack-util" = quicklisp-to-nix-packages."lack-util";
            "let-plus" = quicklisp-to-nix-packages."let-plus";
            "local-time" = quicklisp-to-nix-packages."local-time";
            "map-set" = quicklisp-to-nix-packages."map-set";
            "marshal" = quicklisp-to-nix-packages."marshal";
            "myway" = quicklisp-to-nix-packages."myway";
            "named-readtables" = quicklisp-to-nix-packages."named-readtables";
+           "nibbles" = quicklisp-to-nix-packages."nibbles";
+           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
            "prove" = quicklisp-to-nix-packages."prove";
            "quri" = quicklisp-to-nix-packages."quri";
+           "smart-buffer" = quicklisp-to-nix-packages."smart-buffer";
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
            "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
            "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
            "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
            "trivial-types" = quicklisp-to-nix-packages."trivial-types";
            "usocket" = quicklisp-to-nix-packages."usocket";
+           "xsubseq" = quicklisp-to-nix-packages."xsubseq";
        }));
 
 

From a8ed1fc4edb6949c6eb0bdbf773c05f9b4a15a0c Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 30 May 2018 19:36:16 +0200
Subject: [PATCH 2795/3370] Update GCE image for 18.03

(cherry picked from commit 8aa385069f830fc801c8a04d2bd8a70a02be3de4)
---
 nixos/modules/virtualisation/gce-images.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/gce-images.nix b/nixos/modules/virtualisation/gce-images.nix
index 8a9bda1b60c2..575bbaadbcdb 100644
--- a/nixos/modules/virtualisation/gce-images.nix
+++ b/nixos/modules/virtualisation/gce-images.nix
@@ -3,6 +3,7 @@ let self = {
   "15.09" = "gs://nixos-cloud-images/nixos-15.09.425.7870f20-x86_64-linux.raw.tar.gz";
   "16.03" = "gs://nixos-cloud-images/nixos-image-16.03.847.8688c17-x86_64-linux.raw.tar.gz";
   "17.03" = "gs://nixos-cloud-images/nixos-image-17.03.1082.4aab5c5798-x86_64-linux.raw.tar.gz";
+  "18.03" = "gs://nixos-cloud-images/nixos-image-18.03.132536.fdb5ba4cdf9-x86_64-linux.raw.tar.gz";
 
-  latest = self."17.03";
+  latest = self."18.03";
 }; in self

From 711f96ee1df662ae04a237eddf5fd9f572e4a730 Mon Sep 17 00:00:00 2001
From: John Boehr <john@johnboehr.is>
Date: Wed, 30 May 2018 10:40:18 -0700
Subject: [PATCH 2796/3370] consul-ui: fix build

Update the dependencies used for building consul-ui. therubyracer
is no longer required and fails to build. Instead, a nodejs
binary is required to build the assets. Patch out unnecessary
executions of `bundle` which can cause failures.
---
 pkgs/servers/consul/Gemfile                 |  1 -
 pkgs/servers/consul/Gemfile.lock            | 27 +++++-----
 pkgs/servers/consul/gemset.nix              | 57 +++++++++++----------
 pkgs/servers/consul/ui-no-bundle-exec.patch | 17 ++++++
 pkgs/servers/consul/ui.nix                  |  8 +--
 5 files changed, 67 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/servers/consul/ui-no-bundle-exec.patch

diff --git a/pkgs/servers/consul/Gemfile b/pkgs/servers/consul/Gemfile
index 77b884c352dc..0e782af6b000 100644
--- a/pkgs/servers/consul/Gemfile
+++ b/pkgs/servers/consul/Gemfile
@@ -3,4 +3,3 @@ source "https://rubygems.org"
 
 gem "uglifier"
 gem "sass"
-gem "therubyracer"
diff --git a/pkgs/servers/consul/Gemfile.lock b/pkgs/servers/consul/Gemfile.lock
index cc4df6b24309..60a565f66951 100644
--- a/pkgs/servers/consul/Gemfile.lock
+++ b/pkgs/servers/consul/Gemfile.lock
@@ -1,22 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    execjs (2.3.0)
-    json (1.8.2)
-    libv8 (3.16.14.11)
-    ref (1.0.5)
-    sass (3.4.11)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
-      ref
-    uglifier (2.7.0)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
+    execjs (2.7.0)
+    ffi (1.9.23)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    sass (3.5.6)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    uglifier (4.1.10)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   sass
-  therubyracer
   uglifier
+
+BUNDLED WITH
+   1.14.6
diff --git a/pkgs/servers/consul/gemset.nix b/pkgs/servers/consul/gemset.nix
index f87038775be7..2a5425ccf5f5 100644
--- a/pkgs/servers/consul/gemset.nix
+++ b/pkgs/servers/consul/gemset.nix
@@ -1,59 +1,62 @@
 {
   execjs = {
-    version = "2.3.0";
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1";
       type = "gem";
-      sha256 = "097v02bhmzc70j7n0yyf8j0z5wms88zcmgpmggby4hnvqxf41y1h";
     };
+    version = "2.7.0";
   };
-  json = {
-    version = "1.8.2";
+  ffi = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
       type = "gem";
-      sha256 = "0zzvv25vjikavd3b1bp6lvbgj23vv9jvmnl4vpim8pv30z8p6vr5";
     };
+    version = "1.9.23";
   };
-  libv8 = {
-    version = "3.16.14.11";
+  rb-fsevent = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
       type = "gem";
-      sha256 = "000vbiy78wk5r1f6p7qncab8ldg7qw5pjz7bchn3lw700gpaacxp";
     };
+    version = "0.10.3";
   };
-  ref = {
-    version = "1.0.5";
+  rb-inotify = {
+    dependencies = ["ffi"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71";
       type = "gem";
-      sha256 = "19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la";
     };
+    version = "0.9.10";
   };
   sass = {
-    version = "3.4.11";
+    dependencies = ["sass-listen"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag";
       type = "gem";
-      sha256 = "10dncnv7g5v8d1xpw2aaarxjjlm68f7nm02ns2kl8nf3yxi6wzdf";
     };
+    version = "3.5.6";
   };
-  therubyracer = {
-    version = "0.12.1";
+  sass-listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df";
       type = "gem";
-      sha256 = "106fqimqyaalh7p6czbl5m2j69z8gv7cm10mjb8bbb2p2vlmqmi6";
     };
-    dependencies = [
-      "libv8"
-      "ref"
-    ];
+    version = "4.0.0";
   };
   uglifier = {
-    version = "2.7.0";
+    dependencies = ["execjs"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dycp9c5xiricla6sgvg0vf22i3axs5k1v1607dvl7nv1xkkaczi";
       type = "gem";
-      sha256 = "1x1mnakx086l83a3alj690c6n8kfmb4bk243a6m6yz99s15gbxfq";
     };
-    dependencies = [
-      "execjs"
-      "json"
-    ];
+    version = "4.1.10";
   };
-}
+}
\ No newline at end of file
diff --git a/pkgs/servers/consul/ui-no-bundle-exec.patch b/pkgs/servers/consul/ui-no-bundle-exec.patch
new file mode 100644
index 000000000000..5707b871049b
--- /dev/null
+++ b/pkgs/servers/consul/ui-no-bundle-exec.patch
@@ -0,0 +1,17 @@
+diff --git a/ui/scripts/dist.sh b/ui/scripts/dist.sh
+index 0ad6e28e..db340da0 100755
+--- a/ui/scripts/dist.sh
++++ b/ui/scripts/dist.sh
+@@ -15,10 +15,9 @@ DEPLOY="../pkg/web_ui"
+ rm -rf $DEPLOY
+ mkdir -p $DEPLOY
+ 
+-bundle check >/dev/null 2>&1 || bundle install
+-bundle exec sass styles/base.scss static/base.css
++sass styles/base.scss static/base.css
+ 
+-bundle exec ruby scripts/compile.rb
++ruby scripts/compile.rb
+ 
+ # Copy into deploy
+ shopt -s dotglob
diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
index b4cbca22c30a..da9b518bad73 100644
--- a/pkgs/servers/consul/ui.nix
+++ b/pkgs/servers/consul/ui.nix
@@ -1,4 +1,4 @@
-{ stdenv, consul, ruby, bundlerEnv, zip }:
+{ stdenv, consul, ruby, bundlerEnv, zip, nodejs }:
 
 let
   # `sass` et al
@@ -13,9 +13,11 @@ stdenv.mkDerivation {
 
   src = consul.src;
 
-  buildInputs = [ ruby gems zip ];
+  buildInputs = [ ruby gems zip nodejs ];
 
-  patchPhase = "patchShebangs ./ui/scripts/dist.sh";
+  patches = [ ./ui-no-bundle-exec.patch ];
+
+  postPatch = "patchShebangs ./ui/scripts/dist.sh";
 
   buildPhase = ''
     # Build ui static files

From c315d45fda8ed83db5a2383be981fbdae45244c2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 30 May 2018 20:35:02 +0200
Subject: [PATCH 2797/3370] parallel: 20180422 -> 20180522

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 9bb09d227c4c..75be4efe7d1b 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20180422";
+  name = "parallel-20180522";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0xsfpbxwgd4197gra981iv0nmjfk58c0d88dxx6dh6yrqz523klx";
+    sha256 = "1khcz9pm7rjnq4gw8pn30k1d40x337a204dxj4y4qijpx8m7w0gb";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];

From 6bced693052c0f305dc290155865a5ce1e8bb201 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 30 May 2018 20:36:52 +0200
Subject: [PATCH 2798/3370] checkstyle: 8.10 -> 8.10.1

---
 pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index cbb33901311b..da60b77934b0 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "8.10";
+  version = "8.10.1";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1n7bqqrd13zqx51dqh160z5sjdc6kr089i505gf405ymmfbx1p3d";
+    sha256 = "18i1a6v9dg08in68g584y7bhf76g59pp8lyixqc3v6wgj3ksv8q9";
   };
 
   installPhase = ''

From 5f7064251b036f88dd780f40024de429a1f077c4 Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Wed, 30 May 2018 19:29:05 +0000
Subject: [PATCH 2799/3370] tryton: 4.8.0 -> 4.8.2

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

diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix
index 0df9fd899dc5..e44106f7b65e 100644
--- a/pkgs/applications/office/tryton/default.nix
+++ b/pkgs/applications/office/tryton/default.nix
@@ -14,10 +14,10 @@ with stdenv.lib;
 
 python2Packages.buildPythonApplication rec {
   pname = "tryton";
-  version = "4.8.0";
+  version = "4.8.2";
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1ywgna4hhmji8pfrwhdfj1ns49vs9nwppqb7iy7jr27wrxk4bm6b";
+    sha256 = "02jnqxwsqk7hn52hc4jd59nd94d810i4psaa3lqqig3br5blp8yx";
   };
   nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
   propagatedBuildInputs = with python2Packages; [

From 93555b0c199d5e1f2025e1792642f99d21dfa69a Mon Sep 17 00:00:00 2001
From: Udo Spallek <udono@virtual-things.biz>
Date: Wed, 30 May 2018 19:29:43 +0000
Subject: [PATCH 2800/3370] trytond: 4.8.0 -> 4.8.1

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

diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix
index 31c6a7059fc0..d1b3cb1b1a17 100644
--- a/pkgs/applications/office/trytond/default.nix
+++ b/pkgs/applications/office/trytond/default.nix
@@ -5,10 +5,10 @@ with stdenv.lib;
 
 python2Packages.buildPythonApplication rec {
   pname = "trytond";
-  version = "4.8.0";
+  version = "4.8.1";
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "114c0ea15b8395117bf8c669b7da8af4961001297fbd034c780a42a40e079e3a";
+    sha256 = "8e72a24bdf2fd090c5e12ce5f73a00322e31519608b31db44d7bb76382078db9";
   };
 
   # Tells the tests which database to use

From cd213eea7d942f3d6e7889c12bd878d84d61e113 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 30 May 2018 21:40:14 +0200
Subject: [PATCH 2801/3370] all-packages: remove some duplicate references

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e76602fb3d99..87d70cb53de5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1427,7 +1427,7 @@ with pkgs;
     czmq = czmq3;
   };
 
-  rsyslog-light = callPackage ../tools/system/rsyslog {
+  rsyslog-light = rsyslog.override {
     libkrb5 = null;
     systemd = null;
     jemalloc = null;
@@ -2779,7 +2779,7 @@ with pkgs;
     zfsSupport = false;
   };
 
-  grub2_xen = callPackage ../tools/misc/grub/2.0x.nix {
+  grub2_xen = grub2_full.override {
     xenSupport = true;
   };
 
@@ -2952,9 +2952,9 @@ with pkgs;
 
   heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {};
 
-  heimdall = libsForQt5.callPackage ../tools/misc/heimdall { enableGUI = false; };
+  heimdall = libsForQt5.callPackage ../tools/misc/heimdall { };
 
-  heimdall-gui = libsForQt5.callPackage ../tools/misc/heimdall { enableGUI = true; };
+  heimdall-gui = heimdall.override { enableGUI = true; };
 
   hevea = callPackage ../tools/typesetting/hevea { };
 

From e62bf6dda4f32f6158bd181a95d336883a0acb66 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 19:40:19 +0000
Subject: [PATCH 2802/3370] shadowsocks-libev: 3.1.3 -> 3.2.0

Fixes build with CMake 3.11.
---
 pkgs/tools/networking/shadowsocks-libev/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index cbbc36b383bf..2823917fc31d 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation rec {
   name = "shadowsocks-libev-${version}";
-  version = "3.1.3";
+  version = "3.2.0";
 
   # Git tag includes CMake build files which are much more convenient.
   # fetchgit because submodules.
   src = fetchgit {
     url = "https://github.com/shadowsocks/shadowsocks-libev";
     rev = "refs/tags/v${version}";
-    sha256 = "16q91xh6ixfv7b5rl31an11101irv08119klfx5qgj4i6h7c41s7";
+    sha256 = "0i9vz5b2c2bkdl2k9kqzvqyrlpdl94lf7k7rzxds8hn2kk0jizhb";
   };
 
   buildInputs = [ libsodium mbedtls libev c-ares pcre ];

From b503e76ee0dd94e54c851188f0060765d9419157 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Wed, 30 May 2018 21:48:07 +0200
Subject: [PATCH 2803/3370] use sandbox instead of build-use-sandbox

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 75db8e1377c4..e7a9b1ba25fd 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -5,7 +5,7 @@
 
 <!-- Please check what applies. Note that these are not hard requirements but merely serve as information for reviewers. -->
 
-- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `build-use-sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)
+- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS)
 - Built on platform(s)
    - [ ] NixOS
    - [ ] macOS

From bb8aa7f8d1929c006d493d99c01f8745fac82bea Mon Sep 17 00:00:00 2001
From: Lenz Weber <mail@lenzw.de>
Date: Wed, 30 May 2018 21:57:35 +0200
Subject: [PATCH 2804/3370] barrier: init at 2.1.1

---
 maintainers/maintainer-list.nix            |  5 ++++
 pkgs/applications/misc/barrier/default.nix | 33 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/misc/barrier/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 107baf2aca98..3f27238bcc21 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2968,6 +2968,11 @@
     github = "phreedom";
     name = "Evgeny Egorochkin";
   };
+  phryneas = {
+    email = "mail@lenzw.de";
+    github = "phryneas";
+    name = "Lenz Weber";
+  };
   phunehehe = {
     email = "phunehehe@gmail.com";
     github = "phunehehe";
diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix
new file mode 100644
index 000000000000..0bc12e269c0e
--- /dev/null
+++ b/pkgs/applications/misc/barrier/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, cmake, curl, xorg, avahi, qt5,
+  avahiWithLibdnssdCompat ? avahi.override { withLibdnssdCompat = true; }
+}:
+
+stdenv.mkDerivation rec {
+  name = "barrier-${version}";
+  version = "2.1.1";
+  src = fetchurl {
+    url = "https://github.com/debauchee/barrier/archive/v${version}.tar.gz";
+    sha256 = "0x17as5ikfx2r5hawr368a9risvcavyc8zv5g724s709nr6m0pbp";
+  };
+
+  buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat ];
+  propagatedBuildInputs = with qt5; [ qtbase ];
+
+  postFixup = ''
+      substituteInPlace "$out/share/applications/barrier.desktop" --replace "Exec=barrier" "Exec=$out/bin/barrier"
+    '';
+
+  meta = {
+    description = "Open-source KVM software";
+    longDescription = ''
+      Barrier is KVM software forked from Symless's synergy 1.9 codebase.
+      Synergy was a commercialized reimplementation of the original
+      CosmoSynergy written by Chris Schoeneman.
+    '';
+    homepage = https://github.com/debauchee/barrier;
+    downloadPage = https://github.com/debauchee/barrier/releases;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.phryneas ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e76602fb3d99..39ed88808d4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14943,6 +14943,8 @@ with pkgs;
     ffmpeg = ffmpeg_1;
   };
 
+  barrier = callPackage ../applications/misc/barrier {};
+
   banshee = callPackage ../applications/audio/banshee {
     gconf = pkgs.gnome2.GConf;
     libgpod = pkgs.libgpod.override { monoSupport = true; };

From 57bbe4129599b75f587ea9c9789113ac36e49ea4 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 30 May 2018 16:06:34 -0400
Subject: [PATCH 2805/3370] thepeg: fix rivet backend

---
 pkgs/development/libraries/physics/thepeg/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 63db874d8480..0a8ee8f393c3 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-hepmc=${hepmc}"
+    "--with-rivet=${rivet}"
     "--without-javagui"
   ];
 

From 4342d99d82deee4920ed9b0ee9a44957e23a5fa9 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 30 May 2018 16:06:56 -0400
Subject: [PATCH 2806/3370] herwig: 7.1.2 -> 7.1.3

thepeg: 2.1.2 -> 2.1.3
---
 pkgs/development/libraries/physics/herwig/default.nix | 4 ++--
 pkgs/development/libraries/physics/thepeg/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix
index f3ba8a4a6ff6..ce6ea4c56a89 100644
--- a/pkgs/development/libraries/physics/herwig/default.nix
+++ b/pkgs/development/libraries/physics/herwig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "herwig-${version}";
-  version = "7.1.2";
+  version = "7.1.3";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2";
-    sha256 = "0wr2mmmf5rlvcc6xgdagafm6vb5g6ifvrjc7kd86gs9jip32p29i";
+    sha256 = "1iq1h5ap86729c4pfkswzfh0l2v20fyvqsb15c35g0407l54wfqm";
   };
 
   nativeBuildInputs = [ autoconf automake libtool ];
diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix
index 0a8ee8f393c3..0a84fe20da72 100644
--- a/pkgs/development/libraries/physics/thepeg/default.nix
+++ b/pkgs/development/libraries/physics/thepeg/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "thepeg-${version}";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchurl {
     url = "http://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2";
-    sha256 = "0jbz70ax05w3lpjvz71fnfz35rcjp0jry1nyjpa662714xd6f3va";
+    sha256 = "030wpk78mwb56iph5iqmblsxgzpydsa25bbkv07bihihfm8gds0n";
   };
 
   buildInputs = [ boost fastjet gsl hepmc lhapdf rivet zlib ];

From e2126dfd71a536c0db7c890e94c574afa06f01e7 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 30 May 2018 16:23:37 -0400
Subject: [PATCH 2807/3370] nix-plugins: 4.0.4 -> 4.0.5.

Allows building against nix stable.
---
 pkgs/development/libraries/nix-plugins/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                    | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index c4a30f52b050..ff8a54f87f2a 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, nix, cmake, pkgconfig, boost }:
-let version = "4.0.4"; in
+let version = "4.0.5"; in
 stdenv.mkDerivation {
   name = "nix-plugins-${version}";
 
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    sha256 = "02lz62n55pvqin4x44qlxb5knrapyckmj9k8ggk4qxgb36368ifn";
+    sha256 = "170f365rnik62fp9wllbqlspr8lf1yb96pmn2z708i2wjlkdnrny";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8df999e5bad..c4ab8d37c98b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10850,9 +10850,7 @@ with pkgs;
   };
   libnghttp2 = nghttp2.lib;
 
-  nix-plugins = callPackage ../development/libraries/nix-plugins {
-    nix = nixUnstable;
-  };
+  nix-plugins = callPackage ../development/libraries/nix-plugins {};
 
   nlohmann_json = callPackage ../development/libraries/nlohmann_json { };
 

From 584006a85e3daed5a8e5719fd6a4d6b82d0252f3 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Sat, 12 May 2018 04:19:44 +0400
Subject: [PATCH 2808/3370] chromium: fix crashpad build

---
 pkgs/applications/networking/browsers/chromium/common.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 923084a57385..defbfbd121d1 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -198,8 +198,10 @@ let
       tar -xJf ${freetype_source}
 
       # remove unused third-party
+      # in third_party/crashpad third_party/zlib contains just a header-adapter
       for lib in ${toString gnSystemLibraries}; do
         find -type f -path "*third_party/$lib/*"     \
+            \! -path "*third_party/crashpad/crashpad/third_party/zlib/*"  \
             \! -path "*third_party/$lib/chromium/*"  \
             \! -path "*third_party/$lib/google/*"    \
             \! -path "*base/third_party/icu/*"       \

From 72d7b5ddb14a8b5903f01c7b40f216a0a6149fb8 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Sat, 12 May 2018 04:19:56 +0400
Subject: [PATCH 2809/3370] chromium: fix nix_plugin_paths for 68+

---
 .../networking/browsers/chromium/common.nix   |  5 +-
 .../patches/nix_plugin_paths_68.patch         | 70 +++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index defbfbd121d1..4718cc6c1ede 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -138,12 +138,13 @@ let
       ++ optional pulseSupport libpulseaudio;
 
     patches = [
-      ./patches/nix_plugin_paths_52.patch
       # As major versions are added, you can trawl the gentoo and arch repos at
       # https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/
       # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
       # for updated patches and hints about build flags
     # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
+    ]  ++ optionals (versionRange "66" "68") [
+      ./patches/nix_plugin_paths_52.patch
     ]  ++ optionals (versionRange "66" "67") [
       (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd")
       (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4")
@@ -154,6 +155,8 @@ let
       (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj")
       (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw")
       (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
+    ]  ++ optionals (versionAtLeast version "68") [
+      ./patches/nix_plugin_paths_68.patch
     ] ++ optional enableWideVine ./patches/widevine.patch
       ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [
         ./patches/skia_buildfix.patch
diff --git a/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
new file mode 100644
index 000000000000..c90e98e72fa1
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/nix_plugin_paths_68.patch
@@ -0,0 +1,70 @@
+diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
+index f4e119d..d9775bd 100644
+--- a/chrome/common/chrome_paths.cc
++++ b/chrome/common/chrome_paths.cc
+@@ -68,21 +68,14 @@ static base::LazyInstance<base::FilePath>
+     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
+ 
+ // Gets the path for internal plugins.
+-bool GetInternalPluginsDirectory(base::FilePath* result) {
+-#if defined(OS_MACOSX)
+-  // If called from Chrome, get internal plugins from a subdirectory of the
+-  // framework.
+-  if (base::mac::AmIBundled()) {
+-    *result = chrome::GetFrameworkBundlePath();
+-    DCHECK(!result->empty());
+-    *result = result->Append("Internet Plug-Ins");
+-    return true;
+-  }
+-  // In tests, just look in the module directory (below).
+-#endif
+-
+-  // The rest of the world expects plugins in the module directory.
+-  return base::PathService::Get(base::DIR_MODULE, result);
++bool GetInternalPluginsDirectory(base::FilePath* result,
++                                 const std::string& ident) {
++  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
++  const char* value = getenv(full_env.c_str());
++  if (value == NULL)
++      return PathService::Get(base::DIR_MODULE, result);
++  else
++      *result = base::FilePath(value);
+ }
+ 
+ // Gets the path for bundled implementations of components. Note that these
+@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) {
+       create_dir = true;
+       break;
+     case chrome::DIR_INTERNAL_PLUGINS:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "ALL"))
+         return false;
+       break;
+     case chrome::DIR_COMPONENTS:
+@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) {
+         return false;
+       break;
+     case chrome::DIR_PEPPER_FLASH_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
+         return false;
+       cur = cur.Append(kPepperFlashBaseDirectory);
+       break;
+@@ -323,7 +316,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // We currently need a path here to look up whether the plugin is disabled
+     // and what its permissions are.
+     case chrome::FILE_NACL_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "NACL"))
+         return false;
+       cur = cur.Append(kInternalNaClPluginFileName);
+       break;
+@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) {
+         cur = cur.DirName();
+       }
+ #else
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
+         return false;
+ #endif
+       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));

From 7acec162261a574e75a0c4e1e11e781923407a2f Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Thu, 31 May 2018 00:20:30 +0400
Subject: [PATCH 2810/3370] chromium: 66.0.3359.181 -> 67.0.3396.62

New stable version, with 34 security fixes and site isolation. See
https://chromereleases.googleblog.com/2018/05/stable-channel-update-for-desktop_58.html
---
 .../browsers/chromium/upstream-info.nix        | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index bb080a50bebd..b0da1b5809c2 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -1,18 +1,18 @@
 # This file is autogenerated from update.sh in the same directory.
 {
   beta = {
-    sha256 = "169lxj6rhpqcnrg3n2api82975hkifz6wmks1bh04jkxw0z2vkny";
-    sha256bin64 = "1hd4s35yhi2xidy3xncp66p03cv715bzbf3gcv5dl0d1h3nmhhdf";
-    version = "67.0.3396.40";
+    sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm";
+    sha256bin64 = "06gmn0clhll91pmph07db043006gf2x6nfgxlir4qwqsj2qgdch0";
+    version = "67.0.3396.62";
   };
   dev = {
-    sha256 = "0j4vcfbdj8cvdsmnb6pz0k71w559rm3ka1yyv0yfq7f756hinpvp";
-    sha256bin64 = "1qqhyjdd227psvr904w3d3lq47bfwmpk6f7sam2gp4j0wxn23w8w";
-    version = "68.0.3423.2";
+    sha256 = "0hy36r938k6c89alam4a8yy2wynnlcc0zqhhb0jgy3qlnqrksvrc";
+    sha256bin64 = "0y69ykzj1phpvmhd380wijzs0f8s15gmvb88zd4m8fzqi6gg51dj";
+    version = "68.0.3438.3";
   };
   stable = {
-    sha256 = "06g9m7lxm9g63dcci25dqiglyjxjfy7v05vjhdda4rdk84vngrip";
-    sha256bin64 = "105ds6r6awzhf5sq3nf43b6zb84lb4qbhjnfk3fnxfqvskq3b6r2";
-    version = "66.0.3359.181";
+    sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm";
+    sha256bin64 = "16fljvrq2gcpjpyhf1w8s3rv805mknmy2i88n43v2cg7hl35241c";
+    version = "67.0.3396.62";
   };
 }

From 88007f819d87c21a7be5e3c801f8f319f4515474 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Thu, 31 May 2018 00:25:22 +0400
Subject: [PATCH 2811/3370] chromium: remove outdated patches

---
 .../networking/browsers/chromium/common.nix   | 16 +-------------
 .../chromium/patches/neon_buildfix.patch      | 21 ------------------
 .../chromium/patches/skia_buildfix.patch      | 22 -------------------
 3 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch
 delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 4718cc6c1ede..8ab141b5a337 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -145,23 +145,9 @@ let
     # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
     ]  ++ optionals (versionRange "66" "68") [
       ./patches/nix_plugin_paths_52.patch
-    ]  ++ optionals (versionRange "66" "67") [
-      (gentooPatch "chromium-webrtc-r0.patch" "0wp4zivbv2wpgiwmiznbq1aw4w98mvwjvdy36cpfmnvr8yw430pd")
-      (gentooPatch "chromium-ffmpeg-r1.patch" "1k8agaqsvg0w0s6s5wh346ih02cc86vr0vwyshw2q9vafa0jvmq4")
-      # GCC 7 fixes
-      (githubPatch "f64fadcd79aebe5ed893ecbf258d1123609d28f8" "1h255w1v327r08cnifs19s4bwmkinqjmdmbwihddc5dyl43sjnvv")
-      (githubPatch "ede5178322ccd297b0ad82ae4c59119ceaab9ea5" "0rsal0dy0yhgs4lhn8h1vy1s77xcssy4f5wals7hvrz5m08jqizj")
-      (githubPatch "7d721f438acb38db556ae9a9e6e8b718bd503216" "13lzvxm63zq3rd8p387ylq4bm9wr4r09vk2w4p81f838pf0v1kbj")
-      (githubPatch "ba4141e451f4e0b1b19410b1b503bd32e150df06" "1cjxw1f9fin6z12b0mcxnxf2mdjb0n3chwz7mgvmp9yij8qhqnxj")
-      (githubPatch "b34ed1e6524479d61ee944ebf6ca7389ea47e563" "1s13zw93nsyr259dzck6gbhg4x46qg5sg14djf4bvrrc6hlkiczw")
-      (githubPatch "4f2b52281ce1649ea8347489443965ad33262ecc" "1g59izkicn9cpcphamdgrijs306h5b9i7i4pmy134asn1ifiax5z")
     ]  ++ optionals (versionAtLeast version "68") [
       ./patches/nix_plugin_paths_68.patch
-    ] ++ optional enableWideVine ./patches/widevine.patch
-      ++ optionals (stdenv.isAarch64 && versionRange "65" "67") [
-        ./patches/skia_buildfix.patch
-        ./patches/neon_buildfix.patch
-    ];
+    ] ++ optional enableWideVine ./patches/widevine.patch;
 
     postPatch = ''
       # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX
diff --git a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch
deleted file mode 100644
index b44487ca634c..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/neon_buildfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/skia/ext/convolver_neon.cc b/skia/ext/convolver_neon.cc
-index 26b91b9..cae6bc2 100644
---- a/skia/ext/convolver_neon.cc
-+++ b/skia/ext/convolver_neon.cc
-
-@@ -23,7 +23,7 @@
-     remainder[2] += coeff * pixels_left[i * 4 + 2];
-     remainder[3] += coeff * pixels_left[i * 4 + 3];
-   }
--  return {remainder[0], remainder[1], remainder[2], remainder[3]};
-+  return vld1q_s32(remainder);
- }
- 
- // Convolves horizontally along a single row. The row data is given in
-@@ -336,4 +336,4 @@
-   }
- }
- 
--}  // namespace skia
-\ No newline at end of file
-+}  // namespace skia
diff --git a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch b/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
deleted file mode 100644
index 5348b9ac905b..000000000000
--- a/pkgs/applications/networking/browsers/chromium/patches/skia_buildfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
-===================================================================
---- chromium-browser-65.0.3325.73.orig/third_party/skia/src/jumper/SkJumper_stages.cpp
-+++ chromium-browser-65.0.3325.73/third_party/skia/src/jumper/SkJumper_stages.cpp
-@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
- }
- 
- SI F from_half(U16 h) {
--#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return vcvt_f32_f16(h);
- 
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)
-@@ -686,7 +686,7 @@ SI F from_half(U16 h) {
- }
- 
- SI U16 to_half(F f) {
--#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3)  // Temporary workaround for some Google3 builds.
-     return vcvt_f16_f32(f);
- 
- #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)

From e4810965c01db441d0347240ce4eff69d3556d0e Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Thu, 31 May 2018 00:33:42 +0400
Subject: [PATCH 2812/3370] chromium: fix build for 67

---
 .../networking/browsers/chromium/common.nix       |  2 ++
 .../browsers/chromium/patches/fix-freetype.patch  | 15 +++++++++++++++
 .../browsers/chromium/patches/fix-openh264.patch  | 10 ++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 8ab141b5a337..a2d8a24ec5e6 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -143,6 +143,8 @@ let
       # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium
       # for updated patches and hints about build flags
     # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000")
+      ./patches/fix-openh264.patch
+      ./patches/fix-freetype.patch
     ]  ++ optionals (versionRange "66" "68") [
       ./patches/nix_plugin_paths_52.patch
     ]  ++ optionals (versionAtLeast version "68") [
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
new file mode 100644
index 000000000000..cc380a55abe0
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch
@@ -0,0 +1,15 @@
+--- a/third_party/freetype/BUILD.gn
++++ b/third_party/freetype/BUILD.gn
+@@ -63,10 +63,12 @@ source_set("freetype_source") {
+     "src/src/base/ftbase.c",
+     "src/src/base/ftbbox.c",
+     "src/src/base/ftbitmap.c",
++    "src/src/base/ftfntfmt.c",
+     "src/src/base/ftfstype.c",
+     "src/src/base/ftgasp.c",
+     "src/src/base/ftglyph.c",
+     "src/src/base/ftinit.c",
++    "src/src/base/ftlcdfil.c",
+     "src/src/base/ftmm.c",
+     "src/src/base/ftstroke.c",
+     "src/src/base/fttype1.c",
diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch
new file mode 100644
index 000000000000..9d9ed6d2d052
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch
@@ -0,0 +1,10 @@
+--- a/third_party/openh264/BUILD.gn
++++ b/third_party/openh264/BUILD.gn
+@@ -24,6 +24,7 @@ config("config") {
+   if (!is_win || is_clang) {
+     cflags += [
+       "-Wno-format",
++      "-Wno-format-security",
+       "-Wno-header-hygiene",
+       "-Wno-unused-function",
+       "-Wno-unused-value",

From 129dfedaa94c25fec361819aa4d1752034a4b3ff Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com>
Date: Wed, 30 May 2018 22:10:49 +0100
Subject: [PATCH 2813/3370] xcode: remove extra quote from message (#41286)

---
 pkgs/os-specific/darwin/xcode/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index bed4cd6490d1..4cfc0874fcd0 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -23,7 +23,7 @@ let requireXcode = version: sha256:
       message  = ''
         Unfortunately, we cannot download ${name} automatically.
         Please go to ${url}
-        to download it yourself, and add it to the Nix store by running the following commands."
+        to download it yourself, and add it to the Nix store by running the following commands.
         Note: download (~ 5GB), extraction and storing of Xcode will take a while
 
         ${unxip}

From a4e732482c1e6a422ec257ce5a228bbe42fc105a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 May 2018 14:11:42 -0700
Subject: [PATCH 2814/3370] gitAndTools.transcrypt: 1.0.3 -> 1.1.0 (#41231)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/transcrypt/versions.

These checks were done:

- built on NixOS
- /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/transcrypt passed the binary check.
- /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0/bin/.transcrypt-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 1.1.0 with grep in /nix/store/rnqjmp32pr8zq5y7bn9n0qcrnwg5qi82-transcrypt-1.1.0
- directory tree listing: https://gist.github.com/74399ed2dc0f5e79c6face443cf11691
- du listing: https://gist.github.com/6c7f5baa546117396d7b51993bf84dba
---
 .../version-management/git-and-tools/transcrypt/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
index d04f0d5792b2..35e9c17438f7 100644
--- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "transcrypt-${version}";
-  version = "1.0.3";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "elasticdog";
     repo = "transcrypt";
     rev = "v${version}";
-    sha256 = "1hvg4ipsxm27n5yn5jpk43qyvvx5gx3z3cczw1z3r6hrs4n8d5rz";
+    sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam";
   };
 
   buildInputs = [ git makeWrapper openssl ];

From ef695239a07cc7e16b9d4687e44349ca33be15ae Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 30 May 2018 21:22:35 +0000
Subject: [PATCH 2815/3370] cairo: 1.15.10 -> 1.15.12

The previous 1.15.10 (and the stable 1.14.12) have the bug
https://bugs.freedesktop.org/show_bug.cgi?id=104325 which breaks
perlPackages.Cairo and pythonPackages.cairocffi tests.
---
 pkgs/development/libraries/cairo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 74ae4abaedf9..44cdfc4e0eef 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -10,14 +10,14 @@
 assert glSupport -> libGL != null;
 
 let
-  version = "1.15.10";
+  version = "1.15.12";
   inherit (stdenv.lib) optional optionals;
 in stdenv.mkDerivation rec {
   name = "cairo-${version}";
 
   src = fetchurl {
     url = "http://cairographics.org/${if stdenv.lib.mod (builtins.fromJSON (stdenv.lib.versions.minor version)) 2 == 0 then "releases" else "snapshots"}/${name}.tar.xz";
-    sha256 = "14l3jll98pjdlpm8f972v0spzcsf6y5nz85y2k8iybyg6ihj5jk2";
+    sha256 = "1jcl0mnqq6j2xip8p506g2cj54sfycm339rrd3p4g2jljhdhh8vn";
   };
 
   outputs = [ "out" "dev" "devdoc" ];

From cd7bfa6f48295f361c691a7520fb122938bd2a68 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 30 May 2018 23:41:56 +0200
Subject: [PATCH 2816/3370] lispPackages: drop pgloader that leads to a
 circular depedency

---
 .../lisp-modules/quicklisp-to-nix-systems.txt |   2 +-
 .../lisp-modules/quicklisp-to-nix.nix         | 329 +-----------------
 2 files changed, 13 insertions(+), 318 deletions(-)

diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index babfba3f653d..3b10d610d272 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -100,7 +100,6 @@ nibbles
 optima
 parenscript
 pcall
-pgloader
 plump
 proc-parse
 prove
@@ -108,6 +107,7 @@ prove
 query-fs
 quri
 salza2
+simple-date
 smart-buffer
 split-sequence
 static-vectors
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 8d150cc29b3c..71d974d9711b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,21 +6,6 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql";
-
-
-  "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres";
-
-
-  "moptilities" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."moptilities" or (x: {}))
-       (import ./quicklisp-to-nix-output/moptilities.nix {
-         inherit fetchurl;
-           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
-       }));
-
-
   "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date";
 
 
@@ -40,239 +25,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "uuid" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."uuid" or (x: {}))
-       (import ./quicklisp-to-nix-output/uuid.nix {
-         inherit fetchurl;
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
-           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
-       }));
-
-
-  "simple-date" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."simple-date" or (x: {}))
-       (import ./quicklisp-to-nix-output/simple-date.nix {
-         inherit fetchurl;
-           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
-           "fiveam" = quicklisp-to-nix-packages."fiveam";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-       }));
-
-
-  "s-sql" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."s-sql" or (x: {}))
-       (import ./quicklisp-to-nix-output/s-sql.nix {
-         inherit fetchurl;
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
-           "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests";
-           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
-           "fiveam" = quicklisp-to-nix-packages."fiveam";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "postmodern" = quicklisp-to-nix-packages."postmodern";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-       }));
-
-
-  "qmynd" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."qmynd" or (x: {}))
-       (import ./quicklisp-to-nix-output/qmynd.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "list-of" = quicklisp-to-nix-packages."list-of";
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
-           "salza2" = quicklisp-to-nix-packages."salza2";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-       }));
-
-
-  "py-configparser" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."py-configparser" or (x: {}))
-       (import ./quicklisp-to-nix-output/py-configparser.nix {
-         inherit fetchurl;
-           "parse-number" = quicklisp-to-nix-packages."parse-number";
-       }));
-
-
-  "postmodern" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."postmodern" or (x: {}))
-       (import ./quicklisp-to-nix-output/postmodern.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
-           "cl-postgres_slash_tests" = quicklisp-to-nix-packages."cl-postgres_slash_tests";
-           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
-           "fiveam" = quicklisp-to-nix-packages."fiveam";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "s-sql" = quicklisp-to-nix-packages."s-sql";
-           "s-sql_slash_tests" = quicklisp-to-nix-packages."s-sql_slash_tests";
-           "simple-date" = quicklisp-to-nix-packages."simple-date";
-           "simple-date_slash_postgres-glue" = quicklisp-to-nix-packages."simple-date_slash_postgres-glue";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-       }));
-
-
-  "mssql" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."mssql" or (x: {}))
-       (import ./quicklisp-to-nix-output/mssql.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "garbage-pools" = quicklisp-to-nix-packages."garbage-pools";
-           "iterate" = quicklisp-to-nix-packages."iterate";
-           "parse-number" = quicklisp-to-nix-packages."parse-number";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-       }));
-
-
-  "metatilities-base" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."metatilities-base" or (x: {}))
-       (import ./quicklisp-to-nix-output/metatilities-base.nix {
-         inherit fetchurl;
-       }));
-
-
-  "lparallel" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lparallel" or (x: {}))
-       (import ./quicklisp-to-nix-output/lparallel.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-       }));
-
-
-  "list-of" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."list-of" or (x: {}))
-       (import ./quicklisp-to-nix-output/list-of.nix {
-         inherit fetchurl;
-           "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers";
-       }));
-
-
-  "ixf" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."ixf" or (x: {}))
-       (import ./quicklisp-to-nix-output/ixf.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-       }));
-
-
-  "garbage-pools" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."garbage-pools" or (x: {}))
-       (import ./quicklisp-to-nix-output/garbage-pools.nix {
-         inherit fetchurl;
-       }));
-
-
-  "dynamic-classes" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."dynamic-classes" or (x: {}))
-       (import ./quicklisp-to-nix-output/dynamic-classes.nix {
-         inherit fetchurl;
-           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
-       }));
-
-
-  "db3" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."db3" or (x: {}))
-       (import ./quicklisp-to-nix-output/db3.nix {
-         inherit fetchurl;
-       }));
-
-
-  "cl-markdown" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-markdown" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-markdown.nix {
-         inherit fetchurl;
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
-           "cl-containers" = quicklisp-to-nix-packages."cl-containers";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes";
-           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
-           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
-       }));
-
-
-  "cl-log" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-log" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-log.nix {
-         inherit fetchurl;
-       }));
-
-
-  "cl-containers" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."cl-containers" or (x: {}))
-       (import ./quicklisp-to-nix-output/cl-containers.nix {
-         inherit fetchurl;
-           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
-           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
-           "moptilities" = quicklisp-to-nix-packages."moptilities";
-       }));
-
-
-  "asdf-finalizers" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."asdf-finalizers" or (x: {}))
-       (import ./quicklisp-to-nix-output/asdf-finalizers.nix {
-         inherit fetchurl;
-       }));
-
-
-  "abnf" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."abnf" or (x: {}))
-       (import ./quicklisp-to-nix-output/abnf.nix {
-         inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "esrap" = quicklisp-to-nix-packages."esrap";
-       }));
-
-
   "stefil" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."stefil" or (x: {}))
@@ -1298,6 +1050,18 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "simple-date" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."simple-date" or (x: {}))
+       (import ./quicklisp-to-nix-output/simple-date.nix {
+         inherit fetchurl;
+           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "fiveam" = quicklisp-to-nix-packages."fiveam";
+           "md5" = quicklisp-to-nix-packages."md5";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+       }));
+
+
   "salza2" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."salza2" or (x: {}))
@@ -1381,75 +1145,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "pgloader" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."pgloader" or (x: {}))
-       (import ./quicklisp-to-nix-output/pgloader.nix {
-         inherit fetchurl;
-           "abnf" = quicklisp-to-nix-packages."abnf";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-           "asdf-finalizers" = quicklisp-to-nix-packages."asdf-finalizers";
-           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "cl_plus_ssl" = quicklisp-to-nix-packages."cl_plus_ssl";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl-containers" = quicklisp-to-nix-packages."cl-containers";
-           "cl-csv" = quicklisp-to-nix-packages."cl-csv";
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
-           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
-           "cl-log" = quicklisp-to-nix-packages."cl-log";
-           "cl-markdown" = quicklisp-to-nix-packages."cl-markdown";
-           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
-           "cl-utilities" = quicklisp-to-nix-packages."cl-utilities";
-           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
-           "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments";
-           "db3" = quicklisp-to-nix-packages."db3";
-           "drakma" = quicklisp-to-nix-packages."drakma";
-           "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes";
-           "esrap" = quicklisp-to-nix-packages."esrap";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "garbage-pools" = quicklisp-to-nix-packages."garbage-pools";
-           "ieee-floats" = quicklisp-to-nix-packages."ieee-floats";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "iterate" = quicklisp-to-nix-packages."iterate";
-           "ixf" = quicklisp-to-nix-packages."ixf";
-           "list-of" = quicklisp-to-nix-packages."list-of";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "lparallel" = quicklisp-to-nix-packages."lparallel";
-           "md5" = quicklisp-to-nix-packages."md5";
-           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
-           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
-           "mssql" = quicklisp-to-nix-packages."mssql";
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
-           "parse-number" = quicklisp-to-nix-packages."parse-number";
-           "postmodern" = quicklisp-to-nix-packages."postmodern";
-           "puri" = quicklisp-to-nix-packages."puri";
-           "py-configparser" = quicklisp-to-nix-packages."py-configparser";
-           "qmynd" = quicklisp-to-nix-packages."qmynd";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "s-sql" = quicklisp-to-nix-packages."s-sql";
-           "salza2" = quicklisp-to-nix-packages."salza2";
-           "simple-date" = quicklisp-to-nix-packages."simple-date";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "sqlite" = quicklisp-to-nix-packages."sqlite";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "trivial-garbage" = quicklisp-to-nix-packages."trivial-garbage";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "uuid" = quicklisp-to-nix-packages."uuid";
-       }));
-
-
   "pcall" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."pcall" or (x: {}))

From 5c16e62d4bdea6e026ea1475878704e6642403c7 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Thu, 31 May 2018 00:39:12 +0300
Subject: [PATCH 2817/3370] git-lfs: 2.3.4 -> 2.4.2 (#41249)

---
 pkgs/applications/version-management/git-lfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index 5c2e99d8e3fe..6ca563f7d1a6 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
-  version = "2.3.4";
+  version = "2.4.2";
 
   goPackagePath = "github.com/git-lfs/git-lfs";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "git-lfs";
     repo = "git-lfs";
-    sha256 = "0fv1ly9577jrjwx91jqfql740rwp06chl4y37pcpl72nc08jvcw7";
+    sha256 = "0ww1jh45nlm74vbi4n6cdxi35bzgjlqmz3q8h9igdwfhkf79kd5c";
   };
 
   preBuild = ''

From 30c3a7f5c6d5ca9a250dcdfce6b536c4cc9e54c3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 May 2018 14:44:54 -0700
Subject: [PATCH 2818/3370] strongswan: 5.6.2 -> 5.6.3 (#41237)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/strongswan/versions.

These checks were done:

- built on NixOS
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/pki passed the binary check.
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/charon-cmd passed the binary check.
- Warning: no invocation of /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/charon-systemd had a zero exit code or showed the expected version
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/ipsec passed the binary check.
- /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3/bin/swanctl passed the binary check.
- 4 of 5 passed binary check by having a zero exit code.
- 1 of 5 passed binary check by having the new version present in output.
- found 5.6.3 with grep in /nix/store/9qicaqwg2cvmahh3hqwig5bcqpd41k9a-strongswan-5.6.3
- directory tree listing: https://gist.github.com/258736889db4e822d054b65e7035147b
- du listing: https://gist.github.com/478dbb4f44b4ed18b112076b17451a4e
---
 pkgs/tools/networking/strongswan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix
index eb466745ef84..9ceb08ad72e9 100644
--- a/pkgs/tools/networking/strongswan/default.nix
+++ b/pkgs/tools/networking/strongswan/default.nix
@@ -16,11 +16,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "strongswan-${version}";
-  version = "5.6.2";
+  version = "5.6.3";
 
   src = fetchurl {
     url = "http://download.strongswan.org/${name}.tar.bz2";
-    sha256 = "14ifqay54brw2b2hbmm517bxw8bs9631d7jm4g139igkxcq0m9p0";
+    sha256 = "095zg7h7qwsc456sqgwb1lhhk29ac3mk5z9gm6xja1pl061driy3";
   };
 
   dontPatchELF = true;

From edbebe72144ab64670b0ce50242dec6111f32758 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 24 May 2018 21:10:01 -0500
Subject: [PATCH 2819/3370] z3: 4.6.0 -> 4.7.1

---
 pkgs/applications/science/logic/z3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index 5eda2da60566..54c9799a01b8 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "z3-${version}";
-  version = "4.6.0";
+  version = "4.7.1";
 
   src = fetchFromGitHub {
     owner  = "Z3Prover";
     repo   = "z3";
-    rev    = "b0aaa4c6d7a739eb5e8e56a73e0486df46483222";
-    sha256 = "1cgwlmjdbf4rsv2rriqi2sdpz9qxihxrcpm6a4s37ijy437xg78l";
+    rev    = "3b1b82bef05a1b5fd69ece79c80a95fb6d72a990";
+    sha256 = "1s850r6qifwl83zzgvrb5l0jigvmymzpv18ph71hg2bcpk7kjw3d";
   };
 
   buildInputs = [ python fixDarwinDylibNames ];

From 4d2cd9894b8638bb8fd3052eab9eb3f7bae62105 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 May 2018 14:57:09 -0700
Subject: [PATCH 2820/3370] libcouchbase: 2.8.7 -> 2.9.0 (#41113)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libcouchbase/versions.

These checks were done:

- built on NixOS
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-cat passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-create passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-observe passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-observe-seqno passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-incr passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-decr passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-mcflush passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-hash passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-lock passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-unlock passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-rm passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-stats passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-version passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-verbosity passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-view passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-n1ql passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-admin passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-ping passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-bucket-create passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-bucket-delete passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-bucket-flush passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-connstr passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-write-config passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-strerror passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-touch passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-role-list passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-user-list passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-user-upsert passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-user-delete passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-watch passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-pillowfight passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-n1qlback passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-subdoc passed the binary check.
- /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0/bin/cbc-proxy passed the binary check.
- 35 of 35 passed binary check by having a zero exit code.
- 0 of 35 passed binary check by having the new version present in output.
- found 2.9.0 with grep in /nix/store/zj8j91qlmkqy5bzhzgmmhjzynxxl5isd-libcouchbase-2.9.0
- directory tree listing: https://gist.github.com/615a7ba10ca91c94d08d74c5a200cef6
- du listing: https://gist.github.com/9991135c2e307e906da31f66df3aa79c
---
 pkgs/development/libraries/libcouchbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index d6447e449cfb..bf72ec767258 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.8.7";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "1hx66dlbb3sc3xaj6nsav4rp7qghl9zyv796kxj1sammw9wp98b1";
+    sha256 = "12s2iw4akil3hlvsccns7qw2c90yw5h67zj3wq03q938w8xcw0d0";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From ea3769ec81a3a8e95ecd995d90165998a2d91938 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 May 2018 15:14:46 -0700
Subject: [PATCH 2821/3370] povray: 3.7.0.7 -> 3.7.0.8 (#41269)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/povray/versions.

These checks were done:

- built on NixOS
- /nix/store/hl6rn2fjd9h2g4vks7hrm3yv2f1zh3yc-povray-3.7.0.8/bin/povray passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.7.0.8 with grep in /nix/store/hl6rn2fjd9h2g4vks7hrm3yv2f1zh3yc-povray-3.7.0.8
- directory tree listing: https://gist.github.com/d35bed4b147aefbe2b8c6e42bdf56ccb
- du listing: https://gist.github.com/75bee836a81741aa901a3677fb40aa16
---
 pkgs/tools/graphics/povray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix
index 5dfed3722e09..217a85f266ab 100644
--- a/pkgs/tools/graphics/povray/default.nix
+++ b/pkgs/tools/graphics/povray/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "povray-${version}";
-  version = "3.7.0.7";
+  version = "3.7.0.8";
 
   src = fetchFromGitHub {
     owner = "POV-Ray";
     repo = "povray";
     rev = "v${version}";
-    sha256 = "0gqbc4ycjfqpnixzzqxlygmargk6sm77b0k3xzff9dxdrak3xng7";
+    sha256 = "1q114n4m3r7qy3yn954fq7p46rg7ypdax5fazxr9yj1jklf1lh6z";
   };
 
 

From a3efa24da976a993848059fa9adf5e28fccb0d65 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Thu, 31 May 2018 02:50:27 +0400
Subject: [PATCH 2822/3370] chromium: bump dev version

---
 .../networking/browsers/chromium/upstream-info.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index b0da1b5809c2..2113b9cdbed7 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -7,8 +7,8 @@
   };
   dev = {
     sha256 = "0hy36r938k6c89alam4a8yy2wynnlcc0zqhhb0jgy3qlnqrksvrc";
-    sha256bin64 = "0y69ykzj1phpvmhd380wijzs0f8s15gmvb88zd4m8fzqi6gg51dj";
-    version = "68.0.3438.3";
+    sha256bin64 = "0liqgz8sip5fz5mxb54zagz3p8s24j96p26i5dql935bic7p3lhw";
+    version = "68.0.3440.7";
   };
   stable = {
     sha256 = "03bpznpnr22lphixvvc1cr0pn4p7fxjlz0wwysjw9j7i5y9n7vnm";

From 21155d586fb3f15a53c3affb662633b3cf2978ae Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 May 2018 16:18:24 -0700
Subject: [PATCH 2823/3370] khal: 0.9.8 -> 0.9.9 (#41267)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/khal/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9/bin/.ikhal-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9/bin/ikhal had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9/bin/.khal-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9/bin/khal had a zero exit code or showed the expected version
- 0 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 0.9.9 with grep in /nix/store/wkssgwwqyffwnf7c8p1zi180xjm256il-khal-0.9.9
- directory tree listing: https://gist.github.com/a146a88f248f45c280a17c50a0d46b79
- du listing: https://gist.github.com/72d0555178317dce9c07ab814f13f512
---
 pkgs/applications/misc/khal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 5351cd41b251..9dd466c442aa 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -5,11 +5,11 @@ with python3Packages;
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "khal";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y";
+    sha256 = "0dq9aqb9pqjfqrnfg43mhpb7m0szmychxy1ydb3lwzf3500c9rsh";
   };
 
   LC_ALL = "en_US.UTF-8";

From 4fc23d2de09d3ae357088bcf35bb9915acd08e82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 31 May 2018 00:35:20 +0100
Subject: [PATCH 2824/3370] hubUnstable: remove in favor of hub

---
 .../git-and-tools/default.nix                 |  4 +--
 .../git-and-tools/hub/unstable.nix            | 36 -------------------
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/hub/unstable.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 99b6b5313709..9a4ef524dde9 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -109,9 +109,7 @@ rec {
     inherit (darwin) Security;
   };
 
-  hubUnstable = callPackage ./hub/unstable.nix {
-    inherit (darwin) Security;
-  };
+  hubUnstable = throw "use gitAndTools.hub instead";
 
   qgit = qt5.callPackage ./qgit { };
 
diff --git a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix b/pkgs/applications/version-management/git-and-tools/hub/unstable.nix
deleted file mode 100644
index 7e83c2cfb674..000000000000
--- a/pkgs/applications/version-management/git-and-tools/hub/unstable.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchgit, go, ronn, groff, utillinux, Security }:
-
-stdenv.mkDerivation rec {
-  name = "hub-${version}";
-  version = "2.3.0-pre10";
-
-  src = fetchgit {
-    url = https://github.com/github/hub.git;
-    rev = "refs/tags/v${version}";
-    sha256 = "07sz1i6zxx2g36ayhjp1vjw523ckk5b0cr8b80s1qhar2d2hkibd";
-  };
-
-  buildInputs = [ go ronn groff utillinux ]
-    ++ stdenv.lib.optional stdenv.isDarwin Security;
-
-  buildPhase = ''
-    mkdir bin
-    ln -s ${ronn}/bin/ronn bin/ronn
-
-    patchShebangs .
-    make all man-pages
-  '';
-
-  installPhase = ''
-    prefix=$out sh -x < script/install.sh
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Command-line wrapper for git that makes you better at GitHub";
-
-    license = licenses.mit;
-    homepage = https://hub.github.com/;
-    maintainers = with maintainers; [ the-kenny ];
-    platforms = with platforms; unix;
-  };
-}

From e055b76336e63cf7db6201356c1fbe558c621524 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 May 2018 19:52:17 -0400
Subject: [PATCH 2825/3370] linux: 4.4.134 -> 4.4.135

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 1f9b52c8db74..e06be4838ee3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.134";
+  version = "4.4.135";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "14gvkpdm3wbdfifnkrlk8b3i2isb439prqrzzlvjh88h582x4y20";
+    sha256 = "1p41fz1jhcrzcmvhbl8di1660bv0w2wpcmi4hfgksdjfh84b1k03";
   };
 } // (args.argsOverride or {}))

From 943d2fce81c4017bb2eb0d5e0dd48b6f15f35b77 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 May 2018 19:52:43 -0400
Subject: [PATCH 2826/3370] linux: 4.9.104 -> 4.9.105

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 8d4094075a49..d69717b15fe7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.104";
+  version = "4.9.105";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "13f30b7z9sp9h1kwjahla194k7ji46z3pr706caapn71npn55abv";
+    sha256 = "1i3dv7lvh7b08943iw45j0x99878wia83fribbgxn7xcwcld51fh";
   };
 } // (args.argsOverride or {}))

From 4afe59cb360da4a8134b6599e0f54fa7351949e0 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 30 May 2018 19:53:01 -0400
Subject: [PATCH 2827/3370] linux: 4.14.46 -> 4.14.47

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index a7277d679684..d7bcd411764b 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.46";
+  version = "4.14.47";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0cpnfsxf2ici3yfn1bxix6219fri2s3ld19hpf00z9im8x91px4h";
+    sha256 = "06c8kl9f0s5qmqh9l16y1q7r44ld56kd0a00722c3aivddm3nav7";
   };
 } // (args.argsOverride or {}))

From 98463f7a6c8a1b7165aea9a5074362709e7b06f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 30 May 2018 17:50:58 -0700
Subject: [PATCH 2828/3370] iperf2: 2.0.10 -> 2.0.11

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/iperf/versions.

These checks were done:

- built on NixOS
- /nix/store/96cfq6l9jpw5jb2xfmyqsqvpx9khvaff-iperf-2.0.11/bin/iperf passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.0.11 with grep in /nix/store/96cfq6l9jpw5jb2xfmyqsqvpx9khvaff-iperf-2.0.11
- directory tree listing: https://gist.github.com/9e979b025f65af2cc7e8ffe313002b2f
- du listing: https://gist.github.com/68cf597a93df8e798cb97551f8303fa4
---
 pkgs/tools/networking/iperf/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix
index 94be3c25d1fc..33e9841eb058 100644
--- a/pkgs/tools/networking/iperf/2.nix
+++ b/pkgs/tools/networking/iperf/2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "iperf-2.0.10";
+  name = "iperf-2.0.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/iperf2/files/${name}.tar.gz";
-    sha256 = "1whyi7lxrkllmbs7i1avc6jq8fvirn64mhx9197bf4x3rj6k9r3z";
+    sha256 = "1lm5inayc8fkqncj55fvzl9611rkmkj212lknmby7c3bgk851mmp";
   };
 
   hardeningDisable = [ "format" ];

From 9b0370fc47e9d79cef4d2aa4df3b14ea121543ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 30 May 2018 18:37:42 -0700
Subject: [PATCH 2829/3370] folly: 2018.05.21.00 -> 2018.05.28.00

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/folly/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2018.05.28.00 with grep in /nix/store/j0vmqnzcn83749cw2x6rzzf3bay2zyg0-folly-2018.05.28.00
- directory tree listing: https://gist.github.com/2a05d2503ea41d5bd03239e4562bea92
- du listing: https://gist.github.com/f4cb65851fac8a956d81301fa5623140
---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 36da31e8908a..8abd42fe1744 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "folly-${version}";
-  version = "2018.05.21.00";
+  version = "2018.05.28.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "0x8qa0g0rj4bmy5cra7f0ch0srq34d8d04f1c59q93xd6ggkr52w";
+    sha256 = "1n5zic8bgm4dfc7prjj3af2ipxalia6w7dk6w9pmrz1nkrpyd68c";
   };
 
   nativeBuildInputs = [ autoreconfHook python pkgconfig ];

From f24f6d7af33d2ccc2942fba735e8de81c2ea268d Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <benjamin.saunders@here.com>
Date: Wed, 30 May 2018 18:48:42 -0700
Subject: [PATCH 2830/3370] tests.cc-wrapper: skip known-broken sanitizer cases

---
 pkgs/test/cc-wrapper/default.nix | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 87d070f56162..00b964940c81 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -1,6 +1,9 @@
 { stdenv }:
-
-stdenv.mkDerivation {
+with stdenv.lib;
+let
+  # Sanitizer headers aren't available in older libc++ stdenvs due to a bug
+  sanitizersBroken = stdenv.cc.isClang && builtins.compareVersions (getVersion stdenv.cc.name) "6.0.0" < 0;
+in stdenv.mkDerivation {
   name = "cc-wrapper-test";
 
   buildCommand = ''
@@ -15,7 +18,7 @@ stdenv.mkDerivation {
     $CXX -o cxx-check ${./cxx-main.cc}
     ./cxx-check
 
-    ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) ''
+    ${optionalString (stdenv.isDarwin && stdenv.cc.isClang) ''
       printf "checking whether compiler can build with CoreFoundation.framework... " >&2
       mkdir -p foo/lib
       $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c}
@@ -31,7 +34,7 @@ stdenv.mkDerivation {
     printf "checking whether compiler uses NIX_LDFLAGS... " >&2
     mkdir -p foo/lib
     $CC -shared \
-      ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \
+      ${optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} \
       -DVALUE=42 \
       -o foo/lib/libfoo${stdenv.hostPlatform.extensions.sharedLibrary} \
       ${./foo.c}
@@ -39,11 +42,14 @@ stdenv.mkDerivation {
     NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c}
     ./ldflags-check
 
-    $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
-    ./sanitizers
+    ${optionalString (!sanitizersBroken) ''
+      printf "checking whether sanitizers are fully functional... ">&2
+      $CC -o sanitizers -fsanitize=address,undefined ${./sanitizers.c}
+      ./sanitizers
+    ''}
 
     touch $out
   '';
 
-  meta.platforms = stdenv.lib.platforms.all;
+  meta.platforms = platforms.all;
 }

From b8110dbee652cd41c0868a6d8e19e86557d50046 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 30 May 2018 20:11:53 -0700
Subject: [PATCH 2831/3370] git-hub: 1.0.0 -> 1.0.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/git-hub/versions.

These checks were done:

- built on NixOS
- /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1/bin/git-hub passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.0.1 with grep in /nix/store/alnsn3bczp0j8x9d8f390q67aql5y7cc-git-hub-1.0.1
- directory tree listing: https://gist.github.com/fc09f98152d4008f23cb52855621b6bb
- du listing: https://gist.github.com/29489408ac7b6cb1137948d9edd0fef6
---
 .../version-management/git-and-tools/git-hub/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index b4c3baecd417..94143e652f95 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "git-hub-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
-    sha256 = "07756pidrm4cph3nm90z16imvnylvz3fw4369wrglbdr27filf3x";
+    sha256 = "1lizjyi8vac1p1anbnh6qrr176rwxp5yjc1787asw437sackkwza";
     rev = "v${version}";
     repo = "git-hub";
     owner = "sociomantic-tsunami";

From 3414e67a9de794948a595e94f31bc29eac3f95e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 30 May 2018 20:21:01 -0700
Subject: [PATCH 2832/3370] flyway: 5.0.7 -> 5.1.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/flyway/versions.

These checks were done:

- built on NixOS
- /nix/store/g01xk8pg48hnpaazi1kl0rhc2qzln0ds-flyway-5.1.1/bin/flyway passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 5.1.1 with grep in /nix/store/g01xk8pg48hnpaazi1kl0rhc2qzln0ds-flyway-5.1.1
- directory tree listing: https://gist.github.com/4d37780b7850ab73ad0c8dadf82a0a5b
- du listing: https://gist.github.com/40c8567fb139fa68811ad82c15399369
---
 pkgs/development/tools/flyway/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 43026e55e7f3..924dde91acc5 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, jre_headless, makeWrapper }:
   let
-    version = "5.0.7";
+    version = "5.1.1";
   in
     stdenv.mkDerivation {
       name = "flyway-${version}";
       src = fetchurl {
-        url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.0.7/flyway-commandline-${version}.tar.gz";
-        sha256 = "1zmnzz7d5kb2wpmfizryxxhpjs16j5k9mich1hbb2qfkqvygk6sv";
+        url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.1/flyway-commandline-${version}.tar.gz";
+        sha256 = "0kdi7m5rwlik0d2rn9s3siqmc83xfkhhsdxw3g7r1mvk2ivscb7f";
       };
       buildInputs = [ makeWrapper ];
       dontBuild = true;

From f855beb988b44c11098667b07ebcb30f60cafd74 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 May 2018 23:46:06 -0700
Subject: [PATCH 2833/3370] opentsdb: 2.3.0 -> 2.3.1 (#41273)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/opentsdb/versions.

These checks were done:

- built on NixOS
- /nix/store/bzg1dfd5xpc3rqgi601a162vajil47r0-opentsdb-2.3.1/bin/tsdb passed the binary check.
- Warning: no invocation of /nix/store/bzg1dfd5xpc3rqgi601a162vajil47r0-opentsdb-2.3.1/bin/.tsdb-wrapped had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.3.1 with grep in /nix/store/bzg1dfd5xpc3rqgi601a162vajil47r0-opentsdb-2.3.1
- directory tree listing: https://gist.github.com/b48d02ce7d61ccc9a1066feef216ebeb
- du listing: https://gist.github.com/fa09ba05d6c0f628805a900c2624ac13
---
 pkgs/tools/misc/opentsdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix
index 31375eeaf85d..f6aea4a92ab9 100644
--- a/pkgs/tools/misc/opentsdb/default.nix
+++ b/pkgs/tools/misc/opentsdb/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "opentsdb-${version}";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://github.com/OpenTSDB/opentsdb/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "0nip40rh3vl5azfc27yha4ngnm9sw47hf110c90hg0warzz85sch";
+    sha256 = "1lf1gynr11silla4bsrkwqv023dxirsb88ncs2qmc2ng35593fjd";
   };
 
   buildInputs = [ autoconf automake curl jdk makeWrapper nettools python git ];

From 51fbd3068b94a205feefc471c0cb262a05bd4c55 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 30 May 2018 23:54:06 -0700
Subject: [PATCH 2834/3370] pacman: 5.0.2 -> 5.1.0 (#41275)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pacman/versions.

These checks were done:

- built on NixOS
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/repo-add passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/makepkg passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pacman-db-upgrade passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pacman-key passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pkgdelta passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/repo-elephant passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/repo-remove passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/vercmp passed the binary check.
- Warning: no invocation of /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/testpkg had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/cleanupdelta had a zero exit code or showed the expected version
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pacman passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/pacman-conf passed the binary check.
- /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0/bin/makepkg-template passed the binary check.
- 11 of 13 passed binary check by having a zero exit code.
- 0 of 13 passed binary check by having the new version present in output.
- found 5.1.0 with grep in /nix/store/mgfrpaqbzbby4qy7wxj20h6dx0dh1sqz-pacman-5.1.0
- directory tree listing: https://gist.github.com/61f365ecd9146adf48fc68403568904d
- du listing: https://gist.github.com/391d88c911aeda73c0cd89f80ced8ce2
---
 pkgs/tools/package-management/pacman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix
index cdee8c15d8b5..d343064cc539 100644
--- a/pkgs/tools/package-management/pacman/default.nix
+++ b/pkgs/tools/package-management/pacman/default.nix
@@ -3,11 +3,11 @@ zlib, bzip2, lzma }:
 
 stdenv.mkDerivation rec {
   name = "pacman-${version}";
-  version = "5.0.2";
+  version = "5.1.0";
 
   src = fetchurl {
     url = "https://git.archlinux.org/pacman.git/snapshot/pacman-${version}.tar.gz";
-    sha256 = "1lk54k7d281v55fryqsajl4xav7rhpk8x8pxcms2v6dapp959hgi";
+    sha256 = "1b545zvh661vkypnqr1cdicypym9d2kfvnxbf4a61qkyza6kzx35";
   };
 
   # trying to build docs fails with a2x errors, unable to fix through asciidoc

From 78ae380773a0445ee985a9c3ca61e157c1d50b09 Mon Sep 17 00:00:00 2001
From: Jens Binkert <jensbin+git@pm.me>
Date: Thu, 31 May 2018 09:04:17 +0200
Subject: [PATCH 2835/3370] openshift: fix mkdir command (#41274)

---
 pkgs/applications/networking/cluster/openshift/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix
index 79eb8bb233c9..6b6a2dc8986b 100644
--- a/pkgs/applications/networking/cluster/openshift/default.nix
+++ b/pkgs/applications/networking/cluster/openshift/default.nix
@@ -48,7 +48,7 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace pkg/oc/bootstrap/docker/host/host.go  \
       --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \
-      'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount'
+      'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir'
   '';
 
   buildPhase = ''

From 630f3337d4180e65f0f7933ab01a65861a0f33f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 31 May 2018 00:11:40 -0700
Subject: [PATCH 2836/3370] galen: 2.3.6 -> 2.3.7 (#41296)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/galen/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/s5whrksq3l5xnv6m5jqbpgmycgj8f9n6-galen-2.3.7/bin/galen.jar had a zero exit code or showed the expected version
- /nix/store/s5whrksq3l5xnv6m5jqbpgmycgj8f9n6-galen-2.3.7/bin/galen passed the binary check.
- 1 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.3.7 with grep in /nix/store/s5whrksq3l5xnv6m5jqbpgmycgj8f9n6-galen-2.3.7
- directory tree listing: https://gist.github.com/c69a7c8c8a31e5b3b0d3243ea03c777f
- du listing: https://gist.github.com/a6d7632f5a3c34d8c20c3f24715aa6a3
---
 pkgs/development/tools/galen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
index bbcdc0cd798e..2bb67d6f761b 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/pkgs/development/tools/galen/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "galen";
-  version = "2.3.6";
+  version = "2.3.7";
   name = "${pname}-${version}";
 
   inherit jre8;
 
   src = fetchurl {
     url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip";
-    sha256 = "0kndib3slj7mdvhd36fxin5q87cnsz4hs135yxgjx0nccxq4f2h5";
+    sha256 = "045y1s4n8jd52jnk9kwd0k4x3yscvcfsf2rxzn0xngvn9nkw2g65";
   };
 
   buildInputs = [ unzip ];

From ecb257831655b8316ba60b2f3b37b97288edc469 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 31 May 2018 09:33:42 +0200
Subject: [PATCH 2837/3370] groovy: 2.4.15 -> 2.5.0 (#41270)

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

diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index 968d9f1e8fb0..d2d923d783d7 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.4.15";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "1vaa1wjnaza04hvp1n4kh10hvxx8370liz2ndm908dqv9mxa6k5x";
+    sha256 = "1qzciri8qjx5p7x015rk5ws7gj53qidamp85r2r7aj6ssyp3r40k";
   };
 
   buildInputs = [ unzip makeWrapper ];
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out
     mkdir -p $out/share/doc/groovy
     rm bin/*.bat
-    mv {bin,conf,embeddable,grooid,indy,lib} $out
+    mv {bin,conf,grooid,indy,lib} $out
     mv {licenses,LICENSE,NOTICE} $out/share/doc/groovy
 
     sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy

From e37e19ff6182258a3b9f0ab68604797efd66deff Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 31 May 2018 01:13:32 -0700
Subject: [PATCH 2838/3370] yoshimi: 1.5.7 -> 1.5.8 (#41221)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/yoshimi/versions.

These checks were done:

- built on NixOS
- /nix/store/jpvzkcfk0dablksr19lnwi7xajm7d7bh-yoshimi-1.5.8/bin/yoshimi passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.5.8 with grep in /nix/store/jpvzkcfk0dablksr19lnwi7xajm7d7bh-yoshimi-1.5.8
- directory tree listing: https://gist.github.com/53f8899fb2961c61707a03b4bcb225d1
- du listing: https://gist.github.com/3b61f944f2b81b3f5bc299051a284cec
---
 pkgs/applications/audio/yoshimi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 678345a91ddd..0c85d72cc901 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.5.7";
+  version = "1.5.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "1w916mmi6hh547a7icrgx6qr2kwxlxwlm6ampql427rshcz9r61k";
+    sha256 = "0gwsr5srzy28hwqhfzrc8pswysmyra8kbww3bxfx8bq4mdjifdj6";
   };
 
   buildInputs = [

From 47b85dc5ab8243a653c20d4851a3e6c966877251 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 31 May 2018 11:31:04 +0200
Subject: [PATCH 2839/3370] nix: 2.0.3 -> 2.0.4

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 8 ++++----
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index a7d41d4a8436..7c5414257b46 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,6 +1,6 @@
 {
-  x86_64-linux = "/nix/store/8d9zsq17v8f7lgbc5ca6gv438gk1ydqm-nix-2.0.3";
-  i686-linux = "/nix/store/7k7ca4ck24yqinbr9nyl5z2wmcx4l81g-nix-2.0.3";
-  aarch64-linux = "/nix/store/ckmrh426n1swlq9h4d53hvrxjc72avzp-nix-2.0.3";
-  x86_64-darwin = "/nix/store/2jp9d9qns3372hkx4k523hc1bbzkr4yp-nix-2.0.3";
+  x86_64-linux = "/nix/store/0d60i73mcv8z1m8d2m74yfn84980gfsa-nix-2.0.4";
+  i686-linux = "/nix/store/6ssafj2s5a2g9x28yld7b70vwd6vw6lb-nix-2.0.4";
+  aarch64-linux = "/nix/store/3wwch7bp7n7xsl8apgy2a4b16yzyij1z-nix-2.0.4";
+  x86_64-darwin = "/nix/store/771l8i0mz4c8kry8cz3sz8rr3alalckg-nix-2.0.4";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 076451de31e2..c3f1e4d8d459 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -133,10 +133,10 @@ in rec {
   }) // { perl-bindings = nixStable; };
 
   nixStable = (common rec {
-    name = "nix-2.0.3";
+    name = "nix-2.0.4";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "4f2f1d624cecac3baf7a026f89e08cf3d01bd6983cc7812bca4178092e436660";
+      sha256 = "166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b";
     };
   }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
 

From 828ddc2e20e6644b054d9c7efc0d1c3f5c221a87 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Thu, 31 May 2018 11:42:12 +0200
Subject: [PATCH 2840/3370] perlPackages.DBDPg: disable tests

Build was broken because tests freeze in sandbox, disable them.
Fixes #41199.
---
 pkgs/development/perl-modules/DBD-Pg/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix
index 3cf6880050b4..b9d287b2bf3c 100644
--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/pkgs/development/perl-modules/DBD-Pg/default.nix
@@ -13,6 +13,9 @@ buildPerlPackage rec {
 
   makeMakerFlags = "POSTGRES_HOME=${postgresql}";
 
+  # tests freeze in a sandbox
+  doCheck = false;
+
   meta = {
     homepage = http://search.cpan.org/dist/DBD-Pg/;
     description = "DBI PostgreSQL interface";

From d629daeb2c9e8eec3f4ce9ec6456ddad8531f06d Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr>
Date: Thu, 31 May 2018 11:55:10 +0200
Subject: [PATCH 2841/3370] cfitsio: use absolute references instead of rpath
 on darwin

---
 .../cfitsio/darwin-rpath-universal.patch      | 21 +++++++++++++++++++
 .../libraries/cfitsio/darwin-universal.patch  | 12 -----------
 .../development/libraries/cfitsio/default.nix |  2 +-
 3 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
 delete mode 100644 pkgs/development/libraries/cfitsio/darwin-universal.patch

diff --git a/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch b/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
new file mode 100644
index 000000000000..7ac051326517
--- /dev/null
+++ b/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
@@ -0,0 +1,21 @@
+diff -ruN cfitsio/configure cfitsio-rpath-universal/configure
+--- cfitsio/configure	2018-05-09 21:16:00.000000000 +0200
++++ cfitsio-rpath-universal/configure	2018-05-31 12:02:25.000000000 +0200
+@@ -4727,16 +4727,7 @@
+     SHLIB_SUFFIX=".dylib"
+     CFITSIO_SHLIB="lib\${PACKAGE}.\${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}\${SHLIB_SUFFIX}"
+     CFITSIO_SHLIB_SONAME="lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX}"
+-    case $host in
+-        *darwin[56789]*)
+-            SHLIB_LD="$CC -dynamiclib -install_name lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
+-            ;;
+-        *)
+-            # Build 'Universal' binaries (i386 & x86_64 architectures) and
+-            # use rpath token on Darwin 10.x or newer:
+-            SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
+-            ;;
+-    esac
++    SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
+ 
+     lhea_shlib_cflags="-fPIC -fno-common"
+     ;;
diff --git a/pkgs/development/libraries/cfitsio/darwin-universal.patch b/pkgs/development/libraries/cfitsio/darwin-universal.patch
deleted file mode 100644
index db9b7b5a56e4..000000000000
--- a/pkgs/development/libraries/cfitsio/darwin-universal.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN cfitsio/configure cfitsio-universal/configure
---- cfitsio/configure	2018-05-09 21:16:00.000000000 +0200
-+++ cfitsio-universal/configure	2018-05-30 14:26:03.000000000 +0200
-@@ -4734,7 +4734,7 @@
-         *)
-             # Build 'Universal' binaries (i386 & x86_64 architectures) and
-             # use rpath token on Darwin 10.x or newer:
--            SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
-+            SHLIB_LD="$CC -dynamiclib -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
-             ;;
-     esac
- 
diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index 1fc9b62ccc86..a21158723be1 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -8,7 +8,7 @@
     sha256 = "07fghxh5fl8nqk3q0dh8rvc83npnm0hisxzcj16a6r7gj5pmp40l";
   };
 
-  patches = [ ./darwin-curl-config.patch ./darwin-universal.patch ];
+  patches = [ ./darwin-curl-config.patch ./darwin-rpath-universal.patch ];
 
   # Shared-only build
   buildFlags = "shared";

From feaf65f1eecf1e7ad248e5d3240be52736a8af8c Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Thu, 31 May 2018 12:33:39 +0200
Subject: [PATCH 2842/3370] darcs: Allow newer graphviz

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a63462028795..a88cd1c789ed 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -939,7 +939,8 @@ self: super: {
   haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };
 
   # Jailbreak "unix-compat >=0.1.2 && <0.5".
-  darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' darcs.cabal"; });
+  # Jailbreak "graphviz >=2999.18.1 && <2999.20".
+  darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' -e 's/fgl .*,/fgl,/' -e 's/graphviz .*,/graphviz,/' darcs.cabal"; });
 
   # https://github.com/Twinside/Juicy.Pixels/issues/149
   JuicyPixels = dontHaddock super.JuicyPixels;

From c4900b2fceed98dab4ce1d72e1f9d0826e42d7e2 Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Thu, 31 May 2018 12:22:52 +0100
Subject: [PATCH 2843/3370] pythonPackage.amazon_kclpy: init at 1.5.0

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

diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix
new file mode 100644
index 000000000000..f0ee7dd241be
--- /dev/null
+++ b/pkgs/development/python-modules/amazon_kclpy/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }:
+
+buildPythonPackage rec {
+  pname = "amazon_kclpy";
+  version = "1.5.0";
+
+  src = fetchFromGitHub {
+    owner = "awslabs";
+    repo = "amazon-kinesis-client-python";
+    rev = "v${version}";
+    sha256 = "1qg86y9172gm5592ja7lr6w7kfnx668j99bf3ijklpk5yshxwr9m";
+  };
+
+  # argparse is just required for python2.6
+  prePatch = ''
+    substituteInPlace setup.py \
+      --replace "'argparse'," ""
+  '';
+
+  propagatedBuildInputs =  [ mock boto ];
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    ${python.interpreter} -m pytest
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Amazon Kinesis Client Library for Python";
+    homepage = https://github.com/awslabs/amazon-kinesis-client-python;
+    license = licenses.asl;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0a230853087c..031746346b9f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -201,6 +201,8 @@ in {
 
   # packages defined elsewhere
 
+  amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   bap = callPackage ../development/python-modules/bap {

From 95c05343ce292cd97c120f68131560947e25122c Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine.chikhaoui91@gmail.com>
Date: Thu, 31 May 2018 12:49:15 +0100
Subject: [PATCH 2844/3370] revert 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 and
 properly remove the temporary ssh host keys file/directory.

---
 nixos/modules/virtualisation/google-compute-image.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 374a84332357..5957c95a86dd 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -253,11 +253,12 @@ in
               mv -f $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key* /etc/ssh/
               chmod 600 /etc/ssh/ssh_host_ed25519_key
               chmod 644 /etc/ssh/ssh_host_ed25519_key.pub
+              rm $SSH_HOST_KEYS_DIR/*
           else
               echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed."
               false
           fi
-          rm -f $SSH_HOST_KEYS_DIR
+          rm -r $SSH_HOST_KEYS_DIR
         '';
       serviceConfig.Type = "oneshot";
       serviceConfig.RemainAfterExit = true;

From fdec3e7dce4213c812ea1985965df4d9303dfcf0 Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Thu, 31 May 2018 12:57:50 +0100
Subject: [PATCH 2845/3370] pythonPackage.amazon_kclpy: fix licence name asl ->
 amazonsl

---
 pkgs/development/python-modules/amazon_kclpy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix
index f0ee7dd241be..a405b575b253 100644
--- a/pkgs/development/python-modules/amazon_kclpy/default.nix
+++ b/pkgs/development/python-modules/amazon_kclpy/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   meta = with stdenv.lib; {
     description = "Amazon Kinesis Client Library for Python";
     homepage = https://github.com/awslabs/amazon-kinesis-client-python;
-    license = licenses.asl;
+    license = licenses.amazonsl;
     maintainers = with maintainers; [ psyanticy ];
   };
 }

From 56023ac0ba5d24708a3210db7ba087ebd86e3d6c Mon Sep 17 00:00:00 2001
From: Tobias Happ <Gerschtli@users.noreply.github.com>
Date: Thu, 31 May 2018 14:14:25 +0200
Subject: [PATCH 2846/3370] cargo-edit: Fixes build with carnix (#39348)

---
 .../cargo-edit/cargo-edit.nix                 | 1910 +++++++++++++++++
 .../package-management/cargo-edit/default.nix |   43 +-
 2 files changed, 1931 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/tools/package-management/cargo-edit/cargo-edit.nix

diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
new file mode 100644
index 000000000000..c37ef373ac24
--- /dev/null
+++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
@@ -0,0 +1,1910 @@
+# Generated by carnix 0.6.6: carnix -o cargo-edit.nix --src ./. Cargo.lock --standalone
+with import <nixpkgs> {};
+let kernel = buildPlatform.parsed.kernel.name;
+    abi = buildPlatform.parsed.abi.name;
+    include = includedFiles: src: builtins.filterSource (path: type:
+      lib.lists.any (f:
+        let p = toString (src + ("/" + f)); in
+        (path == p) || (type == "directory" && lib.strings.hasPrefix path p)
+      ) includedFiles
+    ) src;
+    updateFeatures = f: up: functions: builtins.deepSeq f (lib.lists.foldl' (features: fun: fun features) (lib.attrsets.recursiveUpdate f up) functions);
+    mapFeatures = features: map (fun: fun { features = features; });
+    mkFeatures = feat: lib.lists.foldl (features: featureName:
+      if feat.${featureName} or false then
+        [ featureName ] ++ features
+      else
+        features
+    ) [] (builtins.attrNames feat);
+in
+rec {
+  cargo_edit = f: cargo_edit_0_2_0 { features = cargo_edit_0_2_0_features { cargo_edit_0_2_0 = f; }; };
+  adler32_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "adler32";
+    version = "1.0.0";
+    authors = [ "Remi Rampin <remirampin@gmail.com>" ];
+    sha256 = "0pj35a7m4apn5xjg9n63gsdj6w8iw76zg4p9znrij43xnfqp084w";
+    inherit dependencies buildDependencies features;
+  };
+  advapi32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "advapi32-sys";
+    version = "0.2.0";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1l6789hkz2whd9gklwz1m379kcvyizaj8nnzj3rn4a5h79yg59v7";
+    libName = "advapi32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  aho_corasick_0_6_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "aho-corasick";
+    version = "0.6.3";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "1cpqzf6acj8lm06z3f1cg41wn6c2n9l3v49nh0dvimv4055qib6k";
+    libName = "aho_corasick";
+    crateBin = [ {  name = "aho-corasick-dot"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  assert_cli_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "assert_cli";
+    version = "0.4.0";
+    authors = [ "Pascal Hertleif <killercup@gmail.com>" ];
+    sha256 = "0jq138q0wma5b149ixjv43al19xnzwgp67s908mh4cma1ar4rxbn";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  backtrace_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "backtrace";
+    version = "0.3.2";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "The Rust Project Developers" ];
+    sha256 = "0cj0ynv5p2f5ghisw58yjwrw4gvpji6sh12kk9j0228j7bhjznv7";
+    inherit dependencies buildDependencies features;
+  };
+  backtrace_sys_0_1_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "backtrace-sys";
+    version = "0.1.11";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "06c6s9hsygix25awgcfa1gnzvihc7kvv5apnmf6p15l4phwzz6x6";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  base64_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "base64";
+    version = "0.6.0";
+    authors = [ "Alice Maz <alice@alicemaz.com>" "Marshall Pierce <marshall@mpierce.org>" ];
+    sha256 = "0ql1rmczbnww3iszc0pfc6mqa47ravpsdf525vp6s8r32nyzspl5";
+    inherit dependencies buildDependencies features;
+  };
+  bitflags_0_9_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "bitflags";
+    version = "0.9.1";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
+    inherit dependencies buildDependencies features;
+  };
+  byteorder_1_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "byteorder";
+    version = "1.1.0";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "1i2n0161jm00zvzh4bncgv9zrwa6ydbxdn5j4bx0wwn7rvi9zycp";
+    inherit dependencies buildDependencies features;
+  };
+  bytes_0_4_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "bytes";
+    version = "0.4.4";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "028l4zlrjbr62y92slr84zil8h1bypqr7g545i566gf7cbss7hsp";
+    inherit dependencies buildDependencies features;
+  };
+  cargo_edit_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cargo-edit";
+    version = "0.2.0";
+    authors = [ "Without Boats <lee@libertad.ucsd.edu>" "Pascal Hertleif <killercup@gmail.com>" "Sebastian Garrido <sebasgarcep@gmail.com>" "Jonas Platte <mail@jonasplatte.de>" "Benjamin Gill <git@bgill.eu>" "Andronik Ordian <write@reusable.software>" ];
+    src = ./.;
+    crateBin = [ {  name = "cargo-add";  path = "src/bin/add/main.rs"; } {  name = "cargo-rm";  path = "src/bin/rm/main.rs"; } {  name = "cargo-upgrade";  path = "src/bin/upgrade/main.rs"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  cfg_if_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "cfg-if";
+    version = "0.1.2";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0x06hvrrqy96m97593823vvxcgvjaxckghwyy2jcyc8qc7c6cyhi";
+    inherit dependencies buildDependencies features;
+  };
+  colored_1_5_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "colored";
+    version = "1.5.2";
+    authors = [ "Thomas Wickham <mackwic@gmail.com>" ];
+    sha256 = "0d7c6vpqzlabph7qr29hdjgsks8z9hqcarzl8z5dfb8cnnrfrhzn";
+    inherit dependencies buildDependencies features;
+  };
+  core_foundation_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "core-foundation";
+    version = "0.2.3";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "1g0vpya5h2wa0nlz4a74jar6y8z09f0p76zbzfqrm3dbfsrld1pm";
+    inherit dependencies buildDependencies features;
+  };
+  core_foundation_sys_0_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "core-foundation-sys";
+    version = "0.2.3";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "19s0d03294m9s5j8cvy345db3gkhs2y02j5268ap0c6ky5apl53s";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  crypt32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "crypt32-sys";
+    version = "0.2.0";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1vy1q3ayc7f4wiwyxw31hd12cvs7791x3by6ka9wbxhm5gzfs3d0";
+    libName = "crypt32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  dbghelp_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "dbghelp-sys";
+    version = "0.2.0";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0ylpi3bbiy233m57hnisn1df1v0lbl7nsxn34b0anzsgg440hqpq";
+    libName = "dbghelp";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  difference_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "difference";
+    version = "1.0.0";
+    authors = [ "Johann Hofmann <mail@johann-hofmann.com>" ];
+    sha256 = "0r1p2diin8zykfiifv6v9i3ajimdb1rg6qzxkrfw2n2iy57846qn";
+    crateBin = [ {  name = "difference"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  docopt_0_8_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "docopt";
+    version = "0.8.1";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "0kmqy534qgcc2hh81nd248jmnvdjb5y4wclddd7y2jjm27rzibss";
+    crateBin = [ {  name = "docopt-wordlist";  path = "src/wordlist.rs"; } ];
+    inherit dependencies buildDependencies features;
+  };
+  dtoa_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "dtoa";
+    version = "0.4.1";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0mgg4r90yby68qg7y8csbclhsm53ac26vsyq615viq535plllhzw";
+    inherit dependencies buildDependencies features;
+  };
+  error_chain_0_10_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "error-chain";
+    version = "0.10.0";
+    authors = [ "Brian Anderson <banderson@mozilla.com>" "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" "Yamakaky <yamakaky@yamaworld.fr>" ];
+    sha256 = "1xxbzd8cjlpzsb9fsih7mdnndhzrvykj0w77yg90qc85az1xwy5z";
+    inherit dependencies buildDependencies features;
+  };
+  foreign_types_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "foreign-types";
+    version = "0.2.0";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "1sznwg2py4xi7hyrx0gg1sirlwgh87wsanvjx3zb475g6c4139jh";
+    inherit dependencies buildDependencies features;
+  };
+  futures_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "futures";
+    version = "0.1.14";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1s53l50dy9abbycc88ghz1s76yfacygrxr3vnkl132m9ja0qi9nl";
+    inherit dependencies buildDependencies features;
+  };
+  futures_cpupool_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "futures-cpupool";
+    version = "0.1.5";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1i001y0qv8pvvqd2ch1gsxw97286bcf789mlnhaindjzhm7x8fi6";
+    inherit dependencies buildDependencies features;
+  };
+  gcc_0_3_51_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "gcc";
+    version = "0.3.51";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0h2lnfakbvyn7lzpi5x41y30d5pzwz3172bdjzxxm4j59ipby563";
+    inherit dependencies buildDependencies features;
+  };
+  getopts_0_2_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "getopts";
+    version = "0.2.14";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1wdz34vls97g9868h8kiw4wmwkbyxg4xm3xzvr1542hc3w4c7z0a";
+    inherit dependencies buildDependencies features;
+  };
+  httparse_1_2_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "httparse";
+    version = "1.2.3";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "13x17y9bip0bija06y4vwpgh8jdmdi2gsvjq02kyfy0fbp5cqa93";
+    inherit dependencies buildDependencies features;
+  };
+  hyper_0_11_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "hyper";
+    version = "0.11.1";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "0al73rns6d18f09v872hasr5sf56mpzg4cpzi9g0118fy6v2z21a";
+    inherit dependencies buildDependencies features;
+  };
+  hyper_tls_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "hyper-tls";
+    version = "0.1.2";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "0n39sb8sc2pzdg501nshmv35q0r9pnrfjh8r1pdlygwxgcni9n3d";
+    inherit dependencies buildDependencies features;
+  };
+  idna_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "idna";
+    version = "0.1.4";
+    authors = [ "The rust-url developers" ];
+    sha256 = "15j44qgjx1skwg9i7f4cm36ni4n99b1ayx23yxx7axxcw8vjf336";
+    inherit dependencies buildDependencies features;
+  };
+  iovec_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "iovec";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "01gmbcaamfms70ll964wj3akqbj5bf6zzi7nfj5y2hvzjxd959sj";
+    inherit dependencies buildDependencies features;
+  };
+  itoa_0_3_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "itoa";
+    version = "0.3.1";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0jp1wvfw0qqbyz0whbycp7xr5nx1ds5plh4wsfyj503xmjf9ab4k";
+    inherit dependencies buildDependencies features;
+  };
+  kernel32_sys_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "kernel32-sys";
+    version = "0.2.2";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
+    libName = "kernel32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  language_tags_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "language-tags";
+    version = "0.2.2";
+    authors = [ "Pyfisch <pyfisch@gmail.com>" ];
+    sha256 = "1zkrdzsqzzc7509kd7nngdwrp461glm2g09kqpzaqksp82frjdvy";
+    inherit dependencies buildDependencies features;
+  };
+  lazy_static_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "lazy_static";
+    version = "0.2.8";
+    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
+    sha256 = "1xbpxx7cd5kl60g87g43q80jxyrsildhxfjc42jb1x4jncknpwbl";
+    inherit dependencies buildDependencies features;
+  };
+  lazycell_0_4_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "lazycell";
+    version = "0.4.0";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Nikita Pekin <contact@nikitapek.in>" ];
+    sha256 = "1vgxv62l8qh3m8gvjyrd7wkx44hih724ivssc1mwj7vq9gnhgl0d";
+    inherit dependencies buildDependencies features;
+  };
+  libc_0_2_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "libc";
+    version = "0.2.26";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0938y1yh2sr08zy8vpgj9wqk3nildip4ngpy2krvarzc8aqgvxrc";
+    inherit dependencies buildDependencies features;
+  };
+  libflate_0_1_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "libflate";
+    version = "0.1.10";
+    authors = [ "Takeru Ohta <phjgt308@gmail.com>" ];
+    sha256 = "123m6wz1qvczv8fnak0k71hb7gj2kkiw3sj3rv55gfmir2kgf6gk";
+    inherit dependencies buildDependencies features;
+  };
+  log_0_3_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "log";
+    version = "0.3.8";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1c43z4z85sxrsgir4s1hi84558ab5ic7jrn5qgmsiqcv90vvn006";
+    inherit dependencies buildDependencies features;
+  };
+  matches_0_1_6_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "matches";
+    version = "0.1.6";
+    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
+    sha256 = "1zlrqlbvzxdil8z8ial2ihvxjwvlvg3g8dr0lcdpsjclkclasjan";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  memchr_1_0_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "memchr";
+    version = "1.0.1";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
+    sha256 = "071m5y0zm9p1k7pzqm20f44ixvmycf71xsrpayqaypxrjwchnkxm";
+    inherit dependencies buildDependencies features;
+  };
+  mime_0_3_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "mime";
+    version = "0.3.2";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "10yv7sq2gbq8xdh4imrga3wqiar652y8y31f8jqxw313pwsks3m5";
+    inherit dependencies buildDependencies features;
+  };
+  mio_0_6_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "mio";
+    version = "0.6.9";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0fbx9mxqqzcp0jzm1xkg9h4l4l43vphv3zca4zpdc8ahadvfw6qh";
+    inherit dependencies buildDependencies features;
+  };
+  miow_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "miow";
+    version = "0.2.1";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "14f8zkc6ix7mkyis1vsqnim8m29b6l55abkba3p2yz7j1ibcvrl0";
+    inherit dependencies buildDependencies features;
+  };
+  native_tls_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "native-tls";
+    version = "0.1.4";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0q5y5i96mfpjbhx8y7w9rdq65mksw67m60bw4xqlybc8y6jkr99v";
+    inherit dependencies buildDependencies features;
+  };
+  net2_0_2_30_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "net2";
+    version = "0.2.30";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1gd7r0d646sa3fdj7rwyyx43fj7m9amqvmn0h4gv6sqcwgb7rlad";
+    inherit dependencies buildDependencies features;
+  };
+  num_traits_0_1_40_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num-traits";
+    version = "0.1.40";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1fr8ghp4i97q3agki54i0hpmqxv3s65i2mqd1pinc7w7arc3fplw";
+    inherit dependencies buildDependencies features;
+  };
+  num_cpus_1_6_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "num_cpus";
+    version = "1.6.2";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "0wxfzxsk05xbkph5qcvdqyi334zn0pnpahzi7n7iagxbb68145rm";
+    inherit dependencies buildDependencies features;
+  };
+  openssl_0_9_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "openssl";
+    version = "0.9.14";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0z8bza11x7fbhzsa3xrp4hzv4sl83102yxaiigmsdh2a480xg6jl";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  openssl_sys_0_9_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "openssl-sys";
+    version = "0.9.14";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0wq8hanw6lsm7h49ql62b3z5immbk8dcbp61vddd0pi5rk53cb2w";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  pad_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "pad";
+    version = "0.1.4";
+    authors = [ "Ben S <ogham@bsago.me>" ];
+    sha256 = "1ca30d5s6yx1cb5qa3hwxgl53m69cnn037disw3kr6cv7sy7mw1n";
+    inherit dependencies buildDependencies features;
+  };
+  percent_encoding_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "percent-encoding";
+    version = "1.0.0";
+    authors = [ "The rust-url developers" ];
+    sha256 = "0c91wp8inj7z270i2kilxjl00kcagqalxxnnjg7fsdlimdwb7q1z";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  pkg_config_0_3_9_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "pkg-config";
+    version = "0.3.9";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "06k8fxgrsrxj8mjpjcq1n7mn2p1shpxif4zg9y5h09c7vy20s146";
+    inherit dependencies buildDependencies features;
+  };
+  pretty_assertions_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "pretty_assertions";
+    version = "0.2.1";
+    authors = [ "Colin Kiegel <kiegel@gmx.de>" ];
+    sha256 = "06i0q8xjs1kbv3g0amx997axm93znwvpmj560vxrzn7s55hb9a8i";
+    inherit dependencies buildDependencies features;
+  };
+  pulldown_cmark_0_0_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "pulldown-cmark";
+    version = "0.0.3";
+    authors = [ "Raph Levien <raph@google.com>" ];
+    sha256 = "08wgdjqjnaz8yjvamdwcf1cqz18z795frkmbal9rgp9g2i1yrzwy";
+    inherit dependencies buildDependencies features;
+  };
+  quick_error_1_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "quick-error";
+    version = "1.2.0";
+    authors = [ "Paul Colomiets <paul@colomiets.name>" "Colin Kiegel <kiegel@gmx.de>" ];
+    sha256 = "1gc95wll0algrl2cqrym6x97sg07hslczn6wkbnkxfikrfissmga";
+    inherit dependencies buildDependencies features;
+  };
+  quote_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "quote";
+    version = "0.3.15";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg";
+    inherit dependencies buildDependencies features;
+  };
+  rand_0_3_15_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "rand";
+    version = "0.3.15";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1fs30rc1xic40s1n7l3y7pxzfifpy03mgrvhy5ggp5p7zjfv3rr8";
+    inherit dependencies buildDependencies features;
+  };
+  redox_syscall_0_1_26_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "redox_syscall";
+    version = "0.1.26";
+    authors = [ "Jeremy Soller <jackpot51@gmail.com>" ];
+    sha256 = "0hfnc05jwlkkkjpvzzfbx8anzgc2n81n92pmvb065hkqlarbjz85";
+    libName = "syscall";
+    inherit dependencies buildDependencies features;
+  };
+  regex_0_2_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "regex";
+    version = "0.2.2";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1f1zrrynfylg0vcfyfp60bybq4rp5g1yk2k7lc7fyz7mmc7k2qr7";
+    inherit dependencies buildDependencies features;
+  };
+  regex_syntax_0_4_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "regex-syntax";
+    version = "0.4.1";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "01yrsm68lj86ad1whgg1z95c2pfsvv58fz8qjcgw7mlszc0c08ls";
+    inherit dependencies buildDependencies features;
+  };
+  reqwest_0_7_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "reqwest";
+    version = "0.7.1";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "0w3x0f6wmha09jcv83dkw00gpl11afi2k4gsavl43ccfdfa4b2nh";
+    inherit dependencies buildDependencies features;
+  };
+  rustc_demangle_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "rustc-demangle";
+    version = "0.1.4";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0q7myf1m5r7cilayw5r2n5qraxwlcpdr7s2mq8c63pxrz48h24qv";
+    inherit dependencies buildDependencies features;
+  };
+  rustc_version_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "rustc_version";
+    version = "0.1.7";
+    authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
+    sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
+    inherit dependencies buildDependencies features;
+  };
+  safemem_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "safemem";
+    version = "0.2.0";
+    authors = [ "Austin Bonander <austin.bonander@gmail.com>" ];
+    sha256 = "058m251q202n479ip1h6s91yw3plg66vsk5mpaflssn6rs5hijdm";
+    inherit dependencies buildDependencies features;
+  };
+  schannel_0_1_7_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "schannel";
+    version = "0.1.7";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" "Steffen Butzer <steffen.butzer@outlook.com>" ];
+    sha256 = "1np6wzxwj8r4kqmmz0a3w9dfs2zfwh0m7mrv7xpzxkpm4c4hcn5f";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  scoped_tls_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "scoped-tls";
+    version = "0.1.0";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1j8azxa15srljafrg7wc221npvxb3700sbfk6jjav0rw2zclsnf5";
+    inherit dependencies buildDependencies features;
+  };
+  secur32_sys_0_2_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "secur32-sys";
+    version = "0.2.0";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0sp46ix9mx1156bidpfiq30xxsgmpva5jffls3259kxjqlxifcnx";
+    libName = "secur32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  security_framework_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "security-framework";
+    version = "0.1.14";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "0xxxasrqls0ssflxjl2bf6bvljig0piy13pscbgkxd4zqw7w8i7q";
+    inherit dependencies buildDependencies features;
+  };
+  security_framework_sys_0_1_14_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "security-framework-sys";
+    version = "0.1.14";
+    authors = [ "Steven Fackler <sfackler@gmail.com>" ];
+    sha256 = "15ggkd39aq01yzrg0fxchciz9gf5wncl7k3mgvqmi7vk7hfhkcw7";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  semver_0_1_20_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "semver";
+    version = "0.1.20";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
+    inherit dependencies buildDependencies features;
+  };
+  semver_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "semver";
+    version = "0.7.0";
+    authors = [ "Steve Klabnik <steve@steveklabnik.com>" "The Rust Project Developers" ];
+    sha256 = "079944bh20ldr41i96nk9b31igj555dl2d8mg51m4h0ccwric4l8";
+    inherit dependencies buildDependencies features;
+  };
+  semver_parser_0_7_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "semver-parser";
+    version = "0.7.0";
+    authors = [ "Steve Klabnik <steve@steveklabnik.com>" ];
+    sha256 = "1da66c8413yakx0y15k8c055yna5lyb6fr0fw9318kdwkrk5k12h";
+    inherit dependencies buildDependencies features;
+  };
+  serde_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde";
+    version = "1.0.10";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1p71hm8xpa7gfmhr2hzb4ah1ajhsmf3gh3i1fknf9ch8dn0qfycv";
+    inherit dependencies buildDependencies features;
+  };
+  serde_derive_1_0_10_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_derive";
+    version = "1.0.10";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1m5if144vqsjx9fk6g7b9x0cy8mam6w78yghv3fykngminklcjw6";
+    procMacro = true;
+    inherit dependencies buildDependencies features;
+  };
+  serde_derive_internals_0_15_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_derive_internals";
+    version = "0.15.1";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0s2i03rv2sppywan0z5qiif65b2wqc6lp5r5l71mz4nigrh04zrj";
+    inherit dependencies buildDependencies features;
+  };
+  serde_json_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_json";
+    version = "1.0.2";
+    authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0vabw2zciy8vy0hgj0khm1vwbvng4whwry7ylfl3ypd0inx84mn6";
+    inherit dependencies buildDependencies features;
+  };
+  serde_urlencoded_0_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "serde_urlencoded";
+    version = "0.5.1";
+    authors = [ "Anthony Ramine <n.oxyde@gmail.com>" ];
+    sha256 = "0zh2wlnapmcwqhxnnq1mdlmg8vily7j54wvj01s7cvapzg5jphdl";
+    inherit dependencies buildDependencies features;
+  };
+  skeptic_0_5_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "skeptic";
+    version = "0.5.0";
+    authors = [ "Brian Anderson <banderson@mozilla.com>" ];
+    sha256 = "06vf19309psngmx61sg33czbkx1cg9bmw0wr66n9mqdhvwa4y52d";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  slab_0_3_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "slab";
+    version = "0.3.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0y6lhjggksh57hyfd3l6p9wgv5nhvw9c6djrysq7jnalz8fih21k";
+    inherit dependencies buildDependencies features;
+  };
+  smallvec_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "smallvec";
+    version = "0.2.1";
+    authors = [ "Simon Sapin <simon.sapin@exyr.org>" ];
+    sha256 = "0rnsll9af52bpjngz0067dpm1ndqmh76i64a58fc118l4lvnjxw2";
+    libPath = "lib.rs";
+    inherit dependencies buildDependencies features;
+  };
+  strsim_0_6_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "strsim";
+    version = "0.6.0";
+    authors = [ "Danny Guo <dannyguo91@gmail.com>" ];
+    sha256 = "1lz85l6y68hr62lv4baww29yy7g8pg20dlr0lbaswxmmcb0wl7gd";
+    inherit dependencies buildDependencies features;
+  };
+  syn_0_11_11_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "syn";
+    version = "0.11.11";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502";
+    inherit dependencies buildDependencies features;
+  };
+  synom_0_11_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "synom";
+    version = "0.11.3";
+    authors = [ "David Tolnay <dtolnay@gmail.com>" ];
+    sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc";
+    inherit dependencies buildDependencies features;
+  };
+  take_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "take";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "17rfh39di5n8w9aghpic2r94cndi3dr04l60nkjylmxfxr3iwlhd";
+    inherit dependencies buildDependencies features;
+  };
+  tempdir_0_3_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tempdir";
+    version = "0.3.5";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "0rirc5prqppzgd15fm8ayan349lgk2k5iqdkrbwrwrv5pm4znsnz";
+    inherit dependencies buildDependencies features;
+  };
+  thread_local_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "thread_local";
+    version = "0.3.4";
+    authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
+    sha256 = "1y6cwyhhx2nkz4b3dziwhqdvgq830z8wjp32b40pjd8r0hxqv2jr";
+    inherit dependencies buildDependencies features;
+  };
+  time_0_1_38_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "time";
+    version = "0.1.38";
+    authors = [ "The Rust Project Developers" ];
+    sha256 = "1ws283vvz7c6jfiwn53rmc6kybapr4pjaahfxxrz232b0qzw7gcp";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_core_0_1_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-core";
+    version = "0.1.8";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "1wikhmk648j13dxy4dpi435dm943ph5bf4ldfhpxn23cbzlr2kcp";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_io_0_1_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-io";
+    version = "0.1.2";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "07ab05gmzq0xmi5h26wpvjzircax5bwfjgc3zzn62ll4rarz4pva";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_proto_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-proto";
+    version = "0.1.1";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "030q9h8pn1ngm80klff5irglxxki60hf5maw0mppmmr46k773z66";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_service_0_1_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-service";
+    version = "0.1.0";
+    authors = [ "Carl Lerche <me@carllerche.com>" ];
+    sha256 = "0c85wm5qz9fabg0k6k763j89m43n6max72d3a8sxcs940id6qmih";
+    inherit dependencies buildDependencies features;
+  };
+  tokio_tls_0_1_3_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "tokio-tls";
+    version = "0.1.3";
+    authors = [ "Carl Lerche <me@carllerche.com>" "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "0ib58y81qr64m3gg0pn7k06b71r8b05cmvakzpgfqdsw0qj08sva";
+    inherit dependencies buildDependencies features;
+  };
+  toml_0_4_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "toml";
+    version = "0.4.2";
+    authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
+    sha256 = "12v5l461czglhspc0crn29brb9p67xx7n6karrrs87slvq4xc7f1";
+    inherit dependencies buildDependencies features;
+  };
+  unicase_2_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicase";
+    version = "2.0.0";
+    authors = [ "Sean McArthur <sean.monstar@gmail.com>" ];
+    sha256 = "1nmidnfn5cwp6dr6aln2ffk8yvdfsf3si3bq1znss5swi3i5v64w";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_bidi_0_3_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-bidi";
+    version = "0.3.4";
+    authors = [ "The Servo Project Developers" ];
+    sha256 = "0lcd6jasrf8p9p0q20qyf10c6xhvw40m2c4rr105hbk6zy26nj1q";
+    libName = "unicode_bidi";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_normalization_0_1_5_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-normalization";
+    version = "0.1.5";
+    authors = [ "kwantam <kwantam@gmail.com>" ];
+    sha256 = "0hg29g86fca7b65mwk4sm5s838js6bqrl0gabadbazvbsgjam0j5";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_width_0_1_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-width";
+    version = "0.1.4";
+    authors = [ "kwantam <kwantam@gmail.com>" ];
+    sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl";
+    inherit dependencies buildDependencies features;
+  };
+  unicode_xid_0_0_4_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unicode-xid";
+    version = "0.0.4";
+    authors = [ "erick.tryzelaar <erick.tryzelaar@gmail.com>" "kwantam <kwantam@gmail.com>" ];
+    sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v";
+    inherit dependencies buildDependencies features;
+  };
+  unreachable_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "unreachable";
+    version = "1.0.0";
+    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
+    sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf";
+    inherit dependencies buildDependencies features;
+  };
+  url_1_5_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "url";
+    version = "1.5.1";
+    authors = [ "The rust-url developers" ];
+    sha256 = "1l2m7jdl2x09fdz60mjk63f61m3fjk1w5ykiadi9lxayg3bvppcw";
+    inherit dependencies buildDependencies features;
+  };
+  utf8_ranges_1_0_0_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "utf8-ranges";
+    version = "1.0.0";
+    authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
+    sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0";
+    inherit dependencies buildDependencies features;
+  };
+  void_1_0_2_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "void";
+    version = "1.0.2";
+    authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
+    sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_0_2_8_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi";
+    version = "0.2.8";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
+    inherit dependencies buildDependencies features;
+  };
+  winapi_build_0_1_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "winapi-build";
+    version = "0.1.1";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
+    libName = "build";
+    inherit dependencies buildDependencies features;
+  };
+  ws2_32_sys_0_2_1_ = { dependencies?[], buildDependencies?[], features?[] }: buildRustCrate {
+    crateName = "ws2_32-sys";
+    version = "0.2.1";
+    authors = [ "Peter Atashian <retep998@gmail.com>" ];
+    sha256 = "1zpy9d9wk11sj17fczfngcj28w4xxjs3b4n036yzpy38dxp4f7kc";
+    libName = "ws2_32";
+    build = "build.rs";
+    inherit dependencies buildDependencies features;
+  };
+  adler32_1_0_0 = { features?(adler32_1_0_0_features {}) }: adler32_1_0_0_ {};
+  adler32_1_0_0_features = f: updateFeatures f (rec {
+    adler32_1_0_0.default = (f.adler32_1_0_0.default or true);
+  }) [];
+  advapi32_sys_0_2_0 = { features?(advapi32_sys_0_2_0_features {}) }: advapi32_sys_0_2_0_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  advapi32_sys_0_2_0_features = f: updateFeatures f (rec {
+    advapi32_sys_0_2_0.default = (f.advapi32_sys_0_2_0.default or true);
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+  aho_corasick_0_6_3 = { features?(aho_corasick_0_6_3_features {}) }: aho_corasick_0_6_3_ {
+    dependencies = mapFeatures features ([ memchr_1_0_1 ]);
+  };
+  aho_corasick_0_6_3_features = f: updateFeatures f (rec {
+    aho_corasick_0_6_3.default = (f.aho_corasick_0_6_3.default or true);
+    memchr_1_0_1.default = true;
+  }) [ memchr_1_0_1_features ];
+  assert_cli_0_4_0 = { features?(assert_cli_0_4_0_features {}) }: assert_cli_0_4_0_ {
+    dependencies = mapFeatures features ([ colored_1_5_2 difference_1_0_0 error_chain_0_10_0 ]);
+    buildDependencies = mapFeatures features ([ skeptic_0_5_0 ]);
+  };
+  assert_cli_0_4_0_features = f: updateFeatures f (rec {
+    assert_cli_0_4_0.default = (f.assert_cli_0_4_0.default or true);
+    colored_1_5_2.default = true;
+    difference_1_0_0.default = true;
+    error_chain_0_10_0.default = true;
+    skeptic_0_5_0.default = true;
+  }) [ colored_1_5_2_features difference_1_0_0_features error_chain_0_10_0_features skeptic_0_5_0_features ];
+  backtrace_0_3_2 = { features?(backtrace_0_3_2_features {}) }: backtrace_0_3_2_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_2 libc_0_2_26 rustc_demangle_0_1_4 ])
+      ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ ]
+      ++ (if features.backtrace_0_3_2.backtrace-sys or false then [ backtrace_sys_0_1_11 ] else [])) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ ]
+      ++ (if features.backtrace_0_3_2.dbghelp-sys or false then [ dbghelp_sys_0_2_0 ] else [])
+      ++ (if features.backtrace_0_3_2.kernel32-sys or false then [ kernel32_sys_0_2_2 ] else [])
+      ++ (if features.backtrace_0_3_2.winapi or false then [ winapi_0_2_8 ] else [])) else []);
+    features = mkFeatures (features.backtrace_0_3_2 or {});
+  };
+  backtrace_0_3_2_features = f: updateFeatures f (rec {
+    backtrace_0_3_2.backtrace-sys =
+      (f.backtrace_0_3_2.backtrace-sys or false) ||
+      (f.backtrace_0_3_2.libbacktrace or false) ||
+      (backtrace_0_3_2.libbacktrace or false);
+    backtrace_0_3_2.coresymbolication =
+      (f.backtrace_0_3_2.coresymbolication or false) ||
+      (f.backtrace_0_3_2.default or false) ||
+      (backtrace_0_3_2.default or false);
+    backtrace_0_3_2.dbghelp =
+      (f.backtrace_0_3_2.dbghelp or false) ||
+      (f.backtrace_0_3_2.default or false) ||
+      (backtrace_0_3_2.default or false);
+    backtrace_0_3_2.dbghelp-sys =
+      (f.backtrace_0_3_2.dbghelp-sys or false) ||
+      (f.backtrace_0_3_2.dbghelp or false) ||
+      (backtrace_0_3_2.dbghelp or false);
+    backtrace_0_3_2.default = (f.backtrace_0_3_2.default or true);
+    backtrace_0_3_2.dladdr =
+      (f.backtrace_0_3_2.dladdr or false) ||
+      (f.backtrace_0_3_2.default or false) ||
+      (backtrace_0_3_2.default or false);
+    backtrace_0_3_2.kernel32-sys =
+      (f.backtrace_0_3_2.kernel32-sys or false) ||
+      (f.backtrace_0_3_2.dbghelp or false) ||
+      (backtrace_0_3_2.dbghelp or false);
+    backtrace_0_3_2.libbacktrace =
+      (f.backtrace_0_3_2.libbacktrace or false) ||
+      (f.backtrace_0_3_2.default or false) ||
+      (backtrace_0_3_2.default or false);
+    backtrace_0_3_2.libunwind =
+      (f.backtrace_0_3_2.libunwind or false) ||
+      (f.backtrace_0_3_2.default or false) ||
+      (backtrace_0_3_2.default or false);
+    backtrace_0_3_2.rustc-serialize =
+      (f.backtrace_0_3_2.rustc-serialize or false) ||
+      (f.backtrace_0_3_2.serialize-rustc or false) ||
+      (backtrace_0_3_2.serialize-rustc or false);
+    backtrace_0_3_2.serde =
+      (f.backtrace_0_3_2.serde or false) ||
+      (f.backtrace_0_3_2.serialize-serde or false) ||
+      (backtrace_0_3_2.serialize-serde or false);
+    backtrace_0_3_2.serde_derive =
+      (f.backtrace_0_3_2.serde_derive or false) ||
+      (f.backtrace_0_3_2.serialize-serde or false) ||
+      (backtrace_0_3_2.serialize-serde or false);
+    backtrace_0_3_2.winapi =
+      (f.backtrace_0_3_2.winapi or false) ||
+      (f.backtrace_0_3_2.dbghelp or false) ||
+      (backtrace_0_3_2.dbghelp or false);
+    backtrace_sys_0_1_11.default = true;
+    cfg_if_0_1_2.default = true;
+    dbghelp_sys_0_2_0.default = true;
+    kernel32_sys_0_2_2.default = true;
+    libc_0_2_26.default = true;
+    rustc_demangle_0_1_4.default = true;
+    winapi_0_2_8.default = true;
+  }) [ cfg_if_0_1_2_features libc_0_2_26_features rustc_demangle_0_1_4_features backtrace_sys_0_1_11_features dbghelp_sys_0_2_0_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
+  backtrace_sys_0_1_11 = { features?(backtrace_sys_0_1_11_features {}) }: backtrace_sys_0_1_11_ {
+    dependencies = mapFeatures features ([ libc_0_2_26 ]);
+    buildDependencies = mapFeatures features ([ gcc_0_3_51 ]);
+  };
+  backtrace_sys_0_1_11_features = f: updateFeatures f (rec {
+    backtrace_sys_0_1_11.default = (f.backtrace_sys_0_1_11.default or true);
+    gcc_0_3_51.default = true;
+    libc_0_2_26.default = true;
+  }) [ libc_0_2_26_features gcc_0_3_51_features ];
+  base64_0_6_0 = { features?(base64_0_6_0_features {}) }: base64_0_6_0_ {
+    dependencies = mapFeatures features ([ byteorder_1_1_0 safemem_0_2_0 ]);
+  };
+  base64_0_6_0_features = f: updateFeatures f (rec {
+    base64_0_6_0.default = (f.base64_0_6_0.default or true);
+    byteorder_1_1_0.default = true;
+    safemem_0_2_0.default = true;
+  }) [ byteorder_1_1_0_features safemem_0_2_0_features ];
+  bitflags_0_9_1 = { features?(bitflags_0_9_1_features {}) }: bitflags_0_9_1_ {
+    features = mkFeatures (features.bitflags_0_9_1 or {});
+  };
+  bitflags_0_9_1_features = f: updateFeatures f (rec {
+    bitflags_0_9_1.default = (f.bitflags_0_9_1.default or true);
+    bitflags_0_9_1.example_generated =
+      (f.bitflags_0_9_1.example_generated or false) ||
+      (f.bitflags_0_9_1.default or false) ||
+      (bitflags_0_9_1.default or false);
+  }) [];
+  byteorder_1_1_0 = { features?(byteorder_1_1_0_features {}) }: byteorder_1_1_0_ {
+    features = mkFeatures (features.byteorder_1_1_0 or {});
+  };
+  byteorder_1_1_0_features = f: updateFeatures f (rec {
+    byteorder_1_1_0.default = (f.byteorder_1_1_0.default or true);
+    byteorder_1_1_0.std =
+      (f.byteorder_1_1_0.std or false) ||
+      (f.byteorder_1_1_0.default or false) ||
+      (byteorder_1_1_0.default or false);
+  }) [];
+  bytes_0_4_4 = { features?(bytes_0_4_4_features {}) }: bytes_0_4_4_ {
+    dependencies = mapFeatures features ([ byteorder_1_1_0 iovec_0_1_0 ]);
+  };
+  bytes_0_4_4_features = f: updateFeatures f (rec {
+    byteorder_1_1_0.default = true;
+    bytes_0_4_4.default = (f.bytes_0_4_4.default or true);
+    iovec_0_1_0.default = true;
+  }) [ byteorder_1_1_0_features iovec_0_1_0_features ];
+  cargo_edit_0_2_0 = { features?(cargo_edit_0_2_0_features {}) }: cargo_edit_0_2_0_ {
+    dependencies = mapFeatures features ([ docopt_0_8_1 pad_0_1_4 quick_error_1_2_0 regex_0_2_2 reqwest_0_7_1 semver_0_7_0 serde_1_0_10 serde_derive_1_0_10 serde_json_1_0_2 toml_0_4_2 ]);
+    features = mkFeatures (features.cargo_edit_0_2_0 or {});
+  };
+  cargo_edit_0_2_0_features = f: updateFeatures f (rec {
+    cargo_edit_0_2_0.default = (f.cargo_edit_0_2_0.default or true);
+    docopt_0_8_1.default = true;
+    pad_0_1_4.default = true;
+    quick_error_1_2_0.default = true;
+    regex_0_2_2.default = true;
+    reqwest_0_7_1.default = true;
+    semver_0_7_0.default = true;
+    semver_0_7_0.serde = true;
+    serde_1_0_10.default = true;
+    serde_derive_1_0_10.default = true;
+    serde_json_1_0_2.default = true;
+    toml_0_4_2.default = true;
+  }) [ docopt_0_8_1_features pad_0_1_4_features quick_error_1_2_0_features regex_0_2_2_features reqwest_0_7_1_features semver_0_7_0_features serde_1_0_10_features serde_derive_1_0_10_features serde_json_1_0_2_features toml_0_4_2_features ];
+  cfg_if_0_1_2 = { features?(cfg_if_0_1_2_features {}) }: cfg_if_0_1_2_ {};
+  cfg_if_0_1_2_features = f: updateFeatures f (rec {
+    cfg_if_0_1_2.default = (f.cfg_if_0_1_2.default or true);
+  }) [];
+  colored_1_5_2 = { features?(colored_1_5_2_features {}) }: colored_1_5_2_ {
+    dependencies = mapFeatures features ([ lazy_static_0_2_8 ]);
+    features = mkFeatures (features.colored_1_5_2 or {});
+  };
+  colored_1_5_2_features = f: updateFeatures f (rec {
+    colored_1_5_2.default = (f.colored_1_5_2.default or true);
+    lazy_static_0_2_8.default = true;
+  }) [ lazy_static_0_2_8_features ];
+  core_foundation_0_2_3 = { features?(core_foundation_0_2_3_features {}) }: core_foundation_0_2_3_ {
+    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_26 ]);
+  };
+  core_foundation_0_2_3_features = f: updateFeatures f (rec {
+    core_foundation_0_2_3.default = (f.core_foundation_0_2_3.default or true);
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_26.default = true;
+  }) [ core_foundation_sys_0_2_3_features libc_0_2_26_features ];
+  core_foundation_sys_0_2_3 = { features?(core_foundation_sys_0_2_3_features {}) }: core_foundation_sys_0_2_3_ {
+    dependencies = mapFeatures features ([ libc_0_2_26 ]);
+  };
+  core_foundation_sys_0_2_3_features = f: updateFeatures f (rec {
+    core_foundation_sys_0_2_3.default = (f.core_foundation_sys_0_2_3.default or true);
+    libc_0_2_26.default = true;
+  }) [ libc_0_2_26_features ];
+  crypt32_sys_0_2_0 = { features?(crypt32_sys_0_2_0_features {}) }: crypt32_sys_0_2_0_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  crypt32_sys_0_2_0_features = f: updateFeatures f (rec {
+    crypt32_sys_0_2_0.default = (f.crypt32_sys_0_2_0.default or true);
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+  dbghelp_sys_0_2_0 = { features?(dbghelp_sys_0_2_0_features {}) }: dbghelp_sys_0_2_0_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  dbghelp_sys_0_2_0_features = f: updateFeatures f (rec {
+    dbghelp_sys_0_2_0.default = (f.dbghelp_sys_0_2_0.default or true);
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+  difference_1_0_0 = { features?(difference_1_0_0_features {}) }: difference_1_0_0_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.difference_1_0_0 or {});
+  };
+  difference_1_0_0_features = f: updateFeatures f (rec {
+    difference_1_0_0.default = (f.difference_1_0_0.default or true);
+    difference_1_0_0.getopts =
+      (f.difference_1_0_0.getopts or false) ||
+      (f.difference_1_0_0.bin or false) ||
+      (difference_1_0_0.bin or false);
+  }) [];
+  docopt_0_8_1 = { features?(docopt_0_8_1_features {}) }: docopt_0_8_1_ {
+    dependencies = mapFeatures features ([ lazy_static_0_2_8 regex_0_2_2 serde_1_0_10 serde_derive_1_0_10 strsim_0_6_0 ]);
+  };
+  docopt_0_8_1_features = f: updateFeatures f (rec {
+    docopt_0_8_1.default = (f.docopt_0_8_1.default or true);
+    lazy_static_0_2_8.default = true;
+    regex_0_2_2.default = true;
+    serde_1_0_10.default = true;
+    serde_derive_1_0_10.default = true;
+    strsim_0_6_0.default = true;
+  }) [ lazy_static_0_2_8_features regex_0_2_2_features serde_1_0_10_features serde_derive_1_0_10_features strsim_0_6_0_features ];
+  dtoa_0_4_1 = { features?(dtoa_0_4_1_features {}) }: dtoa_0_4_1_ {};
+  dtoa_0_4_1_features = f: updateFeatures f (rec {
+    dtoa_0_4_1.default = (f.dtoa_0_4_1.default or true);
+  }) [];
+  error_chain_0_10_0 = { features?(error_chain_0_10_0_features {}) }: error_chain_0_10_0_ {
+    dependencies = mapFeatures features ([ ]
+      ++ (if features.error_chain_0_10_0.backtrace or false then [ backtrace_0_3_2 ] else []));
+    features = mkFeatures (features.error_chain_0_10_0 or {});
+  };
+  error_chain_0_10_0_features = f: updateFeatures f (rec {
+    backtrace_0_3_2.default = true;
+    error_chain_0_10_0.backtrace =
+      (f.error_chain_0_10_0.backtrace or false) ||
+      (f.error_chain_0_10_0.default or false) ||
+      (error_chain_0_10_0.default or false);
+    error_chain_0_10_0.default = (f.error_chain_0_10_0.default or true);
+    error_chain_0_10_0.example_generated =
+      (f.error_chain_0_10_0.example_generated or false) ||
+      (f.error_chain_0_10_0.default or false) ||
+      (error_chain_0_10_0.default or false);
+  }) [ backtrace_0_3_2_features ];
+  foreign_types_0_2_0 = { features?(foreign_types_0_2_0_features {}) }: foreign_types_0_2_0_ {};
+  foreign_types_0_2_0_features = f: updateFeatures f (rec {
+    foreign_types_0_2_0.default = (f.foreign_types_0_2_0.default or true);
+  }) [];
+  futures_0_1_14 = { features?(futures_0_1_14_features {}) }: futures_0_1_14_ {
+    features = mkFeatures (features.futures_0_1_14 or {});
+  };
+  futures_0_1_14_features = f: updateFeatures f (rec {
+    futures_0_1_14.default = (f.futures_0_1_14.default or true);
+    futures_0_1_14.use_std =
+      (f.futures_0_1_14.use_std or false) ||
+      (f.futures_0_1_14.default or false) ||
+      (futures_0_1_14.default or false);
+    futures_0_1_14.with-deprecated =
+      (f.futures_0_1_14.with-deprecated or false) ||
+      (f.futures_0_1_14.default or false) ||
+      (futures_0_1_14.default or false);
+  }) [];
+  futures_cpupool_0_1_5 = { features?(futures_cpupool_0_1_5_features {}) }: futures_cpupool_0_1_5_ {
+    dependencies = mapFeatures features ([ futures_0_1_14 num_cpus_1_6_2 ]);
+    features = mkFeatures (features.futures_cpupool_0_1_5 or {});
+  };
+  futures_cpupool_0_1_5_features = f: updateFeatures f (rec {
+    futures_0_1_14.default = (f.futures_0_1_14.default or false);
+    futures_0_1_14.use_std = true;
+    futures_0_1_14.with-deprecated =
+      (f.futures_0_1_14.with-deprecated or false) ||
+      (futures_cpupool_0_1_5.with-deprecated or false) ||
+      (f.futures_cpupool_0_1_5.with-deprecated or false);
+    futures_cpupool_0_1_5.default = (f.futures_cpupool_0_1_5.default or true);
+    futures_cpupool_0_1_5.with-deprecated =
+      (f.futures_cpupool_0_1_5.with-deprecated or false) ||
+      (f.futures_cpupool_0_1_5.default or false) ||
+      (futures_cpupool_0_1_5.default or false);
+    num_cpus_1_6_2.default = true;
+  }) [ futures_0_1_14_features num_cpus_1_6_2_features ];
+  gcc_0_3_51 = { features?(gcc_0_3_51_features {}) }: gcc_0_3_51_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.gcc_0_3_51 or {});
+  };
+  gcc_0_3_51_features = f: updateFeatures f (rec {
+    gcc_0_3_51.default = (f.gcc_0_3_51.default or true);
+    gcc_0_3_51.rayon =
+      (f.gcc_0_3_51.rayon or false) ||
+      (f.gcc_0_3_51.parallel or false) ||
+      (gcc_0_3_51.parallel or false);
+  }) [];
+  getopts_0_2_14 = { features?(getopts_0_2_14_features {}) }: getopts_0_2_14_ {};
+  getopts_0_2_14_features = f: updateFeatures f (rec {
+    getopts_0_2_14.default = (f.getopts_0_2_14.default or true);
+  }) [];
+  httparse_1_2_3 = { features?(httparse_1_2_3_features {}) }: httparse_1_2_3_ {
+    features = mkFeatures (features.httparse_1_2_3 or {});
+  };
+  httparse_1_2_3_features = f: updateFeatures f (rec {
+    httparse_1_2_3.default = (f.httparse_1_2_3.default or true);
+    httparse_1_2_3.std =
+      (f.httparse_1_2_3.std or false) ||
+      (f.httparse_1_2_3.default or false) ||
+      (httparse_1_2_3.default or false);
+  }) [];
+  hyper_0_11_1 = { features?(hyper_0_11_1_features {}) }: hyper_0_11_1_ {
+    dependencies = mapFeatures features ([ base64_0_6_0 bytes_0_4_4 futures_0_1_14 futures_cpupool_0_1_5 httparse_1_2_3 language_tags_0_2_2 log_0_3_8 mime_0_3_2 percent_encoding_1_0_0 time_0_1_38 tokio_core_0_1_8 tokio_io_0_1_2 tokio_proto_0_1_1 tokio_service_0_1_0 unicase_2_0_0 ]);
+    features = mkFeatures (features.hyper_0_11_1 or {});
+  };
+  hyper_0_11_1_features = f: updateFeatures f (rec {
+    base64_0_6_0.default = true;
+    bytes_0_4_4.default = true;
+    futures_0_1_14.default = true;
+    futures_cpupool_0_1_5.default = true;
+    httparse_1_2_3.default = true;
+    hyper_0_11_1.default = (f.hyper_0_11_1.default or true);
+    language_tags_0_2_2.default = true;
+    log_0_3_8.default = true;
+    mime_0_3_2.default = true;
+    percent_encoding_1_0_0.default = true;
+    time_0_1_38.default = true;
+    tokio_core_0_1_8.default = true;
+    tokio_io_0_1_2.default = true;
+    tokio_proto_0_1_1.default = true;
+    tokio_service_0_1_0.default = true;
+    unicase_2_0_0.default = true;
+  }) [ base64_0_6_0_features bytes_0_4_4_features futures_0_1_14_features futures_cpupool_0_1_5_features httparse_1_2_3_features language_tags_0_2_2_features log_0_3_8_features mime_0_3_2_features percent_encoding_1_0_0_features time_0_1_38_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_proto_0_1_1_features tokio_service_0_1_0_features unicase_2_0_0_features ];
+  hyper_tls_0_1_2 = { features?(hyper_tls_0_1_2_features {}) }: hyper_tls_0_1_2_ {
+    dependencies = mapFeatures features ([ futures_0_1_14 hyper_0_11_1 native_tls_0_1_4 tokio_core_0_1_8 tokio_io_0_1_2 tokio_service_0_1_0 tokio_tls_0_1_3 ]);
+  };
+  hyper_tls_0_1_2_features = f: updateFeatures f (rec {
+    futures_0_1_14.default = true;
+    hyper_0_11_1.default = true;
+    hyper_tls_0_1_2.default = (f.hyper_tls_0_1_2.default or true);
+    native_tls_0_1_4.default = true;
+    tokio_core_0_1_8.default = true;
+    tokio_io_0_1_2.default = true;
+    tokio_service_0_1_0.default = true;
+    tokio_tls_0_1_3.default = true;
+  }) [ futures_0_1_14_features hyper_0_11_1_features native_tls_0_1_4_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_service_0_1_0_features tokio_tls_0_1_3_features ];
+  idna_0_1_4 = { features?(idna_0_1_4_features {}) }: idna_0_1_4_ {
+    dependencies = mapFeatures features ([ matches_0_1_6 unicode_bidi_0_3_4 unicode_normalization_0_1_5 ]);
+  };
+  idna_0_1_4_features = f: updateFeatures f (rec {
+    idna_0_1_4.default = (f.idna_0_1_4.default or true);
+    matches_0_1_6.default = true;
+    unicode_bidi_0_3_4.default = true;
+    unicode_normalization_0_1_5.default = true;
+  }) [ matches_0_1_6_features unicode_bidi_0_3_4_features unicode_normalization_0_1_5_features ];
+  iovec_0_1_0 = { features?(iovec_0_1_0_features {}) }: iovec_0_1_0_ {
+    dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ winapi_0_2_8 ]) else []);
+  };
+  iovec_0_1_0_features = f: updateFeatures f (rec {
+    iovec_0_1_0.default = (f.iovec_0_1_0.default or true);
+    libc_0_2_26.default = true;
+    winapi_0_2_8.default = true;
+  }) [ libc_0_2_26_features winapi_0_2_8_features ];
+  itoa_0_3_1 = { features?(itoa_0_3_1_features {}) }: itoa_0_3_1_ {};
+  itoa_0_3_1_features = f: updateFeatures f (rec {
+    itoa_0_3_1.default = (f.itoa_0_3_1.default or true);
+  }) [];
+  kernel32_sys_0_2_2 = { features?(kernel32_sys_0_2_2_features {}) }: kernel32_sys_0_2_2_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  kernel32_sys_0_2_2_features = f: updateFeatures f (rec {
+    kernel32_sys_0_2_2.default = (f.kernel32_sys_0_2_2.default or true);
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+  language_tags_0_2_2 = { features?(language_tags_0_2_2_features {}) }: language_tags_0_2_2_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.language_tags_0_2_2 or {});
+  };
+  language_tags_0_2_2_features = f: updateFeatures f (rec {
+    language_tags_0_2_2.default = (f.language_tags_0_2_2.default or true);
+    language_tags_0_2_2.heapsize =
+      (f.language_tags_0_2_2.heapsize or false) ||
+      (f.language_tags_0_2_2.heap_size or false) ||
+      (language_tags_0_2_2.heap_size or false);
+    language_tags_0_2_2.heapsize_plugin =
+      (f.language_tags_0_2_2.heapsize_plugin or false) ||
+      (f.language_tags_0_2_2.heap_size or false) ||
+      (language_tags_0_2_2.heap_size or false);
+  }) [];
+  lazy_static_0_2_8 = { features?(lazy_static_0_2_8_features {}) }: lazy_static_0_2_8_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.lazy_static_0_2_8 or {});
+  };
+  lazy_static_0_2_8_features = f: updateFeatures f (rec {
+    lazy_static_0_2_8.default = (f.lazy_static_0_2_8.default or true);
+    lazy_static_0_2_8.nightly =
+      (f.lazy_static_0_2_8.nightly or false) ||
+      (f.lazy_static_0_2_8.spin_no_std or false) ||
+      (lazy_static_0_2_8.spin_no_std or false);
+    lazy_static_0_2_8.spin =
+      (f.lazy_static_0_2_8.spin or false) ||
+      (f.lazy_static_0_2_8.spin_no_std or false) ||
+      (lazy_static_0_2_8.spin_no_std or false);
+  }) [];
+  lazycell_0_4_0 = { features?(lazycell_0_4_0_features {}) }: lazycell_0_4_0_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.lazycell_0_4_0 or {});
+  };
+  lazycell_0_4_0_features = f: updateFeatures f (rec {
+    lazycell_0_4_0.clippy =
+      (f.lazycell_0_4_0.clippy or false) ||
+      (f.lazycell_0_4_0.nightly-testing or false) ||
+      (lazycell_0_4_0.nightly-testing or false);
+    lazycell_0_4_0.default = (f.lazycell_0_4_0.default or true);
+    lazycell_0_4_0.nightly =
+      (f.lazycell_0_4_0.nightly or false) ||
+      (f.lazycell_0_4_0.nightly-testing or false) ||
+      (lazycell_0_4_0.nightly-testing or false);
+  }) [];
+  libc_0_2_26 = { features?(libc_0_2_26_features {}) }: libc_0_2_26_ {
+    features = mkFeatures (features.libc_0_2_26 or {});
+  };
+  libc_0_2_26_features = f: updateFeatures f (rec {
+    libc_0_2_26.default = (f.libc_0_2_26.default or true);
+    libc_0_2_26.use_std =
+      (f.libc_0_2_26.use_std or false) ||
+      (f.libc_0_2_26.default or false) ||
+      (libc_0_2_26.default or false);
+  }) [];
+  libflate_0_1_10 = { features?(libflate_0_1_10_features {}) }: libflate_0_1_10_ {
+    dependencies = mapFeatures features ([ adler32_1_0_0 byteorder_1_1_0 ]);
+  };
+  libflate_0_1_10_features = f: updateFeatures f (rec {
+    adler32_1_0_0.default = true;
+    byteorder_1_1_0.default = true;
+    libflate_0_1_10.default = (f.libflate_0_1_10.default or true);
+  }) [ adler32_1_0_0_features byteorder_1_1_0_features ];
+  log_0_3_8 = { features?(log_0_3_8_features {}) }: log_0_3_8_ {
+    features = mkFeatures (features.log_0_3_8 or {});
+  };
+  log_0_3_8_features = f: updateFeatures f (rec {
+    log_0_3_8.default = (f.log_0_3_8.default or true);
+    log_0_3_8.use_std =
+      (f.log_0_3_8.use_std or false) ||
+      (f.log_0_3_8.default or false) ||
+      (log_0_3_8.default or false);
+  }) [];
+  matches_0_1_6 = { features?(matches_0_1_6_features {}) }: matches_0_1_6_ {};
+  matches_0_1_6_features = f: updateFeatures f (rec {
+    matches_0_1_6.default = (f.matches_0_1_6.default or true);
+  }) [];
+  memchr_1_0_1 = { features?(memchr_1_0_1_features {}) }: memchr_1_0_1_ {
+    dependencies = mapFeatures features ([ libc_0_2_26 ]);
+    features = mkFeatures (features.memchr_1_0_1 or {});
+  };
+  memchr_1_0_1_features = f: updateFeatures f (rec {
+    libc_0_2_26.default = (f.libc_0_2_26.default or false);
+    libc_0_2_26.use_std =
+      (f.libc_0_2_26.use_std or false) ||
+      (memchr_1_0_1.use_std or false) ||
+      (f.memchr_1_0_1.use_std or false);
+    memchr_1_0_1.default = (f.memchr_1_0_1.default or true);
+    memchr_1_0_1.use_std =
+      (f.memchr_1_0_1.use_std or false) ||
+      (f.memchr_1_0_1.default or false) ||
+      (memchr_1_0_1.default or false);
+  }) [ libc_0_2_26_features ];
+  mime_0_3_2 = { features?(mime_0_3_2_features {}) }: mime_0_3_2_ {
+    dependencies = mapFeatures features ([ unicase_2_0_0 ]);
+  };
+  mime_0_3_2_features = f: updateFeatures f (rec {
+    mime_0_3_2.default = (f.mime_0_3_2.default or true);
+    unicase_2_0_0.default = true;
+  }) [ unicase_2_0_0_features ];
+  mio_0_6_9 = { features?(mio_0_6_9_features {}) }: mio_0_6_9_ {
+    dependencies = mapFeatures features ([ iovec_0_1_0 lazycell_0_4_0 log_0_3_8 net2_0_2_30 slab_0_3_0 ])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 miow_0_2_1 winapi_0_2_8 ]) else []);
+    features = mkFeatures (features.mio_0_6_9 or {});
+  };
+  mio_0_6_9_features = f: updateFeatures f (rec {
+    iovec_0_1_0.default = true;
+    kernel32_sys_0_2_2.default = true;
+    lazycell_0_4_0.default = true;
+    libc_0_2_26.default = true;
+    log_0_3_8.default = true;
+    mio_0_6_9.default = (f.mio_0_6_9.default or true);
+    mio_0_6_9.with-deprecated =
+      (f.mio_0_6_9.with-deprecated or false) ||
+      (f.mio_0_6_9.default or false) ||
+      (mio_0_6_9.default or false);
+    miow_0_2_1.default = true;
+    net2_0_2_30.default = true;
+    slab_0_3_0.default = true;
+    winapi_0_2_8.default = true;
+  }) [ iovec_0_1_0_features lazycell_0_4_0_features log_0_3_8_features net2_0_2_30_features slab_0_3_0_features libc_0_2_26_features kernel32_sys_0_2_2_features miow_0_2_1_features winapi_0_2_8_features ];
+  miow_0_2_1 = { features?(miow_0_2_1_features {}) }: miow_0_2_1_ {
+    dependencies = mapFeatures features ([ kernel32_sys_0_2_2 net2_0_2_30 winapi_0_2_8 ws2_32_sys_0_2_1 ]);
+  };
+  miow_0_2_1_features = f: updateFeatures f (rec {
+    kernel32_sys_0_2_2.default = true;
+    miow_0_2_1.default = (f.miow_0_2_1.default or true);
+    net2_0_2_30.default = (f.net2_0_2_30.default or false);
+    winapi_0_2_8.default = true;
+    ws2_32_sys_0_2_1.default = true;
+  }) [ kernel32_sys_0_2_2_features net2_0_2_30_features winapi_0_2_8_features ws2_32_sys_0_2_1_features ];
+  native_tls_0_1_4 = { features?(native_tls_0_1_4_features {}) }: native_tls_0_1_4_ {
+    dependencies = (if !(kernel == "windows" || kernel == "darwin") then mapFeatures features ([ openssl_0_9_14 ]) else [])
+      ++ (if kernel == "darwin" then mapFeatures features ([ security_framework_0_1_14 security_framework_sys_0_1_14 tempdir_0_3_5 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ schannel_0_1_7 ]) else []);
+  };
+  native_tls_0_1_4_features = f: updateFeatures f (rec {
+    native_tls_0_1_4.default = (f.native_tls_0_1_4.default or true);
+    openssl_0_9_14.default = true;
+    schannel_0_1_7.default = true;
+    security_framework_0_1_14.OSX_10_8 = true;
+    security_framework_0_1_14.default = true;
+    security_framework_sys_0_1_14.default = true;
+    tempdir_0_3_5.default = true;
+  }) [ openssl_0_9_14_features security_framework_0_1_14_features security_framework_sys_0_1_14_features tempdir_0_3_5_features schannel_0_1_7_features ];
+  net2_0_2_30 = { features?(net2_0_2_30_features {}) }: net2_0_2_30_ {
+    dependencies = mapFeatures features ([ cfg_if_0_1_2 ])
+      ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ libc_0_2_26 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ws2_32_sys_0_2_1 ]) else [])
+      ++ (if kernel == "i686-apple-darwin" then mapFeatures features ([ libc_0_2_26 ]) else [])
+      ++ (if kernel == "i686-unknown-linux-gnu" then mapFeatures features ([ libc_0_2_26 ]) else [])
+      ++ (if kernel == "x86_64-apple-darwin" then mapFeatures features ([ libc_0_2_26 ]) else [])
+      ++ (if kernel == "x86_64-unknown-linux-gnu" then mapFeatures features ([ libc_0_2_26 ]) else []);
+    features = mkFeatures (features.net2_0_2_30 or {});
+  };
+  net2_0_2_30_features = f: updateFeatures f (rec {
+    cfg_if_0_1_2.default = true;
+    kernel32_sys_0_2_2.default = true;
+    libc_0_2_26.default = true;
+    net2_0_2_30.default = (f.net2_0_2_30.default or true);
+    net2_0_2_30.duration =
+      (f.net2_0_2_30.duration or false) ||
+      (f.net2_0_2_30.default or false) ||
+      (net2_0_2_30.default or false);
+    winapi_0_2_8.default = true;
+    ws2_32_sys_0_2_1.default = true;
+  }) [ cfg_if_0_1_2_features libc_0_2_26_features kernel32_sys_0_2_2_features winapi_0_2_8_features ws2_32_sys_0_2_1_features libc_0_2_26_features libc_0_2_26_features libc_0_2_26_features libc_0_2_26_features ];
+  num_traits_0_1_40 = { features?(num_traits_0_1_40_features {}) }: num_traits_0_1_40_ {};
+  num_traits_0_1_40_features = f: updateFeatures f (rec {
+    num_traits_0_1_40.default = (f.num_traits_0_1_40.default or true);
+  }) [];
+  num_cpus_1_6_2 = { features?(num_cpus_1_6_2_features {}) }: num_cpus_1_6_2_ {
+    dependencies = mapFeatures features ([ libc_0_2_26 ]);
+  };
+  num_cpus_1_6_2_features = f: updateFeatures f (rec {
+    libc_0_2_26.default = true;
+    num_cpus_1_6_2.default = (f.num_cpus_1_6_2.default or true);
+  }) [ libc_0_2_26_features ];
+  openssl_0_9_14 = { features?(openssl_0_9_14_features {}) }: openssl_0_9_14_ {
+    dependencies = mapFeatures features ([ bitflags_0_9_1 foreign_types_0_2_0 lazy_static_0_2_8 libc_0_2_26 openssl_sys_0_9_14 ]);
+    features = mkFeatures (features.openssl_0_9_14 or {});
+  };
+  openssl_0_9_14_features = f: updateFeatures f (rec {
+    bitflags_0_9_1.default = true;
+    foreign_types_0_2_0.default = true;
+    lazy_static_0_2_8.default = true;
+    libc_0_2_26.default = true;
+    openssl_0_9_14.default = (f.openssl_0_9_14.default or true);
+    openssl_sys_0_9_14.default = true;
+  }) [ bitflags_0_9_1_features foreign_types_0_2_0_features lazy_static_0_2_8_features libc_0_2_26_features openssl_sys_0_9_14_features ];
+  openssl_sys_0_9_14 = { features?(openssl_sys_0_9_14_features {}) }: openssl_sys_0_9_14_ {
+    dependencies = mapFeatures features ([ libc_0_2_26 ]);
+    buildDependencies = mapFeatures features ([ gcc_0_3_51 pkg_config_0_3_9 ]);
+  };
+  openssl_sys_0_9_14_features = f: updateFeatures f (rec {
+    gcc_0_3_51.default = true;
+    libc_0_2_26.default = true;
+    openssl_sys_0_9_14.default = (f.openssl_sys_0_9_14.default or true);
+    pkg_config_0_3_9.default = true;
+  }) [ libc_0_2_26_features gcc_0_3_51_features pkg_config_0_3_9_features ];
+  pad_0_1_4 = { features?(pad_0_1_4_features {}) }: pad_0_1_4_ {
+    dependencies = mapFeatures features ([ unicode_width_0_1_4 ]);
+  };
+  pad_0_1_4_features = f: updateFeatures f (rec {
+    pad_0_1_4.default = (f.pad_0_1_4.default or true);
+    unicode_width_0_1_4.default = true;
+  }) [ unicode_width_0_1_4_features ];
+  percent_encoding_1_0_0 = { features?(percent_encoding_1_0_0_features {}) }: percent_encoding_1_0_0_ {};
+  percent_encoding_1_0_0_features = f: updateFeatures f (rec {
+    percent_encoding_1_0_0.default = (f.percent_encoding_1_0_0.default or true);
+  }) [];
+  pkg_config_0_3_9 = { features?(pkg_config_0_3_9_features {}) }: pkg_config_0_3_9_ {};
+  pkg_config_0_3_9_features = f: updateFeatures f (rec {
+    pkg_config_0_3_9.default = (f.pkg_config_0_3_9.default or true);
+  }) [];
+  pretty_assertions_0_2_1 = { features?(pretty_assertions_0_2_1_features {}) }: pretty_assertions_0_2_1_ {
+    dependencies = mapFeatures features ([ difference_1_0_0 ]);
+  };
+  pretty_assertions_0_2_1_features = f: updateFeatures f (rec {
+    difference_1_0_0.default = true;
+    pretty_assertions_0_2_1.default = (f.pretty_assertions_0_2_1.default or true);
+  }) [ difference_1_0_0_features ];
+  pulldown_cmark_0_0_3 = { features?(pulldown_cmark_0_0_3_features {}) }: pulldown_cmark_0_0_3_ {
+    dependencies = mapFeatures features ([ getopts_0_2_14 ]);
+  };
+  pulldown_cmark_0_0_3_features = f: updateFeatures f (rec {
+    getopts_0_2_14.default = true;
+    pulldown_cmark_0_0_3.default = (f.pulldown_cmark_0_0_3.default or true);
+  }) [ getopts_0_2_14_features ];
+  quick_error_1_2_0 = { features?(quick_error_1_2_0_features {}) }: quick_error_1_2_0_ {};
+  quick_error_1_2_0_features = f: updateFeatures f (rec {
+    quick_error_1_2_0.default = (f.quick_error_1_2_0.default or true);
+  }) [];
+  quote_0_3_15 = { features?(quote_0_3_15_features {}) }: quote_0_3_15_ {};
+  quote_0_3_15_features = f: updateFeatures f (rec {
+    quote_0_3_15.default = (f.quote_0_3_15.default or true);
+  }) [];
+  rand_0_3_15 = { features?(rand_0_3_15_features {}) }: rand_0_3_15_ {
+    dependencies = mapFeatures features ([ libc_0_2_26 ]);
+  };
+  rand_0_3_15_features = f: updateFeatures f (rec {
+    libc_0_2_26.default = true;
+    rand_0_3_15.default = (f.rand_0_3_15.default or true);
+  }) [ libc_0_2_26_features ];
+  redox_syscall_0_1_26 = { features?(redox_syscall_0_1_26_features {}) }: redox_syscall_0_1_26_ {};
+  redox_syscall_0_1_26_features = f: updateFeatures f (rec {
+    redox_syscall_0_1_26.default = (f.redox_syscall_0_1_26.default or true);
+  }) [];
+  regex_0_2_2 = { features?(regex_0_2_2_features {}) }: regex_0_2_2_ {
+    dependencies = mapFeatures features ([ aho_corasick_0_6_3 memchr_1_0_1 regex_syntax_0_4_1 thread_local_0_3_4 utf8_ranges_1_0_0 ]);
+    features = mkFeatures (features.regex_0_2_2 or {});
+  };
+  regex_0_2_2_features = f: updateFeatures f (rec {
+    aho_corasick_0_6_3.default = true;
+    memchr_1_0_1.default = true;
+    regex_0_2_2.default = (f.regex_0_2_2.default or true);
+    regex_0_2_2.simd =
+      (f.regex_0_2_2.simd or false) ||
+      (f.regex_0_2_2.simd-accel or false) ||
+      (regex_0_2_2.simd-accel or false);
+    regex_syntax_0_4_1.default = true;
+    thread_local_0_3_4.default = true;
+    utf8_ranges_1_0_0.default = true;
+  }) [ aho_corasick_0_6_3_features memchr_1_0_1_features regex_syntax_0_4_1_features thread_local_0_3_4_features utf8_ranges_1_0_0_features ];
+  regex_syntax_0_4_1 = { features?(regex_syntax_0_4_1_features {}) }: regex_syntax_0_4_1_ {};
+  regex_syntax_0_4_1_features = f: updateFeatures f (rec {
+    regex_syntax_0_4_1.default = (f.regex_syntax_0_4_1.default or true);
+  }) [];
+  reqwest_0_7_1 = { features?(reqwest_0_7_1_features {}) }: reqwest_0_7_1_ {
+    dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 hyper_0_11_1 hyper_tls_0_1_2 libflate_0_1_10 log_0_3_8 native_tls_0_1_4 serde_1_0_10 serde_json_1_0_2 serde_urlencoded_0_5_1 tokio_core_0_1_8 tokio_io_0_1_2 tokio_tls_0_1_3 url_1_5_1 ]);
+    features = mkFeatures (features.reqwest_0_7_1 or {});
+  };
+  reqwest_0_7_1_features = f: updateFeatures f (rec {
+    bytes_0_4_4.default = true;
+    futures_0_1_14.default = true;
+    hyper_0_11_1.default = true;
+    hyper_tls_0_1_2.default = true;
+    libflate_0_1_10.default = true;
+    log_0_3_8.default = true;
+    native_tls_0_1_4.default = true;
+    reqwest_0_7_1.default = (f.reqwest_0_7_1.default or true);
+    serde_1_0_10.default = true;
+    serde_json_1_0_2.default = true;
+    serde_urlencoded_0_5_1.default = true;
+    tokio_core_0_1_8.default = true;
+    tokio_io_0_1_2.default = true;
+    tokio_tls_0_1_3.default = true;
+    url_1_5_1.default = true;
+  }) [ bytes_0_4_4_features futures_0_1_14_features hyper_0_11_1_features hyper_tls_0_1_2_features libflate_0_1_10_features log_0_3_8_features native_tls_0_1_4_features serde_1_0_10_features serde_json_1_0_2_features serde_urlencoded_0_5_1_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_tls_0_1_3_features url_1_5_1_features ];
+  rustc_demangle_0_1_4 = { features?(rustc_demangle_0_1_4_features {}) }: rustc_demangle_0_1_4_ {};
+  rustc_demangle_0_1_4_features = f: updateFeatures f (rec {
+    rustc_demangle_0_1_4.default = (f.rustc_demangle_0_1_4.default or true);
+  }) [];
+  rustc_version_0_1_7 = { features?(rustc_version_0_1_7_features {}) }: rustc_version_0_1_7_ {
+    dependencies = mapFeatures features ([ semver_0_1_20 ]);
+  };
+  rustc_version_0_1_7_features = f: updateFeatures f (rec {
+    rustc_version_0_1_7.default = (f.rustc_version_0_1_7.default or true);
+    semver_0_1_20.default = true;
+  }) [ semver_0_1_20_features ];
+  safemem_0_2_0 = { features?(safemem_0_2_0_features {}) }: safemem_0_2_0_ {};
+  safemem_0_2_0_features = f: updateFeatures f (rec {
+    safemem_0_2_0.default = (f.safemem_0_2_0.default or true);
+  }) [];
+  schannel_0_1_7 = { features?(schannel_0_1_7_features {}) }: schannel_0_1_7_ {
+    dependencies = mapFeatures features ([ advapi32_sys_0_2_0 crypt32_sys_0_2_0 kernel32_sys_0_2_2 lazy_static_0_2_8 secur32_sys_0_2_0 winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  schannel_0_1_7_features = f: updateFeatures f (rec {
+    advapi32_sys_0_2_0.default = true;
+    crypt32_sys_0_2_0.default = true;
+    kernel32_sys_0_2_2.default = true;
+    lazy_static_0_2_8.default = true;
+    schannel_0_1_7.default = (f.schannel_0_1_7.default or true);
+    secur32_sys_0_2_0.default = true;
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+  }) [ advapi32_sys_0_2_0_features crypt32_sys_0_2_0_features kernel32_sys_0_2_2_features lazy_static_0_2_8_features secur32_sys_0_2_0_features winapi_0_2_8_features winapi_build_0_1_1_features ];
+  scoped_tls_0_1_0 = { features?(scoped_tls_0_1_0_features {}) }: scoped_tls_0_1_0_ {};
+  scoped_tls_0_1_0_features = f: updateFeatures f (rec {
+    scoped_tls_0_1_0.default = (f.scoped_tls_0_1_0.default or true);
+  }) [];
+  secur32_sys_0_2_0 = { features?(secur32_sys_0_2_0_features {}) }: secur32_sys_0_2_0_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  secur32_sys_0_2_0_features = f: updateFeatures f (rec {
+    secur32_sys_0_2_0.default = (f.secur32_sys_0_2_0.default or true);
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+  security_framework_0_1_14 = { features?(security_framework_0_1_14_features {}) }: security_framework_0_1_14_ {
+    dependencies = mapFeatures features ([ core_foundation_0_2_3 core_foundation_sys_0_2_3 libc_0_2_26 security_framework_sys_0_1_14 ]);
+    features = mkFeatures (features.security_framework_0_1_14 or {});
+  };
+  security_framework_0_1_14_features = f: updateFeatures f (rec {
+    core_foundation_0_2_3.default = true;
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_26.default = true;
+    security_framework_0_1_14.OSX_10_10 =
+      (f.security_framework_0_1_14.OSX_10_10 or false) ||
+      (f.security_framework_0_1_14.OSX_10_11 or false) ||
+      (security_framework_0_1_14.OSX_10_11 or false);
+    security_framework_0_1_14.OSX_10_8 =
+      (f.security_framework_0_1_14.OSX_10_8 or false) ||
+      (f.security_framework_0_1_14.OSX_10_9 or false) ||
+      (security_framework_0_1_14.OSX_10_9 or false);
+    security_framework_0_1_14.OSX_10_9 =
+      (f.security_framework_0_1_14.OSX_10_9 or false) ||
+      (f.security_framework_0_1_14.OSX_10_10 or false) ||
+      (security_framework_0_1_14.OSX_10_10 or false);
+    security_framework_0_1_14.default = (f.security_framework_0_1_14.default or true);
+    security_framework_sys_0_1_14.OSX_10_10 =
+      (f.security_framework_sys_0_1_14.OSX_10_10 or false) ||
+      (security_framework_0_1_14.OSX_10_10 or false) ||
+      (f.security_framework_0_1_14.OSX_10_10 or false);
+    security_framework_sys_0_1_14.OSX_10_11 =
+      (f.security_framework_sys_0_1_14.OSX_10_11 or false) ||
+      (security_framework_0_1_14.OSX_10_11 or false) ||
+      (f.security_framework_0_1_14.OSX_10_11 or false);
+    security_framework_sys_0_1_14.OSX_10_8 =
+      (f.security_framework_sys_0_1_14.OSX_10_8 or false) ||
+      (security_framework_0_1_14.OSX_10_8 or false) ||
+      (f.security_framework_0_1_14.OSX_10_8 or false);
+    security_framework_sys_0_1_14.OSX_10_9 =
+      (f.security_framework_sys_0_1_14.OSX_10_9 or false) ||
+      (security_framework_0_1_14.OSX_10_9 or false) ||
+      (f.security_framework_0_1_14.OSX_10_9 or false);
+    security_framework_sys_0_1_14.default = true;
+  }) [ core_foundation_0_2_3_features core_foundation_sys_0_2_3_features libc_0_2_26_features security_framework_sys_0_1_14_features ];
+  security_framework_sys_0_1_14 = { features?(security_framework_sys_0_1_14_features {}) }: security_framework_sys_0_1_14_ {
+    dependencies = mapFeatures features ([ core_foundation_sys_0_2_3 libc_0_2_26 ]);
+    features = mkFeatures (features.security_framework_sys_0_1_14 or {});
+  };
+  security_framework_sys_0_1_14_features = f: updateFeatures f (rec {
+    core_foundation_sys_0_2_3.default = true;
+    libc_0_2_26.default = true;
+    security_framework_sys_0_1_14.OSX_10_10 =
+      (f.security_framework_sys_0_1_14.OSX_10_10 or false) ||
+      (f.security_framework_sys_0_1_14.OSX_10_11 or false) ||
+      (security_framework_sys_0_1_14.OSX_10_11 or false);
+    security_framework_sys_0_1_14.OSX_10_8 =
+      (f.security_framework_sys_0_1_14.OSX_10_8 or false) ||
+      (f.security_framework_sys_0_1_14.OSX_10_9 or false) ||
+      (security_framework_sys_0_1_14.OSX_10_9 or false);
+    security_framework_sys_0_1_14.OSX_10_9 =
+      (f.security_framework_sys_0_1_14.OSX_10_9 or false) ||
+      (f.security_framework_sys_0_1_14.OSX_10_10 or false) ||
+      (security_framework_sys_0_1_14.OSX_10_10 or false);
+    security_framework_sys_0_1_14.default = (f.security_framework_sys_0_1_14.default or true);
+  }) [ core_foundation_sys_0_2_3_features libc_0_2_26_features ];
+  semver_0_1_20 = { features?(semver_0_1_20_features {}) }: semver_0_1_20_ {};
+  semver_0_1_20_features = f: updateFeatures f (rec {
+    semver_0_1_20.default = (f.semver_0_1_20.default or true);
+  }) [];
+  semver_0_7_0 = { features?(semver_0_7_0_features {}) }: semver_0_7_0_ {
+    dependencies = mapFeatures features ([ semver_parser_0_7_0 ]
+      ++ (if features.semver_0_7_0.serde or false then [ serde_1_0_10 ] else []));
+    features = mkFeatures (features.semver_0_7_0 or {});
+  };
+  semver_0_7_0_features = f: updateFeatures f (rec {
+    semver_0_7_0.default = (f.semver_0_7_0.default or true);
+    semver_0_7_0.serde =
+      (f.semver_0_7_0.serde or false) ||
+      (f.semver_0_7_0.ci or false) ||
+      (semver_0_7_0.ci or false);
+    semver_parser_0_7_0.default = true;
+    serde_1_0_10.default = true;
+  }) [ semver_parser_0_7_0_features serde_1_0_10_features ];
+  semver_parser_0_7_0 = { features?(semver_parser_0_7_0_features {}) }: semver_parser_0_7_0_ {};
+  semver_parser_0_7_0_features = f: updateFeatures f (rec {
+    semver_parser_0_7_0.default = (f.semver_parser_0_7_0.default or true);
+  }) [];
+  serde_1_0_10 = { features?(serde_1_0_10_features {}) }: serde_1_0_10_ {
+    dependencies = mapFeatures features ([]);
+    features = mkFeatures (features.serde_1_0_10 or {});
+  };
+  serde_1_0_10_features = f: updateFeatures f (rec {
+    serde_1_0_10.default = (f.serde_1_0_10.default or true);
+    serde_1_0_10.serde_derive =
+      (f.serde_1_0_10.serde_derive or false) ||
+      (f.serde_1_0_10.derive or false) ||
+      (serde_1_0_10.derive or false) ||
+      (f.serde_1_0_10.playground or false) ||
+      (serde_1_0_10.playground or false);
+    serde_1_0_10.std =
+      (f.serde_1_0_10.std or false) ||
+      (f.serde_1_0_10.default or false) ||
+      (serde_1_0_10.default or false);
+    serde_1_0_10.unstable =
+      (f.serde_1_0_10.unstable or false) ||
+      (f.serde_1_0_10.alloc or false) ||
+      (serde_1_0_10.alloc or false);
+  }) [];
+  serde_derive_1_0_10 = { features?(serde_derive_1_0_10_features {}) }: serde_derive_1_0_10_ {
+    dependencies = mapFeatures features ([ quote_0_3_15 serde_derive_internals_0_15_1 syn_0_11_11 ]);
+  };
+  serde_derive_1_0_10_features = f: updateFeatures f (rec {
+    quote_0_3_15.default = true;
+    serde_derive_1_0_10.default = (f.serde_derive_1_0_10.default or true);
+    serde_derive_internals_0_15_1.default = (f.serde_derive_internals_0_15_1.default or false);
+    syn_0_11_11.default = true;
+    syn_0_11_11.visit = true;
+  }) [ quote_0_3_15_features serde_derive_internals_0_15_1_features syn_0_11_11_features ];
+  serde_derive_internals_0_15_1 = { features?(serde_derive_internals_0_15_1_features {}) }: serde_derive_internals_0_15_1_ {
+    dependencies = mapFeatures features ([ syn_0_11_11 synom_0_11_3 ]);
+  };
+  serde_derive_internals_0_15_1_features = f: updateFeatures f (rec {
+    serde_derive_internals_0_15_1.default = (f.serde_derive_internals_0_15_1.default or true);
+    syn_0_11_11.default = (f.syn_0_11_11.default or false);
+    syn_0_11_11.parsing = true;
+    synom_0_11_3.default = true;
+  }) [ syn_0_11_11_features synom_0_11_3_features ];
+  serde_json_1_0_2 = { features?(serde_json_1_0_2_features {}) }: serde_json_1_0_2_ {
+    dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 num_traits_0_1_40 serde_1_0_10 ]);
+    features = mkFeatures (features.serde_json_1_0_2 or {});
+  };
+  serde_json_1_0_2_features = f: updateFeatures f (rec {
+    dtoa_0_4_1.default = true;
+    itoa_0_3_1.default = true;
+    num_traits_0_1_40.default = true;
+    serde_1_0_10.default = true;
+    serde_json_1_0_2.default = (f.serde_json_1_0_2.default or true);
+    serde_json_1_0_2.linked-hash-map =
+      (f.serde_json_1_0_2.linked-hash-map or false) ||
+      (f.serde_json_1_0_2.preserve_order or false) ||
+      (serde_json_1_0_2.preserve_order or false);
+  }) [ dtoa_0_4_1_features itoa_0_3_1_features num_traits_0_1_40_features serde_1_0_10_features ];
+  serde_urlencoded_0_5_1 = { features?(serde_urlencoded_0_5_1_features {}) }: serde_urlencoded_0_5_1_ {
+    dependencies = mapFeatures features ([ dtoa_0_4_1 itoa_0_3_1 serde_1_0_10 url_1_5_1 ]);
+  };
+  serde_urlencoded_0_5_1_features = f: updateFeatures f (rec {
+    dtoa_0_4_1.default = true;
+    itoa_0_3_1.default = true;
+    serde_1_0_10.default = true;
+    serde_urlencoded_0_5_1.default = (f.serde_urlencoded_0_5_1.default or true);
+    url_1_5_1.default = true;
+  }) [ dtoa_0_4_1_features itoa_0_3_1_features serde_1_0_10_features url_1_5_1_features ];
+  skeptic_0_5_0 = { features?(skeptic_0_5_0_features {}) }: skeptic_0_5_0_ {
+    dependencies = mapFeatures features ([ pulldown_cmark_0_0_3 tempdir_0_3_5 ]);
+  };
+  skeptic_0_5_0_features = f: updateFeatures f (rec {
+    pulldown_cmark_0_0_3.default = true;
+    skeptic_0_5_0.default = (f.skeptic_0_5_0.default or true);
+    tempdir_0_3_5.default = true;
+  }) [ pulldown_cmark_0_0_3_features tempdir_0_3_5_features ];
+  slab_0_3_0 = { features?(slab_0_3_0_features {}) }: slab_0_3_0_ {};
+  slab_0_3_0_features = f: updateFeatures f (rec {
+    slab_0_3_0.default = (f.slab_0_3_0.default or true);
+  }) [];
+  smallvec_0_2_1 = { features?(smallvec_0_2_1_features {}) }: smallvec_0_2_1_ {};
+  smallvec_0_2_1_features = f: updateFeatures f (rec {
+    smallvec_0_2_1.default = (f.smallvec_0_2_1.default or true);
+  }) [];
+  strsim_0_6_0 = { features?(strsim_0_6_0_features {}) }: strsim_0_6_0_ {};
+  strsim_0_6_0_features = f: updateFeatures f (rec {
+    strsim_0_6_0.default = (f.strsim_0_6_0.default or true);
+  }) [];
+  syn_0_11_11 = { features?(syn_0_11_11_features {}) }: syn_0_11_11_ {
+    dependencies = mapFeatures features ([ ]
+      ++ (if features.syn_0_11_11.quote or false then [ quote_0_3_15 ] else [])
+      ++ (if features.syn_0_11_11.synom or false then [ synom_0_11_3 ] else [])
+      ++ (if features.syn_0_11_11.unicode-xid or false then [ unicode_xid_0_0_4 ] else []));
+    features = mkFeatures (features.syn_0_11_11 or {});
+  };
+  syn_0_11_11_features = f: updateFeatures f (rec {
+    quote_0_3_15.default = true;
+    syn_0_11_11.default = (f.syn_0_11_11.default or true);
+    syn_0_11_11.parsing =
+      (f.syn_0_11_11.parsing or false) ||
+      (f.syn_0_11_11.default or false) ||
+      (syn_0_11_11.default or false);
+    syn_0_11_11.printing =
+      (f.syn_0_11_11.printing or false) ||
+      (f.syn_0_11_11.default or false) ||
+      (syn_0_11_11.default or false);
+    syn_0_11_11.quote =
+      (f.syn_0_11_11.quote or false) ||
+      (f.syn_0_11_11.printing or false) ||
+      (syn_0_11_11.printing or false);
+    syn_0_11_11.synom =
+      (f.syn_0_11_11.synom or false) ||
+      (f.syn_0_11_11.parsing or false) ||
+      (syn_0_11_11.parsing or false);
+    syn_0_11_11.unicode-xid =
+      (f.syn_0_11_11.unicode-xid or false) ||
+      (f.syn_0_11_11.parsing or false) ||
+      (syn_0_11_11.parsing or false);
+    synom_0_11_3.default = true;
+    unicode_xid_0_0_4.default = true;
+  }) [ quote_0_3_15_features synom_0_11_3_features unicode_xid_0_0_4_features ];
+  synom_0_11_3 = { features?(synom_0_11_3_features {}) }: synom_0_11_3_ {
+    dependencies = mapFeatures features ([ unicode_xid_0_0_4 ]);
+  };
+  synom_0_11_3_features = f: updateFeatures f (rec {
+    synom_0_11_3.default = (f.synom_0_11_3.default or true);
+    unicode_xid_0_0_4.default = true;
+  }) [ unicode_xid_0_0_4_features ];
+  take_0_1_0 = { features?(take_0_1_0_features {}) }: take_0_1_0_ {};
+  take_0_1_0_features = f: updateFeatures f (rec {
+    take_0_1_0.default = (f.take_0_1_0.default or true);
+  }) [];
+  tempdir_0_3_5 = { features?(tempdir_0_3_5_features {}) }: tempdir_0_3_5_ {
+    dependencies = mapFeatures features ([ rand_0_3_15 ]);
+  };
+  tempdir_0_3_5_features = f: updateFeatures f (rec {
+    rand_0_3_15.default = true;
+    tempdir_0_3_5.default = (f.tempdir_0_3_5.default or true);
+  }) [ rand_0_3_15_features ];
+  thread_local_0_3_4 = { features?(thread_local_0_3_4_features {}) }: thread_local_0_3_4_ {
+    dependencies = mapFeatures features ([ lazy_static_0_2_8 unreachable_1_0_0 ]);
+  };
+  thread_local_0_3_4_features = f: updateFeatures f (rec {
+    lazy_static_0_2_8.default = true;
+    thread_local_0_3_4.default = (f.thread_local_0_3_4.default or true);
+    unreachable_1_0_0.default = true;
+  }) [ lazy_static_0_2_8_features unreachable_1_0_0_features ];
+  time_0_1_38 = { features?(time_0_1_38_features {}) }: time_0_1_38_ {
+    dependencies = mapFeatures features ([ libc_0_2_26 ])
+      ++ (if kernel == "redox" then mapFeatures features ([ redox_syscall_0_1_26 ]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([ kernel32_sys_0_2_2 winapi_0_2_8 ]) else []);
+  };
+  time_0_1_38_features = f: updateFeatures f (rec {
+    kernel32_sys_0_2_2.default = true;
+    libc_0_2_26.default = true;
+    redox_syscall_0_1_26.default = true;
+    time_0_1_38.default = (f.time_0_1_38.default or true);
+    winapi_0_2_8.default = true;
+  }) [ libc_0_2_26_features redox_syscall_0_1_26_features kernel32_sys_0_2_2_features winapi_0_2_8_features ];
+  tokio_core_0_1_8 = { features?(tokio_core_0_1_8_features {}) }: tokio_core_0_1_8_ {
+    dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 iovec_0_1_0 log_0_3_8 mio_0_6_9 scoped_tls_0_1_0 slab_0_3_0 tokio_io_0_1_2 ]);
+  };
+  tokio_core_0_1_8_features = f: updateFeatures f (rec {
+    bytes_0_4_4.default = true;
+    futures_0_1_14.default = true;
+    iovec_0_1_0.default = true;
+    log_0_3_8.default = true;
+    mio_0_6_9.default = true;
+    scoped_tls_0_1_0.default = true;
+    slab_0_3_0.default = true;
+    tokio_core_0_1_8.default = (f.tokio_core_0_1_8.default or true);
+    tokio_io_0_1_2.default = true;
+  }) [ bytes_0_4_4_features futures_0_1_14_features iovec_0_1_0_features log_0_3_8_features mio_0_6_9_features scoped_tls_0_1_0_features slab_0_3_0_features tokio_io_0_1_2_features ];
+  tokio_io_0_1_2 = { features?(tokio_io_0_1_2_features {}) }: tokio_io_0_1_2_ {
+    dependencies = mapFeatures features ([ bytes_0_4_4 futures_0_1_14 log_0_3_8 ]);
+  };
+  tokio_io_0_1_2_features = f: updateFeatures f (rec {
+    bytes_0_4_4.default = true;
+    futures_0_1_14.default = true;
+    log_0_3_8.default = true;
+    tokio_io_0_1_2.default = (f.tokio_io_0_1_2.default or true);
+  }) [ bytes_0_4_4_features futures_0_1_14_features log_0_3_8_features ];
+  tokio_proto_0_1_1 = { features?(tokio_proto_0_1_1_features {}) }: tokio_proto_0_1_1_ {
+    dependencies = mapFeatures features ([ futures_0_1_14 log_0_3_8 net2_0_2_30 rand_0_3_15 slab_0_3_0 smallvec_0_2_1 take_0_1_0 tokio_core_0_1_8 tokio_io_0_1_2 tokio_service_0_1_0 ]);
+  };
+  tokio_proto_0_1_1_features = f: updateFeatures f (rec {
+    futures_0_1_14.default = true;
+    log_0_3_8.default = true;
+    net2_0_2_30.default = true;
+    rand_0_3_15.default = true;
+    slab_0_3_0.default = true;
+    smallvec_0_2_1.default = true;
+    take_0_1_0.default = true;
+    tokio_core_0_1_8.default = true;
+    tokio_io_0_1_2.default = true;
+    tokio_proto_0_1_1.default = (f.tokio_proto_0_1_1.default or true);
+    tokio_service_0_1_0.default = true;
+  }) [ futures_0_1_14_features log_0_3_8_features net2_0_2_30_features rand_0_3_15_features slab_0_3_0_features smallvec_0_2_1_features take_0_1_0_features tokio_core_0_1_8_features tokio_io_0_1_2_features tokio_service_0_1_0_features ];
+  tokio_service_0_1_0 = { features?(tokio_service_0_1_0_features {}) }: tokio_service_0_1_0_ {
+    dependencies = mapFeatures features ([ futures_0_1_14 ]);
+  };
+  tokio_service_0_1_0_features = f: updateFeatures f (rec {
+    futures_0_1_14.default = true;
+    tokio_service_0_1_0.default = (f.tokio_service_0_1_0.default or true);
+  }) [ futures_0_1_14_features ];
+  tokio_tls_0_1_3 = { features?(tokio_tls_0_1_3_features {}) }: tokio_tls_0_1_3_ {
+    dependencies = mapFeatures features ([ futures_0_1_14 native_tls_0_1_4 tokio_core_0_1_8 tokio_io_0_1_2 ])
+      ++ (if !(kernel == "darwin") && !(kernel == "windows") && !(kernel == "ios") then mapFeatures features ([]) else [])
+      ++ (if kernel == "darwin" || kernel == "ios" then mapFeatures features ([]) else [])
+      ++ (if kernel == "windows" then mapFeatures features ([]) else []);
+  };
+  tokio_tls_0_1_3_features = f: updateFeatures f (rec {
+    futures_0_1_14.default = true;
+    native_tls_0_1_4.default = true;
+    tokio_core_0_1_8.default = true;
+    tokio_io_0_1_2.default = true;
+    tokio_tls_0_1_3.default = (f.tokio_tls_0_1_3.default or true);
+  }) [ futures_0_1_14_features native_tls_0_1_4_features tokio_core_0_1_8_features tokio_io_0_1_2_features ];
+  toml_0_4_2 = { features?(toml_0_4_2_features {}) }: toml_0_4_2_ {
+    dependencies = mapFeatures features ([ serde_1_0_10 ]);
+  };
+  toml_0_4_2_features = f: updateFeatures f (rec {
+    serde_1_0_10.default = true;
+    toml_0_4_2.default = (f.toml_0_4_2.default or true);
+  }) [ serde_1_0_10_features ];
+  unicase_2_0_0 = { features?(unicase_2_0_0_features {}) }: unicase_2_0_0_ {
+    buildDependencies = mapFeatures features ([ rustc_version_0_1_7 ]);
+    features = mkFeatures (features.unicase_2_0_0 or {});
+  };
+  unicase_2_0_0_features = f: updateFeatures f (rec {
+    rustc_version_0_1_7.default = true;
+    unicase_2_0_0.default = (f.unicase_2_0_0.default or true);
+  }) [ rustc_version_0_1_7_features ];
+  unicode_bidi_0_3_4 = { features?(unicode_bidi_0_3_4_features {}) }: unicode_bidi_0_3_4_ {
+    dependencies = mapFeatures features ([ matches_0_1_6 ]);
+    features = mkFeatures (features.unicode_bidi_0_3_4 or {});
+  };
+  unicode_bidi_0_3_4_features = f: updateFeatures f (rec {
+    matches_0_1_6.default = true;
+    unicode_bidi_0_3_4.default = (f.unicode_bidi_0_3_4.default or true);
+    unicode_bidi_0_3_4.flame =
+      (f.unicode_bidi_0_3_4.flame or false) ||
+      (f.unicode_bidi_0_3_4.flame_it or false) ||
+      (unicode_bidi_0_3_4.flame_it or false);
+    unicode_bidi_0_3_4.flamer =
+      (f.unicode_bidi_0_3_4.flamer or false) ||
+      (f.unicode_bidi_0_3_4.flame_it or false) ||
+      (unicode_bidi_0_3_4.flame_it or false);
+    unicode_bidi_0_3_4.serde =
+      (f.unicode_bidi_0_3_4.serde or false) ||
+      (f.unicode_bidi_0_3_4.with_serde or false) ||
+      (unicode_bidi_0_3_4.with_serde or false);
+  }) [ matches_0_1_6_features ];
+  unicode_normalization_0_1_5 = { features?(unicode_normalization_0_1_5_features {}) }: unicode_normalization_0_1_5_ {};
+  unicode_normalization_0_1_5_features = f: updateFeatures f (rec {
+    unicode_normalization_0_1_5.default = (f.unicode_normalization_0_1_5.default or true);
+  }) [];
+  unicode_width_0_1_4 = { features?(unicode_width_0_1_4_features {}) }: unicode_width_0_1_4_ {
+    features = mkFeatures (features.unicode_width_0_1_4 or {});
+  };
+  unicode_width_0_1_4_features = f: updateFeatures f (rec {
+    unicode_width_0_1_4.default = (f.unicode_width_0_1_4.default or true);
+  }) [];
+  unicode_xid_0_0_4 = { features?(unicode_xid_0_0_4_features {}) }: unicode_xid_0_0_4_ {
+    features = mkFeatures (features.unicode_xid_0_0_4 or {});
+  };
+  unicode_xid_0_0_4_features = f: updateFeatures f (rec {
+    unicode_xid_0_0_4.default = (f.unicode_xid_0_0_4.default or true);
+  }) [];
+  unreachable_1_0_0 = { features?(unreachable_1_0_0_features {}) }: unreachable_1_0_0_ {
+    dependencies = mapFeatures features ([ void_1_0_2 ]);
+  };
+  unreachable_1_0_0_features = f: updateFeatures f (rec {
+    unreachable_1_0_0.default = (f.unreachable_1_0_0.default or true);
+    void_1_0_2.default = (f.void_1_0_2.default or false);
+  }) [ void_1_0_2_features ];
+  url_1_5_1 = { features?(url_1_5_1_features {}) }: url_1_5_1_ {
+    dependencies = mapFeatures features ([ idna_0_1_4 matches_0_1_6 percent_encoding_1_0_0 ]);
+    features = mkFeatures (features.url_1_5_1 or {});
+  };
+  url_1_5_1_features = f: updateFeatures f (rec {
+    idna_0_1_4.default = true;
+    matches_0_1_6.default = true;
+    percent_encoding_1_0_0.default = true;
+    url_1_5_1.default = (f.url_1_5_1.default or true);
+    url_1_5_1.encoding =
+      (f.url_1_5_1.encoding or false) ||
+      (f.url_1_5_1.query_encoding or false) ||
+      (url_1_5_1.query_encoding or false);
+    url_1_5_1.heapsize =
+      (f.url_1_5_1.heapsize or false) ||
+      (f.url_1_5_1.heap_size or false) ||
+      (url_1_5_1.heap_size or false);
+  }) [ idna_0_1_4_features matches_0_1_6_features percent_encoding_1_0_0_features ];
+  utf8_ranges_1_0_0 = { features?(utf8_ranges_1_0_0_features {}) }: utf8_ranges_1_0_0_ {};
+  utf8_ranges_1_0_0_features = f: updateFeatures f (rec {
+    utf8_ranges_1_0_0.default = (f.utf8_ranges_1_0_0.default or true);
+  }) [];
+  void_1_0_2 = { features?(void_1_0_2_features {}) }: void_1_0_2_ {
+    features = mkFeatures (features.void_1_0_2 or {});
+  };
+  void_1_0_2_features = f: updateFeatures f (rec {
+    void_1_0_2.default = (f.void_1_0_2.default or true);
+    void_1_0_2.std =
+      (f.void_1_0_2.std or false) ||
+      (f.void_1_0_2.default or false) ||
+      (void_1_0_2.default or false);
+  }) [];
+  winapi_0_2_8 = { features?(winapi_0_2_8_features {}) }: winapi_0_2_8_ {};
+  winapi_0_2_8_features = f: updateFeatures f (rec {
+    winapi_0_2_8.default = (f.winapi_0_2_8.default or true);
+  }) [];
+  winapi_build_0_1_1 = { features?(winapi_build_0_1_1_features {}) }: winapi_build_0_1_1_ {};
+  winapi_build_0_1_1_features = f: updateFeatures f (rec {
+    winapi_build_0_1_1.default = (f.winapi_build_0_1_1.default or true);
+  }) [];
+  ws2_32_sys_0_2_1 = { features?(ws2_32_sys_0_2_1_features {}) }: ws2_32_sys_0_2_1_ {
+    dependencies = mapFeatures features ([ winapi_0_2_8 ]);
+    buildDependencies = mapFeatures features ([ winapi_build_0_1_1 ]);
+  };
+  ws2_32_sys_0_2_1_features = f: updateFeatures f (rec {
+    winapi_0_2_8.default = true;
+    winapi_build_0_1_1.default = true;
+    ws2_32_sys_0_2_1.default = (f.ws2_32_sys_0_2_1.default or true);
+  }) [ winapi_0_2_8_features winapi_build_0_1_1_features ];
+}
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index ecb0708eb307..933d41278583 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -1,28 +1,27 @@
-{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, zlib, openssl }:
+{ stdenv, darwin, defaultCrateOverrides, fetchFromGitHub }:
 
-with rustPlatform;
+((import ./cargo-edit.nix).cargo_edit {}).override {
+  crateOverrides = defaultCrateOverrides // {
+    cargo-edit = attrs: rec {
+      name = "cargo-edit-${version}";
+      version = "0.2.0";
 
-buildRustPackage rec {
-  name = "cargo-edit-${version}";
-  version = "0.1.6";
+      src = fetchFromGitHub {
+        owner = "killercup";
+        repo = "cargo-edit";
+        rev = "v${version}";
+        sha256 = "1jxppbb7s50pwg24qxf79fqvm1clwm2zdnv0xlkay7y05nd5bc0c";
+      };
 
-  src = fetchFromGitHub {
-    owner = "killercup";
-    repo = "cargo-edit";
-    rev = "v${version}";
-    sha256 = "16wvix2zkpzl1hhlsvd6mkps8fw5k4n2dvjk9m10gg27pixmiync";
-  };
+      propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  buildInputs = [ zlib openssl ];
-
-  cargoSha256 = "1m4yb7472g1n900dh3xqvdcywk3v01slj3bkk7bk7a9p5x1kyjfn";
-
-  meta = with stdenv.lib; {
-    description = "A utility for managing cargo dependencies from the command line";
-    homepage = https://github.com/killercup/cargo-edit;
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ jb55 ];
-    platforms = platforms.all;
-    broken = true;
+      meta = with stdenv.lib; {
+        description = "A utility for managing cargo dependencies from the command line";
+        homepage = https://github.com/killercup/cargo-edit;
+        license = with licenses; [ mit ];
+        maintainers = with maintainers; [ gerschtli jb55 ];
+        platforms = platforms.all;
+      };
+    };
   };
 }

From 5e445b94f8327871987b9cca3e1dc7d32d33eae0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 31 May 2018 15:31:40 +0200
Subject: [PATCH 2847/3370] androidStudioPackages.{dev,canary}: 3.2.0.14 ->
 3.2.0.15

---
 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 ecc6e244a585..339a1ce7c6f1 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
   };
   latestVersion = {
-    version = "3.2.0.14"; # "Android Studio 3.2 Canary 15"
-    build = "181.4773949";
-    sha256Hash = "10lhy6sdvvh4a8kj8jyk4z9nzh67v8f5zpkwparvk3pb2s5mf3mk";
+    version = "3.2.0.15"; # "Android Studio 3.2 Canary 16"
+    build = "181.4802120";
+    sha256Hash = "0ch9jjq58k83dpnq65xyxchyik24w3fmh2v9q3kx1s028iavmpym";
   };
 in rec {
   # Old alias

From cf5a5b82d4e42ae8b178fe2da4fcf2b6a3e4883b Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 31 May 2018 15:37:05 +0200
Subject: [PATCH 2848/3370] pythonPackages.raven: 6.8.0 -> 6.9.0

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

diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index 9ec3f7c156ed..07632662d267 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -4,13 +4,13 @@
 
 buildPythonPackage rec {
   pname = "raven";
-  version = "6.8.0";
+  version = "6.9.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "raven-python";
     rev = version;
-    sha256 = "0d052nns0pf1bsazapnnrylvair37vhnjaifsdldddqv05ccfc57";
+    sha256 = "1kggp34i8gqi47khca2v5n2i32zrg66m1pga6c00yqmlbv74d84v";
   };
 
   # way too many dependencies to run tests

From 87a68c455e7a5475e2a899a6f956da521afec715 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Nov 2017 15:49:51 +0200
Subject: [PATCH 2849/3370] kernel: Allow kernel packages to specify a custom
 default defconfig

---
 pkgs/os-specific/linux/kernel/generic.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 2b44ff51ad0a..249a1ea5cefa 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -12,6 +12,9 @@
 , # The kernel version.
   version
 
+, # Allows overriding the default defconfig
+  defconfig ? null
+
 , # Overrides to the kernel config.
   extraConfig ? ""
 
@@ -85,7 +88,7 @@ let
 
     platformName = hostPlatform.platform.name;
     # e.g. "defconfig"
-    kernelBaseConfig = hostPlatform.platform.kernelBaseConfig;
+    kernelBaseConfig = if defconfig != null then defconfig else hostPlatform.platform.kernelBaseConfig;
     # e.g. "bzImage"
     kernelTarget = hostPlatform.platform.kernelTarget;
 

From 96edbe4a0eaf192d970172351a685c9b5585a7ce Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 3 Nov 2017 15:50:19 +0200
Subject: [PATCH 2850/3370] linux_rpi: Specify defconfig in kernel expression

In particular, now the mainline kernel can be built on the RPi 1 as well
(so kernelBaseConfig should always be a mainline defconfig from now on).
And RPi 2 users can now use linux_rpi without doing the
`nixpkgs.config.platform = lib.systems.platforms.raspberrypi2;` dance.
---
 lib/systems/platforms.nix                   | 4 +---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 5 +++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 32f055b6b1c5..00b2b683db0d 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -167,7 +167,7 @@ rec {
   raspberrypi = {
     name = "raspberrypi";
     kernelMajor = "2.6";
-    kernelBaseConfig = "bcmrpi_defconfig";
+    kernelBaseConfig = "bcm2835_defconfig";
     kernelDTB = true;
     kernelArch = "arm";
     kernelAutoModules = false;
@@ -254,8 +254,6 @@ rec {
 
   raspberrypi2 = armv7l-hf-multiplatform // {
     name = "raspberrypi2";
-    kernelBaseConfig = "bcm2709_defconfig";
-    kernelDTB = true;
     kernelAutoModules = false;
     kernelExtraConfig = ''
       BLK_DEV_RAM y
diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index a96a910c68c9..d85583242213 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -15,6 +15,11 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
     sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk";
   };
 
+  defconfig = {
+    "armv6l-linux" = "bcmrpi_defconfig";
+    "armv7l-linux" = "bcm2709_defconfig";
+  }.${stdenv.system} or (throw "linux_rpi not supported on '${stdenv.system}'");
+
   features = {
     efiBootStub = false;
   } // (args.features or {});

From db2988f7bd579b984d98fbdbcbc157b9eb9fd387 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 5 Nov 2017 19:32:19 +0200
Subject: [PATCH 2851/3370] platforms.nix: Clean up obsolete cruft from
 raspberrypi

Works fine without, and the 'DRM n' is actually preventing the mainline
VC4 driver from building.
---
 lib/systems/platforms.nix | 69 ---------------------------------------
 1 file changed, 69 deletions(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 00b2b683db0d..ccfad9543e3b 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -172,83 +172,14 @@ rec {
     kernelArch = "arm";
     kernelAutoModules = false;
     kernelExtraConfig = ''
-      BLK_DEV_RAM y
-      BLK_DEV_INITRD y
-      BLK_DEV_CRYPTOLOOP m
-      BLK_DEV_DM m
-      DM_CRYPT m
-      MD y
-      REISERFS_FS m
-      BTRFS_FS y
-      XFS_FS m
-      JFS_FS y
-      EXT4_FS y
-
-      IP_PNP y
-      IP_PNP_DHCP y
-      NFS_FS y
-      ROOT_NFS y
-      TUN m
-      NFS_V4 y
-      NFS_V4_1 y
-      NFS_FSCACHE y
-      NFSD m
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-      NETFILTER y
-      IP_NF_IPTABLES y
-      IP_NF_FILTER y
-      IP_NF_MATCH_ADDRTYPE y
-      IP_NF_TARGET_LOG y
-      IP_NF_MANGLE y
-      IPV6 m
-      VLAN_8021Q m
-
-      CIFS y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE y
-      CIFS_ACL y
-
-      ZRAM m
-
       # Disable OABI to have seccomp_filter (required for systemd)
       # https://github.com/raspberrypi/firmware/issues/651
       OABI_COMPAT n
-
-      # Fail to build
-      DRM n
-      SCSI_ADVANSYS n
-      USB_ISP1362_HCD n
-      SND_SOC n
-      SND_ALI5451 n
-      FB_SAVAGE n
-      SCSI_NSP32 n
-      ATA_SFF n
-      SUNGEM n
-      IRDA n
-      ATM_HE n
-      SCSI_ACARD n
-      BLK_DEV_CMD640_ENHANCED n
-
-      FUSE_FS m
-
-      # nixos mounts some cgroup
-      CGROUPS y
-
-      # Latencytop
-      LATENCYTOP y
     '';
     kernelTarget = "zImage";
     gcc = {
       arch = "armv6";
       fpu = "vfp";
-      # TODO(@Ericson2314) what is this and is it a good idea? It was
-      # used in some cross compilation examples but not others.
-      #
-      # abi = "aapcs-linux";
     };
   };
 

From 3abdd4f1e3d85bd258caa92baf42b30286109d10 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 5 Nov 2017 19:34:00 +0200
Subject: [PATCH 2852/3370] platforms.nix: Clean up obsolete cruft from
 raspberrypi2

---
 lib/systems/platforms.nix | 77 ++-------------------------------------
 1 file changed, 4 insertions(+), 73 deletions(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index ccfad9543e3b..14a0c4eb6967 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -186,79 +186,6 @@ rec {
   raspberrypi2 = armv7l-hf-multiplatform // {
     name = "raspberrypi2";
     kernelAutoModules = false;
-    kernelExtraConfig = ''
-      BLK_DEV_RAM y
-      BLK_DEV_INITRD y
-      BLK_DEV_CRYPTOLOOP m
-      BLK_DEV_DM m
-      DM_CRYPT m
-      MD y
-      REISERFS_FS m
-      BTRFS_FS y
-      XFS_FS m
-      JFS_FS y
-      EXT4_FS y
-
-      IP_PNP y
-      IP_PNP_DHCP y
-      NFS_FS y
-      ROOT_NFS y
-      TUN m
-      NFS_V4 y
-      NFS_V4_1 y
-      NFS_FSCACHE y
-      NFSD m
-      NFSD_V2_ACL y
-      NFSD_V3 y
-      NFSD_V3_ACL y
-      NFSD_V4 y
-      NETFILTER y
-      IP_NF_IPTABLES y
-      IP_NF_FILTER y
-      IP_NF_MATCH_ADDRTYPE y
-      IP_NF_TARGET_LOG y
-      IP_NF_MANGLE y
-      IPV6 m
-      VLAN_8021Q m
-
-      CIFS y
-      CIFS_XATTR y
-      CIFS_POSIX y
-      CIFS_FSCACHE y
-      CIFS_ACL y
-
-      ZRAM m
-
-      # Disable OABI to have seccomp_filter (required for systemd)
-      # https://github.com/raspberrypi/firmware/issues/651
-      OABI_COMPAT n
-
-      # Fail to build
-      DRM n
-      SCSI_ADVANSYS n
-      USB_ISP1362_HCD n
-      SND_SOC n
-      SND_ALI5451 n
-      FB_SAVAGE n
-      SCSI_NSP32 n
-      ATA_SFF n
-      SUNGEM n
-      IRDA n
-      ATM_HE n
-      SCSI_ACARD n
-      BLK_DEV_CMD640_ENHANCED n
-
-      FUSE_FS m
-
-      # nixos mounts some cgroup
-      CGROUPS y
-
-      # Latencytop
-      LATENCYTOP y
-
-      # Disable the common config Xen, it doesn't build on ARM
-      XEN? n
-    '';
     kernelTarget = "zImage";
   };
 
@@ -353,6 +280,10 @@ rec {
 
       # Hangs ODROID-XU4
       ARM_BIG_LITTLE_CPUIDLE n
+
+      # Disable OABI to have seccomp_filter (required for systemd)
+      # https://github.com/raspberrypi/firmware/issues/651
+      OABI_COMPAT n
     '';
     gcc = {
       # Some table about fpu flags:

From 27bb4da3441eed128574e5e4eabf5762fe4f68be Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 6 Nov 2017 15:26:52 +0200
Subject: [PATCH 2853/3370] platforms.nix: More rpi2 cleanup

---
 lib/systems/platforms.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix
index 14a0c4eb6967..f624a5c140a3 100644
--- a/lib/systems/platforms.nix
+++ b/lib/systems/platforms.nix
@@ -183,11 +183,8 @@ rec {
     };
   };
 
-  raspberrypi2 = armv7l-hf-multiplatform // {
-    name = "raspberrypi2";
-    kernelAutoModules = false;
-    kernelTarget = "zImage";
-  };
+  # Legacy attribute, for compatibility with existing configs only.
+  raspberrypi2 = armv7l-hf-multiplatform;
 
   scaleway-c1 = armv7l-hf-multiplatform // {
     gcc = {

From 37b90ed9af899b118758199b2e9b24b9570a30c0 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 31 May 2018 17:55:23 +0200
Subject: [PATCH 2854/3370] scdoc: init at 1.3.3 (#41315)

We'll need this to build the man pages of sway 1.0 (sway 1.0-alpha.2:
"This release replaces the asciidoc dependency with scdoc." [0]).

[0]: https://github.com/swaywm/sway/releases/tag/1.0-alpha.2
---
 pkgs/tools/typesetting/scdoc/default.nix | 32 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/typesetting/scdoc/default.nix

diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
new file mode 100644
index 000000000000..b3c256e94869
--- /dev/null
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "scdoc-${version}";
+  version = "1.3.3";
+
+  src = fetchurl {
+    url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz";
+    sha256 = "1xkfsrzpbm68522b1dml9dghnwb5dlwpf91c1i4y51rgv3hdgwdj";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "VERSION=1.2.3" "VERSION=${version}" \
+      --replace "-static" "" \
+      --replace "/usr/local" "$out"
+  '';
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A simple man page generator";
+    longDescription = ''
+      scdoc is a simple man page generator written for POSIX systems written in
+      C99.
+    '';
+    homepage = https://git.sr.ht/~sircmpwn/scdoc/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ primeos ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a43f084b56a7..b092b5113283 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4853,6 +4853,8 @@ with pkgs;
 
   scanbd = callPackage ../tools/graphics/scanbd { };
 
+  scdoc = callPackage ../tools/typesetting/scdoc { };
+
   screen = callPackage ../tools/misc/screen {
     inherit (darwin.apple_sdk.libs) utmp;
   };

From e8b7d73653259942a44e52c18a594154993477e3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 15:10:08 -0400
Subject: [PATCH 2855/3370] Revert "inkscape: disable parallelBuilding"

This reverts commit 05a6e94f3437af6c28fa8b794136e193553e98c5.
---
 pkgs/applications/graphics/inkscape/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index ae3de3494122..42257323eac6 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -51,9 +51,7 @@ stdenv.mkDerivation rec {
     libvisio libcdr libexif potrace python2Env icu
   ];
 
-  # To avoid non-deterministic build failure using make.
-  # When switching back to cmake turn parallel back on, see #40046.
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   preConfigure = ''
     intltoolize -f

From 63c0885502952375fe8e323a3c043c00ccea55d2 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 15:10:19 -0400
Subject: [PATCH 2856/3370] Revert "inkscape: fix on darwin again"

This reverts commit 047c9372ab1314d8e3fab13b9f21359fdf3a643c.
---
 pkgs/applications/graphics/inkscape/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 42257323eac6..1ddddc65b213 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -29,13 +29,10 @@ stdenv.mkDerivation rec {
     patchShebangs fix-roff-punct
 
     # XXX: Not needed for CMake:
-    ${lib.optionalString (!stdenv.isDarwin) ''
-      patchShebangs share/filters
-      patchShebangs share/palettes
-      patchShebangs share/patterns
-      patchShebangs share/symbols
-      patchShebangs share/templates
-    ''}
+    patchShebangs share/palettes
+    patchShebangs share/patterns
+    patchShebangs share/symbols
+    patchShebangs share/templates
 
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.

From 4a58ed605942e2a135cc18e9396358abe99624b9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 15:10:21 -0400
Subject: [PATCH 2857/3370] Revert "inkscape: don't patch share/filters"

This reverts commit 38364c0b07b9343e67e331bdcad1891511690c0b.
---
 pkgs/applications/graphics/inkscape/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 1ddddc65b213..ff53e5f11606 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
     patchShebangs fix-roff-punct
 
     # XXX: Not needed for CMake:
+    patchShebangs share/filters
     patchShebangs share/palettes
     patchShebangs share/patterns
     patchShebangs share/symbols

From 9e04546809f7a8ab176ae6aded2c0ca6ee1611d3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 15:10:23 -0400
Subject: [PATCH 2858/3370] Revert "inkscape: Fix build on NixOS"

This reverts commit 6c748ae749faae3ff989a800ffa5095f634a6050.
---
 pkgs/applications/graphics/inkscape/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index ff53e5f11606..8f6c096847fb 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -4,7 +4,6 @@
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
 , libvisio, libcdr, libexif, potrace, autoreconfHook
 , intltool
-, icu # Not needed for building with CMake
 , lib
 }:
 
@@ -28,13 +27,6 @@ stdenv.mkDerivation rec {
     patchShebangs share/extensions
     patchShebangs fix-roff-punct
 
-    # XXX: Not needed for CMake:
-    patchShebangs share/filters
-    patchShebangs share/palettes
-    patchShebangs share/patterns
-    patchShebangs share/symbols
-    patchShebangs share/templates
-
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
     substituteInPlace src/extension/implementation/script.cpp \
@@ -46,7 +38,7 @@ stdenv.mkDerivation rec {
     perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif potrace python2Env icu
+    libvisio libcdr libexif potrace python2Env
   ];
 
   enableParallelBuilding = true;

From 012a3a3f9b2672e3bb10fc88fb5b2df092aecb9d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 15:10:25 -0400
Subject: [PATCH 2859/3370] Revert "inkscape: typo"

This reverts commit 0a8c91a931ea270e8b1d66f592f6acba9b4b5fcf.
---
 pkgs/applications/graphics/inkscape/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 8f6c096847fb..89b2a1f171aa 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
-    maintainers = with maintainers; [ matthewbauer ];
+    maintainers = with maintainters; [ matthewbauer ];
   };
 }

From 95f917153154ef8ff4bb408ef350675f1b08e89b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 28 May 2018 15:10:27 -0400
Subject: [PATCH 2860/3370] Revert "inkscape: fix on Darwin"

This reverts commit a276d5160cc4b307d97261b419e183fb3a2214aa.
---
 .../graphics/inkscape/default.nix             | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 89b2a1f171aa..7eb9e7aa0016 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -2,15 +2,9 @@
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper
 , gsl, python2, poppler, imagemagick, libwpg, librevenge
-, libvisio, libcdr, libexif, potrace, autoreconfHook
-, intltool
-, lib
+, libvisio, libcdr, libexif, potrace, cmake
 }:
 
-# Note that originally this Nix expression used CMake to build but
-# this led to errors on MacOS of "Too many arguments". Inkscape
-# supports autoconf and we will use this for now on.
-
 let
   python2Env = python2.withPackages(ps: with ps; [ numpy lxml ]);
 in
@@ -23,6 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "1chng2yw8dsjxc9gf92aqv7plj11cav8ax321wmakmv5bb09cch6";
   };
 
+  unpackPhase = ''
+    cp $src ${name}.tar.bz2
+    tar xvjf ${name}.tar.bz2 > /dev/null
+    cd ${name}
+  '';
+
   postPatch = ''
     patchShebangs share/extensions
     patchShebangs fix-roff-punct
@@ -33,29 +33,28 @@ stdenv.mkDerivation rec {
       --replace '"python-interpreter", "python"' '"python-interpreter", "${python2Env}/bin/python"'
   '';
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook intltool ];
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     perl perlXMLParser libXft libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext
     makeWrapper gsl poppler imagemagick libwpg librevenge
-    libvisio libcdr libexif potrace python2Env
+    libvisio libcdr libexif potrace cmake python2Env
   ];
 
   enableParallelBuilding = true;
 
-  preConfigure = ''
-    intltoolize -f
-  '';
-
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
     rm "$out/share/icons/hicolor/icon-theme.cache"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkscape
+    install_name_tool -change $out/lib/libinkscape_base.dylib $out/lib/inkscape/libinkscape_base.dylib $out/bin/inkview
   '';
 
   # 0.92.3 complains about an invalid conversion from const char * to char *
   NIX_CFLAGS_COMPILE = " -fpermissive ";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     license = "GPL";
     homepage = https://www.inkscape.org;
     description = "Vector graphics editor";
@@ -66,6 +65,5 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
-    maintainers = with maintainters; [ matthewbauer ];
   };
 }

From 279fd72b339a88aac56b425bdd3dbdc6ba3f7c1c Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 29 May 2018 15:55:19 -0400
Subject: [PATCH 2861/3370] darwin.ICU: fix cctools

---
 pkgs/os-specific/darwin/apple-source-releases/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index 3120d8ae3d10..f9602b50e321 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchzip, pkgs, fetchurlBoot }:
+{ stdenv, buildPackages, fetchurl, fetchzip, pkgs, fetchurlBoot }:
 
 let
   # This attrset can in theory be computed automatically, but for that to work nicely we need
@@ -212,7 +212,11 @@ let
     dtrace-xcode    = applePackage "dtrace/xcode.nix"  "osx-10.11.6"     "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {};
     dyld            = applePackage "dyld"              "osx-10.11.6"     "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {};
     eap8021x        = applePackage "eap8021x"          "osx-10.11.6"     "0iw0qdib59hihyx2275rwq507bq2a06gaj8db4a8z1rkaj1frskh" {};
-    ICU             = applePackage "ICU"               "osx-10.10.5"     "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" {};
+
+    # Splicing is currently broken in Nixpkgs
+    # cctools need to be specified manually here to handle this
+    ICU             = applePackage "ICU"               "osx-10.10.5"     "1qihlp42n5g4dl0sn0f9pc0bkxy1452dxzf0vr6y5gqpshlzy03p" { inherit (buildPackages.darwin) cctools; };
+
     IOKit           = applePackage "IOKit"             "osx-10.11.6"     "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; };
     launchd         = applePackage "launchd"           "osx-10.9.5"      "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {};
     libauto         = applePackage "libauto"           "osx-10.9.5"      "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {};

From 9a4cb9003e32fdb1e07e044a7ee9b96bbebfa899 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 29 May 2018 21:19:45 -0400
Subject: [PATCH 2862/3370] wesnoth: supports darwin

---
 pkgs/games/wesnoth/default.nix  | 6 ++++--
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index a30685338b00..12fb0bd60b0b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer, SDL2_net, SDL2_ttf
 , pango, gettext, boost, freetype, libvorbis, fribidi, dbus, libpng, pcre, openssl, icu
+, Cocoa, Foundation
 , enableTools ? false
 }:
 
@@ -17,7 +18,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost
-                  libvorbis fribidi dbus libpng pcre openssl icu ];
+                  libvorbis fribidi dbus libpng pcre openssl icu ]
+                ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation];
 
   cmakeFlags = [ "-DENABLE_TOOLS=${if enableTools then "ON" else "OFF"}" ];
 
@@ -36,6 +38,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.wesnoth.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b092b5113283..893e74248f6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19618,7 +19618,9 @@ with pkgs;
 
   warzone2100 = libsForQt5.callPackage ../games/warzone2100 { };
 
-  wesnoth = callPackage ../games/wesnoth { };
+  wesnoth = callPackage ../games/wesnoth {
+    inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
+  };
 
   wesnoth-dev = wesnoth;
 

From 0e0435615396562c855bf8f1a949a077b60cdc2a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 29 May 2018 21:20:56 -0400
Subject: [PATCH 2863/3370] woff2: supports darwin

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

diff --git a/pkgs/development/web/woff2/default.nix b/pkgs/development/web/woff2/default.nix
index 1142c1e006b7..bda6dab14d8a 100644
--- a/pkgs/development/web/woff2/default.nix
+++ b/pkgs/development/web/woff2/default.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/google/woff2;
     license = licenses.mit;
     maintainers = [ maintainers.hrdinka ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 8950b14355b93d25cf71b3df74f8b4e7ecc93223 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 29 May 2018 21:21:09 -0400
Subject: [PATCH 2864/3370] libpeas: supports darwin

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

diff --git a/pkgs/desktops/gnome-3/core/libpeas/default.nix b/pkgs/desktops/gnome-3/core/libpeas/default.nix
index 8eaa927ac7b9..d4ca0e509ddd 100644
--- a/pkgs/desktops/gnome-3/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/core/libpeas/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "A GObject-based plugins engine";
     homepage = http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/;
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = gnome3.maintainers;
   };
 }

From 58359bab6bf5478e65042c80b501bd5f48351cdc Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Tue, 29 May 2018 21:35:38 -0400
Subject: [PATCH 2865/3370] all-packages: remove default.nix in callPackage

not needed
---
 pkgs/top-level/all-packages.nix | 118 ++++++++++++++++----------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 893e74248f6b..7ececf584e3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -142,7 +142,7 @@ with pkgs;
 
   dotnetbuildhelpers = callPackage ../build-support/dotnetbuildhelpers { };
 
-  dotnet-sdk = callPackage ../development/compilers/dotnet/sdk/default.nix { };
+  dotnet-sdk = callPackage ../development/compilers/dotnet/sdk { };
 
   dispad = callPackage ../tools/X11/dispad { };
 
@@ -358,13 +358,13 @@ with pkgs;
 
   replaceDependency = callPackage ../build-support/replace-dependency.nix { };
 
-  nukeReferences = callPackage ../build-support/nuke-references/default.nix { };
+  nukeReferences = callPackage ../build-support/nuke-references { };
 
-  removeReferencesTo = callPackage ../build-support/remove-references-to/default.nix { };
+  removeReferencesTo = callPackage ../build-support/remove-references-to { };
 
-  vmTools = callPackage ../build-support/vm/default.nix { };
+  vmTools = callPackage ../build-support/vm { };
 
-  releaseTools = callPackage ../build-support/release/default.nix { };
+  releaseTools = callPackage ../build-support/release { };
 
   composableDerivation = callPackage ../../lib/composable-derivation.nix { };
 
@@ -458,7 +458,7 @@ with pkgs;
     stdenv = clangStdenv;
   };
 
-  afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { };
+  afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { };
 
   agrep = callPackage ../tools/text/agrep { };
 
@@ -653,7 +653,7 @@ with pkgs;
 
   git-fire = callPackage ../tools/misc/git-fire { };
 
-  gitless = callPackage ../applications/version-management/gitless/default.nix { };
+  gitless = callPackage ../applications/version-management/gitless { };
 
   grc = callPackage ../tools/misc/grc { };
 
@@ -911,7 +911,7 @@ with pkgs;
 
   btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
 
-  btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe/default.nix {};
+  btrfs-dedupe = callPackage ../tools/filesystems/btrfs-dedupe {};
 
   btrbk = callPackage ../tools/backup/btrbk {
     asciidoc = asciidoc-full;
@@ -2148,7 +2148,7 @@ with pkgs;
 
   s-tar = callPackages ../tools/archivers/s-tar {};
 
-  tealdeer = callPackage ../tools/misc/tealdeer/default.nix { };
+  tealdeer = callPackage ../tools/misc/tealdeer { };
 
   uudeview = callPackage ../tools/misc/uudeview { };
 
@@ -2313,7 +2313,7 @@ with pkgs;
 
   fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
 
-  fcppt = callPackage ../development/libraries/fcppt/default.nix { };
+  fcppt = callPackage ../development/libraries/fcppt { };
 
   fcrackzip = callPackage ../tools/security/fcrackzip { };
 
@@ -2417,7 +2417,7 @@ with pkgs;
 
   fortune = callPackage ../tools/misc/fortune { };
 
-  fox = callPackage ../development/libraries/fox/default.nix {
+  fox = callPackage ../development/libraries/fox {
     libpng = libpng12;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
@@ -3036,7 +3036,7 @@ with pkgs;
 
   iftop = callPackage ../tools/networking/iftop { };
 
-  ifuse = callPackage ../tools/filesystems/ifuse/default.nix { };
+  ifuse = callPackage ../tools/filesystems/ifuse { };
 
   inherit (callPackages ../tools/filesystems/irods rec {
             stdenv = llvmPackages_38.libcxxStdenv;
@@ -3750,7 +3750,7 @@ with pkgs;
 
   mednafen-server = callPackage ../misc/emulators/mednafen/server.nix { };
 
-  mednaffe = callPackage ../misc/emulators/mednaffe/default.nix {
+  mednaffe = callPackage ../misc/emulators/mednaffe {
     gtk2 = null;
   };
 
@@ -3758,9 +3758,9 @@ with pkgs;
 
   megatools = callPackage ../tools/networking/megatools { };
 
-  memo = callPackage ../applications/misc/memo/default.nix { };
+  memo = callPackage ../applications/misc/memo { };
 
-  mencal = callPackage ../applications/misc/mencal/default.nix { } ;
+  mencal = callPackage ../applications/misc/mencal { } ;
 
   metamorphose2 = callPackage ../applications/misc/metamorphose2 { };
 
@@ -5362,7 +5362,7 @@ with pkgs;
 
   oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { };
 
-  twilight = callPackage ../tools/graphics/twilight/default.nix {
+  twilight = callPackage ../tools/graphics/twilight {
     libX11 = xorg.libX11;
   };
 
@@ -6439,7 +6439,7 @@ with pkgs;
   stack = haskell.lib.justStaticExecutables haskellPackages.stack;
   hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;
 
-  all-cabal-hashes = callPackage ../data/misc/hackage/default.nix { };
+  all-cabal-hashes = callPackage ../data/misc/hackage { };
 
   purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
   psc-package = haskell.lib.justStaticExecutables
@@ -6535,7 +6535,7 @@ with pkgs;
 
   intercal = callPackage ../development/compilers/intercal { };
 
-  irony-server = callPackage ../development/tools/irony-server/default.nix {
+  irony-server = callPackage ../development/tools/irony-server {
     # The repository of irony to use -- must match the version of the employed emacs
     # package.  Wishing we could merge it into one irony package, to avoid this issue,
     # but its emacs-side expression is autogenerated, and we can't hook into it (other
@@ -6887,7 +6887,7 @@ with pkgs;
 
   rgbds = callPackage ../development/compilers/rgbds { };
 
-  rtags = callPackage ../development/tools/rtags/default.nix {
+  rtags = callPackage ../development/tools/rtags {
     inherit (darwin) apple_sdk;
   };
 
@@ -7961,7 +7961,7 @@ with pkgs;
 
   flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { };
   flex_2_6_1 = callPackage ../development/tools/parsing/flex/2.6.1.nix { };
-  flex = callPackage ../development/tools/parsing/flex/default.nix { };
+  flex = callPackage ../development/tools/parsing/flex { };
 
   flexcpp = callPackage ../development/tools/parsing/flexc++ { };
 
@@ -9201,7 +9201,7 @@ with pkgs;
   gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; });
 
   #GMP ex-satellite, so better keep it near gmp
-  mpfr = callPackage ../development/libraries/mpfr/default.nix { };
+  mpfr = callPackage ../development/libraries/mpfr { };
 
   mpfi = callPackage ../development/libraries/mpfi { };
 
@@ -9535,7 +9535,7 @@ with pkgs;
     libpng = libpng12;
   };
 
-  imv = callPackage ../applications/graphics/imv/default.nix { };
+  imv = callPackage ../applications/graphics/imv { };
 
   iml = callPackage ../development/libraries/iml { };
 
@@ -10492,7 +10492,7 @@ with pkgs;
 
   libunibreak = callPackage ../development/libraries/libunibreak { };
 
-  libunique = callPackage ../development/libraries/libunique/default.nix { };
+  libunique = callPackage ../development/libraries/libunique { };
   libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome2) gtkdoc; };
 
   liburcu = callPackage ../development/libraries/liburcu { };
@@ -11009,7 +11009,7 @@ with pkgs;
 
   ortp = callPackage ../development/libraries/ortp { };
 
-  openrct2 = callPackage ../games/openrct2/default.nix { };
+  openrct2 = callPackage ../games/openrct2 { };
 
   osm-gps-map = callPackage ../development/libraries/osm-gps-map { };
 
@@ -11966,14 +11966,14 @@ with pkgs;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9/default.nix {
+  wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
     inherit (gnome2) GConf;
     inherit (darwin.stubs) setfile;
     inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
     withMesa = lib.elem system lib.platforms.mesaPlatforms;
   };
 
-  wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0/default.nix {
+  wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 {
     inherit (gnome2) GConf;
     inherit (darwin.stubs) setfile;
     inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
@@ -12369,7 +12369,7 @@ with pkgs;
 
   appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
 
-  archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { };
+  archiveopteryx = callPackage ../servers/mail/archiveopteryx { };
 
   atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { };
   atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { };
@@ -12467,7 +12467,7 @@ with pkgs;
 
   exhibitor = callPackage ../servers/exhibitor { };
 
-  hyp = callPackage ../servers/http/hyp/default.nix { };
+  hyp = callPackage ../servers/http/hyp { };
 
   prosody = callPackage ../servers/xmpp/prosody {
     # _compat can probably be removed on next minor version after 0.10.0
@@ -12562,11 +12562,11 @@ with pkgs;
 
   mediatomb = callPackage ../servers/mediatomb { };
 
-  meguca = callPackage ../servers/meguca/default.nix { };
+  meguca = callPackage ../servers/meguca { };
 
   memcached = callPackage ../servers/memcached {};
 
-  meteor = callPackage ../servers/meteor/default.nix { };
+  meteor = callPackage ../servers/meteor { };
 
   minio = callPackage ../servers/minio { };
 
@@ -12804,12 +12804,12 @@ with pkgs;
 
   vmfs-tools = callPackage ../tools/filesystems/vmfs-tools { };
 
-  pgbouncer = callPackage ../servers/sql/pgbouncer/default.nix { };
+  pgbouncer = callPackage ../servers/sql/pgbouncer { };
 
   pgpool93 = pgpool.override { postgresql = postgresql93; };
   pgpool94 = pgpool.override { postgresql = postgresql94; };
 
-  pgpool = callPackage ../servers/sql/pgpool/default.nix {
+  pgpool = callPackage ../servers/sql/pgpool {
     pam = if stdenv.isLinux then pam else null;
     libmemcached = null; # Detection is broken upstream
   };
@@ -12878,7 +12878,7 @@ with pkgs;
   };
 
   radicale1 = callPackage ../servers/radicale/1.x.nix { };
-  radicale2 = callPackage ../servers/radicale/default.nix { };
+  radicale2 = callPackage ../servers/radicale { };
 
   radicale = radicale2;
 
@@ -13053,7 +13053,7 @@ with pkgs;
     inherit (darwin.apple_sdk.libs) Xplugin;
   };
 
-  xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg/default.nix {
+  xorg = recurseIntoAttrs (lib.callPackagesWith pkgs ../servers/x11/xorg {
     inherit clangStdenv fetchurl fetchgit fetchpatch stdenv intltool freetype fontconfig
       libxslt expat libpng zlib perl mesa_drivers spice-protocol libunwind
       dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook
@@ -13588,7 +13588,7 @@ with pkgs;
 
     lttng-modules = callPackage ../os-specific/linux/lttng-modules { };
 
-    broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };
+    broadcom_sta = callPackage ../os-specific/linux/broadcom-sta { };
 
     tbs = callPackage ../os-specific/linux/tbs { };
 
@@ -14155,7 +14155,7 @@ with pkgs;
 
   eudev = callPackage ../os-specific/linux/eudev {};
 
-  libudev0-shim = callPackage ../os-specific/linux/libudev0-shim/default.nix { };
+  libudev0-shim = callPackage ../os-specific/linux/libudev0-shim { };
 
   udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
   udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
@@ -14786,7 +14786,7 @@ with pkgs;
     useUnrar = config.ahoviewer.useUnrar or false;
   };
 
-  airwave = callPackage ../applications/audio/airwave/default.nix { };
+  airwave = callPackage ../applications/audio/airwave { };
 
   alembic = callPackage ../development/libraries/alembic {};
 
@@ -15622,7 +15622,7 @@ with pkgs;
 
   epdfview = callPackage ../applications/misc/epdfview { };
 
-  epeg = callPackage ../applications/graphics/epeg/default.nix { };
+  epeg = callPackage ../applications/graphics/epeg { };
 
   inherit (gnome3) epiphany;
 
@@ -15739,7 +15739,7 @@ with pkgs;
 
   ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { };
 
-  gitweb = callPackage ../applications/version-management/git-and-tools/gitweb/default.nix { };
+  gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { };
 
   gksu = callPackage ../applications/misc/gksu { };
 
@@ -16318,7 +16318,7 @@ with pkgs;
 
   i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { };
 
-  i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled/default.nix { };
+  i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { };
 
   i3minator = callPackage ../tools/misc/i3minator { };
 
@@ -16446,9 +16446,9 @@ with pkgs;
 
   bip = callPackage ../applications/networking/irc/bip { };
 
-  j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop/default.nix { };
+  j4-dmenu-desktop = callPackage ../applications/misc/j4-dmenu-desktop { };
 
-  jabref = callPackage ../applications/office/jabref/default.nix { };
+  jabref = callPackage ../applications/office/jabref { };
 
   jack_capture = callPackage ../applications/audio/jack-capture { };
 
@@ -17469,7 +17469,7 @@ with pkgs;
 
   psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { };
 
-  psol = callPackage ../development/libraries/psol/default.nix { };
+  psol = callPackage ../development/libraries/psol { };
 
   pstree = callPackage ../applications/misc/pstree { };
 
@@ -17964,7 +17964,7 @@ with pkgs;
 
   ltunify = callPackage ../tools/misc/ltunify { };
 
-  src = callPackage ../applications/version-management/src/default.nix {
+  src = callPackage ../applications/version-management/src {
     git = gitMinimal;
   };
 
@@ -17995,7 +17995,7 @@ with pkgs;
 
   sublime3-dev = sublime3Packages.sublime3-dev;
 
-  inherit (callPackages ../applications/version-management/subversion/default.nix {
+  inherit (callPackages ../applications/version-management/subversion {
       bdbSupport = true;
       httpServer = false;
       httpSupport = true;
@@ -18672,7 +18672,7 @@ with pkgs;
 
   xbindkeys = callPackage ../tools/X11/xbindkeys { };
 
-  xbindkeys-config = callPackage ../tools/X11/xbindkeys-config/default.nix {
+  xbindkeys-config = callPackage ../tools/X11/xbindkeys-config {
     gtk = gtk2;
   };
 
@@ -19529,7 +19529,7 @@ with pkgs;
 
   tennix = callPackage ../games/tennix { };
 
-  terraria-server = callPackage ../games/terraria-server/default.nix { };
+  terraria-server = callPackage ../games/terraria-server { };
 
   tibia = callPackage_i686 ../games/tibia { };
 
@@ -19565,7 +19565,7 @@ with pkgs;
 
   ultrastar-manager = libsForQt5.callPackage ../tools/misc/ultrastar-manager { };
 
-  ultrastardx = callPackage ../games/ultrastardx/default.nix {
+  ultrastardx = callPackage ../games/ultrastardx {
     ffmpeg = ffmpeg_2;
   };
 
@@ -19874,7 +19874,7 @@ with pkgs;
     stdenv = overrideCC stdenv gcc49;
   };
 
-  bedtools = callPackage ../applications/science/biology/bedtools/default.nix { };
+  bedtools = callPackage ../applications/science/biology/bedtools { };
 
   bcftools = callPackage ../applications/science/biology/bcftools { };
 
@@ -19906,7 +19906,7 @@ with pkgs;
 
   kallisto = callPackage ../applications/science/biology/kallisto { };
 
-  muscle = callPackage ../applications/science/biology/muscle/default.nix { };
+  muscle = callPackage ../applications/science/biology/muscle { };
 
   n3 = callPackage ../applications/science/biology/N3 {
     inherit (perlPackages) perl GetoptTabular MNI-Perllib;
@@ -19942,13 +19942,13 @@ with pkgs;
 
   paml = callPackage ../applications/science/biology/paml { };
 
-  picard-tools = callPackage ../applications/science/biology/picard-tools/default.nix { };
+  picard-tools = callPackage ../applications/science/biology/picard-tools { };
 
-  platypus = callPackage ../applications/science/biology/platypus/default.nix { };
+  platypus = callPackage ../applications/science/biology/platypus { };
 
-  plink = callPackage ../applications/science/biology/plink/default.nix { };
+  plink = callPackage ../applications/science/biology/plink { };
 
-  plink-ng = callPackage ../applications/science/biology/plink-ng/default.nix { };
+  plink-ng = callPackage ../applications/science/biology/plink-ng { };
 
   raxml = callPackage ../applications/science/biology/raxml { };
 
@@ -19956,18 +19956,18 @@ with pkgs;
     mpi = true;
   });
 
-  samtools = callPackage ../applications/science/biology/samtools/default.nix { };
+  samtools = callPackage ../applications/science/biology/samtools { };
   samtools_0_1_19 = callPackage ../applications/science/biology/samtools/samtools_0_1_19.nix {
     stdenv = gccStdenv;
   };
 
-  snpeff = callPackage ../applications/science/biology/snpeff/default.nix { };
+  snpeff = callPackage ../applications/science/biology/snpeff { };
 
   star = callPackage ../applications/science/biology/star { };
 
-  varscan = callPackage ../applications/science/biology/varscan/default.nix { };
+  varscan = callPackage ../applications/science/biology/varscan { };
 
-  bwa = callPackage ../applications/science/biology/bwa/default.nix { };
+  bwa = callPackage ../applications/science/biology/bwa { };
 
   ### SCIENCE/MACHINE LEARNING
 
@@ -20252,7 +20252,7 @@ with pkgs;
 
   picosat = callPackage ../applications/science/logic/picosat {};
 
-  libpoly = callPackage ../applications/science/logic/poly/default.nix {};
+  libpoly = callPackage ../applications/science/logic/poly {};
 
   prooftree = (with ocamlPackages_4_01_0;
     callPackage  ../applications/science/logic/prooftree {

From ced1670092402319ad3260d82b41bd5306a3c266 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 30 May 2018 17:16:58 -0400
Subject: [PATCH 2866/3370] haskell: disable language-nix on i686 linux

see https://github.com/peti/language-nix/issues/4 for discusssion
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index a88cd1c789ed..387983003af3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -347,6 +347,7 @@ self: super: {
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
+  language-nix = overrideCabal super.language-nix (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; }); # Tests crash on 32-bit linux; see https://github.com/peti/language-nix/issues/4
   ldap-client = dontCheck super.ldap-client;
   lensref = dontCheck super.lensref;
   lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25

From 753c63dbc11bbd8a090a953acb8f9669f7f0ecf0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 30 May 2018 17:53:54 -0400
Subject: [PATCH 2867/3370] qemu-flags: default to qemu-kvm

this is the "generic" version & should work everywhere.

also add darwin case
---
 nixos/lib/qemu-flags.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix
index e4c95ebdfb0d..6f61c64a832e 100644
--- a/nixos/lib/qemu-flags.nix
+++ b/nixos/lib/qemu-flags.nix
@@ -13,9 +13,9 @@
         else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'";
 
   qemuBinary = qemuPkg: {
-    "i686-linux" = "${qemuPkg}/bin/qemu-kvm";
     "x86_64-linux" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
     "armv7l-linux" = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host";
     "aarch64-linux" = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host";
-  }.${pkgs.stdenv.system} or (throw "Unknown QEMU binary for '${pkgs.stdenv.system}'");
+    "x86_64-darwin" = "${qemuPkg}/bin/qemu-kvm -cpu kvm64";
+  }.${pkgs.stdenv.system} or "${qemuPkg}/bin/qemu-kvm";
 }

From ee1d6114a8926b96651e1938ad8dd6464db84339 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 30 May 2018 21:39:14 -0400
Subject: [PATCH 2868/3370] emacsMacport: 25.3 -> 26.1

---
 pkgs/applications/editors/emacs/macport.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 70c723b40dae..c5cb0f4655e6 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -4,26 +4,26 @@
 }:
 
 stdenv.mkDerivation rec {
-  emacsVersion = "25.3";
+  emacsVersion = "26.1";
   emacsName = "emacs-${emacsVersion}";
-  macportVersion = "6.8";
+  macportVersion = "7.0";
   name = "emacs-mac-${emacsVersion}-${macportVersion}";
 
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = "mirror:///gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "02y00y9q42g1iqgz5qhmsja75hwxd88yrn9zp14lanay0zkwafi5";
+    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
+    sha256 = "0b6k1wq44rc8gkvxhi1bbjxbz3cwg29qbq8mklq2az6p1hjgrx0w";
   };
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz";
-    sha256 = "167lgl76jz1bq6whb9ajshhw5v9bbw9ci4lji4qlmd5nrwnb7kqg";
+    sha256 = "02dbasiv1szvlzi0avb7bi9xwpw2lssj3kzbn8pi5vmziqhvgfhz";
   };
 
   hiresSrc = fetchurl {
-    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-2.0.tar.gz";
-    sha256 = "1ari8n3y1d4hdl9npg3c3hk27x7cfkwfgyhgzn1vlqkrdah4z434";
+    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/emacs-hires-icons-3.0.tar.gz";
+    sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk";
   };
 
   enableParallelBuilding = true;

From 2f68e86ce6b6018828bb52098c72aa464d9120ca Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 30 May 2018 22:27:24 -0400
Subject: [PATCH 2869/3370] zsh: only do promptInit when TERM!=dumb

This allows tramp to be used correctly when default shell is zsh.
---
 nixos/modules/programs/zsh/zsh.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix
index f689250dc61f..662b463d572e 100644
--- a/nixos/modules/programs/zsh/zsh.nix
+++ b/nixos/modules/programs/zsh/zsh.nix
@@ -69,7 +69,9 @@ in
 
       promptInit = mkOption {
         default = ''
-          autoload -U promptinit && promptinit && prompt walters
+          if [ "$TERM" != dumb ]; then
+            autoload -U promptinit && promptinit && prompt walters
+          fi
         '';
         description = ''
           Shell script code used to initialise the zsh prompt.

From f492246df2f21ebb281716c76153fb271e456811 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 30 May 2018 22:36:26 -0400
Subject: [PATCH 2870/3370] all-packages remove unused override

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ececf584e3b..3b02a62f7f26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19077,7 +19077,7 @@ with pkgs;
 
   dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { });
 
-  dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { };
+  dwarf-fortress = dwarf-fortress-packages.dwarf-fortress;
 
   dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
 

From e557a432e07441a508544fca2aba3be6fd9860c0 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 30 May 2018 23:06:28 -0400
Subject: [PATCH 2871/3370] cairo: fix build inputs

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

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 74ae4abaedf9..7f6419272dd9 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -25,6 +25,9 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
+  ];
+
+  buildInputs = [
     libiconv
     libintl
   ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

From 03b3148beb975645b762bfd9f6961d967a926a5e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 11:11:27 -0400
Subject: [PATCH 2872/3370] ffmpeg: fix 3.4 on darwin

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b02a62f7f26..b9d7ec7c5d4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8920,6 +8920,7 @@ with pkgs;
   };
   ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
+    stdenv = gccStdenv;
   };
   ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;

From 85ae7137ac6a1623be90c8f0897566367d300c12 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 11:41:14 -0400
Subject: [PATCH 2873/3370] Revert commit
 4b2f3971981272b79da7f87b639ca8854a6ea89c

This reverts commit 4b2f3971981272b79da7f87b639ca8854a6ea89c. It
updated gdk_pixbuf to 2.36.12 but unfortunately broke macOS builds.
The new mime sniffing is not working correctly so that .png files
cannot be built.

Fixes #41314

/cc @jtojnar @lnl7
---
 .../libraries/gdk-pixbuf/default.nix          | 72 +++++--------------
 .../gdk-pixbuf/installed-tests-path.patch     | 13 ----
 .../gdk-pixbuf/no-mime-sniffing.patch         | 18 -----
 3 files changed, 18 insertions(+), 85 deletions(-)
 delete mode 100644 pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
 delete mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 849e72d9a976..7660d6481c3c 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -4,72 +4,39 @@
 
 let
   pname = "gdk-pixbuf";
-  version = "2.36.12";
+  version = "2.36.7";
+  # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
+  # which apparently requires access to shared-mime-info files during runtime.
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball
-  # src = fetchurl {
-  #   url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-  #   sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
-  # };
-  src = fetchgit {
-    url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git;
-    rev = version;
-    sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+    sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
   };
 
-  patches = [
-    # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
-    # which requires access to shared-mime-info files during runtime.
-    # For now, we are patching the build script to avoid the dependency.
-    ./no-mime-sniffing.patch
-
-    # Fix installed tests with meson
-    # https://bugzilla.gnome.org/show_bug.cgi?id=795527
-    (fetchurl {
-      url = https://bugzilla.gnome.org/attachment.cgi?id=371381;
-      sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn";
-    })
-
-    # Add missing test file bug753605-atsize.jpg
-    (fetchpatch {
-      url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch;
-      sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0";
-    })
-
-    # Move installed tests to a separate output
-    ./installed-tests-path.patch
-  ];
-
-  outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
+  outputs = [ "out" "dev" "devdoc" ];
 
   setupHook = ./setup-hook.sh;
 
-  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 ];
+  enableParallelBuilding = true;
 
-  nativeBuildInputs = [
-    meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
-    gtk-doc gobjectIntrospection makeWrapper
-  ]
+  # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
+  buildInputs = [ libX11 gobjectIntrospection ];
+
+  nativeBuildInputs = [ pkgconfig ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  mesonFlags = [
-    "-Ddocs=true"
-    "-Djasper=true"
-    "-Dx11=true"
-    "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
-  ];
+  configureFlags = "--with-libjasper --with-x11"
+    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
+    ;
 
-  postPatch = ''
-    chmod +x build-aux/* # patchShebangs only applies to executables
-    patchShebangs build-aux
-
-    substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests"
+  # on darwin, tests don't link
+  preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
+    substituteInPlace Makefile --replace "docs tests" "docs"
   '';
 
   postInstall =
@@ -77,9 +44,6 @@ stdenv.mkDerivation rec {
     ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
-
-      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
-      $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The fixDarwinDylibNames hook doesn't patch library references or binaries.
diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
deleted file mode 100644
index 1da2b0a10dcd..000000000000
--- a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -85,8 +85,8 @@
-   'aero.gif',
- ]
- 
--installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name())
--installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name())
-+installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', meson.project_name())
-+installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', meson.project_name())
- 
- install_data(test_data, install_dir: installed_test_bindir)
- install_subdir('test-images', install_dir: installed_test_bindir)
diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
deleted file mode 100644
index 9896e25acda1..000000000000
--- a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -186,13 +186,8 @@
- gmodule_dep = dependency('gmodule-no-export-2.0')
- gio_dep = dependency('gio-2.0')
- 
--# On non-Windows/macOS systems we always required shared-mime-info and GIO
--if host_system != 'windows' and host_system != 'darwin'
--  shared_mime_dep = dependency('shared-mime-info')
--  gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1)
--else
--  shared_mime_dep = []
--endif
-+# No MIME sniffing for now
-+shared_mime_dep = []
- 
- gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ]
- 

From 050557ef8ac21f0458f23a902f0f0229069e937b Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 12:13:03 -0400
Subject: [PATCH 2874/3370] PowerManagement: init at 572.50.1

---
 .../apple-source-releases/PowerManagement/default.nix    | 9 +++++++++
 .../os-specific/darwin/apple-source-releases/default.nix | 2 ++
 2 files changed, 11 insertions(+)
 create mode 100644 pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix

diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
new file mode 100644
index 000000000000..a866c9414d52
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/default.nix
@@ -0,0 +1,9 @@
+{ appleDerivation, xcbuild, IOKit }:
+
+appleDerivation {
+  buildInputs = [ xcbuild IOKit ];
+  xcbuildFlags = "-target caffeinate";
+  installPhase = ''
+    install -D Products/Deployment/caffeinate $out/bin/caffeinate
+  '';
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix
index f9602b50e321..e2d62cef1ba4 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -7,6 +7,7 @@ let
   # now it's staying here.
   versions = {
     "osx-10.11.6" = {
+      PowerManagement = "572.50.1";
       SmartCardServices = "55111";
       dtrace        = "168";
       xnu           = "3248.60.10";
@@ -257,6 +258,7 @@ let
     system_cmds     = applePackage "system_cmds"       "osx-10.11.6"     "1h46j2c5v02pkv5d9fyv6cpgyg0lczvwicrx6r9s210cl03l77jl" {};
     text_cmds       = applePackage "text_cmds"         "osx-10.11.6"     "1f93m7dd0ghqb2hwh905mjhzblyfr7dwffw98xhgmv1mfdnigxg0" {};
     top             = applePackage "top"               "osx-10.11.6"     "0i9120rfwapgwdvjbfg0ya143i29s1m8zbddsxh39pdc59xnsg5l" {};
+    PowerManagement = applePackage "PowerManagement"   "osx-10.11.6"     "1llimhvp0gjffd47322lnjq7cqwinx0c5z7ikli04ad5srpa68mh" {};
 
     security_systemkeychain = applePackage "security_systemkeychain" "osx-10.10.5" "0xviskdgxsail15npi0billyiysvljlmg38mmhnr7qi4ymnnjr90" {};
 

From fd874b74560d5811660b492c38f0a690468d6bef Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 12:13:35 -0400
Subject: [PATCH 2875/3370] netbsd: allow replacing nbcompat with libbsd

---
 pkgs/os-specific/bsd/netbsd/compat.patch      | 18 ++++++++++++++++++
 pkgs/os-specific/bsd/netbsd/default.nix       |  9 ++++++++-
 pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc | 11 +++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/bsd/netbsd/compat.patch
 create mode 100644 pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc

diff --git a/pkgs/os-specific/bsd/netbsd/compat.patch b/pkgs/os-specific/bsd/netbsd/compat.patch
new file mode 100644
index 000000000000..f67ca2e50791
--- /dev/null
+++ b/pkgs/os-specific/bsd/netbsd/compat.patch
@@ -0,0 +1,18 @@
+diff -u -r1.35.2.1 nbtool_config.h.in
+--- a/nbtool_config.h.in	22 Apr 2015 07:18:58 -0000	1.35.2.1
++++ b/nbtool_config.h.in	31 May 2018 01:46:53 -0000
+@@ -680,5 +680,14 @@
+ /* Define if you have u_int8_t, but not uint8_t. */
+ #undef uint8_t
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ #include "compat_defs.h"
++
++#ifdef __cplusplus
++}
++#endif
++
+ #endif /* !__NETBSD_NBTOOL_CONFIG_H__ */
diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index 84d6926c50c7..eb305d5b3db7 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -162,7 +162,7 @@ let
     extraPaths = [ make.src ] ++ make.extraPaths;
   };
 
-  compat = netBSDDerivation {
+  compat = netBSDDerivation rec {
     path = "tools/compat";
     sha256 = "17phkfafybxwhzng44k5bhmag6i55br53ky1nwcmw583kg2fa86z";
     version = "7.1.2";
@@ -182,6 +182,8 @@ let
     installFlags = [];
     RENAME = "-D";
 
+    patches = [ ./compat.patch ];
+
     postInstall = ''
       mv $out/include/compat/* $out/include
       rmdir $out/include/compat
@@ -204,6 +206,11 @@ let
       install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h
       install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h
 
+      mkdir -p $out/lib/pkgconfig
+      substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \
+        --subst-var-by out $out \
+        --subst-var-by version ${version}
+
       # Remove lingering /usr references
       if [ -d $out/usr ]; then
         cd $out/usr
diff --git a/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc b/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc
new file mode 100644
index 000000000000..3aadabe50882
--- /dev/null
+++ b/pkgs/os-specific/bsd/netbsd/libbsd-overlay.pc
@@ -0,0 +1,11 @@
+prefix=@out@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: nbcompat
+Description: NetBSD compatibility framework
+Version: @version@
+URL: https://www.netbsd.org/
+Libs: -L${libdir} -lnbcompat
+Cflags: -I${includedir} -DHAVE_NBTOOL_CONFIG_H -include nbtool_config.h

From 480434f7eeefed7026dbbd11a4a0b1e4bfc1f137 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 12:14:21 -0400
Subject: [PATCH 2876/3370] libbsd: replace with nbcompat

---
 pkgs/development/libraries/libbsd/cdefs.patch | 222 ------
 .../development/libraries/libbsd/darwin.patch | 703 ------------------
 pkgs/development/libraries/libbsd/default.nix |  34 -
 .../libraries/libbsd/features.patch           |  26 -
 .../libraries/libbsd/non-glibc.patch          |  74 --
 pkgs/top-level/all-packages.nix               |   4 +-
 6 files changed, 2 insertions(+), 1061 deletions(-)
 delete mode 100644 pkgs/development/libraries/libbsd/cdefs.patch
 delete mode 100644 pkgs/development/libraries/libbsd/darwin.patch
 delete mode 100644 pkgs/development/libraries/libbsd/default.nix
 delete mode 100644 pkgs/development/libraries/libbsd/features.patch
 delete mode 100644 pkgs/development/libraries/libbsd/non-glibc.patch

diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch
deleted file mode 100644
index 81822654aeb4..000000000000
--- a/pkgs/development/libraries/libbsd/cdefs.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Tue, 6 Mar 2018 01:41:35 +0100
-Subject: Handle systems missing <sys/cdefs.h>
-
-This is a non-portable header, and we cannot expect it to be provided by
-the system libc (e.g. musl). We just need and rely on declaration that
-we have defined ourselves in our own <bsd/sys/cdefs.h>. So we switch to
-only ever assume that.
-
-Fixes: https://bugs.freedesktop.org/105281
----
- include/bsd/libutil.h        | 4 ++++
- include/bsd/md5.h            | 4 ++++
- include/bsd/nlist.h          | 4 ++++
- include/bsd/readpassphrase.h | 4 ++++
- include/bsd/stdlib.h         | 4 ++++
- include/bsd/string.h         | 4 ++++
- include/bsd/stringlist.h     | 5 +++++
- include/bsd/sys/queue.h      | 4 ++++
- include/bsd/sys/tree.h       | 4 ++++
- include/bsd/timeconv.h       | 4 ++++
- include/bsd/vis.h            | 4 ++++
- include/bsd/wchar.h          | 4 ++++
- 12 files changed, 49 insertions(+)
-
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index 45b3b15..ccca29a 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -40,7 +40,11 @@
- #define LIBBSD_LIBUTIL_H
- 
- #include <features.h>
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- #include <stdint.h>
- #include <stdio.h>
-diff --git a/include/bsd/md5.h b/include/bsd/md5.h
-index 5f3ae46..bf36a30 100644
---- a/include/bsd/md5.h
-+++ b/include/bsd/md5.h
-@@ -27,7 +27,11 @@ typedef struct MD5Context {
- 	uint8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
- } MD5_CTX;
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- __BEGIN_DECLS
-diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h
-index cb297e8..8767117 100644
---- a/include/bsd/nlist.h
-+++ b/include/bsd/nlist.h
-@@ -27,7 +27,11 @@
- #ifndef LIBBSD_NLIST_H
- #define LIBBSD_NLIST_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- 
- struct nlist {
- 	union {
-diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h
-index 14744b8..5eb8021 100644
---- a/include/bsd/readpassphrase.h
-+++ b/include/bsd/readpassphrase.h
-@@ -31,7 +31,11 @@
- #define RPP_SEVENBIT    0x10		/* Strip the high bit from input. */
- #define RPP_STDIN       0x20		/* Read from stdin, not /dev/tty */
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- __BEGIN_DECLS
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index ebc9638..8d33d1f 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -42,7 +42,11 @@
- #ifndef LIBBSD_STDLIB_H
- #define LIBBSD_STDLIB_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/stat.h>
- #include <stdint.h>
- 
-diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 6798bf6..29097f6 100644
---- a/include/bsd/string.h
-+++ b/include/bsd/string.h
-@@ -33,7 +33,11 @@
- #ifndef LIBBSD_STRING_H
- #define LIBBSD_STRING_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- __BEGIN_DECLS
-diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h
-index ff30cac..dd71496 100644
---- a/include/bsd/stringlist.h
-+++ b/include/bsd/stringlist.h
-@@ -31,7 +31,12 @@
- 
- #ifndef LIBBSD_STRINGLIST_H
- #define LIBBSD_STRINGLIST_H
-+
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- /*
-diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h
-index 4a94ea7..ac00026 100644
---- a/include/bsd/sys/queue.h
-+++ b/include/bsd/sys/queue.h
-@@ -33,7 +33,11 @@
- #ifndef LIBBSD_SYS_QUEUE_H
- #define LIBBSD_SYS_QUEUE_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- 
- /*
-  * This file defines four types of data structures: singly-linked lists,
-diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h
-index 628bec0..325b382 100644
---- a/include/bsd/sys/tree.h
-+++ b/include/bsd/sys/tree.h
-@@ -30,7 +30,11 @@
- #ifndef LIBBSD_SYS_TREE_H
- #define LIBBSD_SYS_TREE_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- 
- /*
-  * This file defines data structures for different types of trees:
-diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h
-index e2a2c55..a426bd3 100644
---- a/include/bsd/timeconv.h
-+++ b/include/bsd/timeconv.h
-@@ -41,7 +41,11 @@
- #ifndef LIBBSD_TIMECONV_H
- #define LIBBSD_TIMECONV_H
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <stdint.h>
- #include <time.h>
- 
-diff --git a/include/bsd/vis.h b/include/bsd/vis.h
-index 970dfdd..ab5430c 100644
---- a/include/bsd/vis.h
-+++ b/include/bsd/vis.h
-@@ -72,7 +72,11 @@
-  */
- #define	UNVIS_END	1	/* no more characters */
- 
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- 
- __BEGIN_DECLS
- char	*vis(char *, int, int, int);
-diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h
-index 33a500e..7216503 100644
---- a/include/bsd/wchar.h
-+++ b/include/bsd/wchar.h
-@@ -40,7 +40,11 @@
- #define LIBBSD_WCHAR_H
- 
- #include <stddef.h>
-+#ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
-+#else
-+#include <bsd/sys/cdefs.h>
-+#endif
- #include <sys/types.h>
- 
- __BEGIN_DECLS
--- 
-cgit v1.1
-
diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch
deleted file mode 100644
index 4bddec6b0ffd..000000000000
--- a/pkgs/development/libraries/libbsd/darwin.patch
+++ /dev/null
@@ -1,703 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 88ccd91..0857782 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,7 +59,7 @@ AS_CASE([$host_os],
- )
- 
- # Checks for header files.
--AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
-+AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h])
- 
- # Checks for typedefs, structures, and compiler characteristics.
- AC_C_INLINE
-@@ -146,6 +146,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
-                 pstat_getproc sysconf])
- AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"])
- 
-+HostOS=`echo "$host" | sed 's/.*-//'`
-+os_is_macosx=false
-+nonLinuxOS=false
-+AC_SUBST(HostOS)
-+case ${HostOS} in
-+	darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*)
-+		os_is_macosx=true
-+		nonLinuxOS=true
-+		echo HostOS="$HostOS"
-+		;;
-+	*)
-+		echo host="$host"
-+		echo HostOS="$HostOS"
-+		os_is_macosx=false
-+		nonLinuxOS=false
-+		;;
-+esac		
-+AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue])
-+AM_COND_IF([IS_DARWIN],
-+	[AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
-+
-+AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue])
-+AM_COND_IF([NON_LINUX],
-+	[AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])])
-+
- AC_CONFIG_FILES([
- 	Makefile
- 	include/Makefile
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index 45b3b15..d0d4043 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -39,7 +39,9 @@
- #ifndef LIBBSD_LIBUTIL_H
- #define LIBBSD_LIBUTIL_H
- 
-+#ifdef HAVE_FEATURES_H
- #include <features.h>
-+#endif
- #include <sys/cdefs.h>
- #include <sys/types.h>
- #include <stdint.h>
-diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
-index 4b69983..c75151b 100644
---- a/include/bsd/stdio.h
-+++ b/include/bsd/stdio.h
-@@ -48,12 +48,16 @@
- __BEGIN_DECLS
- const char *fmtcheck(const char *, const char *);
- 
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- /* XXX: The function requires cooperation from the system libc to store the
-  * line buffer in the FILE struct itself. */
- char *fgetln(FILE *fp, size_t *lenp)
--	LIBBSD_DEPRECATED("This functions cannot be safely ported, "
--	                  "use getline(3) instead, as it is supported "
--	                  "by GNU and POSIX.1-2008.");
-+	__attribute__((deprecated("This functions cannot be safely ported, "
-+	                          "use getline(3) instead, as it is supported "
-+	                          "by GNU and POSIX.1-2008.")));
-+#else
-+char *fgetln(FILE *fp, size_t *lenp);
-+#endif
- 
- /*
-  * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index ebc9638..6cd7943 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb,
-                const unsigned char *table, unsigned endbyte);
- 
- void *reallocf(void *ptr, size_t size);
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
-+#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
-+#if !__GLIBC_PREREQ(2, 26)
- void *reallocarray(void *ptr, size_t nmemb, size_t size);
- #endif
-+#endif
- 
- long long strtonum(const char *nptr, long long minval, long long maxval,
-                    const char **errstr);
-diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 6798bf6..6baaa14 100644
---- a/include/bsd/string.h
-+++ b/include/bsd/string.h
-@@ -37,6 +37,12 @@
- #include <sys/types.h>
- 
- __BEGIN_DECLS
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+size_t bsd_strlcpy(char *dst, const char *src, size_t siz);
-+size_t bsd_strlcat(char *dst, const char *src, size_t siz);
-+char *bsd_strnstr(const char *str, const char *find, size_t str_len);
-+void bsd_strmode(mode_t mode, char *str);
-+#else
- size_t strlcpy(char *dst, const char *src, size_t siz);
- size_t strlcat(char *dst, const char *src, size_t siz);
- char *strnstr(const char *str, const char *find, size_t str_len);
-@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str);
- #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
- void explicit_bzero(void *buf, size_t len);
- #endif
-+#endif
- __END_DECLS
- 
- #endif
-diff --git a/src/Makefile.am b/src/Makefile.am
-index ad83dbf..0f2a7ee 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \
- 	libbsd.map
- libbsd_la_LIBADD = \
- 	$(CLOCK_GETTIME_LIBS)
-+
-+if IS_DARWIN
-+libbsd_la_LDFLAGS = \
-+	-Wl \
-+	-version-number $(LIBBSD_ABI)
-+else
- libbsd_la_LDFLAGS = \
- 	-Wl,--version-script=$(srcdir)/libbsd.map \
- 	-version-number $(LIBBSD_ABI)
-+endif
-+
- libbsd_la_SOURCES = \
- 	arc4random.c \
--	arc4random.h \
--	arc4random_unix.h \
--	arc4random_openbsd.h \
- 	arc4random_uniform.c \
- 	bsd_getopt.c \
--	chacha_private.h \
- 	closefrom.c \
- 	dehumanize_number.c \
- 	err.c \
-@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \
- 	$(nil)
- endif
- 
-+noinst_HEADERS = \
-+	arc4random.h \
-+	arc4random_bsd.h \
-+	arc4random_linux.h \
-+	arc4random_unix.h \
-+	arc4random_osx.h \
-+	arc4random_openbsd.h \
-+	chacha_private.h
-+
- libbsd_ctor_a_SOURCES = \
- 	setproctitle_ctor.c \
- 	$(nil)
-diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h
-new file mode 100644
-index 0000000..ece2f85
---- /dev/null
-+++ b/src/arc4random_bsd.h
-@@ -0,0 +1,86 @@
-+/*	$OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $	*/
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
-+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
-+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
-+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include <sys/mman.h>
-+
-+#include <pthread.h>
-+#include <signal.h>
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+/*
-+ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if
-+ * a program does not link to -lthr. Callbacks registered with pthread_atfork()
-+ * appear to fail silently. So, it is not always possible to detect a PID
-+ * wraparound.
-+ */
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+	raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+	_rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+	static pid_t _rs_pid = 0;
-+	pid_t pid = getpid();
-+
-+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+		_rs_pid = pid;
-+		_rs_forked = 0;
-+		if (rs)
-+			memset(rs, 0, sizeof(*rs));
-+	}
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+		return (-1);
-+
-+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+		munmap(*rsp, sizeof(**rsp));
-+		return (-1);
-+	}
-+
-+	_ARC4_ATFORK(_rs_forkhandler);
-+	return (0);
-+}
-diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h
-new file mode 100644
-index 0000000..d61a8db
---- /dev/null
-+++ b/src/arc4random_linux.h
-@@ -0,0 +1,86 @@
-+/*	$OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $	*/
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
-+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
-+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
-+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include <sys/mman.h>
-+
-+#include <pthread.h>
-+#include <signal.h>
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+#ifdef __GLIBC__
-+extern void *__dso_handle;
-+extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *);
-+#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle)
-+#else
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+#endif
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+	raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+	_rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+	static pid_t _rs_pid = 0;
-+	pid_t pid = getpid();
-+
-+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+		_rs_pid = pid;
-+		_rs_forked = 0;
-+		if (rs)
-+			memset(rs, 0, sizeof(*rs));
-+	}
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+		return (-1);
-+
-+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+		munmap(*rsp, sizeof(**rsp));
-+		return (-1);
-+	}
-+
-+	_ARC4_ATFORK(_rs_forkhandler);
-+	return (0);
-+}
-diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h
-new file mode 100644
-index 0000000..14771a6
---- /dev/null
-+++ b/src/arc4random_osx.h
-@@ -0,0 +1,82 @@
-+/*	$OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $	*/
-+
-+/*
-+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
-+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
-+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
-+ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+/*
-+ * Stub functions for portability.
-+ */
-+
-+#include <sys/mman.h>
-+
-+#include <unistd.h>
-+#include <pthread.h>
-+#include <signal.h>
-+
-+static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
-+#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
-+#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
-+
-+#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
-+
-+static inline void
-+_getentropy_fail(void)
-+{
-+	raise(SIGKILL);
-+}
-+
-+static volatile sig_atomic_t _rs_forked;
-+
-+static inline void
-+_rs_forkhandler(void)
-+{
-+	_rs_forked = 1;
-+}
-+
-+static inline void
-+_rs_forkdetect(void)
-+{
-+	static pid_t _rs_pid = 0;
-+	pid_t pid = getpid();
-+
-+	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
-+		_rs_pid = pid;
-+		_rs_forked = 0;
-+		if (rs)
-+			memset(rs, 0, sizeof(*rs));
-+	}
-+}
-+
-+static inline int
-+_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
-+{
-+	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
-+		return (-1);
-+
-+	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
-+	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
-+		munmap(*rsp, sizeof(**rsp));
-+		*rsp = NULL;
-+		return (-1);
-+	}
-+
-+	_ARC4_ATFORK(_rs_forkhandler);
-+	return (0);
-+}
-diff --git a/src/fgetln.c b/src/fgetln.c
-index 4d1726e..9c73788 100644
---- a/src/fgetln.c
-+++ b/src/fgetln.c
-@@ -30,7 +30,9 @@
- #include <sys/types.h>
- #include <string.h>
- 
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- #include "local-link.h"
-+#endif
- 
- #ifdef HAVE_GETLINE
- struct filebuf {
-@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len)
- 		return fb->buf;
- 	}
- }
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
- libbsd_link_warning(fgetln,
-                     "This functions cannot be safely ported, use getline(3) "
-                     "instead, as it is supported by GNU and POSIX.1-2008.")
-+#endif
- #else
- #error "Function fgetln() needs to be ported."
- #endif
-diff --git a/src/fpurge.c b/src/fpurge.c
-index 462535a..e7eb46f 100644
---- a/src/fpurge.c
-+++ b/src/fpurge.c
-@@ -26,9 +26,11 @@
- 
- #include <errno.h>
- #include <stdio.h>
-+#if HAVE___FPURGE
- #include <stdio_ext.h>
-+#endif
- 
--#ifdef HAVE___FPURGE
-+#ifdef HAVE___FPURGE                   /* glibc >= 2.2, Haiku, Solaris >= 7 */
- int
- fpurge(FILE *fp)
- {
-@@ -42,5 +44,55 @@ fpurge(FILE *fp)
- 	return 0;
- }
- #else
--#error "Function fpurge() needs to be ported."
-+#define fp_ fp
-+//#error "Function fpurge() needs to be ported."
-+//#elif HAVE_FPURGE                   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */
-+int
-+fpurge(FILE *fp)
-+{
-+	if (fp == NULL || fileno(fp) < 0) {
-+		errno = EBADF;
-+		return EOF;
-+	}
-+
-+  /* Call the system's fpurge function.  */
-+# undef fpurge
-+# if !HAVE_DECL_FPURGE
-+  extern int fpurge (FILE *);
-+# endif
-+  int result = fpurge (fp);
-+# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
-+  if (result == 0)
-+    /* Correct the invariants that fpurge broke.
-+       <stdio.h> on BSD systems says:
-+         "The following always hold: if _flags & __SRD, _w is 0."
-+       If this invariant is not fulfilled and the stream is read-write but
-+       currently reading, subsequent putc or fputc calls will write directly
-+       into the buffer, although they shouldn't be allowed to.  */
-+    if ((fp_->_flags & __SRD) != 0)
-+      fp_->_w = 0;
-+#endif
-+  return result;
-+}
-+//#endif
-+#endif
-+
-+#ifdef TEST
-+int
-+main()
-+{
-+	static FILE fp_bad;
-+	FILE *fp;
-+
-+	if (fpurge(&fp_bad) == 0)
-+		return 1;
-+
-+	fp = fopen("/dev/zero", "r");
-+	if (fpurge(fp) < 0)
-+		return 1;
-+
-+	fclose(fp);
-+
-+	return 0;
-+}
- #endif
-diff --git a/src/funopen.c b/src/funopen.c
-index 1e05c7e..75e61ea 100644
---- a/src/funopen.c
-+++ b/src/funopen.c
-@@ -143,6 +143,7 @@ funopen(const void *cookie,
-  * they will not add the needed support to implement it. Just ignore this
-  * interface there, as it has never been provided anyway.
-  */
-+#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX)
- #else
- #error "Function funopen() needs to be ported or disabled."
- #endif
-diff --git a/src/getentropy.c b/src/getentropy.c
-index 3f11a1e..8a23a07 100644
---- a/src/getentropy.c
-+++ b/src/getentropy.c
-@@ -28,9 +28,7 @@
- #include "getentropy_linux.c"
- #elif defined(__GNU__)
- #include "getentropy_hurd.c"
--#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
--#include "getentropy_bsd.c"
--#elif defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
- #include "getentropy_bsd.c"
- #elif defined(__sun)
- #include "getentropy_solaris.c"
-diff --git a/src/hash/sha512.h b/src/hash/sha512.h
-index 4f368a1..ab22fc1 100644
---- a/src/hash/sha512.h
-+++ b/src/hash/sha512.h
-@@ -29,7 +29,11 @@
- #ifndef _SHA512_H_
- #define _SHA512_H_
- 
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+#include <stdint.h>
-+#else
- #include <sys/types.h>
-+#endif
- 
- #define SHA512_DIGEST_LENGTH		64
- 
-diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
-index b3c8d5e..f69013d 100644
---- a/src/hash/sha512c.c
-+++ b/src/hash/sha512c.c
-@@ -25,7 +25,13 @@
-  */
- 
- #include <sys/cdefs.h>
-+__FBSDID("$FreeBSD$");
-+
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+#include <machine/endian.h>
-+#else
- #include <sys/endian.h>
-+#endif
- #include <sys/types.h>
- 
- #include <string.h>
-diff --git a/src/nlist.c b/src/nlist.c
-index 0932f59..598a329 100644
---- a/src/nlist.c
-+++ b/src/nlist.c
-@@ -27,6 +27,10 @@
-  * SUCH DAMAGE.
-  */
- 
-+#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
-+#if defined(LIBC_SCCS) && !defined(lint)
-+static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
-+#endif /* LIBC_SCCS and not lint */
- #include <sys/cdefs.h>
- 
- #include <sys/param.h>
-@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list)
- 	(void)close(fd);
- 	return (n);
- }
-+#endif /* _NLIST_DO_ELF */
-diff --git a/src/setproctitle.c b/src/setproctitle.c
-index 038ac7d..d0ef01b 100644
---- a/src/setproctitle.c
-+++ b/src/setproctitle.c
-@@ -32,6 +32,11 @@
- #include <unistd.h>
- #include <string.h>
- 
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+#define __asm__(x)
-+extern char **environ;
-+#endif
-+
- static struct {
- 	/* Original value. */
- 	const char *arg0;
-@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
-  * for code linking against that version, and change the default to use the
-  * new version, so that new code depends on the implemented version. */
- #ifdef HAVE_TYPEOF
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+//
-+// HACK: even weak aliasing breaks in clang so just comment this out for now
-+//
-+// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl")));
-+#else
- extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl")));
-+#endif
- #else
- void setproctitle_stub(const char *fmt, ...)
- 	__attribute__((alias("setproctitle_impl")));
-diff --git a/src/strlcat.c b/src/strlcat.c
-index 14c53a1..e01cb60 100644
---- a/src/strlcat.c
-+++ b/src/strlcat.c
-@@ -27,7 +27,11 @@
-  * If retval >= dsize, truncation occurred.
-  */
- size_t
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strlcat(char *dst, const char *src, size_t dsize)
-+#else
- strlcat(char *dst, const char *src, size_t dsize)
-+#endif
- {
- 	const char *odst = dst;
- 	const char *osrc = src;
-diff --git a/src/strlcpy.c b/src/strlcpy.c
-index e9a7fe4..10a855f 100644
---- a/src/strlcpy.c
-+++ b/src/strlcpy.c
-@@ -25,7 +25,11 @@
-  * Returns strlen(src); if retval >= dsize, truncation occurred.
-  */
- size_t
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strlcpy(char *dst, const char *src, size_t dsize)
-+#else
- strlcpy(char *dst, const char *src, size_t dsize)
-+#endif
- {
- 	const char *osrc = src;
- 	size_t nleft = dsize;
-diff --git a/src/strmode.c b/src/strmode.c
-index e6afde5..c463243 100644
---- a/src/strmode.c
-+++ b/src/strmode.c
-@@ -33,7 +33,11 @@
- #include <string.h>
- 
- void
-+#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
-+bsd_strmode(mode_t mode, char *p)
-+#else
- strmode(mode_t mode, char *p)
-+#endif
- {
- 	 /* print type */
- 	switch (mode & S_IFMT) {
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
deleted file mode 100644
index ff9412ceb580..000000000000
--- a/pkgs/development/libraries/libbsd/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, autoreconfHook }:
-
-stdenv.mkDerivation rec {
-  name = "libbsd-${version}";
-  version = "0.8.7";
-
-  src = fetchurl {
-    url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m";
-  };
-
-  # darwin changes configure.ac which means we need to regenerate
-  # the configure scripts
-  nativeBuildInputs = [ autoreconfHook ];
-
-  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch
-    # Suitable for all, but limited to musl to avoid rebuilds
-    ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
-      # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490
-      ./non-glibc.patch
-      # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd
-      ./cdefs.patch
-      # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404
-      ./features.patch
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Common functions found on BSD systems";
-    homepage = https://libbsd.freedesktop.org/;
-    license = licenses.bsd3;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ matthewbauer ];
-  };
-}
diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch
deleted file mode 100644
index 66bd1e9232ba..000000000000
--- a/pkgs/development/libraries/libbsd/features.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Tue, 6 Mar 2018 01:42:52 +0100
-Subject: Remove <features.h> inclusion from <bsd/libutil.h>
-
-This is a non-portable header, and we should not assume it is present.
-Let the first system header pull it in if needed.
----
- include/bsd/libutil.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
-index ccca29a..e5f148a 100644
---- a/include/bsd/libutil.h
-+++ b/include/bsd/libutil.h
-@@ -39,7 +39,6 @@
- #ifndef LIBBSD_LIBUTIL_H
- #define LIBBSD_LIBUTIL_H
- 
--#include <features.h>
- #ifdef LIBBSD_OVERLAY
- #include <sys/cdefs.h>
- #else
--- 
-cgit v1.1
-
diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch
deleted file mode 100644
index f61e0d242943..000000000000
--- a/pkgs/development/libraries/libbsd/non-glibc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Tue, 6 Mar 2018 01:39:45 +0100
-Subject: Fix function declaration protection for glibc already providing them
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On non-glibc based systems we cannot unconditionally use the
-__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead,
-if it is undefined, define it to 0.
-
-We should also always declare these functions on non-glibc based
-systems. And on systems with a new enough glibc, which provides these
-functions, we should still provide the declarations if _GNU_SOURCE
-is *not* defined.
-
-Reported-by: Jörg Krause <joerg.krause@embedded.rocks>
----
- include/bsd/stdlib.h    | 3 ++-
- include/bsd/string.h    | 3 ++-
- include/bsd/sys/cdefs.h | 8 ++++++++
- 3 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
-index 8d33d1f..a5b063c 100644
---- a/include/bsd/stdlib.h
-+++ b/include/bsd/stdlib.h
-@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb,
-                const unsigned char *table, unsigned endbyte);
- 
- void *reallocf(void *ptr, size_t size);
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
-+#if !defined(__GLIBC__) || \
-+    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE)))
- void *reallocarray(void *ptr, size_t nmemb, size_t size);
- #endif
- 
-diff --git a/include/bsd/string.h b/include/bsd/string.h
-index 29097f6..f987fee 100644
---- a/include/bsd/string.h
-+++ b/include/bsd/string.h
-@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz);
- char *strnstr(const char *str, const char *find, size_t str_len);
- void strmode(mode_t mode, char *str);
- 
--#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
-+#if !defined(__GLIBC__) || \
-+    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE)))
- void explicit_bzero(void *buf, size_t len);
- #endif
- __END_DECLS
-diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
-index b4c8f30..d1cc419 100644
---- a/include/bsd/sys/cdefs.h
-+++ b/include/bsd/sys/cdefs.h
-@@ -59,6 +59,14 @@
- #endif
- 
- /*
-+ * On non-glibc based systems, we cannot unconditionally use the
-+ * __GLIBC_PREREQ macro as it gets expanded before evaluation.
-+ */
-+#ifndef __GLIBC_PREREQ
-+#define __GLIBC_PREREQ(maj, min) 0
-+#endif
-+
-+/*
-  * Some kFreeBSD headers expect those macros to be set for sanity checks.
-  */
- #ifndef _SYS_CDEFS_H_
--- 
-cgit v1.1
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9d7ec7c5d4c..ac8c97bdfaa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2371,8 +2371,6 @@ with pkgs;
 
   flvstreamer = callPackage ../tools/networking/flvstreamer { };
 
-  libbsd = callPackage ../development/libraries/libbsd { };
-
   libbladeRF = callPackage ../development/libraries/libbladeRF { };
 
   lp_solve = callPackage ../applications/science/math/lp_solve { };
@@ -21462,6 +21460,8 @@ with pkgs;
                       mount wall hostname more sysctl getconf
                       getent;
 
+  libbsd = netbsd.compat;
+
   inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
           netbsd;
 

From e99322507e4535c64c0aab9a5a6b15ae3ffaf761 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 12:33:36 -0400
Subject: [PATCH 2877/3370] treewide: get rid of musl stuff

---
 pkgs/os-specific/linux/musl/fts-setup-hook.sh |  4 ----
 pkgs/os-specific/linux/musl/fts.nix           | 19 -------------------
 pkgs/os-specific/linux/musl/getconf.nix       | 19 -------------------
 pkgs/os-specific/linux/musl/getent.nix        | 18 ------------------
 pkgs/tools/compression/xar/default.nix        |  5 ++---
 pkgs/top-level/all-packages.nix               |  5 ++---
 pkgs/top-level/unix-tools.nix                 | 10 +++++-----
 7 files changed, 9 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/musl/fts-setup-hook.sh
 delete mode 100644 pkgs/os-specific/linux/musl/fts.nix
 delete mode 100644 pkgs/os-specific/linux/musl/getconf.nix
 delete mode 100644 pkgs/os-specific/linux/musl/getent.nix

diff --git a/pkgs/os-specific/linux/musl/fts-setup-hook.sh b/pkgs/os-specific/linux/musl/fts-setup-hook.sh
deleted file mode 100644
index 5cf8c753aec3..000000000000
--- a/pkgs/os-specific/linux/musl/fts-setup-hook.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# See pkgs/build-support/setup-hooks/role.bash
-getHostRole
-
-export NIX_${role_pre}LDFLAGS+=" -lfts"
diff --git a/pkgs/os-specific/linux/musl/fts.nix b/pkgs/os-specific/linux/musl/fts.nix
deleted file mode 100644
index 24d25de3a2d9..000000000000
--- a/pkgs/os-specific/linux/musl/fts.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "musl-fts-${version}";
-  version = "2017-01-13";
-  src = fetchFromGitHub {
-    owner = "pullmoll";
-    repo = "musl-fts";
-    rev = "0bde52df588e8969879a2cae51c3a4774ec62472";
-    sha256 = "1q8cpzisziysrs08b89wj0rm4p6dsyl177cclpfa0f7spjm3jg03";
-  };
-
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-
-  setupHooks = [
-    ../../../build-support/setup-hooks/role.bash
-    ./fts-setup-hook.sh
-  ];
-}
diff --git a/pkgs/os-specific/linux/musl/getconf.nix b/pkgs/os-specific/linux/musl/getconf.nix
deleted file mode 100644
index dbfaca296bf9..000000000000
--- a/pkgs/os-specific/linux/musl/getconf.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "musl-getconf";
-  src = fetchurl {
-    url = "https://raw.githubusercontent.com/alpinelinux/aports/48b16204aeeda5bc1f87e49c6b8e23d9abb07c73/main/musl/getconf.c";
-    sha256 = "0z14ml5343p5gapxw9fnbn2r72r7v2gk8662iifjrblh6sxhqzfq";
-  };
-
-  unpackPhase = ":";
-
-  buildPhase = ''$CC $src -o getconf'';
-  installPhase = ''
-    mkdir -p $out/bin
-    cp getconf $out/bin/
-  '';
-}
-
-
diff --git a/pkgs/os-specific/linux/musl/getent.nix b/pkgs/os-specific/linux/musl/getent.nix
deleted file mode 100644
index 6eed17a76b02..000000000000
--- a/pkgs/os-specific/linux/musl/getent.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "musl-getent";
-  src = fetchurl {
-    url = "https://raw.githubusercontent.com/alpinelinux/aports/89a718d88ec7466e721f3bbe9ede5ffe58061d78/main/musl/getent.c";
-    sha256 = "0b4jqnsmv1hjgcz7db3vd61k682aphl59c3yhwya2q7mkc6g48xk";
-  };
-
-  unpackPhase = ":";
-
-  buildPhase = ''$CC $src -o getent'';
-  installPhase = ''
-    mkdir -p $out/bin
-    cp getent $out/bin/
-  '';
-}
-
diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix
index 01d18fe6ad7d..69d4284b795d 100644
--- a/pkgs/tools/compression/xar/default.nix
+++ b/pkgs/tools/compression/xar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, musl-fts }:
+{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2, fts }:
 
 stdenv.mkDerivation rec {
   version = "1.6.1";
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf";
   };
 
-  buildInputs = [ libxml2 openssl zlib bzip2 ]
-    ++ stdenv.lib.optional stdenv.hostPlatform.isMusl musl-fts;
+  buildInputs = [ libxml2 openssl zlib bzip2 fts ];
 
   meta = {
     homepage    = https://mackyle.github.io/xar/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac8c97bdfaa3..d5fc9283e0f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13843,9 +13843,6 @@ with pkgs;
   multipath-tools = callPackage ../os-specific/linux/multipath-tools { };
 
   musl = callPackage ../os-specific/linux/musl { };
-  musl-fts = callPackage ../os-specific/linux/musl/fts.nix { };
-  musl-getconf = callPackage ../os-specific/linux/musl/getconf.nix { };
-  musl-getent = callPackage ../os-specific/linux/musl/getent.nix { };
 
   nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { }
              else unixtools.nettools;
@@ -21460,6 +21457,8 @@ with pkgs;
                       mount wall hostname more sysctl getconf
                       getent;
 
+  fts = if hostPlatform.isMusl then netbsd.fts else null;
+
   libbsd = netbsd.compat;
 
   inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index c057aa45be6f..f8e269168a13 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -50,14 +50,14 @@ let
       linux = pkgs.utillinux;
     };
     getconf = {
-      linux = if hostPlatform.isMusl then pkgs.musl-getconf
-              else lib.getBin stdenv.cc.libc;
+      linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc
+              else pkgs.netbsd.getconf;
       darwin = pkgs.darwin.system_cmds;
     };
     getent = {
-      linux = if hostPlatform.isMusl then pkgs.musl-getent
-              # This may not be right on other platforms, but preserves existing behavior
-              else /* if hostPlatform.libc == "glibc" then */ pkgs.glibc.bin;
+      linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc
+              else pkgs.netbsd.getent;
+      darwin = pkgs.netbsd.getent;
     };
     getopt = {
       linux = pkgs.utillinux;

From 3c1ee736df3b3013cf77ec4676441c7364d312f9 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 12:41:41 -0400
Subject: [PATCH 2878/3370] Revert "cairo: fix build inputs"

This reverts commit e557a432e07441a508544fca2aba3be6fd9860c0.

Sorry about this. Accidentally got into my git push. Did not mean to
cause a mass rebuild!
---
 pkgs/development/libraries/cairo/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 7f6419272dd9..74ae4abaedf9 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -25,9 +25,6 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-  ];
-
-  buildInputs = [
     libiconv
     libintl
   ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [

From 252a8af143f8c47ff62ace476df42a2d62db1601 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 31 May 2018 19:14:38 +0200
Subject: [PATCH 2879/3370] json-glib: add updateScript

---
 .../libraries/json-glib/default.nix           | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index 21bddf8f6bb5..a9b5d596b395 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, fetchpatch, glib, meson, ninja, pkgconfig, gettext
-, gobjectIntrospection, dbus
-, fixDarwinDylibNames
+, gobjectIntrospection, dbus, fixDarwinDylibNames, gnome3
 }:
 
-stdenv.mkDerivation rec {
-  name = "json-glib-${minVer}.2";
-  minVer = "1.4";
+let
+  pname = "json-glib";
+  version = "1.4.2";
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz";
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
     sha256 = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8";
   };
 
@@ -28,9 +29,15 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
   meta = with stdenv.lib; {
-    homepage = http://live.gnome.org/JsonGlib;
     description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format";
+    homepage = https://wiki.gnome.org/Projects/JsonGlib;
     license = licenses.lgpl2;
     maintainers = with maintainers; [ lethalman ];
     platforms = with platforms; unix;

From ae6a4a913cfa6f51c9c4bfd30c401dba88b81e2d Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 12:44:17 -0400
Subject: [PATCH 2880/3370] fix eval

---
 pkgs/os-specific/linux/libselinux/default.nix | 7 +++----
 pkgs/top-level/unix-tools.nix                 | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix
index 59d5db52ac68..a172e45e7faa 100644
--- a/pkgs/os-specific/linux/libselinux/default.nix
+++ b/pkgs/os-specific/linux/libselinux/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pcre, pkgconfig, libsepol
 , enablePython ? true, swig ? null, python ? null
-, musl-fts
+, fts
 }:
 
 assert enablePython -> swig != null && python != null;
@@ -18,9 +18,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libsepol pcre ]
-             ++ optionals enablePython [ swig python ]
-             ++ optional stdenv.hostPlatform.isMusl musl-fts;
+  buildInputs = [ libsepol pcre fts ]
+             ++ optionals enablePython [ swig python ];
 
   # drop fortify here since package uses it by default, leading to compile error:
   # command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix
index f8e269168a13..64979ba3234d 100644
--- a/pkgs/top-level/unix-tools.nix
+++ b/pkgs/top-level/unix-tools.nix
@@ -50,12 +50,12 @@ let
       linux = pkgs.utillinux;
     };
     getconf = {
-      linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc
+      linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc
               else pkgs.netbsd.getconf;
       darwin = pkgs.darwin.system_cmds;
     };
     getent = {
-      linux = if hostPlatform.isGNU then lib.getBin pkgs.glibc
+      linux = if hostPlatform.libc == "glibc" then lib.getBin pkgs.glibc
               else pkgs.netbsd.getent;
       darwin = pkgs.netbsd.getent;
     };

From d38d1ed44f44da5481d7a010a113056c6ec09299 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@users.noreply.github.com>
Date: Thu, 31 May 2018 19:22:23 +0200
Subject: [PATCH 2881/3370] jl: 0.0.4 -> 0.0.5 (#41319)

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

diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix
index ea6214284582..6ab331ebc6a3 100644
--- a/pkgs/development/tools/jl/default.nix
+++ b/pkgs/development/tools/jl/default.nix
@@ -5,12 +5,12 @@
 }:
 mkDerivation rec {
   pname = "jl";
-  version = "0.0.4";
+  version = "0.0.5";
   src = fetchFromGitHub {
     owner = "chrisdone";
     repo = "jl";
     rev = "v${version}";
-    sha256 = "0wsdfj4m729q0kjpkn0ywpncdhvpvvprd4rh45vcg6kjw20krm3r";
+    sha256 = "1hlnwsl4cj0l4x8dxwda2fcnk789cwlphl9gv9cfrivl43mgkgar";
   };
   isLibrary = true;
   isExecutable = true;

From 9d99fcf8a14571749c75d33d4c93119a43cfcb20 Mon Sep 17 00:00:00 2001
From: James  Kay <twey@twey.co.uk>
Date: Thu, 31 May 2018 18:24:30 +0100
Subject: [PATCH 2882/3370] compton-git: 2016-08-10 -> 2018-05-21 (#41317)

---
 pkgs/applications/window-managers/compton/git.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index 53bcd158aedd..dd2559d2b15c 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -3,14 +3,15 @@
   pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
   libXrandr, libXrender, xwininfo }:
 
-stdenv.mkDerivation {
-  name = "compton-git-2016-08-10";
+stdenv.mkDerivation rec {
+  name = "compton-git-${version}";
+  version = "2018-05-21";
 
   src = fetchFromGitHub {
-    owner  = "chjj";
+    owner  = "yshui";
     repo   = "compton";
-    rev    = "f1cd308cde0f1e1f21ec2ac8f16a3c873fa22d3a";
-    sha256 = "1ky438d1rsg4ylkcp60m82r0jck8rks3gfa869rc63k37p2nfn8p";
+    rev    = "9b24550814b7c69065f90039b0a5d0a2281b9f81";
+    sha256 = "09nn0q9lgv59chfxljips0n8vnwwxi1yz6hmcsiggsl3zvpabpxl";
   };
 
   nativeBuildInputs = [
@@ -44,7 +45,7 @@ stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description =
       "A fork of XCompMgr, a sample compositing manager for X servers (git version)";
-    homepage = https://github.com/chjj/compton/;
+    homepage = https://github.com/yshui/compton/;
     license = licenses.mit;
     longDescription = ''
       A fork of XCompMgr, which is a sample compositing manager for X
@@ -53,7 +54,7 @@ stdenv.mkDerivation {
       additional features, such as additional effects, and a fork at a
       well-defined and proper place.
     '';
-    maintainers = [ maintainers.ertes ];
+    maintainers = [ maintainers.ertes maintainers.twey ];
     platforms = platforms.linux;
   };
 }

From 0c7f4106044ba039be8cf7aa4c491055a02aa474 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Thu, 31 May 2018 19:39:53 +0200
Subject: [PATCH 2883/3370] postgis: 2.4.3 -> 2.4.4 (#41278)

See http://svn.osgeo.org/postgis/tags/2.4.4/NEWS for release notes
---
 pkgs/development/libraries/postgis/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index d201654fbb4c..9a72e03ef2c6 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -44,8 +44,8 @@
 
 
 let
-  version = "2.4.3";
-  sha256 = "1fg4pmla5m903m76ndjd8q5dkcykf67v1p4dcajmnr3bvg2p8lza";
+  version = "2.4.4";
+  sha256 = "1hm8migjb53cymp4qvg1h20yqllmy9f7x0awv5450391i6syyqq6";
 in stdenv.mkDerivation rec {
   name = "postgis-${version}";
 
@@ -54,17 +54,6 @@ in stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://trac.osgeo.org/postgis/changeset/16417?format=diff&new=16417";
-      name = "json-c-0.13.patch";
-      sha256 = "1hk2fh4nsvq76ksi7z4shlgj7fik6ac3sjsb0khsypsjfhz7ic8z";
-      stripLen = 3;
-      extraPrefix = "";
-      excludes = [ "NEWS" ];
-    })
-  ];
-
   # don't pass these vars to the builder
   removeAttrs = ["sql_comments" "sql_srcs"];
 

From e48b54c0789c38bd7de7438c112197f95b6b8ca1 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix+github@lancelotsix.com>
Date: Thu, 31 May 2018 19:44:31 +0200
Subject: [PATCH 2884/3370] qgis: 2.18.17 -> 2.18.20 (#41195)

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

diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 896387b1f7f4..279d83e92193 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "qgis-2.18.17";
+  name = "qgis-2.18.20";
 
   buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ]
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://qgis.org/downloads/${name}.tar.bz2";
-    sha256 = "1nxwl5lwibbiz9v3qaw3px7iyxg113zr4j8d99yj07mhk2ap082y";
+    sha256 = "0bm9sv268lc3v48zjypsjjs62xnyb7zabzrms4jsy020waz6sk9g";
   };
 
   # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system

From 42e18cf6d1086f68210c9d9ad1293bb53b66a7cd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 31 May 2018 10:56:38 -0700
Subject: [PATCH 2885/3370] bison: 3.0.4 -> 3.0.5 (#41302)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bison/versions.

These checks were done:

- built on NixOS
- /nix/store/q481pyq4xd66jis7wdcfjy3dldch0vwl-bison-3.0.5/bin/bison passed the binary check.
- /nix/store/q481pyq4xd66jis7wdcfjy3dldch0vwl-bison-3.0.5/bin/yacc passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 3.0.5 with grep in /nix/store/q481pyq4xd66jis7wdcfjy3dldch0vwl-bison-3.0.5
- directory tree listing: https://gist.github.com/76c5b3a38b02115e31a48c51785d1bd3
- du listing: https://gist.github.com/566dbfdfcc7a89fa9cd11d1ddf49935c
---
 pkgs/development/tools/parsing/bison/3.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 9c75e93bb1c1..921f5d2d948c 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -1,11 +1,11 @@
 { stdenv, hostPlatform, fetchurl, m4, perl, help2man }:
 
 stdenv.mkDerivation rec {
-  name = "bison-3.0.4";
+  name = "bison-3.0.5";
 
   src = fetchurl {
     url = "mirror://gnu/bison/${name}.tar.gz";
-    sha256 = "b67fd2daae7a64b5ba862c66c07c1addb9e6b1b05c5f2049392cfd8a2172952e";
+    sha256 = "0rnml9spd6p0i5qy9g4r82drwdr09r1z9cf4p89agbrkxqmrsffd";
   };
 
   patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;

From cf2604004e4b091da6a2deb5e0455c960d3e7d1e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 31 May 2018 12:39:52 -0500
Subject: [PATCH 2886/3370] haskellPackages.ghc84x.singletons: disable test
 suite for ghc-8.4.3

Otherwise, the test suite fails, due to the 'Lambdas' test failing:

    Lambdas:              FAIL (1.06s)
      42c42
      <     foo8 x = (\ Foo a _ -> a) x
      ---
      >     foo8 x = (\ (Foo a _) -> a) x

I assume this is a minor bogus failure due to some change in 8.4.3 that
nobody expected.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index c4ba4b9cba73..f94d6e15b957 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -120,7 +120,7 @@ self: super: {
     prePatch        = "cd lambdacube-ir.haskell; ";
   });
 
-  singletons = super.singletons_2_4_1;
+  singletons = dontCheck super.singletons_2_4_1;
   th-desugar = super.th-desugar_1_8;
 
   ## Upstreamed, awaiting a Hackage release

From 5d61168461b6e5a3e50473f3cd64f222f6686b43 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 31 May 2018 10:59:26 -0700
Subject: [PATCH 2887/3370] fftwLongDouble: 3.3.7 -> 3.3.8 (#41299)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fftw-long-double/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 3.3.8 with grep in /nix/store/7csndk7q4h2wvv46ndgh6lm4j0ybx9zf-fftw-long-double-3.3.8
- directory tree listing: https://gist.github.com/05084878f5535b72e17b90667821c468
- du listing: https://gist.github.com/174653df406b155bf1a9c07da9257f54
---
 pkgs/development/libraries/fftw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 701209971074..3c5100f2f7f4 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -5,7 +5,7 @@ with lib;
 assert elem precision [ "single" "double" "long-double" "quad-precision" ];
 
 let
-  version = "3.3.7";
+  version = "3.3.8";
   withDoc = stdenv.cc.isGNU;
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
-    sha256 = "0wsms8narnbhfsa8chdflv2j9hzspvflblnqdn7hw8x5xdzrnq1v";
+    sha256 = "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1";
   };
 
   outputs = [ "out" "dev" "man" ]

From 218ada1ba7ecb0a3b1d9e7aed9147ba35d484faa Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 13:41:21 -0400
Subject: [PATCH 2888/3370] nixos: disable gdk-pixbuf test

The test currently relies on installedTests output which was reverted
in 85ae7137ac6a1623be90c8f0897566367d300c12.

See
https://github.com/NixOS/nixpkgs/commit/85ae7137ac6a1623be90c8f0897566367d300c12
for discussion.
---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 1e52c0f86a7a..13174f992e62 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -289,7 +289,7 @@ in rec {
   tests.flatpak = callTest tests/flatpak.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fwupd = callTest tests/fwupd.nix {};
-  tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
+  #tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gitolite = callTest tests/gitolite.nix {};
   tests.gjs = callTest tests/gjs.nix {};

From c425a1fc5002a1642036a74d67b200e47f19cefb Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Thu, 22 Jun 2017 21:43:03 -0400
Subject: [PATCH 2889/3370] haskell: add *FrameworkDepends arguments

---
 .../haskell-modules/generic-builder.nix          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index a1b92595c78d..941ba31d34c3 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -35,6 +35,10 @@ in
 , enableStaticLibraries ? !hostPlatform.isWindows
 , enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
+# On macOS, statically linking against system frameworks is not supported;
+# see https://developer.apple.com/library/content/qa/qa1118/_index.html
+# They must be propagated to the environment of any executable linking with the library
+, libraryFrameworkDepends ? [], executableFrameworkDepends ? []
 , homepage ? "https://hackage.haskell.org/package/${pname}"
 , platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile
 , hydraPlatforms ? null
@@ -47,8 +51,8 @@ in
 , doHaddock ? !(ghc.isHaLVM or false)
 , passthru ? {}
 , pkgconfigDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
-, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
-, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? []
+, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? []
+, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? []
 , testTarget ? ""
 , broken ? false
 , preCompileBuildDriver ? "", postCompileBuildDriver ? ""
@@ -178,11 +182,11 @@ let
   nativeBuildInputs = [ ghc nativeGhc removeReferencesTo ] ++ optional (allPkgconfigDepends != []) pkgconfig ++
                       setupHaskellDepends ++
                       buildTools ++ libraryToolDepends ++ executableToolDepends;
-  propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends;
-  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++
+  propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
+  otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++
                      allPkgconfigDepends ++
-                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++
-                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends);
+                     optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++
+                     optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends);
 
   allBuildInputs = propagatedBuildInputs ++ otherBuildInputs;
 

From a22faf10606aa91d6e7971ed43acea722d36f37d Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Thu, 31 May 2018 13:03:46 -0500
Subject: [PATCH 2890/3370] haskellPackages.ghc84x.criterion: bump to criterion
 1.4.1.0

We need base-compat-0.10 for 8.4, but the older version wanted 0.9.
(Criterion 1.4.1.0 now uses base-compat-batteries-0.10, in fact)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index f94d6e15b957..55e80d7fb0c3 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -136,6 +136,8 @@ self: super: {
     };
   });
 
+  ## Bounds related: it wants base-compat 0.9.
+  criterion = super.criterion_1_4_1_0;
 
   ## Unmerged
 

From e4e89672698362ebb71229cf773f26f86939d994 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 14:05:56 -0400
Subject: [PATCH 2891/3370] haskell: fixup merge of
 c425a1fc5002a1642036a74d67b200e47f19cefb

This was accidentally included even though setupHaskellDepends is
already listed above.
---
 pkgs/development/haskell-modules/generic-builder.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 941ba31d34c3..629910fd62e1 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -183,7 +183,7 @@ let
                       setupHaskellDepends ++
                       buildTools ++ libraryToolDepends ++ executableToolDepends;
   propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends ++ libraryFrameworkDepends;
-  otherBuildInputs = setupHaskellDepends ++ extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++
+  otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ executableFrameworkDepends ++
                      allPkgconfigDepends ++
                      optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends ++ testFrameworkDepends) ++
                      optionals doBenchmark (benchmarkDepends ++ benchmarkHaskellDepends ++ benchmarkSystemDepends ++ benchmarkToolDepends ++ benchmarkFrameworkDepends);

From 125ff1ec54173791490c0924a937c9860ac2acba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 31 May 2018 11:40:34 -0700
Subject: [PATCH 2892/3370] uftp: 4.9.6 -> 4.9.7 (#41236)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/uftp/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftp had a zero exit code or showed the expected version
- /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftpd passed the binary check.
- /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftp_keymgt passed the binary check.
- Warning: no invocation of /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7/bin/uftpproxyd had a zero exit code or showed the expected version
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 4.9.7 with grep in /nix/store/xdg3hz58kdakygb1qigw2x1kh1gk5z4n-uftp-4.9.7
- directory tree listing: https://gist.github.com/1fe6684f427417f8a9e189f960c84a74
- du listing: https://gist.github.com/15a89b170d541884994e503690c961ef
---
 pkgs/servers/uftp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix
index d1ec31d6b856..a484e0382104 100644
--- a/pkgs/servers/uftp/default.nix
+++ b/pkgs/servers/uftp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "uftp-${version}";
-  version = "4.9.6";
+  version = "4.9.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz";
-    sha256 = "0byg7ff39i32ljzqxn6rhiz3zs1b04y50xpvzmjx5v8pmdajn0sz";
+    sha256 = "1gh1zpc6dh690xjhfp5x2ajhwjkchyh5wazr8agm6axxwqhd9gn8";
   };
 
   buildInputs = [ openssl ];

From 8ad1476755ad5686bc68e060d41f8d1ce308e981 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 May 2018 21:19:57 +0200
Subject: [PATCH 2893/3370] multi-ghc-travis: update to latest git version for
 ghc-8.4.3 support

---
 pkgs/development/tools/haskell/multi-ghc-travis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index 394e603ee217..b9f6db1cc947 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -8,8 +8,8 @@ mkDerivation {
   src = fetchFromGitHub {
     owner = "haskell-CI";
     repo = "haskell-ci";
-    rev = "a0d76bc5dde3b1cc790a32f84b9ce084e7596f1e";
-    sha256 = "1wrn9f5rz0nafcwisima6rp18v3a2kjgsyq2wj7vhinqwx9z72r4";
+    rev = "db63eb7f2eaa64b7b0e4759e98258fea2a27a424";
+    sha256 = "0ff55zafx7561s1yps7aw83ws4vcpc5cq9r6bbckaagvwwla0dcq";
   };
   isLibrary = true;
   isExecutable = true;

From 5421c6f156f4e2082a997fac68526c1c338cdfdb Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Thu, 31 May 2018 21:42:26 +0200
Subject: [PATCH 2894/3370] atom, atom-beta: 1.27.1 -> 1.27.2, 1.28.0-beta1 ->
 1.28.0-beta2 (#41318)

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 7a88d761a345..f80a14c1e0f3 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -58,12 +58,12 @@ let
   };
 in stdenv.lib.mapAttrs common {
   atom = {
-    version = "1.27.1";
-    sha256 = "08slv8s90wz2jcdrcqh2d815wfbrkwcdx9c3qbx8cml04hz8p2gx";
+    version = "1.27.2";
+    sha256 = "0xriv142asc82mjxzkqsafaqalxa3icz4781z2fsgyfkkw6zbz2v";
   };
 
   atom-beta = {
-    version = "1.28.0-beta1";
-    sha256 = "1mkxq2a7sylj9jx1bs2v1pmgrwc10cgh810qic1lncq9jzpaik0n";
+    version = "1.28.0-beta2";
+    sha256 = "0fc9j1l776hv057dirw2bv9wmvhcaba5c4nq1cgs5rb5whxir2n6";
   };
 }

From 0fbc3451ef82f73ecc1a6ae10c68a72bbf13abf9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 31 May 2018 12:47:30 -0700
Subject: [PATCH 2895/3370] byacc: 20180510 -> 20180525 (#41304)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/byacc/versions.

These checks were done:

- built on NixOS
- /nix/store/bz6434x282zsy6xz19nbd3fhzmdr4yzy-byacc-20180525/bin/yacc passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 20180525 with grep in /nix/store/bz6434x282zsy6xz19nbd3fhzmdr4yzy-byacc-20180525
- directory tree listing: https://gist.github.com/fffd356f1d450bf13fc3f2bf8a8f5304
- du listing: https://gist.github.com/3e8f1a51d1e20db022ff93cedc85b5a7
---
 pkgs/development/tools/parsing/byacc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index 2f8c97ff2711..17d1e47cb4ed 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "byacc-${version}";
-  version = "20180510";
+  version = "20180525";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/byacc/${name}.tgz"
       "https://invisible-mirror.net/archives/byacc/${name}.tgz"
     ];
-    sha256 = "14ynlrcsc2hwny3gxng19blfvglhqd4m7hl597fwksf7zfzhv56h";
+    sha256 = "1ridghk1xprxfg2k8ls87wjc00i4a7f39x2fkswfqb2wwf5qv6qj";
   };
 
   doCheck = true;

From 05eb57b35d2859dd3981ab20c7e2a2ccfc530b75 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 15:55:06 -0400
Subject: [PATCH 2896/3370] Revert "nixpkgs module: Fix defaulting of
 `localSystem` and `system`"

This reverts commit 4fe289860888668956b7e79e24efeb101c2f51d1.

This gives a recursion in certain nixpkgs configs.
---
 nixos/modules/misc/nixpkgs.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 29019ed3d552..8fbe218b232a 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -1,10 +1,9 @@
-{ config, options, lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
 let
   cfg = config.nixpkgs;
-  opts = options.nixpgs;
 
   isConfig = x:
     builtins.isAttrs x || lib.isFunction x;
@@ -63,11 +62,12 @@ in
     pkgs = mkOption {
       defaultText = literalExample
         ''import "''${nixos}/.." {
-            inherit (cfg) config overlays localSystem crossSystem;
+            inherit (config.nixpkgs) config overlays localSystem crossSystem;
           }
         '';
       default = import ../../.. {
-        inherit (cfg) config overlays localSystem crossSystem;
+        localSystem = { inherit (cfg) system; } // cfg.localSystem;
+        inherit (cfg) config overlays crossSystem;
       };
       type = pkgsType;
       example = literalExample ''import <nixpkgs> {}'';
@@ -140,7 +140,7 @@ in
 
     localSystem = mkOption {
       type = types.attrs; # TODO utilize lib.systems.parsedPlatform
-      default = { system = cfg.system or builtins.currentSystem; };
+      default = { system = builtins.currentSystem; };
       example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; };
       defaultText = literalExample
         ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform'';
@@ -179,8 +179,6 @@ in
 
     system = mkOption {
       type = types.str;
-      default = cfg.localSystem.system
-        or opts.localSystem.default.system;
       example = "i686-linux";
       description = ''
         Specifies the Nix platform type on which NixOS should be built.
@@ -198,7 +196,6 @@ in
         </programlisting>
         See <code>nixpkgs.localSystem</code> for more information.
 
-        Ignored when <code>nixpkgs.localSystem</code> is set.
         Ignored when <code>nixpkgs.pkgs</code> is set.
       '';
     };

From 9d456bf0c136234e4e9150f92c956727668bb405 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent.demeester@docker.com>
Date: Thu, 31 May 2018 21:57:29 +0200
Subject: [PATCH 2897/3370] traefik: 1.5.2 -> 1.6.2 (#41208)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/servers/traefik/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix
index d38405688fc5..1ed50a65e91a 100644
--- a/pkgs/servers/traefik/default.nix
+++ b/pkgs/servers/traefik/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "traefik-${version}";
-  version = "1.5.2";
+  version = "1.6.2";
 
   goPackagePath = "github.com/containous/traefik";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "containous";
     repo = "traefik";
     rev = "v${version}";
-    sha256 = "0cv05nm7jj1g2630l5zmzpmsrjx712ba3l7klh8nqs02mzykzsha";
+    sha256 = "1gklji9zwdprvv7fvy7rhgazfslwsyjq97w193v9dpsriz1rk5qa";
   };
 
   buildInputs = [ go-bindata bash ];
@@ -34,6 +34,6 @@ buildGoPackage rec {
     homepage = https://traefik.io;
     description = "A modern reverse proxy";
     license = licenses.mit;
-    maintainers = with maintainers; [ hamhut1066 ];
+    maintainers = with maintainers; [ hamhut1066 vdemeester ];
   };
 }

From 0b6dd07980975cf0db8573241fca5933ec4dc0d5 Mon Sep 17 00:00:00 2001
From: Colin King <richard.colin.king@gmail.com>
Date: Thu, 31 May 2018 13:03:48 -0700
Subject: [PATCH 2898/3370] kafka: include Kafka Connect shell scripts (#41322)

Kafka Connect is a newer addition to Kafka and these scripts may be
handy to keep around.
---
 pkgs/servers/apache-kafka/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index fe67bdd0282c..fd9c48f3469e 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/bin
     cp bin/kafka* $out/bin
+    cp bin/connect* $out/bin
 
     # allow us the specify logging directory using env
     substituteInPlace $out/bin/kafka-run-class.sh \

From 9e730ee2543dae09d8121a35b148689ceee207a4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Thu, 31 May 2018 09:12:59 +0200
Subject: [PATCH 2899/3370] renaming cudatoolkit version numbers

---
 .../compilers/cudatoolkit/default.nix         | 12 +++----
 .../libraries/science/math/cudnn/default.nix  | 22 ++++++-------
 .../libraries/science/math/nccl/default.nix   | 10 +++---
 pkgs/top-level/all-packages.nix               | 32 +++++++++----------
 pkgs/top-level/python-packages.nix            | 18 +++++------
 5 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index d569e2401b6d..41e5a60596a6 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -151,35 +151,35 @@ let
 
 in {
 
-  cudatoolkit6 = common {
+  cudatoolkit_6 = common {
     version = "6.0.37";
     url = "http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run";
     sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
     gcc = gcc48;
   };
 
-  cudatoolkit65 = common {
+  cudatoolkit_6_5 = common {
     version = "6.5.19";
     url = "http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run";
     sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
     gcc = gcc48;
   };
 
-  cudatoolkit7 = common {
+  cudatoolkit_7 = common {
     version = "7.0.28";
     url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run";
     sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
     gcc = gcc49;
   };
 
-  cudatoolkit75 = common {
+  cudatoolkit_7_5 = common {
     version = "7.5.18";
     url = "http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run";
     sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88";
     gcc = gcc49;
   };
 
-  cudatoolkit8 = common {
+  cudatoolkit_8 = common {
     version = "8.0.61.2";
     url = "https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run";
     sha256 = "1i4xrsqbad283qffvysn88w2pmxzxbbby41lw0j1113z771akv4w";
@@ -192,7 +192,7 @@ in {
     gcc = gcc5;
   };
 
-  cudatoolkit9 = common {
+  cudatoolkit_9 = common {
     version = "9.1.85.1";
     url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux";
     sha256 = "0lz9bwhck1ax4xf1fyb5nicb7l1kssslj518z64iirpy2qmwg5l4";
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index f5715157531e..d612de606619 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, cudatoolkit7, cudatoolkit75, cudatoolkit8, cudatoolkit9 }:
+{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9 }:
 
 let
   generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@@ -8,37 +8,37 @@ let
 in
 
 {
-  cudnn_cudatoolkit7 = generic rec {
+  cudnn_cudatoolkit_7 = generic rec {
     version = "4.0";
-    cudatoolkit = cudatoolkit7;
+    cudatoolkit = cudatoolkit_7;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}-prod.tgz";
     sha256 = "0zgr6qdbc29qw6sikhrh6diwwz7150rqc8a49f2qf37j2rvyyr2f";
   };
 
-  cudnn_cudatoolkit75 = generic rec {
+  cudnn_cudatoolkit_7_5 = generic rec {
     version = "6.0";
-    cudatoolkit = cudatoolkit75;
+    cudatoolkit = cudatoolkit_7_5;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz";
     sha256 = "0b68hv8pqcvh7z8xlgm4cxr9rfbjs0yvg1xj2n5ap4az1h3lp3an";
   };
 
-  cudnn6_cudatoolkit8 = generic rec {
+  cudnn6_cudatoolkit_8 = generic rec {
     version = "6.0";
-    cudatoolkit = cudatoolkit8;
+    cudatoolkit = cudatoolkit_8;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v${version}.tgz";
     sha256 = "173zpgrk55ri8if7s5yngsc89ajd6hz4pss4cdxlv6lcyh5122cv";
   };
 
-  cudnn_cudatoolkit8 = generic rec {
+  cudnn_cudatoolkit_8 = generic rec {
     version = "7.0.5";
-    cudatoolkit = cudatoolkit8;
+    cudatoolkit = cudatoolkit_8;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
     sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e";
   };
 
-  cudnn_cudatoolkit9 = generic rec {
+  cudnn_cudatoolkit_9 = generic rec {
     version = "7.0.5";
-    cudatoolkit = cudatoolkit9;
+    cudatoolkit = cudatoolkit_9;
     srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
     sha256 = "1rfmdd2v47p83fm3sfyvik31gci0q17qs6kjng6mvcsd6akmvb8y";
   };
diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix
index 1d692f6316ff..d3c20258425b 100644
--- a/pkgs/development/libraries/science/math/nccl/default.nix
+++ b/pkgs/development/libraries/science/math/nccl/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, cudatoolkit8, cudatoolkit9 }:
+{ callPackage, cudatoolkit_8, cudatoolkit_9 }:
 
 let
   generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@@ -8,16 +8,16 @@ let
 in
 
 {
-  nccl_cudatoolkit8 = generic rec {
+  nccl_cudatoolkit_8 = generic rec {
     version = "2.1.4";
-    cudatoolkit = cudatoolkit8;
+    cudatoolkit = cudatoolkit_8;
     srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz";
     sha256 = "1lwwm8kdhna5m318yg304kl2gsz1jwhv4zv4gn8av2m57zh848zi";
   };
 
-  nccl_cudatoolkit9 = generic rec {
+  nccl_cudatoolkit_9 = generic rec {
     version = "2.1.4";
-    cudatoolkit = cudatoolkit9;
+    cudatoolkit = cudatoolkit_9;
     srcName = "nccl_${version}-1+cuda${cudatoolkit.majorVersion}_x86_64.txz";
     sha256 = "0pajmqzkacpszs63jh2hw2qqc49kj75kcf7r0ky8hdh560q8xn0p";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4dcd0314066..617372ded93e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1864,23 +1864,23 @@ with pkgs;
   cron = callPackage ../tools/system/cron { };
 
   inherit (callPackages ../development/compilers/cudatoolkit { })
-    cudatoolkit6
-    cudatoolkit65
-    cudatoolkit7
-    cudatoolkit75
-    cudatoolkit8
-    cudatoolkit9;
+    cudatoolkit_6
+    cudatoolkit_6_5
+    cudatoolkit_7
+    cudatoolkit_7_5
+    cudatoolkit_8
+    cudatoolkit_9;
 
-  cudatoolkit = cudatoolkit9;
+  cudatoolkit = cudatoolkit_9;
 
   inherit (callPackages ../development/libraries/science/math/cudnn { })
-    cudnn_cudatoolkit7
-    cudnn_cudatoolkit75
-    cudnn6_cudatoolkit8
-    cudnn_cudatoolkit8
-    cudnn_cudatoolkit9;
+    cudnn_cudatoolkit_7
+    cudnn_cudatoolkit_7_5
+    cudnn6_cudatoolkit_8
+    cudnn_cudatoolkit_8
+    cudnn_cudatoolkit_9;
 
-  cudnn = cudnn_cudatoolkit9;
+  cudnn = cudnn_cudatoolkit_9;
 
   curlFull = curl.override {
     idnSupport = true;
@@ -3910,10 +3910,10 @@ with pkgs;
   xnbd = callPackage ../tools/networking/xnbd { };
 
   inherit (callPackages ../development/libraries/science/math/nccl { })
-    nccl_cudatoolkit8
-    nccl_cudatoolkit9;
+    nccl_cudatoolkit_8
+    nccl_cudatoolkit_9;
 
-  nccl = nccl_cudatoolkit9;
+  nccl = nccl_cudatoolkit_9;
 
   ndjbdns = callPackage ../tools/networking/ndjbdns { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5849a0bc714..6bf9f27291a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1199,8 +1199,8 @@ in {
   cufflinks = callPackage ../development/python-modules/cufflinks { };
 
   cupy = callPackage ../development/python-modules/cupy {
-    cudatoolkit = pkgs.cudatoolkit8;
-    cudnn = pkgs.cudnn6_cudatoolkit8;
+    cudatoolkit = pkgs.cudatoolkit_8;
+    cudnn = pkgs.cudnn6_cudatoolkit_8;
     nccl = pkgs.nccl;
   };
 
@@ -3968,7 +3968,7 @@ in {
   };
 
   pycuda = callPackage ../development/python-modules/pycuda rec {
-    cudatoolkit = pkgs.cudatoolkit75;
+    cudatoolkit = pkgs.cudatoolkit_7_5;
     inherit (pkgs.stdenv) mkDerivation;
   };
 
@@ -5600,14 +5600,14 @@ in {
     # https://github.com/pytorch/pytorch/issues/5831
     # https://devtalk.nvidia.com/default/topic/1028112
     # We should be able to remove this when CUDA 9.2 is released.
-    cudatoolkit9 = pkgs.cudatoolkit9.override {
+    cudatoolkit_9 = pkgs.cudatoolkit_9.override {
       gcc6 = pkgs.gcc5;
     };
   in callPackage ../development/python-modules/pytorch {
     cudaSupport = pkgs.config.cudaSupport or false;
-    cudatoolkit = cudatoolkit9;
-    cudnn = pkgs.cudnn_cudatoolkit9.override {
-      inherit cudatoolkit9;
+    cudatoolkit = cudatoolkit_9;
+    cudnn = pkgs.cudnn_cudatoolkit_9.override {
+      inherit cudatoolkit_9;
     };
   };
 
@@ -17583,8 +17583,8 @@ EOF
     else callPackage ../development/python-modules/tensorflow rec {
       cudaSupport = pkgs.config.cudaSupport or false;
       inherit (pkgs.linuxPackages) nvidia_x11;
-      cudatoolkit = pkgs.cudatoolkit9;
-      cudnn = pkgs.cudnn_cudatoolkit9;
+      cudatoolkit = pkgs.cudatoolkit_9;
+      cudnn = pkgs.cudnn_cudatoolkit_9;
     };
 
   tensorflowWithoutCuda = self.tensorflow.override {

From 397c4b7748df276e6b1b891998785b71999f5e95 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Wed, 30 May 2018 16:37:14 +0200
Subject: [PATCH 2900/3370] cudatoolkit: add 9.0

This version is a dependency of tensorflow binaries
---
 pkgs/development/compilers/cudatoolkit/default.nix       | 7 +++++++
 .../development/libraries/science/math/cudnn/default.nix | 9 ++++++++-
 pkgs/top-level/all-packages.nix                          | 4 +++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 41e5a60596a6..b7c310cf01d2 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -192,6 +192,13 @@ in {
     gcc = gcc5;
   };
 
+  cudatoolkit_9_0 = common {
+    version = "9.0.176.1";
+    url = "https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run";
+    sha256 = "0308rmmychxfa4inb1ird9bpgfppgr9yrfg1qp0val5azqik91ln";
+    gcc = gcc6;
+  };
+
   cudatoolkit_9 = common {
     version = "9.1.85.1";
     url = "https://developer.nvidia.com/compute/cuda/9.1/Prod/local_installers/cuda_9.1.85_387.26_linux";
diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix
index d612de606619..1a98ecc87436 100644
--- a/pkgs/development/libraries/science/math/cudnn/default.nix
+++ b/pkgs/development/libraries/science/math/cudnn/default.nix
@@ -1,4 +1,4 @@
-{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9 }:
+{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9 }:
 
 let
   generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) {
@@ -36,6 +36,13 @@ in
     sha256 = "9e0b31735918fe33a79c4b3e612143d33f48f61c095a3b993023cdab46f6d66e";
   };
 
+  cudnn_cudatoolkit_9_0 = generic rec {
+    version = "7.0.5";
+    cudatoolkit = cudatoolkit_9_0;
+    srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v7.tgz";
+    sha256 = "03mbv4m5lhwnc181xz8li067pjzzhxqbxgnrfc68dffm8xj0fghs";
+  };
+
   cudnn_cudatoolkit_9 = generic rec {
     version = "7.0.5";
     cudatoolkit = cudatoolkit_9;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 617372ded93e..502ab80e9901 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1869,6 +1869,7 @@ with pkgs;
     cudatoolkit_7
     cudatoolkit_7_5
     cudatoolkit_8
+    cudatoolkit_9_0
     cudatoolkit_9;
 
   cudatoolkit = cudatoolkit_9;
@@ -1878,7 +1879,8 @@ with pkgs;
     cudnn_cudatoolkit_7_5
     cudnn6_cudatoolkit_8
     cudnn_cudatoolkit_8
-    cudnn_cudatoolkit_9;
+    cudnn_cudatoolkit_9
+    cudnn_cudatoolkit_9_0;
 
   cudnn = cudnn_cudatoolkit_9;
 

From 82540b5e1a1cf56638f21326999d271eb85c9499 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Wed, 30 May 2018 16:38:51 +0200
Subject: [PATCH 2901/3370] pythonPackages.tensorflow: 1.5.0 -> 1.7.1

Re-instates binary build for all versions.
---
 .../python-modules/tensorflow/bin.nix         | 56 +++++++++++++++----
 .../python-modules/tensorflow/prefetcher.sh   | 29 ++++++++++
 .../tensorflow/tf1.7.1-hashes.nix             | 34 +++++++++++
 pkgs/top-level/python-packages.nix            |  6 +-
 4 files changed, 111 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/development/python-modules/tensorflow/prefetcher.sh
 create mode 100644 pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index c9b89ff7616a..9c6b84e8c7ac 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , buildPythonPackage
-, isPy3k, isPy36, pythonOlder
+, isPy3k, isPy35, isPy36, pythonOlder
 , numpy
 , six
 , protobuf
@@ -12,20 +12,40 @@
 , enum34
 , tensorflow-tensorboard
 , cudaSupport ? false
+, cudatoolkit ? null
+, cudnn ? null
+, nvidia_x11 ? null
+, zlib
+, python
+, symlinkJoin
 }:
 
-# tensorflow is built from a downloaded wheel because the source
-# build doesn't yet work on Darwin.
+# We keep this binary build for two reasons:
+# - the source build doesn't work on Darwin.
+# - the source build is currently brittle and not easy to maintain
 
-buildPythonPackage rec {
+assert cudaSupport -> cudatoolkit != null
+                   && cudnn != null
+                   && nvidia_x11 != null;
+let
+  cudatoolkit_joined = symlinkJoin {
+    name = "unsplit_cudatoolkit";
+    paths = [ cudatoolkit.out
+              cudatoolkit.lib ];};
+
+in buildPythonPackage rec {
   pname = "tensorflow";
-  version = "1.5.0";
+  version = "1.7.1";
   format = "wheel";
 
-  src = fetchurl {
-    url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-${version}-py3-none-any.whl";
-    sha256 = "1mapv45n9wmgcq3i3im0pv0gmhwkxw5z69nsnxb1gfxbj1mz5h9m";
-  };
+  src = let
+    pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) "${python.majorVersion}";
+    version = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot;
+    platform = if stdenv.isDarwin then "mac" else "linux";
+    unit = if cudaSupport then "gpu" else "cpu";
+    key = "${platform}_py_${version}_${unit}";
+    dls = import ./tf1.7.1-hashes.nix;
+  in fetchurl dls.${key};
 
   propagatedBuildInputs = [ numpy six protobuf absl-py ]
                  ++ lib.optional (!isPy3k) mock
@@ -38,14 +58,28 @@ buildPythonPackage rec {
   # bleach) Hence we disable dependency checking for now.
   installFlags = lib.optional isPy36 "--no-dependencies";
 
+  # Note that we need to run *after* the fixup phase because the
+  # libraries are loaded at runtime. If we run in preFixup then
+  # patchelf --shrink-rpath will remove the cuda libraries.
+  postFixup = let
+    rpath = stdenv.lib.makeLibraryPath
+      ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit_joined cudnn nvidia_x11 ]);
+  in
+  lib.optionalString (stdenv.isLinux) ''
+    rrPath="$out/${python.sitePackages}/tensorflow/:${rpath}"
+    internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so"
+    find $out -name '*.${stdenv.hostPlatform.extensions.sharedLibrary}' -exec patchelf --set-rpath "$rrPath" {} \;
+  '';
+
+
   meta = with stdenv.lib; {
     description = "Computation using data flow graphs for scalable machine learning";
     homepage = http://tensorflow.org;
     license = licenses.asl20;
     maintainers = with maintainers; [ jyp abbradar ];
-    platforms = platforms.darwin;
+    platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin;
     # Python 2.7 build uses different string encoding.
     # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253
-    broken = cudaSupport || !isPy3k;
+    broken = stdenv.isDarwin && !isPy3k;
   };
 }
diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh
new file mode 100644
index 000000000000..ba9aa0bdf356
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh
@@ -0,0 +1,29 @@
+version=1.7.1
+hashfile=tf${version}-hashes.nix
+rm -f $hashfile
+echo "{" >> $hashfile
+for sys in "linux" "mac"; do
+    for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do
+        for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64"; do
+            if [ $sys == "mac" ]; then
+               [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]]
+               result=$?
+               pyver=${pykind:2:1}
+               flavour=cpu
+            else
+               [[ $pykind =~ .*linux.* ]]
+               result=$?
+               pyver=${pykind:2:2}
+               flavour=${tfpref:0:3}
+            fi
+            if [ $result == 0 ]; then
+                url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl
+                hash=$(nix-prefetch-url $url)
+                echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile
+                echo "  url = \"$url\";" >> $hashfile
+                echo "  sha256 = \"$hash\";" >> $hashfile
+                echo "};" >> $hashfile
+            fi
+        done
+    done
+done
diff --git a/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix b/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix
new file mode 100644
index 000000000000..c9ed7c182644
--- /dev/null
+++ b/pkgs/development/python-modules/tensorflow/tf1.7.1-hashes.nix
@@ -0,0 +1,34 @@
+{
+linux_py_27_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp27-none-linux_x86_64.whl";
+  sha256 = "0p8n5x74qmdv9g63y176xqpfdc1gawzjysn79bvk46knrks3pa2b";
+};
+linux_py_35_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp35-cp35m-linux_x86_64.whl";
+  sha256 = "050qv8fjpnw2y8da7s910jv4nsxg56d3xdpl09jim47kbwqabr5m";
+};
+linux_py_36_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.7.1-cp36-cp36m-linux_x86_64.whl";
+  sha256 = "00d5cij1mh64hh0zc2qfl8z2hpr3nna6lhpsc6qh4am1g7wz4ndn";
+};
+linux_py_27_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp27-none-linux_x86_64.whl";
+  sha256 = "0ami6nlp9cwg631a8f5rfpzpwb9ls9zxhsx61cimw46xljx3l2b5";
+};
+linux_py_35_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp35-cp35m-linux_x86_64.whl";
+  sha256 = "1xfc8dww52fy8g4b0j8r20q7yj2bfg20hlk9p7sk3k9z8swfw0kc";
+};
+linux_py_36_gpu = {
+  url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.7.1-cp36-cp36m-linux_x86_64.whl";
+  sha256 = "1kkqx8m7h03b8l9l6dki4g4r7sgi3wbb4dp9gvk6l08n4vnlvc50";
+};
+mac_py_2_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.7.1-py2-none-any.whl";
+  sha256 = "1icbsvvwkkc09s6bdd43drvnhc6v6xmnqwjzipgc8rmpj1z71yz5";
+};
+mac_py_3_cpu = {
+  url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.7.1-py3-none-any.whl";
+  sha256 = "0s5dy956jvwazqflc90v15i912zvhwsbzlf0cl8k7isq52j6g3kp";
+};
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6bf9f27291a8..b6c383bfc997 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17580,11 +17580,11 @@ EOF
   tensorflow =
     if stdenv.isDarwin
     then callPackage ../development/python-modules/tensorflow/bin.nix { }
-    else callPackage ../development/python-modules/tensorflow rec {
+    else callPackage ../development/python-modules/tensorflow/bin.nix rec {
       cudaSupport = pkgs.config.cudaSupport or false;
       inherit (pkgs.linuxPackages) nvidia_x11;
-      cudatoolkit = pkgs.cudatoolkit_9;
-      cudnn = pkgs.cudnn_cudatoolkit_9;
+      cudatoolkit = pkgs.cudatoolkit_9_0;
+      cudnn = pkgs.cudnn_cudatoolkit_9_0;
     };
 
   tensorflowWithoutCuda = self.tensorflow.override {

From 58ce59dd96102dcdda28c162c4f8a3d397368af1 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 31 May 2018 16:29:02 -0400
Subject: [PATCH 2902/3370] haskell infra: Allow overriding `haskellSrc2nix`

---
 pkgs/development/haskell-modules/make-package-set.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 2a96c66dced5..271f1c1a8f72 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -149,7 +149,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
       filter = path: type:
                  pkgs.lib.hasSuffix "${name}.cabal" path ||
                  baseNameOf path == "package.yaml";
-      expr = haskellSrc2nix {
+      expr = self.haskellSrc2nix {
         inherit name;
         src = if pkgs.lib.canCleanSource src
                 then pkgs.lib.cleanSourceWith { inherit src filter; }

From 286f9ca704502c575f3a1a00a576a5d7b5242dcd Mon Sep 17 00:00:00 2001
From: Jack Henahan <jhenahan@me.com>
Date: Thu, 31 May 2018 16:37:05 -0400
Subject: [PATCH 2903/3370] configuration-ghc-8.4.x: bump to dhall_1_14_0

The `dhall_1_13_0` attribute doesn't exist, anymore.
---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 55e80d7fb0c3..b0dc20128fc4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -408,8 +408,8 @@ self: super: {
   # Older versions don't compile.
   base-compat = self.base-compat_0_10_1;
   brick = self.brick_0_37_1;
-  dhall = self.dhall_1_13_0;
-  dhall_1_13_0 = doJailbreak super.dhall_1_13_0;  # support ansi-terminal 0.8.x
+  dhall = self.dhall_1_14_0;
+  dhall_1_13_0 = doJailbreak super.dhall_1_14_0;  # support ansi-terminal 0.8.x
   HaTeX = self.HaTeX_3_19_0_0;
   hpack = self.hpack_0_28_2;
   hspec = dontCheck super.hspec_2_5_1;

From aee19ca7f8fd3d49fc5f9f459c6c6fe439673950 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <github@tazj.in>
Date: Thu, 31 May 2018 22:58:04 +0200
Subject: [PATCH 2904/3370] dd-agent: fix compatibility issue with iostat
 (#41035)

Applies a patch to the dd-agent derivation that fixes a compatibility
issue with the current version of iostat, which no longer contains a
colon after its table headers.

This patch is applied in order for the fix to be backportable to
existing stable releases. A final "proper" fix will be an upgrade to a
newer version of dd-agent, but that requires several other changes.

This fixes #40103.
---
 .../dd-agent/40103-iostat-fix.patch           | 30 +++++++++++++++++++
 pkgs/tools/networking/dd-agent/default.nix    |  3 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/dd-agent/40103-iostat-fix.patch

diff --git a/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch b/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch
new file mode 100644
index 000000000000..9897a76c957d
--- /dev/null
+++ b/pkgs/tools/networking/dd-agent/40103-iostat-fix.patch
@@ -0,0 +1,30 @@
+diff --git a/checks/system/unix.py b/checks/system/unix.py
+index c37af3c3..58c72626 100644
+--- a/checks/system/unix.py
++++ b/checks/system/unix.py
+@@ -39,7 +39,7 @@ class IO(Check):
+         self.value_re = re.compile(r'\d+\.\d+')
+ 
+     def _parse_linux2(self, output):
+-        recentStats = output.split('Device:')[2].split('\n')
++        recentStats = output.split('Device')[2].split('\n')
+         header = recentStats[0]
+         headerNames = re.findall(self.header_re, header)
+         device = None
+@@ -123,14 +123,14 @@ class IO(Check):
+ 
+                 #                 Linux 2.6.32-343-ec2 (ip-10-35-95-10)   12/11/2012      _x86_64_        (2 CPU)
+                 #
+-                # Device:         rrqm/s   wrqm/s     r/s     w/s    rkB/s    wkB/s avgrq-sz avgqu-sz   await  svctm  %util
++                # Device         rrqm/s   wrqm/s     r/s     w/s    rkB/s    wkB/s avgrq-sz avgqu-sz   await  svctm  %util
+                 # sda1              0.00    17.61    0.26   32.63     4.23   201.04    12.48     0.16    4.81   0.53   1.73
+                 # sdb               0.00     2.68    0.19    3.84     5.79    26.07    15.82     0.02    4.93   0.22   0.09
+                 # sdg               0.00     0.13    2.29    3.84   100.53    30.61    42.78     0.05    8.41   0.88   0.54
+                 # sdf               0.00     0.13    2.30    3.84   100.54    30.61    42.78     0.06    9.12   0.90   0.55
+                 # md0               0.00     0.00    0.05    3.37     1.41    30.01    18.35     0.00    0.00   0.00   0.00
+                 #
+-                # Device:         rrqm/s   wrqm/s     r/s     w/s    rkB/s    wkB/s avgrq-sz avgqu-sz   await  svctm  %util
++                # Device         rrqm/s   wrqm/s     r/s     w/s    rkB/s    wkB/s avgrq-sz avgqu-sz   await  svctm  %util
+                 # sda1              0.00     0.00    0.00   10.89     0.00    43.56     8.00     0.03    2.73   2.73   2.97
+                 # sdb               0.00     0.00    0.00    2.97     0.00    11.88     8.00     0.00    0.00   0.00   0.00
+                 # sdg               0.00     0.00    0.00    0.00     0.00     0.00     0.00     0.00    0.00   0.00   0.00
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 805b0dddcacf..1038882573bc 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -38,6 +38,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
   };
 
+  patches = [ ./40103-iostat-fix.patch ];
+
   buildInputs = [
     python
     unzip
@@ -59,6 +61,7 @@ in stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp -R $src $out/agent
     chmod u+w -R $out
+    (cd $out/agent; patchPhase)
     PYTHONPATH=$out/agent:$PYTHONPATH
     ln -s $out/agent/agent.py $out/bin/dd-agent
     ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd

From e4ba5dc3d6d4948f8ddb4efb145504ce615c546c Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Fri, 1 Jun 2018 00:04:50 +0300
Subject: [PATCH 2905/3370] gitkraken: 3.6.0 -> 3.6.1 (#41130)

---
 .../version-management/gitkraken/default.nix  | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index cf68da44a5fa..74364327645d 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.6.0";
+  version = "3.6.1";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "0zrxw7rrlspm3ic847dy1ly4rlcdkizdr6m8nycmrxg4s98yxkb8";
+    sha256 = "1f77y281r3dp35vw3zdai2cgwwy2gpg7px6g66ylfz4gkig26dz8";
   };
 
   libPath = makeLibraryPath [
@@ -54,41 +54,47 @@ stdenv.mkDerivation rec {
     libgnome-keyring
   ];
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  dontBuild = true;
-
   desktopItem = makeDesktopItem {
     name = "gitkraken";
     exec = "gitkraken";
-    icon = "app";
+    icon = "gitkraken";
     desktopName = "GitKraken";
     genericName = "Git Client";
     categories = "Application;Development;";
     comment = "Graphical Git client from Axosoft";
   };
 
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ dpkg ];
 
-  unpackPhase = "true";
-  buildCommand = ''
-    mkdir -p $out
-    dpkg -x $src $out
-    substituteInPlace $out/usr/share/applications/gitkraken.desktop \
-      --replace /usr/share/gitkraken $out/bin
-    cp -av $out/usr/* $out
-    rm -rf $out/etc $out/usr $out/share/lintian
-    chmod -R g-w $out
+  unpackCmd = ''
+    mkdir out
+    dpkg -x $curSrc out
+  '';
 
-    for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
+  installPhase = ''
+    mkdir $out
+    pushd usr
+    pushd share
+    substituteInPlace applications/gitkraken.desktop \
+      --replace /usr/share/gitkraken $out/bin \
+      --replace Icon=app Icon=gitkraken
+    mv pixmaps/app.png pixmaps/gitkraken.png
+    popd
+    rm -rf bin/gitkraken share/lintian
+    cp -av share bin $out/
+    popd
+    ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
+  '';
+
+  postFixup = ''
+    pushd $out/share/gitkraken
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" gitkraken
+
+    for file in $(find . -type f \( -name \*.node -o -name gitkraken -o -name \*.so\* \) ); do
       patchelf --set-rpath ${libPath}:$out/share/gitkraken $file || true
     done
-
-    find $out/share/gitkraken -name "*.node" -exec patchelf --set-rpath "${libPath}:$out/share/gitkraken" {} \;
-
-    mkdir $out/bin
-    ln -s $out/share/gitkraken/gitkraken $out/bin/gitkraken
+    popd
   '';
 
   meta = {

From 2d3db84ddbb3555e48464b5cc20747f71c458c28 Mon Sep 17 00:00:00 2001
From: coretemp <34454443+coretemp@users.noreply.github.com>
Date: Thu, 31 May 2018 23:15:19 +0200
Subject: [PATCH 2906/3370] dnscrypt-proxy: make man 8 dnscrypt-proxy work
 (#41039)

---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 6f5e7d8d456e..8edcf925dbfa 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -145,6 +145,9 @@ in
       }
     ];
 
+    # make man 8 dnscrypt-proxy work
+    environment.systemPackages = [ pkgs.dnscrypt-proxy ];
+
     users.users.dnscrypt-proxy = {
       description = "dnscrypt-proxy daemon user";
       isSystemUser = true;

From 7aca4b47c8d312fdb10b086c5d93d04d884fc62f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 17:15:50 -0400
Subject: [PATCH 2907/3370] add sys/tree.h is needed for mg

---
 pkgs/os-specific/bsd/netbsd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix
index eb305d5b3db7..950694d0bfe3 100644
--- a/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/pkgs/os-specific/bsd/netbsd/default.nix
@@ -205,6 +205,7 @@ let
       install -D $NETBSDSRCDIR/include/rpc/types.h $out/include/rpc/types.h
       install -D $NETBSDSRCDIR/include/utmpx.h $out/include/utmpx.h
       install -D $NETBSDSRCDIR/include/tzfile.h $out/include/tzfile.h
+      install -D $NETBSDSRCDIR/sys/sys/tree.h $out/include/sys/tree.h
 
       mkdir -p $out/lib/pkgconfig
       substitute ${./libbsd-overlay.pc} $out/lib/pkgconfig/libbsd-overlay.pc \

From c6c2e65c2da191f09edfa4554d79408943816ef1 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 31 May 2018 21:27:41 +0000
Subject: [PATCH 2908/3370] graalvm8: 0.31 -> 1.0.0-rc1 (#41335)

Minor update and fix the build which is broken since the default GCC hardening was changed
---
 .../development/compilers/graalvm/default.nix | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
index 2eb9c4a7e835..ff269afd1a64 100644
--- a/pkgs/development/compilers/graalvm/default.nix
+++ b/pkgs/development/compilers/graalvm/default.nix
@@ -23,11 +23,15 @@ let
     rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6.sources_${sha1}.jar";                url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; }
     rec { sha1 = "b852fb028de645ad2852bbe998e084d253f450a5"; name = "JMH_GENERATOR_ANNPROCESS_1_18_${sha1}.jar";         url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18.jar; }
     rec { sha1 = "d455b0dc6108b5e6f1fb4f6cf1c7b4cbedbecc97"; name = "JMH_GENERATOR_ANNPROCESS_1_18.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.18/jmh-generator-annprocess-1.18-sources.jar; }
+    rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}.jar";         url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; }
+    rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21.sources_${sha1}.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; }
     rec { sha1 = "702b8525fcf81454235e5e2fa2a35f15ffc0ec7e"; name = "ASM_DEBUG_ALL_${sha1}.jar";                         url = mirror://maven/org/ow2/asm/asm-debug-all/5.0.4/asm-debug-all-5.0.4.jar; }
     rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}.jar";                     url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; }
     rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2.sources_${sha1}.jar";             url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; }
     rec { sha1 = "0174aa0077e9db596e53d7f9ec37556d9392d5a6"; name = "JMH_1_18_${sha1}.jar";                              url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18.jar; }
     rec { sha1 = "7ff1e1aafea436b6aa8b29a8b8f1c2d66be26f5b"; name = "JMH_1_18.sources_${sha1}.jar";                      url = mirror://maven/org/openjdk/jmh/jmh-core/1.18/jmh-core-1.18-sources.jar; }
+    rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}.jar";                              url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; }
+    rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21.sources_${sha1}.jar";                      url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; }
     rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}.jar";                                 url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12.jar; }
     rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT.sources_${sha1}.jar";                         url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/junit-4.12-sources.jar; }
     rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}.jar";                              url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hamcrest-core-1.3.jar; }
@@ -50,13 +54,14 @@ let
 
 in rec {
 
-  mx = stdenv.mkDerivation {
+  mx = stdenv.mkDerivation rec {
+    version = "5.171.0";
     name = "mx";
     src = fetchFromGitHub {
       owner  = "graalvm";
       repo   = "mx";
-      rev    = "22557cf7ec417c49aca20c13a9123045005d72d0"; # HEAD at 2018-02-16
-      sha256 = "070647ih2qzcssj7yripbg1w9bjwi1rcp1blx5z3jbp1shrr6563";
+      rev    = version;
+      sha256 = "0ag3g49fnjrnlmjb55dbn9l2cwyvanx36f5hyf21ad8px05fh6jv";
     };
     nativeBuildInputs = [ makeWrapper ];
     buildPhase = ''
@@ -77,9 +82,9 @@ in rec {
 
   # copy of pkgs.oraclejvm8 with JVMCI interface (TODO: it should work with pkgs.openjdk8 too)
   jvmci8 = stdenv.mkDerivation rec {
-    version = "0.41";
+    version = "0.43";
     name = let
-             n = "jvmci8u161-${version}";
+             n = "jvmci8u171-${version}";
            in if (lib.stringLength n) == (lib.stringLength oraclejdk8.name) then
                 n
               else
@@ -88,7 +93,7 @@ in rec {
       owner  = "graalvm";
       repo   = "graal-jvmci-8";
       rev    = "jvmci-${version}";
-      sha256 = "0pajf114l8lzczfdzz968c3s1ardiy4q5ya8p2kmwxl06giy95qr";
+      sha256 = "0jkp67m7s252kngxnj0yp397pgx5z95v1lbi68v9g4dw050l28rk";
     };
     buildInputs = [ mx mercurial ];
     postUnpack = ''
@@ -101,8 +106,10 @@ in rec {
         hg checkout ${lib.escapeShellArg src.rev}
       )
     '';
+    hardeningDisable = [ "fortify" ];
     NIX_CFLAGS_COMPILE = [
       "-Wno-error=format-overflow" # newly detected by gcc7
+      "-Wno-error=nonnull"
     ];
     buildPhase = ''
       cp -dpR ${oraclejdk8} writable-copy-of-jdk
@@ -122,9 +129,9 @@ in rec {
   };
 
   graalvm8 = stdenv.mkDerivation rec {
-    version = "0.31";
+    version = "1.0.0-rc1";
     name = let
-             n = "graal-vm-8-${version}";
+             n = "graal-${version}";
            in if (lib.stringLength n) == (lib.stringLength jvmci8.name) then
                 n
               else
@@ -132,8 +139,8 @@ in rec {
     src = fetchFromGitHub {
       owner  = "oracle";
       repo   = "graal";
-      rev    = "vm-enterprise-${version}";
-      sha256 = "0rhd6dk2jpbxgdprqvdk991b2k177jrjgyjabdnmv5lzlhczy676";
+      rev    = "vm-${version}";
+      sha256 = "1j1m53d8x0mkvqr9lwlkjddfha5jrsq9hxlblbjv1bqcivfmmfn7";
     };
     buildInputs = [ mx zlib mercurial jvmci8 ];
     postUnpack = ''
@@ -167,7 +174,6 @@ in rec {
       cp -pR  $MX_ALT_OUTPUT_ROOT/tools/dists/chromeinspector*          $out/jre/tools/chromeinspector/
       echo "name=GraalVM ${version}"                                  > $out/jre/lib/amd64/server/vm.properties
       ln -s --relative $out/jre/bin/native-image                        $out/bin/native-image
-      cp      $out/jre/tools/nfi/bin/libtrufflenfi.so                   $out/jre/lib/amd64/
       cp -dpR $out/jre/lib/svm/clibraries                               $out/jre/lib/svm/builder/
 
       # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
@@ -193,7 +199,7 @@ in rec {
       $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
 
       # Ahead-Of-Time compilation
-      $out/bin/native-image -no-server HelloWorld
+      $out/bin/native-image --no-server HelloWorld
       ./helloworld
       ./helloworld | fgrep 'Hello World'
     '';

From 75f20c2e3e5ad81a996c33e8c5462263ac757e46 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 31 May 2018 21:33:15 +0000
Subject: [PATCH 2909/3370] frostwire: 6.6.3 -> 6.6.7

---
 pkgs/applications/networking/p2p/frostwire/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 727999414020..79d0e9acef92 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, gradle, perl, jre, makeWrapper, makeDesktopItem, mplayer }:
 
 let
-  version = "6.6.3-build-253";
+  version = "6.6.7-build-529";
   name = "frostwire-desktop-${version}";
 
   src = fetchFromGitHub {
     owner = "frostwire";
     repo = "frostwire";
     rev = name;
-    sha256 = "1bqv942hfz12i3b3nm1pfwdp7f58nzjxg44h31f3q47719hh8kd7";
+    sha256 = "03wdj2kr8akzx8m1scvg98132zbaxh81qjdsxn2645b3gahjwz0m";
   };
 
   desktopItem = makeDesktopItem {
@@ -40,7 +40,7 @@ let
     '';
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
-    outputHash = "0p279i41q7pn6nss8vndv3g4qzrvj3pmhdxq50kymwkyp2kly3lc";
+    outputHash = "11zd98g0d0fdgls4lsskkagwfxyh26spfd6c6g9cahl89czvlg3c";
   };
 
 in stdenv.mkDerivation {

From 001a84f22adb50971c5d3898012eb92a5c90d503 Mon Sep 17 00:00:00 2001
From: symphorien <symphorien@users.noreply.github.com>
Date: Thu, 31 May 2018 21:33:48 +0000
Subject: [PATCH 2910/3370] etherape: 0.9.13 -> 0.9.17 (#41332)

fixes startup
---
 .../networking/sniffers/etherape/default.nix  | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix
index f01a36cc65f5..9c27139c66d2 100644
--- a/pkgs/applications/networking/sniffers/etherape/default.nix
+++ b/pkgs/applications/networking/sniffers/etherape/default.nix
@@ -1,24 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, libgnome, libgnomeui
-, gnomedocutils, scrollkeeper, libxslt }:
+{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade,
+libgnomecanvas, popt, itstool }:
 
 stdenv.mkDerivation rec {
-  name = "etherape-0.9.13";
+  name = "etherape-0.9.17";
   src = fetchurl {
     url = "mirror://sourceforge/etherape/${name}.tar.gz";
-    sha256 = "1xq93k1slyak8mgwrw5kymq0xn0kl8chvfcvaablgki4p0l2lg9a";
+    sha256 = "1n66dw9nsl7zz0qfkb74ncgch3lzms2ssw8dq2bzbk3q1ilad3p6";
   };
 
-  configureFlags = [ "--disable-scrollkeeper" ];
-
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ itstool pkgconfig ];
   buildInputs = [
-    libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils
-    scrollkeeper libxslt
+    libtool gtk2 libpcap libglade libgnomecanvas popt
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://etherape.sourceforge.net/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with platforms; linux;
+    maintainers = with maintainers; [ symphorien ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9d7ec7c5d4c..d7c718fe8780 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15647,7 +15647,7 @@ with pkgs;
   eterm = callPackage ../applications/misc/eterm { };
 
   etherape = callPackage ../applications/networking/sniffers/etherape {
-    inherit (gnome2) gnomedocutils libgnome libglade libgnomeui scrollkeeper;
+    inherit (gnome2) libgnomecanvas libglade;
   };
 
   evilvte = callPackage ../applications/misc/evilvte {

From 2bd46c6b8029c7a3f3abff6c8b2336734f12bcc5 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 31 May 2018 21:34:21 +0000
Subject: [PATCH 2911/3370] frostwire-bin: 6.6.5 -> 6.6.7

---
 pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
index 84ed1ff92591..d634502a0352 100644
--- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
+++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "6.6.5";
+  version = "6.6.7";
   name = "frostwire-${version}";
 
   src = fetchurl {
     url = "http://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz";
-    sha256 = "0qxh5288mxd7ksd3zl0i8avkyzh8lj06x3jqya8znfq1c1wg0fph";
+    sha256 = "01ah0cwr3ahihfz1xxs0irw4rsa7wjgnlkcqfyg5q9rmzwbnxkyh";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 8b984ba61e011b02466dc7f371a4d84ed81a713d Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Thu, 31 May 2018 22:10:44 +0000
Subject: [PATCH 2912/3370] frostwire: disable auto-update

---
 .../applications/networking/p2p/frostwire/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix
index 79d0e9acef92..8cb5f768f956 100644
--- a/pkgs/applications/networking/p2p/frostwire/default.nix
+++ b/pkgs/applications/networking/p2p/frostwire/default.nix
@@ -52,8 +52,15 @@ in stdenv.mkDerivation {
   buildPhase = ''
     export GRADLE_USER_HOME=$(mktemp -d)
     ( cd desktop
+
+      # disable auto-update (anyway it won't update frostwire installed in nix store)
+      substituteInPlace src/com/frostwire/gui/updates/UpdateManager.java \
+        --replace 'um.checkForUpdates' '// um.checkForUpdates'
+
+      # fix path to mplayer
       substituteInPlace src/com/frostwire/gui/player/MediaPlayerLinux.java \
         --replace /usr/bin/mplayer ${mplayer}/bin/mplayer
+
       substituteInPlace build.gradle \
         --replace 'mavenCentral()' 'mavenLocal(); maven { url uri("${deps}") }'
       gradle --offline --no-daemon build
@@ -66,8 +73,8 @@ in stdenv.mkDerivation {
     cp desktop/build/libs/frostwire.jar $out/share/java/frostwire.jar
 
     cp ${ { x86_64-darwin = "desktop/lib/native/*.dylib";
-            x86_64-linux  = "desktop/lib/native/libjlibtorrent.so";
-            i686-linux    = "desktop/lib/native/libjlibtorrentx86.so";
+            x86_64-linux  = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}.so";
+            i686-linux    = "desktop/lib/native/lib{jlibtorrent,SystemUtilities}X86.so";
           }.${stdenv.system} or (throw "unsupported system ${stdenv.system}")
         } $out/lib
 

From ae8b7a189ac3cd4509d7e21f72e5477aa61a3db4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 1 Jun 2018 00:13:15 +0200
Subject: [PATCH 2913/3370] Revert "Revert commit
 4b2f3971981272b79da7f87b639ca8854a6ea89c"

This reverts commit 85ae7137ac6a1623be90c8f0897566367d300c12.
---
 .../libraries/gdk-pixbuf/default.nix          | 70 ++++++++++++++-----
 .../gdk-pixbuf/installed-tests-path.patch     | 13 ++++
 .../gdk-pixbuf/no-mime-sniffing.patch         | 18 +++++
 3 files changed, 84 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
 create mode 100644 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 7660d6481c3c..849e72d9a976 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -4,39 +4,72 @@
 
 let
   pname = "gdk-pixbuf";
-  version = "2.36.7";
-  # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
-  # which apparently requires access to shared-mime-info files during runtime.
+  version = "2.36.12";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1b6e5eef09d98f05f383014ecd3503e25dfb03d7e5b5f5904e5a65b049a6a4d8";
+  # TODO: Change back once tests/bug753605-atsize.jpg is part of the dist tarball
+  # src = fetchurl {
+  #   url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
+  #   sha256 = "0d534ysa6n9prd17wwzisq7mj6qkhwh8wcf8qgin1ar3hbs5ry7z";
+  # };
+  src = fetchgit {
+    url = https://gitlab.gnome.org/GNOME/gdk-pixbuf.git;
+    rev = version;
+    sha256 = "18lwqg63vyap2m1mw049rnb8fm869429xbf7636a2n21gs3d3jwv";
   };
 
-  outputs = [ "out" "dev" "devdoc" ];
+  patches = [
+    # TODO: since 2.36.8 gdk-pixbuf gets configured to use mime-type sniffing,
+    # which requires access to shared-mime-info files during runtime.
+    # For now, we are patching the build script to avoid the dependency.
+    ./no-mime-sniffing.patch
+
+    # Fix installed tests with meson
+    # https://bugzilla.gnome.org/show_bug.cgi?id=795527
+    (fetchurl {
+      url = https://bugzilla.gnome.org/attachment.cgi?id=371381;
+      sha256 = "0nl1cixkjfa5kcfh0laz8h6hdsrpdkxqn7a1k35jrb6zwc9hbydn";
+    })
+
+    # Add missing test file bug753605-atsize.jpg
+    (fetchpatch {
+      url = https://gitlab.gnome.org/GNOME/gdk-pixbuf/commit/87f8f4bf01dfb9982c1ef991e4060a5e19fdb7a7.patch;
+      sha256 = "1slzywwnrzfx3zjzdsxrvp4g2q4skmv50pdfmyccp41j7bfyb2j0";
+    })
+
+    # Move installed tests to a separate output
+    ./installed-tests-path.patch
+  ];
+
+  outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
 
   setupHook = ./setup-hook.sh;
 
-  enableParallelBuilding = true;
-
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 gobjectIntrospection ];
+  buildInputs = [ libX11 ];
 
-  nativeBuildInputs = [ pkgconfig ]
+  nativeBuildInputs = [
+    meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43
+    gtk-doc gobjectIntrospection makeWrapper
+  ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  configureFlags = "--with-libjasper --with-x11"
-    + stdenv.lib.optionalString (gobjectIntrospection != null) " --enable-introspection=yes"
-    ;
+  mesonFlags = [
+    "-Ddocs=true"
+    "-Djasper=true"
+    "-Dx11=true"
+    "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
+  ];
 
-  # on darwin, tests don't link
-  preBuild = stdenv.lib.optionalString (stdenv.isDarwin && !doCheck) ''
-    substituteInPlace Makefile --replace "docs tests" "docs"
+  postPatch = ''
+    chmod +x build-aux/* # patchShebangs only applies to executables
+    patchShebangs build-aux
+
+    substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests"
   '';
 
   postInstall =
@@ -44,6 +77,9 @@ stdenv.mkDerivation rec {
     ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
+
+      # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
+      $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
   # The fixDarwinDylibNames hook doesn't patch library references or binaries.
diff --git a/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
new file mode 100644
index 000000000000..1da2b0a10dcd
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
@@ -0,0 +1,13 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -85,8 +85,8 @@
+   'aero.gif',
+ ]
+ 
+-installed_test_bindir = join_paths(gdk_pixbuf_libexecdir, 'installed-tests', meson.project_name())
+-installed_test_datadir = join_paths(gdk_pixbuf_datadir, 'installed-tests', meson.project_name())
++installed_test_bindir = join_paths('@installedtestsprefix@', 'libexec', 'installed-tests', meson.project_name())
++installed_test_datadir = join_paths('@installedtestsprefix@', 'share', 'installed-tests', meson.project_name())
+ 
+ install_data(test_data, install_dir: installed_test_bindir)
+ install_subdir('test-images', install_dir: installed_test_bindir)
diff --git a/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
new file mode 100644
index 000000000000..9896e25acda1
--- /dev/null
+++ b/pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
@@ -0,0 +1,18 @@
+--- a/meson.build
++++ b/meson.build
+@@ -186,13 +186,8 @@
+ gmodule_dep = dependency('gmodule-no-export-2.0')
+ gio_dep = dependency('gio-2.0')
+ 
+-# On non-Windows/macOS systems we always required shared-mime-info and GIO
+-if host_system != 'windows' and host_system != 'darwin'
+-  shared_mime_dep = dependency('shared-mime-info')
+-  gdk_pixbuf_conf.set('GDK_PIXBUF_USE_GIO_MIME', 1)
+-else
+-  shared_mime_dep = []
+-endif
++# No MIME sniffing for now
++shared_mime_dep = []
+ 
+ gdk_pixbuf_deps = [ mathlib_dep, gobject_dep, gmodule_dep, gio_dep, shared_mime_dep ]
+ 

From 6d3b9763a6b343531a510ca495ec1bc260d41c32 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 1 Jun 2018 00:14:59 +0200
Subject: [PATCH 2914/3370] gdk-pixbuf: make loaders builtin on Darwin

Meson produces faulty loaders on Darwin, building them into the library bypasses that.

https://github.com/NixOS/nixpkgs/commit/4b2f3971981272b79da7f87b639ca8854a6ea89c
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 849e72d9a976..b0a86644afb2 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     "-Djasper=true"
     "-Dx11=true"
     "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin "-Dbuiltin_loaders=all";
 
   postPatch = ''
     chmod +x build-aux/* # patchShebangs only applies to executables

From 86c4a640b4c952388831a516fbebc060b6e7868b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 1 Jun 2018 00:17:38 +0200
Subject: [PATCH 2915/3370] Revert "nixos: disable gdk-pixbuf test"

This reverts commit 218ada1ba7ecb0a3b1d9e7aed9147ba35d484faa.
---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 13174f992e62..1e52c0f86a7a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -289,7 +289,7 @@ in rec {
   tests.flatpak = callTest tests/flatpak.nix {};
   tests.firewall = callTest tests/firewall.nix {};
   tests.fwupd = callTest tests/fwupd.nix {};
-  #tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
+  tests.gdk-pixbuf = callTest tests/gdk-pixbuf.nix {};
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gitolite = callTest tests/gitolite.nix {};
   tests.gjs = callTest tests/gjs.nix {};

From ef7e0e8347b630b08a7fbb6f82ac45636a31afc2 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 1 Jun 2018 00:21:04 +0200
Subject: [PATCH 2916/3370] scdoc: 1.3.3 -> 1.3.4

---
 pkgs/tools/typesetting/scdoc/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix
index b3c256e94869..d6bdbf920852 100644
--- a/pkgs/tools/typesetting/scdoc/default.nix
+++ b/pkgs/tools/typesetting/scdoc/default.nix
@@ -2,16 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "scdoc-${version}";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchurl {
     url = "https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-${version}.tar.xz";
-    sha256 = "1xkfsrzpbm68522b1dml9dghnwb5dlwpf91c1i4y51rgv3hdgwdj";
+    sha256 = "131f6sd4azpc988kwzlrc9c4x98abhfnxr5wpk7i427ha84g89yb";
   };
 
   postPatch = ''
     substituteInPlace Makefile \
-      --replace "VERSION=1.2.3" "VERSION=${version}" \
       --replace "-static" "" \
       --replace "/usr/local" "$out"
   '';

From 0046d4239767f7586eafa1a9c503ad97f1edb542 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Fri, 1 Jun 2018 01:53:54 +0200
Subject: [PATCH 2917/3370] cargo-edit: remove reference to <nixpkgs>

... it broke nixpkgs.tarball
---
 pkgs/tools/package-management/cargo-edit/cargo-edit.nix | 4 +++-
 pkgs/tools/package-management/cargo-edit/default.nix    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
index c37ef373ac24..042c999be0df 100644
--- a/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
+++ b/pkgs/tools/package-management/cargo-edit/cargo-edit.nix
@@ -1,5 +1,7 @@
 # Generated by carnix 0.6.6: carnix -o cargo-edit.nix --src ./. Cargo.lock --standalone
-with import <nixpkgs> {};
+{ pkgs }:
+
+with pkgs;
 let kernel = buildPlatform.parsed.kernel.name;
     abi = buildPlatform.parsed.abi.name;
     include = includedFiles: src: builtins.filterSource (path: type:
diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix
index 933d41278583..37f543b66b64 100644
--- a/pkgs/tools/package-management/cargo-edit/default.nix
+++ b/pkgs/tools/package-management/cargo-edit/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, darwin, defaultCrateOverrides, fetchFromGitHub }:
+{ stdenv, pkgs, darwin, defaultCrateOverrides, fetchFromGitHub }:
 
-((import ./cargo-edit.nix).cargo_edit {}).override {
+((import ./cargo-edit.nix { inherit pkgs; }).cargo_edit {}).override {
   crateOverrides = defaultCrateOverrides // {
     cargo-edit = attrs: rec {
       name = "cargo-edit-${version}";

From b13c4e546542b2f599d8aa9d2b082ecf916479e6 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 31 May 2018 20:09:20 -0400
Subject: [PATCH 2918/3370] release: remove nix-repl

nix-repl is not needed anymore because Nix 2.0 comes with repl already. Anyway nix-repl is broken right now on Hydra because Nix 1.11 is broken.

https://hydra.nixos.org/build/74933091
---
 pkgs/top-level/release.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index b4eeef1f3def..f78152a8931c 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -44,7 +44,6 @@ let
               jobs.git.x86_64-darwin
               jobs.go.x86_64-darwin
               jobs.mariadb.x86_64-darwin
-              jobs.nix-repl.x86_64-darwin
               jobs.nix.x86_64-darwin
               jobs.nox.x86_64-darwin
               jobs.nix-info.x86_64-darwin
@@ -84,9 +83,6 @@ let
               jobs.python.x86_64-darwin
               jobs.python3.x86_64-linux
               jobs.python3.x86_64-darwin
-              # Many developers use nix-repl
-              jobs.nix-repl.x86_64-linux
-              jobs.nix-repl.x86_64-darwin
               # Needed by travis-ci to test PRs
               jobs.nox.x86_64-linux
               jobs.nox.x86_64-darwin

From aa59151c21c353923b3f003662f17f2210c63c57 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 31 May 2018 20:23:24 -0400
Subject: [PATCH 2919/3370] doc: Adds rule to xmlformat to help keep spacing
 right.

The other definitions broke term, cmdsynopsis and arg tags; spaces
inside were removed, making workdsrun-ininstead of keeping them spaced.
---
 nixos/doc/xmlformat.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/xmlformat.conf b/nixos/doc/xmlformat.conf
index 50255857b24a..4a565c8465bc 100644
--- a/nixos/doc/xmlformat.conf
+++ b/nixos/doc/xmlformat.conf
@@ -67,6 +67,7 @@ programlisting screen
   entry-break = 0
   exit-break = 0
 
-
-#term
-#  format       inline
+# This is needed so that the spacing inside those tags is kept.
+term cmdsynopsis arg
+  normalize yes
+  format    block

From bc0421c4cf18c431ece8d6a19f723159316f55ff Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 31 May 2018 20:26:27 -0400
Subject: [PATCH 2920/3370] doc: Adds xml fixing script. (see previous and next
 commits)

This script is used to automatically fix issues within xml documentation
files.

The script is *for now* intended to be used ad-hoc, and the commits to
be examined.

A future discussion will define whether:

  * This commit and scripts are kept.
  * The script is extended for common use.

The biggest issue right now with the script is that it *could* in theory
destroy a valid space-less varlistentry.

The script could, in practical use, be changed and extended to normalize
some parts of the XML files, mainly:

  * A common quoting style for attributes
  * Fix-up some weird formatting automatically that xmlformat doesn't
    catch
---
 doc/Makefile                    |   5 ++
 doc/shell.nix                   |   2 +-
 nixos/doc/manual/Makefile       |   5 ++
 nixos/doc/manual/shell.nix      |   2 +-
 nixos/doc/varlistentry-fixer.rb | 124 ++++++++++++++++++++++++++++++++
 5 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100755 nixos/doc/varlistentry-fixer.rb

diff --git a/doc/Makefile b/doc/Makefile
index 8a4612e95f19..ba77be6678c4 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -12,6 +12,11 @@ format:
 	find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
 		xmlformat --config-file "$$XMLFORMAT_CONFIG" -i {}
 
+.PHONY: fix-misc-xml
+fix-misc-xml:
+	find . -iname '*.xml' -type f \
+		-exec ../nixos/doc/varlistentry-fixer.rb {} ';'
+
 .PHONY: clean
 clean:
 	rm -f ${MD_TARGETS} .version manual-full.xml
diff --git a/doc/shell.nix b/doc/shell.nix
index e8da2eaf16be..24fe20e81050 100644
--- a/doc/shell.nix
+++ b/doc/shell.nix
@@ -1,5 +1,5 @@
 { pkgs ? import ../. {} }:
 (import ./default.nix).overrideAttrs (x: {
-  buildInputs = x.buildInputs ++ [ pkgs.xmloscopy ];
+  buildInputs = x.buildInputs ++ [ pkgs.xmloscopy pkgs.ruby ];
 
 })
diff --git a/nixos/doc/manual/Makefile b/nixos/doc/manual/Makefile
index 2e2322d5fb51..5cbbf140869a 100644
--- a/nixos/doc/manual/Makefile
+++ b/nixos/doc/manual/Makefile
@@ -14,6 +14,11 @@ format:
 	find . -iname '*.xml' -type f -print0 | xargs -0 -I{} -n1 \
 		xmlformat --config-file "../xmlformat.conf" -i {}
 
+.PHONY: fix-misc-xml
+fix-misc-xml:
+	find . -iname '*.xml' -type f \
+		-exec ../varlistentry-fixer.rb {} ';'
+
 .PHONY: clean
 clean:
 	rm -f manual-combined.xml generated
diff --git a/nixos/doc/manual/shell.nix b/nixos/doc/manual/shell.nix
index 7f8422b4ec11..cc3609d750e0 100644
--- a/nixos/doc/manual/shell.nix
+++ b/nixos/doc/manual/shell.nix
@@ -4,5 +4,5 @@ in
 pkgs.mkShell {
   name = "nixos-manual";
 
-  buildInputs = with pkgs; [ xmlformat jing xmloscopy ];
+  buildInputs = with pkgs; [ xmlformat jing xmloscopy ruby ];
 }
diff --git a/nixos/doc/varlistentry-fixer.rb b/nixos/doc/varlistentry-fixer.rb
new file mode 100755
index 000000000000..6c7cc1e6439b
--- /dev/null
+++ b/nixos/doc/varlistentry-fixer.rb
@@ -0,0 +1,124 @@
+#!/usr/bin/env ruby
+
+# This script is written intended as a living, evolving tooling
+# to fix oopsies within the docbook documentation.
+#
+# This is *not* a formatter. It, instead, handles some known cases
+# where something bad happened, and fixing it manually is tedious.
+#
+# Read the code to see the different cases it handles.
+#
+# ALWAYS `make format` after fixing with this!
+# ALWAYS read the changes, this tool isn't yet proven to be always right.
+
+require "rexml/document"
+include REXML
+
+if ARGV.length < 1 then
+	$stderr.puts "Needs a filename."
+	exit 1
+end
+
+filename = ARGV.shift
+doc = Document.new(File.open(filename))
+
+$touched = false
+
+# Fixing varnames having a sibling element without spacing.
+# This is to fix an initial `xmlformat` issue where `term`
+# would mangle as spaces.
+#
+#   <varlistentry>
+#    <term><varname>types.separatedString</varname><replaceable>sep</replaceable> <----
+#    </term>
+#    ...
+#
+# Generates: types.separatedStringsep
+#                               ^^^^
+#
+# <varlistentry xml:id='fun-makeWrapper'>
+#  <term>
+#   <function>makeWrapper</function><replaceable>executable</replaceable><replaceable>wrapperfile</replaceable><replaceable>args</replaceable>  <----
+#  </term>
+#
+# Generates: makeWrapperexecutablewrapperfileargs
+#                     ^^^^      ^^^^    ^^  ^^
+#
+#    <term>
+#     <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable> <-----
+#    </term>
+#
+# Generates: --optionnamevalue
+#                   ^^  ^^
+doc.elements.each("//varlistentry/term") do |term|
+	["varname", "function", "option", "replaceable"].each do |prev_name|
+		term.elements.each(prev_name) do |el|
+			if el.next_element and
+					el.next_element.name == "replaceable" and
+					el.next_sibling_node.class == Element
+				then
+				$touched = true
+				term.insert_after(el, Text.new(" "))
+			end
+		end
+	end
+end
+
+
+
+#  <cmdsynopsis>
+#   <command>nixos-option</command>
+#   <arg>
+#    <option>-I</option><replaceable>path</replaceable>        <------
+#   </arg>
+#
+# Generates: -Ipath
+#             ^^
+doc.elements.each("//cmdsynopsis/arg") do |term|
+	["option", "replaceable"].each do |prev_name|
+		term.elements.each(prev_name) do |el|
+			if el.next_element and
+				el.next_element.name == "replaceable" and
+				el.next_sibling_node.class == Element
+			then
+				$touched = true
+				term.insert_after(el, Text.new(" "))
+			end
+		end
+	end
+end
+
+#  <cmdsynopsis>
+#   <arg>
+#    <group choice='req'>
+#    <arg choice='plain'>
+#     <option>--profile-name</option>
+#    </arg>
+#
+#    <arg choice='plain'>
+#     <option>-p</option>
+#    </arg>
+#     </group><replaceable>name</replaceable>   <----
+#   </arg>
+#
+# Generates: [{--profile-name | -p }name]
+#                                   ^^^^
+doc.elements.each("//cmdsynopsis/arg") do |term|
+	["group"].each do |prev_name|
+		term.elements.each(prev_name) do |el|
+			if el.next_element and
+				el.next_element.name == "replaceable" and
+				el.next_sibling_node.class == Element
+			then
+				$touched = true
+				term.insert_after(el, Text.new(" "))
+			end
+		end
+	end
+end
+
+
+if $touched then
+	doc.context[:attribute_quote] = :quote
+	doc.write(output: File.open(filename, "w"))
+end

From a45edd9024b8fdbe1ace26d7bd8e39370e96ae52 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 31 May 2018 21:03:37 -0400
Subject: [PATCH 2921/3370] doc: ran `make format`

With visual inspection that nothing got worse.
---
 doc/coding-conventions.xml         | 168 +++++++++---
 doc/cross-compilation.xml          |  27 +-
 doc/functions.xml                  |  48 ++--
 doc/languages-frameworks/bower.xml |   4 +-
 doc/meta.xml                       |  52 ++--
 doc/multiple-output.xml            |  32 +--
 doc/package-notes.xml              |  12 +-
 doc/stdenv.xml                     | 426 +++++++++++++++++++----------
 8 files changed, 513 insertions(+), 256 deletions(-)

diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml
index f244c11d4f20..b3f7f093835c 100644
--- a/doc/coding-conventions.xml
+++ b/doc/coding-conventions.xml
@@ -312,11 +312,15 @@ args.stdenv.mkDerivation (args // {
 
    <variablelist>
     <varlistentry>
-     <term>If it’s used to support <emphasis>software development</emphasis>:</term>
+     <term>
+      If it’s used to support <emphasis>software development</emphasis>:
+     </term>
      <listitem>
       <variablelist>
        <varlistentry>
-        <term>If it’s a <emphasis>library</emphasis> used by other packages:</term>
+        <term>
+         If it’s a <emphasis>library</emphasis> used by other packages:
+        </term>
         <listitem>
          <para>
           <filename>development/libraries</filename> (e.g.
@@ -325,7 +329,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a <emphasis>compiler</emphasis>:</term>
+        <term>
+         If it’s a <emphasis>compiler</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>development/compilers</filename> (e.g.
@@ -334,7 +340,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s an <emphasis>interpreter</emphasis>:</term>
+        <term>
+         If it’s an <emphasis>interpreter</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>development/interpreters</filename> (e.g.
@@ -343,11 +351,15 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a (set of) development <emphasis>tool(s)</emphasis>:</term>
+        <term>
+         If it’s a (set of) development <emphasis>tool(s)</emphasis>:
+        </term>
         <listitem>
          <variablelist>
           <varlistentry>
-           <term>If it’s a <emphasis>parser generator</emphasis> (including lexers):</term>
+           <term>
+            If it’s a <emphasis>parser generator</emphasis> (including lexers):
+           </term>
            <listitem>
             <para>
              <filename>development/tools/parsing</filename> (e.g.
@@ -356,7 +368,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>If it’s a <emphasis>build manager</emphasis>:</term>
+           <term>
+            If it’s a <emphasis>build manager</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>development/tools/build-managers</filename> (e.g.
@@ -365,7 +379,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>Else:</term>
+           <term>
+            Else:
+           </term>
            <listitem>
             <para>
              <filename>development/tools/misc</filename> (e.g.
@@ -377,7 +393,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>Else:</term>
+        <term>
+         Else:
+        </term>
         <listitem>
          <para>
           <filename>development/misc</filename>
@@ -388,7 +406,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a (set of) <emphasis>tool(s)</emphasis>:</term>
+     <term>
+      If it’s a (set of) <emphasis>tool(s)</emphasis>:
+     </term>
      <listitem>
       <para>
        (A tool is a relatively small program, especially one intended to be
@@ -396,7 +416,9 @@ args.stdenv.mkDerivation (args // {
       </para>
       <variablelist>
        <varlistentry>
-        <term>If it’s for <emphasis>networking</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>networking</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>tools/networking</filename> (e.g.
@@ -405,7 +427,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s for <emphasis>text processing</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>text processing</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>tools/text</filename> (e.g. <filename>diffutils</filename>)
@@ -413,9 +437,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a <emphasis>system utility</emphasis>, i.e.,
-          something related or essential to the operation of a
-          system:</term>
+        <term>
+         If it’s a <emphasis>system utility</emphasis>, i.e., something related or essential to the operation of a system:
+        </term>
         <listitem>
          <para>
           <filename>tools/system</filename> (e.g. <filename>cron</filename>)
@@ -423,8 +447,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s an <emphasis>archiver</emphasis> (which may
-          include a compression function):</term>
+        <term>
+         If it’s an <emphasis>archiver</emphasis> (which may include a compression function):
+        </term>
         <listitem>
          <para>
           <filename>tools/archivers</filename> (e.g. <filename>zip</filename>,
@@ -433,7 +458,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a <emphasis>compression</emphasis> program:</term>
+        <term>
+         If it’s a <emphasis>compression</emphasis> program:
+        </term>
         <listitem>
          <para>
           <filename>tools/compression</filename> (e.g.
@@ -442,7 +469,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s a <emphasis>security</emphasis>-related program:</term>
+        <term>
+         If it’s a <emphasis>security</emphasis>-related program:
+        </term>
         <listitem>
          <para>
           <filename>tools/security</filename> (e.g. <filename>nmap</filename>,
@@ -451,7 +480,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>Else:</term>
+        <term>
+         Else:
+        </term>
         <listitem>
          <para>
           <filename>tools/misc</filename>
@@ -462,7 +493,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>shell</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>shell</emphasis>:
+     </term>
      <listitem>
       <para>
        <filename>shells</filename> (e.g. <filename>bash</filename>)
@@ -470,11 +503,15 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>server</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>server</emphasis>:
+     </term>
      <listitem>
       <variablelist>
        <varlistentry>
-        <term>If it’s a web server:</term>
+        <term>
+         If it’s a web server:
+        </term>
         <listitem>
          <para>
           <filename>servers/http</filename> (e.g.
@@ -483,7 +520,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s an implementation of the X Windowing System:</term>
+        <term>
+         If it’s an implementation of the X Windowing System:
+        </term>
         <listitem>
          <para>
           <filename>servers/x11</filename> (e.g. <filename>xorg</filename> —
@@ -492,7 +531,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>Else:</term>
+        <term>
+         Else:
+        </term>
         <listitem>
          <para>
           <filename>servers/misc</filename>
@@ -503,7 +544,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>desktop environment</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>desktop environment</emphasis>:
+     </term>
      <listitem>
       <para>
        <filename>desktops</filename> (e.g. <filename>kde</filename>,
@@ -512,7 +555,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>window manager</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>window manager</emphasis>:
+     </term>
      <listitem>
       <para>
        <filename>applications/window-managers</filename> (e.g.
@@ -521,7 +566,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s an <emphasis>application</emphasis>:</term>
+     <term>
+      If it’s an <emphasis>application</emphasis>:
+     </term>
      <listitem>
       <para>
        A (typically large) program with a distinct user interface, primarily
@@ -529,7 +576,9 @@ args.stdenv.mkDerivation (args // {
       </para>
       <variablelist>
        <varlistentry>
-        <term>If it’s a <emphasis>version management system</emphasis>:</term>
+        <term>
+         If it’s a <emphasis>version management system</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>applications/version-management</filename> (e.g.
@@ -538,7 +587,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s for <emphasis>video playback / editing</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>video playback / editing</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>applications/video</filename> (e.g.
@@ -547,7 +598,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s for <emphasis>graphics viewing / editing</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>graphics viewing / editing</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>applications/graphics</filename> (e.g.
@@ -556,11 +609,15 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s for <emphasis>networking</emphasis>:</term>
+        <term>
+         If it’s for <emphasis>networking</emphasis>:
+        </term>
         <listitem>
          <variablelist>
           <varlistentry>
-           <term>If it’s a <emphasis>mailreader</emphasis>:</term>
+           <term>
+            If it’s a <emphasis>mailreader</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>applications/networking/mailreaders</filename> (e.g.
@@ -569,7 +626,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>If it’s a <emphasis>newsreader</emphasis>:</term>
+           <term>
+            If it’s a <emphasis>newsreader</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>applications/networking/newsreaders</filename> (e.g.
@@ -578,7 +637,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>If it’s a <emphasis>web browser</emphasis>:</term>
+           <term>
+            If it’s a <emphasis>web browser</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>applications/networking/browsers</filename> (e.g.
@@ -587,7 +648,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>Else:</term>
+           <term>
+            Else:
+           </term>
            <listitem>
             <para>
              <filename>applications/networking/misc</filename>
@@ -598,7 +661,9 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>Else:</term>
+        <term>
+         Else:
+        </term>
         <listitem>
          <para>
           <filename>applications/misc</filename>
@@ -609,12 +674,15 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s <emphasis>data</emphasis> (i.e., does not have a
-    straight-forward executable semantics):</term>
+     <term>
+      If it’s <emphasis>data</emphasis> (i.e., does not have a straight-forward executable semantics):
+     </term>
      <listitem>
       <variablelist>
        <varlistentry>
-        <term>If it’s a <emphasis>font</emphasis>:</term>
+        <term>
+         If it’s a <emphasis>font</emphasis>:
+        </term>
         <listitem>
          <para>
           <filename>data/fonts</filename>
@@ -622,11 +690,15 @@ args.stdenv.mkDerivation (args // {
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term>If it’s related to <emphasis>SGML/XML processing</emphasis>:</term>
+        <term>
+         If it’s related to <emphasis>SGML/XML processing</emphasis>:
+        </term>
         <listitem>
          <variablelist>
           <varlistentry>
-           <term>If it’s an <emphasis>XML DTD</emphasis>:</term>
+           <term>
+            If it’s an <emphasis>XML DTD</emphasis>:
+           </term>
            <listitem>
             <para>
              <filename>data/sgml+xml/schemas/xml-dtd</filename> (e.g.
@@ -635,7 +707,9 @@ args.stdenv.mkDerivation (args // {
            </listitem>
           </varlistentry>
           <varlistentry>
-           <term>If it’s an <emphasis>XSLT stylesheet</emphasis>:</term>
+           <term>
+            If it’s an <emphasis>XSLT stylesheet</emphasis>:
+           </term>
            <listitem>
             <para>
              (Okay, these are executable...)
@@ -653,7 +727,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>If it’s a <emphasis>game</emphasis>:</term>
+     <term>
+      If it’s a <emphasis>game</emphasis>:
+     </term>
      <listitem>
       <para>
        <filename>games</filename>
@@ -661,7 +737,9 @@ args.stdenv.mkDerivation (args // {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Else:</term>
+     <term>
+      Else:
+     </term>
      <listitem>
       <para>
        <filename>misc</filename>
diff --git a/doc/cross-compilation.xml b/doc/cross-compilation.xml
index fe0e0d88d30e..3b433fdcc1d2 100644
--- a/doc/cross-compilation.xml
+++ b/doc/cross-compilation.xml
@@ -60,7 +60,8 @@
 
    <variablelist>
     <varlistentry>
-     <term><varname>buildPlatform</varname>
+     <term>
+      <varname>buildPlatform</varname>
      </term>
      <listitem>
       <para>
@@ -71,7 +72,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>hostPlatform</varname>
+     <term>
+      <varname>hostPlatform</varname>
      </term>
      <listitem>
       <para>
@@ -82,7 +84,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>targetPlatform</varname>
+     <term>
+      <varname>targetPlatform</varname>
      </term>
      <listitem>
       <para>
@@ -128,7 +131,8 @@
 
    <variablelist>
     <varlistentry>
-     <term><varname>system</varname>
+     <term>
+      <varname>system</varname>
      </term>
      <listitem>
       <para>
@@ -141,7 +145,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>config</varname>
+     <term>
+      <varname>config</varname>
      </term>
      <listitem>
       <para>
@@ -157,7 +162,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>parsed</varname>
+     <term>
+      <varname>parsed</varname>
      </term>
      <listitem>
       <para>
@@ -171,7 +177,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>libc</varname>
+     <term>
+      <varname>libc</varname>
      </term>
      <listitem>
       <para>
@@ -183,7 +190,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>is*</varname>
+     <term>
+      <varname>is*</varname>
      </term>
      <listitem>
       <para>
@@ -195,7 +203,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>platform</varname>
+     <term>
+      <varname>platform</varname>
      </term>
      <listitem>
       <para>
diff --git a/doc/functions.xml b/doc/functions.xml
index cdae96703f13..746ef7131f86 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -321,7 +321,8 @@ merge:"diff3"
 
   <variablelist>
    <varlistentry>
-    <term><literal>name</literal>
+    <term>
+     <literal>name</literal>
     </term>
     <listitem>
      <para>
@@ -330,7 +331,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>targetPkgs</literal>
+    <term>
+     <literal>targetPkgs</literal>
     </term>
     <listitem>
      <para>
@@ -340,7 +342,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>multiPkgs</literal>
+    <term>
+     <literal>multiPkgs</literal>
     </term>
     <listitem>
      <para>
@@ -351,7 +354,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>extraBuildCommands</literal>
+    <term>
+     <literal>extraBuildCommands</literal>
     </term>
     <listitem>
      <para>
@@ -361,7 +365,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>extraBuildCommandsMulti</literal>
+    <term>
+     <literal>extraBuildCommandsMulti</literal>
     </term>
     <listitem>
      <para>
@@ -371,7 +376,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>extraOutputsToInstall</literal>
+    <term>
+     <literal>extraOutputsToInstall</literal>
     </term>
     <listitem>
      <para>
@@ -381,7 +387,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>extraInstallCommands</literal>
+    <term>
+     <literal>extraInstallCommands</literal>
     </term>
     <listitem>
      <para>
@@ -391,7 +398,8 @@ merge:"diff3"
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>runScript</literal>
+    <term>
+     <literal>runScript</literal>
     </term>
     <listitem>
      <para>
@@ -624,9 +632,9 @@ merge:"diff3"
 
    <para>
     This function is analogous to the <command>docker pull</command> command,
-    in that can be used to pull a Docker image from a Docker registry.
-    By default <link xlink:href="https://hub.docker.com/">Docker Hub</link>
-    is used to pull images.
+    in that can be used to pull a Docker image from a Docker registry. By
+    default <link xlink:href="https://hub.docker.com/">Docker Hub</link> is
+    used to pull images.
    </para>
 
    <para>
@@ -648,15 +656,15 @@ merge:"diff3"
    <calloutlist>
     <callout arearefs='ex-dockerTools-pullImage-1'>
      <para>
-      <varname>imageName</varname> specifies the name of the image to be downloaded,
-      which can also include the registry namespace (e.g. <literal>nixos</literal>).
-      This argument is required.
+      <varname>imageName</varname> specifies the name of the image to be
+      downloaded, which can also include the registry namespace (e.g.
+      <literal>nixos</literal>). This argument is required.
      </para>
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-2'>
      <para>
-      <varname>imageDigest</varname> specifies the digest of the image
-      to be downloaded. Skopeo can be used to get the digest of an image
+      <varname>imageDigest</varname> specifies the digest of the image to be
+      downloaded. Skopeo can be used to get the digest of an image
 <programlisting>
   $ skopeo inspect docker://docker.io/nixos/nix:1.11 | jq -r '.Digest'
   sha256:20d9485b25ecfd89204e843a962c1bd70e9cc6858d65d7f5fadc340246e2116b
@@ -666,10 +674,10 @@ merge:"diff3"
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-3'>
      <para>
-      <varname>finalImageTag</varname>, if specified, this is the tag of
-      the image to be created. Note it is never used to fetch the image
-      since we prefer to rely on the immutable digest ID. By default
-      it's <literal>latest</literal>.
+      <varname>finalImageTag</varname>, if specified, this is the tag of the
+      image to be created. Note it is never used to fetch the image since we
+      prefer to rely on the immutable digest ID. By default it's
+      <literal>latest</literal>.
      </para>
     </callout>
     <callout arearefs='ex-dockerTools-pullImage-4'>
diff --git a/doc/languages-frameworks/bower.xml b/doc/languages-frameworks/bower.xml
index db7536cdc14e..118f6e10473a 100644
--- a/doc/languages-frameworks/bower.xml
+++ b/doc/languages-frameworks/bower.xml
@@ -205,8 +205,8 @@ pkgs.stdenv.mkDerivation {
 
   <variablelist>
    <varlistentry>
-    <term><literal>ENOCACHE</literal> errors from
-    <varname>buildBowerComponents</varname>
+    <term>
+     <literal>ENOCACHE</literal> errors from <varname>buildBowerComponents</varname>
     </term>
     <listitem>
      <para>
diff --git a/doc/meta.xml b/doc/meta.xml
index ab6befd4381c..496b32916552 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -83,7 +83,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
 
   <variablelist>
    <varlistentry>
-    <term><varname>description</varname>
+    <term>
+     <varname>description</varname>
     </term>
     <listitem>
      <para>
@@ -106,7 +107,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>longDescription</varname>
+    <term>
+     <varname>longDescription</varname>
     </term>
     <listitem>
      <para>
@@ -115,7 +117,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>branch</varname>
+    <term>
+     <varname>branch</varname>
     </term>
     <listitem>
      <para>
@@ -126,7 +129,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>homepage</varname>
+    <term>
+     <varname>homepage</varname>
     </term>
     <listitem>
      <para>
@@ -136,7 +140,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>downloadPage</varname>
+    <term>
+     <varname>downloadPage</varname>
     </term>
     <listitem>
      <para>
@@ -146,7 +151,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>license</varname>
+    <term>
+     <varname>license</varname>
     </term>
     <listitem>
      <para>
@@ -198,7 +204,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>maintainers</varname>
+    <term>
+     <varname>maintainers</varname>
     </term>
     <listitem>
      <para>
@@ -213,7 +220,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>priority</varname>
+    <term>
+     <varname>priority</varname>
     </term>
     <listitem>
      <para>
@@ -225,7 +233,8 @@ hello-2.3  A program that produces a familiar, friendly greeting
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>platforms</varname>
+    <term>
+     <varname>platforms</varname>
     </term>
     <listitem>
      <para>
@@ -242,7 +251,8 @@ meta.platforms = stdenv.lib.platforms.linux;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>hydraPlatforms</varname>
+    <term>
+     <varname>hydraPlatforms</varname>
     </term>
     <listitem>
      <para>
@@ -261,7 +271,8 @@ meta.hydraPlatforms = [];
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>broken</varname>
+    <term>
+     <varname>broken</varname>
     </term>
     <listitem>
      <para>
@@ -273,7 +284,8 @@ meta.hydraPlatforms = [];
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>updateWalker</varname>
+    <term>
+     <varname>updateWalker</varname>
     </term>
     <listitem>
      <para>
@@ -305,8 +317,8 @@ meta.hydraPlatforms = [];
    generic options are available:
    <variablelist>
     <varlistentry>
-     <term><varname>stdenv.lib.licenses.free</varname>,
-    <varname>"free"</varname>
+     <term>
+      <varname>stdenv.lib.licenses.free</varname>, <varname>"free"</varname>
      </term>
      <listitem>
       <para>
@@ -315,8 +327,8 @@ meta.hydraPlatforms = [];
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
-    <varname>"unfree-redistributable"</varname>
+     <term>
+      <varname>stdenv.lib.licenses.unfreeRedistributable</varname>, <varname>"unfree-redistributable"</varname>
      </term>
      <listitem>
       <para>
@@ -336,8 +348,8 @@ meta.hydraPlatforms = [];
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stdenv.lib.licenses.unfree</varname>,
-    <varname>"unfree"</varname>
+     <term>
+      <varname>stdenv.lib.licenses.unfree</varname>, <varname>"unfree"</varname>
      </term>
      <listitem>
       <para>
@@ -348,8 +360,8 @@ meta.hydraPlatforms = [];
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
-    <varname>"unfree-redistributable-firmware"</varname>
+     <term>
+      <varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>, <varname>"unfree-redistributable-firmware"</varname>
      </term>
      <listitem>
       <para>
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index 040c12c92913..981b4b966cdf 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -188,8 +188,8 @@
 
    <variablelist>
     <varlistentry>
-     <term><varname>
-         $outputDev</varname>
+     <term>
+      <varname> $outputDev</varname>
      </term>
      <listitem>
       <para>
@@ -200,8 +200,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputBin</varname>
+     <term>
+      <varname> $outputBin</varname>
      </term>
      <listitem>
       <para>
@@ -211,8 +211,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputLib</varname>
+     <term>
+      <varname> $outputLib</varname>
      </term>
      <listitem>
       <para>
@@ -223,8 +223,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputDoc</varname>
+     <term>
+      <varname> $outputDoc</varname>
      </term>
      <listitem>
       <para>
@@ -235,8 +235,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputDevdoc</varname>
+     <term>
+      <varname> $outputDevdoc</varname>
      </term>
      <listitem>
       <para>
@@ -248,8 +248,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputMan</varname>
+     <term>
+      <varname> $outputMan</varname>
      </term>
      <listitem>
       <para>
@@ -259,8 +259,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputDevman</varname>
+     <term>
+      <varname> $outputDevman</varname>
      </term>
      <listitem>
       <para>
@@ -270,8 +270,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>
-        $outputInfo</varname>
+     <term>
+      <varname> $outputInfo</varname>
      </term>
      <listitem>
       <para>
diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index f16826ae6806..a6347bfdebaf 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -428,7 +428,9 @@ packageOverrides = pkgs: {
    <para>
     <variablelist>
      <varlistentry>
-      <term>Steam fails to start. What do I do?</term>
+      <term>
+       Steam fails to start. What do I do?
+      </term>
       <listitem>
        <para>
         Try to run
@@ -438,7 +440,9 @@ packageOverrides = pkgs: {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term>Using the FOSS Radeon or nouveau (nvidia) drivers</term>
+      <term>
+       Using the FOSS Radeon or nouveau (nvidia) drivers
+      </term>
       <listitem>
        <itemizedlist>
         <listitem>
@@ -462,7 +466,9 @@ packageOverrides = pkgs: {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term>Java</term>
+      <term>
+       Java
+      </term>
       <listitem>
        <orderedlist>
         <listitem>
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 78fa1d209b58..f6180d5ca6a8 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -361,7 +361,8 @@ let f(h, h + 1, i) = i + h
   <variablelist>
    <title>Variables specifying dependencies</title>
    <varlistentry>
-    <term><varname>depsBuildBuild</varname>
+    <term>
+     <varname>depsBuildBuild</varname>
     </term>
     <listitem>
      <para>
@@ -386,7 +387,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>nativeBuildInputs</varname>
+    <term>
+     <varname>nativeBuildInputs</varname>
     </term>
     <listitem>
      <para>
@@ -412,7 +414,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsBuildTarget</varname>
+    <term>
+     <varname>depsBuildTarget</varname>
     </term>
     <listitem>
      <para>
@@ -451,7 +454,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsHostHost</varname>
+    <term>
+     <varname>depsHostHost</varname>
     </term>
     <listitem>
      <para>
@@ -469,7 +473,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>buildInputs</varname>
+    <term>
+     <varname>buildInputs</varname>
     </term>
     <listitem>
      <para>
@@ -492,7 +497,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsTargetTarget</varname>
+    <term>
+     <varname>depsTargetTarget</varname>
     </term>
     <listitem>
      <para>
@@ -508,7 +514,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsBuildBuildPropagated</varname>
+    <term>
+     <varname>depsBuildBuildPropagated</varname>
     </term>
     <listitem>
      <para>
@@ -519,7 +526,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>propagatedNativeBuildInputs</varname>
+    <term>
+     <varname>propagatedNativeBuildInputs</varname>
     </term>
     <listitem>
      <para>
@@ -539,7 +547,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsBuildTargetPropagated</varname>
+    <term>
+     <varname>depsBuildTargetPropagated</varname>
     </term>
     <listitem>
      <para>
@@ -549,7 +558,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsHostHostPropagated</varname>
+    <term>
+     <varname>depsHostHostPropagated</varname>
     </term>
     <listitem>
      <para>
@@ -558,7 +568,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>propagatedBuildInputs</varname>
+    <term>
+     <varname>propagatedBuildInputs</varname>
     </term>
     <listitem>
      <para>
@@ -569,7 +580,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>depsTargetTarget</varname>
+    <term>
+     <varname>depsTargetTarget</varname>
     </term>
     <listitem>
      <para>
@@ -586,7 +598,8 @@ let f(h, h + 1, i) = i + h
   <variablelist>
    <title>Variables affecting <literal>stdenv</literal> initialisation</title>
    <varlistentry>
-    <term><varname>NIX_DEBUG</varname>
+    <term>
+     <varname>NIX_DEBUG</varname>
     </term>
     <listitem>
      <para>
@@ -607,7 +620,8 @@ let f(h, h + 1, i) = i + h
   <variablelist>
    <title>Variables affecting build properties</title>
    <varlistentry>
-    <term><varname>enableParallelBuilding</varname>
+    <term>
+     <varname>enableParallelBuilding</varname>
     </term>
     <listitem>
      <para>
@@ -624,7 +638,8 @@ let f(h, h + 1, i) = i + h
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>preferLocalBuild</varname>
+    <term>
+     <varname>preferLocalBuild</varname>
     </term>
     <listitem>
      <para>
@@ -642,7 +657,8 @@ let f(h, h + 1, i) = i + h
   <variablelist>
    <title>Special variables</title>
    <varlistentry>
-    <term><varname>passthru</varname>
+    <term>
+     <varname>passthru</varname>
     </term>
     <listitem>
      <para>
@@ -707,7 +723,8 @@ passthru = {
     <variablelist>
      <title>Variables affecting phase control</title>
      <varlistentry>
-      <term><varname>phases</varname>
+      <term>
+       <varname>phases</varname>
       </term>
       <listitem>
        <para>
@@ -727,7 +744,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>prePhases</varname>
+      <term>
+       <varname>prePhases</varname>
       </term>
       <listitem>
        <para>
@@ -736,7 +754,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preConfigurePhases</varname>
+      <term>
+       <varname>preConfigurePhases</varname>
       </term>
       <listitem>
        <para>
@@ -745,7 +764,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preBuildPhases</varname>
+      <term>
+       <varname>preBuildPhases</varname>
       </term>
       <listitem>
        <para>
@@ -754,7 +774,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preInstallPhases</varname>
+      <term>
+       <varname>preInstallPhases</varname>
       </term>
       <listitem>
        <para>
@@ -763,7 +784,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preFixupPhases</varname>
+      <term>
+       <varname>preFixupPhases</varname>
       </term>
       <listitem>
        <para>
@@ -772,7 +794,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>preDistPhases</varname>
+      <term>
+       <varname>preDistPhases</varname>
       </term>
       <listitem>
        <para>
@@ -781,7 +804,8 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><varname>postPhases</varname>
+      <term>
+       <varname>postPhases</varname>
       </term>
       <listitem>
        <para>
@@ -804,7 +828,9 @@ passthru = {
     default:
     <variablelist>
      <varlistentry>
-      <term>Tar files</term>
+      <term>
+       Tar files
+      </term>
       <listitem>
        <para>
         These can optionally be compressed using <command>gzip</command>
@@ -817,7 +843,9 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term>Zip files</term>
+      <term>
+       Zip files
+      </term>
       <listitem>
        <para>
         Zip files are unpacked using <command>unzip</command>. However,
@@ -827,7 +855,9 @@ passthru = {
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term>Directories in the Nix store</term>
+      <term>
+       Directories in the Nix store
+      </term>
       <listitem>
        <para>
         These are simply copied to the current directory. The hash part of the
@@ -847,7 +877,8 @@ passthru = {
    <variablelist>
     <title>Variables controlling the unpack phase</title>
     <varlistentry>
-     <term><varname>srcs</varname> / <varname>src</varname>
+     <term>
+      <varname>srcs</varname> / <varname>src</varname>
      </term>
      <listitem>
       <para>
@@ -857,7 +888,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>sourceRoot</varname>
+     <term>
+      <varname>sourceRoot</varname>
      </term>
      <listitem>
       <para>
@@ -869,7 +901,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>setSourceRoot</varname>
+     <term>
+      <varname>setSourceRoot</varname>
      </term>
      <listitem>
       <para>
@@ -881,7 +914,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preUnpack</varname>
+     <term>
+      <varname>preUnpack</varname>
      </term>
      <listitem>
       <para>
@@ -890,7 +924,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postUnpack</varname>
+     <term>
+      <varname>postUnpack</varname>
      </term>
      <listitem>
       <para>
@@ -899,7 +934,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontMakeSourcesWritable</varname>
+     <term>
+      <varname>dontMakeSourcesWritable</varname>
      </term>
      <listitem>
       <para>
@@ -911,7 +947,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>unpackCmd</varname>
+     <term>
+      <varname>unpackCmd</varname>
      </term>
      <listitem>
       <para>
@@ -935,7 +972,8 @@ passthru = {
    <variablelist>
     <title>Variables controlling the patch phase</title>
     <varlistentry>
-     <term><varname>patches</varname>
+     <term>
+      <varname>patches</varname>
      </term>
      <listitem>
       <para>
@@ -948,7 +986,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>patchFlags</varname>
+     <term>
+      <varname>patchFlags</varname>
      </term>
      <listitem>
       <para>
@@ -959,7 +998,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>prePatch</varname>
+     <term>
+      <varname>prePatch</varname>
      </term>
      <listitem>
       <para>
@@ -968,7 +1008,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postPatch</varname>
+     <term>
+      <varname>postPatch</varname>
      </term>
      <listitem>
       <para>
@@ -991,7 +1032,8 @@ passthru = {
    <variablelist>
     <title>Variables controlling the configure phase</title>
     <varlistentry>
-     <term><varname>configureScript</varname>
+     <term>
+      <varname>configureScript</varname>
      </term>
      <listitem>
       <para>
@@ -1003,7 +1045,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>configureFlags</varname>
+     <term>
+      <varname>configureFlags</varname>
      </term>
      <listitem>
       <para>
@@ -1013,7 +1056,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>configureFlagsArray</varname>
+     <term>
+      <varname>configureFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1024,7 +1068,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontAddPrefix</varname>
+     <term>
+      <varname>dontAddPrefix</varname>
      </term>
      <listitem>
       <para>
@@ -1034,7 +1079,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>prefix</varname>
+     <term>
+      <varname>prefix</varname>
      </term>
      <listitem>
       <para>
@@ -1045,7 +1091,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontAddDisableDepTrack</varname>
+     <term>
+      <varname>dontAddDisableDepTrack</varname>
      </term>
      <listitem>
       <para>
@@ -1056,7 +1103,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontFixLibtool</varname>
+     <term>
+      <varname>dontFixLibtool</varname>
      </term>
      <listitem>
       <para>
@@ -1076,7 +1124,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontDisableStatic</varname>
+     <term>
+      <varname>dontDisableStatic</varname>
      </term>
      <listitem>
       <para>
@@ -1090,7 +1139,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>configurePlatforms</varname>
+     <term>
+      <varname>configurePlatforms</varname>
      </term>
      <listitem>
       <para>
@@ -1111,7 +1161,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preConfigure</varname>
+     <term>
+      <varname>preConfigure</varname>
      </term>
      <listitem>
       <para>
@@ -1120,7 +1171,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postConfigure</varname>
+     <term>
+      <varname>postConfigure</varname>
      </term>
      <listitem>
       <para>
@@ -1146,7 +1198,8 @@ passthru = {
    <variablelist>
     <title>Variables controlling the build phase</title>
     <varlistentry>
-     <term><varname>dontBuild</varname>
+     <term>
+      <varname>dontBuild</varname>
      </term>
      <listitem>
       <para>
@@ -1155,7 +1208,8 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>makefile</varname>
+     <term>
+      <varname>makefile</varname>
      </term>
      <listitem>
       <para>
@@ -1164,15 +1218,19 @@ passthru = {
      </listitem>
     </varlistentry>
     <varlistentry>
-      <term><varname>checkInputs</varname>
-      </term>
-      <listitem><para>
-        A list of dependencies used by the phase. This gets included in
-        <varname>buildInputs</varname> when <varname>doCheck</varname> is set.
-      </para></listitem>
+     <term>
+      <varname>checkInputs</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of dependencies used by the phase. This gets included in
+       <varname>buildInputs</varname> when <varname>doCheck</varname> is set.
+      </para>
+     </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>makeFlags</varname>
+     <term>
+      <varname>makeFlags</varname>
      </term>
      <listitem>
       <para>
@@ -1193,7 +1251,8 @@ makeFlags = [ "PREFIX=$(out)" ];
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>makeFlagsArray</varname>
+     <term>
+      <varname>makeFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1211,7 +1270,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>buildFlags</varname> / <varname>buildFlagsArray</varname>
+     <term>
+      <varname>buildFlags</varname> / <varname>buildFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1222,7 +1282,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preBuild</varname>
+     <term>
+      <varname>preBuild</varname>
      </term>
      <listitem>
       <para>
@@ -1231,7 +1292,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postBuild</varname>
+     <term>
+      <varname>postBuild</varname>
      </term>
      <listitem>
       <para>
@@ -1266,7 +1328,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
    <variablelist>
     <title>Variables controlling the check phase</title>
     <varlistentry>
-     <term><varname>doCheck</varname>
+     <term>
+      <varname>doCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1282,9 +1345,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>makeFlags</varname> /
-    <varname>makeFlagsArray</varname> /
-    <varname>makefile</varname>
+     <term>
+      <varname>makeFlags</varname> / <varname>makeFlagsArray</varname> / <varname>makefile</varname>
      </term>
      <listitem>
       <para>
@@ -1293,7 +1355,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>checkTarget</varname>
+     <term>
+      <varname>checkTarget</varname>
      </term>
      <listitem>
       <para>
@@ -1303,7 +1366,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>checkFlags</varname> / <varname>checkFlagsArray</varname>
+     <term>
+      <varname>checkFlags</varname> / <varname>checkFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1314,7 +1378,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preCheck</varname>
+     <term>
+      <varname>preCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1323,7 +1388,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postCheck</varname>
+     <term>
+      <varname>postCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1347,9 +1413,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
    <variablelist>
     <title>Variables controlling the install phase</title>
     <varlistentry>
-     <term><varname>makeFlags</varname> /
-    <varname>makeFlagsArray</varname> /
-    <varname>makefile</varname>
+     <term>
+      <varname>makeFlags</varname> / <varname>makeFlagsArray</varname> / <varname>makefile</varname>
      </term>
      <listitem>
       <para>
@@ -1358,7 +1423,8 @@ makeFlagsArray=(CFLAGS="-O0 -g" LDFLAGS="-lfoo -lbar")
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>installTargets</varname>
+     <term>
+      <varname>installTargets</varname>
      </term>
      <listitem>
       <para>
@@ -1370,7 +1436,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>installFlags</varname> / <varname>installFlagsArray</varname>
+     <term>
+      <varname>installFlags</varname> / <varname>installFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1381,7 +1448,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preInstall</varname>
+     <term>
+      <varname>preInstall</varname>
      </term>
      <listitem>
       <para>
@@ -1390,7 +1458,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postInstall</varname>
+     <term>
+      <varname>postInstall</varname>
      </term>
      <listitem>
       <para>
@@ -1444,7 +1513,8 @@ installTargets = "install-bin install-doc";</programlisting>
    <variablelist>
     <title>Variables controlling the fixup phase</title>
     <varlistentry>
-     <term><varname>dontStrip</varname>
+     <term>
+      <varname>dontStrip</varname>
      </term>
      <listitem>
       <para>
@@ -1454,7 +1524,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontStripHost</varname>
+     <term>
+      <varname>dontStripHost</varname>
      </term>
      <listitem>
       <para>
@@ -1466,7 +1537,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontStripTarget</varname>
+     <term>
+      <varname>dontStripTarget</varname>
      </term>
      <listitem>
       <para>
@@ -1478,7 +1550,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontMoveSbin</varname>
+     <term>
+      <varname>dontMoveSbin</varname>
      </term>
      <listitem>
       <para>
@@ -1488,7 +1561,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stripAllList</varname>
+     <term>
+      <varname>stripAllList</varname>
      </term>
      <listitem>
       <para>
@@ -1500,7 +1574,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stripAllFlags</varname>
+     <term>
+      <varname>stripAllFlags</varname>
      </term>
      <listitem>
       <para>
@@ -1511,7 +1586,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stripDebugList</varname>
+     <term>
+      <varname>stripDebugList</varname>
      </term>
      <listitem>
       <para>
@@ -1522,7 +1598,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>stripDebugFlags</varname>
+     <term>
+      <varname>stripDebugFlags</varname>
      </term>
      <listitem>
       <para>
@@ -1533,7 +1610,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontPatchELF</varname>
+     <term>
+      <varname>dontPatchELF</varname>
      </term>
      <listitem>
       <para>
@@ -1543,7 +1621,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontPatchShebangs</varname>
+     <term>
+      <varname>dontPatchShebangs</varname>
      </term>
      <listitem>
       <para>
@@ -1553,7 +1632,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>forceShare</varname>
+     <term>
+      <varname>forceShare</varname>
      </term>
      <listitem>
       <para>
@@ -1564,7 +1644,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>setupHook</varname>
+     <term>
+      <varname>setupHook</varname>
      </term>
      <listitem>
       <para>
@@ -1579,7 +1660,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preFixup</varname>
+     <term>
+      <varname>preFixup</varname>
      </term>
      <listitem>
       <para>
@@ -1588,7 +1670,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postFixup</varname>
+     <term>
+      <varname>postFixup</varname>
      </term>
      <listitem>
       <para>
@@ -1597,7 +1680,8 @@ installTargets = "install-bin install-doc";</programlisting>
      </listitem>
     </varlistentry>
     <varlistentry xml:id="stdenv-separateDebugInfo">
-     <term><varname>separateDebugInfo</varname>
+     <term>
+      <varname>separateDebugInfo</varname>
      </term>
      <listitem>
       <para>
@@ -1639,7 +1723,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
    <variablelist>
     <title>Variables controlling the installCheck phase</title>
     <varlistentry>
-     <term><varname>doInstallCheck</varname>
+     <term>
+      <varname>doInstallCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1655,16 +1740,20 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-      <term><varname>installCheckInputs</varname>
-      </term>
-      <listitem><para>
-        A list of dependencies used by the phase. This gets included in
-        <varname>buildInputs</varname> when <varname>doInstallCheck</varname>
-        is set.
-      </para></listitem>
+     <term>
+      <varname>installCheckInputs</varname>
+     </term>
+     <listitem>
+      <para>
+       A list of dependencies used by the phase. This gets included in
+       <varname>buildInputs</varname> when <varname>doInstallCheck</varname> is
+       set.
+      </para>
+     </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preInstallCheck</varname>
+     <term>
+      <varname>preInstallCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1673,7 +1762,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postInstallCheck</varname>
+     <term>
+      <varname>postInstallCheck</varname>
      </term>
      <listitem>
       <para>
@@ -1698,7 +1788,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
    <variablelist>
     <title>Variables controlling the distribution phase</title>
     <varlistentry>
-     <term><varname>distTarget</varname>
+     <term>
+      <varname>distTarget</varname>
      </term>
      <listitem>
       <para>
@@ -1708,7 +1799,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>distFlags</varname> / <varname>distFlagsArray</varname>
+     <term>
+      <varname>distFlags</varname> / <varname>distFlagsArray</varname>
      </term>
      <listitem>
       <para>
@@ -1717,7 +1809,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>tarballs</varname>
+     <term>
+      <varname>tarballs</varname>
      </term>
      <listitem>
       <para>
@@ -1728,7 +1821,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>dontCopyDist</varname>
+     <term>
+      <varname>dontCopyDist</varname>
      </term>
      <listitem>
       <para>
@@ -1737,7 +1831,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>preDist</varname>
+     <term>
+      <varname>preDist</varname>
      </term>
      <listitem>
       <para>
@@ -1746,7 +1841,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><varname>postDist</varname>
+     <term>
+      <varname>postDist</varname>
      </term>
      <listitem>
       <para>
@@ -1766,7 +1862,8 @@ set debug-file-directory ~/.nix-profile/lib/debug
 
   <variablelist>
    <varlistentry xml:id='fun-makeWrapper'>
-    <term><function>makeWrapper</function><replaceable>executable</replaceable><replaceable>wrapperfile</replaceable><replaceable>args</replaceable>
+    <term>
+     <function>makeWrapper</function><replaceable>executable</replaceable><replaceable>wrapperfile</replaceable><replaceable>args</replaceable>
     </term>
     <listitem>
      <para>
@@ -1791,7 +1888,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-substitute'>
-    <term><function>substitute</function><replaceable>infile</replaceable><replaceable>outfile</replaceable><replaceable>subs</replaceable>
+    <term>
+     <function>substitute</function><replaceable>infile</replaceable><replaceable>outfile</replaceable><replaceable>subs</replaceable>
     </term>
     <listitem>
      <para>
@@ -1801,7 +1899,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
       <replaceable>subs</replaceable> are of the following form:
       <variablelist>
        <varlistentry>
-        <term><option>--replace</option><replaceable>s1</replaceable><replaceable>s2</replaceable>
+        <term>
+         <option>--replace</option><replaceable>s1</replaceable><replaceable>s2</replaceable>
         </term>
         <listitem>
          <para>
@@ -1811,7 +1910,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term><option>--subst-var</option><replaceable>varName</replaceable>
+        <term>
+         <option>--subst-var</option><replaceable>varName</replaceable>
         </term>
         <listitem>
          <para>
@@ -1826,7 +1926,8 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
         </listitem>
        </varlistentry>
        <varlistentry>
-        <term><option>--subst-var-by</option><replaceable>varName</replaceable><replaceable>s</replaceable>
+        <term>
+         <option>--subst-var-by</option><replaceable>varName</replaceable><replaceable>s</replaceable>
         </term>
         <listitem>
          <para>
@@ -1860,7 +1961,8 @@ substitute ./foo.in ./foo.out \
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-substituteInPlace'>
-    <term><function>substituteInPlace</function><replaceable>file</replaceable><replaceable>subs</replaceable>
+    <term>
+     <function>substituteInPlace</function><replaceable>file</replaceable><replaceable>subs</replaceable>
     </term>
     <listitem>
      <para>
@@ -1870,7 +1972,8 @@ substitute ./foo.in ./foo.out \
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-substituteAll'>
-    <term><function>substituteAll</function><replaceable>infile</replaceable><replaceable>outfile</replaceable>
+    <term>
+     <function>substituteAll</function><replaceable>infile</replaceable><replaceable>outfile</replaceable>
     </term>
     <listitem>
      <para>
@@ -1909,7 +2012,8 @@ echo @foo@
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-substituteAllInPlace'>
-    <term><function>substituteAllInPlace</function><replaceable>file</replaceable>
+    <term>
+     <function>substituteAllInPlace</function><replaceable>file</replaceable>
     </term>
     <listitem>
      <para>
@@ -1919,7 +2023,8 @@ echo @foo@
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-stripHash'>
-    <term><function>stripHash</function><replaceable>path</replaceable>
+    <term>
+     <function>stripHash</function><replaceable>path</replaceable>
     </term>
     <listitem>
      <para>
@@ -1939,7 +2044,8 @@ someVar=$(stripHash $name)
     </listitem>
    </varlistentry>
    <varlistentry xml:id='fun-wrapProgram'>
-    <term><function>wrapProgram</function><replaceable>executable</replaceable><replaceable>makeWrapperArgs</replaceable>
+    <term>
+     <function>wrapProgram</function><replaceable>executable</replaceable><replaceable>makeWrapperArgs</replaceable>
     </term>
     <listitem>
      <para>
@@ -2039,7 +2145,9 @@ addEnvHooks "$hostOffset" myBashFunction
    mechanism is only to be used as a last resort, it might be.
    <variablelist>
     <varlistentry>
-     <term>Bintools Wrapper</term>
+     <term>
+      Bintools Wrapper
+     </term>
      <listitem>
       <para>
        Bintools Wrapper wraps the binary utilities for a bunch of miscellaneous
@@ -2109,7 +2217,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>CC Wrapper</term>
+     <term>
+      CC Wrapper
+     </term>
      <listitem>
       <para>
        CC Wrapper wraps a C toolchain for a bunch of miscellaneous purposes.
@@ -2140,7 +2250,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Perl</term>
+     <term>
+      Perl
+     </term>
      <listitem>
       <para>
        Adds the <filename>lib/site_perl</filename> subdirectory of each build
@@ -2152,7 +2264,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Python</term>
+     <term>
+      Python
+     </term>
      <listitem>
       <para>
        Adds the <filename>lib/${python.libPrefix}/site-packages</filename>
@@ -2162,7 +2276,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>pkg-config</term>
+     <term>
+      pkg-config
+     </term>
      <listitem>
       <para>
        Adds the <filename>lib/pkgconfig</filename> and
@@ -2172,7 +2288,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Automake</term>
+     <term>
+      Automake
+     </term>
      <listitem>
       <para>
        Adds the <filename>share/aclocal</filename> subdirectory of each build
@@ -2181,7 +2299,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Autoconf</term>
+     <term>
+      Autoconf
+     </term>
      <listitem>
       <para>
        The <varname>autoreconfHook</varname> derivation adds
@@ -2192,7 +2312,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>libxml2</term>
+     <term>
+      libxml2
+     </term>
      <listitem>
       <para>
        Adds every file named <filename>catalog.xml</filename> found under the
@@ -2203,7 +2325,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>teTeX / TeX Live</term>
+     <term>
+      teTeX / TeX Live
+     </term>
      <listitem>
       <para>
        Adds the <filename>share/texmf-nix</filename> subdirectory of each build
@@ -2212,7 +2336,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>Qt 4</term>
+     <term>
+      Qt 4
+     </term>
      <listitem>
       <para>
        Sets the <envar>QTDIR</envar> environment variable to Qt’s path.
@@ -2220,7 +2346,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>gdk-pixbuf</term>
+     <term>
+      gdk-pixbuf
+     </term>
      <listitem>
       <para>
        Exports <envar>GDK_PIXBUF_MODULE_FILE</envar> environment variable the
@@ -2230,7 +2358,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>GHC</term>
+     <term>
+      GHC
+     </term>
      <listitem>
       <para>
        Creates a temporary package database and registers every Haskell build
@@ -2239,7 +2369,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>GStreamer</term>
+     <term>
+      GStreamer
+     </term>
      <listitem>
       <para>
        Adds the GStreamer plugins subdirectory of each build input to the
@@ -2249,7 +2381,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>paxctl</term>
+     <term>
+      paxctl
+     </term>
      <listitem>
       <para>
        Defines the <varname>paxmark</varname> helper for setting per-executable
@@ -2271,7 +2405,9 @@ addEnvHooks "$hostOffset" myBashFunction
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>autoPatchelfHook</term>
+     <term>
+      autoPatchelfHook
+     </term>
      <listitem>
       <para>
        This is a special setup hook which helps in packaging proprietary
@@ -2330,7 +2466,8 @@ addEnvHooks "$hostOffset" myBashFunction
 
   <variablelist>
    <varlistentry>
-    <term><varname>format</varname>
+    <term>
+     <varname>format</varname>
     </term>
     <listitem>
      <para>
@@ -2354,7 +2491,8 @@ cc1plus: some warnings being treated as errors
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>stackprotector</varname>
+    <term>
+     <varname>stackprotector</varname>
     </term>
     <listitem>
      <para>
@@ -2375,7 +2513,8 @@ bin/blib.a(bios_console.o): In function `bios_handle_cup':
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>fortify</varname>
+    <term>
+     <varname>fortify</varname>
     </term>
     <listitem>
      <para>
@@ -2415,7 +2554,8 @@ fcntl2.h:50:4: error: call to '__open_missing_mode' declared with attribute erro
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>pic</varname>
+    <term>
+     <varname>pic</varname>
     </term>
     <listitem>
      <para>
@@ -2439,7 +2579,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>strictoverflow</varname>
+    <term>
+     <varname>strictoverflow</varname>
     </term>
     <listitem>
      <para>
@@ -2457,7 +2598,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>relro</varname>
+    <term>
+     <varname>relro</varname>
     </term>
     <listitem>
      <para>
@@ -2477,7 +2619,8 @@ ccbLfRgg.s:33: Error: missing or invalid displacement expression `private_key_le
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>bindnow</varname>
+    <term>
+     <varname>bindnow</varname>
     </term>
     <listitem>
      <para>
@@ -2509,7 +2652,8 @@ intel_drv.so: undefined symbol: vgaHWFreeHWRec
 
   <variablelist>
    <varlistentry>
-    <term><varname>pie</varname>
+    <term>
+     <varname>pie</varname>
     </term>
     <listitem>
      <para>

From 88ca2b1ec4fcdadb48ed6084b2bf4cae58d6ccea Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 31 May 2018 21:03:51 -0400
Subject: [PATCH 2922/3370] nixos/doc: ran `make format`

With visual inspection that nothing got worse.
---
 .../manual/administration/boot-problems.xml   |  15 +-
 .../doc/manual/configuration/config-file.xml  |  24 +++-
 .../doc/manual/development/building-parts.xml |  27 ++--
 .../development/option-declarations.xml       |  12 +-
 nixos/doc/manual/development/option-types.xml | 129 +++++++++++------
 .../development/writing-nixos-tests.xml       |  81 +++++++----
 nixos/doc/manual/installation/installing.xml  |  20 ++-
 nixos/doc/manual/man-nixos-build-vms.xml      |  27 ++--
 nixos/doc/manual/man-nixos-enter.xml          |  49 +++++--
 .../doc/manual/man-nixos-generate-config.xml  |  43 ++++--
 nixos/doc/manual/man-nixos-install.xml        | 100 +++++++++----
 nixos/doc/manual/man-nixos-option.xml         |  30 ++--
 nixos/doc/manual/man-nixos-rebuild.xml        | 135 ++++++++++++------
 nixos/doc/manual/man-nixos-version.xml        |  28 ++--
 nixos/doc/manual/release-notes/rl-1509.xml    |  10 +-
 nixos/doc/manual/release-notes/rl-1809.xml    | 101 +++++++------
 16 files changed, 558 insertions(+), 273 deletions(-)

diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml
index 5f05ad261ef3..de3d8ac21aeb 100644
--- a/nixos/doc/manual/administration/boot-problems.xml
+++ b/nixos/doc/manual/administration/boot-problems.xml
@@ -14,7 +14,8 @@
   NixOS boot scripts or by systemd:
   <variablelist>
    <varlistentry>
-    <term><literal>boot.shell_on_fail</literal>
+    <term>
+     <literal>boot.shell_on_fail</literal>
     </term>
     <listitem>
      <para>
@@ -25,7 +26,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>boot.debug1</literal>
+    <term>
+     <literal>boot.debug1</literal>
     </term>
     <listitem>
      <para>
@@ -37,7 +39,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>boot.trace</literal>
+    <term>
+     <literal>boot.trace</literal>
     </term>
     <listitem>
      <para>
@@ -46,7 +49,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>single</literal>
+    <term>
+     <literal>single</literal>
     </term>
     <listitem>
      <para>
@@ -59,7 +63,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><literal>systemd.log_level=debug systemd.log_target=console</literal>
+    <term>
+     <literal>systemd.log_level=debug systemd.log_target=console</literal>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index a9420b3fc921..8a1a39c98c10 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -80,7 +80,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
   Options have various types of values. The most important are:
   <variablelist>
    <varlistentry>
-    <term>Strings</term>
+    <term>
+     Strings
+    </term>
     <listitem>
      <para>
       Strings are enclosed in double quotes, e.g.
@@ -112,7 +114,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term>Booleans</term>
+    <term>
+     Booleans
+    </term>
     <listitem>
      <para>
       These can be <literal>true</literal> or <literal>false</literal>, e.g.
@@ -124,7 +128,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term>Integers</term>
+    <term>
+     Integers
+    </term>
     <listitem>
      <para>
       For example,
@@ -141,7 +147,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term>Sets</term>
+    <term>
+     Sets
+    </term>
     <listitem>
      <para>
       Sets were introduced above. They are name/value pairs enclosed in braces,
@@ -157,7 +165,9 @@ The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is no
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term>Lists</term>
+    <term>
+     Lists
+    </term>
     <listitem>
      <para>
       The important thing to note about lists is that list elements are
@@ -173,7 +183,9 @@ swapDevices = [ { device = "/dev/disk/by-label/swap"; } ];
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term>Packages</term>
+    <term>
+     Packages
+    </term>
     <listitem>
      <para>
       Usually, the packages you need are already part of the Nix Packages
diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml
index 031048aaa377..eaffc0ef47c2 100644
--- a/nixos/doc/manual/development/building-parts.xml
+++ b/nixos/doc/manual/development/building-parts.xml
@@ -15,7 +15,8 @@ $ nix-build -A config.<replaceable>option</replaceable></screen>
   include:
   <variablelist>
    <varlistentry>
-    <term><varname>system.build.toplevel</varname>
+    <term>
+     <varname>system.build.toplevel</varname>
     </term>
     <listitem>
      <para>
@@ -32,7 +33,8 @@ $ nix-build -A system</screen>
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>system.build.manual.manual</varname>
+    <term>
+     <varname>system.build.manual.manual</varname>
     </term>
     <listitem>
      <para>
@@ -41,7 +43,8 @@ $ nix-build -A system</screen>
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>system.build.etc</varname>
+    <term>
+     <varname>system.build.etc</varname>
     </term>
     <listitem>
      <para>
@@ -51,9 +54,11 @@ $ nix-build -A system</screen>
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>system.build.initialRamdisk</varname>
+    <term>
+     <varname>system.build.initialRamdisk</varname>
     </term>
-    <term><varname>system.build.kernel</varname>
+    <term>
+     <varname>system.build.kernel</varname>
     </term>
     <listitem>
      <para>
@@ -69,11 +74,14 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>system.build.nixos-rebuild</varname>
+    <term>
+     <varname>system.build.nixos-rebuild</varname>
     </term>
-    <term><varname>system.build.nixos-install</varname>
+    <term>
+     <varname>system.build.nixos-install</varname>
     </term>
-    <term><varname>system.build.nixos-generate-config</varname>
+    <term>
+     <varname>system.build.nixos-generate-config</varname>
     </term>
     <listitem>
      <para>
@@ -82,7 +90,8 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname>
+    <term>
+     <varname>systemd.units.<replaceable>unit-name</replaceable>.unit</varname>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index a8f528a0a804..eee81bf64263 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -32,7 +32,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
   The function <varname>mkOption</varname> accepts the following arguments.
   <variablelist>
    <varlistentry>
-    <term><varname>type</varname>
+    <term>
+     <varname>type</varname>
     </term>
     <listitem>
      <para>
@@ -43,7 +44,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>default</varname>
+    <term>
+     <varname>default</varname>
     </term>
     <listitem>
      <para>
@@ -55,7 +57,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>example</varname>
+    <term>
+     <varname>example</varname>
     </term>
     <listitem>
      <para>
@@ -64,7 +67,8 @@ xlink:href="https://nixos.org/nixpkgs/manual/#sec-package-naming">
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>description</varname>
+    <term>
+     <varname>description</varname>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index 5cb747e6d9f1..bf2e38b4c4d6 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -22,7 +22,8 @@
 
   <variablelist>
    <varlistentry>
-    <term><varname>types.attrs</varname>
+    <term>
+     <varname>types.attrs</varname>
     </term>
     <listitem>
      <para>
@@ -31,7 +32,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.bool</varname>
+    <term>
+     <varname>types.bool</varname>
     </term>
     <listitem>
      <para>
@@ -41,7 +43,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.path</varname>
+    <term>
+     <varname>types.path</varname>
     </term>
     <listitem>
      <para>
@@ -52,7 +55,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.package</varname>
+    <term>
+     <varname>types.package</varname>
     </term>
     <listitem>
      <para>
@@ -68,7 +72,8 @@
 
   <variablelist>
    <varlistentry>
-    <term><varname>types.int</varname>
+    <term>
+     <varname>types.int</varname>
     </term>
     <listitem>
      <para>
@@ -77,7 +82,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.ints.{s8, s16, s32}</varname>
+    <term>
+     <varname>types.ints.{s8, s16, s32}</varname>
     </term>
     <listitem>
      <para>
@@ -91,7 +97,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.ints.unsigned</varname>
+    <term>
+     <varname>types.ints.unsigned</varname>
     </term>
     <listitem>
      <para>
@@ -100,7 +107,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.ints.{u8, u16, u32}</varname>
+    <term>
+     <varname>types.ints.{u8, u16, u32}</varname>
     </term>
     <listitem>
      <para>
@@ -114,7 +122,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.ints.positive</varname>
+    <term>
+     <varname>types.ints.positive</varname>
     </term>
     <listitem>
      <para>
@@ -130,7 +139,8 @@
 
   <variablelist>
    <varlistentry>
-    <term><varname>types.str</varname>
+    <term>
+     <varname>types.str</varname>
     </term>
     <listitem>
      <para>
@@ -139,7 +149,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.lines</varname>
+    <term>
+     <varname>types.lines</varname>
     </term>
     <listitem>
      <para>
@@ -149,7 +160,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.commas</varname>
+    <term>
+     <varname>types.commas</varname>
     </term>
     <listitem>
      <para>
@@ -159,7 +171,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.envVar</varname>
+    <term>
+     <varname>types.envVar</varname>
     </term>
     <listitem>
      <para>
@@ -169,7 +182,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.strMatching</varname>
+    <term>
+     <varname>types.strMatching</varname>
     </term>
     <listitem>
      <para>
@@ -191,7 +205,8 @@
 
   <variablelist>
    <varlistentry>
-    <term><varname>types.enum</varname><replaceable>l</replaceable>
+    <term>
+     <varname>types.enum</varname><replaceable>l</replaceable>
     </term>
     <listitem>
      <para>
@@ -202,7 +217,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.separatedString</varname><replaceable>sep</replaceable>
+    <term>
+     <varname>types.separatedString</varname><replaceable>sep</replaceable>
     </term>
     <listitem>
      <para>
@@ -212,7 +228,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.ints.between</varname><replaceable>lowest</replaceable><replaceable>highest</replaceable>
+    <term>
+     <varname>types.ints.between</varname><replaceable>lowest</replaceable><replaceable>highest</replaceable>
     </term>
     <listitem>
      <para>
@@ -223,7 +240,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.submodule</varname><replaceable>o</replaceable>
+    <term>
+     <varname>types.submodule</varname><replaceable>o</replaceable>
     </term>
     <listitem>
      <para>
@@ -250,7 +268,8 @@
 
   <variablelist>
    <varlistentry>
-    <term><varname>types.listOf</varname><replaceable>t</replaceable>
+    <term>
+     <varname>types.listOf</varname><replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -260,7 +279,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.attrsOf</varname><replaceable>t</replaceable>
+    <term>
+     <varname>types.attrsOf</varname><replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -271,7 +291,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.loaOf</varname><replaceable>t</replaceable>
+    <term>
+     <varname>types.loaOf</varname><replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -281,7 +302,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.nullOr</varname><replaceable>t</replaceable>
+    <term>
+     <varname>types.nullOr</varname><replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -291,7 +313,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.uniq</varname><replaceable>t</replaceable>
+    <term>
+     <varname>types.uniq</varname><replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -301,7 +324,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.either</varname><replaceable>t1</replaceable><replaceable>t2</replaceable>
+    <term>
+     <varname>types.either</varname><replaceable>t1</replaceable><replaceable>t2</replaceable>
     </term>
     <listitem>
      <para>
@@ -312,7 +336,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>types.coercedTo</varname><replaceable>from</replaceable><replaceable>f</replaceable><replaceable>to</replaceable>
+    <term>
+     <varname>types.coercedTo</varname><replaceable>from</replaceable><replaceable>f</replaceable><replaceable>to</replaceable>
     </term>
     <listitem>
      <para>
@@ -468,7 +493,8 @@ config.mod.two = { foo = 2; bar = "two"; };</screen>
 
   <variablelist>
    <varlistentry>
-    <term><varname>check</varname>
+    <term>
+     <varname>check</varname>
     </term>
     <listitem>
      <para>
@@ -501,7 +527,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>merge</varname>
+    <term>
+     <varname>merge</varname>
     </term>
     <listitem>
      <para>
@@ -534,7 +561,8 @@ nixThings = mkOption {
 
   <variablelist>
    <varlistentry>
-    <term><varname>name</varname>
+    <term>
+     <varname>name</varname>
     </term>
     <listitem>
      <para>
@@ -543,7 +571,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>definition</varname>
+    <term>
+     <varname>definition</varname>
     </term>
     <listitem>
      <para>
@@ -553,7 +582,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>check</varname>
+    <term>
+     <varname>check</varname>
     </term>
     <listitem>
      <para>
@@ -565,7 +595,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>merge</varname>
+    <term>
+     <varname>merge</varname>
     </term>
     <listitem>
      <para>
@@ -573,7 +604,8 @@ nixThings = mkOption {
      </para>
      <variablelist>
       <varlistentry>
-       <term><replaceable>loc</replaceable>
+       <term>
+        <replaceable>loc</replaceable>
        </term>
        <listitem>
         <para>
@@ -583,7 +615,8 @@ nixThings = mkOption {
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><replaceable>defs</replaceable>
+       <term>
+        <replaceable>defs</replaceable>
        </term>
        <listitem>
         <para>
@@ -600,7 +633,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>getSubOptions</varname>
+    <term>
+     <varname>getSubOptions</varname>
     </term>
     <listitem>
      <para>
@@ -615,7 +649,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>getSubModules</varname>
+    <term>
+     <varname>getSubModules</varname>
     </term>
     <listitem>
      <para>
@@ -628,7 +663,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>substSubModules</varname>
+    <term>
+     <varname>substSubModules</varname>
     </term>
     <listitem>
      <para>
@@ -644,7 +680,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>typeMerge</varname>
+    <term>
+     <varname>typeMerge</varname>
     </term>
     <listitem>
      <para>
@@ -654,7 +691,8 @@ nixThings = mkOption {
      </para>
      <variablelist>
       <varlistentry>
-       <term><replaceable>f</replaceable>
+       <term>
+        <replaceable>f</replaceable>
        </term>
        <listitem>
         <para>
@@ -670,7 +708,8 @@ nixThings = mkOption {
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><varname>functor</varname>
+    <term>
+     <varname>functor</varname>
     </term>
     <listitem>
      <para>
@@ -679,7 +718,8 @@ nixThings = mkOption {
      </para>
      <variablelist>
       <varlistentry>
-       <term><varname>type</varname>
+       <term>
+        <varname>type</varname>
        </term>
        <listitem>
         <para>
@@ -688,7 +728,8 @@ nixThings = mkOption {
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><varname>wrapped</varname>
+       <term>
+        <varname>wrapped</varname>
        </term>
        <listitem>
         <para>
@@ -697,7 +738,8 @@ nixThings = mkOption {
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><varname>payload</varname>
+       <term>
+        <varname>payload</varname>
        </term>
        <listitem>
         <para>
@@ -709,7 +751,8 @@ nixThings = mkOption {
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><varname>binOp</varname>
+       <term>
+        <varname>binOp</varname>
        </term>
        <listitem>
         <para>
diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml
index 89a6a4423627..5935fbc049bd 100644
--- a/nixos/doc/manual/development/writing-nixos-tests.xml
+++ b/nixos/doc/manual/development/writing-nixos-tests.xml
@@ -54,7 +54,8 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
 <!-- FIXME: would be nice to generate this automatically. -->
   <variablelist>
    <varlistentry>
-    <term><option>virtualisation.memorySize</option>
+    <term>
+     <option>virtualisation.memorySize</option>
     </term>
     <listitem>
      <para>
@@ -63,7 +64,8 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>virtualisation.vlans</option>
+    <term>
+     <option>virtualisation.vlans</option>
     </term>
     <listitem>
      <para>
@@ -75,7 +77,8 @@ xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs.nix">nf
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>virtualisation.writableStore</option>
+    <term>
+     <option>virtualisation.writableStore</option>
     </term>
     <listitem>
      <para>
@@ -120,7 +123,8 @@ startAll;
   The following methods are available on machine objects:
   <variablelist>
    <varlistentry>
-    <term><methodname>start</methodname>
+    <term>
+     <methodname>start</methodname>
     </term>
     <listitem>
      <para>
@@ -130,7 +134,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>shutdown</methodname>
+    <term>
+     <methodname>shutdown</methodname>
     </term>
     <listitem>
      <para>
@@ -139,7 +144,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>crash</methodname>
+    <term>
+     <methodname>crash</methodname>
     </term>
     <listitem>
      <para>
@@ -148,7 +154,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>block</methodname>
+    <term>
+     <methodname>block</methodname>
     </term>
     <listitem>
      <para>
@@ -158,7 +165,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>unblock</methodname>
+    <term>
+     <methodname>unblock</methodname>
     </term>
     <listitem>
      <para>
@@ -167,7 +175,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>screenshot</methodname>
+    <term>
+     <methodname>screenshot</methodname>
     </term>
     <listitem>
      <para>
@@ -177,7 +186,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>getScreenText</methodname>
+    <term>
+     <methodname>getScreenText</methodname>
     </term>
     <listitem>
      <para>
@@ -193,7 +203,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>sendMonitorCommand</methodname>
+    <term>
+     <methodname>sendMonitorCommand</methodname>
     </term>
     <listitem>
      <para>
@@ -203,7 +214,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>sendKeys</methodname>
+    <term>
+     <methodname>sendKeys</methodname>
     </term>
     <listitem>
      <para>
@@ -213,7 +225,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>sendChars</methodname>
+    <term>
+     <methodname>sendChars</methodname>
     </term>
     <listitem>
      <para>
@@ -224,7 +237,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>execute</methodname>
+    <term>
+     <methodname>execute</methodname>
     </term>
     <listitem>
      <para>
@@ -235,7 +249,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>succeed</methodname>
+    <term>
+     <methodname>succeed</methodname>
     </term>
     <listitem>
      <para>
@@ -245,7 +260,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>fail</methodname>
+    <term>
+     <methodname>fail</methodname>
     </term>
     <listitem>
      <para>
@@ -255,7 +271,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitUntilSucceeds</methodname>
+    <term>
+     <methodname>waitUntilSucceeds</methodname>
     </term>
     <listitem>
      <para>
@@ -264,7 +281,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitUntilFails</methodname>
+    <term>
+     <methodname>waitUntilFails</methodname>
     </term>
     <listitem>
      <para>
@@ -273,7 +291,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitForUnit</methodname>
+    <term>
+     <methodname>waitForUnit</methodname>
     </term>
     <listitem>
      <para>
@@ -282,7 +301,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitForFile</methodname>
+    <term>
+     <methodname>waitForFile</methodname>
     </term>
     <listitem>
      <para>
@@ -291,7 +311,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitForOpenPort</methodname>
+    <term>
+     <methodname>waitForOpenPort</methodname>
     </term>
     <listitem>
      <para>
@@ -301,7 +322,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitForClosedPort</methodname>
+    <term>
+     <methodname>waitForClosedPort</methodname>
     </term>
     <listitem>
      <para>
@@ -310,7 +332,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitForX</methodname>
+    <term>
+     <methodname>waitForX</methodname>
     </term>
     <listitem>
      <para>
@@ -319,7 +342,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitForText</methodname>
+    <term>
+     <methodname>waitForText</methodname>
     </term>
     <listitem>
      <para>
@@ -336,7 +360,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>waitForWindow</methodname>
+    <term>
+     <methodname>waitForWindow</methodname>
     </term>
     <listitem>
      <para>
@@ -346,7 +371,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>copyFileFromHost</methodname>
+    <term>
+     <methodname>copyFileFromHost</methodname>
     </term>
     <listitem>
      <para>
@@ -361,7 +387,8 @@ startAll;
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><methodname>systemctl</methodname>
+    <term>
+     <methodname>systemctl</methodname>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 4e1fde662d6e..6066d025adbf 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -16,7 +16,9 @@
    </para>
    <variablelist>
     <varlistentry>
-     <term>UEFI systems</term>
+     <term>
+      UEFI systems
+     </term>
      <listitem>
       <para>
        You should boot the live CD in UEFI mode (consult your specific
@@ -138,7 +140,9 @@
      <listitem>
       <variablelist>
        <varlistentry>
-        <term>UEFI systems</term>
+        <term>
+         UEFI systems
+        </term>
         <listitem>
          <para>
           For creating boot partitions: <command>mkfs.fat</command>. Again
@@ -178,7 +182,9 @@
   <listitem>
    <variablelist>
     <varlistentry>
-     <term>UEFI systems</term>
+     <term>
+      UEFI systems
+     </term>
      <listitem>
       <para>
        Mount the boot file system on <filename>/mnt/boot</filename>, e.g.
@@ -234,7 +240,9 @@
    </para>
    <variablelist>
     <varlistentry>
-     <term>BIOS systems</term>
+     <term>
+      BIOS systems
+     </term>
      <listitem>
       <para>
        You <emphasis>must</emphasis> set the option
@@ -244,7 +252,9 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term>UEFI systems</term>
+     <term>
+      UEFI systems
+     </term>
      <listitem>
       <para>
        You <emphasis>must</emphasis> set the option
diff --git a/nixos/doc/manual/man-nixos-build-vms.xml b/nixos/doc/manual/man-nixos-build-vms.xml
index 02dad4c548b8..87e4f3dae869 100644
--- a/nixos/doc/manual/man-nixos-build-vms.xml
+++ b/nixos/doc/manual/man-nixos-build-vms.xml
@@ -12,14 +12,22 @@
   </refname><refpurpose>build a network of virtual machines from a network of NixOS configurations</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
-  <cmdsynopsis><command>nixos-build-vms</command>
-   <arg><option>--show-trace</option>
+  <cmdsynopsis>
+   <command>nixos-build-vms</command> 
+   <arg>
+    <option>--show-trace</option>
    </arg>
-   <arg><option>--no-out-link</option>
+    
+   <arg>
+    <option>--no-out-link</option>
    </arg>
-   <arg><option>--help</option>
+    
+   <arg>
+    <option>--help</option>
    </arg>
-   <arg choice="plain"><replaceable>network.nix</replaceable>
+    
+   <arg choice="plain">
+    <replaceable>network.nix</replaceable>
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -78,7 +86,8 @@
   </para>
   <variablelist>
    <varlistentry>
-    <term><option>--show-trace</option>
+    <term>
+     <option>--show-trace</option>
     </term>
     <listitem>
      <para>
@@ -87,7 +96,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--no-out-link</option>
+    <term>
+     <option>--no-out-link</option>
     </term>
     <listitem>
      <para>
@@ -96,7 +106,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>-h</option>, <option>--help</option>
+    <term>
+     <option>-h</option>, <option>--help</option>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml
index 7db4b72ee36e..42edaa1ae5b6 100644
--- a/nixos/doc/manual/man-nixos-enter.xml
+++ b/nixos/doc/manual/man-nixos-enter.xml
@@ -12,26 +12,40 @@
   </refname><refpurpose>run a command in a NixOS chroot environment</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
-  <cmdsynopsis><command>nixos-enter</command>
+  <cmdsynopsis>
+   <command>nixos-enter</command> 
    <arg>
-    <arg choice='plain'><option>--root</option>
-    </arg><replaceable>root</replaceable>
+    <arg choice='plain'>
+     <option>--root</option>
+    </arg>
+     <replaceable>root</replaceable>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--system</option>
-    </arg><replaceable>system</replaceable>
+    <arg choice='plain'>
+     <option>--system</option>
+    </arg>
+     <replaceable>system</replaceable>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>-c</option>
-    </arg><replaceable>shell-command</replaceable>
+    <arg choice='plain'>
+     <option>-c</option>
+    </arg>
+     <replaceable>shell-command</replaceable>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--help</option>
+    <arg choice='plain'>
+     <option>--help</option>
     </arg>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--</option>
-    </arg><replaceable>arguments</replaceable>
+    <arg choice='plain'>
+     <option>--</option>
+    </arg>
+     <replaceable>arguments</replaceable>
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -50,7 +64,8 @@
   </para>
   <variablelist>
    <varlistentry>
-    <term><option>--root</option>
+    <term>
+     <option>--root</option>
     </term>
     <listitem>
      <para>
@@ -60,7 +75,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--system</option>
+    <term>
+     <option>--system</option>
     </term>
     <listitem>
      <para>
@@ -72,9 +88,11 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--command</option>
+    <term>
+     <option>--command</option>
     </term>
-    <term><option>-c</option>
+    <term>
+     <option>-c</option>
     </term>
     <listitem>
      <para>
@@ -83,7 +101,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--</option>
+    <term>
+     <option>--</option>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
index 8bf90f452db6..1227873f5780 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -12,16 +12,24 @@
   </refname><refpurpose>generate NixOS configuration modules</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
-  <cmdsynopsis><command>nixos-generate-config</command>
-   <arg><option>--force</option>
-   </arg>
+  <cmdsynopsis>
+   <command>nixos-generate-config</command> 
    <arg>
-    <arg choice='plain'><option>--root</option>
-    </arg><replaceable>root</replaceable>
+    <option>--force</option>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--dir</option>
-    </arg><replaceable>dir</replaceable>
+    <arg choice='plain'>
+     <option>--root</option>
+    </arg>
+     <replaceable>root</replaceable>
+   </arg>
+    
+   <arg>
+    <arg choice='plain'>
+     <option>--dir</option>
+    </arg>
+     <replaceable>dir</replaceable>
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -31,7 +39,8 @@
    This command writes two NixOS configuration modules:
    <variablelist>
     <varlistentry>
-     <term><option>/etc/nixos/hardware-configuration.nix</option>
+     <term>
+      <option>/etc/nixos/hardware-configuration.nix</option>
      </term>
      <listitem>
       <para>
@@ -53,7 +62,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>/etc/nixos/configuration.nix</option>
+     <term>
+      <option>/etc/nixos/configuration.nix</option>
      </term>
      <listitem>
       <para>
@@ -74,7 +84,8 @@
   </para>
   <variablelist>
    <varlistentry>
-    <term><option>--root</option>
+    <term>
+     <option>--root</option>
     </term>
     <listitem>
      <para>
@@ -88,7 +99,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--dir</option>
+    <term>
+     <option>--dir</option>
     </term>
     <listitem>
      <para>
@@ -99,7 +111,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--force</option>
+    <term>
+     <option>--force</option>
     </term>
     <listitem>
      <para>
@@ -109,7 +122,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--no-filesystems</option>
+    <term>
+     <option>--no-filesystems</option>
     </term>
     <listitem>
      <para>
@@ -119,7 +133,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--show-hardware-config</option>
+    <term>
+     <option>--show-hardware-config</option>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 2d45e83a863f..34b3eef8b212 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -12,47 +12,76 @@
   </refname><refpurpose>install bootloader and NixOS</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
-  <cmdsynopsis><command>nixos-install</command>
+  <cmdsynopsis>
+   <command>nixos-install</command> 
    <arg>
-    <arg choice='plain'><option>-I</option>
-    </arg><replaceable>path</replaceable>
+    <arg choice='plain'>
+     <option>-I</option>
+    </arg>
+     <replaceable>path</replaceable>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--root</option>
-    </arg><replaceable>root</replaceable>
+    <arg choice='plain'>
+     <option>--root</option>
+    </arg>
+     <replaceable>root</replaceable>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--system</option>
-    </arg><replaceable>path</replaceable>
+    <arg choice='plain'>
+     <option>--system</option>
+    </arg>
+     <replaceable>path</replaceable>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--no-channel-copy</option>
+    <arg choice='plain'>
+     <option>--no-channel-copy</option>
     </arg>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--no-root-passwd</option>
+    <arg choice='plain'>
+     <option>--no-root-passwd</option>
     </arg>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--no-bootloader</option>
+    <arg choice='plain'>
+     <option>--no-bootloader</option>
     </arg>
    </arg>
-   <arg><group choice='req'>
-    <arg choice='plain'><option>--max-jobs</option>
-    </arg>
-    <arg choice='plain'><option>-j</option>
-    </arg></group><replaceable>number</replaceable>
-   </arg>
-   <arg><option>--cores</option><replaceable>number</replaceable>
-   </arg>
-   <arg><option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
-   </arg>
+    
    <arg>
-    <arg choice='plain'><option>--show-trace</option>
+    <group choice='req'> 
+    <arg choice='plain'>
+     <option>--max-jobs</option>
+    </arg>
+     
+    <arg choice='plain'>
+     <option>-j</option>
+    </arg>
+     </group><replaceable>number</replaceable>
+   </arg>
+    
+   <arg>
+    <option>--cores</option><replaceable>number</replaceable>
+   </arg>
+    
+   <arg>
+    <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
+   </arg>
+    
+   <arg>
+    <arg choice='plain'>
+     <option>--show-trace</option>
     </arg>
    </arg>
+    
    <arg>
-    <arg choice='plain'><option>--help</option>
+    <arg choice='plain'>
+     <option>--help</option>
     </arg>
    </arg>
   </cmdsynopsis>
@@ -106,7 +135,8 @@
   </para>
   <variablelist>
    <varlistentry>
-    <term><option>--root</option>
+    <term>
+     <option>--root</option>
     </term>
     <listitem>
      <para>
@@ -117,7 +147,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--system</option>
+    <term>
+     <option>--system</option>
     </term>
     <listitem>
      <para>
@@ -135,7 +166,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>-I</option>
+    <term>
+     <option>-I</option>
     </term>
     <listitem>
      <para>
@@ -147,9 +179,11 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--max-jobs</option>
+    <term>
+     <option>--max-jobs</option>
     </term>
-    <term><option>-j</option>
+    <term>
+     <option>-j</option>
     </term>
     <listitem>
      <para>
@@ -160,7 +194,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--cores</option>
+    <term>
+     <option>--cores</option>
     </term>
     <listitem>
      <para>
@@ -177,7 +212,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
+    <term>
+     <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
     </term>
     <listitem>
      <para>
@@ -187,7 +223,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--show-trace</option>
+    <term>
+     <option>--show-trace</option>
     </term>
     <listitem>
      <para>
@@ -197,7 +234,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--help</option>
+    <term>
+     <option>--help</option>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index c22c3811dedf..e087a18eba8f 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -12,14 +12,22 @@
   </refname><refpurpose>inspect a NixOS configuration</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
-  <cmdsynopsis><command>nixos-option</command>
-   <arg><option>-I</option><replaceable>path</replaceable>
+  <cmdsynopsis>
+   <command>nixos-option</command> 
+   <arg>
+    <option>-I</option><replaceable>path</replaceable>
    </arg>
-   <arg><option>--verbose</option>
+    
+   <arg>
+    <option>--verbose</option>
    </arg>
-   <arg><option>--xml</option>
+    
+   <arg>
+    <option>--xml</option>
    </arg>
-   <arg choice="plain"><replaceable>option.name</replaceable>
+    
+   <arg choice="plain">
+    <replaceable>option.name</replaceable>
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -42,7 +50,8 @@
   </para>
   <variablelist>
    <varlistentry>
-    <term><option>-I</option><replaceable>path</replaceable>
+    <term>
+     <option>-I</option><replaceable>path</replaceable>
     </term>
     <listitem>
      <para>
@@ -52,7 +61,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--verbose</option>
+    <term>
+     <option>--verbose</option>
     </term>
     <listitem>
      <para>
@@ -62,7 +72,8 @@
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--xml</option>
+    <term>
+     <option>--xml</option>
     </term>
     <listitem>
      <para>
@@ -76,7 +87,8 @@
   <title>Environment</title>
   <variablelist>
    <varlistentry>
-    <term><envar>NIXOS_CONFIG</envar>
+    <term>
+     <envar>NIXOS_CONFIG</envar>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index e1a2c7108d18..1dbcfd329bcd 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -12,43 +12,75 @@
   </refname><refpurpose>reconfigure a NixOS machine</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
-  <cmdsynopsis><command>nixos-rebuild</command><group choice='req'>
-   <arg choice='plain'><option>switch</option>
+  <cmdsynopsis>
+   <command>nixos-rebuild</command><group choice='req'> 
+   <arg choice='plain'>
+    <option>switch</option>
    </arg>
-   <arg choice='plain'><option>boot</option>
+    
+   <arg choice='plain'>
+    <option>boot</option>
    </arg>
-   <arg choice='plain'><option>test</option>
+    
+   <arg choice='plain'>
+    <option>test</option>
    </arg>
-   <arg choice='plain'><option>build</option>
+    
+   <arg choice='plain'>
+    <option>build</option>
    </arg>
-   <arg choice='plain'><option>dry-build</option>
+    
+   <arg choice='plain'>
+    <option>dry-build</option>
    </arg>
-   <arg choice='plain'><option>dry-activate</option>
+    
+   <arg choice='plain'>
+    <option>dry-activate</option>
    </arg>
-   <arg choice='plain'><option>build-vm</option>
+    
+   <arg choice='plain'>
+    <option>build-vm</option>
    </arg>
-   <arg choice='plain'><option>build-vm-with-bootloader</option>
-   </arg></group>
+    
+   <arg choice='plain'>
+    <option>build-vm-with-bootloader</option>
+   </arg>
+    </group>
    <sbr />
-   <arg><option>--upgrade</option>
+   <arg>
+    <option>--upgrade</option>
    </arg>
-   <arg><option>--install-bootloader</option>
+    
+   <arg>
+    <option>--install-bootloader</option>
    </arg>
-   <arg><option>--no-build-nix</option>
+    
+   <arg>
+    <option>--no-build-nix</option>
    </arg>
-   <arg><option>--fast</option>
+    
+   <arg>
+    <option>--fast</option>
    </arg>
-   <arg><option>--rollback</option>
+    
+   <arg>
+    <option>--rollback</option>
    </arg>
    <sbr />
-   <arg><group choice='req'>
-    <arg choice='plain'><option>--profile-name</option>
+   <arg>
+    <group choice='req'> 
+    <arg choice='plain'>
+     <option>--profile-name</option>
     </arg>
-    <arg choice='plain'><option>-p</option>
-    </arg></group><replaceable>name</replaceable>
+     
+    <arg choice='plain'>
+     <option>-p</option>
+    </arg>
+     </group><replaceable>name</replaceable>
    </arg>
    <sbr />
-   <arg><option>--show-trace</option>
+   <arg>
+    <option>--show-trace</option>
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -68,7 +100,8 @@
    operation. It must be one of the following:
    <variablelist>
     <varlistentry>
-     <term><option>switch</option>
+     <term>
+      <option>switch</option>
      </term>
      <listitem>
       <para>
@@ -82,7 +115,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>boot</option>
+     <term>
+      <option>boot</option>
      </term>
      <listitem>
       <para>
@@ -94,7 +128,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>test</option>
+     <term>
+      <option>test</option>
      </term>
      <listitem>
       <para>
@@ -107,7 +142,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>build</option>
+     <term>
+      <option>build</option>
      </term>
      <listitem>
       <para>
@@ -124,7 +160,8 @@ $ nix-build /path/to/nixpkgs/nixos -A system
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>dry-build</option>
+     <term>
+      <option>dry-build</option>
      </term>
      <listitem>
       <para>
@@ -134,7 +171,8 @@ $ nix-build /path/to/nixpkgs/nixos -A system
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>dry-activate</option>
+     <term>
+      <option>dry-activate</option>
      </term>
      <listitem>
       <para>
@@ -147,7 +185,8 @@ $ nix-build /path/to/nixpkgs/nixos -A system
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>build-vm</option>
+     <term>
+      <option>build-vm</option>
      </term>
      <listitem>
       <para>
@@ -186,7 +225,8 @@ $ ./result/bin/run-*-vm
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><option>build-vm-with-bootloader</option>
+     <term>
+      <option>build-vm-with-bootloader</option>
      </term>
      <listitem>
       <para>
@@ -213,7 +253,8 @@ $ ./result/bin/run-*-vm
   </para>
   <variablelist>
    <varlistentry>
-    <term><option>--upgrade</option>
+    <term>
+     <option>--upgrade</option>
     </term>
     <listitem>
      <para>
@@ -222,7 +263,8 @@ $ ./result/bin/run-*-vm
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--install-bootloader</option>
+    <term>
+     <option>--install-bootloader</option>
     </term>
     <listitem>
      <para>
@@ -232,7 +274,8 @@ $ ./result/bin/run-*-vm
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--no-build-nix</option>
+    <term>
+     <option>--no-build-nix</option>
     </term>
     <listitem>
      <para>
@@ -246,7 +289,8 @@ $ ./result/bin/run-*-vm
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--fast</option>
+    <term>
+     <option>--fast</option>
     </term>
     <listitem>
      <para>
@@ -258,7 +302,8 @@ $ ./result/bin/run-*-vm
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--rollback</option>
+    <term>
+     <option>--rollback</option>
     </term>
     <listitem>
      <para>
@@ -271,9 +316,11 @@ $ ./result/bin/run-*-vm
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--profile-name</option>
+    <term>
+     <option>--profile-name</option>
     </term>
-    <term><option>-p</option>
+    <term>
+     <option>-p</option>
     </term>
     <listitem>
      <para>
@@ -299,7 +346,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--build-host</option>
+    <term>
+     <option>--build-host</option>
     </term>
     <listitem>
      <para>
@@ -323,7 +371,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><option>--target-host</option>
+    <term>
+     <option>--target-host</option>
     </term>
     <listitem>
      <para>
@@ -361,7 +410,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix
   <title>Environment</title>
   <variablelist>
    <varlistentry>
-    <term><envar>NIXOS_CONFIG</envar>
+    <term>
+     <envar>NIXOS_CONFIG</envar>
     </term>
     <listitem>
      <para>
@@ -371,7 +421,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><envar>NIX_SSHOPTS</envar>
+    <term>
+     <envar>NIX_SSHOPTS</envar>
     </term>
     <listitem>
      <para>
@@ -386,7 +437,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix
   <title>Files</title>
   <variablelist>
    <varlistentry>
-    <term><filename>/run/current-system</filename>
+    <term>
+     <filename>/run/current-system</filename>
     </term>
     <listitem>
      <para>
@@ -395,7 +447,8 @@ $ nixos-rebuild switch -p test -I nixos-config=./test.nix
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><filename>/nix/var/nix/profiles/system</filename>
+    <term>
+     <filename>/nix/var/nix/profiles/system</filename>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-version.xml b/nixos/doc/manual/man-nixos-version.xml
index c173bce19136..931c4a5ad029 100644
--- a/nixos/doc/manual/man-nixos-version.xml
+++ b/nixos/doc/manual/man-nixos-version.xml
@@ -11,10 +11,14 @@
   </refname><refpurpose>show the NixOS version</refpurpose>
  </refnamediv>
  <refsynopsisdiv>
-  <cmdsynopsis><command>nixos-version</command>
-   <arg><option>--hash</option>
+  <cmdsynopsis>
+   <command>nixos-version</command> 
+   <arg>
+    <option>--hash</option>
    </arg>
-   <arg><option>--revision</option>
+    
+   <arg>
+    <option>--revision</option>
    </arg>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -29,7 +33,8 @@
    The version consists of the following elements:
    <variablelist>
     <varlistentry>
-     <term><literal>16.03</literal>
+     <term>
+      <literal>16.03</literal>
      </term>
      <listitem>
       <para>
@@ -39,7 +44,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><literal>1011</literal>
+     <term>
+      <literal>1011</literal>
      </term>
      <listitem>
       <para>
@@ -53,7 +59,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><literal>6317da4</literal>
+     <term>
+      <literal>6317da4</literal>
      </term>
      <listitem>
       <para>
@@ -63,7 +70,8 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><literal>Emu</literal>
+     <term>
+      <literal>Emu</literal>
      </term>
      <listitem>
       <para>
@@ -83,9 +91,11 @@
   </para>
   <variablelist>
    <varlistentry>
-    <term><option>--hash</option>
+    <term>
+     <option>--hash</option>
     </term>
-    <term><option>--revision</option>
+    <term>
+     <option>--revision</option>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml
index 734bc076b852..2465f370cf13 100644
--- a/nixos/doc/manual/release-notes/rl-1509.xml
+++ b/nixos/doc/manual/release-notes/rl-1509.xml
@@ -435,11 +435,11 @@ system.autoUpgrade.enable = true;
 <programlisting>
 system.nixos.stateVersion = "14.12";
 </programlisting>
-     The new option <option>system.nixos.stateVersion</option> ensures that certain
-     configuration changes that could break existing systems (such as the
-     <command>sshd</command> host key setting) will maintain compatibility with
-     the specified NixOS release. NixOps sets the state version of existing
-     deployments automatically.
+     The new option <option>system.nixos.stateVersion</option> ensures that
+     certain configuration changes that could break existing systems (such as
+     the <command>sshd</command> host key setting) will maintain compatibility
+     with the specified NixOS release. NixOps sets the state version of
+     existing deployments automatically.
     </para>
    </listitem>
    <listitem>
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 35dc69515ffd..ae0f35046fff 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -53,10 +53,12 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
 
   <itemizedlist>
    <listitem>
-     <para>When enabled the <literal>iproute2</literal> will copy the files
-       expected by ip route (e.g., <filename>rt_tables</filename>) in
-       <filename>/run/iproute2</filename>. This allows to write aliases for
-       routing tables for instance.</para>
+    <para>
+     When enabled the <literal>iproute2</literal> will copy the files expected
+     by ip route (e.g., <filename>rt_tables</filename>) in
+     <filename>/run/iproute2</filename>. This allows to write aliases for
+     routing tables for instance.
+    </para>
    </listitem>
   </itemizedlist>
  </section>
@@ -99,20 +101,24 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-     The <varname>services.docker-registry.extraConfig</varname> object doesn't contain
-     environment variables anymore. Instead it needs to provide an object structure
-     that can be mapped onto the YAML configuration defined in <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the <varname>docker/distribution</varname> docs</link>.
+     The <varname>services.docker-registry.extraConfig</varname> object doesn't
+     contain environment variables anymore. Instead it needs to provide an
+     object structure that can be mapped onto the YAML configuration defined in
+     <link xlink:href="https://github.com/docker/distribution/blob/v2.6.2/docs/configuration.md">the
+     <varname>docker/distribution</varname> docs</link>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>gnucash</literal> has changed from version 2.4 to 3.x.
-     If you've been using <literal>gnucash</literal> (version 2.4) instead of
-     <literal>gnucash26</literal> (version 2.6) you must open your Gnucash 
-     data file(s) with <literal>gnucash26</literal> and then save them to
-     upgrade the file format. Then you may use your data file(s) with
-     Gnucash 3.x. See the upgrade <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.
-     Gnucash 2.4 is still available under the attribute <literal>gnucash24</literal>.
+     <literal>gnucash</literal> has changed from version 2.4 to 3.x. If you've
+     been using <literal>gnucash</literal> (version 2.4) instead of
+     <literal>gnucash26</literal> (version 2.6) you must open your Gnucash data
+     file(s) with <literal>gnucash26</literal> and then save them to upgrade
+     the file format. Then you may use your data file(s) with Gnucash 3.x. See
+     the upgrade
+     <link xlink:href="https://wiki.gnucash.org/wiki/FAQ#Using_Different_Versions.2C_Up_And_Downgrade">documentation</link>.
+     Gnucash 2.4 is still available under the attribute
+     <literal>gnucash24</literal>.
     </para>
    </listitem>
   </itemizedlist>
@@ -128,9 +134,9 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
   <itemizedlist>
    <listitem>
     <para>
-     <literal>dockerTools.pullImage</literal> relies on image digest
-     instead of image tag to download the image. The
-     <literal>sha256</literal> of a pulled image has to be updated.
+     <literal>dockerTools.pullImage</literal> relies on image digest instead of
+     image tag to download the image. The <literal>sha256</literal> of a pulled
+     image has to be updated.
     </para>
    </listitem>
    <listitem>
@@ -187,32 +193,40 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
     <para>
      The module for <option>security.dhparams</option> has two new options now:
     </para>
-
     <variablelist>
      <varlistentry>
-      <term><option>security.dhparams.stateless</option></term>
-      <listitem><para>
-       Puts the generated Diffie-Hellman parameters into the Nix store instead
-       of managing them in a stateful manner in
-       <filename class="directory">/var/lib/dhparams</filename>.
-      </para></listitem>
+      <term>
+       <option>security.dhparams.stateless</option>
+      </term>
+      <listitem>
+       <para>
+        Puts the generated Diffie-Hellman parameters into the Nix store instead
+        of managing them in a stateful manner in
+        <filename class="directory">/var/lib/dhparams</filename>.
+       </para>
+      </listitem>
      </varlistentry>
      <varlistentry>
-      <term><option>security.dhparams.defaultBitSize</option></term>
-      <listitem><para>
-       The default bit size to use for the generated Diffie-Hellman parameters.
-      </para></listitem>
+      <term>
+       <option>security.dhparams.defaultBitSize</option>
+      </term>
+      <listitem>
+       <para>
+        The default bit size to use for the generated Diffie-Hellman
+        parameters.
+       </para>
+      </listitem>
      </varlistentry>
     </variablelist>
-
-    <note><para>
-     The path to the actual generated parameter files should now be queried
-     using
-     <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>
-     because it might be either in the Nix store or in a directory configured
-     by <option>security.dhparams.path</option>.
-    </para></note>
-
+    <note>
+     <para>
+      The path to the actual generated parameter files should now be queried
+      using
+      <literal>config.security.dhparams.params.<replaceable>name</replaceable>.path</literal>
+      because it might be either in the Nix store or in a directory configured
+      by <option>security.dhparams.path</option>.
+     </para>
+    </note>
     <note>
      <title>For developers:</title>
      <para>
@@ -237,20 +251,23 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
    </listitem>
    <listitem>
     <para>
-     <literal>networking.networkmanager.useDnsmasq</literal> has been deprecated. Use
-     <literal>networking.networkmanager.dns</literal> instead.
+     <literal>networking.networkmanager.useDnsmasq</literal> has been
+     deprecated. Use <literal>networking.networkmanager.dns</literal> instead.
     </para>
    </listitem>
    <listitem>
     <para>
-     The option <varname>services.kubernetes.apiserver.admissionControl</varname>
-     was renamed to <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
+     The option
+     <varname>services.kubernetes.apiserver.admissionControl</varname> was
+     renamed to
+     <varname>services.kubernetes.apiserver.enableAdmissionPlugins</varname>.
     </para>
    </listitem>
    <listitem>
     <para>
      Recommented way to access the Kubernetes Dashboard is with HTTPS (TLS)
-     Therefore; public service port for the dashboard has changed to 443 (container port 8443) and scheme to https.
+     Therefore; public service port for the dashboard has changed to 443
+     (container port 8443) and scheme to https.
     </para>
    </listitem>
   </itemizedlist>

From 15fa70cd784c641571081420de6fae73894c4481 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 31 May 2018 21:07:15 -0400
Subject: [PATCH 2923/3370] nixos/doc+man: Fixes squishedtogether definitions.

---
 nixos/doc/manual/development/option-types.xml | 22 +++++++++----------
 nixos/doc/manual/man-nixos-install.xml        |  8 +++----
 nixos/doc/manual/man-nixos-option.xml         |  4 ++--
 nixos/doc/manual/man-nixos-rebuild.xml        |  2 +-
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml
index bf2e38b4c4d6..47dd09158e91 100644
--- a/nixos/doc/manual/development/option-types.xml
+++ b/nixos/doc/manual/development/option-types.xml
@@ -206,7 +206,7 @@
   <variablelist>
    <varlistentry>
     <term>
-     <varname>types.enum</varname><replaceable>l</replaceable>
+     <varname>types.enum</varname> <replaceable>l</replaceable>
     </term>
     <listitem>
      <para>
@@ -218,7 +218,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.separatedString</varname><replaceable>sep</replaceable>
+     <varname>types.separatedString</varname> <replaceable>sep</replaceable>
     </term>
     <listitem>
      <para>
@@ -229,7 +229,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.ints.between</varname><replaceable>lowest</replaceable><replaceable>highest</replaceable>
+     <varname>types.ints.between</varname> <replaceable>lowest</replaceable> <replaceable>highest</replaceable>
     </term>
     <listitem>
      <para>
@@ -241,7 +241,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.submodule</varname><replaceable>o</replaceable>
+     <varname>types.submodule</varname> <replaceable>o</replaceable>
     </term>
     <listitem>
      <para>
@@ -269,7 +269,7 @@
   <variablelist>
    <varlistentry>
     <term>
-     <varname>types.listOf</varname><replaceable>t</replaceable>
+     <varname>types.listOf</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -280,7 +280,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.attrsOf</varname><replaceable>t</replaceable>
+     <varname>types.attrsOf</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -292,7 +292,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.loaOf</varname><replaceable>t</replaceable>
+     <varname>types.loaOf</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -303,7 +303,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.nullOr</varname><replaceable>t</replaceable>
+     <varname>types.nullOr</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -314,7 +314,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.uniq</varname><replaceable>t</replaceable>
+     <varname>types.uniq</varname> <replaceable>t</replaceable>
     </term>
     <listitem>
      <para>
@@ -325,7 +325,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.either</varname><replaceable>t1</replaceable><replaceable>t2</replaceable>
+     <varname>types.either</varname> <replaceable>t1</replaceable> <replaceable>t2</replaceable>
     </term>
     <listitem>
      <para>
@@ -337,7 +337,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <varname>types.coercedTo</varname><replaceable>from</replaceable><replaceable>f</replaceable><replaceable>to</replaceable>
+     <varname>types.coercedTo</varname> <replaceable>from</replaceable> <replaceable>f</replaceable> <replaceable>to</replaceable>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml
index 34b3eef8b212..25f4f40613ac 100644
--- a/nixos/doc/manual/man-nixos-install.xml
+++ b/nixos/doc/manual/man-nixos-install.xml
@@ -62,15 +62,15 @@
     <arg choice='plain'>
      <option>-j</option>
     </arg>
-     </group><replaceable>number</replaceable>
+     </group> <replaceable>number</replaceable>
    </arg>
     
    <arg>
-    <option>--cores</option><replaceable>number</replaceable>
+    <option>--cores</option> <replaceable>number</replaceable>
    </arg>
     
    <arg>
-    <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
+    <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
    </arg>
     
    <arg>
@@ -213,7 +213,7 @@
    </varlistentry>
    <varlistentry>
     <term>
-     <option>--option</option><replaceable>name</replaceable><replaceable>value</replaceable>
+     <option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index e087a18eba8f..d436cce742a2 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -15,7 +15,7 @@
   <cmdsynopsis>
    <command>nixos-option</command> 
    <arg>
-    <option>-I</option><replaceable>path</replaceable>
+    <option>-I</option> <replaceable>path</replaceable>
    </arg>
     
    <arg>
@@ -51,7 +51,7 @@
   <variablelist>
    <varlistentry>
     <term>
-     <option>-I</option><replaceable>path</replaceable>
+     <option>-I</option> <replaceable>path</replaceable>
     </term>
     <listitem>
      <para>
diff --git a/nixos/doc/manual/man-nixos-rebuild.xml b/nixos/doc/manual/man-nixos-rebuild.xml
index 1dbcfd329bcd..551a65f5e96b 100644
--- a/nixos/doc/manual/man-nixos-rebuild.xml
+++ b/nixos/doc/manual/man-nixos-rebuild.xml
@@ -76,7 +76,7 @@
     <arg choice='plain'>
      <option>-p</option>
     </arg>
-     </group><replaceable>name</replaceable>
+     </group> <replaceable>name</replaceable>
    </arg>
    <sbr />
    <arg>

From 6bf54191fb3a7328fa701e408419f29d7bc7ba79 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 31 May 2018 21:09:16 -0400
Subject: [PATCH 2924/3370] doc: Fixes squishedtogether definitions.

---
 doc/stdenv.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index f6180d5ca6a8..e7f52377e687 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1863,7 +1863,7 @@ set debug-file-directory ~/.nix-profile/lib/debug
   <variablelist>
    <varlistentry xml:id='fun-makeWrapper'>
     <term>
-     <function>makeWrapper</function><replaceable>executable</replaceable><replaceable>wrapperfile</replaceable><replaceable>args</replaceable>
+     <function>makeWrapper</function> <replaceable>executable</replaceable> <replaceable>wrapperfile</replaceable> <replaceable>args</replaceable>
     </term>
     <listitem>
      <para>
@@ -1889,7 +1889,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
    </varlistentry>
    <varlistentry xml:id='fun-substitute'>
     <term>
-     <function>substitute</function><replaceable>infile</replaceable><replaceable>outfile</replaceable><replaceable>subs</replaceable>
+     <function>substitute</function> <replaceable>infile</replaceable> <replaceable>outfile</replaceable> <replaceable>subs</replaceable>
     </term>
     <listitem>
      <para>
@@ -1900,7 +1900,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
       <variablelist>
        <varlistentry>
         <term>
-         <option>--replace</option><replaceable>s1</replaceable><replaceable>s2</replaceable>
+         <option>--replace</option> <replaceable>s1</replaceable> <replaceable>s2</replaceable>
         </term>
         <listitem>
          <para>
@@ -1911,7 +1911,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
        </varlistentry>
        <varlistentry>
         <term>
-         <option>--subst-var</option><replaceable>varName</replaceable>
+         <option>--subst-var</option> <replaceable>varName</replaceable>
         </term>
         <listitem>
          <para>
@@ -1927,7 +1927,7 @@ makeWrapper $out/bin/foo $wrapperfile --prefix PATH : ${lib.makeBinPath [ hello
        </varlistentry>
        <varlistentry>
         <term>
-         <option>--subst-var-by</option><replaceable>varName</replaceable><replaceable>s</replaceable>
+         <option>--subst-var-by</option> <replaceable>varName</replaceable> <replaceable>s</replaceable>
         </term>
         <listitem>
          <para>
@@ -1962,7 +1962,7 @@ substitute ./foo.in ./foo.out \
    </varlistentry>
    <varlistentry xml:id='fun-substituteInPlace'>
     <term>
-     <function>substituteInPlace</function><replaceable>file</replaceable><replaceable>subs</replaceable>
+     <function>substituteInPlace</function> <replaceable>file</replaceable> <replaceable>subs</replaceable>
     </term>
     <listitem>
      <para>
@@ -1973,7 +1973,7 @@ substitute ./foo.in ./foo.out \
    </varlistentry>
    <varlistentry xml:id='fun-substituteAll'>
     <term>
-     <function>substituteAll</function><replaceable>infile</replaceable><replaceable>outfile</replaceable>
+     <function>substituteAll</function> <replaceable>infile</replaceable> <replaceable>outfile</replaceable>
     </term>
     <listitem>
      <para>
@@ -2013,7 +2013,7 @@ echo @foo@
    </varlistentry>
    <varlistentry xml:id='fun-substituteAllInPlace'>
     <term>
-     <function>substituteAllInPlace</function><replaceable>file</replaceable>
+     <function>substituteAllInPlace</function> <replaceable>file</replaceable>
     </term>
     <listitem>
      <para>
@@ -2024,7 +2024,7 @@ echo @foo@
    </varlistentry>
    <varlistentry xml:id='fun-stripHash'>
     <term>
-     <function>stripHash</function><replaceable>path</replaceable>
+     <function>stripHash</function> <replaceable>path</replaceable>
     </term>
     <listitem>
      <para>
@@ -2045,7 +2045,7 @@ someVar=$(stripHash $name)
    </varlistentry>
    <varlistentry xml:id='fun-wrapProgram'>
     <term>
-     <function>wrapProgram</function><replaceable>executable</replaceable><replaceable>makeWrapperArgs</replaceable>
+     <function>wrapProgram</function> <replaceable>executable</replaceable> <replaceable>makeWrapperArgs</replaceable>
     </term>
     <listitem>
      <para>

From 507d24a7def2bc16ee3034371c9851ef8ec8843a Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 1 Jun 2018 02:50:37 +0200
Subject: [PATCH 2925/3370] signal-desktop: 1.11.0 -> 1.12.0

---
 .../instant-messengers/signal-desktop/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index b9c1c2a1db0a..da862b715147 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, gnome3, gtk2, atk, cairo, pango, gdk_pixbuf, glib, freetype,
+{ stdenv, lib, fetchurl, dpkg, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype,
 fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
 libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
 nspr, alsaLib, cups, expat, udev
@@ -16,7 +16,7 @@ let
     gdk_pixbuf
     glib
     gnome3.gconf
-    gtk2
+    gtk3
     pango
     libX11
     libXScrnSaver
@@ -40,13 +40,13 @@ in
   stdenv.mkDerivation rec {
     name = "signal-desktop-${version}";
 
-    version = "1.11.0";
+    version = "1.12.0";
 
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
           url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "0s3qlzm7iy9qxca2hlh1hq0dnjr7y5wxad1ssqgmyhxsif0nqm96";
+          sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk";
         }
       else
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";

From c97fcb4d2b08f31078459f113fd53fd89c107cd9 Mon Sep 17 00:00:00 2001
From: Anton Latukha <anton.latukha@gmail.com>
Date: Fri, 1 Jun 2018 09:02:28 +0300
Subject: [PATCH 2926/3370] qbittorrent: 4.1.0 -> 4.1.1 (#41252)

---
 .../networking/p2p/qbittorrent/default.nix    | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index b2e9333beb3e..a5d861093c90 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,44 +1,47 @@
-{ stdenv, fetchurl, pkgconfig, which
+{ stdenv, fetchFromGitHub, pkgconfig
 , boost, libtorrentRasterbar, qtbase, qttools, qtsvg
 , debugSupport ? false # Debugging
-, guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
+, guiSupport ? true, dbus ? null # GUI (disable to run headless)
 , webuiSupport ? true # WebUI
 }:
 
-assert guiSupport -> (dbus_libs != null);
+assert guiSupport -> (dbus != null);
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "4.1.0";
+  version = "4.1.1";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "0fdr74sc31x421sb69vlgal1hxpccjxxk8hrrzz9f5bg4jv895pw";
+  src = fetchFromGitHub {
+    owner = "qbittorrent";
+    repo = "qbittorrent";
+    rev = "release-${version}";
+    sha256 = "09bf1jr2sfdps8cb154gjw7zhdcpsamhnfbgacdmkfyd7qgcbykf";
   };
 
-  nativeBuildInputs = [ pkgconfig which ];
+  # NOTE: 2018-05-31: CMake is working but it is not officially supported
+  nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ boost libtorrentRasterbar qtbase qttools qtsvg ]
-    ++ optional guiSupport dbus_libs;
+    ++ optional guiSupport dbus; # D(esktop)-Bus depends on GUI support
 
   # Otherwise qm_gen.pri assumes lrelease-qt5, which does not exist.
   QMAKE_LRELEASE = "lrelease";
 
   configureFlags = [
     "--with-boost-libdir=${boost.out}/lib"
-    "--with-boost=${boost.dev}"
-    (if guiSupport then "" else "--disable-gui")
-    (if webuiSupport then "" else "--disable-webui")
-  ] ++ optional debugSupport "--enable-debug";
+    "--with-boost=${boost.dev}" ]
+    ++ optionals (!guiSupport) [ "--disable-gui" "--enable-systemd" ] # Also place qbittorrent-nox systemd service files
+    ++ optional (!webuiSupport) "--disable-webui"
+    ++ optional debugSupport "--enable-debug";
 
   enableParallelBuilding = true;
 
   meta = {
-    description = "Free Software alternative to µtorrent";
+    description = "Featureful free software BitTorrent client";
     homepage    = https://www.qbittorrent.org/;
     license     = licenses.gpl2;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ viric ];
+    maintainers = with maintainers; [ Anton-Latukha viric ];
   };
 }

From 5662c243026bf5b14e8696fa4fe961589470d199 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 31 May 2018 00:12:23 +0000
Subject: [PATCH 2927/3370] qpid-cpp: fix build after #28029
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When -O2 from hardening does not redefine -O3 from CMake, the build fails with:

     src/qpid/broker/SelectorExpression.cpp: In member function ‘qpid::broker::Expression* qpid::broker::Parse::orExpression(qpid::broker::Tokeniser&)’:
     src/qpid/broker/SelectorExpression.cpp:1041:13: error: ‘*((void*)& s +17)’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
          if (s[1]=='b' || s[1]=='B') {
---
 pkgs/servers/amqp/qpid-cpp/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix
index a838fa3b904c..8446578507d8 100644
--- a/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/pkgs/servers/amqp/qpid-cpp/default.nix
@@ -35,8 +35,9 @@ let
 
     NIX_CFLAGS_COMPILE = [
       "-Wno-error=deprecated-declarations"
-      "-Wno-error=unused-function"
       "-Wno-error=int-in-bool-context"
+      "-Wno-error=maybe-uninitialized"
+      "-Wno-error=unused-function"
     ];
   };
 

From 0385d69f878a4b9ce4d4735e28dff6ecf7b64507 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 1 Jun 2018 08:10:27 +0200
Subject: [PATCH 2928/3370] tests/containers-imperative: Include stdenvNoCC

While building the container there are a few occasions where stdenvNoCC
is used underneath. During the last staging merge, some change now tries
to build texinfo during the test while building stdenvNoCC.

With this change, I'm adding stdenvNoCC to the closure to make sure that
even when we have future stdenv changes, it doesn't break (well, except
if we do have another variation like stdenvNoCC that overrides stdenv).

I haven't bisected the exact change, but I'd suspect that it could be
one of the commits in #39457.

This fixes the test and it no longer fails with the following error:

error: unable to download 'http://ftpmirror.gnu.org/texinfo/texinfo-6.5.tar.xz': Couldn't resolve host name (6)
builder for '/nix/store/r7sf1wjbnimwgnv276jh59nfnzw40x30-texinfo-6.5.tar.xz.drv' failed with exit code 1
cannot build derivation '/nix/store/5w1pv788ayi1wahyy76i90yqv96ai4h5-texinfo-6.5.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/cnsfkf0j5xmm14zzm5a3a66pz66gbc82-stdenv-linux.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv': 1 dependencies couldn't be built
error: build of '/nix/store/11kkhk57ic8kfd7g197sqwgd0pzqfjhl-nixos-system-foo-0-18.09pre-git.drv' failed
/run/current-system/sw/bin/nixos-container: failed to build initial container configuration

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @aristidb, @edolstra, @chaoflow, @kampfschlaefer
---
 nixos/tests/containers-imperative.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index a548b17b1ff1..b89e08f82acb 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -22,7 +22,10 @@ import ./make-test.nix ({ pkgs, ...} : {
             };
           };
         };
-      in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ];
+      in [
+        pkgs.stdenv pkgs.stdenvNoCC emptyContainer.config.containers.foo.path
+        pkgs.libxslt
+      ];
     };
 
   testScript =

From 1bf2fe70a7a32a87fdf4cc75560eac572c10a6f7 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 1 Jun 2018 10:00:43 +0800
Subject: [PATCH 2929/3370] firefox-devedition-bin: 61.0b9 -> 61.0b10

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 7b518e3714eb..82fa989a7bb3 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b9";
+  version = "61.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ach/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ach/firefox-61.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "75fb64c0c50503e92393c2294ad48c63abae225bcd88f9e5d3e681ee1e1d59d9100d672ba7440523ac0a365a5a6fb5ec08cc4bbc09c59ebaee33e826565c9a6f";
+      sha512 = "740d588bf8c76fe5404b5c85c3fe684487d66737736df0a63257f2634dc09ba57d5dcaf6ff0bd2e143fde57f40c94785f7c544de63155540459b592923cdc825";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/af/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/af/firefox-61.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "96a5aa4c1952144b8867f98b5fbc5b2f7e3707e0b6d1629310284a6099c28bd415ff16cac453beb91bdd7848d86e360907eb6cacb711e7dfea54d08b91fc09a2";
+      sha512 = "364ca986f49c9264b82a22f8eb54d23238d4cf88dee75e793a05cba1cdf9dd43d961d563dc2601133ad82745f525af9620c20f2af0b61b846c9d11e6766cbf36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/an/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/an/firefox-61.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "e1a0ef6531a26db01cda6403d18c20d27f19a6f97d61c48441706d05ffae12de2e2b349ab709027dd9f2ef72f52343703feef372922120902f8a6f3479603dd3";
+      sha512 = "071bac11250764e3d53b7254fa8f5e2d52e3ef848d540f8b1f8e1ab057b52ca3417018d2e92e86bf367d7c6c957b98acdb810677c39f1a20cb21e44f0fc00478";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ar/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ar/firefox-61.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "7dd862b547f4c996269a627f40b43445421af04f6043f4ba7904be3426ec1ef68d2fdc25e48825d2f078342f7481144fca1a64275ecbbe78a2d5c0c199a1110c";
+      sha512 = "1317f10e8011304d00acbaca253aa8b6caac069878a93c11b4a81ce94ee86b13029a6610f771dfac165b4a15ccd89ebe4190abfb7db02efee4d8f97a561cb767";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/as/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/as/firefox-61.0b10.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "1396ffecab2ef9a183f3faac009eb8cd94f4f3aec74a2a4f5c7d4cf84d4e70c157b4608ba1c5b48e01f6ac3563a567329ef3137bca9749a4694f815f01ee82cd";
+      sha512 = "62178638fb5536efef88923ddd7c45ddd48f662ce33f838080ea04a4b31a12d0cdc0ea507873ca463eac17e4863ccd6a02430c7da97e2caefebbd4eb19efe842";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ast/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ast/firefox-61.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "f07e660a8e390fec025ba0ae12c86ed45aa39abf1cb168596fbf480a4a2bffa91cb667dc10beb75f3d9bf007669d63e6e93104b7276d12dfd1e0dade27269990";
+      sha512 = "d8912103afa9795c9c96576e086e3ee88c12f060104a899f150ab07f1693cd11804fc1c080ba0a09137e58218ff765db854427913f8f1bc010fa9c010d721eff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/az/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/az/firefox-61.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "715f4e1782c759d3578f9f57ba1912a47c1fea41f878432b999ec6b68906ffb794c1413f5372653e8b3119c16837d19351004323331c1b29012f14fc47be897f";
+      sha512 = "9ce7b890d540ca77fc2190d0d396a00b300fabf170472980d127d874898ff16588679a1467a64da671417eb59dd1594d2837f00a3977bf497242d070fbec0ae1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/be/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/be/firefox-61.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "e4b6e9357b45d56a985811e5b60ded4feed851981a3d39d013b43af70c6c83dc6dafd3c200a8ba945162923985b19960b6cbe54435c8d89fff1f36fe8fb42991";
+      sha512 = "45488290c37219d05c804c953f98895245c401b2fd04ccd43e8c8ae8a91c6f55108c3b9ba3ef0d2866c15bd1a8791d76a01dd69fc79b30eebf6d1628c23f4bc8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bg/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bg/firefox-61.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "1d9341f17b3d82e26bb79541cc87b189cf624557d5e59978fa2248640d9756b7ece0aa6c64a59ecca47c23f65ece8ca6bc3b2bd7e6ed6d09003e2b23265dd048";
+      sha512 = "24eca3ce4fbaa3f0e476478b537bbc091f2afecac4d2841a2561b91c84a8b2f3c2e73c4e4d39bd0c7394b321ce85e3155ada433c4cdb7c0e12ba24b0034d55fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bn-BD/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bn-BD/firefox-61.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "8c187890d236e847e33d994635e2e3fbe3a8c4b5e6aed0e65ed41659bb02ca0aa72be2bf65a8bd73e5f786fc42032b659a36e0516bad2663e72a9bd18ed1aafc";
+      sha512 = "274a9c2b0b2461aaeb8c951e8c197af5fdb0bc08ac97582940318e585fa89e9245a5424452cbd6664100e5061866242c12ba1b69b51a0764f76788ab3e65bbff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bn-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bn-IN/firefox-61.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "94757d9cebe243e06c0e454b72b8898f0ca1c8ee5682529775c4b86b871fdec03041dd00ee048b7a875ae2f91d0b81f173d48576a16a1e03f240c74ed0c7afeb";
+      sha512 = "3b2218b908dda94ef336c4b9f567f2c1b0f880a40d32ae9a3f0633eb448932ccae425636a43cc960a00790ad640e3355dd5b4ff385669e1f8fc3c17aedf72249";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/br/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/br/firefox-61.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "7b55fb596d76c18d8f6271b1b7d7fb8646abaa2e765f7a3ff428ee75ea6e23de662f77544c72fd1e1462ff7a633e3f244cda23388315488daa65e11ec35d95fd";
+      sha512 = "81ce5b13a01746389ac8aa171d8724bef8c124c66984102cde0eed038f1b5a8da1c8ec6f67743ed8c949cbd54dc3aeff0beae09522cc9b348d17e1c96b2df354";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/bs/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bs/firefox-61.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "8f37addc81aa8283a489a5d1c4f756f7532429c661124c1294e00bffb8b313c43c0bdef0e4c0b7be05b3e1f306a7a77c44909cdd9030cb45d85e643f58cc8799";
+      sha512 = "b76b7c5388e7bed9c7e78c404cc73b9514e739f750308019fc34ed7f67a5dbf6455079fe54886c31d1b517b1e5877062242bd8a0eaba50e4baba2f1e6c6b31a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ca/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ca/firefox-61.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "672eb7c624d0e574fc8028c4cd0877e17f77c540876c64f652c3531c1c1abff67c4408ea26bcec8b9a68212cf0e13f494c02d7aa63195c6f26d08b35bae556b4";
+      sha512 = "6180796b52b2a1a918593e35da2732537f2d8657b48cf91541ba65c85908a4cac4c5a414ddef5a8f746bd4b8c1b7a09153be874b0bd4718979ee74dd45e61239";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cak/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cak/firefox-61.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "2638169827de1a5ac36af21297695bb3883c755cd6995f02bd63375988253b9f925bf88a9aff03e942c8e0a4de0f5a7a9acfdf55a8c0ffcd4ad200152c051901";
+      sha512 = "d642f89a303414819e66ea1d2e253d053b95e4b8d89ec90d617b36ce482556e835825159181a72cbdb48c40136f2c59e0851d4609ccc55b675fe5a6d06a54ae4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cs/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cs/firefox-61.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "0e1e30e740c9a2ab4fc6121d929d21275b7007555a475f003fe64cc58c5f0c664b499b6361322c1c4f6f5b6bc3fc1de4b9cf21ffc15e9c0889cb00f3d12bceb8";
+      sha512 = "4775eb724aa03c77fd36ec1969d43e27c80b829401417d687ec369794c3235a9ba99a30501a1d2c54806f94cab054b5e763c96591568089b8a78d590453212a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/cy/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cy/firefox-61.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "71011db2d4a7b023c03f6c253662ae31301c0a8e0d66d769775094ae2dafe3e1b6723c30749e0a96a0a2e470100ed5aa58ca2b6b37ce41d3f06fb82e54a92f6e";
+      sha512 = "8a629ae7e2c9f2376d9846d6713e049f227ba251caafde55aaeac062e738ce26c75480c730a7d4332dc63c4d3eacf240396f5c7db657e9a6dfcb45a3e6c7400f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/da/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/da/firefox-61.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "af01926560242286366d3abfcb499eec06ddbd3cd07d6789489145e06b5689969bd6e80be15f457ba3f36009c15097ba56dbe9ccf91d61913db3bd563a0167be";
+      sha512 = "b814806fc1b7f26c2c10d973db25b159ff49834a75afa1fc6e24fcb9b08bb3899269a4383cc675dd117f9846d4a3b5e530aed3c37e8ab4b65ac21c00bf2478cb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/de/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/de/firefox-61.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "8bb69b0557a110331472e8d85f5978713e7e3824342225fcee2dad27f248f8568175339e2e9dcaab216009c3f71e905a79c5efbf4910e337b040eb43e83bc887";
+      sha512 = "4caf961bf706b616cb877b713b9d199ae8f518a69a608213f1d26ee43a141ada3a4ead80595203314818adf45a21ffd5a4a92402aece9c215d85316ee1eca528";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/dsb/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/dsb/firefox-61.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "7e6839670e1024bcc9124baa6072ac9381885ed979903c4eecce2234baeb471c64a445d2fd5085cce05c27b134792530dfa8a971863f67e38ddd3dca7ac90e50";
+      sha512 = "8b18c3e4d16f4400c10541a2c7ad31cd21cd5709e352d9db1116aceb3c0adf36e5ee69fb35a02c69e864b2d8ef8c977531df1176dc0530e3f5655609dddc7c78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/el/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/el/firefox-61.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "c392024823653a78d3e7e47eaa522e6b2e465e3caf9e1e3dff1c1bb3a15e48176c616c9f8daba332254e6efea4c9425cc8bfef75a0eefafe9485cb8e18bb807c";
+      sha512 = "6796cfda6591d705c4ccfd10a082a27dad9395191bf18ca8d721fcd37c82d7769abef341b5f1e87de0e2fd73333e61480d0f70ab4e796a7e333c407cc38291b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-GB/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-GB/firefox-61.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "316c9fefc7fac7b1013e0f0e32633ceb3125b5d8865d0ee8b8db7283c5d18c28dc85de57b25fbb15d569b907690b49e4351da2b9fa5116e910aba1375bf1d4be";
+      sha512 = "48c7fb0a44b65a6e5e8a7021525a5101fbc4727c43b28d8e1167996214c4c25f933e28c14f40d6c68a4a46aafe21a7f87375eb6a191c7edd8458fe4ec726c55e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-US/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-US/firefox-61.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "30aa0f0329f76b52fafc22332cbf6e278c0cca5507cc2a806e7fb78969a203e8b7c1b89ef029a38bb3da8b78f11fcba4b7c6c1fed0cedca6031fa080cebf1ee4";
+      sha512 = "92a77caf98ad017193bd2989e9a83b59c802563503e1d84d48ab4bb6358437b31d89ea51d85ad4c97025f8db9da3245b2dfb51b76e81b11f2fa39ba859cd622b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/en-ZA/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-ZA/firefox-61.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "86a2fa792c357040a006e6558864a417dd973464231197857e05e17a5b2abf2299811fd4c2cd21de5979de5631017d7057f675b05820198d4e1dbe3b89432fea";
+      sha512 = "9a912d19b5ba481b59999f619ad0f1588bfe00adffaeda2004d600a5f1490a7013137b6a66167e0e228350265a0aef08a98b76920bae15ff4b3fee2532e3de33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/eo/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/eo/firefox-61.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "350feffc864f163595c24540e23f8d8e81bf25e8a353f344ca3fdac6b80e0b4646287232332310d10b87b1fe64a2cbecfad24752200a1aa05d25b0a00fc0c698";
+      sha512 = "8ad7db7437357ed0041d5b08a0ebf70e35b58c0eb66105700a473a7231d560915a775e90be2be9b7e776836d01e86ae08210f454efeb7e0e99594fe53353252f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-AR/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-AR/firefox-61.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "2a735cbdd073ef00cdfb1b37134c7959faae380f69533dd46ebc67e1644990452e8e55d643e41f1b61d600a8ffd200cf26c9952d08130f50b2d0557c19fbc710";
+      sha512 = "266d24efcaeac7a06eeefa7657ebd9a3e33f79726890cc1c8b929c7a0dab38d761ef4cbd5514444540e58b8f2718f0a4bed832985bf2ce5d2929d6c695a7de91";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-CL/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-CL/firefox-61.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "69d6dfcd9426970681864dbc81e092c5a00a1360401bb641863f07acc6fc11450a62a7ddcc1799eb290f07cdfcf98ed713be84e9ef13b4257594a7511d922ab0";
+      sha512 = "3188079a0ef7845a6157d887470d11dfa700e17f3a85012a4138529b7e21f44ed4034814338c4e231b2023131686984f86cf938ad2c437607659e971f45bc96e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-ES/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-ES/firefox-61.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "e46e6871499bab27d57d37cce001abf97646c841321b4e1fe9d05fc1e1b2282077c7fdcdcdc53869322b7b6c0ded791a092020a16cf82152551240c0415fa2ff";
+      sha512 = "58979c9e00b285c61fa1ac30f0414aeedbc30185542e49615f943a1a7eec8a92be30726b090d275fe21e6bb7ed0103eb0e02e4d9043cfbb8752769ca9e20e5cd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/es-MX/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-MX/firefox-61.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "20ac9ff086c905f8b46abc959909495faaebeb09ae125c9f0ec0c75d41a2eba9d661a2a3b1f21b061f7d148784129a43fe5e39cd1daced601f02ebe1d8980743";
+      sha512 = "182fa29867ce9a6c2f7906f3b81bd5e0ba33c6b8802330d3af27ff0dab863ff95575e72f3388cbf4aa1ab5e8a10e0cbcaffa4ed4873e2f1dd3f20233a3dc316d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/et/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/et/firefox-61.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "1bf54cac4cd8e3b640357897af7a3eb15e082d24950fac0243006f2e402a67137cf17ab927c287a600ab6a13f803073d47168be6fce85f4910c751ff9d772ceb";
+      sha512 = "103fdd39cad73c256a76719b9f1bfe56b0f0ce9a888b63378a56968e01321e27dffb113e9580ab96756a8a8d397560b49ba69a42887dbc9cb2ab520583ec32c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/eu/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/eu/firefox-61.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "4201780fb972013086b454028bb42b32ae8b8519952272a129045e557c8f8f377eb4c6b12d59a8cdac23fb49250cc6bd3a0f9aeb8b14eafebb48bb34310baafe";
+      sha512 = "44f11cabfed645db051ac0e74d416de36832124cd906d5d5743317ff216fb52e9300df3653ab48daf3d5206783c97ede183bd836212774130966241ec7819a29";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fa/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fa/firefox-61.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "d371143546311601cc3177f327211c9e67bf57156dfb7ad3d9664ac11f45e3c0461acd64ff8f445a106f904773d8734b498993978e8c6fd14f8572cfc8a514de";
+      sha512 = "c06676d1b349575ec4da0e7afe8f50bb9f5176d417d5291fbc3772176a0510f1b512d62f7f7e6377d5a886179deff4a48b4844550fb8fd1bf7d2cd110e16b916";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ff/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ff/firefox-61.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "72b8e0ada0e725f9dfc5727b55a0efee0acbfc5837bdc5ce6b7b9fbca4bbca59852f00df3b983dc70e233a2c4e643aa0e066830934965c63427a19da8fbba0de";
+      sha512 = "85503ac496efc98e642a12e2c7000704424ab69e01657d1db57e2af72365517d9c403bea05cd740ef5795838bab60992d23dd6727105e1e8e9952abe4eecd97a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fi/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fi/firefox-61.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "30394db6c85ddc94f21a49c41b6b9e26b77ffda48061c53abefb114c85dbe09bac1f6f2f40f83a719b98ae673936a4bbc90b3f74d399b50b0e98f50faddda1e8";
+      sha512 = "669c6fade9300b3918b4f72bd79984eeba9c56f8e4010c062ec733c85b201ef152543cd42dc7c448ea4035672d314ee90ead6dab0f055763f9637a0dbaaf5dc1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fr/firefox-61.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "6fb78971dcc3fe3ac5f52809c217b893678d80f33b712c9f9afe0d133aaac6a02d446becbc3bf533a8913aa272ab6bcdb9a21a884227b609e8fd0a4ee419b2c0";
+      sha512 = "b4de90e91c977cf7005b44926283831d4f338de06513cb09304eea1ec6ec3b7891e0fea48c48b7933ad5cf5ec571f3b36dfadc5066b9412be5b084eb705e8359";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/fy-NL/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fy-NL/firefox-61.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "bf92a74774aaa365fa7e4630e0543ac017a4d4692df25282fa7763bcf2afae2824ba8147d9f1b33cc8ba1c7b2ecbb6edf6c00e9e13edeb669900a58a8dd3d839";
+      sha512 = "e37e4d7be6f4f8f66a18d17c35822ba82b68a3004c4007a0e7bebec19900d948870293586fb9d8f27b4c974bc40f7d305545d920bddd22b9e4bf592debbda23c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ga-IE/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ga-IE/firefox-61.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "ae835b5886193657584754244f0fa3ffb93b1e0efe3fea4e56e0633e867a8772fe0b1bd2a49d5d26cbab03bfd4f2c8c14090de91e286624917637ba50838fb3d";
+      sha512 = "4423d01af6bafacbe8128933ea27a43cb9d93a9e22edadacbe39131bed9ebb23fb22d6bc1ec6e9ce648cd4eb6bac72d8a58afc476fb2222542a4d81d183d344b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gd/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gd/firefox-61.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "53cc4518af97928f836c4427ff22ce60325682705a6941ced6fab32cf1aa1814e7d295a7b1cb7d389bb1fc8f2a691fb178f9ddff5d69ddb377e282f2f2e07171";
+      sha512 = "e19cbd917c6e3822804a5176dfe2bf345744a8f9a65e9c201fd34e610cf6fc8ca8c85a0309126025647fd0a251ca2b360e420541d83f0a66c9ee5001d46db916";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gl/firefox-61.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "eb3b1d9c6565864bb870a6d98f303a749afcfcc66b619ec85c5babb3e93ad26fc1a4054159c75f3f6e400da3538499f2f26abe65ab1a01a68c7ce85be70be935";
+      sha512 = "bea38f7c3f9d79ce5dbe1a10c118497f110acd9c346fc24d377757cf28b35676f9df2fc7902f431feec1177f67465dd6d57a349209463e39514e4962f93d108a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gn/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gn/firefox-61.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "23e34458f7776d192271eb29d6d06072753b16b929cb3efdd9d9fdd741625a650d407e51ee6f2f5415bd60392872aed7de231419c1cb32d5d45ba7435a445ae5";
+      sha512 = "cd21d480fac0cbd1f06896c778d8dec99f5355944f5ef976522d4d893a6b68243b858ac64ef96fd69d3699cb6bec70368268991654d4119172862a7aed99f91c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/gu-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gu-IN/firefox-61.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "7f7b8993077ff366c9153d732f6c294400d0fd887bace7c35dfc056d0f3171eeb465f599cff802f9d73873d77d10deaa423762ddb0a469f98ef79e1bb512312f";
+      sha512 = "f2374262b10dad0c20fc0e8700df88ebdd6cfadd2075ff66172007d953012038443964fc359f6266f0c02c6bcf4050549095bb5beee26efc23731049b4faed00";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/he/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/he/firefox-61.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "5678f36bf759bbe510914cd522309c43d4f346e3386261bcac77e0e6101f0fa88dda99b38dc54f0d28aad73f4c233758d297758816b5601806e578a288fc9918";
+      sha512 = "7e2f13ff348c23e3f64e18619f0c39d1bbd57edba2ee22c2c50b1c03014f658be9b7c4ad15563286f87786d87fe983e607a70c338a6e906321c0ae321c521647";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hi-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hi-IN/firefox-61.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "89d448c4967e611bd90936499c83003744a1c505ed5f282cbcdb37f10655d75793992328237e3d08054d9e14c42755cd1bda8d60bb3432f85be5d55fca499e3a";
+      sha512 = "64b1fbb4fd1def6819bc42eb55df6e88623e94028517ee57dae350c63943927e455805463b5f2afb144c3ba8387e192df2f4355755f402dfaa2dc02c2ffa6570";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hr/firefox-61.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "28504ecdb7c0f2a76ba5d2dc257b5e8f4dd31bc93b341ad2db987ffa59685f67f04d4550118259869052ff2943acf97efc356e0b117af7dd78969af731edc538";
+      sha512 = "2f7d0ccd6ece526b82c03aa9af1908c976fe1b8bac37c6403a9162a6fcbe0fceb9f12e40cfa9877dd57df77adb9104511b0da1efe4c81690043b7718a4dd70d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hsb/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hsb/firefox-61.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "7d04bb5f3f4b00d43c20406f1d1fc2945855edc9280ded91a41f0deb9c5ef348cd3a3b440619cce67117cffec88e408426c25024248da4540413d660c1287008";
+      sha512 = "72b9b8b82743d2d0ed4299423ca02e17d8e4d8415bbcaa9d09841bfb45889b391b15bc21dbf13ed96582253190d49ac876e1bda6c0758e9d5d0f16f815f3c036";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hu/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hu/firefox-61.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "1702ef8af27cdbf85a331cce97f640c50f03ef0eb9f8a3dfc33308138ec9a9a255c1997666772a732ebb197f8dec1eddf0d84184b717b8ecb1bbd373df551a69";
+      sha512 = "59e84fb28fe39c686d648f7cfd49341f66a0823941f4d9d14f8f310f9192a2cb3bc23bb54e12415633976e82184b8350f43839cc9734ba203259b8fc0f179ae6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/hy-AM/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hy-AM/firefox-61.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "65a9c00c3ade5acff7fc8f325be456d876a2595ae7cbfb37afea8d6ab9a941bddeb23ed8e06722d8ea05260d48a77a7f77fc69748c5255c1f7f0955068e04c90";
+      sha512 = "003df5c384d23d3555e9b0d92720243f9e3df290367b332d251a2c4b3832c426d4cf09d5e00eb1e738e9d155aa457c1e5e6b2b3fda4ae429d14bdef774fbe78a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ia/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ia/firefox-61.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "bed9ddd51fc5bf8d5e12ae8964901696002a047fd3bc33ef52bad2253f13307db518ebdf0218816a7e0fc184f8ec2c697270d71e30337647634e9b993169c13f";
+      sha512 = "5d0b187b3fa398785c0c4d5901eb3e9d095668a962187a396e634dc2e90c46e6c352e1ccde962f77748a8f97292b1419ab7e09c23cdfd56e3ae0f1842abf0cb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/id/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/id/firefox-61.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "3a5bace1ff0ca4ca7af8cf93dab07a88e869f678c0e1f173bb26d5ffa44ac25af35dafe6840a4132cce59a528b07f307d03d4e7886dfa4eaa47323374d129786";
+      sha512 = "78b44c4aacc812973258ae941ee30fb9d325af19ee2b373cd6aa746e20a940bc2989e50ed67b35f62336f30ea81d66f18d55c44b6ed169360cbcb08b609245e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/is/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/is/firefox-61.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "ae9257f6e9423bf71ee51c645d41c48583a5b4b0c2c76517c1edb4fdea2e109ee5562d7ec35097e558cbd46e1a929f215113390c04991e18f3cd26ecd7d8e87e";
+      sha512 = "bc0ec077b4d2f736e9644b8332563790d0baae85e90d7f02326bb9056124b4a63066d347be524288d51cd213cd92ee3ff4f8c63e88c2345f6c3c2e2789251405";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/it/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/it/firefox-61.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "24f39efc482e1051ad934259b47a79702f1232d1be308fefc06a0c80eea4195ebad7ac195303b646b52cd385c27ca7e3a8f9053e2e0487d337443ba61794176b";
+      sha512 = "97516d02b2693972ca54c979990bc66405cf565e4ac6d544352a9da3cdfe9abbb1ae74ffe0b71fe71b1f0a88760ed0f7ce9cfe12f3fb3e226ed0e0ec7ed053f2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ja/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ja/firefox-61.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "a9ccd225ebfd6d4d4975a4ee731935f7bb7b16f23c6e2f23b7939b5348e6f8a6a3b11fd683b579d93d9caf826acf50a3a12116d8e4cdb91aa8ca908ef2c9c72a";
+      sha512 = "20fec5b84817ff92c773746364c4abb184d31db34f75c4ae8f88410180a59daff8f39d1ce865b964dbac47f2866dfba6c4b24756ccb2a693e7f0cf13100e5f06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ka/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ka/firefox-61.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "e8b4f18dd35ecfeb4840c955a067376defa72c609e853f48c1c2e8e364e367477f08cc63ab02f8e7449c00bc45df3c6d6e8ac48762c425217c3ba3eb9ab68a7e";
+      sha512 = "511f05631702d1a4d8c82b848e2919cf1102d88e0965ec17b14451543b0d91e1ca542bf455cffc1013a531f6a4ff13410a082efcd996cd491daf4d6b271151dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kab/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kab/firefox-61.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "a624c332fcb259401de7a5e6a6e9412ca76d861010f150e3b68b6913e3b4a2493c51bd4c584533ec6c10c84c5801d874519feaf6da4266797ec27ab532157e9d";
+      sha512 = "bd3a639c0377454098b70394fe1088d971fbd8be65eecc6d5076e7450a6a5092ab09ee3459c8efb2a34430889950b480e4863938e7c2862ce28a98a393e10aa1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kk/firefox-61.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "12bdcd149cbe8eec06956dc101b55fe45b938b92131ce5b11a7c8581c019932199f7ddd2f510c2015c800a226dd98650509616839776452c535f48d22b5486d4";
+      sha512 = "52050b3ebfe363d0fe34fe6ca27fa67f6b32f809e508e6df5c99239769ffd8d8272fa177f8187c53a45dc59533d5b54c5c9957ef177208d6f3af9316938c266f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/km/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/km/firefox-61.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "856123aa5a7fc476f74fd959cca25099c1de9cadf2b7f15b0f7c850d5399a337f8ee0d944b649e0bad3107b8fb52cf46fd887e4418e7fd8f148f95d86f3fad02";
+      sha512 = "84eec5c1740d64edf90df6ad363e6782821b665bf058b42373b5497daae22ff4ab99f4c3ac505f9254b0acf814dbcbd4588f55ea18af74cc71b1b54880f83f14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/kn/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kn/firefox-61.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "3a3f20b713d1d9a49de9c7309231e75755132495b105b19f5bb2361c5ceb82166c715bbc0b74094cbf81a1e451cdbe648a19b81a3d68cb73d495540f95e54432";
+      sha512 = "152cdfd619bf6c7f01837b7b0837d2e5ae1293d10045feaf96d8fe1dc6bfb290d4ab60ba8a2ee13eab4fde952740c67f587b010adcce5e7ef34b3b9c5e91f161";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ko/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ko/firefox-61.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "bbb64dcd8afb5af7c7d3dae71321f39be97fa9d20b92ab8158383687c1dbed5e71fd4e5bebb29bebb1b14de3027410f595a240c472c9eef9cf009c1ebfa93773";
+      sha512 = "fd87cf3b849387194cf632429ae73fd3e2791d39abf341924606a834403ffdd4637addfeb6fe65660a8de533f1b46d71bbcad5a9ac8e779b439658c6a2586bf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lij/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lij/firefox-61.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "5808ef41ea5aab9ca5333855271fb6c72cd776009c4827997211ed1216eae9cb1455871dd14c0bbafdd095c7c68d569b708a67f6004754ae7ba24da05e31b322";
+      sha512 = "ae57d2327a143edce6f1b459b3c0a1120904cb6e319a7f1c02bf221908d6ba56ee72b0223ae9d9e409b303be56d2162d1aeb46472870b9992ebabcdcc7579bbc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lt/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lt/firefox-61.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ce54d32adbfe12ae70b982bf8a98174dec1bd34c3d98e0f5092d2b19ca09dc3a13a1ae4f62ce52829cca764210bf9095e0f535d4a05972fbd67a49b00213c200";
+      sha512 = "0f6afd4c33925472269070d7152b13132c76bbe489a8561db8a760d766df7a71f60bf23a1e60ff3aa6f22697eed1b64d079b14a4a5919c12cebbd87a5c21e034";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/lv/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lv/firefox-61.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "9abd019bea5f3b27bbc04af20bc7d0b47da91348d143fcaf4fe946c1e368373d0e5df1bf252d65fe341c767e52420ebf86ef5ff40ba9ebcc05880de6642ac865";
+      sha512 = "6966b2f4874e12091679daa53b0da6a25a4190a251475cc14858d3879031c3b806d1d7cb37f851bc3d5da5f698cf4cf8a3cbb1bb365c060e7bb66c5d21c7f113";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mai/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mai/firefox-61.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "446754bac17853bb1cbd79a8e9ea988e4795ee35c92020218b5f2fababaa7931918cda588ffaef75913b33e7546f141ebb578914a9fb1ef4c672e02df1abe51b";
+      sha512 = "c52d814873cee8e11da15e30dea3ad85dbd6fe97262bc32ff246747301026b543927dee712d9a9bca480d5980f7753f3ab50ca01316524ad9b6bfe2e53476c01";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mk/firefox-61.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "a1323b05df4856259e6198c81887e0d1b4f7b2b25d8ed14da52f80fa09b9fd62d6bc49af4ab90ec54b866316786de330021a1877aaa9f8863017e5537bf06e14";
+      sha512 = "a794ac4ac3943e92a5d7ba56e4ddcf9ab803b41184c3fc3926b6bd0121d35d0061c70a10bbfa41fda26ea7ff445013358f7d842171235c01fafce2c30af2ac32";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ml/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ml/firefox-61.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "07d4707a71e55f27b9ab931026b42476bb1facffb9998523ffdc7b6d6acbecb8f9bf0c1fb90a7eaadc136b374c9d1a7c8df6a52011efffc924cadfd6a1596bd0";
+      sha512 = "3cb7e29291a68bdaf5b57a8604b82bbac54af93867e8452b5b61515e3d7220c67acc09beacbf28e780e5aadabc24eb2c2371ff76aad8be6a836ab76712c40e2f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/mr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mr/firefox-61.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "add2dcb55bc2da5691b497610bd87f9adc7a67a7e1de04acf21562aedd5fd71a1fe3f70b69098807b3d85b6cfe3cb91676c6297b9ffde7707e7d3178e2abebaf";
+      sha512 = "355578a744644fd928d8f470a95573ff566db162fa4521beed09cc84d6c7b19509633ac48faa9e80c58cbdc4d781f5ca0155a986323b68ee7c7a968325af903c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ms/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ms/firefox-61.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "352ada2093c4e8eb6964d053fb61c3d971d296377505775c72feff02811f1ba4cd7f9fa955f413c809205e68d1ff05be0189873b8a0664a440d2102275061936";
+      sha512 = "c91c9a810686a8d8e96d13109272b8cbae5dfa6cdc9b9a064ad9c5eef98e5b47916074c79958d7faa18a8d6c9498482dc1eeda531caf2ebe4c5b1ba9059017f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/my/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/my/firefox-61.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "c0553541ab4fade9c7b2a5957b24ee7fc415cb6071ca2fa94b74e3b31806ad340f5e75565a6c1a6c25353d2a1e2375e3d954f5f3bd076fc4eb75f71e58ec26bc";
+      sha512 = "c25b9f13da2fd1ec67c09dac800da0bfcf103f08161957bdfeb49a0d538f7d3a4811dcaaea3f86b6d166c440094edd31a540eaeb92d668f4195d3db4f25e7da2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nb-NO/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nb-NO/firefox-61.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "e94f4f77b29b15018333c2aad853aaea2ddb360a5dbfbd0bf8b10fbc57f6b3e8c241b34e72df38873157bd46bfb2c95c25a1ccf2946aa24dffd1920d913ea763";
+      sha512 = "e7713c599199f31ab6fe553e13d165918ea95e2ed5b128eef9fbddcb0ca102e7f9fe0787f3aae61a4ebda37d52d106d997f5819b7a74064875b555b6351ffcdf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ne-NP/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ne-NP/firefox-61.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "f41df5a5212e906a5ced3b4d7193ce84df9a38bfb8da3f0a6603bf22bfd4ddbd1c357ddc7429b6103d063634127104b56b55db9692a3af65c848227d7e825f5a";
+      sha512 = "23d0756367a3e68e85bba22fdef2d117dd9d5d20321a0222c783d0846a73f00439477129d70e7515071a3439800fc22f3074ac3fcf55c7642133601ad3ac6ba4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nl/firefox-61.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "6baef38f5722497fb5e576785d788e23e51fed88ea49ecbf47d8f9abb5b497e2921f51ebbd1e9111becced65dfadae2e84ac4f01bcb0cfd8a6fb017a51b81604";
+      sha512 = "2584249a71274d4ba69436c423f75a84ac993e50b87fc4d3a113bf70ea2a48a86dfb201b3f06bd19ed3d5ae5e7aa5c3025c56905c8a0255550c0816f17badaf8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/nn-NO/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nn-NO/firefox-61.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "4af7b502e8447acebc362adb703516b77dbb3388b8656a2cb41cc4f63d303533c038e1fc24b97d2d45ba81f5bb1bdd9880568943166da0b7bff458a8921068c4";
+      sha512 = "dc909b3f7ee3641c7d0250a9d0ef5ee2b0e89c1e4e70e81befd4dd2ddf33557cd52f2e7aff4dc469c4b9eff105cdfdb97eb06b7920a6253a089cede1914b2c80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/oc/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/oc/firefox-61.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "3cbab81d47d46ceb78df4b133c960192eaa34d4fe936872a29dfd9985d8561266c3bca7aec9c6d142cbadac165ff3729632036a028462b583c1a55f4e0510687";
+      sha512 = "5a00f883379d38b67f21af9089658bad971eaa5b16cb410cd3d9db601d050cd464e6a6413380e26a9a7f46bba7241bb16a29a55c7d08255b39017d2cbdf945bf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/or/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/or/firefox-61.0b10.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "22ef57941c62010d0874b1b12d8f0c6d6c03f3123a05e32fcf88ab0c53f127daad70bc16c2ad14c5c157f4a71db53ed1e04869f3cc76f4a4a3ffc69f0879dbb7";
+      sha512 = "4b9a8fc2d63a333efa3d2e8d5fa40378b2a58d1165438fc924024ba3f8c0d5716cb75738ba2b18b9673453a2cdabf2c506a645560effc68bbfc7d4efc1cc205a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pa-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pa-IN/firefox-61.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "85accf8c383738df43dfc26c3258502fda0ed2659bddb0fafd666894324d2d1503df06783d3d317e29898a1254d4f05b945f0882b37f4e58012f57473a3ebfe8";
+      sha512 = "e6411b8f71b597da9c1e4a5c8cc6c2c61f99319f46792145b675724bd3dbde8de9dfbb9b59fa004d5e4140df77929da2a9defe32dca321d5054b36bf90afc03c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pl/firefox-61.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "a6bfea30bdf8b9db4ddbb9bf1dc66ae351e4bc616ce287859af78e56a1babfe027384161f33a9db144d326532706029c1a2bc8a5369db62a645872c1b36c10e3";
+      sha512 = "87542203f11fa3b32b7ca203bcdfae1e08e4fea191d5e17764221a5758f45dc161b4c6d5aab5e295aaeb679d0fc9278a5a578f35bf7390ae5b2c71caa37275a4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pt-BR/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pt-BR/firefox-61.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "9d20c00c9decbf3e57ef6266ac45fc8762ae527b642fb000b3b580b304f9b90fe7b226f420ac3de6ebdf4e2381edf1c17b0a18153e39eca29d34d849cab5a63b";
+      sha512 = "a7812a6e6939ed9e80251f1c3b3882ed61769f63fb3cb967cedfbcf43a46a99fdcf01254b252d4a5a770d17eac622de3ec44a0b235426aee3e0d0f9eaa45d9e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/pt-PT/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pt-PT/firefox-61.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "92fdf84fd3a98dc2c3da6267cd6d794d111cf8e9a99c9a7f2e703ec85702238e5486c28bc17415eed57053934fa17ab0c38269bcc72a3196b340ac1841af5d85";
+      sha512 = "539f9969af49633ea8d9b2ff245815147dd792ac649a6858173eaf2be65c97d40c62d1c597a604eb7f54dc8f7f4fd4566ad6e907b7d99ecd2ea6eb052f7ecc8d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/rm/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/rm/firefox-61.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "7dfa630b451ef91b85990a611b3e4f8a0e998efbe8b1cb4838cd50fb08d5fa64f53197ba7bf6b64b6223fc9739987a75966a1acad83a94743a18274ac1584ed6";
+      sha512 = "0a905984476a7bd951deb5a4000d5323963e2431ddd9d13ba20c14ff62c04031677bd5545a7e07037146bb239541ebb2e9bdf0765d3ee0dd2f809b6cfbdaad4e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ro/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ro/firefox-61.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "1db4df7de8906f3a702ef3e205144ea6e090b2b649d82037393dbb58f998987a11517b51af124af3ddc2402241d846d9eea9556f9d976a9de323af23ccd43a24";
+      sha512 = "9797b3e7aec8b30629474b4e55261bb15bfcc3a482823076b1e9618a5fc1b198f31270c085e8e28e5e69c5e5b05de91eb3cf6bc2e5e90aba9bcfb1a07d60c131";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ru/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ru/firefox-61.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "2cfe54d682547355c384f46f60bdce9629db039842084f7b9b3dbb1eb65769b8531c41f41bc23da63af9b9fa2c69ee987ba362baa7541f7a09d6e77a1dcee024";
+      sha512 = "3f52823ddd0ab6eb63f8b75ced6d1bd1e398be1d4067f574e9ec9f95f51dc0b6d13f7f611ef38351fa746ca0e2cb3fe4f3518ff6d250bc97f5c5845453022a9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/si/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/si/firefox-61.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "fc2ad8db7c8eb65f1506d066001b33bd7412b711adec7f35edeeaf25bc8ef9b9c9b8ba77e5941366aab63ff2c45587d09cbd576f455f076cc6e0d3eb034ce21d";
+      sha512 = "d1d5be36226929132f4f6ffbe462628fa5fb0a11c1680243ee1c0b8498a0d00c8cae56a7dfb502136e5c84e4e109fec7a5cd673fccaec444ff2a2503f2d2b421";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sk/firefox-61.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "8ee88dfe9d8457e0414dd8252487d7757ad62d6e16ab3dc44ef05f4d83948e6db714b1160208a9953f7b71b3bc2f5efeace559d9db956bf0d1fb70b9943846b7";
+      sha512 = "bb846e1ed5a7fe60d00f456e3de91e5335b33c98835dcb0348002c80dcb0ca1e1f0d2f0ec0dd6f8cb5a57154f5203166aafb393681d21611311cd9479a7b2c7b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sl/firefox-61.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "975a8a5eece45ce927fb6bdc7179ef0e9b9a6ac568f924c6892310fcd67f6edc6ad1ddfb10776b375ee70eb538ae84da531e3b98d04c856987b9f04d75d2519f";
+      sha512 = "0dc8cb7ca47985e32eec0985079808abfe8b1750dd91b6d13bd7b8441b344b2602467be9fa1fc2626a1eac37ecf98ccbbebd626287b4d11902b85effd0730415";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/son/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/son/firefox-61.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "8a7832f815843c46c1333ada75d2db3745ea300f6999478e95fee23b5824fa0d7aba7a51b7bd36c75ebbcbd2c0f59182bedd2f7e1b5c73239915f12905da12b1";
+      sha512 = "4ac8d5e87c60775776da837f28a7b9b0ef33e73bb1589d1b8dee8a682df922c4612fc72c0027ca00e23eb68305a396e60c1baefe6b478271f5634560bc6cf3c9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sq/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sq/firefox-61.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "4f184c5310ee496f9f321badec736d7849511f6b3d5c95cfa82f927c79c69a3c120f708ebd3d055fcaef30c8ef5e38e4511c029f13e6a7b187fb2ed650e3a754";
+      sha512 = "e6c552b445034743158bd9276d9abf4867d76a3c1d88d08fc48c304f4ac6e174e6e0b51e6a7539265fd5d0ca1ad6c2c097b7b169d9d865407e5963dd9b2da01b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sr/firefox-61.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "9615f2b72aed205eaa41ea211fc96253a3a13f4086a95eef976f2211fb238c0ec713f825928935c0fd45c327759e23e54ad6061f061f349f49046f630f37a2db";
+      sha512 = "019ac2eacd87fdea52e28cb48f79ae85d2fe022a86398751c5b30a7c069f9f3ea3a6ee74577ab0984c02bdf79bfd35dcc70f6e2d3bb5bbf4f767befdd0803df7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/sv-SE/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sv-SE/firefox-61.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "2fc015bb42a9ac9a0d2778ad2d9b4b05ea42e51fcee85d139c035e7115a29649eeee1b9f283cc96c6df701765504da31ca6cc96c20248f493da44a0c7ebfb5a6";
+      sha512 = "1fa8bbf9741e517a944f08c484ccabc0994ac7b72fba3fbada9cc071e23c1381c86f890e2d7421a2aa2804bca599901215f7aca3e14608572e78b69b2540c58f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ta/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ta/firefox-61.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2b9d9b78d691cdfde7da5ef55d45a535081d9e548aa861fd6b71999602b9599b2c1d06f554049b967136f39ec1995339bbae7a4878fb208a071072e68e15b633";
+      sha512 = "fd5d13d75e9a57bb1b49086a8c2cb4428ebe26f7c082c34fb84ec89311a939f17fea415a28e43922d8b03faacf8f9b06c9d3d53d89ef9a6f16ba23709599bf36";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/te/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/te/firefox-61.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0b12221b03ab876994901901f2838a18ed6936ad5e31ca47dcc0aff2c1963a1fd5b2874e01c69808acd7adf44fb5a653c537b433178ba38b4db7c45192fb4248";
+      sha512 = "1d7833808bfb87e47c126e94fde2fc65934f3bdf8ed7ae658e4dffa18150da6f61f444591df4e6ebda40cbf79e193ccca1bc799707cf0b9386b14381a75e6147";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/th/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/th/firefox-61.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "027bf7acc4a0b95378dc2eb4ceec31a15dabae2a6870489ecba858b9009dda05442f9958646e113c7ad8c669ccf185fe6674e971ea1e3e1e37f0a6ad630ee4ce";
+      sha512 = "19b8a299ca06060cf194da9f7c454bc569567e9e94ad752f1d8307929f29c3add0fa9af26a1dc528bcd083e8f5b4734da4431c263ce8f4fcad02926e4a6c7f3c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/tr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/tr/firefox-61.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "f8e385ba8269763b48a4a5455c8d96b2237f2a71744c5dea2969f95896d18e1108a1025606a4ade56aea0dca397228bfc08c60e0fff954831fd92d288bee7b6f";
+      sha512 = "7239236aab73b17299151e3c37a4eabf108ae0d6cc336ea3a02809c09daeee3ec403187560c975d25c5c270ce31a58e2cbc09a780cd281b35ca9362ace7ae42a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/uk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/uk/firefox-61.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "4d3a0ec7f4e03bcfb2c04020fc3775c08da0ff2f727cd5e5e4132f6d99336bf8ab5a79c6a863a0bf027da81b13de45aa203fb10f7c8c38dd087e7953c4d7561d";
+      sha512 = "033d95f4400f3005bad243c2e7ad87d20bde5bb4f2ea0b4c75fd1b1d0bf558b4efb811494617821f1d3128be18856e906bfd5e2debe658f4b28cebbc9fe505f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/ur/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ur/firefox-61.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "da9e0a98bb3c0b791831aee8f688f1e525141be609ab4b3a65136a6bfd41c2aab220675540429231b6a63636ffd0f9333732dc4c0cbfd21b08dba92de9edb755";
+      sha512 = "ae98df054497fc8c9507a73cd7fab6beec9447802851c718f6d6c13b00e05593a1f324cb7d7d6aaf1528208f3f55d0313caaf6ff4a16448d138421e19f54dcf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/uz/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/uz/firefox-61.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "3712d5d80364978d28d49eb47a8e7a25a0d085a11826b4aeeab16636c4d277c45839d65afebe3ccc94afdd305ac76b0c5c508ce2208633eca89367600ba623d3";
+      sha512 = "2e7e27351f909170c06454930d5a050203d59171d8ad3879bb27bc6232740078626ba726b307bb0634eca025ef094b1935c1867b37f68dde8bd61ff0ccfb0c77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/vi/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/vi/firefox-61.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "0d6fe8b3b05fc42e2e6abcdd88d127bf4d45d60984386fb6d6d8ed3dddc9b8423977aa04c189162a20fbe72518a2d5cc4474aa4f71fd8ff5a3039b42fc6ff62f";
+      sha512 = "a9eb501ebcfbb306a98c8f04787a7e04463025614dc484bc94c124e2d56df648fc7ca882e6462896623acc5a1a6521dcca7310da08899da207b8c9443cc8f59c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/xh/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/xh/firefox-61.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "b83af193af0813f5e820ee5abab820f18b5e037f767729fd8a7c332f6e921a0a684813dd3e489e95d7ed24ae252f95149771aa5929f42e37f97d1e35e7746bb1";
+      sha512 = "90f83bbf142d5c2829f45bb1db915a64e05e1c08df0299e80c447f71590a815f8a2f197f035ffea7a9515626a905211b8de9597d24c12ca4fc38b1bff2482b06";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/zh-CN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/zh-CN/firefox-61.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "c63b6893b8926eedf6289bf2c8dac0f3a8fd5d069f34a9159efe0decb1b2ba825d4e9adc646a28acd555f9d68f65def8cd1f80f2faa1f973f4a9629817e3ecce";
+      sha512 = "08732a0043ca0d2cc98eb60ea8a90a9c43450b09369800e279f2fbae3efe765afd320a1d031854129916389037f6d7e2c64188ff777deed9c4f7c33c3aaf7b69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-x86_64/zh-TW/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/zh-TW/firefox-61.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "c9dc03480201e6030b2d0016e25d3b1044b1718d40f58def0aaf8e646c0061e737ee1aee317d17aee4ae98624b09cca2c2dbcf0c70a85b97652a443666881b76";
+      sha512 = "7b25a828a7f25e231f8133025a66cd2c2fcb4ee9141471ecb925dfc919915905763a2c61dc95cf4ddcd451e8690a27c0dc177f29ec6e1024b6c8965d36f68df0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ach/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ach/firefox-61.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "b9954501ed8d449079263a14b481aa2c20f151590377f3519d919ff6bb493d982b7bfba3279d37d2627d96d3d83c4a68bf6affe4d5e486d47b22d1f5391b1348";
+      sha512 = "1c425b2a712b815c592f0b051865d8b4879f9d55908945a43fdde6687caa5383a196d28283c6d66dc5e7344018dd5cf5761d1c3d566a8a4cba146d6b24b121a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/af/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/af/firefox-61.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "5b8fd0240dbbfe10e866f84275591612fb568281c0d6b28573fcd39514b31a3c4a83fd5a710fee8d7a13be5ad1ab95048cf4915f3643d7a438c8f22f1738f6e0";
+      sha512 = "1da13350d4e51e717f363c0ac8ec9d0e7c064e52f5142006e1c59f265ea1039edccbb3fe46877b1d08ed1beaaaf3960d9a060da91da0e57c887c2861aaeff641";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/an/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/an/firefox-61.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "07d49cc079c37e6bba667d27f8bea54edd04b94159f5d4dced279323ce0d400f76e2e31eebfbf7e13db184f299ea9c47068745e01f9a43a704effd79448b93ca";
+      sha512 = "d0191fe2db7122058c18e77e8689426f01011ddf4360a53d523b8415e6ead69fafcc5c987d8afa11b891b16bf822f456195433ef45afb4718df41038ad21882c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ar/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ar/firefox-61.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "44428d88329b13c99b745bea63cf61ab9041b5217704618e728e10c80b4665a87cb011d4e26ad2ba56f628f0c3d331608a6a6308c514cdcc01c22ef2b85d942f";
+      sha512 = "742c9087bb14b90bfdce3995d8a40dd540dadcc298fcdaa36615c27baa661d17dc95cc5d8ddfe5ff039d897aac7994c08c1420adb8206ab473d113c3df0a2c94";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/as/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/as/firefox-61.0b10.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "ea016f0f343a4b65ffd97db4403ec76fe9d32c03b56638ec27a4764bd08863194eb9052c2ed52555786d24684d8f2e27257877374833eb51b62b862b065ed198";
+      sha512 = "e40a96838e428391e4a8bffb25ba694ea62d6177ce5aac504cf37eca763406392c9471731d10f7fd220510f8c4fcb793c02b1393b25faaa8ab72d91e27f29e45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ast/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ast/firefox-61.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "efcf5678e84d588a58e33f9eed56b5567eac0f704bee59f5d2a9a81f1df696abc7f9dbd0344373add689e201de9efb31dee5e22f1ef1097adbf62ef054d02850";
+      sha512 = "7f2ac35c4688314bee804467eaaaabce38f671c6ad4bfabcfab989984df67ddaee24e6787e11447ba13c63abf69d96a0bdb62aa66e4ab23bdc81d7f2549a162f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/az/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/az/firefox-61.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "701222574544b535015fced8e48f8999a424646e5535d8ba2020c60fa7bee3a32f3ccc3cc2f5630c64e69d594cee26017b856ef8b13133c4a9589b0c72b22ec4";
+      sha512 = "cedec6c0c44689b1608972dcb8774e9870b9c90f41d91cbfa546bd37335c771bd0c8fffc7fb488b4a6e1d19b3a5cae87d54639abaa3a093189e2f48b5cefd5be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/be/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/be/firefox-61.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "96c8037997a2f16fd01fa511895925d8c8d55feea1b4472673e84128bf98f1a24457c56f3707812fa0330c3b387e0b79bf9b5534c3d59358c86f283ba6be3770";
+      sha512 = "e74beb5d364761e9f00fe4dc9577f036ca0ed7115c107b55109ec0aa55e4fd726dbb9ceff93939cafb2bb0015bc349024496864eab95dc9881348170c8419545";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bg/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bg/firefox-61.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "dc2df8e6154eb44dcbd80563a362fc54c74888f689ac8836b8e0a8c8c67b4ee7683544ef45320a4ef31a6bf101c0e162d757c29c583df1382a650722db466bd9";
+      sha512 = "bb3ac1cc0bd269894eb2362d2e2199fcaa8ea2f906fe7cfe389bf7ba31b24679d5470d30fceb8427a15970b549b0e851d85a4db2da65bbaca23fd5f7fad1e9aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bn-BD/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bn-BD/firefox-61.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "ff6a1cc88071b422bd6055ff0d88609551d4acb3ae57c4a0924e48f789fe7dba6d1325ba15eeaf20746c4e0ee796964094827a8cdaf0251ffeaa6c0d8b3e8402";
+      sha512 = "403e148a7de182cd4a78495e80d6c6a8ab8b6348a6d1c70b56ed1e719ad0c49f433b3210d47cedcfac4dba3902ba6435ae0d9825be5856e32b7c2cf0f5cf3f8c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bn-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bn-IN/firefox-61.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "726f93f9094ea50bc24e00578a73bf8b906d460fa2aabba8ca1b84f73e2e82346833eb050aaa58361f43a5d12982d85168302c3bc73e630a26b38e029f8fe536";
+      sha512 = "4513f1855962b1a1bfd1cecd6bd431fc19a19a201ef4ee715aa0cfc192aacb1aad9b7ccee4da99a89b5ca62b0ea7a1ab0bc5ae98dba9695bed2eca6d56ce4f0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/br/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/br/firefox-61.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "a1660a0ad425cdf16ddf69259bbdd833204e813af5f36e81757defa470f45c43b1a1235b7d937d85f9d8584255eda668373ef8b8087bf5b7a6d82eb2930a69c0";
+      sha512 = "9d4a52a622f174d1a9e6758fd19abd3579fb4d2e53de2eb6f8cbffcd6f15d533682c4fc802b62b50e2282fb51aa966fcbeae519402ef8ddcea9f8e0352f3ce16";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/bs/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bs/firefox-61.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "695b4622a597345cecb4a9462d58c5f58f5a4395b4b46fa72b1a47cf7ce9bd1e0052ad070298cab0614092b9ce0f268c95866f2cd77c35a5aebb0968bf4c42eb";
+      sha512 = "be101428478a333987464e6df2e70f24c31ce31a5760405ce511c3c2af4c8415d51204e97d941d0f8b0ca9966e439835d4f295cc0f96c73e963b59e230a5ddbd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ca/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ca/firefox-61.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "0c38f24c68731780c99c4f361a4e1ed06ead7aa95382ffd3a9d2b939e5fb6890498528433f1cf9ed60505b540805656dfbd12e06170aa3af2b7aded1728d2300";
+      sha512 = "74d30138e89a1078dffeaeccd477fefc5c508bf2c4ee4a88c5d100c39b112056c9636d92acb642ce8cfe98239e08ec2ad193c034dfaae6137da5dada030a9917";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cak/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cak/firefox-61.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "4e6c26ec08a8b49e06a7139734216824de6f3ebef6f175403e43b641603eee066d83511dc0fb9f19e5ef9a126637b137bb3b31d345d00753f03b4ade413e4002";
+      sha512 = "634feeb47538b8e018ebad76ae0be0c30154b25ca478852f6e773d9eaf5a28945dcdbc3eaa7caa2f2190f840497bbb6bda3ea38721ee1e4faef8676130b21264";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cs/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cs/firefox-61.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "c76a823191caa3655bfdb45d10c4333155b71808d08da8b85c581521d0f9fdb1105f60d9586df6d655dde082dc93f212926bdd8970c629b80e3c4328d2d7d994";
+      sha512 = "0821502510822b9d1b239561f0b515ae80c1b20e3d97b783ff4fd98fcfcd86859731d5b3551d0f59fe7bf9f478efc6ba914eed0591d6dd2548fe27fd1f50c729";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/cy/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cy/firefox-61.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "d5ca0b5db73a8c1bf6a718e7b7cc7435a40506e49997bd18ce869aa9b198e3a424313e4bc8cd19529ec4d9f93c92a75de9f08d8750626b32d8f0744523c4380a";
+      sha512 = "4bad268d8b10bc3422bed446c53ac2d52a48b636455531117a16f4e977b1f1ca43093ecf484f3f09cd2f021ae5dc390320daee3e2e863b91751db4f82b32a9be";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/da/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/da/firefox-61.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "eaacbb06990c820d62cbc24bea736ddbd815679d72495f57089ac29b9b1f47c2740c905b979b0b6679f44170986651e1756e616d000331221233cb2aaaf82f92";
+      sha512 = "5772be3713075fd78391494460a3e16b72202bec35e797c2e560bed9bc91163d61358fe76710e0238d9d4aabcc7bf8f06d08603437a80996ad136357b882f0a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/de/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/de/firefox-61.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "bcfd0e3cf4dc1d5666add6aafeac746452641e6888772a8ee7593f68939a409067f10b5ac58826e2fe4234f7edf7bd0066b21e8abe0381a53ea0fa1a8baedd05";
+      sha512 = "949acec21ffa40045e3498970c867bcf6220814d68e4871521db3f03f5094dd2094a5760c29e505bcd2fb7826da2729031d49815cfe1a71373014f76ac29ddf4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/dsb/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/dsb/firefox-61.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "25450381401bc26153a8b8bcccfb090f6bbdd0511b515f7db13108f4b7625c60c1abeeae8123b59a3178b8d2afcb4da33ece5519d150c4a60871593f62210c12";
+      sha512 = "0159c36db9f37cee06d66b425f0d8036f68ddf99a7459884faa1dee31a0d91f0c0761b58ae0f69a40d5efc1a73fc930a9e1e02bc401797d8c2e00c6af125e03e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/el/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/el/firefox-61.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "f6514c01acae82c66738d0564f2237b1598b1a0b83894aeab4a6f2abca209c8e7c5db1033e87b8b6e5b9904a6011afd57e28a2d438668ad0d6883d30868f555a";
+      sha512 = "16ca273fbc2d77391325f8551ff548344ec59b65a869f2e4ccb20545ee28b3cf1dc15006a208285d33765ec6e200b224eee3272fa91e988a34b671f468aeaf2b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-GB/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-GB/firefox-61.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "371571ac90445231ed59650fb6796fff63cf9f0ae26ebbbb33dc4174e8021b59edc0eddfdcbe0618e308dc8828407984ca91fd2b3435452bc5d2d033e25fcb48";
+      sha512 = "9e31834faa2db1abaad11261abc17c19d82a42dc7eabd3ba796f542af83bcbea2cf0a234de32cd023591ce5a6b4a37b35375cf0e1ff470500e56247c8cb69560";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-US/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-US/firefox-61.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "3d664fb83d2c15198d8d054d99de307f17cd5f5c26d8167b47a44a74a6e0d65bf81395802d350c84c54c7635845b233be60f3dd626007dc7bbe2e67583d9a42c";
+      sha512 = "5e0ac9a0965f9674d4d06afeac7aa0ba35987e683fb29e1b77d22097f98b5d1c57599d6e22d191cf02363715aaaf3266e0fd79aa3fdb2c47c3fb1ae83bd9ed13";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/en-ZA/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-ZA/firefox-61.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "9ca6c029cb33cdd8fb7a01e323b5a29a894f10eee122c6fa47fbf4bfc965258ac986b7feebfe2094220671bbc77492ec0329c2ed4b3c54c76481a97496c7b3c2";
+      sha512 = "73a3ba8c65ac491b2eb4f16929f7858e91ee021b3dd8ce6881ece2a355b112c0f5629aac0eba02be8d50f522dc37f94dc7669bc5b421de85e72575fc689ba14e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/eo/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/eo/firefox-61.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "16175f3bbebaf395146a23accc071cdc2f62ce407e78a52b79c32afa43f1cb9b6729261e2939930d6c6dff2276e888f093b58225b52e57c650910a1f1c46a4e6";
+      sha512 = "e14ff47eb986fe81611bcdb2c5896aa9a90ca8dab3fe1308fc18f8d13b066011ab04cc081a9288522bfdb40844555631d15a4c643f18b4dab6df950a191733fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-AR/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-AR/firefox-61.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "6b90005fbf9aba2a4d20d57f307abeeb5d8662d8405a4c6ada4da5c302e27e20448d3966ae8742e932ece81f7bf8d909c5ac2e8e4e71a65430c2cda3073617c0";
+      sha512 = "c9bbd34edb7640875921a8f5b8ce6c07f3788c73a544e446e6fc0c011e875e998154be7a27e3296358cea505ad2b318ad4a743b0c56330b6acc7a82b19bcf8f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-CL/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-CL/firefox-61.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "f710706658a248fc40c2bfd6c8f6ac543837ea1e2dcce7cd25a33982bff50b36a7b9463261c033ee49a01d1f340bb7468460bf73bb882ac814c5b15fbe7d13c1";
+      sha512 = "9e3eaa81e7eb11000e67cbffb0ce227ad1983ef4b29bd138e2c99895010baeb0af010876d97891b147244c531b05355440bb3ced6310c1c7bc0117b2688b95ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-ES/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-ES/firefox-61.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "37d95434ce619068412fa5e74e15e6460b310527723d4e0d763072661721aa7eef649eff79243ad4260c2724387fbe7a71fb7700e8b1dea9ab2374fa49cee579";
+      sha512 = "d88b17b23dc4768e3368e505604828085baefc1cb5ff2d350961e40a78fca10634cb21281699544f8fb42fb167ee18955950fbda2f1587a2054d0790018934d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/es-MX/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-MX/firefox-61.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "b3cba4eb00e705050f2cbd8bf559c35f43742dce6f8afee6abda620ccbcc0657887b35077cb1512de0a3653992f6227c493c655ec11d048eee1a5111d27c42de";
+      sha512 = "a6c48a51cfe4c640b7044a168258c7bdf4ebfa4cf19c4a4386a87056ae0183aba1a97cbddf87ee9b66e57520ae00a24e1a5a6acd0188fdc5e1d3be63af6ad245";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/et/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/et/firefox-61.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "56dd03e6ac80b2d41ea3132845a72972eccab4e70834b0eb77412d75da16428ec8d518f4873abb4b45db183546cb3c9e6ff6716e6f1667477df60315e51e6610";
+      sha512 = "73efbac7c210914940f459db4470dc75187f2afaf43969cf7bc8604304c2fc77e384e16952a9870e9919cc60a1f8318a497997bfdf12593be76eb747c8af35a0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/eu/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/eu/firefox-61.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "24a589c4091eed2cd2333f769d32913751444f9bbb5421f6f1efb29134f64e095a8fdbd52342895d57bbe277e7e6a6d437f201e5a9402510cfbf9e0589fa7372";
+      sha512 = "2134fb5f94cb9ffdeab346f854e1a53974dce2a034589b1fd30699ff721d7c2aab2e24fcfef54fac41d9d781fcb5f83534e9330572fa8a76d5a04f1295bf75fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fa/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fa/firefox-61.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "a53b212685a7dda9a8044d7390664007cedde3005276f5b84502f7693abc7b573207a25160930f4269b97aa48962eed796e2f4cb91a6b9d251c786716c1eb8a5";
+      sha512 = "b4ad171d16f8ea4331febcd5c875714125cfd15639299001770a25f4d671c868d3c7d1a058b2a75ceb7e61b458901bd89536567eec4654d04ac71172a1f98e90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ff/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ff/firefox-61.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "029d0a32f54a7f59801c53309d4bc6a7ddfcaf5cf8398a98d42451d2f7dfc398bf4d3f54a7fa7cfdd309b6fcaa91cb751ea227d3c230ce79ed1306263b50977a";
+      sha512 = "c114b3cbf9b16bff9935408d33f5ba0f92c96daeccd1602e07c7d730683e3585f9320d7812fb1489e983fe2f197de285ce7e30d4d98fe944005cc1889e0d5301";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fi/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fi/firefox-61.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "6c76910971236407f4eda6f54e9fc8cdcc94362341eaea189c0fe32fd09bdfb6a817b14ee81485397752ad6f9d6a7177f224d98025aa962061e32ea83add2173";
+      sha512 = "e1005f991a598f5fc2f45bafb3d2eced8b5dcc648680fc0e0cc679f13af5ae3cb0fde38e9cfcc535afb2dc9b6dc8ae7fbfdd22c86b1c1818352a0915439e5f64";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fr/firefox-61.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "d5873e3637038213feab288002fd16bea5b4d8744ef186ebc47fd4b94dab93defb4384ea45152851e131e1ff9d362e6af7b59cb63c1a853e7242a12eac896b80";
+      sha512 = "b720ef0f36115a388f94fc99cbbc39f2f40b2b69d0740aa2598543cdce14996c889b9e068da92af374a508309161995178ac003cf1172893bb1cbd5a426f9ef1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/fy-NL/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fy-NL/firefox-61.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "f2a02746ce4b527835acae82de58e465bc58021b7c41e850576715587933f5e54ac6472809f0fe6c1441c4350b938affb3358056af098f36daac9005edad60f3";
+      sha512 = "bd8cc5a71e69d8a2b7b319e27ae8df88832d33d8107aedd54f8cdb8ec8b87eec89b718a092c4b2d414d7236f4212ff901041c06455d9eb939e26f14601563584";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ga-IE/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ga-IE/firefox-61.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "f99b18f2b13a6789910a6cbf4dd97bc4da6540c95cd08daf90c0744d69372333bfdb6946391d930b608b640da07a19db9468daa186fb86eb837e7df45e66a2fc";
+      sha512 = "4798d957102423ec6e4acfa622b58391542312180314f2a02f52a4b9874687b1e4140f7fd13c939dd5f70fed9dcb7bdd168fd2dc2505d558f99b2d6fc8d7ce70";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gd/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gd/firefox-61.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "5f61378ff50b566e02cd9f70647558b2bacbafa07007ce7bda340d79b13d69dc86a7918614e411e5bbf1e3c5c739c6bb62a655605f1d5617a9176526120b14ca";
+      sha512 = "56a199baaccde45bca1a640f81fa62530cc932629902d50aca73a59e28b7a70c0d9679d21c16d3427df497156a2ef3bd718da99824ccbb323c8af695d4fa0bc6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gl/firefox-61.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "eea76df7b67364649f10a5532103035212b0ff7a42336a6732ec0d22aa452f931326c1251b1ab8f61dfd201cc54d0f47a1083705b2b7d8a675ccd9134e106a44";
+      sha512 = "1ba62b6ef66bb8247c53e38214aa15c416b6a64c05d094ee0a51bc4537d01a732e00c6515269c3f86f22ec6c580f47ed5f1cb455643100740cbb7762ae6c3fc7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gn/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gn/firefox-61.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "5a9e5aa33ead532f51e07a9fc4bc5aaf6ad77795e49a9abfbe4e488958befc16d51e4c047f60b4b884dd53040624d9f315f1f29dcad32a52ba6f2853e244a99c";
+      sha512 = "1ab4d17cb5e2abb02aa4550028e15ad92712a2841bd0385932f62d98d9ba1453fa91ae1a9841c444ffeb7e96d469bfefd6ea48eecaaa2fcfd5b822ac839eeacd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/gu-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gu-IN/firefox-61.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "b757b32b9733f7cca8b9a5673403df2887861f6dec66319f8316cb23dd20be03078647bc3546189016a25af58f4b74ebde7abc29f68212d3205978f313aa7279";
+      sha512 = "cfca82ab95559801654c140dbc7d9d7e86cd605e59511de92d724b9fea2bbb027e621eeff10326b94adddeb9cf5e29ee73cd89aaa54b803c664830854fa19a9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/he/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/he/firefox-61.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "157862e9f36f6990e139fae95222c31c65377594c36e348a1ca5f69dc7a11f70972b603c0eb588401ba6706a7c117679b92caa6099b09569df1aeb78883beb42";
+      sha512 = "056b45b614693a0cab73b530ffb9bc50d2174a2771cf9e932d1633133e02a174305e8773a7fdba1dc2ec4e7189407b51354a8d3c13d1c9639d8f4337029e7d35";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hi-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hi-IN/firefox-61.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "d64db24b335df9e41a873b8b5f7dd86439ad96921707d0956f5ed31bb7e38039173226031fec48fe957d255cadcb0cddf5bc897fb64ea404a46bcf8466a8a05b";
+      sha512 = "37df62bf5dd1ba63b31df5b736b82baf8cada43a2fb02bfaf97f033d684d6ee8cb9657ba0531a806796facc5a6fe03532bcfff0e30c93d74fc65c7995b323080";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hr/firefox-61.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "1851c28d00e8298b75c3e98bd32c384643932fe2528ed547fc08f04ea1440663184e928be69accc034628068d935509f5f9f0df79675803bb23cf8fa1e00a067";
+      sha512 = "537a774e8fdbfb3ed3bcf306dc995d807e17904c5702b83c1fa24a665cf4fc8f2b00f9327bb02c13b8dd73ef4128f676a115807cb5e8a8b85cbc11c308a0a6ae";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hsb/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hsb/firefox-61.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "77e0dd746cfd9553a56a3912f1e4eec31c846fbc7a309241e064145f42ef572cd54fdc30d788531069505b0b30371dc9e977a3e506d1e6d0af881160f21b8eb6";
+      sha512 = "ec7065a86da1f23c1a48478257b7c985c95cb14b40297f2bf25fc10e63beb8148f8df30c61a719c4148abb62d920bd771dd412f47e328f9641d0525f3f4eb971";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hu/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hu/firefox-61.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "a2624628a55d83b67e8fe795ab41a200a2feebed8cc6d3235025d8ab32b7423ab23ba1eba914104594f74c114ec79f55f1e339ef8f9b2999f9f69d5db81d3e5d";
+      sha512 = "43a745f61271a3d9805ca9a94c69fe3d6f05fe6072074dd6b3258907f185c0ee12cfaa7e32a948b35053955178d518ae2498997b1a597e4fafd023cdf6b00a44";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/hy-AM/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hy-AM/firefox-61.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "6acd8b6a40ce2b80117ffed130600209907916da0e3751466295ef4c17795d459ba410a1979ba6755ece14aedc974afe815f774f03a53c9418d0d5023e36950a";
+      sha512 = "b26a54ff76d79d960f4fafbd4871e2e8dd7f3af2408984fca74c326693a26e28809844b65de6684225923cb7029e8139268d2222d058ddba96d273dbf1180ee9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ia/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ia/firefox-61.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "84de46654d08503f735e41cc2c8083f6adbc80244625601a242f31b3229840bddbe3245b843f9f5cd4483945b78f14b3998f438be4f26bff9d34741cee21e271";
+      sha512 = "d8e82a6a104e7f1bdb85dcd7f3b292c9bd066a09789299f893f4e83a09a794a0187276636a2c65cbb50f4dbb1b85bbd6afd934ec184a57ccd5e670242455ef20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/id/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/id/firefox-61.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "295153e98a8feaeea1f5ba6c8148893cde566449ab766f28a5c6f99d5a8918a6c654162c888c883d0f4f2edde6b6740f7b60077f9d1748eaa0fc7cfc3bc8636c";
+      sha512 = "34c7c48ef40d7931f62f4ebed44e036cb171d1f592017dca740c46d800f03a7bcb5caa7312a8fc845323f157d7dc5f8c5abc75717a4429564acb858543f44d5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/is/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/is/firefox-61.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "6bb9b3f62140548a6e9c188aaccde4265b6c81d6b19c4bf5bc8fd9b38680ace5740e483af35da878290b5f8c14610a91ef0c041e6ad733350d99d85c47d0c250";
+      sha512 = "432b759025ec04752d12198b50ae6d883ed26fb0ec568a5644032ebe42cdc8cbbb5f38f08280ca6ef1790e104dd3af1fbbbcc579ca5cb18d8489576b8a20cf63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/it/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/it/firefox-61.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "dd1f3336ef41030f78d3a2c246f677f0863c3b5fdda45bb439cb99f620afe66642d0cb436fa1472904e2abaffbb2e512fedc461ec615262a0899e236efede0a9";
+      sha512 = "573f25755af311fb3a4ee7ee9aff172dfcd1ee17df128b5742dc67ca651e71f279ad378b95745e428ce9facc47b66e763c297d35963d3dc11fc57e4b3415e9cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ja/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ja/firefox-61.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "db4962a11da935032958e7387e27f178d78caa6903a992f6a014a213a3f6278ff961d746c32c074c4a6320f122bebdb5f48813534e570e2386a1fc52c74d6a6d";
+      sha512 = "41be1b052beaa4a58466e25b7039470c56e6f9b0ae22e46c38f5e10cb65bb1500df50810273c608fc83f73f0f103be9b4fd63add9c73c3f3d855fedb241c673c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ka/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ka/firefox-61.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "5cbb7e135aab4e36021f2323335368dcb6ed32e50304a69c74a3d6a88aaa1bb7c0dda646b141caf9d6a381a4fd260f46da638ac0df2487884ae8cd0bcb19d13f";
+      sha512 = "25e5e82f90491793e7663f956e22f08581f071ee2e55e2194925cd73898498a6cf8a69652b0cd0c5748db107a08f47d5a38bdfa89e380f3b5a9eb6ce3b3eb967";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kab/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kab/firefox-61.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "ef84eb38c46ebbfa43e93bf26c0aab073fe22ac6abd7683de068ad22566f0f5ee1316bcc80a9a1c15215edba82c42eafcb7d5a0555ead5e03baa9c09b17558ed";
+      sha512 = "0a4c168e17efb5d7789269e21a66be1fc9248d07feb68c956b7a7e179c961c2e05c1e6b687efabb05f0a57b570efd3d6028998204f7da846845b58d098e099d6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kk/firefox-61.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "e1c913e4bd51637e757162e453a7f9a5d452e4f1b656c5259bf4cf6e1a6680c5a5b8d065e692cc503f180eeaced7f08a0e14731b85077a45d46a62f89bd390cb";
+      sha512 = "4f618c6bdf212251697d3328ad9044fd6f0bbe1b5c3e90febc45209d886aa8c5718316023640f2e3d19e6c2735850111a907c07d02cb9c35ecc4692f39201415";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/km/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/km/firefox-61.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "0da0ae2a02b271667e58872b48cc1ea6c01d2778c31c38020fd120c6f32ff990627a529f178304af80efb5dedcaf9558a44f3f198b0e2b2a4c12129e6e278c3e";
+      sha512 = "aaf6c1e0075886e3965f5840ca804dc596b8ee495c2cc7cdc5a5b56fe8422a77ad22261996b23d09782b0a84fcfe23836a5068251757426440665787704f4f5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/kn/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kn/firefox-61.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "ab937a1f08c0f0ba6b70ad29a9aeec0d61115ee15f57644cbd33cef4765a19820968b36b8618732ec9aec09111a4504a840d3d4df99728f44f04e6dbb100a71c";
+      sha512 = "fccce9a1786accf2106f0aa7745fdab89f86dfc13240a8d08dc665777cee64e6c5a4747dd911a3246cb0bf91acb812d9496e3129a704b3951e2f6efdf6932393";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ko/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ko/firefox-61.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "20ce9c08906e2fbab91ff4ced398e5a956ebddd96e6128de79a4ec3370ac512322a9535605f9aa3c196d6f52fb55630550afd39a6c0e46d7adff2669e637ec53";
+      sha512 = "29f1ed0212d3cc5ad758282ab75dbe9034d890c80dce4458e6b31ac35ef071026f433802b9eb49f264ab3d2189c64a7e3a2b44a909acc041b8e8e58043c1ba0f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lij/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lij/firefox-61.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "9b213b2e8d1063a369b673e07040aa5bb53d1213a3725d9276534dab45e2d87707009bcbc5cbca7de7d321e5457c7e38e5c801d57c6d1a400a8b9441fa2d2b08";
+      sha512 = "b9807a6327a2cf6d40b4d12e42d27217def2ac62aa27f0dea872ddab99f125ac08ddb815d5a360bedb19b92c4dd5a7be46d8bb10bbab5ea7a82959cd35380c8b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lt/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lt/firefox-61.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "4c89b3ae40b27f07652ac580a4484b7b3fd50e69e3894677206feb45f13238066618eac22b17bf81616b9a0fd004d023152ee5e028bcd31e72214a361d36c639";
+      sha512 = "8be5c106e64aa30ab2e74fb4785fafc15ac4c495499741bc5f80b634a276dd3f639b5e00f20ab90f732419c80f4fb5600a19d1e20d4e46a5049c86340ce205d9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/lv/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lv/firefox-61.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "ff23b317791f8782c2aa267a5a6a1fedf8a10c5774263e4a6c8059d649e0b3e52972b33778d092e99712aa777e4a03679dbc4d350fd753c3e2b963655f36d5fa";
+      sha512 = "86a527082caa8787bd2d76e7ed32b0123ab9d12229da1d66efcf8d1cd72eecab6da73c5adb0f57bbf5b04fa5f09fde21ab2d12c31f37a9005747153d2226cc04";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mai/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mai/firefox-61.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "6205561e9b7badbb308649b2caa9bf610cc71dea0cf8c02322b682839c8279fd3708768f62970a6efdda6d0f2d2a6f72960f1ee86a174760c1ec235d7b30dcbd";
+      sha512 = "3b2df769960d791ba4a57135a242b77bf62c21170e9763136ab6dc91d49a421ffad0b92b3c80a6850a9e4f326ffb4d32d27c70581f4825e05d2a244fcb4995c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mk/firefox-61.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "a74f1e49bdd1b7c0bc29a9023571149859ec145bf0a12bf49aac45f2e381689f49370f5e02a3777334f3470bc439e6b962c49e5bb05092cd3c817adc9a8e890a";
+      sha512 = "4847358c0d1e3b4c350978f9ce54df0ba74b95c0d6f734d3e81205228b295743bfa29b560cbbbcb11e32ca2100df6555b8f495675e16cb525b7ae5ef77770d1b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ml/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ml/firefox-61.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "5ca453fa3c321a9503088bfe01824e3b3c287a90fc48c792cd0658e9723f982888847cbccea423c1b9fc1ed77caf703141a4dd0c697a30d0ae1e5f8d8d8c547c";
+      sha512 = "b73bdc8c1768d9a335dcd4261c50fd5a6d2d96ea3f29579dda4262c1fda6ad6e30ff52073945a1e5cb12bddc15c4b83796585bee002fd1a4988853a46c467bd9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/mr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mr/firefox-61.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "f3a5109dba2f2c4516d689a17ce19faa7385f5bac96fb0b9f72fdbdde0626df701fc821a1defab8326db93af7baf9edab594992a9b2d05eceeb4b1176098b557";
+      sha512 = "c1a26b027acffce2ac8f38cad8403bb50688fd51e330bfbefc295fb854c0692e4c0b928fedd82fd2eee425a20f6577309f5da8b04b4e12e60b03556ed10bd059";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ms/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ms/firefox-61.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d2bb114188c11fda8e3ed59454cb623f8883328fd83705d21fc74dc344f41582880f1a231aeb941d32bd1b3ee1f6694532f9da82944be56e2898e6e750e48da6";
+      sha512 = "5184e98def6d4d6c9b7a77f7be6dcb1a5e3f88732f14b394c737a5ecd3bd0a5e514b61978edc0594f2f503cb54b7f22bfafbc09d5e697d3ba2b530cb42d26410";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/my/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/my/firefox-61.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "bd71fc5dc34c76bb99a2da062e987666fec47be8f883065ca456e3bb888eadb747648571c0012d924574c60acd5bec7c8443890687309cc2885de09d2f695ee0";
+      sha512 = "2ddab9e165fa114153675d3d2f756cd31658f045800b0535f4eb468fc42d260574fa0455c6cf07ab3c96d2b52d557082a4b0cb15361511fe660d75befc302434";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nb-NO/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nb-NO/firefox-61.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "0991d3ee984d0e8f265a0b8092f75d4f87b03b7b0b29bf87706373d130adc827bb5511006b4e708fe06cb7ca83de27cee5c55166eb8ef2f01b02e343e1e6785e";
+      sha512 = "8ae0d4172f290fa5d51fbd2e477b3b1f74615235155037aad3ce5b2afc1ab28b1f2f937fe0f5bcb3564891fd2171e8c49862672a77e4057b1d7501e13e4bb6cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ne-NP/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ne-NP/firefox-61.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "5a600d7f0b48c6a6a96bb346d64a8df9d5737e81215420fc221526ec66d18ede9a32471244fd226398bab08c4d722ebb154021ae13594133c34048d7e0a2eaf0";
+      sha512 = "c214e9dba678afeda469d8f7c858837cfb0a8ce13b281469925eb86d94f485d2f181d41a410fed049744a692ee1bf5bd004238d0e8192eeebc50a7fea37188df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nl/firefox-61.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "27e53c68f58fc3a16e4ab7e56bf0ca9df84beec10a2b037c9ee6a70b7a426c45fe3afa84d42d0346a384f7c8587f9d3269a70403d5babeb59d300ccf6703d423";
+      sha512 = "44f8a7fa592105aa6113227fbcb28dbc40904e50b2e743c8340a39178d2f821baf65f08af1f971af13a25279c76f825c684bb252a967f2f0bbe53f88574a0a25";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/nn-NO/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nn-NO/firefox-61.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "3d1525c74bb1a841a300f55e382732383db62907e76bffc7dc25a1c4f9b6abfda3831f2a6fe8edd143a41059a0cf3810f9b0f07a36ef45d2ed3225155893ce51";
+      sha512 = "be33124e0c0c411fefc2a7cddf3b1298f04423cf6a76b879943cc2d63f1005ac73375b9853c6af5522ef4381558756f2a5fd417070565851a16a59f29ff993a9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/oc/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/oc/firefox-61.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "769ed67982c898de539ab8cc45e45ad0877fbebcb9254ff00ce90eb2dac2e886d3d9b3724ad9b696e57a0fd3911e52e8e379c5c46bb8de7a41ddeaaf6a207237";
+      sha512 = "45de2e78408d56c11982868badae10edfe90e53c98c03ff67d9c7c7ce82603050a5f44a99da1cb17447ed57a2ec5bd3a12a830af56b2cd10b80d88a329ee35d1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/or/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/or/firefox-61.0b10.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "575de9b7df4c1dcc720628508393888beba930466a582651cc8cb5faafe63ddf813fb387763590270e81eb7a31bd78229ae311365f42f42823073bee9d35714c";
+      sha512 = "fbeec26c20a545f8d34b2848f74d433a8ccb8686eec10ac614e06fec35e017649108d5a371c0073980f7c38375c700d58b298d640b2b4b40711b60cd8187977e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pa-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pa-IN/firefox-61.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "f886074ac57d1cd92bd0bd02bec7f33f9044d874bcd740b7d1d46980744e744201cac4585307844f700e3f0ac7aca8809c3c8e68ce19b0ce4d1d81912e3d7c18";
+      sha512 = "54974c56b30eee44d29f5744176260c8bf6370a627e7b9439c3888f5be584280436f80684ad3916ecd7b7fb3407a379546da1956e8e6bd8829f3b2540829e068";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pl/firefox-61.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "c7a95edd18e5b2f88c1228950ae311ae90f303e0cb18eac856418a9714da20458936194a26b92f4d3862af12dbcaf9a2452f4ee360d2c4223c088c4be9f25bd2";
+      sha512 = "a3139bd9fc34f38f55251d1fa03589f859d69a2dede76dd699980a5359050fabe4b9cedb352ddf21e1dff8f4f328d6d2a4fc87ae6b64166dc325981df57d50b3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pt-BR/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pt-BR/firefox-61.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "f359a63f34e63f4727d0792664dca1ce69c0a2bde9b0201d1894589a0db2f8a99126aab553c8ecd1578bb05b8422820f27cb9fa6919ac09791056691a35410e7";
+      sha512 = "b95635c38ff7a4a23b1c383ae8296e5362f4547e6082a0ec355d9c400176ed5282d91bc608cbc1826903dc26039278e1f923ef0a0e850d96232b59c61eeade90";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/pt-PT/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pt-PT/firefox-61.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "1d64be7fee2f41c88d082761c6f65b57f299061f3e3eb6db2d8b524b7f2c4bb8ab8632cc2ed611faacb5ab2a47cc96ada67fce7acbf332ceba105538a849e942";
+      sha512 = "770277e4ca433f50a13bf2b962661f6d426f580e2ed71b23c687545df38622dfffc34df27f892b0b20643a19cd6cf6f13647b9ab5c1650bb089cf5c95e9726d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/rm/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/rm/firefox-61.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "a493559f9a276a388a01316b123d3861a73ba677805b16c2984437e42aa7399d821c13c678d9c23fd4939c9b97687273514d454c679820db3279ec5f74aa811f";
+      sha512 = "eee5341bb68d8bf2102aee543b5a355e0d44341ca0c9404714a5affb215cbab5bf329ba80d145f31c671da096a308a66baeeb631475937d314770fcb321bca72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ro/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ro/firefox-61.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "06f443ea5ff57033ffef5092d5e47adb0213db21ceea8c5b08aff9c140c0a6d9b8d9c590dc5e36d9084eac3a7de26c5754f09e0b41dd3773cedea4f212e762a1";
+      sha512 = "a350c005a481f08b5a0c3683326e1b95c2b1a69d64e8195686fed68be2ea01752d9b8cfc36b62ec61df8730bf14e6603547611968136518ed7c1d4c5cce97852";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ru/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ru/firefox-61.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "34b50bb908ba61cb54fb99ba3a02447caabbc463c2093edebfae8c555712ca2dd921bb64960a782b6b83673e6756004f84836022b319513ddec6344442703ec3";
+      sha512 = "d0bb1e20e75ccc0306b01c6a96b3c7e169afcd7b72e7ae881e96d6058efcabcb814e0a33acf17628af16bc014083bb48d7f53703ba58f63cc871aa417404b515";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/si/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/si/firefox-61.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "3fa9e1c43af9b7e290a936fd63d8cc552b1bcf92e0daa000f177ba729b850c43a315883fd66417b5de00f14b16d73ab4cb9060e263125ebbcc7d6a6011c7b4d9";
+      sha512 = "70d749eedcd0fcd96e17227f60606ec36783a95beae52854f48d5692ccc0069e9af39a21c906140b2245b01631df8670364537d0019794788d063416506694c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sk/firefox-61.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "55f1ea454d4cfa5d9c53f8724ca96256694805cb11c1ad2c7f87b70e91cf506c0aedb91346b29fa853df63c637c89fdf600422ca92f54fef4e9e9792d350b018";
+      sha512 = "ca3b8d19b75d4c7379833c4c77ad03aaa2f58bb1644da6dec4971ec4a4d42109e903f50b82eb8d6cae8ee65c4511cd9149514c8ca96fc8c73ebb0bac0c83dfea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sl/firefox-61.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "62adb09839258d0f1a08ec7a2c1fcf3a2d6a306d1cd3caf383d9ad281d43beece215587de3bd71ced2bb18c3e9362c1b8855f60aaae556c4f73b5bfd6dac1015";
+      sha512 = "7b73224876d367a7d72a068162fa19605719c331be0b9c4970e10461b9655520edded19e013efe0d4488b40258a1de6455fb717333470441af6cc51a69fc39fc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/son/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/son/firefox-61.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "07fcdc1c3d39339ecdfaec8be13bc104ec1f081d54faa2811abfd0a568624c1ecc05d5375c12a419f975e3b75ec00397f7f5ba0bb0f0b4271e1a7304225c0f27";
+      sha512 = "51e823ef446148f4faba9e9037ec132d3e9d8ce5257b1672aead096035a95fc42ee9cf8003747252a567a487c215bd11065776515059ce16f2d2478754828da5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sq/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sq/firefox-61.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "38ca6d4bdd0a170202be79c3b0d501643f2dae9dee7e257609a915b444cb0a680628b6ee1c812e67e0aa656d3771b0194af64138f181cf618c3df70bc002f93b";
+      sha512 = "e95b91131b23a0447f9c9a129790d1b415b05814c7ebe00ab04579835ce1ba47ca09fe9285949635e33164df7f45e838763ca5a2ed88efff950afbd923f5a1a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sr/firefox-61.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "1e77086a1c55571475227c0b4a76fccc99802abda94d30cc24c4a0ad36430c3fd5459719c0a06db64010d35413cc11342d6e8be364aca6d726040827d152ab59";
+      sha512 = "18f27f39d9953ef6eb39f872efe3ca8b371f84ddc5253e5c6440a3ea5916fc602b827420e5f7737e0596578fa2fd1d2f4663fe1e9b2c977d8f1240decd874dc6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/sv-SE/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sv-SE/firefox-61.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "9327d9408d0904123769e5001ff5c31e2187d0d198c29f39edd009d7f6b2d4f68f73a4026aec57bf9542f669c55ebd8748c58e30d8eed2e4df28eb0c07221340";
+      sha512 = "f1cd96c9d1db5d7f47411fc1cb12e8356bbcf1dbd1828e53e39ad3ab1ab9ad423b125ff9b0ab18f5bbea1ebde04d10768c759aa60176e1a7277dab6d10bb891f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ta/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ta/firefox-61.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "eb81e72e10d123a6d301107213149ec2fccb522326baf726cc56fba0944143512b1984d747b256554e6d0d6c861483a6d2c53804556b4eeedbaac64fb65b42d3";
+      sha512 = "6a802f54419d911e2e8cee0a1a20e7d915c8ad574a119c6a296e2c951de8bda1874b2f4c047f9579589f79520ff7a155a0e9a289120b4539578b27da40db687d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/te/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/te/firefox-61.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "0ec83ed676ad164571c45242e4a8f06cdc68ca1069c449cfa3fad0dc799ec5439a8c7bdf68bd196486ab9bd3bb7d956dc179dd872d8165b229c222c1f34188b5";
+      sha512 = "f5fbc36114bc91039ed6fa9e17345de50d1300262e1244748a311da0dfab38084b5680c7245063416bea3df29d0e601f7acb11961ad7f6773af63ce7fcf65883";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/th/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/th/firefox-61.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "5bf46c9e5d0d409af159d59ee643303660c55cefc4a7ca91bfd21b9ce5f0dd09d531b15fdef9a5dc9649fed5ccab28610298523cb5c56362cfc6ba12e97f2b4a";
+      sha512 = "eefcfc5d5b2123c4589ba7358aac8ccc01aa9b38cd4210d3e810552fc25c66467c6d71d64c0ee9b75cb2ee1c9d58a2ec6e117fc60cb60a678576076d2cd8db08";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/tr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/tr/firefox-61.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "e718aa0877c3561085ae4ea619fe902ef6eeb8e4db1c6f18b82f0811df6b80b14d9cd2241a6f551148d7d75899731d843ccc3e6de9cc6d769d327cfe8db9651f";
+      sha512 = "3447abe024b9b06b7978320bc084cdd6179fd0636bb60e629fee13d5e671e5e40bd398d8f296abdd1eb353eef57ae5cd22b20722f390451bc9bf218fb0cce392";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/uk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/uk/firefox-61.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "55eae1f05a00991678300c563ed44fe362eb41513b48b39d51607e7acf2a46fcbf9653161d9fbb1e82c5626f5069337536023418fecdffd058069711fafa8b4e";
+      sha512 = "e145d2aacee3a41d4ac178ece89e1f4f223fae87dd2a2236199abc34e83e2bad5730a6ecb1542c3cf6508e2b51a64ecdeb4293f97328ca683b62d8f70f96e9d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/ur/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ur/firefox-61.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "afea9f0143a8910028ea7751a6f06d116beacd576c3407cc57bc6d92d4ee3340fccf9801787f281d6bd04ffe75fba907e044ec179a2dd30bad58096285db6ffa";
+      sha512 = "c040b31191c14e491ae774c46e33c8433f7d15f5b4cfdd1ae2be3d292d750cdba271e5f5fbbfe6f2e2af52ec24642d524b7141288234e91afe038aae4b6da4d3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/uz/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/uz/firefox-61.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "00e26875f2250fa32c3ff1b6082f998b1d66711dbe3c4d0407f88adece9140379025cd117f9798827e63ff4ec2456b146e0b1bfbc376522e469aa0f55ec96ad9";
+      sha512 = "e6d81219e98cb11e9b6848364a551dcd427c7455d4ae87383d43f191a15bc13815fe7654a1198f1fc5ae63d5d300ce8bec801f1eea51cc257156f99d2811d0c5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/vi/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/vi/firefox-61.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "859a5bb8928a4892aed82920f51ee2b5ec6a7bfc0a4f0e3a149f417393095fc49b3a5f9cd7c4eb9f1c33777f20f769698363d92e195d7f19cdab28b7444d90bf";
+      sha512 = "b15ac4dd72f0b4752e72cf6baeaa8f0f2bc34303886a33ebe8859ed8a4fa2382abe260d54d9fefbda9319f39fef056bce53e07d1772ad79b5e652277371c4ac3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/xh/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/xh/firefox-61.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "d99ed33f72b671ab0a4833e25fa18071240491fa2e256f9748149e878fcca828d5e9c36e54abbd56f3bf92a190e1c4d81a7101e89a78c1b69525961a3184a207";
+      sha512 = "90c88df007abf67f973b96439ce4bc3d62f678c7657cc3f04f7bc74f7d0eba4fbf25224e35cb56d2736861413c54c95fe9d7a4170a460def0c7fdabad5813bf7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/zh-CN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/zh-CN/firefox-61.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c45bebd4526245e46d58031078add808ef38fcf301661fa754f40afccedfd727f19788accc098576f1757aed54652e1a88c4d868bc16644270bd8feecb086d7d";
+      sha512 = "ee66d559133bb827cce96470299b1cce56f9d2b8f16f013503138e54a9c3aede0027ef062640a6c691d551b5b56025b06d7f13e92bdd5a8c9a7403f5aea88548";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b9/linux-i686/zh-TW/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/zh-TW/firefox-61.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "39301c26b62d60670396ee7e6f6d4c04c2372d345094b65d37ad280b3aeebc5a48b4b7773c6c6a285b137875b1ae8957e29266ae352f0de1068925c428fa4b32";
+      sha512 = "9507c7958db71618c74b6b23ba672668471a0a8f7198ce5a711d087b485f8504b4471528320e3969f2cbbc34e02b19642833c8e2a963e3af745fb5b59577ef6a";
     }
     ];
 }

From 83399e31917fc2402a0658ebc88f43beb6327775 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 1 Jun 2018 10:00:54 +0800
Subject: [PATCH 2930/3370] firefox-beta-bin: 61.0b9 -> 61.0b10

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 13619aba30d3..b48eaaccf000 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b9";
+  version = "61.0b10";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ach/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ach/firefox-61.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "54e9f255a3c7a03206774fd9a7a5ca159d87aaa87c2c4bb097372a32e468f623ccd3bf871022a2a2abbf048e878eb7de8ef6f4fefc5793cf687b7afd4f68325c";
+      sha512 = "f1320b763b1b5ecc502d41f16604c73c346d3475b84840623802d0ecc8caeac44a5d754846c9a1a2814fe451cde75e2f0e655409400f4d3acba9cb53c60e9cf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/af/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/af/firefox-61.0b10.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "3b492abe56f91c88e43b4fda7e9a5ee804073e0416db3806f97593d928bf6988dd33c337e10fe1ebab5bdb3160d4a747d508be0531a0f86441515e1e8bfd1ffa";
+      sha512 = "44f0a51ef809484808fc4aec9c72ddf548b8a37b2d405a80349ec0ec3cfd0610fc85288b73a1daa069ad8fa808a2db431f0c8d7fa510cd0f340c292fb73b828f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/an/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/an/firefox-61.0b10.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "26304c889df459a7379dcf50ac29be7e1484e8b7cb9587dc9bc8fd83565f800c3813258d6e6f66926fa85ecd7363dca3c6e7e1418cdcb67577719cb72d2ecfb2";
+      sha512 = "c73158c3ae6309c48f57e16fde9c4720cbaa03b82fcae0160454f732f05e23521bd7e8f7371b953bd84e916f00726b44e9dfd1df513b3be2c1a228128d6f5873";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ar/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ar/firefox-61.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "c046459a9e0d2e6d486c60faff2cfd843d26b229263d8a908ee1db91a054bf4891bfd6bf4333de28d138dc5e55de886593a6a5ab0c1f0d3e88da4d67ca06892d";
+      sha512 = "cf833f4f05692adddb2a34c531fecedf66fabe9b1eb6bf27ca689c97c90fe02afb1396040ac53fa083393c3043fd7547e93a9af25eab48da33437146e71c8473";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/as/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/as/firefox-61.0b10.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "055673b62be410b9d456c61ae2db0c9959327cafe5ab75906c3be5d3ed2309988816f23d61d2c268ca0eaeeb367354201d9ca0f94adc94e273e8af96e0a94ce5";
+      sha512 = "da95c56c6e29f44cc751e1d96c9cfe81b5c523fb5ccbe7b24b8f7ebb840c81f1e4e324887445c793653bac2f4a1861cd3ebafd52aa63282e0f92d82bf2cba397";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ast/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ast/firefox-61.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "abb3187d4fee2fe48ace82cc28a1dbd7a050977085d31ea7e429b069c805a011000ae0cd6995a729ceed84b92cc725a1d7df6e7f36ed284b71ea818ffcb4ffb0";
+      sha512 = "d4d70405b5be8dd2faf01ce4dbe7007d64aa1f25c8c445730c9c4082a45b4fd12e7e921097029bb244015a4de8ce95426bb44a98a6a5a2407985c200b0178537";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/az/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/az/firefox-61.0b10.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "1ef3ac146b59a364dcafe89a4024b53914f92453fc2ac9f01cd71dca1cade3062530b45ca1ee17c0b832433dd603b6c7faf8d971db5f19cbe62b7733a5ad4608";
+      sha512 = "7080c9b35f02ad119ca0634698c2565b375bf400876e73914eb832035796e282b34da07c664513382de9b686f974e830be1932b7c39c2cd816d77f747f218c8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/be/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/be/firefox-61.0b10.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "8c7cf00731984eefd891dc31b3f7da88f8aa2bab110df3d45fd2622fc4cebeb51efc5c23849fd6f773cac0ce39bb442c627a3ac10657177e29311fa5f5e82d33";
+      sha512 = "21cfd56ea6a933c3a9c52c76c1757f33b3dc5bc914a95489a3365c8cabd78ff0bcf12378563c14854df155ecf0b93f0dc39d2520c4a030e5507d190155dd26e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bg/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bg/firefox-61.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "e33245d7a8d169c9d15e70ed7951f96530e88df7648f022684ce8bb6c81f4e3fbe421480dafa8541a3adb5e6a76e01756165c435cb6d086837c834e318f773e8";
+      sha512 = "e602233214b5ba1245b7e7d306da132674a5403d233f221b910c9bc6e73ccbd04acecf62f14fa0bcc1104f64b34dcc8c4adc91194f81b576872754b266bb3bc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bn-BD/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bn-BD/firefox-61.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "77da98a1bab406a5b5c71d83fc7a31bf5c18901f8977af4831a09bf09ec6d549d829e1ca5e01982c704229e53d0b10cc99449bd76b138ea3a4d8f89e5593a955";
+      sha512 = "b183556f189645beca53aa31dd282e6aa93d40f4ad4316ba23ccae4281ed3365c542d70addc4af544c267077c4eb1a4e797fc12a7a6a3744bf2f8cb9bc312a8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bn-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bn-IN/firefox-61.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "230413831fb4a3c9ac7a66c5201398ed90ff0e6f32479cea646c397cd901c0f4542b465aabd4cf4541d0a2af1734e42c054114c7ca1cf131be3aad6fa7915e49";
+      sha512 = "da0ada9f93a6d78c7e26324c74a9d47b9dae8fae81450663aad7e247f95e72e752345863db304852fb2b7e700c0acb4238152b331b817a13d5351d541905e974";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/br/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/br/firefox-61.0b10.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "29d83c329e73f5d85863da3b5ca54d5f90e2b83a8e500eaca16370c8ca0b848a721e7b92c6d335e4a8f3acbf5f38e1ee4470d2042f3a9f04cdd30fca48c1ebbf";
+      sha512 = "ccf4662ee9f9b5ed94f3b50e328642560a180c4f72e0da9a097078519ebabf5409ae4f439c65fc8020cbbdde5e45516d109d7ef31c37cd46c60730e12bf71de1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/bs/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bs/firefox-61.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "0277de6ef5ba15d6ee9c31e6512837338c5715d35dc9741190a876e8c853e85e82724b9a533a22fcfea57e6083a2ae6cda5026e8036ac9eaf0992294aa4bc609";
+      sha512 = "ec7d7aacd9b93456efa00041d47b9eddcdd46a8473db2d28334443574ccf07622b1fedaabbc30f2b0d42ccb90b54eff20c254c0d80359d656c8b872a8d52eeda";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ca/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ca/firefox-61.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "b8bd25c0470ef22b9127614f56dd9b25c823f0f542772333d02874aed80a16186ec501aaffd72b6786eb03f8ae24e477ed0439851ef45ac301827b11561c3c5c";
+      sha512 = "4a4d44681024bae6e714c6696f4476bc27fe025061ad49582f0f01d73dd4751cbeb1837c8bfab58a85efe9c0c65d610a6dbf1968da9b6514fede4e43ded1ebd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cak/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cak/firefox-61.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "97df63b6f4fb78320bb7821ac6459528ff765b08c9c93b2704f50cb9437663be7c01a31c98ac26d15416c5836c4d36b31de6d94575f96e160137da3850853128";
+      sha512 = "904c6d56bd6971e167c5a7f622e1c453d9a1837a8973c2b6f1c1673bef7f43e499a6753d5ea8f57ae68ea8491d8ccf61bc4e013c3cd9f15de1e6e5f4f8eeae3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cs/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cs/firefox-61.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "25c0befa4481726efc87b766c3b647c21baa2cc2f8a969ca1af2cbe250032ec9cf86af8c13f1a9a6110ce86146ba5cc586e5fcc284b3059f6409cd0e75b0dde5";
+      sha512 = "1225e7246316fedbdb933014cc53802b317e44a100d941833fa7ed3f59755afa87553ad2f054404290d3cd519f0b534f18811bdbb6e92985beb10c6c8103cee3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/cy/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cy/firefox-61.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "3dc4f1f3d5ac4e393f832f6d65747e1b8fb6324153b87d20fc79b44076686c2fe2f7c3846cd10efef6a996518edff7866ed36ef54150b0fe9b24644b30e37dfe";
+      sha512 = "afc88489179f5cbe7e94344d37f4930460d050644a3bcd3acc896761b62880ddb525c7fb1da4d6c564c76d051b9f02475b9d9db0e4a1c768b35db667b2589732";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/da/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/da/firefox-61.0b10.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "47c2fbf47d9ad269832e49778d47b623bb910d55954190275d2bed1f2f0101aab31c782f4624b5eff7ebaba165d243af55d798835ff9bb11a62e13c93fec53ad";
+      sha512 = "d18834876a5dddd72cd439fba28b91ecaea2033e90cbad5a7d2a6f89bd0433c7e4f2bb6ee0a68057ed8b02bcb0075e29d3d92186dfd2dfc9b7a811fb35f63a1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/de/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/de/firefox-61.0b10.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "857d22d48c8798454b374543ec0d5a28c7befe4e159f75394e9eddefcdf679e5628d56d65c3f473f8da362a8df4e314285de3540fa65344af1f290bf92d8c78a";
+      sha512 = "51789ce2a18920ca616804bbef5b4cd6738884a6bbbd8397131e6882a470271d630cba4facb8dddd6951af712c5a17ae4703025d51e1c9ab3b8edbd4d444660e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/dsb/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/dsb/firefox-61.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "bf57cb64d6f4304b4387ef6793fe0326a1598843a28ba7b319ca90c759b3335aa80d2bab6c38d2388a567aa10121f68b3fbc807c025218bfe991bfe0e7ac3b5f";
+      sha512 = "5ca16056bb13f8861691edc05db28aabb3a9d5838c7f5ae231ca9700894a3ebd081bac007aa655ad3fc4724ea31fb35d3d0d33b955ddc8c20651b28cde0d0f6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/el/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/el/firefox-61.0b10.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "4ec0167050257963f41b69e79a8ffbd5e2c4daa6f05bb9629c4c86e34b37825d4736af371d00da3aeeae5bc935a496cf9413aa06ecc56866cd76520026a8dbff";
+      sha512 = "ff97b8db8bae51a15d7167016fa4e3bae7ca0690df5800268b572fb74ca4b058cdde789c6f14423258301fc585ff1dd780137702267070c001eb3b54c06d437d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-GB/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-GB/firefox-61.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "0119050c48451ea8b4e83a79d75a0244d1498369f5ea940bcc9213b8e045f4f2bdf8265924c6929aea090dc5e452acd12b8ac64285208c37bffaab2ee0d6803e";
+      sha512 = "2b64dfc41b38af92695530cb4ef63ab6c4272bb99eeb4c848daf5813402b9cdc5c83ac72551929f6cc1e28607d90fe15985033c1aa3a792a039859ceb129dd1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-US/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-US/firefox-61.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "40702554f1baa31ca75c5411388f39f5d073d16670bffc10f68674c0f49ebc13832922ba35bcd43c2de96c19ee48901942205abb4083112b3c7d654a36c2f631";
+      sha512 = "8fe66383f7afd3e5353a93ed7b38abca70ec1c909dfe27a69ea5eb2a7a785120605eb581b9e6a0cf4586a7e4c5512619abaed0ee60d7743baab2c070a2c5a8a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/en-ZA/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-ZA/firefox-61.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "df4af3bf6c246314b3eca57f7e30ccf1981fc7cca95a32612934aa0a7f5391c3c5627238331a83c37500d6fc9311e397aab5ac6beaae8758bcc22d8dd16f0eda";
+      sha512 = "d12f30cc478db39e610d9a13cda696bc2e88a0105425c6d2cff984c81ba1b953d3c7d7844469ef0cb51b21d0f8ef8d087ca621e183c3ca27e8a7dbc96881c133";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/eo/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/eo/firefox-61.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "053e570e858aeb0eb059a377698120d6e670be4e0f531cf86dd86490f931c0d03eba4d95763ffd88d6aab916f6d4ac2393596ee08f681f435ce1b4547c2ab7a2";
+      sha512 = "927675a0c82deccc56931a36ef7597cf7be73712cf2d61179ff8163b4c6216fd32c59186f8a76d9d3c8b1be4b70b98370ea323eed6869e36fa680ee0d53deeb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-AR/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-AR/firefox-61.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "d918d1b1e35e206e409991e1eb754952b49e741b01bea5f83b61ee1a345b90af42e0965f2e5919403c25be7141c752498ca388985b4c897c850a0667f8ab45b0";
+      sha512 = "d172ec8678f9709958e2f74186cc5712903eb9736cf7dde60b5bba86c144f0e415a65ab5efed2de017ce72c091d5ec5be7421fe49772d64e5afaa2865f52a7d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-CL/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-CL/firefox-61.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "43ea381fab19c998d1eb5544811e81504237731b2032a8ed84925eaafa253df7ac4b0a0543c4cffd7b072ea0ed0c0a26d75dbee997c4613863f0bafb39e78bf7";
+      sha512 = "452be0d583962b7891b673ebefa9b02208f59beadad96c6dde3f8d4367ea794031c309b56fdbcb036028e59f33942e136417bfc827e1979450b726e64735ea52";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-ES/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-ES/firefox-61.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "a9a246c5e7f4559fb96c92d3f4384dffd8656218c582988da984a7c081c2cd741dd1cd5c384f96d846e39216bcace099453122006b4508a25013716a4ed356a7";
+      sha512 = "b12d48bd9e73e439dc7968443bad6b5a855e1dcd87ab4a714a1b30ec0a2c94880219f7eb6c914b0712d7a706afff696f9dd2a3cca3dbef2a801785e0d22b9002";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/es-MX/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-MX/firefox-61.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "373f2d8cfdeb77c2da3c88420d7eb9dfd2f41dde0408c0d9c69676114bf109f4c7271eeef3e21f030e192332fe26a0fa9daf4d9e3366fbc85e2626d1d32cfc07";
+      sha512 = "26ac7f76d3f3203afe13687a0f61cfd3bc5d69feb68fd02a7fa13ff391a1e0b06532d5ca7a2222bcc51f1e083e8eff5aa38551432e84ce1891e0e648d020a74f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/et/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/et/firefox-61.0b10.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "68d8cd59cf761e2bd5e6857d9d39edac254772d522b5e3103a83a0f133e903c3dbfaa518c8fba310b318b96452a3e4376ce07336b7f5c43b595bd4fe1b4e5f97";
+      sha512 = "14848b5c938bb40e9e1f4825854c4d802b2568d534cd777135f5c17a4e17777b35c77d888eb30ad260ce4c6fbb5cc473d55e23c5ea7694cae63c29bff0f24a04";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/eu/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/eu/firefox-61.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ec9278b7c2ae3c1093677fd38b05377bfa19a01f7b9d45fe6d9bcaec399ed015facd53634649561047f4723d8cdac458d9c73cac345569bb31837fe30c316bf3";
+      sha512 = "e5ad3ae3942943d2fd82ff83fde360c507f2b4d50eb4ff87be919a04c60dd410204605c95c439266dfe9ca4200430e2a745b04d5e29ac69d27de3a98ee91699c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fa/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fa/firefox-61.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "543f75d7b7fa724f18a0ab20d158ba14f1200531f9582e54609573d104d57549c40c1805dad4ccf764b0a924984fe0226677089a1191c77e3c03ea3220989382";
+      sha512 = "968967397e661e921a03e473d2be3d25d31d345d2e5501456cce7022d4523185207cc78be7b0149645bb53027d618a9f22f775f01793eb687274d9b14354013d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ff/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ff/firefox-61.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "f353aa0fe010a0897592d1611c7b3327915b78b8eaa0bead1a14d9b305f49e1d91b8fd5a124e723d494f591186fdadda76ba93852dbbb66be7942a078f537138";
+      sha512 = "732f1a3bb6bd153762391189376a2796b07b7626567a7348cda08ae38ded10d9dfb3244689cefaaad337306f667796855a91b646f210576476f2f349f7f1d35e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fi/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fi/firefox-61.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "10dfa66ef00d961fe2558995421424bda7a22b5a97342724e33de1bba8d2f6e5d8646ce953fb7f6a338870df5aad2642faa2fada481c49f0aeaede3be9813ad3";
+      sha512 = "8b84165ca3c333f776835149b62500562c6e69ce190d46d6f2d0d93cb7c24f8d0614793c830cc8b070ecaf316c21358f627bf221049513c20a1dbd68d9e59c42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fr/firefox-61.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "2bc74014bcd3163aa5d59ec400ab57212e168992240372d06cdf6d1e3f620e183cfeb23a28a41f61246ae172b24a8fe69eb699b312975f7cb8e1ce490e4ec336";
+      sha512 = "dd7dc60caf98ebf0726dab9781f2f8149334f7cf658aac2267b71ae3a80a89126301ff371ef56028851438b33e72746dc24d546563f9f1a680899065bb372ef4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/fy-NL/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fy-NL/firefox-61.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "b3c49a5407b714dc83ea34a669fa7487f25d4b810026d32540ed7a59e76d460d97f2fe282528d634887fec9ec15481bd5b47aabebe62d3d7b4fc70868a37d525";
+      sha512 = "b5728dcd3cac5546d05eea13e62d4327170364c03b512364ef1e9d4d9c53de0e3c709d71528ecb15383a2f1b82e072b84c9aba61d054fcb102cbd33a77131d1b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ga-IE/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ga-IE/firefox-61.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "aa97023bce92cb2dd450d6a65ba09d36af49870eab6c2823a4221cbdc5590f1a535e759867a1777c0f5f8d540f6be8fab7a1c814d55d3fd0670547c2ddd5e876";
+      sha512 = "50f50e79e1d8b62628de28a8cd0c37e90997e6d1a59222e7a8473cd6dc05d50dfebffd185cffcc3aab915fa180b5b8e09decc948635171e5cdfda973f74bf9ab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gd/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gd/firefox-61.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "202319e8cd0fb328bbc1af9aab327b608853ccb516d59ca2af45723b13da707a458eacedf538e64acce94676db6e4a588d40bb50b9cd8e1bf5d732e92c1823e4";
+      sha512 = "3425c84784e8cfb8efd56d6c8fe7c4bee995a33b38b3438c648342fa866e29e75cbd7e7f0a1269dd4c4123b172440e76b9615b3058bdf6761c9b75116ea7b3ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gl/firefox-61.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "f765645de5ced254fc74d637b1d7edf0b110d70f894375b4c698e31241fb4ee61400a63a2a64c3688df4b10ada76616170dcdb969c7e26e77997353f7cf0ca05";
+      sha512 = "5d304c6b65fe277a36e4b7f697a2c238ed4a9d2702a52befffeaa4fa3782a1d456dfffa3645d09fec307dd27cb2c6d65fa73ea1bcf39025b51b3cebe73d6e70c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gn/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gn/firefox-61.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "e46f4c2ca5e1f6198e3bd5c6a5d304df69282fd95e9a4ac06df462e6263b2cec3e9dc1b07d43a583f3a14b3a678cd99cd1cca3a8575f41b2670bf6f9bdb21d32";
+      sha512 = "38b3a8bc2a36650eefb6d0f5e3ae4f03443b1aa746db35666288ccd4263e7a60e6803fccb5a33c5631612a2ffa6fc18dd8a564de34b966d3284e5babfb06240d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/gu-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gu-IN/firefox-61.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "9fe5708fd788aed90b59c0b7cdbb73e9ee8f805199a4ff06c737602a234af6bfba3d5542a625a3b044866c598c1b771f258b980675a06b3393afa5e1e88d422e";
+      sha512 = "3f8933cf0f99193452b8cc837434932122e01fb86565cf72f5b42833baaa3705aaa63b811af4ae2826ff472fc1cca7798b0afc7aefe1cec28d330c8a537b0e0e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/he/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/he/firefox-61.0b10.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7b3ec2007304097be1682f5ffca4972e533d8d93225639375521bccc996e1416ae844b4b5f26969f14c1d880ca369d399a4b1d6c1dfd9d9f549c583e01d3a5b0";
+      sha512 = "d2946ebfcd2ce288141cfdc4cfec8e7f5bd6c4f6470d6aaec4156ef4e36a3154f262a38992f92bf6b18f9dbeee43019d23e1d40f0f481ac1060a52b5c5dac4be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hi-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hi-IN/firefox-61.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "12187fa3ebc6c45ec1ddf9d2320cc434d0ff7ac4c49a080d204a466211fcc65106117a635b771c5171b509292302930e6d3da87c83888e38c099c4a6823a1c29";
+      sha512 = "d6781605eb332d61c66bcd07c1ac177e07bcf9d8d24b4f720de95deafc4b5ff68d8271792abcda2473321217e5288daa64576c0cdf37fb7590b366980e59c821";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hr/firefox-61.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "2aafef00064448b5e3f884a956aa90298869c1dcf25b58746e7568fd3cc49e1229d84baf9972395a3b7202e8e82c44629a67774f02b985516a88d66f53beb320";
+      sha512 = "7dd72e8b26bfbbfca7f08c0ae5fae73ba92c05cd6d221c87d3257473422db159e31a48c66f96d53ec64722d9f35e7ca081e373ca11a9b9ff8f85bfb7693f0150";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hsb/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hsb/firefox-61.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "970c8cb83e625976c355c7f773037974aa0fdf25560b1004d1e03a81866cac5cdaa0ac80f40d318aabb7a89bf921b03eb68ae9905c61ef7a7bf1db5cba8e2d42";
+      sha512 = "8aeaa498060a40f1c88a9d4bf1afcefb5a6291707e1eb47e27044f7503de4515670c217b5eb1220278a3aa3f3bc0528023757f82c583fc907447f5d700452527";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hu/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hu/firefox-61.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "d93448919741035a1d988895efadfabfa41a2a06f91ea6728dc7e952607a65bb3038380e007c2b6f1f2e3c67daabfe16325929d81d315aa48ddee51238895a7d";
+      sha512 = "08fc38f050c359c146b3aeeb4cf15032da9ac45fa93a2210ebe6baa673f4692e96154e127406ce65509cf6aac52e0ae550c6735e3dd4f134f5885f5c056619d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/hy-AM/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hy-AM/firefox-61.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "1c66b62a0ec38a66dfefd29a92b29c065b089eda9cefd06ece92de0502bf4d80e86655bf3453f4d28828dc4d2fb03996100da5f6da31892ba62eb55be59675e0";
+      sha512 = "db7005ba812a980b4f764048e97505a885422c044876ce8640305d1730ae6232a982aacf0a0d2bd7ff1e7df3f3f749314940e7b9583c18dbe4963d8ad64a1ae3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ia/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ia/firefox-61.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "44abb1074d87ddbc4ae414e9a2ef744ffa7e2c1ccee9ddf7f55f8f4602cdfd88c0f634b277087aed0643b40f0f87307d8ba06c374b49cf7e24151dace7d4a31f";
+      sha512 = "20e614a3cd40234d5208890838ad671b32ea1d601c6c9984a511bb0dd971e3faab0fbb709bacd101fcf8c069f5c9ebbb208c9ddfcb34e00c405b026cd1a421f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/id/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/id/firefox-61.0b10.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "49b055c1a0561ec26ee81005f9cc8f95e7375e5e2b6354febc78f64b9272e7d999d3dcd4777a01f7d37fcdf24cee92dd4d9564d864d8af0910cfc327970a3977";
+      sha512 = "c4ce9cce3307d3d0002aa158dea3ec873e260d47b3a423c0bcdfe0180dc4c30fbd807ede1b93314a5f00a440bff71c53c8a134b046fa9e8e08655f7871e652d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/is/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/is/firefox-61.0b10.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "c5ae438e2a2523fcf446da39301954d61d9099ff9373b3665682dfd6eee02859c6d228138c89315e8bfb9a41b92001a218df079fa916f07fe034c4591cb32954";
+      sha512 = "4b88688009dcc4baec3135f2a313efd2f3a2d1ff6dbfdf62cbb1b9a009288166a817779ee715abed57caef3d46e8d45b1459776fdc9a2e5f5737b84efc5e2175";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/it/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/it/firefox-61.0b10.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "ca0e426078cf44cc90f3f5bb696de77d36565020442324d89cd6acf09405b36b088f33b4de7ad7ab2d9be9d88acaf16059c75fc8ffe7745f275e021b4b34575a";
+      sha512 = "3d81dcc71359fbe93979346b3d4a3f5b62c15cbd9f7a022f7b0fb956a26e0bc029b3abba69022ec2959e284dc52a91a710b16839fc427bb11f36530f4d65268f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ja/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ja/firefox-61.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "b47b6edacd8e7f2f9bf05632aa7cd6ced932bc3399587244d7e806dce77d04d3d7cbe9c31cdea31d40df8a10c9b284a6bbdd246a4bdf31e12aff4d8bf021ae24";
+      sha512 = "320ca44d41b370ffc5282f0cc5ff42eb8a190e99417a828baefc78b9a78325ac0f11aeb2ab43319f30c09f6f31fd3dcea5656a21d4edf42eb753dc03b09a30ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ka/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ka/firefox-61.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "2711d46506ed9438ff0528e113de3c1cb10d1bbc0a9042e9b0fce67feb37de484275ebe6c6999a07a9a77b3b5edf1bfae9100d24db4fc2a35f90a61f6a99aedb";
+      sha512 = "52485206ca748007b69c8a4a6495b8f1708332eee317bd417cf8a03102cbfe76dcaf57410e91f5fe88c8ba1b8a0566319ac8f4ca192f8cc20e4528d266e36370";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kab/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kab/firefox-61.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "874d0a6991d243b369a0d2b4619ede4d9f14d825944faad22fa997a39466182349d4455180e425d32db87dfbe33f7d584c9c7bf49fa9d71a76a6ff5df7552952";
+      sha512 = "3c69a0e364c1dbc34f6c0078f08053e7b0bd0bd57f2ca69d5271fbe19493fc4e291b33a9668a389ae0c15eee48d7cd063aa68a251ac53dc4290513bd7defd525";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kk/firefox-61.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "09a0a3f8080694decb259619a421d5ba566ef5f002fb24e4c4bfbcb82eb8f697b5b86be4fb35c3f88d269cf178f8b15efdd93f693d65c07ce12d7ee3df98e4da";
+      sha512 = "e5a75a9643a5c3d34427a71fca78c27240af06c6298566c2afb57e8a271b901cb439e1969e2a11962cc464fbdd0267c8db5be2fe92a6c909060fe0c8b0fd125c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/km/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/km/firefox-61.0b10.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "0dd4932a1dd9b973234f5b0d723a98dcaf50f9cf5cd957a4782b427b382cedd7a4bd19fb1622dcedfe71f6ee5d60ccca71650fcb756de3cba5aa67e773e73ea6";
+      sha512 = "cc2a4743502520a66293053329536841919ad2d08364eefbfa201b1bcb02b515ba7a123d48f3db8c8a1967b167b5ad50830d72b9d0292f00ec7dee0d4e4fb222";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/kn/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kn/firefox-61.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "5e47e7d5b729186a23c4d7f8a097a16f079b6996e05fde2d19aa0537c9713f08aa34350ed0aa75159c3cf5aa4aaf855b5f5ad6609f5b9f14153b23033bc940bd";
+      sha512 = "fa1785e7c83e043aa7fb3211e12f4592f19263b9bfd07824267ed60292f0f5293c43e6c0d3d7c9cb9790401249c61a71936c8bf8308169649acf734eae1bac21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ko/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ko/firefox-61.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "8dc20d9f5db63f641f83404d807d3b4284b8a242618a22af6f33d79f9e736ee67886fa2d9e8efe6eb2186e5b6ed5212d3180c247b132e02b91eb25f07006c37c";
+      sha512 = "e19c0d0e74f5eafba8497fc25fb96994a13fd3ade4ae849bf0d6ab6e4782d41f54e122a6260840981f434bdb35b3218fdd93c09af9fd60ffe901f91c5e605e63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lij/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lij/firefox-61.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "ea876f0cc7c7c9dc4afc7035af098fb9bbc429d89349f7b5e12782159622820e8bd82935fba81a1da8cae3e4a38bba1717d70d671b2501a24fae248d7d1fff79";
+      sha512 = "0df623bfe75ee25c10c5d6163e61e0a14f5b3749a9570bd714ff0f9a95be40944ec19930f5b7aff961bf27e90f0a0fcb1a64afb0dbf0ec8eca8b44aa40aa4f60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lt/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lt/firefox-61.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "ec438f7a85d8730a9c9e11e0c310eecb7ac14c52ad3edb43fadd13083d8cd182bdb77e1b847e585f126167fec4d087563b736cf5300ef297fad171b36e8c3bc5";
+      sha512 = "774073a8fa2aeb6687184da42a25e222e6172d1e0878478a08230bc43b0ffb1b00f063059373f42da99dc1aa501c4ec272f501f5742ddad24e8c17517c4a333d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/lv/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lv/firefox-61.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "65664dbf460447d24bdd7e54af5c05a9768b71d5de160273173939f0cb170bc0aa543f6886a6c45d7f0bf716844f21ab5f1c84a554aef5e2cca2a060a9379fba";
+      sha512 = "583e8e9c17ee61f466ff20147777f76b94099104b0d9c5516a0d12cb2fe26968c9999bb1f145f2d32e7ec89a7d68fe1c5d02d360d803d0d20736910b54be2fc2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mai/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mai/firefox-61.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "38ceb85c2ab2c0021f5877805c800976b590e56005320f60a5d375ee346f1e2441bf744fac86ae4a5513465459a3a9e02287379d24baa4ada3e86acadfb82753";
+      sha512 = "10a5a51d87c3fd4f9e982bcfb47a6452b351ab86b0042146eb3dd697cdf6b17c5589ad6ab4914fc1d18b52acb68718f74a48d4bf9b94b1f7a82235a33627c92e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mk/firefox-61.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "976f841c1cad0180bbd18f578393d61a3c0c80c251aa67d22f8bfe247c09fdf719ca7de003db9b3b6aaf941c8e1284c7ae407f25c18e4f64714e2797de08e41a";
+      sha512 = "1e655cd47256b3b340c9878023e74ab925a359eb131817b8255e362e243994dccaf1b0ef91b1a96a4ec497a2f436419161de6a1ae773c6b22852f8efda2e71ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ml/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ml/firefox-61.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "a7cb8203aa1ec3b0f2b436774036f82b71940569eaa553a476ca6133e13960fd3ebd00cfc9a70b2812bde0f388d054b9a219fe44522e19d9bb113177fffa505d";
+      sha512 = "1d587134c40405ad3339fd6dc45b9f4a41182f00d8b24b20d073cceaffd00b61b9ca9708b0937513b4f5e4ce9d28072a93421cef9f516ae76568e6c5dbbf9c94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/mr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mr/firefox-61.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "f36b95b08786751a90c3d19d53761b971d0043a0b3049edf40f81edf629f87b4b9c9f3bd2cb2401149a41eba883eefe1dfbea5b62955b94659c3ffb982687e5b";
+      sha512 = "a2f4a29a30c6a6e46659e4cd4b8c66c8661d94bc49b0b494839feebab197c67cefeced7d161b60ae388b8643f44669370274dcf04846e878f61cfbec6bc71255";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ms/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ms/firefox-61.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "03d0171327097bdde583770e10f4852b7ba955d7392d1997c4c82bce781b8540157665c641497e69ff50d7fcd9d04c3fa48d6f22f867197b71a5d68e46a31590";
+      sha512 = "95a01d3aab89fd37beee953cc3212d2f18a45293d027db8847edaa4935288d3180f25d4e8411ffee8e4a8dc1c071edef17409f2bd981225e84a1ff3f726f3863";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/my/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/my/firefox-61.0b10.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "75ba4ced40a26fce83ba3e688d260c3becd1b98e5914f525681c4c04a7d7f9476e45fc12789e7df78135614113deb196f2403085d605bbba061fbfef10027c31";
+      sha512 = "d35d2aab040b0c8f0619ce904ab55dd0cec0498c34836cb9c27ccc9f02667c5368acb37c1678802839a9429c9f716c7b470d5f30fcd4b18a61230b095f56114d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nb-NO/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nb-NO/firefox-61.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "dd741fd32bae0f327a19d019870ee587ab24b6004410cb41e0cc6bd79a3893647c14216ccdff11a54b16adc6504b95cf414905a5bb5de35c250123f9c078a964";
+      sha512 = "0f6937717ebcf680e9a619f36f1883c9bd3a1c3ae9031ba25ceb41b5a866746b309ebdcee447048a4a6ba4fda29ff740006f08c98d79d5e1380abf239c9536f6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ne-NP/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ne-NP/firefox-61.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "eb3cc5309e52ab663f37866089c6f42c543f640c6144bc66319a850534cfc0732e545b10f5c56045683a4c61943d59e8e46b90d795c4e5c3ca80e30f5a7b04df";
+      sha512 = "2957ee8f89d219f6e8926fd81e6414e4a52f46f5ba00ef729b4996b8f34a7d436dfd1303754ae5d06ea4fdf555dab2c14b498fa94026149118a7f74ca198190e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nl/firefox-61.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "74aee78453e4e78c4bcab739c363de3d6bcdea7d23583398ef03fde87b619d54c3e478f3eeceacd52e3f4c7824240c4cee1c067ee6ec8d1db1c29f5862a356ea";
+      sha512 = "0f76ef41860cc51645f09c427c5759471475086a65a15715e8b68327d71be049be1fe50561c66e30e9858f4dccae45417ca8e26d373d81693bd0ecb2b12ac1cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/nn-NO/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nn-NO/firefox-61.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "4d11560b237d4cd9ce5b3fba3f369ff2e8273939d5f2ae85a6f2bc1a872de413ca58c16c15818f5588fe8e52c6d103c92c8755003bb2e0a3875ca8aec7adb908";
+      sha512 = "6070b0480e965645b6aed071b886216974e5a03574715edf002a0f83f7fac4a75b20fa0e1c5289a6e3604fc4db08003c454a4ec767fda18cf92a72b051b66ca1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/oc/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/oc/firefox-61.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "625455a5c5043e416f66b65417e09982e0e491abd1c1b28d9fc63375d9cf5c29c9d11be9936ea2db97b0011460e832d44f7fc5a3cfd9c95c95f4934c3d6ea40a";
+      sha512 = "abe4a71654c0c679bbf83913c9eaa2e028872415ab38627ee79aa5aaad47695a306895589b218303d54c6394d7c4afd2dd7bda536075a098fefcb13d24114a36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/or/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/or/firefox-61.0b10.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "ddd26fd7e5f69663e831246ec9d71dfca4d4894a00ef22d72594a8fce9c6a230bf81e1ed9bf1c0cec9f86b0059a3b87980aca31db4151204419bf174c89e2cac";
+      sha512 = "a9554fb7f97f7d8bde55a6bc1755851c6321bf3ca8512b15a6465a8fd6963fd1999b2960ac8b462bf887c901af26947f304f55dd12ccd95e2696e96bdb89b720";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pa-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pa-IN/firefox-61.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "eb7bf00fd7ac6521e93f7fc87373e87d5d2d58fbb82a76f8df675c64a2f9f443ad018e47d86d6f86913c166cd05d6703c3553e82e5d27ba095bdbe7188fd1e96";
+      sha512 = "21392aaefff4abe4d6f540918a292080325ba635465cac18113db249f52a949b5f15810579859131ff5a19a75933337f830b3080cabfffd3415554c769da8b11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pl/firefox-61.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "98cddf287453fd68db2f84732dd7768ebd0a72f492cdc0578cfe71a3f3eeff9bc1be6161b810efcf22f64bfd2f6b52f93aacade45df55380d5d9830cfc1cbfe3";
+      sha512 = "d0969bdaf97b8888a1953d5c44848f80e9500f795eff456e87f3031a066a583d42b4e76b8478d1f3cd08d4480053fffa703b0522e4208d3291923d90be92e37e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pt-BR/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pt-BR/firefox-61.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "35e3f27b7e2dadef3e93239e6530fb1ca5ab5f2dff619f24f8bd66d7ab5c95b23da1d744769e99fadbfb0eb94ee81a5f5db76f2eb842cdaa4432bd0187f92b4a";
+      sha512 = "983272eef924b86872b2b76ca922af33c568d89ff97bd5415782bb66d0cc3f83d48b7d10f45c501d0acbed8781b0f6dc962ec6be73dd34cdd3e78ea3494244aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/pt-PT/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pt-PT/firefox-61.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "721d13aab5ef95bb3ee4d7d52c1e80bacd6f372c2e68598cc6a0c146fc6abb5f2f52248e9b26bb0dee6a88fa68517bf7c1bc28fe20d9c9d9faf7e49f9524a0b0";
+      sha512 = "333f35627c6cf52c558541357bac83382597a622b9b6c669cb918c1950a314c85475236fc1961048cbc8c0d390800d1b7fc71eeaa81fde5124c017876c62a378";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/rm/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/rm/firefox-61.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "4018a271f732d96d7f61871deb91a08bea47a24b0f1a5b4fe2212fb46c23bf3fd5bef6bc3871ef0ab0303c98875671b1fdd1de740797005b6fd0f5bebd874048";
+      sha512 = "a6f9dffdb00f28cea349c40ab6681ad6817f61c1c6ed7e8980a8e4b33317367d1946baf0f6fe2404ab3b07889336a9676d87bdbc07743ced795c1f8f7bfa7a43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ro/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ro/firefox-61.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "ce71174e9f1e1f6cbe3ad4dac63a06019ecca88e1849ede786c19cc20f1a08ae32ec99913f49d894731b7975896326a1f96ced12344d593f9efe3230412c125a";
+      sha512 = "59a7f64cacd0a2db705350f36343a7cea81c68e54500a02dbc596e08705ed464a1aa51bb239a742f9599a3088adc8d782a811ee79937af987285a35aec74065f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ru/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ru/firefox-61.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "774ae2146f629550e7b3eb36a5e27bdd2a5aa845d8119f5ca67b181aaded964e9609f9e3ddcf212efcd8baab58de66cdadf0bf7a5f088b9a39e2b63f53dac48a";
+      sha512 = "6de1516de2b9ef25d24684d0d912727cb2b424ed58ef5c87d0d2b4b707e10975e84cdf716e5b828771d05f3cabac387205f1846f549356017646354c14d3ff22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/si/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/si/firefox-61.0b10.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "942d12625cd0063ffe09b1c6fd83a19bddd89220ca37f1b78d88fb184e08eae044ec3d7e545b3dc2a3b020693cd62a8f21f10e803191ee2dc98b538e9ec57f27";
+      sha512 = "fef8283a1a5b3fcc5ca02a434e6008b601085feb3ba5c73c5c60a1d8b3d31c1e3338a1277bc78fa09a3a69150c6cdb9a5ee3de1998289f27e0f38aa4eb779cb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sk/firefox-61.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "0588b18c99369288e188dd329fc77f73c04bce1fde3acb1a940dbbf01223ee8e2b852fd145e531841d950e53d008fe8e24ce681f2b36f1d5afd434e96b6f95a8";
+      sha512 = "6c78e0618b9248c45d71c8f18241c57b8c46dac25b15a6fd4adc3bbdae88e2cfe89b638980c567adcb93132d3ed95187db68e6570fcbf0bea7dccdf87b65c7ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sl/firefox-61.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "7c0c826eefaa3304f32c4a817a4913417833ab56575ab577d42391421a449bb366168cb5f62e2f1f1fd9c551a32875484a77462491fbd5e274adfe51b0584a9c";
+      sha512 = "bfe8750cb89b6a29c4123a8f7de6a53c105e898d47c2eff29969d424d1e28fd8d7d99ebc479b7e8ad696e6b91409722b319f8f255e9ec2ef425c59122e50cfe7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/son/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/son/firefox-61.0b10.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "9f8614124d669df9f0e539bbd14c9d99214a012128619c5e6c509029664782bd75a887967f255bd886da0a645c47934f53317ddc20624820c5badfd08724d44d";
+      sha512 = "85e8a7dcd5f6e3761956dc6eb556248d9668538dad511ddf3d8499ecc55301de61e7dc42fec0c0f3c56801eebb940c88ce1d2511a16afa21f740b45409115f6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sq/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sq/firefox-61.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "2227eac2f7c71a627c2cde8f545011a7049897256fa7ec226ee795576f35f06eddd7333ad9bfa2a474023cad5029c9159d6904db50e80094c3f405f857f4ccc6";
+      sha512 = "3f5daf2ae701be63b84eea53903a582fae6095e9377f49c750a2bd404d8247c5eca4852d86b3d4effffd5367bc965c16ab1bba939a245445b0fd0bceffc32ec8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sr/firefox-61.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "3843eb3b078bd581849615ad8a8b936835b4a85a6ba4ba33b917d9ec549e43d847e160ff4a760775dc6e2c1688674f43e16eb9f561c93263afd3e532a74590ff";
+      sha512 = "0bc074a4953a34f533d7867e6ac374402bad84b2a2bd219971e80e40195f8a984f801ed916c761438d8f34313415ebedcaec8622d495b601cf28c8593bca90c2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/sv-SE/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sv-SE/firefox-61.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "5dd55e468825c8b13473c57c9ed6a24f0920364ff339136c7f03b576a6f9d473b63c173f95c597365d68e9f9afaa653ae1e961d5eb2eaa5c670f48a4dbae5466";
+      sha512 = "c78352750ad3af2cc7cc6d035124ccab4f46ab0d46b178f6a32ea92e79ff5b8ba5148415d9ec3e08d0b1f7c4d4377e62d174779f164b730b0a4516c2224627ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ta/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ta/firefox-61.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "6c45af1110563f53e7ad536b266e84b23e98e47eed4a88d91b4ceaf7bddfc81c54680a93c00ffc7367a0fb79bba5e29e69069b0e7d9cd9fb8e1b2375b9e489a3";
+      sha512 = "31642ab24c1101dbb28c9f0149754461eed6d8939f59ce5ad45c1225749c550fd8dcf23c42bd3d892f09ebd316dafe59f92e135133ebfee4d642d33d21ee106f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/te/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/te/firefox-61.0b10.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "58ccf32e884cd7d2a2258e12f3cc89f2e56e5bdd367aa44b944a656d03732d936a4e64d308ac10039bdda92ed491e3369241e72a189b936e9fe718c3ae373af6";
+      sha512 = "f864c6c416ac77fbc541b3c0371189c0d46adb38ef87823a47ec56828efc87f43edc4bdc74d0bc12d9a1c3b02bdbbc4d2072ac9ae06225bca65ad4ee1202533a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/th/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/th/firefox-61.0b10.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "04afab7b77c679aacba048b73b39b661f47ef58327fadfc0e22d7d86111e3c43fb9bd63e13c0c71b3b789d2ae9a24f939eb046acd189b5b88677868fab24a6d5";
+      sha512 = "91483b673a8d32210a3b0ed14d8289d5bb5ac99f938de80f5dfcb0d880507637744d3caaa77f28eee639cf98ea82ce0013792b2067234d2013a656f31a22f3f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/tr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/tr/firefox-61.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "9fa6f4cb7de48647aa239192d3fbe97d40f5d090b8fa47c11e76cce479cb4838b28345642215d1ec049b0bc76f334895c387beae513593347cd262f9cd830eac";
+      sha512 = "6a6f5447be163eb93430529918d241e8f0156b13dcec6a25d1ac209cad073d54920c623363f5e4d402603b4dfba5f1a4be4bbe128207d17afdf372f29e6aa6d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/uk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/uk/firefox-61.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "418df497b4e51af407fbed1ee83bd608cd1fe128a2d3f24a3663e57d3c2675c025f25fee213aec73b9f805cf3e88b8bb979dfb1e18a998b2054c666092e52b08";
+      sha512 = "e0e5b3c58cc76896e959db56d716b00e905f7fcf6ce9a55e5232c7cbe18e1c973a87769462945d7a740b2077a398b6f6cd619f7a9cca2ea5b9839048190efb2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/ur/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ur/firefox-61.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "0483583dcd3f4b25357bfd6807b757b139096ddfe68752e65dfca20521e3e6c12b66f50562954d79af1377e45e4e59748adf070b6ec20a424467017757885762";
+      sha512 = "2ea257a82bfce1c2bb3fe4175fe53c2c01aa6eb0854b4c66db5bf4c0466858ed87c8c5bef081977d87d0f38d3682ad24104ba6ba96983f7b02414a39ad422582";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/uz/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/uz/firefox-61.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "64ab03909d03ac497bdcbceb0c17ddd6b4c57ac453ce9125ca28a9458116617737c413f293e42b83c27c998b9a2352b20921d0c3ca5cf9dbd7bee717541568f6";
+      sha512 = "471abe8a5fbb78da0eb791161aa6d10cbca5ac40344f76dece294010a94bdecce15a0ee0382f9e1f21cf6e2805f439af5153ce1d0e3a913901bc15d3df7b5af2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/vi/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/vi/firefox-61.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "faa55bacae7b3c97336e3a1e4352fa32f504392b56d42d16d4d544083ab3e9d26503c28b3066298f7fe11bad4dc81e52241c72558984b2b4b85f88ac1f4e8ec6";
+      sha512 = "689cbf4a4e727709364758264bcf9ba7870b831cb5779ca4c601b5cf5931341169468a04819a680ad7be4a1ab03506e379d77d1926c830e4035dd9581c997394";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/xh/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/xh/firefox-61.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "92866b07535bfafebe35c3f193bc0f61c8952f1fae00e66530abbabf9268ad3d06ec44fca332677163cfa4832c6990b70aecc6a80c1448012a9695901185085e";
+      sha512 = "baaa6643e5eb9811b47b50a798af8774fd69fde12a036144840887bb49ce248650672942a57b83177d330aa33d890b3b49349dd85d0e7506673f480d54fef80d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/zh-CN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/zh-CN/firefox-61.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "7b02a18303661b4e3d6ad941f25d454fa322e95af520c5ee9504364dbbdd04f498c195099559bee74313efef02f46e259f43a54ef8036378ca27611316970b18";
+      sha512 = "5fe8264f5969c30e4eb356382e4518a3e49b7d58e2a880dbd9e2d7eed12455892a1ac06b8785cdb6f7cac7948876d43faea8ac8c67d8849563de260ae155e1f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-x86_64/zh-TW/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/zh-TW/firefox-61.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "0d60e2c69bb76bd26e4522e4a216d05e47f822147c84b360bbbb246a1f9f4cef3f823c066dbfc35be660060027af4dc0eb1cf4bad9904ce32a40799b7d616237";
+      sha512 = "df1f3757986cee6b2dee6dc00525e72e58933d5a9db7214dd098a11ef51041da8fb39025c39eaa052114eb4216f76a1109d682591bef19d7b4a6faea6335d489";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ach/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ach/firefox-61.0b10.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "21c5e60f9536a360222d9d933bc71f152ad115379e897257c56fdc9162c681f98d612e40c5a877ca859e3353b8a3ae193d7c938c262ebd548c3741e04d83da89";
+      sha512 = "f8629cf29ecd95f3f023c71e7ebd75c088876ad593179b95f583e627db872ed34b490af5da2251eefba9549ce0333fac0e3257089f76740708aacbe3fb3caee8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/af/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/af/firefox-61.0b10.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "6899e468cb5412ab0d9e29e0160239987839b897b878ae2f4b0ddba13f89e62dff716f454e23635882aea74e1c833259a88013b787e4a908feb74626ae31f163";
+      sha512 = "18d2d2d2f8e808ff8c4ef0c0f2c58ac0e170e1cc244c3b06ca30581f671ca9cf749c066c249460242e81d516763250ba6b70cd31b96370df7dddb02db88fabdc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/an/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/an/firefox-61.0b10.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "7da4f066cfa181d81f792db0f6772f576306248ecf68b7ae7bd43989db243427a2c81dd3488fa0fddb953b4d3680f2bc1802f8b0c459d99e6df791476f83c905";
+      sha512 = "73702c3e0820d508291848b0894b0d53d89a7fd798a0b0aa4155e956c796f5d8444656c8288378ffeb24988207da9ff74a71931538abbe2c339ad4ede86e38fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ar/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ar/firefox-61.0b10.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "1c317e4fd9aa4fa0fab8abb7b3f9b38822a4e4ed84c513e4c6714f1726e450fdfb5945b2954820a13079975b96275352b43a1bcbfcb69a17cb2bb241ce0a67b7";
+      sha512 = "12daf00fefbe27b5388356255a6d67307dbf43bd326d294735d9838a8b2b58cfe2deab391b3083d281e56a4c2f25c110283109e05579946b995978a61f4cadf2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/as/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/as/firefox-61.0b10.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "5ff20af423a327ba0ed9ff700c8edc2d543c791593125bdba92f513a26826db749b58bd25afd8dfcd05a4edf312c3326bbd9e8aa63a2c5592c3ef828e27f5836";
+      sha512 = "3f769a9769202ce3334cce7dcf9fc4a2798f2d8572e99eb5324d042bd71f865b1a8b27819a6854a1ee91163b6cda82eb6bfe8c174f2cae2fa5f8be45f4e2d54d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ast/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ast/firefox-61.0b10.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "fa45afa676ab9fad755b3cd256f2d11f9700719f1ad48835e07b870c7604c7c14730a4e19c4e9244b284c64bb668642fb4fa0207244e0543baa5d2387ee9c846";
+      sha512 = "f6a2e1c64d834692d1b15d653a1e6c05d0572e635e3b0231d36a3c0dd58f3cc4994af6d5e025c0ae6a715eb318f4eccd00ccad7c3c097996a8bbac79bc100274";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/az/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/az/firefox-61.0b10.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "19351061671bed7347ccf3977feeb4faf250a0c86e2eadca80fe5ed06864f081c76cb16456420bbdd53295f529f61cabe9a2aeabdb2dce1add087bf1f0916b16";
+      sha512 = "786b490e0df3788435be32252568cc8978c5d06dc2b6749a26026a6b0d62660825b6ee35a0b01f0c1b0757267a403c150dc963899a67f2a57e6ddecea1e5d4a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/be/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/be/firefox-61.0b10.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "d5a765a34705dabe43aca3fc5216061e9f17615b8e54be2de34db766f23c6ecd62781a8d8cd18442c5a41191545f72faab2f6330a5a0e160dc1306e30bebbc26";
+      sha512 = "92c487200f1cc9189ae1cca82e28225f9c30d9c63ba022ab78899a41887af3dbb91ea6a534231e080e4ffb9c867849cc30b234e88bf368540efd1ba619c4ca3b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bg/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bg/firefox-61.0b10.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "1958969e36cd3b63071725fed3bff2bf9489290d380e690d9b09a6873cccae3233b967cc666fe9639f85ca194003830c91763c0373a9e015897cb5744200eac5";
+      sha512 = "7bc40d3bae027e87d7f08a542e814edde2f99fdf777e6e02f5161742bd3cf72f11801dfa92a89b4d9b75b03ecd4513cf90d6ce25547a110045f6a94d35006911";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bn-BD/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bn-BD/firefox-61.0b10.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "9d4d1c24b0336d042b404103f4f3a59d073c6ee612ae669ca667d1cac57b0f936a4d2dcead956dca5390b910e2141c2c9ecfa7b526edf1581bcbe1fb99d7ae32";
+      sha512 = "dd9c399f39e50df48bb642859d78331b41f77d4132cb4fb93ce0c609c6b900b50bae2a370169543682769b96d75b31c795b545a2ba003c6609e2bbb170a62b3e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bn-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bn-IN/firefox-61.0b10.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "0e87d8792d4ae45a9f5188065e3fade5dca047eef5e4670451468cd9deff4064a9f206d4ffc2fcb231a97f19ecd7604d028e577069a48bd447d3b27baeebd03a";
+      sha512 = "2683a0e7ea89e2eabc8749686b0c4c37f13c40521927a091653ad8ad129bdd3da869562cbbcecade3b686ad1e111c7b8aae69770d67c7a5dbca7d510db1aa45c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/br/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/br/firefox-61.0b10.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "44872968154009726fe0ab81620a8ff65b67dbc3b8e2191c63420c793c5bca3bf7919f3b53afef048fa38b698ab13fe718d5d91b1d03e0e6f7921ce8beea4d06";
+      sha512 = "a7c69e38aae2303785ddde5e50dcbe0c6474cf52f0e58241674671be67cae286442552b68b3fd6f5b83d60298228dc942050cda13f34347ec8bdf2900b88cb3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/bs/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bs/firefox-61.0b10.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "5f10561b78d6b6932adaca728bbdadb2143ba88fa149678811f74435cb312021d2a5da4df6081dbf08dfb203e3ac68a0833ed4eabb8982cf5965db02116fe3f8";
+      sha512 = "abde203fc0b0f869224b2006337f57c59af85e4216b8a7917524c9de5b23ea8c65539e7b58568b5c6ea8831cc6657b3b15a4fec73e3a32d0a67a82c8f04aa8bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ca/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ca/firefox-61.0b10.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "8b59ba083d00a16ef0a0c38cffdca64102bac770d9095b0bfa0cce55fd57c38c0a74cf41d1e66838806d57709082659eaf462de167fb55bc3d3b78f24558ca05";
+      sha512 = "d5fffc89c2a1312d71d289d17cbe8d5f388c1dff3548fd2df835e1941fcb968900f24acb5c4bae35c714fc05de41d885455666da834edb3f86f06fcf4c65a230";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cak/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cak/firefox-61.0b10.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d7758e213d282976b50885ad10240e594f762d4c5f0643e5146ff4c0b289da645d9e1d41206162566175147f83a6589be19f64010625b0941b5a69eb39d387bd";
+      sha512 = "809ed3e4d2a3d8a58d30aa5230ca37e0de470a3fa81e56c7a0f1f3ac03471a9ac96d7a11b3340ed86e1b9973a73528a3eb564146103b63f5127280e0354ce883";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cs/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cs/firefox-61.0b10.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "97dcf8fa04df58333420358f3dc30291e5d2eddeecb7e4b1f956e4508ead0dd5ef83dda2725eed02708ba8d9c4fca3f8a13b70d86858f3f011a616d80a816b7d";
+      sha512 = "689d9ccbdae7b47882c73f16fa9e448e7d9e205be973b50bd70bfb2c8095a41452a7d2795f3c2b8d79d06afeb0505e0b6e454ab42ea4fc87f3975cacb062208d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/cy/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cy/firefox-61.0b10.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "d463de168e07810595ba7171454576b0882ac28d9bfd3b9e315b00ace8cced905ea26a38dbb83417e8ee0df2b03eb3408d810df13ba68735758c6d14f3ad8536";
+      sha512 = "53180bcc3e3b0c2cc8f57121314a8d843af2bd609ea3ed0795f8ae41b22cf6fdab116220b038995a360776b1f97dcd9a9ba0d823f577e715c252ba35b967519d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/da/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/da/firefox-61.0b10.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "4ed7ece1863ad330bc74f14185b9dc94d62a9dcaa83a94c6b744b9b8caf2e3d21fd2f0590890f961205062a8b5b79d5ea43c1e67f23b328a125d581535247e06";
+      sha512 = "bc19b87813b0dfcf9b7a7b00b5ed0cc4017a9102ff7ecede8dd4d00d9f24ab5aa528f4e5024317cdd5f36a8156685eaf2bfd9418abc3c542666bee8ad236368e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/de/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/de/firefox-61.0b10.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "bc1692b0d04e5b3fcf6dd09d5dbed9b2f40d0558710944819a394ece4cec9488e1cc8f588bdba2d2cdd8f35513f75afc47c07890e81a242a039e407bf029e72a";
+      sha512 = "06cc483c97ed2c7b357b4f56252569c7ac92bf44f4bd389fba0a0a7c735af8ab889c6b79c08ea477fd6c0300c4f8be62cdf7245f6adb54448da993c9fe34d99c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/dsb/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/dsb/firefox-61.0b10.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "4d6c29e5a52822d4b1d747f922cb117d068e4a55c281df4f563c478776d250beb66091bc67d65e5d584e93bab6f01ecfd2d30013c7b0e0bede1184f88c96263a";
+      sha512 = "4e835d66dc8a299cb3ca0ff8435b302a4be8b72d858bac6d2747ee4899bd7c1b5a4a9bd4e6e7b8c649be890c80307b84888ed61073fdef0df8f0e3ffcec1a151";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/el/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/el/firefox-61.0b10.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "00baf5f4164bd0a9bfea3b9d94976688dcab170f8c7a79fbda00cc026ba58ff293d258e50f40105bac206373022d7354cd51d56fc8252b979b6d1f588e57c7c5";
+      sha512 = "edbf71dc77fbbe34abc6946ef30c360a37df3057743966c5d01a8ef29e1abfc7715b2b2c8fd9dd7e3753d42437b7795a05e75fe32399a843c2573d78bd50af54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-GB/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-GB/firefox-61.0b10.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "5471902249f97c29cd66ed2703356f1e79a81c7f33eea14634003e335578fc087032abe2f032b763031db42a7564007c3acfde9ce6e337c271f0babab75fae7e";
+      sha512 = "d70b96ba3ce553c9b67cc4fe5e874d1064c14b592e032f6e9c15ef6e753ddeed8cd419b6aa1dc53b275accc7059ea76e59109059f79ffc5f2594ebbc6d86e6be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-US/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-US/firefox-61.0b10.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "2bb21a3726725c861492d501876e6236dcfb1f718d61fa12f50fe512c1a391f61db16249ac49b95fc6ff8f31a12de3b70cdb43cc8c40f2210f0fbaf93b31bd85";
+      sha512 = "6fc73ead9aa8f1555d13ad49bf9176056fc24452d40368e77541cfb0d24fb0671abbc5664bd9839ffaefae21043ae3c5c6da31d17368240088b332977cc07b7b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/en-ZA/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-ZA/firefox-61.0b10.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "c357161871ecda52551d9961dc22d85aa310fbff1eba00203efba529e3760c9cafaa7aae93cf84ef8f122f1ece4fa2f6660ee72518c1ee72e38c967325a41d03";
+      sha512 = "372ca800a57cbe53ba4c4c792f85597b1e196d452a611d26e14d328f6c36d846f2db0e80d686f3aea93e6dd352253220d4fb98f508944147e425cf682d65b807";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/eo/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/eo/firefox-61.0b10.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "951e0247b0da69601be706dba8ffc7d701a9c10020ef70e37632379281a2259e02c6631da634c6565bc70d0248a7acd1aac961b030c2d141889e0228b8fd59d1";
+      sha512 = "d74d6071a9345470dbbbb8502818ce6349283d5e3682d687d43c5dc0f79d7c0c3b321c950568c4f4b85d5d415911cb3cb900a05caf2dd9c0f79c75eb67930703";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-AR/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-AR/firefox-61.0b10.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "9401ba099715e1dc977a5e912ca6886f0af7a7a715fdd8275e7cbd383a94ed35dac9919f281fe0e20481ca31d0cf5c321b4dfb09d0318a0e5c9244d3823c15f2";
+      sha512 = "c2ee16f80b733d49e5e466ae07b52915f48516dbbaea5eb16b814dcc342d5df43da35066727864222fa4f779009351ea957bea02a25eafb4add1a6bc2b10ed07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-CL/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-CL/firefox-61.0b10.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "8e204b19ecc12c8273414d14b68bfbb48ebab18eb8c76e77682e3ae28eafdb063755d13ab5d7798727cd71107b588cc39f8f2e33d01d5418434a212bcf38af60";
+      sha512 = "d175ad469da71f969dcdec57241b9258b9b40f3313d8a58d7c9883a2cc8207edbacfe441a8cf347c82a29d52dda40b1b02ba2770653d853f1c3f7423f81a8916";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-ES/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-ES/firefox-61.0b10.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "6c970d1c90c2bc1da19df2beeac9f7ef19bb075812a3dd33865bb4f3d0d26cda5d0645a432f0a95cae0bcf6cd0f63229f7288cfa729b4ba71a1a177ca6b5e1c2";
+      sha512 = "11191dab140fde70f88769a84c3aec15453bb555468a51e3e10cd61dfe0df2a375c49ae35a104bb5a160822c7c341654728f811d9b630c02e6e7d08667dab38c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/es-MX/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-MX/firefox-61.0b10.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "5130a89d187dae0b622e557fff536e6e01ece8b139277c78f8ed57abb6a402cb24171170cf1f1585758389ebd17876835f80a103028e699837475261b85b00f3";
+      sha512 = "549988f41e881561d98092b3c772c02cb2e8f1e6ba67af6234d074f7f451aee48ab4b0618e237a147d44f869e39aaf701610f54a8f1a7fc2b22fdccd714b9c00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/et/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/et/firefox-61.0b10.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "bb967d8ca372464218b3f38c8e7b66660f0a40eb95c067e3d020dce9da168cab14a9437392a0feb5a3858f2cde9f51678b28537d42d1a05cc89821c7bc492dae";
+      sha512 = "7683d28bd7fffc66c428ddcfd4ea9d95d744f27e5ed38192ded65a482ff1b67a7477e5c107ae7cfe7eeedbf6a05a9248855a70d5093d837943504c2292db4fea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/eu/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/eu/firefox-61.0b10.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "ec1de732e07863f6b89c35e74c052df882b877c557abfcc53b69617b3269f99d1747334391befa85591b46350fef57202276eed04a97495406f356eb6c428d05";
+      sha512 = "b85b2aa1d2e98f56ede47a2138e50d5fb68fd88da92a69325ca408646908090ee660b01ba6fff62e8c0bbb80d68b9e554ea3848ba51ba056c25ba9a8886f2589";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fa/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fa/firefox-61.0b10.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "ea12b5e6c090e2edbe1b25438bf07f21edc9f4f63a4b6ddbe10465ec6351664ab591c51229fad8c04017456e6ac495ff06820f976fe433710a2f4f386c0cf004";
+      sha512 = "6d96d873a670432e8a4252784965c54f1f8a2b667a03834da653a23bb2abd5213b92ca90767dc4f2857aafd97d42d2ba7678ab76c294c848778211bc51ab1742";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ff/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ff/firefox-61.0b10.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "92d15a1aea67cae4c4c1ac9b5b084f186502006f8850ff6daace5d43cf02a1169fdefc5ce55f86fea356cd965290b263e2cb1fe13450482a7fdb4836cf18e77d";
+      sha512 = "bb6ee71aa9d7ad5672936cbeeca36abbb024b4a7e0558f72f8270a7be4109c5cc6427743dd5fac5d723ee8b960008ec5771f8306c0e7e7f60e170761eb92c2cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fi/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fi/firefox-61.0b10.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "1de8cd725fd50fc0f551b8e5ce7c68d295826cecf36539a64dcbec8f1796c87597a54f4ddee365392c92c21d18c460e3196d0b308232cc7c18fb26518b2318e5";
+      sha512 = "ce1593a3a16db7264b6d249315aa6f16c0f7bff93a3ded473c79f3fc8c95e9594155b0f56d67582c0f090f2763d9354560d92414f1442a14f95ba314a29e1f63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fr/firefox-61.0b10.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "caa72eec283e962aa8bf9df0350ccb31e62859e894adbd8fce82b7bfe309cff5d2f66bea006baad34b93b5861855ac21c512ef38a0321ca49b196b21433e2814";
+      sha512 = "e35269bffd06dda7e784ef2be57c20757cf1b2d717a73fd940a297ff1c4939962accc33893454301c86b3803cd1cba5913d2d0d606293ae8ab56a3ba8911301b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/fy-NL/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fy-NL/firefox-61.0b10.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "1e709986af8046c51c380ea2a1763cecb0f050074b4385e5e2814044cdceac2829dff1efe8e692dfd40d2c3d943ab5235ead273b052422e2a8c053790ac659db";
+      sha512 = "b76c49eee827039ee2c5c479e425d71e18e9adff7f609f027f842de3c359650ea0d74f1f143d1c686da36c9e688600faea589c241a83587e13b8291b4d67ba00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ga-IE/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ga-IE/firefox-61.0b10.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "91fa3b71f34c068b7c54ddd36feb53f3851040d85de34cbd5a28f5946cd3bfa81e98224035d6218fa63a1f584cacee9728e6167eca3ccbc25916f8b6bf3c917d";
+      sha512 = "ecc342e40471565eb2cbb8855afed5561e5bdacad623431a474cbb85b8be7e0087b78660082251d0da58a40d628005e4e6417c186e4c60a30d16658a7b945738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gd/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gd/firefox-61.0b10.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "db99f01106489e4c1135c4a34e86e9215fd280819d739d75c902b295513e294cc270e07a4c85994ce3922c5a1081e2e127431c6d8a72011281543f1069157dcf";
+      sha512 = "ef6351f8456da39ef7bf4a2d85bbd828a0fb8c65ec3b2d123426809c5d6bf1c1da99291296e7bfc74069c0d1cc1db4e8a1425545f9f9530e7b4183fd6f25ecd1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gl/firefox-61.0b10.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "e68c2b71e55f5caeaf34a46d2ffa6f50d7d19b04cd4b6b0d097cade0961f9b53571acbc5ba4eafe7af1ced8437f7d442432061856325fec6aa6d3b679325070a";
+      sha512 = "6783198c822e4c9f246e4420b79b11470a2fe6edb2912ddcbe479a407f54a209f6cebc83bce8ee7f1363df802b5bdd29f44c5e12f587469237c35574240748ee";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gn/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gn/firefox-61.0b10.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "9635821b0e53b384de19f77eb2d34312f8a68bfe5c128096799cd7f80e18d43d66ffca6d576d73c1ae3817ec7b979b168fb55e905cbbc4824b08bfcd93ea5af7";
+      sha512 = "2f2be59d8caa2b78aafda07da4a1a2a0599bcea50bb99ab9b3049e14a81febdc0f72b506a79555d6b58ccc62e2538424eb35d018b3fa25961b3d783937abd1fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/gu-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gu-IN/firefox-61.0b10.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "73084cb2163eea8bd7325793287267185d38f2c83d1b803fb02f218c5ade82f6a5d78fb25d74418ae358ab90b8dbd413204cfcb732bbb979f7111f2e6480472d";
+      sha512 = "f4ee493efaf81881e76664540847571f7eef4dfb764b0e92b4437404d83d8cc7a8696ab0292b9603de49847485b469be6a22361b857922ab39352a4b76a3fcc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/he/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/he/firefox-61.0b10.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "12ccf678a8c6006ab70a0681779be3de7420a01d6b418559dc7f0b6cad40270bbc082f9fdcd03ff83ae06547a8743106d8be7a5e5378bec751d32eacca709f51";
+      sha512 = "7cc947f307711338fe9d4b57b580a7d33901e1c262a7d003ecf29e94b7fb3907ead9af4fc96117aa44c6aa829f42ab8e79c50e7274cf4442172433c3899d8d33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hi-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hi-IN/firefox-61.0b10.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "d457133bb210748e6aef9a588dc345f440330c2300bcd961cfaffee0d9b0e7e2728a7194638096c62b7ec736fb497b1865f7a2da1a9f87422ace4b37261856f0";
+      sha512 = "d49040bea058cc92c81db6438e6a631e1c0ebb8c27993a06ddd95c20648e3d3e0352a7424a8748cbfffa22216cd06263f78d13b69ddcb9821a9b7bb01d540695";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hr/firefox-61.0b10.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "629223cb5a84acb1bc9dabefffa489590a4b6be55f64a6c639f9196ddd93f2d51b5d154ee4488a54a87785093c0b046f03f1a8aacbf017ef4daa0237c14f6812";
+      sha512 = "b76cc94c9792ae728f8bdd284ca7e1102e4130bb78402052a748d26dabff4b0233c302301ec9b6b4076bc939fbf931fb0303f9e7f8881511e325b69d86955d44";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hsb/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hsb/firefox-61.0b10.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "e3a2ae377fcf74a29c216e4d82e969993af27bce553050d7318071eeefa921524aa8e3bda4e06391fd0017d5b49b17858bfefbba76e1dc03c3061899eca8f68e";
+      sha512 = "3843d8c6fc92aa99259f9f32778e35ca436fa3d36965a175a1b964e9d3fe0bf9834bd8fd3cc3c65755260e0d39c5c21a7d88f54a5f1c81938890ae82545f5291";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hu/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hu/firefox-61.0b10.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "e13549b23549abb978b1bffd3653348c982f1cac38d69d16814e1e6cf3b7ad07b29a4844f2ba5d76a1018b0819ab889fa638f662d47cc63e258f1cc065a44a26";
+      sha512 = "eac3443ecc5d37fb3a357247bb5a4dc1fb0807071a57ee6c649b1405100ee728cb7e476eda792bb55acc96132708a652b6e83eff0e764f2c6ca9348f54c41cc1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/hy-AM/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hy-AM/firefox-61.0b10.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "70ee2755b76813e32f9c986ddd81cb23945bd7a25593193c0243ee6eded7141e4657b1549dc0a376f9e46b986fdf9605e6690463549cecf3435507c0e2a8c65e";
+      sha512 = "aecb0ad35bc320216526a7bac0794825f6f266972c4c291a4e97f81af747bf462f05e662e9d5bf77d1090a6bb65adefc5a985dd71f32319cd25cfd0e465a7791";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ia/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ia/firefox-61.0b10.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "37ac67a3ef2b9a2ccb23a2cdb4557b38cd7056808bf1cc620aea664d51406fb24e7bb623b74b8e14282b3b20e3ddb3e8547ac0daa9e4f844e5eb275e01479205";
+      sha512 = "a26fe81ec4a5b8d6164f1dda9d70eafbc2e1e9697fce29d7de9076f0fd25d0467a5c9c02002d51066dd0a3ff427a627d18735f4bf520d1c861ac77c0357717dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/id/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/id/firefox-61.0b10.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "e679dcbaec7aca833f3a4cc8c3f2f371d804983a43ac8a5f08911873ea688c2c1847d89f27897b76f16f75a4dc93998c565f1eb78285b5b54a216f19322fc889";
+      sha512 = "c28fffdf9662c0e8e3ec972dd9ac7245be0f4097c0694a6688b7cc422738cfb539fd15753b59b2208f904e85ab037698cd21d08b26c0d9c209088c13b0e91f8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/is/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/is/firefox-61.0b10.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "b17f433ea41533e3820479c8b00ed9967f21255cffc130015cfc69ec050aafe4952c5c3e112de845092bfc74ea5f3e94d6af788c82ae86028398a4c8ec809395";
+      sha512 = "24fb7c5dfa3ccfe0ab012c3c8c26b5be1411ca8a9204b36c1592017cbb6712396ed589b9c0050b3843e62d31aae51083c54d2c53175127d68dbc3b02958016f3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/it/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/it/firefox-61.0b10.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "1d91fe9523aeadf7c9ef7561d7996607cc58b0a18ab73204343d2a05ae754a1e0b9dd388d2734a8e81a77aa8069c7e07ca9e178060fe73532e550ed430c3068c";
+      sha512 = "e32baeabbe7e0b6b02b8b6c7ae1f10921ca05f97b4bab73610ef6164fdefe126651a9bc1e7a00afa42ea5ff163ebe1a4a04394e11e9f5c8a2f78df464180a073";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ja/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ja/firefox-61.0b10.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "47efd7f3c63a41b638236bcdf523fa174a5db944f1e7debc68f5e456955d910ab66dfe885a516f707610c6c05c3b126dcbc3f5010688b18f86af90fb92f0e122";
+      sha512 = "024f8684b1b87f3c27adab5132cc6371a0e56b405a131b67a025f047b5077fe0c4f41b82b2f88c5583975fd96cd11be4de3befa63c71e1ca209938e1d33d5890";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ka/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ka/firefox-61.0b10.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "bf3603ab02401915155dfa32f6aa009777615835e21464ad39a4a7f17bccdfd21a707eb9e8eeb23194df7fa8aaed80071b54b589bb8f8e1617d3520f06bba4db";
+      sha512 = "50db5a65147cac7d9805bf90e35d9cec8d5364a1fb97d7ba0e094a8396adca1ebd928469347fe7eef619620e41461f3c115ba3d2687c04c06d990d8d0e5a0f65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kab/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kab/firefox-61.0b10.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "8301ada1fd1ba2ffae4a2edb6882ffdd022f93a0b3e1c8ef739bd7e3053d9530ea177877a7263ae6c21aba8e467746e40318374375423516f206d9f3c953e999";
+      sha512 = "0d6fd66316b6df70adfed1f896b7b178832b800ce54db9512a8f344da6095722c29d7cdac29c09c0ae02df6225f8f76442ddbb630a15a6f996023b118f581d59";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kk/firefox-61.0b10.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "58f789dd68b8974c9237dfa4754811dfa4e3fb7ad1f41b0936b19bc990d28b010397b4f6e71fc4b1633080475a71086dde1b9719b07d281b51112672069ca690";
+      sha512 = "1e620226f3c81d18013d663dd3f186617222fb75425687b0f07e1bdd35fe42f7889bc826c9e726324cda6045350a24e623a83f637acd2fb4577df68b56b64068";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/km/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/km/firefox-61.0b10.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "f7fe0f0afc75196e0ffef3110956b8ca3def1949541df36b965b776b95c884622df54db098a1aca3a9fc9818cb5e4af545f749bd8f7a815f8ac4917bda6c0f8b";
+      sha512 = "9770c32624919d8fdd215fd8023e5bf80fe15e79e641421a0b16fee9060872a1807364ec400e574eeb59017d43e25cbbaf8bec8574fd473d4c8cc78c596730a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/kn/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kn/firefox-61.0b10.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "fb4b19d2f48b9977ea8b9e0113be90be339f3eceb167a7c6ed34e6cc47ad8fa74f933ec35f2971c42bd7028810450426aee692dc167f10404935fbadc927d2df";
+      sha512 = "f2b45d0195c68091a04cc921070ee31ea410faf2013546800612c9ecda2e999a763f58589d36aa5076cc834d0d31e5d58e3624e24dffa2483d8b889965b9fbd4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ko/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ko/firefox-61.0b10.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "262f678940aee5583264a1ace147d3a3dab52a4fce1687d6dbac31835701f3f28e7302e89e7dc064276a3fefc348c8136d27ac7649c06d556f71e314c6cb3ee0";
+      sha512 = "55be6785f4f76e42e94d263499641c7c883b4217ab0f0846ebdd00019425510a64ed2f16c98b7e3bf86834ac35cca012fa26cbad62ffab8b889f287caaddcfd5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lij/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lij/firefox-61.0b10.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "01bf9f12281e35432d2c548490b0d45bd94294415453f5f5e5080b734f9804c13fac581786f213d8812c3433b5f085fbd91fa51b8ec5ab2719e1c8c522988355";
+      sha512 = "587ce487c9e90a190405ca58efe6537e8138c9726a07d1d4de5911856ab040b7924df5a8474f64a76748f64fc1f35d9fc3018e06977d1047cb7fb55f0bfcec00";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lt/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lt/firefox-61.0b10.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "ea61f60c91b79e06bf2ce3ff18206ca4410928ddbaf4bcc3e873be60f4b9d35a2a987df852c18eb098d51cf7ad853c19de10398246e40c518de310a22deef4df";
+      sha512 = "7ec86498c6e720a77c49a109455df7c9b31b9d1b69cec8a735e605503094b67dc4e38948d6e4e861ba2aa1a8bc680c8619281e5e2ab3545c987ab3099ed211f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/lv/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lv/firefox-61.0b10.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "73d96a7957b4a2667c25e9561a499616ef5d87f564fc48e49fcfb59686648438bddbc06bb4b19af879e3ce8607d7742bc0c84b585456044642ba2f42fe1eef5a";
+      sha512 = "b1cce9d06ac3eeaed9a92f291c98a2b2011ebbe4afec4fa1afc95c6ead74243078f26f46fd2c07ff62f7b856b7a1c366fd1b302b18c1fa4b5bd1ae8aed49a54a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mai/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mai/firefox-61.0b10.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "dc7a015d1a7d63dd31c3c3a1ae2b4aa4a6e63a58a46f9b8bcd33c21e1b80487580ff5499536424af31290f556ddb35b17e161ac956b9c8dc821b998b56edb021";
+      sha512 = "70380e961c5f2063024ce0d77571b8bbb8402e991ab8fd69fdf9db749f09d4801f74cd0271e2bcff55dec196ef646d061a633d93f3544faacfb4c045204755bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mk/firefox-61.0b10.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "94b89adbd22884cd96f21690aaf70d1271df04555218ca3180d3571d546adbe201eecb2f93aa2e0613187c780089a569933c0b0fdab1ef22f4be03fd39e5b868";
+      sha512 = "e6d5c3e8dbf60768bc2c4c32b552550ffb954dfc048e393eff1d68d6b246d64e874c42149fcd20d4a706090698ec85c6ddb0da7ff10bff4dac861d31cc5cdea2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ml/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ml/firefox-61.0b10.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "d4bafc665e1f06daf14f320e24992052f1875ca0267d7bf9915052f202f3e506130a97d82343ed9be784636a9725efd9c5a286d9e91149120f62a01ff86a7057";
+      sha512 = "0b5854b257ea50a31ccc9fb5956f45b71aa70e9078771fcb7c005c8cbc6ebdf38c381e6ad7fb75717ba961dafc5639567c2b6a717076f9a97b952b231c1a0b14";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/mr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mr/firefox-61.0b10.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "43a7e1066df8f854a2af7dea6240ebc14abe09c51bd3ab96f5b2e050f2c138826f302c1592f4e6652e5541380aa3b126f2b70d7cc83abb8215cac6cf2c0f27a2";
+      sha512 = "630e53701b5ce7a7bde0090987c5b3aede1725da4dbedde268c1eef7e3250e35e8295376b666a5d099681d601d4a7262e21da30a12553f1e7c90b4971c5ea528";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ms/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ms/firefox-61.0b10.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "c38b25895cb2486dc5de1d4f759cb3660f81084327ae66166582ca2f39e1783edb1da374162e7b3e28d9519bbaa8995f2864748a3b2170404d47d265f08f38c0";
+      sha512 = "c1f0efdf8e94b101975b0a8b15bbd71a02d555bf9c12c0f937045a2e271597aef69e588bf75c714826cc7eef61c43fe046a4016619d4a63d488faffb9bb16f63";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/my/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/my/firefox-61.0b10.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "968fbafdf4eb8cd71de1cb276f253eb4c6a7078adcb4b5e1af294e764c4fa37a9397023ad35a41cfcf34097fc6fe20d73e664fb2695cd1698e4fdac81a59f9ba";
+      sha512 = "cea65de645dba0943c85583e9bb63f923d06f3ac589c812b93eceed995baffb4569f14c45e38c93aa9762929b70087e0dc9a4866ca8d9fffa5ccac8644472cff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nb-NO/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nb-NO/firefox-61.0b10.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "f49509695435c0ed75bef24640203d9ddbb2ee799c5c47341938dfdaf5238c3d0408dbc00a88c84e38b73d31b955066aceed1545119508ed9d510e5551c3c145";
+      sha512 = "90ad8e0c6a4b99ea3751dc0ed4cabc74ec1ec6dd351920f574c1adfacc594fa1a21bc3f7ca77d4abcbc2ab8f8024e3c13a0a9b0fa8629c66c08770ee473ade8d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ne-NP/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ne-NP/firefox-61.0b10.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "3b5df92eb3684622a3991878ae0231674dc33947d350b05c978edf4ef3649ef6e69b773cda17e8b5d3cb8f8a604c59c19e6314c889081e5ca98e1bf44fcb1850";
+      sha512 = "874dcc2335c3381a8c49ccace54ab7fe0b2c370c1d5e43ff2fb94c93ee74c89de476b810ac71960fc34edbdc735070a140ba3bc919112191b1258810478e8212";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nl/firefox-61.0b10.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "3439ef70a3a099be344f71242e2ad45fb89f3cb63ca762a770aa34499b7d0d7dce33546fc987263c309b5c504a04026b2f7ddad327bcf3906b095e965292e6d9";
+      sha512 = "61c9843955b6472eaefb13b39cfdcb1371cb249c8cf2e01471b1d27f76273a329c7b578d7ec868822f9ca0ee6818e5fc3210b6d1e4bc625a256316878e6c5baf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/nn-NO/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nn-NO/firefox-61.0b10.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "e405691dd3fe2ec0e6b54e055da8ca60945068dbc669a95f2baf64348b15ef57785f4add6fcbf4d37aa06f7f618d63db3c794495ff5bcc944def442045188e74";
+      sha512 = "8c1ed92350e2dd2aa8051a4491ed064f0c790009d29b2512f1ddb52d8b5e31564dfc8678006c4baf3a4c42ee4d94fb519f4aad59adfe65a5a541e9d4289e4db2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/oc/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/oc/firefox-61.0b10.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "3200665e5382d1df831f46ff61b92df6086076bc025b44564169f233a7700ad2ea8f3e1a36c98ce88e2e99860a72d6092c8887180f5d89a1840a3e5a0aab4b2a";
+      sha512 = "e11dccf5877b57d996aa75f8bef15a4a914377296f16dba1b59416971f4fd84e4ea43593139e43481351bc038d7a66d53066140fd4436f61d3e0cb1f490a5f87";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/or/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/or/firefox-61.0b10.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "a05c84cbc6ec9afa919a6061fd0cf637ba5337c407ef52bed903f435d2fb7d3e7c3f77298b04bd80f13d0153fc771a1cb3f91a266883e0fa796674880ffcc03f";
+      sha512 = "ec297c47b7920cafedb0ffe3cc173a3c2fc986d2f858ee25aa159b8be7f05051cee280590589d7aa712fd3eed376947297ff0afbd64e187f1a19c8bb8a1295a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pa-IN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pa-IN/firefox-61.0b10.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "b71d5784ad5f26cd299141f3192d1cd6d1484caf4c5eb45f90b96237b5dd5d6333076a9817fcc62b44e5e05bcef6340b1f5bdf908582b02a798bdd3988d59370";
+      sha512 = "4ca71e223e4c05877bd6cb86f9e3677b60ec22a6b362138818e9fa5f7b2fcc2eb166193e068ca0a6ce3b536ccfd1e6a216505d4ef45b2e90ecc83467e7529443";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pl/firefox-61.0b10.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "8db81ab58c019e0abc4a8c3b58c41681a248d64369b9c1a48336e7f04c3bde8af996b30de8cd440e914ac1ea221fbf000df7ec87352e22720cf99883e6d64290";
+      sha512 = "69e1296216820c09a299ddab644ace678e7041b86dd2704cf8ac2fd0b548733815e1cf35abf324b0a2614615f96c58073d55074dcb7e66a16c5f7b55f562520d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pt-BR/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pt-BR/firefox-61.0b10.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "d2d499aad2075d23c3eca76b4af2c9d25c026deaea5cfed9e8954cd1248a63f051d0a670d043d8dbe4a8dd62b001f460ec7141e4f00769c1dd62239124e777be";
+      sha512 = "283dbbc4fb72e0a14889c97e93f48686229d4ca6f2a548ac664dc4fd75bac1f22f5d9f16f6c3bc1a3b83b0c8567cf2856be7fb23e3241a334de80d037b2ef85d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/pt-PT/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pt-PT/firefox-61.0b10.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "5dd6a7e1d3dbdef7c3987744a3dc79dc9beaa2ceb59291160e43b2691151653f98303c2bd7023302fa86986887aacc780e31fb563238e08e748a05939251599c";
+      sha512 = "d996775b48dd48ef7c0eaf5387bec85968329acaf6ee4360c5213773dea5a932693a8bbe6b70e2b92d3b387db767bbf8120cbd37257707dad06b9082ddb89032";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/rm/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/rm/firefox-61.0b10.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "43b7e42163f582f496bb1fbedf95d822c3a6d801e3695001e9d9265f73cfd4101d1d20a8ea5e8f2051b3a4633365af393b044559440924f825d4fb7ec8a700df";
+      sha512 = "11927162d0d7e3d6dc05be2185a25acd768a99874d9440b4d28b9044c58f19ba6c7a1608bd8a9bea95a5751bfab71a665fa59fc180ca07abd3f86f1c2eeffc8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ro/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ro/firefox-61.0b10.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "6d9928ae2f79c3331a7ee308d1b140c9b379de32cf5f3d9eea14e8dd820968264b2e7e90f53fdee0a64fe01fd4d343025a0c83f68def289c53fef97707880e05";
+      sha512 = "4ebaef0d862281919e04abecd02173e1eca253944e6a9dab0ff301a0ffa521e93c755d59c819315eaf910d3b75cdd149a01f7302880b44355a0436e27312cdde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ru/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ru/firefox-61.0b10.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d591bd1d9b178f620f8ec139759aa6825bb13483fdd622149f6106deca780f802cf19f016e3ec9fdcc71ada5bd34ef6a8d4a79a26676769cd2b020e0cdfced81";
+      sha512 = "01f5e519412f16c4bc21ef86acf287c74f34a51067c7263b5b6e6a9514849167e441dd23ff9f01d9710656189ebe123493f10e5e202d5a690591b84d828ac6f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/si/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/si/firefox-61.0b10.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "537ca6ac0cdcffa041e9cfd4817132e5ed6278c21d600d52a0075242ba7681838c7850a795e8953783ddb4c723b1f470ae723c148dbff793b97929c0ffa97175";
+      sha512 = "f8199341e89ac1816254fdf0d4b37c1c069c00e193d8c56fc44a6f1e833d174f57b498bd21564989777fe383cb0912800a53dbabe4470402a2ced7cbb8459b11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sk/firefox-61.0b10.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "8ec463c0b4dcdc8af09a68b161aa0b44b554e0520d0f59b2ea0b97a0fce0f6fe4084f5d942f51480ff55071f41a06e0e90aba78591ae63b20a255ca51c4c1fd6";
+      sha512 = "a3ac61681567f715405b299bf9b772cfea1574b62ea9529e8df6a8155dddd2e26d51419b641c94329d462a21fc3a207dd99ec600b3764d198964f21481cca690";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sl/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sl/firefox-61.0b10.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "6e48bd9b56110db58b78c7f46009be572ac5d70d6423732f42e583f5bf1f07bac88a63381d800ba419d502d5deda242cd65c2ebb493975f75ad4b73d23d3229b";
+      sha512 = "a28730ba99c9f63494b4dc955dcf231e412179a4f1bc405ccaa63325ed34720906c2c6e90e0534544a5328bf51e9b485b91d54e72ce73c873633f1743c1f0734";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/son/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/son/firefox-61.0b10.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "5d38f57f414ffc2497ae08a58ae7458c57f8c346d97e39c6c5f1d6400fe6c2243461a822080932a38873a1f0e497730ef0df74de78017789dca5290e92d2f92f";
+      sha512 = "a5ce8085b83ba048211bfb9b2ac173701e0cb1363db8e027430b63f85ef58c845e5775ec1e82417a73531e789059f0cb30583df446fa171fa3df9bedf40cc84d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sq/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sq/firefox-61.0b10.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c8e1ea770afd0e69816d1ca8f9b12b440c99227f2e5c49d6130a8eaef9988fa7735fd05087dc28b428dd977ed6035c96895ce6b9091a08b0a3b2bf0ea38e97fb";
+      sha512 = "a4ebe4df7b56338d188aacb98ed58d6eedeffb6bd00b139525bf906e2c3c40316a7e9ab9b1792f02fcc19a7767786ac1f8c0ac8fbb39c7e01868d4406eec7ed8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sr/firefox-61.0b10.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "56585f6e9a6581d6ba21e528f8806ae84dc24c0ddddae0137a5563fdcf049cf2250d9fe7996e5ced947c285a5765cf45543bc442cc8e0c7c56e3abac277e7fd7";
+      sha512 = "461c94b2a15854e5e3ebb95b2f6fac0a3591fe1b57b2e163e4fe8918ad5736cad1f085bcf0083d2bf2f0cd5cc811c6b7822dc9398adf906496ead870f4b1688a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/sv-SE/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sv-SE/firefox-61.0b10.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "7db5b6a4d25e30641743cce3cf2eb366c8a6fac93d421d6d14d9e71a1f3a772a737223b8954e2b3c41b7ae20079e2a8d24976c4869ec4d3abf085ab784c9f805";
+      sha512 = "1ac1fdc2b3eb80a172efa60aee46e8a3a5bbee3f1bbd62e23bce5503daec25beece76ae22fc78ffe18aeadbb29417453cf3ef19f6462e4f1c3544842e1304d49";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ta/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ta/firefox-61.0b10.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "860c256a0893ea5f4ef0876997d807afe24d7526dd62811c079b3d2c9678df187ccee3020277c172d50077121e601345d9a654e0f6eb2f28ee8e8dd2c96678e2";
+      sha512 = "664b18d6203a7cb1934d2b813b2269cca5eec2e68cfc4a4bbf129107edc2f7a48b6d75cf5cb41abe6387a4c26eedeb53b837ec8aea7eb67f3ee5799ab8a08e47";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/te/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/te/firefox-61.0b10.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "365d1f7d61441056e3240d30ffa8f507337b44fda9b8a1c04fef5ef32613535e2ef29061a4570c1239fc3dd7183892eb896acd823c5805d77e4167adef077e77";
+      sha512 = "241a510e2f520a7afcb84383435587533e62a14b2771cd770763db99a047746aee5249b9272ab34d96160613efb7b3769c8911946a4ffa3f0156570a7a6c4310";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/th/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/th/firefox-61.0b10.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "5c3e4320848c716e90d1426f76d43a9ba44660eeba55fe6d08d7e1cdc88987f9d2051141c5b3bb45bdd977a8793c9cc1713fa8ae95c23c04cbebab546d9a86d2";
+      sha512 = "9621e6f3d49264b07f913b1e8161e0146fea15900dceaa98612b0c32b81059094af5af2321d61300168644421e72486ea6ed9336ac9cbd752e2e192a155e532e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/tr/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/tr/firefox-61.0b10.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "6bd8bc524a9fba341f0be0c5c73897279e4e70713545ddd279c1ea760f87f6a14e8d7ce72486a26bb2e42f6238f4e4806b8fb7b0cff04a89a564c0a6c5188055";
+      sha512 = "f26c74a359d71f41bc83320010b356b22a5a8224521c37fb7ecea3d4f79fc4583bcbf6d44d183c04a30b25bac3832635b721c7566052c496f41718f4b7b6694f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/uk/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/uk/firefox-61.0b10.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "187869732f00a8fa29c3c7ca1437f90ac795a155578a0742a802e6fe3c5a03de54da7d6fa0f4a85bde009bf346e2f505f4485be86bf34dab0b221ed9a6505009";
+      sha512 = "106284d66f26ea36e906b24dd204e98a042ef89b749bf059a1d44fc088aee6c08e269257489ca6f215b390606f32af368954bb2507a714f09e3a0fb0a9271900";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/ur/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ur/firefox-61.0b10.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "ba2e4d0e603dcafc3d18881506ea5d7cf9493c116cb5771d2b00b455ee37453dfcba4df30401c390d86377252ba6f961b4ad92c0b777eaef23081443280ce3e8";
+      sha512 = "4c90bb8536fce5f052d258f280270e0cf032c257bf7eed70d63f52949f52fcf8a961424372e726cf05026f5a569060e0065231462bcc8626a0f3d166d52434a9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/uz/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/uz/firefox-61.0b10.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "4cbe45129e0b4d7961cdc911dd6e220b5be7a82cfa8b86d688d0c0489c872f50c3fa34f2fc7b6f645a81511a1035ffc9e0bee695d87f512039416b0541698ee9";
+      sha512 = "961c106641e47281774c1285bfe8cca3897fe7f3c78d961ac943e35a5d98398124f55d44ea09cef2820e60ddce1f87fa31c498ff005d66603e8d101590c17fab";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/vi/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/vi/firefox-61.0b10.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "482feb16a9cf314d4aa6807bc31477e5149a7a769f060e69f9e9a94ef97cc6e951cc585f9fa8bc93b2614f02904791a027de81034174e9a976d33f01bb111462";
+      sha512 = "b4cdc14821cc62d09c47026483efd4d2050541e97384d36507eb2d74efb9d98d52ede8c8569365e4b4c49c738ad6e2a6f0252aba6d72abfac90f22a2d8afb8f4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/xh/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/xh/firefox-61.0b10.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "be46161eb9c7cafc89229afcc4242d4780738a040316ee61297bd97b45531fcf84c0df329fbe97bfde4f6b42c63e2715b43a24c93855b1493140fbedf24ab158";
+      sha512 = "f2dcdeac743f291b62db80012bad4d5c1233f63579d59d59df85da2584afd1ed50d30f7101748067fd8b59007a5565482b14c3328f1f40066b5098864cc0e99f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/zh-CN/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/zh-CN/firefox-61.0b10.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "0be0d3df82ba0623ab20386c52bdfbe95f9348ce9eebc7419ee825e8bbd27dcda3e16d0258fd30deea814c4133130842ec9108ebc3c5d79f2138ec3ce3adfa90";
+      sha512 = "c7fe4c6796cb2f05d8ce1af83474cfda7ca6a58e995a6c7908e6bd9dd353fab5235831ccd44d89ad7e8c4bfe2caec9d9d9eca71660d447f0f3d9662b56efc4d5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b9/linux-i686/zh-TW/firefox-61.0b9.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/zh-TW/firefox-61.0b10.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "67f180a71b1cce75d24b9dbf78b914202dcb2e03e7e659e1538b6fe1e3d833ab188dcea70ce5ef99c9fadd7d8ddadab3de808f002005ea2de9038cccfe20e25e";
+      sha512 = "a2e0792cb72b5c69030732707008347d04cfb455f2df45e25b10f0e78d3fb94d4a5c5a4b2d92ec7566501c60c3ae952438b0285af588daa1f7e6e0a4ada269c2";
     }
     ];
 }

From 5fb1cfb77bf5330d33ad5ccf232c2fdd1cf4eaf7 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Fri, 1 Jun 2018 14:38:54 +0800
Subject: [PATCH 2931/3370] nodePackages_8_x.pnpm: wrap nodejs.passthru.python

---
 pkgs/development/node-packages/default-v8.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 701648da2280..0428095d97c6 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -24,13 +24,13 @@ nodePackages // {
   phantomjs = nodePackages.phantomjs.override (oldAttrs: {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ];
   });
-  
+
   webdrvr = nodePackages.webdrvr.override (oldAttrs: {
     buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs ];
-    
+
     preRebuild = ''
       mkdir $TMPDIR/webdrvr
-      
+
       ln -s ${pkgs.fetchurl {
         url = "https://selenium-release.storage.googleapis.com/2.43/selenium-server-standalone-2.43.1.jar";
         sha1 = "ef1b5f8ae9c99332f99ba8794988a1d5b974d27b";
@@ -66,6 +66,15 @@ nodePackages // {
     '';
   });
 
+  pnpm = nodePackages.pnpm.override (oldAttrs: {
+    nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
+    postInstall = ''
+      for prog in $out/bin/*; do
+        wrapProgram "$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ nodejs.passthru.python ]}
+      done
+    '';
+  });
+
   fast-cli = nodePackages."fast-cli-1.x".override (oldAttrs: {
     preRebuild = ''
       # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore

From 26a01ede6102752bc947b1c4fb2cb957c7b130d8 Mon Sep 17 00:00:00 2001
From: Michael Brantley <limeytexan@gmail.com>
Date: Fri, 1 Jun 2018 03:12:25 -0400
Subject: [PATCH 2932/3370] perlPackages.Git: init at 0.42

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b89b8403dd22..d4a3ee1234e5 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6549,6 +6549,20 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Git = buildPerlPackage rec {
+    name = "Git-0.42";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/M/MS/MSOUTH/${name}.tar.gz";
+      sha256 = "9469a9f398f3a2bf2b0500566ee41d3ff6fae460412a137185767a1cc4783a6d";
+    };
+    propagatedBuildInputs = [ Error ];
+    meta = {
+      maintainers = [ maintainers.limeytexan ];
+      description = "This is the Git.pm, plus the other files in the perl/Git directory, from github's git/git";
+      license = stdenv.lib.licenses.free;
+    };
+  };
+
   GitPurePerl = buildPerlPackage rec {
     name = "Git-PurePerl-0.53";
     src = fetchurl {

From 73bc4734dc2b737c9f7bd44bbefb68e4d12723f9 Mon Sep 17 00:00:00 2001
From: Sebastien Maret <sebastien.maret@univ-grenoble-alpes.fr>
Date: Fri, 1 Jun 2018 11:15:47 +0200
Subject: [PATCH 2933/3370] cfitsio: fix install name on darwin

---
 pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch b/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
index 7ac051326517..af38abf329ea 100644
--- a/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
+++ b/pkgs/development/libraries/cfitsio/darwin-rpath-universal.patch
@@ -15,7 +15,7 @@ diff -ruN cfitsio/configure cfitsio-rpath-universal/configure
 -            SHLIB_LD="$CC -dynamiclib $C_UNIV_SWITCH -headerpad_max_install_names -install_name @rpath/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
 -            ;;
 -    esac
-+    SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
++    SHLIB_LD="$CC -dynamiclib -install_name ${out}/lib/lib\${PACKAGE}.\${CFITSIO_SONAME}\${SHLIB_SUFFIX} -compatibility_version \${CFITSIO_SONAME} -current_version \${CFITSIO_SONAME}.\${CFITSIO_MAJOR}.\${CFITSIO_MINOR}"
  
      lhea_shlib_cflags="-fPIC -fno-common"
      ;;

From 5feb8d3a9b1f9101f4bb3a7ba862d79d6e925f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 1 Jun 2018 10:22:01 +0100
Subject: [PATCH 2934/3370] godep: remove in favor of dep

upstream deprecated this and recommend dep
---
 pkgs/development/tools/godep/default.nix | 30 -----------
 pkgs/development/tools/godep/deps.nix    | 67 ------------------------
 pkgs/top-level/all-packages.nix          |  2 -
 3 files changed, 99 deletions(-)
 delete mode 100644 pkgs/development/tools/godep/default.nix
 delete mode 100644 pkgs/development/tools/godep/deps.nix

diff --git a/pkgs/development/tools/godep/default.nix b/pkgs/development/tools/godep/default.nix
deleted file mode 100644
index 3503a6c2c625..000000000000
--- a/pkgs/development/tools/godep/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  version = "73";
-  name = "godep-${version}";
-
-  src = import ./deps.nix {
-    inherit stdenv lib fetchgit;
-  };
-
-  buildInputs = [ go ];
-
-  buildPhase = ''
-    export GOPATH=$src
-    go build -v -o godep github.com/tools/godep
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    mv godep $out/bin
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Dependency tool for go";
-    homepage = https://github.com/tools/godep;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/tools/godep/deps.nix b/pkgs/development/tools/godep/deps.nix
deleted file mode 100644
index 10071fa51955..000000000000
--- a/pkgs/development/tools/godep/deps.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-# This file was generated by go2nix.
-{ stdenv, lib, fetchgit }:
-
-let
-  goDeps = [
-    {
-      root = "github.com/kr/fs";
-      src = fetchgit {
-        url = "https://github.com/kr/fs.git";
-        rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b";
-        sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly";
-      };
-    }
-    {
-      root = "github.com/tools/godep";
-      src = fetchgit {
-        url = "https://github.com/tools/godep.git";
-        rev = "f4edf338389e6e2bde0e8307886718133dc0613e";
-        sha256 = "1jdza8kwnzdsh3layqjzy9dnr92xdg3kfhnzvqkq3p50vsdims9w";
-      };
-    }
-    {
-      root = "github.com/kr/pretty";
-      src = fetchgit {
-        url = "https://github.com/kr/pretty";
-        rev = "f31442d60e51465c69811e2107ae978868dbea5c";
-        sha256 = "12nczwymikxmivb10q5ml5yxrwpz9s8p6k4vqig9g9707yhpxrkh";
-      };
-    }
-    {
-      root = "github.com/kr/text";
-      src = fetchgit {
-        url = "https://github.com/kr/text";
-        rev = "6807e777504f54ad073ecef66747de158294b639";
-        sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698";
-      };
-    }
-    {
-      root = "github.com/pmezard/go-difflib";
-      src = fetchgit {
-        url = "https://github.com/pmezard/go-difflib";
-        rev = "f78a839676152fd9f4863704f5d516195c18fc14";
-        sha256 = "1bws3qyy572b62i3wkwfr1aw1g2nwcim2sy42jqsvh9pajjsf1vz";
-      };
-    }
-    {
-      root = "golang.org/x/tools";
-      src = fetchgit {
-        url = "https://go.googlesource.com/tools";
-        rev = "1f1b3322f67af76803c942fd237291538ec68262";
-        sha256 = "0h2yarcvcgg1px20r8n58psra1czv0sgly5gins2q3wp25iql6gj";
-      };
-    }
-  ];
-
-in
-
-stdenv.mkDerivation rec {
-  name = "go-deps";
-
-  buildCommand =
-    lib.concatStrings
-      (map (dep: ''
-              mkdir -p $out/src/`dirname ${dep.root}`
-              ln -s ${dep.src} $out/src/${dep.root}
-            '') goDeps);
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7c718fe8780..16df78a7a116 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13890,8 +13890,6 @@ with pkgs;
 
   golint = callPackage ../development/tools/golint { };
 
-  godep = callPackage ../development/tools/godep { };
-
   godef = callPackage ../development/tools/godef { };
 
   goimports = callPackage ../development/tools/goimports { };

From 82d837cde2f438eb6ba1c3f5ae1fc8f78152b8c1 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Fri, 1 Jun 2018 13:13:52 +0300
Subject: [PATCH 2935/3370] bat: 0.3.0 -> 0.4.1 (#41348)

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

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index b869f1e634c5..7a3231ce85c2 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, pkgs, rustPlatform, fetchFromGitHub }:
+{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }:
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
-  version = "0.3.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner  = "sharkdp";
     repo   = "bat";
     rev    = "v${version}";
-    sha256 = "15d7i0iy5lks3jg9js6n6fy4xanjk76fpryl2kq88kdkq67hpzfp";
+    sha256 = "0fiif6b8g2hdb05s028dbcpav6ax0qap2hbsr9p2bld4z7j7321m";
   };
 
-  cargoSha256 = "179a7abhzpxjp3cc820jzxg0qk1fiv9rkpazwnzhkjl8yd7b7qi3";
+  cargoSha256 = "0w0y3sfrpk8sn9rls90kjqrqr62pd690ripdfbvb5ipkzizp429l";
 
-  buildInputs = with pkgs; [ pkgconfig cmake zlib file perl curl ];
+  nativeBuildInputs = [ cmake pkgconfig zlib ];
 
   meta = with stdenv.lib; {
     description = "A cat(1) clone with syntax highlighting and Git integration";

From 23e9126e755c221bb8bed69730e259fb20ec44bf Mon Sep 17 00:00:00 2001
From: patternspandemic <patternspandemic@live.com>
Date: Fri, 1 Jun 2018 03:17:03 -0700
Subject: [PATCH 2936/3370] neo4j: 3.3.4 -> 3.4.0 (#41338)

---
 pkgs/servers/nosql/neo4j/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix
index bc67e7eaf430..022a1a9ba10f 100644
--- a/pkgs/servers/nosql/neo4j/default.nix
+++ b/pkgs/servers/nosql/neo4j/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "neo4j-${version}";
-  version = "3.3.4";
+  version = "3.4.0";
 
   src = fetchurl {
-    url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz";
-    sha256 = "072pk0x1iyg6kasjah8qpki2z462qp0rvgn93y6ngi6zvrpdlbyc";
+    url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz";
+    sha256 = "1pccw3av72qqpyfsdyz72ab1lvc7fqraw14vi3hq67n96rsj017a";
   };
 
   buildInputs = [ makeWrapper jre8 which gawk ];

From 86990d26bad0d1ffafc7295eec595dd0325576e9 Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Fri, 1 Jun 2018 18:23:01 +0800
Subject: [PATCH 2937/3370] scite: 3.7.5 -> 4.0.5 (#41345)

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

diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix
index 61b28e02949e..76a00c44ebbe 100644
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "scite-${version}";
-  version = "3.7.5";
+  version = "4.0.5";
 
   src = fetchurl {
-    url = http://www.scintilla.org/scite375.tgz;
-    sha256 = "11pg9bifyyqpblqsrl1b9f8shb3fa6fgzclvjba6hwh7hh98drji";
+    url = http://www.scintilla.org/scite405.tgz;
+    sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 85952d850e40d40f801d6653db24448fb375d8e3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 21 Apr 2018 18:30:12 +0300
Subject: [PATCH 2938/3370] raspberrypifw: 1.20180328 -> 1.20180417

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

diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
index d00f1b148374..344d224df948 100644
--- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
+++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "raspberrypi-firmware-${version}";
-  version = "1.20180328";
+  version = "1.20180417";
 
   src = fetchFromGitHub {
     owner = "raspberrypi";
     repo = "firmware";
     rev = version;
-    sha256 = "19h4lv11idy268pyrq21c5gsff77d5xr9xjkpmzfpcq34gjh3x21";
+    sha256 = "17mnnhni0wgdnc3mw60nfhcj9v6p5dwcqkwnbpvzczab3r2hziji";
   };
 
   installPhase = ''

From b71f5830fa5a56251ca675a26e7066ec5d0a88a7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 3 Apr 2018 02:20:05 +0300
Subject: [PATCH 2939/3370] linux_rpi: 1.20171029 -> 1.20180417

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index d85583242213..d6b174a43d4e 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -1,8 +1,8 @@
 { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
 
 let
-  modDirVersion = "4.9.59";
-  tag = "1.20171029";
+  modDirVersion = "4.14.34";
+  tag = "1.20180417";
 in
 stdenv.lib.overrideDerivation (buildLinux (args // rec {
   version = "${modDirVersion}-${tag}";
@@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
     owner = "raspberrypi";
     repo = "linux";
     rev = "raspberrypi-kernel_${tag}-1";
-    sha256 = "19lb1gxz21x1d5zdznzqfq60kxg7iqmyl6l0mb9qg2vrl8fcgnxk";
+    sha256 = "1xgisvmcq50lpnd4rpqhaw52399n0rx2n8mp6k0bf8qm1g3vnza2";
   };
 
   defconfig = {

From 964bd06bbc35bb26d9b0166d085f43cc9e8e53f0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Fri, 20 Apr 2018 14:58:32 +0300
Subject: [PATCH 2940/3370] U-Boot: 2018.03 -> 2018.05

---
 pkgs/misc/uboot/default.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 4cf1748bad44..d9cc1c077d36 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -7,8 +7,8 @@ let
   # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05
   sunxiPatch = fetchpatch {
     name = "sunxi.patch";
-    url = "https://github.com/u-boot/u-boot/compare/v2018.03...dezgeg:2018-03-sunxi.patch";
-    sha256 = "1pqn7c6c06hfygwpcgaraqvqxcjhz99j0rx5psfhj8igy0qvk2dq";
+    url = "https://github.com/u-boot/u-boot/compare/v2018.05...dezgeg:2018-05-sunxi.patch";
+    sha256 = "1dfv4s1f71iv80vjxgyghv4pcwjv4mjphk75a8hfl3jdbpd66d36";
   };
 
   buildUBoot = { filesToInstall
@@ -21,21 +21,21 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2018.03";
+    version = "2018.05";
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "1z9x635l5164c5hnf7qs19w7j3qghbkgs7rpn673dm898i9pfx3y";
+      sha256 = "0j60p4iskzb4hamxgykc6gd7xchxfka1zwh8hv08r9rrc4m3r8ad";
     };
 
     patches = [
       (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch1.patch;
-        sha256 = "067yq55vv1slv4xy346px7h329pi14abdn04chg6s1s6hmf6c1x9";
+        url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch1.patch;
+        sha256 = "0xvw16mp6mm36987rd5yb8bw0n5b3p1gq35wch2gbj15wx55450p";
       })
       (fetchpatch {
-        url = https://github.com/dezgeg/u-boot/commit/rpi-2017-11-patch2.patch;
-        sha256 = "0bbw0q027xvzvdxxvpzjajg4rm30a8mb7z74b6ma9q0l7y7bi0c4";
+        url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch2.patch;
+        sha256 = "0q1a5l5rfgddncxrjk59qr1f5587dwbvcf6z15bsfl2invs19m2b";
       })
       (fetchpatch {
         url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch;
@@ -100,8 +100,7 @@ in rec {
     hardeningDisable = [];
     dontStrip = false;
     extraMeta.platforms = stdenv.lib.platforms.linux;
-    # build tools/kwboot
-    extraMakeFlags = [ "CONFIG_KIRKWOOD=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
+    extraMakeFlags = [ "HOST_TOOLS_ALL=y" "CROSS_BUILD_TOOLS=1" "NO_SDL=1" "tools" ];
     postConfigure = ''
       sed -i '/CONFIG_SYS_TEXT_BASE/c\CONFIG_SYS_TEXT_BASE=0x00000000' .config
     '';

From 912e87c45cc4ffbdb80a606d01fe2fa6545386a3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 5 May 2018 14:44:04 +0300
Subject: [PATCH 2941/3370] U-Boot: Add ubootRaspberryPiZero variant

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

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index d9cc1c077d36..9486a504ac39 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -217,6 +217,12 @@ in rec {
     filesToInstall = ["u-boot.bin"];
   };
 
+  ubootRaspberryPiZero = buildUBoot rec {
+    defconfig = "rpi_0_w_defconfig";
+    extraMeta.platforms = ["armv6l-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
   ubootSheevaplug = buildUBoot rec {
     defconfig = "sheevaplug_defconfig";
     extraMeta.platforms = ["armv5tel-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c8acb7cff0e..b7bb3ab70e66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14206,6 +14206,7 @@ with pkgs;
     ubootRaspberryPi2
     ubootRaspberryPi3_32bit
     ubootRaspberryPi3_64bit
+    ubootRaspberryPiZero
     ubootSheevaplug
     ubootSopine
     ubootUtilite

From f49906d80c30dbb37a2d2d188ab9bd9793a4ac3f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 5 May 2018 19:02:00 +0300
Subject: [PATCH 2942/3370] nixos/sd-image-raspberrypi: Support Raspberry Pi
 Zero

---
 .../installer/cd-dvd/sd-image-raspberrypi.nix | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
index 212013b5e289..fe6cc4161630 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix
@@ -31,11 +31,24 @@ in
   users.extraUsers.root.initialHashedPassword = "";
 
   sdImage = {
-    populateBootCommands = ''
-      (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
-      cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi.bin
-      echo 'kernel u-boot-rpi.bin' > boot/config.txt
-      ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot
-    '';
+    populateBootCommands = let
+      configTxt = pkgs.writeText "config.txt" ''
+        # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel
+        # when attempting to show low-voltage or overtemperature warnings.
+        avoid_warnings=1
+
+        [pi0]
+        kernel=u-boot-rpi0.bin
+
+        [pi1]
+        kernel=u-boot-rpi1.bin
+      '';
+      in ''
+        (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/boot/)
+        cp ${pkgs.ubootRaspberryPiZero}/u-boot.bin boot/u-boot-rpi0.bin
+        cp ${pkgs.ubootRaspberryPi}/u-boot.bin boot/u-boot-rpi1.bin
+        cp ${configTxt} boot/config.txt
+        ${extlinux-conf-builder} -t 3 -c ${config.system.build.toplevel} -d ./boot
+      '';
   };
 }

From a8c898be6071c461961b4572afe3b72b7c831fc7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 7 May 2018 21:59:15 +0300
Subject: [PATCH 2943/3370] linux_rpi: More downstream device tree name fixups

Also remove the upstream device trees beforehand so we don't
accidentally end using them if we mess up in postFixup.

Also on the topic of mess ups, make the copy unconditional since they
always seem to be built on all architectures anyway so checking for
their existence just hides typos.
---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index d6b174a43d4e..d869ea090360 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -32,16 +32,15 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
   '';
 
   postFixup = ''
-    # Make copies of the DTBs so that U-Boot finds them, as it is looking for the upstream names.
-    # This is ugly as heck.
+    # Make copies of the DTBs named after the upstream names so that U-Boot finds them.
+    # This is ugly as heck, but I don't know a better solution so far.
+    rm $out/dtbs/bcm283*.dtb
     copyDTB() {
-      if [ -f "$out/dtbs/$1" ]; then
-        cp -v "$out/dtbs/$1" "$out/dtbs/$2"
-      fi
+      cp -v "$out/dtbs/$1" "$out/dtbs/$2"
     }
 
-    # I am not sure if all of these are correct...
-    copyDTB bcm2708-rpi-0-w.dts bcm2835-rpi-zero.dtb
+    copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero.dtb
+    copyDTB bcm2708-rpi-0-w.dtb bcm2835-rpi-zero-w.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
     copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
@@ -51,6 +50,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec {
     copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
     copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
     copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
-    # bcm2710-rpi-cm3.dts is yet unknown.
+    copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
+    copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
   '';
 })

From 52de9e82066750a7032657e6483c39622221c82f Mon Sep 17 00:00:00 2001
From: Maciej Kazulak <kazulakm@gmail.com>
Date: Fri, 1 Jun 2018 10:30:55 +0200
Subject: [PATCH 2944/3370] odpic: init at 2.3.2

---
 maintainers/maintainer-list.nix              |  5 +++
 pkgs/development/libraries/odpic/default.nix | 36 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/libraries/odpic/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 50185280c5a5..a22a1d6d5d13 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2516,6 +2516,11 @@
     github = "MikePlayle";
     name = "Mike Playle";
   };
+  mkazulak = {
+    email = "kazulakm@gmail.com";
+    github = "mulderr";
+    name = "Maciej Kazulak";
+  };
   mkg = {
     email = "mkg@vt.edu";
     github = "mkgvt";
diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
new file mode 100644
index 000000000000..dc7faee93725
--- /dev/null
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, libaio, oracle-instantclient }:
+
+stdenv.mkDerivation rec {
+  name = "odpic-${version}";
+  version = "2.3.2";
+
+  src = fetchurl {
+    url = "https://github.com/oracle/odpi/archive/v${version}.tar.gz";
+    sha256 = "0a52vqy3c27hmcia4x4vhs6z0ha27xkw7fvfa17f7kxs5w84ll07";
+  };
+
+  buildInputs = [ libaio oracle-instantclient ];
+
+  libPath = stdenv.lib.makeLibraryPath
+    [ oracle-instantclient ];
+
+  dontPatchELF = true;
+  installPhase = ''
+    mkdir -p $out/lib
+    mkdir $out/include
+
+    cp lib/* $out/lib/
+    cp include/* $out/include/
+
+    patchelf --set-rpath "${libPath}" $out/lib/libodpic.so
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Oracle ODPI-C library";
+    homepage = "https://oracle.github.io/odpi/";
+    maintainers = with maintainers; [ mkazulak ];
+    licence = licenses.asl20;
+    platforms = [ "x86_64-linux" ];
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7c718fe8780..4b3110113674 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4125,6 +4125,8 @@ with pkgs;
 
   odpdown = callPackage ../tools/typesetting/odpdown { };
 
+  odpic = callPackage ../development/libraries/odpic { };
+
   odt2txt = callPackage ../tools/text/odt2txt { };
 
   offlineimap = callPackage ../tools/networking/offlineimap { };

From 5d795355a0eba0c2cc0a8ccf0d204a3d631637ca Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 1 Jun 2018 14:22:07 +0200
Subject: [PATCH 2945/3370] signal-desktop: Fix a possible crash when saving an
 attachment

If executed in a pure environment (nix-shell --pure) or depending on the
`gtk3` version of the system Signal-Desktop was e.g. crashing when
clicking on a PDF attachment (instead of showing the dialog to save a
file).
Using wrapGAppsHook and setting XDG_DATA_DIRS to the correct version
fixes this bug.

The error message was the following:
```
(signal-desktop:30756): Gtk-WARNING **: 14:04:49.073: Could not find the icon 'user-home-symbolic-ltr'. The 'hicolor' theme
was not found either, perhaps you need to install it.
You can get a copy from:
        http://icon-theme.freedesktop.org/releases

(signal-desktop:30756): GLib-GIO-ERROR **: 14:04:49.134: No GSettings schemas are installed on the system
Trace/breakpoint trap
```
---
 .../instant-messengers/signal-desktop/default.nix          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index da862b715147..fa31b19e6e2c 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype,
+{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype,
 fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
 libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
 nspr, alsaLib, cups, expat, udev
@@ -52,7 +52,7 @@ in
         throw "Signal for Desktop is not currently supported on ${stdenv.system}";
 
     phases = [ "unpackPhase" "installPhase" ];
-    nativeBuildInputs = [ dpkg ];
+    nativeBuildInputs = [ dpkg wrapGAppsHook ];
     unpackPhase = "dpkg-deb -x $src .";
     installPhase = ''
       mkdir -p $out
@@ -67,6 +67,9 @@ in
       # Patch signal
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
                --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
+      wrapProgram $out/libexec/signal-desktop \
+        --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+        "''${gappsWrapperArgs[@]}"
 
       # Symlink to bin
       mkdir -p $out/bin

From 548277d0c7bfa5863c1424e7b603b25093c5bc33 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Sat, 24 Feb 2018 18:41:07 +0100
Subject: [PATCH 2946/3370] bulletml: init at 0.0.6

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

diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix
new file mode 100644
index 000000000000..240cc057a821
--- /dev/null
+++ b/pkgs/development/libraries/bulletml/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchpatch, fetchurl, bison, perl }:
+
+let
+  version = "0.0.6";
+  debianRevision = "7";
+  debianPatch = patchname: hash: fetchpatch {
+    name = "${patchname}.patch";
+    url = "https://sources.debian.org/data/main/b/bulletml/${version}-${debianRevision}/debian/patches/${patchname}.patch";
+    sha256 = hash;
+  };
+
+in stdenv.mkDerivation {
+  name = "bulletml-${version}";
+
+  srcs = [
+    (fetchurl {
+      url = "http://shinh.skr.jp/libbulletml/libbulletml-${version}.tar.bz2";
+      sha256 = "0yda0zgj2ydgkmby5676f5iiawabxadzh5p7bmy42998sp9g6dvw";
+    })
+    (fetchurl {
+      url = "http://shinh.skr.jp/d/d_cpp.tar.bz2";
+      sha256 = "1ly9qmbb8q9nyadmdap1gmxs3vkniqgchlv2hw7riansz4gg1agh";
+    })
+  ];
+  sourceRoot = "bulletml";
+  postUnpack = "mv d_cpp bulletml/";
+
+  patches = [
+    (debianPatch "fixes" "0cnr968n0h50fjmjijx7idsa2pg2pv5cwy6nvfbkx9z8w2zf0mkl")
+    (debianPatch "bulletml_d" "03d1dgln3gkiw019pxn3gwgjkmvzisq8kp3n6fpn38yfwh4fp4hv")
+    (debianPatch "d_cpp" "04g9c7c89w7cgrxw75mcbdhzxqmz1716li49mhl98znakchrlb9h")
+    (debianPatch "warnings" "18px79x4drvm6dy6w6js53nzlyvha7qaxhz5a99b97pyk3qc7i9g")
+    (debianPatch "makefile" "0z6yxanxmarx0s08gh12pk2wfqjk8g797wmfcqczdv1i6xc7nqzp")
+    (debianPatch "includes" "1n11j5695hs9pspslf748w2cq5d78s6bwhyl476wp6gcq6jw20bw")
+  ];
+
+  makeFlags = [
+    "-C src"
+  ];
+  nativeBuildInputs = [ bison perl ];
+
+  installPhase = ''
+    install -D -m 644 src/bulletml.d "$out"/include/d/bulletml.d
+    install -d "$out"/include/bulletml/tinyxml
+    install -m 644 src/*.h "$out"/include/bulletml
+    install -m 644 src/tinyxml/tinyxml.h "$out"/include/bulletml/tinyxml
+    cp -r src/boost $out/include/boost
+
+    install -d "$out"/lib
+    install -m 644 src/libbulletml.{a,so}* "$out"/lib
+
+    install -D -m 644 README "$out"/share/doc/libbulletml/README.jp
+    install -m 644 README.en "$out"/share/doc/libbulletml
+    install -m 644 README.bulletml "$out"/share/doc/libbulletml
+    install -D -m 644 README "$out"/share/licenses/libbulletml/README.jp
+    install -m 644 README.en "$out"/share/licenses/libbulletml
+  '';
+
+  meta = with stdenv.lib; {
+    description = "C++ library to handle BulletML easily";
+    longDescription = ''
+      BulletML is the Bullet Markup Language. BulletML can describe the barrage
+      of bullets in shooting games.
+    '';
+    homepage = "http://www.asahi-net.or.jp/~cs8k-cyu/bulletml/index_e.html";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fgaz ];
+    # See https://github.com/NixOS/nixpkgs/pull/35482
+    # for some attempts in getting it to build on darwin
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a43f084b56a7..079219f7bb4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8636,6 +8636,8 @@ with pkgs;
 
   buddy = callPackage ../development/libraries/buddy { };
 
+  bulletml = callPackage ../development/libraries/bulletml { };
+
   bwidget = callPackage ../development/libraries/bwidget { };
 
   bzrtp = callPackage ../development/libraries/bzrtp { };

From f78f2e10177d1dc929c7be9eb85dd07de9678a41 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <francygazz@gmail.com>
Date: Sat, 24 Feb 2018 18:41:33 +0100
Subject: [PATCH 2947/3370] rrootage: init at 0.23a

---
 pkgs/games/rrootage/default.nix | 80 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 2 files changed, 82 insertions(+)
 create mode 100644 pkgs/games/rrootage/default.nix

diff --git a/pkgs/games/rrootage/default.nix b/pkgs/games/rrootage/default.nix
new file mode 100644
index 000000000000..8b07a38c7bb7
--- /dev/null
+++ b/pkgs/games/rrootage/default.nix
@@ -0,0 +1,80 @@
+{ stdenv, fetchpatch, fetchurl, SDL, SDL_mixer, bulletml }:
+
+let
+  version = "0.23a";
+  debianRevision = "12";
+  debianPatch = patchname: hash: fetchpatch {
+    name = "${patchname}.patch";
+    url = "https://sources.debian.org/data/main/r/rrootage/${version}-${debianRevision}/debian/patches/${patchname}.patch";
+    sha256 = hash;
+  };
+
+in stdenv.mkDerivation {
+  name = "rrootage-${version}";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/rrootage/rRootage-${version}.tar.gz";
+    sha256 = "01zzg4ih3kmbhsn1p9zr7g8srv1d2dhrp8cdd86y9qq233idnkln";
+  };
+
+  patches = [
+    (debianPatch
+      "01_makefile"
+      "0wgplznx9kgb82skwqplpydbpallgrby3w662h52wky5zl0pyijj")
+    (debianPatch
+      "02_data_dir"
+      "12vw60s94by3f6k8pk45k555h4y7gzlqfds0a96nrrryammpgnq3")
+    (debianPatch
+      "03_texture_filename"
+      "1qxkxy6821xvanacf25mi43wj8nf40c1qiyavhc8av798xprpkjh")
+    (debianPatch
+      "04_home"
+      "0s15b0liv40jzjd9l4zsq688ky1yp9b1gmb1xhi3bih4y7q9awdz")
+    (debianPatch
+      "05_gcc"
+      "06ihgbfrklabs7cb6216w1jjb9sglv86iagzhhmyydwyph4fb782")
+    (debianPatch
+      "06_rrootage_highres"
+      "0ifjmh236yiv3g896nfwwydgcnq3njdb8ldah7s3jxp3xkpvwcga")
+    (debianPatch
+      "07_use_system_bulletml"
+      "1sxsl1yzx3msvz8mf0jk1vnahqb1ahq9drm391idgh0afy77l6j7")
+    (debianPatch
+      "08_windowed_mode"
+      "0knx4g445ngilsz4dvdkq69f5f8i2xv2fnmdmq037xd5rhfg0b23")
+    (debianPatch
+      "09_rootage_make_highres_default"
+      "1zqz8s54rl8jmqmvdi9c3ayfcma6qkbfkx5vw0fzyn268wcs022p")
+    (debianPatch
+      "10_deg_out_of_range"
+      "1wr76az4rlv1gaj9xdknzqcjazw6h8myqw6y3753q259hxbq4cah")
+  ];
+  postPatch = ''
+    substituteInPlace "src/screen.c" --replace "/usr/share/games/rrootage" "$out/share/games/rrootage"
+    substituteInPlace "src/soundmanager.c" --replace "/usr/share/games/rrootage" "$out/share/games/rrootage"
+    substituteInPlace "src/barragemanager.cc" --replace "/usr/share/games/rrootage" "$out/share/games/rrootage"
+  '';
+
+  buildInputs = [ SDL SDL_mixer bulletml ];
+  makeFlags = [ "-C src" "-f makefile.lin" ];
+  hardeningDisable = [ "stackprotector" "fortify" ]; # buffer overflow without this
+
+  installPhase = ''
+    install -d "$out"/share/games
+    cp -r rr_share "$out"/share/games/rrootage
+    install -D src/rrootage "$out"/bin/rrootage
+
+    install -D -m 644 readme.txt "$out"/share/licenses/rrootage/README.jp
+    install -m 644 readme_e.txt "$out"/share/licenses/rrootage/README.en
+
+    install -D -m 644 readme.txt "$out"/share/doc/rrootage/README.jp
+    install -m 644 readme_e.txt "$out"/share/doc/rrootage/README.en
+    install -m 644 readme_linux "$out"/share/doc/rrootage/README
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Abstract shooter created by Kenta Cho";
+    homepage = "http://rrootage.sourceforge.net/";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 079219f7bb4c..185a7a3125f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19419,6 +19419,8 @@ with pkgs;
 
   rocksndiamonds = callPackage ../games/rocksndiamonds { };
 
+  rrootage = callPackage ../games/rrootage { };
+
   saga = callPackage ../applications/gis/saga { };
 
   samplv1 = callPackage ../applications/audio/samplv1 { };

From ab593d46dc38b9f0f23964120912138c77fa9af4 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 1 Jun 2018 14:53:30 +0200
Subject: [PATCH 2948/3370] signal-desktop: Refactor the package description

Removed some redundancy (src check via meta.platforms) and made some
changes according to our style-guide.
I've changed meta.description and added meta.longDescription.
---
 .../signal-desktop/default.nix                | 99 ++++++++++---------
 1 file changed, 50 insertions(+), 49 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index fa31b19e6e2c..60c075c2fadb 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype,
-fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr,
-libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss,
-nspr, alsaLib, cups, expat, udev
+{ stdenv, lib, fetchurl, dpkg, wrapGAppsHook
+, gnome3, gtk3, atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
+, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
+, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
+, cups, expat, udev
 }:
+
 let
   rpath = lib.makeLibraryPath [
     alsaLib
@@ -36,57 +38,56 @@ let
     xorg.libxcb
   ];
 
-in
-  stdenv.mkDerivation rec {
-    name = "signal-desktop-${version}";
+in stdenv.mkDerivation rec {
+  name = "signal-desktop-${version}";
+  version = "1.12.0";
 
-    version = "1.12.0";
+  src = fetchurl {
+    url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
+    sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk";
+  };
 
-    src =
-      if stdenv.system == "x86_64-linux" then
-        fetchurl {
-          url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-          sha256 = "19c9pilx2qkpyqw3p167bfcizrpd4np5jxdcwqmpbcfibmrpmcsk";
-        }
-      else
-        throw "Signal for Desktop is not currently supported on ${stdenv.system}";
+  phases = [ "unpackPhase" "installPhase" ];
 
-    phases = [ "unpackPhase" "installPhase" ];
-    nativeBuildInputs = [ dpkg wrapGAppsHook ];
-    unpackPhase = "dpkg-deb -x $src .";
-    installPhase = ''
-      mkdir -p $out
-      cp -R opt $out
+  nativeBuildInputs = [ dpkg wrapGAppsHook ];
 
-      mv ./usr/share $out/share
-      mv $out/opt/Signal $out/libexec
-      rmdir $out/opt
+  unpackPhase = "dpkg-deb -x $src .";
 
-      chmod -R g-w $out
+  installPhase = ''
+    mkdir -p $out
+    cp -R opt $out
 
-      # Patch signal
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-               --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
-      wrapProgram $out/libexec/signal-desktop \
-        --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
-        "''${gappsWrapperArgs[@]}"
+    mv ./usr/share $out/share
+    mv $out/opt/Signal $out/libexec
+    rmdir $out/opt
 
-      # Symlink to bin
-      mkdir -p $out/bin
-      ln -s $out/libexec/signal-desktop $out/bin/signal-desktop
+    chmod -R g-w $out
 
-      # Fix the desktop link
-      substituteInPlace $out/share/applications/signal-desktop.desktop \
-        --replace /opt/Signal/signal-desktop $out/bin/signal-desktop
+    # Patch signal
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+             --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop
+    wrapProgram $out/libexec/signal-desktop \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
+      "''${gappsWrapperArgs[@]}"
+
+    # Symlink to bin
+    mkdir -p $out/bin
+    ln -s $out/libexec/signal-desktop $out/bin/signal-desktop
+
+    # Fix the desktop link
+    substituteInPlace $out/share/applications/signal-desktop.desktop \
+      --replace /opt/Signal/signal-desktop $out/bin/signal-desktop
+  '';
+
+  meta = {
+    description = "Private, simple, and secure messenger";
+    longDescription = ''
+      Signal Desktop is an Electron application that links with your
+      "Signal Android" or "Signal iOS" app.
     '';
-
-    meta = {
-      description = "Signal Private Messenger for the Desktop.";
-      homepage    = https://signal.org/;
-      license     = lib.licenses.gpl3;
-      maintainers = with lib.maintainers; [ ixmatus primeos ];
-      platforms   = [
-        "x86_64-linux"
-      ];
-    };
-  }
+    homepage    = https://signal.org/;
+    license     = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ ixmatus primeos ];
+    platforms   = [ "x86_64-linux" ];
+  };
+}

From c69cc21338d476358af7c794fcdad18f678785eb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 1 Jun 2018 15:06:06 +0200
Subject: [PATCH 2949/3370] tdesktopPackages.preview: 1.2.24 -> 1.3.0

Note: I'm not packaging this as stable for now as there might be some
issues left (see GitHub), it says "Version 1.3 alpha" in the bottom left
corner, and I've only got a "New in version 1.2.25" message.
---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 12b6179f8e1a..50a0d6db2273 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.2.24";
-    sha256Hash = "0rrji2h2a7fxdl4wmbwj053vwy3hhbaphymjim55klpzj86jycil";
+    version = "1.3.0";
+    sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i";
   });
 }

From fd9cfc4db512f41612727a4a4fe0303fe8f67bef Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 1 Jun 2018 17:23:53 +0200
Subject: [PATCH 2950/3370] Revert "itstool: 2.0.2 -> 2.0.4" (#41339)

This reverts commit 48698a0668552a477f4454909ca4455fef0a6d19

It crashes and breaks the build of gnome3.gnome_desktop and others.

Upstream issue: https://github.com/itstool/itstool/issues/17
---
 pkgs/development/tools/misc/itstool/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix
index 129c1c6b3a93..9368a3c1acf8 100644
--- a/pkgs/development/tools/misc/itstool/default.nix
+++ b/pkgs/development/tools/misc/itstool/default.nix
@@ -2,11 +2,13 @@
 # We need the same Python as is used to build libxml2Python
 
 stdenv.mkDerivation rec {
-  name = "itstool-2.0.4";
+  # 2.0.3+ breaks the build of gnome3.gnome-desktop
+  # https://github.com/itstool/itstool/issues/17
+  name = "itstool-2.0.2";
 
   src = fetchurl {
     url = "http://files.itstool.org/itstool/${name}.tar.bz2";
-    sha256 = "0q7b4qrc758zfx3adsgvz0r93swdbxjr42w37rahngm33nshihlp";
+    sha256 = "bf909fb59b11a646681a8534d5700fec99be83bb2c57badf8c1844512227033a";
   };
 
   buildInputs = [ python2 libxml2Python ];

From e1985dcb8d5a5392c036e04ccc2d3f318dbd3d17 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Fri, 1 Jun 2018 17:01:39 +0100
Subject: [PATCH 2951/3370] Add missing ios triples to bfd

---
 .../tools/misc/binutils/support-ios.patch     | 68 +++++++++++++++++--
 1 file changed, 62 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/support-ios.patch b/pkgs/development/tools/misc/binutils/support-ios.patch
index 919a3920727f..74e56d130ed5 100644
--- a/pkgs/development/tools/misc/binutils/support-ios.patch
+++ b/pkgs/development/tools/misc/binutils/support-ios.patch
@@ -1,5 +1,5 @@
 diff --git a/bfd/config.bfd b/bfd/config.bfd
-index f04a993f06..3357022f35 100644
+index f04a993f06..1e24a9d030 100644
 --- a/bfd/config.bfd
 +++ b/bfd/config.bfd
 @@ -238,7 +238,7 @@ case "${targ}" in
@@ -20,8 +20,35 @@ index f04a993f06..3357022f35 100644
      targ_defvec=arm_mach_o_vec
      targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec"
      targ_archs="$targ_archs bfd_i386_arch bfd_powerpc_arch bfd_rs6000_arch"
+@@ -678,7 +678,7 @@ case "${targ}" in
+   i[3-7]86-*-aix*)
+     targ_defvec=i386_coff_vec
+     ;;
+-  i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
++  i[3-7]86-*-darwin* | i[3-7]86-*-ios* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
+     targ_defvec=i386_mach_o_vec
+     targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+     targ64_selvecs=x86_64_mach_o_vec
+@@ -762,7 +762,7 @@ case "${targ}" in
+     targ_defvec=x86_64_elf64_cloudabi_vec
+     want64=true
+     ;;
+-  x86_64-*-darwin*)
++  x86_64-*-darwin* | x86_64-*-ios*)
+     targ_defvec=x86_64_mach_o_vec
+     targ_selvecs="i386_mach_o_vec mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+     targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
+@@ -1402,7 +1402,7 @@ case "${targ}" in
+     targ_selvecs="powerpc_elf32_le_vec powerpc_boot_vec"
+     targ64_selvecs="powerpc_elf64_vec powerpc_elf64_le_vec"
+     ;;
+-  powerpc-*-darwin* | powerpc-*-macos10* | powerpc-*-rhapsody*)
++  powerpc-*-darwin* | powerpc-*-ios* | powerpc-*-macos10* | powerpc-*-rhapsody*)
+     targ_defvec=mach_o_be_vec
+     targ_selvecs="mach_o_be_vec mach_o_le_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+     targ_archs="$targ_archs bfd_i386_arch"
 diff --git a/configure.ac b/configure.ac
-index aae94501e4..4b1121e0d1 100644
+index aae94501e4..2cceb4dad4 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -510,7 +510,7 @@ if test x$enable_libgomp = x ; then
@@ -33,9 +60,18 @@ index aae94501e4..4b1121e0d1 100644
  	;;
      nvptx*-*-*)
  	;;
-@@ -706,7 +706,7 @@ case "${target}" in
+@@ -700,13 +700,13 @@ esac
+ 
+ # Disable libffi for some systems.
+ case "${target}" in
+-  powerpc-*-darwin*)
++  powerpc-*-darwin* | powerpc-*-ios*)
      ;;
-   x86_64-*-darwin[[912]]*)
+-  i[[3456789]]86-*-darwin*)
++  i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*)
+     ;;
+-  x86_64-*-darwin[[912]]*)
++  x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*)
      ;;
 -  *-*-darwin*)
 +  *-*-darwin* | *-*-ios*)
@@ -60,7 +96,7 @@ index aae94501e4..4b1121e0d1 100644
  	# PR 46986
  	noconfigdirs="$noconfigdirs target-libgo"
  	;;
-@@ -916,11 +916,11 @@ esac
+@@ -916,27 +916,27 @@ esac
  case "${target}" in
    *-*-chorusos)
      ;;
@@ -74,7 +110,18 @@ index aae94501e4..4b1121e0d1 100644
      noconfigdirs="$noconfigdirs ld gas gdb gprof"
      noconfigdirs="$noconfigdirs sim target-rda"
      ;;
-@@ -936,7 +936,7 @@ case "${target}" in
+-  powerpc-*-darwin*)
++  powerpc-*-darwin* | powerpc-*-ios*)
+     noconfigdirs="$noconfigdirs ld gas gdb gprof"
+     noconfigdirs="$noconfigdirs sim target-rda"
+     ;;
+-  i[[3456789]]86-*-darwin*)
++  i[[3456789]]86-*-darwin* | i[[3456789]]86-*-ios*)
+     noconfigdirs="$noconfigdirs ld gprof"
+     noconfigdirs="$noconfigdirs sim target-rda"
+     ;;
+-  x86_64-*-darwin[[912]]*)
++  x86_64-*-darwin[[912]]* | x86_64-*-ios[[912]]*)
      noconfigdirs="$noconfigdirs ld gas gprof"
      noconfigdirs="$noconfigdirs sim target-rda"
      ;;
@@ -92,6 +139,15 @@ index aae94501e4..4b1121e0d1 100644
      host_makefile_frag="config/mh-darwin"
      ;;
    powerpc-*-aix*)
+@@ -1697,7 +1697,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
+   build_lto_plugin=yes
+ ],[if test x"$default_enable_lto" = x"yes" ; then
+     case $target in
+-      *-apple-darwin[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;;
++      *-apple-darwin[[912]]* | *-apple-ios[[912]]* | *-cygwin* | *-mingw* | *djgpp*) ;;
+       # On other non-ELF platforms, LTO has yet to be validated.
+       *) enable_lto=no ;;
+     esac
 @@ -1708,7 +1708,7 @@ ACX_ELF_TARGET_IFELSE([# ELF platforms build the lto-plugin always.
    # warn during gcc/ subconfigure; unless you're bootstrapping with
    # -flto it won't be needed until after installation anyway.

From 6c76c4c6d8cfb4575d913367a2088d643914c726 Mon Sep 17 00:00:00 2001
From: WilliButz <WilliButz@users.noreply.github.com>
Date: Fri, 1 Jun 2018 18:25:08 +0200
Subject: [PATCH 2952/3370] prometheus-snmp-exporter: 0.9.0 -> 0.11.0 (#41363)

---
 pkgs/servers/monitoring/prometheus/snmp-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 9fd7ae8591fc..9692354ad8a8 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "snmp_exporter-${version}";
-  version = "0.9.0";
+  version = "0.11.0";
 
   goPackagePath = "github.com/prometheus/snmp_exporter";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "prometheus";
     repo = "snmp_exporter";
     rev = "v${version}";
-    sha256 = "081ah4zyy53plhm6znwrx55phm2ysxzyx7d4hm8zzrv5r967rgl1";
+    sha256 = "027p96jzhq9l7m3s5qxxg3rqp14pai7q66d3ppin19lg7al11c9x";
   };
 
   buildInputs = [ net_snmp ];

From a0797bad2c9ea3781367703bb603ab21e5d64d3e Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 1 Jun 2018 13:37:43 +0200
Subject: [PATCH 2953/3370] nixos/mpd: allow services.mpd.dbFile to be null

This change allows users to specify an alternative database method. For
example an mpd satellite setup where another mpd on the network shares
it's database with the local instance. The `dbFile` parameter must not be
configured in that case.
---
 nixos/modules/services/audio/mpd.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 5f379b392ea8..500a9e35a13b 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -13,7 +13,9 @@ let
   mpdConf = pkgs.writeText "mpd.conf" ''
     music_directory     "${cfg.musicDirectory}"
     playlist_directory  "${cfg.playlistDirectory}"
-    db_file             "${cfg.dbFile}"
+    ${lib.optionalString (cfg.dbFile != null) ''
+      db_file             "${cfg.dbFile}"
+    ''}
     state_file          "${cfg.dataDir}/state"
     sticker_file        "${cfg.dataDir}/sticker.sql"
     log_file            "syslog"
@@ -126,11 +128,12 @@ in {
       };
 
       dbFile = mkOption {
-        type = types.str;
+        type = types.nullOr types.str;
         default = "${cfg.dataDir}/tag_cache";
         defaultText = ''''${dataDir}/tag_cache'';
         description = ''
-          The path to MPD's database.
+          The path to MPD's database. If set to <literal>null</literal> the
+          paramter is omitted from the configuration.
         '';
       };
     };

From 19fa9b2e309877734bb47ff3150e504dbba9d417 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Fri, 1 Jun 2018 19:19:09 +0200
Subject: [PATCH 2954/3370] haskell.packages.ghcjs.terminfo: Bump version
 (#41337)

---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 7a6416b9e13b..c04686734675 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -50,7 +50,7 @@ self: super:
   haskeline = self.haskeline_0_7_3_1;
   hoopl = self.hoopl_3_10_2_1;
   hpc = self.hpc_0_6_0_2;
-  terminfo = self.terminfo_0_4_0_2;
+  terminfo = self.terminfo_0_4_1_1;
   xhtml = self.xhtml_3000_2_1;
 
 ## OTHER PACKAGES

From 44659fcbe162b8dbce50df6fc32ca63637e2f9ca Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Fri, 1 Jun 2018 19:31:02 +0200
Subject: [PATCH 2955/3370] coqPackages.contribs.aac-tactics: enable for Coq
 8.7 and 8.8 (#41351)

---
 .../coq-modules/contribs/default.nix            | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index 7b274812737e..1b310d74b82a 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -21,11 +21,18 @@ let mkContrib = repo: revs: param:
     };
   }; in
 {
-  aac-tactics = mkContrib "aac-tactics" [ ] {
-    version = "v8.6.0-7-g54913f4";
-    rev = "54913f44939623986ce3e01e3faf31efa9059ca6";
-    sha256 = "0bb6y7nqs4gyv1ybzhbdg6hb2hyfxc7bmkg6zl43l14641zhv247";
-  };
+  aac-tactics = mkContrib "aac-tactics" [ "8.7" "8.8" ] {
+    "8.7" = {
+      version = "20180530";
+      rev = "f01df35e1d796ce1fdc7ba3d670ce5d63c95d544";
+      sha256 = "1bwvnbd5ws1plgj147blcrvyycf3gg3fz3rm2mckln8z3sfxyq2k";
+    };
+    "8.8" = {
+      version = "20180530";
+      rev = "86ac28259030649ef51460e4de2441c8a1017751";
+      sha256 = "09bbk2a7pn0j76mmapl583f8a20zqd3a1m9lkml8rpwml692bzi9";
+    };
+  }."${coq.coq-version}";
 
   abp = mkContrib "abp" [ "8.5" "8.6" "8.7" ] {
     version = "v8.6.0";

From 0b1823ff8480451b37837d1612b4bf97c9491385 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Fri, 1 Jun 2018 20:56:40 +0200
Subject: [PATCH 2956/3370] gnome2.gtksourceview: fix build on darwin (#41353)

---
 pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
index caf067532392..b40cb98cbefc 100644
--- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchpatch, fetchurl, autoreconfHook, pkgconfig, atk, cairo, glib
 , gnome-common, gtk, pango
-, libxml2Python, perl, intltool, gettext, gtk-mac-integration }:
+, libxml2Python, perl, intltool, gettext, gtk-mac-integration-gtk2 }:
 
 with stdenv.lib;
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     pango libxml2Python perl intltool
     gettext
   ] ++ optionals stdenv.isDarwin [
-    autoreconfHook gnome-common gtk-mac-integration
+    autoreconfHook gnome-common gtk-mac-integration-gtk2
   ];
 
   preConfigure = optionalString stdenv.isDarwin ''

From 61cec46f78194bf7063b034029b4d1f6760bdca5 Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Fri, 1 Jun 2018 12:22:57 -0700
Subject: [PATCH 2957/3370] adapta-kde-theme: init at 20180512 (#41217)

---
 pkgs/misc/themes/adapta-kde/default.nix | 28 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/misc/themes/adapta-kde/default.nix

diff --git a/pkgs/misc/themes/adapta-kde/default.nix b/pkgs/misc/themes/adapta-kde/default.nix
new file mode 100644
index 000000000000..875973c9d3f5
--- /dev/null
+++ b/pkgs/misc/themes/adapta-kde/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "adapta-kde-theme-${version}";
+  version = "20180512";
+
+  src = fetchFromGitHub {
+    owner = "PapirusDevelopmentTeam";
+    repo = "adapta-kde";
+    rev = version;
+    sha256 = "1lgpkylhzbayk892inql16sjyy9d3v126f9i1v7qgha1203rwcji";
+  };
+
+  makeFlags = ["PREFIX=$(out)" ];
+
+  # Make this a fixed-output derivation
+  outputHashMode = "recursive";
+  outputHashAlgo = "sha256";
+  ouputHash = "0rxhk8sp81vb2mngqr7kn9vlqyliq9aqj2d25igcr01v5axbxbzb";
+
+  meta = {
+    description = "A port of the Adapta theme for Plasma";
+    homepage = https://git.io/adapta-kde;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.tadfisher ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdd61a138eea..e55bbb5461f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -738,6 +738,8 @@ with pkgs;
 
   adapta-gtk-theme = callPackage ../misc/themes/adapta { };
 
+  adapta-kde-theme = callPackage ../misc/themes/adapta-kde { };
+
   aria2 = callPackage ../tools/networking/aria2 {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From f96c5effd6b0fd11ae5b7174f23ade7c1bcb60aa Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Fri, 1 Jun 2018 21:25:27 +0200
Subject: [PATCH 2958/3370] procps-ng: 3.3.14 -> 3.3.15 (#41324)

https://nvd.nist.gov/vuln/detail/CVE-2018-1124

Closes #41082
---
 pkgs/os-specific/linux/procps-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix
index 08420e36c65b..bd69145521c1 100644
--- a/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/pkgs/os-specific/linux/procps-ng/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "procps-${version}";
-  version = "3.3.14";
+  version = "3.3.15";
 
   # The project's releases are on SF, but git repo on gitlab.
   src = fetchurl {
     url = "mirror://sourceforge/procps-ng/procps-ng-${version}.tar.xz";
-    sha256 = "0v3j6rkzzscqds37i105cxx3q4dk04rsgpqfd5p7hzcvk59h5njy";
+    sha256 = "0r84kwa5fl0sjdashcn4vh7hgfm7ahdcysig3mcjvpmkzi7p9g8h";
   };
 
   buildInputs = [ ncurses ];

From 33a418e2e6abe489c45d282a0d1d250ff08f8ac7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Fri, 1 Jun 2018 21:29:53 +0200
Subject: [PATCH 2959/3370] opaline: init at 0.3.1 (#41346)

Opaline is a lightweight replacement for opam-installer.

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

diff --git a/pkgs/development/tools/ocaml/opaline/default.nix b/pkgs/development/tools/ocaml/opaline/default.nix
new file mode 100644
index 000000000000..10088cce4912
--- /dev/null
+++ b/pkgs/development/tools/ocaml/opaline/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, ocamlPackages }:
+
+stdenv.mkDerivation rec {
+  version = "0.3.1";
+  name = "opaline-${version}";
+
+  src = fetchFromGitHub {
+    owner = "jaapb";
+    repo = "opaline";
+    rev = "v${version}";
+    sha256 = "0vd5xaf272hk4iqfj347jvbppy7my5p5gz8yqpkvl1d1i6lzh08v";
+  };
+
+  buildInputs = with ocamlPackages; [ ocaml findlib ocamlbuild opam-file-format ];
+
+  preInstall = "mkdir -p $out/bin";
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    description = "OPAm Light INstaller Engine";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocamlPackages.ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e55bbb5461f2..d95338a7bb83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6873,6 +6873,8 @@ with pkgs;
     ocamlPackages = ocamlPackages_4_02;
   };
 
+  opaline = callPackage ../development/tools/ocaml/opaline { };
+
   opam = callPackage ../development/tools/ocaml/opam { };
 
   picat = callPackage ../development/compilers/picat {

From eefb0032b749c978f3e3b3d369db9c6206232b12 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 1 Jun 2018 14:39:20 -0500
Subject: [PATCH 2960/3370] {g,w}llvm: 1.2.1 -> 1.2.2

(these are released together, at least currently)
---
 pkgs/development/tools/gllvm/default.nix | 4 ++--
 pkgs/development/tools/wllvm/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index 6cf36e44dd1c..abb0b447d60b 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "gllvm-${version}";
-  version = "1.2.1";
+  version = "1.2.2";
 
   goPackagePath = "github.com/SRI-CSL/gllvm";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner = "SRI-CSL";
     repo = "gllvm";
     rev = "v${version}";
-    sha256 = "1rbvn7qhzb7xxqv0wrkwxq4sm657vsl6q7nwrfq2zwb21573811z";
+    sha256 = "1k6081frnc6i6h3fa8d796cirhbf5kkshw7qyarz5wi3fcgijn4s";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix
index 8fa7574f3110..18d7be93258b 100644
--- a/pkgs/development/tools/wllvm/default.nix
+++ b/pkgs/development/tools/wllvm/default.nix
@@ -1,13 +1,13 @@
 { stdenv, python3Packages }:
 
 python3Packages.buildPythonApplication rec {
-  version = "1.2.1";
+  version = "1.2.2";
   pname = "wllvm";
   name = "${pname}-${version}";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "1yr0gijhgbxx1sl5a8dygr3a8g5wfkh9rk4v789r2aplvcbanv5a";
+    sha256 = "1zrjcabv41105mmv632gp488kmhya37n0jwgwxhadps4z3jv2qxb";
   };
 
   meta = with stdenv.lib; {

From 6cd5863060a48b7d0331dd2f69a7cfd43417d4a3 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 1 Jun 2018 12:21:11 -0400
Subject: [PATCH 2961/3370] squashfs: support darwin

---
 pkgs/tools/filesystems/squashfs/darwin.patch | 431 +++++++++++++++++++
 pkgs/tools/filesystems/squashfs/default.nix  |   4 +-
 2 files changed, 433 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/filesystems/squashfs/darwin.patch

diff --git a/pkgs/tools/filesystems/squashfs/darwin.patch b/pkgs/tools/filesystems/squashfs/darwin.patch
new file mode 100644
index 000000000000..6022e65be479
--- /dev/null
+++ b/pkgs/tools/filesystems/squashfs/darwin.patch
@@ -0,0 +1,431 @@
+diff --git a/squashfs-tools/action.c b/squashfs-tools/action.c
+index 4b06ccb..26365e7 100644
+--- a/squashfs-tools/action.c
++++ b/squashfs-tools/action.c
+@@ -38,6 +38,10 @@
+ #include <limits.h>
+ #include <errno.h>
+ 
++#ifndef FNM_EXTMATCH /* glibc extension */
++ #define FNM_EXTMATCH 0
++#endif
++
+ #include "squashfs_fs.h"
+ #include "mksquashfs.h"
+ #include "action.h"
+@@ -2284,9 +2288,12 @@ static char *get_start(char *s, int n)
+ 
+ static int subpathname_fn(struct atom *atom, struct action_data *action_data)
+ {
+-	return fnmatch(atom->argv[0], get_start(strdupa(action_data->subpath),
++	char *path = strdup(action_data->subpath);
++	int is_match = fnmatch(atom->argv[0], get_start(path,
+ 		count_components(atom->argv[0])),
+ 		FNM_PATHNAME|FNM_PERIOD|FNM_EXTMATCH) == 0;
++	free(path);
++	return is_match;
+ }
+ 
+ /*
+diff --git a/squashfs-tools/info.c b/squashfs-tools/info.c
+index 7968c77..c8e4c52 100644
+--- a/squashfs-tools/info.c
++++ b/squashfs-tools/info.c
+@@ -134,31 +134,22 @@ void dump_state()
+ void *info_thrd(void *arg)
+ {
+ 	sigset_t sigmask;
+-	struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 };
+-	int sig, waiting = 0;
++    int sig, err, waiting = 0;
+ 
+ 	sigemptyset(&sigmask);
+ 	sigaddset(&sigmask, SIGQUIT);
+ 	sigaddset(&sigmask, SIGHUP);
++    sigaddset(&sigmask, SIGALRM);
+ 
+ 	while(1) {
+-		if(waiting)
+-			sig = sigtimedwait(&sigmask, NULL, &timespec);
+-		else
+-			sig = sigwaitinfo(&sigmask, NULL);
++		err = sigwait(&sigmask, &sig);
+ 
+-		if(sig == -1) {
++		if(err == -1) {
+ 			switch(errno) {
+-			case EAGAIN:
+-				/* interval timed out */
+-				waiting = 0;
+-				/* FALLTHROUGH */
+ 			case EINTR:
+-				/* if waiting, the wait will be longer, but
+-				   that's OK */
+ 				continue;
+ 			default:
+-				BAD_ERROR("sigtimedwait/sigwaitinfo failed "
++				BAD_ERROR("sigwaitfailed "
+ 					"because %s\n", strerror(errno));
+ 			}
+ 		}
+@@ -169,8 +160,12 @@ void *info_thrd(void *arg)
+ 			/* set one second interval period, if ^\ received
+ 			   within then, dump queue and cache status */
+ 			waiting = 1;
+-		} else
++			alarm(1);
++		} else if (sig == SIGQUIT) {
+ 			dump_state();
++		} else if (sig == SIGALRM) {
++			waiting = 0;
++		}
+ 	}
+ }
+ 
+diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
+index d696a51..c86d1b3 100644
+--- a/squashfs-tools/mksquashfs.c
++++ b/squashfs-tools/mksquashfs.c
+@@ -50,6 +50,10 @@
+ #include <limits.h>
+ #include <ctype.h>
+ 
++#ifndef FNM_EXTMATCH /* glibc extension */
++    #define FNM_EXTMATCH 0
++#endif
++
+ #ifndef linux
+ #define __BYTE_ORDER BYTE_ORDER
+ #define __BIG_ENDIAN BIG_ENDIAN
+@@ -831,13 +835,13 @@ char *subpathname(struct dir_ent *dir_ent)
+ }
+ 
+ 
+-inline unsigned int get_inode_no(struct inode_info *inode)
++static inline unsigned int get_inode_no(struct inode_info *inode)
+ {
+ 	return inode->inode_number;
+ }
+ 
+ 
+-inline unsigned int get_parent_no(struct dir_info *dir)
++static inline unsigned int get_parent_no(struct dir_info *dir)
+ {
+ 	return dir->depth ? get_inode_no(dir->dir_ent->inode) : inode_no;
+ }
+@@ -2030,7 +2034,7 @@ struct file_info *duplicate(long long file_size, long long bytes,
+ }
+ 
+ 
+-inline int is_fragment(struct inode_info *inode)
++static inline int is_fragment(struct inode_info *inode)
+ {
+ 	off_t file_size = inode->buf.st_size;
+ 
+@@ -2999,13 +3003,13 @@ struct inode_info *lookup_inode2(struct stat *buf, int pseudo, int id)
+ }
+ 
+ 
+-inline struct inode_info *lookup_inode(struct stat *buf)
++static inline struct inode_info *lookup_inode(struct stat *buf)
+ {
+ 	return lookup_inode2(buf, 0, 0);
+ }
+ 
+ 
+-inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
++static inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
+ {
+ 	if (inode->inode_number == 0) {
+ 		inode->inode_number = use_this ? : inode_no ++;
+@@ -3016,7 +3020,7 @@ inline void alloc_inode_no(struct inode_info *inode, unsigned int use_this)
+ }
+ 
+ 
+-inline struct dir_ent *create_dir_entry(char *name, char *source_name,
++static inline struct dir_ent *create_dir_entry(char *name, char *source_name,
+ 	char *nonstandard_pathname, struct dir_info *dir)
+ {
+ 	struct dir_ent *dir_ent = malloc(sizeof(struct dir_ent));
+@@ -3034,7 +3038,7 @@ inline struct dir_ent *create_dir_entry(char *name, char *source_name,
+ }
+ 
+ 
+-inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
++static inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
+ 	struct inode_info *inode_info)
+ {
+ 	struct dir_info *dir = dir_ent->our_dir;
+@@ -3050,7 +3054,7 @@ inline void add_dir_entry(struct dir_ent *dir_ent, struct dir_info *sub_dir,
+ }
+ 
+ 
+-inline void add_dir_entry2(char *name, char *source_name,
++static inline void add_dir_entry2(char *name, char *source_name,
+ 	char *nonstandard_pathname, struct dir_info *sub_dir,
+ 	struct inode_info *inode_info, struct dir_info *dir)
+ {
+@@ -3062,7 +3066,7 @@ inline void add_dir_entry2(char *name, char *source_name,
+ }
+ 
+ 
+-inline void free_dir_entry(struct dir_ent *dir_ent)
++static inline void free_dir_entry(struct dir_ent *dir_ent)
+ {
+ 	if(dir_ent->name)
+ 		free(dir_ent->name);
+@@ -3083,7 +3087,7 @@ inline void free_dir_entry(struct dir_ent *dir_ent)
+ }
+ 
+ 
+-inline void add_excluded(struct dir_info *dir)
++static inline void add_excluded(struct dir_info *dir)
+ {
+ 	dir->excluded ++;
+ }
+@@ -4200,6 +4204,7 @@ void initialise_threads(int readq, int fragq, int bwriteq, int fwriteq,
+ 	sigemptyset(&sigmask);
+ 	sigaddset(&sigmask, SIGQUIT);
+ 	sigaddset(&sigmask, SIGHUP);
++	sigaddset(&sigmask, SIGALRM);
+ 	if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) == -1)
+ 		BAD_ERROR("Failed to set signal mask in intialise_threads\n");
+ 
+@@ -4987,6 +4992,36 @@ int parse_num(char *arg, int *res)
+ 
+ int get_physical_memory()
+ {
++	int phys_mem;
++#ifndef linux
++	#ifdef HW_MEMSIZE
++		#define SYSCTL_PHYSMEM HW_MEMSIZE
++	#elif defined(HW_PHYSMEM64)
++		#define SYSCTL_PHYSMEM HW_PHYSMEM64
++	#else
++		#define SYSCTL_PHYSMEM HW_PHYSMEM
++	#endif
++
++	int mib[2];
++	uint64_t sysctl_physmem = 0;
++	size_t sysctl_len = sizeof(sysctl_physmem);
++
++	mib[0] = CTL_HW;
++	mib[1] = SYSCTL_PHYSMEM;
++
++	if(sysctl(mib, 2, &sysctl_physmem, &sysctl_len, NULL, 0) == 0) {
++		/* some systems use 32-bit values, work with what we're given */
++		if (sysctl_len == 4)
++			sysctl_physmem = *(uint32_t*)&sysctl_physmem;
++		phys_mem = sysctl_physmem >> 20;
++	} else {
++		ERROR_START("Failed to get amount of available "
++			"memory.");
++		ERROR_EXIT("  Defaulting to least viable amount\n");
++		phys_mem = SQUASHFS_LOWMEM;
++	}
++	#undef SYSCTL_PHYSMEM
++#else
+ 	/*
+ 	 * Long longs are used here because with PAE, a 32-bit
+ 	 * machine can have more than 4GB of physical memory
+@@ -4996,10 +5031,11 @@ int get_physical_memory()
+ 	 */
+ 	long long num_pages = sysconf(_SC_PHYS_PAGES);
+ 	long long page_size = sysconf(_SC_PAGESIZE);
+-	int phys_mem = num_pages * page_size >> 20;
++	phys_mem = num_pages * page_size >> 20;
+ 
+ 	if(num_pages == -1 || page_size == -1)
+ 		return 0;
++#endif
+ 
+ 	if(phys_mem < SQUASHFS_LOWMEM)
+ 		BAD_ERROR("Mksquashfs requires more physical memory than is "
+diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
+index 55708a3..d44d1fd 100644
+--- a/squashfs-tools/mksquashfs.h
++++ b/squashfs-tools/mksquashfs.h
+@@ -24,6 +24,7 @@
+  * mksquashfs.h
+  *
+  */
++#include <pthread.h>
+ 
+ struct dir_info {
+ 	char			*pathname;
+diff --git a/squashfs-tools/pseudo.c b/squashfs-tools/pseudo.c
+index cb74cf6..fe2b4bc 100644
+--- a/squashfs-tools/pseudo.c
++++ b/squashfs-tools/pseudo.c
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <sys/stat.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+diff --git a/squashfs-tools/read_xattrs.c b/squashfs-tools/read_xattrs.c
+index 42106f5..837d3fb 100644
+--- a/squashfs-tools/read_xattrs.c
++++ b/squashfs-tools/read_xattrs.c
+@@ -39,13 +39,13 @@
+ #include <endian.h>
+ #endif
+ 
++#include <stdlib.h>
++
+ #include "squashfs_fs.h"
+ #include "squashfs_swap.h"
+ #include "xattr.h"
+ #include "error.h"
+ 
+-#include <stdlib.h>
+-
+ extern int read_fs_bytes(int, long long, int, void *);
+ extern int read_block(int, long long, long long *, int, void *);
+ 
+diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
+index f190e96..927e441 100644
+--- a/squashfs-tools/unsquashfs.c
++++ b/squashfs-tools/unsquashfs.c
+@@ -32,7 +32,12 @@
+ #include "stdarg.h"
+ #include "fnmatch_compat.h"
+ 
++#ifndef linux
++#include <sys/sysctl.h>
++#else
+ #include <sys/sysinfo.h>
++#endif
++
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+@@ -2185,6 +2190,7 @@ void initialise_threads(int fragment_buffer_size, int data_buffer_size)
+ 	sigemptyset(&sigmask);
+ 	sigaddset(&sigmask, SIGQUIT);
+ 	sigaddset(&sigmask, SIGHUP);
++	sigaddset(&sigmask, SIGALRM);
+ 	if(pthread_sigmask(SIG_BLOCK, &sigmask, NULL) == -1)
+ 		EXIT_UNSQUASH("Failed to set signal mask in initialise_threads"
+ 			"\n");
+diff --git a/squashfs-tools/unsquashfs.h b/squashfs-tools/unsquashfs.h
+index 0edbd25..cea9caa 100644
+--- a/squashfs-tools/unsquashfs.h
++++ b/squashfs-tools/unsquashfs.h
+@@ -46,6 +46,10 @@
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ 
++#ifndef FNM_EXTMATCH /* glibc extension */
++    #define FNM_EXTMATCH 0
++#endif
++
+ #ifndef linux
+ #define __BYTE_ORDER BYTE_ORDER
+ #define __BIG_ENDIAN BIG_ENDIAN
+diff --git a/squashfs-tools/unsquashfs_info.c b/squashfs-tools/unsquashfs_info.c
+index c8e2b9b..7d4f7af 100644
+--- a/squashfs-tools/unsquashfs_info.c
++++ b/squashfs-tools/unsquashfs_info.c
+@@ -97,31 +97,22 @@ void dump_state()
+ void *info_thrd(void *arg)
+ {
+ 	sigset_t sigmask;
+-	struct timespec timespec = { .tv_sec = 1, .tv_nsec = 0 };
+-	int sig, waiting = 0;
++	int sig, err, waiting = 0;
+ 
+ 	sigemptyset(&sigmask);
+ 	sigaddset(&sigmask, SIGQUIT);
+ 	sigaddset(&sigmask, SIGHUP);
++	sigaddset(&sigmask, SIGALRM);
+ 
+ 	while(1) {
+-		if(waiting)
+-			sig = sigtimedwait(&sigmask, NULL, &timespec);
+-		else
+-			sig = sigwaitinfo(&sigmask, NULL);
++		err = sigwait(&sigmask, &sig);
+ 
+-		if(sig == -1) {
++		if(err == -1) {
+ 			switch(errno) {
+-			case EAGAIN:
+-				/* interval timed out */
+-				waiting = 0;
+-				/* FALLTHROUGH */
+ 			case EINTR:
+-				/* if waiting, the wait will be longer, but
+-				   that's OK */
+ 				continue;
+ 			default:
+-				BAD_ERROR("sigtimedwait/sigwaitinfo failed "
++				BAD_ERROR("sigwait failed "
+ 					"because %s\n", strerror(errno));
+ 			}
+ 		}
+@@ -133,8 +124,12 @@ void *info_thrd(void *arg)
+ 			/* set one second interval period, if ^\ received
+ 			   within then, dump queue and cache status */
+ 			waiting = 1;
+-		} else
++			alarm(1);
++		} else if (sig == SIGQUIT) {
+ 			dump_state();
++		} else if (sig == SIGALRM) {
++			waiting = 0;
++		}
+ 	}
+ }
+ 
+diff --git a/squashfs-tools/unsquashfs_xattr.c b/squashfs-tools/unsquashfs_xattr.c
+index 59f4aae..13f0e35 100644
+--- a/squashfs-tools/unsquashfs_xattr.c
++++ b/squashfs-tools/unsquashfs_xattr.c
+@@ -27,6 +27,11 @@
+ 
+ #include <sys/xattr.h>
+ 
++#ifdef XATTR_NOFOLLOW /* Apple's xattrs */
++    #define lsetxattr(path_, name_, val_, sz_, flags_) \
++        setxattr(path_, name_, val_, sz_, 0, flags_ | XATTR_NOFOLLOW)
++#endif
++
+ #define NOSPACE_MAX 10
+ 
+ extern int root_process;
+diff --git a/squashfs-tools/xattr.c b/squashfs-tools/xattr.c
+index b46550c..5b32eca 100644
+--- a/squashfs-tools/xattr.c
++++ b/squashfs-tools/xattr.c
+@@ -22,6 +22,14 @@
+  * xattr.c
+  */
+ 
++#ifndef linux
++#define __BYTE_ORDER BYTE_ORDER
++#define __BIG_ENDIAN BIG_ENDIAN
++#define __LITTLE_ENDIAN LITTLE_ENDIAN
++#else
++#include <endian.h>
++#endif
++
+ #define TRUE 1
+ #define FALSE 0
+ 
+@@ -36,6 +44,13 @@
+ #include <stdlib.h>
+ #include <sys/xattr.h>
+ 
++#ifdef XATTR_NOFOLLOW /* Apple's xattrs */
++    #define llistxattr(path_, buf_, sz_) \
++        listxattr(path_, buf_, sz_, XATTR_NOFOLLOW)
++    #define lgetxattr(path_, name_, val_, sz_) \
++        getxattr(path_, name_, val_, sz_, 0, XATTR_NOFOLLOW)
++#endif
++
+ #include "squashfs_fs.h"
+ #include "squashfs_swap.h"
+ #include "mksquashfs.h"
diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix
index a7f4e85eb34f..d5bcd912c957 100644
--- a/pkgs/tools/filesystems/squashfs/default.nix
+++ b/pkgs/tools/filesystems/squashfs/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ./0001-If-SOURCE_DATE_EPOCH-is-set-override-timestamps-with.patch
     ./0002-If-SOURCE_DATE_EPOCH-is-set-also-clamp-content-times.patch
     ./0003-remove-frag-deflator-thread.patch
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch;
 
   buildInputs = [ zlib xz ]
     ++ stdenv.lib.optional lz4Support lz4;
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://squashfs.sourceforge.net/;
     description = "Tool for creating and unpacking squashfs filesystems";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ ruuda ];
   };

From 1feffb18c410eb1982642391386dc29ea7b761f9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 1 Jun 2018 14:50:49 -0500
Subject: [PATCH 2962/3370] gllvm: should work on "all" platforms, indicate
 this

---
 pkgs/development/tools/gllvm/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix
index abb0b447d60b..cae6d2255bf2 100644
--- a/pkgs/development/tools/gllvm/default.nix
+++ b/pkgs/development/tools/gllvm/default.nix
@@ -18,5 +18,6 @@ buildGoPackage rec {
     description = "Whole Program LLVM: wllvm ported to go";
     license = licenses.bsd3;
     maintainers = with maintainers; [ dtzWill ];
+    platforms = platforms.all;
   };
 }

From cf152c2791c3a525736bcd540422d9b99a8f2a38 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 1 Jun 2018 13:04:34 -0700
Subject: [PATCH 2963/3370] p11-kit: 0.23.10 -> 0.23.11 (#41271)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/p11-kit/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.23.11 with grep in /nix/store/9whclrmrld36nawkkdshhj636jlh1cdm-p11-kit-0.23.11
- directory tree listing: https://gist.github.com/be74c2d2f6d0b1ee2fb5e2b0e30fb945
- du listing: https://gist.github.com/470d2f00cd777773ea45ea6ea280a07a
---
 pkgs/development/libraries/p11-kit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 9c6631862879..225623fa4916 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "p11-kit-${version}";
-  version = "0.23.10";
+  version = "0.23.11";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = "p11-kit";
     rev = version;
-    sha256 = "0n0wqv028flzvnxllqv8i6x9nv705csl7ddzi0fzvppc9fp2yinp";
+    sha256 = "08jfxml3w8gn85qz19ps1z8yb66k921z0cgzizqn1ipl9pp5pxyd";
   };
 
   outputs = [ "out" "dev"];

From b17b44232f5dd69f399c168c0c5ca87c58af0063 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Fri, 1 Jun 2018 22:27:51 +0200
Subject: [PATCH 2964/3370] nixos/tests/iftop: fix non-deterministic failure
 (#41309)

- make sure machines are fully booted before sending commands
- test that capability setting in iftop module makes a difference
---
 nixos/tests/iftop.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/iftop.nix b/nixos/tests/iftop.nix
index 21ff3cafed7c..a4f524ceb27b 100644
--- a/nixos/tests/iftop.nix
+++ b/nixos/tests/iftop.nix
@@ -9,22 +9,26 @@ with lib;
   nodes = {
     withIftop = {
       imports = [ ./common/user-account.nix ];
-
       programs.iftop.enable = true;
     };
     withoutIftop = {
       imports = [ ./common/user-account.nix ];
+      environment.systemPackages = [ pkgs.iftop ];
     };
   };
 
   testScript = ''
     subtest "machine with iftop enabled", sub {
-      $withIftop->start;
-      $withIftop->succeed("su -l alice -c 'iftop -t -s 1'");
+      $withIftop->waitForUnit("default.target");
+      # limit to eth1 (eth0 is the test driver's control interface)
+      # and don't try name lookups
+      $withIftop->succeed("su -l alice -c 'iftop -t -s 1 -n -i eth1'");
     };
     subtest "machine without iftop", sub {
-      $withoutIftop->start;
-      $withoutIftop->mustFail("su -l alice -c 'iftop -t -s 1'");
+      $withoutIftop->waitForUnit("default.target");
+      # check that iftop is there but user alice lacks capabilities
+      $withoutIftop->succeed("iftop -t -s 1 -n -i eth1");
+      $withoutIftop->fail("su -l alice -c 'iftop -t -s 1 -n -i eth1'");
     };
   '';
 })

From d9cc753a9d63b517b848fc886ea6e28644317ceb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 1 Jun 2018 13:46:29 -0700
Subject: [PATCH 2965/3370] nftables: 0.8.3 -> 0.8.5 (#41288)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/nftables/versions.

These checks were done:

- built on NixOS
- /nix/store/k4gbg52hrir6j4krsa3iky2phrbaqail-nftables-0.8.5/bin/nft passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.8.5 with grep in /nix/store/k4gbg52hrir6j4krsa3iky2phrbaqail-nftables-0.8.5
- directory tree listing: https://gist.github.com/c51183f763d8d6799836191579a6121e
- du listing: https://gist.github.com/14256ccb73b20c829e35302dbd31c12a
---
 pkgs/os-specific/linux/nftables/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix
index be52cbc2029d..63d389fdb1f8 100644
--- a/pkgs/os-specific/linux/nftables/default.nix
+++ b/pkgs/os-specific/linux/nftables/default.nix
@@ -2,12 +2,12 @@
 , flex, bison, libmnl, libnftnl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.3";
+  version = "0.8.5";
   name = "nftables-${version}";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2";
-    sha256 = "0f2yv7as1ybkfvn75f72x0z9y1ydibw4s3hbzhlmvsc8vgsy2syi";
+    sha256 = "08z3xaxdryi0i9gcfifs77c96xs8ljynkr2hbfgf3w67l60az6wf";
   };
 
   configureFlags = [

From 3cb531f828a0cf316949a21c89db78e5de293318 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 1 Jun 2018 13:49:25 -0700
Subject: [PATCH 2966/3370] powerdns: 4.1.2 -> 4.1.3 (#41046)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/powerdns/versions.

These checks were done:

- built on NixOS
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/pdns_control passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/pdnsutil passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/zone2sql passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/zone2json passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dnsgram passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dnsreplay passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dnsscan passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dnsscope passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dnswasher passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dumresp passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/pdns_notify passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/nproxy passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/nsec3dig passed the binary check.
- Warning: no invocation of /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/saxfr had a zero exit code or showed the expected version
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/stubquery passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/ixplore passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/sdig passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/calidns passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dnsbulktest passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dnstcpbench passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/zone2ldap passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/dnspcap2protobuf passed the binary check.
- /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3/bin/pdns_server passed the binary check.
- 22 of 23 passed binary check by having a zero exit code.
- 20 of 23 passed binary check by having the new version present in output.
- found 4.1.3 with grep in /nix/store/yacb209ny3gi3p0bg2n4hamp39b9dqxi-powerdns-4.1.3
- directory tree listing: https://gist.github.com/4e2a99ca3fe4bbb630b7cbd39e96db37
- du listing: https://gist.github.com/9722c4085ca5ddbe661816db86a84a6f
---
 pkgs/servers/dns/powerdns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix
index 0ef24a97f888..20c9eecb0d5f 100644
--- a/pkgs/servers/dns/powerdns/default.nix
+++ b/pkgs/servers/dns/powerdns/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "powerdns-${version}";
-  version = "4.1.2";
+  version = "4.1.3";
 
   src = fetchurl {
     url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2";
-    sha256 = "15anf9x4h3acf7rhvaim4595v2hrz7mn4va9qv18bfnif40vxn46";
+    sha256 = "1bh1qdgw415ax542123b6isri1jh4mbf2i9i1yffkfk0xmyv79cs";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From d987f5d07d1094c454c65287e948a671bd61c13c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 1 Jun 2018 13:49:49 -0700
Subject: [PATCH 2967/3370] pdns-recursor: 4.1.2 -> 4.1.3 (#41049)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pdns-recursor/versions.

These checks were done:

- built on NixOS
- /nix/store/8ifncdfxzi2s8cnhx7a2hj74h4mqq1vi-pdns-recursor-4.1.3/bin/rec_control passed the binary check.
- /nix/store/8ifncdfxzi2s8cnhx7a2hj74h4mqq1vi-pdns-recursor-4.1.3/bin/pdns_recursor passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 4.1.3 with grep in /nix/store/8ifncdfxzi2s8cnhx7a2hj74h4mqq1vi-pdns-recursor-4.1.3
- directory tree listing: https://gist.github.com/5eac7110d507381d1bcb747d44e175ba
- du listing: https://gist.github.com/4805d9a92ed57016e729c49cf2de1e3c
---
 pkgs/servers/dns/pdns-recursor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix
index 76f1bd91e33d..286447352fc0 100644
--- a/pkgs/servers/dns/pdns-recursor/default.nix
+++ b/pkgs/servers/dns/pdns-recursor/default.nix
@@ -8,11 +8,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "pdns-recursor-${version}";
-  version = "4.1.2";
+  version = "4.1.3";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2";
-    sha256 = "0xpd8k7ahwrwabz05zbjmg54dmd4hm5hkbfn8m1ws6y4f7qm4inv";
+    sha256 = "12x8gm6771wh2xaqad3p5y08p5pimp6k9h830s0487mwg9glacy1";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 85a7b75faaf805ca0c08257a6918cee11a6e6558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Fri, 1 Jun 2018 22:02:24 +0100
Subject: [PATCH 2968/3370] dep2nix: init at 0.0.1 (#41352)

---
 pkgs/development/tools/dep2nix/default.nix |  34 +++++
 pkgs/development/tools/dep2nix/deps.nix    | 145 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   2 +
 3 files changed, 181 insertions(+)
 create mode 100644 pkgs/development/tools/dep2nix/default.nix
 create mode 100644 pkgs/development/tools/dep2nix/deps.nix

diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix
new file mode 100644
index 000000000000..6367f6be2981
--- /dev/null
+++ b/pkgs/development/tools/dep2nix/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, buildGoPackage
+, makeWrapper, nix-prefetch-git }:
+
+buildGoPackage rec {
+  name = "dep2nix-${version}";
+  version = "0.0.1";
+
+  goPackagePath = "github.com/nixcloud/dep2nix";
+
+  src = fetchFromGitHub {
+    owner = "nixcloud";
+    repo = "dep2nix";
+    rev = version;
+    sha256 = "05b06wgcy88fb5ccqwq3mfhrhcblr1akpxgsf44kgbdwf5nzz87g";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  postFixup = ''
+    wrapProgram $bin/bin/dep2nix \
+      --prefix PATH : ${nix-prefetch-git}/bin
+  '';
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`";
+    license = licenses.bsd3;
+    homepage = https://github.com/nixcloud/dep2nix;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/development/tools/dep2nix/deps.nix b/pkgs/development/tools/dep2nix/deps.nix
new file mode 100644
index 000000000000..fc9280e9df5b
--- /dev/null
+++ b/pkgs/development/tools/dep2nix/deps.nix
@@ -0,0 +1,145 @@
+
+  # file automatically generated from Gopkg.lock with https://github.com/nixcloud/dep2nix (golang dep)
+  [
+  
+    {
+      goPackagePath  = "github.com/Masterminds/semver";
+      fetch = {
+        type = "git";
+        url = "https://github.com/Masterminds/semver";
+        rev =  "a93e51b5a57ef416dac8bb02d11407b6f55d8929";
+        sha256 = "1rd3p135r7iw0lvaa6vk7afxna87chq61a7a0wqnxd3xgpnpa9ik";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/Masterminds/vcs";
+      fetch = {
+        type = "git";
+        url = "https://github.com/Masterminds/vcs";
+        rev =  "6f1c6d150500e452704e9863f68c2559f58616bf";
+        sha256 = "02bpyzccazw9lwqchcz349al4vlxnz4m5gzwigk02zg2qpa1j53j";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/armon/go-radix";
+      fetch = {
+        type = "git";
+        url = "https://github.com/armon/go-radix";
+        rev =  "1fca145dffbcaa8fe914309b1ec0cfc67500fe61";
+        sha256 = "19jws9ngncpbhghzcy7biyb4r8jh14mzknyk67cvq6ln7kh1qyic";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/boltdb/bolt";
+      fetch = {
+        type = "git";
+        url = "https://github.com/boltdb/bolt";
+        rev =  "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8";
+        sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/golang/dep";
+      fetch = {
+        type = "git";
+        url = "https://github.com/CrushedPixel/dep";
+        rev =  "fa9f32339c8855ebe7e7bc66e549036a7e06d37a";
+        sha256 = "1knaxs1ji1b0b68393f24r8qzvahxz9x7rqwc8jsjlshvpz0hlm6";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/golang/protobuf";
+      fetch = {
+        type = "git";
+        url = "https://github.com/golang/protobuf";
+        rev =  "bbd03ef6da3a115852eaf24c8a1c46aeb39aa175";
+        sha256 = "1pyli3dcagi7jzpiazph4fhkz7a3z4bhd25nwbb7g0iy69b8z1g4";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/jmank88/nuts";
+      fetch = {
+        type = "git";
+        url = "https://github.com/jmank88/nuts";
+        rev =  "8b28145dffc87104e66d074f62ea8080edfad7c8";
+        sha256 = "1d0xj1dj1lfalq3pg15h0c645n84lf122xx3zkm7hawq9zri6n5k";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/nightlyone/lockfile";
+      fetch = {
+        type = "git";
+        url = "https://github.com/nightlyone/lockfile";
+        rev =  "6a197d5ea61168f2ac821de2b7f011b250904900";
+        sha256 = "03znnf6rzyyi4h4qj81py1xpfs3pnfm39j4bfc9qzakz5j9y1gdl";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/pelletier/go-toml";
+      fetch = {
+        type = "git";
+        url = "https://github.com/pelletier/go-toml";
+        rev =  "acdc4509485b587f5e675510c4f2c63e90ff68a8";
+        sha256 = "1y5m9pngxhsfzcnxh8ma5nsllx74wn0jr47p2n6i3inrjqxr12xh";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/pkg/errors";
+      fetch = {
+        type = "git";
+        url = "https://github.com/pkg/errors";
+        rev =  "645ef00459ed84a119197bfb8d8205042c6df63d";
+        sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
+      };
+    }
+    
+    {
+      goPackagePath  = "github.com/sdboyer/constext";
+      fetch = {
+        type = "git";
+        url = "https://github.com/sdboyer/constext";
+        rev =  "836a144573533ea4da4e6929c235fd348aed1c80";
+        sha256 = "0055yw73di4spa1wwpa2pyb708wmh9r3xd8dcv8pn81dba94if1w";
+      };
+    }
+    
+    {
+      goPackagePath  = "golang.org/x/net";
+      fetch = {
+        type = "git";
+        url = "https://go.googlesource.com/net";
+        rev =  "dc948dff8834a7fe1ca525f8d04e261c2b56e70d";
+        sha256 = "0gkw1am63agb1rgpxr2qhns9npr99mzwrxg7px88qq8h93zzd4kg";
+      };
+    }
+    
+    {
+      goPackagePath  = "golang.org/x/sync";
+      fetch = {
+        type = "git";
+        url = "https://go.googlesource.com/sync";
+        rev =  "fd80eb99c8f653c847d294a001bdf2a3a6f768f5";
+        sha256 = "12lzldlj1cqc1babp1hkkn76fglzn5abkqvmbpr4f2j95mf9x836";
+      };
+    }
+    
+    {
+      goPackagePath  = "golang.org/x/sys";
+      fetch = {
+        type = "git";
+        url = "https://go.googlesource.com/sys";
+        rev =  "37707fdb30a5b38865cfb95e5aab41707daec7fd";
+        sha256 = "1abrr2507a737hdqv4q7pw7hv6ls9pdiq9crhdi52r3gcz6hvizg";
+      };
+    }
+    
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d95338a7bb83..10eb430e9fa5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13870,6 +13870,8 @@ with pkgs;
 
   dep = callPackage ../development/tools/dep { };
 
+  dep2nix = callPackage ../development/tools/dep2nix { };
+
   easyjson = callPackage ../development/tools/easyjson { };
 
   go-bindata = callPackage ../development/tools/go-bindata { };

From 4a0c181d0a2b67cdf264785a6c6bd08ba9d93aa9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 1 Jun 2018 14:03:58 -0700
Subject: [PATCH 2969/3370] wsjtx: 1.8.0 -> 1.9.0 (#41230)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wsjtx/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/wsjtx had a zero exit code or showed the expected version
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/udp_daemon passed the binary check.
- Warning: no invocation of /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/message_aggregator had a zero exit code or showed the expected version
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/jt9 passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/ft8code passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/jt65code passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/qra64code passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/qra64sim passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/jt9code passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/jt4code passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/msk144code passed the binary check.
- Warning: no invocation of /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/wsprd had a zero exit code or showed the expected version
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/wspr_fsk8d passed the binary check.
- Warning: no invocation of /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/fmtave had a zero exit code or showed the expected version
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/fcal passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/fmeasure passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/rigctl-wsjtx passed the binary check.
- /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0/bin/rigctld-wsjtx passed the binary check.
- 14 of 18 passed binary check by having a zero exit code.
- 0 of 18 passed binary check by having the new version present in output.
- found 1.9.0 with grep in /nix/store/l4y2p3rynqjnvx6y4n4ir9zgm2p8bhym-wsjtx-1.9.0
- directory tree listing: https://gist.github.com/17cbff922de89906d061835dbd464639
- du listing: https://gist.github.com/3751165113207ba96fed9df78188a6e3
---
 pkgs/applications/misc/wsjtx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/wsjtx/default.nix b/pkgs/applications/misc/wsjtx/default.nix
index 8a23134e3ed0..311983e8f527 100644
--- a/pkgs/applications/misc/wsjtx/default.nix
+++ b/pkgs/applications/misc/wsjtx/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "wsjtx-${version}";
-  version = "1.8.0";
+  version = "1.9.0";
 
   # This is a composite source tarball containing both wsjtx and a hamlib fork
   src = fetchurl {
     url = "http://physics.princeton.edu/pulsar/K1JT/wsjtx-${version}.tgz";
-    sha256 = "21603ad4d5f43cd9c79a6e8cf468bde88c554654012b2c6c1ef9144cfbf668ce";
+    sha256 = "1qxwiylnykh37kw780hh9xfphzbj8ndpfqz4xazld16v3qx2g0jc";
   };
 
   # Hamlib builds with autotools, wsjtx builds with cmake

From a8925a2188b61347e7435429c6e171d0941d61a2 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 1 Jun 2018 14:07:37 -0700
Subject: [PATCH 2970/3370] qutebrowser: 1.3.0 -> 1.3.1 (#41263)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qutebrowser/versions.

These checks were done:

- built on NixOS
- /nix/store/g9592dbmfj1icx0njg1dhj094v2l8rcj-qutebrowser-1.3.1/bin/qutebrowser passed the binary check.
- /nix/store/g9592dbmfj1icx0njg1dhj094v2l8rcj-qutebrowser-1.3.1/bin/..qutebrowser-wrapped-wrapped passed the binary check.
- /nix/store/g9592dbmfj1icx0njg1dhj094v2l8rcj-qutebrowser-1.3.1/bin/.qutebrowser-wrapped passed the binary check.
- 3 of 3 passed binary check by having a zero exit code.
- 0 of 3 passed binary check by having the new version present in output.
- found 1.3.1 with grep in /nix/store/g9592dbmfj1icx0njg1dhj094v2l8rcj-qutebrowser-1.3.1
- directory tree listing: https://gist.github.com/c6f74ace4cd8ac51662079876bcef904
- du listing: https://gist.github.com/c1a964f74432d7f8c83f9825d26fbad0
---
 pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 0cebdd62140c..38aaf8115166 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -29,13 +29,13 @@ let
 in python3Packages.buildPythonApplication rec {
   name = "qutebrowser-${version}${versionPostfix}";
   namePrefix = "";
-  version = "1.3.0";
+  version = "1.3.1";
   versionPostfix = "";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "159h669x60pfla71zx28wnrik8rvsrw5i8kbd3xccynk6klm3kw3";
+    sha256 = "121fz549vlxdasw0lcx6v394x8g34nadvrfs4svw3b65n0shv1ky";
   };
 
   # Needs tox

From 0addac3b0a1cd1faf42ecd5f793fd8481dbada07 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 1 Jun 2018 20:56:19 +0000
Subject: [PATCH 2971/3370] lib: bitAnd, bitOr, bitXor

---
 lib/default.nix |  8 ++++----
 lib/trivial.nix | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 4 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index 4ca2e2ea6e37..d608d7094474 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -56,10 +56,10 @@ let
       hasAttr head isAttrs isBool isInt isList isString length
       lessThan listToAttrs pathExists readFile replaceStrings seq
       stringLength sub substring tail;
-    inherit (trivial) id const concat or and boolToString mergeAttrs
-      flip mapNullable inNixShell min max importJSON warn info
-      nixpkgsVersion version mod compare splitByAndCompare
-      functionArgs setFunctionArgs isFunction;
+    inherit (trivial) id const concat or and bitAnd bitOr bitXor
+      boolToString mergeAttrs flip mapNullable inNixShell min max
+      importJSON warn info nixpkgsVersion version mod compare
+      splitByAndCompare functionArgs setFunctionArgs isFunction;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 251cb796db0e..86e3c939dd69 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -1,4 +1,38 @@
 { lib }:
+let
+  zipIntBits = f: x: y:
+    let
+      # (intToBits 6) -> [ 0 1 1 ]
+      intToBits = x:
+        if x==0 then
+          []
+        else
+          let
+            headbit  = if (x / 2) * 2 != x then 1 else 0;                          # x & 1
+            tailbits = if x < 0 then 9223372036854775807 + ((x+1) / 2) else x / 2; # x >>> 1
+          in
+            [headbit] ++ (intToBits tailbits);
+
+      # (bitsToInt [ 0 1 1 ]) -> 6
+      bitsToInt = l:
+        if l==[] then
+          0
+        else
+          (builtins.head l) + (2 * (bitsToInt (builtins.tail l)));
+
+      zipListsWith' = fst: snd:
+        if fst==[] && snd==[] then
+          []
+        else if fst==[] then
+          [(f 0                   (builtins.head snd))] ++ (zipListsWith' []                  (builtins.tail snd))
+        else if snd==[] then
+          [(f (builtins.head fst) 0                  )] ++ (zipListsWith' (builtins.tail fst) []                 )
+        else
+          [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd));
+    in
+      assert (builtins.isInt x) && (builtins.isInt y);
+      bitsToInt (zipListsWith' (intToBits x) (intToBits y));
+in
 rec {
 
   /* The identity function
@@ -31,6 +65,15 @@ rec {
   /* boolean “and” */
   and = x: y: x && y;
 
+  /* bitwise “and” */
+  bitAnd = builtins.bitAnd or zipIntBits (a: b: if a==1 && b==1 then 1 else 0);
+
+  /* bitwise “or” */
+  bitOr = builtins.bitOr or zipIntBits (a: b: if a==1 || b==1 then 1 else 0);
+
+  /* bitwise “xor” */
+  bitXor = builtins.bitXor or zipIntBits (a: b: if a!=b then 1 else 0);
+
   /* Convert a boolean to a string.
      Note that toString on a bool returns "1" and "".
   */

From 995d2ec92889bf6c4fb9c5a742ac5e96cee0e677 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 24 May 2018 20:16:01 +0200
Subject: [PATCH 2972/3370] nixos/slurm: Extend configuration options

* Updated SrunX11 option
* Added extraPlugstackConfig parameter
* Added option enableStools
* Add cgroup.conf to module
* Fix some typos
---
 .../services/computing/slurm/slurm.nix        | 60 ++++++++++++++++---
 1 file changed, 52 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 3e513ab15717..82cf429936ea 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -6,7 +6,7 @@ let
 
   cfg = config.services.slurm;
   # configuration file can be generated by http://slurm.schedmd.com/configurator.html
-  configFile = pkgs.writeText "slurm.conf"
+  configFile = pkgs.writeTextDir "slurm.conf"
     ''
       ${optionalString (cfg.controlMachine != null) ''controlMachine=${cfg.controlMachine}''}
       ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''}
@@ -17,10 +17,25 @@ let
       ${cfg.extraConfig}
     '';
 
-  plugStackConfig = pkgs.writeText "plugstack.conf"
+  plugStackConfig = pkgs.writeTextDir "plugstack.conf"
     ''
       ${optionalString cfg.enableSrunX11 ''optional ${pkgs.slurm-spank-x11}/lib/x11.so''}
+      ${cfg.extraPlugstackConfig}
     '';
+
+
+  cgroupConfig = pkgs.writeTextDir "cgroup.conf"
+   ''
+     ${cfg.extraCgroupConfig}
+   '';
+
+  # slurm expects some additional config files to be
+  # in the same directory as slurm.conf
+  etcSlurm = pkgs.symlinkJoin {
+    name = "etc-slurm";
+    paths = [ configFile cgroupConfig plugStackConfig ];
+  };
+
 in
 
 {
@@ -46,7 +61,17 @@ in
 
       client = {
         enable = mkEnableOption "slurm client daemon";
+      };
 
+      enableStools = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Wether to provide a slurm.conf file.
+          Enable this option if you do not run a slurm daemon on this host
+          (i.e. <literal>server.enable</literal> and <literal>client.enable</literal> are <literal>false</literal>)
+          but you still want to run slurm commands from this host.
+        '';
       };
 
       package = mkOption {
@@ -97,7 +122,7 @@ in
         example = "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP";
         description = ''
           Name by which the partition may be referenced. Note that now you have
-          to write patrition's parameters after the name.
+          to write the partition's parameters after the name.
         '';
       };
 
@@ -107,8 +132,8 @@ in
         description = ''
           If enabled srun will accept the option "--x11" to allow for X11 forwarding
           from within an interactive session or a batch job. This activates the
-          slurm-spank-x11 module. Note that this requires 'services.openssh.forwardX11'
-          to be enabled on the compute nodes.
+          slurm-spank-x11 module. Note that this option also enables
+          'services.openssh.forwardX11' on the client.
         '';
       };
 
@@ -130,6 +155,23 @@ in
           the end of the slurm configuration file.
         '';
       };
+
+      extraPlugstackConfig = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Extra configuration that will be added to the end of <literal>plugstack.conf</literal>.
+        '';
+      };
+
+      extraCgroupConfig = mkOption {
+        default = "";
+        type = types.lines;
+        description = ''
+          Extra configuration for <literal>cgroup.conf</literal>. This file is
+          used when <literal>procTrackType=proctrack/cgroup</literal>.
+        '';
+      };
     };
 
   };
@@ -142,7 +184,7 @@ in
       wrappedSlurm = pkgs.stdenv.mkDerivation {
         name = "wrappedSlurm";
 
-        propagatedBuildInputs = [ cfg.package configFile ];
+        propagatedBuildInputs = [ cfg.package etcSlurm ];
 
         builder = pkgs.writeText "builder.sh" ''
           source $stdenv/setup
@@ -155,7 +197,7 @@ in
           #!/bin/sh
           if [ -z "$SLURM_CONF" ]
           then
-            SLURM_CONF="${configFile}" "$EXE" "\$@"
+            SLURM_CONF="${etcSlurm}/slurm.conf" "$EXE" "\$@"
           else
             "$EXE" "\$0"
           fi
@@ -165,7 +207,7 @@ in
         '';
       };
 
-  in mkIf (cfg.client.enable || cfg.server.enable) {
+  in mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable) {
 
     environment.systemPackages = [ wrappedSlurm ];
 
@@ -190,6 +232,8 @@ in
       '';
     };
 
+    services.openssh.forwardX11 = mkIf cfg.client.enable (mkDefault true);
+
     systemd.services.slurmctld = mkIf (cfg.server.enable) {
       path = with pkgs; [ wrappedSlurm munge coreutils ]
         ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;

From b7e91f096a46c5e3d3b699ff54bbb1b0bcd5e847 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 1 Jun 2018 22:02:16 +0200
Subject: [PATCH 2973/3370] nixos/slurm: Add man pages to wrapedSlurm

The nixos module adds a new derivation to
systemPackages to make sure that the binaries
get the generated config file. This derivation
did not contain the man pages so far.
Activating the module now makes the man pages
available in the system environment.
---
 nixos/modules/services/computing/slurm/slurm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 82cf429936ea..02c0aabe0a74 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -204,6 +204,9 @@ in
           EOT
             chmod +x "$wrappername"
           done
+
+          mkdir -p $out/share
+          ln -s ${getBin cfg.package}/share/man $out/share/man
         '';
       };
 

From 8026127e47398df660cc818d6266a552ecca8c1c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 26 May 2018 11:51:45 +0200
Subject: [PATCH 2974/3370] slurm: add freeipmi, readline, libssh2, fix hwloc

* add freeipmi to get power meter readings
* readline support for scontrol
* libssh2 support for X11 supporta
* Add note to enableSrunX11 in module
* fix hwloc support (was detected by configure)
---
 .../services/computing/slurm/slurm.nix        |  2 ++
 pkgs/servers/computing/slurm/default.nix      | 25 +++++++++++++++----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 02c0aabe0a74..cf7fc8c75c1f 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -134,6 +134,8 @@ in
           from within an interactive session or a batch job. This activates the
           slurm-spank-x11 module. Note that this option also enables
           'services.openssh.forwardX11' on the client.
+
+          This option requires slurm to be compiled without native X11 support.
         '';
       };
 
diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index b0460f21bfaf..1603abac8dc1 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -1,5 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, libtool, curl, python, munge, perl, pam, openssl
+{ stdenv, fetchurl, pkgconfig, libtool, curl
+, python, munge, perl, pam, openssl
 , ncurses, mysql, gtk2, lua, hwloc, numactl
+, readline, freeipmi, libssh2, xorg
+# enable internal X11 support via libssh2
+, enableX11 ? true
 }:
 
 stdenv.mkDerivation rec {
@@ -13,6 +17,11 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
+  prePatch = stdenv.lib.optional enableX11 ''
+    substituteInPlace src/common/x11_util.c \
+        --replace '"/usr/bin/xauth"' '"${xorg.xauth}/bin/xauth"'
+  '';
+
   # nixos test fails to start slurmd with 'undefined symbol: slurm_job_preempt_mode'
   # https://groups.google.com/forum/#!topic/slurm-devel/QHOajQ84_Es
   # this doesn't fix tests completely at least makes slurmd to launch
@@ -20,14 +29,20 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = [
-    curl python munge perl pam openssl mysql.connector-c ncurses gtk2 lua hwloc numactl
-  ];
+    curl python munge perl pam openssl
+      mysql.connector-c ncurses gtk2
+      lua hwloc numactl readline freeipmi
+  ] ++ stdenv.lib.optionals enableX11 [ libssh2 xorg.xauth ];
 
-  configureFlags =
+  configureFlags = with stdenv.lib;
     [ "--with-munge=${munge}"
       "--with-ssl=${openssl.dev}"
+      "--with-hwloc=${hwloc.dev}"
+      "--with-freeipmi=${freeipmi}"
       "--sysconfdir=/etc/slurm"
-    ] ++ stdenv.lib.optional (gtk2 == null)  "--disable-gtktest";
+    ] ++ (optional (gtk2 == null)  "--disable-gtktest")
+      ++ (optional enableX11 "--with-libssh2=${libssh2.dev}");
+
 
   preConfigure = ''
     patchShebangs ./doc/html/shtml2html.py

From c8faa482fa3eae065f011505c4d244d5511171c0 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 1 Jun 2018 23:42:21 +0200
Subject: [PATCH 2975/3370] nixos/slurm: update test, add test for enableStools

* Add pure submit host to test 'enableStools'
* Disable client.enable on control machine
---
 nixos/tests/slurm.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index dc4f62af5640..c23d85e40020 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -1,7 +1,6 @@
 import ./make-test.nix ({ pkgs, ... }:
 let mungekey = "mungeverryweakkeybuteasytointegratoinatest";
     slurmconfig = {
-      client.enable = true;
       controlMachine = "control";
       nodeName = ''
         control
@@ -20,9 +19,12 @@ in {
         # TODO slrumd port and slurmctld port should be configurations and
         # automatically allowed by the  firewall.
         networking.firewall.enable = false;
-        services.slurm = slurmconfig;
+        services.slurm = {
+          client.enable = true;
+        } // slurmconfig;
       };
     in {
+
     control =
       { config, pkgs, ...}:
       {
@@ -31,17 +33,28 @@ in {
           server.enable = true;
         } // slurmconfig;
       };
+
+    submit =
+      { config, pkgs, ...}:
+      {
+        networking.firewall.enable = false;
+        services.slurm = {
+          enableStools = true;
+        } // slurmconfig;
+      };
+
     node1 = computeNode;
     node2 = computeNode;
     node3 = computeNode;
   };
 
+
   testScript =
   ''
   startAll;
 
   # Set up authentification across the cluster
-  foreach my $node (($control,$node1,$node2,$node3))
+  foreach my $node (($submit,$control,$node1,$node2,$node3))
   {
     $node->waitForUnit("default.target");
 
@@ -60,7 +73,7 @@ in {
   };
 
   subtest "can_start_slurmd", sub {
-    foreach my $node (($control,$node1,$node2,$node3))
+    foreach my $node (($node1,$node2,$node3))
     {
       $node->succeed("systemctl restart slurmd.service");
       $node->waitForUnit("slurmd");
@@ -72,7 +85,7 @@ in {
   subtest "run_distributed_command", sub {
     # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes).
     # The output must contain the 3 different names
-    $control->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq");
+    $submit->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq");
   };
   '';
 })

From f07ddeaa6708cd6ceab295d329b722a523c8edee Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 2 Jun 2018 00:37:54 +0200
Subject: [PATCH 2976/3370] slurm: add maintainer

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

diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix
index 1603abac8dc1..7a03bf75802b 100644
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@@ -60,6 +60,6 @@ stdenv.mkDerivation rec {
     description = "Simple Linux Utility for Resource Management";
     platforms = platforms.linux;
     license = licenses.gpl2;
-    maintainers = [ maintainers.jagajaga ];
+    maintainers = with maintainers; [ jagajaga markuskowa ];
   };
 }

From 933d7f37ace7928c10c99f760d18c561f6a631b7 Mon Sep 17 00:00:00 2001
From: Chaz Schlarp <schlarpc@gmail.com>
Date: Fri, 1 Jun 2018 17:56:53 -0700
Subject: [PATCH 2977/3370] cacert: fix certdata2pem url

Related to #39927

```
$ nix-prefetch-url https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py
path is '/nix/store/0d00axdac4h8ffxrf90s5zh8xdw3r29z-certdata2pem.py'
1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy
```
---
 pkgs/data/misc/cacert/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index 638a342e8eba..e867d0fbb4be 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -9,7 +9,7 @@ let
 
   certdata2pem = fetchurl {
     name = "certdata2pem.py";
-    url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20170717";
+    url = "https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py";
     sha256 = "1d4q27j1gss0186a5m8bs5dk786w07ccyq0qi6xmd2zr1a8q16wy";
   };
 

From fea0215ec0ce159cb776421d0b5eb07890818a96 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Fri, 1 Jun 2018 13:57:19 -0400
Subject: [PATCH 2978/3370] pass: Add pass-audit extension

---
 pkgs/tools/security/pass/extensions/audit.nix | 42 +++++++++++++++++++
 .../security/pass/extensions/default.nix      |  3 ++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/tools/security/pass/extensions/audit.nix

diff --git a/pkgs/tools/security/pass/extensions/audit.nix b/pkgs/tools/security/pass/extensions/audit.nix
new file mode 100644
index 000000000000..79dd1fadb01c
--- /dev/null
+++ b/pkgs/tools/security/pass/extensions/audit.nix
@@ -0,0 +1,42 @@
+{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }:
+
+let
+  pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]);
+
+in stdenv.mkDerivation rec {
+  name = "pass-audit-${version}";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "roddhjav";
+    repo = "pass-audit";
+    rev = "v${version}";
+    sha256 = "0v0db8bzpcaa7zqz17syn3c78mgvw4mpg8qg1gh5rmbjsjfxw6sm";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ pythonEnv ];
+
+  patchPhase = ''
+    sed -i -e "s|/usr/lib|$out/lib|" audit.bash
+    sed -i -e 's|$0|${pass}/bin/pass|' audit.bash
+  '';
+
+  dontBuild = true;
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postFixup = ''
+    wrapProgram $out/lib/password-store/extensions/audit.bash \
+      --prefix PATH : "${pythonEnv}/bin" \
+      --run "export PREFIX"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pass extension for auditing your password repository.";
+    homepage = https://github.com/roddhjav/pass-audit;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix
index dfb853c0a0bf..f69687e512b8 100644
--- a/pkgs/tools/security/pass/extensions/default.nix
+++ b/pkgs/tools/security/pass/extensions/default.nix
@@ -3,6 +3,9 @@
 with pkgs;
 
 {
+  pass-audit = callPackage ./audit.nix {
+    pythonPackages = python3Packages;
+  };
   pass-import = callPackage ./import.nix {
     pythonPackages = python3Packages;
   };

From 7d49699b701a987c2f0dd9a9e7a0ce1022db3b13 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Fri, 1 Jun 2018 14:14:12 -0400
Subject: [PATCH 2979/3370] pass-import: export PREFIX, set PASSWORD_STORE_BIN

---
 pkgs/tools/security/pass/extensions/import.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix
index 8ba4abc5e3db..9e69cf376210 100644
--- a/pkgs/tools/security/pass/extensions/import.nix
+++ b/pkgs/tools/security/pass/extensions/import.nix
@@ -18,13 +18,18 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ pythonEnv ];
 
+  patchPhase = ''
+    sed -i -e 's|$0|${pass}/bin/pass|' import.bash
+  '';
+
   dontBuild = true;
 
   installFlags = [ "PREFIX=$(out)" ];
 
   postFixup = ''
     wrapProgram $out/lib/password-store/extensions/import.bash \
-      --prefix PATH : "${pythonEnv}/bin"
+      --prefix PATH : "${pythonEnv}/bin" \
+      --run "export PREFIX"
   '';
 
   meta = with stdenv.lib; {

From 97f6be5c90de1d04391d855f2be588f827b2e7ae Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 2 Jun 2018 02:50:38 +0000
Subject: [PATCH 2980/3370] subversion_1_10: init at 1.10.0 (#41383)

---
 .../version-management/subversion/default.nix       | 13 ++++++++++---
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 6b8ef7b88e8e..8cbfe1ec1617 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -5,9 +5,9 @@
 , perlBindings ? false
 , javahlBindings ? false
 , saslSupport ? false
-, stdenv, fetchurl, apr, aprutil, zlib, sqlite
+, stdenv, fetchurl, apr, aprutil, zlib, sqlite, openssl, lz4, utf8proc
 , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
-, sasl ? null, serf ? null, openssl
+, sasl ? null, serf ? null
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
@@ -17,7 +17,7 @@ assert javahlBindings -> jdk != null && perl != null;
 
 let
 
-  common = { version, sha256 }: stdenv.mkDerivation (rec {
+  common = { version, sha256, extraBuildInputs ? [ ] }: stdenv.mkDerivation (rec {
     inherit version;
     name = "subversion-${version}";
 
@@ -30,6 +30,7 @@ let
     outputs = [ "out" "dev" "man" ];
 
     buildInputs = [ zlib apr aprutil sqlite openssl ]
+      ++ extraBuildInputs
       ++ stdenv.lib.optional httpSupport serf
       ++ stdenv.lib.optional pythonBindings python
       ++ stdenv.lib.optional perlBindings perl
@@ -114,4 +115,10 @@ in {
     version = "1.9.7";
     sha256 = "08qn94zaqcclam2spb4h742lvhxw8w5bnrlya0fm0bp17hriicf3";
   };
+
+  subversion_1_10 = common {
+    version = "1.10.0";
+    sha256 = "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic";
+    extraBuildInputs = [ lz4 utf8proc ];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e8edbe58f8b..df008f75af91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18014,7 +18014,7 @@ with pkgs;
       saslSupport = false;
       sasl = cyrus_sasl;
     })
-    subversion18 subversion19;
+    subversion18 subversion19 subversion_1_10;
 
   subversion = pkgs.subversion19;
 

From d866a4fdcd9e7e0dbe69d11f4ba63a5ecda70b07 Mon Sep 17 00:00:00 2001
From: Ivan Jager <aij+git@mrph.org>
Date: Sat, 26 May 2018 13:29:22 -0500
Subject: [PATCH 2981/3370] altcoins.aeon: 0.9.14.0 -> 0.12.0.0

Aeon was rebased onto a recent version of monero, so
aeon/default.nix now more closely matches monero/default.nix.
---
 pkgs/applications/altcoins/aeon/default.nix | 30 +++++++++++++--------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix
index cfbb1f24b198..0489c8b649f5 100644
--- a/pkgs/applications/altcoins/aeon/default.nix
+++ b/pkgs/applications/altcoins/aeon/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc, openssl, pkgconfig, unbound }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, git, doxygen, graphviz
+, boost, miniupnpc, openssl, unbound, cppzmq
+, zeromq, pcsclite, readline
+}:
 
 let
-  version = "0.9.14.0";
+  version = "0.12.0.0";
 in
 stdenv.mkDerivation {
   name = "aeon-${version}";
@@ -10,19 +13,24 @@ stdenv.mkDerivation {
     owner = "aeonix";
     repo = "aeon";
     rev = "v${version}";
-    sha256 = "0pl9nfhihj0wsdgvvpv5f14k4m2ikk8s3xw6nd8ymbnpxfzyxynr";
+    fetchSubmodules = true;
+    sha256 = "1schzlscslhqq7zcd68b1smqlaf7k789x1rwpplm7qi5iz9a8cfr";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ];
 
-  buildInputs = [ boost miniupnpc openssl unbound ];
+  buildInputs = [
+    boost miniupnpc openssl unbound
+    cppzmq zeromq pcsclite readline
+  ];
 
-  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"
-  '';
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=Release"
+    "-DBUILD_GUI_DEPS=ON"
+    "-DReadline_ROOT_DIR=${readline.dev}"
+  ];
+
+  hardeningDisable = [ "fortify" ];
 
   meta = with stdenv.lib; {
     description = "Private, secure, untraceable currency";

From 5bedf2351412b4cec838badcff3cce10aa92a9d8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 2 Jun 2018 03:14:27 +0000
Subject: [PATCH 2982/3370] p11-kit: 0.23.11 -> 0.23.12

0.23.11 breaks gnutls: https://github.com/p11-glue/p11-kit/issues/159
---
 pkgs/development/libraries/p11-kit/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index 225623fa4916..212547c63a0e 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "p11-kit-${version}";
-  version = "0.23.11";
+  version = "0.23.12";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = "p11-kit";
     rev = version;
-    sha256 = "08jfxml3w8gn85qz19ps1z8yb66k921z0cgzizqn1ipl9pp5pxyd";
+    sha256 = "0pb3qlddzbw7dglwnrl7fs9g71vhqk7qzxnb1i4nw633qgy21ga1";
   };
 
   outputs = [ "out" "dev"];
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
 
   doInstallCheck = false; # probably a bug in this derivation
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = https://p11-glue.freedesktop.org/;

From 33aed158e0a34133d3dedc4bdc2baa64df05fdbf Mon Sep 17 00:00:00 2001
From: patternspandemic <patternspandemic@live.com>
Date: Sat, 2 Jun 2018 00:45:08 -0700
Subject: [PATCH 2983/3370] ponyc: 0.22.2 -> 0.22.3 (#41380)

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

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index 998d7cd90dee..a074c3d3a369 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.22.2";
+  version = "0.22.3";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1sw038mci4174zn8n3b4p511bdwjb3hwrv5gyzbv477nna1y9lvn";
+    sha256 = "0av664n3k73psn00bd36pibkyc5b530aqqiqpg4mw2ks060dm40v";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From 4d88c022d0d8ca8b856733aff9e3b131202dd4ac Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Sat, 2 Jun 2018 10:06:28 +0200
Subject: [PATCH 2984/3370] mapmap: init at 0.6.1 (#41228)

The Nix package currently doesn't support video textures, just still images.
When I figure out why video textures don't work I will provide a fix.
---
 pkgs/applications/video/mapmap/default.nix | 63 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/applications/video/mapmap/default.nix

diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix
new file mode 100644
index 000000000000..6569caad6c52
--- /dev/null
+++ b/pkgs/applications/video/mapmap/default.nix
@@ -0,0 +1,63 @@
+{ stdenv 
+, fetchFromGitHub
+, qttools
+, qtbase
+, qtmultimedia
+, liblo
+, gst_all_1
+, qmake
+, pkgconfig
+}:
+
+with stdenv;
+
+mkDerivation rec {
+
+  version = "0.6.1";
+  name = "mapmap-${version}";
+
+  src = fetchFromGitHub {
+    owner = "mapmapteam";
+    repo = "mapmap";
+    rev = version;
+    sha256 = "15km6xmfkxhrflq4sl9m9r85zi4shrr4k5h15x17v7x0qkc3xgsh";
+  };
+
+  nativeBuildInputs = [
+    qmake
+    pkgconfig
+  ];
+
+  buildInputs = [
+    qttools
+    qtmultimedia
+    liblo
+    gst_all_1.gstreamer
+    gst_all_1.gstreamermm
+    gst_all_1.gst-libav
+    gst_all_1.gst-vaapi
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp mapmap $out/bin/mapmap
+    mkdir -p $out/share/applications/
+    sed 's|Icon=/usr/share/icons/hicolor/scalable/apps/mapmap.svg|Icon=mapmap|g' resources/texts/mapmap.desktop > $out/share/applications/mapmap.desktop
+    mkdir -p $out/share/icons/hicolor/scalable/apps/
+    cp resources/images/logo/mapmap.* $out/share/icons/hicolor/scalable/apps/
+  '';
+
+  # RPATH in /tmp hack
+  # preFixup = ''
+  #   rm -r $NIX_BUILD_TOP/__nix_qt5__
+  # '';
+
+  meta = with stdenv.lib; {
+    description = "Open source video mapping software";
+    homepage = https://github.com/mapmapteam/mapmap;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.erictapen ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0dfd5631eac..872266a7a7c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16787,6 +16787,8 @@ with pkgs;
 
   makeself = callPackage ../applications/misc/makeself { };
 
+  mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
+
   marathon = callPackage ../applications/networking/cluster/marathon { };
   marathonctl = callPackage ../tools/virtualization/marathonctl { } ;
 

From a1bc16a18f553eebc3e1c2f9cae18c35c1607969 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 2 Jun 2018 01:08:27 -0700
Subject: [PATCH 2985/3370] aws-sdk-cpp: 1.4.40 -> 1.4.50 (#40694)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/aws-sdk-cpp/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.4.50 with grep in /nix/store/kg9d5flfl989yxfcppyq886g60mfhpzy-aws-sdk-cpp-1.4.50
- directory tree listing: https://gist.github.com/2faf1d98f152431438b23c93bd489e09
- du listing: https://gist.github.com/9df0b904ab22201191bb2261798bb0a3
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 18aeef04a770..46e6a73433d0 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.4.40";
+  version = "1.4.50";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "16n5p29pf062mfsn7q8q8hw0ppxb02a0kkakd0vjrybqflpgf42j";
+    sha256 = "1qly5zn7w9j8w6a9pjw25xnr01sfq8dn8g5zrz6xyjgz590fj2x7";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From 9290905b3abb975323017a748b9dbae8f56f3e0d Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Sat, 2 Jun 2018 11:44:24 +0300
Subject: [PATCH 2986/3370] adobe_flex_sdk: 4.0.0.14159 -> apache-flex-sdk:
 4.16.1 (#41257)

---
 .../compilers/adobe-flex-sdk/default.nix      | 41 --------------
 .../compilers/apache-flex-sdk/default.nix     | 56 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 58 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/compilers/adobe-flex-sdk/default.nix
 create mode 100644 pkgs/development/compilers/apache-flex-sdk/default.nix

diff --git a/pkgs/development/compilers/adobe-flex-sdk/default.nix b/pkgs/development/compilers/adobe-flex-sdk/default.nix
deleted file mode 100644
index 1512ef396558..000000000000
--- a/pkgs/development/compilers/adobe-flex-sdk/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, unzip }:
-
-stdenv.mkDerivation rec {
-  name = "adobe-flex-sdk-4.0.0.14159";
-
-  src = fetchurl {
-    # This is the open source distribution
-    url = http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4/flex_sdk_4.0.0.14159_mpl.zip;
-    sha256 = "1x12sji6g42bm1h7jndkda5vpah6vnkpc13qwq0c4xvbsh8757v5";
-  };
-
-  phases = "installPhase";
-
-  buildInputs = [ unzip ];
-
-  # Why do shell scripts have \r\n ??
-  # moving to /opt because jdk has lib/xercesImpl.jar as well
-  installPhase = ''
-    unzip ${src}
-    t=$out/opt/flex-sdk
-    mkdir -p $t $out/bin
-    mv * $t
-    rm $t/bin/*.exe $t/bin/*.bat
-    sed 's/
$//' -i $t/bin/*
-    for i in $t/bin/*; do
-      b="$(basename "$i")";
-    cat > "$out/bin/$b" << EOF
-    #!/bin/sh
-    exec $t/bin/$b "\$@"
-    EOF
-      chmod +x $out/bin/$b $t/bin/$b
-    done
-  '';
-
-  meta = {
-    description = "Flex SDK for Adobe Flash / ActionScript";
-    homepage = "https://www.adobe.com/products/flex.html";
-    license = stdenv.lib.licenses.mpl11;
-    platforms = stdenv.lib.platforms.unix;
-  };
-}
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix
new file mode 100644
index 000000000000..e8759ec073b3
--- /dev/null
+++ b/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+
+let
+  playerglobal_ver = "27.0";
+  playerglobal = fetchurl {
+    url = "https://fpdownload.macromedia.com/get/flashplayer/updaters/27/playerglobal27_0.swc";
+    sha256 = "0qw2bgls8qsmp80j8vpd4c7s0c8anlrk0ac8z42w89bajcdbwk2f";
+  };
+in stdenv.mkDerivation rec {
+  name = "apache-flex-sdk-${version}";
+  version = "4.16.1";
+
+  src = fetchurl {
+    url = "https://www.apache.org/dist/flex/${version}/binaries/${name}-bin.tar.gz";
+    sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildInputs = [ jre ];
+
+  buildPhase = ":";
+
+  postPatch = ''
+    shopt -s extglob
+    for i in bin/!(aasdoc|acompc|amxmlc); do
+      substituteInPlace $i --replace "java " "${jre}/bin/java "
+    done
+  '';
+
+  installPhase = ''
+    t=$out/opt/apache-flex-sdk
+    mkdir -p $t $out/bin
+    mv * $t
+    rm $t/bin/*.bat
+    ln -s $t/bin/* $out/bin/
+
+    for i in $out/bin/!(aasdoc|acompc|amxmlc); do
+      wrapProgram $i \
+        --set FLEX_HOME $t \
+        --set PLAYERGLOBAL_HOME $t/frameworks/libs/player/ 
+    done
+
+    mkdir -p $t/frameworks/libs/player/${playerglobal_ver}/
+    cp ${playerglobal} $t/frameworks/libs/player/${playerglobal_ver}/playerglobal.swc
+  '';
+  
+  fixupPhase = ":";
+
+  meta = with stdenv.lib; {
+    description = "Flex SDK for Adobe Flash / ActionScript";
+    homepage = "https://flex.apache.org/";
+    license = with licenses; [ asl20 ];
+    maintainers = with maintainers; [ dywedir ];
+  };
+}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 458250acce64..f310fd156c33 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -37,6 +37,7 @@ mapAliases (rec {
   QmidiNet = qmidinet;  # added 2016-05-22
   accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
   adobeReader = adobe-reader; # added 2013-11-04
+  adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01
   ag = silver-searcher; # added 2018-04-25
   aircrackng = aircrack-ng; # added 2016-01-14
   ammonite-repl = ammonite; # added 2017-05-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 872266a7a7c9..893bdb31d68f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6119,7 +6119,7 @@ with pkgs;
 
   elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });
 
-  adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };
+  apache-flex-sdk = callPackage ../development/compilers/apache-flex-sdk { };
 
   fpc = callPackage ../development/compilers/fpc { };
 

From 799a461b9ea5175e859613667a803f46b52ba494 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@users.noreply.github.com>
Date: Sat, 2 Jun 2018 10:45:02 +0200
Subject: [PATCH 2987/3370] bulletml: fix build failure due to
 -Wformat-security (#41387)

Some files are built with -Wno-format, which is not compatible with the
default hardening setting of -Wformat-security in Nixpkgs.
---
 pkgs/development/libraries/bulletml/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/bulletml/default.nix b/pkgs/development/libraries/bulletml/default.nix
index 240cc057a821..b61ac1dcb09f 100644
--- a/pkgs/development/libraries/bulletml/default.nix
+++ b/pkgs/development/libraries/bulletml/default.nix
@@ -38,6 +38,7 @@ in stdenv.mkDerivation {
     "-C src"
   ];
   nativeBuildInputs = [ bison perl ];
+  hardeningDisable = [ "format" ];
 
   installPhase = ''
     install -D -m 644 src/bulletml.d "$out"/include/d/bulletml.d

From b25c25170dc5dfcd0d9bd93a94dc5f072fe8e461 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@users.noreply.github.com>
Date: Sat, 2 Jun 2018 11:01:01 +0200
Subject: [PATCH 2988/3370] zeronet: init at 0.6.2 (#40883)

---
 .../networking/p2p/zeronet/default.nix        | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/networking/p2p/zeronet/default.nix

diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix
new file mode 100644
index 000000000000..8a8d1b33ca73
--- /dev/null
+++ b/pkgs/applications/networking/p2p/zeronet/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, python2Packages }:
+
+python2Packages.buildPythonApplication rec {
+  pname = "zeronet";
+  version = "0.6.2";
+
+  src = fetchFromGitHub {
+    owner = "HelloZeroNet";
+    repo = "ZeroNet";
+    rev = "v${version}";
+    sha256 = "0v19jjirkyv8hj2yfdj0c40zwynn51h2bj4issn5blr95vhfm8s7";
+  };
+
+  propagatedBuildInputs = with python2Packages; [ msgpack gevent ];
+
+  format = "other";
+
+  buildPhase = "${python2Packages.python.interpreter} -O -m compileall .";
+
+  installPhase = ''
+    mkdir -p $out/share
+    cp -r plugins src tools *.py $out/share/
+  '';
+
+  # Wrap the main executable and set the log and data dir to something out of
+  # the store
+  postFixup = ''
+    makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \
+        --set PYTHONPATH "$PYTHONPATH" \
+        --set PATH ${python2Packages.python}/bin \
+        --add-flags "--log_dir \$HOME/.local/share/zeronet/logs" \
+        --add-flags "--data_dir \$HOME/.local/share/zeronet"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Decentralized websites using Bitcoin crypto and BitTorrent network";
+    homepage = "https://zeronet.io/";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ fgaz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 893bdb31d68f..3c0e04dd2635 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18936,6 +18936,8 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  zeronet = callPackage ../applications/networking/p2p/zeronet { };
+
   zexy = callPackage ../applications/audio/pd-plugins/zexy  { };
 
   zgrviewer = callPackage ../applications/graphics/zgrviewer {};

From 04f0e08c9102bed3cbdc1d9eb900b377e6375632 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Sat, 2 Jun 2018 02:16:45 -0700
Subject: [PATCH 2989/3370] ipfs: 0.4.14 -> 0.4.15 (#41376)

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

diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix
index 4153d527b9ff..56dc9fc4d5a2 100644
--- a/pkgs/applications/networking/ipfs/default.nix
+++ b/pkgs/applications/networking/ipfs/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "ipfs-${version}";
-  version = "0.4.14";
+  version = "0.4.15";
   rev = "v${version}";
 
   goPackagePath = "github.com/ipfs/go-ipfs";
@@ -10,7 +10,7 @@ buildGoPackage rec {
   extraSrcPaths = [
     (fetchgx {
       inherit name src;
-      sha256 = "0gad5y5clkrk5jsjj9gmrlnx8kbn2vg50vka1b8jg7b55hdvvlcg";
+      sha256 = "0bysfh2hd040i8lnyzhy96frflls4kdnlw748cl51ngqg3rwbhgz";
     })
   ];
 
@@ -18,7 +18,7 @@ buildGoPackage rec {
     owner = "ipfs";
     repo = "go-ipfs";
     inherit rev;
-    sha256 = "0wvjw8jziwhvfwhksg26qlj2irznl5bs2yll9jkv335pnwb5qi3v";
+    sha256 = "1ry4a4pq26dbwy2b9cwi3xjaiyq6sng9lxnb1n30zxhp4w7rla2h";
   };
 
   meta = with stdenv.lib; {

From 52fdec3c1dedaf9c7396d0ee5532135a64ed2075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jun 2018 11:30:41 +0200
Subject: [PATCH 2990/3370] bison: drop non-applying patch on Darwin

The Darwin case seems newly fixed in the tarballs now.
Beware: the affected file is *not* in bison's git repo (gitignored),
but it is in tarballs and is used during build (yummy!)
---
 pkgs/development/tools/parsing/bison/3.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix
index 921f5d2d948c..287bb8beb524 100644
--- a/pkgs/development/tools/parsing/bison/3.x.nix
+++ b/pkgs/development/tools/parsing/bison/3.x.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rnml9spd6p0i5qy9g4r82drwdr09r1z9cf4p89agbrkxqmrsffd";
   };
 
-  patches = stdenv.lib.optional hostPlatform.isDarwin stdenv.secure-format-patch;
+  patches = []; # remove on another rebuild
 
   nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man;
   propagatedBuildInputs = [ m4 ];

From 5a4d428d7c3b725a92f8f6e3eb2bb579d5563a4a Mon Sep 17 00:00:00 2001
From: Meghea Iulian <iulian.meghea@gmail.com>
Date: Sat, 2 Jun 2018 13:35:29 +0300
Subject: [PATCH 2991/3370] gitkraken: 3.6.1 -> 3.6.3

---
 pkgs/applications/version-management/gitkraken/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 74364327645d..dc983e003365 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "gitkraken-${version}";
-  version = "3.6.1";
+  version = "3.6.3";
 
   src = fetchurl {
     url = "https://release.gitkraken.com/linux/v${version}.deb";
-    sha256 = "1f77y281r3dp35vw3zdai2cgwwy2gpg7px6g66ylfz4gkig26dz8";
+    sha256 = "1bl4zz4k9whv5q6bkf6hyki26dkjhm19rzx2800zzadbrdgs7iz4";
   };
 
   libPath = makeLibraryPath [

From d7412d0b1615260fc84d346010bcfe6ed955d4aa Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 2 Jun 2018 14:01:24 +0200
Subject: [PATCH 2992/3370] nixos/slurm: remove propagatedBuidInputs from
 slurmWrapped

propagatedBuildInputs = [ cfg.package etcSlurm ]; had no effect
---
 nixos/modules/services/computing/slurm/slurm.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index cf7fc8c75c1f..1e1c5bc9f035 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -186,8 +186,6 @@ in
       wrappedSlurm = pkgs.stdenv.mkDerivation {
         name = "wrappedSlurm";
 
-        propagatedBuildInputs = [ cfg.package etcSlurm ];
-
         builder = pkgs.writeText "builder.sh" ''
           source $stdenv/setup
           mkdir -p $out/bin

From 35a284ad4aa18153d69ac1749d98a3e5b969ba0d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 2 Jun 2018 10:02:43 -0400
Subject: [PATCH 2993/3370] sbt: 1.1.4 -> 1.1.6

---
 pkgs/development/tools/build-managers/sbt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 04102e7e8f86..76d099625626 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "1.1.4";
+  version = "1.1.6";
 
   src = fetchurl {
     urls = [
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"
       "https://cocl.us/sbt-${version}.tgz"
     ];
-    sha256 = "0hc361gb71psadx9gj78j0j60fw4sljjk8sl45hw6yzx3hmmkg9g";
+    sha256 = "1hb8gcf3shcp4a65pnlqdlp8j5as7prqvw3d0b5bnfjfi0qbaigm";
   };
 
   patchPhase = ''

From 8b5ed12952300846928555b20fc10893f9df3965 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 2 Jun 2018 16:13:38 +0200
Subject: [PATCH 2994/3370] libbsd-freedesktop: re-init at 0.9.1, use for samba

a partial rollback of #41320

samba is already Linux-only because of acl, and it is unclear what the
problem is with upstream netbsd-compat.
---
 pkgs/development/libraries/libbsd/default.nix | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/libbsd/default.nix

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
new file mode 100644
index 000000000000..114d3209b58a
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libbsd-${version}";
+  version = "0.9.1";
+
+  src = fetchurl {
+    url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
+  };
+
+  patches = [];
+
+  meta = with stdenv.lib; {
+    description = "Common functions found on BSD systems, Freedesktop fork";
+    homepage = https://libbsd.freedesktop.org/;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e2c3eb4b954..ee3f266d2dd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12938,6 +12938,7 @@ with pkgs;
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
+    libbsd = libbsd-freedesktop;
   };
 
   sambaMaster = callPackage ../servers/samba/master.nix { };
@@ -21491,6 +21492,8 @@ with pkgs;
 
   libbsd = netbsd.compat;
 
+  libbsd-freedesktop = callPackage ../development/libraries/libbsd {};
+
   inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
           netbsd;
 

From 44b52c10ea094720fe7d427ee9e38008872a5a3d Mon Sep 17 00:00:00 2001
From: Adel Prokurov <34094162+aprokurov@users.noreply.github.com>
Date: Sat, 2 Jun 2018 18:56:07 +0300
Subject: [PATCH 2995/3370] spotify: 1.0.79.223.g92622cc2-21 ->
 1.0.80.480.g51b03ac3-13 (#41356)

Version 1.0.79.223.g92622cc2-21 doesn't exists in [spotify](https://repository-origin.spotify.com/pool/non-free/s/spotify-client/) repository, so i updated it to exists version
---
 pkgs/applications/audio/spotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 5f6772256cab..b8495465db55 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -7,7 +7,7 @@ let
   # Latest version number can be found at:
   # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/
   # Be careful not to pick the testing version.
-  version = "1.0.79.223.g92622cc2-21";
+  version = "1.0.80.480.g51b03ac3-13";
 
   deps = [
     alsaLib
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-    sha256 = "1x1rpprzin4cmz1spzw036b4phd0yk1v7idlrcy4pkv97b4g5dw6";
+    sha256 = "e32f4816ae79dbfa0c14086e76df3bc83d526402aac1dbba534127fc00fe50ea";
   };
 
   buildInputs = [ dpkg makeWrapper ];

From 82cd6a3c77a55793d8db878a0276c4f0a8e71a17 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 2 Jun 2018 19:09:52 +0200
Subject: [PATCH 2996/3370] calibre: 2.24.1 -> 2.25.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 68f95195b6e7..93a5d9428534 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.24.1";
+  version = "3.25.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1hgjnw8ynvpcfry4vanz5f54sjq55pqidvyy47lz59cz0s8lx50b";
+    sha256 = "018gxjbj5rak4ys5nyx6749rj9vszlf9k1wdcpl60ap3l83kxdnd";
   };
 
   patches = [

From dcea0913e5e66f44660b5de7451672bebee7b871 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 2 Jun 2018 13:50:45 -0400
Subject: [PATCH 2997/3370] qt: fixup from
 c4cac55d6979ccdbc48cf0daf26e44c79cf5d0f9

This commit was too aggressive in adding configure flags. Only qtbsea
needs the -no-framework flag to work correctly. Qmake will handle
everything else for us.
---
 pkgs/development/libraries/qt-5/mkDerivation.nix   | 3 ---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/mkDerivation.nix b/pkgs/development/libraries/qt-5/mkDerivation.nix
index 53949ddd4925..96014cfbc779 100644
--- a/pkgs/development/libraries/qt-5/mkDerivation.nix
+++ b/pkgs/development/libraries/qt-5/mkDerivation.nix
@@ -16,9 +16,6 @@ let
       optional (!debug) "-DQT_NO_DEBUG"
       ++ lib.toList (args.NIX_CFLAGS_COMPILE or []);
 
-    configureFlags = [ "-no-framework" ]
-                  ++ (args.configureFlags or []);
-
     cmakeFlags =
       (args.cmakeFlags or [])
       ++ [
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 28b250437d08..2bd832300282 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -298,6 +298,7 @@ stdenv.mkDerivation {
           "-no-fontconfig"
           "-qt-freetype"
           "-qt-libpng"
+          "-no-framework"
         ]
       else
         [

From 49dc36c9a8576b69fe50a7789dc6ef9d6c3ca584 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 2 Jun 2018 18:17:22 +0000
Subject: [PATCH 2998/3370] pandas: fix check with the current pytest

pandas 0.23.0 has fixed this too, but it introduces new test failures.
---
 pkgs/development/python-modules/pandas/default.nix  |  2 ++
 .../pandas/pandas-0.22.0-pytest-3.5.1.patch         | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 3f9188a6322a..cb497742e47a 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -55,6 +55,8 @@ in buildPythonPackage rec {
     xlwt
   ];
 
+  patches = [ ./pandas-0.22.0-pytest-3.5.1.patch ];
+
   # For OSX, we need to add a dependency on libcxx, which provides
   # `complex.h` and other libraries that pandas depends on to build.
   postPatch = optionalString isDarwin ''
diff --git a/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch b/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch
new file mode 100644
index 000000000000..cba71b91316a
--- /dev/null
+++ b/pkgs/development/python-modules/pandas/pandas-0.22.0-pytest-3.5.1.patch
@@ -0,0 +1,13 @@
+--- a/pandas/tests/io/test_pytables.py
++++ b/pandas/tests/io/test_pytables.py
+@@ -5028,8 +5028,8 @@ class TestHDFStore(Base):
+             with ensure_clean_path(self.path) as path:
+                 with catch_warnings(record=True):
+                     with pytest.raises(
+-                        ValueError, msg=("cannot have non-object label "
+-                                         "DataIndexableCol")):
++                        ValueError, message=("cannot have non-object label "
++                                             "DataIndexableCol")):
+                         df.to_hdf(path, 'df', format='table',
+                                   data_columns=True)
+ 

From 078b9b4c2b3348c3972c89acc66cdea48c5ec824 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Sat, 2 Jun 2018 21:13:43 +0000
Subject: [PATCH 2999/3370] lib: test for bitAnd, bitOr, bitXor

---
 lib/tests/misc.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index c683df7d7ca3..eab20d0f14dc 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -45,6 +45,21 @@ runTests {
     expected = true;
   };
 
+  testBitAnd = {
+    expr = (bitAnd 3 10);
+    expected = 2;
+  };
+
+  testBitOr = {
+    expr = (bitOr 3 10);
+    expected = 11;
+  };
+
+  testBitXor = {
+    expr = (bitXor 3 10);
+    expected = 9;
+  };
+
 # STRINGS
 
   testConcatMapStrings = {

From c52beb18ad03e803b80473c843efcdac119bba74 Mon Sep 17 00:00:00 2001
From: Okina Matara <okinan@chiru.no>
Date: Sat, 2 Jun 2018 19:58:34 -0500
Subject: [PATCH 3000/3370] multimc: 0.6.1 -> 0.6.2

---
 pkgs/games/multimc/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index 35444f82f66e..c6697f5806d4 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -4,12 +4,12 @@ let
   libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
 in stdenv.mkDerivation rec {
   name = "multimc-${version}";
-  version = "0.6.1";
+  version = "0.6.2";
   src = fetchFromGitHub {
     owner = "MultiMC";
     repo = "MultiMC5";
     rev = version;
-    sha256 = "0glsf4vfir8w24bpinf3cx2ninrcp7hpq9cl463wl78dvqfg47kx";
+    sha256 = "07jrr6si8nzfqwf073zhgw47y6snib23ad3imh1ik1nn5r7wqy3c";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [ cmake file makeWrapper ];
@@ -18,6 +18,9 @@ in stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
+    mkdir -p $out/share/{applications,pixmaps}
+    cp ../application/resources/multimc/scalable/multimc.svg $out/share/pixmaps
+    cp ../application/package/linux/multimc.desktop $out/share/applications
     wrapProgram $out/bin/MultiMC --add-flags "-d \$HOME/.multimc/" --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} --prefix PATH : ${jdk}/bin/
   '';
 

From 4ae5f8a92aa1e8ae21c3e40d5cbb29fae424de1b Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sat, 2 Jun 2018 23:07:12 -0400
Subject: [PATCH 3001/3370] qt: remove install_name_tool stuff

hopefully it's not needed - the frameworks are no longer there
---
 .../libraries/qt-5/modules/qtbase.nix          | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 2bd832300282..0c7af9e185dd 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -374,24 +374,6 @@ stdenv.mkDerivation {
     ''
 
     + (
-      if stdenv.isDarwin
-      then
-        ''
-          fixDarwinDylibNames_rpath() {
-            local flags=()
-
-            for fn in "$@"; do
-              flags+=(-change "@rpath/$fn.framework/Versions/5/$fn" "$out/lib/$fn.framework/Versions/5/$fn")
-            done
-
-            for fn in "$@"; do
-              echo "$fn: fixing dylib"
-              install_name_tool -id "$out/lib/$fn.framework/Versions/5/$fn" "''${flags[@]}" "$out/lib/$fn.framework/Versions/5/$fn"
-            done
-          }
-          fixDarwinDylibNames_rpath "QtConcurrent" "QtPrintSupport" "QtCore" "QtSql" "QtDBus" "QtTest" "QtGui" "QtWidgets" "QtNetwork" "QtXml" "QtOpenGL"
-        ''
-      else
         # fixup .pc file (where to find 'moc' etc.)
         ''
           sed -i "$dev/lib/pkgconfig/Qt5Core.pc" \

From 33ff34f3a21c7f8870159835be2152ddf3d148e2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 3 Jun 2018 15:51:22 +0800
Subject: [PATCH 3002/3370] pulseaudio-ctl: init at 1.66

---
 .../audio/pulseaudio-ctl/default.nix          | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/audio/pulseaudio-ctl/default.nix

diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix
new file mode 100644
index 000000000000..6e1e576043d1
--- /dev/null
+++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, makeWrapper
+, bc, dbus, gawk, gnused, libnotify, pulseaudioLight }:
+
+let
+  path = stdenv.lib.makeBinPath [ bc dbus gawk gnused libnotify pulseaudioLight ];
+  pname = "pulseaudio-ctl";
+
+in stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "1.66";
+
+  src = fetchFromGitHub {
+    owner = "graysky2";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "19a24w7y19551ar41q848w7r1imqkl9cpff4dpb7yry7qp1yjg0y";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace /usr $out
+
+    substituteInPlace common/${pname}.in \
+      --replace '$0' ${pname}
+  '';
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postFixup = ''
+    wrapProgram $out/bin/${pname} \
+      --prefix PATH : ${path}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils.";
+    homepage = https://bbs.archlinux.org/viewtopic.php?id=124513;
+    license = licenses.mit;
+    maintainers = with maintainers; [ peterhoeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3f266d2dd7..066ffb6583d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17498,6 +17498,8 @@ with pkgs;
 
   ptask = callPackage ../applications/misc/ptask { };
 
+  pulseaudio-ctl = callPackage ../applications/audio/pulseaudio-ctl { };
+
   pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
 
   pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };

From 323c2a1c6b1fe17d7f32451ad82e646c5e610e3c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 3 Jun 2018 09:55:26 +0200
Subject: [PATCH 3003/3370] mpd: fix spelling in description

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

diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix
index 500a9e35a13b..94020ed05d67 100644
--- a/nixos/modules/services/audio/mpd.nix
+++ b/nixos/modules/services/audio/mpd.nix
@@ -133,7 +133,7 @@ in {
         defaultText = ''''${dataDir}/tag_cache'';
         description = ''
           The path to MPD's database. If set to <literal>null</literal> the
-          paramter is omitted from the configuration.
+          parameter is omitted from the configuration.
         '';
       };
     };

From 83e4f663473317a858f8b41db478a853beaec1ab Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sun, 3 Jun 2018 10:05:32 +0200
Subject: [PATCH 3004/3370] prosody: 0.10.1 -> 0.10.2

Fixes CVE-2018-10847 [1] and a bunch of minor things [2].

[1] https://prosody.im/security/advisory_20180531/
[2] http://blog.prosody.im/prosody-0-10-2-security-release/
---
 pkgs/servers/xmpp/prosody/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 6f092dd80cde..40f630999450 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -25,12 +25,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.10.1";
+  version = "0.10.2";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "1kmmpkkgymg1r8r0k8j83pgmiskg1phl8hmpzjrnvlvsfnrnjplr";
+    sha256 = "13knr7izscw0zx648b9582dx11aap4cq9bzfiqh5ykd7wwsz1dbm";
   };
 
   communityModules = fetchhg {

From 33a51d78a2c1e6c32f80e0bc321613e9bc78a17f Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sun, 3 Jun 2018 12:00:27 +0200
Subject: [PATCH 3005/3370] imagemagick: depend on fftw for fft feature

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 4b8d2ab291b7..daa48e515b0a 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchpatch, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
-, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp
+, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw
 , ApplicationServices
 , buildPlatform, hostPlatform
 }:
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional stdenv.isDarwin ApplicationServices;
 
   propagatedBuildInputs =
-    [ bzip2 freetype libjpeg lcms2 ]
+    [ bzip2 freetype libjpeg lcms2 fftw ]
     ++ lib.optionals (!hostPlatform.isMinGW)
       [ libX11 libXext libXt libwebp ]
     ;

From 122f66a51315ecd9d7cd4b2d882a195a7ef4f550 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Sun, 3 Jun 2018 12:09:02 +0200
Subject: [PATCH 3006/3370] imagemagick: set license metadata

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

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index daa48e515b0a..3af6e19b7011 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -101,5 +101,6 @@ stdenv.mkDerivation rec {
     description = "A software suite to create, edit, compose, or convert bitmap images";
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ the-kenny wkennington ];
+    license = licenses.asl20;
   };
 }

From 613e4dec6b5360b7a0af02fd78e6ebd60c1462dd Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 23 May 2018 10:55:16 +0300
Subject: [PATCH 3007/3370] jetbrains.idea-community: 2018.1.3 -> 2018.1.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 5c882738a0bc..777ceeec8433 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -276,12 +276,12 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
-      sha256 = "0ws5s8bvjpz60pdyak3vb22x27qi00ajxx18wia1hql8831gsk3m"; /* updated by script */
+      sha256 = "1qb425wg4690474g348yizhkcqcgigz2synp4blcfv4p0pg79ri6"; /* updated by script */
     };
     wmClass = "jetbrains-idea-ce";
     update-channel = "IDEA_Release";

From 60762627bf1bd358264876be00ad87ea88e15a0a Mon Sep 17 00:00:00 2001
From: Ioannis Koutras <ioannis.koutras@gmail.com>
Date: Wed, 23 May 2018 10:56:13 +0300
Subject: [PATCH 3008/3370] jetbrains.idea-ultimate: 2018.1.3 -> 2018.1.4

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 777ceeec8433..8064ffeb7f55 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -289,12 +289,12 @@ in
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "2018.1.3"; /* updated by script */
+    version = "2018.1.4"; /* updated by script */
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz";
-      sha256 = "14h71x3jidwiwv73g48f6bd0y4p3s33jb4wdr5grdhm677pqb702"; /* updated by script */
+      sha256 = "0jn771z09bscnk283kwrki0zyzhh4v4n6mr2swbd0ccs9v12dx71"; /* updated by script */
     };
     wmClass = "jetbrains-idea";
     update-channel = "IDEA_Release";

From 646767e9615bd3fff5d0765f011393008d31bc4d Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sun, 3 Jun 2018 12:15:51 -0400
Subject: [PATCH 3009/3370] ctags: fix source url (#41382)

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

diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix
index af40f3df20fa..86136084d840 100644
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/pkgs/development/tools/misc/ctags/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   revision = "816";
 
   src = fetchsvn {
-    url = "https://ctags.svn.sourceforge.net/svnroot/ctags/trunk";
+    url = https://svn.code.sf.net/p/ctags/code/trunk;
     rev = revision;
     sha256 = "0jmbkrmscbl64j71qffcc39x005jrmphx8kirs1g2ws44wil39hf";
   };

From 2c382eda621c47976a3448a38275cecf8cfbc9b0 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Sun, 3 Jun 2018 20:02:28 +0300
Subject: [PATCH 3010/3370] skim: 0.3.2 -> 0.4.0 (#41417)

---
 pkgs/tools/misc/skim/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix
index 709cbbe07912..169389928d06 100644
--- a/pkgs/tools/misc/skim/default.nix
+++ b/pkgs/tools/misc/skim/default.nix
@@ -2,18 +2,18 @@
 
 rustPlatform.buildRustPackage rec {
   name = "skim-${version}";
-  version = "0.3.2";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "lotabout";
     repo = "skim";
     rev = "v${version}";
-    sha256 = "0spkkgjjrch1grb0115rn0wxzsh8pzmm96a7j69zy5pc1il2m5lp";
+    sha256 = "067ds1sdi9ya1yqz9saczj1vml8arwzd46w35gmvdxgmxx4wmihs";
   };
 
   outputs = [ "out" "vim" ];
 
-  cargoSha256 = "0zbjnii8r41ih2m2vqhm3wdiwgi13kipvxx75sg4vm4maf4wpmhv";
+  cargoSha256 = "18lgjh1b1wfm9xsd6y6slfj1i3dwrvzkzszdzk3lmqx1f8515gx7";
 
   patchPhase = ''
     sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
     description = "Fuzzy Finder in rust!";
     homepage = https://github.com/lotabout/skim;
     license = licenses.mit;
-    maintainers = [];
+    maintainers = with maintainers; [ dywedir ];
     platforms = platforms.all;
   };
 }

From e92c4285935fa97a14946fdc649a51aecd8dd692 Mon Sep 17 00:00:00 2001
From: Vladyslav M <dywedir@pm.me>
Date: Sun, 3 Jun 2018 20:10:38 +0300
Subject: [PATCH 3011/3370] synapse-bt: init at 2018-06-04 (#41402)

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

diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix
new file mode 100644
index 000000000000..c8d54e945bf9
--- /dev/null
+++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl }:
+
+rustPlatform.buildRustPackage rec {
+  name = "synapse-bt-unstable-${version}";
+  version = "2018-06-04";
+
+  src = fetchFromGitHub {
+    owner = "Luminarys";
+    repo = "synapse";
+    rev = "ec8f23a14af21426ab0c4f8953dd954f747850ab";
+    sha256 = "0d1rrwnk333zz9g8s40i75xgdkpz6a1j01ajsh32yvzvbi045zkw";
+  };
+
+  cargoSha256 = "1psrmgf6ddzqwx7gf301rx84asfnvxpsvkx2fan453v65819k960";
+
+  buildInputs = [ pkgconfig openssl ];
+
+  cargoBuildFlags = [ "--all" ];
+
+  meta = with stdenv.lib; {
+    description = "Flexible and fast BitTorrent daemon";
+    homepage = https://synapse-bt.org/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ dywedir ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 943781e3e6fc..8079f6a416d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17138,6 +17138,8 @@ with pkgs;
     inherit (gnome3) libgee;
   };
 
+  synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { };
+
   synfigstudio = callPackage ../applications/graphics/synfigstudio {
     fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };
     inherit (gnome3) defaultIconTheme;

From fdafb70453ac17e139015f549176bbf90f52b4b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Sun, 3 Jun 2018 20:46:01 +0200
Subject: [PATCH 3012/3370] Add myself as maintainer

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4f28823f0c24..e11e7edcc691 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -58,6 +58,11 @@
     github = "DamienCassou";
     name = "Damien Cassou";
   };
+  das_j = {
+    email = "janne@hess.ooo";
+    github = "dasJ";
+    name = "Janne Heß";
+  };
   DerGuteMoritz = {
     email = "moritz@twoticketsplease.de";
     github = "DerGuteMoritz";

From c1419f0e63ea885ba374608d721aa16d44a83c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Sun, 3 Jun 2018 20:46:40 +0200
Subject: [PATCH 3013/3370] Add myself as maintainer for dnsdist

See Mic92's comment at #38658
---
 pkgs/servers/dns/dnsdist/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix
index 7369713dc86a..772292b0a57e 100644
--- a/pkgs/servers/dns/dnsdist/default.nix
+++ b/pkgs/servers/dns/dnsdist/default.nix
@@ -30,5 +30,6 @@
     description = "DNS Loadbalancer";
     homepage = "https://dnsdist.org";
     license = licenses.gpl2;
+    maintainers = with maintainers; [ das_j ];
   };
 }

From e01a2dec8be0a8e8efa63b0bcf7913aa166294bf Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 16 Apr 2018 02:22:22 +0200
Subject: [PATCH 3014/3370] claws-mail: add support for python plugin

---
 .../mailreaders/claws-mail/default.nix        | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 10daeeab8e13..4d3c8a797412 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -1,7 +1,7 @@
-{ fetchurl, stdenv, wrapGAppsHook
+{ fetchurl, stdenv, wrapGAppsHook, autoreconfHook
 , curl, dbus, dbus-glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor-icon-theme
 , libarchive, libcanberra-gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager
-, openldap , perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2
+, openldap, perl, pkgconfig, poppler, python, shared-mime-info, webkitgtk24x-gtk2
 , glib-networking, gsettings-desktop-schemas, libSM, libytnef
 
 # Build options
@@ -10,7 +10,6 @@
 #       provided:
 #         gdata requires libgdata
 #         geolocation requires libchamplain
-#         python requires python
 , enableLdap ? false
 , enableNetworkManager ? false
 , enablePgp ? true
@@ -19,6 +18,7 @@
 , enablePluginNotificationDialogs ? true
 , enablePluginNotificationSounds ? true
 , enablePluginPdf ? false
+, enablePluginPython ? false
 , enablePluginRavatar ? false
 , enablePluginRssyl ? false
 , enablePluginSmime ? false
@@ -43,16 +43,22 @@ stdenv.mkDerivation rec {
 
   patches = [ ./mime.patch ];
 
+  preConfigure = ''
+    # autotools check tries to dlopen libpython as a requirement for the python plugin
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${python}/lib
+  '';
+
   postPatch = ''
     substituteInPlace src/procmime.c \
         --subst-var-by MIMEROOTDIR ${shared-mime-info}/share
   '';
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook python.pkgs.wrapPython ];
+  propagatedBuildInputs = with python.pkgs; [ python ] ++ optionals enablePluginPython [ pygtk pygobject2 ];
 
   buildInputs =
     [ curl dbus dbus-glib gtk2 gnutls gsettings-desktop-schemas hicolor-icon-theme
-      libetpan perl python glib-networking libSM libytnef
+      libetpan perl glib-networking libSM libytnef
     ]
     ++ optional enableSpellcheck enchant
     ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ]
@@ -77,6 +83,7 @@ stdenv.mkDerivation rec {
     ++ optional (!enablePluginArchive) "--disable-archive-plugin"
     ++ optional (!enablePluginFancy) "--disable-fancy-plugin"
     ++ optional (!enablePluginPdf) "--disable-pdf_viewer-plugin"
+    ++ optional (!enablePluginPython) "--disable-python-plugin"
     ++ optional (!enablePluginRavatar) "--disable-libravatar-plugin"
     ++ optional (!enablePluginRssyl) "--disable-rssyl-plugin"
     ++ optional (!enablePluginSmime) "--disable-smime-plugin"
@@ -87,8 +94,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  pythonPath = with python.pkgs; [ pygobject2 pygtk ];
+
   preFixup = ''
-    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share")
+    buildPythonPath "$out $pythonPath"
+    gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share" --prefix PYTHONPATH : "$program_PYTHONPATH")
   '';
 
   postInstall = ''

From b3e7923b94bb99cebb699bcd75486aa1e277dfe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Sun, 3 Jun 2018 21:22:55 +0200
Subject: [PATCH 3015/3370] nixos/exim: Add unit restart trigger (#41418)

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

diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix
index 440eae281f40..f9ee3f909660 100644
--- a/nixos/modules/services/mail/exim.nix
+++ b/nixos/modules/services/mail/exim.nix
@@ -94,6 +94,7 @@ in
     systemd.services.exim = {
       description = "Exim Mail Daemon";
       wantedBy = [ "multi-user.target" ];
+      restartTriggers = [ config.environment.etc."exim.conf".source ];
       serviceConfig = {
         ExecStart   = "${exim}/bin/exim -bdf -q30m";
         ExecReload  = "${coreutils}/bin/kill -HUP $MAINPID";

From f569a0a684f07dcdf41bd398cc881caaa20c9f7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Sun, 3 Jun 2018 20:48:17 +0200
Subject: [PATCH 3016/3370] schema2ldif: Init at 1.3

---
 pkgs/tools/text/schema2ldif/default.nix | 31 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/text/schema2ldif/default.nix

diff --git a/pkgs/tools/text/schema2ldif/default.nix b/pkgs/tools/text/schema2ldif/default.nix
new file mode 100644
index 000000000000..699d2d28b82b
--- /dev/null
+++ b/pkgs/tools/text/schema2ldif/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, makeWrapper, perl, perlPackages }: stdenv.mkDerivation rec {
+  name = "schema2ldif-${version}";
+  version = "1.3";
+
+  src = fetchurl {
+    url = "https://repos.fusiondirectory.org/sources/schema2ldif/schema2ldif-${version}.tar.gz";
+    sha256 = "00cd9xx9g0mnnfn5lvay3vg166z84jla0ya1x34ljdc8bflxsr9a";
+  };
+
+  buildInputs = [ perl ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+
+    cp bin/{schema2ldif,ldap-schema-manager} $out/bin
+    gzip -c man/schema2ldif.1 > $out/share/man/man1/schema2ldif.1.gz
+    gzip -c man/ldap-schema-manager.1 > $out/share/man/man1/ldap-schema-manager.1.gz
+
+    wrapProgram $out/bin/schema2ldif \
+       --prefix PERL5PATH : "${stdenv.lib.makePerlPath [ perlPackages.GetoptLong perlPackages.PodUsage ]}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Utilities to manage schema in .schema and .ldif format";
+    homepage = "https://www.fusiondirectory.org/schema2ldif-project-and-components/";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ das_j ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc8bd0773769..f5616b5f57bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4911,6 +4911,8 @@ with pkgs;
 
   sharutils = callPackage ../tools/archivers/sharutils { };
 
+  schema2ldif = callPackage ../tools/text/schema2ldif { };
+
   shocco = callPackage ../tools/text/shocco { };
 
   shotwell = callPackage ../applications/graphics/shotwell { };

From 96606abf82caafb6defbe32a91b4ec14deaa1740 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 3 Jun 2018 19:43:24 +0000
Subject: [PATCH 3017/3370] SDL: propagate libiconv

SDL/SDL.h includes SDL/SDL_stdinc.h which includes iconv.h, therefore all
packages that include SDL.h should be able to include iconv.h

Fixes SDL_gfx, SDL_image etc. on Darwin.
---
 pkgs/development/libraries/SDL/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 7e96cf84686f..d40b25cd8040 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  propagatedBuildInputs = [ ]
+  propagatedBuildInputs = [ libiconv ]
     ++ optionals x11Support [ libXext libICE libXrandr ]
     ++ optional stdenv.isLinux libcap
     ++ optionals openglSupport [ libGL libGLU ]
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     ++ optional pulseaudioSupport libpulseaudio
     ++ optional stdenv.isDarwin Cocoa;
 
-  buildInputs = [ libiconv ]
+  buildInputs = [ ]
     ++ optional (!hostPlatform.isMinGW) audiofile
     ++ optionals stdenv.isDarwin [ AudioUnit CoreAudio CoreServices Kernel OpenGL ];
 
@@ -119,6 +119,8 @@ stdenv.mkDerivation rec {
 
   passthru = { inherit openglSupport; };
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A cross-platform multimedia library";
     homepage    = "http://www.libsdl.org/";

From a47d34cebe37e80329c2ce551c3f895b2b5f3e58 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 3 Jun 2018 22:11:29 +0200
Subject: [PATCH 3018/3370] pythonPackages.jira: fix build (#41419)

The build for `pythonPackages.jira` failed with the following error:

```
Download error on https://pypi.python.org/simple/sphinx/: [Errno -2] Name or service not known -- Some packages may not be found!
Couldn't find index page for 'sphinx' (maybe misspelled?)
Download error on https://pypi.python.org/simple/: [Errno -2] Name or service not known -- Some packages may not be found!
No local packages or working download links found for sphinx>=1.6.5
Traceback (most recent call last):
  ...
  File "/nix/store/bp4dillg6xxblpf00v8d9nxfx3bnggfy-python3.6-bootstrapped-pip-10.0.1/lib/python3.6/site-packages/setuptools/command/easy_install.py", line 667, in easy_install
    raise DistutilsError(msg)
distutils.errors.DistutilsError: Could not find suitable distribution for Requirement.parse('sphinx>=1.6.5')
builder for '/nix/store/8dv7mpspyk6kxwnzqb43rzm4q5j14xp0-python3.6-jira-1.0.15.drv' failed with exit code 1
```

The root issue is most likely caused by some docs fixes upstream
(https://github.com/pycontribs/jira/commit/519183d874fde26e676a75aa53496968643aaac0)
which were released in 1.0.15. The bump (without the fix) has been
performed in 7a6bf668fb73cd4d1096fa1c0162d9c6009f1d7e. Since `sphinx`
isn't needed during runtime, it's not necessary to use it as
`propagatedBuildInput`. In order to work around this the dependency had
to be removed from from `setup.py`.

See https://hydra.nixos.org/build/75004048 for further reference
---
 .../python-modules/jira/default.nix            | 18 ++++++++++++------
 .../python-modules/jira/sphinx-fix.patch       | 11 +++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/python-modules/jira/sphinx-fix.patch

diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix
index 2a1abe7b59ce..ac4f45f4e9d3 100644
--- a/pkgs/development/python-modules/jira/default.nix
+++ b/pkgs/development/python-modules/jira/default.nix
@@ -1,29 +1,35 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k
 , pytest, pytestrunner, pbr, glibcLocales , pytestcov
-, requests, requests_oauthlib, requests_toolbelt, defusedxml }:
+, requests, requests_oauthlib, requests_toolbelt, defusedxml
+, ipython
+}:
 
 buildPythonPackage rec {
   pname = "jira";
   version = "1.0.15";
 
+  PBR_VERSION = version;
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "20108a1d5b0dd058d5d4e0047f2d09ee06aaa413b22ca4d5c249e86167417fe8";
   };
 
   buildInputs = [ glibcLocales pytest pytestcov pytestrunner pbr ];
-  propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml ];
+  propagatedBuildInputs = [ requests requests_oauthlib requests_toolbelt defusedxml pbr ipython ];
+
+  # impure tests because of connectivity attempts to jira servers
+  doCheck = false;
+
+  patches = [ ./sphinx-fix.patch ];
 
   LC_ALL = "en_US.utf8";
 
   disabled = !isPy3k;
 
-  # no tests in release tarball
-  doCheck = false;
-
   meta = with lib; {
     description = "This library eases the use of the JIRA REST API from Python.";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ globin ];
+    maintainers = with maintainers; [ globin ma27 ];
   };
 }
diff --git a/pkgs/development/python-modules/jira/sphinx-fix.patch b/pkgs/development/python-modules/jira/sphinx-fix.patch
new file mode 100644
index 000000000000..ccc47ac4b9cf
--- /dev/null
+++ b/pkgs/development/python-modules/jira/sphinx-fix.patch
@@ -0,0 +1,11 @@
+diff --git a/setup.py b/setup.py
+index c49a24d..31aeec2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -11,5 +11,5 @@ except ImportError:
+ 
+ 
+ setuptools.setup(
+-    setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner', 'sphinx>=1.6.5'],
++    setup_requires=['pbr>=3.0.0', 'setuptools>=17.1', 'pytest-runner'],
+     pbr=True)

From 76f6dc177220296ca32bb76ad662198b5d5eaced Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 3 Jun 2018 15:20:21 -0500
Subject: [PATCH 3019/3370] shadowsocks-libev: supports darwin (#41421)

---
 .../networking/shadowsocks-libev/default.nix      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
index 2823917fc31d..d2e8a9a30519 100644
--- a/pkgs/tools/networking/shadowsocks-libev/default.nix
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -24,6 +24,19 @@ stdenv.mkDerivation rec {
     cp lib/* $out/lib
     chmod +x $out/bin/*
     mv $out/pkgconfig $out/lib
+
+    ${stdenv.lib.optionalString stdenv.isDarwin ''
+      install_name_tool -change libcork.dylib $out/lib/libcork.dylib $out/lib/libipset.dylib
+      install_name_tool -change libbloom.dylib $out/lib/libbloom.dylib $out/lib/libipset.dylib
+
+      for exe in $out/bin/*; do
+        install_name_tool -change libmbedtls.dylib ${mbedtls}/lib/libmbedtls.dylib $exe
+        install_name_tool -change libmbedcrypto.dylib ${mbedtls}/lib/libmbedcrypto.dylib $exe
+        install_name_tool -change libcork.dylib $out/lib/libcork.dylib $exe
+        install_name_tool -change libipset.dylib $out/lib/libipset.dylib $exe
+        install_name_tool -change libbloom.dylib $out/lib/libbloom.dylib $exe
+      done
+    ''}
   '';
 
   meta = with stdenv.lib; {
@@ -35,6 +48,6 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/shadowsocks/shadowsocks-libev;
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.nfjinjing ];
-    platforms = platforms.linux;
+    platforms = platforms.all;
   };
 }

From 214b35d11521573de3f6b3dcf3cc421d41ce4b7e Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 3 Jun 2018 20:37:40 +0000
Subject: [PATCH 3020/3370] freeimage: fix build with glibc 2.27

---
 pkgs/development/libraries/freeimage/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index 157f9f3936ec..b2c66ad346d0 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation {
       url = patchURL + "/Fix-CVE-2016-5684.patch";
       sha256 = "14ffgqbnwg28r6sjvm3z89zbnnm9ghbc81hdhrzxlyk3vwvd6cw3";
     })
+    (fetchurl {
+      url = https://raw.githubusercontent.com/buildroot/buildroot/2018.05/package/libfreeimage/0005-Manage-powf64-with-glibc.patch;
+      sha256 = "1lis479ad5cfkhqm044nk4x97wfwm3hry3bvij1w5xkndnlfppc2";
+    })
   ];
 
   buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools;
@@ -57,6 +61,8 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_COMPILE = "-Wno-narrowing";
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Open Source library for accessing popular graphics image file formats";
     homepage = http://freeimage.sourceforge.net/;

From 64fd1ceb38009c20ba8f56542aad154532384d20 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 3 Jun 2018 20:41:36 +0000
Subject: [PATCH 3021/3370] certbot: disable check on darwin

On Hydra it fails with "Too many open files":
https://hydra.nixos.org/build/64286041
https://hydra.nixos.org/build/75419471
---
 pkgs/tools/admin/certbot/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 7a26896bbc28..353abe9c8bca 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -42,6 +42,8 @@ pythonPackages.buildPythonApplication rec {
     done
   '';
 
+  doCheck = !stdenv.isDarwin; # On Hydra Darwin tests fail with "Too many open files".
+
   meta = with stdenv.lib; {
     homepage = src.meta.homepage;
     description = "ACME client that can obtain certs and extensibly update server configurations";

From 93cb47a2fc93637b4c5a92f2648e53c5b0de00c9 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 3 Jun 2018 20:48:42 +0000
Subject: [PATCH 3022/3370] python.pkgs.detox: 0.11 -> 0.12

Fixes build with python.pkgs.tox 3.0.0.
---
 pkgs/development/python-modules/detox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix
index ea50eebb38cb..7c3aa87e9b89 100644
--- a/pkgs/development/python-modules/detox/default.nix
+++ b/pkgs/development/python-modules/detox/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "detox";
-  version = "0.11";
+  version = "0.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4719ca48c4ea5ffd908b1bc3d5d1b593b41e71dee17180d58d8a3e7e8f588d45";
+    sha256 = "06svvkszg6xlg0fr471smn4rmpfga960d6qqsyhyiwa48k59n4gk";
   };
 
   buildInputs = [ pytest ];

From 332b9dedc87b364a652c80aca675cd5282268519 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sun, 3 Jun 2018 16:56:17 -0400
Subject: [PATCH 3023/3370] rust: disable tests on darwin

See https://github.com/rust-lang/rust/issues/51006

Tests frequently fail on Darwin. Not sure why but it's easier to just disable for now.
---
 pkgs/development/compilers/rust/rustc.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 19c4a590e454..277ffda20afd 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -10,7 +10,11 @@
 , targets
 , targetPatches
 , targetToolchains
-, doCheck ? true
+
+# Tests frequently break on Darwin
+# See the rust issue: https://github.com/rust-lang/rust/issues/51006
+, doCheck ? (!stdenv.isDarwin)
+
 , broken ? false
 , buildPlatform, hostPlatform
 } @ args:

From 0644b4d9483704a04ecef3134ca55549255af83d Mon Sep 17 00:00:00 2001
From: lewo <lewo@abesis.fr>
Date: Sun, 3 Jun 2018 22:58:23 +0200
Subject: [PATCH 3024/3370] dockerTools.pullImage: expose image* attributes
 (#41366)

Attributes `imageName` and `imageTag` are exposed if the image is
built by our Nix tools but not if the image is pulled. So, we expose
these attributes for convenience and homogeneity.
---
 pkgs/build-support/docker/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 0e10ba036a06..b01f0b722724 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -47,6 +47,8 @@ rec {
     }:
 
     runCommand name {
+      inherit imageName imageDigest;
+      imageTag = finalImageTag;
       impureEnvVars = pkgs.stdenv.lib.fetchers.proxyImpureEnvVars;
       outputHashMode = "flat";
       outputHashAlgo = "sha256";

From ea52ca64e8fe1553316f851cb8a4a542e8b120ad Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 3 Jun 2018 17:28:17 -0400
Subject: [PATCH 3025/3370] Fix GHCJS 8.4/8.2 in sandboxed builds (#41411)

---
 .../compilers/ghcjs-ng/configured-ghcjs-src.nix          | 7 ++++++-
 pkgs/development/compilers/ghcjs-ng/default.nix          | 9 ++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
index e8c24b21134c..57d9fccd266b 100644
--- a/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
+++ b/pkgs/development/compilers/ghcjs-ng/configured-ghcjs-src.nix
@@ -6,6 +6,8 @@
 , cabal-install
 , gmp
 , runCommand
+, lib
+, stdenv
 
 , ghc
 , happy
@@ -20,15 +22,18 @@ runCommand "configured-ghcjs-src" {
     autoconf
     automake
     python3
-    gcc
     ghc
     happy
     alex
     cabal-install
+  ] ++ lib.optionals stdenv.isDarwin [
+    gcc # https://github.com/ghcjs/ghcjs/issues/663
   ];
   inherit ghcjsSrc;
 } ''
   export HOME=$(pwd)
+  mkdir $HOME/.cabal
+  touch $HOME/.cabal/config
   cp -r "$ghcjsSrc" "$out"
   chmod -R +w "$out"
   cd "$out"
diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 7f13c373942d..04c3431f6f23 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -50,13 +50,10 @@ let
   };
 
   bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;
-  libexec =
-    if builtins.compareVersions bootGhcjs.version "8.3" <= 0
-      then "${bootGhcjs}/bin"
-      else "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin"] ["osx"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
+  libexec = "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin"] ["osx"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
 
 in stdenv.mkDerivation {
-    name = "ghcjs";
+    name = bootGhcjs.name;
     src = passthru.configuredSrc;
     nativeBuildInputs = [
       bootGhcjs
@@ -73,6 +70,8 @@ in stdenv.mkDerivation {
     phases = ["unpackPhase" "buildPhase"];
     buildPhase = ''
       export HOME=$TMP
+      mkdir $HOME/.cabal
+      touch $HOME/.cabal/config
       cd lib/boot
 
       mkdir -p $out/bin

From 0edad9f5c8d3deb6950537256f6077c2b086896c Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sun, 3 Jun 2018 23:49:27 +0200
Subject: [PATCH 3026/3370] steam: add optional extraProfile

---
 pkgs/games/steam/chrootenv.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index c44a166268cc..4de5f6608186 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -3,6 +3,7 @@
 , withJava ? false
 , withPrimus ? false
 , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
+, extraProfile ? "" # string to append to profile
 , nativeOnly ? false
 , runtimeOnly ? false
 }:
@@ -178,7 +179,7 @@ in buildFHSUserEnv rec {
 
   profile = ''
     export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"}
-  '';
+  '' + extraProfile;
 
   runScript = writeScript "steam-wrapper.sh" ''
     #!${stdenv.shell}

From 5b96694e2d85e3c4bd3324719b630a0d2a6b2423 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 3 Jun 2018 21:11:39 +0000
Subject: [PATCH 3027/3370] perlPackages.CPANPLUS: restore build inputs removed
 in #41394

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d4a3ee1234e5..6081e832e063 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2905,7 +2905,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
       sha256 = "1q4b0fkdn4sh8ym9dig21w96p7kzrhq66lqhn0dy1l3pgx413zlc";
     };
-    doCheck = false;
+    propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ];
     meta = {
       homepage = https://github.com/jib/cpanplus-devel;
       description = "Ameliorated interface to the CPAN";

From 39c2df48d510a287fba3790a0fda9bda8e82bc2c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 3 Jun 2018 21:19:54 +0000
Subject: [PATCH 3028/3370] freecell-solver: fix build

---
 pkgs/games/freecell-solver/default.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix
index a096b17b71a5..3dc9857d4552 100644
--- a/pkgs/games/freecell-solver/default.nix
+++ b/pkgs/games/freecell-solver/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, cmake
 , perl, gmp, libtap, gperf
-, perlPackages, python3Packages }:
+, perlPackages, python3 }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
@@ -13,11 +13,20 @@ stdenv.mkDerivation rec{
     sha256 = "1cmaib69pijmcpvgjvrdry8j4xys8l906l80b8z21vvyhdwrfdnn";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake perl gmp libtap gperf
-    perlPackages.TemplateToolkit perlPackages.StringShellQuote
-    perlPackages.GamesSolitaireVerify perlPackages.TaskFreecellSolverTesting
-    python3Packages.python python3Packages.random2 ];
+  nativeBuildInputs = [
+    cmake perl pkgconfig
+  ] ++ (with perlPackages; TaskFreecellSolverTesting.buildInputs ++ [
+    GamesSolitaireVerify StringShellQuote TaskFreecellSolverTesting TemplateToolkit
+  ]);
+
+  buildInputs = [
+    gmp libtap gperf
+    python3 python3.pkgs.random2
+  ];
+
+  # "ninja t/CMakeFiles/delta-states-test.t.exe.dir/__/delta_states.c.o" fails
+  # to depend on the generated "is_king.h".
+  enableParallelBuilding = false;
 
   meta = {
     description = "A FreeCell automatic solver";

From 264254568b46d4280bea65214f94a0e751ca16e7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 4 Jun 2018 02:00:32 +0000
Subject: [PATCH 3029/3370] python.pkgs.cairocffi: 0.8.0 -> 0.8.1

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

diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index a8a8ac110f10..dbc747399b44 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "cairocffi";
-  version = "0.8.0";
+  version = "0.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0i9m3p39g9wrkpjvpawch2qmnmm3cnim7niz3nmmbcp2hrkixwk5";
+    sha256 = "0y373vafv7q35msg7gqdn7niifr3j4j4n070hflxshahs59irss7";
   };
 
   LC_ALL = "en_US.UTF-8";

From 6db9f4685a310f1ae65e35afacd977d2ed8fb01d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 4 Jun 2018 02:35:39 +0000
Subject: [PATCH 3030/3370] python.pkgs.cairocffi: update tests for Cairo
 1.15.12

Fixes #41183
---
 .../cairocffi-0.8.1-cairo-1.15.12.patch       | 24 +++++++++++++++++++
 .../python-modules/cairocffi/default.nix      |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch

diff --git a/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch b/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch
new file mode 100644
index 000000000000..4d142275b9e8
--- /dev/null
+++ b/pkgs/development/python-modules/cairocffi/cairocffi-0.8.1-cairo-1.15.12.patch
@@ -0,0 +1,24 @@
+diff --git a/cairocffi/test_cairo.py b/cairocffi/test_cairo.py
+index 1588349..5452910 100644
+--- a/cairocffi/test_cairo.py
++++ b/cairocffi/test_cairo.py
+@@ -292,7 +292,8 @@ def test_pdf_surface():
+         pdf_bytes = file_obj.getvalue()
+         assert pdf_bytes.startswith(b'%PDF')
+         assert b'/MediaBox [ 0 0 123 432 ]' in pdf_bytes
+-        assert pdf_bytes.count(b'/Type /Page\n') == 1
++        assert pdf_bytes.count(b'/Type /Pages') == 1
++        assert pdf_bytes.count(b'/Type /Page') == 2
+ 
+     file_obj = io.BytesIO()
+     surface = PDFSurface(file_obj, 1, 1)
+@@ -306,7 +307,8 @@ def test_pdf_surface():
+     assert b'/MediaBox [ 0 0 1 1 ]' not in pdf_bytes
+     assert b'/MediaBox [ 0 0 12 100 ]' in pdf_bytes
+     assert b'/MediaBox [ 0 0 42 700 ]' in pdf_bytes
+-    assert pdf_bytes.count(b'/Type /Page\n') == 2
++    assert pdf_bytes.count(b'/Type /Pages') == 1
++    assert pdf_bytes.count(b'/Type /Page') == 3
+ 
+ 
+ def test_svg_surface():
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index dbc747399b44..a9c4a3437b58 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -47,6 +47,7 @@ buildPythonPackage rec {
       gdk_pixbuf = gdk_pixbuf.out;
     })
     ./fix_test_scaled_font.patch
+    ./cairocffi-0.8.1-cairo-1.15.12.patch
   ];
 
   meta = with lib; {

From 1c7acb09fa50b122ba6df52da2bc03e2aa0450d8 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 4 Jun 2018 04:06:09 +0000
Subject: [PATCH 3031/3370] python.pkgs.trustme: fix python2 build

---
 pkgs/development/python-modules/trustme/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix
index 0c3ccb5258e7..db966ed4421e 100644
--- a/pkgs/development/python-modules/trustme/default.nix
+++ b/pkgs/development/python-modules/trustme/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, cryptography, pytest, pyopenssl, service-identity }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, cryptography, futures, pytest, pyopenssl, service-identity }:
 
 buildPythonPackage rec {
   pname = "trustme";
@@ -15,6 +15,8 @@ buildPythonPackage rec {
   '';
   propagatedBuildInputs = [
     cryptography
+  ] ++ lib.optionals (!isPy3k) [
+    futures
   ];
 
   meta = {

From ca0e52edc3f15ce1fca5e7f8e4accc718ea93e1f Mon Sep 17 00:00:00 2001
From: Geoffrey Huntley <ghuntley@ghuntley.com>
Date: Mon, 4 Jun 2018 15:45:25 +1000
Subject: [PATCH 3032/3370] kubernetes: corrected spelling mistake in docs
 (#41439)

---
 nixos/modules/services/cluster/kubernetes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/cluster/kubernetes/default.nix b/nixos/modules/services/cluster/kubernetes/default.nix
index 501925597023..e624f41601b3 100644
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@@ -78,7 +78,7 @@ let
     };
 
     caFile = mkOption {
-      description = "${prefix} certificate authrority file used to connect to kube-apiserver.";
+      description = "${prefix} certificate authority file used to connect to kube-apiserver.";
       type = types.nullOr types.path;
       default = cfg.caFile;
     };

From 61f5b9d6c4d45c5c5ffc469ca5335ec7ffe947ab Mon Sep 17 00:00:00 2001
From: Thomas Kerber <tk@drwx.org>
Date: Mon, 4 Jun 2018 07:41:20 +0100
Subject: [PATCH 3033/3370] nixos/gitea: Respect gitea-dump enable option.
 (#41437)

---
 nixos/modules/services/misc/gitea.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 45dfdc71eb36..46efc1df12eb 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -356,7 +356,7 @@ in
         text = cfg.database.password;
       })));
 
-    systemd.services.gitea-dump = {
+    systemd.services.gitea-dump = mkIf cfg.dump.enable {
        description = "gitea dump";
        after = [ "gitea.service" ];
        wantedBy = [ "default.target" ];
@@ -376,7 +376,7 @@ in
        };
     };
 
-    systemd.timers.gitea-dump = {
+    systemd.timers.gitea-dump = mkIf cfg.dump.enable {
       description = "Update timer for gitea-dump";
       partOf = [ "gitea-dump.service" ];
       wantedBy = [ "timers.target" ];

From 07e1ae54a65e0a6359cb7ded62cad0e9bb8f2fcd Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 4 Jun 2018 06:46:30 +0000
Subject: [PATCH 3034/3370] plotutils: fix parallel building

E.g. https://hydra.nixos.org/build/75429322:

     b_closepl.c:21:10: fatal error: xmi.h: No such file or directory
     make[2]: *** [Makefile:958: b_closepl.lo] Error 1
     make[2]: Leaving directory '/build/plotutils-2.6/libplot'
---
 pkgs/tools/graphics/plotutils/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix
index 85685e0b0482..780e09ee91cf 100644
--- a/pkgs/tools/graphics/plotutils/default.nix
+++ b/pkgs/tools/graphics/plotutils/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ libpng ];
   patches = map fetchurl (import ./debian-patches.nix);
 
+  preBuild = ''
+    # Fix parallel building.
+    make -C libplot xmi.h
+  '';
+
   configureFlags = "--enable-libplotter"; # required for pstoedit
 
   hardeningDisable = [ "format" ];

From e5dedc5f3b5a4b3473f635c946d2f241ea53c79a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 4 Jun 2018 08:40:39 +0000
Subject: [PATCH 3035/3370] perlPackages.CPANPLUS: add cpanp dependency

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6081e832e063..aefa04703eb4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2905,7 +2905,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/B/BI/BINGOS/${name}.tar.gz";
       sha256 = "1q4b0fkdn4sh8ym9dig21w96p7kzrhq66lqhn0dy1l3pgx413zlc";
     };
-    propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ];
+    propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants TermUI ];
     meta = {
       homepage = https://github.com/jib/cpanplus-devel;
       description = "Ameliorated interface to the CPAN";

From 1398d0c3128323f02e4e380c64bf817823a278c6 Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine.chikhaoui91@gmail.com>
Date: Mon, 4 Jun 2018 10:23:40 +0100
Subject: [PATCH 3036/3370] avoid redundant rm calls

---
 nixos/modules/virtualisation/google-compute-image.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 5957c95a86dd..de2c43b8a40a 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -253,12 +253,11 @@ in
               mv -f $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key* /etc/ssh/
               chmod 600 /etc/ssh/ssh_host_ed25519_key
               chmod 644 /etc/ssh/ssh_host_ed25519_key.pub
-              rm $SSH_HOST_KEYS_DIR/*
           else
               echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed."
               false
           fi
-          rm -r $SSH_HOST_KEYS_DIR
+          rm -rf $SSH_HOST_KEYS_DIR
         '';
       serviceConfig.Type = "oneshot";
       serviceConfig.RemainAfterExit = true;

From d26b629b4c4c6251dd12524a01883b70011f2f0a Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 4 Jun 2018 11:25:38 +0000
Subject: [PATCH 3037/3370] znapzend: fix build

fix build by pinning old versions of Perl Libraries
---
 pkgs/tools/backup/znapzend/default.nix | 34 ++++++++++++++++++--------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 796a34c253a9..7cef9971d765 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -1,6 +1,22 @@
-{ stdenv, fetchFromGitHub, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
+{ stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
 
 let
+  Mojolicious-6-46 = perlPackages.buildPerlPackage rec {
+    name = "Mojolicious-6.46";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/S/SR/SRI/${name}.tar.gz";
+      sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr";
+    };
+  };
+  MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec {
+    name = "Mojo-IOLoop-ForkCall-0.17";
+    src = fetchurl {
+      url = "mirror://cpan/authors/id/J/JB/JBERGER/${name}.tar.gz";
+      sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8";
+    };
+    propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ];
+  };
+
   version = "0.18.0";
   checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd";
 in
@@ -14,9 +30,7 @@ stdenv.mkDerivation rec {
     sha256 = checksum;
   };
 
-  buildInputs = [ perl perlPackages.TestHarness perlPackages.Mojolicious
-                  perlPackages.TAPParserSourceHandlerpgTAP perlPackages.MojoIOLoopForkCall
-                  perlPackages.IOPipely wget ];
+  buildInputs = [ wget perl perlPackages.TestHarness MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ];
 
   nativeBuildInputs = [ autoconf automake ];
 
@@ -38,25 +52,25 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \
       "${perl}/bin/perl \
       -I${perlPackages.TestHarness}/${perl.libPrefix} \
-      -I${perlPackages.Mojolicious}/${perl.libPrefix} \
+      -I${Mojolicious-6-46}/${perl.libPrefix} \
       -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
-      -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
+      -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
       -I${perlPackages.IOPipely}/${perl.libPrefix} \
       "
     substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \
       "${perl}/bin/perl \
       -I${perlPackages.TestHarness}/${perl.libPrefix} \
-      -I${perlPackages.Mojolicious}/${perl.libPrefix} \
+      -I${Mojolicious-6-46}/${perl.libPrefix} \
       -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
-      -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
+      -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
       -I${perlPackages.IOPipely}/${perl.libPrefix} \
       "
     substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \
       "${perl}/bin/perl \
       -I${perlPackages.TestHarness}/${perl.libPrefix} \
-      -I${perlPackages.Mojolicious}/${perl.libPrefix} \
+      -I${Mojolicious-6-46}/${perl.libPrefix} \
       -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \
-      -I${perlPackages.MojoIOLoopForkCall}/${perl.libPrefix} \
+      -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \
       -I${perlPackages.IOPipely}/${perl.libPrefix} \
       "
   '';

From b529dda3a19856cb2c1a26db0f0d2e0f6d268861 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <t.kerber@ed.ac.uk>
Date: Mon, 4 Jun 2018 13:06:54 +0100
Subject: [PATCH 3038/3370] opendkim: fix libbsd dependency

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9983cef069aa..d18987d5d0dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4151,7 +4151,9 @@ with pkgs;
 
   opendht = callPackage ../development/libraries/opendht {};
 
-  opendkim = callPackage ../development/libraries/opendkim { };
+  opendkim = callPackage ../development/libraries/opendkim {
+    libbsd = libbsd-freedesktop;
+  };
 
   opendylan = callPackage ../development/compilers/opendylan {
     opendylan-bootstrap = opendylan_bin;

From 13e3a21b5ca6122684daaf18aff3258fe5aa3a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Mon, 4 Jun 2018 14:12:16 +0200
Subject: [PATCH 3039/3370] gdal: Fix darwin build

This fixes:
  error: cannot initialize a variable of type 'GooString *' with an rvalue of type 'const GooString *'
which occurs with recent clang or gcc-7.
See https://github.com/OSGeo/gdal/pull/573
---
 pkgs/development/libraries/gdal/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 873d71d178bc..e15f2583f4da 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libjpeg, libtiff, zlib
+{ stdenv, fetchurl, fetchpatch, unzip, libjpeg, libtiff, zlib
 , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
 , libpng, sqlite, libspatialite, poppler, hdf4
 , libiconv
@@ -16,6 +16,16 @@ stdenv.mkDerivation rec {
     sha256 = "18iaamzkn0lipizynvspf3bs5qzgcy36hn6bbi941q8dlfdf8xbg";
   };
 
+  patches = [
+    # fix build with recent Poppler
+    (fetchpatch {
+      url    = "https://github.com/OSGeo/gdal/commit/124f0343436d1267319ac627fc220530091b41ea.diff";
+      stripLen = 2;
+      extraPrefix = "";
+      sha256 = "1v6iiy4cgrdcfas3iva5swh9446pqfjh5p6bcab6y49hyjhpsgfy";
+    })
+  ];
+
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl sqlite
     libspatialite poppler hdf4 ]
   ++ (with pythonPackages; [ python numpy wrapPython ])

From c548814b81ac93a64ae858b87ea41d4de0671624 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 4 Jun 2018 15:06:33 +0200
Subject: [PATCH 3040/3370] julia: add some version info to passthru, will be
 used by julia2nix

---
 pkgs/development/compilers/julia/0.6.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix
index 6fad8e5259c5..9f0d0250c5d1 100644
--- a/pkgs/development/compilers/julia/0.6.nix
+++ b/pkgs/development/compilers/julia/0.6.nix
@@ -50,11 +50,16 @@ let
     url = "mirror://pypi/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
     sha256 = "06fw4liazpx5vf3am45q2pdiwrv0id7ckv7n6zmpml29x6vkzmkh";
   };
+
+  majorVersion = "0";
+  minorVersion = "6";
+  maintenanceVersion = "2";
+  version = "${majorVersion}.${minorVersion}.${maintenanceVersion}";
 in
 
 stdenv.mkDerivation rec {
   pname = "julia";
-  version = "0.6.2";
+  inherit version;
   name = "${pname}-${version}";
 
   src = fetchzip {
@@ -183,6 +188,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit majorVersion minorVersion maintenanceVersion;
+    site = "share/julia/site/v${majorVersion}.${minorVersion}";
+  };
+
   meta = {
     description = "High-level performance-oriented dynamical language for technical computing";
     homepage = https://julialang.org/;

From 0e7c945e15117e88ac494e29c9828ccea2ec32ee Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Mon, 4 Jun 2018 15:34:21 +0200
Subject: [PATCH 3041/3370] nixos/systemd: Allow to override serviceConfig

This has been reported by @qknight in his Stack Overflow question:

https://stackoverflow.com/q/50678639

The correct way to override a single value would be to use something
like this:

systemd.services.nagios.serviceConfig.Restart = lib.mkForce "no";

However, this doesn't work because the check is applied for the attrsOf
type and thus the attribute values might still contain the attribute set
created by mkOverride.

The unitOption type however did already account for this, but at this
stage it's already too late.

So now the actual value is unpacked while checking the values of the
attribute set, which should allow us to override values in
serviceConfig.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @edolstra, @qknight
---
 nixos/modules/system/boot/systemd-lib.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix
index ae9ee8811f77..8b37bf8d35d8 100644
--- a/nixos/modules/system/boot/systemd-lib.nix
+++ b/nixos/modules/system/boot/systemd-lib.nix
@@ -78,10 +78,16 @@ in rec {
     optional (badFields != [ ])
       "Systemd ${group} has extra fields [${concatStringsSep " " badFields}].";
 
-  checkUnitConfig = group: checks: v:
-    let errors = concatMap (c: c group v) checks; in
-    if errors == [] then true
-      else builtins.trace (concatStringsSep "\n" errors) false;
+  checkUnitConfig = group: checks: attrs: let
+    # We're applied at the top-level type (attrsOf unitOption), so the actual
+    # unit options might contain attributes from mkOverride that we need to
+    # convert into single values before checking them.
+    defs = mapAttrs (const (v:
+      if v._type or "" == "override" then v.content else v
+    )) attrs;
+    errors = concatMap (c: c group defs) checks;
+  in if errors == [] then true
+     else builtins.trace (concatStringsSep "\n" errors) false;
 
   toOption = x:
     if x == true then "true"

From 5c4a404b0d0e5125070dde5c1787210149157e83 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 4 Jun 2018 10:22:09 -0400
Subject: [PATCH 3042/3370] linux-copperhead: 4.16.12.a -> 4.16.13.a

---
 .../linux/kernel/copperhead-4-16.patch        | 2571 +++++++++++++++++
 pkgs/os-specific/linux/kernel/linux-4.16.nix  |    4 +-
 .../linux/kernel/linux-copperhead-stable.nix  |   30 -
 pkgs/os-specific/linux/kernel/patches.nix     |    5 +
 pkgs/top-level/all-packages.nix               |   14 +-
 5 files changed, 2585 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/copperhead-4-16.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix

diff --git a/pkgs/os-specific/linux/kernel/copperhead-4-16.patch b/pkgs/os-specific/linux/kernel/copperhead-4-16.patch
new file mode 100644
index 000000000000..f0a4bc940347
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/copperhead-4-16.patch
@@ -0,0 +1,2571 @@
+diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
+index 9824d049367e..6ff72316ff0a 100644
+--- a/Documentation/admin-guide/kernel-parameters.txt
++++ b/Documentation/admin-guide/kernel-parameters.txt
+@@ -496,16 +496,6 @@
+			nosocket -- Disable socket memory accounting.
+			nokmem -- Disable kernel memory accounting.
+
+-	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
+-			Format: { "0" | "1" }
+-			See security/selinux/Kconfig help text.
+-			0 -- check protection applied by kernel (includes
+-				any implied execute protection).
+-			1 -- check protection requested by application.
+-			Default value is set via a kernel config option.
+-			Value can be changed at runtime via
+-				/selinux/checkreqprot.
+-
+	cio_ignore=	[S390]
+			See Documentation/s390/CommonIO for details.
+	clk_ignore_unused
+@@ -2946,6 +2936,11 @@
+			the specified number of seconds.  This is to be used if
+			your oopses keep scrolling off the screen.
+
++	extra_latent_entropy
++			Enable a very simple form of latent entropy extraction
++			from the first 4GB of memory as the bootmem allocator
++			passes the memory pages to the buddy allocator.
++
+	pcbit=		[HW,ISDN]
+
+	pcd.		[PARIDE]
+diff --git a/Makefile b/Makefile
+index ded9e8480d74..2e948bb78142 100644
+--- a/Makefile
++++ b/Makefile
+@@ -734,6 +734,9 @@ endif
+ endif
+
+ ifeq ($(cc-name),clang)
++ifdef CONFIG_LOCAL_INIT
++KBUILD_CFLAGS   += -fsanitize=local-init
++endif
+ KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)
+ KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)
+ KBUILD_CFLAGS += $(call cc-disable-warning, gnu)
+diff --git a/arch/Kconfig b/arch/Kconfig
+index 76c0b54443b1..63a2d30f807f 100644
+--- a/arch/Kconfig
++++ b/arch/Kconfig
+@@ -454,6 +454,11 @@ config GCC_PLUGIN_LATENT_ENTROPY
+	  is some slowdown of the boot process (about 0.5%) and fork and
+	  irq processing.
+
++	  When extra_latent_entropy is passed on the kernel command line,
++	  entropy will be extracted from up to the first 4GB of RAM while the
++	  runtime memory allocator is being initialized.  This costs even more
++	  slowdown of the boot process.
++
+	  Note that entropy extracted this way is not cryptographically
+	  secure!
+
+@@ -747,7 +752,7 @@ config ARCH_MMAP_RND_BITS
+	int "Number of bits to use for ASLR of mmap base address" if EXPERT
+	range ARCH_MMAP_RND_BITS_MIN ARCH_MMAP_RND_BITS_MAX
+	default ARCH_MMAP_RND_BITS_DEFAULT if ARCH_MMAP_RND_BITS_DEFAULT
+-	default ARCH_MMAP_RND_BITS_MIN
++	default ARCH_MMAP_RND_BITS_MAX
+	depends on HAVE_ARCH_MMAP_RND_BITS
+	help
+	  This value can be used to select the number of bits to use to
+@@ -781,7 +786,7 @@ config ARCH_MMAP_RND_COMPAT_BITS
+	int "Number of bits to use for ASLR of mmap base address for compatible applications" if EXPERT
+	range ARCH_MMAP_RND_COMPAT_BITS_MIN ARCH_MMAP_RND_COMPAT_BITS_MAX
+	default ARCH_MMAP_RND_COMPAT_BITS_DEFAULT if ARCH_MMAP_RND_COMPAT_BITS_DEFAULT
+-	default ARCH_MMAP_RND_COMPAT_BITS_MIN
++	default ARCH_MMAP_RND_COMPAT_BITS_MAX
+	depends on HAVE_ARCH_MMAP_RND_COMPAT_BITS
+	help
+	  This value can be used to select the number of bits to use to
+@@ -968,6 +973,7 @@ config ARCH_HAS_REFCOUNT
+
+ config REFCOUNT_FULL
+	bool "Perform full reference count validation at the expense of speed"
++	default y
+	help
+	  Enabling this switches the refcounting infrastructure from a fast
+	  unchecked atomic_t implementation to a fully state checked
+diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
+index be665760f2bd..5fb9026c9762 100644
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -988,6 +988,7 @@ endif
+
+ config ARM64_SW_TTBR0_PAN
+	bool "Emulate Privileged Access Never using TTBR0_EL1 switching"
++	default y
+	help
+	  Enabling this option prevents the kernel from accessing
+	  user-space memory directly by pointing TTBR0_EL1 to a reserved
+@@ -1141,6 +1142,7 @@ config RANDOMIZE_BASE
+	bool "Randomize the address of the kernel image"
+	select ARM64_MODULE_PLTS if MODULES
+	select RELOCATABLE
++	default y
+	help
+	  Randomizes the virtual address at which the kernel image is
+	  loaded, as a security feature that deters exploit attempts
+diff --git a/arch/arm64/Kconfig.debug b/arch/arm64/Kconfig.debug
+index cc6bd559af85..01d5442d4722 100644
+--- a/arch/arm64/Kconfig.debug
++++ b/arch/arm64/Kconfig.debug
+@@ -45,6 +45,7 @@ config ARM64_RANDOMIZE_TEXT_OFFSET
+ config DEBUG_WX
+	bool "Warn on W+X mappings at boot"
+	select ARM64_PTDUMP_CORE
++	default y
+	---help---
+	  Generate a warning if any W+X mappings are found at boot.
+
+diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
+index 634b373785c4..5b255a6db6a7 100644
+--- a/arch/arm64/configs/defconfig
++++ b/arch/arm64/configs/defconfig
+@@ -1,4 +1,3 @@
+-CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
+ CONFIG_AUDIT=y
+ CONFIG_NO_HZ_IDLE=y
+diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
+index fac1c4de7898..34786ca166e4 100644
+--- a/arch/arm64/include/asm/elf.h
++++ b/arch/arm64/include/asm/elf.h
+@@ -114,10 +114,10 @@
+
+ /*
+  * This is the base location for PIE (ET_DYN with INTERP) loads. On
+- * 64-bit, this is above 4GB to leave the entire 32-bit address
++ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
+  * space open for things that want to use the area for 32-bit pointers.
+  */
+-#define ELF_ET_DYN_BASE		(2 * TASK_SIZE_64 / 3)
++#define ELF_ET_DYN_BASE		0x100000000UL
+
+ #ifndef __ASSEMBLY__
+
+@@ -158,10 +158,10 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm,
+ /* 1GB of VA */
+ #ifdef CONFIG_COMPAT
+ #define STACK_RND_MASK			(test_thread_flag(TIF_32BIT) ? \
+-						0x7ff >> (PAGE_SHIFT - 12) : \
+-						0x3ffff >> (PAGE_SHIFT - 12))
++						((1UL << mmap_rnd_compat_bits) - 1) >> (PAGE_SHIFT - 12) : \
++						((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12))
+ #else
+-#define STACK_RND_MASK			(0x3ffff >> (PAGE_SHIFT - 12))
++#define STACK_RND_MASK			(((1UL << mmap_rnd_bits) - 1) >> (PAGE_SHIFT - 12))
+ #endif
+
+ #ifdef __AARCH64EB__
+diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
+index c0da6efe5465..f308b521c114 100644
+--- a/arch/arm64/kernel/process.c
++++ b/arch/arm64/kernel/process.c
+@@ -481,9 +481,9 @@ unsigned long arch_align_stack(unsigned long sp)
+ unsigned long arch_randomize_brk(struct mm_struct *mm)
+ {
+	if (is_compat_task())
+-		return randomize_page(mm->brk, SZ_32M);
++		return mm->brk + get_random_long() % SZ_32M + PAGE_SIZE;
+	else
+-		return randomize_page(mm->brk, SZ_1G);
++		return mm->brk + get_random_long() % SZ_1G + PAGE_SIZE;
+ }
+
+ /*
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index 0fa71a78ec99..d78d44944374 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -1208,8 +1208,7 @@ config VM86
+        default X86_LEGACY_VM86
+
+ config X86_16BIT
+-	bool "Enable support for 16-bit segments" if EXPERT
+-	default y
++	bool "Enable support for 16-bit segments"
+	depends on MODIFY_LDT_SYSCALL
+	---help---
+	  This option is required by programs like Wine to run 16-bit
+@@ -2299,7 +2298,7 @@ config COMPAT_VDSO
+ choice
+	prompt "vsyscall table for legacy applications"
+	depends on X86_64
+-	default LEGACY_VSYSCALL_EMULATE
++	default LEGACY_VSYSCALL_NONE
+	help
+	  Legacy user code that does not know how to find the vDSO expects
+	  to be able to issue three syscalls by calling fixed addresses in
+@@ -2380,8 +2379,7 @@ config CMDLINE_OVERRIDE
+	  be set to 'N' under normal conditions.
+
+ config MODIFY_LDT_SYSCALL
+-	bool "Enable the LDT (local descriptor table)" if EXPERT
+-	default y
++	bool "Enable the LDT (local descriptor table)"
+	---help---
+	  Linux can allow user programs to install a per-process x86
+	  Local Descriptor Table (LDT) using the modify_ldt(2) system
+diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
+index 192e4d2f9efc..343c2f1b13da 100644
+--- a/arch/x86/Kconfig.debug
++++ b/arch/x86/Kconfig.debug
+@@ -101,6 +101,7 @@ config EFI_PGT_DUMP
+ config DEBUG_WX
+	bool "Warn on W+X mappings at boot"
+	select X86_PTDUMP_CORE
++	default y
+	---help---
+	  Generate a warning if any W+X mappings are found at boot.
+
+diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig
+index e32fc1f274d8..d08acc76502a 100644
+--- a/arch/x86/configs/x86_64_defconfig
++++ b/arch/x86/configs/x86_64_defconfig
+@@ -1,5 +1,4 @@
+ # CONFIG_LOCALVERSION_AUTO is not set
+-CONFIG_SYSVIPC=y
+ CONFIG_POSIX_MQUEUE=y
+ CONFIG_BSD_PROCESS_ACCT=y
+ CONFIG_TASKSTATS=y
+diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
+index 5b8b556dbb12..a569f08b4478 100644
+--- a/arch/x86/entry/vdso/vma.c
++++ b/arch/x86/entry/vdso/vma.c
+@@ -204,55 +204,9 @@ static int map_vdso(const struct vdso_image *image, unsigned long addr)
+ }
+
+ #ifdef CONFIG_X86_64
+-/*
+- * Put the vdso above the (randomized) stack with another randomized
+- * offset.  This way there is no hole in the middle of address space.
+- * To save memory make sure it is still in the same PTE as the stack
+- * top.  This doesn't give that many random bits.
+- *
+- * Note that this algorithm is imperfect: the distribution of the vdso
+- * start address within a PMD is biased toward the end.
+- *
+- * Only used for the 64-bit and x32 vdsos.
+- */
+-static unsigned long vdso_addr(unsigned long start, unsigned len)
+-{
+-	unsigned long addr, end;
+-	unsigned offset;
+-
+-	/*
+-	 * Round up the start address.  It can start out unaligned as a result
+-	 * of stack start randomization.
+-	 */
+-	start = PAGE_ALIGN(start);
+-
+-	/* Round the lowest possible end address up to a PMD boundary. */
+-	end = (start + len + PMD_SIZE - 1) & PMD_MASK;
+-	if (end >= TASK_SIZE_MAX)
+-		end = TASK_SIZE_MAX;
+-	end -= len;
+-
+-	if (end > start) {
+-		offset = get_random_int() % (((end - start) >> PAGE_SHIFT) + 1);
+-		addr = start + (offset << PAGE_SHIFT);
+-	} else {
+-		addr = start;
+-	}
+-
+-	/*
+-	 * Forcibly align the final address in case we have a hardware
+-	 * issue that requires alignment for performance reasons.
+-	 */
+-	addr = align_vdso_addr(addr);
+-
+-	return addr;
+-}
+-
+ static int map_vdso_randomized(const struct vdso_image *image)
+ {
+-	unsigned long addr = vdso_addr(current->mm->start_stack, image->size-image->sym_vvar_start);
+-
+-	return map_vdso(image, addr);
++	return map_vdso(image, 0);
+ }
+ #endif
+
+diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
+index 0d157d2a1e2a..770c8ae97f92 100644
+--- a/arch/x86/include/asm/elf.h
++++ b/arch/x86/include/asm/elf.h
+@@ -249,11 +249,11 @@ extern int force_personality32;
+
+ /*
+  * This is the base location for PIE (ET_DYN with INTERP) loads. On
+- * 64-bit, this is above 4GB to leave the entire 32-bit address
++ * 64-bit, this is raised to 4GB to leave the entire 32-bit address
+  * space open for things that want to use the area for 32-bit pointers.
+  */
+ #define ELF_ET_DYN_BASE		(mmap_is_ia32() ? 0x000400000UL : \
+-						  (DEFAULT_MAP_WINDOW / 3 * 2))
++						  0x100000000UL)
+
+ /* This yields a mask that user programs can use to figure out what
+    instruction set this CPU supports.  This could be done in user space,
+@@ -313,8 +313,8 @@ extern bool mmap_address_hint_valid(unsigned long addr, unsigned long len);
+
+ #ifdef CONFIG_X86_32
+
+-#define __STACK_RND_MASK(is32bit) (0x7ff)
+-#define STACK_RND_MASK (0x7ff)
++#define __STACK_RND_MASK(is32bit) ((1UL << mmap_rnd_bits) - 1)
++#define STACK_RND_MASK ((1UL << mmap_rnd_bits) - 1)
+
+ #define ARCH_DLINFO		ARCH_DLINFO_IA32
+
+@@ -323,7 +323,11 @@ extern bool mmap_address_hint_valid(unsigned long addr, unsigned long len);
+ #else /* CONFIG_X86_32 */
+
+ /* 1GB for 64bit, 8MB for 32bit */
+-#define __STACK_RND_MASK(is32bit) ((is32bit) ? 0x7ff : 0x3fffff)
++#ifdef CONFIG_COMPAT
++#define __STACK_RND_MASK(is32bit) ((is32bit) ? (1UL << mmap_rnd_compat_bits) - 1 : (1UL << mmap_rnd_bits) - 1)
++#else
++#define __STACK_RND_MASK(is32bit) ((1UL << mmap_rnd_bits) - 1)
++#endif
+ #define STACK_RND_MASK __STACK_RND_MASK(mmap_is_ia32())
+
+ #define ARCH_DLINFO							\
+@@ -381,5 +385,4 @@ struct va_alignment {
+ } ____cacheline_aligned;
+
+ extern struct va_alignment va_align;
+-extern unsigned long align_vdso_addr(unsigned long);
+ #endif /* _ASM_X86_ELF_H */
+diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
+index 84137c22fdfa..4f197404cab9 100644
+--- a/arch/x86/include/asm/tlbflush.h
++++ b/arch/x86/include/asm/tlbflush.h
+@@ -261,6 +261,7 @@ static inline void cr4_set_bits(unsigned long mask)
+
+	local_irq_save(flags);
+	cr4 = this_cpu_read(cpu_tlbstate.cr4);
++	BUG_ON(cr4 != __read_cr4());
+	if ((cr4 | mask) != cr4)
+		__cr4_set(cr4 | mask);
+	local_irq_restore(flags);
+@@ -273,6 +274,7 @@ static inline void cr4_clear_bits(unsigned long mask)
+
+	local_irq_save(flags);
+	cr4 = this_cpu_read(cpu_tlbstate.cr4);
++	BUG_ON(cr4 != __read_cr4());
+	if ((cr4 & ~mask) != cr4)
+		__cr4_set(cr4 & ~mask);
+	local_irq_restore(flags);
+@@ -283,6 +285,7 @@ static inline void cr4_toggle_bits_irqsoff(unsigned long mask)
+	unsigned long cr4;
+
+	cr4 = this_cpu_read(cpu_tlbstate.cr4);
++        BUG_ON(cr4 != __read_cr4());
+	__cr4_set(cr4 ^ mask);
+ }
+
+@@ -389,6 +392,7 @@ static inline void __native_flush_tlb_global(void)
+	raw_local_irq_save(flags);
+
+	cr4 = this_cpu_read(cpu_tlbstate.cr4);
++	BUG_ON(cr4 != __read_cr4());
+	/* toggle PGE */
+	native_write_cr4(cr4 ^ X86_CR4_PGE);
+	/* write old PGE again and flush TLBs */
+diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
+index 5f74f94244e1..9c9fdb5ef52e 100644
+--- a/arch/x86/kernel/cpu/common.c
++++ b/arch/x86/kernel/cpu/common.c
+@@ -1662,7 +1662,6 @@ void cpu_init(void)
+	wrmsrl(MSR_KERNEL_GS_BASE, 0);
+	barrier();
+
+-	x86_configure_nx();
+	x2apic_setup();
+
+	/*
+diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
+index 30ca2d1a9231..bde0a18cd9f9 100644
+--- a/arch/x86/kernel/process.c
++++ b/arch/x86/kernel/process.c
+@@ -39,6 +39,8 @@
+ #include <asm/desc.h>
+ #include <asm/prctl.h>
+ #include <asm/spec-ctrl.h>
++#include <asm/elf.h>
++#include <linux/sizes.h>
+
+ /*
+  * per-CPU TSS segments. Threads are completely 'soft' on Linux,
+@@ -718,7 +720,10 @@ unsigned long arch_align_stack(unsigned long sp)
+
+ unsigned long arch_randomize_brk(struct mm_struct *mm)
+ {
+-	return randomize_page(mm->brk, 0x02000000);
++	if (mmap_is_ia32())
++		return mm->brk + get_random_long() % SZ_32M + PAGE_SIZE;
++	else
++		return mm->brk + get_random_long() % SZ_1G + PAGE_SIZE;
+ }
+
+ /*
+diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
+index 676774b9bb8d..5ad7a95382b0 100644
+--- a/arch/x86/kernel/sys_x86_64.c
++++ b/arch/x86/kernel/sys_x86_64.c
+@@ -54,13 +54,6 @@ static unsigned long get_align_bits(void)
+	return va_align.bits & get_align_mask();
+ }
+
+-unsigned long align_vdso_addr(unsigned long addr)
+-{
+-	unsigned long align_mask = get_align_mask();
+-	addr = (addr + align_mask) & ~align_mask;
+-	return addr | get_align_bits();
+-}
+-
+ static int __init control_va_addr_alignment(char *str)
+ {
+	/* guard against enabling this on other CPU families */
+@@ -122,10 +115,7 @@ static void find_start_end(unsigned long addr, unsigned long flags,
+	}
+
+	*begin	= get_mmap_base(1);
+-	if (in_compat_syscall())
+-		*end = task_size_32bit();
+-	else
+-		*end = task_size_64bit(addr > DEFAULT_MAP_WINDOW);
++	*end	= get_mmap_base(0);
+ }
+
+ unsigned long
+@@ -210,7 +200,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
+
+	info.flags = VM_UNMAPPED_AREA_TOPDOWN;
+	info.length = len;
+-	info.low_limit = PAGE_SIZE;
++	info.low_limit = get_mmap_base(1);
+	info.high_limit = get_mmap_base(0);
+
+	/*
+diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
+index 396e1f0151ac..6526b19579dc 100644
+--- a/arch/x86/mm/init_32.c
++++ b/arch/x86/mm/init_32.c
+@@ -558,7 +558,7 @@ static void __init pagetable_init(void)
+	permanent_kmaps_init(pgd_base);
+ }
+
+-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
++pteval_t __supported_pte_mask __ro_after_init = ~(_PAGE_NX | _PAGE_GLOBAL);
+ EXPORT_SYMBOL_GPL(__supported_pte_mask);
+
+ /* user-defined highmem size */
+@@ -866,7 +866,7 @@ int arch_remove_memory(u64 start, u64 size, struct vmem_altmap *altmap)
+ #endif
+ #endif
+
+-int kernel_set_to_readonly __read_mostly;
++int kernel_set_to_readonly __ro_after_init;
+
+ void set_kernel_text_rw(void)
+ {
+@@ -918,12 +918,11 @@ void mark_rodata_ro(void)
+	unsigned long start = PFN_ALIGN(_text);
+	unsigned long size = PFN_ALIGN(_etext) - start;
+
++	kernel_set_to_readonly = 1;
+	set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
+	printk(KERN_INFO "Write protecting the kernel text: %luk\n",
+		size >> 10);
+
+-	kernel_set_to_readonly = 1;
+-
+ #ifdef CONFIG_CPA_DEBUG
+	printk(KERN_INFO "Testing CPA: Reverting %lx-%lx\n",
+		start, start+size);
+diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
+index af11a2890235..b2d28d38c01e 100644
+--- a/arch/x86/mm/init_64.c
++++ b/arch/x86/mm/init_64.c
+@@ -65,7 +65,7 @@
+  * around without checking the pgd every time.
+  */
+
+-pteval_t __supported_pte_mask __read_mostly = ~0;
++pteval_t __supported_pte_mask __ro_after_init = ~0;
+ EXPORT_SYMBOL_GPL(__supported_pte_mask);
+
+ int force_personality32;
+@@ -1195,7 +1195,7 @@ void __init mem_init(void)
+	mem_init_print_info(NULL);
+ }
+
+-int kernel_set_to_readonly;
++int kernel_set_to_readonly __ro_after_init;
+
+ void set_kernel_text_rw(void)
+ {
+@@ -1244,9 +1244,8 @@ void mark_rodata_ro(void)
+
+	printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",
+	       (end - start) >> 10);
+-	set_memory_ro(start, (end - start) >> PAGE_SHIFT);
+-
+	kernel_set_to_readonly = 1;
++	set_memory_ro(start, (end - start) >> PAGE_SHIFT);
+
+	/*
+	 * The rodata/data/bss/brk section (but not the kernel text!)
+diff --git a/block/blk-softirq.c b/block/blk-softirq.c
+index 01e2b353a2b9..9aeddca4a29f 100644
+--- a/block/blk-softirq.c
++++ b/block/blk-softirq.c
+@@ -20,7 +20,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
+  * Softirq action handler - move entries to local list and loop over them
+  * while passing them to the queue registered handler.
+  */
+-static __latent_entropy void blk_done_softirq(struct softirq_action *h)
++static __latent_entropy void blk_done_softirq(void)
+ {
+	struct list_head *cpu_list, local_list;
+
+diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
+index 0df21f046fc6..6f8d9bf71bba 100644
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -5151,7 +5151,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
+	struct ata_port *ap;
+	unsigned int tag;
+
+-	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
++	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+	ap = qc->ap;
+
+	qc->flags = 0;
+@@ -5168,7 +5168,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
+	struct ata_port *ap;
+	struct ata_link *link;
+
+-	WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
++	BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
+	WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
+	ap = qc->ap;
+	link = qc->dev->link;
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index c28dca0c613d..d4813f0d25ca 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -9,7 +9,6 @@ source "drivers/tty/Kconfig"
+
+ config DEVMEM
+	bool "/dev/mem virtual device support"
+-	default y
+	help
+	  Say Y here if you want to support the /dev/mem device.
+	  The /dev/mem device is used to access areas of physical
+@@ -568,7 +567,6 @@ config TELCLOCK
+ config DEVPORT
+	bool "/dev/port character device"
+	depends on ISA || PCI
+-	default y
+	help
+	  Say Y here if you want to support the /dev/port device. The /dev/port
+	  device is similar to /dev/mem, but for I/O ports.
+diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
+index b811442c5ce6..4f62a63cbcb1 100644
+--- a/drivers/tty/Kconfig
++++ b/drivers/tty/Kconfig
+@@ -122,7 +122,6 @@ config UNIX98_PTYS
+
+ config LEGACY_PTYS
+	bool "Legacy (BSD) PTY support"
+-	default y
+	---help---
+	  A pseudo terminal (PTY) is a software device consisting of two
+	  halves: a master and a slave. The slave device behaves identical to
+diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
+index 83c58a20d16f..32ef2e3a8482 100644
+--- a/drivers/usb/core/hub.c
++++ b/drivers/usb/core/hub.c
+@@ -41,6 +41,8 @@
+ #define USB_TP_TRANSMISSION_DELAY	40	/* ns */
+ #define USB_TP_TRANSMISSION_DELAY_MAX	65535	/* ns */
+
++extern int deny_new_usb;
++
+ /* Protect struct usb_device->state and ->children members
+  * Note: Both are also protected by ->dev.sem, except that ->state can
+  * change to USB_STATE_NOTATTACHED even when the semaphore isn't held. */
+@@ -4847,6 +4849,12 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
+			goto done;
+		return;
+	}
++
++	if (deny_new_usb) {
++		dev_err(&port_dev->dev, "denied insert of USB device on port %d\n", port1);
++		goto done;
++	}
++
+	if (hub_is_superspeed(hub->hdev))
+		unit_load = 150;
+	else
+diff --git a/fs/exec.c b/fs/exec.c
+index 7eb8d21bcab9..171f31b3bf05 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -62,6 +62,7 @@
+ #include <linux/oom.h>
+ #include <linux/compat.h>
+ #include <linux/vmalloc.h>
++#include <linux/random.h>
+
+ #include <linux/uaccess.h>
+ #include <asm/mmu_context.h>
+@@ -321,6 +322,8 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
+	arch_bprm_mm_init(mm, vma);
+	up_write(&mm->mmap_sem);
+	bprm->p = vma->vm_end - sizeof(void *);
++	if (randomize_va_space)
++		bprm->p ^= get_random_int() & ~PAGE_MASK;
+	return 0;
+ err:
+	up_write(&mm->mmap_sem);
+diff --git a/fs/namei.c b/fs/namei.c
+index b61d6aa9279d..255c2dc36189 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -883,8 +883,8 @@ static inline void put_link(struct nameidata *nd)
+		path_put(&last->link);
+ }
+
+-int sysctl_protected_symlinks __read_mostly = 0;
+-int sysctl_protected_hardlinks __read_mostly = 0;
++int sysctl_protected_symlinks __read_mostly = 1;
++int sysctl_protected_hardlinks __read_mostly = 1;
+
+ /**
+  * may_follow_link - Check symlink following for unsafe situations
+diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
+index 5f93cfacb3d1..cea0d7d3b23e 100644
+--- a/fs/nfs/Kconfig
++++ b/fs/nfs/Kconfig
+@@ -195,4 +195,3 @@ config NFS_DEBUG
+	bool
+	depends on NFS_FS && SUNRPC_DEBUG
+	select CRC32
+-	default y
+diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
+index 1ade1206bb89..60b0f76dec47 100644
+--- a/fs/proc/Kconfig
++++ b/fs/proc/Kconfig
+@@ -39,7 +39,6 @@ config PROC_KCORE
+ config PROC_VMCORE
+	bool "/proc/vmcore support"
+	depends on PROC_FS && CRASH_DUMP
+-	default y
+         help
+         Exports the dump image of crashed kernel in ELF format.
+
+diff --git a/fs/stat.c b/fs/stat.c
+index 873785dae022..d3c2ada8b9c7 100644
+--- a/fs/stat.c
++++ b/fs/stat.c
+@@ -40,8 +40,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
+	stat->gid = inode->i_gid;
+	stat->rdev = inode->i_rdev;
+	stat->size = i_size_read(inode);
+-	stat->atime = inode->i_atime;
+-	stat->mtime = inode->i_mtime;
++	if (is_sidechannel_device(inode) && !capable_noaudit(CAP_MKNOD)) {
++		stat->atime = inode->i_ctime;
++		stat->mtime = inode->i_ctime;
++	} else {
++		stat->atime = inode->i_atime;
++		stat->mtime = inode->i_mtime;
++	}
+	stat->ctime = inode->i_ctime;
+	stat->blksize = i_blocksize(inode);
+	stat->blocks = inode->i_blocks;
+@@ -75,9 +80,14 @@ int vfs_getattr_nosec(const struct path *path, struct kstat *stat,
+	stat->result_mask |= STATX_BASIC_STATS;
+	request_mask &= STATX_ALL;
+	query_flags &= KSTAT_QUERY_FLAGS;
+-	if (inode->i_op->getattr)
+-		return inode->i_op->getattr(path, stat, request_mask,
+-					    query_flags);
++	if (inode->i_op->getattr) {
++		int retval = inode->i_op->getattr(path, stat, request_mask, query_flags);
++		if (!retval && is_sidechannel_device(inode) && !capable_noaudit(CAP_MKNOD)) {
++			stat->atime = stat->ctime;
++			stat->mtime = stat->ctime;
++		}
++		return retval;
++	}
+
+	generic_fillattr(inode, stat);
+	return 0;
+diff --git a/include/linux/cache.h b/include/linux/cache.h
+index 750621e41d1c..e7157c18c62c 100644
+--- a/include/linux/cache.h
++++ b/include/linux/cache.h
+@@ -31,6 +31,8 @@
+ #define __ro_after_init __attribute__((__section__(".data..ro_after_init")))
+ #endif
+
++#define __read_only __ro_after_init
++
+ #ifndef ____cacheline_aligned
+ #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
+ #endif
+diff --git a/include/linux/capability.h b/include/linux/capability.h
+index f640dcbc880c..2b4f5d651f19 100644
+--- a/include/linux/capability.h
++++ b/include/linux/capability.h
+@@ -207,6 +207,7 @@ extern bool has_capability_noaudit(struct task_struct *t, int cap);
+ extern bool has_ns_capability_noaudit(struct task_struct *t,
+				      struct user_namespace *ns, int cap);
+ extern bool capable(int cap);
++extern bool capable_noaudit(int cap);
+ extern bool ns_capable(struct user_namespace *ns, int cap);
+ extern bool ns_capable_noaudit(struct user_namespace *ns, int cap);
+ #else
+@@ -232,6 +233,10 @@ static inline bool capable(int cap)
+ {
+	return true;
+ }
++static inline bool capable_noaudit(int cap)
++{
++	return true;
++}
+ static inline bool ns_capable(struct user_namespace *ns, int cap)
+ {
+	return true;
+diff --git a/include/linux/fs.h b/include/linux/fs.h
+index c6baf767619e..31904f3d38a6 100644
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -3407,4 +3407,15 @@ static inline bool dir_relax_shared(struct inode *inode)
+ extern bool path_noexec(const struct path *path);
+ extern void inode_nohighmem(struct inode *inode);
+
++extern int device_sidechannel_restrict;
++
++static inline bool is_sidechannel_device(const struct inode *inode)
++{
++	umode_t mode;
++	if (!device_sidechannel_restrict)
++		return false;
++	mode = inode->i_mode;
++	return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
++}
++
+ #endif /* _LINUX_FS_H */
+diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
+index bdaf22582f6e..326ff15d4637 100644
+--- a/include/linux/fsnotify.h
++++ b/include/linux/fsnotify.h
+@@ -181,6 +181,9 @@ static inline void fsnotify_access(struct file *file)
+	struct inode *inode = path->dentry->d_inode;
+	__u32 mask = FS_ACCESS;
+
++	if (is_sidechannel_device(inode))
++		return;
++
+	if (S_ISDIR(inode->i_mode))
+		mask |= FS_ISDIR;
+
+@@ -199,6 +202,9 @@ static inline void fsnotify_modify(struct file *file)
+	struct inode *inode = path->dentry->d_inode;
+	__u32 mask = FS_MODIFY;
+
++	if (is_sidechannel_device(inode))
++		return;
++
+	if (S_ISDIR(inode->i_mode))
+		mask |= FS_ISDIR;
+
+diff --git a/include/linux/gfp.h b/include/linux/gfp.h
+index 1a4582b44d32..4d445a8fe7f2 100644
+--- a/include/linux/gfp.h
++++ b/include/linux/gfp.h
+@@ -513,9 +513,9 @@ extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,
+ extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order);
+ extern unsigned long get_zeroed_page(gfp_t gfp_mask);
+
+-void *alloc_pages_exact(size_t size, gfp_t gfp_mask);
++void *alloc_pages_exact(size_t size, gfp_t gfp_mask) __attribute__((alloc_size(1)));
+ void free_pages_exact(void *virt, size_t size);
+-void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask);
++void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) __attribute__((alloc_size(1)));
+
+ #define __get_free_page(gfp_mask) \
+		__get_free_pages((gfp_mask), 0)
+diff --git a/include/linux/highmem.h b/include/linux/highmem.h
+index 776f90f3a1cd..3f5c47000059 100644
+--- a/include/linux/highmem.h
++++ b/include/linux/highmem.h
+@@ -191,6 +191,13 @@ static inline void clear_highpage(struct page *page)
+	kunmap_atomic(kaddr);
+ }
+
++static inline void verify_zero_highpage(struct page *page)
++{
++	void *kaddr = kmap_atomic(page);
++	BUG_ON(memchr_inv(kaddr, 0, PAGE_SIZE));
++	kunmap_atomic(kaddr);
++}
++
+ static inline void zero_user_segments(struct page *page,
+	unsigned start1, unsigned end1,
+	unsigned start2, unsigned end2)
+diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
+index 69c238210325..ee487ea4f48f 100644
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -485,7 +485,7 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
+
+ struct softirq_action
+ {
+-	void	(*action)(struct softirq_action *);
++	void	(*action)(void);
+ };
+
+ asmlinkage void do_softirq(void);
+@@ -500,7 +500,7 @@ static inline void do_softirq_own_stack(void)
+ }
+ #endif
+
+-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
++extern void __init open_softirq(int nr, void (*action)(void));
+ extern void softirq_init(void);
+ extern void __raise_softirq_irqoff(unsigned int nr);
+
+diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
+index 069aa2ebef90..cb9e3637a620 100644
+--- a/include/linux/kobject_ns.h
++++ b/include/linux/kobject_ns.h
+@@ -45,7 +45,7 @@ struct kobj_ns_type_operations {
+	void (*drop_ns)(void *);
+ };
+
+-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
++int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
+ int kobj_ns_type_registered(enum kobj_ns_type type);
+ const struct kobj_ns_type_operations *kobj_child_ns_ops(struct kobject *parent);
+ const struct kobj_ns_type_operations *kobj_ns_ops(struct kobject *kobj);
+diff --git a/include/linux/mm.h b/include/linux/mm.h
+index a4e9bdbec490..0fe7ebd0f462 100644
+--- a/include/linux/mm.h
++++ b/include/linux/mm.h
+@@ -535,7 +535,7 @@ static inline int is_vmalloc_or_module_addr(const void *x)
+ }
+ #endif
+
+-extern void *kvmalloc_node(size_t size, gfp_t flags, int node);
++extern void *kvmalloc_node(size_t size, gfp_t flags, int node) __attribute__((alloc_size(1)));
+ static inline void *kvmalloc(size_t size, gfp_t flags)
+ {
+	return kvmalloc_node(size, flags, NUMA_NO_NODE);
+diff --git a/include/linux/percpu.h b/include/linux/percpu.h
+index 296bbe49d5d1..b26652c9a98d 100644
+--- a/include/linux/percpu.h
++++ b/include/linux/percpu.h
+@@ -129,7 +129,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,
+				pcpu_fc_populate_pte_fn_t populate_pte_fn);
+ #endif
+
+-extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
++extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align) __attribute__((alloc_size(1)));
+ extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr);
+ extern bool is_kernel_percpu_address(unsigned long addr);
+
+@@ -137,8 +137,8 @@ extern bool is_kernel_percpu_address(unsigned long addr);
+ extern void __init setup_per_cpu_areas(void);
+ #endif
+
+-extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp);
+-extern void __percpu *__alloc_percpu(size_t size, size_t align);
++extern void __percpu *__alloc_percpu_gfp(size_t size, size_t align, gfp_t gfp) __attribute__((alloc_size(1)));
++extern void __percpu *__alloc_percpu(size_t size, size_t align) __attribute__((alloc_size(1)));
+ extern void free_percpu(void __percpu *__pdata);
+ extern phys_addr_t per_cpu_ptr_to_phys(void *addr);
+
+diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
+index 7546822a1d74..320033b310d2 100644
+--- a/include/linux/perf_event.h
++++ b/include/linux/perf_event.h
+@@ -1151,6 +1151,11 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
+ int perf_event_max_stack_handler(struct ctl_table *table, int write,
+				 void __user *buffer, size_t *lenp, loff_t *ppos);
+
++static inline bool perf_paranoid_any(void)
++{
++	return sysctl_perf_event_paranoid > 2;
++}
++
+ static inline bool perf_paranoid_tracepoint_raw(void)
+ {
+	return sysctl_perf_event_paranoid > -1;
+diff --git a/include/linux/slab.h b/include/linux/slab.h
+index 231abc8976c5..b0bf5d4a4934 100644
+--- a/include/linux/slab.h
++++ b/include/linux/slab.h
+@@ -177,8 +177,8 @@ void memcg_destroy_kmem_caches(struct mem_cgroup *);
+ /*
+  * Common kmalloc functions provided by all allocators
+  */
+-void * __must_check __krealloc(const void *, size_t, gfp_t);
+-void * __must_check krealloc(const void *, size_t, gfp_t);
++void * __must_check __krealloc(const void *, size_t, gfp_t) __attribute__((alloc_size(2)));
++void * __must_check krealloc(const void *, size_t, gfp_t) __attribute((alloc_size(2)));
+ void kfree(const void *);
+ void kzfree(const void *);
+ size_t ksize(const void *);
+@@ -351,7 +351,7 @@ static __always_inline int kmalloc_index(size_t size)
+ }
+ #endif /* !CONFIG_SLOB */
+
+-void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __malloc;
++void *__kmalloc(size_t size, gfp_t flags) __assume_kmalloc_alignment __malloc __attribute__((alloc_size(1)));
+ void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags) __assume_slab_alignment __malloc;
+ void kmem_cache_free(struct kmem_cache *, void *);
+
+@@ -375,7 +375,7 @@ static __always_inline void kfree_bulk(size_t size, void **p)
+ }
+
+ #ifdef CONFIG_NUMA
+-void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment __malloc;
++void *__kmalloc_node(size_t size, gfp_t flags, int node) __assume_kmalloc_alignment __malloc __attribute__((alloc_size(1)));
+ void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node) __assume_slab_alignment __malloc;
+ #else
+ static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
+@@ -497,7 +497,7 @@ static __always_inline void *kmalloc_large(size_t size, gfp_t flags)
+  * for general use, and so are not documented here. For a full list of
+  * potential flags, always refer to linux/gfp.h.
+  */
+-static __always_inline void *kmalloc(size_t size, gfp_t flags)
++static __always_inline __attribute__((alloc_size(1))) void *kmalloc(size_t size, gfp_t flags)
+ {
+	if (__builtin_constant_p(size)) {
+		if (size > KMALLOC_MAX_CACHE_SIZE)
+@@ -537,7 +537,7 @@ static __always_inline int kmalloc_size(int n)
+	return 0;
+ }
+
+-static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
++static __always_inline __attribute__((alloc_size(1))) void *kmalloc_node(size_t size, gfp_t flags, int node)
+ {
+ #ifndef CONFIG_SLOB
+	if (__builtin_constant_p(size) &&
+diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
+index 8ad99c47b19c..91fea0d0db3b 100644
+--- a/include/linux/slub_def.h
++++ b/include/linux/slub_def.h
+@@ -120,6 +120,11 @@ struct kmem_cache {
+	unsigned long random;
+ #endif
+
++#ifdef CONFIG_SLAB_CANARY
++	unsigned long random_active;
++	unsigned long random_inactive;
++#endif
++
+ #ifdef CONFIG_NUMA
+	/*
+	 * Defragmentation by allocating from a remote node.
+diff --git a/include/linux/string.h b/include/linux/string.h
+index dd39a690c841..00d16d874c0a 100644
+--- a/include/linux/string.h
++++ b/include/linux/string.h
+@@ -235,10 +235,16 @@ void __read_overflow2(void) __compiletime_error("detected read beyond size of ob
+ void __read_overflow3(void) __compiletime_error("detected read beyond size of object passed as 3rd parameter");
+ void __write_overflow(void) __compiletime_error("detected write beyond size of object passed as 1st parameter");
+
++#ifdef CONFIG_FORTIFY_SOURCE_STRICT_STRING
++#define __string_size(p) __builtin_object_size(p, 1)
++#else
++#define __string_size(p) __builtin_object_size(p, 0)
++#endif
++
+ #if !defined(__NO_FORTIFY) && defined(__OPTIMIZE__) && defined(CONFIG_FORTIFY_SOURCE)
+ __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size)
+ {
+-	size_t p_size = __builtin_object_size(p, 0);
++	size_t p_size = __string_size(p);
+	if (__builtin_constant_p(size) && p_size < size)
+		__write_overflow();
+	if (p_size < size)
+@@ -248,7 +254,7 @@ __FORTIFY_INLINE char *strncpy(char *p, const char *q, __kernel_size_t size)
+
+ __FORTIFY_INLINE char *strcat(char *p, const char *q)
+ {
+-	size_t p_size = __builtin_object_size(p, 0);
++	size_t p_size = __string_size(p);
+	if (p_size == (size_t)-1)
+		return __builtin_strcat(p, q);
+	if (strlcat(p, q, p_size) >= p_size)
+@@ -259,7 +265,7 @@ __FORTIFY_INLINE char *strcat(char *p, const char *q)
+ __FORTIFY_INLINE __kernel_size_t strlen(const char *p)
+ {
+	__kernel_size_t ret;
+-	size_t p_size = __builtin_object_size(p, 0);
++	size_t p_size = __string_size(p);
+
+	/* Work around gcc excess stack consumption issue */
+	if (p_size == (size_t)-1 ||
+@@ -274,7 +280,7 @@ __FORTIFY_INLINE __kernel_size_t strlen(const char *p)
+ extern __kernel_size_t __real_strnlen(const char *, __kernel_size_t) __RENAME(strnlen);
+ __FORTIFY_INLINE __kernel_size_t strnlen(const char *p, __kernel_size_t maxlen)
+ {
+-	size_t p_size = __builtin_object_size(p, 0);
++	size_t p_size = __string_size(p);
+	__kernel_size_t ret = __real_strnlen(p, maxlen < p_size ? maxlen : p_size);
+	if (p_size <= ret && maxlen != ret)
+		fortify_panic(__func__);
+@@ -286,8 +292,8 @@ extern size_t __real_strlcpy(char *, const char *, size_t) __RENAME(strlcpy);
+ __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size)
+ {
+	size_t ret;
+-	size_t p_size = __builtin_object_size(p, 0);
+-	size_t q_size = __builtin_object_size(q, 0);
++	size_t p_size = __string_size(p);
++	size_t q_size = __string_size(q);
+	if (p_size == (size_t)-1 && q_size == (size_t)-1)
+		return __real_strlcpy(p, q, size);
+	ret = strlen(q);
+@@ -307,8 +313,8 @@ __FORTIFY_INLINE size_t strlcpy(char *p, const char *q, size_t size)
+ __FORTIFY_INLINE char *strncat(char *p, const char *q, __kernel_size_t count)
+ {
+	size_t p_len, copy_len;
+-	size_t p_size = __builtin_object_size(p, 0);
+-	size_t q_size = __builtin_object_size(q, 0);
++	size_t p_size = __string_size(p);
++	size_t q_size = __string_size(q);
+	if (p_size == (size_t)-1 && q_size == (size_t)-1)
+		return __builtin_strncat(p, q, count);
+	p_len = strlen(p);
+@@ -421,8 +427,8 @@ __FORTIFY_INLINE void *kmemdup(const void *p, size_t size, gfp_t gfp)
+ /* defined after fortified strlen and memcpy to reuse them */
+ __FORTIFY_INLINE char *strcpy(char *p, const char *q)
+ {
+-	size_t p_size = __builtin_object_size(p, 0);
+-	size_t q_size = __builtin_object_size(q, 0);
++	size_t p_size = __string_size(p);
++	size_t q_size = __string_size(q);
+	if (p_size == (size_t)-1 && q_size == (size_t)-1)
+		return __builtin_strcpy(p, q);
+	memcpy(p, q, strlen(q) + 1);
+diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
+index 1e5d8c392f15..66d0e49c9987 100644
+--- a/include/linux/vmalloc.h
++++ b/include/linux/vmalloc.h
+@@ -68,19 +68,19 @@ static inline void vmalloc_init(void)
+ }
+ #endif
+
+-extern void *vmalloc(unsigned long size);
+-extern void *vzalloc(unsigned long size);
+-extern void *vmalloc_user(unsigned long size);
+-extern void *vmalloc_node(unsigned long size, int node);
+-extern void *vzalloc_node(unsigned long size, int node);
+-extern void *vmalloc_exec(unsigned long size);
+-extern void *vmalloc_32(unsigned long size);
+-extern void *vmalloc_32_user(unsigned long size);
+-extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
++extern void *vmalloc(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vzalloc(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vmalloc_user(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vmalloc_node(unsigned long size, int node) __attribute__((alloc_size(1)));
++extern void *vzalloc_node(unsigned long size, int node) __attribute__((alloc_size(1)));
++extern void *vmalloc_exec(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vmalloc_32(unsigned long size) __attribute__((alloc_size(1)));
++extern void *vmalloc_32_user(unsigned long size) __attribute__((alloc_size(1)));
++extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) __attribute__((alloc_size(1)));
+ extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
+			unsigned long start, unsigned long end, gfp_t gfp_mask,
+			pgprot_t prot, unsigned long vm_flags, int node,
+-			const void *caller);
++			const void *caller) __attribute__((alloc_size(1)));
+ #ifndef CONFIG_MMU
+ extern void *__vmalloc_node_flags(unsigned long size, int node, gfp_t flags);
+ static inline void *__vmalloc_node_flags_caller(unsigned long size, int node,
+diff --git a/init/Kconfig b/init/Kconfig
+index e37f4b2a6445..49c20dea1afd 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -296,6 +296,7 @@ config USELIB
+ config AUDIT
+	bool "Auditing support"
+	depends on NET
++	default y
+	help
+	  Enable auditing infrastructure that can be used with another
+	  kernel subsystem, such as SELinux (which requires this for
+@@ -1039,6 +1040,12 @@ config CC_OPTIMIZE_FOR_SIZE
+
+ endchoice
+
++config LOCAL_INIT
++	bool "Zero uninitialized locals"
++	help
++	  Zero-fill uninitialized local variables, other than variable-length
++	  arrays. Requires compiler support.
++
+ config SYSCTL
+	bool
+
+@@ -1296,8 +1303,7 @@ config SHMEM
+	  which may be appropriate on small systems without swap.
+
+ config AIO
+-	bool "Enable AIO support" if EXPERT
+-	default y
++	bool "Enable AIO support"
+	help
+	  This option enables POSIX asynchronous I/O which may by used
+	  by some high performance threaded applications. Disabling
+@@ -1502,7 +1508,7 @@ config VM_EVENT_COUNTERS
+
+ config SLUB_DEBUG
+	default y
+-	bool "Enable SLUB debugging support" if EXPERT
++	bool "Enable SLUB debugging support"
+	depends on SLUB && SYSFS
+	help
+	  SLUB has extensive debug support features. Disabling these can
+@@ -1526,7 +1532,6 @@ config SLUB_MEMCG_SYSFS_ON
+
+ config COMPAT_BRK
+	bool "Disable heap randomization"
+-	default y
+	help
+	  Randomizing heap placement makes heap exploits harder, but it
+	  also breaks ancient binaries (including anything libc5 based).
+@@ -1573,7 +1578,6 @@ endchoice
+
+ config SLAB_MERGE_DEFAULT
+	bool "Allow slab caches to be merged"
+-	default y
+	help
+	  For reduced kernel memory fragmentation, slab caches can be
+	  merged when they share the same size and other characteristics.
+@@ -1586,9 +1590,9 @@ config SLAB_MERGE_DEFAULT
+	  command line.
+
+ config SLAB_FREELIST_RANDOM
+-	default n
+	depends on SLAB || SLUB
+	bool "SLAB freelist randomization"
++	default y
+	help
+	  Randomizes the freelist order used on creating new pages. This
+	  security feature reduces the predictability of the kernel slab
+@@ -1597,12 +1601,56 @@ config SLAB_FREELIST_RANDOM
+ config SLAB_FREELIST_HARDENED
+	bool "Harden slab freelist metadata"
+	depends on SLUB
++	default y
+	help
+	  Many kernel heap attacks try to target slab cache metadata and
+	  other infrastructure. This options makes minor performance
+	  sacrifies to harden the kernel slab allocator against common
+	  freelist exploit methods.
+
++config SLAB_HARDENED
++	default y
++	depends on SLUB
++	bool "Hardened SLAB infrastructure"
++	help
++          Make minor performance sacrifices to harden the kernel slab
++          allocator.
++
++config SLAB_CANARY
++	depends on SLUB
++	depends on !SLAB_MERGE_DEFAULT
++	bool "SLAB canaries"
++	default y
++	help
++	  Place canaries at the end of kernel slab allocations, sacrificing
++	  some performance and memory usage for security.
++
++	  Canaries can detect some forms of heap corruption when allocations
++	  are freed and as part of the HARDENED_USERCOPY feature. It provides
++	  basic use-after-free detection for HARDENED_USERCOPY.
++
++	  Canaries absorb small overflows (rendering them harmless), mitigate
++	  non-NUL terminated C string overflows on 64-bit via a guaranteed zero
++	  byte and provide basic double-free detection.
++
++config SLAB_SANITIZE
++	bool "Sanitize SLAB allocations"
++	depends on SLUB
++	default y
++	help
++	  Zero fill slab allocations on free, reducing the lifetime of
++	  sensitive data and helping to mitigate use-after-free bugs.
++
++	  For slabs with debug poisoning enabling, this has no impact.
++
++config SLAB_SANITIZE_VERIFY
++	depends on SLAB_SANITIZE && PAGE_SANITIZE
++	default y
++	bool "Verify sanitized SLAB allocations"
++	help
++	  Verify that newly allocated slab allocations are zeroed to detect
++	  write-after-free bugs.
++
+ config SLUB_CPU_PARTIAL
+	default y
+	depends on SLUB && SMP
+diff --git a/kernel/audit.c b/kernel/audit.c
+index 227db99b0f19..aec52b408543 100644
+--- a/kernel/audit.c
++++ b/kernel/audit.c
+@@ -1578,6 +1578,9 @@ static int __init audit_enable(char *str)
+
+	if (audit_default == AUDIT_OFF)
+		audit_initialized = AUDIT_DISABLED;
++	else if (!audit_ever_enabled)
++		audit_initialized = AUDIT_UNINITIALIZED;
++
+	if (audit_set_enabled(audit_default))
+		panic("audit: error setting audit state (%d)\n", audit_default);
+
+diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
+index ba03ec39efb3..47ed9081b668 100644
+--- a/kernel/bpf/core.c
++++ b/kernel/bpf/core.c
+@@ -302,7 +302,7 @@ struct bpf_prog *bpf_patch_insn_single(struct bpf_prog *prog, u32 off,
+ #ifdef CONFIG_BPF_JIT
+ /* All BPF JIT sysctl knobs here. */
+ int bpf_jit_enable   __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_ALWAYS_ON);
+-int bpf_jit_harden   __read_mostly;
++int bpf_jit_harden   __read_mostly = 2;
+ int bpf_jit_kallsyms __read_mostly;
+
+ static __always_inline void
+diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
+index 43f95d190eea..8e353f596873 100644
+--- a/kernel/bpf/syscall.c
++++ b/kernel/bpf/syscall.c
+@@ -42,7 +42,7 @@ static DEFINE_SPINLOCK(prog_idr_lock);
+ static DEFINE_IDR(map_idr);
+ static DEFINE_SPINLOCK(map_idr_lock);
+
+-int sysctl_unprivileged_bpf_disabled __read_mostly;
++int sysctl_unprivileged_bpf_disabled __read_mostly = 1;
+
+ static const struct bpf_map_ops * const bpf_map_types[] = {
+ #define BPF_PROG_TYPE(_id, _ops)
+diff --git a/kernel/capability.c b/kernel/capability.c
+index 1e1c0236f55b..452062fe45ce 100644
+--- a/kernel/capability.c
++++ b/kernel/capability.c
+@@ -431,6 +431,12 @@ bool capable(int cap)
+	return ns_capable(&init_user_ns, cap);
+ }
+ EXPORT_SYMBOL(capable);
++
++bool capable_noaudit(int cap)
++{
++	return ns_capable_noaudit(&init_user_ns, cap);
++}
++EXPORT_SYMBOL(capable_noaudit);
+ #endif /* CONFIG_MULTIUSER */
+
+ /**
+diff --git a/kernel/events/core.c b/kernel/events/core.c
+index ca7298760c83..910ac6cc9f07 100644
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -397,8 +397,13 @@ static cpumask_var_t perf_online_mask;
+  *   0 - disallow raw tracepoint access for unpriv
+  *   1 - disallow cpu events for unpriv
+  *   2 - disallow kernel profiling for unpriv
++ *   3 - disallow all unpriv perf event use
+  */
++#ifdef CONFIG_SECURITY_PERF_EVENTS_RESTRICT
++int sysctl_perf_event_paranoid __read_mostly = 3;
++#else
+ int sysctl_perf_event_paranoid __read_mostly = 2;
++#endif
+
+ /* Minimum for 512 kiB + 1 user control page */
+ int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
+@@ -9921,6 +9926,9 @@ SYSCALL_DEFINE5(perf_event_open,
+	if (flags & ~PERF_FLAG_ALL)
+		return -EINVAL;
+
++	if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
++		return -EACCES;
++
+	err = perf_copy_attr(attr_uptr, &attr);
+	if (err)
+		return err;
+diff --git a/kernel/fork.c b/kernel/fork.c
+index e5d9d405ae4e..c4be89c51f25 100644
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -103,6 +103,11 @@
+
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/task.h>
++#ifdef CONFIG_USER_NS
++extern int unprivileged_userns_clone;
++#else
++#define unprivileged_userns_clone 0
++#endif
+
+ /*
+  * Minimum number of threads to boot the kernel
+@@ -1591,6 +1596,10 @@ static __latent_entropy struct task_struct *copy_process(
+	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
+		return ERR_PTR(-EINVAL);
+
++	if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
++		if (!capable(CAP_SYS_ADMIN))
++			return ERR_PTR(-EPERM);
++
+	/*
+	 * Thread groups must share signals as well, and detached threads
+	 * can only be started up within the thread group.
+@@ -2385,6 +2394,12 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
+	if (unshare_flags & CLONE_NEWNS)
+		unshare_flags |= CLONE_FS;
+
++	if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
++		err = -EPERM;
++		if (!capable(CAP_SYS_ADMIN))
++			goto bad_unshare_out;
++	}
++
+	err = check_unshare_flags(unshare_flags);
+	if (err)
+		goto bad_unshare_out;
+diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c
+index 3d37c279c090..0789ca413f09 100644
+--- a/kernel/power/snapshot.c
++++ b/kernel/power/snapshot.c
+@@ -1138,7 +1138,7 @@ void free_basic_memory_bitmaps(void)
+
+ void clear_free_pages(void)
+ {
+-#ifdef CONFIG_PAGE_POISONING_ZERO
++#if defined(CONFIG_PAGE_POISONING_ZERO) || defined(CONFIG_PAGE_SANITIZE)
+	struct memory_bitmap *bm = free_pages_map;
+	unsigned long pfn;
+
+@@ -1155,7 +1155,7 @@ void clear_free_pages(void)
+	}
+	memory_bm_position_reset(bm);
+	pr_info("free pages cleared after restore\n");
+-#endif /* PAGE_POISONING_ZERO */
++#endif /* PAGE_POISONING_ZERO || PAGE_SANITIZE */
+ }
+
+ /**
+diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
+index a64eee0db39e..4d7de378fe4c 100644
+--- a/kernel/rcu/tiny.c
++++ b/kernel/rcu/tiny.c
+@@ -164,7 +164,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
+	}
+ }
+
+-static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
++static __latent_entropy void rcu_process_callbacks(void)
+ {
+	__rcu_process_callbacks(&rcu_sched_ctrlblk);
+	__rcu_process_callbacks(&rcu_bh_ctrlblk);
+diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
+index 491bdf39f276..28f51c774671 100644
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -2906,7 +2906,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
+ /*
+  * Do RCU core processing for the current CPU.
+  */
+-static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
++static __latent_entropy void rcu_process_callbacks(void)
+ {
+	struct rcu_state *rsp;
+
+diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
+index 5eb3ffc9be84..a60c59cbbaee 100644
+--- a/kernel/sched/fair.c
++++ b/kernel/sched/fair.c
+@@ -9387,7 +9387,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
+  * run_rebalance_domains is triggered when needed from the scheduler tick.
+  * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
+  */
+-static __latent_entropy void run_rebalance_domains(struct softirq_action *h)
++static __latent_entropy void run_rebalance_domains(void)
+ {
+	struct rq *this_rq = this_rq();
+	enum cpu_idle_type idle = this_rq->idle_balance ?
+diff --git a/kernel/softirq.c b/kernel/softirq.c
+index 24d243ef8e71..4ed8a162cd70 100644
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
+ EXPORT_SYMBOL(irq_stat);
+ #endif
+
+-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
++static struct softirq_action softirq_vec[NR_SOFTIRQS] __ro_after_init __aligned(PAGE_SIZE);
+
+ DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
+
+@@ -282,7 +282,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
+		kstat_incr_softirqs_this_cpu(vec_nr);
+
+		trace_softirq_entry(vec_nr);
+-		h->action(h);
++		h->action();
+		trace_softirq_exit(vec_nr);
+		if (unlikely(prev_count != preempt_count())) {
+			pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
+@@ -444,7 +444,7 @@ void __raise_softirq_irqoff(unsigned int nr)
+	or_softirq_pending(1UL << nr);
+ }
+
+-void open_softirq(int nr, void (*action)(struct softirq_action *))
++void __init open_softirq(int nr, void (*action)(void))
+ {
+	softirq_vec[nr].action = action;
+ }
+@@ -486,7 +486,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
+ }
+ EXPORT_SYMBOL(__tasklet_hi_schedule);
+
+-static __latent_entropy void tasklet_action(struct softirq_action *a)
++static __latent_entropy void tasklet_action(void)
+ {
+	struct tasklet_struct *list;
+
+@@ -522,7 +522,7 @@ static __latent_entropy void tasklet_action(struct softirq_action *a)
+	}
+ }
+
+-static __latent_entropy void tasklet_hi_action(struct softirq_action *a)
++static __latent_entropy void tasklet_hi_action(void)
+ {
+	struct tasklet_struct *list;
+
+diff --git a/kernel/sysctl.c b/kernel/sysctl.c
+index f98f28c12020..861e8b721161 100644
+--- a/kernel/sysctl.c
++++ b/kernel/sysctl.c
+@@ -99,12 +99,19 @@
+ #if defined(CONFIG_SYSCTL)
+
+ /* External variables not in a header file. */
++#if IS_ENABLED(CONFIG_USB)
++int deny_new_usb __read_mostly = 0;
++EXPORT_SYMBOL(deny_new_usb);
++#endif
+ extern int suid_dumpable;
+ #ifdef CONFIG_COREDUMP
+ extern int core_uses_pid;
+ extern char core_pattern[];
+ extern unsigned int core_pipe_limit;
+ #endif
++#ifdef CONFIG_USER_NS
++extern int unprivileged_userns_clone;
++#endif
+ extern int pid_max;
+ extern int pid_max_min, pid_max_max;
+ extern int percpu_pagelist_fraction;
+@@ -116,40 +123,43 @@ extern int sysctl_nr_trim_pages;
+
+ /* Constants used for minimum and  maximum */
+ #ifdef CONFIG_LOCKUP_DETECTOR
+-static int sixty = 60;
++static int sixty __read_only = 60;
+ #endif
+
+-static int __maybe_unused neg_one = -1;
++static int __maybe_unused neg_one __read_only = -1;
+
+ static int zero;
+-static int __maybe_unused one = 1;
+-static int __maybe_unused two = 2;
+-static int __maybe_unused four = 4;
+-static unsigned long one_ul = 1;
+-static int one_hundred = 100;
+-static int one_thousand = 1000;
++static int __maybe_unused one __read_only = 1;
++static int __maybe_unused two __read_only = 2;
++static int __maybe_unused four __read_only = 4;
++static unsigned long one_ul __read_only = 1;
++static int one_hundred __read_only = 100;
++static int one_thousand __read_only = 1000;
+ #ifdef CONFIG_PRINTK
+-static int ten_thousand = 10000;
++static int ten_thousand __read_only = 10000;
+ #endif
+ #ifdef CONFIG_PERF_EVENTS
+-static int six_hundred_forty_kb = 640 * 1024;
++static int six_hundred_forty_kb __read_only = 640 * 1024;
+ #endif
+
+ /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
+-static unsigned long dirty_bytes_min = 2 * PAGE_SIZE;
++static unsigned long dirty_bytes_min __read_only = 2 * PAGE_SIZE;
+
+ /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
+-static int maxolduid = 65535;
+-static int minolduid;
++static int maxolduid __read_only = 65535;
++static int minolduid __read_only;
+
+-static int ngroups_max = NGROUPS_MAX;
++static int ngroups_max __read_only = NGROUPS_MAX;
+ static const int cap_last_cap = CAP_LAST_CAP;
+
+ /*this is needed for proc_doulongvec_minmax of sysctl_hung_task_timeout_secs */
+ #ifdef CONFIG_DETECT_HUNG_TASK
+-static unsigned long hung_task_timeout_max = (LONG_MAX/HZ);
++static unsigned long hung_task_timeout_max __read_only = (LONG_MAX/HZ);
+ #endif
+
++int device_sidechannel_restrict __read_mostly = 1;
++EXPORT_SYMBOL(device_sidechannel_restrict);
++
+ #ifdef CONFIG_INOTIFY_USER
+ #include <linux/inotify.h>
+ #endif
+@@ -289,19 +299,19 @@ static struct ctl_table sysctl_base_table[] = {
+ };
+
+ #ifdef CONFIG_SCHED_DEBUG
+-static int min_sched_granularity_ns = 100000;		/* 100 usecs */
+-static int max_sched_granularity_ns = NSEC_PER_SEC;	/* 1 second */
+-static int min_wakeup_granularity_ns;			/* 0 usecs */
+-static int max_wakeup_granularity_ns = NSEC_PER_SEC;	/* 1 second */
++static int min_sched_granularity_ns __read_only = 100000;		/* 100 usecs */
++static int max_sched_granularity_ns __read_only = NSEC_PER_SEC;	/* 1 second */
++static int min_wakeup_granularity_ns __read_only;			/* 0 usecs */
++static int max_wakeup_granularity_ns __read_only = NSEC_PER_SEC;	/* 1 second */
+ #ifdef CONFIG_SMP
+-static int min_sched_tunable_scaling = SCHED_TUNABLESCALING_NONE;
+-static int max_sched_tunable_scaling = SCHED_TUNABLESCALING_END-1;
++static int min_sched_tunable_scaling __read_only = SCHED_TUNABLESCALING_NONE;
++static int max_sched_tunable_scaling __read_only = SCHED_TUNABLESCALING_END-1;
+ #endif /* CONFIG_SMP */
+ #endif /* CONFIG_SCHED_DEBUG */
+
+ #ifdef CONFIG_COMPACTION
+-static int min_extfrag_threshold;
+-static int max_extfrag_threshold = 1000;
++static int min_extfrag_threshold __read_only;
++static int max_extfrag_threshold __read_only = 1000;
+ #endif
+
+ static struct ctl_table kern_table[] = {
+@@ -515,6 +525,15 @@ static struct ctl_table kern_table[] = {
+		.proc_handler	= proc_dointvec,
+	},
+ #endif
++#ifdef CONFIG_USER_NS
++	{
++		.procname	= "unprivileged_userns_clone",
++		.data		= &unprivileged_userns_clone,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec,
++	},
++#endif
+ #ifdef CONFIG_PROC_SYSCTL
+	{
+		.procname	= "tainted",
+@@ -856,6 +875,26 @@ static struct ctl_table kern_table[] = {
+		.extra1		= &zero,
+		.extra2		= &two,
+	},
++#endif
++	{
++		.procname	= "device_sidechannel_restrict",
++		.data		= &device_sidechannel_restrict,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec_minmax_sysadmin,
++		.extra1		= &zero,
++		.extra2		= &one,
++	},
++#if IS_ENABLED(CONFIG_USB)
++	{
++		.procname	= "deny_new_usb",
++		.data		= &deny_new_usb,
++		.maxlen		= sizeof(int),
++		.mode		= 0644,
++		.proc_handler	= proc_dointvec_minmax_sysadmin,
++		.extra1		= &zero,
++		.extra2		= &one,
++	},
+ #endif
+	{
+		.procname	= "ngroups_max",
+diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
+index 23788100e214..5577a58d1c7a 100644
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1413,7 +1413,7 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now,
+	}
+ }
+
+-static __latent_entropy void hrtimer_run_softirq(struct softirq_action *h)
++static __latent_entropy void hrtimer_run_softirq(void)
+ {
+	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
+	unsigned long flags;
+diff --git a/kernel/time/timer.c b/kernel/time/timer.c
+index 4a4fd567fb26..be236ef42690 100644
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -1672,7 +1672,7 @@ static inline void __run_timers(struct timer_base *base)
+ /*
+  * This function runs timers and the timer-tq in bottom half context.
+  */
+-static __latent_entropy void run_timer_softirq(struct softirq_action *h)
++static __latent_entropy void run_timer_softirq(void)
+ {
+	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
+
+diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
+index 246d4d4ce5c7..f64432b45cec 100644
+--- a/kernel/user_namespace.c
++++ b/kernel/user_namespace.c
+@@ -26,6 +26,9 @@
+ #include <linux/bsearch.h>
+ #include <linux/sort.h>
+
++/* sysctl */
++int unprivileged_userns_clone;
++
+ static struct kmem_cache *user_ns_cachep __read_mostly;
+ static DEFINE_MUTEX(userns_state_mutex);
+
+diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
+index 64155e310a9f..0c002bbb8f75 100644
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -945,6 +945,7 @@ endmenu # "Debug lockups and hangs"
+
+ config PANIC_ON_OOPS
+	bool "Panic on Oops"
++	default y
+	help
+	  Say Y here to enable the kernel to panic when it oopses. This
+	  has the same effect as setting oops=panic on the kernel command
+@@ -954,7 +955,7 @@ config PANIC_ON_OOPS
+	  anything erroneous after an oops which could result in data
+	  corruption or other issues.
+
+-	  Say N if unsure.
++	  Say Y if unsure.
+
+ config PANIC_ON_OOPS_VALUE
+	int
+@@ -1309,6 +1310,7 @@ config DEBUG_BUGVERBOSE
+ config DEBUG_LIST
+	bool "Debug linked list manipulation"
+	depends on DEBUG_KERNEL || BUG_ON_DATA_CORRUPTION
++	default y
+	help
+	  Enable this to turn on extended checks in the linked-list
+	  walking routines.
+@@ -1949,6 +1951,7 @@ config MEMTEST
+ config BUG_ON_DATA_CORRUPTION
+	bool "Trigger a BUG when data corruption is detected"
+	select DEBUG_LIST
++	default y
+	help
+	  Select this option if the kernel should BUG when it encounters
+	  data corruption in kernel memory structures when they get checked
+@@ -1988,6 +1991,7 @@ config STRICT_DEVMEM
+ config IO_STRICT_DEVMEM
+	bool "Filter I/O access to /dev/mem"
+	depends on STRICT_DEVMEM
++	default y
+	---help---
+	  If this option is disabled, you allow userspace (root) access to all
+	  io-memory regardless of whether a driver is actively using that
+diff --git a/lib/irq_poll.c b/lib/irq_poll.c
+index 86a709954f5a..6f15787fcb1b 100644
+--- a/lib/irq_poll.c
++++ b/lib/irq_poll.c
+@@ -75,7 +75,7 @@ void irq_poll_complete(struct irq_poll *iop)
+ }
+ EXPORT_SYMBOL(irq_poll_complete);
+
+-static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
++static void __latent_entropy irq_poll_softirq(void)
+ {
+	struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
+	int rearm = 0, budget = irq_poll_budget;
+diff --git a/lib/kobject.c b/lib/kobject.c
+index d20a97a7e168..7afe7fcfa6c9 100644
+--- a/lib/kobject.c
++++ b/lib/kobject.c
+@@ -954,9 +954,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
+
+
+ static DEFINE_SPINLOCK(kobj_ns_type_lock);
+-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
++static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __ro_after_init;
+
+-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
++int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
+ {
+	enum kobj_ns_type type = ops->type;
+	int error;
+diff --git a/lib/nlattr.c b/lib/nlattr.c
+index dfa55c873c13..c6b0436f473d 100644
+--- a/lib/nlattr.c
++++ b/lib/nlattr.c
+@@ -364,6 +364,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
+ {
+	int minlen = min_t(int, count, nla_len(src));
+
++	BUG_ON(minlen < 0);
++
+	memcpy(dest, nla_data(src), minlen);
+	if (count > minlen)
+		memset(dest + minlen, 0, count - minlen);
+diff --git a/lib/vsprintf.c b/lib/vsprintf.c
+index 38b509cc6b46..6b3bf13d57d6 100644
+--- a/lib/vsprintf.c
++++ b/lib/vsprintf.c
+@@ -1344,7 +1344,7 @@ char *uuid_string(char *buf, char *end, const u8 *addr,
+	return string(buf, end, uuid, spec);
+ }
+
+-int kptr_restrict __read_mostly;
++int kptr_restrict __read_mostly = 2;
+
+ static noinline_for_stack
+ char *restricted_pointer(char *buf, char *end, const void *ptr,
+diff --git a/mm/Kconfig b/mm/Kconfig
+index e07608f64d47..18937911b87a 100644
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -319,7 +319,8 @@ config KSM
+ config DEFAULT_MMAP_MIN_ADDR
+         int "Low address space to protect from user allocation"
+	depends on MMU
+-        default 4096
++	default 32768 if ARM || (ARM64 && COMPAT)
++	default 65536
+         help
+	  This is the portion of low virtual memory which should be protected
+	  from userspace allocation.  Keeping a user from writing to low pages
+diff --git a/mm/mmap.c b/mm/mmap.c
+index 03ca089cce0f..9bf52aa6b042 100644
+--- a/mm/mmap.c
++++ b/mm/mmap.c
+@@ -220,6 +220,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
+
+	newbrk = PAGE_ALIGN(brk);
+	oldbrk = PAGE_ALIGN(mm->brk);
++	/* properly handle unaligned min_brk as an empty heap */
++	if (min_brk & ~PAGE_MASK) {
++		if (brk == min_brk)
++			newbrk -= PAGE_SIZE;
++		if (mm->brk == min_brk)
++			oldbrk -= PAGE_SIZE;
++	}
+	if (oldbrk == newbrk)
+		goto set_brk;
+
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 1741dd23e7c1..462ce9910e43 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -68,6 +68,7 @@
+ #include <linux/ftrace.h>
+ #include <linux/lockdep.h>
+ #include <linux/nmi.h>
++#include <linux/random.h>
+
+ #include <asm/sections.h>
+ #include <asm/tlbflush.h>
+@@ -101,6 +102,15 @@ int _node_numa_mem_[MAX_NUMNODES];
+ DEFINE_MUTEX(pcpu_drain_mutex);
+ DEFINE_PER_CPU(struct work_struct, pcpu_drain);
+
++bool __meminitdata extra_latent_entropy;
++
++static int __init setup_extra_latent_entropy(char *str)
++{
++	extra_latent_entropy = true;
++	return 0;
++}
++early_param("extra_latent_entropy", setup_extra_latent_entropy);
++
+ #ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
+ volatile unsigned long latent_entropy __latent_entropy;
+ EXPORT_SYMBOL(latent_entropy);
+@@ -1069,6 +1079,13 @@ static __always_inline bool free_pages_prepare(struct page *page,
+		debug_check_no_obj_freed(page_address(page),
+					   PAGE_SIZE << order);
+	}
++
++	if (IS_ENABLED(CONFIG_PAGE_SANITIZE)) {
++		int i;
++		for (i = 0; i < (1 << order); i++)
++			clear_highpage(page + i);
++	}
++
+	arch_free_page(page, order);
+	kernel_poison_pages(page, 1 << order, 0);
+	kernel_map_pages(page, 1 << order, 0);
+@@ -1286,6 +1303,21 @@ static void __init __free_pages_boot_core(struct page *page, unsigned int order)
+	__ClearPageReserved(p);
+	set_page_count(p, 0);
+
++	if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
++		unsigned long hash = 0;
++		size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
++		const unsigned long *data = lowmem_page_address(page);
++
++		for (index = 0; index < end; index++)
++			hash ^= hash + data[index];
++#ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY
++		latent_entropy ^= hash;
++		add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
++#else
++		add_device_randomness((const void *)&hash, sizeof(hash));
++#endif
++	}
++
+	page_zone(page)->managed_pages += nr_pages;
+	set_page_refcounted(page);
+	__free_pages(page, order);
+@@ -1754,8 +1786,8 @@ static inline int check_new_page(struct page *page)
+
+ static inline bool free_pages_prezeroed(void)
+ {
+-	return IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) &&
+-		page_poisoning_enabled();
++	return IS_ENABLED(CONFIG_PAGE_SANITIZE) ||
++		(IS_ENABLED(CONFIG_PAGE_POISONING_ZERO) && page_poisoning_enabled());
+ }
+
+ #ifdef CONFIG_DEBUG_VM
+@@ -1812,6 +1844,11 @@ static void prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags
+
+	post_alloc_hook(page, order, gfp_flags);
+
++	if (IS_ENABLED(CONFIG_PAGE_SANITIZE_VERIFY)) {
++		for (i = 0; i < (1 << order); i++)
++			verify_zero_highpage(page + i);
++	}
++
+	if (!free_pages_prezeroed() && (gfp_flags & __GFP_ZERO))
+		for (i = 0; i < (1 << order); i++)
+			clear_highpage(page + i);
+diff --git a/mm/slab.h b/mm/slab.h
+index 51813236e773..e0d1b194a454 100644
+--- a/mm/slab.h
++++ b/mm/slab.h
+@@ -312,7 +312,11 @@ static inline bool is_root_cache(struct kmem_cache *s)
+ static inline bool slab_equal_or_root(struct kmem_cache *s,
+				      struct kmem_cache *p)
+ {
++#ifdef CONFIG_SLAB_HARDENED
++	return p == s;
++#else
+	return true;
++#endif
+ }
+
+ static inline const char *cache_name(struct kmem_cache *s)
+@@ -364,18 +368,26 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
+	 * to not do even the assignment. In that case, slab_equal_or_root
+	 * will also be a constant.
+	 */
+-	if (!memcg_kmem_enabled() &&
++	if (!IS_ENABLED(CONFIG_SLAB_HARDENED) &&
++	    !memcg_kmem_enabled() &&
+	    !unlikely(s->flags & SLAB_CONSISTENCY_CHECKS))
+		return s;
+
+	page = virt_to_head_page(x);
++#ifdef CONFIG_SLAB_HARDENED
++	BUG_ON(!PageSlab(page));
++#endif
+	cachep = page->slab_cache;
+	if (slab_equal_or_root(cachep, s))
+		return cachep;
+
+	pr_err("%s: Wrong slab cache. %s but object is from %s\n",
+	       __func__, s->name, cachep->name);
++#ifdef CONFIG_BUG_ON_DATA_CORRUPTION
++	BUG_ON(1);
++#else
+	WARN_ON_ONCE(1);
++#endif
+	return s;
+ }
+
+@@ -400,7 +412,7 @@ static inline size_t slab_ksize(const struct kmem_cache *s)
+	 * back there or track user information then we can
+	 * only use the space before that information.
+	 */
+-	if (s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_STORE_USER))
++	if ((s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_STORE_USER)) || IS_ENABLED(CONFIG_SLAB_CANARY))
+		return s->inuse;
+	/*
+	 * Else we can use all the padding etc for the allocation
+diff --git a/mm/slab_common.c b/mm/slab_common.c
+index 10f127b2de7c..3637ef72c5b4 100644
+--- a/mm/slab_common.c
++++ b/mm/slab_common.c
+@@ -26,10 +26,10 @@
+
+ #include "slab.h"
+
+-enum slab_state slab_state;
++enum slab_state slab_state __ro_after_init;
+ LIST_HEAD(slab_caches);
+ DEFINE_MUTEX(slab_mutex);
+-struct kmem_cache *kmem_cache;
++struct kmem_cache *kmem_cache __ro_after_init;
+
+ #ifdef CONFIG_HARDENED_USERCOPY
+ bool usercopy_fallback __ro_after_init =
+@@ -57,7 +57,7 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work,
+ /*
+  * Merge control. If this is set then no merging of slab caches will occur.
+  */
+-static bool slab_nomerge = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
++static bool slab_nomerge __ro_after_init = !IS_ENABLED(CONFIG_SLAB_MERGE_DEFAULT);
+
+ static int __init setup_slab_nomerge(char *str)
+ {
+@@ -968,7 +968,7 @@ EXPORT_SYMBOL(kmalloc_dma_caches);
+  * of two cache sizes there. The size of larger slabs can be determined using
+  * fls.
+  */
+-static s8 size_index[24] = {
++static s8 size_index[24] __ro_after_init = {
+	3,	/* 8 */
+	4,	/* 16 */
+	5,	/* 24 */
+diff --git a/mm/slub.c b/mm/slub.c
+index e381728a3751..76dd844d978a 100644
+--- a/mm/slub.c
++++ b/mm/slub.c
+@@ -125,6 +125,16 @@ static inline int kmem_cache_debug(struct kmem_cache *s)
+ #endif
+ }
+
++static inline bool has_sanitize(struct kmem_cache *s)
++{
++	return IS_ENABLED(CONFIG_SLAB_SANITIZE) && !(s->flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON));
++}
++
++static inline bool has_sanitize_verify(struct kmem_cache *s)
++{
++	return IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && has_sanitize(s);
++}
++
+ void *fixup_red_left(struct kmem_cache *s, void *p)
+ {
+	if (kmem_cache_debug(s) && s->flags & SLAB_RED_ZONE)
+@@ -299,6 +309,35 @@ static inline void set_freepointer(struct kmem_cache *s, void *object, void *fp)
+	*(void **)freeptr_addr = freelist_ptr(s, fp, freeptr_addr);
+ }
+
++#ifdef CONFIG_SLAB_CANARY
++static inline unsigned long *get_canary(struct kmem_cache *s, void *object)
++{
++	if (s->offset)
++		return object + s->offset + sizeof(void *);
++	return object + s->inuse;
++}
++
++static inline unsigned long get_canary_value(const void *canary, unsigned long value)
++{
++	return (value ^ (unsigned long)canary) & CANARY_MASK;
++}
++
++static inline void set_canary(struct kmem_cache *s, void *object, unsigned long value)
++{
++	unsigned long *canary = get_canary(s, object);
++	*canary = get_canary_value(canary, value);
++}
++
++static inline void check_canary(struct kmem_cache *s, void *object, unsigned long value)
++{
++	unsigned long *canary = get_canary(s, object);
++	BUG_ON(*canary != get_canary_value(canary, value));
++}
++#else
++#define set_canary(s, object, value)
++#define check_canary(s, object, value)
++#endif
++
+ /* Loop over all objects in a slab */
+ #define for_each_object(__p, __s, __addr, __objects) \
+	for (__p = fixup_red_left(__s, __addr); \
+@@ -486,13 +525,13 @@ static inline void *restore_red_left(struct kmem_cache *s, void *p)
+  * Debug settings:
+  */
+ #if defined(CONFIG_SLUB_DEBUG_ON)
+-static slab_flags_t slub_debug = DEBUG_DEFAULT_FLAGS;
++static slab_flags_t slub_debug __ro_after_init = DEBUG_DEFAULT_FLAGS;
+ #else
+-static slab_flags_t slub_debug;
++static slab_flags_t slub_debug __ro_after_init;
+ #endif
+
+-static char *slub_debug_slabs;
+-static int disable_higher_order_debug;
++static char *slub_debug_slabs __ro_after_init;
++static int disable_higher_order_debug __ro_after_init;
+
+ /*
+  * slub is about to manipulate internal object metadata.  This memory lies
+@@ -552,6 +591,9 @@ static struct track *get_track(struct kmem_cache *s, void *object,
+	else
+		p = object + s->inuse;
+
++	if (IS_ENABLED(CONFIG_SLAB_CANARY))
++		p = (void *)p + sizeof(void *);
++
+	return p + alloc;
+ }
+
+@@ -690,6 +732,9 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
+	else
+		off = s->inuse;
+
++	if (IS_ENABLED(CONFIG_SLAB_CANARY))
++		off += sizeof(void *);
++
+	if (s->flags & SLAB_STORE_USER)
+		off += 2 * sizeof(struct track);
+
+@@ -819,6 +864,9 @@ static int check_pad_bytes(struct kmem_cache *s, struct page *page, u8 *p)
+		/* Freepointer is placed after the object. */
+		off += sizeof(void *);
+
++	if (IS_ENABLED(CONFIG_SLAB_CANARY))
++		off += sizeof(void *);
++
+	if (s->flags & SLAB_STORE_USER)
+		/* We also have user information there */
+		off += 2 * sizeof(struct track);
+@@ -1420,8 +1468,9 @@ static void setup_object(struct kmem_cache *s, struct page *page,
+				void *object)
+ {
+	setup_object_debug(s, page, object);
++	set_canary(s, object, s->random_inactive);
+	kasan_init_slab_obj(s, object);
+-	if (unlikely(s->ctor)) {
++	if (unlikely(s->ctor) && !has_sanitize_verify(s)) {
+		kasan_unpoison_object_data(s, object);
+		s->ctor(object);
+		kasan_poison_object_data(s, object);
+@@ -2719,9 +2768,21 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s,
+		stat(s, ALLOC_FASTPATH);
+	}
+
+-	if (unlikely(gfpflags & __GFP_ZERO) && object)
++	if (has_sanitize_verify(s) && object) {
++		size_t offset = s->offset ? 0 : sizeof(void *);
++		BUG_ON(memchr_inv(object + offset, 0, s->object_size - offset));
++		if (s->ctor)
++			s->ctor(object);
++		if (unlikely(gfpflags & __GFP_ZERO) && offset)
++			memset(object, 0, sizeof(void *));
++	} else if (unlikely(gfpflags & __GFP_ZERO) && object)
+		memset(object, 0, s->object_size);
+
++	if (object) {
++		check_canary(s, object, s->random_inactive);
++		set_canary(s, object, s->random_active);
++	}
++
+	slab_post_alloc_hook(s, gfpflags, 1, &object);
+
+	return object;
+@@ -2928,6 +2989,27 @@ static __always_inline void do_slab_free(struct kmem_cache *s,
+	void *tail_obj = tail ? : head;
+	struct kmem_cache_cpu *c;
+	unsigned long tid;
++	bool sanitize = has_sanitize(s);
++
++	if (IS_ENABLED(CONFIG_SLAB_CANARY) || sanitize) {
++		__maybe_unused int offset = s->offset ? 0 : sizeof(void *);
++		void *x = head;
++
++		while (1) {
++			check_canary(s, x, s->random_active);
++			set_canary(s, x, s->random_inactive);
++
++			if (sanitize) {
++				memset(x + offset, 0, s->object_size - offset);
++				if (!IS_ENABLED(CONFIG_SLAB_SANITIZE_VERIFY) && s->ctor)
++					s->ctor(x);
++			}
++			if (x == tail_obj)
++				break;
++			x = get_freepointer(s, x);
++		}
++	}
++
+ redo:
+	/*
+	 * Determine the currently cpus per cpu slab.
+@@ -3106,7 +3188,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+			  void **p)
+ {
+	struct kmem_cache_cpu *c;
+-	int i;
++	int i, k;
+
+	/* memcg and kmem_cache debug support */
+	s = slab_pre_alloc_hook(s, flags);
+@@ -3143,13 +3225,29 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
+	local_irq_enable();
+
+	/* Clear memory outside IRQ disabled fastpath loop */
+-	if (unlikely(flags & __GFP_ZERO)) {
++	if (has_sanitize_verify(s)) {
++		int j;
++
++		for (j = 0; j < i; j++) {
++			size_t offset = s->offset ? 0 : sizeof(void *);
++			BUG_ON(memchr_inv(p[j] + offset, 0, s->object_size - offset));
++			if (s->ctor)
++				s->ctor(p[j]);
++			if (unlikely(flags & __GFP_ZERO) && offset)
++				memset(p[j], 0, sizeof(void *));
++		}
++	} else if (unlikely(flags & __GFP_ZERO)) {
+		int j;
+
+		for (j = 0; j < i; j++)
+			memset(p[j], 0, s->object_size);
+	}
+
++	for (k = 0; k < i; k++) {
++		check_canary(s, p[k], s->random_inactive);
++		set_canary(s, p[k], s->random_active);
++	}
++
+	/* memcg and kmem_cache debug support */
+	slab_post_alloc_hook(s, flags, size, p);
+	return i;
+@@ -3181,9 +3279,9 @@ EXPORT_SYMBOL(kmem_cache_alloc_bulk);
+  * and increases the number of allocations possible without having to
+  * take the list_lock.
+  */
+-static int slub_min_order;
+-static int slub_max_order = PAGE_ALLOC_COSTLY_ORDER;
+-static int slub_min_objects;
++static int slub_min_order __ro_after_init;
++static int slub_max_order __ro_after_init = PAGE_ALLOC_COSTLY_ORDER;
++static int slub_min_objects __ro_after_init;
+
+ /*
+  * Calculate the order of allocation given an slab object size.
+@@ -3353,6 +3451,7 @@ static void early_kmem_cache_node_alloc(int node)
+	init_object(kmem_cache_node, n, SLUB_RED_ACTIVE);
+	init_tracking(kmem_cache_node, n);
+ #endif
++	set_canary(kmem_cache_node, n, kmem_cache_node->random_active);
+	kasan_kmalloc(kmem_cache_node, n, sizeof(struct kmem_cache_node),
+		      GFP_KERNEL);
+	init_kmem_cache_node(n);
+@@ -3509,6 +3608,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
+		size += sizeof(void *);
+	}
+
++	if (IS_ENABLED(CONFIG_SLAB_CANARY))
++		size += sizeof(void *);
++
+ #ifdef CONFIG_SLUB_DEBUG
+	if (flags & SLAB_STORE_USER)
+		/*
+@@ -3579,6 +3681,10 @@ static int kmem_cache_open(struct kmem_cache *s, slab_flags_t flags)
+ #ifdef CONFIG_SLAB_FREELIST_HARDENED
+	s->random = get_random_long();
+ #endif
++#ifdef CONFIG_SLAB_CANARY
++	s->random_active = get_random_long();
++	s->random_inactive = get_random_long();
++#endif
+
+	if (need_reserve_slab_rcu && (s->flags & SLAB_TYPESAFE_BY_RCU))
+		s->reserved = sizeof(struct rcu_head);
+@@ -3846,6 +3952,8 @@ void __check_heap_object(const void *ptr, unsigned long n, struct page *page,
+		offset -= s->red_left_pad;
+	}
+
++	check_canary(s, (void *)ptr - offset, s->random_active);
++
+	/* Allow address range falling entirely within usercopy region. */
+	if (offset >= s->useroffset &&
+	    offset - s->useroffset <= s->usersize &&
+@@ -3879,7 +3987,11 @@ static size_t __ksize(const void *object)
+	page = virt_to_head_page(object);
+
+	if (unlikely(!PageSlab(page))) {
++#ifdef CONFIG_BUG_ON_DATA_CORRUPTION
++		BUG_ON(!PageCompound(page));
++#else
+		WARN_ON(!PageCompound(page));
++#endif
+		return PAGE_SIZE << compound_order(page);
+	}
+
+@@ -4744,7 +4856,7 @@ enum slab_stat_type {
+ #define SO_TOTAL	(1 << SL_TOTAL)
+
+ #ifdef CONFIG_MEMCG
+-static bool memcg_sysfs_enabled = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
++static bool memcg_sysfs_enabled __ro_after_init = IS_ENABLED(CONFIG_SLUB_MEMCG_SYSFS_ON);
+
+ static int __init setup_slub_memcg_sysfs(char *str)
+ {
+diff --git a/mm/swap.c b/mm/swap.c
+index 0f17330dd0e5..6e52cb476ef5 100644
+--- a/mm/swap.c
++++ b/mm/swap.c
+@@ -92,6 +92,13 @@ static void __put_compound_page(struct page *page)
+	if (!PageHuge(page))
+		__page_cache_release(page);
+	dtor = get_compound_page_dtor(page);
++	if (!PageHuge(page))
++		BUG_ON(dtor != free_compound_page
++#ifdef CONFIG_TRANSPARENT_HUGEPAGE
++			&& dtor != free_transhuge_page
++#endif
++		);
++
+	(*dtor)(page);
+ }
+
+diff --git a/net/core/dev.c b/net/core/dev.c
+index ace13bea3e50..77a1519c52b7 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -4196,7 +4196,7 @@ int netif_rx_ni(struct sk_buff *skb)
+ }
+ EXPORT_SYMBOL(netif_rx_ni);
+
+-static __latent_entropy void net_tx_action(struct softirq_action *h)
++static __latent_entropy void net_tx_action(void)
+ {
+	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
+
+@@ -5745,7 +5745,7 @@ static int napi_poll(struct napi_struct *n, struct list_head *repoll)
+	return work;
+ }
+
+-static __latent_entropy void net_rx_action(struct softirq_action *h)
++static __latent_entropy void net_rx_action(void)
+ {
+	struct softnet_data *sd = this_cpu_ptr(&softnet_data);
+	unsigned long time_limit = jiffies +
+diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
+index f48fe6fc7e8c..d78c52835c08 100644
+--- a/net/ipv4/Kconfig
++++ b/net/ipv4/Kconfig
+@@ -261,6 +261,7 @@ config IP_PIMSM_V2
+
+ config SYN_COOKIES
+	bool "IP: TCP syncookie support"
++	default y
+	---help---
+	  Normal TCP/IP networking is open to an attack known as "SYN
+	  flooding". This denial-of-service attack prevents legitimate remote
+diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
+index 9917f928d0fd..784e0e2fc839 100644
+--- a/scripts/mod/modpost.c
++++ b/scripts/mod/modpost.c
+@@ -37,6 +37,7 @@ static int vmlinux_section_warnings = 1;
+ static int warn_unresolved = 0;
+ /* How a symbol is exported */
+ static int sec_mismatch_count = 0;
++static int writable_fptr_count = 0;
+ static int sec_mismatch_verbose = 1;
+ static int sec_mismatch_fatal = 0;
+ /* ignore missing files */
+@@ -965,6 +966,7 @@ enum mismatch {
+	ANY_EXIT_TO_ANY_INIT,
+	EXPORT_TO_INIT_EXIT,
+	EXTABLE_TO_NON_TEXT,
++	DATA_TO_TEXT
+ };
+
+ /**
+@@ -1091,6 +1093,12 @@ static const struct sectioncheck sectioncheck[] = {
+	.good_tosec = {ALL_TEXT_SECTIONS , NULL},
+	.mismatch = EXTABLE_TO_NON_TEXT,
+	.handler = extable_mismatch_handler,
++},
++/* Do not reference code from writable data */
++{
++	.fromsec = { DATA_SECTIONS, NULL },
++	.bad_tosec = { ALL_TEXT_SECTIONS, NULL },
++	.mismatch = DATA_TO_TEXT
+ }
+ };
+
+@@ -1240,10 +1248,10 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
+			continue;
+		if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
+			continue;
+-		if (sym->st_value == addr)
+-			return sym;
+		/* Find a symbol nearby - addr are maybe negative */
+		d = sym->st_value - addr;
++		if (d == 0)
++			return sym;
+		if (d < 0)
+			d = addr - sym->st_value;
+		if (d < distance) {
+@@ -1402,7 +1410,11 @@ static void report_sec_mismatch(const char *modname,
+	char *prl_from;
+	char *prl_to;
+
+-	sec_mismatch_count++;
++	if (mismatch->mismatch == DATA_TO_TEXT)
++		writable_fptr_count++;
++	else
++		sec_mismatch_count++;
++
+	if (!sec_mismatch_verbose)
+		return;
+
+@@ -1526,6 +1538,14 @@ static void report_sec_mismatch(const char *modname,
+		fatal("There's a special handler for this mismatch type, "
+		      "we should never get here.");
+		break;
++	case DATA_TO_TEXT:
++#if 0
++		fprintf(stderr,
++		"The %s %s:%s references\n"
++		"the %s %s:%s%s\n",
++		from, fromsec, fromsym, to, tosec, tosym, to_p);
++#endif
++		break;
+	}
+	fprintf(stderr, "\n");
+ }
+@@ -2539,6 +2559,14 @@ int main(int argc, char **argv)
+		}
+	}
+	free(buf.p);
++	if (writable_fptr_count) {
++		if (!sec_mismatch_verbose) {
++			warn("modpost: Found %d writable function pointer(s).\n"
++			     "To see full details build your kernel with:\n"
++			     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
++			     writable_fptr_count);
++		}
++	}
+
+	return err;
+ }
+diff --git a/security/Kconfig b/security/Kconfig
+index c4302067a3ad..1b1e9368cae5 100644
+--- a/security/Kconfig
++++ b/security/Kconfig
+@@ -8,7 +8,7 @@ source security/keys/Kconfig
+
+ config SECURITY_DMESG_RESTRICT
+	bool "Restrict unprivileged access to the kernel syslog"
+-	default n
++	default y
+	help
+	  This enforces restrictions on unprivileged users reading the kernel
+	  syslog via dmesg(8).
+@@ -18,10 +18,21 @@ config SECURITY_DMESG_RESTRICT
+
+	  If you are unsure how to answer this question, answer N.
+
++config SECURITY_PERF_EVENTS_RESTRICT
++	bool "Restrict unprivileged use of performance events"
++	depends on PERF_EVENTS
++	default y
++	help
++	  If you say Y here, the kernel.perf_event_paranoid sysctl
++	  will be set to 3 by default, and no unprivileged use of the
++	  perf_event_open syscall will be permitted unless it is
++	  changed.
++
+ config SECURITY
+	bool "Enable different security models"
+	depends on SYSFS
+	depends on MULTIUSER
++	default y
+	help
+	  This allows you to choose different security modules to be
+	  configured into your kernel.
+@@ -48,6 +59,7 @@ config SECURITYFS
+ config SECURITY_NETWORK
+	bool "Socket and Networking Security Hooks"
+	depends on SECURITY
++	default y
+	help
+	  This enables the socket and networking security hooks.
+	  If enabled, a security module can use these hooks to
+@@ -155,6 +167,7 @@ config HARDENED_USERCOPY
+	depends on HAVE_HARDENED_USERCOPY_ALLOCATOR
+	select BUG
+	imply STRICT_DEVMEM
++	default y
+	help
+	  This option checks for obviously wrong memory regions when
+	  copying memory to/from the kernel (via copy_to_user() and
+@@ -167,7 +180,6 @@ config HARDENED_USERCOPY
+ config HARDENED_USERCOPY_FALLBACK
+	bool "Allow usercopy whitelist violations to fallback to object size"
+	depends on HARDENED_USERCOPY
+-	default y
+	help
+	  This is a temporary option that allows missing usercopy whitelists
+	  to be discovered via a WARN() to the kernel log, instead of
+@@ -192,10 +204,36 @@ config HARDENED_USERCOPY_PAGESPAN
+ config FORTIFY_SOURCE
+	bool "Harden common str/mem functions against buffer overflows"
+	depends on ARCH_HAS_FORTIFY_SOURCE
++	default y
+	help
+	  Detect overflows of buffers in common string and memory functions
+	  where the compiler can determine and validate the buffer sizes.
+
++config FORTIFY_SOURCE_STRICT_STRING
++	bool "Harden common functions against buffer overflows"
++	depends on FORTIFY_SOURCE
++	depends on EXPERT
++	help
++	  Perform stricter overflow checks catching overflows within objects
++	  for common C string functions rather than only between objects.
++
++	  This is not yet intended for production use, only bug finding.
++
++config PAGE_SANITIZE
++	bool "Sanitize pages"
++	default y
++	help
++	  Zero fill page allocations on free, reducing the lifetime of
++	  sensitive data and helping to mitigate use-after-free bugs.
++
++config PAGE_SANITIZE_VERIFY
++	bool "Verify sanitized pages"
++	depends on PAGE_SANITIZE
++	default y
++	help
++	  Verify that newly allocated pages are zeroed to detect
++	  write-after-free bugs.
++
+ config STATIC_USERMODEHELPER
+	bool "Force all usermode helper calls through a single binary"
+	help
+diff --git a/security/selinux/Kconfig b/security/selinux/Kconfig
+index 8af7a690eb40..6539694b0fd3 100644
+--- a/security/selinux/Kconfig
++++ b/security/selinux/Kconfig
+@@ -2,7 +2,7 @@ config SECURITY_SELINUX
+	bool "NSA SELinux Support"
+	depends on SECURITY_NETWORK && AUDIT && NET && INET
+	select NETWORK_SECMARK
+-	default n
++	default y
+	help
+	  This selects NSA Security-Enhanced Linux (SELinux).
+	  You will also need a policy configuration and a labeled filesystem.
+@@ -79,23 +79,3 @@ config SECURITY_SELINUX_AVC_STATS
+	  This option collects access vector cache statistics to
+	  /selinux/avc/cache_stats, which may be monitored via
+	  tools such as avcstat.
+-
+-config SECURITY_SELINUX_CHECKREQPROT_VALUE
+-	int "NSA SELinux checkreqprot default value"
+-	depends on SECURITY_SELINUX
+-	range 0 1
+-	default 0
+-	help
+-	  This option sets the default value for the 'checkreqprot' flag
+-	  that determines whether SELinux checks the protection requested
+-	  by the application or the protection that will be applied by the
+-	  kernel (including any implied execute for read-implies-exec) for
+-	  mmap and mprotect calls.  If this option is set to 0 (zero),
+-	  SELinux will default to checking the protection that will be applied
+-	  by the kernel.  If this option is set to 1 (one), SELinux will
+-	  default to checking the protection requested by the application.
+-	  The checkreqprot flag may be changed from the default via the
+-	  'checkreqprot=' boot parameter.  It may also be changed at runtime
+-	  via /selinux/checkreqprot if authorized by policy.
+-
+-	  If you are unsure how to answer this question, answer 0.
+diff --git a/security/selinux/include/objsec.h b/security/selinux/include/objsec.h
+index 3d54468ce334..ceafb908afde 100644
+--- a/security/selinux/include/objsec.h
++++ b/security/selinux/include/objsec.h
+@@ -154,6 +154,6 @@ struct bpf_security_struct {
+	u32 sid;  /*SID of bpf obj creater*/
+ };
+
+-extern unsigned int selinux_checkreqprot;
++extern const unsigned int selinux_checkreqprot;
+
+ #endif /* _SELINUX_OBJSEC_H_ */
+diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
+index 00eed842c491..8f7b8d7e6f91 100644
+--- a/security/selinux/selinuxfs.c
++++ b/security/selinux/selinuxfs.c
+@@ -41,16 +41,7 @@
+ #include "objsec.h"
+ #include "conditional.h"
+
+-unsigned int selinux_checkreqprot = CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE;
+-
+-static int __init checkreqprot_setup(char *str)
+-{
+-	unsigned long checkreqprot;
+-	if (!kstrtoul(str, 0, &checkreqprot))
+-		selinux_checkreqprot = checkreqprot ? 1 : 0;
+-	return 1;
+-}
+-__setup("checkreqprot=", checkreqprot_setup);
++const unsigned int selinux_checkreqprot;
+
+ static DEFINE_MUTEX(sel_mutex);
+
+@@ -610,10 +601,9 @@ static ssize_t sel_write_checkreqprot(struct file *file, const char __user *buf,
+		return PTR_ERR(page);
+
+	length = -EINVAL;
+-	if (sscanf(page, "%u", &new_value) != 1)
++	if (sscanf(page, "%u", &new_value) != 1 || new_value)
+		goto out;
+
+-	selinux_checkreqprot = new_value ? 1 : 0;
+	length = count;
+ out:
+	kfree(page);
+diff --git a/security/yama/Kconfig b/security/yama/Kconfig
+index 96b27405558a..485c1b85c325 100644
+--- a/security/yama/Kconfig
++++ b/security/yama/Kconfig
+@@ -1,7 +1,7 @@
+ config SECURITY_YAMA
+	bool "Yama support"
+	depends on SECURITY
+-	default n
++	default y
+	help
+	  This selects Yama, which extends DAC support with additional
+	  system-wide security settings beyond regular Linux discretionary
diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 4fe2e405698b..1b0c42b81114 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
 
 with stdenv.lib;
 
@@ -6,7 +6,7 @@ buildLinux (args // rec {
   version = "4.16.13";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
+  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
diff --git a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix b/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
deleted file mode 100644
index 571b49245661..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-copperhead-stable.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args:
-
-with stdenv.lib;
-
-let
-  version = "4.16.12";
-  revision = "a";
-  sha256 = "0gkgvhh2v5lca67xjmq512mqnfbln6lkk6hgigby2406b9w1b0sd";
-
-  # modVersion needs to be x.y.z, will automatically add .0 if needed
-  modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0")));
-
-  # branchVersion needs to be x.y
-  branchVersion = concatStrings (intersperse "." (take 2 (splitString "." version)));
-
-  modDirVersion = "${modVersion}-hardened";
-in
-buildLinux (args // {
-  inherit modDirVersion;
-
-  version = "${version}-${revision}";
-  extraMeta.branch = "${branchVersion}";
-
-  src = fetchFromGitHub {
-    inherit sha256;
-    owner = "copperhead";
-    repo = "linux-hardened";
-    rev = "${version}.${revision}";
-  };
-} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index fb28bba1c32f..c22762bde7c7 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -28,6 +28,11 @@ rec {
     patch = ./tag-hardened.patch;
   };
 
+  copperhead_4_16 = rec {
+    name = "copperhead-4.16";
+    patch = ./copperhead-4-16.patch;
+  };
+
   # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6
   iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec {
     name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9983cef069aa..3cf0e2e9e384 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13465,13 +13465,13 @@ with pkgs;
     ];
   };
 
-  linux_copperhead_stable = callPackage ../os-specific/linux/kernel/linux-copperhead-stable.nix {
-    kernelPatches = with kernelPatches; [
-      bridge_stp_helper
-      modinst_arg_list_too_long
-      tag_hardened
-    ];
-  };
+  linux_copperhead_stable = (linux_4_16.override {
+    kernelPatches = linux_4_16.kernelPatches ++ [
+      kernelPatches.copperhead_4_16
+      kernelPatches.tag_hardened
+     ];
+    modDirVersionArg = linux_4_16.modDirVersion + "-hardened";
+  });
 
   # linux mptcp is based on the 4.4 kernel
   linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {

From 67eaab86b4fb2541d63571d99935f790f9e500f7 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 4 Jun 2018 16:07:19 +0200
Subject: [PATCH 3043/3370] gnome3.vinagre: fix build

Currently, vinagre fails to build with the following message:

vinagre/vinagre-utils.c: In function 'vinagre_utils_request_credential':
vinagre/vinagre-utils.c:686:2: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
  _tmp12_ = g_strdup_printf (_tmp10_, _tmp11_);
  ^~~~~~~

vinagre-utils.c seems to be generated from vinagre-utils.vala. I
couldn't find anything weird in here, so let's disable
-Werror=format-nonliteral for now as done elsewhere, too.
---
 pkgs/desktops/gnome-3/apps/vinagre/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index 4f358cf0b4f6..566624431dc6 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret
                   itstool makeWrapper gnome3.defaultIconTheme librsvg ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral";
+
   preFixup = ''
     wrapProgram "$out/bin/vinagre" \
       --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"

From bc158d37fedb307d3b6b6bbf47fd5507c5d2036d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Mon, 4 Jun 2018 16:25:16 +0200
Subject: [PATCH 3044/3370] eigen3_3: Fix darwin build

---
 pkgs/development/libraries/eigen/3.3.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/eigen/3.3.nix b/pkgs/development/libraries/eigen/3.3.nix
index 5d13fb09dcca..7de05926da59 100644
--- a/pkgs/development/libraries/eigen/3.3.nix
+++ b/pkgs/development/libraries/eigen/3.3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake}:
+{stdenv, fetchurl, fetchpatch, cmake}:
 
 let
   version = "3.3.4";
@@ -11,6 +11,15 @@ stdenv.mkDerivation {
     name = "eigen-${version}.tar.gz";
     sha256 = "1q85bgd6hnsgn0kq73wa4jwh4qdwklfg73pgqrz4zmxvzbqyi1j2";
   };
+
+  patches = [
+    # Remove for > 3.3.4
+    # Upstream commit from 6 Apr 2018 "Fix cmake scripts with no fortran compiler"
+    (fetchpatch {
+      url    = "https://bitbucket.org/eigen/eigen/commits/ba14974d054ae9ae4ba88e5e58012fa6c2729c32/raw";
+      sha256 = "0fskiy9sbzvp693fcyv3pfq8kxxx3d3mgmaqvjbl5bpfjivij8l1";
+    })
+  ];
   
   nativeBuildInputs = [ cmake ];
 

From 27b71b6e762f82600a22c6247e4a22a4a325ad17 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Mon, 4 Jun 2018 15:33:32 +0000
Subject: [PATCH 3045/3370] znapzend: minor comment

---
 pkgs/tools/backup/znapzend/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix
index 7cef9971d765..f78c300afd0a 100644
--- a/pkgs/tools/backup/znapzend/default.nix
+++ b/pkgs/tools/backup/znapzend/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, fetchurl, zfs, mbuffer, perl, perlPackages, wget, autoconf, automake }:
 
 let
+  # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES
   Mojolicious-6-46 = perlPackages.buildPerlPackage rec {
     name = "Mojolicious-6.46";
     src = fetchurl {

From 39444569e0c6e96bceea74840762202e0e968f32 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 4 Jun 2018 14:12:03 -0400
Subject: [PATCH 3046/3370] linux: Add 4.17

---
 pkgs/os-specific/linux/kernel/linux-4.17.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix              | 14 +++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-4.17.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.17.nix b/pkgs/os-specific/linux/kernel/linux-4.17.nix
new file mode 100644
index 000000000000..b360e98f0c09
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-4.17.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
+
+with stdenv.lib;
+
+buildLinux (args // rec {
+  version = "4.17";
+
+  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
+  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
+
+  # branchVersion needs to be x.y
+  extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
+    sha256 = "04yd7hnsdyaq4xmrgg7509qjf09k1dy6k1p8qqfrdspajvc1valz";
+  };
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cf0e2e9e384..f79e38a41d08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13526,6 +13526,17 @@ with pkgs;
       ];
   };
 
+  linux_4_17 = callPackage ../os-specific/linux/kernel/linux-4.17.nix {
+    kernelPatches =
+      [ kernelPatches.bridge_stp_helper
+        # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
+        # when adding a new linux version
+        # kernelPatches.cpu-cgroup-v2."4.11"
+        kernelPatches.modinst_arg_list_too_long
+        kernelPatches.bcm2835_mmal_v4l2_camera_driver # Only needed for 4.16!
+      ];
+  };
+
   linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
     kernelPatches = [
       kernelPatches.bridge_stp_helper
@@ -13711,7 +13722,7 @@ with pkgs;
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!
-  linuxPackages_latest = linuxPackages_4_16;
+  linuxPackages_latest = linuxPackages_4_17;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
@@ -13722,6 +13733,7 @@ with pkgs;
   linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9);
   linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14);
   linuxPackages_4_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_16);
+  linuxPackages_4_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_17);
   # Don't forget to update linuxPackages_latest!
 
   # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.

From f34b498bd2d998e6d5c1b707076f1f4875b3583e Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Mon, 4 Jun 2018 14:52:32 -0400
Subject: [PATCH 3047/3370] vinagre: disable format hardening

https://hydra.nixos.org/build/75464534/nixlog/1
---
 pkgs/desktops/gnome-3/apps/vinagre/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index 4f358cf0b4f6..20fe55d9b81a 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
   '';
 
+  hardeningDisable = [ "format" ];
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Vinagre;
     description = "Remote desktop viewer for GNOME";

From fd95f532e0a0bfc8bdbef5c359351501c16807ce Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Fri, 11 May 2018 16:37:29 +0200
Subject: [PATCH 3048/3370] rust: 1.25.0 -> 1.26.1

---
 pkgs/development/compilers/rust/bootstrap.nix | 14 ++---
 pkgs/development/compilers/rust/default.nix   | 13 ++---
 ...tests-libstd-net-tcp-on-Darwin-Linux.patch | 53 -------------------
 .../compilers/rust/patches/grsec.patch        | 24 ---------
 pkgs/development/compilers/rust/rustc.nix     |  3 +-
 5 files changed, 14 insertions(+), 93 deletions(-)
 delete mode 100644 pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
 delete mode 100644 pkgs/development/compilers/rust/patches/grsec.patch

diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 44d96bc4ad1d..589054ef4384 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
 let
   # Note: the version MUST be one version prior to the version we're
   # building
-  version = "1.24.1";
+  version = "1.26.0";
 
   # fetch hashes by running `print-hashes.sh 1.24.1`
   hashes = {
-    i686-unknown-linux-gnu = "a483576bb2ab237aa1ef62b66c0814f934afd8129d7c9748cb9a75da4a678c98";
-    x86_64-unknown-linux-gnu = "4567e7f6e5e0be96e9a5a7f5149b5452828ab6a386099caca7931544f45d5327";
-    armv7-unknown-linux-gnueabihf = "1169ab005b771c4befcdab536347a90242cae544b6b76eccd0f76796b61a534c";
-    aarch64-unknown-linux-gnu = "64bb25a9689b18ddadf025b90d9bdb150b809ebfb74432dc69cc2e46120adbb2";
-    i686-apple-darwin = "c96f7579e2406220895da80a989daaa194751c141e112ebe95761f2ed4ecb662";
-    x86_64-apple-darwin = "9d4aacdb5849977ea619d399903c9378163bd9c76ea11dac5ef6eca27849f501";
+    i686-unknown-linux-gnu = "2aef0709b1f2e93d396143b7a926f262ac6fd24dd8768bf2c9425255a4a401c1";
+    x86_64-unknown-linux-gnu = "13691d7782577fc9f110924b26603ade1990de0b691a3ce2dc324b4a72a64a68";
+    armv7-unknown-linux-gnueabihf = "d10c892cd3267010068930599e1e3835b50c6ba5261a912107dcba5ca1893ec5";
+    aarch64-unknown-linux-gnu = "e12dc84bdb569cdb382268a5fe6ae6a8e2e53810cb890ec3a7133c20ba8451ac";
+    i686-apple-darwin = "04dd24d7a5d5e02d5e992eaabd5952d39363885ce2a9980e3e96e5bc09dab2f0";
+    x86_64-apple-darwin = "38708803c3096b8f101d1919ee2d7e723b0adf1bc1bb986b060973b57d8c7c28";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index f191515b745c..8669af91a9a9 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,16 +6,18 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.25.0";
-  cargoVersion = "0.26.0";
+  version = "1.26.1";
+  cargoVersion = "1.26.1";
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "0baxjr99311lvwdq0s38bipbnj72pn6fgbk6lcq7j555xq53mxpf";
+    sha256 = "1w0da0cysvzxqyn0ap0aprzlm006185yk5lq3v0b4hzcv0drd9vh";
   };
 in rec {
   rustc = callPackage ./rustc.nix {
     inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src;
 
+    patches = [];
+
     forceBundledLLVM = true;
 
     configureFlags = [ "--release-channel=stable" ];
@@ -25,11 +27,6 @@ in rec {
     # So we do the same.
     # 2. Tests run out of memory for i686
     doCheck = !stdenv.isAarch64 && !stdenv.isi686;
-
-    patches = [
-      ./patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
-    ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
-
   };
 
   cargo = callPackage ./cargo.nix rec {
diff --git a/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch b/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
deleted file mode 100644
index f55d0badb823..000000000000
--- a/pkgs/development/compilers/rust/patches/0001-Disable-fragile-tests-libstd-net-tcp-on-Darwin-Linux.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 26d3b70abec1adf773522643b31ce9c03439916a Mon Sep 17 00:00:00 2001
-From: Joerg Thalheim <joerg@thalheim.io>
-Date: Tue, 10 Oct 2017 00:40:20 +0100
-Subject: [PATCH] Disable fragile tests libstd::net::tcp on Darwin/Linux
-
-Signed-off-by: Joerg Thalheim <joerg@thalheim.io>
----
- src/libstd/net/tcp.rs | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
-index 8d1e7882e5..2c223fb315 100644
---- a/src/libstd/net/tcp.rs
-+++ b/src/libstd/net/tcp.rs
-@@ -949,6 +949,7 @@ mod tests {
-         })
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn write_close() {
-         each_ip(&mut |addr| {
-@@ -1421,7 +1422,10 @@ mod tests {
- 
-     // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
-     //        no longer has rounding errors.
--    #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
-+    #[cfg_attr(any(target_os = "bitrig",
-+                   target_os = "netbsd",
-+                   target_os = "openbsd",
-+                   target_os = "macos"), ignore)]
-     #[test]
-     fn timeouts() {
-         let addr = next_test_ip4();
-@@ -1500,6 +1504,7 @@ mod tests {
-         assert_eq!(false, t!(stream.nodelay()));
-     }
- 
-+    #[cfg_attr(target_os = "macos", ignore)]
-     #[test]
-     fn ttl() {
-         let ttl = 100;
-@@ -1568,6 +1573,7 @@ mod tests {
-         })
-     }
- 
-+    #[cfg_attr(target_os = "linux", ignore)]
-     #[test]
-     fn connect_timeout_unroutable() {
-         // this IP is unroutable, so connections should always time out,
--- 
-2.14.2
-
diff --git a/pkgs/development/compilers/rust/patches/grsec.patch b/pkgs/development/compilers/rust/patches/grsec.patch
deleted file mode 100644
index b97b40c24091..000000000000
--- a/pkgs/development/compilers/rust/patches/grsec.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/test/run-make/relocation-model/Makefile b/src/test/run-make/relocation-model/Makefile
-index b22f34f..c6489bd 100644
---- a/src/test/run-make/relocation-model/Makefile
-+++ b/src/test/run-make/relocation-model/Makefile
-@@ -2,9 +2,11 @@
- 
- all: others
- 	$(RUSTC) -C relocation-model=dynamic-no-pic foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 
- 	$(RUSTC) -C relocation-model=default --crate-type=dylib foo.rs
-@@ -16,6 +18,7 @@ others:
- else
- others:
- 	$(RUSTC) -C relocation-model=static foo.rs
-+	paxctl -czexm $(TMPDIR)/foo
- 	$(call RUN,foo)
- 	$(RUSTC) -C relocation-model=static --crate-type=dylib foo.rs
- endif
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 277ffda20afd..72d0ee70782a 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -149,10 +149,11 @@ stdenv.mkDerivation {
   outputs = [ "out" "man" "doc" ];
   setOutputFlags = false;
 
-  # Disable codegen units for the tests.
+  # Disable codegen units and hardening for the tests.
   preCheck = ''
     export RUSTFLAGS=
     export TZDIR=${tzdata}/share/zoneinfo
+    export hardeningDisable=all
   '' +
   # Ensure TMPDIR is set, and disable a test that removing the HOME
   # variable from the environment falls back to another home

From 6d03390d12dc5c2adb76028d736690eb8bfa5867 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 4 Jun 2018 22:01:48 +0200
Subject: [PATCH 3049/3370] haproxy: 1.8.4 -> 1.8.9

This fixes CVE-2018-10184 a potential remote denial of service in the
http/2 module. The version bump also includes various other changes that
are described in the changelog [1]:

2018/05/18 : 1.8.9
    - BUG/MINOR: pattern: Add a missing HA_SPIN_INIT() in pat_ref_newid()
    - BUG/MAJOR: channel: Fix crash when trying to read from a closed socket
    - BUG/MINOR: log: t_idle (%Ti) is not set for some requests
    - BUG/MEDIUM: lua: Fix segmentation fault if a Lua task exits
    - MINOR: h2: detect presence of CONNECT and/or content-length
    - BUG/MEDIUM: h2: implement missing support for chunked encoded uploads
    - BUG/MINOR: lua/threads: Make lua's tasks sticky to the current thread
    - BUG/MINOR: config: disable http-reuse on TCP proxies
    - BUG/MINOR: checks: Fix check->health computation for flapping servers
    - BUG/MEDIUM: threads: Fix the sync point for more than 32 threads
    - BUG/MINOR: lua: Put tasks to sleep when waiting for data
    - DOC/MINOR: clean up LUA documentation re: servers & array/table.
    - BUG/MINOR: map: correctly track reference to the last ref_elt being dumped
    - BUG/MEDIUM: task: Don't free a task that is about to be run.
    - BUG/MINOR: lua: schedule socket task upon lua connect()
    - BUG/MINOR: lua: ensure large proxy IDs can be represented
    - BUG/MEDIUM: http: don't always abort transfers on CF_SHUTR
    - BUG/MEDIUM: pollers: Use a global list for fd shared between threads.
    - BUG/MEDIUM: ssl: properly protect SSL cert generation
    - BUG/MINOR: spoe: Mistake in error message about SPOE configuration

2018/04/19 : 1.8.8
    - BUG/MEDIUM: threads: Fix the max/min calculation because of name clashes
    - BUG/MEDIUM: connection: Make sure we have a mux before calling detach().
    - BUG/MINOR: http: Return an error in proxy mode when url2sa fails
    - BUG/MEDIUM: kqueue: When adding new events, provide an output to get errors.
    - BUG/MINOR: cli: Guard against NULL messages when using CLI_ST_PRINT_FREE
    - MINOR: cli: Ensure the CLI always outputs an error when it should
    - DOC: lua: update the links to the config and Lua API
    - BUG/CRITICAL: h2: fix incorrect frame length check

2018/04/07 : 1.8.7
    - BUG/MAJOR: cache: always initialize newly created objects
    - MINOR: servers: Support alphanumeric characters for the server templates names

2018/04/05 : 1.8.6
    - BUG/MINOR: lua: the function returns anything
    - BUG/MINOR: lua funtion hlua_socket_settimeout don't check negative values
    - BUILD/MINOR: fix build when USE_THREAD is not defined
    - MINOR: cli/threads: make "show fd" report thread_sync_io_handler instead of "unknown"
    - MINOR: cli: make "show fd" report the mux and mux_ctx pointers when available
    - BUILD/MINOR: cli: fix a build warning introduced by last commit
    - BUG/MINOR: hpack: fix harmless use of uninitialized value in hpack_dht_insert
    - CLEANUP: h2: rename misleading h2c_stream_close() to h2s_close()
    - MINOR: h2: provide and use h2s_detach() and h2s_free()
    - BUG/MAJOR: h2: remove orphaned streams from the send list before closing
    - MINOR: h2: always call h2s_detach() in h2_detach()
    - MINOR: h2: fuse h2s_detach() and h2s_free() into h2s_destroy()
    - BUG/MEDIUM: h2/threads: never release the task outside of the task handler
    - BUG/MEDIUM: h2: don't consider pending data on detach if connection is in error
    - BUILD/MINOR: threads: always export thread_sync_io_handler()
    - BUG/MEDIUM: h2: always add a stream to the send or fctl list when blocked
    - BUG/MINOR: checks: check the conn_stream's readiness and not the connection
    - BUG/MINOR: email-alert: Set the mailer port during alert initialization
    - BUG/MINOR: cache: fix "show cache" output
    - BUG/MINOR: fd: Don't clear the update_mask in fd_insert.
    - BUG/MAJOR: cache: fix random crashes caused by incorrect delete() on non-first blocks
    - BUG/MINOR: spoe: Initialize variables used during conf parsing before any check
    - BUG/MINOR: spoe: Don't release the context buffer in .check_timeouts callbaclk

2018/03/23 : 1.8.5
    - BUG/MINOR: threads: fix missing thread lock labels for 1.8
    - BUG/MEDIUM: ssl: Don't always treat SSL_ERROR_SYSCALL as unrecovarable.
    - BUG/MEDIUM: ssl: Shutdown the connection for reading on SSL_ERROR_SYSCALL
    - BUG/MINOR: init: Add missing brackets in the code parsing -sf/-st
    - BUG/MINOR: ssl/threads: Make management of the TLS ticket keys files thread-safe
    - BUG/MEDIUM: http: Switch the HTTP response in tunnel mode as earlier as possible
    - BUG/MEDIUM: ssl/sample: ssl_bc_* fetch keywords are broken.
    - DOC: lua: new prototype for function "register_action()"
    - DOC: cfgparse: Warn on option (tcp|http)log in backend
    - BUG/MINOR: debug/pools: properly handle out-of-memory when building with DEBUG_UAF
    - MINOR: debug/pools: make DEBUG_UAF also detect underflows
    - BUG/MINOR: h2: Set the target of dbuf_wait to h2c
    - MINOR: stats: display the number of threads in the statistics.
    - BUG/MEDIUM: h2: always consume any trailing data after end of output buffers
    - BUG/MEDIUM: buffer: Fix the wrapping case in bo_putblk
    - BUG/MEDIUM: buffer: Fix the wrapping case in bi_putblk
    - Revert "BUG/MINOR: send-proxy-v2: string size must include ('\0')"
    - MINOR: systemd: Add section for SystemD sandboxing to unit file
    - MINOR: systemd: Add SystemD's Protect*= options to the unit file
    - MINOR: systemd: Add SystemD's SystemCallFilter option to the unit file
    - MINOR/BUILD: fix Lua build on Mac OS X
    - BUILD/MINOR: fix Lua build on Mac OS X (again)
    - BUG/MINOR: session: Fix tcp-request session failure if handshake.
    - CLEANUP: .gitignore: Ignore binaries from the contrib directory
    - BUG/MINOR: unix: Don't mess up when removing the socket from the xfer_sock_list.
    - BUG/MEDIUM: h2: also arm the h2 timeout when sending
    - BUG/MINOR: cli: Fix a crash when passing a negative or too large value to "show fd"
    - CLEANUP: ssl: Remove a duplicated #include
    - CLEANUP: cli: Remove a leftover debug message
    - BUG/MINOR: cli: Fix a typo in the 'set rate-limit' usage
    - BUG/MEDIUM: fix a 100% cpu usage with cpu-map and nbthread/nbproc
    - BUG/MINOR: force-persist and ignore-persist only apply to backends
    - BUG/MEDIUM: spoe: Remove idle applets from idle list when HAProxy is stopping
    - BUG/MEDIUM: threads/unix: Fix a deadlock when a listener is temporarily disabled
    - BUG/MAJOR: threads/queue: Fix thread-safety issues on the queues management
    - BUG/MINOR: dns: don't downgrade DNS accepted payload size automatically
    - BUG/MINOR: seemless reload: Fix crash when an interface is specified.
    - BUG/MINOR: cli: Fix a crash when sending a command with too many arguments
    - BUILD: ssl: Fix build with OpenSSL without NPN capability
    - BUG/MINOR: spoa-example: unexpected behavior for more than 127 args
    - BUG/MINOR: lua: return bad error messages
    - BUG/MEDIUM: tcp-check: single connect rule can't detect DOWN servers
    - BUG/MINOR: tcp-check: use the server's service port as a fallback
    - BUG/MEDIUM: threads/queue: wake up other threads upon dequeue
    - MINOR: log: stop emitting alerts when it's not possible to write on the socket
    - BUILD/BUG: enable -fno-strict-overflow by default
    - DOC: log: more than 2 log servers are allowed
    - DOC: don't suggest using http-server-close
    - BUG/MEDIUM: h2: properly account for DATA padding in flow control
    - BUG/MINOR: h2: ensure we can never send an RST_STREAM in response to an RST_STREAM
    - BUG/MINOR: listener: Don't decrease actconn twice when a new session is rejected

[1] https://www.haproxy.org/download/1.8/src/CHANGELOG
---
 pkgs/tools/networking/haproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 598557380e28..d327c109dc2c 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -9,12 +9,12 @@ assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
-  version = "1.8.4";
+  version = "1.8.9";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
-    sha256 = "19l4i0p92ahm3vaw42gz3rmmidfivk36mvqyhir81h6ywyjb01g3";
+    sha256 = "00miblgwll3mycsgmp3gd3cn4lwsagxzgjxk5i6csnyqgj97fss3";
   };
 
   buildInputs = [ openssl zlib ]

From ea8b37c1c849b9c953f4beadb84cb061d75de40d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 4 Jun 2018 22:10:16 +0200
Subject: [PATCH 3050/3370] haproxy: fix CVE-2018-11469

---
 pkgs/tools/networking/haproxy/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index d327c109dc2c..e01b62b54f1c 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -1,6 +1,6 @@
 { useLua ? !stdenv.isDarwin
 , usePcre ? true
-, stdenv, fetchurl
+, stdenv, fetchurl, fetchpatch
 , openssl, zlib, lua5_3 ? null, pcre ? null
 }:
 
@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
     sha256 = "00miblgwll3mycsgmp3gd3cn4lwsagxzgjxk5i6csnyqgj97fss3";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2018-11469.patch";
+      url = "https://git.haproxy.org/?p=haproxy-1.8.git;a=patch;h=17514045e5d934dede62116216c1b016fe23dd06";
+      sha256 = "0hzcvghg8qz45n3mrcgsjgvrvicvbvm52cc4hs5jbk1yb50qvls7";
+    })
+  ];
+
   buildInputs = [ openssl zlib ]
     ++ stdenv.lib.optional useLua lua5_3
     ++ stdenv.lib.optional usePcre pcre;

From b7e25adbde2e640d361e0c723f40015efc5d2316 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 4 Jun 2018 21:41:45 +0200
Subject: [PATCH 3051/3370] pythonPackages.cx_oracle: use new odpic from
 nixpkgs

---
 ...-dpiOci.c-nixify-libclntsh.so-dlopen.patch | 27 -------------------
 .../python-modules/cx_oracle/default.nix      | 13 ++++-----
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch

diff --git a/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch b/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch
deleted file mode 100644
index a2de7b248531..000000000000
--- a/pkgs/development/python-modules/cx_oracle/0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 355b9d812efdfbd041e14b365258b69c81689981 Mon Sep 17 00:00:00 2001
-From: Florian Klink <flokli@flokli.de>
-Date: Thu, 17 May 2018 18:37:40 +0200
-Subject: [PATCH] odpi/src/dpiOci.c: nixify libclntsh.so dlopen
-
----
- odpi/src/dpiOci.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/odpi/src/dpiOci.c b/odpi/src/dpiOci.c
-index 76b9867..22c2987 100644
---- a/odpi/src/dpiOci.c
-+++ b/odpi/src/dpiOci.c
-@@ -1575,6 +1575,10 @@ static int dpiOci__loadLib(dpiError *error)
-             }
-         }
-     }
-+    if(!dpiOciLibHandle) {
-+        dpiOciLibHandle = dlopen("@libclntsh@", RTLD_LAZY);
-+    }
-+
- #endif
- 
-     if (!dpiOciLibHandle) {
--- 
-2.16.3
-
diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix
index 717faf1128f0..7c0fa32eb99f 100644
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -1,22 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, oracle-instantclient }:
+{ stdenv, buildPythonPackage, fetchPypi, odpic }:
 
 buildPythonPackage rec {
   pname = "cx_Oracle";
   version = "6.3.1";
 
-  buildInputs = [
-    oracle-instantclient
-  ];
+  buildInputs = [ odpic ];
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0200j6jh80rpgzxmvgcxmkshaj4zadq32g2i97nlwiq3f7q374l7";
   };
 
-  patches = [ ./0001-odpi-src-dpiOci.c-nixify-libclntsh.so-dlopen.patch ];
-
-  postPatch = ''
-    substituteInPlace odpi/src/dpiOci.c --replace @libclntsh@ "${oracle-instantclient}/lib/libclntsh.so";
+  preConfigure = ''
+    export ODPIC_INC_DIR="${odpic}/include"
+    export ODPIC_LIB_DIR="${odpic}/lib"
   '';
 
   # Check need an Oracle database to run

From fca22a60789a80edc4bedefc5727d753e14aedd3 Mon Sep 17 00:00:00 2001
From: Maciej Kazulak <kazulakm@gmail.com>
Date: Mon, 4 Jun 2018 23:33:06 +0200
Subject: [PATCH 3052/3370] odpic: fix typo in metadata

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

diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index dc7faee93725..229553b95e9e 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Oracle ODPI-C library";
     homepage = "https://oracle.github.io/odpi/";
     maintainers = with maintainers; [ mkazulak ];
-    licence = licenses.asl20;
+    license = licenses.asl20;
     platforms = [ "x86_64-linux" ];
     hydraPlatforms = [];
   };

From 7e6d315a89f20d73a2cf151f248e34b3b8adcc5b Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Tue, 29 May 2018 18:08:50 -0700
Subject: [PATCH 3053/3370] PowerShell: init at 6.0.2

---
 pkgs/shells/powershell/default.nix | 48 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/shells/powershell/default.nix

diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix
new file mode 100644
index 000000000000..937494916112
--- /dev/null
+++ b/pkgs/shells/powershell/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchgit, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl, cacert,
+  makeWrapper, less, openssl }:
+
+let platformString = if stdenv.isDarwin then "osx"
+                     else if stdenv.isLinux then "linux"
+                     else throw "unsupported platform";
+    platformSha = if stdenv.isDarwin then "1ga4p8xmrxa54v2s6i0q1q7lx2idcmp1jwm0g4jxr54fyn5ay3lf"
+                     else if stdenv.isLinux then "000mmv5iblnmwydfdvg5izli3vpb6l14xy4qy3smcikpf0h87fhl"
+                     else throw "unsupported platform";
+    platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH"
+                     else if stdenv.isLinux then "LD_LIBRARY_PATH"
+                     else throw "unsupported platform";
+in
+stdenv.mkDerivation rec {
+  name = "powershell-${version}";
+  version = "6.0.2";
+
+  src = fetchzip {
+    url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz";
+    sha256 = platformSha;
+    stripRoot = false;
+  };
+
+  buildInputs = [ autoPatchelfHook makeWrapper ];
+  propagatedBuildInputs = [ libunwind libuuid icu curl cacert less openssl ];
+
+  # TODO: remove PAGER after upgrading to v6.1.0-preview.1 or later as it has been addressed in
+  # https://github.com/PowerShell/PowerShell/pull/6144
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/powershell
+    cp -r * $out/share/powershell
+    rm $out/share/powershell/DELETE_ME_TO_DISABLE_CONSOLEHOST_TELEMETRY
+    makeWrapper $out/share/powershell/pwsh $out/bin/pwsh --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath [ libunwind libuuid icu openssl curl ]}" \
+                                           --set PAGER ${less}/bin/less --set TERM xterm
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework";
+    homepage = https://github.com/PowerShell/PowerShell;
+    maintainers = [ maintainers.yrashk ];
+    platforms = platforms.unix;
+    license = with licenses; [ mit ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4dcd0314066..44bc4807e3df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21461,4 +21461,6 @@ with pkgs;
 
   yrd = callPackage ../tools/networking/yrd { };
 
+  powershell = callPackage ../shells/powershell { };
+
 }

From 5574df35497a228a437873e48655edbca1bdcdcc Mon Sep 17 00:00:00 2001
From: Tim Steinbach <NeQuissimus@users.noreply.github.com>
Date: Mon, 4 Jun 2018 18:25:23 -0400
Subject: [PATCH 3054/3370] nix: point at curl 7.59.0 (#41452)

---
 pkgs/tools/networking/curl/7_59.nix | 113 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  10 +++
 2 files changed, 123 insertions(+)
 create mode 100644 pkgs/tools/networking/curl/7_59.nix

diff --git a/pkgs/tools/networking/curl/7_59.nix b/pkgs/tools/networking/curl/7_59.nix
new file mode 100644
index 000000000000..5980392267b0
--- /dev/null
+++ b/pkgs/tools/networking/curl/7_59.nix
@@ -0,0 +1,113 @@
+{ stdenv, lib, fetchurl, pkgconfig, perl
+, http2Support ? true, nghttp2
+, idnSupport ? false, libidn ? null
+, ldapSupport ? false, openldap ? null
+, zlibSupport ? false, zlib ? null
+, sslSupport ? false, openssl ? null
+, gnutlsSupport ? false, gnutls ? null
+, scpSupport ? false, libssh2 ? null
+, gssSupport ? false, kerberos ? null
+, c-aresSupport ? false, c-ares ? null
+, brotliSupport ? false, brotli ? null
+}:
+
+assert http2Support -> nghttp2 != null;
+assert idnSupport -> libidn != null;
+assert ldapSupport -> openldap != null;
+assert zlibSupport -> zlib != null;
+assert sslSupport -> openssl != null;
+assert !(gnutlsSupport && sslSupport);
+assert gnutlsSupport -> gnutls != null;
+assert scpSupport -> libssh2 != null;
+assert c-aresSupport -> c-ares != null;
+assert brotliSupport -> brotli != null;
+assert gssSupport -> kerberos != null;
+
+stdenv.mkDerivation rec {
+  name = "curl-7.59.0";
+
+  src = fetchurl {
+    urls = [
+      "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
+      "https://curl.haxx.se/download/${name}.tar.bz2"
+    ];
+    sha256 = "185mazhi4bc5mc6rvhrmnc67j8l3sg7f0w2hp5gmi5ccdbyhz4mm";
+  };
+
+  outputs = [ "bin" "dev" "out" "man" "devdoc" ];
+  separateDebugInfo = stdenv.isLinux;
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ pkgconfig perl ];
+
+  # Zlib and OpenSSL must be propagated because `libcurl.la' contains
+  # "-lz -lssl", which aren't necessary direct build inputs of
+  # applications that use Curl.
+  propagatedBuildInputs = with stdenv.lib;
+    optional http2Support nghttp2 ++
+    optional idnSupport libidn ++
+    optional ldapSupport openldap ++
+    optional zlibSupport zlib ++
+    optional gssSupport kerberos ++
+    optional c-aresSupport c-ares ++
+    optional sslSupport openssl ++
+    optional gnutlsSupport gnutls ++
+    optional scpSupport libssh2 ++
+    optional brotliSupport brotli;
+
+  # for the second line see https://curl.haxx.se/mail/tracker-2014-03/0087.html
+  preConfigure = ''
+    sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
+    rm src/tool_hugehelp.c
+  '';
+
+  configureFlags = [
+      "--with-ca-fallback"
+      "--disable-manual"
+      ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" )
+      ( if gnutlsSupport then "--with-gnutls=${gnutls.dev}" else "--without-gnutls" )
+      ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" )
+      ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )
+      ( if ldapSupport then "--enable-ldaps" else "--disable-ldaps" )
+      ( if idnSupport then "--with-libidn=${libidn.dev}" else "--without-libidn" )
+      ( if brotliSupport then "--with-brotli" else "--without-brotli" )
+    ]
+    ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}"
+    ++ stdenv.lib.optional gssSupport "--with-gssapi=${kerberos.dev}";
+
+  CXX = "${stdenv.cc.targetPrefix}c++";
+  CXXCPP = "${stdenv.cc.targetPrefix}c++ -E";
+
+  doCheck = false; # expensive, fails
+
+  postInstall = ''
+    moveToOutput bin/curl-config "$dev"
+    sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
+  '' + stdenv.lib.optionalString gnutlsSupport ''
+    ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so
+    ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4
+    ln $out/lib/libcurl.so $out/lib/libcurl-gnutls.so.4.4.0
+  '';
+
+  crossAttrs = {
+    # We should refer to the cross built openssl
+    # For the 'urandom', maybe it should be a cross-system option
+    configureFlags = [
+        ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" )
+        ( if gnutlsSupport then "--with-gnutls=${gnutls.crossDrv}" else "--without-gnutls" )
+        "--with-random /dev/urandom"
+      ];
+  };
+
+  passthru = {
+    inherit sslSupport openssl;
+  };
+
+  meta = with stdenv.lib; {
+    description = "A command line tool for transferring files with URL syntax";
+    homepage    = https://curl.haxx.se/;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 693b96aac4a2..cdb937efd06f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1891,6 +1891,15 @@ with pkgs;
     brotliSupport = true;
   };
 
+  curl_7_59 = callPackage ../tools/networking/curl/7_59.nix rec {
+    fetchurl = fetchurlBoot;
+    http2Support = true;
+    zlibSupport = true;
+    sslSupport = zlibSupport;
+    scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;
+    gssSupport = true;
+  };
+
   curl = callPackage ../tools/networking/curl rec {
     fetchurl = fetchurlBoot;
     http2Support = true;
@@ -20880,6 +20889,7 @@ with pkgs;
   inherit (callPackages ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";
       stateDir = config.nix.stateDir or "/nix/var";
+      curl = curl_7_59;
       })
     nix
     nix1

From 8414fa2d6bb1249ed77565ff6b9f312fd52917da Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Mon, 4 Jun 2018 22:37:07 +0000
Subject: [PATCH 3055/3370] Revert "vinagre: disable format hardening"

This reverts commit f34b498bd2d998e6d5c1b707076f1f4875b3583e.

It did not fix the build error in https://hydra.nixos.org/build/75464534/nixlog,
but #41449 did.
---
 pkgs/desktops/gnome-3/apps/vinagre/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
index d22ca879e52a..566624431dc6 100644
--- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix
+++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
   '';
 
-  hardeningDisable = [ "format" ];
-
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Vinagre;
     description = "Remote desktop viewer for GNOME";

From 84440379bade6fc7c42b11377e0595e6c3ff7117 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 5 Jun 2018 00:13:47 +0000
Subject: [PATCH 3056/3370] gradle: 4.7 -> 4.8

---
 pkgs/development/tools/build-managers/gradle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index fbbddbd0fcbc..7570c3be0679 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -52,12 +52,12 @@ rec {
   };
 
   gradle_latest = gradleGen rec {
-    name = "gradle-4.7";
+    name = "gradle-4.8";
     nativeVersion = "0.14";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "016vvjvk3gfasv3h6dxxp48kp9v4ariqj280bijn835mr1yhi9gw";
+      sha256 = "1fpihf35nd2wqh3ghkk9x0x2nr1s4vx3dgrfn2q4xagsm299dqpk";
     };
   };
 

From ff37f08aa8807b683fa5dfcf52059286601de334 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 4 Jun 2018 22:08:41 +0200
Subject: [PATCH 3057/3370] rustc: re-enable tests on darwin

- disable doctest for stdsimd
- disable previous and some extra extra tcp tests
---
 pkgs/development/compilers/rust/default.nix   |   2 +-
 .../rust/patches/net-tcp-disable-tests.patch  | 104 ++++++++++++++++++
 .../patches/stdsimd-disable-doctest.patch     |  20 ++++
 pkgs/development/compilers/rust/rustc.nix     |   6 +-
 4 files changed, 126 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
 create mode 100644 pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index 8669af91a9a9..f3fe7b07b9a7 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -16,7 +16,7 @@ in rec {
   rustc = callPackage ./rustc.nix {
     inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src;
 
-    patches = [];
+    patches = [ ./patches/net-tcp-disable-tests.patch ./patches/stdsimd-disable-doctest.patch ];
 
     forceBundledLLVM = true;
 
diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
new file mode 100644
index 000000000000..70a91ceb9d97
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
@@ -0,0 +1,104 @@
+diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs
+index 0f60b5b3e..9b08415e7 100644
+--- a/src/libstd/net/tcp.rs
++++ b/src/libstd/net/tcp.rs
+@@ -962,6 +962,7 @@ mod tests {
+         }
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn listen_localhost() {
+         let socket_addr = next_test_ip4();
+@@ -1020,6 +1021,7 @@ mod tests {
+         })
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn read_eof() {
+         each_ip(&mut |addr| {
+@@ -1039,6 +1041,7 @@ mod tests {
+         })
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn write_close() {
+         each_ip(&mut |addr| {
+@@ -1065,6 +1068,7 @@ mod tests {
+         })
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn multiple_connect_serial() {
+         each_ip(&mut |addr| {
+@@ -1087,6 +1091,7 @@ mod tests {
+         })
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn multiple_connect_interleaved_greedy_schedule() {
+         const MAX: usize = 10;
+@@ -1123,6 +1128,7 @@ mod tests {
+     }
+ 
+     #[test]
++    #[cfg_attr(target_os = "macos", ignore)]
+     fn multiple_connect_interleaved_lazy_schedule() {
+         const MAX: usize = 10;
+         each_ip(&mut |addr| {
+@@ -1401,6 +1407,7 @@ mod tests {
+     }
+ 
+     #[test]
++    #[cfg_attr(target_os = "macos", ignore)]
+     fn clone_while_reading() {
+         each_ip(&mut |addr| {
+             let accept = t!(TcpListener::bind(&addr));
+@@ -1421,7 +1422,10 @@ mod tests {
+ 
+     // FIXME: re-enabled bitrig/openbsd tests once their socket timeout code
+     //        no longer has rounding errors.
+-    #[cfg_attr(any(target_os = "bitrig", target_os = "netbsd", target_os = "openbsd"), ignore)]
++    #[cfg_attr(any(target_os = "bitrig",
++                   target_os = "netbsd",
++                   target_os = "openbsd",
++                   target_os = "macos"), ignore)]
+     #[test]
+     fn timeouts() {
+         let addr = next_test_ip4();
+@@ -1596,6 +1603,7 @@ mod tests {
+         drop(listener);
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn nodelay() {
+         let addr = next_test_ip4();
+@@ -1610,6 +1618,7 @@ mod tests {
+         assert_eq!(false, t!(stream.nodelay()));
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn ttl() {
+         let ttl = 100;
+@@ -1647,6 +1656,7 @@ mod tests {
+         }
+     }
+ 
++    #[cfg_attr(target_os = "macos", ignore)]
+     #[test]
+     fn peek() {
+         each_ip(&mut |addr| {
+@@ -1679,6 +1689,7 @@ mod tests {
+     }
+ 
+     #[test]
++    #[cfg_attr(target_os = "linux", target_os = "macos", ignore)]
+     fn connect_timeout_unroutable() {
+         // this IP is unroutable, so connections should always time out,
+         // provided the network is reachable to begin with.
diff --git a/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch b/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
new file mode 100644
index 000000000000..6ef7fd0f7ce4
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/stdsimd-disable-doctest.patch
@@ -0,0 +1,20 @@
+diff --git a/src/stdsimd/coresimd/x86/mod.rs b/src/stdsimd/coresimd/x86/mod.rs
+index 32915c332..7cb54f31e 100644
+--- a/src/stdsimd/coresimd/x86/mod.rs
++++ b/src/stdsimd/coresimd/x86/mod.rs
+@@ -279,7 +279,6 @@ types! {
+     ///
+     /// # Examples
+     ///
+-    /// ```
+     /// # #![feature(cfg_target_feature, target_feature, stdsimd)]
+     /// # #![cfg_attr(not(dox), no_std)]
+     /// # #[cfg(not(dox))]
+@@ -301,7 +300,6 @@ types! {
+     /// # }
+     /// # if is_x86_feature_detected!("sse") { unsafe { foo() } }
+     /// # }
+-    /// ```
+     pub struct __m256(f32, f32, f32, f32, f32, f32, f32, f32);
+ 
+     /// 256-bit wide set of four `f64` types, x86-specific
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index 72d0ee70782a..d3dcc8e2f6c9 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -10,11 +10,7 @@
 , targets
 , targetPatches
 , targetToolchains
-
-# Tests frequently break on Darwin
-# See the rust issue: https://github.com/rust-lang/rust/issues/51006
-, doCheck ? (!stdenv.isDarwin)
-
+, doCheck ? true
 , broken ? false
 , buildPlatform, hostPlatform
 } @ args:

From dda215332f1310fbca6b6b59968d0b46bf29bda8 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 31 May 2018 21:10:41 +0200
Subject: [PATCH 3058/3370] python36Packages.voluptuous-serialize: init at
 1.0.0

---
 .../voluptuous-serialize/default.nix          | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/voluptuous-serialize/default.nix

diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix
new file mode 100644
index 000000000000..e2796ee2a74e
--- /dev/null
+++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, voluptuous, pytest }:
+
+buildPythonPackage rec  {
+  pname = "voluptuous-serialize";
+  version = "2018-03-10";
+
+  disabled = !isPy3k;
+
+  # no tests in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "balloob";
+    repo = pname;
+    rev = "567f0d96f928cf6c30c9f1b8bdee729e651aac82";
+    sha256 = "0b16f1bxlqyvi1hy8wmzp2k0rzqcycmdhs8zwsyx0swnvkgwnv50";
+  };
+
+  propagatedBuildInputs = [
+    voluptuous
+  ];
+
+  checkInputs = [
+    pytest
+  ];
+
+  checkPhase = ''
+    py.test
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/balloob/voluptuous-serialize;
+    license = licenses.asl20;
+    description = "Convert Voluptuous schemas to dictionaries so they can be serialized";
+    maintainers = with maintainers; [ etu ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0a230853087c..4ec4d12f106b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18129,6 +18129,8 @@ EOF
 
   voluptuous = callPackage ../development/python-modules/voluptuous { };
 
+  voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { };
+
   pysigset = callPackage ../development/python-modules/pysigset { };
 
   us = callPackage ../development/python-modules/us { };

From b69d12c5a97f570d5fcccafa4380f13e244edcd5 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 31 May 2018 21:43:58 +0200
Subject: [PATCH 3059/3370] home-assistant: Add dependency used for hue modules

---
 pkgs/servers/home-assistant/component-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 4d970a7e0d5d..abe57c2d57f9 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -402,7 +402,7 @@
     "http.real_ip" = ps: with ps; [  ];
     "http.static" = ps: with ps; [  ];
     "http.view" = ps: with ps; [  ];
-    "hue" = ps: with ps; [ aiohue ];
+    "hue" = ps: with ps; [ aiohue voluptuous-serialize ];
     "hue.bridge" = ps: with ps; [  ];
     "hue.config_flow" = ps: with ps; [  ];
     "hue.const" = ps: with ps; [  ];
@@ -459,7 +459,7 @@
     "light.hive" = ps: with ps; [  ];
     "light.homekit_controller" = ps: with ps; [  ];
     "light.homematic" = ps: with ps; [ pyhomematic ];
-    "light.hue" = ps: with ps; [ aiohue ];
+    "light.hue" = ps: with ps; [ aiohue voluptuous-serialize ];
     "light.hyperion" = ps: with ps; [  ];
     "light.iglo" = ps: with ps; [  ];
     "light.ihc" = ps: with ps; [  ];

From eca586e0e83a624b31c6b3ce91cf591453380952 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 May 2018 02:30:35 +0200
Subject: [PATCH 3060/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-21-g9312993 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/fd2c3d3b576b746cfeacd2ab2e6b38b4039df2f6.
---
 .../haskell-modules/hackage-packages.nix      | 1961 ++++++++++++++---
 1 file changed, 1656 insertions(+), 305 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 928829c8701c..3345cade70b5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -759,6 +759,50 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ abbradar ];
      }) {inherit (pkgs) emacs;};
 
+  "Agda_2_5_4" = callPackage
+    ({ mkDerivation, alex, array, async, base, binary, blaze-html
+     , boxes, bytestring, Cabal, containers, cpphs, data-hash, deepseq
+     , directory, EdisonCore, edit-distance, emacs, equivalence
+     , filepath, geniplate-mirror, gitrev, happy, hashable, hashtables
+     , haskeline, ieee754, mtl, murmur-hash, pretty, process, regex-tdfa
+     , stm, strict, template-haskell, text, time, transformers
+     , unordered-containers, uri-encode, zlib
+     }:
+     mkDerivation {
+       pname = "Agda";
+       version = "2.5.4";
+       sha256 = "02cyq1wpnllzcwdb45gk3hq7hha2090ay6m16qg7fq9467ip22dl";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal filepath process ];
+       libraryHaskellDepends = [
+         array async base binary blaze-html boxes bytestring containers
+         data-hash deepseq directory EdisonCore edit-distance equivalence
+         filepath geniplate-mirror gitrev hashable hashtables haskeline
+         ieee754 mtl murmur-hash pretty process regex-tdfa stm strict
+         template-haskell text time transformers unordered-containers
+         uri-encode zlib
+       ];
+       libraryToolDepends = [ alex cpphs happy ];
+       executableHaskellDepends = [ base directory filepath process ];
+       executableToolDepends = [ emacs ];
+       postInstall = ''
+         files=("$data/share/ghc-"*"/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda})
+         for f in "''${files[@]}" ; do
+           $out/bin/agda $f
+         done
+         for f in "''${files[@]}" ; do
+           $out/bin/agda -c --no-main $f
+         done
+         $out/bin/agda-mode compile
+       '';
+       description = "A dependently typed functional programming language and proof assistant";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ abbradar ];
+     }) {inherit (pkgs) emacs;};
+
   "Agda-executable" = callPackage
     ({ mkDerivation, Agda, base }:
      mkDerivation {
@@ -9815,6 +9859,21 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {inherit (pkgs) openssl;};
 
+  "HsOpenSSL_0_11_4_14" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
+     mkDerivation {
+       pname = "HsOpenSSL";
+       version = "0.11.4.14";
+       sha256 = "12blnh5x69wvhw1lx3vk14lm1klhqblgd539ffqnrg2dn9qh4ga4";
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [ base bytestring network time ];
+       librarySystemDepends = [ openssl ];
+       testHaskellDepends = [ base bytestring ];
+       description = "Partial OpenSSL binding for Haskell";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) openssl;};
+
   "HsOpenSSL-x509-system" = callPackage
     ({ mkDerivation, base, bytestring, HsOpenSSL, unix }:
      mkDerivation {
@@ -9889,6 +9948,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HsYAML" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, mtl, parsec
+     , text
+     }:
+     mkDerivation {
+       pname = "HsYAML";
+       version = "0.1.0.0";
+       sha256 = "1vl2fsbs0grgjwcghzqsiijnl7qlv2fgfw2nk9sbcfp81y0bxy3c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers dlist mtl parsec text
+       ];
+       description = "Pure Haskell YAML 1.2 parser";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Hsed" = callPackage
     ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor
      , data-accessor-template, data-accessor-transformers, directory
@@ -11400,6 +11476,8 @@ self: {
        pname = "List";
        version = "0.6.2";
        sha256 = "0y5qk6pzpcha01pa9133qgmmk9nkgjqxaxlg04993i9g43hjpff4";
+       revision = "1";
+       editedCabalFile = "11ws93cdzz7k4nvcld2d74155mdgcvyi6f6an7gpf9z4k523c11n";
        libraryHaskellDepends = [ base transformers ];
        description = "List monad transformer and class";
        license = stdenv.lib.licenses.bsd3;
@@ -14259,8 +14337,8 @@ self: {
      }:
      mkDerivation {
        pname = "Persistence";
-       version = "1.1";
-       sha256 = "1jyq159w7lpdgk0i6biqifdqf93jqla790lyix3qx7717r98kkav";
+       version = "1.1.2";
+       sha256 = "1p9nsq0rx1fh8v3cm809z8xs4877hgvgxygqxi3iq0k7gikninx4";
        libraryHaskellDepends = [
          base containers maximal-cliques parallel vector
        ];
@@ -16275,27 +16353,27 @@ self: {
      }) {};
 
   "ShellCheck" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, json, mtl
-     , parsec, process, QuickCheck, regex-tdfa
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , directory, mtl, parsec, process, QuickCheck, regex-tdfa
      }:
      mkDerivation {
        pname = "ShellCheck";
-       version = "0.4.7";
-       sha256 = "0z0dlx4s0j5v627cvns5qdq1r6kcka5nif8g62hdria29lk5aj8q";
-       revision = "1";
-       editedCabalFile = "0fbrysx6wb9kmlzbfyjcb7107rnf0rjldlszaqnpib33vwd7l1hx";
+       version = "0.5.0";
+       sha256 = "0z1hscbr11hwkq8k1v0vaa947hb9m6k4cm831jk1gpj8dxrk151b";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [
-         base containers directory json mtl parsec process QuickCheck
-         regex-tdfa
+         aeson base bytestring containers directory mtl parsec process
+         QuickCheck regex-tdfa
        ];
        executableHaskellDepends = [
-         base containers directory json mtl parsec QuickCheck regex-tdfa
+         aeson base bytestring containers directory mtl parsec QuickCheck
+         regex-tdfa
        ];
        testHaskellDepends = [
-         base containers directory json mtl parsec QuickCheck regex-tdfa
+         aeson base bytestring containers directory mtl parsec QuickCheck
+         regex-tdfa
        ];
        description = "Shell script analysis tool";
        license = stdenv.lib.licenses.gpl3;
@@ -18369,8 +18447,8 @@ self: {
      }:
      mkDerivation {
        pname = "Villefort";
-       version = "0.1.2.10";
-       sha256 = "0c7i5y5h2q55nj4wv692zd8hsai998dws3mdqgj5h1065v48r6im";
+       version = "0.1.2.11";
+       sha256 = "0ggcp3sgqv1m5xs8q87c2n6rms7mypbf3j9f5702qllzyns2r79l";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -18384,7 +18462,7 @@ self: {
        testHaskellDepends = [
          base HDBC HDBC-sqlite3 hspec mtl QuickCheck webdriver
        ];
-       description = "Villefort is a task manager and time tracker written in haskell";
+       description = "Villefort is a task manager and time tracker";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -26687,6 +26765,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "animate-frames" = callPackage
+    ({ mkDerivation, aeson, animate, async, base, bytestring
+     , containers, JuicyPixels, pureMD5, safe, stm, tasty, tasty-hspec
+     , text, vector, yaml
+     }:
+     mkDerivation {
+       pname = "animate-frames";
+       version = "0.0.1";
+       sha256 = "1yjr3w064nm5qi87m4w8xvjpjqry4b6chs5igshwzijrb530chk9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson animate async base bytestring containers JuicyPixels pureMD5
+         safe stm text vector yaml
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       description = "Convert sprite frames to animate files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "animate-preview" = callPackage
     ({ mkDerivation, aeson, animate, base, bytestring, containers
      , filepath, fsnotify, key-state, lens, linear, mtl
@@ -27145,6 +27244,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
+  "apart" = callPackage
+    ({ mkDerivation, base, comonad, contravariant, free, hedgehog, lens
+     , semigroupoids
+     }:
+     mkDerivation {
+       pname = "apart";
+       version = "0.1.0";
+       sha256 = "05jpxq68pm1hs05nxz6wd787jmdxf59kd13nmsa89p5qcdh7znqw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base comonad contravariant free hedgehog lens semigroupoids
+       ];
+       executableHaskellDepends = [
+         base comonad contravariant free hedgehog lens semigroupoids
+       ];
+       testHaskellDepends = [
+         base comonad contravariant free hedgehog lens semigroupoids
+       ];
+       description = "Get all your structure and rip it apart";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "apecs" = callPackage
     ({ mkDerivation, async, base, containers, criterion, linear, mtl
      , QuickCheck, template-haskell, vector
@@ -28759,8 +28881,8 @@ self: {
      }:
      mkDerivation {
        pname = "arx";
-       version = "0.2.3";
-       sha256 = "1dlxc36sfsk0mc196v9z0kzgbz9qg2ln8ds8d2lmvi8zqyl9v0ha";
+       version = "0.3.1";
+       sha256 = "1wfxazj1qavk366vi9b65iyf5r16bp3xdzdas08ipaba3f91mx37";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30022,8 +30144,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-storable";
-       version = "0.3.0.3";
-       sha256 = "1a9id432vhvr3n69m1f7iyc899nc2wa4w8jpa7s7aqkixw2vqlr2";
+       version = "0.3.0.4";
+       sha256 = "0yjbhlxnrprdvf0k93j0w4dpbr55pdcxcs1jhw4b7ngd64a6nvw5";
        libraryHaskellDepends = [
          base bytestring composition-prelude text
        ];
@@ -31726,6 +31848,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "axiom_0_4_7" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory
+     , ghcjs-perch, mtl, transformers, transient, transient-universe
+     }:
+     mkDerivation {
+       pname = "axiom";
+       version = "0.4.7";
+       sha256 = "14vdmkyfqn2i5ibc9d6nfhi5hqbk1552x8paq2x0yvsng4kj228x";
+       libraryHaskellDepends = [
+         base bytestring containers directory ghcjs-perch mtl transformers
+         transient transient-universe
+       ];
+       description = "Web EDSL for running in browsers and server nodes using transient";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "axiomatic-classes" = callPackage
     ({ mkDerivation, base, containers, control-invariants, lens
      , monad-loops, mtl, portable-template-haskell-lens, QuickCheck
@@ -31906,6 +32045,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "b9_0_5_49" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors
+     , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile
+     , directory, filepath, free, hashable, hspec, hspec-expectations
+     , lens, mtl, optparse-applicative, parallel, parsec, pretty
+     , pretty-show, process, QuickCheck, random, shake, syb, template
+     , text, time, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.49";
+       sha256 = "0n9vci1wc2ws4nyzmmqi2npwkd3zz28znyqj4905y1hc126x0yi3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bifunctors binary boxes
+         bytestring conduit conduit-extra ConfigFile directory filepath free
+         hashable lens mtl parallel parsec pretty pretty-show process
+         QuickCheck random shake syb template text time transformers
+         unordered-containers vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory lens optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck text
+         unordered-containers vector yaml
+       ];
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "babl" = callPackage
     ({ mkDerivation, babl, base }:
      mkDerivation {
@@ -32806,29 +32978,32 @@ self: {
 
   "baserock-schema" = callPackage
     ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors
-     , hspec, mtl, QuickCheck, text, transformers, turtle, yaml
+     , gitlab-api, hspec, lens, mtl, QuickCheck, text, transformers
+     , turtle, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "baserock-schema";
-       version = "0.0.1.3";
-       sha256 = "1p6q6g61cbmsl7ppfqcs5jn0z17aya4sqp7gdi4y01msgd81cvcc";
+       version = "0.0.1.5";
+       sha256 = "0dc9wsdxgp0jx7mnq0c1dx48y6khjr9zjg3wjlifyx3k3k7yn2i5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         algebraic-graphs base bytestring errors mtl text transformers
-         turtle yaml
+         algebraic-graphs base bytestring errors lens mtl text transformers
+         turtle unordered-containers yaml
        ];
        executableHaskellDepends = [
-         algebraic-graphs base bytestring docopt errors mtl text
-         transformers turtle yaml
+         algebraic-graphs base bytestring docopt errors gitlab-api lens mtl
+         text transformers turtle unordered-containers yaml
        ];
        testHaskellDepends = [
-         algebraic-graphs base bytestring errors hspec mtl QuickCheck text
-         transformers turtle yaml
+         algebraic-graphs base bytestring errors hspec lens mtl QuickCheck
+         text transformers turtle unordered-containers yaml
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {gitlab-api = null;};
 
   "basex-client" = callPackage
     ({ mkDerivation, base, network, pureMD5, utf8-string }:
@@ -34331,23 +34506,28 @@ self: {
      }) {};
 
   "binary-ext" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
-     , directory, filepath, HUnit, QuickCheck, random, test-framework
-     , test-framework-quickcheck2
+    ({ mkDerivation, attoparsec, base, binary, bytestring, conduit
+     , conduit-combinators, data-binary-ieee754, errors, exceptions
+     , HUnit, monad-control, monad-loops, mono-traversable, mtl
+     , scientific, text, transformers, transformers-base
      }:
      mkDerivation {
        pname = "binary-ext";
-       version = "1.0.8.5.1";
-       sha256 = "166c0wvmjpgpsm5s93clkp0ba50xyxinma4bkjxwqz3x1iv0gvzb";
+       version = "2.0.4";
+       sha256 = "026y58an12p6cmpxhs3qrwl6w4q3i6i47svcj5qz5mi6vsdy2n3f";
        libraryHaskellDepends = [
-         array base binary bytestring containers
+         attoparsec base binary bytestring conduit conduit-combinators
+         data-binary-ieee754 errors exceptions monad-control monad-loops
+         mono-traversable mtl scientific text transformers transformers-base
        ];
        testHaskellDepends = [
-         array base binary bytestring Cabal containers directory filepath
-         HUnit QuickCheck random test-framework test-framework-quickcheck2
+         attoparsec base binary bytestring conduit conduit-combinators
+         data-binary-ieee754 errors exceptions HUnit monad-control
+         monad-loops mono-traversable mtl scientific text transformers
+         transformers-base
        ];
-       description = "An alternate with typed errors for Data.Binary.Get monad from 'binary' library.";
-       license = stdenv.lib.licenses.bsd3;
+       description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package.";
+       license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -35780,8 +35960,8 @@ self: {
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.5.0";
-       sha256 = "1nb549w2rzc9psdnz8xbma0qgm2hj4svrlm3x8vc2i1dklmljmvr";
+       version = "0.5.1";
+       sha256 = "1lpcbzapinfbd7s4hz2yj3nwp1hm4fy514hqnqil4ijndyknlk3n";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring bytestring-lexing
@@ -36980,8 +37160,8 @@ self: {
      }:
      mkDerivation {
        pname = "blaze-colonnade";
-       version = "1.2.1";
-       sha256 = "0bsax9fw3bmj32a0dsrmp7zrpfp2pgilq3nss6qfa1zh1kdyj1xy";
+       version = "1.2.2";
+       sha256 = "0k51iqfr2dvc445q6jzvf4mb3q3x4z0vvf9p8fhd4npazwb72bqz";
        libraryHaskellDepends = [
          base blaze-html blaze-markup colonnade text
        ];
@@ -37715,6 +37895,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "boltzmann-brain" = callPackage
+    ({ mkDerivation, array, base, containers, haskell-src-exts, hmatrix
+     , megaparsec, mtl, multiset, process
+     }:
+     mkDerivation {
+       pname = "boltzmann-brain";
+       version = "1.3.1.3";
+       sha256 = "1qv0s70bvn0zgmyb2bccw64d377pb6m0xjzqq7lsz8nzk86wqhzs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers haskell-src-exts hmatrix megaparsec mtl
+         multiset process
+       ];
+       executableHaskellDepends = [ base containers hmatrix ];
+       description = "Boltzmann sampler compiler for combinatorial systems";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "boltzmann-samplers" = callPackage
     ({ mkDerivation, ad, base, containers, hashable, hmatrix, ieee754
      , MonadRandom, mtl, QuickCheck, transformers, unordered-containers
@@ -37734,28 +37933,29 @@ self: {
 
   "bond" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, async, base, bytestring
-     , cmdargs, derive, Diff, directory, filepath, HUnit, monad-loops
-     , mtl, parsec, pretty, process, QuickCheck, scientific, shakespeare
-     , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
+     , cmdargs, derive, Diff, directory, filepath, HUnit, megaparsec
+     , monad-loops, mtl, pretty, process, QuickCheck, scientific
+     , shakespeare, tasty, tasty-golden, tasty-hunit, tasty-quickcheck
+     , text, unordered-containers
      }:
      mkDerivation {
        pname = "bond";
-       version = "0.10.1.0";
-       sha256 = "024qd9dmgqsa3q5xykc0bbvgay9hp9qwl9xixkgjpa5li68rd54c";
+       version = "0.11.0.3";
+       sha256 = "1zarrlhcp8q1impikmqsz8mnaxi8l8b4nl02qp8xm6y6gpbyhaqj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring filepath mtl parsec scientific shakespeare
-         text
+         aeson base bytestring filepath megaparsec mtl scientific
+         shakespeare text unordered-containers
        ];
        executableHaskellDepends = [
-         aeson async base bytestring cmdargs directory filepath monad-loops
-         parsec process text
+         aeson async base bytestring cmdargs directory filepath megaparsec
+         monad-loops process text
        ];
        testHaskellDepends = [
          aeson aeson-pretty base bytestring cmdargs derive Diff directory
-         filepath HUnit monad-loops parsec pretty QuickCheck tasty
-         tasty-golden tasty-hunit tasty-quickcheck text
+         filepath HUnit megaparsec monad-loops pretty QuickCheck shakespeare
+         tasty tasty-golden tasty-hunit tasty-quickcheck text
        ];
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
@@ -38004,8 +38204,8 @@ self: {
      }:
      mkDerivation {
        pname = "boomange";
-       version = "0.1.3.5";
-       sha256 = "017klwzi30qmrvxy19i8swnmgzxfimq9q647kvw001yx9nsf204n";
+       version = "0.1.3.6";
+       sha256 = "0gdhvxjcbyzhxvrgzk70jaihgkxa03ycg4bls03rgnqy773p07f1";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -39253,6 +39453,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "build" = callPackage
+    ({ mkDerivation, algebraic-graphs, base, containers, extra
+     , filepath, mtl, random, transformers
+     }:
+     mkDerivation {
+       pname = "build";
+       version = "0.0.1.1";
+       sha256 = "1p3814if20x9prd7m3q414v9a1c735bxzgblp55lb9bbsaja7zyl";
+       libraryHaskellDepends = [
+         algebraic-graphs base containers extra filepath mtl random
+         transformers
+       ];
+       testHaskellDepends = [ base containers extra mtl transformers ];
+       description = "Build systems a la carte";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "buildable" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, text }:
      mkDerivation {
@@ -41045,6 +41262,25 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "cabal-rpm_0_12_4" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , http-client, http-client-tls, http-conduit, process, time, unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "0.12.4";
+       sha256 = "1wzsbnm57wc38ppqh8fdp8qnqxham5qia96qlgya4b2wh3q6d932";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath http-client
+         http-client-tls http-conduit process time unix
+       ];
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-scripts" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -43368,6 +43604,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ccast" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "ccast";
+       version = "0.1.0.0";
+       sha256 = "1yls8b1kjmdc8gh1i4vaaav1sgvfccyjfqxjpvb7gw27ivma3v7l";
+       libraryHaskellDepends = [ base template-haskell ];
+       description = "typesafe c-style casts; useful for FFI";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cci" = callPackage
     ({ mkDerivation, base, binary, bytestring, cci, cmdargs, containers
      , filepath, mtl, pretty, process, random, time
@@ -45442,6 +45689,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cl3" = callPackage
+    ({ mkDerivation, base, criterion, QuickCheck, random }:
+     mkDerivation {
+       pname = "cl3";
+       version = "1.0.0.0";
+       sha256 = "1a15nbx0q260bs5bh10vckvlbzfgjs5f676r3drki77hggkidvjh";
+       libraryHaskellDepends = [ base random ];
+       testHaskellDepends = [ base QuickCheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Clifford Algebra of three dimensional space";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "cl3-hmatrix-interface" = callPackage
+    ({ mkDerivation, base, cl3, hmatrix }:
+     mkDerivation {
+       pname = "cl3-hmatrix-interface";
+       version = "1.0.0.0";
+       sha256 = "0cz1pzbnxld2kpiqggln0yags46zhlc8pzghz3mykblwdvgk7z7s";
+       libraryHaskellDepends = [ base cl3 hmatrix ];
+       description = "Interface to/from Cl3 and HMatrix";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "cl3-linear-interface" = callPackage
+    ({ mkDerivation, base, cl3, linear }:
+     mkDerivation {
+       pname = "cl3-linear-interface";
+       version = "1.0.0.0";
+       sha256 = "02yyajy8n9j7jd3kz2qas4h2vyv5b42jrjj092cy18lfj9hr22as";
+       libraryHaskellDepends = [ base cl3 linear ];
+       description = "Interface to/from Cl3 and Linear";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "clac" = callPackage
     ({ mkDerivation, base, containers, dsp, optparse-applicative
      , plailude, pretty-tree, safe, split
@@ -47564,10 +47846,8 @@ self: {
      }:
      mkDerivation {
        pname = "codeworld-api";
-       version = "0.2.2.1";
-       sha256 = "0vb3v8d4jdzk14zs1jv4m5f2wa32bpxsfa0zr4f3w6z77as136sx";
-       revision = "2";
-       editedCabalFile = "0glp45kr9v8c9pxbaaq6cwm6i5rhglw2npk16kab80dgsfdb1pj9";
+       version = "0.2.3";
+       sha256 = "0rn4lzjrw930phg62pmrziq4g3dv7rjzxxfsnz11k46w845zzgih";
        libraryHaskellDepends = [
          base blank-canvas cereal cereal-text containers hashable mtl random
          random-shuffle text time
@@ -48745,8 +49025,8 @@ self: {
      }:
      mkDerivation {
        pname = "compactable";
-       version = "0.1.2.0";
-       sha256 = "0kh36h1zfdlhvcz8xzf3c4af0rbypa7p421rl0xsig914r5z519j";
+       version = "0.1.2.1";
+       sha256 = "00fxrwyn1znyhfpql2ygh308b7nl6a3lgxvl39q3qm89wzh2gisc";
        libraryHaskellDepends = [
          base bifunctors containers transformers vector
        ];
@@ -49214,12 +49494,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "composition-prelude_1_4_0_5" = callPackage
+  "composition-prelude_1_5_0_0" = callPackage
     ({ mkDerivation, base, cpphs }:
      mkDerivation {
        pname = "composition-prelude";
-       version = "1.4.0.5";
-       sha256 = "0bcz7lx4v25dz9d11qy8im6fk1gviqqhgcr1bwxg4yqyzbfl8bas";
+       version = "1.5.0.0";
+       sha256 = "01rbbqnwmm615af1yrg4afk4dvv24y2k52m6c1rz9xkyyg8ii0hq";
        libraryHaskellDepends = [ base ];
        libraryToolDepends = [ cpphs ];
        description = "Higher-order function combinators";
@@ -50032,6 +50312,42 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conduit-algorithms_0_0_8_1" = callPackage
+    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
+     , conduit-combinators, conduit-extra, containers, criterion
+     , deepseq, directory, exceptions, HUnit, lzma-conduit
+     , monad-control, mtl, pqueue, resourcet, stm, stm-conduit
+     , streaming-commons, test-framework, test-framework-hunit
+     , test-framework-th, transformers, unliftio-core, vector
+     }:
+     mkDerivation {
+       pname = "conduit-algorithms";
+       version = "0.0.8.1";
+       sha256 = "07gx2q3d1bbfw14q41rmqg0i4m018pci10lswc0k1ij6lw7sb9fd";
+       libraryHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra containers deepseq exceptions lzma-conduit
+         monad-control mtl pqueue resourcet stm stm-conduit
+         streaming-commons transformers unliftio-core vector
+       ];
+       testHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra containers deepseq directory exceptions HUnit
+         lzma-conduit monad-control mtl pqueue resourcet stm stm-conduit
+         streaming-commons test-framework test-framework-hunit
+         test-framework-th transformers unliftio-core vector
+       ];
+       benchmarkHaskellDepends = [
+         async base bytestring bzlib-conduit conduit conduit-combinators
+         conduit-extra containers criterion deepseq exceptions lzma-conduit
+         monad-control mtl pqueue resourcet stm stm-conduit
+         streaming-commons transformers unliftio-core vector
+       ];
+       description = "Conduit-based algorithms";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "conduit-audio" = callPackage
     ({ mkDerivation, base, conduit, vector }:
      mkDerivation {
@@ -51062,8 +51378,8 @@ self: {
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "constrictor";
-       version = "0.1.1.2";
-       sha256 = "0cqnc0hd73wjmmv9qcvakgg36mhxxp5f9wv2jh3nc45bxjd91snq";
+       version = "0.1.2.0";
+       sha256 = "17vdyc2r9fgblh2pjwdrya7iyrb83ay09zhpfvn80rrrj3d2nd8x";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        description = "strict versions of many things in base";
        license = stdenv.lib.licenses.mit;
@@ -51332,6 +51648,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "contiguous" = callPackage
+    ({ mkDerivation, base, primitive }:
+     mkDerivation {
+       pname = "contiguous";
+       version = "0.1.0.0";
+       sha256 = "19j58q0iq8ghhvrz6hqh4k7biiw8nnnxd2q3b3gwnlgfv08g8h7b";
+       libraryHaskellDepends = [ base primitive ];
+       description = "Unified interface for primitive arrays";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "continue" = callPackage
     ({ mkDerivation, base, bifunctors, monad-control, mtl
      , semigroupoids, transformers, transformers-base
@@ -51477,8 +51804,8 @@ self: {
      }:
      mkDerivation {
        pname = "control-iso";
-       version = "0.1.0.0";
-       sha256 = "1z4z3plxs06w485injj2azk8bl42wy0i6c65c4j7fzkkyk7pqbfj";
+       version = "0.1.0.1";
+       sha256 = "1346x6fmdizqi7mxv13z97yjb58psga9mk0rqc6144fgk5i9y9v1";
        libraryHaskellDepends = [
          base bytestring newtype-generics profunctors text
        ];
@@ -56579,14 +56906,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse-lens_4_1_0_0" = callPackage
+  "data-diverse-lens_4_2_0_0" = callPackage
     ({ mkDerivation, base, data-diverse, data-has, hspec, lens
      , profunctors, tagged
      }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "4.1.0.0";
-       sha256 = "1kzmxlrnvz0xl4fvdgi9qm0vdkwh8129x5af9cjcji5rhmshh5bh";
+       version = "4.2.0.0";
+       sha256 = "0skjgkv81sjmpggk57ac33f84qv0in04hnwyy23zk9g9cbqz0qwr";
        libraryHaskellDepends = [
          base data-diverse data-has lens profunctors tagged
        ];
@@ -59384,14 +59711,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_6_0_0" = callPackage
+  "dejafu_1_8_0_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, contravariant
      , deepseq, exceptions, leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.6.0.0";
-       sha256 = "101lbnan5cgyl6v6j4hbys8j8br814m14clxgc366yyd2rkf8saf";
+       version = "1.8.0.0";
+       sha256 = "09l1z86vzccvbmsbar5q2a9zc7i8qh8ykinfhvrzcir1yhyz422i";
        libraryHaskellDepends = [
          base concurrency containers contravariant deepseq exceptions
          leancheck profunctors random transformers
@@ -59993,8 +60320,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "descrilo";
-       version = "0.1.0.5";
-       sha256 = "13pmncbss1fwzc8n37rc7czdpjh12iim5nc10p0486ka5asxcc95";
+       version = "0.1.0.6";
+       sha256 = "166x7j8q5wg8iq1bf2qz01ps0b1pbfgizsy1zfhjd98a3zl9fid2";
        libraryHaskellDepends = [ base ];
        description = "Loads a list of items with fields";
        license = stdenv.lib.licenses.gpl3;
@@ -60456,24 +60783,25 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, containers, contravariant
      , dhall, Diff, filepath, formatting, hashable
      , insert-ordered-containers, optparse-applicative, prettyprinter
-     , tasty, tasty-golden, text, transformers, trifecta, vector
+     , tasty, tasty-golden, text, transformers, vector
      }:
      mkDerivation {
        pname = "dhall-to-cabal";
-       version = "1.0.0.1";
-       sha256 = "0qs00xhsk09azm7sqfihnwmapilmkybmcim1wzlw3h6y4jj6nmq9";
+       version = "1.1.0.0";
+       sha256 = "1vmyc9pbcndqimh2wpdwbnnzjkgkqahq13migasbj8p96ck1kbcn";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal containers dhall formatting hashable
-         insert-ordered-containers text transformers trifecta vector
+         base bytestring Cabal containers contravariant dhall formatting
+         hashable insert-ordered-containers text transformers vector
        ];
        executableHaskellDepends = [
-         base Cabal contravariant dhall hashable insert-ordered-containers
-         optparse-applicative prettyprinter text
+         base bytestring Cabal dhall insert-ordered-containers
+         optparse-applicative prettyprinter text transformers
        ];
        testHaskellDepends = [
-         base bytestring Cabal Diff filepath tasty tasty-golden text
+         base bytestring Cabal dhall Diff filepath prettyprinter tasty
+         tasty-golden text
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
@@ -60872,8 +61200,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-html5";
-       version = "1.4";
-       sha256 = "1an1f7ykimjbi9xir3mac34ikkawnvs96bpnzp8ia8jcdaa3qra3";
+       version = "1.4.1";
+       sha256 = "0vp99ks9ldy91x1jlla0kyg8sq9748k82ql0jsf0jxhimvwd7vp8";
        libraryHaskellDepends = [
          base cmdargs containers data-default-class diagrams-core
          diagrams-lib lens mtl NumInstances optparse-applicative split
@@ -62501,6 +62829,50 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "distributed-fork" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, constraints
+     , distributed-closure, exceptions, stm, tasty, tasty-hunit
+     , terminal-size, text, transformers, typed-process, unix
+     }:
+     mkDerivation {
+       pname = "distributed-fork";
+       version = "0.0.1.2";
+       sha256 = "0sdabc688fm1xajrdr9q6wzxd2fhzs9ary07sxh2sx0dwlyzk773";
+       libraryHaskellDepends = [
+         async base binary bytestring constraints distributed-closure
+         exceptions stm terminal-size text transformers typed-process
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit unix ];
+       description = "Like 'forkIO', but uses remote machines instead of local threads";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "distributed-fork-aws-lambda" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, amazonka, amazonka-cloudformation
+     , amazonka-core, amazonka-lambda, amazonka-s3, amazonka-sqs, async
+     , base, base64-bytestring, bytestring, containers, distributed-fork
+     , interpolate, lens, lens-aeson, safe-exceptions, SHA, stratosphere
+     , tasty, tasty-hunit, text, time, typed-process
+     , unordered-containers, zip-archive
+     }:
+     mkDerivation {
+       pname = "distributed-fork-aws-lambda";
+       version = "0.0.1.2";
+       sha256 = "1y511vildwj2f6kcswwqw65xhv06q106pnnv1pnhjc91x7r7sbzm";
+       libraryHaskellDepends = [
+         aeson aeson-qq amazonka amazonka-cloudformation amazonka-core
+         amazonka-lambda amazonka-s3 amazonka-sqs async base
+         base64-bytestring bytestring containers distributed-fork
+         interpolate lens lens-aeson safe-exceptions SHA stratosphere text
+         time typed-process unordered-containers zip-archive
+       ];
+       testHaskellDepends = [
+         base distributed-fork tasty tasty-hunit text
+       ];
+       description = "AWS Lambda backend for distributed-fork";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distributed-process" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-accessor, deepseq, distributed-static, exceptions, hashable
@@ -68919,6 +69291,62 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "espial" = callPackage
+    ({ mkDerivation, aeson, base, bcrypt, bytestring, case-insensitive
+     , classy-prelude, classy-prelude-conduit, classy-prelude-yesod
+     , conduit, containers, data-default, directory, esqueleto
+     , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec
+     , http-conduit, iso8601-time, microlens, monad-control
+     , monad-logger, mtl, optparse-generic, persistent
+     , persistent-sqlite, persistent-template, pretty-show, safe
+     , shakespeare, template-haskell, text, time, transformers
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-static
+     , yesod-test
+     }:
+     mkDerivation {
+       pname = "espial";
+       version = "0.0.1";
+       sha256 = "19zkd2vki74ny69w2bdc3qr71fzawk20a56vsv3an9q5xx0f36a6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bcrypt bytestring case-insensitive classy-prelude
+         classy-prelude-conduit classy-prelude-yesod conduit containers
+         data-default directory esqueleto fast-logger file-embed
+         foreign-store hjsmin hscolour http-conduit iso8601-time
+         monad-control monad-logger mtl persistent persistent-sqlite
+         persistent-template pretty-show safe shakespeare template-haskell
+         text time transformers unordered-containers vector wai wai-extra
+         wai-logger warp yaml yesod yesod-auth yesod-core yesod-form
+         yesod-static
+       ];
+       executableHaskellDepends = [
+         aeson base bcrypt bytestring case-insensitive classy-prelude
+         classy-prelude-conduit classy-prelude-yesod conduit containers
+         data-default directory esqueleto fast-logger file-embed
+         foreign-store hjsmin hscolour http-conduit iso8601-time
+         monad-control monad-logger mtl optparse-generic persistent
+         persistent-sqlite persistent-template pretty-show safe shakespeare
+         template-haskell text time transformers unordered-containers vector
+         wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core
+         yesod-form yesod-static
+       ];
+       testHaskellDepends = [
+         aeson base bcrypt bytestring case-insensitive classy-prelude
+         classy-prelude-conduit classy-prelude-yesod conduit containers
+         data-default directory esqueleto fast-logger file-embed
+         foreign-store hjsmin hscolour hspec http-conduit iso8601-time
+         microlens monad-control monad-logger mtl persistent
+         persistent-sqlite persistent-template pretty-show safe shakespeare
+         template-haskell text time transformers unordered-containers vector
+         wai wai-extra wai-logger warp yaml yesod yesod-auth yesod-core
+         yesod-form yesod-static yesod-test
+       ];
+       description = "Espial is an open-source, web-based bookmarking server";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "esqueleto" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
@@ -69009,8 +69437,8 @@ self: {
      }:
      mkDerivation {
        pname = "etc";
-       version = "0.4.0.1";
-       sha256 = "0vpc3816vsxs985h076wxyr3z9q759399xapnhiv1m428sksw6zs";
+       version = "0.4.0.3";
+       sha256 = "0xnm5mvrd0409kcrxp6ls92z5fvq959pghf67pqmj4a84k1dwkw3";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base hashable rio text typed-process unliftio
@@ -70315,8 +70743,8 @@ self: {
      }:
      mkDerivation {
        pname = "exinst";
-       version = "0.5";
-       sha256 = "1r6hy9kkfn24zszb9jd4p6w3wa4nwd2ds8mvb3k9rl20gc3zzhhi";
+       version = "0.6";
+       sha256 = "0pljgk0y4azzgp0k9q8dl7jpf9bf2719xax54mnc35g1px4s21p9";
        libraryHaskellDepends = [
          aeson base binary bytes cborg cereal constraints deepseq hashable
          profunctors QuickCheck serialise singletons
@@ -71444,8 +71872,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.0.6";
-       sha256 = "1vw652sps7dx11anqrrjw2fz039m7bkcfmk61px9g3yn0wvjlm02";
+       version = "0.6.0.7";
+       sha256 = "12ma6p4qy7wc22dd63dxqq3sq7spsx2hdzn82zf0w9y33y2jyaml";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ];
        benchmarkHaskellDepends = [ arithmoi base combinat criterion ];
@@ -73069,6 +73497,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "filecache_0_4_0" = callPackage
+    ({ mkDerivation, base, containers, directory, exceptions, filepath
+     , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time
+     }:
+     mkDerivation {
+       pname = "filecache";
+       version = "0.4.0";
+       sha256 = "0x2ffqx6wfv6n3k3396463f771zs9ps1rcw8ga3qw4vm5sv8s26d";
+       libraryHaskellDepends = [
+         base containers directory exceptions filepath fsnotify mtl stm
+         strict-base-types time
+       ];
+       testHaskellDepends = [
+         base containers directory filepath hspec stm temporary
+       ];
+       description = "A cache system associating values to files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "filediff" = callPackage
     ({ mkDerivation, base, bytestring, data-default
      , data-memocombinators, directory, either, hashmap, mtl, rainbow
@@ -75498,15 +75946,15 @@ self: {
      }) {};
 
   "forest" = callPackage
-    ({ mkDerivation, aeson, base, deepseq, hashable, profunctors
-     , semigroupoids
+    ({ mkDerivation, aeson, base, comonad, deepseq, free, hashable
+     , profunctors, semigroupoids
      }:
      mkDerivation {
        pname = "forest";
-       version = "0.2";
-       sha256 = "0z8wfvylzcls994yg3s4bywjxl3592y4ba6gcn2h8ndc7c8w09v4";
+       version = "0.2.1";
+       sha256 = "1kj84w39bxirasa5m2y9zjgsq7cd6yv82y51g8cr9g7r1z30wri8";
        libraryHaskellDepends = [
-         aeson base deepseq hashable profunctors semigroupoids
+         aeson base comonad deepseq free hashable profunctors semigroupoids
        ];
        description = "Tree and Forest types";
        license = stdenv.lib.licenses.mpl20;
@@ -77066,15 +77514,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fsnotify_0_3_0_0" = callPackage
+  "fsnotify_0_3_0_1" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , filepath, hinotify, random, shelly, tasty, tasty-hunit, temporary
      , text, time, unix, unix-compat
      }:
      mkDerivation {
        pname = "fsnotify";
-       version = "0.3.0.0";
-       sha256 = "1ni5zmrbc255raxn4ws20n6b1n89yyjxrf96d1fs8y74h3z4ny85";
+       version = "0.3.0.1";
+       sha256 = "19bdbz9wb9jvln6yg6qm0hz0w84bypvkxf0wjhgrgd52f9gidlny";
+       revision = "1";
+       editedCabalFile = "1pa9pa0kflkqlb4dysagy0aihn452hmf6wwlsr7fp4ygg86m7fsq";
        libraryHaskellDepends = [
          async base bytestring containers directory filepath hinotify shelly
          text time unix unix-compat
@@ -77108,6 +77558,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fsnotify-conduit_0_1_1_1" = callPackage
+    ({ mkDerivation, base, conduit, directory, filepath, fsnotify
+     , hspec, resourcet, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "fsnotify-conduit";
+       version = "0.1.1.1";
+       sha256 = "1kh1y1p4dw2yhxrl1rrkmpkvm3q5nq12cwl8dfcscrkx3wqhz683";
+       libraryHaskellDepends = [
+         base conduit directory filepath fsnotify resourcet transformers
+       ];
+       testHaskellDepends = [
+         base conduit directory filepath fsnotify hspec resourcet temporary
+         transformers
+       ];
+       description = "Get filesystem notifications as a stream of events";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fst" = callPackage
     ({ mkDerivation, array, base, haskeline, mtl, QuickCheck
      , transformers
@@ -77165,8 +77635,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswatch";
-       version = "0.1.0.2";
-       sha256 = "1k3592nfiy348aqg2q64k3w1vbzl7x7098jy73gp7ipzyfr9k1pp";
+       version = "0.1.0.3";
+       sha256 = "1k68h4jzcqsnmmhnm3sp0zlkz99q0d925iragl3dbnsbk837sq25";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -79088,6 +79558,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "generic-random_1_2_0_0" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "generic-random";
+       version = "1.2.0.0";
+       sha256 = "130lmblycxnpqbsl7vf6a90zccibnvcb5zaclfajcn3by39007lv";
+       libraryHaskellDepends = [ base QuickCheck ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       description = "Generic random generators";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-records" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -79828,6 +80311,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "genvalidity-mergeless" = callPackage
+    ({ mkDerivation, base, containers, genvalidity
+     , genvalidity-containers, genvalidity-hspec
+     , genvalidity-hspec-aeson, genvalidity-time, genvalidity-typed-uuid
+     , hspec, mergeless, mtl, QuickCheck, random, time, typed-uuid, uuid
+     }:
+     mkDerivation {
+       pname = "genvalidity-mergeless";
+       version = "0.0.0.0";
+       sha256 = "08lic96xmyqxi773zynn361yzqkx13w57hd7jl21hbkpjjx1g9ka";
+       libraryHaskellDepends = [
+         base genvalidity genvalidity-containers genvalidity-time mergeless
+         QuickCheck
+       ];
+       testHaskellDepends = [
+         base containers genvalidity-hspec genvalidity-hspec-aeson
+         genvalidity-typed-uuid hspec mergeless mtl QuickCheck random time
+         typed-uuid uuid
+       ];
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {genvalidity-typed-uuid = null; typed-uuid = null;};
+
   "genvalidity-path" = callPackage
     ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec, path
      , validity-path
@@ -81709,6 +82216,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghcjs-base-stub_0_2_0_0" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, containers, deepseq
+     , ghc-prim, primitive, scientific, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "ghcjs-base-stub";
+       version = "0.2.0.0";
+       sha256 = "05k59a6jg1a5s8zvqfah5rvm5kg34sqpv2zx4chczihx3n9prfv7";
+       libraryHaskellDepends = [
+         aeson attoparsec base containers deepseq ghc-prim primitive
+         scientific text transformers unordered-containers vector
+       ];
+       description = "Allow GHCJS projects to compile under GHC and develop using intero";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcjs-codemirror" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -82050,25 +82575,25 @@ self: {
   "gi-dbusmenugtk3" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
      , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk
-     , haskell-gi, haskell-gi-base, haskell-gi-overloading
+     , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading
      , libdbusmenu-gtk3, text, transformers
      }:
      mkDerivation {
        pname = "gi-dbusmenugtk3";
-       version = "0.4.1";
-       sha256 = "0gl37jsska2qsakzbmvwvb33lskdrbxpk1hmw907y187d0hq7pry";
+       version = "0.4.2";
+       sha256 = "0wflxyicav2p1z2sqdrjpvkf4blsilg7psvbr0cfl0r7vmy6nx4w";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf
          gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
          haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ libdbusmenu-gtk3 ];
+       libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ];
        doHaddock = false;
        description = "DbusmenuGtk bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libdbusmenu-gtk3;};
+     }) {gtk3 = pkgs.gnome3.gtk; inherit (pkgs) libdbusmenu-gtk3;};
 
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -82942,8 +83467,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-all";
-       version = "1.5.0";
-       sha256 = "0wfvfrmwn81myiaa5x4bw6ypyk0hljaaf3f7b9rnpxwk291dwc3z";
+       version = "1.6.0";
+       sha256 = "10fq88fld1lb5wrikcsg9gxcfbldr0fpix81sba8qy11g7igd7fl";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82977,8 +83502,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20180509";
-       sha256 = "09rl41c7fsz9jzf9234qcqfix61afxyc2vjx6sld2zyqiky7rhvh";
+       version = "6.20180529";
+       sha256 = "1rx0m4yrl3gl2ca8rbbv74fdlg4s2jnddzljhph7271a7bpyxsx5";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -83070,13 +83595,16 @@ self: {
 
   "git-date" = callPackage
     ({ mkDerivation, base, bytestring, old-locale, QuickCheck
-     , test-framework, test-framework-quickcheck2, time, utf8-string
+     , test-framework, test-framework-quickcheck2, time, unexceptionalio
+     , utf8-string
      }:
      mkDerivation {
        pname = "git-date";
-       version = "0.2.2";
-       sha256 = "0yld8p7jgq0ihz21nkmirz3ynwi0mgrlgzx727kim59hplm6xrcl";
-       libraryHaskellDepends = [ base bytestring time utf8-string ];
+       version = "0.3.0";
+       sha256 = "1lhmzjfch84nilr89b0qaj4a7nrkkrabimg46rnqpmylbgws1h4m";
+       libraryHaskellDepends = [
+         base bytestring time unexceptionalio utf8-string
+       ];
        testHaskellDepends = [
          base bytestring old-locale QuickCheck test-framework
          test-framework-quickcheck2 time utf8-string
@@ -83720,19 +84248,18 @@ self: {
   "gitlib" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, conduit
      , conduit-combinators, containers, directory, exceptions, filepath
-     , hashable, lifted-async, lifted-base, monad-control, mtl
-     , resourcet, semigroups, tagged, text, time, transformers, unix
-     , unordered-containers
+     , hashable, mtl, resourcet, semigroups, tagged, text, time
+     , transformers, unix, unliftio, unliftio-core, unordered-containers
      }:
      mkDerivation {
        pname = "gitlib";
-       version = "3.1.1";
-       sha256 = "1vwmyfmqlly351jq9pgjhcfhnxvrhzkd4lfq7qpsa37vca5pas6x";
+       version = "3.1.2";
+       sha256 = "1r973cpkp4h8dfjrkqgyy31a3x4bbqi7zhpck09ix2a9i597b345";
        libraryHaskellDepends = [
          base base16-bytestring bytestring conduit conduit-combinators
-         containers directory exceptions filepath hashable lifted-async
-         lifted-base monad-control mtl resourcet semigroups tagged text time
-         transformers unix unordered-containers
+         containers directory exceptions filepath hashable mtl resourcet
+         semigroups tagged text time transformers unix unliftio
+         unliftio-core unordered-containers
        ];
        description = "API library for working with Git repositories";
        license = stdenv.lib.licenses.mit;
@@ -84342,6 +84869,8 @@ self: {
        pname = "glirc";
        version = "2.26";
        sha256 = "1ax2ygzrsr1r21v9cx4ixnlgrax6nxr4rkh090n1wv6xn02kd3j0";
+       revision = "1";
+       editedCabalFile = "0wbkapxwzlmjcmkp6inm2xj6bghd8nl4a4ddljizm6xvwcpvp75j";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -84915,12 +85444,12 @@ self: {
      }) {};
 
   "gmpint" = callPackage
-    ({ mkDerivation, base, gmp, recursion-schemes }:
+    ({ mkDerivation, base, gmp }:
      mkDerivation {
        pname = "gmpint";
-       version = "0.1.0.13";
-       sha256 = "0n4syarw91367kkvsbn9ag3caiksbplx4grm8q4z96wh39dvb24y";
-       libraryHaskellDepends = [ base recursion-schemes ];
+       version = "0.1.0.14";
+       sha256 = "08a3ksaq1xx8w153v0xd5k7g2b65wgkr1jshj7533pkg59s8zdxs";
+       libraryHaskellDepends = [ base ];
        librarySystemDepends = [ gmp ];
        description = "GMP integer conversions";
        license = stdenv.lib.licenses.bsd3;
@@ -84984,8 +85513,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.3.32";
-       sha256 = "0b2v7msj54r6dd2w2wd4c8q6wvywnkmyddaa05r990cnbg9l4i9b";
+       version = "0.3.41";
+       sha256 = "1q3g5yikm0n1q2n98iy1j203fi11hy9cfdm6qgcx2ib3b4b2z613";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90982,8 +91511,8 @@ self: {
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.5.5";
-       sha256 = "0chvf2wvpvbnzf8980sdg9s61c4p100ps7ava85hlr281sng5d60";
+       version = "0.5.6";
+       sha256 = "0im76n8487q08rmw8bn536qncrdhz9pjir5cxlf2myh7prrrrczs";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -91824,6 +92353,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
 
+  "hakyll_4_12_3_0" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+     , containers, cryptohash, data-default, deepseq, directory
+     , file-embed, filepath, fsnotify, http-conduit, http-types
+     , lrucache, mtl, network-uri, optparse-applicative, pandoc
+     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
+     , resourcet, scientific, tagsoup, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, time-locale-compat
+     , unordered-containers, utillinux, vector, wai, wai-app-static
+     , warp, yaml
+     }:
+     mkDerivation {
+       pname = "hakyll";
+       version = "4.12.3.0";
+       sha256 = "1cczcca2h5spvrq8z2nm5ygphcrjfm6k725ppbcc05c4w49dqwm4";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory file-embed filepath
+         fsnotify http-conduit http-types lrucache mtl network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process random
+         regex-tdfa resourcet scientific tagsoup text time
+         time-locale-compat unordered-containers vector wai wai-app-static
+         warp yaml
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base bytestring containers filepath QuickCheck tasty tasty-hunit
+         tasty-quickcheck text unordered-containers yaml
+       ];
+       testToolDepends = [ utillinux ];
+       description = "A static website compiler library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) utillinux;};
+
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
      }:
@@ -94817,8 +95384,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-dap";
-       version = "0.0.4.0";
-       sha256 = "1nzaf9zwqsx1jgspimkig6vhh2d1iz7kc3hr2kixc52sbr7y9iag";
+       version = "0.0.5.0";
+       sha256 = "1sb6jqq1nfzaycr1cx4an5yaaad3k8ijig7ss0xa6wvjkyc37xqa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -95031,6 +95598,34 @@ self: {
      }) {inherit (pkgs) glib; 
          inherit (pkgs.gnome3) gobjectIntrospection;};
 
+  "haskell-gi_0_21_3" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
+     , directory, doctest, filepath, glib, gobjectIntrospection
+     , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
+     , text, transformers, xdg-basedir, xml-conduit
+     }:
+     mkDerivation {
+       pname = "haskell-gi";
+       version = "0.21.3";
+       sha256 = "09smnzg6kqjyb7m281k8w3y6vabws41snp9wkh8449s0ya3ndbn0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring Cabal containers directory filepath
+         haskell-gi-base mtl pretty-show process regex-tdfa safe text
+         transformers xdg-basedir xml-conduit
+       ];
+       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       executableHaskellDepends = [
+         base containers directory filepath haskell-gi-base pretty-show text
+       ];
+       testHaskellDepends = [ base doctest process ];
+       description = "Generate Haskell bindings for GObject Introspection capable libraries";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib; 
+         inherit (pkgs.gnome3) gobjectIntrospection;};
+
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
@@ -101496,6 +102091,8 @@ self: {
        pname = "hgeometry";
        version = "0.6.0.0";
        sha256 = "1pphbdl5sn6gvm4crshpnfjmf0c8kwfz68hv615hhadp7120x3ij";
+       revision = "1";
+       editedCabalFile = "19j3n0kf7n2n0spyr83gdjngxnfxvyr1sryvhq8jflsxq44d8rdg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101976,8 +102573,8 @@ self: {
      }:
      mkDerivation {
        pname = "hifi";
-       version = "0.1.4.0";
-       sha256 = "0rgmhj1fn0ldyzbscv1q447fbqggqaw3zqxagsn95zq2dqyhrpyl";
+       version = "0.1.4.1";
+       sha256 = "01bdylz6a58aczaf3b35w6x7ji0hxr6b8sjcqsx2jwnc1vx379ns";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -103779,8 +104376,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlrdb";
-       version = "0.2.0.0";
-       sha256 = "1x7vw2mcwd703dr5mjghsjd04yxwl6z7wzdysgk75i4l7f0lcqfq";
+       version = "0.2.0.1";
+       sha256 = "0rrpn3gsh2ck3skpc9d6mdprcac8xdxxc71m8y5jfi0yzh6priga";
        libraryHaskellDepends = [
          base base64-bytestring bytestring cryptonite hashable hedis
          hlrdb-core memory random store time unordered-containers
@@ -111132,6 +111729,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hsx-jmacro_7_3_8_1" = callPackage
+    ({ mkDerivation, base, hsp, jmacro, mtl, text, wl-pprint-text }:
+     mkDerivation {
+       pname = "hsx-jmacro";
+       version = "7.3.8.1";
+       sha256 = "0ndgy5vf5rwgwqya75ny5vbr7hfqwjrdgfgpwf5410bk0603v47i";
+       libraryHaskellDepends = [
+         base hsp jmacro mtl text wl-pprint-text
+       ];
+       description = "hsp+jmacro support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hsx-xhtml" = callPackage
     ({ mkDerivation, base, hsx, mtl }:
      mkDerivation {
@@ -113114,12 +113725,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hunit-dejafu_1_2_0_1" = callPackage
+  "hunit-dejafu_1_2_0_3" = callPackage
     ({ mkDerivation, base, dejafu, exceptions, HUnit }:
      mkDerivation {
        pname = "hunit-dejafu";
-       version = "1.2.0.1";
-       sha256 = "1shkfbn14qfk9bjnrmdn3zz88718jb1m942idg2vl53yfj16ahy9";
+       version = "1.2.0.3";
+       sha256 = "1qja9warghakl06fv5v7fimb3bqnb38lhs9y264x9hrc7i0nx2xj";
        libraryHaskellDepends = [ base dejafu exceptions HUnit ];
        description = "Deja Fu support for the HUnit test framework";
        license = stdenv.lib.licenses.mit;
@@ -113185,6 +113796,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hunspell-hs" = callPackage
+    ({ mkDerivation, base, criterion, hspec, hunspell, stm }:
+     mkDerivation {
+       pname = "hunspell-hs";
+       version = "0.1.0.0";
+       sha256 = "0jiqgs4akny8kcpl3hdkj08hyknw2p0z96dci6lwq2fv5qprj77i";
+       libraryHaskellDepends = [ base stm ];
+       librarySystemDepends = [ hunspell ];
+       testHaskellDepends = [ base hspec stm ];
+       testSystemDepends = [ hunspell ];
+       benchmarkHaskellDepends = [ base criterion stm ];
+       benchmarkSystemDepends = [ hunspell ];
+       description = "Hunspell thread-safe FFI bindings for spell checking";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) hunspell;};
+
   "hunt-searchengine" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
      , containers, data-default, data-r-tree, data-stringmap, deepseq
@@ -113531,6 +114158,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-dsv" = callPackage
+    ({ mkDerivation, base, bits-extra, bytestring, cassava, criterion
+     , directory, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hspec-hedgehog, hw-prim, hw-rankselect, hw-rankselect-base
+     , lens, mmap, optparse-applicative, resourcet, text, vector, weigh
+     }:
+     mkDerivation {
+       pname = "hw-dsv";
+       version = "0.1.0.0";
+       sha256 = "1qyqvb4ky4fl0hys1yihn54xxmh1ajnb81szgsv8crh1idvx0fil";
+       revision = "1";
+       editedCabalFile = "0g99dyjx8vrhm9rdblla1gwd1z1p7fpaddq21y56k5bfg9zjcivw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bits-extra bytestring hw-bits hw-prim hw-rankselect
+         hw-rankselect-base vector
+       ];
+       executableHaskellDepends = [
+         base bits-extra bytestring hedgehog hw-bits hw-prim hw-rankselect
+         hw-rankselect-base lens optparse-applicative resourcet vector
+       ];
+       testHaskellDepends = [
+         base bits-extra bytestring cassava directory hedgehog hspec hw-bits
+         hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text
+         vector weigh
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bits-extra bytestring cassava criterion directory hw-bits
+         hw-prim hw-rankselect hw-rankselect-base mmap vector weigh
+       ];
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hw-eliasfano" = callPackage
     ({ mkDerivation, base, hspec, hw-bits, hw-int, hw-packed-vector
      , hw-prim, QuickCheck, safe, vector
@@ -113605,17 +114267,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hw-fingertree-strict_0_1_1_0" = callPackage
+  "hw-fingertree-strict_0_1_1_1" = callPackage
     ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
      , hw-hspec-hedgehog, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "hw-fingertree-strict";
-       version = "0.1.1.0";
-       sha256 = "0a709kcly1wi3lxznk92bcir29yawv5hz6fxnw2dp1zhdmxqj09q";
-       revision = "1";
-       editedCabalFile = "06dv0zbxzvayymf2syi3dqcm6q8x9c91yl35z1dgkz36lddqbidh";
+       version = "0.1.1.1";
+       sha256 = "0s0jz6lynxiaz2h8hr78j05vhswrl6vwhmvdra9a46c3yg7vf9qi";
        libraryHaskellDepends = [ base deepseq ];
        testHaskellDepends = [
          base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
@@ -113964,6 +114624,8 @@ self: {
        pname = "hw-rankselect";
        version = "0.10.0.3";
        sha256 = "1jqlyprb83bnffmq6ck6xpx27mqnmrarn890r2dn8k06asghf7da";
+       revision = "1";
+       editedCabalFile = "1rkni89h3sq02y03phb2bgx4yrx4gly9mzan6r4ziph0qayf09wf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113995,6 +114657,8 @@ self: {
        pname = "hw-rankselect";
        version = "0.12.0.2";
        sha256 = "02fr2p1sl7ynpc1280l1nakf24ifp4fkpjpy2lac8rk4iab48syk";
+       revision = "1";
+       editedCabalFile = "0wggs7k8b0syivi3lyz6qplkiqb11im94bqhhbn6dqikf5sv6qv7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -117630,6 +118294,8 @@ self: {
        pname = "ini";
        version = "0.3.6";
        sha256 = "1n9wsl7nz910bc8jx9ps7pvpql4hlnryjkqbdpfq0phjb9sf7fzw";
+       revision = "1";
+       editedCabalFile = "0gfikdal67aws20i5r4wg4r0lgn844glykcn3nnmbmyvwsks049l";
        libraryHaskellDepends = [
          attoparsec base text unordered-containers
        ];
@@ -118547,6 +119213,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "interprocess" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "interprocess";
+       version = "0.1.0.0";
+       sha256 = "13bxwgzbqb2ih76j5il5l6fqaq9lxl7c6h7r0y6hlpzm9f9izcpa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       description = "Shared memory and control structures for IPC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "interruptible" = callPackage
     ({ mkDerivation, base, Cabal, either, lifted-base, monad-control
      , transformers
@@ -118783,6 +119462,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "invertible-grammar" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter
+     , profunctors, semigroups, tagged, template-haskell, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "invertible-grammar";
+       version = "0.1.0";
+       sha256 = "0wi0s07v95yh1bmhc4z6n5r47mbmg0mvf3a3ks999gdma4sva1iz";
+       libraryHaskellDepends = [
+         base bifunctors containers mtl prettyprinter profunctors semigroups
+         tagged template-haskell text transformers
+       ];
+       description = "Invertible parsing combinators framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "invertible-hlist" = callPackage
     ({ mkDerivation, base, HList, invertible }:
      mkDerivation {
@@ -120651,6 +121347,8 @@ self: {
        pname = "jailbreak-cabal";
        version = "1.3.3";
        sha256 = "076h7nbf94zfwvfijcpv03r3s2nyynb2y9v354m4bxqz3anhib3b";
+       revision = "3";
+       editedCabalFile = "0f4gqssh2ayl089zzl8m5rwa66x430dg1q5hfwcfd56r6xr6wi1l";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
@@ -123373,8 +124071,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip";
-       version = "0.5.5.0";
-       sha256 = "10s2bv79shvnpkz1zbcn220mxv05xxq5gny332vhrhflnlcsq9jr";
+       version = "0.5.5.1";
+       sha256 = "0q72kjjrn6x1qr2rp6c3mhf5s3cq4pdsl917a9bflid9zmk5n30b";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -125865,8 +126563,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.2.0.10";
-       sha256 = "1998i63gn8f5pn4jlkv30869679jab0vz0gvjzr4yqlyq4npsvpy";
+       version = "1.2.0.11";
+       sha256 = "1kz30k8fdmnrx5zcyy3kpvr81p50m7bwsxgp5qqjrhk2i1a1igfp";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
@@ -125942,6 +126640,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c_0_8" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers, deepseq
+     , directory, filepath, happy, pretty, process, syb
+     }:
+     mkDerivation {
+       pname = "language-c";
+       version = "0.8";
+       sha256 = "0ms0hfg65d7phfr2dq6183vcbmq9ddpvmlqbs8nwbqhqvcdpfl4w";
+       libraryHaskellDepends = [
+         array base bytestring containers deepseq directory filepath pretty
+         process syb
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [ base directory filepath process ];
+       description = "Analysis and generation of C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-c-comments" = callPackage
     ({ mkDerivation, alex, array, base, language-c }:
      mkDerivation {
@@ -126106,22 +126823,23 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "language-docker_5_0_1" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, free, Glob
-     , hspec, HUnit, mtl, parsec, pretty, process, QuickCheck, split
-     , template-haskell, text, th-lift, time
+  "language-docker_6_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , free, Glob, hspec, HUnit, megaparsec, mtl, prettyprinter, process
+     , QuickCheck, split, template-haskell, text, th-lift, time
      }:
      mkDerivation {
        pname = "language-docker";
-       version = "5.0.1";
-       sha256 = "0y2kb2g9w34p3yw8cdjr4f0xkq9j065khlk1mbk7061gg2rhpykv";
+       version = "6.0.0";
+       sha256 = "0b3m6vzfhypwqnlwdy1b1cx6dfca0rcq2m4zivd608ny2ii22ajv";
        libraryHaskellDepends = [
-         base bytestring free mtl parsec pretty split template-haskell text
-         th-lift time
+         base bytestring containers free megaparsec mtl prettyprinter split
+         template-haskell text th-lift time
        ];
        testHaskellDepends = [
-         base bytestring directory filepath free Glob hspec HUnit mtl parsec
-         pretty process QuickCheck split template-haskell text th-lift time
+         base bytestring containers directory filepath free Glob hspec HUnit
+         megaparsec mtl prettyprinter process QuickCheck split
+         template-haskell text th-lift time
        ];
        description = "Dockerfile parser, pretty-printer and embedded DSL";
        license = stdenv.lib.licenses.gpl3;
@@ -126195,7 +126913,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "language-ecmascript_0_18" = callPackage
+  "language-ecmascript_0_19" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, charset, containers
      , data-default-class, Diff, directory, filepath, HUnit, mtl, parsec
      , QuickCheck, template-haskell, test-framework
@@ -126204,16 +126922,17 @@ self: {
      }:
      mkDerivation {
        pname = "language-ecmascript";
-       version = "0.18";
-       sha256 = "0gg608hniq1v7f1d56akyk44zyrmd0acr33m53cbdlcq8w1c8h70";
+       version = "0.19";
+       sha256 = "13v5ghw8qc4paacn34skgwmvwisjaykszwjrq3lk4idzvrxln2jp";
        libraryHaskellDepends = [
          ansi-wl-pprint base charset containers data-default-class Diff mtl
-         parsec QuickCheck template-haskell testing-feat uniplate
+         parsec QuickCheck template-haskell uniplate
        ];
        testHaskellDepends = [
-         ansi-wl-pprint base containers data-default-class Diff directory
-         filepath HUnit mtl parsec QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 uniplate
+         ansi-wl-pprint base charset containers data-default-class Diff
+         directory filepath HUnit mtl parsec QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 testing-feat
+         uniplate
        ];
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
@@ -129794,8 +130513,8 @@ self: {
      }:
      mkDerivation {
        pname = "limp";
-       version = "0.3.2.1";
-       sha256 = "0fx8q7ll47qc06laagiap0z4b5mbp958r3b9mc6qm1h9rhksimjk";
+       version = "0.3.2.2";
+       sha256 = "0dx2xgkrqda8qwfiwm3pd5lfnfw5sxf1qdz5sbp54jf6516m2c4w";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base containers QuickCheck tasty tasty-quickcheck tasty-th
@@ -129806,14 +130525,18 @@ self: {
      }) {};
 
   "limp-cbc" = callPackage
-    ({ mkDerivation, base, c2hs, containers, limp, vector }:
+    ({ mkDerivation, base, c2hs, containers, limp, QuickCheck, tasty
+     , tasty-quickcheck, vector
+     }:
      mkDerivation {
        pname = "limp-cbc";
-       version = "0.3.2.1";
-       sha256 = "0q4az96nbwvm7jhrwvbjp87vzkb5nlp739jhkya6z0iq340cjxjy";
+       version = "0.3.2.2";
+       sha256 = "0v637hrm980iqj3bh9p0ixirkhg3dwq7i36pff3n1fiav516qbww";
        libraryHaskellDepends = [ base containers limp vector ];
        libraryToolDepends = [ c2hs ];
-       testHaskellDepends = [ base limp ];
+       testHaskellDepends = [
+         base limp QuickCheck tasty tasty-quickcheck
+       ];
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131478,8 +132201,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-hs-pretty";
-       version = "0.3.0.0";
-       sha256 = "1q67rsjnw8wsfvmz4a54nr7b9il59fdjbbra2wwnnyjldi29ykdq";
+       version = "0.4.0.0";
+       sha256 = "1b398yxyd0x2mlv5b70vgy1q3i8nk77fch7asyx8s42pnff4qqkq";
        libraryHaskellDepends = [
          array base bytestring llvm-hs-pure text wl-pprint-text
        ];
@@ -136495,6 +137218,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mbug" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, http-client
+     , http-client-tls, optparse-applicative, process, scalpel-core
+     , tagsoup, text, th-printf, time, xdg-basedir
+     }:
+     mkDerivation {
+       pname = "mbug";
+       version = "1.0";
+       sha256 = "1bz8bwmapxssgs1j98xvad47185i81sqkydjf6r7329c4sn5gipv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring directory extra http-client http-client-tls
+         optparse-applicative process scalpel-core tagsoup text th-printf
+         time xdg-basedir
+       ];
+       executableHaskellDepends = [
+         base bytestring directory extra http-client http-client-tls
+         optparse-applicative process scalpel-core tagsoup text th-printf
+         time xdg-basedir
+       ];
+       description = "download bugs mailboxes";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "mcl" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, criterion
      , deepseq, ghc-prim, gmpxx, groups, integer-gmp, mcl, openssl
@@ -137473,6 +138221,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mergeless" = callPackage
+    ({ mkDerivation, aeson, base, containers, mtl, time, validity
+     , validity-containers, validity-time
+     }:
+     mkDerivation {
+       pname = "mergeless";
+       version = "0.0.0.0";
+       sha256 = "1wldriwz4247ikf73prlrgd2s5jfazq27p5b7yyfqmylx0h49vaz";
+       libraryHaskellDepends = [
+         aeson base containers mtl time validity validity-containers
+         validity-time
+       ];
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "merkle-patricia-db" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, base, base16-bytestring
      , binary, bytestring, containers, cryptonite, data-default
@@ -138839,6 +139602,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "minio-hs_1_0_1" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , case-insensitive, conduit, conduit-extra, containers, cryptonite
+     , cryptonite-conduit, data-default, directory, filepath
+     , http-client, http-conduit, http-types, memory, protolude
+     , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, temporary, text, time, transformers, unliftio
+     , unliftio-core, xml-conduit
+     }:
+     mkDerivation {
+       pname = "minio-hs";
+       version = "1.0.1";
+       sha256 = "0hxl56zx9xhyi14pmd4mns8r43pym1nhhfqrni3wxqrxh1w6qbsv";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive conduit
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         filepath http-client http-conduit http-types memory protolude
+         resourcet text time transformers unliftio unliftio-core xml-conduit
+       ];
+       testHaskellDepends = [
+         aeson base base64-bytestring bytestring case-insensitive conduit
+         conduit-extra containers cryptonite cryptonite-conduit data-default
+         directory filepath http-client http-conduit http-types memory
+         protolude QuickCheck resourcet tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck temporary text time transformers unliftio
+         unliftio-core xml-conduit
+       ];
+       description = "A Minio Haskell Library for Amazon S3 compatible cloud storage";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "minions" = callPackage
     ({ mkDerivation, ansi-terminal, base, MissingH, process, time }:
      mkDerivation {
@@ -140986,13 +141781,14 @@ self: {
      }:
      mkDerivation {
        pname = "monadiccp-gecode";
-       version = "0.1.2";
-       sha256 = "1ylyzklcb37khrq8a11fzlyd0sa1nrhpd7cv470m23v7l1hc1wg0";
+       version = "0.1.3";
+       sha256 = "0h3a82lrsvsdkdvf1m5hl9ayvikxp5p38wj5rpgn6qh8n5im2sn8";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [ base containers monadiccp mtl ];
        librarySystemDepends = [
          gecodeint gecodekernel gecodesearch gecodeset gecodesupport
        ];
+       testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -148205,20 +149001,16 @@ self: {
      }) {};
 
   "notzero" = callPackage
-    ({ mkDerivation, base, bifunctors, directory, doctest, filepath
-     , lens, mtl, QuickCheck, semigroupoids, semigroups
-     , template-haskell, transformers
+    ({ mkDerivation, base, bifunctors, lens, mtl, semigroupoids
+     , semigroups, transformers
      }:
      mkDerivation {
        pname = "notzero";
-       version = "0.0.11";
-       sha256 = "0sqqffk1znyh7ghbx9ayr2khzxh5g07jjlarx78c051rb2sgdy77";
+       version = "0.1";
+       sha256 = "0l9z10njx18vp7xxcb0gys9dyq2g7i8i5mczymfknwdv9x3v2jk5";
        libraryHaskellDepends = [
          base bifunctors lens mtl semigroupoids semigroups transformers
        ];
-       testHaskellDepends = [
-         base directory doctest filepath QuickCheck template-haskell
-       ];
        description = "A data type for representing numeric values, except zero";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -149506,18 +150298,19 @@ self: {
   "odpic-raw" = callPackage
     ({ mkDerivation, base, c2hs, conduit, hspec, monad-control
      , monad-logger, odpic, QuickCheck, resourcet, text, time
+     , unliftio-core
      }:
      mkDerivation {
        pname = "odpic-raw";
-       version = "0.1.11";
-       sha256 = "0via5p0sfma91ny5rw87sirmp4189663ww25dfwi6jlha4d82hlh";
+       version = "0.2.0";
+       sha256 = "0g83ag8ggcwmf82zghzdds990l5hvcfiv85rlj95phb0lpdskj5m";
        libraryHaskellDepends = [
-         base conduit monad-control resourcet text time
+         base conduit monad-control resourcet text time unliftio-core
        ];
        librarySystemDepends = [ odpic ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
-         base conduit hspec monad-logger QuickCheck resourcet
+         base conduit hspec monad-logger QuickCheck resourcet text
        ];
        description = "Oracle Database Bindings";
        license = stdenv.lib.licenses.bsd3;
@@ -150037,14 +150830,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "online_0_2_3_0" = callPackage
+  "online_0_3_0_0" = callPackage
     ({ mkDerivation, base, doctest, foldl, numhask-prelude, protolude
      , tasty, tdigest, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "online";
-       version = "0.2.3.0";
-       sha256 = "04yh51gdmb2nycsxjrfzkb07byxdmn1n9wrk7wv7nh3ki7jxi15d";
+       version = "0.3.0.0";
+       sha256 = "056a9dkrzfgj0wf9f9d9d25f6yc03jx9z0p0z5xm8n8brk6b3bds";
        libraryHaskellDepends = [
          base foldl numhask-prelude protolude tdigest vector
          vector-algorithms
@@ -151581,8 +152374,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.2.0";
-       sha256 = "1xx0mqq4c2war7ykr7md67dhhgh7h74b5j25arh1im7hgn1iy52x";
+       version = "0.2.1";
+       sha256 = "1zpkj3f0gdi5ri39s7g532j2pgk5mgs97y2g1gj42q9aa5lm5hw5";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
@@ -152467,8 +153260,8 @@ self: {
        pname = "pandoc";
        version = "2.1.2";
        sha256 = "0rgba2vfh2n7kh2g75hmxa6pbjk6p73a4zwj00pfsvhwyvpjc2yw";
-       revision = "1";
-       editedCabalFile = "1vk5g5dbk7q8w9pncqgkn4wbdj83p20ca6ipb5vca532x2294x5b";
+       revision = "2";
+       editedCabalFile = "0s7hhycdkjqw4sd6qj4n7lrf76aa4yaw4kaq35ivpjin7hrf011j";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -155764,14 +156557,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "perf_0_4_0_1" = callPackage
+  "perf_0_4_1_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, doctest, foldl, rdtsc
      , text, time, transformers
      }:
      mkDerivation {
        pname = "perf";
-       version = "0.4.0.1";
-       sha256 = "1am2wzj43gi0naz5mwpvja9i005g05d6gpkqw0qvdy63mddz9b96";
+       version = "0.4.1.0";
+       sha256 = "1z0128fnqlraj8sj26fsfy9izfr1ld3k5c3sh0471fh36vf507c8";
        libraryHaskellDepends = [
          base containers deepseq foldl rdtsc text time transformers
        ];
@@ -155781,6 +156574,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "perf-analysis" = callPackage
+    ({ mkDerivation, base, containers, deepseq, formatting
+     , optparse-generic, perf, protolude, scientific, tdigest, text
+     , vector
+     }:
+     mkDerivation {
+       pname = "perf-analysis";
+       version = "0.0.1.1";
+       sha256 = "1rjig10c7cy3lck2cvjs6drwrakb65mqhjgs6aakb07yjjl536pn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base deepseq formatting perf protolude scientific tdigest text
+         vector
+       ];
+       executableHaskellDepends = [
+         base containers deepseq formatting optparse-generic perf protolude
+         scientific tdigest text vector
+       ];
+       description = "analysis example using perf";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "perfect-hash-generator" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, data-ordlist
      , directory, filepath, hashable, HUnit, optparse-applicative
@@ -155904,11 +156720,14 @@ self: {
      }) {};
 
   "permutation" = callPackage
-    ({ mkDerivation, base, ghc-prim, QuickCheck }:
+    ({ mkDerivation, base, Cabal, ghc-prim, process, QuickCheck }:
      mkDerivation {
        pname = "permutation";
        version = "0.5.0.5";
        sha256 = "005737s6k9dfpjmjf41m3k1wc31c2kql08ig7fd6npk22nhwmdai";
+       revision = "1";
+       editedCabalFile = "0lrargadwkwzzvajfiay8vkq1byh56kbr2h9ba9cfbpqwb4s90j9";
+       setupHaskellDepends = [ base Cabal process ];
        libraryHaskellDepends = [ base ghc-prim QuickCheck ];
        description = "A library for permutations and combinations";
        license = stdenv.lib.licenses.bsd3;
@@ -157023,8 +157842,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.23.0";
-       sha256 = "139fjsyximny4ikgqrjxx9pg4spkz8s1fh6b3a9xgrsyya4r1sw7";
+       version = "0.0.24.0";
+       sha256 = "1kk8bfvai1196960cqq6zg5xhs15jzwllw57n247csiifijs0b0v";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -158181,6 +159000,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-fluid_0_6_0_1" = callPackage
+    ({ mkDerivation, async, base, constraints, hspec, lens
+     , lifted-async, mmorph, monad-control, mtl, pipes
+     , pipes-concurrency, pipes-misc, semigroups, stm, these
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "pipes-fluid";
+       version = "0.6.0.1";
+       sha256 = "01ig0czixnf5fypnfns2kzna676vd3mr2a52fb9f4cg7yy6qwp8h";
+       libraryHaskellDepends = [
+         base constraints lens lifted-async monad-control pipes semigroups
+         stm these transformers transformers-base
+       ];
+       testHaskellDepends = [
+         async base constraints hspec lens lifted-async mmorph monad-control
+         mtl pipes pipes-concurrency pipes-misc stm transformers
+       ];
+       description = "Reactively combines Producers so that a value is yielded as soon as possible";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-group" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
@@ -161525,15 +162367,15 @@ self: {
      }) {};
 
   "potoki-cereal" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring, cereal, potoki
+    ({ mkDerivation, base, base-prelude, bytestring, cereal
      , potoki-core, text
      }:
      mkDerivation {
        pname = "potoki-cereal";
-       version = "0.1.6";
-       sha256 = "0mr3wv8mx88xzbkcrndq833wcq753dyp9z4610pxa34cfalnbvhf";
+       version = "0.2";
+       sha256 = "06fb615lki0pa341a8fv68vkyw13zax4zw6cappnffqccplvdhyg";
        libraryHaskellDepends = [
-         base base-prelude bytestring cereal potoki potoki-core text
+         base base-prelude bytestring cereal potoki-core text
        ];
        description = "Streaming serialization";
        license = stdenv.lib.licenses.mit;
@@ -161541,18 +162383,24 @@ self: {
      }) {};
 
   "potoki-core" = callPackage
-    ({ mkDerivation, base, profunctors, QuickCheck
-     , quickcheck-instances, rerebase, stm, tasty, tasty-hunit
-     , tasty-quickcheck
+    ({ mkDerivation, acquire, attoparsec, base, base-prelude
+     , bytestring, directory, foldl, hashable, profunctors, ptr
+     , QuickCheck, quickcheck-instances, random, rerebase, stm, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers, unagi-chan
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "1.5.2";
-       sha256 = "1qkr3g7xfbkmvy2a4gcy0zxg22000mxdgw0dapq16pymj9wqf2si";
-       libraryHaskellDepends = [ base profunctors stm ];
+       version = "2";
+       sha256 = "13zgqw4csypx5m97xfpbxxxic7rxms0xrz6wz5kk5x2pn6i9mgjl";
+       libraryHaskellDepends = [
+         acquire attoparsec base base-prelude bytestring directory foldl
+         hashable profunctors ptr stm text transformers unagi-chan
+         unordered-containers vector
+       ];
        testHaskellDepends = [
-         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
-         tasty-quickcheck
+         attoparsec QuickCheck quickcheck-instances random rerebase tasty
+         tasty-hunit tasty-quickcheck
        ];
        description = "Low-level components of \"potoki\"";
        license = stdenv.lib.licenses.mit;
@@ -162857,6 +163705,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "primitive_0_6_4_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, transformers }:
+     mkDerivation {
+       pname = "primitive";
+       version = "0.6.4.0";
+       sha256 = "0r0cda7acvplgwaxy69kviv4jp7kkfi038by68gj4yfx4iwszgjc";
+       libraryHaskellDepends = [ base ghc-prim transformers ];
+       description = "Primitive memory-related operations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "primitive-checked" = callPackage
     ({ mkDerivation, base, primitive }:
      mkDerivation {
@@ -162883,6 +163743,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "primitive-sort" = callPackage
+    ({ mkDerivation, base, containers, contiguous, doctest, gauge
+     , ghc-prim, HUnit, primitive, QuickCheck, random, smallcheck, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "primitive-sort";
+       version = "0.1.0.0";
+       sha256 = "147y4y8v00yggfgyf70kzd3pd9r6jvgxkzjsy3xpbp6mjdnzrbm3";
+       libraryHaskellDepends = [ base contiguous ghc-prim primitive ];
+       testHaskellDepends = [
+         base containers doctest HUnit primitive QuickCheck smallcheck tasty
+         tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
+       description = "Sort primitive arrays";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "primula-board" = callPackage
     ({ mkDerivation, base, ConfigFile, containers, directory, happstack
      , happstack-helpers, happstack-server, happstack-state, hsp
@@ -166160,8 +167039,8 @@ self: {
      }:
      mkDerivation {
        pname = "qr-imager";
-       version = "2.0.0.0";
-       sha256 = "01886bwkap8qk39iihlyrfa9g8cw6sicrynwk7r24nd5ib60csc3";
+       version = "2.0.0.1";
+       sha256 = "0n3f5zhyp0pvrb4ixvrvzs9af2x1mjprlnyjbhhldb3rc64jl7yd";
        libraryHaskellDepends = [
          base binary bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels microlens process split vector
@@ -168813,8 +169692,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "4.0.9";
-       sha256 = "0wz36zclpckkm8w7mmdzbklrr08ggyqsk7j4wfxbh4gxa0ry7yj5";
+       version = "4.1.0";
+       sha256 = "1skamrpkz8p9i19anyp0lqcncsa1zwzcikcxlm3gmrgqf2hq0m0i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -169822,8 +170701,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "1.2.3";
-       sha256 = "1glnxvgf79qm2iz4xxdn6zygjff42cyakk1nah2wrzkkrr11axqk";
+       version = "1.2.4";
+       sha256 = "1gah2qwfpzwamnikbc5h4nv6dgvv9h16di9ka7946za3nibyasya";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
          contravariant-extras deepseq dlist either fail hashable mtl
@@ -170500,6 +171379,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "refined_0_2_3_0" = callPackage
+    ({ mkDerivation, base, containers, exceptions, mtl, prettyprinter
+     , template-haskell, these, transformers
+     }:
+     mkDerivation {
+       pname = "refined";
+       version = "0.2.3.0";
+       sha256 = "1xc4qg2xibf2j0k6dwjj2sp5s58cj4dwcri6zrn42460wxnvyjk6";
+       libraryHaskellDepends = [
+         base containers exceptions mtl prettyprinter template-haskell these
+         transformers
+       ];
+       description = "Refinement types with static and runtime checking";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reflection" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -172840,22 +173736,26 @@ self: {
      }) {};
 
   "require" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, tasty, tasty-hspec
-     , text, universum
+    ({ mkDerivation, base, bytestring, criterion, megaparsec, tasty
+     , tasty-hspec, text, universum
      }:
      mkDerivation {
        pname = "require";
-       version = "0.0.1";
-       sha256 = "04zi13y2xzgwrw4n0z2l7ii8rkl2d78n0cwq1xi2v5amr3kb8jjn";
+       version = "0.2.1";
+       sha256 = "0cf19mcjmqn50gz2fc32b67s8za6bb7i2k0h6sj25b457xv9rdx2";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring text universum ];
-       executableHaskellDepends = [ base bytestring text universum ];
+       libraryHaskellDepends = [
+         base bytestring megaparsec text universum
+       ];
+       executableHaskellDepends = [
+         base bytestring megaparsec text universum
+       ];
        testHaskellDepends = [
-         base bytestring tasty tasty-hspec text universum
+         base bytestring megaparsec tasty tasty-hspec text universum
        ];
        benchmarkHaskellDepends = [
-         base bytestring criterion text universum
+         base bytestring criterion megaparsec text universum
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
@@ -172865,8 +173765,8 @@ self: {
     ({ mkDerivation, rebase }:
      mkDerivation {
        pname = "rerebase";
-       version = "1.2.1";
-       sha256 = "02j119pabivn2x23mvvmzlkypxwi31p7s2fpakavhqfs6bmbnb2a";
+       version = "1.2.2";
+       sha256 = "11v6rmz7ql2rdx6mhb3lsal952lwihclfhh0m7fcnii5br0906ks";
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
@@ -178903,8 +179803,8 @@ self: {
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.2.0.0";
-       sha256 = "1p1z4zy7s7j4sxx45lcspxvxf10v6vx80vgrw52acgbqnfairg7c";
+       version = "0.2.1";
+       sha256 = "0as9qxqh1pc695ds7kah5x241psnmfsp9hz2ilvvl73yanfg7j90";
        libraryHaskellDepends = [
          base binary bytestring Cabal extra file-embed path path-io process
          unix-compat
@@ -180208,30 +181108,52 @@ self: {
      }) {};
 
   "servant-checked-exceptions" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
-     , hspec-wai, http-media, http-types, profunctors, servant
-     , servant-client, servant-client-core, servant-docs, servant-server
-     , tagged, tasty, tasty-hspec, tasty-hunit, text, wai
+    ({ mkDerivation, aeson, base, bytestring, deepseq, hspec-wai
+     , http-media, http-types, profunctors, servant
+     , servant-checked-exceptions-core, servant-client
+     , servant-client-core, servant-docs, servant-server, tagged, tasty
+     , tasty-hspec, tasty-hunit, text, wai, world-peace
      }:
      mkDerivation {
        pname = "servant-checked-exceptions";
-       version = "1.1.0.0";
-       sha256 = "1zvpha9czj4pnvdd53qcyl609x3w1hkaqxva7hk68bk65zd296jk";
+       version = "2.0.0.0";
+       sha256 = "127nav7z2zkgfgzpjjprqb6s55mbdj9z2p05knjx3mangs2q5wm7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring deepseq http-media http-types profunctors
-         servant servant-client servant-client-core servant-docs
-         servant-server tagged text wai
+         servant servant-checked-exceptions-core servant-client
+         servant-client-core servant-docs servant-server tagged text wai
+         world-peace
        ];
        testHaskellDepends = [
-         base bytestring doctest Glob hspec-wai http-types servant
-         servant-server tasty tasty-hspec tasty-hunit wai
+         base bytestring hspec-wai http-types servant servant-server tasty
+         tasty-hspec tasty-hunit wai
        ];
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-checked-exceptions-core" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob
+     , http-media, http-types, profunctors, servant, servant-docs
+     , tagged, text, world-peace
+     }:
+     mkDerivation {
+       pname = "servant-checked-exceptions-core";
+       version = "2.0.0.0";
+       sha256 = "0j5j7ai1b7nnsvzal27jy6hamwx5i2pyc1f6mmmb06r40cs53lxa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring deepseq http-media http-types profunctors
+         servant servant-docs tagged text world-peace
+       ];
+       testHaskellDepends = [ base doctest Glob ];
+       description = "Checked exceptions for Servant APIs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servant-client" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , containers, deepseq, exceptions, generics-sop, hspec
@@ -181689,8 +182611,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.5.0";
-       sha256 = "0di9l77x6skbf26vic4sg83187lgkc98yzakip1ix5d9a45niz6m";
+       version = "0.5.2";
+       sha256 = "1nsxc9kif57fvr6j1pp116llbmyb1ngvzgndcfjwvdbscl23jfwg";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -182242,28 +183164,29 @@ self: {
 
   "sexp-grammar" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
-     , criterion, happy, mtl, prettyprinter, profunctors, QuickCheck
-     , scientific, semigroups, split, tagged, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, text, transformers
+     , criterion, deepseq, happy, invertible-grammar, prettyprinter
+     , QuickCheck, recursion-schemes, scientific, semigroups, split
+     , tasty, tasty-hunit, tasty-quickcheck, text, utf8-string
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.3.0";
-       sha256 = "0h9b9rmymfy0qwr51yllapmp7g0j3f70pmhwyzag782giff8q0x3";
+       version = "2.0.0";
+       sha256 = "1wf9mrmz89kcvrkyif5mp0wwqxgg363f3jc7y9sf370qc4frm68p";
        libraryHaskellDepends = [
-         array base bytestring containers mtl prettyprinter profunctors
-         scientific semigroups split tagged template-haskell text
-         transformers
+         array base bytestring containers deepseq invertible-grammar
+         prettyprinter recursion-schemes scientific semigroups split text
+         utf8-string
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
-         base QuickCheck scientific semigroups tasty tasty-hunit
-         tasty-quickcheck text
+         base containers invertible-grammar prettyprinter QuickCheck
+         scientific semigroups tasty tasty-hunit tasty-quickcheck text
+         utf8-string
        ];
        benchmarkHaskellDepends = [
-         base bytestring criterion scientific semigroups text
+         base bytestring criterion deepseq text
        ];
-       description = "Invertible parsers for S-expressions";
+       description = "Invertible grammar combinators for S-expressions";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -182600,8 +183523,8 @@ self: {
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.11.0.3";
-       sha256 = "0v5n7l3xx1a0y4vvrn0zi61pb3wd41pqh1g3vnq1dr12dhrrx1ac";
+       version = "2.11.0.4";
+       sha256 = "0c7jbbq69y0v6244c6fx6kw9sp8sl5kkmnrfcryfwdgahj3psnp4";
        libraryHaskellDepends = [
          base Cabal cdeps composition-prelude cpphs directory shake
          template-haskell
@@ -183288,30 +184211,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "shelly_1_8_0" = callPackage
+  "shelly_1_8_1" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, directory
      , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
      , HUnit, lifted-async, lifted-base, monad-control, mtl, process
      , system-fileio, system-filepath, text, time, transformers
-     , transformers-base, unix-compat
+     , transformers-base, unix, unix-compat
      }:
      mkDerivation {
        pname = "shelly";
-       version = "1.8.0";
-       sha256 = "1y08pdw49yk4hbipgfwjab0wa85ng0mkypch5l0p53frykjm2zvk";
+       version = "1.8.1";
+       sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions lifted-async lifted-base monad-control mtl process
          system-fileio system-filepath text time transformers
-         transformers-base unix-compat
+         transformers-base unix unix-compat
        ];
        testHaskellDepends = [
          async base bytestring containers directory enclosed-exceptions
          exceptions filepath hspec hspec-contrib HUnit lifted-async
          lifted-base monad-control mtl process system-fileio system-filepath
-         text time transformers transformers-base unix-compat
+         text time transformers transformers-base unix unix-compat
        ];
        description = "shell-like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -184931,8 +185854,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "simtreelo";
-       version = "0.1.1.2";
-       sha256 = "1wn3hycwn0i25jad096g6hzkxrm64j2hpjdpp8lr69mdrcmn2gmx";
+       version = "0.1.1.3";
+       sha256 = "148j6z8rxqaiwfjgxz780fy8w8xv8a8gwida61lfir677jlkwgh9";
        libraryHaskellDepends = [ base containers ];
        description = "Loader for data organized in a tree";
        license = stdenv.lib.licenses.gpl3;
@@ -185225,8 +186148,8 @@ self: {
     ({ mkDerivation, base, bytestring, containers, lens, mtl }:
      mkDerivation {
        pname = "sixty-five-oh-two";
-       version = "1.1.0.0";
-       sha256 = "1jw86xxim016gqws34diabdlrlilypg22s6670n7x887sjc1bkz6";
+       version = "1.2.0.0";
+       sha256 = "0xxx8k6zx8h2a3ddgic5k52nhzlxz8r7kkfmsyhaycwhkrgkfvsq";
        libraryHaskellDepends = [ base bytestring containers lens mtl ];
        testHaskellDepends = [ base bytestring containers lens mtl ];
        description = "An eDSL for writing 65(C)02 bytecode";
@@ -188864,8 +189787,8 @@ self: {
      }:
      mkDerivation {
        pname = "sparrow";
-       version = "0.0.2.0";
-       sha256 = "061bjgrvvvv2n6bhn0lz6sd5c7mc63nb2b83rbpgdx3am68mk9gf";
+       version = "0.0.2.1";
+       sha256 = "1j20536pjp4m26l8zvsaf8wv0vvj0fkwid1nkljl6zkggaqq5b8f";
        libraryHaskellDepends = [
          aeson aeson-attoparsec async attoparsec attoparsec-uri base
          bytestring deepseq exceptions extractable-singleton hashable
@@ -189201,6 +190124,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "speechmatics" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, hspec
+     , http-client, http-client-openssl, http-types, json-autotype, lens
+     , mime-types, neat-interpolation, options, SHA, text, wreq
+     }:
+     mkDerivation {
+       pname = "speechmatics";
+       version = "0.4.0.0";
+       sha256 = "0lnv4rq0iaj4j9mf49ws43p9ajini1q1vzj4yyvlnpwikkn6yk67";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring HsOpenSSL http-client http-client-openssl
+         http-types json-autotype lens mime-types text wreq
+       ];
+       executableHaskellDepends = [
+         base bytestring mime-types options SHA text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec neat-interpolation text
+       ];
+       description = "Speechmatics api client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "speedy-slice" = callPackage
     ({ mkDerivation, base, containers, kan-extensions, lens, mcmc-types
      , mwc-probability, pipes, primitive, transformers
@@ -190598,8 +191546,8 @@ self: {
        pname = "stack";
        version = "1.7.1";
        sha256 = "17rjc9fz1hn56jz4bnhhm50h5x71r69jizlw6dx7kfvm57hg5i0r";
-       revision = "3";
-       editedCabalFile = "0ni953da0qiscnvbx70pd89myy2qq3chgkghmw6wg9xhzcz7nwgp";
+       revision = "4";
+       editedCabalFile = "06imaj3adll2lwfivkv3axzfkaj6nfp0vbq6vsmpknw0r8s32xad";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -192414,15 +193362,18 @@ self: {
      }) {};
 
   "stocks" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, http-conduit, semigroups
+    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
+     , HUnit, semigroups, unordered-containers
      }:
      mkDerivation {
        pname = "stocks";
-       version = "0.1.0.0";
-       sha256 = "10ws7mg0236iqkjclajwph2lb5719adkay5imaxrsj13d10f8ssq";
+       version = "0.2.0.0";
+       sha256 = "1rbspmxw81739hjzj5bd365zm9jqmsq5lv70d3wc8vvvf92zimi9";
        libraryHaskellDepends = [
-         aeson base bytestring http-conduit semigroups
+         aeson base bytestring containers http-conduit semigroups
+         unordered-containers
        ];
+       testHaskellDepends = [ base bytestring HUnit ];
        description = "Library for the IEX Trading API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192677,6 +193628,58 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "store_0_5_0" = callPackage
+    ({ mkDerivation, array, async, base, base-orphans
+     , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector
+     , containers, contravariant, criterion, cryptohash, deepseq
+     , directory, filepath, free, ghc-prim, hashable, hspec
+     , hspec-smallcheck, integer-gmp, lifted-base, monad-control
+     , mono-traversable, network, primitive, resourcet, safe, semigroups
+     , smallcheck, store-core, syb, template-haskell, text, th-lift
+     , th-lift-instances, th-orphans, th-reify-many, th-utilities, time
+     , transformers, unordered-containers, vector
+     , vector-binary-instances, void, weigh
+     }:
+     mkDerivation {
+       pname = "store";
+       version = "0.5.0";
+       sha256 = "1ivr2pvfja2plhp625wjv9lbd47vmydp33f31ljwdyzqik2j7vij";
+       libraryHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring containers contravariant cryptohash deepseq directory
+         filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp
+         lifted-base monad-control mono-traversable network primitive
+         resourcet safe semigroups smallcheck store-core syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       testHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring cereal cereal-vector containers contravariant criterion
+         cryptohash deepseq directory filepath free ghc-prim hashable hspec
+         hspec-smallcheck integer-gmp lifted-base monad-control
+         mono-traversable network primitive resourcet safe semigroups
+         smallcheck store-core syb template-haskell text th-lift
+         th-lift-instances th-orphans th-reify-many th-utilities time
+         transformers unordered-containers vector vector-binary-instances
+         void weigh
+       ];
+       benchmarkHaskellDepends = [
+         array async base base-orphans base64-bytestring bifunctors
+         bytestring containers contravariant criterion cryptohash deepseq
+         directory filepath free ghc-prim hashable hspec hspec-smallcheck
+         integer-gmp lifted-base monad-control mono-traversable network
+         primitive resourcet safe semigroups smallcheck store-core syb
+         template-haskell text th-lift th-lift-instances th-orphans
+         th-reify-many th-utilities time transformers unordered-containers
+         vector void
+       ];
+       description = "Fast binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "store-core" = callPackage
     ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
      , transformers
@@ -192692,6 +193695,44 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "store-core_0_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, primitive, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "store-core";
+       version = "0.4.3";
+       sha256 = "0fx4ylhqm79pi6k8qzby6nb0d7nlq5za8n3fir1v97wl34vmr3gf";
+       libraryHaskellDepends = [
+         base bytestring ghc-prim primitive text transformers
+       ];
+       description = "Fast and lightweight binary serialization";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "store-streaming" = callPackage
+    ({ mkDerivation, async, base, bytestring, conduit, free, hspec
+     , hspec-smallcheck, network, resourcet, smallcheck, store
+     , store-core, streaming-commons, text, transformers, void
+     }:
+     mkDerivation {
+       pname = "store-streaming";
+       version = "0.1.0.0";
+       sha256 = "04vsglnxqgznnacgmb34z3dsb7pz1kmc2fis1ij5p7k740c9gn2g";
+       libraryHaskellDepends = [
+         async base bytestring conduit free resourcet store store-core
+         streaming-commons text transformers
+       ];
+       testHaskellDepends = [
+         async base bytestring conduit free hspec hspec-smallcheck network
+         resourcet smallcheck store store-core streaming-commons text
+         transformers void
+       ];
+       description = "Streaming interfaces for `store`";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "str" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, Crypto
      , hashable, MissingH, text, utf8-string
@@ -192732,15 +193773,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_23_0" = callPackage
+  "stratosphere_0_24_0" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.23.0";
-       sha256 = "0np2rxcs0fld06ihldgmi9i61344dx64w1dz0vlfrnkrcjpkqhif";
+       version = "0.24.0";
+       sha256 = "02hpx1j1s4rjgf39qg9vxmdqvvb2il0w291gv8819fzmrrifhym5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194727,6 +195768,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "summoner" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, directory
+     , filepath, generic-deriving, hedgehog, neat-interpolation
+     , optparse-applicative, process, tasty, tasty-discover
+     , tasty-hedgehog, text, time, tomland, universum
+     }:
+     mkDerivation {
+       pname = "summoner";
+       version = "1.0.2";
+       sha256 = "164mcpcjmbqrpdxaw693394s15f13i8mvxaq7ib7rflavkjdm8qh";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring directory filepath
+         generic-deriving neat-interpolation optparse-applicative process
+         text time tomland universum
+       ];
+       executableHaskellDepends = [ base universum ];
+       testHaskellDepends = [
+         base hedgehog tasty tasty-hedgehog universum
+       ];
+       testToolDepends = [ tasty-discover ];
+       description = "Tool for creating completely configured production Haskell projects";
+       license = stdenv.lib.licenses.mpl20;
+     }) {};
+
   "sump" = callPackage
     ({ mkDerivation, base, bytestring, data-default, lens, serialport
      , transformers, vector
@@ -197001,8 +198068,8 @@ self: {
      }) {};
 
   "taffybar" = callPackage
-    ({ mkDerivation, alsa-mixer, base, cairo, ConfigFile, containers
-     , dbus, dbus-hslogger, directory, dyre, either, enclosed-exceptions
+    ({ mkDerivation, base, cairo, ConfigFile, containers, dbus
+     , dbus-hslogger, directory, dyre, either, enclosed-exceptions
      , filepath, gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gdkx11, gi-glib
      , gi-gtk, gi-gtk-hs, glib, gtk-sni-tray, gtk-strut, gtk-traymanager
      , gtk3, haskell-gi, haskell-gi-base, hslogger, HStringTemplate
@@ -197015,16 +198082,16 @@ self: {
      }:
      mkDerivation {
        pname = "taffybar";
-       version = "2.1.0";
-       sha256 = "1a32wpxjyimn08pmbwwx7crn97hg9wmlva5f0blkw4cwv090jhh8";
+       version = "2.1.1";
+       sha256 = "13bp0ydwb26k8y4f3cn47qy24lwxfx9v7ysm1q0r8iksjg9a6lhk";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         alsa-mixer base cairo ConfigFile containers dbus dbus-hslogger
-         directory dyre either enclosed-exceptions filepath gi-cairo gi-gdk
-         gi-gdkpixbuf gi-gdkx11 gi-glib gi-gtk gi-gtk-hs glib gtk-sni-tray
-         gtk-strut gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger
+         base cairo ConfigFile containers dbus dbus-hslogger directory dyre
+         either enclosed-exceptions filepath gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gdkx11 gi-glib gi-gtk gi-gtk-hs glib gtk-sni-tray gtk-strut
+         gtk-traymanager gtk3 haskell-gi haskell-gi-base hslogger
          HStringTemplate HTTP multimap network network-uri old-locale parsec
          process rate-limit regex-compat safe split status-notifier-item stm
          template-haskell text time time-locale-compat time-units
@@ -197980,12 +199047,12 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-dejafu_1_2_0_2" = callPackage
+  "tasty-dejafu_1_2_0_4" = callPackage
     ({ mkDerivation, base, dejafu, random, tagged, tasty }:
      mkDerivation {
        pname = "tasty-dejafu";
-       version = "1.2.0.2";
-       sha256 = "145w018mv8928g9bbp5pjwzciyfspxxqdg5grzq0mlpydkpmmgr5";
+       version = "1.2.0.4";
+       sha256 = "151cr15l4v1p1zlfps4q3wv26v2mhcnplnnx03lmcq9di21y95yn";
        libraryHaskellDepends = [ base dejafu random tagged tasty ];
        description = "Deja Fu support for the Tasty test framework";
        license = stdenv.lib.licenses.mit;
@@ -198865,6 +199932,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "telegram-bot-simple" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron
+     , hashable, http-api-data, http-client, http-client-tls
+     , monad-control, mtl, pretty-show, profunctors, servant
+     , servant-client, split, stm, template-haskell, text, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "telegram-bot-simple";
+       version = "0.2.0";
+       sha256 = "1aafj27zj69hvzxv58cz7h8pjbc9c74hmg92swg2sy8ai1rcb34a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring cron hashable http-api-data
+         http-client http-client-tls monad-control mtl pretty-show
+         profunctors servant servant-client split stm template-haskell text
+         time transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring cron hashable http-api-data
+         http-client http-client-tls monad-control mtl pretty-show
+         profunctors servant servant-client split stm template-haskell text
+         time transformers unordered-containers
+       ];
+       description = "Easy to use library for building Telegram bots";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "teleport" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring
      , configurator, optparse-applicative, system-filepath, text, turtle
@@ -203730,8 +204826,8 @@ self: {
      }:
      mkDerivation {
        pname = "tintin";
-       version = "1.4.6";
-       sha256 = "012mvfwn9dy50xpmi4hgf5rq7k4660fjbwdhs3f02x0wndh77n49";
+       version = "1.8.0";
+       sha256 = "1i5hdyxrrflxbw59i55p7bxfn75m2j6dmn7h43f9qwcgn6fv3l3y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -210421,6 +211517,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unpacked-these" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck
+     , quickcheck-classes, these, unpacked-maybe
+     }:
+     mkDerivation {
+       pname = "unpacked-these";
+       version = "0.1.0.0";
+       sha256 = "18m0ynw9dnyfkk4nvkfp0qjhzwis5696si3cvkh5chpqm6m725sv";
+       libraryHaskellDepends = [
+         base deepseq ghc-prim these unpacked-maybe
+       ];
+       testHaskellDepends = [ base QuickCheck quickcheck-classes ];
+       description = "An unpacked these data type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "unpacked-validation" = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck
+     , quickcheck-classes, unpacked-either, validation
+     }:
+     mkDerivation {
+       pname = "unpacked-validation";
+       version = "0.1.0.0";
+       sha256 = "058lp5b4cpyksmpnzj5v1vckbaa22mclprfqq9bl619vpr3y0gg2";
+       libraryHaskellDepends = [
+         base deepseq ghc-prim unpacked-either validation
+       ];
+       testHaskellDepends = [ base QuickCheck quickcheck-classes ];
+       description = "An unpacked validation data type";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unroll-ghc-plugin" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
@@ -212504,6 +213632,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vault_0_3_1_1" = callPackage
+    ({ mkDerivation, base, containers, hashable, semigroups
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "vault";
+       version = "0.3.1.1";
+       sha256 = "0a1fir7gvbj2w894daac5c4c3gy36r6c74yci78lb2nvk431b95j";
+       libraryHaskellDepends = [
+         base containers hashable semigroups unordered-containers
+       ];
+       description = "a persistent store for values of arbitrary types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vault-tool" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client
      , http-client-tls, http-types, text, unordered-containers
@@ -217010,6 +218154,84 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "webex-teams-api" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
+     , bytestring, conduit, data-default, hspec, http-conduit
+     , http-types, network-uri, optparse-applicative, text, utf8-string
+     , wai, warp
+     }:
+     mkDerivation {
+       pname = "webex-teams-api";
+       version = "0.2.0.0";
+       sha256 = "02x4g10r0rl1g4fbqkj8zxcbz64g8dck4d77f0gswkadsn5y6mkp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bitset-word8 bytestring conduit data-default
+         http-conduit network-uri text
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring data-default http-conduit
+         optparse-applicative text utf8-string
+       ];
+       testHaskellDepends = [
+         aeson async attoparsec base bytestring data-default hspec
+         http-conduit http-types network-uri text wai warp
+       ];
+       description = "A Haskell bindings for Webex Teams API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "webex-teams-conduit" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, conduit
+     , data-default, hspec, http-client, http-conduit, http-types
+     , network-uri, optparse-applicative, text, utf8-string, wai, warp
+     , webex-teams-api
+     }:
+     mkDerivation {
+       pname = "webex-teams-conduit";
+       version = "0.2.0.0";
+       sha256 = "0p9ffj3qm84c7m4w5bfpn53vcs96p7gdlyk87mjmc9h9i6v7sz0d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base conduit webex-teams-api ];
+       executableHaskellDepends = [
+         base bytestring conduit data-default http-client
+         optparse-applicative text utf8-string webex-teams-api
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring conduit data-default hspec http-conduit
+         http-types network-uri text wai warp webex-teams-api
+       ];
+       description = "Conduit wrapper of Webex Teams List API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "webex-teams-pipes" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, data-default
+     , hspec, http-client, http-conduit, http-types, network-uri
+     , optparse-applicative, pipes, text, utf8-string, wai, warp
+     , webex-teams-api
+     }:
+     mkDerivation {
+       pname = "webex-teams-pipes";
+       version = "0.2.0.0";
+       sha256 = "001ilf2yj6q8rqcagjlh28rad191jyjjr1cpk6cf84v66isdbykp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base pipes webex-teams-api ];
+       executableHaskellDepends = [
+         base bytestring data-default http-client optparse-applicative pipes
+         text utf8-string webex-teams-api
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring data-default hspec http-conduit
+         http-types network-uri pipes text wai warp webex-teams-api
+       ];
+       description = "Pipes wrapper of Webex Teams List API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "webfinger-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default-class
      , hashable, http-client, http-client-tls, http-types
@@ -217242,6 +218464,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "websockets_0_12_5_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
+     , streaming-commons, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "websockets";
+       version = "0.12.5.0";
+       sha256 = "19vp0mjpib66980q12iv7xkc6j82nkwlyiir0n964nyzl478v3rd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers entropy network
+         random SHA streaming-commons text
+       ];
+       testHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers entropy HUnit
+         network QuickCheck random SHA streaming-commons test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+       ];
+       benchmarkHaskellDepends = [
+         attoparsec base base64-bytestring binary bytestring
+         bytestring-builder case-insensitive containers criterion entropy
+         network random SHA text
+       ];
+       doCheck = false;
+       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "websockets-rpc" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , exceptions, hashable, monad-control, mtl, QuickCheck
@@ -217909,6 +219166,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "winery" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hashable, mtl
+     , prettyprinter, prettyprinter-ansi-terminal, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "winery";
+       version = "0";
+       sha256 = "0bhgiw2zljr50cyhfc8rzkd217g8mvl56f82ys5z0kvr5gp8mjdw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers hashable mtl prettyprinter
+         prettyprinter-ansi-terminal text transformers unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [
+         base bytestring containers hashable mtl prettyprinter
+         prettyprinter-ansi-terminal text transformers unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers hashable mtl prettyprinter
+         prettyprinter-ansi-terminal text transformers unordered-containers
+         vector
+       ];
+       description = "Sustainable serialisation library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "winio" = callPackage
     ({ mkDerivation, base, bytestring, extensible-exceptions, kernel32
      , network, winerror, ws2_32
@@ -219368,7 +220655,7 @@ self: {
 
   "wxc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , libX11, mesa, process, split, wxdirect, wxGTK
+     , libGL, libX11, process, split, wxdirect, wxGTK
      }:
      mkDerivation {
        pname = "wxc";
@@ -219380,7 +220667,7 @@ self: {
          base bytestring Cabal directory filepath process split
        ];
        libraryHaskellDepends = [ base split wxdirect ];
-       librarySystemDepends = [ libX11 mesa ];
+       librarySystemDepends = [ libGL libX11 ];
        libraryPkgconfigDepends = [ wxGTK ];
        doHaddock = false;
        postInstall = "cp -v dist/build/libwxc.so.0.92.3.0 $out/lib/libwxc.so";
@@ -219388,7 +220675,7 @@ self: {
        description = "wxHaskell C++ wrapper";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; 
+     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
          inherit (pkgs) wxGTK;};
 
   "wxcore" = callPackage
@@ -222041,6 +223328,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yaml-pretty-extras" = callPackage
+    ({ mkDerivation, base, bytestring, errors, hspec, mtl, text, yaml
+     }:
+     mkDerivation {
+       pname = "yaml-pretty-extras";
+       version = "0.0.1.1";
+       sha256 = "1xb4f76w1sqhv7bkjzzyn13x13ldzpbmnn9kqkq0lzs8zlcyyyjn";
+       libraryHaskellDepends = [ base bytestring errors mtl text yaml ];
+       testHaskellDepends = [
+         base bytestring errors hspec mtl text yaml
+       ];
+       description = "Extra functionality for pretty printing Yaml documents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yaml-rpc" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-client
      , http-types, lens, template-haskell, text, th-lift, transformers
@@ -223164,6 +224466,8 @@ self: {
        pname = "yesod-core";
        version = "1.4.37.3";
        sha256 = "1jw1302p5s9jy7xghxzg9j63pn6b1hp957n1808qyk1iz7yrfsg0";
+       revision = "2";
+       editedCabalFile = "0hgrp8i33zssjlvkbvlnrr5ppblvn1vzhxlax2m5qyjjg60cqjsp";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          byteable bytestring case-insensitive cereal clientsession conduit
@@ -223812,6 +225116,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "yesod-paginator_1_1_0_0" = callPackage
+    ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
+     , persistent, safe, text, transformers, uri-encode, yesod-core
+     , yesod-persistent, yesod-test
+     }:
+     mkDerivation {
+       pname = "yesod-paginator";
+       version = "1.1.0.0";
+       sha256 = "03h9zpplsglblcdf0cm36i3kmmfbhk6iqwq2vsh8nw5ygizcqh0n";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-markup path-pieces persistent safe text transformers
+         uri-encode yesod-core yesod-persistent
+       ];
+       testHaskellDepends = [ base doctest hspec yesod-core yesod-test ];
+       description = "A pagination approach for yesod";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-paypal-rest" = callPackage
     ({ mkDerivation, base, paypal-rest-client, time, yesod-core }:
      mkDerivation {
@@ -225567,16 +226892,16 @@ self: {
      }) {};
 
   "zephyr" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, base, base-compat, boxes
-     , bytestring, containers, directory, filepath, formatting, Glob
-     , hspec, hspec-core, HUnit, language-javascript, mtl
-     , optparse-applicative, process, purescript, safe, text
+    ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base
+     , base-compat, boxes, bytestring, containers, directory, filepath
+     , formatting, Glob, hspec, hspec-core, HUnit, language-javascript
+     , mtl, optparse-applicative, process, purescript, safe, text
      , transformers, transformers-base, transformers-compat, utf8-string
      }:
      mkDerivation {
        pname = "zephyr";
-       version = "0.1.1.0";
-       sha256 = "0wh6yarc890j442s5kmqpsl03y0f8n4kq43sx1k8y63avhq1qi2m";
+       version = "0.1.4";
+       sha256 = "0zsqn8rbrzdh1l2m44nqhcdx3y3lbxdvik4scs5lb0sz5a0rdx5q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -225586,10 +226911,10 @@ self: {
          transformers-base transformers-compat utf8-string
        ];
        executableHaskellDepends = [
-         aeson ansi-terminal base base-compat bytestring containers
-         directory filepath formatting Glob language-javascript mtl
-         optparse-applicative purescript text transformers transformers-base
-         transformers-compat utf8-string
+         aeson ansi-terminal ansi-wl-pprint base base-compat bytestring
+         containers directory filepath formatting Glob language-javascript
+         mtl optparse-applicative purescript text transformers
+         transformers-base transformers-compat utf8-string
        ];
        testHaskellDepends = [
          aeson ansi-terminal base base-compat bytestring containers
@@ -226039,6 +227364,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) unzip;};
 
+  "zip-archive_0_3_2_5" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
+     , digest, directory, filepath, HUnit, mtl, old-time, pretty
+     , process, temporary, text, time, unix, unzip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.3.2.5";
+       sha256 = "14xkaj456zpxxbwd1h5prcxiiid42snli4mqm1052jp32c7xhf89";
+       isLibrary = true;
+       isExecutable = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl old-time pretty text time unix zlib
+       ];
+       testHaskellDepends = [
+         base bytestring directory filepath HUnit old-time process temporary
+         time unix
+       ];
+       testToolDepends = [ unzip ];
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) unzip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl

From b2d07e093fd14adca8d1b6b7a4bb522cf7416ce0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 1 Jun 2018 09:56:41 +0200
Subject: [PATCH 3061/3370] git-annex: update sha256 hash for new version

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 387983003af3..b92ba205b843 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -82,7 +82,7 @@ self: super: {
       name = "git-annex-${drv.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + drv.version;
-      sha256 = "1w0gzqk70ymlpvh9zqkg1cd3ipaw4n85k4zsf49xl6kjp4vbcmwj";
+      sha256 = "0cz044zjp067xjx0dw1yg3n7vnrkn1j3rvnk9i3jf1aqfvm1szwy";
     };
   })).overrideScope (self: super: {
     aws = dontCheck (self.aws_0_18);

From dd06ec2cf84c0c4b938f315ecd5c1c0e874ffd16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 1 Jun 2018 18:19:30 +0200
Subject: [PATCH 3062/3370] all-cabal-hashes: update snapshot to Hackage at
 2018-05-29T07:28:04Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index e2f14a059c24..4612556f73db 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/810aa8e3848857c1158ded74a52159220119d188.tar.gz";
-  sha256 = "1s4x3ipn2san4rvfagmczdn70rhygpwwdmz0pqvy7q4rmgxy9x1i";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6a869307fd58b59579f78e5631b9bc8ae6b9bb92.tar.gz";
+  sha256 = "1i6gg49gibbqgc0iq87qlf6cqmi67pk8y2zbiz3gynqzrcmqbhfd";
 }

From 47a08c1918effcc44b8aa8c999a4a6d694e3b7f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 5 Jun 2018 09:37:30 +0200
Subject: [PATCH 3063/3370] home-assistant: add voluptuous-serialize to
 propagatedBuildInputs

---
 pkgs/servers/home-assistant/component-packages.nix | 6 +++---
 pkgs/servers/home-assistant/default.nix            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index abe57c2d57f9..e2acee87d1ab 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -228,7 +228,7 @@
     "comfoconnect" = ps: with ps; [  ];
     "config" = ps: with ps; [ aiohttp-cors ];
     "config.automation" = ps: with ps; [  ];
-    "config.config_entries" = ps: with ps; [  ];
+    "config.config_entries" = ps: with ps; [ voluptuous-serialize ];
     "config.core" = ps: with ps; [  ];
     "config.customize" = ps: with ps; [  ];
     "config.entity_registry" = ps: with ps; [  ];
@@ -402,7 +402,7 @@
     "http.real_ip" = ps: with ps; [  ];
     "http.static" = ps: with ps; [  ];
     "http.view" = ps: with ps; [  ];
-    "hue" = ps: with ps; [ aiohue voluptuous-serialize ];
+    "hue" = ps: with ps; [ aiohue ];
     "hue.bridge" = ps: with ps; [  ];
     "hue.config_flow" = ps: with ps; [  ];
     "hue.const" = ps: with ps; [  ];
@@ -459,7 +459,7 @@
     "light.hive" = ps: with ps; [  ];
     "light.homekit_controller" = ps: with ps; [  ];
     "light.homematic" = ps: with ps; [ pyhomematic ];
-    "light.hue" = ps: with ps; [ aiohue voluptuous-serialize ];
+    "light.hue" = ps: with ps; [ aiohue ];
     "light.hyperion" = ps: with ps; [  ];
     "light.iglo" = ps: with ps; [  ];
     "light.ihc" = ps: with ps; [  ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 60b005ed54cc..fbc233398735 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -95,8 +95,8 @@ in with py.pkgs; buildPythonApplication rec {
   propagatedBuildInputs = [
     # From setup.py
     requests pyyaml pytz pip jinja2 voluptuous typing aiohttp async-timeout astral certifi attrs
-    # From http, frontend and recorder components
-    sqlalchemy aiohttp-cors hass-frontend
+    # From http, frontend, recorder and config.config_entries components
+    sqlalchemy aiohttp-cors hass-frontend voluptuous-serialize
   ] ++ componentBuildInputs ++ extraBuildInputs;
 
   checkInputs = [

From 5413bce5d3a839ef1b959118b656e9f597d40c3b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Tue, 5 Jun 2018 07:27:52 -0400
Subject: [PATCH 3064/3370] dbeaver: 5.0.6 -> 5.1.0 (#41468)

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

diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix
index b7acd297d3ee..84150a4c32c6 100644
--- a/pkgs/applications/misc/dbeaver/default.nix
+++ b/pkgs/applications/misc/dbeaver/default.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation rec {
   name = "dbeaver-ce-${version}";
-  version = "5.0.6";
+  version = "5.1.0";
 
   desktopItem = makeDesktopItem {
     name = "dbeaver";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz";
-    sha256 = "12crrazlfzvr1c6y33z7v4z7ip9pjbzki8cw15v5d2irkpa710ky";
+    sha256 = "041wqlipkwk4xp3qa4rrwyw6rgsn1ppv25qb4h2mkhrsjcjagqhj";
   };
 
   installPhase = ''

From f44c16401e71aac01028a75f46bd52480f9b49b0 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Tue, 5 Jun 2018 13:43:28 +0200
Subject: [PATCH 3065/3370] s-tar: fix eval error

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 198b00e7c5ac..8906893112d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2157,7 +2157,7 @@ with pkgs;
 
   mcrcon = callPackage ../tools/networking/mcrcon {};
 
-  s-tar = callPackages ../tools/archivers/s-tar {};
+  s-tar = callPackage ../tools/archivers/s-tar {};
 
   tealdeer = callPackage ../tools/misc/tealdeer { };
 

From 23bfa472ad38e9b423ad6078e498b5f24834ebcc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 5 Jun 2018 16:25:47 +0200
Subject: [PATCH 3066/3370] jekyll: 3.8.2 -> 3.8.3

---
 .../misc/jekyll/basic/Gemfile.lock            |  8 +++----
 .../applications/misc/jekyll/basic/gemset.nix | 16 ++++++-------
 .../misc/jekyll/full/Gemfile.lock             | 12 +++++-----
 pkgs/applications/misc/jekyll/full/gemset.nix | 24 +++++++++----------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index 3cead5d24ad2..15beb8a88fb1 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -14,7 +14,7 @@ GEM
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.23)
+    ffi (1.9.25)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
     html-pipeline (2.8.0)
@@ -23,7 +23,7 @@ GEM
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.2)
+    jekyll (3.8.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -43,7 +43,7 @@ GEM
       jekyll (~> 3.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.4.0)
+    jekyll-seo-tag (2.5.0)
       jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
@@ -53,7 +53,7 @@ GEM
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
-    kramdown (1.16.2)
+    kramdown (1.17.0)
     liquid (4.0.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index e96438eefe3a..a75f74119ca7 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -53,10 +53,10 @@
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+      sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
       type = "gem";
     };
-    version = "1.9.23";
+    version = "1.9.25";
   };
   forwardable-extended = {
     source = {
@@ -104,10 +104,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
+      sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk";
       type = "gem";
     };
-    version = "3.8.2";
+    version = "3.8.3";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -140,10 +140,10 @@
     dependencies = ["jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big";
+      sha256 = "19yfr5i04gm50swbc6xxf4090z5z1v0kjfnvh695ydq1dkyx1csl";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.0";
   };
   jekyll-sitemap = {
     dependencies = ["jekyll"];
@@ -175,10 +175,10 @@
   kramdown = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za";
+      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
       type = "gem";
     };
-    version = "1.16.2";
+    version = "1.17.0";
   };
   liquid = {
     source = {
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index 323a0c2f3601..0689bad59806 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -22,10 +22,10 @@ GEM
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.1)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     fast-stemmer (1.0.2)
-    ffi (1.9.23)
+    ffi (1.9.25)
     forwardable-extended (2.6.0)
     gemoji (3.0.0)
     html-pipeline (2.8.0)
@@ -34,7 +34,7 @@ GEM
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.8.2)
+    jekyll (3.8.3)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -52,7 +52,7 @@ GEM
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
-    jekyll-feed (0.9.3)
+    jekyll-feed (0.10.0)
       jekyll (~> 3.3)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
@@ -64,7 +64,7 @@ GEM
       jekyll (~> 3.3)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-seo-tag (2.4.0)
+    jekyll-seo-tag (2.5.0)
       jekyll (~> 3.3)
     jekyll-sitemap (1.2.0)
       jekyll (~> 3.3)
@@ -74,7 +74,7 @@ GEM
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
-    kramdown (1.16.2)
+    kramdown (1.17.0)
     liquid (4.0.0)
     liquid-c (3.0.0)
       liquid (>= 3.0.0)
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index 7fc93589236f..e5eb6d62a706 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -96,10 +96,10 @@
     dependencies = ["multipart-post"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0q3z6mm6ym11jrzi1hqcwi0mkydb5m980g8is6ggkcxrinmx2nxx";
+      sha256 = "14lg0c4bphk16rccc5jmaan6nfcvmy0caiahpc61f9zfwpsj7ymg";
       type = "gem";
     };
-    version = "0.15.1";
+    version = "0.15.2";
   };
   fast-stemmer = {
     source = {
@@ -112,10 +112,10 @@
   ffi = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr";
+      sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q";
       type = "gem";
     };
-    version = "1.9.23";
+    version = "1.9.25";
   };
   forwardable-extended = {
     source = {
@@ -163,10 +163,10 @@
     dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1cp1iijcf4w2i7lzfbszpv2in9fcxm23fv0znghkm934rxrw55g8";
+      sha256 = "1iw90wihk9dscgmppf5v6lysg3kjmnx50mjyl4gghkdb4spw97xk";
       type = "gem";
     };
-    version = "3.8.2";
+    version = "3.8.3";
   };
   jekyll-avatar = {
     dependencies = ["jekyll"];
@@ -190,10 +190,10 @@
     dependencies = ["jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0kr3kyaq4z3jixn6ay8h16bxxlv6slvvp7nqnl05jdymhkl0bmm9";
+      sha256 = "0l5w2bd6dsjnc623qjw5h06n0wslh32rqkkjlkymga24cplbln8j";
       type = "gem";
     };
-    version = "0.9.3";
+    version = "0.10.0";
   };
   jekyll-gist = {
     dependencies = ["octokit"];
@@ -243,10 +243,10 @@
     dependencies = ["jekyll"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0f9b2mvmx57zj49afb3x8cmzdmb1kh4rbpbv3v7w5bh47g2c9big";
+      sha256 = "19yfr5i04gm50swbc6xxf4090z5z1v0kjfnvh695ydq1dkyx1csl";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.0";
   };
   jekyll-sitemap = {
     dependencies = ["jekyll"];
@@ -278,10 +278,10 @@
   kramdown = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za";
+      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
       type = "gem";
     };
-    version = "1.16.2";
+    version = "1.17.0";
   };
   liquid = {
     source = {

From dcfaef2b8ee59a7c329ae1d0a8cf8fe2a9556ccc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 5 Jun 2018 17:16:53 +0200
Subject: [PATCH 3067/3370] tdesktopPackages.preview: 1.3.0 -> 1.3.1

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 50a0d6db2273..59e7c0c2dd9a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.3.0";
-    sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i";
+    version = "1.3.1";
+    sha256Hash = "084zrdx3w1yq53r53zjbqpz7s8fc3ga26ffwyfxj07ysmyn7ck25";
   });
 }

From 137a372d7080d19b0cd86ff3d7dd0dc9bc05981e Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 5 Jun 2018 17:20:25 +0200
Subject: [PATCH 3068/3370] tdesktop: 1.2.17 -> 1.3.0

It still displays "Version 1.3 alpha" but other than that it should be
fine.
---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 59e7c0c2dd9a..b6f91f02f833 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -4,8 +4,8 @@ let
   mkTelegram = args: qt5.callPackage (import ./generic.nix args) { };
   stableVersion = {
     stable = true;
-    version = "1.2.17";
-    sha256Hash = "1lswjn3rnrbps1pd2xhnhggcn1z0i7y71dpr0v9wb1yc8qhh4pi0";
+    version = "1.3.0";
+    sha256Hash = "1h5zcvd58bjm02b0rfb7fx1nx1gmzdlk1854lm6kg1hd6mqrrb0i";
     # svn log svn://svn.archlinux.org/community/telegram-desktop/trunk
     archPatchesRevision = "310557";
     archPatchesHash = "1v134dal3xiapgh3akfr61vh62j24m9vkb62kckwvap44iqb0hlk";

From db68f314dbf7683f5cdd9f95aaae45faf31a3b72 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 5 Jun 2018 17:30:12 +0200
Subject: [PATCH 3069/3370] udiskie: 1.7.4 -> 1.7.5 (#41480)

`udiskie` breaks for me with the following error when using 1.7.4:

```
Traceback (most recent call last):
  File "/nix/store/cqa72mqgm5gi0xpqp5r8csdizv3p3ajr-udiskie-1.7.4/lib/python3.6/site-packages/udiskie/cli.py", line 307, in _start_async_tasks
    results = yield self._init()
  File "/nix/store/cqa72mqgm5gi0xpqp5r8csdizv3p3ajr-udiskie-1.7.4/lib/python3.6/site-packages/udiskie/cli.py", line 495, in _init
    tasks.append(Async())
NameError: name 'Async' is not defined
```

The error has been confirmed by the Debian issue tracker, so it's
obviously not related to NixOS.

See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=899419 for further
reference.
---
 pkgs/applications/misc/udiskie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix
index f3dc92605f37..1db0e4be1966 100644
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonApplication rec {
   name = "udiskie-${version}";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
     owner = "coldfix";
     repo = "udiskie";
     rev = version;
-    sha256 = "0r3m8y6ppkl8p1lhr89sfk9v2la1zn0rbmr6hy860j7b22yvnkrn";
+    sha256 = "1mcdn8ha5d5nsmrzk6xnnsqrmk94rdrzym9sqm38zk5r8gpyl1k4";
   };
 
   buildInputs = [

From 527f11bde380ebe3a31857bf3157b31ba6b3a14a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 5 Jun 2018 17:33:48 +0200
Subject: [PATCH 3070/3370] lombok: 1.6.20 -> 1.6.22 (#41455)

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

diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix
index df9b3f96c871..5ec4634d6323 100644
--- a/pkgs/development/libraries/java/lombok/default.nix
+++ b/pkgs/development/libraries/java/lombok/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "lombok-1.16.20";
+  name = "lombok-1.16.22";
 
   src = fetchurl {
     url = "https://projectlombok.org/downloads/${name}.jar";
-    sha256 = "0v8fq4qlpjh4b87xx35m32y2xpnj4d05xflrgghia6mar8c8n5y5";
+    sha256 = "1hr2jjlqdnxrw7ablqkf7ljc6n2q6a04ww14di06zs6i3l82zzpa";
   };
 
   buildCommand = ''

From bfea60ff64d0e27f054aa04704576ff24d46c622 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Tue, 5 Jun 2018 17:42:20 +0200
Subject: [PATCH 3071/3370] ponyc: 0.22.3 -> 0.22.5 (#41484)

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

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index a074c3d3a369..b7037c9b9a86 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.22.3";
+  version = "0.22.5";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "0av664n3k73psn00bd36pibkyc5b530aqqiqpg4mw2ks060dm40v";
+    sha256 = "1kxn4chc35h72hrblfrmmwgzb9s1sjsjazwz1dksj3hy45288lj1";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From 967467c0e522a4ce5690acbb2abeebddecf941ac Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 5 Jun 2018 12:24:32 -0400
Subject: [PATCH 3072/3370] linux: 4.9.105 -> 4.9.106

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index d69717b15fe7..e4a02b10e992 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.105";
+  version = "4.9.106";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1i3dv7lvh7b08943iw45j0x99878wia83fribbgxn7xcwcld51fh";
+    sha256 = "0g5y3ckwb1zn8gzsk1sc6vnmsrvsx5g2a1p0p9hrmsl8jnr9nh1d";
   };
 } // (args.argsOverride or {}))

From 661721f998efcf1ac63041f261a81b225d67ac65 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 5 Jun 2018 12:24:48 -0400
Subject: [PATCH 3073/3370] linux: 4.14.47 -> 4.14.48

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix
index d7bcd411764b..786709d53283 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.14.47";
+  version = "4.14.48";
 
   # branchVersion needs to be x.y
   extraMeta.branch = concatStrings (intersperse "." (take 2 (splitString "." version)));
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "06c8kl9f0s5qmqh9l16y1q7r44ld56kd0a00722c3aivddm3nav7";
+    sha256 = "1f92pz92mf0x9jfv3qf4w40i78l053f2qh2n8p2sbrqzc67n1840";
   };
 } // (args.argsOverride or {}))

From 6842319f8148cfb9d1644ebc0465169d75d91317 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 5 Jun 2018 12:25:02 -0400
Subject: [PATCH 3074/3370] linux: 4.16.13 -> 4.16.14

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.16.nix b/pkgs/os-specific/linux/kernel/linux-4.16.nix
index 1b0c42b81114..0a06c4dd434e 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.16.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 buildLinux (args // rec {
-  version = "4.16.13";
+  version = "4.16.14";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1qzj5mbkxkrpmnwws8vdz292gp863kybrgr9bvgs7v28plx7n2kg";
+    sha256 = "1h6zjnwpdyqk9fp72c35565lhw00kpjl55faakwx7xsxfpyvc25p";
   };
 } // (args.argsOverride or {}))

From f98272d6e293a9deae83a9274f1061f0121e84c9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 5 Jun 2018 18:43:42 +0200
Subject: [PATCH 3075/3370] Revert "lib: bitAnd, bitOr, bitXor"

---
 lib/default.nix    |  8 ++++----
 lib/tests/misc.nix | 15 ---------------
 lib/trivial.nix    | 43 -------------------------------------------
 3 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/lib/default.nix b/lib/default.nix
index d608d7094474..4ca2e2ea6e37 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -56,10 +56,10 @@ let
       hasAttr head isAttrs isBool isInt isList isString length
       lessThan listToAttrs pathExists readFile replaceStrings seq
       stringLength sub substring tail;
-    inherit (trivial) id const concat or and bitAnd bitOr bitXor
-      boolToString mergeAttrs flip mapNullable inNixShell min max
-      importJSON warn info nixpkgsVersion version mod compare
-      splitByAndCompare functionArgs setFunctionArgs isFunction;
+    inherit (trivial) id const concat or and boolToString mergeAttrs
+      flip mapNullable inNixShell min max importJSON warn info
+      nixpkgsVersion version mod compare splitByAndCompare
+      functionArgs setFunctionArgs isFunction;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
       makeExtensible makeExtensibleWithCustomName;
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index eab20d0f14dc..c683df7d7ca3 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -45,21 +45,6 @@ runTests {
     expected = true;
   };
 
-  testBitAnd = {
-    expr = (bitAnd 3 10);
-    expected = 2;
-  };
-
-  testBitOr = {
-    expr = (bitOr 3 10);
-    expected = 11;
-  };
-
-  testBitXor = {
-    expr = (bitXor 3 10);
-    expected = 9;
-  };
-
 # STRINGS
 
   testConcatMapStrings = {
diff --git a/lib/trivial.nix b/lib/trivial.nix
index 86e3c939dd69..251cb796db0e 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -1,38 +1,4 @@
 { lib }:
-let
-  zipIntBits = f: x: y:
-    let
-      # (intToBits 6) -> [ 0 1 1 ]
-      intToBits = x:
-        if x==0 then
-          []
-        else
-          let
-            headbit  = if (x / 2) * 2 != x then 1 else 0;                          # x & 1
-            tailbits = if x < 0 then 9223372036854775807 + ((x+1) / 2) else x / 2; # x >>> 1
-          in
-            [headbit] ++ (intToBits tailbits);
-
-      # (bitsToInt [ 0 1 1 ]) -> 6
-      bitsToInt = l:
-        if l==[] then
-          0
-        else
-          (builtins.head l) + (2 * (bitsToInt (builtins.tail l)));
-
-      zipListsWith' = fst: snd:
-        if fst==[] && snd==[] then
-          []
-        else if fst==[] then
-          [(f 0                   (builtins.head snd))] ++ (zipListsWith' []                  (builtins.tail snd))
-        else if snd==[] then
-          [(f (builtins.head fst) 0                  )] ++ (zipListsWith' (builtins.tail fst) []                 )
-        else
-          [(f (builtins.head fst) (builtins.head snd))] ++ (zipListsWith' (builtins.tail fst) (builtins.tail snd));
-    in
-      assert (builtins.isInt x) && (builtins.isInt y);
-      bitsToInt (zipListsWith' (intToBits x) (intToBits y));
-in
 rec {
 
   /* The identity function
@@ -65,15 +31,6 @@ rec {
   /* boolean “and” */
   and = x: y: x && y;
 
-  /* bitwise “and” */
-  bitAnd = builtins.bitAnd or zipIntBits (a: b: if a==1 && b==1 then 1 else 0);
-
-  /* bitwise “or” */
-  bitOr = builtins.bitOr or zipIntBits (a: b: if a==1 || b==1 then 1 else 0);
-
-  /* bitwise “xor” */
-  bitXor = builtins.bitXor or zipIntBits (a: b: if a!=b then 1 else 0);
-
   /* Convert a boolean to a string.
      Note that toString on a bool returns "1" and "".
   */

From 52de38f5f40a97dc46bbb9a442903f26e087bd30 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 5 Jun 2018 10:37:12 -0400
Subject: [PATCH 3076/3370] grub-config.xml: handle a null font

---
 nixos/modules/system/boot/loader/grub/grub.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 67daaa333e5e..2e497ff9f2c4 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -64,9 +64,10 @@ let
       )) + ":" + (makeSearchPathOutput "bin" "sbin" [
         pkgs.mdadm pkgs.utillinux
       ]);
-      font = if lib.last (lib.splitString "." cfg.font) == "pf2"
+      font = if cfg.font == null then ""
+        else (if lib.last (lib.splitString "." cfg.font) == "pf2"
              then cfg.font
-             else "${convertedFont}";
+             else "${convertedFont}");
     });
 
   bootDeviceCounters = fold (device: attr: attr // { "${device}" = (attr."${device}" or 0) + 1; }) {}

From ab889c14b5228fbb1d76f61bfa9bb07558ca053c Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 5 Jun 2018 10:37:38 -0400
Subject: [PATCH 3077/3370] install-grub: only try to loadfont if font is not
 null

---
 .../system/boot/loader/grub/install-grub.pl   | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 1aa14729a75c..872261d0edfa 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -281,22 +281,24 @@ else {
         else
           insmod vbe
         fi
-        insmod font
-        if loadfont " . $grubBoot->path . "/converted-font.pf2; then
-          insmod gfxterm
-          if [ \"\${grub_platform}\" = \"efi\" ]; then
-            set gfxmode=$gfxmodeEfi
-            set gfxpayload=keep
-          else
-            set gfxmode=$gfxmodeBios
-            set gfxpayload=text
-          fi
-          terminal_output gfxterm
-        fi
     ";
 
     if ($font) {
         copy $font, "$bootPath/converted-font.pf2" or die "cannot copy $font to $bootPath\n";
+        $conf .= "
+            insmod font
+            if loadfont " . $grubBoot->path . "/converted-font.pf2; then
+              insmod gfxterm
+              if [ \"\${grub_platform}\" = \"efi\" ]; then
+                set gfxmode=$gfxmodeEfi
+                set gfxpayload=keep
+              else
+                set gfxmode=$gfxmodeBios
+                set gfxpayload=text
+              fi
+              terminal_output gfxterm
+            fi
+        ";
     }
     if ($splashImage) {
         # Keeps the image's extension.

From 2a0ec8b4456b7aa210d18419e816c3c8fccfe4a6 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Tue, 5 Jun 2018 19:29:34 +0200
Subject: [PATCH 3078/3370] ctmg: add 1.2

---
 pkgs/tools/security/ctmg/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/security/ctmg/default.nix

diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix
new file mode 100644
index 000000000000..270e702cf110
--- /dev/null
+++ b/pkgs/tools/security/ctmg/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, ...  }:
+
+stdenv.mkDerivation rec {
+  name    = "ctmg-${version}";
+  version = "1.2";
+
+  src = fetchurl {
+    url    = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz";
+    sha256 = "1djxrf66abl63cybxfgjshr8avbp6nq158d0jx4mlfa3pdj32kv9";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ctmg.sh $out/bin/ctmg
+  '';
+
+  meta = with stdenv.lib; {
+    description = "An encrypted container manager for Linux using cryptsetup";
+    homepage    = https://git.zx2c4.com/ctmg/about/;
+    license     = licenses.free;
+    maintainers = with maintainers; [ mrVanDalo ];
+    platforms   = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8906893112d8..a3a81001b470 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7816,6 +7816,8 @@ with pkgs;
 
   ctodo = callPackage ../applications/misc/ctodo { };
 
+  ctmg = callPackage ../tools/security/ctmg { };
+
   cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { };
 
   cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { };

From 999871400b97109c78eaf2e88fa61c6e7793e07e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Tue, 5 Jun 2018 20:29:00 +0200
Subject: [PATCH 3079/3370] ocamlPackages.linenoise: init at 1.1.0 (#41489)

---
 .../ocaml-modules/linenoise/default.nix       | 29 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/linenoise/default.nix

diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix
new file mode 100644
index 000000000000..53ac918c47e6
--- /dev/null
+++ b/pkgs/development/ocaml-modules/linenoise/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, ocaml, jbuilder, findlib, result }:
+
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "linenoise is not available for OCaml ${ocaml.version}"
+else
+
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-linenoise-${version}";
+  version = "1.1.0";
+  src = fetchFromGitHub {
+    owner = "fxfactorial";
+    repo = "ocaml-linenoise";
+    rev = "v${version}";
+    sha256 = "1h6rqfgmhmd7p5z8yhk6zkbrk4yzw1v2fgwas2b7g3hqs6y0xj0q";
+  };
+
+  buildInputs = [ ocaml findlib jbuilder ];
+  propagatedBuildInputs = [ result ];
+
+  inherit (jbuilder) installPhase;
+
+  meta = {
+    description = "OCaml bindings to linenoise";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    inherit (src.meta) homepage;
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ef7e6f4c5888..3bb84e7e3a0c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -363,6 +363,8 @@ let
       then callPackage ../development/ocaml-modules/lambda-term { }
       else lambdaTerm-1_6;
 
+    linenoise = callPackage ../development/ocaml-modules/linenoise { };
+
     llvm = callPackage ../development/ocaml-modules/llvm {
       llvm = pkgs.llvm_39;
     };

From 3cc263ea132572ecb498b11e4baa8efb2faa3f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jos=C3=A9=20Pando?=
 <nand0p@users.noreply.github.com>
Date: Tue, 5 Jun 2018 14:39:24 -0400
Subject: [PATCH 3080/3370] opendune: init at 0.9 (#41415)

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

diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix
new file mode 100644
index 000000000000..7b848086794b
--- /dev/null
+++ b/pkgs/games/opendune/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, SDL, SDL_image, SDL_mixer, binutils }:
+
+# - set the opendune configuration at ~/.config/opendune/opendune.ini:
+#     [opendune]
+#     datadir=/path/to/opendune-data
+# - download dune2 into [datadir] http://www.bestoldgames.net/eng/old-games/dune-2.php
+
+stdenv.mkDerivation rec {
+  name = "opendune-${version}";
+  version = "0.9";
+
+  src = fetchFromGitHub {
+    owner = "OpenDUNE";
+    repo = "OpenDUNE";
+    rev = version;
+    sha256 = "15rvrnszdy3db8s0dmb696l4isb3x2cpj7wcl4j09pdi59pc8p37";
+  };
+
+  buildInputs = [ SDL SDL_image SDL_mixer ];
+
+  installPhase = ''
+    install -m 555 -D bin/opendune $out/bin/opendune
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Dune, Reinvented";
+    homepage = https://github.com/OpenDUNE/OpenDUNE;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.nand0p ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8906893112d8..e20ee5fa6bc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1358,6 +1358,8 @@ with pkgs;
 
   meritous = callPackage ../games/meritous { };
 
+  opendune = callPackage ../games/opendune { };
+
   meson = callPackage ../development/tools/build-managers/meson { };
 
   metabase = callPackage ../servers/metabase { };

From 706cc4ac68af7a04ec2881f4127b7663f2789755 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Tue, 5 Jun 2018 22:05:11 +0300
Subject: [PATCH 3081/3370] ctmg: review

---
 pkgs/tools/security/ctmg/default.nix | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix
index 270e702cf110..1e0618412210 100644
--- a/pkgs/tools/security/ctmg/default.nix
+++ b/pkgs/tools/security/ctmg/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchurl, ...  }:
+{ stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
-  name    = "ctmg-${version}";
+  name = "ctmg-${version}";
   version = "1.2";
 
-  src = fetchurl {
-    url    = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz";
-    sha256 = "1djxrf66abl63cybxfgjshr8avbp6nq158d0jx4mlfa3pdj32kv9";
+  src = fetchzip {
+    url = "https://git.zx2c4.com/ctmg/snapshot/ctmg-${version}.tar.xz";
+    sha256 = "1i4v8sriwjrmj3yizbl1ysckb711yl9qsn9x45jq0ij1apsydhyc";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ctmg.sh $out/bin/ctmg
-  '';
+  installPhase = "install -D ctmg.sh $out/bin/ctmg";
 
   meta = with stdenv.lib; {
     description = "An encrypted container manager for Linux using cryptsetup";
-    homepage    = https://git.zx2c4.com/ctmg/about/;
-    license     = licenses.free;
+    homepage = https://git.zx2c4.com/ctmg/about/;
+    license = licenses.isc;
     maintainers = with maintainers; [ mrVanDalo ];
-    platforms   = platforms.linux;
+    platforms = platforms.linux;
   };
 }
-

From d3a07d790e6d3a15894de9192af485734e67e990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 5 Jun 2018 21:38:29 +0200
Subject: [PATCH 3082/3370] vlc: 3.0.1 -> 3.0.3 (#41483)

Besides updating the version, a patch is applied for building with
QT5.11.
---
 pkgs/applications/video/vlc/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 6cc26baf70c0..c3665daad9de 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -20,11 +20,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "3.0.1";
+  version = "3.0.3";
 
   src = fetchurl {
     url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "008krfhykm9447wc1kkw82bsw3f6ikljgrqyb1sinwlxnkghqw6f";
+    sha256 = "0lavzly8l0ll1d9iris9cnirgcs77g48lxj14058dxqkvd5v1a4v";
   };
 
   # VLC uses a *ton* of libraries for various pieces of functionality, many of
@@ -52,6 +52,14 @@ stdenv.mkDerivation rec {
   # set the path to the compiler
   BUILDCC = "${stdenv.cc}/bin/gcc";
 
+  patches = [
+    (fetchpatch {
+      name = "vlc-qt5.11.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vlc-qt5.11.patch?h=packages/vlc";
+      sha256 = "0yh65bhhaz876cazhagnafs1dr61184lpj3y0m3y7k37bswykj8p";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace configure \
       --replace /bin/echo echo

From 1499c812a19f6f0bf5771d57e01f9898ac54d121 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Tue, 5 Jun 2018 21:54:13 +0200
Subject: [PATCH 3083/3370] readline70: 7.0.3 -> 7.0.5 (#41493)

---
 pkgs/development/libraries/readline/readline-7.0-patches.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/readline/readline-7.0-patches.nix b/pkgs/development/libraries/readline/readline-7.0-patches.nix
index 45bec6b64812..c34ef2bf97bb 100644
--- a/pkgs/development/libraries/readline/readline-7.0-patches.nix
+++ b/pkgs/development/libraries/readline/readline-7.0-patches.nix
@@ -4,4 +4,6 @@ patch: [
 (patch "001" "0xm3sxvwmss7ddyfb11n6pgcqd1aglnpy15g143vzcf75snb7hcs")
 (patch "002" "0n1dxmqsbjgrfxb1hgk5c6lsraw4ncbnzxlsx7m35nym6lncjiw7")
 (patch "003" "1027kmymniizcy0zbdlrczxfx3clxcdln5yq05q9yzlc6y9slhwy")
+(patch "004" "0r3bbaf12iz8m02z6p3fzww2m365fhn71xmzab2p62gj54s6h9gr")
+(patch "005" "0lxpa4f72y2nsgj6fgrhjk2nmmxvccys6aciwfxwchb5f21rq5fa")
 ]

From 1868fa92a2a77ae41e919777afafbf806d1f785a Mon Sep 17 00:00:00 2001
From: Philipp Middendorf <pmidden+github@secure.mailbox.org>
Date: Tue, 5 Jun 2018 22:12:05 +0200
Subject: [PATCH 3084/3370] pythonPackages.typing-extensions: init at 3.6.5
 (#40983)

---
 .../typing-extensions/default.nix             | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/typing-extensions/default.nix

diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix
new file mode 100644
index 000000000000..de06ddbe2ce5
--- /dev/null
+++ b/pkgs/development/python-modules/typing-extensions/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, python, typing }:
+let
+  testDir = if isPy3k then "src_py3" else "src_py2";
+
+in buildPythonPackage rec {
+  pname = "typing_extensions";
+  version = "3.6.5";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09xxykw8mk30r0g33r2gy5qlqw3sqj5vkp6h7nh0flp59hxqw2hw";
+  };
+
+  checkInputs = lib.optional (pythonOlder "3.5") typing;
+
+  # Error for Python3.6: ImportError: cannot import name 'ann_module'
+  # See https://github.com/python/typing/pull/280
+  doCheck = pythonOlder "3.6";
+
+  checkPhase = ''
+    cd ${testDir}
+    ${python.interpreter} -m unittest discover
+  '';
+
+  meta = with lib; {
+    description = "Backported and Experimental Type Hints for Python 3.5+";
+    homepage = https://github.com/python/typing;
+    license = licenses.psfl;
+    maintainers = with maintainers; [ pmiddend ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 032cda8aa911..ea308ca15901 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12435,6 +12435,8 @@ in {
 
   typing = callPackage ../development/python-modules/typing { };
 
+  typing-extensions = callPackage ../development/python-modules/typing-extensions { };
+
   typeguard = callPackage ../development/python-modules/typeguard { };
 
   ruamel_yaml = buildPythonPackage rec {

From 186675b06f1a5efe3439c351fe69b7dd6a9a8878 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Tue, 5 Jun 2018 22:31:08 +0200
Subject: [PATCH 3085/3370] pdf-redact-tools: init -> 0.1.2 (#41451)

---
 .../tools/graphics/pdfredacttools/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/graphics/pdfredacttools/default.nix

diff --git a/pkgs/tools/graphics/pdfredacttools/default.nix b/pkgs/tools/graphics/pdfredacttools/default.nix
new file mode 100644
index 000000000000..d66c0b0a9451
--- /dev/null
+++ b/pkgs/tools/graphics/pdfredacttools/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, pythonPackages, imagemagick, exiftool, file, ghostscript }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "pdf-redact-tools";
+  version = "0.1.2";
+
+  src = fetchFromGitHub {
+    owner = "firstlookmedia";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "01vs1bc0pfgk6x2m36vwra605fg59yc31d0hl9jmj86n8q6wwvss";
+  };
+
+  patchPhase = ''substituteInPlace pdf-redact-tools      \
+    --replace \'convert\' \'${imagemagick}/bin/convert\' \
+    --replace \'exiftool\' \'${exiftool}/bin/exiftool\'  \
+    --replace \'file\' \'${file}/bin/file\'
+   '';
+
+  propagatedBuildInputs = [ imagemagick exiftool ghostscript ];
+
+  meta = with stdenv.lib; {
+    description = "Redact and strip metadata from documents before publishing";
+    longDescription = ''
+	PDF Redact Tools helps with securely redacting and stripping metadata
+	from documents before publishing. Note that this is not a security tool.
+        It uses ImageMagick to parse PDFs.  While ImageMagick is a versatile tool, it has
+        a history of several security bugs. A malicious PDF could exploit a bug in
+        ImageMagick to take over your computer. If you're working with potentially
+        malicious PDFs, it's safest to run them through PDF Redact Tools in an isolated
+        environment, such as a virtual machine, or by using a tool such as the Qubes
+        PDF Converter instead.
+    '';
+    platforms = platforms.all;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ leenaars ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65de40b046c1..dc29d48760b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4376,6 +4376,8 @@ with pkgs;
 
   pdf2odt = callPackage ../tools/typesetting/pdf2odt { };
 
+  pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { };
+
   pdf2svg = callPackage ../tools/graphics/pdf2svg { };
 
   fmodex = callPackage ../games/zandronum/fmod.nix { };

From 16845d61e8b97a6f955eb65aff30a87dc2f33c68 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Tue, 5 Jun 2018 23:43:17 +0300
Subject: [PATCH 3086/3370] mc: 4.8.20 -> 4.8.21 (#41496)

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

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index bc097e2a0857..bdae1e0cf848 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mc-${version}";
-  version = "4.8.20";
+  version = "4.8.21";
 
   src = fetchurl {
     url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
-    sha256 = "072h7n9b3j79fqn48xaw0xhlcjavpsmfpz6nyh20lhmfz3sffzh1";
+    sha256 = "130lzrcmazinznnnpf00lcizdlmjdhfiqfx00g1cjcbwmi3fadwg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 44f3a1dd41bc6ec78d827bb2aa5997a4cb67be70 Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Mon, 21 May 2018 17:44:15 +0200
Subject: [PATCH 3087/3370] faust2: fix build with llvm 5.0.2 (#40672)

build was broken by  llvm: 5.0.1 -> 5.0.2 (#39979)

(cherry picked from commit a16c31244b904cb0ee152eca2c0c01c3be0fdc7f)
---
 pkgs/applications/audio/faust/faust2.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index db5433cc35fc..961ef7135697 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -73,6 +73,13 @@ let
       sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix
     '';
 
+    postPatch = ''
+      # fix build with llvm 5.0.2 by adding it to the list of known versions
+      # TODO: check if still needed on next update
+      substituteInPlace compiler/Makefile.unix \
+        --replace "5.0.0 5.0.1" "5.0.0 5.0.1 5.0.2"
+    '';
+
     # Remove most faust2appl scripts since they won't run properly
     # without additional paths setup. See faust.wrap,
     # faust.wrapWithBuildEnv.
@@ -193,6 +200,7 @@ let
 
       propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs;
 
+
       postFixup = ''
 
         # export parts of the build environment

From 0ef083c020f05ae317caede78ad8862fb863a54e Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Tue, 5 Jun 2018 14:06:56 -0700
Subject: [PATCH 3088/3370] docker-machine-kvm2: init at 0.27.0

---
 .../cluster/docker-machine/kvm2.nix           | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/docker-machine/kvm2.nix

diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
new file mode 100644
index 000000000000..fd067936efdf
--- /dev/null
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@@ -0,0 +1,36 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
+
+buildGoPackage rec {
+  pname = "docker-machine-kvm2";
+  name = "${pname}-${version}";
+  version = "0.27.0";
+
+  goPackagePath = "k8s.io/minikube";
+  subPackages = [ "cmd/drivers/kvm" ];
+
+  src = fetchFromGitHub {
+    owner = "kubernetes";
+    repo = "minikube";
+    rev = "v${version}";
+    sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libvirt ];
+
+  preBuild = ''
+    export buildFlagsArray=(-ldflags="-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=v${version}")
+  '';
+
+  postInstall = ''
+    mv $bin/bin/kvm $bin/bin/docker-machine-driver-kvm2
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md;
+    description = "KVM2 driver for docker-machine.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ tadfisher ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8906893112d8..59a30fbc13ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15362,6 +15362,7 @@ with pkgs;
 
   docker-machine = callPackage ../applications/networking/cluster/docker-machine { };
   docker-machine-kvm = callPackage ../applications/networking/cluster/docker-machine/kvm.nix { };
+  docker-machine-kvm2 = callPackage ../applications/networking/cluster/docker-machine/kvm2.nix { };
   docker-machine-xhyve = callPackage ../applications/networking/cluster/docker-machine/xhyve.nix {
     inherit (darwin.apple_sdk.frameworks) Hypervisor vmnet;
   };

From 9aba987f37dd3ea775b63de9b0257ead8e7b719a Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Tue, 5 Jun 2018 23:56:17 +0200
Subject: [PATCH 3089/3370] bat: support darwin

---
 pkgs/tools/misc/bat/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix
index 7a3231ce85c2..01fbe67e5f20 100644
--- a/pkgs/tools/misc/bat/default.nix
+++ b/pkgs/tools/misc/bat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib }:
+{ stdenv, rustPlatform, fetchFromGitHub, cmake, pkgconfig, zlib, libiconv, darwin }:
 
 rustPlatform.buildRustPackage rec {
   name    = "bat-${version}";
@@ -15,11 +15,15 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ cmake pkgconfig zlib ];
 
+  buildInputs = [ libiconv ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
   meta = with stdenv.lib; {
     description = "A cat(1) clone with syntax highlighting and Git integration";
     homepage    = https://github.com/sharkdp/bat;
     license     = with licenses; [ asl20 /* or */ mit ];
     maintainers = with maintainers; [ dywedir ];
-    platforms   = platforms.linux;
+    platforms   = platforms.linux ++ platforms.darwin;
   };
 }

From 96ea550a3bc4ab6f1e675c48fc0a4b03c9e9dbb3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 5 Jun 2018 15:13:26 -0700
Subject: [PATCH 3090/3370] snd: 18.3 -> 18.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/snd/versions.

These checks were done:

- built on NixOS
- /nix/store/mjj4w55zxs6frv2k1jwwj6prfvc5khq8-snd-18.4/bin/snd passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 18.4 with grep in /nix/store/mjj4w55zxs6frv2k1jwwj6prfvc5khq8-snd-18.4
- directory tree listing: https://gist.github.com/3273a4d6d644822345c927f1c5898be3
- du listing: https://gist.github.com/990100affe939370c541757ed1ee0839
---
 pkgs/applications/audio/snd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index cacc6e04429d..9b386ea7ac7e 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-18.3";
+  name = "snd-18.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "117sgvdv0a03ys1v27bs99mgzpfm2a7xg6s0q6m1f79jniia12ss";
+    sha256 = "1asc513d0cmbq0ldzpzmfbydvlj5hwpp480qnicgkn96wplp9c7s";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 26c194d000d641ddf2d892157ab2a520baa2a83f Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Tue, 5 Jun 2018 23:50:28 +0100
Subject: [PATCH 3091/3370] pythonPackages.pykdtree: init at 1.3.0 (#41355)

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

diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix
new file mode 100644
index 000000000000..86524b6002d6
--- /dev/null
+++ b/pkgs/development/python-modules/pykdtree/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, numpy, nose, openmp }:
+
+buildPythonPackage rec {
+  pname = "pykdtree";
+  version = "1.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "79351b79087f473f83fb27a5cd552bd1056f2dfa7acec5d4a68f35a7cbea6776";
+  };
+
+  buildInputs = [ openmp ];
+
+  propagatedBuildInputs = [ numpy ];
+
+  checkInputs = [ nose ];
+
+  meta = with stdenv.lib; {
+    description = "kd-tree implementation for fast nearest neighbour search in Python";
+    homepage = https://github.com/storpipfugl/pykdtree;
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea308ca15901..2c4ab7805bda 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -384,6 +384,10 @@ in {
     callPackage = pkgs.callPackage;
   };
 
+  pykdtree = callPackage ../development/python-modules/pykdtree {
+    inherit (pkgs.llvmPackages) openmp;
+  };
+
   pyparser = callPackage ../development/python-modules/pyparser { };
 
   pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {

From f2d7142b33168aafde2bc030d2a31107b52aef54 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 5 Jun 2018 15:55:06 -0700
Subject: [PATCH 3092/3370] syncthing: 0.14.47 -> 0.14.48

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/syncthing/versions.

These checks were done:

- built on NixOS
- /nix/store/h4ya458k1kcphch5pxzm16v38l07qv7r-syncthing-0.14.48/bin/syncthing passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.14.48 with grep in /nix/store/h4ya458k1kcphch5pxzm16v38l07qv7r-syncthing-0.14.48
- directory tree listing: https://gist.github.com/ba1db3154a5999b389aae4932af21f2b
- du listing: https://gist.github.com/a469360f23a2909c7550178ab7a1d0f2
---
 pkgs/applications/networking/syncthing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index e1a2cf8d1716..25d482fd9b06 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,14 +3,14 @@
 let
   common = { stname, target, patches ? [], postInstall ? "" }:
     stdenv.mkDerivation rec {
-      version = "0.14.47";
+      version = "0.14.48";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "1md835c13f3c9bknnm6pxn0r8k8g2wg56zfav96bpnpk4aqx41bh";
+        sha256 = "10jls0z3y081fq097xarplzv5sz076ibhawzm65bq695f6s5sdzw";
       };
 
       inherit patches;

From f63c52bc424e1c2c91cc679e880e8c8db980df42 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 5 Jun 2018 15:57:40 -0700
Subject: [PATCH 3093/3370] unetbootin: 657 -> 661

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/unetbootin/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/25pjsiav4kpzyvms0a24zfmm3267nsq9-unetbootin-661/bin/unetbootin had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/25pjsiav4kpzyvms0a24zfmm3267nsq9-unetbootin-661/bin/.unetbootin-wrapped had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 661 with grep in /nix/store/25pjsiav4kpzyvms0a24zfmm3267nsq9-unetbootin-661
- directory tree listing: https://gist.github.com/b36c6d9dbe30c7b0e794715dafed8272
- du listing: https://gist.github.com/2da554212740e7e9655de8e211d2e8ed
---
 pkgs/tools/cd-dvd/unetbootin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix
index 7deac71f1512..502937dd565b 100644
--- a/pkgs/tools/cd-dvd/unetbootin/default.nix
+++ b/pkgs/tools/cd-dvd/unetbootin/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "unetbootin-${version}";
-  version = "657";
+  version = "661";
 
   src = fetchFromGitHub {
     owner  = "unetbootin";
     repo   = "unetbootin";
     rev    = version;
-    sha256 = "18bbcrjk6ladr46kl3dvqz5pq2xcv4nnwmajqllb4sl3k1xqsngy";
+    sha256 = "0jwmmym86x9hc6yr619dxdbxdawx8x0zwld0dfrhzwxvwbqbpav5";
   };
 
   setSourceRoot = ''

From e14fa60cb61e285258c202762e7a102add8a42f1 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Wed, 6 Jun 2018 11:22:23 +0900
Subject: [PATCH 3094/3370] flent: fix fetchFromGitHub version

Lacked a "v" in revision.
---
 pkgs/applications/networking/flent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index 9a0bb0104d4c..90ff868d6bec 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -6,8 +6,8 @@ buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "tohojo";
     repo = "flent";
-    rev = version;
-    sha256 = "0rl4ahynl6ymw7r04vpg9p90pplrxc41rjlzvm0swxsvpw40yvkm";
+    rev = "v${version}";
+    sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r";
   };
 
   buildInputs = [ netperf ];

From 13170a9694fc7b77501425b20c50e8d3b7221f45 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 6 Jun 2018 03:39:14 +0000
Subject: [PATCH 3095/3370] Revert "libbsd-freedesktop: re-init at 0.9.1, use
 for samba"

This reverts commit 8b5ed12952300846928555b20fc10893f9df3965.
---
 pkgs/development/libraries/libbsd/default.nix | 21 -------------------
 pkgs/top-level/all-packages.nix               |  3 ---
 2 files changed, 24 deletions(-)
 delete mode 100644 pkgs/development/libraries/libbsd/default.nix

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
deleted file mode 100644
index 114d3209b58a..000000000000
--- a/pkgs/development/libraries/libbsd/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "libbsd-${version}";
-  version = "0.9.1";
-
-  src = fetchurl {
-    url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1957w2wi7iqar978qlfsm220dwywnrh5m58nrnn9zmi74ds3bn2n";
-  };
-
-  patches = [];
-
-  meta = with stdenv.lib; {
-    description = "Common functions found on BSD systems, Freedesktop fork";
-    homepage = https://libbsd.freedesktop.org/;
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ raskin ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc29d48760b8..c700f37fed9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12963,7 +12963,6 @@ with pkgs;
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    libbsd = libbsd-freedesktop;
   };
 
   sambaMaster = callPackage ../servers/samba/master.nix { };
@@ -21532,8 +21531,6 @@ with pkgs;
 
   libbsd = netbsd.compat;
 
-  libbsd-freedesktop = callPackage ../development/libraries/libbsd {};
-
   inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
           netbsd;
 

From f2682af9c9777068933c863065bf02b8d72706a6 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 6 Jun 2018 04:07:54 +0000
Subject: [PATCH 3096/3370] Revert "opendkim: fix libbsd dependency"

This reverts commit b529dda3a19856cb2c1a26db0f0d2e0f6d268861.
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c700f37fed9c..c537cdf8bc77 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4162,9 +4162,7 @@ with pkgs;
 
   opendht = callPackage ../development/libraries/opendht {};
 
-  opendkim = callPackage ../development/libraries/opendkim {
-    libbsd = libbsd-freedesktop;
-  };
+  opendkim = callPackage ../development/libraries/opendkim { };
 
   opendylan = callPackage ../development/compilers/opendylan {
     opendylan-bootstrap = opendylan_bin;

From 05fedecad9db7f06385d26b60e6353c7edc7d56a Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 6 Jun 2018 03:43:49 +0000
Subject: [PATCH 3097/3370] Revert "libbsd: replace with nbcompat"

This reverts commit 480434f7eeefed7026dbbd11a4a0b1e4bfc1f137.

netbsd.compat does not provide include files that are provided by libbsd [1], and it
encumbers its transitive dependents with an obligatory include file that setups
BSD-compatible C environment [2].

[1] https://github.com/NixOS/nixpkgs/pull/41320#issuecomment-394922277
[2] https://github.com/NixOS/nixpkgs/pull/41320#issuecomment-394928845
---
 pkgs/development/libraries/libbsd/cdefs.patch | 222 ++++++
 .../development/libraries/libbsd/darwin.patch | 703 ++++++++++++++++++
 pkgs/development/libraries/libbsd/default.nix |  34 +
 .../libraries/libbsd/features.patch           |  26 +
 .../libraries/libbsd/non-glibc.patch          |  74 ++
 pkgs/top-level/all-packages.nix               |   4 +-
 6 files changed, 1061 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/libbsd/cdefs.patch
 create mode 100644 pkgs/development/libraries/libbsd/darwin.patch
 create mode 100644 pkgs/development/libraries/libbsd/default.nix
 create mode 100644 pkgs/development/libraries/libbsd/features.patch
 create mode 100644 pkgs/development/libraries/libbsd/non-glibc.patch

diff --git a/pkgs/development/libraries/libbsd/cdefs.patch b/pkgs/development/libraries/libbsd/cdefs.patch
new file mode 100644
index 000000000000..81822654aeb4
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/cdefs.patch
@@ -0,0 +1,222 @@
+From 11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem@hadrons.org>
+Date: Tue, 6 Mar 2018 01:41:35 +0100
+Subject: Handle systems missing <sys/cdefs.h>
+
+This is a non-portable header, and we cannot expect it to be provided by
+the system libc (e.g. musl). We just need and rely on declaration that
+we have defined ourselves in our own <bsd/sys/cdefs.h>. So we switch to
+only ever assume that.
+
+Fixes: https://bugs.freedesktop.org/105281
+---
+ include/bsd/libutil.h        | 4 ++++
+ include/bsd/md5.h            | 4 ++++
+ include/bsd/nlist.h          | 4 ++++
+ include/bsd/readpassphrase.h | 4 ++++
+ include/bsd/stdlib.h         | 4 ++++
+ include/bsd/string.h         | 4 ++++
+ include/bsd/stringlist.h     | 5 +++++
+ include/bsd/sys/queue.h      | 4 ++++
+ include/bsd/sys/tree.h       | 4 ++++
+ include/bsd/timeconv.h       | 4 ++++
+ include/bsd/vis.h            | 4 ++++
+ include/bsd/wchar.h          | 4 ++++
+ 12 files changed, 49 insertions(+)
+
+diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
+index 45b3b15..ccca29a 100644
+--- a/include/bsd/libutil.h
++++ b/include/bsd/libutil.h
+@@ -40,7 +40,11 @@
+ #define LIBBSD_LIBUTIL_H
+ 
+ #include <features.h>
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <sys/types.h>
+ #include <stdint.h>
+ #include <stdio.h>
+diff --git a/include/bsd/md5.h b/include/bsd/md5.h
+index 5f3ae46..bf36a30 100644
+--- a/include/bsd/md5.h
++++ b/include/bsd/md5.h
+@@ -27,7 +27,11 @@ typedef struct MD5Context {
+ 	uint8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
+ } MD5_CTX;
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <sys/types.h>
+ 
+ __BEGIN_DECLS
+diff --git a/include/bsd/nlist.h b/include/bsd/nlist.h
+index cb297e8..8767117 100644
+--- a/include/bsd/nlist.h
++++ b/include/bsd/nlist.h
+@@ -27,7 +27,11 @@
+ #ifndef LIBBSD_NLIST_H
+ #define LIBBSD_NLIST_H
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ 
+ struct nlist {
+ 	union {
+diff --git a/include/bsd/readpassphrase.h b/include/bsd/readpassphrase.h
+index 14744b8..5eb8021 100644
+--- a/include/bsd/readpassphrase.h
++++ b/include/bsd/readpassphrase.h
+@@ -31,7 +31,11 @@
+ #define RPP_SEVENBIT    0x10		/* Strip the high bit from input. */
+ #define RPP_STDIN       0x20		/* Read from stdin, not /dev/tty */
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <sys/types.h>
+ 
+ __BEGIN_DECLS
+diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
+index ebc9638..8d33d1f 100644
+--- a/include/bsd/stdlib.h
++++ b/include/bsd/stdlib.h
+@@ -42,7 +42,11 @@
+ #ifndef LIBBSD_STDLIB_H
+ #define LIBBSD_STDLIB_H
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <sys/stat.h>
+ #include <stdint.h>
+ 
+diff --git a/include/bsd/string.h b/include/bsd/string.h
+index 6798bf6..29097f6 100644
+--- a/include/bsd/string.h
++++ b/include/bsd/string.h
+@@ -33,7 +33,11 @@
+ #ifndef LIBBSD_STRING_H
+ #define LIBBSD_STRING_H
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <sys/types.h>
+ 
+ __BEGIN_DECLS
+diff --git a/include/bsd/stringlist.h b/include/bsd/stringlist.h
+index ff30cac..dd71496 100644
+--- a/include/bsd/stringlist.h
++++ b/include/bsd/stringlist.h
+@@ -31,7 +31,12 @@
+ 
+ #ifndef LIBBSD_STRINGLIST_H
+ #define LIBBSD_STRINGLIST_H
++
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <sys/types.h>
+ 
+ /*
+diff --git a/include/bsd/sys/queue.h b/include/bsd/sys/queue.h
+index 4a94ea7..ac00026 100644
+--- a/include/bsd/sys/queue.h
++++ b/include/bsd/sys/queue.h
+@@ -33,7 +33,11 @@
+ #ifndef LIBBSD_SYS_QUEUE_H
+ #define LIBBSD_SYS_QUEUE_H
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ 
+ /*
+  * This file defines four types of data structures: singly-linked lists,
+diff --git a/include/bsd/sys/tree.h b/include/bsd/sys/tree.h
+index 628bec0..325b382 100644
+--- a/include/bsd/sys/tree.h
++++ b/include/bsd/sys/tree.h
+@@ -30,7 +30,11 @@
+ #ifndef LIBBSD_SYS_TREE_H
+ #define LIBBSD_SYS_TREE_H
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ 
+ /*
+  * This file defines data structures for different types of trees:
+diff --git a/include/bsd/timeconv.h b/include/bsd/timeconv.h
+index e2a2c55..a426bd3 100644
+--- a/include/bsd/timeconv.h
++++ b/include/bsd/timeconv.h
+@@ -41,7 +41,11 @@
+ #ifndef LIBBSD_TIMECONV_H
+ #define LIBBSD_TIMECONV_H
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <stdint.h>
+ #include <time.h>
+ 
+diff --git a/include/bsd/vis.h b/include/bsd/vis.h
+index 970dfdd..ab5430c 100644
+--- a/include/bsd/vis.h
++++ b/include/bsd/vis.h
+@@ -72,7 +72,11 @@
+  */
+ #define	UNVIS_END	1	/* no more characters */
+ 
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ 
+ __BEGIN_DECLS
+ char	*vis(char *, int, int, int);
+diff --git a/include/bsd/wchar.h b/include/bsd/wchar.h
+index 33a500e..7216503 100644
+--- a/include/bsd/wchar.h
++++ b/include/bsd/wchar.h
+@@ -40,7 +40,11 @@
+ #define LIBBSD_WCHAR_H
+ 
+ #include <stddef.h>
++#ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
++#else
++#include <bsd/sys/cdefs.h>
++#endif
+ #include <sys/types.h>
+ 
+ __BEGIN_DECLS
+-- 
+cgit v1.1
+
diff --git a/pkgs/development/libraries/libbsd/darwin.patch b/pkgs/development/libraries/libbsd/darwin.patch
new file mode 100644
index 000000000000..4bddec6b0ffd
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/darwin.patch
@@ -0,0 +1,703 @@
+diff --git a/configure.ac b/configure.ac
+index 88ccd91..0857782 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -59,7 +59,7 @@ AS_CASE([$host_os],
+ )
+ 
+ # Checks for header files.
+-AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
++AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h stdio_ext.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_INLINE
+@@ -146,6 +146,31 @@ AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \
+                 pstat_getproc sysconf])
+ AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"])
+ 
++HostOS=`echo "$host" | sed 's/.*-//'`
++os_is_macosx=false
++nonLinuxOS=false
++AC_SUBST(HostOS)
++case ${HostOS} in
++	darwin* | powerpc*-*-darwin* | freebsd* | netbsd* | openbsd*)
++		os_is_macosx=true
++		nonLinuxOS=true
++		echo HostOS="$HostOS"
++		;;
++	*)
++		echo host="$host"
++		echo HostOS="$HostOS"
++		os_is_macosx=false
++		nonLinuxOS=false
++		;;
++esac		
++AM_CONDITIONAL([IS_DARWIN], [test x$os_is_macosx = xtrue])
++AM_COND_IF([IS_DARWIN],
++	[AC_DEFINE([IS_DARWIN], [1], [Get HostOS Type is Darwin])])
++
++AM_CONDITIONAL([NON_LINUX], [test x$userdefine_gethostbyname_r = xtrue])
++AM_COND_IF([NON_LINUX],
++	[AC_DEFINE([NON_LINUX], [1], [Get HostOS Type])])
++
+ AC_CONFIG_FILES([
+ 	Makefile
+ 	include/Makefile
+diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
+index 45b3b15..d0d4043 100644
+--- a/include/bsd/libutil.h
++++ b/include/bsd/libutil.h
+@@ -39,7 +39,9 @@
+ #ifndef LIBBSD_LIBUTIL_H
+ #define LIBBSD_LIBUTIL_H
+ 
++#ifdef HAVE_FEATURES_H
+ #include <features.h>
++#endif
+ #include <sys/cdefs.h>
+ #include <sys/types.h>
+ #include <stdint.h>
+diff --git a/include/bsd/stdio.h b/include/bsd/stdio.h
+index 4b69983..c75151b 100644
+--- a/include/bsd/stdio.h
++++ b/include/bsd/stdio.h
+@@ -48,12 +48,16 @@
+ __BEGIN_DECLS
+ const char *fmtcheck(const char *, const char *);
+ 
++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ /* XXX: The function requires cooperation from the system libc to store the
+  * line buffer in the FILE struct itself. */
+ char *fgetln(FILE *fp, size_t *lenp)
+-	LIBBSD_DEPRECATED("This functions cannot be safely ported, "
+-	                  "use getline(3) instead, as it is supported "
+-	                  "by GNU and POSIX.1-2008.");
++	__attribute__((deprecated("This functions cannot be safely ported, "
++	                          "use getline(3) instead, as it is supported "
++	                          "by GNU and POSIX.1-2008.")));
++#else
++char *fgetln(FILE *fp, size_t *lenp);
++#endif
+ 
+ /*
+  * Note: We diverge from the FreeBSD, OpenBSD and DragonFlyBSD declarations,
+diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
+index ebc9638..6cd7943 100644
+--- a/include/bsd/stdlib.h
++++ b/include/bsd/stdlib.h
+@@ -67,9 +67,11 @@ int sradixsort(const unsigned char **base, int nmemb,
+                const unsigned char *table, unsigned endbyte);
+ 
+ void *reallocf(void *ptr, size_t size);
+-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
++#if defined(_GNU_SOURCE) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
++#if !__GLIBC_PREREQ(2, 26)
+ void *reallocarray(void *ptr, size_t nmemb, size_t size);
+ #endif
++#endif
+ 
+ long long strtonum(const char *nptr, long long minval, long long maxval,
+                    const char **errstr);
+diff --git a/include/bsd/string.h b/include/bsd/string.h
+index 6798bf6..6baaa14 100644
+--- a/include/bsd/string.h
++++ b/include/bsd/string.h
+@@ -37,6 +37,12 @@
+ #include <sys/types.h>
+ 
+ __BEGIN_DECLS
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++size_t bsd_strlcpy(char *dst, const char *src, size_t siz);
++size_t bsd_strlcat(char *dst, const char *src, size_t siz);
++char *bsd_strnstr(const char *str, const char *find, size_t str_len);
++void bsd_strmode(mode_t mode, char *str);
++#else
+ size_t strlcpy(char *dst, const char *src, size_t siz);
+ size_t strlcat(char *dst, const char *src, size_t siz);
+ char *strnstr(const char *str, const char *find, size_t str_len);
+@@ -45,6 +51,7 @@ void strmode(mode_t mode, char *str);
+ #if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
+ void explicit_bzero(void *buf, size_t len);
+ #endif
++#endif
+ __END_DECLS
+ 
+ #endif
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ad83dbf..0f2a7ee 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -54,17 +54,21 @@ libbsd_la_DEPENDENCIES = \
+ 	libbsd.map
+ libbsd_la_LIBADD = \
+ 	$(CLOCK_GETTIME_LIBS)
++
++if IS_DARWIN
++libbsd_la_LDFLAGS = \
++	-Wl \
++	-version-number $(LIBBSD_ABI)
++else
+ libbsd_la_LDFLAGS = \
+ 	-Wl,--version-script=$(srcdir)/libbsd.map \
+ 	-version-number $(LIBBSD_ABI)
++endif
++
+ libbsd_la_SOURCES = \
+ 	arc4random.c \
+-	arc4random.h \
+-	arc4random_unix.h \
+-	arc4random_openbsd.h \
+ 	arc4random_uniform.c \
+ 	bsd_getopt.c \
+-	chacha_private.h \
+ 	closefrom.c \
+ 	dehumanize_number.c \
+ 	err.c \
+@@ -117,6 +121,15 @@ libbsd_la_SOURCES += \
+ 	$(nil)
+ endif
+ 
++noinst_HEADERS = \
++	arc4random.h \
++	arc4random_bsd.h \
++	arc4random_linux.h \
++	arc4random_unix.h \
++	arc4random_osx.h \
++	arc4random_openbsd.h \
++	chacha_private.h
++
+ libbsd_ctor_a_SOURCES = \
+ 	setproctitle_ctor.c \
+ 	$(nil)
+diff --git a/src/arc4random_bsd.h b/src/arc4random_bsd.h
+new file mode 100644
+index 0000000..ece2f85
+--- /dev/null
++++ b/src/arc4random_bsd.h
+@@ -0,0 +1,86 @@
++/*	$OpenBSD: arc4random_freebsd.h,v 1.2 2015/01/15 06:57:18 deraadt Exp $	*/
++
++/*
++ * Copyright (c) 1996, David Mazieres <dm@uun.org>
++ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
++ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
++ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Stub functions for portability.
++ */
++
++#include <sys/mman.h>
++
++#include <pthread.h>
++#include <signal.h>
++
++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
++#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
++
++/*
++ * Unfortunately, pthread_atfork() is broken on FreeBSD (at least 9 and 10) if
++ * a program does not link to -lthr. Callbacks registered with pthread_atfork()
++ * appear to fail silently. So, it is not always possible to detect a PID
++ * wraparound.
++ */
++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
++
++static inline void
++_getentropy_fail(void)
++{
++	raise(SIGKILL);
++}
++
++static volatile sig_atomic_t _rs_forked;
++
++static inline void
++_rs_forkhandler(void)
++{
++	_rs_forked = 1;
++}
++
++static inline void
++_rs_forkdetect(void)
++{
++	static pid_t _rs_pid = 0;
++	pid_t pid = getpid();
++
++	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
++		_rs_pid = pid;
++		_rs_forked = 0;
++		if (rs)
++			memset(rs, 0, sizeof(*rs));
++	}
++}
++
++static inline int
++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
++{
++	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
++		return (-1);
++
++	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
++		munmap(*rsp, sizeof(**rsp));
++		return (-1);
++	}
++
++	_ARC4_ATFORK(_rs_forkhandler);
++	return (0);
++}
+diff --git a/src/arc4random_linux.h b/src/arc4random_linux.h
+new file mode 100644
+index 0000000..d61a8db
+--- /dev/null
++++ b/src/arc4random_linux.h
+@@ -0,0 +1,86 @@
++/*	$OpenBSD: arc4random_linux.h,v 1.8 2014/08/13 06:04:10 deraadt Exp $	*/
++
++/*
++ * Copyright (c) 1996, David Mazieres <dm@uun.org>
++ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
++ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
++ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Stub functions for portability.
++ */
++
++#include <sys/mman.h>
++
++#include <pthread.h>
++#include <signal.h>
++
++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
++#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
++
++#ifdef __GLIBC__
++extern void *__dso_handle;
++extern int __register_atfork(void (*)(void), void(*)(void), void (*)(void), void *);
++#define _ARC4_ATFORK(f) __register_atfork(NULL, NULL, (f), __dso_handle)
++#else
++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
++#endif
++
++static inline void
++_getentropy_fail(void)
++{
++	raise(SIGKILL);
++}
++
++static volatile sig_atomic_t _rs_forked;
++
++static inline void
++_rs_forkhandler(void)
++{
++	_rs_forked = 1;
++}
++
++static inline void
++_rs_forkdetect(void)
++{
++	static pid_t _rs_pid = 0;
++	pid_t pid = getpid();
++
++	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
++		_rs_pid = pid;
++		_rs_forked = 0;
++		if (rs)
++			memset(rs, 0, sizeof(*rs));
++	}
++}
++
++static inline int
++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
++{
++	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
++		return (-1);
++
++	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
++		munmap(*rsp, sizeof(**rsp));
++		return (-1);
++	}
++
++	_ARC4_ATFORK(_rs_forkhandler);
++	return (0);
++}
+diff --git a/src/arc4random_osx.h b/src/arc4random_osx.h
+new file mode 100644
+index 0000000..14771a6
+--- /dev/null
++++ b/src/arc4random_osx.h
+@@ -0,0 +1,82 @@
++/*	$OpenBSD: arc4random_osx.h,v 1.10 2015/09/11 11:52:55 deraadt Exp $	*/
++
++/*
++ * Copyright (c) 1996, David Mazieres <dm@uun.org>
++ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
++ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
++ * Copyright (c) 2014, Theo de Raadt <deraadt@openbsd.org>
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++/*
++ * Stub functions for portability.
++ */
++
++#include <sys/mman.h>
++
++#include <unistd.h>
++#include <pthread.h>
++#include <signal.h>
++
++static pthread_mutex_t arc4random_mtx = PTHREAD_MUTEX_INITIALIZER;
++#define _ARC4_LOCK()   pthread_mutex_lock(&arc4random_mtx)
++#define _ARC4_UNLOCK() pthread_mutex_unlock(&arc4random_mtx)
++
++#define _ARC4_ATFORK(f) pthread_atfork(NULL, NULL, (f))
++
++static inline void
++_getentropy_fail(void)
++{
++	raise(SIGKILL);
++}
++
++static volatile sig_atomic_t _rs_forked;
++
++static inline void
++_rs_forkhandler(void)
++{
++	_rs_forked = 1;
++}
++
++static inline void
++_rs_forkdetect(void)
++{
++	static pid_t _rs_pid = 0;
++	pid_t pid = getpid();
++
++	if (_rs_pid == 0 || _rs_pid != pid || _rs_forked) {
++		_rs_pid = pid;
++		_rs_forked = 0;
++		if (rs)
++			memset(rs, 0, sizeof(*rs));
++	}
++}
++
++static inline int
++_rs_allocate(struct _rs **rsp, struct _rsx **rsxp)
++{
++	if ((*rsp = mmap(NULL, sizeof(**rsp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED)
++		return (-1);
++
++	if ((*rsxp = mmap(NULL, sizeof(**rsxp), PROT_READ|PROT_WRITE,
++	    MAP_ANON|MAP_PRIVATE, -1, 0)) == MAP_FAILED) {
++		munmap(*rsp, sizeof(**rsp));
++		*rsp = NULL;
++		return (-1);
++	}
++
++	_ARC4_ATFORK(_rs_forkhandler);
++	return (0);
++}
+diff --git a/src/fgetln.c b/src/fgetln.c
+index 4d1726e..9c73788 100644
+--- a/src/fgetln.c
++++ b/src/fgetln.c
+@@ -30,7 +30,9 @@
+ #include <sys/types.h>
+ #include <string.h>
+ 
++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ #include "local-link.h"
++#endif
+ 
+ #ifdef HAVE_GETLINE
+ struct filebuf {
+@@ -75,9 +77,11 @@ fgetln(FILE *stream, size_t *len)
+ 		return fb->buf;
+ 	}
+ }
++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
+ libbsd_link_warning(fgetln,
+                     "This functions cannot be safely ported, use getline(3) "
+                     "instead, as it is supported by GNU and POSIX.1-2008.")
++#endif
+ #else
+ #error "Function fgetln() needs to be ported."
+ #endif
+diff --git a/src/fpurge.c b/src/fpurge.c
+index 462535a..e7eb46f 100644
+--- a/src/fpurge.c
++++ b/src/fpurge.c
+@@ -26,9 +26,11 @@
+ 
+ #include <errno.h>
+ #include <stdio.h>
++#if HAVE___FPURGE
+ #include <stdio_ext.h>
++#endif
+ 
+-#ifdef HAVE___FPURGE
++#ifdef HAVE___FPURGE                   /* glibc >= 2.2, Haiku, Solaris >= 7 */
+ int
+ fpurge(FILE *fp)
+ {
+@@ -42,5 +44,55 @@ fpurge(FILE *fp)
+ 	return 0;
+ }
+ #else
+-#error "Function fpurge() needs to be ported."
++#define fp_ fp
++//#error "Function fpurge() needs to be ported."
++//#elif HAVE_FPURGE                   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin 1.7 */
++int
++fpurge(FILE *fp)
++{
++	if (fp == NULL || fileno(fp) < 0) {
++		errno = EBADF;
++		return EOF;
++	}
++
++  /* Call the system's fpurge function.  */
++# undef fpurge
++# if !HAVE_DECL_FPURGE
++  extern int fpurge (FILE *);
++# endif
++  int result = fpurge (fp);
++# if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
++  if (result == 0)
++    /* Correct the invariants that fpurge broke.
++       <stdio.h> on BSD systems says:
++         "The following always hold: if _flags & __SRD, _w is 0."
++       If this invariant is not fulfilled and the stream is read-write but
++       currently reading, subsequent putc or fputc calls will write directly
++       into the buffer, although they shouldn't be allowed to.  */
++    if ((fp_->_flags & __SRD) != 0)
++      fp_->_w = 0;
++#endif
++  return result;
++}
++//#endif
++#endif
++
++#ifdef TEST
++int
++main()
++{
++	static FILE fp_bad;
++	FILE *fp;
++
++	if (fpurge(&fp_bad) == 0)
++		return 1;
++
++	fp = fopen("/dev/zero", "r");
++	if (fpurge(fp) < 0)
++		return 1;
++
++	fclose(fp);
++
++	return 0;
++}
+ #endif
+diff --git a/src/funopen.c b/src/funopen.c
+index 1e05c7e..75e61ea 100644
+--- a/src/funopen.c
++++ b/src/funopen.c
+@@ -143,6 +143,7 @@ funopen(const void *cookie,
+  * they will not add the needed support to implement it. Just ignore this
+  * interface there, as it has never been provided anyway.
+  */
++#elif defined(darwin) || defined(__APPLE__) || defined(MACOSX)
+ #else
+ #error "Function funopen() needs to be ported or disabled."
+ #endif
+diff --git a/src/getentropy.c b/src/getentropy.c
+index 3f11a1e..8a23a07 100644
+--- a/src/getentropy.c
++++ b/src/getentropy.c
+@@ -28,9 +28,7 @@
+ #include "getentropy_linux.c"
+ #elif defined(__GNU__)
+ #include "getentropy_hurd.c"
+-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#include "getentropy_bsd.c"
+-#elif defined(__NetBSD__)
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
+ #include "getentropy_bsd.c"
+ #elif defined(__sun)
+ #include "getentropy_solaris.c"
+diff --git a/src/hash/sha512.h b/src/hash/sha512.h
+index 4f368a1..ab22fc1 100644
+--- a/src/hash/sha512.h
++++ b/src/hash/sha512.h
+@@ -29,7 +29,11 @@
+ #ifndef _SHA512_H_
+ #define _SHA512_H_
+ 
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#include <stdint.h>
++#else
+ #include <sys/types.h>
++#endif
+ 
+ #define SHA512_DIGEST_LENGTH		64
+ 
+diff --git a/src/hash/sha512c.c b/src/hash/sha512c.c
+index b3c8d5e..f69013d 100644
+--- a/src/hash/sha512c.c
++++ b/src/hash/sha512c.c
+@@ -25,7 +25,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
++__FBSDID("$FreeBSD$");
++
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#include <machine/endian.h>
++#else
+ #include <sys/endian.h>
++#endif
+ #include <sys/types.h>
+ 
+ #include <string.h>
+diff --git a/src/nlist.c b/src/nlist.c
+index 0932f59..598a329 100644
+--- a/src/nlist.c
++++ b/src/nlist.c
+@@ -27,6 +27,10 @@
+  * SUCH DAMAGE.
+  */
+ 
++#if !defined(darwin) && !defined(__APPLE__) && !defined(MACOSX)
++#if defined(LIBC_SCCS) && !defined(lint)
++static char sccsid[] = "@(#)nlist.c	8.1 (Berkeley) 6/4/93";
++#endif /* LIBC_SCCS and not lint */
+ #include <sys/cdefs.h>
+ 
+ #include <sys/param.h>
+@@ -265,3 +269,4 @@ nlist(const char *name, struct nlist *list)
+ 	(void)close(fd);
+ 	return (n);
+ }
++#endif /* _NLIST_DO_ELF */
+diff --git a/src/setproctitle.c b/src/setproctitle.c
+index 038ac7d..d0ef01b 100644
+--- a/src/setproctitle.c
++++ b/src/setproctitle.c
+@@ -32,6 +32,11 @@
+ #include <unistd.h>
+ #include <string.h>
+ 
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++#define __asm__(x)
++extern char **environ;
++#endif
++
+ static struct {
+ 	/* Original value. */
+ 	const char *arg0;
+@@ -287,7 +292,14 @@ __asm__(".symver setproctitle_impl,setproctitle@@LIBBSD_0.5");
+  * for code linking against that version, and change the default to use the
+  * new version, so that new code depends on the implemented version. */
+ #ifdef HAVE_TYPEOF
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++//
++// HACK: even weak aliasing breaks in clang so just comment this out for now
++//
++// extern typeof(setproctitle_impl) setproctitle_stub __attribute__((weak, alias("setproctitle_impl")));
++#else
+ extern typeof(setproctitle_impl) setproctitle_stub __attribute__((alias("setproctitle_impl")));
++#endif
+ #else
+ void setproctitle_stub(const char *fmt, ...)
+ 	__attribute__((alias("setproctitle_impl")));
+diff --git a/src/strlcat.c b/src/strlcat.c
+index 14c53a1..e01cb60 100644
+--- a/src/strlcat.c
++++ b/src/strlcat.c
+@@ -27,7 +27,11 @@
+  * If retval >= dsize, truncation occurred.
+  */
+ size_t
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++bsd_strlcat(char *dst, const char *src, size_t dsize)
++#else
+ strlcat(char *dst, const char *src, size_t dsize)
++#endif
+ {
+ 	const char *odst = dst;
+ 	const char *osrc = src;
+diff --git a/src/strlcpy.c b/src/strlcpy.c
+index e9a7fe4..10a855f 100644
+--- a/src/strlcpy.c
++++ b/src/strlcpy.c
+@@ -25,7 +25,11 @@
+  * Returns strlen(src); if retval >= dsize, truncation occurred.
+  */
+ size_t
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++bsd_strlcpy(char *dst, const char *src, size_t dsize)
++#else
+ strlcpy(char *dst, const char *src, size_t dsize)
++#endif
+ {
+ 	const char *osrc = src;
+ 	size_t nleft = dsize;
+diff --git a/src/strmode.c b/src/strmode.c
+index e6afde5..c463243 100644
+--- a/src/strmode.c
++++ b/src/strmode.c
+@@ -33,7 +33,11 @@
+ #include <string.h>
+ 
+ void
++#if defined(darwin) || defined(__APPLE__) || defined(MACOSX)
++bsd_strmode(mode_t mode, char *p)
++#else
+ strmode(mode_t mode, char *p)
++#endif
+ {
+ 	 /* print type */
+ 	switch (mode & S_IFMT) {
diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
new file mode 100644
index 000000000000..ff9412ceb580
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, autoreconfHook }:
+
+stdenv.mkDerivation rec {
+  name = "libbsd-${version}";
+  version = "0.8.7";
+
+  src = fetchurl {
+    url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "0c9bl49zs0xdddcwj5dh0lay9sxi2m1yi74848g8p87mb87g2j7m";
+  };
+
+  # darwin changes configure.ac which means we need to regenerate
+  # the configure scripts
+  nativeBuildInputs = [ autoreconfHook ];
+
+  patches = stdenv.lib.optional stdenv.isDarwin ./darwin.patch
+    # Suitable for all, but limited to musl to avoid rebuilds
+    ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [
+      # https://cgit.freedesktop.org/libbsd/commit/?id=1f8a3f7bccfc84b195218ad0086ebd57049c3490
+      ./non-glibc.patch
+      # https://cgit.freedesktop.org/libbsd/commit/?id=11ec8f1e5dfa1c10e0c9fb94879b6f5b96ba52dd
+      ./cdefs.patch
+      # https://cgit.freedesktop.org/libbsd/commit/?id=b20272f5a966333b49fdf2bda797e2a9f0227404
+      ./features.patch
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Common functions found on BSD systems";
+    homepage = https://libbsd.freedesktop.org/;
+    license = licenses.bsd3;
+    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = with maintainers; [ matthewbauer ];
+  };
+}
diff --git a/pkgs/development/libraries/libbsd/features.patch b/pkgs/development/libraries/libbsd/features.patch
new file mode 100644
index 000000000000..66bd1e9232ba
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/features.patch
@@ -0,0 +1,26 @@
+From b20272f5a966333b49fdf2bda797e2a9f0227404 Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem@hadrons.org>
+Date: Tue, 6 Mar 2018 01:42:52 +0100
+Subject: Remove <features.h> inclusion from <bsd/libutil.h>
+
+This is a non-portable header, and we should not assume it is present.
+Let the first system header pull it in if needed.
+---
+ include/bsd/libutil.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/include/bsd/libutil.h b/include/bsd/libutil.h
+index ccca29a..e5f148a 100644
+--- a/include/bsd/libutil.h
++++ b/include/bsd/libutil.h
+@@ -39,7 +39,6 @@
+ #ifndef LIBBSD_LIBUTIL_H
+ #define LIBBSD_LIBUTIL_H
+ 
+-#include <features.h>
+ #ifdef LIBBSD_OVERLAY
+ #include <sys/cdefs.h>
+ #else
+-- 
+cgit v1.1
+
diff --git a/pkgs/development/libraries/libbsd/non-glibc.patch b/pkgs/development/libraries/libbsd/non-glibc.patch
new file mode 100644
index 000000000000..f61e0d242943
--- /dev/null
+++ b/pkgs/development/libraries/libbsd/non-glibc.patch
@@ -0,0 +1,74 @@
+From 1f8a3f7bccfc84b195218ad0086ebd57049c3490 Mon Sep 17 00:00:00 2001
+From: Guillem Jover <guillem@hadrons.org>
+Date: Tue, 6 Mar 2018 01:39:45 +0100
+Subject: Fix function declaration protection for glibc already providing them
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+On non-glibc based systems we cannot unconditionally use the
+__GLIBC_PREREQ macro as it gets expanded before evaluation. Instead,
+if it is undefined, define it to 0.
+
+We should also always declare these functions on non-glibc based
+systems. And on systems with a new enough glibc, which provides these
+functions, we should still provide the declarations if _GNU_SOURCE
+is *not* defined.
+
+Reported-by: Jörg Krause <joerg.krause@embedded.rocks>
+---
+ include/bsd/stdlib.h    | 3 ++-
+ include/bsd/string.h    | 3 ++-
+ include/bsd/sys/cdefs.h | 8 ++++++++
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/include/bsd/stdlib.h b/include/bsd/stdlib.h
+index 8d33d1f..a5b063c 100644
+--- a/include/bsd/stdlib.h
++++ b/include/bsd/stdlib.h
+@@ -71,7 +71,8 @@ int sradixsort(const unsigned char **base, int nmemb,
+                const unsigned char *table, unsigned endbyte);
+ 
+ void *reallocf(void *ptr, size_t size);
+-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 26)
++#if !defined(__GLIBC__) || \
++    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 26) || !defined(_GNU_SOURCE)))
+ void *reallocarray(void *ptr, size_t nmemb, size_t size);
+ #endif
+ 
+diff --git a/include/bsd/string.h b/include/bsd/string.h
+index 29097f6..f987fee 100644
+--- a/include/bsd/string.h
++++ b/include/bsd/string.h
+@@ -46,7 +46,8 @@ size_t strlcat(char *dst, const char *src, size_t siz);
+ char *strnstr(const char *str, const char *find, size_t str_len);
+ void strmode(mode_t mode, char *str);
+ 
+-#if defined(_GNU_SOURCE) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 25)
++#if !defined(__GLIBC__) || \
++    (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE)))
+ void explicit_bzero(void *buf, size_t len);
+ #endif
+ __END_DECLS
+diff --git a/include/bsd/sys/cdefs.h b/include/bsd/sys/cdefs.h
+index b4c8f30..d1cc419 100644
+--- a/include/bsd/sys/cdefs.h
++++ b/include/bsd/sys/cdefs.h
+@@ -59,6 +59,14 @@
+ #endif
+ 
+ /*
++ * On non-glibc based systems, we cannot unconditionally use the
++ * __GLIBC_PREREQ macro as it gets expanded before evaluation.
++ */
++#ifndef __GLIBC_PREREQ
++#define __GLIBC_PREREQ(maj, min) 0
++#endif
++
++/*
+  * Some kFreeBSD headers expect those macros to be set for sanity checks.
+  */
+ #ifndef _SYS_CDEFS_H_
+-- 
+cgit v1.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c537cdf8bc77..99c3324e0673 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2384,6 +2384,8 @@ with pkgs;
 
   flvstreamer = callPackage ../tools/networking/flvstreamer { };
 
+  libbsd = callPackage ../development/libraries/libbsd { };
+
   libbladeRF = callPackage ../development/libraries/libbladeRF { };
 
   lp_solve = callPackage ../applications/science/math/lp_solve { };
@@ -21527,8 +21529,6 @@ with pkgs;
 
   fts = if hostPlatform.isMusl then netbsd.fts else null;
 
-  libbsd = netbsd.compat;
-
   inherit (recurseIntoAttrs (callPackages ../os-specific/bsd { }))
           netbsd;
 

From 5835aff59c78deda25a882ebe025017802a4abf0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 5 Jun 2018 21:22:05 -0700
Subject: [PATCH 3098/3370] quodlibet: 4.0.2 -> 4.1.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/quodlibet/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/exfalso had a zero exit code or showed the expected version
- /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/operon passed the binary check.
- Warning: no invocation of /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/quodlibet had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/..exfalso-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/.exfalso-wrapped had a zero exit code or showed the expected version
- /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/..operon-wrapped-wrapped passed the binary check.
- /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/.operon-wrapped passed the binary check.
- Warning: no invocation of /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/..quodlibet-wrapped-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0/bin/.quodlibet-wrapped had a zero exit code or showed the expected version
- 3 of 9 passed binary check by having a zero exit code.
- 0 of 9 passed binary check by having the new version present in output.
- found 4.1.0 with grep in /nix/store/3p27i5pd743r3jxcpffgm4646xmcx5x7-quodlibet-4.1.0
- directory tree listing: https://gist.github.com/296d4e647e2235036b698f635ea58ee1
- du listing: https://gist.github.com/78b82ba179474dd128d2bd74355001fe
---
 pkgs/applications/audio/quodlibet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 972da4f773f6..e7073d0c95e9 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -9,7 +9,7 @@
 let optionals = stdenv.lib.optionals; in
 python3.pkgs.buildPythonApplication rec {
   name = "quodlibet${tag}-${version}";
-  version = "4.0.2";
+  version = "4.1.0";
 
   # XXX, tests fail
   # https://github.com/quodlibet/quodlibet/issues/2820
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
 
   src = fetchurl {
     url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
-    sha256 = "072s983p3n84yl807pbdxsy5vrgs8jzzfl648gsri6kpwsp6w5fz";
+    sha256 = "1vcxx4sz5i4ag74pjpdfw7jkwxfb8jhvn8igcjwd5cccw4gscm2z";
   };
 
   nativeBuildInputs = [ wrapGAppsHook gettext intltool ];

From a1df64bab5492eb481baed7aab67eb1cdc439617 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 5 Jun 2018 21:43:54 -0700
Subject: [PATCH 3099/3370] qrencode: 4.0.0 -> 4.0.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qrencode/versions.

These checks were done:

- built on NixOS
- /nix/store/b6r4hmimplv6bb9c6hifz12fviffv7sy-qrencode-4.0.1/bin/qrencode passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 4.0.1 with grep in /nix/store/b6r4hmimplv6bb9c6hifz12fviffv7sy-qrencode-4.0.1
- directory tree listing: https://gist.github.com/baadc6a6ea64d66edc20bd100d9f2c44
- du listing: https://gist.github.com/c734323c8b2a2924e59912df5f75be0d
---
 pkgs/tools/graphics/qrencode/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
index a83e38e577dd..5620f5058a5f 100644
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ b/pkgs/tools/graphics/qrencode/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "qrencode-4.0.0";
+  name = "qrencode-4.0.1";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "02vx69fl52jbcrmnydsaxcmy6nxqm9jyxzd7hr07s491d7hka069";
+    sha256 = "0j7cqhjc0l6i99lzph51gakmcmfs74x483plna93r4ngz328knph";
   };
 
   buildInputs = [ libpng ];

From e32cdcb7e6250dcc555fe1ac38197cfcb37954be Mon Sep 17 00:00:00 2001
From: Will Dietz <github@wdtz.org>
Date: Wed, 6 Jun 2018 00:20:15 -0500
Subject: [PATCH 3100/3370] gnuplot: 5.2.3 -> 5.2.4 (#41505)

http://www.gnuplot.info/ReleaseNotes_5_2_4.html
---
 pkgs/tools/graphics/gnuplot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index b2b8508640bf..0a4ebf495b24 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -20,11 +20,11 @@ let
   withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
 stdenv.mkDerivation rec {
-  name = "gnuplot-5.2.3";
+  name = "gnuplot-5.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
-    sha256 = "0977vgjszjpqhz2jahq07zmcmi0k9d6v7wq70ph2klfrb29qrdgy";
+    sha256 = "1jvh8xmd2cvrhlsg88kxwh55wkwx31sg50v1n59slfippl0g058m";
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig texinfo ] ++ lib.optional withQt qttools;

From 810e6759c23c8e1a71bc0963e712757327c91911 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Tue, 5 Jun 2018 21:54:27 +0200
Subject: [PATCH 3101/3370] rustc: 1.26.1 -> 1.26.2

---
 pkgs/development/compilers/rust/binaryBuild.nix |  2 +-
 pkgs/development/compilers/rust/bootstrap.nix   | 14 +++++++-------
 pkgs/development/compilers/rust/default.nix     |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/rust/binaryBuild.nix b/pkgs/development/compilers/rust/binaryBuild.nix
index 1904c12dfdc1..849917c4a0c4 100644
--- a/pkgs/development/compilers/rust/binaryBuild.nix
+++ b/pkgs/development/compilers/rust/binaryBuild.nix
@@ -14,7 +14,7 @@ let
 
   installComponents
     = "rustc,rust-std-${platform}"
-    + (optionalString bootstrapping ",rust-docs,cargo")
+    + (optionalString bootstrapping ",cargo")
     ;
 in
 
diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix
index 589054ef4384..9d67dd8f8564 100644
--- a/pkgs/development/compilers/rust/bootstrap.nix
+++ b/pkgs/development/compilers/rust/bootstrap.nix
@@ -3,16 +3,16 @@
 let
   # Note: the version MUST be one version prior to the version we're
   # building
-  version = "1.26.0";
+  version = "1.26.1";
 
   # fetch hashes by running `print-hashes.sh 1.24.1`
   hashes = {
-    i686-unknown-linux-gnu = "2aef0709b1f2e93d396143b7a926f262ac6fd24dd8768bf2c9425255a4a401c1";
-    x86_64-unknown-linux-gnu = "13691d7782577fc9f110924b26603ade1990de0b691a3ce2dc324b4a72a64a68";
-    armv7-unknown-linux-gnueabihf = "d10c892cd3267010068930599e1e3835b50c6ba5261a912107dcba5ca1893ec5";
-    aarch64-unknown-linux-gnu = "e12dc84bdb569cdb382268a5fe6ae6a8e2e53810cb890ec3a7133c20ba8451ac";
-    i686-apple-darwin = "04dd24d7a5d5e02d5e992eaabd5952d39363885ce2a9980e3e96e5bc09dab2f0";
-    x86_64-apple-darwin = "38708803c3096b8f101d1919ee2d7e723b0adf1bc1bb986b060973b57d8c7c28";
+    i686-unknown-linux-gnu = "d704ba5cbaaf93c5e2112d211630db0e460d5dc819a43464ba91581e5c821df3";
+    x86_64-unknown-linux-gnu = "b7e964bace1286696d511c287b945f3ece476ba77a231f0c31f1867dfa5080e0";
+    armv7-unknown-linux-gnueabihf = "34fbcebc8e60b6496f1ce7998cf0b50cd618770f039da529b65110fff1f25fa0";
+    aarch64-unknown-linux-gnu = "d4a369053c2dfd5f457de6853557dab563944579fa4bb55bc919bacf259bff6d";
+    i686-apple-darwin = "047c31a872161ebb1d21ef616f7658190403769a8734f84364a3cf15838b4708";
+    x86_64-apple-darwin = "ebf898b9fa7e2aafc53682a41f18af5ca6660ebe82dd78f28cd9799fe4dc189a";
   };
 
   platform =
diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index f3fe7b07b9a7..e6caebe88bfe 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -6,11 +6,11 @@
 
 let
   rustPlatform = recurseIntoAttrs (makeRustPlatform (callPackage ./bootstrap.nix {}));
-  version = "1.26.1";
-  cargoVersion = "1.26.1";
+  version = "1.26.2";
+  cargoVersion = "1.26.2";
   src = fetchurl {
     url = "https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
-    sha256 = "1w0da0cysvzxqyn0ap0aprzlm006185yk5lq3v0b4hzcv0drd9vh";
+    sha256 = "0047ais0fvmqvngqkdsxgrzhb0kljg8wy85b01kbbjc88hqcz7pv";
   };
 in rec {
   rustc = callPackage ./rustc.nix {

From 0a016775338f62843a14bcd21499b1b9b3c521b1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 5 Jun 2018 23:27:07 -0700
Subject: [PATCH 3102/3370] wireless-regdb: 2018.05.09 -> 2018.05.31 (#41502)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wireless-regdb/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/eb0bfbd5021737ca480ef0988bdb7c0b
- du listing: https://gist.github.com/bef51cf6379ac49345c3a945c0d86181
---
 pkgs/data/misc/wireless-regdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index 0805a62b15e0..b386b18e69e2 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2018.05.09";
+  version = "2018.05.31";
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/network/wireless-regdb/${name}.tar.xz";
-    sha256 = "0db4p8m194cjydrv9q7ygx62v202sighb9pizbn8a29anvm0cmzd";
+    sha256 = "0yxydxkmcb6iryrbazdk8lqqibig102kq323gw3p64vpjwxvrpz1";
   };
 
   dontBuild = true;

From 52e3ce6107825dfaf1a9ad4669ea874b184f5131 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 5 Jun 2018 23:31:02 -0700
Subject: [PATCH 3103/3370] renpy: 6.99.14.3 -> 7.0.0 (#41515)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/renpy/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/ahy8smyhk0l4jhca9gnzvw7pgl82aw0z-renpy-7.0.0/bin/renpy had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 7.0.0 with grep in /nix/store/ahy8smyhk0l4jhca9gnzvw7pgl82aw0z-renpy-7.0.0
- directory tree listing: https://gist.github.com/d2bcdfe97ec6d25a85ed5c0960610062
- du listing: https://gist.github.com/a9cf861b24bbd391732cfc7a596b829a
---
 pkgs/development/interpreters/renpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix
index a992717d94f3..220aa9abe558 100644
--- a/pkgs/development/interpreters/renpy/default.nix
+++ b/pkgs/development/interpreters/renpy/default.nix
@@ -7,7 +7,7 @@ with pythonPackages;
 
 stdenv.mkDerivation rec {
   name = "renpy-${version}";
-  version = "6.99.14.3";
+  version = "7.0.0";
 
   meta = with stdenv.lib; {
     description = "Ren'Py Visual Novel Engine";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.renpy.org/dl/${version}/renpy-${version}-source.tar.bz2";
-    sha256 = "15n29ybblcpnfbmhc31gm5vj7cpqd8cwrcqxlwnxy0gjpbc50x73";
+    sha256 = "0yrwp5iw4fjg7kbd041qv8gh2p0dnbrnkrgmn0ndk5k10pjij82g";
   };
 
   patches = [

From e28ebcf8d71142f5e2fe2dd66bfb71d5fd4c7a99 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 5 Jun 2018 23:35:10 -0700
Subject: [PATCH 3104/3370] pmd: 6.3.0 -> 6.4.0 (#41529)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pmd/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/bgastviewer.bat had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/cpdgui.bat had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/designer.bat had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/pmd.bat had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/cpd.bat had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0/bin/run.sh had a zero exit code or showed the expected version
- 0 of 6 passed binary check by having a zero exit code.
- 0 of 6 passed binary check by having the new version present in output.
- found 6.4.0 with grep in /nix/store/vjq9c2hiwhwz3blq7dpv4dbb715sb4di-pmd-6.4.0
- directory tree listing: https://gist.github.com/c371521af22489a6f711d026a7ae6ca8
- du listing: https://gist.github.com/c80d6292115b6f1817e4c877e3b840a9
---
 pkgs/development/tools/analysis/pmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/pmd/default.nix b/pkgs/development/tools/analysis/pmd/default.nix
index 6f908128e599..e738d30543ed 100644
--- a/pkgs/development/tools/analysis/pmd/default.nix
+++ b/pkgs/development/tools/analysis/pmd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pmd-${version}";
-  version = "6.3.0";
+  version = "6.4.0";
 
   buildInputs = [ unzip ];
 
   src = fetchurl {
     url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip";
-    sha256 = "09x6mpqz4z583lvliipkmvlv3qmmwi7zjzgfjhwyp27faf2pz1ym";
+    sha256 = "17yjjmqcn1fy3bj73nh5i84yc7wappza612a0iwg0lqqn4yl7lyn";
   };
 
   installPhase = ''

From 231bcd3555817afc02476d6372ac0d35c462405d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 5 Jun 2018 23:36:30 -0700
Subject: [PATCH 3105/3370] pkcs11helper: 1.22 -> 1.23 (#41530)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pkcs11-helper/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 1.23 with grep in /nix/store/njd3rr6rvfss4xm4slpj7pxcp7ydlkxx-pkcs11-helper-1.23
- directory tree listing: https://gist.github.com/dfd004f45e4a3e63bf0656538040eb38
- du listing: https://gist.github.com/197b03678f9126503098e42ad217a12b
---
 pkgs/development/libraries/pkcs11helper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix
index 1a1bb1800cf2..0c5d5e22e696 100644
--- a/pkgs/development/libraries/pkcs11helper/default.nix
+++ b/pkgs/development/libraries/pkcs11helper/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "pkcs11-helper-${version}";
-  version = "1.22";
+  version = "1.23";
 
   src = fetchFromGitHub {
     owner = "OpenSC";
     repo = "pkcs11-helper";
     rev = "${name}";
-    sha256 = "01v3zv6sr5phqhr2f21fl2rmcnmkp9518dkq82g1v2y9ysjksg7q";
+    sha256 = "1m3fp3v6c903cs36bvvg0h65p1sdamsmzy13ww0zyvplcycarz0n";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 46dfe1eca806defde9a13fb8a94254ba5b086f7a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 5 Jun 2018 23:37:08 -0700
Subject: [PATCH 3106/3370] osinfo-db: 20180514 -> 20180531 (#41532)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/osinfo-db/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 20180531 with grep in /nix/store/25851x07kvaxfb8s7427mhpvylj8swg1-osinfo-db-20180531
- directory tree listing: https://gist.github.com/60bc6cf4445cc0ea32c19263635f4abc
- du listing: https://gist.github.com/f17e071004c463f800b9a570501643e5
---
 pkgs/data/misc/osinfo-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index 7f0fbd71021b..9919fb57f7cc 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, osinfo-db-tools, intltool, libxml2 }:
 
 stdenv.mkDerivation rec {
-  name = "osinfo-db-20180514";
+  name = "osinfo-db-20180531";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.xz";
-    sha256 = "1pyz89gwn3s9ha4chgfcfddi6dixm2dp4zsypfd38fwhqa9v0ij2";
+    sha256 = "0vw6hn7xdfj0q7wc3k9b0nvbghdp1b9dl63xz2v7frr55qv59m5x";
   };
 
   nativeBuildInputs = [ osinfo-db-tools intltool libxml2 ];

From cd1dd31772cfc969089d0a130a375d744ce6736c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 5 Jun 2018 23:44:33 -0700
Subject: [PATCH 3107/3370] monit: 5.25.1 -> 5.25.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/monit/versions.

These checks were done:

- built on NixOS
- /nix/store/mh4qnd2ljfha67cv20lvkiyxr1cj0ar7-monit-5.25.2/bin/monit passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 5.25.2 with grep in /nix/store/mh4qnd2ljfha67cv20lvkiyxr1cj0ar7-monit-5.25.2
- directory tree listing: https://gist.github.com/510e765f79571ddc4c2542c69dffc6f3
- du listing: https://gist.github.com/31af9a371bca965d4d606614e84025d4
---
 pkgs/tools/system/monit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index a5d6f2f518c8..17e472b8d2be 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -3,11 +3,11 @@
 let useSSL = (openssl != null);
     isCross = ( buildPlatform != hostPlatform ) ; in
 stdenv.mkDerivation rec {
-  name = "monit-5.25.1";
+  name = "monit-5.25.2";
 
   src = fetchurl {
     url = "${meta.homepage}dist/${name}.tar.gz";
-    sha256 = "1g417cf6j0v6z233a3625fw1cxsh45xql7ag83jz2988n772ap2b";
+    sha256 = "0jn6mdsh50zd3jc61hr1y8sd80r01gqcyvd860zf8m8i3lvfc35a";
   };
 
   nativeBuildInputs = [ bison flex ];

From 9114b4731454cbbe547b8a0279b5084a672e6064 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 May 2018 05:50:12 +0000
Subject: [PATCH 3108/3370] ocamlPackages.gg: use opaline

---
 pkgs/development/ocaml-modules/gg/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix
index 0839ff361aea..0c80f39d9d7d 100644
--- a/pkgs/development/ocaml-modules/gg/default.nix
+++ b/pkgs/development/ocaml-modules/gg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
 
 let
   inherit (stdenv.lib) getVersion versionAtLeast;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  buildInputs = [ ocaml findlib ocamlbuild opaline ];
 
   createFindlibDestdir = true;
 
@@ -27,10 +27,7 @@ stdenv.mkDerivation rec {
 
   buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
 
-  installPhase = ''
-    opam-installer --script --prefix=$out ${pname}.install | sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
-  '';
+  installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";
 
   meta = with stdenv.lib; {
     description = "Basic types for computer graphics in OCaml";

From 853fb4598fcc96c7f27c795332d49292f871edcd Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 May 2018 06:08:03 +0000
Subject: [PATCH 3109/3370] ocamlPackages.uchar: use opaline

---
 pkgs/development/ocaml-modules/uchar/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix
index 6b27f00fb150..8fddf883da5d 100644
--- a/pkgs/development/ocaml-modules/uchar/default.nix
+++ b/pkgs/development/ocaml-modules/uchar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
 
 stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-uchar-0.0.2";
@@ -9,15 +9,9 @@ stdenv.mkDerivation {
   };
 
   unpackCmd = "tar xjf $src";
-  buildInputs = [ ocaml ocamlbuild opam ];
+  buildInputs = [ ocaml ocamlbuild findlib opaline ];
   buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
-  installPhase = ''
-    opam-installer --script --prefix=$out uchar.install > install.sh
-    sh install.sh
-    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/
-    ln -s $out/lib/uchar $out/lib/ocaml/${ocaml.version}/site-lib/
-  '';
-
+  installPhase = "opaline -libdir $OCAMLFIND_DESTDIR";
 
   meta = {
     description = "Compatibility library for OCaml’s Uchar module";

From c066d9dfc3c3848036ee6ea6c90622de006215b3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 May 2018 06:12:16 +0000
Subject: [PATCH 3110/3370] ocamlPackages.topkg: use opaline

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

diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix
index 9a655e055131..3ff641ff93e5 100644
--- a/pkgs/development/ocaml-modules/topkg/default.nix
+++ b/pkgs/development/ocaml-modules/topkg/default.nix
@@ -5,7 +5,7 @@ The `buildPhase` and `installPhase` attributes can be reused directly
 in many cases. When more fine-grained control on how to run the “topkg”
 build system is required, the attribute `run` can be used.
 */
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opaline }:
 
 if !stdenv.lib.versionAtLeast ocaml.version "4.01"
 then throw "topkg is not available for OCaml ${ocaml.version}"
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   unpackCmd = "tar xjf ${src}";
   buildPhase = "${run} build";
   createFindlibDestdir = true;
-  installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+  installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
 
   passthru = { inherit run; };
 

From 29a6ca660af6bcc20c87b6b4b88510016551d676 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 May 2018 06:12:33 +0000
Subject: [PATCH 3111/3370] jbuilder: use opaline

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

diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix
index 38fd4323d5ca..abfcdb61c1e6 100644
--- a/pkgs/development/tools/ocaml/jbuilder/default.nix
+++ b/pkgs/development/tools/ocaml/jbuilder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, opam }:
+{ stdenv, fetchFromGitHub, ocamlPackages, opaline }:
 
 stdenv.mkDerivation rec {
   name = "jbuilder-${version}";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f";
   };
 
-  buildInputs = [ ocaml ];
+  buildInputs = with ocamlPackages; [ ocaml findlib ];
 
   dontAddPrefix = true;
 
-  installPhase = "${opam}/bin/opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+  installPhase = "${opaline}/bin/opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
 
   preFixup = "rm -rf $out/jbuilder";
 
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     description = "Fast, portable and opinionated build system";
     maintainers = [ stdenv.lib.maintainers.vbgl ];
     license = stdenv.lib.licenses.asl20;
-    inherit (ocaml.meta) platforms;
+    inherit (ocamlPackages.ocaml.meta) platforms;
   };
 }

From 8e0100ba8516a4c0bd7bafa49ccd5673bcadfbfb Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 May 2018 06:50:17 +0000
Subject: [PATCH 3112/3370] ocamlPackages.ppx_import: use opaline

---
 pkgs/development/ocaml-modules/ppx_import/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index 991af1e41de1..3948cfce0e8e 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, buildOcaml, ocaml, opam,
+{stdenv, fetchFromGitHub, buildOcaml, ocaml, opaline,
  cppo, ppx_tools, ounit, ppx_deriving}:
 
 buildOcaml rec {
@@ -15,15 +15,12 @@ buildOcaml rec {
     sha256 = "14c2lp7r9080c4hsb1y1drbxxx3v44b7ib5wfh3kkh3f1jfsjwbk";
   };
 
-  buildInputs = [ cppo ounit ppx_deriving opam ];
+  buildInputs = [ cppo ounit ppx_deriving opaline ];
 
   doCheck = true;
   checkTarget = "test";
 
-  installPhase = ''
-    opam-installer --script --prefix=$out ppx_import.install | sh
-    ln -s $out/lib/ppx_import $out/lib/ocaml/${ocaml.version}/site-lib
-  '';
+  installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
 
   meta = with stdenv.lib; {
     description = "A syntax extension that allows to pull in types or signatures from other compiled interface files";

From e7795ce53e6e7fff4c5b43b29ff4b682ea8d563d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 May 2018 06:52:45 +0000
Subject: [PATCH 3113/3370] ocamlPackages.reactivedata: use opaline

---
 pkgs/development/ocaml-modules/reactivedata/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix
index 1f1781f5a65b..fa85f2174688 100644
--- a/pkgs/development/ocaml-modules/reactivedata/default.nix
+++ b/pkgs/development/ocaml-modules/reactivedata/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, react, opaline }:
 
 assert stdenv.lib.versionAtLeast ocaml.version "3.11";
 
@@ -9,12 +9,12 @@ stdenv.mkDerivation {
     sha256 = "0wcs0z50nia1cpk8mh6i5qbc6sff9cc8x7s7q1q89d7m73bnv4vf";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild opam ];
+  buildInputs = [ ocaml findlib ocamlbuild opaline ];
   propagatedBuildInputs = [ react ];
 
   buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true";
 
-  installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+  installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
 
   meta = with stdenv.lib; {
     description = "An OCaml module for functional reactive programming (FRP) based on React";

From cb5d4c1205d432b1098d59633cf73ebc23f31548 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 28 May 2018 07:35:51 +0000
Subject: [PATCH 3114/3370] ocamlPackages.eliom: use opaline

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

diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index da9383c4e95b..8b304aadd9ef 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, which, ocsigen_server, ocsigen_deriving, ocaml, camlp4,
   js_of_ocaml, lwt_react, cryptokit,
   ipaddr, ocamlnet, lwt_ssl, ocaml_pcre,
-  opam, ppx_tools, ppx_deriving, findlib
+  opaline, ppx_tools, ppx_deriving, findlib
 , js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
 , js_of_ocaml-lwt
 , js_of_ocaml-tyxml
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec
 
   patches = [ ./camlp4.patch ];
 
-  buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opam ppx_tools
+  buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ppx_tools
     ocsigen_deriving
   ];
 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec
     ppx_deriving
   ];
 
-  installPhase = "opam-installer -i --prefix=$out --libdir=$OCAMLFIND_DESTDIR";
+  installPhase = "opaline -prefix $out -libdir $OCAMLFIND_DESTDIR";
 
   setupHook = [ ./setup-hook.sh ];
 

From 69ac6be0096c15b0a2f60b788aac00dc99ccce1c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 29 May 2018 05:15:32 +0000
Subject: [PATCH 3115/3370] ocamlPackages.ocsigen-toolkit: use opaline

---
 pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
index 556c343241c3..37c8c8f76c95 100644
--- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
+++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildOcaml, ocaml, opam
+{ stdenv, fetchurl, buildOcaml, ocaml, opaline
 , calendar, eliom, js_of_ocaml-ppx_deriving_json
 }:
 
@@ -8,13 +8,13 @@ buildOcaml rec
  version = "1.1.0";
 
  propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
- buildInputs = [ opam ];
+ buildInputs = [ opaline ];
 
  installPhase =
   ''
     export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH
     make install
-    opam-installer --prefix=$out
+    opaline -prefix $out
   '';
 
   src = fetchurl {

From 535a8b000f7f7538de70f8441c56316c51355451 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 29 May 2018 05:26:45 +0000
Subject: [PATCH 3116/3370] ocamlPackages.buildOcamlJane: use opaline

---
 .../ocaml-modules/janestreet/buildOcamlJane.nix    | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
index 61b2038bfd29..fdb0d8034e69 100644
--- a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
+++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix
@@ -1,4 +1,4 @@
-{ buildOcaml, opam, js_build_tools, ocaml_oasis, fetchurl } :
+{ buildOcaml, opaline, js_build_tools, ocaml_oasis, fetchurl } :
 
 { name, version ? "113.33.03", buildInputs ? [],
   hash ? "",
@@ -14,7 +14,7 @@ buildOcaml (args // {
 
   hasSharedObjects = true;
 
-  buildInputs = [ ocaml_oasis js_build_tools opam ] ++ buildInputs;
+  buildInputs = [ ocaml_oasis js_build_tools opaline ] ++ buildInputs;
 
   dontAddPrefix = true;
 
@@ -22,14 +22,6 @@ buildOcaml (args // {
 
   buildPhase = "OCAML_TOPLEVEL_PATH=`ocamlfind query findlib`/.. make";
 
-  installPhase = ''
-    opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` --stubsdir `ocamlfind printconf destdir`/${name} ${name}.install
-    if [ -d $out/lib/${name} ]
-      then if [ "$(ls -A $out/lib/${name})" ]
-        then mv $out/lib/${name}/* `ocamlfind printconf destdir`/${name}
-      fi
-      rmdir $out/lib/${name}
-    fi
-  '';
+  installPhase = "opaline -prefix $prefix -libdir $OCAMLFIND_DESTDIR ${name}.install";
 
 })

From 733d88574b46b666648140c3505f32fc5cc6acec Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 29 May 2018 05:27:27 +0000
Subject: [PATCH 3117/3370] ocamlPackages.js-build-tools: use opaline

---
 .../development/ocaml-modules/janestreet/js-build-tools.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
index 2c314f3dbdea..f77b793bcaab 100644
--- a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
+++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opam }:
+{ stdenv, buildOcaml, fetchurl, ocaml_oasis, opaline }:
 
 buildOcaml rec {
   name = "js-build-tools";
@@ -13,11 +13,11 @@ buildOcaml rec {
 
   hasSharedObjects = true;
 
-  buildInputs = [ ocaml_oasis opam ];
+  buildInputs = [ ocaml_oasis opaline ];
 
   dontAddPrefix = true;
   configurePhase = "./configure --prefix $prefix";
-  installPhase = "opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` ${name}.install";
+  installPhase = "opaline -prefix $prefix -libdir $OCAMLFIND_DESTDIR ${name}.install";
 
   patches = [ ./js-build-tools-darwin.patch ];
 

From 94445ed4bc4229d8bc40076f0d77ff265138c3c9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 29 May 2018 05:28:04 +0000
Subject: [PATCH 3118/3370] ocamlPackages.findlib: fix stublibs

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

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index e25b94714b68..18b84e2c961d 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -50,8 +50,8 @@ stdenv.mkDerivation rec {
         if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib"; then
             export OCAMLPATH="''${OCAMLPATH}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/"
         fi
-        if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"; then
-            export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stubslibs"
+        if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then
+            export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"
         fi
         export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/"
         if test -n "$createFindlibDestdir"; then

From 98e8e95136d3e89fd46c03899aebef10d7e55ee1 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 2 Jun 2018 14:54:51 +0000
Subject: [PATCH 3119/3370] ocamlPackages.nocrypto: use opaline

---
 pkgs/development/ocaml-modules/nocrypto/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix
index cfe3f37800de..6e68c87b5ff0 100644
--- a/pkgs/development/ocaml-modules/nocrypto/default.nix
+++ b/pkgs/development/ocaml-modules/nocrypto/default.nix
@@ -22,10 +22,7 @@ stdenv.mkDerivation rec {
     ppx_sexp_conv ];
   propagatedBuildInputs = [ cstruct zarith sexplib ] ++ optional withLwt cstruct-lwt;
 
-  buildPhase = ''
-    LD_LIBRARY_PATH=${cpuid}/lib/ocaml/${ocaml.version}/site-lib/stubslibs/ \
-    ${topkg.buildPhase} --with-lwt ${boolToString withLwt}
-  '';
+  buildPhase = "${topkg.buildPhase} --with-lwt ${boolToString withLwt}";
   inherit (topkg) installPhase;
 
   meta = {

From 10d70a2ae3e20ae8e578212b4cc92b453445d8ca Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 2 Jun 2018 14:55:23 +0000
Subject: [PATCH 3120/3370] ocamlPackages.lambda-term: fix installPhase

---
 pkgs/development/ocaml-modules/lambda-term/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix
index 769b80ecddce..fdd30d28ed89 100644
--- a/pkgs/development/ocaml-modules/lambda-term/default.nix
+++ b/pkgs/development/ocaml-modules/lambda-term/default.nix
@@ -17,10 +17,7 @@ buildOcaml rec {
 
   buildPhase = "jbuilder build -p lambda-term";
 
-  installPhase = ''
-    ${jbuilder.installPhase}
-    mv $out/lib/ocaml/${ocaml.version}/site-lib/{stubslibs,lambda-term}/dlllambda_term_stubs.so
-  '';
+  inherit (jbuilder) installPhase;
 
   hasSharedObjects = true;
 

From a4fa4c45cc7f0d2057729f0103a1600de32d642d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 2 Jun 2018 14:55:47 +0000
Subject: [PATCH 3121/3370] ocamlPackages.cmdliner_0_9: use opaline

---
 pkgs/development/ocaml-modules/cmdliner/0.9.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cmdliner/0.9.nix b/pkgs/development/ocaml-modules/cmdliner/0.9.nix
index e8824f318071..345d56d21707 100644
--- a/pkgs/development/ocaml-modules/cmdliner/0.9.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/0.9.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }:
+{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opaline }:
 
 let
   pname = "cmdliner";
@@ -17,17 +17,12 @@ stdenv.mkDerivation rec {
   };
 
   unpackCmd = "tar xjf $src";
-  nativeBuildInputs = [ ocamlbuild opam ];
+  nativeBuildInputs = [ ocamlbuild opaline ];
   buildInputs = [ ocaml findlib ];
 
-  createFindlibDestdir = true;
-
   configurePhase = "ocaml pkg/git.ml";
   buildPhase     = "ocaml pkg/build.ml native=true native-dynlink=true";
-  installPhase   = ''
-    opam-installer --script --prefix=$out | sh
-    ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/
-  '';
+  installPhase   = "opaline -libdir $OCAMLFIND_DESTDIR";
 
   meta = with stdenv.lib; {
     homepage = http://erratique.ch/software/cmdliner;

From 2e851f96519f999d5e645ca556193353f2d39186 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 4 Jun 2018 18:28:12 +0000
Subject: [PATCH 3122/3370] ocamlPackages.xmlm: remove at 1.2.0

---
 .../ocaml-modules/xmlm/default.nix            | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
index 9d3a0b1bb4d0..a1765296d57d 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -4,38 +4,24 @@ let
   webpage = "http://erratique.ch/software/${pname}";
 in
 
-assert stdenv.lib.versionAtLeast ocaml.version "3.12";
-
-let param =
-  if stdenv.lib.versionAtLeast ocaml.version "4.02"
-  then {
-    version = "1.3.0";
-    sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n";
-    buildInputs = [ topkg ];
-    inherit (topkg) buildPhase;
-  } else {
-    version = "1.2.0";
-    sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh";
-    buildInputs = [];
-    buildPhase = "./pkg/build true";
-  };
-in
+if !stdenv.lib.versionAtLeast ocaml.version "4.02"
+then throw "xmlm is not available for OCaml ${ocaml.version}"
+else
 
 stdenv.mkDerivation rec {
-  name = "ocaml-${pname}-${version}";
-  inherit (param) version;
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "${webpage}/releases/${pname}-${version}.tbz";
-    inherit (param) sha256;
+    sha256 = "1rrdxg5kh9zaqmgapy9bhdqyxbbvxxib3bdfg1vhw4rrkp1z0x8n";
   };
 
-  buildInputs = [ ocaml findlib ocamlbuild ] ++ param.buildInputs;
+  buildInputs = [ ocaml findlib ocamlbuild topkg ];
 
   unpackCmd = "tar xjf $src";
 
-  inherit (param) buildPhase;
-  inherit (topkg) installPhase;
+  inherit (topkg) buildPhase installPhase;
 
   meta = with stdenv.lib; {
     description = "An OCaml streaming codec to decode and encode the XML data format";

From 07d40825d8ef020f6dd10aa5c64caf395b76799e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 6 Jun 2018 07:13:50 +0000
Subject: [PATCH 3123/3370] ocamlPackages.mstruct: remove spurious dependency

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

diff --git a/pkgs/development/ocaml-modules/mstruct/default.nix b/pkgs/development/ocaml-modules/mstruct/default.nix
index 5aa57ba8fbb8..5682b75d6a14 100644
--- a/pkgs/development/ocaml-modules/mstruct/default.nix
+++ b/pkgs/development/ocaml-modules/mstruct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, opam
+{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
 , cstruct
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 		sha256 = "1p4ygwzs3n1fj4apfib0z0sabpph21bkq1dgjk4bsa59pq4prncm";
 	};
 
-	buildInputs = [ ocaml findlib jbuilder opam ];
+	buildInputs = [ ocaml findlib jbuilder ];
 
 	propagatedBuildInputs = [ cstruct ];
 

From 832973d1791cacedb22f3ee4be87c4c84288f581 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 6 Jun 2018 07:17:52 +0000
Subject: [PATCH 3124/3370] python.pkgs.cairocffi: support darwin

---
 pkgs/development/python-modules/cairocffi/default.nix     | 4 +++-
 .../python-modules/cairocffi/dlopen-paths.patch           | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index a9c4a3437b58..13d00d0529c0 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -1,5 +1,6 @@
 # FIXME: make gdk_pixbuf dependency optional
-{ buildPythonPackage
+{ stdenv
+, buildPythonPackage
 , fetchPypi
 , lib
 , substituteAll
@@ -42,6 +43,7 @@ buildPythonPackage rec {
     # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0
     (substituteAll {
       src = ./dlopen-paths.patch;
+      ext = stdenv.hostPlatform.extensions.sharedLibrary;
       cairo = cairo.out;
       glib = glib.out;
       gdk_pixbuf = gdk_pixbuf.out;
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index bc5e939ceba9..862f7bd4bf7c 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -16,10 +16,10 @@ index 718aa7f..1a1dcff 100644
  
 +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
 +_LIBS = {
-+    'cairo': '@cairo@/lib/libcairo.so.2',
-+    'glib-2.0': '@glib@/lib/libglib-2.0.so.0',
-+    'gobject-2.0': '@glib@/lib/libgobject-2.0.so.0',
-+    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0',
++    'cairo': '@cairo@/lib/libcairo@ext@',
++    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
++    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
++    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
  
 -def dlopen(ffi, *names):

From 632b00f0c975a338873594574702892d95b27fa7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 6 Jun 2018 00:30:17 -0700
Subject: [PATCH 3125/3370] logcheck: 1.3.18 -> 1.3.19

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/logcheck/versions.

These checks were done:

- built on NixOS
- /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19/bin/logcheck-test passed the binary check.
- /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19/bin/logcheck passed the binary check.
- Warning: no invocation of /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19/bin/logtail had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19/bin/logtail2 had a zero exit code or showed the expected version
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 1.3.19 with grep in /nix/store/mvacp7nmvc8fg9jyrspb3if7x22wwa9p-logcheck-1.3.19
- directory tree listing: https://gist.github.com/8e0cb190715df3e41d3fe55fb5ea865f
- du listing: https://gist.github.com/42a702aaffbc35973caa3cde9f16868a
---
 pkgs/tools/system/logcheck/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix
index f27a0cbcb999..0f2de9888e44 100644
--- a/pkgs/tools/system/logcheck/default.nix
+++ b/pkgs/tools/system/logcheck/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "logcheck-${version}";
-  version = "1.3.18";
+  version = "1.3.19";
   _name    = "logcheck_${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/l/logcheck/${_name}.tar.xz";
-    sha256 = "1x4skb5nmv2xj8cygj8pq1rd1ws4m2fsibw54yslgdyjri4r2yq7";
+    sha256 = "1a9ccy92lg1lnx86di6i1wpdv4ccf5w7gials2iyq5915c4lqa86";
   };
 
   prePatch = ''

From fea9bd7717b39eb957857606cab7c8fa221a8f9c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 6 Jun 2018 00:31:21 -0700
Subject: [PATCH 3126/3370] lxcfs: 3.0.0 -> 3.0.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/lxcfs/versions.

These checks were done:

- built on NixOS
- /nix/store/cl7h5cnf1g85ig7sd82iar0cgj1ms4f1-lxcfs-3.0.1/bin/lxcfs passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 3.0.1 with grep in /nix/store/cl7h5cnf1g85ig7sd82iar0cgj1ms4f1-lxcfs-3.0.1
- directory tree listing: https://gist.github.com/76388e1795e7273b4e3035a87a0d4749
- du listing: https://gist.github.com/8217b030a3bd3d182b6edc6439ae67e0
---
 pkgs/os-specific/linux/lxcfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 6f7dd2f56ff7..2bdec70b6f9c 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -3,13 +3,13 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxcfs-3.0.0";
+  name = "lxcfs-3.0.1";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = name;
-    sha256 = "0fsy2h7b5dkzvfm6m8vqzhnji42cszdn0b3ndnaxiwv3402ccmvk";
+    sha256 = "0rwk1nbcjnp2d2zbyng8ix9dmww211aiqq8870r9p4j11xv9mgx4";
   };
 
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];

From 0b97cb69f3b62e7cb4a482744ffdf6c17617b733 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Wed, 6 Jun 2018 15:53:27 +0800
Subject: [PATCH 3127/3370] nodePackages_8_x: Add nodejs (npm) to wrapper

Some pnpm commands forward to npm which might not exist in $PATH
---
 pkgs/development/node-packages/default-v8.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/node-packages/default-v8.nix b/pkgs/development/node-packages/default-v8.nix
index 0428095d97c6..eb87f13f56d3 100644
--- a/pkgs/development/node-packages/default-v8.nix
+++ b/pkgs/development/node-packages/default-v8.nix
@@ -68,9 +68,14 @@ nodePackages // {
 
   pnpm = nodePackages.pnpm.override (oldAttrs: {
     nativeBuildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ];
-    postInstall = ''
+    postInstall = let
+      pnpmLibPath = stdenv.lib.makeBinPath [
+        nodejs.passthru.python
+        nodejs
+      ];
+    in ''
       for prog in $out/bin/*; do
-        wrapProgram "$prog" --prefix PATH : ${stdenv.lib.makeBinPath [ nodejs.passthru.python ]}
+        wrapProgram "$prog" --prefix PATH : ${pnpmLibPath}
       done
     '';
   });

From 07ebb8bb792be16de33596e2cea120eb72b2ec77 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 6 Jun 2018 07:59:59 +0000
Subject: [PATCH 3128/3370] tests.cc-wrapper: do not test sanitizers on darwin

They are not supported yet.

https://github.com/NixOS/nixpkgs/pull/41284#issuecomment-394977350
---
 pkgs/test/cc-wrapper/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 00b964940c81..7061adb8e88a 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -1,8 +1,9 @@
 { stdenv }:
 with stdenv.lib;
 let
+  # Sanitizers are not supported on Darwin.
   # Sanitizer headers aren't available in older libc++ stdenvs due to a bug
-  sanitizersBroken = stdenv.cc.isClang && builtins.compareVersions (getVersion stdenv.cc.name) "6.0.0" < 0;
+  sanitizersBroken = stdenv.isDarwin || stdenv.cc.isClang && builtins.compareVersions (getVersion stdenv.cc.name) "6.0.0" < 0;
 in stdenv.mkDerivation {
   name = "cc-wrapper-test";
 

From a073f266d439e26858132735271ed8a4bc8d75d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 6 Jun 2018 00:22:22 -0700
Subject: [PATCH 3129/3370] lttng-tools: 2.10.3 -> 2.10.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/lttng-tools/versions.

These checks were done:

- built on NixOS
- /nix/store/dkn45wpwlqz4afidp3f2z9gf4a2k331a-lttng-tools-2.10.4/bin/lttng passed the binary check.
- /nix/store/dkn45wpwlqz4afidp3f2z9gf4a2k331a-lttng-tools-2.10.4/bin/lttng-crash passed the binary check.
- /nix/store/dkn45wpwlqz4afidp3f2z9gf4a2k331a-lttng-tools-2.10.4/bin/lttng-relayd passed the binary check.
- /nix/store/dkn45wpwlqz4afidp3f2z9gf4a2k331a-lttng-tools-2.10.4/bin/lttng-sessiond passed the binary check.
- 4 of 4 passed binary check by having a zero exit code.
- 2 of 4 passed binary check by having the new version present in output.
- found 2.10.4 with grep in /nix/store/dkn45wpwlqz4afidp3f2z9gf4a2k331a-lttng-tools-2.10.4
- directory tree listing: https://gist.github.com/e4d67a251f6e4d55bef4903a618d4c77
- du listing: https://gist.github.com/5a95c60b995446339306ed79d3eee027
---
 pkgs/development/tools/misc/lttng-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
index 8294b68126fc..6be23c171a6a 100644
--- a/pkgs/development/tools/misc/lttng-tools/default.nix
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "lttng-tools-${version}";
-  version = "2.10.3";
+  version = "2.10.4";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
-    sha256 = "0x3b6jps053s9pxc7bslj5qsn2z53yf0fk9pcrmxjf9yri17n3qr";
+    sha256 = "1p3y7p8m5i5f8qvsib4da2m41rkw7pamvsngplh7wspgvg0zxvay";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From fa209571e8b352c247af09f46e166b8c5b6bea9c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 6 Jun 2018 02:22:42 -0700
Subject: [PATCH 3130/3370] ipmiutil: 3.1.0 -> 3.1.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ipmiutil/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ipmiutil had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ievents had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/idiscover had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ialarms had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/icmd had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iconfig had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ifirewall had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ifru had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ifwum had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/igetevent had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ihealth had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ihpm had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ilan had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ipicmg had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ipmi_port had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/ireset had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/isel had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iseltime had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/isensor had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iserial had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/isol had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iuser had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/g5xqcpmd9m47yc23dsdczapwlmw56b9a-ipmiutil-3.1.1/bin/iwdt had a zero exit code or showed the expected version
- 0 of 23 passed binary check by having a zero exit code.
- 0 of 23 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/2e464372bda59e64858903e01bf01472
- du listing: https://gist.github.com/310a0565ebec0aa5644c80c0d97ffb94
---
 pkgs/tools/system/ipmiutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix
index bace31a17bda..f3bd820e3e85 100644
--- a/pkgs/tools/system/ipmiutil/default.nix
+++ b/pkgs/tools/system/ipmiutil/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   baseName = "ipmiutil";
-  version = "3.1.0";
+  version = "3.1.1";
   name = "${baseName}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz";
-    sha256 = "1vvdydql5gmq103wr0ris2fvr3l5an2a8zgg2mmgdi88pxi11xfx";
+    sha256 = "1w1smjhinddf139yir44y88j5bjw5kzmprk2ljc3k6xz3va7v1k0";
   };
 
   buildInputs = [ openssl ];

From f65cee3b9c6982408119ffa0b809d0c8a8bd36e3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 11:39:01 +0200
Subject: [PATCH 3131/3370] =?UTF-8?q?gnome3.epiphany:=203.28.1.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/epiphany/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index c9537f497690..f55be458addf 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
-  version = "3.28.1.1";
+  version = "3.28.2.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "15d4dr4dwb1dyw3mvs7wp5gik57kdg0rxdc49n92wx46wfh6lhlr";
+    sha256 = "0ba0qqsbg3cv1k1pcj971y7l8kqib5l7kbr743x9a7hbmkqfk95s";
   };
 
   # Tests need an X display

From 17a8d7f5a45d1bb56c3074e1a6039cbb1caf94ee Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 11:39:22 +0200
Subject: [PATCH 3132/3370] =?UTF-8?q?gnome3.gdm:=203.28.1=20=E2=86=92=203.?=
 =?UTF-8?q?28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix
index 247d3566d6f3..2f7452dbc572 100644
--- a/pkgs/desktops/gnome-3/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/core/gdm/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gdm-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1yxjjyrp0ywrc25cp81bsdhp79zn0c0jag48hlp00b5wfnkqy1kp";
+    sha256 = "0wdm1503x66n1crdlmzmincbd2hccpxsdgjsl5anx3yjpdzs0hb0";
   };
 
   # Only needed to make it build

From 26aca3bee118c1bc658f979022938ed71d97283e Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 11:40:17 +0200
Subject: [PATCH 3133/3370] =?UTF-8?q?gnome3.geocode-glib:=203.25.4.1=20?=
 =?UTF-8?q?=E2=86=92=203.26.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/geocode-glib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
index 910ef01fcb9d..f48e9b3b1218 100644
--- a/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/core/geocode-glib/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "geocode-glib-${version}";
-  version = "3.25.4.1";
+  version = "3.26.0";
 
   outputs = [ "out" "dev" "installedTests" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/geocode-glib/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0y6p5l2jrr78p7l4hijjhclzbap005y6h06g3aiglg9i5hk6j0gi";
+    sha256 = "1vmydxs5xizcmaxpkfrq75xpj6pqrpdjizxyb30m00h54yqqch7a";
   };
 
   nativeBuildInputs = with gnome3; [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobjectIntrospection ];

From e12afbe11579c295e11c089a1ad308a615e1c9d9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 11:40:31 +0200
Subject: [PATCH 3134/3370] =?UTF-8?q?gnome3.gnome-control-center:=203.28.1?=
 =?UTF-8?q?=20=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 55ac087cfa2c..6d5777614118 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -9,13 +9,13 @@
 
 let
   pname = "gnome-control-center";
-  version = "3.28.1";
+  version = "3.28.2";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "0f2p91bzbl39q3cb1qj5vi55km7wxb2fibx07vciz39g5va5cpn6";
+    sha256 = "0d6pjdbsra16nav8201kaadja5yma92bhziki9601ilk2ry3v7pz";
   };
 
   nativeBuildInputs = [

From 933383ceb8d363dd9e9fee192cd8530ccdb1c4fe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 11:40:49 +0200
Subject: [PATCH 3135/3370] =?UTF-8?q?gnome3.gnome-disk-utility:=203.28.2?=
 =?UTF-8?q?=20=E2=86=92=203.28.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
index 38f105bfcb0f..2eb66b02627b 100644
--- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-disk-utility-${version}";
-  version = "3.28.2";
+  version = "3.28.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1j3l4b1prbnixzy6srvcsjfg1dx5nqys2lmygm31ygfdq7svp3m6";
+    sha256 = "11ajz4cbsdns81kihd6242b6pwxbw8bkr9qqkf4qnb4kp363a38m";
   };
 
   passthru = {

From fba07434d1c8386be6c4818ab59393cdc62498fe Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 11:41:09 +0200
Subject: [PATCH 3136/3370] =?UTF-8?q?gnome3.gnome-terminal:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
index 6f80fe0c90bf..d224f0561703 100644
--- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-terminal-${version}";
-  version = "3.28.1";
+  version = "3.28.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1hqwh12hiy73mazqgvyrq8jk4c669x2fb4nh8mwby3qbk8ca19pp";
+    sha256 = "0ybjansg6lr279191w8z8r45gy4rxwzw1ajm98cgkv0fk2jdr0x2";
   };
 
   passthru = {

From 35dc5875cb1db9d25c759617c2a45509b2d6e761 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 11:41:31 +0200
Subject: [PATCH 3137/3370] =?UTF-8?q?gnome3.libdazzle:=203.28.1=20?=
 =?UTF-8?q?=E2=86=92=203.28.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix
index faa8b483a780..67552181d9a6 100644
--- a/pkgs/development/libraries/libdazzle/default.nix
+++ b/pkgs/development/libraries/libdazzle/default.nix
@@ -2,7 +2,7 @@
 , gtk-doc, docbook_xsl, dbus, xvfb_run, glib, gtk3, gnome3 }:
 
 let
-  version = "3.28.1";
+  version = "3.28.2";
   pname = "libdazzle";
 in
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "04j9pjigpgxddq6y90y73k8qyjixlalip87q121ss5d8zp8xnz32";
+    sha256 = "1kfxnyqjwb1r8d4bpr59j1cikd94m6nxf1641hlg7dqlpl9rwlan";
   };
 
   nativeBuildInputs = [ ninja meson pkgconfig vala gobjectIntrospection libxml2 gtk-doc docbook_xsl dbus xvfb_run ];

From 595a506c4ac481ee5d2c34dbe37342bb36d06127 Mon Sep 17 00:00:00 2001
From: Lincoln Lee <git@lincoln.hk>
Date: Wed, 6 Jun 2018 17:54:42 +0800
Subject: [PATCH 3138/3370] Add myself to maintainer list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e11e7edcc691..2e5a374a7435 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2176,6 +2176,11 @@
     github = "limeytexan";
     name = "Michael Brantley";
   };
+  linc01n = {
+    email = "git@lincoln.hk";
+    github = "linc01n";
+    name = "Lincoln Lee";
+  };
   linquize = {
     email = "linquize@yahoo.com.hk";
     github = "linquize";

From 14987c6336ba956b433f5384cf2ac3454440f778 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 6 Jun 2018 08:49:36 +0000
Subject: [PATCH 3139/3370] Revert "gdk-pixbuf: make loaders builtin on Darwin"

This reverts commit 6d3b9763a6b343531a510ca495ec1bc260d41c32.

See the next commit.
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index b0a86644afb2..849e72d9a976 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
     "-Djasper=true"
     "-Dx11=true"
     "-Dgir=${if gobjectIntrospection != null then "true" else "false"}"
-  ] ++ stdenv.lib.optional stdenv.isDarwin "-Dbuiltin_loaders=all";
+  ];
 
   postPatch = ''
     chmod +x build-aux/* # patchShebangs only applies to executables

From 06cdd7d83f388b880081be7bbcd81cd2afaa2599 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 6 Jun 2018 09:48:23 +0000
Subject: [PATCH 3140/3370] Revert "gdk-pixbuf: patch library rpath references
 on darwin"

This reverts commit 6bb08e881dd41c7cda2569126bec930007c2cc0f.

See the next commit.
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 849e72d9a976..ea14e2fab2d1 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -82,12 +82,8 @@ stdenv.mkDerivation rec {
       $dev/bin/gdk-pixbuf-query-loaders --update-cache
     '';
 
-  # The fixDarwinDylibNames hook doesn't patch library references or binaries.
+  # The fixDarwinDylibNames hook doesn't patch binaries.
   preFixup = stdenv.lib.optionalString stdenv.isDarwin ''
-    for f in $(find $out/lib -name '*.dylib'); do
-        install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
-    done
-
     for f in $out/bin/* $dev/bin/*; do
         install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
     done

From eed7db423e722bdb3542af56f96fd08583e80b3d Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Wed, 6 Jun 2018 10:00:55 +0000
Subject: [PATCH 3141/3370] gdk-pixbuf: fix loader.cache on darwin

gdk-pixbuf-query-loaders looks for .so files even on darwin, but after the
switch to meson the loaders are installed with .dylib extension.

Fixes #41314
---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index ea14e2fab2d1..3e11aaf7bc6b 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -73,8 +73,16 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall =
-    # All except one utility seem to be only useful during building.
+    # meson erroneously installs loaders with .dylib extension on Darwin.
+    # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
+    stdenv.lib.optionalString stdenv.isDarwin ''
+      for f in $out/${passthru.moduleDir}/*.dylib; do
+          install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
+          mv $f ''${f%.dylib}.so
+      done
     ''
+    # All except one utility seem to be only useful during building.
+    + ''
       moveToOutput "bin" "$dev"
       moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
 

From be170030b948c944192facc32613aa4282f7f7df Mon Sep 17 00:00:00 2001
From: Lincoln Lee <git@lincoln.hk>
Date: Wed, 6 Jun 2018 18:04:07 +0800
Subject: [PATCH 3142/3370] fcitx-table-extra: init at 0.3.8

---
 .../fcitx-table-extra/default.nix             | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
new file mode 100644
index 000000000000..918edf0240a5
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-extra/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, fcitx, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-table-extra-${version}";
+  version = "0.3.8";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-table-extra/${name}.tar.xz";
+    sha256 = "c91bb19c1a7b53c5339bf2f75ae83839020d337990f237a8b9bc0f4416c120ef";
+  };
+
+  buildInputs = [ cmake fcitx gettext ];
+
+  preInstall = ''
+   substituteInPlace tables/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+
+  meta = with stdenv.lib; {
+    isFcitxEngine = true;
+    homepage      = "https://github.com/fcitx/fcitx-table-extra";
+    downloadPage  = "http://download.fcitx-im.org/fcitx-table-extra/";
+    description   = "Provides extra table for Fcitx, including Boshiamy, Zhengma, Cangjie, and Quick";
+    license       = licenses.gpl2Plus;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ linc01n ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99c3324e0673..56a88ea9001a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2315,6 +2315,8 @@ with pkgs;
       protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
     };
 
+    table-extra = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-extra { };
+
     table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };
 
     cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { };

From 2a49af0213493092742a82824ce9085e83da111a Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 12:13:15 +0200
Subject: [PATCH 3143/3370] mypaint: fix impurities

Closes: https://github.com/NixOS/nixpkgs/issues/41552
---
 pkgs/applications/graphics/mypaint/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 630834fc9e99..120fc1174cdf 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg,
-  pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
+{ stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobjectIntrospection, hicolor-icon-theme
+, gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
 
 let
   inherit (python2Packages) python pycairo pygobject3 numpy;
@@ -15,9 +15,14 @@ in stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ intltool pkgconfig scons swig wrapGAppsHook ];
+  nativeBuildInputs = [
+    intltool pkgconfig scons swig wrapGAppsHook
+    gobjectIntrospection # for setup hook
+  ];
 
-  buildInputs = [ gtk3 json_c lcms2 libpng librsvg pycairo pygobject3 python ];
+  buildInputs = [
+    gtk3 gdk_pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme
+  ];
 
   propagatedBuildInputs = [ numpy ];
 

From 027180ab034989e0cd6302b6605ff7ea75d68d43 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 12:43:30 +0200
Subject: [PATCH 3144/3370] =?UTF-8?q?gnome3.vte:=200.52.1=20=E2=86=92=200.?=
 =?UTF-8?q?52.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/desktops/gnome-3/core/vte/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/vte/default.nix b/pkgs/desktops/gnome-3/core/vte/default.nix
index 6577ba3ae587..ed313221e56a 100644
--- a/pkgs/desktops/gnome-3/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/core/vte/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "vte-${version}";
-  version = "0.52.1";
+  version = "0.52.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${gnome3.versionBranch version}/${name}.tar.xz";
-    sha256 = "1lva70inb5y8p42rg95fb88z2ybwcz0lybla3ixbgp2sj0s4rzdh";
+    sha256 = "1br6kg0wzf1wmww1hadihhcpqbamalqmbppfdzjvzk1ayp75f9hg";
   };
 
   passthru = {

From 4ffeb3bb47535d642b8d6c5b2d4a500de7dd8eda Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 6 Jun 2018 12:51:52 +0200
Subject: [PATCH 3145/3370] =?UTF-8?q?phpPackages.php-cs-fixer:=202.11.1=20?=
 =?UTF-8?q?=E2=86=92=202.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index ebba6a2f5ceb..2b24b189c93f 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -383,11 +383,11 @@ let
 
   php-cs-fixer = pkgs.stdenv.mkDerivation rec {
     name = "php-cs-fixer-${version}";
-    version = "2.11.1";
+    version = "2.12.0";
 
     src = pkgs.fetchurl {
       url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-      sha256 = "1270s5y7bgcml452lngq4fqn3a1mx15gfgmgcczjiiv0fxir446b";
+      sha256 = "1vz3s0hbqp1rzgrqfnr0jj5qds1jnw7kyhpl4qjlpd4s40x0n4b1";
     };
 
     phases = [ "installPhase" ];

From 4d7019a4f34e0d8a9d2fd9e08ebf6d5d54ab715e Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Wed, 6 Jun 2018 13:22:37 +0300
Subject: [PATCH 3146/3370] pythonPackages.pvlib: init at 0.5.2

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

diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix
new file mode 100644
index 000000000000..296b20fac4a2
--- /dev/null
+++ b/pkgs/development/python-modules/pvlib/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchPypi, numpy, pandas, pytz, six, pytest }:
+
+buildPythonPackage rec {
+  pname = "pvlib";
+  version = "0.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1897v9qq97nk5n0hfm9089yz8pffd42795mnhcyq48g9bsyap1xi";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ numpy pandas pytz six ];
+
+  # Currently, the PyPI tarball doesn't contain the tests. When that has been
+  # fixed, enable testing. See: https://github.com/pvlib/pvlib-python/issues/473
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://pvlib-python.readthedocs.io;
+    description = "Simulate the performance of photovoltaic energy systems";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c4ab7805bda..d017e899ab05 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9888,6 +9888,8 @@ in {
     name = "${python.libPrefix}-${pkgs.kmsxx.name}";
   });
 
+  pvlib = callPackage ../development/python-modules/pvlib { };
+
   pybase64 = callPackage ../development/python-modules/pybase64 { };
 
   pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { };

From 3b1e15140c574c01ae25835b934fe71be3376877 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Tue, 5 Jun 2018 21:37:15 -0700
Subject: [PATCH 3147/3370] qmmp: 1.2.1 -> 1.2.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qmmp/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/wmri4qc7h7p1xb90x82fjknxpq8mr50c-qmmp-1.2.2/bin/qmmp had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.2.2 with grep in /nix/store/wmri4qc7h7p1xb90x82fjknxpq8mr50c-qmmp-1.2.2
- directory tree listing: https://gist.github.com/5df37ecfd2a1e3650a65dec2b57cef84
- du listing: https://gist.github.com/49d55015de390d6d3f1477dad43024ac
---
 pkgs/applications/audio/qmmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index e2218f477a59..dc12baefed14 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -29,11 +29,11 @@
 # handle that.
 
 stdenv.mkDerivation rec {
-  name = "qmmp-1.2.1";
+  name = "qmmp-1.2.2";
 
   src = fetchurl {
     url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "1ag8wh11dq394zjqdyz5g1srjnm4fnq4cwlhpb9k89gpmlk42cdr";
+    sha256 = "01nnyg8m3p3px1fj3lfsqqv9zh1388dwx1bm2qv4v87jywimgp79";
   };
 
   buildInputs =

From 220d2637c1747d4a91cc1e01aab25cc8941928cb Mon Sep 17 00:00:00 2001
From: MarcFontaine <MarcFontaine@users.noreply.github.com>
Date: Wed, 6 Jun 2018 14:34:00 +0200
Subject: [PATCH 3148/3370] xearth : init at 1.1

---
 maintainers/maintainer-list.nix               |  5 +++
 .../science/astronomy/xearth/default.nix      | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/science/astronomy/xearth/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e11e7edcc691..0fe5d3a1103d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2289,6 +2289,11 @@
     github = "madjar";
     name = "Georges Dubus";
   };
+  mafo = {
+    email = "Marc.Fontaine@gmx.de";
+    github = "MarcFontaine";
+    name = "Marc Fontaine";
+  };
   magnetophon = {
     email = "bart@magnetophon.nl";
     github = "magnetophon";
diff --git a/pkgs/applications/science/astronomy/xearth/default.nix b/pkgs/applications/science/astronomy/xearth/default.nix
new file mode 100644
index 000000000000..5f276a1b3c70
--- /dev/null
+++ b/pkgs/applications/science/astronomy/xearth/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, xorg }:
+stdenv.mkDerivation rec {
+  name = "xearth-${version}";
+  version = "1.1";
+  
+  src = fetchurl {
+    url = "http://xearth.org/${name}.tar.gz";
+    sha256 = "bcb1407cc35b3f6dd3606b2c6072273b6a912cbd9ed1ae22fb2d26694541309c";
+  };
+
+  buildInputs = with xorg; [  imake libXt libXext ];
+
+  dontAddPrefix = true;
+  configureScript="xmkmf";
+
+  installFlags=[ "DESTDIR=$(out)/" "BINDIR=bin" "MANDIR=man/man1"];
+  installTargets="install install.man";
+  
+  meta = with stdenv.lib; {
+    description = "sets the X root window to an image of the Earth";
+    homepage = "http://xplanet.org";
+    longDescription =
+      '' Xearth  sets  the X root window to an image of the Earth, as seen from your favorite vantage point in space,
+         correctly shaded for the current position of the Sun.
+	 By default, xearth updates the displayed image every  five  minutes.
+      '';
+    maintainers = [ maintainers.mafo ];
+    license = "xearth";
+    platforms=platforms.unix;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99c3324e0673..9d8baf3064d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20569,6 +20569,7 @@ with pkgs;
 
   vite = callPackage ../applications/science/misc/vite { };
 
+  xearth = callPackage ../applications/science/astronomy/xearth { };
   xplanet = callPackage ../applications/science/astronomy/xplanet { };
 
   ### SCIENCE / PHYSICS

From c36101eac193cc9eeace2be4b3d1622a1b013e55 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 6 Jun 2018 15:43:48 +0300
Subject: [PATCH 3149/3370] parity-beta: deinit

---
 pkgs/applications/altcoins/default.nix        |   1 -
 pkgs/applications/altcoins/parity/beta.nix    |   7 --
 .../parity/patches/vendored-sources-1.9.patch | 101 ------------------
 pkgs/top-level/all-packages.nix               |   1 -
 4 files changed, 110 deletions(-)
 delete mode 100644 pkgs/applications/altcoins/parity/beta.nix
 delete mode 100644 pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch

diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 9915e0a301a1..1a0e77dc12f1 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -85,7 +85,6 @@ rec {
   };
 
   parity = callPackage ./parity { };
-  parity-beta = callPackage ./parity/beta.nix { };
   parity-ui = callPackage ./parity-ui { };
 
   particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; withGui = false; };
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix
deleted file mode 100644
index 9cbab6ad0955..000000000000
--- a/pkgs/applications/altcoins/parity/beta.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-let
-  version     = "1.10.2";
-  sha256      = "1a1rbwlwi60nfv6m1rdy5baq5lcafc8nw96y45pr1674i48gkp0l";
-  cargoSha256 = "0l3rjkinzppfq8fi8h24r35rb552fzzman5a6yk33wlsdj2lv7yh";
-  patches     = [ ./patches/vendored-sources-1.10.patch ];
-in
-  import ./parity.nix { inherit version sha256 cargoSha256 patches; }
diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
deleted file mode 100644
index 3e1ba2429f2d..000000000000
--- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.9.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff --git a/.cargo/config b/.cargo/config
-new file mode 100644
-index 000000000..0efb69724
---- /dev/null 
-+++ b/.cargo/config
-@@ -0,0 +1,94 @@
-+[source."https://github.com/alexcrichton/mio-named-pipes"]
-+git = "https://github.com/alexcrichton/mio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"]
-+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-shell.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"]
-+git = "https://github.com/js-dist-paritytech/parity-stable-1-9-v1.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/parity-tokio-ipc"]
-+git = "https://github.com/nikvolf/parity-tokio-ipc"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/nikvolf/tokio-named-pipes"]
-+git = "https://github.com/nikvolf/tokio-named-pipes"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/app-dirs-rs"]
-+git = "https://github.com/paritytech/app-dirs-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/bn"]
-+git = "https://github.com/paritytech/bn"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/hidapi-rs"]
-+git = "https://github.com/paritytech/hidapi-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/hyper"]
-+git = "https://github.com/paritytech/hyper"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/jsonrpc.git"]
-+git = "https://github.com/paritytech/jsonrpc.git"
-+branch = "parity-1.9"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-rs"]
-+git = "https://github.com/paritytech/libusb-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/libusb-sys"]
-+git = "https://github.com/paritytech/libusb-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-ctrlc.git"]
-+git = "https://github.com/paritytech/rust-ctrlc.git"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-rocksdb"]
-+git = "https://github.com/paritytech/rust-rocksdb"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-secp256k1"]
-+git = "https://github.com/paritytech/rust-secp256k1"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/rust-snappy"]
-+git = "https://github.com/paritytech/rust-snappy"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/paritytech/trezor-sys"]
-+git = "https://github.com/paritytech/trezor-sys"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/tailhook/rotor"]
-+git = "https://github.com/tailhook/rotor"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
-+[source."https://github.com/tomusdrw/ws-rs"]
-+git = "https://github.com/tomusdrw/ws-rs"
-+branch = "master"
-+replace-with = "vendored-sources"
-+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99c3324e0673..06b9d8482c4d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14948,7 +14948,6 @@ with pkgs;
   hevm = self.altcoins.hevm;
 
   parity = self.altcoins.parity;
-  parity-beta = self.altcoins.parity-beta;
   parity-ui = self.altcoins.parity-ui;
 
   stellar-core = self.altcoins.stellar-core;

From 7e45efc0f2f01bbceffb29f4748b4778842869f0 Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Wed, 6 Jun 2018 15:44:47 +0300
Subject: [PATCH 3150/3370] parity: 1.9.7 -> 1.10.6

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

diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix
index d85fc25355c8..3ba2495d45a2 100644
--- a/pkgs/applications/altcoins/parity/default.nix
+++ b/pkgs/applications/altcoins/parity/default.nix
@@ -1,7 +1,7 @@
 let
-  version     = "1.9.7";
-  sha256      = "1h9rmyqkdv2v83g12dadgqflq1n1qqgd5hrpy20ajha0qpbiv3ph";
-  cargoSha256 = "0ss5jw43850r8l34prai5vk1zd5d5fjyg4rcav1asbq6v683bww0";
-  patches     = [ ./patches/vendored-sources-1.9.patch ];
+  version     = "1.10.6";
+  sha256      = "1x2sm262z8fdkx8zin6r8nwbb7znziw9nm224pr6ap3p0jmv7fcq";
+  cargoSha256 = "1wf1lh32f9dlhv810gdcssv92g1yximx09lw63m0mxcjbn9813bs";
+  patches     = [ ./patches/vendored-sources-1.10.patch ];
 in
   import ./parity.nix { inherit version sha256 cargoSha256 patches; }

From 15fe683c2fc9364e9e4d2d696a5dd30a9f4b7336 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 6 Jun 2018 05:59:19 -0700
Subject: [PATCH 3151/3370] bibutils: 6.2 -> 6.3

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/bibutils/versions.

These checks were done:

- built on NixOS
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/bib2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/biblatex2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/copac2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/end2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/endx2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/isi2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/med2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/nbib2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/ris2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/ebi2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/wordbib2xml passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/xml2ads passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/xml2bib passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/xml2end passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/xml2isi passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/xml2ris passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/xml2wordbib passed the binary check.
- /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3/bin/modsclean passed the binary check.
- 18 of 18 passed binary check by having a zero exit code.
- 0 of 18 passed binary check by having the new version present in output.
- found 6.3 with grep in /nix/store/wi9d6xxy76775jkzlqmy6fp4pm2kikdn-bibutils-6.3
- directory tree listing: https://gist.github.com/ff41347f63c0154c5f7b0322829c0001
- du listing: https://gist.github.com/2121b0f7644516ee8febcabcb1928da5
---
 pkgs/tools/misc/bibutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
index b720ac22f27e..90a2211235d7 100644
--- a/pkgs/tools/misc/bibutils/default.nix
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bibutils-${version}";
-  version = "6.2";
+  version = "6.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz";
-    sha256 = "07wgzk01kfdrjl6g3qlxg9qbi3kyrxxmxyy49qmcfq24fpmf9mrr";
+    sha256 = "10r5v5xbhsxdh6vq6g2xp6lgmpjdzba83h4m4clfhrzqis8clwqy";
   };
 
   configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ];

From a12cda87941392a2118106c870116ca3e5a71b75 Mon Sep 17 00:00:00 2001
From: Stewart Mackenzie <setori88@gmail.com>
Date: Wed, 6 Jun 2018 21:04:42 +0800
Subject: [PATCH 3152/3370] racket: use latest gtk (gtk2 -> gkt3) (#41557)

---
 pkgs/development/interpreters/racket/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index f25d2933ab7f..36d1a8326e70 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, makeFontsConf, makeWrapper
 , cairo, coreutils, fontconfig, freefont_ttf
-, glib, gmp, gtk2, libedit, libffi, libjpeg
+, glib, gmp, gtk3, libedit, libffi, libjpeg
 , libpng, libtool, mpfr, openssl, pango, poppler
 , readline, sqlite
 , disableDocs ? false
 , CoreFoundation
+, gsettings_desktop_schemas
 }:
 
 let
@@ -18,7 +19,8 @@ let
     fontconfig
     glib
     gmp
-    gtk2
+    gtk3
+    gsettings_desktop_schemas
     libedit
     libjpeg
     libpng
@@ -53,7 +55,7 @@ stdenv.mkDerivation rec {
     (stdenv.lib.optionalString stdenv.isDarwin "-framework CoreFoundation")
   ];
 
-  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ]
+  buildInputs = [ fontconfig libffi libtool makeWrapper sqlite gsettings_desktop_schemas gtk3 ]
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation ];
 
   preConfigure = ''
@@ -76,7 +78,9 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     for p in $(ls $out/bin/) ; do
-      wrapProgram $out/bin/$p --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}";
+      wrapProgram $out/bin/$p \
+        --prefix LD_LIBRARY_PATH ":" "${LD_LIBRARY_PATH}" \
+        --prefix XDG_DATA_DIRS ":" "$GSETTINGS_SCHEMAS_PATH";
     done
   '';
 

From 47fc27b4562042bc309ff369c0369f001adb9ef0 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Fri, 18 May 2018 16:49:32 +0200
Subject: [PATCH 3153/3370] nixos/tests/hydra: build a trivial derivation

A script is used to create a project, and configure a jobset. This
jobset fetches a local file containing a trivial Nix expression. The
test script makes sure this derivation has been successfully built by
Hydra.
---
 nixos/tests/hydra.nix                       | 32 ---------
 nixos/tests/hydra/create-trivial-project.sh | 56 +++++++++++++++
 nixos/tests/hydra/default.nix               | 78 +++++++++++++++++++++
 3 files changed, 134 insertions(+), 32 deletions(-)
 delete mode 100644 nixos/tests/hydra.nix
 create mode 100755 nixos/tests/hydra/create-trivial-project.sh
 create mode 100644 nixos/tests/hydra/default.nix

diff --git a/nixos/tests/hydra.nix b/nixos/tests/hydra.nix
deleted file mode 100644
index 6abd7a5ad300..000000000000
--- a/nixos/tests/hydra.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-import ./make-test.nix ({ pkgs, ...} : {
-  name = "hydra-init-localdb";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ pstn ];
-  };
-
-  machine =
-    { config, pkgs, ... }:
-
-    {
-      services.hydra = {
-        enable = true;
-
-        #Hydra needs those settings to start up, so we add something not harmfull.
-        hydraURL = "example.com";
-        notificationSender = "example@example.com";
-      };
-    };
-
-  testScript =
-    ''
-      # let the system boot up
-      $machine->waitForUnit("multi-user.target");
-      # test whether the database is running
-      $machine->succeed("systemctl status postgresql.service");
-      # test whether the actual hydra daemons are running
-      $machine->succeed("systemctl status hydra-queue-runner.service");
-      $machine->succeed("systemctl status hydra-init.service");
-      $machine->succeed("systemctl status hydra-evaluator.service");
-      $machine->succeed("systemctl status hydra-send-stats.service");
-     '';
-})
diff --git a/nixos/tests/hydra/create-trivial-project.sh b/nixos/tests/hydra/create-trivial-project.sh
new file mode 100755
index 000000000000..3cca5665acc5
--- /dev/null
+++ b/nixos/tests/hydra/create-trivial-project.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+#
+# This script creates a project, a jobset with an input of type local
+# path. This local path is a directory that contains a Nix expression
+# to define a job.
+# The EXPR-PATH environment variable must be set with the local path.
+
+set -e
+
+URL=http://localhost:3000
+USERNAME="admin"
+PASSWORD="admin"
+PROJECT_NAME="trivial"
+JOBSET_NAME="trivial"
+EXPR_PATH=${EXPR_PATH:-}
+
+if [ -z $EXPR_PATH ]; then
+   echo "Environment variable EXPR_PATH must be set"
+   exit 1
+fi
+
+mycurl() {
+  curl --referer $URL -H "Accept: application/json" -H "Content-Type: application/json" $@
+}
+
+cat >data.json <<EOF
+{ "username": "$USERNAME", "password": "$PASSWORD" }
+EOF
+mycurl -X POST -d '@data.json' $URL/login -c hydra-cookie.txt
+
+cat >data.json <<EOF
+{
+  "displayname":"Trivial",
+  "enabled":"1"
+}
+EOF
+mycurl --silent -X PUT $URL/project/$PROJECT_NAME -d @data.json -b hydra-cookie.txt
+
+cat >data.json <<EOF
+{
+  "description": "Trivial",
+  "checkinterval": "60",
+  "enabled": "1",
+  "visible": "1",
+  "keepnr": "1",
+  "nixexprinput": "trivial",
+  "nixexprpath": "trivial.nix",
+  "inputs": {
+    "trivial": {
+      "value": "$EXPR_PATH",
+      "type": "path"
+    }
+  }
+}
+EOF
+mycurl --silent -X PUT $URL/jobset/$PROJECT_NAME/$JOBSET_NAME -d @data.json -b hydra-cookie.txt
diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix
new file mode 100644
index 000000000000..74919444c16d
--- /dev/null
+++ b/nixos/tests/hydra/default.nix
@@ -0,0 +1,78 @@
+import ../make-test.nix ({ pkgs, ...} :
+
+let
+   trivialJob = pkgs.writeTextDir "trivial.nix" ''
+     with import <nix/config.nix>;
+
+     { trivial = builtins.derivation {
+         name = "trivial";
+         system = "x86_64-linux";
+         PATH = coreutils;
+         builder = shell;
+         args = ["-c" "touch $out; exit 0"];
+       };
+     }
+   '';
+
+    createTrivialProject = pkgs.stdenv.mkDerivation {
+      name = "create-trivial-project";
+      unpackPhase = ":";
+      buildInputs = [ pkgs.makeWrapper ];
+      installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh";
+      postFixup = ''
+        wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob}
+      '';
+    };
+
+in {
+  name = "hydra-init-localdb";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ pstn lewo ];
+  };
+
+  machine =
+    { config, pkgs, ... }:
+
+    {
+      virtualisation.memorySize = 1024;
+      time.timeZone = "UTC";
+
+      environment.systemPackages = [ createTrivialProject pkgs.jq ];
+      services.hydra = {
+        enable = true;
+
+        #Hydra needs those settings to start up, so we add something not harmfull.
+        hydraURL = "example.com";
+        notificationSender = "example@example.com";
+      };
+      nix = {
+        buildMachines = [{
+          hostName = "localhost";
+          systems = [ "x86_64-linux" ];
+        }];
+      };
+    };
+
+  testScript =
+    ''
+      # let the system boot up
+      $machine->waitForUnit("multi-user.target");
+      # test whether the database is running
+      $machine->succeed("systemctl status postgresql.service");
+      # test whether the actual hydra daemons are running
+      $machine->succeed("systemctl status hydra-queue-runner.service");
+      $machine->succeed("systemctl status hydra-init.service");
+      $machine->succeed("systemctl status hydra-evaluator.service");
+      $machine->succeed("systemctl status hydra-send-stats.service");
+
+      $machine->succeed("hydra-create-user admin --role admin --password admin");
+
+      # create a project with a trivial job
+      $machine->waitForOpenPort(3000);
+
+      # make sure the build as been successfully built
+      $machine->succeed("create-trivial-project.sh");
+
+      $machine->waitUntilSucceeds('curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" |  jq .buildstatus | xargs test 0 -eq');
+     '';
+})

From 891650bd44e125a89f2960974dfb623d3fff6638 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Fri, 18 May 2018 17:11:29 +0200
Subject: [PATCH 3154/3370] nixos/tests/hydra: add it in nixos/release.nix

---
 nixos/release.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/release.nix b/nixos/release.nix
index 8777d85c5d46..d2eaa22dc6fc 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -305,6 +305,7 @@ in rec {
   tests.home-assistant = callTest tests/home-assistant.nix { };
   tests.hound = callTest tests/hound.nix {};
   tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {};
+  tests.hydra = callTest tests/hydra {};
   tests.i3wm = callTest tests/i3wm.nix {};
   tests.iftop = callTest tests/iftop.nix {};
   tests.initrd-network-ssh = callTest tests/initrd-network-ssh {};

From f8e77b3373d111e516ff440f8cdbae97adb1c6a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jun 2018 12:22:57 +0200
Subject: [PATCH 3155/3370] multi-ghc-travis: patch to support latest
 ShellCheck version

---
 .../tools/haskell/multi-ghc-travis/default.nix      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
index b9f6db1cc947..98df266703ac 100644
--- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
+++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix
@@ -1,7 +1,17 @@
 { mkDerivation, ansi-terminal, base, bytestring, Cabal, containers
 , deepseq, Diff, directory, filepath, ShellCheck, stdenv, tasty
-, tasty-golden, transformers, fetchFromGitHub
+, tasty-golden, transformers, fetchFromGitHub, fetchpatch
 }:
+
+let
+
+  newShellCheck = fetchpatch {
+    url = https://github.com/haskell-CI/haskell-ci/pull/159.patch;
+    sha256 = "17qn099lvfiii5z3hg24idmg4sk6ph7m2k940fsxzhqrad8fkjmw";
+  };
+
+in
+
 mkDerivation {
   pname = "haskell-ci";
   version = "0";
@@ -11,6 +21,7 @@ mkDerivation {
     rev = "db63eb7f2eaa64b7b0e4759e98258fea2a27a424";
     sha256 = "0ff55zafx7561s1yps7aw83ws4vcpc5cq9r6bbckaagvwwla0dcq";
   };
+  patches = [ newShellCheck ];
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [

From 33ffa1f88843e38749083edc339de91e6f8c1d68 Mon Sep 17 00:00:00 2001
From: Justin Humm <justin.humm@posteo.de>
Date: Wed, 6 Jun 2018 17:40:35 +0200
Subject: [PATCH 3156/3370] haskellPackages.http-link-header: disable tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The test

  Network.HTTP.Link, writeLinkHeader → parseLinkHeader, roundtrips successfully

seems to flap, as I cannot reproduce the failure locally, but it occured on
Hydra [0]. Also upstream is aware of the problem [1].

[0] https://hydra.nixos.org/build/75041105
[1] https://github.com/myfreeweb/http-link-header/issues/7
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b92ba205b843..b24a4b0c2a46 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -342,6 +342,7 @@ self: super: {
   HTF = dontCheck super.HTF;
   htsn = dontCheck super.htsn;
   htsn-import = dontCheck super.htsn-import;
+  http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
   ihaskell = dontCheck super.ihaskell;
   influxdb = dontCheck super.influxdb;
   itanium-abi = dontCheck super.itanium-abi;

From f2ea885bedfed7f9449b0bc57c859fcc13fbe081 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 6 Jun 2018 19:13:26 +0200
Subject: [PATCH 3157/3370] bro: 2.5.3 -> 2.5.4

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

diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 577252bc69e0..2612e2d9240b 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -2,11 +2,11 @@
 , geoip, gperftools, python, swig }:
 
 stdenv.mkDerivation rec {
-  name = "bro-2.5.3";
+  name = "bro-2.5.4";
 
   src = fetchurl {
     url = "http://www.bro.org/downloads/${name}.tar.gz";
-    sha256 = "09b227j1c0ggihbhbyphd7lnh26mpz07z1s0h148dg6fwqagm13k";
+    sha256 = "07sz1i4ly30257677b8vfrbsvxhz2awijyzn5ihg4m567x1ymnl0";
   };
 
   nativeBuildInputs = [ cmake flex bison file ];

From c5d1f8f313433154b80753b46a5de7fb3738e4b3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 6 Jun 2018 20:18:13 +0200
Subject: [PATCH 3158/3370] rust: fix test condition in tcp patch

---
 .../compilers/rust/patches/net-tcp-disable-tests.patch          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
index 70a91ceb9d97..10713b6b7aa9 100644
--- a/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
+++ b/pkgs/development/compilers/rust/patches/net-tcp-disable-tests.patch
@@ -98,7 +98,7 @@ index 0f60b5b3e..9b08415e7 100644
      }
  
      #[test]
-+    #[cfg_attr(target_os = "linux", target_os = "macos", ignore)]
++    #[cfg_attr(any(target_os = "linux", target_os = "macos"), ignore)]
      fn connect_timeout_unroutable() {
          // this IP is unroutable, so connections should always time out,
          // provided the network is reachable to begin with.

From 95ee1bc937c3813a7d1dfed7730b44fae5df6ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Wed, 6 Jun 2018 20:21:22 +0200
Subject: [PATCH 3159/3370] nvidia_x11: 390.48 -> 390.67

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 +++++-------
 .../linux/nvidia-x11/fix_missing_symbol.patch | 19 -------------------
 2 files changed, 5 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 11a97d420a83..8eeaf502020d 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -17,13 +17,11 @@ in
 rec {
   # Policy: use the highest stable version as the default (on our master).
   stable = generic {
-    version = "390.48";
-    sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai";
-    sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c";
-    settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl";
-    persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k";
-
-    patches = [ ./fix_missing_symbol.patch ];
+    version = "390.67";
+    sha256_32bit = "01c8fa80njyyr39c1pyf7ssmfq65ci8mapbs94fd6gnhwc7gfjkg";
+    sha256_64bit = "0np6xj93fali2hss8xsdlmy5ykjgn4hx6mzjr8dpbdi0fhdcmwkd";
+    settingsSha256 = "1wk4587czysnbj5yxijmv3bldcffzwp4yvfx133apsr31dqca0s7";
+    persistencedSha256 = "1zia1r97lyj6fbmvsw4hv5qfcj84x3sz971m4430d8qyks2c4sdw";
   };
 
   beta = stable; # not enough interest to maintain beta ATM
diff --git a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
deleted file mode 100644
index ea783b4f011e..000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://devtalk.nvidia.com/default/topic/1030082/linux/kernel-4-16-rc1-breaks-latest-drivers-unknown-symbol-swiotlb_map_sg_attrs-/
---- a/kernel/common/inc/nv-linux.h~     2018-01-25 06:09:41.000000000 +0100
-+++ b/kernel/common/inc/nv-linux.h      2018-03-05 13:58:17.746725638 +0100
-@@ -1209,6 +1209,7 @@ static inline NvU32 nv_alloc_init_flags(
- static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
- {
-     NvBool swiotlb_in_use = NV_FALSE;
-+#if 0
- #if defined(CONFIG_SWIOTLB)
-   #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
-     /*
-@@ -1251,7 +1252,7 @@ static inline NvBool nv_dma_maps_swiotlb
-     swiotlb_in_use = (swiotlb == 1);
-   #endif
- #endif
--
-+#endif
-     return swiotlb_in_use;
- }

From 4c25fbe338212f498a34d2a9b4c2072ac96c0e31 Mon Sep 17 00:00:00 2001
From: Uli Baum <xeji@cat3.de>
Date: Wed, 6 Jun 2018 20:16:04 +0200
Subject: [PATCH 3160/3370] nixos/release-combined: remove keymap tests from
 tested job

Temporary fix for #41538; non-deterministic failures
blocked the release channel.
---
 nixos/release-combined.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 989764874c48..66b253c230f1 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -88,12 +88,14 @@ in rec {
         (all nixos.tests.env)
         (all nixos.tests.ipv6)
         (all nixos.tests.i3wm)
-        (all nixos.tests.keymap.azerty)
-        (all nixos.tests.keymap.colemak)
-        (all nixos.tests.keymap.dvorak)
-        (all nixos.tests.keymap.dvp)
-        (all nixos.tests.keymap.neo)
-        (all nixos.tests.keymap.qwertz)
+        # 2018-06-06: keymap tests temporarily removed from tested job
+        # since non-deterministic failure are blocking the channel (#41538)
+        #(all nixos.tests.keymap.azerty)
+        #(all nixos.tests.keymap.colemak)
+        #(all nixos.tests.keymap.dvorak)
+        #(all nixos.tests.keymap.dvp)
+        #(all nixos.tests.keymap.neo)
+        #(all nixos.tests.keymap.qwertz)
         (all nixos.tests.plasma5)
         #(all nixos.tests.lightdm)
         (all nixos.tests.login)

From 58929311824743f26a6ba70dc24c563b8f7d39fc Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Wed, 6 Jun 2018 21:16:07 +0200
Subject: [PATCH 3161/3370] midas: fix package name (x32edit and m32edit)

---
 pkgs/applications/audio/midas/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/midas/generic.nix b/pkgs/applications/audio/midas/generic.nix
index f82961e6e010..293d1b0b6c82 100644
--- a/pkgs/applications/audio/midas/generic.nix
+++ b/pkgs/applications/audio/midas/generic.nix
@@ -2,7 +2,7 @@
 stdenv.mkDerivation rec {
   inherit type;
   baseName = "${type}-Edit";
-  name = "${baseName}-${version}";
+  name = "${lib.toLower baseName}-${version}";
 
   src = fetchurl {
     url = "http://downloads.music-group.com/software/behringer/${type}/${type}-Edit_LINUX_64bit_${version}.tar.gz";

From d277e4fbced66521489141e086066bb9f56a7d56 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 6 Jun 2018 03:31:37 -0700
Subject: [PATCH 3162/3370] h2o: 2.2.4 -> 2.2.5

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/h2o/versions.

These checks were done:

- built on NixOS
- /nix/store/dwz174x5lsj14gm3a89rhpw2mb4wciap-h2o-2.2.5/bin/h2o passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.2.5 with grep in /nix/store/dwz174x5lsj14gm3a89rhpw2mb4wciap-h2o-2.2.5
- directory tree listing: https://gist.github.com/b8176825df6a9bbef22331d62ac7208c
- du listing: https://gist.github.com/4c5ecd9f4cd736d08daeeab72549037e
---
 pkgs/servers/http/h2o/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix
index cd2985960a75..e05624fa46c8 100644
--- a/pkgs/servers/http/h2o/default.nix
+++ b/pkgs/servers/http/h2o/default.nix
@@ -7,13 +7,13 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "h2o-${version}";
-  version = "2.2.4";
+  version = "2.2.5";
 
   src = fetchFromGitHub {
     owner  = "h2o";
     repo   = "h2o";
     rev    = "refs/tags/v${version}";
-    sha256 = "0176x0bzjry19zs074a9i5vhncc842xikmx43wj61jky318nq4w4";
+    sha256 = "0jyvbp6cjiirj44nxqa2fi5y473gnc8awfn8zv82hb1y9rlxqfyv";
   };
 
   nativeBuildInputs = [ pkgconfig cmake ];

From ff92e43a17f4813cd9241dd7d3065f70f9c427c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 6 Jun 2018 03:29:15 -0700
Subject: [PATCH 3163/3370] gtkwave: 3.3.90 -> 3.3.91

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gtkwave/versions.

These checks were done:

- built on NixOS
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/evcd2vcd passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/fst2vcd passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/vcd2fst passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/fstminer passed the binary check.
- Warning: no invocation of /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/ghwdump had a zero exit code or showed the expected version
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/lxt2miner passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/lxt2vcd passed the binary check.
- Warning: no invocation of /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/shmidcat had a zero exit code or showed the expected version
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/vcd2lxt passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/vcd2lxt2 passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/vcd2vzt passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/vzt2vcd passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/vztminer passed the binary check.
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/gtkwave passed the binary check.
- Warning: no invocation of /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/twinwave had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/rtlbrowse had a zero exit code or showed the expected version
- /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91/bin/vermin passed the binary check.
- 13 of 17 passed binary check by having a zero exit code.
- 0 of 17 passed binary check by having the new version present in output.
- found 3.3.91 with grep in /nix/store/saxwlbm10w3r18rlj0svnfbrf5crwr4w-gtkwave-3.3.91
- directory tree listing: https://gist.github.com/3ce8b90b2a4e815255bced6a94d99818
- du listing: https://gist.github.com/8571bbab590243bbfadf05271e188f20
---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 4ca489c40b3f..3583c3dbd19c 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkwave-${version}";
-  version = "3.3.90";
+  version = "3.3.91";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "1q1fi0nqja9d8xj24h7ykvnpms6zqgn24jmyj1mxn48qig301c6m";
+    sha256 = "1vp9qj3wyfwm36jk3pajvi09xvc1m1crf3d4gphfbs6nkyx2z942";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 517d5ff6e16fb5f927c759e2f1b6cb5a91366763 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Wed, 6 Jun 2018 04:59:41 -0700
Subject: [PATCH 3164/3370] cryptoverif: 1.28 -> 2.00

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cryptoverif/versions.

These checks were done:

- built on NixOS
- /nix/store/449i03imd329g3yi4gbmcbq9pv5ijpib-cryptoverif-2.00/bin/cryptoverif passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.00 with grep in /nix/store/449i03imd329g3yi4gbmcbq9pv5ijpib-cryptoverif-2.00
- directory tree listing: https://gist.github.com/b4cdf4e1befb51addd9b1dc1c39d78d9
- du listing: https://gist.github.com/18190fb11f51471790dcc668635aba6a
---
 pkgs/applications/science/logic/cryptoverif/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/cryptoverif/default.nix b/pkgs/applications/science/logic/cryptoverif/default.nix
index 3257977f5b5a..df9e58af08bb 100644
--- a/pkgs/applications/science/logic/cryptoverif/default.nix
+++ b/pkgs/applications/science/logic/cryptoverif/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cryptoverif-${version}";
-  version = "1.28";
+  version = "2.00";
 
   src = fetchurl {
     url    = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${version}.tar.gz";
-    sha256 = "0vssz751g1nn8wclkiwgghpm475jl00xkivc164vgbr9acxsr7n7";
+    sha256 = "0g8pkj58b48zk4c0sgpln0qhbj82v75mz3w6cl3w5bvmxsbkwvy1";
   };
 
   buildInputs = [ ocaml ];

From 31ab326e4e663dda17060378a7d3cf3444a10a21 Mon Sep 17 00:00:00 2001
From: Patrick Hilhorst <git@hilhorst.be>
Date: Wed, 6 Jun 2018 21:56:21 +0200
Subject: [PATCH 3165/3370] atom-beta: 1.28.0-beta2 -> 1.28.0-beta3 (#41597)

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index f80a14c1e0f3..a68c841d53bc 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -63,7 +63,7 @@ in stdenv.lib.mapAttrs common {
   };
 
   atom-beta = {
-    version = "1.28.0-beta2";
-    sha256 = "0fc9j1l776hv057dirw2bv9wmvhcaba5c4nq1cgs5rb5whxir2n6";
+    version = "1.28.0-beta3";
+    sha256 = "07mmzkbc7xzcwh6ylrs2w1g3l5gmyfk0gdmr2kzr6jdr00cq73y0";
   };
 }

From 0a1ab7ec71123d22c0a04dd5536bdd58963d4c26 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 6 Jun 2018 21:56:57 +0200
Subject: [PATCH 3166/3370] quiterss: 0.18.10 -> 0.18.11

---
 .../0001-Revert-change-WebKit-602.1-c2f.patch | 157 ++++++++++++++++++
 .../newsreaders/quiterss/default.nix          |  15 +-
 2 files changed, 168 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch

diff --git a/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch
new file mode 100644
index 000000000000..d9b994d9b37c
--- /dev/null
+++ b/pkgs/applications/networking/newsreaders/quiterss/0001-Revert-change-WebKit-602.1-c2f.patch
@@ -0,0 +1,157 @@
+Date: Wed, 6 Jun 2018 20:46:38 +0200
+
+This reverts commit eceda92a16f1f4e5c5b584acd745398571df2bd6.
+---
+ src/application/mainapplication.cpp |  3 ---
+ src/application/mainwindow.cpp      | 11 -----------
+ src/application/mainwindow.h        |  2 --
+ src/newstabwidget.cpp               |  6 +-----
+ src/newstabwidget.h                 |  2 +-
+ src/optionsdialog.cpp               |  2 --
+ src/webview/webpage.cpp             | 13 +------------
+ src/webview/webpage.h               |  3 ---
+ 8 files changed, 3 insertions(+), 39 deletions(-)
+
+diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp
+index e93ec9c1..a5913bdf 100644
+--- a/src/application/mainapplication.cpp
++++ b/src/application/mainapplication.cpp
+@@ -566,9 +566,6 @@ void MainApplication::c2fLoadSettings()
+   settings.beginGroup("ClickToFlash");
+   c2fWhitelist_ = settings.value("whitelist", QStringList()).toStringList();
+   c2fEnabled_ = settings.value("enabled", true).toBool();
+-#if QT_VERSION >= 0x050900
+-  c2fEnabled_ = false;
+-#endif
+   settings.endGroup();
+ }
+ 
+diff --git a/src/application/mainwindow.cpp b/src/application/mainwindow.cpp
+index 337a7c4e..42255d2c 100644
+--- a/src/application/mainwindow.cpp
++++ b/src/application/mainwindow.cpp
+@@ -8140,14 +8140,3 @@ void MainWindow::createBackup()
+     QFile::copy(settings.fileName(), backupFileName);
+   }
+ }
+-
+-void MainWindow::webViewFullScreen(bool on)
+-{
+-  setFullScreen();
+-  feedsWidget_->setVisible(!on);
+-  pushButtonNull_->setVisible(!on);
+-  tabBarWidget_->setVisible(!on);
+-  currentNewsTab->newsWidget_->setVisible(!on);
+-  pushButtonNull_->setVisible(!on);
+-  statusBar()->setVisible(!on);
+-}
+diff --git a/src/application/mainwindow.h b/src/application/mainwindow.h
+index 995f96dc..93b75c11 100644
+--- a/src/application/mainwindow.h
++++ b/src/application/mainwindow.h
+@@ -271,8 +271,6 @@ public:
+ 
+   AdBlockIcon *adBlockIcon() { return adblockIcon_; }
+ 
+-  void webViewFullScreen(bool on);
+-
+ public slots:
+   void restoreFeedsOnStartUp();
+   void addFeed();
+diff --git a/src/newstabwidget.cpp b/src/newstabwidget.cpp
+index 77d74d3b..c6c130f7 100644
+--- a/src/newstabwidget.cpp
++++ b/src/newstabwidget.cpp
+@@ -1842,12 +1842,8 @@ void NewsTabWidget::loadNewspaper(int refresh)
+  *----------------------------------------------------------------------------*/
+ void NewsTabWidget::slotSetHtmlWebView(const QString &html, const QUrl &baseUrl)
+ {
+-  QUrl url = baseUrl;
+-#if QT_VERSION >= 0x050900
+-  url.setScheme("");
+-#endif
+   webView_->history()->setMaximumItemCount(0);
+-  webView_->setHtml(html, url);
++  webView_->setHtml(html, baseUrl);
+   webView_->history()->setMaximumItemCount(100);
+ }
+ 
+diff --git a/src/newstabwidget.h b/src/newstabwidget.h
+index 7f5c3957..8d1266ac 100644
+--- a/src/newstabwidget.h
++++ b/src/newstabwidget.h
+@@ -127,7 +127,6 @@ public:
+   QToolBar *newsToolBar_;
+   QSplitter *newsTabWidgetSplitter_;
+ 
+-  QWidget *newsWidget_;
+   WebView *webView_;
+   QToolBar *webToolBar_;
+   LocationBar *locationBar_;
+@@ -199,6 +198,7 @@ private:
+ 
+   MainWindow *mainWindow_;
+   QSqlDatabase db_;
++  QWidget *newsWidget_;
+ 
+   FeedsModel *feedsModel_;
+   FeedsProxyModel *feedsProxyModel_;
+diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
+index 73136dec..c082bc30 100644
+--- a/src/optionsdialog.cpp
++++ b/src/optionsdialog.cpp
+@@ -741,9 +741,7 @@ void OptionsDialog::createBrowserWidget()
+   browserWidget_ = new QTabWidget();
+   browserWidget_->addTab(generalBrowserWidget, tr("General"));
+   browserWidget_->addTab(historyBrowserWidget_, tr("History"));
+-#if QT_VERSION < 0x050900
+   browserWidget_->addTab(click2FlashWidget_, tr("Click to Flash"));
+-#endif
+   browserWidget_->addTab(downloadsWidget, tr("Downloads"));
+ }
+ 
+diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp
+index 6401ec87..0254a167 100644
+--- a/src/webview/webpage.cpp
++++ b/src/webview/webpage.cpp
+@@ -51,10 +51,7 @@ WebPage::WebPage(QObject *parent)
+           this, SLOT(downloadRequested(QNetworkRequest)));
+   connect(this, SIGNAL(printRequested(QWebFrame*)),
+           mainApp->mainWindow(), SLOT(slotPrint(QWebFrame*)));
+-#if QT_VERSION >= 0x050900
+-  connect(this, SIGNAL(fullScreenRequested(QWebFullScreenRequest)),
+-          this, SLOT(slotFullScreenRequested(QWebFullScreenRequest)));
+-#endif
++
+   livingPages_.append(this);
+ }
+ 
+@@ -286,11 +283,3 @@ void WebPage::cleanBlockedObjects()
+     mainFrame()->scrollToAnchor(mainFrame()->url().fragment());
+   }
+ }
+-
+-#if QT_VERSION >= 0x050900
+-void WebPage::slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest)
+-{
+-  fullScreenRequest.accept();
+-  mainApp->mainWindow()->webViewFullScreen(fullScreenRequest.toggleOn());
+-}
+-#endif
+diff --git a/src/webview/webpage.h b/src/webview/webpage.h
+index 5c376c50..91e72758 100644
+--- a/src/webview/webpage.h
++++ b/src/webview/webpage.h
+@@ -68,9 +68,6 @@ private slots:
+   void downloadRequested(const QNetworkRequest &request);
+   void cleanBlockedObjects();
+   void urlChanged(const QUrl &url);
+-#if QT_VERSION >= 0x050900
+-  void slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest);
+-#endif
+ 
+ private:
+   NetworkManagerProxy *networkManagerProxy_;
+-- 
+2.16.2
+
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 7bd50a47f813..6bd42183d038 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -1,17 +1,24 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitHub, qmake, pkgconfig
+, qtbase, qttools, qtwebkit, sqlite
+}:
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.10";
+  version = "0.18.11";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "1bv5aw6fscrwlycirvzm6fvbwmg8lbd1ycldkwbvybhjyfjaxkpm";
+    sha256 = "0n9byhibi2qpgrb7x08knvqnmyn5c7vm24cl6y3zcvz52pz8y2yc";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake ];
+  # Revert this commit until qt5.qtwebkit (currently an older version) from
+  # nixpkgs supports it (the commit states WebKit 602.1 while the current
+  # version in nixos-unstable is 538.1)
+  patches = [ ./0001-Revert-change-WebKit-602.1-c2f.patch ];
+
+  nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
 
   meta = with stdenv.lib; {

From 90268406b8016fd4e64c37aabe1f527064e0c547 Mon Sep 17 00:00:00 2001
From: leenaars <leenaars@users.noreply.github.com>
Date: Wed, 6 Jun 2018 22:06:00 +0200
Subject: [PATCH 3167/3370] getdns: 1.4.1 -> 1.4.2 (#41595)

---
 pkgs/development/libraries/getdns/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/getdns/default.nix b/pkgs/development/libraries/getdns/default.nix
index 779534460df2..66fc0138ef9b 100644
--- a/pkgs/development/libraries/getdns/default.nix
+++ b/pkgs/development/libraries/getdns/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   pname = "getdns";
   name = "${pname}-${version}";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchurl {
-    url = "https://getdnsapi.net/releases/${pname}-1-4-1/${pname}-${version}.tar.gz";
-    sha256 = "07n5n5m4dnnh2xkh7wrnlx8s8myrvjf2nbs7n5m5nq8gg3f36li4";
+    url = "https://getdnsapi.net/releases/${pname}-1-4-2/${pname}-${version}.tar.gz";
+    sha256 = "100fzjpvajvnv0kym8g5lkwyv8w8vhy7g2p0pb2gyz19zqnvi18n";
   };
 
   nativeBuildInputs = [ libtool m4 autoreconfHook automake file ];

From b7a025cef2d1babe7ba5365bafbdc3ec544a61a1 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Wed, 6 Jun 2018 22:08:34 +0200
Subject: [PATCH 3168/3370] Mint: 2018-05-27 -> 0.0.3 (#41554)

---
 pkgs/development/compilers/mint/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix
index 619170d4a486..08a55dc609f6 100644
--- a/pkgs/development/compilers/mint/default.nix
+++ b/pkgs/development/compilers/mint/default.nix
@@ -28,13 +28,13 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  version = "2018-05-27";
+  version = "0.0.3";
   name = "mint-${version}";
   src = fetchFromGitHub {
     owner = "mint-lang";
     repo = "mint";
-    rev = "a3f0c86f54b8b3a18dda5c39c2089bdb1d774b4f";
-    sha256 = "1bgs6jkwfc2ksq4gj55cl3h2l5g25f5bwlsjryiw9cbx5k4bp1kz";
+    rev = "0.0.3";
+    sha256 = "15aawhpagpaqrs64jnz3g6iw3dhq0rlqm92cvfd5a3hbwvxg7lm0";
   };
 
   buildInputs = [ crystal zlib openssl duktape ];

From 979a835c4654c5097848900792daf02886a64a83 Mon Sep 17 00:00:00 2001
From: Thomas Kerber <tk@drwx.org>
Date: Wed, 6 Jun 2018 21:12:19 +0100
Subject: [PATCH 3169/3370] skypeforlinux: remove libstdc++5 dependency
 (#41590)

---
 .../networking/instant-messengers/skypeforlinux/default.nix  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index e305a4927204..1cf7243476cf 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome3
-, gtk2, libnotify, libpulseaudio, libsecret, libstdcxx5, libv4l, nspr, nss, pango, systemd, xorg }:
+, gtk2, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
 
 let
 
@@ -25,7 +25,7 @@ let
     gnome3.gconf
     gdk_pixbuf
     gtk2
-    
+
 
     gnome3.gnome-keyring
 
@@ -36,7 +36,6 @@ let
     pango
     stdenv.cc.cc
     systemd
-    libstdcxx5
     libv4l
 
     xorg.libxkbfile

From 1c3798f1cbf78da70610906dd5fa7869bb176755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Stylianos=20Ramos?= <andre.stylianos@gmail.com>
Date: Wed, 6 Jun 2018 22:13:00 +0200
Subject: [PATCH 3170/3370] joker: 0.9.2 -> 0.9.3 (#41577)

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

diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix
index 4c32c0684d0e..87f2ebf2d70e 100644
--- a/pkgs/development/interpreters/joker/default.nix
+++ b/pkgs/development/interpreters/joker/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "joker-${version}";
-  version = "0.9.2";
+  version = "0.9.3";
 
   goPackagePath = "github.com/candid82/joker";
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "candid82";
     repo = "joker";
-    sha256 = "1ayp7arygd3l4a1zbkhvix84fpqnnncbdxhimymr3c75ymwmmdr8";
+    sha256 = "1738gr25hlffc8ppzy6kik21jfix9iy316kv1kj1lqxr8giirhf6";
   };
 
   preBuild = "go generate ./...";

From 6c426745b4469b5a9432002affd819055bd1a67d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <vbgl@users.noreply.github.com>
Date: Wed, 6 Jun 2018 22:18:11 +0200
Subject: [PATCH 3171/3370] ocamlPackages.functory: 0.5 -> 0.6 (#41596)

---
 .../ocaml-modules/functory/default.nix         | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix
index 6d4deac38c47..c8b29759b97c 100644
--- a/pkgs/development/ocaml-modules/functory/default.nix
+++ b/pkgs/development/ocaml-modules/functory/default.nix
@@ -1,14 +1,24 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{ stdenv, fetchurl, ocaml, findlib }:
 
 assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.11";
 
+let param =
+  if stdenv.lib.versionAtLeast ocaml.version "4.02" then {
+    version = "0.6";
+    sha256 = "18wpyxblz9jh5bfp0hpffnd0q8cq1b0dqp0f36vhqydfknlnpx8y";
+  } else {
+    version = "0.5";
+    sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3";
+  };
+in
+
 stdenv.mkDerivation {
 
-  name = "ocaml-functory-0.5";
+  name = "ocaml${ocaml.version}-functory-${param.version}";
 
   src = fetchurl {
-    url = https://www.lri.fr/~filliatr/functory/download/functory-0.5.tar.gz;
-    sha256 = "1j17rhifdjv1z262dma148ywg34x0zjn8vczdrnkwajsm4qg1hw3";
+    url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz";
+    inherit (param) sha256;
   };
 
   buildInputs = [ ocaml findlib ];

From 13705c02ce7bd8417dfcc70ec635c1f349cb0728 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Wed, 6 Jun 2018 23:19:57 +0300
Subject: [PATCH 3172/3370] mariadb: 10.2.14 -> 10.2.15 (#41497)

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

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index e22e3a64fac1..fea5583ea591 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -15,11 +15,11 @@ mariadb = everything // {
 };
 
 common = rec { # attributes common to both builds
-  version = "10.2.14";
+  version = "10.2.15";
 
   src = fetchurl {
     url    = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz";
-    sha256 = "0zizf3q0hdkmsn6rpwdbfm5xkj21cwpnnzq9knjfpwcadqnyqhrl";
+    sha256 = "04ds6vkb7k2lqpcdz663z4ll1jx1zz2hqxz5nj7gs8pwb18j1pik";
     name   = "mariadb-${version}.tar.gz";
   };
 

From 75601e10cb30d5220c09c5d0cf2c8ee55fc4b34a Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 6 Jun 2018 22:36:17 +0200
Subject: [PATCH 3173/3370] manual: make epub a build product on hydra (#41475)

---
 doc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/default.nix b/doc/default.nix
index 0d95d3f04573..f99aaff5f8a6 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -44,5 +44,6 @@ pkgs.stdenv.mkDerivation {
 
     mkdir -p $out/nix-support/
     echo "doc manual $dest manual.html" >> $out/nix-support/hydra-build-products
+    echo "doc manual $dest nixpkgs-manual.epub" >> $out/nix-support/hydra-build-products
   '';
 }

From 0dc563881a127de4aed84ab325c41cdaad883ee9 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 6 Jun 2018 23:17:07 +0200
Subject: [PATCH 3174/3370] unifont: 10.0.06 -> 11.0.01

See https://lists.gnu.org/archive/html/info-gnu/2018-06/msg00003.html
for release information
---
 pkgs/data/fonts/unifont/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix
index e56807a434e8..5e658e458fd5 100644
--- a/pkgs/data/fonts/unifont/default.nix
+++ b/pkgs/data/fonts/unifont/default.nix
@@ -2,16 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "unifont-${version}";
-  version = "10.0.06";
+  version = "11.0.01";
 
   ttf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.ttf";
-    sha256 = "1h4scl4l6503n8ghzd35dxfbai773csjrgdziqm86334zdj9g6k6";
+    sha256 = "03nnfnh4j60a4hy0d4hqpnvhlfx437hp4g1wjfjy91vzrcbmvkwi";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/${name}/${name}.pcf.gz";
-    sha256 = "0ypkmwyfrsnag69h1c0mx89ranz4f6jc9y1sqkpq2rbzg64maik0";
+    sha256 = "03bqqz2ipy3afhwsfy30c2v97cc27grw11lc0vzcvrgvin9ys2v1";
   };
 
   nativeBuildInputs = [ mkfontscale mkfontdir ];
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "1qz7qr6lrwcn47vn0hbbgqnhz3agdl7q7x4l4yd5ard0idv3jj98";
+  outputHash = "1ncllq42x1mlblf6h44garc3b5hkxv9dkpgbaipzll22p1l29yrf";
 
   meta = with stdenv.lib; {
     description = "Unicode font for Base Multilingual Plane";

From 5d092b3052b2fad2c1b6f73bb4765cc6f2eca8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 6 Jun 2018 23:57:08 +0200
Subject: [PATCH 3175/3370] rPackages.cluster: fix darwin build

This fixes the error:
    ld: library not found for -liconv
---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index cbaea0f0d85e..82ebe2f15e49 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -433,6 +433,7 @@ let
     PET = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ];
     dti = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ];
     mzR = [ pkgs.netcdf ];
+    cluster = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [

From e023f117f83d18195bae00ffbfe553184050b4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 6 Jun 2018 23:58:15 +0200
Subject: [PATCH 3176/3370] rPackages.KernSmooth: fix darwin build

This fixes the error:
    ld: library not found for -liconv
---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 82ebe2f15e49..7feb3e38b178 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -434,6 +434,7 @@ let
     dti = [ pkgs.which pkgs.xorg.xdpyinfo pkgs.imagemagick ];
     mzR = [ pkgs.netcdf ];
     cluster = [ pkgs.libiconv ];
+    KernSmooth = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [

From d8ad2ad91617de99e71316d207c5aea0bc7c9c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Wed, 6 Jun 2018 23:59:09 +0200
Subject: [PATCH 3177/3370] rPackages.nlme: fix darwin build

This fixes the error:
    ld: library not found for -liconv
---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 7feb3e38b178..149c94fee59a 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -435,6 +435,7 @@ let
     mzR = [ pkgs.netcdf ];
     cluster = [ pkgs.libiconv ];
     KernSmooth = [ pkgs.libiconv ];
+    nlme = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [

From 0275562a12848c75dfcfdd0f1b0c1522c18ad336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Thu, 7 Jun 2018 00:00:07 +0200
Subject: [PATCH 3178/3370] rPackages.Matrix: fix darwin build

This fixes the error:
    ld: library not found for -liconv
---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 149c94fee59a..00a84bf0e0a4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -436,6 +436,7 @@ let
     cluster = [ pkgs.libiconv ];
     KernSmooth = [ pkgs.libiconv ];
     nlme = [ pkgs.libiconv ];
+    Matrix = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [

From aeda45821da6f63ec17533194c1503d83e626874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= <josef.kemetmueller@gmail.com>
Date: Thu, 7 Jun 2018 00:00:42 +0200
Subject: [PATCH 3179/3370] rPackages.mgcv: fix darwin build

This fixes the error:
    ld: library not found for -liconv
---
 pkgs/development/r-modules/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 00a84bf0e0a4..35822fa78bd4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -437,6 +437,7 @@ let
     KernSmooth = [ pkgs.libiconv ];
     nlme = [ pkgs.libiconv ];
     Matrix = [ pkgs.libiconv ];
+    mgcv = [ pkgs.libiconv ];
   };
 
   packagesRequireingX = [

From 91184d159d000f74505eae336eeae5999e82b177 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 6 Jun 2018 17:05:02 -0400
Subject: [PATCH 3180/3370] dwarf-fortress: move themes to .json file

This will make it easier to automate.
---
 pkgs/games/dwarf-fortress/default.nix        | 12 ++--
 pkgs/games/dwarf-fortress/themes/cla.nix     | 33 ---------
 pkgs/games/dwarf-fortress/themes/default.nix | 25 +++++++
 pkgs/games/dwarf-fortress/themes/phoebus.nix | 34 ---------
 pkgs/games/dwarf-fortress/themes/themes.json | 72 ++++++++++++++++++++
 5 files changed, 105 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/games/dwarf-fortress/themes/cla.nix
 create mode 100644 pkgs/games/dwarf-fortress/themes/default.nix
 delete mode 100644 pkgs/games/dwarf-fortress/themes/phoebus.nix
 create mode 100644 pkgs/games/dwarf-fortress/themes/themes.json

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 82710256c631..ee2e442daa28 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,14 +1,14 @@
-{ pkgs, pkgsi686Linux, stdenv }:
+{ pkgs, stdenv, stdenvNoCC, gccStdenv }:
 
 let
   callPackage = pkgs.newScope self;
-  callPackage_i686 = pkgsi686Linux.newScope self;
 
   self = rec {
     dwarf-fortress-original = callPackage ./game.nix { };
 
     dfhack = callPackage ./dfhack {
       inherit (pkgs.perlPackages) XMLLibXML XMLLibXSLT;
+      stdenv = gccStdenv;
     };
 
     soundSense = callPackage ./soundsense.nix { };
@@ -32,9 +32,13 @@ let
 
     dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { };
 
-    phoebus-theme = callPackage ./themes/phoebus.nix { };
+    themes = callPackage ./themes {
+      stdenv = stdenvNoCC;
+    };
 
-    cla-theme = callPackage ./themes/cla.nix { };
+    phoebus-theme = themes.phoebus;
+
+    cla-theme = themes.cla;
   };
 
 in self
diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
deleted file mode 100644
index c7d85c48ce8e..000000000000
--- a/pkgs/games/dwarf-fortress/themes/cla.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-# On upgrade check https://github.com/DFgraphics/CLA/blob/master/manifest.json
-# for compatibility information.
-
-stdenv.mkDerivation rec {
-  name = "cla-theme-${version}";
-  version = "44.xx-v25";
-
-  src = fetchFromGitHub {
-    owner = "DFgraphics";
-    repo = "CLA";
-    rev = version;
-    sha256 = "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk";
-  };
-
-  installPhase = ''
-    mkdir $out
-    cp -r data raw $out
-  '';
-
-  passthru.dfVersion = "0.44.09";
-
-  preferLocalBuild = true;
-
-  meta = with stdenv.lib; {
-    description = "CLA graphics set for Dwarf Fortress";
-    homepage = http://www.bay12forums.com/smf/index.php?topic=105376.0;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ abbradar ];
-    license = licenses.free;
-  };
-}
diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix
new file mode 100644
index 000000000000..90f46d052618
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/themes/default.nix
@@ -0,0 +1,25 @@
+{stdenv, lib, fetchFromGitHub}:
+
+with builtins;
+
+listToAttrs (map (v: {
+  inherit (v) name;
+  value = stdenv.mkDerivation {
+    name = "${v.name}-${v.version}";
+    src = fetchFromGitHub {
+      owner = "DFgraphics";
+      repo = v.name;
+      rev = v.version;
+      sha256 = v.sha256;
+    };
+    installPhase = ''
+      mkdir -p $out
+      cp -r data raw $out
+    '';
+    meta = with lib; {
+      platforms = platforms.all;
+      maintainers = [ maintainers.matthewbauer ];
+      license = licenses.free;
+    };
+  };
+}) (fromJSON (readFile ./themes.json)))
diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
deleted file mode 100644
index 8641e15fa864..000000000000
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-# On upgrade check https://github.com/DFgraphics/Phoebus/blob/master/manifest.json
-# for compatibility information.
-
-stdenv.mkDerivation rec {
-  name = "phoebus-theme-${version}";
-  version = "44.07";
-
-  src = fetchFromGitHub {
-    owner = "DFgraphics";
-    repo = "Phoebus";
-    rev = version;
-    sha256 = "114yc0s7j57i4rq6iq295gggbgzx4qb389xip8lkzfg4dnp6klns";
-  };
-
-  installPhase = ''
-    mkdir $out
-    cp -r data raw $out
-  '';
-
-  passthru.dfVersion = "0.44.09";
-
-  preferLocalBuild = true;
-
-  meta = with stdenv.lib; {
-    description = "Phoebus graphics set for Dwarf Fortress";
-    homepage = http://www.bay12forums.com/smf/index.php?topic=137096.0;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ a1russell abbradar ];
-    # https://github.com/fricy/Phoebus/issues/5
-    license = licenses.free;
-  };
-}
diff --git a/pkgs/games/dwarf-fortress/themes/themes.json b/pkgs/games/dwarf-fortress/themes/themes.json
new file mode 100644
index 000000000000..f2cc4ed3ac7d
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/themes/themes.json
@@ -0,0 +1,72 @@
+[
+  {
+      "name": "taffer",
+      "version": "44.10a",
+      "sha256": "0gp8hmv55bp34db0caksdpd3kn2glh7sz03gyxknzdymh1cpy0qv"
+  },
+  {
+      "name": "spacefox",
+      "version": "44.10a",
+      "sha256": "0ngipq1aha8cd34k4hkrfbi238gp36qpymr2f87d3nwbj2vi9hmh"
+  },
+  {
+      "name": "gemset",
+      "version": "44.10a",
+      "sha256": "14q69dyqzhxsfv1a4vh17fx7r7mylfimmjrydz6ygdypblgc9zm6"
+  },
+  {
+      "name": "wanderlust",
+      "version": "44.10",
+      "sha256": "016acv0ab2wj4rn9slhbf626977zas6q4372f7avaf99ihcmwi85"
+  },
+  {
+      "name": "rally-ho",
+      "version": "44.10",
+      "sha256": "1pij5llnc8hfsqgyrwj1ak123wxhhk7yhlpnj033gwbpp0lnqz2x"
+  },
+  {
+      "name": "phoebus",
+      "version": "44.10",
+      "sha256": "1fvl5251wzjns159snhw01p214k53vpdlyj7piv545r23q7wg2ji"
+  },
+  {
+      "name": "obsidian",
+      "version": "44.10",
+      "sha256": "06lixlkprjd829zn10g5zljnxymsh81g31dj86hn2jvlch4dh98q"
+  },
+  {
+      "name": "mayday",
+      "version": "44.10",
+      "sha256": "1g15ha0w93iyj5ni2pavhwrsckhnw80xvwrvw4dbp5zx1y41f3x9"
+  },
+  {
+      "name": "jolly-bastion",
+      "version": "44.10",
+      "sha256": "038qvr08776rinlqa6zwb8qqxyrc75nnyyqjsasr2rf9d2f9yf8j"
+  },
+  {
+      "name": "ironhand",
+      "version": "44.10",
+      "sha256": "14hngixd4gkw0lzqzlkj9ljmrxr8b3wgjk67n6zysgyi3f38f5j2"
+  },
+  {
+      "name": "afro-graphics",
+      "version": "44.10",
+      "sha256": "050mrpy9q6g9y4133al7rdsj6c9hy2wva7jqmc56babvmmcpcc2j"
+  },
+  {
+      "name": "cla",
+      "version": "44.xx-v25",
+      "sha256": "1h8nwa939qzqklbi8vwsq9p2brvv7sc0pbzzrdjnb221lr9p58zk"
+  },
+  {
+      "name": "tergel",
+      "version": "44.03",
+      "sha256": "1kgk0cav5b6v7mca36gm84b2p556ibd8yy4rwbfc4i6i3hlsdw07"
+  },
+  {
+      "name": "autoreiv",
+      "version": "44.03",
+      "sha256": "03w9dp42718p5gnswynw3p9wz85y61gkzz60jf71arw1zhf23wm0"
+  }
+]

From dfc4744afd82b2d26a8df71b05ffacf05230af50 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 6 Jun 2018 18:07:42 -0400
Subject: [PATCH 3181/3370] =?UTF-8?q?dwarf-fortress:=2044.09=20=E2=86=92?=
 =?UTF-8?q?=2044.10?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/games/dwarf-fortress/dfhack/default.nix  | 18 +++++++--------
 .../dfhack/fix-stonesense.patch               | 23 -------------------
 .../dwarf-therapist/default.nix               |  4 ++--
 pkgs/games/dwarf-fortress/game.nix            |  8 +++----
 pkgs/games/dwarf-fortress/soundsense.nix      |  2 +-
 pkgs/games/dwarf-fortress/unfuck.nix          |  4 ++--
 6 files changed, 17 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 641676489ed9..a77f50a51711 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -1,13 +1,11 @@
-{ stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage
+{ stdenv, hostPlatform, lib, fetchFromGitHub, cmake, writeScriptBin, callPackage
 , perl, XMLLibXML, XMLLibXSLT, zlib
 , enableStoneSense ? false,  allegro5, libGLU_combined
 }:
 
 let
-  dfVersion = "0.44.09";
+  dfVersion = "0.44.10";
   version = "${dfVersion}-r1";
-  rev = "refs/tags/${version}";
-  sha256 = "1cwifdhi48a976xc472nf6q2k0ibwqffil5a4llcymcxdbgxdcc9";
 
   # revision of library/xml submodule
   xmlRev = "3c0bf63674d5430deadaf7befaec42f0ec1e8bc5";
@@ -25,7 +23,7 @@ let
       if [ "$(dirname "$(pwd)")" = "xml" ]; then
         echo "${xmlRev}"
       else
-        echo "${rev}"
+        echo "refs/tags/${version}"
       fi
     elif [ "$*" = "rev-parse HEAD:library/xml" ]; then
       echo "${xmlRev}"
@@ -38,13 +36,13 @@ in stdenv.mkDerivation rec {
   name = "dfhack-${version}";
 
   # Beware of submodules
-  src = fetchgit {
-    url = "https://github.com/DFHack/dfhack";
-    inherit rev sha256;
+  src = fetchFromGitHub {
+    owner = "DFHack";
+    repo = "dfhack";
+    sha256 = "0srgymyd57hk9iffhi2i0ra5vzw2vzlpzn4042yb90vqpmvz2zrj";
+    rev = version;
   };
 
-  patches = [ ./fix-stonesense.patch ];
-
   nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
   # We don't use system libraries because dfhack needs old C++ ABI.
   buildInputs = [ zlib ]
diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
deleted file mode 100644
index da860cd55624..000000000000
--- a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001
-From: Herwig Hochleitner <hhochleitner@gmail.com>
-Date: Sun, 1 Oct 2017 18:01:43 +0200
-Subject: [PATCH] include <GL/glext.h>
-
-this fixes `GLhandleARB` not being defined
----
- plugins/stonesense/common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h
-index eb36691..ef45389 100644
---- a/plugins/stonesense/common.h
-+++ b/plugins/stonesense/common.h
-@@ -31,6 +31,8 @@ using namespace df::enums;
- #include <allegro5/allegro_opengl.h>
- #include <allegro5/utf8.h>
- 
-+#include <GL/glext.h>
-+
- // allegro leaks X headers, undef some of it here:
- #undef TileShape
- #undef None
\ No newline at end of file
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 29cc2dc62857..6d96f98aec94 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "dwarf-therapist-original-${version}";
-  version = "39.3.1";
+  version = "40.0.0";
 
   src = fetchFromGitHub {
     owner = "Dwarf-Therapist";
     repo = "Dwarf-Therapist";
     rev = "v${version}";
-    sha256 = "0vb0dg1r833gaa4jzlrxf9acn41az3xjs9alx7r9lkqwvkjyrdy2";
+    sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9";
   };
 
   outputs = [ "out" "layouts" ];
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 79eb6e191329..477ba33b77c6 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -9,7 +9,7 @@ with lib;
 
 let
   baseVersion = "44";
-  patchVersion = "09";
+  patchVersion = "10";
   dfVersion = "0.${baseVersion}.${patchVersion}";
 
   libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ];
@@ -21,15 +21,15 @@ let
   srcs = {
     "x86_64-linux" = fetchurl {
       url = "${homepage}df_${baseVersion}_${patchVersion}_linux.tar.bz2";
-      sha256 = "1haikynkg1pqyrzzqk1qxm19p36ww58qp8brh3fjxssp4x71rcdy";
+      sha256 = "1cqm43hn3ar9d8a7y7dwq48ajp72cirn1gclh8r2fykkypprxmp2";
     };
     "i686-linux" = fetchurl {
       url = "${homepage}df_${baseVersion}_${patchVersion}_linux32.tar.bz2";
-      sha256 = "0lmbrdf7wjdwj5yx0khnq871yxvhfwqxjjyfkqcdy5ik18lvlkj8";
+      sha256 = "0gdb6sq8725nwdisxwha8f5b6arq570s73aj4gdrh611gxh13r6n";
     };
     "x86_64-darwin" = fetchurl {
       url = "${homepage}df_${baseVersion}_${patchVersion}_osx.tar.bz2";
-      sha256 = "01dss8g9lmi8majp6lxcfw166ydz4himkz6am5pi29gixaf4vfqs";
+      sha256 = "1wpa45d81q8f5mhqmaxvdkz93k6cm3pg7vpsqjjjsp5s961gd74g";
     };
   };
 
diff --git a/pkgs/games/dwarf-fortress/soundsense.nix b/pkgs/games/dwarf-fortress/soundsense.nix
index 67c86f7f745c..f09ac8435482 100644
--- a/pkgs/games/dwarf-fortress/soundsense.nix
+++ b/pkgs/games/dwarf-fortress/soundsense.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation rec {
   version = "2016-1_196";
-  dfVersion = "0.44.09";
+  dfVersion = "0.44.10";
   inherit soundPack;
   name = "soundsense-${version}";
   src = fetchzip {
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index fc42c05f0701..d816ba461b11 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -3,7 +3,7 @@
 , ncurses, glib, gtk2, libsndfile, zlib
 }:
 
-let dfVersion = "0.44.09"; in
+let dfVersion = "0.44.10"; in
 
 stdenv.mkDerivation {
   name = "dwarf_fortress_unfuck-${dfVersion}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "svenstaro";
     repo = "dwarf_fortress_unfuck";
     rev = dfVersion;
-    sha256 = "00yj4l4gazxg4i6fj9rwri6vm17i6bviy2mpkx0z5c0mvsr7s14b";
+    sha256 = "0vb19qx2ibc79j4bgbk9lskb883qfb0815zw1dfz9k7rqwal8mzj";
   };
 
   cmakeFlags = [

From 08c6c6beb46be071202c3973e4f2f2959af13c93 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 6 Jun 2018 19:18:00 -0400
Subject: [PATCH 3182/3370] SDL2: disable sdltest on darwin

Darwin headless will hang when trying to run the SDL test program.
---
 pkgs/development/libraries/SDL2/default.nix       | 3 ++-
 pkgs/development/libraries/SDL2_gfx/default.nix   | 3 ++-
 pkgs/development/libraries/SDL2_image/default.nix | 3 +++
 pkgs/development/libraries/SDL2_mixer/default.nix | 3 ++-
 pkgs/development/libraries/SDL2_net/default.nix   | 2 ++
 pkgs/development/libraries/SDL2_ttf/default.nix   | 2 ++
 6 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index d852b594f6dd..c32f59636a92 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -55,7 +55,8 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--disable-oss"
   ] ++ optional (!x11Support) "--without-x"
-    ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib";
+    ++ optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib"
+    ++ optional stdenv.isDarwin "--disable-sdltest";
 
   postInstall = ''
     moveToOutput lib/libSDL2main.a "$dev"
diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix
index 04ec3f9652c2..803cc97a8ae8 100644
--- a/pkgs/development/libraries/SDL2_gfx/default.nix
+++ b/pkgs/development/libraries/SDL2_gfx/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ SDL2 ]
     ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
 
-  configureFlags = if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx";
+  configureFlags = [(if stdenv.isi686 || stdenv.isx86_64 then "--enable-mmx" else "--disable-mmx")]
+     ++ stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
 
   meta = with stdenv.lib; {
     description = "SDL graphics drawing primitives and support functions";
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index b0f2d0e8b8d1..ea5f37513afb 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ SDL2 libpng libjpeg libtiff libungif libXpm zlib ]
     ++ stdenv.lib.optional stdenv.isDarwin Foundation;
 
+
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix
index 00251adb9153..f31fe33ea096 100644
--- a/pkgs/development/libraries/SDL2_mixer/default.nix
+++ b/pkgs/development/libraries/SDL2_mixer/default.nix
@@ -23,7 +23,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ SDL2 libogg libvorbis fluidsynth smpeg2 flac libmodplug ];
 
   configureFlags = [ "--disable-music-ogg-shared" ]
-    ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl";
+    ++ lib.optional enableNativeMidi "--enable-music-native-midi-gpl"
+    ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" "--disable-smpegtest" ];
 
   meta = with stdenv.lib; {
     description = "SDL multi-channel audio mixer library";
diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix
index 780444d51f4f..5cadfb9d9051 100644
--- a/pkgs/development/libraries/SDL2_net/default.nix
+++ b/pkgs/development/libraries/SDL2_net/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
 
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
   propagatedBuildInputs = [ SDL2 ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix
index 4558317ce3e3..a21315fdc882 100644
--- a/pkgs/development/libraries/SDL2_ttf/default.nix
+++ b/pkgs/development/libraries/SDL2_ttf/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl";
   };
 
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-sdltest";
+
   buildInputs = [ SDL2 freetype libGL ]
     ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc;
 

From b00737be2345fd3dce8968bbb3bc8c099e155e93 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 6 Jun 2018 20:57:03 -0400
Subject: [PATCH 3183/3370] genimage: add gettext

https://hydra.nixos.org/build/75400168/nixlog/1
---
 pkgs/tools/filesystems/genimage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix
index 792b2e2c75b4..b39c51a0c881 100644
--- a/pkgs/tools/filesystems/genimage/default.nix
+++ b/pkgs/tools/filesystems/genimage/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libconfuse }:
+{ stdenv, fetchurl, pkgconfig, libconfuse, gettext }:
 
 stdenv.mkDerivation rec {
   name = "genimage-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ libconfuse ];
+  buildInputs = [ libconfuse gettext ];
 
   postInstall = ''
     # As there is no manpage or built-in --help, add the README file for

From bcb303dc47eee14f95ae649de962691b31b2e45e Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Wed, 6 Jun 2018 21:18:32 -0400
Subject: [PATCH 3184/3370] libbdplus: add gettext

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

diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 83b9367f9923..8b2f0b0da92d 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
+{ stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex, gettext }:
 
 # library that allows libbluray to play BDplus protected bluray disks
 # libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
   };
 
-  buildInputs = [ libgcrypt libgpgerror ];
+  buildInputs = [ libgcrypt libgpgerror gettext ];
 
   nativeBuildInputs = [ ];
 

From 203c8c4534c166406dac460f1b01c410a4159ffb Mon Sep 17 00:00:00 2001
From: Sander Hollaar <git@humilis.net>
Date: Thu, 7 Jun 2018 06:01:02 +0200
Subject: [PATCH 3185/3370] intltool-debian-patch - fix "error: cannot download
 perl-5.22.patch from any mirror"

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

diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index cb64bd602b79..67180b08f026 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
 
   # fix "unescaped left brace" errors when using intltool in some cases
   patches = [(fetchpatch {
-    name = "perl-5.22.patch";
-    url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool"
-      + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co&pathrev=47258";
-    sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3";
+    name = "perl5.26-regex-fixes.patch";
+    url = "https://sources.debian.org/data/main/i/intltool/0.51.0-5"
+      + "/debian/patches/perl5.26-regex-fixes.patch";
+    sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45";
   })];
 
   propagatedBuildInputs = [ gettext perl perlXMLParser ];

From 333cebead2886d70b24e3736a77ce435636841d5 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 7 Jun 2018 14:10:48 +0800
Subject: [PATCH 3186/3370] perlPackages.DBDsybase: init at 1.16

---
 .../perl-modules/DBD-sybase/default.nix         | 17 +++++++++++++++++
 pkgs/top-level/perl-packages.nix                |  5 +++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/perl-modules/DBD-sybase/default.nix

diff --git a/pkgs/development/perl-modules/DBD-sybase/default.nix b/pkgs/development/perl-modules/DBD-sybase/default.nix
new file mode 100644
index 000000000000..ced458396da5
--- /dev/null
+++ b/pkgs/development/perl-modules/DBD-sybase/default.nix
@@ -0,0 +1,17 @@
+{ fetchurl, buildPerlPackage, DBI, freetds }:
+
+buildPerlPackage rec {
+  name = "DBD-Sybase-1.16";
+
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/M/ME/MEWP/${name}.tar.gz";
+    sha256 = "1k6n261nrrcll9wxn5xwi4ibpavqv1il96687k62mbpznzl2gx37";
+  };
+
+  SYBASE = freetds;
+
+  buildInputs = [ freetds ] ;
+  propagatedBuildInputs = [ DBI ];
+
+  doCheck = false;
+}
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4a0f258bb2da..c1a715a67f36 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4100,6 +4100,11 @@ let self = _self // overrides; _self = with self; {
     inherit (pkgs) postgresql;
   };
 
+  DBDsybase = import ../development/perl-modules/DBD-sybase {
+    inherit fetchurl buildPerlPackage DBI;
+    inherit (pkgs) freetds;
+  };
+
   DBFile = import ../development/perl-modules/DB_File {
     inherit fetchurl buildPerlPackage;
     inherit (pkgs) db;

From d5f37d1f2e4e95693c55772917c435a929339526 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 7 Jun 2018 14:21:18 +0800
Subject: [PATCH 3187/3370] check-mssql-health: init at 2.6.4.14

---
 .../monitoring/plugins/labs_consol_de.nix     | 19 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
index 350728d509fb..957aee43691a 100644
--- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix
+++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchurl, buildPerlPackage, autoreconfHook, makeWrapper
-, perl, NetSNMP, coreutils, gnused, gnugrep }:
+, perl, DBDsybase, NetSNMP, coreutils, gnused, gnugrep }:
 
 let
   glplugin = fetchFromGitHub {
@@ -9,11 +9,10 @@ let
     sha256 = "0wb55a9pmgbilfffx0wkiikg9830qd66j635ypczqp4basslpq5b";
   };
 
-  generic = { pname, version, sha256, description, ... } @ attrs:
+  generic = { pname, version, sha256, description, buildInputs, ... }:
   let
-    attrs' = builtins.removeAttrs attrs [ "pname" "version" "rev" "sha256"];
     name' = "${stdenv.lib.replaceStrings [ "-" ] [ "_" ] "${pname}"}-${version}";
-  in perl.stdenv.mkDerivation rec {
+  in perl.stdenv.mkDerivation {
     name = "${pname}-${version}";
 
     src = fetchurl {
@@ -21,7 +20,7 @@ let
       inherit sha256;
     };
 
-    buildInputs = [ perl NetSNMP ];
+    buildInputs = [ perl ] ++ buildInputs;
 
     nativeBuildInputs = [ autoreconfHook makeWrapper ];
 
@@ -54,11 +53,20 @@ let
   };
 
 in {
+  check-mssql-health = generic {
+    pname       = "check_mssql_health";
+    version     = "2.6.4.14";
+    sha256      = "0w6gybrs7imx169l8740s0ax3adya867fw0abrampx59mnsj5pm1";
+    description = "Check plugin for Microsoft SQL Server.";
+    buildInputs = [ DBDsybase ];
+  };
+
   check-nwc-health = generic {
     pname       = "check_nwc_health";
     version     = "7.0.1.3";
     sha256      = "0rgd6zgd7kplx3z72n8zbzwkh8vnd83361sk9ibh6ng78sds1sl5";
     description = "Check plugin for network equipment.";
+    buildInputs = [ NetSNMP ];
   };
 
   check-ups-health = generic {
@@ -66,5 +74,6 @@ in {
     version     = "2.8.2.2";
     sha256      = "1gc2wjsymay2vk5ywc1jj9cvrbhs0fs851x8l4nc75df2g75v521";
     description = "Check plugin for UPSs.";
+    buildInputs = [ NetSNMP ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae5da9a8a622..a0fa4cd83edc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12811,7 +12811,8 @@ with pkgs;
   monitoring-plugins = callPackage ../servers/monitoring/plugins { };
   nagiosPluginsOfficial = monitoring-plugins;
 
-  inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) NetSNMP; })
+  inherit (callPackage ../servers/monitoring/plugins/labs_consol_de.nix { inherit (perlPackages) DBDsybase NetSNMP; })
+    check-mssql-health
     check-nwc-health
     check-ups-health;
 

From df92030a3257b4fd75db5e001da72150b4fb5f65 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 7 Jun 2018 10:50:58 +0200
Subject: [PATCH 3188/3370] python36Packages.cython: Disable the
 "test_coerce_to_numpy" test on aarch64 (#41453)

---
 .../python-modules/Cython/default.nix          | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index a9488b540e28..948f8e700acb 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -11,7 +11,18 @@
 , ncurses
 }:
 
-buildPythonPackage rec {
+let
+  excludedTests = []
+    # cython's testsuite is not working very well with libc++
+    # We are however optimistic about things outside of testsuite still working
+    ++ stdenv.lib.optionals (stdenv.cc.isClang or false) [ "cpdef_extern_func" "libcpp_algo" ]
+    # Some tests in the test suite isn't working on aarch64. Disable them for
+    # now until upstream finds a workaround.
+    # Upstream issue here: https://github.com/cython/cython/issues/2308
+    ++ stdenv.lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ]
+  ;
+
+in buildPythonPackage rec {
   pname = "Cython";
   version = "0.28.2";
 
@@ -29,12 +40,11 @@ buildPythonPackage rec {
   buildInputs = [ glibcLocales gdb ];
   LC_ALL = "en_US.UTF-8";
 
-  # cython's testsuite is not working very well with libc++
-  # We are however optimistic about things outside of testsuite still working
   checkPhase = ''
     export HOME="$NIX_BUILD_TOP"
     ${python.interpreter} runtests.py \
-      ${if stdenv.cc.isClang or false then ''--exclude="(cpdef_extern_func|libcpp_algo)"'' else ""}
+      ${stdenv.lib.optionalString (builtins.length excludedTests != 0)
+        ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''}
   '';
 
   meta = {

From 81853859a1d67a0d7569487688e58da6db608d4e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 7 Jun 2018 02:04:01 -0700
Subject: [PATCH 3189/3370] cutemaze: 1.2.2 -> 1.2.3 (#41572)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/cutemaze/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/sqmwkpsp62yarxbxil0xwl6c7434bhns-cutemaze-1.2.3/bin/cutemaze had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.2.3 with grep in /nix/store/sqmwkpsp62yarxbxil0xwl6c7434bhns-cutemaze-1.2.3
- directory tree listing: https://gist.github.com/a8cfdfb66984a0f73bf7653f74bd4875
- du listing: https://gist.github.com/ad7863094421835157fc96f90206e350
---
 pkgs/games/cutemaze/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix
index 253a7fcbf304..2570ccb51dcd 100644
--- a/pkgs/games/cutemaze/default.nix
+++ b/pkgs/games/cutemaze/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cutemaze-${version}";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "https://gottcode.org/cutemaze/${name}-src.tar.bz2";
-    sha256 = "1a2jmkm7fjzdrvzgvbqfq20k0vvpwfcycagsm0haxb3fpv86950y";
+    sha256 = "1gczg8bki9d2kkkkrac5wi4vnjdynv8xjw2qxn9lx1jfkm8fk1qk";
   };
 
   nativeBuildInputs = [ qmake qttools ];

From e5d43df48cfbedb114651efedd995204918f17df Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 7 Jun 2018 12:06:51 +0300
Subject: [PATCH 3190/3370] pythonPackages.autograd: init at 1.2 (#41558)

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

diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix
new file mode 100644
index 000000000000..1c3c1fdefbea
--- /dev/null
+++ b/pkgs/development/python-modules/autograd/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, numpy, future, nose }:
+
+buildPythonPackage rec {
+  pname = "autograd";
+  version = "1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zd4lhz9dpll4i63jjijbzkzbgmg8h88il7lr7kmcylvadnzm2x0";
+  };
+
+  propagatedBuildInputs = [ numpy future ];
+
+  # Currently, the PyPI tarball doesn't contain the tests. When that has been
+  # fixed, enable testing. See: https://github.com/HIPS/autograd/issues/404
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/HIPS/autograd;
+    description = "Compute derivatives of NumPy code efficiently";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jluttine ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c4ab7805bda..a60fd40c70dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -195,6 +195,8 @@ in {
     inherit (pkgs) augeas;
   };
 
+  autograd = callPackage ../development/python-modules/autograd { };
+
   automat = callPackage ../development/python-modules/automat { };
 
   aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { };

From 24786e1249539619b7e441585d738baca5aa23b7 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 7 Jun 2018 09:04:45 +0000
Subject: [PATCH 3191/3370] dwarf-therapist: fix build

Update for dfc4744afd82b2d26a8df71b05ffacf05230af50.
---
 .../dwarf-fortress/dwarf-therapist/default.nix    | 15 ---------------
 .../dwarf-fortress/dwarf-therapist/wrapper.nix    |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 6d96f98aec94..2e54258c4be9 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -11,24 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9";
   };
 
-  outputs = [ "out" "layouts" ];
   buildInputs = [ qtbase qtdeclarative ];
   nativeBuildInputs = [ texlive cmake ninja ];
 
-  configurePhase = ''
-    cmake -GNinja
-  '';
-
-  buildPhase = ''
-    ninja -j$NIX_BUILD_CORES
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ./DwarfTherapist $out/bin/DwarfTherapist
-    cp -r ./share/memory_layouts $layouts
-  '';
-
   meta = with stdenv.lib; {
     description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
     maintainers = with maintainers; [ the-kenny abbradar bendlas ];
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 6debf0bb0b2b..f9e3e468cdc0 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -18,7 +18,7 @@ in symlinkJoin {
   postBuild = ''
     # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
     # therefore uses many relative paths.
-    wrapProgram $out/bin/DwarfTherapist \
+    wrapProgram $out/bin/dwarftherapist \
       --run "cd $out/share/dwarftherapist"
 
     rm -rf $out/share/dwarftherapist/memory_layouts/linux
@@ -26,7 +26,7 @@ in symlinkJoin {
     origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8)
     patchedmd5=$(cat "${dfHashFile}" | cut -c1-8)
     substitute \
-      ${dt.layouts}/${inifile} \
+      ${dt}/share/dwarftherapist/memory_layouts/${inifile} \
       $out/share/dwarftherapist/memory_layouts/${inifile} \
       --replace "$origmd5" "$patchedmd5"
   '';

From 5e35e9934c50489ce0f42b329c25b7ceb7153d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Thu, 7 Jun 2018 11:32:40 +0200
Subject: [PATCH 3192/3370] python.pkgs.envs: 1.2.4 -> 1.2.6

---
 pkgs/development/python-modules/envs/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix
index 7b6159d0e616..43446b407af6 100644
--- a/pkgs/development/python-modules/envs/default.nix
+++ b/pkgs/development/python-modules/envs/default.nix
@@ -1,16 +1,13 @@
-{ lib, buildPythonPackage, fetchFromGitHub
+{ lib, buildPythonPackage, fetchPypi
 , click, jinja2, terminaltables }:
 
 buildPythonPackage rec {
   pname = "envs";
-  version = "1.2.4";
+  version = "1.2.6";
 
-  # move to fetchPyPi when https://github.com/capless/envs/issues/8 is fixed
-  src = fetchFromGitHub {
-    owner  = "capless";
-    repo   = "envs";
-    rev    = "e1f6cbad7f20316fc44324d2c50826d57c2817a8";
-    sha256 = "0p88a79amj0jxll3ssq1dzg78y7zwgc8yqyr7cf53nv2i7kmpakv";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5fe059d6df1ae01c422d32b10ec7f539baad0e7d339f4c8b2de4ad8cbb07c8ba";
   };
 
   checkInputs = [ click jinja2 terminaltables ];

From 5d9a182f8afeb21598be0e0f25dacf2f84a20b06 Mon Sep 17 00:00:00 2001
From: Sondre Nilsen <nilsen.sondre@gmail.com>
Date: Thu, 7 Jun 2018 12:09:14 +0200
Subject: [PATCH 3193/3370] Jetbrains CLion: 2018.1.2 -> 2018.1.3

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

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 8064ffeb7f55..f6c446da35d1 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -237,12 +237,12 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "2018.1.2"; /* updated by script */
+    version = "2018.1.3";
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz";
-      sha256 = "158ydbr0bbzm1nqi4xhrcp6bwk7kmiw78v959h7bxg3y7z55hbwa"; /* updated by script */
+      sha256 = "0daj1ha7d9kxgb60mx2yzyj01m6ahw5d6wzs0vvwp5fh5qf4mpw5";
     };
     wmClass = "jetbrains-clion";
     update-channel = "CLion_Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml

From feb801505647caa60043a6b09123fdfef1975938 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 7 Jun 2018 12:47:29 +0200
Subject: [PATCH 3194/3370] phpPackages.phpcs: 3.2.3 -> 3.3.0

Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.3.0
---
 pkgs/top-level/php-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index ebba6a2f5ceb..8649e9219986 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -443,11 +443,11 @@ let
 
   phpcs = pkgs.stdenv.mkDerivation rec {
     name = "phpcs-${version}";
-    version = "3.2.3";
+    version = "3.3.0";
 
     src = pkgs.fetchurl {
       url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
-      sha256 = "193axz56j1kyq458q0y38m99bx31jjjldfg6bv71vgm6zh4rvvs1";
+      sha256 = "1zl35vcq8dmspsj7ww338h30ah75dg91j6a1dy8avkzw5zljqi4h";
     };
 
     phases = [ "installPhase" ];

From ce40a23ac92ab3164063c0f3f797777dd47da36c Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 7 Jun 2018 12:48:38 +0200
Subject: [PATCH 3195/3370] phpPackages.phpcbf: 3.2.3 -> 3.3.0

Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.3.0
---
 pkgs/top-level/php-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 8649e9219986..948a84ea02d2 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -470,11 +470,11 @@ let
 
   phpcbf = pkgs.stdenv.mkDerivation rec {
     name = "phpcbf-${version}";
-    version = "3.2.3";
+    version = "3.3.0";
 
     src = pkgs.fetchurl {
       url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
-      sha256 = "00p0l01shxx1h6g26j2dbfrp9j7im541das4xps4wrsvc4h4da9l";
+      sha256 = "1ah065gzmr11njp1if5bc4b19f4izilqwr06m84yb7af18qr77ls";
     };
 
     phases = [ "installPhase" ];

From 01040d9c27cce96a095dffe8225e220fb8e8dbcc Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 7 Jun 2018 12:46:58 +0200
Subject: [PATCH 3196/3370] tdesktopPackages.preview: 1.3.1 -> 1.3.3

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index b6f91f02f833..09723ab95c07 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.3.1";
-    sha256Hash = "084zrdx3w1yq53r53zjbqpz7s8fc3ga26ffwyfxj07ysmyn7ck25";
+    version = "1.3.3";
+    sha256Hash = "0c5p2isakcm53n24q82glsj5c3j7drn36xx14apdxxm3aj87bcaj";
   });
 }

From 961f1fc7fce7be6f199e9e23ade6423147e95d28 Mon Sep 17 00:00:00 2001
From: Karol Chmist <karol@chmist.com>
Date: Thu, 7 Jun 2018 13:14:49 +0200
Subject: [PATCH 3197/3370] dotty: 0.6.0-RC1 -> 0.8.0-RC1

---
 pkgs/development/compilers/scala/dotty-bare.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix
index bff73337e9e8..0c9625c04d5c 100644
--- a/pkgs/development/compilers/scala/dotty-bare.nix
+++ b/pkgs/development/compilers/scala/dotty-bare.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "0.6.0-RC1";
+  version = "0.8.0-RC1";
   name = "dotty-bare-${version}";
 
   src = fetchurl {
     url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz";
-    sha256 = "de1f5e72fb0e0b4c377d6cec93f565eff49769698cd8be01b420705fe8475ca4";
+    sha256 = "e5b7a9bb6f1007146a440ddfff871cc312075e5d69b9ab7e279ad7c3514f7065";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 52f81b6b5852d5d02e3b7e877e7f31b811e1ce7f Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <beb82@cornell.edu>
Date: Thu, 7 Jun 2018 11:44:06 +0000
Subject: [PATCH 3198/3370] ats2: 0.3.9 -> 0.3.11

---
 maintainers/maintainer-list.nix             | 5 +++++
 pkgs/development/compilers/ats2/default.nix | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e11e7edcc691..94a5f236511b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -562,6 +562,11 @@
     github = "basvandijk";
     name = "Bas van Dijk";
   };
+  bbarker = {
+    email = "brandon.barker@gmail.com";
+    github = "bbarker";
+    name = "Brandon Elam Barker";
+  };  
   bcarrell = {
     email = "brandoncarrell@gmail.com";
     github = "bcarrell";
diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix
index 579af7a8d232..d6453d1d1071 100644
--- a/pkgs/development/compilers/ats2/default.nix
+++ b/pkgs/development/compilers/ats2/default.nix
@@ -3,11 +3,11 @@
 , withContrib ? true }:
 
 let
-  versionPkg = "0.3.9" ;
+  versionPkg = "0.3.11" ;
 
   contrib = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-contrib-${versionPkg}.tgz" ;
-    sha256 = "627bb99ecf2e3d5976f95f2faa13c7c330726601e8bb05a2113c9b69c98749b5";
+    sha256 = "300884eca8a54cb9b0daa19bd04a86252160cc8ad6ef494198babd56d5a579bc";
   };
 
   postInstallContrib = stdenv.lib.optionalString withContrib
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
-    sha256 = "c69a7c58964df26227e77656659129ca4c05205d2ebcacc7084edba818fb6e81";
+    sha256 = "feba71f37e9688b8ff0a72c4eb21914ce59f19421350d9dc3f15ad6f8c28428a";
   };
 
   buildInputs = [ gmp ];
@@ -52,6 +52,6 @@ stdenv.mkDerivation rec {
     homepage    = "http://www.ats-lang.org";
     license     = licenses.gpl3Plus;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ thoughtpolice ttuegel ];
+    maintainers = with maintainers; [ thoughtpolice ttuegel bbarker ];
   };
 }

From b955c93cbeb0e7f85d5c62975b99ab5798ed718c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 7 Jun 2018 07:16:18 -0500
Subject: [PATCH 3199/3370] aws-sdk-cpp: 1.4.50 -> 1.4.60

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

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 46e6a73433d0..5fce7bae8fcd 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -15,13 +15,13 @@ let
         else throw "Unsupported system!";
 in stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
-  version = "1.4.50";
+  version = "1.4.60";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "aws-sdk-cpp";
     rev = version;
-    sha256 = "1qly5zn7w9j8w6a9pjw25xnr01sfq8dn8g5zrz6xyjgz590fj2x7";
+    sha256 = "0zn1pyhn37w8di9byq5p3y886hsgf5569bmxiqb7bvjcrhnlb83l";
   };
 
   # FIXME: might be nice to put different APIs in different outputs

From 2be28b1df547fde6c5f12d840e7564d239545eef Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Thu, 7 Jun 2018 14:23:37 +0200
Subject: [PATCH 3200/3370] Revert "Merge pull request #38263 from
 lopsided98/grub-initrd-secrets"

This reverts commit c06d7950f1b97abf510bc70bd2a2b0445e8d36f2, reversing
changes made to 4c25fbe338212f498a34d2a9b4c2072ac96c0e31.

See https://github.com/NixOS/nixpkgs/issues/41608
---
 nixos/doc/manual/release-notes/rl-1809.xml    |  9 ------
 .../modules/system/boot/loader/grub/grub.nix  | 20 +++++++++----
 .../system/boot/loader/grub/install-grub.pl   | 30 ++++++++-----------
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index 53aa910aea0d..ae0f35046fff 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -121,15 +121,6 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      <literal>gnucash24</literal>.
     </para>
    </listitem>
-   <listitem>
-    <para>
-      The GRUB specific option <option>boot.loader.grub.extraInitrd</option>
-      has been replaced with the generic option
-      <option>boot.initrd.secrets</option>. This option creates a secondary
-      initrd from the specified files, rather than using a manually created
-      initrd file.
-    </para>
-   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 350ad162da63..2e497ff9f2c4 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -35,7 +35,6 @@ let
     let
       efiSysMountPoint = if args.efiSysMountPoint == null then args.path else args.efiSysMountPoint;
       efiSysMountPoint' = replaceChars [ "/" ] [ "-" ] efiSysMountPoint;
-      initrdSecrets = config.boot.initrd.secrets != {};
     in
     pkgs.writeText "grub-config.xml" (builtins.toXML
     { splashImage = f cfg.splashImage;
@@ -50,12 +49,12 @@ let
       storePath = config.boot.loader.grub.storePath;
       bootloaderId = if args.efiBootloaderId == null then "NixOS${efiSysMountPoint'}" else args.efiBootloaderId;
       timeout = if config.boot.loader.timeout == null then -1 else config.boot.loader.timeout;
-      inherit efiSysMountPoint initrdSecrets;
+      inherit efiSysMountPoint;
       inherit (args) devices;
       inherit (efi) canTouchEfiVariables;
       inherit (cfg)
         version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber
-        extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels
+        extraEntriesBeforeNixOS extraPrepareConfig extraInitrd configurationLimit copyKernels
         default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios;
       path = (makeBinPath ([
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
@@ -285,6 +284,19 @@ in
         '';
       };
 
+      extraInitrd = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        example = "/boot/extra_initramfs.gz";
+        description = ''
+          The path to a second initramfs to be supplied to the kernel.
+          This ramfs will not be copied to the store, so that it can
+          contain secrets such as LUKS keyfiles or ssh keys.
+          This implies that rolling back to a previous configuration
+          won't rollback the state of this file.
+        '';
+      };
+
       useOSProber = mkOption {
         default = false;
         type = types.bool;
@@ -529,8 +541,6 @@ in
         { path = "/boot"; inherit (cfg) devices; inherit (efi) efiSysMountPoint; }
       ];
 
-      boot.loader.supportsInitrdSecrets = true;
-
       system.build.installBootLoader =
         let
           install-grub-pl = pkgs.substituteAll {
diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index ed0210d5645d..872261d0edfa 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -49,7 +49,7 @@ my $extraPrepareConfig = get("extraPrepareConfig");
 my $extraPerEntryConfig = get("extraPerEntryConfig");
 my $extraEntries = get("extraEntries");
 my $extraEntriesBeforeNixOS = get("extraEntriesBeforeNixOS") eq "true";
-my $initrdSecrets = get("initrdSecrets");
+my $extraInitrd = get("extraInitrd");
 my $splashImage = get("splashImage");
 my $configurationLimit = int(get("configurationLimit"));
 my $copyKernels = get("copyKernels") eq "true";
@@ -228,6 +228,13 @@ my $grubStore;
 if ($copyKernels == 0) {
     $grubStore = GrubFs($storePath);
 }
+my $extraInitrdPath;
+if ($extraInitrd) {
+    if (! -f $extraInitrd) {
+        print STDERR "Warning: the specified extraInitrd " . $extraInitrd . " doesn't exist. Your system won't boot without it.\n";
+    }
+    $extraInitrdPath = GrubFs($extraInitrd);
+}
 
 # Generate the header.
 my $conf .= "# Automatically generated.  DO NOT EDIT THIS FILE!\n";
@@ -347,23 +354,9 @@ sub addEntry {
 
     my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel"));
     my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd"));
-
-    # Include second initrd with secrets
-    if ($initrdSecrets) {
-      # Get last element of path
-      $initrd =~ /\/([^\/]+)$/;
-      my $initrdSecretsPath = "$bootPath/kernels/$1-secrets";
-      $initrd .= " $initrd-secrets";
-      my $oldUmask = umask;
-      # Make sure initrd is not world readable (won't work if /boot is FAT)
-      umask 0137;
-      my $initrdSecretsPathTemp = File::Temp::mktemp("$initrdSecretsPath.XXXXXXXX");
-      system("$path/append-initrd-secrets", $initrdSecretsPathTemp) == 0 or die "failed to create initrd secrets\n";
-      rename $initrdSecretsPathTemp, $initrdSecretsPath or die "failed to move initrd secrets into place\n";
-      umask $oldUmask;
-      $copied{$initrdSecretsPath} = 1;
+    if ($extraInitrd) {
+        $initrd .= " " .$extraInitrdPath->path;
     }
-
     my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef;
 
     # FIXME: $confName
@@ -386,6 +379,9 @@ sub addEntry {
         if ($copyKernels == 0) {
             $conf .= $grubStore->search . "\n";
         }
+        if ($extraInitrd) {
+            $conf .= $extraInitrdPath->search . "\n";
+        }
         $conf .= "  $extraPerEntryConfig\n" if $extraPerEntryConfig;
         $conf .= "  multiboot $xen $xenParams\n" if $xen;
         $conf .= "  " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";

From 0b41fa32d1d250cd7f6df88e9c4c868440a03f85 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Thu, 7 Jun 2018 15:57:06 +0300
Subject: [PATCH 3201/3370] pythonPackages.h5py: 2.7.1 -> 2.8.0 (#41581)

---
 .../python-modules/h5py/default.nix           | 15 +--
 .../python-modules/h5py/numpy-1.14.patch      | 94 -------------------
 2 files changed, 5 insertions(+), 104 deletions(-)
 delete mode 100644 pkgs/development/python-modules/h5py/numpy-1.14.patch

diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix
index 54cfb5dc93ba..144e826b675d 100644
--- a/pkgs/development/python-modules/h5py/default.nix
+++ b/pkgs/development/python-modules/h5py/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage
-, numpy, hdf5, cython, six, pkgconfig
+{ stdenv, fetchPypi, fetchpatch, isPy27, python, buildPythonPackage
+, numpy, hdf5, cython, six, pkgconfig, unittest2
 , mpi4py ? null, openssh }:
 
 assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
@@ -10,12 +10,12 @@ let
   mpi = hdf5.mpi;
   mpiSupport = hdf5.mpiSupport;
 in buildPythonPackage rec {
-  version = "2.7.1";
+  version = "2.8.0";
   pname = "h5py";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "180a688311e826ff6ae6d3bda9b5c292b90b28787525ddfcb10a29d5ddcae2cc";
+    sha256 = "0mdr6wrq02ac93m1aqx9kad0ppfzmm4imlxqgyy1x4l7hmdcc9p6";
   };
 
   configure_flags = "--hdf5=${hdf5}" + optionalString mpiSupport " --mpi";
@@ -30,18 +30,13 @@ in buildPythonPackage rec {
 
   preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
 
+  checkInputs = optional isPy27 unittest2;
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ hdf5 cython ]
     ++ optional mpiSupport mpi;
   propagatedBuildInputs = [ numpy six]
     ++ optionals mpiSupport [ mpi4py openssh ];
 
-  patches = [
-    # Patch is based on upstream patch. The tox.ini hunk had to be removed.
-    # https://github.com/h5py/h5py/commit/5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4.patch
-    ./numpy-1.14.patch
-  ];
-
   meta = {
     description =
       "Pythonic interface to the HDF5 binary data format";
diff --git a/pkgs/development/python-modules/h5py/numpy-1.14.patch b/pkgs/development/python-modules/h5py/numpy-1.14.patch
deleted file mode 100644
index e1db7e05808d..000000000000
--- a/pkgs/development/python-modules/h5py/numpy-1.14.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 5009e062a6f7d4e074cab0fcb42a780ac2b1d7d4 Mon Sep 17 00:00:00 2001
-From: James Tocknell <aragilar@gmail.com>
-Date: Thu, 28 Dec 2017 20:55:55 +1100
-Subject: [PATCH] FIX: Don't reorder compound types, breaks on numpy 1.14
-
----
- h5py/h5t.pyx | 25 +++++++------------------
- setup.py     |  2 +-
- tox.ini      |  4 ++--
- 3 files changed, 10 insertions(+), 21 deletions(-)
-
-diff --git a/h5py/h5t.pyx b/h5py/h5t.pyx
-index cc2344e1..7445e9eb 100644
---- a/h5py/h5t.pyx
-+++ b/h5py/h5t.pyx
-@@ -1136,12 +1136,6 @@ cdef class TypeCompoundID(TypeCompositeID):
-         else:
-             if sys.version[0] == '3':
-                 field_names = [x.decode('utf8') for x in field_names]
--            if len(field_names) > 0:
--                collated_fields = zip(field_names, field_types, field_offsets)
--                ordered_fields = sorted(
--                    collated_fields, key=operator.itemgetter(2))
--                field_names, field_types, field_offsets = \
--                    map(list, zip(*ordered_fields))
-             typeobj = dtype({
-                 'names': field_names,
-                 'formats': field_types,
-@@ -1458,8 +1452,7 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned):
-     cdef dtype member_dt
-     cdef size_t member_offset = 0
- 
--    cdef dict offsets = {}
--    cdef list fields = []
-+    cdef dict fields = {}
- 
-     # The challenge with correctly converting a numpy/h5py dtype to a HDF5 type
-     # which is composed of subtypes has three aspects we must consider
-@@ -1468,19 +1461,14 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned):
-     # 2. For correct round-tripping of aligned dtypes, we need to consider how
-     #   much padding we need by looking at the field offsets
-     # 3. There is no requirement that the offsets be monotonically increasing
--    #  (so we start by sorting the names as a function of increasing offset)
-     #
-     # The code below tries to cover these aspects
- 
--    # Get offsets for each compound member
--    for name, field in dt.fields.items():
--        offsets[name] = field[1]
--
-     # Build list of names, offsets, and types, sorted by increasing offset
-     # (i.e. the position of the member in the struct)
--    for name in sorted(dt.names, key=offsets.__getitem__):
-+    for name in sorted(dt.names, key=(lambda n: dt.fields[n][1])):
-         field = dt.fields[name]
--        name = name.encode('utf8') if isinstance(name, unicode) else name
-+        h5_name = name.encode('utf8') if isinstance(name, unicode) else name
- 
-         # Get HDF5 data types and set the offset for each member
-         member_dt = field[0]
-@@ -1489,7 +1477,7 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned):
-         if aligned and (member_offset > field[1]
-                         or member_dt.itemsize != member_type.get_size()):
-             raise TypeError("Enforced alignment not compatible with HDF5 type")
--        fields.append((name, member_offset, member_type))
-+        fields[name] = (h5_name, member_offset, member_type)
- 
-         # Update member offset based on the HDF5 type size
-         member_offset += member_type.get_size()
-@@ -1500,8 +1488,9 @@ cdef TypeCompoundID _c_compound(dtype dt, int logical, int aligned):
- 
-     # Create compound with the necessary size, and insert its members
-     tid = H5Tcreate(H5T_COMPOUND, member_offset)
--    for (name, member_offset, member_type) in fields:
--        H5Tinsert(tid, name, member_offset, member_type.id)
-+    for name in dt.names:
-+        h5_name, member_offset, member_type = fields[name]
-+        H5Tinsert(tid, h5_name, member_offset, member_type.id)
- 
-     return TypeCompoundID(tid)
- 
-diff --git a/setup.py b/setup.py
-index ec2a78a7..bbb086f6 100755
---- a/setup.py
-+++ b/setup.py
-@@ -32,7 +32,7 @@
- # these are required to build h5py
- # RUN_REQUIRES is included as setup.py test needs RUN_REQUIRES for testing
- # RUN_REQUIRES can be removed when setup.py test is removed
--SETUP_REQUIRES = RUN_REQUIRES + [NUMPY_DEP, 'Cython>=0.19', 'pkgconfig']
-+SETUP_REQUIRES = RUN_REQUIRES + [NUMPY_DEP, 'Cython>=0.23', 'pkgconfig']
- 
- # Needed to avoid trying to install numpy/cython on pythons which the latest
- # versions don't support

From 7aa6d2c808b14aa04dc93c2ca64344c9eee0876a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jun 2018 09:35:03 +0200
Subject: [PATCH 3202/3370] LTS Haskell 11.12

---
 .../configuration-hackage2nix.yaml            | 185 +++++++++++++-----
 1 file changed, 137 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 577ecd804932..31fe60180bb5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.11
+  # LTS Haskell 11.12
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -79,7 +79,7 @@ default-package-overrides:
   - aeson-yak ==0.1.1.3
   - Agda ==2.5.3
   - airship ==0.9.3
-  - alarmclock ==0.4.0.3
+  - alarmclock ==0.4.0.4
   - alerts ==0.1.0.0
   - alex ==3.2.4
   - algebra ==4.3.1
@@ -91,6 +91,95 @@ default-package-overrides:
   - alternative-vector ==0.0.0
   - alternators ==0.1.2.0
   - ALUT ==2.4.0.2
+  - amazonka ==1.6.0
+  - amazonka-apigateway ==1.6.0
+  - amazonka-application-autoscaling ==1.6.0
+  - amazonka-appstream ==1.6.0
+  - amazonka-autoscaling ==1.6.0
+  - amazonka-budgets ==1.6.0
+  - amazonka-certificatemanager ==1.6.0
+  - amazonka-cloudformation ==1.6.0
+  - amazonka-cloudfront ==1.6.0
+  - amazonka-cloudhsm ==1.6.0
+  - amazonka-cloudsearch ==1.6.0
+  - amazonka-cloudsearch-domains ==1.6.0
+  - amazonka-cloudtrail ==1.6.0
+  - amazonka-cloudwatch ==1.6.0
+  - amazonka-cloudwatch-events ==1.6.0
+  - amazonka-cloudwatch-logs ==1.6.0
+  - amazonka-codebuild ==1.6.0
+  - amazonka-codecommit ==1.6.0
+  - amazonka-codedeploy ==1.6.0
+  - amazonka-codepipeline ==1.6.0
+  - amazonka-cognito-identity ==1.6.0
+  - amazonka-cognito-idp ==1.6.0
+  - amazonka-cognito-sync ==1.6.0
+  - amazonka-config ==1.6.0
+  - amazonka-core ==1.6.0
+  - amazonka-datapipeline ==1.6.0
+  - amazonka-devicefarm ==1.6.0
+  - amazonka-directconnect ==1.6.0
+  - amazonka-discovery ==1.6.0
+  - amazonka-dms ==1.6.0
+  - amazonka-ds ==1.6.0
+  - amazonka-dynamodb ==1.6.0
+  - amazonka-dynamodb-streams ==1.6.0
+  - amazonka-ec2 ==1.6.0
+  - amazonka-ecr ==1.6.0
+  - amazonka-ecs ==1.6.0
+  - amazonka-efs ==1.6.0
+  - amazonka-elasticache ==1.6.0
+  - amazonka-elasticbeanstalk ==1.6.0
+  - amazonka-elasticsearch ==1.6.0
+  - amazonka-elastictranscoder ==1.6.0
+  - amazonka-elb ==1.6.0
+  - amazonka-elbv2 ==1.6.0
+  - amazonka-emr ==1.6.0
+  - amazonka-gamelift ==1.6.0
+  - amazonka-glacier ==1.6.0
+  - amazonka-health ==1.6.0
+  - amazonka-iam ==1.6.0
+  - amazonka-importexport ==1.6.0
+  - amazonka-inspector ==1.6.0
+  - amazonka-iot ==1.6.0
+  - amazonka-iot-dataplane ==1.6.0
+  - amazonka-kinesis ==1.6.0
+  - amazonka-kinesis-analytics ==1.6.0
+  - amazonka-kinesis-firehose ==1.6.0
+  - amazonka-kms ==1.6.0
+  - amazonka-lambda ==1.6.0
+  - amazonka-lightsail ==1.6.0
+  - amazonka-marketplace-analytics ==1.6.0
+  - amazonka-marketplace-metering ==1.6.0
+  - amazonka-ml ==1.6.0
+  - amazonka-opsworks ==1.6.0
+  - amazonka-opsworks-cm ==1.6.0
+  - amazonka-pinpoint ==1.6.0
+  - amazonka-polly ==1.6.0
+  - amazonka-rds ==1.6.0
+  - amazonka-redshift ==1.6.0
+  - amazonka-rekognition ==1.6.0
+  - amazonka-route53 ==1.6.0
+  - amazonka-route53-domains ==1.6.0
+  - amazonka-s3 ==1.6.0
+  - amazonka-sdb ==1.6.0
+  - amazonka-servicecatalog ==1.6.0
+  - amazonka-ses ==1.6.0
+  - amazonka-shield ==1.6.0
+  - amazonka-sms ==1.6.0
+  - amazonka-snowball ==1.6.0
+  - amazonka-sns ==1.6.0
+  - amazonka-sqs ==1.6.0
+  - amazonka-ssm ==1.6.0
+  - amazonka-stepfunctions ==1.6.0
+  - amazonka-storagegateway ==1.6.0
+  - amazonka-sts ==1.6.0
+  - amazonka-support ==1.6.0
+  - amazonka-swf ==1.6.0
+  - amazonka-test ==1.6.0
+  - amazonka-waf ==1.6.0
+  - amazonka-workspaces ==1.6.0
+  - amazonka-xray ==1.6.0
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
   - ansigraph ==0.3.0.5
@@ -140,9 +229,9 @@ default-package-overrides:
   - auto-update ==0.1.4
   - avwx ==0.3.0.2
   - axiom ==0.4.6
-  - b9 ==0.5.47
+  - b9 ==0.5.49
   - backprop ==0.1.5.2
-  - bank-holidays-england ==0.1.0.6
+  - bank-holidays-england ==0.1.0.7
   - barrier ==0.1.1
   - base16-bytestring ==0.1.1.6
   - base32string ==0.9.1
@@ -159,13 +248,13 @@ default-package-overrides:
   - bcrypt ==0.0.11
   - beam-core ==0.7.2.1
   - beam-migrate ==0.3.2.0
-  - beam-sqlite ==0.3.2.0
+  - beam-sqlite ==0.3.2.1
   - bench ==1.0.9
   - benchpress ==0.2.2.10
   - bencode ==0.6.0.0
   - bento ==0.1.0
   - between ==0.11.0.0
-  - bhoogle ==0.1.2.6
+  - bhoogle ==0.1.2.7
   - bibtex ==0.1.0.6
   - bifunctors ==5.5.2
   - bimap ==0.3.3
@@ -179,7 +268,7 @@ default-package-overrides:
   - binary-parsers ==0.2.3.0
   - binary-search ==1.0.0.3
   - binary-shared ==0.8.3
-  - binary-tagged ==0.1.4.2
+  - binary-tagged ==0.1.5
   - bindings-DSL ==1.0.25
   - bindings-GLFW ==3.1.2.4
   - bindings-libzip ==1.0.1
@@ -260,7 +349,7 @@ default-package-overrides:
   - Cabal ==2.0.1.1
   - cabal-doctest ==1.0.6
   - cabal-file-th ==0.2.4
-  - cabal-rpm ==0.12.3
+  - cabal-rpm ==0.12.4
   - cabal-toolkit ==0.0.5
   - cache ==0.1.1.0
   - cairo ==0.13.5.0
@@ -286,7 +375,7 @@ default-package-overrides:
   - cereal-vector ==0.2.0.1
   - ChannelT ==0.0.0.7
   - charset ==0.3.7.1
-  - charsetdetect-ae ==1.1.0.3
+  - charsetdetect-ae ==1.1.0.4
   - Chart ==1.8.3
   - Chart-cairo ==1.8.3
   - chaselev-deque ==0.5.0.5
@@ -357,7 +446,7 @@ default-package-overrides:
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
   - conduit ==1.3.0.2
-  - conduit-algorithms ==0.0.8.0
+  - conduit-algorithms ==0.0.8.1
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
   - conduit-extra ==1.3.0
@@ -515,7 +604,7 @@ default-package-overrides:
   - dlist ==0.8.0.4
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
-  - dns ==3.0.3
+  - dns ==3.0.4
   - docker ==0.5.1.1
   - docker-build-cacher ==1.9.2
   - dockerfile ==0.1.0.1
@@ -589,11 +678,11 @@ default-package-overrides:
   - eventful-sqlite ==0.2.0
   - eventful-test-helpers ==0.2.0
   - event-list ==0.1.2
-  - eventsource-api ==1.3.0
+  - eventsource-api ==1.3.1
   - eventsource-geteventstore-store ==1.1.0
   - eventsource-store-specs ==1.1.1
   - eventsource-stub-store ==1.0.3
-  - eventstore ==1.1.3
+  - eventstore ==1.1.4
   - every ==0.0.1
   - exact-combinatorics ==0.2.0.8
   - exact-pi ==0.4.1.3
@@ -610,7 +699,7 @@ default-package-overrides:
   - extensible ==0.4.9
   - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
-  - extra ==1.6.6
+  - extra ==1.6.8
   - extractable-singleton ==0.0.1
   - extrapolate ==0.3.1
   - fail ==4.9.0.0
@@ -800,12 +889,12 @@ default-package-overrides:
   - haddock-library ==1.4.5
   - hailgun ==0.4.1.8
   - hailgun-simple ==0.1.0.0
-  - hakyll ==4.12.2.0
+  - hakyll ==4.12.3.0
   - half ==0.2.2.3
   - hamilton ==0.1.0.2
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.5
+  - hapistrano ==0.3.5.6
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.1
   - happstack-server-tls ==7.1.6.5
@@ -815,9 +904,9 @@ default-package-overrides:
   - hashable-time ==0.2.0.1
   - hashids ==1.0.2.4
   - hashmap ==1.3.3
-  - hashtables ==1.2.3.0
+  - hashtables ==1.2.3.1
   - haskeline ==0.7.4.2
-  - haskell-gi ==0.21.2
+  - haskell-gi ==0.21.3
   - haskell-gi-base ==0.21.1
   - haskell-gi-overloading ==0.0
   - haskell-lexer ==1.0.1
@@ -841,9 +930,9 @@ default-package-overrides:
   - hasmin ==1.0.2
   - hasql ==1.1.1
   - hasql-migration ==0.1.3
-  - hasql-optparse-applicative ==0.3.0.1
-  - hasql-pool ==0.4.3
-  - hasql-transaction ==0.6
+  - hasql-optparse-applicative ==0.3.0.2
+  - hasql-pool ==0.4.3.1
+  - hasql-transaction ==0.6.0.1
   - hastache ==0.6.1
   - hasty-hamiltonian ==1.3.2
   - HaTeX ==3.18.0.0
@@ -864,7 +953,7 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.5.3
   - hedgehog-quickcheck ==0.1
-  - hedis ==0.10.1
+  - hedis ==0.10.2
   - heist ==1.0.1.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
@@ -944,7 +1033,7 @@ default-package-overrides:
   - hslua-module-text ==0.1.2.1
   - hsndfile ==0.8.0
   - hsndfile-vector ==0.5.2
-  - HsOpenSSL ==0.11.4.13
+  - HsOpenSSL ==0.11.4.14
   - HsOpenSSL-x509-system ==0.1.0.3
   - hsp ==0.10.0
   - hspec ==2.4.8
@@ -969,7 +1058,7 @@ default-package-overrides:
   - hstatsd ==0.1
   - HStringTemplate ==0.8.7
   - HSvm ==0.1.0.3.22
-  - hsx-jmacro ==7.3.8
+  - hsx-jmacro ==7.3.8.1
   - hsyslog ==5.0.1
   - hsyslog-udp ==0.2.2
   - htaglib ==1.1.1
@@ -1005,9 +1094,9 @@ default-package-overrides:
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.0
   - hw-fingertree ==0.1.0.1
-  - hw-fingertree-strict ==0.1.0.3
+  - hw-fingertree-strict ==0.1.1.1
   - hw-hedgehog ==0.1.0.1
-  - hw-hspec-hedgehog ==0.1.0.4
+  - hw-hspec-hedgehog ==0.1.0.5
   - hw-int ==0.0.0.3
   - hw-json ==0.6.0.0
   - hw-mquery ==0.1.0.1
@@ -1280,12 +1369,12 @@ default-package-overrides:
   - microstache ==1.0.1.1
   - midi ==0.2.2.2
   - mighty-metropolis ==1.2.0
-  - milena ==0.5.2.1
+  - milena ==0.5.2.2
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.4.1
   - mime-types ==0.1.0.7
   - minimorph ==0.1.6.1
-  - minio-hs ==1.0.0
+  - minio-hs ==1.0.1
   - miniutter ==0.4.7.0
   - mintty ==0.1.2
   - misfortune ==0.1.1.2
@@ -1329,7 +1418,7 @@ default-package-overrides:
   - monadplus ==1.4.2
   - monad-products ==4.0.1
   - MonadPrompt ==1.0.0.5
-  - MonadRandom ==0.5.1
+  - MonadRandom ==0.5.1.1
   - monad-recorder ==0.1.1
   - monad-skeleton ==0.1.5
   - monad-st ==0.2.4.1
@@ -1353,7 +1442,7 @@ default-package-overrides:
   - multiarg ==0.30.0.10
   - multimap ==1.2.1
   - multipart ==0.1.2
-  - multiset ==0.3.3
+  - multiset ==0.3.4
   - multistate ==0.7.1.2
   - murmur-hash ==0.1.0.9
   - mustache ==2.3.0
@@ -1367,7 +1456,7 @@ default-package-overrides:
   - mysql-haskell-openssl ==0.8.3.0
   - mysql-simple ==0.4.5
   - nagios-check ==0.3.2
-  - names-th ==0.2.0.3
+  - names-th ==0.2.0.4
   - nano-erl ==0.1.0.1
   - nanospec ==0.2.2
   - naqsha ==0.2.0.1
@@ -1565,8 +1654,8 @@ default-package-overrides:
   - postgresql-binary ==0.12.1.1
   - postgresql-libpq ==0.9.4.1
   - postgresql-schema ==0.1.14
-  - postgresql-simple ==0.5.3.0
-  - postgresql-simple-migration ==0.1.11.0
+  - postgresql-simple ==0.5.4.0
+  - postgresql-simple-migration ==0.1.12.0
   - postgresql-simple-queue ==1.0.1
   - postgresql-simple-url ==0.2.1.0
   - postgresql-transactional ==1.1.1
@@ -1609,10 +1698,10 @@ default-package-overrides:
   - prometheus-metrics-ghc ==0.3.0
   - promises ==0.3
   - prompt ==0.1.1.2
-  - protobuf ==0.2.1.1
+  - protobuf ==0.2.1.2
   - protobuf-simple ==0.1.0.5
-  - protocol-buffers ==2.4.9
-  - protocol-buffers-descriptor ==2.4.9
+  - protocol-buffers ==2.4.10
+  - protocol-buffers-descriptor ==2.4.10
   - protocol-radius ==0.0.1.0
   - protocol-radius-test ==0.0.1.0
   - proto-lens ==0.2.2.0
@@ -1660,7 +1749,7 @@ default-package-overrides:
   - random-shuffle ==0.0.4
   - random-source ==0.3.0.6
   - random-tree ==0.6.0.5
-  - range-set-list ==0.1.2.1
+  - range-set-list ==0.1.3
   - rank1dynamic ==0.4.0
   - rank2classes ==1.0.2
   - rank-product ==0.2.0.1
@@ -1755,8 +1844,8 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.16
   - sbv ==7.5
-  - SCalendar ==1.1.0
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1837,7 +1926,7 @@ default-package-overrides:
   - signal ==0.1.0.4
   - silently ==1.2.5
   - simple ==0.11.2
-  - simple-log ==0.9.4
+  - simple-log ==0.9.5
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.27
   - simple-session ==0.10.1.1
@@ -1892,7 +1981,7 @@ default-package-overrides:
   - spoon ==0.3.1
   - spreadsheet ==0.1.3.7
   - sqlite-simple ==0.4.15.0
-  - sql-words ==0.1.6.0
+  - sql-words ==0.1.6.1
   - squeal-postgresql ==0.1.1.4
   - srcloc ==0.5.1.2
   - stache ==1.2.1
@@ -1924,7 +2013,7 @@ default-package-overrides:
   - storable-tuple ==0.0.3.3
   - storablevector ==0.2.13
   - store ==0.4.3.2
-  - store-core ==0.4.1
+  - store-core ==0.4.3
   - Strafunski-StrategyLib ==5.0.1.0
   - stratosphere ==0.19.1
   - streaming ==0.2.1.0
@@ -2027,9 +2116,9 @@ default-package-overrides:
   - textlocal ==0.1.0.5
   - text-manipulate ==0.2.0.1
   - text-metrics ==0.3.0
-  - text-postgresql ==0.0.2.3
+  - text-postgresql ==0.0.3.0
   - text-printer ==0.5
-  - text-region ==0.3.0.0
+  - text-region ==0.3.1.0
   - text-short ==0.1.2
   - text-show ==3.7.2
   - text-show-instances ==3.6.3
@@ -2143,8 +2232,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - unique ==0
   - Unique ==0.4.7.2
+  - unique ==0
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2163,7 +2252,7 @@ default-package-overrides:
   - unordered-containers ==0.2.9.0
   - unordered-intmap ==0.1.0.0
   - unsafe ==0.0
-  - uri-bytestring ==0.3.1.1
+  - uri-bytestring ==0.3.2.0
   - uri-bytestring-aeson ==0.1.0.6
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
@@ -2192,7 +2281,7 @@ default-package-overrides:
   - validity-uuid ==0.0.0.0
   - validity-vector ==0.1.0.0
   - varying ==0.7.0.3
-  - vault ==0.3.1.0
+  - vault ==0.3.1.1
   - vcswrapper ==0.1.6
   - vector ==0.12.0.1
   - vector-algorithms ==0.7.0.1
@@ -2259,7 +2348,7 @@ default-package-overrides:
   - web-routes-th ==0.22.6.3
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.4.1
+  - websockets ==0.12.5.0
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.3.0
@@ -2382,7 +2471,7 @@ default-package-overrides:
   - zeromq4-haskell ==0.7.0
   - zim-parser ==0.2.1.0
   - zip ==1.0.0
-  - zip-archive ==0.3.2.4
+  - zip-archive ==0.3.2.5
   - zippers ==0.2.5
   - zlib ==0.6.2
   - zlib-bindings ==0.1.1.5

From a89d9005668cea435f31746f6a5d691257cc75c8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jun 2018 12:28:14 +0200
Subject: [PATCH 3203/3370] hackage2nix: update list of broken packages

---
 .../configuration-hackage2nix.yaml            | 52 ++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 31fe60180bb5..c53fd35c48ec 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2984,6 +2984,7 @@ dont-distribute-packages:
   Animas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   animascii:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate-example:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  animate-frames:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate-preview:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate-sdl2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   animate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3000,6 +3001,7 @@ dont-distribute-packages:
   antlrc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  apart:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   apelsin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   api-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3189,6 +3191,7 @@ dont-distribute-packages:
   base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   basic-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  basic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   batchd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   battlenet-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3212,6 +3215,7 @@ dont-distribute-packages:
   Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   belka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bench-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BenchmarkHistory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bencoding:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3329,6 +3333,7 @@ dont-distribute-packages:
   BlastHTTP:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   blatex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-builder-enumerator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blaze-colonnade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-hexpat:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blaze-html-truncate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3356,6 +3361,7 @@ dont-distribute-packages:
   board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bolt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boltzmann-brain:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell-compiler:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3435,6 +3441,7 @@ dont-distribute-packages:
   cabal-ghc-dynflags:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-helper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cabal-ide-backend:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-info:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3608,6 +3615,9 @@ dont-distribute-packages:
   citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cj-token:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cjk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cl3-hmatrix-interface:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cl3-linear-interface:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cl3:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   clac:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   claferIG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3809,6 +3819,7 @@ dont-distribute-packages:
   content-store:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContextAlgebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  contiguous:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4170,6 +4181,7 @@ dont-distribute-packages:
   dist-upload:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-fork-aws-lambda:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-async:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-client-server:            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4299,6 +4311,7 @@ dont-distribute-packages:
   edentv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   edge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   edit-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   editable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4345,6 +4358,7 @@ dont-distribute-packages:
   engine-io-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   entangle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  EntrezHTTP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerate-function:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4377,6 +4391,7 @@ dont-distribute-packages:
   escape-artist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  espial:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   esqueleto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ess:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   estimators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4430,6 +4445,7 @@ dont-distribute-packages:
   exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   exitcode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   exp-extended:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exp-pairs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   expiring-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4658,6 +4674,7 @@ dont-distribute-packages:
   freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   freetype-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freq:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fresco-binding:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fresh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-devil:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5281,6 +5298,8 @@ dont-distribute-packages:
   haphviz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happlets-lib-gtk:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happlets:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   happraise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HAppS-Data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   happs-hsp-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5669,6 +5688,7 @@ dont-distribute-packages:
   hi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hid-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hieraclus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-clustering-diagrams:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6080,6 +6100,7 @@ dont-distribute-packages:
   hunit-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunit-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hunspell-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunt-searchengine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hunt-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hurdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6089,10 +6110,16 @@ dont-distribute-packages:
   huttons-razor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-balancedparens:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-dsv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-excess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-kafka-avro:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-prim-bits:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-rankselect-base:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-rankselect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-succinct:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-xml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwall-auth-iitk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hweblib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6138,6 +6165,7 @@ dont-distribute-packages:
   hyperloglog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperloglogplus:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperpublic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hyphenate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hzulip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   i18n:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6888,6 +6916,7 @@ dont-distribute-packages:
   memorable-bits:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mercury-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   merge-bash-history:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mergeless:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   merkle-patricia-db:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   messente:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   meta-misc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7066,7 +7095,6 @@ dont-distribute-packages:
   mulang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multi-ghc-travis:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiaddr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7501,6 +7529,7 @@ dont-distribute-packages:
   perceptron:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   peregrin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  perf-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   perf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   perfecthash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7623,6 +7652,7 @@ dont-distribute-packages:
   PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plur:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   png-file:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7720,6 +7750,7 @@ dont-distribute-packages:
   prettyprinter-vty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   primesieve:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  primitive-sort:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PrimitiveArray-Pretty:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PrimitiveArray:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8062,6 +8093,7 @@ dont-distribute-packages:
   req-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reqcatcher:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  require:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rerebase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reroute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reserve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8238,6 +8270,7 @@ dont-distribute-packages:
   scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SciFlow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion-browser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   scons2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8343,6 +8376,7 @@ dont-distribute-packages:
   servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-smsc-ru:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-streaming-client:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-client:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8728,6 +8762,7 @@ dont-distribute-packages:
   Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  store-streaming:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   str:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-ATermLib:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8775,6 +8810,7 @@ dont-distribute-packages:
   suffixarray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SuffixStructures:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   suitable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  summoner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunlight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-compiler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8879,6 +8915,7 @@ dont-distribute-packages:
   tamarin-prover-utils:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tape:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tar-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   target:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tart:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   task-distribution:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8892,6 +8929,7 @@ dont-distribute-packages:
   tasty-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-tap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-travis:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Taxonomy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TaxonomyTools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9031,6 +9069,7 @@ dont-distribute-packages:
   time-machine:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-parsers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-patterns:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  time-quote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-series-lib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9046,6 +9085,7 @@ dont-distribute-packages:
   timers-tick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeseries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   timezone-unix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tintin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyLaunchbury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   tinyMesh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyURL:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9259,6 +9299,10 @@ dont-distribute-packages:
   unordered-containers-rematch:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unordered-graphs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpack-funcs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-either:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-maybe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-these:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-validation:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   unroll-ghc-plugin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   unsafely:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   unscramble:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9283,6 +9327,7 @@ dont-distribute-packages:
   urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urlencoded:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9627,6 +9672,8 @@ dont-distribute-packages:
   yam-servant:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-transaction-odbc:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-transaction-postgresql:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yaml-pretty-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9728,8 +9775,10 @@ dont-distribute-packages:
   yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   york-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yu-auth:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yu-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yu-launch:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yu-tool:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yuiGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yuuko:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yxdb-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9740,6 +9789,7 @@ dont-distribute-packages:
   ZEBEDDE:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   zendesk-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeno:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zephyr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   zeromq3-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]

From 89a8e0bfad847030d9f2514b136f2fa302e36bf3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jun 2018 09:36:39 +0200
Subject: [PATCH 3204/3370] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.9.2-21-g9312993 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/338f06c74f10e6e4c71321169baf01549a6cde06.
---
 .../haskell-modules/hackage-packages.nix      | 1716 +++++++----------
 1 file changed, 653 insertions(+), 1063 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 3345cade70b5..6acf61979771 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -915,24 +915,26 @@ self: {
      }) {};
 
   "Allure" = callPackage
-    ({ mkDerivation, async, base, containers, enummapset-th, filepath
+    ({ mkDerivation, async, base, containers, enummapset, filepath
      , LambdaHack, optparse-applicative, random, template-haskell, text
      , zlib
      }:
      mkDerivation {
        pname = "Allure";
-       version = "0.7.1.0";
-       sha256 = "0lsyp2rgn5g5d7q4wv13m9p5ayh0aqlzp3b11swhf7br77gg17ym";
+       version = "0.8.0.0";
+       sha256 = "0mg5srs0mfvdwf898fwkf8ji1722rkc55d0z8d4fb3aq8dvxgsxv";
+       revision = "1";
+       editedCabalFile = "10b34p2wv4nqldj0yaas9injjizxb151ks15k6wdx976fjpkqjqd";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
-         async base containers enummapset-th filepath LambdaHack
+         async base containers enummapset filepath LambdaHack
          optparse-applicative random template-haskell text zlib
        ];
        testHaskellDepends = [
-         base containers enummapset-th filepath LambdaHack
-         optparse-applicative random template-haskell text zlib
+         base containers enummapset filepath LambdaHack optparse-applicative
+         random template-haskell text zlib
        ];
        description = "Near-future Sci-Fi roguelike and tactical squad game";
        license = stdenv.lib.licenses.agpl3;
@@ -4790,6 +4792,7 @@ self: {
        ];
        description = "Libary to interface with the NCBI Entrez REST service";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Enum" = callPackage
@@ -9842,24 +9845,6 @@ self: {
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network
-     , openssl, time
-     }:
-     mkDerivation {
-       pname = "HsOpenSSL";
-       version = "0.11.4.13";
-       sha256 = "0izzgyjd0s9whqllwyg8gv2xnsfax9sf8j47zq1d2vmk7mpx2p0j";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         base bytestring integer-gmp network time
-       ];
-       librarySystemDepends = [ openssl ];
-       testHaskellDepends = [ base bytestring ];
-       description = "Partial OpenSSL binding for Haskell";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {inherit (pkgs) openssl;};
-
-  "HsOpenSSL_0_11_4_14" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }:
      mkDerivation {
        pname = "HsOpenSSL";
@@ -9871,7 +9856,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Partial OpenSSL binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "HsOpenSSL-x509-system" = callPackage
@@ -9954,8 +9938,8 @@ self: {
      }:
      mkDerivation {
        pname = "HsYAML";
-       version = "0.1.0.0";
-       sha256 = "1vl2fsbs0grgjwcghzqsiijnl7qlv2fgfw2nk9sbcfp81y0bxy3c";
+       version = "0.1.1.0";
+       sha256 = "1dih7i0c1fayqrz9x27hfhvg0rb0w1m70a702qhbyjr5jczlh6rb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -11103,41 +11087,43 @@ self: {
 
   "LambdaHack" = callPackage
     ({ mkDerivation, assert-failure, async, base, base-compat, binary
-     , bytestring, containers, deepseq, directory, enummapset-th
-     , filepath, ghc-prim, hashable, hsini, keys, miniutter
-     , optparse-applicative, pretty-show, random, sdl2, sdl2-ttf, stm
-     , template-haskell, text, time, transformers, unordered-containers
-     , vector, vector-binary-instances, zlib
+     , bytestring, containers, deepseq, directory, enummapset, filepath
+     , ghc-prim, hashable, hsini, keys, miniutter, optparse-applicative
+     , pretty-show, random, sdl2, sdl2-ttf, stm, template-haskell, text
+     , time, transformers, unordered-containers, vector
+     , vector-binary-instances, zlib
      }:
      mkDerivation {
        pname = "LambdaHack";
-       version = "0.7.1.0";
-       sha256 = "1k68vjlfcjnyikissv9bmqfg04zhba1318pvhjc9yb1lb2v745d7";
+       version = "0.8.0.0";
+       sha256 = "1g7lmplcgj2swk2mvams42fjmmiamk0hxhhzgzdv29jlq9gzmfv2";
+       revision = "1";
+       editedCabalFile = "1l0s7vqv2qpq50352x772584zz4q7ip0z7jc17b72vnipqln7jkd";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          assert-failure async base base-compat binary bytestring containers
-         deepseq directory enummapset-th filepath ghc-prim hashable hsini
-         keys miniutter optparse-applicative pretty-show random sdl2
-         sdl2-ttf stm text time transformers unordered-containers vector
+         deepseq directory enummapset filepath ghc-prim hashable hsini keys
+         miniutter optparse-applicative pretty-show random sdl2 sdl2-ttf stm
+         text time transformers unordered-containers vector
          vector-binary-instances zlib
        ];
        executableHaskellDepends = [
          assert-failure async base base-compat binary bytestring containers
-         deepseq directory enummapset-th filepath ghc-prim hashable hsini
-         keys miniutter optparse-applicative pretty-show random stm
+         deepseq directory enummapset filepath ghc-prim hashable hsini keys
+         miniutter optparse-applicative pretty-show random stm
          template-haskell text time transformers unordered-containers vector
          vector-binary-instances zlib
        ];
        testHaskellDepends = [
          assert-failure async base base-compat binary bytestring containers
-         deepseq directory enummapset-th filepath ghc-prim hashable hsini
-         keys miniutter optparse-applicative pretty-show random stm
+         deepseq directory enummapset filepath ghc-prim hashable hsini keys
+         miniutter optparse-applicative pretty-show random stm
          template-haskell text time transformers unordered-containers vector
          vector-binary-instances zlib
        ];
-       description = "A game engine library for roguelike dungeon crawlers";
+       description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -12406,23 +12392,6 @@ self: {
      }) {};
 
   "MonadRandom" = callPackage
-    ({ mkDerivation, base, fail, mtl, primitive, random, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "MonadRandom";
-       version = "0.5.1";
-       sha256 = "11qdfghizww810vdj9ac1f5qr5kdmrk40l6w6qh311bjh290ygwy";
-       revision = "1";
-       editedCabalFile = "19242r11a7iqr8dnbxsac04c3ylh7xkan70pdv5k3jzcmfwn4shd";
-       libraryHaskellDepends = [
-         base fail mtl primitive random transformers transformers-compat
-       ];
-       description = "Random-number generation monad";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "MonadRandom_0_5_1_1" = callPackage
     ({ mkDerivation, base, mtl, primitive, random, transformers
      , transformers-compat
      }:
@@ -12435,7 +12404,6 @@ self: {
        ];
        description = "Random-number generation monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadRandomLazy" = callPackage
@@ -16216,6 +16184,7 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ScratchFs" = callPackage
@@ -17575,6 +17544,7 @@ self: {
        ];
        description = "Libary for parsing, processing and vizualization of taxonomy data";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TaxonomyTools" = callPackage
@@ -22947,19 +22917,6 @@ self: {
      }) {inherit (pkgs) openal;};
 
   "alarmclock" = callPackage
-    ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }:
-     mkDerivation {
-       pname = "alarmclock";
-       version = "0.4.0.3";
-       sha256 = "0phgcmji4jrmyia6w05wqllrdl2hnsyxfkbh68dlgi7gn0c5nvxn";
-       libraryHaskellDepends = [
-         async base clock stm time unbounded-delays
-       ];
-       description = "Wake up and perform an action at a certain time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "alarmclock_0_4_0_4" = callPackage
     ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }:
      mkDerivation {
        pname = "alarmclock";
@@ -22970,7 +22927,6 @@ self: {
        ];
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alea" = callPackage
@@ -26784,6 +26740,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "Convert sprite frames to animate files";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "animate-preview" = callPackage
@@ -27265,6 +27222,7 @@ self: {
        ];
        description = "Get all your structure and rip it apart";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apecs" = callPackage
@@ -30098,8 +30056,10 @@ self: {
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "2.10.2.0";
-       sha256 = "04pclxd3wx582fx6l6fj7ggs52f0vvdag4rg17zh6xh562qbccsc";
+       version = "2.10.2.2";
+       sha256 = "080wkmv04zdzm86zrmgvyyfv7gkjxfr1fwy9470vviy7hywh1xin";
+       revision = "1";
+       editedCabalFile = "02wam77mcbknvfx8hb0d9d8m9ppvrd1w3xklwky5fz2dv071alm3";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
@@ -32014,38 +31974,6 @@ self: {
      }) {};
 
   "b9" = callPackage
-    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
-     , bytestring, conduit, conduit-extra, ConfigFile, directory
-     , filepath, free, hashable, hspec, hspec-expectations, lens, mtl
-     , optparse-applicative, parallel, parsec, pretty, pretty-show
-     , process, QuickCheck, random, shake, syb, template, text, time
-     , transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "b9";
-       version = "0.5.47";
-       sha256 = "1jnfci7px5hf6i729mz1fbx5sfg35q8l3663ls6pkf6b4kx8qfyz";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bifunctors binary boxes bytestring conduit
-         conduit-extra ConfigFile directory filepath free hashable lens mtl
-         parallel parsec pretty pretty-show process QuickCheck random shake
-         syb template text time transformers unordered-containers vector
-         yaml
-       ];
-       executableHaskellDepends = [
-         base bytestring directory lens optparse-applicative
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec hspec-expectations QuickCheck text
-         unordered-containers vector yaml
-       ];
-       description = "A tool and library for building virtual machine images";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "b9_0_5_49" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, bifunctors
      , binary, boxes, bytestring, conduit, conduit-extra, ConfigFile
      , directory, filepath, free, hashable, hspec, hspec-expectations
@@ -32075,7 +32003,6 @@ self: {
        ];
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "babl" = callPackage
@@ -32448,18 +32375,6 @@ self: {
      }) {};
 
   "bank-holidays-england" = callPackage
-    ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
-     mkDerivation {
-       pname = "bank-holidays-england";
-       version = "0.1.0.6";
-       sha256 = "1arlyjaaq8df2q121r9lc23wacn02ncdx5b7s8yszp6szx5jivap";
-       libraryHaskellDepends = [ base containers time ];
-       testHaskellDepends = [ base containers hspec QuickCheck time ];
-       description = "Calculation of bank holidays in England and Wales";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bank-holidays-england_0_1_0_7" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holidays-england";
@@ -32469,7 +32384,6 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck time ];
        description = "Calculation of bank holidays in England and Wales";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "banwords" = callPackage
@@ -32762,6 +32676,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-prelude_1_3" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-prelude";
+       version = "1.3";
+       sha256 = "1zk728sd09hh2r4xwz4lazsrrgg5cshydn64932sm0vckplndk73";
+       libraryHaskellDepends = [ base ];
+       description = "The most complete prelude formed solely from the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-unicode-symbols" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -32978,26 +32904,26 @@ self: {
 
   "baserock-schema" = callPackage
     ({ mkDerivation, algebraic-graphs, base, bytestring, docopt, errors
-     , gitlab-api, hspec, lens, mtl, QuickCheck, text, transformers
-     , turtle, unordered-containers, yaml
+     , flippers, gitlab-api, hspec, microlens-platform, mtl, QuickCheck
+     , rio, yaml, yaml-pretty-extras
      }:
      mkDerivation {
        pname = "baserock-schema";
-       version = "0.0.1.5";
-       sha256 = "0dc9wsdxgp0jx7mnq0c1dx48y6khjr9zjg3wjlifyx3k3k7yn2i5";
+       version = "0.0.2.0";
+       sha256 = "02lz48177jrnn7fwk7kjlh38a6kv7f197skf69mx0xgs88xjwrn9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         algebraic-graphs base bytestring errors lens mtl text transformers
-         turtle unordered-containers yaml
+         algebraic-graphs base errors flippers microlens-platform mtl rio
+         yaml yaml-pretty-extras
        ];
        executableHaskellDepends = [
-         algebraic-graphs base bytestring docopt errors gitlab-api lens mtl
-         text transformers turtle unordered-containers yaml
+         algebraic-graphs base docopt errors flippers gitlab-api
+         microlens-platform mtl rio yaml yaml-pretty-extras
        ];
        testHaskellDepends = [
-         algebraic-graphs base bytestring errors hspec lens mtl QuickCheck
-         text transformers turtle unordered-containers yaml
+         algebraic-graphs base bytestring errors flippers hspec
+         microlens-platform mtl QuickCheck rio yaml yaml-pretty-extras
        ];
        description = "Baserock Definitions Schema";
        license = stdenv.lib.licenses.bsd3;
@@ -33045,6 +32971,7 @@ self: {
        ];
        description = "Lifting values from base types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "basic-cpuid" = callPackage
@@ -33399,6 +33326,44 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ostree;};
 
+  "bdcs-api" = callPackage
+    ({ mkDerivation, aeson, async, base, bdcs, bifunctors, bytestring
+     , concurrent-extra, cond, containers, directory, extra, filepath
+     , gi-ggit, gi-gio, gi-glib, gitrev, haskell-gi-base, hspec, htoml
+     , http-client, http-media, http-types, libgit2-glib, monad-logger
+     , monad-loops, mtl, network, persistent, persistent-sqlite
+     , resourcet, safe-exceptions, semver, servant-client
+     , servant-options, servant-server, split, stm, string-conversions
+     , string-qq, tar, temporary, text, time, transformers, unix, uuid
+     , wai, wai-cors, warp
+     }:
+     mkDerivation {
+       pname = "bdcs-api";
+       version = "0.1.0";
+       sha256 = "1hnzbmihpq4nr0yxpwsaq5har2ws20zaialx98g9ws1k8k1kgzh0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bdcs bifunctors bytestring concurrent-extra cond
+         containers directory extra filepath gi-ggit gi-gio gi-glib gitrev
+         haskell-gi-base htoml http-media http-types monad-logger
+         monad-loops mtl network persistent persistent-sqlite resourcet
+         safe-exceptions semver servant-options servant-server split stm
+         string-conversions tar temporary text time transformers unix uuid
+         wai wai-cors warp
+       ];
+       libraryPkgconfigDepends = [ libgit2-glib ];
+       executableHaskellDepends = [ base safe-exceptions ];
+       testHaskellDepends = [
+         aeson base bdcs bytestring cond directory filepath hspec
+         http-client monad-loops safe-exceptions servant-client
+         servant-server string-conversions string-qq temporary text time wai
+         warp
+       ];
+       description = "BDCS API Server";
+       license = stdenv.lib.licenses.gpl3;
+     }) {inherit (pkgs.gnome3) libgit2-glib;};
+
   "bdd" = callPackage
     ({ mkDerivation, base, directory, HUnit, mtl, process
      , test-framework, test-framework-hunit, transformers
@@ -33527,24 +33492,6 @@ self: {
      }) {};
 
   "beam-sqlite" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate
-     , bytestring, dlist, free, hashable, mtl, network-uri, scientific
-     , sqlite-simple, text, time, unix
-     }:
-     mkDerivation {
-       pname = "beam-sqlite";
-       version = "0.3.2.0";
-       sha256 = "06lmsajdlqc2178p4lkgwv2hh49dmjygrfjk081sr2xbhgnslr9s";
-       libraryHaskellDepends = [
-         aeson attoparsec base beam-core beam-migrate bytestring dlist free
-         hashable mtl network-uri scientific sqlite-simple text time unix
-       ];
-       description = "Beam driver for SQLite";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "beam-sqlite_0_3_2_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, beam-core, beam-migrate
      , bytestring, dlist, free, hashable, mtl, network-uri, scientific
      , sqlite-simple, text, time, unix
@@ -33764,6 +33711,7 @@ self: {
        testHaskellDepends = [ base split text ];
        description = "Plot and compare benchmarks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "benchmark-function" = callPackage
@@ -34055,25 +34003,6 @@ self: {
      }) {};
 
   "bhoogle" = callPackage
-    ({ mkDerivation, base, brick, bytestring, containers, directory
-     , filepath, hoogle, lens, process, protolude, text, time, vector
-     , vty
-     }:
-     mkDerivation {
-       pname = "bhoogle";
-       version = "0.1.2.6";
-       sha256 = "0p6zh1rh80hzrm36w6d5hr6qjkfc71cr96dk9shrndnxlp8vlxsn";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick bytestring containers directory filepath hoogle lens
-         process protolude text time vector vty
-       ];
-       description = "Simple terminal GUI for local hoogle";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "bhoogle_0_1_2_7" = callPackage
     ({ mkDerivation, base, brick, bytestring, containers, directory
      , filepath, hoogle, lens, process, protolude, text, time, vector
      , vty
@@ -34090,7 +34019,6 @@ self: {
        ];
        description = "Simple terminal GUI for local hoogle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bibdb" = callPackage
@@ -34826,39 +34754,6 @@ self: {
      }) {};
 
   "binary-tagged" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
-     , binary, binary-orphans, bytestring, containers, criterion
-     , deepseq, generics-sop, hashable, nats, quickcheck-instances
-     , scientific, semigroups, SHA, tagged, tasty, tasty-quickcheck
-     , text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "binary-tagged";
-       version = "0.1.4.2";
-       sha256 = "1167rlb2lnib1vin9p75hp7fzcjqxljlw56bhmkwn05c5f6an7ri";
-       revision = "8";
-       editedCabalFile = "0a8xcrx2lm8yzcnrf76c1wynn238i87yz3lqlgrg5n9csdc0bhj1";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring binary bytestring containers
-         generics-sop hashable nats scientific semigroups SHA tagged text
-         time unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring bifunctors binary binary-orphans
-         bytestring containers generics-sop hashable nats
-         quickcheck-instances scientific semigroups SHA tagged tasty
-         tasty-quickcheck text time unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [
-         aeson array base base16-bytestring binary binary-orphans bytestring
-         containers criterion deepseq generics-sop hashable nats scientific
-         semigroups SHA tagged text time unordered-containers vector
-       ];
-       description = "Tagged binary serialisation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "binary-tagged_0_1_5" = callPackage
     ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
      , binary, binary-orphans, bytestring, containers, criterion
      , deepseq, generics-sop, hashable, nats, quickcheck-instances
@@ -34887,7 +34782,6 @@ self: {
        ];
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-tree" = callPackage
@@ -37168,6 +37062,7 @@ self: {
        testHaskellDepends = [ base colonnade doctest ];
        description = "Helper functions for using blaze-html with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-from-html" = callPackage
@@ -37912,6 +37807,7 @@ self: {
        executableHaskellDepends = [ base containers hmatrix ];
        description = "Boltzmann sampler compiler for combinatorial systems";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boltzmann-samplers" = callPackage
@@ -40473,8 +40369,8 @@ self: {
      }:
      mkDerivation {
        pname = "c-mosquitto";
-       version = "0.1.4.1";
-       sha256 = "0adb0sjdvdl3i2mqrpcvdqbi9w7bwcwc7y33ibcsyrgx542jf831";
+       version = "0.1.5.0";
+       sha256 = "07pqy6809lma8b69s91m93ibkag7irma07axnhkhsswkhd2kf5im";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -40591,6 +40487,31 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "c2hs_0_28_5" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , dlist, filepath, HUnit, language-c, pretty, process, shelly
+     , test-framework, test-framework-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "c2hs";
+       version = "0.28.5";
+       sha256 = "1xid997cc38rym6hsgv8xz5dg8jcsh8hs5rrwaxkij7mc09an45x";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         array base bytestring containers directory dlist filepath
+         language-c pretty process
+       ];
+       testHaskellDepends = [
+         base filepath HUnit shelly test-framework test-framework-hunit text
+         transformers
+       ];
+       description = "C->Haskell FFI tool that gives some cross-language type safety";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "c2hs-extra" = callPackage
     ({ mkDerivation, base, c2hs }:
      mkDerivation {
@@ -40969,6 +40890,7 @@ self: {
        doCheck = false;
        description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-info" = callPackage
@@ -41245,24 +41167,6 @@ self: {
      }) {};
 
   "cabal-rpm" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
-     , http-client, http-client-tls, http-conduit, process, time, unix
-     }:
-     mkDerivation {
-       pname = "cabal-rpm";
-       version = "0.12.3";
-       sha256 = "0nid91q38k4b3hgjrhv6sy68y5h74f85j08991hmfbwzd727dzfg";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring Cabal directory filepath http-client
-         http-client-tls http-conduit process time unix
-       ];
-       description = "RPM packaging tool for Haskell Cabal-based packages";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "cabal-rpm_0_12_4" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath
      , http-client, http-client-tls, http-conduit, process, time, unix
      }:
@@ -41278,7 +41182,6 @@ self: {
        ];
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -44407,17 +44310,6 @@ self: {
      }) {};
 
   "charsetdetect-ae" = callPackage
-    ({ mkDerivation, base, bytestring }:
-     mkDerivation {
-       pname = "charsetdetect-ae";
-       version = "1.1.0.3";
-       sha256 = "15kf9g708ics81s3gj4vkx4xcvywj2fripf0g9p29v4xliwd9m7y";
-       libraryHaskellDepends = [ base bytestring ];
-       description = "Character set detection using Mozilla's Universal Character Set Detector";
-       license = "LGPL";
-     }) {};
-
-  "charsetdetect-ae_1_1_0_4" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "charsetdetect-ae";
@@ -44426,7 +44318,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chart-histogram" = callPackage
@@ -44451,8 +44342,8 @@ self: {
      }:
      mkDerivation {
        pname = "chart-unit";
-       version = "0.6.2.0";
-       sha256 = "0y6xha20ckj0n0yih1zwwhyp55q1jcdmq06caid9biji8nkahzb0";
+       version = "0.6.3.0";
+       sha256 = "0r8c2g4jq2ldxn8msyyfa8r04hw5acgvb70q77jhh9v9jk5m93aa";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -45700,6 +45591,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Clifford Algebra of three dimensional space";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cl3-hmatrix-interface" = callPackage
@@ -45711,6 +45603,7 @@ self: {
        libraryHaskellDepends = [ base cl3 hmatrix ];
        description = "Interface to/from Cl3 and HMatrix";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cl3-linear-interface" = callPackage
@@ -45722,6 +45615,7 @@ self: {
        libraryHaskellDepends = [ base cl3 linear ];
        description = "Interface to/from Cl3 and Linear";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clac" = callPackage
@@ -48938,6 +48832,8 @@ self: {
        pname = "compact";
        version = "0.1.0.1";
        sha256 = "0lynnbvsyr07driy7lm9llrhvmk9wprjdbfc34svzfwldghk71gf";
+       revision = "1";
+       editedCabalFile = "0bdp226gx3gr1hg68xydxhkfr0h469ay60h0s1ywar19y3m8dn1p";
        libraryHaskellDepends = [ base binary bytestring ghc-compact ];
        testHaskellDepends = [ base directory ];
        description = "Non-GC'd, contiguous storage for immutable data structures";
@@ -50283,36 +50179,6 @@ self: {
      }) {};
 
   "conduit-algorithms" = callPackage
-    ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
-     , conduit-combinators, conduit-extra, containers, deepseq
-     , directory, exceptions, HUnit, lzma-conduit, monad-control, mtl
-     , resourcet, stm, stm-conduit, streaming-commons, test-framework
-     , test-framework-hunit, test-framework-th, transformers
-     , unliftio-core, vector
-     }:
-     mkDerivation {
-       pname = "conduit-algorithms";
-       version = "0.0.8.0";
-       sha256 = "0i8ikrh3fpwfqli8ksfayc20kml1wacl0rgv8pc00lgrsmd8r9i8";
-       libraryHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra containers deepseq exceptions lzma-conduit
-         monad-control mtl resourcet stm stm-conduit streaming-commons
-         transformers unliftio-core vector
-       ];
-       testHaskellDepends = [
-         async base bytestring bzlib-conduit conduit conduit-combinators
-         conduit-extra containers deepseq directory exceptions HUnit
-         lzma-conduit monad-control mtl resourcet stm stm-conduit
-         streaming-commons test-framework test-framework-hunit
-         test-framework-th transformers unliftio-core vector
-       ];
-       description = "Conduit-based algorithms";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "conduit-algorithms_0_0_8_1" = callPackage
     ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit
      , conduit-combinators, conduit-extra, containers, criterion
      , deepseq, directory, exceptions, HUnit, lzma-conduit
@@ -51657,6 +51523,7 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "continue" = callPackage
@@ -52899,8 +52766,8 @@ self: {
     ({ mkDerivation, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "3.5.0";
-       sha256 = "0x8l31zbgcx4idcvpjsipsc3k610hj6g6rjpxbbpaz7zcb2ykvn1";
+       version = "3.5.1";
+       sha256 = "01kknyznwyxd5cgw9q21wmzykl1yiava0s1y3vrrdxzvixk1f89l";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -54977,6 +54844,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "csv-conduit_0_7_0_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
+     , conduit, conduit-extra, containers, data-default, directory
+     , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl
+     , primitive, resourcet, semigroups, test-framework
+     , test-framework-hunit, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "csv-conduit";
+       version = "0.7.0.0";
+       sha256 = "1rzshr0py23xi1cfgsghnhgy65hyhlxhlnb6qyfzfsqqshmy13s7";
+       libraryHaskellDepends = [
+         array attoparsec base blaze-builder bytestring conduit
+         conduit-extra containers data-default exceptions ghc-prim mmorph
+         monad-control mtl primitive resourcet semigroups text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory HUnit mtl primitive
+         test-framework test-framework-hunit text transformers vector
+       ];
+       description = "A flexible, fast, conduit-based CSV parser library for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "csv-enumerator" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-enumerator, base
      , bytestring, containers, directory, enumerator, safe, transformers
@@ -56906,14 +56800,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-diverse-lens_4_2_0_0" = callPackage
+  "data-diverse-lens_4_2_0_1" = callPackage
     ({ mkDerivation, base, data-diverse, data-has, hspec, lens
      , profunctors, tagged
      }:
      mkDerivation {
        pname = "data-diverse-lens";
-       version = "4.2.0.0";
-       sha256 = "0skjgkv81sjmpggk57ac33f84qv0in04hnwyy23zk9g9cbqz0qwr";
+       version = "4.2.0.1";
+       sha256 = "07nwbvjhwx3qyh2ksk027qgci91nsckgd4yskkbafndpiri1fxds";
        libraryHaskellDepends = [
          base data-diverse data-has lens profunctors tagged
        ];
@@ -59953,8 +59847,8 @@ self: {
      }:
      mkDerivation {
        pname = "dependency";
-       version = "1.1.0.0";
-       sha256 = "1874zvkv5vkx9s6864kmpihq7514hywzb2a1zhqn3f6qf27bnj9c";
+       version = "1.2.0.0";
+       sha256 = "19b7f0j5b34yaf5gk8kasg275sphjs5bsgbn4cfi1fm874h5612m";
        libraryHaskellDepends = [
          ansi-wl-pprint base binary containers deepseq
          micro-recursion-schemes microlens
@@ -61630,13 +61524,19 @@ self: {
      }) {};
 
   "diet" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, contiguous, primitive
+     , QuickCheck, quickcheck-classes, tasty, tasty-quickcheck
+     }:
      mkDerivation {
        pname = "diet";
-       version = "0.0.1";
-       sha256 = "0qkyfmys5k6la10dvi8wsmw120xfarjblpkr33xiazll2m9845wh";
-       libraryHaskellDepends = [ base ];
-       description = "Discrete Interval Encoding Tree";
+       version = "0.1.0.0";
+       sha256 = "17mqgkxjpimr1fipiszabf8djxp0k63gmd3l3dbbsr49cfnnimr2";
+       libraryHaskellDepends = [ base contiguous primitive ];
+       testHaskellDepends = [
+         base containers primitive QuickCheck quickcheck-classes tasty
+         tasty-quickcheck
+       ];
+       description = "Discrete Interval Encoding Trees";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -62871,6 +62771,7 @@ self: {
        ];
        description = "AWS Lambda backend for distributed-fork";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process" = callPackage
@@ -63758,29 +63659,6 @@ self: {
      }) {};
 
   "dns" = callPackage
-    ({ mkDerivation, async, attoparsec, auto-update, base
-     , base64-bytestring, binary, bytestring, containers, cryptonite
-     , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe
-     , time, word8
-     }:
-     mkDerivation {
-       pname = "dns";
-       version = "3.0.3";
-       sha256 = "0m7xgf5vgh3xj5yrv8hyvhx3lligx1xrnq22a9b6s2prbywyllfv";
-       libraryHaskellDepends = [
-         async attoparsec auto-update base base64-bytestring binary
-         bytestring containers cryptonite iproute mtl network psqueues safe
-         time
-       ];
-       testHaskellDepends = [
-         base bytestring doctest hspec iproute network QuickCheck word8
-       ];
-       testTarget = "spec";
-       description = "DNS library in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "dns_3_0_4" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base
      , base64-bytestring, binary, bytestring, containers, cryptonite
      , doctest, hspec, iproute, mtl, network, psqueues, QuickCheck, safe
@@ -63801,7 +63679,6 @@ self: {
        testTarget = "spec";
        description = "DNS library in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dnscache" = callPackage
@@ -66554,6 +66431,7 @@ self: {
        ];
        description = "A monad for rewriting things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edit-distance" = callPackage
@@ -66789,22 +66667,22 @@ self: {
 
   "egison" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
-     , directory, filepath, ghc, ghc-paths, Glob, haskeline, HUnit, mtl
-     , parallel, parsec, process, random, regex-tdfa, test-framework
-     , test-framework-hunit, text, transformers, unordered-containers
-     , vector
+     , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline
+     , HUnit, mtl, parallel, parsec, process, random, regex-tdfa, split
+     , test-framework, test-framework-hunit, text, transformers
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "egison";
-       version = "3.7.10";
-       sha256 = "129g0xw951pkizs4rmbn5mhy1w0lhqw06hj2sr8sf7r2wnqmn0dy";
+       version = "3.7.11";
+       sha256 = "0k7dx9lnr8gj9nzxijcxwiivy5pi62jfld5hcskq9yqfpy5x618f";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         array base containers directory ghc ghc-paths haskeline mtl
-         parallel parsec process random regex-tdfa text transformers
-         unordered-containers vector
+         array base containers directory ghc ghc-paths hashable haskeline
+         mtl parallel parsec process random regex-tdfa split text
+         transformers unordered-containers vector
        ];
        executableHaskellDepends = [
          array base containers directory filepath ghc ghc-paths haskeline
@@ -69345,6 +69223,7 @@ self: {
        ];
        description = "Espial is an open-source, web-based bookmarking server";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "esqueleto" = callPackage
@@ -70120,25 +69999,6 @@ self: {
      }) {};
 
   "eventsource-api" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers
-     , enclosed-exceptions, lifted-async, lifted-base, monad-control
-     , monad-loops, mtl, stm, stm-chans, string-conversions, text
-     , transformers-base, unordered-containers, uuid
-     }:
-     mkDerivation {
-       pname = "eventsource-api";
-       version = "1.3.0";
-       sha256 = "1xv1j0dyvbl319513ycyl8857jy3gh0dcjvwxfxz4ddsw0sld3bx";
-       libraryHaskellDepends = [
-         aeson base bytestring containers enclosed-exceptions lifted-async
-         lifted-base monad-control monad-loops mtl stm stm-chans
-         string-conversions text transformers-base unordered-containers uuid
-       ];
-       description = "Provides an eventsourcing high level API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "eventsource-api_1_3_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , enclosed-exceptions, lifted-async, lifted-base, monad-control
      , monad-loops, mtl, stm, stm-chans, string-conversions, text
@@ -70155,7 +70015,6 @@ self: {
        ];
        description = "Provides an eventsourcing high level API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventsource-geteventstore-store" = callPackage
@@ -70238,41 +70097,6 @@ self: {
      }) {};
 
   "eventstore" = callPackage
-    ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
-     , cereal, clock, connection, containers, dns, dotnet-timespan
-     , ekg-core, exceptions, fast-logger, hashable, http-client
-     , interpolate, lifted-async, lifted-base, machines, monad-control
-     , monad-logger, mono-traversable, mtl, protobuf, random
-     , safe-exceptions, semigroups, stm, stm-chans, tasty, tasty-hspec
-     , tasty-hunit, text, time, transformers-base, unordered-containers
-     , uuid
-     }:
-     mkDerivation {
-       pname = "eventstore";
-       version = "1.1.3";
-       sha256 = "076pxyaslvw4kiqqbhapvqi0nr501l2z8nvajkqw1d9iasgwcfxz";
-       libraryHaskellDepends = [
-         aeson array base bifunctors bytestring cereal clock connection
-         containers dns dotnet-timespan ekg-core exceptions fast-logger
-         hashable http-client interpolate lifted-async lifted-base machines
-         monad-control monad-logger mono-traversable mtl protobuf random
-         safe-exceptions semigroups stm stm-chans text time
-         transformers-base unordered-containers uuid
-       ];
-       testHaskellDepends = [
-         aeson async base bytestring cereal connection containers
-         dotnet-timespan exceptions fast-logger hashable lifted-async
-         lifted-base monad-control mono-traversable protobuf safe-exceptions
-         semigroups stm stm-chans tasty tasty-hspec tasty-hunit text time
-         transformers-base unordered-containers uuid
-       ];
-       description = "EventStore TCP Client";
-       license = stdenv.lib.licenses.bsd3;
-       platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "eventstore_1_1_4" = callPackage
     ({ mkDerivation, aeson, array, async, base, bifunctors, bytestring
      , cereal, clock, connection, containers, dns, dotnet-timespan
      , ekg-core, exceptions, fast-logger, hashable, http-client
@@ -70935,6 +70759,7 @@ self: {
        ];
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -71413,22 +71238,6 @@ self: {
      }) {};
 
   "extra" = callPackage
-    ({ mkDerivation, base, clock, directory, filepath, process
-     , QuickCheck, time, unix
-     }:
-     mkDerivation {
-       pname = "extra";
-       version = "1.6.6";
-       sha256 = "17d0fd2hng1bwgdl8ms7vzjb4zzwk8cljci5wsd5ninxi9m6x6br";
-       libraryHaskellDepends = [
-         base clock directory filepath process time unix
-       ];
-       testHaskellDepends = [ base directory filepath QuickCheck unix ];
-       description = "Extra functions I use";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "extra_1_6_8" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
@@ -71442,7 +71251,6 @@ self: {
        testHaskellDepends = [ base directory filepath QuickCheck unix ];
        description = "Extra functions I use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extract-dependencies" = callPackage
@@ -72167,6 +71975,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) openssl;};
 
+  "fastsum" = callPackage
+    ({ mkDerivation, base, ghc-prim, hashable, template-haskell }:
+     mkDerivation {
+       pname = "fastsum";
+       version = "0.1.0.0";
+       sha256 = "19an2yx0x10mj1lxwh3sqj5zs8fcwbw1zj530sxs64127l2dby57";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base ghc-prim hashable template-haskell
+       ];
+       description = "A fast open-union type suitable for 100+ contained alternatives";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fathead-util" = callPackage
     ({ mkDerivation, base, bytestring, cassava, hxt, network-uri, text
      }:
@@ -77145,21 +76968,24 @@ self: {
      }) {};
 
   "freq" = callPackage
-    ({ mkDerivation, base, bytestring, containers, gauge, hedgehog
-     , primitive
+    ({ mkDerivation, base, bytestring, containers, deepseq, gauge
+     , hedgehog, primitive
      }:
      mkDerivation {
        pname = "freq";
-       version = "0.1.0.3";
-       sha256 = "0b9ji45n6yhz24x29adyhwmrwp9xyhl2ydm0kk5a9jqv9lddddkp";
+       version = "0.1.0.4";
+       sha256 = "1h5lhsnm89g4g46sqiym2zf855skinirygqllf9grj6vk4qbls9n";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring containers primitive ];
+       libraryHaskellDepends = [
+         base bytestring containers deepseq primitive
+       ];
        executableHaskellDepends = [ base bytestring containers ];
        testHaskellDepends = [ base bytestring containers hedgehog ];
        benchmarkHaskellDepends = [ base bytestring containers gauge ];
        description = "Are you ready to get freaky?";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fresco-binding" = callPackage
@@ -85513,8 +85339,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.3.41";
-       sha256 = "1q3g5yikm0n1q2n98iy1j203fi11hy9cfdm6qgcx2ib3b4b2z613";
+       version = "0.3.44";
+       sha256 = "11khp73xa1vy6w5plk644ksgv47q6j4y3jmxds6iv90mqv47z0al";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92317,43 +92143,6 @@ self: {
      }) {};
 
   "hakyll" = callPackage
-    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
-     , containers, cryptohash, data-default, deepseq, directory
-     , file-embed, filepath, fsnotify, http-conduit, http-types
-     , lrucache, mtl, network-uri, optparse-applicative, pandoc
-     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-tdfa
-     , resourcet, scientific, tagsoup, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, time-locale-compat
-     , unordered-containers, utillinux, vector, wai, wai-app-static
-     , warp, yaml
-     }:
-     mkDerivation {
-       pname = "hakyll";
-       version = "4.12.2.0";
-       sha256 = "1bkr94dakfwq86pm68r61x4g2xmcsliqn8lxgp2jkf8603mjla47";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base binary blaze-html blaze-markup bytestring containers
-         cryptohash data-default deepseq directory file-embed filepath
-         fsnotify http-conduit http-types lrucache mtl network-uri
-         optparse-applicative pandoc pandoc-citeproc parsec process random
-         regex-tdfa resourcet scientific tagsoup text time
-         time-locale-compat unordered-containers vector wai wai-app-static
-         warp yaml
-       ];
-       executableHaskellDepends = [ base directory filepath ];
-       testHaskellDepends = [
-         base bytestring containers filepath QuickCheck tasty tasty-hunit
-         tasty-quickcheck text unordered-containers yaml
-       ];
-       testToolDepends = [ utillinux ];
-       description = "A static website compiler library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) utillinux;};
-
-  "hakyll_4_12_3_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , containers, cryptohash, data-default, deepseq, directory
      , file-embed, filepath, fsnotify, http-conduit, http-types
@@ -92388,7 +92177,6 @@ self: {
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -92795,6 +92583,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hall-symbols" = callPackage
+    ({ mkDerivation, base, doctest, hspec, matrix, matrix-as-xyz
+     , parsec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hall-symbols";
+       version = "0.1.0.2";
+       sha256 = "05jp1l5v9vz4ai9pbz6nwcm3mzxx0k2nsj85ryi2nl9pkhfwa0l4";
+       libraryHaskellDepends = [ base doctest matrix parsec ];
+       testHaskellDepends = [
+         base doctest hspec matrix matrix-as-xyz parsec QuickCheck
+       ];
+       description = "Symmetry operations generater of Hall Symbols";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "halma" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default
      , diagrams-lib, grid, HUnit, QuickCheck, test-framework
@@ -93313,32 +93117,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath
-     , formatting, gitrev, hspec, mtl, optparse-applicative, path
-     , path-io, process, stm, temporary, time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.5.5";
-       sha256 = "1imgfnn58cmfi383zfi0flx8w2430f5kplsy2m27djy5fv6brmpv";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath formatting gitrev mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base formatting gitrev optparse-applicative path
-         path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_6" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -93362,7 +93140,6 @@ self: {
        ];
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -93414,6 +93191,7 @@ self: {
        ];
        description = "\"Haskell Applets\" provides an event handler and a canvas for building simple GUI apps";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happlets-lib-gtk" = callPackage
@@ -93435,6 +93213,7 @@ self: {
        ];
        description = "The \"Haskell Applets\" Gtk+ ver. 2 back-end for \"happlets\".";
        license = "AGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happraise" = callPackage
@@ -94870,19 +94649,6 @@ self: {
      }) {};
 
   "hashtables" = callPackage
-    ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
-     mkDerivation {
-       pname = "hashtables";
-       version = "1.2.3.0";
-       sha256 = "19bkpx43f3b5mya4jkygiafw402hvazawp6qr69h3wqkc6xv8mpr";
-       libraryHaskellDepends = [
-         base ghc-prim hashable primitive vector
-       ];
-       description = "Mutable hash tables in the ST monad";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hashtables_1_2_3_1" = callPackage
     ({ mkDerivation, base, ghc-prim, hashable, primitive, vector }:
      mkDerivation {
        pname = "hashtables";
@@ -94893,7 +94659,6 @@ self: {
        ];
        description = "Mutable hash tables in the ST monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashtables-plus" = callPackage
@@ -95571,34 +95336,6 @@ self: {
      }) {};
 
   "haskell-gi" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
-     , directory, doctest, filepath, glib, gobjectIntrospection
-     , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
-     , text, transformers, xdg-basedir, xml-conduit
-     }:
-     mkDerivation {
-       pname = "haskell-gi";
-       version = "0.21.2";
-       sha256 = "0g32zgj89n1nihldvn756bz0z25h1ip8as2xvp3d10prx92i4qgi";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base bytestring Cabal containers directory filepath
-         haskell-gi-base mtl pretty-show process regex-tdfa safe text
-         transformers xdg-basedir xml-conduit
-       ];
-       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
-       executableHaskellDepends = [
-         base containers directory filepath haskell-gi-base pretty-show text
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "Generate Haskell bindings for GObject Introspection capable libraries";
-       license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) glib; 
-         inherit (pkgs.gnome3) gobjectIntrospection;};
-
-  "haskell-gi_0_21_3" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
      , directory, doctest, filepath, glib, gobjectIntrospection
      , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
@@ -96032,6 +95769,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-overridez" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring
+     , Cabal, exceptions, foldl, managed, neat-interpolation
+     , network-uri, optparse-applicative, system-fileio, system-filepath
+     , text, turtle
+     }:
+     mkDerivation {
+       pname = "haskell-overridez";
+       version = "0.10.0.1";
+       sha256 = "0p50hsnj57hjd2sngcamicjp1yj9h4fk9jyp37ygy1j0yzyhn3a5";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson aeson-casing attoparsec base bytestring Cabal exceptions
+         foldl managed neat-interpolation network-uri optparse-applicative
+         system-fileio system-filepath text turtle
+       ];
+       description = "Manage nix overrides for haskell packages";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell-packages" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, containers
      , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl
@@ -98317,8 +98075,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-optparse-applicative";
-       version = "0.3.0.1";
-       sha256 = "19a31qg4fj74qcjrf6ng11za7zbywg08hnls4pri816fwkjdjs9k";
+       version = "0.3.0.2";
+       sha256 = "1yrqq9lpvrvqvxhrkflyi9fy7nzkga5r4pqn24c939jxi83ncvl1";
        libraryHaskellDepends = [
          base-prelude hasql hasql-pool optparse-applicative
        ];
@@ -98347,8 +98105,8 @@ self: {
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
        pname = "hasql-pool";
-       version = "0.4.3";
-       sha256 = "08fzh0y1cxaslp8ia26p9jhs3dckjfdvmiqw1lasdabb7ij82i0j";
+       version = "0.4.3.1";
+       sha256 = "1hjlfxlakzqjghm25a29y7rhfk2m9bhsjfkbqfk9z1221qybwg6s";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
@@ -98456,8 +98214,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-transaction";
-       version = "0.6";
-       sha256 = "00dxm78wscj88zb6wbyg48ps4a5cc41jbbknjrmxlgp0iw4hr06b";
+       version = "0.6.0.1";
+       sha256 = "0fw207hnpqg1r7ypwfqj5jpi91dx73q1syr1jisrhf78j3yw8rni";
        libraryHaskellDepends = [
          base base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras hasql mtl transformers
@@ -100315,30 +100073,6 @@ self: {
      }) {};
 
   "hedis" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
-     , resource-pool, scanner, slave-thread, stm, test-framework
-     , test-framework-hunit, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.10.1";
-       sha256 = "1xzma70f1p6zfihwpsnc23bdzw09yg50pig7knkj6bxkv19czbsn";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing deepseq errors HTTP mtl
-         network network-uri resource-pool scanner stm text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring doctest HUnit mtl slave-thread stm
-         test-framework test-framework-hunit text time
-       ];
-       benchmarkHaskellDepends = [ base mtl time ];
-       description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedis_0_10_2" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
      , resource-pool, scanner, slave-thread, stm, test-framework
@@ -100361,7 +100095,6 @@ self: {
        benchmarkHaskellDepends = [ base mtl time ];
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -102439,6 +102172,7 @@ self: {
        ];
        description = "Examples to accompany the book \"Haskell in Depth\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hidapi" = callPackage
@@ -103925,6 +103659,8 @@ self: {
        pname = "hledger";
        version = "1.9.1";
        sha256 = "13arzk1l2hxmi8baa68kvl2sha0na34h0dl6isbfpvgnp7w1c0b3";
+       revision = "1";
+       editedCabalFile = "0qmvkw2zbcpjmkf71janpdpdha45yi29f9kv54rxqbckkh1ziych";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104096,6 +103832,8 @@ self: {
        pname = "hledger-lib";
        version = "1.9.1";
        sha256 = "0yxgx4bpqn8vchrfp07d1fqmsscj8w5g63nqd2n49r29d6i5q5az";
+       revision = "1";
+       editedCabalFile = "1j7yhnjkiw2vm63d6va18kknjxkywb2j0h525ys4z3y6840i8b8k";
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory extra
@@ -104126,6 +103864,8 @@ self: {
        pname = "hledger-ui";
        version = "1.9.1";
        sha256 = "18ar9lja583rg06q9dbnrpify6hj99444fjw2z54lr54587151v0";
+       revision = "1";
+       editedCabalFile = "0dy5vrm969cqp4mz31524z8w1m3lznrr17kgn204rgq91j7zzwx2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -104170,6 +103910,8 @@ self: {
        pname = "hledger-web";
        version = "1.9.2";
        sha256 = "0b533vs5vrk4wpwgf23l7rvijq4qpi6w5nql2hsjwl3xk2ihfpv3";
+       revision = "1";
+       editedCabalFile = "1njgbfl71iif3f7z3kkyqgab98md93a56mpl6laq0kw4azgdsajy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106404,8 +106146,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-docs";
-       version = "0.4.0";
-       sha256 = "186pb32mqwvb5n1a9v2p0cs3g01lrdw5j3p3ddjqdkss7mq6sacz";
+       version = "0.5.0";
+       sha256 = "08i15jbn7k21qfmmi1f8151bakqivbk440gi44jjnndhkdj8lwwa";
        libraryHaskellDepends = [
          base haskell-src hoppy-generator hoppy-runtime
        ];
@@ -106420,8 +106162,8 @@ self: {
      }:
      mkDerivation {
        pname = "hoppy-generator";
-       version = "0.4.0";
-       sha256 = "0dk5xhxiw697pb1df544yixsfhiivpp8irllvvjbij7hfbivi409";
+       version = "0.5.0";
+       sha256 = "0cv1idp7i8zqhhrf107xkscghq9j111mfcpxvrshdibsycizlwp0";
        libraryHaskellDepends = [
          base containers directory filepath haskell-src mtl
        ];
@@ -106434,8 +106176,8 @@ self: {
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
        pname = "hoppy-runtime";
-       version = "0.4.0";
-       sha256 = "0vi1i2wa64gdxsc3705vpmimkajf3dz6dakxils1alyxp5ih8f4z";
+       version = "0.5.0";
+       sha256 = "089dqnnczknir9q9mwdh5z9jzb5wsw4bmqqi8spibxk8lna4cvqs";
        libraryHaskellDepends = [
          base Cabal containers directory filepath
        ];
@@ -106448,8 +106190,8 @@ self: {
     ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }:
      mkDerivation {
        pname = "hoppy-std";
-       version = "0.4.0";
-       sha256 = "0kb9myfnradifyihigjw08navl5fwcfqznqrp9xjmkwkp8k2h0p5";
+       version = "0.5.0";
+       sha256 = "1x4a4z434nhkgd5nndwrj3y9zm3pf4mln1mccsclf8kkyaj4hyqd";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base filepath haskell-src hoppy-generator
@@ -107380,6 +107122,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
+  "hpqtypes_1_5_3_0" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, containers
+     , data-default-class, directory, exceptions, filepath, HUnit
+     , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
+     , resource-pool, scientific, semigroups, test-framework
+     , test-framework-hunit, text, text-show, time, transformers
+     , transformers-base, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hpqtypes";
+       version = "1.5.3.0";
+       sha256 = "1igzja5vy3pfvn2xi4bfbrbnxggxwav16cw2kfjrzkp2xrxq09gz";
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         aeson async base bytestring containers data-default-class
+         exceptions lifted-base monad-control mtl resource-pool semigroups
+         text text-show time transformers transformers-base vector
+       ];
+       librarySystemDepends = [ postgresql ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions HUnit lifted-base monad-control
+         mtl QuickCheck random scientific test-framework
+         test-framework-hunit text text-show time transformers-base
+         unordered-containers vector
+       ];
+       description = "Haskell bindings to libpqtypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) postgresql;};
+
   "hpqtypes-extras" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, containers
      , cryptohash, data-default, exceptions, fields-json, hpqtypes
@@ -107736,6 +107508,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "hs-bibutils_6_4_0_0" = callPackage
+    ({ mkDerivation, base, syb }:
+     mkDerivation {
+       pname = "hs-bibutils";
+       version = "6.4.0.0";
+       sha256 = "1kravnc0cn0r7bnm3fmcd6d1l4z1ax41wcm32jrp5rafq15lyg9f";
+       libraryHaskellDepends = [ base syb ];
+       description = "Haskell bindings to bibutils, the bibliography conversion utilities";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hs-blake2" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
      , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck
@@ -109667,19 +109451,19 @@ self: {
      }) {};
 
   "hsini" = callPackage
-    ({ mkDerivation, base, bytestring, containers, HUnit, mtl, parsec
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, tasty-th
+    ({ mkDerivation, base, bytestring, containers, mtl, parsec, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th
      }:
      mkDerivation {
        pname = "hsini";
-       version = "0.5.1.1";
-       sha256 = "0yfmra5z9fjms5ighlmi6zd092c4kpwnmsrcp2p8gqwdz7k1in51";
+       version = "0.5.1.2";
+       sha256 = "1r6qksnrmk18ndxs5zaga8b7kvmk34kp0kh5hwqmq797qrlax9pa";
        libraryHaskellDepends = [ base bytestring containers mtl parsec ];
        testHaskellDepends = [
-         base bytestring containers HUnit mtl parsec QuickCheck tasty
-         tasty-hunit tasty-quickcheck tasty-th
+         base bytestring containers mtl parsec tasty tasty-hunit
+         tasty-quickcheck tasty-th
        ];
-       description = "Package for user configuration files (INI)";
+       description = "ini configuration files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -111717,19 +111501,6 @@ self: {
      }) {};
 
   "hsx-jmacro" = callPackage
-    ({ mkDerivation, base, hsp, jmacro, mtl, text, wl-pprint-text }:
-     mkDerivation {
-       pname = "hsx-jmacro";
-       version = "7.3.8";
-       sha256 = "15a427bkyn36rdkkvw74ck5dzgbsxnwhy23yd6fibidcz2iyziwp";
-       libraryHaskellDepends = [
-         base hsp jmacro mtl text wl-pprint-text
-       ];
-       description = "hsp+jmacro support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsx-jmacro_7_3_8_1" = callPackage
     ({ mkDerivation, base, hsp, jmacro, mtl, text, wl-pprint-text }:
      mkDerivation {
        pname = "hsx-jmacro";
@@ -111740,7 +111511,6 @@ self: {
        ];
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -113810,6 +113580,7 @@ self: {
        benchmarkSystemDepends = [ hunspell ];
        description = "Hunspell thread-safe FFI bindings for spell checking";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) hunspell;};
 
   "hunt-searchengine" = callPackage
@@ -114105,6 +113876,7 @@ self: {
        ];
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-bits" = callPackage
@@ -114191,6 +113963,7 @@ self: {
          hw-prim hw-rankselect hw-rankselect-base mmap vector weigh
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-eliasfano" = callPackage
@@ -114227,6 +114000,7 @@ self: {
        ];
        description = "Excess";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-fingertree" = callPackage
@@ -114248,26 +114022,6 @@ self: {
      }) {};
 
   "hw-fingertree-strict" = callPackage
-    ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
-     , hw-hspec-hedgehog, QuickCheck, test-framework
-     , test-framework-hunit, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "hw-fingertree-strict";
-       version = "0.1.0.3";
-       sha256 = "03njx1g23f8s8a9dcyanpfm8pzgcbyds4zwkmp7g8mshk1rljfcm";
-       revision = "1";
-       editedCabalFile = "027ds9pl198478hyimfqaff52r8qhwgmhzazck847z2i5igp30i2";
-       libraryHaskellDepends = [ base deepseq ];
-       testHaskellDepends = [
-         base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       description = "Generic strict finger-tree structure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-fingertree-strict_0_1_1_1" = callPackage
     ({ mkDerivation, base, deepseq, hedgehog, hspec, HUnit
      , hw-hspec-hedgehog, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2
@@ -114283,7 +114037,6 @@ self: {
        ];
        description = "Generic strict finger-tree structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-hedgehog" = callPackage
@@ -114299,20 +114052,6 @@ self: {
      }) {};
 
   "hw-hspec-hedgehog" = callPackage
-    ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }:
-     mkDerivation {
-       pname = "hw-hspec-hedgehog";
-       version = "0.1.0.4";
-       sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq";
-       revision = "1";
-       editedCabalFile = "12bh7ms7kjmpk43fwmnbbaflsl41icjck3bn8pcjybp7f7j0mrk5";
-       libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
-       testHaskellDepends = [ base hedgehog hspec ];
-       description = "Interoperability between hspec and hedgehog";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-hspec-hedgehog_0_1_0_5" = callPackage
     ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit
      , transformers
      }:
@@ -114326,7 +114065,6 @@ self: {
        testHaskellDepends = [ base hedgehog hspec ];
        description = "Interoperability between hspec and hedgehog";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-int" = callPackage
@@ -114645,6 +114383,7 @@ self: {
        ];
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect_0_12_0_2" = callPackage
@@ -114701,6 +114440,7 @@ self: {
        ];
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect-base_0_3_2_0" = callPackage
@@ -114755,6 +114495,7 @@ self: {
        ];
        description = "Succint datastructures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-vector" = callPackage
@@ -115851,6 +115592,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Text hyphenation algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyphenation" = callPackage
@@ -129313,6 +129055,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lexer-applicative_2_1_0_2" = callPackage
+    ({ mkDerivation, base, deepseq, regex-applicative, srcloc, tasty
+     , tasty-hunit
+     }:
+     mkDerivation {
+       pname = "lexer-applicative";
+       version = "2.1.0.2";
+       sha256 = "1gjwxc9d2al8az89mrxkvh8fmmdk78685dgdxi4fil2r587kqhxf";
+       libraryHaskellDepends = [ base regex-applicative srcloc ];
+       testHaskellDepends = [
+         base deepseq regex-applicative srcloc tasty tasty-hunit
+       ];
+       description = "Simple lexer based on applicative regular expressions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lfst" = callPackage
     ({ mkDerivation, base, containers, doctest, lattices, QuickCheck }:
      mkDerivation {
@@ -136856,6 +136615,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "matrix-as-xyz" = callPackage
+    ({ mkDerivation, base, doctest, hspec, matrix, parsec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "matrix-as-xyz";
+       version = "0.1.1.0";
+       sha256 = "0ckirpbflr69a51k21nfak74d5r4jxra2sl4ys2gyicjm77b5a3s";
+       libraryHaskellDepends = [ base hspec matrix parsec QuickCheck ];
+       testHaskellDepends = [
+         base doctest hspec matrix parsec QuickCheck
+       ];
+       description = "Read and Display representation of matrix like \"x,y,z\"";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "matrix-market" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -138234,6 +138008,7 @@ self: {
          validity-time
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "merkle-patricia-db" = callPackage
@@ -139289,29 +139064,6 @@ self: {
      }) {};
 
   "milena" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, digest, lens
-     , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck
-     , random, resource-pool, semigroups, tasty, tasty-hspec
-     , tasty-quickcheck, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "milena";
-       version = "0.5.2.1";
-       sha256 = "1mylkqp8vha9gq7li5cir5h3i27zb573alxgxnvr1y938z2nimf2";
-       libraryHaskellDepends = [
-         base bytestring cereal containers digest lens lifted-base
-         monad-control mtl murmur-hash network random resource-pool
-         semigroups transformers zlib
-       ];
-       testHaskellDepends = [
-         base bytestring lens mtl network QuickCheck semigroups tasty
-         tasty-hspec tasty-quickcheck
-       ];
-       description = "A Kafka client for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "milena_0_5_2_2" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, digest, lens
      , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck
      , random, resource-pool, semigroups, tasty, tasty-hspec
@@ -139332,7 +139084,6 @@ self: {
        ];
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime" = callPackage
@@ -139570,39 +139321,6 @@ self: {
      }) {};
 
   "minio-hs" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
-     , case-insensitive, conduit, conduit-extra, containers, cryptonite
-     , cryptonite-conduit, data-default, directory, exceptions, filepath
-     , http-client, http-conduit, http-types, memory, protolude
-     , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck, temporary, text, text-format, time
-     , transformers, unliftio, unliftio-core, xml-conduit
-     }:
-     mkDerivation {
-       pname = "minio-hs";
-       version = "1.0.0";
-       sha256 = "0q6qzzkkbm9b0a7c630yj2rlg54imir1yjbpsy4x9fh3kc7vx0i2";
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring case-insensitive conduit
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         exceptions filepath http-client http-conduit http-types memory
-         protolude resourcet text text-format time transformers unliftio
-         unliftio-core xml-conduit
-       ];
-       testHaskellDepends = [
-         aeson base base64-bytestring bytestring case-insensitive conduit
-         conduit-extra containers cryptonite cryptonite-conduit data-default
-         directory exceptions filepath http-client http-conduit http-types
-         memory protolude QuickCheck resourcet tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck temporary text text-format time
-         transformers unliftio unliftio-core xml-conduit
-       ];
-       description = "A Minio Haskell Library for Amazon S3 compatible cloud storage";
-       license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "minio-hs_1_0_1" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring
      , case-insensitive, conduit, conduit-extra, containers, cryptonite
      , cryptonite-conduit, data-default, directory, filepath
@@ -143815,20 +143533,6 @@ self: {
      }) {};
 
   "multiset" = callPackage
-    ({ mkDerivation, base, containers, doctest, Glob }:
-     mkDerivation {
-       pname = "multiset";
-       version = "0.3.3";
-       sha256 = "0dg1dlvsyjam5z284p2pzfdzhk88z9bw57v290xzx0dyvg9pfkn7";
-       revision = "2";
-       editedCabalFile = "1pwb1prra12yrm3qdjp8h7343cilbkck85blhaflzsmn1sbcyq2w";
-       libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base doctest Glob ];
-       description = "The Data.MultiSet container type";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "multiset_0_3_4" = callPackage
     ({ mkDerivation, base, containers, deepseq, doctest, Glob }:
      mkDerivation {
        pname = "multiset";
@@ -143838,7 +143542,6 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "The Data.MultiSet container type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiset-comb" = callPackage
@@ -145331,17 +145034,6 @@ self: {
      }) {};
 
   "names-th" = callPackage
-    ({ mkDerivation, base, containers, template-haskell }:
-     mkDerivation {
-       pname = "names-th";
-       version = "0.2.0.3";
-       sha256 = "1ijy7wkmw8y5lv7f1p975jlp17r3yfv5v05csiqrs1zykcpjpghf";
-       libraryHaskellDepends = [ base containers template-haskell ];
-       description = "Manipulate name strings for TH";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "names-th_0_2_0_4" = callPackage
     ({ mkDerivation, base, containers, template-haskell }:
      mkDerivation {
        pname = "names-th";
@@ -145350,7 +145042,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Manipulate name strings for TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "namespace" = callPackage
@@ -150102,24 +149793,24 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , file-embed, filepath, formatting, hspec, hspec-golden-aeson, mtl
      , process, QuickCheck, quickcheck-arbitrary-adt, servant
-     , servant-server, split, template-haskell, text, time
-     , typelits-witnesses, wai, wai-extra, warp, wl-pprint-text
+     , servant-server, singletons, split, template-haskell, text, time
+     , wai, wai-extra, warp, wl-pprint-text
      }:
      mkDerivation {
        pname = "ocaml-export";
-       version = "0.7.0.0";
-       sha256 = "10cvzzqnv7za9albnma112cx0pr4ranjqg3r38k5x6jmj4n5s4bp";
+       version = "0.9.0.0";
+       sha256 = "1wqgvaf8198p1avq3vlmi256a6wk5w76m4hvlhvmdv0kzad3iw25";
        libraryHaskellDepends = [
          aeson base bytestring containers directory file-embed filepath
          formatting hspec hspec-golden-aeson mtl QuickCheck
-         quickcheck-arbitrary-adt servant servant-server split
-         template-haskell text time typelits-witnesses wl-pprint-text
+         quickcheck-arbitrary-adt servant servant-server singletons split
+         template-haskell text time wl-pprint-text
        ];
        testHaskellDepends = [
          aeson base bytestring containers directory filepath hspec
          hspec-golden-aeson process QuickCheck quickcheck-arbitrary-adt
-         servant servant-server template-haskell text time
-         typelits-witnesses wai wai-extra warp
+         servant servant-server singletons template-haskell text time wai
+         wai-extra warp
        ];
        description = "Convert Haskell types in OCaml types";
        license = stdenv.lib.licenses.bsd3;
@@ -156595,6 +156286,7 @@ self: {
        ];
        description = "analysis example using perf";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "perfect-hash-generator" = callPackage
@@ -160339,6 +160031,7 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plural" = callPackage
@@ -161888,32 +161581,6 @@ self: {
      }) {};
 
   "postgresql-simple" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , cryptohash, filepath, hashable, HUnit, postgresql-libpq
-     , scientific, tasty, tasty-golden, tasty-hunit, template-haskell
-     , text, time, transformers, uuid-types, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-simple";
-       version = "0.5.3.0";
-       sha256 = "0h8f4d09f25p0dlz2mxvgp5b5pr56hnhng3yhb69pmv0dmj7n38y";
-       revision = "1";
-       editedCabalFile = "1hvry7nhk629yas6nbm3wnyy0bgwh6r8511rmsq9r8xkl7qm76r2";
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring bytestring-builder
-         case-insensitive containers hashable postgresql-libpq scientific
-         template-haskell text time transformers uuid-types vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring containers cryptohash
-         filepath HUnit tasty tasty-golden tasty-hunit text time vector
-       ];
-       description = "Mid-Level PostgreSQL client library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-simple_0_5_4_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, bytestring-builder, case-insensitive, containers
      , cryptohash, filepath, hashable, HUnit, postgresql-libpq
@@ -161935,7 +161602,6 @@ self: {
        ];
        description = "Mid-Level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-bind" = callPackage
@@ -161960,29 +161626,6 @@ self: {
      }) {};
 
   "postgresql-simple-migration" = callPackage
-    ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
-     , directory, hspec, postgresql-simple, text, time
-     }:
-     mkDerivation {
-       pname = "postgresql-simple-migration";
-       version = "0.1.11.0";
-       sha256 = "17kmmilvzpllk5nr7xngkym2gavkv32z5i1b7vc290g89c58a3y0";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple time
-       ];
-       executableHaskellDepends = [
-         base base64-bytestring bytestring cryptohash directory
-         postgresql-simple text time
-       ];
-       testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       description = "PostgreSQL Schema Migrations";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "postgresql-simple-migration_0_1_12_0" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
      , directory, hspec, postgresql-simple, text, time
      }:
@@ -162003,7 +161646,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-opts" = callPackage
@@ -163760,6 +163402,7 @@ self: {
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primula-board" = callPackage
@@ -164607,20 +164250,21 @@ self: {
      , criterion, cryptohash-sha256, data-interval, deepseq
      , deepseq-generics, directory, distributed-process
      , distributed-process-async, distributed-process-client-server
-     , distributed-process-extras, either, extended-reals, filepath, ghc
-     , ghc-boot, ghc-paths, Glob, gnuplot, hashable, hashable-time
-     , haskeline, http-api-data, http-types, HUnit, list-t, megaparsec
-     , monad-parallel, MonadRandom, mtl, network, network-transport
-     , network-transport-tcp, old-locale, optparse-applicative, parallel
-     , path-pieces, random, random-shuffle, resourcet, scotty
-     , semigroups, stm, stm-containers, template-haskell, temporary
-     , text, time, transformers, unix, unordered-containers, uuid
-     , vector, vector-binary-instances, websockets, zlib
+     , distributed-process-extras, either, exceptions, extended-reals
+     , filepath, ghc, ghc-boot, ghc-paths, ghci, Glob, gnuplot, hashable
+     , hashable-time, haskeline, http-api-data, http-types, HUnit
+     , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network
+     , network-transport, network-transport-tcp, old-locale
+     , optparse-applicative, parallel, path-pieces, QuickCheck, random
+     , random-shuffle, resourcet, rset, scotty, semigroups, stm
+     , stm-containers, template-haskell, temporary, text, time
+     , transformers, unix, unordered-containers, uuid, vector
+     , vector-binary-instances, websockets, zlib
      }:
      mkDerivation {
        pname = "project-m36";
-       version = "0.3";
-       sha256 = "0l72wafjy12vymsvfjy5xh0gfkswdyzr12hmn1qffham9s280014";
+       version = "0.4";
+       sha256 = "0lp0vrvvplyav0dp418kx12y4qrf7y7xp3vxwsv5jjb3sc7aqyq9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164628,13 +164272,13 @@ self: {
          conduit containers cryptohash-sha256 data-interval deepseq
          deepseq-generics directory distributed-process
          distributed-process-async distributed-process-client-server
-         distributed-process-extras either extended-reals filepath ghc
-         ghc-boot ghc-paths Glob gnuplot hashable hashable-time haskeline
-         http-api-data list-t monad-parallel MonadRandom mtl
-         network-transport network-transport-tcp old-locale
-         optparse-applicative parallel path-pieces random-shuffle resourcet
-         stm stm-containers temporary text time transformers unix
-         unordered-containers uuid vector vector-binary-instances zlib
+         distributed-process-extras either exceptions extended-reals
+         filepath ghc ghc-boot ghc-paths ghci Glob gnuplot hashable
+         hashable-time haskeline http-api-data list-t monad-parallel
+         MonadRandom mtl network-transport network-transport-tcp old-locale
+         optparse-applicative parallel path-pieces QuickCheck random-shuffle
+         resourcet rset stm stm-containers temporary text time transformers
+         unix unordered-containers uuid vector vector-binary-instances zlib
        ];
        executableHaskellDepends = [
          aeson attoparsec base base64-bytestring binary blaze-html
@@ -164662,7 +164306,8 @@ self: {
          containers criterion data-interval deepseq deepseq-generics
          directory filepath gnuplot hashable hashable-time haskeline HUnit
          megaparsec mtl parallel stm stm-containers temporary text time
-         unordered-containers uuid vector vector-binary-instances
+         transformers unordered-containers uuid vector
+         vector-binary-instances
        ];
        description = "Relational Algebra Engine";
        license = stdenv.lib.licenses.publicDomain;
@@ -164793,8 +164438,8 @@ self: {
      }:
      mkDerivation {
        pname = "prologue";
-       version = "3.2.2";
-       sha256 = "1sswdhbfgh2pnhyixj03khp5ylsxkyisghyg0mqgb039kq1lxxci";
+       version = "3.2.3";
+       sha256 = "1a69283vmxr3ksak6b8hb8ys52gi5r7f1d59l32xfq1ilaswxxwm";
        libraryHaskellDepends = [
          base bifunctors binary comonad cond container convert data-default
          deepseq deriving-compat either errors exceptions functor-utils
@@ -165242,27 +164887,6 @@ self: {
      }) {};
 
   "protobuf" = callPackage
-    ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
-     , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
-     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "protobuf";
-       version = "0.2.1.1";
-       sha256 = "0b3jbr6s8m21q4yiikvjv74j9w744frhrpsd1d6203b7bc49lrfd";
-       libraryHaskellDepends = [
-         base base-orphans bytestring cereal data-binary-ieee754 deepseq mtl
-         text unordered-containers
-       ];
-       testHaskellDepends = [
-         base bytestring cereal containers hex HUnit mtl QuickCheck tagged
-         tasty tasty-hunit tasty-quickcheck text unordered-containers
-       ];
-       description = "Google Protocol Buffers via GHC.Generics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protobuf_0_2_1_2" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cereal, containers
      , data-binary-ieee754, deepseq, hex, HUnit, mtl, QuickCheck, tagged
      , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
@@ -165281,7 +164905,6 @@ self: {
        ];
        description = "Google Protocol Buffers via GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protobuf-native" = callPackage
@@ -165334,22 +164957,6 @@ self: {
      }) {};
 
   "protocol-buffers" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, filepath, mtl, parsec, syb, utf8-string
-     }:
-     mkDerivation {
-       pname = "protocol-buffers";
-       version = "2.4.9";
-       sha256 = "0d6j5k8mfxnixx9n6v7vwncy49cx9sxkhjgh1g7sbs1q15rxkn6m";
-       libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath mtl
-         parsec syb utf8-string
-       ];
-       description = "Parse Google Protocol Buffer specifications";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers_2_4_10" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, filepath, mtl, parsec, syb, utf8-string
      }:
@@ -165363,24 +164970,9 @@ self: {
        ];
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor" = callPackage
-    ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
-     mkDerivation {
-       pname = "protocol-buffers-descriptor";
-       version = "2.4.9";
-       sha256 = "0641cwi7lb53w4mi1icbgz0yghz4lwdf16y9pi0f188hp31f3b2j";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base bytestring containers protocol-buffers
-       ];
-       description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "protocol-buffers-descriptor_2_4_10" = callPackage
     ({ mkDerivation, base, bytestring, containers, protocol-buffers }:
      mkDerivation {
        pname = "protocol-buffers-descriptor";
@@ -165392,7 +164984,6 @@ self: {
        ];
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-descriptor-fork" = callPackage
@@ -167108,8 +166699,8 @@ self: {
      }:
      mkDerivation {
        pname = "qtah-cpp-qt5";
-       version = "0.4.0";
-       sha256 = "03m45jc5jpkjfcx0dr1lb2nsajbhkfb5phsx7v909hj8d7j7swvz";
+       version = "0.5.0";
+       sha256 = "14349jf69wvbcp18xi5jb0281qhrz38pw68qw91hwfr8vmqdx8h7";
        setupHaskellDepends = [ base Cabal directory filepath process ];
        libraryHaskellDepends = [ base process qtah-generator ];
        librarySystemDepends = [ qtbase ];
@@ -167124,8 +166715,8 @@ self: {
      }:
      mkDerivation {
        pname = "qtah-examples";
-       version = "0.4.0";
-       sha256 = "0q8k2diyrxpvsnhlw484lxy3j6qbk07hkqj0hg2cxv8whhi02bp9";
+       version = "0.5.0";
+       sha256 = "087sspnaw39zcymkm0xzyzdbc4g96zlpa45b2i6mfshxi4g38af5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -167143,8 +166734,8 @@ self: {
      }:
      mkDerivation {
        pname = "qtah-generator";
-       version = "0.4.0";
-       sha256 = "1fxv8g3rrhf9q7g90phqji4q5yb2l0sfi0qm81zp9ya91wmcfsg5";
+       version = "0.5.0";
+       sha256 = "0kbc3dpmkxxi2ms6a7dga02g19vq9fm0hz53y9x6iyfpnlpk1sy7";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -167161,25 +166752,23 @@ self: {
 
   "qtah-qt5" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, directory
-     , filepath, hoppy-runtime, HUnit, qtah, qtah-cpp-qt5
-     , qtah-generator, qtbase
+     , filepath, hoppy-runtime, HUnit, qtah-cpp-qt5, qtah-generator
+     , qtbase
      }:
      mkDerivation {
        pname = "qtah-qt5";
-       version = "0.4.0";
-       sha256 = "1b20wrbyldxx6vsxax3kdfxikv0v79m3qcbwhjwgyp586gk9pl63";
+       version = "0.5.0";
+       sha256 = "0c4z56siw1kkqiyzmbpjk6jkzmcxqv6ji52rnivlavlyw3b4s2a3";
        setupHaskellDepends = [ base Cabal directory filepath ];
        libraryHaskellDepends = [
          base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator
        ];
-       librarySystemDepends = [ qtah ];
        libraryToolDepends = [ qtbase ];
        testHaskellDepends = [ base hoppy-runtime HUnit ];
-       testSystemDepends = [ qtah ];
        description = "Qt bindings for Haskell";
        license = stdenv.lib.licenses.lgpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {qtah = null; inherit (pkgs.qt5) qtbase;};
+     }) {inherit (pkgs.qt5) qtbase;};
 
   "quack" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, http-types, mtl, text }:
@@ -167852,6 +167441,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quickcheck-simple_0_1_0_4" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "quickcheck-simple";
+       version = "0.1.0.4";
+       sha256 = "0524xkhx2qa6wfl7wf9qdjscr2djl0l08a1bk6ikigcpdabbb3l0";
+       libraryHaskellDepends = [ base QuickCheck ];
+       description = "Test properties and default-mains for QuickCheck";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "quickcheck-special" = callPackage
     ({ mkDerivation, base, QuickCheck, special-values }:
      mkDerivation {
@@ -169218,23 +168819,6 @@ self: {
      }) {};
 
   "range-set-list" = callPackage
-    ({ mkDerivation, base, containers, deepseq, hashable, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "range-set-list";
-       version = "0.1.2.1";
-       sha256 = "06f8z9rmk2phmds9wv95y2xvjhfx8dr9jbqlv4ybv8m21283x0kw";
-       libraryHaskellDepends = [ base containers deepseq hashable ];
-       testHaskellDepends = [
-         base containers deepseq hashable tasty tasty-quickcheck
-       ];
-       description = "Memory efficient sets with ranges of elements";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "range-set-list_0_1_3" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, tasty
      , tasty-quickcheck
      }:
@@ -172711,6 +172295,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "relational-query-HDBC_0_6_7_0" = callPackage
+    ({ mkDerivation, base, containers, convertible, dlist, HDBC
+     , HDBC-session, names-th, persistable-record, product-isomorphic
+     , relational-query, relational-schemas, sql-words, template-haskell
+     , th-data-compat, transformers
+     }:
+     mkDerivation {
+       pname = "relational-query-HDBC";
+       version = "0.6.7.0";
+       sha256 = "1g10z6076lrlal3ismvz4q4pxpawy749zwxpyvvfdhld2qqhg74c";
+       libraryHaskellDepends = [
+         base containers convertible dlist HDBC HDBC-session names-th
+         persistable-record product-isomorphic relational-query
+         relational-schemas sql-words template-haskell th-data-compat
+         transformers
+       ];
+       description = "HDBC instance of relational-query and typed query interface for HDBC";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "relational-record" = callPackage
     ({ mkDerivation, base, persistable-record
      , persistable-types-HDBC-pg, product-isomorphic, relational-query
@@ -173759,6 +173364,7 @@ self: {
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rerebase" = callPackage
@@ -176889,6 +176495,17 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "safe-foldable" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "safe-foldable";
+       version = "0.1.0.0";
+       sha256 = "1l87j0liv0hgdv3f3d4s4962df5q5xcyhmnfz2fj773r1v62wzya";
+       libraryHaskellDepends = [ base ];
+       description = "Safe wrappers for null-partial Foldable operations";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "safe-freeze" = callPackage
     ({ mkDerivation, base, indexed, mtl, vector }:
      mkDerivation {
@@ -182225,6 +181842,7 @@ self: {
        ];
        description = "Client instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-streaming-docs" = callPackage
@@ -183485,22 +183103,49 @@ self: {
 
   "shake-ats" = callPackage
     ({ mkDerivation, base, binary, dependency, directory, hashable
-     , hs2ats, language-ats, microlens, microlens-th, shake, shake-ext
-     , text
+     , hs2ats, language-ats, microlens, microlens-th, shake, shake-cabal
+     , shake-ext, text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.8.0.5";
-       sha256 = "0hznrllvlw3ypd3ljlx6wlr3d7hkm8g2mrwpfscgvf4hk0lyj1hd";
+       version = "1.8.0.6";
+       sha256 = "00887a8dh26w2qj5w0scivrz3qjybbkflf4s135lmrz6s5pb7l6f";
        libraryHaskellDepends = [
          base binary dependency directory hashable hs2ats language-ats
-         microlens microlens-th shake shake-ext text
+         microlens microlens-th shake shake-cabal shake-ext text
        ];
        description = "Utilities for building ATS projects with shake";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shake-c" = callPackage
+    ({ mkDerivation, base, cdeps, shake }:
+     mkDerivation {
+       pname = "shake-c";
+       version = "0.1.0.0";
+       sha256 = "0g6lavs5y62g5dpy1pfpm2bks43kf6i4m1gb9hdrkrz1iysgl209";
+       libraryHaskellDepends = [ base cdeps shake ];
+       description = "Library for building C code with shake";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shake-cabal" = callPackage
+    ({ mkDerivation, base, Cabal, composition-prelude, directory, shake
+     }:
+     mkDerivation {
+       pname = "shake-cabal";
+       version = "0.1.0.0";
+       sha256 = "1zxxfjfklwnarzvdyq9n221n5aygq253xcr3hly54mrvalq337bb";
+       revision = "2";
+       editedCabalFile = "02hzlwp75i2vmvk8inaasnpgpy89a00xbawp6p4p5fg07czx3fap";
+       libraryHaskellDepends = [
+         base Cabal composition-prelude directory shake
+       ];
+       description = "Shake library for use with cabal";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shake-cabal-build" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process }:
      mkDerivation {
@@ -183517,17 +183162,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shake-ccjs" = callPackage
+    ({ mkDerivation, base, directory, shake }:
+     mkDerivation {
+       pname = "shake-ccjs";
+       version = "0.1.0.0";
+       sha256 = "1n52fjay6xgx65ihin6zxx05q42mfkdqi9888hn8dnn70kf5j7cg";
+       libraryHaskellDepends = [ base directory shake ];
+       description = "Shake rules for CCJS";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "shake-elm" = callPackage
+    ({ mkDerivation, base, shake }:
+     mkDerivation {
+       pname = "shake-elm";
+       version = "0.1.0.0";
+       sha256 = "1pd2ga35kjcx5zfkvmdwr4rjlcm5b5r8h0kjmjadk4qf5219rwc1";
+       libraryHaskellDepends = [ base shake ];
+       description = "Elm builds in shake";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shake-ext" = callPackage
-    ({ mkDerivation, base, Cabal, cdeps, composition-prelude, cpphs
-     , directory, shake, template-haskell
+    ({ mkDerivation, base, cdeps, composition-prelude, directory, shake
+     , template-haskell
      }:
      mkDerivation {
        pname = "shake-ext";
-       version = "2.11.0.4";
-       sha256 = "0c7jbbq69y0v6244c6fx6kw9sp8sl5kkmnrfcryfwdgahj3psnp4";
+       version = "2.12.0.0";
+       sha256 = "1yvsywbszvn2vllbzbp8c9c10idaid87wv1qvhz2xq4jw2f8q38h";
        libraryHaskellDepends = [
-         base Cabal cdeps composition-prelude cpphs directory shake
-         template-haskell
+         base cdeps composition-prelude directory shake template-haskell
        ];
        description = "Helper functions for linting with shake";
        license = stdenv.lib.licenses.bsd3;
@@ -183587,6 +183253,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "shake-literate" = callPackage
+    ({ mkDerivation, base, cpphs, shake }:
+     mkDerivation {
+       pname = "shake-literate";
+       version = "0.1.0.0";
+       sha256 = "1kliv9i9libcyzm0bccxi226rd69kvjxi9hi3n4y7zjbbp40cqgd";
+       libraryHaskellDepends = [ base cpphs shake ];
+       description = "Rules for building literate programs in shake";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "shake-minify" = callPackage
     ({ mkDerivation, base, bytestring, css-text, hjsmin, shake, text }:
      mkDerivation {
@@ -185193,26 +184870,6 @@ self: {
      }) {};
 
   "simple-log" = callPackage
-    ({ mkDerivation, async, base, base-unicode-symbols, containers
-     , data-default, deepseq, directory, exceptions, filepath, hformat
-     , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
-     , text, time, transformers
-     }:
-     mkDerivation {
-       pname = "simple-log";
-       version = "0.9.4";
-       sha256 = "0chp90h9112sxa7ds0ldzdp59i6b1vy7chkqcb6d5mb9faq6vjqi";
-       libraryHaskellDepends = [
-         async base base-unicode-symbols containers data-default deepseq
-         directory exceptions filepath hformat microlens microlens-platform
-         mmorph mtl SafeSemaphore text time transformers
-       ];
-       testHaskellDepends = [ base hspec microlens-platform text ];
-       description = "Simple log for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-log_0_9_5" = callPackage
     ({ mkDerivation, async, base, base-unicode-symbols, containers
      , data-default, deepseq, directory, exceptions, filepath, hformat
      , hspec, microlens, microlens-platform, mmorph, mtl, SafeSemaphore
@@ -185230,7 +184887,6 @@ self: {
        testHaskellDepends = [ base hspec microlens-platform text ];
        description = "Simple log for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-log-syslog" = callPackage
@@ -189097,6 +188753,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "socket-icmp" = callPackage
+    ({ mkDerivation, base, socket }:
+     mkDerivation {
+       pname = "socket-icmp";
+       version = "0.1.0.0";
+       sha256 = "14lfvbhcq1ri9bfc0qiymh8qv8b7q78lzfbr5qsarh8rb85ii2vj";
+       libraryHaskellDepends = [ base socket ];
+       description = "Definitions for ICMP with the `socket` library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "socket-io" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, engine-io
      , mtl, stm, text, transformers, unordered-containers, vector
@@ -190127,23 +189794,24 @@ self: {
   "speechmatics" = callPackage
     ({ mkDerivation, aeson, base, bytestring, HsOpenSSL, hspec
      , http-client, http-client-openssl, http-types, json-autotype, lens
-     , mime-types, neat-interpolation, options, SHA, text, wreq
+     , mime-types, monad-logger, mtl, neat-interpolation, options, SHA
+     , text, wreq
      }:
      mkDerivation {
        pname = "speechmatics";
-       version = "0.4.0.0";
-       sha256 = "0lnv4rq0iaj4j9mf49ws43p9ajini1q1vzj4yyvlnpwikkn6yk67";
+       version = "0.5.0.0";
+       sha256 = "12hk79wfs935118y1dzzrya9k82jf525scn67ps0s314g8fzpnc0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring HsOpenSSL http-client http-client-openssl
-         http-types json-autotype lens mime-types text wreq
+         http-types json-autotype lens mime-types monad-logger mtl text wreq
        ];
        executableHaskellDepends = [
-         base bytestring mime-types options SHA text
+         base bytestring mime-types monad-logger mtl options SHA text
        ];
        testHaskellDepends = [
-         base bytestring hspec neat-interpolation text
+         base bytestring hspec monad-logger mtl neat-interpolation text
        ];
        description = "Speechmatics api client";
        license = stdenv.lib.licenses.bsd3;
@@ -190892,18 +190560,6 @@ self: {
      }) {};
 
   "sql-words" = callPackage
-    ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
-     mkDerivation {
-       pname = "sql-words";
-       version = "0.1.6.0";
-       sha256 = "065ymcym5vm5xmprbzgv88wk3b09j44ajvsd59apw6qr32j218rn";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       description = "SQL keywords data constructors into OverloadedString";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "sql-words_0_1_6_1" = callPackage
     ({ mkDerivation, base, QuickCheck, quickcheck-simple }:
      mkDerivation {
        pname = "sql-words";
@@ -190913,7 +190569,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "SQL keywords data constructors into OverloadedString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlcipher" = callPackage
@@ -193681,21 +193336,6 @@ self: {
      }) {};
 
   "store-core" = callPackage
-    ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "store-core";
-       version = "0.4.1";
-       sha256 = "1d34n2n9vjngxndkbxcqm07sg4cnaq6rlx013rhyjr3aybwqalhl";
-       libraryHaskellDepends = [
-         base bytestring fail ghc-prim primitive text transformers
-       ];
-       description = "Fast and lightweight binary serialization";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "store-core_0_4_3" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, primitive, text
      , transformers
      }:
@@ -193708,7 +193348,6 @@ self: {
        ];
        description = "Fast and lightweight binary serialization";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "store-streaming" = callPackage
@@ -193731,6 +193370,7 @@ self: {
        ];
        description = "Streaming interfaces for `store`";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "str" = callPackage
@@ -193773,15 +193413,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "stratosphere_0_24_0" = callPackage
+  "stratosphere_0_24_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.24.0";
-       sha256 = "02hpx1j1s4rjgf39qg9vxmdqvvb2il0w291gv8819fzmrrifhym5";
+       version = "0.24.1";
+       sha256 = "1kgky2713bik420i93k982zwlnp4ldr6lik2brg4nqwplwzf091i";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -194448,7 +194088,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "streamly_0_2_0" = callPackage
+  "streamly_0_2_1" = callPackage
     ({ mkDerivation, atomic-primops, base, containers, deepseq
      , exceptions, gauge, hspec, lifted-base, lockfree-queue
      , monad-control, mtl, QuickCheck, random, stm, transformers
@@ -194456,8 +194096,8 @@ self: {
      }:
      mkDerivation {
        pname = "streamly";
-       version = "0.2.0";
-       sha256 = "1vbzyvmdzhjxpjd4pq4lkn6y0s2yxiziypp4vf9pvwmy1bq5dk0f";
+       version = "0.2.1";
+       sha256 = "157zxg03ibgxdrghpcdyj22fd7zd02fmgnib13yf0jwwc400c4gp";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195792,6 +195432,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "Tool for creating completely configured production Haskell projects";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sump" = callPackage
@@ -196498,6 +196139,8 @@ self: {
        pname = "swagger2";
        version = "2.2.2";
        sha256 = "1jkfmfrldqrfqqnjf0g4spd03w9xjmi35k33xnhsmfj122455lw2";
+       revision = "1";
+       editedCabalFile = "08rjphysbbiy1zcakgrscv0f3ypxx604dcg6h84jg38azqsf8kff";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          aeson base base-compat-batteries bytestring containers generics-sop
@@ -198813,6 +198456,7 @@ self: {
        ];
        description = "Extract and create tar files using conduit for streaming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tardis" = callPackage
@@ -199085,6 +198729,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-discover_4_2_1" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, Glob
+     , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-discover";
+       version = "4.2.1";
+       sha256 = "0ghxrjkqp4w6i47pvdsd25zs6sj10rw4ybkf0pxr598l8qw5nv5y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath Glob
+       ];
+       executableHaskellDepends = [
+         base containers directory filepath Glob
+       ];
+       testHaskellDepends = [
+         base containers directory filepath Glob hedgehog tasty
+         tasty-hedgehog tasty-hspec tasty-hunit tasty-quickcheck
+         tasty-smallcheck
+       ];
+       description = "Test discovery for the tasty framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-expected-failure" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
@@ -199943,6 +199614,8 @@ self: {
        pname = "telegram-bot-simple";
        version = "0.2.0";
        sha256 = "1aafj27zj69hvzxv58cz7h8pjbc9c74hmg92swg2sy8ai1rcb34a";
+       revision = "1";
+       editedCabalFile = "1li6b3m9glhfg8agr9h0mrbxpr8zr46l57mzjfdqndm248ddbklv";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -201947,22 +201620,6 @@ self: {
      }) {};
 
   "text-postgresql" = callPackage
-    ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
-     , transformers, transformers-compat
-     }:
-     mkDerivation {
-       pname = "text-postgresql";
-       version = "0.0.2.3";
-       sha256 = "0dp4f213d9rslgiqpmpk9dzl6yb9njmiym7s1fn3ms9aadipag72";
-       libraryHaskellDepends = [
-         base dlist transformers transformers-compat
-       ];
-       testHaskellDepends = [ base QuickCheck quickcheck-simple ];
-       description = "Parser and Printer of PostgreSQL extended types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-postgresql_0_0_3_0" = callPackage
     ({ mkDerivation, base, dlist, QuickCheck, quickcheck-simple
      , transformers, transformers-compat
      }:
@@ -201976,7 +201633,6 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        description = "Parser and Printer of PostgreSQL extended types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-printer" = callPackage
@@ -202014,22 +201670,6 @@ self: {
      }) {};
 
   "text-region" = callPackage
-    ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
-     , groups, hspec, lens, text
-     }:
-     mkDerivation {
-       pname = "text-region";
-       version = "0.3.0.0";
-       sha256 = "0xy9lpdn26dla4ad7hcpv51swih4n2iw3n27dq68sdp01rz43sfa";
-       libraryHaskellDepends = [
-         aeson base base-unicode-symbols bytestring groups lens text
-       ];
-       testHaskellDepends = [ base base-unicode-symbols hspec lens text ];
-       description = "Marking text regions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-region_0_3_1_0" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
      , groups, hspec, lens, text
      }:
@@ -202043,7 +201683,6 @@ self: {
        testHaskellDepends = [ base base-unicode-symbols hspec lens text ];
        description = "Marking text regions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-register-machine" = callPackage
@@ -204275,6 +203914,7 @@ self: {
        ];
        description = "Quasi-quoters for dates and times";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-recurrence" = callPackage
@@ -204840,6 +204480,7 @@ self: {
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tiny-scheduler" = callPackage
@@ -211503,6 +211144,7 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpacked-maybe" = callPackage
@@ -211515,6 +211157,7 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpacked-these" = callPackage
@@ -211531,6 +211174,7 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked these data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpacked-validation" = callPackage
@@ -211547,6 +211191,7 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked validation data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unroll-ghc-plugin" = callPackage
@@ -211869,35 +211514,6 @@ self: {
      }) {};
 
   "uri-bytestring" = callPackage
-    ({ mkDerivation, attoparsec, base, base-compat, blaze-builder
-     , bytestring, containers, criterion, deepseq, deepseq-generics
-     , fail, generics-sop, HUnit, network-uri, QuickCheck
-     , quickcheck-instances, semigroups, tasty, tasty-hunit
-     , tasty-quickcheck, template-haskell, th-lift-instances
-     , transformers
-     }:
-     mkDerivation {
-       pname = "uri-bytestring";
-       version = "0.3.1.1";
-       sha256 = "1ysmwf2zqv6kky2656nk6i2azpngzl0rkgy5fab7ja3xhx998y3z";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder bytestring containers fail
-         template-haskell th-lift-instances
-       ];
-       testHaskellDepends = [
-         attoparsec base base-compat blaze-builder bytestring containers
-         generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty
-         tasty-hunit tasty-quickcheck transformers
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq deepseq-generics
-         network-uri
-       ];
-       description = "Haskell URI parsing as ByteStrings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "uri-bytestring_0_3_2_0" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, blaze-builder
      , bytestring, containers, criterion, deepseq, deepseq-generics
      , generics-sop, HUnit, network-uri, QuickCheck
@@ -211924,7 +211540,6 @@ self: {
        ];
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-bytestring-aeson" = callPackage
@@ -212170,6 +211785,7 @@ self: {
        testHaskellDepends = [ base network network-uri QuickCheck ];
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlpath" = callPackage
@@ -213618,21 +213234,6 @@ self: {
      }) {};
 
   "vault" = callPackage
-    ({ mkDerivation, base, containers, hashable, semigroups
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "vault";
-       version = "0.3.1.0";
-       sha256 = "17wp9i64k5ms4bqwjwqjj7llcbmyvgf81sah7w3zdqfsqd1shq6r";
-       libraryHaskellDepends = [
-         base containers hashable semigroups unordered-containers
-       ];
-       description = "a persistent store for values of arbitrary types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "vault_0_3_1_1" = callPackage
     ({ mkDerivation, base, containers, hashable, semigroups
      , unordered-containers
      }:
@@ -213645,7 +213246,6 @@ self: {
        ];
        description = "a persistent store for values of arbitrary types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault-tool" = callPackage
@@ -218431,40 +218031,6 @@ self: {
      }) {};
 
   "websockets" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
-     , bytestring, bytestring-builder, case-insensitive, containers
-     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "websockets";
-       version = "0.12.4.1";
-       sha256 = "1qr9sjjnllf6y2k5knyrck9nnh3s7z6nid8a0z5vsvmmvr37fa4j";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers entropy network
-         random SHA streaming-commons text
-       ];
-       testHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers entropy HUnit
-         network QuickCheck random SHA streaming-commons test-framework
-         test-framework-hunit test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base base64-bytestring binary bytestring
-         bytestring-builder case-insensitive containers criterion entropy
-         network random SHA text
-       ];
-       doCheck = false;
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets_0_12_5_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , bytestring, bytestring-builder, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -218496,7 +218062,6 @@ self: {
        doCheck = false;
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-rpc" = callPackage
@@ -223220,6 +222785,7 @@ self: {
        ];
        description = "Yam Web";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yamemo" = callPackage
@@ -223329,18 +222895,22 @@ self: {
      }) {};
 
   "yaml-pretty-extras" = callPackage
-    ({ mkDerivation, base, bytestring, errors, hspec, mtl, text, yaml
+    ({ mkDerivation, base, bytestring, errors, hspec, mtl, rio, text
+     , yaml
      }:
      mkDerivation {
        pname = "yaml-pretty-extras";
-       version = "0.0.1.1";
-       sha256 = "1xb4f76w1sqhv7bkjzzyn13x13ldzpbmnn9kqkq0lzs8zlcyyyjn";
-       libraryHaskellDepends = [ base bytestring errors mtl text yaml ];
+       version = "0.0.1.3";
+       sha256 = "15jk0hxpvq6hjysxrf4nilhn7s32cwvpfc4wbb3fgfvgzaxnnqfb";
+       libraryHaskellDepends = [
+         base bytestring errors mtl rio text yaml
+       ];
        testHaskellDepends = [
-         base bytestring errors hspec mtl text yaml
+         base bytestring errors hspec mtl rio text yaml
        ];
        description = "Extra functionality for pretty printing Yaml documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc" = callPackage
@@ -224835,6 +224405,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-form-bulma" = callPackage
+    ({ mkDerivation, base, email-validate, shakespeare, text, yesod
+     , yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-form-bulma";
+       version = "0.1.0.0";
+       sha256 = "0488n3j61jimw0qxw6nhnkrdslzg1jva1ird8q1ljggmdhin0prm";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base email-validate shakespeare text yesod-core yesod-form
+       ];
+       executableHaskellDepends = [
+         base email-validate shakespeare text yesod yesod-core yesod-form
+       ];
+       testHaskellDepends = [
+         base email-validate shakespeare text yesod-core yesod-form
+       ];
+       description = "support Bulma form for Yesod";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "yesod-form-json" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, text
      , unordered-containers, yesod-core, yesod-form
@@ -226290,6 +225883,26 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-rope_0_11" = callPackage
+    ({ mkDerivation, base, binary, bytestring, criterion, deepseq
+     , fingertree, hspec, QuickCheck, quickcheck-instances, text
+     }:
+     mkDerivation {
+       pname = "yi-rope";
+       version = "0.11";
+       sha256 = "020hnyhl2g313ch6dng9lq3xdjy3ssnb069wiwzbpg816mlii4ws";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq fingertree text
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances text
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq text ];
+       description = "A rope data structure used by Yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-snippet" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, free
      , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
@@ -226595,6 +226208,7 @@ self: {
        testHaskellDepends = [ base MonadRandom random yu-utils ];
        description = "Auth module for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yu-core" = callPackage
@@ -226641,6 +226255,7 @@ self: {
        ];
        description = "Tool for Yu";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yu-utils" = callPackage
@@ -226924,6 +226539,7 @@ self: {
        ];
        description = "Zephyr tree shaking for PureScript Language";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zero" = callPackage
@@ -227340,31 +226956,6 @@ self: {
      }) {};
 
   "zip-archive" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
-     , digest, directory, filepath, HUnit, mtl, old-time, pretty
-     , process, temporary, text, time, unix, unzip, zlib
-     }:
-     mkDerivation {
-       pname = "zip-archive";
-       version = "0.3.2.4";
-       sha256 = "119p7f9dbims5swf23czyg4r4p0sjmgwfh042bpxw54d9p9jwq90";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         array base binary bytestring containers digest directory filepath
-         mtl old-time pretty text time unix zlib
-       ];
-       libraryToolDepends = [ unzip ];
-       testHaskellDepends = [
-         base bytestring directory filepath HUnit old-time process temporary
-         time unix
-       ];
-       description = "Library for creating and modifying zip archives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) unzip;};
-
-  "zip-archive_0_3_2_5" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty
      , process, temporary, text, time, unix, unzip, zlib
@@ -227387,7 +226978,6 @@ self: {
        testToolDepends = [ unzip ];
        description = "Library for creating and modifying zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) unzip;};
 
   "zip-conduit" = callPackage

From c08d5ab247450e224edfcb489b261d2058f12627 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 5 Jun 2018 12:13:28 +0200
Subject: [PATCH 3205/3370] emacsPackages.haskellMode: mark 'broken'

This package is obsolete anyway. Use "emacsMelpa.haskell-mode" instead.
---
 pkgs/applications/editors/emacs-modes/haskell/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix
index 6f998300290a..6b10766bedb7 100644
--- a/pkgs/applications/editors/emacs-modes/haskell/default.nix
+++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo }:
 
+# Use "emacsMelpa.haskell-mode" instead.
+
 let
   version = "13.14-169-g0d3569d";      # git describe --tags
 in
@@ -35,5 +37,6 @@ stdenv.mkDerivation {
 
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.peti ];
+    broken = true;  # no longer compiles and this package is obsolete anyway
   };
 }

From 0287773a0ada8eb7143acc4434671a131a8fbc1c Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 5 Jun 2018 17:21:31 -0400
Subject: [PATCH 3206/3370] haskell-gi: remove patch already present in new
 version

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b92ba205b843..51db6109b14b 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -437,12 +437,6 @@ self: super: {
   # https://github.com/evanrinehart/mikmod/issues/1
   mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;
 
-  # Version 0.21.2 calls its doctest suite with incorrect paths.
-  haskell-gi = appendPatch super.haskell-gi (pkgs.fetchpatch {
-    url = https://github.com/haskell-gi/haskell-gi/pull/163/commits/b876c4f351893370d4ae597aab6ecc0422e7f665.patch;
-    sha256 = "03vzpvnr3vnz2zgsr504iyf0n9aw6mkz8rkj6zhazfixl3dzfkyd";
-  });
-
   # https://github.com/basvandijk/threads/issues/10
   threads = dontCheck super.threads;
 

From 2558c411927faccaf68b8acf2f0718daf2f8c891 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 5 Jun 2018 20:52:05 -0400
Subject: [PATCH 3207/3370] gi-dbusmenugtk3: add dependency on gtk3

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 2f1eb1ad97a8..41d6b5ba83e2 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -146,6 +146,9 @@ self: super: builtins.intersectAttrs super {
   gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
   taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; };
 
+  # Add necessary reference to gtk3 package
+  gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3;
+
   # Need WebkitGTK, not just webkit.
   webkit = super.webkit.override { webkit = pkgs.webkitgtk24x-gtk2; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x-gtk3; };

From b7a0c60e8b4eaa44b4bd7b4dc4ff077cbc0cb81c Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 5 Jun 2018 20:52:33 -0400
Subject: [PATCH 3208/3370] dbus-hslogger, status-notifier-item: specify dbus
 version

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 41d6b5ba83e2..a1f353e070a9 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -146,6 +146,10 @@ self: super: builtins.intersectAttrs super {
   gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
   taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; };
 
+  # Specify needed dbus version
+  dbus-hslogger = super.dbus-hslogger.override { dbus = self.dbus_1_0_1; };
+  status-notifier-item = super.status-notifier-item.override { dbus = self.dbus_1_0_1; };
+
   # Add necessary reference to gtk3 package
   gi-dbusmenugtk3 = addPkgconfigDepend super.gi-dbusmenugtk3 pkgs.gtk3;
 

From ba17cbfd1f4dcbd1b3d3da1e9e3ac66273f18464 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 5 Jun 2018 20:53:06 -0400
Subject: [PATCH 3209/3370] taffybar: turn on strictDeps

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index a1f353e070a9..72c13707f48d 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -144,7 +144,9 @@ self: super: builtins.intersectAttrs super {
   gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"];
   gtksourceview2 = addPkgconfigDepend super.gtksourceview2 pkgs.gtk2;
   gtk-traymanager = addPkgconfigDepend super.gtk-traymanager pkgs.gtk3;
-  taffybar = (addPkgconfigDepend super.taffybar pkgs.gtk3).override { dbus = self.dbus_1_0_1; };
+
+  # Add necessary reference to gtk3 package, plus specify needed dbus version, plus turn on strictDeps to fix build
+  taffybar = ((addPkgconfigDepend super.taffybar pkgs.gtk3).overrideDerivation (drv: { strictDeps = true; })).override { dbus = self.dbus_1_0_1; };
 
   # Specify needed dbus version
   dbus-hslogger = super.dbus-hslogger.override { dbus = self.dbus_1_0_1; };

From 3ebcac8d8563d8e10fdcde86af8ca0568b32c18a Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 7 Jun 2018 10:53:02 -0400
Subject: [PATCH 3210/3370] darwin.libiconv: use static library

This is necessary to get stuff into the Apple App Store for iOS. Apple does not really like using dynamic libraries in iOS. Also the libcharset thing is apparently a "private" symbol.

See https://github.com/reflex-frp/reflex-platform/pull/307 for more details.

See https://github.com/NixOS/nixpkgs/commit/3dee596ed1e373c296cf4d5a09b937b41f27fbe5#diff-261d74054a31954b7c6175e2e7e28356 for discussion
---
 .../darwin/apple-source-releases/libiconv/default.nix       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
index 7ea9d51b4bf6..bb9e4fa755db 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, appleDerivation, autoreconfHook }:
+{ stdenv, appleDerivation, autoreconfHook, targetPlatform, enableStatic ? targetPlatform.isiOS }:
 
 appleDerivation {
   postUnpack = "sourceRoot=$sourceRoot/libiconv";
@@ -7,7 +7,9 @@ appleDerivation {
     sed -i 's/darwin\*/ios\*/g' configure libcharset/configure
   '';
 
-  postInstall = ''
+  configureFlags = stdenv.lib.optionals enableStatic [ "--enable-static" "--disable-shared" ];
+
+  postInstall = stdenv.lib.optionalString (!enableStatic) ''
     mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib
     ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib
 

From 8aff02e0241b73d7667d694a20462d05b4ccccc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Gaspard?= <leo@gaspard.io>
Date: Thu, 7 Jun 2018 17:33:21 +0200
Subject: [PATCH 3211/3370] nheko: 0.4.2 -> 0.4.3

---
 .../networking/instant-messengers/nheko/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix
index 707e78459efe..929277996c5e 100644
--- a/pkgs/applications/networking/instant-messengers/nheko/default.nix
+++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix
@@ -50,13 +50,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "nheko-${version}";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "mujx";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "1z9dbvcgwafxr131a8447qkx97x8l93k32xa8xvajgvjlimqphqk";
+    sha256 = "0qjia42nam3hj835k2jb5b6j6n56rdkb8rn67yqf45xdz8ypmbmv";
   };
 
   # This patch is likely not strictly speaking needed, but will help detect when

From 975874311a1c72444fab2256a4fbcfb490f3ed1d Mon Sep 17 00:00:00 2001
From: Maciej Kazulak <kazulakm@gmail.com>
Date: Thu, 7 Jun 2018 17:25:49 +0200
Subject: [PATCH 3212/3370] odpic: 2.3.2 -> 2.4.0

---
 pkgs/development/libraries/odpic/default.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 229553b95e9e..10a36b03d8db 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "odpic-${version}";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchurl {
     url = "https://github.com/oracle/odpi/archive/v${version}.tar.gz";
-    sha256 = "0a52vqy3c27hmcia4x4vhs6z0ha27xkw7fvfa17f7kxs5w84ll07";
+    sha256 = "1z793mg8hmy067xhllip7ca84xy07ca1cqilnr35mbvhmydp03zz";
   };
 
   buildInputs = [ libaio oracle-instantclient ];
@@ -15,14 +15,10 @@ stdenv.mkDerivation rec {
     [ oracle-instantclient ];
 
   dontPatchELF = true;
-  installPhase = ''
-    mkdir -p $out/lib
-    mkdir $out/include
+  makeFlags = [ "PREFIX=$(out)" ];
 
-    cp lib/* $out/lib/
-    cp include/* $out/include/
-
-    patchelf --set-rpath "${libPath}" $out/lib/libodpic.so
+  postFixup = ''
+    patchelf --set-rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
   '';
 
   meta = with stdenv.lib; {

From 7edc6f648d033cea8e7964e9c6e533a5d125bf94 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 7 Jun 2018 11:34:46 -0500
Subject: [PATCH 3213/3370] libunistring: re-enable tests w/musl, update seems
 to have fixed

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

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index e3be66e8b1ca..356462e8a4af 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     "--with-libiconv-prefix=${libiconv}"
   ];
 
-  doCheck = !stdenv.hostPlatform.isMusl;
+  doCheck = true;
 
   enableParallelBuilding = true;
 

From cc13564aa802d64e3c267f5e52dec0bfa84a295b Mon Sep 17 00:00:00 2001
From: Winnie Quinn <me@winniequinn.com>
Date: Thu, 7 Jun 2018 13:02:05 -0400
Subject: [PATCH 3214/3370] vscode: 1.23.1 -> 1.24.0

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

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index 29de230d38c7..4b1d26742d69 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -2,7 +2,7 @@
   makeWrapper, libXScrnSaver, libxkbfile, libsecret }:
 
 let
-  version = "1.23.1";
+  version = "1.24.0";
   channel = "stable";
 
   plat = {
@@ -12,9 +12,9 @@ let
   }.${stdenv.system};
 
   sha256 = {
-    "i686-linux" = "0vqaxyg6r6mfm1gz8j7wxgg426hjsmv2ybyi8rfjcm9s8d23y9n6";
-    "x86_64-linux" = "0zycl8zqf5yiqq6k6mr28a20yg37whb8iw527pavvm74knzx3lgk";
-    "x86_64-darwin" = "03r2cvim7swq1fjxh6m9f7rifww3hddnyzpzniqb5132nnq4mrmc";
+    "i686-linux" = "17dvyp31kf12mfs6z3cm8rxfrvrmbrk9gbsk3z7v284z64dry9vz";
+    "x86_64-linux" = "11m50lb0hvnmvb3qdixgpvdzcljzm94qxl41240g4qh4a36qvr1j";
+    "x86_64-darwin" = "1wm6h3f8b33rky5nlrvwx4qx0k9h72aabiz6sm27x1wrs486p3lf";
   }.${stdenv.system};
 
   archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz";

From c923e938a3de8738ac881bd8762a18961aadc796 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Thu, 7 Jun 2018 13:17:20 -0400
Subject: [PATCH 3215/3370] Revert "trash-cli: cleanup"

This reverts commit 3216cf6cdf5a9d0e77af10add1a9cd5c0d6106c2.
---
 pkgs/tools/misc/trash-cli/default.nix     | 23 ++++++++++----------
 pkgs/tools/misc/trash-cli/nix-paths.patch | 26 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/tools/misc/trash-cli/nix-paths.patch

diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 7be2e3fc61d7..77308ecf2ed8 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, fetchpatch, python3, python3Packages
-, lib, makeWrapper, coreutils }:
+{ stdenv, fetchFromGitHub, fetchpatch, coreutils
+, python3, python3Packages, substituteAll }:
+
+assert stdenv.isLinux;
 
 python3Packages.buildPythonApplication rec {
   name = "trash-cli-${version}";
@@ -14,6 +16,12 @@ python3Packages.buildPythonApplication rec {
   };
 
   patches = [
+    (substituteAll {
+      src = ./nix-paths.patch;
+      df = "${coreutils}/bin/df";
+      libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
+    })
+
     # Fix build on Python 3.6.
     (fetchpatch {
       url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch";
@@ -22,19 +30,10 @@ python3Packages.buildPythonApplication rec {
   ];
 
   buildInputs = with python3Packages; [ nose mock ];
-  nativeBuildInputs = [ makeWrapper ];
-
-  preFixup = ''
-    for bin in $out/bin/*; do
-      wrapProgram $bin \
-        --prefix PATH : ${lib.makeBinPath [ coreutils ]} \
-        --prefix DYLD_LIBRARY_PATH : ${lib.makeSearchPath "lib" (lib.optional (stdenv.hostPlatform.libc == "glibc") (lib.getDev stdenv.cc.libc))}
-    done
-  '';
 
   checkPhase = "nosetests";
 
-  meta = with lib; {
+  meta = with stdenv.lib; {
     homepage = https://github.com/andreafrancia/trash-cli;
     description = "Command line tool for the desktop trash can";
     maintainers = [ maintainers.rycee ];
diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch
new file mode 100644
index 000000000000..d7b485eec158
--- /dev/null
+++ b/pkgs/tools/misc/trash-cli/nix-paths.patch
@@ -0,0 +1,26 @@
+--- a/trashcli/list_mount_points.py	2014-12-23 10:10:43.808470486 +0100
++++ a/trashcli/list_mount_points.py	2014-12-23 10:19:04.954796457 +0100
+@@ -12,7 +12,7 @@ def mount_points_from_getmnt():
+ 
+ def mount_points_from_df():
+     import subprocess
+-    df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout
++    df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout
+     return list(_mount_points_from_df_output(df_output))
+ 
+ def _mount_points_from_df_output(df_output):
+@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() :
+                     ("mnt_freq", c_int),       # Dump frequency (in days).
+                     ("mnt_passno", c_int)]     # Pass number for `fsck'.
+ 
+-    if sys.platform == "cygwin":
+-        libc_name = "cygwin1.dll"
+-    else:
+-        libc_name = find_library("c")
+-
+-    if libc_name == None :
+-        libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0
++    libc_name = "@libc@"
+ 
+     libc = cdll.LoadLibrary(libc_name)
+     libc.getmntent.restype = POINTER(mntent_struct)

From f379be939c92a5775556e92564b435c077508a21 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 7 Jun 2018 14:27:44 -0400
Subject: [PATCH 3216/3370] haskell infra: Use `self.ghc` rather than closing
 over initial value

---
 pkgs/development/haskell-modules/make-package-set.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix
index 7fc921037a2a..a54967c4e45e 100644
--- a/pkgs/development/haskell-modules/make-package-set.nix
+++ b/pkgs/development/haskell-modules/make-package-set.nix
@@ -102,8 +102,7 @@ let
   callPackage = drv: args: callPackageWithScope defaultScope drv args;
 
   withPackages = packages: buildPackages.callPackage ./with-packages-wrapper.nix {
-    inherit (self) llvmPackages;
-    inherit ghc;
+    inherit (self) ghc llvmPackages;
     inherit packages;
   };
 
@@ -120,7 +119,7 @@ let
       installPhase = ''
         export HOME="$TMP"
         mkdir -p "$out"
-        cabal2nix --compiler=${ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
+        cabal2nix --compiler=${self.ghc.haskellCompilerName} --system=${hostPlatform.system} ${sha256Arg} "${src}" ${extraCabal2nixOptions} > "$out/default.nix"
       '';
   };
 

From 95aa3f4cc69c35c3c37ace4634df69e472749448 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Thu, 7 Jun 2018 22:16:42 +0300
Subject: [PATCH 3217/3370] flashplayer: 29.0.0.171 -> 30.0.0.113

---
 .../networking/browsers/chromium/plugins.nix         |  4 ++--
 .../browsers/mozilla-plugins/flashplayer/default.nix | 12 ++++++------
 .../mozilla-plugins/flashplayer/standalone.nix       | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index cb2121553ace..1f704c824283 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -98,12 +98,12 @@ let
 
   flash = stdenv.mkDerivation rec {
     name = "flashplayer-ppapi-${version}";
-    version = "29.0.0.171";
+    version = "30.0.0.113";
 
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "1j7w81wjfrpkir11m719jdahnbnw4sph448hs90hvai6rsn3imib";
+      sha256 = "092fjp5znnc8mz6jh4nm9kswkhfr31v2l7kasr97f32rw9fksi9g";
       stripRoot = false;
     };
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index 6c19b684aaa5..507697f0c2c3 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -73,25 +73,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "29.0.0.171";
+  version = "30.0.0.113";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_npapi_linux_debug.${arch}.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_npapi_linux_debug.${arch}.tar.gz"
       else
         "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz";
     sha256 =
       if debug then
         if arch == "x86_64" then
-          "140galarr38lmfnd2chl2msvxizx96kdi000gbikir9xnd7bx1hc"
+          "1s4i9lmlydm8b373pi8jw5xf3fhcq75fgqyp7xd7aava8hay7x0j"
         else
-          "0wzmf12xrmyq8vqqyii932yx4nadrvkn2j9s86xcw67lb40xj5ig"
+          "1jhzvrn6f9zcynx3zq0vxidaps946aymm7l16c42p1f7q9s8msb4"
       else
         if arch == "x86_64" then
-          "17c57xgs0w71p4xsjw5an7dg484769wanq3kx86ppaqw8vqhnqc3"
+          "05dv4cn9i3zz5fmy16dxs9m1rpvlaih4gzsrf0q1zfjn46jbyw2l"
         else
-          "06pjbc9050fgi2njzf9vm6py7c22i6chw852rbm8flx3cmplw23b";
+          "0pn159rzx6nb6lmkghccl0ynnc9ihfbr4rvfp14gm4n6jzbl6vg8";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index fa9c89b442bb..8664b20e82d7 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -55,19 +55,19 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-standalone-${version}";
-  version = "29.0.0.171";
+  version = "30.0.0.113";
 
   src = fetchurl {
     url =
       if debug then
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux_debug.x86_64.tar.gz"
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux_debug.x86_64.tar.gz"
       else
-        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/29/flash_player_sa_linux.x86_64.tar.gz";
+        "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz";
     sha256 =
       if debug then
-        "1q2lmsb9g2cxbwxb712javmadk6vmcgkihd244394nr10isdzw67"
+        "0vdzmk9l04jq9mfkdddsqrga7ndikq910indl7wa3vndghrahmn0"
       else
-        "0qj5qdc9k53pgqxb5jpcbgfsgavmlyzp0cpz468c4zacsvxgq502";
+        "10rm48i3h6x1dygjivv2mvd0jq6n40j5c2ik090s7i0ily5z97m8";
   };
 
   nativeBuildInputs = [ unzip ];

From 6081f514b68ef4146e959bf6ec34f4d5b5740534 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 18 May 2018 22:15:07 +0100
Subject: [PATCH 3218/3370] opensmtpd: 6.0.2p1 -> 6.0.3p1

---
 pkgs/servers/mail/opensmtpd/default.nix    | 13 ++++----
 pkgs/servers/mail/opensmtpd/proc_path.diff | 37 ++++------------------
 2 files changed, 12 insertions(+), 38 deletions(-)

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index d2667597c627..e562fdc88a6c 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -5,28 +5,27 @@
 # see also https://github.com/OpenSMTPD/OpenSMTPD/issues/678
 , unpriviledged_smtpctl_encrypt ? true
 
-# This enables you to override the '+' character which typically separates the user from the tag in user+tag@domain.tld
+# Deprecated: use the subaddressing-delimiter in the config file going forward
 , tag_char ? null
 }:
 
-stdenv.mkDerivation rec {
+if (tag_char != null)
+then throw "opensmtpd: the tag_char argument is deprecated as it can now be specified at runtime via the 'subaddressing-delimiter' option of the configuration file"
+else stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "6.0.2p1";
+  version = "6.0.3p1";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib openssl db pam ];
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "1b4h64w45hpmfq5721smhg4s0shs64gbcjqjpx3fbiw4hz8bdy9a";
+    sha256 = "291881862888655565e8bbe3cfb743310f5dc0edb6fd28a889a9a547ad767a81";
   };
 
   patches = [ ./proc_path.diff ];
 
   postPatch = with builtins; with lib;
-    optionalString (isString tag_char) ''
-      sed -i -e "s,TAG_CHAR.*'+',TAG_CHAR '${tag_char}'," smtpd/smtpd-defines.h
-    '' +
     optionalString unpriviledged_smtpctl_encrypt ''
       substituteInPlace smtpd/smtpctl.c --replace \
         'if (geteuid())' \
diff --git a/pkgs/servers/mail/opensmtpd/proc_path.diff b/pkgs/servers/mail/opensmtpd/proc_path.diff
index 9306685e365e..5e1cfd004299 100644
--- a/pkgs/servers/mail/opensmtpd/proc_path.diff
+++ b/pkgs/servers/mail/opensmtpd/proc_path.diff
@@ -1,33 +1,8 @@
-diff --git a/smtpd/parse.y b/smtpd/parse.y
-index ab02719..c1c77d9 100644
---- a/smtpd/parse.y
-+++ b/smtpd/parse.y
-@@ -2534,13 +2534,19 @@ create_filter_proc(char *name, char *prog)
- {
- 	struct filter_conf	*f;
- 	char			*path;
-+	const char		*proc_path;
- 
- 	if (dict_get(&conf->sc_filters, name)) {
- 		yyerror("filter \"%s\" already defined", name);
- 		return (NULL);
- 	}
- 
--	if (asprintf(&path, "%s/filter-%s", PATH_LIBEXEC, prog) == -1) {
-+	proc_path = getenv("OPENSMTPD_PROC_PATH");
-+	if (proc_path == NULL) {
-+		proc_path = PATH_LIBEXEC;
-+	}
-+
-+	if (asprintf(&path, "%s/filter-%s", proc_path, prog) == -1) {
- 		yyerror("filter \"%s\" asprintf failed", name);
- 		return (0);
- 	}
 diff --git a/smtpd/smtpd.c b/smtpd/smtpd.c
-index afc8891..9b0a80f 100644
+index e049f07c..a1bd03a0 100644
 --- a/smtpd/smtpd.c
 +++ b/smtpd/smtpd.c
-@@ -795,6 +795,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
+@@ -1157,6 +1157,7 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
  	char		path[PATH_MAX];
  	char		name[PATH_MAX];
  	char		*arg;
@@ -35,7 +10,7 @@ index afc8891..9b0a80f 100644
  
  	if (strlcpy(name, conf, sizeof(name)) >= sizeof(name)) {
  		log_warnx("warn: %s-proc: conf too long", key);
-@@ -805,7 +806,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
+@@ -1167,7 +1168,12 @@ fork_proc_backend(const char *key, const char *conf, const char *procname)
  	if (arg)
  		*arg++ = '\0';
  
@@ -50,10 +25,10 @@ index afc8891..9b0a80f 100644
  		log_warn("warn: %s-proc: exec path too long", key);
  		return (-1);
 diff --git a/smtpd/table.c b/smtpd/table.c
-index 21ee237..95b5164 100644
+index 9cfdfb99..24dfcca4 100644
 --- a/smtpd/table.c
 +++ b/smtpd/table.c
-@@ -193,6 +193,7 @@ table_create(const char *backend, const char *name, const char *tag,
+@@ -201,6 +201,7 @@ table_create(const char *backend, const char *name, const char *tag,
  	struct table_backend	*tb;
  	char			 buf[LINE_MAX];
  	char			 path[LINE_MAX];
@@ -61,7 +36,7 @@ index 21ee237..95b5164 100644
  	size_t			 n;
  	struct stat		 sb;
  
-@@ -207,11 +208,16 @@ table_create(const char *backend, const char *name, const char *tag,
+@@ -215,11 +216,16 @@ table_create(const char *backend, const char *name, const char *tag,
  	if (name && table_find(name, NULL))
  		fatalx("table_create: table \"%s\" already defined", name);
  

From 0f8594170a7593063886fca4c3820a0b104a47d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 7 Jun 2018 12:44:56 +0200
Subject: [PATCH 3219/3370] lttng-modules: add 'libelf' to fix build against
 linux 4.14

Fixes this:

$ nix-build -A linuxPackages.lttng-modules
[...]
/nix/store/...-linux-4.14.48-dev/lib/modules/4.14.48/source/Makefile:948: \
  *** "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfu

(Linux 4.16+ has other issues, so mark as broken.)
---
 pkgs/os-specific/linux/lttng-modules/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 7c2233714d4c..413ac3efbe54 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel }:
+{ stdenv, fetchurl, kernel, libelf }:
 
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${version}";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq";
   };
 
+  buildInputs = [ libelf ];
+
   hardeningDisable = [ "pic" ];
 
   NIX_CFLAGS_COMPILE = [ "-Wno-error=implicit-function-declaration" ];
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
     broken = builtins.compareVersions kernel.version "3.18" == -1
-      || builtins.compareVersions kernel.version "4.11" == 1;
+      || builtins.compareVersions kernel.version "4.16" == 1;
   };
 
 }

From f098e60ecfe9f2d7b1d51a58e00a09656099b342 Mon Sep 17 00:00:00 2001
From: Brandon Elam Barker <brandon.barker@gmail.com>
Date: Thu, 7 Jun 2018 16:43:52 -0400
Subject: [PATCH 3220/3370] nixos/sandbox: improve documentation.

This was put together based on feedback from LnL on IRC.
---
 nixos/modules/services/misc/nix-daemon.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 429ce09ea68f..0ee105e4c6f1 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -130,11 +130,13 @@ in
         default = false;
         description = "
           If set, Nix will perform builds in a sandboxed environment that it
-          will set up automatically for each build.  This prevents
-          impurities in builds by disallowing access to dependencies
-          outside of the Nix store. This isn't enabled by default for
-          performance. It doesn't affect derivation hashes, so changing
-          this option will not trigger a rebuild of packages.
+          will set up automatically for each build. This prevents impurities
+          in builds by disallowing access to dependencies outside of the Nix 
+          store by using network and mount namespaces in a chroot environment. 
+          This isn't enabled by default for possible performance impacts due to 
+          the initial setup time of a sandbox for each build. It doesn't affect 
+          derivation hashes, so changing this option will not trigger a rebuild
+          of packages.
         ";
       };
 

From 673628e10cff3037552b576e5a45d3a576c2a348 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Thu, 7 Jun 2018 17:04:08 -0400
Subject: [PATCH 3221/3370] androidndk: remove set -x

This was causing output limit exceeded in Hydra:

https://hydra.nixos.org/build/75406916
---
 pkgs/development/mobile/androidenv/androidndk.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index a0a15bf184dc..6a647192e091 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
       jdk python3 which
     ]) + ":${platformTools}/platform-tools";
   in ''
-    set -x
     mkdir -pv $out/libexec
     mkdir -pv $out/lib64
     ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5

From 876b6406d3644813badfdd75635ea47b7bd3aadd Mon Sep 17 00:00:00 2001
From: Daniel Sandbecker <daniels@users.noreply.github.com>
Date: Thu, 7 Jun 2018 23:20:09 +0200
Subject: [PATCH 3222/3370] odt2txt: 0.4 -> 0.5

Version 0.4 failed to build for me on MacOS 10.12.6 (16G1314). (Might be related to the removed libiconv-hacks.) Version 0.5 as specified builds cleanly. Not tested on any other platforms though.

Also 0.4 is from 2008 while 0.5 was released in 2014.

The old homepage now redirects to the GitHub repo.
---
 pkgs/tools/text/odt2txt/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix
index 3feecdf4f53c..48abee018306 100644
--- a/pkgs/tools/text/odt2txt/default.nix
+++ b/pkgs/tools/text/odt2txt/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, zlib, libiconv }:
 
 stdenv.mkDerivation rec {
-  name = "odt2txt-0.4";
+  name = "odt2txt-${version}";
+  version = "0.5";
 
   src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.gz";
-    sha256 = "1y36s7w2ng0r4nismxb3hb3zvsim8aimvvblz9hgnanw3kwbvx55";
+    url = "${meta.homepage}/archive/v${version}.tar.gz";
+    sha256 = "23a889109ca9087a719c638758f14cc3b867a5dcf30a6c90bf6a0985073556dd";
   };
 
   configurePhase="export makeFlags=\"DESTDIR=$out\"";
@@ -14,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Simple .odt to .txt converter";
-    homepage = http://stosberg.net/odt2txt;
+    homepage = https://github.com/dstosberg/odt2txt;
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ ];

From 16ee92eba9ed6306d573bdb310d19cf87f4a5066 Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Fri, 8 Jun 2018 01:02:51 +0300
Subject: [PATCH 3223/3370] flashplayer: fix sha256 hash

---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 1f704c824283..70d457028292 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -103,7 +103,7 @@ let
     src = fetchzip {
       url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/"
           + "${version}/flash_player_ppapi_linux.x86_64.tar.gz";
-      sha256 = "092fjp5znnc8mz6jh4nm9kswkhfr31v2l7kasr97f32rw9fksi9g";
+      sha256 = "0bcsrsz2dd12xs9vn2977k4s6hag1cknkrsgxz3c9pxk4jz99f3k";
       stripRoot = false;
     };
 

From 812c52a974279a96a2fcd3552dc2d65f5b36438d Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Fri, 8 Jun 2018 00:16:36 +0200
Subject: [PATCH 3224/3370] wireguard: 0.0.20180524 -> 0.0.20180531

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

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index 7411aeed6d2e..ecc522f97af0 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -4,11 +4,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "wireguard-tools-${version}";
-  version = "0.0.20180524";
+  version = "0.0.20180531";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "0h503h9hh1vl3j2daz7lm2fp4wda65iphmx8k21md6yql8f56vmi";
+    sha256 = "ff653095cc0e4c491ab6cd095ddf5d1db207f48f947fb92873a73220363f423c";
   };
 
   sourceRoot = "source/src/tools";

From ff5cecf821082ca7fbf14a795c568bace0cb8e5d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 8 Jun 2018 00:21:33 +0200
Subject: [PATCH 3225/3370] autoPatchelfHook: Patch PIC exes/libs as well

If there is a shared object or executable that's using
position-independent code, the file's mime type is
"application/x-pie-executable", so until this change its dependencies
wouldn't be patched.

This simply adds the mime type to the search loop.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/build-support/setup-hooks/auto-patchelf.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh
index 0f9d7603d48f..f40cdcf4cadf 100644
--- a/pkgs/build-support/setup-hooks/auto-patchelf.sh
+++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh
@@ -15,6 +15,7 @@ findElfs() {
         while [ -n "$1" ]; do
             mimeType="$(file -b -N --mime-type "$1")"
             if [ "$mimeType" = application/x-executable \
+              -o "$mimeType" = application/x-pie-executable \
               -o "$mimeType" = application/x-sharedlib ]; then
                 echo "$1"
             fi

From 0e5c971af8d4f455498b31dc5cfeb3f780924650 Mon Sep 17 00:00:00 2001
From: Hamish Mackenzie <Hamish.K.Mackenzie@googlemail.com>
Date: Fri, 8 Jun 2018 11:22:00 +1200
Subject: [PATCH 3226/3370] minio: Output server logs & startup in json format

Currently minio logs with enhanced tty data and journalctl does not include anything useful as a result:

```
Jun 08 11:03:28 alpha minio[17813]: [78B blob data]
Jun 08 11:03:28 alpha minio[17813]: [49B blob data]
Jun 08 11:03:28 alpha minio[17813]: [19B blob data]
Jun 08 11:03:28 alpha minio[17813]: [88B blob data]
Jun 08 11:03:28 alpha minio[17813]: [45B blob data]
Jun 08 11:03:28 alpha minio[17813]: [44B blob data]
Jun 08 11:03:28 alpha minio[17813]: [57B blob data]
```

Indicating that it detected some binary output.  With the `--json` flag it logs:

```
Jun 08 11:14:58 alpha minio[18573]: {"level":"FATAL","time":"2018-06-07T23:14:58.770637778Z","error":{"message":"--address input is invalid: address 127.0.0.1: missing port in address","source":["/build/go/src/github.com/minio/minio/cmd/server-main.go:121:cmd.serverHandleCmdArgs()"]}}
```
---
 nixos/modules/services/web-servers/minio.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/minio.nix b/nixos/modules/services/web-servers/minio.nix
index 843f0d986877..7ead33483ea4 100644
--- a/nixos/modules/services/web-servers/minio.nix
+++ b/nixos/modules/services/web-servers/minio.nix
@@ -85,7 +85,7 @@ in
       '';
       serviceConfig = {
         PermissionsStartOnly = true;
-        ExecStart = "${cfg.package}/bin/minio server --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}";
+        ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --config-dir=${cfg.configDir} ${cfg.dataDir}";
         Type = "simple";
         User = "minio";
         Group = "minio";

From 16a575c6bf0275034babf98fda5f6d4caab0664f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 7 Jun 2018 21:15:22 -0400
Subject: [PATCH 3227/3370] linux: 4.4.135 -> 4.4.136

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index e06be4838ee3..ecef71fd604f 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.135";
+  version = "4.4.136";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1p41fz1jhcrzcmvhbl8di1660bv0w2wpcmi4hfgksdjfh84b1k03";
+    sha256 = "0svb6qbhc376jk26r67qssh7lradx63s60qlm1q2kd4xjhxyj5a3";
   };
 } // (args.argsOverride or {}))

From 8cee6cbe816df40d13e809f1df9077128370469b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Thu, 7 Jun 2018 21:15:37 -0400
Subject: [PATCH 3228/3370] linux: 4.9.106 -> 4.9.107

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index e4a02b10e992..bcc4aad7fccb 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.106";
+  version = "4.9.107";
   extraMeta.branch = "4.9";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0g5y3ckwb1zn8gzsk1sc6vnmsrvsx5g2a1p0p9hrmsl8jnr9nh1d";
+    sha256 = "1lya48grdgjjbzw8x5kvvblanfas23dcmchysnhwv5p0rq7g9rrw";
   };
 } // (args.argsOverride or {}))

From d204c4aee8945394c49a8b114b76ff3e1589293b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 7 Jun 2018 21:47:14 -0700
Subject: [PATCH 3229/3370] xonsh: 0.6.4 -> 0.6.6

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xonsh/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/n2hvc59jjmqfww86pqz7w6hmr7wlklbw-xonsh-0.6.6/bin/xon.sh had a zero exit code or showed the expected version
- /nix/store/n2hvc59jjmqfww86pqz7w6hmr7wlklbw-xonsh-0.6.6/bin/.xonsh-wrapped passed the binary check.
- /nix/store/n2hvc59jjmqfww86pqz7w6hmr7wlklbw-xonsh-0.6.6/bin/xonsh passed the binary check.
- 2 of 3 passed binary check by having a zero exit code.
- 2 of 3 passed binary check by having the new version present in output.
- found 0.6.6 with grep in /nix/store/n2hvc59jjmqfww86pqz7w6hmr7wlklbw-xonsh-0.6.6
- directory tree listing: https://gist.github.com/dba795a63cf24871f010baf56dba68d0
- du listing: https://gist.github.com/afde349bcf27d995e595d895941de9de
---
 pkgs/shells/xonsh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 93add8a69138..0e4d23ffd5cf 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
-  version = "0.6.4";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "scopatz";
     repo = "xonsh";
     rev = version;
-    sha256= "16nfvfa9cklm5qb2lrr12z7k4wjb6pbb0y0ma15riqcda56ygmj7";
+    sha256= "09w7656qhqv3al52cl5lgzawvkbkpwjfnxyg0vyx0gbjs1hwiqjj";
   };
 
   LC_ALL = "en_US.UTF-8";

From 743136566213f093ef80540352b26857ce29ed8b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 7 Jun 2018 22:20:21 -0700
Subject: [PATCH 3230/3370] wolfssl: 3.13.0 -> 3.15.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/wolfssl/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 3.15.0 in filename of file in /nix/store/gx03mc7m4r07ybly7san7xk3v17pm264-wolfssl-3.15.0
- directory tree listing: https://gist.github.com/79fbf246bbacf1d8014bee57d274625a
- du listing: https://gist.github.com/1f19919b71d52208a236a55cf066a003
---
 pkgs/development/libraries/wolfssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index fa65a14121fc..47686451eee6 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.13.0";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     rev = "v${version}-stable";
-    sha256 = "0mvq7ifcpckfrg0zzcxqfbrv08pnz4a8g2z2j3s9h3cwns9ipn6h";
+    sha256 = "1jqhq0dl2zxks7dm6g3dm1zvrl646ab073kgg8ypv19nkd5cvbdv";
   };
 
   outputs = [ "out" "dev" "doc" "lib" ];

From e534844afa650a1cb53a8bc4a55a2af7db3bf7f0 Mon Sep 17 00:00:00 2001
From: Kyle Lacy <kylelacy+git@pm.me>
Date: Thu, 7 Jun 2018 22:22:51 -0700
Subject: [PATCH 3231/3370] libbluray: fix Java build

---
 .../libbluray/BDJ-JARFILE-path.patch          | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
index 2680b1c6de5c..8d9c5d0fbba7 100644
--- a/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
+++ b/pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
@@ -1,21 +1,26 @@
-diff -ru3 libbluray-0.8.0/configure.ac libbluray-0.8.0-new/configure.ac
---- libbluray-0.8.0/configure.ac	2015-04-10 09:48:23.000000000 +0300
-+++ libbluray-0.8.0-new/configure.ac	2015-05-18 14:22:01.002075482 +0300
-@@ -231,6 +231,7 @@
-   AC_DEFINE([USING_BDJAVA], [1], ["Define to 1 if using BD-Java"])
-   AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
-   AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
-+  CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
+diff --git a/configure.ac b/configure.ac
+index 5fd3c8de..7ae343e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,6 +228,10 @@ if test "x$use_bdjava_jar" = "xyes" && test "x$HAVE_ANT" = "xno"; then
+     AC_MSG_ERROR([BD-J requires ANT, but ant was not found. Please install it.])
  fi
- AM_CONDITIONAL([USING_BDJAVA], [ test $use_bdjava = "yes" ])
  
-diff -ru3 libbluray-0.8.0/src/libbluray/bdj/bdj.c libbluray-0.8.0-new/src/libbluray/bdj/bdj.c
---- libbluray-0.8.0/src/libbluray/bdj/bdj.c	2015-04-06 19:25:09.000000000 +0300
-+++ libbluray-0.8.0-new/src/libbluray/bdj/bdj.c	2015-05-18 14:22:59.241312808 +0300
-@@ -228,6 +228,7 @@
- #ifdef _WIN32
-         "" BDJ_JARFILE,
- #else
++if test "x$use_bdjava_jar" = "xyes"; then
++  CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'"
++fi
++
+ AC_DEFINE_UNQUOTED([JAVA_ARCH], ["$java_arch"], ["Defines the architecture of the java vm."])
+ AC_DEFINE_UNQUOTED([JDK_HOME], ["$JDK_HOME"], [""])
+ AM_CONDITIONAL([USING_BDJAVA_BUILD_JAR], [ test $use_bdjava_jar = "yes" ])
+diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
+index 511ad533..e273b9e0 100644
+--- a/src/libbluray/bdj/bdj.c
++++ b/src/libbluray/bdj/bdj.c
+@@ -478,6 +478,7 @@ static const char *_find_libbluray_jar(BDJ_STORAGE *storage)
+     // pre-defined search paths for libbluray.jar
+     static const char * const jar_paths[] = {
+ #ifndef _WIN32
 +        JARDIR "/" BDJ_JARFILE,
          "/usr/share/java/" BDJ_JARFILE,
          "/usr/share/libbluray/lib/" BDJ_JARFILE,

From d62db346c881741e4380d93d197502f68b5f4498 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 7 Jun 2018 22:40:06 -0700
Subject: [PATCH 3232/3370] urlwatch: 2.11 -> 2.13

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/urlwatch/versions.

These checks were done:

- built on NixOS
- /nix/store/yxp495qcrnid39kivd5b748j8frqlkdm-urlwatch-2.13/bin/.urlwatch-wrapped passed the binary check.
- /nix/store/yxp495qcrnid39kivd5b748j8frqlkdm-urlwatch-2.13/bin/urlwatch passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 2.13 with grep in /nix/store/yxp495qcrnid39kivd5b748j8frqlkdm-urlwatch-2.13
- directory tree listing: https://gist.github.com/255d16f15c73bd3e1d6a677d1dd4c3c6
- du listing: https://gist.github.com/a3fa79092d3a5ca8f6929ee7b05f686f
---
 pkgs/tools/networking/urlwatch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index 3efc9e6be232..ecaf498da42d 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urlwatch-${version}";
-  version = "2.11";
+  version = "2.13";
 
   src = fetchFromGitHub {
     owner  = "thp";
     repo   = "urlwatch";
     rev    = version;
-    sha256 = "0vp85d62zhca7d841vg82mwlqb8yihshyc8q2cvwm3rpn5vwf0pi";
+    sha256 = "0rspb5j02mmb0r2dnfryx7jaczvb22lsnysgrr1l9iag0djcgdf5";
   };
 
   propagatedBuildInputs = with python3Packages; [

From f2f681d918df1c9f81b8dc76ed8ecdc09db0c10b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Thu, 7 Jun 2018 22:58:18 -0700
Subject: [PATCH 3233/3370] securefs: 0.8.1 -> 0.8.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/securefs/versions.

These checks were done:

- built on NixOS
- /nix/store/rbd37l5asgzjv9l2vsiyylgj841kjada-securefs-0.8.2/bin/securefs passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.8.2 with grep in /nix/store/rbd37l5asgzjv9l2vsiyylgj841kjada-securefs-0.8.2
- directory tree listing: https://gist.github.com/5aa426f3a1d68b6b2658022bc9848445
- du listing: https://gist.github.com/984ae2a71ea3f57fbfa4d993661314d4
---
 pkgs/tools/filesystems/securefs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/securefs/default.nix b/pkgs/tools/filesystems/securefs/default.nix
index 6fc7ba6499ea..37eb8b9aa72c 100644
--- a/pkgs/tools/filesystems/securefs/default.nix
+++ b/pkgs/tools/filesystems/securefs/default.nix
@@ -4,10 +4,10 @@
 
 stdenv.mkDerivation rec {
   name = "securefs-${version}";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
-    sha256 = "065n3mskv0b2dlk9w4b3pa70h5ymrnanydbanwyx74mf7n8c80r2";
+    sha256 = "0m3nv748g31b5nzxbwqqqjvygmz41x9vmhrjh655086g26gzrfib";
     rev = version;
     repo = "securefs";
     owner = "netheril96";

From daef5308ecd87ef560838202e99543cb073a3c6b Mon Sep 17 00:00:00 2001
From: Anton-Latukha <anton.latukha@gmail.com>
Date: Fri, 8 Jun 2018 02:08:49 +0300
Subject: [PATCH 3234/3370] hiawatha: GitHub -> GitLab, clean-up, build with
 ninja

Developer deleted account on GitHub. As a GitLab proof - official page:
https://www.hiawatha-webserver.org/download
points to GitLab.

* Web server officially created for mbedtls, use bundled
* Assert not needed
* Build with cmake/ninja
* Removed hack, no longer needed
---
 pkgs/servers/http/hiawatha/default.nix | 52 +++++++++++++-------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix
index 277fa06a7079..39722c6d831f 100644
--- a/pkgs/servers/http/hiawatha/default.nix
+++ b/pkgs/servers/http/hiawatha/default.nix
@@ -1,50 +1,50 @@
-{ stdenv, fetchurl, cmake,
-  libxslt, zlib, libxml2, openssl,
-  enableSSL ? true,
-  enableMonitor ? false,
-  enableRproxy ? true,
-  enableTomahawk ? false,
-  enableXSLT ? true,
-  enableToolkit ? true
-}:
+{ stdenv
+, fetchFromGitLab
 
-assert enableSSL -> openssl !=null;
+, cmake
+, ninja
+
+, libxslt
+, libxml2
+
+, enableSSL ? true
+, enableMonitor ? false
+, enableRproxy ? true
+, enableTomahawk ? false
+, enableXSLT ? true
+, enableToolkit ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "hiawatha-${version}";
   version = "10.8.1";
 
-  src = fetchurl {
-    url = "https://github.com/hsleisink/hiawatha/archive/v${version}.tar.gz";
-    sha256 = "1f2hlw2lp98b4dx87i7pz7h66vsy2g22b5adfrlij3kj0vfv61w8";
+  src = fetchFromGitLab {
+    owner = "hsleisink";
+    repo = "hiawatha";
+    rev = "v${version}";
+    sha256 = "1428byx0xpzzwyc0j157q70sjx18dykvg6fd5vp70kj85ank0xpa";
   };
 
-  buildInputs =  [ cmake libxslt zlib libxml2 ] ++ stdenv.lib.optional enableSSL openssl ;
+  nativeBuildInputs = [ cmake ninja ];
+  buildInputs = [ libxslt libxml2 ];
 
   prePatch = ''
     substituteInPlace CMakeLists.txt --replace SETUID ""
   '';
 
   cmakeFlags = [
-    ( if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" )
+    (
+      # FIXME: 2018-06-08: Uses bundled library, with external ("-DUSE_SYSTEM_MBEDTLS=on") asks:
+      # ../src/tls.c:46:2: error: #error "The mbed TLS library must be compiled with MBEDTLS_THREADING_PTHREAD and MBEDTLS_THREADING_C enabled."
+      if enableSSL then "-DENABLE_TLS=on" else "-DENABLE_TLS=off" )
     ( if enableMonitor then "-DENABLE_MONITOR=on" else "-DENABLE_MONITOR=off" )
     ( if enableRproxy then "-DENABLE_RPROXY=on" else "-DENABLE_RPROXY=off" )
     ( if enableTomahawk then "-DENABLE_TOMAHAWK=on" else "-DENABLE_TOMAHAWK=off" )
     ( if enableXSLT then "-DENABLE_XSLT=on" else "-DENABLE_XSLT=off" )
     ( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" )
-    "-DWEBROOT_DIR=/var/www/hiawatha"
-    "-DPID_DIR=/run"
-    "-DWORK_DIR=/var/lib/hiawatha"
-    "-DLOG_DIR=/var/log/hiawatha"
   ];
 
-  # workaround because cmake tries installs stuff outside of nix store
-  makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
-  postInstall = ''
-    mv $out/$out/* $out
-    rm -rf $out/{var,run}
-  '';
-
   meta = with stdenv.lib; {
     description = "An advanced and secure webserver";
     license = licenses.gpl2;

From eb7e0d42dbe44a452dcbf9afea979ac9591c2fd1 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Thu, 30 Nov 2017 05:09:00 +0900
Subject: [PATCH 3235/3370] doc: Explain how to hack on kernel

Presents the options available (linuxManualConfig versus overriding
extraConfig, ignoreConfigErrors, autoModules, kernelPreferBuiltin.

For advanced hostPlatform customization refer to the commands shared by ericson1234 at
https://github.com/NixOS/nixpkgs/pull/33813 but it is too advanced to
put in the doc.
---
 .../doc/manual/configuration/linux-kernel.xml | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml
index 6502aaec83e5..f4d697c42dbd 100644
--- a/nixos/doc/manual/configuration/linux-kernel.xml
+++ b/nixos/doc/manual/configuration/linux-kernel.xml
@@ -66,6 +66,57 @@ nixpkgs.config.packageOverrides = pkgs:
   sets the kernel’s TCP keepalive time to 120 seconds. To see the available
   parameters, run <command>sysctl -a</command>.
  </para>
+ <section>
+  <title>Customize your kernel</title>
+
+  <para>
+   The first step before compiling the kernel is to generate an appropriate
+   <literal>.config</literal> configuration. Either you pass your own config via
+   the <literal>configfile</literal> setting of <literal>linuxManualConfig</literal>:
+  <screen><![CDATA[
+  custom-kernel = super.linuxManualConfig {
+    inherit (super) stdenv hostPlatform;
+    inherit (linux_4_9) src;
+    version = "${linux_4_9.version}-custom";
+
+    configfile = /home/me/my_kernel_config;
+    allowImportFromDerivation = true;
+  };
+  ]]></screen>
+
+You can edit the config with this snippet (by default <command>make menuconfig</command> won't work
+  out of the box on nixos):
+  <screen><![CDATA[
+      nix-shell -E 'with import <nixpkgs> {}; kernelToOverride.overrideAttrs (o: {nativeBuildInputs=o.nativeBuildInputs ++ [ pkgconfig ncurses ];})'
+  ]]></screen>
+
+
+  or you can let nixpkgs generate the configuration.
+  Nixpkgs generates it via answering the interactive kernel utility <command>make config</command>.
+  The answers depend on parameters passed to <filename>pkgs/os-specific/linux/kernel/generic.nix</filename>
+  (which you can influence by overriding <literal>extraConfig, autoModules, modDirVersion, preferBuiltin, extraConfig</literal>).
+<screen><![CDATA[
+
+  mptcp93.override ({
+      name="mptcp-local";
+
+      ignoreConfigErrors = true;
+      autoModules = false;
+      kernelPreferBuiltin = true;
+
+      enableParallelBuilding = true;
+
+      extraConfig = ''
+        DEBUG_KERNEL y
+        FRAME_POINTER y
+        KGDB y
+        KGDB_SERIAL_CONSOLE y
+        DEBUG_INFO y
+      '';
+    });
+  ]]></screen>
+  </para>
+ </section>
  <section>
   <title>Developing kernel modules</title>
 

From bf56acccb8f97d4f4093ab3c9601388bc60fa685 Mon Sep 17 00:00:00 2001
From: Sander Hollaar <git@humilis.net>
Date: Fri, 8 Jun 2018 09:53:12 +0200
Subject: [PATCH 3236/3370] pinentry-debian-patch - "anonscm.debian.org has
 migrated to salsa.debian.org" https://github.com/NixOS/nixpkgs/issues/39927

---
 pkgs/tools/security/pinentry/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 07cf15baa224..3a7e1b5a3437 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   patches = lib.optionals (gtk2 != null) [
     (fetchpatch {
-      url = https://anonscm.debian.org/cgit/pkg-gnupg/pinentry.git/plain/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch;
+      url = https://sources.debian.org/data/main/p/pinentry/1.1.0-1/debian/patches/0007-gtk2-When-X11-input-grabbing-fails-try-again-over-0..patch;
       sha256 = "15r1axby3fdlzz9wg5zx7miv7gqx2jy4immaw4xmmw5skiifnhfd";
     })
   ];

From b7edc2b30e13cc30ccea951dec2e4c72e7dc2988 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 01:39:17 -0700
Subject: [PATCH 3237/3370] owl-lisp: 0.1.15 -> 0.1.16

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/owl-lisp/versions.

These checks were done:

- built on NixOS
- /nix/store/w56xh2wbvj0f9f7cs7px7jrwkw6lcb9q-owl-lisp-0.1.16/bin/ol passed the binary check.
- Warning: no invocation of /nix/store/w56xh2wbvj0f9f7cs7px7jrwkw6lcb9q-owl-lisp-0.1.16/bin/ovm had a zero exit code or showed the expected version
- 1 of 2 passed binary check by having a zero exit code.
- 1 of 2 passed binary check by having the new version present in output.
- found 0.1.16 with grep in /nix/store/w56xh2wbvj0f9f7cs7px7jrwkw6lcb9q-owl-lisp-0.1.16
- directory tree listing: https://gist.github.com/b4c2aa74b73f2272f18b1a116c55897a
- du listing: https://gist.github.com/c130a766b1c674ed98f2f4e109186fe3
---
 pkgs/development/compilers/owl-lisp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/owl-lisp/default.nix b/pkgs/development/compilers/owl-lisp/default.nix
index ee076acd8b17..ccd149bbb404 100644
--- a/pkgs/development/compilers/owl-lisp/default.nix
+++ b/pkgs/development/compilers/owl-lisp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name    = "owl-lisp-${version}";
-  version = "0.1.15";
+  version = "0.1.16";
 
   src = fetchFromGitHub {
     owner  = "aoh";
     repo   = "owl-lisp";
     rev    = "v${version}";
-    sha256 = "0pczmra2x6icyz6b6g66pp5ij83cq4wszg0ssw8qm7a5314kxkq4";
+    sha256 = "1qp6p48bmlyn83rqi6k3d098dg4cribavg5rd4x17z37i181vxvj";
   };
 
   nativeBuildInputs = [ which ];

From 2f79089553bb9324acb292050ab34cfa09e20051 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 7 Jun 2018 16:36:41 +0200
Subject: [PATCH 3238/3370] ponyc: 0.22.5 -> 0.22.6

https://github.com/ponylang/ponyc/issues/2758
---
 pkgs/development/compilers/ponyc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index b7037c9b9a86..061b9b8639d2 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation ( rec {
   name = "ponyc-${version}";
-  version = "0.22.5";
+  version = "0.22.6";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     rev = version;
-    sha256 = "1kxn4chc35h72hrblfrmmwgzb9s1sjsjazwz1dksj3hy45288lj1";
+    sha256 = "05y0qcfdyzv6cgizhbg6yl7rrlbfbkcr0jmxjlzhvhz7dypk20cl";
   };
 
   buildInputs = [ llvm makeWrapper which ];

From ac6573cf23c91d65e403d315680e3bb5ad8aaddb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 02:20:26 -0700
Subject: [PATCH 3239/3370] ndpi: 1.8 -> 2.2

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ndpi/versions.

These checks were done:

- built on NixOS
- /nix/store/0wzn4dsnqb45c38lzvhlhbc8bjqqy6ig-ndpi-2.2/bin/ndpiReader passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 2.2 with grep in /nix/store/0wzn4dsnqb45c38lzvhlhbc8bjqqy6ig-ndpi-2.2
- directory tree listing: https://gist.github.com/7144c4f9a07d41666dd0187209a7e06e
- du listing: https://gist.github.com/be818fd366b25df61d730577ad3512c9
---
 pkgs/development/libraries/ndpi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ndpi/default.nix b/pkgs/development/libraries/ndpi/default.nix
index c84cddc897c1..0fd531fa282f 100644
--- a/pkgs/development/libraries/ndpi/default.nix
+++ b/pkgs/development/libraries/ndpi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap }:
 
-let version = "1.8"; in
+let version = "2.2"; in
 
 stdenv.mkDerivation rec {
   name = "ndpi-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "ntop";
     repo = "nDPI";
     rev = "${version}";
-    sha256 = "0kxp9dv4d1nmr2cxv6zsfy2j14wyb0q6am0qyxg0npjb08p7njf4";
+    sha256 = "06gg8lhn944arlczmv5i40jkjdnl1nrvsmvm843l9ybcswpayv4m";
   };
 
   configureScript = "./autogen.sh";

From 47529594e4dbc02ab31d30df608bff0cc991b869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 8 Jun 2018 07:57:16 +0100
Subject: [PATCH 3240/3370] rustc: disable test-inherit-env

This fails on hydra on x86_64 for unknown reason.
---
 pkgs/development/compilers/rust/default.nix            |  9 ++++++++-
 .../rust/patches/disable-test-inherit-env.patch        | 10 ++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch

diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix
index e6caebe88bfe..44b43a7af542 100644
--- a/pkgs/development/compilers/rust/default.nix
+++ b/pkgs/development/compilers/rust/default.nix
@@ -16,7 +16,14 @@ in rec {
   rustc = callPackage ./rustc.nix {
     inherit stdenv llvm targets targetPatches targetToolchains rustPlatform version src;
 
-    patches = [ ./patches/net-tcp-disable-tests.patch ./patches/stdsimd-disable-doctest.patch ];
+    patches = [
+      ./patches/net-tcp-disable-tests.patch
+      ./patches/stdsimd-disable-doctest.patch
+      # Fails on hydra - not locally; the exact reason is unknown.
+      # Comments in the test suggest that some non-reproducible environment
+      # variables such $RANDOM can make it fail.
+      ./patches/disable-test-inherit-env.patch
+    ];
 
     forceBundledLLVM = true;
 
diff --git a/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch
new file mode 100644
index 000000000000..fcb75ed098ec
--- /dev/null
+++ b/pkgs/development/compilers/rust/patches/disable-test-inherit-env.patch
@@ -0,0 +1,10 @@
+--- rustc-1.26.2-src.org/src/libstd/process.rs	2018-06-01 21:40:11.000000000 +0100
++++ rustc-1.26.2-src/src/libstd/process.rs	2018-06-08 07:50:23.023828658 +0100
+@@ -1745,6 +1745,7 @@
+     }
+ 
+     #[test]
++    #[ignore]
+     fn test_inherit_env() {
+         use env;
+ 

From cf40f4cb93c81399fce16b4838e43939c1c8e890 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 03:15:51 -0700
Subject: [PATCH 3241/3370] mbedtls: 2.9.0 -> 2.10.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mbedtls/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_udp_proxy_wrapper.sh had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_aescrypt2 passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_crypt_and_hash had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_generic_sum had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_hello passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_dh_client had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_dh_genprime had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_dh_server had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ecdh_curve25519 passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ecdsa had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_gen_key had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_key_app passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_key_app_writer had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_mpi_demo passed the binary check.
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_pk_decrypt passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_pk_encrypt had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_pk_sign had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_pk_verify had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_rsa_decrypt had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_rsa_encrypt had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_rsa_genkey passed the binary check.
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_rsa_sign passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_rsa_sign_pss had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_rsa_verify had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_rsa_verify_pss had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_gen_entropy passed the binary check.
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_gen_random_ctr_drbg passed the binary check.
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_gen_random_havege passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_dtls_client had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_dtls_server had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_mini_client had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ssl_client1 had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ssl_client2 had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ssl_fork_server had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ssl_mail_client passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ssl_server had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ssl_server2 had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_benchmark passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_selftest had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_ssl_cert_test passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_udp_proxy had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_zeroize had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_pem2der passed the binary check.
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_strerror passed the binary check.
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_cert_app had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_cert_req had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_cert_write had a zero exit code or showed the expected version
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_crl_app passed the binary check.
- /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0/bin/mbedtls_req_app passed the binary check.
- 18 of 49 passed binary check by having a zero exit code.
- 0 of 49 passed binary check by having the new version present in output.
- found 2.10.0 with grep in /nix/store/q18bxf7hgbdqa9w5di6ndcf3xs28r6h5-mbedtls-2.10.0
- directory tree listing: https://gist.github.com/a14a6f7f932021b4c72aa2a56d3cafc8
- du listing: https://gist.github.com/d1d619564617178d839c99f546be2911
---
 pkgs/development/libraries/mbedtls/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 74be133b0687..ed1052ce40a0 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.9.0";
+  name = "mbedtls-2.10.0";
 
   src = fetchFromGitHub {
     owner = "ARMmbed";
     repo = "mbedtls";
     rev = name;
-    sha256 = "1pb1my8wwa757hvd06qwidkj58fa1wayf16g98q600xhya5fj3vx";
+    sha256 = "0im83kqf7a64ywxh6dnv0by3gwxww93zx5wpdqglr6xp7b8yg4xk";
   };
 
   nativeBuildInputs = [ perl ];

From 77c2ca6be2264d8068113be8182d148d13251380 Mon Sep 17 00:00:00 2001
From: Andrey Pavlov <couchemar@yandex.ru>
Date: Fri, 8 Jun 2018 13:26:43 +0300
Subject: [PATCH 3242/3370] hub: 2.3.0 -> 2.4.0

---
 .../version-management/git-and-tools/hub/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix
index 46d33d1944ca..1a6e8bc56f40 100644
--- a/pkgs/applications/version-management/git-and-tools/hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "hub-${version}";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchgit {
     url = https://github.com/github/hub.git;
     rev = "refs/tags/v${version}";
-    sha256 = "0rx5izxgjxh4jdn991x90xvgbc7nhwx15pkmmzc8rkdzf0hnas1s";
+    sha256 = "1lr6vg0zhg2air9bnzcl811g97jraxq05l3cs46wqqflwy57xpz2";
   };
 
 

From aec5eada5a5fe6b3d6f26bc2f879edd19013b934 Mon Sep 17 00:00:00 2001
From: Frank Doepper <github@woffs.de>
Date: Fri, 8 Jun 2018 12:34:59 +0200
Subject: [PATCH 3243/3370] detox: fix missing safe.tbl

---
 pkgs/tools/misc/detox/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix
index 7d17dee8b53c..874da29da4fa 100644
--- a/pkgs/tools/misc/detox/default.nix
+++ b/pkgs/tools/misc/detox/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation {
 
   hardeningDisable = [ "format" ];
 
+  postInstall = ''
+    install -m644 safe.tbl $out/share/detox/
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://detox.sourceforge.net/;
     description = "Utility designed to clean up filenames";

From ebf5de7467e11c5ee90c70b534ea3b20b158afe1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 03:43:53 -0700
Subject: [PATCH 3244/3370] lxc: 3.0.0 -> 3.0.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/lxc/versions.

These checks were done:

- built on NixOS
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-attach passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-autostart passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-cgroup passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-checkpoint passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-copy passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-config passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-console passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-create passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-destroy passed the binary check.
- Warning: no invocation of /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-device had a zero exit code or showed the expected version
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-execute passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-freeze passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-info passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-ls passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-monitor passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-snapshot passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-start passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-stop passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-top passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-unfreeze passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-unshare passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-usernsexec passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-wait passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-checkconfig passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/lxc-update-config passed the binary check.
- /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1/bin/init.lxc passed the binary check.
- 25 of 26 passed binary check by having a zero exit code.
- 20 of 26 passed binary check by having the new version present in output.
- found 3.0.1 with grep in /nix/store/x6894sbycq6n355c9nflvf51c5wl5b4a-lxc-3.0.1
- directory tree listing: https://gist.github.com/99239516868c9c02f18f88c0399aa8f1
- du listing: https://gist.github.com/60d07821cb31145506d2cba9745bbe7d
---
 pkgs/os-specific/linux/lxc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index 1b15edcc923c..491f89f3cb44 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -9,11 +9,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "lxc-${version}";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
-    sha256 = "12ldpkd17cy6fg7z1icr91cfs86jkkrsj61b6wdj0l7h4x624c32";
+    sha256 = "1nyml98k28sc5sda0260cmby4irkpnhpwgmx4yhqy10wpr4nr625";
   };
 
   nativeBuildInputs = [

From 44055018f553b6b9cde562669f24e7686873ad7c Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 11:08:14 +0000
Subject: [PATCH 3245/3370] perlPackages.DB_File: 1.831 -> 1.841

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

diff --git a/pkgs/development/perl-modules/DB_File/default.nix b/pkgs/development/perl-modules/DB_File/default.nix
index 9d189de77c4e..b34ea3873660 100644
--- a/pkgs/development/perl-modules/DB_File/default.nix
+++ b/pkgs/development/perl-modules/DB_File/default.nix
@@ -1,11 +1,11 @@
 {fetchurl, buildPerlPackage, db}:
 
 buildPerlPackage rec {
-  name = "DB_File-1.831";
+  name = "DB_File-1.841";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "0hq2vvcsa3nkb5bpcl0nkfsxhk8wyrsp3p3ara18rscrfd783hjs";
+    sha256 = "11fks42kgscpia0mxx4lc9krm7q4gv6w7m5h3m2jr3dl7viv36hn";
   };
 
   preConfigure = ''

From 02fb8fb7e3709f9e3ecce3eb7a0a3447748b784f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 11:10:15 +0000
Subject: [PATCH 3246/3370] perlPackages.CompressRawZlib: 2.074 -> 2.081

---
 pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index a136e61e5547..832cec169ba3 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, buildPerlPackage, zlib, stdenv }:
 
 buildPerlPackage rec {
-  name = "Compress-Raw-Zlib-2.074";
+  name = "Compress-Raw-Zlib-2.081";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "08bpx9v6i40n54rdcj6invlj294z20amrl8wvwf9b83aldwdwsd3";
+    sha256 = "06rsm9ahp20xfyvd3jc69sd0k8vqysryxc6apzdbn96jbcsdwmp1";
   };
 
   preConfigure = ''

From 22a74ad5f22ffa6147001110967ebdd61b128404 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 11:21:22 +0000
Subject: [PATCH 3247/3370] libvirt: 4.1.0 -> 4.4.0

---
 pkgs/development/libraries/libvirt/default.nix      | 6 +++---
 pkgs/development/python-modules/libvirt/default.nix | 4 ++--
 pkgs/top-level/perl-packages.nix                    | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 7262ca541f01..8456e395f468 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -14,19 +14,19 @@ let
   buildFromTarball = stdenv.isDarwin;
 in stdenv.mkDerivation rec {
   name = "libvirt-${version}";
-  version = "4.1.0";
+  version = "4.4.0";
 
   src =
     if buildFromTarball then
       fetchurl {
         url = "http://libvirt.org/sources/${name}.tar.xz";
-        sha256 = "0fb466mcma21hsxx3cckllbr9hhncpbwim5px1mr66iidy1a8bwa";
+        sha256 = "1djaz3b5n4ksyw6z4n4qs82g5zyxdl2gm4rsb5181bv1rdiisqs6";
       }
     else
       fetchgit {
         url = git://libvirt.org/libvirt.git;
         rev = "v${version}";
-        sha256 = "01021r7i71dw9w7ffp6ia8h70ns6bc0ps5np0hq9nipxs68finm6";
+        sha256 = "0rhas7hbisfh0aib75nsh9wspxj8pvcqagds1mp2jgfls7hfna0r";
         fetchSubmodules = true;
       };
 
diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix
index d120c38b02cb..65e8f3c7ba6c 100644
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libvirt";
-  version = "4.1.0";
+  version = "4.4.0";
 
   src = assert version == libvirt.version; fetchgit {
     url = git://libvirt.org/libvirt-python.git;
     rev = "v${version}";
-    sha256 = "0z87y6qr0ypdxfanphxl7yanisd7a0b0bwhg97kii68mig5dlw9r";
+    sha256 = "01kwwwacbq7kbsslb2ac3wwfs4r8nsv7jhn0df2mmff30izbhq34";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 647eed6f0841..a51072dd851e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -14496,17 +14496,16 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SysVirt = buildPerlPackage rec {
-    version = "4.1.0";
+  SysVirt = buildPerlModule rec {
+    version = "4.4.0";
     name = "Sys-Virt-${version}";
     src = assert version == pkgs.libvirt.version; pkgs.fetchgit {
       url = git://libvirt.org/libvirt-perl.git;
       rev = "v${version}";
-      sha256 = "0m0snv6gqh97nh1c31qvbm4sdzp49vixn7w3r69h6a5r71sn78x4";
+      sha256 = "1swlbis7mk1dk36badyibi3s467vhrjii0hhvhbsn2n0l6wa49x6";
     };
-    propagatedBuildInputs = [XMLXPath];
     nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [TestPodCoverage TimeHiRes TestPod pkgs.libvirt];
+    buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ];
     meta = {
       platforms = stdenv.lib.platforms.linux;
     };

From 179590a3146bfd9b948fdea1d23d8be096246383 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 8 Jun 2018 13:16:53 +0200
Subject: [PATCH 3248/3370] android-studio: 3.1.2.0 -> 3.1.3.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 339a1ce7c6f1..20522edc2f03 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -8,9 +8,9 @@ let
     inherit (gnome2) GConf gnome_vfs;
   };
   stableVersion = {
-    version = "3.1.2.0"; # "Android Studio 3.1.2"
-    build = "173.4720617";
-    sha256Hash = "1h9f4pkyqxkqxampi8v035czg5d4g6lp4bsrnq5mgpwhjwkr1whk";
+    version = "3.1.3.0"; # "Android Studio 3.1.3"
+    build = "173.4819257";
+    sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq";
   };
   latestVersion = {
     version = "3.2.0.15"; # "Android Studio 3.2 Canary 16"

From 7fd9a40ddeeedcd1fc935d3f5b605c372266296f Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 8 Jun 2018 13:17:57 +0200
Subject: [PATCH 3249/3370] androidStudioPackages.{dev,canary}: 3.2.0.15 ->
 3.2.0.16

---
 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 20522edc2f03..5e37ba47fa5f 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -13,9 +13,9 @@ let
     sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq";
   };
   latestVersion = {
-    version = "3.2.0.15"; # "Android Studio 3.2 Canary 16"
-    build = "181.4802120";
-    sha256Hash = "0ch9jjq58k83dpnq65xyxchyik24w3fmh2v9q3kx1s028iavmpym";
+    version = "3.2.0.16"; # "Android Studio 3.2 Canary 17"
+    build = "181.4823740";
+    sha256Hash = "04282zd28kn2a4rjsi0ikx4bc9ab668xm7cc87ga60pzyg5gmmgk";
   };
 in rec {
   # Old alias

From da07dbcd4287fe077f3a24193008a47905cca0ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 04:21:43 -0700
Subject: [PATCH 3250/3370] librealsense: 2.11.1 -> 2.12.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/librealsense/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 2.12.0 with grep in /nix/store/px6ccyxxnyw1xklds9kcw8j2zdls3ays-librealsense-2.12.0
- directory tree listing: https://gist.github.com/e1d2253d92ab8f4bd8aa06a2fd223431
- du listing: https://gist.github.com/bafbf4e97cf5ec6f4471c2fe5f3d785a
---
 pkgs/development/libraries/librealsense/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix
index 796954b356d1..b6328a7354cf 100644
--- a/pkgs/development/libraries/librealsense/default.nix
+++ b/pkgs/development/libraries/librealsense/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "librealsense-${version}";
-  version = "2.11.1";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "IntelRealSense";
     repo = "librealsense";
     rev = "v${version}";
-    sha256 = "1r27pdisg4hl4x23lrmykqfdc5agrc4pi161mhvzd1vjfkjrxbid";
+    sha256 = "1hmrp39x6c8i1l5d0hla0c8k6mf70sdyfjrlnwiqyi2p4s6phyd2";
   };
 
   buildInputs = [

From 2630b1274c78619883622f3a09c972014a5ac17b Mon Sep 17 00:00:00 2001
From: Assassinkin <iuns@outlook.fr>
Date: Fri, 8 Jun 2018 12:28:43 +0100
Subject: [PATCH 3251/3370] pythonPackages.ansiconv: init at 1.0.0

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

diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix
new file mode 100644
index 000000000000..08f93134b325
--- /dev/null
+++ b/pkgs/development/python-modules/ansiconv/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pytest }:
+
+buildPythonPackage rec {
+  pname = "ansiconv";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4";
+  };  
+
+  checkInputs = [ pytest ];
+
+  meta = with stdenv.lib; {
+    description = "A module for converting ANSI coded text and converts it to either plain text or HTML";
+    homepage = https://github.com/ansible/ansiconv;
+    license = licenses.mit;
+    maintainers = with maintainers; [ psyanticy ];
+  };
+
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 031746346b9f..18fdc2f79b2a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -203,6 +203,8 @@ in {
 
   amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { };
 
+  ansiconv = callPackage ../development/python-modules/ansiconv { };
+
   backports_csv = callPackage ../development/python-modules/backports_csv {};
 
   bap = callPackage ../development/python-modules/bap {

From 7731c3aea2a2b5995fb8de6586f425aec82b0d69 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 11:34:30 +0000
Subject: [PATCH 3252/3370] perlPackages.BerkeleyDB: 0.54 -> 0.55

---
 pkgs/development/perl-modules/BerkeleyDB/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/BerkeleyDB/default.nix b/pkgs/development/perl-modules/BerkeleyDB/default.nix
index 72e27ab9a0dd..4566c04fcb6a 100644
--- a/pkgs/development/perl-modules/BerkeleyDB/default.nix
+++ b/pkgs/development/perl-modules/BerkeleyDB/default.nix
@@ -1,11 +1,11 @@
 {buildPerlPackage, fetchurl, db}:
 
 buildPerlPackage rec {
-  name = "BerkeleyDB-0.54";
-  
+  name = "BerkeleyDB-0.55";
+
   src = fetchurl {
     url = "mirror://cpan/authors/id/P/PM/PMQS/${name}.tar.gz";
-    sha256 = "010e66d0034b93a8397c600da320611149aef7861eaf1f93b95e49ae37b825b8";
+    sha256 = "0kz40wqr7qwag43qnmkpri03cjnqwzb0kj0vc9aw9yz2qx0y2a3g";
   };
 
   preConfigure = ''

From 4110c1bdaf3e3760b7fabc6735a58b7abfd70c62 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 11:42:09 +0000
Subject: [PATCH 3253/3370] perlPackages.ListBinarySearch: 0.20 -> 0.25

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 647eed6f0841..c245c29a8e4a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8598,11 +8598,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  ListBinarySearch = pkgs.buildPerlPackage {
-    name = "List-BinarySearch-0.20";
+  ListBinarySearch = buildPerlPackage {
+    name = "List-BinarySearch-0.25";
     src = pkgs.fetchurl {
-      url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.20.tar.gz;
-      sha256 = "1piyl65m38bwqaap13wkgs033wiwb6m5zmr5va86ya4696cir7wd";
+      url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.25.tar.gz;
+      sha256 = "0ap8y9rsjxg75887klgij90mf459f8dwy0dbx1g06h30pmqk04f8";
     };
   };
 

From 72f07e74f3bcac0635b880fecbd45c17938a6368 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 8 Jun 2018 13:26:05 +0200
Subject: [PATCH 3254/3370] tdesktopPackages.preview: 1.3.3 -> 1.3.4

---
 .../instant-messengers/telegram/tdesktop/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index 09723ab95c07..071f82a8cbec 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -14,7 +14,7 @@ in {
   stable = mkTelegram stableVersion;
   preview = mkTelegram (stableVersion // {
     stable = false;
-    version = "1.3.3";
-    sha256Hash = "0c5p2isakcm53n24q82glsj5c3j7drn36xx14apdxxm3aj87bcaj";
+    version = "1.3.4";
+    sha256Hash = "17xdzyl7jb5g69a2h6fyk67z7s6h2dqjg8j478px6n0br1n420wk";
   });
 }

From c7520b66702b726e12bc292d1efd56730901735d Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexandre.fmp.esteves@gmail.com>
Date: Fri, 8 Jun 2018 13:37:53 +0100
Subject: [PATCH 3255/3370] dylibbundler: init

---
 pkgs/tools/misc/dylibbundler/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/dylibbundler/default.nix

diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix
new file mode 100644
index 000000000000..c88e29bb4553
--- /dev/null
+++ b/pkgs/tools/misc/dylibbundler/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "dylibbundler";
+
+  src  = fetchFromGitHub {
+    owner  = "auriamg";
+    repo   = "/macdylibbundler";
+    rev    = "27923fbf6d1bc4d18c18e118280c4fe51fc41a80";
+    sha256 = "1mpd43hvpfp7pskfrjnd6vcmfii9v3p97q0ws50krkdvshp0bv2h";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = with stdenv.lib; {
+    description = "Small command-line program that aims to make bundling .dylibs as easy as possible";
+    homepage    = "https://github.com/auriamg/macdylibbundler";
+    license     = licenses.mit;
+    maintainers = with maintainers; [ alexfmpe ];
+    platforms   = with platforms; darwin ++ linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc29d48760b8..9f5aa1fac23b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1176,6 +1176,8 @@ with pkgs;
 
   duperemove = callPackage ../tools/filesystems/duperemove { };
 
+  dylibbundler = callPackage ../tools/misc/dylibbundler { };
+
   dynamic-colors = callPackage ../tools/misc/dynamic-colors { };
 
   dyncall = callPackage ../development/libraries/dyncall { };

From 6b27c4e149e56d9da989d46cf1d86de37ecbcef6 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 8 Jun 2018 12:55:42 +0000
Subject: [PATCH 3256/3370] pythonPackages.cython: Disable tests on i686
 (#41633)

---
 pkgs/development/python-modules/Cython/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 948f8e700acb..88709949aee4 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -20,6 +20,7 @@ let
     # now until upstream finds a workaround.
     # Upstream issue here: https://github.com/cython/cython/issues/2308
     ++ stdenv.lib.optionals stdenv.isAarch64 [ "numpy_memoryview" ]
+    ++ stdenv.lib.optionals stdenv.isi686 [ "future_division" "overflow_check_longlong" ]
   ;
 
 in buildPythonPackage rec {

From aa11c0877bf029ed8d142f430802ab42e05f4161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 8 Jun 2018 14:00:55 +0100
Subject: [PATCH 3257/3370] perlPackages.FileDesktopEntry: fix build by adding
 missing Module::Build

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c245c29a8e4a..91dec5a8ba72 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5876,6 +5876,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "d7f80d8bd303651a43dc1810c73740d38a0d2b158fb33cd3b6ca4d3a566da7cb";
     };
     propagatedBuildInputs = [ FileBaseDir ];
+    buildInputs = [ ModuleBuild ];
   };
 
   FileFindIterator = buildPerlPackage {

From 1b6dcf493661bc18f8ffd4b327f73b0d2d91aa8b Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 7 Jun 2018 09:04:45 +0000
Subject: [PATCH 3258/3370] dwarf-therapist: fix build

Update for dfc4744afd82b2d26a8df71b05ffacf05230af50.
---
 .../dwarf-fortress/dwarf-therapist/default.nix    | 15 ---------------
 .../dwarf-fortress/dwarf-therapist/wrapper.nix    |  4 ++--
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 6d96f98aec94..2e54258c4be9 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -11,24 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "0b5y7800nzydn0jcc0vglgi9mzkj8f3qhw16wd872cf5396xnag9";
   };
 
-  outputs = [ "out" "layouts" ];
   buildInputs = [ qtbase qtdeclarative ];
   nativeBuildInputs = [ texlive cmake ninja ];
 
-  configurePhase = ''
-    cmake -GNinja
-  '';
-
-  buildPhase = ''
-    ninja -j$NIX_BUILD_CORES
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ./DwarfTherapist $out/bin/DwarfTherapist
-    cp -r ./share/memory_layouts $layouts
-  '';
-
   meta = with stdenv.lib; {
     description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
     maintainers = with maintainers; [ the-kenny abbradar bendlas ];
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 6debf0bb0b2b..f9e3e468cdc0 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -18,7 +18,7 @@ in symlinkJoin {
   postBuild = ''
     # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
     # therefore uses many relative paths.
-    wrapProgram $out/bin/DwarfTherapist \
+    wrapProgram $out/bin/dwarftherapist \
       --run "cd $out/share/dwarftherapist"
 
     rm -rf $out/share/dwarftherapist/memory_layouts/linux
@@ -26,7 +26,7 @@ in symlinkJoin {
     origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8)
     patchedmd5=$(cat "${dfHashFile}" | cut -c1-8)
     substitute \
-      ${dt.layouts}/${inifile} \
+      ${dt}/share/dwarftherapist/memory_layouts/${inifile} \
       $out/share/dwarftherapist/memory_layouts/${inifile} \
       --replace "$origmd5" "$patchedmd5"
   '';

From e0e3a0770be56bf4871d7e8f630aa23368686337 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 13:19:27 +0000
Subject: [PATCH 3259/3370] perlPackages.FileDesktopEntry: 0.04 -> 0.22

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 91dec5a8ba72..978890562e05 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5865,18 +5865,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   FileDesktopEntry = buildPerlPackage rec {
-    version = "0.04";
+    version = "0.22";
     name = "File-DesktopEntry-${version}";
-    configurePhase = ''
-      preConfigure || true
-      perl Build.PL PREFIX="$out" prefix="$out"
-    '';
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
-      sha256 = "d7f80d8bd303651a43dc1810c73740d38a0d2b158fb33cd3b6ca4d3a566da7cb";
+      url = mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz;
+      sha256 = "169c01e3dae2f629767bec1a9f1cdbd6ec6d713d1501e0b2786e4dd1235635b8";
     };
-    propagatedBuildInputs = [ FileBaseDir ];
-    buildInputs = [ ModuleBuild ];
+    propagatedBuildInputs = [ FileBaseDir URI ];
   };
 
   FileFindIterator = buildPerlPackage {

From bab8aee740f539b098b6d3e7b0180e180def4345 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 06:30:20 -0700
Subject: [PATCH 3260/3370] gromacs: 2018 -> 2018.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/gromacs/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/GMXRC had a zero exit code or showed the expected version
- /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/GMXRC.bash passed the binary check.
- /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/GMXRC.zsh passed the binary check.
- Warning: no invocation of /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/GMXRC.csh had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/demux.pl had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/xplor2gmx.pl had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/gmx-completion.bash had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/gmx-completion-gmx.bash had a zero exit code or showed the expected version
- /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1/bin/gmx passed the binary check.
- 3 of 9 passed binary check by having a zero exit code.
- 0 of 9 passed binary check by having the new version present in output.
- found 2018.1 with grep in /nix/store/a0ab5ixcsgcj9pzkmysfa46dydbbzsyy-gromacs-2018.1
- directory tree listing: https://gist.github.com/4d089bde03168c17ad10db514f47d339
- du listing: https://gist.github.com/5dd10f02ed60d442ec148efcf18c7661
---
 .../science/molecular-dynamics/gromacs/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index ae21af65584c..11087846e05c 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -8,11 +8,11 @@
 
 
 stdenv.mkDerivation {
-  name = "gromacs-2018";
+  name = "gromacs-2018.1";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.tar.gz";
-    sha256 = "1sfh3wdrw07797xm86fq10r0024ym585yyrnhdh0qam596vx1dfy";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.1.tar.gz";
+    sha256 = "1k85sz0b9rmq00g58v22y9v671gsa512sjivx3n3yclr0hs36dad";
   };
 
   buildInputs = [cmake fftw]

From 48696cf4fea6e9a49f83c4487626f2522babcb0b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Fri, 8 Jun 2018 15:13:47 +0200
Subject: [PATCH 3261/3370] python.packages.astunparse: init at 1.5.0

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

diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix
new file mode 100644
index 000000000000..4c46f93b547c
--- /dev/null
+++ b/pkgs/development/python-modules/astunparse/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchPypi, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+  pname = "astunparse";
+  version =  "1.5.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1kc9lm2jvfcip3z8snj04dar5a9jh857a704m6lvcv4xclm3rpsm";
+  };
+  propagatedBuildInputs = [ six ];
+  doCheck = false; # no tests
+  meta = with stdenv.lib; {
+    description = "This is a factored out version of unparse found in the Python source distribution";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jyp ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de99a1e64d8b..7a0248a05b3b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18171,6 +18171,8 @@ EOF
 
   spectral-cube = callPackage ../development/python-modules/spectral-cube { };
 
+  astunparse = callPackage ../development/python-modules/astunparse { };
+
 });
 
 in fix' (extends overrides packages)

From 72f051a97025f85dbbb6e6b6f74a8c4ea451e3f2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Thu, 7 Jun 2018 13:29:27 +0200
Subject: [PATCH 3262/3370] python.packages.gast: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix
new file mode 100644
index 000000000000..036bed9dd792
--- /dev/null
+++ b/pkgs/development/python-modules/gast/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchPypi, buildPythonPackage, astunparse }:
+
+buildPythonPackage rec {
+  pname = "gast";
+  version =  "0.2.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c296xm1vz9x4w4inmdl0k8mnc0i9arw94si2i7pglpc461r0s3h";
+  };
+  checkInputs = [ astunparse ] ;
+  meta = with stdenv.lib; {
+    description = "GAST provides a compatibility layer between the AST of various Python versions, as produced by ast.parse from the standard ast module.";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ jyp ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a0248a05b3b..fc0ebcdc2e6f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18173,6 +18173,8 @@ EOF
 
   astunparse = callPackage ../development/python-modules/astunparse { };
 
+  gast = callPackage ../development/python-modules/gast { };
+
 });
 
 in fix' (extends overrides packages)

From 14771710733d904de3849921923a5154d1bd3367 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Thu, 7 Jun 2018 13:29:58 +0200
Subject: [PATCH 3263/3370] python.packages.tensorflow-tensorboard: 1.5.0 ->
 1.7.0

---
 .../tensorflow-tensorboard/default.nix          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
index f0b4e6f341d4..a767120ddf32 100644
--- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
+++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix
@@ -3,33 +3,34 @@
 , numpy
 , werkzeug
 , protobuf
+, grpcio
 , markdown
 , futures
 }:
 
-# tensorflow is built from a downloaded wheel, because
-# https://github.com/tensorflow/tensorboard/issues/719
-# blocks buildBazelPackage.
+# tensorflow/tensorboard is built from a downloaded wheel, because
+# https://github.com/tensorflow/tensorboard/issues/719 blocks
+# buildBazelPackage.
 
 buildPythonPackage rec {
   pname = "tensorflow-tensorboard";
-  version = "1.5.1";
+  version = "1.7.0";
   name = "${pname}-${version}";
   format = "wheel";
 
   src = fetchPypi ({
-    pname = "tensorflow_tensorboard";
+    pname = "tensorboard";
     inherit version;
     format = "wheel";
   } // (if isPy3k then {
     python = "py3";
-    sha256 = "1cydgvrr0s05xqz1v9z2wdiv60gzbs8wv9wvbflw5700a2llb63l";
+    sha256 = "1aa42rl3fkpllqch09d311gk1j281qry6nn07ywgbs6j0kwr6isc";
   } else {
     python = "py2";
-    sha256 = "0dhljddlirq6nr84zg4yrk5k69gj3x2abb6wg3crgrparb6qbya7";
+    sha256 = "1vcdkyvw22kpljmj4gxb8m1q54ry02iwvw54w8v8hmdigvc77a7k";
   }));
 
-  propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown ] ++ lib.optional (!isPy3k) futures;
+  propagatedBuildInputs = [ bleach_1_5_0 numpy werkzeug protobuf markdown grpcio ] ++ lib.optional (!isPy3k) futures;
 
   meta = with stdenv.lib; {
     description = "TensorFlow's Visualization Toolkit";

From 7d02ec9ac6e4788e5a8d679c6615d7d7f0c47e14 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Thu, 7 Jun 2018 13:30:29 +0200
Subject: [PATCH 3264/3370] python.packages.tensorflow: add missing
 dependencies

---
 pkgs/development/python-modules/tensorflow/bin.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index 9c6b84e8c7ac..785cff5b8b75 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -3,8 +3,11 @@
 , fetchurl
 , buildPythonPackage
 , isPy3k, isPy35, isPy36, pythonOlder
+, astor
+, gast
 , numpy
 , six
+, termcolor
 , protobuf
 , absl-py
 , mock
@@ -47,7 +50,7 @@ in buildPythonPackage rec {
     dls = import ./tf1.7.1-hashes.nix;
   in fetchurl dls.${key};
 
-  propagatedBuildInputs = [ numpy six protobuf absl-py ]
+  propagatedBuildInputs = [ numpy six protobuf absl-py astor gast termcolor ]
                  ++ lib.optional (!isPy3k) mock
                  ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ]
                  ++ lib.optional (pythonOlder "3.6") tensorflow-tensorboard;

From 757a58ed2f7c1195af4b7e7487d4daebd50815c6 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 13:33:57 +0000
Subject: [PATCH 3265/3370] [cpan2nix] perlPackages.GD: 2.53 -> 2.68

dependencies:
perlPackages.TestFork: init at 0.02
---
 ...d-options-passthrough-and-fontconfig.patch | 49 -------------------
 pkgs/top-level/perl-packages.nix              | 27 +++++-----
 2 files changed, 16 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch

diff --git a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch b/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch
deleted file mode 100644
index 24eab55f6eb5..000000000000
--- a/pkgs/development/perl-modules/gd-options-passthrough-and-fontconfig.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-This patch configures Getopt::Long to pass options
-so they will be available at the second GetOptions call.
-
-Also an option to specify the search path for libfontconfig
-is added.
-diff -Naur GD-2.45/Makefile.PL GD-2.45-patched/Makefile.PL
---- GD-2.45/Makefile.PL	2009-07-10 13:40:07.000000000 -0430
-+++ GD-2.45-patched/Makefile.PL	2010-11-26 22:48:52.372992578 -0430
-@@ -16,9 +16,9 @@
- my (@INC,@LIBPATH,@LIBS);
- my $AUTOCONFIG = 0;      # global set by try_to_autoconfigure() below
- 
--my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force);
-+my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$lib_fontconfig_path,$force);
- 
--use Getopt::Long;
-+use Getopt::Long qw(:config pass_through);
- GetOptions("ignore_missing_gd" => \$force);
- 
- unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) {
-@@ -49,6 +49,7 @@
- 			"lib_jpeg_path=s" => \$lib_jpeg_path,
- 			"lib_xpm_path=s"  => \$lib_xpm_path,
- 			"lib_zlib_path=s" => \$lib_zlib_path,
-+                        "lib_fontconfig_path=s" => \$lib_fontconfig_path,
- 		       );
- unless ($result) {
-   print STDERR <<END;
-@@ -64,6 +65,7 @@
-      -lib_jpeg_path path            path to libjpeg
-      -lib_xpm_path  path            path to libxpm
-      -lib_zlib_path path            path to libpng
-+     -lib_fontconfig_path path      path to libfontconfig
-      -ignore_missing_gd             Ignore missing or old libgd installations and try to compile anyway
- 
- If no options are passed on the command line.  The program will
-@@ -111,6 +113,12 @@
-     @INC     = ("-I$lib_zlib_path/include", @INC);
-     @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH); 
- }
-+if( defined($lib_fontconfig_path) ) 
-+{
-+    print "Fontconfig library used from:     $lib_fontconfig_path\n";
-+    @INC     = ("-I$lib_fontconfig_path/include", @INC);
-+    @LIBPATH = ("-L$lib_fontconfig_path/lib", @LIBPATH); 
-+}
- #############################################################################################
- 
- if ($^O eq 'VMS'){
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 978890562e05..8990bac4d110 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6449,24 +6449,17 @@ let self = _self // overrides; _self = with self; {
   };
 
   GD = buildPerlPackage rec {
-    name = "GD-2.53";
+    name = "GD-2.68";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz";
-      sha256 = "1ampz82kf0ixybncfgpvq2bp9nq5sjsmmw4c8srsv0g5jpz02pfh";
+      url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.68.tar.gz;
+      sha256 = "0p2ya641nl5cvcqgw829xgabh835qijfd6vq2ba12862946xx8va";
     };
 
-    buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ];
-
-    # Patch needed to get arguments past the first GetOptions call
-    # and to specify libfontconfig search path.
-    # Patch has been sent upstream.
-    patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ];
+    buildInputs = [ pkgs.gd pkgs.libjpeg pkgs.zlib pkgs.freetype pkgs.libpng pkgs.fontconfig pkgs.xorg.libXpm ExtUtilsPkgConfig TestFork ];
 
     # otherwise "cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]"
     hardeningDisable = [ "format" ];
 
-    doCheck = false; # fails 1 out of 13 tests
-
     makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}";
   };
 
@@ -15303,6 +15296,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  TestFork = buildPerlModule rec {
+    name = "Test-Fork-0.02";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz;
+      sha256 = "0gnh8m81fdrwmzy1fix12grfq7sf7nn0gbf24zlap1gq4kxzpzpw";
+    };
+    meta = {
+      description = "test code which forks";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
   TestHarness = buildPerlPackage {
     name = "Test-Harness-3.42";
     src = fetchurl {

From 85fc222296b435d07d264967a8733d7821481837 Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 13:48:50 +0000
Subject: [PATCH 3266/3370] perlPackages.DBDmysql: 4.041 -> 4.046

---
 pkgs/development/perl-modules/DBD-mysql/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-mysql/default.nix b/pkgs/development/perl-modules/DBD-mysql/default.nix
index 12ddcf166e25..2191c233d455 100644
--- a/pkgs/development/perl-modules/DBD-mysql/default.nix
+++ b/pkgs/development/perl-modules/DBD-mysql/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, buildPerlPackage, DBI, mysql }:
 
 buildPerlPackage rec {
-  name = "DBD-mysql-4.041";
+  name = "DBD-mysql-4.046";
 
   src = fetchurl {
-    url = "mirror://cpan/authors/id/M/MI/MICHIELB/${name}.tar.gz";
-    sha256 = "0h4h6zwzj8fwh9ljb8svnsa0a3ch4p10hp59kpdibdb4qh8xwxs7";
+    url = "mirror://cpan/authors/id/C/CA/CAPTTOFU/${name}.tar.gz";
+    sha256 = "1xziv9w87cl3fbl1mqkdrx28mdqly3gs6gs1ynbmpl2rr4p6arb1";
   };
 
   buildInputs = [ mysql.connector-c ] ;

From 094efaa31d8536ced8c6a94bb1f62ed819059656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Fri, 8 Jun 2018 15:49:33 +0200
Subject: [PATCH 3267/3370] openrct2: Update homepage

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

diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index e34f29300ab4..5a35b06a1e3d 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)";
-    homepage = https://openrct2.website/;
+    homepage = https://openrct2.io/;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ geistesk ];

From a0b7475e2326aada00033fa21e9860e6ecc75d64 Mon Sep 17 00:00:00 2001
From: Sorixelle <38685302+Sorixelle@users.noreply.github.com>
Date: Fri, 8 Jun 2018 23:56:12 +1000
Subject: [PATCH 3268/3370] jetbrainsjdk: 152b1136.20 -> 152b1248.6

---
 pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 5ffb7b92b26a..1c62f79f907b 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -7,13 +7,13 @@
 
 let drv = stdenv.mkDerivation rec {
   pname = "jetbrainsjdk";
-  version = "152b1136.20";
+  version = "152b1248.6";
   name = pname + "-" + version;
 
   src = if stdenv.system == "x86_64-linux" then
     fetchurl {
       url = "https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbsdk8u${version}_linux_x64.tar.gz";
-      sha256 = "0sqr8f3z062kwcxh3dxnan45ldas438blbc69z0pypbhc8c2sk2b";
+      sha256 = "12l81g8zhaymh4rzyfl9nyzmpkgzc7wrphm3j4plxx129yn9i7d7";
     }
   else
     throw "unsupported system: ${stdenv.system}";

From a1b5b1a660b95da965abb9ad3d2b480b0b5f8643 Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Fri, 8 Jun 2018 10:27:40 -0400
Subject: [PATCH 3269/3370] xcode: update Xcode URL

Apple has changed this location. Now the url should look like:

https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_8.2/Xcode_8.2.xip
---
 pkgs/os-specific/darwin/xcode/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 4cfc0874fcd0..46f6f03b90a7 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -17,7 +17,7 @@ let requireXcode = version: sha256:
             '';
     app = requireFile rec {
       name     = "Xcode.app";
-      url      = "https://download.developer.apple.com/Developer_Tools/Xcode_" + version + "/" + xip;
+      url      = "https://developer.apple.com/services-account/download?path=/Developer_Tools/Xcode_${version}/${xip}";
       hashMode = "recursive";
       inherit sha256;
       message  = ''

From 43a62b66d0175b10fd3cc6f1fabdec9d205c171c Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Fri, 8 Jun 2018 16:32:53 +0200
Subject: [PATCH 3270/3370] ihaskell: Do not unset $PATH in the wrapper

---
 pkgs/development/tools/haskell/ihaskell/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
index 73050280f17e..0f42a5e34903 100644
--- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix
+++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix
@@ -9,7 +9,7 @@ let
   ihaskellSh = writeScriptBin "ihaskell-notebook" ''
     #! ${stdenv.shell}
     export GHC_PACKAGE_PATH="$(echo ${ihaskellEnv}/lib/*/package.conf.d| tr ' ' ':'):$GHC_PACKAGE_PATH"
-    export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}"
+    export PATH="${stdenv.lib.makeBinPath ([ ihaskellEnv jupyter ])}\${PATH:+':'}$PATH"
     ${ihaskellEnv}/bin/ihaskell install -l $(${ihaskellEnv}/bin/ghc --print-libdir) && ${jupyter}/bin/jupyter notebook
   '';
 in

From 502472511898bb06b77d544c0ff4fefa5089072a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 8 Jun 2018 15:36:35 +0100
Subject: [PATCH 3271/3370] wireguard: fix checksum

---
 pkgs/tools/networking/wireguard-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix
index ecc522f97af0..276d7066c561 100644
--- a/pkgs/tools/networking/wireguard-tools/default.nix
+++ b/pkgs/tools/networking/wireguard-tools/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${version}.tar.xz";
-    sha256 = "ff653095cc0e4c491ab6cd095ddf5d1db207f48f947fb92873a73220363f423c";
+    sha256 = "0944zxmpx2cs71nxl7rcyhpqlwplkzd7jsf1n66vflngw2sjxm03";
   };
 
   sourceRoot = "source/src/tools";

From 67af5ba643c708397b76ffc1bf8033bed04f0783 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 08:06:37 -0700
Subject: [PATCH 3272/3370] grml-zsh-config: 0.14.3 -> 0.15.0

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/grml-zsh-config/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- directory tree listing: https://gist.github.com/f301ffb4e2c7eb9a9e2a03bc7291a958
- du listing: https://gist.github.com/810ea8b2fb0bfc9f2bd5eee5e90fce2a
---
 pkgs/shells/zsh/grml-zsh-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
index e516393a23ca..1c5535ba1c69 100644
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "grml-zsh-config-${version}";
-  version = "0.14.3";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "grml";
     repo = "grml-etc-core";
     rev = "v${version}";
-    sha256 = "1akx6lwxnbcccddzw41rci8rb9n5vb6q2vpn5qr07f0grchyiifk";
+    sha256 = "0a39m7rlf30r0ja56mmhidqbalck8f5gkmgngcvkxy3n486xxmkm";
   };
 
   buildInputs = [ zsh coreutils txt2tags procps ]

From 7c59058a2a74165a5f6fc68c1993edd29a4df21d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 8 Jun 2018 18:16:20 +0200
Subject: [PATCH 3273/3370] i3lock-pixeled: github -> gitlab

Additionally `pkgs` has been removed which makes possible overrides
*way* easier.
---
 .../screensavers/i3lock-pixeled/default.nix   | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
index 5fff7b8f0ea3..de6114897318 100644
--- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix
+++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, pkgs, fetchurl }:
+{ stdenv, i3lock, imagemagick, scrot, playerctl, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
   name = "i3lock-pixeled-${version}";
   version = "1.2.0";
 
-  src = fetchurl {
-    url = "https://github.com/Ma27/i3lock-pixeled/archive/${version}.tar.gz";
-    sha256 = "0vlynm833fk1mmdnkcgh4hwqmfypn22zskhysm110k39zvikif0h";
+  src = fetchFromGitLab {
+    owner = "Ma27";
+    repo = "i3lock-pixeled";
+    rev = version;
+    sha256 = "0pysx9sv4i3nnjvpqkrxkxaqja2a2dw5f2r1bzjcgg3c3c5qv74b";
   };
 
-  propagatedBuildInputs = with pkgs; [
+  propagatedBuildInputs = [
     i3lock
     imagemagick
     scrot
@@ -22,15 +24,15 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace i3lock-pixeled \
-       --replace i3lock    "${pkgs.i3lock}/bin/i3lock" \
-       --replace convert   "${pkgs.imagemagick}/bin/convert" \
-       --replace scrot     "${pkgs.scrot}/bin/scrot" \
-       --replace playerctl "${pkgs.playerctl}/bin/playerctl"
+       --replace i3lock    "${i3lock}/bin/i3lock" \
+       --replace convert   "${imagemagick}/bin/convert" \
+       --replace scrot     "${scrot}/bin/scrot" \
+       --replace playerctl "${playerctl}/bin/playerctl"
   '';
 
   meta = with stdenv.lib; {
     description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active.";
-    homepage = https://github.com/Ma27/i3lock-pixeled;
+    homepage = https://gitlab.com/Ma27/i3lock-pixeled;
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [ ma27 ];

From 7dbd9a63784ab77800a75757043b07838cccaa30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 8 Jun 2018 13:57:04 +0200
Subject: [PATCH 3274/3370] lttng-modules: use kernel.moduleBuildDependencies

Instead of explicitly depending on libelf, use
kernel.moduleBuildDependencies which was introduced in 1e77d0b975ad
("kernel 4.14 require libelf to compile modules.").
---
 pkgs/os-specific/linux/lttng-modules/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index 413ac3efbe54..d4b3f374c5bc 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, kernel, libelf }:
+{ stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation rec {
   pname = "lttng-modules-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "07rs01zwr4bmjamplix5qz1c6mb6wdawb68vyn0w6wx68ppbpnxq";
   };
 
-  buildInputs = [ libelf ];
+  buildInputs = kernel.moduleBuildDependencies;
 
   hardeningDisable = [ "pic" ];
 

From a2f8e9443939594d8321498661d7141955fb68cb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 09:41:56 -0700
Subject: [PATCH 3275/3370] eid-mw: 4.4.1 -> 4.4.2 (#41571)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/eid-mw/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/eid-viewer had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/.eid-viewer-wrapped had a zero exit code or showed the expected version
- /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/beid-update-nssdb passed the binary check.
- /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2/bin/eid-nssdb passed the binary check.
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 4.4.2 with grep in /nix/store/fb82i287dxzdi7iymk84yyvrx5ph4x41-eid-mw-4.4.2
- directory tree listing: https://gist.github.com/9bc7e47978cdc6d1c57b60a0cdf06ffc
- du listing: https://gist.github.com/8f3d2be711226cec456c9d62c6e114d6
---
 pkgs/tools/security/eid-mw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index eb8861486747..53ce183d4afb 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.4.1";
+  version = "4.4.2";
 
   src = fetchFromGitHub {
-    sha256 = "0an7xgj5rzl75kq6qfrmm886v639hhlh7c9yfs8iihc47wghpma8"; 
+    sha256 = "0jsa1jl51kz8i8dpi3664a7y3bhypr3ipk1srzxfkk6aph4a5cdf"; 
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

From b854b831546b8351bd7b08752a99d0c81e387ace Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 8 Jun 2018 16:49:34 +0000
Subject: [PATCH 3276/3370] perlPackages.JSON: 2.90 -> 2.97001 (#41712)

update to match JSON::PP version
---
 pkgs/top-level/perl-packages.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8990bac4d110..cd83258b179c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8153,25 +8153,16 @@ let self = _self // overrides; _self = with self; {
      };
   };
 
-
   JSON = buildPerlPackage {
-    name = "JSON-2.90";
+    name = "JSON-2.97001";
     src = fetchurl {
-      url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.90.tar.gz;
-      sha256 = "127yppvr17qik9pkd1vy901hs4l13kg6rhp76jdgcyask35v7nsd";
+      url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-2.97001.tar.gz;
+      sha256 = "0nlgdzy40q26z8qhwngsd461glyai8dpwaccyhiljmrkaqwdjxz2";
     };
-    preConfigure = ''
-      cp lib/JSON/backportPP.pm{,orig}
-      echo "1;" > lib/JSON/backportPP.pm
-    '';
-    postConfigure = ''
-      cp lib/JSON/backportPP.pm{orig,}
-    '';
     meta = {
       description = "JSON (JavaScript Object Notation) encoder/decoder";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
     };
-    doCheck = false;
   };
 
   JSONAny = buildPerlPackage {

From 2b4653461c7a4736ff72592d9903b3b3fddd1bb4 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 8 Jun 2018 16:57:28 +0000
Subject: [PATCH 3277/3370] perlPackages.UnicodeString: 2.09 -> 2.10 (#41698)

* perlPackages.UnicodeString: 2.09 -> 2.10

* perlPackages.UnicodeString: fix url
---
 .../perl-modules/Unicode-String-perl-5-22.patch       | 11 -----------
 pkgs/top-level/perl-packages.nix                      |  9 +++------
 2 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/perl-modules/Unicode-String-perl-5-22.patch

diff --git a/pkgs/development/perl-modules/Unicode-String-perl-5-22.patch b/pkgs/development/perl-modules/Unicode-String-perl-5-22.patch
deleted file mode 100644
index 08d0d13b41f0..000000000000
--- a/pkgs/development/perl-modules/Unicode-String-perl-5-22.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru libunicode-string-perl-2.09.pristine/lib/Unicode/CharName.pm libunicode-string-perl-2.09/lib/Unicode/CharName.pm
---- libunicode-string-perl-2.09.pristine/lib/Unicode/CharName.pm	2005-10-25 19:11:00.000000000 +0100
-+++ libunicode-string-perl-2.09/lib/Unicode/CharName.pm	2012-01-24 12:56:59.730653088 +0000
-@@ -77,7 +77,7 @@
- 	    return join("", "HANGUL SYLLABLE ", @s)
- 	}
-     }
--    _init_names() unless defined %NAMES;
-+    _init_names() unless %NAMES;
-     $NAMES{sprintf("%04X",$code)}
- }
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cd83258b179c..658968f62ae6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -17240,13 +17240,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   UnicodeString = buildPerlPackage rec {
-    name = "Unicode-String-2.09";
-    patches = [
-      ../development/perl-modules/Unicode-String-perl-5-22.patch
-    ];
+    name = "Unicode-String-2.10";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/G/GA/GAAS/${name}.tar.gz";
-      sha256 = "1bgsaf3dgmlgyvi84r42ysc037mr5280amnypa4d98jfjpdvw5y8";
+      url = mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz;
+      sha256 = "0s4vp8k7ag7z9lsnnkpa9mnch83kxhp9gh7yiapld5a7rq712jl9";
     };
   };
 

From 60e4907256a481ccf3894c7e06c5ce81575cca16 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 10:01:13 -0700
Subject: [PATCH 3278/3370] graylog: 2.4.4 -> 2.4.5 (#41686)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/graylog/versions.

These checks were done:

- built on NixOS
- /nix/store/957p5ly7vbcn5rbzcsqz1fhwih4avkzh-graylog-2.4.5/bin/graylogctl passed the binary check.
- /nix/store/957p5ly7vbcn5rbzcsqz1fhwih4avkzh-graylog-2.4.5/bin/.graylogctl-wrapped passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 2.4.5 with grep in /nix/store/957p5ly7vbcn5rbzcsqz1fhwih4avkzh-graylog-2.4.5
- directory tree listing: https://gist.github.com/b91cd0e75ee5014ab3b6ef789d72127d
- du listing: https://gist.github.com/36db46a4bf59057799ab10aa9dca0f9b
---
 pkgs/tools/misc/graylog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix
index f79be961378b..60e7f273a338 100644
--- a/pkgs/tools/misc/graylog/default.nix
+++ b/pkgs/tools/misc/graylog/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre_headless }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.4";
+  version = "2.4.5";
   name = "graylog-${version}";
 
   src = fetchurl {
     url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz";
-    sha256 = "0wiqwwsy306hr7zn57f5hvh8wvcc2q46x0hdlabi0n9m44wk993i";
+    sha256 = "0yb8r7f64s1m83dqw64yakxmlyn7d3kdi2rd9mpw3rnz4kqcarly";
   };
 
   dontBuild = true;

From d50e65b3465dc3add1fb7aa1e50c368ae10d4993 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 10:02:38 -0700
Subject: [PATCH 3279/3370] pynac: 0.7.19 -> 0.7.21 (#41662)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pynac/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 0.7.21 with grep in /nix/store/883yhmfc1k4vz1dd37l73v7clvnyaa3v-pynac-0.7.21
- directory tree listing: https://gist.github.com/a0f53cebb1c4cae07c81edef938ac632
- du listing: https://gist.github.com/78800724710d0766e4add7ed1847c3fc
---
 pkgs/applications/science/math/pynac/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix
index fd566abd9a9a..a3ff0d6d0f1e 100644
--- a/pkgs/applications/science/math/pynac/default.nix
+++ b/pkgs/applications/science/math/pynac/default.nix
@@ -9,14 +9,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.19";
+  version = "0.7.21";
   name = "pynac-${version}";
 
   src = fetchFromGitHub {
     owner = "pynac";
     repo = "pynac";
     rev = "pynac-${version}";
-    sha256 = "132bibvapm245c5xy29j3xmjs0pawvw7lv05374m8vv1m39127d3";
+    sha256 = "072mdziyx52y0knxjf2hs6nab36bckkanp7g6ff6qiy4fm0v8q04";
   };
 
   buildInputs = [

From 45eeb247019d6f05626ca06b9ea155fc2d8805a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 10:06:27 -0700
Subject: [PATCH 3280/3370] xmlsec: 1.2.25 -> 1.2.26 (#41655)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xmlsec/versions.

These checks were done:

- built on NixOS
- /nix/store/y5z1vxy9v75bpsjl4z3xg1l4m0d8iqg1-xmlsec-1.2.26/bin/.xmlsec1-wrapped passed the binary check.
- /nix/store/y5z1vxy9v75bpsjl4z3xg1l4m0d8iqg1-xmlsec-1.2.26/bin/xmlsec1 passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 1.2.26 with grep in /nix/store/y5z1vxy9v75bpsjl4z3xg1l4m0d8iqg1-xmlsec-1.2.26
- directory tree listing: https://gist.github.com/35b63e4ccf9a1df1b167177e91716a4e
- du listing: https://gist.github.com/d45eba60006ba229e2682ff2db682d96
---
 pkgs/development/libraries/xmlsec/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix
index 32ce856eddd3..e17ac6d15075 100644
--- a/pkgs/development/libraries/xmlsec/default.nix
+++ b/pkgs/development/libraries/xmlsec/default.nix
@@ -2,14 +2,14 @@
 , openssl, nss, makeWrapper }:
 
 let
-  version = "1.2.25";
+  version = "1.2.26";
 in
 stdenv.mkDerivation rec {
   name = "xmlsec-${version}";
 
   src = fetchurl {
     url = "http://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz";
-    sha256 = "1lpwj8dxwhha54sby0v5axjk79h56jnhjjiwiasbbk15vwzahz4n";
+    sha256 = "0l1dk344rn3j2vnj13daz72xd8j1msvzhg82n2il5ji0qz4pd0ld";
   };
 
   outputs = [ "out" "dev" ];

From 8767598d4da1cb1bc874c47dcb425e891fbbf5d9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 10:17:43 -0700
Subject: [PATCH 3281/3370] fio: 3.6 -> 3.7 (#41564)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fio/versions.

These checks were done:

- built on NixOS
- /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio passed the binary check.
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio-genzipf had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio-btrace2fio had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio-dedupe had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio-verify-state had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio_generate_plots had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio2gnuplot had a zero exit code or showed the expected version
- /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/genfio passed the binary check.
- /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fiologparser.py passed the binary check.
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fiologparser_hist.py had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7/bin/fio_jsonplus_clat2csv had a zero exit code or showed the expected version
- 3 of 11 passed binary check by having a zero exit code.
- 1 of 11 passed binary check by having the new version present in output.
- found 3.7 with grep in /nix/store/1q2bln9rv2q8sym6zvgavzqk2w8hpc1x-fio-3.7
- directory tree listing: https://gist.github.com/bd1f8351a206f7ab3391b9aaf656b1cf
- du listing: https://gist.github.com/f8ccaaf11e78def220b20bc5d0fcfa4a
---
 pkgs/tools/system/fio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index 6e63f467f600..2a5eea0b2516 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "3.6";
-  sha256 = "1dilsn6r958skq1kpknm13fdzw7whb3bqa3wwnn2j9gba28599pq";
+  version = "3.7";
+  sha256 = "1m2slyxhzyznq283m6ljjgjg38i0hxg537bwhfs12qskv00c4vsk";
 in
 
 stdenv.mkDerivation rec {

From 3f107b617ffb3d15595819ff141e1793d9e34078 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 8 Jun 2018 17:19:11 +0000
Subject: [PATCH 3282/3370] perlPackages.DBDPg: 3.5.3 -> 3.7.4 (#41677)

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

diff --git a/pkgs/development/perl-modules/DBD-Pg/default.nix b/pkgs/development/perl-modules/DBD-Pg/default.nix
index b9d287b2bf3c..f69ce015ed1c 100644
--- a/pkgs/development/perl-modules/DBD-Pg/default.nix
+++ b/pkgs/development/perl-modules/DBD-Pg/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, postgresql }:
 
 buildPerlPackage rec {
-  name = "DBD-Pg-3.5.3";
+  name = "DBD-Pg-3.7.4";
 
   src = fetchurl {
     url = "mirror://cpan/authors/id/T/TU/TURNSTEP/${name}.tar.gz";
-    sha256 = "03m9w1cd0yyrbqwkwcl92j1cpmasmm69f3hwvcrlfsi5fnwsk63y";
+    sha256 = "0gkqlvbmzbdm0g4k328nlkjdg3wrjm5i2n9jxj1i8sqxkm79rylz";
   };
 
   buildInputs = [ postgresql ];

From 276bf53ae95870eddc257a4463e4ebd66fb8fa82 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 10:22:23 -0700
Subject: [PATCH 3283/3370] dcraw: 9.27.0 -> 9.28.0 (#41716)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/dcraw/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/i7qixx7ll7p7hamiq04sjn73v2f58fjj-dcraw-9.28.0/bin/dcraw had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 9.28.0 with grep in /nix/store/i7qixx7ll7p7hamiq04sjn73v2f58fjj-dcraw-9.28.0
- directory tree listing: https://gist.github.com/6f620f3965b3cc4522f8f02eaf1115da
- du listing: https://gist.github.com/835f683cdb46fe5ac50f063aeb7d0226
---
 pkgs/tools/graphics/dcraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix
index 0223375a0884..44ad267f9d4e 100644
--- a/pkgs/tools/graphics/dcraw/default.nix
+++ b/pkgs/tools/graphics/dcraw/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }:
 
 stdenv.mkDerivation rec {
-  name = "dcraw-9.27.0";
+  name = "dcraw-9.28.0";
 
   src = fetchurl {
     url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz";
-    sha256 = "16bhk3pl5kb9ikv367szl8m92nx85rqypz5im8x3sakm357wrn61";
+    sha256 = "1fdl3xa1fbm71xzc3760rsjkvf0x5jdjrvdzyg2l9ka24vdc7418";
   };
 
   buildInputs = [ libjpeg lcms2 gettext jasper ];

From 46f03200093529374b94430039ae4013d41d5b13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 10:44:43 -0700
Subject: [PATCH 3284/3370] darktable: 2.4.3 -> 2.4.4

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/darktable/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-rs-identify had a zero exit code or showed the expected version
- /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-cltest passed the binary check.
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-cli had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-generate-cache had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-cmstest had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/darktable-chart had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-rs-identify-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-cltest-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-cli-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-generate-cache-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-cmstest-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4/bin/.darktable-chart-wrapped had a zero exit code or showed the expected version
- 1 of 14 passed binary check by having a zero exit code.
- 0 of 14 passed binary check by having the new version present in output.
- found 2.4.4 with grep in /nix/store/jgj8pvq3axhdwb75mjz3pv6a0fricl5s-darktable-2.4.4
- directory tree listing: https://gist.github.com/5bf935d4e34e2708e7c6c17628c7ee7b
- du listing: https://gist.github.com/b5ad3482552e5573dfaea42499dc0fb2
---
 pkgs/applications/graphics/darktable/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 4de49524f82f..ee35afb09237 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.4.3";
+  version = "2.4.4";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "1lq3xp7hhfhfwqrz0f2mrp3xywnpvb0nlw6lbm5cgx22s5xzri8x";
+    sha256 = "0kdhmiw4wxk2w9v2hms9yk8nl4ymdshnqyj0l07nivzzr6w20hwn";
   };
 
   nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ];

From e1d726f660eb211d5de245e76acdb51fed1eb4db Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm+bot@ryantm.com>
Date: Fri, 8 Jun 2018 10:52:53 -0700
Subject: [PATCH 3285/3370] ddcutil: 0.9.0 -> 0.9.1

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ddcutil/versions.

These checks were done:

- built on NixOS
- /nix/store/s0wznnnrk2688704nlzkplhvh8zcs7xq-ddcutil-0.9.1/bin/ddcutil passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.9.1 with grep in /nix/store/s0wznnnrk2688704nlzkplhvh8zcs7xq-ddcutil-0.9.1
- directory tree listing: https://gist.github.com/e013a05120e8a9b8e765dbfe9ada44c3
- du listing: https://gist.github.com/bb63986822a2bb627a9f6623b2570c2b
---
 pkgs/tools/misc/ddcutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index e5af0c8d7263..35c18954bf3f 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ddcutil-${version}";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "1lcn3jbhpcm6ixp24vsfnk1v0qi0fjkkf57f4grs1wg148s3jpvc";
+    sha256 = "0chs5bfw4yjnr7brhxxqydybcxdkjv4gnik2s0cvjzcj3bqnz73b";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 9da116091b2eb6bf450a20d24c8969137441b62c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 8 Jun 2018 20:26:04 +0200
Subject: [PATCH 3286/3370] nbxmpp: 0.6.5 -> 0.6.6

Upstream changes:

  * Record all SSL errors instead of only the first
  * Pass arguments to plugin/plugout methods
  * Allow the Roster to be initalized without requesting it from the
    server

Tested by building and running Gajim 1.0.3.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @abbradar
---
 pkgs/development/python-modules/nbxmpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index cb7635522621..e45c69aa3954 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "0.6.5";
+  version = "0.6.6";
   name = "${pname}-${version}";
 
   # Tests aren't included in PyPI tarball.
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     name = "${name}.tar.bz2";
     url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
         + "ref=${name}";
-    sha256 = "0b7jw07s4mnp20gcg8raw4bhw2h1hxf75cbn4f2ynj69fbpfr38h";
+    sha256 = "10n7z613p00q15dplsvdrz11s9yq26jy2qack6nd8k7fivfhlcmz";
   };
 
   propagatedBuildInputs = [ pyopenssl ];

From a7e9fabd7b3d11dd19b10f77599b66a4be74a523 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Fri, 8 Jun 2018 20:32:20 +0200
Subject: [PATCH 3287/3370] gajim: 1.0.2 -> 1.0.3

Upstream changes:

  * 8296 Fix errors on roster updates after stream management resume
  * 9106 Convert font weight from pango to css values
  * 9124 Bring ChatControl to front when notification is clicked

  * Set no-store hint on groupchat chatstates
  * Dont show OOB uri if message body is the same
  * Add missing bybonjour dependency for Windows zeroconf

The full change log can be found at:

https://dev.gajim.org/gajim/gajim/raw/gajim-1.0.3/ChangeLog

Built and tested the package on my machine.

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @7c6f434c, @abbradar
---
 .../networking/instant-messengers/gajim/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index a1c81f3f0020..0f9cff4fd8d7 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -17,11 +17,11 @@ with lib;
 buildPythonApplication rec {
   name = "gajim-${version}";
   majorVersion = "1.0";
-  version = "${majorVersion}.2";
+  version = "${majorVersion}.3";
 
   src = fetchurl {
     url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
-    sha256 = "0wyyy3wrk7ka5xrsbafnajzf7iacg8vg3hi16pl4c5p104hdhjdw";
+    sha256 = "0ds4rqwfrpj89a489w6yih8gx5zi7qa4ffgld950fk7s0qxvcfnb";
   };
 
   postPatch = ''

From 7c34c28cfaacf9cb9fcb7b169cd6a28e4c34d8d0 Mon Sep 17 00:00:00 2001
From: Lenz Weber <mail@lenzw.de>
Date: Sat, 2 Jun 2018 00:29:33 +0200
Subject: [PATCH 3288/3370] nixos/programs.mosh: refactor

Adds programs.mosh.withUtempter (default: true).
The option enables -with-utempter for mosh, allowing it to write to
/var/run/utmp and thus making connected sessions appear in the output
of `who -a`.

For that, a guid-wrapper is required. Also, the path to the `utempter` was
hardcoded in the resulting binary until now (so it could never been found),
thus, libutempter was patched accordingly to point to
/run/wrappers/bin/utempter which at least works when the wrapper is
configured.
---
 nixos/modules/programs/mosh.nix               | 18 +++++++++++++
 .../libraries/libutempter/default.nix         |  8 +++++-
 .../libraries/libutempter/exec_path.patch     | 25 +++++++++++++++++++
 pkgs/tools/networking/mosh/default.nix        | 11 ++++----
 .../tools/networking/mosh/utempter_path.patch | 14 +++++++++++
 5 files changed, 70 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/libutempter/exec_path.patch
 create mode 100644 pkgs/tools/networking/mosh/utempter_path.patch

diff --git a/nixos/modules/programs/mosh.nix b/nixos/modules/programs/mosh.nix
index b3aa55e189a3..359fe23e0ecd 100644
--- a/nixos/modules/programs/mosh.nix
+++ b/nixos/modules/programs/mosh.nix
@@ -16,10 +16,28 @@ in
       default = false;
       type = lib.types.bool;
     };
+    withUtempter = mkOption {
+      description = ''
+        Whether to enable libutempter for mosh.
+        This is required so that mosh can write to /var/run/utmp (which can be queried with `who` to display currently connected user sessions).
+        Note, this will add a guid wrapper for the group utmp!
+      '';
+      default = true;
+      type = lib.types.bool;
+    };
   };
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [ mosh ];
     networking.firewall.allowedUDPPortRanges = [ { from = 60000; to = 61000; } ];
+    security.wrappers = mkIf cfg.withUtempter {
+      utempter = {
+        source = "${pkgs.libutempter}/lib/utempter/utempter";
+        owner = "nobody";
+        group = "utmp";
+        setuid = false;
+        setgid = true;
+      };
+    };
   };
 }
diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix
index d54c82ae7f21..f9703e3c5932 100644
--- a/pkgs/development/libraries/libutempter/default.nix
+++ b/pkgs/development/libraries/libutempter/default.nix
@@ -13,11 +13,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ glib ];
 
+  patches = [ ./exec_path.patch ];
+
   prePatch = ''
     substituteInPlace Makefile --replace 2711 0711
   '';
 
-  installFlags = [
+  makeFlags = [
     "libdir=\${out}/lib"
     "libexecdir=\${out}/lib"
     "includedir=\${out}/include"
@@ -26,6 +28,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files";
+    longDescription = ''
+      The bundled utempter binary must be able to run as a user belonging to group utmp.
+      On NixOS systems, this can be achieved by creating a setguid wrapper.
+    '';
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.msteen ];
diff --git a/pkgs/development/libraries/libutempter/exec_path.patch b/pkgs/development/libraries/libutempter/exec_path.patch
new file mode 100644
index 000000000000..bd5f56611ef9
--- /dev/null
+++ b/pkgs/development/libraries/libutempter/exec_path.patch
@@ -0,0 +1,25 @@
+diff -ur libutempter-1.1.6/iface.c libutempter-1.1.6.patched/iface.c
+--- libutempter-1.1.6/iface.c	2010-11-04 18:14:53.000000000 +0100
++++ libutempter-1.1.6.patched/iface.c	2018-06-06 15:09:11.417755549 +0200
+@@ -60,9 +60,9 @@
+ 		_exit(EXIT_FAILURE);
+ 	}
+ 
+-	execv(path, argv);
++	execvp(path, argv);
+ #ifdef	UTEMPTER_DEBUG
+-	fprintf(stderr, "libutempter: execv: %s\n", strerror(errno));
++	fprintf(stderr, "libutempter: execvp: %s\n", strerror(errno));
+ #endif
+ 
+ 	while (EACCES == errno)
+@@ -79,7 +79,7 @@
+ 		if (setgid(sgid))
+ 			break;
+ 
+-		(void) execv(path, argv);
++		(void) execvp(path, argv);
+ 		break;
+ 	}
+ 
+Only in libutempter-1.1.6.patched: result
diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index fb94b750e1d8..1a2086810724 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty
-, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion }:
+{ lib, stdenv, fetchurl, zlib, protobuf, ncurses, pkgconfig, IOTty
+, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion
+, libutempter ? null, withUtempter ? stdenv.isLinux }:
 
 stdenv.mkDerivation rec {
   name = "mosh-1.3.2";
@@ -10,15 +11,15 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl bash-completion ];
+  buildInputs = [ protobuf ncurses zlib IOTty makeWrapper perl openssl bash-completion ] ++ lib.optional withUtempter libutempter;
 
-  patches = [ ./ssh_path.patch ];
+  patches = [ ./ssh_path.patch ./utempter_path.patch ];
   postPatch = ''
     substituteInPlace scripts/mosh.pl \
         --subst-var-by ssh "${openssh}/bin/ssh"
   '';
 
-  configureFlags = [ "--enable-completion" ];
+  configureFlags = [ "--enable-completion" ] ++ lib.optional withUtempter "--with-utempter";
 
   postInstall = ''
       wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB
diff --git a/pkgs/tools/networking/mosh/utempter_path.patch b/pkgs/tools/networking/mosh/utempter_path.patch
new file mode 100644
index 000000000000..a981708ffadf
--- /dev/null
+++ b/pkgs/tools/networking/mosh/utempter_path.patch
@@ -0,0 +1,14 @@
+diff -ur mosh-1.3.2/src/frontend/mosh-server.cc mosh-1.3.2.patched/src/frontend/mosh-server.cc
+--- mosh-1.3.2/src/frontend/mosh-server.cc	2017-07-22 23:14:53.000000000 +0200
++++ mosh-1.3.2.patched/src/frontend/mosh-server.cc	2018-06-06 10:45:50.725352804 +0200
+@@ -351,6 +351,10 @@
+     }
+   }
+ 
++#ifdef HAVE_UTEMPTER
++    utempter_set_helper( "utempter" );
++#endif
++
+   try {
+     return run_server( desired_ip, desired_port, command_path, command_argv, colors, verbose, with_motd );
+   } catch ( const Network::NetworkException &e ) {

From 1fa9e7defbf570478a378edaace6bcd7a37ee8a1 Mon Sep 17 00:00:00 2001
From: James Deikun <james.deikun@obsidian.systems>
Date: Mon, 4 Jun 2018 15:22:07 -0400
Subject: [PATCH 3289/3370] fix opam tool support

---
 pkgs/development/tools/ocaml/opam/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix
index 469e97e19de5..aa9feda985a3 100644
--- a/pkgs/development/tools/ocaml/opam/default.nix
+++ b/pkgs/development/tools/ocaml/opam/default.nix
@@ -71,8 +71,12 @@ in stdenv.mkDerivation rec {
   # Dirty, but apparently ocp-build requires a TERM
   makeFlags = ["TERM=screen"];
 
+  # change argv0 to "opam" as a workaround for
+  # https://github.com/ocaml/opam/issues/2142
   postInstall = ''
-    wrapProgram $out/bin/opam \
+    mv $out/bin/opam $out/bin/.opam-wrapped
+    makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
+      --argv0 "opam" \
       --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin
   '';
 

From e1790030262d1ce4a28144363469af96a588b21d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Fri, 8 Jun 2018 22:30:24 +0200
Subject: [PATCH 3290/3370] nixos/tests; add haproxy

---
 nixos/release.nix       |  1 +
 nixos/tests/haproxy.nix | 41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 nixos/tests/haproxy.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 8777d85c5d46..fd4c40a24c89 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -300,6 +300,7 @@ in rec {
   tests.grafana = callTest tests/grafana.nix {};
   tests.graphite = callTest tests/graphite.nix {};
   tests.hardened = callTest tests/hardened.nix { };
+  tests.haproxy = callTest tests/haproxy.nix {};
   tests.hibernate = callTest tests/hibernate.nix {};
   tests.hitch = callTest tests/hitch {};
   tests.home-assistant = callTest tests/home-assistant.nix { };
diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix
new file mode 100644
index 000000000000..ce4094237db2
--- /dev/null
+++ b/nixos/tests/haproxy.nix
@@ -0,0 +1,41 @@
+import ./make-test.nix ({ pkgs, ...}: {
+  name = "haproxy";
+  nodes = {
+    machine = { config, ...}: {
+      imports = [ ../modules/profiles/minimal.nix ];
+      services.haproxy = {
+        enable = true;
+        config = ''
+          defaults
+            timeout connect 10s
+
+          backend http_server
+            mode http
+            server httpd [::1]:8000
+
+          frontend http
+            bind *:80
+            mode http
+            use_backend http_server
+        '';
+      };
+      services.httpd = {
+        enable = true;
+        documentRoot = pkgs.writeTextDir "index.txt" "We are all good!";
+        adminAddr = "notme@yourhost.local";
+        listen = [{
+          ip = "::1";
+          port = 8000;
+        }];
+      };
+    };
+  };
+  testScript = ''
+    startAll;
+    $machine->waitForUnit('multi-user.target');
+    $machine->waitForUnit('haproxy.service');
+    $machine->waitForUnit('httpd.service');
+    $machine->succeed('curl -k http://localhost:80/index.txt | grep "We are all good!"');
+
+  '';
+})

From 4c9c4c0a97c175e931ef695b8de744947b237e5f Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Mon, 4 Jun 2018 22:42:14 +0200
Subject: [PATCH 3291/3370] haproxy: fix build on darwin

---
 pkgs/tools/networking/haproxy/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index e01b62b54f1c..1690d3fcc3e3 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -23,7 +23,11 @@ stdenv.mkDerivation rec {
       url = "https://git.haproxy.org/?p=haproxy-1.8.git;a=patch;h=17514045e5d934dede62116216c1b016fe23dd06";
       sha256 = "0hzcvghg8qz45n3mrcgsjgvrvicvbvm52cc4hs5jbk1yb50qvls7";
     })
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch {
+    name = "fix-darwin-no-threads-build.patch";
+    url = "https://git.haproxy.org/?p=haproxy-1.8.git;a=patch;h=fbf09c441a4e72c4a690bc7ef25d3374767fe5c5;hp=3157ef219c493f3b01192f1b809a086a5b119a1e";
+    sha256 = "16ckzb160anf7xih7mmqy59pfz8sdywmyblxnr7lz9xix3jwk55r";
+  });
 
   buildInputs = [ openssl zlib ]
     ++ stdenv.lib.optional useLua lua5_3

From 91fe664867f7322a4a536754108eb6ec54b37f38 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 8 Jun 2018 23:27:31 +0200
Subject: [PATCH 3292/3370] haskellPackages.hnix: dont jailbreak

The jailbreak itself produces a broken cabal file, and with the current
haskellPackages hnix builds just fine.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7120d15ade7c..ad07da83c4e3 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -250,7 +250,7 @@ self: super: {
   digit = doJailbreak super.digit;
 
   # https://github.com/jwiegley/hnix/issues/98 - tied to an older deriving-compat
-  hnix = doJailbreak (overrideCabal super.hnix (old: {
+  hnix = (overrideCabal super.hnix (old: {
     patches = old.patches or [] ++ [
       # should land in hnix-5.2
       (pkgs.fetchpatch {

From 208a3ff6c01b2d90d917d809eb69438c232fb21f Mon Sep 17 00:00:00 2001
From: volth <volth@volth.com>
Date: Fri, 8 Jun 2018 21:54:37 +0000
Subject: [PATCH 3293/3370] perlPackages.DBDSQLite: 1.55_07 -> 1.58 (please
 ignore it)

---
 .../perl-modules/DBD-SQLite/default.nix       | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index 2737ad95d4b7..5b6990810b39 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -1,12 +1,11 @@
 { stdenv, fetchurl, buildPerlPackage, DBI, sqlite }:
 
 buildPerlPackage rec {
-  name = "DBD-SQLite-${version}";
-  version = "1.55_07";
+  name = "DBD-SQLite-1.58";
 
   src = fetchurl {
-    url = "https://github.com/DBD-SQLite/DBD-SQLite/archive/${version}.tar.gz";
-    sha256 = "0213a31eb7b5afc2d7b3775ca2d1717d07fc7e9ed21ae73b2513a8d54ca222d8";
+    url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.58.tar.gz;
+    sha256 = "0fqx386jgs9mmrknr7smmzapf07izgivza7x08lfm39ks2cxs83i";
   };
 
   propagatedBuildInputs = [ DBI ];
@@ -19,23 +18,10 @@ buildPerlPackage rec {
 
   makeMakerFlags = "SQLITE_INC=${sqlite.dev}/include SQLITE_LIB=${sqlite.out}/lib";
 
-  preBuild =
-    ''
-      substituteInPlace Makefile --replace -L/usr/lib ""
-    '';
-
-  postInstall =
-    ''
-      # Prevent warnings from `strip'.
-      chmod -R u+w $out
-
-      # Get rid of a pointless copy of the SQLite sources.
-      rm -rf $out/lib/perl5/site_perl/*/*/auto/share
-    '';
-
-  # Disabled because the tests can randomly fail due to timeouts
-  # (e.g. "database is locked(5) at dbdimp.c line 402 at t/07busy.t").
-  #doCheck = false;
+  postInstall = ''
+    # Get rid of a pointless copy of the SQLite sources.
+    rm -rf $out/lib/perl5/site_perl/*/*/auto/share
+  '';
 
   meta = with stdenv.lib; {
     description = "Self Contained SQLite RDBMS in a DBI Driver";

From a4083785aa9716ee3644f23f14a0f291256614b6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:27:40 -0700
Subject: [PATCH 3294/3370] xpra: 2.3 -> 2.3.1 (#41501)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/xpra/versions.

These checks were done:

- built on NixOS
- /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/xpra passed the binary check.
- Warning: no invocation of /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/xpra_Xdummy had a zero exit code or showed the expected version
- /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/xpra_udev_product_version passed the binary check.
- Warning: no invocation of /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/.xpra_browser-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/xpra_browser had a zero exit code or showed the expected version
- /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/.xpra_launcher-wrapped passed the binary check.
- /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/xpra_launcher passed the binary check.
- Warning: no invocation of /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/.xpra_signal_listener-wrapped had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/xpra_signal_listener had a zero exit code or showed the expected version
- /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/..xpra-wrapped-wrapped passed the binary check.
- /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1/bin/.xpra-wrapped passed the binary check.
- 6 of 11 passed binary check by having a zero exit code.
- 0 of 11 passed binary check by having the new version present in output.
- found 2.3.1 with grep in /nix/store/l56gn6d9mhf9w91awvnwp8xyz5n21ihq-xpra-2.3.1
- directory tree listing: https://gist.github.com/7606ce6a89a1f8d80289d7e80071283f
- du listing: https://gist.github.com/02108b6781cb898bec5d8a6033508e03
---
 pkgs/tools/X11/xpra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index f8174a03cacf..279b2e8321a4 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -12,11 +12,11 @@ let
   inherit (python2Packages) python cython buildPythonApplication;
 in buildPythonApplication rec {
   name = "xpra-${version}";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.xz";
-    sha256 = "0kq0ambpy8r7m3wxdp79cgxgnl9yfmr19lv88f617gnv0sp0aarp";
+    sha256 = "0wghjmrw77pkh6agc5rz7ynr6s8yyc68qvj9rnp0vlwa3x1fl3ry";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 3c0498518f15d7f23a2608a43b92f0d041d4a0d7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:29:20 -0700
Subject: [PATCH 3295/3370] urh: 2.0.4 -> 2.1.0 (#41500)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/urh/versions.

These checks were done:

- built on NixOS
- /nix/store/mn4bz8dm9vgkskyw0r4xnhfgwvz1vx1i-urh-2.1.0/bin/.urh-wrapped passed the binary check.
- /nix/store/mn4bz8dm9vgkskyw0r4xnhfgwvz1vx1i-urh-2.1.0/bin/urh passed the binary check.
- /nix/store/mn4bz8dm9vgkskyw0r4xnhfgwvz1vx1i-urh-2.1.0/bin/.urh_cli-wrapped passed the binary check.
- /nix/store/mn4bz8dm9vgkskyw0r4xnhfgwvz1vx1i-urh-2.1.0/bin/urh_cli passed the binary check.
- 4 of 4 passed binary check by having a zero exit code.
- 2 of 4 passed binary check by having the new version present in output.
- found 2.1.0 with grep in /nix/store/mn4bz8dm9vgkskyw0r4xnhfgwvz1vx1i-urh-2.1.0
- directory tree listing: https://gist.github.com/a3d9fe3fa0702e0f4b952663ee34adbb
- du listing: https://gist.github.com/d28e0203aeb3c009339b4497256f911a
---
 pkgs/applications/misc/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index b1966539f2c6..1a9cd2a12525 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -2,13 +2,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.0.4";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "1b796lfwasp02q1340g43z0gmza5y6jn1ga6nb22vfas0yvqpz6p";
+    sha256 = "0i01pj71p3lc1kcqj6mixax6865vbxd9k9jczi2xh4p9nmfa5m2a";
   };
 
   buildInputs = [ hackrf rtl-sdr ];

From 20f6c5c865a488f339ac47346702dd4394facaf7 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Thu, 24 May 2018 23:35:53 +0200
Subject: [PATCH 3296/3370] nixos/duplicati: add port and interface options

---
 nixos/modules/services/backup/duplicati.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix
index 9772ca4d20a7..379fde1fe038 100644
--- a/nixos/modules/services/backup/duplicati.nix
+++ b/nixos/modules/services/backup/duplicati.nix
@@ -9,6 +9,23 @@ in
   options = {
     services.duplicati = {
       enable = mkEnableOption "Duplicati";
+
+      port = mkOption {
+        default = 8200;
+        type = types.int;
+        description = ''
+          Port serving the web interface
+        '';
+      };
+
+      interface = mkOption {
+        default = "lo";
+        type = types.str;
+        description = ''
+          Listening interface for the web UI
+          Set it to "any" to listen on all available interfaces
+        '';
+      };
     };
   };
 
@@ -22,7 +39,7 @@ in
       serviceConfig = {
         User = "duplicati";
         Group = "duplicati";
-        ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=any --webservice-port=8200 --server-datafolder=/var/lib/duplicati";
+        ExecStart = "${pkgs.duplicati}/bin/duplicati-server --webservice-interface=${cfg.interface} --webservice-port=${toString cfg.port} --server-datafolder=/var/lib/duplicati";
         Restart = "on-failure";
       };
     };

From 2874e56c05a24fdf1641b42a56f6049eff6df2e0 Mon Sep 17 00:00:00 2001
From: volth <volth@webmaster.ms>
Date: Fri, 8 Jun 2018 22:38:51 +0000
Subject: [PATCH 3297/3370] nixos/sslh: add transparent proxying support
 (#41412)

[x] Support transparent proxying. This means services behind sslh (Apache, sshd and so on) will see the external IP and ports as if the external world connected directly to them.
 [x] Run sslh daemon as unprivileged user instead of root (it is not only for security, transparent proxying requires it)
 [x] Removed pidFile support (it is not compatible with running sslh daemon as unprivileged user)
 [x] listenAddress default changed from "config.networking.hostName" (which resolves to meaningless "127.0.0.1" as with current /etc/hosts production) to "0.0.0.0" (all addresses)
---
 nixos/modules/services/networking/sslh.nix | 114 +++++++++++++++++----
 1 file changed, 95 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/networking/sslh.nix b/nixos/modules/services/networking/sslh.nix
index e3d65c49fbf2..0222e8ce8b58 100644
--- a/nixos/modules/services/networking/sslh.nix
+++ b/nixos/modules/services/networking/sslh.nix
@@ -4,15 +4,14 @@ with lib;
 
 let
   cfg = config.services.sslh;
+  user = "sslh";
   configFile = pkgs.writeText "sslh.conf" ''
     verbose: ${boolToString cfg.verbose};
     foreground: true;
     inetd: false;
     numeric: false;
-    transparent: false;
+    transparent: ${boolToString cfg.transparent};
     timeout: "${toString cfg.timeout}";
-    user: "nobody";
-    pidfile: "${cfg.pidfile}";
 
     listen:
     (
@@ -50,16 +49,16 @@ in
         description = "Timeout in seconds.";
       };
 
-      pidfile = mkOption {
-        type = types.path;
-        default = "/run/sslh.pid";
-        description = "PID file path for sslh daemon.";
+      transparent = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them";
       };
 
       listenAddress = mkOption {
         type = types.str;
-        default = config.networking.hostName;
-        description = "Listening hostname.";
+        default = "0.0.0.0";
+        description = "Listening address or hostname.";
       };
 
       port = mkOption {
@@ -76,14 +75,91 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    systemd.services.sslh = {
-      description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${pkgs.sslh}/bin/sslh -F${configFile}";
-      serviceConfig.KillMode = "process";
-      serviceConfig.PIDFile = "${cfg.pidfile}";
-    };
-  };
+  config = mkMerge [
+    (mkIf cfg.enable {
+      users.users.${user} = {
+        description = "sslh daemon user";
+        isSystemUser = true;
+      };
+
+      systemd.services.sslh = {
+        description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+
+        serviceConfig = {
+          User                 = user;
+          Group                = "nogroup";
+          PermissionsStartOnly = true;
+          Restart              = "always";
+          RestartSec           = "1s";
+          ExecStart            = "${pkgs.sslh}/bin/sslh -F${configFile}";
+          KillMode             = "process";
+          AmbientCapabilities  = "CAP_NET_BIND_SERVICE CAP_NET_ADMIN CAP_SETGID CAP_SETUID";
+          PrivateTmp           = true;
+          PrivateDevices       = true;
+          ProtectSystem        = "full";
+          ProtectHome          = true;
+        };
+      };
+    })
+
+    # code from https://github.com/yrutschle/sslh#transparent-proxy-support
+    # the only difference is using iptables mark 0x2 instead of 0x1 to avoid conflicts with nixos/nat module
+    (mkIf (cfg.enable && cfg.transparent) {
+      # Set route_localnet = 1 on all interfaces so that ssl can use "localhost" as destination
+      boot.kernel.sysctl."net.ipv4.conf.default.route_localnet" = 1;
+      boot.kernel.sysctl."net.ipv4.conf.all.route_localnet"     = 1;
+
+      systemd.services.sslh = let
+        iptablesCommands = [
+          # DROP martian packets as they would have been if route_localnet was zero
+          # Note: packets not leaving the server aren't affected by this, thus sslh will still work
+          { table = "raw";    command = "PREROUTING  ! -i lo -d 127.0.0.0/8 -j DROP"; }
+          { table = "mangle"; command = "POSTROUTING ! -o lo -s 127.0.0.0/8 -j DROP"; }
+          # Mark all connections made by ssl for special treatment (here sslh is run as user ${user})
+          { table = "nat";    command = "OUTPUT -m owner --uid-owner ${user} -p tcp --tcp-flags FIN,SYN,RST,ACK SYN -j CONNMARK --set-xmark 0x02/0x0f"; }
+          # Outgoing packets that should go to sslh instead have to be rerouted, so mark them accordingly (copying over the connection mark)
+          { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; }
+        ];
+        ip6tablesCommands = [
+          { table = "raw";    command = "PREROUTING  ! -i lo -d ::1/128     -j DROP"; }
+          { table = "mangle"; command = "POSTROUTING ! -o lo -s ::1/128     -j DROP"; }
+          { table = "nat";    command = "OUTPUT -m owner --uid-owner ${user} -p tcp --tcp-flags FIN,SYN,RST,ACK SYN -j CONNMARK --set-xmark 0x02/0x0f"; }
+          { table = "mangle"; command = "OUTPUT ! -o lo -p tcp -m connmark --mark 0x02/0x0f -j CONNMARK --restore-mark --mask 0x0f"; }
+        ];
+      in {
+        path = [ pkgs.iptables pkgs.iproute pkgs.procps ];
+
+        preStart = ''
+          # Cleanup old iptables entries which might be still there
+          ${concatMapStringsSep "\n" ({table, command}: "while iptables -w -t ${table} -D ${command} 2>/dev/null; do echo; done") iptablesCommands}
+          ${concatMapStringsSep "\n" ({table, command}:       "iptables -w -t ${table} -A ${command}"                           ) iptablesCommands}
+
+          # Configure routing for those marked packets
+          ip rule  add fwmark 0x2 lookup 100
+          ip route add local 0.0.0.0/0 dev lo table 100
+
+        '' + optionalString config.networking.enableIPv6 ''
+          ${concatMapStringsSep "\n" ({table, command}: "while ip6tables -w -t ${table} -D ${command} 2>/dev/null; do echo; done") ip6tablesCommands}
+          ${concatMapStringsSep "\n" ({table, command}:       "ip6tables -w -t ${table} -A ${command}"                           ) ip6tablesCommands}
+
+          ip -6 rule  add fwmark 0x2 lookup 100
+          ip -6 route add local ::/0 dev lo table 100
+        '';
+
+        postStop = ''
+          ${concatMapStringsSep "\n" ({table, command}: "iptables -w -t ${table} -D ${command}") iptablesCommands}
+
+          ip rule  del fwmark 0x2 lookup 100
+          ip route del local 0.0.0.0/0 dev lo table 100
+        '' + optionalString config.networking.enableIPv6 ''
+          ${concatMapStringsSep "\n" ({table, command}: "ip6tables -w -t ${table} -D ${command}") ip6tablesCommands}
+
+          ip -6 rule  del fwmark 0x2 lookup 100
+          ip -6 route del local ::/0 dev lo table 100
+        '';
+      };
+    })
+  ];
 }

From 6979ed8c38710364700a45fd0091c152f8e1cc26 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:42:05 -0700
Subject: [PATCH 3298/3370] qsampler: 0.5.0 -> 0.5.1 (#41526)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/qsampler/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/wjb056clfsdy4z4f31nnr5jsm97lkrd3-qsampler-0.5.1/bin/qsampler had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.5.1 with grep in /nix/store/wjb056clfsdy4z4f31nnr5jsm97lkrd3-qsampler-0.5.1
- directory tree listing: https://gist.github.com/bb864f141bbd7bd8f3d6ced7d86fbac5
- du listing: https://gist.github.com/bdce0e9f2ef4b38440f76509b4012a26
---
 pkgs/applications/audio/qsampler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix
index 518fef0c4f5e..19255dce6b0c 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/applications/audio/qsampler/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "qsampler-${version}";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/qsampler/${name}.tar.gz";
-    sha256 = "0kn1mv31ygjjsric03pkbv7r8kg3bri9ldx2ajc9pyx0p8ggnbmc";
+    sha256 = "18j4cwmn7waih9x5b66cba2aa85spqqp507bf19ahsb5gl358yhh";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ];

From f67f46cca6ee6ccf411d765db68043c5d9d722af Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:43:02 -0700
Subject: [PATCH 3299/3370] mopidy-iris: 3.18.0 -> 3.20.0 (#41534)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/Mopidy-Iris/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 3.20.0 with grep in /nix/store/0v9g0y8ik2ywqz9yn4znad73la2g0545-Mopidy-Iris-3.20.0
- directory tree listing: https://gist.github.com/5b11f78cc0e1e8f1665c9951f6b1b9d0
- du listing: https://gist.github.com/7bd8ef1ac69ff6560db53865c6a9e322
---
 pkgs/applications/audio/mopidy/iris.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix
index eb4dce814166..dcd2d6f5f5ae 100644
--- a/pkgs/applications/audio/mopidy/iris.nix
+++ b/pkgs/applications/audio/mopidy/iris.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "Mopidy-Iris";
-  version = "3.18.0";
+  version = "3.20.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0j56pj7cqymdk22bjw33c9rz4n36k693gs3w6kg6y68as8l6qpvb";
+    sha256 = "1fva5ysik3af3x74l6059ngwsxrk9g6ml47wr5ck536k66i025ar";
   };
 
   propagatedBuildInputs = [

From 2c3575d7fe0bf4a6a501dcffbb8a5659bd4e06bb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:43:56 -0700
Subject: [PATCH 3300/3370] altcoins.parity-ui: 0.2.1 -> 0.2.5 (#41533)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/parity-ui/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/2aph1kzcjppfld8ynp0ks7r4w6ghh1ir-parity-ui-0.2.5/bin/parity-ui had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.2.5 with grep in /nix/store/2aph1kzcjppfld8ynp0ks7r4w6ghh1ir-parity-ui-0.2.5
- directory tree listing: https://gist.github.com/c69e2d05d926decf9c0435e7ed94fab9
- du listing: https://gist.github.com/8a81380e0a3c16f2804599e811b3c336
---
 pkgs/applications/altcoins/parity-ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix
index 316c1fa3701d..33e72125c6bd 100644
--- a/pkgs/applications/altcoins/parity-ui/default.nix
+++ b/pkgs/applications/altcoins/parity-ui/default.nix
@@ -6,11 +6,11 @@ uiEnv = pkgs.callPackage ./env.nix { };
 
 in stdenv.mkDerivation rec {
   name = "parity-ui-${version}";
-  version = "0.2.1";
+  version = "0.2.5";
 
   src = fetchurl {
     url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb";
-    sha256 = "08gh438mqxj2h8i9hv826bx040wmkmdgsda5grj0k81459vds31l";
+    sha256 = "1jk7ac6qqxs47hf16vhr94ix4wf51qzpm55q8h6wsx1lrgy1y3g6";
     name = "${name}.deb";
   };
 

From 7085bc9711c4ff0cb56bf3c4add5cced7ac901ad Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:44:36 -0700
Subject: [PATCH 3301/3370] powerstat: 0.02.16 -> 0.02.17 (#41531)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/powerstat/versions.

These checks were done:

- built on NixOS
- /nix/store/1q7hifi7jvv22y20h3rgp268k1p52cph-powerstat-0.02.17/bin/powerstat passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 0.02.17 with grep in /nix/store/1q7hifi7jvv22y20h3rgp268k1p52cph-powerstat-0.02.17
- directory tree listing: https://gist.github.com/899a2e562dda36e64002479fff344183
- du listing: https://gist.github.com/5ede1bb4a0659e6dbfdb8882dc2efa39
---
 pkgs/os-specific/linux/powerstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/powerstat/default.nix b/pkgs/os-specific/linux/powerstat/default.nix
index 2d4d8f8266f7..5408c4237ec4 100644
--- a/pkgs/os-specific/linux/powerstat/default.nix
+++ b/pkgs/os-specific/linux/powerstat/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "powerstat-${version}";
-  version = "0.02.16";
+  version = "0.02.17";
   src = fetchurl {
     url = "http://kernel.ubuntu.com/~cking/tarballs/powerstat/powerstat-${version}.tar.gz";
-    sha256 = "14sx37l40038sjygsnp95542fkbhhc911vd9k5rf85czmvndz29m";
+    sha256 = "1lxzrvwlf6h35i0d8v1yj1ka63i9i0yvv3adhy3pa3fl8arpvycs";
   };
   installFlags = [ "DESTDIR=$(out)" ];
   postInstall = ''

From b22c1b79943c24bb71859ac29194877a471a5160 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:45:22 -0700
Subject: [PATCH 3302/3370] pstoedit: 3.71 -> 3.73 (#41528)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/pstoedit/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/m0nhahi727p7jwnxysk68svbyxv17k8m-pstoedit-3.73/bin/pstoedit had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.73 with grep in /nix/store/m0nhahi727p7jwnxysk68svbyxv17k8m-pstoedit-3.73
- directory tree listing: https://gist.github.com/4da3ca3d5e74c32b039a23ccafc88d68
- du listing: https://gist.github.com/66649e7e80a80f79059715f8158aff56
---
 pkgs/tools/graphics/pstoedit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index a31a9848c101..623415a314b5 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "pstoedit-3.71";
+  name = "pstoedit-3.73";
 
   src = fetchurl {
     url = "mirror://sourceforge/pstoedit/${name}.tar.gz";
-    sha256 = "15dwrwjbixjqph2jmdqzi9fihwpqc1kz5jcv5phxw8wwrlicv285";
+    sha256 = "147jkgvm9n6mbkl6ndqnm9x74x5y9agbxkfwj0jrw6yxyhxx2cdd";
   };
 
   outputs = [ "out" "dev" ];

From 96af022af5d587dc3de21334c24760df8117bc26 Mon Sep 17 00:00:00 2001
From: markuskowa <markus.kowalewski@gmail.com>
Date: Sat, 9 Jun 2018 00:50:28 +0200
Subject: [PATCH 3303/3370] nixos/munge: run munge as user munge instead of
 root. (#41509)

* Added a note in release notes (incompatibilities)
* Adapt slurm test
* Change user to munge in service.munge
---
 nixos/doc/manual/release-notes/rl-1809.xml |  6 ++++++
 nixos/modules/services/security/munge.nix  | 16 +++++++++++++++-
 nixos/tests/slurm.nix                      |  1 +
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml
index ae0f35046fff..5799354c6e99 100644
--- a/nixos/doc/manual/release-notes/rl-1809.xml
+++ b/nixos/doc/manual/release-notes/rl-1809.xml
@@ -121,6 +121,12 @@ $ nix-instantiate -E '(import &lt;nixpkgsunstable&gt; {}).gitFull'
      <literal>gnucash24</literal>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <varname>services.munge</varname> now runs as user (and group) <literal>munge</literal> instead of root.
+     Make sure the key file is accessible to the daemon.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 
diff --git a/nixos/modules/services/security/munge.nix b/nixos/modules/services/security/munge.nix
index 919c2c2b0e15..5bca15833544 100644
--- a/nixos/modules/services/security/munge.nix
+++ b/nixos/modules/services/security/munge.nix
@@ -35,7 +35,15 @@ in
 
     environment.systemPackages = [ pkgs.munge ];
 
-    systemd.services.munged = { 
+    users.users.munge = {
+      description   = "Munge daemon user";
+      isSystemUser  = true;
+      group         = "munge";
+    };
+
+    users.groups.munge = {};
+
+    systemd.services.munged = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
@@ -44,14 +52,20 @@ in
       preStart = ''
         chmod 0700 ${cfg.password}
         mkdir -p /var/lib/munge -m 0711
+        chown -R munge:munge /var/lib/munge
         mkdir -p /var/log/munge -m 0700
+        chown -R munge:munge /var/log/munge
         mkdir -p /run/munge -m 0755
+        chown -R munge:munge /run/munge
       '';
 
       serviceConfig = {
         ExecStart = "${pkgs.munge}/bin/munged --syslog --key-file ${cfg.password}";
         PIDFile = "/run/munge/munged.pid";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        PermissionsStartOnly = "true";
+        User = "munge";
+        Group = "munge";
       };
 
     };
diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix
index c23d85e40020..ec67ea092874 100644
--- a/nixos/tests/slurm.nix
+++ b/nixos/tests/slurm.nix
@@ -61,6 +61,7 @@ in {
     $node->succeed("mkdir /etc/munge");
     $node->succeed("echo '${mungekey}' > /etc/munge/munge.key");
     $node->succeed("chmod 0400 /etc/munge/munge.key");
+    $node->succeed("chown munge:munge /etc/munge/munge.key");
     $node->succeed("systemctl restart munged");
   }
 

From 0c101bf6260b6d60d25d082b7d10c015607a47f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:50:51 -0700
Subject: [PATCH 3304/3370] mate.mate-themes: 3.22.16 -> 3.22.17 (#41541)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mate-themes/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 3.22.17 with grep in /nix/store/vnrs1vjrq1jjqff5872k2vyqnf5bj5iw-mate-themes-3.22.17
- directory tree listing: https://gist.github.com/7496d09132d21dac1574730a34586a9d
- du listing: https://gist.github.com/fae90128247da010e9abf4c845ceb824
---
 pkgs/desktops/mate/mate-themes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 9d82d439c825..8d6d470727dd 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-themes-${version}";
-  version = "3.22.16";
+  version = "3.22.17";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/themes/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1k8qp2arjv4vj8kyjhjgyj5h46jy0darlfh48l5h25623z1firdj";
+    sha256 = "1bf1swyrr5dkfsp1ihc0svr5nnwv22zxjwgmf6zhxl638ng9f41h";
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];

From a5950ab0f7c4765e49f55be773ca4a735cc8ad0d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:51:23 -0700
Subject: [PATCH 3305/3370] mate.mate-applets: 1.20.1 -> 1.20.2 (#41546)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mate-applets/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/ll379k2bj134fdja5l40wl49d1zzyj5v-mate-applets-1.20.2/bin/mate-cpufreq-selector had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/ll379k2bj134fdja5l40wl49d1zzyj5v-mate-applets-1.20.2/bin/.mate-cpufreq-selector-wrapped had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 1.20.2 with grep in /nix/store/ll379k2bj134fdja5l40wl49d1zzyj5v-mate-applets-1.20.2
- directory tree listing: https://gist.github.com/8917b9a2989aa781cfe8f2a3b86c8821
- du listing: https://gist.github.com/867b59527b5cda0652968142a6f9ef54
---
 pkgs/desktops/mate/mate-applets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix
index b9f9e0ece35d..f154829c4cb5 100644
--- a/pkgs/desktops/mate/mate-applets/default.nix
+++ b/pkgs/desktops/mate/mate-applets/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-applets-${version}";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "1a119g49sr7jrd8i32bw7sn2qlsg3sdiwqdb2v36bm2999j261wc";
+    sha256 = "0c860yxbphpvci281gj78ipw1rvcka4rr0bxwvg0nkpangdhj9ls";
   };
 
   nativeBuildInputs = [

From 51ea9fed192171f3a2424f0629facb3838f8bfb0 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:57:12 -0700
Subject: [PATCH 3306/3370] libpqxx: 6.2.3 -> 6.2.4 (#41547)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/libpqxx/versions.

These checks were done:

- built on NixOS
- /nix/store/d309iqn144gbq4g5dd2w2jnbqdi4ywrz-libpqxx-6.2.4/bin/pqxx-config passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 6.2.4 with grep in /nix/store/d309iqn144gbq4g5dd2w2jnbqdi4ywrz-libpqxx-6.2.4
- directory tree listing: https://gist.github.com/9ba0b82a0fae29ca1da4ffd51bf8c2e2
- du listing: https://gist.github.com/eb156369be72c9249ae90e6536eb3537
---
 pkgs/development/libraries/libpqxx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix
index f027b767db68..5c4699d26268 100644
--- a/pkgs/development/libraries/libpqxx/default.nix
+++ b/pkgs/development/libraries/libpqxx/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libpqxx-${version}";
-  version = "6.2.3";
+  version = "6.2.4";
 
   src = fetchFromGitHub {
     owner = "jtv";
     repo = "libpqxx";
     rev = version;
-    sha256 = "130mkkq46l23aaxfc2bnlf9mi3qxfn5465ziz0048bxymbxa7b58";
+    sha256 = "18fkyfa3a917ljmarf3jy8ycdhqzpc47cj87542sjpxnpaj9hy59";
   };
 
   nativeBuildInputs = [ gnused python2 ];

From ff4aeb7793f24654f3b9d3539ac64d3abf25c626 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 15:57:59 -0700
Subject: [PATCH 3307/3370] ne: 3.0.1 -> 3.1.1 (#41536)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ne/versions.

These checks were done:

- built on NixOS
- /nix/store/3fg6chzj3d06c3vgdg6nm31s8wh0rcy7-ne-3.1.1/bin/ne passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.1.1 with grep in /nix/store/3fg6chzj3d06c3vgdg6nm31s8wh0rcy7-ne-3.1.1
- directory tree listing: https://gist.github.com/42510d37e15dd038fe5cb41d40afdd1b
- du listing: https://gist.github.com/bc434bb32e50be446738c27c6e76a14e
---
 pkgs/applications/editors/ne/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix
index 7feb7f22e222..a24fb90ed9c7 100644
--- a/pkgs/applications/editors/ne/default.nix
+++ b/pkgs/applications/editors/ne/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "ne-${version}";
-  version = "3.0.1";
+  version = "3.1.1";
   src = fetchFromGitHub {
     owner = "vigna";
     repo = "ne";
     rev = version;
-    sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp";
+    sha256 = "1i4vk5r2wn4cd6sgsidzqs9s3bmb4j9cn4392izkidi0j9mm3hvg";
   };
   buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ];
   dontBuild = true;

From 7193d8653ffd94331aa90bc20e4170e895c6e7ab Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 8 Jun 2018 16:07:02 -0700
Subject: [PATCH 3308/3370] focuswriter: 1.6.12 -> 1.6.13 (#41567)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/focuswriter/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/rj9lzdc106vkfwgw7f055ki4avyjzxg2-focuswriter-1.6.13/bin/focuswriter had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.6.13 with grep in /nix/store/rj9lzdc106vkfwgw7f055ki4avyjzxg2-focuswriter-1.6.13
- directory tree listing: https://gist.github.com/db4b900533de6fbcd9a1a49a687360bb
- du listing: https://gist.github.com/4a9ea745f0fc337735be9262721a0a12
---
 pkgs/applications/editors/focuswriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index b01532ae2881..4b14b1333204 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "focuswriter-${version}";
-  version = "1.6.12";
+  version = "1.6.13";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "0vcr9dhfsdls2x493klv7w5kn08iqqfg2jwjcbz274mcnd07bpqj";
+    sha256 = "1qs9v5r88scahpyw8ndr622fdnaib9789jvl2jnkwi62zcivbf6n";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];

From 500f1a94388f817b9d2d91ffbb68cf554268c2d7 Mon Sep 17 00:00:00 2001
From: Thomas Bach <social-t+github@babibo.de>
Date: Sat, 9 Jun 2018 01:34:35 +0200
Subject: [PATCH 3309/3370] jenkins: 2.89.4 -> 2.107.3 (#41618)

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 2d534435b5f9..ebbf5023374f 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.89.4";
+  version = "2.107.3";
 
   src = fetchurl {
     url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war";
-    sha256 = "0lwv3y12r36amkr70fap5g1zfd7vv92809lh9w7178s91sikm28x";
+    sha256 = "1f4sz1dqcfypdywdwcz4byjmir7ismcpzg2hbgg6pcf5pq4yba8p";
   };
 
   buildCommand = ''

From 1305752ba01dba39cfd1dec3ed410b460af72b96 Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 9 Jun 2018 02:05:21 +0200
Subject: [PATCH 3310/3370] nixos/memcached: added simple set/get test

The test ensures that the services comes up and accepts/provides values.
---
 nixos/release.nix         |  1 +
 nixos/tests/memcached.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 nixos/tests/memcached.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 2b9c58df95bc..0fa8b22cc898 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -334,6 +334,7 @@ in rec {
   #tests.logstash = callTest tests/logstash.nix {};
   tests.mathics = callTest tests/mathics.nix {};
   tests.matrix-synapse = callTest tests/matrix-synapse.nix {};
+  tests.memcached = callTest tests/memcached.nix {};
   tests.mesos = callTest tests/mesos.nix {};
   tests.misc = callTest tests/misc.nix {};
   tests.mongodb = callTest tests/mongodb.nix {};
diff --git a/nixos/tests/memcached.nix b/nixos/tests/memcached.nix
new file mode 100644
index 000000000000..f9ef3647bd1a
--- /dev/null
+++ b/nixos/tests/memcached.nix
@@ -0,0 +1,28 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "memcached";
+
+  nodes = {
+    machine =
+      { config, pkgs, ... }:
+      {
+        imports = [ ../modules/profiles/minimal.nix ];
+        services.memcached.enable = true;
+      };
+  };
+
+  testScript = let
+    testScript = pkgs.writeScript "testScript.py" ''
+      #!${pkgs.python3.withPackages (p: [p.memcached])}/bin/python
+
+      import memcache
+      c = memcache.Client(['localhost:11211'])
+      c.set('key', 'value')
+      assert 'value' == c.get('key')
+    '';
+  in ''
+    startAll;
+    $machine->waitForUnit("memcached.service");
+    $machine->waitForOpenPort("11211");
+    $machine->succeed("${testScript}");
+  '';
+})

From deb6c6e052a7c7d255835cb50ea2d39890c817a8 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Sat, 9 Jun 2018 00:06:22 +0100
Subject: [PATCH 3311/3370] zfs: Fix "zfs-sync" for modern systemd

---
 nixos/modules/tasks/filesystems/zfs.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index c3bf897d51fd..de735e9ba11b 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -403,6 +403,9 @@ in
           nameValuePair "zfs-sync-${pool}" {
             description = "Sync ZFS pool \"${pool}\"";
             wantedBy = [ "shutdown.target" ];
+            unitConfig = {
+              DefaultDependencies = false;
+            };
             serviceConfig = {
               Type = "oneshot";
               RemainAfterExit = true;

From 6bcbd229979a99a5f589e5b05eea893c877e3561 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 9 Jun 2018 06:02:56 +0300
Subject: [PATCH 3312/3370] wireguard-go: 0.0.20180519 -> 0.0.20180531

---
 pkgs/tools/networking/wireguard-go/default.nix |  6 +++---
 pkgs/tools/networking/wireguard-go/deps.nix    | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index 37220acf8cf8..f1f43fc30cc1 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "wireguard-go-${version}";
-  version = "0.0.20180519";
+  version = "0.0.20180531";
 
-  goPackagePath = "wireguard-go";
+  goPackagePath = "git.zx2c4.com/wireguard-go";
 
   src = fetchzip {
     url = "https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-${version}.tar.xz";
-    sha256 = "0b3wpc0ccf24567fjafv1sjs3yqq1xjam3gpfp37avxqy9789nb7";
+    sha256 = "1vs11kr5a2s99v0g7079nfrfvmjfh1p2lnkj2icjyn2cb0s1vqiy";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/tools/networking/wireguard-go/deps.nix b/pkgs/tools/networking/wireguard-go/deps.nix
index 88381d5f207a..87e3d73018be 100644
--- a/pkgs/tools/networking/wireguard-go/deps.nix
+++ b/pkgs/tools/networking/wireguard-go/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev =  "1a580b3eff7814fc9b40602fd35256c63b50f491";
-      sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
+      rev =  "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9";
+      sha256 = "0vg0dfpv1wgj5imlakpma763yfd67aqbiy0fcklq3cw46qmfbzf1";
     };
   }
   {
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev =  "2491c5de3490fced2f6cff376127c667efeed857";
-      sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
+      rev =  "1e491301e022f8f977054da4c2d852decd59571f";
+      sha256 = "1wc18flnz99bip2j1gpnvr3qdp1y7wgyvawlvvc8rmd6ggf5f2yq";
     };
   }
   {
@@ -23,8 +23,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev =  "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
-      sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
+      rev =  "9527bec2660bd847c050fda93a0f0c6dee0800bb";
+      sha256 = "02kd2lnw7dnyqs0vvcpzwkv5brpgkwagqly2xs7dwmsi1vvf400p";
     };
   }
 ]
\ No newline at end of file

From 2a13dc778f3a8b05905286e9a0b660ea88d6b0c7 Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Sat, 9 Jun 2018 06:39:43 +0300
Subject: [PATCH 3313/3370] wireguard-go: assign yegortimoshenko as maintainer

---
 pkgs/tools/networking/wireguard-go/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix
index f1f43fc30cc1..62ea3d64468a 100644
--- a/pkgs/tools/networking/wireguard-go/default.nix
+++ b/pkgs/tools/networking/wireguard-go/default.nix
@@ -22,7 +22,7 @@ buildGoPackage rec {
     description = "Userspace Go implementation of WireGuard";
     homepage = https://git.zx2c4.com/wireguard-go/about/;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ kirelagin zx2c4 ];
+    maintainers = with maintainers; [ kirelagin yegortimoshenko zx2c4 ];
     platforms = platforms.darwin;
   };
 }

From 029977927586cea476cdeedcf616bbcfdd631bfa Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 9 Jun 2018 02:25:00 +0800
Subject: [PATCH 3314/3370] firefox-devedition-bin: 61.0b10 -> 61.0b12

---
 .../firefox-bin/devedition_sources.nix        | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index 82fa989a7bb3..d8d58c0fe16d 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b10";
+  version = "61.0b12";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ach/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ach/firefox-61.0b12.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "740d588bf8c76fe5404b5c85c3fe684487d66737736df0a63257f2634dc09ba57d5dcaf6ff0bd2e143fde57f40c94785f7c544de63155540459b592923cdc825";
+      sha512 = "076d627bb6fba278807793b5b41b944595626f80f5c1b92cf61d3c4be8c3c35c08139b57349ca08b2f0f23aceb7af755d94332a1e11483f03a813bda400371bd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/af/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/af/firefox-61.0b12.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "364ca986f49c9264b82a22f8eb54d23238d4cf88dee75e793a05cba1cdf9dd43d961d563dc2601133ad82745f525af9620c20f2af0b61b846c9d11e6766cbf36";
+      sha512 = "b3e0f4fef73c0714f5a8d54b21278137a83fbaed1056b4201bbfe9a227f6406d6f962f676707641ed7d9c3a3d225ed90879803d7101b84950d4fbc7d7bebf8e4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/an/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/an/firefox-61.0b12.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "071bac11250764e3d53b7254fa8f5e2d52e3ef848d540f8b1f8e1ab057b52ca3417018d2e92e86bf367d7c6c957b98acdb810677c39f1a20cb21e44f0fc00478";
+      sha512 = "10087d953477a93cc4ef842b3e54cda8e41236d1a50737538dade9eea0849698106ba25ac506d83fa3baa1773b98b1a7545b0e2c28224a6d9f55d4805e4f448d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ar/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ar/firefox-61.0b12.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "1317f10e8011304d00acbaca253aa8b6caac069878a93c11b4a81ce94ee86b13029a6610f771dfac165b4a15ccd89ebe4190abfb7db02efee4d8f97a561cb767";
+      sha512 = "aeabe46628f508010dbd51a8961ffb1fe6d8941376758e165ce3f286bcaff8764b4c38afa494875407e99d44175bcea744aad4b331f49ef2fe1828133478cf76";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/as/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/as/firefox-61.0b12.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "62178638fb5536efef88923ddd7c45ddd48f662ce33f838080ea04a4b31a12d0cdc0ea507873ca463eac17e4863ccd6a02430c7da97e2caefebbd4eb19efe842";
+      sha512 = "a2699f209952f310939ed4e605380940391f212a6649b73b0b850ba9cb575fe6b7fd56e09631658245edfc3b45f53979fbc1e522334e49607124d4b1d1091f7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ast/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ast/firefox-61.0b12.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "d8912103afa9795c9c96576e086e3ee88c12f060104a899f150ab07f1693cd11804fc1c080ba0a09137e58218ff765db854427913f8f1bc010fa9c010d721eff";
+      sha512 = "e06bd557142c7f25fc450f52c405e93e9aea03b9774054fa361a16849f46cf52919f9d09f1c7897f7c96a32825891f5677faac5994b1a8ce4ecfa03f97c8062c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/az/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/az/firefox-61.0b12.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "9ce7b890d540ca77fc2190d0d396a00b300fabf170472980d127d874898ff16588679a1467a64da671417eb59dd1594d2837f00a3977bf497242d070fbec0ae1";
+      sha512 = "496899ac014db2ec2044df67b62e4a78c4f8a65708c141bb33e0234691ef4d68c0e6338e6664d40e18f29d6892600bda71fb27083c5d23b1c492018a35b02026";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/be/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/be/firefox-61.0b12.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "45488290c37219d05c804c953f98895245c401b2fd04ccd43e8c8ae8a91c6f55108c3b9ba3ef0d2866c15bd1a8791d76a01dd69fc79b30eebf6d1628c23f4bc8";
+      sha512 = "fe3c134af6a3023d91f2ee022eea6febfeba3901af6d60492121503ea464b506942885de2a93a58c1b1302c8dadb26915695ecb6866864901f6b263ebaca8c3f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bg/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bg/firefox-61.0b12.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "24eca3ce4fbaa3f0e476478b537bbc091f2afecac4d2841a2561b91c84a8b2f3c2e73c4e4d39bd0c7394b321ce85e3155ada433c4cdb7c0e12ba24b0034d55fa";
+      sha512 = "37c2a30520cffa6374e28020cdbcb1e4fba124e42dc78d1806e6ccd973265e1d6c6f7a74a3b9510e1059b49b44198e75c7d056baf6553ecce4e522641ef8d0f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bn-BD/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bn-BD/firefox-61.0b12.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "274a9c2b0b2461aaeb8c951e8c197af5fdb0bc08ac97582940318e585fa89e9245a5424452cbd6664100e5061866242c12ba1b69b51a0764f76788ab3e65bbff";
+      sha512 = "e123698c813009b7ad982e42c7e91a43f86576d71bf4fbc0fddb092de28cd6b3f213cd1abec52bdc7c779c5385847aac3637b1a00ce2754341a736f1815f6c3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bn-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bn-IN/firefox-61.0b12.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "3b2218b908dda94ef336c4b9f567f2c1b0f880a40d32ae9a3f0633eb448932ccae425636a43cc960a00790ad640e3355dd5b4ff385669e1f8fc3c17aedf72249";
+      sha512 = "16e8d4f623e78333df9cfd72a03b30ebd54c3cb26d6583cc009b278288495f971e33183334a59931f2d00d59efc37eab51327743075cbf2c2c1c985c86d06379";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/br/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/br/firefox-61.0b12.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "81ce5b13a01746389ac8aa171d8724bef8c124c66984102cde0eed038f1b5a8da1c8ec6f67743ed8c949cbd54dc3aeff0beae09522cc9b348d17e1c96b2df354";
+      sha512 = "7c4678353845207626bb2b886a0b2dec87f0fc86c370085afefcdaf470d4d67f74f4e20631257700c309efba9d301e4092b5daa1f3b85ea691f9885c307fb3f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/bs/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/bs/firefox-61.0b12.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "b76b7c5388e7bed9c7e78c404cc73b9514e739f750308019fc34ed7f67a5dbf6455079fe54886c31d1b517b1e5877062242bd8a0eaba50e4baba2f1e6c6b31a2";
+      sha512 = "a201de963c3dfebe369f1fc8f04784e69ad06aa6402aad9853c822d43223d211732b1fada85ae3fc72b68ba14c4bacf516787880d421e81efcb1f27fad782e0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ca/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ca/firefox-61.0b12.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "6180796b52b2a1a918593e35da2732537f2d8657b48cf91541ba65c85908a4cac4c5a414ddef5a8f746bd4b8c1b7a09153be874b0bd4718979ee74dd45e61239";
+      sha512 = "d79adefe980e53658d591c1dd2b4ad6e3ebffe22a6723b23cb052a24c30e0face2bb0a7678661018ef1f47cb65ba37838bb705f1cf601f9a6c3647b34b685ebd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cak/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cak/firefox-61.0b12.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "d642f89a303414819e66ea1d2e253d053b95e4b8d89ec90d617b36ce482556e835825159181a72cbdb48c40136f2c59e0851d4609ccc55b675fe5a6d06a54ae4";
+      sha512 = "eea0c8306c265d85ae6c8f2c8a0cb9233e6798b81228c65e6afd62cbb529b57d4f43c5f00033f62b2d3eea2220dc2c6cf614d04682f82102dabceb399c0b11fa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cs/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cs/firefox-61.0b12.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "4775eb724aa03c77fd36ec1969d43e27c80b829401417d687ec369794c3235a9ba99a30501a1d2c54806f94cab054b5e763c96591568089b8a78d590453212a1";
+      sha512 = "f55e4f7e0c75ff9f6e73eacbffed28a85cc3a561f60390d42ac8ed8550cd2bbf3c4592bb8119646c246779eb102b79a6bb046498c06c0c9529e2ce559ef08248";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/cy/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/cy/firefox-61.0b12.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "8a629ae7e2c9f2376d9846d6713e049f227ba251caafde55aaeac062e738ce26c75480c730a7d4332dc63c4d3eacf240396f5c7db657e9a6dfcb45a3e6c7400f";
+      sha512 = "e431d678fccbe04769821132f5abe84778940fc0a61210ab6e3bbbdd2506530baa19ca53c75d7212726eed8ea10d226f90f314bd68ebaa0bc21f509fc932ec3a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/da/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/da/firefox-61.0b12.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "b814806fc1b7f26c2c10d973db25b159ff49834a75afa1fc6e24fcb9b08bb3899269a4383cc675dd117f9846d4a3b5e530aed3c37e8ab4b65ac21c00bf2478cb";
+      sha512 = "b4e2ea82061651644db144c56296df53d7a401f72ba999220dbfe6339e3233be65b8195709881cf3a4210c463f851fe2806b9a87a7567911c031fbb0b11e947f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/de/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/de/firefox-61.0b12.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "4caf961bf706b616cb877b713b9d199ae8f518a69a608213f1d26ee43a141ada3a4ead80595203314818adf45a21ffd5a4a92402aece9c215d85316ee1eca528";
+      sha512 = "0603e12a1f7f9f5c478abff3012f94d0124e657c327fc851010f01e5f2bf213b829d680ca1d0119a55bd4ff2475e37323cd0bd9ee656a266a6c87fbd2c159989";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/dsb/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/dsb/firefox-61.0b12.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "8b18c3e4d16f4400c10541a2c7ad31cd21cd5709e352d9db1116aceb3c0adf36e5ee69fb35a02c69e864b2d8ef8c977531df1176dc0530e3f5655609dddc7c78";
+      sha512 = "c7ed913ae77520203acdbe32069d239a3c3ab5dd03e6fcf2556909eeb9b8dd94f49405d036275481fb49f376009fcc72b6676d0380b520d8e57b70be2034b94e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/el/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/el/firefox-61.0b12.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "6796cfda6591d705c4ccfd10a082a27dad9395191bf18ca8d721fcd37c82d7769abef341b5f1e87de0e2fd73333e61480d0f70ab4e796a7e333c407cc38291b6";
+      sha512 = "7c54f4b2c905854e7deb59b18c44d8868518aceeecb340d9b287f502aa3a62e317ac7e86439915ab03eee8151fe2573946fdf10944ec271f64d3dd73b272cdf6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-GB/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-GB/firefox-61.0b12.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "48c7fb0a44b65a6e5e8a7021525a5101fbc4727c43b28d8e1167996214c4c25f933e28c14f40d6c68a4a46aafe21a7f87375eb6a191c7edd8458fe4ec726c55e";
+      sha512 = "531a49323ab069376afe6aa7d925e517a90ad9304127d8f5a7c740f0a5f09e45b9b161a1283419c02438d5099b5b6f7d61149ad988564504b00ee7b007c664e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-US/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-US/firefox-61.0b12.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "92a77caf98ad017193bd2989e9a83b59c802563503e1d84d48ab4bb6358437b31d89ea51d85ad4c97025f8db9da3245b2dfb51b76e81b11f2fa39ba859cd622b";
+      sha512 = "7b9af92e0718abebdc64a5f4c5ca1e3b26838c58f2d92a3fe189d1fc1e593815d6a7ffb5970a9d02c7172a3e8ba1dee8294337e29c43e2f2fbb2998042f26143";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/en-ZA/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/en-ZA/firefox-61.0b12.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "9a912d19b5ba481b59999f619ad0f1588bfe00adffaeda2004d600a5f1490a7013137b6a66167e0e228350265a0aef08a98b76920bae15ff4b3fee2532e3de33";
+      sha512 = "7c6f80d57f2d9ca8c98601f05290018a323c1d2103caa71f712f0006fcb0885864989f07e77a2bde4edab1ed2fcbdce22962eee7fb5917bb43eb5b73fdd41692";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/eo/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/eo/firefox-61.0b12.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "8ad7db7437357ed0041d5b08a0ebf70e35b58c0eb66105700a473a7231d560915a775e90be2be9b7e776836d01e86ae08210f454efeb7e0e99594fe53353252f";
+      sha512 = "89813e89b4cd363458113ea9fa4428b43ce978aed19d4e9236268f6ee9de8a739adf0cf3ee397548592eea74750c37195a8e189567c0fc853d9b010fe394bdd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-AR/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-AR/firefox-61.0b12.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "266d24efcaeac7a06eeefa7657ebd9a3e33f79726890cc1c8b929c7a0dab38d761ef4cbd5514444540e58b8f2718f0a4bed832985bf2ce5d2929d6c695a7de91";
+      sha512 = "4f86c38d1c056259b7d27241d805575dfcb2a71afd593c638f0c3ed3488d9a8e6c9125735378e22fe7ed47bbe61d56b743755b6331e3621733dbdadf1afbec7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-CL/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-CL/firefox-61.0b12.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "3188079a0ef7845a6157d887470d11dfa700e17f3a85012a4138529b7e21f44ed4034814338c4e231b2023131686984f86cf938ad2c437607659e971f45bc96e";
+      sha512 = "fdc42f6d6c96c24a08e0ce6a34bb2be21e314ddad090107e6640f4d761e2ed8304211f071ee6ca71aec7f3e36fe0b618b72da72a29ba12456a8a6b1b13392edc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-ES/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-ES/firefox-61.0b12.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "58979c9e00b285c61fa1ac30f0414aeedbc30185542e49615f943a1a7eec8a92be30726b090d275fe21e6bb7ed0103eb0e02e4d9043cfbb8752769ca9e20e5cd";
+      sha512 = "ad2e4d68fc63d93bba2267fda419e3e227ee07d4084673bc1942c3bf8f48a87af9b01f5639561ad302ed9f6ba325c8a4bbcbb3618bc58b8d0a6272bcdfe167fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/es-MX/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/es-MX/firefox-61.0b12.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "182fa29867ce9a6c2f7906f3b81bd5e0ba33c6b8802330d3af27ff0dab863ff95575e72f3388cbf4aa1ab5e8a10e0cbcaffa4ed4873e2f1dd3f20233a3dc316d";
+      sha512 = "700e5d01b2f130dcda65df25121d09f55fbacc52ab58e2f32fbcbe2cfbc591e6552e4157b64c4bf31b3fc02f85bec7ea9276c948a023a89987ff1a1ff4dcae33";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/et/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/et/firefox-61.0b12.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "103fdd39cad73c256a76719b9f1bfe56b0f0ce9a888b63378a56968e01321e27dffb113e9580ab96756a8a8d397560b49ba69a42887dbc9cb2ab520583ec32c1";
+      sha512 = "e576b557e08ae12aea5db28c1be4fe0d48469196c854b78c750560325f29b347b8c2600a5df97258dd0b104a888ca2fcc6d03068a8ea78b0bbecf08022b7ca5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/eu/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/eu/firefox-61.0b12.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "44f11cabfed645db051ac0e74d416de36832124cd906d5d5743317ff216fb52e9300df3653ab48daf3d5206783c97ede183bd836212774130966241ec7819a29";
+      sha512 = "6d2175348912f8b07b76c9c3750040efce9cacf3ea79a27353a2cf4ae70d6240b0b4c4d40c1c07291518da49ead715a7e8f65ef33be623365dcfd462ee237cc5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fa/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fa/firefox-61.0b12.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "c06676d1b349575ec4da0e7afe8f50bb9f5176d417d5291fbc3772176a0510f1b512d62f7f7e6377d5a886179deff4a48b4844550fb8fd1bf7d2cd110e16b916";
+      sha512 = "9c3f1e65f56421334108ac9206cbaaa4eebb761447f993037c1b6790996db9bbe19b2a75843e746e482cea4281ba571ae3874b2323efea10eba559a74f6d4e10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ff/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ff/firefox-61.0b12.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "85503ac496efc98e642a12e2c7000704424ab69e01657d1db57e2af72365517d9c403bea05cd740ef5795838bab60992d23dd6727105e1e8e9952abe4eecd97a";
+      sha512 = "bb2600a4ccba282bfcc3b26a44cfd13adc72083d333613fb17cb927358a61f505c74a727ffce5943ec1cc37239e1149874beaf404699bc49ecc17397aa578487";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fi/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fi/firefox-61.0b12.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "669c6fade9300b3918b4f72bd79984eeba9c56f8e4010c062ec733c85b201ef152543cd42dc7c448ea4035672d314ee90ead6dab0f055763f9637a0dbaaf5dc1";
+      sha512 = "b1fdd37d5a661145173594d2e5ad3add713f1843c55c20d282c6967c0a98de7d91f42ee4dfdf54b482195b3ba7ed4e94dd65667632bc75df250312aae4d1932e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fr/firefox-61.0b12.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b4de90e91c977cf7005b44926283831d4f338de06513cb09304eea1ec6ec3b7891e0fea48c48b7933ad5cf5ec571f3b36dfadc5066b9412be5b084eb705e8359";
+      sha512 = "dd04b9c12290b0e54d7aa19330e3902cb131e9e390f091674d16a857797cd106461e63ef65be71fd912e6b8979dc534c3e66c89c64a2cadc427422e9dac22ded";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/fy-NL/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/fy-NL/firefox-61.0b12.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "e37e4d7be6f4f8f66a18d17c35822ba82b68a3004c4007a0e7bebec19900d948870293586fb9d8f27b4c974bc40f7d305545d920bddd22b9e4bf592debbda23c";
+      sha512 = "6a2f60be75f6e0812f4e7defbd9f483669a4c4a4d6d59a5bc8490a35e0520ec231186c6769384c768395e27ae660820fee8fa4e9d0049715e5503d4e55431623";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ga-IE/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ga-IE/firefox-61.0b12.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "4423d01af6bafacbe8128933ea27a43cb9d93a9e22edadacbe39131bed9ebb23fb22d6bc1ec6e9ce648cd4eb6bac72d8a58afc476fb2222542a4d81d183d344b";
+      sha512 = "b61bd25b1b9010f70c2deb0cda49838d89abef4c4c1ce0d2b7334195d9871957fc0aa4a38d278ccd05171671a92ab7bb1578331481492aa0a4cc5b5ec0ea75c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gd/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gd/firefox-61.0b12.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "e19cbd917c6e3822804a5176dfe2bf345744a8f9a65e9c201fd34e610cf6fc8ca8c85a0309126025647fd0a251ca2b360e420541d83f0a66c9ee5001d46db916";
+      sha512 = "9afffdb255895026cb963ad9e24690710948decb53bc254e363cb3d96fa2aba3714748858e0d0158682678e8c4cd9cfbf6fde24f180e07ebb017b814cde43714";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gl/firefox-61.0b12.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "bea38f7c3f9d79ce5dbe1a10c118497f110acd9c346fc24d377757cf28b35676f9df2fc7902f431feec1177f67465dd6d57a349209463e39514e4962f93d108a";
+      sha512 = "65c39926daf8664a306d85936421bdae622f16a26c86cd7c8d6ba928d5cb76b3fc0e75bb7b484317d7e6f8f2b6b00d016711f70a24f271051c3ffbc7702e80c1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gn/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gn/firefox-61.0b12.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "cd21d480fac0cbd1f06896c778d8dec99f5355944f5ef976522d4d893a6b68243b858ac64ef96fd69d3699cb6bec70368268991654d4119172862a7aed99f91c";
+      sha512 = "1c605598cf858fb46b1931503019f644fe1ae0e93fdc36193fde6e9d4667926a477e1b3b51722a496e8f55fbba2ff65e6c7209a2a3bf47ec0f5106924a1184f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/gu-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/gu-IN/firefox-61.0b12.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "f2374262b10dad0c20fc0e8700df88ebdd6cfadd2075ff66172007d953012038443964fc359f6266f0c02c6bcf4050549095bb5beee26efc23731049b4faed00";
+      sha512 = "b4bea06a476fac58407a54358fb56cdaf26853f19c5f87ba90d8d8fce27d959e333abb5ded0c960ab3faefb45abda2aa54c40ab1dbb7ae2e342e1601fa89bf9b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/he/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/he/firefox-61.0b12.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "7e2f13ff348c23e3f64e18619f0c39d1bbd57edba2ee22c2c50b1c03014f658be9b7c4ad15563286f87786d87fe983e607a70c338a6e906321c0ae321c521647";
+      sha512 = "997b1e8e7fb8036bde2785ec0b1a2fd1f3cc00bfdf4d1ae1697f740bb91bb174e021e632c167d9a702d924e457e689fc90e006c05caafcf6be403859b6267ac2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hi-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hi-IN/firefox-61.0b12.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "64b1fbb4fd1def6819bc42eb55df6e88623e94028517ee57dae350c63943927e455805463b5f2afb144c3ba8387e192df2f4355755f402dfaa2dc02c2ffa6570";
+      sha512 = "f9320e510318e83a879adf34d6e94637c2d457c4f0c8ce54794b66c8ac09de2224510745a3e96b152ba652ba070cf5184bbaa3afe2af816083115863ddf3a6eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hr/firefox-61.0b12.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "2f7d0ccd6ece526b82c03aa9af1908c976fe1b8bac37c6403a9162a6fcbe0fceb9f12e40cfa9877dd57df77adb9104511b0da1efe4c81690043b7718a4dd70d2";
+      sha512 = "1097e0020b011d160bd2a1c0c20676b5188d07cd6a818ee047e83ac07b83bf89e036fd7223c6fb978f5c23eb940ceb0bf840cdee1fd46bb303fe7d40439289d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hsb/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hsb/firefox-61.0b12.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "72b9b8b82743d2d0ed4299423ca02e17d8e4d8415bbcaa9d09841bfb45889b391b15bc21dbf13ed96582253190d49ac876e1bda6c0758e9d5d0f16f815f3c036";
+      sha512 = "8c2a4f2d42fef3a3085660c2ef5186e0e2d9af585eb4dbb919b186eca8ecd391582e40e1844c3a7b8494465c1d052440f1d31c725d0a44ed9ba35ce071a2cc0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hu/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hu/firefox-61.0b12.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "59e84fb28fe39c686d648f7cfd49341f66a0823941f4d9d14f8f310f9192a2cb3bc23bb54e12415633976e82184b8350f43839cc9734ba203259b8fc0f179ae6";
+      sha512 = "b080e388ec0d6a46575668cdb0867ae34b79f6338f401d1888020bc0469d878a5e717b70744326be1bc62eca321e41df6ffd8ee2e4f740d0a1859b6b394123aa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/hy-AM/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/hy-AM/firefox-61.0b12.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "003df5c384d23d3555e9b0d92720243f9e3df290367b332d251a2c4b3832c426d4cf09d5e00eb1e738e9d155aa457c1e5e6b2b3fda4ae429d14bdef774fbe78a";
+      sha512 = "367010c05454117230802a61b6ee00838905514aac7f06af5e612bfa12dc44e1bad8b642ba24d59242ef5cfcf67cb04165bc3cf08dc5e13beb8b754b136e91bc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ia/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ia/firefox-61.0b12.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "5d0b187b3fa398785c0c4d5901eb3e9d095668a962187a396e634dc2e90c46e6c352e1ccde962f77748a8f97292b1419ab7e09c23cdfd56e3ae0f1842abf0cb8";
+      sha512 = "cb6fcf58b49ebad81329cee4a9e4f5e54cdca6506f17df16af85f3f35c328e7a5ebbe4b8419f531531c79c2efc855ea2c31ad56dd0563b299df913a4be2a413d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/id/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/id/firefox-61.0b12.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "78b44c4aacc812973258ae941ee30fb9d325af19ee2b373cd6aa746e20a940bc2989e50ed67b35f62336f30ea81d66f18d55c44b6ed169360cbcb08b609245e7";
+      sha512 = "e8de3160e004a82b38daebb44b3af2eca63c44971296e6c4eb1e3dd7b65e516a00f40b430d740bdcaa2a500917d653de02c363285f243d5db0f09ede34322160";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/is/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/is/firefox-61.0b12.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "bc0ec077b4d2f736e9644b8332563790d0baae85e90d7f02326bb9056124b4a63066d347be524288d51cd213cd92ee3ff4f8c63e88c2345f6c3c2e2789251405";
+      sha512 = "dd4aaae6eb4bba3d4383fe736061d033ee2c56914711f4d3aab00fb965404b0626b3133cb57588b51148c13b4de6f090597ac25beb28c93660723752ea313c15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/it/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/it/firefox-61.0b12.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "97516d02b2693972ca54c979990bc66405cf565e4ac6d544352a9da3cdfe9abbb1ae74ffe0b71fe71b1f0a88760ed0f7ce9cfe12f3fb3e226ed0e0ec7ed053f2";
+      sha512 = "5eef084981e138f49a12a9c188d5caf59777a8fedf905670a0151749dc964bc7be20c6ac848b29ce89ab7d51c9bad28ad51e65c2b2a80a3a82a8225c490ddeb2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ja/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ja/firefox-61.0b12.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "20fec5b84817ff92c773746364c4abb184d31db34f75c4ae8f88410180a59daff8f39d1ce865b964dbac47f2866dfba6c4b24756ccb2a693e7f0cf13100e5f06";
+      sha512 = "561590036c3c0d16e742c0877cef4f107a05ae13c9f4b030b08afc4633b64212ec359a438b0dd54d968cfe33d85c5478f8c9fd997ea0252a2869cce93cb6b6fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ka/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ka/firefox-61.0b12.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "511f05631702d1a4d8c82b848e2919cf1102d88e0965ec17b14451543b0d91e1ca542bf455cffc1013a531f6a4ff13410a082efcd996cd491daf4d6b271151dc";
+      sha512 = "5ed3e24a7762da603b0ae00ae5bade06881b69369fbe98f6ef8ba800da2d66a306fef43a830f324238558f7affad168c08499d1757ded12612cad2d808cbf908";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kab/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kab/firefox-61.0b12.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "bd3a639c0377454098b70394fe1088d971fbd8be65eecc6d5076e7450a6a5092ab09ee3459c8efb2a34430889950b480e4863938e7c2862ce28a98a393e10aa1";
+      sha512 = "0bea4f9e2547361f39bf52552ee95dadea60cdf13e462ca536e5e08c85125823e92893b1f71653a3be01d250477fde733b362e31d218c1eb7c0c28d7dbe97691";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kk/firefox-61.0b12.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "52050b3ebfe363d0fe34fe6ca27fa67f6b32f809e508e6df5c99239769ffd8d8272fa177f8187c53a45dc59533d5b54c5c9957ef177208d6f3af9316938c266f";
+      sha512 = "a7b9777cd258b64900771c9a9b0a17ca064fe5ad7704f775d5ab007146242971f16dc8fa43eafb9b6b1e595046bbe25efe3ef428d80e77889127b7d18f670140";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/km/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/km/firefox-61.0b12.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "84eec5c1740d64edf90df6ad363e6782821b665bf058b42373b5497daae22ff4ab99f4c3ac505f9254b0acf814dbcbd4588f55ea18af74cc71b1b54880f83f14";
+      sha512 = "08c45d608b04ef7e58fec76f1ff3988c701374e5f81b6c51d9cd16c829a014526c6fd358852ad68d46fac52975b0849c9ea9b60f67ca27c6608f25dd39c5e58c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/kn/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/kn/firefox-61.0b12.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "152cdfd619bf6c7f01837b7b0837d2e5ae1293d10045feaf96d8fe1dc6bfb290d4ab60ba8a2ee13eab4fde952740c67f587b010adcce5e7ef34b3b9c5e91f161";
+      sha512 = "6e37f618c5993a40bdd80d228a1d35b8b95fff02e74c62d64a01dd065b8f5e43c9dac296ec9f7d282897c1ed8463799aa4f58a93bc183541871988ac241821b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ko/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ko/firefox-61.0b12.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "fd87cf3b849387194cf632429ae73fd3e2791d39abf341924606a834403ffdd4637addfeb6fe65660a8de533f1b46d71bbcad5a9ac8e779b439658c6a2586bf0";
+      sha512 = "d633acc7e741cdad5384fb7f48865817d952ceab58af67b9664f122f89eb864333ef174d046c45053f7289a44751c468891d3a39f71c3b2de3f56673a5d4f0d7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lij/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lij/firefox-61.0b12.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "ae57d2327a143edce6f1b459b3c0a1120904cb6e319a7f1c02bf221908d6ba56ee72b0223ae9d9e409b303be56d2162d1aeb46472870b9992ebabcdcc7579bbc";
+      sha512 = "43b9976d4a98134f2c83edbebb1b4d8de7c8e24ababd41719256aafd7c11f6cd1e89ccd6549246529e860303ba5ba41becb07b3e5cf722290b5bde32f602576c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lt/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lt/firefox-61.0b12.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "0f6afd4c33925472269070d7152b13132c76bbe489a8561db8a760d766df7a71f60bf23a1e60ff3aa6f22697eed1b64d079b14a4a5919c12cebbd87a5c21e034";
+      sha512 = "47cc1e66ca49cae1249872465c2f4b27fac6badab4a28c53118c06abd4ba3e43d2a4b93a556d8ab86add2446a28e36e532b170ba95eb505128de4720c6468047";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/lv/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/lv/firefox-61.0b12.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "6966b2f4874e12091679daa53b0da6a25a4190a251475cc14858d3879031c3b806d1d7cb37f851bc3d5da5f698cf4cf8a3cbb1bb365c060e7bb66c5d21c7f113";
+      sha512 = "8c3aa7fcf524a63670113a08ce3b31dc34c113c04360216ef5076ed33240f7a062a649fa4d0d95cb0e2749c5bc0ba33e0fafdf073b3c09d6d11d196aece24861";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mai/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mai/firefox-61.0b12.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "c52d814873cee8e11da15e30dea3ad85dbd6fe97262bc32ff246747301026b543927dee712d9a9bca480d5980f7753f3ab50ca01316524ad9b6bfe2e53476c01";
+      sha512 = "8c7e485363f6e16b3858f1c25ac0f6dae2f3f70aea8ca18c14fbc21c3084700585202fe0832d165f519f8c8bb312d84943d34f0f46c0e2127dbee4e8eb706889";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mk/firefox-61.0b12.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "a794ac4ac3943e92a5d7ba56e4ddcf9ab803b41184c3fc3926b6bd0121d35d0061c70a10bbfa41fda26ea7ff445013358f7d842171235c01fafce2c30af2ac32";
+      sha512 = "4c063b9c4b8b6e1433576384d8707906337648dd141eef6672f72877e2367a33da87a420a621339b68abe786f0f35f007ea999639aa37f480b6cc9de278669ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ml/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ml/firefox-61.0b12.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "3cb7e29291a68bdaf5b57a8604b82bbac54af93867e8452b5b61515e3d7220c67acc09beacbf28e780e5aadabc24eb2c2371ff76aad8be6a836ab76712c40e2f";
+      sha512 = "32b7a4d6c27cd8a19bec4875bf56846cac63789f943c63b555fa8c4503c083a261cb112ca4a3077de9e5bdccef301c631e8beaa4e40eab322805730a9519e73d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/mr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/mr/firefox-61.0b12.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "355578a744644fd928d8f470a95573ff566db162fa4521beed09cc84d6c7b19509633ac48faa9e80c58cbdc4d781f5ca0155a986323b68ee7c7a968325af903c";
+      sha512 = "1c4607c713df330d01efd8f33d2defaf154d65e911dc5bdc9f30b67a7eb35d704dc474a5366fcafdb546438b157f5bd1c9fff879f9d15f00c028ae480e3890f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ms/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ms/firefox-61.0b12.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "c91c9a810686a8d8e96d13109272b8cbae5dfa6cdc9b9a064ad9c5eef98e5b47916074c79958d7faa18a8d6c9498482dc1eeda531caf2ebe4c5b1ba9059017f7";
+      sha512 = "c611780fb48d09967fea62a8b9173c1eba99e56dcc2ae8196f1b29cf07552931a9ebc06010e513c652fdae01b32b1446b5409361d3f5f0c262fdd1cd715bbc0d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/my/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/my/firefox-61.0b12.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "c25b9f13da2fd1ec67c09dac800da0bfcf103f08161957bdfeb49a0d538f7d3a4811dcaaea3f86b6d166c440094edd31a540eaeb92d668f4195d3db4f25e7da2";
+      sha512 = "7fc59b78f1d6251122c5b91dc51753e1477b6ce4d5a0bc22ba813048cb5b6f6b05ed79482296ec12158c9f11be08a484f8ca9b3e4e77eacd1aa902fcdef30a98";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nb-NO/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nb-NO/firefox-61.0b12.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "e7713c599199f31ab6fe553e13d165918ea95e2ed5b128eef9fbddcb0ca102e7f9fe0787f3aae61a4ebda37d52d106d997f5819b7a74064875b555b6351ffcdf";
+      sha512 = "281f313ada351f060aedcb4b08424beb6a8518b45d9571eae15527bcede5c87a188c4042d7ec826484b9f7e643b20575bf526d3699e29cc48cfc4a6367744a37";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ne-NP/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ne-NP/firefox-61.0b12.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "23d0756367a3e68e85bba22fdef2d117dd9d5d20321a0222c783d0846a73f00439477129d70e7515071a3439800fc22f3074ac3fcf55c7642133601ad3ac6ba4";
+      sha512 = "05b146af2dffebe79f19e2f32b469633f1ca38ad190b8763667d80f434c94ab23723fd29a4a4680cc394ac48eb7b049df61238d2ed0fc995c730e7a27dc8a0d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nl/firefox-61.0b12.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "2584249a71274d4ba69436c423f75a84ac993e50b87fc4d3a113bf70ea2a48a86dfb201b3f06bd19ed3d5ae5e7aa5c3025c56905c8a0255550c0816f17badaf8";
+      sha512 = "279253a928dad6f326a16e6e5720802e83e7f15ea1eca1714ca6d2ce7035a79d16e3dc195dd64701b2b3c6a1d79c150706733d5bbfe02e1fcb7e911592f6edb1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/nn-NO/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/nn-NO/firefox-61.0b12.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "dc909b3f7ee3641c7d0250a9d0ef5ee2b0e89c1e4e70e81befd4dd2ddf33557cd52f2e7aff4dc469c4b9eff105cdfdb97eb06b7920a6253a089cede1914b2c80";
+      sha512 = "7ffd3a708b8cf8ef7b8293322008fc6f8765d1de4df72e7e8b8d320bf16f638fd068dc8eec4cae4a6a23387245dec1c7ce7341acd3b8c6cdd52af0178fa14570";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/oc/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/oc/firefox-61.0b12.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "5a00f883379d38b67f21af9089658bad971eaa5b16cb410cd3d9db601d050cd464e6a6413380e26a9a7f46bba7241bb16a29a55c7d08255b39017d2cbdf945bf";
+      sha512 = "ee3b9e8b5d092c966b8fbdb35b04bb25f3816a2f5ba72520372c65ae53163461d184c313cfbccab9a7a68fe4cddfc708671e3ea61d3400096dc168098be0656b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/or/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/or/firefox-61.0b12.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "4b9a8fc2d63a333efa3d2e8d5fa40378b2a58d1165438fc924024ba3f8c0d5716cb75738ba2b18b9673453a2cdabf2c506a645560effc68bbfc7d4efc1cc205a";
+      sha512 = "2f6a878393fdb6c7df042fa95e04db8f7250eedf991470e8affc42f27b0ac5526e50bfe926b5e44fca6d877aff8f1c7459f30d58cd961a77f5e7754c1d07a9dd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pa-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pa-IN/firefox-61.0b12.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "e6411b8f71b597da9c1e4a5c8cc6c2c61f99319f46792145b675724bd3dbde8de9dfbb9b59fa004d5e4140df77929da2a9defe32dca321d5054b36bf90afc03c";
+      sha512 = "230d08f87b6aa0115383d926792033ab88860083a887d1acf9409466cc0f6e528e039277e37f75b1839956ef4bd237de8682474b6fb1f1519233088e89aab6c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pl/firefox-61.0b12.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "87542203f11fa3b32b7ca203bcdfae1e08e4fea191d5e17764221a5758f45dc161b4c6d5aab5e295aaeb679d0fc9278a5a578f35bf7390ae5b2c71caa37275a4";
+      sha512 = "50531ee7a4bdbe3533d3fa94797da28c9bdb41c262537f7b14d8ab5c3ab7353c083e62d14a00678bff4b9fa3a1d7a6c5f2bd6cb1d0364a5d364de661476737c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pt-BR/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pt-BR/firefox-61.0b12.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "a7812a6e6939ed9e80251f1c3b3882ed61769f63fb3cb967cedfbcf43a46a99fdcf01254b252d4a5a770d17eac622de3ec44a0b235426aee3e0d0f9eaa45d9e6";
+      sha512 = "4f70f26ce2779a6185cddb3bfa4f973b59a60fea1541ab0bc1dd8a58607ecd853073883823a254ccd353b247f141a8af126f491dc732b5c4a14963c0719788c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/pt-PT/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/pt-PT/firefox-61.0b12.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "539f9969af49633ea8d9b2ff245815147dd792ac649a6858173eaf2be65c97d40c62d1c597a604eb7f54dc8f7f4fd4566ad6e907b7d99ecd2ea6eb052f7ecc8d";
+      sha512 = "19d0a557eeafc734e13c852f9222839a31c7e56fe6e100a75f3d64d7167ed78ccb10bc491724403948d13f0a1b874aa7568c648e3d20e5b41208a645fe9996c8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/rm/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/rm/firefox-61.0b12.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "0a905984476a7bd951deb5a4000d5323963e2431ddd9d13ba20c14ff62c04031677bd5545a7e07037146bb239541ebb2e9bdf0765d3ee0dd2f809b6cfbdaad4e";
+      sha512 = "10ea7f8eb8ecb5ace562b9eca4182ac05554b9cdffdab1716cab55685428ebc50f25738e71994c2da6b27a657411e409d063cda6d7aff2dc477a30d2d3c14eff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ro/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ro/firefox-61.0b12.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "9797b3e7aec8b30629474b4e55261bb15bfcc3a482823076b1e9618a5fc1b198f31270c085e8e28e5e69c5e5b05de91eb3cf6bc2e5e90aba9bcfb1a07d60c131";
+      sha512 = "654cc1cb5bcccde12d486e92123401940ab00a47cd20e864a5424bbc0f37854cb4047fadd672fce71b976659dc0aa4082a0d12c25431dc0a30e6faf97531d3d5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ru/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ru/firefox-61.0b12.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "3f52823ddd0ab6eb63f8b75ced6d1bd1e398be1d4067f574e9ec9f95f51dc0b6d13f7f611ef38351fa746ca0e2cb3fe4f3518ff6d250bc97f5c5845453022a9e";
+      sha512 = "582c24ca9b4808f004a622b4bfa59b00df17a81425e5785452a4d9871925e118cd59d9fdc1a8854ab0a702be026012cecea48fc842b4660e389e37d5f11842c2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/si/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/si/firefox-61.0b12.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "d1d5be36226929132f4f6ffbe462628fa5fb0a11c1680243ee1c0b8498a0d00c8cae56a7dfb502136e5c84e4e109fec7a5cd673fccaec444ff2a2503f2d2b421";
+      sha512 = "f26f9abdd9e1da50c7e4d555396bd96ac309a6aaaba9c1bda10925c16c3f8a57bbf26180fef93afe7ecff9ec49a41a51004450d738ac440f54071cc9c4d4eda0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sk/firefox-61.0b12.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "bb846e1ed5a7fe60d00f456e3de91e5335b33c98835dcb0348002c80dcb0ca1e1f0d2f0ec0dd6f8cb5a57154f5203166aafb393681d21611311cd9479a7b2c7b";
+      sha512 = "de942ae63f311ce0e3a7786f10f9ee728060e520551a8c0ec91a31a74344dd373a18aec68cb1547f96d245536a669369569cec605699f85bfd8aefaf1d0576b1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sl/firefox-61.0b12.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "0dc8cb7ca47985e32eec0985079808abfe8b1750dd91b6d13bd7b8441b344b2602467be9fa1fc2626a1eac37ecf98ccbbebd626287b4d11902b85effd0730415";
+      sha512 = "be1a0662549921cea469a2c40452a973daf47a40883e044455697c2caa0dfd6184f23a0458f448916e2b0f483d3ad228a9e3724d5dd46e2c82b38ff63b571498";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/son/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/son/firefox-61.0b12.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "4ac8d5e87c60775776da837f28a7b9b0ef33e73bb1589d1b8dee8a682df922c4612fc72c0027ca00e23eb68305a396e60c1baefe6b478271f5634560bc6cf3c9";
+      sha512 = "225527e7f8a9ced9fb53f7f0d3e11cf5a6745ec861b1e293aca467339a487bc50fdf11e2c2a0512dbd5532b4439651f57095b9b4b779d670945c912e5cc20901";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sq/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sq/firefox-61.0b12.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "e6c552b445034743158bd9276d9abf4867d76a3c1d88d08fc48c304f4ac6e174e6e0b51e6a7539265fd5d0ca1ad6c2c097b7b169d9d865407e5963dd9b2da01b";
+      sha512 = "b8f1aa044caad453cb0ee492ee8204ed5fae05d5f7fd1344d9dc2ffc0989e9b089adfaf486f3b09f38534af17bb35e5ce183e353200c3b5279c566a86f952bfb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sr/firefox-61.0b12.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "019ac2eacd87fdea52e28cb48f79ae85d2fe022a86398751c5b30a7c069f9f3ea3a6ee74577ab0984c02bdf79bfd35dcc70f6e2d3bb5bbf4f767befdd0803df7";
+      sha512 = "b31d69a2dbe85f7269c994751ea8e5c43c3b134be9843ccdaf0c2dfb3d5db19635a9d998bd2465ecb47c02b9cafaa50329d08a501289846eb80097561cfe6330";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/sv-SE/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/sv-SE/firefox-61.0b12.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "1fa8bbf9741e517a944f08c484ccabc0994ac7b72fba3fbada9cc071e23c1381c86f890e2d7421a2aa2804bca599901215f7aca3e14608572e78b69b2540c58f";
+      sha512 = "08c58b4457122713139d7d5db7bdc1fb10cc3c8789b7052c95f868722c84679919b8dd5ec11c26343210ab962566827bfd350007f2e0207016c36754a4a24266";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ta/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ta/firefox-61.0b12.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "fd5d13d75e9a57bb1b49086a8c2cb4428ebe26f7c082c34fb84ec89311a939f17fea415a28e43922d8b03faacf8f9b06c9d3d53d89ef9a6f16ba23709599bf36";
+      sha512 = "dbfea11dcb74aa27fe3f0a3984303ba813df0ef0a958c2fd43ebc215d00e7def02dd31e2450f98179250deecc98db79880c973048f53d72a6792591043fdd792";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/te/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/te/firefox-61.0b12.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "1d7833808bfb87e47c126e94fde2fc65934f3bdf8ed7ae658e4dffa18150da6f61f444591df4e6ebda40cbf79e193ccca1bc799707cf0b9386b14381a75e6147";
+      sha512 = "87c4bb3f356698e2b7fe2968c100384e7f74b2731191d1cc4aa6e8dc500e5cdc94c561d8b06a2b208575c85b68abaafdbcd2dfbebe31ed8cc15d7acf4bca3fa3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/th/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/th/firefox-61.0b12.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "19b8a299ca06060cf194da9f7c454bc569567e9e94ad752f1d8307929f29c3add0fa9af26a1dc528bcd083e8f5b4734da4431c263ce8f4fcad02926e4a6c7f3c";
+      sha512 = "2dd48ccefeafd4848f480b24bde131667e87ed25fff8fe119c4d60bbfc114ad68ba350980f0eba9590c26eb631fa77db5873ffe72aee3a754b346046e89fc0d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/tr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/tr/firefox-61.0b12.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "7239236aab73b17299151e3c37a4eabf108ae0d6cc336ea3a02809c09daeee3ec403187560c975d25c5c270ce31a58e2cbc09a780cd281b35ca9362ace7ae42a";
+      sha512 = "cb2923deb94acbd7159df685fbe44477bd49d9982853d30567ac56fb17849f215d7e462a9cce9f4a5c467cc1d9632f89d956881fbf6ad1e90b9a58a549ebfda7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/uk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/uk/firefox-61.0b12.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "033d95f4400f3005bad243c2e7ad87d20bde5bb4f2ea0b4c75fd1b1d0bf558b4efb811494617821f1d3128be18856e906bfd5e2debe658f4b28cebbc9fe505f3";
+      sha512 = "24931a8ffeba090ac00f32cce09488456e153ad267b7f43f15ae4be3921fb4547820fb93baf5f15695ad003c5d7716c1916f7742f22ba09ccc71fbb6de602885";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/ur/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/ur/firefox-61.0b12.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "ae98df054497fc8c9507a73cd7fab6beec9447802851c718f6d6c13b00e05593a1f324cb7d7d6aaf1528208f3f55d0313caaf6ff4a16448d138421e19f54dcf0";
+      sha512 = "900a307a41faf1c1e3663e4b10ae7ef7972c3ce010c2e3098396dedd8d882c2769ecb5bbbf57d2b0cdcb21d3bbd898f508b4851792eed0d2e06a03142d204c69";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/uz/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/uz/firefox-61.0b12.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "2e7e27351f909170c06454930d5a050203d59171d8ad3879bb27bc6232740078626ba726b307bb0634eca025ef094b1935c1867b37f68dde8bd61ff0ccfb0c77";
+      sha512 = "0bb865a14e5c9c33679c09f6fab5a1fea12a41a7c561e37cf20e02b2c424c85cd766c9e4769ac199a8cd6341cf3950cb64c15776bef1f8b992786c979ae5901c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/vi/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/vi/firefox-61.0b12.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "a9eb501ebcfbb306a98c8f04787a7e04463025614dc484bc94c124e2d56df648fc7ca882e6462896623acc5a1a6521dcca7310da08899da207b8c9443cc8f59c";
+      sha512 = "b45a9c119d16b7d06199df2ffa49d44ca54101d249354e766a06dec3b7fb9b126d1badf9b787268846b8f0650ad033382c1a9a927bb62e0d260ad4c5880b5a22";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/xh/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/xh/firefox-61.0b12.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "90f83bbf142d5c2829f45bb1db915a64e05e1c08df0299e80c447f71590a815f8a2f197f035ffea7a9515626a905211b8de9597d24c12ca4fc38b1bff2482b06";
+      sha512 = "a183e4a310e4a6cb4f0d98daf230b38c5c1d1852b8144f4fa8d56b05beea0e1b42fe4a243a5e551c366a9d724eeb7677175331d1b812a54151e3e0e64ff31fc3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/zh-CN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/zh-CN/firefox-61.0b12.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "08732a0043ca0d2cc98eb60ea8a90a9c43450b09369800e279f2fbae3efe765afd320a1d031854129916389037f6d7e2c64188ff777deed9c4f7c33c3aaf7b69";
+      sha512 = "efef2f01d1dbf8a53dde1511e71ad33c220c76fdc8b6c9a68067f69d58149d613f7bedbf9952dbda386834f14aed4aaa798ee3871a6d4d018bd432ac52b1eeca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-x86_64/zh-TW/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-x86_64/zh-TW/firefox-61.0b12.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "7b25a828a7f25e231f8133025a66cd2c2fcb4ee9141471ecb925dfc919915905763a2c61dc95cf4ddcd451e8690a27c0dc177f29ec6e1024b6c8965d36f68df0";
+      sha512 = "9b247086e288674c0b38a6da4658d8363d616cc0a518d54bf8a7f46a5b0b1aa40798725a45a09162bf85e4e07a9bba1a0a5b80e458182fba92f27af6691b4fdc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ach/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ach/firefox-61.0b12.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "1c425b2a712b815c592f0b051865d8b4879f9d55908945a43fdde6687caa5383a196d28283c6d66dc5e7344018dd5cf5761d1c3d566a8a4cba146d6b24b121a2";
+      sha512 = "b10f1bfe8fa0daa5cdebf7dd67cc79b2bba5c1bd01df11ac6157f557759737794dc591b8253bb2f911a9157145d56e95c8cae557319a2739c19913f3e85e0f5c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/af/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/af/firefox-61.0b12.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "1da13350d4e51e717f363c0ac8ec9d0e7c064e52f5142006e1c59f265ea1039edccbb3fe46877b1d08ed1beaaaf3960d9a060da91da0e57c887c2861aaeff641";
+      sha512 = "479ff91b7b4270aacb02230de29e111204951c194bc70b534d34b1965e76b408340aa2d6e3c3496d43ff007728880bc9c36eeed33a2ca90e48e2375ebf6d158e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/an/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/an/firefox-61.0b12.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "d0191fe2db7122058c18e77e8689426f01011ddf4360a53d523b8415e6ead69fafcc5c987d8afa11b891b16bf822f456195433ef45afb4718df41038ad21882c";
+      sha512 = "ea0b543308a21b7d364cba55c1a55be6c87acd86133ebee60006ac9bd73144b22f7c4d140401175c1c7bdca95eddd7a63c3cd622df2326b7a622664424f5f801";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ar/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ar/firefox-61.0b12.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "742c9087bb14b90bfdce3995d8a40dd540dadcc298fcdaa36615c27baa661d17dc95cc5d8ddfe5ff039d897aac7994c08c1420adb8206ab473d113c3df0a2c94";
+      sha512 = "78e9971aa0e31e37be5a8373109dce66eba95b444f2cf830d08566024f1260565903552708050f6428a755ed2fff727cf0ba177428d505de568c976118527e55";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/as/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/as/firefox-61.0b12.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "e40a96838e428391e4a8bffb25ba694ea62d6177ce5aac504cf37eca763406392c9471731d10f7fd220510f8c4fcb793c02b1393b25faaa8ab72d91e27f29e45";
+      sha512 = "3d915d481b88156da4700e7b7669698b23f4ed761d808c3d3ba57c0ae54b4ed7cef38ce5cd1def3dfbf9fcdc8333ad74e376c8f1520ca6f05a69c7b3758bb1f8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ast/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ast/firefox-61.0b12.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "7f2ac35c4688314bee804467eaaaabce38f671c6ad4bfabcfab989984df67ddaee24e6787e11447ba13c63abf69d96a0bdb62aa66e4ab23bdc81d7f2549a162f";
+      sha512 = "1d160b65cbec0d222aefbf1ded97bc131398e7c10ef9e4ab03e0057d59f2999f1e0d79b7466f522923e286f48afea8309d98d2c1e6b1c9c3a81879b0471918f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/az/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/az/firefox-61.0b12.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "cedec6c0c44689b1608972dcb8774e9870b9c90f41d91cbfa546bd37335c771bd0c8fffc7fb488b4a6e1d19b3a5cae87d54639abaa3a093189e2f48b5cefd5be";
+      sha512 = "db9556748397f222b01776df3fc920f1d75d3b89ff854c17aacde8c44777b7b60c2a115d80fbc5af9adc14e81d1801efa96c83bc3fb64aefb886f79f0fd09a80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/be/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/be/firefox-61.0b12.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "e74beb5d364761e9f00fe4dc9577f036ca0ed7115c107b55109ec0aa55e4fd726dbb9ceff93939cafb2bb0015bc349024496864eab95dc9881348170c8419545";
+      sha512 = "7a4591db7d7f500c969def96949ed441807364d5afe0bbd50960d3344a91afa11a553047210f1ac5f820e1f266d2974aa516c50f8f403868544b8adecb12719d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bg/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bg/firefox-61.0b12.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "bb3ac1cc0bd269894eb2362d2e2199fcaa8ea2f906fe7cfe389bf7ba31b24679d5470d30fceb8427a15970b549b0e851d85a4db2da65bbaca23fd5f7fad1e9aa";
+      sha512 = "418c8fe10153784695829714b50c75db6c380f22abecc596555646ed00d6a2f0c94d1eec70f000808f6343ada728b69a1d504e910676526d50b5fb1a7148f41b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bn-BD/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bn-BD/firefox-61.0b12.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "403e148a7de182cd4a78495e80d6c6a8ab8b6348a6d1c70b56ed1e719ad0c49f433b3210d47cedcfac4dba3902ba6435ae0d9825be5856e32b7c2cf0f5cf3f8c";
+      sha512 = "6860c155ae24b95ac5e394b6e73d893b904ec63c057bf361c9afc3ce6cb8ef085e086e595da8f106092641f37bd5482cb4e07655882ea35e18174f2ca7bea839";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bn-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bn-IN/firefox-61.0b12.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "4513f1855962b1a1bfd1cecd6bd431fc19a19a201ef4ee715aa0cfc192aacb1aad9b7ccee4da99a89b5ca62b0ea7a1ab0bc5ae98dba9695bed2eca6d56ce4f0f";
+      sha512 = "a381c1c9d0a0b366859d7ce48405a84bb6fb5a116841cfb7e0780c390e42795a095f74727dacc20ea058f7f9c8c85e22e1da06133a10d1106e4d41dd5ffb0ac6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/br/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/br/firefox-61.0b12.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "9d4a52a622f174d1a9e6758fd19abd3579fb4d2e53de2eb6f8cbffcd6f15d533682c4fc802b62b50e2282fb51aa966fcbeae519402ef8ddcea9f8e0352f3ce16";
+      sha512 = "3556210ae4bf3d2062dea53c267bce8dfece29bbf8f485eff398f76b9a4722b42408dabe34b4ce4f3eeea18a3390c17ac0fbfd33133ea5c009d13e7290e5f624";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/bs/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/bs/firefox-61.0b12.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "be101428478a333987464e6df2e70f24c31ce31a5760405ce511c3c2af4c8415d51204e97d941d0f8b0ca9966e439835d4f295cc0f96c73e963b59e230a5ddbd";
+      sha512 = "52aecb7676940adbca112bbe17feb4f7946684f54f5a2111c08375919f78690e1340599beae4c886913dc97c47438c4962a2ab78ed01c29f235b9f8c130433b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ca/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ca/firefox-61.0b12.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "74d30138e89a1078dffeaeccd477fefc5c508bf2c4ee4a88c5d100c39b112056c9636d92acb642ce8cfe98239e08ec2ad193c034dfaae6137da5dada030a9917";
+      sha512 = "b92d1711a552b96b9617dbefd917124764cfdf6f79c657272a0a12bee6d79eb2f02228f6d7bc23002ce104f7475c28efc0e4d474f444349a1751f393915690e6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cak/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cak/firefox-61.0b12.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "634feeb47538b8e018ebad76ae0be0c30154b25ca478852f6e773d9eaf5a28945dcdbc3eaa7caa2f2190f840497bbb6bda3ea38721ee1e4faef8676130b21264";
+      sha512 = "86d6e0f2d427d1fd6c8bb1c33ec8594e63f2349c2bd00faecee0ef5d0d24b2baf9b7a8f40094170a4c9d737c978eaecc7c74f0377fc1d13fba24a9db6904de1f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cs/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cs/firefox-61.0b12.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "0821502510822b9d1b239561f0b515ae80c1b20e3d97b783ff4fd98fcfcd86859731d5b3551d0f59fe7bf9f478efc6ba914eed0591d6dd2548fe27fd1f50c729";
+      sha512 = "53c5c1b07f24c9c0510d40860b6944d613b3ffe4b752029ed9a32e89bb9b699fb8cb54ab2f25b9222aabd08255197e44e6cc3797bebbff1392c5a65ddd1a460d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/cy/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/cy/firefox-61.0b12.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "4bad268d8b10bc3422bed446c53ac2d52a48b636455531117a16f4e977b1f1ca43093ecf484f3f09cd2f021ae5dc390320daee3e2e863b91751db4f82b32a9be";
+      sha512 = "4f634916df6f13916858d4bba56092ce8224fbc693c7a466ac1636088545c268a607f0ae986f0ca58404668913565da9ddf778a8aad0fec2de040c87c20edc12";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/da/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/da/firefox-61.0b12.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "5772be3713075fd78391494460a3e16b72202bec35e797c2e560bed9bc91163d61358fe76710e0238d9d4aabcc7bf8f06d08603437a80996ad136357b882f0a7";
+      sha512 = "1c35bb182112c13667121588db9d686f5797a29acb7b3515550d8c8631d3420409678972233bd9fd08d477985d796fa51e7cd7f5f72e05b8476d4451737d5479";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/de/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/de/firefox-61.0b12.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "949acec21ffa40045e3498970c867bcf6220814d68e4871521db3f03f5094dd2094a5760c29e505bcd2fb7826da2729031d49815cfe1a71373014f76ac29ddf4";
+      sha512 = "02b3897e181b6427e6b713e97d9b4ddb6c175091796577aa7c726ab0d865520a44435f26425ffa4e9f78a9a73581eca30e82a4172d617b15c6ab9e42caeaddb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/dsb/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/dsb/firefox-61.0b12.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "0159c36db9f37cee06d66b425f0d8036f68ddf99a7459884faa1dee31a0d91f0c0761b58ae0f69a40d5efc1a73fc930a9e1e02bc401797d8c2e00c6af125e03e";
+      sha512 = "82fc4a58d0a0a49f8b96d4457854ba295f11c5880716c517838d4329e5cd41044dd26b4aa20f036fe664cbf8813e4622ecc3b2069a7629fe6e03e84a87927191";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/el/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/el/firefox-61.0b12.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "16ca273fbc2d77391325f8551ff548344ec59b65a869f2e4ccb20545ee28b3cf1dc15006a208285d33765ec6e200b224eee3272fa91e988a34b671f468aeaf2b";
+      sha512 = "e4c46c68f9a2551969a06dcf55a7fff30a53b52896c3802ec7966d53e4527d986c2d15d7eea3a70ab90cb8bd8414de20e207ca40afc7866bc13cfd47524a752e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-GB/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-GB/firefox-61.0b12.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "9e31834faa2db1abaad11261abc17c19d82a42dc7eabd3ba796f542af83bcbea2cf0a234de32cd023591ce5a6b4a37b35375cf0e1ff470500e56247c8cb69560";
+      sha512 = "1c478b893c558516988c273f9b82e27e3abfc3db28f83aaab952a9df5595cff6a0044ff8054f172d7ec71304d65ce0f67a682b9b0008213cc9a301e24901146b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-US/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-US/firefox-61.0b12.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "5e0ac9a0965f9674d4d06afeac7aa0ba35987e683fb29e1b77d22097f98b5d1c57599d6e22d191cf02363715aaaf3266e0fd79aa3fdb2c47c3fb1ae83bd9ed13";
+      sha512 = "1750541362c668f517431b6abc5d8096f0436895f85134ad008cd11d589a0b89b6aba7b54ad2d4ec08164d1bed88a25ed9c279cdad07b996657caecbe7f946bb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/en-ZA/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/en-ZA/firefox-61.0b12.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "73a3ba8c65ac491b2eb4f16929f7858e91ee021b3dd8ce6881ece2a355b112c0f5629aac0eba02be8d50f522dc37f94dc7669bc5b421de85e72575fc689ba14e";
+      sha512 = "71e632bec1a0d3b4c95d4e9ffaca97e18a0d936e4c7be8c2ce3595672d28fc7b5dfeeb73962d189d83b64cc4bad0e4855d80fceace8384c76bec8bea5d8c253b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/eo/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/eo/firefox-61.0b12.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "e14ff47eb986fe81611bcdb2c5896aa9a90ca8dab3fe1308fc18f8d13b066011ab04cc081a9288522bfdb40844555631d15a4c643f18b4dab6df950a191733fe";
+      sha512 = "ae28a8f714639b150103a271254f9deaa405d86d9cfad0f4dc5dd2d198e64a59c9b34d7ac2e3eb723ed629452ba94de0218f7125d5e40cc1aa9f5e3bc7eaf17c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-AR/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-AR/firefox-61.0b12.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "c9bbd34edb7640875921a8f5b8ce6c07f3788c73a544e446e6fc0c011e875e998154be7a27e3296358cea505ad2b318ad4a743b0c56330b6acc7a82b19bcf8f4";
+      sha512 = "91772cc444e2f6e56103d4635c6eb3861b22a4d5dadb440f049c1cde84901b463fec3305086ae224c98e321b867ed556d7831de33cf91facd7d99a2896b7202e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-CL/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-CL/firefox-61.0b12.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "9e3eaa81e7eb11000e67cbffb0ce227ad1983ef4b29bd138e2c99895010baeb0af010876d97891b147244c531b05355440bb3ced6310c1c7bc0117b2688b95ef";
+      sha512 = "9d4a2209c1a8c8e620de33c43f80e09003f08f97f4bb551839f8ecb877967261f9e8b3e87449c3e2fb659a17a0ce408c5b4c3386f4551bb9b49b57347cbf0ce9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-ES/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-ES/firefox-61.0b12.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "d88b17b23dc4768e3368e505604828085baefc1cb5ff2d350961e40a78fca10634cb21281699544f8fb42fb167ee18955950fbda2f1587a2054d0790018934d9";
+      sha512 = "4282f1ff6a953a2f7f30e7adf05470022259911c113a0777dd614f7cc55190b764be66cc025c4db1a65118e111612422ab02794ad659940bce9d3cec448368f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/es-MX/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/es-MX/firefox-61.0b12.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "a6c48a51cfe4c640b7044a168258c7bdf4ebfa4cf19c4a4386a87056ae0183aba1a97cbddf87ee9b66e57520ae00a24e1a5a6acd0188fdc5e1d3be63af6ad245";
+      sha512 = "d01276bd4f3e740bf61f5d6553dc0252bb367117db56cc9b8df8df143df0db0c2624e81a926f363d9a71963f8ff1c4412c7cd41b8d7a7be7503a9f3177ce9b85";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/et/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/et/firefox-61.0b12.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "73efbac7c210914940f459db4470dc75187f2afaf43969cf7bc8604304c2fc77e384e16952a9870e9919cc60a1f8318a497997bfdf12593be76eb747c8af35a0";
+      sha512 = "d48429950bd675d120dcee2c078d005d87ef84eb29012fad143c498e87962561c0f75f43f841374ef2af898e3ad83b67287a1bd200926bb6c35026f40fe5d050";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/eu/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/eu/firefox-61.0b12.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "2134fb5f94cb9ffdeab346f854e1a53974dce2a034589b1fd30699ff721d7c2aab2e24fcfef54fac41d9d781fcb5f83534e9330572fa8a76d5a04f1295bf75fc";
+      sha512 = "ca86788fe7133a03b4bd9d1061da03d01510b5f997a5bcd5a186e21310889084053d2109820b8efa62cf0f1526e89271e2460a28508653e32ca34caad560ab17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fa/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fa/firefox-61.0b12.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "b4ad171d16f8ea4331febcd5c875714125cfd15639299001770a25f4d671c868d3c7d1a058b2a75ceb7e61b458901bd89536567eec4654d04ac71172a1f98e90";
+      sha512 = "fe3f9fe8c832333b979ba34e1328eb11a38fd76cdbcdb9b19a4669df8d71dd7a34b0518ae5b9e71a1a41777fa1dbcb0ed0e4d0727c5d1eca56a74271dfebb3f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ff/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ff/firefox-61.0b12.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "c114b3cbf9b16bff9935408d33f5ba0f92c96daeccd1602e07c7d730683e3585f9320d7812fb1489e983fe2f197de285ce7e30d4d98fe944005cc1889e0d5301";
+      sha512 = "7d8b940a57c3c3b019dc83abb63e7f4e6222f3705197df3114a560d676ce580bcfc119531f9f96f168353fbd4b12e58c107411ee62f152454f9aef33decc50ce";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fi/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fi/firefox-61.0b12.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "e1005f991a598f5fc2f45bafb3d2eced8b5dcc648680fc0e0cc679f13af5ae3cb0fde38e9cfcc535afb2dc9b6dc8ae7fbfdd22c86b1c1818352a0915439e5f64";
+      sha512 = "2ccdfc0613d91e7066c640f1b310dedf0e1f6d89bb3d1ae71510b22bf63786aaf693211586fa25181e5cc183a5d54966c43f8cf60639f66679248fd3c7b3645e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fr/firefox-61.0b12.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "b720ef0f36115a388f94fc99cbbc39f2f40b2b69d0740aa2598543cdce14996c889b9e068da92af374a508309161995178ac003cf1172893bb1cbd5a426f9ef1";
+      sha512 = "6a88924af75101f52b354e37756b9638320865d726560a794cf02f65b3c0eae46eaae0c980ce90757250c94d2eecb76275915c6a1160d39514201f261a24d239";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/fy-NL/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/fy-NL/firefox-61.0b12.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "bd8cc5a71e69d8a2b7b319e27ae8df88832d33d8107aedd54f8cdb8ec8b87eec89b718a092c4b2d414d7236f4212ff901041c06455d9eb939e26f14601563584";
+      sha512 = "06a99118ab6a20e884bb7771a61093206fcf7230d097f606d8a162144f00493811f2f462db2d75d70bc7e8284b4fe82f7462e7382419b08841da5d441f8524ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ga-IE/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ga-IE/firefox-61.0b12.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "4798d957102423ec6e4acfa622b58391542312180314f2a02f52a4b9874687b1e4140f7fd13c939dd5f70fed9dcb7bdd168fd2dc2505d558f99b2d6fc8d7ce70";
+      sha512 = "c0b3695a8e3f3f8ff991fdf861823964129e142872cd79eb76a588eaca71b57c8742477a5ad455fd13d10e344b5c117a4a101e65d18148958db62315a572252a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gd/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gd/firefox-61.0b12.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "56a199baaccde45bca1a640f81fa62530cc932629902d50aca73a59e28b7a70c0d9679d21c16d3427df497156a2ef3bd718da99824ccbb323c8af695d4fa0bc6";
+      sha512 = "047fe3900b1e904d9f6d6ffea8866e56701ff269e6589fc2836021d1a841e7c524f25db5ccb00b91163901d8bd3a89b27fc98a1affdf4119351f96a7aaa56429";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gl/firefox-61.0b12.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "1ba62b6ef66bb8247c53e38214aa15c416b6a64c05d094ee0a51bc4537d01a732e00c6515269c3f86f22ec6c580f47ed5f1cb455643100740cbb7762ae6c3fc7";
+      sha512 = "5c7091e0f42d711f4f65814cf2b1745c14889d8206530911216b55443d75d9fe43bdcdf7b7221dd7a316553de5ee4327f1fd50fc9143d3c333926c2b22755f7d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gn/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gn/firefox-61.0b12.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "1ab4d17cb5e2abb02aa4550028e15ad92712a2841bd0385932f62d98d9ba1453fa91ae1a9841c444ffeb7e96d469bfefd6ea48eecaaa2fcfd5b822ac839eeacd";
+      sha512 = "5bff9ecc955a5c40afe27775c255727d8eaca2c48e92065edff3ff841280b917b89ea2c2a5e53115959ea14b0c86a60559acf802fb74707dccd92241e469272d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/gu-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/gu-IN/firefox-61.0b12.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "cfca82ab95559801654c140dbc7d9d7e86cd605e59511de92d724b9fea2bbb027e621eeff10326b94adddeb9cf5e29ee73cd89aaa54b803c664830854fa19a9e";
+      sha512 = "e210b2a52074d446b835a47becb241ff01724cb55829665a3fd8661ff25f5a19c2f77998e678d485bf14409c8c88f1a8850a1717d08d1240dd844888ddb2dfec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/he/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/he/firefox-61.0b12.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "056b45b614693a0cab73b530ffb9bc50d2174a2771cf9e932d1633133e02a174305e8773a7fdba1dc2ec4e7189407b51354a8d3c13d1c9639d8f4337029e7d35";
+      sha512 = "790a38a052543e13974134e9366f579a1f41b5c6c9e0c7b56c6bce0d44d1a9bdc04aa9a57bf035293b0fbc0c5ae02c7181673d5373b01c63579b4aaaa3f66ad7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hi-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hi-IN/firefox-61.0b12.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "37df62bf5dd1ba63b31df5b736b82baf8cada43a2fb02bfaf97f033d684d6ee8cb9657ba0531a806796facc5a6fe03532bcfff0e30c93d74fc65c7995b323080";
+      sha512 = "a987e5e132b4c5efbefe700364e094502b33471bab25d479934ff25cf4e6b614e9161d1d8f113852fb710ac7282d0c5845e5a1e0e3c3281db86bd79a12d27551";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hr/firefox-61.0b12.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "537a774e8fdbfb3ed3bcf306dc995d807e17904c5702b83c1fa24a665cf4fc8f2b00f9327bb02c13b8dd73ef4128f676a115807cb5e8a8b85cbc11c308a0a6ae";
+      sha512 = "156bce37c7224b01c5f0929ee80a12088f57ee215f875125f646f7258654a91210792d52ffbc8e1749f85c9bf174d633f2a787160be01c8821ad6d1cd8118133";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hsb/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hsb/firefox-61.0b12.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "ec7065a86da1f23c1a48478257b7c985c95cb14b40297f2bf25fc10e63beb8148f8df30c61a719c4148abb62d920bd771dd412f47e328f9641d0525f3f4eb971";
+      sha512 = "0eb4815892e9ea61a9a7cc258c891c674df6abea2f04551f30a4cafdc3e4a190c18a6413a8889060193a3481ef19833e6703c2a7f527e718fe13222605d78ed9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hu/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hu/firefox-61.0b12.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "43a745f61271a3d9805ca9a94c69fe3d6f05fe6072074dd6b3258907f185c0ee12cfaa7e32a948b35053955178d518ae2498997b1a597e4fafd023cdf6b00a44";
+      sha512 = "3f1e5afca6e56f251631931799be1fd18417b4907a7f075c9a4d78a46afabc482b3e6df0ade62dc5013e4e34f0080411c3a5171f8ece6bec1d0723d2d5930c0e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/hy-AM/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/hy-AM/firefox-61.0b12.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "b26a54ff76d79d960f4fafbd4871e2e8dd7f3af2408984fca74c326693a26e28809844b65de6684225923cb7029e8139268d2222d058ddba96d273dbf1180ee9";
+      sha512 = "f6897f07b122fd68e96dc502c3df8489d967a6bb5ff48f8b4fdf07de646d89735bed686dbfb8433277bea57fdd18d75ebb28f755e40cbb0b7d2fcb8cb8e87cb9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ia/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ia/firefox-61.0b12.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "d8e82a6a104e7f1bdb85dcd7f3b292c9bd066a09789299f893f4e83a09a794a0187276636a2c65cbb50f4dbb1b85bbd6afd934ec184a57ccd5e670242455ef20";
+      sha512 = "4c1e875e73f0c4afb5a0f8ab5ec40f520ff2734f060419e8d3bff5e9f533774d1a52b554b3ca8c6a76c3286bc70091a1ba85a8e00cc2e64d6fdb3167be3f13da";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/id/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/id/firefox-61.0b12.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "34c7c48ef40d7931f62f4ebed44e036cb171d1f592017dca740c46d800f03a7bcb5caa7312a8fc845323f157d7dc5f8c5abc75717a4429564acb858543f44d5a";
+      sha512 = "daaf0fbef850fa277f6089bbde27b58fae2aad022df5cfa5428e81eb5e65fd8fd56b17466c6aa2ea9751c3ffadd3227100903413a62f696f134310f33b894a47";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/is/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/is/firefox-61.0b12.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "432b759025ec04752d12198b50ae6d883ed26fb0ec568a5644032ebe42cdc8cbbb5f38f08280ca6ef1790e104dd3af1fbbbcc579ca5cb18d8489576b8a20cf63";
+      sha512 = "ee7af4acf4191578cadeed746b4a333ec072349dc7a334d4dcef7cfef4b5f6cdc736c0d0d465d809e564da7521d1591a86e0bdb8f059216f29155b99a8eb4006";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/it/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/it/firefox-61.0b12.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "573f25755af311fb3a4ee7ee9aff172dfcd1ee17df128b5742dc67ca651e71f279ad378b95745e428ce9facc47b66e763c297d35963d3dc11fc57e4b3415e9cf";
+      sha512 = "548d9492e0da5241936c3c9bc5b8ba655a4334118e3b16758f3f96b53ee6367c9403f02be501375c96b60e20f9a733408a953c86cad48116fcc07b7ed907167a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ja/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ja/firefox-61.0b12.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "41be1b052beaa4a58466e25b7039470c56e6f9b0ae22e46c38f5e10cb65bb1500df50810273c608fc83f73f0f103be9b4fd63add9c73c3f3d855fedb241c673c";
+      sha512 = "84e44c54977bd37417b7cc92ee7ffe51a5815a3a63559c53026cdf703931c418aef7a16e81b8a038a61209e0b246cc2d16d73a1ff42afaa81792e2250894b168";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ka/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ka/firefox-61.0b12.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "25e5e82f90491793e7663f956e22f08581f071ee2e55e2194925cd73898498a6cf8a69652b0cd0c5748db107a08f47d5a38bdfa89e380f3b5a9eb6ce3b3eb967";
+      sha512 = "f315c726215432bc8375044714ba66f1a02504d0ac4ac75ebd2eccddb69c7a05eff6ebaae84f7fb2a33dcf8571ef231e4c130ae168f00874a4fdcd04b6a16491";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kab/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kab/firefox-61.0b12.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "0a4c168e17efb5d7789269e21a66be1fc9248d07feb68c956b7a7e179c961c2e05c1e6b687efabb05f0a57b570efd3d6028998204f7da846845b58d098e099d6";
+      sha512 = "c5d5ce3a7aa32fe2be100b4c1095cbc7ca533ec6abce2c770584fd108e5671ce7e7e4e3bb7d7bd68d66a78f4e04aadcc2e6fabae94526dc6beffea99629d6faa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kk/firefox-61.0b12.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "4f618c6bdf212251697d3328ad9044fd6f0bbe1b5c3e90febc45209d886aa8c5718316023640f2e3d19e6c2735850111a907c07d02cb9c35ecc4692f39201415";
+      sha512 = "8338d1d56bf64f419ead646f8c79afa81b310a24f250625f637a3bedb2db3e60850d2f2d10e393098838d8e65f4e7dd870cc7fadd34f16c81fda20578893888b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/km/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/km/firefox-61.0b12.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "aaf6c1e0075886e3965f5840ca804dc596b8ee495c2cc7cdc5a5b56fe8422a77ad22261996b23d09782b0a84fcfe23836a5068251757426440665787704f4f5a";
+      sha512 = "c408f89bbbc6e90d831b47236cdd6c4b2086556235e7c5df65a3796fdb36053c70eca365016aab3cced3249f0f50794c741454a7298e42c1fb9d261faf6b9627";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/kn/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/kn/firefox-61.0b12.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "fccce9a1786accf2106f0aa7745fdab89f86dfc13240a8d08dc665777cee64e6c5a4747dd911a3246cb0bf91acb812d9496e3129a704b3951e2f6efdf6932393";
+      sha512 = "02aa0007ca0e3495c343ebed7bec89c30d3b0b34a2c09d8adb9e7e61846fa3586bd954a53cfde76b7f7058e2f938ffb1f59648e3968a3f37f11e56f34de1a628";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ko/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ko/firefox-61.0b12.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "29f1ed0212d3cc5ad758282ab75dbe9034d890c80dce4458e6b31ac35ef071026f433802b9eb49f264ab3d2189c64a7e3a2b44a909acc041b8e8e58043c1ba0f";
+      sha512 = "12281135bb407740b4bd2098c6382ae440e3fe3cda92cbef7a9ef38268d2d72b357330c8f054f8365c4b2301709bcd3119759818a1b86a25697d3843191b6b10";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lij/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lij/firefox-61.0b12.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "b9807a6327a2cf6d40b4d12e42d27217def2ac62aa27f0dea872ddab99f125ac08ddb815d5a360bedb19b92c4dd5a7be46d8bb10bbab5ea7a82959cd35380c8b";
+      sha512 = "4d28673f495ec4c8dc1a7bb6915ed8474fd7f378fbcacbdc5633835e3a33c89b8cc9e82c5258fb1975ef5675d7b72df6c0ad2d909003b33e60d89737674c51f5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lt/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lt/firefox-61.0b12.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "8be5c106e64aa30ab2e74fb4785fafc15ac4c495499741bc5f80b634a276dd3f639b5e00f20ab90f732419c80f4fb5600a19d1e20d4e46a5049c86340ce205d9";
+      sha512 = "9a7939df189181535319e74eb28c87d570e053e329efd42c32a4572e953bbd975ee8c310deee24a5fe31d9cbe5bb209d36c6525c6eaa8ea440555d87c3ab91b9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/lv/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/lv/firefox-61.0b12.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "86a527082caa8787bd2d76e7ed32b0123ab9d12229da1d66efcf8d1cd72eecab6da73c5adb0f57bbf5b04fa5f09fde21ab2d12c31f37a9005747153d2226cc04";
+      sha512 = "fdf9d973305278e3c7fa677e3f884ab533fc1895b68e8318846a8771038a2b876aaa8465cf0e952e67aff0c3b6529f2c988226610ca7f1359aedca464a62a9d4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mai/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mai/firefox-61.0b12.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "3b2df769960d791ba4a57135a242b77bf62c21170e9763136ab6dc91d49a421ffad0b92b3c80a6850a9e4f326ffb4d32d27c70581f4825e05d2a244fcb4995c7";
+      sha512 = "c89e58c8888bf34a370309c9d29ebd4870e18565b5a41cf0e654c773f0daac8f1e0f3d33a2df1d7acf8cdfb5a99a17c2407bdd1027b30f2d831cdf11bd4fdc9d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mk/firefox-61.0b12.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "4847358c0d1e3b4c350978f9ce54df0ba74b95c0d6f734d3e81205228b295743bfa29b560cbbbcb11e32ca2100df6555b8f495675e16cb525b7ae5ef77770d1b";
+      sha512 = "4ef7ac1803bf7634e754d3719c3ea53f2f19e7d3faf47f0c91ed1bd2446871d43ab33b1786a00f79f8e68ca57361778a99663160bdea8a196d109a6c347d4dff";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ml/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ml/firefox-61.0b12.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "b73bdc8c1768d9a335dcd4261c50fd5a6d2d96ea3f29579dda4262c1fda6ad6e30ff52073945a1e5cb12bddc15c4b83796585bee002fd1a4988853a46c467bd9";
+      sha512 = "40abc6fdc4ba15d88af54dca0aefa33809140ad3d7059eb17e86accbd1a788d045b80bf94117819813647b5b5011c3e35783bbc7035808a42668c44278170845";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/mr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/mr/firefox-61.0b12.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "c1a26b027acffce2ac8f38cad8403bb50688fd51e330bfbefc295fb854c0692e4c0b928fedd82fd2eee425a20f6577309f5da8b04b4e12e60b03556ed10bd059";
+      sha512 = "800461d8726ed7cee434d283bd87942ec1729d5fa052c4c51e7de44a69b4b9b2fadf9c314e504e75ec713e72f53aef323ec45708b3ee73ba758c8940ca44decf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ms/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ms/firefox-61.0b12.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "5184e98def6d4d6c9b7a77f7be6dcb1a5e3f88732f14b394c737a5ecd3bd0a5e514b61978edc0594f2f503cb54b7f22bfafbc09d5e697d3ba2b530cb42d26410";
+      sha512 = "c00f27a992e42b8c5c707a07946582e577431f6e0603bd1d6fd23308961230923f243fa07b484feea97e9f05a66d4a0ac9d2bbc4f6a14153d49bd5ed55eda5d0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/my/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/my/firefox-61.0b12.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "2ddab9e165fa114153675d3d2f756cd31658f045800b0535f4eb468fc42d260574fa0455c6cf07ab3c96d2b52d557082a4b0cb15361511fe660d75befc302434";
+      sha512 = "c74fea7e9ea9f6967893293b11011c980ad1f621aacfab2fd6913d6fbb39ec4e33480d527a677237495bf7a5fddb6a2b012713251ab58b033a90fea856187501";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nb-NO/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nb-NO/firefox-61.0b12.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "8ae0d4172f290fa5d51fbd2e477b3b1f74615235155037aad3ce5b2afc1ab28b1f2f937fe0f5bcb3564891fd2171e8c49862672a77e4057b1d7501e13e4bb6cf";
+      sha512 = "f3cb7b04a139a7c4d9974fa50ca64e31109b05719c65c02114735d05e0cbb1a8274b212470d3c49150afd28c53b8b52083bc97fa95d31460b172bce81852414d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ne-NP/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ne-NP/firefox-61.0b12.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "c214e9dba678afeda469d8f7c858837cfb0a8ce13b281469925eb86d94f485d2f181d41a410fed049744a692ee1bf5bd004238d0e8192eeebc50a7fea37188df";
+      sha512 = "21f328f1deb08a06957195ccdd6de3ee08c316655643e60f4c1c8fd2748d69ccf778a9e108037a859ec1ff9f079802b6f70a4c0f5436692eca42f0ee2b6a18a3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nl/firefox-61.0b12.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "44f8a7fa592105aa6113227fbcb28dbc40904e50b2e743c8340a39178d2f821baf65f08af1f971af13a25279c76f825c684bb252a967f2f0bbe53f88574a0a25";
+      sha512 = "c640dba6a09dfaf25c9d76f26808a5d5a6d96c7c8164f567c1be396af32a36b64b07eaa2fc4db7b011aa6dd4e63b31fa2d14499eadd59c34894a8ac16b6e2bc5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/nn-NO/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/nn-NO/firefox-61.0b12.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "be33124e0c0c411fefc2a7cddf3b1298f04423cf6a76b879943cc2d63f1005ac73375b9853c6af5522ef4381558756f2a5fd417070565851a16a59f29ff993a9";
+      sha512 = "bd69bba361521ca53cc4603bf874122cf21977eb86be84f58664da4ccb7d330641eed6084fd62a14920ccbf9ad723cf3edcb44b2c672e6fa46ebdc3129d5e8a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/oc/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/oc/firefox-61.0b12.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "45de2e78408d56c11982868badae10edfe90e53c98c03ff67d9c7c7ce82603050a5f44a99da1cb17447ed57a2ec5bd3a12a830af56b2cd10b80d88a329ee35d1";
+      sha512 = "6b325721e50c9f5d3cda7961c169f1bf61379f199f203eb04708e5daf5adf4e5cfbdcafe393846be8811a95caea08eae379413f070fc87fcc6fdc8d792429bfd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/or/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/or/firefox-61.0b12.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "fbeec26c20a545f8d34b2848f74d433a8ccb8686eec10ac614e06fec35e017649108d5a371c0073980f7c38375c700d58b298d640b2b4b40711b60cd8187977e";
+      sha512 = "fb810758c07df0e88346e9da1b3f69b8ad0c1f325253b4066f979028133b35b6f38ec6ced190b469302edeacc2be1480a89101ebd49595692ba4ae0810336f72";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pa-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pa-IN/firefox-61.0b12.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "54974c56b30eee44d29f5744176260c8bf6370a627e7b9439c3888f5be584280436f80684ad3916ecd7b7fb3407a379546da1956e8e6bd8829f3b2540829e068";
+      sha512 = "a64fc38eb4aca8f51323c0fd579f92710f9f2130885f1d3af375ba22be6f052354664abb35cf92be820117f37c2e86dceb1a0dae6b06ffb2a38ddc71d35e6afa";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pl/firefox-61.0b12.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "a3139bd9fc34f38f55251d1fa03589f859d69a2dede76dd699980a5359050fabe4b9cedb352ddf21e1dff8f4f328d6d2a4fc87ae6b64166dc325981df57d50b3";
+      sha512 = "90284224c8c4b990280e60d00c7d787a4702d466a4a98be69948d56e9d2142388c39eeb0de77d7277b5df97444de7c6b341c42020ba42dbaf1c80336cd8f2397";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pt-BR/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pt-BR/firefox-61.0b12.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "b95635c38ff7a4a23b1c383ae8296e5362f4547e6082a0ec355d9c400176ed5282d91bc608cbc1826903dc26039278e1f923ef0a0e850d96232b59c61eeade90";
+      sha512 = "09f22cfa4d6a5d7943ba21c46b3d272f002cbeb75c70de51ced0787ff45068eca9a6f7f1b336863ef315b41e8d6145cf77f974c7ae12c0d2825720fcc32f6f48";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/pt-PT/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/pt-PT/firefox-61.0b12.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "770277e4ca433f50a13bf2b962661f6d426f580e2ed71b23c687545df38622dfffc34df27f892b0b20643a19cd6cf6f13647b9ab5c1650bb089cf5c95e9726d5";
+      sha512 = "3d6f83528e8161f5dfdd6f35174f88d677ac97fac3ffb561450ac54367f552cf9c09ff08a69a82224123ca271ebfb2d011723de4a8a86708ab0afd34e9806c30";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/rm/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/rm/firefox-61.0b12.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "eee5341bb68d8bf2102aee543b5a355e0d44341ca0c9404714a5affb215cbab5bf329ba80d145f31c671da096a308a66baeeb631475937d314770fcb321bca72";
+      sha512 = "65043eb93f0b43f1e7a4282732d06b5d4043f898eec4324ece23fdea36812c85871fd943cabe8265badae913d7338e925f519732edac792429f7643adc062332";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ro/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ro/firefox-61.0b12.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "a350c005a481f08b5a0c3683326e1b95c2b1a69d64e8195686fed68be2ea01752d9b8cfc36b62ec61df8730bf14e6603547611968136518ed7c1d4c5cce97852";
+      sha512 = "d78f56f3171789ab1254f6be63725f5a5462da78fb1d6f5df1acd4d2e3baa777fdbddf565d4f458e678508cc0aad8bdcfca55d810e86a1c7bbd490b303134252";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ru/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ru/firefox-61.0b12.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "d0bb1e20e75ccc0306b01c6a96b3c7e169afcd7b72e7ae881e96d6058efcabcb814e0a33acf17628af16bc014083bb48d7f53703ba58f63cc871aa417404b515";
+      sha512 = "51ebb33bd00d2444a1049222fb8d97d846034fd4eca5e441b066c4da262080846e22d893e1fd7ed6eca390112f8694996cd001a28ccb7f24769a3fa479cbb453";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/si/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/si/firefox-61.0b12.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "70d749eedcd0fcd96e17227f60606ec36783a95beae52854f48d5692ccc0069e9af39a21c906140b2245b01631df8670364537d0019794788d063416506694c2";
+      sha512 = "097e100f8b1d476fda5d070d87ac3a0521889f5c2aa7a26fa794e01b518b311ce380c8731bcfba41db6e6dbe24c6cb83fe8e595dc41cf2450a72f7e6698d74ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sk/firefox-61.0b12.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "ca3b8d19b75d4c7379833c4c77ad03aaa2f58bb1644da6dec4971ec4a4d42109e903f50b82eb8d6cae8ee65c4511cd9149514c8ca96fc8c73ebb0bac0c83dfea";
+      sha512 = "603b641c4f23a68767cf97945d8e72e81abf2cf40da031aa6d343729ff028a30c3e4bed074d4377aba9dd58d3f0d18a80bd9cc15ad81dad873866ddb9f6b00dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sl/firefox-61.0b12.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "7b73224876d367a7d72a068162fa19605719c331be0b9c4970e10461b9655520edded19e013efe0d4488b40258a1de6455fb717333470441af6cc51a69fc39fc";
+      sha512 = "6eaba505da78615bb9345ae6bb3321a089dabf470d6b4d10c08290ab81f0b44df346015e96c95b413d32eee27bddc53ca5e3d1a632f8ebfbb8fdd0580c937fc5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/son/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/son/firefox-61.0b12.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "51e823ef446148f4faba9e9037ec132d3e9d8ce5257b1672aead096035a95fc42ee9cf8003747252a567a487c215bd11065776515059ce16f2d2478754828da5";
+      sha512 = "dddeb77817ecfae0e6671c8db2aa4a0c313c3d7bc11474be4d2933033f11dece142c1b6d1e12fa1f2650e7691dcb8ddd58a2ee9af6005620647c06d69f6691fe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sq/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sq/firefox-61.0b12.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "e95b91131b23a0447f9c9a129790d1b415b05814c7ebe00ab04579835ce1ba47ca09fe9285949635e33164df7f45e838763ca5a2ed88efff950afbd923f5a1a5";
+      sha512 = "b5f3e7e78abbc20d612ea38ed74697f4543e6b580605cd37c630ddddbb15cb6829af2f69fbf470981bf47184b4ee501426fb515c6f09fc4d7b1156bdd04002a2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sr/firefox-61.0b12.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "18f27f39d9953ef6eb39f872efe3ca8b371f84ddc5253e5c6440a3ea5916fc602b827420e5f7737e0596578fa2fd1d2f4663fe1e9b2c977d8f1240decd874dc6";
+      sha512 = "b1687aba62e211f614d0ed4d307fa48b8228109665f42f1557037ab645f87af54b1c0069f54c14e09d46d652b68e6e5802f83c3052b45c29f5ac9284934b2961";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/sv-SE/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/sv-SE/firefox-61.0b12.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "f1cd96c9d1db5d7f47411fc1cb12e8356bbcf1dbd1828e53e39ad3ab1ab9ad423b125ff9b0ab18f5bbea1ebde04d10768c759aa60176e1a7277dab6d10bb891f";
+      sha512 = "fdb632c4004f721fba16669ffd8ae0031023f55fff3ab0de3f045fc408232788b4aa7dff4fd5bbab847f1b7a1b524fd786dd9c9f63ac289d699dbfad687a759c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ta/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ta/firefox-61.0b12.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "6a802f54419d911e2e8cee0a1a20e7d915c8ad574a119c6a296e2c951de8bda1874b2f4c047f9579589f79520ff7a155a0e9a289120b4539578b27da40db687d";
+      sha512 = "a53f07ad5212a975d201dfec81a89c18ab83e8e6429a67d835aa47897d8a5ac4cbc676d178db41fdeef4f5d066813bb68fd5b52c8dc9d55b8830be2b69b353db";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/te/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/te/firefox-61.0b12.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "f5fbc36114bc91039ed6fa9e17345de50d1300262e1244748a311da0dfab38084b5680c7245063416bea3df29d0e601f7acb11961ad7f6773af63ce7fcf65883";
+      sha512 = "9cc6d73c01531a72dd59fc19e56987da093518f4a54b76e6d40fb6f26b708caadc7c301d069ba8138ea91cd667c46e1c298aa63889b067a1b981cd3bafeb55fd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/th/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/th/firefox-61.0b12.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "eefcfc5d5b2123c4589ba7358aac8ccc01aa9b38cd4210d3e810552fc25c66467c6d71d64c0ee9b75cb2ee1c9d58a2ec6e117fc60cb60a678576076d2cd8db08";
+      sha512 = "8afb2048fd071ec612791c26892652c01aab0d12798cf26dfb5af69e97962d805f962c555e4e6c842d403286da7572724022885f13599fbde665dbcdb27438fb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/tr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/tr/firefox-61.0b12.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "3447abe024b9b06b7978320bc084cdd6179fd0636bb60e629fee13d5e671e5e40bd398d8f296abdd1eb353eef57ae5cd22b20722f390451bc9bf218fb0cce392";
+      sha512 = "2ef229013fbe4221920a2573b7925be045ef8062b600f8e560e844ec87420506df3c712378cef34e7890e387f0a8d4706f7ceafa1487d5f024a69cc46c218408";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/uk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/uk/firefox-61.0b12.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "e145d2aacee3a41d4ac178ece89e1f4f223fae87dd2a2236199abc34e83e2bad5730a6ecb1542c3cf6508e2b51a64ecdeb4293f97328ca683b62d8f70f96e9d4";
+      sha512 = "ce10d72b1eb8ebe01cbce38722ed16333b6eda3616aaf398a40c685ce062874339599a1c1344b6d9c9529e072564f3bf739b56a62ad0c6deea2ae2f5ffa29505";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/ur/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/ur/firefox-61.0b12.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "c040b31191c14e491ae774c46e33c8433f7d15f5b4cfdd1ae2be3d292d750cdba271e5f5fbbfe6f2e2af52ec24642d524b7141288234e91afe038aae4b6da4d3";
+      sha512 = "52c7fa6169f399eb224bdbbafef9951285543a478985088e60f601fb5c798855d24b1b8257d29ff44ed6c5435fea4e65ec1e1164daa0b7e22eb32152d172e6f4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/uz/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/uz/firefox-61.0b12.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "e6d81219e98cb11e9b6848364a551dcd427c7455d4ae87383d43f191a15bc13815fe7654a1198f1fc5ae63d5d300ce8bec801f1eea51cc257156f99d2811d0c5";
+      sha512 = "835f1cae73b327bbb520935b801b78bf47b9e58a03962aa22a9d2b933f187670d828871a679508702a0ac2d461e17bdad71a3e0bf2e8d34824b08dffb7f65d52";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/vi/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/vi/firefox-61.0b12.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b15ac4dd72f0b4752e72cf6baeaa8f0f2bc34303886a33ebe8859ed8a4fa2382abe260d54d9fefbda9319f39fef056bce53e07d1772ad79b5e652277371c4ac3";
+      sha512 = "f4812bba2812a71e004107a0d761795fe1feaa9705be0afe7db5462782fc888cc677bf5eaaedad7f5f914b827435bceba8322dd246274539d095b082f1221fb8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/xh/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/xh/firefox-61.0b12.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "90c88df007abf67f973b96439ce4bc3d62f678c7657cc3f04f7bc74f7d0eba4fbf25224e35cb56d2736861413c54c95fe9d7a4170a460def0c7fdabad5813bf7";
+      sha512 = "d8ba71f75d3131dc130a638692e42565cf9a5cd976caee18220cba6bba8a858f728f470cf345294d286bbbd3e2059554018f86f33533fd9dace88f0e0d97c0f1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/zh-CN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/zh-CN/firefox-61.0b12.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "ee66d559133bb827cce96470299b1cce56f9d2b8f16f013503138e54a9c3aede0027ef062640a6c691d551b5b56025b06d7f13e92bdd5a8c9a7403f5aea88548";
+      sha512 = "49ea68976c1ea0a972b7b228283cac2a1f0c9bc660da4456e700786d235e7f40a04f89a69c337a65e82a4c200307120cd2c8cbb1fe3536c9d417be07a80c42cf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b10/linux-i686/zh-TW/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/61.0b12/linux-i686/zh-TW/firefox-61.0b12.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "9507c7958db71618c74b6b23ba672668471a0a8f7198ce5a711d087b485f8504b4471528320e3969f2cbbc34e02b19642833c8e2a963e3af745fb5b59577ef6a";
+      sha512 = "0332cba8cbc962ab2868bc61de0748c446c098a45d4ce8125c78b2f7d167e6da94348cd255e2910471c9ff7635d4ed8500eec27c1bbde21e79cd65b7f88fdba4";
     }
     ];
 }

From d4931441368d79fe241c55d33b5adbde9d54999f Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 9 Jun 2018 02:25:10 +0800
Subject: [PATCH 3315/3370] firefox-beta-bin: 61.0b10 -> 61.0b12

---
 .../browsers/firefox-bin/beta_sources.nix     | 786 +++++++++---------
 1 file changed, 393 insertions(+), 393 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index b48eaaccf000..ec6b0734a1d6 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,985 +1,985 @@
 {
-  version = "61.0b10";
+  version = "61.0b12";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ach/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ach/firefox-61.0b12.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "f1320b763b1b5ecc502d41f16604c73c346d3475b84840623802d0ecc8caeac44a5d754846c9a1a2814fe451cde75e2f0e655409400f4d3acba9cb53c60e9cf2";
+      sha512 = "52a328bfa793f42b7244eb29368c4e5ee044d4bd3b291aa5c43f0b6cc8c9a0486b15c7d44bf1a1f1e51697b6f775ec1c55f27a1970284483a3f8b28c64ceda6e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/af/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/af/firefox-61.0b12.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "44f0a51ef809484808fc4aec9c72ddf548b8a37b2d405a80349ec0ec3cfd0610fc85288b73a1daa069ad8fa808a2db431f0c8d7fa510cd0f340c292fb73b828f";
+      sha512 = "8278f56fd31808414ab5df2f6aec2b4df31c8a7f1e5658213933254c58cc78087b2741befc4260444b2b6d32b38f4d5fbf281e3c6a30248e31f93053ddd46057";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/an/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/an/firefox-61.0b12.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "c73158c3ae6309c48f57e16fde9c4720cbaa03b82fcae0160454f732f05e23521bd7e8f7371b953bd84e916f00726b44e9dfd1df513b3be2c1a228128d6f5873";
+      sha512 = "7487a16e06b0e71d1a1b3495952d6216f3aa4941fe20243a276e61bb2ed4cd0f08b7c02886437ae82a0fdf1b90773ceb54a31ec3290ce050ae4170ac16a4e226";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ar/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ar/firefox-61.0b12.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "cf833f4f05692adddb2a34c531fecedf66fabe9b1eb6bf27ca689c97c90fe02afb1396040ac53fa083393c3043fd7547e93a9af25eab48da33437146e71c8473";
+      sha512 = "df491982db74b684c6aa1a1163564b2210a502d994ce3813fe73cce40e9c4eb064a966286ae35db436495c9802528995cf4ad80752ded199dc8528412f150042";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/as/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/as/firefox-61.0b12.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "da95c56c6e29f44cc751e1d96c9cfe81b5c523fb5ccbe7b24b8f7ebb840c81f1e4e324887445c793653bac2f4a1861cd3ebafd52aa63282e0f92d82bf2cba397";
+      sha512 = "eabe64dcd8d7daaedf6ed6a6538e32837752e7c18e1fd19d31a5751f556a8a05a95342fd2c8a6438c1bbb6546101adbeb95138b83baf6065be7b93b4e4d45f2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ast/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ast/firefox-61.0b12.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "d4d70405b5be8dd2faf01ce4dbe7007d64aa1f25c8c445730c9c4082a45b4fd12e7e921097029bb244015a4de8ce95426bb44a98a6a5a2407985c200b0178537";
+      sha512 = "a10cf8205b4ed7a83ebbf58475d2b24b831e548c5fe99b19e05dc9106be53516a660a877f8d952dec86c97eddfbc01100b9056630e5fcb1157d45cbd0a473323";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/az/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/az/firefox-61.0b12.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "7080c9b35f02ad119ca0634698c2565b375bf400876e73914eb832035796e282b34da07c664513382de9b686f974e830be1932b7c39c2cd816d77f747f218c8f";
+      sha512 = "45b55eec4e38782d44708e4db79e81383cb87425c4ea1db124dc986326e889f41f41f361fb408c1b1575604ba92173d42d959f1fa333bc06dfef2bca2cc6f766";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/be/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/be/firefox-61.0b12.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha512 = "21cfd56ea6a933c3a9c52c76c1757f33b3dc5bc914a95489a3365c8cabd78ff0bcf12378563c14854df155ecf0b93f0dc39d2520c4a030e5507d190155dd26e2";
+      sha512 = "b442e60610d2b705210117da72b37f28f9fc5c72f3c0d90a11ec7136be2230f6f4953b69cfefad37948aa4afccaeb73c363cf2de8f72c58cfeb3a2aba6da747d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bg/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bg/firefox-61.0b12.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "e602233214b5ba1245b7e7d306da132674a5403d233f221b910c9bc6e73ccbd04acecf62f14fa0bcc1104f64b34dcc8c4adc91194f81b576872754b266bb3bc4";
+      sha512 = "c93ca5b4a33041ef2c0dd0eab472ff7d8d94bab7d5b2f17600bf45995a1c67287ca8a1bd2c82ed5fce3d15c8efae228c6cbf9f5884a97280f52ee431836e02bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bn-BD/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bn-BD/firefox-61.0b12.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "b183556f189645beca53aa31dd282e6aa93d40f4ad4316ba23ccae4281ed3365c542d70addc4af544c267077c4eb1a4e797fc12a7a6a3744bf2f8cb9bc312a8c";
+      sha512 = "25b6962a0b196bf19fe2de5f553d49c78b1c1fe4037561cbbefaaae453769b7dbc99e92876706b021eaac28e3cb7dd2bddd05206fc983abd7ce7aac49853cbd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bn-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bn-IN/firefox-61.0b12.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "da0ada9f93a6d78c7e26324c74a9d47b9dae8fae81450663aad7e247f95e72e752345863db304852fb2b7e700c0acb4238152b331b817a13d5351d541905e974";
+      sha512 = "b035474bbc3260270a79e30c3d7b0c9d211d6c4498a2627ddd9c4266027654ff317682e0654a9a83b9b8b5f4e86fbdc692dad08b8b45dc2e671fdf87df673bcd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/br/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/br/firefox-61.0b12.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "ccf4662ee9f9b5ed94f3b50e328642560a180c4f72e0da9a097078519ebabf5409ae4f439c65fc8020cbbdde5e45516d109d7ef31c37cd46c60730e12bf71de1";
+      sha512 = "bc3bb4159aed0ea2d24940c245d2f7305b8c9aa2db08b89050cfa1148abc51c66118176e1a4796cae04b37ccdc7d46908b7321484be689c65dec64ad6ddd3730";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/bs/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/bs/firefox-61.0b12.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "ec7d7aacd9b93456efa00041d47b9eddcdd46a8473db2d28334443574ccf07622b1fedaabbc30f2b0d42ccb90b54eff20c254c0d80359d656c8b872a8d52eeda";
+      sha512 = "0ad50c789c497ee9fe48dd981c61ac5efc8c298d2f113294c0f273beeae5e26461890def35568c670d6bdf00346f01a87cbeb30936236a4977dc0e9690da9eb9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ca/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ca/firefox-61.0b12.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "4a4d44681024bae6e714c6696f4476bc27fe025061ad49582f0f01d73dd4751cbeb1837c8bfab58a85efe9c0c65d610a6dbf1968da9b6514fede4e43ded1ebd4";
+      sha512 = "a8412bd99749c5b8c4b32b4a92d24a4ca464e9bb04e4aaf36da0536cfe768bea38bc9aa077600473d644a9c68b202d64ddded17c3f2a49d7486bb7ab966a7b29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cak/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cak/firefox-61.0b12.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "904c6d56bd6971e167c5a7f622e1c453d9a1837a8973c2b6f1c1673bef7f43e499a6753d5ea8f57ae68ea8491d8ccf61bc4e013c3cd9f15de1e6e5f4f8eeae3f";
+      sha512 = "249f20e9a18ac6c21d3ffd27d4d1da5385b44b959ef884add67651f9560381967fdbb5ae51157736a29ce20882ad78ddad2a1bd3e586ff204301575ab6d277cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cs/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cs/firefox-61.0b12.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "1225e7246316fedbdb933014cc53802b317e44a100d941833fa7ed3f59755afa87553ad2f054404290d3cd519f0b534f18811bdbb6e92985beb10c6c8103cee3";
+      sha512 = "28a7a595f9348a6e19467ce25c6b02ff91b10db4f8ba05099eef4e4e0404c29a8a8ed4ff589b0d5b95cdf3d5c2c84c69170e420034399f906e9632ec10e1cfc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/cy/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/cy/firefox-61.0b12.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "afc88489179f5cbe7e94344d37f4930460d050644a3bcd3acc896761b62880ddb525c7fb1da4d6c564c76d051b9f02475b9d9db0e4a1c768b35db667b2589732";
+      sha512 = "cc3c2dfa6ec782bf4ec16c914063c88292bebf81d3814a2b2873490409f84c0934c517e753a4813aea72e44d76a986aec283623f3b17e40cdbf15ab22b4a7213";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/da/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/da/firefox-61.0b12.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "d18834876a5dddd72cd439fba28b91ecaea2033e90cbad5a7d2a6f89bd0433c7e4f2bb6ee0a68057ed8b02bcb0075e29d3d92186dfd2dfc9b7a811fb35f63a1a";
+      sha512 = "7b1d54a8a18472369bc9c51d42289d399bd0c59178fe44026229f71390203adcbcda944aa6e7288bb87962a6d7d2123659969d91d3149ec1ffd1143516c23333";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/de/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/de/firefox-61.0b12.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "51789ce2a18920ca616804bbef5b4cd6738884a6bbbd8397131e6882a470271d630cba4facb8dddd6951af712c5a17ae4703025d51e1c9ab3b8edbd4d444660e";
+      sha512 = "001d83700ad1630ebc139cf7228c82abeb62f4e9b06179bba185e10731df9e040b543ad4b2ef53eb1a8f6eb24b5bba341a7c8563943e09c23fcab67cce930a3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/dsb/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/dsb/firefox-61.0b12.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "5ca16056bb13f8861691edc05db28aabb3a9d5838c7f5ae231ca9700894a3ebd081bac007aa655ad3fc4724ea31fb35d3d0d33b955ddc8c20651b28cde0d0f6b";
+      sha512 = "d5750da2cff1c2467a3ef1db671b3d457c185f95bcd3865e553fb30bc1c574573a6e42a064cbe666fd35a1021fede35975bf562a0b161783ad16332080527784";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/el/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/el/firefox-61.0b12.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "ff97b8db8bae51a15d7167016fa4e3bae7ca0690df5800268b572fb74ca4b058cdde789c6f14423258301fc585ff1dd780137702267070c001eb3b54c06d437d";
+      sha512 = "25a5d3afc9543abf9a403992af0f1a2690559e93357bdc7742ab216c87888d9d7c25a711b2540fb298e699bcd13da5134bb35584d252345669ed0d5e877b5277";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-GB/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-GB/firefox-61.0b12.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "2b64dfc41b38af92695530cb4ef63ab6c4272bb99eeb4c848daf5813402b9cdc5c83ac72551929f6cc1e28607d90fe15985033c1aa3a792a039859ceb129dd1c";
+      sha512 = "033999bb8c3c973342755983fdf208a828ad2344a5aeac6e82fc9d066afd21784ba48866981cffd4fa793fc2ae063f420931402e9cd290a97eeedd9047678f4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-US/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-US/firefox-61.0b12.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "8fe66383f7afd3e5353a93ed7b38abca70ec1c909dfe27a69ea5eb2a7a785120605eb581b9e6a0cf4586a7e4c5512619abaed0ee60d7743baab2c070a2c5a8a9";
+      sha512 = "662859918fef837f5b66413164f1fd89c68506a12733d0014dcf75366dd62a03489439a035ad6481a4764feaa80a0a5eec5201813136f755d95c1bb65d87c954";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/en-ZA/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/en-ZA/firefox-61.0b12.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "d12f30cc478db39e610d9a13cda696bc2e88a0105425c6d2cff984c81ba1b953d3c7d7844469ef0cb51b21d0f8ef8d087ca621e183c3ca27e8a7dbc96881c133";
+      sha512 = "5f5a6ef28731594dba101d6e244f909dbcbb8b08d2808440bbb485038997719f30f2ba38c1e021d8b91268c7d402b3b9c9fa341afec412cb5878a31a1150c40e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/eo/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/eo/firefox-61.0b12.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "927675a0c82deccc56931a36ef7597cf7be73712cf2d61179ff8163b4c6216fd32c59186f8a76d9d3c8b1be4b70b98370ea323eed6869e36fa680ee0d53deeb7";
+      sha512 = "5c96c2d900106ddbb0e527aabb90f082dccbee05e8e05a40a3d704d59254027b9ef42eddd0c19ceaf73bb5d020cd7a075b510ec9fbe4f9cae71e3cd92a6d0d8a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-AR/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-AR/firefox-61.0b12.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "d172ec8678f9709958e2f74186cc5712903eb9736cf7dde60b5bba86c144f0e415a65ab5efed2de017ce72c091d5ec5be7421fe49772d64e5afaa2865f52a7d9";
+      sha512 = "83c0596af66758bc50649badda5e628ef6344ff1e6f579540c804a8fe1d503c36d2c8116d9fc4cb1ad4ca8cfa13dff0462b299f5a038f7f607282ab702b4ac82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-CL/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-CL/firefox-61.0b12.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "452be0d583962b7891b673ebefa9b02208f59beadad96c6dde3f8d4367ea794031c309b56fdbcb036028e59f33942e136417bfc827e1979450b726e64735ea52";
+      sha512 = "d03939763ce2bec161acec52fb67c9068f50e28abb838f9a073bc4bb479a1696e5aa721cd2e4f6993937e6539c7c56e16385b1ffed6c9942b41996fe44afa722";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-ES/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-ES/firefox-61.0b12.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "b12d48bd9e73e439dc7968443bad6b5a855e1dcd87ab4a714a1b30ec0a2c94880219f7eb6c914b0712d7a706afff696f9dd2a3cca3dbef2a801785e0d22b9002";
+      sha512 = "b200f2c47bb70213aa13531b540d2d11d457282c7ded5316093b61e6f09cf333225aaceeeb9c4d44174e3faad4635ddbabd87c399fac17466d53a2318b691b0f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/es-MX/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/es-MX/firefox-61.0b12.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "26ac7f76d3f3203afe13687a0f61cfd3bc5d69feb68fd02a7fa13ff391a1e0b06532d5ca7a2222bcc51f1e083e8eff5aa38551432e84ce1891e0e648d020a74f";
+      sha512 = "eb26c0f4e1cbc4c19a05de06781a9012c46e0c30c4f7eeb33817fac24bc1d052904d77a51ca4d8f2a7ad323e2dca1c026f339adf4d29725417beff74fb2197c1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/et/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/et/firefox-61.0b12.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "14848b5c938bb40e9e1f4825854c4d802b2568d534cd777135f5c17a4e17777b35c77d888eb30ad260ce4c6fbb5cc473d55e23c5ea7694cae63c29bff0f24a04";
+      sha512 = "7b36afcc29ed9e54aeeb563361c23fd97faa572fc470f3a80af583076d6fed1003aa6f9152c958466185672ca14232be4027efba6f3b9383e490d997766b9c4d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/eu/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/eu/firefox-61.0b12.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "e5ad3ae3942943d2fd82ff83fde360c507f2b4d50eb4ff87be919a04c60dd410204605c95c439266dfe9ca4200430e2a745b04d5e29ac69d27de3a98ee91699c";
+      sha512 = "3560f55503091209c10e5eec35e11d5eba4051b37e8eadeb52f6179697570a3900a5c6807a97cab39fc028966e2d1c4b1acb57878fa651f5c435a8a9a78325fa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fa/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fa/firefox-61.0b12.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "968967397e661e921a03e473d2be3d25d31d345d2e5501456cce7022d4523185207cc78be7b0149645bb53027d618a9f22f775f01793eb687274d9b14354013d";
+      sha512 = "45b0e2c3669d556e62ac9a9f9c6e3dba61c304db275b037e9e2c24c63513f55c7d41f82256dc7cfc23528d1ae92964c25268a55200deaad2113c689287a021a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ff/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ff/firefox-61.0b12.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "732f1a3bb6bd153762391189376a2796b07b7626567a7348cda08ae38ded10d9dfb3244689cefaaad337306f667796855a91b646f210576476f2f349f7f1d35e";
+      sha512 = "c9da6bc3443dbdf28fdc9f9c5b11be77e6569621286ce3eb75ef4160aad22f76a78c98f700f80be63f19c6964771c7b4f9e35d251d8cbad5aad98889cbdfe74b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fi/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fi/firefox-61.0b12.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "8b84165ca3c333f776835149b62500562c6e69ce190d46d6f2d0d93cb7c24f8d0614793c830cc8b070ecaf316c21358f627bf221049513c20a1dbd68d9e59c42";
+      sha512 = "845ec5b705525585855cb846454f84a683a3c53fd27732250e4de823113a9f178a8dba0cae5da456cfb8a7e33121ab046a8eba68f0fd8917fa7484efe86cd7c3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fr/firefox-61.0b12.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "dd7dc60caf98ebf0726dab9781f2f8149334f7cf658aac2267b71ae3a80a89126301ff371ef56028851438b33e72746dc24d546563f9f1a680899065bb372ef4";
+      sha512 = "eb0c835552d8bedc442140969ab66973d2852e016bfd3bf471bce0063afe7fd3a6e52a0e4759f797886a89c24fe84caa150e01867078d23026ba28dbec476761";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/fy-NL/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/fy-NL/firefox-61.0b12.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "b5728dcd3cac5546d05eea13e62d4327170364c03b512364ef1e9d4d9c53de0e3c709d71528ecb15383a2f1b82e072b84c9aba61d054fcb102cbd33a77131d1b";
+      sha512 = "438eae3dda2d35251fb9ebd18e42a58fd8cd20ef475c9575f0a087d9c336daf07482c8919791c5e0f7d6deec58c02b481c9810a364637f4a918d0ca896fae9a1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ga-IE/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ga-IE/firefox-61.0b12.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "50f50e79e1d8b62628de28a8cd0c37e90997e6d1a59222e7a8473cd6dc05d50dfebffd185cffcc3aab915fa180b5b8e09decc948635171e5cdfda973f74bf9ab";
+      sha512 = "e1436c622ffc70b381809e62c9889d7b35924914c689b55b0a05d12cc13a7a612677efe47e0fc4b58b90bb188b3289630d86874ba6849ff619cf9518c77c4c80";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gd/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gd/firefox-61.0b12.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "3425c84784e8cfb8efd56d6c8fe7c4bee995a33b38b3438c648342fa866e29e75cbd7e7f0a1269dd4c4123b172440e76b9615b3058bdf6761c9b75116ea7b3ae";
+      sha512 = "2cb057a728e2772181619fd8b908f9b363232d12afeed63052d3e4c0b201e3f960aba6e879a41dd3f381a8561a813aa5ca490ae5f58b9e6f095b5ce4ece21aa4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gl/firefox-61.0b12.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "5d304c6b65fe277a36e4b7f697a2c238ed4a9d2702a52befffeaa4fa3782a1d456dfffa3645d09fec307dd27cb2c6d65fa73ea1bcf39025b51b3cebe73d6e70c";
+      sha512 = "4d00e5cb9ef0cf15a8c8db979836a50d28ac4741875f56f632135cc777f8096d05e398d773596a314e24627ffb549e354a07f1efa14c74318c266d8c373fee26";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gn/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gn/firefox-61.0b12.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "38b3a8bc2a36650eefb6d0f5e3ae4f03443b1aa746db35666288ccd4263e7a60e6803fccb5a33c5631612a2ffa6fc18dd8a564de34b966d3284e5babfb06240d";
+      sha512 = "a5e92fd556d1d084793b3d3d5b61bf7fa083f1447a88be227cf58cdbc7f66e156ca67a2a3f6508135935f0315efb02b0ee2ad1a597a7937d6ded1efb7d7c1a07";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/gu-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/gu-IN/firefox-61.0b12.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "3f8933cf0f99193452b8cc837434932122e01fb86565cf72f5b42833baaa3705aaa63b811af4ae2826ff472fc1cca7798b0afc7aefe1cec28d330c8a537b0e0e";
+      sha512 = "02c9c67bb7003c114c6d64f864b878c5ce6048c54f6bbf13753606bef5b4d1ee6b62c543de230d537b5afc7c99b619049d45989c851027b23f7d1e8a8c029e86";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/he/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/he/firefox-61.0b12.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "d2946ebfcd2ce288141cfdc4cfec8e7f5bd6c4f6470d6aaec4156ef4e36a3154f262a38992f92bf6b18f9dbeee43019d23e1d40f0f481ac1060a52b5c5dac4be";
+      sha512 = "2150ea2261ceebcbdc97013630bed5b9fddb581b52fe416ae237115a93997e4db3ceee3056724df321ab3922effec37dcb421e5c72f417301c8e500d877bd606";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hi-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hi-IN/firefox-61.0b12.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "d6781605eb332d61c66bcd07c1ac177e07bcf9d8d24b4f720de95deafc4b5ff68d8271792abcda2473321217e5288daa64576c0cdf37fb7590b366980e59c821";
+      sha512 = "1944f410ee05c3e2fea73460a1ed576490a54a8f16fab3cb4893913c7db9bbc7f133cf6a0aabf00736292986f11ce595670e03f1a30833d57549dd2d0943a0f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hr/firefox-61.0b12.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "7dd72e8b26bfbbfca7f08c0ae5fae73ba92c05cd6d221c87d3257473422db159e31a48c66f96d53ec64722d9f35e7ca081e373ca11a9b9ff8f85bfb7693f0150";
+      sha512 = "3b330bf4db4e818723f17b6ae8b78337e2d1c8c03eb58a1ccd0d078ad70dcd2864a5c94e7e1259f1a1c4cf3df482659b6e8d6d37c1c0f131e030101883141bdb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hsb/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hsb/firefox-61.0b12.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "8aeaa498060a40f1c88a9d4bf1afcefb5a6291707e1eb47e27044f7503de4515670c217b5eb1220278a3aa3f3bc0528023757f82c583fc907447f5d700452527";
+      sha512 = "06690a9d7933a561e0ee7d6ce72a08c34626860f6d0a5475e0bbfcd598eb5c499a3098e7ed354341553600fada49cd8a1411a1b6bb016b10d67acf5e5050609f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hu/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hu/firefox-61.0b12.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "08fc38f050c359c146b3aeeb4cf15032da9ac45fa93a2210ebe6baa673f4692e96154e127406ce65509cf6aac52e0ae550c6735e3dd4f134f5885f5c056619d3";
+      sha512 = "d61587a46d45839fd2b3545ec0ef51a58b8af22ac795f77031f0739320f6568f69ec637a4ae8048c519720a6756b87f6453dda77a2d8eab2de7d7ba4031c53a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/hy-AM/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/hy-AM/firefox-61.0b12.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "db7005ba812a980b4f764048e97505a885422c044876ce8640305d1730ae6232a982aacf0a0d2bd7ff1e7df3f3f749314940e7b9583c18dbe4963d8ad64a1ae3";
+      sha512 = "67375036a64e5b4b7e2174d64a28a34ef28273fac58939686ad90a6348d82d8d5cde629763535276fbf4dc7a89ffd3c0c753d6649300b82bd0d8050f96bddb2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ia/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ia/firefox-61.0b12.tar.bz2";
       locale = "ia";
       arch = "linux-x86_64";
-      sha512 = "20e614a3cd40234d5208890838ad671b32ea1d601c6c9984a511bb0dd971e3faab0fbb709bacd101fcf8c069f5c9ebbb208c9ddfcb34e00c405b026cd1a421f8";
+      sha512 = "0e1042db7af12830cdfef6f34b00a2a57ea7ff24628c4e9dc3381681252eb93979f90c19d020c542fc8c5e517e7639b3a8f2804ebe9afafd1d2308ff1efc7c60";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/id/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/id/firefox-61.0b12.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "c4ce9cce3307d3d0002aa158dea3ec873e260d47b3a423c0bcdfe0180dc4c30fbd807ede1b93314a5f00a440bff71c53c8a134b046fa9e8e08655f7871e652d2";
+      sha512 = "938603e41fa33128f615e983beeed9aa99820110ff69466e7d0b16650655efa8773a7bb6eb863bb51267988bb3b9097e03c9632e0dae945827033aaad67a2e22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/is/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/is/firefox-61.0b12.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "4b88688009dcc4baec3135f2a313efd2f3a2d1ff6dbfdf62cbb1b9a009288166a817779ee715abed57caef3d46e8d45b1459776fdc9a2e5f5737b84efc5e2175";
+      sha512 = "2cb7dbce745c9e310f77977914cc7b1e861b62c11abfdcacf9899174f3dfad850fb0b0dfbc10842fa8e0e1cc4dc08a0863f1842e99b967d75e76fb13cb26b4fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/it/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/it/firefox-61.0b12.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "3d81dcc71359fbe93979346b3d4a3f5b62c15cbd9f7a022f7b0fb956a26e0bc029b3abba69022ec2959e284dc52a91a710b16839fc427bb11f36530f4d65268f";
+      sha512 = "0aca845e35d1f392cce164062690c5b346fa7c2e422666ed4ce8abc9e61f341e401e6a3fd09c1cbd05a5c08a8a8e671622c690e776b584cf356c61b4c46433e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ja/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ja/firefox-61.0b12.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "320ca44d41b370ffc5282f0cc5ff42eb8a190e99417a828baefc78b9a78325ac0f11aeb2ab43319f30c09f6f31fd3dcea5656a21d4edf42eb753dc03b09a30ef";
+      sha512 = "1679481dd3bab13693a54d2e0b31e85c5d1ba374e3f13434986bfac6e2606d761245ce6d7945a75f4547775e7b72743038699102edb938f296e5a35d6ededef8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ka/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ka/firefox-61.0b12.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "52485206ca748007b69c8a4a6495b8f1708332eee317bd417cf8a03102cbfe76dcaf57410e91f5fe88c8ba1b8a0566319ac8f4ca192f8cc20e4528d266e36370";
+      sha512 = "607f3cc38807df3293c8ab288d143724206ef7d2a84e6ab34b2099637ab6e53f295996c552edda9d8f8f12aa5101b3d1cdd4269b3afb792c27a136ea2ba87c4a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kab/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kab/firefox-61.0b12.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "3c69a0e364c1dbc34f6c0078f08053e7b0bd0bd57f2ca69d5271fbe19493fc4e291b33a9668a389ae0c15eee48d7cd063aa68a251ac53dc4290513bd7defd525";
+      sha512 = "1edd189564cd7e760753c3f335b406a341233135711884c45244055c861480d3b4d654e697a5f0158bb16c3ad05934dff5c18ab0543c7d1e4e2234ee81351bf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kk/firefox-61.0b12.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "e5a75a9643a5c3d34427a71fca78c27240af06c6298566c2afb57e8a271b901cb439e1969e2a11962cc464fbdd0267c8db5be2fe92a6c909060fe0c8b0fd125c";
+      sha512 = "37cb725edf3cb07927ddd4f9ffc9c510bf30d8a02acd1f7c2bab838b9b344d57e003fc87cf61da340a98a13a8386a6e36f92896bcee5774c9629f1b851e06a68";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/km/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/km/firefox-61.0b12.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "cc2a4743502520a66293053329536841919ad2d08364eefbfa201b1bcb02b515ba7a123d48f3db8c8a1967b167b5ad50830d72b9d0292f00ec7dee0d4e4fb222";
+      sha512 = "3e5e5ea32e9bbbc912e9047492a4df1e928e56060218d6338b4f3f8a173aba13767b9653e66bffbeaf0932b0640e4853e12ca870724b24d31554e6814fdddbbc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/kn/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/kn/firefox-61.0b12.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "fa1785e7c83e043aa7fb3211e12f4592f19263b9bfd07824267ed60292f0f5293c43e6c0d3d7c9cb9790401249c61a71936c8bf8308169649acf734eae1bac21";
+      sha512 = "d49132da3584d83bbb8b8620871e8b8016b7379b45c9b3a88992c6ab7c888ddd648eeeece8168bcd808af9a1adeb227689b109c27bc221bbe51c10a8bd7ae483";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ko/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ko/firefox-61.0b12.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "e19c0d0e74f5eafba8497fc25fb96994a13fd3ade4ae849bf0d6ab6e4782d41f54e122a6260840981f434bdb35b3218fdd93c09af9fd60ffe901f91c5e605e63";
+      sha512 = "4ba372f0ff299eb86f0fae4eab623ece74525516c256fdfbf2579bfea8365d5b85beb0d544af6dfb492eeee5f5c3fa3bb779d2221aa197e0108f4a46096111fe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lij/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lij/firefox-61.0b12.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "0df623bfe75ee25c10c5d6163e61e0a14f5b3749a9570bd714ff0f9a95be40944ec19930f5b7aff961bf27e90f0a0fcb1a64afb0dbf0ec8eca8b44aa40aa4f60";
+      sha512 = "3f2508dacd506a4e2368bec9253c0efc88e4e97c37bcf4e923e1acd0014431bd79a0a223d157f9eeebfbdf1262351b1fcfd20ad0a5be6a22ebeccad68cdaa6c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lt/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lt/firefox-61.0b12.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "774073a8fa2aeb6687184da42a25e222e6172d1e0878478a08230bc43b0ffb1b00f063059373f42da99dc1aa501c4ec272f501f5742ddad24e8c17517c4a333d";
+      sha512 = "6e147ded183d2de13419d077ac7e74941881e5c17bf9f5e3e9f2805352d6b0c33628ce493a3e6bc8705a57631da13f33c45486280a62caba471ac6c558c03ae5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/lv/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/lv/firefox-61.0b12.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "583e8e9c17ee61f466ff20147777f76b94099104b0d9c5516a0d12cb2fe26968c9999bb1f145f2d32e7ec89a7d68fe1c5d02d360d803d0d20736910b54be2fc2";
+      sha512 = "9357d029b1a7b189917d5d2587a7da8ac05801b530c5e9b9bd46353a9b980da782a406b47d6ef4528f3865a8ad05fa5442ecec92696b5f96494d09bf6f35d02a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mai/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mai/firefox-61.0b12.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "10a5a51d87c3fd4f9e982bcfb47a6452b351ab86b0042146eb3dd697cdf6b17c5589ad6ab4914fc1d18b52acb68718f74a48d4bf9b94b1f7a82235a33627c92e";
+      sha512 = "0264751831b7caf8f5d56255af54b446574819f2bac3d0252d5cea29b8fd7b060da60e513c16f9dbf486114b02ca244901270ed40c2741b9ec9e403fd547e031";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mk/firefox-61.0b12.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "1e655cd47256b3b340c9878023e74ab925a359eb131817b8255e362e243994dccaf1b0ef91b1a96a4ec497a2f436419161de6a1ae773c6b22852f8efda2e71ba";
+      sha512 = "16445afe986de8dd4b894bf07ff0dd8a99fef38c768479d8a83a4f091c616e7439db5b1dba41c878fb8492100630026c0a453ca0e7cf26c066e2a076715a87ae";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ml/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ml/firefox-61.0b12.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "1d587134c40405ad3339fd6dc45b9f4a41182f00d8b24b20d073cceaffd00b61b9ca9708b0937513b4f5e4ce9d28072a93421cef9f516ae76568e6c5dbbf9c94";
+      sha512 = "db77a52531b4e706b84fccc042ee45337aecb77015578b4504a3e9898157d775c3a8d5b0538a12281627a040cbe049e7e8f48b138acb9c34291a532d2e320726";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/mr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/mr/firefox-61.0b12.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "a2f4a29a30c6a6e46659e4cd4b8c66c8661d94bc49b0b494839feebab197c67cefeced7d161b60ae388b8643f44669370274dcf04846e878f61cfbec6bc71255";
+      sha512 = "46192be8b4b3f0885c8c587f919def8418fd2711a9f35fac16d1240fd8e3c7a89c4349ca4a625986999a5d3525c7cb35965d703cceb8d027d4f3188276aac123";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ms/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ms/firefox-61.0b12.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "95a01d3aab89fd37beee953cc3212d2f18a45293d027db8847edaa4935288d3180f25d4e8411ffee8e4a8dc1c071edef17409f2bd981225e84a1ff3f726f3863";
+      sha512 = "7306b0517f8dfafb55221adc4fb02840c33db98a54856ea768bd0a0795a9fd7a761dde7fdeef9da3b9b32f04a4a948e897084847ab91c2ea282acfb6ee24d85d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/my/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/my/firefox-61.0b12.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "d35d2aab040b0c8f0619ce904ab55dd0cec0498c34836cb9c27ccc9f02667c5368acb37c1678802839a9429c9f716c7b470d5f30fcd4b18a61230b095f56114d";
+      sha512 = "774950b82abd0360a0acf997ca2a86afa0a08216f2bafd759ba26a603bf02e524ad2f54fb99d9ee869fe5ca474e8aaf59afa31d1b9d048a1cf277a4e0696903d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nb-NO/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nb-NO/firefox-61.0b12.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0f6937717ebcf680e9a619f36f1883c9bd3a1c3ae9031ba25ceb41b5a866746b309ebdcee447048a4a6ba4fda29ff740006f08c98d79d5e1380abf239c9536f6";
+      sha512 = "bba3378115ec3aec5539094820959226ddad5f2ace20d6de8f73920317eba594771762cd552b0bffe5371c7050f9bf3af88c1ff57d67887e55cec017521a823d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ne-NP/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ne-NP/firefox-61.0b12.tar.bz2";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha512 = "2957ee8f89d219f6e8926fd81e6414e4a52f46f5ba00ef729b4996b8f34a7d436dfd1303754ae5d06ea4fdf555dab2c14b498fa94026149118a7f74ca198190e";
+      sha512 = "7d2218a5dd3a75d652d73fa50d349c40e1cc89d02ea7e1918b8f3b732ac078b2f9187527b2345576de7733009ed1a74bc68df4cc9727bf92a65b6f88e25418c8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nl/firefox-61.0b12.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "0f76ef41860cc51645f09c427c5759471475086a65a15715e8b68327d71be049be1fe50561c66e30e9858f4dccae45417ca8e26d373d81693bd0ecb2b12ac1cd";
+      sha512 = "c574b2086b28c060e9cafcb560d4914106bad3571b1c58848b0e99436fc188af5a4a3cf82649636e305e8a2bd32e67827e48a7960eb561cac266973e6c249c33";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/nn-NO/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/nn-NO/firefox-61.0b12.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "6070b0480e965645b6aed071b886216974e5a03574715edf002a0f83f7fac4a75b20fa0e1c5289a6e3604fc4db08003c454a4ec767fda18cf92a72b051b66ca1";
+      sha512 = "abaa85ff573cffd459db073d3fc1a66e41cb0901698c00b8c33d7db2a25e4fd7764989ad7e6a97afc976d606713e0807730c4ec9b13076b7546a5661aabd1cb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/oc/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/oc/firefox-61.0b12.tar.bz2";
       locale = "oc";
       arch = "linux-x86_64";
-      sha512 = "abe4a71654c0c679bbf83913c9eaa2e028872415ab38627ee79aa5aaad47695a306895589b218303d54c6394d7c4afd2dd7bda536075a098fefcb13d24114a36";
+      sha512 = "c8b309a79531a6a53f06ccf96aedb1667004d242d56be5f252e802f5a9689ad7a72aa6dc2c9e2a2641c10ee102bff930a939d41d2586b55d04db2805a39ebfff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/or/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/or/firefox-61.0b12.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "a9554fb7f97f7d8bde55a6bc1755851c6321bf3ca8512b15a6465a8fd6963fd1999b2960ac8b462bf887c901af26947f304f55dd12ccd95e2696e96bdb89b720";
+      sha512 = "d00ad155453c562f5d04b99db7810160535ad36e0066c76c17a2c37889369a5e699f1addf045bc7472d7f2a98f22443ac7fbfea785da52619c41162025587fd3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pa-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pa-IN/firefox-61.0b12.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "21392aaefff4abe4d6f540918a292080325ba635465cac18113db249f52a949b5f15810579859131ff5a19a75933337f830b3080cabfffd3415554c769da8b11";
+      sha512 = "582714b7c9db90f364ab390d4bd383b5f111628e2aae7d08083f4b01eda1edd3b566dd985500e3e72e49d56333c2c98648f6835ef06e2c12a4189dbaa86b2a6d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pl/firefox-61.0b12.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "d0969bdaf97b8888a1953d5c44848f80e9500f795eff456e87f3031a066a583d42b4e76b8478d1f3cd08d4480053fffa703b0522e4208d3291923d90be92e37e";
+      sha512 = "f07a2e782fbaf2d43404d890a84820bac13d4f06daca634fbc203674560c94917a2e189a193c9c4ada26b5380bc2ba7eab05ddda34e98e9cfe8b4912a2c11d7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pt-BR/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pt-BR/firefox-61.0b12.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "983272eef924b86872b2b76ca922af33c568d89ff97bd5415782bb66d0cc3f83d48b7d10f45c501d0acbed8781b0f6dc962ec6be73dd34cdd3e78ea3494244aa";
+      sha512 = "1e54be6780c0a1cacd364b91d4a1857eacd2646b668fed30487707b8a7eea5d7b14bfc1a137fcce60f27847da411b5187155e16b9ea15ed4dec8c38f5ad707d9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/pt-PT/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/pt-PT/firefox-61.0b12.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "333f35627c6cf52c558541357bac83382597a622b9b6c669cb918c1950a314c85475236fc1961048cbc8c0d390800d1b7fc71eeaa81fde5124c017876c62a378";
+      sha512 = "3bf222a72788c1ffd67ffc102203f2b55796391adf61bee3e586ee1cdca773206017f2927c7e3898ff548eb7c6372027e8c14ba5819e1dc084103a317eb4697e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/rm/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/rm/firefox-61.0b12.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "a6f9dffdb00f28cea349c40ab6681ad6817f61c1c6ed7e8980a8e4b33317367d1946baf0f6fe2404ab3b07889336a9676d87bdbc07743ced795c1f8f7bfa7a43";
+      sha512 = "7eb639523200984fc229d0578e3bd322c5a517aaa6ccb314a85dd490c00c0793d2f9b3e8ff8e02a328425160f5c1a67325906fb27ee4ba159cf08f87a5976d11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ro/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ro/firefox-61.0b12.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "59a7f64cacd0a2db705350f36343a7cea81c68e54500a02dbc596e08705ed464a1aa51bb239a742f9599a3088adc8d782a811ee79937af987285a35aec74065f";
+      sha512 = "7488f5dff4381076f07e50fac78eb7355ea46ddbb9a7da33212d140d57fdf33079c91e2c218e22db78c7e230db5bd51014a930b052be603840bf2d2fad026077";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ru/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ru/firefox-61.0b12.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "6de1516de2b9ef25d24684d0d912727cb2b424ed58ef5c87d0d2b4b707e10975e84cdf716e5b828771d05f3cabac387205f1846f549356017646354c14d3ff22";
+      sha512 = "0538f5ae025020d57bf9a8102892ecd27f493839badeefc3f27de5dac01bd96255aaa7aa9b677a60ed7d9cee86f6913c41a8338ee61473b718a9b2724419ad74";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/si/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/si/firefox-61.0b12.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "fef8283a1a5b3fcc5ca02a434e6008b601085feb3ba5c73c5c60a1d8b3d31c1e3338a1277bc78fa09a3a69150c6cdb9a5ee3de1998289f27e0f38aa4eb779cb4";
+      sha512 = "601daed45b7a07d3a71a7dc94acc40911041145e920fda15061c98c155e6282b2070dd023887e7d2fecc813dfb83368459ae5d0593b36ea9c31d42f31abae777";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sk/firefox-61.0b12.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "6c78e0618b9248c45d71c8f18241c57b8c46dac25b15a6fd4adc3bbdae88e2cfe89b638980c567adcb93132d3ed95187db68e6570fcbf0bea7dccdf87b65c7ce";
+      sha512 = "78a1167cee2e6e2104ebb1b40aa34f71964984c332f06d061c21213627d8205a33069a7bb4574b3e763c4086ef072c0dee5e02e41ea1284131ccd9688e688dcc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sl/firefox-61.0b12.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "bfe8750cb89b6a29c4123a8f7de6a53c105e898d47c2eff29969d424d1e28fd8d7d99ebc479b7e8ad696e6b91409722b319f8f255e9ec2ef425c59122e50cfe7";
+      sha512 = "01d9c2c21bb9bb343dbcf914266845400345683cd81f71fe0bbf523a626b08a493b6851bffab94ceaca0fdd432d5c386c3de1396f0fc48b460103878f1dd4781";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/son/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/son/firefox-61.0b12.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "85e8a7dcd5f6e3761956dc6eb556248d9668538dad511ddf3d8499ecc55301de61e7dc42fec0c0f3c56801eebb940c88ce1d2511a16afa21f740b45409115f6f";
+      sha512 = "41ceaf62ea512e6c18a4ec01c51d5c5377ca947821c82cb414913f52bdf742ad26e9de86dd67bebc9cb4fc921c4c5e1d2f57664028eb7d143f5ed770718a5c7f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sq/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sq/firefox-61.0b12.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "3f5daf2ae701be63b84eea53903a582fae6095e9377f49c750a2bd404d8247c5eca4852d86b3d4effffd5367bc965c16ab1bba939a245445b0fd0bceffc32ec8";
+      sha512 = "a5fe9343e1aaf6818cfae7e5953ee2dcfacc15c33aaacab445eb345f1f340dc0d090d0e2f42f74daf6c6bf4f7efd50c8e4ac9fc2a52e33b84369d3a7b46341ba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sr/firefox-61.0b12.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "0bc074a4953a34f533d7867e6ac374402bad84b2a2bd219971e80e40195f8a984f801ed916c761438d8f34313415ebedcaec8622d495b601cf28c8593bca90c2";
+      sha512 = "16180694b75382f00c1853984e78d6a423b5b9859e827606f3d603ce13fcfe578ed3b5ce7656937625b9459996ee996d704eafdb9e880d8d2274e2154253375c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/sv-SE/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/sv-SE/firefox-61.0b12.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "c78352750ad3af2cc7cc6d035124ccab4f46ab0d46b178f6a32ea92e79ff5b8ba5148415d9ec3e08d0b1f7c4d4377e62d174779f164b730b0a4516c2224627ea";
+      sha512 = "9d71193c78ff1f06c2d12b0e8fc299d5e0316b1425861e6faf7f9e46303d72280358e9f2a4cebe931ea7bfde54e36147872c1e319fc95dfa964bfd6abd235d55";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ta/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ta/firefox-61.0b12.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "31642ab24c1101dbb28c9f0149754461eed6d8939f59ce5ad45c1225749c550fd8dcf23c42bd3d892f09ebd316dafe59f92e135133ebfee4d642d33d21ee106f";
+      sha512 = "21f00f0631fa5e3ad7e4a9e33596beb1bba7df4cf3d7cf1fcbd3c9f457039fb038f3c77595f8b925268192f3215a83dd7d233d782e2ed883ee053d932f5304cf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/te/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/te/firefox-61.0b12.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "f864c6c416ac77fbc541b3c0371189c0d46adb38ef87823a47ec56828efc87f43edc4bdc74d0bc12d9a1c3b02bdbbc4d2072ac9ae06225bca65ad4ee1202533a";
+      sha512 = "34489cc573800d78fbf1e98645275a2245d4a764abf3431ab79f182dbd30bccb383ce860dbcda2f215df47358307be2899a00d30a6dde2055311be3830e9a6eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/th/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/th/firefox-61.0b12.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "91483b673a8d32210a3b0ed14d8289d5bb5ac99f938de80f5dfcb0d880507637744d3caaa77f28eee639cf98ea82ce0013792b2067234d2013a656f31a22f3f3";
+      sha512 = "f9593af4f06279ddbeaf465669a9a5235f5521f7c020c8cbe36f6d069cb7f64461e2e0c1b6100c23f8cd4d02f81f56053df6cc004aa5f4b0b54fbfff4dfadc11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/tr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/tr/firefox-61.0b12.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "6a6f5447be163eb93430529918d241e8f0156b13dcec6a25d1ac209cad073d54920c623363f5e4d402603b4dfba5f1a4be4bbe128207d17afdf372f29e6aa6d0";
+      sha512 = "18248ee9591aefd1049f7c12274940c913a5780daff7c9a5c3f39966cad584a31a877dc4ccbb491ad15c555561e3d35482afffbab921c093d165d33715a507ad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/uk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/uk/firefox-61.0b12.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "e0e5b3c58cc76896e959db56d716b00e905f7fcf6ce9a55e5232c7cbe18e1c973a87769462945d7a740b2077a398b6f6cd619f7a9cca2ea5b9839048190efb2d";
+      sha512 = "7a3d3a3b3514b1cb4870131e875547574bd93803ea8dc5caad970ec8bbbedd408d65efdb4049c728ddaa6445b59e7925dd29fab1783f47e7160af128c7f7f045";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/ur/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/ur/firefox-61.0b12.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "2ea257a82bfce1c2bb3fe4175fe53c2c01aa6eb0854b4c66db5bf4c0466858ed87c8c5bef081977d87d0f38d3682ad24104ba6ba96983f7b02414a39ad422582";
+      sha512 = "a0ca2dda0e0ee5696760156a18863acf9742ba914e76feb08a52b3d56b03d3cef93273e4c05b21a7888effb03d4a2acedd278caf0e7bf19117dd2fcca848ee42";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/uz/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/uz/firefox-61.0b12.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "471abe8a5fbb78da0eb791161aa6d10cbca5ac40344f76dece294010a94bdecce15a0ee0382f9e1f21cf6e2805f439af5153ce1d0e3a913901bc15d3df7b5af2";
+      sha512 = "25ccd88703d814115cb5e19a511b3b93d18d1b122fb3323c262de2f807b93b7ffca31fea484859c400966b5b028414aa0675d6fe12bee27b3dbf29ca62db4ac0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/vi/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/vi/firefox-61.0b12.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "689cbf4a4e727709364758264bcf9ba7870b831cb5779ca4c601b5cf5931341169468a04819a680ad7be4a1ab03506e379d77d1926c830e4035dd9581c997394";
+      sha512 = "04d6c29f647a788b6b5345fe6caf1bb045a7d4855ebfbae67975049a84f42660bd18f2471d7a8b46afd3aa71e23226ac9bc99b0b151439961250e968cd83af4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/xh/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/xh/firefox-61.0b12.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "baaa6643e5eb9811b47b50a798af8774fd69fde12a036144840887bb49ce248650672942a57b83177d330aa33d890b3b49349dd85d0e7506673f480d54fef80d";
+      sha512 = "678d5e90d2016cf3ff4826c763cc9110a8a7685f9a0f1c4a423c0b48e0779a422be834493d8eb420453b90d3cee9b11e3d891a57f25de50ae4a13419f8a00259";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/zh-CN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/zh-CN/firefox-61.0b12.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "5fe8264f5969c30e4eb356382e4518a3e49b7d58e2a880dbd9e2d7eed12455892a1ac06b8785cdb6f7cac7948876d43faea8ac8c67d8849563de260ae155e1f1";
+      sha512 = "df6abf9a93a6745fa96eee39dec2b7460347fdab6348a8b20fb84334d8373de95b5bc595a9159a6e9acd17f16f6aeb3eb8af30709c0c65a8949404c3360269ac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-x86_64/zh-TW/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-x86_64/zh-TW/firefox-61.0b12.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "df1f3757986cee6b2dee6dc00525e72e58933d5a9db7214dd098a11ef51041da8fb39025c39eaa052114eb4216f76a1109d682591bef19d7b4a6faea6335d489";
+      sha512 = "6f5982081aada2eb35459db7de8a46eecf5d2abb45a9ccf0119f91fd05daf82ab6a2d95d601a847febcfb4de6f8c75da71f40c43140da4845fe0bc7f5cfce80c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ach/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ach/firefox-61.0b12.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "f8629cf29ecd95f3f023c71e7ebd75c088876ad593179b95f583e627db872ed34b490af5da2251eefba9549ce0333fac0e3257089f76740708aacbe3fb3caee8";
+      sha512 = "146e5f0560341cc585337223fe04f7a2a7e7f0c4b47ffbca58707c4d3bb52b71f82b02f0ad5ac4cce69f45d6702a4c06230ed12612a529d71714a5efbc1de553";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/af/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/af/firefox-61.0b12.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "18d2d2d2f8e808ff8c4ef0c0f2c58ac0e170e1cc244c3b06ca30581f671ca9cf749c066c249460242e81d516763250ba6b70cd31b96370df7dddb02db88fabdc";
+      sha512 = "132ea8da613fa047aef0d63ae5ac33256306a18fb16a3012551dc8bda4383889bc6a51be0c85ab09a3470b7a2e5c22996d04487b5b5ae2ddb474efcb18570059";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/an/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/an/firefox-61.0b12.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "73702c3e0820d508291848b0894b0d53d89a7fd798a0b0aa4155e956c796f5d8444656c8288378ffeb24988207da9ff74a71931538abbe2c339ad4ede86e38fa";
+      sha512 = "f9b8e3bfa820f5f24cef33745e51079636d6e8fc69fefbe511d20392309426281670dcf9924bd0f1bde8fac05750d80ec360257aed4078ba7f5efaad4d8acaf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ar/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ar/firefox-61.0b12.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "12daf00fefbe27b5388356255a6d67307dbf43bd326d294735d9838a8b2b58cfe2deab391b3083d281e56a4c2f25c110283109e05579946b995978a61f4cadf2";
+      sha512 = "62795fdb3d07fc6f9877039068dbe18214b3c6ab3f248bafa17e4e251e093b600bb912fae5cc19e2f9b9b498941bd5ff20f44790c2f89dcc12ed8fc403f94f6f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/as/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/as/firefox-61.0b12.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "3f769a9769202ce3334cce7dcf9fc4a2798f2d8572e99eb5324d042bd71f865b1a8b27819a6854a1ee91163b6cda82eb6bfe8c174f2cae2fa5f8be45f4e2d54d";
+      sha512 = "c07cf4012c35379cab339b88cf8d70c5bee7403b7de782ced36999829701477b18c4398986e4c88ec138322b0f6fcba17853cd6cb9627fa597329ec3362df4f1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ast/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ast/firefox-61.0b12.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "f6a2e1c64d834692d1b15d653a1e6c05d0572e635e3b0231d36a3c0dd58f3cc4994af6d5e025c0ae6a715eb318f4eccd00ccad7c3c097996a8bbac79bc100274";
+      sha512 = "510ffd64355160f52ac60251b5a3f580fd688910fe0eaa7d54f6f1850b1597dbe3f4a9a8db2a2a236b7244b084c37a7ac612427bd28375eecd2d899f81ec9465";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/az/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/az/firefox-61.0b12.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "786b490e0df3788435be32252568cc8978c5d06dc2b6749a26026a6b0d62660825b6ee35a0b01f0c1b0757267a403c150dc963899a67f2a57e6ddecea1e5d4a3";
+      sha512 = "f0b3dc7ebd3cb6cb44816c8af620d8cd4d7fdd317557e960c72c08722a2a97f6c9cc17d322e85239f7262aa8dd57e9281ac42a679ecd97d1ed6a6685135e93bc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/be/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/be/firefox-61.0b12.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha512 = "92c487200f1cc9189ae1cca82e28225f9c30d9c63ba022ab78899a41887af3dbb91ea6a534231e080e4ffb9c867849cc30b234e88bf368540efd1ba619c4ca3b";
+      sha512 = "3aeb733096ec39823015271b731be2b51da548d633c82d7040e9be887acd774310cf44ce392cd5ecf0526bb483cad5010ea00ac355c17755fea5ad8a99ebbaa8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bg/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bg/firefox-61.0b12.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "7bc40d3bae027e87d7f08a542e814edde2f99fdf777e6e02f5161742bd3cf72f11801dfa92a89b4d9b75b03ecd4513cf90d6ce25547a110045f6a94d35006911";
+      sha512 = "9990329df9385651e42a32276573e9b5666481fe9619946f469455f0beb972e8308ab789ba3063f42475f21774e8e7f2353df5e0c49a6b11789397fb937e5cf6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bn-BD/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bn-BD/firefox-61.0b12.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "dd9c399f39e50df48bb642859d78331b41f77d4132cb4fb93ce0c609c6b900b50bae2a370169543682769b96d75b31c795b545a2ba003c6609e2bbb170a62b3e";
+      sha512 = "31860be3d06c3f78126d037324dfa0cf9ac648f34847a4016e255c4ecd3743ee3fd2b8c48c6bc532adc16a5cbe337350923769aa1ee3facc5c64c87add39d24b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bn-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bn-IN/firefox-61.0b12.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "2683a0e7ea89e2eabc8749686b0c4c37f13c40521927a091653ad8ad129bdd3da869562cbbcecade3b686ad1e111c7b8aae69770d67c7a5dbca7d510db1aa45c";
+      sha512 = "eb182fa279ffe2365676835029c47f7f89b38964f74942aa597b99b02b02fd42fb25b55ac9325c997e7faab1a912dc99405cb8acdb6c6ceb7aad13dd518976a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/br/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/br/firefox-61.0b12.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "a7c69e38aae2303785ddde5e50dcbe0c6474cf52f0e58241674671be67cae286442552b68b3fd6f5b83d60298228dc942050cda13f34347ec8bdf2900b88cb3f";
+      sha512 = "9cee54cbc563039273ee81c09b322e83e014b3d2d66d0f05854d09dc6b9651410fc7e5259d8bcabd6d24fd4afd95cb2b5f7aa549f8a96914afe7552102317f8c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/bs/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/bs/firefox-61.0b12.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "abde203fc0b0f869224b2006337f57c59af85e4216b8a7917524c9de5b23ea8c65539e7b58568b5c6ea8831cc6657b3b15a4fec73e3a32d0a67a82c8f04aa8bb";
+      sha512 = "edabcbc201ac663c8c596b7bf1fbb128da042b3b3eabeb0cddc80ac1364c570eeb596d13e6e2fda6fbc2f06f068768a3391826be9bdbc74d66335287d9705e37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ca/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ca/firefox-61.0b12.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "d5fffc89c2a1312d71d289d17cbe8d5f388c1dff3548fd2df835e1941fcb968900f24acb5c4bae35c714fc05de41d885455666da834edb3f86f06fcf4c65a230";
+      sha512 = "dd38e337c6d0efd503c7f117c22a2542f4f77b8e27b4bd58f40ddc7f90950db5d5c90c40afc6ea78e1c55c1d5e21f585b49016640f5cbf60ff73f74bedef00f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cak/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cak/firefox-61.0b12.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "809ed3e4d2a3d8a58d30aa5230ca37e0de470a3fa81e56c7a0f1f3ac03471a9ac96d7a11b3340ed86e1b9973a73528a3eb564146103b63f5127280e0354ce883";
+      sha512 = "c4535437b19571f1143ae2e242a9068993553a282ee9e87658b467491dfa1b1919a705dfbfbcd3bb1392c8795e43fcfc9598bd4bc91211f81b0a75a650153ebc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cs/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cs/firefox-61.0b12.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "689d9ccbdae7b47882c73f16fa9e448e7d9e205be973b50bd70bfb2c8095a41452a7d2795f3c2b8d79d06afeb0505e0b6e454ab42ea4fc87f3975cacb062208d";
+      sha512 = "657c545ac09551db5363ec085f08af96637df8dd9e2cda81276ee02b9d3cd03ca52a4e2d3f1fc30b60717caeb39b6ace71f8f799d9de9f3a1c793bd37be13b9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/cy/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/cy/firefox-61.0b12.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "53180bcc3e3b0c2cc8f57121314a8d843af2bd609ea3ed0795f8ae41b22cf6fdab116220b038995a360776b1f97dcd9a9ba0d823f577e715c252ba35b967519d";
+      sha512 = "e5c70b0b61721f0d166556fa3693cbdcd8a174a1e795412637a6d03107d51240fd1095425145958c9c3ef3ccd3bea0a228e1fe12525dc05763d632075248e1d2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/da/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/da/firefox-61.0b12.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "bc19b87813b0dfcf9b7a7b00b5ed0cc4017a9102ff7ecede8dd4d00d9f24ab5aa528f4e5024317cdd5f36a8156685eaf2bfd9418abc3c542666bee8ad236368e";
+      sha512 = "73445ab7d6e44074f9995523047717dd6a6f58f4673649f1de0e370c14a49958befdf70ff52a295976966e5e7900392c1b96d6a19170907018b9defc592638eb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/de/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/de/firefox-61.0b12.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "06cc483c97ed2c7b357b4f56252569c7ac92bf44f4bd389fba0a0a7c735af8ab889c6b79c08ea477fd6c0300c4f8be62cdf7245f6adb54448da993c9fe34d99c";
+      sha512 = "38a13b53dc897e154cdf7c0bb06afde38e5201f832650a1c6f2d55f4ae6319b934cf1e9be33770e2e75cbe231184906d1e4a1a22fde98b9647d67e48b5f475aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/dsb/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/dsb/firefox-61.0b12.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "4e835d66dc8a299cb3ca0ff8435b302a4be8b72d858bac6d2747ee4899bd7c1b5a4a9bd4e6e7b8c649be890c80307b84888ed61073fdef0df8f0e3ffcec1a151";
+      sha512 = "db069d18fa6ea82011f337dbe71fa653d81f7001f708a6f907327e8721caf64398ac3977aa3941920bee84d9787a037d48bb00952f785513e2346df9cb1a1991";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/el/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/el/firefox-61.0b12.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "edbf71dc77fbbe34abc6946ef30c360a37df3057743966c5d01a8ef29e1abfc7715b2b2c8fd9dd7e3753d42437b7795a05e75fe32399a843c2573d78bd50af54";
+      sha512 = "d59cb7082b6aafae03177b3193bbaa44f76aa59ec0b230e35e800fd2705fe5a859c7f381a9a3701a6938286ae98ccf4acb4e0835722ce9d6ba020fe93a653d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-GB/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-GB/firefox-61.0b12.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "d70b96ba3ce553c9b67cc4fe5e874d1064c14b592e032f6e9c15ef6e753ddeed8cd419b6aa1dc53b275accc7059ea76e59109059f79ffc5f2594ebbc6d86e6be";
+      sha512 = "390b1a511a6e4563af75a9e9b419d3052cf1d4b27ab53c61860572b2d72991771cfbe4e645464a7e1ad252a3808e3a64abf87fb05ec2525e279b5d70b240ac0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-US/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-US/firefox-61.0b12.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "6fc73ead9aa8f1555d13ad49bf9176056fc24452d40368e77541cfb0d24fb0671abbc5664bd9839ffaefae21043ae3c5c6da31d17368240088b332977cc07b7b";
+      sha512 = "35e9712e45d749f3a3855dfcc0e20812b775911ab7ef3fb4a908c3fc824faaedea08160ec9bd3f0367b2d0a95f18f885feb66775d9769905fc2b272ef0577c3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/en-ZA/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/en-ZA/firefox-61.0b12.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "372ca800a57cbe53ba4c4c792f85597b1e196d452a611d26e14d328f6c36d846f2db0e80d686f3aea93e6dd352253220d4fb98f508944147e425cf682d65b807";
+      sha512 = "6a53911b6de1f07047e5ff60fde03d12895292c4e50712f8da4a2d044ce7b265e1a8ae5be096a987fc0d7e055c9a55876d446308c461355a6024783a82672203";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/eo/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/eo/firefox-61.0b12.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "d74d6071a9345470dbbbb8502818ce6349283d5e3682d687d43c5dc0f79d7c0c3b321c950568c4f4b85d5d415911cb3cb900a05caf2dd9c0f79c75eb67930703";
+      sha512 = "893df2a1b1e0a3494222e940dbbec52754944a6e0239a69515204d15190b3f9c53f187976b21672165dac42f5d2253db506608f949f04101651e33bff0f37d02";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-AR/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-AR/firefox-61.0b12.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "c2ee16f80b733d49e5e466ae07b52915f48516dbbaea5eb16b814dcc342d5df43da35066727864222fa4f779009351ea957bea02a25eafb4add1a6bc2b10ed07";
+      sha512 = "7f727d9572804a21796d583564c3d4cdbecbc480a92ee5ae2c57174a9fbce9e3f867bce52cef9bb346c2dbd312fc710f691fc5b005ca1f272bccd7c6f0680418";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-CL/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-CL/firefox-61.0b12.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "d175ad469da71f969dcdec57241b9258b9b40f3313d8a58d7c9883a2cc8207edbacfe441a8cf347c82a29d52dda40b1b02ba2770653d853f1c3f7423f81a8916";
+      sha512 = "6f9442c705d469233294a18e567d4c60a291345b9d2fb1086ba898a869c1d1de501f773ec66e32cc07787df7111e7f5ee3e38c11d212faa6a0d6098894718a4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-ES/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-ES/firefox-61.0b12.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "11191dab140fde70f88769a84c3aec15453bb555468a51e3e10cd61dfe0df2a375c49ae35a104bb5a160822c7c341654728f811d9b630c02e6e7d08667dab38c";
+      sha512 = "e60abf563a66d68007eabafa6113a8ab38f558e61630b0eff3f5896cdaafaa6411db49525e6a4a7930030bc3b94253b13a65fbf87d6812982b380ba88f74edea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/es-MX/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/es-MX/firefox-61.0b12.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "549988f41e881561d98092b3c772c02cb2e8f1e6ba67af6234d074f7f451aee48ab4b0618e237a147d44f869e39aaf701610f54a8f1a7fc2b22fdccd714b9c00";
+      sha512 = "18e09cd4ce53933e405d653f6b6dc731f0367fc9fa772c9a2338b71c02984499c9c529e5450976170e0249d5e10d861f561718b4762a6e730dfb159ebe664c88";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/et/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/et/firefox-61.0b12.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "7683d28bd7fffc66c428ddcfd4ea9d95d744f27e5ed38192ded65a482ff1b67a7477e5c107ae7cfe7eeedbf6a05a9248855a70d5093d837943504c2292db4fea";
+      sha512 = "17999b5c83170958b49b818cedf360581a0198897acf7a439d7cb8c4cef8a69d67f5185a976690afd319b3a18f86aa437e1031c6529268d236174630fce50d58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/eu/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/eu/firefox-61.0b12.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "b85b2aa1d2e98f56ede47a2138e50d5fb68fd88da92a69325ca408646908090ee660b01ba6fff62e8c0bbb80d68b9e554ea3848ba51ba056c25ba9a8886f2589";
+      sha512 = "5d1508e82062c4680fb3deea990417aec7250ed2d005132fb0c8159c938e7098cc72d06d2425bed797969138d53a9bd39f2446a914e3320a8770951e0397b5bf";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fa/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fa/firefox-61.0b12.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "6d96d873a670432e8a4252784965c54f1f8a2b667a03834da653a23bb2abd5213b92ca90767dc4f2857aafd97d42d2ba7678ab76c294c848778211bc51ab1742";
+      sha512 = "4471fa4e48ca9763f92247dc225bba545ea8f6b6ae85657481906624350dcbe61e78e04fd24814d967c12680cc70f4cfaa0c50c6e9335ea914ebd30f41e298c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ff/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ff/firefox-61.0b12.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "bb6ee71aa9d7ad5672936cbeeca36abbb024b4a7e0558f72f8270a7be4109c5cc6427743dd5fac5d723ee8b960008ec5771f8306c0e7e7f60e170761eb92c2cd";
+      sha512 = "ef0d11d3c7f212871a387b800567e53f717c59cc7186ced1ed92c12d9fb0f9c15e0e1922e21d2a57fbebaff901c0f4018ea5907a0344c52e504bdb9ac8454b32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fi/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fi/firefox-61.0b12.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "ce1593a3a16db7264b6d249315aa6f16c0f7bff93a3ded473c79f3fc8c95e9594155b0f56d67582c0f090f2763d9354560d92414f1442a14f95ba314a29e1f63";
+      sha512 = "c606a916853f95e9a8a90b341533725a9c3a8fef5cf52deb4d99163309a90650552df6db79186396233f19133c0955f818b11f65a75cab395be7ea1476dd326d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fr/firefox-61.0b12.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "e35269bffd06dda7e784ef2be57c20757cf1b2d717a73fd940a297ff1c4939962accc33893454301c86b3803cd1cba5913d2d0d606293ae8ab56a3ba8911301b";
+      sha512 = "e3ad9f587d99ed1e5b258b02b990c43e2c760376eac9f94ae42c8fddcb079d0f4a946b5873ed0b82ff6a35009f11fccea8d157af496ba1ec565f5d64b2cfbb3f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/fy-NL/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/fy-NL/firefox-61.0b12.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "b76c49eee827039ee2c5c479e425d71e18e9adff7f609f027f842de3c359650ea0d74f1f143d1c686da36c9e688600faea589c241a83587e13b8291b4d67ba00";
+      sha512 = "d7b93ec05788b7c324dfbfc0d55411368d46ce1bae8bdc245c920ab26356643259672ba473ea8f9cb63db141a0cb76acd8bfbb0f9c0fcc4ff197795705f4e47e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ga-IE/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ga-IE/firefox-61.0b12.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "ecc342e40471565eb2cbb8855afed5561e5bdacad623431a474cbb85b8be7e0087b78660082251d0da58a40d628005e4e6417c186e4c60a30d16658a7b945738";
+      sha512 = "9928b0e7c03060bb93d4edadc9228ede47f5e43caed8f0d23be729740b4aba168be59e3365f9619696d4a8e421a663b0946701746ffd3c4fd5bcec1473d2b092";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gd/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gd/firefox-61.0b12.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "ef6351f8456da39ef7bf4a2d85bbd828a0fb8c65ec3b2d123426809c5d6bf1c1da99291296e7bfc74069c0d1cc1db4e8a1425545f9f9530e7b4183fd6f25ecd1";
+      sha512 = "a883d411bfd612b5de69d7e1b535d992c0641eb1cabdc28a80f8a38469f55de36aafbb3547da757b4f6fdac96dd2934aa10c8c61362fb9a837e49049062c2afc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gl/firefox-61.0b12.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "6783198c822e4c9f246e4420b79b11470a2fe6edb2912ddcbe479a407f54a209f6cebc83bce8ee7f1363df802b5bdd29f44c5e12f587469237c35574240748ee";
+      sha512 = "6e01cc01459c1d78df561eefe0bcda490960a8724f4fd4670e19b84c3ff16c41b5367205f883e51a0af8c03b957b65f55696bd7eb851f015f57aa5e950b36799";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gn/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gn/firefox-61.0b12.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "2f2be59d8caa2b78aafda07da4a1a2a0599bcea50bb99ab9b3049e14a81febdc0f72b506a79555d6b58ccc62e2538424eb35d018b3fa25961b3d783937abd1fe";
+      sha512 = "62dd993eb1a643fcad48aaa5e2b9ac291137c6e26ee40065333ca31bee94e51f0f6fb31b55dc1901fe3983f87b69b617b0577b7555e20663147ac17a94fd423e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/gu-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/gu-IN/firefox-61.0b12.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "f4ee493efaf81881e76664540847571f7eef4dfb764b0e92b4437404d83d8cc7a8696ab0292b9603de49847485b469be6a22361b857922ab39352a4b76a3fcc3";
+      sha512 = "6dbd6d474aef6d10b6b47d1c3f606ddfee10488dbf9ef6d353002157bc31158564d5603699c1c8e8abe6af83717c098776fa90430cb849461aeaed8b832252bb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/he/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/he/firefox-61.0b12.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "7cc947f307711338fe9d4b57b580a7d33901e1c262a7d003ecf29e94b7fb3907ead9af4fc96117aa44c6aa829f42ab8e79c50e7274cf4442172433c3899d8d33";
+      sha512 = "06d27186e2b0970ab8599d283c7a5332de87af021584137b4ceef3ceff35e0177f0068d4de2190e0e633be44674291a021087f5c1bd344162555cc50999eac2d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hi-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hi-IN/firefox-61.0b12.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "d49040bea058cc92c81db6438e6a631e1c0ebb8c27993a06ddd95c20648e3d3e0352a7424a8748cbfffa22216cd06263f78d13b69ddcb9821a9b7bb01d540695";
+      sha512 = "24b56f6eddda98e6bf33bad4a2ce615191076d3094c84611b5a244c488397a8afce689fe2a5089eb8fa93f4ba3cc894164bf1500f5b0b864fbbcd843a338ec03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hr/firefox-61.0b12.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "b76cc94c9792ae728f8bdd284ca7e1102e4130bb78402052a748d26dabff4b0233c302301ec9b6b4076bc939fbf931fb0303f9e7f8881511e325b69d86955d44";
+      sha512 = "bf5b2dddf62818357e4729c8b51cf87b03d8c2ed74456a9666b85d4837d88db73ca83684e6348a53f03ec9086572526888c84204e661b4aeb022a31e4962c8d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hsb/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hsb/firefox-61.0b12.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "3843d8c6fc92aa99259f9f32778e35ca436fa3d36965a175a1b964e9d3fe0bf9834bd8fd3cc3c65755260e0d39c5c21a7d88f54a5f1c81938890ae82545f5291";
+      sha512 = "c55d7ac11802db6cb85cab3a62c850ba2e868d6f46760bdcb1dc530313b0355113cac404619f3ea7347d26efe3754dd8ae74f83fbfac5b27655164beca0bb56e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hu/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hu/firefox-61.0b12.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "eac3443ecc5d37fb3a357247bb5a4dc1fb0807071a57ee6c649b1405100ee728cb7e476eda792bb55acc96132708a652b6e83eff0e764f2c6ca9348f54c41cc1";
+      sha512 = "75b66ec8b5827e39d0fd1e72e01321b640e356855fd1b70d3ff8a0d8fe7abbc44a381db9fad8a44c97840fa39f200cd53d55a02e84f6137c65e4217ca0b951ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/hy-AM/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/hy-AM/firefox-61.0b12.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "aecb0ad35bc320216526a7bac0794825f6f266972c4c291a4e97f81af747bf462f05e662e9d5bf77d1090a6bb65adefc5a985dd71f32319cd25cfd0e465a7791";
+      sha512 = "2e94363c1f25d59fbb97b2faf554b3000bd3a8aee7783cf415e7008c8754578299f7529e04a907ad94cdea80c51ee2562e114c369ef98c66beb9776c83e4e4f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ia/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ia/firefox-61.0b12.tar.bz2";
       locale = "ia";
       arch = "linux-i686";
-      sha512 = "a26fe81ec4a5b8d6164f1dda9d70eafbc2e1e9697fce29d7de9076f0fd25d0467a5c9c02002d51066dd0a3ff427a627d18735f4bf520d1c861ac77c0357717dd";
+      sha512 = "bdd9f4ea0a4017abd387ccf8514b5ad9f73f232e252f66b4ba0387ee328f159c49e7b79c1a28c3ba4e040ff767f018f8ddbe4de20193a361c406934fcff42e5c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/id/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/id/firefox-61.0b12.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "c28fffdf9662c0e8e3ec972dd9ac7245be0f4097c0694a6688b7cc422738cfb539fd15753b59b2208f904e85ab037698cd21d08b26c0d9c209088c13b0e91f8c";
+      sha512 = "e29865d8115bcf89f34af721e0c12365e1fcb622a9abe56f1e6f04edd4456b400ddccced69bf45912c5be24da63058c73c981e1f34bceac9b4d436ef3306fa36";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/is/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/is/firefox-61.0b12.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "24fb7c5dfa3ccfe0ab012c3c8c26b5be1411ca8a9204b36c1592017cbb6712396ed589b9c0050b3843e62d31aae51083c54d2c53175127d68dbc3b02958016f3";
+      sha512 = "3ff1eeade8b45f8657f87e0c7e84ee551f330461e39f377c14469e9b7ba8d744077407185e9968d021ffb4fbf1394b6c100e6d76c4ba94e1711310fad14c8d43";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/it/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/it/firefox-61.0b12.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e32baeabbe7e0b6b02b8b6c7ae1f10921ca05f97b4bab73610ef6164fdefe126651a9bc1e7a00afa42ea5ff163ebe1a4a04394e11e9f5c8a2f78df464180a073";
+      sha512 = "b912beeb96910ee0fe101a1f1ba4ca0f6f5fa13c93d1fe14fb6bbc5bed14eaa2d9b2caeeca3a9665de8ba27de9a55b903060441f152b4a4563ccf74ced2b5aba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ja/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ja/firefox-61.0b12.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "024f8684b1b87f3c27adab5132cc6371a0e56b405a131b67a025f047b5077fe0c4f41b82b2f88c5583975fd96cd11be4de3befa63c71e1ca209938e1d33d5890";
+      sha512 = "1712c01828f98110fb68925ee80a343e79bf8bc7521d44840dc5c6f57ff0a2b8625c5116d1d076882a517f00c8f09066e9385744aa6a3ec57b2f21315a3279ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ka/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ka/firefox-61.0b12.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "50db5a65147cac7d9805bf90e35d9cec8d5364a1fb97d7ba0e094a8396adca1ebd928469347fe7eef619620e41461f3c115ba3d2687c04c06d990d8d0e5a0f65";
+      sha512 = "b7e3d57935289bfab5a7925210cd484d24c87374412041ee0d279691e758e6bc872666fcdf2a0ecec84e6073fd03f9e32765e0fcf4ede852a4f389d6fcd5be03";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kab/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kab/firefox-61.0b12.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "0d6fd66316b6df70adfed1f896b7b178832b800ce54db9512a8f344da6095722c29d7cdac29c09c0ae02df6225f8f76442ddbb630a15a6f996023b118f581d59";
+      sha512 = "6cc7b0bc89590ffc749b39a070e20ffe3a8c7b611d69aa7d1b0d803bea0fa98c208387e24b640ce18f586e718a4bd3e2387070053d0cf7fe2198e920119d9b41";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kk/firefox-61.0b12.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "1e620226f3c81d18013d663dd3f186617222fb75425687b0f07e1bdd35fe42f7889bc826c9e726324cda6045350a24e623a83f637acd2fb4577df68b56b64068";
+      sha512 = "be754f0a6bd1f7b8b81eaf59b8985fa993bd6ab507d16385b4da2541000e9a25304de87b017979d7d79a803a9bacb147026aa0c96fa3c94cc2e5f5322e1c7f69";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/km/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/km/firefox-61.0b12.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "9770c32624919d8fdd215fd8023e5bf80fe15e79e641421a0b16fee9060872a1807364ec400e574eeb59017d43e25cbbaf8bec8574fd473d4c8cc78c596730a1";
+      sha512 = "87f25a6ba372602ac5c80143c740370df1ec020f4166786310937af019225f7ab156e6f6a1580187cff144ecc53b28d0c4596fbe5efe49befbd5c2ce0b579b93";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/kn/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/kn/firefox-61.0b12.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "f2b45d0195c68091a04cc921070ee31ea410faf2013546800612c9ecda2e999a763f58589d36aa5076cc834d0d31e5d58e3624e24dffa2483d8b889965b9fbd4";
+      sha512 = "c5e50196d9ffa05ed6dc1d3b70407fcc3d65bd5889ce891e988a4fe131d58480460de560f89f5d19afda6f17cebcbb25ce15233381be571b2d5ed20d5d964940";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ko/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ko/firefox-61.0b12.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "55be6785f4f76e42e94d263499641c7c883b4217ab0f0846ebdd00019425510a64ed2f16c98b7e3bf86834ac35cca012fa26cbad62ffab8b889f287caaddcfd5";
+      sha512 = "129c1b5d034514b486979b1ce8b960ab2a533c7d92127135029f207c56c9c9fe79ab44bba68a1a6decb8444e040fa2f304bd4120a9da2ca4dec6f2f084cb0224";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lij/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lij/firefox-61.0b12.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "587ce487c9e90a190405ca58efe6537e8138c9726a07d1d4de5911856ab040b7924df5a8474f64a76748f64fc1f35d9fc3018e06977d1047cb7fb55f0bfcec00";
+      sha512 = "7633c91bd22b6034bae60513d506baf824f9240cc01a3845b6e8b52de6662074dcdeaa672846677aecbbd8027e29b4e703f7ae63be249591c4d48006b24a8960";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lt/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lt/firefox-61.0b12.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "7ec86498c6e720a77c49a109455df7c9b31b9d1b69cec8a735e605503094b67dc4e38948d6e4e861ba2aa1a8bc680c8619281e5e2ab3545c987ab3099ed211f1";
+      sha512 = "dcd4765d1df0ef95e71052b9b981c874af71a97e3f37185d33d74c49208ec2839602830043749b5e551683602c263c095012d2385209d75a6e4f04fc30d2afc4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/lv/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/lv/firefox-61.0b12.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "b1cce9d06ac3eeaed9a92f291c98a2b2011ebbe4afec4fa1afc95c6ead74243078f26f46fd2c07ff62f7b856b7a1c366fd1b302b18c1fa4b5bd1ae8aed49a54a";
+      sha512 = "354997be972af80700b7085f5023c46b8d8cecdec079c7415f5ec5a12bdc2ceb6aadca9a7c9041c2ef65a518cb18efdadb9f3b78692f9a17e62d35ea701e1e11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mai/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mai/firefox-61.0b12.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "70380e961c5f2063024ce0d77571b8bbb8402e991ab8fd69fdf9db749f09d4801f74cd0271e2bcff55dec196ef646d061a633d93f3544faacfb4c045204755bf";
+      sha512 = "8b9bbb13c4bef28a7134c05f0d05476caf5d72d0112f4b8507b66e448b183fd357b7caf643c81cefd652ebcdf021432c2cc5af9e40803b20f11e3095d3ee3a4f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mk/firefox-61.0b12.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "e6d5c3e8dbf60768bc2c4c32b552550ffb954dfc048e393eff1d68d6b246d64e874c42149fcd20d4a706090698ec85c6ddb0da7ff10bff4dac861d31cc5cdea2";
+      sha512 = "9e098c8a2bf36c14b3802c54fe2c8e6b7db83242d2356e299f9eee67edcc006e74fc83646428c0f475b1ac93440fc4105f767a5bbf57974b8e4d19cb1d30a0dd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ml/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ml/firefox-61.0b12.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "0b5854b257ea50a31ccc9fb5956f45b71aa70e9078771fcb7c005c8cbc6ebdf38c381e6ad7fb75717ba961dafc5639567c2b6a717076f9a97b952b231c1a0b14";
+      sha512 = "b6a84bdc0168d82e6ecc3cdacd9e899c0ba0b15e448b04ba70621c82e82d05cf022b762f8df2e9b54082facebee3040ce50b1074f74b5637694ee7cdd840880d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/mr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/mr/firefox-61.0b12.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "630e53701b5ce7a7bde0090987c5b3aede1725da4dbedde268c1eef7e3250e35e8295376b666a5d099681d601d4a7262e21da30a12553f1e7c90b4971c5ea528";
+      sha512 = "e1901d752960078ef992dd11bcb04df1c29019bb8a947442478cceae75083c2f063341329e10dcd471720cd1fef6f5ba6410fa98f95ced45591178592b760e97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ms/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ms/firefox-61.0b12.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "c1f0efdf8e94b101975b0a8b15bbd71a02d555bf9c12c0f937045a2e271597aef69e588bf75c714826cc7eef61c43fe046a4016619d4a63d488faffb9bb16f63";
+      sha512 = "3cc2cb6c9fbd5d3c5a399cdc0dd10d2198412a5cda82ac4e93e691f88e8eb6bc55fd27abc453c011502e681abbd0017f6743915906869c3ac60d5b713b45fcc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/my/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/my/firefox-61.0b12.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "cea65de645dba0943c85583e9bb63f923d06f3ac589c812b93eceed995baffb4569f14c45e38c93aa9762929b70087e0dc9a4866ca8d9fffa5ccac8644472cff";
+      sha512 = "e267949bd286b873105e1872f077fa3b6a0d1fe4ec2a789a0a415781e847d540e021e830ee37fc70738ab54829f6c35e2f0b4d0fea1003f771fd12f19c97c04d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nb-NO/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nb-NO/firefox-61.0b12.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "90ad8e0c6a4b99ea3751dc0ed4cabc74ec1ec6dd351920f574c1adfacc594fa1a21bc3f7ca77d4abcbc2ab8f8024e3c13a0a9b0fa8629c66c08770ee473ade8d";
+      sha512 = "8e369eb4e8085abb02dd29ec504e198e7c2167e32c60d81448b24c6204818708f1756690e2ee8e498c7aa0eebf0db5755df7884f706853e2d3306e4002425c82";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ne-NP/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ne-NP/firefox-61.0b12.tar.bz2";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha512 = "874dcc2335c3381a8c49ccace54ab7fe0b2c370c1d5e43ff2fb94c93ee74c89de476b810ac71960fc34edbdc735070a140ba3bc919112191b1258810478e8212";
+      sha512 = "6425928fe907b60946f029d8ea67a5c4b6e0860771eb15a0f26bfe9a56ea020a5a278b513e077cb9d2c751675596c42a7ccda96aed810987a701ea9f0b505330";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nl/firefox-61.0b12.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "61c9843955b6472eaefb13b39cfdcb1371cb249c8cf2e01471b1d27f76273a329c7b578d7ec868822f9ca0ee6818e5fc3210b6d1e4bc625a256316878e6c5baf";
+      sha512 = "822baa292edbcc6a72dbe175f9d8cda33d03aa6389027a982f3c40bb0ccc9709be663d072d72ad046a2bef1b9f251ba85dfe422cfd6e68bf4e2990a9f8b8d205";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/nn-NO/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/nn-NO/firefox-61.0b12.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "8c1ed92350e2dd2aa8051a4491ed064f0c790009d29b2512f1ddb52d8b5e31564dfc8678006c4baf3a4c42ee4d94fb519f4aad59adfe65a5a541e9d4289e4db2";
+      sha512 = "1f91b46a16102e291a74d653572e34329e0d6e4905c7a9770badc446c129db9a9037106d401aa925a26e4662eb42f89f925aabc0a438bcfce262a9b5cdc501da";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/oc/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/oc/firefox-61.0b12.tar.bz2";
       locale = "oc";
       arch = "linux-i686";
-      sha512 = "e11dccf5877b57d996aa75f8bef15a4a914377296f16dba1b59416971f4fd84e4ea43593139e43481351bc038d7a66d53066140fd4436f61d3e0cb1f490a5f87";
+      sha512 = "436800ba52f5b68c3b53e6c13cd3d4749556575314215228608426ef1315e8ad2628a84eec05a66a53d9de10ef159e4b493649ed0ab73b61cc2007933f43dec1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/or/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/or/firefox-61.0b12.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "ec297c47b7920cafedb0ffe3cc173a3c2fc986d2f858ee25aa159b8be7f05051cee280590589d7aa712fd3eed376947297ff0afbd64e187f1a19c8bb8a1295a7";
+      sha512 = "02584b67c2dd65ac2ffdfd7fb1ecb518afd0344ab6ea623b43ba1b3da9142c6788e4060e4449fe5aa362f2b748ccef1a3c535bb1f6c8bc99eb2753dc119cad66";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pa-IN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pa-IN/firefox-61.0b12.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "4ca71e223e4c05877bd6cb86f9e3677b60ec22a6b362138818e9fa5f7b2fcc2eb166193e068ca0a6ce3b536ccfd1e6a216505d4ef45b2e90ecc83467e7529443";
+      sha512 = "931a1f6319dfb6db4148eba5bb01a996c2ea2512f065123113e539a9c6cdef40ad92b5ed3f42237a36e256fd95f3a6eccb6a77f2a9829541c57f651f3ddf65dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pl/firefox-61.0b12.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "69e1296216820c09a299ddab644ace678e7041b86dd2704cf8ac2fd0b548733815e1cf35abf324b0a2614615f96c58073d55074dcb7e66a16c5f7b55f562520d";
+      sha512 = "c94c23a33651f0036e3163d25c6ca94fb832e1906869c1d384417098f89e7fea75e815c62a7e2f6661e629cbc56d17cce03d440a716c77185a1c38b6f646dfc3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pt-BR/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pt-BR/firefox-61.0b12.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "283dbbc4fb72e0a14889c97e93f48686229d4ca6f2a548ac664dc4fd75bac1f22f5d9f16f6c3bc1a3b83b0c8567cf2856be7fb23e3241a334de80d037b2ef85d";
+      sha512 = "e4714d288c1729aa625d9a497aec6154d5fe055e9b306ee2fbe812b4123e2bcab03177488806c470f530d9c45b2781cfb650a756eb17565d3f9e58097d8a8c2c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/pt-PT/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/pt-PT/firefox-61.0b12.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "d996775b48dd48ef7c0eaf5387bec85968329acaf6ee4360c5213773dea5a932693a8bbe6b70e2b92d3b387db767bbf8120cbd37257707dad06b9082ddb89032";
+      sha512 = "d460b6962554bf114b28feb80ad560b7e2eac625b05bb4722422f04a41787d32d04c7393b95c1bae9ab6dfbbeeceb1b43493bc3126dcca1f265c23e5870a89db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/rm/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/rm/firefox-61.0b12.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "11927162d0d7e3d6dc05be2185a25acd768a99874d9440b4d28b9044c58f19ba6c7a1608bd8a9bea95a5751bfab71a665fa59fc180ca07abd3f86f1c2eeffc8f";
+      sha512 = "a38ad0170a0811754a282ad894f41ab6edf30addfc83da973fe1a5b7ce61824b817b42543613203757f98768609213b68242d61f17c3388d4b67909e9a45a921";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ro/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ro/firefox-61.0b12.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "4ebaef0d862281919e04abecd02173e1eca253944e6a9dab0ff301a0ffa521e93c755d59c819315eaf910d3b75cdd149a01f7302880b44355a0436e27312cdde";
+      sha512 = "3a8c57014c7e4a9e912219b61192d0617f6b995e0609104574948dad1405601ca02d750d71dd8c29b7b914f11044d9623d0d89d2531c2506519c41a905ab3cea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ru/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ru/firefox-61.0b12.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "01f5e519412f16c4bc21ef86acf287c74f34a51067c7263b5b6e6a9514849167e441dd23ff9f01d9710656189ebe123493f10e5e202d5a690591b84d828ac6f7";
+      sha512 = "23a7611dddccd415ba5fbca31a3bc7e58f0de84295f60a051fac891581e3a52cfc52000e2be2f4a81a37a208e9d4c0d8c0db72a109a6361c03fb0294753dea2a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/si/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/si/firefox-61.0b12.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "f8199341e89ac1816254fdf0d4b37c1c069c00e193d8c56fc44a6f1e833d174f57b498bd21564989777fe383cb0912800a53dbabe4470402a2ced7cbb8459b11";
+      sha512 = "8266694c5c13e3ff93cf1e6380dadbaa4056a80b48c2b42eb1d1b0d4d3b57cb5db18ce78b261b459ff25356f3bbdaa0d6032cc71e97414f8e124d68a0198685c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sk/firefox-61.0b12.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a3ac61681567f715405b299bf9b772cfea1574b62ea9529e8df6a8155dddd2e26d51419b641c94329d462a21fc3a207dd99ec600b3764d198964f21481cca690";
+      sha512 = "9bcb5e29e221be2eac6552578f0b4cf351400101f44f91648fbfc82db85dc5175d66854017751f1f890cb78cf8ab6102bac7d86e0fa2615abe6a18c62baadf1a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sl/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sl/firefox-61.0b12.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "a28730ba99c9f63494b4dc955dcf231e412179a4f1bc405ccaa63325ed34720906c2c6e90e0534544a5328bf51e9b485b91d54e72ce73c873633f1743c1f0734";
+      sha512 = "e08a7ac0517da3d82627fe126096205c60c3ee4114ef9ed8a67859a0b2ce9540d79f6d84b046f28ba0d3c3c1902484fefae8090ce3780bcd45ce24c2ea211cb1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/son/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/son/firefox-61.0b12.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "a5ce8085b83ba048211bfb9b2ac173701e0cb1363db8e027430b63f85ef58c845e5775ec1e82417a73531e789059f0cb30583df446fa171fa3df9bedf40cc84d";
+      sha512 = "d50fd3a722014d16c95e8c8ea1798d2305ed77c878513d3f67f3d3f5baf5ae7eb595fef17f84a41a353342ab93bd7d2049c62cbc9b9e9be8bd7593cba563eb9b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sq/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sq/firefox-61.0b12.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "a4ebe4df7b56338d188aacb98ed58d6eedeffb6bd00b139525bf906e2c3c40316a7e9ab9b1792f02fcc19a7767786ac1f8c0ac8fbb39c7e01868d4406eec7ed8";
+      sha512 = "a21ed6954e84ec409700f12a285acb46f8f969e20c671e2ade4d1015a8b01823d7c5b64b49c6b73b7000f367ba6e1ccfe3af1f7eef4ee0b28335385bb206d61c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sr/firefox-61.0b12.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "461c94b2a15854e5e3ebb95b2f6fac0a3591fe1b57b2e163e4fe8918ad5736cad1f085bcf0083d2bf2f0cd5cc811c6b7822dc9398adf906496ead870f4b1688a";
+      sha512 = "cc73f22b2f3846dbf19b320ea9433696bd00471ecaecc6b3450dee8f6696bd5698c329254629aacdf3b10ca2a3d67cba9cc44f636901a74672ecae506d6936be";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/sv-SE/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/sv-SE/firefox-61.0b12.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "1ac1fdc2b3eb80a172efa60aee46e8a3a5bbee3f1bbd62e23bce5503daec25beece76ae22fc78ffe18aeadbb29417453cf3ef19f6462e4f1c3544842e1304d49";
+      sha512 = "02fc03caab923214814a5e6c025bac0113c8454696c2dd502e97a729d96693aaf3f0419cb8ddb3a55803b2c05ae35ec82f0cc59547c42e50f4125f061c2ee7f8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ta/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ta/firefox-61.0b12.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "664b18d6203a7cb1934d2b813b2269cca5eec2e68cfc4a4bbf129107edc2f7a48b6d75cf5cb41abe6387a4c26eedeb53b837ec8aea7eb67f3ee5799ab8a08e47";
+      sha512 = "2f240d2d1c49d6cdb162edcfd3fd7dd6771854f516fea45e1d9634421815ca2315735fbd1a9556dcda180c1fbc27934dc0e27f64d0bd2f8640a4c532521b0f73";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/te/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/te/firefox-61.0b12.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "241a510e2f520a7afcb84383435587533e62a14b2771cd770763db99a047746aee5249b9272ab34d96160613efb7b3769c8911946a4ffa3f0156570a7a6c4310";
+      sha512 = "ef538472c38863cf11728eb38e03bd8b3d7e6c568d81ab030b010a9c123a191c1b0d6a6361b9daed2d025d708a433633b74819a67d3751e0b37de17bbc495c12";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/th/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/th/firefox-61.0b12.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "9621e6f3d49264b07f913b1e8161e0146fea15900dceaa98612b0c32b81059094af5af2321d61300168644421e72486ea6ed9336ac9cbd752e2e192a155e532e";
+      sha512 = "bd5db689c9115f88efd8ea6e38d557f7ae765d8c58c269954005b069626421f022d7a2cbda59b143bad54a0d0f17acb15691641f1699d89435e68ee2eebb7801";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/tr/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/tr/firefox-61.0b12.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "f26c74a359d71f41bc83320010b356b22a5a8224521c37fb7ecea3d4f79fc4583bcbf6d44d183c04a30b25bac3832635b721c7566052c496f41718f4b7b6694f";
+      sha512 = "8a4f2e312cc7e6e7a80eccc0619702d64e89e5a120341fab88705dc9236d4604343fa0e80115b496004f1af5465949188a34accc09958612c8d8277e027c3470";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/uk/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/uk/firefox-61.0b12.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "106284d66f26ea36e906b24dd204e98a042ef89b749bf059a1d44fc088aee6c08e269257489ca6f215b390606f32af368954bb2507a714f09e3a0fb0a9271900";
+      sha512 = "ecd943cd65d7ee7b57328d2adbfe3b81ed457fa6f75d2d911845ebe31ffec7c0d622ecccbe04eeeba90d35e8f6c789d33caf251d6aa4e38d85633108013f2374";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/ur/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/ur/firefox-61.0b12.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "4c90bb8536fce5f052d258f280270e0cf032c257bf7eed70d63f52949f52fcf8a961424372e726cf05026f5a569060e0065231462bcc8626a0f3d166d52434a9";
+      sha512 = "23120059c8f35c7cda3493fd2c233c810d81d81ac6ad521e01c9a455fbc63375024510e2394c9a3eb8ae3bc311f68c2a760bc7451e3d35a7246b33f618fef167";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/uz/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/uz/firefox-61.0b12.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "961c106641e47281774c1285bfe8cca3897fe7f3c78d961ac943e35a5d98398124f55d44ea09cef2820e60ddce1f87fa31c498ff005d66603e8d101590c17fab";
+      sha512 = "6dee30f68865feed42e46806a81620edada2095d28b79751ca813497df5b17a831eedf7d22b14f37ab8a85bef3111f7ba1f04ea8ec4133fad0ca281af28a32e4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/vi/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/vi/firefox-61.0b12.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "b4cdc14821cc62d09c47026483efd4d2050541e97384d36507eb2d74efb9d98d52ede8c8569365e4b4c49c738ad6e2a6f0252aba6d72abfac90f22a2d8afb8f4";
+      sha512 = "868a354fa2a09e79cb914c0d51d58a810ed00498eb051d39345fbe23a1f6c19c4293df71af951e7701767a1579c178090f0a3b49216e25fc48458c33dd252f8f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/xh/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/xh/firefox-61.0b12.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "f2dcdeac743f291b62db80012bad4d5c1233f63579d59d59df85da2584afd1ed50d30f7101748067fd8b59007a5565482b14c3328f1f40066b5098864cc0e99f";
+      sha512 = "a7deea372bb9597668ae47040aaa3ef6432eb5a8df65fdee92c001dca10474283171bdbf9a498b48c023495f0f0f39352221df54cc3f874fd623dbf510377409";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/zh-CN/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/zh-CN/firefox-61.0b12.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c7fe4c6796cb2f05d8ce1af83474cfda7ca6a58e995a6c7908e6bd9dd353fab5235831ccd44d89ad7e8c4bfe2caec9d9d9eca71660d447f0f3d9662b56efc4d5";
+      sha512 = "e1d7d831001c8914cb577d31ae5e4bd1af779a79da422bca8f0bdabadf1a7d44b9e950c1f66ef5917bdfc8c274972cad5e3c9678831a4d3bc58e292b6db3faff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b10/linux-i686/zh-TW/firefox-61.0b10.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/61.0b12/linux-i686/zh-TW/firefox-61.0b12.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "a2e0792cb72b5c69030732707008347d04cfb455f2df45e25b10f0e78d3fb94d4a5c5a4b2d92ec7566501c60c3ae952438b0285af588daa1f7e6e0a4ada269c2";
+      sha512 = "056940876ef7139604ee19ea9a44ef4f4c3ebd4b31a4705bd44a312a53e9750fc7f7af8f39d2e4641f831bcba6aa8e185a71351acb6a871b26aae015bfbc2e0c";
     }
     ];
 }

From 0afcfe1c49ac11ea5a7dcf630f24109ab8eab724 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Sat, 9 Jun 2018 02:29:10 +0800
Subject: [PATCH 3316/3370] firefox-bin: Add ffmpeg to lib path

Fixes video playback on devedition and beta
---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index eaf304ca9fd4..6a9cd8b7b472 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -45,6 +45,7 @@
 , gnused
 , gnugrep
 , gnupg
+, ffmpeg
 }:
 
 let
@@ -122,6 +123,7 @@ stdenv.mkDerivation {
       libpulseaudio
       (lib.getDev libpulseaudio)
       systemd
+      ffmpeg
     ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
       stdenv.cc.cc
     ];

From 5d960b51c66f7dff154a9ddda76296269bf922ee Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 9 Jun 2018 05:56:48 +0000
Subject: [PATCH 3317/3370] serf: update scons patch, enable kerberos on darwin

NIX_CFLAGS_COMPILE set by the old patch is long not recognized by cc wrappers.
---
 pkgs/development/libraries/serf/default.nix | 35 +++++++++++----------
 pkgs/development/libraries/serf/scons.patch | 12 +++++++
 2 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/libraries/serf/scons.patch

diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 62d8bcccfe36..dfaf1c679dd7 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -13,31 +13,32 @@ stdenv.mkDerivation rec {
   buildInputs = [ apr scons openssl aprutil zlib libiconv ]
     ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos;
 
-  postPatch = ''
-    sed -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"PATH":os.environ["PATH"]})' \
-        -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_CFLAGS_COMPILE":os.environ["NIX_CFLAGS_COMPILE"]})' \
-        -e '/^env[.]Append(BUILDERS/ienv.Append(ENV={"NIX_LDFLAGS":os.environ["NIX_LDFLAGS"]})' \
-      -i SConstruct
-  '';
+  patches = [ ./scons.patch ];
 
   buildPhase = ''
-    scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr.dev}"/bin/*-config)" CFLAGS="-I${zlib.dev}/include" \
-      LINKFLAGS="-L${zlib.out}/lib -L${openldap}/lib -L${libiconv}/lib" \
-        APU="$(echo "${aprutil.dev}"/bin/*-config)" CC=$CC ${
-          if (stdenv.isDarwin || stdenv.isCygwin) then "" else "GSSAPI=\"${kerberos.dev}\""
-        }
+    scons \
+      -j $NIX_BUILD_CORES \
+      APR="$(echo ${apr.dev}/bin/*-config)" \
+      APU="$(echo ${aprutil.dev}/bin/*-config)" \
+      CC=$CC \
+      OPENSSL=${openssl} \
+      PREFIX="$out" \
+      ZLIB=${zlib} \
+      ${
+        if stdenv.isCygwin then "" else "GSSAPI=${kerberos.dev}"
+      }
   '';
 
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-L/usr/lib";
-
   installPhase = ''
     scons install
   '';
 
-  meta = {
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
     description = "HTTP client library based on APR";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    license = licenses.asl20;
+    maintainers = with maintainers; [ orivej raskin ];
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/development/libraries/serf/scons.patch b/pkgs/development/libraries/serf/scons.patch
new file mode 100644
index 000000000000..a7eefe7d5c1f
--- /dev/null
+++ b/pkgs/development/libraries/serf/scons.patch
@@ -0,0 +1,12 @@
+diff --git a/SConstruct b/SConstruct
+index 4358a23..0d862e7 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -155,6 +155,7 @@ if sys.platform == 'win32':
+ env = Environment(variables=opts,
+                   tools=('default', 'textfile',),
+                   CPPPATH=['.', ],
++                  ENV=os.environ,
+                   )
+ 
+ env.Append(BUILDERS = {

From b707632e4599cb17714b2012164a141a5a6a9410 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 9 Jun 2018 08:40:00 +0200
Subject: [PATCH 3318/3370] xidlehook: 0.4.6 -> 0.4.8 (#41094)

---
 pkgs/tools/X11/xidlehook/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix
index 733a8eb630dd..e22338dbc718 100644
--- a/pkgs/tools/X11/xidlehook/default.nix
+++ b/pkgs/tools/X11/xidlehook/default.nix
@@ -1,19 +1,21 @@
-{ lib, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf
-, stdenv}:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, x11, xorg, libpulseaudio, pkgconfig, patchelf }:
 
 rustPlatform.buildRustPackage rec {
   name = "xidlehook-${version}";
-  version = "0.4.6";
+  version = "0.4.8";
+
+  doCheck = false;
 
   src = fetchFromGitHub {
     owner = "jD91mZM2";
     repo = "xidlehook";
     rev = version;
 
-    sha256 = "0h84ichm1v2wdmm4w1n7jr70yfb9hhi7kykvd99ppg00h1x9lr7w";
+    sha256 = "1125n5szgq7bziz3lkrhb2a2iac93ap63g2xr78ap7b9i3gxs3xh";
   };
 
-  cargoSha256 = "0a1bl6fnfw6xy71q3b5zij52p9skylj1ivqj8my44bfsid2qfn7d";
+  cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"];
+  cargoSha256 = "1mrg59flmmqg5wwi2l8lw6p1xpgdw597fdfsmpn8b126rgzqmjl8";
 
   buildInputs = [ x11 xorg.libXScrnSaver libpulseaudio ];
   nativeBuildInputs = [ pkgconfig patchelf ];

From 93255334c767874aa065030833d9a1daf17544f8 Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Sat, 9 Jun 2018 08:40:19 +0200
Subject: [PATCH 3319/3370] powerline-rs: 0.1.7 -> 0.1.8 (#41736)

---
 pkgs/tools/misc/powerline-rs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/powerline-rs/default.nix b/pkgs/tools/misc/powerline-rs/default.nix
index 138145683cb8..b16be0b5bdca 100644
--- a/pkgs/tools/misc/powerline-rs/default.nix
+++ b/pkgs/tools/misc/powerline-rs/default.nix
@@ -2,14 +2,14 @@
 rustPlatform.buildRustPackage rec {
   pname = "powerline-rs";
   name = "${pname}-${version}";
-  version = "0.1.7";
+  version = "0.1.8";
 
   src = fetchFromGitHub {
     owner = "jD91mZM2";
     repo = "powerline-rs";
     rev = version;
 
-    sha256 = "0ry1axia78sp9vmn6p119l69sj3dqx2san1k71a5npf60rf4gfkc";
+    sha256 = "018i9qq98afbgv0nxs1n83zb09lqhqxpdrd95f2maic3rr5ngnj5";
   };
 
   cargoSha256 = "184s432a6damzvl0lv6jar1iml9dq60r190aqjy44lcg938981zc";

From 2060ac6c79aa1975e3cf9924248fc9aeea71f42d Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 9 Jun 2018 09:57:25 +0300
Subject: [PATCH 3320/3370] aria2: 1.33.1 -> 1.34.0

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 29186906d27b..87725f51a7fb 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.33.1";
+  version = "1.34.0";
 
   src = fetchFromGitHub {
     owner = "aria2";
     repo = "aria2";
     rev = "release-${version}";
-    sha256 = "0ai84ijgsvnixwhxkj8if2mj9hcg2a41w81vy8bdvi89h3bmq9zf";
+    sha256 = "0hwqnjyszasr6049vr5mn48slb48v5kw39cbpbxa68ggmhj9bw6m";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];

From eb915f2b3cd4ae4e6e8627e8c2b3e0a117543a06 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 24 Mar 2018 20:52:55 -0500
Subject: [PATCH 3321/3370] spice: 0.13.3 -> 0.14.0

---
 pkgs/development/libraries/spice/default.nix | 23 ++------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix
index 1ab76340cc7c..ee54ad555537 100644
--- a/pkgs/development/libraries/spice/default.nix
+++ b/pkgs/development/libraries/spice/default.nix
@@ -6,32 +6,13 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "spice-0.13.3";
+  name = "spice-0.14.0";
 
   src = fetchurl {
     url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
-    sha256 = "17mqgwamdhj8sx8vhahrjl5937x693kjnw6cp6v0akjrwz011xrh";
+    sha256 = "0j5q7cp5p95jk8fp48gz76rz96lifimdsx1wnpmfal0nnnar9nrs";
   };
 
-  patches = [
-    # the following three patches fix CVE-2016-9577 and CVE-2016-9578
-    (fetchpatch {
-      name = "0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch";
-      url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0001-Prevent-possible-DoS-attempts-during-protocol-handsh.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
-      sha256 = "11x5566lx5zyl7f39glwsgpzkxb7hpcshx8va5ab3imrns07130q";
-    })
-    (fetchpatch {
-      name = "0002-Prevent-integer-overflows-in-capability-checks.patch";
-      url = "http://src.fedoraproject.org/cgit/rpms/spice.git/plain/0002-Prevent-integer-overflows-in-capability-checks.patch?id=d919d639ae5f83a9735a04d843eed675f9357c0d";
-      sha256 = "1r1bhq98w93cvvrlrz6jwdfsy261xl3xqs0ppchaa2igyxvxv5z5";
-    })
-    (fetchpatch {
-      name = "0003-main-channel-Prevent-overflow-reading-messages-from.patch";
-      url = "https://cgit.freedesktop.org/spice/spice/patch/?id=1d3e26c0ee75712fa4bbbcfa09d8d5866b66c8af";
-      sha256 = "030mm551aipck99rqiz39vsvk071pn8715zynr5j6chwzgpflwm3";
-    })
-  ];
-
   buildInputs = [ pixman celt alsaLib openssl libjpeg zlib
                   libXrandr libXfixes libXrender libXext libXinerama
                   python pyparsing glib cyrus_sasl lz4 ];

From b42cf67084bc647db7fd35441e375875d9ef0bbc Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 9 Jun 2018 07:17:14 +0000
Subject: [PATCH 3322/3370] xen: enable parallel building

---
 pkgs/applications/virtualization/xen/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 0cbf30bea741..6d0344d46865 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -221,6 +221,8 @@ stdenv.mkDerivation (rec {
     done
   '';
 
+  enableParallelBuilding = true;
+
   # TODO(@oxij): Stop referencing args here
   meta = {
     homepage = http://www.xen.org/;

From 5b787eba2560086070d96e4ce82ea10ce66add2e Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 9 Jun 2018 02:47:28 -0500
Subject: [PATCH 3323/3370] tcsh: patch to fix w/musl

---
 pkgs/shells/tcsh/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index da76e2c3027a..1dc966559560 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, fetchpatch
 , ncurses }:
 
 stdenv.mkDerivation rec {
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses ];
 
+  patches = stdenv.lib.optional stdenv.hostPlatform.isMusl
+    (fetchpatch {
+      name = "sysmalloc.patch";
+      url = "https://git.alpinelinux.org/cgit/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf";
+      sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67";
+    });
+
   meta = with stdenv.lib;{
     description = "An enhanced version of the Berkeley UNIX C shell (csh)";
     longDescription = ''

From a757aff8393a75e3d0235db61805618f9c9df6b9 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 8 Jun 2018 02:35:26 +0200
Subject: [PATCH 3324/3370] oracle-instantclient: use zips, add darwin support

---
 .../oracle-instantclient/default.nix          | 78 ++++++++++---------
 1 file changed, 43 insertions(+), 35 deletions(-)

diff --git a/pkgs/development/libraries/oracle-instantclient/default.nix b/pkgs/development/libraries/oracle-instantclient/default.nix
index 7e0f2e1cf903..56f0cc084d14 100644
--- a/pkgs/development/libraries/oracle-instantclient/default.nix
+++ b/pkgs/development/libraries/oracle-instantclient/default.nix
@@ -1,49 +1,57 @@
-{ stdenv, requireFile, autoPatchelfHook, rpmextract, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
+{ stdenv, requireFile, autoPatchelfHook, unzip, libaio, makeWrapper, odbcSupport ? false, unixODBC }:
 
 assert odbcSupport -> unixODBC != null;
 
 let
-    baseVersion = "12.2";
-    requireSource = version: rel: part: hash: (requireFile rec {
-      name = "oracle-instantclient${baseVersion}-${part}-${version}-${rel}.x86_64.rpm";
-      message = ''
-        This Nix expression requires that ${name} already
-        be part of the store. Download the file
-        manually at
-
-        http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html
-
-        and add it to the Nix store using either:
-          nix-store --add-fixed sha256 ${name}
-        or
-          nix-prefetch-url --type sha256 file:///path/to/${name}
-      '';
-      url = "http://www.oracle.com/technetwork/topics/linuxx86-64soft-092277.html";
-      sha256 = hash;
-    });
-in stdenv.mkDerivation rec {
+  baseVersion = "12.2";
   version = "${baseVersion}.0.1.0";
+
+  requireSource = component: arch: version: rel: hash: (requireFile rec {
+    name = "instantclient-${component}-${arch}-${version}" + (stdenv.lib.optionalString (rel != "") "-${rel}") + ".zip";
+    url = "http://www.oracle.com/technetwork/database/database-technologies/instant-client/downloads/index.html";
+    sha256 = hash;
+  });
+
+  throwSystem = throw "Unsupported system: ${stdenv.system}";
+
+  arch = {
+    "x86_64-linux" = "linux.x64";
+    "x86_64-darwin" = "macos.x64";
+  }."${stdenv.system}" or throwSystem;
+
+  srcs = {
+    "x86_64-linux" = [
+      (requireSource "basic" arch version "" "5015e3c9fba84e009f7519893f798a1622c37d1ae2c55104ff502c52a0fe5194")
+      (requireSource "sdk" arch version "" "7f404c3573c062ce487a51ac4cfe650c878d7edf8e73b364ec852645ed1098cb")
+      (requireSource "sqlplus" arch version "" "d49b2bd97376591ca07e7a836278933c3f251875c215044feac73ba9f451dfc2") ]
+      ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "365a4ae32c7062d9fbc3fb41add748e7881f774484a175a4b41a2c294ce9095d");
+    "x86_64-darwin" = [
+      (requireSource "basic" arch version "2" "3ed3102e5a24f0da638694191edb34933309fb472eb1df21ad5c86eedac3ebb9")
+      (requireSource "sdk" arch version "2" "e0befca9c4e71ebc9f444957ffa70f01aeeec5976ea27c40406471b04c34848b")
+      (requireSource "sqlplus" arch version "2" "d147cbb5b2a954fdcb4b642df4f0bd1153fd56e0f56e7fa301601b4f7e2abe0e") ]
+      ++ stdenv.lib.optional odbcSupport (requireSource "odbc" arch version "2" "1805c1ab6c8c5e8df7bdcc35d7f2b94c329ecf4dff9bde55d5f9b159ecd8b64e");
+  }."${stdenv.system}" or throwSystem;
+
+in stdenv.mkDerivation rec {
+  inherit version srcs;
   name = "oracle-instantclient-${version}";
 
-  buildInputs = [ libaio stdenv.cc.cc.lib ] ++ stdenv.lib.optional odbcSupport unixODBC;
-  nativeBuildInputs = [ autoPatchelfHook makeWrapper rpmextract ];
+  buildInputs = [ stdenv.cc.cc.lib ]
+    ++ stdenv.lib.optionals (stdenv.isLinux) [ libaio ]
+    ++ stdenv.lib.optional odbcSupport unixODBC;
+  nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ];
 
-  srcs = [
-    (requireSource version "1" "basic" "43c4bfa938af741ae0f9964a656f36a0700849f5780a2887c8e9f1be14fe8b66")
-    (requireSource version "1" "devel" "4c7ad8d977f9f908e47c5e71ce56c2a40c7dc83cec8a5c106b9ff06d45bb3442")
-    (requireSource version "1" "sqlplus" "303e82820a10f78e401e2b07d4eebf98b25029454d79f06c46e5f9a302ce5552")
-  ] ++ stdenv.lib.optional odbcSupport (requireSource version "2" "odbc" "e870c84d2d4be6f77c0760083b82b7ffbb15a4bf5c93c4e6c84f36d6ed4dfdf1");
-
-  unpackCmd = "rpmextract $curSrc";
+  unpackCmd = "unzip $curSrc";
 
   installPhase = ''
-    mkdir -p "$out/"{bin,include,lib,"share/${name}/demo/"}
+    mkdir -p "$out/"{bin,include,lib,"share/java","share/${name}/demo/"}
 
-    install -Dm755 lib/oracle/${baseVersion}/client64/bin/* $out/bin
+    install -Dm755 {sqlplus,adrci,genezi} $out/bin
     ln -s $out/bin/sqlplus $out/bin/sqlplus64
-    install -Dm644 lib/oracle/${baseVersion}/client64/lib/* $out/lib
-    install -Dm644 include/oracle/${baseVersion}/client64/* $out/include
-    install -Dm644 share/oracle/${baseVersion}/client64/demo/* $out/share/${name}/demo
+    install -Dm644 *${stdenv.hostPlatform.extensions.sharedLibrary}* $out/lib
+    install -Dm644 *.jar $out/share/java
+    install -Dm644 sdk/include/* $out/include
+    install -Dm644 sdk/demo/* $out/share/${name}/demo
   '';
 
   meta = with stdenv.lib; {
@@ -54,7 +62,7 @@ in stdenv.mkDerivation rec {
       command line SQL client.
     '';
     license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
     maintainers = with maintainers; [ pesterhazy flokli ];
     hydraPlatforms = [];
   };

From b19a03ec622038fd870f5163652cbf03a8ef7b36 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sat, 9 Jun 2018 03:14:29 -0500
Subject: [PATCH 3325/3370] tcsh: build for darwin too!

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

diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix
index 1dc966559560..0f393c11988f 100644
--- a/pkgs/shells/tcsh/default.nix
+++ b/pkgs/shells/tcsh/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.tcsh.org/;
     license = licenses.bsd2;
     maintainers = with maintainers; [ AndersonTorres ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 
   passthru = {

From c86622219af68e2651ff72bb80e1c2bd33f2ae04 Mon Sep 17 00:00:00 2001
From: florianjacob <accounts+github@florianjacob.de>
Date: Sat, 9 Jun 2018 11:46:24 +0200
Subject: [PATCH 3326/3370] matrix-synapse: 0.30.0 -> 0.31.1 (#41728)

---
 pkgs/servers/matrix-synapse/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 423fbf027fb5..3b1b34ac9d57 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,13 +26,13 @@ let
   };
 in pythonPackages.buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.30.0";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "10ggv7669ngxs8py82k8z24874ga0ldcxvpp7xhjpbr1s0gw8zv8";
+    sha256 = "1lrbjqa9rxn2prbnha9aghnwyi4z1rpfd7bk0bjsjixjl389d6d8";
   };
 
   patches = [
@@ -42,7 +42,7 @@ in pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = with pythonPackages; [
     blist canonicaljson daemonize dateutil frozendict pillow pyasn1
     pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests
-    signedjson systemd twisted ujson unpaddedbase64 pyyaml
+    signedjson systemd twisted ujson unpaddedbase64 pyyaml prometheus_client
     matrix-angular-sdk bleach netaddr jinja2 psycopg2
     psutil msgpack-python lxml matrix-synapse-ldap3
     phonenumbers jsonschema affinity bcrypt

From 7468501411c40aefd6ffe1e2a1bedef29e189256 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 9 Jun 2018 11:52:40 +0000
Subject: [PATCH 3327/3370] solargraph: 0.21.1 -> 0.22.0 (#41743)

---
 .../ruby-modules/solargraph/Gemfile.lock      | 14 +++++----
 .../ruby-modules/solargraph/gemset.nix        | 30 ++++++++++++-------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
index e87f65d02ad5..831653a60d1d 100644
--- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock
+++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock
@@ -5,7 +5,8 @@ GEM
     coderay (1.1.2)
     eventmachine (1.2.7)
     htmlentities (4.3.4)
-    kramdown (1.16.2)
+    jaro_winkler (1.5.1)
+    kramdown (1.17.0)
     mini_portile2 (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
@@ -16,7 +17,8 @@ GEM
     rainbow (3.0.0)
     reverse_markdown (1.1.0)
       nokogiri
-    rubocop (0.56.0)
+    rubocop (0.57.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
@@ -24,11 +26,11 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    solargraph (0.21.1)
+    solargraph (0.22.0)
       coderay (~> 1.1)
       eventmachine (~> 1.2, >= 1.2.5)
       htmlentities (~> 4.3, >= 4.3.4)
-      kramdown
+      kramdown (~> 1.16)
       parser (~> 2.4)
       reverse_markdown (~> 1.0, >= 1.0.5)
       rubocop (~> 0.52)
@@ -37,8 +39,8 @@ GEM
       yard (~> 0.9)
     thor (0.20.0)
     tilt (2.0.8)
-    unicode-display_width (1.3.2)
-    yard (0.9.12)
+    unicode-display_width (1.4.0)
+    yard (0.9.14)
 
 PLATFORMS
   ruby
diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix
index 0dbdd17d4d4d..e9e1244a53a5 100644
--- a/pkgs/development/ruby-modules/solargraph/gemset.nix
+++ b/pkgs/development/ruby-modules/solargraph/gemset.nix
@@ -31,13 +31,21 @@
     };
     version = "4.3.4";
   };
+  jaro_winkler = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rr797nqz081bfk30m2apj5h24bg5d1jr1c8p3xwx4hbwsrbclah";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
   kramdown = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0mkrqpp01rrfn3rx6wwsjizyqmafp0vgg8ja1dvbjs185r5zw3za";
+      sha256 = "1n1c4jmrh5ig8iv1rw81s4mw4xsp4v97hvf8zkigv4hn5h542qjq";
       type = "gem";
     };
-    version = "1.16.2";
+    version = "1.17.0";
   };
   mini_portile2 = {
     source = {
@@ -99,13 +107,13 @@
     version = "1.1.0";
   };
   rubocop = {
-    dependencies = ["parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
+    dependencies = ["jaro_winkler" "parallel" "parser" "powerpack" "rainbow" "ruby-progressbar" "unicode-display_width"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "04j2n2zilvfw46v94mpymwnfzni0jq05fz6gs3yi2na7l4c98zv8";
+      sha256 = "1rm2fidc3zkxamfvn53aa6mz4rr0qx6fhcnxc83bn4myv59gw9dd";
       type = "gem";
     };
-    version = "0.56.0";
+    version = "0.57.1";
   };
   ruby-progressbar = {
     source = {
@@ -119,10 +127,10 @@
     dependencies = ["coderay" "eventmachine" "htmlentities" "kramdown" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "18wkmbhymhwpdy4638bmdslniy2mjwldms5p61r6jnxzc7qnnalf";
+      sha256 = "1khj0bpyr7mwbjxd9x2al78rcw5k7s87ncrql5ml0ykqx57w7b7l";
       type = "gem";
     };
-    version = "0.21.1";
+    version = "0.22.0";
   };
   thor = {
     source = {
@@ -143,17 +151,17 @@
   unicode-display_width = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x31fgv1acywbb50prp7y4fr677c2d9gsl6wxmfcrlxbwz7nxn5n";
+      sha256 = "0040bsdpcmvp8w31lqi2s9s4p4h031zv52401qidmh25cgyh4a57";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   yard = {
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "11x58w0ccayvgy0lmhfyrzxd33ya1v41prh5zzhvaajhw8vr74lh";
+      sha256 = "08kww2m1izjq56q2va2my0x3f3f0xsg6f07b6sgb4nl0scr6y10q";
       type = "gem";
     };
-    version = "0.9.12";
+    version = "0.9.14";
   };
 }
\ No newline at end of file

From 62f4cc349bcda6b4ea015718b4ed5915d5cb3a10 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Fri, 8 Jun 2018 22:51:14 +0100
Subject: [PATCH 3328/3370] citrix-receiver: fix default version

---
 pkgs/applications/networking/remote/citrix-receiver/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 61dfb434070b..545bb88ba110 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -23,7 +23,7 @@
 , alsaLib
 , libidn
 , zlib
-, version ? "13.9.0"
+, version ? "13.9.1"
 }:
 
 let

From 34d3a97ec6661e906cca77369531aeb8f0a40ae1 Mon Sep 17 00:00:00 2001
From: obadz <obadz-git@obadz.com>
Date: Sat, 9 Jun 2018 15:11:19 +0100
Subject: [PATCH 3329/3370] citrix-receiver: add workaround to #41279

---
 pkgs/applications/networking/remote/citrix-receiver/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 545bb88ba110..9190deb990e9 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -209,6 +209,7 @@ let
         find $ICAInstDir -type f -exec file {} \; |
           grep 'ELF.*executable' |
           cut -f 1 -d : |
+          grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729
           while read f
           do
             echo "Patching ELF intrepreter and rpath for $f"

From 7a17a117d69de8deecf115f2e1d0808ef48472d7 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 9 Jun 2018 12:14:54 -0400
Subject: [PATCH 3330/3370] npth: use gnupg mirrors for fetchurl

This lets nix try any of the gnupg mirror alternatives if the previous FTP site
is down or temporarily unavailable.
---
 pkgs/development/libraries/npth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix
index a600938cdbb2..203be8b6907b 100644
--- a/pkgs/development/libraries/npth/default.nix
+++ b/pkgs/development/libraries/npth/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "npth-1.5";
 
   src = fetchurl {
-    url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2";
+    url = "mirror://gnupg/npth/${name}.tar.bz2";
     sha256 = "1hmkkp6vzyrh8v01c2ynzf9vwikyagp7p1lxhbnr4ysk3w66jji9";
   };
 

From 697ae2a0737daedf53e60ddfee83c8cc096ad28e Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 9 Jun 2018 12:32:53 -0400
Subject: [PATCH 3331/3370] emacsMacport: apply clean-env.patch

---
 pkgs/applications/editors/emacs/macport.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index c5cb0f4655e6..9fdc72ec22e5 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     sha256 = "0f2wzdw2a3ac581322b2y79rlj3c9f33ddrq9allj97r1si6v5xk";
   };
 
+  patches = [ ./clean-env.patch ];
+
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ pkgconfig autoconf automake ];

From bc490a4b3f48a3667c206869c5cc15056149d6c1 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 9 Jun 2018 12:56:22 -0400
Subject: [PATCH 3332/3370] =?UTF-8?q?emacs-mac:=20don=E2=80=99t=20propagat?=
 =?UTF-8?q?e=20frameworks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes the closure really big & is not needed for a running emacs.
---
 pkgs/applications/editors/emacs/macport.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix
index 9fdc72ec22e5..49ea544289f1 100644
--- a/pkgs/applications/editors/emacs/macport.nix
+++ b/pkgs/applications/editors/emacs/macport.nix
@@ -32,9 +32,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoconf automake ];
 
-  buildInputs = [ ncurses libxml2 gnutls texinfo gettext ];
-
-  propagatedBuildInputs = [
+  buildInputs = [ ncurses libxml2 gnutls texinfo gettext
     AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
     ImageCaptureCore GSS ImageIO   # may be optional
   ];

From f4434bef8bb2e4c27b998bd05a233f3be05b1a88 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 8 Jun 2018 02:45:56 +0200
Subject: [PATCH 3333/3370] odpic: enable on darwin

---
 pkgs/development/libraries/odpic/default.nix | 27 +++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/odpic/default.nix b/pkgs/development/libraries/odpic/default.nix
index 10a36b03d8db..07edc24ecabc 100644
--- a/pkgs/development/libraries/odpic/default.nix
+++ b/pkgs/development/libraries/odpic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libaio, oracle-instantclient }:
+{ stdenv, fetchurl, fetchpatch, fixDarwinDylibNames, oracle-instantclient, libaio }:
 
 stdenv.mkDerivation rec {
   name = "odpic-${version}";
@@ -9,24 +9,37 @@ stdenv.mkDerivation rec {
     sha256 = "1z793mg8hmy067xhllip7ca84xy07ca1cqilnr35mbvhmydp03zz";
   };
 
-  buildInputs = [ libaio oracle-instantclient ];
+  patches = [ (fetchpatch {
+    url = https://github.com/oracle/odpi/commit/31fdd70c06be711840a2668f572c7ee7c4434d18.patch;
+    sha256 = "1f00zp4w7l4vnkg0fmvnkga20ih8kjd5bxvr1nryziibjh1xp41j";
+  }) ];
+
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames ];
+
+  buildInputs = [ oracle-instantclient ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libaio ];
 
   libPath = stdenv.lib.makeLibraryPath
     [ oracle-instantclient ];
 
   dontPatchELF = true;
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [ "PREFIX=$(out)" "CC=cc" "LD=cc"];
 
   postFixup = ''
-    patchelf --set-rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
-  '';
+    ${stdenv.lib.optionalString (stdenv.isLinux) ''
+      patchelf --set-rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
+    ''}
+    ${stdenv.lib.optionalString (stdenv.isDarwin) ''
+      install_name_tool -add_rpath "${libPath}" $out/lib/libodpic${stdenv.hostPlatform.extensions.sharedLibrary}
+    ''}
+    '';
 
   meta = with stdenv.lib; {
     description = "Oracle ODPI-C library";
     homepage = "https://oracle.github.io/odpi/";
-    maintainers = with maintainers; [ mkazulak ];
+    maintainers = with maintainers; [ mkazulak flokli ];
     license = licenses.asl20;
-    platforms = [ "x86_64-linux" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
     hydraPlatforms = [];
   };
 }

From 05b9e9f011f2873329e8da62a1147f520caa15db Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 9 Jun 2018 18:45:44 +0200
Subject: [PATCH 3334/3370] gnome3.totem: fix build

Hopefully a proper fix for https://github.com/orivej/nixpkgs/commit/be17bccf38a2e5a5701115e15adf7ed5c585ac7d
---
 pkgs/desktops/gnome-3/core/totem/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index b4c15b5dce2e..f852e053cdeb 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
-  # https://bugzilla.gnome.org/show_bug.cgi?id=784236
-  # https://github.com/mesonbuild/meson/issues/1994
-  enableParallelBuilding = false;
-
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
   nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool wrapGAppsHook ];
@@ -46,7 +41,13 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ];
+  mesonFlags = [
+    "-Dwith-nautilusdir=lib/nautilus/extensions-3.0"
+    # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021
+    # https://bugzilla.gnome.org/show_bug.cgi?id=784236
+    # https://github.com/mesonbuild/meson/issues/1994
+    "-Denable-vala=no"
+  ];
 
   wrapPrefixVariables = [ "PYTHONPATH" ];
 

From bf794aaffc17ca9b7ff3cd3403e02b6d22a5fe4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 9 Jun 2018 18:24:54 +0100
Subject: [PATCH 3335/3370] mypy: 0.600 -> 0.610

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

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index 5ce05b7938f5..65cdf79059df 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "0.600";
+  version = "0.610";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1pd3kkz435wlvi9fwqbi3xag5zs59jcjqi6c9gzdjdn23friq9dw";
+    sha256 = "0fc7h7hf9042nlqczdvj2ngz2hc7rcnd35qz5pb840j38x9n8wpl";
   };
 
   disabled = !isPy3k;

From 79511c84344d539cd64ec0f3c836450a4d04156d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 9 Jun 2018 21:21:52 +0200
Subject: [PATCH 3336/3370] nzbget: 19.1 -> 20.0

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

diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix
index ef65444ae331..20a448b0ded6 100644
--- a/pkgs/tools/networking/nzbget/default.nix
+++ b/pkgs/tools/networking/nzbget/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "nzbget-${version}";
-  version = "19.1";
+  version = "20.0";
 
   src = fetchurl {
     url = "http://github.com/nzbget/nzbget/releases/download/v${version}/nzbget-${version}-src.tar.gz";
-    sha256 = "1rjwv555zc2hiagf00k8l1pzav91qglsnqbqkyy3pmn2d8sl5pq6";
+    sha256 = "0vyhmjg3ipjlv41il6kklys3m6rhqifdkv25a7ak772l6ba3dp04";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 08197d032a221bdb4c4d423a6544442ad12b798f Mon Sep 17 00:00:00 2001
From: xeji <36407913+xeji@users.noreply.github.com>
Date: Sat, 9 Jun 2018 22:02:48 +0200
Subject: [PATCH 3337/3370] nixos/tests/gnome3: switch to lightdm (#41742)

---
 nixos/tests/gnome3.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix
index 492fa61484a0..591ed8600685 100644
--- a/nixos/tests/gnome3.nix
+++ b/nixos/tests/gnome3.nix
@@ -11,8 +11,9 @@ import ./make-test.nix ({ pkgs, ...} : {
 
       services.xserver.enable = true;
 
-      services.xserver.displayManager.auto.enable = true;
-      services.xserver.displayManager.auto.user = "alice";
+      services.xserver.displayManager.lightdm.enable = true;
+      services.xserver.displayManager.lightdm.autoLogin.enable = true;
+      services.xserver.displayManager.lightdm.autoLogin.user = "alice";
       services.xserver.desktopManager.gnome3.enable = true;
 
       virtualisation.memorySize = 1024;
@@ -21,7 +22,9 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript =
     ''
       $machine->waitForX;
-      $machine->sleep(15);
+
+      # wait for alice to be logged in
+      $machine->waitForUnit("default.target","alice");
 
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");

From fc618a15e8be77035bbdf1ed9b6de2595cda7f14 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 9 Jun 2018 22:09:44 +0200
Subject: [PATCH 3338/3370] tor-browser-bundle-bin: 7.5.4 -> 7.5.5

---
 .../networking/browsers/tor-browser-bundle-bin/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 97b719c1471b..b8ee0aebb5fe 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -98,7 +98,7 @@ let
   fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ];
 
   # Upstream source
-  version = "7.5.4";
+  version = "7.5.5";
 
   lang = "en-US";
 
@@ -108,7 +108,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"
       ];
-      sha256 = "1d5q2vc7kyd2wizl4551yf54rcagh3y2xf1lzvrswxq4kasii3h9";
+      sha256 = "0v8mxxfqfpwm2nqmb3jyi91rqvxm4n391ilnvxavi00pd5p0glfh";
     };
 
     "i686-linux" = fetchurl {
@@ -116,7 +116,7 @@ let
         "https://github.com/TheTorProject/gettorbrowser/releases/download/v${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
         "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"
       ];
-      sha256 = "18v7ykv23gsylvn9mlkp5547yz3y833i9h126r7195wsqdshizdj";
+      sha256 = "1j1bhj50d0fqimcl10qfg076gp1wq42s6k9865jdvd3xfsgldnsj";
     };
   };
 in

From ee1550b763c0fe100ded752de6cc11676951a346 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 9 Jun 2018 20:14:36 +0000
Subject: [PATCH 3339/3370] hello-unfree: init at 1.0 (#41763)

Also add `version` attribute to GNU `hello` while we are at it.
---
 .../misc/hello-unfree/default.nix             | 23 +++++++++++++++++++
 pkgs/applications/misc/hello/default.nix      |  3 ++-
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/hello-unfree/default.nix

diff --git a/pkgs/applications/misc/hello-unfree/default.nix b/pkgs/applications/misc/hello-unfree/default.nix
new file mode 100644
index 000000000000..ef378b2c5ffb
--- /dev/null
+++ b/pkgs/applications/misc/hello-unfree/default.nix
@@ -0,0 +1,23 @@
+{ stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "example-unfree-package-${version}";
+  version = "1.0";
+
+  phases = [ "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cat > $out/bin/hello-unfree << EOF
+    #!/bin/sh
+    echo "Hello, you are running an unfree system!"
+    EOF
+    chmod +x $out/bin/hello-unfree
+  '';
+
+  meta = {
+    description = "An example package with unfree license (for testing)";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.oxij ];
+  };
+}
diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix
index c94f78317f4e..7998d30f253f 100644
--- a/pkgs/applications/misc/hello/default.nix
+++ b/pkgs/applications/misc/hello/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "hello-2.10";
+  name = "hello-${version}";
+  version = "2.10";
 
   src = fetchurl {
     url = "mirror://gnu/hello/${name}.tar.gz";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5dacded6fe6..659f28407227 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16297,6 +16297,7 @@ with pkgs;
   };
 
   hello = callPackage ../applications/misc/hello { };
+  hello-unfree = callPackage ../applications/misc/hello-unfree { };
 
   helmholtz = callPackage ../applications/audio/pd-plugins/helmholtz { };
 

From ab82f54f46dfedeffced607f532c49723ebb900c Mon Sep 17 00:00:00 2001
From: Lorenzo Manacorda <lorenzo@mailbox.org>
Date: Sat, 9 Jun 2018 22:45:56 +0200
Subject: [PATCH 3340/3370] keybase: 1.0.44 -> 2.0.0 (#41695)

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

diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix
index 331375273edd..47941a9d7787 100644
--- a/pkgs/tools/security/keybase/default.nix
+++ b/pkgs/tools/security/keybase/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "keybase-${version}";
-  version = "1.0.44";
+  version = "2.0.0";
 
   goPackagePath = "github.com/keybase/client";
   subPackages = [ "go/keybase" ];
@@ -13,7 +13,7 @@ buildGoPackage rec {
     owner  = "keybase";
     repo   = "client";
     rev    = "v${version}";
-    sha256 = "1np8fk15wwqkswzcyygga52r74dp101ny63i3m1wypgfky4hvsbb";
+    sha256 = "0lapcw9csr18n4pc1mlljs1bd8w8imzsic4qgr07s53i80bd8l6n";
   };
 
   buildFlags = [ "-tags production" ];

From fff4f5ad9521f8b606179deb5bd575cf1c1dd54e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 13:46:31 -0700
Subject: [PATCH 3341/3370] nextcloud: 13.0.2 -> 13.0.3 (#41666)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/nextcloud/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 13.0.3 with grep in /nix/store/hbps5w1zb88icnpqdpix29yx24hcf3ww-nextcloud-13.0.3
- directory tree listing: https://gist.github.com/feec7566b2d989d0e2f4a1870b1bb899
- du listing: https://gist.github.com/52d6f78c92d6b0bbd7179d3ed6da3d75
---
 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 7513d3c71d2b..fb43643f9038 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name= "nextcloud-${version}";
-  version = "13.0.2";
+  version = "13.0.3";
 
   src = fetchurl {
     url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2";
-    sha256 = "0zf4z4cn4wwsybxirvzyk7l6xjw9gkc60lzm8jqz9aak3a5gk5kk";
+    sha256 = "1r4k3vbjxm07mlm430hmp61dx052ikgzw0bqlmg09p8011a6fdhq";
   };
 
   installPhase = ''

From 857ab32cca581dd891d13631c360321b374e2420 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 9 Jun 2018 22:13:01 +0200
Subject: [PATCH 3342/3370] darwin.iproute2mac: init at 1.2.1

---
 .../darwin/iproute2mac/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/darwin-packages.nix            |  4 ++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/darwin/iproute2mac/default.nix

diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
new file mode 100644
index 000000000000..3b227091cb3f
--- /dev/null
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, python }:
+
+stdenv.mkDerivation rec {
+  version = "1.2.1";
+  name = "iproute2mac-${version}";
+
+  src = fetchFromGitHub {
+    owner = "brona";
+    repo = "iproute2mac";
+    rev = "v${version}";
+    sha256 = "1n6la7blbxza2m79cpnywsavhzsdv4gzdxrkly4dppyidjg6jy1h";
+  };
+
+  buildInputs = [ python ];
+
+  postPatch = ''
+    substituteInPlace src/ip.py --replace /usr/bin/python ${python}/bin/python
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D -m 755 src/ip.py $out/bin/ip
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/brona/iproute2mac;
+    description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command.";
+    license = licenses.mit;
+    maintainers = with maintainers; [ flokli ];
+    platforms = platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index a53b16919ee3..c6be00b0288f 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -51,8 +51,10 @@ in
     inherit (pkgs.llvmPackages) clang-unwrapped;
   };
 
+  iproute2mac = callPackage ../os-specific/darwin/iproute2mac { };
+
   libobjc = apple-source-releases.objc4;
-  
+
   lsusb = callPackage ../os-specific/darwin/lsusb { };
 
   opencflite = callPackage ../os-specific/darwin/opencflite { };

From dcdeaa1a2455f61f2406431efd279aacb955544b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 9 Jun 2018 23:12:16 +0200
Subject: [PATCH 3343/3370] darwin.iproute2mac: wrap network_cmds

---
 pkgs/os-specific/darwin/iproute2mac/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix
index 3b227091cb3f..3ff03aace4ee 100644
--- a/pkgs/os-specific/darwin/iproute2mac/default.nix
+++ b/pkgs/os-specific/darwin/iproute2mac/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python }:
+{ stdenv, fetchFromGitHub, darwin, python }:
 
 stdenv.mkDerivation rec {
   version = "1.2.1";
@@ -14,7 +14,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
 
   postPatch = ''
-    substituteInPlace src/ip.py --replace /usr/bin/python ${python}/bin/python
+    substituteInPlace src/ip.py \
+      --replace /usr/bin/python ${python}/bin/python \
+      --replace /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
+      --replace /sbin/route ${darwin.network_cmds}/bin/route \
+      --replace /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
+      --replace /usr/sbin/ndp ${darwin.network_cmds}/bin/ndp \
+      --replace /usr/sbin/arp ${darwin.network_cmds}/bin/arp \
+      --replace /usr/sbin/networksetup ${darwin.network_cmds}/bin/networksetup
   '';
   installPhase = ''
     mkdir -p $out/bin

From 488ee63a13cb6ac9180f92da19d8be9d1da86fcf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:29:41 -0700
Subject: [PATCH 3344/3370] sysstat: 11.7.3 -> 11.7.4 (#41510)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/sysstat/versions.

These checks were done:

- built on NixOS
- /nix/store/gz1jvhynz6ixwh9z33kw5fi603nq090q-sysstat-11.7.4/bin/sar passed the binary check.
- /nix/store/gz1jvhynz6ixwh9z33kw5fi603nq090q-sysstat-11.7.4/bin/sadf passed the binary check.
- /nix/store/gz1jvhynz6ixwh9z33kw5fi603nq090q-sysstat-11.7.4/bin/iostat passed the binary check.
- /nix/store/gz1jvhynz6ixwh9z33kw5fi603nq090q-sysstat-11.7.4/bin/tapestat passed the binary check.
- /nix/store/gz1jvhynz6ixwh9z33kw5fi603nq090q-sysstat-11.7.4/bin/mpstat passed the binary check.
- /nix/store/gz1jvhynz6ixwh9z33kw5fi603nq090q-sysstat-11.7.4/bin/pidstat passed the binary check.
- /nix/store/gz1jvhynz6ixwh9z33kw5fi603nq090q-sysstat-11.7.4/bin/cifsiostat passed the binary check.
- 7 of 7 passed binary check by having a zero exit code.
- 0 of 7 passed binary check by having the new version present in output.
- found 11.7.4 with grep in /nix/store/gz1jvhynz6ixwh9z33kw5fi603nq090q-sysstat-11.7.4
- directory tree listing: https://gist.github.com/099df05f7cbb5510144a7b1741ff0fda
- du listing: https://gist.github.com/21956b2e9d623a7923391b59af578f7e
---
 pkgs/os-specific/linux/sysstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index db9f05f5f4d8..0da32371b351 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "sysstat-11.7.3";
+  name = "sysstat-11.7.4";
 
   src = fetchurl {
     url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
-    sha256 = "1sk6rhdqr8xsm456fkhkcmbnqgkymqqs3jkapcf8mrnsx36gz94f";
+    sha256 = "144h5fb93s33w3pmgw7qadw1f7c4jq41m5lzcs49ihl44yi6aqm9";
   };
 
   buildInputs = [ gettext ];

From d5cb2b49e7889a54744990530382ef7f374ae97d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:30:16 -0700
Subject: [PATCH 3345/3370] thermald: 1.7.1 -> 1.7.2 (#41512)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/thermald/versions.

These checks were done:

- built on NixOS
- /nix/store/nbpmvairfm9zrzjijmwhr30bzmp2653h-thermald-1.7.2/bin/thermald passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 1 of 1 passed binary check by having the new version present in output.
- found 1.7.2 with grep in /nix/store/nbpmvairfm9zrzjijmwhr30bzmp2653h-thermald-1.7.2
- directory tree listing: https://gist.github.com/ad1f865238e5c5f860f3887649db1e4e
- du listing: https://gist.github.com/7d5e5cedb23a1867821a4444b72d29ab
---
 pkgs/tools/system/thermald/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 1300a6a87655..27458174dc2a 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "thermald-${version}";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thermal_daemon";
     rev = "v${version}";
-    sha256 = "0y0r8zcaxcnim3axc7kh5pm4py33pgv5mwh002cbrw6h90l2qzq1";
+    sha256 = "1cs2pq8xvfnsvrhg2bxawk4kn3z1qmfrnpnhs178pvfbglzh15hc";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From f8621a202544bba96081699699f19e66188667aa Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:32:31 -0700
Subject: [PATCH 3346/3370] matomo: 3.5.0 -> 3.5.1 (#41540)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/matomo/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/r4kflygmbi1z0vl2gp5b64h5dnbw0zps-matomo-3.5.1/bin/matomo-console had a zero exit code or showed the expected version
- 0 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 3.5.1 with grep in /nix/store/r4kflygmbi1z0vl2gp5b64h5dnbw0zps-matomo-3.5.1
- directory tree listing: https://gist.github.com/1ab3b04c7d594c57458b6d4ef8e65867
- du listing: https://gist.github.com/c105a7109ba84d6e2715bc3800c66780
---
 pkgs/servers/web-apps/matomo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix
index 27cf873e7908..a4a26fd506bc 100644
--- a/pkgs/servers/web-apps/matomo/default.nix
+++ b/pkgs/servers/web-apps/matomo/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "matomo-${version}";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchurl {
     # TODO: As soon as the tarballs are renamed as well on future releases, this should be enabled again
     # url = "https://builds.matomo.org/${name}.tar.gz";
     url = "https://builds.matomo.org/piwik-${version}.tar.gz";
-    sha256 = "1l656b194h7z3k52ywl7sfa2h6sxa5gf22wcfrp0pp07v9p6pc5f";
+    sha256 = "0ifrgaw30h4d6hwwzrz8i9k036dxzkxgh71y9s0ds10lhr8vidym";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From cc9fc2bdcd4bbdaaf6b4e172011488f712693617 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:33:17 -0700
Subject: [PATCH 3347/3370] ipopt: 3.12.9 -> 3.12.10 (#41555)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/ipopt/versions.

These checks were done:

- built on NixOS

- 0 of 0 passed binary check by having a zero exit code.
- 0 of 0 passed binary check by having the new version present in output.
- found 3.12.10 with grep in /nix/store/6748l35g9dz7z77wqwal99ylrhn87liv-ipopt-3.12.10
- directory tree listing: https://gist.github.com/5da4bb4853af0913caca26e8cbc87666
- du listing: https://gist.github.com/c4d8373c7d9a61f39479151fdffa99cb
---
 pkgs/development/libraries/science/math/ipopt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix
index f694f72f22b6..0af00f75d994 100644
--- a/pkgs/development/libraries/science/math/ipopt/default.nix
+++ b/pkgs/development/libraries/science/math/ipopt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ipopt-${version}";
-  version = "3.12.9";
+  version = "3.12.10";
 
   src = fetchurl {
     url = "http://www.coin-or.org/download/source/Ipopt/Ipopt-${version}.zip";
-    sha256 = "1fqdjgxh6l1xjvw1ffma7lg92xqg0l8sj02y0zqvbfnx8i47qs9a";
+    sha256 = "004pd90knnnzcx727knb7ffkabb1ggbskb8s607bfvfgdd7wlli9";
   };
 
   CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ];

From c283f18b0f20a92d77902116b1b0680401cd4d60 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:34:36 -0700
Subject: [PATCH 3348/3370] debootstrap: 1.0.100 -> 1.0.101 (#41573)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/debootstrap/versions.

These checks were done:

- built on NixOS
- /nix/store/x9xnb4bkg9h18iz4xvjsqwq1yzy7y4fg-debootstrap-1.0.101/bin/debootstrap passed the binary check.
- 1 of 1 passed binary check by having a zero exit code.
- 0 of 1 passed binary check by having the new version present in output.
- found 1.0.101 with grep in /nix/store/x9xnb4bkg9h18iz4xvjsqwq1yzy7y4fg-debootstrap-1.0.101
- directory tree listing: https://gist.github.com/ff456a293ac749e2bb7a78fd6cf95906
- du listing: https://gist.github.com/57824cbc8d981aa24e5d98ca35e86053
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index d12038a707d2..bf4319759fb6 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -4,13 +4,13 @@
 # There is also cdebootstrap now. Is that easier to maintain?
 stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.100";
+  version = "1.0.101";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "0jmwf26sq4bkdz6wi0dcjsrfkg8c8k3xdhi11xp6cdrw6qpw82ws";
+    sha256 = "1p1a81s8hq73byd7256iljdls389x2q7w6srgrgfmx5bl1csnzp3";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];

From 00156c3caea9c651d5d1d3dcafa2a9729dcdbd81 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:35:06 -0700
Subject: [PATCH 3349/3370] fanficfare: 2.25.0 -> 2.26.0 (#41569)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/fanficfare/versions.

These checks were done:

- built on NixOS
- /nix/store/8xysybhmjya5wx4rsykxk7d9f37g3qbk-fanficfare-2.26.0/bin/.fanficfare-wrapped passed the binary check.
- /nix/store/8xysybhmjya5wx4rsykxk7d9f37g3qbk-fanficfare-2.26.0/bin/fanficfare passed the binary check.
- 2 of 2 passed binary check by having a zero exit code.
- 2 of 2 passed binary check by having the new version present in output.
- found 2.26.0 with grep in /nix/store/8xysybhmjya5wx4rsykxk7d9f37g3qbk-fanficfare-2.26.0
- directory tree listing: https://gist.github.com/8dac0cbfced5624b49e894cfb51f13be
- du listing: https://gist.github.com/3710839076360d257f245cd976e974fa
---
 pkgs/tools/text/fanficfare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix
index 2ebab9d63904..7a395eb8905e 100644
--- a/pkgs/tools/text/fanficfare/default.nix
+++ b/pkgs/tools/text/fanficfare/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, python27Packages }:
 
 python27Packages.buildPythonApplication rec {
-  version = "2.25.0";
+  version = "2.26.0";
   name = "fanficfare-${version}";
   nameprefix = "";
 
   src = fetchurl {
     url = "https://github.com/JimmXinu/FanFicFare/archive/v${version}.tar.gz";
-    sha256 = "1fval2jhrv3w762rmrbhbn8zj161aalvqy8n8q74yr8hzmpcvlwn";
+    sha256 = "1gas5x0xzkxnc0rvyi04phzxpxxd1jfmx9a7l2fhqmlw67lml4rr";
   };
 
   propagatedBuildInputs = with python27Packages; [ beautifulsoup4 chardet html5lib html2text ];

From 4d5cb8617ca471ec2f06a379a8046693f64902d6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:35:35 -0700
Subject: [PATCH 3350/3370] kdeconnect: 1.3.0 -> 1.3.1 (#41551)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/kdeconnect/versions.

These checks were done:

- built on NixOS
- /nix/store/2w9c8qf2zm1hvmd67j23q0wv5i3v26v0-kdeconnect-1.3.1/bin/kdeconnect-cli passed the binary check.
- Warning: no invocation of /nix/store/2w9c8qf2zm1hvmd67j23q0wv5i3v26v0-kdeconnect-1.3.1/bin/kdeconnect-indicator had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/2w9c8qf2zm1hvmd67j23q0wv5i3v26v0-kdeconnect-1.3.1/bin/kdeconnect-handler had a zero exit code or showed the expected version
- 1 of 3 passed binary check by having a zero exit code.
- 1 of 3 passed binary check by having the new version present in output.
- found 1.3.1 with grep in /nix/store/2w9c8qf2zm1hvmd67j23q0wv5i3v26v0-kdeconnect-1.3.1
- directory tree listing: https://gist.github.com/a152722e459e7e8094cfdbd791a8c55b
- du listing: https://gist.github.com/665212497cfba50b98110a2788e52eec
---
 pkgs/applications/misc/kdeconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 0d02dbba69eb..97e371e9e72c 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -20,12 +20,12 @@
 
 stdenv.mkDerivation rec {
   pname = "kdeconnect";
-  version = "1.3.0";
+  version = "1.3.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${version}/src/${pname}-kde-${version}.tar.xz";
-    sha256 = "0gzv55hks6j37pf7d18l40n1q6j8b74j9qg3v44p8sp0gnglwkcm";
+    sha256 = "0rzjbn4d2lh81n19dd3a5ilm8qml3zs3g3ahg75avcw8770rr344";
   };
 
   buildInputs = [

From 492f1649f811654365f8ff647e62e5b9d74117df Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:37:07 -0700
Subject: [PATCH 3351/3370] springLobby: 0.255 -> 0.264 (#41508)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/springlobby/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/i6g7iand22k99ry0hjda1gs71amk9q11-springlobby-0.264/bin/springlobby had a zero exit code or showed the expected version
- Warning: no invocation of /nix/store/i6g7iand22k99ry0hjda1gs71amk9q11-springlobby-0.264/bin/.springlobby-wrapped had a zero exit code or showed the expected version
- 0 of 2 passed binary check by having a zero exit code.
- 0 of 2 passed binary check by having the new version present in output.
- found 0.264 with grep in /nix/store/i6g7iand22k99ry0hjda1gs71amk9q11-springlobby-0.264
- directory tree listing: https://gist.github.com/4d077ab682c9643337f22bf2bd75f51c
- du listing: https://gist.github.com/f215b8788c2ea5ebb286f3dddc34fdf9
---
 pkgs/games/spring/springlobby.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index 36256d31fda7..2000398b537d 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "springlobby-${version}";
-  version = "0.255";
+  version = "0.264";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "12iv6h1mz998lzxc2jwkza0m1yvaaq8h05k36i85xyp7g90197jw";
+    sha256 = "1i31anvvywhl2m8014m3vk74cj74l37j6a0idzfhd4ack8b9hg2x";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7710faccee9f74b4201bdc73e43cd2728357ce36 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 9 Jun 2018 14:44:55 -0700
Subject: [PATCH 3352/3370] mate.mate-desktop: 1.20.1 -> 1.20.3 (#41548)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/mate-desktop/versions.

These checks were done:

- built on NixOS
- Warning: no invocation of /nix/store/wxcn9xjdga9v1qlsk99rhiaim6xwrkcl-mate-desktop-1.20.3/bin/mate-color-select had a zero exit code or showed the expected version
- /nix/store/wxcn9xjdga9v1qlsk99rhiaim6xwrkcl-mate-desktop-1.20.3/bin/mate-about passed the binary check.
- Warning: no invocation of /nix/store/wxcn9xjdga9v1qlsk99rhiaim6xwrkcl-mate-desktop-1.20.3/bin/.mate-color-select-wrapped had a zero exit code or showed the expected version
- /nix/store/wxcn9xjdga9v1qlsk99rhiaim6xwrkcl-mate-desktop-1.20.3/bin/.mate-about-wrapped passed the binary check.
- 2 of 4 passed binary check by having a zero exit code.
- 0 of 4 passed binary check by having the new version present in output.
- found 1.20.3 with grep in /nix/store/wxcn9xjdga9v1qlsk99rhiaim6xwrkcl-mate-desktop-1.20.3
- directory tree listing: https://gist.github.com/31f847260d9910561df955f376feb063
- du listing: https://gist.github.com/2b921cbfb4bda4b008a2b2a496b49229
---
 pkgs/desktops/mate/mate-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix
index f84b6b254207..09f8da17e096 100644
--- a/pkgs/desktops/mate/mate-desktop/default.nix
+++ b/pkgs/desktops/mate/mate-desktop/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "mate-desktop-${version}";
-  version = "1.20.1";
+  version = "1.20.3";
 
   src = fetchurl {
     url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz";
-    sha256 = "0jxhhf9w6mz8ha6ymgj2alzmiydylg4ngqslkjxx37vvpvms2dyx";
+    sha256 = "132z1wwmh5115cpgkx9w6hzkk87f1vh66paaf3b2d2qfci7myffs";
   };
 
   nativeBuildInputs = [

From 8e9e728aee73306751277ec65ae2e33b0ba88a6f Mon Sep 17 00:00:00 2001
From: Vincent Ambo <github@tazj.in>
Date: Sun, 10 Jun 2018 00:03:02 +0200
Subject: [PATCH 3353/3370] kontemplate: 1.5.0 -> 1.6.0 (#41766)

Upstream release notes at:

https://github.com/tazjin/kontemplate/releases/tag/v1.6.0
---
 pkgs/applications/networking/cluster/kontemplate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix
index fd599cd86586..e5d649c68b79 100644
--- a/pkgs/applications/networking/cluster/kontemplate/default.nix
+++ b/pkgs/applications/networking/cluster/kontemplate/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name          = "kontemplate-${version}";
-  version       = "1.5.0";
+  version       = "1.6.0";
   goPackagePath = "github.com/tazjin/kontemplate";
   goDeps        = ./deps.nix;
 
@@ -10,7 +10,7 @@ buildGoPackage rec {
     owner  = "tazjin";
     repo   = "kontemplate";
     rev    = "v${version}";
-    sha256 = "0k3yr0ypw6brj1lxqs041zsyi0r09113i0x3xfj48zv4ralq74b6";
+    sha256 = "06qcf2cxs686kd7iqccmqd5chdzxgbkav95byjim7sgvq9qjajfi";
   };
 
   meta = with lib; {

From d5ca8dea78dbdfe54ebed8781d8795fd030baa75 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 9 Jun 2018 17:14:38 -0500
Subject: [PATCH 3354/3370] synapse-bt: fix darwin build

---
 pkgs/applications/networking/p2p/synapse-bt/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix
index c8d54e945bf9..2c257a1294ac 100644
--- a/pkgs/applications/networking/p2p/synapse-bt/default.nix
+++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl }:
+{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, Security }:
 
 rustPlatform.buildRustPackage rec {
   name = "synapse-bt-unstable-${version}";
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "1psrmgf6ddzqwx7gf301rx84asfnvxpsvkx2fan453v65819k960";
 
-  buildInputs = [ pkgconfig openssl ];
+  buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security;
 
   cargoBuildFlags = [ "--all" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e645b0a2a02c..f09e321d3b15 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17187,7 +17187,9 @@ with pkgs;
     inherit (gnome3) libgee;
   };
 
-  synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { };
+  synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   synfigstudio = callPackage ../applications/graphics/synfigstudio {
     fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; };

From 84670fb9c827e5f1c77d70013e4bb637e051aa2a Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 9 Jun 2018 22:14:54 +0000
Subject: [PATCH 3355/3370] antibody: 3.4.6 -> 3.5.0 (#41746)

---
 pkgs/shells/zsh/antibody/default.nix |  4 +-
 pkgs/shells/zsh/antibody/deps.nix    | 67 +++++++++++++++++++---------
 2 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix
index b95ba35045d0..6d428b69e630 100644
--- a/pkgs/shells/zsh/antibody/default.nix
+++ b/pkgs/shells/zsh/antibody/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "antibody-${version}";
-  version = "3.4.6";
+  version = "3.5.0";
   rev = "v${version}";
   
   goPackagePath = "github.com/getantibody/antibody";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner  = "getantibody";
     repo   = "antibody";
-    sha256 = "0pvsngvlxv5iw7yj18snslag8c61ji4w3j3rw543ckl6k3f9zq6c";
+    sha256 = "0x9wfki7cl3cm9h21zj37196gwdzgllfgqmgy9n86m82wbla6slb";
   };
 
   goDeps = ./deps.nix;
diff --git a/pkgs/shells/zsh/antibody/deps.nix b/pkgs/shells/zsh/antibody/deps.nix
index 6e97ff319029..b824358fbbab 100644
--- a/pkgs/shells/zsh/antibody/deps.nix
+++ b/pkgs/shells/zsh/antibody/deps.nix
@@ -1,82 +1,109 @@
 [
   {
-    goPackagePath = "github.com/alecthomas/kingpin";
+    goPackagePath  = "github.com/alecthomas/kingpin";
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/kingpin";
-      rev = "a39589180ebd6bbf43076e514b55f20a95d43086";
+      rev =  "a39589180ebd6bbf43076e514b55f20a95d43086";
       sha256 = "0b00bfiwl76qflnmnk3cnlaii6wxgzzdnby99cxdych4f8qmzlv3";
     };
   }
   {
-    goPackagePath = "github.com/alecthomas/template";
+    goPackagePath  = "github.com/alecthomas/template";
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/template";
-      rev = "a0175ee3bccc567396460bf5acd36800cb10c49c";
+      rev =  "a0175ee3bccc567396460bf5acd36800cb10c49c";
       sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj";
     };
   }
   {
-    goPackagePath = "github.com/alecthomas/units";
+    goPackagePath  = "github.com/alecthomas/units";
     fetch = {
       type = "git";
       url = "https://github.com/alecthomas/units";
-      rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
+      rev =  "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a";
       sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl";
     };
   }
   {
-    goPackagePath = "github.com/caarlos0/gohome";
+    goPackagePath  = "github.com/caarlos0/gohome";
     fetch = {
       type = "git";
       url = "https://github.com/caarlos0/gohome";
-      rev = "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
+      rev =  "c08fdebe2a8b9b92637a423c66ac5d4a8f4e91e8";
       sha256 = "1wpg7dpi44kic4y20bk6fjwpanm65h1hj4762dsp41kbdfzc8322";
     };
   }
   {
-    goPackagePath = "github.com/getantibody/folder";
+    goPackagePath  = "github.com/davecgh/go-spew";
     fetch = {
       type = "git";
-      url = "https://github.com/getantibody/folder";
-      rev = "e65aa38ebeb03e6d6e91b90a637f3b7c17e1b6d6";
-      sha256 = "0h8al3sl4gxg1p33s8jrz91i7vrqahk12p0b3srlhnz1sn4ahn8n";
+      url = "https://github.com/davecgh/go-spew";
+      rev =  "346938d642f2ec3594ed81d874461961cd0faa76";
+      sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c";
     };
   }
   {
-    goPackagePath = "golang.org/x/crypto";
+    goPackagePath  = "github.com/getantibody/folder";
+    fetch = {
+      type = "git";
+      url = "https://github.com/getantibody/folder";
+      rev =  "479aa91767d47bc27599e6ebc7fd07945dd38132";
+      sha256 = "0mzc2x7897f17kj2v807d8cqzgclq9bsz2xqz81j1k85g53l513j";
+    };
+  }
+  {
+    goPackagePath  = "github.com/pmezard/go-difflib";
+    fetch = {
+      type = "git";
+      url = "https://github.com/pmezard/go-difflib";
+      rev =  "792786c7400a136282c1664665ae0a8db921c6c2";
+      sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
+    };
+  }
+  {
+    goPackagePath  = "github.com/stretchr/testify";
+    fetch = {
+      type = "git";
+      url = "https://github.com/stretchr/testify";
+      rev =  "12b6f73e6084dad08a7c6e575284b177ecafbc71";
+      sha256 = "01f80s0q64pw5drfgqwwk1wfwwkvd2lhbs56lhhkff4ni83k73fd";
+    };
+  }
+  {
+    goPackagePath  = "golang.org/x/crypto";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "1a580b3eff7814fc9b40602fd35256c63b50f491";
+      rev =  "1a580b3eff7814fc9b40602fd35256c63b50f491";
       sha256 = "11adgxc6fzcb3dxr5v2g4nk6ggrz04qnx633hzgmzfh2wv3blgv7";
     };
   }
   {
-    goPackagePath = "golang.org/x/net";
+    goPackagePath  = "golang.org/x/net";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "2491c5de3490fced2f6cff376127c667efeed857";
+      rev =  "2491c5de3490fced2f6cff376127c667efeed857";
       sha256 = "1wmijnrxi9p2rv8g6clqkzdihn5ncv29j0s4s1bz9ksncdr36ll3";
     };
   }
   {
-    goPackagePath = "golang.org/x/sync";
+    goPackagePath  = "golang.org/x/sync";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sync";
-      rev = "1d60e4601c6fd243af51cc01ddf169918a5407ca";
+      rev =  "1d60e4601c6fd243af51cc01ddf169918a5407ca";
       sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6";
     };
   }
   {
-    goPackagePath = "golang.org/x/sys";
+    goPackagePath  = "golang.org/x/sys";
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/sys";
-      rev = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
+      rev =  "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b";
       sha256 = "03fhkng37rczqwfgah5hd7d373jps3hcfx79dmky2fh62yvpcyn3";
     };
   }

From 350f49734b161895803df1e3eb712df4f9c0e81e Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sat, 9 Jun 2018 17:31:00 -0500
Subject: [PATCH 3356/3370] pythonPackages.pylibmc: fix runtime dependency on
 libsasl2.so, by way of cyrus_sasl

Without explicitly specifying that libsasl2 is part of the build, and
without explicitly making it part of pylibmc's linker flags for its
CPython extension, the cpython code enters a build state error where it
instead attempts to blindly `dlopen("libsasl2.so")` out of
$LD_LIBRARY_PATH; this fails as it can't be found in the store,
obviously.

The bigger problem with this is that it otherwise makes pylibmc
unusable, as it will try to immediately load libsasl2 at startup. This
means even using 'import pylibmc' at all will cause a failure.

Instead, add cyrus_sasl into the build closure of the library, and pass
an argument to the setup.py script to properly pass -lsasl2 to the C
extension. This causes a link to properly be formed.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/pylibmc/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
index 7f57f17efeb1..47499e4ae188 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,4 +1,5 @@
-{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib }:
+{ buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }:
+
 buildPythonPackage rec {
   version = "1.5.2";
   pname = "pylibmc";
@@ -9,7 +10,8 @@ buildPythonPackage rec {
     sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
   };
 
-  buildInputs = [ libmemcached zlib ];
+  buildInputs = [ libmemcached zlib cyrus_sasl ];
+  setupPyBuildFlags = [ "--with-sasl2" ];
 
   # requires an external memcached server running
   doCheck = false;

From e20abf829a1582f93486f929a14b8151ec9ac0c7 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 9 Jun 2018 19:08:59 -0400
Subject: [PATCH 3357/3370] p7zip: fix src URL for debian gitlab move (#41769)

Another broken URL related to: https://github.com/NixOS/nixpkgs/issues/39927

Note that the patch file has legitimately changed, because ~4 months ago Debian
replaced their CVE security fix with a newer version that fixes some additional
bugs: https://salsa.debian.org/debian/p7zip/commit/d6fd3b37345489ec2907fcf70aabf0c754f5371f
---
 pkgs/tools/archivers/p7zip/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 886ed8179091..6cabd8ff976b 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch rec {
       name = "CVE-2016-9296.patch";
-      url = "https://src.fedoraproject.org/cgit/rpms/p7zip.git/plain/${name}?id=4b3973f6a5d";
+      url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/12-${name}";
       sha256 = "09wbkzai46bwm8zmplsz0m4jck3qn7snr68i9p1gsih300zidj0m";
     })
     (fetchpatch rec {
       name = "CVE-2017-17969.patch";
-      url = "https://anonscm.debian.org/cgit/users/robert/p7zip.git/plain/debian/patches/13-${name}?h=debian/16.02%2bdfsg-5";
-      sha256 = "16lbf6rgyl7xwxfjgg1243jvi39yb3i5pgqfnxswyc0jzhxv81d7";
+      url = "https://salsa.debian.org/debian/p7zip/raw/debian/${version}+dfsg-6/debian/patches/13-${name}";
+      sha256 = "00pycdwx6gw7w591bg54ym6zhbxgn47p3zhms6mnmaycfzw09mkn";
     })
   ];
 

From e2b44b317052fa65acd15cfb2ed53b78638327b9 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 9 Jun 2018 19:18:16 -0400
Subject: [PATCH 3358/3370] fftw: support multiple src URLs

The fftw download page provides both an HTTP and FTP endpoint for downloading release tarballs:
http://fftw.org/download.html

Since some users may have difficulty fetching via FTP through corporate
firewalls, we should provide the option to get it over HTTP as well.
---
 pkgs/development/libraries/fftw/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 3c5100f2f7f4..12b30cf0349f 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -13,7 +13,10 @@ stdenv.mkDerivation rec {
   name = "fftw-${precision}-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz";
+    urls = [
+      "http://fftw.org/fftw-${version}.tar.gz"
+      "ftp://ftp.fftw.org/pub/fftw/fftw-${version}.tar.gz"
+    ];
     sha256 = "00z3k8fq561wq2khssqg0kallk0504dzlx989x3vvicjdqpjc4v1";
   };
 

From 5cc335cd555e88abf0ef2f0cac98778ff5e8d971 Mon Sep 17 00:00:00 2001
From: Benjamin Hipple <bhipple@protonmail.com>
Date: Sat, 9 Jun 2018 19:35:39 -0400
Subject: [PATCH 3359/3370] xfsprogs: swap src url to HTTPS

This swaps the fetchgit call to be more consistent with the majority of other
NixPkgs fetchgit calls. Moreover, almost every network will be able to do HTTPS,
while some enterprise networks may limit external SSH access.
---
 pkgs/tools/filesystems/xfsprogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index cc2bbad1680a..d38e26edec6e 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   version = "4.14.0";
 
   src = fetchgit {
-    url = "git://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git";
-    rev = "refs/tags/v${version}";
+    url = "https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git";
+    rev = "v${version}";
     sha256 = "19mg3avm188xz215hqbbh7251q27qwm7g1xr8ffrjwvzmdq55rxj";
   };
 

From 9ef30fd56a02872a6b33cb8c29d0f476ef0dbd05 Mon Sep 17 00:00:00 2001
From: Izorkin <Izorkin@gmail.com>
Date: Sun, 10 Jun 2018 02:39:06 +0300
Subject: [PATCH 3360/3370] sshd: change location of config file (#41744)

create symlink /etc/ssh/sshd_config
---
 nixos/modules/services/networking/ssh/sshd.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 902e759f3a3a..961e72b2b810 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -334,7 +334,9 @@ in
     services.openssh.moduliFile = mkDefault "${cfgc.package}/etc/ssh/moduli";
 
     environment.etc = authKeysFiles //
-      { "ssh/moduli".source = cfg.moduliFile; };
+      { "ssh/moduli".source = cfg.moduliFile;
+        "ssh/sshd_config".text = cfg.extraConfig;
+      };
 
     systemd =
       let
@@ -365,7 +367,7 @@ in
               { ExecStart =
                   (optionalString cfg.startWhenNeeded "-") +
                   "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
-                  "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
+                  "-f /etc/ssh/sshd_config";
                 KillMode = "process";
               } // (if cfg.startWhenNeeded then {
                 StandardInput = "socket";

From 72fe3d7b082f646c5ce546a7a3304ad3ea990350 Mon Sep 17 00:00:00 2001
From: Nicolas Dudebout <nicolas.dudebout@gmail.com>
Date: Sat, 9 Jun 2018 19:43:13 -0400
Subject: [PATCH 3361/3370] bind: compile with libcap (#41755)

Additionally:

   + split native and other build inputs
   + alphabetically order dependencies
   + explicitly disable libjson support (the configure script looks for it in
     /usr, /usr/local, and /opt/local)
---
 pkgs/servers/dns/bind/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix
index 2b1830ea6797..d424d510cd28 100644
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, lib, fetchurl, openssl, libtool, perl, libxml2
+{ stdenv, lib, fetchurl
+, perl
+, libcap, libtool, libxml2, openssl
 , enablePython ? false, python3 ? null
 , enableSeccomp ? false, libseccomp ? null, buildPackages
 }:
@@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch;
 
   nativeBuildInputs = [ perl ];
-  buildInputs = [ openssl libtool libxml2 ]
+  buildInputs = [ libcap libtool libxml2 openssl ]
     ++ lib.optional enableSeccomp libseccomp
     ++ lib.optional enablePython python3;
 
@@ -32,6 +34,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--localstatedir=/var"
+    "--with-libcap=${libcap.dev}"
     "--with-libtool"
     "--with-libxml2=${libxml2.dev}"
     "--with-openssl=${openssl.dev}"
@@ -43,6 +46,7 @@ stdenv.mkDerivation rec {
     "--without-idn"
     "--without-idnlib"
     "--without-lmdb"
+    "--without-libjson"
     "--without-pkcs11"
     "--without-purify"
     "--with-randomdev=/dev/random"

From 1aaab72291394d2aee14818f819e22974026426c Mon Sep 17 00:00:00 2001
From: Matthew Justin Bauer <mjbauer95@gmail.com>
Date: Sat, 9 Jun 2018 19:45:46 -0400
Subject: [PATCH 3362/3370] ghcjs-ng: fixup system tuple

on i686-linux, the libexec dir should be /libexec/i386-linux-ghc-8.2.2 not /libexec/i686-linux-ghc-8.2.2
---
 pkgs/development/compilers/ghcjs-ng/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 04c3431f6f23..6e883aeafe83 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -50,7 +50,7 @@ let
   };
 
   bootGhcjs = haskellLib.justStaticExecutables passthru.bootPkgs.ghcjs;
-  libexec = "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin"] ["osx"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
+  libexec = "${bootGhcjs}/libexec/${builtins.replaceStrings ["darwin" "i686"] ["osx" "i386"] stdenv.system}-${passthru.bootPkgs.ghc.name}/${bootGhcjs.name}";
 
 in stdenv.mkDerivation {
     name = bootGhcjs.name;

From 86e5595dda4c3f64819ca5c3b13dce7f90b8cde6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sat, 9 Jun 2018 19:55:02 -0400
Subject: [PATCH 3363/3370] spidermonkey: fix i686 error on 38
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

spidermonkey doesn’t compile correctly on i686 linux & gcc7. It gives
the error:

  with gcc-7: undefined reference to `__divmoddi4'
---
 pkgs/top-level/all-packages.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f09e321d3b15..bc48df43f404 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7505,9 +7505,11 @@ with pkgs;
   spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { };
   spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { };
   spidermonkey_31 = callPackage ../development/interpreters/spidermonkey/31.nix { };
-  spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix {
+  spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({
     inherit (darwin) libobjc;
-  };
+  } // (stdenv.lib.optionalAttrs (stdenv.cc.isGNU && stdenv.hostPlatform.isi686) {
+      stdenv = overrideCC stdenv gcc6; # with gcc-7: undefined reference to `__divmoddi4'
+  }));
   spidermonkey_52 = callPackage ../development/interpreters/spidermonkey/52.nix { };
   spidermonkey = spidermonkey_31;
 

From 6d6ff86c8538521cecba665161bc5407728f5a22 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 10 Jun 2018 02:27:10 -0500
Subject: [PATCH 3364/3370] pythonPackages: paperspace 0.0.11

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 .../python-modules/paperspace/default.nix     | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/paperspace/default.nix

diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix
new file mode 100644
index 000000000000..303534d69c4c
--- /dev/null
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, boto3, requests
+}:
+
+buildPythonPackage rec {
+  pname = "paperspace";
+  version = "0.0.11";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0z19arikcjpfvp3bgssnlhplm1qzgw95s3r5fnsyf7nwmc4pvvpa";
+  };
+
+  buildInputs = [ boto3 requests ];
+
+  doCheck = false; # bizarre test failure
+
+  meta = with stdenv.lib; {
+    description = "Python API for Paperspace Cloud";
+    homepage    = https://paperspace.com;
+    license     = licenses.isc;
+    platforms   = platforms.unix;
+    maintainers = with maintainers; [ thoughtpolice ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1f62f1e7c17f..e0ae870cae0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3731,6 +3731,8 @@ in {
   # These used to be here but were moved to all-packages, but I'll leave them around for a while.
   pants = pkgs.pants;
 
+  paperspace = callPackage ../development/python-modules/paperspace { };
+
   paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { };
 
   papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { };

From ce93645c9cb21de907293fae5cb8dca2d29ef2e2 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 10 Jun 2018 02:45:30 -0500
Subject: [PATCH 3365/3370] pythonPackages.paperspace: propagate boto3,
 requests

Otherwise, 'paperspace-python' does not work properly.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/python-modules/paperspace/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix
index 303534d69c4c..7d228f0af6ac 100644
--- a/pkgs/development/python-modules/paperspace/default.nix
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -12,9 +12,10 @@ buildPythonPackage rec {
     sha256 = "0z19arikcjpfvp3bgssnlhplm1qzgw95s3r5fnsyf7nwmc4pvvpa";
   };
 
-  buildInputs = [ boto3 requests ];
+  propagatedBuildInputs = [ boto3 requests ];
 
-  doCheck = false; # bizarre test failure
+  # tries to use /homeless-shelter to mimic container usage, etc
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Python API for Paperspace Cloud";

From aa8e572e137ebd87602f26b73e67afcd5c972792 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 10 Jun 2018 10:05:59 +0200
Subject: [PATCH 3366/3370] josm: 13576 -> 13878

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 6c14c93c83da..d79e2620c343 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "13576";
+  version = "13878";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "0pw7srvds8zs53ibvj779vj505h2gfrn7xqx13hkbacdg441jkd4";
+    sha256 = "0f8cbzlrlyq8awhzgbjvsljih19s8dzxhhwb4h2dfiakv1rl6vvx";
   };
 
   buildInputs = [ jre8 makeWrapper ];

From 985aea6b55c8ffb5316b1d07337b1cb7a139e463 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 10 Jun 2018 01:22:47 -0700
Subject: [PATCH 3367/3370] anki: 2.0.51 -> 2.0.52 (#41582)

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools.

This update was made based on information from https://repology.org/metapackage/anki/versions.

These checks were done:

- built on NixOS
- /nix/store/2dqw72sffcynzzgcfk0k9mh7jn8sw0kw-anki-2.0.52/bin/anki passed the binary check.
- /nix/store/2dqw72sffcynzzgcfk0k9mh7jn8sw0kw-anki-2.0.52/bin/..anki-wrapped-wrapped passed the binary check.
- /nix/store/2dqw72sffcynzzgcfk0k9mh7jn8sw0kw-anki-2.0.52/bin/.anki-wrapped passed the binary check.
- 3 of 3 passed binary check by having a zero exit code.
- 3 of 3 passed binary check by having the new version present in output.
- found 2.0.52 with grep in /nix/store/2dqw72sffcynzzgcfk0k9mh7jn8sw0kw-anki-2.0.52
- directory tree listing: https://gist.github.com/1a53026ee3eea78708113c1b6e9d857f
- du listing: https://gist.github.com/c8dcabda5b46155a959b86843ee24ddd
---
 pkgs/games/anki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index efc30c1bbf3c..e9f239b4df32 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -28,7 +28,7 @@ let
     qt4 = pyqt4.qt;
 
 in buildPythonApplication rec {
-    version = "2.0.51";
+    version = "2.0.52";
     name = "anki-${version}";
 
     src = fetchurl {
@@ -37,7 +37,7 @@ in buildPythonApplication rec {
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
       ];
-      sha256 = "17prfkz9hbz1sdb62ddi6m4jwsb50n08myhai997x8d0r0xxilw0";
+      sha256 = "0yjyxgpk79rplz9z2r93kmlk09ari6xxfrz1cfm2yl9v8zfw1n6l";
     };
 
     propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]

From 5095e9e32eacfcc794227bfe4fd45d5e60285f73 Mon Sep 17 00:00:00 2001
From: mingchuan <sifmelcara@users.noreply.github.com>
Date: Sun, 10 Jun 2018 16:37:58 +0800
Subject: [PATCH 3368/3370] solc: 0.4.23 -> 0.4.24 (#41631)

Also enable test
---
 pkgs/development/compilers/solc/default.nix   | 24 +++++++++++--------
 .../solc/patches/boost-shared-libs.patch      | 24 -------------------
 .../solc/patches/shared-libs-install.patch    | 12 +++++-----
 3 files changed, 20 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/development/compilers/solc/patches/boost-shared-libs.patch

diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix
index d94ce75e3f55..edb7fc61d2a3 100644
--- a/pkgs/development/compilers/solc/default.nix
+++ b/pkgs/development/compilers/solc/default.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }:
 
 let
-  version = "0.4.23";
-  rev = "124ca40dc525a987a88176c6e5170978e82fa290";
-  sha256 = "07l8rfqh95yrdmbxc4pfb77s06k5v65dk3rgdqscqmwchkndrmm0";
-  jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
+  version = "0.4.24";
+  rev = "e67f0147998a9e3835ed3ce8bf6a0a0c634216c5";
+  sha256 = "1gy2miv6ia1z98zy6w4y03balwfr964bnvwzyg8v7pn2mayqnaap";
+  jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
   jsoncpp = fetchzip {
     url = jsoncppURL;
-    sha256 = "0jz93zv17ir7lbxb3dv8ph2n916rajs8i96immwx9vb45pqid3n0";
+    sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
   };
 in
-
 stdenv.mkDerivation {
   name = "solc-${version}";
 
@@ -21,7 +20,6 @@ stdenv.mkDerivation {
   };
 
   patches = [
-    ./patches/boost-shared-libs.patch
     ./patches/shared-libs-install.patch
   ];
 
@@ -30,17 +28,23 @@ stdenv.mkDerivation {
     echo >commit_hash.txt "${rev}"
     substituteInPlace cmake/jsoncpp.cmake \
       --replace "${jsoncppURL}" ${jsoncpp}
-    substituteInPlace cmake/EthCompilerSettings.cmake \
-      --replace "add_compile_options(-Werror)" ""
+
+    # To allow non-standard CMAKE_INSTALL_LIBDIR (fixed in upstream, not yet released)
+    substituteInPlace cmake/jsoncpp.cmake \
+      --replace "\''${CMAKE_INSTALL_LIBDIR}" "lib" \
+      --replace "# Build static lib but suitable to be included in a shared lib." "-DCMAKE_INSTALL_LIBDIR=lib"
   '';
 
   cmakeFlags = [
     "-DBoost_USE_STATIC_LIBS=OFF"
     "-DBUILD_SHARED_LIBS=ON"
     "-DINSTALL_LLLC=ON"
-    "-DTESTS=OFF"
   ];
 
+  doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform;
+  checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:$LD_LIBRARY_PATH " +
+               "./test/soltest -p -- --no-ipc --no-smt --testpath ../test";
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ boost z3 ];
 
diff --git a/pkgs/development/compilers/solc/patches/boost-shared-libs.patch b/pkgs/development/compilers/solc/patches/boost-shared-libs.patch
deleted file mode 100644
index 499fc46c6caf..000000000000
--- a/pkgs/development/compilers/solc/patches/boost-shared-libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
-index 97b01c83..0bdec4b4 100644
---- a/libsolidity/CMakeLists.txt
-+++ b/libsolidity/CMakeLists.txt
-@@ -28,7 +28,7 @@ else()
- endif()
- 
- add_library(solidity ${sources} ${headers})
--target_link_libraries(solidity PUBLIC evmasm devcore)
-+target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})
- 
- if (${Z3_FOUND})
-   target_link_libraries(solidity PUBLIC ${Z3_LIBRARY})
-diff --git a/lllc/CMakeLists.txt b/lllc/CMakeLists.txt
-index 5c480093..d6538ee2 100644
---- a/lllc/CMakeLists.txt
-+++ b/lllc/CMakeLists.txt
-@@ -1,5 +1,5 @@
- add_executable(lllc main.cpp)
--target_link_libraries(lllc PRIVATE lll)
-+target_link_libraries(lllc PRIVATE lll ${Boost_SYSTEM_LIBRARY})
- 
- if (INSTALL_LLLC)
- 	include(GNUInstallDirs)
diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
index 732797e5ae7d..70162bfbcb6a 100644
--- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch
+++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch
@@ -1,11 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ac56b43..dacf3853 100644
+index 0c05208f..8893648e 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -48,6 +48,19 @@ add_subdirectory(libevmasm)
+@@ -48,6 +48,20 @@ add_subdirectory(libevmasm)
  add_subdirectory(libsolidity)
  add_subdirectory(libsolc)
  
++
 +install(DIRECTORY libdevcore/
 +        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore
 +        FILES_MATCHING PATTERN "*.h")
@@ -38,7 +39,7 @@ index 86192c1b..e7f15e93 100644
 @@ -3,3 +3,4 @@ file(GLOB headers "*.h")
  
  add_library(evmasm ${sources} ${headers})
- target_link_libraries(evmasm PUBLIC jsoncpp devcore)
+ target_link_libraries(evmasm PUBLIC devcore)
 +install(TARGETS evmasm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/liblll/CMakeLists.txt b/liblll/CMakeLists.txt
 index 4cdc073a..b61f03c7 100644
@@ -50,11 +51,10 @@ index 4cdc073a..b61f03c7 100644
  target_link_libraries(lll PUBLIC evmasm devcore)
 +install(TARGETS lll LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
-index 97b01c83..e876177e 100644
+index 0bdec4b4..e876177e 100644
 --- a/libsolidity/CMakeLists.txt
 +++ b/libsolidity/CMakeLists.txt
-@@ -28,7 +28,8 @@ else()
- endif()
+@@ -29,6 +29,7 @@ endif()
  
  add_library(solidity ${sources} ${headers})
  target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY})

From f0bfa9de83082fd27a092f330b22b697a7955883 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 10 Jun 2018 11:51:09 +0200
Subject: [PATCH 3369/3370] pythonPackages.PyICU: 1.9.7 -> 2.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5ee887ed598c..1a6a625116a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10841,13 +10841,20 @@ in {
   };
 
   PyICU = buildPythonPackage rec {
-    name = "PyICU-1.9.7";
+    name = "PyICU-2.0.3";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/P/PyICU/${name}.tar.gz";
-      sha256 = "0qavhngmn7c90fz25a8a2k50wd5gzp3vwwjq8v2pkf2hq4fcs9yv";
+      sha256 = "0pzss3l0b0vcsyr7wlqdd6pkcqldspajfgd9k2iijf6r152d2ln4";
     };
 
+    patches = [
+      (pkgs.fetchpatch {
+        url = https://sources.debian.org/data/main/p/pyicu/2.0.3-1/debian/patches/icu_test.patch;
+        sha256 = "1iavdkyqixm9i753svl17barla93b7jzgkw09dn3hnggamx7zwx9";
+      })
+    ];
+
     buildInputs = [ pkgs.icu self.pytest ];
 
     propagatedBuildInputs = [ self.six ];

From fc9ffe790f5f0c3c378b1af25f3a45333145fded Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 10 Jun 2018 12:09:01 +0200
Subject: [PATCH 3370/3370] linux: Enable RT53XX wifi support

---
 pkgs/os-specific/linux/kernel/common-config.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index a226061ecbfa..d1314431abe1 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -463,6 +463,7 @@ with stdenv.lib;
   PPP_FILTER y
   REGULATOR y # Voltage and Current Regulator Support
   RC_DEVICES? y # Enable IR devices
+  RT2800USB_RT53XX y
   RT2800USB_RT55XX y
   SCHED_AUTOGROUP y
   CFS_BANDWIDTH y